From 64f76bd7628c23341188fb1d02355809f3ab73e0 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 24 Jun 2013 09:16:55 +0900
Subject: [PATCH 0001/1519] Use the right value when getting a function's
 defref.

Either I had gotten confused while writing the code and mixed up line and
offset, or I had changed offset to line at one stage but missed a place.
This fixes the segfault when compiling chewed-alias.r and return-ivar.r
---
 tools/qfcc/source/linker.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/qfcc/source/linker.c b/tools/qfcc/source/linker.c
index 99c77a0f1..772f3fd35 100644
--- a/tools/qfcc/source/linker.c
+++ b/tools/qfcc/source/linker.c
@@ -876,7 +876,7 @@ process_funcs (qfo_t *qfo)
 		func->file = linker_add_string (QFOSTR (qfo, func->file));
 		if (func->code > 0)
 			func->code += work_base[qfo_code_space];
-		func->def = qfo->defs[func->def].offset;	// defref index
+		func->def = qfo->defs[func->def].line;	// defref index
 		func->locals_space = qfo->spaces[func->locals_space].id;
 		if (func->line_info)
 			func->line_info += work->num_lines - 1;		//FIXME order dependent

From 35bc9814020ab0b30dc163aef3753fa8ad6feda7 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 25 Jun 2013 12:09:13 +0900
Subject: [PATCH 0002/1519] Allow use of a jump table when switching on an
 enum.

---
 tools/qfcc/source/switch.c | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/tools/qfcc/source/switch.c b/tools/qfcc/source/switch.c
index f74fe762d..a60b89d7b 100644
--- a/tools/qfcc/source/switch.c
+++ b/tools/qfcc/source/switch.c
@@ -401,7 +401,7 @@ switch_expr (switch_block_t *switch_block, expr_t *break_label,
 		num_labels++;
 	if (options.code.progsversion == PROG_ID_VERSION
 		|| (type != &type_string
-			&& type != &type_float && type != &type_integer)
+			&& type != &type_float && !is_integral (type))
 		|| num_labels < 8) {
 		for (l = labels; *l; l++) {
 			expr_t     *cmp = binary_expr (EQ, sw_val, (*l)->value);
@@ -421,20 +421,10 @@ switch_expr (switch_block_t *switch_block, expr_t *break_label,
 			temp = new_temp_def_expr (&type_integer);
 		else
 			temp = new_temp_def_expr (type);
-		case_tree = build_case_tree (labels, num_labels, type == &type_integer);
-		switch (type->type) {
-			case ev_string:
-				op = NE;
-				break;
-			case ev_float:
-				op = '-';
-				break;
-			case ev_integer:
-				op = '-';
-				break;
-			default:
-				internal_error (0, "in switch");
-		}
+		case_tree = build_case_tree (labels, num_labels, is_integral (type));
+		op = '-';
+		if (type->type == ev_string)
+			op = NE;
 		build_switch (sw, case_tree, op, sw_val, temp, default_label->label);
 	}
 	pr.source_line = saved_line;

From 8ac2c3a04da0e91f27fdd960291fdbd85650405e Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 25 Jun 2013 14:21:43 +0900
Subject: [PATCH 0003/1519] Check for unused enum values in switch statements.

Unfortunately, it turns out the value lookup is broken (including for
duplicate cases).
---
 tools/qfcc/source/switch.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/tools/qfcc/source/switch.c b/tools/qfcc/source/switch.c
index a60b89d7b..f2665b63d 100644
--- a/tools/qfcc/source/switch.c
+++ b/tools/qfcc/source/switch.c
@@ -368,6 +368,24 @@ build_switch (expr_t *sw, case_node_t *tree, int op, expr_t *sw_val,
 	}
 }
 
+static void
+check_enum_switch (switch_block_t *switch_block)
+{
+	case_label_t cl;
+	symbol_t   *enum_val;
+	type_t     *type = get_type (switch_block->test);
+
+	for (enum_val = type->t.symtab->symbols; enum_val;
+		 enum_val = enum_val->next) {
+		cl.value = new_integer_expr (enum_val->s.value->v.integer_val);
+		if (!Hash_FindElement (switch_block->labels, &cl)) {
+			warning (switch_block->test,
+					 "enumeration value `%s' not handled in switch",
+					 enum_val->name);
+		}
+	}
+}
+
 struct expr_s *
 switch_expr (switch_block_t *switch_block, expr_t *break_label,
 			 expr_t *statements)
@@ -393,6 +411,8 @@ switch_expr (switch_block_t *switch_block, expr_t *break_label,
 	if (!default_label) {
 		default_label = &_default_label;
 		default_label->label = break_label;
+		if (is_enum (type))
+			check_enum_switch (switch_block);
 	}
 
 	append_expr (sw, assign_expr (sw_val, switch_block->test));

From 29df4ac7eedfef00c1a03d293e66c67d4b37460c Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 26 Jun 2013 08:40:25 +0900
Subject: [PATCH 0004/1519] Fix case label lookup.

It looks like I had forgotten that the compare function is supposed to
return true/false (unlike memcmp's sorting ability). Also, avoid the
pointers in the value struct as they can change without notice.

Using enums in switches now works nicely, including warnings for unused
enum values.
---
 tools/qfcc/TODO            |  2 +-
 tools/qfcc/source/switch.c | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/tools/qfcc/TODO b/tools/qfcc/TODO
index f9867c2b3..368ea6e77 100644
--- a/tools/qfcc/TODO
+++ b/tools/qfcc/TODO
@@ -6,13 +6,13 @@ I = in progress
 W = waiting on other work
 
 X	fix object files
+X	fix enums in switch statements (use tables (treat as int), check missing)
 M	arrays in structures
 M	unnamed function parameters for prototypes/typdefs etc.
 I	optimizations (esp CSE)
 I	fix used/uninitialized warnings
 o	id id;
 o	vec = [x, y, z]; expressions (nice feature in fteqcc)
-o	fix enums in switch statements (use tables (treat as int), check missing)
 o	arrays in entities
 o	optional arguments for functions (alternative to overloading)
 	vector(vector fwd, optional vector up) vectoangles = #51;
diff --git a/tools/qfcc/source/switch.c b/tools/qfcc/source/switch.c
index f2665b63d..dee8bac5f 100644
--- a/tools/qfcc/source/switch.c
+++ b/tools/qfcc/source/switch.c
@@ -68,6 +68,8 @@ get_value (expr_t *e)
 {
 	if (e->type == ex_symbol)
 		return e->e.symbol->s.value;
+	if (e->type != ex_value)
+		internal_error (e, "bogus case label");
 	return e->e.value;
 }
 
@@ -80,7 +82,7 @@ get_hash (const void *_cl, void *unused)
 	if (!cl->value)
 		return 0;
 	val = get_value (cl->value);
-	return Hash_Buffer (val, sizeof (*val));
+	return Hash_Buffer (&val->v, sizeof (val->v)) + val->type;
 }
 
 static int
@@ -99,8 +101,10 @@ compare (const void *_cla, const void *_clb, void *unused)
 	if (extract_type (v1) != extract_type (v2))
 		return 0;
 	val1 = get_value (v1);
-	val2 = get_value (v1);
-	return memcmp (val1, val2, sizeof (*val1));
+	val2 = get_value (v2);
+	if (val1->type != val2->type)
+		return 0;
+	return memcmp (&val1->v, &val2->v, sizeof (val1->v)) == 0;
 }
 
 struct expr_s *

From fd1ea9e00eb2e0cbd9f10afdb2d6e6d2f24af3cb Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 26 Jun 2013 09:08:51 +0900
Subject: [PATCH 0005/1519] Add an option to control the enum switch warning.

---
 tools/qfcc/doc/man/qfcc.1    | 7 +++++++
 tools/qfcc/include/options.h | 1 +
 tools/qfcc/source/options.c  | 7 +++++++
 tools/qfcc/source/switch.c   | 2 +-
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/tools/qfcc/doc/man/qfcc.1 b/tools/qfcc/doc/man/qfcc.1
index cf5c6372d..2857ffedd 100644
--- a/tools/qfcc/doc/man/qfcc.1
+++ b/tools/qfcc/doc/man/qfcc.1
@@ -314,6 +314,13 @@ Emit a warning when potentially ambiguous logic is used without parentheses.
 .B redeclared
 Emit a warning when a local variable is redeclared.
 .TP
+.B switch
+Emit a warning when an enum value is not handled in a switch statement that
+tests an enum.
+Using a default label will cause all otherwise unhandled enum values to be
+handled (for good or evil).
+.TP
+.TP
 .B traditional
 Emit a warning when code that should be an error is allowed by traditional
 \fBqcc\fP.
diff --git a/tools/qfcc/include/options.h b/tools/qfcc/include/options.h
index 131aec720..6be963699 100644
--- a/tools/qfcc/include/options.h
+++ b/tools/qfcc/include/options.h
@@ -61,6 +61,7 @@ typedef struct {
 	qboolean	initializer;		// Warn on excessive initializer elements
 	qboolean	unimplemented;		// Warn on unimplemented class methods
 	qboolean	redeclared;			// Warn on redeclared local variables
+	qboolean	enum_switch;		// Warn on unhandled enum values in switch
 } warn_options_t;
 
 typedef struct {
diff --git a/tools/qfcc/source/options.c b/tools/qfcc/source/options.c
index e9f67ca0c..4209cbbec 100644
--- a/tools/qfcc/source/options.c
+++ b/tools/qfcc/source/options.c
@@ -232,6 +232,8 @@ warning_usage (void)
 "                            interface.\n"
 "    none                    Turn off all warnings.\n"
 "    [no-]precedence         Warn about potentially ambiguous logic.\n"
+"    [no-]switch             Warn about unhandled enum values in switch\n"
+"                            statements.\n"
 "    [no-]redeclared         Warn about redeclared local variables.\n"
 "    [no-]traditional        Warn about bad code that qcc allowed.\n"
 "    [no-]undef-function     Warn about calling a yet to be defined\n"
@@ -295,6 +297,7 @@ DecodeArgs (int argc, char **argv)
 	options.warnings.initializer = true;
 	options.warnings.unimplemented = true;
 	options.warnings.redeclared = true;
+	options.warnings.enum_switch = true;
 
 	options.single_cpp = true;
 	options.save_temps = false;
@@ -503,6 +506,7 @@ DecodeArgs (int argc, char **argv)
 							options.warnings.initializer = true;
 							options.warnings.unimplemented = true;
 							options.warnings.redeclared = true;
+							options.warnings.enum_switch = true;
 						} else if (!(strcasecmp (temp, "none"))) {
 							options.warnings.cow = false;
 							options.warnings.undefined_function = false;
@@ -517,6 +521,7 @@ DecodeArgs (int argc, char **argv)
 							options.warnings.initializer = false;
 							options.warnings.unimplemented = false;
 							options.warnings.redeclared = false;
+							options.warnings.enum_switch = false;
 						} else {
 							qboolean    flag = true;
 
@@ -542,6 +547,8 @@ DecodeArgs (int argc, char **argv)
 								options.warnings.precedence = flag;
 							} else if (!strcasecmp (temp, "redeclared")) {
 								options.warnings.redeclared = flag;
+							} else if (!strcasecmp (temp, "switch")) {
+								options.warnings.enum_switch = flag;
 							} else if (!strcasecmp (temp, "traditional")) {
 								options.warnings.traditional = flag;
 							} else if (!strcasecmp (temp, "undef-function")) {
diff --git a/tools/qfcc/source/switch.c b/tools/qfcc/source/switch.c
index dee8bac5f..f6b05547c 100644
--- a/tools/qfcc/source/switch.c
+++ b/tools/qfcc/source/switch.c
@@ -415,7 +415,7 @@ switch_expr (switch_block_t *switch_block, expr_t *break_label,
 	if (!default_label) {
 		default_label = &_default_label;
 		default_label->label = break_label;
-		if (is_enum (type))
+		if (options.warnings.enum_switch && is_enum (type))
 			check_enum_switch (switch_block);
 	}
 

From 99a8e8f22803521a7a6721ce2b0612bd70d7c736 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 26 Jun 2013 09:59:19 +0900
Subject: [PATCH 0006/1519] Fix the jump instruction.

The offset to compensate for st++ was missing.

Obviously, the code has never been tested.  Found while looking at the
jump code and thinking about using 32-bit addresses for the jump tables.
---
 libs/gamecode/pr_exec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/gamecode/pr_exec.c b/libs/gamecode/pr_exec.c
index 24778dd74..f67bc1856 100644
--- a/libs/gamecode/pr_exec.c
+++ b/libs/gamecode/pr_exec.c
@@ -893,7 +893,7 @@ PR_ExecuteProgram (progs_t * pr, func_t fnum)
 					&& (OPA.uinteger_var >= pr->progs->numstatements)) {
 					PR_RunError (pr, "Invalid jump destination");
 				}
-				pr->pr_xstatement = OPA.uinteger_var;
+				pr->pr_xstatement = OPA.uinteger_var - 1;	// offset the st++
 				st = pr->pr_statements + pr->pr_xstatement;
 				break;
 			case OP_JUMPB:

From 77337e2402646a457a4c4b984ecb5dc599ff874c Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 20 Dec 2012 09:57:24 +0900
Subject: [PATCH 0007/1519] Separate "" and nil.

It turns out this is required for compatibility with qcc (and C, really).
Once string to boolean conversions are sorted out completely (not that
simple as qcc is inconsistent with if (string) vs if (!string)), Qgets can
be implemented :)
---
 tools/qfcc/source/strpool.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/qfcc/source/strpool.c b/tools/qfcc/source/strpool.c
index d22762a3c..8b32ae71e 100644
--- a/tools/qfcc/source/strpool.c
+++ b/tools/qfcc/source/strpool.c
@@ -103,7 +103,7 @@ strpool_addstr (strpool_t *strpool, const char *str)
 	intptr_t    s;
 	int         len;
 
-	if (!str || !*str)
+	if (!str)
 		return 0;
 	s = (intptr_t) Hash_Find (strpool->str_tab, str);
 	if (s)

From 8d34d3305544826972af57d2cf5246326201643d Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 20 Dec 2012 10:02:00 +0900
Subject: [PATCH 0008/1519] Implement "if not (foo)" syntax.

It is syntactic sugar for if (!(foo)), but is useful for avoiding
inconsistencies between such things as if (string) and if (!string), even
though qcc can't parse if not (string). It also makes for easier to read
code when the logic in the condition is complex.
---
 tools/qfcc/include/expr.h    |  3 ++-
 tools/qfcc/source/expr.c     | 11 ++++++++---
 tools/qfcc/source/qc-lex.l   |  1 +
 tools/qfcc/source/qc-parse.y | 17 +++++++++++------
 tools/qfcc/source/qp-parse.y |  4 ++--
 5 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/tools/qfcc/include/expr.h b/tools/qfcc/include/expr.h
index 713292fbf..a3348e9d7 100644
--- a/tools/qfcc/include/expr.h
+++ b/tools/qfcc/include/expr.h
@@ -598,7 +598,8 @@ expr_t *incop_expr (int op, expr_t *e, int postop);
 expr_t *array_expr (expr_t *array, expr_t *index);
 expr_t *pointer_expr (expr_t *pointer);
 expr_t *address_expr (expr_t *e1, expr_t *e2, struct type_s *t);
-expr_t *build_if_statement (expr_t *test, expr_t *s1, expr_t *els, expr_t *s2);
+expr_t *build_if_statement (int not, expr_t *test, expr_t *s1, expr_t *els,
+							expr_t *s2);
 expr_t *build_while_statement (expr_t *test, expr_t *statement,
 							   expr_t *break_label, expr_t *continue_label);
 expr_t *build_do_while_statement (expr_t *statement, expr_t *test,
diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index 8f72240cf..109d0a51f 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -2284,7 +2284,7 @@ address_expr (expr_t *e1, expr_t *e2, type_t *t)
 }
 
 expr_t *
-build_if_statement (expr_t *test, expr_t *s1, expr_t *els, expr_t *s2)
+build_if_statement (int not, expr_t *test, expr_t *s1, expr_t *els, expr_t *s2)
 {
 	int         line = pr.source_line;
 	string_t    file = pr.source_file;
@@ -2299,8 +2299,13 @@ build_if_statement (expr_t *test, expr_t *s1, expr_t *els, expr_t *s2)
 
 	test = convert_bool (test, 1);
 	if (test->type != ex_error) {
-		backpatch (test->e.bool.true_list, tl);
-		backpatch (test->e.bool.false_list, fl);
+		if (not) {
+			backpatch (test->e.bool.true_list, fl);
+			backpatch (test->e.bool.false_list, tl);
+		} else {
+			backpatch (test->e.bool.true_list, tl);
+			backpatch (test->e.bool.false_list, fl);
+		}
 		append_expr (test->e.bool.e, tl);
 		append_expr (if_expr, test);
 	}
diff --git a/tools/qfcc/source/qc-lex.l b/tools/qfcc/source/qc-lex.l
index ff0f89e8a..7d190cb48 100644
--- a/tools/qfcc/source/qc-lex.l
+++ b/tools/qfcc/source/qc-lex.l
@@ -319,6 +319,7 @@ static keyword_t at_keywords[] = {
 	{"static",		STATIC	},
 	{"sizeof",		SIZEOF	},
 	{"nosave",		NOSAVE	},
+	{"not",			NOT		},
 };
 
 // These keywords require the QuakeForge VM to be of any use. ie, they cannot
diff --git a/tools/qfcc/source/qc-parse.y b/tools/qfcc/source/qc-parse.y
index ef7bd1cf6..7304f7f0e 100644
--- a/tools/qfcc/source/qc-parse.y
+++ b/tools/qfcc/source/qc-parse.y
@@ -145,7 +145,7 @@ int yylex (void);
 
 %token				LOCAL RETURN WHILE DO IF ELSE FOR BREAK CONTINUE ELLIPSIS
 %token				NIL IFBE IFB IFAE IFA SWITCH CASE DEFAULT ENUM TYPEDEF
-%token				ARGS EXTERN STATIC SYSTEM NOSAVE OVERLOAD
+%token				ARGS EXTERN STATIC SYSTEM NOSAVE OVERLOAD NOT
 %token	<op>		STRUCT
 %token	<type>		TYPE
 %token	<symbol>	OBJECT TYPE_NAME
@@ -205,7 +205,7 @@ int yylex (void);
 %type	<protocol>	protocol_name
 %type	<methodlist> methodprotolist methodprotolist2
 %type	<symtab>	ivar_decl_list
-%type	<op>		ci
+%type	<op>		ci not
 
 %{
 
@@ -1149,13 +1149,13 @@ statement
 			switch_block = $5;
 			break_label = $2;
 		}
-	| IF '(' texpr ')' statement %prec IFX
+	| IF not '(' texpr ')' statement %prec IFX
 		{
-			$$ = build_if_statement ($3, $5, 0, 0);
+			$$ = build_if_statement ($2, $4, $6, 0, 0);
 		}
-	| IF '(' texpr ')' statement else statement
+	| IF not '(' texpr ')' statement else statement
 		{
-			$$ = build_if_statement ($3, $5, $6, $7);
+			$$ = build_if_statement ($2, $4, $6, $7, $8);
 		}
 	| FOR break_label continue_label
 			'(' opt_expr ';' opt_expr ';' opt_expr ')' statement
@@ -1184,6 +1184,11 @@ statement
 		}
 	;
 
+not
+	: NOT						{ $$ = 1; }
+	| /* empty */				{ $$ = 0; }
+	;
+
 else
 	: ELSE
 		{
diff --git a/tools/qfcc/source/qp-parse.y b/tools/qfcc/source/qp-parse.y
index f8c870ed4..a2b94acea 100644
--- a/tools/qfcc/source/qp-parse.y
+++ b/tools/qfcc/source/qp-parse.y
@@ -354,11 +354,11 @@ statement
 	| compound_statement
 	| IF expression THEN statement else statement
 		{
-			$$ = build_if_statement ($2, $4, $5, $6);
+			$$ = build_if_statement (0, $2, $4, $5, $6);
 		}
 	| IF expression THEN statement %prec IFX
 		{
-			$$ = build_if_statement ($2, $4, 0, 0);
+			$$ = build_if_statement (0, $2, $4, 0, 0);
 		}
 	| WHILE expression DO statement
 		{

From 6fa63f6c54d2bf4bdee36838d3df4448151d255c Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 20 Dec 2012 10:05:17 +0900
Subject: [PATCH 0009/1519] Implement the basics of fteqcc's -Fifstring.

It's -Cifstring in qfcc, but otherwise the intent is the same. More testing
and investigation into what fteqcc does is required.
---
 tools/qfcc/include/options.h | 1 +
 tools/qfcc/source/expr.c     | 5 ++++-
 tools/qfcc/source/options.c  | 6 ++++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/tools/qfcc/include/options.h b/tools/qfcc/include/options.h
index 6be963699..4377dab97 100644
--- a/tools/qfcc/include/options.h
+++ b/tools/qfcc/include/options.h
@@ -44,6 +44,7 @@ typedef struct {
 	qboolean    local_merging;		// merge function locals into one block
 	unsigned    progsversion;		// Progs version to generate code for
 	qboolean    vector_components;	// add *_[xyz] symbols for vectors
+	qboolean    ifstring;			// expand if (str) to if (str != "")
 } code_options_t;
 
 typedef struct {
diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index 109d0a51f..ff1ebab3e 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -1082,6 +1082,8 @@ test_expr (expr_t *e)
 			}
 			return error (e, "void has no value");
 		case ev_string:
+			if (!options.code.ifstring)
+				return new_alias_expr (type_default, e);
 			new = new_string_expr (0);
 			break;
 		case ev_uinteger:
@@ -1211,7 +1213,8 @@ convert_bool (expr_t *e, int block)
 		return b;
 	}
 
-	if (e->type == ex_uexpr && e->e.expr.op == '!') {
+	if (e->type == ex_uexpr && e->e.expr.op == '!'
+		&& get_type (e->e.expr.e1) != &type_string) {
 		e = convert_bool (e->e.expr.e1, 0);
 		if (e->type == ex_error)
 			return e;
diff --git a/tools/qfcc/source/options.c b/tools/qfcc/source/options.c
index 4209cbbec..4edb03623 100644
--- a/tools/qfcc/source/options.c
+++ b/tools/qfcc/source/options.c
@@ -470,6 +470,8 @@ DecodeArgs (int argc, char **argv)
 							options.code.optimize = flag;
 						} else if (!(strcasecmp (temp, "short-circuit"))) {
 							options.code.short_circuit = flag;
+						} else if (!(strcasecmp (temp, "ifstring"))) {
+							options.code.ifstring = flag;
 						} else if (!(strcasecmp (temp, "single-cpp"))) {
 							options.single_cpp = flag;
 						} else if (!(strcasecmp (temp, "vector-calls"))) {
@@ -645,6 +647,8 @@ DecodeArgs (int argc, char **argv)
 		options.advanced = false;
 		if (!options.code.progsversion)
 			options.code.progsversion = PROG_ID_VERSION;
+		if (options.code.ifstring == (qboolean) -1)
+			options.code.ifstring = false;
 		if (options.code.short_circuit == (qboolean) -1)
 			options.code.short_circuit = false;
 		if (options.code.local_merging == (qboolean) -1)
@@ -658,6 +662,8 @@ DecodeArgs (int argc, char **argv)
 		options.advanced = true;
 		add_cpp_def ("-D__RUAMOKO__=1");
 		add_cpp_def ("-D__RAUMOKO__=1");
+		if (options.code.ifstring == (qboolean) -1)
+			options.code.ifstring = false;
 		if (options.code.short_circuit == (qboolean) -1)
 			options.code.short_circuit = true;
 		if (options.code.local_merging == (qboolean) -1)

From 45a09e195ec63998974f7d38ed377855a33e26ce Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 20 Dec 2012 10:08:27 +0900
Subject: [PATCH 0010/1519] Add more TODO items (strings stuff)

---
 tools/qfcc/TODO | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/qfcc/TODO b/tools/qfcc/TODO
index 368ea6e77..37c64d6d6 100644
--- a/tools/qfcc/TODO
+++ b/tools/qfcc/TODO
@@ -13,6 +13,8 @@ I	optimizations (esp CSE)
 I	fix used/uninitialized warnings
 o	id id;
 o	vec = [x, y, z]; expressions (nice feature in fteqcc)
+o	finish -Fifstring
+o	isset() intrinsic for more consistent string handling.
 o	arrays in entities
 o	optional arguments for functions (alternative to overloading)
 	vector(vector fwd, optional vector up) vectoangles = #51;

From cef213605061958bf1a9b0be8936efa2d3ba42f7 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 25 Jun 2013 10:46:51 +0900
Subject: [PATCH 0011/1519] Implement "not" logic for while and do-while.

This goes towards complementing the "if not" logic extension. I need to
check if fteqcc supports "not" with "while" (the version I have access to
at the moment does not), and also whether it would be good  to support
"not" with "for", and if so, what form the syntax should take.
---
 tools/qfcc/include/expr.h    |  4 ++--
 tools/qfcc/source/expr.c     | 22 ++++++++++++++++------
 tools/qfcc/source/qc-parse.y |  9 +++++----
 tools/qfcc/source/qp-parse.y |  2 +-
 4 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/tools/qfcc/include/expr.h b/tools/qfcc/include/expr.h
index a3348e9d7..819969afc 100644
--- a/tools/qfcc/include/expr.h
+++ b/tools/qfcc/include/expr.h
@@ -600,9 +600,9 @@ expr_t *pointer_expr (expr_t *pointer);
 expr_t *address_expr (expr_t *e1, expr_t *e2, struct type_s *t);
 expr_t *build_if_statement (int not, expr_t *test, expr_t *s1, expr_t *els,
 							expr_t *s2);
-expr_t *build_while_statement (expr_t *test, expr_t *statement,
+expr_t *build_while_statement (int not, expr_t *test, expr_t *statement,
 							   expr_t *break_label, expr_t *continue_label);
-expr_t *build_do_while_statement (expr_t *statement, expr_t *test,
+expr_t *build_do_while_statement (expr_t *statement, int not, expr_t *test,
 								  expr_t *break_label, expr_t *continue_label);
 expr_t *build_for_statement (expr_t *init, expr_t *test, expr_t *next,
 							 expr_t *statement,
diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index ff1ebab3e..67307b0e2 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -2337,7 +2337,7 @@ build_if_statement (int not, expr_t *test, expr_t *s1, expr_t *els, expr_t *s2)
 }
 
 expr_t *
-build_while_statement (expr_t *test, expr_t *statement,
+build_while_statement (int not, expr_t *test, expr_t *statement,
 					   expr_t *break_label, expr_t *continue_label)
 {
 	int         line = pr.source_line;
@@ -2358,8 +2358,13 @@ build_while_statement (expr_t *test, expr_t *statement,
 
 	test = convert_bool (test, 1);
 	if (test->type != ex_error) {
-		backpatch (test->e.bool.true_list, l1);
-		backpatch (test->e.bool.false_list, l2);
+		if (not) {
+			backpatch (test->e.bool.true_list, l2);
+			backpatch (test->e.bool.false_list, l1);
+		} else {
+			backpatch (test->e.bool.true_list, l1);
+			backpatch (test->e.bool.false_list, l2);
+		}
 		append_expr (test->e.bool.e, l2);
 		append_expr (while_expr, test);
 	}
@@ -2371,7 +2376,7 @@ build_while_statement (expr_t *test, expr_t *statement,
 }
 
 expr_t *
-build_do_while_statement (expr_t *statement, expr_t *test,
+build_do_while_statement (expr_t *statement, int not, expr_t *test,
 						  expr_t *break_label, expr_t *continue_label)
 {
 	expr_t *l1 = new_label_expr ();
@@ -2390,8 +2395,13 @@ build_do_while_statement (expr_t *statement, expr_t *test,
 
 	test = convert_bool (test, 1);
 	if (test->type != ex_error) {
-		backpatch (test->e.bool.true_list, l1);
-		backpatch (test->e.bool.false_list, break_label);
+		if (not) {
+			backpatch (test->e.bool.true_list, break_label);
+			backpatch (test->e.bool.false_list, l1);
+		} else {
+			backpatch (test->e.bool.true_list, l1);
+			backpatch (test->e.bool.false_list, break_label);
+		}
 		append_expr (test->e.bool.e, break_label);
 		append_expr (do_while_expr, test);
 	}
diff --git a/tools/qfcc/source/qc-parse.y b/tools/qfcc/source/qc-parse.y
index 7304f7f0e..14937a811 100644
--- a/tools/qfcc/source/qc-parse.y
+++ b/tools/qfcc/source/qc-parse.y
@@ -1165,15 +1165,16 @@ statement
 			break_label = $2;
 			continue_label = $3;
 		}
-	| WHILE break_label continue_label '(' texpr ')' statement
+	| WHILE break_label continue_label not '(' texpr ')' statement
 		{
-			$$ = build_while_statement ($5, $7, break_label, continue_label);
+			$$ = build_while_statement ($4, $6, $8, break_label,
+										continue_label);
 			break_label = $2;
 			continue_label = $3;
 		}
-	| DO break_label continue_label statement WHILE '(' texpr ')' ';'
+	| DO break_label continue_label statement WHILE not '(' texpr ')' ';'
 		{
-			$$ = build_do_while_statement ($4, $7,
+			$$ = build_do_while_statement ($4, $6, $8,
 										   break_label, continue_label);
 			break_label = $2;
 			continue_label = $3;
diff --git a/tools/qfcc/source/qp-parse.y b/tools/qfcc/source/qp-parse.y
index a2b94acea..9731402a5 100644
--- a/tools/qfcc/source/qp-parse.y
+++ b/tools/qfcc/source/qp-parse.y
@@ -362,7 +362,7 @@ statement
 		}
 	| WHILE expression DO statement
 		{
-			$$ = build_while_statement ($2, $4,
+			$$ = build_while_statement (0, $2, $4,
 										new_label_expr (),
 										new_label_expr ());
 		}

From 257597fd384f1d00a5b462ea096807194637bf2e Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 25 Jun 2013 11:03:25 +0900
Subject: [PATCH 0012/1519] Update ifstring in TODO

It seems to be done, but...
---
 tools/qfcc/TODO | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/qfcc/TODO b/tools/qfcc/TODO
index 37c64d6d6..f44c2bf15 100644
--- a/tools/qfcc/TODO
+++ b/tools/qfcc/TODO
@@ -13,7 +13,7 @@ I	optimizations (esp CSE)
 I	fix used/uninitialized warnings
 o	id id;
 o	vec = [x, y, z]; expressions (nice feature in fteqcc)
-o	finish -Fifstring
+M	finish -Fifstring
 o	isset() intrinsic for more consistent string handling.
 o	arrays in entities
 o	optional arguments for functions (alternative to overloading)

From 16d899ace5df478e2b36778df9b264ede971bdac Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 25 Jun 2013 11:23:02 +0900
Subject: [PATCH 0013/1519] Remove the string:string concatentation TODO item.

I think it may have been for compatibility with a certain qcc variant (no
idea which one, though). While the shift/reduce conflict is fixable using
"%prec IFX" on the const:string rule, the colon breaks test?"a":"b".
Putting parentheses around "a" allows such a construct, requiring them
breaks comatibility with C. I think this feature just isn't worth that.
---
 tools/qfcc/TODO | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tools/qfcc/TODO b/tools/qfcc/TODO
index f44c2bf15..ed68de57c 100644
--- a/tools/qfcc/TODO
+++ b/tools/qfcc/TODO
@@ -20,4 +20,3 @@ o	optional arguments for functions (alternative to overloading)
 	vector(vector fwd, optional vector up) vectoangles = #51;
 ?	try to reduce memory consumption
 ??	embedded nul characters in strings (why?)
-??	"":"" string concatenation (parser issues) (why?)

From 03fb47d7ba5f56429817ea5ac6ed890fbab2aa4e Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 26 Sep 2013 17:45:30 +0900
Subject: [PATCH 0014/1519] Fix some sizeof goofs.

Yay for continually improving gcc warnings :)
---
 qw/source/cl_chat.c      | 2 +-
 tools/qfcc/source/type.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/qw/source/cl_chat.c b/qw/source/cl_chat.c
index 305c14f55..2b40e64dd 100644
--- a/qw/source/cl_chat.c
+++ b/qw/source/cl_chat.c
@@ -160,7 +160,7 @@ static qboolean cam_iterator (ignore_t *ig, llist_node_t *node)
 		return true;
 	}
 	dsprintf (g_cam_test, "%s: ", Info_ValueForKey (cl.players[ig->slot].userinfo, "name"));
-	if (!strncmp (g_cam_test->str, g_cam_str, sizeof (g_cam_test->str))) {
+	if (!strncmp (g_cam_test->str, g_cam_str, g_cam_test->size - 1)) {
 		return g_cam_allowed = false;
 	} else
 		return true;
diff --git a/tools/qfcc/source/type.c b/tools/qfcc/source/type.c
index 0077d36c7..92d63b11f 100644
--- a/tools/qfcc/source/type.c
+++ b/tools/qfcc/source/type.c
@@ -182,7 +182,7 @@ free_type (type_t *type)
 				free_type (type->t.array.type);
 			break;
 	}
-	memset (type, 0, sizeof (type));
+	memset (type, 0, sizeof (*type));
 	FREE (types, type);
 }
 

From 6288684fa245005e7399c56955ff297fa4207d3d Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 27 Sep 2013 23:08:33 +0900
Subject: [PATCH 0015/1519] Fix more gcc 4.8 errors.

More actual bugs found, too.
---
 libs/ruamoko/rua_plist.c                  | 4 +++-
 libs/video/renderer/gl/gl_dyn_part.c      | 8 ++++++--
 libs/video/renderer/glsl/glsl_particles.c | 8 +++++---
 libs/video/renderer/sw/sw_rpart.c         | 8 +++++---
 libs/video/renderer/sw32/sw32_rpart.c     | 8 +++++---
 qw/source/sv_pr_cpqw.c                    | 6 +++---
 6 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/libs/ruamoko/rua_plist.c b/libs/ruamoko/rua_plist.c
index 40a8b072f..0fdb1ff8d 100644
--- a/libs/ruamoko/rua_plist.c
+++ b/libs/ruamoko/rua_plist.c
@@ -45,6 +45,8 @@
 
 #include "rua_internal.h"
 
+#define always_inline inline __attribute__((__always_inline__))
+
 typedef struct bi_plist_s {
 	struct bi_plist_s *next;
 	struct bi_plist_s **prev;
@@ -140,7 +142,7 @@ plist_free_handle (plist_resources_t *res, bi_plist_t *plist)
 	plist_free (res, plist);
 }
 
-static inline bi_plist_t *
+static always_inline bi_plist_t *
 get_plist (progs_t *pr, const char *name, int handle)
 {
 	plist_resources_t *res = PR_Resources_Find (pr, "plist");
diff --git a/libs/video/renderer/gl/gl_dyn_part.c b/libs/video/renderer/gl/gl_dyn_part.c
index 949e8b0a3..d3f50f015 100644
--- a/libs/video/renderer/gl/gl_dyn_part.c
+++ b/libs/video/renderer/gl/gl_dyn_part.c
@@ -1185,8 +1185,12 @@ R_EntityParticles_ID (const entity_t *ent)
 	}
 
 	if (!avelocities[0][0]) {
-		for (i = 0; i < NUMVERTEXNORMALS * 3; i++)
-			avelocities[0][i] = (mtwist_rand (&mt) & 255) * 0.01;
+		for (i = 0; i < NUMVERTEXNORMALS; i++) {
+			int         k;
+			for (k = 0; k < 3; k++) {
+				avelocities[i][k] = (mtwist_rand (&mt) & 255) * 0.01;
+			}
+		}
 	}
 
 	for (i = 0; i < j; i++) {
diff --git a/libs/video/renderer/glsl/glsl_particles.c b/libs/video/renderer/glsl/glsl_particles.c
index 06ca3d000..8d4819fec 100644
--- a/libs/video/renderer/glsl/glsl_particles.c
+++ b/libs/video/renderer/glsl/glsl_particles.c
@@ -1271,9 +1271,11 @@ R_EntityParticles_ID (const entity_t *ent)
 		j = r_maxparticles - numparticles;
 	}
 
-	if (!avelocities[0][0]) {
-		for (i = 0; i < NUMVERTEXNORMALS * 3; i++)
-			avelocities[0][i] = (mtwist_rand (&mt) & 255) * 0.01;
+	for (i = 0; i < NUMVERTEXNORMALS; i++) {
+		int         k;
+		for (k = 0; k < 3; k++) {
+			avelocities[i][k] = (mtwist_rand (&mt) & 255) * 0.01;
+		}
 	}
 
 	for (i = 0; i < j; i++) {
diff --git a/libs/video/renderer/sw/sw_rpart.c b/libs/video/renderer/sw/sw_rpart.c
index b198624ee..de59f0ba1 100644
--- a/libs/video/renderer/sw/sw_rpart.c
+++ b/libs/video/renderer/sw/sw_rpart.c
@@ -435,9 +435,11 @@ R_EntityParticles_ID (const entity_t *ent)
 	if (!r_particles->int_val)
 		return;
 
-	if (!avelocities[0][0]) {
-		for (i = 0; i < NUMVERTEXNORMALS * 3; i++)
-			avelocities[0][i] = (mtwist_rand (&mt) & 255) * 0.01;
+	for (i = 0; i < NUMVERTEXNORMALS; i++) {
+		int         k;
+		for (k = 0; k < 3; k++) {
+			avelocities[i][k] = (mtwist_rand (&mt) & 255) * 0.01;
+		}
 	}
 
 	for (i = 0; i < NUMVERTEXNORMALS; i++) {
diff --git a/libs/video/renderer/sw32/sw32_rpart.c b/libs/video/renderer/sw32/sw32_rpart.c
index 3ae503213..3affa45b1 100644
--- a/libs/video/renderer/sw32/sw32_rpart.c
+++ b/libs/video/renderer/sw32/sw32_rpart.c
@@ -377,9 +377,11 @@ R_EntityParticles_ID (const entity_t *ent)
 	particle_t *p;
 	vec3_t		forward;
 
-	if (!avelocities[0][0]) {
-		for (i = 0; i < NUMVERTEXNORMALS * 3; i++)
-			avelocities[0][i] = (mtwist_rand (&mt) & 255) * 0.01;
+	for (i = 0; i < NUMVERTEXNORMALS; i++) {
+		int         k;
+		for (k = 0; k < 3; k++) {
+			avelocities[i][k] = (mtwist_rand (&mt) & 255) * 0.01;
+		}
 	}
 
 	for (i = 0; i < NUMVERTEXNORMALS; i++) {
diff --git a/qw/source/sv_pr_cpqw.c b/qw/source/sv_pr_cpqw.c
index 3037db482..07659f634 100644
--- a/qw/source/sv_pr_cpqw.c
+++ b/qw/source/sv_pr_cpqw.c
@@ -818,10 +818,10 @@ cpqw_user_cmd (void)
 
 		PR_PushFrame (pr);
 		P_FLOAT (pr, 0) = argc;
-		for (i = 0; i < argc; i++)
-			P_STRING (pr, i + 1) = PR_SetTempString (pr, Cmd_Argv (i));
+		for (i = 1; i < argc; i++)
+			P_STRING (pr, i) = PR_SetTempString (pr, Cmd_Argv (i - 1));
 		for (; i < 7; i++)
-			P_STRING (pr, i + 1) = 0;
+			P_STRING (pr, i) = 0;
 		PR_ExecuteProgram (pr, cpqw_funcs.ClientCommand);
 		PR_PopFrame (pr);
 		return (int) R_FLOAT (pr);

From 35de42aeac9ce15f2f5e5374e17c1c35130ceba9 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 24 Jun 2013 11:34:38 +0900
Subject: [PATCH 0016/1519] Catch bogus comparison types.

This fixes an ICE when trying to compare a function with a float.
---
 tools/qfcc/source/expr.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index 67307b0e2..f734710b2 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -1539,6 +1539,10 @@ binary_expr (int op, expr_t *e1, expr_t *e2)
 
 	type = t1;
 
+	if (is_compare (op)) {
+		if (!type_assignable (t1, t2))
+			return error (e1, "type mismatch for %s", get_op_string (op));
+	}
 	if (is_compare (op) || is_logic (op)) {
 		if (options.code.progsversion > PROG_ID_VERSION)
 			type = &type_integer;

From a6cdc8735a56aef602410edabfcc9cf821324fc2 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 24 Jun 2013 11:36:52 +0900
Subject: [PATCH 0017/1519] Start implementing vec = [x,y,z].

This is a nice feature found in fteqcc (also a bit of a challenge from
Spike). Getting bison to accept the new expression required rewriting the
state expression grammar, so this is mostly for the state expression. A
test to ensure the state expression doesn't break is included.
---
 tools/qfcc/include/expr.h      |  3 +-
 tools/qfcc/source/expr.c       | 30 +++++++++++++++++--
 tools/qfcc/source/qc-parse.y   | 34 ++++++++++------------
 tools/qfcc/test/Makefile.am    |  8 +++++
 tools/qfcc/test/state.r        | 53 ++++++++++++++++++++++++++++++++++
 tools/qfcc/test/test-bi.c      | 18 ++++++++++++
 tools/qfcc/test/test-harness.c |  2 +-
 tools/qfcc/test/test-harness.h |  6 ++++
 8 files changed, 131 insertions(+), 23 deletions(-)
 create mode 100644 tools/qfcc/test/state.r
 create mode 100644 tools/qfcc/test/test-harness.h

diff --git a/tools/qfcc/include/expr.h b/tools/qfcc/include/expr.h
index 819969afc..f4dd2d716 100644
--- a/tools/qfcc/include/expr.h
+++ b/tools/qfcc/include/expr.h
@@ -571,6 +571,7 @@ void convert_name (expr_t *e);
 
 expr_t *append_expr (expr_t *block, expr_t *e);
 
+expr_t *reverse_expr_list (expr_t *e);
 void print_expr (expr_t *e);
 void dump_dot_expr (void *e, const char *filename);
 
@@ -607,7 +608,7 @@ expr_t *build_do_while_statement (expr_t *statement, int not, expr_t *test,
 expr_t *build_for_statement (expr_t *init, expr_t *test, expr_t *next,
 							 expr_t *statement,
 							 expr_t *break_label, expr_t *continue_label);
-expr_t *build_state_expr (expr_t *frame, expr_t *think, expr_t *step);
+expr_t *build_state_expr (expr_t *e);
 expr_t *think_expr (struct symbol_s *think_sym);
 expr_t *assign_expr (expr_t *e1, expr_t *e2);
 expr_t *cast_expr (struct type_s *t, expr_t *e);
diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index f734710b2..d87b17ac4 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -2472,8 +2472,18 @@ build_for_statement (expr_t *init, expr_t *test, expr_t *next,
 }
 
 expr_t *
-build_state_expr (expr_t *frame, expr_t *think, expr_t *step)
+build_state_expr (expr_t *e)
 {
+	expr_t     *frame = 0;
+	expr_t     *think = 0;
+	expr_t     *step = 0;
+
+	e = reverse_expr_list (e);
+	frame = e;
+	think = frame->next;
+	step = think->next;
+	if (think->type == ex_symbol)
+		think = think_expr (think->e.symbol);
 	if (is_integer_val (frame))
 		convert_int (frame);
 	if (!type_assignable (&type_float, get_type (frame)))
@@ -2481,10 +2491,12 @@ build_state_expr (expr_t *frame, expr_t *think, expr_t *step)
 	if (extract_type (think) != ev_func)
 		return error (think, "invalid type for think");
 	if (step) {
+		if (step->next)
+			return error (step->next, "too many state arguments");
 		if (is_integer_val (step))
 			convert_int (step);
 		if (!type_assignable (&type_float, get_type (step)))
-			return error (step, "invalid type for frame number");
+			return error (step, "invalid type for step");
 	}
 	return new_state_expr (frame, think, step);
 }
@@ -2951,3 +2963,17 @@ sizeof_expr (expr_t *expr, struct type_s *type)
 	expr = new_integer_expr (type_size (type));
 	return expr;
 }
+
+expr_t *
+reverse_expr_list (expr_t *e)
+{
+	expr_t     *r = 0;
+
+	while (e) {
+		expr_t     *t = e->next;
+		e->next = r;
+		r = e;
+		e = t;
+	}
+	return r;
+}
diff --git a/tools/qfcc/source/qc-parse.y b/tools/qfcc/source/qc-parse.y
index 14937a811..a0be3c5d8 100644
--- a/tools/qfcc/source/qc-parse.y
+++ b/tools/qfcc/source/qc-parse.y
@@ -180,8 +180,8 @@ int yylex (void);
 %type	<symbol>	methoddef
 %type	<expr>		opt_initializer var_initializer local_def
 
-%type	<expr>		opt_expr fexpr expr element_list element
-%type	<expr>		optional_state_expr think opt_step texpr
+%type	<expr>		opt_expr fexpr expr element_list element vector_expr
+%type	<expr>		optional_state_expr texpr
 %type	<expr>		statement statements compound_statement
 %type	<expr>		else label break_label continue_label
 %type	<expr>		unary_expr cast_expr opt_arg_list arg_list
@@ -1026,23 +1026,7 @@ var_initializer
 
 optional_state_expr
 	: /* emtpy */						{ $$ = 0; }
-	| '[' fexpr ',' think opt_step ']'	{ $$ = build_state_expr ($2, $4, $5); }
-	;
-
-think
-	: identifier
-		{
-			$$ = think_expr ($1);
-		}
-	| '(' fexpr ')'
-		{
-			$$ = $2;
-		}
-	;
-
-opt_step
-	: ',' fexpr					{ $$ = $2; }
-	| /* empty */				{ $$ = 0; }
+	| vector_expr						{ $$ = build_state_expr ($1); }
 	;
 
 element_list
@@ -1261,9 +1245,21 @@ unary_expr
 		{
 			$$ = sizeof_expr (0, $3->type);
 		}
+	| vector_expr				{ $$ = $1; }
 	| obj_expr					{ $$ = $1; }
 	;
 
+vector_expr
+	: '[' fexpr ',' arg_list ']'
+		{
+			expr_t     *t = $4;
+			while (t->next)
+				t = t->next;
+			t->next = $2;
+			$$ = $4;
+		}
+	;
+
 cast_expr
 	: '(' abstract_decl ')' cast_expr
 		{
diff --git a/tools/qfcc/test/Makefile.am b/tools/qfcc/test/Makefile.am
index de5a7a078..eee7ba5be 100644
--- a/tools/qfcc/test/Makefile.am
+++ b/tools/qfcc/test/Makefile.am
@@ -28,6 +28,7 @@ test_progs_dat=\
 	paramret.dat \
 	return-ivar.dat \
 	sendv.dat \
+	state.dat \
 	structlive.dat \
 	structptr.dat \
 	vecinit.dat \
@@ -109,6 +110,13 @@ sendv.dat: $(sendv_obj) $(QFCC_DEP)
 sendv.run: Makefile build-run
 	$(srcdir)/build-run $@
 
+state_dat_SOURCES=state.r
+state_obj=$(state_dat_SOURCES:.r=.qfo)
+state.dat: $(state_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(state_obj)
+state.run: Makefile build-run
+	$(srcdir)/build-run $@
+
 structlive_dat_SOURCES=structlive.r
 structlive_obj=$(structlive_dat_SOURCES:.r=.qfo)
 structlive.dat: $(structlive_obj) $(QFCC_DEP)
diff --git a/tools/qfcc/test/state.r b/tools/qfcc/test/state.r
new file mode 100644
index 000000000..7fec3c2d0
--- /dev/null
+++ b/tools/qfcc/test/state.r
@@ -0,0 +1,53 @@
+#include "test-harness.h"
+
+.void() think;
+.float nextthink;
+.float frame;
+entity self;
+float time;
+
+$frame frame0 frame1 frame2 frame3
+
+void
+state0 (void)
+[$frame1, state1]
+{
+	if (self.frame != $frame1 || self.think != state1
+		|| self.nextthink != 0.1) {
+		printf ("state0: %g %x %g\n", self.frame, self.think, self.nextthink);
+		exit (1);
+	}
+}
+
+void
+state1 (void)
+[$frame2, state2, 0.2]
+{
+	if (self.frame != $frame2 || self.think != state2
+		|| self.nextthink != 0.2) {
+		printf ("state0: %g %x %g\n", self.frame, self.think, self.nextthink);
+		exit (1);
+	}
+}
+
+void
+state2 (void)
+[$frame0, state0, 0.5]
+{
+	if (self.frame != $frame0 || self.think != state0
+		|| self.nextthink != 0.5) {
+		printf ("state0: %g %x %g\n", self.frame, self.think, self.nextthink);
+		exit (1);
+	}
+}
+
+int
+main ()
+{
+	self = spawn ();
+	state0();
+	while (self.frame != $frame0) {
+		self.think();
+	}
+	return 0;
+}
diff --git a/tools/qfcc/test/test-bi.c b/tools/qfcc/test/test-bi.c
index a820aa9d8..bec2b247e 100644
--- a/tools/qfcc/test/test-bi.c
+++ b/tools/qfcc/test/test-bi.c
@@ -79,11 +79,29 @@ bi_exit (progs_t *pr)
 	exit (P_INT (pr, 0));
 }
 
+static void
+bi_spawn (progs_t *pr)
+{
+	edict_t    *ed;
+	ed = ED_Alloc (pr);
+	RETURN_EDICT (pr, ed);
+}
+
+static void
+bi_remove (progs_t *pr)
+{
+	edict_t    *ed;
+	ed = P_EDICT (pr, 0);
+	ED_Free (pr, ed);
+}
+
 static builtin_t builtins[] = {
 	{"printf",		bi_printf,		-1},
 	{"errno",		bi_errno,		-1},
 	{"strerror",	bi_strerror,	-1},
 	{"exit",		bi_exit,		-1},
+	{"spawn",		bi_spawn,		-1},
+	{"remove",		bi_remove,		-1},
 	{0}
 };
 
diff --git a/tools/qfcc/test/test-harness.c b/tools/qfcc/test/test-harness.c
index eff3ff9a4..87cd26c55 100644
--- a/tools/qfcc/test/test-harness.c
+++ b/tools/qfcc/test/test-harness.c
@@ -165,7 +165,7 @@ load_progs (const char *name)
 		return 0;
 	}
 	pr.progs_name = name;
-	PR_LoadProgsFile (&pr, file, size, 1, 1024 * 1024);
+	PR_LoadProgsFile (&pr, file, size, 16, 1024 * 1024);
 	Qclose (file);
 	if (!PR_RunLoadFuncs (&pr))
 		PR_Error (&pr, "unable to load %s", pr.progs_name);
diff --git a/tools/qfcc/test/test-harness.h b/tools/qfcc/test/test-harness.h
new file mode 100644
index 000000000..959910534
--- /dev/null
+++ b/tools/qfcc/test/test-harness.h
@@ -0,0 +1,6 @@
+void printf (string fmt, ...) = #0;
+int errno (void) = #0;
+string strerror (int err) = #0;
+void exit (int code) = #0;
+entity spawn (void) = #0;
+void remove (entity e) = #0;

From c197d6a4f970821927f6af5b512226fee8997d95 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 24 Jun 2013 11:43:57 +0900
Subject: [PATCH 0018/1519] Ignore the new test-driver link.

It seems to have come with automake 1.13.
---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 5d6dd8c0a..b3bca858c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,6 +37,7 @@ core
 /mkinstalldirs
 /quakeforge-config
 /quakeforge.lsm
+/test-driver
 /ylwrap
 
 # /RPM/

From 2572811bf464755a3313daa54a033e8d3c8fde50 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 24 Jun 2013 15:33:21 +0900
Subject: [PATCH 0019/1519] Add support for quaternion.w/x/y/z.

It's sometimes more useful to have direct access to each individual
component of the imaginary part of the quaternion, and then for
consistency, alias w and s.
---
 tools/qfcc/source/type.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/tools/qfcc/source/type.c b/tools/qfcc/source/type.c
index 92d63b11f..51615e9d7 100644
--- a/tools/qfcc/source/type.c
+++ b/tools/qfcc/source/type.c
@@ -885,6 +885,21 @@ init_types (void)
 	make_structure ("@quaternion", 's', quaternion_struct, &type_quaternion);
 	type_quaternion.type = ev_quat;
 	type_quaternion.meta = ty_none;
+	{
+		symbol_t   *sym;
+		sym = new_symbol_type ("w", &type_float);
+		sym->s.offset = 0;
+		symtab_addsymbol (type_quaternion.t.symtab, sym);
+		sym = new_symbol_type ("x", &type_float);
+		sym->s.offset = 1;
+		symtab_addsymbol (type_quaternion.t.symtab, sym);
+		sym = new_symbol_type ("y", &type_float);
+		sym->s.offset = 2;
+		symtab_addsymbol (type_quaternion.t.symtab, sym);
+		sym = new_symbol_type ("z", &type_float);
+		sym->s.offset = 3;
+		symtab_addsymbol (type_quaternion.t.symtab, sym);
+	}
 }
 
 void

From 7a7a68510542f29b597288889f5dbd7340a768fe Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 24 Jun 2013 15:37:08 +0900
Subject: [PATCH 0020/1519] Add support for actual vector expressions.

Currently, they can represent either vectors or quaternions, and the
quaternions can be in either [s, v] form or [w, x, y, z] form.

Many things will not actual work yet as the vector expression needs to be
converted into the appropriate form for assigning the elements to the
components of the "vector" type.
---
 tools/qfcc/include/expr.h      |  8 +++++
 tools/qfcc/source/dot_expr.c   |  9 ++++++
 tools/qfcc/source/expr.c       | 57 ++++++++++++++++++++++++++++++++++
 tools/qfcc/source/qc-parse.y   |  2 +-
 tools/qfcc/source/statements.c |  2 ++
 5 files changed, 77 insertions(+), 1 deletion(-)

diff --git a/tools/qfcc/include/expr.h b/tools/qfcc/include/expr.h
index f4dd2d716..5729e316e 100644
--- a/tools/qfcc/include/expr.h
+++ b/tools/qfcc/include/expr.h
@@ -51,6 +51,7 @@ typedef enum {
 	ex_uexpr,		///< unary expression (::ex_expr_t)
 	ex_symbol,		///< non-temporary variable (::symbol_t)
 	ex_temp,		///< temporary variable (::ex_temp_t)
+	ex_vector,		///< "vector" expression (::ex_vector_t)
 
 	ex_nil,			///< umm, nil, null. nuff said (0 of any type)
 	ex_value,		///< constant value (::ex_value_t)
@@ -96,6 +97,11 @@ typedef struct {
 	struct type_s *type;	///< The type of the temporary variable.
 } ex_temp_t;
 
+typedef struct {
+	struct type_s *type;	///< Type of vector (vector/quaternion)
+	struct expr_s *list;	///< Linked list of element expressions.
+} ex_vector_t;
+
 /**	Pointer constant expression.
 
 	Represent a pointer to an absolute address in data space.
@@ -199,6 +205,7 @@ typedef struct expr_s {
 		ex_expr_t   expr;				///< binary or unary expression
 		struct symbol_s *symbol;		///< symbol reference expression
 		ex_temp_t   temp;				///< temporary variable expression
+		ex_vector_t vector;				///< vector expression list
 		ex_value_t *value;				///< constant value
 	} e;
 } expr_t;
@@ -396,6 +403,7 @@ float expr_float (expr_t *e);
 */
 expr_t *new_vector_expr (const float *vector_val);
 const float *expr_vector (expr_t *e);
+expr_t *new_vector_list (expr_t *e);
 
 /** Create a new entity constant expression node.
 
diff --git a/tools/qfcc/source/dot_expr.c b/tools/qfcc/source/dot_expr.c
index aaf5b8706..301086dba 100644
--- a/tools/qfcc/source/dot_expr.c
+++ b/tools/qfcc/source/dot_expr.c
@@ -361,6 +361,14 @@ print_temp (dstring_t *dstr, expr_t *e, int level, int id, expr_t *next)
 			   e->line);
 }
 
+static void
+print_vector (dstring_t *dstr, expr_t *e, int level, int id, expr_t *next)
+{
+	int         indent = level * 2 + 2;
+
+	dasprintf (dstr, "%*se_%p [label=\"vector FIXME\"];\n", indent, "", e);
+}
+
 static void
 print_nil (dstring_t *dstr, expr_t *e, int level, int id, expr_t *next)
 {
@@ -455,6 +463,7 @@ _print_expr (dstring_t *dstr, expr_t *e, int level, int id, expr_t *next)
 		print_uexpr,
 		print_symbol,
 		print_temp,
+		print_vector,
 		print_nil,
 		print_value,
 	};
diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index d87b17ac4..2efa90cd3 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -178,6 +178,8 @@ get_type (expr_t *e)
 				convert_int (e);
 			}
 			return ev_types[e->e.value->type];
+		case ex_vector:
+			return e->e.vector.type;
 	}
 	return 0;
 }
@@ -355,6 +357,18 @@ copy_expr (expr_t *e)
 			n->file = pr.source_file;
 			n->e.temp.expr = copy_expr (e->e.temp.expr);
 			return n;
+		case ex_vector:
+			n = new_expr ();
+			n->e.vector.type = e->e.vector.type;
+			n->e.vector.list = copy_expr (e->e.vector.list);
+			n = n->e.vector.list;
+			t = e->e.vector.list;
+			while (t->next) {
+				n->next = copy_expr (t->next);
+				n = n->next;
+				t = t->next;
+			}
+			return n;
 	}
 	internal_error (e, "invalid expression");
 }
@@ -546,6 +560,46 @@ new_vector_expr (const float *vector_val)
 	return e;
 }
 
+expr_t *
+new_vector_list (expr_t *e)
+{
+	expr_t     *t;
+	int         count;
+	type_t     *type = &type_vector;
+	expr_t     *vec;
+
+	e = reverse_expr_list (e);		// put the elements in the right order
+	for (t = e, count = 0; t; t = t->next)
+		count++;
+	switch (count) {
+		case 4:
+			type = &type_quaternion;
+		case 3:
+			// quaternion or vector. all expressions must be compatible with
+			// a float
+			for (t = e; t; t = t->next)
+				if (!type_assignable (&type_float, get_type (t)))
+					return error (t, "invalid type for vector element");
+			vec = new_expr ();
+			vec->type = ex_vector;
+			vec->e.vector.type = type;
+			vec->e.vector.list = e;
+			break;
+		case 2:
+			// quaternion. first expression must be compatible with a float,
+			// the other must be a vector
+			if (!type_assignable (&type_float, get_type (e))
+				|| type_assignable (&type_vector, get_type(e->next))) {
+				return error (t, "invalid types for vector elements");
+			}
+			// s, v
+			break;
+		default:
+			return error (e, "invalid number of elements in vector exprssion");
+	}
+	return vec;
+}
+
 expr_t *
 new_entity_expr (int entity_val)
 {
@@ -1669,6 +1723,7 @@ unary_expr (int op, expr_t *e)
 				case ex_expr:
 				case ex_bool:
 				case ex_temp:
+				case ex_vector:
 					{
 						expr_t     *n = new_unary_expr (op, e);
 
@@ -1733,6 +1788,7 @@ unary_expr (int op, expr_t *e)
 				case ex_expr:
 				case ex_symbol:
 				case ex_temp:
+				case ex_vector:
 					{
 						expr_t     *n = new_unary_expr (op, e);
 
@@ -1793,6 +1849,7 @@ unary_expr (int op, expr_t *e)
 				case ex_bool:
 				case ex_symbol:
 				case ex_temp:
+				case ex_vector:
 bitnot_expr:
 					if (options.code.progsversion == PROG_ID_VERSION) {
 						expr_t     *n1 = new_integer_expr (-1);
diff --git a/tools/qfcc/source/qc-parse.y b/tools/qfcc/source/qc-parse.y
index a0be3c5d8..bf2ff86f4 100644
--- a/tools/qfcc/source/qc-parse.y
+++ b/tools/qfcc/source/qc-parse.y
@@ -1245,7 +1245,7 @@ unary_expr
 		{
 			$$ = sizeof_expr (0, $3->type);
 		}
-	| vector_expr				{ $$ = $1; }
+	| vector_expr				{ $$ = new_vector_list ($1); }
 	| obj_expr					{ $$ = $1; }
 	;
 
diff --git a/tools/qfcc/source/statements.c b/tools/qfcc/source/statements.c
index de425b0dd..ac4b140f1 100644
--- a/tools/qfcc/source/statements.c
+++ b/tools/qfcc/source/statements.c
@@ -1005,6 +1005,7 @@ statement_subexpr (sblock_t *sblock, expr_t *e, operand_t **op)
 		expr_uexpr,
 		expr_symbol,
 		expr_temp,
+		0,					// ex_vector
 		0,					// ex_nil
 		expr_value,
 	};
@@ -1287,6 +1288,7 @@ statement_slist (sblock_t *sblock, expr_t *e)
 		statement_uexpr,
 		statement_nonexec,	// ex_symbol
 		statement_nonexec,	// ex_temp
+		statement_nonexec,	// ex_vector
 		statement_nonexec,	// ex_nil
 		statement_nonexec,	// ex_value
 	};

From 7f50333b2c089f4844d4f7ffe7fa9b004e9422aa Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 24 Jun 2013 15:42:11 +0900
Subject: [PATCH 0021/1519] Add support for constant [] vector expressions.

---
 tools/qfcc/include/expr.h |  2 ++
 tools/qfcc/source/expr.c  | 60 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+)

diff --git a/tools/qfcc/include/expr.h b/tools/qfcc/include/expr.h
index 5729e316e..cb84ac691 100644
--- a/tools/qfcc/include/expr.h
+++ b/tools/qfcc/include/expr.h
@@ -577,6 +577,8 @@ expr_t *new_move_expr (expr_t *e1, expr_t *e2, struct type_s *type,
 */
 void convert_name (expr_t *e);
 
+expr_t *convert_vector (expr_t *e);
+
 expr_t *append_expr (expr_t *block, expr_t *e);
 
 expr_t *reverse_expr_list (expr_t *e);
diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index 2efa90cd3..2b9bb58d3 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -138,6 +138,65 @@ convert:
 	e->e = new->e;
 }
 
+expr_t *
+convert_vector (expr_t *e)
+{
+	float       val[4];
+
+	if (e->type != ex_vector)
+		return e;
+	if (e->e.vector.type == &type_vector) {
+		// guaranteed to have three elements
+		expr_t     *x = e->e.vector.list;
+		expr_t     *y = x->next;
+		expr_t     *z = y->next;
+		x = fold_constants (cast_expr (&type_float, x));
+		y = fold_constants (cast_expr (&type_float, y));
+		z = fold_constants (cast_expr (&type_float, z));
+		if (is_constant (x) && is_constant (y) && is_constant (z)) {
+			val[0] = expr_float(x);
+			val[1] = expr_float(y);
+			val[2] = expr_float(z);
+			return new_vector_expr (val);
+		}
+	}
+	if (e->e.vector.type == &type_quaternion) {
+		// guaranteed to have two or four elements
+		if (e->e.vector.list->next->next) {
+			// four vals: w, x, y, z
+			expr_t     *w = e->e.vector.list;
+			expr_t     *x = w->next;
+			expr_t     *y = x->next;
+			expr_t     *z = y->next;
+			w = fold_constants (cast_expr (&type_float, w));
+			x = fold_constants (cast_expr (&type_float, x));
+			y = fold_constants (cast_expr (&type_float, y));
+			z = fold_constants (cast_expr (&type_float, z));
+			if (is_constant (w) && is_constant (x) && is_constant (y)
+				&& is_constant (z)) {
+				val[0] = expr_float(w);
+				val[1] = expr_float(x);
+				val[2] = expr_float(y);
+				val[3] = expr_float(z);
+				return new_quaternion_expr (val);
+			}
+		} else {
+			// s, v
+			expr_t     *s = e->e.vector.list;
+			expr_t     *v = s->next;
+
+			s = fold_constants (cast_expr (&type_float, s));
+			v = convert_vector (v);
+			if (is_constant (s) && is_constant (v)) {
+				val[0] = expr_float (s);
+				memcpy (val + 1, expr_vector (v), 3 * sizeof (float));
+				return new_quaternion_expr (val);
+			}
+		}
+	}
+	internal_error (e, "bogus vector expression");
+}
+
 type_t *
 get_type (expr_t *e)
 {
@@ -2636,6 +2695,7 @@ assign_expr (expr_t *e1, expr_t *e2)
 
 	convert_name (e1);
 	convert_name (e2);
+	e2 = convert_vector (e2);
 
 	if (e1->type == ex_error)
 		return e1;

From c13f2c2c233053098264327ca03e56c7c480656e Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 24 Jun 2013 15:52:24 +0900
Subject: [PATCH 0022/1519] Fix the support for [s, v] for quaterions.

---
 tools/qfcc/source/expr.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index 2b9bb58d3..4d4f37e31 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -648,10 +648,14 @@ new_vector_list (expr_t *e)
 			// quaternion. first expression must be compatible with a float,
 			// the other must be a vector
 			if (!type_assignable (&type_float, get_type (e))
-				|| type_assignable (&type_vector, get_type(e->next))) {
+				|| !type_assignable (&type_vector, get_type(e->next))) {
 				return error (t, "invalid types for vector elements");
 			}
 			// s, v
+			vec = new_expr ();
+			vec->type = ex_vector;
+			vec->e.vector.type = &type_quaternion;
+			vec->e.vector.list = e;
 			break;
 		default:
 			return error (e, "invalid number of elements in vector exprssion");

From b66cbeeb57730f9f6be37814e7cbcde4e3751241 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 27 Jun 2013 09:24:56 +0900
Subject: [PATCH 0023/1519] Run fold_constants on comparison operands.

This is a bit of a workaround to ensure the operands have their types
setup correctly. Really, binary_expr needs to handle expression types
properly.

This fixes the bogus error for comparing the result of pointer subtraction
with an integer.
---
 tools/qfcc/source/expr.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index 4d4f37e31..f44344084 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -1626,6 +1626,10 @@ binary_expr (int op, expr_t *e1, expr_t *e2)
 		e1 = test_expr (e1);
 		e2 = test_expr (e2);
 	}
+	if (is_compare (op)) {
+		e1 = fold_constants (e1);
+		e2 = fold_constants (e2);
+	}
 
 	if (e1->type == ex_error)
 		return e1;

From ca9693d9cdff7269f353de4b298d0d06010033e3 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 27 Sep 2013 17:41:20 +0900
Subject: [PATCH 0024/1519] Expose convert_from_bool().

---
 tools/qfcc/include/expr.h | 1 +
 tools/qfcc/source/expr.c  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/qfcc/include/expr.h b/tools/qfcc/include/expr.h
index cb84ac691..3b991799b 100644
--- a/tools/qfcc/include/expr.h
+++ b/tools/qfcc/include/expr.h
@@ -593,6 +593,7 @@ void convert_nil (expr_t *e, struct type_s *t);
 expr_t *test_expr (expr_t *e);
 void backpatch (ex_list_t *list, expr_t *label);
 expr_t *convert_bool (expr_t *e, int block);
+expr_t *convert_from_bool (expr_t *e, struct type_s *type);
 expr_t *bool_expr (int op, expr_t *label, expr_t *e1, expr_t *e2);
 expr_t *binary_expr (int op, expr_t *e1, expr_t *e2);
 expr_t *asx_expr (int op, expr_t *e1, expr_t *e2);
diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index f44344084..d8111ead5 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -1363,7 +1363,7 @@ convert_bool (expr_t *e, int block)
 	return e;
 }
 
-static expr_t *
+expr_t *
 convert_from_bool (expr_t *e, type_t *type)
 {
 	expr_t     *zero;

From 3295370328a7a5e53ffbcda51f82fc053dbe9bdb Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 27 Sep 2013 17:43:33 +0900
Subject: [PATCH 0025/1519] Expose and use field_expr().

This may cause problems later on, but it is needed for the binary_expr()
cleanup.
---
 tools/qfcc/include/expr.h      |  1 +
 tools/qfcc/source/class.c      |  4 ++--
 tools/qfcc/source/def.c        |  4 ++--
 tools/qfcc/source/expr.c       | 14 +++++++-------
 tools/qfcc/source/qc-parse.y   |  2 +-
 tools/qfcc/source/statements.c |  2 +-
 6 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/tools/qfcc/include/expr.h b/tools/qfcc/include/expr.h
index 3b991799b..8973f810b 100644
--- a/tools/qfcc/include/expr.h
+++ b/tools/qfcc/include/expr.h
@@ -596,6 +596,7 @@ expr_t *convert_bool (expr_t *e, int block);
 expr_t *convert_from_bool (expr_t *e, struct type_s *type);
 expr_t *bool_expr (int op, expr_t *label, expr_t *e1, expr_t *e2);
 expr_t *binary_expr (int op, expr_t *e1, expr_t *e2);
+expr_t *field_expr (expr_t *e1, expr_t *e2);
 expr_t *asx_expr (int op, expr_t *e1, expr_t *e2);
 expr_t *unary_expr (int op, expr_t *e);
 expr_t *build_function_call (expr_t *fexpr, struct type_s *ftype,
diff --git a/tools/qfcc/source/class.c b/tools/qfcc/source/class.c
index 65517b356..a7898e5db 100644
--- a/tools/qfcc/source/class.c
+++ b/tools/qfcc/source/class.c
@@ -1576,8 +1576,8 @@ class_finish_ivar_scope (class_type_t *class_type, symtab_t *ivar_scope,
 		if (sym->sy_type != sy_var)
 			continue;
 		sym->sy_type = sy_expr;
-		sym->s.expr = binary_expr ('.', copy_expr (self_expr),
-								   new_symbol_expr (new_symbol (sym->name)));
+		sym->s.expr = field_expr (copy_expr (self_expr),
+								  new_symbol_expr (new_symbol (sym->name)));
 	}
 }
 
diff --git a/tools/qfcc/source/def.c b/tools/qfcc/source/def.c
index e26105f3d..c16aa9912 100644
--- a/tools/qfcc/source/def.c
+++ b/tools/qfcc/source/def.c
@@ -426,8 +426,8 @@ init_vector_components (symbol_t *vector_sym, int is_field)
 			if (is_field) {
 				expr = new_field_expr (i, &type_float, vector_sym->s.def);
 			} else {
-				expr = binary_expr ('.', vector_expr,
-									new_symbol_expr (new_symbol (fields[i])));
+				expr = field_expr (vector_expr,
+								   new_symbol_expr (new_symbol (fields[i])));
 			}
 		}
 		sym->sy_type = sy_expr;
diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index d8111ead5..e85817d1e 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -1075,7 +1075,7 @@ get_struct_field (type_t *t1, expr_t *e1, expr_t *e2)
 	return field;
 }
 
-static expr_t *
+expr_t *
 field_expr (expr_t *e1, expr_t *e2)
 {
 	type_t     *t1, *t2;
@@ -2756,10 +2756,10 @@ assign_expr (expr_t *e1, expr_t *e2)
 				warning (e1, "assignment between disparate function types");
 			} else if (t1->type == ev_float && t2->type == ev_vector) {
 				warning (e1, "assignment of vector to float");
-				e2 = binary_expr ('.', e2, new_name_expr ("x"));
+				e2 = field_expr (e2, new_name_expr ("x"));
 			} else if (t1->type == ev_vector && t2->type == ev_float) {
 				warning (e1, "assignment of float to vector");
-				e1 = binary_expr ('.', e1, new_name_expr ("x"));
+				e1 = field_expr (e1, new_name_expr ("x"));
 			} else {
 				return type_mismatch (e1, e2, op);
 			}
@@ -2972,13 +2972,13 @@ super_expr (class_type_t *class_type)
 
 	super_block = new_block_expr ();
 
-	e = assign_expr (binary_expr ('.', super, new_name_expr ("self")),
-								  new_name_expr ("self"));
+	e = assign_expr (field_expr (super, new_name_expr ("self")),
+								 new_name_expr ("self"));
 	append_expr (super_block, e);
 
 	e = new_symbol_expr (class_pointer_symbol (class));
-	e = assign_expr (binary_expr ('.', super, new_name_expr ("class")),
-					 binary_expr ('.', e, new_name_expr ("super_class")));
+	e = assign_expr (field_expr (super, new_name_expr ("class")),
+					 field_expr (e, new_name_expr ("super_class")));
 	append_expr (super_block, e);
 
 	e = address_expr (super, 0, 0);
diff --git a/tools/qfcc/source/qc-parse.y b/tools/qfcc/source/qc-parse.y
index bf2ff86f4..2ab9d4144 100644
--- a/tools/qfcc/source/qc-parse.y
+++ b/tools/qfcc/source/qc-parse.y
@@ -1231,7 +1231,7 @@ unary_expr
 	| '(' expr ')'				{ $$ = $2; $$->paren = 1; }
 	| unary_expr '(' opt_arg_list ')' { $$ = function_expr ($1, $3); }
 	| unary_expr '[' expr ']'		{ $$ = array_expr ($1, $3); }
-	| unary_expr '.' unary_expr		{ $$ = binary_expr ('.', $1, $3); }
+	| unary_expr '.' unary_expr		{ $$ = field_expr ($1, $3); }
 	| INCOP unary_expr				{ $$ = incop_expr ($1, $2, 0); }
 	| unary_expr INCOP				{ $$ = incop_expr ($2, $1, 1); }
 	| '+' cast_expr %prec UNARY	{ $$ = $2; }
diff --git a/tools/qfcc/source/statements.c b/tools/qfcc/source/statements.c
index ac4b140f1..e1606705e 100644
--- a/tools/qfcc/source/statements.c
+++ b/tools/qfcc/source/statements.c
@@ -624,7 +624,7 @@ vector_call (sblock_t *sblock, expr_t *earg, expr_t *param, int ind,
 	for (i = 0; i < 3; i++) {
 		n = new_name_expr (names[i]);
 		v = new_float_expr (earg->e.value->v.vector_val[i]);
-		a = assign_expr (binary_expr ('.', param, n), v);
+		a = assign_expr (field_expr (param, n), v);
 		param = new_param_expr (get_type (earg), ind);
 		a->line = earg->line;
 		a->file = earg->file;

From ec98954dfc6bcd666b3766cdac2276c985887c60 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 27 Sep 2013 17:44:29 +0900
Subject: [PATCH 0026/1519] Remove the small struct optimization.

It might cause trouble for the binary_expr() cleanup.
---
 tools/qfcc/source/type.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/tools/qfcc/source/type.c b/tools/qfcc/source/type.c
index 51615e9d7..586a7b1a0 100644
--- a/tools/qfcc/source/type.c
+++ b/tools/qfcc/source/type.c
@@ -101,13 +101,8 @@ low_level_type (type_t *type)
 		return type->type;
 	if (is_enum (type))
 		return type_default->type;
-	if (is_struct (type)) {
-		//FIXME does this break anything?
-		//maybe the peephole optimizer should do this sort of thing.
-		if (type_size (type) == 1)
-			return ev_integer;
+	if (is_struct (type))
 		return ev_void;
-	}
 	if (is_array (type))
 		return ev_void;
 	internal_error (0, "invalid complex type");

From 4bc40b39171dc71dbf9a91c3f1577004425d0c1d Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 27 Sep 2013 17:48:06 +0900
Subject: [PATCH 0027/1519] Rewrite binary_expr().

It is now in its own file and uses table lookups to check for valid type
and operator combinations, and also the resulting type of the expression.

This probably breaks multiple function calls in the one expression.
---
 tools/qfcc/source/Makefile.am   |   3 +-
 tools/qfcc/source/expr.c        | 201 --------
 tools/qfcc/source/expr_binary.c | 787 ++++++++++++++++++++++++++++++++
 3 files changed, 789 insertions(+), 202 deletions(-)
 create mode 100644 tools/qfcc/source/expr_binary.c

diff --git a/tools/qfcc/source/Makefile.am b/tools/qfcc/source/Makefile.am
index b2c5f0711..b5674b614 100644
--- a/tools/qfcc/source/Makefile.am
+++ b/tools/qfcc/source/Makefile.am
@@ -41,7 +41,8 @@ bin_SCRIPTS=	qfpreqcc
 common_src=\
 	class.c codespace.c constfold.c cpp.c dags.c debug.c def.c defspace.c \
 	diagnostic.c dot.c dot_dag.c dot_expr.c dot_flow.c dot_sblock.c emit.c \
-	expr.c flow.c function.c grab.c idstuff.c linker.c method.c obj_file.c \
+	expr.c expr_binary.c flow.c function.c grab.c idstuff.c linker.c method.c \
+	obj_file.c \
 	obj_type.c opcodes.c options.c pragma.c qfcc.c reloc.c shared.c \
 	statements.c strpool.c struct.c switch.c symtab.c type.c value.c
 
diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index e85817d1e..bc5ba5a6e 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -1488,91 +1488,6 @@ is_logic (int op)
 	return 0;
 }
 
-static expr_t *
-check_precedence (int op, expr_t *e1, expr_t *e2)
-{
-	if (e1->type == ex_uexpr && e1->e.expr.op == '!' && !e1->paren) {
-		if (options.traditional) {
-			if (op != AND && op != OR && op != '=') {
-				notice (e1, "precedence of `!' and `%s' inverted for "
-							"traditional code", get_op_string (op));
-				e1->e.expr.e1->paren = 1;
-				return unary_expr ('!', binary_expr (op, e1->e.expr.e1, e2));
-			}
-		} else if (op == '&' || op == '|') {
-			if (options.warnings.precedence)
-				warning (e1, "ambiguous logic. Suggest explicit parentheses "
-						 "with expressions involving ! and %s",
-						 get_op_string (op));
-		}
-	}
-	if (options.traditional) {
-		if (e2->type == ex_expr && !e2->paren) {
-			if (((op == '&' || op == '|')
-				 && (is_math_op (e2->e.expr.op) || is_compare (e2->e.expr.op)))
-				|| (op == '='
-					&& (e2->e.expr.op == OR || e2->e.expr.op == AND))) {
-				notice (e1, "precedence of `%s' and `%s' inverted for "
-							"traditional code", get_op_string (op),
-							get_op_string (e2->e.expr.op));
-				e1 = binary_expr (op, e1, e2->e.expr.e1);
-				e1->paren = 1;
-				return binary_expr (e2->e.expr.op, e1, e2->e.expr.e2);
-			}
-			if (((op == EQ || op == NE) && is_compare (e2->e.expr.op))
-				|| (op == OR && e2->e.expr.op == AND)
-				|| (op == '|' && e2->e.expr.op == '&')) {
-				notice (e1, "precedence of `%s' raised to `%s' for "
-							"traditional code", get_op_string (op),
-							get_op_string (e2->e.expr.op));
-				e1 = binary_expr (op, e1, e2->e.expr.e1);
-				e1->paren = 1;
-				return binary_expr (e2->e.expr.op, e1, e2->e.expr.e2);
-			}
-		} else if (e1->type == ex_expr && !e1->paren) {
-			if (((op == '&' || op == '|')
-				 && (is_math_op (e1->e.expr.op) || is_compare (e1->e.expr.op)))
-				|| (op == '='
-					&& (e1->e.expr.op == OR || e1->e.expr.op == AND))) {
-				notice (e1, "precedence of `%s' and `%s' inverted for "
-							"traditional code", get_op_string (op),
-							get_op_string (e1->e.expr.op));
-				e2 = binary_expr (op, e1->e.expr.e2, e2);
-				e2->paren = 1;
-				return binary_expr (e1->e.expr.op, e1->e.expr.e1, e2);
-			}
-		}
-	} else {
-		if (e2->type == ex_expr && !e2->paren) {
-			if ((op == '&' || op == '|' || op == '^')
-				&& (is_math_op (e2->e.expr.op)
-					|| is_compare (e2->e.expr.op))) {
-				if (options.warnings.precedence)
-					warning (e2, "suggest parentheses around %s in "
-							 "operand of %c",
-							 is_compare (e2->e.expr.op)
-							 		? "comparison"
-							 		: get_op_string (e2->e.expr.op),
-							 op);
-			}
-		}
-		if (e1->type == ex_expr && !e1->paren) {
-			if ((op == '&' || op == '|' || op == '^')
-				&& (is_math_op (e1->e.expr.op)
-					|| is_compare (e1->e.expr.op))) {
-				if (options.warnings.precedence)
-					warning (e1, "suggest parentheses around %s in "
-							 "operand of %c",
-							 is_compare (e1->e.expr.op)
-							 		? "comparison"
-							 		: get_op_string (e1->e.expr.op),
-							 op);
-			}
-		}
-	}
-	return 0;
-}
-
 static int
 has_function_call (expr_t *e)
 {
@@ -1599,122 +1514,6 @@ has_function_call (expr_t *e)
 	}
 }
 
-expr_t *
-binary_expr (int op, expr_t *e1, expr_t *e2)
-{
-	type_t     *t1, *t2;
-	type_t     *type = 0;
-	expr_t     *e;
-
-	if (e1->type == ex_error)
-		return e1;
-	if (e2->type == ex_error)
-		return e2;
-
-	convert_name (e1);
-	if (e1->type == ex_block && e1->e.block.is_call
-		&& has_function_call (e2) && e1->e.block.result) {
-		e = new_temp_def_expr (get_type (e1->e.block.result));
-		e1 = assign_expr (e, e1);
-	}
-
-	if (op == '.')
-		return field_expr (e1, e2);
-
-	convert_name (e2);
-	if (op == OR || op == AND) {
-		e1 = test_expr (e1);
-		e2 = test_expr (e2);
-	}
-	if (is_compare (op)) {
-		e1 = fold_constants (e1);
-		e2 = fold_constants (e2);
-	}
-
-	if (e1->type == ex_error)
-		return e1;
-	if (e2->type == ex_error)
-		return e2;
-	t1 = get_type (e1);
-	t2 = get_type (e2);
-	if (!t1 || !t2)
-		internal_error (e1, 0);
-	if (op == EQ || op == NE) {
-		if (e1->type == ex_nil) {
-			t1 = t2;
-			convert_nil (e1, t1);
-		} else if (e2->type == ex_nil) {
-			t2 = t1;
-			convert_nil (e2, t2);
-		}
-	}
-
-	if (e1->type == ex_bool)
-		e1 = convert_from_bool (e1, t2);
-
-	if (e2->type == ex_bool)
-		e2 = convert_from_bool (e2, t1);
-
-	if ((e = check_precedence (op, e1, e2)))
-		return e;
-
-	type = t1;
-
-	if (is_compare (op)) {
-		if (!type_assignable (t1, t2))
-			return error (e1, "type mismatch for %s", get_op_string (op));
-	}
-	if (is_compare (op) || is_logic (op)) {
-		if (options.code.progsversion > PROG_ID_VERSION)
-			type = &type_integer;
-		else
-			type = &type_float;
-	} else if (op == '*' && t1 == &type_vector && t2 == &type_vector) {
-		type = &type_float;
-	}
-	if (!type)
-		internal_error (e1, 0);
-
-	if (options.code.progsversion == PROG_ID_VERSION) {
-		switch (op) {
-			case '%':
-				{
-					expr_t     *tmp1, *tmp2, *tmp3, *tmp4, *t1, *t2;
-					e = new_block_expr ();
-					t1 = new_temp_def_expr (&type_float);
-					t2 = new_temp_def_expr (&type_float);
-					tmp1 = new_temp_def_expr (&type_float);
-					tmp2 = new_temp_def_expr (&type_float);
-					tmp3 = new_temp_def_expr (&type_float);
-					tmp4 = new_temp_def_expr (&type_float);
-
-					append_expr (e, assign_expr (t1, e1));
-					e1 = binary_expr ('&', t1, t1);
-					append_expr (e, assign_expr (tmp1, e1));
-
-					append_expr (e, assign_expr (t2, e2));
-					e2 = binary_expr ('&', t2, t2);
-					append_expr (e, assign_expr (tmp2, e2));
-
-					e1 = binary_expr ('/', tmp1, tmp2);
-					append_expr (e, assign_expr (tmp3, e1));
-
-					e2 = binary_expr ('&', tmp3, tmp3);
-					append_expr (e, assign_expr (tmp4, e2));
-
-					e1 = binary_expr ('*', tmp2, tmp4);
-					e2 = binary_expr ('-', tmp1, e1);
-					e->e.block.result = e2;
-					return e;
-				}
-				break;
-		}
-	}
-	e = new_binary_expr (op, e1, e2);
-	e->e.expr.type = type;
-	return e;
-}
-
 expr_t *
 asx_expr (int op, expr_t *e1, expr_t *e2)
 {
diff --git a/tools/qfcc/source/expr_binary.c b/tools/qfcc/source/expr_binary.c
new file mode 100644
index 000000000..d9f6f43b0
--- /dev/null
+++ b/tools/qfcc/source/expr_binary.c
@@ -0,0 +1,787 @@
+/*
+	exprtype.c
+
+	Expression type manipulation
+
+	Copyright (C) 2013 Bill Currie <bill@taniwha.org>
+
+	Author: Bill Currie <bill@taniwha.org>
+	Date: 2013/06/27
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include "diagnostic.h"
+#include "expr.h"
+#include "options.h"
+#include "type.h"
+#include "qc-parse.h"
+
+typedef struct {
+	int         op;
+	type_t     *type;
+	type_t     *a_cast;
+	type_t     *b_cast;
+} expr_type_t;
+
+static expr_type_t string_string[] = {
+	{'+',	&type_string},
+	{EQ,	&type_integer},
+	{NE,	&type_integer},
+	{LE,	&type_integer},
+	{GE,	&type_integer},
+	{LT,	&type_integer},
+	{GT,	&type_integer},
+	{0, 0}
+};
+
+static expr_type_t float_float[] = {
+	{'+',	&type_float},
+	{'-',	&type_float},
+	{'*',	&type_float},
+	{'/',	&type_float},
+	{'&',	&type_float},
+	{'|',	&type_float},
+	{'^',	&type_float},
+	{'%',	&type_float},
+	{SHL,	&type_float},
+	{SHR,	&type_float},
+	{EQ,	&type_integer},
+	{NE,	&type_integer},
+	{LE,	&type_integer},
+	{GE,	&type_integer},
+	{LT,	&type_integer},
+	{GT,	&type_integer},
+	{0, 0}
+};
+
+static expr_type_t float_vector[] = {
+	{'*',	&type_vector},
+	{0, 0}
+};
+
+static expr_type_t float_quat[] = {
+	{'*',	&type_quaternion},
+	{'/',	&type_quaternion},
+	{0, 0}
+};
+
+static expr_type_t float_integer[] = {
+	{'+',	&type_float, 0, &type_float},
+	{'-',	&type_float, 0, &type_float},
+	{'*',	&type_float, 0, &type_float},
+	{'/',	&type_float, 0, &type_float},
+	{'&',	&type_float, 0, &type_float},
+	{'|',	&type_float, 0, &type_float},
+	{'^',	&type_float, 0, &type_float},
+	{'%',	&type_float, 0, &type_float},
+	{SHL,	&type_float, 0, &type_float},
+	{SHR,	&type_float, 0, &type_float},
+	{EQ,	&type_integer, 0, &type_float},
+	{NE,	&type_integer, 0, &type_float},
+	{LE,	&type_integer, 0, &type_float},
+	{GE,	&type_integer, 0, &type_float},
+	{LT,	&type_integer, 0, &type_float},
+	{GT,	&type_integer, 0, &type_float},
+	{0, 0}
+};
+#define float_uinteger float_integer
+#define float_short float_integer
+
+static expr_type_t vector_float[] = {
+	{'*',	&type_vector},
+	{'/',	&type_vector},
+	{0, 0}
+};
+
+static expr_type_t vector_vector[] = {
+	{'+',	&type_vector},
+	{'-',	&type_vector},
+	{'*',	&type_float},
+	{EQ,	&type_integer},
+	{NE,	&type_integer},
+	{0, 0}
+};
+
+#define vector_integer vector_float
+#define vector_uinteger vector_float
+#define vector_short vector_float
+
+static expr_type_t entity_entity[] = {
+	{EQ,	&type_integer},
+	{NE,	&type_integer},
+	{0, 0}
+};
+
+static expr_type_t field_field[] = {
+	{EQ,	&type_integer},
+	{NE,	&type_integer},
+	{0, 0}
+};
+
+static expr_type_t func_func[] = {
+	{EQ,	&type_integer},
+	{NE,	&type_integer},
+	{0, 0}
+};
+
+static expr_type_t pointer_pointer[] = {
+	{'-',	&type_integer, &type_integer, &type_integer},
+	{EQ,	&type_integer},
+	{NE,	&type_integer},
+	{LE,	&type_integer},
+	{GE,	&type_integer},
+	{LT,	&type_integer},
+	{GT,	&type_integer},
+	{0, 0}
+};
+
+static expr_type_t pointer_integer[] = {
+	{'+',	&type_pointer},
+	{'-',	&type_pointer},
+	{0, 0}
+};
+#define pointer_uinteger pointer_integer
+#define pointer_short pointer_integer
+
+static expr_type_t quat_float[] = {
+	{'*',	&type_quaternion},
+	{'/',	&type_quaternion},
+	{0, 0}
+};
+
+static expr_type_t quat_vector[] = {
+	{'*',	&type_vector},
+	{0, 0}
+};
+
+static expr_type_t quat_quat[] = {
+	{'+',	&type_quaternion},
+	{'-',	&type_quaternion},
+	{'*',	&type_quaternion},
+	{EQ,	&type_integer},
+	{NE,	&type_integer},
+	{0, 0}
+};
+
+static expr_type_t quat_integer[] = {
+	{'*',	&type_quaternion, 0, &type_float},
+	{'/',	&type_quaternion, 0, &type_float},
+	{0, 0}
+};
+#define quat_uinteger quat_integer
+#define quat_short quat_integer
+
+static expr_type_t integer_float[] = {
+	{'+',	&type_float, &type_float, 0},
+	{'-',	&type_float, &type_float, 0},
+	{'*',	&type_float, &type_float, 0},
+	{'/',	&type_float, &type_float, 0},
+	{'&',	&type_float, &type_float, 0},
+	{'|',	&type_float, &type_float, 0},
+	{'^',	&type_float, &type_float, 0},
+	{'%',	&type_float, &type_float, 0},
+	{SHL,	&type_integer, 0, &type_integer},	//FIXME?
+	{SHR,	&type_integer, 0, &type_integer},	//FIXME?
+	{EQ,	&type_integer, &type_float, 0},
+	{NE,	&type_integer, &type_float, 0},
+	{LE,	&type_integer, &type_float, 0},
+	{GE,	&type_integer, &type_float, 0},
+	{LT,	&type_integer, &type_float, 0},
+	{GT,	&type_integer, &type_float, 0},
+	{0, 0}
+};
+
+static expr_type_t integer_vector[] = {
+	{'*',	&type_vector, &type_float, 0},
+	{0, 0}
+};
+
+static expr_type_t integer_pointer[] = {
+	{'+',	&type_pointer},
+	{0, 0}
+};
+
+static expr_type_t integer_quat[] = {
+	{'*',	&type_quaternion, &type_float, 0},
+	{'/',	&type_quaternion, &type_float, 0},
+	{0, 0}
+};
+
+static expr_type_t integer_integer[] = {
+	{'+',	&type_integer},
+	{'-',	&type_integer},
+	{'*',	&type_integer},
+	{'/',	&type_integer},
+	{'&',	&type_integer},
+	{'|',	&type_integer},
+	{'^',	&type_integer},
+	{'%',	&type_integer},
+	{SHL,	&type_integer},
+	{SHR,	&type_integer},
+	{EQ,	&type_integer},
+	{NE,	&type_integer},
+	{LE,	&type_integer},
+	{GE,	&type_integer},
+	{LT,	&type_integer},
+	{GT,	&type_integer},
+	{0, 0}
+};
+
+static expr_type_t integer_uinteger[] = {
+	{'+',	&type_integer},
+	{'-',	&type_integer},
+	{'*',	&type_integer},
+	{'/',	&type_integer},
+	{'&',	&type_integer},
+	{'|',	&type_integer},
+	{'^',	&type_integer},
+	{'%',	&type_integer},
+	{SHL,	&type_integer},
+	{SHR,	&type_integer},
+	{EQ,	&type_integer},
+	{NE,	&type_integer},
+	{LE,	&type_integer},
+	{GE,	&type_integer},
+	{LT,	&type_integer},
+	{GT,	&type_integer},
+	{0, 0}
+};
+
+static expr_type_t integer_short[] = {
+	{'+',	&type_integer},
+	{'-',	&type_integer},
+	{'*',	&type_integer},
+	{'/',	&type_integer},
+	{'&',	&type_integer},
+	{'|',	&type_integer},
+	{'^',	&type_integer},
+	{'%',	&type_integer},
+	{SHL,	&type_integer},
+	{SHR,	&type_integer},
+	{EQ,	&type_integer},
+	{NE,	&type_integer},
+	{LE,	&type_integer},
+	{GE,	&type_integer},
+	{LT,	&type_integer},
+	{GT,	&type_integer},
+	{0, 0}
+};
+
+#define uinteger_float integer_float
+#define uinteger_vector integer_vector
+#define uinteger_pointer integer_pointer
+#define uinteger_quat integer_quat
+
+static expr_type_t uinteger_integer[] = {
+	{'+',	&type_integer},
+	{'-',	&type_integer},
+	{'*',	&type_integer},
+	{'/',	&type_integer},
+	{'&',	&type_integer},
+	{'|',	&type_integer},
+	{'^',	&type_integer},
+	{'%',	&type_integer},
+	{SHL,	&type_uinteger},
+	{SHR,	&type_uinteger},
+	{EQ,	&type_integer},
+	{NE,	&type_integer},
+	{LE,	&type_integer},
+	{GE,	&type_integer},
+	{LT,	&type_integer},
+	{GT,	&type_integer},
+	{0, 0}
+};
+
+static expr_type_t uinteger_uinteger[] = {
+	{'+',	&type_uinteger},
+	{'-',	&type_uinteger},
+	{'*',	&type_uinteger},
+	{'/',	&type_uinteger},
+	{'&',	&type_uinteger},
+	{'|',	&type_uinteger},
+	{'^',	&type_uinteger},
+	{'%',	&type_uinteger},
+	{SHL,	&type_uinteger},
+	{SHR,	&type_uinteger},
+	{EQ,	&type_integer},
+	{NE,	&type_integer},
+	{LE,	&type_integer},
+	{GE,	&type_integer},
+	{LT,	&type_integer},
+	{GT,	&type_integer},
+	{0, 0}
+};
+#define uinteger_short uinteger_integer
+
+#define short_float integer_float
+#define short_vector integer_vector
+#define short_pointer integer_pointer
+#define short_quat integer_quat
+
+static expr_type_t short_integer[] = {
+	{'+',	&type_integer},
+	{'-',	&type_integer},
+	{'*',	&type_integer},
+	{'/',	&type_integer},
+	{'&',	&type_integer},
+	{'|',	&type_integer},
+	{'^',	&type_integer},
+	{'%',	&type_integer},
+	{SHL,	&type_short},
+	{SHR,	&type_short},
+	{EQ,	&type_integer},
+	{NE,	&type_integer},
+	{LE,	&type_integer},
+	{GE,	&type_integer},
+	{LT,	&type_integer},
+	{GT,	&type_integer},
+	{0, 0}
+};
+
+static expr_type_t short_uinteger[] = {
+	{'+',	&type_uinteger},
+	{'-',	&type_uinteger},
+	{'*',	&type_uinteger},
+	{'/',	&type_uinteger},
+	{'&',	&type_uinteger},
+	{'|',	&type_uinteger},
+	{'^',	&type_uinteger},
+	{'%',	&type_uinteger},
+	{SHL,	&type_short},
+	{SHR,	&type_short},
+	{EQ,	&type_integer},
+	{NE,	&type_integer},
+	{LE,	&type_integer},
+	{GE,	&type_integer},
+	{LT,	&type_integer},
+	{GT,	&type_integer},
+	{0, 0}
+};
+
+static expr_type_t short_short[] = {
+	{'+',	&type_short},
+	{'-',	&type_short},
+	{'*',	&type_short},
+	{'/',	&type_short},
+	{'&',	&type_short},
+	{'|',	&type_short},
+	{'^',	&type_short},
+	{'%',	&type_short},
+	{SHL,	&type_short},
+	{SHR,	&type_short},
+	{EQ,	&type_integer},
+	{NE,	&type_integer},
+	{LE,	&type_integer},
+	{GE,	&type_integer},
+	{LT,	&type_integer},
+	{GT,	&type_integer},
+	{0, 0}
+};
+
+static expr_type_t *string_x[] = {
+	0,				// ev_void
+	string_string,
+	0,				// ev_float
+	0,				// ev_vector
+	0,				// ev_entity
+	0,				// ev_field
+	0,				// ev_func
+	0,				// ev_pointer
+	0,				// ev_quat
+	0,				// ev_integer
+	0,				// ev_uinteger
+	0,				// ev_short
+};
+
+static expr_type_t *float_x[] = {
+	0,				// ev_void
+	0,				// ev_string
+	float_float,
+	float_vector,
+	0,				// ev_entity
+	0,				// ev_field
+	0,				// ev_func
+	0,				// ev_pointer
+	float_quat,
+	float_integer,
+	float_uinteger,
+	float_short,
+};
+
+static expr_type_t *vector_x[] = {
+	0,				// ev_void
+	0,				// ev_string
+	vector_float,
+	vector_vector,
+	0,				// ev_entity
+	0,				// ev_field
+	0,				// ev_func
+	0,				// ev_pointer
+	0,				// ev_quaternion
+	vector_integer,
+	vector_uinteger,
+	vector_short,
+};
+
+static expr_type_t *entity_x[] = {
+	0,				// ev_void
+	0,				// ev_string
+	0,				// ev_float
+	0,				// ev_vector
+	entity_entity,	// ev_entity
+	0,				// ev_field
+	0,				// ev_func
+	0,				// ev_pointer
+	0,				// ev_quaternion
+	0,				// ev_integer
+	0,				// ev_uinteger
+	0,				// ev_short
+};
+
+static expr_type_t *field_x[] = {
+	0,				// ev_void
+	0,				// ev_string
+	0,				// ev_float
+	0,				// ev_vector
+	0,				// ev_entity
+	field_field,	// ev_field
+	0,				// ev_func
+	0,				// ev_pointer
+	0,				// ev_quaternion
+	0,				// ev_integer
+	0,				// ev_uinteger
+	0,				// ev_short
+};
+
+static expr_type_t *funcx[] = {
+	0,				// ev_void
+	0,				// ev_string
+	0,				// ev_float
+	0,				// ev_vector
+	0,				// ev_entity
+	0,				// ev_field
+	func_func,		// ev_func
+	0,				// ev_pointer
+	0,				// ev_quaternion
+	0,				// ev_integer
+	0,				// ev_uinteger
+	0,				// ev_short
+};
+
+static expr_type_t *pointer_x[] = {
+	0,				// ev_void
+	0,				// ev_string
+	0,				// ev_float
+	0,				// ev_vector
+	0,				// ev_entity
+	0,				// ev_field
+	0,				// ev_func
+	pointer_pointer,
+	0,				// ev_quat
+	pointer_integer,
+	pointer_uinteger,
+	pointer_short,
+};
+
+static expr_type_t *quat_x[] = {
+	0,				// ev_void
+	0,				// ev_string
+	quat_float,
+	quat_vector,
+	0,				// ev_entity
+	0,				// ev_field
+	0,				// ev_func
+	0,				// ev_pointer
+	quat_quat,
+	quat_integer,
+	quat_uinteger,
+	quat_short,
+};
+
+static expr_type_t *integer_x[] = {
+	0,				// ev_void
+	0,				// ev_string
+	integer_float,
+	integer_vector,
+	0,				// ev_entity
+	0,				// ev_field
+	0,				// ev_func
+	integer_pointer,
+	integer_quat,
+	integer_integer,
+	integer_uinteger,
+	integer_short,
+};
+
+static expr_type_t *uinteger_x[] = {
+	0,				// ev_void
+	0,				// ev_string
+	uinteger_float,
+	uinteger_vector,
+	0,				// ev_entity
+	0,				// ev_field
+	0,				// ev_func
+	uinteger_pointer,
+	uinteger_quat,
+	uinteger_integer,
+	uinteger_uinteger,
+	uinteger_short,
+};
+
+static expr_type_t *short_x[] = {
+	0,				// ev_void
+	0,				// ev_string
+	short_float,
+	short_vector,
+	0,				// ev_entity
+	0,				// ev_field
+	0,				// ev_func
+	short_pointer,
+	short_quat,
+	short_integer,
+	short_uinteger,
+	short_short,
+};
+
+static expr_type_t **binary_expr_types[] = {
+	0,				// ev_void
+	string_x,
+	float_x,
+	vector_x,
+	entity_x,
+	field_x,
+	funcx,
+	pointer_x,
+	quat_x,
+	integer_x,
+	uinteger_x,
+	short_x,
+};
+
+static expr_t *
+invalid_binary_expr (int op, expr_t *e1, expr_t *e2)
+{
+	etype_t     t1, t2;
+	t1 = extract_type (e1);
+	t2 = extract_type (e2);
+	return error (e1, "invalid binary expression: %s %s %s",
+				  pr_type_name[t1], get_op_string (op), pr_type_name[t2]);
+}
+
+static expr_t *
+reimplement_binary_expr (int op, expr_t *e1, expr_t *e2)
+{
+	expr_t     *e;
+
+	if (options.code.progsversion == PROG_ID_VERSION) {
+		switch (op) {
+			case '%':
+				{
+					expr_t     *tmp1, *tmp2, *tmp3, *tmp4, *t1, *t2;
+					e = new_block_expr ();
+					t1 = new_temp_def_expr (&type_float);
+					t2 = new_temp_def_expr (&type_float);
+					tmp1 = new_temp_def_expr (&type_float);
+					tmp2 = new_temp_def_expr (&type_float);
+					tmp3 = new_temp_def_expr (&type_float);
+					tmp4 = new_temp_def_expr (&type_float);
+
+					append_expr (e, assign_expr (t1, e1));
+					e1 = binary_expr ('&', t1, t1);
+					append_expr (e, assign_expr (tmp1, e1));
+
+					append_expr (e, assign_expr (t2, e2));
+					e2 = binary_expr ('&', t2, t2);
+					append_expr (e, assign_expr (tmp2, e2));
+
+					e1 = binary_expr ('/', tmp1, tmp2);
+					append_expr (e, assign_expr (tmp3, e1));
+
+					e2 = binary_expr ('&', tmp3, tmp3);
+					append_expr (e, assign_expr (tmp4, e2));
+
+					e1 = binary_expr ('*', tmp2, tmp4);
+					e2 = binary_expr ('-', tmp1, e1);
+					e->e.block.result = e2;
+					return e;
+				}
+				break;
+		}
+	}
+	return 0;
+}
+
+static expr_t *
+check_precedence (int op, expr_t *e1, expr_t *e2)
+{
+	if (e1->type == ex_uexpr && e1->e.expr.op == '!' && !e1->paren) {
+		if (options.traditional) {
+			if (op != AND && op != OR && op != '=') {
+				notice (e1, "precedence of `!' and `%s' inverted for "
+							"traditional code", get_op_string (op));
+				e1->e.expr.e1->paren = 1;
+				return unary_expr ('!', binary_expr (op, e1->e.expr.e1, e2));
+			}
+		} else if (op == '&' || op == '|') {
+			if (options.warnings.precedence)
+				warning (e1, "ambiguous logic. Suggest explicit parentheses "
+						 "with expressions involving ! and %s",
+						 get_op_string (op));
+		}
+	}
+	if (options.traditional) {
+		if (e2->type == ex_expr && !e2->paren) {
+			if (((op == '&' || op == '|')
+				 && (is_math_op (e2->e.expr.op) || is_compare (e2->e.expr.op)))
+				|| (op == '='
+					&& (e2->e.expr.op == OR || e2->e.expr.op == AND))) {
+				notice (e1, "precedence of `%s' and `%s' inverted for "
+							"traditional code", get_op_string (op),
+							get_op_string (e2->e.expr.op));
+				e1 = binary_expr (op, e1, e2->e.expr.e1);
+				e1->paren = 1;
+				return binary_expr (e2->e.expr.op, e1, e2->e.expr.e2);
+			}
+			if (((op == EQ || op == NE) && is_compare (e2->e.expr.op))
+				|| (op == OR && e2->e.expr.op == AND)
+				|| (op == '|' && e2->e.expr.op == '&')) {
+				notice (e1, "precedence of `%s' raised to `%s' for "
+							"traditional code", get_op_string (op),
+							get_op_string (e2->e.expr.op));
+				e1 = binary_expr (op, e1, e2->e.expr.e1);
+				e1->paren = 1;
+				return binary_expr (e2->e.expr.op, e1, e2->e.expr.e2);
+			}
+		} else if (e1->type == ex_expr && !e1->paren) {
+			if (((op == '&' || op == '|')
+				 && (is_math_op (e1->e.expr.op) || is_compare (e1->e.expr.op)))
+				|| (op == '='
+					&& (e1->e.expr.op == OR || e1->e.expr.op == AND))) {
+				notice (e1, "precedence of `%s' and `%s' inverted for "
+							"traditional code", get_op_string (op),
+							get_op_string (e1->e.expr.op));
+				e2 = binary_expr (op, e1->e.expr.e2, e2);
+				e2->paren = 1;
+				return binary_expr (e1->e.expr.op, e1->e.expr.e1, e2);
+			}
+		}
+	} else {
+		if (e2->type == ex_expr && !e2->paren) {
+			if ((op == '&' || op == '|' || op == '^')
+				&& (is_math_op (e2->e.expr.op)
+					|| is_compare (e2->e.expr.op))) {
+				if (options.warnings.precedence)
+					warning (e2, "suggest parentheses around %s in "
+							 "operand of %c",
+							 is_compare (e2->e.expr.op)
+									? "comparison"
+									: get_op_string (e2->e.expr.op),
+							 op);
+			}
+		}
+		if (e1->type == ex_expr && !e1->paren) {
+			if ((op == '&' || op == '|' || op == '^')
+				&& (is_math_op (e1->e.expr.op)
+					|| is_compare (e1->e.expr.op))) {
+				if (options.warnings.precedence)
+					warning (e1, "suggest parentheses around %s in "
+							 "operand of %c",
+							 is_compare (e1->e.expr.op)
+									? "comparison"
+									: get_op_string (e1->e.expr.op),
+							 op);
+			}
+		}
+	}
+	return 0;
+}
+
+expr_t *
+binary_expr (int op, expr_t *e1, expr_t *e2)
+{
+	type_t     *t1, *t2;
+	etype_t     et1, et2;
+	expr_t     *e;
+	expr_type_t *expr_type;
+
+	convert_name (e1);
+	if (e1->type == ex_error)
+		return e1;
+
+	convert_name (e2);
+	if (e2->type == ex_error)
+		return e2;
+
+	if (e1->type == ex_bool)
+		e1 = convert_from_bool (e1, get_type (e2));
+	if (e2->type == ex_bool)
+		e2 = convert_from_bool (e2, get_type (e1));
+
+	if ((e = check_precedence (op, e1, e2)))
+		return e;
+
+	t1 = get_type (e1);
+	t2 = get_type (e2);
+	if (!t1 || !t2)
+		internal_error (e1, "expr with no type");
+
+	if (op == EQ || op == NE) {
+		if (e1->type == ex_nil) {
+			t1 = t2;
+			convert_nil (e1, t1);
+		} else if (e2->type == ex_nil) {
+			t2 = t1;
+			convert_nil (e2, t2);
+		}
+	}
+
+	et1 = low_level_type (t1);
+	et2 = low_level_type (t2);
+
+	if (et1 > ev_short || !binary_expr_types[et1])
+		return invalid_binary_expr(op, e1, e2);
+	if (et2 > ev_short || !binary_expr_types[et1][et2])
+		return invalid_binary_expr(op, e1, e2);
+	expr_type = binary_expr_types[et1][et2];
+	while (expr_type->op && expr_type->op != op)
+		expr_type++;
+	if (!expr_type->op)
+		return invalid_binary_expr(op, e1, e2);
+
+	if (expr_type->a_cast)
+		e1 = cast_expr (expr_type->a_cast, e1);
+	if (expr_type->b_cast)
+		e2 = cast_expr (expr_type->b_cast, e2);
+
+	if ((e = reimplement_binary_expr (op, e1, e2)))
+		return e;
+
+	e = new_binary_expr (op, e1, e2);
+	e->e.expr.type = expr_type->type;
+	if (is_compare (op) || is_logic (op)) {
+		if (options.code.progsversion == PROG_ID_VERSION)
+			e->e.expr.type = &type_float;
+	}
+	return e;
+}

From 70d18ecfa13b493f9b4d5f17762a4fec7889ef75 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 27 Sep 2013 18:21:15 +0900
Subject: [PATCH 0028/1519] Add a test for functions in binary expressions.

As expected, the binary_expr() cleanup broke multiple function calls in a
single expression.
---
 tools/qfcc/test/Makefile.am |  8 ++++++++
 tools/qfcc/test/func-expr.r | 18 ++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 tools/qfcc/test/func-expr.r

diff --git a/tools/qfcc/test/Makefile.am b/tools/qfcc/test/Makefile.am
index eee7ba5be..1ca89205a 100644
--- a/tools/qfcc/test/Makefile.am
+++ b/tools/qfcc/test/Makefile.am
@@ -21,6 +21,7 @@ QFCC_TEST_INCS=@QFCC_TEST_INCS@
 test_progs_dat=\
 	chewed-alias.dat \
 	chewed-return.dat \
+	func-expr.dat \
 	func-static.dat \
 	deadbool.dat \
 	infloop.dat \
@@ -61,6 +62,13 @@ chewed-return.dat: $(chewed_return_obj) $(QFCC_DEP)
 chewed-return.run: Makefile build-run
 	TEST_HARNESS_OPTS=--float $(srcdir)/build-run $@
 
+func_expr_dat_SOURCES=func-expr.r
+func_expr_obj=$(func_expr_dat_SOURCES:.r=.qfo)
+func-expr.dat: $(func_expr_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(func_expr_obj)
+func-expr.run: Makefile build-run
+	$(srcdir)/build-run $@
+
 func_static_dat_SOURCES=func-static.r
 func_static_obj=$(func_static_dat_SOURCES:.r=.qfo)
 func-static.dat: $(func_static_obj) $(QFCC_DEP)
diff --git a/tools/qfcc/test/func-expr.r b/tools/qfcc/test/func-expr.r
new file mode 100644
index 000000000..a6b43ca4b
--- /dev/null
+++ b/tools/qfcc/test/func-expr.r
@@ -0,0 +1,18 @@
+int foo (int i)
+{
+	return i;
+}
+
+int func (int a, int b)
+{
+	local int x;
+
+	x = foo (a) + foo (b);
+	return x;
+};
+
+int
+main ()
+{
+	return func (1,3) != 1 + 3;
+}

From db460155e9df747cadb2265f4465ee0e5fd3cd11 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 27 Sep 2013 23:07:38 +0900
Subject: [PATCH 0029/1519] Fix multiple function calls in expressions.

---
 tools/qfcc/include/expr.h       | 2 ++
 tools/qfcc/source/expr.c        | 2 +-
 tools/qfcc/source/expr_binary.c | 5 +++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/tools/qfcc/include/expr.h b/tools/qfcc/include/expr.h
index 8973f810b..5b1c6d1e7 100644
--- a/tools/qfcc/include/expr.h
+++ b/tools/qfcc/include/expr.h
@@ -516,6 +516,8 @@ int is_math_op (int op);
 */
 int is_logic (int op);
 
+int has_function_call (expr_t *e);
+
 int is_string_val (expr_t *e);
 int is_float_val (expr_t *e);
 int is_vector_val (expr_t *e);
diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index bc5ba5a6e..14ee4b528 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -1488,7 +1488,7 @@ is_logic (int op)
 	return 0;
 }
 
-static int
+int
 has_function_call (expr_t *e)
 {
 	switch (e->type) {
diff --git a/tools/qfcc/source/expr_binary.c b/tools/qfcc/source/expr_binary.c
index d9f6f43b0..2aa963b3a 100644
--- a/tools/qfcc/source/expr_binary.c
+++ b/tools/qfcc/source/expr_binary.c
@@ -726,6 +726,11 @@ binary_expr (int op, expr_t *e1, expr_t *e2)
 	expr_type_t *expr_type;
 
 	convert_name (e1);
+	if (e1->type == ex_block && e1->e.block.is_call
+		&& has_function_call (e2) && e1->e.block.result) {
+		e = new_temp_def_expr (get_type (e1->e.block.result));
+		e1 = assign_expr (e, e1);
+	}
 	if (e1->type == ex_error)
 		return e1;
 

From c88d1987a1585a8ead5a07dcaa79c88902df4bac Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 30 Sep 2013 18:09:04 +0900
Subject: [PATCH 0030/1519] Add warnings for empty blocks in if/else/do.

Saw a discussion of such in #qc and that gcc implemented it. I realized it
would be pretty easy to detect and very useful (I've made such mistakes at
times).
---
 tools/qfcc/source/expr.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index 14ee4b528..a5a88ca37 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -2222,6 +2222,14 @@ build_if_statement (int not, expr_t *test, expr_t *s1, expr_t *els, expr_t *s2)
 	expr_t     *tl = new_label_expr ();
 	expr_t     *fl = new_label_expr ();
 
+	if (els && !s2) {
+		warning (els,
+				 "suggest braces around empty body in an ‘else’ statement");
+	}
+	if (!els && !s1) {
+		warning (test,
+				 "suggest braces around empty body in an ‘if’ statement");
+	}
 	pr.source_line = test->line;
 	pr.source_file = test->file;
 
@@ -2311,6 +2319,11 @@ build_do_while_statement (expr_t *statement, int not, expr_t *test,
 	string_t    file = pr.source_file;
 	expr_t     *do_while_expr;
 
+	if (!statement) {
+		warning (break_label,
+				 "suggest braces around empty body in a ‘do’ statement");
+	}
+
 	pr.source_line = test->line;
 	pr.source_file = test->file;
 

From eeaf2bc43f695a6b6a97e9c63bc2bedf4f0375a2 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 24 Nov 2013 11:19:50 +0900
Subject: [PATCH 0031/1519] Return None instead of False from parse_entity.

Don't remember how I found that one, but None makes much more sense.
---
 tools/io_qfmap/map.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/io_qfmap/map.py b/tools/io_qfmap/map.py
index b05c7392c..b0820de69 100644
--- a/tools/io_qfmap/map.py
+++ b/tools/io_qfmap/map.py
@@ -229,7 +229,7 @@ def parse_epair(script, mapent):
 
 def parse_entity(script):
     if script.getToken(True) == None:
-        return False
+        return None
     if script.token != "{":
         map_error(script, "Missing {")
     mapent = Entity()

From 6996e7295a9d3fd0d9ade07fa81da13ec24c7b02 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 24 Nov 2013 11:21:40 +0900
Subject: [PATCH 0032/1519] Add a getLine method to Script.

It returns the rest of the line (minus // style comments) as the token. I
needed it in another project but this is my central repository for
script.py.
---
 tools/io_qfmap/script.py | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/tools/io_qfmap/script.py b/tools/io_qfmap/script.py
index 170f79f14..9e34934f9 100644
--- a/tools/io_qfmap/script.py
+++ b/tools/io_qfmap/script.py
@@ -61,6 +61,24 @@ class Script:
                 continue
             return True
         return False
+    def getLine(self):
+        start = self.pos
+        end = start
+        while self.pos < len(self.text):
+            if self.text[self.pos] == "\n":
+                self.line += 1
+                self.pos += 1
+                break
+            if self.text[self.pos:self.pos + 2] == "//":
+                break
+            self.pos += 1
+            end = self.pos
+        if self.unget:
+            self.unget = False
+            self.token = self.token + self.text[start:end]
+        else:
+            self.token = self.text[start:end]
+        return self.pos < len(self.text)
     def getToken(self, crossline=False):
         if self.unget:
             self.unget = False

From f5501fbf241ce281b6cfa43f5cd3799ecd1fcc59 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 24 Nov 2013 13:11:50 +0900
Subject: [PATCH 0033/1519] Fix a pile of automake deprecation warnings.

s/INCLUDES/AM_CPPFLAGS/g

I <3 sed :)
---
 hw/source/Makefile.am                | 2 +-
 libs/audio/Makefile.am               | 2 +-
 libs/audio/renderer/Makefile.am      | 2 +-
 libs/audio/targets/Makefile.am       | 2 +-
 libs/audio/test/Makefile.am          | 2 +-
 libs/client/Makefile.am              | 2 +-
 libs/console/Makefile.am             | 2 +-
 libs/gamecode/Makefile.am            | 2 +-
 libs/gib/Makefile.am                 | 2 +-
 libs/models/Makefile.am              | 2 +-
 libs/models/alias/Makefile.am        | 2 +-
 libs/models/brush/Makefile.am        | 2 +-
 libs/models/iqm/Makefile.am          | 2 +-
 libs/models/sprite/Makefile.am       | 2 +-
 libs/models/test/Makefile.am         | 2 +-
 libs/net/Makefile.am                 | 2 +-
 libs/net/nc/Makefile.am              | 2 +-
 libs/net/nm/Makefile.am              | 2 +-
 libs/qw/Makefile.am                  | 2 +-
 libs/ruamoko/Makefile.am             | 2 +-
 libs/util/Makefile.am                | 2 +-
 libs/util/test/Makefile.am           | 2 +-
 libs/video/renderer/Makefile.am      | 2 +-
 libs/video/renderer/gl/Makefile.am   | 2 +-
 libs/video/renderer/glsl/Makefile.am | 2 +-
 libs/video/renderer/sw/Makefile.am   | 2 +-
 libs/video/renderer/sw32/Makefile.am | 2 +-
 libs/video/targets/Makefile.am       | 2 +-
 nq/source/Makefile.am                | 2 +-
 qtv/source/Makefile.am               | 2 +-
 qw/source/Makefile.am                | 2 +-
 ruamoko/gui/Makefile.am              | 4 ++--
 ruamoko/lib/Makefile.am              | 4 ++--
 ruamoko/scheme/Makefile.am           | 4 ++--
 tools/bsp2img/Makefile.am            | 2 +-
 tools/carne/Makefile.am              | 2 +-
 tools/pak/Makefile.am                | 2 +-
 tools/qfbsp/source/Makefile.am       | 2 +-
 tools/qfcc/source/Makefile.am        | 2 +-
 tools/qfcc/test/Makefile.am          | 2 +-
 tools/qflight/source/Makefile.am     | 2 +-
 tools/qflmp/Makefile.am              | 2 +-
 tools/qfmodelgen/source/Makefile.am  | 2 +-
 tools/qfspritegen/Makefile.am        | 2 +-
 tools/qfvis/source/Makefile.am       | 2 +-
 tools/qwaq/Makefile.am               | 2 +-
 tools/wad/Makefile.am                | 2 +-
 tools/wav/Makefile.am                | 2 +-
 48 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/hw/source/Makefile.am b/hw/source/Makefile.am
index 25a0c90b3..d5ad0658e 100644
--- a/hw/source/Makefile.am
+++ b/hw/source/Makefile.am
@@ -30,7 +30,7 @@
 AUTOMAKE_OPTIONS=	foreign
 
 # Stuff that is common to both client and server
-INCLUDES=	-I$(top_srcdir)/include -I$(top_srcdir)/hw/include
+AM_CPPFLAGS=	-I$(top_srcdir)/include -I$(top_srcdir)/hw/include
 SDL_LIBS = @SDL_LIBS@
 
 bin_PROGRAMS=	@HW_TARGETS@
diff --git a/libs/audio/Makefile.am b/libs/audio/Makefile.am
index bdff7edea..5521b3e2f 100644
--- a/libs/audio/Makefile.am
+++ b/libs/audio/Makefile.am
@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS= foreign
 
 SUBDIRS= targets renderer . test
 AM_CFLAGS= @PREFER_PIC@
-INCLUDES= -I$(top_srcdir)/include
+AM_CPPFLAGS= -I$(top_srcdir)/include
 SDL_LIBS= @SDL_LIBS@
 XMMS_LIBS= @XMMS_LIBS@
 plugin_ldflags= @plugin_ldflags@ -avoid-version -module -rpath $(plugindir)
diff --git a/libs/audio/renderer/Makefile.am b/libs/audio/renderer/Makefile.am
index e0c86a009..0c3bcd719 100644
--- a/libs/audio/renderer/Makefile.am
+++ b/libs/audio/renderer/Makefile.am
@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS= foreign
 
 AM_CFLAGS= @PREFER_PIC@ \
 	$(VORBIS_CFLAGS) $(OGG_CFLAGS) $(SAMPLERATE_CFLAGS) $(JACK_CFLAGS)
-INCLUDES= -I$(top_srcdir)/include
+AM_CPPFLAGS= -I$(top_srcdir)/include
 plugin_ldflags= @plugin_ldflags@ -avoid-version -module -rpath $(plugindir)
 plugin_libadd= @plugin_libadd@
 EXEEXT=
diff --git a/libs/audio/targets/Makefile.am b/libs/audio/targets/Makefile.am
index 7b42f69d5..ff0411354 100644
--- a/libs/audio/targets/Makefile.am
+++ b/libs/audio/targets/Makefile.am
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS= foreign
 
 AM_CFLAGS= @PREFER_PIC@
-INCLUDES= -I$(top_srcdir)/include
+AM_CPPFLAGS= -I$(top_srcdir)/include
 SDL_LIBS = @SDL_LIBS@
 plugin_ldflags= @plugin_ldflags@ -avoid-version -module -rpath $(plugindir)
 plugin_libadd= @plugin_libadd@
diff --git a/libs/audio/test/Makefile.am b/libs/audio/test/Makefile.am
index ebee1ef13..410be4f4e 100644
--- a/libs/audio/test/Makefile.am
+++ b/libs/audio/test/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS= foreign
 
-INCLUDES= -I$(top_srcdir)/include
+AM_CPPFLAGS= -I$(top_srcdir)/include
 
 noinst_PROGRAMS= @AUDIO_TARGETS@
 
diff --git a/libs/client/Makefile.am b/libs/client/Makefile.am
index af91b0b3b..d9fc98a77 100644
--- a/libs/client/Makefile.am
+++ b/libs/client/Makefile.am
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS= foreign
 
 AM_CFLAGS= @PREFER_PIC@
-INCLUDES= -I$(top_srcdir)/include
+AM_CPPFLAGS= -I$(top_srcdir)/include
 
 noinst_LTLIBRARIES= libQFclient.la
 
diff --git a/libs/console/Makefile.am b/libs/console/Makefile.am
index 8c9fb156f..d7cce92e7 100644
--- a/libs/console/Makefile.am
+++ b/libs/console/Makefile.am
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS= foreign
 
 AM_CFLAGS= @PREFER_PIC@
-INCLUDES= -I$(top_srcdir)/include $(FNM_FLAGS)
+AM_CPPFLAGS= -I$(top_srcdir)/include $(FNM_FLAGS)
 plugin_ldflags= @plugin_ldflags@ -avoid-version -module -rpath $(plugindir)
 plugin_libadd= @plugin_libadd@
 lib_ldflags=-version-info $(QUAKE_LIBRARY_VERSION_INFO) \
diff --git a/libs/gamecode/Makefile.am b/libs/gamecode/Makefile.am
index 3222ff473..6d31504a8 100644
--- a/libs/gamecode/Makefile.am
+++ b/libs/gamecode/Makefile.am
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS= foreign
 
 AM_CFLAGS= @PREFER_PIC@
-INCLUDES= -I$(top_srcdir)/include
+AM_CPPFLAGS= -I$(top_srcdir)/include
 lib_ldflags=
 
 gc_deps=$(top_builddir)/libs/util/libQFutil.la
diff --git a/libs/gib/Makefile.am b/libs/gib/Makefile.am
index b8f2a7c93..80ea92067 100644
--- a/libs/gib/Makefile.am
+++ b/libs/gib/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS= foreign
 AM_CFLAGS= @PREFER_PIC@
-INCLUDES= -I$(top_srcdir)/include $(FNM_FLAGS)
+AM_CPPFLAGS= -I$(top_srcdir)/include $(FNM_FLAGS)
 
 lib_ldflags=-version-info $(QUAKE_LIBRARY_VERSION_INFO) \
 			-rpath $(libdir) -no-undefined
diff --git a/libs/models/Makefile.am b/libs/models/Makefile.am
index 425679829..2fa145649 100644
--- a/libs/models/Makefile.am
+++ b/libs/models/Makefile.am
@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS= foreign
 
 SUBDIRS= alias brush iqm sprite . test
 AM_CFLAGS= @PREFER_PIC@
-INCLUDES= -I$(top_srcdir)/include
+AM_CPPFLAGS= -I$(top_srcdir)/include
 
 lib_LTLIBRARIES=	libQFmodels.la
 noinst_LTLIBRARIES= @models_libs@
diff --git a/libs/models/alias/Makefile.am b/libs/models/alias/Makefile.am
index e79dbd9e6..e74edfeda 100644
--- a/libs/models/alias/Makefile.am
+++ b/libs/models/alias/Makefile.am
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS= foreign
 
 AM_CFLAGS= @PREFER_PIC@
-INCLUDES= -I$(top_srcdir)/include
+AM_CPPFLAGS= -I$(top_srcdir)/include
 
 noinst_LTLIBRARIES=	@alias_libs@
 EXTRA_LTLIBRARIES=libalias_gl.la libalias_glsl.la libalias_sw.la
diff --git a/libs/models/brush/Makefile.am b/libs/models/brush/Makefile.am
index 01cc76439..cd728baed 100644
--- a/libs/models/brush/Makefile.am
+++ b/libs/models/brush/Makefile.am
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS= foreign
 
 AM_CFLAGS= @PREFER_PIC@
-INCLUDES= -I$(top_srcdir)/include
+AM_CPPFLAGS= -I$(top_srcdir)/include
 
 noinst_LTLIBRARIES=	libbrush.la @brush_libs@
 EXTRA_LTLIBRARIES=libbrush_gl.la libbrush_glsl.la libbrush_sw.la
diff --git a/libs/models/iqm/Makefile.am b/libs/models/iqm/Makefile.am
index 0603bdbbe..71f54f576 100644
--- a/libs/models/iqm/Makefile.am
+++ b/libs/models/iqm/Makefile.am
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS= foreign
 
 AM_CFLAGS= @PREFER_PIC@
-INCLUDES= -I$(top_srcdir)/include
+AM_CPPFLAGS= -I$(top_srcdir)/include
 
 noinst_LTLIBRARIES=	@iqm_libs@
 EXTRA_LTLIBRARIES=libiqm_gl.la libiqm_glsl.la libiqm_sw.la
diff --git a/libs/models/sprite/Makefile.am b/libs/models/sprite/Makefile.am
index a4aa70858..3c6c023d1 100644
--- a/libs/models/sprite/Makefile.am
+++ b/libs/models/sprite/Makefile.am
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS= foreign
 
 AM_CFLAGS= @PREFER_PIC@
-INCLUDES= -I$(top_srcdir)/include
+AM_CPPFLAGS= -I$(top_srcdir)/include
 
 noinst_LTLIBRARIES=	@sprite_libs@
 EXTRA_LTLIBRARIES=libsprite_gl.la libsprite_glsl.la libsprite_sw.la
diff --git a/libs/models/test/Makefile.am b/libs/models/test/Makefile.am
index 6c9f65c75..2718f5ddd 100644
--- a/libs/models/test/Makefile.am
+++ b/libs/models/test/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS= foreign
 
-INCLUDES= -I$(srcdir) -I$(top_srcdir)/include
+AM_CPPFLAGS= -I$(srcdir) -I$(top_srcdir)/include
 
 check_PROGRAMS=testclip testcontents testportals
 EXTRA_DIST=	trace-id.c trace-qf-bad.c hulls.h main.c
diff --git a/libs/net/Makefile.am b/libs/net/Makefile.am
index 6d5e13fa9..69f2fbb6c 100644
--- a/libs/net/Makefile.am
+++ b/libs/net/Makefile.am
@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS= foreign
 
 SUBDIRS= nc nm
 AM_CFLAGS= @PREFER_NON_PIC@
-INCLUDES= -I$(top_srcdir)/include
+AM_CPPFLAGS= -I$(top_srcdir)/include
 
 noinst_LTLIBRARIES=	libnet_chan.la libnet_main.la
 
diff --git a/libs/net/nc/Makefile.am b/libs/net/nc/Makefile.am
index 27a900987..08b0cb810 100644
--- a/libs/net/nc/Makefile.am
+++ b/libs/net/nc/Makefile.am
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS= foreign
 
 AM_CFLAGS= @PREFER_NON_PIC@
-INCLUDES= -I$(top_srcdir)/include
+AM_CPPFLAGS= -I$(top_srcdir)/include
 
 noinst_LTLIBRARIES=	libnc.la
 
diff --git a/libs/net/nm/Makefile.am b/libs/net/nm/Makefile.am
index ba7771470..cfdaae275 100644
--- a/libs/net/nm/Makefile.am
+++ b/libs/net/nm/Makefile.am
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS= foreign
 
 AM_CFLAGS= @PREFER_NON_PIC@
-INCLUDES= -I$(top_srcdir)/include
+AM_CPPFLAGS= -I$(top_srcdir)/include
 
 noinst_LTLIBRARIES=	libnm.la
 
diff --git a/libs/qw/Makefile.am b/libs/qw/Makefile.am
index 5af85f1a0..48a58fa72 100644
--- a/libs/qw/Makefile.am
+++ b/libs/qw/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS= foreign
 
-INCLUDES= -I$(top_srcdir)/include
+AM_CPPFLAGS= -I$(top_srcdir)/include
 
 noinst_LIBRARIES= libqw.a
 
diff --git a/libs/ruamoko/Makefile.am b/libs/ruamoko/Makefile.am
index 4a255a4c7..64c65e972 100644
--- a/libs/ruamoko/Makefile.am
+++ b/libs/ruamoko/Makefile.am
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS= foreign
 
 AM_CFLAGS= @PREFER_PIC@
-INCLUDES= -I$(top_srcdir)/include $(FNM_FLAGS)
+AM_CPPFLAGS= -I$(top_srcdir)/include $(FNM_FLAGS)
 
 lib_ldflags=-version-info $(QUAKE_LIBRARY_VERSION_INFO) \
 			-rpath $(libdir) -no-undefined
diff --git a/libs/util/Makefile.am b/libs/util/Makefile.am
index 0a8ed680f..a54935e16 100644
--- a/libs/util/Makefile.am
+++ b/libs/util/Makefile.am
@@ -4,7 +4,7 @@ SUBDIRS= . test
 
 AM_CFLAGS= @PREFER_PIC@
 CCASFLAGS+= @PREFER_PIC@
-INCLUDES= -I$(top_srcdir)/include $(Z_CFLAGS) $(FNM_FLAGS)
+AM_CPPFLAGS= -I$(top_srcdir)/include $(Z_CFLAGS) $(FNM_FLAGS)
 
 lib_LTLIBRARIES= libQFutil.la
 
diff --git a/libs/util/test/Makefile.am b/libs/util/test/Makefile.am
index 17b64d3a7..b9b3b8f9a 100644
--- a/libs/util/test/Makefile.am
+++ b/libs/util/test/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS= foreign
 
-INCLUDES= -I$(top_srcdir)/include
+AM_CPPFLAGS= -I$(top_srcdir)/include
 
 check_PROGRAMS= \
 	test-bary test-cs test-dq test-half test-mat3 test-mat4 test-plist \
diff --git a/libs/video/renderer/Makefile.am b/libs/video/renderer/Makefile.am
index aee55cfe9..2c234fe33 100644
--- a/libs/video/renderer/Makefile.am
+++ b/libs/video/renderer/Makefile.am
@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS= foreign
 
 SUBDIRS= @vid_render_dirs@
 DIST_SUBDIRS= gl glsl sw sw32
-INCLUDES= -I$(top_srcdir)/include
+AM_CPPFLAGS= -I$(top_srcdir)/include
 
 lib_ldflags=-version-info $(QUAKE_LIBRARY_VERSION_INFO) \
 			-rpath $(libdir) -no-undefined
diff --git a/libs/video/renderer/gl/Makefile.am b/libs/video/renderer/gl/Makefile.am
index 087fa0e8e..041db8546 100644
--- a/libs/video/renderer/gl/Makefile.am
+++ b/libs/video/renderer/gl/Makefile.am
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS= foreign
 
 AM_CFLAGS= @PREFER_PIC@
-INCLUDES= -I$(top_srcdir)/include $(GLX_CFLAGS)
+AM_CPPFLAGS= -I$(top_srcdir)/include $(GLX_CFLAGS)
 
 noinst_LTLIBRARIES=	libgl.la
 
diff --git a/libs/video/renderer/glsl/Makefile.am b/libs/video/renderer/glsl/Makefile.am
index 097e847a9..c85b7a6fe 100644
--- a/libs/video/renderer/glsl/Makefile.am
+++ b/libs/video/renderer/glsl/Makefile.am
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS= foreign
 
 AM_CFLAGS= @PREFER_PIC@
-INCLUDES= -I$(top_srcdir)/include $(GLX_CFLAGS)
+AM_CPPFLAGS= -I$(top_srcdir)/include $(GLX_CFLAGS)
 
 shader_src= \
 	iqm.frag iqm.vert \
diff --git a/libs/video/renderer/sw/Makefile.am b/libs/video/renderer/sw/Makefile.am
index 697315e25..62f64e689 100644
--- a/libs/video/renderer/sw/Makefile.am
+++ b/libs/video/renderer/sw/Makefile.am
@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS= foreign
 
 AM_CFLAGS= @PREFER_PIC@
 CCASFLAGS+= @PREFER_PIC@
-INCLUDES= -I$(top_srcdir)/include
+AM_CPPFLAGS= -I$(top_srcdir)/include
 
 asm = @swrend_libs@
 
diff --git a/libs/video/renderer/sw32/Makefile.am b/libs/video/renderer/sw32/Makefile.am
index 5fa5f7e03..5d078e90c 100644
--- a/libs/video/renderer/sw32/Makefile.am
+++ b/libs/video/renderer/sw32/Makefile.am
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS= foreign
 
 AM_CFLAGS= @PREFER_PIC@
-INCLUDES= -I$(top_srcdir)/include
+AM_CPPFLAGS= -I$(top_srcdir)/include
 
 noinst_LTLIBRARIES=	libsw32.la
 
diff --git a/libs/video/targets/Makefile.am b/libs/video/targets/Makefile.am
index 98faa6099..b883b676b 100644
--- a/libs/video/targets/Makefile.am
+++ b/libs/video/targets/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS= foreign
 
-INCLUDES= -I$(top_srcdir)/include
+AM_CPPFLAGS= -I$(top_srcdir)/include
 
 lib_ldflags=-version-info $(QUAKE_LIBRARY_VERSION_INFO) \
 			-rpath $(libdir) -no-undefined
diff --git a/nq/source/Makefile.am b/nq/source/Makefile.am
index 415c603c0..71cb290e8 100644
--- a/nq/source/Makefile.am
+++ b/nq/source/Makefile.am
@@ -30,7 +30,7 @@ AUTOMAKE_OPTIONS= foreign
 
 # Stuff that is common to both client and server
 #
-INCLUDES=	-I$(top_srcdir)/include -I$(top_srcdir)/nq/include
+AM_CPPFLAGS=	-I$(top_srcdir)/include -I$(top_srcdir)/nq/include
 SDL_LIBS = @SDL_LIBS@
 AM_CFLAGS= @PTHREAD_CFLAGS@
 
diff --git a/qtv/source/Makefile.am b/qtv/source/Makefile.am
index b403f70e9..fa73f8de8 100644
--- a/qtv/source/Makefile.am
+++ b/qtv/source/Makefile.am
@@ -29,7 +29,7 @@
 
 AUTOMAKE_OPTIONS=	foreign
 
-INCLUDES=	-I$(top_srcdir)/include -I$(top_srcdir)/qtv/include
+AM_CPPFLAGS=	-I$(top_srcdir)/include -I$(top_srcdir)/qtv/include
 
 bin_PROGRAMS=	@QTV_TARGETS@
 
diff --git a/qw/source/Makefile.am b/qw/source/Makefile.am
index 202f2a70d..9afe77ae1 100644
--- a/qw/source/Makefile.am
+++ b/qw/source/Makefile.am
@@ -30,7 +30,7 @@
 AUTOMAKE_OPTIONS=	foreign
 
 # Stuff that is common to both client and server
-INCLUDES=	-I$(top_srcdir)/include -I$(top_srcdir)/qw/include @LIBCURL_CFLAGS@
+AM_CPPFLAGS=	-I$(top_srcdir)/include -I$(top_srcdir)/qw/include @LIBCURL_CFLAGS@
 SDL_LIBS = @SDL_LIBS@
 AM_CFLAGS= @PTHREAD_CFLAGS@
 
diff --git a/ruamoko/gui/Makefile.am b/ruamoko/gui/Makefile.am
index 611819151..e4866e856 100644
--- a/ruamoko/gui/Makefile.am
+++ b/ruamoko/gui/Makefile.am
@@ -4,11 +4,11 @@ pkglibdir=$(datarootdir)/qfcc/lib
 
 QFCC=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT)
 QCFLAGS=-qq -O -g -Werror -Wall -Wno-integer-divide --no-default-paths
-QCPPFLAGS=$(INCLUDES)
+QCPPFLAGS=$(AM_CPPFLAGS)
 PAK=$(top_builddir)/tools/pak/pak$(EXEEXT)
 RANLIB=touch
 
-INCLUDES=	-I$(top_srcdir)/ruamoko/include -I$(top_srcdir)/include
+AM_CPPFLAGS=	-I$(top_srcdir)/ruamoko/include -I$(top_srcdir)/include
 
 gui_libs=libgui.a
 libs=$(gui_libs)
diff --git a/ruamoko/lib/Makefile.am b/ruamoko/lib/Makefile.am
index 112941dc4..53a20875b 100644
--- a/ruamoko/lib/Makefile.am
+++ b/ruamoko/lib/Makefile.am
@@ -4,11 +4,11 @@ pkglibdir=$(datarootdir)/qfcc/lib
 
 QFCC=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT)
 QCFLAGS=-qq -O -g -Wall -Wno-integer-divide -Werror --no-default-paths
-QCPPFLAGS=$(INCLUDES)
+QCPPFLAGS=$(AM_CPPFLAGS)
 PAK=$(top_builddir)/tools/pak/pak$(EXEEXT)
 RANLIB=touch
 
-INCLUDES=	-I$(top_srcdir)/ruamoko/include -I$(top_srcdir)/include
+AM_CPPFLAGS=	-I$(top_srcdir)/ruamoko/include -I$(top_srcdir)/include
 
 noinst_HEADERS= \
 	Array+Private.h
diff --git a/ruamoko/scheme/Makefile.am b/ruamoko/scheme/Makefile.am
index 0e9365d5c..75f784ef5 100644
--- a/ruamoko/scheme/Makefile.am
+++ b/ruamoko/scheme/Makefile.am
@@ -5,7 +5,7 @@ pkglibdir=$(datarootdir)/qfcc/lib
 QFCC_DEP=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT)
 QFCC=$(QFCC_DEP)
 QCFLAGS=-qq -O -g -Werror -Wall -Wno-integer-divide --no-default-paths
-QCPPFLAGS=$(INCLUDES)
+QCPPFLAGS=$(AM_CPPFLAGS)
 PAK=$(top_builddir)/tools/pak/pak$(EXEEXT)
 GZIP=if echo $@ | grep -q .gz; then gzip -f `basename $@ .gz`; if test -f `basename $@ .dat.gz`.sym; then gzip -f `basename $@ .dat.gz`.sym; fi; fi
 GZ=@progs_gz@
@@ -15,7 +15,7 @@ STRIP=`echo -n $(srcdir)/ | sed -e 's/[^/]//g' | wc -c`
 
 RANLIB=touch
 
-INCLUDES=	-I$(top_srcdir)/ruamoko/include -I$(top_srcdir)/include
+AM_CPPFLAGS=	-I$(top_srcdir)/ruamoko/include -I$(top_srcdir)/include
 
 scheme_libs=libscheme.a
 libs=$(scheme_libs)
diff --git a/tools/bsp2img/Makefile.am b/tools/bsp2img/Makefile.am
index cef3784cf..ceaeca266 100644
--- a/tools/bsp2img/Makefile.am
+++ b/tools/bsp2img/Makefile.am
@@ -2,7 +2,7 @@ BSP2IMG_LIBS=@BSP2IMG_LIBS@
 BSP2IMG_DEPS=@BSP2IMG_DEPS@
 BSP2IMG_INCS=@BSP2IMG_INCS@
 
-INCLUDES=	-I$(top_srcdir)/include $(BSP2IMG_INCS)
+AM_CPPFLAGS=	-I$(top_srcdir)/include $(BSP2IMG_INCS)
 
 bin_PROGRAMS=bsp2img
 
diff --git a/tools/carne/Makefile.am b/tools/carne/Makefile.am
index 6a966cbbc..bec57857d 100644
--- a/tools/carne/Makefile.am
+++ b/tools/carne/Makefile.am
@@ -4,7 +4,7 @@ CARNE_LIBS=@CARNE_LIBS@
 CARNE_DEPS=@CARNE_DEPS@
 PAK_INCS=@CARNE_INCS@
 
-INCLUDES= -I$(top_srcdir)/include $(CARNE_INCS)
+AM_CPPFLAGS= -I$(top_srcdir)/include $(CARNE_INCS)
 
 noinst_PROGRAMS= carne
 
diff --git a/tools/pak/Makefile.am b/tools/pak/Makefile.am
index 95559f892..5461c399e 100644
--- a/tools/pak/Makefile.am
+++ b/tools/pak/Makefile.am
@@ -4,7 +4,7 @@ PAK_LIBS=@PAK_LIBS@
 PAK_DEPS=@PAK_DEPS@
 PAK_INCS=@PAK_INCS@
 
-INCLUDES= -I$(top_srcdir)/include $(PAK_INCS)
+AM_CPPFLAGS= -I$(top_srcdir)/include $(PAK_INCS)
 
 bin_PROGRAMS=		pak
 bin_SCRIPTS=		zpak
diff --git a/tools/qfbsp/source/Makefile.am b/tools/qfbsp/source/Makefile.am
index dffb426ab..8fd7f660b 100644
--- a/tools/qfbsp/source/Makefile.am
+++ b/tools/qfbsp/source/Makefile.am
@@ -4,7 +4,7 @@ QFBSP_LIBS=@QFBSP_LIBS@
 QFBSP_DEPS=@QFBSP_DEPS@
 QFBSP_INCS=@QFBSP_INCS@
 
-INCLUDES=	-I$(top_srcdir)/include $(QFBSP_INCS)
+AM_CPPFLAGS=	-I$(top_srcdir)/include $(QFBSP_INCS)
 
 bin_PROGRAMS=	qfbsp
 
diff --git a/tools/qfcc/source/Makefile.am b/tools/qfcc/source/Makefile.am
index b5674b614..58011ea08 100644
--- a/tools/qfcc/source/Makefile.am
+++ b/tools/qfcc/source/Makefile.am
@@ -32,7 +32,7 @@ QFCC_LIBS=@QFCC_LIBS@
 QFCC_DEPS=@QFCC_DEPS@
 QFCC_INCS=@QFCC_INCS@
 
-INCLUDES=	-I$(top_srcdir)/include $(QFCC_INCS)
+AM_CPPFLAGS=	-I$(top_srcdir)/include $(QFCC_INCS)
 YFLAGS = -v -d
 
 bin_PROGRAMS=	qfcc qfprogs
diff --git a/tools/qfcc/test/Makefile.am b/tools/qfcc/test/Makefile.am
index 1ca89205a..d447671a9 100644
--- a/tools/qfcc/test/Makefile.am
+++ b/tools/qfcc/test/Makefile.am
@@ -1,5 +1,5 @@
 AUTOMAKE_OPTIONS= foreign
-INCLUDES= -I$(top_srcdir)/include $(QFCC_INCS)
+AM_CPPFLAGS= -I$(top_srcdir)/include $(QFCC_INCS)
 
 QFCC_DEP=$(builddir)/../source/qfcc$(EXEEXT)
 QFCC=$(QFCC_DEP)
diff --git a/tools/qflight/source/Makefile.am b/tools/qflight/source/Makefile.am
index 063521a8f..cdf5005fb 100644
--- a/tools/qflight/source/Makefile.am
+++ b/tools/qflight/source/Makefile.am
@@ -6,7 +6,7 @@ QFLIGHT_INCS=@QFLIGHT_INCS@
 PTHREAD_LDFLAGS=@PTHREAD_LDFLAGS@
 PTHREAD_CFLAGS=@PTHREAD_CFLAGS@
 
-INCLUDES=	-I$(top_srcdir)/include $(QFLIGHT_INCS) $(PTHREAD_CFLAGS)
+AM_CPPFLAGS=	-I$(top_srcdir)/include $(QFLIGHT_INCS) $(PTHREAD_CFLAGS)
 
 bin_PROGRAMS=	qflight
 
diff --git a/tools/qflmp/Makefile.am b/tools/qflmp/Makefile.am
index e3c6fe5fd..b9436172c 100644
--- a/tools/qflmp/Makefile.am
+++ b/tools/qflmp/Makefile.am
@@ -4,7 +4,7 @@ QFLMP_LIBS=@QFLMP_LIBS@
 QFLMP_DEPS=@QFLMP_DEPS@
 QFLMP_INCS=@QFLMP_INCS@
 
-INCLUDES= -I$(top_srcdir)/include $(QFLMP_INCS)
+AM_CPPFLAGS= -I$(top_srcdir)/include $(QFLMP_INCS)
 
 bin_PROGRAMS=	qflmp
 
diff --git a/tools/qfmodelgen/source/Makefile.am b/tools/qfmodelgen/source/Makefile.am
index 6e95a7a3e..4bc3a0bda 100644
--- a/tools/qfmodelgen/source/Makefile.am
+++ b/tools/qfmodelgen/source/Makefile.am
@@ -4,7 +4,7 @@ QFMODELGEN_LIBS=@QFMODELGEN_LIBS@
 QFMODELGEN_DEPS=@QFMODELGEN_DEPS@
 QFMODELGEN_INCS=@QFMODELGEN_INCS@
 
-INCLUDES=	-I$(top_srcdir)/include $(QFMODELGEN_INCS)
+AM_CPPFLAGS=	-I$(top_srcdir)/include $(QFMODELGEN_INCS)
 
 bin_PROGRAMS=	qfmodelgen
 
diff --git a/tools/qfspritegen/Makefile.am b/tools/qfspritegen/Makefile.am
index 7f3735ee4..05f321022 100644
--- a/tools/qfspritegen/Makefile.am
+++ b/tools/qfspritegen/Makefile.am
@@ -4,7 +4,7 @@ QFSPRITEGEN_LIBS=@QFSPRITEGEN_LIBS@
 QFSPRITEGEN_DEPS=@QFSPRITEGEN_DEPS@
 QFSPRITEGEN_INCS=@QFSPRITEGEN_INCS@
 
-INCLUDES=	-I$(top_srcdir)/include $(QFSPRITEGEN_INCS)
+AM_CPPFLAGS=	-I$(top_srcdir)/include $(QFSPRITEGEN_INCS)
 
 bin_PROGRAMS=	qfspritegen
 
diff --git a/tools/qfvis/source/Makefile.am b/tools/qfvis/source/Makefile.am
index 1ddcf6404..e0a725ca0 100644
--- a/tools/qfvis/source/Makefile.am
+++ b/tools/qfvis/source/Makefile.am
@@ -6,7 +6,7 @@ QFVIS_INCS=@QFVIS_INCS@
 PTHREAD_LDFLAGS=@PTHREAD_LDFLAGS@
 PTHREAD_CFLAGS=@PTHREAD_CFLAGS@
 
-INCLUDES=	-I$(top_srcdir)/include $(QFVIS_INCS) $(PTHREAD_CFLAGS)
+AM_CPPFLAGS=	-I$(top_srcdir)/include $(QFVIS_INCS) $(PTHREAD_CFLAGS)
 
 bin_PROGRAMS=	qfvis
 
diff --git a/tools/qwaq/Makefile.am b/tools/qwaq/Makefile.am
index e80524ddc..dd34fd9c5 100644
--- a/tools/qwaq/Makefile.am
+++ b/tools/qwaq/Makefile.am
@@ -2,7 +2,7 @@ QWAQ_LIBS=@QWAQ_LIBS@
 QWAQ_DEPS=@QWAQ_DEPS@
 QWAQ_INCS=@QWAQ_INCS@
 
-INCLUDES=	-I$(top_srcdir)/include $(QWAQ_INCS)
+AM_CPPFLAGS=	-I$(top_srcdir)/include $(QWAQ_INCS)
 
 QFCC_DEP=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT)
 QFCC=$(top_builddir)/tools/qfcc/source/qfcc
diff --git a/tools/wad/Makefile.am b/tools/wad/Makefile.am
index a47a10047..7db82d273 100644
--- a/tools/wad/Makefile.am
+++ b/tools/wad/Makefile.am
@@ -4,7 +4,7 @@ WAD_LIBS=@WAD_LIBS@
 WAD_DEPS=@WAD_DEPS@
 WAD_INCS=@WAD_INCS@
 
-INCLUDES= -I$(top_srcdir)/include $(WAD_INCS)
+AM_CPPFLAGS= -I$(top_srcdir)/include $(WAD_INCS)
 
 
 bin_PROGRAMS=	wad
diff --git a/tools/wav/Makefile.am b/tools/wav/Makefile.am
index 555ae0fbb..7e17fe376 100644
--- a/tools/wav/Makefile.am
+++ b/tools/wav/Makefile.am
@@ -4,7 +4,7 @@ WAV_LIBS=@WAV_LIBS@
 WAV_DEPS=@WAV_DEPS@
 WAV_INCS=@WAV_INCS@
 
-INCLUDES= -I$(top_srcdir)/include $(WAV_INCS)
+AM_CPPFLAGS= -I$(top_srcdir)/include $(WAV_INCS)
 
 bin_PROGRAMS=	qfwavinfo
 

From 6c0f2717839a1702a8a605243725b502a7929ba2 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 24 Nov 2013 13:26:12 +0900
Subject: [PATCH 0034/1519] Fix some more automake warnings.

---
 tools/qfcc/test/Makefile.am | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/tools/qfcc/test/Makefile.am b/tools/qfcc/test/Makefile.am
index d447671a9..c4302f32f 100644
--- a/tools/qfcc/test/Makefile.am
+++ b/tools/qfcc/test/Makefile.am
@@ -50,112 +50,112 @@ test_harness_DEPENDENCIES=	$(QFCC_TEST_DEPS)
 
 chewed_alias_dat_SOURCES=chewed-alias.r
 chewed_alias_obj=$(chewed_alias_dat_SOURCES:.r=.qfo)
-chewed-alias.dat: $(chewed_alias_obj) $(QFCC_DEP)
+chewed-alias.dat$(EXEEXT): $(chewed_alias_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(chewed_alias_obj)
 chewed-alias.run: Makefile build-run
 	$(srcdir)/build-run $@
 
 chewed_return_dat_SOURCES=chewed-return.r
 chewed_return_obj=$(chewed_return_dat_SOURCES:.r=.qfo)
-chewed-return.dat: $(chewed_return_obj) $(QFCC_DEP)
+chewed-return.dat$(EXEEXT): $(chewed_return_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(chewed_return_obj)
 chewed-return.run: Makefile build-run
 	TEST_HARNESS_OPTS=--float $(srcdir)/build-run $@
 
 func_expr_dat_SOURCES=func-expr.r
 func_expr_obj=$(func_expr_dat_SOURCES:.r=.qfo)
-func-expr.dat: $(func_expr_obj) $(QFCC_DEP)
+func-expr.dat$(EXEEXT): $(func_expr_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(func_expr_obj)
 func-expr.run: Makefile build-run
 	$(srcdir)/build-run $@
 
 func_static_dat_SOURCES=func-static.r
 func_static_obj=$(func_static_dat_SOURCES:.r=.qfo)
-func-static.dat: $(func_static_obj) $(QFCC_DEP)
+func-static.dat$(EXEEXT): $(func_static_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(func_static_obj)
 func-static.run: Makefile build-run
 	$(srcdir)/build-run $@
 
 deadbool_dat_SOURCES=deadbool.r
 deadbool_obj=$(deadbool_dat_SOURCES:.r=.qfo)
-deadbool.dat: $(deadbool_obj) $(QFCC_DEP)
+deadbool.dat$(EXEEXT): $(deadbool_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(deadbool_obj)
 deadbool.run: Makefile build-run
 	$(srcdir)/build-run $@
 
 infloop_dat_SOURCES=infloop.r
 infloop_obj=$(infloop_dat_SOURCES:.r=.qfo)
-infloop.dat: $(infloop_obj) $(QFCC_DEP)
+infloop.dat$(EXEEXT): $(infloop_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(infloop_obj)
 infloop.run: Makefile build-run
 	$(srcdir)/build-run $@
 
 modulo_dat_SOURCES=modulo.r
 modulo_obj=$(modulo_dat_SOURCES:.r=.qfo)
-modulo.dat: $(modulo_obj) $(QFCC_DEP)
+modulo.dat$(EXEEXT): $(modulo_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(modulo_obj)
 modulo.run: Makefile build-run
 	TEST_HARNESS_OPTS=--float $(srcdir)/build-run $@
 
 paramret_dat_SOURCES=paramret.r
 paramret_obj=$(paramret_dat_SOURCES:.r=.qfo)
-paramret.dat: $(paramret_obj) $(QFCC_DEP)
+paramret.dat$(EXEEXT): $(paramret_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(paramret_obj)
 paramret.run: Makefile build-run
 	TEST_HARNESS_OPTS=--float $(srcdir)/build-run $@
 
 return_ivar_dat_SOURCES=return-ivar.r
 return_ivar_obj=$(return_ivar_dat_SOURCES:.r=.qfo)
-return-ivar.dat: $(return_ivar_obj) $(QFCC_DEP)
+return-ivar.dat$(EXEEXT): $(return_ivar_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(return_ivar_obj)
 return-ivar.run: Makefile build-run
 	$(srcdir)/build-run $@
 
 sendv_dat_SOURCES=sendv.r
 sendv_obj=$(sendv_dat_SOURCES:.r=.qfo)
-sendv.dat: $(sendv_obj) $(QFCC_DEP)
+sendv.dat$(EXEEXT): $(sendv_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(sendv_obj)
 sendv.run: Makefile build-run
 	$(srcdir)/build-run $@
 
 state_dat_SOURCES=state.r
 state_obj=$(state_dat_SOURCES:.r=.qfo)
-state.dat: $(state_obj) $(QFCC_DEP)
+state.dat$(EXEEXT): $(state_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(state_obj)
 state.run: Makefile build-run
 	$(srcdir)/build-run $@
 
 structlive_dat_SOURCES=structlive.r
 structlive_obj=$(structlive_dat_SOURCES:.r=.qfo)
-structlive.dat: $(structlive_obj) $(QFCC_DEP)
+structlive.dat$(EXEEXT): $(structlive_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(structlive_obj)
 structlive.run: Makefile build-run
 	$(srcdir)/build-run $@
 
 structptr_dat_SOURCES=structptr.r
 structptr_obj=$(structptr_dat_SOURCES:.r=.qfo)
-structptr.dat: $(structptr_obj) $(QFCC_DEP)
+structptr.dat$(EXEEXT): $(structptr_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(structptr_obj)
 structptr.run: Makefile build-run
 	$(srcdir)/build-run $@
 
 vecinit_dat_SOURCES=vecinit.r
 vecinit_obj=$(vecinit_dat_SOURCES:.r=.qfo)
-vecinit.dat: $(vecinit_obj) $(QFCC_DEP)
+vecinit.dat$(EXEEXT): $(vecinit_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(vecinit_obj)
 vecinit.run: Makefile build-run
 	$(srcdir)/build-run $@
 
 while_dat_SOURCES=while.r
 while_obj=$(while_dat_SOURCES:.r=.qfo)
-while.dat: $(while_obj) $(QFCC_DEP)
+while.dat$(EXEEXT): $(while_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(while_obj)
 while.run: Makefile build-run
 	$(srcdir)/build-run $@
 
 voidfor_dat_SOURCES=voidfor.r
 voidfor_obj=$(voidfor_dat_SOURCES:.r=.qfo)
-voidfor.dat: $(voidfor_obj) $(QFCC_DEP)
+voidfor.dat$(EXEEXT): $(voidfor_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(voidfor_obj)
 voidfor.run: Makefile build-run
 	$(srcdir)/build-run $@

From 4c6478c77f4fa334889aad46fca08f90de1602e6 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 26 Nov 2013 14:27:49 +0900
Subject: [PATCH 0035/1519] Strip trailing spaces from field names.

A certain mod (glare at rogue) has a space at the end of a field name in
the bsp entity data causing a crash. Thanks to ccr for the report.
---
 libs/gamecode/pr_parse.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/libs/gamecode/pr_parse.c b/libs/gamecode/pr_parse.c
index 758e2c4cc..a8259ee78 100644
--- a/libs/gamecode/pr_parse.c
+++ b/libs/gamecode/pr_parse.c
@@ -305,7 +305,7 @@ ED_ConvertToPlist (script_t *script, int nohack)
 	plitem_t   *ent;
 	plitem_t   *key;
 	plitem_t   *value;
-	const char *token;
+	char       *token;
 	int         anglehack;
 
 	while (Script_GetToken (script, 1)) {
@@ -314,11 +314,18 @@ ED_ConvertToPlist (script_t *script, int nohack)
 			Sys_Error ("ED_ConvertToPlist: EOF without closing brace");
 		ent = PL_NewDictionary ();
 		while (1) {
+			int         n;
+
 			if (!Script_GetToken (script, 1))
 				Sys_Error ("ED_ConvertToPlist: EOF without closing brace");
 			token = script->token->str;
 			if (strequal (token, "}"))
 				break;
+			// hack to take care of trailing spaces in field names
+			// (looking at you, Rogue)
+			for (n = strlen (token); n && token[n - 1] == ' '; n--) {
+				token[n - 1] = 0;
+			}
 			anglehack = 0;
 			if (!nohack && strequal (token, "angle")) {
 				key = PL_NewString ("angles");

From 7de0317a22c76808f57ed55b6ae3b6108d03af8d Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 27 Nov 2013 16:08:30 +0900
Subject: [PATCH 0036/1519] Avoid a segfault at the end of hipnotic.

This is based on ccr's patch, but a little more thorough (he missed some
potential problems) and probably more readable (the original code wasn't
the greatest (still isn't, but...))..
---
 nq/source/cl_ents.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/nq/source/cl_ents.c b/nq/source/cl_ents.c
index 87f25f1ed..b6bac93cd 100644
--- a/nq/source/cl_ents.c
+++ b/nq/source/cl_ents.c
@@ -294,6 +294,7 @@ CL_RelinkEntities (void)
 	int         i, j;
 	int         entvalid;
 	vec3_t      delta;
+	int         model_flags;
 
 	r_data->player_entity = &cl_entities[cl.viewentity];
 
@@ -365,13 +366,16 @@ CL_RelinkEntities (void)
 		VectorCopy (ent_colormod[new->colormod], ent->colormod);
 		ent->colormod[3] = ENTALPHA_DECODE (new->alpha);
 
+		model_flags = 0;
+		if (ent->model)
+			model_flags = ent->model->flags;
 
 		if (cl_forcelink[i]) {
 			// The entity was not updated in the last message so move to the
 			// final spot
 			ent->pose1 = ent->pose2 = -1;
 			VectorCopy (new->origin, ent->origin);
-			if (!(ent->model->flags & EF_ROTATE))
+			if (!(model_flags & EF_ROTATE))
 				CL_TransformEntity (ent, new->angles, true);
 			if (i != cl.viewentity || chase_active->int_val) {
 				if (ent->efrag)
@@ -388,14 +392,14 @@ CL_RelinkEntities (void)
 				|| fabs (delta[2]) > 100) {
 				// assume a teleportation, not a motion
 				VectorCopy (new->origin, ent->origin);
-				if (!(ent->model->flags & EF_ROTATE))
+				if (!(model_flags & EF_ROTATE))
 					CL_TransformEntity (ent, new->angles, true);
 				ent->pose1 = ent->pose2 = -1;
 			} else {
 				vec3_t      angles, d;
 				// interpolate the origin and angles
 				VectorMultAdd (old->origin, f, delta, ent->origin);
-				if (!(ent->model->flags & EF_ROTATE)) {
+				if (!(model_flags & EF_ROTATE)) {
 					VectorSubtract (new->angles, old->angles, d);
 					for (j = 0; j < 3; j++) {
 						if (d[j] > 180)
@@ -420,7 +424,7 @@ CL_RelinkEntities (void)
 		}
 
 		// rotate binary objects locally
-		if (ent->model->flags & EF_ROTATE) {
+		if (model_flags & EF_ROTATE) {
 			vec3_t      angles;
 			VectorCopy (new->angles, angles);
 			angles[YAW] = bobjrotate;
@@ -431,7 +435,7 @@ CL_RelinkEntities (void)
 					  new->glow_color);
 		if (VectorDistance_fast (old->origin, ent->origin) > (256 * 256))
 			VectorCopy (ent->origin, old->origin);
-		if (ent->model->flags & ~EF_ROTATE)
+		if (model_flags & ~EF_ROTATE)
 			CL_ModelEffects (ent, i, new->glow_color);
 
 		cl_forcelink[i] = false;

From b133e9a092469eaeaf3c294d9c53cc02edb37529 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 17 Jan 2014 15:47:29 +0900
Subject: [PATCH 0037/1519] Remove a stray -e from bootstrap's error report.

Not sure it was there, unless I had intended -n.
---
 bootstrap | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap b/bootstrap
index 7e7aa4789..4986a6ca4 100755
--- a/bootstrap
+++ b/bootstrap
@@ -100,7 +100,7 @@ else
 fi
 
 if test -n "$errors" ; then
-	echo -e $errors
+	echo  "$errors"
 	exit 1
 fi
 

From d912970cd340631138695e8fe4b584814e99b73d Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 26 Feb 2013 18:55:37 +0900
Subject: [PATCH 0038/1519] Add support for segmented text files.

The idea comes from The OpenGL Shader Wrangler
(http://prideout.net/blog/?p=11). Text files are broken up into chunks via
lines beginning with -- (^-- in regex). The chunks are optionally named
with tags of the form: [0-9A-Za-z._]+. Unnamed chunks cannot be found.
Searching for chunks looks for the longest tag that matches the beginning
of the search tag (eg, a chunk named "Vertex" will be found with a search
tag of "Vertex.foo"). Note that '.' forms the units for the searc
("Vertex.foo" will not find "Vertex.f").

Unlike glsw, this implementation does not have the concept of effects keys
as that will be separate. Also, this implementation takes strings rather
than file names (thus is more generally useful).
---
 include/QF/Makefile.am     |   4 +-
 include/QF/segtext.h       |  58 ++++++++++
 libs/util/Makefile.am      |   4 +-
 libs/util/segtext.c        | 214 +++++++++++++++++++++++++++++++++++++
 libs/util/test/Makefile.am |   6 +-
 libs/util/test/test-seg.c  |  65 +++++++++++
 6 files changed, 346 insertions(+), 5 deletions(-)
 create mode 100644 include/QF/segtext.h
 create mode 100644 libs/util/segtext.c
 create mode 100644 libs/util/test/test-seg.c

diff --git a/include/QF/Makefile.am b/include/QF/Makefile.am
index 1283043da..ffb0ff56b 100644
--- a/include/QF/Makefile.am
+++ b/include/QF/Makefile.am
@@ -7,8 +7,8 @@ nobase_pkginclude_HEADERS = \
 	link.h llist.h locs.h mathlib.h mdfour.h mersenne.h model.h modelgen.h \
 	msg.h object.h pak.h pakfile.h pcx.h png.h plugin.h pr_comp.h pr_debug.h \
 	pr_obj.h progs.h qargs.h qdefs.h qendian.h qfplist.h qtypes.h quakefs.h \
-	quakeio.h render.h riff.h ruamoko.h set.h screen.h script.h sizebuf.h \
-	skin.h sound.h spritegn.h sys.h teamplay.h tga.h uint32.h va.h \
+	quakeio.h render.h riff.h ruamoko.h screen.h script.h segtext.h set.h \
+	sizebuf.h skin.h sound.h spritegn.h sys.h teamplay.h tga.h uint32.h va.h \
 	ver_check.h vid.h vrect.h view.h wad.h wadfile.h winding.h zone.h \
 	\
 	GL/ati.h GL/defines.h GL/extensions.h GL/funcs.h GL/qf_draw.h \
diff --git a/include/QF/segtext.h b/include/QF/segtext.h
new file mode 100644
index 000000000..1c781fcb9
--- /dev/null
+++ b/include/QF/segtext.h
@@ -0,0 +1,58 @@
+/*
+	segtext.h
+
+	Segmented text file handling
+
+	Copyright (C) 2013 Bill Currie <bill@taniwha.org>
+
+	Author: Bill Currie <bill@taniwha.org>
+	Date: 2013/02/26
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+
+#ifndef __QF_segtext_h
+#define __QF_segtext_h
+
+/** \defgroup segtext Segmented text files.
+	\ingroup utils
+
+	Based on The OpenGL Shader Wrangler: http://prideout.net/blog/?p=11
+*/
+
+typedef struct segchunk_s {
+	struct segchunk_s *next;
+	const char *tag;
+	const char *text;
+	int         start_line;
+} segchunk_t;
+
+typedef struct segtext_s {
+	struct segtext_s *next;
+	segchunk_t *chunk_list;
+	struct hashtab_s *tab;
+} segtext_t;
+
+segtext_t *Segtext_new (const char *src);
+void Segtext_delete (segtext_t *st);
+const segchunk_t *Segtext_FindChunk (const segtext_t *st, const char *tag);
+const char *Segtext_Find (const segtext_t *st, const char *tag);
+
+#endif//__QF_segtext_h
diff --git a/libs/util/Makefile.am b/libs/util/Makefile.am
index a54935e16..0c6421450 100644
--- a/libs/util/Makefile.am
+++ b/libs/util/Makefile.am
@@ -52,8 +52,8 @@ libQFutil_la_SOURCES= \
 	bspfile.c buildnum.c cbuf.c checksum.c cmd.c crc.c cvar.c dstring.c \
 	fendian.c hash.c idparse.c info.c link.c llist.c \
 	mathlib.c mdfour.c mersenne.c msg.c pakfile.c plugin.c qargs.c qendian.c \
-	qfplist.c quakefs.c quakeio.c riff.c script.c set.c sizebuf.c string.c \
-	sys.c va.c ver_check.c vrect.c wad.c wadfile.c zone.c \
+	qfplist.c quakefs.c quakeio.c riff.c script.c segtext.c set.c sizebuf.c \
+	string.c sys.c va.c ver_check.c vrect.c wad.c wadfile.c zone.c \
 	$(dirent) $(fnmatch) $(getopt)
 
 EXTRA_DIST= $(fnmatch_src) $(getopt_src)
diff --git a/libs/util/segtext.c b/libs/util/segtext.c
new file mode 100644
index 000000000..01268a9f0
--- /dev/null
+++ b/libs/util/segtext.c
@@ -0,0 +1,214 @@
+/*
+	segtext.c
+
+	Segmented text file handling
+
+	Copyright (C) 2013 Bill Currie <bill@taniwha.org>
+
+	Author: Bill Currie <bill@taniwha.org>
+	Date: 2013/02/26
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <ctype.h>
+
+#include "QF/alloc.h"
+#include "QF/hash.h"
+#include "QF/qtypes.h"
+#include "QF/segtext.h"
+
+static segchunk_t *free_chunks;
+static segtext_t *free_texts;
+
+static segchunk_t *
+new_chunk (void)
+{
+	segchunk_t *chunk;
+	ALLOC (64, segchunk_t, chunks, chunk);
+	return chunk;
+}
+
+static void
+delete_chunk (segchunk_t *chunk)
+{
+	FREE (chunks, chunk);
+}
+
+static segtext_t *
+new_text (void)
+{
+	segtext_t  *text;
+	ALLOC (64, segtext_t, texts, text);
+	return text;
+}
+
+static void
+delete_text (segtext_t *text)
+{
+	FREE (texts, text);
+}
+
+static const char *
+segtext_getkey (const void *sc, void *unused)
+{
+	segchunk_t *chunk = (segchunk_t *) sc;
+	if (!chunk->tag)
+		return "";
+	return chunk->tag;
+}
+
+static char *
+next_line (char *src, int *line)
+{
+	while (*src && *src != '\n')
+		src++;
+	if (*src == '\n') {
+		*line += 1;
+		src++;
+	}
+	return src;
+}
+
+static char *
+next_chunk (char *src, int *line)
+{
+	while (*src) {
+		// chunks begin on a line that starts with --
+		if (src[0] == '-' && src[1] == '-')
+			return src;
+		src = next_line (src, line);
+	}
+	// no next chunk
+	return 0;
+}
+
+static int
+is_tag_char (char ch)
+{
+	return isalnum ((byte) ch) || ch == '.' || ch == '_';
+}
+
+static char *
+find_tag (const char *src)
+{
+	const char *end;
+	char       *tag;
+
+	while (*src && *src != '\n' && !is_tag_char (*src))
+		src++;
+
+	for (end = src; is_tag_char (*end); end++)
+		;
+	if (end == src)
+		return 0;
+
+	tag = malloc (end - src + 1);
+	strncpy (tag, src, end - src);
+	tag[end - src] = 0;
+	return tag;
+}
+
+VISIBLE segtext_t *
+Segtext_new (const char *source_string)
+{
+	segchunk_t **chunk;
+	segtext_t  *text;
+	char       *src;
+	int         line = 1;
+
+	if (!source_string)
+		return 0;
+	text = new_text ();
+	text->tab = Hash_NewTable (61, segtext_getkey, 0, 0);
+
+	src = strdup (source_string);
+	// The first chunk is special in that it holds the pointer to the copied
+	// string data. The chunk itself has no name and may be empty.
+	chunk = &text->chunk_list;
+	*chunk = new_chunk ();
+	(*chunk)->tag = 0;
+	(*chunk)->text = src;
+	(*chunk)->start_line = line;
+
+	chunk = &(*chunk)->next;
+
+	while ((src = next_chunk (src, &line))) {
+		*src++ = 0;							// terminate the previous chunk
+		*chunk = new_chunk ();
+		(*chunk)->tag = find_tag (src);
+		(*chunk)->text = next_line (src, &line);
+		(*chunk)->start_line = line;
+		// If tags are duplicated, the first one takes precedence
+		if ((*chunk)->tag && !Hash_Find (text->tab, (*chunk)->tag))
+			Hash_Add (text->tab, *chunk);
+	}
+	return text;
+}
+
+VISIBLE void
+Segtext_delete (segtext_t *st)
+{
+	segchunk_t *chunk;
+
+	// the first chunk holds the pointer to the block holding all chunk data;
+	free ((char *) st->chunk_list->text);
+	while (st->chunk_list) {
+		chunk = st->chunk_list;
+		st->chunk_list = chunk->next;
+		if (chunk->tag)
+			free ((char *) chunk->tag);
+		delete_chunk (chunk);
+	}
+	Hash_DelTable (st->tab);
+	delete_text (st);
+}
+
+const segchunk_t *
+Segtext_FindChunk (const segtext_t *st, const char *tag)
+{
+	char       *sub;
+	char       *dot;
+	segchunk_t *chunk;
+
+	sub = alloca (strlen (tag) + 1);
+	strcpy (sub, tag);
+	do {
+		chunk = Hash_Find (st->tab, sub);
+		if (chunk)
+			return chunk;
+		dot = strrchr (sub, '.');
+		if (dot)
+			*dot = 0;
+	} while (dot);
+	return 0;
+}
+
+const char *
+Segtext_Find (const segtext_t *st, const char *tag)
+{
+	const segchunk_t *chunk = Segtext_FindChunk (st, tag);
+	if (chunk)
+		return chunk->text;
+	return 0;
+}
diff --git a/libs/util/test/Makefile.am b/libs/util/test/Makefile.am
index b9b3b8f9a..a7bdb5d4e 100644
--- a/libs/util/test/Makefile.am
+++ b/libs/util/test/Makefile.am
@@ -4,7 +4,7 @@ AM_CPPFLAGS= -I$(top_srcdir)/include
 
 check_PROGRAMS= \
 	test-bary test-cs test-dq test-half test-mat3 test-mat4 test-plist \
-	test-qfs test-quat test-seb test-set test-vrect
+	test-qfs test-quat test-seb test-seg test-set test-vrect
 
 test_bary_SOURCES=test-bary.c
 test_bary_LDADD=$(top_builddir)/libs/util/libQFutil.la
@@ -46,6 +46,10 @@ test_seb_SOURCES=test-seb.c
 test_seb_LDADD=$(top_builddir)/libs/util/libQFutil.la
 test_seb_DEPENDENCIES=$(top_builddir)/libs/util/libQFutil.la
 
+test_seg_SOURCES=test-seg.c
+test_seg_LDADD=$(top_builddir)/libs/util/libQFutil.la
+test_seg_DEPENDENCIES=$(top_builddir)/libs/util/libQFutil.la
+
 test_set_SOURCES=test-set.c
 test_set_LDADD=$(top_builddir)/libs/util/libQFutil.la
 test_set_DEPENDENCIES=$(top_builddir)/libs/util/libQFutil.la
diff --git a/libs/util/test/test-seg.c b/libs/util/test/test-seg.c
new file mode 100644
index 000000000..7c36cec17
--- /dev/null
+++ b/libs/util/test/test-seg.c
@@ -0,0 +1,65 @@
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#include <stdlib.h>
+#include <stdio.h>
+
+#include "QF/segtext.h"
+
+static const char *test_string =
+	"blah\n"
+	"-- Vertex\n"
+	"FOO\n"
+	"-- Geometry\n"
+	"BAR\n"
+	"-- Fragment.Erosion\n"
+	"BAZ\n"
+	"-- Fragment.Grassfire\n"
+	"QUX\n"
+	"-- TessControl\n"
+	"QUUX\n"
+	"-- TessEvaluation\n"
+	"QUUUX";
+
+struct {
+	const char *tag;
+	const char *expect;
+} seg_tests[] = {
+	{"", 0},						// empty tags not findable
+	{"Vertex", "FOO\n"},
+	{"Geometry", "BAR\n"},
+	{"Fragment.Erosion", "BAZ\n"},
+	{"Fragment.Grassfire", "QUX\n"},
+	{"TessControl", "QUUX\n"},
+	{"TessEvaluation", "QUUUX"},	// final chunk doesn't have \n
+	{"Vertex.Erosion", "FOO\n"},
+	{"Geometry.Grasfire", "BAR\n"},
+};
+#define num_seg_tests (sizeof (seg_tests) / sizeof (seg_tests[0]))
+
+int
+main (int argc, const char **argv)
+{
+	size_t      i;
+	int         res = 0;
+	segtext_t  *st;
+
+	st = Segtext_new (test_string);
+	for (i = 0; i < num_seg_tests; i++) {
+		const char *text = Segtext_Find (st, seg_tests[i].tag);
+		if ((!text != !seg_tests[i].expect)
+			&& (!text || !seg_tests[i].expect
+				|| strcmp (text, seg_tests[i].expect))) {
+			fprintf (stderr, "FAIL: (%zd) \"%s\" -> \"%s\", got \"%s\"\n", i,
+					 seg_tests[i].tag, seg_tests[i].expect, text);
+			res = 1;
+		}
+	}
+	return res;
+}

From d1848a93c8e97d1a44cffe36a25b0d0160ea97fe Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 26 Feb 2013 19:50:23 +0900
Subject: [PATCH 0039/1519] Add tests for chunk line numbers.

Which happen to find errors :P
---
 libs/util/test/test-seg.c | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/libs/util/test/test-seg.c b/libs/util/test/test-seg.c
index 7c36cec17..d67001394 100644
--- a/libs/util/test/test-seg.c
+++ b/libs/util/test/test-seg.c
@@ -43,6 +43,19 @@ struct {
 };
 #define num_seg_tests (sizeof (seg_tests) / sizeof (seg_tests[0]))
 
+struct {
+	const char *tag;
+	int         expect;
+} line_tests[] = {
+	{"Vertex", 3},
+	{"Geometry", 5},
+	{"Fragment.Erosion", 7},
+	{"Fragment.Grassfire", 9},
+	{"TessControl", 11},
+	{"TessEvaluation", 13},	// final chunk doesn't have \n
+};
+#define num_line_tests (sizeof (line_tests) / sizeof (line_tests[0]))
+
 int
 main (int argc, const char **argv)
 {
@@ -61,5 +74,14 @@ main (int argc, const char **argv)
 			res = 1;
 		}
 	}
+	for (i = 0; i < num_line_tests; i++) {
+		const segchunk_t *chunk = Segtext_FindChunk (st, line_tests[i].tag);
+		if (!chunk || chunk->start_line != line_tests[i].expect) {
+			fprintf (stderr, "FAIL: (%zd) \"%s\" -> %d, got %d\n", i,
+					 line_tests[i].tag, line_tests[i].expect,
+					 chunk->start_line);
+			res = 1;
+		}
+	}
 	return res;
 }

From 3b56f0e3bfb3555b58f85b9bc0830203357c14cd Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 26 Feb 2013 19:51:26 +0900
Subject: [PATCH 0040/1519] Advance src with next_line.

This fixes the double counting of the \n at the end of the chunk separator
line.
---
 libs/util/segtext.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libs/util/segtext.c b/libs/util/segtext.c
index 01268a9f0..9ae516b6f 100644
--- a/libs/util/segtext.c
+++ b/libs/util/segtext.c
@@ -157,7 +157,8 @@ Segtext_new (const char *source_string)
 		*src++ = 0;							// terminate the previous chunk
 		*chunk = new_chunk ();
 		(*chunk)->tag = find_tag (src);
-		(*chunk)->text = next_line (src, &line);
+		src = next_line (src, &line);
+		(*chunk)->text = src;
 		(*chunk)->start_line = line;
 		// If tags are duplicated, the first one takes precedence
 		if ((*chunk)->tag && !Hash_Find (text->tab, (*chunk)->tag))

From 96c40cb9a1ac026985519100c5f8d3cc8273f3c9 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 26 Feb 2013 21:52:35 +0900
Subject: [PATCH 0041/1519] Add basic support for shader "effects".

Again, based on The OpenGL Shader Wrangler. The wrangling part is not used
yet, but the shader compiler has been modified to take the built up shader.
Just to keep things compiling, a wrapper has been temporarily created.
---
 include/QF/GLSL/qf_vid.h                   |  14 +-
 libs/video/renderer/glsl/Makefile.am       |   4 +-
 libs/video/renderer/glsl/glsl_alias.c      |   4 +-
 libs/video/renderer/glsl/glsl_bsp.c        |  12 +-
 libs/video/renderer/glsl/glsl_draw.c       |   4 +-
 libs/video/renderer/glsl/glsl_iqm.c        |   4 +-
 libs/video/renderer/glsl/glsl_particles.c  |   8 +-
 libs/video/renderer/glsl/glsl_shader.c     | 161 +++++++++++++++++++++
 libs/video/renderer/glsl/glsl_sprite.c     |   4 +-
 libs/video/renderer/glsl/vid_common_glsl.c |  31 ++--
 10 files changed, 213 insertions(+), 33 deletions(-)
 create mode 100644 libs/video/renderer/glsl/glsl_shader.c

diff --git a/include/QF/GLSL/qf_vid.h b/include/QF/GLSL/qf_vid.h
index 8240db436..c08354037 100644
--- a/include/QF/GLSL/qf_vid.h
+++ b/include/QF/GLSL/qf_vid.h
@@ -30,6 +30,12 @@
 
 #include "QF/qtypes.h"
 
+typedef struct shader_s {
+	int         num_strings;
+	const char **strings;
+	const char **src;
+} shader_t;
+
 typedef struct shaderparam_s {
 	const char *name;
 	qboolean    uniform;
@@ -40,9 +46,15 @@ extern int glsl_palette;
 extern int glsl_colormap;
 
 void GLSL_Init_Common (void);
-int GLSL_CompileShader (const char *name, const char *shader_src, int type);
+
+int GLSL_CompileShader (const char *name, const shader_t *shader, int type);
+int GLSL_CompileShaderS (const char *name, const char *src, int type);
 int GLSL_LinkProgram (const char *name, int vert, int frag);
 int GLSL_ResolveShaderParam (int program, shaderparam_t *param);
 void GLSL_DumpAttribArrays (void);
 
+int GLSL_RegisterEffect (const char *name, const char *src);
+shader_t *GLSL_BuildShader (const char **effect_keys);
+void GLSL_FreeShader (shader_t *shader);
+
 #endif // __QF_GLSL_vid_h
diff --git a/libs/video/renderer/glsl/Makefile.am b/libs/video/renderer/glsl/Makefile.am
index c85b7a6fe..1b8208769 100644
--- a/libs/video/renderer/glsl/Makefile.am
+++ b/libs/video/renderer/glsl/Makefile.am
@@ -17,8 +17,8 @@ shader_gen= \
 
 glsl_src = \
 	glsl_alias.c glsl_bsp.c glsl_draw.c glsl_fog.c glsl_iqm.c glsl_lightmap.c \
-	glsl_main.c glsl_particles.c glsl_screen.c glsl_sprite.c glsl_textures.c \
-	qfglsl.c vid_common_glsl.c
+	glsl_main.c glsl_particles.c glsl_screen.c glsl_shader.c glsl_sprite.c \
+	glsl_textures.c qfglsl.c vid_common_glsl.c
 
 noinst_LTLIBRARIES=	libglsl.la
 BUILT_SOURCES= $(shader_gen)
diff --git a/libs/video/renderer/glsl/glsl_alias.c b/libs/video/renderer/glsl/glsl_alias.c
index b8925ad0f..2a2a3560b 100644
--- a/libs/video/renderer/glsl/glsl_alias.c
+++ b/libs/video/renderer/glsl/glsl_alias.c
@@ -113,9 +113,9 @@ glsl_R_InitAlias (void)
 	int         vert;
 	int         frag;
 
-	vert = GLSL_CompileShader ("quakemdl.vert", quakemdl_vert,
+	vert = GLSL_CompileShaderS ("quakemdl.vert", quakemdl_vert,
 							   GL_VERTEX_SHADER);
-	frag = GLSL_CompileShader ("quakemdl.frag", quakemdl_frag,
+	frag = GLSL_CompileShaderS ("quakemdl.frag", quakemdl_frag,
 							   GL_FRAGMENT_SHADER);
 	quake_mdl.program = GLSL_LinkProgram ("quakemdl", vert, frag);
 	GLSL_ResolveShaderParam (quake_mdl.program, &quake_mdl.mvp_matrix);
diff --git a/libs/video/renderer/glsl/glsl_bsp.c b/libs/video/renderer/glsl/glsl_bsp.c
index 13aad5a95..8de55a9bd 100644
--- a/libs/video/renderer/glsl/glsl_bsp.c
+++ b/libs/video/renderer/glsl/glsl_bsp.c
@@ -1244,9 +1244,9 @@ glsl_R_InitBsp (void)
 	int         vert;
 	int         frag;
 
-	vert = GLSL_CompileShader ("quakebsp.vert", quakebsp_vert,
+	vert = GLSL_CompileShaderS ("quakebsp.vert", quakebsp_vert,
 							   GL_VERTEX_SHADER);
-	frag = GLSL_CompileShader ("quakebsp.frag", quakebsp_frag,
+	frag = GLSL_CompileShaderS ("quakebsp.frag", quakebsp_frag,
 							   GL_FRAGMENT_SHADER);
 	quake_bsp.program = GLSL_LinkProgram ("quakebsp", vert, frag);
 	GLSL_ResolveShaderParam (quake_bsp.program, &quake_bsp.mvp_matrix);
@@ -1258,7 +1258,7 @@ glsl_R_InitBsp (void)
 	GLSL_ResolveShaderParam (quake_bsp.program, &quake_bsp.color);
 	GLSL_ResolveShaderParam (quake_bsp.program, &quake_bsp.fog);
 
-	frag = GLSL_CompileShader ("quaketrb.frag", quaketurb_frag,
+	frag = GLSL_CompileShaderS ("quaketrb.frag", quaketurb_frag,
 							   GL_FRAGMENT_SHADER);
 	quake_turb.program = GLSL_LinkProgram ("quaketrb", vert, frag);
 	GLSL_ResolveShaderParam (quake_turb.program, &quake_turb.mvp_matrix);
@@ -1270,9 +1270,9 @@ glsl_R_InitBsp (void)
 	GLSL_ResolveShaderParam (quake_turb.program, &quake_turb.color);
 	GLSL_ResolveShaderParam (quake_turb.program, &quake_turb.fog);
 
-	vert = GLSL_CompileShader ("quakesky.vert", quakesky_vert,
+	vert = GLSL_CompileShaderS ("quakesky.vert", quakesky_vert,
 							   GL_VERTEX_SHADER);
-	frag = GLSL_CompileShader ("quakeski.frag", quakeskyid_frag,
+	frag = GLSL_CompileShaderS ("quakeski.frag", quakeskyid_frag,
 							   GL_FRAGMENT_SHADER);
 	quake_skyid.program = GLSL_LinkProgram ("quakeskyid", vert, frag);
 	GLSL_ResolveShaderParam (quake_skyid.program, &quake_skyid.mvp_matrix);
@@ -1284,7 +1284,7 @@ glsl_R_InitBsp (void)
 	GLSL_ResolveShaderParam (quake_skyid.program, &quake_skyid.realtime);
 	GLSL_ResolveShaderParam (quake_skyid.program, &quake_skyid.fog);
 
-	frag = GLSL_CompileShader ("quakeskb.frag", quakeskybox_frag,
+	frag = GLSL_CompileShaderS ("quakeskb.frag", quakeskybox_frag,
 							   GL_FRAGMENT_SHADER);
 	quake_skybox.program = GLSL_LinkProgram ("quakeskybox", vert, frag);
 	GLSL_ResolveShaderParam (quake_skybox.program, &quake_skybox.mvp_matrix);
diff --git a/libs/video/renderer/glsl/glsl_draw.c b/libs/video/renderer/glsl/glsl_draw.c
index e7209bd53..9be2635cc 100644
--- a/libs/video/renderer/glsl/glsl_draw.c
+++ b/libs/video/renderer/glsl/glsl_draw.c
@@ -381,9 +381,9 @@ glsl_Draw_Init (void)
 
 	draw_queue = dstring_new ();
 
-	vert = GLSL_CompileShader ("quakeico.vert", quakeicon_vert,
+	vert = GLSL_CompileShaderS ("quakeico.vert", quakeicon_vert,
 							   GL_VERTEX_SHADER);
-	frag = GLSL_CompileShader ("quake2d.frag", quake2d_frag,
+	frag = GLSL_CompileShaderS ("quake2d.frag", quake2d_frag,
 							   GL_FRAGMENT_SHADER);
 	quake_2d.program = GLSL_LinkProgram ("quake2d", vert, frag);
 	GLSL_ResolveShaderParam (quake_2d.program, &quake_2d.texture);
diff --git a/libs/video/renderer/glsl/glsl_iqm.c b/libs/video/renderer/glsl/glsl_iqm.c
index 17302d7aa..b8cae10bd 100644
--- a/libs/video/renderer/glsl/glsl_iqm.c
+++ b/libs/video/renderer/glsl/glsl_iqm.c
@@ -140,8 +140,8 @@ glsl_R_InitIQM (void)
 	int         frag;
 	int         i;
 
-	vert = GLSL_CompileShader ("iqm.vert", iqm_vert, GL_VERTEX_SHADER);
-	frag = GLSL_CompileShader ("iqm.frag", iqm_frag, GL_FRAGMENT_SHADER);
+	vert = GLSL_CompileShaderS ("iqm.vert", iqm_vert, GL_VERTEX_SHADER);
+	frag = GLSL_CompileShaderS ("iqm.frag", iqm_frag, GL_FRAGMENT_SHADER);
 	iqm_shader.program = GLSL_LinkProgram ("iqm", vert, frag);
 	GLSL_ResolveShaderParam (iqm_shader.program, &iqm_shader.mvp_matrix);
 	GLSL_ResolveShaderParam (iqm_shader.program, &iqm_shader.norm_matrix);
diff --git a/libs/video/renderer/glsl/glsl_particles.c b/libs/video/renderer/glsl/glsl_particles.c
index 8d4819fec..4d870623f 100644
--- a/libs/video/renderer/glsl/glsl_particles.c
+++ b/libs/video/renderer/glsl/glsl_particles.c
@@ -223,9 +223,9 @@ glsl_R_InitParticles (void)
 	qfeglGetFloatv (GL_ALIASED_POINT_SIZE_RANGE, v);
 	Sys_MaskPrintf (SYS_GLSL, "point size: %g - %g\n", v[0], v[1]);
 
-	vert = GLSL_CompileShader ("quakepnt.vert", quakepoint_vert,
+	vert = GLSL_CompileShaderS ("quakepnt.vert", quakepoint_vert,
 							   GL_VERTEX_SHADER);
-	frag = GLSL_CompileShader ("quakepnt.frag", quakepoint_frag,
+	frag = GLSL_CompileShaderS ("quakepnt.frag", quakepoint_frag,
 							   GL_FRAGMENT_SHADER);
 	quake_point.program = GLSL_LinkProgram ("quakepoint", vert, frag);
 	GLSL_ResolveShaderParam (quake_point.program, &quake_point.mvp_matrix);
@@ -234,9 +234,9 @@ glsl_R_InitParticles (void)
 	GLSL_ResolveShaderParam (quake_point.program, &quake_point.color);
 	GLSL_ResolveShaderParam (quake_point.program, &quake_point.fog);
 
-	vert = GLSL_CompileShader ("quakepar.vert", quakepart_vert,
+	vert = GLSL_CompileShaderS ("quakepar.vert", quakepart_vert,
 							   GL_VERTEX_SHADER);
-	frag = GLSL_CompileShader ("quakepar.frag", quakepart_frag,
+	frag = GLSL_CompileShaderS ("quakepar.frag", quakepart_frag,
 							   GL_FRAGMENT_SHADER);
 	quake_part.program = GLSL_LinkProgram ("quakepart", vert, frag);
 	GLSL_ResolveShaderParam (quake_part.program, &quake_part.mvp_matrix);
diff --git a/libs/video/renderer/glsl/glsl_shader.c b/libs/video/renderer/glsl/glsl_shader.c
new file mode 100644
index 000000000..4fb317b04
--- /dev/null
+++ b/libs/video/renderer/glsl/glsl_shader.c
@@ -0,0 +1,161 @@
+/*
+	glsl_shader.c
+
+	Shader management based on The OpenGL Shader Wrangler
+	http://prideout.net/blog/?p=11
+
+	Copyright (C) 2013 Bill Currie <bill@taniwha.org>
+
+	Author: Bill Currie <bill@taniwha.org>
+	Date: 2013/02/26
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include "QF/alloc.h"
+#include "QF/dstring.h"
+#include "QF/hash.h"
+#include "QF/segtext.h"
+#include "QF/sys.h"
+#include "QF/va.h"
+
+#include "QF/GLSL/qf_vid.h"
+
+typedef struct glsl_effect_s {
+	struct glsl_effect_s *next;
+	const char *name;
+	segtext_t  *text;
+} glsl_effect_t;
+
+static hashtab_t *effect_tab;
+static glsl_effect_t *free_effects;
+
+static glsl_effect_t *
+new_effect (void)
+{
+	glsl_effect_t *effect;
+	ALLOC (64, glsl_effect_t, effects, effect);
+	return effect;
+}
+
+static const char *
+effect_get_key (const void *e, void *unused)
+{
+	glsl_effect_t *effect = (glsl_effect_t *) e;
+	return effect->name;
+}
+
+int
+GLSL_RegisterEffect (const char *name, const char *src)
+{
+	glsl_effect_t *effect;
+	segtext_t  *text;
+
+	if (!effect_tab)
+		effect_tab = Hash_NewTable (61, effect_get_key, 0, 0);
+
+	if (Hash_Find (effect_tab, name)) {
+		Sys_Printf ("WARNING: ignoring duplicate '%s' effect\n", name);
+		return 0;
+	}
+	text = Segtext_new (src);
+	if (!text) {
+		Sys_Printf ("WARNING: %s: problem parsing effect source\n", name);
+		return 0;
+	}
+	effect = new_effect ();
+	effect->name = strdup (name);
+	effect->text = text;
+	Hash_Add (effect_tab, effect);
+	return 1;
+}
+
+shader_t *
+GLSL_BuildShader (const char **effect_keys)
+{
+	const char *dot;
+	const char **key;
+	int         num_keys = 0;
+	shader_t   *shader;
+	dstring_t  *ekey;
+	glsl_effect_t *effect;
+	const segchunk_t *chunk;
+
+	for (key = effect_keys; *key; key++)
+		num_keys++;
+
+	shader = malloc (sizeof (shader_t));
+	shader->num_strings = num_keys;
+	shader->strings = calloc (2, num_keys);
+	shader->src = shader->strings + num_keys;
+
+	ekey = dstring_new ();
+	for (key = effect_keys; *key; key++) {
+		int         num = key - effect_keys;
+		dot = strchr (*key, '.');
+		if (!dot) {
+			Sys_Printf ("Invalid effect key: '%s'\n", *key);
+			goto error;
+		}
+		dstring_copysubstr (ekey, *key, dot - *key);
+		effect = Hash_Find (effect_tab, ekey->str);
+		if (!effect) {
+			Sys_Printf ("Unknown effect: '%s'\n", ekey->str);
+			goto error;
+		}
+		dot++;
+		chunk = Segtext_FindChunk (effect->text, dot);
+		if (!chunk) {
+			Sys_Printf ("Unknown shader key: '%s'\n", dot);
+			goto error;
+		}
+		shader->strings[num] = nva ("#line %d\n%s", chunk->start_line,
+									chunk->text);
+		shader->src[num] = strdup (ekey->str);
+	}
+	dstring_delete (ekey);
+	return shader;
+error:
+	// there is guaranteed to be a null in the array if an error occurs.
+	for (key = shader->strings; *key; key++) {
+		free ((char *) *key);
+		free ((char *) shader->src[key - shader->strings]);
+	}
+	free (shader->strings);
+	free (shader);
+	dstring_delete (ekey);
+	return 0;
+}
+
+void
+GLSL_FreeShader (shader_t *shader)
+{
+	int         i;
+
+	for (i = 0; i < shader->num_strings; i++) {
+		free ((char *) shader->strings[i]);
+		free ((char *) shader->src[i]);
+	}
+	free (shader->strings);
+	free (shader);
+}
diff --git a/libs/video/renderer/glsl/glsl_sprite.c b/libs/video/renderer/glsl/glsl_sprite.c
index a5b02b42a..ab96b137e 100644
--- a/libs/video/renderer/glsl/glsl_sprite.c
+++ b/libs/video/renderer/glsl/glsl_sprite.c
@@ -98,9 +98,9 @@ glsl_R_InitSprites (void)
 {
 	int         frag, vert;
 
-	vert = GLSL_CompileShader ("quakespr.vert", quakesprite_vert,
+	vert = GLSL_CompileShaderS ("quakespr.vert", quakesprite_vert,
 							   GL_VERTEX_SHADER);
-	frag = GLSL_CompileShader ("quakespr.frag", quakesprite_frag,
+	frag = GLSL_CompileShaderS ("quakespr.frag", quakesprite_frag,
 							   GL_FRAGMENT_SHADER);
 	quake_sprite.program = GLSL_LinkProgram ("quakespr", vert, frag);
 	GLSL_ResolveShaderParam (quake_sprite.program, &quake_sprite.spritea);
diff --git a/libs/video/renderer/glsl/vid_common_glsl.c b/libs/video/renderer/glsl/vid_common_glsl.c
index 4c46a56d5..6664eb841 100644
--- a/libs/video/renderer/glsl/vid_common_glsl.c
+++ b/libs/video/renderer/glsl/vid_common_glsl.c
@@ -184,33 +184,40 @@ GLSL_Init_Common (void)
 }
 
 int
-GLSL_CompileShader (const char *name, const char *shader_src, int type)
+GLSL_CompileShader (const char *name, const shader_t *shader, int type)
 {
-	const char *src[1];
-	int         shader;
+	int         sid;
 	int         compiled;
 
-	src[0] = shader_src;
-	shader = qfeglCreateShader (type);
-	qfeglShaderSource (shader, 1, src, 0);
-	qfeglCompileShader (shader);
-	qfeglGetShaderiv (shader, GL_COMPILE_STATUS, &compiled);
+	sid = qfeglCreateShader (type);
+	qfeglShaderSource (sid, shader->num_strings, shader->strings, 0);
+	qfeglCompileShader (sid);
+	qfeglGetShaderiv (sid, GL_COMPILE_STATUS, &compiled);
 	if (!compiled || (developer->int_val & SYS_GLSL)) {
 		dstring_t  *log = dstring_new ();
 		int         size;
-		qfeglGetShaderiv (shader, GL_INFO_LOG_LENGTH, &size);
+		qfeglGetShaderiv (sid, GL_INFO_LOG_LENGTH, &size);
 		log->size = size + 1;	// for terminating null
 		dstring_adjust (log);
-		qfeglGetShaderInfoLog (shader, log->size, 0, log->str);
+		qfeglGetShaderInfoLog (sid, log->size, 0, log->str);
 		if (!compiled)
-			qfeglDeleteShader (shader);
+			qfeglDeleteShader (sid);
 		Sys_Printf ("Shader (%s) compile log:\n----8<----\n%s----8<----\n",
 					name, log->str);
 		dstring_delete (log);
 		if (!compiled)
 			return 0;
 	}
-	return shader;
+	return sid;
+}
+
+int
+GLSL_CompileShaderS (const char *name, const char *src, int type)
+{
+	const char *shader_src = src;
+	const char *shader_name = "wrapped";
+	shader_t    shader = {1, &shader_src, &shader_name};
+	return GLSL_CompileShader (name, &shader, type);
 }
 
 static const char *

From 550f1ae7889cb3137f08fff429c037e5683484bf Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 12 May 2013 13:11:26 +0900
Subject: [PATCH 0042/1519] Fix some bitrot.

Just updating for the changes to the ALLOC/FREE macros.
---
 libs/util/segtext.c                    | 4 ++--
 libs/video/renderer/glsl/glsl_shader.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libs/util/segtext.c b/libs/util/segtext.c
index 9ae516b6f..742983be1 100644
--- a/libs/util/segtext.c
+++ b/libs/util/segtext.c
@@ -38,8 +38,8 @@
 #include "QF/qtypes.h"
 #include "QF/segtext.h"
 
-static segchunk_t *free_chunks;
-static segtext_t *free_texts;
+static segchunk_t *chunks_freelist;
+static segtext_t *texts_freelist;
 
 static segchunk_t *
 new_chunk (void)
diff --git a/libs/video/renderer/glsl/glsl_shader.c b/libs/video/renderer/glsl/glsl_shader.c
index 4fb317b04..bc3a7c546 100644
--- a/libs/video/renderer/glsl/glsl_shader.c
+++ b/libs/video/renderer/glsl/glsl_shader.c
@@ -48,7 +48,7 @@ typedef struct glsl_effect_s {
 } glsl_effect_t;
 
 static hashtab_t *effect_tab;
-static glsl_effect_t *free_effects;
+static glsl_effect_t *effects_freelist;
 
 static glsl_effect_t *
 new_effect (void)

From 323fbe192708242bebfce3980c263f791ea33837 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 12 May 2013 13:50:17 +0900
Subject: [PATCH 0043/1519] Fix an allocation oopsie.

I must have been tired when I wrote that line.
---
 libs/video/renderer/glsl/glsl_shader.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/video/renderer/glsl/glsl_shader.c b/libs/video/renderer/glsl/glsl_shader.c
index bc3a7c546..d38bb2c29 100644
--- a/libs/video/renderer/glsl/glsl_shader.c
+++ b/libs/video/renderer/glsl/glsl_shader.c
@@ -106,7 +106,7 @@ GLSL_BuildShader (const char **effect_keys)
 
 	shader = malloc (sizeof (shader_t));
 	shader->num_strings = num_keys;
-	shader->strings = calloc (2, num_keys);
+	shader->strings = calloc (2 * num_keys, sizeof (const char *));
 	shader->src = shader->strings + num_keys;
 
 	ekey = dstring_new ();

From 4bd82eb2b818676311d681f55d1cf9e8184187a0 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 12 May 2013 13:50:43 +0900
Subject: [PATCH 0044/1519] Add some documentation.

Nowhere near adequate.
---
 include/QF/GLSL/qf_vid.h | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/include/QF/GLSL/qf_vid.h b/include/QF/GLSL/qf_vid.h
index c08354037..1dd324f05 100644
--- a/include/QF/GLSL/qf_vid.h
+++ b/include/QF/GLSL/qf_vid.h
@@ -53,8 +53,36 @@ int GLSL_LinkProgram (const char *name, int vert, int frag);
 int GLSL_ResolveShaderParam (int program, shaderparam_t *param);
 void GLSL_DumpAttribArrays (void);
 
+/*	Register a shader effect "file".
+
+	This is based on The OpenGL Shader Wrangler by the little grasshopper
+	(http://prideout.net/blog/?p=11).
+
+	\param name		The name of the effect in the effect key.
+	\param src		The string holding the effect file.
+	\return			0 for failure, 1 for success.
+*/
 int GLSL_RegisterEffect (const char *name, const char *src);
+
+/*	Build a shader program script from a list of effect keys.
+
+	This is based on The OpenGL Shader Wrangler by the little grasshopper
+	(http://prideout.net/blog/?p=11).
+
+	The returned shader program script is suitable for passing directly to
+	GLSL_CompileShader.
+
+	\param effect_keys	Null terminated list of effect keys. The shader will be
+					built from the specified segments in the given order.
+	\return			A pointer to the built up shader program script, or null on
+					failure.
+*/
 shader_t *GLSL_BuildShader (const char **effect_keys);
+
+/*	Free a shader program script built by GLSL_BuildShader.
+
+	\param shader	The shader program script to be freed.
+*/
 void GLSL_FreeShader (shader_t *shader);
 
 #endif // __QF_GLSL_vid_h

From b269338947939cb8ad0f658a68acd92e53a0e648 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 12 May 2013 13:51:02 +0900
Subject: [PATCH 0045/1519] Start using the new shader system.

So far, alias model rendering is the only victim, but things are working,
even if only color map lookup and fog blending are broken out at this
stage.

I expect the effect naming scheme will go through some changes until I'm
happy with it.
---
 libs/video/renderer/glsl/Makefile.am       |   8 +-
 libs/video/renderer/glsl/glsl_alias.c      |  25 ++--
 libs/video/renderer/glsl/quakeforge.glsl   | 152 +++++++++++++++++++++
 libs/video/renderer/glsl/quakemdl.frag     |  42 ------
 libs/video/renderer/glsl/quakemdl.vert     |  27 ----
 libs/video/renderer/glsl/vid_common_glsl.c |   6 +
 6 files changed, 180 insertions(+), 80 deletions(-)
 create mode 100644 libs/video/renderer/glsl/quakeforge.glsl
 delete mode 100644 libs/video/renderer/glsl/quakemdl.frag
 delete mode 100644 libs/video/renderer/glsl/quakemdl.vert

diff --git a/libs/video/renderer/glsl/Makefile.am b/libs/video/renderer/glsl/Makefile.am
index 1b8208769..dd65e2f0b 100644
--- a/libs/video/renderer/glsl/Makefile.am
+++ b/libs/video/renderer/glsl/Makefile.am
@@ -3,13 +3,13 @@ AUTOMAKE_OPTIONS= foreign
 AM_CFLAGS= @PREFER_PIC@
 AM_CPPFLAGS= -I$(top_srcdir)/include $(GLX_CFLAGS)
 
-shader_src= \
+shader_src= quakeforge.glsl \
 	iqm.frag iqm.vert \
 	quake2d.frag quakebsp.frag quakebsp.vert quakeico.vert quakemdl.frag \
 	quakemdl.vert quakepar.frag quakepar.vert quakepnt.frag quakepnt.vert \
 	quakeskb.frag quakeski.frag quakesky.vert quakespr.frag quakespr.vert \
 	quaketrb.frag quaketxt.vert
-shader_gen= \
+shader_gen= quakeforge.slc \
 	iqm.fc iqm.vc \
 	quake2d.fc quakebsp.fc quakebsp.vc quakeico.vc quakemdl.fc quakemdl.vc \
 	quakepar.fc quakepar.vc quakepnt.fc quakepnt.vc quakeskb.fc quakeski.fc \
@@ -23,7 +23,9 @@ glsl_src = \
 noinst_LTLIBRARIES=	libglsl.la
 BUILT_SOURCES= $(shader_gen)
 
-SUFFICES=.frag .vert .fc .vc
+SUFFICES=.frag .vert .fc .vc .slc .glsl
+.glsl.slc:
+	sed -e 's/^/"/' -e 's/$$/\\n"/' $< > $@
 .frag.fc:
 	sed -e 's/^/"/' -e 's/$$/\\n"/' $< > $@
 .vert.vc:
diff --git a/libs/video/renderer/glsl/glsl_alias.c b/libs/video/renderer/glsl/glsl_alias.c
index 2a2a3560b..ddbec7b04 100644
--- a/libs/video/renderer/glsl/glsl_alias.c
+++ b/libs/video/renderer/glsl/glsl_alias.c
@@ -55,13 +55,17 @@
 
 #include "r_internal.h"
 
-static const char quakemdl_vert[] =
-#include "quakemdl.vc"
-;
+static const char *alias_vert_effects[] =
+{
+	"QuakeForge.Vertex.mdl",
+};
 
-static const char quakemdl_frag[] =
-#include "quakemdl.fc"
-;
+static const char *alias_frag_effects[] =
+{
+	"QuakeForge.Fragment.fog",
+	"QuakeForge.Fragment.colormap",
+	"QuakeForge.Fragment.mdl",
+};
 
 static struct {
 	int         program;
@@ -110,12 +114,15 @@ static mat4_t alias_vp;
 void
 glsl_R_InitAlias (void)
 {
+	shader_t   *vert_shader, *frag_shader;
 	int         vert;
 	int         frag;
 
-	vert = GLSL_CompileShaderS ("quakemdl.vert", quakemdl_vert,
+	vert_shader = GLSL_BuildShader (alias_vert_effects);
+	frag_shader = GLSL_BuildShader (alias_frag_effects);
+	vert = GLSL_CompileShader ("quakemdl.vert", vert_shader,
 							   GL_VERTEX_SHADER);
-	frag = GLSL_CompileShaderS ("quakemdl.frag", quakemdl_frag,
+	frag = GLSL_CompileShader ("quakemdl.frag", frag_shader,
 							   GL_FRAGMENT_SHADER);
 	quake_mdl.program = GLSL_LinkProgram ("quakemdl", vert, frag);
 	GLSL_ResolveShaderParam (quake_mdl.program, &quake_mdl.mvp_matrix);
@@ -136,6 +143,8 @@ glsl_R_InitAlias (void)
 	GLSL_ResolveShaderParam (quake_mdl.program, &quake_mdl.shadelight);
 	GLSL_ResolveShaderParam (quake_mdl.program, &quake_mdl.lightvec);
 	GLSL_ResolveShaderParam (quake_mdl.program, &quake_mdl.fog);
+	GLSL_FreeShader (vert_shader);
+	GLSL_FreeShader (frag_shader);
 }
 
 static void
diff --git a/libs/video/renderer/glsl/quakeforge.glsl b/libs/video/renderer/glsl/quakeforge.glsl
new file mode 100644
index 000000000..cfb296307
--- /dev/null
+++ b/libs/video/renderer/glsl/quakeforge.glsl
@@ -0,0 +1,152 @@
+-- Math.const
+
+const float PI = 3.14159265;
+const float E = 2.71828183;
+
+-- Math.quaternion
+
+vec3
+qmult (vec4 q, vec3 v)
+{
+	float       qc = q.w;
+	vec3        qv = q.xyz;
+	vec3        t = cross (qv, v);
+	return (qs * qs) * v + 2.0 * qs * t + dot (qv, v) * qv + cross (qv, t);
+}
+
+vec3
+dqtrans (vec4 q0, vec4 qe)
+{//2.0 * (q0.w * qe.xyz - qe.w * q0.xyz - cross (qe.xyz, q0.xyz));
+	float       qs = q0.w, Ts = qe.w;
+	vec3        qv = -q0.xyz, Tv = qe.xyz;
+
+	return 2.0 * (Ts * qv + qs * Tv + cross (Tv, qv));
+}
+
+-- Fragment.fog
+
+uniform vec4 fog;
+
+vec4
+fogBlend (vec4 color)
+{
+	float       fog_factor;
+	float       az = fog.a * gl_FragCoord.z / gl_FragCoord.w;
+	vec4        fog_color = vec4 (fog.rgb, 1.0);
+
+	fog_factor = exp (-az * az);
+	return vec4 (mix (fog_color.rgb, color.rgb, fog_factor), color.a);
+}
+
+-- Fragment.colormap
+
+uniform sampler2D colormap;
+
+vec4
+mappedColor (float pix, float light)
+{
+	return texture2D (colormap, vec2 (pix, light));
+}
+
+-- Fragment.turb
+
+const float SPEED = 20.0;
+const float CYCLE = 128.0;
+const float FACTOR = PI * 2.0 / CYCLE;
+const vec2 BIAS = vec2 (1.0, 1.0)
+const float SCALE = 8.0;
+
+vec2
+turb_st (vec2 st, float time)
+{
+	vec2        angle = st.ts * CYCLE / 2.0;
+	vec2        phase = vec2 (time, time) * SPEED;
+	return st + (sin ((angle + phase) * FACTOR) + BIAS) / SCALE;
+}
+
+-- Fragment.skydome
+
+uniform sampler2D palette;
+uniform sampler2D solid;
+uniform sampler2D trans;
+uniform float time
+varying vec3 direction
+
+const float SCALE = 189.0 / 64.0;
+
+vec4
+skydome (dir, time)
+{
+	float       len;
+	float       pix;
+	vec2        flow = vec2 (1.0, 1.0);
+	vec2        st, base;
+	vec3        dir = direction;
+
+	dir.z *= 3.0;
+	len = dot (dir, dir);
+	len = SCALE * inversesqrt (len);
+
+	base = dir.yx * vec2(1.0, -1.0) * len;
+	st = base + flow * time / 8.0;
+	pix = texture2D (trans, st).r;
+	if (pix == 0.0) {
+		st = base + flow * realtime / 16.0;
+		pix = texture2D (solid, st).r;
+	}
+	return texture2D (palette, pix);
+}
+
+-- Vertex.mdl
+uniform mat4 mvp_mat;
+uniform mat3 norm_mat;
+uniform vec2 skin_size;
+uniform float blend;
+
+attribute vec4 vcolora, vcolorb;
+attribute vec2 vsta, vstb;
+attribute vec3 vnormala, vnormalb;
+attribute vec3 vertexa, vertexb;
+
+varying vec3 normal;
+varying vec2 st;
+varying vec4 color;
+
+void
+main (void)
+{
+    vec3        vertex;
+	vec3        vnormal;
+
+	vertex = mix (vertexa, vertexb, blend);
+	vnormal = mix (vnormala, vnormalb, blend);
+	gl_Position = mvp_mat * vec4 (vertex, 1.0);
+	st = mix (vsta, vstb, blend) / skin_size;
+	normal = norm_mat * vnormal;
+	color = mix (vcolora, vcolorb, blend);
+}
+-- Fragment.mdl
+uniform sampler2D skin;
+uniform float ambient;
+uniform float shadelight;
+uniform vec3 lightvec;
+
+varying vec3 normal;
+varying vec2 st;
+varying vec4 color;
+
+void
+main (void)
+{
+	float       pix = texture2D (skin, st).r;
+	float       light = ambient;
+	float       d, col;
+	vec4        lit;
+
+	d = dot (normal, lightvec);
+	d = min (d, 0.0);
+	light = 255.0 - light;
+	light += d * shadelight;
+	lit = mappedColor (pix, light / 255.0);
+	gl_FragColor = fogBlend (lit * color);
+}
diff --git a/libs/video/renderer/glsl/quakemdl.frag b/libs/video/renderer/glsl/quakemdl.frag
deleted file mode 100644
index cb7320931..000000000
--- a/libs/video/renderer/glsl/quakemdl.frag
+++ /dev/null
@@ -1,42 +0,0 @@
-uniform sampler2D colormap;
-uniform sampler2D skin;
-uniform float ambient;
-uniform float shadelight;
-uniform vec3 lightvec;
-uniform vec4 fog;
-
-varying vec3 normal;
-varying vec2 st;
-varying vec4 color;
-
-float
-sqr (float x)
-{
-	return x * x;
-}
-
-vec4
-fogBlend (vec4 color)
-{
-	float       f;
-	vec4        fog_color = vec4 (fog.rgb, 1.0);
-
-	f = exp (-sqr (fog.a * gl_FragCoord.z / gl_FragCoord.w));
-	return vec4 (mix (fog_color.rgb, color.rgb, f), color.a);
-}
-
-void
-main (void)
-{
-	float       pix = texture2D (skin, st).r;
-	float       light = ambient;
-	float       d, col;
-	vec4        lit;
-
-	d = dot (normal, lightvec);
-	d = min (d, 0.0);
-	light = 255.0 - light;
-	light += d * shadelight;
-	lit = texture2D (colormap, vec2 (pix, light / 255.0));
-	gl_FragColor = fogBlend (lit * color);
-}
diff --git a/libs/video/renderer/glsl/quakemdl.vert b/libs/video/renderer/glsl/quakemdl.vert
deleted file mode 100644
index b21e09b9f..000000000
--- a/libs/video/renderer/glsl/quakemdl.vert
+++ /dev/null
@@ -1,27 +0,0 @@
-uniform mat4 mvp_mat;
-uniform mat3 norm_mat;
-uniform vec2 skin_size;
-uniform float blend;
-
-attribute vec4 vcolora, vcolorb;
-attribute vec2 vsta, vstb;
-attribute vec3 vnormala, vnormalb;
-attribute vec3 vertexa, vertexb;
-
-varying vec3 normal;
-varying vec2 st;
-varying vec4 color;
-
-void
-main (void)
-{
-	vec3        vertex;
-	vec3        vnormal;
-
-	vertex = mix (vertexa, vertexb, blend);
-	vnormal = mix (vnormala, vnormalb, blend);
-	gl_Position = mvp_mat * vec4 (vertex, 1.0);
-	st = mix (vsta, vstb, blend) / skin_size;
-	normal = norm_mat * vnormal;
-	color = mix (vcolora, vcolorb, blend);
-}
diff --git a/libs/video/renderer/glsl/vid_common_glsl.c b/libs/video/renderer/glsl/vid_common_glsl.c
index 6664eb841..9f46fdc9c 100644
--- a/libs/video/renderer/glsl/vid_common_glsl.c
+++ b/libs/video/renderer/glsl/vid_common_glsl.c
@@ -56,6 +56,10 @@
 #include "d_iface.h"
 #include "r_internal.h"
 
+static const char quakeforge_effect[] =
+#include "quakeforge.slc"
+;
+
 int					glsl_palette;
 int					glsl_colormap;
 
@@ -181,6 +185,8 @@ GLSL_Init_Common (void)
 
 	qfeglEnable (GL_BLEND);
 	qfeglBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
+	GLSL_RegisterEffect ("QuakeForge", quakeforge_effect);
 }
 
 int

From f43592589d8376d642e3125e643935374212ce9a Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 7 Jun 2013 17:12:44 +0900
Subject: [PATCH 0046/1519] Use the new shader system in the bsp renderer.

It mostly works. Skybox is untested, and water surfaces are broken.
---
 libs/video/renderer/glsl/Makefile.am     | 12 +--
 libs/video/renderer/glsl/glsl_alias.c    |  2 +
 libs/video/renderer/glsl/glsl_bsp.c      | 93 +++++++++++++++---------
 libs/video/renderer/glsl/quakebsp.vert   | 18 -----
 libs/video/renderer/glsl/quakeforge.glsl | 82 +++++++++++++++++++--
 libs/video/renderer/glsl/quakeskb.frag   | 32 --------
 libs/video/renderer/glsl/quakeski.frag   | 48 ------------
 libs/video/renderer/glsl/quakesky.vert   | 14 ----
 8 files changed, 143 insertions(+), 158 deletions(-)
 delete mode 100644 libs/video/renderer/glsl/quakebsp.vert
 delete mode 100644 libs/video/renderer/glsl/quakeskb.frag
 delete mode 100644 libs/video/renderer/glsl/quakeski.frag
 delete mode 100644 libs/video/renderer/glsl/quakesky.vert

diff --git a/libs/video/renderer/glsl/Makefile.am b/libs/video/renderer/glsl/Makefile.am
index dd65e2f0b..0a1b83725 100644
--- a/libs/video/renderer/glsl/Makefile.am
+++ b/libs/video/renderer/glsl/Makefile.am
@@ -5,15 +5,15 @@ AM_CPPFLAGS= -I$(top_srcdir)/include $(GLX_CFLAGS)
 
 shader_src= quakeforge.glsl \
 	iqm.frag iqm.vert \
-	quake2d.frag quakebsp.frag quakebsp.vert quakeico.vert quakemdl.frag \
-	quakemdl.vert quakepar.frag quakepar.vert quakepnt.frag quakepnt.vert \
-	quakeskb.frag quakeski.frag quakesky.vert quakespr.frag quakespr.vert \
+	quake2d.frag quakeico.vert \
+	quakepar.frag quakepar.vert quakepnt.frag quakepnt.vert \
+	quakespr.frag quakespr.vert \
 	quaketrb.frag quaketxt.vert
 shader_gen= quakeforge.slc \
 	iqm.fc iqm.vc \
-	quake2d.fc quakebsp.fc quakebsp.vc quakeico.vc quakemdl.fc quakemdl.vc \
-	quakepar.fc quakepar.vc quakepnt.fc quakepnt.vc quakeskb.fc quakeski.fc \
-	quakesky.vc quakespr.fc quakespr.vc quaketrb.fc quaketxt.vc
+	quake2d.fc quakeico.vc \
+	quakepar.fc quakepar.vc quakepnt.fc quakepnt.vc \
+	quakespr.fc quakespr.vc quaketrb.fc quaketxt.vc
 
 glsl_src = \
 	glsl_alias.c glsl_bsp.c glsl_draw.c glsl_fog.c glsl_iqm.c glsl_lightmap.c \
diff --git a/libs/video/renderer/glsl/glsl_alias.c b/libs/video/renderer/glsl/glsl_alias.c
index ddbec7b04..3fdd50b66 100644
--- a/libs/video/renderer/glsl/glsl_alias.c
+++ b/libs/video/renderer/glsl/glsl_alias.c
@@ -58,6 +58,7 @@
 static const char *alias_vert_effects[] =
 {
 	"QuakeForge.Vertex.mdl",
+	0
 };
 
 static const char *alias_frag_effects[] =
@@ -65,6 +66,7 @@ static const char *alias_frag_effects[] =
 	"QuakeForge.Fragment.fog",
 	"QuakeForge.Fragment.colormap",
 	"QuakeForge.Fragment.mdl",
+	0
 };
 
 static struct {
diff --git a/libs/video/renderer/glsl/glsl_bsp.c b/libs/video/renderer/glsl/glsl_bsp.c
index 8de55a9bd..4280964a5 100644
--- a/libs/video/renderer/glsl/glsl_bsp.c
+++ b/libs/video/renderer/glsl/glsl_bsp.c
@@ -106,29 +106,45 @@ static double   sky_time;
 static quat_t   default_color = { 1, 1, 1, 1 };
 static quat_t   last_color;
 
-static const char quakebsp_vert[] =
-#include "quakebsp.vc"
-;
+static const char *bsp_vert_effects[] =
+{
+	"QuakeForge.Vertex.bsp",
+	0
+};
 
-static const char quakebsp_frag[] =
-#include "quakebsp.fc"
-;
+static const char *bsp_lit_effects[] =
+{
+	"QuakeForge.Fragment.fog",
+	"QuakeForge.Fragment.colormap",
+	"QuakeForge.Fragment.bsp.lit",
+	0
+};
 
-static const char quaketurb_frag[] =
-#include "quaketrb.fc"
-;
+static const char *bsp_turb_effects[] =
+{
+	"QuakeForge.Fragment.fog",
+	"QuakeForge.Fragment.colormap",
+	"QuakeForge.Fragment.bsp.lit",
+	0
+};
 
-static const char quakesky_vert[] =
-#include "quakesky.vc"
-;
+static const char *bsp_sky_cube_effects[] =
+{
+	"QuakeForge.Fragment.fog",
+	"QuakeForge.Fragment.colormap",
+	"QuakeForge.env.sky.cube",
+	"QuakeForge.Fragment.bsp.sky",
+	0
+};
 
-static const char quakeskyid_frag[] =
-#include "quakeski.fc"
-;
-
-static const char quakeskybox_frag[] =
-#include "quakeskb.fc"
-;
+static const char *bsp_sky_id_effects[] =
+{
+	"QuakeForge.Fragment.fog",
+	"QuakeForge.Fragment.colormap",
+	"QuakeForge.env.sky.id",
+	"QuakeForge.Fragment.bsp.sky",
+	0
+};
 
 static struct {
 	int         program;
@@ -159,7 +175,7 @@ static struct {
 	shaderparam_t vertex;
 	shaderparam_t palette;
 	shaderparam_t texture;
-	shaderparam_t realtime;
+	shaderparam_t time;
 	shaderparam_t color;
 	shaderparam_t fog;
 } quake_turb = {
@@ -169,7 +185,7 @@ static struct {
 	{"vertex", 0},
 	{"palette", 1},
 	{"texture", 1},
-	{"realtime", 1},
+	{"time", 1},
 	{"vcolor", 0},
 	{"fog", 1},
 };
@@ -182,7 +198,7 @@ static struct {
 	shaderparam_t palette;
 	shaderparam_t solid;
 	shaderparam_t trans;
-	shaderparam_t realtime;
+	shaderparam_t time;
 	shaderparam_t fog;
 } quake_skyid = {
 	0,
@@ -192,7 +208,7 @@ static struct {
 	{"palette", 1},
 	{"solid", 1},
 	{"trans", 1},
-	{"realtime", 1},
+	{"time", 1},
 	{"fog", 1},
 };
 
@@ -917,7 +933,7 @@ turb_begin (void)
 	qfeglEnable (GL_TEXTURE_2D);
 	qfeglBindTexture (GL_TEXTURE_2D, glsl_palette);
 
-	qfeglUniform1f (quake_turb.realtime.location, vr_data.realtime);
+	qfeglUniform1f (quake_turb.time.location, vr_data.realtime);
 
 	qfeglUniform1i (quake_turb.texture.location, 0);
 	qfeglActiveTexture (GL_TEXTURE0 + 0);
@@ -1001,7 +1017,7 @@ sky_begin (void)
 		qfeglEnable (GL_TEXTURE_2D);
 		qfeglBindTexture (GL_TEXTURE_2D, glsl_palette);
 
-		qfeglUniform1f (quake_skyid.realtime.location, vr_data.realtime);
+		qfeglUniform1f (quake_skyid.time.location, vr_data.realtime);
 
 		qfeglUniform1i (quake_skyid.trans.location, 0);
 		qfeglActiveTexture (GL_TEXTURE0 + 0);
@@ -1241,12 +1257,15 @@ glsl_R_DrawSky (void)
 void
 glsl_R_InitBsp (void)
 {
+	shader_t   *vert_shader, *frag_shader;
 	int         vert;
 	int         frag;
 
-	vert = GLSL_CompileShaderS ("quakebsp.vert", quakebsp_vert,
+	vert_shader = GLSL_BuildShader (bsp_vert_effects);
+	frag_shader = GLSL_BuildShader (bsp_lit_effects);
+	vert = GLSL_CompileShader ("quakebsp.vert", vert_shader,
 							   GL_VERTEX_SHADER);
-	frag = GLSL_CompileShaderS ("quakebsp.frag", quakebsp_frag,
+	frag = GLSL_CompileShader ("quakebsp.frag", frag_shader,
 							   GL_FRAGMENT_SHADER);
 	quake_bsp.program = GLSL_LinkProgram ("quakebsp", vert, frag);
 	GLSL_ResolveShaderParam (quake_bsp.program, &quake_bsp.mvp_matrix);
@@ -1257,8 +1276,11 @@ glsl_R_InitBsp (void)
 	GLSL_ResolveShaderParam (quake_bsp.program, &quake_bsp.lightmap);
 	GLSL_ResolveShaderParam (quake_bsp.program, &quake_bsp.color);
 	GLSL_ResolveShaderParam (quake_bsp.program, &quake_bsp.fog);
+	GLSL_FreeShader (vert_shader);
+	GLSL_FreeShader (frag_shader);
 
-	frag = GLSL_CompileShaderS ("quaketrb.frag", quaketurb_frag,
+	frag_shader = GLSL_BuildShader (bsp_turb_effects);
+	frag = GLSL_CompileShader ("quaketrb.frag", frag_shader,
 							   GL_FRAGMENT_SHADER);
 	quake_turb.program = GLSL_LinkProgram ("quaketrb", vert, frag);
 	GLSL_ResolveShaderParam (quake_turb.program, &quake_turb.mvp_matrix);
@@ -1266,13 +1288,13 @@ glsl_R_InitBsp (void)
 	GLSL_ResolveShaderParam (quake_turb.program, &quake_turb.vertex);
 	GLSL_ResolveShaderParam (quake_turb.program, &quake_turb.palette);
 	GLSL_ResolveShaderParam (quake_turb.program, &quake_turb.texture);
-	GLSL_ResolveShaderParam (quake_turb.program, &quake_turb.realtime);
+	GLSL_ResolveShaderParam (quake_turb.program, &quake_turb.time);
 	GLSL_ResolveShaderParam (quake_turb.program, &quake_turb.color);
 	GLSL_ResolveShaderParam (quake_turb.program, &quake_turb.fog);
+	GLSL_FreeShader (frag_shader);
 
-	vert = GLSL_CompileShaderS ("quakesky.vert", quakesky_vert,
-							   GL_VERTEX_SHADER);
-	frag = GLSL_CompileShaderS ("quakeski.frag", quakeskyid_frag,
+	frag_shader = GLSL_BuildShader (bsp_sky_id_effects);
+	frag = GLSL_CompileShader ("quakeski.frag", frag_shader,
 							   GL_FRAGMENT_SHADER);
 	quake_skyid.program = GLSL_LinkProgram ("quakeskyid", vert, frag);
 	GLSL_ResolveShaderParam (quake_skyid.program, &quake_skyid.mvp_matrix);
@@ -1281,10 +1303,12 @@ glsl_R_InitBsp (void)
 	GLSL_ResolveShaderParam (quake_skyid.program, &quake_skyid.palette);
 	GLSL_ResolveShaderParam (quake_skyid.program, &quake_skyid.solid);
 	GLSL_ResolveShaderParam (quake_skyid.program, &quake_skyid.trans);
-	GLSL_ResolveShaderParam (quake_skyid.program, &quake_skyid.realtime);
+	GLSL_ResolveShaderParam (quake_skyid.program, &quake_skyid.time);
 	GLSL_ResolveShaderParam (quake_skyid.program, &quake_skyid.fog);
+	GLSL_FreeShader (frag_shader);
 
-	frag = GLSL_CompileShaderS ("quakeskb.frag", quakeskybox_frag,
+	frag_shader = GLSL_BuildShader (bsp_sky_cube_effects);
+	frag = GLSL_CompileShader ("quakeskb.frag", frag_shader,
 							   GL_FRAGMENT_SHADER);
 	quake_skybox.program = GLSL_LinkProgram ("quakeskybox", vert, frag);
 	GLSL_ResolveShaderParam (quake_skybox.program, &quake_skybox.mvp_matrix);
@@ -1292,6 +1316,7 @@ glsl_R_InitBsp (void)
 	GLSL_ResolveShaderParam (quake_skybox.program, &quake_skybox.vertex);
 	GLSL_ResolveShaderParam (quake_skybox.program, &quake_skybox.sky);
 	GLSL_ResolveShaderParam (quake_skybox.program, &quake_skybox.fog);
+	GLSL_FreeShader (frag_shader);
 }
 
 static inline int
diff --git a/libs/video/renderer/glsl/quakebsp.vert b/libs/video/renderer/glsl/quakebsp.vert
deleted file mode 100644
index fc22d17e6..000000000
--- a/libs/video/renderer/glsl/quakebsp.vert
+++ /dev/null
@@ -1,18 +0,0 @@
-uniform mat4 mvp_mat;
-
-attribute vec4 vcolor;
-attribute vec4 tlst;
-attribute vec4 vertex;
-
-varying vec2 tst;
-varying vec2 lst;
-varying vec4 color;
-
-void
-main (void)
-{
-	gl_Position = mvp_mat * vertex;
-	tst = tlst.st;
-	lst = tlst.pq;
-	color = vcolor;
-}
diff --git a/libs/video/renderer/glsl/quakeforge.glsl b/libs/video/renderer/glsl/quakeforge.glsl
index cfb296307..7efd9db48 100644
--- a/libs/video/renderer/glsl/quakeforge.glsl
+++ b/libs/video/renderer/glsl/quakeforge.glsl
@@ -64,24 +64,36 @@ turb_st (vec2 st, float time)
 	return st + (sin ((angle + phase) * FACTOR) + BIAS) / SCALE;
 }
 
--- Fragment.skydome
+-- env.sky.cube
+
+uniform samplerCube sky;
+
+vec4
+sky_color (vec3 dir)
+{
+	// NOTE: quake's world and GL's world are rotated relative to each other
+	// quake has x right, y in, z up. gl has x right, y up, z out
+	// The textures are loaded with GL's z (quake's y) already negated, so
+	// all that's needed here is to swizzle y and z.
+	return textureCube(sky, dir.xzy);
+}
+
+-- env.sky.id
 
 uniform sampler2D palette;
 uniform sampler2D solid;
 uniform sampler2D trans;
-uniform float time
-varying vec3 direction
+uniform float time;
 
 const float SCALE = 189.0 / 64.0;
 
 vec4
-skydome (dir, time)
+sky_color (vec3 dir)
 {
 	float       len;
 	float       pix;
 	vec2        flow = vec2 (1.0, 1.0);
 	vec2        st, base;
-	vec3        dir = direction;
 
 	dir.z *= 3.0;
 	len = dot (dir, dir);
@@ -91,13 +103,14 @@ skydome (dir, time)
 	st = base + flow * time / 8.0;
 	pix = texture2D (trans, st).r;
 	if (pix == 0.0) {
-		st = base + flow * realtime / 16.0;
+		st = base + flow * time / 16.0;
 		pix = texture2D (solid, st).r;
 	}
 	return texture2D (palette, pix);
 }
 
 -- Vertex.mdl
+
 uniform mat4 mvp_mat;
 uniform mat3 norm_mat;
 uniform vec2 skin_size;
@@ -125,7 +138,9 @@ main (void)
 	normal = norm_mat * vnormal;
 	color = mix (vcolora, vcolorb, blend);
 }
+
 -- Fragment.mdl
+
 uniform sampler2D skin;
 uniform float ambient;
 uniform float shadelight;
@@ -150,3 +165,58 @@ main (void)
 	lit = mappedColor (pix, light / 255.0);
 	gl_FragColor = fogBlend (lit * color);
 }
+
+-- Vertex.bsp
+
+uniform mat4 mvp_mat;
+uniform mat4 sky_mat;
+
+attribute vec4 vcolor;
+attribute vec4 tlst;
+attribute vec4 vertex;
+
+varying vec2 tst;
+varying vec2 lst;
+varying vec4 color;
+varying vec3 direction;
+
+void
+main (void)
+{
+	gl_Position = mvp_mat * vertex;
+	direction = (sky_mat * vertex).xyz;
+	tst = tlst.st;
+	lst = tlst.pq;
+	color = vcolor;
+}
+
+-- Fragment.bsp.lit
+
+uniform sampler2D texture;
+uniform sampler2D lightmap;
+
+varying vec2 tst;
+varying vec2 lst;
+varying vec4 color;
+
+void
+main (void)
+{
+	float       pix = texture2D (texture, tst).r;
+	float       light = texture2D (lightmap, lst).r;
+	vec4        c;
+
+	c = mappedColor (pix, light * 4.0) * color;
+	gl_FragColor = fogBlend (c);
+}
+
+-- Fragment.bsp.sky
+
+varying vec3 direction;
+
+void
+main (void)
+{
+	vec4        c = sky_color (direction);
+	gl_FragColor = fogBlend (c);
+}
diff --git a/libs/video/renderer/glsl/quakeskb.frag b/libs/video/renderer/glsl/quakeskb.frag
deleted file mode 100644
index 3ffacd398..000000000
--- a/libs/video/renderer/glsl/quakeskb.frag
+++ /dev/null
@@ -1,32 +0,0 @@
-uniform samplerCube sky;
-uniform vec4 fog;
-
-varying vec3 direction;
-
-float
-sqr (float x)
-{
-	return x * x;
-}
-
-vec4
-fogBlend (vec4 color)
-{
-	float       f;
-	vec4        fog_color = vec4 (fog.rgb, 1.0);
-
-	f = exp (-sqr (fog.a * gl_FragCoord.z / gl_FragCoord.w));
-	return vec4 (mix (fog_color.rgb, color.rgb, f), color.a);
-}
-
-void
-main (void)
-{
-	vec3        dir = direction;
-
-	// NOTE: quake's world and GL's world are rotated relative to each other
-	// quake has x right, y in, z up. gl has x right, y up, z out
-	// The textures are loaded with GL's z (quake's y) already negated, so
-	// all that's needed here is to swizzle y and z.
-	gl_FragColor = fogBlend (textureCube(sky, dir.xzy));
-}
diff --git a/libs/video/renderer/glsl/quakeski.frag b/libs/video/renderer/glsl/quakeski.frag
deleted file mode 100644
index 5c2bbb96c..000000000
--- a/libs/video/renderer/glsl/quakeski.frag
+++ /dev/null
@@ -1,48 +0,0 @@
-uniform sampler2D palette;
-uniform sampler2D solid;
-uniform sampler2D trans;
-uniform float realtime;
-uniform vec4 fog;
-
-varying vec3 direction;
-
-const float SCALE = 189.0 / 64.0;
-
-float
-sqr (float x)
-{
-	return x * x;
-}
-
-vec4
-fogBlend (vec4 color)
-{
-	float       f;
-	vec4        fog_color = vec4 (fog.rgb, 1.0);
-
-	f = exp (-sqr (fog.a * gl_FragCoord.z / gl_FragCoord.w));
-	return vec4 (mix (fog_color.rgb, color.rgb, f), color.a);
-}
-
-void
-main (void)
-{
-	float       len;
-	float       pix;
-	vec2        flow = vec2 (1.0, 1.0);
-	vec2        st, base;
-	vec3        dir = direction;
-
-	dir.z *= 3.0;
-	len = dot (dir, dir);
-	len = SCALE * inversesqrt (len);
-
-	base = direction.yx * vec2(1.0, -1.0) * len;
-	st = base + flow * realtime / 8.0;
-	pix = texture2D (trans, st).r;
-	if (pix == 0.0) {
-		st = base + flow * realtime / 16.0;
-		pix = texture2D (solid, st).r;
-	}
-	gl_FragColor = fogBlend (texture2D (palette, vec2 (pix, 0.0)));
-}
diff --git a/libs/video/renderer/glsl/quakesky.vert b/libs/video/renderer/glsl/quakesky.vert
deleted file mode 100644
index 98754de77..000000000
--- a/libs/video/renderer/glsl/quakesky.vert
+++ /dev/null
@@ -1,14 +0,0 @@
-uniform mat4 mvp_mat;
-uniform mat4 sky_mat;
-
-attribute vec4 tlst;
-attribute vec4 vertex;
-
-varying vec3 direction;
-
-void
-main (void)
-{
-	gl_Position = mvp_mat * vertex;
-	direction = (sky_mat * vertex).xyz;
-}

From 26fc0b74e61dad055807a1fbf900b19b7a09aeda Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 7 Jun 2013 19:08:58 +0900
Subject: [PATCH 0047/1519] Fix bsp water surfaces.

Everything seems to be working for the bsp renderer.
---
 libs/video/renderer/glsl/glsl_bsp.c      |  5 ++-
 libs/video/renderer/glsl/quakeforge.glsl | 45 +++++++++++++++++++++---
 2 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/libs/video/renderer/glsl/glsl_bsp.c b/libs/video/renderer/glsl/glsl_bsp.c
index 4280964a5..9f6d019ed 100644
--- a/libs/video/renderer/glsl/glsl_bsp.c
+++ b/libs/video/renderer/glsl/glsl_bsp.c
@@ -115,6 +115,7 @@ static const char *bsp_vert_effects[] =
 static const char *bsp_lit_effects[] =
 {
 	"QuakeForge.Fragment.fog",
+	"QuakeForge.env.warp.nop",
 	"QuakeForge.Fragment.colormap",
 	"QuakeForge.Fragment.bsp.lit",
 	0
@@ -122,9 +123,11 @@ static const char *bsp_lit_effects[] =
 
 static const char *bsp_turb_effects[] =
 {
+	"QuakeForge.Math.const",
 	"QuakeForge.Fragment.fog",
+	"QuakeForge.env.warp.turb",
 	"QuakeForge.Fragment.colormap",
-	"QuakeForge.Fragment.bsp.lit",
+	"QuakeForge.Fragment.bsp.unlit",
 	0
 };
 
diff --git a/libs/video/renderer/glsl/quakeforge.glsl b/libs/video/renderer/glsl/quakeforge.glsl
index 7efd9db48..a4bb5390d 100644
--- a/libs/video/renderer/glsl/quakeforge.glsl
+++ b/libs/video/renderer/glsl/quakeforge.glsl
@@ -48,16 +48,24 @@ mappedColor (float pix, float light)
 	return texture2D (colormap, vec2 (pix, light));
 }
 
--- Fragment.turb
+-- env.warp.nop
+
+vec2
+warp_st (vec2 st, float time)
+{
+	return st;
+}
+
+-- env.warp.turb
 
 const float SPEED = 20.0;
 const float CYCLE = 128.0;
 const float FACTOR = PI * 2.0 / CYCLE;
-const vec2 BIAS = vec2 (1.0, 1.0)
+const vec2 BIAS = vec2 (1.0, 1.0);
 const float SCALE = 8.0;
 
 vec2
-turb_st (vec2 st, float time)
+warp_st (vec2 st, float time)
 {
 	vec2        angle = st.ts * CYCLE / 2.0;
 	vec2        phase = vec2 (time, time) * SPEED;
@@ -106,7 +114,7 @@ sky_color (vec3 dir)
 		st = base + flow * time / 16.0;
 		pix = texture2D (solid, st).r;
 	}
-	return texture2D (palette, pix);
+	return texture2D (palette, vec2 (pix, 0));
 }
 
 -- Vertex.mdl
@@ -194,6 +202,7 @@ main (void)
 
 uniform sampler2D texture;
 uniform sampler2D lightmap;
+uniform float time;
 
 varying vec2 tst;
 varying vec2 lst;
@@ -202,14 +211,40 @@ varying vec4 color;
 void
 main (void)
 {
-	float       pix = texture2D (texture, tst).r;
+	float       pix;
+	vec2        st;
 	float       light = texture2D (lightmap, lst).r;
 	vec4        c;
 
+	st = warp_st (tst, time);
+	pix = texture2D (texture, st).r;
 	c = mappedColor (pix, light * 4.0) * color;
 	gl_FragColor = fogBlend (c);
 }
 
+-- Fragment.bsp.unlit
+
+uniform sampler2D texture;
+uniform sampler2D palette;
+uniform float time;
+
+varying vec2 tst;
+varying vec4 color;
+
+void
+main (void)
+{
+	float       pix;
+	vec2        st;
+	vec4        c;
+
+	st = warp_st (tst, time);
+	pix = texture2D (texture, st).r;
+	c = texture2D (palette, vec2(pix, 0)) * color;
+	gl_FragColor = fogBlend (c);
+}
+
+
 -- Fragment.bsp.sky
 
 varying vec3 direction;

From 042d6e57281ef3109639755ee8a92cc38bba5a23 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 7 Jun 2013 19:42:51 +0900
Subject: [PATCH 0048/1519] Remove a couple of stale files.

Missed these in the bsp related commit.
---
 libs/video/renderer/glsl/quakebsp.frag | 36 -------------------
 libs/video/renderer/glsl/quaketrb.frag | 49 --------------------------
 2 files changed, 85 deletions(-)
 delete mode 100644 libs/video/renderer/glsl/quakebsp.frag
 delete mode 100644 libs/video/renderer/glsl/quaketrb.frag

diff --git a/libs/video/renderer/glsl/quakebsp.frag b/libs/video/renderer/glsl/quakebsp.frag
deleted file mode 100644
index 4dd8a0c7e..000000000
--- a/libs/video/renderer/glsl/quakebsp.frag
+++ /dev/null
@@ -1,36 +0,0 @@
-uniform sampler2D colormap;
-uniform sampler2D texture;
-uniform sampler2D lightmap;
-uniform vec4 fog;
-
-varying vec2 tst;
-varying vec2 lst;
-varying vec4 color;
-
-float
-sqr (float x)
-{
-	return x * x;
-}
-
-vec4
-fogBlend (vec4 color)
-{
-	float       f;
-	vec4        fog_color = vec4 (fog.rgb, 1.0);
-
-	f = exp (-sqr (fog.a * gl_FragCoord.z / gl_FragCoord.w));
-	return vec4 (mix (fog_color.rgb, color.rgb, f), color.a);
-}
-
-void
-main (void)
-{
-	float       pix = texture2D (texture, tst).r;
-	float       light = texture2D (lightmap, lst).r;
-	float       col;
-	vec4        c;
-
-	c = texture2D (colormap, vec2 (pix, light * 4.0)) * color;
-	gl_FragColor = fogBlend (c);
-}
diff --git a/libs/video/renderer/glsl/quaketrb.frag b/libs/video/renderer/glsl/quaketrb.frag
deleted file mode 100644
index e019c557e..000000000
--- a/libs/video/renderer/glsl/quaketrb.frag
+++ /dev/null
@@ -1,49 +0,0 @@
-uniform sampler2D palette;
-uniform sampler2D texture;
-uniform float realtime;
-uniform vec4 fog;
-
-varying vec2 tst;
-varying vec4 color;
-
-const float SPEED = 20.0;
-const float CYCLE = 128.0;
-const float PI = 3.14159;
-const float FACTOR = PI * 2.0 / CYCLE;
-const vec2  BIAS = vec2 (1.0, 1.0);
-const float SCALE = 8.0;
-
-float
-sqr (float x)
-{
-	return x * x;
-}
-
-vec4
-fogBlend (vec4 color)
-{
-	float       f;
-	vec4        fog_color = vec4 (fog.rgb, 1.0);
-
-	f = exp (-sqr (fog.a * gl_FragCoord.z / gl_FragCoord.w));
-	return vec4 (mix (fog_color.rgb, color.rgb, f), color.a);
-}
-
-vec2
-turb_st (vec2 st, float time)
-{
-	vec2        angle = st.ts * CYCLE / 2.0;
-	vec2        phase = vec2 (time, time) * SPEED;
-	return st + (sin ((angle + phase) * FACTOR) + BIAS) / SCALE;
-}
-
-void
-main (void)
-{
-	float       pix;
-	vec2        st;
-
-	st = turb_st (tst, realtime);
-	pix = texture2D (texture, st).r;
-	gl_FragColor = fogBlend (texture2D (palette, vec2 (pix, 0.0)) * color);
-}

From a419fb2c92c2f4bf3b60bd01f7a7c76f271c6547 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 28 Jan 2014 11:38:13 +0900
Subject: [PATCH 0049/1519] Ensure the vertex coord attribute is attribute 0.

It seems mesa still has the bug where non-array attributes don't work
when set as attribute 0, and that the allocation order changed sometime
since I last tested with mesa. This fixes the black world and flickering
alias models on my eeepc.
---
 libs/video/renderer/glsl/quakeforge.glsl | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/libs/video/renderer/glsl/quakeforge.glsl b/libs/video/renderer/glsl/quakeforge.glsl
index a4bb5390d..c8d0da2c2 100644
--- a/libs/video/renderer/glsl/quakeforge.glsl
+++ b/libs/video/renderer/glsl/quakeforge.glsl
@@ -124,10 +124,10 @@ uniform mat3 norm_mat;
 uniform vec2 skin_size;
 uniform float blend;
 
-attribute vec4 vcolora, vcolorb;
-attribute vec2 vsta, vstb;
-attribute vec3 vnormala, vnormalb;
 attribute vec3 vertexa, vertexb;
+attribute vec3 vnormala, vnormalb;
+attribute vec2 vsta, vstb;
+attribute vec4 vcolora, vcolorb;
 
 varying vec3 normal;
 varying vec2 st;
@@ -179,9 +179,9 @@ main (void)
 uniform mat4 mvp_mat;
 uniform mat4 sky_mat;
 
-attribute vec4 vcolor;
-attribute vec4 tlst;
 attribute vec4 vertex;
+attribute vec4 tlst;
+attribute vec4 vcolor;
 
 varying vec2 tst;
 varying vec2 lst;

From 3af6a640fedd4c6034660dfd44c84e89bbaac19c Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 28 Jan 2014 12:06:36 +0900
Subject: [PATCH 0050/1519] Missed the old turb frag shader.

---
 libs/video/renderer/glsl/Makefile.am | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libs/video/renderer/glsl/Makefile.am b/libs/video/renderer/glsl/Makefile.am
index 0a1b83725..d28c62454 100644
--- a/libs/video/renderer/glsl/Makefile.am
+++ b/libs/video/renderer/glsl/Makefile.am
@@ -8,12 +8,12 @@ shader_src= quakeforge.glsl \
 	quake2d.frag quakeico.vert \
 	quakepar.frag quakepar.vert quakepnt.frag quakepnt.vert \
 	quakespr.frag quakespr.vert \
-	quaketrb.frag quaketxt.vert
+	quaketxt.vert
 shader_gen= quakeforge.slc \
 	iqm.fc iqm.vc \
 	quake2d.fc quakeico.vc \
 	quakepar.fc quakepar.vc quakepnt.fc quakepnt.vc \
-	quakespr.fc quakespr.vc quaketrb.fc quaketxt.vc
+	quakespr.fc quakespr.vc quaketxt.vc
 
 glsl_src = \
 	glsl_alias.c glsl_bsp.c glsl_draw.c glsl_fog.c glsl_iqm.c glsl_lightmap.c \

From 1a7b532927e550fcec363b1246cd5d78ab76add6 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 28 Jan 2014 12:08:53 +0900
Subject: [PATCH 0051/1519] Use the new shader system for point particles.

---
 libs/video/renderer/glsl/Makefile.am      |  4 +-
 libs/video/renderer/glsl/glsl_particles.c | 25 +++++++----
 libs/video/renderer/glsl/quakeforge.glsl  | 55 +++++++++++++++++++++++
 libs/video/renderer/glsl/quakepnt.frag    | 29 ------------
 libs/video/renderer/glsl/quakepnt.vert    | 19 --------
 5 files changed, 74 insertions(+), 58 deletions(-)
 delete mode 100644 libs/video/renderer/glsl/quakepnt.frag
 delete mode 100644 libs/video/renderer/glsl/quakepnt.vert

diff --git a/libs/video/renderer/glsl/Makefile.am b/libs/video/renderer/glsl/Makefile.am
index d28c62454..7c1b1869c 100644
--- a/libs/video/renderer/glsl/Makefile.am
+++ b/libs/video/renderer/glsl/Makefile.am
@@ -6,13 +6,13 @@ AM_CPPFLAGS= -I$(top_srcdir)/include $(GLX_CFLAGS)
 shader_src= quakeforge.glsl \
 	iqm.frag iqm.vert \
 	quake2d.frag quakeico.vert \
-	quakepar.frag quakepar.vert quakepnt.frag quakepnt.vert \
+	quakepar.frag quakepar.vert \
 	quakespr.frag quakespr.vert \
 	quaketxt.vert
 shader_gen= quakeforge.slc \
 	iqm.fc iqm.vc \
 	quake2d.fc quakeico.vc \
-	quakepar.fc quakepar.vc quakepnt.fc quakepnt.vc \
+	quakepar.fc quakepar.vc \
 	quakespr.fc quakespr.vc quaketxt.vc
 
 glsl_src = \
diff --git a/libs/video/renderer/glsl/glsl_particles.c b/libs/video/renderer/glsl/glsl_particles.c
index 4d870623f..902fef2c0 100644
--- a/libs/video/renderer/glsl/glsl_particles.c
+++ b/libs/video/renderer/glsl/glsl_particles.c
@@ -78,13 +78,17 @@ static partvert_t  *particleVertexArray;
 
 static GLuint   part_tex;
 
-static const char quakepoint_vert[] =
-#include "quakepnt.vc"
-;
+static const char *particle_point_vert_effects[] =
+{
+	"QuakeForge.Vertex.particle.point",
+	0
+};
 
-static const char quakepoint_frag[] =
-#include "quakepnt.fc"
-;
+static const char *particle_point_frag_effects[] =
+{
+	"QuakeForge.Fragment.particle.point",
+	0
+};
 
 static const char quakepart_vert[] =
 #include "quakepar.vc"
@@ -210,6 +214,7 @@ glsl_R_ClearParticles (void)
 void
 glsl_R_InitParticles (void)
 {
+	shader_t   *vert_shader, *frag_shader;
 	unsigned    i;
 	int         vert;
 	int         frag;
@@ -223,9 +228,11 @@ glsl_R_InitParticles (void)
 	qfeglGetFloatv (GL_ALIASED_POINT_SIZE_RANGE, v);
 	Sys_MaskPrintf (SYS_GLSL, "point size: %g - %g\n", v[0], v[1]);
 
-	vert = GLSL_CompileShaderS ("quakepnt.vert", quakepoint_vert,
+	vert_shader = GLSL_BuildShader (particle_point_vert_effects);
+	frag_shader = GLSL_BuildShader (particle_point_frag_effects);
+	vert = GLSL_CompileShader ("quakepnt.vert", vert_shader,
 							   GL_VERTEX_SHADER);
-	frag = GLSL_CompileShaderS ("quakepnt.frag", quakepoint_frag,
+	frag = GLSL_CompileShader ("quakepnt.frag", frag_shader,
 							   GL_FRAGMENT_SHADER);
 	quake_point.program = GLSL_LinkProgram ("quakepoint", vert, frag);
 	GLSL_ResolveShaderParam (quake_point.program, &quake_point.mvp_matrix);
@@ -233,6 +240,8 @@ glsl_R_InitParticles (void)
 	GLSL_ResolveShaderParam (quake_point.program, &quake_point.palette);
 	GLSL_ResolveShaderParam (quake_point.program, &quake_point.color);
 	GLSL_ResolveShaderParam (quake_point.program, &quake_point.fog);
+	GLSL_FreeShader (vert_shader);
+	GLSL_FreeShader (frag_shader);
 
 	vert = GLSL_CompileShaderS ("quakepar.vert", quakepart_vert,
 							   GL_VERTEX_SHADER);
diff --git a/libs/video/renderer/glsl/quakeforge.glsl b/libs/video/renderer/glsl/quakeforge.glsl
index c8d0da2c2..cbde9ac81 100644
--- a/libs/video/renderer/glsl/quakeforge.glsl
+++ b/libs/video/renderer/glsl/quakeforge.glsl
@@ -255,3 +255,58 @@ main (void)
 	vec4        c = sky_color (direction);
 	gl_FragColor = fogBlend (c);
 }
+
+
+-- Vertex.particle.point
+
+uniform mat4 mvp_mat;
+attribute float vcolor;
+/** Vertex position.
+
+	x, y, z, c
+
+	c is the color of the point.
+*/
+attribute vec3 vertex;
+
+varying float color;
+
+void
+main (void)
+{
+	gl_Position = mvp_mat * vec4 (vertex, 1.0);
+	gl_PointSize = max (1.0, 1024.0 * abs (1.0 / gl_Position.z));
+	color = vcolor;
+}
+
+-- Fragment.particle.point
+
+//precision mediump float;
+uniform sampler2D palette;
+uniform vec4 fog;
+
+varying float color;
+
+float
+sqr (float x)
+{
+	return x * x;
+}
+
+vec4
+fogBlend (vec4 color)
+{
+	float       f;
+	vec4        fog_color = vec4 (fog.rgb, 1.0);
+
+	f = exp (-sqr (fog.a * gl_FragCoord.z / gl_FragCoord.w));
+	return vec4 (mix (fog_color.rgb, color.rgb, f), color.a);
+}
+
+void
+main (void)
+{
+	if (color == 1.0)
+		discard;
+	gl_FragColor = fogBlend (texture2D (palette, vec2 (color, 0.0)));
+}
diff --git a/libs/video/renderer/glsl/quakepnt.frag b/libs/video/renderer/glsl/quakepnt.frag
deleted file mode 100644
index 3ae6bebbc..000000000
--- a/libs/video/renderer/glsl/quakepnt.frag
+++ /dev/null
@@ -1,29 +0,0 @@
-//precision mediump float;
-uniform sampler2D palette;
-uniform vec4 fog;
-
-varying float color;
-
-float
-sqr (float x)
-{
-	return x * x;
-}
-
-vec4
-fogBlend (vec4 color)
-{
-	float       f;
-	vec4        fog_color = vec4 (fog.rgb, 1.0);
-
-	f = exp (-sqr (fog.a * gl_FragCoord.z / gl_FragCoord.w));
-	return vec4 (mix (fog_color.rgb, color.rgb, f), color.a);
-}
-
-void
-main (void)
-{
-	if (color == 1.0)
-		discard;
-	gl_FragColor = fogBlend (texture2D (palette, vec2 (color, 0.0)));
-}
diff --git a/libs/video/renderer/glsl/quakepnt.vert b/libs/video/renderer/glsl/quakepnt.vert
deleted file mode 100644
index 2a1ca43b6..000000000
--- a/libs/video/renderer/glsl/quakepnt.vert
+++ /dev/null
@@ -1,19 +0,0 @@
-uniform mat4 mvp_mat;
-attribute float vcolor;
-/** Vertex position.
-
-	x, y, z, c
-
-	c is the color of the point.
-*/
-attribute vec3 vertex;
-
-varying float color;
-
-void
-main (void)
-{
-	gl_Position = mvp_mat * vec4 (vertex, 1.0);
-	gl_PointSize = max (1.0, 1024.0 * abs (1.0 / gl_Position.z));
-	color = vcolor;
-}

From 1d67f8f0c3dc362b43497bc2094cfbdf54e5785c Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 28 Jan 2014 12:16:52 +0900
Subject: [PATCH 0052/1519] Use the new shader system for textured particles.

---
 libs/video/renderer/glsl/Makefile.am      |  2 -
 libs/video/renderer/glsl/glsl_particles.c | 24 ++++++----
 libs/video/renderer/glsl/quakeforge.glsl  | 55 +++++++++++++++++++++++
 libs/video/renderer/glsl/quakepar.frag    | 28 ------------
 libs/video/renderer/glsl/quakepar.vert    | 21 ---------
 5 files changed, 71 insertions(+), 59 deletions(-)
 delete mode 100644 libs/video/renderer/glsl/quakepar.frag
 delete mode 100644 libs/video/renderer/glsl/quakepar.vert

diff --git a/libs/video/renderer/glsl/Makefile.am b/libs/video/renderer/glsl/Makefile.am
index 7c1b1869c..2afb4ccd2 100644
--- a/libs/video/renderer/glsl/Makefile.am
+++ b/libs/video/renderer/glsl/Makefile.am
@@ -6,13 +6,11 @@ AM_CPPFLAGS= -I$(top_srcdir)/include $(GLX_CFLAGS)
 shader_src= quakeforge.glsl \
 	iqm.frag iqm.vert \
 	quake2d.frag quakeico.vert \
-	quakepar.frag quakepar.vert \
 	quakespr.frag quakespr.vert \
 	quaketxt.vert
 shader_gen= quakeforge.slc \
 	iqm.fc iqm.vc \
 	quake2d.fc quakeico.vc \
-	quakepar.fc quakepar.vc \
 	quakespr.fc quakespr.vc quaketxt.vc
 
 glsl_src = \
diff --git a/libs/video/renderer/glsl/glsl_particles.c b/libs/video/renderer/glsl/glsl_particles.c
index 902fef2c0..09ae06d6f 100644
--- a/libs/video/renderer/glsl/glsl_particles.c
+++ b/libs/video/renderer/glsl/glsl_particles.c
@@ -90,13 +90,17 @@ static const char *particle_point_frag_effects[] =
 	0
 };
 
-static const char quakepart_vert[] =
-#include "quakepar.vc"
-;
+static const char *particle_textured_vert_effects[] =
+{
+	"QuakeForge.Vertex.particle.textured",
+	0
+};
 
-static const char quakepart_frag[] =
-#include "quakepar.fc"
-;
+static const char *particle_textured_frag_effects[] =
+{
+	"QuakeForge.Fragment.particle.textured",
+	0
+};
 
 static struct {
 	int         program;
@@ -243,9 +247,11 @@ glsl_R_InitParticles (void)
 	GLSL_FreeShader (vert_shader);
 	GLSL_FreeShader (frag_shader);
 
-	vert = GLSL_CompileShaderS ("quakepar.vert", quakepart_vert,
+	vert_shader = GLSL_BuildShader (particle_textured_vert_effects);
+	frag_shader = GLSL_BuildShader (particle_textured_frag_effects);
+	vert = GLSL_CompileShader ("quakepar.vert", vert_shader,
 							   GL_VERTEX_SHADER);
-	frag = GLSL_CompileShaderS ("quakepar.frag", quakepart_frag,
+	frag = GLSL_CompileShader ("quakepar.frag", frag_shader,
 							   GL_FRAGMENT_SHADER);
 	quake_part.program = GLSL_LinkProgram ("quakepart", vert, frag);
 	GLSL_ResolveShaderParam (quake_part.program, &quake_part.mvp_matrix);
@@ -254,6 +260,8 @@ glsl_R_InitParticles (void)
 	GLSL_ResolveShaderParam (quake_part.program, &quake_part.color);
 	GLSL_ResolveShaderParam (quake_part.program, &quake_part.texture);
 	GLSL_ResolveShaderParam (quake_part.program, &quake_part.fog);
+	GLSL_FreeShader (vert_shader);
+	GLSL_FreeShader (frag_shader);
 
 	memset (data, 0, sizeof (data));
 	qfeglGenTextures (1, &part_tex);
diff --git a/libs/video/renderer/glsl/quakeforge.glsl b/libs/video/renderer/glsl/quakeforge.glsl
index cbde9ac81..097ef89ed 100644
--- a/libs/video/renderer/glsl/quakeforge.glsl
+++ b/libs/video/renderer/glsl/quakeforge.glsl
@@ -279,6 +279,30 @@ main (void)
 	color = vcolor;
 }
 
+-- Vertex.particle.textured
+
+uniform mat4 mvp_mat;
+attribute vec4 vcolor;
+attribute vec2 vst;
+/** Vertex position.
+
+	x, y, z, c
+
+	c is the color of the point.
+*/
+attribute vec3 vertex;
+
+varying vec4 color;
+varying vec2 st;
+
+void
+main (void)
+{
+	gl_Position = mvp_mat * vec4 (vertex, 1.0);
+	color = vcolor;
+	st = vst;
+}
+
 -- Fragment.particle.point
 
 //precision mediump float;
@@ -310,3 +334,34 @@ main (void)
 		discard;
 	gl_FragColor = fogBlend (texture2D (palette, vec2 (color, 0.0)));
 }
+
+-- Fragment.particle.textured
+
+//precision mediump float;
+uniform sampler2D texture;
+uniform vec4 fog;
+
+varying vec4 color;
+varying vec2 st;
+
+float
+sqr (float x)
+{
+	return x * x;
+}
+
+vec4
+fogBlend (vec4 color)
+{
+	float       f;
+	vec4        fog_color = vec4 (fog.rgb, 1.0);
+
+	f = exp (-sqr (fog.a * gl_FragCoord.z / gl_FragCoord.w));
+	return vec4 (mix (fog_color.rgb, color.rgb, f), color.a);
+}
+
+void
+main (void)
+{
+	gl_FragColor = fogBlend (texture2D (texture, st) * color);
+}
diff --git a/libs/video/renderer/glsl/quakepar.frag b/libs/video/renderer/glsl/quakepar.frag
deleted file mode 100644
index da829b0f3..000000000
--- a/libs/video/renderer/glsl/quakepar.frag
+++ /dev/null
@@ -1,28 +0,0 @@
-//precision mediump float;
-uniform sampler2D texture;
-uniform vec4 fog;
-
-varying vec4 color;
-varying vec2 st;
-
-float
-sqr (float x)
-{
-	return x * x;
-}
-
-vec4
-fogBlend (vec4 color)
-{
-	float       f;
-	vec4        fog_color = vec4 (fog.rgb, 1.0);
-
-	f = exp (-sqr (fog.a * gl_FragCoord.z / gl_FragCoord.w));
-	return vec4 (mix (fog_color.rgb, color.rgb, f), color.a);
-}
-
-void
-main (void)
-{
-	gl_FragColor = fogBlend (texture2D (texture, st) * color);
-}
diff --git a/libs/video/renderer/glsl/quakepar.vert b/libs/video/renderer/glsl/quakepar.vert
deleted file mode 100644
index 3c80e6520..000000000
--- a/libs/video/renderer/glsl/quakepar.vert
+++ /dev/null
@@ -1,21 +0,0 @@
-uniform mat4 mvp_mat;
-attribute vec4 vcolor;
-attribute vec2 vst;
-/** Vertex position.
-
-	x, y, z, c
-
-	c is the color of the point.
-*/
-attribute vec3 vertex;
-
-varying vec4 color;
-varying vec2 st;
-
-void
-main (void)
-{
-	gl_Position = mvp_mat * vec4 (vertex, 1.0);
-	color = vcolor;
-	st = vst;
-}

From 68bd7e643d039a1f67bc1641ff2a1cb4b4c807be Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 28 Jan 2014 12:22:38 +0900
Subject: [PATCH 0053/1519] Remove the long dead text vertex shader.

---
 libs/video/renderer/glsl/Makefile.am   |  5 ++-
 libs/video/renderer/glsl/glsl_draw.c   |  4 ---
 libs/video/renderer/glsl/quaketxt.vert | 49 --------------------------
 3 files changed, 2 insertions(+), 56 deletions(-)
 delete mode 100644 libs/video/renderer/glsl/quaketxt.vert

diff --git a/libs/video/renderer/glsl/Makefile.am b/libs/video/renderer/glsl/Makefile.am
index 2afb4ccd2..34108e9d4 100644
--- a/libs/video/renderer/glsl/Makefile.am
+++ b/libs/video/renderer/glsl/Makefile.am
@@ -6,12 +6,11 @@ AM_CPPFLAGS= -I$(top_srcdir)/include $(GLX_CFLAGS)
 shader_src= quakeforge.glsl \
 	iqm.frag iqm.vert \
 	quake2d.frag quakeico.vert \
-	quakespr.frag quakespr.vert \
-	quaketxt.vert
+	quakespr.frag quakespr.vert
 shader_gen= quakeforge.slc \
 	iqm.fc iqm.vc \
 	quake2d.fc quakeico.vc \
-	quakespr.fc quakespr.vc quaketxt.vc
+	quakespr.fc quakespr.vc
 
 glsl_src = \
 	glsl_alias.c glsl_bsp.c glsl_draw.c glsl_fog.c glsl_iqm.c glsl_lightmap.c \
diff --git a/libs/video/renderer/glsl/glsl_draw.c b/libs/video/renderer/glsl/glsl_draw.c
index 9be2635cc..a42bc9370 100644
--- a/libs/video/renderer/glsl/glsl_draw.c
+++ b/libs/video/renderer/glsl/glsl_draw.c
@@ -76,10 +76,6 @@ static const char quakeicon_vert[] =
 #include "quakeico.vc"
 ;
 
-static const char quaketext_vert[] =
-#include "quaketxt.vc"
-;
-
 static const char quake2d_frag[] =
 #include "quake2d.fc"
 ;
diff --git a/libs/video/renderer/glsl/quaketxt.vert b/libs/video/renderer/glsl/quaketxt.vert
deleted file mode 100644
index 4c4c6f216..000000000
--- a/libs/video/renderer/glsl/quaketxt.vert
+++ /dev/null
@@ -1,49 +0,0 @@
-uniform mat4 mvp_mat;
-/** Vertex position.
-
-	x, y, cx, cy
-
-	\a vertex provides the onscreen location at which to draw the character
-	(\a x, \a y) and which corner of the character cell this vertex
-	represents (\a cx, \a cy). \a cx and \a cy must be either 0 or 1, or
-	wierd things will happen with the character cell.
-*/
-attribute vec4 vertex;
-
-/** Vectex color.
-
-	r, g, b, a
-*/
-attribute vec4 vcolor;
-
-/** The character to draw.
-
-	The quake character map supports only 256 characters, 0-255. Any other
-	value will give interesting results.
-*/
-attribute float dchar;
-
-/** Coordinate in character map texture.
-*/
-varying vec4 color;
-varying vec2 st;
-
-void
-main (void)
-{
-	float       row, col;
-	vec2        pos, corner, uv;
-	const vec2  inset = vec2 (0.03125, 0.03125);
-	const vec2  size = vec2 (0.0625, 0.0625);
-
-	row = floor (dchar / 16.0);
-	col = mod (dchar, 16.0);
-
-	pos = vertex.xy;
-	corner = vertex.zw;
-	uv = vec2 (col, row) + inset * (1.0 - 2.0 * corner) + corner;
-	uv *= size;
-	gl_Position = mvp_mat * vec4 (pos + corner * 8.0, 0.0, 1.0);
-	st = uv;
-	color = vcolor;
-}

From 50bb40be29b9eebce55b794ecac5513c0d80164a Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 28 Jan 2014 12:31:27 +0900
Subject: [PATCH 0054/1519] Use the new shader system for sprites.

---
 libs/video/renderer/glsl/Makefile.am     |  6 +--
 libs/video/renderer/glsl/glsl_sprite.c   | 25 ++++++---
 libs/video/renderer/glsl/quakeforge.glsl | 69 ++++++++++++++++++++++++
 libs/video/renderer/glsl/quakespr.frag   | 43 ---------------
 libs/video/renderer/glsl/quakespr.vert   | 20 -------
 5 files changed, 88 insertions(+), 75 deletions(-)
 delete mode 100644 libs/video/renderer/glsl/quakespr.frag
 delete mode 100644 libs/video/renderer/glsl/quakespr.vert

diff --git a/libs/video/renderer/glsl/Makefile.am b/libs/video/renderer/glsl/Makefile.am
index 34108e9d4..1daa73c78 100644
--- a/libs/video/renderer/glsl/Makefile.am
+++ b/libs/video/renderer/glsl/Makefile.am
@@ -5,12 +5,10 @@ AM_CPPFLAGS= -I$(top_srcdir)/include $(GLX_CFLAGS)
 
 shader_src= quakeforge.glsl \
 	iqm.frag iqm.vert \
-	quake2d.frag quakeico.vert \
-	quakespr.frag quakespr.vert
+	quake2d.frag quakeico.vert
 shader_gen= quakeforge.slc \
 	iqm.fc iqm.vc \
-	quake2d.fc quakeico.vc \
-	quakespr.fc quakespr.vc
+	quake2d.fc quakeico.vc
 
 glsl_src = \
 	glsl_alias.c glsl_bsp.c glsl_draw.c glsl_fog.c glsl_iqm.c glsl_lightmap.c \
diff --git a/libs/video/renderer/glsl/glsl_sprite.c b/libs/video/renderer/glsl/glsl_sprite.c
index ab96b137e..6603a7e69 100644
--- a/libs/video/renderer/glsl/glsl_sprite.c
+++ b/libs/video/renderer/glsl/glsl_sprite.c
@@ -55,13 +55,17 @@
 
 #include "r_internal.h"
 
-static const char quakesprite_vert[] =
-#include "quakespr.vc"
-;
+static const char *sprite_vert_effects[] =
+{
+	"QuakeForge.Vertex.sprite",
+	0
+};
 
-static const char quakesprite_frag[] =
-#include "quakespr.fc"
-;
+static const char *sprite_frag_effects[] =
+{
+	"QuakeForge.Fragment.sprite",
+	0
+};
 
 //static float proj_matrix[16];
 
@@ -96,11 +100,14 @@ static struct {
 void
 glsl_R_InitSprites (void)
 {
+	shader_t   *vert_shader, *frag_shader;
 	int         frag, vert;
 
-	vert = GLSL_CompileShaderS ("quakespr.vert", quakesprite_vert,
+	vert_shader = GLSL_BuildShader (sprite_vert_effects);
+	frag_shader = GLSL_BuildShader (sprite_frag_effects);
+	vert = GLSL_CompileShader ("quakespr.vert", vert_shader,
 							   GL_VERTEX_SHADER);
-	frag = GLSL_CompileShaderS ("quakespr.frag", quakesprite_frag,
+	frag = GLSL_CompileShader ("quakespr.frag", frag_shader,
 							   GL_FRAGMENT_SHADER);
 	quake_sprite.program = GLSL_LinkProgram ("quakespr", vert, frag);
 	GLSL_ResolveShaderParam (quake_sprite.program, &quake_sprite.spritea);
@@ -114,6 +121,8 @@ glsl_R_InitSprites (void)
 	GLSL_ResolveShaderParam (quake_sprite.program, &quake_sprite.uvab);
 	GLSL_ResolveShaderParam (quake_sprite.program, &quake_sprite.blend);
 	GLSL_ResolveShaderParam (quake_sprite.program, &quake_sprite.fog);
+	GLSL_FreeShader (vert_shader);
+	GLSL_FreeShader (frag_shader);
 }
 
 static void
diff --git a/libs/video/renderer/glsl/quakeforge.glsl b/libs/video/renderer/glsl/quakeforge.glsl
index 097ef89ed..fc4954252 100644
--- a/libs/video/renderer/glsl/quakeforge.glsl
+++ b/libs/video/renderer/glsl/quakeforge.glsl
@@ -365,3 +365,72 @@ main (void)
 {
 	gl_FragColor = fogBlend (texture2D (texture, st) * color);
 }
+
+-- Vertex.sprite
+
+uniform mat4 mvp_mat;
+attribute float vblend;
+attribute vec4 vcolora, vcolorb;
+attribute vec4 uvab;	///< ua va ub vb
+attribute vec3 vertexa, vertexb;
+
+varying float blend;
+varying vec4 colora, colorb;
+varying vec2 sta, stb;
+
+void
+main (void)
+{
+	gl_Position = mvp_mat * vec4 (mix (vertexa, vertexb, vblend), 1.0);
+	blend = vblend;
+	colora = vcolora;
+	colorb = vcolorb;
+	sta = uvab.xy;
+	stb = uvab.zw;
+}
+
+-- Fragment.sprite
+
+uniform sampler2D spritea;
+uniform sampler2D spriteb;
+uniform sampler2D palette;
+uniform vec4 fog;
+
+varying float blend;
+varying vec4 colora, colorb;
+varying vec2 sta, stb;
+
+float
+sqr (float x)
+{
+	return x * x;
+}
+
+vec4
+fogBlend (vec4 color)
+{
+	float       f;
+	vec4        fog_color = vec4 (fog.rgb, 1.0);
+
+	f = exp (-sqr (fog.a * gl_FragCoord.z / gl_FragCoord.w));
+	return vec4 (mix (fog_color.rgb, color.rgb, f), color.a);
+}
+
+void
+main (void)
+{
+	float       pixa, pixb;
+	vec4        cola, colb;
+	vec4        col;
+
+	pixa = texture2D (spritea, sta).r;
+	pixb = texture2D (spriteb, stb).r;
+	if (pixa == 1.0 && pixb == 1.0)
+		discard;
+	cola = texture2D (palette, vec2 (pixa, 0.0)) * colora;
+	colb = texture2D (palette, vec2 (pixb, 0.0)) * colorb;
+	col = mix (cola, colb, blend);
+	if (col.a == 0.0)
+		discard;
+	gl_FragColor = fogBlend (col);
+}
diff --git a/libs/video/renderer/glsl/quakespr.frag b/libs/video/renderer/glsl/quakespr.frag
deleted file mode 100644
index fd20a4fa4..000000000
--- a/libs/video/renderer/glsl/quakespr.frag
+++ /dev/null
@@ -1,43 +0,0 @@
-uniform sampler2D spritea;
-uniform sampler2D spriteb;
-uniform sampler2D palette;
-uniform vec4 fog;
-
-varying float blend;
-varying vec4 colora, colorb;
-varying vec2 sta, stb;
-
-float
-sqr (float x)
-{
-	return x * x;
-}
-
-vec4
-fogBlend (vec4 color)
-{
-	float       f;
-	vec4        fog_color = vec4 (fog.rgb, 1.0);
-
-	f = exp (-sqr (fog.a * gl_FragCoord.z / gl_FragCoord.w));
-	return vec4 (mix (fog_color.rgb, color.rgb, f), color.a);
-}
-
-void
-main (void)
-{
-	float       pixa, pixb;
-	vec4        cola, colb;
-	vec4        col;
-
-	pixa = texture2D (spritea, sta).r;
-	pixb = texture2D (spriteb, stb).r;
-	if (pixa == 1.0 && pixb == 1.0)
-		discard;
-	cola = texture2D (palette, vec2 (pixa, 0.0)) * colora;
-	colb = texture2D (palette, vec2 (pixb, 0.0)) * colorb;
-	col = mix (cola, colb, blend);
-	if (col.a == 0.0)
-		discard;
-	gl_FragColor = fogBlend (col);
-}
diff --git a/libs/video/renderer/glsl/quakespr.vert b/libs/video/renderer/glsl/quakespr.vert
deleted file mode 100644
index c248d292c..000000000
--- a/libs/video/renderer/glsl/quakespr.vert
+++ /dev/null
@@ -1,20 +0,0 @@
-uniform mat4 mvp_mat;
-attribute float vblend;
-attribute vec4 vcolora, vcolorb;
-attribute vec4 uvab;	///< ua va ub vb
-attribute vec3 vertexa, vertexb;
-
-varying float blend;
-varying vec4 colora, colorb;
-varying vec2 sta, stb;
-
-void
-main (void)
-{
-	gl_Position = mvp_mat * vec4 (mix (vertexa, vertexb, vblend), 1.0);
-	blend = vblend;
-	colora = vcolora;
-	colorb = vcolorb;
-	sta = uvab.xy;
-	stb = uvab.zw;
-}

From c89e612cd4280c0d874e288f71dee2686ffc3d1b Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 28 Jan 2014 13:00:28 +0900
Subject: [PATCH 0055/1519] Remove redundant fog and palette shader code.

---
 libs/video/renderer/glsl/glsl_bsp.c       |  5 +-
 libs/video/renderer/glsl/glsl_particles.c |  4 ++
 libs/video/renderer/glsl/glsl_sprite.c    |  2 +
 libs/video/renderer/glsl/quakeforge.glsl  | 75 +++++------------------
 4 files changed, 23 insertions(+), 63 deletions(-)

diff --git a/libs/video/renderer/glsl/glsl_bsp.c b/libs/video/renderer/glsl/glsl_bsp.c
index 9f6d019ed..e52402660 100644
--- a/libs/video/renderer/glsl/glsl_bsp.c
+++ b/libs/video/renderer/glsl/glsl_bsp.c
@@ -125,8 +125,8 @@ static const char *bsp_turb_effects[] =
 {
 	"QuakeForge.Math.const",
 	"QuakeForge.Fragment.fog",
+	"QuakeForge.Fragment.palette",
 	"QuakeForge.env.warp.turb",
-	"QuakeForge.Fragment.colormap",
 	"QuakeForge.Fragment.bsp.unlit",
 	0
 };
@@ -134,7 +134,6 @@ static const char *bsp_turb_effects[] =
 static const char *bsp_sky_cube_effects[] =
 {
 	"QuakeForge.Fragment.fog",
-	"QuakeForge.Fragment.colormap",
 	"QuakeForge.env.sky.cube",
 	"QuakeForge.Fragment.bsp.sky",
 	0
@@ -143,7 +142,7 @@ static const char *bsp_sky_cube_effects[] =
 static const char *bsp_sky_id_effects[] =
 {
 	"QuakeForge.Fragment.fog",
-	"QuakeForge.Fragment.colormap",
+	"QuakeForge.Fragment.palette",
 	"QuakeForge.env.sky.id",
 	"QuakeForge.Fragment.bsp.sky",
 	0
diff --git a/libs/video/renderer/glsl/glsl_particles.c b/libs/video/renderer/glsl/glsl_particles.c
index 09ae06d6f..dba65db08 100644
--- a/libs/video/renderer/glsl/glsl_particles.c
+++ b/libs/video/renderer/glsl/glsl_particles.c
@@ -86,6 +86,8 @@ static const char *particle_point_vert_effects[] =
 
 static const char *particle_point_frag_effects[] =
 {
+	"QuakeForge.Fragment.fog",
+	"QuakeForge.Fragment.palette",
 	"QuakeForge.Fragment.particle.point",
 	0
 };
@@ -98,6 +100,8 @@ static const char *particle_textured_vert_effects[] =
 
 static const char *particle_textured_frag_effects[] =
 {
+	"QuakeForge.Fragment.fog",
+	"QuakeForge.Fragment.palette",
 	"QuakeForge.Fragment.particle.textured",
 	0
 };
diff --git a/libs/video/renderer/glsl/glsl_sprite.c b/libs/video/renderer/glsl/glsl_sprite.c
index 6603a7e69..83f116ee3 100644
--- a/libs/video/renderer/glsl/glsl_sprite.c
+++ b/libs/video/renderer/glsl/glsl_sprite.c
@@ -63,6 +63,8 @@ static const char *sprite_vert_effects[] =
 
 static const char *sprite_frag_effects[] =
 {
+	"QuakeForge.Fragment.fog",
+	"QuakeForge.Fragment.palette",
 	"QuakeForge.Fragment.sprite",
 	0
 };
diff --git a/libs/video/renderer/glsl/quakeforge.glsl b/libs/video/renderer/glsl/quakeforge.glsl
index fc4954252..66371483e 100644
--- a/libs/video/renderer/glsl/quakeforge.glsl
+++ b/libs/video/renderer/glsl/quakeforge.glsl
@@ -38,6 +38,16 @@ fogBlend (vec4 color)
 	return vec4 (mix (fog_color.rgb, color.rgb, fog_factor), color.a);
 }
 
+-- Fragment.palette
+
+uniform sampler2D palette;
+
+vec4
+palettedColor (float pix)
+{
+	return texture2D (palette, vec2 (pix, 0.0));
+}
+
 -- Fragment.colormap
 
 uniform sampler2D colormap;
@@ -88,7 +98,6 @@ sky_color (vec3 dir)
 
 -- env.sky.id
 
-uniform sampler2D palette;
 uniform sampler2D solid;
 uniform sampler2D trans;
 uniform float time;
@@ -114,7 +123,7 @@ sky_color (vec3 dir)
 		st = base + flow * time / 16.0;
 		pix = texture2D (solid, st).r;
 	}
-	return texture2D (palette, vec2 (pix, 0));
+	return palettedColor (pix);
 }
 
 -- Vertex.mdl
@@ -225,7 +234,6 @@ main (void)
 -- Fragment.bsp.unlit
 
 uniform sampler2D texture;
-uniform sampler2D palette;
 uniform float time;
 
 varying vec2 tst;
@@ -240,7 +248,7 @@ main (void)
 
 	st = warp_st (tst, time);
 	pix = texture2D (texture, st).r;
-	c = texture2D (palette, vec2(pix, 0)) * color;
+	c = palettedColor (pix) * color;
 	gl_FragColor = fogBlend (c);
 }
 
@@ -306,60 +314,25 @@ main (void)
 -- Fragment.particle.point
 
 //precision mediump float;
-uniform sampler2D palette;
-uniform vec4 fog;
 
 varying float color;
 
-float
-sqr (float x)
-{
-	return x * x;
-}
-
-vec4
-fogBlend (vec4 color)
-{
-	float       f;
-	vec4        fog_color = vec4 (fog.rgb, 1.0);
-
-	f = exp (-sqr (fog.a * gl_FragCoord.z / gl_FragCoord.w));
-	return vec4 (mix (fog_color.rgb, color.rgb, f), color.a);
-}
-
 void
 main (void)
 {
 	if (color == 1.0)
 		discard;
-	gl_FragColor = fogBlend (texture2D (palette, vec2 (color, 0.0)));
+	gl_FragColor = fogBlend (palettedColor (color));
 }
 
 -- Fragment.particle.textured
 
 //precision mediump float;
 uniform sampler2D texture;
-uniform vec4 fog;
 
 varying vec4 color;
 varying vec2 st;
 
-float
-sqr (float x)
-{
-	return x * x;
-}
-
-vec4
-fogBlend (vec4 color)
-{
-	float       f;
-	vec4        fog_color = vec4 (fog.rgb, 1.0);
-
-	f = exp (-sqr (fog.a * gl_FragCoord.z / gl_FragCoord.w));
-	return vec4 (mix (fog_color.rgb, color.rgb, f), color.a);
-}
-
 void
 main (void)
 {
@@ -393,29 +366,11 @@ main (void)
 
 uniform sampler2D spritea;
 uniform sampler2D spriteb;
-uniform sampler2D palette;
-uniform vec4 fog;
 
 varying float blend;
 varying vec4 colora, colorb;
 varying vec2 sta, stb;
 
-float
-sqr (float x)
-{
-	return x * x;
-}
-
-vec4
-fogBlend (vec4 color)
-{
-	float       f;
-	vec4        fog_color = vec4 (fog.rgb, 1.0);
-
-	f = exp (-sqr (fog.a * gl_FragCoord.z / gl_FragCoord.w));
-	return vec4 (mix (fog_color.rgb, color.rgb, f), color.a);
-}
-
 void
 main (void)
 {
@@ -427,8 +382,8 @@ main (void)
 	pixb = texture2D (spriteb, stb).r;
 	if (pixa == 1.0 && pixb == 1.0)
 		discard;
-	cola = texture2D (palette, vec2 (pixa, 0.0)) * colora;
-	colb = texture2D (palette, vec2 (pixb, 0.0)) * colorb;
+	cola = palettedColor (pixa) * colora;
+	colb = palettedColor (pixb) * colorb;
 	col = mix (cola, colb, blend);
 	if (col.a == 0.0)
 		discard;

From 385175ca656802abe0b744ce3974ab2541a3c1b5 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 28 Jan 2014 13:10:56 +0900
Subject: [PATCH 0056/1519] Use the new shader system for 2d drawing.

---
 libs/video/renderer/glsl/Makefile.am     |  6 ++--
 libs/video/renderer/glsl/glsl_draw.c     | 26 ++++++++++-----
 libs/video/renderer/glsl/quake2d.frag    | 16 ---------
 libs/video/renderer/glsl/quakeforge.glsl | 42 ++++++++++++++++++++++++
 libs/video/renderer/glsl/quakeico.vert   | 21 ------------
 5 files changed, 62 insertions(+), 49 deletions(-)
 delete mode 100644 libs/video/renderer/glsl/quake2d.frag
 delete mode 100644 libs/video/renderer/glsl/quakeico.vert

diff --git a/libs/video/renderer/glsl/Makefile.am b/libs/video/renderer/glsl/Makefile.am
index 1daa73c78..933108b6b 100644
--- a/libs/video/renderer/glsl/Makefile.am
+++ b/libs/video/renderer/glsl/Makefile.am
@@ -4,11 +4,9 @@ AM_CFLAGS= @PREFER_PIC@
 AM_CPPFLAGS= -I$(top_srcdir)/include $(GLX_CFLAGS)
 
 shader_src= quakeforge.glsl \
-	iqm.frag iqm.vert \
-	quake2d.frag quakeico.vert
+	iqm.frag iqm.vert
 shader_gen= quakeforge.slc \
-	iqm.fc iqm.vc \
-	quake2d.fc quakeico.vc
+	iqm.fc iqm.vc
 
 glsl_src = \
 	glsl_alias.c glsl_bsp.c glsl_draw.c glsl_fog.c glsl_iqm.c glsl_lightmap.c \
diff --git a/libs/video/renderer/glsl/glsl_draw.c b/libs/video/renderer/glsl/glsl_draw.c
index a42bc9370..528dc60da 100644
--- a/libs/video/renderer/glsl/glsl_draw.c
+++ b/libs/video/renderer/glsl/glsl_draw.c
@@ -72,13 +72,18 @@ typedef struct {
 	float       color[4];
 } drawvert_t;
 
-static const char quakeicon_vert[] =
-#include "quakeico.vc"
-;
+static const char *twod_vert_effects[] =
+{
+	"QuakeForge.Vertex.2d",
+	0
+};
 
-static const char quake2d_frag[] =
-#include "quake2d.fc"
-;
+static const char *twod_frag_effects[] =
+{
+	"QuakeForge.Fragment.palette",
+	"QuakeForge.Fragment.2d",
+	0
+};
 
 static float proj_matrix[16];
 
@@ -364,6 +369,7 @@ Draw_ClearCache (int phase)
 void
 glsl_Draw_Init (void)
 {
+	shader_t   *vert_shader, *frag_shader;
 	int         i;
 	int         frag, vert;
 	qpic_t     *pic;
@@ -377,9 +383,11 @@ glsl_Draw_Init (void)
 
 	draw_queue = dstring_new ();
 
-	vert = GLSL_CompileShaderS ("quakeico.vert", quakeicon_vert,
+	vert_shader = GLSL_BuildShader (twod_vert_effects);
+	frag_shader = GLSL_BuildShader (twod_frag_effects);
+	vert = GLSL_CompileShader ("quakeico.vert", vert_shader,
 							   GL_VERTEX_SHADER);
-	frag = GLSL_CompileShaderS ("quake2d.frag", quake2d_frag,
+	frag = GLSL_CompileShader ("quake2d.frag", frag_shader,
 							   GL_FRAGMENT_SHADER);
 	quake_2d.program = GLSL_LinkProgram ("quake2d", vert, frag);
 	GLSL_ResolveShaderParam (quake_2d.program, &quake_2d.texture);
@@ -387,6 +395,8 @@ glsl_Draw_Init (void)
 	GLSL_ResolveShaderParam (quake_2d.program, &quake_2d.matrix);
 	GLSL_ResolveShaderParam (quake_2d.program, &quake_2d.vertex);
 	GLSL_ResolveShaderParam (quake_2d.program, &quake_2d.color);
+	GLSL_FreeShader (vert_shader);
+	GLSL_FreeShader (frag_shader);
 
 	draw_scrap = GLSL_CreateScrap (2048, GL_LUMINANCE, 0);
 
diff --git a/libs/video/renderer/glsl/quake2d.frag b/libs/video/renderer/glsl/quake2d.frag
deleted file mode 100644
index 730b48e22..000000000
--- a/libs/video/renderer/glsl/quake2d.frag
+++ /dev/null
@@ -1,16 +0,0 @@
-//precision mediump float;
-uniform sampler2D   texture;
-uniform sampler2D   palette;
-varying vec4 color;
-varying vec2 st;
-
-void
-main (void)
-{
-	float       pix;
-
-	pix = texture2D (texture, st).r;
-	if (pix == 1.0)
-		discard;
-	gl_FragColor = texture2D (palette, vec2 (pix, 0.0)) * color;
-}
diff --git a/libs/video/renderer/glsl/quakeforge.glsl b/libs/video/renderer/glsl/quakeforge.glsl
index 66371483e..ff1fd57a2 100644
--- a/libs/video/renderer/glsl/quakeforge.glsl
+++ b/libs/video/renderer/glsl/quakeforge.glsl
@@ -389,3 +389,45 @@ main (void)
 		discard;
 	gl_FragColor = fogBlend (col);
 }
+
+-- Vertex.2d
+
+uniform mat4 mvp_mat;
+attribute vec4 vcolor;
+/** Vertex position.
+
+	x, y, s, t
+
+	\a vertex provides the onscreen location at which to draw the icon
+	(\a x, \a y) and texture coordinate for the icon (\a s=z, \a t=w).
+*/
+attribute vec4 vertex;
+
+varying vec4 color;
+varying vec2 st;
+
+void
+main (void)
+{
+	gl_Position = mvp_mat * vec4 (vertex.xy, 0.0, 1.0);
+	st = vertex.zw;
+	color = vcolor;
+}
+
+-- Fragment.2d
+
+//precision mediump float;
+uniform sampler2D   texture;
+varying vec4 color;
+varying vec2 st;
+
+void
+main (void)
+{
+	float       pix;
+
+	pix = texture2D (texture, st).r;
+	if (pix == 1.0)
+		discard;
+	gl_FragColor = palettedColor (pix) * color;
+}
diff --git a/libs/video/renderer/glsl/quakeico.vert b/libs/video/renderer/glsl/quakeico.vert
deleted file mode 100644
index 9f0399c75..000000000
--- a/libs/video/renderer/glsl/quakeico.vert
+++ /dev/null
@@ -1,21 +0,0 @@
-uniform mat4 mvp_mat;
-attribute vec4 vcolor;
-/** Vertex position.
-
-	x, y, s, t
-
-	\a vertex provides the onscreen location at which to draw the icon
-	(\a x, \a y) and texture coordinate for the icon (\a s=z, \a t=w).
-*/
-attribute vec4 vertex;
-
-varying vec4 color;
-varying vec2 st;
-
-void
-main (void)
-{
-	gl_Position = mvp_mat * vec4 (vertex.xy, 0.0, 1.0);
-	st = vertex.zw;
-	color = vcolor;
-}

From 57d21981401d765e5be4e400c3f756708695ccf7 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 28 Jan 2014 13:28:35 +0900
Subject: [PATCH 0057/1519] Use the new shader system for iqm models.

---
 libs/video/renderer/glsl/Makefile.am     |   6 +-
 libs/video/renderer/glsl/glsl_iqm.c      |  27 +++--
 libs/video/renderer/glsl/iqm.frag        |  67 -------------
 libs/video/renderer/glsl/iqm.vert        |  82 ---------------
 libs/video/renderer/glsl/quakeforge.glsl | 122 ++++++++++++++++++++++-
 5 files changed, 142 insertions(+), 162 deletions(-)
 delete mode 100644 libs/video/renderer/glsl/iqm.frag
 delete mode 100644 libs/video/renderer/glsl/iqm.vert

diff --git a/libs/video/renderer/glsl/Makefile.am b/libs/video/renderer/glsl/Makefile.am
index 933108b6b..68321ae78 100644
--- a/libs/video/renderer/glsl/Makefile.am
+++ b/libs/video/renderer/glsl/Makefile.am
@@ -3,10 +3,8 @@ AUTOMAKE_OPTIONS= foreign
 AM_CFLAGS= @PREFER_PIC@
 AM_CPPFLAGS= -I$(top_srcdir)/include $(GLX_CFLAGS)
 
-shader_src= quakeforge.glsl \
-	iqm.frag iqm.vert
-shader_gen= quakeforge.slc \
-	iqm.fc iqm.vc
+shader_src= quakeforge.glsl
+shader_gen= quakeforge.slc
 
 glsl_src = \
 	glsl_alias.c glsl_bsp.c glsl_draw.c glsl_fog.c glsl_iqm.c glsl_lightmap.c \
diff --git a/libs/video/renderer/glsl/glsl_iqm.c b/libs/video/renderer/glsl/glsl_iqm.c
index b8cae10bd..d189a4cbe 100644
--- a/libs/video/renderer/glsl/glsl_iqm.c
+++ b/libs/video/renderer/glsl/glsl_iqm.c
@@ -55,13 +55,19 @@
 
 #include "r_internal.h"
 
-static const char iqm_vert[] =
-#include "iqm.vc"
-;
+static const char *iqm_vert_effects[] =
+{
+	"QuakeForge.Math.quaternion",
+	"QuakeForge.Vertex.iqm",
+	0
+};
 
-static const char iqm_frag[] =
-#include "iqm.fc"
-;
+static const char *iqm_frag_effects[] =
+{
+	"QuakeForge.Fragment.fog",
+	"QuakeForge.Fragment.iqm",
+	0
+};
 
 typedef struct {
 	shaderparam_t position;
@@ -136,12 +142,15 @@ static mat4_t iqm_vp;
 void
 glsl_R_InitIQM (void)
 {
+	shader_t   *vert_shader, *frag_shader;
 	int         vert;
 	int         frag;
 	int         i;
 
-	vert = GLSL_CompileShaderS ("iqm.vert", iqm_vert, GL_VERTEX_SHADER);
-	frag = GLSL_CompileShaderS ("iqm.frag", iqm_frag, GL_FRAGMENT_SHADER);
+	vert_shader = GLSL_BuildShader (iqm_vert_effects);
+	frag_shader = GLSL_BuildShader (iqm_frag_effects);
+	vert = GLSL_CompileShader ("iqm.vert", vert_shader, GL_VERTEX_SHADER);
+	frag = GLSL_CompileShader ("iqm.frag", frag_shader, GL_FRAGMENT_SHADER);
 	iqm_shader.program = GLSL_LinkProgram ("iqm", vert, frag);
 	GLSL_ResolveShaderParam (iqm_shader.program, &iqm_shader.mvp_matrix);
 	GLSL_ResolveShaderParam (iqm_shader.program, &iqm_shader.norm_matrix);
@@ -163,6 +172,8 @@ glsl_R_InitIQM (void)
 	GLSL_ResolveShaderParam (iqm_shader.program, &iqm_shader.texture);
 	GLSL_ResolveShaderParam (iqm_shader.program, &iqm_shader.normalmap);
 	GLSL_ResolveShaderParam (iqm_shader.program, &iqm_shader.fog);
+	GLSL_FreeShader (vert_shader);
+	GLSL_FreeShader (frag_shader);
 }
 
 static void
diff --git a/libs/video/renderer/glsl/iqm.frag b/libs/video/renderer/glsl/iqm.frag
deleted file mode 100644
index fd4b64b87..000000000
--- a/libs/video/renderer/glsl/iqm.frag
+++ /dev/null
@@ -1,67 +0,0 @@
-struct light {
-	vec4        position;		// xyz = pos, w = strength
-	vec4        color;			// rgb. a = ?
-};
-uniform sampler2D texture;
-uniform sampler2D normalmap;
-uniform vec3 ambient;
-uniform light lights[8];
-uniform vec4 fog;
-
-varying vec3 position;
-varying vec3 bitangent;
-varying vec3 tangent;
-varying vec3 normal;
-varying vec2 st;
-varying vec4 color;
-
-float
-sqr (float x)
-{
-    return x * x;
-}
-
-vec4
-fogBlend (vec4 color)
-{
-	float       f;
-	vec4        fog_color = vec4 (fog.rgb, 1.0);
-
-	f = exp (-sqr (fog.a * gl_FragCoord.z / gl_FragCoord.w));
-	return vec4 (mix (fog_color.rgb, color.rgb, f), color.a);
-}
-
-vec3
-calc_light (vec3 n, int ind)
-{
-	vec3        d;
-	light       l = lights[ind];
-	float       mag;
-
-	d = l.position.xyz - position;
-	mag = dot (d, n);
-	mag = max (0.0, mag);
-	return l.color.rgb * (l.position.w * mag / dot (d, d));
-}
-
-void
-main (void)
-{
-	mat3        tbn = mat3 (tangent, bitangent, normal);
-	vec3        norm, l;
-	vec4        col;
-
-	norm = (texture2D (normalmap, st).xyz - vec3(0.5)) * 2.0;
-	norm = tbn * norm;
-	l = ambient;
-	l += calc_light (norm, 0);
-	l += calc_light (norm, 1);
-	l += calc_light (norm, 2);
-	l += calc_light (norm, 3);
-	l += calc_light (norm, 4);
-	l += calc_light (norm, 5);
-	l += calc_light (norm, 6);
-	l += calc_light (norm, 7);
-	col = texture2D (texture, st) * color * vec4 (l, 1.0);
-	gl_FragColor = fogBlend (col);
-}
diff --git a/libs/video/renderer/glsl/iqm.vert b/libs/video/renderer/glsl/iqm.vert
deleted file mode 100644
index 180212e9f..000000000
--- a/libs/video/renderer/glsl/iqm.vert
+++ /dev/null
@@ -1,82 +0,0 @@
-uniform mat4 mvp_mat;
-uniform mat3 norm_mat;
-uniform mat4 bonemats[80];
-attribute vec4 vcolor;
-attribute vec4 vweights;
-attribute vec4 vbones;
-attribute vec4 vtangent;
-attribute vec3 vnormal;
-attribute vec2 texcoord;
-attribute vec3 vposition;
-
-varying vec3 position;
-varying vec3 bitangent;
-varying vec3 tangent;
-varying vec3 normal;
-varying vec2 st;
-varying vec4 color;
-
-vec3
-qmult (vec4 q, vec3 v)
-{
-	float       qs = q.w;
-	vec3        qv = q.xyz;
-	vec3        t = cross (qv, v);
-	return (qs * qs) * v + 2.0 * qs * t + dot (qv, v) * qv + cross (qv, t);
-}
-
-vec3
-dqtrans (vec4 q0, vec4 qe)
-{//2.0 * (q0.w * qe.xyz - qe.w * q0.xyz - cross (qe.xyz, q0.xyz));
-	float       qs = q0.w, Ts = qe.w;
-	vec3        qv = -q0.xyz, Tv = qe.xyz;
-
-	return 2.0 * (Ts * qv + qs * Tv + cross (Tv, qv));
-}
-
-void
-main (void)
-{
-	mat4        m;
-	vec4        q0, qe;
-	vec3        sh, sc, tr, v, n, t;
-
-	m  = bonemats[int (vbones.x)] * vweights.x;
-	m += bonemats[int (vbones.y)] * vweights.y;
-	m += bonemats[int (vbones.z)] * vweights.z;
-	m += bonemats[int (vbones.w)] * vweights.w;
-#if 0
-	q0 = m[0].yzwx; //swizzle for conversion betwen QF and GL
-	qe = m[1].yzwx; //swizzle for conversion betwen QF and GL
-	sh = m[2].xyz;
-	sc = m[3].xyz;
-
-	// extract translation from dual quaternion
-	tr = dqtrans (q0, qe);
-	// apply rotation and translation
-	v = qmult (q0, vposition) + tr;
-	// apply shear
-	v.z += v.y * sh.z + v.x * sh.y;
-	v.y += v.x * sh.x;
-	// apply scale
-	v *= sc;
-	// rotate normal (won't bother with shear or scale: not super accurate,
-	// but probably good enough)
-	n = qmult (q0, vnormal);
-	// rotate tangent (won't bother with shear or scale: not super accurate,
-	// but probably good enough)
-	t = qmult (q0, vtangent.xyz);
-#else
-	mat3 nm = mat3 (m[0].xyz, m[1].xyz, m[2].xyz);
-	v = (m * vec4 (vposition, 1.0)).xyz;
-	n = nm * vnormal;
-	t = nm * vtangent.xyz;
-#endif
-	position = v;
-	normal = norm_mat * n;
-	tangent = norm_mat * t;
-	bitangent = cross (normal, tangent) * vtangent.w;
-	color = vcolor;
-	st = texcoord;
-	gl_Position = mvp_mat * vec4 (position, 1.0);
-}
diff --git a/libs/video/renderer/glsl/quakeforge.glsl b/libs/video/renderer/glsl/quakeforge.glsl
index ff1fd57a2..8ac479219 100644
--- a/libs/video/renderer/glsl/quakeforge.glsl
+++ b/libs/video/renderer/glsl/quakeforge.glsl
@@ -8,7 +8,7 @@ const float E = 2.71828183;
 vec3
 qmult (vec4 q, vec3 v)
 {
-	float       qc = q.w;
+	float       qs = q.w;
 	vec3        qv = q.xyz;
 	vec3        t = cross (qv, v);
 	return (qs * qs) * v + 2.0 * qs * t + dot (qv, v) * qv + cross (qv, t);
@@ -431,3 +431,123 @@ main (void)
 		discard;
 	gl_FragColor = palettedColor (pix) * color;
 }
+
+-- Vertex.iqm
+
+uniform mat4 mvp_mat;
+uniform mat3 norm_mat;
+uniform mat4 bonemats[80];
+attribute vec4 vcolor;
+attribute vec4 vweights;
+attribute vec4 vbones;
+attribute vec4 vtangent;
+attribute vec3 vnormal;
+attribute vec2 texcoord;
+attribute vec3 vposition;
+
+varying vec3 position;
+varying vec3 bitangent;
+varying vec3 tangent;
+varying vec3 normal;
+varying vec2 st;
+varying vec4 color;
+
+void
+main (void)
+{
+	mat4        m;
+	vec4        q0, qe;
+	vec3        sh, sc, tr, v, n, t;
+
+	m  = bonemats[int (vbones.x)] * vweights.x;
+	m += bonemats[int (vbones.y)] * vweights.y;
+	m += bonemats[int (vbones.z)] * vweights.z;
+	m += bonemats[int (vbones.w)] * vweights.w;
+#if 0
+	q0 = m[0].yzwx; //swizzle for conversion betwen QF and GL
+	qe = m[1].yzwx; //swizzle for conversion betwen QF and GL
+	sh = m[2].xyz;
+	sc = m[3].xyz;
+
+	// extract translation from dual quaternion
+	tr = dqtrans (q0, qe);
+	// apply rotation and translation
+	v = qmult (q0, vposition) + tr;
+	// apply shear
+	v.z += v.y * sh.z + v.x * sh.y;
+	v.y += v.x * sh.x;
+	// apply scale
+	v *= sc;
+	// rotate normal (won't bother with shear or scale: not super accurate,
+	// but probably good enough)
+	n = qmult (q0, vnormal);
+	// rotate tangent (won't bother with shear or scale: not super accurate,
+	// but probably good enough)
+	t = qmult (q0, vtangent.xyz);
+#else
+	mat3 nm = mat3 (m[0].xyz, m[1].xyz, m[2].xyz);
+	v = (m * vec4 (vposition, 1.0)).xyz;
+	n = nm * vnormal;
+	t = nm * vtangent.xyz;
+#endif
+	position = v;
+	normal = norm_mat * n;
+	tangent = norm_mat * t;
+	bitangent = cross (normal, tangent) * vtangent.w;
+	color = vcolor;
+	st = texcoord;
+	gl_Position = mvp_mat * vec4 (position, 1.0);
+}
+
+-- Fragment.iqm
+
+struct light {
+	vec4        position;		// xyz = pos, w = strength
+	vec4        color;			// rgb. a = ?
+};
+uniform sampler2D texture;
+uniform sampler2D normalmap;
+uniform vec3 ambient;
+uniform light lights[8];
+
+varying vec3 position;
+varying vec3 bitangent;
+varying vec3 tangent;
+varying vec3 normal;
+varying vec2 st;
+varying vec4 color;
+
+vec3
+calc_light (vec3 n, int ind)
+{
+	vec3        d;
+	light       l = lights[ind];
+	float       mag;
+
+	d = l.position.xyz - position;
+	mag = dot (d, n);
+	mag = max (0.0, mag);
+	return l.color.rgb * (l.position.w * mag / dot (d, d));
+}
+
+void
+main (void)
+{
+	mat3        tbn = mat3 (tangent, bitangent, normal);
+	vec3        norm, l;
+	vec4        col;
+
+	norm = (texture2D (normalmap, st).xyz - vec3(0.5)) * 2.0;
+	norm = tbn * norm;
+	l = ambient;
+	l += calc_light (norm, 0);
+	l += calc_light (norm, 1);
+	l += calc_light (norm, 2);
+	l += calc_light (norm, 3);
+	l += calc_light (norm, 4);
+	l += calc_light (norm, 5);
+	l += calc_light (norm, 6);
+	l += calc_light (norm, 7);
+	col = texture2D (texture, st) * color * vec4 (l, 1.0);
+	gl_FragColor = fogBlend (col);
+}

From a5db0b1a6583e7a3bf370c1d91fbfd4526e0e4cd Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 28 Jan 2014 13:36:45 +0900
Subject: [PATCH 0058/1519] Remove the now unnecessary GLSL_CompileShaderS().

Now that the transition to using shader effects is comlete, there's no
need for the wrapper.
---
 include/QF/GLSL/qf_vid.h                   | 1 -
 libs/video/renderer/glsl/vid_common_glsl.c | 9 ---------
 2 files changed, 10 deletions(-)

diff --git a/include/QF/GLSL/qf_vid.h b/include/QF/GLSL/qf_vid.h
index 1dd324f05..57f6e5313 100644
--- a/include/QF/GLSL/qf_vid.h
+++ b/include/QF/GLSL/qf_vid.h
@@ -48,7 +48,6 @@ extern int glsl_colormap;
 void GLSL_Init_Common (void);
 
 int GLSL_CompileShader (const char *name, const shader_t *shader, int type);
-int GLSL_CompileShaderS (const char *name, const char *src, int type);
 int GLSL_LinkProgram (const char *name, int vert, int frag);
 int GLSL_ResolveShaderParam (int program, shaderparam_t *param);
 void GLSL_DumpAttribArrays (void);
diff --git a/libs/video/renderer/glsl/vid_common_glsl.c b/libs/video/renderer/glsl/vid_common_glsl.c
index 9f46fdc9c..d684fd4ff 100644
--- a/libs/video/renderer/glsl/vid_common_glsl.c
+++ b/libs/video/renderer/glsl/vid_common_glsl.c
@@ -217,15 +217,6 @@ GLSL_CompileShader (const char *name, const shader_t *shader, int type)
 	return sid;
 }
 
-int
-GLSL_CompileShaderS (const char *name, const char *src, int type)
-{
-	const char *shader_src = src;
-	const char *shader_name = "wrapped";
-	shader_t    shader = {1, &shader_src, &shader_name};
-	return GLSL_CompileShader (name, &shader, type);
-}
-
 static const char *
 type_name (GLenum type)
 {

From 4d59282641bdc97ff5420caed2317ce755d8fcd6 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 28 Jan 2014 13:49:06 +0900
Subject: [PATCH 0059/1519] Find the remaining vertex attribute order issues.

I hope. I do need to figure out why I made sprite blend an attribute
rather than a uniform.
---
 libs/video/renderer/glsl/quakeforge.glsl | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/libs/video/renderer/glsl/quakeforge.glsl b/libs/video/renderer/glsl/quakeforge.glsl
index 8ac479219..e346b31af 100644
--- a/libs/video/renderer/glsl/quakeforge.glsl
+++ b/libs/video/renderer/glsl/quakeforge.glsl
@@ -268,7 +268,6 @@ main (void)
 -- Vertex.particle.point
 
 uniform mat4 mvp_mat;
-attribute float vcolor;
 /** Vertex position.
 
 	x, y, z, c
@@ -276,6 +275,7 @@ attribute float vcolor;
 	c is the color of the point.
 */
 attribute vec3 vertex;
+attribute float vcolor;
 
 varying float color;
 
@@ -290,8 +290,6 @@ main (void)
 -- Vertex.particle.textured
 
 uniform mat4 mvp_mat;
-attribute vec4 vcolor;
-attribute vec2 vst;
 /** Vertex position.
 
 	x, y, z, c
@@ -299,6 +297,8 @@ attribute vec2 vst;
 	c is the color of the point.
 */
 attribute vec3 vertex;
+attribute vec2 vst;
+attribute vec4 vcolor;
 
 varying vec4 color;
 varying vec2 st;
@@ -342,10 +342,10 @@ main (void)
 -- Vertex.sprite
 
 uniform mat4 mvp_mat;
-attribute float vblend;
-attribute vec4 vcolora, vcolorb;
-attribute vec4 uvab;	///< ua va ub vb
 attribute vec3 vertexa, vertexb;
+attribute vec4 uvab;	///< ua va ub vb
+attribute float vblend;	//FIXME why is this not a uniform?
+attribute vec4 vcolora, vcolorb;
 
 varying float blend;
 varying vec4 colora, colorb;
@@ -393,7 +393,6 @@ main (void)
 -- Vertex.2d
 
 uniform mat4 mvp_mat;
-attribute vec4 vcolor;
 /** Vertex position.
 
 	x, y, s, t
@@ -402,6 +401,7 @@ attribute vec4 vcolor;
 	(\a x, \a y) and texture coordinate for the icon (\a s=z, \a t=w).
 */
 attribute vec4 vertex;
+attribute vec4 vcolor;
 
 varying vec4 color;
 varying vec2 st;

From 6910c50a4356fffa350ba52bfa6d112abcb69069 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 20 Jan 2013 10:09:05 +0900
Subject: [PATCH 0060/1519] Clean up the #ifdef mess in _QFS_FOpenFile

With proper initialization, only the one chunk of #ifdefs is needed. Now
the code is much easier to read.
---
 libs/util/quakefs.c | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/libs/util/quakefs.c b/libs/util/quakefs.c
index b864dfb74..8c893d600 100644
--- a/libs/util/quakefs.c
+++ b/libs/util/quakefs.c
@@ -871,12 +871,8 @@ _QFS_FOpenFile (const char *filename, QFile **gzfile,
 {
 	searchpath_t *search;
 	char       *path;
-#ifdef HAVE_VORBIS
-	char       *oggfilename;
-#endif
-#ifdef HAVE_ZLIB
-	char       *gzfilename;
-#endif
+	char       *oggfilename = 0;
+	char       *gzfilename = 0;
 
 	// make sure they're not trying to do weird stuff with our private files
 	path = QFS_CompressPath (filename);
@@ -893,8 +889,6 @@ _QFS_FOpenFile (const char *filename, QFile **gzfile,
 		QFS_StripExtension (path, oggfilename);
 		strncat (oggfilename, ".ogg",
 				 sizeof (oggfilename) - strlen (oggfilename) - 1);
-	} else {
-		oggfilename = 0;
 	}
 #endif
 #ifdef HAVE_ZLIB
@@ -904,16 +898,13 @@ _QFS_FOpenFile (const char *filename, QFile **gzfile,
 
 	// search through the path, one element at a time
 	for (search = qfs_searchpaths; search; search = search->next) {
-#ifdef HAVE_VORBIS
 		//NOTE gzipped oggs not supported
 		if (oggfilename
 			&& open_file (search, oggfilename, gzfile, foundname, false) != -1)
 			goto ok;
-#endif
-#ifdef HAVE_ZLIB
-		if (open_file (search, gzfilename, gzfile, foundname, zip) != -1)
+		if (gzfilename
+			&& open_file (search, gzfilename, gzfile, foundname, zip) != -1)
 			goto ok;
-#endif
 		if (open_file (search, path, gzfile, foundname, zip) != -1)
 			goto ok;
 	}

From f05c7179c3423b9bf35beae9f8887d204a6b292f Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 20 Jan 2013 13:41:30 +0900
Subject: [PATCH 0061/1519] Split up the search paths into vpath chunks.

A vpath is the union of all locations searched for a file in a single
gamedir (eg, shadows, id1 etc). This is a necessary step to preventing
problems like id1/maps/start.lit being used for shadows/maps/start.bsp.

However, QFS_FilelistFill still needs to be reworked as it does not compile
yet (testing was done with a gutted QFS_FilelistFill).
---
 libs/util/quakefs.c | 202 ++++++++++++++++++++++++++++++++------------
 1 file changed, 146 insertions(+), 56 deletions(-)

diff --git a/libs/util/quakefs.c b/libs/util/quakefs.c
index 8c893d600..b73b9b6bc 100644
--- a/libs/util/quakefs.c
+++ b/libs/util/quakefs.c
@@ -74,7 +74,7 @@
 #include <limits.h>
 
 #include "qfalloca.h"
-
+#include "QF/alloc.h"
 #include "QF/cmd.h"
 #include "QF/cvar.h"
 #include "QF/dstring.h"
@@ -136,7 +136,26 @@ typedef struct searchpath_s {
 	struct searchpath_s *next;
 } searchpath_t;
 
-static searchpath_t *qfs_searchpaths;
+/** Represent a single game directory.
+
+	A vpath is the union of all locations searched for a single gamedir. This
+	includes all pak files in the gamedir in the user's directory, the
+	filesystem in the user's gamedir, then all pak files in the share
+	game directory, and finally share's gamedir filesystem.
+
+	The purpose is to enable searches to be limited to a single gamedir or to
+	not search past a certain gamedir.
+*/
+typedef struct vpath_s {
+	char       *name;		// usually the gamedir name
+	searchpath_t *user;
+	searchpath_t *share;
+	struct vpath_s *next;
+} vpath_t;
+
+static searchpath_t *free_searchpaths;
+static vpath_t *free_vpaths;
+static vpath_t *qfs_vpaths;
 
 //QFS
 
@@ -145,7 +164,7 @@ typedef struct qfs_var_s {
 	char       *val;
 } qfs_var_t;
 
-static void qfs_add_gamedir (const char *dir);
+static void qfs_add_gamedir (vpath_t *vpath, const char *dir);
 
 VISIBLE gamedir_t  *qfs_gamedir;
 static plitem_t *qfs_gd_plist;
@@ -213,6 +232,55 @@ static gamedir_callback_t **gamedir_callbacks;
 static int num_gamedir_callbacks;
 static int max_gamedir_callbacks;
 
+static searchpath_t *
+new_searchpath (void)
+{
+	searchpath_t *searchpath;
+	ALLOC (16, searchpath_t, searchpaths, searchpath);
+	return searchpath;
+}
+
+static void
+delete_searchpath (searchpath_t *searchpath)
+{
+	if (searchpath->pack) {
+		Qclose (searchpath->pack->handle);
+		free (searchpath->pack->files);
+		free (searchpath->pack);
+	}
+	if (searchpath->filename)
+		free (searchpath->filename);
+	FREE (searchpaths, searchpath);
+}
+
+static vpath_t *
+new_vpath (void)
+{
+	vpath_t    *vpath;
+	ALLOC (16, vpath_t, vpaths, vpath);
+	return vpath;
+}
+
+static void
+delete_vpath (vpath_t *vpath)
+{
+	searchpath_t *next;
+
+	if (vpath->name)
+		free (vpath->name);
+	while (vpath->user) {
+		next = vpath->user->next;
+		delete_searchpath (vpath->user);
+		vpath->user = next;
+	}
+	while (vpath->share) {
+		next = vpath->share->next;
+		delete_searchpath (vpath->share);
+		vpath->share = next;
+	}
+	FREE (vpaths, vpath);
+}
+
 static const char *
 qfs_var_get_key (const void *_v, void *unused)
 {
@@ -448,18 +516,22 @@ qfs_process_path (const char *path, const char *gamedir)
 {
 	const char *e = path + strlen (path);
 	const char *s = e;
-	dstring_t  *dir = dstring_new ();
+	char       *dir;
+	vpath_t    *vpath;
 
 	while (s >= path) {
 		while (s != path && s[-1] !=':')
 			s--;
 		if (s != e) {
-			dsprintf (dir, "%.*s", (int) (e - s), s);
-			qfs_add_gamedir (dir->str);
+			dir = nva ("%.*s", (int) (e - s), s);
+			vpath = new_vpath ();
+			vpath->name = dir;
+			qfs_add_gamedir (vpath, dir);
+			vpath->next = qfs_vpaths;
+			qfs_vpaths = vpath;
 		}
 		e = --s;
 	}
-	dstring_delete (dir);
 }
 
 static void
@@ -497,20 +569,10 @@ qfs_build_gamedir (const char **list)
 		free (qfs_gamedir);
 	}
 
-	while (qfs_searchpaths) {
-		searchpath_t *next;
-
-		if (qfs_searchpaths->pack) {
-			Qclose (qfs_searchpaths->pack->handle);
-			free (qfs_searchpaths->pack->files);
-			free (qfs_searchpaths->pack);
-		}
-		if (qfs_searchpaths->filename)
-			free (qfs_searchpaths->filename);
-
-		next = qfs_searchpaths->next;
-		free (qfs_searchpaths);
-		qfs_searchpaths = next;
+	while (qfs_vpaths) {
+		vpath_t    *next = qfs_vpaths->next;
+		delete_vpath (qfs_vpaths);
+		qfs_vpaths = next;
 	}
 
 	for (j = 0; list[j]; j++)
@@ -688,19 +750,30 @@ QFS_FileBase (const char *in)
 	return out;
 }
 
+static void
+qfs_path_print (searchpath_t *sp)
+{
+	if (sp->pack) {
+		Sys_Printf ("%s (%i files)\n", sp->pack->filename, sp->pack->numfiles);
+	} else {
+		Sys_Printf ("%s\n", sp->filename);
+	}
+}
 
 static void
 qfs_path_f (void)
 {
-	searchpath_t *s;
+	vpath_t    *vp;
+	searchpath_t *sp;
 
 	Sys_Printf ("Current search path:\n");
-	for (s = qfs_searchpaths; s; s = s->next) {
-		if (s->pack)
-			Sys_Printf ("%s (%i files)\n", s->pack->filename,
-						s->pack->numfiles);
-		else
-			Sys_Printf ("%s\n", s->filename);
+	for (vp = qfs_vpaths; vp; vp = vp->next) {
+		for (sp = vp->user; sp; sp = sp->next) {
+			qfs_path_print (sp);
+		}
+		for (sp = vp->share; sp; sp = sp->next) {
+			qfs_path_print (sp);
+		}
 	}
 }
 
@@ -865,10 +938,28 @@ open_file (searchpath_t *search, const char *filename, QFile **gzfile,
 	return -1;
 }
 
+static int
+qfs_check_path (searchpath_t *search, const char *oggfilename,
+				const char *gzfilename, const char *path, QFile **gzfile,
+				dstring_t *foundname, int zip)
+{
+	//NOTE gzipped oggs not supported
+	if (oggfilename
+		&& open_file (search, oggfilename, gzfile, foundname, false) != -1)
+		return 0;
+	if (gzfilename
+		&& open_file (search, gzfilename, gzfile, foundname, zip) != -1)
+		return 0;
+	if (open_file (search, path, gzfile, foundname, zip) != -1)
+		return 0;
+	return -1;
+}
+
 VISIBLE int
 _QFS_FOpenFile (const char *filename, QFile **gzfile,
 				dstring_t *foundname, int zip)
 {
+	vpath_t    *vpath;
 	searchpath_t *search;
 	char       *path;
 	char       *oggfilename = 0;
@@ -897,16 +988,17 @@ _QFS_FOpenFile (const char *filename, QFile **gzfile,
 #endif
 
 	// search through the path, one element at a time
-	for (search = qfs_searchpaths; search; search = search->next) {
-		//NOTE gzipped oggs not supported
-		if (oggfilename
-			&& open_file (search, oggfilename, gzfile, foundname, false) != -1)
-			goto ok;
-		if (gzfilename
-			&& open_file (search, gzfilename, gzfile, foundname, zip) != -1)
-			goto ok;
-		if (open_file (search, path, gzfile, foundname, zip) != -1)
-			goto ok;
+	for (vpath = qfs_vpaths; vpath; vpath = vpath->next) {
+		for (search = vpath->user; search; search = search->next) {
+			if (qfs_check_path (search, oggfilename, gzfilename, path, gzfile,
+								foundname, zip) != -1)
+				goto ok;
+		}
+		for (search = vpath->share; search; search = search->next) {
+			if (qfs_check_path (search, oggfilename, gzfilename, path, gzfile,
+								foundname, zip) != -1)
+				goto ok;
+		}
 	}
 
 	Sys_MaskPrintf (SYS_FS_NF, "FindFile: can't find %s\n", filename);
@@ -1061,9 +1153,9 @@ qfs_file_sort (char **os1, char **os2)
 }
 
 static void
-qfs_load_gamedir (const char *dir)
+qfs_load_gamedir (searchpath_t **searchpath, const char *dir)
 {
-	searchpath_t *search;
+	searchpath_t *sp;
 	pack_t     *pak;
 	DIR        *dir_ptr;
 	struct dirent *dirent;
@@ -1117,11 +1209,10 @@ qfs_load_gamedir (const char *dir)
 		if (!pak) {
 			Sys_Error ("Bad pakfile %s!!", pakfiles[i]);
 		} else {
-			search = malloc (sizeof (searchpath_t));
-			search->filename = 0;
-			search->pack = pak;
-			search->next = qfs_searchpaths;
-			qfs_searchpaths = search;
+			sp = new_searchpath ();
+			sp->pack = pak;
+			sp->next = *searchpath;
+			*searchpath = sp;
 		}
 	}
 
@@ -1138,23 +1229,22 @@ qfs_load_gamedir (const char *dir)
 	pak1.pak ...
 */
 static void
-qfs_add_dir (const char *dir)
+qfs_add_dir (searchpath_t **searchpath, const char *dir)
 {
-	searchpath_t *search;
+	searchpath_t *sp;
 
 	// add the directory to the search path
-	search = malloc (sizeof (searchpath_t));
-	search->filename = strdup (dir);
-	search->pack = 0;
-	search->next = qfs_searchpaths;
-	qfs_searchpaths = search;
+	sp = new_searchpath ();
+	sp->filename = strdup (dir);
+	sp->next = *searchpath;
+	*searchpath = sp;
 
 	// add any pak files in the format pak0.pak pak1.pak, ...
-	qfs_load_gamedir (dir);
+	qfs_load_gamedir (searchpath, dir);
 }
 
 static void
-qfs_add_gamedir (const char *dir)
+qfs_add_gamedir (vpath_t *vpath, const char *dir)
 {
 	const char *e;
 	const char *s;
@@ -1181,7 +1271,7 @@ qfs_add_gamedir (const char *dir)
 				Sys_MaskPrintf (SYS_FS, "qfs_add_gamedir (\"%s\")\n",
 								f_dir->str);
 
-				qfs_add_dir (f_dir->str);
+				qfs_add_dir (&vpath->share, f_dir->str);
 			}
 		}
 		e = --s;
@@ -1189,7 +1279,7 @@ qfs_add_gamedir (const char *dir)
 
 	qfs_expand_userpath (f_dir, dir);
 	Sys_MaskPrintf (SYS_FS, "qfs_add_gamedir (\"%s\")\n", f_dir->str);
-	qfs_add_dir (f_dir->str);
+	qfs_add_dir (&vpath->user, f_dir->str);
 
 	dstring_delete (f_dir);
 	dstring_delete (s_dir);

From 098821e35d2cc94b3ddd30b7a4e98695a1c2c291 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 20 Jan 2013 14:07:57 +0900
Subject: [PATCH 0062/1519] Fix QFS_FilelistFill to work with vpaths.

---
 libs/util/quakefs.c | 66 ++++++++++++++++++++++++++-------------------
 1 file changed, 39 insertions(+), 27 deletions(-)

diff --git a/libs/util/quakefs.c b/libs/util/quakefs.c
index b73b9b6bc..f96361a0e 100644
--- a/libs/util/quakefs.c
+++ b/libs/util/quakefs.c
@@ -1587,45 +1587,57 @@ QFS_FilelistAdd (filelist_t *filelist, const char *fname, const char *ext)
 	filelist->list[filelist->count++] = str;
 }
 
+static void
+qfs_filelistfill_do (filelist_t *list, const searchpath_t *search, const char *cp, const char *ext, int strip)
+{
+	const char *separator = "/";
+
+	if (*cp && cp[strlen (cp) - 1] == '/')
+		separator = "";
+
+	if (search->pack) {
+		int         i;
+		pack_t     *pak = search->pack;
+
+		for (i = 0; i < pak->numfiles; i++) {
+			char       *name = pak->files[i].name;
+			if (!fnmatch (va("%s%s*.%s", cp, separator, ext), name,
+						  FNM_PATHNAME)
+				|| !fnmatch (va("%s%s*.%s.gz", cp, separator, ext), name,
+							 FNM_PATHNAME))
+				QFS_FilelistAdd (list, name, strip ? ext : 0);
+		}
+	} else {
+		DIR        *dir_ptr;
+		struct dirent *dirent;
+
+		dir_ptr = opendir (va ("%s/%s", search->filename, cp));
+		if (!dir_ptr)
+			return;
+		while ((dirent = readdir (dir_ptr)))
+			if (!fnmatch (va("*.%s", ext), dirent->d_name, 0)
+				|| !fnmatch (va("*.%s.gz", ext), dirent->d_name, 0))
+				QFS_FilelistAdd (list, dirent->d_name, strip ? ext : 0);
+		closedir (dir_ptr);
+	}
+}
+
 VISIBLE void
 QFS_FilelistFill (filelist_t *list, const char *path, const char *ext,
 				  int strip)
 {
+	vpath_t    *vpath;
 	searchpath_t *search;
-	DIR        *dir_ptr;
-	struct dirent *dirent;
 	char       *cpath, *cp;
-	const char *separator = "/";
 
 	if (strchr (ext, '/') || strchr (ext, '\\'))
 		return;
 
 	cp = cpath = QFS_CompressPath (path);
-	if (*cp && cp[strlen (cp) - 1] == '/')
-		separator = "";
 
-	for (search = qfs_searchpaths; search != NULL; search = search->next) {
-		if (search->pack) {
-			int         i;
-			pack_t     *pak = search->pack;
-
-			for (i = 0; i < pak->numfiles; i++) {
-				char       *name = pak->files[i].name;
-				if (!fnmatch (va("%s%s*.%s", cp, separator, ext), name,
-							  FNM_PATHNAME)
-					|| !fnmatch (va("%s%s*.%s.gz", cp, separator, ext), name,
-								 FNM_PATHNAME))
-					QFS_FilelistAdd (list, name, strip ? ext : 0);
-			}
-		} else {
-			dir_ptr = opendir (va ("%s/%s", search->filename, cp));
-			if (!dir_ptr)
-				continue;
-			while ((dirent = readdir (dir_ptr)))
-				if (!fnmatch (va("*.%s", ext), dirent->d_name, 0)
-					|| !fnmatch (va("*.%s.gz", ext), dirent->d_name, 0))
-					QFS_FilelistAdd (list, dirent->d_name, strip ? ext : 0);
-			closedir (dir_ptr);
+	for (vpath = qfs_vpaths; vpath; vpath = vpath->next) {
+		for (search = vpath->user; search; search = search->next) {
+			qfs_filelistfill_do (list, search, cp, ext, strip);
 		}
 	}
 	free (cpath);

From 8bc2f7f6df72aafeb2e9401991d193c0a4cd4f13 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 20 Jan 2013 14:35:19 +0900
Subject: [PATCH 0063/1519] Print the vpath name when dumping the paths.

---
 libs/util/quakefs.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libs/util/quakefs.c b/libs/util/quakefs.c
index f96361a0e..a3f956195 100644
--- a/libs/util/quakefs.c
+++ b/libs/util/quakefs.c
@@ -768,6 +768,7 @@ qfs_path_f (void)
 
 	Sys_Printf ("Current search path:\n");
 	for (vp = qfs_vpaths; vp; vp = vp->next) {
+		Sys_Printf ("%s\n", vp->name);
 		for (sp = vp->user; sp; sp = sp->next) {
 			qfs_path_print (sp);
 		}

From 6b87ddbb7c0e14a0ce84875ebdc33173fe2c1945 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 20 Jan 2013 18:09:02 +0900
Subject: [PATCH 0064/1519] Add QFS_FindFile.

QFS_FindFile's search can be constrained to begin or end at a certain
vpath.
---
 include/QF/quakefs.h |  35 +++++++++++
 libs/util/quakefs.c  | 135 ++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 168 insertions(+), 2 deletions(-)

diff --git a/include/QF/quakefs.h b/include/QF/quakefs.h
index 2579d78e0..dad69fc23 100644
--- a/include/QF/quakefs.h
+++ b/include/QF/quakefs.h
@@ -67,6 +67,17 @@ typedef struct gamedir_s {
 	} dir;
 } gamedir_t;
 
+typedef struct vpath_s vpath_t;
+
+typedef struct findfile_s {
+	const vpath_t *vpath;		///< vpath in which file was found
+	qboolean    in_pak;			///< if true, path refers to a pak file rather
+								///< than a directory
+	const char *realname;		///< the name of the file as found (may have
+								///< .gz appended, or .ogg substituded for
+								///< .wav) does not include the path
+} findfile_t;
+
 /**	Cached information about the current game directory. \see \ref dirconf.
 */
 extern gamedir_t *qfs_gamedir;
@@ -121,6 +132,30 @@ void QFS_Init (const char *game);
 */
 void QFS_Gamedir (const char *gamedir);
 
+/** Search for a file in the quake file-system.
+
+	The search will begin in the \a start vpath and end in the \a end vpath.
+	If \a start is null, the search will begin in the vpath specified by
+	qfs_vpaths (ie, the first directory in the \c Path attribute
+	(\ref dirconf). If \a end is null, the search will continue to the end
+	of the list of vpaths. If \a start and \a end are the same (and non-null),
+	then only the one vpath will be searched.
+
+	\note	All search paths in a vpath will be searched. This keeps \QF's
+			directory system transparent.
+
+	\note	It is a fatal error for \a end to be non-null but not in the list
+			of vpaths.
+
+	\param fname	The name of the file to be searched for.
+	\param start	The first vpath (gamedir) to search.
+	\param start	The last vpath (gamedir) to search.
+	\return			Pointer to the findfile_t record indicating the location
+					of the file, or null if the file was not found.
+*/
+findfile_t *QFS_FindFile (const char *fname, const vpath_t *start,
+						  const vpath_t *end);
+
 /** Open a file from within the user directory.
 
 	If \a path attempts to leave the user directory, this function sets
diff --git a/libs/util/quakefs.c b/libs/util/quakefs.c
index a3f956195..6168abf4c 100644
--- a/libs/util/quakefs.c
+++ b/libs/util/quakefs.c
@@ -146,12 +146,20 @@ typedef struct searchpath_s {
 	The purpose is to enable searches to be limited to a single gamedir or to
 	not search past a certain gamedir.
 */
-typedef struct vpath_s {
+struct vpath_s {			// typedef to vpath_t is in quakefs.h
 	char       *name;		// usually the gamedir name
 	searchpath_t *user;
 	searchpath_t *share;
 	struct vpath_s *next;
-} vpath_t;
+};
+
+typedef struct int_findfile_s {
+	findfile_t ff;
+	struct pack_s *pack;
+	dpackfile_t *packfile;
+	const char *path;
+	int         fname_index;
+} int_findfile_t;
 
 static searchpath_t *free_searchpaths;
 static vpath_t *free_vpaths;
@@ -792,6 +800,129 @@ QFS_WriteFile (const char *filename, const void *data, int len)
 	Qclose (f);
 }
 
+static int_findfile_t *
+qfs_findfile_search (const vpath_t *vpath, const searchpath_t *sp,
+					 const char **fnames)
+{
+	static int_findfile_t found;
+	const char **fn;
+
+	found.ff.vpath = 0;
+	found.ff.in_pak = false;
+	found.pack = 0;
+	found.packfile = 0;
+	found.fname_index = 0;
+	if (found.ff.realname) {
+		free ((char *) found.ff.realname);
+		found.ff.realname = 0;
+	}
+	if (found.path) {
+		free ((char *) found.path);
+		found.path = 0;
+	}
+	// is the element a pak file?
+	if (sp->pack) {
+		dpackfile_t *packfile;
+
+		for (fn = fnames; *fn; fn++) {
+			packfile = pack_find_file (sp->pack, *fn);
+			if (packfile) {
+				break;
+			}
+		}
+		if (packfile) {
+			Sys_MaskPrintf (SYS_FS_F, "PackFile: %s : %s\n",
+							sp->pack->filename, packfile->name);
+			found.ff.vpath = vpath;
+			found.ff.in_pak = true;
+			found.ff.realname = strdup (*fn);
+			found.pack = sp->pack;
+			found.packfile = packfile;
+			found.fname_index = fn - fnames;
+			found.path = strdup (sp->pack->filename);
+			return &found;
+		}
+	} else {
+		// check a file in the directory tree
+		dstring_t  *path = dstring_new ();
+
+		for (fn = fnames; *fn; fn++) {
+			if (qfs_expand_path (path, sp->filename, *fn, 1) == 0) {
+				if (Sys_FileTime (path->str) == -1) {
+					dstring_delete (path);
+					return 0;
+				}
+
+				Sys_MaskPrintf (SYS_FS_F, "FindFile: %s\n", path->str);
+
+				found.ff.vpath = vpath;
+				found.ff.in_pak = false;
+				found.ff.realname = strdup (*fn);
+				found.path = strdup (path->str);
+				found.fname_index = fn - fnames;
+				return &found;
+			}
+		}
+		dstring_delete (path);
+	}
+	return 0;
+}
+
+static int_findfile_t *
+qfs_findfile (const char **fnames, const vpath_t *start, const vpath_t *end)
+{
+	const vpath_t *vp;
+	searchpath_t *sp;
+	int_findfile_t *found;
+
+	if (!start) {
+		start = qfs_vpaths;
+	}
+	if (end) {
+		for (vp = start; vp; vp = vp->next) {
+			if (vp == end) {
+				break;
+			}
+		}
+		if (!vp) {
+			Sys_Error ("QFS_FindFile: end vpath not in search list");
+		}
+		end = end->next;
+	}
+	for (vp = start; vp && vp != end; vp = vp->next) {
+		for (sp = vp->user; sp; sp = sp->next) {
+			found = qfs_findfile_search (vp, sp, fnames);
+			if (found) {
+				return found;
+			}
+		}
+		for (sp = vp->share; sp; sp = sp->next) {
+			found = qfs_findfile_search (vp, sp, fnames);
+			if (found) {
+				return found;
+			}
+		}
+	}
+	// file not found
+	return 0;
+}
+
+VISIBLE findfile_t *
+QFS_FindFile (const char *fname, const vpath_t *start, const vpath_t *end)
+{
+	int_findfile_t *found;
+	const char *fname_list[2];
+
+	fname_list[0] = fname;
+	fname_list[1] = 0;
+
+	found = qfs_findfile (fname_list, start, end);
+	if (found) {
+		return &found->ff;
+	}
+	return 0;
+}
+
 static QFile *
 qfs_openread (const char *path, int offs, int len, int zip)
 {

From 40206904baf82740d61c1d5ac74c05fb804bee10 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 20 Jan 2013 18:12:09 +0900
Subject: [PATCH 0065/1519] Reimplement _QFS_FOpenFile using QFS_FindFile's
 internals.

_QFS_FOpenFile does a full search, however.
---
 libs/util/quakefs.c | 117 ++++++++++++++------------------------------
 1 file changed, 36 insertions(+), 81 deletions(-)

diff --git a/libs/util/quakefs.c b/libs/util/quakefs.c
index 6168abf4c..ea8e9bd79 100644
--- a/libs/util/quakefs.c
+++ b/libs/util/quakefs.c
@@ -1019,83 +1019,34 @@ VISIBLE int file_from_pak; // global indicating file came from pack file ZOID
 	Sets qfs_filesize and one of handle or file
 */
 
-static int
-open_file (searchpath_t *search, const char *filename, QFile **gzfile,
-		   dstring_t *foundname, int zip)
+static void
+open_file (int_findfile_t *found, QFile **gzfile, dstring_t *foundname,
+		   int zip)
 {
-	file_from_pak = 0;
-
-	// is the element a pak file?
-	if (search->pack) {
-		dpackfile_t *packfile;
-
-		packfile = pack_find_file (search->pack, filename);
-		if (packfile) {
-			Sys_MaskPrintf (SYS_FS_F, "PackFile: %s : %s\n",
-							search->pack->filename, packfile->name);
-			// open a new file on the pakfile
-			if (foundname) {
-				dstring_clearstr (foundname);
-				dstring_appendstr (foundname, packfile->name);
-			}
-			*gzfile = qfs_openread (search->pack->filename, packfile->filepos,
-									packfile->filelen, zip);
-			file_from_pak = 1;
-			return qfs_filesize;
-		}
-	} else {
-		// check a file in the directory tree
-		dstring_t  *netpath = dstring_new ();
-
-		if (qfs_expand_path (netpath, search->filename, filename, 1) == 0) {
-			if (foundname) {
-				dstring_clearstr (foundname);
-				dstring_appendstr (foundname, filename);
-			}
-			if (Sys_FileExists (netpath->str) == -1) {
-				dstring_delete (netpath);
-				return -1;
-			}
-
-			Sys_MaskPrintf (SYS_FS_F, "FindFile: %s\n", netpath->str);
-
-			*gzfile = qfs_openread (netpath->str, -1, -1, zip);
-			dstring_delete (netpath);
-			return qfs_filesize;
-		}
-		dstring_delete (netpath);
-		return -1;
+	file_from_pak = found->ff.in_pak;
+	if (foundname) {
+		dstring_copystr (foundname, found->ff.realname);
+	}
+	if (found->ff.in_pak) {
+		*gzfile = qfs_openread (found->pack->filename,
+								found->packfile->filepos,
+								found->packfile->filelen, zip);
+	} else {
+		*gzfile = qfs_openread (found->path, -1, -1, zip);
 	}
-
-	return -1;
-}
-
-static int
-qfs_check_path (searchpath_t *search, const char *oggfilename,
-				const char *gzfilename, const char *path, QFile **gzfile,
-				dstring_t *foundname, int zip)
-{
-	//NOTE gzipped oggs not supported
-	if (oggfilename
-		&& open_file (search, oggfilename, gzfile, foundname, false) != -1)
-		return 0;
-	if (gzfilename
-		&& open_file (search, gzfilename, gzfile, foundname, zip) != -1)
-		return 0;
-	if (open_file (search, path, gzfile, foundname, zip) != -1)
-		return 0;
-	return -1;
 }
 
 VISIBLE int
 _QFS_FOpenFile (const char *filename, QFile **gzfile,
 				dstring_t *foundname, int zip)
 {
-	vpath_t    *vpath;
-	searchpath_t *search;
+	int_findfile_t *found;
 	char       *path;
 	char       *oggfilename = 0;
 	char       *gzfilename = 0;
+	const char *fnames[4];
+	int         zip_flags[3];
+	int         ind;
 
 	// make sure they're not trying to do weird stuff with our private files
 	path = QFS_CompressPath (filename);
@@ -1106,31 +1057,38 @@ _QFS_FOpenFile (const char *filename, QFile **gzfile,
 		goto error;
 	}
 
+	ind = 0;
 #ifdef HAVE_VORBIS
 	if (strequal (".wav", QFS_FileExtension (path))) {
 		oggfilename = alloca (strlen (path) + 1);
 		QFS_StripExtension (path, oggfilename);
 		strncat (oggfilename, ".ogg",
 				 sizeof (oggfilename) - strlen (oggfilename) - 1);
+		fnames[ind] = oggfilename;
+		zip_flags[ind] = 0;
+		ind++;
 	}
 #endif
 #ifdef HAVE_ZLIB
 	gzfilename = alloca (strlen (path) + 3 + 1);
 	sprintf (gzfilename, "%s.gz", path);
+	fnames[ind] = gzfilename;
+	zip_flags[ind] = zip;
+	ind++;
 #endif
 
-	// search through the path, one element at a time
-	for (vpath = qfs_vpaths; vpath; vpath = vpath->next) {
-		for (search = vpath->user; search; search = search->next) {
-			if (qfs_check_path (search, oggfilename, gzfilename, path, gzfile,
-								foundname, zip) != -1)
-				goto ok;
-		}
-		for (search = vpath->share; search; search = search->next) {
-			if (qfs_check_path (search, oggfilename, gzfilename, path, gzfile,
-								foundname, zip) != -1)
-				goto ok;
-		}
+	fnames[ind] = path;
+	zip_flags[ind] = zip;
+	ind++;
+
+	fnames[ind] = 0;
+
+	found = qfs_findfile (fnames, 0, 0);
+
+	if (found) {
+		open_file (found, gzfile, foundname, zip_flags[found->fname_index]);
+		free(path);
+		return qfs_filesize;
 	}
 
 	Sys_MaskPrintf (SYS_FS_NF, "FindFile: can't find %s\n", filename);
@@ -1139,9 +1097,6 @@ error:
 	qfs_filesize = -1;
 	free (path);
 	return -1;
-ok:
-	free(path);
-	return qfs_filesize;
 }
 
 VISIBLE int

From 4b18501b0073685482ce7dfa5b6ab23ed472ca9c Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 20 Jan 2013 21:04:16 +0900
Subject: [PATCH 0066/1519] Fix an uninitialized variable.

---
 libs/util/quakefs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/util/quakefs.c b/libs/util/quakefs.c
index ea8e9bd79..56ec1f9ac 100644
--- a/libs/util/quakefs.c
+++ b/libs/util/quakefs.c
@@ -822,7 +822,7 @@ qfs_findfile_search (const vpath_t *vpath, const searchpath_t *sp,
 	}
 	// is the element a pak file?
 	if (sp->pack) {
-		dpackfile_t *packfile;
+		dpackfile_t *packfile = 0;
 
 		for (fn = fnames; *fn; fn++) {
 			packfile = pack_find_file (sp->pack, *fn);

From 5560696a65c748a396c1458398e9a3838f06e88a Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 20 Jan 2013 21:09:16 +0900
Subject: [PATCH 0067/1519] Fix some unused variables.

---
 libs/util/quakefs.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/libs/util/quakefs.c b/libs/util/quakefs.c
index 56ec1f9ac..34729f08f 100644
--- a/libs/util/quakefs.c
+++ b/libs/util/quakefs.c
@@ -1042,8 +1042,6 @@ _QFS_FOpenFile (const char *filename, QFile **gzfile,
 {
 	int_findfile_t *found;
 	char       *path;
-	char       *oggfilename = 0;
-	char       *gzfilename = 0;
 	const char *fnames[4];
 	int         zip_flags[3];
 	int         ind;
@@ -1060,6 +1058,7 @@ _QFS_FOpenFile (const char *filename, QFile **gzfile,
 	ind = 0;
 #ifdef HAVE_VORBIS
 	if (strequal (".wav", QFS_FileExtension (path))) {
+		char       *oggfilename;
 		oggfilename = alloca (strlen (path) + 1);
 		QFS_StripExtension (path, oggfilename);
 		strncat (oggfilename, ".ogg",
@@ -1070,11 +1069,14 @@ _QFS_FOpenFile (const char *filename, QFile **gzfile,
 	}
 #endif
 #ifdef HAVE_ZLIB
-	gzfilename = alloca (strlen (path) + 3 + 1);
-	sprintf (gzfilename, "%s.gz", path);
-	fnames[ind] = gzfilename;
-	zip_flags[ind] = zip;
-	ind++;
+	{
+		char       *gzfilename;
+		gzfilename = alloca (strlen (path) + 3 + 1);
+		sprintf (gzfilename, "%s.gz", path);
+		fnames[ind] = gzfilename;
+		zip_flags[ind] = zip;
+		ind++;
+	}
 #endif
 
 	fnames[ind] = path;

From 82ded3fbe5be3011305fed4cadc3659a9de29b42 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 24 Nov 2013 12:28:13 +0900
Subject: [PATCH 0068/1519] Fix some bitrot resulting from a rebase.

---
 libs/util/quakefs.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libs/util/quakefs.c b/libs/util/quakefs.c
index 34729f08f..9b51e2d32 100644
--- a/libs/util/quakefs.c
+++ b/libs/util/quakefs.c
@@ -161,8 +161,8 @@ typedef struct int_findfile_s {
 	int         fname_index;
 } int_findfile_t;
 
-static searchpath_t *free_searchpaths;
-static vpath_t *free_vpaths;
+static searchpath_t *searchpaths_freelist;
+static vpath_t *vpaths_freelist;
 static vpath_t *qfs_vpaths;
 
 //QFS
@@ -848,7 +848,7 @@ qfs_findfile_search (const vpath_t *vpath, const searchpath_t *sp,
 
 		for (fn = fnames; *fn; fn++) {
 			if (qfs_expand_path (path, sp->filename, *fn, 1) == 0) {
-				if (Sys_FileTime (path->str) == -1) {
+				if (Sys_FileExists (path->str) == -1) {
 					dstring_delete (path);
 					return 0;
 				}

From cb448f21b5a7b89a0bd2e133330487d15a6e9495 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 24 Nov 2013 12:53:51 +0900
Subject: [PATCH 0069/1519] Update for doxygen 1.8.5

---
 doc/quakeforge.dox.conf.in | 2314 ++++++++++++++++++++++--------------
 1 file changed, 1401 insertions(+), 913 deletions(-)

diff --git a/doc/quakeforge.dox.conf.in b/doc/quakeforge.dox.conf.in
index 0157cff40..f72ee72a5 100644
--- a/doc/quakeforge.dox.conf.in
+++ b/doc/quakeforge.dox.conf.in
@@ -1,110 +1,119 @@
-# Doxyfile 1.8.1.1
+# Doxyfile 1.8.5
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
 #
-# All text after a hash (#) is considered a comment and will be ignored.
+# All text after a double hash (##) is considered a comment and is placed in
+# front of the TAG it is preceding.
+#
+# All text after a single hash (#) is considered a comment and will be ignored.
 # The format is:
-#       TAG = value [value, ...]
-# For lists items can also be appended using:
-#       TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (" ").
+# TAG = value [value, ...]
+# For lists, items can also be appended using:
+# TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (\" \").
 
 #---------------------------------------------------------------------------
 # Project related configuration options
 #---------------------------------------------------------------------------
 
 # This tag specifies the encoding used for all characters in the config file
-# that follow. The default is UTF-8 which is also the encoding used for all
-# text before the first occurrence of this tag. Doxygen uses libiconv (or the
-# iconv built into libc) for the transcoding. See
-# http://www.gnu.org/software/libiconv for the list of possible encodings.
+# that follow. The default is UTF-8 which is also the encoding used for all text
+# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
+# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv
+# for the list of possible encodings.
+# The default value is: UTF-8.
 
 DOXYFILE_ENCODING      = UTF-8
 
-# The PROJECT_NAME tag is a single word (or sequence of words) that should
-# identify the project. Note that if you do not use Doxywizard you need
-# to put quotes around the project name if it contains spaces.
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
+# double-quotes, unless you are using Doxywizard) that should identify the
+# project for which the documentation is generated. This name is used in the
+# title of most generated pages and in a few other places.
+# The default value is: My Project.
 
 PROJECT_NAME           = @PACKAGE_NAME@
 
-# The PROJECT_NUMBER tag can be used to enter a project or revision number.
-# This could be handy for archiving the generated documentation or
-# if some version control system is used.
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
+# could be handy for archiving the generated documentation or if some version
+# control system is used.
 
 PROJECT_NUMBER         = @PACKAGE_VERSION@
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
-# for a project that appears at the top of each page and should give viewer
-# a quick idea about the purpose of the project. Keep the description short.
+# for a project that appears at the top of each page and should give viewer a
+# quick idea about the purpose of the project. Keep the description short.
 
 PROJECT_BRIEF          =
 
-# With the PROJECT_LOGO tag one can specify an logo or icon that is
-# included in the documentation. The maximum height of the logo should not
-# exceed 55 pixels and the maximum width should not exceed 200 pixels.
-# Doxygen will copy the logo to the output directory.
+# With the PROJECT_LOGO tag one can specify an logo or icon that is included in
+# the documentation. The maximum height of the logo should not exceed 55 pixels
+# and the maximum width should not exceed 200 pixels. Doxygen will copy the logo
+# to the output directory.
 
 PROJECT_LOGO           =
 
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
-# base path where the generated documentation will be put.
-# If a relative path is entered, it will be relative to the location
-# where doxygen was started. If left blank the current directory will be used.
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
+# into which the generated documentation will be written. If a relative path is
+# entered, it will be relative to the location where doxygen was started. If
+# left blank the current directory will be used.
 
 OUTPUT_DIRECTORY       = doxygen
 
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
-# 4096 sub-directories (in 2 levels) under the output directory of each output
-# format and will distribute the generated files over these directories.
-# Enabling this option can be useful when feeding doxygen a huge amount of
-# source files, where putting all generated files in the same directory would
-# otherwise cause performance problems for the file system.
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 4096 sub-
+# directories (in 2 levels) under the output directory of each output format and
+# will distribute the generated files over these directories. Enabling this
+# option can be useful when feeding doxygen a huge amount of source files, where
+# putting all generated files in the same directory would otherwise causes
+# performance problems for the file system.
+# The default value is: NO.
 
 CREATE_SUBDIRS         = NO
 
 # The OUTPUT_LANGUAGE tag is used to specify the language in which all
 # documentation generated by doxygen is written. Doxygen will use this
 # information to generate all constant output in the proper language.
-# The default language is English, other supported languages are:
-# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
-# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
-# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
-# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian,
-# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak,
-# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
+# Possible values are: Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-
+# Traditional, Croatian, Czech, Danish, Dutch, English, Esperanto, Farsi,
+# Finnish, French, German, Greek, Hungarian, Italian, Japanese, Japanese-en,
+# Korean, Korean-en, Latvian, Norwegian, Macedonian, Persian, Polish,
+# Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish, Swedish,
+# Turkish, Ukrainian and Vietnamese.
+# The default value is: English.
 
 OUTPUT_LANGUAGE        = English
 
-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
-# include brief member descriptions after the members that are listed in
-# the file and class documentation (similar to JavaDoc).
-# Set to NO to disable this.
+# If the BRIEF_MEMBER_DESC tag is set to YES doxygen will include brief member
+# descriptions after the members that are listed in the file and class
+# documentation (similar to Javadoc). Set to NO to disable this.
+# The default value is: YES.
 
 BRIEF_MEMBER_DESC      = YES
 
-# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
-# the brief description of a member or function before the detailed description.
-# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# If the REPEAT_BRIEF tag is set to YES doxygen will prepend the brief
+# description of a member or function before the detailed description
+#
+# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
 # brief descriptions will be completely suppressed.
+# The default value is: YES.
 
 REPEAT_BRIEF           = YES
 
-# This tag implements a quasi-intelligent brief description abbreviator
-# that is used to form the text in various listings. Each string
-# in this list, if found as the leading text of the brief description, will be
-# stripped from the text and the result after processing the whole list, is
-# used as the annotated text. Otherwise, the brief description is used as-is.
-# If left blank, the following values are used ("$name" is automatically
-# replaced with the name of the entity): "The $name class" "The $name widget"
-# "The $name file" "is" "provides" "specifies" "contains"
-# "represents" "a" "an" "the"
+# This tag implements a quasi-intelligent brief description abbreviator that is
+# used to form the text in various listings. Each string in this list, if found
+# as the leading text of the brief description, will be stripped from the text
+# and the result, after processing the whole list, is used as the annotated
+# text. Otherwise, the brief description is used as-is. If left blank, the
+# following values are used ($name is automatically replaced with the name of
+# the entity):The $name class, The $name widget, The $name file, is, provides,
+# specifies, contains, represents, a, an and the.
 
 ABBREVIATE_BRIEF       =
 
 # If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
-# Doxygen will generate a detailed section even if there is only a brief
+# doxygen will generate a detailed section even if there is only a brief
 # description.
+# The default value is: NO.
 
 ALWAYS_DETAILED_SEC    = NO
 
@@ -112,169 +121,204 @@ ALWAYS_DETAILED_SEC    = NO
 # inherited members of a class in the documentation of that class as if those
 # members were ordinary class members. Constructors, destructors and assignment
 # operators of the base classes will not be shown.
+# The default value is: NO.
 
 INLINE_INHERITED_MEMB  = YES
 
-# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
-# path before files name in the file list and in the header files. If set
-# to NO the shortest path that makes the file name unique will be used.
+# If the FULL_PATH_NAMES tag is set to YES doxygen will prepend the full path
+# before files name in the file list and in the header files. If set to NO the
+# shortest path that makes the file name unique will be used
+# The default value is: YES.
 
 FULL_PATH_NAMES        = YES
 
-# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
-# can be used to strip a user-defined part of the path. Stripping is
-# only done if one of the specified strings matches the left-hand part of
-# the path. The tag can be used to show relative paths in the file list.
-# If left blank the directory from which doxygen is run is used as the
-# path to strip.
+# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
+# Stripping is only done if one of the specified strings matches the left-hand
+# part of the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the path to
+# strip.
+#
+# Note that you can specify absolute paths here, but also relative paths, which
+# will be relative from the directory where doxygen is started.
+# This tag requires that the tag FULL_PATH_NAMES is set to YES.
 
 STRIP_FROM_PATH        = @TOPSRC@
 
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
-# the path mentioned in the documentation of a class, which tells
-# the reader which header file to include in order to use a class.
-# If left blank only the name of the header file containing the class
-# definition is used. Otherwise one should specify the include paths that
-# are normally passed to the compiler using the -I flag.
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
+# path mentioned in the documentation of a class, which tells the reader which
+# header file to include in order to use a class. If left blank only the name of
+# the header file containing the class definition is used. Otherwise one should
+# specify the list of include paths that are normally passed to the compiler
+# using the -I flag.
 
 STRIP_FROM_INC_PATH    = @TOPSRC@/include
 
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
-# (but less readable) file names. This can be useful if your file system
-# doesn't support long names like on DOS, Mac, or CD-ROM.
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
+# less readable) file names. This can be useful is your file systems doesn't
+# support long names like on DOS, Mac, or CD-ROM.
+# The default value is: NO.
 
 SHORT_NAMES            = NO
 
-# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
-# will interpret the first line (until the first dot) of a JavaDoc-style
-# comment as the brief description. If set to NO, the JavaDoc
-# comments will behave just like regular Qt-style comments
-# (thus requiring an explicit @brief command for a brief description.)
+# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
+# first line (until the first dot) of a Javadoc-style comment as the brief
+# description. If set to NO, the Javadoc-style will behave just like regular Qt-
+# style comments (thus requiring an explicit @brief command for a brief
+# description.)
+# The default value is: NO.
 
 JAVADOC_AUTOBRIEF      = YES
 
-# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
-# interpret the first line (until the first dot) of a Qt-style
-# comment as the brief description. If set to NO, the comments
-# will behave just like regular Qt-style comments (thus requiring
-# an explicit \brief command for a brief description.)
+# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
+# line (until the first dot) of a Qt-style comment as the brief description. If
+# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
+# requiring an explicit \brief command for a brief description.)
+# The default value is: NO.
 
 QT_AUTOBRIEF           = NO
 
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
-# treat a multi-line C++ special comment block (i.e. a block of //! or ///
-# comments) as a brief description. This used to be the default behaviour.
-# The new default is to treat a multi-line C++ comment block as a detailed
-# description. Set this tag to YES if you prefer the old behaviour instead.
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
+# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
+# a brief description. This used to be the default behavior. The new default is
+# to treat a multi-line C++ comment block as a detailed description. Set this
+# tag to YES if you prefer the old behavior instead.
+#
+# Note that setting this tag to YES also means that rational rose comments are
+# not recognized any more.
+# The default value is: NO.
 
 MULTILINE_CPP_IS_BRIEF = NO
 
-# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
-# member inherits the documentation from any documented member that it
-# re-implements.
+# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
+# documentation from any documented member that it re-implements.
+# The default value is: YES.
 
 INHERIT_DOCS           = YES
 
-# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
-# a new page for each member. If set to NO, the documentation of a member will
-# be part of the file/class/namespace that contains it.
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce a
+# new page for each member. If set to NO, the documentation of a member will be
+# part of the file/class/namespace that contains it.
+# The default value is: NO.
 
 SEPARATE_MEMBER_PAGES  = NO
 
-# The TAB_SIZE tag can be used to set the number of spaces in a tab.
-# Doxygen uses this value to replace tabs by spaces in code fragments.
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
+# uses this value to replace tabs by spaces in code fragments.
+# Minimum value: 1, maximum value: 16, default value: 4.
 
 TAB_SIZE               = 4
 
-# This tag can be used to specify a number of aliases that acts
-# as commands in the documentation. An alias has the form "name=value".
-# For example adding "sideeffect=\par Side Effects:\n" will allow you to
-# put the command \sideeffect (or @sideeffect) in the documentation, which
-# will result in a user-defined paragraph with heading "Side Effects:".
-# You can put \n's in the value part of an alias to insert newlines.
+# This tag can be used to specify a number of aliases that act as commands in
+# the documentation. An alias has the form:
+# name=value
+# For example adding
+# "sideeffect=@par Side Effects:\n"
+# will allow you to put the command \sideeffect (or @sideeffect) in the
+# documentation, which will result in a user-defined paragraph with heading
+# "Side Effects:". You can put \n's in the value part of an alias to insert
+# newlines.
 
 ALIASES                = QF=QuakeForge
 
 # This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding
-# "class=itcl::class" will allow you to use the command class in the
-# itcl::class meaning.
+# A mapping has the form "name=value". For example adding "class=itcl::class"
+# will allow you to use the command class in the itcl::class meaning.
 
 TCL_SUBST              =
 
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
-# sources only. Doxygen will then generate output that is more tailored for C.
-# For instance, some of the names that are used will be different. The list
-# of all members will be omitted, etc.
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
+# only. Doxygen will then generate output that is more tailored for C. For
+# instance, some of the names that are used will be different. The list of all
+# members will be omitted, etc.
+# The default value is: NO.
 
 OPTIMIZE_OUTPUT_FOR_C  = YES
 
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
-# sources only. Doxygen will then generate output that is more tailored for
-# Java. For instance, namespaces will be presented as packages, qualified
-# scopes will look different, etc.
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
+# Python sources only. Doxygen will then generate output that is more tailored
+# for that language. For instance, namespaces will be presented as packages,
+# qualified scopes will look different, etc.
+# The default value is: NO.
 
 OPTIMIZE_OUTPUT_JAVA   = NO
 
 # Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
-# sources only. Doxygen will then generate output that is more tailored for
-# Fortran.
+# sources. Doxygen will then generate output that is tailored for Fortran.
+# The default value is: NO.
 
 OPTIMIZE_FOR_FORTRAN   = NO
 
 # Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
-# sources. Doxygen will then generate output that is tailored for
-# VHDL.
+# sources. Doxygen will then generate output that is tailored for VHDL.
+# The default value is: NO.
 
 OPTIMIZE_OUTPUT_VHDL   = NO
 
 # Doxygen selects the parser to use depending on the extension of the files it
-# parses. With this tag you can assign which parser to use for a given extension.
-# Doxygen has a built-in mapping, but you can override or extend it using this
-# tag. The format is ext=language, where ext is a file extension, and language
-# is one of the parsers supported by doxygen: IDL, Java, Javascript, CSharp, C,
-# C++, D, PHP, Objective-C, Python, Fortran, VHDL, C, C++. For instance to make
+# parses. With this tag you can assign which parser to use for a given
+# extension. Doxygen has a built-in mapping, but you can override or extend it
+# using this tag. The format is ext=language, where ext is a file extension, and
+# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
+# C#, C, C++, D, PHP, Objective-C, Python, Fortran, VHDL. For instance to make
 # doxygen treat .inc files as Fortran files (default is PHP), and .f files as C
-# (default is Fortran), use: inc=Fortran f=C. Note that for custom extensions
-# you also need to set FILE_PATTERNS otherwise the files are not read by doxygen.
+# (default is Fortran), use: inc=Fortran f=C.
+#
+# Note For files without extension you can use no_extension as a placeholder.
+#
+# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
+# the files are not read by doxygen.
 
 EXTENSION_MAPPING      =
 
-# If MARKDOWN_SUPPORT is enabled (the default) then doxygen pre-processes all
-# comments according to the Markdown format, which allows for more readable
+# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
+# according to the Markdown format, which allows for more readable
 # documentation. See http://daringfireball.net/projects/markdown/ for details.
-# The output of markdown processing is further processed by doxygen, so you
-# can mix doxygen, HTML, and XML commands with Markdown formatting.
-# Disable only in case of backward compatibilities issues.
+# The output of markdown processing is further processed by doxygen, so you can
+# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
+# case of backward compatibilities issues.
+# The default value is: YES.
 
 MARKDOWN_SUPPORT       = YES
 
+# When enabled doxygen tries to link words that correspond to documented
+# classes, or namespaces to their corresponding documentation. Such a link can
+# be prevented in individual cases by by putting a % sign in front of the word
+# or globally by setting AUTOLINK_SUPPORT to NO.
+# The default value is: YES.
+
+AUTOLINK_SUPPORT       = YES
+
 # If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
-# to include (a tag file for) the STL sources as input, then you should
-# set this tag to YES in order to let doxygen match functions declarations and
-# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
-# func(std::string) {}). This also makes the inheritance and collaboration
+# to include (a tag file for) the STL sources as input, then you should set this
+# tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string);
+# versus func(std::string) {}). This also make the inheritance and collaboration
 # diagrams that involve STL classes more complete and accurate.
+# The default value is: NO.
 
 BUILTIN_STL_SUPPORT    = NO
 
 # If you use Microsoft's C++/CLI language, you should set this option to YES to
 # enable parsing support.
+# The default value is: NO.
 
 CPP_CLI_SUPPORT        = NO
 
-# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.
-# Doxygen will parse them like normal C++ but will assume all classes use public
-# instead of private inheritance when no explicit protection keyword is present.
+# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
+# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen
+# will parse them like normal C++ but will assume all classes use public instead
+# of private inheritance when no explicit protection keyword is present.
+# The default value is: NO.
 
 SIP_SUPPORT            = NO
 
-# For Microsoft's IDL there are propget and propput attributes to indicate getter
-# and setter methods for a property. Setting this option to YES (the default)
-# will make doxygen replace the get and set methods by a property in the
-# documentation. This will only work if the methods are indeed getting or
-# setting a simple type. If this is not the case, or you want to show the
-# methods anyway, you should set this option to NO.
+# For Microsoft's IDL there are propget and propput attributes to indicate
+# getter and setter methods for a property. Setting this option to YES will make
+# doxygen to replace the get and set methods by a property in the documentation.
+# This will only work if the methods are indeed getting or setting a simple
+# type. If this is not the case, or you want to show the methods anyway, you
+# should set this option to NO.
+# The default value is: YES.
 
 IDL_PROPERTY_SUPPORT   = YES
 
@@ -282,67 +326,61 @@ IDL_PROPERTY_SUPPORT   = YES
 # tag is set to YES, then doxygen will reuse the documentation of the first
 # member in the group (if any) for the other members of the group. By default
 # all members of a group must be documented explicitly.
+# The default value is: NO.
 
 DISTRIBUTE_GROUP_DOC   = NO
 
-# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
-# the same type (for instance a group of public functions) to be put as a
-# subgroup of that type (e.g. under the Public Functions section). Set it to
-# NO to prevent subgrouping. Alternatively, this can be done per class using
-# the \nosubgrouping command.
+# Set the SUBGROUPING tag to YES to allow class member groups of the same type
+# (for instance a group of public functions) to be put as a subgroup of that
+# type (e.g. under the Public Functions section). Set it to NO to prevent
+# subgrouping. Alternatively, this can be done per class using the
+# \nosubgrouping command.
+# The default value is: YES.
 
 SUBGROUPING            = YES
 
-# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and
-# unions are shown inside the group in which they are included (e.g. using
-# @ingroup) instead of on a separate page (for HTML and Man pages) or
-# section (for LaTeX and RTF).
+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
+# are shown inside the group in which they are included (e.g. using \ingroup)
+# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
+# and RTF).
+#
+# Note that this feature does not work in combination with
+# SEPARATE_MEMBER_PAGES.
+# The default value is: NO.
 
 INLINE_GROUPED_CLASSES = NO
 
-# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and
-# unions with only public data fields will be shown inline in the documentation
-# of the scope in which they are defined (i.e. file, namespace, or group
-# documentation), provided this scope is documented. If set to NO (the default),
-# structs, classes, and unions are shown on a separate page (for HTML and Man
-# pages) or section (for LaTeX and RTF).
+# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
+# with only public data fields or simple typedef fields will be shown inline in
+# the documentation of the scope in which they are defined (i.e. file,
+# namespace, or group documentation), provided this scope is documented. If set
+# to NO, structs, classes, and unions are shown on a separate page (for HTML and
+# Man pages) or section (for LaTeX and RTF).
+# The default value is: NO.
 
 INLINE_SIMPLE_STRUCTS  = NO
 
-# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
-# is documented as struct, union, or enum with the name of the typedef. So
+# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
+# enum is documented as struct, union, or enum with the name of the typedef. So
 # typedef struct TypeS {} TypeT, will appear in the documentation as a struct
 # with name TypeT. When disabled the typedef will appear as a member of a file,
-# namespace, or class. And the struct will be named TypeS. This can typically
-# be useful for C code in case the coding convention dictates that all compound
+# namespace, or class. And the struct will be named TypeS. This can typically be
+# useful for C code in case the coding convention dictates that all compound
 # types are typedef'ed and only the typedef is referenced, never the tag name.
+# The default value is: NO.
 
 TYPEDEF_HIDES_STRUCT   = NO
 
-# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
-# determine which symbols to keep in memory and which to flush to disk.
-# When the cache is full, less often used symbols will be written to disk.
-# For small to medium size projects (<1000 input files) the default value is
-# probably good enough. For larger projects a too small cache size can cause
-# doxygen to be busy swapping symbols to and from disk most of the time
-# causing a significant performance penalty.
-# If the system has enough physical memory increasing the cache will improve the
-# performance by keeping more symbols in memory. Note that the value works on
-# a logarithmic scale so increasing the size by one will roughly double the
-# memory usage. The cache size is given by this formula:
-# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
-# corresponding to a cache size of 2^16 = 65536 symbols.
-
-SYMBOL_CACHE_SIZE      = 0
-
-# Similar to the SYMBOL_CACHE_SIZE the size of the symbol lookup cache can be
-# set using LOOKUP_CACHE_SIZE. This cache is used to resolve symbols given
-# their name and scope. Since this can be an expensive process and often the
-# same symbol appear multiple times in the code, doxygen keeps a cache of
-# pre-resolved symbols. If the cache is too small doxygen will become slower.
-# If the cache is too large, memory is wasted. The cache size is given by this
-# formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range is 0..9, the default is 0,
-# corresponding to a cache size of 2^16 = 65536 symbols.
+# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
+# cache is used to resolve symbols given their name and scope. Since this can be
+# an expensive process and often the same symbol appears multiple times in the
+# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
+# doxygen will become slower. If the cache is too large, memory is wasted. The
+# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
+# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
+# symbols. At the end of a run doxygen will report the cache usage and suggest
+# the optimal cache size from a speed point of view.
+# Minimum value: 0, maximum value: 9, default value: 0.
 
 LOOKUP_CACHE_SIZE      = 0
 
@@ -351,309 +389,349 @@ LOOKUP_CACHE_SIZE      = 0
 #---------------------------------------------------------------------------
 
 # If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
-# documentation are documented, even if no documentation was available.
-# Private class members and static file members will be hidden unless
-# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
+# documentation are documented, even if no documentation was available. Private
+# class members and static file members will be hidden unless the
+# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
+# Note: This will also disable the warnings about undocumented members that are
+# normally produced when WARNINGS is set to YES.
+# The default value is: NO.
 
 EXTRACT_ALL            = YES
 
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
-# will be included in the documentation.
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class will
+# be included in the documentation.
+# The default value is: NO.
 
 EXTRACT_PRIVATE        = NO
 
-# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal scope will be included in the documentation.
+# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal
+# scope will be included in the documentation.
+# The default value is: NO.
 
 EXTRACT_PACKAGE        = NO
 
-# If the EXTRACT_STATIC tag is set to YES all static members of a file
-# will be included in the documentation.
+# If the EXTRACT_STATIC tag is set to YES all static members of a file will be
+# included in the documentation.
+# The default value is: NO.
 
 EXTRACT_STATIC         = @STATIC_DOC@
 
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
-# defined locally in source files will be included in the documentation.
-# If set to NO only classes defined in header files are included.
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) defined
+# locally in source files will be included in the documentation. If set to NO
+# only classes defined in header files are included. Does not have any effect
+# for Java sources.
+# The default value is: YES.
 
 EXTRACT_LOCAL_CLASSES  = NO
 
-# This flag is only useful for Objective-C code. When set to YES local
-# methods, which are defined in the implementation section but not in
-# the interface are included in the documentation.
-# If set to NO (the default) only methods in the interface are included.
+# This flag is only useful for Objective-C code. When set to YES local methods,
+# which are defined in the implementation section but not in the interface are
+# included in the documentation. If set to NO only methods in the interface are
+# included.
+# The default value is: NO.
 
 EXTRACT_LOCAL_METHODS  = NO
 
 # If this flag is set to YES, the members of anonymous namespaces will be
 # extracted and appear in the documentation as a namespace called
-# 'anonymous_namespace{file}', where file will be replaced with the base
-# name of the file that contains the anonymous namespace. By default
-# anonymous namespaces are hidden.
+# 'anonymous_namespace{file}', where file will be replaced with the base name of
+# the file that contains the anonymous namespace. By default anonymous namespace
+# are hidden.
+# The default value is: NO.
 
 EXTRACT_ANON_NSPACES   = NO
 
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
-# undocumented members of documented classes, files or namespaces.
-# If set to NO (the default) these members will be included in the
-# various overviews, but no documentation section is generated.
-# This option has no effect if EXTRACT_ALL is enabled.
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
+# undocumented members inside documented classes or files. If set to NO these
+# members will be included in the various overviews, but no documentation
+# section is generated. This option has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
 
 HIDE_UNDOC_MEMBERS     = NO
 
-# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
-# undocumented classes that are normally visible in the class hierarchy.
-# If set to NO (the default) these classes will be included in the various
-# overviews. This option has no effect if EXTRACT_ALL is enabled.
+# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy. If set
+# to NO these classes will be included in the various overviews. This option has
+# no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
 
 HIDE_UNDOC_CLASSES     = NO
 
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
-# friend (class|struct|union) declarations.
-# If set to NO (the default) these declarations will be included in the
-# documentation.
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
+# (class|struct|union) declarations. If set to NO these declarations will be
+# included in the documentation.
+# The default value is: NO.
 
 HIDE_FRIEND_COMPOUNDS  = NO
 
-# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
-# documentation blocks found inside the body of a function.
-# If set to NO (the default) these blocks will be appended to the
-# function's detailed documentation block.
+# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
+# documentation blocks found inside the body of a function. If set to NO these
+# blocks will be appended to the function's detailed documentation block.
+# The default value is: NO.
 
 HIDE_IN_BODY_DOCS      = NO
 
-# The INTERNAL_DOCS tag determines if documentation
-# that is typed after a \internal command is included. If the tag is set
-# to NO (the default) then the documentation will be excluded.
-# Set it to YES to include the internal documentation.
+# The INTERNAL_DOCS tag determines if documentation that is typed after a
+# \internal command is included. If the tag is set to NO then the documentation
+# will be excluded. Set it to YES to include the internal documentation.
+# The default value is: NO.
 
 INTERNAL_DOCS          = NO
 
-# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
-# file names in lower-case letters. If set to YES upper-case letters are also
+# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
+# names in lower-case letters. If set to YES upper-case letters are also
 # allowed. This is useful if you have classes or files whose names only differ
 # in case and if your file system supports case sensitive file names. Windows
 # and Mac users are advised to set this option to NO.
+# The default value is: system dependent.
 
 CASE_SENSE_NAMES       = NO
 
-# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
-# will show members with their full class and namespace scopes in the
-# documentation. If set to YES the scope will be hidden.
+# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
+# their full class and namespace scopes in the documentation. If set to YES the
+# scope will be hidden.
+# The default value is: NO.
 
 HIDE_SCOPE_NAMES       = YES
 
-# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
-# will put a list of the files that are included by a file in the documentation
-# of that file.
+# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
+# the files that are included by a file in the documentation of that file.
+# The default value is: YES.
 
 SHOW_INCLUDE_FILES     = NO
 
-# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen
-# will list include files with double quotes in the documentation
-# rather than with sharp brackets.
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
+# files with double quotes in the documentation rather than with sharp brackets.
+# The default value is: NO.
 
 FORCE_LOCAL_INCLUDES   = NO
 
-# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
-# is inserted in the documentation for inline members.
+# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
+# documentation for inline members.
+# The default value is: YES.
 
 INLINE_INFO            = YES
 
-# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
-# will sort the (detailed) documentation of file and class members
-# alphabetically by member name. If set to NO the members will appear in
-# declaration order.
+# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
+# (detailed) documentation of file and class members alphabetically by member
+# name. If set to NO the members will appear in declaration order.
+# The default value is: YES.
 
 SORT_MEMBER_DOCS       = YES
 
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
-# brief documentation of file, namespace and class members alphabetically
-# by member name. If set to NO (the default) the members will appear in
-# declaration order.
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
+# descriptions of file, namespace and class members alphabetically by member
+# name. If set to NO the members will appear in declaration order.
+# The default value is: NO.
 
 SORT_BRIEF_DOCS        = YES
 
-# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen
-# will sort the (brief and detailed) documentation of class members so that
-# constructors and destructors are listed first. If set to NO (the default)
-# the constructors will appear in the respective orders defined by
-# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS.
-# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO
-# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
+# (brief and detailed) documentation of class members so that constructors and
+# destructors are listed first. If set to NO the constructors will appear in the
+# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
+# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
+# member documentation.
+# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
+# detailed member documentation.
+# The default value is: NO.
 
 SORT_MEMBERS_CTORS_1ST = YES
 
-# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
-# hierarchy of group names into alphabetical order. If set to NO (the default)
-# the group names will appear in their defined order.
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
+# of group names into alphabetical order. If set to NO the group names will
+# appear in their defined order.
+# The default value is: NO.
 
 SORT_GROUP_NAMES       = YES
 
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
-# sorted by fully-qualified names, including namespaces. If set to
-# NO (the default), the class list will be sorted only by class name,
-# not including the namespace part.
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
+# fully-qualified names, including namespaces. If set to NO, the class list will
+# be sorted only by class name, not including the namespace part.
 # Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-# Note: This option applies only to the class list, not to the
-# alphabetical list.
+# Note: This option applies only to the class list, not to the alphabetical
+# list.
+# The default value is: NO.
 
 SORT_BY_SCOPE_NAME     = NO
 
-# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to
-# do proper type resolution of all parameters of a function it will reject a
-# match between the prototype and the implementation of a member function even
-# if there is only one candidate or it is obvious which candidate to choose
-# by doing a simple string match. By disabling STRICT_PROTO_MATCHING doxygen
-# will still accept a match between prototype and implementation in such cases.
+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
+# type resolution of all parameters of a function it will reject a match between
+# the prototype and the implementation of a member function even if there is
+# only one candidate or it is obvious which candidate to choose by doing a
+# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
+# accept a match between prototype and implementation in such cases.
+# The default value is: NO.
 
 STRICT_PROTO_MATCHING  = NO
 
-# The GENERATE_TODOLIST tag can be used to enable (YES) or
-# disable (NO) the todo list. This list is created by putting \todo
-# commands in the documentation.
+# The GENERATE_TODOLIST tag can be used to enable ( YES) or disable ( NO) the
+# todo list. This list is created by putting \todo commands in the
+# documentation.
+# The default value is: YES.
 
 GENERATE_TODOLIST      = YES
 
-# The GENERATE_TESTLIST tag can be used to enable (YES) or
-# disable (NO) the test list. This list is created by putting \test
-# commands in the documentation.
+# The GENERATE_TESTLIST tag can be used to enable ( YES) or disable ( NO) the
+# test list. This list is created by putting \test commands in the
+# documentation.
+# The default value is: YES.
 
 GENERATE_TESTLIST      = NO
 
-# The GENERATE_BUGLIST tag can be used to enable (YES) or
-# disable (NO) the bug list. This list is created by putting \bug
-# commands in the documentation.
+# The GENERATE_BUGLIST tag can be used to enable ( YES) or disable ( NO) the bug
+# list. This list is created by putting \bug commands in the documentation.
+# The default value is: YES.
 
 GENERATE_BUGLIST       = YES
 
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
-# disable (NO) the deprecated list. This list is created by putting
-# \deprecated commands in the documentation.
+# The GENERATE_DEPRECATEDLIST tag can be used to enable ( YES) or disable ( NO)
+# the deprecated list. This list is created by putting \deprecated commands in
+# the documentation.
+# The default value is: YES.
 
 GENERATE_DEPRECATEDLIST= YES
 
-# The ENABLED_SECTIONS tag can be used to enable conditional
-# documentation sections, marked by \if sectionname ... \endif.
+# The ENABLED_SECTIONS tag can be used to enable conditional documentation
+# sections, marked by \if <section_label> ... \endif and \cond <section_label>
+# ... \endcond blocks.
 
 ENABLED_SECTIONS       =
 
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
-# the initial value of a variable or macro consists of for it to appear in
-# the documentation. If the initializer consists of more lines than specified
-# here it will be hidden. Use a value of 0 to hide initializers completely.
-# The appearance of the initializer of individual variables and macros in the
-# documentation can be controlled using \showinitializer or \hideinitializer
-# command in the documentation regardless of this setting.
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
+# initial value of a variable or macro / define can have for it to appear in the
+# documentation. If the initializer consists of more lines than specified here
+# it will be hidden. Use a value of 0 to hide initializers completely. The
+# appearance of the value of individual variables and macros / defines can be
+# controlled using \showinitializer or \hideinitializer command in the
+# documentation regardless of this setting.
+# Minimum value: 0, maximum value: 10000, default value: 30.
 
 MAX_INITIALIZER_LINES  = 30
 
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
-# at the bottom of the documentation of classes and structs. If set to YES the
-# list will mention the files that were used to generate the documentation.
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
+# the bottom of the documentation of classes and structs. If set to YES the list
+# will mention the files that were used to generate the documentation.
+# The default value is: YES.
 
 SHOW_USED_FILES        = YES
 
-# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
-# This will remove the Files entry from the Quick Index and from the
-# Folder Tree View (if specified). The default is YES.
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
+# will remove the Files entry from the Quick Index and from the Folder Tree View
+# (if specified).
+# The default value is: YES.
 
 SHOW_FILES             = YES
 
-# Set the SHOW_NAMESPACES tag to NO to disable the generation of the
-# Namespaces page.
-# This will remove the Namespaces entry from the Quick Index
-# and from the Folder Tree View (if specified). The default is YES.
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
+# page. This will remove the Namespaces entry from the Quick Index and from the
+# Folder Tree View (if specified).
+# The default value is: YES.
 
 SHOW_NAMESPACES        = YES
 
 # The FILE_VERSION_FILTER tag can be used to specify a program or script that
 # doxygen should invoke to get the current version for each file (typically from
 # the version control system). Doxygen will invoke the program by executing (via
-# popen()) the command <command> <input-file>, where <command> is the value of
-# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file
-# provided by doxygen. Whatever the program writes to standard output
-# is used as the file version. See the manual for examples.
+# popen()) the command command input-file, where command is the value of the
+# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
+# by doxygen. Whatever the program writes to standard output is used as the file
+# version. For an example see the documentation.
 
 FILE_VERSION_FILTER    =
 
 # The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
 # by doxygen. The layout file controls the global structure of the generated
 # output files in an output format independent way. To create the layout file
-# that represents doxygen's defaults, run doxygen with the -l option.
-# You can optionally specify a file name after the option, if omitted
-# DoxygenLayout.xml will be used as the name of the layout file.
+# that represents doxygen's defaults, run doxygen with the -l option. You can
+# optionally specify a file name after the option, if omitted DoxygenLayout.xml
+# will be used as the name of the layout file.
+#
+# Note that if you run doxygen from a directory containing a file called
+# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
+# tag is left empty.
 
 LAYOUT_FILE            =
 
-# The CITE_BIB_FILES tag can be used to specify one or more bib files
-# containing the references data. This must be a list of .bib files. The
-# .bib extension is automatically appended if omitted. Using this command
-# requires the bibtex tool to be installed. See also
-# http://en.wikipedia.org/wiki/BibTeX for more info. For LaTeX the style
-# of the bibliography can be controlled using LATEX_BIB_STYLE. To use this
-# feature you need bibtex and perl available in the search path.
+# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
+# the reference definitions. This must be a list of .bib files. The .bib
+# extension is automatically appended if omitted. This requires the bibtex tool
+# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info.
+# For LaTeX the style of the bibliography can be controlled using
+# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
+# search path. Do not use file names with spaces, bibtex cannot handle them. See
+# also \cite for info how to create references.
 
 CITE_BIB_FILES         =
 
 #---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
+# Configuration options related to warning and progress messages
 #---------------------------------------------------------------------------
 
-# The QUIET tag can be used to turn on/off the messages that are generated
-# by doxygen. Possible values are YES and NO. If left blank NO is used.
+# The QUIET tag can be used to turn on/off the messages that are generated to
+# standard output by doxygen. If QUIET is set to YES this implies that the
+# messages are off.
+# The default value is: NO.
 
 QUIET                  = YES
 
 # The WARNINGS tag can be used to turn on/off the warning messages that are
-# generated by doxygen. Possible values are YES and NO. If left blank
-# NO is used.
+# generated to standard error ( stderr) by doxygen. If WARNINGS is set to YES
+# this implies that the warnings are on.
+#
+# Tip: Turn warnings on while writing the documentation.
+# The default value is: YES.
 
 WARNINGS               = YES
 
-# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
-# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
-# automatically be disabled.
+# If the WARN_IF_UNDOCUMENTED tag is set to YES, then doxygen will generate
+# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
+# will automatically be disabled.
+# The default value is: YES.
 
 WARN_IF_UNDOCUMENTED   = YES
 
-# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some
-# parameters in a documented function, or documenting parameters that
-# don't exist or using markup commands wrongly.
+# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some parameters
+# in a documented function, or documenting parameters that don't exist or using
+# markup commands wrongly.
+# The default value is: YES.
 
 WARN_IF_DOC_ERROR      = YES
 
-# The WARN_NO_PARAMDOC option can be enabled to get warnings for
-# functions that are documented, but have no documentation for their parameters
-# or return value. If set to NO (the default) doxygen will only warn about
-# wrong or incomplete parameter documentation, but not about the absence of
-# documentation.
+# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
+# are documented, but have no documentation for their parameters or return
+# value. If set to NO doxygen will only warn about wrong or incomplete parameter
+# documentation, but not about the absence of documentation.
+# The default value is: NO.
 
 WARN_NO_PARAMDOC       = NO
 
-# The WARN_FORMAT tag determines the format of the warning messages that
-# doxygen can produce. The string should contain the $file, $line, and $text
-# tags, which will be replaced by the file and line number from which the
-# warning originated and the warning text. Optionally the format may contain
-# $version, which will be replaced by the version of the file (if it could
-# be obtained via FILE_VERSION_FILTER)
+# The WARN_FORMAT tag determines the format of the warning messages that doxygen
+# can produce. The string should contain the $file, $line, and $text tags, which
+# will be replaced by the file and line number from which the warning originated
+# and the warning text. Optionally the format may contain $version, which will
+# be replaced by the version of the file (if it could be obtained via
+# FILE_VERSION_FILTER)
+# The default value is: $file:$line: $text.
 
 WARN_FORMAT            = "$file:$line: $text"
 
-# The WARN_LOGFILE tag can be used to specify a file to which warning
-# and error messages should be written. If left blank the output is written
-# to stderr.
+# The WARN_LOGFILE tag can be used to specify a file to which warning and error
+# messages should be written. If left blank the output is written to standard
+# error (stderr).
 
 WARN_LOGFILE           =
 
 #---------------------------------------------------------------------------
-# configuration options related to the input files
+# Configuration options related to the input files
 #---------------------------------------------------------------------------
 
-# The INPUT tag can be used to specify the files and/or directories that contain
-# documented source files. You may enter file names like "myfile.cpp" or
-# directories like "/usr/src/myproject". Separate the files or directories
-# with spaces.
+# The INPUT tag is used to specify the files and/or directories that contain
+# documented source files. You may enter file names like myfile.cpp or
+# directories like /usr/src/myproject. Separate the files or directories with
+# spaces.
+# Note: If this tag is empty the current directory is searched.
 
 INPUT                  = @TOPSRC@/include \
                          @TOPSRC@/libs \
@@ -665,34 +743,37 @@ INPUT                  = @TOPSRC@/include \
                          @TOPSRC@/INSTALL
 
 # This tag can be used to specify the character encoding of the source files
-# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
-# also the default input encoding. Doxygen uses libiconv (or the iconv built
-# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
-# the list of possible encodings.
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
+# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
+# documentation (see: http://www.gnu.org/software/libiconv) for the list of
+# possible encodings.
+# The default value is: UTF-8.
 
 INPUT_ENCODING         = UTF-8
 
 # If the value of the INPUT tag contains directories, you can use the
-# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
-# blank the following patterns are tested:
-# *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh
-# *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py
-# *.f90 *.f *.for *.vhd *.vhdl
+# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
+# *.h) to filter out the source-files in the directories. If left blank the
+# following patterns are tested:*.c, *.cc, *.cxx, *.cpp, *.c++, *.java, *.ii,
+# *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h, *.hh, *.hxx, *.hpp,
+# *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc, *.m, *.markdown,
+# *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf,
+# *.qsf, *.as and *.js.
 
 FILE_PATTERNS          = *.c \
                          *.h \
                          *.dox
 
-# The RECURSIVE tag can be used to turn specify whether or not subdirectories
-# should be searched for input files as well. Possible values are YES and NO.
-# If left blank NO is used.
+# The RECURSIVE tag can be used to specify whether or not subdirectories should
+# be searched for input files as well.
+# The default value is: NO.
 
 RECURSIVE              = YES
 
 # The EXCLUDE tag can be used to specify files and/or directories that should be
 # excluded from the INPUT source files. This way you can easily exclude a
 # subdirectory from a directory tree whose root is specified with the INPUT tag.
+#
 # Note that relative paths are relative to the directory from which doxygen is
 # run.
 
@@ -715,14 +796,16 @@ EXCLUDE                = @TOPSRC@/tools/qfcc/source/qc-lex.c \
 # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
 # directories that are symbolic links (a Unix file system feature) are excluded
 # from the input.
+# The default value is: NO.
 
 EXCLUDE_SYMLINKS       = NO
 
 # If the value of the INPUT tag contains directories, you can use the
 # EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
-# certain files from those directories. Note that the wildcards are matched
-# against the file with absolute path, so to exclude all test directories
-# for example use the pattern */test/*
+# certain files from those directories.
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories for example use the pattern */test/*
 
 EXCLUDE_PATTERNS       =
 
@@ -731,33 +814,36 @@ EXCLUDE_PATTERNS       =
 # output. The symbol name can be a fully qualified name, a word, or if the
 # wildcard * is used, a substring. Examples: ANamespace, AClass,
 # AClass::ANamespace, ANamespace::*Test
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories use the pattern */test/*
 
 EXCLUDE_SYMBOLS        =
 
-# The EXAMPLE_PATH tag can be used to specify one or more files or
-# directories that contain example code fragments that are included (see
-# the \include command).
+# The EXAMPLE_PATH tag can be used to specify one or more files or directories
+# that contain example code fragments that are included (see the \include
+# command).
 
 EXAMPLE_PATH           = @TOPSRC@/doc \
                          @TOPSRC@/doc/progs
 
 # If the value of the EXAMPLE_PATH tag contains directories, you can use the
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
-# blank all files are included.
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
+# *.h) to filter out the source-files in the directories. If left blank all
+# files are included.
 
 EXAMPLE_PATTERNS       =
 
 # If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
-# searched for input files to be used with the \include or \dontinclude
-# commands irrespective of the value of the RECURSIVE tag.
-# Possible values are YES and NO. If left blank NO is used.
+# searched for input files to be used with the \include or \dontinclude commands
+# irrespective of the value of the RECURSIVE tag.
+# The default value is: NO.
 
 EXAMPLE_RECURSIVE      = NO
 
-# The IMAGE_PATH tag can be used to specify one or more files or
-# directories that contain image that are included in the documentation (see
-# the \image command).
+# The IMAGE_PATH tag can be used to specify one or more files or directories
+# that contain images that are to be included in the documentation (see the
+# \image command).
 
 IMAGE_PATH             = @TOPSRC@/doc \
                          @builddir@ \
@@ -766,724 +852,1046 @@ IMAGE_PATH             = @TOPSRC@/doc \
 
 # The INPUT_FILTER tag can be used to specify a program that doxygen should
 # invoke to filter for each input file. Doxygen will invoke the filter program
-# by executing (via popen()) the command <filter> <input-file>, where <filter>
-# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
-# input file. Doxygen will then use the output that the filter program writes
-# to standard output.
-# If FILTER_PATTERNS is specified, this tag will be
-# ignored.
+# by executing (via popen()) the command:
+#
+# <filter> <input-file>
+#
+# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
+# name of an input file. Doxygen will then use the output that the filter
+# program writes to standard output. If FILTER_PATTERNS is specified, this tag
+# will be ignored.
+#
+# Note that the filter must not add or remove lines; it is applied before the
+# code is scanned, but not when the output code is generated. If lines are added
+# or removed, the anchors will not be placed correctly.
 
 INPUT_FILTER           =
 
 # The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
-# basis.
-# Doxygen will compare the file name with each pattern and apply the
-# filter if there is a match.
-# The filters are a list of the form:
-# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
-# info on how filters are used. If FILTER_PATTERNS is empty or if
-# non of the patterns match the file name, INPUT_FILTER is applied.
+# basis. Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match. The filters are a list of the form: pattern=filter
+# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
+# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
+# patterns match the file name, INPUT_FILTER is applied.
 
 FILTER_PATTERNS        =
 
 # If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
-# INPUT_FILTER) will be used to filter the input files when producing source
-# files to browse (i.e. when SOURCE_BROWSER is set to YES).
+# INPUT_FILTER ) will also be used to filter the input files that are used for
+# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
+# The default value is: NO.
 
 FILTER_SOURCE_FILES    = NO
 
 # The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
-# pattern. A pattern will override the setting for FILTER_PATTERN (if any)
-# and it is also possible to disable source filtering for a specific pattern
-# using *.ext= (so without naming a filter). This option only has effect when
-# FILTER_SOURCE_FILES is enabled.
+# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
+# it is also possible to disable source filtering for a specific pattern using
+# *.ext= (so without naming a filter).
+# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
 
 FILTER_SOURCE_PATTERNS =
 
+# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
+# is part of the input, its contents will be placed on the main page
+# (index.html). This can be useful if you have a project on for instance GitHub
+# and want to reuse the introduction page also for the doxygen output.
+
+USE_MDFILE_AS_MAINPAGE =
+
 #---------------------------------------------------------------------------
-# configuration options related to source browsing
+# Configuration options related to source browsing
 #---------------------------------------------------------------------------
 
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will
-# be generated. Documented entities will be cross-referenced with these sources.
-# Note: To get rid of all source code in the generated output, make sure also
-# VERBATIM_HEADERS is set to NO.
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
+# generated. Documented entities will be cross-referenced with these sources.
+#
+# Note: To get rid of all source code in the generated output, make sure that
+# also VERBATIM_HEADERS is set to NO.
+# The default value is: NO.
 
 SOURCE_BROWSER         = NO
 
-# Setting the INLINE_SOURCES tag to YES will include the body
-# of functions and classes directly in the documentation.
+# Setting the INLINE_SOURCES tag to YES will include the body of functions,
+# classes and enums directly into the documentation.
+# The default value is: NO.
 
 INLINE_SOURCES         = NO
 
-# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
-# doxygen to hide any special comment blocks from generated source code
-# fragments. Normal C, C++ and Fortran comments will always remain visible.
+# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
+# special comment blocks from generated source code fragments. Normal C, C++ and
+# Fortran comments will always remain visible.
+# The default value is: YES.
 
 STRIP_CODE_COMMENTS    = YES
 
-# If the REFERENCED_BY_RELATION tag is set to YES
-# then for each documented function all documented
-# functions referencing it will be listed.
+# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
+# function all documented functions referencing it will be listed.
+# The default value is: NO.
 
 REFERENCED_BY_RELATION = NO
 
-# If the REFERENCES_RELATION tag is set to YES
-# then for each documented function all documented entities
-# called/used by that function will be listed.
+# If the REFERENCES_RELATION tag is set to YES then for each documented function
+# all documented entities called/used by that function will be listed.
+# The default value is: NO.
 
 REFERENCES_RELATION    = NO
 
-# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
-# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
-# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
-# link to the source code.
-# Otherwise they will link to the documentation.
+# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
+# to YES, then the hyperlinks from functions in REFERENCES_RELATION and
+# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
+# link to the documentation.
+# The default value is: YES.
 
 REFERENCES_LINK_SOURCE = NO
 
-# If the USE_HTAGS tag is set to YES then the references to source code
-# will point to the HTML generated by the htags(1) tool instead of doxygen
-# built-in source browser. The htags tool is part of GNU's global source
-# tagging system (see http://www.gnu.org/software/global/global.html). You
-# will need version 4.8.6 or higher.
+# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
+# source code will show a tooltip with additional information such as prototype,
+# brief description and links to the definition and documentation. Since this
+# will make the HTML file larger and loading of large files a bit slower, you
+# can opt to disable this feature.
+# The default value is: YES.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+SOURCE_TOOLTIPS        = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code will
+# point to the HTML generated by the htags(1) tool instead of doxygen built-in
+# source browser. The htags tool is part of GNU's global source tagging system
+# (see http://www.gnu.org/software/global/global.html). You will need version
+# 4.8.6 or higher.
+#
+# To use it do the following:
+# - Install the latest version of global
+# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
+# - Make sure the INPUT points to the root of the source tree
+# - Run doxygen as normal
+#
+# Doxygen will invoke htags (and that will in turn invoke gtags), so these
+# tools must be available from the command line (i.e. in the search path).
+#
+# The result: instead of the source browser generated by doxygen, the links to
+# source code will now point to the output of htags.
+# The default value is: NO.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
 
 USE_HTAGS              = NO
 
-# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
-# will generate a verbatim copy of the header file for each class for
-# which an include is specified. Set to NO to disable this.
+# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
+# verbatim copy of the header file for each class for which an include is
+# specified. Set to NO to disable this.
+# See also: Section \class.
+# The default value is: YES.
 
 VERBATIM_HEADERS       = NO
 
 #---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
+# Configuration options related to the alphabetical class index
 #---------------------------------------------------------------------------
 
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
-# of all compounds will be generated. Enable this if the project
-# contains a lot of classes, structs, unions or interfaces.
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
+# compounds will be generated. Enable this if the project contains a lot of
+# classes, structs, unions or interfaces.
+# The default value is: YES.
 
 ALPHABETICAL_INDEX     = YES
 
-# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
-# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
-# in which this list will be split (can be a number in the range [1..20])
+# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
+# which the alphabetical index list will be split.
+# Minimum value: 1, maximum value: 20, default value: 5.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
 
 COLS_IN_ALPHA_INDEX    = 4
 
-# In case all classes in a project start with a common prefix, all
-# classes will be put under the same header in the alphabetical index.
-# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
-# should be ignored while generating the index headers.
+# In case all classes in a project start with a common prefix, all classes will
+# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
+# can be used to specify a prefix (or a list of prefixes) that should be ignored
+# while generating the index headers.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
 
 IGNORE_PREFIX          =
 
 #---------------------------------------------------------------------------
-# configuration options related to the HTML output
+# Configuration options related to the HTML output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
-# generate HTML output.
+# If the GENERATE_HTML tag is set to YES doxygen will generate HTML output
+# The default value is: YES.
 
 GENERATE_HTML          = YES
 
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `html' will be used as the default path.
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_OUTPUT            = html
 
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
-# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
-# doxygen will generate files with .html extension.
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
+# generated HTML page (for example: .htm, .php, .asp).
+# The default value is: .html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_FILE_EXTENSION    = .html
 
-# The HTML_HEADER tag can be used to specify a personal HTML header for
-# each generated HTML page. If it is left blank doxygen will generate a
-# standard header. Note that when using a custom header you are responsible
-#  for the proper inclusion of any scripts and style sheets that doxygen
-# needs, which is dependent on the configuration options used.
-# It is advised to generate a default header using "doxygen -w html
-# header.html footer.html stylesheet.css YourConfigFile" and then modify
-# that header. Note that the header is subject to change so you typically
-# have to redo this when upgrading to a newer version of doxygen or when
-# changing the value of configuration settings such as GENERATE_TREEVIEW!
+# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
+# each generated HTML page. If the tag is left blank doxygen will generate a
+# standard header.
+#
+# To get valid HTML the header file that includes any scripts and style sheets
+# that doxygen needs, which is dependent on the configuration options used (e.g.
+# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
+# default header using
+# doxygen -w html new_header.html new_footer.html new_stylesheet.css
+# YourConfigFile
+# and then modify the file new_header.html. See also section "Doxygen usage"
+# for information on how to generate the default header that doxygen normally
+# uses.
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. For a description
+# of the possible markers and block names see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_HEADER            =
 
-# The HTML_FOOTER tag can be used to specify a personal HTML footer for
-# each generated HTML page. If it is left blank doxygen will generate a
-# standard footer.
+# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
+# generated HTML page. If the tag is left blank doxygen will generate a standard
+# footer. See HTML_HEADER for more information on how to generate a default
+# footer and what special commands can be used inside the footer. See also
+# section "Doxygen usage" for information on how to generate the default footer
+# that doxygen normally uses.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_FOOTER            =
 
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
-# style sheet that is used by each HTML page. It can be used to
-# fine-tune the look of the HTML output. If the tag is left blank doxygen
-# will generate a default style sheet. Note that doxygen will try to copy
-# the style sheet file to the HTML output directory, so don't put your own
-# style sheet in the HTML output directory as well, or it will be erased!
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
+# sheet that is used by each HTML page. It can be used to fine-tune the look of
+# the HTML output. If left blank doxygen will generate a default style sheet.
+# See also section "Doxygen usage" for information on how to generate the style
+# sheet that doxygen normally uses.
+# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
+# it is more robust and this tag (HTML_STYLESHEET) will in the future become
+# obsolete.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_STYLESHEET        = @TOPSRC@/doc/doxygen.css
 
+# The HTML_EXTRA_STYLESHEET tag can be used to specify an additional user-
+# defined cascading style sheet that is included after the standard style sheets
+# created by doxygen. Using this option one can overrule certain style aspects.
+# This is preferred over using HTML_STYLESHEET since it does not replace the
+# standard style sheet and is therefor more robust against future updates.
+# Doxygen will copy the style sheet file to the output directory. For an example
+# see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_STYLESHEET  =
+
 # The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
 # other source files which should be copied to the HTML output directory. Note
 # that these files will be copied to the base HTML output directory. Use the
-# $relpath$ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
-# files. In the HTML_STYLESHEET file, use the file name only. Also note that
-# the files will be copied as-is; there are no commands or markers available.
+# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
+# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
+# files will be copied as-is; there are no commands or markers available.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_EXTRA_FILES       =
 
-# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output.
-# Doxygen will adjust the colors in the style sheet and background images
-# according to this color. Hue is specified as an angle on a colorwheel,
-# see http://en.wikipedia.org/wiki/Hue for more information.
-# For instance the value 0 represents red, 60 is yellow, 120 is green,
-# 180 is cyan, 240 is blue, 300 purple, and 360 is red again.
-# The allowed range is 0 to 359.
+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
+# will adjust the colors in the stylesheet and background images according to
+# this color. Hue is specified as an angle on a colorwheel, see
+# http://en.wikipedia.org/wiki/Hue for more information. For instance the value
+# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
+# purple, and 360 is red again.
+# Minimum value: 0, maximum value: 359, default value: 220.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_COLORSTYLE_HUE    = 228
 
-# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of
-# the colors in the HTML output. For a value of 0 the output will use
-# grayscales only. A value of 255 will produce the most vivid colors.
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
+# in the HTML output. For a value of 0 the output will use grayscales only. A
+# value of 255 will produce the most vivid colors.
+# Minimum value: 0, maximum value: 255, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_COLORSTYLE_SAT    = 67
 
-# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to
-# the luminance component of the colors in the HTML output. Values below
-# 100 gradually make the output lighter, whereas values above 100 make
-# the output darker. The value divided by 100 is the actual gamma applied,
-# so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2,
-# and 100 does not change the gamma.
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
+# luminance component of the colors in the HTML output. Values below 100
+# gradually make the output lighter, whereas values above 100 make the output
+# darker. The value divided by 100 is the actual gamma applied, so 80 represents
+# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
+# change the gamma.
+# Minimum value: 40, maximum value: 240, default value: 80.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_COLORSTYLE_GAMMA  = 100
 
 # If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
-# page will contain the date and time when the page was generated. Setting
-# this to NO can help when comparing the output of multiple runs.
+# page will contain the date and time when the page was generated. Setting this
+# to NO can help when comparing the output of multiple runs.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_TIMESTAMP         = NO
 
 # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
 # documentation will contain sections that can be hidden and shown after the
 # page has loaded.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_DYNAMIC_SECTIONS  = NO
 
-# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of
-# entries shown in the various tree structured indices initially; the user
-# can expand and collapse entries dynamically later on. Doxygen will expand
-# the tree to such a level that at most the specified number of entries are
-# visible (unless a fully collapsed tree already exceeds this amount).
-# So setting the number of entries 1 will produce a full collapsed tree by
-# default. 0 is a special value representing an infinite number of entries
-# and will result in a full expanded tree by default.
+# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
+# shown in the various tree structured indices initially; the user can expand
+# and collapse entries dynamically later on. Doxygen will expand the tree to
+# such a level that at most the specified number of entries are visible (unless
+# a fully collapsed tree already exceeds this amount). So setting the number of
+# entries 1 will produce a full collapsed tree by default. 0 is a special value
+# representing an infinite number of entries and will result in a full expanded
+# tree by default.
+# Minimum value: 0, maximum value: 9999, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_INDEX_NUM_ENTRIES = 100
 
-# If the GENERATE_DOCSET tag is set to YES, additional index files
-# will be generated that can be used as input for Apple's Xcode 3
-# integrated development environment, introduced with OSX 10.5 (Leopard).
-# To create a documentation set, doxygen will generate a Makefile in the
-# HTML output directory. Running make will produce the docset in that
-# directory and running "make install" will install the docset in
-# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find
-# it at startup.
-# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
+# If the GENERATE_DOCSET tag is set to YES, additional index files will be
+# generated that can be used as input for Apple's Xcode 3 integrated development
+# environment (see: http://developer.apple.com/tools/xcode/), introduced with
+# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a
+# Makefile in the HTML output directory. Running make will produce the docset in
+# that directory and running make install will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
+# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
 # for more information.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_DOCSET        = NO
 
-# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the
-# feed. A documentation feed provides an umbrella under which multiple
-# documentation sets from a single provider (such as a company or product suite)
-# can be grouped.
+# This tag determines the name of the docset feed. A documentation feed provides
+# an umbrella under which multiple documentation sets from a single provider
+# (such as a company or product suite) can be grouped.
+# The default value is: Doxygen generated docs.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
 
 DOCSET_FEEDNAME        = "Doxygen generated docs"
 
-# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that
-# should uniquely identify the documentation set bundle. This should be a
-# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
-# will append .docset to the name.
+# This tag specifies a string that should uniquely identify the documentation
+# set bundle. This should be a reverse domain-name style string, e.g.
+# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
 
 DOCSET_BUNDLE_ID       = org.doxygen.Project
 
-# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely identify
+# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
 # the documentation publisher. This should be a reverse domain-name style
 # string, e.g. com.mycompany.MyDocSet.documentation.
+# The default value is: org.doxygen.Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
 
 DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
 
-# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher.
+# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
+# The default value is: Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
 
 DOCSET_PUBLISHER_NAME  = Publisher
 
-# If the GENERATE_HTMLHELP tag is set to YES, additional index files
-# will be generated that can be used as input for tools like the
-# Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
-# of the generated HTML documentation.
+# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
+# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
+# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
+# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on
+# Windows.
+#
+# The HTML Help Workshop contains a compiler that can convert all HTML output
+# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
+# files are now used as the Windows 98 help format, and will replace the old
+# Windows help format (.hlp) on all Windows platforms in the future. Compressed
+# HTML files also contain an index, a table of contents, and you can search for
+# words in the documentation. The HTML workshop also contains a viewer for
+# compressed HTML files.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_HTMLHELP      = NO
 
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
-# be used to specify the file name of the resulting .chm file. You
-# can add a path in front of the file if the result should not be
+# The CHM_FILE tag can be used to specify the file name of the resulting .chm
+# file. You can add a path in front of the file if the result should not be
 # written to the html output directory.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
 CHM_FILE               =
 
-# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
-# be used to specify the location (absolute path including file name) of
-# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
-# the HTML help compiler on the generated index.hhp.
+# The HHC_LOCATION tag can be used to specify the location (absolute path
+# including file name) of the HTML help compiler ( hhc.exe). If non-empty
+# doxygen will try to run the HTML help compiler on the generated index.hhp.
+# The file has to be specified with full path.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
 HHC_LOCATION           =
 
-# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
-# controls if a separate .chi index file is generated (YES) or that
-# it should be included in the master .chm file (NO).
+# The GENERATE_CHI flag controls if a separate .chi index file is generated (
+# YES) or that it should be included in the master .chm file ( NO).
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
 GENERATE_CHI           = NO
 
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING
-# is used to encode HtmlHelp index (hhk), content (hhc) and project file
-# content.
+# The CHM_INDEX_ENCODING is used to encode HtmlHelp index ( hhk), content ( hhc)
+# and project file content.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
 CHM_INDEX_ENCODING     =
 
-# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
-# controls whether a binary table of contents is generated (YES) or a
-# normal table of contents (NO) in the .chm file.
+# The BINARY_TOC flag controls whether a binary table of contents is generated (
+# YES) or a normal table of contents ( NO) in the .chm file.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
 BINARY_TOC             = NO
 
-# The TOC_EXPAND flag can be set to YES to add extra items for group members
-# to the contents of the HTML help documentation and to the tree view.
+# The TOC_EXPAND flag can be set to YES to add extra items for group members to
+# the table of contents of the HTML help documentation and to the tree view.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
 TOC_EXPAND             = NO
 
 # If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
-# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated
-# that can be used as input for Qt's qhelpgenerator to generate a
-# Qt Compressed Help (.qch) of the generated HTML documentation.
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
+# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
+# (.qch) of the generated HTML documentation.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_QHP           = NO
 
-# If the QHG_LOCATION tag is specified, the QCH_FILE tag can
-# be used to specify the file name of the resulting .qch file.
-# The path specified is relative to the HTML output folder.
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
+# the file name of the resulting .qch file. The path specified is relative to
+# the HTML output folder.
+# This tag requires that the tag GENERATE_QHP is set to YES.
 
 QCH_FILE               =
 
-# The QHP_NAMESPACE tag specifies the namespace to use when generating
-# Qt Help Project output. For more information please see
-# http://doc.trolltech.com/qthelpproject.html#namespace
+# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
+# Project output. For more information please see Qt Help Project / Namespace
+# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace).
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_NAMESPACE          = org.doxygen.Project
 
-# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
-# Qt Help Project output. For more information please see
-# http://doc.trolltech.com/qthelpproject.html#virtual-folders
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
+# Help Project output. For more information please see Qt Help Project / Virtual
+# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual-
+# folders).
+# The default value is: doc.
+# This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_VIRTUAL_FOLDER     = doc
 
-# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to
-# add. For more information please see
-# http://doc.trolltech.com/qthelpproject.html#custom-filters
+# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
+# filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_CUST_FILTER_NAME   =
 
-# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the
-# custom filter to add. For more information please see
-# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">
-# Qt Help Project / Custom Filters</a>.
+# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
+# custom filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_CUST_FILTER_ATTRS  =
 
 # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
-# project's
-# filter section matches.
-# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">
-# Qt Help Project / Filter Attributes</a>.
+# project's filter section matches. Qt Help Project / Filter Attributes (see:
+# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes).
+# This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_SECT_FILTER_ATTRS  =
 
-# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can
-# be used to specify the location of Qt's qhelpgenerator.
-# If non-empty doxygen will try to run qhelpgenerator on the generated
-# .qhp file.
+# The QHG_LOCATION tag can be used to specify the location of Qt's
+# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
+# generated .qhp file.
+# This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHG_LOCATION           =
 
-# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files
-#  will be generated, which together with the HTML files, form an Eclipse help
-# plugin. To install this plugin and make it available under the help contents
-# menu in Eclipse, the contents of the directory containing the HTML and XML
-# files needs to be copied into the plugins directory of eclipse. The name of
-# the directory within the plugins directory should be the same as
-# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before
-# the help appears.
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
+# generated, together with the HTML files, they form an Eclipse help plugin. To
+# install this plugin and make it available under the help contents menu in
+# Eclipse, the contents of the directory containing the HTML and XML files needs
+# to be copied into the plugins directory of eclipse. The name of the directory
+# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
+# After copying Eclipse needs to be restarted before the help appears.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_ECLIPSEHELP   = NO
 
-# A unique identifier for the eclipse help plugin. When installing the plugin
-# the directory name containing the HTML and XML files should also have
-# this name.
+# A unique identifier for the Eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have this
+# name. Each documentation set should have its own identifier.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
 
 ECLIPSE_DOC_ID         = org.doxygen.Project
 
-# The DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs)
-# at top of each HTML page. The value NO (the default) enables the index and
-# the value YES disables it. Since the tabs have the same information as the
-# navigation tree you can set this option to NO if you already set
-# GENERATE_TREEVIEW to YES.
+# If you want full control over the layout of the generated HTML pages it might
+# be necessary to disable the index and replace it with your own. The
+# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
+# of each HTML page. A value of NO enables the index and the value YES disables
+# it. Since the tabs in the index contain the same information as the navigation
+# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 DISABLE_INDEX          = YES
 
 # The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
-# structure should be generated to display hierarchical information.
-# If the tag value is set to YES, a side panel will be generated
-# containing a tree-like index structure (just like the one that
-# is generated for HTML Help). For this to work a browser that supports
-# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser).
-# Windows users are probably better off using the HTML help feature.
-# Since the tree basically has the same information as the tab index you
-# could consider to set DISABLE_INDEX to NO when enabling this option.
+# structure should be generated to display hierarchical information. If the tag
+# value is set to YES, a side panel will be generated containing a tree-like
+# index structure (just like the one that is generated for HTML Help). For this
+# to work a browser that supports JavaScript, DHTML, CSS and frames is required
+# (i.e. any modern browser). Windows users are probably better off using the
+# HTML help feature. Via custom stylesheets (see HTML_EXTRA_STYLESHEET) one can
+# further fine-tune the look of the index. As an example, the default style
+# sheet generated by doxygen has an example that shows how to put an image at
+# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
+# the same information as the tab index, you could consider setting
+# DISABLE_INDEX to YES when enabling this option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_TREEVIEW      = YES
 
-# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values
-# (range [0,1..20]) that doxygen will group on one line in the generated HTML
-# documentation. Note that a value of 0 will completely suppress the enum
-# values from appearing in the overview section.
+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
+# doxygen will group on one line in the generated HTML documentation.
+#
+# Note that a value of 0 will completely suppress the enum values from appearing
+# in the overview section.
+# Minimum value: 0, maximum value: 20, default value: 4.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 ENUM_VALUES_PER_LINE   = 4
 
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
-# used to set the initial width (in pixels) of the frame in which the tree
-# is shown.
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
+# to set the initial width (in pixels) of the frame in which the tree is shown.
+# Minimum value: 0, maximum value: 1500, default value: 250.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 TREEVIEW_WIDTH         = 250
 
-# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open
-# links to external symbols imported via tag files in a separate window.
+# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open links to
+# external symbols imported via tag files in a separate window.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 EXT_LINKS_IN_WINDOW    = NO
 
-# Use this tag to change the font size of Latex formulas included
-# as images in the HTML documentation. The default is 10. Note that
-# when you change the font size after a successful doxygen run you need
-# to manually remove any form_*.png images from the HTML output directory
-# to force them to be regenerated.
+# Use this tag to change the font size of LaTeX formulas included as images in
+# the HTML documentation. When you change the font size after a successful
+# doxygen run you need to manually remove any form_*.png images from the HTML
+# output directory to force them to be regenerated.
+# Minimum value: 8, maximum value: 50, default value: 10.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 FORMULA_FONTSIZE       = 10
 
 # Use the FORMULA_TRANPARENT tag to determine whether or not the images
-# generated for formulas are transparent PNGs. Transparent PNGs are
-# not supported properly for IE 6.0, but are supported on all modern browsers.
-# Note that when changing this option you need to delete any form_*.png files
-# in the HTML output before the changes have effect.
+# generated for formulas are transparent PNGs. Transparent PNGs are not
+# supported properly for IE 6.0, but are supported on all modern browsers.
+#
+# Note that when changing this option you need to delete any form_*.png files in
+# the HTML output directory before the changes have effect.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 FORMULA_TRANSPARENT    = YES
 
-# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax
-# (see http://www.mathjax.org) which uses client side Javascript for the
-# rendering instead of using prerendered bitmaps. Use this if you do not
-# have LaTeX installed or if you want to formulas look prettier in the HTML
-# output. When enabled you may also need to install MathJax separately and
-# configure the path to it using the MATHJAX_RELPATH option.
+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
+# http://www.mathjax.org) which uses client side Javascript for the rendering
+# instead of using prerendered bitmaps. Use this if you do not have LaTeX
+# installed or if you want to formulas look prettier in the HTML output. When
+# enabled you may also need to install MathJax separately and configure the path
+# to it using the MATHJAX_RELPATH option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 USE_MATHJAX            = NO
 
-# When MathJax is enabled you need to specify the location relative to the
-# HTML output directory using the MATHJAX_RELPATH option. The destination
-# directory should contain the MathJax.js script. For instance, if the mathjax
-# directory is located at the same level as the HTML output directory, then
-# MATHJAX_RELPATH should be ../mathjax. The default value points to
-# the MathJax Content Delivery Network so you can quickly see the result without
-# installing MathJax.
-# However, it is strongly recommended to install a local
-# copy of MathJax from http://www.mathjax.org before deployment.
+# When MathJax is enabled you can set the default output format to be used for
+# the MathJax output. See the MathJax site (see:
+# http://docs.mathjax.org/en/latest/output.html) for more details.
+# Possible values are: HTML-CSS (which is slower, but has the best
+# compatibility), NativeMML (i.e. MathML) and SVG.
+# The default value is: HTML-CSS.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_FORMAT         = HTML-CSS
+
+# When MathJax is enabled you need to specify the location relative to the HTML
+# output directory using the MATHJAX_RELPATH option. The destination directory
+# should contain the MathJax.js script. For instance, if the mathjax directory
+# is located at the same level as the HTML output directory, then
+# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
+# Content Delivery Network so you can quickly see the result without installing
+# MathJax. However, it is strongly recommended to install a local copy of
+# MathJax from http://www.mathjax.org before deployment.
+# The default value is: http://cdn.mathjax.org/mathjax/latest.
+# This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
 
-# The MATHJAX_EXTENSIONS tag can be used to specify one or MathJax extension
-# names that should be enabled during MathJax rendering.
+# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
+# extension names that should be enabled during MathJax rendering. For example
+# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_EXTENSIONS     =
 
-# When the SEARCHENGINE tag is enabled doxygen will generate a search box
-# for the HTML output. The underlying search engine uses javascript
-# and DHTML and should work on any modern browser. Note that when using
-# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets
-# (GENERATE_DOCSET) there is already a search function so this one should
-# typically be disabled. For large projects the javascript based search engine
-# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
+# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
+# of code that will be used on startup of the MathJax code. See the MathJax site
+# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
+# example see the documentation.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_CODEFILE       =
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
+# the HTML output. The underlying search engine uses javascript and DHTML and
+# should work on any modern browser. Note that when using HTML help
+# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
+# there is already a search function so this one should typically be disabled.
+# For large projects the javascript based search engine can be slow, then
+# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
+# search using the keyboard; to jump to the search box use <access key> + S
+# (what the <access key> is depends on the OS and browser, but it is typically
+# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
+# key> to jump into the search results window, the results can be navigated
+# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
+# the search. The filter options can be selected when the cursor is inside the
+# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
+# to select a filter and <Enter> or <escape> to activate or cancel the filter
+# option.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 SEARCHENGINE           = YES
 
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a PHP enabled web server instead of at the web client
-# using Javascript. Doxygen will generate the search PHP script and index
-# file to put on the web server. The advantage of the server
-# based approach is that it scales better to large projects and allows
-# full text search. The disadvantages are that it is more difficult to setup
-# and does not have live searching capabilities.
+# implemented using a web server instead of a web client using Javascript. There
+# are two flavours of web server based searching depending on the
+# EXTERNAL_SEARCH setting. When disabled, doxygen will generate a PHP script for
+# searching and an index file used by the script. When EXTERNAL_SEARCH is
+# enabled the indexing and searching needs to be provided by external tools. See
+# the section "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
 
 SERVER_BASED_SEARCH    = NO
 
+# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
+# script for searching. Instead the search results are written to an XML file
+# which needs to be processed by an external indexer. Doxygen will invoke an
+# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
+# search results.
+#
+# Doxygen ships with an example indexer ( doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: http://xapian.org/).
+#
+# See the section "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH        = NO
+
+# The SEARCHENGINE_URL should point to a search engine hosted by a web server
+# which will return the search results when EXTERNAL_SEARCH is enabled.
+#
+# Doxygen ships with an example indexer ( doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: http://xapian.org/). See the section "External Indexing and
+# Searching" for details.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHENGINE_URL       =
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
+# search data is written to a file for indexing by an external tool. With the
+# SEARCHDATA_FILE tag the name of this file can be specified.
+# The default file is: searchdata.xml.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHDATA_FILE        = searchdata.xml
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
+# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
+# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
+# projects and redirect the results back to the right project.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH_ID     =
+
+# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
+# projects other than the one defined by this configuration file, but that are
+# all added to the same external search index. Each project needs to have a
+# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
+# to a relative location where the documentation can be found. The format is:
+# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTRA_SEARCH_MAPPINGS  =
+
 #---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
+# Configuration options related to the LaTeX output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
-# generate Latex output.
+# If the GENERATE_LATEX tag is set to YES doxygen will generate LaTeX output.
+# The default value is: YES.
 
 GENERATE_LATEX         = NO
 
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `latex' will be used as the default path.
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_OUTPUT           = latex
 
 # The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
-# invoked. If left blank `latex' will be used as the default command name.
-# Note that when enabling USE_PDFLATEX this option is only used for
-# generating bitmaps for formulas in the HTML output, but not in the
-# Makefile that is written to the output directory.
+# invoked.
+#
+# Note that when enabling USE_PDFLATEX this option is only used for generating
+# bitmaps for formulas in the HTML output, but not in the Makefile that is
+# written to the output directory.
+# The default file is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_CMD_NAME         = latex
 
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
-# generate index for LaTeX. If left blank `makeindex' will be used as the
-# default command name.
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
+# index for LaTeX.
+# The default file is: makeindex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 MAKEINDEX_CMD_NAME     = makeindex
 
-# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
-# LaTeX documents. This may be useful for small projects and may help to
-# save some trees in general.
+# If the COMPACT_LATEX tag is set to YES doxygen generates more compact LaTeX
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 COMPACT_LATEX          = YES
 
-# The PAPER_TYPE tag can be used to set the paper type that is used
-# by the printer. Possible values are: a4, letter, legal and
-# executive. If left blank a4wide will be used.
+# The PAPER_TYPE tag can be used to set the paper type that is used by the
+# printer.
+# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
+# 14 inches) and executive (7.25 x 10.5 inches).
+# The default value is: a4.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 PAPER_TYPE             = a4wide
 
-# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
-# packages that should be included in the LaTeX output.
+# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
+# that should be included in the LaTeX output. To get the times font for
+# instance you can specify
+# EXTRA_PACKAGES=times
+# If left blank no extra packages will be included.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 EXTRA_PACKAGES         =
 
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
-# the generated latex document. The header should contain everything until
-# the first chapter. If it is left blank doxygen will generate a
-# standard header. Notice: only use this tag if you know what you are doing!
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
+# generated LaTeX document. The header should contain everything until the first
+# chapter. If it is left blank doxygen will generate a standard header. See
+# section "Doxygen usage" for information on how to let doxygen write the
+# default header to a separate file.
+#
+# Note: Only use a user-defined header if you know what you are doing! The
+# following commands have a special meaning inside the header: $title,
+# $datetime, $date, $doxygenversion, $projectname, $projectnumber. Doxygen will
+# replace them by respectively the title of the page, the current date and time,
+# only the current date, the version number of doxygen, the project name (see
+# PROJECT_NAME), or the project number (see PROJECT_NUMBER).
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_HEADER           =
 
-# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for
-# the generated latex document. The footer should contain everything after
-# the last chapter. If it is left blank doxygen will generate a
-# standard footer. Notice: only use this tag if you know what you are doing!
+# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
+# generated LaTeX document. The footer should contain everything after the last
+# chapter. If it is left blank doxygen will generate a standard footer.
+#
+# Note: Only use a user-defined footer if you know what you are doing!
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_FOOTER           =
 
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
-# is prepared for conversion to pdf (using ps2pdf). The pdf file will
-# contain links (just like the HTML output) instead of page references
-# This makes the output suitable for online browsing using a pdf viewer.
+# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the LATEX_OUTPUT output
+# directory. Note that the files will be copied as-is; there are no commands or
+# markers available.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_FILES      =
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
+# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
+# contain links (just like the HTML output) instead of page references. This
+# makes the output suitable for online browsing using a PDF viewer.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 PDF_HYPERLINKS         = NO
 
-# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
-# plain latex in the generated Makefile. Set this option to YES to get a
+# If the LATEX_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
+# the PDF file directly from the LaTeX files. Set this option to YES to get a
 # higher quality PDF documentation.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 USE_PDFLATEX           = NO
 
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
-# command to the generated LaTeX files. This will instruct LaTeX to keep
-# running if errors occur, instead of asking the user for help.
-# This option is also used when generating formulas in HTML.
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
+# command to the generated LaTeX files. This will instruct LaTeX to keep running
+# if errors occur, instead of asking the user for help. This option is also used
+# when generating formulas in HTML.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_BATCHMODE        = NO
 
-# If LATEX_HIDE_INDICES is set to YES then doxygen will not
-# include the index chapters (such as File Index, Compound Index, etc.)
-# in the output.
+# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
+# index chapters (such as File Index, Compound Index, etc.) in the output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_HIDE_INDICES     = NO
 
-# If LATEX_SOURCE_CODE is set to YES then doxygen will include
-# source code with syntax highlighting in the LaTeX output.
-# Note that which sources are shown also depends on other settings
-# such as SOURCE_BROWSER.
+# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
+# code with syntax highlighting in the LaTeX output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_SOURCE_CODE      = NO
 
 # The LATEX_BIB_STYLE tag can be used to specify the style to use for the
-# bibliography, e.g. plainnat, or ieeetr. The default style is "plain". See
-# http://en.wikipedia.org/wiki/BibTeX for more info.
+# bibliography, e.g. plainnat, or ieeetr. See
+# http://en.wikipedia.org/wiki/BibTeX and \cite for more info.
+# The default value is: plain.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_BIB_STYLE        = plain
 
 #---------------------------------------------------------------------------
-# configuration options related to the RTF output
+# Configuration options related to the RTF output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
-# The RTF output is optimized for Word 97 and may not look very pretty with
-# other RTF readers or editors.
+# If the GENERATE_RTF tag is set to YES doxygen will generate RTF output. The
+# RTF output is optimized for Word 97 and may not look too pretty with other RTF
+# readers/editors.
+# The default value is: NO.
 
 GENERATE_RTF           = NO
 
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `rtf' will be used as the default path.
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: rtf.
+# This tag requires that the tag GENERATE_RTF is set to YES.
 
 RTF_OUTPUT             = rtf
 
-# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
-# RTF documents. This may be useful for small projects and may help to
-# save some trees in general.
+# If the COMPACT_RTF tag is set to YES doxygen generates more compact RTF
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
 
 COMPACT_RTF            = NO
 
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
-# will contain hyperlink fields. The RTF file will
-# contain links (just like the HTML output) instead of page references.
-# This makes the output suitable for online browsing using WORD or other
-# programs which support those fields.
-# Note: wordpad (write) and others do not support links.
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
+# contain hyperlink fields. The RTF file will contain links (just like the HTML
+# output) instead of page references. This makes the output suitable for online
+# browsing using Word or some other Word compatible readers that support those
+# fields.
+#
+# Note: WordPad (write) and others do not support links.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
 
 RTF_HYPERLINKS         = NO
 
-# Load style sheet definitions from file. Syntax is similar to doxygen's
-# config file, i.e. a series of assignments. You only have to provide
-# replacements, missing definitions are set to their default value.
+# Load stylesheet definitions from file. Syntax is similar to doxygen's config
+# file, i.e. a series of assignments. You only have to provide replacements,
+# missing definitions are set to their default value.
+#
+# See also section "Doxygen usage" for information on how to generate the
+# default style sheet that doxygen normally uses.
+# This tag requires that the tag GENERATE_RTF is set to YES.
 
 RTF_STYLESHEET_FILE    =
 
-# Set optional variables used in the generation of an rtf document.
-# Syntax is similar to doxygen's config file.
+# Set optional variables used in the generation of an RTF document. Syntax is
+# similar to doxygen's config file. A template extensions file can be generated
+# using doxygen -e rtf extensionFile.
+# This tag requires that the tag GENERATE_RTF is set to YES.
 
 RTF_EXTENSIONS_FILE    =
 
 #---------------------------------------------------------------------------
-# configuration options related to the man page output
+# Configuration options related to the man page output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
-# generate man pages
+# If the GENERATE_MAN tag is set to YES doxygen will generate man pages for
+# classes and files.
+# The default value is: NO.
 
 GENERATE_MAN           = NO
 
-# The MAN_OUTPUT tag is used to specify where the man pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `man' will be used as the default path.
+# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it. A directory man3 will be created inside the directory specified by
+# MAN_OUTPUT.
+# The default directory is: man.
+# This tag requires that the tag GENERATE_MAN is set to YES.
 
 MAN_OUTPUT             = man
 
-# The MAN_EXTENSION tag determines the extension that is added to
-# the generated man pages (default is the subroutine's section .3)
+# The MAN_EXTENSION tag determines the extension that is added to the generated
+# man pages. In case the manual section does not start with a number, the number
+# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
+# optional.
+# The default value is: .3.
+# This tag requires that the tag GENERATE_MAN is set to YES.
 
 MAN_EXTENSION          = .3
 
-# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
-# then it will generate one additional man file for each entity
-# documented in the real man page(s). These additional files
-# only source the real man page, but without them the man command
-# would be unable to find the correct page. The default is NO.
+# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
+# will generate one additional man file for each entity documented in the real
+# man page(s). These additional files only source the real man page, but without
+# them the man command would be unable to find the correct page.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_MAN is set to YES.
 
 MAN_LINKS              = NO
 
 #---------------------------------------------------------------------------
-# configuration options related to the XML output
+# Configuration options related to the XML output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_XML tag is set to YES Doxygen will
-# generate an XML file that captures the structure of
-# the code including all documentation.
+# If the GENERATE_XML tag is set to YES doxygen will generate an XML file that
+# captures the structure of the code including all documentation.
+# The default value is: NO.
 
 GENERATE_XML           = NO
 
-# The XML_OUTPUT tag is used to specify where the XML pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `xml' will be used as the default path.
+# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: xml.
+# This tag requires that the tag GENERATE_XML is set to YES.
 
 XML_OUTPUT             = xml
 
-# The XML_SCHEMA tag can be used to specify an XML schema,
-# which can be used by a validating XML parser to check the
-# syntax of the XML files.
+# The XML_SCHEMA tag can be used to specify a XML schema, which can be used by a
+# validating XML parser to check the syntax of the XML files.
+# This tag requires that the tag GENERATE_XML is set to YES.
 
 XML_SCHEMA             =
 
-# The XML_DTD tag can be used to specify an XML DTD,
-# which can be used by a validating XML parser to check the
-# syntax of the XML files.
+# The XML_DTD tag can be used to specify a XML DTD, which can be used by a
+# validating XML parser to check the syntax of the XML files.
+# This tag requires that the tag GENERATE_XML is set to YES.
 
 XML_DTD                =
 
-# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
-# dump the program listings (including syntax highlighting
-# and cross-referencing information) to the XML output. Note that
-# enabling this will significantly increase the size of the XML output.
+# If the XML_PROGRAMLISTING tag is set to YES doxygen will dump the program
+# listings (including syntax highlighting and cross-referencing information) to
+# the XML output. Note that enabling this will significantly increase the size
+# of the XML output.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_XML is set to YES.
 
 XML_PROGRAMLISTING     = YES
 
 #---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
+# Configuration options related to the DOCBOOK output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
-# generate an AutoGen Definitions (see autogen.sf.net) file
-# that captures the structure of the code including all
-# documentation. Note that this feature is still experimental
-# and incomplete at the moment.
+# If the GENERATE_DOCBOOK tag is set to YES doxygen will generate Docbook files
+# that can be used to generate PDF.
+# The default value is: NO.
+
+GENERATE_DOCBOOK       = NO
+
+# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
+# front of it.
+# The default directory is: docbook.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_OUTPUT         = docbook
+
+#---------------------------------------------------------------------------
+# Configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES doxygen will generate an AutoGen
+# Definitions (see http://autogen.sf.net) file that captures the structure of
+# the code including all documentation. Note that this feature is still
+# experimental and incomplete at the moment.
+# The default value is: NO.
 
 GENERATE_AUTOGEN_DEF   = NO
 
 #---------------------------------------------------------------------------
-# configuration options related to the Perl module output
+# Configuration options related to the Perl module output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_PERLMOD tag is set to YES Doxygen will
-# generate a Perl module file that captures the structure of
-# the code including all documentation. Note that this
-# feature is still experimental and incomplete at the
-# moment.
+# If the GENERATE_PERLMOD tag is set to YES doxygen will generate a Perl module
+# file that captures the structure of the code including all documentation.
+#
+# Note that this feature is still experimental and incomplete at the moment.
+# The default value is: NO.
 
 GENERATE_PERLMOD       = NO
 
-# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
-# the necessary Makefile rules, Perl scripts and LaTeX code to be able
-# to generate PDF and DVI output from the Perl module output.
+# If the PERLMOD_LATEX tag is set to YES doxygen will generate the necessary
+# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
+# output from the Perl module output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
 
 PERLMOD_LATEX          = NO
 
-# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
-# nicely formatted so it can be parsed by a human reader.
-# This is useful
-# if you want to understand what is going on.
-# On the other hand, if this
-# tag is set to NO the size of the Perl module output will be much smaller
-# and Perl will parse it just the same.
+# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be nicely
+# formatted so it can be parsed by a human reader. This is useful if you want to
+# understand what is going on. On the other hand, if this tag is set to NO the
+# size of the Perl module output will be much smaller and Perl will parse it
+# just the same.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
 
 PERLMOD_PRETTY         = YES
 
-# The names of the make variables in the generated doxyrules.make file
-# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
-# This is useful so different doxyrules.make files included by the same
-# Makefile don't overwrite each other's variables.
+# The names of the make variables in the generated doxyrules.make file are
+# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
+# so different doxyrules.make files included by the same Makefile don't
+# overwrite each other's variables.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
 
 PERLMOD_MAKEVAR_PREFIX =
 
@@ -1491,33 +1899,40 @@ PERLMOD_MAKEVAR_PREFIX =
 # Configuration options related to the preprocessor
 #---------------------------------------------------------------------------
 
-# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
-# evaluate all C-preprocessor directives found in the sources and include
-# files.
+# If the ENABLE_PREPROCESSING tag is set to YES doxygen will evaluate all
+# C-preprocessor directives found in the sources and include files.
+# The default value is: YES.
 
 ENABLE_PREPROCESSING   = YES
 
-# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
-# names in the source code. If set to NO (the default) only conditional
-# compilation will be performed. Macro expansion can be done in a controlled
-# way by setting EXPAND_ONLY_PREDEF to YES.
+# If the MACRO_EXPANSION tag is set to YES doxygen will expand all macro names
+# in the source code. If set to NO only conditional compilation will be
+# performed. Macro expansion can be done in a controlled way by setting
+# EXPAND_ONLY_PREDEF to YES.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 MACRO_EXPANSION        = YES
 
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
-# then the macro expansion is limited to the macros specified with the
-# PREDEFINED and EXPAND_AS_DEFINED tags.
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
+# the macro expansion is limited to the macros specified with the PREDEFINED and
+# EXPAND_AS_DEFINED tags.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 EXPAND_ONLY_PREDEF     = YES
 
-# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
-# pointed to by INCLUDE_PATH will be searched when a #include is found.
+# If the SEARCH_INCLUDES tag is set to YES the includes files in the
+# INCLUDE_PATH will be searched if a #include is found.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 SEARCH_INCLUDES        = YES
 
 # The INCLUDE_PATH tag can be used to specify one or more directories that
-# contain include files that are not input files but should be processed by
-# the preprocessor.
+# contain include files that are not input files but should be processed by the
+# preprocessor.
+# This tag requires that the tag SEARCH_INCLUDES is set to YES.
 
 INCLUDE_PATH           = @TOPSRC@/include \
                          @TOPSRC@/hw/include \
@@ -1527,77 +1942,92 @@ INCLUDE_PATH           = @TOPSRC@/include \
 
 # You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
 # patterns (like *.h and *.hpp) to filter out the header-files in the
-# directories. If left blank, the patterns specified with FILE_PATTERNS will
-# be used.
+# directories. If left blank, the patterns specified with FILE_PATTERNS will be
+# used.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 INCLUDE_FILE_PATTERNS  = *.h
 
-# The PREDEFINED tag can be used to specify one or more macro names that
-# are defined before the preprocessor is started (similar to the -D option of
-# gcc). The argument of the tag is a list of macros of the form: name
-# or name=definition (no spaces). If the definition and the = are
-# omitted =1 is assumed. To prevent a macro definition from being
-# undefined via #undef or recursively expanded use the := operator
-# instead of the = operator.
+# The PREDEFINED tag can be used to specify one or more macro names that are
+# defined before the preprocessor is started (similar to the -D option of e.g.
+# gcc). The argument of the tag is a list of macros of the form: name or
+# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
+# is assumed. To prevent a macro definition from being undefined via #undef or
+# recursively expanded use the := operator instead of the = operator.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 PREDEFINED             = "__attribute__(x)=" \
                          VISIBLE=
 
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
-# this tag can be used to specify a list of macro names that should be expanded.
-# The macro definition that is found in the sources will be used.
-# Use the PREDEFINED tag if you want to use a different macro definition that
-# overrules the definition found in the source code.
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
+# tag can be used to specify a list of macro names that should be expanded. The
+# macro definition that is found in the sources will be used. Use the PREDEFINED
+# tag if you want to use a different macro definition that overrules the
+# definition found in the source code.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 EXPAND_AS_DEFINED      = HAVE_FB_AUX_VGA_PLANES_VGA4 \
                          HAVE_FB_AUX_VGA_PLANES_CFB4 \
                          HAVE_FB_AUX_VGA_PLANES_CFB8
 
-# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
-# doxygen's preprocessor will remove all references to function-like macros
-# that are alone on a line, have an all uppercase name, and do not end with a
-# semicolon, because these will confuse the parser if not removed.
+# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
+# remove all refrences to function-like macros that are alone on a line, have an
+# all uppercase name, and do not end with a semicolon. Such function macros are
+# typically used for boiler-plate code, and will confuse the parser if not
+# removed.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 SKIP_FUNCTION_MACROS   = YES
 
 #---------------------------------------------------------------------------
-# Configuration::additions related to external references
+# Configuration options related to external references
 #---------------------------------------------------------------------------
 
-# The TAGFILES option can be used to specify one or more tagfiles. For each
-# tag file the location of the external documentation should be added. The
-# format of a tag file without this location is as follows:
-#
+# The TAGFILES tag can be used to specify one or more tag files. For each tag
+# file the location of the external documentation should be added. The format of
+# a tag file without this location is as follows:
 # TAGFILES = file1 file2 ...
 # Adding location for the tag files is done as follows:
-#
 # TAGFILES = file1=loc1 "file2 = loc2" ...
-# where "loc1" and "loc2" can be relative or absolute paths
-# or URLs. Note that each tag file must have a unique name (where the name does
-# NOT include the path). If a tag file is not located in the directory in which
-# doxygen is run, you must also specify the path to the tagfile here.
+# where loc1 and loc2 can be relative or absolute paths or URLs. See the
+# section "Linking to external documentation" for more information about the use
+# of tag files.
+# Note: Each tag file must have an unique name (where the name does NOT include
+# the path). If a tag file is not located in the directory in which doxygen is
+# run, you must also specify the path to the tagfile here.
 
 TAGFILES               =
 
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create
-# a tag file that is based on the input files it reads.
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
+# tag file that is based on the input files it reads. See section "Linking to
+# external documentation" for more information about the usage of tag files.
 
 GENERATE_TAGFILE       =
 
-# If the ALLEXTERNALS tag is set to YES all external classes will be listed
-# in the class index. If set to NO only the inherited external classes
-# will be listed.
+# If the ALLEXTERNALS tag is set to YES all external class will be listed in the
+# class index. If set to NO only the inherited external classes will be listed.
+# The default value is: NO.
 
 ALLEXTERNALS           = NO
 
-# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
-# in the modules index. If set to NO, only the current project's groups will
-# be listed.
+# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed in
+# the modules index. If set to NO, only the current project's groups will be
+# listed.
+# The default value is: YES.
 
 EXTERNAL_GROUPS        = YES
 
+# If the EXTERNAL_PAGES tag is set to YES all external pages will be listed in
+# the related pages index. If set to NO, only the current project's pages will
+# be listed.
+# The default value is: YES.
+
+EXTERNAL_PAGES         = YES
+
 # The PERL_PATH should be the absolute path and name of the perl script
-# interpreter (i.e. the result of `which perl').
+# interpreter (i.e. the result of 'which perl').
+# The default file (with absolute path) is: /usr/bin/perl.
 
 PERL_PATH              = /usr/bin/perl
 
@@ -1605,222 +2035,280 @@ PERL_PATH              = /usr/bin/perl
 # Configuration options related to the dot tool
 #---------------------------------------------------------------------------
 
-# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
-# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
-# or super classes. Setting the tag to NO turns the diagrams off. Note that
-# this option also works with HAVE_DOT disabled, but it is recommended to
-# install and use dot, since it yields more powerful graphs.
+# If the CLASS_DIAGRAMS tag is set to YES doxygen will generate a class diagram
+# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
+# NO turns the diagrams off. Note that this option also works with HAVE_DOT
+# disabled, but it is recommended to install and use dot, since it yields more
+# powerful graphs.
+# The default value is: YES.
 
 CLASS_DIAGRAMS         = YES
 
 # You can define message sequence charts within doxygen comments using the \msc
-# command. Doxygen will then run the mscgen tool (see
-# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the
+# command. Doxygen will then run the mscgen tool (see:
+# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
 # documentation. The MSCGEN_PATH tag allows you to specify the directory where
 # the mscgen tool resides. If left empty the tool is assumed to be found in the
 # default search path.
 
 MSCGEN_PATH            =
 
-# If set to YES, the inheritance and collaboration graphs will hide
-# inheritance and usage relations if the target is undocumented
-# or is not a class.
+# If set to YES, the inheritance and collaboration graphs will hide inheritance
+# and usage relations if the target is undocumented or is not a class.
+# The default value is: YES.
 
 HIDE_UNDOC_RELATIONS   = YES
 
 # If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
-# available from the path. This tool is part of Graphviz, a graph visualization
-# toolkit from AT&T and Lucent Bell Labs. The other options in this section
-# have no effect if this option is set to NO (the default)
+# available from the path. This tool is part of Graphviz (see:
+# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
+# Bell Labs. The other options in this section have no effect if this option is
+# set to NO
+# The default value is: NO.
 
 HAVE_DOT               = YES
 
-# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is
-# allowed to run in parallel. When set to 0 (the default) doxygen will
-# base this on the number of processors available in the system. You can set it
-# explicitly to a value larger than 0 to get control over the balance
-# between CPU load and processing speed.
+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
+# to run in parallel. When set to 0 doxygen will base this on the number of
+# processors available in the system. You can set it explicitly to a value
+# larger than 0 to get control over the balance between CPU load and processing
+# speed.
+# Minimum value: 0, maximum value: 32, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_NUM_THREADS        = 0
 
-# By default doxygen will use the Helvetica font for all dot files that
-# doxygen generates. When you want a differently looking font you can specify
-# the font name using DOT_FONTNAME. You need to make sure dot is able to find
-# the font, which can be done by putting it in a standard location or by setting
-# the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the
-# directory containing the font.
+# When you want a differently looking font n the dot files that doxygen
+# generates you can specify the font name using DOT_FONTNAME. You need to make
+# sure dot is able to find the font, which can be done by putting it in a
+# standard location or by setting the DOTFONTPATH environment variable or by
+# setting DOT_FONTPATH to the directory containing the font.
+# The default value is: Helvetica.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_FONTNAME           = Arial
 
-# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
-# The default size is 10pt.
+# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
+# dot graphs.
+# Minimum value: 4, maximum value: 24, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_FONTSIZE           = 10
 
-# By default doxygen will tell dot to use the Helvetica font.
-# If you specify a different font using DOT_FONTNAME you can use DOT_FONTPATH to
-# set the path where dot can find it.
+# By default doxygen will tell dot to use the default font as specified with
+# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
+# the path where dot can find it using this tag.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_FONTPATH           =
 
-# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for each documented class showing the direct and
-# indirect inheritance relations. Setting this tag to YES will force the
-# CLASS_DIAGRAMS tag to NO.
+# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
+# each documented class showing the direct and indirect inheritance relations.
+# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 CLASS_GRAPH            = YES
 
-# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for each documented class showing the direct and
-# indirect implementation dependencies (inheritance, containment, and
-# class references variables) of the class with other documented classes.
+# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
+# graph for each documented class showing the direct and indirect implementation
+# dependencies (inheritance, containment, and class references variables) of the
+# class with other documented classes.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 COLLABORATION_GRAPH    = YES
 
-# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for groups, showing the direct groups dependencies
+# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
+# groups, showing the direct groups dependencies.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 GROUP_GRAPHS           = NO
 
 # If the UML_LOOK tag is set to YES doxygen will generate inheritance and
 # collaboration diagrams in a style similar to the OMG's Unified Modeling
 # Language.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 UML_LOOK               = NO
 
-# If the UML_LOOK tag is enabled, the fields and methods are shown inside
-# the class node. If there are many fields or methods and many nodes the
-# graph may become too big to be useful. The UML_LIMIT_NUM_FIELDS
-# threshold limits the number of items for each type to make the size more
-# managable. Set this to 0 for no limit. Note that the threshold may be
-# exceeded by 50% before the limit is enforced.
+# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
+# class node. If there are many fields or methods and many nodes the graph may
+# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
+# number of items for each type to make the size more manageable. Set this to 0
+# for no limit. Note that the threshold may be exceeded by 50% before the limit
+# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
+# but if the number exceeds 15, the total amount of fields shown is limited to
+# 10.
+# Minimum value: 0, maximum value: 100, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 UML_LIMIT_NUM_FIELDS   = 10
 
-# If set to YES, the inheritance and collaboration graphs will show the
-# relations between templates and their instances.
+# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
+# collaboration graphs will show the relations between templates and their
+# instances.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 TEMPLATE_RELATIONS     = YES
 
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
-# tags are set to YES then doxygen will generate a graph for each documented
-# file showing the direct and indirect include dependencies of the file with
-# other documented files.
+# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
+# YES then doxygen will generate a graph for each documented file showing the
+# direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 INCLUDE_GRAPH          = NO
 
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
-# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
-# documented header file showing the documented files that directly or
-# indirectly include this file.
+# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
+# set to YES then doxygen will generate a graph for each documented file showing
+# the direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 INCLUDED_BY_GRAPH      = YES
 
-# If the CALL_GRAPH and HAVE_DOT options are set to YES then
-# doxygen will generate a call dependency graph for every global function
-# or class method. Note that enabling this option will significantly increase
-# the time of a run. So in most cases it will be better to enable call graphs
-# for selected functions only using the \callgraph command.
+# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable call graphs for selected
+# functions only using the \callgraph command.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 CALL_GRAPH             = NO
 
-# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then
-# doxygen will generate a caller dependency graph for every global function
-# or class method. Note that enabling this option will significantly increase
-# the time of a run. So in most cases it will be better to enable caller
-# graphs for selected functions only using the \callergraph command.
+# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable caller graphs for selected
+# functions only using the \callergraph command.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 CALLER_GRAPH           = NO
 
-# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
-# will generate a graphical hierarchy of all classes instead of a textual one.
+# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
+# hierarchy of all classes instead of a textual one.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 GRAPHICAL_HIERARCHY    = YES
 
-# If the DIRECTORY_GRAPH and HAVE_DOT tags are set to YES
-# then doxygen will show the dependencies a directory has on other directories
-# in a graphical way. The dependency relations are determined by the #include
-# relations between the files in the directories.
+# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
+# dependencies a directory has on other directories in a graphical way. The
+# dependency relations are determined by the #include relations between the
+# files in the directories.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DIRECTORY_GRAPH        = NO
 
 # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
-# generated by dot. Possible values are svg, png, jpg, or gif.
-# If left blank png will be used. If you choose svg you need to set
-# HTML_FILE_EXTENSION to xhtml in order to make the SVG files
-# visible in IE 9+ (other browsers do not have this requirement).
+# generated by dot.
+# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
+# to make the SVG files visible in IE 9+ (other browsers do not have this
+# requirement).
+# Possible values are: png, jpg, gif and svg.
+# The default value is: png.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_IMAGE_FORMAT       = svg
 
 # If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
 # enable generation of interactive SVG images that allow zooming and panning.
-# Note that this requires a modern browser other than Internet Explorer.
-# Tested and working are Firefox, Chrome, Safari, and Opera. For IE 9+ you
-# need to set HTML_FILE_EXTENSION to xhtml in order to make the SVG files
-# visible. Older versions of IE do not have SVG support.
+#
+# Note that this requires a modern browser other than Internet Explorer. Tested
+# and working are Firefox, Chrome, Safari, and Opera.
+# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
+# the SVG files visible. Older versions of IE do not have SVG support.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 INTERACTIVE_SVG        = NO
 
-# The tag DOT_PATH can be used to specify the path where the dot tool can be
+# The DOT_PATH tag can be used to specify the path where the dot tool can be
 # found. If left blank, it is assumed the dot tool can be found in the path.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_PATH               =
 
 # The DOTFILE_DIRS tag can be used to specify one or more directories that
-# contain dot files that are included in the documentation (see the
-# \dotfile command).
+# contain dot files that are included in the documentation (see the \dotfile
+# command).
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOTFILE_DIRS           = @TOPSRC@/tools/qfcc/doc/dot
 
 # The MSCFILE_DIRS tag can be used to specify one or more directories that
-# contain msc files that are included in the documentation (see the
-# \mscfile command).
+# contain msc files that are included in the documentation (see the \mscfile
+# command).
 
 MSCFILE_DIRS           =
 
-# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
-# nodes that will be shown in the graph. If the number of nodes in a graph
-# becomes larger than this value, doxygen will truncate the graph, which is
-# visualized by representing a node as a red box. Note that doxygen if the
-# number of direct children of the root node in a graph is already larger than
-# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note
-# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
+# that will be shown in the graph. If the number of nodes in a graph becomes
+# larger than this value, doxygen will truncate the graph, which is visualized
+# by representing a node as a red box. Note that doxygen if the number of direct
+# children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
+# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+# Minimum value: 0, maximum value: 10000, default value: 50.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_GRAPH_MAX_NODES    = 500
 
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
-# graphs generated by dot. A depth value of 3 means that only nodes reachable
-# from the root by following a path via at most 3 edges will be shown. Nodes
-# that lay further from the root node will be omitted. Note that setting this
-# option to 1 or 2 may greatly reduce the computation time needed for large
-# code bases. Also note that the size of a graph can be further restricted by
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
+# generated by dot. A depth value of 3 means that only nodes reachable from the
+# root by following a path via at most 3 edges will be shown. Nodes that lay
+# further from the root node will be omitted. Note that setting this option to 1
+# or 2 may greatly reduce the computation time needed for large code bases. Also
+# note that the size of a graph can be further restricted by
 # DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+# Minimum value: 0, maximum value: 1000, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 MAX_DOT_GRAPH_DEPTH    = 0
 
 # Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
-# background. This is disabled by default, because dot on Windows does not
-# seem to support this out of the box. Warning: Depending on the platform used,
-# enabling this option may lead to badly anti-aliased labels on the edges of
-# a graph (i.e. they become hard to read).
+# background. This is disabled by default, because dot on Windows does not seem
+# to support this out of the box.
+#
+# Warning: Depending on the platform used, enabling this option may lead to
+# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
+# read).
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_TRANSPARENT        = NO
 
 # Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
 # files in one run (i.e. multiple -o and -T options on the command line). This
-# makes dot run faster, but since only newer versions of dot (>1.8.10)
-# support this, this feature is disabled by default.
+# makes dot run faster, but since only newer versions of dot (>1.8.10) support
+# this, this feature is disabled by default.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_MULTI_TARGETS      = YES
 
-# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
-# generate a legend page explaining the meaning of the various boxes and
-# arrows in the dot generated graphs.
+# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
+# explaining the meaning of the various boxes and arrows in the dot generated
+# graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 GENERATE_LEGEND        = YES
 
-# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
-# remove the intermediate dot files that are used to generate
-# the various graphs.
+# If the DOT_CLEANUP tag is set to YES doxygen will remove the intermediate dot
+# files that are used to generate the various graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_CLEANUP            = YES

From 53d267c030326f7131b2d9ae39c8e5768ccdb80a Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 24 Nov 2013 13:03:20 +0900
Subject: [PATCH 0070/1519] Correct some doc comments.

---
 include/QF/quakefs.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/QF/quakefs.h b/include/QF/quakefs.h
index dad69fc23..ace4fd95a 100644
--- a/include/QF/quakefs.h
+++ b/include/QF/quakefs.h
@@ -137,7 +137,7 @@ void QFS_Gamedir (const char *gamedir);
 	The search will begin in the \a start vpath and end in the \a end vpath.
 	If \a start is null, the search will begin in the vpath specified by
 	qfs_vpaths (ie, the first directory in the \c Path attribute
-	(\ref dirconf). If \a end is null, the search will continue to the end
+	(\ref dirconf)). If \a end is null, the search will continue to the end
 	of the list of vpaths. If \a start and \a end are the same (and non-null),
 	then only the one vpath will be searched.
 
@@ -149,7 +149,7 @@ void QFS_Gamedir (const char *gamedir);
 
 	\param fname	The name of the file to be searched for.
 	\param start	The first vpath (gamedir) to search.
-	\param start	The last vpath (gamedir) to search.
+	\param end		The last vpath (gamedir) to search.
 	\return			Pointer to the findfile_t record indicating the location
 					of the file, or null if the file was not found.
 */

From e5148493dbe11d9df0c22e534c98371bcdcb32ba Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 24 Nov 2013 14:10:26 +0900
Subject: [PATCH 0071/1519] Prepend qfs_ to file_from_pak.

A little better name-spacing.
---
 include/QF/quakefs.h | 6 +++++-
 libs/util/quakefs.c  | 4 ++--
 qw/source/sv_user.c  | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/include/QF/quakefs.h b/include/QF/quakefs.h
index ace4fd95a..0f180f691 100644
--- a/include/QF/quakefs.h
+++ b/include/QF/quakefs.h
@@ -97,7 +97,7 @@ extern const char *qfs_userpath;
 
 	Set by QFS_FOpenFIle() and _QFS_FOpenFile().
 */
-extern int file_from_pak;
+extern int qfs_file_from_pak;
 
 /**	The size of the file found via QFS_FOpenFIle() or _QFS_FOpenFile().
 
@@ -147,6 +147,10 @@ void QFS_Gamedir (const char *gamedir);
 	\note	It is a fatal error for \a end to be non-null but not in the list
 			of vpaths.
 
+	\warning	The returned pointer is to a static instance of findfile_t and
+				thus will be overwritten on the next call to any of the search
+				functions (QFS_FindFile, QFS_FOpenFIle, _QFS_FOpenFile)
+
 	\param fname	The name of the file to be searched for.
 	\param start	The first vpath (gamedir) to search.
 	\param end		The last vpath (gamedir) to search.
diff --git a/libs/util/quakefs.c b/libs/util/quakefs.c
index 9b51e2d32..ce10e5445 100644
--- a/libs/util/quakefs.c
+++ b/libs/util/quakefs.c
@@ -1010,7 +1010,7 @@ QFS_CompressPath (const char *pth)
 	return path;
 }
 
-VISIBLE int file_from_pak; // global indicating file came from pack file ZOID
+VISIBLE int qfs_file_from_pak;
 
 /*
 	QFS_FOpenFile
@@ -1023,7 +1023,7 @@ static void
 open_file (int_findfile_t *found, QFile **gzfile, dstring_t *foundname,
 		   int zip)
 {
-	file_from_pak = found->ff.in_pak;
+	qfs_file_from_pak = found->ff.in_pak;
 	if (foundname) {
 		dstring_copystr (foundname, found->ff.realname);
 	}
diff --git a/qw/source/sv_user.c b/qw/source/sv_user.c
index 608b44480..3e3b1c4ce 100644
--- a/qw/source/sv_user.c
+++ b/qw/source/sv_user.c
@@ -764,7 +764,7 @@ SV_BeginDownload_f (void *unused)
 	if (!host_client->download
 		// ZOID: special check for maps, if it came from a pak file, don't
 		// allow download
-		|| (strncmp (name, "maps/", 5) == 0 && file_from_pak)) {
+		|| (strncmp (name, "maps/", 5) == 0 && qfs_file_from_pak)) {
 		if (host_client->download) {
 			Qclose (host_client->download);
 			host_client->download = NULL;

From 576c73cf7cd4e9b44d5806fac452a0539c917aa7 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 24 Nov 2013 15:18:42 +0900
Subject: [PATCH 0072/1519] Replace qfs_file_from_pak with qfs_foundfile.

This exposes the found name, vpath and in_pak status.
---
 include/QF/quakefs.h | 14 +++++++-------
 libs/util/quakefs.c  |  4 ++--
 qw/source/sv_user.c  |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/include/QF/quakefs.h b/include/QF/quakefs.h
index 0f180f691..9ee60c9df 100644
--- a/include/QF/quakefs.h
+++ b/include/QF/quakefs.h
@@ -88,20 +88,20 @@ extern gamedir_t *qfs_gamedir;
 typedef void gamedir_callback_t (int phase);
 
 /**	Base of the QFS user directory tree. The QFS functions, except for
-	QFS_FOpenFIle() and _QFS_FOpenFile(),  will never access a file outside of
+	QFS_FOpenFile() and _QFS_FOpenFile(),  will never access a file outside of
 	this tree. Set via the \c fs_userpath directory.
 */
 extern const char *qfs_userpath;
 
-/**	Indicates the found file came from a pak file.
+/**	Gives information about the last file opened by the FOpenFile functions.
 
-	Set by QFS_FOpenFIle() and _QFS_FOpenFile().
+	Set by QFS_FOpenFile() and _QFS_FOpenFile().
 */
-extern int qfs_file_from_pak;
+extern findfile_t qfs_foundfile;
 
-/**	The size of the file found via QFS_FOpenFIle() or _QFS_FOpenFile().
+/**	The size of the file found via QFS_FOpenFile() or _QFS_FOpenFile().
 
-	Set by QFS_FOpenFIle() and _QFS_FOpenFile().
+	Set by QFS_FOpenFile() and _QFS_FOpenFile().
 */
 extern int qfs_filesize;
 
@@ -149,7 +149,7 @@ void QFS_Gamedir (const char *gamedir);
 
 	\warning	The returned pointer is to a static instance of findfile_t and
 				thus will be overwritten on the next call to any of the search
-				functions (QFS_FindFile, QFS_FOpenFIle, _QFS_FOpenFile)
+				functions (QFS_FindFile, QFS_FOpenFile, _QFS_FOpenFile)
 
 	\param fname	The name of the file to be searched for.
 	\param start	The first vpath (gamedir) to search.
diff --git a/libs/util/quakefs.c b/libs/util/quakefs.c
index ce10e5445..0c14ae6a5 100644
--- a/libs/util/quakefs.c
+++ b/libs/util/quakefs.c
@@ -1010,7 +1010,7 @@ QFS_CompressPath (const char *pth)
 	return path;
 }
 
-VISIBLE int qfs_file_from_pak;
+VISIBLE findfile_t qfs_foundfile;
 
 /*
 	QFS_FOpenFile
@@ -1023,7 +1023,7 @@ static void
 open_file (int_findfile_t *found, QFile **gzfile, dstring_t *foundname,
 		   int zip)
 {
-	qfs_file_from_pak = found->ff.in_pak;
+	qfs_foundfile = found->ff;
 	if (foundname) {
 		dstring_copystr (foundname, found->ff.realname);
 	}
diff --git a/qw/source/sv_user.c b/qw/source/sv_user.c
index 3e3b1c4ce..95f8213ce 100644
--- a/qw/source/sv_user.c
+++ b/qw/source/sv_user.c
@@ -764,7 +764,7 @@ SV_BeginDownload_f (void *unused)
 	if (!host_client->download
 		// ZOID: special check for maps, if it came from a pak file, don't
 		// allow download
-		|| (strncmp (name, "maps/", 5) == 0 && qfs_file_from_pak)) {
+		|| (strncmp (name, "maps/", 5) == 0 && qfs_foundfile.in_pak)) {
 		if (host_client->download) {
 			Qclose (host_client->download);
 			host_client->download = NULL;

From 25a060f369698adecfe01579a495e4b23cb8042d Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 24 Nov 2013 22:45:42 +0900
Subject: [PATCH 0073/1519] Remove the foundname param from _QFS_FOpenFile.

It's now obsolete with qfs_foundfile.
---
 include/QF/quakefs.h          |  4 +---
 libs/audio/renderer/snd_mem.c |  9 +++------
 libs/util/quakefs.c           | 13 ++++---------
 qw/source/sv_user.c           | 25 +++++++++++--------------
 4 files changed, 19 insertions(+), 32 deletions(-)

diff --git a/include/QF/quakefs.h b/include/QF/quakefs.h
index 9ee60c9df..dee718373 100644
--- a/include/QF/quakefs.h
+++ b/include/QF/quakefs.h
@@ -217,7 +217,6 @@ void QFS_WriteFile (const char *filename, const void *data, int len);
 
 	\param filename	The name of the file to open.
 	\param gzfile	Address of file handle pointer.
-	\param foundname If not NULL, will be set to the real name of the file.
 	\param zip		If true and the file has been compressed with gzip, the
 					file will be opened such that it decompresses on the fly.
 					Otherwise, the file will be read as-is.
@@ -227,8 +226,7 @@ void QFS_WriteFile (const char *filename, const void *data, int len);
 					occurs while opening the file, this will be -1 and
 					\a *gzfile will be set to NULL.
 */
-int _QFS_FOpenFile (const char *filename, QFile **gzfile,
-					struct dstring_s *foundname, int zip);
+int _QFS_FOpenFile (const char *filename, QFile **gzfile, int zip);
 
 /**	Open a file for reading.
 
diff --git a/libs/audio/renderer/snd_mem.c b/libs/audio/renderer/snd_mem.c
index dd8b09b0e..13c460cf7 100644
--- a/libs/audio/renderer/snd_mem.c
+++ b/libs/audio/renderer/snd_mem.c
@@ -293,7 +293,6 @@ SND_StreamAdvance (sfxbuffer_t *buffer, unsigned int count)
 int
 SND_Load (sfx_t *sfx)
 {
-	dstring_t  *foundname = dstring_new ();
 	char       *realname;
 	char        buf[4];
 	QFile      *file;
@@ -303,16 +302,14 @@ SND_Load (sfx_t *sfx)
 	sfx->close = snd_noop;
 	sfx->open = snd_open_fail;
 
-	_QFS_FOpenFile (sfx->name, &file, foundname, 1);
+	QFS_FOpenFile (sfx->name, &file);
 	if (!file) {
 		Sys_Printf ("Couldn't load %s\n", sfx->name);
-		dstring_delete (foundname);
 		return -1;
 	}
 	sfx->open = snd_open;
-	if (!strequal (foundname->str, sfx->name)) {
-		realname = foundname->str;
-		free (foundname);
+	if (!strequal (qfs_foundfile.realname, sfx->name)) {
+		realname = strdup (qfs_foundfile.realname);
 	} else {
 		realname = (char *) sfx->name;	// won't free if realname == sfx->name
 	}
diff --git a/libs/util/quakefs.c b/libs/util/quakefs.c
index 0c14ae6a5..3e4076c85 100644
--- a/libs/util/quakefs.c
+++ b/libs/util/quakefs.c
@@ -1020,13 +1020,9 @@ VISIBLE findfile_t qfs_foundfile;
 */
 
 static void
-open_file (int_findfile_t *found, QFile **gzfile, dstring_t *foundname,
-		   int zip)
+open_file (int_findfile_t *found, QFile **gzfile, int zip)
 {
 	qfs_foundfile = found->ff;
-	if (foundname) {
-		dstring_copystr (foundname, found->ff.realname);
-	}
 	if (found->ff.in_pak) {
 		*gzfile = qfs_openread (found->pack->filename,
 								found->packfile->filepos,
@@ -1037,8 +1033,7 @@ open_file (int_findfile_t *found, QFile **gzfile, dstring_t *foundname,
 }
 
 VISIBLE int
-_QFS_FOpenFile (const char *filename, QFile **gzfile,
-				dstring_t *foundname, int zip)
+_QFS_FOpenFile (const char *filename, QFile **gzfile, int zip)
 {
 	int_findfile_t *found;
 	char       *path;
@@ -1088,7 +1083,7 @@ _QFS_FOpenFile (const char *filename, QFile **gzfile,
 	found = qfs_findfile (fnames, 0, 0);
 
 	if (found) {
-		open_file (found, gzfile, foundname, zip_flags[found->fname_index]);
+		open_file (found, gzfile, zip_flags[found->fname_index]);
 		free(path);
 		return qfs_filesize;
 	}
@@ -1104,7 +1099,7 @@ error:
 VISIBLE int
 QFS_FOpenFile (const char *filename, QFile **gzfile)
 {
-	return _QFS_FOpenFile (filename, gzfile, 0, 1);
+	return _QFS_FOpenFile (filename, gzfile, 1);
 }
 
 cache_user_t *loadcache;
diff --git a/qw/source/sv_user.c b/qw/source/sv_user.c
index 95f8213ce..5a063b6b7 100644
--- a/qw/source/sv_user.c
+++ b/qw/source/sv_user.c
@@ -717,7 +717,6 @@ static void
 SV_BeginDownload_f (void *unused)
 {
 	const char *name;
-	dstring_t  *realname;
 	int			http, size, zip;
 	QFile	   *file;
 
@@ -754,8 +753,7 @@ SV_BeginDownload_f (void *unused)
 	http = sv_http_url_base->string[0]
 			&& strchr (Info_ValueForKey (host_client->userinfo, "*cap"), 'h');
 
-	realname = dstring_newstr ();
-	size = _QFS_FOpenFile (name, &file, realname, !zip);
+	size = _QFS_FOpenFile (name, &file, !zip);
 
 	host_client->download = file;
 	host_client->downloadsize = size;
@@ -774,41 +772,40 @@ SV_BeginDownload_f (void *unused)
 		MSG_ReliableWrite_Begin (&host_client->backbuf, svc_download, 4);
 		MSG_ReliableWrite_Short (&host_client->backbuf, DL_NOFILE);
 		MSG_ReliableWrite_Byte (&host_client->backbuf, 0);
-		dstring_delete (realname);
 		return;
 	}
 
 	if (http) {
 		int         size;
-		int         ren = zip && strcmp (realname->str, name);
+		int         ren = zip && strcmp (qfs_foundfile.realname, name);
 		SV_Printf ("http redirect: %s/%s\n", sv_http_url_base->string,
-				   realname->str);
-		size = ren ? strlen (realname->str) * 2 : strlen (name);
+				   qfs_foundfile.realname);
+		size = ren ? strlen (qfs_foundfile.realname) * 2 : strlen (name);
 		size += strlen (sv_http_url_base->string) + 7;
 		MSG_ReliableWrite_Begin (&host_client->backbuf, svc_download, size);
 		MSG_ReliableWrite_Short (&host_client->backbuf, DL_HTTP);
 		MSG_ReliableWrite_Byte (&host_client->backbuf, 0);
 		MSG_ReliableWrite_String (&host_client->backbuf,
 								  va ("%s/%s", sv_http_url_base->string,
-									  ren ? realname->str : name));
+									  ren ? qfs_foundfile.realname : name));
 		MSG_ReliableWrite_String (&host_client->backbuf,
-								  ren ? realname->str : "");
+								  ren ? qfs_foundfile.realname : "");
 		if (host_client->download) {
 			Qclose (host_client->download);
 			host_client->download = NULL;
 		}
 	} else {
-		if (zip && strcmp (realname->str, name)) {
-			SV_Printf ("download renamed to %s\n", realname->str);
+		if (zip && strcmp (qfs_foundfile.realname, name)) {
+			SV_Printf ("download renamed to %s\n", qfs_foundfile.realname);
 			MSG_ReliableWrite_Begin (&host_client->backbuf, svc_download,
-									 strlen (realname->str) + 5);
+									 strlen (qfs_foundfile.realname) + 5);
 			MSG_ReliableWrite_Short (&host_client->backbuf, DL_RENAME);
 			MSG_ReliableWrite_Byte (&host_client->backbuf, 0);
-			MSG_ReliableWrite_String (&host_client->backbuf, realname->str);
+			MSG_ReliableWrite_String (&host_client->backbuf,
+									  qfs_foundfile.realname);
 			MSG_Reliable_FinishWrite (&host_client->backbuf);
 		}
 	}
-	dstring_delete (realname);
 
 	SV_NextDownload_f (0);
 	SV_Printf ("Downloading %s to %s\n", name, host_client->name);

From a56147727412f4818ff3fdc3e75de20122a9ab5f Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 23 Jan 2014 08:57:54 +0900
Subject: [PATCH 0074/1519] Nuke QFS_LoadStackFile().

It was used in only one place and is really not necessary (these days,
anyway).
---
 include/QF/quakefs.h |  8 --------
 libs/util/quakefs.c  | 13 -------------
 qw/source/sv_init.c  |  4 ++--
 3 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/include/QF/quakefs.h b/include/QF/quakefs.h
index dee718373..0a2c63a89 100644
--- a/include/QF/quakefs.h
+++ b/include/QF/quakefs.h
@@ -255,14 +255,6 @@ int QFS_FOpenFile (const char *filename, QFile **gzfile);
 */
 byte *QFS_LoadFile (const char *path, int usehunk);
 
-/** Load a file into memeory.
-
-	This is a wrapper for QFS_LoadFile().
-
-	\deprecated This should go away soon.
-*/
-byte *QFS_LoadStackFile (const char *path, void *buffer, int bufsize);
-
 /** Load a file into memeory.
 
 	The file is loaded into memory allocated from the hunk.
diff --git a/libs/util/quakefs.c b/libs/util/quakefs.c
index 3e4076c85..5ce6f6ff7 100644
--- a/libs/util/quakefs.c
+++ b/libs/util/quakefs.c
@@ -1169,19 +1169,6 @@ QFS_LoadCacheFile (const char *path, struct cache_user_s *cu)
 	QFS_LoadFile (path, 3);
 }
 
-// uses temp hunk if larger than bufsize
-VISIBLE byte *
-QFS_LoadStackFile (const char *path, void *buffer, int bufsize)
-{
-	byte       *buf;
-
-	loadbuf = (byte *) buffer;
-	loadsize = bufsize;
-	buf = QFS_LoadFile (path, 4);
-
-	return buf;
-}
-
 /*
 	qfs_load_pakfile
 
diff --git a/qw/source/sv_init.c b/qw/source/sv_init.c
index d39bc619d..04e4f860c 100644
--- a/qw/source/sv_init.c
+++ b/qw/source/sv_init.c
@@ -285,15 +285,15 @@ SV_CalcPHS (void)
 static unsigned int
 SV_CheckModel (const char *mdl)
 {
-	byte        stackbuf[1024];			// avoid dirtying the cache heap
 	byte       *buf;
 	unsigned short crc = 0;
 
 //	int len;
 
-	buf = (byte *) QFS_LoadStackFile (mdl, stackbuf, sizeof (stackbuf));
+	buf = (byte *) QFS_LoadFile (mdl, 0);
 	if (buf) {
 		crc = CRC_Block (buf, qfs_filesize);
+		free (buf);
 	} else {
 		SV_Printf ("WARNING: cannot generate checksum for %s\n", mdl);
 	}

From 83c47aacefefe01d70f16296cd4eaae33c37aee1 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 23 Jan 2014 09:01:55 +0900
Subject: [PATCH 0075/1519] Remove the stack loading from QFS_LoadFile.

---
 libs/util/quakefs.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/libs/util/quakefs.c b/libs/util/quakefs.c
index 5ce6f6ff7..f48797a67 100644
--- a/libs/util/quakefs.c
+++ b/libs/util/quakefs.c
@@ -1103,8 +1103,6 @@ QFS_FOpenFile (const char *filename, QFile **gzfile)
 }
 
 cache_user_t *loadcache;
-byte       *loadbuf;
-int         loadsize;
 
 /*
 	QFS_LoadFile
@@ -1136,12 +1134,7 @@ QFS_LoadFile (const char *path, int usehunk)
 		buf = calloc (1, len + 1);
 	else if (usehunk == 3)
 		buf = Cache_Alloc (loadcache, len + 1, base);
-	else if (usehunk == 4) {
-		if (len + 1 > loadsize)
-			buf = Hunk_TempAlloc (len + 1);
-		else
-			buf = loadbuf;
-	} else
+	else
 		Sys_Error ("QFS_LoadFile: bad usehunk");
 
 	if (!buf)

From 328b997843a1fbce414259fc19a41c77461217fa Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 23 Jan 2014 09:16:05 +0900
Subject: [PATCH 0076/1519] Save the vpath in the model.

This will be used for restricting searches for auxiliary model files.
---
 include/QF/model.h  | 1 +
 libs/models/model.c | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/QF/model.h b/include/QF/model.h
index ac08414f5..b4d7791cd 100644
--- a/include/QF/model.h
+++ b/include/QF/model.h
@@ -350,6 +350,7 @@ typedef enum {mod_brush, mod_sprite, mod_alias, mod_iqm} modtype_t;
 
 typedef struct model_s {
 	char		 name[MAX_QPATH];
+	const struct vpath_s *vpath;// virtual path where this model was found
 	qboolean	 needload;		// bmodels and sprites don't cache normally
 	aliashdr_t  *aliashdr;		// if not null, alias model is not cached
 	qboolean	 hasfullbrights;
diff --git a/libs/models/model.c b/libs/models/model.c
index f9958f212..cd27be931 100644
--- a/libs/models/model.c
+++ b/libs/models/model.c
@@ -178,14 +178,13 @@ Mod_RealLoadModel (model_t *mod, qboolean crash, cache_allocator_t allocator)
 		return NULL;
 	}
 
-	// allocate a new model
 	if (loadname)
 		free (loadname);
 	loadname = QFS_FileBase (mod->name);
-
 	loadmodel = mod;
 
 	// fill it in
+	mod->vpath = qfs_foundfile.vpath;
 	mod->fullbright = 0;
 	mod->shadow_alpha = 255;
 	mod->min_light = 0.0;

From 3efb0c538fffe77c56a87e3bb15254d450f3e6b3 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 23 Jan 2014 11:57:57 +0900
Subject: [PATCH 0077/1519] Separate file search from loading.

QFS_LoadFile (and its wrappers) now  take a file handle rather than a
path. This will make vpath usage a little cleaner to implement.
---
 include/QF/quakefs.h                      | 28 +++++---------
 libs/audio/cd_file.c                      |  6 +--
 libs/audio/renderer/flac.c                |  4 +-
 libs/audio/renderer/midi.c                |  2 +-
 libs/audio/renderer/snd_mem.c             |  2 +-
 libs/audio/renderer/vorbis.c              |  4 +-
 libs/audio/renderer/wav.c                 |  4 +-
 libs/console/menu.c                       |  5 ++-
 libs/gamecode/pr_load.c                   |  4 +-
 libs/gib/gib_builtin.c                    |  2 +-
 libs/gib/gib_init.c                       |  2 +-
 libs/image/image.c                        |  8 ++--
 libs/models/alias/gl_mesh.c               |  2 +-
 libs/models/brush/gl_model_brush.c        |  2 +-
 libs/models/model.c                       |  2 +-
 libs/models/skin.c                        |  2 +-
 libs/ruamoko/rua_qfs.c                    |  4 +-
 libs/util/cmd.c                           |  4 +-
 libs/util/quakefs.c                       | 47 ++++++++++++-----------
 libs/util/wad.c                           |  2 +-
 libs/video/renderer/gl/gl_draw.c          |  2 +-
 libs/video/renderer/gl/gl_dyn_part.c      |  2 +-
 libs/video/renderer/gl/vid_common_gl.c    |  2 +-
 libs/video/renderer/glsl/glsl_draw.c      |  4 +-
 libs/video/renderer/glsl/glsl_particles.c |  2 +-
 libs/video/renderer/sw/draw.c             |  2 +-
 libs/video/renderer/sw/sw_rpart.c         |  2 +-
 libs/video/renderer/sw32/draw.c           |  2 +-
 libs/video/renderer/sw32/sw32_rpart.c     |  2 +-
 nq/source/cl_demo.c                       |  2 +-
 nq/source/cl_main.c                       |  4 +-
 nq/source/cl_parse.c                      |  4 +-
 nq/source/game.c                          |  2 +-
 nq/source/host.c                          |  2 +-
 nq/source/host_cmd.c                      |  2 +-
 nq/source/sv_main.c                       |  6 +--
 qw/source/cl_demo.c                       |  4 +-
 qw/source/cl_main.c                       |  6 +--
 qw/source/cl_parse.c                      |  4 +-
 qw/source/game.c                          |  2 +-
 qw/source/locs.c                          |  2 +-
 qw/source/map_cfg.c                       |  2 +-
 qw/source/sv_ccmds.c                      |  2 +-
 qw/source/sv_init.c                       |  8 ++--
 qw/source/sv_pr_cpqw.c                    |  2 +-
 qw/source/sv_user.c                       |  6 +--
 tools/qwaq/qwaq-bi.c                      |  4 +-
 47 files changed, 108 insertions(+), 112 deletions(-)

diff --git a/include/QF/quakefs.h b/include/QF/quakefs.h
index 0a2c63a89..675be7731 100644
--- a/include/QF/quakefs.h
+++ b/include/QF/quakefs.h
@@ -216,17 +216,12 @@ void QFS_WriteFile (const char *filename, const void *data, int len);
 	substitution.
 
 	\param filename	The name of the file to open.
-	\param gzfile	Address of file handle pointer.
 	\param zip		If true and the file has been compressed with gzip, the
 					file will be opened such that it decompresses on the fly.
 					Otherwise, the file will be read as-is.
-	\return			The amount of bytes that can be read from the file handle.
-					This will be either the files true size if \a zip is true,
-					or the compressed size of \a zip is false. If an error
-					occurs while opening the file, this will be -1 and
-					\a *gzfile will be set to NULL.
+	\return			The file handle or NULL if there is an error.
 */
-int _QFS_FOpenFile (const char *filename, QFile **gzfile, int zip);
+QFile *_QFS_FOpenFile (const char *filename, int zip);
 
 /**	Open a file for reading.
 
@@ -235,31 +230,28 @@ int _QFS_FOpenFile (const char *filename, QFile **gzfile, int zip);
 	_QFS_FOpenFile() for more details.
 
 	\param filename	The name of the file to open.
-	\param gzfile	Address of file handle pointer.
-	\return			The amount of bytes that can be read from the file handle.
-					If an error occurs while opening the file, this will be
-					-1 and \a *gzfile will be set to NULL.
+	\return			The file handle pointer, or NULL if there is an error.
 */
-int QFS_FOpenFile (const char *filename, QFile **gzfile);
+QFile *QFS_FOpenFile (const char *filename);
 
 /**	Load a file into memory.
 
-	This is a convenience wrapper for QFS_FOpenFile(). The file will be loaded
-	in memory allocated from the location inicated by usehunk.
+	The file will be loaded into memory allocated from the location indicated
+	by \a usehunk.
 
-	\param path		The name of the file to load.
+	\param file		The handle of the file to load.
 	\param usehunk	The location from which to allocate memory for the file's
 					data. Use 0.
 	\return			Pointer to the file's data, or NULL on error.
 	\todo remove \a usehunk
 */
-byte *QFS_LoadFile (const char *path, int usehunk);
+byte *QFS_LoadFile (QFile *file, int usehunk);
 
 /** Load a file into memeory.
 
 	The file is loaded into memory allocated from the hunk.
 */
-byte *QFS_LoadHunkFile (const char *path);
+byte *QFS_LoadHunkFile (QFile *file);
 
 /** Load a file into memeory.
 
@@ -267,7 +259,7 @@ byte *QFS_LoadHunkFile (const char *path);
 
 	\deprecated This should go away soon.
 */
-void QFS_LoadCacheFile (const char *path, struct cache_user_s *cu);
+void QFS_LoadCacheFile (QFile *file, struct cache_user_s *cu);
 
 /**	Rename a file.
 
diff --git a/libs/audio/cd_file.c b/libs/audio/cd_file.c
index cd5a77094..ce0f2b94f 100644
--- a/libs/audio/cd_file.c
+++ b/libs/audio/cd_file.c
@@ -143,7 +143,7 @@ Load_Tracklist (void)
 {
 	QFile	*oggfile = NULL;
 	char	*buffile = NULL;
-	int		 size = -1;
+	int		 size;
 
 	/* kill off the old tracklist, and make sure we're not playing anything */
 	I_OGGMus_Shutdown ();
@@ -155,8 +155,8 @@ Load_Tracklist (void)
 		return -1;		// bail if we don't have a valid filename
 	}
 
-	size = QFS_FOpenFile (mus_ogglist->string, &oggfile);
-	if (size < 0) {
+	oggfile = QFS_FOpenFile (mus_ogglist->string);
+	if (!oggfile) {
 		Sys_Printf ("Mus_OggInit: open of file \"%s\" failed\n",
 			mus_ogglist->string);
 		return -1;
diff --git a/libs/audio/renderer/flac.c b/libs/audio/renderer/flac.c
index 665c68b3e..be7962522 100644
--- a/libs/audio/renderer/flac.c
+++ b/libs/audio/renderer/flac.c
@@ -315,7 +315,7 @@ flac_callback_load (void *object, cache_allocator_t allocator)
 
 	sfxblock_t *block = (sfxblock_t *) object;
 
-	QFS_FOpenFile (block->file, &file);
+	file = QFS_FOpenFile (block->file);
 	if (!file)
 		return; //FIXME Sys_Error?
 
@@ -374,7 +374,7 @@ flac_stream_open (sfx_t *sfx)
 	QFile      *file;
 	void       *f;
 
-	QFS_FOpenFile (stream->file, &file);
+	file = QFS_FOpenFile (stream->file);
 	if (!file)
 		return 0;
 
diff --git a/libs/audio/renderer/midi.c b/libs/audio/renderer/midi.c
index 4a32b9f98..86898da65 100644
--- a/libs/audio/renderer/midi.c
+++ b/libs/audio/renderer/midi.c
@@ -148,7 +148,7 @@ midi_stream_open (sfx_t *sfx)
 	unsigned long int local_buffer_size;
 	midi_file_t *mf;
 
-	QFS_FOpenFile (stream->file, &file);
+	file = QFS_FOpenFile (stream->file);
 
 	local_buffer_size = Qfilesize (file);
 
diff --git a/libs/audio/renderer/snd_mem.c b/libs/audio/renderer/snd_mem.c
index 13c460cf7..154618899 100644
--- a/libs/audio/renderer/snd_mem.c
+++ b/libs/audio/renderer/snd_mem.c
@@ -302,7 +302,7 @@ SND_Load (sfx_t *sfx)
 	sfx->close = snd_noop;
 	sfx->open = snd_open_fail;
 
-	QFS_FOpenFile (sfx->name, &file);
+	file = QFS_FOpenFile (sfx->name);
 	if (!file) {
 		Sys_Printf ("Couldn't load %s\n", sfx->name);
 		return -1;
diff --git a/libs/audio/renderer/vorbis.c b/libs/audio/renderer/vorbis.c
index d323bdee4..fd14ec965 100644
--- a/libs/audio/renderer/vorbis.c
+++ b/libs/audio/renderer/vorbis.c
@@ -196,7 +196,7 @@ vorbis_callback_load (void *object, cache_allocator_t allocator)
 
 	sfxblock_t *block = (sfxblock_t *) object;
 
-	QFS_FOpenFile (block->file, &file);
+	file = QFS_FOpenFile (block->file);
 	if (!file)
 		return; //FIXME Sys_Error?
 
@@ -260,7 +260,7 @@ vorbis_stream_open (sfx_t *sfx)
 	QFile      *file;
 	vorbis_file_t *f;
 
-	QFS_FOpenFile (stream->file, &file);
+	file = QFS_FOpenFile (stream->file);
 	if (!file)
 		return 0;
 
diff --git a/libs/audio/renderer/wav.c b/libs/audio/renderer/wav.c
index 756b4566e..b3d59697a 100644
--- a/libs/audio/renderer/wav.c
+++ b/libs/audio/renderer/wav.c
@@ -67,7 +67,7 @@ wav_callback_load (void *object, cache_allocator_t allocator)
 	sfxbuffer_t *buffer;
 	wavinfo_t  *info = &block->wavinfo;
 
-	QFS_FOpenFile (name, &file);
+	file = QFS_FOpenFile (name);
 	if (!file)
 		return; //FIXME Sys_Error?
 
@@ -152,7 +152,7 @@ wav_stream_open (sfx_t *sfx)
 	QFile      *file;
 	wav_file_t *wf;
 
-	QFS_FOpenFile (stream->file, &file);
+	file = QFS_FOpenFile (stream->file);
 	if (!file)
 		return 0;
 
diff --git a/libs/console/menu.c b/libs/console/menu.c
index c055986d6..48df52b7d 100644
--- a/libs/console/menu.c
+++ b/libs/console/menu.c
@@ -512,7 +512,7 @@ menu_free_progs_mem (progs_t *pr, void *mem)
 static void *
 menu_load_file (progs_t *pr, const char *path)
 {
-	return QFS_LoadFile (path, 0);
+	return QFS_LoadFile (QFS_FOpenFile (path), 0);
 }
 
 static builtin_t builtins[] = {
@@ -615,7 +615,8 @@ Menu_Load (void)
 	top_menu = 0;
 
 	menu_pr_state.progs = 0;
-	if ((size = QFS_FOpenFile (menu_pr_state.progs_name, &file)) != -1) {
+	if ((file = QFS_FOpenFile (menu_pr_state.progs_name))) {
+		size = Qfilesize (file);
 		PR_LoadProgsFile (&menu_pr_state, file, size, 0, 1024 * 1024);
 		Qclose (file);
 
diff --git a/libs/gamecode/pr_load.c b/libs/gamecode/pr_load.c
index b32cf71c3..b9a6df13a 100644
--- a/libs/gamecode/pr_load.c
+++ b/libs/gamecode/pr_load.c
@@ -83,7 +83,7 @@ file_error (progs_t *pr, const char *path)
 static void *
 load_file (progs_t *pr, const char *path)
 {
-	return QFS_LoadHunkFile (path);
+	return QFS_LoadHunkFile (QFS_FOpenFile (path));
 }
 
 static void *
@@ -382,7 +382,7 @@ VISIBLE void
 PR_LoadProgs (progs_t *pr, const char *progsname, int max_edicts, int zone)
 {
 	QFile      *file;
-	QFS_FOpenFile (progsname, &file);
+	file = QFS_FOpenFile (progsname);
 
 	pr->progs_name = progsname;
 	if (file) {
diff --git a/libs/gib/gib_builtin.c b/libs/gib/gib_builtin.c
index 15352e534..c3ba2910a 100644
--- a/libs/gib/gib_builtin.c
+++ b/libs/gib/gib_builtin.c
@@ -792,7 +792,7 @@ GIB_File_Read_f (void)
 	if (!(ret = GIB_Return (0)))
 		return;
 	path = GIB_Argv (1);
-	QFS_FOpenFile (path, &file);
+	file = QFS_FOpenFile (path);
 	if (file) {
 		len = Qfilesize (file);
 		ret->size = len + 1;
diff --git a/libs/gib/gib_init.c b/libs/gib/gib_init.c
index 1b74e5f61..b689e141e 100644
--- a/libs/gib/gib_init.c
+++ b/libs/gib/gib_init.c
@@ -70,7 +70,7 @@ GIB_Exec_Override_f (void)
 	}
 
 	mark = Hunk_LowMark ();
-	f = (char *) QFS_LoadHunkFile (Cmd_Argv (1));
+	f = (char *) QFS_LoadHunkFile (QFS_FOpenFile (Cmd_Argv (1)));
 	if (!f) {
 		Sys_Printf ("couldn't exec %s\n", Cmd_Argv (1));
 		return;
diff --git a/libs/image/image.c b/libs/image/image.c
index 53f4166a7..7df5d9bb2 100644
--- a/libs/image/image.c
+++ b/libs/image/image.c
@@ -62,7 +62,7 @@ LoadImage (const char *imageFile)
 
 	// Check for a .png
 	dstring_replace (tmpFile, tmp, tmpFile->size, ".png", 5);
-	QFS_FOpenFile (tmpFile->str, &fp);
+	fp = QFS_FOpenFile (tmpFile->str);
 	if (fp) {
 		tex = LoadPNG (fp);
 		Qclose (fp);
@@ -72,7 +72,7 @@ LoadImage (const char *imageFile)
 
 	// Check for a .tga
 	dstring_replace (tmpFile, tmp, tmpFile->size, ".tga", 5);
-	QFS_FOpenFile (tmpFile->str, &fp);
+	fp = QFS_FOpenFile (tmpFile->str);
 	if (fp) {
 		tex = LoadTGA (fp);
 		Qclose (fp);
@@ -83,7 +83,7 @@ LoadImage (const char *imageFile)
 /*
 	// Check for a .jpg
 	dstring_replace (tmpFile, tmp, tmpFile->size, ".jpg", 5);
-	QFS_FOpenFile (tmpFile->str, &fp);
+	fp = QFS_FOpenFile (tmpFile->str);
 	if (fp) {
 		tex = LoadJPG (fp);
 		Qclose (fp);
@@ -94,7 +94,7 @@ LoadImage (const char *imageFile)
 
 	// Check for a .pcx
 	dstring_replace (tmpFile, tmp, tmpFile->size, ".pcx", 5);
-	QFS_FOpenFile (tmpFile->str, &fp);
+	fp = QFS_FOpenFile (tmpFile->str);
 	if (fp) {
 		tex = LoadPCX (fp, 1, NULL); // Convert, some users don't grok paletted
 		Qclose (fp);
diff --git a/libs/models/alias/gl_mesh.c b/libs/models/alias/gl_mesh.c
index 9ddca7d59..22498ddea 100644
--- a/libs/models/alias/gl_mesh.c
+++ b/libs/models/alias/gl_mesh.c
@@ -366,7 +366,7 @@ gl_Mod_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr, void *_m,
 							cache->str + strlen ("glquake/"));
 			dstring_appendstr (cache, ".qfms");
 
-			QFS_FOpenFile (cache->str, &f);
+			f = QFS_FOpenFile (cache->str);
 			if (f) {
 				unsigned char d1[MDFOUR_DIGEST_BYTES];
 				unsigned char d2[MDFOUR_DIGEST_BYTES];
diff --git a/libs/models/brush/gl_model_brush.c b/libs/models/brush/gl_model_brush.c
index 687e0a141..c15a4308e 100644
--- a/libs/models/brush/gl_model_brush.c
+++ b/libs/models/brush/gl_model_brush.c
@@ -148,7 +148,7 @@ gl_Mod_LoadLighting (bsp_t *bsp)
 		// LordHavoc: check for a .lit file to load
 		QFS_StripExtension (litfilename->str, litfilename->str);
 		dstring_appendstr (litfilename, ".lit");
-		data = (byte *) QFS_LoadHunkFile (litfilename->str);
+		data = (byte *) QFS_LoadHunkFile (QFS_FOpenFile (litfilename->str));
 		if (data) {
 			if (data[0] == 'Q' && data[1] == 'L' && data[2] == 'I'
 				&& data[3] == 'T') {
diff --git a/libs/models/model.c b/libs/models/model.c
index cd27be931..bac0223de 100644
--- a/libs/models/model.c
+++ b/libs/models/model.c
@@ -171,7 +171,7 @@ Mod_RealLoadModel (model_t *mod, qboolean crash, cache_allocator_t allocator)
 	uint32_t   *buf;
 
 	// load the file
-	buf = (uint32_t *) QFS_LoadFile (mod->name, 0);
+	buf = (uint32_t *) QFS_LoadFile (QFS_FOpenFile (mod->name), 0);
 	if (!buf) {
 		if (crash)
 			Sys_Error ("Mod_LoadModel: %s not found", mod->name);
diff --git a/libs/models/skin.c b/libs/models/skin.c
index a96317d8d..14c21cd81 100644
--- a/libs/models/skin.c
+++ b/libs/models/skin.c
@@ -177,7 +177,7 @@ Skin_SetSkin (skin_t *skin, int cmap, const char *skinname)
 			break;
 		}
 
-		QFS_FOpenFile (va ("skins/%s.pcx", name), &file);
+		file = QFS_FOpenFile (va ("skins/%s.pcx", name));
 		if (!file) {
 			Sys_Printf ("Couldn't load skin %s\n", name);
 			free (name);
diff --git a/libs/ruamoko/rua_qfs.c b/libs/ruamoko/rua_qfs.c
index 3a3391d4e..35d69d0c8 100644
--- a/libs/ruamoko/rua_qfs.c
+++ b/libs/ruamoko/rua_qfs.c
@@ -106,7 +106,7 @@ bi_QFS_LoadFile (progs_t *pr)
 	int         size;
 	void       *buffer;
 
-	QFS_FOpenFile (filename, &file);
+	file = QFS_FOpenFile (filename);
 	if (!file) {
 		RETURN_POINTER (pr, 0);
 		return;
@@ -129,7 +129,7 @@ bi_QFS_OpenFile (progs_t *pr)
 	QFile      *file;
 	const char *filename = P_GSTRING (pr, 0);
 
-	QFS_FOpenFile (filename, &file);
+	file = QFS_FOpenFile (filename);
 	if (!file) {
 		R_INT (pr) = 0;
 		return;
diff --git a/libs/util/cmd.c b/libs/util/cmd.c
index f4cdc79d0..dcdbe6855 100644
--- a/libs/util/cmd.c
+++ b/libs/util/cmd.c
@@ -490,7 +490,7 @@ Cmd_Exec_f (void)
 	}
 
 	mark = Hunk_LowMark ();
-	f = (char *) QFS_LoadHunkFile (Cmd_Argv (1));
+	f = (char *) QFS_LoadHunkFile (QFS_FOpenFile (Cmd_Argv (1)));
 	if (!f) {
 		Sys_Printf ("couldn't exec %s\n", Cmd_Argv (1));
 		return;
@@ -638,7 +638,7 @@ Cmd_Exec_File (cbuf_t *cbuf, const char *path, int qfs)
 	if (!path || !*path)
 		return;
 	if (qfs) {
-		QFS_FOpenFile (path, &file);
+		file = QFS_FOpenFile (path);
 	} else {
 		char *newpath = Sys_ExpandSquiggle (path);
 		file = Qopen (newpath, "r");
diff --git a/libs/util/quakefs.c b/libs/util/quakefs.c
index f48797a67..4e4026d68 100644
--- a/libs/util/quakefs.c
+++ b/libs/util/quakefs.c
@@ -1032,9 +1032,10 @@ open_file (int_findfile_t *found, QFile **gzfile, int zip)
 	}
 }
 
-VISIBLE int
-_QFS_FOpenFile (const char *filename, QFile **gzfile, int zip)
+VISIBLE QFile *
+_QFS_FOpenFile (const char *filename, int zip)
 {
+	QFile      *gzfile;
 	int_findfile_t *found;
 	char       *path;
 	const char *fnames[4];
@@ -1083,26 +1084,25 @@ _QFS_FOpenFile (const char *filename, QFile **gzfile, int zip)
 	found = qfs_findfile (fnames, 0, 0);
 
 	if (found) {
-		open_file (found, gzfile, zip_flags[found->fname_index]);
+		open_file (found, &gzfile, zip_flags[found->fname_index]);
 		free(path);
-		return qfs_filesize;
+		return gzfile;
 	}
 
 	Sys_MaskPrintf (SYS_FS_NF, "FindFile: can't find %s\n", filename);
 error:
-	*gzfile = NULL;
 	qfs_filesize = -1;
 	free (path);
-	return -1;
+	return 0;
 }
 
-VISIBLE int
-QFS_FOpenFile (const char *filename, QFile **gzfile)
+VISIBLE QFile *
+QFS_FOpenFile (const char *filename)
 {
-	return _QFS_FOpenFile (filename, gzfile, 1);
+	return _QFS_FOpenFile (filename, 1);
 }
 
-cache_user_t *loadcache;
+static cache_user_t *loadcache;
 
 /*
 	QFS_LoadFile
@@ -1111,20 +1111,22 @@ cache_user_t *loadcache;
 	Always appends a 0 byte to the loaded data.
 */
 VISIBLE byte *
-QFS_LoadFile (const char *path, int usehunk)
+QFS_LoadFile (QFile *file, int usehunk)
 {
-	QFile      *h;
 	byte       *buf = NULL;
 	char       *base;
 	int         len;
 
 	// look for it in the filesystem or pack files
-	len = qfs_filesize = QFS_FOpenFile (path, &h);
-	if (!h)
+	if (!file)
 		return NULL;
 
+	base = strdup ("QFS_LoadFile");
+
+	len = qfs_filesize = Qfilesize (file);
+
 	// extract the filename base name for hunk tag
-	base = QFS_FileBase (path);
+	//base = QFS_FileBase (path);
 
 	if (usehunk == 1)
 		buf = Hunk_AllocName (len + 1, base);
@@ -1138,11 +1140,12 @@ QFS_LoadFile (const char *path, int usehunk)
 		Sys_Error ("QFS_LoadFile: bad usehunk");
 
 	if (!buf)
-		Sys_Error ("QFS_LoadFile: not enough space for %s", path);
+		Sys_Error ("QFS_LoadFile: not enough space");
+		//Sys_Error ("QFS_LoadFile: not enough space for %s", path);
 
 	buf[len] = 0;
-	Qread (h, buf, len);
-	Qclose (h);
+	Qread (file, buf, len);
+	Qclose (file);
 
 	free (base);
 
@@ -1150,16 +1153,16 @@ QFS_LoadFile (const char *path, int usehunk)
 }
 
 VISIBLE byte *
-QFS_LoadHunkFile (const char *path)
+QFS_LoadHunkFile (QFile *file)
 {
-	return QFS_LoadFile (path, 1);
+	return QFS_LoadFile (file, 1);
 }
 
 VISIBLE void
-QFS_LoadCacheFile (const char *path, struct cache_user_s *cu)
+QFS_LoadCacheFile (QFile *file, struct cache_user_s *cu)
 {
 	loadcache = cu;
-	QFS_LoadFile (path, 3);
+	QFS_LoadFile (file, 3);
 }
 
 /*
diff --git a/libs/util/wad.c b/libs/util/wad.c
index f08e628f5..3b4355bbb 100644
--- a/libs/util/wad.c
+++ b/libs/util/wad.c
@@ -81,7 +81,7 @@ W_LoadWadFile (const char *filename)
 	int         i;
 	int			infotableofs;
 
-	wad_base = QFS_LoadHunkFile (filename);
+	wad_base = QFS_LoadHunkFile (QFS_FOpenFile (filename));
 	if (!wad_base)
 		Sys_Error ("W_LoadWadFile: unable to load %s", filename);
 
diff --git a/libs/video/renderer/gl/gl_draw.c b/libs/video/renderer/gl/gl_draw.c
index 9685e7bab..f988ddf66 100644
--- a/libs/video/renderer/gl/gl_draw.c
+++ b/libs/video/renderer/gl/gl_draw.c
@@ -229,7 +229,7 @@ gl_Draw_CachePic (const char *path, qboolean alpha)
 
 	if (!strcmp (path + strlen (path) - 4, ".lmp")) {
 		// Load the picture..
-		qpic_t     *dat = (qpic_t *) QFS_LoadFile (path, 0);
+		qpic_t     *dat = (qpic_t *) QFS_LoadFile (QFS_FOpenFile (path), 0);
 		if (!dat)
 			Sys_Error ("Draw_CachePic: failed to load %s", path);
 
diff --git a/libs/video/renderer/gl/gl_dyn_part.c b/libs/video/renderer/gl/gl_dyn_part.c
index d3f50f015..5b7f1a63a 100644
--- a/libs/video/renderer/gl/gl_dyn_part.c
+++ b/libs/video/renderer/gl/gl_dyn_part.c
@@ -213,7 +213,7 @@ gl_R_ReadPointFile_f (void)
 	name = va ("%s.pts", mapname);
 	free (mapname);
 
-	QFS_FOpenFile (name, &f);
+	f = QFS_FOpenFile (name);
 	if (!f) {
 		Sys_Printf ("couldn't open %s\n", name);
 		return;
diff --git a/libs/video/renderer/gl/vid_common_gl.c b/libs/video/renderer/gl/vid_common_gl.c
index 08ca45946..ec21df3e5 100644
--- a/libs/video/renderer/gl/vid_common_gl.c
+++ b/libs/video/renderer/gl/vid_common_gl.c
@@ -744,7 +744,7 @@ GL_SetPalette (const byte *palette)
 		return;
 	palflag = true;
 
-	QFS_FOpenFile ("glquake/15to8.pal", &f);
+	f = QFS_FOpenFile ("glquake/15to8.pal");
 	if (f) {
 		Qread (f, gl_15to8table, 1 << 15);
 		Qclose (f);
diff --git a/libs/video/renderer/glsl/glsl_draw.c b/libs/video/renderer/glsl/glsl_draw.c
index 528dc60da..6a8ef0268 100644
--- a/libs/video/renderer/glsl/glsl_draw.c
+++ b/libs/video/renderer/glsl/glsl_draw.c
@@ -283,7 +283,7 @@ glsl_Draw_CachePic (const char *path, qboolean alpha)
 	if ((cpic = Hash_Find (pic_cache, path)))
 		return cpic->pic;
 	if (strlen (path) < 4 || strcmp (path + strlen (path) - 4, ".lmp")
-		|| !(p = (qpic_t *) QFS_LoadFile (path, 0))) {
+		|| !(p = (qpic_t *) QFS_LoadFile (QFS_FOpenFile (path), 0))) {
 		//FIXME load a null texture
 		Sys_Error ("Draw_CachePic: failed to load %s", path);
 	}
@@ -407,7 +407,7 @@ glsl_Draw_Init (void)
 
 	conchars = pic_data ("conchars", 128, 128, draw_chars);
 
-	pic = (qpic_t *) QFS_LoadFile ("gfx/conback.lmp", 0);
+	pic = (qpic_t *) QFS_LoadFile (QFS_FOpenFile ("gfx/conback.lmp"), 0);
 	if (pic) {
 		SwapPic (pic);
 		conback_texture = GLSL_LoadQuakeTexture ("conback",
diff --git a/libs/video/renderer/glsl/glsl_particles.c b/libs/video/renderer/glsl/glsl_particles.c
index dba65db08..c4e214c50 100644
--- a/libs/video/renderer/glsl/glsl_particles.c
+++ b/libs/video/renderer/glsl/glsl_particles.c
@@ -321,7 +321,7 @@ glsl_R_ReadPointFile_f (void)
 	name = va ("%s.pts", mapname);
 	free (mapname);
 
-	QFS_FOpenFile (name, &f);
+	f = QFS_FOpenFile (name);
 	if (!f) {
 		Sys_Printf ("couldn't open %s\n", name);
 		return;
diff --git a/libs/video/renderer/sw/draw.c b/libs/video/renderer/sw/draw.c
index 08110401a..e3728af66 100644
--- a/libs/video/renderer/sw/draw.c
+++ b/libs/video/renderer/sw/draw.c
@@ -148,7 +148,7 @@ Draw_CachePic (const char *path, qboolean alpha)
 		return dat;
 
 	// load the pic from disk
-	QFS_LoadCacheFile (path, &pic->cache);
+	QFS_LoadCacheFile (QFS_FOpenFile (path), &pic->cache);
 
 	dat = (qpic_t *) pic->cache.data;
 	if (!dat) {
diff --git a/libs/video/renderer/sw/sw_rpart.c b/libs/video/renderer/sw/sw_rpart.c
index de59f0ba1..aeb2fa904 100644
--- a/libs/video/renderer/sw/sw_rpart.c
+++ b/libs/video/renderer/sw/sw_rpart.c
@@ -91,7 +91,7 @@ R_ReadPointFile_f (void)
 	name = va ("maps/%s.pts", mapname);
 	free (mapname);
 
-	QFS_FOpenFile (name, &f);
+	f = QFS_FOpenFile (name);
 	if (!f) {
 		Sys_Printf ("couldn't open %s\n", name);
 		return;
diff --git a/libs/video/renderer/sw32/draw.c b/libs/video/renderer/sw32/draw.c
index e07e616ad..a420c8ac0 100644
--- a/libs/video/renderer/sw32/draw.c
+++ b/libs/video/renderer/sw32/draw.c
@@ -151,7 +151,7 @@ sw32_Draw_CachePic (const char *path, qboolean alpha)
 		return dat;
 
 	// load the pic from disk
-	QFS_LoadCacheFile (path, &pic->cache);
+	QFS_LoadCacheFile (QFS_FOpenFile (path), &pic->cache);
 
 	dat = (qpic_t *) pic->cache.data;
 	if (!dat) {
diff --git a/libs/video/renderer/sw32/sw32_rpart.c b/libs/video/renderer/sw32/sw32_rpart.c
index 3affa45b1..5591b9929 100644
--- a/libs/video/renderer/sw32/sw32_rpart.c
+++ b/libs/video/renderer/sw32/sw32_rpart.c
@@ -96,7 +96,7 @@ sw32_R_ReadPointFile_f (void)
 	name = va ("maps/%s.pts", mapname);
 	free (mapname);
 
-	QFS_FOpenFile (name, &f);
+	f = QFS_FOpenFile (name);
 	if (!f) {
 		Sys_Printf ("couldn't open %s\n", name);
 		return;
diff --git a/nq/source/cl_demo.c b/nq/source/cl_demo.c
index b98d3a078..026c59fbb 100644
--- a/nq/source/cl_demo.c
+++ b/nq/source/cl_demo.c
@@ -454,7 +454,7 @@ CL_StartDemo (void)
 	QFS_DefaultExtension (name, ".dem");
 
 	Sys_Printf ("Playing demo from %s.\n", name->str);
-	QFS_FOpenFile (name->str, &cls.demofile);
+	cls.demofile = QFS_FOpenFile (name->str);
 	if (!cls.demofile) {
 		Sys_Printf ("ERROR: couldn't open.\n");
 		cls.demonum = -1;				// stop demo loop
diff --git a/nq/source/cl_main.c b/nq/source/cl_main.c
index 052b45189..7f6dd9e82 100644
--- a/nq/source/cl_main.c
+++ b/nq/source/cl_main.c
@@ -529,10 +529,10 @@ CL_Init (cbuf_t *cbuf)
 {
 	byte       *basepal, *colormap;
 
-	basepal = (byte *) QFS_LoadHunkFile ("gfx/palette.lmp");
+	basepal = (byte *) QFS_LoadHunkFile (QFS_FOpenFile ("gfx/palette.lmp"));
 	if (!basepal)
 		Sys_Error ("Couldn't load gfx/palette.lmp");
-	colormap = (byte *) QFS_LoadHunkFile ("gfx/colormap.lmp");
+	colormap = (byte *) QFS_LoadHunkFile (QFS_FOpenFile ("gfx/colormap.lmp"));
 	if (!colormap)
 		Sys_Error ("Couldn't load gfx/colormap.lmp");
 
diff --git a/nq/source/cl_parse.c b/nq/source/cl_parse.c
index 2b9597e8a..3294cdf40 100644
--- a/nq/source/cl_parse.c
+++ b/nq/source/cl_parse.c
@@ -268,7 +268,7 @@ map_cfg (const char *mapname, int all)
 
 	QFS_StripExtension (mapname, name);
 	strcat (name, ".cfg");
-	QFS_FOpenFile (name, &f);
+	f = QFS_FOpenFile (name);
 	if (f) {
 		Qclose (f);
 		Cmd_Exec_File (cbuf, name, 1);
@@ -294,7 +294,7 @@ map_ent (const char *mapname)
 
 	QFS_StripExtension (mapname, name);
 	strcat (name, ".ent");
-	if ((buf = (char *) QFS_LoadFile (name, 0))) {
+	if ((buf = (char *) QFS_LoadFile (QFS_FOpenFile (name), 0))) {
 		edicts = ED_Parse (&edpr, buf);
 		free (buf);
 	} else {
diff --git a/nq/source/game.c b/nq/source/game.c
index 703d13ddc..f67104472 100644
--- a/nq/source/game.c
+++ b/nq/source/game.c
@@ -57,7 +57,7 @@ Game_CheckRegistered (void)
 {
 	QFile      *h;
 
-	QFS_FOpenFile ("gfx/pop.lmp", &h);
+	h = QFS_FOpenFile ("gfx/pop.lmp");
 	static_registered = 0;
 
 	if (h) {
diff --git a/nq/source/host.c b/nq/source/host.c
index f25562e2c..f6b59cf8b 100644
--- a/nq/source/host.c
+++ b/nq/source/host.c
@@ -817,7 +817,7 @@ check_quakerc (void)
 	int ret = 1;
 	QFile *f;
 
-	QFS_FOpenFile ("quake.rc", &f);
+	f = QFS_FOpenFile ("quake.rc");
 	if (!f)
 		return 1;
 	while ((l = Qgetline (f))) {
diff --git a/nq/source/host_cmd.c b/nq/source/host_cmd.c
index 4a819d66c..1a827f15b 100644
--- a/nq/source/host_cmd.c
+++ b/nq/source/host_cmd.c
@@ -279,7 +279,7 @@ Host_Map_f (void)
 
 	// check to make sure the level exists
 	expanded = va ("maps/%s.bsp", Cmd_Argv (1));
-	QFS_FOpenFile (expanded, &f);
+	f = QFS_FOpenFile (expanded);
 	if (!f) {
 		Sys_Printf ("Can't find %s\n", expanded);
 		return;
diff --git a/nq/source/sv_main.c b/nq/source/sv_main.c
index d06ec4543..831e946e4 100644
--- a/nq/source/sv_main.c
+++ b/nq/source/sv_main.c
@@ -1101,7 +1101,7 @@ SV_SaveSpawnparms (void)
 void
 SV_SpawnServer (const char *server)
 {
-	char       *buf;
+	byte       *buf;
 	int         i;
 	edict_t    *ent;
 
@@ -1211,8 +1211,8 @@ SV_SpawnServer (const char *server)
 	*sv_globals.serverflags = svs.serverflags;
 
 	*sv_globals.time = sv.time;
-	if ((buf = (char *) QFS_LoadFile (va ("maps/%s.ent", server), 0))) {
-		ED_LoadFromFile (&sv_pr_state, buf);
+	if ((buf = QFS_LoadFile (QFS_FOpenFile (va ("maps/%s.ent", server)), 0))) {
+		ED_LoadFromFile (&sv_pr_state, (char *) buf);
 		free (buf);
 	} else {
 		ED_LoadFromFile (&sv_pr_state, sv.worldmodel->entities);
diff --git a/qw/source/cl_demo.c b/qw/source/cl_demo.c
index 5202aa6f7..31ce11620 100644
--- a/qw/source/cl_demo.c
+++ b/qw/source/cl_demo.c
@@ -993,11 +993,11 @@ CL_StartDemo (void)
 	name = dstring_strdup (demoname);
 
 	QFS_DefaultExtension (name, ".mvd");
-	QFS_FOpenFile (name->str, &cls.demofile);
+	cls.demofile = QFS_FOpenFile (name->str);
 	if (!cls.demofile) {
 		dstring_copystr (name, demoname);
 		QFS_DefaultExtension (name, ".qwd");
-		QFS_FOpenFile (name->str, &cls.demofile);
+		cls.demofile = QFS_FOpenFile (name->str);
 	}
 
 	if (!cls.demofile) {
diff --git a/qw/source/cl_main.c b/qw/source/cl_main.c
index dd73f987a..09fb1aec2 100644
--- a/qw/source/cl_main.c
+++ b/qw/source/cl_main.c
@@ -1169,10 +1169,10 @@ CL_Init (void)
 {
 	byte       *basepal, *colormap;
 
-	basepal = (byte *) QFS_LoadHunkFile ("gfx/palette.lmp");
+	basepal = (byte *) QFS_LoadHunkFile (QFS_FOpenFile ("gfx/palette.lmp"));
 	if (!basepal)
 		Sys_Error ("Couldn't load gfx/palette.lmp");
-	colormap = (byte *) QFS_LoadHunkFile ("gfx/colormap.lmp");
+	colormap = (byte *) QFS_LoadHunkFile (QFS_FOpenFile ("gfx/colormap.lmp"));
 	if (!colormap)
 		Sys_Error ("Couldn't load gfx/colormap.lmp");
 
@@ -1716,7 +1716,7 @@ check_quakerc (void)
 	int ret = 1;
 	QFile *f;
 
-	QFS_FOpenFile ("quake.rc", &f);
+	f = QFS_FOpenFile ("quake.rc");
 	if (!f)
 		return 1;
 	while ((l = Qgetline (f))) {
diff --git a/qw/source/cl_parse.c b/qw/source/cl_parse.c
index c6c77ab17..f8d2cba70 100644
--- a/qw/source/cl_parse.c
+++ b/qw/source/cl_parse.c
@@ -237,7 +237,7 @@ CL_CheckOrDownloadFile (const char *filename)
 		return true;
 	}
 */
-	QFS_FOpenFile (filename, &f);
+	f = QFS_FOpenFile (filename);
 	if (f) {							// it exists, no need to download
 		Qclose (f);
 		return true;
@@ -280,7 +280,7 @@ map_ent (const char *mapname)
 
 	QFS_StripExtension (mapname, name);
 	strcat (name, ".ent");
-	if ((buf = (char *) QFS_LoadFile (name, 0))) {
+	if ((buf = (char *) QFS_LoadFile (QFS_FOpenFile (name), 0))) {
 		edicts = ED_Parse (&edpr, buf);
 		free (buf);
 	} else {
diff --git a/qw/source/game.c b/qw/source/game.c
index 9c2b66dbd..ac69d83ea 100644
--- a/qw/source/game.c
+++ b/qw/source/game.c
@@ -62,7 +62,7 @@ Game_CheckRegistered (void)
 {
 	QFile      *h;
 
-	QFS_FOpenFile ("gfx/pop.lmp", &h);
+	h = QFS_FOpenFile ("gfx/pop.lmp");
 	static_registered = 0;
 
 	if (h) {
diff --git a/qw/source/locs.c b/qw/source/locs.c
index 725341fdc..2f94da0f8 100644
--- a/qw/source/locs.c
+++ b/qw/source/locs.c
@@ -136,7 +136,7 @@ locs_load (const char *filename)
 	QFile      *file;
 
 	tmp = va ("maps/%s", filename);
-	QFS_FOpenFile (tmp, &file);
+	file = QFS_FOpenFile (tmp);
 	if (!file) {
 		Sys_Printf ("Couldn't load %s\n", tmp);
 		return;
diff --git a/qw/source/map_cfg.c b/qw/source/map_cfg.c
index 04ab404ea..10b4a5cd5 100644
--- a/qw/source/map_cfg.c
+++ b/qw/source/map_cfg.c
@@ -55,7 +55,7 @@ map_cfg (const char *mapname, int all)
 
 	QFS_StripExtension (mapname, name);
 	strcat (name, ".cfg");
-	QFS_FOpenFile (name, &f);
+	f = QFS_FOpenFile (name);
 	if (f) {
 		Qclose (f);
 		Cmd_Exec_File (cbuf, name, 1);
diff --git a/qw/source/sv_ccmds.c b/qw/source/sv_ccmds.c
index e52032da8..aa359c576 100644
--- a/qw/source/sv_ccmds.c
+++ b/qw/source/sv_ccmds.c
@@ -453,7 +453,7 @@ SV_Map_f (void)
 
 	// check to make sure the level exists
 	expanded = nva ("maps/%s.bsp", level);
-	QFS_FOpenFile (expanded, &f);
+	f = QFS_FOpenFile (expanded);
 	if (!f) {
 		SV_Printf ("Can't find %s\n", expanded);
 		free (expanded);
diff --git a/qw/source/sv_init.c b/qw/source/sv_init.c
index 04e4f860c..a8be620f5 100644
--- a/qw/source/sv_init.c
+++ b/qw/source/sv_init.c
@@ -290,7 +290,7 @@ SV_CheckModel (const char *mdl)
 
 //	int len;
 
-	buf = (byte *) QFS_LoadFile (mdl, 0);
+	buf = (byte *) QFS_LoadFile (QFS_FOpenFile (mdl), 0);
 	if (buf) {
 		crc = CRC_Block (buf, qfs_filesize);
 		free (buf);
@@ -312,7 +312,7 @@ SV_CheckModel (const char *mdl)
 void
 SV_SpawnServer (const char *server)
 {
-	char       *buf;
+	byte       *buf;
 	edict_t    *ent;
 	int         i;
 	void       *so_buffers;
@@ -433,8 +433,8 @@ SV_SpawnServer (const char *server)
 
 	// load and spawn all other entities
 	*sv_globals.time = sv.time;
-	if ((buf = (char *) QFS_LoadFile (va ("maps/%s.ent", server), 0))) {
-		ED_LoadFromFile (&sv_pr_state, buf);
+	if ((buf = QFS_LoadFile (QFS_FOpenFile (va ("maps/%s.ent", server)), 0))) {
+		ED_LoadFromFile (&sv_pr_state, (char *) buf);
 		free (buf);
 	} else {
 		ED_LoadFromFile (&sv_pr_state, sv.worldmodel->entities);
diff --git a/qw/source/sv_pr_cpqw.c b/qw/source/sv_pr_cpqw.c
index 07659f634..594f66219 100644
--- a/qw/source/sv_pr_cpqw.c
+++ b/qw/source/sv_pr_cpqw.c
@@ -390,7 +390,7 @@ PF_validatefile (progs_t *pr)
 
 	st = P_GSTRING (pr, 0);
 
-	QFS_FOpenFile (st, &f);
+	f = QFS_FOpenFile (st);
 	if (!f) {
 		retval = 0.0;
 	} else {
diff --git a/qw/source/sv_user.c b/qw/source/sv_user.c
index 5a063b6b7..5398eff6c 100644
--- a/qw/source/sv_user.c
+++ b/qw/source/sv_user.c
@@ -717,7 +717,7 @@ static void
 SV_BeginDownload_f (void *unused)
 {
 	const char *name;
-	int			http, size, zip;
+	int			http, zip;
 	QFile	   *file;
 
 	name = Cmd_Argv (1);
@@ -753,10 +753,10 @@ SV_BeginDownload_f (void *unused)
 	http = sv_http_url_base->string[0]
 			&& strchr (Info_ValueForKey (host_client->userinfo, "*cap"), 'h');
 
-	size = _QFS_FOpenFile (name, &file, !zip);
+	file = _QFS_FOpenFile (name, !zip);
 
 	host_client->download = file;
-	host_client->downloadsize = size;
+	host_client->downloadsize = Qfilesize (file);
 	host_client->downloadcount = 0;
 
 	if (!host_client->download
diff --git a/tools/qwaq/qwaq-bi.c b/tools/qwaq/qwaq-bi.c
index 32e8ca9e1..822c8c635 100644
--- a/tools/qwaq/qwaq-bi.c
+++ b/tools/qwaq/qwaq-bi.c
@@ -167,10 +167,10 @@ BI_Init (progs_t *pr)
 	Mod_Init_Cvars ();
 	S_Init_Cvars ();
 
-	basepal = (byte *) QFS_LoadHunkFile ("gfx/palette.lmp");
+	basepal = (byte *) QFS_LoadHunkFile (QFS_FOpenFile ("gfx/palette.lmp"));
 	if (!basepal)
 		Sys_Error ("Couldn't load gfx/palette.lmp");
-	colormap = (byte *) QFS_LoadHunkFile ("gfx/colormap.lmp");
+	colormap = (byte *) QFS_LoadHunkFile (QFS_FOpenFile ("gfx/colormap.lmp"));
 	if (!colormap)
 		Sys_Error ("Couldn't load gfx/colormap.lmp");
 

From 8bea6a66cad70e826a00cf528e909e25c90e6946 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 23 Jan 2014 13:08:44 +0900
Subject: [PATCH 0078/1519] Create _QFS_VOpenFile and QFS_VOpenFile.

_QFS_VOpenFile is actually _QFS_FOpenFile reimplemented to take vpath start
and end parameters so the search can be limited. QFS_VOpenFile,
_QFS_FOpenFile, and QFS_FOpenFile are all wrappers for _QFS_VOpenFile.
---
 include/QF/quakefs.h |  5 +++++
 libs/util/quakefs.c  | 19 ++++++++++++++++---
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/include/QF/quakefs.h b/include/QF/quakefs.h
index 675be7731..aab034381 100644
--- a/include/QF/quakefs.h
+++ b/include/QF/quakefs.h
@@ -202,6 +202,11 @@ QFile *QFS_WOpen (const char *path, int zip);
 */
 void QFS_WriteFile (const char *filename, const void *data, int len);
 
+QFile *_QFS_VOpenFile (const char *filename, int zip,
+					   const vpath_t *start, const vpath_t *end);
+QFile *QFS_VOpenFile (const char *filename,
+					  const vpath_t *start, const vpath_t *end);
+
 /**	Open a file for reading.
 
 	The file will be searched for through all the subdirectories given in the
diff --git a/libs/util/quakefs.c b/libs/util/quakefs.c
index 4e4026d68..3fd35e9dc 100644
--- a/libs/util/quakefs.c
+++ b/libs/util/quakefs.c
@@ -1033,7 +1033,8 @@ open_file (int_findfile_t *found, QFile **gzfile, int zip)
 }
 
 VISIBLE QFile *
-_QFS_FOpenFile (const char *filename, int zip)
+_QFS_VOpenFile (const char *filename, int zip,
+				const vpath_t *start, const vpath_t *end)
 {
 	QFile      *gzfile;
 	int_findfile_t *found;
@@ -1081,7 +1082,7 @@ _QFS_FOpenFile (const char *filename, int zip)
 
 	fnames[ind] = 0;
 
-	found = qfs_findfile (fnames, 0, 0);
+	found = qfs_findfile (fnames, start, end);
 
 	if (found) {
 		open_file (found, &gzfile, zip_flags[found->fname_index]);
@@ -1096,10 +1097,22 @@ error:
 	return 0;
 }
 
+VISIBLE QFile *
+QFS_VOpenFile (const char *filename, const vpath_t *start, const vpath_t *end)
+{
+	return _QFS_VOpenFile (filename, 1, start, end);
+}
+
+VISIBLE QFile *
+_QFS_FOpenFile (const char *filename, int zip)
+{
+	return _QFS_VOpenFile (filename, zip, 0, 0);
+}
+
 VISIBLE QFile *
 QFS_FOpenFile (const char *filename)
 {
-	return _QFS_FOpenFile (filename, 1);
+	return _QFS_VOpenFile (filename, 1, 0, 0);
 }
 
 static cache_user_t *loadcache;

From ab3f554a0ec83b6c6209a4c72b401bec26c0110c Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 23 Jan 2014 13:13:00 +0900
Subject: [PATCH 0079/1519] Limit the search for lit and ent files.

The search for these files will stop in the vpath that contains the .bsp
file to which they belong. This will prevent problems with
id1/maps/start.lit being used for shadows/maps/start.bsp.
---
 libs/models/brush/gl_model_brush.c | 4 +++-
 nq/source/cl_parse.c               | 4 +++-
 nq/source/sv_main.c                | 6 +++++-
 qw/source/cl_parse.c               | 4 +++-
 qw/source/sv_init.c                | 5 ++++-
 5 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/libs/models/brush/gl_model_brush.c b/libs/models/brush/gl_model_brush.c
index c15a4308e..18744a529 100644
--- a/libs/models/brush/gl_model_brush.c
+++ b/libs/models/brush/gl_model_brush.c
@@ -141,6 +141,7 @@ gl_Mod_LoadLighting (bsp_t *bsp)
 	dstring_t  *litfilename = dstring_new ();
 	size_t      i;
 	int         ver;
+	QFile      *lit_file;
 
 	dstring_copystr (litfilename, loadmodel->name);
 	loadmodel->lightdata = NULL;
@@ -148,7 +149,8 @@ gl_Mod_LoadLighting (bsp_t *bsp)
 		// LordHavoc: check for a .lit file to load
 		QFS_StripExtension (litfilename->str, litfilename->str);
 		dstring_appendstr (litfilename, ".lit");
-		data = (byte *) QFS_LoadHunkFile (QFS_FOpenFile (litfilename->str));
+		lit_file = QFS_VOpenFile (litfilename->str, 0, loadmodel->vpath);
+		data = (byte *) QFS_LoadHunkFile (lit_file);
 		if (data) {
 			if (data[0] == 'Q' && data[1] == 'L' && data[2] == 'I'
 				&& data[3] == 'T') {
diff --git a/nq/source/cl_parse.c b/nq/source/cl_parse.c
index 3294cdf40..ea12152ff 100644
--- a/nq/source/cl_parse.c
+++ b/nq/source/cl_parse.c
@@ -291,10 +291,12 @@ map_ent (const char *mapname)
 	char       *name = malloc (strlen (mapname) + 4 + 1);
 	char       *buf;
 	plitem_t   *edicts = 0;
+	QFile      *ent_file;
 
 	QFS_StripExtension (mapname, name);
 	strcat (name, ".ent");
-	if ((buf = (char *) QFS_LoadFile (QFS_FOpenFile (name), 0))) {
+	ent_file = QFS_VOpenFile (name, 0, cl.model_precache[1]->vpath);
+	if ((buf = (char *) QFS_LoadFile (ent_file, 0))) {
 		edicts = ED_Parse (&edpr, buf);
 		free (buf);
 	} else {
diff --git a/nq/source/sv_main.c b/nq/source/sv_main.c
index 831e946e4..25def54ac 100644
--- a/nq/source/sv_main.c
+++ b/nq/source/sv_main.c
@@ -1102,9 +1102,11 @@ void
 SV_SpawnServer (const char *server)
 {
 	byte       *buf;
+	QFile      *ent_file;
 	int         i;
 	edict_t    *ent;
 
+
 	S_BlockSound ();
 	// let's not have any servers with no name
 	if (hostname->string[0] == 0)
@@ -1211,7 +1213,9 @@ SV_SpawnServer (const char *server)
 	*sv_globals.serverflags = svs.serverflags;
 
 	*sv_globals.time = sv.time;
-	if ((buf = QFS_LoadFile (QFS_FOpenFile (va ("maps/%s.ent", server)), 0))) {
+	ent_file = QFS_VOpenFile (va ("maps/%s.ent", server), 0,
+							  sv.worldmodel->vpath);
+	if ((buf = QFS_LoadFile (ent_file, 0))) {
 		ED_LoadFromFile (&sv_pr_state, (char *) buf);
 		free (buf);
 	} else {
diff --git a/qw/source/cl_parse.c b/qw/source/cl_parse.c
index f8d2cba70..a271c1197 100644
--- a/qw/source/cl_parse.c
+++ b/qw/source/cl_parse.c
@@ -277,10 +277,12 @@ map_ent (const char *mapname)
 	char       *name = malloc (strlen (mapname) + 4 + 1);
 	char       *buf;
 	plitem_t   *edicts = 0;
+	QFile      *ent_file;
 
 	QFS_StripExtension (mapname, name);
 	strcat (name, ".ent");
-	if ((buf = (char *) QFS_LoadFile (QFS_FOpenFile (name), 0))) {
+	ent_file = QFS_VOpenFile (name, 0, cl.model_precache[1]->vpath);
+	if ((buf = (char *) QFS_LoadFile (ent_file, 0))) {
 		edicts = ED_Parse (&edpr, buf);
 		free (buf);
 	} else {
diff --git a/qw/source/sv_init.c b/qw/source/sv_init.c
index a8be620f5..b9dbb0aec 100644
--- a/qw/source/sv_init.c
+++ b/qw/source/sv_init.c
@@ -319,6 +319,7 @@ SV_SpawnServer (const char *server)
 	int        *so_sizes;
 	int         max_so;
 	struct recorder_s *recorders;
+	QFile      *ent_file;
 
 	Sys_MaskPrintf (SYS_DEV, "SpawnServer: %s\n", server);
 
@@ -433,7 +434,9 @@ SV_SpawnServer (const char *server)
 
 	// load and spawn all other entities
 	*sv_globals.time = sv.time;
-	if ((buf = QFS_LoadFile (QFS_FOpenFile (va ("maps/%s.ent", server)), 0))) {
+	ent_file = QFS_VOpenFile (va ("maps/%s.ent", server), 0,
+							  sv.worldmodel->vpath);
+	if ((buf = QFS_LoadFile (ent_file, 0))) {
 		ED_LoadFromFile (&sv_pr_state, (char *) buf);
 		free (buf);
 	} else {

From 99678a571b77be60cb0917fbea58e996c9260e5d Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 28 Jan 2014 16:26:24 +0900
Subject: [PATCH 0080/1519] Remove *.slc on make clean.

---
 libs/video/renderer/glsl/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/video/renderer/glsl/Makefile.am b/libs/video/renderer/glsl/Makefile.am
index 68321ae78..ca8f4314a 100644
--- a/libs/video/renderer/glsl/Makefile.am
+++ b/libs/video/renderer/glsl/Makefile.am
@@ -25,4 +25,4 @@ SUFFICES=.frag .vert .fc .vc .slc .glsl
 libglsl_la_SOURCES= $(glsl_src)
 
 EXTRA_DIST = $(glsl_src) $(shader_src) namehack.h
-CLEANFILES= *.vc *.fc
+CLEANFILES= *.vc *.fc *.slc

From 946561ba4413859511348d2ab22c7c216bacd6bc Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 29 Jan 2014 16:13:24 +0900
Subject: [PATCH 0081/1519] Don't bail out prematurely when searching for
 files.

This fixes the problem of not finding files without a .gz extension when
gzip support is enabled (most of my quake data is compressed, so it took a
while for me to notice the problem).
---
 libs/util/quakefs.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libs/util/quakefs.c b/libs/util/quakefs.c
index 3fd35e9dc..5131f7194 100644
--- a/libs/util/quakefs.c
+++ b/libs/util/quakefs.c
@@ -849,8 +849,7 @@ qfs_findfile_search (const vpath_t *vpath, const searchpath_t *sp,
 		for (fn = fnames; *fn; fn++) {
 			if (qfs_expand_path (path, sp->filename, *fn, 1) == 0) {
 				if (Sys_FileExists (path->str) == -1) {
-					dstring_delete (path);
-					return 0;
+					continue;
 				}
 
 				Sys_MaskPrintf (SYS_FS_F, "FindFile: %s\n", path->str);

From 2cd59c962c34f778ec56139958f55e8a13d079a6 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 31 Jan 2014 12:22:11 +0900
Subject: [PATCH 0082/1519] Rename qfcc's basename to file_basename.

Avoids naming conflicts with JohnnyonFlame's toolchain.
---
 tools/qfcc/source/qfcc.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/qfcc/source/qfcc.c b/tools/qfcc/source/qfcc.c
index a4d9dde5c..fdf455b5d 100644
--- a/tools/qfcc/source/qfcc.c
+++ b/tools/qfcc/source/qfcc.c
@@ -311,7 +311,7 @@ strip_path (const char *filename)
 }
 
 static const char *
-basename (const char *filename)
+file_basename (const char *filename)
 {
 	const char *p;
 	const char *dot;
@@ -391,7 +391,7 @@ compile_to_obj (const char *file, const char *obj, lang_t lang)
 			exit (1);
 		}
 	}
-	write_frame_macros (va ("%s.frame", basename (file)));
+	write_frame_macros (va ("%s.frame", file_basename (file)));
 	if (!err) {
 		qfo_t      *qfo;
 
@@ -731,12 +731,12 @@ progs_src_compile (void)
 				fprintf (single, "#include \"%s\"\n", qc_filename->str);
 				if (options.frames_files)
 					fprintf (single, "$frame_write \"%s.frame\"\n",
-							 basename (qc_filename->str));
+							 file_basename (qc_filename->str));
 			} else {
 				if (compile_file (qc_filename->str))
 					return 1;
 				write_frame_macros (va ("%s.frame",
-										basename (qc_filename->str)));
+										file_basename (qc_filename->str)));
 			}
 			if (!Script_TokenAvailable (script, 0))
 				break;

From 9d71d9bb7aacb083bae4a156bffb68e8e2ce86d0 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 2 Feb 2014 14:40:39 +0900
Subject: [PATCH 0083/1519] Remove maxwarpwidth and maxwarpheight.

Only the sw32 renderer even tried to use them, and they didn't get set
properly. This fixes JohnnyonFlame's waterwarp issue.
---
 include/QF/vid.h                      |  2 --
 libs/video/renderer/sw32/sw32_rmisc.c | 16 ++++++++--------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/include/QF/vid.h b/include/QF/vid.h
index 07396b566..70298fa8b 100644
--- a/include/QF/vid.h
+++ b/include/QF/vid.h
@@ -59,8 +59,6 @@ typedef struct {
 	int				 conrowbytes;
 	int				 conwidth;
 	int				 conheight;
-	int				 maxwarpwidth;
-	int				 maxwarpheight;
 	byte			*direct;		// direct drawing to framebuffer, if not
 									//  NULL
 	int			   (*surf_cache_size)(int width, int height);
diff --git a/libs/video/renderer/sw32/sw32_rmisc.c b/libs/video/renderer/sw32/sw32_rmisc.c
index be5c0b914..cb12395d3 100644
--- a/libs/video/renderer/sw32/sw32_rmisc.c
+++ b/libs/video/renderer/sw32/sw32_rmisc.c
@@ -248,8 +248,8 @@ sw32_R_SetupFrame (void)
 
 	if ((sw32_r_dowarp != sw32_r_dowarpold) || sw32_r_viewchanged) {
 		if (sw32_r_dowarp) {
-			if ((vid.width <= vid.maxwarpwidth)
-				&& (vid.height <= vid.maxwarpheight)) {
+			if ((vid.width <= WARP_WIDTH)
+				&& (vid.height <= WARP_HEIGHT)) {
 				vrect.x = 0;
 				vrect.y = 0;
 				vrect.width = vid.width;
@@ -261,14 +261,14 @@ sw32_R_SetupFrame (void)
 				w = vid.width;
 				h = vid.height;
 
-				if (w > vid.maxwarpwidth) {
-					h *= (float) vid.maxwarpwidth / w;
-					w = vid.maxwarpwidth;
+				if (w > WARP_WIDTH) {
+					h *= (float) WARP_WIDTH / w;
+					w = WARP_WIDTH;
 				}
 
-				if (h > vid.maxwarpheight) {
-					h = vid.maxwarpheight;
-					w *= (float) vid.maxwarpheight / h;
+				if (h > WARP_HEIGHT) {
+					h = WARP_HEIGHT;
+					w *= (float) WARP_HEIGHT / h;
 				}
 
 				vrect.x = 0;

From 850382eed40cd3203e3d60592a58daafdf675de1 Mon Sep 17 00:00:00 2001
From: Johnny <johnnyonflame@hotmail.com>
Date: Sun, 2 Feb 2014 05:19:04 -0200
Subject: [PATCH 0084/1519] Fixes crashes when sw32_r_pixbytes is set to 2 or 4

---
 libs/video/renderer/sw32/d_init.c          | 1 +
 libs/video/renderer/sw32/vid_common_sw32.c | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/libs/video/renderer/sw32/d_init.c b/libs/video/renderer/sw32/d_init.c
index 0a3c3d9bc..ccb5f7392 100644
--- a/libs/video/renderer/sw32/d_init.c
+++ b/libs/video/renderer/sw32/d_init.c
@@ -71,6 +71,7 @@ sw32_D_Init (void)
 	vr_data.vid->init_caches = sw32_D_InitCaches;
 
 	VID_InitBuffers ();
+	VID_MakeColormaps();
 }
 
 void
diff --git a/libs/video/renderer/sw32/vid_common_sw32.c b/libs/video/renderer/sw32/vid_common_sw32.c
index 592321f48..c6679ebfa 100644
--- a/libs/video/renderer/sw32/vid_common_sw32.c
+++ b/libs/video/renderer/sw32/vid_common_sw32.c
@@ -188,15 +188,13 @@ VID_MakeColormap8 (void *outcolormap, byte *pal)
 
 	LordHavoc: makes 8bit, 16bit, and 32bit colormaps and palettes
 */
-static __attribute__((used)) void //FIXME
+void
 VID_MakeColormaps (int fullbrights, byte *pal)
 {
 	vid.fullbright = fullbrights;
-	vid.colormap8 = malloc (256*VID_GRADES * sizeof (byte));
 	vid.colormap16 = malloc (256*VID_GRADES * sizeof (short));
 	vid.colormap32 = malloc (256*VID_GRADES * sizeof (int));
 	SYS_CHECKMEM (vid.colormap8 && vid.colormap16 && vid.colormap32);
-	VID_MakeColormap8(vid.colormap8, pal);
 	VID_MakeColormap16(vid.colormap16, pal);
 	VID_MakeColormap32(vid.colormap32, pal);
 }

From d80342e0a8cc5bdd8b434bc1cf5418ad0b68b776 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 2 Feb 2014 16:42:08 +0900
Subject: [PATCH 0085/1519] Fix some compile errors from Johnny's patch.

Turns out he has to compile without -Werror.
---
 include/vid_internal.h                     |  2 +
 libs/video/renderer/sw32/vid_common_sw32.c | 60 ++--------------------
 2 files changed, 6 insertions(+), 56 deletions(-)

diff --git a/include/vid_internal.h b/include/vid_internal.h
index 2f2625222..bf1803270 100644
--- a/include/vid_internal.h
+++ b/include/vid_internal.h
@@ -20,5 +20,7 @@ void VID_Update (vrect_t *rects);
 void VID_LockBuffer (void);
 void VID_UnlockBuffer (void);
 void VID_InitBuffers (void);
+void VID_MakeColormaps (void);
+
 
 #endif//__vid_internal_h
diff --git a/libs/video/renderer/sw32/vid_common_sw32.c b/libs/video/renderer/sw32/vid_common_sw32.c
index c6679ebfa..e1e8d3886 100644
--- a/libs/video/renderer/sw32/vid_common_sw32.c
+++ b/libs/video/renderer/sw32/vid_common_sw32.c
@@ -43,34 +43,6 @@
 unsigned short sw32_8to16table[256];
 
 
-/*
-	lhfindcolor
-
-	LordHavoc: finds nearest matching color in a palette
-*/
-static int
-lhfindcolor (byte *pal, int colors, int r, int g, int b)
-{
-	int i, dist, best, bestdist, rd, gd, bd;
-	best = 0;
-	bestdist = 1000000000;
-	for (i = 0;i < colors;i++)
-	{
-		rd = pal[i*3+0] - r;
-		gd = pal[i*3+1] - g;
-		bd = pal[i*3+2] - b;
-		dist = rd*rd+gd*gd+bd*bd;
-		if (dist < bestdist)
-		{
-			if (!dist) // exact match
-				return i;
-			best = i;
-			bestdist = dist;
-		}
-	}
-	return best;
-}
-
 /*
 	VID_MakeColormap32
 
@@ -160,41 +132,17 @@ VID_MakeColormap16 (void *outcolormap, byte *pal)
 	}
 }
 
-/*
-	VID_MakeColormap8
-
-	LordHavoc: makes a 8bit color*light table
-*/
-static void
-VID_MakeColormap8 (void *outcolormap, byte *pal)
-{
-	int c, l;
-	byte *out;
-	out = (byte *) outcolormap;
-	for (l = 0;l < VID_GRADES;l++)
-	{
-		for (c = 0;c < vid.fullbright;c++)
-			out[l*256+c] = lhfindcolor(pal, 256,
-									   (pal[c*3+0] * l) >> (VID_CBITS - 1),
-									   (pal[c*3+1] * l) >> (VID_CBITS - 1),
-									   (pal[c*3+2] * l) >> (VID_CBITS - 1));
-		for (;c < 256;c++)
-			out[l*256+c] = c;
-	}
-}
-
 /*
 	VID_MakeColormaps
 
 	LordHavoc: makes 8bit, 16bit, and 32bit colormaps and palettes
 */
 void
-VID_MakeColormaps (int fullbrights, byte *pal)
+VID_MakeColormaps (void)
 {
-	vid.fullbright = fullbrights;
 	vid.colormap16 = malloc (256*VID_GRADES * sizeof (short));
 	vid.colormap32 = malloc (256*VID_GRADES * sizeof (int));
-	SYS_CHECKMEM (vid.colormap8 && vid.colormap16 && vid.colormap32);
-	VID_MakeColormap16(vid.colormap16, pal);
-	VID_MakeColormap32(vid.colormap32, pal);
+	SYS_CHECKMEM (vid.colormap16 && vid.colormap32);
+	VID_MakeColormap16(vid.colormap16, vid.palette);
+	VID_MakeColormap32(vid.colormap32, vid.palette);
 }

From d1a8c1b27783f8814bae1c6e5c59b74c0f99efdf Mon Sep 17 00:00:00 2001
From: Johnny <johnnyonflame@hotmail.com>
Date: Mon, 3 Feb 2014 05:04:11 -0200
Subject: [PATCH 0086/1519] Color swizzle & software lighting fix

---
 libs/video/renderer/sw32/sw32_rsurf.c      | 34 ++++++++++++++--------
 libs/video/renderer/sw32/vid_common_sw32.c | 22 ++++++++++----
 2 files changed, 38 insertions(+), 18 deletions(-)

diff --git a/libs/video/renderer/sw32/sw32_rsurf.c b/libs/video/renderer/sw32/sw32_rsurf.c
index 4ffe08354..9badf0c96 100644
--- a/libs/video/renderer/sw32/sw32_rsurf.c
+++ b/libs/video/renderer/sw32/sw32_rsurf.c
@@ -193,20 +193,30 @@ R_BuildLightMap (void)
 	if (surf->dlightframe == r_framecount)
 		R_AddDynamicLights ();
 
-//	// LordHavoc: changed to positive (not inverse) lighting
-//	for (i = 0; i < size; i++) {
-//		t = bound(256, blocklights[i] >> (8 - VID_CBITS),
-//				  256 * (VID_GRADES - 1));
-//		blocklights[i] = t;
-//	}
-	// bound, invert, and shift
-	for (i = 0; i < size; i++) {
-		t = (255 * 256 - blocklights[i]) >> (8 - VID_CBITS);
+	/*
+	 * JohnnyonFlame:
+	 * 32 and 16bpp modes uses the positive lighting, unlike 8bpp
+	 */
+	switch (sw32_r_pixbytes) {
+	case 1:
+		// bound, invert, and shift
+		for (i = 0; i < size; i++) {
+			t = (255 * 256 - blocklights[i]) >> (8 - VID_CBITS);
 
-		if (t < (1 << 6))
-			t = (1 << 6);
+			if (t < (1 << 6))
+				t = (1 << 6);
 
-		blocklights[i] = t;
+			blocklights[i] = t;
+		}
+		break;
+	default:
+		// LordHavoc: changed to positive (not inverse) lighting
+		for (i = 0; i < size; i++) {
+			t = bound(256, blocklights[i] >> (8 - VID_CBITS),
+					  256 * (VID_GRADES - 1));
+			blocklights[i] = t;
+		}
+		break;
 	}
 }
 
diff --git a/libs/video/renderer/sw32/vid_common_sw32.c b/libs/video/renderer/sw32/vid_common_sw32.c
index e1e8d3886..279ee08d6 100644
--- a/libs/video/renderer/sw32/vid_common_sw32.c
+++ b/libs/video/renderer/sw32/vid_common_sw32.c
@@ -55,31 +55,41 @@ VID_MakeColormap32 (void *outcolormap, byte *pal)
 	int c, l;
 	byte *out;
 	out = (byte *)&d_8to24table;
+
+	/*
+	 * Generates colors not affected by lighting, such as
+	 * HUD pieces and general sprites (such as explosions)
+	 */
 	for (c = 0; c < 256; c++) {
-		*out++ = pal[c*3+0];
-		*out++ = pal[c*3+1];
 		*out++ = pal[c*3+2];
+		*out++ = pal[c*3+1];
+		*out++ = pal[c*3+0];
 		*out++ = 255;
 	}
 	d_8to24table[255] = 0;				// 255 is transparent
 	out = (byte *) outcolormap;
+
+	/*
+	 * Generates colors affected by lighting, such as the
+	 * world and other models that give it life, like foes and pickups.
+	 */
 	for (l = 0;l < VID_GRADES;l++)
 	{
 		for (c = 0;c < vid.fullbright;c++)
 		{
-			out[(l*256+c)*4+0] = bound(0, (pal[c*3+0] * l) >> (VID_CBITS - 1),
+			out[(l*256+c)*4+0] = bound(0, (pal[c*3+2] * l) >> (VID_CBITS - 1),
 									   255);
 			out[(l*256+c)*4+1] = bound(0, (pal[c*3+1] * l) >> (VID_CBITS - 1),
 									   255);
-			out[(l*256+c)*4+2] = bound(0, (pal[c*3+2] * l) >> (VID_CBITS - 1),
+			out[(l*256+c)*4+2] = bound(0, (pal[c*3+0] * l) >> (VID_CBITS - 1),
 									   255);
 			out[(l*256+c)*4+3] = 255;
 		}
 		for (;c < 255;c++)
 		{
-			out[(l*256+c)*4+0] = pal[c*3+0];
+			out[(l*256+c)*4+0] = pal[c*3+2];
 			out[(l*256+c)*4+1] = pal[c*3+1];
-			out[(l*256+c)*4+2] = pal[c*3+2];
+			out[(l*256+c)*4+2] = pal[c*3+0];
 			out[(l*256+c)*4+3] = 255;
 		}
 		out[(l*256+255)*4+0] = 0;

From 3fb9fb9373fb1024a5505a3ed2af91df37bddcec Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 3 Feb 2014 16:47:51 +0900
Subject: [PATCH 0087/1519] Attempt to autoconfiscate gcc_struct.

It seems some tool-chains get rather picky about such things.
---
 config.d/typedefs_structs_compiler.m4 | 20 +++++++++++++++++++-
 include/QF/pr_comp.h                  |  2 +-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/config.d/typedefs_structs_compiler.m4 b/config.d/typedefs_structs_compiler.m4
index 5bc4f7df1..a25fb7941 100644
--- a/config.d/typedefs_structs_compiler.m4
+++ b/config.d/typedefs_structs_compiler.m4
@@ -45,7 +45,7 @@ AC_TRY_COMPILE(
 	AC_MSG_RESULT(no)
 )
 AH_VERBATIM([HAVE___ATTRIBUTE__VISIBILITY],
-[/* Define this if the GCC __attribute__ keyword is available */
+[/* Define this if the GCC visibility __attribute__ is available */
 #undef HAVE___ATTRIBUTE__VISIBILITY
 #ifdef HAVE___ATTRIBUTE__VISIBILITY
 # define VISIBLE __attribute__((visibility ("default")))
@@ -53,6 +53,24 @@ AH_VERBATIM([HAVE___ATTRIBUTE__VISIBILITY],
 # define VISIBLE
 #endif])
 
+AC_MSG_CHECKING(for __attribute__ ((gcc_struct)))
+AC_TRY_COMPILE(
+	[void foo (void);
+	typedef struct { int foo; } __attribute__ ((gcc_struct)) gcc_struct_test;],
+	[],
+	AC_DEFINE(HAVE___ATTRIBUTE__GCC_STRUCT)
+	AC_MSG_RESULT(yes),
+	AC_MSG_RESULT(no)
+)
+AH_VERBATIM([HAVE___ATTRIBUTE__GCC_STRUCT],
+[/* Define this if the GCC gcc_struct __attribute__ is available */
+#undef HAVE___ATTRIBUTE__GCC_STRUCT
+#ifdef HAVE___ATTRIBUTE__GCC_STRUCT
+# define GCC_STRUCT __attribute__((gcc_struct))
+#else
+# define GCC_STRUCT
+#endif])
+
 AC_MSG_CHECKING(for __builtin_expect)
 AC_TRY_COMPILE(
 	[long (*foo) (long, long) = __builtin_expect;],
diff --git a/include/QF/pr_comp.h b/include/QF/pr_comp.h
index dfc670d27..4cc274f98 100644
--- a/include/QF/pr_comp.h
+++ b/include/QF/pr_comp.h
@@ -314,7 +314,7 @@ void PR_Opcode_Init (void);
 typedef struct dstatement_s {
 	pr_opcode_e op:16;
 	pr_ushort_t a,b,c;
-} __attribute__((gcc_struct)) dstatement_t;
+} GCC_STRUCT dstatement_t;
 
 typedef struct ddef_s {
 	pr_ushort_t type;			// if DEF_SAVEGLOBGAL bit is set

From 512514ca23c70f9f912eff9336853e3120074267 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 3 Feb 2014 16:55:09 +0900
Subject: [PATCH 0088/1519] Limit gcc_struct checking to win32 builds.

I guess -Werror isn't used when doing compile checks.
---
 config.d/typedefs_structs_compiler.m4 | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/config.d/typedefs_structs_compiler.m4 b/config.d/typedefs_structs_compiler.m4
index a25fb7941..a68df83b8 100644
--- a/config.d/typedefs_structs_compiler.m4
+++ b/config.d/typedefs_structs_compiler.m4
@@ -53,15 +53,17 @@ AH_VERBATIM([HAVE___ATTRIBUTE__VISIBILITY],
 # define VISIBLE
 #endif])
 
-AC_MSG_CHECKING(for __attribute__ ((gcc_struct)))
-AC_TRY_COMPILE(
-	[void foo (void);
-	typedef struct { int foo; } __attribute__ ((gcc_struct)) gcc_struct_test;],
-	[],
-	AC_DEFINE(HAVE___ATTRIBUTE__GCC_STRUCT)
-	AC_MSG_RESULT(yes),
-	AC_MSG_RESULT(no)
-)
+if test "x$SYSTYPE" = "xWIN32"; then
+	AC_MSG_CHECKING(for __attribute__ ((gcc_struct)))
+	AC_TRY_COMPILE(
+		[typedef struct { int foo; }
+		__attribute__ ((gcc_struct)) gcc_struct_test;],
+		[],
+		AC_DEFINE(HAVE___ATTRIBUTE__GCC_STRUCT)
+		AC_MSG_RESULT(yes),
+		AC_MSG_RESULT(no)
+	)
+fi
 AH_VERBATIM([HAVE___ATTRIBUTE__GCC_STRUCT],
 [/* Define this if the GCC gcc_struct __attribute__ is available */
 #undef HAVE___ATTRIBUTE__GCC_STRUCT

From d1f1375df5a25d420bb39afb8857152cc5726f68 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 17 Aug 2014 11:35:40 +0900
Subject: [PATCH 0089/1519] Increase number of supported joystick buttons.

Also fix a bug where despite supporting 32 buttons, only 18 were actually
supported, and a similar issue for the number of axes.

My saitek x52 has 34 buttons and 10 axes. Whee.
---
 include/QF/joystick.h     |  4 ++--
 include/QF/keys.h         | 32 ++++++++++++++++++++++++++++++++
 libs/video/targets/keys.c | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 66 insertions(+), 2 deletions(-)

diff --git a/include/QF/joystick.h b/include/QF/joystick.h
index 0ad1481b3..781f783a9 100644
--- a/include/QF/joystick.h
+++ b/include/QF/joystick.h
@@ -31,8 +31,8 @@
 #include <QF/qtypes.h>
 #include "QF/quakeio.h"
 
-#define JOY_MAX_AXES    8
-#define JOY_MAX_BUTTONS 18
+#define JOY_MAX_AXES    32
+#define JOY_MAX_BUTTONS 64
 
 extern struct cvar_s	*joy_device;		// Joystick device name
 extern struct cvar_s	*joy_enable;		// Joystick enabling flag
diff --git a/include/QF/keys.h b/include/QF/keys.h
index 99ca434d2..6661aaeac 100644
--- a/include/QF/keys.h
+++ b/include/QF/keys.h
@@ -409,6 +409,38 @@ typedef enum {
 	QFJ_BUTTON30,
 	QFJ_BUTTON31,
 	QFJ_BUTTON32,
+	QFJ_BUTTON33,
+	QFJ_BUTTON34,
+	QFJ_BUTTON35,
+	QFJ_BUTTON36,
+	QFJ_BUTTON37,
+	QFJ_BUTTON38,
+	QFJ_BUTTON39,
+	QFJ_BUTTON40,
+	QFJ_BUTTON41,
+	QFJ_BUTTON42,
+	QFJ_BUTTON43,
+	QFJ_BUTTON44,
+	QFJ_BUTTON45,
+	QFJ_BUTTON46,
+	QFJ_BUTTON47,
+	QFJ_BUTTON48,
+	QFJ_BUTTON49,
+	QFJ_BUTTON50,
+	QFJ_BUTTON51,
+	QFJ_BUTTON52,
+	QFJ_BUTTON53,
+	QFJ_BUTTON54,
+	QFJ_BUTTON55,
+	QFJ_BUTTON56,
+	QFJ_BUTTON57,
+	QFJ_BUTTON58,
+	QFJ_BUTTON59,
+	QFJ_BUTTON60,
+	QFJ_BUTTON61,
+	QFJ_BUTTON62,
+	QFJ_BUTTON63,
+	QFJ_BUTTON64,
 
 //
 // joystick axes (for button emulation without consuming buttons)
diff --git a/libs/video/targets/keys.c b/libs/video/targets/keys.c
index 9adf25c4e..9b488a7ed 100644
--- a/libs/video/targets/keys.c
+++ b/libs/video/targets/keys.c
@@ -442,6 +442,38 @@ keyname_t   keynames[] = {
 	{ "J_BUTTON30",		QFJ_BUTTON30 },
 	{ "J_BUTTON31",		QFJ_BUTTON31 },
 	{ "J_BUTTON32",		QFJ_BUTTON32 },
+	{ "J_BUTTON33",		QFJ_BUTTON33 },
+	{ "J_BUTTON34",		QFJ_BUTTON34 },
+	{ "J_BUTTON35",		QFJ_BUTTON35 },
+	{ "J_BUTTON36",		QFJ_BUTTON36 },
+	{ "J_BUTTON37",		QFJ_BUTTON37 },
+	{ "J_BUTTON38",		QFJ_BUTTON38 },
+	{ "J_BUTTON39",		QFJ_BUTTON39 },
+	{ "J_BUTTON40",		QFJ_BUTTON40 },
+	{ "J_BUTTON41",		QFJ_BUTTON41 },
+	{ "J_BUTTON42",		QFJ_BUTTON42 },
+	{ "J_BUTTON43",		QFJ_BUTTON43 },
+	{ "J_BUTTON44",		QFJ_BUTTON44 },
+	{ "J_BUTTON45",		QFJ_BUTTON45 },
+	{ "J_BUTTON46",		QFJ_BUTTON46 },
+	{ "J_BUTTON47",		QFJ_BUTTON47 },
+	{ "J_BUTTON48",		QFJ_BUTTON48 },
+	{ "J_BUTTON49",		QFJ_BUTTON49 },
+	{ "J_BUTTON50",		QFJ_BUTTON50 },
+	{ "J_BUTTON51",		QFJ_BUTTON51 },
+	{ "J_BUTTON52",		QFJ_BUTTON52 },
+	{ "J_BUTTON53",		QFJ_BUTTON53 },
+	{ "J_BUTTON54",		QFJ_BUTTON54 },
+	{ "J_BUTTON55",		QFJ_BUTTON55 },
+	{ "J_BUTTON56",		QFJ_BUTTON56 },
+	{ "J_BUTTON57",		QFJ_BUTTON57 },
+	{ "J_BUTTON58",		QFJ_BUTTON58 },
+	{ "J_BUTTON59",		QFJ_BUTTON59 },
+	{ "J_BUTTON60",		QFJ_BUTTON60 },
+	{ "J_BUTTON61",		QFJ_BUTTON61 },
+	{ "J_BUTTON62",		QFJ_BUTTON62 },
+	{ "J_BUTTON63",		QFJ_BUTTON63 },
+	{ "J_BUTTON64",		QFJ_BUTTON64 },
 
 	{ "J_AXIS1",		QFJ_AXIS1 },
 	{ "J_AXIS2",		QFJ_AXIS2 },

From 396338a5438c2af457f14a7d507e4d3103774716 Mon Sep 17 00:00:00 2001
From: Jeff Teunissen <deek@d2dc.net>
Date: Fri, 17 Aug 2012 20:22:03 -0400
Subject: [PATCH 0090/1519] Rua: flesh out docs for BOOL.

---
 ruamoko/include/runtime.h | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/ruamoko/include/runtime.h b/ruamoko/include/runtime.h
index dd24d637d..bbcd793ed 100644
--- a/ruamoko/include/runtime.h
+++ b/ruamoko/include/runtime.h
@@ -16,6 +16,22 @@ enum {
 
 /**
 	Standard boolean type
+
+	This is not like a boolean in some other languages, where you can compare
+	any number against the 'true' value; that is, the following does not catch
+	all true values.
+	\code
+	if (foo == YES) {
+		...
+	}
+	\endcode
+	If you want to catch all true values, simply test for truth using something
+	like:
+	\code
+	if (foo) {
+		...
+	}
+	\endcode
 */
 typedef enum {
 	NO = 0,		///< the false value

From 890c83ff6e91654f0a6bd467e3617f9b6b3a35bd Mon Sep 17 00:00:00 2001
From: Jeff Teunissen <deek@d2dc.net>
Date: Thu, 16 Oct 2014 13:45:39 -0400
Subject: [PATCH 0091/1519] Fix crash in classic GL

GL sometimes crashes when building skins. This probably isn't the correct
fix (finding the situation where fb->tex can become NULL despite fb being
non-null is), but it does kill the segfault. Luckily, this is git and this
commit can just be reverted when the real fix shows up. :)
---
 libs/models/gl_skin.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libs/models/gl_skin.c b/libs/models/gl_skin.c
index 0647d361e..16881d326 100644
--- a/libs/models/gl_skin.c
+++ b/libs/models/gl_skin.c
@@ -185,6 +185,7 @@ build_skin (skin_t *skin, int cmap)
 		s = &player_skin;
 	if (!s->tex)	// we haven't loaded the player model yet
 		return;
+
 	texnum = skin_textures + cmap;
 	fb_texnum = 0;
 	if (s->fb)
@@ -196,13 +197,13 @@ build_skin (skin_t *skin, int cmap)
 	if (vid.is8bit) {
 		build_skin_8 (s->tex, texnum, skin_cmap[cmap],
 					  scaled_width, scaled_height, false);
-		if (s->fb)
+		if (s->fb && s->fb_tex)
 			build_skin_8 (s->fb_tex, fb_texnum, skin_cmap[cmap],
 						  scaled_width, scaled_height, true);
 	} else {
 		build_skin_32 (s->tex, texnum, skin_cmap[cmap],
 					   scaled_width, scaled_height, false);
-		if (s->fb)
+		if (s->fb && s->fb_tex)
 			build_skin_32 (s->fb_tex, fb_texnum, skin_cmap[cmap],
 						   scaled_width, scaled_height, true);
 	}

From bdb221c1d7c861c92caefe80ccc30ca309a2cfce Mon Sep 17 00:00:00 2001
From: Jeff Teunissen <deek@d2dc.net>
Date: Thu, 16 Oct 2014 13:49:43 -0400
Subject: [PATCH 0092/1519] Make the docs better for people blessed with sight

Under certain conditions, language keywords for code examples were being
shown in the same color as the background. This...didn't work out well.
---
 doc/doxygen.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/doxygen.css b/doc/doxygen.css
index e7b24f727..accf1ce9c 100644
--- a/doc/doxygen.css
+++ b/doc/doxygen.css
@@ -276,17 +276,17 @@ img.footer {
 /* @group Code Colorization */
 
 span.keyword {
-	color: #262833;
+	color: white;
 	font-weight: bold;
 }
 
 span.keywordtype {
-	color: #262833;
+	color: #bec3d9;
 	font-weight: bold;
 }
 
 span.keywordflow {
-	color: #000000;
+	color: #bec3d9;
 	font-weight: bold;
 }
 

From 331b054d4a3c39dc2e7aa89e4947987f6d9478c4 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 18 Aug 2014 22:11:10 +0900
Subject: [PATCH 0093/1519] Fix an inappropriate reuse of a variable.

Using "ax"is for the joystick "var"iable is a bit confusing.
---
 libs/video/targets/joy.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libs/video/targets/joy.c b/libs/video/targets/joy.c
index 939ed6805..0a209cdfe 100644
--- a/libs/video/targets/joy.c
+++ b/libs/video/targets/joy.c
@@ -360,8 +360,8 @@ in_joy_f (void)
 	int         i, ax, c = Cmd_Argc ();
 
 	if (c == 2) {
-		ax = JOY_GetOption_i (Cmd_Argv (1));
-		switch (ax) {
+		int         var = JOY_GetOption_i (Cmd_Argv (1));
+		switch (var) {
 			case js_clear:
 				Sys_Printf ("Clearing all joystick settings...\n");
 				for (i = 0; i < JOY_MAX_AXES; i++) {
@@ -406,7 +406,7 @@ in_joy_f (void)
 		}
 		return;
 	} else if (c < 4) {
-		if (JOY_GetOption_i (Cmd_Argv (2)) == js_clear) {
+		if (c == 3 && JOY_GetOption_i (Cmd_Argv (2)) == js_clear) {
 			ax = strtol (Cmd_Argv (1), NULL, 0);
 
 			joy_clear_axis (ax);

From 8b9f513883030d9ce7bfba71b45af0646c6b831a Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 9 Aug 2015 18:24:17 +0900
Subject: [PATCH 0094/1519] Correct a spelling mistake.

---
 doc/property-list.dox | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/property-list.dox b/doc/property-list.dox
index 8be3f3b70..e9388b325 100644
--- a/doc/property-list.dox
+++ b/doc/property-list.dox
@@ -87,5 +87,5 @@ And yes, these long strings were inspired by Python's long strings.
 	 for doxygen -->
 Binary data is hex-encoded and contained within angle brackets (\c \< \c
 \>). There must be an even number of hex-digits. That is, while \c \<FF00\>
-is value, \c \<F00\> is not.
+is valid, \c \<F00\> is not.
 */

From c71eccfb10023bc6001fed1aa4831f1f5c5c9416 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 14 Aug 2015 10:57:51 +0900
Subject: [PATCH 0095/1519] Remove MAX_THREADS.

This fixes a buffer overflow with more than 4 threads.
---
 tools/qfvis/source/qfvis.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tools/qfvis/source/qfvis.c b/tools/qfvis/source/qfvis.c
index 020d80723..7ec7e776c 100644
--- a/tools/qfvis/source/qfvis.c
+++ b/tools/qfvis/source/qfvis.c
@@ -60,8 +60,6 @@
 #include "vis.h"
 #include "options.h"
 
-#define	MAX_THREADS		4
-
 #ifdef USE_PTHREADS
 pthread_attr_t threads_attrib;
 pthread_rwlock_t *global_lock;
@@ -528,11 +526,12 @@ static void
 RunThreads (void *(*thread_func) (void *))
 {
 #ifdef USE_PTHREADS
-	pthread_t   work_threads[MAX_THREADS + 1];
+	pthread_t  *work_threads;
 	void       *status;
 	int         i;
 
 	if (options.threads > 1) {
+		work_threads = alloca ((options.threads + 1) * sizeof (pthread_t *));
 		working = calloc (options.threads, sizeof (int));
 		for (i = 0; i < options.threads; i++) {
 			if (pthread_create (&work_threads[i], &threads_attrib,

From f0dc995c6740ab1a3a64cbb5c7a182b68bfcc22a Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 18 Aug 2015 00:11:03 +0900
Subject: [PATCH 0096/1519] Handle c99 inline vs gnu89 inline.

The meaning of "extern inline" and "inline" swaps between the two, and
gcc-5 uses c99 inline.
---
 config.d/compiling.m4    | 21 +++++++++++++++++++++
 include/QF/math/vector.h |  4 ++--
 include/QF/mathlib.h     |  8 ++++----
 include/gib_parse.h      |  2 +-
 4 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/config.d/compiling.m4 b/config.d/compiling.m4
index a27ef04c5..457882d09 100644
--- a/config.d/compiling.m4
+++ b/config.d/compiling.m4
@@ -14,6 +14,27 @@ if test "x$CFLAGS" != "x"; then
 fi
 AC_MSG_RESULT([$leave_cflags_alone])
 
+AC_MSG_CHECKING(for C99 inline)
+c99_inline=no
+AC_TRY_LINK(
+	[inline int foo (int x) { return x * x; }
+	 int (*bar) (int) = foo;],
+	[],
+	c99_inline=no
+	AC_MSG_RESULT(no),
+	c99_inline=yes
+	AC_DEFINE(HAVE_C99INLINE, extern, [define this if using c99 inline])
+	AC_MSG_RESULT(yes)
+)
+AH_VERBATIM([HAVE_C99INLINE],
+[/* Define this if the GCC __attribute__ keyword is available */
+#undef HAVE_C99INLINE
+#ifdef HAVE_C99INLINE
+# define GNU89INLINE
+#else
+# define GNU89INLINE extern
+#endif])
+
 if test "x$GCC" = xyes; then
 	set $CC
 	shift
diff --git a/include/QF/math/vector.h b/include/QF/math/vector.h
index db9aa36ca..994ffee62 100644
--- a/include/QF/math/vector.h
+++ b/include/QF/math/vector.h
@@ -183,10 +183,10 @@ void _VectorSubtract (const vec3_t veca, const vec3_t vecb, vec3_t out);
 void CrossProduct (const vec3_t v1, const vec3_t v2, vec3_t cross);
 vec_t _VectorNormalize (vec3_t v);			// returns vector length
 
-extern inline float VectorNormalize (vec3_t v);	// returns vector length
+GNU89INLINE inline float VectorNormalize (vec3_t v);	// returns vector length
 
 #ifndef IMPLEMENT_VectorNormalize
-extern inline
+GNU89INLINE inline
 #else
 VISIBLE
 #endif
diff --git a/include/QF/mathlib.h b/include/QF/mathlib.h
index 75c427ced..498dbd2d0 100644
--- a/include/QF/mathlib.h
+++ b/include/QF/mathlib.h
@@ -174,11 +174,11 @@ void RotatePointAroundVector (vec3_t dst, const vec3_t axis,
 	} while (0)
 
 extern plane_t * const frustum;
-extern inline qboolean R_CullBox (const vec3_t mins, const vec3_t maxs);
-extern inline qboolean R_CullSphere (const vec3_t origin, const float radius);
+GNU89INLINE inline qboolean R_CullBox (const vec3_t mins, const vec3_t maxs);
+GNU89INLINE inline qboolean R_CullSphere (const vec3_t origin, const float radius);
 
 #ifndef IMPLEMENT_R_Cull
-extern inline
+GNU89INLINE inline
 #else
 VISIBLE
 #endif
@@ -194,7 +194,7 @@ R_CullBox (const vec3_t mins, const vec3_t maxs)
 }
 
 #ifndef IMPLEMENT_R_Cull
-extern inline
+GNU89INLINE inline
 #else
 VISIBLE
 #endif
diff --git a/include/gib_parse.h b/include/gib_parse.h
index c9be84248..a6dae25c0 100644
--- a/include/gib_parse.h
+++ b/include/gib_parse.h
@@ -30,7 +30,7 @@
 
 #include "gib_tree.h"
 
-inline qboolean GIB_Escaped (const char *str, int i);
+qboolean GIB_Escaped (const char *str, int i);
 
 char GIB_Parse_Match_Brace (const char *str, unsigned int *i);
 char GIB_Parse_Match_Backtick (const char *str, unsigned int *i);

From c3e3ed944c2e1190a56eb0dccd0c784bf2f8e183 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 12 Oct 2015 23:56:42 +0900
Subject: [PATCH 0097/1519] Plug a memory leak.

Courtesy Maraakate.
---
 qw/source/cl_http.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qw/source/cl_http.c b/qw/source/cl_http.c
index efa670c79..38bd9f204 100644
--- a/qw/source/cl_http.c
+++ b/qw/source/cl_http.c
@@ -114,7 +114,7 @@ CL_HTTP_Update (void)
 				Sys_Printf ("download failed: %ld\n", response_code);
 				CL_FailDownload ();
 			}
-			curl_multi_remove_handle (multi_handle, easy_handle);
+			CL_HTTP_Reset ();
 		}
 	}
 }

From 7b350b2a1ba6dc526219ef91f284ec0712438390 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 3 Jan 2016 16:13:59 +0900
Subject: [PATCH 0098/1519] Indicate calls to builtins when tracing.

This makes following progs traces a little easier.
---
 libs/gamecode/pr_exec.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libs/gamecode/pr_exec.c b/libs/gamecode/pr_exec.c
index f67bc1856..0ebf7dbef 100644
--- a/libs/gamecode/pr_exec.c
+++ b/libs/gamecode/pr_exec.c
@@ -338,6 +338,10 @@ PR_CallFunction (progs_t *pr, func_t fnum)
 	f = pr->function_table + fnum;
 	if (f->first_statement < 0) {
 		// negative statements are built in functions
+		if (pr->pr_trace) {
+			Sys_Printf ("Calling builtin %s @ %p\n",
+						PR_GetString (pr, f->descriptor->s_name), f->func);
+		}
 		f->func (pr);
 		return 0;
 	} else {

From 61c6a4b68edb3c4ebc759fdbdc2f6cd67789dd4c Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 3 Jan 2016 16:18:14 +0900
Subject: [PATCH 0099/1519] Include config.h in model tests.

The gcc inlining changes made it necessary.
---
 libs/models/test/hulls.c        | 4 ++++
 libs/models/test/testclip.c     | 4 ++++
 libs/models/test/testcontents.c | 4 ++++
 libs/models/test/testportals.c  | 4 ++++
 4 files changed, 16 insertions(+)

diff --git a/libs/models/test/hulls.c b/libs/models/test/hulls.c
index 261957512..1b7fa39ba 100644
--- a/libs/models/test/hulls.c
+++ b/libs/models/test/hulls.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "hulls.h"
 
 //  0,0
diff --git a/libs/models/test/testclip.c b/libs/models/test/testclip.c
index df7649ae5..6b6672e4b 100644
--- a/libs/models/test/testclip.c
+++ b/libs/models/test/testclip.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <stdlib.h>
 #include "QF/va.h"
 
diff --git a/libs/models/test/testcontents.c b/libs/models/test/testcontents.c
index d69b01269..605ed7a6c 100644
--- a/libs/models/test/testcontents.c
+++ b/libs/models/test/testcontents.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <stdlib.h>
 #include "QF/va.h"
 
diff --git a/libs/models/test/testportals.c b/libs/models/test/testportals.c
index f5f31f4e6..1cc2f50ec 100644
--- a/libs/models/test/testportals.c
+++ b/libs/models/test/testportals.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <stdlib.h>
 #include "QF/va.h"
 

From a54f3d903568d1ad0a79f6093dfb14edfac10710 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 3 Jan 2016 17:39:03 +0900
Subject: [PATCH 0100/1519] Shutdown some subsystems on exit.

This fixes the problem with X keyboard repeat not being restored.
---
 tools/qwaq/qwaq-bi.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tools/qwaq/qwaq-bi.c b/tools/qwaq/qwaq-bi.c
index 822c8c635..918dfbd28 100644
--- a/tools/qwaq/qwaq-bi.c
+++ b/tools/qwaq/qwaq-bi.c
@@ -151,6 +151,14 @@ static builtin_t builtins[] = {
 	{0}
 };
 
+static void
+bi_shutdown (void)
+{
+	S_Shutdown ();
+	IN_Shutdown ();
+	VID_Shutdown ();
+}
+
 void
 BI_Init (progs_t *pr)
 {
@@ -162,6 +170,8 @@ BI_Init (progs_t *pr)
 	PI_Init ();
 	PI_RegisterPlugins (client_plugin_list);
 
+	Sys_RegisterShutdown (bi_shutdown);
+
 	VID_Init_Cvars ();
 	IN_Init_Cvars ();
 	Mod_Init_Cvars ();

From 2cbb7cb0c814802acb589928ffa284b3ac0b86e3 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 3 Jan 2016 18:38:41 +0900
Subject: [PATCH 0101/1519] Remove a redundant va_start/va_end pair.

Found while checking how many places use va_copy.
---
 libs/util/quakeio.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/libs/util/quakeio.c b/libs/util/quakeio.c
index 08e675e6e..f8e62df46 100644
--- a/libs/util/quakeio.c
+++ b/libs/util/quakeio.c
@@ -383,9 +383,7 @@ Qprintf (QFile *file, const char *fmt, ...)
 		if (!buf)
 			buf = dstring_new ();
 
-		va_start (args, fmt);
 		dvsprintf (buf, fmt, args);
-		va_end (args);
 		ret = strlen (buf->str);
 		if (ret > 0)
 			ret = gzwrite (file->gzfile, buf, (unsigned) ret);

From 735fcf68d5e2142d65e65a98f00b0e49406e9899 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 3 Jan 2016 21:16:23 +0900
Subject: [PATCH 0102/1519] Clean up usage of va_copy.

AC_TYPE_VA_LIST is no longer necessary, and the code is easier to read.
---
 config.d/library_functions.m4         | 13 +++++++++++--
 config.d/typedefs_structs_compiler.m4 |  2 --
 libs/util/dstring.c                   | 20 +++-----------------
 libs/util/sys.c                       | 18 ++----------------
 tools/qflmp/lmp.c                     |  3 +++
 5 files changed, 19 insertions(+), 37 deletions(-)

diff --git a/config.d/library_functions.m4 b/config.d/library_functions.m4
index e53ca3efb..66ff31edc 100644
--- a/config.d/library_functions.m4
+++ b/config.d/library_functions.m4
@@ -7,8 +7,6 @@ AC_FUNC_MEMCMP
 AC_FUNC_MMAP
 AC_TYPE_SIGNAL
 AC_FUNC_VPRINTF
-AC_FUNC_VA_COPY
-AC_FUNC__VA_COPY
 AC_CHECK_FUNCS(
 	access _access connect dlopen execvp fcntl ftime _ftime getaddrinfo \
 	gethostbyname gethostname getnameinfo getpagesize gettimeofday getuid \
@@ -17,6 +15,17 @@ AC_CHECK_FUNCS(
 	_vsnprintf wait
 )
 
+AC_FUNC_VA_COPY
+AC_FUNC__VA_COPY
+AH_VERBATIM([DEFINE_VA_COPY],
+[#ifndef HAVE_VA_COPY
+# ifdef HAVE__VA_COPY
+#  define va_copy(d,s) __va_copy ((d), (s))
+# else
+#  define va_copy(d,s) memcpy (&(d), &(s), sizeof (va_list))
+# endif
+#endif])
+
 DL_LIBS=""
 if test "x$ac_cv_func_dlopen" != "xyes"; then
 	AC_CHECK_LIB(dl, dlopen,
diff --git a/config.d/typedefs_structs_compiler.m4 b/config.d/typedefs_structs_compiler.m4
index a68df83b8..3ba73b7d6 100644
--- a/config.d/typedefs_structs_compiler.m4
+++ b/config.d/typedefs_structs_compiler.m4
@@ -88,8 +88,6 @@ AH_VERBATIM([HAVE___BUILTIN_EXPECT],
 # define __builtin_expect(x,c) x
 #endif])
 
-AC_TYPE_VA_LIST
-
 AC_MSG_CHECKING(for type of fpos_t)
 AC_TRY_COMPILE(
 	[#include <stdio.h>],
diff --git a/libs/util/dstring.c b/libs/util/dstring.c
index 7f8fd190e..4e43a0aae 100644
--- a/libs/util/dstring.c
+++ b/libs/util/dstring.c
@@ -299,23 +299,13 @@ dstring_clearstr (dstring_t *dstr)
 	dstr->str[0] = 0;
 }
 
-#if defined (HAVE_VA_COPY)
-# define VA_COPY(a,b) va_copy (a, b)
-#elif defined (HAVE__VA_COPY)
-# define VA_COPY(a,b) __va_copy (a, b)
-#else
-# define VA_COPY(a,b) memcpy (a, b, sizeof (a))
-#endif
-
 static int
 _dvsprintf (dstring_t *dstr, int offs, const char *fmt, va_list args)
 {
 	int         size;
 
-#ifdef VA_LIST_IS_ARRAY
 	va_list     tmp_args;
-	VA_COPY (tmp_args, args);
-#endif
+	va_copy (tmp_args, args);
 
 	if (!dstr->truesize)
 		dstring_clearstr (dstr); // Make it a string
@@ -324,17 +314,13 @@ _dvsprintf (dstring_t *dstr, int offs, const char *fmt, va_list args)
 							  args)) == -1) {
 		dstr->size = (dstr->truesize & ~1023) + 1024;
 		dstring_adjust (dstr);
-#ifdef VA_LIST_IS_ARRAY
-		VA_COPY (args, tmp_args);
-#endif
+		va_copy (args, tmp_args);
 	}
 	dstr->size = size + offs + 2;
 	// "Proper" implementations return the required size
 	if (dstr->size > dstr->truesize) {
 		dstring_adjust (dstr);
-#ifdef VA_LIST_IS_ARRAY
-		VA_COPY (args, tmp_args);
-#endif
+		va_copy (args, tmp_args);
 		vsnprintf (dstr->str + offs, dstr->truesize - offs - 1, fmt, args);
 	}
 	dstr->size = size + offs + 1;
diff --git a/libs/util/sys.c b/libs/util/sys.c
index d6e9af789..4e2e111e2 100644
--- a/libs/util/sys.c
+++ b/libs/util/sys.c
@@ -493,21 +493,11 @@ Sys_Quit (void)
 	exit (0);
 }
 
-#if defined (HAVE_VA_COPY)
-# define VA_COPY(a,b) va_copy (a, b)
-#elif defined (HAVE__VA_COPY)
-# define VA_COPY(a,b) __va_copy (a, b)
-#else
-# define VA_COPY(a,b) memcpy (a, b, sizeof (a))
-#endif
-
 VISIBLE void
 Sys_Error (const char *error, ...)
 {
 	va_list     args;
-#ifdef VA_LIST_IS_ARRAY
 	va_list     tmp_args;
-#endif
 	static int  in_sys_error = 0;
 
 	if (in_sys_error) {
@@ -521,9 +511,7 @@ Sys_Error (const char *error, ...)
 	in_sys_error = 1;
 
 	va_start (args, error);
-#ifdef VA_LIST_IS_ARRAY
-	VA_COPY (tmp_args, args);
-#endif
+	va_copy (tmp_args, args);
 	sys_err_printf_function (error, args);
 	va_end (args);
 
@@ -532,9 +520,7 @@ Sys_Error (const char *error, ...)
 	if (sys_err_printf_function != Sys_ErrPrintf) {
 		// print the message again using the default error printer to increase
 		// the chances of the error being seen.
-#ifdef VA_LIST_IS_ARRAY
-		VA_COPY (args, tmp_args);
-#endif
+		va_copy (args, tmp_args);
 		Sys_ErrPrintf (error, args);
 	}
 
diff --git a/tools/qflmp/lmp.c b/tools/qflmp/lmp.c
index f0f41c256..b8021166c 100644
--- a/tools/qflmp/lmp.c
+++ b/tools/qflmp/lmp.c
@@ -31,6 +31,9 @@
 	width * height bytes
 	no attached palette
 */
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
 #ifndef _GNU_SOURCE
 # define _GNU_SOURCE

From 546e333a3cd71049dfc8e05570f8dd08fa61830c Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 3 Jan 2016 23:04:00 +0900
Subject: [PATCH 0103/1519] Allow Sys_Error to be hooked.

This makes debugging builtins that wrap normal functions a little easier by
giving a progs dump when such an error occurs.
---
 include/QF/sys.h        |  5 +++++
 libs/gamecode/pr_exec.c | 19 +++++++++++++++----
 libs/util/sys.c         | 39 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 59 insertions(+), 4 deletions(-)

diff --git a/include/QF/sys.h b/include/QF/sys.h
index 1fe994c94..8bbb08781 100644
--- a/include/QF/sys.h
+++ b/include/QF/sys.h
@@ -63,13 +63,18 @@ int Sys_isdir (const char *path);
 int Sys_mkdir (const char *path);
 
 typedef void (*sys_printf_t) (const char *fmt, va_list args);
+typedef void (*sys_error_t) (void *data);
 
 void Sys_SetStdPrintf (sys_printf_t func);
 void Sys_SetErrPrintf (sys_printf_t func);
 
+void Sys_PushErrorHandler (sys_error_t func, void *data);
+void Sys_PopErrorHandler (void);
+
 void Sys_Print (FILE *stream, const char *fmt, va_list args);
 void Sys_Printf (const char *fmt, ...) __attribute__((format(printf,1,2)));
 void Sys_Error (const char *error, ...) __attribute__((format(printf,1,2), noreturn));
+void Sys_FatalError (const char *error, ...) __attribute__((format(printf,1,2), noreturn));
 void Sys_Quit (void) __attribute__((noreturn));
 void Sys_Shutdown (void);
 void Sys_RegisterShutdown (void (*func) (void));
diff --git a/libs/gamecode/pr_exec.c b/libs/gamecode/pr_exec.c
index 0ebf7dbef..579992271 100644
--- a/libs/gamecode/pr_exec.c
+++ b/libs/gamecode/pr_exec.c
@@ -328,6 +328,14 @@ signal_hook (int sig, void *data)
 	return 0;
 }
 
+static void
+error_handler (void *data)
+{
+	progs_t    *pr = (progs_t *) data;
+	PR_DumpState (pr);
+	fflush (stdout);
+}
+
 VISIBLE int
 PR_CallFunction (progs_t *pr, func_t fnum)
 {
@@ -370,11 +378,11 @@ PR_ExecuteProgram (progs_t * pr, func_t fnum)
 	startprofile = profile = 0;
 
 	Sys_PushSignalHook (signal_hook, pr);
+	Sys_PushErrorHandler (error_handler, pr);
 
 	if (!PR_CallFunction (pr, fnum)) {
 		// called a builtin instead of progs code
-		Sys_PopSignalHook ();
-		return;
+		goto exit_program;
 	}
 	st = pr->pr_statements + pr->pr_xstatement;
 
@@ -964,8 +972,8 @@ op_call:
 				if (pr->pr_depth == exitdepth) {
 					if (pr->pr_trace && pr->pr_depth <= pr->pr_trace_depth)
 						pr->pr_trace = false;
-					Sys_PopSignalHook ();
-					return;					// all done
+					// all done
+					goto exit_program;
 				}
 				break;
 			case OP_STATE:
@@ -1116,4 +1124,7 @@ op_call:
 			PR_RunError (pr, "watchpoint hit: %d -> %d", old_val.integer_var,
 						 watch->integer_var);
 	}
+exit_program:
+	Sys_PopErrorHandler ();
+	Sys_PopSignalHook ();
 }
diff --git a/libs/util/sys.c b/libs/util/sys.c
index 4e2e111e2..1b6a9c269 100644
--- a/libs/util/sys.c
+++ b/libs/util/sys.c
@@ -79,6 +79,7 @@
 
 #include "qfalloca.h"
 
+#include "QF/alloc.h"
 #include "QF/cmd.h"
 #include "QF/cvar.h"
 #include "QF/dstring.h"
@@ -107,8 +108,17 @@ typedef struct shutdown_list_s {
 	void (*func)(void);
 } shutdown_list_t;
 
+typedef struct error_handler_s {
+	struct error_handler_s *next;
+	sys_error_t func;
+	void       *data;
+} error_handler_t;
+
 static shutdown_list_t *shutdown_list;
 
+static error_handler_t *error_handler_freelist;
+static error_handler_t *error_handler;
+
 #ifndef _WIN32
 static int  do_stdin = 1;
 qboolean    stdin_ready;
@@ -493,6 +503,31 @@ Sys_Quit (void)
 	exit (0);
 }
 
+VISIBLE void
+Sys_PushErrorHandler (sys_error_t func, void *data)
+{
+	error_handler_t *eh;
+	ALLOC (16, error_handler_t, error_handler, eh);
+	eh->func = func;
+	eh->data = data;
+	eh->next = error_handler;
+	error_handler = eh;
+}
+
+VISIBLE void
+Sys_PopErrorHandler (void)
+{
+	error_handler_t *eh;
+
+	if (!error_handler) {
+		Sys_Error ("Sys_PopErrorHandler: no handler to pop");
+	}
+	eh = error_handler;
+	error_handler = eh->next;
+	FREE (error_handler, eh);
+}
+
+
 VISIBLE void
 Sys_Error (const char *error, ...)
 {
@@ -515,6 +550,10 @@ Sys_Error (const char *error, ...)
 	sys_err_printf_function (error, args);
 	va_end (args);
 
+	if (error_handler) {
+		error_handler->func (error_handler->data);
+	}
+
 	Sys_Shutdown ();
 
 	if (sys_err_printf_function != Sys_ErrPrintf) {

From c25fd410a5540f5f0613c0c077102a8d092e4fad Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 4 Jan 2016 11:17:09 +0900
Subject: [PATCH 0104/1519] Update doxygen config files for 1.8.9.1

---
 doc/quakeforge.dox.conf.in |  386 +++---
 ruamoko/Doxyfile.in        | 2438 ++++++++++++++++++++++--------------
 2 files changed, 1760 insertions(+), 1064 deletions(-)

diff --git a/doc/quakeforge.dox.conf.in b/doc/quakeforge.dox.conf.in
index f72ee72a5..9db22207d 100644
--- a/doc/quakeforge.dox.conf.in
+++ b/doc/quakeforge.dox.conf.in
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.5
+# Doxyfile 1.8.9.1
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -46,10 +46,10 @@ PROJECT_NUMBER         = @PACKAGE_VERSION@
 
 PROJECT_BRIEF          =
 
-# With the PROJECT_LOGO tag one can specify an logo or icon that is included in
-# the documentation. The maximum height of the logo should not exceed 55 pixels
-# and the maximum width should not exceed 200 pixels. Doxygen will copy the logo
-# to the output directory.
+# With the PROJECT_LOGO tag one can specify a logo or an icon that is included
+# in the documentation. The maximum height of the logo should not exceed 55
+# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
+# the logo to the output directory.
 
 PROJECT_LOGO           =
 
@@ -60,7 +60,7 @@ PROJECT_LOGO           =
 
 OUTPUT_DIRECTORY       = doxygen
 
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 4096 sub-
+# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
 # directories (in 2 levels) under the output directory of each output format and
 # will distribute the generated files over these directories. Enabling this
 # option can be useful when feeding doxygen a huge amount of source files, where
@@ -70,27 +70,37 @@ OUTPUT_DIRECTORY       = doxygen
 
 CREATE_SUBDIRS         = NO
 
+# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
+# characters to appear in the names of generated files. If set to NO, non-ASCII
+# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
+# U+3044.
+# The default value is: NO.
+
+ALLOW_UNICODE_NAMES    = NO
+
 # The OUTPUT_LANGUAGE tag is used to specify the language in which all
 # documentation generated by doxygen is written. Doxygen will use this
 # information to generate all constant output in the proper language.
-# Possible values are: Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-
-# Traditional, Croatian, Czech, Danish, Dutch, English, Esperanto, Farsi,
-# Finnish, French, German, Greek, Hungarian, Italian, Japanese, Japanese-en,
-# Korean, Korean-en, Latvian, Norwegian, Macedonian, Persian, Polish,
-# Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish, Swedish,
-# Turkish, Ukrainian and Vietnamese.
+# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
+# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
+# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
+# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
+# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
+# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
+# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
+# Ukrainian and Vietnamese.
 # The default value is: English.
 
 OUTPUT_LANGUAGE        = English
 
-# If the BRIEF_MEMBER_DESC tag is set to YES doxygen will include brief member
+# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
 # descriptions after the members that are listed in the file and class
 # documentation (similar to Javadoc). Set to NO to disable this.
 # The default value is: YES.
 
 BRIEF_MEMBER_DESC      = YES
 
-# If the REPEAT_BRIEF tag is set to YES doxygen will prepend the brief
+# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief
 # description of a member or function before the detailed description
 #
 # Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
@@ -125,7 +135,7 @@ ALWAYS_DETAILED_SEC    = NO
 
 INLINE_INHERITED_MEMB  = YES
 
-# If the FULL_PATH_NAMES tag is set to YES doxygen will prepend the full path
+# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path
 # before files name in the file list and in the header files. If set to NO the
 # shortest path that makes the file name unique will be used
 # The default value is: YES.
@@ -195,9 +205,9 @@ MULTILINE_CPP_IS_BRIEF = NO
 
 INHERIT_DOCS           = YES
 
-# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce a
-# new page for each member. If set to NO, the documentation of a member will be
-# part of the file/class/namespace that contains it.
+# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new
+# page for each member. If set to NO, the documentation of a member will be part
+# of the file/class/namespace that contains it.
 # The default value is: NO.
 
 SEPARATE_MEMBER_PAGES  = NO
@@ -259,16 +269,19 @@ OPTIMIZE_OUTPUT_VHDL   = NO
 # extension. Doxygen has a built-in mapping, but you can override or extend it
 # using this tag. The format is ext=language, where ext is a file extension, and
 # language is one of the parsers supported by doxygen: IDL, Java, Javascript,
-# C#, C, C++, D, PHP, Objective-C, Python, Fortran, VHDL. For instance to make
-# doxygen treat .inc files as Fortran files (default is PHP), and .f files as C
-# (default is Fortran), use: inc=Fortran f=C.
+# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran:
+# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran:
+# Fortran. In the later case the parser tries to guess whether the code is fixed
+# or free formatted code, this is the default for Fortran type files), VHDL. For
+# instance to make doxygen treat .inc files as Fortran files (default is PHP),
+# and .f files as C (default is Fortran), use: inc=Fortran f=C.
 #
-# Note For files without extension you can use no_extension as a placeholder.
+# Note: For files without extension you can use no_extension as a placeholder.
 #
 # Note that for custom extensions you also need to set FILE_PATTERNS otherwise
 # the files are not read by doxygen.
 
-EXTENSION_MAPPING      =
+EXTENSION_MAPPING      = no_extension=C
 
 # If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
 # according to the Markdown format, which allows for more readable
@@ -282,8 +295,8 @@ MARKDOWN_SUPPORT       = YES
 
 # When enabled doxygen tries to link words that correspond to documented
 # classes, or namespaces to their corresponding documentation. Such a link can
-# be prevented in individual cases by by putting a % sign in front of the word
-# or globally by setting AUTOLINK_SUPPORT to NO.
+# be prevented in individual cases by putting a % sign in front of the word or
+# globally by setting AUTOLINK_SUPPORT to NO.
 # The default value is: YES.
 
 AUTOLINK_SUPPORT       = YES
@@ -323,7 +336,7 @@ SIP_SUPPORT            = NO
 IDL_PROPERTY_SUPPORT   = YES
 
 # If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
-# tag is set to YES, then doxygen will reuse the documentation of the first
+# tag is set to YES then doxygen will reuse the documentation of the first
 # member in the group (if any) for the other members of the group. By default
 # all members of a group must be documented explicitly.
 # The default value is: NO.
@@ -388,7 +401,7 @@ LOOKUP_CACHE_SIZE      = 0
 # Build related configuration options
 #---------------------------------------------------------------------------
 
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
+# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in
 # documentation are documented, even if no documentation was available. Private
 # class members and static file members will be hidden unless the
 # EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
@@ -398,35 +411,35 @@ LOOKUP_CACHE_SIZE      = 0
 
 EXTRACT_ALL            = YES
 
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class will
+# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will
 # be included in the documentation.
 # The default value is: NO.
 
 EXTRACT_PRIVATE        = NO
 
-# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal
+# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal
 # scope will be included in the documentation.
 # The default value is: NO.
 
 EXTRACT_PACKAGE        = NO
 
-# If the EXTRACT_STATIC tag is set to YES all static members of a file will be
+# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be
 # included in the documentation.
 # The default value is: NO.
 
 EXTRACT_STATIC         = @STATIC_DOC@
 
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) defined
-# locally in source files will be included in the documentation. If set to NO
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined
+# locally in source files will be included in the documentation. If set to NO,
 # only classes defined in header files are included. Does not have any effect
 # for Java sources.
 # The default value is: YES.
 
 EXTRACT_LOCAL_CLASSES  = NO
 
-# This flag is only useful for Objective-C code. When set to YES local methods,
+# This flag is only useful for Objective-C code. When set to YES, local methods,
 # which are defined in the implementation section but not in the interface are
-# included in the documentation. If set to NO only methods in the interface are
+# included in the documentation. If set to NO, only methods in the interface are
 # included.
 # The default value is: NO.
 
@@ -451,21 +464,21 @@ HIDE_UNDOC_MEMBERS     = NO
 
 # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
 # undocumented classes that are normally visible in the class hierarchy. If set
-# to NO these classes will be included in the various overviews. This option has
-# no effect if EXTRACT_ALL is enabled.
+# to NO, these classes will be included in the various overviews. This option
+# has no effect if EXTRACT_ALL is enabled.
 # The default value is: NO.
 
 HIDE_UNDOC_CLASSES     = NO
 
 # If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO these declarations will be
+# (class|struct|union) declarations. If set to NO, these declarations will be
 # included in the documentation.
 # The default value is: NO.
 
 HIDE_FRIEND_COMPOUNDS  = NO
 
 # If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
-# documentation blocks found inside the body of a function. If set to NO these
+# documentation blocks found inside the body of a function. If set to NO, these
 # blocks will be appended to the function's detailed documentation block.
 # The default value is: NO.
 
@@ -479,7 +492,7 @@ HIDE_IN_BODY_DOCS      = NO
 INTERNAL_DOCS          = NO
 
 # If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
-# names in lower-case letters. If set to YES upper-case letters are also
+# names in lower-case letters. If set to YES, upper-case letters are also
 # allowed. This is useful if you have classes or files whose names only differ
 # in case and if your file system supports case sensitive file names. Windows
 # and Mac users are advised to set this option to NO.
@@ -488,18 +501,32 @@ INTERNAL_DOCS          = NO
 CASE_SENSE_NAMES       = NO
 
 # If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
-# their full class and namespace scopes in the documentation. If set to YES the
+# their full class and namespace scopes in the documentation. If set to YES, the
 # scope will be hidden.
 # The default value is: NO.
 
 HIDE_SCOPE_NAMES       = YES
 
+# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will
+# append additional text to a page's title, such as Class Reference. If set to
+# YES the compound reference will be hidden.
+# The default value is: NO.
+
+HIDE_COMPOUND_REFERENCE= NO
+
 # If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
 # the files that are included by a file in the documentation of that file.
 # The default value is: YES.
 
 SHOW_INCLUDE_FILES     = NO
 
+# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
+# grouped member an include statement to the documentation, telling the reader
+# which file to include in order to use the member.
+# The default value is: NO.
+
+SHOW_GROUPED_MEMB_INC  = NO
+
 # If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
 # files with double quotes in the documentation rather than with sharp brackets.
 # The default value is: NO.
@@ -514,14 +541,15 @@ INLINE_INFO            = YES
 
 # If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
 # (detailed) documentation of file and class members alphabetically by member
-# name. If set to NO the members will appear in declaration order.
+# name. If set to NO, the members will appear in declaration order.
 # The default value is: YES.
 
 SORT_MEMBER_DOCS       = YES
 
 # If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
 # descriptions of file, namespace and class members alphabetically by member
-# name. If set to NO the members will appear in declaration order.
+# name. If set to NO, the members will appear in declaration order. Note that
+# this will also influence the order of the classes in the class list.
 # The default value is: NO.
 
 SORT_BRIEF_DOCS        = YES
@@ -565,27 +593,25 @@ SORT_BY_SCOPE_NAME     = NO
 
 STRICT_PROTO_MATCHING  = NO
 
-# The GENERATE_TODOLIST tag can be used to enable ( YES) or disable ( NO) the
-# todo list. This list is created by putting \todo commands in the
-# documentation.
+# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo
+# list. This list is created by putting \todo commands in the documentation.
 # The default value is: YES.
 
 GENERATE_TODOLIST      = YES
 
-# The GENERATE_TESTLIST tag can be used to enable ( YES) or disable ( NO) the
-# test list. This list is created by putting \test commands in the
-# documentation.
+# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test
+# list. This list is created by putting \test commands in the documentation.
 # The default value is: YES.
 
 GENERATE_TESTLIST      = NO
 
-# The GENERATE_BUGLIST tag can be used to enable ( YES) or disable ( NO) the bug
+# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug
 # list. This list is created by putting \bug commands in the documentation.
 # The default value is: YES.
 
 GENERATE_BUGLIST       = YES
 
-# The GENERATE_DEPRECATEDLIST tag can be used to enable ( YES) or disable ( NO)
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO)
 # the deprecated list. This list is created by putting \deprecated commands in
 # the documentation.
 # The default value is: YES.
@@ -610,8 +636,8 @@ ENABLED_SECTIONS       =
 MAX_INITIALIZER_LINES  = 30
 
 # Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
-# the bottom of the documentation of classes and structs. If set to YES the list
-# will mention the files that were used to generate the documentation.
+# the bottom of the documentation of classes and structs. If set to YES, the
+# list will mention the files that were used to generate the documentation.
 # The default value is: YES.
 
 SHOW_USED_FILES        = YES
@@ -659,8 +685,7 @@ LAYOUT_FILE            =
 # to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info.
 # For LaTeX the style of the bibliography can be controlled using
 # LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
-# search path. Do not use file names with spaces, bibtex cannot handle them. See
-# also \cite for info how to create references.
+# search path. See also \cite for info how to create references.
 
 CITE_BIB_FILES         =
 
@@ -676,7 +701,7 @@ CITE_BIB_FILES         =
 QUIET                  = YES
 
 # The WARNINGS tag can be used to turn on/off the warning messages that are
-# generated to standard error ( stderr) by doxygen. If WARNINGS is set to YES
+# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES
 # this implies that the warnings are on.
 #
 # Tip: Turn warnings on while writing the documentation.
@@ -684,7 +709,7 @@ QUIET                  = YES
 
 WARNINGS               = YES
 
-# If the WARN_IF_UNDOCUMENTED tag is set to YES, then doxygen will generate
+# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate
 # warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
 # will automatically be disabled.
 # The default value is: YES.
@@ -701,8 +726,8 @@ WARN_IF_DOC_ERROR      = YES
 
 # This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
 # are documented, but have no documentation for their parameters or return
-# value. If set to NO doxygen will only warn about wrong or incomplete parameter
-# documentation, but not about the absence of documentation.
+# value. If set to NO, doxygen will only warn about wrong or incomplete
+# parameter documentation, but not about the absence of documentation.
 # The default value is: NO.
 
 WARN_NO_PARAMDOC       = NO
@@ -877,7 +902,7 @@ INPUT_FILTER           =
 FILTER_PATTERNS        =
 
 # If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
-# INPUT_FILTER ) will also be used to filter the input files that are used for
+# INPUT_FILTER) will also be used to filter the input files that are used for
 # producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
 # The default value is: NO.
 
@@ -937,7 +962,7 @@ REFERENCED_BY_RELATION = NO
 REFERENCES_RELATION    = NO
 
 # If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
-# to YES, then the hyperlinks from functions in REFERENCES_RELATION and
+# to YES then the hyperlinks from functions in REFERENCES_RELATION and
 # REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
 # link to the documentation.
 # The default value is: YES.
@@ -984,6 +1009,25 @@ USE_HTAGS              = NO
 
 VERBATIM_HEADERS       = NO
 
+# If the CLANG_ASSISTED_PARSING tag is set to YES then doxygen will use the
+# clang parser (see: http://clang.llvm.org/) for more accurate parsing at the
+# cost of reduced performance. This can be particularly helpful with template
+# rich C++ code for which doxygen's built-in parser lacks the necessary type
+# information.
+# Note: The availability of this option depends on whether or not doxygen was
+# compiled with the --with-libclang option.
+# The default value is: NO.
+
+CLANG_ASSISTED_PARSING = NO
+
+# If clang assisted parsing is enabled you can provide the compiler with command
+# line options that you would normally use when invoking the compiler. Note that
+# the include paths will already be set by doxygen for the files and directories
+# specified with INPUT and INCLUDE_PATH.
+# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
+
+CLANG_OPTIONS          =
+
 #---------------------------------------------------------------------------
 # Configuration options related to the alphabetical class index
 #---------------------------------------------------------------------------
@@ -1014,7 +1058,7 @@ IGNORE_PREFIX          =
 # Configuration options related to the HTML output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_HTML tag is set to YES doxygen will generate HTML output
+# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output
 # The default value is: YES.
 
 GENERATE_HTML          = YES
@@ -1076,13 +1120,15 @@ HTML_FOOTER            =
 
 HTML_STYLESHEET        = @TOPSRC@/doc/doxygen.css
 
-# The HTML_EXTRA_STYLESHEET tag can be used to specify an additional user-
-# defined cascading style sheet that is included after the standard style sheets
+# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# cascading style sheets that are included after the standard style sheets
 # created by doxygen. Using this option one can overrule certain style aspects.
 # This is preferred over using HTML_STYLESHEET since it does not replace the
-# standard style sheet and is therefor more robust against future updates.
-# Doxygen will copy the style sheet file to the output directory. For an example
-# see the documentation.
+# standard style sheet and is therefore more robust against future updates.
+# Doxygen will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list). For an example see the documentation.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_EXTRA_STYLESHEET  =
@@ -1098,7 +1144,7 @@ HTML_EXTRA_STYLESHEET  =
 HTML_EXTRA_FILES       =
 
 # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
-# will adjust the colors in the stylesheet and background images according to
+# will adjust the colors in the style sheet and background images according to
 # this color. Hue is specified as an angle on a colorwheel, see
 # http://en.wikipedia.org/wiki/Hue for more information. For instance the value
 # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
@@ -1129,8 +1175,9 @@ HTML_COLORSTYLE_GAMMA  = 100
 
 # If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
 # page will contain the date and time when the page was generated. Setting this
-# to NO can help when comparing the output of multiple runs.
-# The default value is: YES.
+# to YES can help to show when doxygen was last run and thus if the
+# documentation is up to date.
+# The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_TIMESTAMP         = NO
@@ -1226,28 +1273,29 @@ GENERATE_HTMLHELP      = NO
 CHM_FILE               =
 
 # The HHC_LOCATION tag can be used to specify the location (absolute path
-# including file name) of the HTML help compiler ( hhc.exe). If non-empty
+# including file name) of the HTML help compiler (hhc.exe). If non-empty,
 # doxygen will try to run the HTML help compiler on the generated index.hhp.
 # The file has to be specified with full path.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
 HHC_LOCATION           =
 
-# The GENERATE_CHI flag controls if a separate .chi index file is generated (
-# YES) or that it should be included in the master .chm file ( NO).
+# The GENERATE_CHI flag controls if a separate .chi index file is generated
+# (YES) or that it should be included in the master .chm file (NO).
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
 GENERATE_CHI           = NO
 
-# The CHM_INDEX_ENCODING is used to encode HtmlHelp index ( hhk), content ( hhc)
+# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc)
 # and project file content.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
 CHM_INDEX_ENCODING     =
 
-# The BINARY_TOC flag controls whether a binary table of contents is generated (
-# YES) or a normal table of contents ( NO) in the .chm file.
+# The BINARY_TOC flag controls whether a binary table of contents is generated
+# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it
+# enables the Previous and Next buttons.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
@@ -1360,7 +1408,7 @@ DISABLE_INDEX          = YES
 # index structure (just like the one that is generated for HTML Help). For this
 # to work a browser that supports JavaScript, DHTML, CSS and frames is required
 # (i.e. any modern browser). Windows users are probably better off using the
-# HTML help feature. Via custom stylesheets (see HTML_EXTRA_STYLESHEET) one can
+# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
 # further fine-tune the look of the index. As an example, the default style
 # sheet generated by doxygen has an example that shows how to put an image at
 # the root of the tree instead of the PROJECT_NAME. Since the tree basically has
@@ -1388,7 +1436,7 @@ ENUM_VALUES_PER_LINE   = 4
 
 TREEVIEW_WIDTH         = 250
 
-# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open links to
+# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to
 # external symbols imported via tag files in a separate window.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1417,7 +1465,7 @@ FORMULA_TRANSPARENT    = YES
 
 # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
 # http://www.mathjax.org) which uses client side Javascript for the rendering
-# instead of using prerendered bitmaps. Use this if you do not have LaTeX
+# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
 # installed or if you want to formulas look prettier in the HTML output. When
 # enabled you may also need to install MathJax separately and configure the path
 # to it using the MATHJAX_RELPATH option.
@@ -1487,11 +1535,11 @@ SEARCHENGINE           = YES
 
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
 # implemented using a web server instead of a web client using Javascript. There
-# are two flavours of web server based searching depending on the
-# EXTERNAL_SEARCH setting. When disabled, doxygen will generate a PHP script for
-# searching and an index file used by the script. When EXTERNAL_SEARCH is
-# enabled the indexing and searching needs to be provided by external tools. See
-# the section "External Indexing and Searching" for details.
+# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
+# setting. When disabled, doxygen will generate a PHP script for searching and
+# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
+# and searching needs to be provided by external tools. See the section
+# "External Indexing and Searching" for details.
 # The default value is: NO.
 # This tag requires that the tag SEARCHENGINE is set to YES.
 
@@ -1503,7 +1551,7 @@ SERVER_BASED_SEARCH    = NO
 # external search engine pointed to by the SEARCHENGINE_URL option to obtain the
 # search results.
 #
-# Doxygen ships with an example indexer ( doxyindexer) and search engine
+# Doxygen ships with an example indexer (doxyindexer) and search engine
 # (doxysearch.cgi) which are based on the open source search engine library
 # Xapian (see: http://xapian.org/).
 #
@@ -1516,7 +1564,7 @@ EXTERNAL_SEARCH        = NO
 # The SEARCHENGINE_URL should point to a search engine hosted by a web server
 # which will return the search results when EXTERNAL_SEARCH is enabled.
 #
-# Doxygen ships with an example indexer ( doxyindexer) and search engine
+# Doxygen ships with an example indexer (doxyindexer) and search engine
 # (doxysearch.cgi) which are based on the open source search engine library
 # Xapian (see: http://xapian.org/). See the section "External Indexing and
 # Searching" for details.
@@ -1554,7 +1602,7 @@ EXTRA_SEARCH_MAPPINGS  =
 # Configuration options related to the LaTeX output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_LATEX tag is set to YES doxygen will generate LaTeX output.
+# If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output.
 # The default value is: YES.
 
 GENERATE_LATEX         = NO
@@ -1585,7 +1633,7 @@ LATEX_CMD_NAME         = latex
 
 MAKEINDEX_CMD_NAME     = makeindex
 
-# If the COMPACT_LATEX tag is set to YES doxygen generates more compact LaTeX
+# If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX
 # documents. This may be useful for small projects and may help to save some
 # trees in general.
 # The default value is: NO.
@@ -1619,23 +1667,36 @@ EXTRA_PACKAGES         =
 #
 # Note: Only use a user-defined header if you know what you are doing! The
 # following commands have a special meaning inside the header: $title,
-# $datetime, $date, $doxygenversion, $projectname, $projectnumber. Doxygen will
-# replace them by respectively the title of the page, the current date and time,
-# only the current date, the version number of doxygen, the project name (see
-# PROJECT_NAME), or the project number (see PROJECT_NUMBER).
+# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
+# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
+# string, for the replacement values of the other commands the user is referred
+# to HTML_HEADER.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_HEADER           =
 
 # The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
 # generated LaTeX document. The footer should contain everything after the last
-# chapter. If it is left blank doxygen will generate a standard footer.
+# chapter. If it is left blank doxygen will generate a standard footer. See
+# LATEX_HEADER for more information on how to generate a default footer and what
+# special commands can be used inside the footer.
 #
 # Note: Only use a user-defined footer if you know what you are doing!
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_FOOTER           =
 
+# The LATEX_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# LaTeX style sheets that are included after the standard style sheets created
+# by doxygen. Using this option one can overrule certain style aspects. Doxygen
+# will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list).
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_STYLESHEET =
+
 # The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
 # other source files which should be copied to the LATEX_OUTPUT output
 # directory. Note that the files will be copied as-is; there are no commands or
@@ -1653,8 +1714,8 @@ LATEX_EXTRA_FILES      =
 
 PDF_HYPERLINKS         = NO
 
-# If the LATEX_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
-# the PDF file directly from the LaTeX files. Set this option to YES to get a
+# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
+# the PDF file directly from the LaTeX files. Set this option to YES, to get a
 # higher quality PDF documentation.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
@@ -1699,7 +1760,7 @@ LATEX_BIB_STYLE        = plain
 # Configuration options related to the RTF output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_RTF tag is set to YES doxygen will generate RTF output. The
+# If the GENERATE_RTF tag is set to YES, doxygen will generate RTF output. The
 # RTF output is optimized for Word 97 and may not look too pretty with other RTF
 # readers/editors.
 # The default value is: NO.
@@ -1714,7 +1775,7 @@ GENERATE_RTF           = NO
 
 RTF_OUTPUT             = rtf
 
-# If the COMPACT_RTF tag is set to YES doxygen generates more compact RTF
+# If the COMPACT_RTF tag is set to YES, doxygen generates more compact RTF
 # documents. This may be useful for small projects and may help to save some
 # trees in general.
 # The default value is: NO.
@@ -1751,11 +1812,21 @@ RTF_STYLESHEET_FILE    =
 
 RTF_EXTENSIONS_FILE    =
 
+# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
+# with syntax highlighting in the RTF output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_SOURCE_CODE        = NO
+
 #---------------------------------------------------------------------------
 # Configuration options related to the man page output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_MAN tag is set to YES doxygen will generate man pages for
+# If the GENERATE_MAN tag is set to YES, doxygen will generate man pages for
 # classes and files.
 # The default value is: NO.
 
@@ -1779,6 +1850,13 @@ MAN_OUTPUT             = man
 
 MAN_EXTENSION          = .3
 
+# The MAN_SUBDIR tag determines the name of the directory created within
+# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by
+# MAN_EXTENSION with the initial . removed.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_SUBDIR             =
+
 # If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
 # will generate one additional man file for each entity documented in the real
 # man page(s). These additional files only source the real man page, but without
@@ -1792,7 +1870,7 @@ MAN_LINKS              = NO
 # Configuration options related to the XML output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_XML tag is set to YES doxygen will generate an XML file that
+# If the GENERATE_XML tag is set to YES, doxygen will generate an XML file that
 # captures the structure of the code including all documentation.
 # The default value is: NO.
 
@@ -1806,19 +1884,7 @@ GENERATE_XML           = NO
 
 XML_OUTPUT             = xml
 
-# The XML_SCHEMA tag can be used to specify a XML schema, which can be used by a
-# validating XML parser to check the syntax of the XML files.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_SCHEMA             =
-
-# The XML_DTD tag can be used to specify a XML DTD, which can be used by a
-# validating XML parser to check the syntax of the XML files.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_DTD                =
-
-# If the XML_PROGRAMLISTING tag is set to YES doxygen will dump the program
+# If the XML_PROGRAMLISTING tag is set to YES, doxygen will dump the program
 # listings (including syntax highlighting and cross-referencing information) to
 # the XML output. Note that enabling this will significantly increase the size
 # of the XML output.
@@ -1831,7 +1897,7 @@ XML_PROGRAMLISTING     = YES
 # Configuration options related to the DOCBOOK output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_DOCBOOK tag is set to YES doxygen will generate Docbook files
+# If the GENERATE_DOCBOOK tag is set to YES, doxygen will generate Docbook files
 # that can be used to generate PDF.
 # The default value is: NO.
 
@@ -1845,14 +1911,23 @@ GENERATE_DOCBOOK       = NO
 
 DOCBOOK_OUTPUT         = docbook
 
+# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
+# program listings (including syntax highlighting and cross-referencing
+# information) to the DOCBOOK output. Note that enabling this will significantly
+# increase the size of the DOCBOOK output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_PROGRAMLISTING = NO
+
 #---------------------------------------------------------------------------
 # Configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_AUTOGEN_DEF tag is set to YES doxygen will generate an AutoGen
-# Definitions (see http://autogen.sf.net) file that captures the structure of
-# the code including all documentation. Note that this feature is still
-# experimental and incomplete at the moment.
+# If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an
+# AutoGen Definitions (see http://autogen.sf.net) file that captures the
+# structure of the code including all documentation. Note that this feature is
+# still experimental and incomplete at the moment.
 # The default value is: NO.
 
 GENERATE_AUTOGEN_DEF   = NO
@@ -1861,7 +1936,7 @@ GENERATE_AUTOGEN_DEF   = NO
 # Configuration options related to the Perl module output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_PERLMOD tag is set to YES doxygen will generate a Perl module
+# If the GENERATE_PERLMOD tag is set to YES, doxygen will generate a Perl module
 # file that captures the structure of the code including all documentation.
 #
 # Note that this feature is still experimental and incomplete at the moment.
@@ -1869,7 +1944,7 @@ GENERATE_AUTOGEN_DEF   = NO
 
 GENERATE_PERLMOD       = NO
 
-# If the PERLMOD_LATEX tag is set to YES doxygen will generate the necessary
+# If the PERLMOD_LATEX tag is set to YES, doxygen will generate the necessary
 # Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
 # output from the Perl module output.
 # The default value is: NO.
@@ -1877,9 +1952,9 @@ GENERATE_PERLMOD       = NO
 
 PERLMOD_LATEX          = NO
 
-# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be nicely
+# If the PERLMOD_PRETTY tag is set to YES, the Perl module output will be nicely
 # formatted so it can be parsed by a human reader. This is useful if you want to
-# understand what is going on. On the other hand, if this tag is set to NO the
+# understand what is going on. On the other hand, if this tag is set to NO, the
 # size of the Perl module output will be much smaller and Perl will parse it
 # just the same.
 # The default value is: YES.
@@ -1899,14 +1974,14 @@ PERLMOD_MAKEVAR_PREFIX =
 # Configuration options related to the preprocessor
 #---------------------------------------------------------------------------
 
-# If the ENABLE_PREPROCESSING tag is set to YES doxygen will evaluate all
+# If the ENABLE_PREPROCESSING tag is set to YES, doxygen will evaluate all
 # C-preprocessor directives found in the sources and include files.
 # The default value is: YES.
 
 ENABLE_PREPROCESSING   = YES
 
-# If the MACRO_EXPANSION tag is set to YES doxygen will expand all macro names
-# in the source code. If set to NO only conditional compilation will be
+# If the MACRO_EXPANSION tag is set to YES, doxygen will expand all macro names
+# in the source code. If set to NO, only conditional compilation will be
 # performed. Macro expansion can be done in a controlled way by setting
 # EXPAND_ONLY_PREDEF to YES.
 # The default value is: NO.
@@ -1922,7 +1997,7 @@ MACRO_EXPANSION        = YES
 
 EXPAND_ONLY_PREDEF     = YES
 
-# If the SEARCH_INCLUDES tag is set to YES the includes files in the
+# If the SEARCH_INCLUDES tag is set to YES, the include files in the
 # INCLUDE_PATH will be searched if a #include is found.
 # The default value is: YES.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
@@ -1971,9 +2046,9 @@ EXPAND_AS_DEFINED      = HAVE_FB_AUX_VGA_PLANES_VGA4 \
                          HAVE_FB_AUX_VGA_PLANES_CFB8
 
 # If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
-# remove all refrences to function-like macros that are alone on a line, have an
-# all uppercase name, and do not end with a semicolon. Such function macros are
-# typically used for boiler-plate code, and will confuse the parser if not
+# remove all references to function-like macros that are alone on a line, have
+# an all uppercase name, and do not end with a semicolon. Such function macros
+# are typically used for boiler-plate code, and will confuse the parser if not
 # removed.
 # The default value is: YES.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
@@ -1993,7 +2068,7 @@ SKIP_FUNCTION_MACROS   = YES
 # where loc1 and loc2 can be relative or absolute paths or URLs. See the
 # section "Linking to external documentation" for more information about the use
 # of tag files.
-# Note: Each tag file must have an unique name (where the name does NOT include
+# Note: Each tag file must have a unique name (where the name does NOT include
 # the path). If a tag file is not located in the directory in which doxygen is
 # run, you must also specify the path to the tagfile here.
 
@@ -2005,20 +2080,21 @@ TAGFILES               =
 
 GENERATE_TAGFILE       =
 
-# If the ALLEXTERNALS tag is set to YES all external class will be listed in the
-# class index. If set to NO only the inherited external classes will be listed.
+# If the ALLEXTERNALS tag is set to YES, all external class will be listed in
+# the class index. If set to NO, only the inherited external classes will be
+# listed.
 # The default value is: NO.
 
 ALLEXTERNALS           = NO
 
-# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed in
-# the modules index. If set to NO, only the current project's groups will be
+# If the EXTERNAL_GROUPS tag is set to YES, all external groups will be listed
+# in the modules index. If set to NO, only the current project's groups will be
 # listed.
 # The default value is: YES.
 
 EXTERNAL_GROUPS        = YES
 
-# If the EXTERNAL_PAGES tag is set to YES all external pages will be listed in
+# If the EXTERNAL_PAGES tag is set to YES, all external pages will be listed in
 # the related pages index. If set to NO, only the current project's pages will
 # be listed.
 # The default value is: YES.
@@ -2035,7 +2111,7 @@ PERL_PATH              = /usr/bin/perl
 # Configuration options related to the dot tool
 #---------------------------------------------------------------------------
 
-# If the CLASS_DIAGRAMS tag is set to YES doxygen will generate a class diagram
+# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram
 # (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
 # NO turns the diagrams off. Note that this option also works with HAVE_DOT
 # disabled, but it is recommended to install and use dot, since it yields more
@@ -2053,7 +2129,14 @@ CLASS_DIAGRAMS         = YES
 
 MSCGEN_PATH            =
 
-# If set to YES, the inheritance and collaboration graphs will hide inheritance
+# You can include diagrams made with dia in doxygen documentation. Doxygen will
+# then run dia to produce the diagram and insert it in the documentation. The
+# DIA_PATH tag allows you to specify the directory where the dia binary resides.
+# If left empty dia is assumed to be found in the default search path.
+
+DIA_PATH               =
+
+# If set to YES the inheritance and collaboration graphs will hide inheritance
 # and usage relations if the target is undocumented or is not a class.
 # The default value is: YES.
 
@@ -2064,7 +2147,7 @@ HIDE_UNDOC_RELATIONS   = YES
 # http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
 # Bell Labs. The other options in this section have no effect if this option is
 # set to NO
-# The default value is: NO.
+# The default value is: YES.
 
 HAVE_DOT               = YES
 
@@ -2078,7 +2161,7 @@ HAVE_DOT               = YES
 
 DOT_NUM_THREADS        = 0
 
-# When you want a differently looking font n the dot files that doxygen
+# When you want a differently looking font in the dot files that doxygen
 # generates you can specify the font name using DOT_FONTNAME. You need to make
 # sure dot is able to find the font, which can be done by putting it in a
 # standard location or by setting the DOTFONTPATH environment variable or by
@@ -2126,7 +2209,7 @@ COLLABORATION_GRAPH    = YES
 
 GROUP_GRAPHS           = NO
 
-# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
+# If the UML_LOOK tag is set to YES, doxygen will generate inheritance and
 # collaboration diagrams in a style similar to the OMG's Unified Modeling
 # Language.
 # The default value is: NO.
@@ -2216,7 +2299,9 @@ DIRECTORY_GRAPH        = NO
 # Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
 # to make the SVG files visible in IE 9+ (other browsers do not have this
 # requirement).
-# Possible values are: png, jpg, gif and svg.
+# Possible values are: png, png:cairo, png:cairo:cairo, png:cairo:gd, png:gd,
+# png:gd:gd, jpg, jpg:cairo, jpg:cairo:gd, jpg:gd, jpg:gd:gd, gif, gif:cairo,
+# gif:cairo:gd, gif:gd, gif:gd:gd and svg.
 # The default value is: png.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
@@ -2253,6 +2338,25 @@ DOTFILE_DIRS           = @TOPSRC@/tools/qfcc/doc/dot
 
 MSCFILE_DIRS           =
 
+# The DIAFILE_DIRS tag can be used to specify one or more directories that
+# contain dia files that are included in the documentation (see the \diafile
+# command).
+
+DIAFILE_DIRS           =
+
+# When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the
+# path where java can find the plantuml.jar file. If left blank, it is assumed
+# PlantUML is not used or called during a preprocessing step. Doxygen will
+# generate a warning when it encounters a \startuml command in this case and
+# will not generate output for the diagram.
+
+PLANTUML_JAR_PATH      =
+
+# When using plantuml, the specified paths are searched for files specified by
+# the !include statement in a plantuml block.
+
+PLANTUML_INCLUDE_PATH  =
+
 # The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
 # that will be shown in the graph. If the number of nodes in a graph becomes
 # larger than this value, doxygen will truncate the graph, which is visualized
@@ -2289,7 +2393,7 @@ MAX_DOT_GRAPH_DEPTH    = 0
 
 DOT_TRANSPARENT        = NO
 
-# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
+# Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output
 # files in one run (i.e. multiple -o and -T options on the command line). This
 # makes dot run faster, but since only newer versions of dot (>1.8.10) support
 # this, this feature is disabled by default.
@@ -2306,7 +2410,7 @@ DOT_MULTI_TARGETS      = YES
 
 GENERATE_LEGEND        = YES
 
-# If the DOT_CLEANUP tag is set to YES doxygen will remove the intermediate dot
+# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate dot
 # files that are used to generate the various graphs.
 # The default value is: YES.
 # This tag requires that the tag HAVE_DOT is set to YES.
diff --git a/ruamoko/Doxyfile.in b/ruamoko/Doxyfile.in
index a58146ab7..5fd86a9cc 100644
--- a/ruamoko/Doxyfile.in
+++ b/ruamoko/Doxyfile.in
@@ -1,110 +1,129 @@
-# Doxyfile 1.8.1.1
+# Doxyfile 1.8.9.1
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
 #
-# All text after a hash (#) is considered a comment and will be ignored.
+# All text after a double hash (##) is considered a comment and is placed in
+# front of the TAG it is preceding.
+#
+# All text after a single hash (#) is considered a comment and will be ignored.
 # The format is:
-#       TAG = value [value, ...]
-# For lists items can also be appended using:
-#       TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (" ").
+# TAG = value [value, ...]
+# For lists, items can also be appended using:
+# TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (\" \").
 
 #---------------------------------------------------------------------------
 # Project related configuration options
 #---------------------------------------------------------------------------
 
 # This tag specifies the encoding used for all characters in the config file
-# that follow. The default is UTF-8 which is also the encoding used for all
-# text before the first occurrence of this tag. Doxygen uses libiconv (or the
-# iconv built into libc) for the transcoding. See
-# http://www.gnu.org/software/libiconv for the list of possible encodings.
+# that follow. The default is UTF-8 which is also the encoding used for all text
+# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
+# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv
+# for the list of possible encodings.
+# The default value is: UTF-8.
 
 DOXYFILE_ENCODING      = UTF-8
 
-# The PROJECT_NAME tag is a single word (or sequence of words) that should
-# identify the project. Note that if you do not use Doxywizard you need
-# to put quotes around the project name if it contains spaces.
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
+# double-quotes, unless you are using Doxywizard) that should identify the
+# project for which the documentation is generated. This name is used in the
+# title of most generated pages and in a few other places.
+# The default value is: My Project.
 
 PROJECT_NAME           = "The Ruamoko Standard Library"
 
-# The PROJECT_NUMBER tag can be used to enter a project or revision number.
-# This could be handy for archiving the generated documentation or
-# if some version control system is used.
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
+# could be handy for archiving the generated documentation or if some version
+# control system is used.
 
 PROJECT_NUMBER         = @PACKAGE_VERSION@
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
-# for a project that appears at the top of each page and should give viewer
-# a quick idea about the purpose of the project. Keep the description short.
+# for a project that appears at the top of each page and should give viewer a
+# quick idea about the purpose of the project. Keep the description short.
 
 PROJECT_BRIEF          =
 
-# With the PROJECT_LOGO tag one can specify an logo or icon that is
-# included in the documentation. The maximum height of the logo should not
-# exceed 55 pixels and the maximum width should not exceed 200 pixels.
-# Doxygen will copy the logo to the output directory.
+# With the PROJECT_LOGO tag one can specify a logo or an icon that is included
+# in the documentation. The maximum height of the logo should not exceed 55
+# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
+# the logo to the output directory.
 
 PROJECT_LOGO           =
 
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
-# base path where the generated documentation will be put.
-# If a relative path is entered, it will be relative to the location
-# where doxygen was started. If left blank the current directory will be used.
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
+# into which the generated documentation will be written. If a relative path is
+# entered, it will be relative to the location where doxygen was started. If
+# left blank the current directory will be used.
 
 OUTPUT_DIRECTORY       = doxygen
 
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
-# 4096 sub-directories (in 2 levels) under the output directory of each output
-# format and will distribute the generated files over these directories.
-# Enabling this option can be useful when feeding doxygen a huge amount of
-# source files, where putting all generated files in the same directory would
-# otherwise cause performance problems for the file system.
+# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
+# directories (in 2 levels) under the output directory of each output format and
+# will distribute the generated files over these directories. Enabling this
+# option can be useful when feeding doxygen a huge amount of source files, where
+# putting all generated files in the same directory would otherwise causes
+# performance problems for the file system.
+# The default value is: NO.
 
 CREATE_SUBDIRS         = NO
 
+# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
+# characters to appear in the names of generated files. If set to NO, non-ASCII
+# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
+# U+3044.
+# The default value is: NO.
+
+ALLOW_UNICODE_NAMES    = NO
+
 # The OUTPUT_LANGUAGE tag is used to specify the language in which all
 # documentation generated by doxygen is written. Doxygen will use this
 # information to generate all constant output in the proper language.
-# The default language is English, other supported languages are:
-# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
-# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
-# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
-# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian,
-# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak,
-# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
+# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
+# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
+# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
+# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
+# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
+# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
+# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
+# Ukrainian and Vietnamese.
+# The default value is: English.
 
 OUTPUT_LANGUAGE        = English
 
-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
-# include brief member descriptions after the members that are listed in
-# the file and class documentation (similar to JavaDoc).
-# Set to NO to disable this.
+# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
+# descriptions after the members that are listed in the file and class
+# documentation (similar to Javadoc). Set to NO to disable this.
+# The default value is: YES.
 
 BRIEF_MEMBER_DESC      = NO
 
-# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
-# the brief description of a member or function before the detailed description.
-# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief
+# description of a member or function before the detailed description
+#
+# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
 # brief descriptions will be completely suppressed.
+# The default value is: YES.
 
 REPEAT_BRIEF           = YES
 
-# This tag implements a quasi-intelligent brief description abbreviator
-# that is used to form the text in various listings. Each string
-# in this list, if found as the leading text of the brief description, will be
-# stripped from the text and the result after processing the whole list, is
-# used as the annotated text. Otherwise, the brief description is used as-is.
-# If left blank, the following values are used ("$name" is automatically
-# replaced with the name of the entity): "The $name class" "The $name widget"
-# "The $name file" "is" "provides" "specifies" "contains"
-# "represents" "a" "an" "the"
+# This tag implements a quasi-intelligent brief description abbreviator that is
+# used to form the text in various listings. Each string in this list, if found
+# as the leading text of the brief description, will be stripped from the text
+# and the result, after processing the whole list, is used as the annotated
+# text. Otherwise, the brief description is used as-is. If left blank, the
+# following values are used ($name is automatically replaced with the name of
+# the entity):The $name class, The $name widget, The $name file, is, provides,
+# specifies, contains, represents, a, an and the.
 
 ABBREVIATE_BRIEF       =
 
 # If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
-# Doxygen will generate a detailed section even if there is only a brief
+# doxygen will generate a detailed section even if there is only a brief
 # description.
+# The default value is: NO.
 
 ALWAYS_DETAILED_SEC    = NO
 
@@ -112,238 +131,270 @@ ALWAYS_DETAILED_SEC    = NO
 # inherited members of a class in the documentation of that class as if those
 # members were ordinary class members. Constructors, destructors and assignment
 # operators of the base classes will not be shown.
+# The default value is: NO.
 
 INLINE_INHERITED_MEMB  = NO
 
-# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
-# path before files name in the file list and in the header files. If set
-# to NO the shortest path that makes the file name unique will be used.
+# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path
+# before files name in the file list and in the header files. If set to NO the
+# shortest path that makes the file name unique will be used
+# The default value is: YES.
 
 FULL_PATH_NAMES        = YES
 
-# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
-# can be used to strip a user-defined part of the path. Stripping is
-# only done if one of the specified strings matches the left-hand part of
-# the path. The tag can be used to show relative paths in the file list.
-# If left blank the directory from which doxygen is run is used as the
-# path to strip.
+# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
+# Stripping is only done if one of the specified strings matches the left-hand
+# part of the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the path to
+# strip.
+#
+# Note that you can specify absolute paths here, but also relative paths, which
+# will be relative from the directory where doxygen is started.
+# This tag requires that the tag FULL_PATH_NAMES is set to YES.
 
 STRIP_FROM_PATH        = @TOPSRC@/ruamoko
 
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
-# the path mentioned in the documentation of a class, which tells
-# the reader which header file to include in order to use a class.
-# If left blank only the name of the header file containing the class
-# definition is used. Otherwise one should specify the include paths that
-# are normally passed to the compiler using the -I flag.
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
+# path mentioned in the documentation of a class, which tells the reader which
+# header file to include in order to use a class. If left blank only the name of
+# the header file containing the class definition is used. Otherwise one should
+# specify the list of include paths that are normally passed to the compiler
+# using the -I flag.
 
 STRIP_FROM_INC_PATH    = @TOPSRC@/ruamoko/include/
 
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
-# (but less readable) file names. This can be useful if your file system
-# doesn't support long names like on DOS, Mac, or CD-ROM.
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
+# less readable) file names. This can be useful is your file systems doesn't
+# support long names like on DOS, Mac, or CD-ROM.
+# The default value is: NO.
 
 SHORT_NAMES            = NO
 
-# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
-# will interpret the first line (until the first dot) of a JavaDoc-style
-# comment as the brief description. If set to NO, the JavaDoc
-# comments will behave just like regular Qt-style comments
-# (thus requiring an explicit @brief command for a brief description.)
+# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
+# first line (until the first dot) of a Javadoc-style comment as the brief
+# description. If set to NO, the Javadoc-style will behave just like regular Qt-
+# style comments (thus requiring an explicit @brief command for a brief
+# description.)
+# The default value is: NO.
 
 JAVADOC_AUTOBRIEF      = YES
 
-# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
-# interpret the first line (until the first dot) of a Qt-style
-# comment as the brief description. If set to NO, the comments
-# will behave just like regular Qt-style comments (thus requiring
-# an explicit \brief command for a brief description.)
+# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
+# line (until the first dot) of a Qt-style comment as the brief description. If
+# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
+# requiring an explicit \brief command for a brief description.)
+# The default value is: NO.
 
 QT_AUTOBRIEF           = NO
 
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
-# treat a multi-line C++ special comment block (i.e. a block of //! or ///
-# comments) as a brief description. This used to be the default behaviour.
-# The new default is to treat a multi-line C++ comment block as a detailed
-# description. Set this tag to YES if you prefer the old behaviour instead.
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
+# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
+# a brief description. This used to be the default behavior. The new default is
+# to treat a multi-line C++ comment block as a detailed description. Set this
+# tag to YES if you prefer the old behavior instead.
+#
+# Note that setting this tag to YES also means that rational rose comments are
+# not recognized any more.
+# The default value is: NO.
 
 MULTILINE_CPP_IS_BRIEF = NO
 
-# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
-# member inherits the documentation from any documented member that it
-# re-implements.
+# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
+# documentation from any documented member that it re-implements.
+# The default value is: YES.
 
 INHERIT_DOCS           = YES
 
-# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
-# a new page for each member. If set to NO, the documentation of a member will
-# be part of the file/class/namespace that contains it.
+# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new
+# page for each member. If set to NO, the documentation of a member will be part
+# of the file/class/namespace that contains it.
+# The default value is: NO.
 
 SEPARATE_MEMBER_PAGES  = NO
 
-# The TAB_SIZE tag can be used to set the number of spaces in a tab.
-# Doxygen uses this value to replace tabs by spaces in code fragments.
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
+# uses this value to replace tabs by spaces in code fragments.
+# Minimum value: 1, maximum value: 16, default value: 4.
 
 TAB_SIZE               = 4
 
-# This tag can be used to specify a number of aliases that acts
-# as commands in the documentation. An alias has the form "name=value".
-# For example adding "sideeffect=\par Side Effects:\n" will allow you to
-# put the command \sideeffect (or @sideeffect) in the documentation, which
-# will result in a user-defined paragraph with heading "Side Effects:".
-# You can put \n's in the value part of an alias to insert newlines.
+# This tag can be used to specify a number of aliases that act as commands in
+# the documentation. An alias has the form:
+# name=value
+# For example adding
+# "sideeffect=@par Side Effects:\n"
+# will allow you to put the command \sideeffect (or @sideeffect) in the
+# documentation, which will result in a user-defined paragraph with heading
+# "Side Effects:". You can put \n's in the value part of an alias to insert
+# newlines.
 
 ALIASES                =
 
 # This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding
-# "class=itcl::class" will allow you to use the command class in the
-# itcl::class meaning.
+# A mapping has the form "name=value". For example adding "class=itcl::class"
+# will allow you to use the command class in the itcl::class meaning.
 
 TCL_SUBST              =
 
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
-# sources only. Doxygen will then generate output that is more tailored for C.
-# For instance, some of the names that are used will be different. The list
-# of all members will be omitted, etc.
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
+# only. Doxygen will then generate output that is more tailored for C. For
+# instance, some of the names that are used will be different. The list of all
+# members will be omitted, etc.
+# The default value is: NO.
 
 OPTIMIZE_OUTPUT_FOR_C  = NO
 
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
-# sources only. Doxygen will then generate output that is more tailored for
-# Java. For instance, namespaces will be presented as packages, qualified
-# scopes will look different, etc.
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
+# Python sources only. Doxygen will then generate output that is more tailored
+# for that language. For instance, namespaces will be presented as packages,
+# qualified scopes will look different, etc.
+# The default value is: NO.
 
 OPTIMIZE_OUTPUT_JAVA   = NO
 
 # Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
-# sources only. Doxygen will then generate output that is more tailored for
-# Fortran.
+# sources. Doxygen will then generate output that is tailored for Fortran.
+# The default value is: NO.
 
 OPTIMIZE_FOR_FORTRAN   = NO
 
 # Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
-# sources. Doxygen will then generate output that is tailored for
-# VHDL.
+# sources. Doxygen will then generate output that is tailored for VHDL.
+# The default value is: NO.
 
 OPTIMIZE_OUTPUT_VHDL   = NO
 
 # Doxygen selects the parser to use depending on the extension of the files it
-# parses. With this tag you can assign which parser to use for a given extension.
-# Doxygen has a built-in mapping, but you can override or extend it using this
-# tag. The format is ext=language, where ext is a file extension, and language
-# is one of the parsers supported by doxygen: IDL, Java, Javascript, CSharp, C,
-# C++, D, PHP, Objective-C, Python, Fortran, VHDL, C, C++. For instance to make
-# doxygen treat .inc files as Fortran files (default is PHP), and .f files as C
-# (default is Fortran), use: inc=Fortran f=C. Note that for custom extensions
-# you also need to set FILE_PATTERNS otherwise the files are not read by doxygen.
+# parses. With this tag you can assign which parser to use for a given
+# extension. Doxygen has a built-in mapping, but you can override or extend it
+# using this tag. The format is ext=language, where ext is a file extension, and
+# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
+# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran:
+# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran:
+# Fortran. In the later case the parser tries to guess whether the code is fixed
+# or free formatted code, this is the default for Fortran type files), VHDL. For
+# instance to make doxygen treat .inc files as Fortran files (default is PHP),
+# and .f files as C (default is Fortran), use: inc=Fortran f=C.
+#
+# Note: For files without extension you can use no_extension as a placeholder.
+#
+# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
+# the files are not read by doxygen.
 
 EXTENSION_MAPPING      = r=Objective-C \
                          qc=Objective-C
 
-# If MARKDOWN_SUPPORT is enabled (the default) then doxygen pre-processes all
-# comments according to the Markdown format, which allows for more readable
+# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
+# according to the Markdown format, which allows for more readable
 # documentation. See http://daringfireball.net/projects/markdown/ for details.
-# The output of markdown processing is further processed by doxygen, so you
-# can mix doxygen, HTML, and XML commands with Markdown formatting.
-# Disable only in case of backward compatibilities issues.
+# The output of markdown processing is further processed by doxygen, so you can
+# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
+# case of backward compatibilities issues.
+# The default value is: YES.
 
 MARKDOWN_SUPPORT       = YES
 
+# When enabled doxygen tries to link words that correspond to documented
+# classes, or namespaces to their corresponding documentation. Such a link can
+# be prevented in individual cases by putting a % sign in front of the word or
+# globally by setting AUTOLINK_SUPPORT to NO.
+# The default value is: YES.
+
+AUTOLINK_SUPPORT       = YES
+
 # If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
-# to include (a tag file for) the STL sources as input, then you should
-# set this tag to YES in order to let doxygen match functions declarations and
-# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
-# func(std::string) {}). This also makes the inheritance and collaboration
+# to include (a tag file for) the STL sources as input, then you should set this
+# tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string);
+# versus func(std::string) {}). This also make the inheritance and collaboration
 # diagrams that involve STL classes more complete and accurate.
+# The default value is: NO.
 
 BUILTIN_STL_SUPPORT    = NO
 
 # If you use Microsoft's C++/CLI language, you should set this option to YES to
 # enable parsing support.
+# The default value is: NO.
 
 CPP_CLI_SUPPORT        = NO
 
-# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.
-# Doxygen will parse them like normal C++ but will assume all classes use public
-# instead of private inheritance when no explicit protection keyword is present.
+# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
+# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen
+# will parse them like normal C++ but will assume all classes use public instead
+# of private inheritance when no explicit protection keyword is present.
+# The default value is: NO.
 
 SIP_SUPPORT            = NO
 
-# For Microsoft's IDL there are propget and propput attributes to indicate getter
-# and setter methods for a property. Setting this option to YES (the default)
-# will make doxygen replace the get and set methods by a property in the
-# documentation. This will only work if the methods are indeed getting or
-# setting a simple type. If this is not the case, or you want to show the
-# methods anyway, you should set this option to NO.
+# For Microsoft's IDL there are propget and propput attributes to indicate
+# getter and setter methods for a property. Setting this option to YES will make
+# doxygen to replace the get and set methods by a property in the documentation.
+# This will only work if the methods are indeed getting or setting a simple
+# type. If this is not the case, or you want to show the methods anyway, you
+# should set this option to NO.
+# The default value is: YES.
 
 IDL_PROPERTY_SUPPORT   = NO
 
 # If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
-# tag is set to YES, then doxygen will reuse the documentation of the first
+# tag is set to YES then doxygen will reuse the documentation of the first
 # member in the group (if any) for the other members of the group. By default
 # all members of a group must be documented explicitly.
+# The default value is: NO.
 
 DISTRIBUTE_GROUP_DOC   = NO
 
-# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
-# the same type (for instance a group of public functions) to be put as a
-# subgroup of that type (e.g. under the Public Functions section). Set it to
-# NO to prevent subgrouping. Alternatively, this can be done per class using
-# the \nosubgrouping command.
+# Set the SUBGROUPING tag to YES to allow class member groups of the same type
+# (for instance a group of public functions) to be put as a subgroup of that
+# type (e.g. under the Public Functions section). Set it to NO to prevent
+# subgrouping. Alternatively, this can be done per class using the
+# \nosubgrouping command.
+# The default value is: YES.
 
 SUBGROUPING            = YES
 
-# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and
-# unions are shown inside the group in which they are included (e.g. using
-# @ingroup) instead of on a separate page (for HTML and Man pages) or
-# section (for LaTeX and RTF).
+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
+# are shown inside the group in which they are included (e.g. using \ingroup)
+# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
+# and RTF).
+#
+# Note that this feature does not work in combination with
+# SEPARATE_MEMBER_PAGES.
+# The default value is: NO.
 
 INLINE_GROUPED_CLASSES = NO
 
-# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and
-# unions with only public data fields will be shown inline in the documentation
-# of the scope in which they are defined (i.e. file, namespace, or group
-# documentation), provided this scope is documented. If set to NO (the default),
-# structs, classes, and unions are shown on a separate page (for HTML and Man
-# pages) or section (for LaTeX and RTF).
+# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
+# with only public data fields or simple typedef fields will be shown inline in
+# the documentation of the scope in which they are defined (i.e. file,
+# namespace, or group documentation), provided this scope is documented. If set
+# to NO, structs, classes, and unions are shown on a separate page (for HTML and
+# Man pages) or section (for LaTeX and RTF).
+# The default value is: NO.
 
 INLINE_SIMPLE_STRUCTS  = NO
 
-# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
-# is documented as struct, union, or enum with the name of the typedef. So
+# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
+# enum is documented as struct, union, or enum with the name of the typedef. So
 # typedef struct TypeS {} TypeT, will appear in the documentation as a struct
 # with name TypeT. When disabled the typedef will appear as a member of a file,
-# namespace, or class. And the struct will be named TypeS. This can typically
-# be useful for C code in case the coding convention dictates that all compound
+# namespace, or class. And the struct will be named TypeS. This can typically be
+# useful for C code in case the coding convention dictates that all compound
 # types are typedef'ed and only the typedef is referenced, never the tag name.
+# The default value is: NO.
 
 TYPEDEF_HIDES_STRUCT   = NO
 
-# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
-# determine which symbols to keep in memory and which to flush to disk.
-# When the cache is full, less often used symbols will be written to disk.
-# For small to medium size projects (<1000 input files) the default value is
-# probably good enough. For larger projects a too small cache size can cause
-# doxygen to be busy swapping symbols to and from disk most of the time
-# causing a significant performance penalty.
-# If the system has enough physical memory increasing the cache will improve the
-# performance by keeping more symbols in memory. Note that the value works on
-# a logarithmic scale so increasing the size by one will roughly double the
-# memory usage. The cache size is given by this formula:
-# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
-# corresponding to a cache size of 2^16 = 65536 symbols.
-
-SYMBOL_CACHE_SIZE      = 0
-
-# Similar to the SYMBOL_CACHE_SIZE the size of the symbol lookup cache can be
-# set using LOOKUP_CACHE_SIZE. This cache is used to resolve symbols given
-# their name and scope. Since this can be an expensive process and often the
-# same symbol appear multiple times in the code, doxygen keeps a cache of
-# pre-resolved symbols. If the cache is too small doxygen will become slower.
-# If the cache is too large, memory is wasted. The cache size is given by this
-# formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range is 0..9, the default is 0,
-# corresponding to a cache size of 2^16 = 65536 symbols.
+# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
+# cache is used to resolve symbols given their name and scope. Since this can be
+# an expensive process and often the same symbol appears multiple times in the
+# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
+# doxygen will become slower. If the cache is too large, memory is wasted. The
+# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
+# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
+# symbols. At the end of a run doxygen will report the cache usage and suggest
+# the optimal cache size from a speed point of view.
+# Minimum value: 0, maximum value: 9, default value: 0.
 
 LOOKUP_CACHE_SIZE      = 0
 
@@ -351,345 +402,400 @@ LOOKUP_CACHE_SIZE      = 0
 # Build related configuration options
 #---------------------------------------------------------------------------
 
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
-# documentation are documented, even if no documentation was available.
-# Private class members and static file members will be hidden unless
-# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
+# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in
+# documentation are documented, even if no documentation was available. Private
+# class members and static file members will be hidden unless the
+# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
+# Note: This will also disable the warnings about undocumented members that are
+# normally produced when WARNINGS is set to YES.
+# The default value is: NO.
 
 EXTRACT_ALL            = YES
 
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
-# will be included in the documentation.
+# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will
+# be included in the documentation.
+# The default value is: NO.
 
 EXTRACT_PRIVATE        = NO
 
-# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal scope will be included in the documentation.
+# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal
+# scope will be included in the documentation.
+# The default value is: NO.
 
 EXTRACT_PACKAGE        = NO
 
-# If the EXTRACT_STATIC tag is set to YES all static members of a file
-# will be included in the documentation.
+# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be
+# included in the documentation.
+# The default value is: NO.
 
 EXTRACT_STATIC         = NO
 
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
-# defined locally in source files will be included in the documentation.
-# If set to NO only classes defined in header files are included.
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined
+# locally in source files will be included in the documentation. If set to NO,
+# only classes defined in header files are included. Does not have any effect
+# for Java sources.
+# The default value is: YES.
 
 EXTRACT_LOCAL_CLASSES  = NO
 
-# This flag is only useful for Objective-C code. When set to YES local
-# methods, which are defined in the implementation section but not in
-# the interface are included in the documentation.
-# If set to NO (the default) only methods in the interface are included.
+# This flag is only useful for Objective-C code. If set to YES, local methods,
+# which are defined in the implementation section but not in the interface are
+# included in the documentation. If set to NO, only methods in the interface are
+# included.
+# The default value is: NO.
 
 EXTRACT_LOCAL_METHODS  = NO
 
 # If this flag is set to YES, the members of anonymous namespaces will be
 # extracted and appear in the documentation as a namespace called
-# 'anonymous_namespace{file}', where file will be replaced with the base
-# name of the file that contains the anonymous namespace. By default
-# anonymous namespaces are hidden.
+# 'anonymous_namespace{file}', where file will be replaced with the base name of
+# the file that contains the anonymous namespace. By default anonymous namespace
+# are hidden.
+# The default value is: NO.
 
 EXTRACT_ANON_NSPACES   = NO
 
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
-# undocumented members of documented classes, files or namespaces.
-# If set to NO (the default) these members will be included in the
-# various overviews, but no documentation section is generated.
-# This option has no effect if EXTRACT_ALL is enabled.
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
+# undocumented members inside documented classes or files. If set to NO these
+# members will be included in the various overviews, but no documentation
+# section is generated. This option has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
 
 HIDE_UNDOC_MEMBERS     = NO
 
-# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
-# undocumented classes that are normally visible in the class hierarchy.
-# If set to NO (the default) these classes will be included in the various
-# overviews. This option has no effect if EXTRACT_ALL is enabled.
+# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy. If set
+# to NO, these classes will be included in the various overviews. This option
+# has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
 
 HIDE_UNDOC_CLASSES     = NO
 
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
-# friend (class|struct|union) declarations.
-# If set to NO (the default) these declarations will be included in the
-# documentation.
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
+# (class|struct|union) declarations. If set to NO, these declarations will be
+# included in the documentation.
+# The default value is: NO.
 
 HIDE_FRIEND_COMPOUNDS  = NO
 
-# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
-# documentation blocks found inside the body of a function.
-# If set to NO (the default) these blocks will be appended to the
-# function's detailed documentation block.
+# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
+# documentation blocks found inside the body of a function. If set to NO, these
+# blocks will be appended to the function's detailed documentation block.
+# The default value is: NO.
 
 HIDE_IN_BODY_DOCS      = NO
 
-# The INTERNAL_DOCS tag determines if documentation
-# that is typed after a \internal command is included. If the tag is set
-# to NO (the default) then the documentation will be excluded.
-# Set it to YES to include the internal documentation.
+# The INTERNAL_DOCS tag determines if documentation that is typed after a
+# \internal command is included. If the tag is set to NO then the documentation
+# will be excluded. Set it to YES to include the internal documentation.
+# The default value is: NO.
 
 INTERNAL_DOCS          = NO
 
-# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
-# file names in lower-case letters. If set to YES upper-case letters are also
+# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
+# names in lower-case letters. If set to YES, upper-case letters are also
 # allowed. This is useful if you have classes or files whose names only differ
 # in case and if your file system supports case sensitive file names. Windows
 # and Mac users are advised to set this option to NO.
+# The default value is: system dependent.
 
 CASE_SENSE_NAMES       = NO
 
-# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
-# will show members with their full class and namespace scopes in the
-# documentation. If set to YES the scope will be hidden.
+# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
+# their full class and namespace scopes in the documentation. If set to YES, the
+# scope will be hidden.
+# The default value is: NO.
 
 HIDE_SCOPE_NAMES       = YES
 
-# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
-# will put a list of the files that are included by a file in the documentation
-# of that file.
+# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will
+# append additional text to a page's title, such as Class Reference. If set to
+# YES the compound reference will be hidden.
+# The default value is: NO.
+
+HIDE_COMPOUND_REFERENCE= NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
+# the files that are included by a file in the documentation of that file.
+# The default value is: YES.
 
 SHOW_INCLUDE_FILES     = NO
 
-# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen
-# will list include files with double quotes in the documentation
-# rather than with sharp brackets.
+# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
+# grouped member an include statement to the documentation, telling the reader
+# which file to include in order to use the member.
+# The default value is: NO.
+
+SHOW_GROUPED_MEMB_INC  = NO
+
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
+# files with double quotes in the documentation rather than with sharp brackets.
+# The default value is: NO.
 
 FORCE_LOCAL_INCLUDES   = NO
 
-# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
-# is inserted in the documentation for inline members.
+# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
+# documentation for inline members.
+# The default value is: YES.
 
 INLINE_INFO            = YES
 
-# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
-# will sort the (detailed) documentation of file and class members
-# alphabetically by member name. If set to NO the members will appear in
-# declaration order.
+# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
+# (detailed) documentation of file and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order.
+# The default value is: YES.
 
 SORT_MEMBER_DOCS       = NO
 
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
-# brief documentation of file, namespace and class members alphabetically
-# by member name. If set to NO (the default) the members will appear in
-# declaration order.
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
+# descriptions of file, namespace and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order. Note that
+# this will also influence the order of the classes in the class list.
+# The default value is: NO.
 
 SORT_BRIEF_DOCS        = YES
 
-# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen
-# will sort the (brief and detailed) documentation of class members so that
-# constructors and destructors are listed first. If set to NO (the default)
-# the constructors will appear in the respective orders defined by
-# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS.
-# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO
-# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
+# (brief and detailed) documentation of class members so that constructors and
+# destructors are listed first. If set to NO the constructors will appear in the
+# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
+# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
+# member documentation.
+# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
+# detailed member documentation.
+# The default value is: NO.
 
 SORT_MEMBERS_CTORS_1ST = NO
 
-# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
-# hierarchy of group names into alphabetical order. If set to NO (the default)
-# the group names will appear in their defined order.
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
+# of group names into alphabetical order. If set to NO the group names will
+# appear in their defined order.
+# The default value is: NO.
 
 SORT_GROUP_NAMES       = YES
 
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
-# sorted by fully-qualified names, including namespaces. If set to
-# NO (the default), the class list will be sorted only by class name,
-# not including the namespace part.
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
+# fully-qualified names, including namespaces. If set to NO, the class list will
+# be sorted only by class name, not including the namespace part.
 # Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-# Note: This option applies only to the class list, not to the
-# alphabetical list.
+# Note: This option applies only to the class list, not to the alphabetical
+# list.
+# The default value is: NO.
 
 SORT_BY_SCOPE_NAME     = NO
 
-# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to
-# do proper type resolution of all parameters of a function it will reject a
-# match between the prototype and the implementation of a member function even
-# if there is only one candidate or it is obvious which candidate to choose
-# by doing a simple string match. By disabling STRICT_PROTO_MATCHING doxygen
-# will still accept a match between prototype and implementation in such cases.
+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
+# type resolution of all parameters of a function it will reject a match between
+# the prototype and the implementation of a member function even if there is
+# only one candidate or it is obvious which candidate to choose by doing a
+# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
+# accept a match between prototype and implementation in such cases.
+# The default value is: NO.
 
 STRICT_PROTO_MATCHING  = NO
 
-# The GENERATE_TODOLIST tag can be used to enable (YES) or
-# disable (NO) the todo list. This list is created by putting \todo
-# commands in the documentation.
+# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo
+# list. This list is created by putting \todo commands in the documentation.
+# The default value is: YES.
 
 GENERATE_TODOLIST      = YES
 
-# The GENERATE_TESTLIST tag can be used to enable (YES) or
-# disable (NO) the test list. This list is created by putting \test
-# commands in the documentation.
+# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test
+# list. This list is created by putting \test commands in the documentation.
+# The default value is: YES.
 
 GENERATE_TESTLIST      = NO
 
-# The GENERATE_BUGLIST tag can be used to enable (YES) or
-# disable (NO) the bug list. This list is created by putting \bug
-# commands in the documentation.
+# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug
+# list. This list is created by putting \bug commands in the documentation.
+# The default value is: YES.
 
 GENERATE_BUGLIST       = NO
 
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
-# disable (NO) the deprecated list. This list is created by putting
-# \deprecated commands in the documentation.
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO)
+# the deprecated list. This list is created by putting \deprecated commands in
+# the documentation.
+# The default value is: YES.
 
 GENERATE_DEPRECATEDLIST= YES
 
-# The ENABLED_SECTIONS tag can be used to enable conditional
-# documentation sections, marked by \if sectionname ... \endif.
+# The ENABLED_SECTIONS tag can be used to enable conditional documentation
+# sections, marked by \if <section_label> ... \endif and \cond <section_label>
+# ... \endcond blocks.
 
 ENABLED_SECTIONS       =
 
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
-# the initial value of a variable or macro consists of for it to appear in
-# the documentation. If the initializer consists of more lines than specified
-# here it will be hidden. Use a value of 0 to hide initializers completely.
-# The appearance of the initializer of individual variables and macros in the
-# documentation can be controlled using \showinitializer or \hideinitializer
-# command in the documentation regardless of this setting.
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
+# initial value of a variable or macro / define can have for it to appear in the
+# documentation. If the initializer consists of more lines than specified here
+# it will be hidden. Use a value of 0 to hide initializers completely. The
+# appearance of the value of individual variables and macros / defines can be
+# controlled using \showinitializer or \hideinitializer command in the
+# documentation regardless of this setting.
+# Minimum value: 0, maximum value: 10000, default value: 30.
 
 MAX_INITIALIZER_LINES  = 30
 
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
-# at the bottom of the documentation of classes and structs. If set to YES the
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
+# the bottom of the documentation of classes and structs. If set to YES, the
 # list will mention the files that were used to generate the documentation.
+# The default value is: YES.
 
 SHOW_USED_FILES        = YES
 
-# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
-# This will remove the Files entry from the Quick Index and from the
-# Folder Tree View (if specified). The default is YES.
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
+# will remove the Files entry from the Quick Index and from the Folder Tree View
+# (if specified).
+# The default value is: YES.
 
 SHOW_FILES             = YES
 
-# Set the SHOW_NAMESPACES tag to NO to disable the generation of the
-# Namespaces page.
-# This will remove the Namespaces entry from the Quick Index
-# and from the Folder Tree View (if specified). The default is YES.
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
+# page. This will remove the Namespaces entry from the Quick Index and from the
+# Folder Tree View (if specified).
+# The default value is: YES.
 
 SHOW_NAMESPACES        = YES
 
 # The FILE_VERSION_FILTER tag can be used to specify a program or script that
 # doxygen should invoke to get the current version for each file (typically from
 # the version control system). Doxygen will invoke the program by executing (via
-# popen()) the command <command> <input-file>, where <command> is the value of
-# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file
-# provided by doxygen. Whatever the program writes to standard output
-# is used as the file version. See the manual for examples.
+# popen()) the command command input-file, where command is the value of the
+# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
+# by doxygen. Whatever the program writes to standard output is used as the file
+# version. For an example see the documentation.
 
 FILE_VERSION_FILTER    =
 
 # The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
 # by doxygen. The layout file controls the global structure of the generated
 # output files in an output format independent way. To create the layout file
-# that represents doxygen's defaults, run doxygen with the -l option.
-# You can optionally specify a file name after the option, if omitted
-# DoxygenLayout.xml will be used as the name of the layout file.
+# that represents doxygen's defaults, run doxygen with the -l option. You can
+# optionally specify a file name after the option, if omitted DoxygenLayout.xml
+# will be used as the name of the layout file.
+#
+# Note that if you run doxygen from a directory containing a file called
+# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
+# tag is left empty.
 
 LAYOUT_FILE            = @TOPSRC@/doc/ruadoc-layout.xml
 
-# The CITE_BIB_FILES tag can be used to specify one or more bib files
-# containing the references data. This must be a list of .bib files. The
-# .bib extension is automatically appended if omitted. Using this command
-# requires the bibtex tool to be installed. See also
-# http://en.wikipedia.org/wiki/BibTeX for more info. For LaTeX the style
-# of the bibliography can be controlled using LATEX_BIB_STYLE. To use this
-# feature you need bibtex and perl available in the search path.
+# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
+# the reference definitions. This must be a list of .bib files. The .bib
+# extension is automatically appended if omitted. This requires the bibtex tool
+# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info.
+# For LaTeX the style of the bibliography can be controlled using
+# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
+# search path. See also \cite for info how to create references.
 
 CITE_BIB_FILES         =
 
 #---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
+# Configuration options related to warning and progress messages
 #---------------------------------------------------------------------------
 
-# The QUIET tag can be used to turn on/off the messages that are generated
-# by doxygen. Possible values are YES and NO. If left blank NO is used.
+# The QUIET tag can be used to turn on/off the messages that are generated to
+# standard output by doxygen. If QUIET is set to YES this implies that the
+# messages are off.
+# The default value is: NO.
 
 QUIET                  = YES
 
 # The WARNINGS tag can be used to turn on/off the warning messages that are
-# generated by doxygen. Possible values are YES and NO. If left blank
-# NO is used.
+# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES
+# this implies that the warnings are on.
+#
+# Tip: Turn warnings on while writing the documentation.
+# The default value is: YES.
 
 WARNINGS               = YES
 
-# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
-# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
-# automatically be disabled.
+# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate
+# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
+# will automatically be disabled.
+# The default value is: YES.
 
 WARN_IF_UNDOCUMENTED   = YES
 
-# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some
-# parameters in a documented function, or documenting parameters that
-# don't exist or using markup commands wrongly.
+# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some parameters
+# in a documented function, or documenting parameters that don't exist or using
+# markup commands wrongly.
+# The default value is: YES.
 
 WARN_IF_DOC_ERROR      = YES
 
-# The WARN_NO_PARAMDOC option can be enabled to get warnings for
-# functions that are documented, but have no documentation for their parameters
-# or return value. If set to NO (the default) doxygen will only warn about
-# wrong or incomplete parameter documentation, but not about the absence of
-# documentation.
+# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
+# are documented, but have no documentation for their parameters or return
+# value. If set to NO, doxygen will only warn about wrong or incomplete
+# parameter documentation, but not about the absence of documentation.
+# The default value is: NO.
 
 WARN_NO_PARAMDOC       = NO
 
-# The WARN_FORMAT tag determines the format of the warning messages that
-# doxygen can produce. The string should contain the $file, $line, and $text
-# tags, which will be replaced by the file and line number from which the
-# warning originated and the warning text. Optionally the format may contain
-# $version, which will be replaced by the version of the file (if it could
-# be obtained via FILE_VERSION_FILTER)
+# The WARN_FORMAT tag determines the format of the warning messages that doxygen
+# can produce. The string should contain the $file, $line, and $text tags, which
+# will be replaced by the file and line number from which the warning originated
+# and the warning text. Optionally the format may contain $version, which will
+# be replaced by the version of the file (if it could be obtained via
+# FILE_VERSION_FILTER)
+# The default value is: $file:$line: $text.
 
 WARN_FORMAT            = "$file:$line: $text"
 
-# The WARN_LOGFILE tag can be used to specify a file to which warning
-# and error messages should be written. If left blank the output is written
-# to stderr.
+# The WARN_LOGFILE tag can be used to specify a file to which warning and error
+# messages should be written. If left blank the output is written to standard
+# error (stderr).
 
 WARN_LOGFILE           =
 
 #---------------------------------------------------------------------------
-# configuration options related to the input files
+# Configuration options related to the input files
 #---------------------------------------------------------------------------
 
-# The INPUT tag can be used to specify the files and/or directories that contain
-# documented source files. You may enter file names like "myfile.cpp" or
-# directories like "/usr/src/myproject". Separate the files or directories
-# with spaces.
+# The INPUT tag is used to specify the files and/or directories that contain
+# documented source files. You may enter file names like myfile.cpp or
+# directories like /usr/src/myproject. Separate the files or directories with
+# spaces.
+# Note: If this tag is empty the current directory is searched.
 
 INPUT                  = @TOPSRC@/ruamoko/include/ \
                          @TOPSRC@/ruamoko/lib/ \
                          @TOPSRC@/ruamoko/gui/
 
 # This tag can be used to specify the character encoding of the source files
-# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
-# also the default input encoding. Doxygen uses libiconv (or the iconv built
-# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
-# the list of possible encodings.
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
+# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
+# documentation (see: http://www.gnu.org/software/libiconv) for the list of
+# possible encodings.
+# The default value is: UTF-8.
 
 INPUT_ENCODING         = UTF-8
 
 # If the value of the INPUT tag contains directories, you can use the
-# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
-# blank the following patterns are tested:
-# *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh
-# *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py
-# *.f90 *.f *.for *.vhd *.vhdl
+# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
+# *.h) to filter out the source-files in the directories. If left blank the
+# following patterns are tested:*.c, *.cc, *.cxx, *.cpp, *.c++, *.java, *.ii,
+# *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h, *.hh, *.hxx, *.hpp,
+# *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc, *.m, *.markdown,
+# *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf,
+# *.qsf, *.as and *.js.
 
 FILE_PATTERNS          = *.qc \
                          *.r \
                          *.rh \
                          *.h
 
-# The RECURSIVE tag can be used to turn specify whether or not subdirectories
-# should be searched for input files as well. Possible values are YES and NO.
-# If left blank NO is used.
+# The RECURSIVE tag can be used to specify whether or not subdirectories should
+# be searched for input files as well.
+# The default value is: NO.
 
 RECURSIVE              = YES
 
 # The EXCLUDE tag can be used to specify files and/or directories that should be
 # excluded from the INPUT source files. This way you can easily exclude a
 # subdirectory from a directory tree whose root is specified with the INPUT tag.
+#
 # Note that relative paths are relative to the directory from which doxygen is
 # run.
 
@@ -698,14 +804,16 @@ EXCLUDE                =
 # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
 # directories that are symbolic links (a Unix file system feature) are excluded
 # from the input.
+# The default value is: NO.
 
 EXCLUDE_SYMLINKS       = NO
 
 # If the value of the INPUT tag contains directories, you can use the
 # EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
-# certain files from those directories. Note that the wildcards are matched
-# against the file with absolute path, so to exclude all test directories
-# for example use the pattern */test/*
+# certain files from those directories.
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories for example use the pattern */test/*
 
 EXCLUDE_PATTERNS       =
 
@@ -714,755 +822,1130 @@ EXCLUDE_PATTERNS       =
 # output. The symbol name can be a fully qualified name, a word, or if the
 # wildcard * is used, a substring. Examples: ANamespace, AClass,
 # AClass::ANamespace, ANamespace::*Test
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories use the pattern */test/*
 
 EXCLUDE_SYMBOLS        =
 
-# The EXAMPLE_PATH tag can be used to specify one or more files or
-# directories that contain example code fragments that are included (see
-# the \include command).
+# The EXAMPLE_PATH tag can be used to specify one or more files or directories
+# that contain example code fragments that are included (see the \include
+# command).
 
 EXAMPLE_PATH           = @TOPSRC@/ruamoko/examples
 
 # If the value of the EXAMPLE_PATH tag contains directories, you can use the
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
-# blank all files are included.
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
+# *.h) to filter out the source-files in the directories. If left blank all
+# files are included.
 
 EXAMPLE_PATTERNS       =
 
 # If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
-# searched for input files to be used with the \include or \dontinclude
-# commands irrespective of the value of the RECURSIVE tag.
-# Possible values are YES and NO. If left blank NO is used.
+# searched for input files to be used with the \include or \dontinclude commands
+# irrespective of the value of the RECURSIVE tag.
+# The default value is: NO.
 
 EXAMPLE_RECURSIVE      = NO
 
-# The IMAGE_PATH tag can be used to specify one or more files or
-# directories that contain image that are included in the documentation (see
-# the \image command).
+# The IMAGE_PATH tag can be used to specify one or more files or directories
+# that contain images that are to be included in the documentation (see the
+# \image command).
 
 IMAGE_PATH             =
 
 # The INPUT_FILTER tag can be used to specify a program that doxygen should
 # invoke to filter for each input file. Doxygen will invoke the filter program
-# by executing (via popen()) the command <filter> <input-file>, where <filter>
-# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
-# input file. Doxygen will then use the output that the filter program writes
-# to standard output.
-# If FILTER_PATTERNS is specified, this tag will be
-# ignored.
+# by executing (via popen()) the command:
+#
+# <filter> <input-file>
+#
+# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
+# name of an input file. Doxygen will then use the output that the filter
+# program writes to standard output. If FILTER_PATTERNS is specified, this tag
+# will be ignored.
+#
+# Note that the filter must not add or remove lines; it is applied before the
+# code is scanned, but not when the output code is generated. If lines are added
+# or removed, the anchors will not be placed correctly.
 
 INPUT_FILTER           =
 
 # The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
-# basis.
-# Doxygen will compare the file name with each pattern and apply the
-# filter if there is a match.
-# The filters are a list of the form:
-# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
-# info on how filters are used. If FILTER_PATTERNS is empty or if
-# non of the patterns match the file name, INPUT_FILTER is applied.
+# basis. Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match. The filters are a list of the form: pattern=filter
+# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
+# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
+# patterns match the file name, INPUT_FILTER is applied.
 
 FILTER_PATTERNS        =
 
 # If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
-# INPUT_FILTER) will be used to filter the input files when producing source
-# files to browse (i.e. when SOURCE_BROWSER is set to YES).
+# INPUT_FILTER) will also be used to filter the input files that are used for
+# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
+# The default value is: NO.
 
 FILTER_SOURCE_FILES    = NO
 
 # The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
-# pattern. A pattern will override the setting for FILTER_PATTERN (if any)
-# and it is also possible to disable source filtering for a specific pattern
-# using *.ext= (so without naming a filter). This option only has effect when
-# FILTER_SOURCE_FILES is enabled.
+# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
+# it is also possible to disable source filtering for a specific pattern using
+# *.ext= (so without naming a filter).
+# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
 
 FILTER_SOURCE_PATTERNS =
 
+# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
+# is part of the input, its contents will be placed on the main page
+# (index.html). This can be useful if you have a project on for instance GitHub
+# and want to reuse the introduction page also for the doxygen output.
+
+USE_MDFILE_AS_MAINPAGE =
+
 #---------------------------------------------------------------------------
-# configuration options related to source browsing
+# Configuration options related to source browsing
 #---------------------------------------------------------------------------
 
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will
-# be generated. Documented entities will be cross-referenced with these sources.
-# Note: To get rid of all source code in the generated output, make sure also
-# VERBATIM_HEADERS is set to NO.
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
+# generated. Documented entities will be cross-referenced with these sources.
+#
+# Note: To get rid of all source code in the generated output, make sure that
+# also VERBATIM_HEADERS is set to NO.
+# The default value is: NO.
 
 SOURCE_BROWSER         = NO
 
-# Setting the INLINE_SOURCES tag to YES will include the body
-# of functions and classes directly in the documentation.
+# Setting the INLINE_SOURCES tag to YES will include the body of functions,
+# classes and enums directly into the documentation.
+# The default value is: NO.
 
 INLINE_SOURCES         = NO
 
-# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
-# doxygen to hide any special comment blocks from generated source code
-# fragments. Normal C, C++ and Fortran comments will always remain visible.
+# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
+# special comment blocks from generated source code fragments. Normal C, C++ and
+# Fortran comments will always remain visible.
+# The default value is: YES.
 
 STRIP_CODE_COMMENTS    = YES
 
-# If the REFERENCED_BY_RELATION tag is set to YES
-# then for each documented function all documented
-# functions referencing it will be listed.
+# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
+# function all documented functions referencing it will be listed.
+# The default value is: NO.
 
 REFERENCED_BY_RELATION = NO
 
-# If the REFERENCES_RELATION tag is set to YES
-# then for each documented function all documented entities
-# called/used by that function will be listed.
+# If the REFERENCES_RELATION tag is set to YES then for each documented function
+# all documented entities called/used by that function will be listed.
+# The default value is: NO.
 
 REFERENCES_RELATION    = NO
 
-# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
-# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
-# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
-# link to the source code.
-# Otherwise they will link to the documentation.
+# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
+# to YES then the hyperlinks from functions in REFERENCES_RELATION and
+# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
+# link to the documentation.
+# The default value is: YES.
 
 REFERENCES_LINK_SOURCE = NO
 
-# If the USE_HTAGS tag is set to YES then the references to source code
-# will point to the HTML generated by the htags(1) tool instead of doxygen
-# built-in source browser. The htags tool is part of GNU's global source
-# tagging system (see http://www.gnu.org/software/global/global.html). You
-# will need version 4.8.6 or higher.
+# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
+# source code will show a tooltip with additional information such as prototype,
+# brief description and links to the definition and documentation. Since this
+# will make the HTML file larger and loading of large files a bit slower, you
+# can opt to disable this feature.
+# The default value is: YES.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+SOURCE_TOOLTIPS        = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code will
+# point to the HTML generated by the htags(1) tool instead of doxygen built-in
+# source browser. The htags tool is part of GNU's global source tagging system
+# (see http://www.gnu.org/software/global/global.html). You will need version
+# 4.8.6 or higher.
+#
+# To use it do the following:
+# - Install the latest version of global
+# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
+# - Make sure the INPUT points to the root of the source tree
+# - Run doxygen as normal
+#
+# Doxygen will invoke htags (and that will in turn invoke gtags), so these
+# tools must be available from the command line (i.e. in the search path).
+#
+# The result: instead of the source browser generated by doxygen, the links to
+# source code will now point to the output of htags.
+# The default value is: NO.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
 
 USE_HTAGS              = NO
 
-# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
-# will generate a verbatim copy of the header file for each class for
-# which an include is specified. Set to NO to disable this.
+# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
+# verbatim copy of the header file for each class for which an include is
+# specified. Set to NO to disable this.
+# See also: Section \class.
+# The default value is: YES.
 
 VERBATIM_HEADERS       = NO
 
+# If the CLANG_ASSISTED_PARSING tag is set to YES then doxygen will use the
+# clang parser (see: http://clang.llvm.org/) for more accurate parsing at the
+# cost of reduced performance. This can be particularly helpful with template
+# rich C++ code for which doxygen's built-in parser lacks the necessary type
+# information.
+# Note: The availability of this option depends on whether or not doxygen was
+# compiled with the --with-libclang option.
+# The default value is: NO.
+
+CLANG_ASSISTED_PARSING = NO
+
+# If clang assisted parsing is enabled you can provide the compiler with command
+# line options that you would normally use when invoking the compiler. Note that
+# the include paths will already be set by doxygen for the files and directories
+# specified with INPUT and INCLUDE_PATH.
+# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
+
+CLANG_OPTIONS          =
+
 #---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
+# Configuration options related to the alphabetical class index
 #---------------------------------------------------------------------------
 
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
-# of all compounds will be generated. Enable this if the project
-# contains a lot of classes, structs, unions or interfaces.
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
+# compounds will be generated. Enable this if the project contains a lot of
+# classes, structs, unions or interfaces.
+# The default value is: YES.
 
 ALPHABETICAL_INDEX     = YES
 
-# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
-# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
-# in which this list will be split (can be a number in the range [1..20])
+# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
+# which the alphabetical index list will be split.
+# Minimum value: 1, maximum value: 20, default value: 5.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
 
 COLS_IN_ALPHA_INDEX    = 4
 
-# In case all classes in a project start with a common prefix, all
-# classes will be put under the same header in the alphabetical index.
-# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
-# should be ignored while generating the index headers.
+# In case all classes in a project start with a common prefix, all classes will
+# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
+# can be used to specify a prefix (or a list of prefixes) that should be ignored
+# while generating the index headers.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
 
 IGNORE_PREFIX          =
 
 #---------------------------------------------------------------------------
-# configuration options related to the HTML output
+# Configuration options related to the HTML output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
-# generate HTML output.
+# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output
+# The default value is: YES.
 
 GENERATE_HTML          = YES
 
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `html' will be used as the default path.
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_OUTPUT            = .
 
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
-# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
-# doxygen will generate files with .html extension.
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
+# generated HTML page (for example: .htm, .php, .asp).
+# The default value is: .html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_FILE_EXTENSION    = .html
 
-# The HTML_HEADER tag can be used to specify a personal HTML header for
-# each generated HTML page. If it is left blank doxygen will generate a
-# standard header. Note that when using a custom header you are responsible
-#  for the proper inclusion of any scripts and style sheets that doxygen
-# needs, which is dependent on the configuration options used.
-# It is advised to generate a default header using "doxygen -w html
-# header.html footer.html stylesheet.css YourConfigFile" and then modify
-# that header. Note that the header is subject to change so you typically
-# have to redo this when upgrading to a newer version of doxygen or when
-# changing the value of configuration settings such as GENERATE_TREEVIEW!
+# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
+# each generated HTML page. If the tag is left blank doxygen will generate a
+# standard header.
+#
+# To get valid HTML the header file that includes any scripts and style sheets
+# that doxygen needs, which is dependent on the configuration options used (e.g.
+# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
+# default header using
+# doxygen -w html new_header.html new_footer.html new_stylesheet.css
+# YourConfigFile
+# and then modify the file new_header.html. See also section "Doxygen usage"
+# for information on how to generate the default header that doxygen normally
+# uses.
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. For a description
+# of the possible markers and block names see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_HEADER            =
 
-# The HTML_FOOTER tag can be used to specify a personal HTML footer for
-# each generated HTML page. If it is left blank doxygen will generate a
-# standard footer.
+# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
+# generated HTML page. If the tag is left blank doxygen will generate a standard
+# footer. See HTML_HEADER for more information on how to generate a default
+# footer and what special commands can be used inside the footer. See also
+# section "Doxygen usage" for information on how to generate the default footer
+# that doxygen normally uses.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_FOOTER            =
 
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
-# style sheet that is used by each HTML page. It can be used to
-# fine-tune the look of the HTML output. If the tag is left blank doxygen
-# will generate a default style sheet. Note that doxygen will try to copy
-# the style sheet file to the HTML output directory, so don't put your own
-# style sheet in the HTML output directory as well, or it will be erased!
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
+# sheet that is used by each HTML page. It can be used to fine-tune the look of
+# the HTML output. If left blank doxygen will generate a default style sheet.
+# See also section "Doxygen usage" for information on how to generate the style
+# sheet that doxygen normally uses.
+# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
+# it is more robust and this tag (HTML_STYLESHEET) will in the future become
+# obsolete.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_STYLESHEET        = @TOPSRC@/doc/doxygen.css
 
+# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# cascading style sheets that are included after the standard style sheets
+# created by doxygen. Using this option one can overrule certain style aspects.
+# This is preferred over using HTML_STYLESHEET since it does not replace the
+# standard style sheet and is therefore more robust against future updates.
+# Doxygen will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list). For an example see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_STYLESHEET  =
+
 # The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
 # other source files which should be copied to the HTML output directory. Note
 # that these files will be copied to the base HTML output directory. Use the
-# $relpath$ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
-# files. In the HTML_STYLESHEET file, use the file name only. Also note that
-# the files will be copied as-is; there are no commands or markers available.
+# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
+# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
+# files will be copied as-is; there are no commands or markers available.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_EXTRA_FILES       =
 
-# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output.
-# Doxygen will adjust the colors in the style sheet and background images
-# according to this color. Hue is specified as an angle on a colorwheel,
-# see http://en.wikipedia.org/wiki/Hue for more information.
-# For instance the value 0 represents red, 60 is yellow, 120 is green,
-# 180 is cyan, 240 is blue, 300 purple, and 360 is red again.
-# The allowed range is 0 to 359.
+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
+# will adjust the colors in the style sheet and background images according to
+# this color. Hue is specified as an angle on a colorwheel, see
+# http://en.wikipedia.org/wiki/Hue for more information. For instance the value
+# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
+# purple, and 360 is red again.
+# Minimum value: 0, maximum value: 359, default value: 220.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_COLORSTYLE_HUE    = 228
 
-# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of
-# the colors in the HTML output. For a value of 0 the output will use
-# grayscales only. A value of 255 will produce the most vivid colors.
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
+# in the HTML output. For a value of 0 the output will use grayscales only. A
+# value of 255 will produce the most vivid colors.
+# Minimum value: 0, maximum value: 255, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_COLORSTYLE_SAT    = 67
 
-# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to
-# the luminance component of the colors in the HTML output. Values below
-# 100 gradually make the output lighter, whereas values above 100 make
-# the output darker. The value divided by 100 is the actual gamma applied,
-# so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2,
-# and 100 does not change the gamma.
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
+# luminance component of the colors in the HTML output. Values below 100
+# gradually make the output lighter, whereas values above 100 make the output
+# darker. The value divided by 100 is the actual gamma applied, so 80 represents
+# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
+# change the gamma.
+# Minimum value: 40, maximum value: 240, default value: 80.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_COLORSTYLE_GAMMA  = 100
 
 # If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
-# page will contain the date and time when the page was generated. Setting
-# this to NO can help when comparing the output of multiple runs.
+# page will contain the date and time when the page was generated. Setting this
+# to YES can help to show when doxygen was last run and thus if the
+# documentation is up to date.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_TIMESTAMP         = NO
 
 # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
 # documentation will contain sections that can be hidden and shown after the
 # page has loaded.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_DYNAMIC_SECTIONS  = NO
 
-# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of
-# entries shown in the various tree structured indices initially; the user
-# can expand and collapse entries dynamically later on. Doxygen will expand
-# the tree to such a level that at most the specified number of entries are
-# visible (unless a fully collapsed tree already exceeds this amount).
-# So setting the number of entries 1 will produce a full collapsed tree by
-# default. 0 is a special value representing an infinite number of entries
-# and will result in a full expanded tree by default.
+# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
+# shown in the various tree structured indices initially; the user can expand
+# and collapse entries dynamically later on. Doxygen will expand the tree to
+# such a level that at most the specified number of entries are visible (unless
+# a fully collapsed tree already exceeds this amount). So setting the number of
+# entries 1 will produce a full collapsed tree by default. 0 is a special value
+# representing an infinite number of entries and will result in a full expanded
+# tree by default.
+# Minimum value: 0, maximum value: 9999, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_INDEX_NUM_ENTRIES = 100
 
-# If the GENERATE_DOCSET tag is set to YES, additional index files
-# will be generated that can be used as input for Apple's Xcode 3
-# integrated development environment, introduced with OSX 10.5 (Leopard).
-# To create a documentation set, doxygen will generate a Makefile in the
-# HTML output directory. Running make will produce the docset in that
-# directory and running "make install" will install the docset in
-# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find
-# it at startup.
-# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
+# If the GENERATE_DOCSET tag is set to YES, additional index files will be
+# generated that can be used as input for Apple's Xcode 3 integrated development
+# environment (see: http://developer.apple.com/tools/xcode/), introduced with
+# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a
+# Makefile in the HTML output directory. Running make will produce the docset in
+# that directory and running make install will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
+# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
 # for more information.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_DOCSET        = NO
 
-# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the
-# feed. A documentation feed provides an umbrella under which multiple
-# documentation sets from a single provider (such as a company or product suite)
-# can be grouped.
+# This tag determines the name of the docset feed. A documentation feed provides
+# an umbrella under which multiple documentation sets from a single provider
+# (such as a company or product suite) can be grouped.
+# The default value is: Doxygen generated docs.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
 
 DOCSET_FEEDNAME        = "Doxygen generated docs"
 
-# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that
-# should uniquely identify the documentation set bundle. This should be a
-# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
-# will append .docset to the name.
+# This tag specifies a string that should uniquely identify the documentation
+# set bundle. This should be a reverse domain-name style string, e.g.
+# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
 
 DOCSET_BUNDLE_ID       = org.doxygen.Project
 
-# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely identify
+# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
 # the documentation publisher. This should be a reverse domain-name style
 # string, e.g. com.mycompany.MyDocSet.documentation.
+# The default value is: org.doxygen.Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
 
 DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
 
-# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher.
+# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
+# The default value is: Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
 
 DOCSET_PUBLISHER_NAME  = Publisher
 
-# If the GENERATE_HTMLHELP tag is set to YES, additional index files
-# will be generated that can be used as input for tools like the
-# Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
-# of the generated HTML documentation.
+# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
+# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
+# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
+# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on
+# Windows.
+#
+# The HTML Help Workshop contains a compiler that can convert all HTML output
+# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
+# files are now used as the Windows 98 help format, and will replace the old
+# Windows help format (.hlp) on all Windows platforms in the future. Compressed
+# HTML files also contain an index, a table of contents, and you can search for
+# words in the documentation. The HTML workshop also contains a viewer for
+# compressed HTML files.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_HTMLHELP      = NO
 
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
-# be used to specify the file name of the resulting .chm file. You
-# can add a path in front of the file if the result should not be
+# The CHM_FILE tag can be used to specify the file name of the resulting .chm
+# file. You can add a path in front of the file if the result should not be
 # written to the html output directory.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
 CHM_FILE               =
 
-# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
-# be used to specify the location (absolute path including file name) of
-# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
-# the HTML help compiler on the generated index.hhp.
+# The HHC_LOCATION tag can be used to specify the location (absolute path
+# including file name) of the HTML help compiler (hhc.exe). If non-empty,
+# doxygen will try to run the HTML help compiler on the generated index.hhp.
+# The file has to be specified with full path.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
 HHC_LOCATION           =
 
-# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
-# controls if a separate .chi index file is generated (YES) or that
-# it should be included in the master .chm file (NO).
+# The GENERATE_CHI flag controls if a separate .chi index file is generated
+# (YES) or that it should be included in the master .chm file (NO).
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
 GENERATE_CHI           = NO
 
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING
-# is used to encode HtmlHelp index (hhk), content (hhc) and project file
-# content.
+# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc)
+# and project file content.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
 CHM_INDEX_ENCODING     =
 
-# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
-# controls whether a binary table of contents is generated (YES) or a
-# normal table of contents (NO) in the .chm file.
+# The BINARY_TOC flag controls whether a binary table of contents is generated
+# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it
+# enables the Previous and Next buttons.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
 BINARY_TOC             = NO
 
-# The TOC_EXPAND flag can be set to YES to add extra items for group members
-# to the contents of the HTML help documentation and to the tree view.
+# The TOC_EXPAND flag can be set to YES to add extra items for group members to
+# the table of contents of the HTML help documentation and to the tree view.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
 TOC_EXPAND             = NO
 
 # If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
-# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated
-# that can be used as input for Qt's qhelpgenerator to generate a
-# Qt Compressed Help (.qch) of the generated HTML documentation.
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
+# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
+# (.qch) of the generated HTML documentation.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_QHP           = NO
 
-# If the QHG_LOCATION tag is specified, the QCH_FILE tag can
-# be used to specify the file name of the resulting .qch file.
-# The path specified is relative to the HTML output folder.
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
+# the file name of the resulting .qch file. The path specified is relative to
+# the HTML output folder.
+# This tag requires that the tag GENERATE_QHP is set to YES.
 
 QCH_FILE               =
 
-# The QHP_NAMESPACE tag specifies the namespace to use when generating
-# Qt Help Project output. For more information please see
-# http://doc.trolltech.com/qthelpproject.html#namespace
+# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
+# Project output. For more information please see Qt Help Project / Namespace
+# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace).
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_NAMESPACE          = org.doxygen.Project
 
-# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
-# Qt Help Project output. For more information please see
-# http://doc.trolltech.com/qthelpproject.html#virtual-folders
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
+# Help Project output. For more information please see Qt Help Project / Virtual
+# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual-
+# folders).
+# The default value is: doc.
+# This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_VIRTUAL_FOLDER     = doc
 
-# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to
-# add. For more information please see
-# http://doc.trolltech.com/qthelpproject.html#custom-filters
+# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
+# filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_CUST_FILTER_NAME   =
 
-# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the
-# custom filter to add. For more information please see
-# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">
-# Qt Help Project / Custom Filters</a>.
+# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
+# custom filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_CUST_FILTER_ATTRS  =
 
 # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
-# project's
-# filter section matches.
-# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">
-# Qt Help Project / Filter Attributes</a>.
+# project's filter section matches. Qt Help Project / Filter Attributes (see:
+# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes).
+# This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_SECT_FILTER_ATTRS  =
 
-# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can
-# be used to specify the location of Qt's qhelpgenerator.
-# If non-empty doxygen will try to run qhelpgenerator on the generated
-# .qhp file.
+# The QHG_LOCATION tag can be used to specify the location of Qt's
+# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
+# generated .qhp file.
+# This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHG_LOCATION           =
 
-# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files
-#  will be generated, which together with the HTML files, form an Eclipse help
-# plugin. To install this plugin and make it available under the help contents
-# menu in Eclipse, the contents of the directory containing the HTML and XML
-# files needs to be copied into the plugins directory of eclipse. The name of
-# the directory within the plugins directory should be the same as
-# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before
-# the help appears.
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
+# generated, together with the HTML files, they form an Eclipse help plugin. To
+# install this plugin and make it available under the help contents menu in
+# Eclipse, the contents of the directory containing the HTML and XML files needs
+# to be copied into the plugins directory of eclipse. The name of the directory
+# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
+# After copying Eclipse needs to be restarted before the help appears.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_ECLIPSEHELP   = NO
 
-# A unique identifier for the eclipse help plugin. When installing the plugin
-# the directory name containing the HTML and XML files should also have
-# this name.
+# A unique identifier for the Eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have this
+# name. Each documentation set should have its own identifier.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
 
 ECLIPSE_DOC_ID         = org.doxygen.Project
 
-# The DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs)
-# at top of each HTML page. The value NO (the default) enables the index and
-# the value YES disables it. Since the tabs have the same information as the
-# navigation tree you can set this option to NO if you already set
-# GENERATE_TREEVIEW to YES.
+# If you want full control over the layout of the generated HTML pages it might
+# be necessary to disable the index and replace it with your own. The
+# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
+# of each HTML page. A value of NO enables the index and the value YES disables
+# it. Since the tabs in the index contain the same information as the navigation
+# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 DISABLE_INDEX          = YES
 
 # The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
-# structure should be generated to display hierarchical information.
-# If the tag value is set to YES, a side panel will be generated
-# containing a tree-like index structure (just like the one that
-# is generated for HTML Help). For this to work a browser that supports
-# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser).
-# Windows users are probably better off using the HTML help feature.
-# Since the tree basically has the same information as the tab index you
-# could consider to set DISABLE_INDEX to NO when enabling this option.
+# structure should be generated to display hierarchical information. If the tag
+# value is set to YES, a side panel will be generated containing a tree-like
+# index structure (just like the one that is generated for HTML Help). For this
+# to work a browser that supports JavaScript, DHTML, CSS and frames is required
+# (i.e. any modern browser). Windows users are probably better off using the
+# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
+# further fine-tune the look of the index. As an example, the default style
+# sheet generated by doxygen has an example that shows how to put an image at
+# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
+# the same information as the tab index, you could consider setting
+# DISABLE_INDEX to YES when enabling this option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_TREEVIEW      = YES
 
-# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values
-# (range [0,1..20]) that doxygen will group on one line in the generated HTML
-# documentation. Note that a value of 0 will completely suppress the enum
-# values from appearing in the overview section.
+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
+# doxygen will group on one line in the generated HTML documentation.
+#
+# Note that a value of 0 will completely suppress the enum values from appearing
+# in the overview section.
+# Minimum value: 0, maximum value: 20, default value: 4.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 ENUM_VALUES_PER_LINE   = 4
 
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
-# used to set the initial width (in pixels) of the frame in which the tree
-# is shown.
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
+# to set the initial width (in pixels) of the frame in which the tree is shown.
+# Minimum value: 0, maximum value: 1500, default value: 250.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 TREEVIEW_WIDTH         = 230
 
-# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open
-# links to external symbols imported via tag files in a separate window.
+# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to
+# external symbols imported via tag files in a separate window.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 EXT_LINKS_IN_WINDOW    = NO
 
-# Use this tag to change the font size of Latex formulas included
-# as images in the HTML documentation. The default is 10. Note that
-# when you change the font size after a successful doxygen run you need
-# to manually remove any form_*.png images from the HTML output directory
-# to force them to be regenerated.
+# Use this tag to change the font size of LaTeX formulas included as images in
+# the HTML documentation. When you change the font size after a successful
+# doxygen run you need to manually remove any form_*.png images from the HTML
+# output directory to force them to be regenerated.
+# Minimum value: 8, maximum value: 50, default value: 10.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 FORMULA_FONTSIZE       = 10
 
 # Use the FORMULA_TRANPARENT tag to determine whether or not the images
-# generated for formulas are transparent PNGs. Transparent PNGs are
-# not supported properly for IE 6.0, but are supported on all modern browsers.
-# Note that when changing this option you need to delete any form_*.png files
-# in the HTML output before the changes have effect.
+# generated for formulas are transparent PNGs. Transparent PNGs are not
+# supported properly for IE 6.0, but are supported on all modern browsers.
+#
+# Note that when changing this option you need to delete any form_*.png files in
+# the HTML output directory before the changes have effect.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 FORMULA_TRANSPARENT    = YES
 
-# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax
-# (see http://www.mathjax.org) which uses client side Javascript for the
-# rendering instead of using prerendered bitmaps. Use this if you do not
-# have LaTeX installed or if you want to formulas look prettier in the HTML
-# output. When enabled you may also need to install MathJax separately and
-# configure the path to it using the MATHJAX_RELPATH option.
+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
+# http://www.mathjax.org) which uses client side Javascript for the rendering
+# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
+# installed or if you want to formulas look prettier in the HTML output. When
+# enabled you may also need to install MathJax separately and configure the path
+# to it using the MATHJAX_RELPATH option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 USE_MATHJAX            = NO
 
-# When MathJax is enabled you need to specify the location relative to the
-# HTML output directory using the MATHJAX_RELPATH option. The destination
-# directory should contain the MathJax.js script. For instance, if the mathjax
-# directory is located at the same level as the HTML output directory, then
-# MATHJAX_RELPATH should be ../mathjax. The default value points to
-# the MathJax Content Delivery Network so you can quickly see the result without
-# installing MathJax.
-# However, it is strongly recommended to install a local
-# copy of MathJax from http://www.mathjax.org before deployment.
+# When MathJax is enabled you can set the default output format to be used for
+# the MathJax output. See the MathJax site (see:
+# http://docs.mathjax.org/en/latest/output.html) for more details.
+# Possible values are: HTML-CSS (which is slower, but has the best
+# compatibility), NativeMML (i.e. MathML) and SVG.
+# The default value is: HTML-CSS.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_FORMAT         = HTML-CSS
+
+# When MathJax is enabled you need to specify the location relative to the HTML
+# output directory using the MATHJAX_RELPATH option. The destination directory
+# should contain the MathJax.js script. For instance, if the mathjax directory
+# is located at the same level as the HTML output directory, then
+# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
+# Content Delivery Network so you can quickly see the result without installing
+# MathJax. However, it is strongly recommended to install a local copy of
+# MathJax from http://www.mathjax.org before deployment.
+# The default value is: http://cdn.mathjax.org/mathjax/latest.
+# This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
 
-# The MATHJAX_EXTENSIONS tag can be used to specify one or MathJax extension
-# names that should be enabled during MathJax rendering.
+# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
+# extension names that should be enabled during MathJax rendering. For example
+# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_EXTENSIONS     =
 
-# When the SEARCHENGINE tag is enabled doxygen will generate a search box
-# for the HTML output. The underlying search engine uses javascript
-# and DHTML and should work on any modern browser. Note that when using
-# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets
-# (GENERATE_DOCSET) there is already a search function so this one should
-# typically be disabled. For large projects the javascript based search engine
-# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
+# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
+# of code that will be used on startup of the MathJax code. See the MathJax site
+# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
+# example see the documentation.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_CODEFILE       =
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
+# the HTML output. The underlying search engine uses javascript and DHTML and
+# should work on any modern browser. Note that when using HTML help
+# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
+# there is already a search function so this one should typically be disabled.
+# For large projects the javascript based search engine can be slow, then
+# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
+# search using the keyboard; to jump to the search box use <access key> + S
+# (what the <access key> is depends on the OS and browser, but it is typically
+# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
+# key> to jump into the search results window, the results can be navigated
+# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
+# the search. The filter options can be selected when the cursor is inside the
+# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
+# to select a filter and <Enter> or <escape> to activate or cancel the filter
+# option.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 SEARCHENGINE           = YES
 
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a PHP enabled web server instead of at the web client
-# using Javascript. Doxygen will generate the search PHP script and index
-# file to put on the web server. The advantage of the server
-# based approach is that it scales better to large projects and allows
-# full text search. The disadvantages are that it is more difficult to setup
-# and does not have live searching capabilities.
+# implemented using a web server instead of a web client using Javascript. There
+# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
+# setting. When disabled, doxygen will generate a PHP script for searching and
+# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
+# and searching needs to be provided by external tools. See the section
+# "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
 
 SERVER_BASED_SEARCH    = YES
 
+# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
+# script for searching. Instead the search results are written to an XML file
+# which needs to be processed by an external indexer. Doxygen will invoke an
+# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
+# search results.
+#
+# Doxygen ships with an example indexer (doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: http://xapian.org/).
+#
+# See the section "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH        = NO
+
+# The SEARCHENGINE_URL should point to a search engine hosted by a web server
+# which will return the search results when EXTERNAL_SEARCH is enabled.
+#
+# Doxygen ships with an example indexer (doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: http://xapian.org/). See the section "External Indexing and
+# Searching" for details.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHENGINE_URL       =
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
+# search data is written to a file for indexing by an external tool. With the
+# SEARCHDATA_FILE tag the name of this file can be specified.
+# The default file is: searchdata.xml.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHDATA_FILE        = searchdata.xml
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
+# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
+# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
+# projects and redirect the results back to the right project.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH_ID     =
+
+# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
+# projects other than the one defined by this configuration file, but that are
+# all added to the same external search index. Each project needs to have a
+# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
+# to a relative location where the documentation can be found. The format is:
+# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTRA_SEARCH_MAPPINGS  =
+
 #---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
+# Configuration options related to the LaTeX output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
-# generate Latex output.
+# If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output.
+# The default value is: YES.
 
 GENERATE_LATEX         = NO
 
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `latex' will be used as the default path.
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_OUTPUT           = latex
 
 # The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
-# invoked. If left blank `latex' will be used as the default command name.
-# Note that when enabling USE_PDFLATEX this option is only used for
-# generating bitmaps for formulas in the HTML output, but not in the
-# Makefile that is written to the output directory.
+# invoked.
+#
+# Note that when enabling USE_PDFLATEX this option is only used for generating
+# bitmaps for formulas in the HTML output, but not in the Makefile that is
+# written to the output directory.
+# The default file is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_CMD_NAME         = latex
 
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
-# generate index for LaTeX. If left blank `makeindex' will be used as the
-# default command name.
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
+# index for LaTeX.
+# The default file is: makeindex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 MAKEINDEX_CMD_NAME     = makeindex
 
-# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
-# LaTeX documents. This may be useful for small projects and may help to
-# save some trees in general.
+# If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 COMPACT_LATEX          = YES
 
-# The PAPER_TYPE tag can be used to set the paper type that is used
-# by the printer. Possible values are: a4, letter, legal and
-# executive. If left blank a4wide will be used.
+# The PAPER_TYPE tag can be used to set the paper type that is used by the
+# printer.
+# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
+# 14 inches) and executive (7.25 x 10.5 inches).
+# The default value is: a4.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 PAPER_TYPE             = a4wide
 
-# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
-# packages that should be included in the LaTeX output.
+# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
+# that should be included in the LaTeX output. To get the times font for
+# instance you can specify
+# EXTRA_PACKAGES=times
+# If left blank no extra packages will be included.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 EXTRA_PACKAGES         =
 
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
-# the generated latex document. The header should contain everything until
-# the first chapter. If it is left blank doxygen will generate a
-# standard header. Notice: only use this tag if you know what you are doing!
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
+# generated LaTeX document. The header should contain everything until the first
+# chapter. If it is left blank doxygen will generate a standard header. See
+# section "Doxygen usage" for information on how to let doxygen write the
+# default header to a separate file.
+#
+# Note: Only use a user-defined header if you know what you are doing! The
+# following commands have a special meaning inside the header: $title,
+# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
+# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
+# string, for the replacement values of the other commands the user is referred
+# to HTML_HEADER.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_HEADER           =
 
-# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for
-# the generated latex document. The footer should contain everything after
-# the last chapter. If it is left blank doxygen will generate a
-# standard footer. Notice: only use this tag if you know what you are doing!
+# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
+# generated LaTeX document. The footer should contain everything after the last
+# chapter. If it is left blank doxygen will generate a standard footer. See
+# LATEX_HEADER for more information on how to generate a default footer and what
+# special commands can be used inside the footer.
+#
+# Note: Only use a user-defined footer if you know what you are doing!
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_FOOTER           =
 
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
-# is prepared for conversion to pdf (using ps2pdf). The pdf file will
-# contain links (just like the HTML output) instead of page references
-# This makes the output suitable for online browsing using a pdf viewer.
+# The LATEX_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# LaTeX style sheets that are included after the standard style sheets created
+# by doxygen. Using this option one can overrule certain style aspects. Doxygen
+# will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list).
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_STYLESHEET =
+
+# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the LATEX_OUTPUT output
+# directory. Note that the files will be copied as-is; there are no commands or
+# markers available.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_FILES      =
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
+# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
+# contain links (just like the HTML output) instead of page references. This
+# makes the output suitable for online browsing using a PDF viewer.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 PDF_HYPERLINKS         = NO
 
-# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
-# plain latex in the generated Makefile. Set this option to YES to get a
+# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
+# the PDF file directly from the LaTeX files. Set this option to YES, to get a
 # higher quality PDF documentation.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 USE_PDFLATEX           = NO
 
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
-# command to the generated LaTeX files. This will instruct LaTeX to keep
-# running if errors occur, instead of asking the user for help.
-# This option is also used when generating formulas in HTML.
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
+# command to the generated LaTeX files. This will instruct LaTeX to keep running
+# if errors occur, instead of asking the user for help. This option is also used
+# when generating formulas in HTML.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_BATCHMODE        = NO
 
-# If LATEX_HIDE_INDICES is set to YES then doxygen will not
-# include the index chapters (such as File Index, Compound Index, etc.)
-# in the output.
+# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
+# index chapters (such as File Index, Compound Index, etc.) in the output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_HIDE_INDICES     = NO
 
-# If LATEX_SOURCE_CODE is set to YES then doxygen will include
-# source code with syntax highlighting in the LaTeX output.
-# Note that which sources are shown also depends on other settings
-# such as SOURCE_BROWSER.
+# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
+# code with syntax highlighting in the LaTeX output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_SOURCE_CODE      = NO
 
 # The LATEX_BIB_STYLE tag can be used to specify the style to use for the
-# bibliography, e.g. plainnat, or ieeetr. The default style is "plain". See
-# http://en.wikipedia.org/wiki/BibTeX for more info.
+# bibliography, e.g. plainnat, or ieeetr. See
+# http://en.wikipedia.org/wiki/BibTeX and \cite for more info.
+# The default value is: plain.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_BIB_STYLE        = plain
 
 #---------------------------------------------------------------------------
-# configuration options related to the RTF output
+# Configuration options related to the RTF output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
-# The RTF output is optimized for Word 97 and may not look very pretty with
-# other RTF readers or editors.
+# If the GENERATE_RTF tag is set to YES, doxygen will generate RTF output. The
+# RTF output is optimized for Word 97 and may not look too pretty with other RTF
+# readers/editors.
+# The default value is: NO.
 
 GENERATE_RTF           = NO
 
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `rtf' will be used as the default path.
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: rtf.
+# This tag requires that the tag GENERATE_RTF is set to YES.
 
 RTF_OUTPUT             = rtf
 
-# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
-# RTF documents. This may be useful for small projects and may help to
-# save some trees in general.
+# If the COMPACT_RTF tag is set to YES, doxygen generates more compact RTF
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
 
 COMPACT_RTF            = NO
 
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
-# will contain hyperlink fields. The RTF file will
-# contain links (just like the HTML output) instead of page references.
-# This makes the output suitable for online browsing using WORD or other
-# programs which support those fields.
-# Note: wordpad (write) and others do not support links.
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
+# contain hyperlink fields. The RTF file will contain links (just like the HTML
+# output) instead of page references. This makes the output suitable for online
+# browsing using Word or some other Word compatible readers that support those
+# fields.
+#
+# Note: WordPad (write) and others do not support links.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
 
 RTF_HYPERLINKS         = NO
 
-# Load style sheet definitions from file. Syntax is similar to doxygen's
-# config file, i.e. a series of assignments. You only have to provide
-# replacements, missing definitions are set to their default value.
+# Load stylesheet definitions from file. Syntax is similar to doxygen's config
+# file, i.e. a series of assignments. You only have to provide replacements,
+# missing definitions are set to their default value.
+#
+# See also section "Doxygen usage" for information on how to generate the
+# default style sheet that doxygen normally uses.
+# This tag requires that the tag GENERATE_RTF is set to YES.
 
 RTF_STYLESHEET_FILE    =
 
-# Set optional variables used in the generation of an rtf document.
-# Syntax is similar to doxygen's config file.
+# Set optional variables used in the generation of an RTF document. Syntax is
+# similar to doxygen's config file. A template extensions file can be generated
+# using doxygen -e rtf extensionFile.
+# This tag requires that the tag GENERATE_RTF is set to YES.
 
 RTF_EXTENSIONS_FILE    =
 
+# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
+# with syntax highlighting in the RTF output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_SOURCE_CODE        = NO
+
 #---------------------------------------------------------------------------
-# configuration options related to the man page output
+# Configuration options related to the man page output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
-# generate man pages
+# If the GENERATE_MAN tag is set to YES, doxygen will generate man pages for
+# classes and files.
+# The default value is: NO.
 
 GENERATE_MAN           = NO
 
-# The MAN_OUTPUT tag is used to specify where the man pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `man' will be used as the default path.
+# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it. A directory man3 will be created inside the directory specified by
+# MAN_OUTPUT.
+# The default directory is: man.
+# This tag requires that the tag GENERATE_MAN is set to YES.
 
 MAN_OUTPUT             = man
 
-# The MAN_EXTENSION tag determines the extension that is added to
-# the generated man pages (default is the subroutine's section .3)
+# The MAN_EXTENSION tag determines the extension that is added to the generated
+# man pages. In case the manual section does not start with a number, the number
+# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
+# optional.
+# The default value is: .3.
+# This tag requires that the tag GENERATE_MAN is set to YES.
 
 MAN_EXTENSION          = .3
 
-# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
-# then it will generate one additional man file for each entity
-# documented in the real man page(s). These additional files
-# only source the real man page, but without them the man command
-# would be unable to find the correct page. The default is NO.
+# The MAN_SUBDIR tag determines the name of the directory created within
+# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by
+# MAN_EXTENSION with the initial . removed.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_SUBDIR             =
+
+# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
+# will generate one additional man file for each entity documented in the real
+# man page(s). These additional files only source the real man page, but without
+# them the man command would be unable to find the correct page.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_MAN is set to YES.
 
 MAN_LINKS              = NO
 
 #---------------------------------------------------------------------------
-# configuration options related to the XML output
+# Configuration options related to the XML output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_XML tag is set to YES Doxygen will
-# generate an XML file that captures the structure of
-# the code including all documentation.
+# If the GENERATE_XML tag is set to YES, doxygen will generate an XML file that
+# captures the structure of the code including all documentation.
+# The default value is: NO.
 
 GENERATE_XML           = NO
 
-# The XML_OUTPUT tag is used to specify where the XML pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `xml' will be used as the default path.
+# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: xml.
+# This tag requires that the tag GENERATE_XML is set to YES.
 
 XML_OUTPUT             = xml
 
-# The XML_SCHEMA tag can be used to specify an XML schema,
-# which can be used by a validating XML parser to check the
-# syntax of the XML files.
-
-XML_SCHEMA             =
-
-# The XML_DTD tag can be used to specify an XML DTD,
-# which can be used by a validating XML parser to check the
-# syntax of the XML files.
-
-XML_DTD                =
-
-# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
-# dump the program listings (including syntax highlighting
-# and cross-referencing information) to the XML output. Note that
-# enabling this will significantly increase the size of the XML output.
+# If the XML_PROGRAMLISTING tag is set to YES, doxygen will dump the program
+# listings (including syntax highlighting and cross-referencing information) to
+# the XML output. Note that enabling this will significantly increase the size
+# of the XML output.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_XML is set to YES.
 
 XML_PROGRAMLISTING     = YES
 
 #---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
+# Configuration options related to the DOCBOOK output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
-# generate an AutoGen Definitions (see autogen.sf.net) file
-# that captures the structure of the code including all
-# documentation. Note that this feature is still experimental
-# and incomplete at the moment.
+# If the GENERATE_DOCBOOK tag is set to YES, doxygen will generate Docbook files
+# that can be used to generate PDF.
+# The default value is: NO.
+
+GENERATE_DOCBOOK       = NO
+
+# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
+# front of it.
+# The default directory is: docbook.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_OUTPUT         = docbook
+
+# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
+# program listings (including syntax highlighting and cross-referencing
+# information) to the DOCBOOK output. Note that enabling this will significantly
+# increase the size of the DOCBOOK output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_PROGRAMLISTING = NO
+
+#---------------------------------------------------------------------------
+# Configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an
+# AutoGen Definitions (see http://autogen.sf.net) file that captures the
+# structure of the code including all documentation. Note that this feature is
+# still experimental and incomplete at the moment.
+# The default value is: NO.
 
 GENERATE_AUTOGEN_DEF   = NO
 
 #---------------------------------------------------------------------------
-# configuration options related to the Perl module output
+# Configuration options related to the Perl module output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_PERLMOD tag is set to YES Doxygen will
-# generate a Perl module file that captures the structure of
-# the code including all documentation. Note that this
-# feature is still experimental and incomplete at the
-# moment.
+# If the GENERATE_PERLMOD tag is set to YES, doxygen will generate a Perl module
+# file that captures the structure of the code including all documentation.
+#
+# Note that this feature is still experimental and incomplete at the moment.
+# The default value is: NO.
 
 GENERATE_PERLMOD       = NO
 
-# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
-# the necessary Makefile rules, Perl scripts and LaTeX code to be able
-# to generate PDF and DVI output from the Perl module output.
+# If the PERLMOD_LATEX tag is set to YES, doxygen will generate the necessary
+# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
+# output from the Perl module output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
 
 PERLMOD_LATEX          = NO
 
-# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
-# nicely formatted so it can be parsed by a human reader.
-# This is useful
-# if you want to understand what is going on.
-# On the other hand, if this
-# tag is set to NO the size of the Perl module output will be much smaller
-# and Perl will parse it just the same.
+# If the PERLMOD_PRETTY tag is set to YES, the Perl module output will be nicely
+# formatted so it can be parsed by a human reader. This is useful if you want to
+# understand what is going on. On the other hand, if this tag is set to NO, the
+# size of the Perl module output will be much smaller and Perl will parse it
+# just the same.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
 
 PERLMOD_PRETTY         = YES
 
-# The names of the make variables in the generated doxyrules.make file
-# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
-# This is useful so different doxyrules.make files included by the same
-# Makefile don't overwrite each other's variables.
+# The names of the make variables in the generated doxyrules.make file are
+# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
+# so different doxyrules.make files included by the same Makefile don't
+# overwrite each other's variables.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
 
 PERLMOD_MAKEVAR_PREFIX =
 
@@ -1470,107 +1953,130 @@ PERLMOD_MAKEVAR_PREFIX =
 # Configuration options related to the preprocessor
 #---------------------------------------------------------------------------
 
-# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
-# evaluate all C-preprocessor directives found in the sources and include
-# files.
+# If the ENABLE_PREPROCESSING tag is set to YES, doxygen will evaluate all
+# C-preprocessor directives found in the sources and include files.
+# The default value is: YES.
 
 ENABLE_PREPROCESSING   = YES
 
-# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
-# names in the source code. If set to NO (the default) only conditional
-# compilation will be performed. Macro expansion can be done in a controlled
-# way by setting EXPAND_ONLY_PREDEF to YES.
+# If the MACRO_EXPANSION tag is set to YES, doxygen will expand all macro names
+# in the source code. If set to NO, only conditional compilation will be
+# performed. Macro expansion can be done in a controlled way by setting
+# EXPAND_ONLY_PREDEF to YES.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 MACRO_EXPANSION        = YES
 
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
-# then the macro expansion is limited to the macros specified with the
-# PREDEFINED and EXPAND_AS_DEFINED tags.
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
+# the macro expansion is limited to the macros specified with the PREDEFINED and
+# EXPAND_AS_DEFINED tags.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 EXPAND_ONLY_PREDEF     = YES
 
-# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
-# pointed to by INCLUDE_PATH will be searched when a #include is found.
+# If the SEARCH_INCLUDES tag is set to YES, the include files in the
+# INCLUDE_PATH will be searched if a #include is found.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 SEARCH_INCLUDES        = YES
 
 # The INCLUDE_PATH tag can be used to specify one or more directories that
-# contain include files that are not input files but should be processed by
-# the preprocessor.
+# contain include files that are not input files but should be processed by the
+# preprocessor.
+# This tag requires that the tag SEARCH_INCLUDES is set to YES.
 
 INCLUDE_PATH           = @TOPSRC@/ruamoko/include
 
 # You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
 # patterns (like *.h and *.hpp) to filter out the header-files in the
-# directories. If left blank, the patterns specified with FILE_PATTERNS will
-# be used.
+# directories. If left blank, the patterns specified with FILE_PATTERNS will be
+# used.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 INCLUDE_FILE_PATTERNS  = *.h \
                          *.rh
 
-# The PREDEFINED tag can be used to specify one or more macro names that
-# are defined before the preprocessor is started (similar to the -D option of
-# gcc). The argument of the tag is a list of macros of the form: name
-# or name=definition (no spaces). If the definition and the = are
-# omitted =1 is assumed. To prevent a macro definition from being
-# undefined via #undef or recursively expanded use the := operator
-# instead of the = operator.
+# The PREDEFINED tag can be used to specify one or more macro names that are
+# defined before the preprocessor is started (similar to the -D option of e.g.
+# gcc). The argument of the tag is a list of macros of the form: name or
+# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
+# is assumed. To prevent a macro definition from being undefined via #undef or
+# recursively expanded use the := operator instead of the = operator.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 PREDEFINED             = "__attribute__(x)="
 
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
-# this tag can be used to specify a list of macro names that should be expanded.
-# The macro definition that is found in the sources will be used.
-# Use the PREDEFINED tag if you want to use a different macro definition that
-# overrules the definition found in the source code.
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
+# tag can be used to specify a list of macro names that should be expanded. The
+# macro definition that is found in the sources will be used. Use the PREDEFINED
+# tag if you want to use a different macro definition that overrules the
+# definition found in the source code.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 EXPAND_AS_DEFINED      =
 
-# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
-# doxygen's preprocessor will remove all references to function-like macros
-# that are alone on a line, have an all uppercase name, and do not end with a
-# semicolon, because these will confuse the parser if not removed.
+# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
+# remove all references to function-like macros that are alone on a line, have
+# an all uppercase name, and do not end with a semicolon. Such function macros
+# are typically used for boiler-plate code, and will confuse the parser if not
+# removed.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 SKIP_FUNCTION_MACROS   = YES
 
 #---------------------------------------------------------------------------
-# Configuration::additions related to external references
+# Configuration options related to external references
 #---------------------------------------------------------------------------
 
-# The TAGFILES option can be used to specify one or more tagfiles. For each
-# tag file the location of the external documentation should be added. The
-# format of a tag file without this location is as follows:
-#
+# The TAGFILES tag can be used to specify one or more tag files. For each tag
+# file the location of the external documentation should be added. The format of
+# a tag file without this location is as follows:
 # TAGFILES = file1 file2 ...
 # Adding location for the tag files is done as follows:
-#
 # TAGFILES = file1=loc1 "file2 = loc2" ...
-# where "loc1" and "loc2" can be relative or absolute paths
-# or URLs. Note that each tag file must have a unique name (where the name does
-# NOT include the path). If a tag file is not located in the directory in which
-# doxygen is run, you must also specify the path to the tagfile here.
+# where loc1 and loc2 can be relative or absolute paths or URLs. See the
+# section "Linking to external documentation" for more information about the use
+# of tag files.
+# Note: Each tag file must have a unique name (where the name does NOT include
+# the path). If a tag file is not located in the directory in which doxygen is
+# run, you must also specify the path to the tagfile here.
 
 TAGFILES               =
 
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create
-# a tag file that is based on the input files it reads.
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
+# tag file that is based on the input files it reads. See section "Linking to
+# external documentation" for more information about the usage of tag files.
 
 GENERATE_TAGFILE       =
 
-# If the ALLEXTERNALS tag is set to YES all external classes will be listed
-# in the class index. If set to NO only the inherited external classes
-# will be listed.
+# If the ALLEXTERNALS tag is set to YES, all external class will be listed in
+# the class index. If set to NO, only the inherited external classes will be
+# listed.
+# The default value is: NO.
 
 ALLEXTERNALS           = NO
 
-# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
-# in the modules index. If set to NO, only the current project's groups will
-# be listed.
+# If the EXTERNAL_GROUPS tag is set to YES, all external groups will be listed
+# in the modules index. If set to NO, only the current project's groups will be
+# listed.
+# The default value is: YES.
 
 EXTERNAL_GROUPS        = YES
 
+# If the EXTERNAL_PAGES tag is set to YES, all external pages will be listed in
+# the related pages index. If set to NO, only the current project's pages will
+# be listed.
+# The default value is: YES.
+
+EXTERNAL_PAGES         = YES
+
 # The PERL_PATH should be the absolute path and name of the perl script
-# interpreter (i.e. the result of `which perl').
+# interpreter (i.e. the result of 'which perl').
+# The default file (with absolute path) is: /usr/bin/perl.
 
 PERL_PATH              = /usr/bin/perl
 
@@ -1578,222 +2084,308 @@ PERL_PATH              = /usr/bin/perl
 # Configuration options related to the dot tool
 #---------------------------------------------------------------------------
 
-# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
-# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
-# or super classes. Setting the tag to NO turns the diagrams off. Note that
-# this option also works with HAVE_DOT disabled, but it is recommended to
-# install and use dot, since it yields more powerful graphs.
+# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram
+# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
+# NO turns the diagrams off. Note that this option also works with HAVE_DOT
+# disabled, but it is recommended to install and use dot, since it yields more
+# powerful graphs.
+# The default value is: YES.
 
 CLASS_DIAGRAMS         = NO
 
 # You can define message sequence charts within doxygen comments using the \msc
-# command. Doxygen will then run the mscgen tool (see
-# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the
+# command. Doxygen will then run the mscgen tool (see:
+# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
 # documentation. The MSCGEN_PATH tag allows you to specify the directory where
 # the mscgen tool resides. If left empty the tool is assumed to be found in the
 # default search path.
 
 MSCGEN_PATH            =
 
-# If set to YES, the inheritance and collaboration graphs will hide
-# inheritance and usage relations if the target is undocumented
-# or is not a class.
+# You can include diagrams made with dia in doxygen documentation. Doxygen will
+# then run dia to produce the diagram and insert it in the documentation. The
+# DIA_PATH tag allows you to specify the directory where the dia binary resides.
+# If left empty dia is assumed to be found in the default search path.
+
+DIA_PATH               =
+
+# If set to YES the inheritance and collaboration graphs will hide inheritance
+# and usage relations if the target is undocumented or is not a class.
+# The default value is: YES.
 
 HIDE_UNDOC_RELATIONS   = NO
 
 # If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
-# available from the path. This tool is part of Graphviz, a graph visualization
-# toolkit from AT&T and Lucent Bell Labs. The other options in this section
-# have no effect if this option is set to NO (the default)
+# available from the path. This tool is part of Graphviz (see:
+# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
+# Bell Labs. The other options in this section have no effect if this option is
+# set to NO
+# The default value is: YES.
 
 HAVE_DOT               = YES
 
-# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is
-# allowed to run in parallel. When set to 0 (the default) doxygen will
-# base this on the number of processors available in the system. You can set it
-# explicitly to a value larger than 0 to get control over the balance
-# between CPU load and processing speed.
+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
+# to run in parallel. When set to 0 doxygen will base this on the number of
+# processors available in the system. You can set it explicitly to a value
+# larger than 0 to get control over the balance between CPU load and processing
+# speed.
+# Minimum value: 0, maximum value: 32, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_NUM_THREADS        = 0
 
-# By default doxygen will use the Helvetica font for all dot files that
-# doxygen generates. When you want a differently looking font you can specify
-# the font name using DOT_FONTNAME. You need to make sure dot is able to find
-# the font, which can be done by putting it in a standard location or by setting
-# the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the
-# directory containing the font.
+# When you want a differently looking font in the dot files that doxygen
+# generates you can specify the font name using DOT_FONTNAME. You need to make
+# sure dot is able to find the font, which can be done by putting it in a
+# standard location or by setting the DOTFONTPATH environment variable or by
+# setting DOT_FONTPATH to the directory containing the font.
+# The default value is: Helvetica.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_FONTNAME           = Arial
 
-# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
-# The default size is 10pt.
+# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
+# dot graphs.
+# Minimum value: 4, maximum value: 24, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_FONTSIZE           = 10
 
-# By default doxygen will tell dot to use the Helvetica font.
-# If you specify a different font using DOT_FONTNAME you can use DOT_FONTPATH to
-# set the path where dot can find it.
+# By default doxygen will tell dot to use the default font as specified with
+# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
+# the path where dot can find it using this tag.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_FONTPATH           =
 
-# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for each documented class showing the direct and
-# indirect inheritance relations. Setting this tag to YES will force the
-# CLASS_DIAGRAMS tag to NO.
+# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
+# each documented class showing the direct and indirect inheritance relations.
+# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 CLASS_GRAPH            = NO
 
-# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for each documented class showing the direct and
-# indirect implementation dependencies (inheritance, containment, and
-# class references variables) of the class with other documented classes.
+# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
+# graph for each documented class showing the direct and indirect implementation
+# dependencies (inheritance, containment, and class references variables) of the
+# class with other documented classes.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 COLLABORATION_GRAPH    = YES
 
-# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for groups, showing the direct groups dependencies
+# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
+# groups, showing the direct groups dependencies.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 GROUP_GRAPHS           = NO
 
-# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
+# If the UML_LOOK tag is set to YES, doxygen will generate inheritance and
 # collaboration diagrams in a style similar to the OMG's Unified Modeling
 # Language.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 UML_LOOK               = NO
 
-# If the UML_LOOK tag is enabled, the fields and methods are shown inside
-# the class node. If there are many fields or methods and many nodes the
-# graph may become too big to be useful. The UML_LIMIT_NUM_FIELDS
-# threshold limits the number of items for each type to make the size more
-# managable. Set this to 0 for no limit. Note that the threshold may be
-# exceeded by 50% before the limit is enforced.
+# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
+# class node. If there are many fields or methods and many nodes the graph may
+# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
+# number of items for each type to make the size more manageable. Set this to 0
+# for no limit. Note that the threshold may be exceeded by 50% before the limit
+# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
+# but if the number exceeds 15, the total amount of fields shown is limited to
+# 10.
+# Minimum value: 0, maximum value: 100, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 UML_LIMIT_NUM_FIELDS   = 10
 
-# If set to YES, the inheritance and collaboration graphs will show the
-# relations between templates and their instances.
+# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
+# collaboration graphs will show the relations between templates and their
+# instances.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 TEMPLATE_RELATIONS     = NO
 
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
-# tags are set to YES then doxygen will generate a graph for each documented
-# file showing the direct and indirect include dependencies of the file with
-# other documented files.
+# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
+# YES then doxygen will generate a graph for each documented file showing the
+# direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 INCLUDE_GRAPH          = YES
 
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
-# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
-# documented header file showing the documented files that directly or
-# indirectly include this file.
+# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
+# set to YES then doxygen will generate a graph for each documented file showing
+# the direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 INCLUDED_BY_GRAPH      = NO
 
-# If the CALL_GRAPH and HAVE_DOT options are set to YES then
-# doxygen will generate a call dependency graph for every global function
-# or class method. Note that enabling this option will significantly increase
-# the time of a run. So in most cases it will be better to enable call graphs
-# for selected functions only using the \callgraph command.
+# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable call graphs for selected
+# functions only using the \callgraph command.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 CALL_GRAPH             = NO
 
-# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then
-# doxygen will generate a caller dependency graph for every global function
-# or class method. Note that enabling this option will significantly increase
-# the time of a run. So in most cases it will be better to enable caller
-# graphs for selected functions only using the \callergraph command.
+# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable caller graphs for selected
+# functions only using the \callergraph command.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 CALLER_GRAPH           = NO
 
-# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
-# will generate a graphical hierarchy of all classes instead of a textual one.
+# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
+# hierarchy of all classes instead of a textual one.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 GRAPHICAL_HIERARCHY    = NO
 
-# If the DIRECTORY_GRAPH and HAVE_DOT tags are set to YES
-# then doxygen will show the dependencies a directory has on other directories
-# in a graphical way. The dependency relations are determined by the #include
-# relations between the files in the directories.
+# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
+# dependencies a directory has on other directories in a graphical way. The
+# dependency relations are determined by the #include relations between the
+# files in the directories.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DIRECTORY_GRAPH        = NO
 
 # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
-# generated by dot. Possible values are svg, png, jpg, or gif.
-# If left blank png will be used. If you choose svg you need to set
-# HTML_FILE_EXTENSION to xhtml in order to make the SVG files
-# visible in IE 9+ (other browsers do not have this requirement).
+# generated by dot.
+# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
+# to make the SVG files visible in IE 9+ (other browsers do not have this
+# requirement).
+# Possible values are: png, png:cairo, png:cairo:cairo, png:cairo:gd, png:gd,
+# png:gd:gd, jpg, jpg:cairo, jpg:cairo:gd, jpg:gd, jpg:gd:gd, gif, gif:cairo,
+# gif:cairo:gd, gif:gd, gif:gd:gd and svg.
+# The default value is: png.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_IMAGE_FORMAT       = svg
 
 # If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
 # enable generation of interactive SVG images that allow zooming and panning.
-# Note that this requires a modern browser other than Internet Explorer.
-# Tested and working are Firefox, Chrome, Safari, and Opera. For IE 9+ you
-# need to set HTML_FILE_EXTENSION to xhtml in order to make the SVG files
-# visible. Older versions of IE do not have SVG support.
+#
+# Note that this requires a modern browser other than Internet Explorer. Tested
+# and working are Firefox, Chrome, Safari, and Opera.
+# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
+# the SVG files visible. Older versions of IE do not have SVG support.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 INTERACTIVE_SVG        = NO
 
-# The tag DOT_PATH can be used to specify the path where the dot tool can be
+# The DOT_PATH tag can be used to specify the path where the dot tool can be
 # found. If left blank, it is assumed the dot tool can be found in the path.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_PATH               =
 
 # The DOTFILE_DIRS tag can be used to specify one or more directories that
-# contain dot files that are included in the documentation (see the
-# \dotfile command).
+# contain dot files that are included in the documentation (see the \dotfile
+# command).
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOTFILE_DIRS           =
 
 # The MSCFILE_DIRS tag can be used to specify one or more directories that
-# contain msc files that are included in the documentation (see the
-# \mscfile command).
+# contain msc files that are included in the documentation (see the \mscfile
+# command).
 
 MSCFILE_DIRS           =
 
-# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
-# nodes that will be shown in the graph. If the number of nodes in a graph
-# becomes larger than this value, doxygen will truncate the graph, which is
-# visualized by representing a node as a red box. Note that doxygen if the
-# number of direct children of the root node in a graph is already larger than
-# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note
-# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+# The DIAFILE_DIRS tag can be used to specify one or more directories that
+# contain dia files that are included in the documentation (see the \diafile
+# command).
+
+DIAFILE_DIRS           =
+
+# When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the
+# path where java can find the plantuml.jar file. If left blank, it is assumed
+# PlantUML is not used or called during a preprocessing step. Doxygen will
+# generate a warning when it encounters a \startuml command in this case and
+# will not generate output for the diagram.
+
+PLANTUML_JAR_PATH      =
+
+# When using plantuml, the specified paths are searched for files specified by
+# the !include statement in a plantuml block.
+
+PLANTUML_INCLUDE_PATH  =
+
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
+# that will be shown in the graph. If the number of nodes in a graph becomes
+# larger than this value, doxygen will truncate the graph, which is visualized
+# by representing a node as a red box. Note that doxygen if the number of direct
+# children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
+# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+# Minimum value: 0, maximum value: 10000, default value: 50.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_GRAPH_MAX_NODES    = 50
 
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
-# graphs generated by dot. A depth value of 3 means that only nodes reachable
-# from the root by following a path via at most 3 edges will be shown. Nodes
-# that lay further from the root node will be omitted. Note that setting this
-# option to 1 or 2 may greatly reduce the computation time needed for large
-# code bases. Also note that the size of a graph can be further restricted by
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
+# generated by dot. A depth value of 3 means that only nodes reachable from the
+# root by following a path via at most 3 edges will be shown. Nodes that lay
+# further from the root node will be omitted. Note that setting this option to 1
+# or 2 may greatly reduce the computation time needed for large code bases. Also
+# note that the size of a graph can be further restricted by
 # DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+# Minimum value: 0, maximum value: 1000, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 MAX_DOT_GRAPH_DEPTH    = 0
 
 # Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
-# background. This is disabled by default, because dot on Windows does not
-# seem to support this out of the box. Warning: Depending on the platform used,
-# enabling this option may lead to badly anti-aliased labels on the edges of
-# a graph (i.e. they become hard to read).
+# background. This is disabled by default, because dot on Windows does not seem
+# to support this out of the box.
+#
+# Warning: Depending on the platform used, enabling this option may lead to
+# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
+# read).
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_TRANSPARENT        = NO
 
-# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
+# Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output
 # files in one run (i.e. multiple -o and -T options on the command line). This
-# makes dot run faster, but since only newer versions of dot (>1.8.10)
-# support this, this feature is disabled by default.
+# makes dot run faster, but since only newer versions of dot (>1.8.10) support
+# this, this feature is disabled by default.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_MULTI_TARGETS      = YES
 
-# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
-# generate a legend page explaining the meaning of the various boxes and
-# arrows in the dot generated graphs.
+# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
+# explaining the meaning of the various boxes and arrows in the dot generated
+# graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 GENERATE_LEGEND        = YES
 
-# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
-# remove the intermediate dot files that are used to generate
-# the various graphs.
+# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate dot
+# files that are used to generate the various graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_CLEANUP            = YES

From 7c16acf4aa0ca31b58492aa3b50980cb3a1d52b5 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 4 Jan 2016 16:06:48 +0900
Subject: [PATCH 0105/1519] Make Key_GetBinding take an imt instead of a name.

---
 include/QF/keys.h         | 2 +-
 libs/video/targets/keys.c | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/include/QF/keys.h b/include/QF/keys.h
index 6661aaeac..b862a4bb7 100644
--- a/include/QF/keys.h
+++ b/include/QF/keys.h
@@ -533,7 +533,7 @@ void Key_Init (struct cbuf_s *cb);
 void Key_Init_Cvars (void);
 void Key_WriteBindings (QFile *f);
 void Key_ClearStates (void);
-const char *Key_GetBinding (const char *imt_name, knum_t key);
+const char *Key_GetBinding (imt_t *imt, knum_t key);
 void Key_SetBinding (imt_t *imt, knum_t keynum, const char *binding);
 void Key_SetKeyDest(keydest_t kd);
 typedef void keydest_callback_t (keydest_t);
diff --git a/libs/video/targets/keys.c b/libs/video/targets/keys.c
index 9b488a7ed..1170dee24 100644
--- a/libs/video/targets/keys.c
+++ b/libs/video/targets/keys.c
@@ -944,6 +944,7 @@ static void
 Key_GIB_Bind_Get_f (void)
 {
 	const char *key, *cmd;
+	imt_t      *imt;
 	int k;
 
 	if (GIB_Argc () != 2) {
@@ -958,7 +959,8 @@ Key_GIB_Bind_Get_f (void)
 		return;
 	}
 
-	if (!(cmd = Key_GetBinding ("IMT_MOD", k)))
+	imt = Key_FindIMT ("imt_mod");
+	if (!imt || !(cmd = Key_GetBinding (imt, k)))
 		GIB_Return ("");
 	else
 		GIB_Return (cmd);
@@ -1319,11 +1321,8 @@ Key_Init_Cvars (void)
 }
 
 const char *
-Key_GetBinding (const char *imt_name, knum_t key)
+Key_GetBinding (imt_t *imt, knum_t key)
 {
-	imt_t      *imt;
-
-	imt = Key_FindIMT (imt_name);
 	if (imt) {
 		return imt->bindings[key].str;
 	}

From 59f60d1ba7b2c61b8c6ee6fc50723659fe8bd754 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 4 Jan 2016 16:10:22 +0900
Subject: [PATCH 0106/1519] Enable the Key_StringToKeynum builtin.

I don't know why I didn't do it earlier other than lack of need.
---
 libs/video/targets/pr_keys.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/libs/video/targets/pr_keys.c b/libs/video/targets/pr_keys.c
index 9c1b83927..d9dd7d405 100644
--- a/libs/video/targets/pr_keys.c
+++ b/libs/video/targets/pr_keys.c
@@ -143,12 +143,19 @@ bi_Key_KeynumToString (progs_t *pr)
 	RETURN_STRING (pr, Key_KeynumToString (keynum));
 };
 
+static void
+bi_Key_StringToKeynum (progs_t *pr)
+{
+	const char *keyname = P_GSTRING (pr, 0);
+	R_INT (pr) = Key_StringToKeynum (keyname);
+}
+
 static builtin_t builtins[] = {
 	{"Key_SetBinding",		bi_Key_SetBinding,		-1},
 	{"Key_LookupBinding",	bi_Key_LookupBinding,	-1},
 	{"Key_CountBinding",	bi_Key_CountBinding,	-1},
 	{"Key_KeynumToString",	bi_Key_KeynumToString,	-1},
-// NEED THIS ?//	{"Key_StringToKeynum",	bi_Key_KeynumToString,	-1},
+	{"Key_StringToKeynum",	bi_Key_StringToKeynum,	-1},
 	{0}
 };
 

From aecea5c3505051b71fbeffb6c80ca617299a5d67 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 4 Jan 2016 16:11:15 +0900
Subject: [PATCH 0107/1519] Document most of they key binding system.

---
 include/QF/keys.h         | 133 ++++++++++++++++++++++++++++++++++----
 libs/video/targets/keys.c |  19 ------
 2 files changed, 120 insertions(+), 32 deletions(-)

diff --git a/include/QF/keys.h b/include/QF/keys.h
index b862a4bb7..cfd20d258 100644
--- a/include/QF/keys.h
+++ b/include/QF/keys.h
@@ -482,14 +482,14 @@ typedef enum {
 } knum_t;
 
 typedef enum {
-	key_unfocused,			// engine has lost input focus
-	key_game,
-	key_demo,
-	key_console,
-	key_message,
-	key_menu,
+	key_unfocused,			///< engine has lost input focus
+	key_game,				///< Normal in-game key bindings
+	key_demo,				///< Demo playback key bindings
+	key_console,			///< Command console key bindings
+	key_message,			///< Message input line key bindings
+	key_menu,				///< Menu key bindings.
 
-	key_last				// enum size
+	key_last				///< enum size
 } keydest_t;
 
 #ifndef __QFCC__
@@ -515,34 +515,141 @@ typedef struct imt_s {
 	int         written;			///< avoid duplicate config file writes
 } imt_t;
 
+/**	Chain of input mapping tables ascociated with a keydest sub-system (game,
+	menu, etc).
+*/
 typedef struct keytarget_s {
-	imt_t      *imts;
-	imt_t      *active;
+	imt_t      *imts;				///< list of tables attached to this target
+	imt_t      *active;				///< currently active table in this target
 } keytarget_t;
 
 extern int		keydown[QFK_LAST];
 
+struct cbuf_s;
+
+void Key_Init (struct cbuf_s *cb);
+void Key_Init_Cvars (void);
+
+/**	Find an Input Mapping Table by name.
+
+	Searches through all keydest targets for the named imt. The search is case
+	insensitive.
+
+	\param imt_name	The name of the imt to find. Case insensitive.
+	\return			The named imt, or null if not found.
+*/
 imt_t *Key_FindIMT (const char *imt_name);
+
+/**	Create a new imt and attach it to the specified keydest target.
+
+	The name of the new imt must be unique (case insensitive) across all
+	keydest targets. This is to simplify the in_bind command.
+
+	If \a chain_imt_name is not null, then it species the fallback imt for when
+	the key is not bound in the new imt. It must be an already existing imt in
+	the specified keydest target. This is to prevent loops and other weird
+	behavior.
+
+	\param kd		The keydest target to which the new imt will be attached.
+	\param imt_name	The name for the new imt. Must be unique (case
+					insensitive).
+	\param chain_imt_name	The name of the fallback imt if not null. Must
+					already exist on the specified keydest target.
+*/
 void Key_CreateIMT (keydest_t kd, const char *imt_name,
 					const char *chain_imt_name);
 
-struct cbuf_s;
+/**	Handle a key press/release event.
+
+	\param key		The key that was pressed or released for this event.
+	\param unicode	The unicode value of the key.
+	\param down		True if a press event, false if a release event.
+*/
 void Key_Event (knum_t key, short unicode, qboolean down);
+
+/**	Handle loss or gain of input focus (usually in windowed enviroments).
+
+	Sets the keydest target to key_unfocuses when input focus is lost.
+
+	Triggers keydest callbacks.
+
+	\bug			Always sets the target to key_game when focus is gained.
+
+	\param gain		True if focus is gained, false if focus is lost.
+*/
 void Key_FocusEvent (int gain);
-void Key_Init (struct cbuf_s *cb);
-void Key_Init_Cvars (void);
+
 void Key_WriteBindings (QFile *f);
+
+/**	Force all key states to unpressed.
+
+	Sends a key release event for any keys that are seen as down.
+*/
 void Key_ClearStates (void);
+
+/**	Return a key binding in the specified input mapping table.
+
+	\param imt		The input mapping table from which to get the binding.
+	\param key		The key for which to get the binding.
+	\return			The command string bound to the key, or null if unbound.
+*/
 const char *Key_GetBinding (imt_t *imt, knum_t key);
+
+/** Bind a command string to a key in the specified input mapping table.
+
+	Only one command string can be bound to a key, but the command string may
+	contain multiple commands.
+
+	\param int		The input mapping table in which the key will be bound.
+	\param keynum	The key to which the command string will be bound.
+	\param binding	The command string that will be bound.
+*/
 void Key_SetBinding (imt_t *imt, knum_t keynum, const char *binding);
+
+/**	Set the current keydest target.
+
+	Triggers keydest callbacks.
+
+	\param kd		The keydest target to make current.
+*/
 void Key_SetKeyDest(keydest_t kd);
-typedef void keydest_callback_t (keydest_t);
+
+/** keydest callback signature.
+
+	\param kd		The new current keydest target.
+*/
+typedef void keydest_callback_t (keydest_t kd);
+
+/**	Add a callback for when the keydest target changes.
+
+	\param callback	The callback to be added.
+*/
 void Key_KeydestCallback (keydest_callback_t *callback);
 
+/**	Get the string representation of a key.
 
+	Returns a string (a QFK_* name) for the given keynum.
+
+	\param keynum	The key for which to get the string.
+	\return			The string representation of the key.
+*/
 const char *Key_KeynumToString (knum_t keynum);
+
+/**	Get the keynum for the named key.
+
+	Returns a key number to be used to index keybindings[] by looking at
+	the given string.  Single ascii characters return themselves, while
+	the QFK_* names are matched up.
+
+	\param str		The name of the key.
+	\return			The named key if valid, otherwise -1
+*/
 int Key_StringToKeynum (const char *str);
+
 struct progs_s;
+
+/**	Add the Key builtins to the specified progs instance.
+*/
 void Key_Progs_Init (struct progs_s *pr);
 #endif
 
diff --git a/libs/video/targets/keys.c b/libs/video/targets/keys.c
index 1170dee24..b1d22f121 100644
--- a/libs/video/targets/keys.c
+++ b/libs/video/targets/keys.c
@@ -634,10 +634,6 @@ Key_Game (knum_t key, short unicode)
 		imt = imt->chain;
 	}
 	return false;
-/*
-	Sys_DPrintf("kb %p, key_target %d, key_dest %d, key %d\n", kb,
-				key_target, key_dest, key);
-*/
 }
 
 /*
@@ -655,15 +651,6 @@ Key_Console (knum_t key, short unicode)
 	Con_KeyEvent (key, unicode, keydown[key]);
 }
 
-//============================================================================
-
-/*
-  Key_StringToKeynum
-
-  Returns a key number to be used to index keybindings[] by looking at
-  the given string.  Single ascii characters return themselves, while
-  the QFK_* names are matched up.
-*/
 VISIBLE int
 Key_StringToKeynum (const char *str)
 {
@@ -679,12 +666,6 @@ Key_StringToKeynum (const char *str)
 	return -1;
 }
 
-/*
-  Key_KeynumToString
-
-  Returns a string (a QFK_* name) for the given keynum.
-  FIXME: handle quote special (general escape sequence?)
-*/
 VISIBLE const char *
 Key_KeynumToString (knum_t keynum)
 {

From 9cb23ba67ed48f9389509a3bf69f8f8356ca362e Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 4 Jan 2016 16:12:36 +0900
Subject: [PATCH 0108/1519] Clean up some error messages.

The contractions took the emphasis off where it needed to be.
---
 libs/video/targets/keys.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/libs/video/targets/keys.c b/libs/video/targets/keys.c
index b1d22f121..ecf3aa4ce 100644
--- a/libs/video/targets/keys.c
+++ b/libs/video/targets/keys.c
@@ -689,13 +689,13 @@ Key_In_Unbind (const char *imt_name, const char *key_name)
 
 	imt = Key_FindIMT (imt_name);
 	if (!imt) {
-		Sys_Printf ("\"%s\" isn't a valid imt\n", imt_name);
+		Sys_Printf ("\"%s\" is not a valid imt\n", imt_name);
 		return;
 	}
 
 	key = Key_StringToKeynum (key_name);
 	if (key == -1) {
-		Sys_Printf ("\"%s\" isn't a valid key\n", key_name);
+		Sys_Printf ("\"%s\" is not a valid key\n", key_name);
 		return;
 	}
 
@@ -757,7 +757,7 @@ Key_In_Clear (void)
 	}
 	for (i = 1; i < Cmd_Argc (); i++) {
 		if (!Key_FindIMT (Cmd_Argv (i))) {
-			Sys_Printf ("\"%s\" isn't a valid imt\n", Cmd_Argv (i));
+			Sys_Printf ("\"%s\" is not a valid imt\n", Cmd_Argv (i));
 			err = 1;
 		}
 	}
@@ -824,13 +824,13 @@ Key_In_Bind (const char *imt_name, const char *key_name, const char *cmd)
 
 	imt = Key_FindIMT (imt_name);
 	if (!imt) {
-		Sys_Printf ("\"%s\" isn't a valid imt\n", imt_name);
+		Sys_Printf ("\"%s\" is not a valid imt\n", imt_name);
 		return;
 	}
 
 	key = Key_StringToKeynum (key_name);
 	if (key == -1) {
-		Sys_Printf ("\"%s\" isn't a valid key\n", key_name);
+		Sys_Printf ("\"%s\" is not a valid key\n", key_name);
 		return;
 	}
 
@@ -997,7 +997,7 @@ Key_InputMappingTable_f (void)
 
 	imt = Key_FindIMT (Cmd_Argv (1));
 	if (!imt) {
-		Sys_Printf ("\"%s\" isn't a valid imt\n", Cmd_Argv (1));
+		Sys_Printf ("\"%s\" is not a valid imt\n", Cmd_Argv (1));
 		return;
 	}
 
@@ -1041,7 +1041,7 @@ Key_IMT_Keydest_f (void)
 
 	imt = key_target_find_imt (&key_targets[kd], imt_name);
 	if (!imt) {
-		Sys_Printf ("\"%s\" isn't an imt on %s\n", imt_name, keydest);
+		Sys_Printf ("\"%s\" is not an imt on %s\n", imt_name, keydest);
 		return;
 	}
 

From fb3396a21d23fc9bd72249cdfa47fb6831019e2b Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 4 Jan 2016 16:20:57 +0900
Subject: [PATCH 0109/1519] Fix a typo in the key docs.

---
 include/QF/keys.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/QF/keys.h b/include/QF/keys.h
index cfd20d258..a2f751486 100644
--- a/include/QF/keys.h
+++ b/include/QF/keys.h
@@ -600,7 +600,7 @@ const char *Key_GetBinding (imt_t *imt, knum_t key);
 	Only one command string can be bound to a key, but the command string may
 	contain multiple commands.
 
-	\param int		The input mapping table in which the key will be bound.
+	\param imt		The input mapping table in which the key will be bound.
 	\param keynum	The key to which the command string will be bound.
 	\param binding	The command string that will be bound.
 */

From e1f9cb20283b57352f8c02e5c0479f750ba52672 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 4 Jan 2016 17:24:13 +0900
Subject: [PATCH 0110/1519] Create an input subsection for the docs.

---
 include/QF/keys.h | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/include/QF/keys.h b/include/QF/keys.h
index a2f751486..f79291dc0 100644
--- a/include/QF/keys.h
+++ b/include/QF/keys.h
@@ -34,8 +34,14 @@
 # include "QF/quakeio.h"
 #endif
 
-// these are the key numbers that should be passed to Key_Event
+/** \defgroup input Input Sub-system */
 
+/** \defgroup input_keybinding Key Binding Sub-system
+	\ingroup input
+*/
+//@{
+
+/// these are the key numbers that should be passed to Key_Event
 typedef enum {
 	/* The keyboard syms have been cleverly chosen to map to ASCII */
 	QFK_UNKNOWN		= 0,
@@ -653,4 +659,6 @@ struct progs_s;
 void Key_Progs_Init (struct progs_s *pr);
 #endif
 
+//@}
+
 #endif // _KEYS_H

From b38a6bb7a4e7a5fb9bfe45b9ab1455c36a97009a Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 4 Jan 2016 17:24:51 +0900
Subject: [PATCH 0111/1519] Get the dynamic imt docs into doxygen.

I need to rewrite the whole key binding documentation at some stage, but
this will make things easier.
---
 doc/config.dox |  1 +
 doc/imt.dox    | 28 ++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 doc/imt.dox

diff --git a/doc/config.dox b/doc/config.dox
index 907a0262a..33b8a5524 100644
--- a/doc/config.dox
+++ b/doc/config.dox
@@ -11,6 +11,7 @@
 \li \subpage sound
 \li \subpage tracklist
 \li \subpage key_binding
+\li \subpage imt
 \li \subpage cshift_cvars
 \li \subpage server_timestamps
 */
diff --git a/doc/imt.dox b/doc/imt.dox
new file mode 100644
index 000000000..c1f66ffb8
--- /dev/null
+++ b/doc/imt.dox
@@ -0,0 +1,28 @@
+//unfortunately, have to wrap the docs in a C comment for doxygen
+// vim:tw=74:formatoptions-=l
+/**
+\page imt Input Mapping Table
+
+The user can now create and destroy IMTs at will, though currently
+destroying IMTs is currently all or nothing (imt_drop_all).
+
+An IMT is created via imt_create which takes the keydest name (key_game
+etc), the name of the IMT (must be unique for all IMTs) and optionally the
+name of the IMT to which the key binding search will fall back if there is
+no binding in the current IMT, but must be already defined and on the same
+keydest. This means that IMTs now have user determined fallback paths. The
+requirements for the fallback IMT prevent loops and other weird behaviour.
+
+Actual key binding via in_bind is unaffected. This is why the IMT name must
+be unique across all IMTs.
+
+The "imt" command works with the key_game keydest, but imt_keydest is
+provided for specifying the active IMT for a specific keydest.
+
+At startup, default IMTs are setup to emulate the previous static IMTs so
+old configs will continue to work (mostly).  New config files will be
+written with commands to drop all of the current IMTs and build new ones,
+with the bindings and active IMT set as well.
+
+
+*/

From 6e65de251c43dcccca142de2c33312212378213e Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 4 Jan 2016 20:42:22 +0900
Subject: [PATCH 0112/1519] Put qwaq's epoch back to 0.

4Gs causes a few problems at this stage. I really need to look into putting
long and double into qc.
---
 tools/qwaq/qwaq-bi.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/qwaq/qwaq-bi.c b/tools/qwaq/qwaq-bi.c
index 918dfbd28..3c5964df7 100644
--- a/tools/qwaq/qwaq-bi.c
+++ b/tools/qwaq/qwaq-bi.c
@@ -68,7 +68,7 @@ static plugin_list_t client_plugin_list[] = {
 };
 
 double      con_frametime;
-double      con_realtime;
+double      con_realtime, basetime;
 double      old_conrealtime;
 
 
@@ -120,7 +120,7 @@ static SCR_Func bi_2dfuncs[] = {
 static void
 bi_refresh (progs_t *pr)
 {
-	con_realtime = Sys_DoubleTime ();
+	con_realtime = Sys_DoubleTime () - basetime;
 	con_frametime = con_realtime - old_conrealtime;
 	old_conrealtime = con_realtime;
 	bi_rprogs = pr;
@@ -205,4 +205,5 @@ BI_Init (progs_t *pr)
 	S_Init (0, &con_frametime);
 	//CDAudio_Init ();
 	Con_NewMap ();
+	basetime = Sys_DoubleTime ();
 }

From 1ea74c62693dd4be58cd5eae58e8243b27b845c9 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 4 Jan 2016 22:04:39 +0900
Subject: [PATCH 0113/1519] Fix the gl skin segfault.

This was caused by an out-by one error when setting up the skin: if cmap
was 0 then the gl_skin struct would be taken from index -1 of the array and
thus cause all sorts of grief.
---
 libs/models/gl_skin.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/libs/models/gl_skin.c b/libs/models/gl_skin.c
index 16881d326..442def004 100644
--- a/libs/models/gl_skin.c
+++ b/libs/models/gl_skin.c
@@ -231,19 +231,20 @@ gl_Skin_SetupSkin (skin_t *skin, int cmap)
 	int         changed;
 	glskin_t   *s;
 
+	skin->texnum = 0;
+	skin->auxtex = 0;
+	if (!cmap) {
+		return;
+	}
 	// simplify cmap usage (texture offset/array index)
 	cmap--;
 	s = skins + cmap;
 	changed = (s->tex != skin->texels);
 	s->tex = skin->texels;
 	if (!changed) {
-		skin->texnum = 0;
-		skin->auxtex = 0;
-		if (cmap >= 0) {
-			skin->texnum = skin_textures + cmap;
-			if (s->fb)
-				skin->auxtex = skin_fb_textures + cmap;
-		}
+		skin->texnum = skin_textures + cmap;
+		if (s->fb)
+			skin->auxtex = skin_fb_textures + cmap;
 		return;
 	}
 	if (s->tex)

From d54ee6c8c38a18fd5ceaa591329cb49186f8fc66 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 7 Jan 2016 20:08:07 +0900
Subject: [PATCH 0114/1519] Do not promote debug messages to warnings.

I think I copied the notice code for debug and forgot to edit the
promotion. Oops.
---
 tools/qfcc/source/diagnostic.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tools/qfcc/source/diagnostic.c b/tools/qfcc/source/diagnostic.c
index b020a6ed0..2b2347cc2 100644
--- a/tools/qfcc/source/diagnostic.c
+++ b/tools/qfcc/source/diagnostic.c
@@ -103,9 +103,7 @@ debug (expr_t *e, const char *fmt, ...)
 		return;
 
 	va_start (args, fmt);
-	if (options.notices.promote) {
-		_warning (e, fmt, args);
-	} else {
+	{
 		string_t    file = pr.source_file;
 		int         line = pr.source_line;
 

From 431074d58fc2beb48d6b074fd0c659e2471870ac Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 7 Jan 2016 21:24:29 +0900
Subject: [PATCH 0115/1519] Update label destination when moving labels.

This fixes a segfault when optimizing the empty-body test. The label was
getting moved, but the statement block to which it pointed was not updated
and thus it pointed to dead data.
---
 tools/qfcc/source/statements.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tools/qfcc/source/statements.c b/tools/qfcc/source/statements.c
index e1606705e..f331a39f0 100644
--- a/tools/qfcc/source/statements.c
+++ b/tools/qfcc/source/statements.c
@@ -1308,8 +1308,11 @@ move_labels (sblock_t *dst, sblock_t *src)
 
 	if (!src_labels)
 		return;
-	while (src_labels->next)
+	src_labels->dest = dst;
+	while (src_labels->next) {
 		src_labels = src_labels->next;
+		src_labels->dest = dst;
+	}
 	src_labels->next = dst->labels;
 	dst->labels = src->labels;
 	src->labels = 0;

From 1061256c4fc169c126d043a0f7df1300d9edb3bc Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 8 Jan 2016 21:15:47 +0900
Subject: [PATCH 0116/1519] Add a missing expression type to dot_expr.

---
 tools/qfcc/source/dot_expr.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/qfcc/source/dot_expr.c b/tools/qfcc/source/dot_expr.c
index 301086dba..accd8485a 100644
--- a/tools/qfcc/source/dot_expr.c
+++ b/tools/qfcc/source/dot_expr.c
@@ -64,6 +64,7 @@ static const char *expr_names[] =
 	"uexpr",
 	"symbol",
 	"temp",
+	"vector",
 	"nil",
 	"value",
 };

From bf40f0126ef068c34fa7ef7e59daad6006985709 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 8 Jan 2016 21:16:37 +0900
Subject: [PATCH 0117/1519] Convert vector expressions when passing parameters.

Calling a function with [vector stuff] caused an ICE.
---
 tools/qfcc/source/expr.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index a5a88ca37..36627517f 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -1836,11 +1836,11 @@ build_function_call (expr_t *fexpr, type_t *ftype, expr_t *params)
 	for (e = params, i = 0; e; e = e->next, i++) {
 		if (has_function_call (e)) {
 			*a = new_temp_def_expr (arg_types[i]);
-			arg_exprs[arg_expr_count][0] = cast_expr (arg_types[i], e);
+			arg_exprs[arg_expr_count][0] = cast_expr (arg_types[i], convert_vector (e));
 			arg_exprs[arg_expr_count][1] = *a;
 			arg_expr_count++;
 		} else {
-			*a = cast_expr (arg_types[i], e);
+			*a = cast_expr (arg_types[i], convert_vector (e));
 		}
 		a = &(*a)->next;
 	}

From f163e35f2165f88efebb16e87ce4e78d714f9351 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 10 Jan 2016 13:33:05 +0900
Subject: [PATCH 0118/1519] Add a builtin to get keydown.

---
 libs/video/targets/pr_keys.c | 8 ++++++++
 ruamoko/include/key.h        | 2 ++
 ruamoko/lib/key.r            | 1 +
 3 files changed, 11 insertions(+)

diff --git a/libs/video/targets/pr_keys.c b/libs/video/targets/pr_keys.c
index d9dd7d405..b72eb006e 100644
--- a/libs/video/targets/pr_keys.c
+++ b/libs/video/targets/pr_keys.c
@@ -40,6 +40,13 @@
 #include "QF/progs.h"
 #include "QF/zone.h"
 
+static void
+bi_Key_keydown (progs_t *pr)
+{
+	int         keynum  = P_INT (pr, 0);
+	R_INT (pr) = keydown[keynum];
+}
+
 /*
     bi_Key_SetBinding
 
@@ -151,6 +158,7 @@ bi_Key_StringToKeynum (progs_t *pr)
 }
 
 static builtin_t builtins[] = {
+	{"Key_keydown",			bi_Key_keydown,		-1},
 	{"Key_SetBinding",		bi_Key_SetBinding,		-1},
 	{"Key_LookupBinding",	bi_Key_LookupBinding,	-1},
 	{"Key_CountBinding",	bi_Key_CountBinding,	-1},
diff --git a/ruamoko/include/key.h b/ruamoko/include/key.h
index cd8cc2b73..bc7d04801 100644
--- a/ruamoko/include/key.h
+++ b/ruamoko/include/key.h
@@ -2,6 +2,8 @@
 #define __ruamoko_key_h
 
 #include "QF/keys.h"
+
+@extern int Key_keydown (int keynum);
 @extern string Key_SetBinding (string imt, int keynum, string binding);
 @extern int Key_LookupBinding (string imt, int bindnum, string binding);
 @extern int Key_CountBinding (string imt, string binding);
diff --git a/ruamoko/lib/key.r b/ruamoko/lib/key.r
index d66c218fb..19662f138 100644
--- a/ruamoko/lib/key.r
+++ b/ruamoko/lib/key.r
@@ -1,5 +1,6 @@
 #include "key.h"
 
+int Key_keydown (int keynum) = #0;
 string (string imt, int keynum, string binding) Key_SetBinding = #0;
 int (string imt, int bindnum, string binding) Key_LookupBinding = #0;
 int (string imt, string binding) Key_CountBinding = #0;

From 932647bad368c8a24f8123641bb346ffa921b538 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 10 Jan 2016 13:41:49 +0900
Subject: [PATCH 0119/1519] Fix a segfault with switch on an undefined symbol.

Forgot to check if the test expression was not an error.
---
 tools/qfcc/source/switch.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/qfcc/source/switch.c b/tools/qfcc/source/switch.c
index f6b05547c..80321a9ab 100644
--- a/tools/qfcc/source/switch.c
+++ b/tools/qfcc/source/switch.c
@@ -405,6 +405,10 @@ switch_expr (switch_block_t *switch_block, expr_t *break_label,
 	int         saved_line = pr.source_line;
 	string_t    saved_file = pr.source_file;
 
+	if (switch_block->test->type == ex_error) {
+		return switch_block->test;
+	}
+
 	pr.source_line = sw_val->line = switch_block->test->line;
 	pr.source_file = sw_val->file = switch_block->test->file;
 

From 2329fb18853f5778a0f3c93f5d97886ea7ff2ccd Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 25 Oct 2016 00:10:30 +0900
Subject: [PATCH 0120/1519] Fix some warnings and bitrot.

---
 libs/audio/cd_file.c             | 2 +-
 libs/audio/renderer/midi.c       | 2 +-
 libs/video/targets/context_x11.c | 2 +-
 tools/qfbsp/source/brush.c       | 2 +-
 tools/qfcc/source/flow.c         | 2 +-
 tools/qfcc/source/qc-lex.l       | 2 ++
 6 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/libs/audio/cd_file.c b/libs/audio/cd_file.c
index ce0f2b94f..94d394154 100644
--- a/libs/audio/cd_file.c
+++ b/libs/audio/cd_file.c
@@ -454,7 +454,7 @@ Mus_VolChange (cvar_t *bgmvolume)
 static void
 Mus_gamedir (int phase)
 {
-	if (phase);
+	if (phase)
 		Mus_OggChange (mus_ogglist);
 }
 
diff --git a/libs/audio/renderer/midi.c b/libs/audio/renderer/midi.c
index 86898da65..c4f44a050 100644
--- a/libs/audio/renderer/midi.c
+++ b/libs/audio/renderer/midi.c
@@ -105,7 +105,7 @@ midi_stream_read (void *file, float **buf)
 	int         res;
 	byte       *data = alloca (size);
 
-	res = WildMidi_GetOutput (mf->handle, (char *)data, size);
+	res = WildMidi_GetOutput (mf->handle, (int8_t *)data, size);
 	if (res <= 0) {
 		stream->error = 1;
 		return 0;
diff --git a/libs/video/targets/context_x11.c b/libs/video/targets/context_x11.c
index dc9ae9a0c..41045fcdf 100644
--- a/libs/video/targets/context_x11.c
+++ b/libs/video/targets/context_x11.c
@@ -406,7 +406,7 @@ X11_SetVidMode (int width, int height)
 			vid_gamma_avail = true;
 
 			temp = X11_GetGamma ();
-			if (temp && temp[0] > 0) {
+			if (temp && (*temp)[0] > 0) {
 				x_gamma[0] = (*temp)[0];
 				x_gamma[1] = (*temp)[1];
 				x_gamma[2] = (*temp)[2];
diff --git a/tools/qfbsp/source/brush.c b/tools/qfbsp/source/brush.c
index f27c253b8..940fddfb4 100644
--- a/tools/qfbsp/source/brush.c
+++ b/tools/qfbsp/source/brush.c
@@ -736,7 +736,7 @@ LoadBrush (const mbrush_t *mb, int hullnum)
 		CreateBrushFaces ();
 	} else if (mb->detail) {
 		face_t     *f;
-		for (f = brush_faces; f; f = f->next);
+		for (f = brush_faces; f; f = f->next)
 			f->detail = 1;
 	}
 
diff --git a/tools/qfcc/source/flow.c b/tools/qfcc/source/flow.c
index 2c6692f1d..c611fd0a8 100644
--- a/tools/qfcc/source/flow.c
+++ b/tools/qfcc/source/flow.c
@@ -981,7 +981,7 @@ flow_make_edges (flowgraph_t *graph)
 	flownode_t *node;
 	set_iter_t *succ;
 
-	if (graph->edges);
+	if (graph->edges)
 		free (graph->edges);
 	graph->edges = malloc (graph->num_edges * sizeof (flowedge_t));
 	for (j = 0, i = 0; i < graph->num_nodes + 2; i++) {
diff --git a/tools/qfcc/source/qc-lex.l b/tools/qfcc/source/qc-lex.l
index 7d190cb48..14cc1265f 100644
--- a/tools/qfcc/source/qc-lex.l
+++ b/tools/qfcc/source/qc-lex.l
@@ -442,6 +442,8 @@ keyword_or_id (char *token)
 #ifdef YY_FLEX_REALLOC_HACK
 static __attribute__ ((used)) void *(*const yy_flex_realloc_hack)(void *,yy_size_t) = yy_flex_realloc;
 #else
+#ifdef yyunput
 static __attribute__ ((used)) void (*yyunput_hack)(int, char*) = yyunput;
+#endif
 static __attribute__ ((used)) int (*input_hack)(void) = input;
 #endif

From f522e58d530b895bf268135204f6c8a4b6fed667 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 8 Jun 2018 12:45:57 +0900
Subject: [PATCH 0121/1519] Fix some blender warnings.

---
 tools/io_mesh_qfmdl/__init__.py | 2 +-
 tools/io_qfmap/__init__.py      | 2 +-
 tools/io_qfmap/entity.py        | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tools/io_mesh_qfmdl/__init__.py b/tools/io_mesh_qfmdl/__init__.py
index 5ee7375ef..03eb35e71 100644
--- a/tools/io_mesh_qfmdl/__init__.py
+++ b/tools/io_mesh_qfmdl/__init__.py
@@ -128,7 +128,7 @@ class ExportMDL6(bpy.types.Operator, ExportHelper):
         keywords = self.as_keywords (ignore=("check_existing", "filter_glob"))
         return export_mdl.export_mdl(self, context, **keywords)
 
-class MDLPanel(bpy.types.Panel):
+class OBJECT_PT_MDLPanel(bpy.types.Panel):
     bl_space_type = 'PROPERTIES'
     bl_region_type = 'WINDOW'
     bl_context = 'object'
diff --git a/tools/io_qfmap/__init__.py b/tools/io_qfmap/__init__.py
index c67158aff..953750b63 100644
--- a/tools/io_qfmap/__init__.py
+++ b/tools/io_qfmap/__init__.py
@@ -222,7 +222,7 @@ class QFEntityClasses(bpy.types.PropertyGroup):
                     d[sub] = ec
             self.__class__.ecm = EntityClassMenu.build(menudict)
 
-class QFECPanel(bpy.types.Panel):
+class OBJECT_PT_QFECPanel(bpy.types.Panel):
     bl_space_type = 'PROPERTIES'
     bl_region_type = 'WINDOW'
     bl_context = 'scene'
diff --git a/tools/io_qfmap/entity.py b/tools/io_qfmap/entity.py
index ecf9180c8..23f151f7e 100644
--- a/tools/io_qfmap/entity.py
+++ b/tools/io_qfmap/entity.py
@@ -77,7 +77,7 @@ def draw_callback(self, context):
                     bgl.glEnd()
     bgl.glLineWidth(1)
 
-class QFEntityRelations(bpy.types.Panel):
+class VIEW3D_PT_QFEntityRelations(bpy.types.Panel):
     bl_space_type = 'VIEW_3D'
     bl_region_type = 'UI'
     bl_label = "Register callback"
@@ -100,7 +100,7 @@ class QFEntityRelations(bpy.types.Panel):
     def draw(self, context):
         pass
 
-class EntityField_list(bpy.types.UIList):
+class OBJECT_UL_EntityField_list(bpy.types.UIList):
     def draw_item(self, context, layout, data, item, icon, active_data,
                   active_propname, index):
         layout.label(item.name)
@@ -163,7 +163,7 @@ def reflow_text(text, max_width):
             lines.append(flowed_line)
     return lines
 
-class EntityPanel(bpy.types.Panel):
+class OBJECT_PT_EntityPanel(bpy.types.Panel):
     bl_space_type = 'PROPERTIES'
     bl_region_type = 'WINDOW'
     bl_context = 'object'
@@ -198,7 +198,7 @@ class EntityPanel(bpy.types.Panel):
                 sub.prop(qfentity, "flags", text=flags[idx], index=idx)
         row = layout.row()
         col = row.column()
-        col.template_list("EntityField_list", "", qfentity, "fields",
+        col.template_list("OBJECT_UL_EntityField_list", "", qfentity, "fields",
                           qfentity, "field_idx", rows=3)
         col = row.column(align=True)
         col.operator("object.entprop_add", icon='ZOOMIN', text="")

From 0de0eb2fc74b608c909f4301a5516cebc22b14f4 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 8 Jun 2018 13:21:30 +0900
Subject: [PATCH 0122/1519] Fix a bunch of bit-rot.

---
 config.d/typedefs_structs_compiler.m4 | 6 +++---
 include/QF/pr_comp.h                  | 4 ++--
 include/QF/progs.h                    | 2 +-
 libs/gamecode/pr_load.c               | 2 +-
 libs/util/plugin.c                    | 6 ++++--
 nq/source/sv_main.c                   | 2 +-
 qw/source/cl_slist.c                  | 2 +-
 tools/qfcc/source/qp-lex.l            | 2 ++
 8 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/config.d/typedefs_structs_compiler.m4 b/config.d/typedefs_structs_compiler.m4
index 3ba73b7d6..8e6acac2e 100644
--- a/config.d/typedefs_structs_compiler.m4
+++ b/config.d/typedefs_structs_compiler.m4
@@ -74,9 +74,9 @@ AH_VERBATIM([HAVE___ATTRIBUTE__GCC_STRUCT],
 #endif])
 
 AC_MSG_CHECKING(for __builtin_expect)
-AC_TRY_COMPILE(
-	[long (*foo) (long, long) = __builtin_expect;],
-	[],
+AC_TRY_LINK(
+	[int x;],
+	[if (__builtin_expect(!x, 1)) {}],
 	AC_DEFINE(HAVE___BUILTIN_EXPECT)
 	AC_MSG_RESULT(yes),
 	AC_MSG_RESULT(no)
diff --git a/include/QF/pr_comp.h b/include/QF/pr_comp.h
index 4cc274f98..7bac7eb01 100644
--- a/include/QF/pr_comp.h
+++ b/include/QF/pr_comp.h
@@ -346,8 +346,8 @@ typedef union pr_type_u {
 	string_t    string_var;
 	func_t      func_var;
 	pr_int_t    entity_var;
-	float       vector_var[1];	// really 3, but this structure must be 32 bits
-	float       quat_var[1];	// really 4, but this structure must be 32 bits
+	float       vector_var[0];	// really 3, but this structure must be 32 bits
+	float       quat_var[0];	// really 4, but this structure must be 32 bits
 	pr_int_t    integer_var;
 	pointer_t   pointer_var;
 	pr_uint_t   uinteger_var;
diff --git a/include/QF/progs.h b/include/QF/progs.h
index 7c8bb3341..1c706ae4c 100644
--- a/include/QF/progs.h
+++ b/include/QF/progs.h
@@ -221,7 +221,7 @@ struct edict_s {
 	int         entnum;			///< number of this entity
 	float       freetime;		///< sv.time when the object was freed
 	void       *edata;			///< external per-edict data
-	pr_type_t   v[1];			///< fields from progs
+	pr_type_t   v[];			///< fields from progs
 };
 
 // pr_edict.c
diff --git a/libs/gamecode/pr_load.c b/libs/gamecode/pr_load.c
index b9a6df13a..82864b096 100644
--- a/libs/gamecode/pr_load.c
+++ b/libs/gamecode/pr_load.c
@@ -177,7 +177,7 @@ PR_LoadProgsFile (progs_t *pr, QFile *file, int size, int max_edicts, int zone)
 	// size of edict asked for by progs
 	pr->pr_edict_size = max (1, progs.entityfields) * 4;
 	// size of engine data
-	pr->pr_edict_size += sizeof (edict_t) - sizeof (pr_type_t);
+	pr->pr_edict_size += sizeof (edict_t);
 	// round off to next highest whole word address (esp for Alpha)
 	// this ensures that pointers in the engine data area are always
 	// properly aligned
diff --git a/libs/util/plugin.c b/libs/util/plugin.c
index 31fa725fd..7baa8df72 100644
--- a/libs/util/plugin.c
+++ b/libs/util/plugin.c
@@ -98,11 +98,13 @@ loaded_plugin_delete (void *lp, void *unused)
 static int
 pi_close_lib (void *handle)
 {
+	if (handle) {
 #if defined(HAVE_DLOPEN)
-	return (dlclose (handle) == 0);
+		return (dlclose (handle) == 0);
 #elif defined (_WIN32)
-	return (FreeLibrary (handle) == 0);
+		return (FreeLibrary (handle) == 0);
 #endif
+	}
 	return 1;
 }
 
diff --git a/nq/source/sv_main.c b/nq/source/sv_main.c
index 25def54ac..b666516f6 100644
--- a/nq/source/sv_main.c
+++ b/nq/source/sv_main.c
@@ -45,7 +45,7 @@ server_t    sv;
 server_static_t svs;
 double      sv_frametime;
 
-char        localmodels[MAX_MODELS][5];	// inline model names for precache
+char        localmodels[MAX_MODELS][6];	// inline model names for precache
 
 int sv_protocol = PROTOCOL_FITZQUAKE;
 
diff --git a/qw/source/cl_slist.c b/qw/source/cl_slist.c
index 569b711ce..585e6aa47 100644
--- a/qw/source/cl_slist.c
+++ b/qw/source/cl_slist.c
@@ -348,7 +348,7 @@ gettoklen (char *str, int req, char delim)
 	int         len = 0;
 
 	start = gettokstart (str, req, delim);
-	if (start == '\0') {
+	if (*start == '\0') {
 		return 0;
 	}
 	while (*start != delim && *start != '\0') {
diff --git a/tools/qfcc/source/qp-lex.l b/tools/qfcc/source/qp-lex.l
index e98b6511b..0bca559c9 100644
--- a/tools/qfcc/source/qp-lex.l
+++ b/tools/qfcc/source/qp-lex.l
@@ -296,7 +296,9 @@ convert_relop (const char *relop)
 #ifdef YY_FLEX_REALLOC_HACK
 static __attribute__ ((used)) void *(*const yy_flex_realloc_hack)(void *,yy_size_t) = yy_flex_realloc;
 #else
+#ifdef yyunput
 static __attribute__ ((used)) void (*yyunput_hack)(int, char*) = yyunput;
+#endif
 static __attribute__ ((used)) int (*input_hack)(void) = input;
 #endif
 

From b795beb52004e9d8c8066d22845d7d658fb610ef Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 19 Aug 2018 19:31:52 +0900
Subject: [PATCH 0123/1519] Add support for \? to qc strings.

And fix up the man page a bit.
---
 tools/qfcc/doc/man/qfcc.1   | 222 ++++++++++++++++++++++++++++++------
 tools/qfcc/source/strpool.c |   4 +
 2 files changed, 190 insertions(+), 36 deletions(-)

diff --git a/tools/qfcc/doc/man/qfcc.1 b/tools/qfcc/doc/man/qfcc.1
index 2857ffedd..a5e2794e0 100644
--- a/tools/qfcc/doc/man/qfcc.1
+++ b/tools/qfcc/doc/man/qfcc.1
@@ -31,49 +31,67 @@
 .ds qfcc \fBqfcc\fP
 .ds cpp \fBcpp\fP
 .ds progs.src \fIprogs.src\fP
+
 .TH QFCC 1 "28 April, 2004" QuakeForge "QuakeForge Developer's Manual"
 .\" Please update the above date whenever this man page is modified.
+
+
 .SH NAME
 qfcc \- The QuakeForge Code Compiler
+
+
 .SH SYNOPSIS
 .B qfcc
 .RI [ options ]
 .RI [ files ]
+
+
 .SH DESCRIPTION
 \*[qfcc] compiles Ruamoko source into a form that the QuakeForge engine can
 understand.
+
+
 .SH OPTIONS
 \*[qfcc] takes the following arguments:
+
 .TP
 .B \-\-advanced
 Use advanced Ruamoko features.
 This is the default when using separate compilation.
+
 .TP
 .B \-C, \-\-code OPTION,...
 Set code generation options.
 See \fBCODE GENERATION OPTIONS\fP for details.
+
 .TP
 .B \-c
 Only compile, do not link.
 Can be used in either \fBprogs.src\fP or separate compilation modes.
+
 .TP
 .B \-\-cpp CPPSPEC
 \*[cpp] execution command line.
 See \fBCPP NAME\fP for details.
+
 .TP
 .B \-D, \-\-define SYMBOL[=VAL]
 Define a symbol for the preprocessor, if it is in use.
+
 .TP
 .B \-E
 Only preprocess.
 No compilation or linking is done.
+
 .TP
 .B \-\-extended
 Allow extended keywords in traditional mode.
+
 .TP
 .B \-F, \-\-files
 Generate \fIfiles.dat\fP.
 This list is created by checking the parameters to the precache_* functions.
+
 .TP
 .B \-\-frames
 Generate \fI<source>.frame\fP files.
@@ -84,57 +102,71 @@ names with their associated frame numbers. Eg, \fBplayer.qc\fP will produce
 \fBplayer.frame\fPa. Note that files that do not create frame macros will
 not generate a frame file. At this time, the file is always written to the
 current directory.
+
 .TP
 .B \-g
 Generate debugging info.
 Synonym for \fB\-\-code debug\fP.
+
 .TP
 .B \-h, \-\-help
 Show summary of options.
+
 .TP
 .B \-I DIR
 Add DIR to the list of directories for the preprocessor to search when looking
 for include files.
+
 .TP
 .B \-\-include FILE
 Process FILE as if \fB#include "FILE"\fP appeared as the first line of the
 primary source file.
 See the \*[cpp] man page (\fB\-include\fP) for details.
+
 .TP
 .B \-L DIR
 Add DIR to the search path used for finding libraries specified with \fB-l\fP.
+
 .TP
 .B \-l LIB
 Add libLIB.a to the list of libraries to be used for resolving undefined
 symbols.
 \*[qfcc] expects libraries to be \fBpak\fP files of \*[qfcc]
 object files built using the \fBpak\fP utility.
+
 .TP
 .B \-M, \-MD, \-MMD
 Generate dependency info.
 Dependent on \*[cpp] version, so check \*[cpp]'s documentation.
+
 .TP
 .B \-\-no\-default\-paths
 Do not use default paths for include files or libraries.
+
 .TP
 .B \-N, \-\-notice OPTION,...
 Set notice options.
 See \fBNOTICE OPTIONS\fP for details.
+
 .TP
 .B \-o, \-\-output\-file FILE
 Specify output file name.
 In \fBprogs.src\fP mode, this overrides the output file in \*[progs.src].
+
 .TP
 .B \-\-progdefs
 Generate \fIprogdefs.h\fP. Forces \fB\-\-code crc\fP.
+
 .TP
 .B \-P, \-\-progs\-src FILE
 File to use instead of \*[progs.src].
 No effect in separate compilation mode.
+
 .TP
 .B \-\-qccx\-escapes
 Use QCCX escape sequences instead of standard C/QuakeForge sequences in
 strings. See \fBESCAPE SEQUENCES\fP for details.
+
 .TP
 .B \-p, \-\-strip\-path NUM
 Strip NUM leading path elements from file names.
@@ -143,21 +175,26 @@ eg. -p 3 will strip the
 from
 .I ../../../src/foo.r
 when embedding the source file name in the output code.
+
 .TP
 .B \-q, \-\-quiet
 Inhibit some of \*[qfcc]'s normal output.
 Specifying this option multiple times further inhibits \*[qfcc]'s output.
 Counteracts the effects of \fB-v\fP.
+
 .TP
 .B \-r, \-\-relocatable
 Incremental linking.
 Generate a larger object file from other object files and libraries.
+
 .TP
 .B \-S, \-\-save\-temps
 Do not delete temporary files.
+
 .TP
 .B \-s, \-\-source DIR
 Look for \*[progs.src] in \fBDIR\fP instead of the current directory.
+
 .TP
 .B \-\-traditional
 Use traditional QuakeC syntax, semantics and \*(lqbugs\*(rq.
@@ -165,32 +202,40 @@ Also implies the \fBv6only\fP, \fBno-short-circuit\fP and
 \fBno-local-merging\fP code generation options (see
 \fBCODE GENERATION OPTIONS\fP).
 This is the default when using \fBprogs.src\fP mode.
+
 .TP
 .B \-U, \-\-undefine SYMBOL
 Undefine a preprocessor symbol, if the preprocessor is in use.
+
 .TP
 .B \-V, \-\-version
 Show the version of \*[qfcc].
+
 .TP
 .B \-v, \-\-verbose
 Display more output than usual.
 Specifying this option multiple times further increases \*[qfcc]'s output.
 Counteracts the effects of \fB-q\fP.
+
 .TP
 .B \-W, \-\-warn OPTION,...
 Set warning options.
 See \fBWARNING OPTIONS\fP for details.
+
 .TP
 .B \-z
 Compress object files when writing them.
 This is especially useful when creating libraries, especially if using the
 object oriented features, but can be quite slow.
 This has no effect when creating \fBprogs.dat\fP.
+
+
 .SH "CODE GENERATION OPTIONS"
 Code generation options are processed in the order of their appearance on the
 command line.
 Unsupported options are ignored.
 The following options are supported by \*[qfcc]'s \fB\-\-code\fP argument:
+
 .TP
 .B cow
 Allow assignment to initialized globals.
@@ -200,15 +245,18 @@ However, \fBqcc\fP never really enforced this.
 The \fBcow\fP option allows \*[qfcc] to gracefully cope with QuakeC source
 that assigns values to initialized globals in this manner.
 (also known as \*(lqcopy on write\*(rq\(emnever mind the bovine connotations)
+
 .TP
 .B cpp
 Preprocess all input files with \*[cpp].
 This includes the \*[progs.src] file when used.
+
 .TP
 .B crc
 Write the CRC of \fBprogdefs.h\fP to \*(lqprogs.dat\*(rq. Default for v6 progs,
 otherwise defaults to off. However, \fB\-\-progdefs\fP has the effect of
 forcing this option.
+
 .TP
 .B debug
 Generate debug code for QuakeForge engines.
@@ -218,12 +266,14 @@ This option tells \*[qfcc] to generate this information.
 It is written to a secondary file with the extension \*(lqsym\*(rq\(emif your
 output file is \*(lqprogs.dat\*(rq, the symbol file will be
 \*(lqprogs.sym\*(rq.
+
 .TP
 .B fast\-float
 Use float values directly in \*(lqif\*(rq statements.
 Defaults to on.
 This option is always enabled when using version 6 progs (\fBv6only\fP is in
 effect).
+
 .TP
 .B local-merging
 Clump the local variables from all functions into one block of data the size
@@ -235,6 +285,7 @@ data.
 This can be a problem because instructions can access addresses up to 32767 in
 older servers or 65535 in most modern servers.
 Defaults to off for traditional mode, and on for advanced mode.
+
 .TP
 .B short\-circuit
 Generate short circuit code for logical operators (\fB&&\fP and \fB||\fP).
@@ -243,6 +294,7 @@ the code for \fBB\fP will not be executed.
 Similar for \fBA || B\fP, but if \fBA\fP is true, the expression is known to
 be true and the code for \fBB\fP will not be executed.
 Defaults to off for traditional mode, and on for advanced mode.
+
 .TP
 .B single-cpp
 In \fBprogs.src\fP mode, when \*[cpp] is used, produce an intermediate file
@@ -255,6 +307,7 @@ Without this option, each source file is independent with respect to the
 preprocessor.
 Has no effect in separate compilation mode.
 Defaults to on.
+
 .TP
 .B vector\-calls
 When a function is passed a constant vector, this causes the vector to be
@@ -263,12 +316,14 @@ instruction.
 This can save a good number of pr_globals where those vectors contain many
 duplicate coordinates but do not match entirely.
 However, this will generate slower code for such calls.
+
 .TP
 .B vector\-components
 Create extra symbols for accessing the components of a vector variable or 
 field. For example, \fBvector vel\fP will also create \fBvel_x\fP,
 \fBvel_y\fP, and \fBvel_z\fP. Defaults to on for traditional code and off
 for advanced.
+
 .TP
 .B v6only
 Restrict the compiler to only version 6 progs (original Quake/QuakeWorld)
@@ -280,64 +335,80 @@ support) that require extensions.
 Defaults to on for traditional mode and off for advanced mode.
 .PP
 Any of the above can be prefixed with \fBno\-\fP to negate its meaning.
+
+
 .SH "WARNING OPTIONS"
 Warning options are processed in the order of their appearance on the command
 line.
 Unsupported options are ignored.
 The following options are supported by \*[qfcc]'s \fB\-\-warn\fP argument:
+
 .TP
 .B cow
 Emit a warning when the source assigns a value to a named constant.
 See the description of the \fBcow\fP code generation option above for a
 description of what this means.
+
 .TP
 .B error
 Promote warnings to errors.
+
 .TP
 .B executable
 Emit a warning when non-executable statements (eg, \fB==\fP used for
 assignment) are encountered.
+
 .TP
 .B initializer
 Emit a warning when too many structure/array initializer elements are given.
+
 .TP
 .B integer-divide
 Emit a warning when both constants in a division operation are integers.
+
 .TP
 .B interface\-check
 Emit a warning when a method is declared in an implementation but not in the
 interface for a class.
+
 .TP
 .B precedence
 Emit a warning when potentially ambiguous logic is used without parentheses.
+
 .TP
 .B redeclared
 Emit a warning when a local variable is redeclared.
+
 .TP
 .B switch
 Emit a warning when an enum value is not handled in a switch statement that
 tests an enum.
 Using a default label will cause all otherwise unhandled enum values to be
 handled (for good or evil).
-.TP
+
 .TP
 .B traditional
 Emit a warning when code that should be an error is allowed by traditional
 \fBqcc\fP.
 Has effect only in traditional mode.
+
 .TP
 .B undef\-function
 Emit a warning when a function is called, but has not yet been defined.
+
 .TP
 .B unimplemented
 Emit a warning when a class method has not been implemented.
+
 .TP
 .B unused
 Emit a warning for unused local variables.
+
 .TP
 .B uninited\-var
 Emit a warning when a variable is read from that has not been initialized to a
 value.
+
 .TP
 .B vararg\-integer
 Emit a warning when a function that takes a variable number of arguments is
@@ -345,26 +416,34 @@ passed a constant of an integer type.
 .PP
 Any of the above can be prefixed with \fBno\-\fP to negate its meaning.
 There are also two special options:
+
 .TP
 .B all
 Turns on all warning options except \fBerror\fP.
+
 .TP
 .B none
 Turns off all warning options except \fBerror\fP.
+
+
 .SH "NOTICE OPTIONS"
 Notices are used to flag code constructs that may have changed semantics but
 shouldn't be treated as warnings.
 They are also used for internal debugging purposes, so if you see any cryptic
 notices, please report them as a bug (normal notices should be fairly
 self-explanatory).
+
 .TP
 .B none
 Silences all notice messages.
+
 .TP
 .B warn
 Promote notices to warnings.
 If warnings are being treated as errors, so will notices.
 Disabling warnings has no effect on this option.
+
+
 .SH "CPP NAME"
 When preprocessing source files, \*[qfcc] calls \*[cpp] (the C
 preprocessor) with a configurable command line.
@@ -379,19 +458,24 @@ This spec is similar in concept to a \fBprintf\fP string.
 The name of the program may be either absolute (eg \fB/lib/cpp\fP) or relative
 as the \fBPATH\fP will be searched.
 Available substitutions:
+
 .TP
 .B %d
 Mainly for defines (\-D, \-U and \-I) but \fB%d\fP will be replaced by all
 \*[cpp] options that \*[qfcc] passes to \*[cpp]
+
 .TP
 .B %o
 This will be replaced by the output file path.
 Could be either absolute or relative, depending on whether \*[qfcc] is
 deleting temporary files or not.
+
 .TP
 .B %i
 This will be replaced by the input file path.
 Generally as given to \*[qfcc].
+
+
 .SH "COMPILATION MODES"
 \*[qfcc] has two, mutually exclusive, modes of operation: \fBprogs.src\fP
 mode and \*(lqseparate compilation\*(rq mode.
@@ -466,99 +550,153 @@ overridden using \fB--traditional\fP.
 When using \*[cpp], each source file is passed through the preprocessor
 individually.
 Each file is truly independent of any other file on the command line.
+
+
 .SH "ESCAPE SEQUENCES"
 \*[qfcc] supports a variety of string escape sequences. This includes those of
 \fBqcc\fP (which are a subset of those in standard C), standard C and
 \fBqccx\fP. There are some conflicts between the escape sequences, but
 \fB\-\-qccx\-escapes\fP selects which set to use.
-.TP
-.B \(rs\(rs
-Backslash.
-.TP
-.B \(rsn
-Line feed.
-.TP
-.B \(rs"
-Double quote.
-.TP
-.B \(rs\'
-Single quote.
-.TP
-.B \(rs0-7
-Octal character code, up to three digits. This conflicts with \fBqccx\fP. In
-\fBqccx\fP, this produces gold digits. Use \fB\-\-qccx\-escapes\fP to select
-\fBqccx\fP behaviour.
-.TP
-.B \(rs8-9
-Produce gold digits.
-.TP
-.B \(rsx0-9A-Fa-f
-Hexadecimal character code, any number of digits, but only the least
-significant byte will be used.
+.SS Standard escape sequences:
+These are the supported escape sequences from standard C, with the addition of
+\(rse (escape), which would be nice if it was in standard C.
+
 .TP
 .B \(rsa
 Bell character (not in quake engines). Equivalent to \(rsx07.
+
 .TP
 .B \(rsb
 Backspace character (not in quake engines). Equivalent to \(rsx08. This
 conflicts with \fBqccx\fP. In \fBqccx\fP, this toggles bronze characters. Use
 \fB\-\-qccx\-escapes\fP to select \fBqccx\fP behaviour.
+
 .TP
 .B \(rse
-Escape character (not in quake engines). Equivalent to \(rsx1b (dull 9).
+Escape character (not in quake engines). Equivalent to \(rsx1b. Not actually
+standard, but it should be.
+
 .TP
 .B \(rsf
 Formfeed character (not in quake engines). Equivalent to \(rsx0c.
+
+.TP
+.B \(rsn
+Line feed.
+
 .TP
 .B \(rsr
 Carriage return. Equivalent to \(rsx0d.
+
 .TP
-.B \(rss
-Toggle "bold" characters (add 0x80).
 .B \(rst
 Tab character. Equivalent to \(rsx09.
+
 .TP
 .B \(rsv
 Vertical tab. Equivalent to \(rsx0b.
+
 .TP
-.B \(rs^
-Make the next character "bold" (add 0x80).
+.B \(rs\(rs
+Backslash.
+
+.TP
+.B \(rs\'
+Single quote.
+
+.TP
+.B \(rs"
+Double quote.
+
+.TP
+.B \(rs?
+Question mark. Avoids trigraphs in standard C, but supported for compatibility.
+
+.TP
+.B \(rs0-7
+Octal character code, up to three digits. This conflicts with \fBqccx\fP. In
+\fBqccx\fP, this produces gold digits. Use \fB\-\-qccx\-escapes\fP to select
+\fBqccx\fP behaviour.
+
+.TP
+.B \(rs8-9
+Produce gold digits.
+
+.TP
+.B \(rsx0-9A-Fa-f
+Hexadecimal character code, any number of digits, but only the least
+significant byte will be used.
+
+
+.SS Quake character set extension escape sequences:
+
+.TP
+.B \(rsb
+Toggle bronze characters. Requires \fB\-\-qccx\-escapes\fP.
+
+.TP
+.B \(rss
+Toggle "bold" characters (add 0x80).
+
 .TP
 .B \(rs[
 Gold [ character. Equivalent to \(rsx90.
+
 .TP
 .B \(rs]
 Gold ] character. Equivalent to \(rsx91.
+
 .TP
 .B \(rs.
 Center dot. Equivalent to \(rsx1c.
+
 .TP
 .B \(rs<
 Turn on "bold" characters (add 0x80). This conflicts with \fBqccx\fP. In
-\fBqccx\fP, this produces the brown left end. Equivalent to \(rsx1d. Use
+\fBqccx\fP, this produces the separator left end. Equivalent to \(rsx1d. Use
 \fB\-\-qccx\-escapes\fP to select \fBqccx\fP behaviour.
+
 .TP
 .B \(rs\-
-Brown center bit. Equivalent to \(rsx1e.
+Separator center. Equivalent to \(rsx1e.
+
 .TP
 .B \(rs>
 Turn off "bold" characters (add 0x80). This conflicts with \fBqccx\fP. In
-\fBqccx\fP, this produces the brown right end. Equivalent to \(rsx1f. Use
+\fBqccx\fP, this produces the separator right end. Equivalent to \(rsx1f. Use
 \fB\-\-qccx\-escapes\fP to select \fBqccx\fP behaviour.
+
+.TP
+.B \(rs^
+Make the next character "bold" (add 0x80).
+
+.TP
+.B \(rs0-9
+Produce gold digits. Requires \fB\-\-qccx\-escapes\fP (except \(rs8 and \(rs9:
+they are always available).
+
 .TP
 .B \(rs(
-Left slider end. Equivalent to \(rsx80.
+Slider left end. Equivalent to \(rsx80.
+
 .TP
 .B \(rs=
 Slider center. Equivalent to \(rsx81.
+
 .TP
 .B \(rs)
-Right slider end. Equivalent to \(rsx82.
+Slider right end. Equivalent to \(rsx82.
+
 .TP
 .B \(rs{0-255}
-Decimal character code.
+Decimal character code. Quake specific as qccx added this to allow specifying
+the character code directly as \(rs0-\(rs9 were already used for specifying
+gold digits.
+
 .P
 \fB\-\-qccx\-escapes\fP has no effect on sequences that do not conflict.
+
+
 .SH TRADITIONAL VS ADVANCED
 Compared to \fBqcc\fP, \*[qfcc] has many advanced features and is much stricter
 about type checking.
@@ -586,13 +724,17 @@ a lot of data space).
 Advanced mode is simply \*[qfcc] in its natural state.
 Using \fB--advanced\fP, \*[qfcc] can be put in to advanced mode while using the
 \fBprogs.src\fP compilation mode.
+
+
 .SH "FAQ"
+
 .TP
 .B Where did the name Ruamoko come from?
 In Maori mythology, Ruamoko is the youngest child of Ranginui, the
 Sky-father, and Papatuanuku, the Earth-mother.
 Ruamoko is the god of volcanoes and earthquakes.
 For more information, see the Web site at <\fBhttp://maori.com/kmst1.htm\fP>.
+
 .TP
 .B qfcc hangs
 This is almost always caused by qfcc incorrectly invoking \*[cpp].
@@ -600,11 +742,13 @@ Using the \fB--cpp\fP option (refer to the \fBCPP NAME\fP section above), the
 correct method for invoking \*[cpp] can be specified.
 Once you have found this, please send the correct \*[cpp] command line,
 preferably along with the output of \fBconfig.guess\fP, to the team.
+
 .TP
 .B qfcc is singing a bad 80s rap song to me. What's going on?
 \*(lqice ice baby\*(rq is QuakeForge-speak for \*(lqInternal Compiler
 Error\*(rq.
 It usually means there's a bug in \*[qfcc], so please report it to the team.
+
 .TP
 .B qfcc is mooing at me. What's wrong with you people?
 The compiler doesn't like being treated like a slab of beef.
@@ -615,11 +759,17 @@ while, but you told it not to do that by passing the \fBcow\fP option to
 \fB\-\-code\fP, so it has its revenge by mooing out a warning.
 Or something like that.
 To disable the warning, pass \fBno-cow\fP to \fB\-\-warn\fP.
+
+
 .SH "FILES"
 .I progs.src
+
+
 .SH "SEE ALSO"
 .BR quakeforge (1),
 .BR pak (1)
+
+
 .SH AUTHORS
 The original \fBqcc\fP program, for compiling the QuakeC language, was written
 by Id Software, Inc.
diff --git a/tools/qfcc/source/strpool.c b/tools/qfcc/source/strpool.c
index 8b32ae71e..0b59d5b9d 100644
--- a/tools/qfcc/source/strpool.c
+++ b/tools/qfcc/source/strpool.c
@@ -188,6 +188,10 @@ make_string (char *token, char **end)
 					boldnext = 0;
 					c = '\'' ^ mask;
 					break;
+				case '?':
+					boldnext = 0;
+					c = '?' ^ mask;
+					break;
 				case '0':
 				case '1':
 				case '2':

From 81202d7b296536f82fa7b403a6bbc62ce1eb474f Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 19 Aug 2018 19:44:45 +0900
Subject: [PATCH 0124/1519] Add a shutdown builtin to qwaq.

---
 tools/qwaq/qwaq-bi.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tools/qwaq/qwaq-bi.c b/tools/qwaq/qwaq-bi.c
index 3c5964df7..7e21a9259 100644
--- a/tools/qwaq/qwaq-bi.c
+++ b/tools/qwaq/qwaq-bi.c
@@ -143,11 +143,18 @@ bi_refresh_3d (progs_t *pr)
 	qc3d = P_FUNCTION (pr, 0);
 }
 
+static void
+bi_shutdown_ (progs_t *pr)
+{
+	Sys_Shutdown ();
+}
+
 static builtin_t builtins[] = {
 	{"printf",		bi_printf,		-1},
 	{"refresh",		bi_refresh,		-1},
 	{"refresh_2d",	bi_refresh_2d,	-1},
 	{"refresh_3d",	bi_refresh_3d,	-1},
+	{"shutdown",	bi_shutdown_,	-1},
 	{0}
 };
 

From 4f584291375b146b50398b22ead976f74b33b1ff Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 20 Aug 2018 00:05:00 +0900
Subject: [PATCH 0125/1519] Fix an unhealthy pile of gcc 8 warnings.

While some of the warnings were merely annoying, some where actual bugs or
unearthed bugs in related code.
---
 include/QF/model.h                 |  4 +-
 include/QF/teamplay.h              |  2 +-
 libs/models/alias/gl_model_alias.c | 35 ++++++------
 libs/models/brush/gl_model_brush.c |  4 +-
 libs/models/brush/model_brush.c    | 26 +++++----
 libs/models/gl_model_fullbright.c  |  2 +-
 libs/util/pakfile.c                |  2 +-
 libs/util/wadfile.c                |  2 +-
 libs/video/renderer/gl/gl_draw.c   |  3 +-
 nq/source/cl_demo.c                | 23 ++++----
 nq/source/sbar.c                   |  2 +-
 qw/include/server.h                |  2 +-
 qw/source/cl_cmd.c                 | 38 ++++++++-----
 qw/source/cl_demo.c                | 22 ++++----
 qw/source/sbar.c                   |  2 +-
 qw/source/sv_init.c                |  6 +-
 qw/source/sv_main.c                |  8 +--
 qw/source/sv_send.c                | 89 ++++++++++++++++--------------
 qw/source/teamplay.c               | 39 ++++++-------
 tools/qfspritegen/spritegen.c      | 18 +++---
 20 files changed, 178 insertions(+), 151 deletions(-)

diff --git a/include/QF/model.h b/include/QF/model.h
index b4d7791cd..641e025ec 100644
--- a/include/QF/model.h
+++ b/include/QF/model.h
@@ -90,7 +90,7 @@ typedef struct instsurf_s {
 } instsurf_t;
 
 typedef struct texture_s {
-	char		name[16];
+	char		*name;
 	unsigned int	width, height;
 	int			gl_texturenum;
 	int			gl_fb_texturenum;
@@ -445,7 +445,7 @@ mleaf_t *Mod_PointInLeaf (const vec3_t p, model_t *model);
 byte	*Mod_LeafPVS (mleaf_t *leaf, model_t *model);
 model_t	*Mod_FindName (const char *name);
 int     Mod_CalcFullbright (byte *in, byte *out, int pixels);
-int     Mod_Fullbright (byte * skin, int width, int height, char *name);
+int     Mod_Fullbright (byte * skin, int width, int height, const char *name);
 
 void    *Mod_LoadAliasFrame (void *pin, int *posenum, maliasframedesc_t *frame,
 							 int extra);
diff --git a/include/QF/teamplay.h b/include/QF/teamplay.h
index b0b1c01da..bf4ae9445 100644
--- a/include/QF/teamplay.h
+++ b/include/QF/teamplay.h
@@ -43,7 +43,7 @@ void Team_Init_Cvars (void);
 void Team_BestWeaponImpulse (void);
 void Team_Dead (void);
 void Team_NewMap (void);
-const char *Team_ParseSay (const char *);
+const char *Team_ParseSay (struct dstring_s *buf, const char *);
 void Locs_Init (void);
 void Team_ParseChat (const char *string);
 void Team_ResetTimers (void);
diff --git a/libs/models/alias/gl_model_alias.c b/libs/models/alias/gl_model_alias.c
index ec304b80d..63618451e 100644
--- a/libs/models/alias/gl_model_alias.c
+++ b/libs/models/alias/gl_model_alias.c
@@ -38,6 +38,7 @@
 # include <strings.h>
 #endif
 
+#include "QF/dstring.h"
 #include "QF/image.h"
 #include "QF/qendian.h"
 #include "QF/quakefs.h"
@@ -56,8 +57,9 @@ gl_Mod_LoadSkin (byte * skin, int skinsize, int snum, int gnum, qboolean group,
 				 maliasskindesc_t *skindesc)
 {
 	byte   *pskin;
-	char	name[32], modname[MAX_QPATH + 4];
+	char	modname[MAX_QPATH + 4];
 	int		fb_texnum = 0, texnum = 0;
+	dstring_t  *name = dstring_new ();
 
 	pskin = Hunk_AllocName (skinsize, loadname);
 	skindesc->skin = (byte *) pskin - (byte *) pheader;
@@ -75,27 +77,26 @@ gl_Mod_LoadSkin (byte * skin, int skinsize, int snum, int gnum, qboolean group,
 
 	if (!loadmodel->fullbright) {
 		if (group) {
-			snprintf (name, sizeof (name), "fb_%s_%i_%i", modname,
-					  snum, gnum);
+			dsprintf (name, "fb_%s_%i_%i", modname, snum, gnum);
 		} else {
-			snprintf (name, sizeof (name), "fb_%s_%i", modname, snum);
+			dsprintf (name, "fb_%s_%i", modname, snum);
 		}
 		fb_texnum = Mod_Fullbright (pskin, pheader->mdl.skinwidth,
-									pheader->mdl.skinheight, name);
-		Sys_MaskPrintf (SYS_GLT, "%s %d\n", name, fb_texnum);
+									pheader->mdl.skinheight, name->str);
+		Sys_MaskPrintf (SYS_GLT, "%s %d\n", name->str, fb_texnum);
 	}
 	if (group) {
-		snprintf (name, sizeof (name), "%s_%i_%i", modname, snum,
-				  gnum);
+		dsprintf (name, "%s_%i_%i", modname, snum, gnum);
 	} else {
-		snprintf (name, sizeof (name), "%s_%i", modname, snum);
+		dsprintf (name, "%s_%i", modname, snum);
 	}
-	texnum = GL_LoadTexture (name, pheader->mdl.skinwidth,
+	texnum = GL_LoadTexture (name->str, pheader->mdl.skinwidth,
 							 pheader->mdl.skinheight, pskin, true, false, 1);
-	Sys_MaskPrintf (SYS_GLT, "%s %d\n", name, texnum);
+	Sys_MaskPrintf (SYS_GLT, "%s %d\n", name->str, texnum);
 	skindesc->texnum = texnum;
 	skindesc->fb_texnum = fb_texnum;
 	loadmodel->hasfullbrights = fb_texnum;
+	dstring_delete (name);
 	// alpha param was true for non group skins
 	return skin + skinsize;
 }
@@ -151,10 +152,11 @@ Mod_LoadExternalSkin (maliasskindesc_t *pskindesc, char *filename)
 void
 gl_Mod_LoadExternalSkins (model_t *mod)
 {
-	char			   filename[MAX_QPATH + 4], modname[MAX_QPATH + 4];
+	char			   modname[MAX_QPATH + 4];
 	int				   i, j;
 	maliasskindesc_t  *pskindesc;
 	maliasskingroup_t *pskingroup;
+	dstring_t  *filename = dstring_new ();
 
 	QFS_StripExtension (mod->name, modname);
 
@@ -162,16 +164,15 @@ gl_Mod_LoadExternalSkins (model_t *mod)
 		pskindesc = ((maliasskindesc_t *)
 					 ((byte *) pheader + pheader->skindesc)) + i;
 		if (pskindesc->type == ALIAS_SKIN_SINGLE) {
-			snprintf (filename, sizeof (filename), "%s_%i", modname, i);
-			Mod_LoadExternalSkin (pskindesc, filename);
+			dsprintf (filename, "%s_%i", modname, i);
+			Mod_LoadExternalSkin (pskindesc, filename->str);
 		} else {
 			pskingroup = (maliasskingroup_t *)
 				((byte *) pheader + pskindesc->skin);
 
 			for (j = 0; j < pskingroup->numskins; j++) {
-				snprintf (filename, sizeof (filename), "%s_%i_%i",
-						  modname, i, j);
-				Mod_LoadExternalSkin (pskingroup->skindescs + j, filename);
+				dsprintf (filename, "%s_%i_%i", modname, i, j);
+				Mod_LoadExternalSkin (pskingroup->skindescs + j, filename->str);
 			}
 		}
 	}
diff --git a/libs/models/brush/gl_model_brush.c b/libs/models/brush/gl_model_brush.c
index 18744a529..1485fdd94 100644
--- a/libs/models/brush/gl_model_brush.c
+++ b/libs/models/brush/gl_model_brush.c
@@ -55,11 +55,11 @@
 void
 gl_Mod_ProcessTexture (texture_t *tx)
 {
-	char		name[32];
+	const char *name;
 
 	if (!strncmp (tx->name, "sky", 3))
 		return;
-	snprintf (name, sizeof (name), "fb_%s", tx->name);
+	name = va ("fb_%s", tx->name);
 	tx->gl_fb_texturenum =
 		Mod_Fullbright ((byte *) (tx + 1), tx->width, tx->height, name);
 	tx->gl_texturenum =
diff --git a/libs/models/brush/model_brush.c b/libs/models/brush/model_brush.c
index 931575534..dd43c1dc8 100644
--- a/libs/models/brush/model_brush.c
+++ b/libs/models/brush/model_brush.c
@@ -42,6 +42,7 @@
 
 #include "QF/checksum.h"
 #include "QF/cvar.h"
+#include "QF/dstring.h"
 #include "QF/model.h"
 #include "QF/qendian.h"
 #include "QF/quakefs.h"
@@ -132,25 +133,28 @@ Mod_LeafPVS (mleaf_t *leaf, model_t *model)
 static void
 mod_unique_miptex_name (texture_t **textures, texture_t *tx, int ind)
 {
-	char        name[17];
+	char       *name;
 	int         num = 0, i;
-	const char *tag;
+	dstring_t  *tag = 0;
 
-	strncpy (name, tx->name, 16);
-	name[16] = 0;
+	name = tx->name;
 	do {
 		for (i = 0; i < ind; i++)
 			if (textures[i] && !strcmp (textures[i]->name, tx->name))
 				break;
 		if (i == ind)
 			break;
-		tag = va ("~%x", num++);
-		strncpy (tx->name, name, 16);
-		if (strlen (name) + strlen (tag) <= 15)
-			strcat (tx->name, tag);
-		else
-			strcpy (tx->name + 15 - strlen (tag), tag);
+		if (!tag) {
+			tag = dstring_new ();
+		}
+		dsprintf (tag, "%s~%x", name, num++);
+		tx->name = tag->str;
 	} while (1);
+
+	if (tag) {
+		tx->name = dstring_freeze (tag);
+		free(name);
+	}
 }
 
 static void
@@ -188,7 +192,7 @@ Mod_LoadTextures (bsp_t *bsp)
 
 		loadmodel->textures[i] = tx;
 
-		memcpy (tx->name, mt->name, sizeof (tx->name));
+		tx->name = strndup(mt->name, sizeof (mt->name));
 		mod_unique_miptex_name (loadmodel->textures, tx, i);
 		tx->width = mt->width;
 		tx->height = mt->height;
diff --git a/libs/models/gl_model_fullbright.c b/libs/models/gl_model_fullbright.c
index f556c5dd7..3417b6646 100644
--- a/libs/models/gl_model_fullbright.c
+++ b/libs/models/gl_model_fullbright.c
@@ -59,7 +59,7 @@ Mod_CalcFullbright (byte *in, byte *out, int pixels)
 }
 
 int
-Mod_Fullbright (byte *skin, int width, int height, char *name)
+Mod_Fullbright (byte *skin, int width, int height, const char *name)
 {
 	byte   *ptexels;
 	int		pixels;
diff --git a/libs/util/pakfile.c b/libs/util/pakfile.c
index 5ddbbb9a2..9cfcb9924 100644
--- a/libs/util/pakfile.c
+++ b/libs/util/pakfile.c
@@ -161,7 +161,7 @@ pack_create (const char *name)
 		pack_del (pack);
 		return 0;
 	}
-	strncpy (pack->header.id, "PACK", sizeof (pack->header.id));
+	memcpy (pack->header.id, "PACK", sizeof (pack->header.id));
 
 	Qwrite (pack->handle, &pack->header, sizeof (pack->header));
 
diff --git a/libs/util/wadfile.c b/libs/util/wadfile.c
index d5bf7c7fd..3175f22c7 100644
--- a/libs/util/wadfile.c
+++ b/libs/util/wadfile.c
@@ -182,7 +182,7 @@ wad_create (const char *name)
 		wad_del (wad);
 		return 0;
 	}
-	strncpy (wad->header.id, "WAD2", sizeof (wad->header.id));
+	memcpy (wad->header.id, "WAD2", sizeof (wad->header.id));
 
 	Qwrite (wad->handle, &wad->header, sizeof (wad->header));
 
diff --git a/libs/video/renderer/gl/gl_draw.c b/libs/video/renderer/gl/gl_draw.c
index f988ddf66..6cebda1fb 100644
--- a/libs/video/renderer/gl/gl_draw.c
+++ b/libs/video/renderer/gl/gl_draw.c
@@ -256,7 +256,8 @@ gl_Draw_CachePic (const char *path, qboolean alpha)
 	} else
 		Sys_Error ("Draw_CachePic: failed to load %s", path);
 
-	strncpy (pic->name, path, sizeof (pic->name));
+	memset (pic->name, 0, sizeof (pic->name));
+	strncpy (pic->name, path, sizeof (pic->name) - 1);
 
 	// Now lets mark this cache entry as used..
 	pic->dirty = false;
diff --git a/nq/source/cl_demo.c b/nq/source/cl_demo.c
index 026c59fbb..3b0a1a803 100644
--- a/nq/source/cl_demo.c
+++ b/nq/source/cl_demo.c
@@ -56,15 +56,15 @@ typedef struct {
 	double      fps;
 } td_stats_t;
 
-int         demo_timeframes_isactive;
-int         demo_timeframes_index;
-char        demoname[1024];
-double     *demo_timeframes_array;
+static int         demo_timeframes_isactive;
+static int         demo_timeframes_index;
+static dstring_t  *demoname;
+static double     *demo_timeframes_array;
 #define CL_TIMEFRAMES_ARRAYBLOCK 4096
 
-int         timedemo_count;
-int         timedemo_runs;
-td_stats_t *timedemo_data;
+static int         timedemo_count;
+static int         timedemo_runs;
+static td_stats_t *timedemo_data;
 
 static void CL_FinishTimeDemo (void);
 static void CL_TimeFrames_DumpLog (void);
@@ -450,7 +450,7 @@ CL_StartDemo (void)
 	CL_Disconnect ();
 
 	// open the demo file
-	name = dstring_strdup (demoname);
+	name = dstring_strdup (demoname->str);
 	QFS_DefaultExtension (name, ".dem");
 
 	Sys_Printf ("Playing demo from %s.\n", name->str);
@@ -499,7 +499,7 @@ CL_PlayDemo_f (void)
 
 	switch (Cmd_Argc ()) {
 		case 1:
-			if (!demoname[0])
+			if (!demoname->str[0])
 				goto playdemo_error;
 			// fall through
 		case 2:
@@ -519,7 +519,7 @@ playdemo_error:
 	timedemo_runs = timedemo_count = 1;	// make sure looped timedemos stop
 
 	if (Cmd_Argc () > 1)
-		strncpy (demoname, Cmd_Argv (1), sizeof (demoname));
+		dstring_copystr (demoname, Cmd_Argv (1));
 	CL_StartDemo ();
 }
 
@@ -627,7 +627,7 @@ CL_TimeDemo_f (void)
 		timedemo_data = 0;
 	}
 	timedemo_data = calloc (timedemo_runs, sizeof (td_stats_t));
-	strncpy (demoname, Cmd_Argv (1), sizeof (demoname));
+	dstring_copystr (demoname, Cmd_Argv (1));
 	CL_StartTimeDemo ();
 	timedemo_runs = timedemo_count = max (count, 1);
 	timedemo_data = calloc (timedemo_runs, sizeof (td_stats_t));
@@ -636,6 +636,7 @@ CL_TimeDemo_f (void)
 void
 CL_Demo_Init (void)
 {
+	demoname = dstring_newstr ();
 	demo_timeframes_isactive = 0;
 	demo_timeframes_index = 0;
 	demo_timeframes_array = NULL;
diff --git a/nq/source/sbar.c b/nq/source/sbar.c
index e77ff103a..44d911118 100644
--- a/nq/source/sbar.c
+++ b/nq/source/sbar.c
@@ -352,7 +352,7 @@ draw_num (view_t *view, int x, int y, int num, int digits, int color)
 static inline void
 draw_smallnum (view_t *view, int x, int y, int n, int packed, int colored)
 {
-	char        num[4];
+	char        num[12];
 
 	packed = packed != 0;				// ensure 0 or 1
 
diff --git a/qw/include/server.h b/qw/include/server.h
index dbda77e12..642f296f8 100644
--- a/qw/include/server.h
+++ b/qw/include/server.h
@@ -73,7 +73,7 @@ typedef struct {
 	unsigned int	model_player_checksum;
 	unsigned int	eyes_player_checksum;
 
-	char		name[64];			// map name
+	char		*name;			// map name
 	char		modelname[MAX_QPATH];		// maps/<name>.bsp, for model_precache[0]
 	struct model_s 	*worldmodel;
 	const char	*model_precache[MAX_MODELS];	// NULL terminated
diff --git a/qw/source/cl_cmd.c b/qw/source/cl_cmd.c
index 1b02d4581..a38dbc875 100644
--- a/qw/source/cl_cmd.c
+++ b/qw/source/cl_cmd.c
@@ -37,12 +37,33 @@
 
 #include "QF/cbuf.h"
 #include "QF/cmd.h"
+#include "QF/dstring.h"
 #include "QF/msg.h"
 #include "QF/sys.h"
 #include "QF/teamplay.h"
 
 #include "client.h"
 
+static void
+send_say (const char *str)
+{
+	static dstring_t *teambuf;
+	const char *s;
+
+	if (!teambuf) {
+		teambuf = dstring_newstr ();
+	}
+
+	s = Team_ParseSay (teambuf, Cmd_Args (1));
+	if (*s && *s < 32 && *s != 10) {
+		// otherwise the server would eat leading characters
+		// less than 32 or greater than 127
+		SZ_Print (&cls.netchan.message, "\"");
+		SZ_Print (&cls.netchan.message, s);
+		SZ_Print (&cls.netchan.message, "\"");
+	} else
+		SZ_Print (&cls.netchan.message, s);
+}
 
 /*
 	CL_Cmd_ForwardToServer
@@ -70,21 +91,10 @@ CL_Cmd_ForwardToServer (void)
 
 		if (!strcasecmp (Cmd_Argv (0), "say") ||
 			!strcasecmp (Cmd_Argv (0), "say_team")) {
-			const char *s;
-
-			s = Team_ParseSay (Cmd_Args (1));
-			if (*s && *s < 32 && *s != 10) {
-				// otherwise the server would eat leading characters
-				// less than 32 or greater than 127
-				SZ_Print (&cls.netchan.message, "\"");
-				SZ_Print (&cls.netchan.message, s);
-				SZ_Print (&cls.netchan.message, "\"");
-			} else
-				SZ_Print (&cls.netchan.message, s);
-			return;
+			send_say(Cmd_Args (1));
+		} else {
+			SZ_Print (&cls.netchan.message, Cmd_Args (1));
 		}
-
-		SZ_Print (&cls.netchan.message, Cmd_Args (1));
 	}
 }
 
diff --git a/qw/source/cl_demo.c b/qw/source/cl_demo.c
index 31ce11620..04ccbdf55 100644
--- a/qw/source/cl_demo.c
+++ b/qw/source/cl_demo.c
@@ -69,14 +69,14 @@ typedef struct {
 	double      fps;
 } td_stats_t;
 
-int         demo_timeframes_isactive;
-int         demo_timeframes_index;
+static int  demo_timeframes_isactive;
+static int  demo_timeframes_index;
 static int  demotime_cached;
 static float cached_demotime;
 static byte cached_newtime;
-float       nextdemotime;
-char        demoname[1024];
-double     *demo_timeframes_array;
+static float  nextdemotime;
+static dstring_t *demoname;
+static double *demo_timeframes_array;
 #define CL_TIMEFRAMES_ARRAYBLOCK 4096
 
 int         timedemo_count;
@@ -990,12 +990,12 @@ CL_StartDemo (void)
 	int         type;
 
 	// open the demo file
-	name = dstring_strdup (demoname);
+	name = dstring_strdup (demoname->str);
 
 	QFS_DefaultExtension (name, ".mvd");
 	cls.demofile = QFS_FOpenFile (name->str);
 	if (!cls.demofile) {
-		dstring_copystr (name, demoname);
+		dstring_copystr (name, demoname->str);
 		QFS_DefaultExtension (name, ".qwd");
 		cls.demofile = QFS_FOpenFile (name->str);
 	}
@@ -1050,7 +1050,7 @@ CL_PlayDemo_f (void)
 {
 	switch (Cmd_Argc ()) {
 		case 1:
-			if (!demoname[0])
+			if (!demoname->str[0])
 				goto playdemo_error;
 			// fall through
 		case 2:
@@ -1072,7 +1072,7 @@ playdemo_error:
 	CL_Disconnect ();
 
 	if (Cmd_Argc () > 1)
-		strncpy (demoname, Cmd_Argv (1), sizeof (demoname));
+		dstring_copystr (demoname, Cmd_Argv (1));
 	CL_StartDemo ();
 }
 
@@ -1182,7 +1182,7 @@ CL_TimeDemo_f (void)
 		timedemo_data = 0;
 	}
 	timedemo_data = calloc (timedemo_runs, sizeof (td_stats_t));
-	strncpy (demoname, Cmd_Argv (1), sizeof (demoname));
+	dstring_copystr (demoname, Cmd_Argv (1));
 	CL_StartTimeDemo ();
 	timedemo_runs = timedemo_count = max (count, 1);
 	timedemo_data = calloc (timedemo_runs, sizeof (td_stats_t));
@@ -1191,6 +1191,8 @@ CL_TimeDemo_f (void)
 void
 CL_Demo_Init (void)
 {
+	demoname = dstring_newstr ();
+
 	demo_timeframes_isactive = 0;
 	demo_timeframes_index = 0;
 	demo_timeframes_array = NULL;
diff --git a/qw/source/sbar.c b/qw/source/sbar.c
index 7234c7f51..34490e43e 100644
--- a/qw/source/sbar.c
+++ b/qw/source/sbar.c
@@ -476,7 +476,7 @@ draw_solo (view_t *view)
 static inline void
 draw_smallnum (view_t *view, int x, int y, int n, int packed, int colored)
 {
-	char        num[4];
+	char        num[12];
 
 	packed = packed != 0;				// ensure 0 or 1
 
diff --git a/qw/source/sv_init.c b/qw/source/sv_init.c
index b9dbb0aec..7d8c894d1 100644
--- a/qw/source/sv_init.c
+++ b/qw/source/sv_init.c
@@ -341,6 +341,9 @@ SV_SpawnServer (const char *server)
 	so_buffers = sv.signon_buffers;
 	so_sizes = sv.signon_buffer_size;
 
+	if (sv.name) {
+		free (sv.name);
+	}
 	memset (&sv, 0, sizeof (sv));
 
 	sv.recorders = recorders;
@@ -363,7 +366,7 @@ SV_SpawnServer (const char *server)
 
 	SV_NextSignon ();
 
-	strcpy (sv.name, server);
+	sv.name = strdup(server);
 
 	// load progs to get entity field count which determines how big each
 	// edict is
@@ -384,7 +387,6 @@ SV_SpawnServer (const char *server)
 
 	sv.time = 1.0;
 
-	strncpy (sv.name, server, sizeof (sv.name));
 	snprintf (sv.modelname, sizeof (sv.modelname), "maps/%s.bsp", server);
 	map_cfg (sv.modelname, 0);
 	sv.worldmodel = Mod_ForName (sv.modelname, true);
diff --git a/qw/source/sv_main.c b/qw/source/sv_main.c
index 42a313aa6..685dfd0a7 100644
--- a/qw/source/sv_main.c
+++ b/qw/source/sv_main.c
@@ -1430,7 +1430,7 @@ SV_AddIP_f (void)
 		// FIXME: this should boot any matching clients
 	    for (i = 0; i < MAX_CLIENTS; i++) {
 			client_t *cl = &svs.clients[i];
-			char text[1024];
+			const char *text;
 			const char *typestr;
 			char timestr[1024];
 
@@ -1461,9 +1461,9 @@ SV_AddIP_f (void)
 							  bantime / 60);
 				else
 					strncpy (timestr, "permanently", sizeof (timestr));
-				snprintf (text, sizeof (text), "You are %s %s\n%s",
-						  typestr, timestr, type == ft_ban ? "" :
-						  "\nReconnecting won't help...");
+				text = va ("You are %s %s\n%s",
+						   typestr, timestr, type == ft_ban ? "" :
+						   "\nReconnecting won't help...");
 				MSG_ReliableWrite_Begin (&cl->backbuf, svc_centerprint,
 										 strlen (text) + 2);
 				MSG_ReliableWrite_String (&cl->backbuf, text);
diff --git a/qw/source/sv_send.c b/qw/source/sv_send.c
index 58fb00bef..54e53d347 100644
--- a/qw/source/sv_send.c
+++ b/qw/source/sv_send.c
@@ -148,6 +148,20 @@ SV_EndRedirect (void)
 }
 
 #define	MAXPRINTMSG	4096
+static int
+find_userid (const char *name)
+{
+	int         i;
+
+	for (i = 0; i < MAX_CLIENTS; i++) {
+		if (!svs.clients[i].state)
+			continue;
+		if (!strcmp (svs.clients[i].name, name)) {
+			return svs.clients[i].userid;
+		}
+	}
+	return 0;
+}
 
 /*
 	SV_Printf
@@ -158,10 +172,11 @@ SV_EndRedirect (void)
 void
 SV_Print (const char *fmt, va_list args)
 {
+	static dstring_t *premsg;
+	static dstring_t *msg;
+	static dstring_t *msg2;
 	static int  pending = 0;			// partial line being printed
-	char		premsg[MAXPRINTMSG];
-	unsigned char msg[MAXPRINTMSG];
-	char        msg2[MAXPRINTMSG];
+
 	char        msg3[MAXPRINTMSG];
 
 	time_t      mytime = 0;
@@ -169,50 +184,42 @@ SV_Print (const char *fmt, va_list args)
 	qboolean    timestamps = false;
 
 	char        *in;
-	unsigned char *out;
 
-	vsnprintf (premsg, sizeof (premsg), fmt, args);
-	in = premsg;
-	out = msg;
+	if (!premsg) {
+		premsg = dstring_newstr ();
+		msg = dstring_new ();
+		msg2 = dstring_new ();
+	}
+	dstring_clearstr (msg);
 
-	if (!*premsg)
+	dvsprintf (premsg, fmt, args);
+	in = premsg->str;
+
+	if (!*premsg->str)
 		return;
 	// expand FFnickFF to nick <userid>
 	do {
-		switch ((byte) *in) {
-			case 0xFF: {
-				char *end = strchr (in + 1, 0xFF);
-				int userid = 0;
-				int len;
-				int i;
-
-				if (!end)
-					end = in + strlen (in);
-				*end = '\0';
-				for (i = 0; i < MAX_CLIENTS; i++) {
-					if (!svs.clients[i].state)
-						continue;
-					if (!strcmp (svs.clients[i].name, in + 1)) {
-						userid = svs.clients[i].userid;
-						break;
-					}
-				}
-				len = snprintf ((char *) out, sizeof (msg) - (out - msg),
-								"%s <%d>", in + 1, userid);
-				out += len;
-				in = end + 1;
-				break;
+		char *beg = strchr (in, 0xFF);
+		if (beg) {
+			char *name = beg + 1;
+			char *end = strchr (name, 0xFF);
+			if (!end) {
+				end = beg + strlen (name);
 			}
-			default:
-				*out++ = *in++;
+			*end = 0;
+			dstring_appendsubstr (msg, in, beg - in);
+			dasprintf (msg, "%s <%d>", name, find_userid (name));
+			in = end + 1;
+		} else {
+			dstring_appendstr (msg, in);
+			break;
 		}
-	} while (sizeof (msg) - (out - msg) > 0 && *in);
-	*out = '\0';
+	} while (*in);
 
 	if (sv_redirected) {				// Add to redirected message
-		dstring_appendstr (&outputbuf, (char *) msg);
+		dstring_appendstr (&outputbuf, msg->str);
 	}
-	if (*msg && !con_printf_no_log) {
+	if (*msg->str && !con_printf_no_log) {
 		// We want to output to console and maybe logfile
 		if (sv_timestamps && sv_timefmt && sv_timefmt->string
 			&& sv_timestamps->int_val && !pending)
@@ -223,17 +230,17 @@ SV_Print (const char *fmt, va_list args)
 			local = localtime (&mytime);
 			strftime (msg3, sizeof (msg3), sv_timefmt->string, local);
 
-			snprintf (msg2, sizeof (msg2), "%s%s", msg3, msg);
+			dsprintf (msg2, "%s%s", msg3, msg->str);
 		} else {
-			snprintf (msg2, sizeof (msg2), "%s", msg);
+			dsprintf (msg2, "%s", msg->str);
 		}
-		if (msg2[strlen (msg2) - 1] != '\n') {
+		if (msg2->str[strlen (msg2->str) - 1] != '\n') {
 			pending = 1;
 		} else {
 			pending = 0;
 		}
 
-		Con_Printf ("%s", msg2);		// also echo to debugging console
+		Con_Printf ("%s", msg2->str);		// also echo to debugging console
 	}
 }
 
diff --git a/qw/source/teamplay.c b/qw/source/teamplay.c
index 513fdd4f7..538dc0f1d 100644
--- a/qw/source/teamplay.c
+++ b/qw/source/teamplay.c
@@ -117,13 +117,12 @@ Team_BestWeaponImpulse (void)
 		in_impulse = best;
 }
 
-
-const char       *
-Team_ParseSay (const char *s)
+//FIXME slow use of dstring
+const char *
+Team_ParseSay (dstring_t *buf, const char *s)
 {
-	char        chr, t2[128], t3[128];
+	char        chr, t2[128], t3[2];
 	const char *t1;
-	static char buf[1024];
 	size_t      i, bracket;
 	static location_t *location = NULL;
 
@@ -213,8 +212,9 @@ Team_ParseSay (const char *s)
 
 					snprintf (t2, sizeof (t2), "%sa:%i", t3,
 							  cl.stats[STAT_ARMOR]);
-				} else
+				} else {
 					snprintf (t2, sizeof (t2), "%i", cl.stats[STAT_ARMOR]);
+				}
 				break;
 			case 'A':
 				bracket = 0;
@@ -254,29 +254,24 @@ Team_ParseSay (const char *s)
 				t1 = t2;
 			}
 
-			if (bracket)
-				buf[i++] = 0x90;		// '['
-
-			if (t1) {
-				int         len;
-
-				len = strlen (t1);
-				if (i + len >= sizeof (buf))
-					continue;			// No more space in buffer, icky.
-				strncpy (buf + i, t1, len);
-				i += len;
+			if (bracket) {
+				dstring_appendstr (buf, "\x90");	// '['
 			}
 
-			if (bracket)
-				buf[i++] = 0x91;		// ']'
+			if (t1) {
+				dstring_appendstr (buf, t1);
+			}
+
+			if (bracket) {
+				dstring_appendstr (buf, "\x91");	// ']'
+			}
 
 			continue;
 		}
-		buf[i++] = *s++;
+		dstring_appendsubstr (buf, s++, 1);
 	}
-	buf[i] = 0;
 
-	return buf;
+	return buf->str;
 }
 
 void
diff --git a/tools/qfspritegen/spritegen.c b/tools/qfspritegen/spritegen.c
index b209650d4..5234adc0c 100644
--- a/tools/qfspritegen/spritegen.c
+++ b/tools/qfspritegen/spritegen.c
@@ -27,6 +27,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "QF/dstring.h"
 #include "QF/image.h"
 #include "QF/pcx.h"
 #include "QF/qendian.h"
@@ -42,8 +43,8 @@
 tex_t          *image;
 dsprite_t		sprite;
 byte			*lumpbuffer, *plump;
-char			spritedir[1024];
-char			spriteoutname[1024];
+dstring_t		*spritedir;
+dstring_t		*spriteoutname;
 int				framesmaxs[2];
 int				framecount;
 
@@ -444,7 +445,7 @@ Cmd_Spritename (void)
 		FinishSprite ();
 
 	Script_GetToken (&scr, false);
-	sprintf (spriteoutname, "%s%s.spr", spritedir, Script_Token (&scr));
+	dsprintf (spriteoutname, "%s%s.spr", spritedir->str, Script_Token (&scr));
 	memset (&sprite, 0, sizeof(sprite));
 	framecount = 0;
 
@@ -472,14 +473,14 @@ FinishSprite (void)
 	if (sprite.numframes == 0)
 		Sys_Error ("no frames\n");
 
-	if (!strlen(spriteoutname))
+	if (!spriteoutname->str)
 		Sys_Error ("Didn't name sprite file");
 
 	if ((plump - lumpbuffer) > MAX_BUFFER_SIZE)
 		Sys_Error ("Sprite package too big; increase MAX_BUFFER_SIZE");
 
-	spriteouthandle = Qopen (spriteoutname, "wb");
-	printf ("saving in %s\n", spriteoutname);
+	spriteouthandle = Qopen (spriteoutname->str, "wb");
+	printf ("saving in %s\n", spriteoutname->str);
 	WriteSprite (spriteouthandle);
 	Qclose (spriteouthandle);
 
@@ -487,7 +488,7 @@ FinishSprite (void)
 	printf ("%d frame(s)\n", sprite.numframes);
 	printf ("%d ungrouped frame(s), including group headers\n", framecount);
 
-	spriteoutname[0] = 0;		// clear for a new sprite
+	dstring_clearstr (spriteoutname);		// clear for a new sprite
 }
 
 /*
@@ -505,6 +506,9 @@ int main (int argc, char **argv)
 	if (argc != 2)
 		Sys_Error ("usage: spritegen file.qc");
 
+	spritedir = dstring_newstr ();
+	spriteoutname = dstring_newstr ();
+
 	i = 1;
 
 	//SetQdirFromPath (argv[i]);

From 027e76b4c9fbc486f31d29c81be5842d52a21856 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 20 Aug 2018 00:09:20 +0900
Subject: [PATCH 0126/1519] Add a doc block to parse_cpp_line.

It took me too long to figure it out :P
---
 tools/qfcc/source/qfcc.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tools/qfcc/source/qfcc.c b/tools/qfcc/source/qfcc.c
index fdf455b5d..e53cdc077 100644
--- a/tools/qfcc/source/qfcc.c
+++ b/tools/qfcc/source/qfcc.c
@@ -589,6 +589,14 @@ load_file (const char *fname)
 	return src;
 }
 
+/**	Parse a cpp line number directive.
+
+	Parses a cpp line directive of the form "# 1 file", setting the line and
+	file fields of \a script. "#line 1 file" is supported, too.
+
+	\param script		the script being parsed
+	\param filename		storage for the parsed filename
+*/
 static void
 parse_cpp_line (script_t *script, dstring_t *filename)
 {

From 5dbb7b6d4de6c93385da545a8b2150b16bc2d6f1 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 20 Aug 2018 00:11:02 +0900
Subject: [PATCH 0127/1519] Handle all modelgen commands.

Just in case someone ever adds models.qc to progs.src.
---
 tools/qfcc/source/grab.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/tools/qfcc/source/grab.c b/tools/qfcc/source/grab.c
index 03edaa41a..520c40492 100644
--- a/tools/qfcc/source/grab.c
+++ b/tools/qfcc/source/grab.c
@@ -69,12 +69,17 @@ static frame_t *frame_list;
 static frame_t **frame_tail = &frame_list;
 
 static frame_t grab_list[] = {
-	{0, "cd",		0},
-	{0, "origin",	0},
-	{0, "base",		0},
-	{0, "flags",	0},
-	{0, "scale",	0},
-	{0, "skin",		0},
+	{0, "modelname",		0},
+	{0, "base",				0},
+	{0, "cd",				0},
+	{0, "sync",				0},
+	{0, "origin",			0},
+	{0, "eyeposition",		0},
+	{0, "scale",			0},
+	{0, "flags",			0},
+	{0, "skin",				0},
+	{0, "framegroupstart",	0},
+	{0, "skingroupstart",	0},
 };
 
 static const char *

From fbdf560a7aebba62c82d0ee1cabf458fb32ab0b6 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 21 Aug 2018 15:55:11 +0900
Subject: [PATCH 0128/1519] Rename print_extra_live to print_flow_vars.

---
 tools/qfcc/source/dot_flow.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tools/qfcc/source/dot_flow.c b/tools/qfcc/source/dot_flow.c
index 7c8357611..96dc33cb5 100644
--- a/tools/qfcc/source/dot_flow.c
+++ b/tools/qfcc/source/dot_flow.c
@@ -197,7 +197,7 @@ print_flow_node_live (dstring_t *dstr, flowgraph_t *graph, flownode_t *node,
 }
 
 static void
-print_extra_live (dstring_t *dstr, flowgraph_t *graph, int level)
+print_flow_vars (dstring_t *dstr, flowgraph_t *graph, int level)
 {
 	int         indent = level * 2 + 2;
 	int         i;
@@ -208,8 +208,9 @@ print_extra_live (dstring_t *dstr, flowgraph_t *graph, int level)
 					 "cellspacing=\"0\">\n", indent + 2, "");
 	for (i = 0; i < graph->func->num_vars; i++) {
 		var = graph->func->vars[i];
-		dasprintf (dstr, "%*s<tr><td>(%d) %s</td></tr>\n", indent + 4, "",
-				   var->number, html_string(operand_string (var->op)));
+		dasprintf (dstr, "%*s<tr><td>(%d) %s %s</td></tr>\n", indent + 4, "",
+				   var->number, html_string(operand_string (var->op)),
+				   set_as_string (var->define));
 	}
 	dasprintf (dstr, "%*s</table>>];\n", indent + 2, "");
 }
@@ -299,7 +300,7 @@ print_flow_edge_statements (dstring_t *dstr, flowgraph_t *graph,
 static flow_dot_t flow_dot_methods[] = {
 	{"",			print_flow_node,			print_flow_edge},
 	{"dag",			print_flow_node_dag,		print_flow_edge_dag},
-	{"live",		print_flow_node_live, print_flow_edge, print_extra_live},
+	{"live",		print_flow_node_live, print_flow_edge, print_flow_vars},
 	{"reaching",	print_flow_node_reaching,	print_flow_edge},
 	{"statements",	print_flow_node_statements,	print_flow_edge_statements},
 };

From 5ba13d759b5100db332df16374e5fdd3900da916 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 21 Aug 2018 15:56:03 +0900
Subject: [PATCH 0129/1519] Fix a FIXME.

Set of everything got added shortly after that FIXME was added, but I
forgot to fix it.
---
 tools/qfcc/source/flow.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/qfcc/source/flow.c b/tools/qfcc/source/flow.c
index c611fd0a8..39fd7f862 100644
--- a/tools/qfcc/source/flow.c
+++ b/tools/qfcc/source/flow.c
@@ -838,7 +838,7 @@ flow_analyze_statement (statement_t *s, set_t *use, set_t *def, set_t *kill,
 					flow_add_op_var (use, s->opc);
 			}
 			if (kill) {
-				//FIXME set of everything
+				set_everything (kill);
 			}
 			if (operands) {
 				if (!strcmp (s->opcode, "<MOVE>"))

From 1b84ea747c79b6d7c873d26103035cff1d62bd52 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 21 Aug 2018 15:56:39 +0900
Subject: [PATCH 0130/1519] Dump statements during flow analysis.

---
 tools/qfcc/include/options.h | 1 +
 tools/qfcc/source/flow.c     | 2 ++
 tools/qfcc/source/options.c  | 3 +++
 3 files changed, 6 insertions(+)

diff --git a/tools/qfcc/include/options.h b/tools/qfcc/include/options.h
index 4377dab97..b66d9b19a 100644
--- a/tools/qfcc/include/options.h
+++ b/tools/qfcc/include/options.h
@@ -77,6 +77,7 @@ typedef struct {
 	qboolean    final;
 	qboolean    dags;
 	qboolean    expr;
+	qboolean    statements;
 	qboolean    reaching;
 	qboolean    live;
 	qboolean    flow;
diff --git a/tools/qfcc/source/flow.c b/tools/qfcc/source/flow.c
index 39fd7f862..45dcbf5c9 100644
--- a/tools/qfcc/source/flow.c
+++ b/tools/qfcc/source/flow.c
@@ -1262,6 +1262,8 @@ flow_data_flow (function_t *func)
 	flow_build_statements (func);
 	flow_build_vars (func);
 	graph = flow_build_graph (func);
+	if (options.block_dot.statements)
+		dump_dot ("statements", graph, dump_dot_flow_statements);
 	flow_reaching_defs (graph);
 	if (options.block_dot.reaching)
 		dump_dot ("reaching", graph, dump_dot_flow_reaching);
diff --git a/tools/qfcc/source/options.c b/tools/qfcc/source/options.c
index 4edb03623..a0e7f83a9 100644
--- a/tools/qfcc/source/options.c
+++ b/tools/qfcc/source/options.c
@@ -411,6 +411,8 @@ DecodeArgs (int argc, char **argv)
 							options.block_dot.flow = flag;
 						} else if (!(strcasecmp (temp, "reaching"))) {
 							options.block_dot.reaching = flag;
+						} else if (!(strcasecmp (temp, "statements"))) {
+							options.block_dot.statements = flag;
 						} else if (!(strcasecmp (temp, "live"))) {
 							options.block_dot.live = flag;
 						} else if (!(strcasecmp (temp, "post"))) {
@@ -428,6 +430,7 @@ DecodeArgs (int argc, char **argv)
 					options.block_dot.expr = true;
 					options.block_dot.flow = true;
 					options.block_dot.reaching = true;
+					options.block_dot.statements = true;
 					options.block_dot.live = true;
 					options.block_dot.post = true;
 				}

From 0f279cd3f0b9f69a91040f04672f28395c3c6df9 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 21 Aug 2018 15:57:51 +0900
Subject: [PATCH 0131/1519] Add a comment about fake statement numbers.

I had forgotten how they worked (not surprising after 6 years).
---
 tools/qfcc/source/flow.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/tools/qfcc/source/flow.c b/tools/qfcc/source/flow.c
index 45dcbf5c9..2b45708cc 100644
--- a/tools/qfcc/source/flow.c
+++ b/tools/qfcc/source/flow.c
@@ -377,6 +377,17 @@ flow_build_vars (function_t *func)
 			set_add (func->global_vars, i);
 	}
 	// create dummy defs for local vars
+	// defined local vars add their address in local space to the number of
+	// statements in the function:
+	//     ([num_statements ... num_statements+localsize])
+	// with a set element for each def used in the local space
+	//
+	// temporary vars add their var number to the size of the local space
+	// before adding the number of statements in the function:
+	//     ([num_statements+localsize ... num_vars])
+	// temporary vars are always accessed as a full var, so only one set
+	// element per temporary var is needed. This can lead to holes in the
+	// temporary var set element space, but it does keep things simple
 	for (i = 0; i < func->num_vars; i++) {
 		int         offset, size;
 		int         j;

From f2500650033e2c0aa94d9d3ff517037db481cda3 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 21 Aug 2018 16:27:22 +0900
Subject: [PATCH 0132/1519] Add tests for swapping vars and triangle area.

Triangle area was meant just to check Kahan's equation, but it found a
problem with swapping vars. swap.r currently fails.
---
 tools/qfcc/test/Makefile.am | 18 +++++++++++++++++-
 tools/qfcc/test/build-run   |  2 +-
 tools/qfcc/test/swap.r      | 15 +++++++++++++++
 tools/qfcc/test/triangle.r  | 32 ++++++++++++++++++++++++++++++++
 4 files changed, 65 insertions(+), 2 deletions(-)
 create mode 100644 tools/qfcc/test/swap.r
 create mode 100644 tools/qfcc/test/triangle.r

diff --git a/tools/qfcc/test/Makefile.am b/tools/qfcc/test/Makefile.am
index c4302f32f..f177d5b9b 100644
--- a/tools/qfcc/test/Makefile.am
+++ b/tools/qfcc/test/Makefile.am
@@ -32,6 +32,8 @@ test_progs_dat=\
 	state.dat \
 	structlive.dat \
 	structptr.dat \
+	swap.dat \
+	triangle.dat \
 	vecinit.dat \
 	while.dat \
 	voidfor.dat
@@ -139,6 +141,20 @@ structptr.dat$(EXEEXT): $(structptr_obj) $(QFCC_DEP)
 structptr.run: Makefile build-run
 	$(srcdir)/build-run $@
 
+swap_dat_SOURCES=swap.r
+swap_obj=$(swap_dat_SOURCES:.r=.qfo)
+swap.dat$(EXEEXT): $(swap_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(swap_obj)
+swap.run: Makefile build-run
+	$(srcdir)/build-run $@
+
+triangle_dat_SOURCES=triangle.r
+triangle_obj=$(triangle_dat_SOURCES:.r=.qfo)
+triangle.dat$(EXEEXT): $(triangle_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(triangle_obj)
+triangle.run: Makefile build-run
+	$(srcdir)/build-run $@ 1 2 3
+
 vecinit_dat_SOURCES=vecinit.r
 vecinit_obj=$(vecinit_dat_SOURCES:.r=.qfo)
 vecinit.dat$(EXEEXT): $(vecinit_obj) $(QFCC_DEP)
@@ -163,4 +179,4 @@ voidfor.run: Makefile build-run
 include ./$(DEPDIR)/*.Qo
 
 EXTRA_DIST= test-bi.h build-run
-CLEANFILES= *.dat *.sym *.qfo *.run
+CLEANFILES= *.dat *.sym *.qfo *.run *.frame
diff --git a/tools/qfcc/test/build-run b/tools/qfcc/test/build-run
index ddee2ee77..577355a80 100755
--- a/tools/qfcc/test/build-run
+++ b/tools/qfcc/test/build-run
@@ -6,6 +6,6 @@ shift
 
 cat > $script <<EOF
 #! /bin/sh
-./test-harness $TEST_HARNESS_OPTS $progs "\$@"
+./test-harness $TEST_HARNESS_OPTS $progs $@
 EOF
 chmod +x $script
diff --git a/tools/qfcc/test/swap.r b/tools/qfcc/test/swap.r
new file mode 100644
index 000000000..8a338be15
--- /dev/null
+++ b/tools/qfcc/test/swap.r
@@ -0,0 +1,15 @@
+void printf (string fmt, ...) = #0;
+
+float
+swap (float a, float b)
+{
+	float t;
+	if (a < b) { t = a; a = b; b = t; }
+	return a - b;
+}
+
+int
+main ()
+{
+	return swap (1, 2) > 0 ? 0 : 1;
+}
diff --git a/tools/qfcc/test/triangle.r b/tools/qfcc/test/triangle.r
new file mode 100644
index 000000000..d2bf03d4b
--- /dev/null
+++ b/tools/qfcc/test/triangle.r
@@ -0,0 +1,32 @@
+void printf (string fmt, ...) = #0;
+float (string s) stof = #0;
+float (float x) sqrt = #0;
+
+float
+heron (float a, float b, float c)
+{
+	float s = (a + b + c) / 2;
+	return sqrt (s*(s-a)*(s-b)*(s-c));
+}
+
+float
+kahan (float a, float b, float c)
+{
+	float t;
+	if (a < b) { t = a; a = b; b = t; }
+	if (b < c) { t = b; b = c; c = t; }
+	if (a < b) { t = a; a = b; b = t; }
+	printf ("%f %f %f\n", a, b, c);
+	return sqrt ((a+(b+c))*(c-(a-b))*(c+(a-b))*(a+(b-c)))/4;
+}
+
+int
+main (int argc, string *argv)
+{
+	float a = stof(argv[1]);
+	float b = stof(argv[2]);
+	float c = stof(argv[3]);
+	printf ("%.9g %.9g %.9g\n", a, b, c);
+	printf ("%.9g %.9g\n", heron (a, b, c), kahan (a, b, c));
+	return 0;
+}

From 8b8b42bde274a91c984d8586d72645f434bf01fe Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 23 Aug 2018 20:04:51 +0900
Subject: [PATCH 0133/1519] Fix a typo in a comment.

---
 tools/qfcc/include/dags.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/qfcc/include/dags.h b/tools/qfcc/include/dags.h
index 21ac8c943..7b624ea2e 100644
--- a/tools/qfcc/include/dags.h
+++ b/tools/qfcc/include/dags.h
@@ -60,7 +60,7 @@ typedef struct dagnode_s {
 	struct set_s *parents;		///< empty if root node
 	int         cost;			///< cost of this node in temp vars
 	unsigned    killed:1;		///< node is unavailable for cse
-	st_type_t   type;			///< type of node (st_node = leaf)
+	st_type_t   type;			///< type of node (st_none = leaf)
 	daglabel_t *label;			///< ident/const if leaf node, or operator
 	etype_t     tl;
 	struct operand_s *value;	///< operand holding the value of this node

From cdbdf3f0eb7880be0c0f5dd9689bca3e8d4928a5 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 23 Aug 2018 20:05:16 +0900
Subject: [PATCH 0134/1519] Make print_operand global.

---
 tools/qfcc/include/statements.h | 1 +
 tools/qfcc/source/statements.c  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/qfcc/include/statements.h b/tools/qfcc/include/statements.h
index 75be49d79..565cc9295 100644
--- a/tools/qfcc/include/statements.h
+++ b/tools/qfcc/include/statements.h
@@ -133,6 +133,7 @@ void sblock_add_statement (sblock_t *sblock, statement_t *statement);
 sblock_t *make_statements (struct expr_s *expr);
 void statements_count_temps (sblock_t *sblock);
 
+void print_operand (operand_t *op);
 void print_statement (statement_t *s);
 void dump_dot_sblock (void *data, const char *fname);
 void dot_sblock (struct dstring_s *dstr, sblock_t *sblock, int blockno);
diff --git a/tools/qfcc/source/statements.c b/tools/qfcc/source/statements.c
index f331a39f0..7c0fb693f 100644
--- a/tools/qfcc/source/statements.c
+++ b/tools/qfcc/source/statements.c
@@ -144,7 +144,7 @@ operand_string (operand_t *op)
 	return ("??");
 }
 
-static void
+void
 print_operand (operand_t *op)
 {
 	switch (op->op_type) {

From cb366dd825a1db3dedd47115882b8fd62af80e75 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 23 Aug 2018 20:07:11 +0900
Subject: [PATCH 0135/1519] Better flow dot dump "scripting".

Not sure I want to keep the statements in the live dump, but the system
is more flexible now.
---
 tools/qfcc/source/dot_flow.c | 82 +++++++++++++++++++++++-------------
 1 file changed, 52 insertions(+), 30 deletions(-)

diff --git a/tools/qfcc/source/dot_flow.c b/tools/qfcc/source/dot_flow.c
index 96dc33cb5..d702f7b9e 100644
--- a/tools/qfcc/source/dot_flow.c
+++ b/tools/qfcc/source/dot_flow.c
@@ -51,11 +51,15 @@
 #include "statements.h"
 #include "strpool.h"
 
+typedef struct {
+	void (*node) (dstring_t *, flowgraph_t *, flownode_t *, int);
+	void (*edge) (dstring_t *, flowgraph_t *, flowedge_t *, int);
+	void (*extra) (dstring_t *, flowgraph_t *, int);
+} flow_print_t;
+
 typedef struct {
 	const char *type;
-	void (*print_node) (dstring_t *, flowgraph_t *, flownode_t *, int);
-	void (*print_edge) (dstring_t *, flowgraph_t *, flowedge_t *, int);
-	void (*print_extra) (dstring_t *, flowgraph_t *, int);
+	flow_print_t *print;
 } flow_dot_t;
 
 static void
@@ -177,23 +181,17 @@ print_flow_node_live (dstring_t *dstr, flowgraph_t *graph, flownode_t *node,
 					  int level)
 {
 	int         indent = level * 2 + 2;
-	int         live;
 	set_t      *use = node->live_vars.use;
 	set_t      *def = node->live_vars.def;
 	set_t      *in = node->live_vars.in;
 	set_t      *out = node->live_vars.out;
 
-	live = node->live_vars.out && !set_is_empty (node->live_vars.out);
-
-	if (live) {
-		dasprintf (dstr, "%*sfn_%p [label=\"", indent, "", node);
-		dasprintf (dstr, "use: %s\\n", set_as_string (use));
-		dasprintf (dstr, "def: %s\\n", set_as_string (def));
-		dasprintf (dstr, "in: %s\\n", set_as_string (in));
-		dasprintf (dstr, "out: %s\"];\n", set_as_string (out));
-	} else {
-		print_flow_node (dstr, graph, node, level);
-	}
+	dasprintf (dstr, "%*sfn_%p [label=\"", indent, "", node);
+	dasprintf (dstr, "use: %s\\n", set_as_string (use));
+	dasprintf (dstr, "def: %s\\n", set_as_string (def));
+	dasprintf (dstr, "in: %s\\n", set_as_string (in));
+	dasprintf (dstr, "out: %s", set_as_string (out));
+	dasprintf (dstr, "\"];\n");
 }
 
 static void
@@ -297,12 +295,34 @@ print_flow_edge_statements (dstring_t *dstr, flowgraph_t *graph,
 	dasprintf (dstr, "];\n");
 }
 
+static flow_print_t null_print[] = {
+	{	print_flow_node,	print_flow_edge },
+	{ 0 }
+};
+static flow_print_t dag_print[] = {
+	{	print_flow_node_dag,	print_flow_edge_dag},
+	{ 0 }
+};
+static flow_print_t live_print[] = {
+	{	print_flow_node_live,	print_flow_edge, 	print_flow_vars},
+	{	print_flow_node_statements,	print_flow_edge_statements},
+	{ 0 }
+};
+static flow_print_t reaching_print[] = {
+	{	print_flow_node_reaching,	print_flow_edge},
+	{ 0 }
+};
+static flow_print_t statements_print[] = {
+	{	print_flow_node_statements,	print_flow_edge_statements},
+	{ 0 }
+};
+
 static flow_dot_t flow_dot_methods[] = {
-	{"",			print_flow_node,			print_flow_edge},
-	{"dag",			print_flow_node_dag,		print_flow_edge_dag},
-	{"live",		print_flow_node_live, print_flow_edge, print_flow_vars},
-	{"reaching",	print_flow_node_reaching,	print_flow_edge},
-	{"statements",	print_flow_node_statements,	print_flow_edge_statements},
+	{"",			null_print},
+	{"dag",			dag_print},
+	{"live",		live_print},
+	{"reaching",	reaching_print},
+	{"statements",	statements_print},
 };
 
 static void
@@ -316,17 +336,19 @@ print_flowgraph (flow_dot_t *method, flowgraph_t *graph, const char *filename)
 	dasprintf (dstr, "  clusterrank=local;\n");
 	dasprintf (dstr, "  rankdir=TB;\n");
 	dasprintf (dstr, "  compound=true;\n");
-	for (i = 0; i < graph->num_nodes; i++) {
-		method->print_node (dstr, graph, graph->nodes[i], 0);
+	for (flow_print_t *print = method->print; print->node; print++) {
+		for (i = 0; i < graph->num_nodes; i++) {
+			print->node (dstr, graph, graph->nodes[i], 0);
+		}
+		for (i = 0; i < graph->num_edges; i++) {
+			if ((int) graph->edges[i].head >= graph->num_nodes
+				|| (int) graph->edges[i].tail >= graph->num_nodes)
+				continue;		// dummy node
+			print->edge (dstr, graph, &graph->edges[i], 0);
+		}
+		if (print->extra)
+			print->extra (dstr, graph, 0);
 	}
-	for (i = 0; i < graph->num_edges; i++) {
-		if ((int) graph->edges[i].head >= graph->num_nodes
-			|| (int) graph->edges[i].tail >= graph->num_nodes)
-			continue;		// dummy node
-		method->print_edge (dstr, graph, &graph->edges[i], 0);
-	}
-	if (method->print_extra)
-		method->print_extra (dstr, graph, 0);
 	dasprintf (dstr, "}\n");
 
 	if (filename) {

From 2fcda44ab081ec4425d6f54923109bfd5131bd57 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 23 Aug 2018 20:07:22 +0900
Subject: [PATCH 0136/1519] Kill dag leaf nodes on assignment.

Fixes the failing swap test caused by a's original value being used (via t)
after being written.
---
 tools/qfcc/source/dags.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tools/qfcc/source/dags.c b/tools/qfcc/source/dags.c
index 95c99d10a..5daf3060e 100644
--- a/tools/qfcc/source/dags.c
+++ b/tools/qfcc/source/dags.c
@@ -475,6 +475,11 @@ dagnode_attach_label (dagnode_t *n, daglabel_t *l)
 		internal_error (0, "attempt to attach non-identifer label to dagnode "
 						"identifiers");
 	if (l->dagnode) {
+		// if the node is a leaf, then kill its value so no attempt is made
+		// to reuse it.
+		if (l->dagnode->type == st_none) {
+			l->dagnode->killed = 1;
+		}
 		dagnode_t  *node = l->dagnode;
 		set_union (n->edges, node->parents);
 		set_remove (n->edges, n->number);

From 1b9149ef31bee1aa1546bcb85d83a8b0322a3dc5 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 23 Aug 2018 20:22:29 +0900
Subject: [PATCH 0137/1519] Fix an argument passing error in test-harness.

It failed to pass the last argument to the ruamoko program being run.
---
 tools/qfcc/test/test-harness.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/qfcc/test/test-harness.c b/tools/qfcc/test/test-harness.c
index 87cd26c55..b364a7f0c 100644
--- a/tools/qfcc/test/test-harness.c
+++ b/tools/qfcc/test/test-harness.c
@@ -242,11 +242,11 @@ main (int argc, char **argv)
 
 	PR_PushFrame (&pr);
 	if (argc > 2)
-		pr_argc = argc - 1;
+		pr_argc = argc;
 	pr_argv = PR_Zone_Malloc (&pr, (pr_argc + 1) * 4);
 	pr_argv[0] = PR_SetTempString (&pr, name);
 	for (i = 1; i < pr_argc; i++)
-		pr_argv[i] = PR_SetTempString (&pr, argv[1 + i]);
+		pr_argv[i] = PR_SetTempString (&pr, argv[i]);
 	pr_argv[i] = 0;
 
 	if ((dfunc = PR_FindFunction (&pr, ".main"))

From b37b0180cb1171d2ca03a0518d1cb5e8178f0d20 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 23 Aug 2018 20:50:06 +0900
Subject: [PATCH 0138/1519] Actually do a test for triangle.r.

If the kahan triangle area method breaks, I did something wrong with qfcc's
handling of parentheses (ie, floating point math is not truly associative).
---
 tools/qfcc/test/Makefile.am |  2 +-
 tools/qfcc/test/triangle.r  | 17 +++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/tools/qfcc/test/Makefile.am b/tools/qfcc/test/Makefile.am
index f177d5b9b..9bb48d112 100644
--- a/tools/qfcc/test/Makefile.am
+++ b/tools/qfcc/test/Makefile.am
@@ -153,7 +153,7 @@ triangle_obj=$(triangle_dat_SOURCES:.r=.qfo)
 triangle.dat$(EXEEXT): $(triangle_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(triangle_obj)
 triangle.run: Makefile build-run
-	$(srcdir)/build-run $@ 1 2 3
+	$(srcdir)/build-run $@ 100000 100000 1.00005 50002.4961
 
 vecinit_dat_SOURCES=vecinit.r
 vecinit_obj=$(vecinit_dat_SOURCES:.r=.qfo)
diff --git a/tools/qfcc/test/triangle.r b/tools/qfcc/test/triangle.r
index d2bf03d4b..6ef592ace 100644
--- a/tools/qfcc/test/triangle.r
+++ b/tools/qfcc/test/triangle.r
@@ -16,17 +16,18 @@ kahan (float a, float b, float c)
 	if (a < b) { t = a; a = b; b = t; }
 	if (b < c) { t = b; b = c; c = t; }
 	if (a < b) { t = a; a = b; b = t; }
-	printf ("%f %f %f\n", a, b, c);
-	return sqrt ((a+(b+c))*(c-(a-b))*(c+(a-b))*(a+(b-c)))/4;
+	return sqrt ((a + (b + c))*(c - (a - b))*(c + (a - b))*(a + (b - c)))/4;
 }
 
 int
 main (int argc, string *argv)
 {
-	float a = stof(argv[1]);
-	float b = stof(argv[2]);
-	float c = stof(argv[3]);
-	printf ("%.9g %.9g %.9g\n", a, b, c);
-	printf ("%.9g %.9g\n", heron (a, b, c), kahan (a, b, c));
-	return 0;
+	float a = stof (argv[1]);
+	float b = stof (argv[2]);
+	float c = stof (argv[3]);
+	float expt = stof (argv[4]);
+	float h = heron (a, b, c);
+	float k = kahan (a, b, c);
+	printf ("%.9g %.9g %d\n", h, k, k == expt);
+	return k != expt;
 }

From 89daf15215586be13983ce3c3bb0f462668e59f6 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 26 Aug 2018 15:05:13 +0900
Subject: [PATCH 0139/1519] Fix a c&p error in a doc comment.

---
 include/QF/vrect.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/QF/vrect.h b/include/QF/vrect.h
index 4c0cba107..bb0f99061 100644
--- a/include/QF/vrect.h
+++ b/include/QF/vrect.h
@@ -100,7 +100,7 @@ vrect_t *VRect_Intersect (const vrect_t *r1, const vrect_t *r2);
 vrect_t *VRect_HSplit (const vrect_t *r, int y);
 
 /** Return two rectangles representing the portions of \a r to the left and
-	right of \a y.
+	right of \a x.
 
 	One of the returned rectangles may be empty. Use VRect_IsEmpty to check.
 	The first rectangle represents the portion of \a r that is to the left of
@@ -111,7 +111,7 @@ vrect_t *VRect_HSplit (const vrect_t *r, int y);
 	\param r		The rectangle to split.
 	\param x		The vertical line by which \a r will be split.
 	\return			The two linked rectangles representing the portions to the
-					left and right of \a y. The returned pointer points to the
+					left and right of \a x. The returned pointer points to the
 					first (left) rectangle, which links to the second (right)
 					rectangle.
 	\note	It is the caller's responsibility to delete the returned

From 575a67b2a142b3f280805815ecd3b9f7fbcbee28 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 26 Aug 2018 15:06:08 +0900
Subject: [PATCH 0140/1519] mat4 test case fixes.

The tests cases themselves were buggy.
---
 libs/util/test/test-mat4.c | 32 ++++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/libs/util/test/test-mat4.c b/libs/util/test/test-mat4.c
index 623444a0d..1bd7afcc9 100644
--- a/libs/util/test/test-mat4.c
+++ b/libs/util/test/test-mat4.c
@@ -58,8 +58,8 @@ static vec3_t test_scales[] = {
 	{ 3, 1, 2},
 	{ 3, 2, 1},
 };
-#define num_translation_tests \
-	(sizeof (test_translations) / sizeof (test_translations[0]))
+#define num_scale_tests \
+	(sizeof (test_scales) / sizeof (test_scales[0]))
 
 // return true if a and b are close enough (yay, floats)
 static int
@@ -143,7 +143,8 @@ test_transform2 (const vec3_t angles, const vec3_t scale,
 	vec3_t      x, y;
 	quat_t      rotation;
 	mat4_t      mat;
-	vec3_t      rot, sc, sh, tr;
+	quat_t      rot;
+	vec3_t      sc, sh, tr;
 
 	VectorCopy (v, x);
 	AngleQuat (angles, rotation);
@@ -171,6 +172,9 @@ fail:
 			VectorExpand (translation), VectorExpand (v));
 	printf ("  (%g %g %g)\n", VectorExpand (x));
 	printf ("  (%g %g %g)\n", VectorExpand (y));
+	printf ("  (%g %g %g %g) (%g %g %g %g) (%g %g %g) (%g %g %g) (%g %g %g)\n",
+			QuatExpand (rotation), QuatExpand (rot), VectorExpand (sh),
+			VectorExpand (sc), VectorExpand (tr));
 	return 0;
 }
 
@@ -214,33 +218,41 @@ main (int argc, const char **argv)
 	size_t      i, j, k;
 
 	for (i = 0; i < num_angle_tests; i ++) {
-		if (!test_angle (test_angles[i]))
+		if (!test_angle (test_angles[i])) {
 			res = 1;
+			printf("angle test %zd failed\n", i);
+		}
 	}
 	for (i = 0; i < num_angle_tests; i ++) {
-		for (j = 0; j < num_translation_tests; j ++) {
+		for (j = 0; j < num_scale_tests; j ++) {
 			for (k = 0; k < num_translation_tests; k ++) {
 				if (!test_transform (test_angles[i], test_scales[j],
-									 test_translations[k]))
+									 test_translations[k])) {
 					res = 1;
+					printf("transform test %zd:%zd:%zd failed\n", i, j, k);
+				}
 			}
 		}
 	}
 	for (i = 0; i < num_angle_tests; i ++) {
-		for (j = 0; j < num_translation_tests; j ++) {
+		for (j = 0; j < num_scale_tests; j ++) {
 			for (k = 0; k < num_translation_tests; k ++) {
 				if (!test_transform2 (test_angles[i], test_scales[j],
-									  test_translations[k]))
+									  test_translations[k])) {
 					res = 1;
+					printf("transform2 test %zd:%zd:%zd failed\n", i, j, k);
+				}
 			}
 		}
 	}
 	for (i = 0; i < num_angle_tests; i ++) {
-		for (j = 0; j < num_translation_tests; j ++) {
+		for (j = 0; j < num_scale_tests; j ++) {
 			for (k = 0; k < num_translation_tests; k ++) {
 				if (!test_inverse (test_angles[i], test_scales[j],
-								   test_translations[k]))
+								   test_translations[k])) {
 					res = 1;
+					printf("inverse test %zd:%zd:%zd failed\n", i, j, k);
+				}
 			}
 		}
 	}

From 8fd5be0ee03bd68a36e8cc96118606099ba8ca3c Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 7 Sep 2018 20:00:57 +0900
Subject: [PATCH 0141/1519] Fix a pile of sizeof goofs.

While scan-build wasn't what I was looking for, it has proven useful
anyway: many of the sizeof errors were just noise, but a few were actual
bugs (allocating too much or too little memory).
---
 libs/console/filelist.c                    | 2 +-
 libs/gamecode/pr_debug.c                   | 2 +-
 libs/gib/gib_classes.c                     | 2 +-
 libs/gib/gib_vars.c                        | 2 +-
 libs/models/iqm/sw_model_iqm.c             | 2 +-
 libs/util/qargs.c                          | 2 +-
 libs/util/riff.c                           | 2 +-
 libs/video/renderer/sw32/vid_common_sw32.c | 4 ++--
 nq/source/cl_tent.c                        | 2 +-
 qtv/source/server.c                        | 2 +-
 qw/source/cl_tent.c                        | 2 +-
 tools/qfcc/source/class.c                  | 2 +-
 tools/qfcc/source/cpp.c                    | 2 +-
 tools/qfcc/source/flow.c                   | 2 +-
 tools/qfcc/source/switch.c                 | 2 +-
 15 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/libs/console/filelist.c b/libs/console/filelist.c
index 73595de82..dd979743a 100644
--- a/libs/console/filelist.c
+++ b/libs/console/filelist.c
@@ -102,7 +102,7 @@ filelist_print (filelist_t *filelist)
 	if (filelist->count) {
 		qsort (filelist->list, filelist->count, sizeof (char *), filelist_cmp);
 
-		list = malloc ((filelist->count + 1) * sizeof (char **));
+		list = malloc ((filelist->count + 1) * sizeof (char *));
 		list[filelist->count] = 0;
 		for (i = 0; i < filelist->count; i++)
 			list[i] = filelist->list[i];
diff --git a/libs/gamecode/pr_debug.c b/libs/gamecode/pr_debug.c
index 602a2cc15..9f5cdc818 100644
--- a/libs/gamecode/pr_debug.c
+++ b/libs/gamecode/pr_debug.c
@@ -108,7 +108,7 @@ source_path_f (cvar_t *var)
 	for (i = 2, s = source_path_string; *s; s++)
 		if (*s == ';')
 			i++;
-	source_paths = malloc (i * sizeof (char **));
+	source_paths = malloc (i * sizeof (char *));
 	source_paths[0] = source_path_string;
 	for (i = 1, s = source_path_string; *s; s++)
 		if (*s == ';') {
diff --git a/libs/gib/gib_classes.c b/libs/gib/gib_classes.c
index 749e7ff07..8258e7882 100644
--- a/libs/gib/gib_classes.c
+++ b/libs/gib/gib_classes.c
@@ -445,7 +445,7 @@ ObjectHash_Get_f (gib_object_t *obj, gib_method_t *method, void *data,
 	if ((refs = (ObjRef_t **) Hash_FindList (objh->objects,
 					mesg.argv[1]))) {
 		for (r = refs, len = 0; *r; r++, len++);
-		reply = malloc (sizeof (char **) * len);
+		reply = malloc (sizeof (char *) * len);
 		for (r = refs, i = 0; *r; r++, i++)
 			reply[i] = (*r)->obj->handstr;
 		GIB_Reply (obj, mesg, len, reply);
diff --git a/libs/gib/gib_vars.c b/libs/gib/gib_vars.c
index d8a555673..e8b7f8a3a 100644
--- a/libs/gib/gib_vars.c
+++ b/libs/gib/gib_vars.c
@@ -51,7 +51,7 @@ GIB_Var_New (const char *key)
 {
 	gib_var_t  *new = calloc (1, sizeof (gib_var_t));
 
-	new->array = calloc (1, sizeof (dstring_t *));
+	new->array = calloc (1, sizeof (struct gib_varray_s));
 	new->key = strdup (key);
 	return new;
 }
diff --git a/libs/models/iqm/sw_model_iqm.c b/libs/models/iqm/sw_model_iqm.c
index 2a32ecca0..5b609ca75 100644
--- a/libs/models/iqm/sw_model_iqm.c
+++ b/libs/models/iqm/sw_model_iqm.c
@@ -153,7 +153,7 @@ sw_iqm_load_textures (iqm_t *iqm)
 	bytes = (iqm->num_verts + 7) / 8;
 	done_verts = alloca (bytes);
 	memset (done_verts, 0, bytes);
-	sw->skins = malloc (iqm->num_meshes * sizeof (tex_t));
+	sw->skins = malloc (iqm->num_meshes * sizeof (tex_t *));
 	for (i = 0; i < iqm->num_meshes; i++) {
 		for (j = 0; j < i; j++) {
 			if (iqm->meshes[j].material == iqm->meshes[i].material) {
diff --git a/libs/util/qargs.c b/libs/util/qargs.c
index 5ba36b842..36f23bb69 100644
--- a/libs/util/qargs.c
+++ b/libs/util/qargs.c
@@ -100,7 +100,7 @@ COM_InitArgv (int argc, const char **argv)
 	safe = false;
 
 	largv = (const char **) calloc (1, (argc + NUM_SAFE_ARGVS + 1) *
-									sizeof (const char **));
+									sizeof (const char *));
 
 	for (com_argc = 0, len = 0; com_argc < argc; com_argc++) {
 		largv[com_argc] = argv[com_argc];
diff --git a/libs/util/riff.c b/libs/util/riff.c
index ce3fb2e22..bd7320c96 100644
--- a/libs/util/riff.c
+++ b/libs/util/riff.c
@@ -161,7 +161,7 @@ read_adtl (dstring_t *list_buf, QFile *f, int len)
 				chunk = &label->ck;
 				break;
 			default:
-				data = malloc (sizeof (data));
+				data = malloc (sizeof (riff_data_t));
 				data->ck = ck;
 				data->data = read_data (f, ck.len);
 				chunk = &data->ck;
diff --git a/libs/video/renderer/sw32/vid_common_sw32.c b/libs/video/renderer/sw32/vid_common_sw32.c
index 279ee08d6..943fb2708 100644
--- a/libs/video/renderer/sw32/vid_common_sw32.c
+++ b/libs/video/renderer/sw32/vid_common_sw32.c
@@ -150,8 +150,8 @@ VID_MakeColormap16 (void *outcolormap, byte *pal)
 void
 VID_MakeColormaps (void)
 {
-	vid.colormap16 = malloc (256*VID_GRADES * sizeof (short));
-	vid.colormap32 = malloc (256*VID_GRADES * sizeof (int));
+	vid.colormap16 = malloc (256*VID_GRADES * sizeof (unsigned short));
+	vid.colormap32 = malloc (256*VID_GRADES * sizeof (unsigned int));
 	SYS_CHECKMEM (vid.colormap16 && vid.colormap32);
 	VID_MakeColormap16(vid.colormap16, vid.palette);
 	VID_MakeColormap32(vid.colormap32, vid.palette);
diff --git a/nq/source/cl_tent.c b/nq/source/cl_tent.c
index 11c5c9fde..8aa7dd2e7 100644
--- a/nq/source/cl_tent.c
+++ b/nq/source/cl_tent.c
@@ -177,7 +177,7 @@ new_tent_object (void)
 	if (!tent_objects) {
 		int         i;
 
-		tent_objects = malloc (TEMP_BATCH * sizeof (tent_t));
+		tent_objects = malloc (TEMP_BATCH * sizeof (tent_obj_t));
 		for (i = 0; i < TEMP_BATCH - 1; i++)
 			tent_objects[i].next = &tent_objects[i + 1];
 		tent_objects[i].next = 0;
diff --git a/qtv/source/server.c b/qtv/source/server.c
index 6375177a2..c664f36e4 100644
--- a/qtv/source/server.c
+++ b/qtv/source/server.c
@@ -493,7 +493,7 @@ sv_list_f (void)
 		qtv_printf ("no servers\n");
 		return;
 	}
-	list = malloc (count * sizeof (server_t **));
+	list = malloc (count * sizeof (server_t *));
 	for (l = &servers, count = 0; *l; l = &(*l)->next, count++)
 		list[count] = *l;
 	qsort (list, count, sizeof (*list), server_compare);
diff --git a/qw/source/cl_tent.c b/qw/source/cl_tent.c
index c401defa2..43e5930d0 100644
--- a/qw/source/cl_tent.c
+++ b/qw/source/cl_tent.c
@@ -181,7 +181,7 @@ new_tent_object (void)
 	if (!tent_objects) {
 		int         i;
 
-		tent_objects = malloc (TEMP_BATCH * sizeof (tent_t));
+		tent_objects = malloc (TEMP_BATCH * sizeof (tent_obj_t));
 		for (i = 0; i < TEMP_BATCH - 1; i++)
 			tent_objects[i].next = &tent_objects[i + 1];
 		tent_objects[i].next = 0;
diff --git a/tools/qfcc/source/class.c b/tools/qfcc/source/class.c
index a7898e5db..6edb3f7da 100644
--- a/tools/qfcc/source/class.c
+++ b/tools/qfcc/source/class.c
@@ -1397,7 +1397,7 @@ add_protocol (protocollist_t *protocollist, const char *name)
 	}
 	protocollist->count++;
 	protocollist->list = realloc (protocollist->list,
-								  sizeof (protocol_t) * protocollist->count);
+								  sizeof (protocol_t *) * protocollist->count);
 	protocollist->list[protocollist->count - 1] = protocol;
 	return protocollist;
 }
diff --git a/tools/qfcc/source/cpp.c b/tools/qfcc/source/cpp.c
index cfc5de81d..e1c3fb8ce 100644
--- a/tools/qfcc/source/cpp.c
+++ b/tools/qfcc/source/cpp.c
@@ -121,7 +121,7 @@ build_cpp_args (const char *in_name, const char *out_name)
 
 	if (cpp_argv)
 		free (cpp_argv);
-	cpp_argv = (const char **)malloc ((cpp_argc + 1) * sizeof (char**));
+	cpp_argv = (const char **)malloc ((cpp_argc + 1) * sizeof (char *));
 	for (arg = cpp_argv, cpp_arg = cpp_arg_list;
 		 cpp_arg;
 		 cpp_arg = cpp_arg->next) {
diff --git a/tools/qfcc/source/flow.c b/tools/qfcc/source/flow.c
index 2b45708cc..b23fb1bb0 100644
--- a/tools/qfcc/source/flow.c
+++ b/tools/qfcc/source/flow.c
@@ -343,7 +343,7 @@ flow_build_vars (function_t *func)
 	if (!num_vars)
 		return;
 
-	func->vars = malloc (num_vars * sizeof (daglabel_t *));
+	func->vars = malloc (num_vars * sizeof (flowvar_t *));
 
 	stuse = set_new ();
 	stdef = set_new ();
diff --git a/tools/qfcc/source/switch.c b/tools/qfcc/source/switch.c
index 80321a9ab..718e1ea04 100644
--- a/tools/qfcc/source/switch.c
+++ b/tools/qfcc/source/switch.c
@@ -213,7 +213,7 @@ new_case_node (expr_t *low, expr_t *high)
 		if (!is_integer_val (low))
 			internal_error (low, "switch");
 		size = expr_integer (high) - expr_integer (low) + 1;
-		node->labels = calloc (size, sizeof (case_node_t *));
+		node->labels = calloc (size, sizeof (expr_t *));
 	}
 	node->left = node->right = 0;
 	return node;

From 8f028b8a0da6632a6756b154046bd95e57472f1c Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 7 Sep 2018 20:03:19 +0900
Subject: [PATCH 0142/1519] Fix some double frees.

---
 libs/ruamoko/rua_file.c      | 1 +
 tools/qfcc/source/obj_file.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/libs/ruamoko/rua_file.c b/libs/ruamoko/rua_file.c
index 95d21682c..61def0a3f 100644
--- a/libs/ruamoko/rua_file.c
+++ b/libs/ruamoko/rua_file.c
@@ -166,6 +166,7 @@ bi_File_Open (progs_t *pr)
 	if ((R_INT (pr) = QFile_AllocHandle (pr, file)))
 		return;
 	Qclose (file);
+	return;
 error:
 	free (path);
 	R_INT (pr) = 0;
diff --git a/tools/qfcc/source/obj_file.c b/tools/qfcc/source/obj_file.c
index 1c81381f1..b39bea1e7 100644
--- a/tools/qfcc/source/obj_file.c
+++ b/tools/qfcc/source/obj_file.c
@@ -607,7 +607,7 @@ qfo_delete (qfo_t *qfo)
 	} else {
 		int         i;
 		for (i = 0; i < qfo->num_spaces; i++)
-			free (qfo->spaces->d.data);
+			free (qfo->spaces[i].d.data);
 		free (qfo->relocs);
 		free (qfo->defs);
 		free (qfo->funcs);

From 1eb1622420df70485743448336a07d84365e0a8d Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 7 Sep 2018 21:27:34 +0900
Subject: [PATCH 0143/1519] Fix some strncat issues.

---
 libs/video/targets/keys.c | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/libs/video/targets/keys.c b/libs/video/targets/keys.c
index ecf3aa4ce..5538f07cb 100644
--- a/libs/video/targets/keys.c
+++ b/libs/video/targets/keys.c
@@ -850,7 +850,7 @@ Key_In_Bind_f (void)
 {
 	int         c, i;
 	const char *imt, *key, *cmd = 0;
-	char        cmd_buf[1024];
+	dstring_t  *cmd_buf = 0;
 
 	c = Cmd_Argc ();
 
@@ -865,17 +865,17 @@ Key_In_Bind_f (void)
 	key = Cmd_Argv (2);
 
 	if (c >= 4) {
-		cmd = cmd_buf;
-		cmd_buf[0] = 0;
+		cmd_buf = dstring_newstr ();
 		for (i = 3; i < c; i++) {
-			strncat (cmd_buf, Cmd_Argv (i), sizeof (cmd_buf) -
-					 strlen (cmd_buf));
-			if (i != (c - 1))
-				strncat (cmd_buf, " ", sizeof (cmd_buf) - strlen (cmd_buf));
+			dasprintf (cmd_buf, "%s%s", i > 3 ? " " : "", Cmd_Argv (i));
 		}
+		cmd = cmd_buf->str;
 	}
 
 	Key_In_Bind (imt, key, cmd);
+	if (cmd_buf) {
+		dstring_delete (cmd_buf);
+	}
 }
 
 static void
@@ -896,7 +896,7 @@ Key_Bind_f (void)
 {
 	int         c, i;
 	const char *key, *cmd = 0;
-	char        cmd_buf[1024];
+	dstring_t  *cmd_buf = 0;
 
 	c = Cmd_Argc ();
 
@@ -908,17 +908,17 @@ Key_Bind_f (void)
 	key = OK_TranslateKeyName (Cmd_Argv (1));
 
 	if (c >= 3) {
-		cmd = cmd_buf;
-		cmd_buf[0] = 0;
+		cmd_buf = dstring_newstr ();
 		for (i = 2; i < c; i++) {
-			strncat (cmd_buf, Cmd_Argv (i), sizeof (cmd_buf) -
-					 strlen (cmd_buf));
-			if (i != (c - 1))
-				strncat (cmd_buf, " ", sizeof (cmd_buf) - strlen (cmd_buf));
+			dasprintf (cmd_buf, "%s%s", i > 2 ? " " : "", Cmd_Argv (i));
 		}
+		cmd = cmd_buf->str;
 	}
 
 	Key_In_Bind ("imt_mod", key, cmd);
+	if (cmd_buf) {
+		dstring_delete (cmd_buf);
+	}
 }
 
 static void

From f75ff2d269269b2696f56d67cdb141c1ea693679 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 7 Sep 2018 22:30:44 +0900
Subject: [PATCH 0144/1519] Fix some null argument issues.

---
 libs/util/qargs.c       | 2 +-
 tools/qfcc/source/cpp.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/libs/util/qargs.c b/libs/util/qargs.c
index 36f23bb69..7f385e5a1 100644
--- a/libs/util/qargs.c
+++ b/libs/util/qargs.c
@@ -106,7 +106,7 @@ COM_InitArgv (int argc, const char **argv)
 		largv[com_argc] = argv[com_argc];
 		if ((argv[com_argc]) && !strcmp ("-safe", argv[com_argc]))
 			safe = true;
-		if (com_argc)
+		if (argv[com_argc])
 			len += strlen (argv[com_argc]) + 1;
 	}
 
diff --git a/tools/qfcc/source/cpp.c b/tools/qfcc/source/cpp.c
index e1c3fb8ce..9bea8741d 100644
--- a/tools/qfcc/source/cpp.c
+++ b/tools/qfcc/source/cpp.c
@@ -55,6 +55,7 @@
 #include "QF/dstring.h"
 
 #include "cpp.h"
+#include "diagnostic.h"
 #include "options.h"
 
 typedef struct cpp_arg_s {
@@ -205,6 +206,9 @@ preprocess_file (const char *filename, const char *ext)
 	if (cpp_name) {
 		intermediate_file (tempname, filename, ext ? ext : "p", 0);
 		build_cpp_args (filename, tempname->str);
+		if (!cpp_argv[0]) {
+			internal_error(0, "cpp_argv[0] is null");
+		}
 
 #ifdef _WIN32
 		if (!options.save_temps && !options.preprocess_only)

From 59b04dbcca93fd7db7ac44790ee281ec9adfc548 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 8 Sep 2018 19:45:19 +0900
Subject: [PATCH 0145/1519] Make many qfo int fields unsigned.

I don't remember why I thought signed was a good idea, but unsigned does
make more sense for most fields.
---
 tools/qfcc/include/obj_file.h    | 46 +++++++++++++++---------------
 tools/qfcc/source/dump_globals.c | 10 +++----
 tools/qfcc/source/linker.c       | 49 +++++++++++++++++++-------------
 tools/qfcc/source/obj_file.c     | 20 ++++++-------
 4 files changed, 67 insertions(+), 58 deletions(-)

diff --git a/tools/qfcc/include/obj_file.h b/tools/qfcc/include/obj_file.h
index cd9cd45f6..1fe1d3690 100644
--- a/tools/qfcc/include/obj_file.h
+++ b/tools/qfcc/include/obj_file.h
@@ -83,11 +83,11 @@ typedef enum qfos_type_e {
 */
 typedef struct qfo_space_s {
 	pr_int_t    type;			///< code, string, data, entity...
-	pr_int_t    defs;			///< index of first def
-	pr_int_t    num_defs;		///< zero for code or string spaces
-	pr_int_t    data;			///< byte offset in qfo
+	pr_uint_t   defs;			///< index of first def
+	pr_uint_t   num_defs;		///< zero for code or string spaces
+	pr_uint_t   data;			///< byte offset in qfo
 	pr_uint_t   data_size;		///< in elements. zero for entity spaces
-	pr_int_t    id;
+	pr_uint_t   id;
 	pr_int_t    reserved[2];
 } qfo_space_t;
 
@@ -98,13 +98,13 @@ typedef struct qfo_def_s {
 	string_t    name;			///< def name
 	pointer_t   offset;			///< def offset (address)
 
-	pr_int_t    relocs;			///< index of first reloc record
-	pr_int_t    num_relocs;		///< number of reloc records
+	pr_uint_t   relocs;			///< index of first reloc record
+	pr_uint_t   num_relocs;		///< number of reloc records
 
 	pr_uint_t   flags;			///< \ref qfcc_qfo_QFOD "QFOD flags"
 
 	string_t    file;			///< source file name
-	pr_int_t    line;			///< source line number
+	pr_uint_t   line;			///< source line number
 } qfo_def_t;
 //@}
 
@@ -180,7 +180,7 @@ typedef struct qfo_func_s {
 	string_t    name;			///< function name
 	pointer_t   type;			///< function type (in type data space)
 	string_t    file;			///< source file name
-	pr_int_t    line;			///< source line number
+	pr_uint_t   line;			///< source line number
 
 	/** \name Function code location.
 		If #code is negative, then the function is a VM builtin function.
@@ -191,22 +191,22 @@ typedef struct qfo_func_s {
 	*/
 	pr_int_t    code;
 
-	pr_int_t    def;			///< def that references this function. Index
+	pr_uint_t   def;			///< def that references this function. Index
 								///< to ::qfo_def_t. The data word pointed to
 								///< by the def stores the index of this
 								///< function.
 
-	pr_int_t    locals_space;	///< space holding the function's local data
+	pr_uint_t   locals_space;	///< space holding the function's local data
 
-	pr_int_t    line_info;		///< Index to first ::pr_lineno_t line record.
+	pr_uint_t   line_info;		///< Index to first ::pr_lineno_t line record.
 								///< Zero if there are no records.
 
 	/** \name Function relocation records.
 		XXX not sure how these work
 	*/
 	//@{
-	pr_int_t    relocs;			///< Index to first ::qfo_reloc_t reloc record.
-	pr_int_t    num_relocs;		///< Number of reloc records.
+	pr_uint_t   relocs;			///< Index to first ::qfo_reloc_t reloc record.
+	pr_uint_t   num_relocs;		///< Number of reloc records.
 	//@}
 	pr_int_t    reserved[2];
 } qfo_func_t;
@@ -237,8 +237,8 @@ typedef struct qfo_func_s {
 	the referenced field def.
 */
 typedef struct qfo_reloc_s {
-	pr_int_t    space;			///< index of space holding data to be adjusted
-	pr_int_t    offset;			///< offset of the relocation
+	pr_uint_t   space;			///< index of space holding data to be adjusted
+	pr_uint_t   offset;			///< offset of the relocation
 	pr_int_t    type;			///< type of the relocation (::reloc_type)
 	pr_uint_t   target;			///< def/func/etc this relocation is for
 } qfo_reloc_t;
@@ -248,14 +248,14 @@ typedef struct qfo_reloc_s {
 typedef struct qfo_mspace_s {
 	qfos_type_t type;
 	qfo_def_t  *defs;
-	int         num_defs;
+	unsigned    num_defs;
 	union {
 		dstatement_t *code;
 		pr_type_t  *data;
 		char       *strings;
 	}           d;
 	unsigned    data_size;
-	int         id;
+	unsigned    id;
 } qfo_mspace_t;
 
 /** In-memory representation of a QFO object file.
@@ -263,16 +263,16 @@ typedef struct qfo_mspace_s {
 typedef struct qfo_s {
 	void       *data;			///< data buffer holding qfo file when read
 	qfo_mspace_t *spaces;
-	int         num_spaces;
+	unsigned    num_spaces;
 	qfo_reloc_t *relocs;
-	int         num_relocs;			// includes num_loose_relocs
+	unsigned    num_relocs;			// includes num_loose_relocs
 	qfo_def_t  *defs;
-	int         num_defs;
+	unsigned    num_defs;
 	qfo_func_t *funcs;
-	int         num_funcs;
+	unsigned    num_funcs;
 	pr_lineno_t *lines;
-	int         num_lines;
-	int         num_loose_relocs;	// included in num_relocs
+	unsigned    num_lines;
+	unsigned    num_loose_relocs;	// included in num_relocs
 } qfo_t;
 
 enum {
diff --git a/tools/qfcc/source/dump_globals.c b/tools/qfcc/source/dump_globals.c
index dce3bd265..e3ce6f557 100644
--- a/tools/qfcc/source/dump_globals.c
+++ b/tools/qfcc/source/dump_globals.c
@@ -257,8 +257,8 @@ void
 qfo_globals (qfo_t *qfo)
 {
 	qfo_def_t  *def;
-	int         i;
-	int         space;
+	unsigned    i;
+	unsigned    space;
 	int         count = 0;
 
 	for (space = 0; space < qfo->num_spaces; space++) {
@@ -282,7 +282,7 @@ qfo_relocs (qfo_t *qfo)
 	qfo_reloc_t  *reloc;
 	qfo_def_t    *def;
 	qfo_func_t   *func;
-	int           i;
+	unsigned      i;
 
 	for (i = 0; i < qfo->num_relocs; i++) {
 		reloc = qfo->relocs + i;
@@ -385,8 +385,8 @@ qfo_functions (qfo_t *qfo)
 {
 	qfo_def_t  *def;
 	qfo_func_t *func;
-	int         i, d;
-	int         space;
+	unsigned    i, d;
+	unsigned    space;
 
 	for (i = 0; i < qfo->num_funcs; i++) {
 		func = &qfo->funcs[i];
diff --git a/tools/qfcc/source/linker.c b/tools/qfcc/source/linker.c
index 772f3fd35..952997374 100644
--- a/tools/qfcc/source/linker.c
+++ b/tools/qfcc/source/linker.c
@@ -147,7 +147,7 @@ static qfo_t *work;
 static int work_base[qfo_num_spaces];
 static int work_func_base;
 static defref_t **work_defrefs;
-static int num_work_defrefs;
+static unsigned num_work_defrefs;
 static strpool_t *work_strings;
 static codespace_t *work_code;
 static defspace_t *work_near_data;
@@ -436,7 +436,7 @@ adjust_reloc_offset (qfo_reloc_t *reloc)
 static int
 add_relocs (qfo_t *qfo, int start, int count, int target)
 {
-	int         size;
+	unsigned    size;
 	qfo_reloc_t *ireloc;
 	qfo_reloc_t *oreloc;
 
@@ -448,7 +448,7 @@ add_relocs (qfo_t *qfo, int start, int count, int target)
 		*oreloc = *ireloc;
 		ireloc->type = -1;
 		ireloc->offset = work->num_relocs++;
-		if (oreloc->space < 0 || oreloc->space >= qfo->num_spaces) {
+		if (oreloc->space >= qfo->num_spaces) {
 			linker_error ("bad reloc space: %d (%d)", oreloc->space,
 						  qfo->num_spaces);
 			oreloc->type = rel_none;
@@ -806,7 +806,7 @@ update_type_space_reloc (qfo_mspace_t *space, qfo_reloc_t *reloc)
 static int
 process_type_space (qfo_t *qfo, qfo_mspace_t *space, int pass)
 {
-	int         i;
+	unsigned    i;
 
 	if (pass != 0)
 		return 0;
@@ -860,7 +860,7 @@ process_type_space (qfo_t *qfo, qfo_mspace_t *space, int pass)
 static void
 process_funcs (qfo_t *qfo)
 {
-	int         size;
+	unsigned    size;
 	qfo_func_t *func;
 	qfot_type_t *type;
 
@@ -888,7 +888,7 @@ process_funcs (qfo_t *qfo)
 static void
 process_lines (qfo_t *qfo)
 {
-	int         size;
+	unsigned    size;
 	pr_lineno_t *line;
 
 	if (!qfo->num_lines)
@@ -920,7 +920,7 @@ process_loose_relocs (qfo_t *qfo)
 			qfo->num_loose_relocs * sizeof (qfo_reloc_t));
 	while (work_num_loose_relocs < size) {
 		reloc = work_loose_relocs + work_num_loose_relocs++;
-		if (reloc->space < 0 || reloc->space >= qfo->num_spaces) {
+		if (reloc->space >= qfo->num_spaces) {
 			linker_error ("bad reloc space");
 			reloc->type = rel_none;
 			continue;
@@ -954,7 +954,7 @@ linker_add_qfo (qfo_t *qfo)
 		process_entity_space,
 		process_type_space,
 	};
-	int         i;
+	unsigned    i;
 	int         pass;
 	qfo_mspace_t *space;
 
@@ -1027,7 +1027,8 @@ linker_add_lib (const char *libname)
 	path_t      start = {path_head, "."};
 	path_t     *path = &start;
 	const char *path_name = 0;
-	int         i, j;
+	int         i;
+	unsigned    j;
 	int         did_something;
 
 	if (strncmp (libname, "-l", 2) == 0) {
@@ -1101,7 +1102,7 @@ static __attribute__ ((used)) void
 undefined_def (qfo_def_t *def)
 {
 	qfo_def_t   line_def;
-	pr_int_t    i;
+	pr_uint_t   i;
 	qfo_reloc_t *reloc = work->relocs + def->relocs;
 
 	for (i = 0; i < def->num_relocs; i++, reloc++) {
@@ -1113,17 +1114,20 @@ undefined_def (qfo_def_t *def)
 			 || reloc->type == rel_op_c_def_ofs)
 			&& work->lines) {
 			qfo_func_t *func = work->funcs;
-			qfo_func_t *best = func;
-			pr_int_t    best_dist = reloc->offset - func->code;
+			qfo_func_t *best = 0;
+			pr_uint_t    best_dist;
 			pr_lineno_t *line;
 
-			while (best_dist && func - work->funcs < work->num_funcs) {
-				if (func->code <= reloc->offset) {
-					if (best_dist < 0
-						|| reloc->offset - func->code < best_dist) {
-						best = func;
-						best_dist = reloc->offset - func->code;
-					}
+			while (func - work->funcs < work->num_funcs) {
+				if (func->code < 0) {
+					continue;
+				}
+				if ((pr_uint_t) func->code > reloc->offset) {
+					continue;
+				}
+				if (!best || reloc->offset - func->code < best_dist) {
+					best = func;
+					best_dist = reloc->offset - func->code;
 				}
 				func++;
 			}
@@ -1195,7 +1199,7 @@ build_qfo (void)
 {
 	qfo_t      *qfo;
 	int         size;
-	int         i, j;
+	unsigned    i, j;
 	qfo_reloc_t *reloc;
 	qfo_def_t **defs;
 
@@ -1288,6 +1292,11 @@ build_qfo (void)
 			continue;
 		if (reloc->type != rel_def_def)
 			continue;
+		if (reloc->target >= qfo->num_defs) {
+			linker_error ("Invalid reloc target def %d / %d.\n",
+						  reloc->target, qfo->num_defs);
+			continue;
+		}
 		def = qfo->defs + reloc->target;
 		QFO_INT (qfo, reloc->space, reloc->offset) = def->offset;
 	}
diff --git a/tools/qfcc/source/obj_file.c b/tools/qfcc/source/obj_file.c
index b39bea1e7..b7d5a389e 100644
--- a/tools/qfcc/source/obj_file.c
+++ b/tools/qfcc/source/obj_file.c
@@ -394,9 +394,9 @@ qfo_byteswap_space (void *space, int size, qfos_type_t type)
 int
 qfo_write (qfo_t *qfo, const char *filename)
 {
-	int         size;
+	unsigned    size;
 	int         space_offset;
-	int         i;
+	unsigned    i;
 	byte       *data;
 	qfo_header_t *header;
 	qfo_space_t *spaces;
@@ -499,7 +499,7 @@ qfo_read (QFile *file)
 	qfo_header_t *header;
 	qfo_space_t *spaces;
 	qfo_t      *qfo;
-	int         i;
+	unsigned    i;
 
 	size = Qfilesize (file);
 	data = malloc (size);
@@ -605,7 +605,7 @@ qfo_delete (qfo_t *qfo)
 	if (qfo->data) {
 		free (qfo->data);
 	} else {
-		int         i;
+		unsigned    i;
 		for (i = 0; i < qfo->num_spaces; i++)
 			free (qfo->spaces[i].d.data);
 		free (qfo->relocs);
@@ -715,7 +715,7 @@ convert_def (qfo_t *qfo, const qfo_def_t *def, ddef_t *ddef)
 static void
 qfo_relocate_refs (qfo_t *qfo)
 {
-	int         i;
+	unsigned    i;
 	qfo_reloc_t *reloc;
 
 	for (i = 0, reloc = qfo->relocs; i < qfo->num_relocs; i++, reloc++) {
@@ -788,10 +788,10 @@ qfo_to_progs (qfo_t *qfo, int *size)
 	pr_type_t  *type_data;
 	dprograms_t *progs;
 	qfo_def_t  *types_def = 0;
-	int         i, j;
+	unsigned    i, j;
 	unsigned    locals_size = 0;
 	int         locals_start;
-	int         big_locals = 0;
+	unsigned    big_locals = 0;
 	int         big_func = 0;
 
 	*size = RUP (sizeof (dprograms_t), 16);
@@ -976,7 +976,7 @@ pr_debug_header_t *
 qfo_to_sym (qfo_t *qfo, int *size)
 {
 	pr_debug_header_t *sym;
-	int         i, j;
+	unsigned    i, j;
 	pr_auxfunction_t *auxfuncs;
 	pr_auxfunction_t *aux;
 	pr_lineno_t *linenos;
@@ -988,7 +988,7 @@ qfo_to_sym (qfo_t *qfo, int *size)
 	sym->version = PROG_DEBUG_VERSION;
 	for (i = 0; i < qfo->num_funcs; i++) {
 		qfo_func_t *func = qfo->funcs + i;
-		int num_locals = 0;
+		unsigned    num_locals = 0;
 
 		if (func->locals_space)
 			num_locals = qfo->spaces[func->locals_space].num_defs;
@@ -1017,7 +1017,7 @@ qfo_to_sym (qfo_t *qfo, int *size)
 	for (i = 0, aux = auxfuncs; i < qfo->num_funcs; i++) {
 		qfo_func_t *func = qfo->funcs + i;
 		qfo_def_t  *def = 0;
-		int         num_locals = 0;
+		unsigned    num_locals = 0;
 		qfot_type_t *type;
 
 		if (func->locals_space) {

From 59e85b7d5e466f7863d8281a9aacb44863edaf2c Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 8 Sep 2018 22:23:57 +0900
Subject: [PATCH 0146/1519] Fix a pile of dead assignments.

Some were actual bugs!
---
 libs/gamecode/pr_strings.c             | 1 -
 libs/gib/gib_builtin.c                 | 8 ++++----
 libs/gib/gib_function.c                | 7 +++----
 libs/models/brush/model_brush.c        | 1 -
 libs/util/cvar.c                       | 4 ++--
 libs/util/quakefs.c                    | 2 +-
 libs/util/riff.c                       | 2 --
 libs/video/renderer/gl/gl_mod_iqm.c    | 1 -
 libs/video/renderer/gl/gl_sky_clip.c   | 1 -
 libs/video/renderer/glsl/glsl_sprite.c | 1 -
 libs/video/targets/vid_x11.c           | 2 --
 nq/source/cl_demo.c                    | 4 ++++
 nq/source/host_cmd.c                   | 1 -
 qw/source/cl_slist.c                   | 1 -
 qw/source/net_packetlog.c              | 2 +-
 qw/source/sv_ents.c                    | 1 -
 qw/source/teamplay.c                   | 2 --
 tools/qfbsp/source/merge.c             | 1 -
 tools/qfbsp/source/portals.c           | 1 -
 tools/qfcc/source/dump_globals.c       | 2 --
 tools/qfcc/source/expr.c               | 7 +++++--
 tools/qfcc/source/flow.c               | 1 -
 tools/qfcc/source/value.c              | 2 +-
 tools/qflight/source/ltface.c          | 5 +----
 tools/qflight/source/properties.c      | 3 ---
 25 files changed, 22 insertions(+), 41 deletions(-)

diff --git a/libs/gamecode/pr_strings.c b/libs/gamecode/pr_strings.c
index f6983469a..ac957e23b 100644
--- a/libs/gamecode/pr_strings.c
+++ b/libs/gamecode/pr_strings.c
@@ -841,7 +841,6 @@ PR_Sprintf (progs_t *pr, dstring_t *result, const char *name,
 		(*fi)->data.string_var = l;
 
 		(*fi)->next = new_fmt_item ();
-		fi = &(*fi)->next;
 	}
 
 	if (fmt_count != count) {
diff --git a/libs/gib/gib_builtin.c b/libs/gib/gib_builtin.c
index c3ba2910a..6f6e857bd 100644
--- a/libs/gib/gib_builtin.c
+++ b/libs/gib/gib_builtin.c
@@ -236,8 +236,8 @@ GIB_Local_f (void)
 			for (i = 3; i < GIB_Argc(); i++)
 				GIB_Return (GIB_Argv(i));
 	} else for (i = 1; i < GIB_Argc(); i++)
-		var = GIB_Var_Get_Complex (&GIB_DATA (cbuf_active)->locals, &zero,
-								 GIB_Argv (i), &index, true);
+		GIB_Var_Get_Complex (&GIB_DATA (cbuf_active)->locals, &zero,
+							 GIB_Argv (i), &index, true);
 }
 
 
@@ -261,8 +261,8 @@ GIB_Shared_f (void)
 			for (i = 3; i < GIB_Argc(); i++)
 				GIB_Return (GIB_Argv(i));
 	} else for (i = 1; i < GIB_Argc(); i++)
-		var = GIB_Var_Get_Complex (&GIB_DATA (cbuf_active)->globals, &zero,
-								 GIB_Argv (i), &index, true);
+		GIB_Var_Get_Complex (&GIB_DATA (cbuf_active)->globals, &zero,
+							 GIB_Argv (i), &index, true);
 }
 
 static void
diff --git a/libs/gib/gib_function.c b/libs/gib/gib_function.c
index 72c1d1ea5..5c5403277 100644
--- a/libs/gib/gib_function.c
+++ b/libs/gib/gib_function.c
@@ -234,11 +234,10 @@ GIB_Function_Prepare_Args_D (cbuf_t * cbuf, dstring_t **args, unsigned int
 	g_fpad_args = args;
 	g_fpad_argc = argc;
 
-	i = 1; llist_iterate (arglist, LLIST_ICAST (fpad_iterate));
+	llist_iterate (arglist, LLIST_ICAST (fpad_iterate));
 
-	var =
-		GIB_Var_Get_Complex (&GIB_DATA (cbuf)->locals, &g_fpad_zero, argss,
-				&g_fpad_ind, true);
+	var = GIB_Var_Get_Complex (&GIB_DATA (cbuf)->locals, &g_fpad_zero, argss,
+							   &g_fpad_ind, true);
 	var->array = realloc (var->array, sizeof (struct gib_varray_s) * argc);
 	memset (var->array + 1, 0, (argc - 1) * sizeof (struct gib_varray_s));
 	var->size = argc;
diff --git a/libs/models/brush/model_brush.c b/libs/models/brush/model_brush.c
index dd43c1dc8..33e67b952 100644
--- a/libs/models/brush/model_brush.c
+++ b/libs/models/brush/model_brush.c
@@ -221,7 +221,6 @@ Mod_LoadTextures (bsp_t *bsp)
 		memset (altanims, 0, sizeof (altanims));
 
 		max = tx->name[1];
-		altmax = 0;
 		if (max >= 'a' && max <= 'z')
 			max -= 'a' - 'A';
 		if (max >= '0' && max <= '9') {
diff --git a/libs/util/cvar.c b/libs/util/cvar.c
index 32e3af26a..64ef200ab 100644
--- a/libs/util/cvar.c
+++ b/libs/util/cvar.c
@@ -356,8 +356,8 @@ set_cvar (const char *cmd, int orflags)
 			Cvar_SetFlags (var, var->flags | orflags);
 		}
 	} else {
-		var = Cvar_Get (var_name, value, CVAR_USER_CREATED | orflags, NULL,
-						USER_CVAR);
+		Cvar_Get (var_name, value, CVAR_USER_CREATED | orflags, NULL,
+				  USER_CVAR);
 	}
 }
 
diff --git a/libs/util/quakefs.c b/libs/util/quakefs.c
index 5131f7194..edbb39c6c 100644
--- a/libs/util/quakefs.c
+++ b/libs/util/quakefs.c
@@ -1209,7 +1209,7 @@ qfs_file_sort (char **os1, char **os2)
 	s2 = *os2;
 
 	while (1) {
-		in1 = in2 = n1 = n2 = 0;
+		n1 = n2 = 0;
 
 		if ((in1 = isdigit ((byte) *s1)))
 			n1 = strtol (s1, &s1, 10);
diff --git a/libs/util/riff.c b/libs/util/riff.c
index bd7320c96..9bbeb461c 100644
--- a/libs/util/riff.c
+++ b/libs/util/riff.c
@@ -138,7 +138,6 @@ read_adtl (dstring_t *list_buf, QFile *f, int len)
 	//FIXME list = (riff_list_t *) list_buf->str;
 	while (len) {
 		if (!Rread (f, &ck, sizeof (ck))) {
-			len = 0;
 			break;
 		}
 		len -= sizeof (ck);
@@ -392,7 +391,6 @@ riff_read (QFile *f)
 				break;
 		}
 		dstring_append (riff_buf, (char *)&chunk, sizeof (chunk));
-		riff = (riff_list_t *) riff_buf->str;
 		chunk = 0;
 	}
 bail:
diff --git a/libs/video/renderer/gl/gl_mod_iqm.c b/libs/video/renderer/gl/gl_mod_iqm.c
index 8a6efaade..4c50795b7 100644
--- a/libs/video/renderer/gl/gl_mod_iqm.c
+++ b/libs/video/renderer/gl/gl_mod_iqm.c
@@ -97,7 +97,6 @@ gl_R_DrawIQMModel (entity_t *ent)
 	iqmframe_t *frame;
 	int         i;
 
-	model = ent->model;
 	blend = R_IQMGetLerpedFrames (ent, iqm);
 	frame = R_IQMBlendPalette (iqm, ent->pose1, ent->pose2, blend, 0,
 							   gl->blend_palette, gl->palette_size);
diff --git a/libs/video/renderer/gl/gl_sky_clip.c b/libs/video/renderer/gl/gl_sky_clip.c
index 613e8b177..44a560005 100644
--- a/libs/video/renderer/gl/gl_sky_clip.c
+++ b/libs/video/renderer/gl/gl_sky_clip.c
@@ -370,7 +370,6 @@ process_corners (struct box_def *box)
 	for (i = 0; i < 6; i++) {
 		if (max_visit < box->face_visits[i]) {
 			max_visit = box->face_visits[i];
-			center = i;
 		}
 	}
 
diff --git a/libs/video/renderer/glsl/glsl_sprite.c b/libs/video/renderer/glsl/glsl_sprite.c
index 83f116ee3..69c67335a 100644
--- a/libs/video/renderer/glsl/glsl_sprite.c
+++ b/libs/video/renderer/glsl/glsl_sprite.c
@@ -143,7 +143,6 @@ R_GetSpriteFrames (entity_t *ent, msprite_t *sprite, mspriteframe_t **frame1,
 	if (framenum >= sprite->numframes || framenum < 0)
 		framenum = 0;
 
-	numframes = sprite->numframes;
 	framedesc = &sprite->frames[framenum];
 	if (framedesc->type == SPR_SINGLE) {
 		frame_interval = 0.1;
diff --git a/libs/video/targets/vid_x11.c b/libs/video/targets/vid_x11.c
index 6430b9c06..1050d6adb 100644
--- a/libs/video/targets/vid_x11.c
+++ b/libs/video/targets/vid_x11.c
@@ -536,8 +536,6 @@ x11_choose_visual (void)
 	int         num_visuals;
 	int         template_mask;
 
-	template_mask = 0;
-
 	// specify a visual id
 	if ((pnum = COM_CheckParm ("-visualid"))) {
 		if (pnum >= com_argc - 1)
diff --git a/nq/source/cl_demo.c b/nq/source/cl_demo.c
index 3b0a1a803..7d47eb627 100644
--- a/nq/source/cl_demo.c
+++ b/nq/source/cl_demo.c
@@ -184,6 +184,10 @@ read_demopacket (void)
 	VectorCopy (cl.mviewangles[0], cl.mviewangles[1]);
 	for (i = 0; i < 3; i++) {
 		r = Qread (cls.demofile, &f, 4);
+		if (r != 4) {
+			CL_StopPlayback ();
+			return 0;
+		}
 		cl.mviewangles[0][i] = LittleFloat (f);
 	}
 	r = Qread (cls.demofile, net_message->message->data,
diff --git a/nq/source/host_cmd.c b/nq/source/host_cmd.c
index 1a827f15b..1e502b7d5 100644
--- a/nq/source/host_cmd.c
+++ b/nq/source/host_cmd.c
@@ -692,7 +692,6 @@ Host_Loadgame_f (void)
 	ED_InitGlobals (&sv_pr_state, PL_ObjectForKey (game, "globals"));
 
 	list = PL_ObjectForKey (game, "entities");
-	entnum = 0;
 	count = PL_A_NumObjects (list);
 	if (count > sv.max_edicts)
 		Host_Error ("too many entities in saved game. adjust max_edicts\n");
diff --git a/qw/source/cl_slist.c b/qw/source/cl_slist.c
index 585e6aa47..9efafd73b 100644
--- a/qw/source/cl_slist.c
+++ b/qw/source/cl_slist.c
@@ -119,7 +119,6 @@ SL_Add (server_entry_t *start, const char *ip, const char *desc)
 {
 	server_entry_t *p;
 
-	p = start;
 	if (!start) {						// Nothing at beginning of list,
 										// create it
 		start = calloc (1, sizeof (server_entry_t));
diff --git a/qw/source/net_packetlog.c b/qw/source/net_packetlog.c
index 87edf8e45..3ec8078e5 100644
--- a/qw/source/net_packetlog.c
+++ b/qw/source/net_packetlog.c
@@ -635,7 +635,7 @@ Parse_Server_Packet (int has_sequence)
 					break;
 				case svc_playerinfo:
 					Net_LogPrintf ("\n\tPlayer: %d", MSG_ReadByte (&packet));
-					mask2 = mask1 = MSG_ReadShort (&packet);
+					mask1 = MSG_ReadShort (&packet);
 					Net_LogPrintf (" Mask1: %d", mask1);
 #if 1
 					Net_LogPrintf (" Origin:");
diff --git a/qw/source/sv_ents.c b/qw/source/sv_ents.c
index bb0b2b1b3..f6682337c 100644
--- a/qw/source/sv_ents.c
+++ b/qw/source/sv_ents.c
@@ -577,7 +577,6 @@ SV_WritePlayersToClient (delta_t *delta, byte *pvs, sizebuf_t *msg)
 	if (delta->client) {
 		clent = delta->client->edict;
 		spec_track = delta->client->spec_track;
-		stdver = delta->client->stdver;
 		null_player_state.modelindex = sv_playermodel;
 		full = 0;		// normal qw clients don't get real deltas on players
 	}
diff --git a/qw/source/teamplay.c b/qw/source/teamplay.c
index 538dc0f1d..5da9dace2 100644
--- a/qw/source/teamplay.c
+++ b/qw/source/teamplay.c
@@ -156,7 +156,6 @@ Team_ParseSay (dstring_t *buf, const char *s)
 			case 'S':
 				bracket = 0;
 				t1 = skin->string;
-				t1 = "FIXME";
 				break;
 			case 'd':
 				bracket = 0;
@@ -475,7 +474,6 @@ Team_ParseChat (const char *string)
 	if (!cl_freply->value)
 		return;
 
-	s = strchr (string, ':');
 	if (!(s = strchr (string, ':')))
 		return;
 	s++;
diff --git a/tools/qfbsp/source/merge.c b/tools/qfbsp/source/merge.c
index 8551336df..5692a6d83 100644
--- a/tools/qfbsp/source/merge.c
+++ b/tools/qfbsp/source/merge.c
@@ -74,7 +74,6 @@ TryMerge (const face_t *f1, const face_t *f2)
 		return NULL;
 
 	p1 = p2 = NULL;
-	j = 0;
 
 	// find a common edge
 	for (i = 0; i < f1p->numpoints; i++) {
diff --git a/tools/qfbsp/source/portals.c b/tools/qfbsp/source/portals.c
index edad5724a..6b99cefda 100644
--- a/tools/qfbsp/source/portals.c
+++ b/tools/qfbsp/source/portals.c
@@ -280,7 +280,6 @@ CutNodePortals_r (node_t *node)
 	/// cutting plane and clipping it by all of the planes from the other
 	/// portals on the node.
 	w = BaseWindingForPlane (plane);
-	side = 0;
 	for (p = node->portals; p; p = p->next[side]) {
 		clipplane = planes[p->planenum];	// copy the plane
 		if (p->nodes[0] == node)
diff --git a/tools/qfcc/source/dump_globals.c b/tools/qfcc/source/dump_globals.c
index e3ce6f557..4361b7a57 100644
--- a/tools/qfcc/source/dump_globals.c
+++ b/tools/qfcc/source/dump_globals.c
@@ -202,8 +202,6 @@ dump_functions (progs_t *pr)
 
 		name = PR_GetString (pr, func->s_name);
 
-		comment = "";
-
 		start = func->first_statement;
 		if (start > 0)
 			comment = va (" @ %x", start);
diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index 36627517f..45aa50882 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -1926,13 +1926,17 @@ return_expr (function_t *f, expr_t *e)
 				if (options.warnings.traditional)
 					warning (e,
 							 "return from non-void function without a value");
+				// force a nil return value in case qf code is being generated
 				e = new_nil_expr ();
 			} else {
 				e = error (e, "return from non-void function without a value");
 				return e;
 			}
 		}
-		return new_unary_expr ('r', 0);
+		// the traditional check above may have set e
+		if (!e) {
+			return new_unary_expr ('r', 0);
+		}
 	}
 
 	t = get_type (e);
@@ -2823,7 +2827,6 @@ message_expr (expr_t *receiver, keywordarg_t *message)
 			return receiver;
 		receiver = cast_expr (&type_id, receiver);	//FIXME better way?
 		class = extract_class (current_class);
-		rec_type = class->type;
 	} else {
 		if (receiver->type == ex_symbol) {
 			if (strcmp (receiver->e.symbol->name, "self") == 0)
diff --git a/tools/qfcc/source/flow.c b/tools/qfcc/source/flow.c
index b23fb1bb0..bb398e045 100644
--- a/tools/qfcc/source/flow.c
+++ b/tools/qfcc/source/flow.c
@@ -1050,7 +1050,6 @@ flow_find_dominators (flowgraph_t *graph)
 		changed = 0;
 		for (i = 1; i < graph->num_nodes; i++) {
 			node = graph->nodes[i];
-			pred = set_first (node->predecessors);
 			set_empty (work);
 			for (pred = set_first (node->predecessors); pred;
 				 pred = set_next (pred))
diff --git a/tools/qfcc/source/value.c b/tools/qfcc/source/value.c
index 1eab5ec68..0d323ac99 100644
--- a/tools/qfcc/source/value.c
+++ b/tools/qfcc/source/value.c
@@ -558,7 +558,7 @@ emit_value (ex_value_t *value, def_t *def)
 
 	memcpy (D_POINTER (void, cn), &val.v, 4 * type_size (type));
 
-	imm = make_def_imm (cn, tab, &val);
+	make_def_imm (cn, tab, &val);
 
 	return cn;
 }
diff --git a/tools/qflight/source/ltface.c b/tools/qflight/source/ltface.c
index acb157c36..1864b7746 100644
--- a/tools/qflight/source/ltface.c
+++ b/tools/qflight/source/ltface.c
@@ -488,7 +488,6 @@ SkyLightFace (entity_t *ent, int sun, lightinfo_t *l)
 	// Check each point...
 	VectorCopy (sun_dir, incoming);
 	VectorNormalize (incoming);
-	angle = DotProduct (incoming, l->facenormal);
 	//anglesense = 0.5;	//FIXME
 
 	// FIXME global
@@ -499,11 +498,9 @@ SkyLightFace (entity_t *ent, int sun, lightinfo_t *l)
 
 		if (!TestSky (l, point->v, sun_dir))
 			continue;
+
 		add = sun_light;
-			continue;
-
 		add *= angle;
-
 		add *= options.extrascale;
 
 		sample = &l->sample[mapnum][point->samplepos];
diff --git a/tools/qflight/source/properties.c b/tools/qflight/source/properties.c
index d9286e268..5cf957b7f 100644
--- a/tools/qflight/source/properties.c
+++ b/tools/qflight/source/properties.c
@@ -237,14 +237,11 @@ set_properties (entity_t *ent, plitem_t *dict)
 	const char *str;
 
 	if (properties) {
-		prop = PL_ObjectForKey (properties, ent->classname);
 		if ((p = get_item ("light_name", dict, 0))
 			&& (str = PL_String (p)))
 			prop = PL_ObjectForKey (properties, str);
 		if (!prop)
 			prop = PL_ObjectForKey (properties, ent->classname);
-
-		prop = PL_ObjectForKey (properties, ent->classname);
 		if (!prop)
 			prop = PL_ObjectForKey (properties, "default");
 	}

From 62793b2dc2b599bedd5913c3a7a354e737d67797 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 9 Sep 2018 09:54:16 +0900
Subject: [PATCH 0147/1519] Fix some potentially garbage assignments.

These are the ones where I could easily make scan-build happy. They do seem
to be potential holes where invalid data in one place could result in use
of uninitialized values.
---
 libs/models/brush/gl_model_brush.c | 6 ++++--
 libs/net/nm/net_udp.c              | 4 ++--
 libs/video/renderer/sw/d_sky.c     | 2 ++
 libs/video/renderer/sw32/d_sky.c   | 6 ++++++
 nq/source/host_cmd.c               | 1 +
 5 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/libs/models/brush/gl_model_brush.c b/libs/models/brush/gl_model_brush.c
index 1485fdd94..7b7e171ac 100644
--- a/libs/models/brush/gl_model_brush.c
+++ b/libs/models/brush/gl_model_brush.c
@@ -222,7 +222,7 @@ SubdividePolygon (int numverts, float *verts)
 	vec3_t      mins, maxs;
 	vec3_t      front[64], back[64];
 
-	if (numverts > 60)
+	if (numverts < 3 || numverts > 60)
 		Sys_Error ("numverts = %i", numverts);
 
 	BoundPoly (numverts, verts, mins, maxs);
@@ -317,5 +317,7 @@ gl_Mod_SubdivideSurface (msurface_t *fa)
 		numverts++;
 	}
 
-	SubdividePolygon (numverts, verts[0]);
+	if (numverts > 3) {
+		SubdividePolygon (numverts, verts[0]);
+	}
 }
diff --git a/libs/net/nm/net_udp.c b/libs/net/nm/net_udp.c
index 84f01a3a9..cf2348256 100644
--- a/libs/net/nm/net_udp.c
+++ b/libs/net/nm/net_udp.c
@@ -387,7 +387,7 @@ PartialIPAddress (const char *in, netadr_t *hostaddr)
 {
 	char       *buff;
 	char       *b;
-	int         addr, mask, num, port, run;
+	unsigned    addr, mask, num, port, run;
 
 	buff = nva (".%s", in);
 	b = buff;
@@ -407,7 +407,7 @@ PartialIPAddress (const char *in, netadr_t *hostaddr)
 		}
 		if ((*b < '0' || *b > '9') && *b != '.' && *b != ':' && *b != 0)
 			goto error;
-		if (num < 0 || num > 255)
+		if (num > 255)
 			goto error;
 		mask <<= 8;
 		addr = (addr << 8) + num;
diff --git a/libs/video/renderer/sw/d_sky.c b/libs/video/renderer/sw/d_sky.c
index 6bc7872aa..853a3e0e0 100644
--- a/libs/video/renderer/sw/d_sky.c
+++ b/libs/video/renderer/sw/d_sky.c
@@ -72,6 +72,8 @@ D_DrawSkyScans (espan_t *pspan)
 
 	sstep = 0;							// keep compiler happy
 	tstep = 0;							// ditto
+	snext = 0;							// ditto
+	tnext = 0;							// ditto
 
 	do {
 		pdest = (unsigned char *) ((byte *) d_viewbuffer +
diff --git a/libs/video/renderer/sw32/d_sky.c b/libs/video/renderer/sw32/d_sky.c
index 20e2765b0..6ceb6095a 100644
--- a/libs/video/renderer/sw32/d_sky.c
+++ b/libs/video/renderer/sw32/d_sky.c
@@ -79,6 +79,8 @@ sw32_D_DrawSkyScans (espan_t *pspan)
 
 		sstep = 0;							// keep compiler happy
 		tstep = 0;							// ditto
+		snext = 0;							// ditto
+		tnext = 0;							// ditto
 
 		do {
 			pdest = (byte *) sw32_d_viewbuffer + sw32_screenwidth * pspan->v + pspan->u;
@@ -146,6 +148,8 @@ sw32_D_DrawSkyScans (espan_t *pspan)
 
 		sstep = 0;							// keep compiler happy
 		tstep = 0;							// ditto
+		snext = 0;							// ditto
+		tnext = 0;							// ditto
 
 		do {
 			pdest = (short *) sw32_d_viewbuffer + sw32_screenwidth * pspan->v + pspan->u;
@@ -213,6 +217,8 @@ sw32_D_DrawSkyScans (espan_t *pspan)
 
 		sstep = 0;							// keep compiler happy
 		tstep = 0;							// ditto
+		snext = 0;							// ditto
+		tnext = 0;							// ditto
 
 		do {
 			pdest = (int *) sw32_d_viewbuffer + sw32_screenwidth * pspan->v + pspan->u;
diff --git a/nq/source/host_cmd.c b/nq/source/host_cmd.c
index 1e502b7d5..5aaf60e73 100644
--- a/nq/source/host_cmd.c
+++ b/nq/source/host_cmd.c
@@ -657,6 +657,7 @@ Host_Loadgame_f (void)
 		game = convert_to_game_dict (script);
 	}
 
+	memset (spawn_parms, 0, sizeof (spawn_parms));
 	item = PL_ObjectForKey (game, "spawn_parms");
 	for (i = 0; i < NUM_SPAWN_PARMS; i++) {
 		if (i >= PL_A_NumObjects (item))

From 3f638d95ba95eae488eca6e5c49327c89705c427 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 9 Sep 2018 10:54:38 +0900
Subject: [PATCH 0148/1519] Remove a possibly spurious break.

I'm not certain despair actually meant for the break to be there. It
certainly would have sped up the game a bit but at the expense of proper
blood trails in the software renderers.
---
 libs/video/renderer/sw/sw_rpart.c     | 1 -
 libs/video/renderer/sw32/sw32_rpart.c | 1 -
 2 files changed, 2 deletions(-)

diff --git a/libs/video/renderer/sw/sw_rpart.c b/libs/video/renderer/sw/sw_rpart.c
index aeb2fa904..601a003c9 100644
--- a/libs/video/renderer/sw/sw_rpart.c
+++ b/libs/video/renderer/sw/sw_rpart.c
@@ -590,7 +590,6 @@ R_BloodTrail_QF (const entity_t *ent)
 		p->color = 67 + (mtwist_rand (&mt) & 3);
 		for (j = 0; j < 3; j++)
 			p->org[j] = old_origin[j] + ((mtwist_rand (&mt) % 6) - 3);
-		break;
 
 		VectorAdd (old_origin, vec, old_origin);
 	}
diff --git a/libs/video/renderer/sw32/sw32_rpart.c b/libs/video/renderer/sw32/sw32_rpart.c
index 5591b9929..7b910005d 100644
--- a/libs/video/renderer/sw32/sw32_rpart.c
+++ b/libs/video/renderer/sw32/sw32_rpart.c
@@ -603,7 +603,6 @@ R_BloodTrail_QF (const entity_t *ent)
 		p->color = 67 + (mtwist_rand (&mt) & 3);
 		for (j = 0; j < 3; j++)
 			p->org[j] = old_origin[j] + ((mtwist_rand (&mt) % 6) - 3);
-		break;
 
 		VectorAdd (old_origin, vec, old_origin);
 	}

From db3df6f8a771fcd7a0ae9a8f64b598c517c83d2b Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 9 Sep 2018 11:12:04 +0900
Subject: [PATCH 0149/1519] Fix a bunch of dead increments.

---
 libs/util/riff.c                  |  2 +-
 libs/video/renderer/gl/vtxarray.c |  3 ---
 libs/video/renderer/sw32/d_scan.c | 12 ------------
 3 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/libs/util/riff.c b/libs/util/riff.c
index 9bbeb461c..c4590ce2d 100644
--- a/libs/util/riff.c
+++ b/libs/util/riff.c
@@ -228,6 +228,7 @@ read_list (riff_d_chunk_t *ck, QFile *f, int len)
 					riff_data_t     *data = malloc (sizeof (riff_data_t));
 					if (!Rread (f, &data->ck, sizeof (data->ck))) {
 						free (data);
+						len = 0;
 					} else {
 						data->ck.len = LittleLong (data->ck.len);
 						data->data = read_data (f, data->ck.len);
@@ -235,7 +236,6 @@ read_list (riff_d_chunk_t *ck, QFile *f, int len)
 						chunk = &data->ck;
 					}
 				}
-				len = 0;
 				break;
 		}
 		if (chunk) {
diff --git a/libs/video/renderer/gl/vtxarray.c b/libs/video/renderer/gl/vtxarray.c
index 78e245a55..dda46974b 100644
--- a/libs/video/renderer/gl/vtxarray.c
+++ b/libs/video/renderer/gl/vtxarray.c
@@ -445,7 +445,6 @@ qfgl_InterleavedArrays (GLenum format, GLsizei stride, const GLvoid *pointer)
 		case GL_C4UB_V2F:
 			qfgl_VertexPointer (2, GL_FLOAT, stride - 2 * sizeof (GLfloat),
 								ptr);
-			ptr += 2 * sizeof (GLfloat);
 			break;
 		case GL_V3F:
 		case GL_C4UB_V3F:
@@ -459,13 +458,11 @@ qfgl_InterleavedArrays (GLenum format, GLsizei stride, const GLvoid *pointer)
 		case GL_T2F_C4F_N3F_V3F:
 			qfgl_VertexPointer (3, GL_FLOAT, stride - 3 * sizeof (GLfloat),
 								ptr);
-			ptr += 3 * sizeof (GLfloat);
 			break;
 		case GL_T4F_V4F:
 		case GL_T4F_C4F_N3F_V4F:
 			qfgl_VertexPointer (4, GL_FLOAT, stride - 4 * sizeof (GLfloat),
 								ptr);
-			ptr += 4 * sizeof (GLfloat);
 			break;
 		default:
 			break;
diff --git a/libs/video/renderer/sw32/d_scan.c b/libs/video/renderer/sw32/d_scan.c
index c77f131df..d5c2000ea 100644
--- a/libs/video/renderer/sw32/d_scan.c
+++ b/libs/video/renderer/sw32/d_scan.c
@@ -515,14 +515,10 @@ sw32_D_DrawSpans (espan_t *pspan)
 					}
 					if (count & 1)
 						pdest[0] = pbase[(t >> 16) * sw32_cachewidth + (s >> 16)];
-					s += sstep;
-					t += tstep;
 				}
 				else
 				{
 					pdest[0] = pbase[(t >> 16) * sw32_cachewidth + (s >> 16)];
-					s += sstep;
-					t += tstep;
 				}
 			}
 		} while ((pspan = pspan->pnext) != NULL);
@@ -657,14 +653,10 @@ sw32_D_DrawSpans (espan_t *pspan)
 					}
 					if (count & 1)
 						pdest[0] = pbase[(t >> 16) * sw32_cachewidth + (s >> 16)];
-					s += sstep;
-					t += tstep;
 				}
 				else
 				{
 					pdest[0] = pbase[(t >> 16) * sw32_cachewidth + (s >> 16)];
-					s += sstep;
-					t += tstep;
 				}
 			}
 		} while ((pspan = pspan->pnext) != NULL);
@@ -800,14 +792,10 @@ sw32_D_DrawSpans (espan_t *pspan)
 					}
 					if (count & 1)
 						pdest[0] = pbase[(t >> 16) * sw32_cachewidth + (s >> 16)];
-					s += sstep;
-					t += tstep;
 				}
 				else
 				{
 					pdest[0] = pbase[(t >> 16) * sw32_cachewidth + (s >> 16)];
-					s += sstep;
-					t += tstep;
 				}
 			}
 		} while ((pspan = pspan->pnext) != NULL);

From 06ab36de3de3d11da1b3b45d0334cdbde70b6d1a Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 9 Sep 2018 13:38:32 +0900
Subject: [PATCH 0150/1519] Slight cleanup of winding allocation.

It seems gcc doesn't care if the & is present when calculating field
offsets, but it not being there bothered me very much and might as well use
our "standard" macro anyway.
---
 tools/qfvis/source/qfvis.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/qfvis/source/qfvis.c b/tools/qfvis/source/qfvis.c
index 7ec7e776c..e32f91d67 100644
--- a/tools/qfvis/source/qfvis.c
+++ b/tools/qfvis/source/qfvis.c
@@ -149,7 +149,7 @@ NewWinding (int points)
 	if (points > MAX_POINTS_ON_WINDING)
 		Sys_Error ("NewWinding: %i points", points);
 
-	size = (size_t)(uintptr_t) ((winding_t *) 0)->points[points];
+	size = field_offset (winding_t, points[points]);
 	winding = calloc (1, size);
 
 	return winding;
@@ -168,7 +168,7 @@ CopyWinding (const winding_t *w)
 	size_t      size;
 	winding_t  *copy;
 
-	size = (size_t) (uintptr_t) ((winding_t *) 0)->points[w->numpoints];
+	size = field_offset (winding_t, points[w->numpoints]);
 	copy = malloc (size);
 	memcpy (copy, w, size);
 	copy->original = false;

From fa1514798ba22f933ccf2499924cd76f3567a18a Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 9 Sep 2018 13:41:00 +0900
Subject: [PATCH 0151/1519] Print the number of threads used by qfvis.

---
 tools/qfvis/source/qfvis.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/qfvis/source/qfvis.c b/tools/qfvis/source/qfvis.c
index e32f91d67..a5520927b 100644
--- a/tools/qfvis/source/qfvis.c
+++ b/tools/qfvis/source/qfvis.c
@@ -724,6 +724,7 @@ CalcVis (void)
 {
 	int         i;
 
+	printf ("Thread count: %d\n", options.threads);
 	BasePortalVis ();
 	CalcPortalVis ();
 

From aebd9288cd0ec21fd3c9bf9cbec8f1d70bd5411f Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 9 Sep 2018 13:41:22 +0900
Subject: [PATCH 0152/1519] Force thread count to 1 when pthreads is
 unavailable.

Don't want the thread count being misreported.
---
 tools/qfvis/source/qfvis.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tools/qfvis/source/qfvis.c b/tools/qfvis/source/qfvis.c
index a5520927b..8c2cc6ed3 100644
--- a/tools/qfvis/source/qfvis.c
+++ b/tools/qfvis/source/qfvis.c
@@ -111,6 +111,9 @@ InitThreads (void)
 	stats_lock = malloc (sizeof (pthread_rwlock_t));
 	if (pthread_rwlock_init (stats_lock, 0))
 		Sys_Error ("pthread_rwlock_init failed");
+#else
+	// Unable to run multi-threaded, so force threadcount to 1
+	options.threads = 1;
 #endif
 }
 
@@ -1112,14 +1115,14 @@ main (int argc, char **argv)
 	dstring_t  *portalfile = dstring_new ();
 	QFile      *f;
 
-	InitThreads ();
-
 	start = Sys_DoubleTime ();
 
 	this_program = argv[0];
 
 	DecodeArgs (argc, argv);
 
+	InitThreads ();
+
 	if (!options.bspfile) {
 		usage (1);
 		Sys_Error ("%s: no bsp file specified.", this_program);

From 113e0d82bac43f240720dd6526cebbd71ab1def7 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 9 Sep 2018 16:48:19 +0900
Subject: [PATCH 0153/1519] Fix a signed comparison error.

Not sure how this fix got lost.
---
 tools/qfcc/source/linker.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/qfcc/source/linker.c b/tools/qfcc/source/linker.c
index 952997374..4d1c86e31 100644
--- a/tools/qfcc/source/linker.c
+++ b/tools/qfcc/source/linker.c
@@ -128,8 +128,8 @@ static builtin_sym_t builtin_symbols[] __attribute__ ((used)) = {
 	{".param_6",	&type_param,	QFOD_NOSAVE | QFOD_GLOBAL},
 	{".param_7",	&type_param,	QFOD_NOSAVE | QFOD_GLOBAL},
 };
-static const int num_builtins = sizeof (builtin_symbols)
-								/ sizeof (builtin_symbols[0]);
+static const unsigned num_builtins = sizeof (builtin_symbols)
+									 / sizeof (builtin_symbols[0]);
 
 static defref_t *defrefs_freelist;
 
@@ -638,7 +638,7 @@ linker_find_def (const char *name)
 void
 linker_begin (void)
 {
-	int         i;
+	unsigned    i;
 
 	linker_current_file = dstring_newstr ();
 

From 71569b45c96926d1822e02f1b8922b304180b6b7 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 9 Sep 2018 18:09:32 +0900
Subject: [PATCH 0154/1519] Pre-format diagnostic messages.

This will make it easier to hook diagnostics enabling unit tests.
---
 tools/qfcc/source/diagnostic.c | 116 ++++++++++++++++-----------------
 1 file changed, 57 insertions(+), 59 deletions(-)

diff --git a/tools/qfcc/source/diagnostic.c b/tools/qfcc/source/diagnostic.c
index 2b2347cc2..6f198851e 100644
--- a/tools/qfcc/source/diagnostic.c
+++ b/tools/qfcc/source/diagnostic.c
@@ -73,10 +73,27 @@ report_function (expr_t *e)
 }
 
 static void
-_warning (expr_t *e, const char *fmt, va_list args)
+format_message (dstring_t *message, const char *msg_type, expr_t *e,
+				const char *fmt, va_list args)
 {
 	string_t    file = pr.source_file;
 	int         line = pr.source_line;
+	const char *colon = fmt ? ": " : "";
+
+	if (e) {
+		file = e->file;
+		line = e->line;
+	}
+	dsprintf (message, "%s:%d: %s%s", GETSTR (file), line, msg_type, colon);
+	if (fmt) {
+		davsprintf (message, fmt, args);
+	}
+}
+
+static void
+_warning (expr_t *e, const char *fmt, va_list args)
+{
+	dstring_t  *message = dstring_new ();
 
 	report_function (e);
 	if (options.warnings.promote) {
@@ -85,13 +102,9 @@ _warning (expr_t *e, const char *fmt, va_list args)
 		pr.error_count++;
 	}
 
-	if (e) {
-		file = e->file;
-		line = e->line;
-	}
-	fprintf (stderr, "%s:%d: warning: ", GETSTR (file), line);
-	vfprintf (stderr, fmt, args);
-	fputs ("\n", stderr);
+	format_message (message, "warning", e, fmt, args);
+	fprintf (stderr, "%s\n", message->str);
+	dstring_delete (message);
 }
 
 void
@@ -102,19 +115,14 @@ debug (expr_t *e, const char *fmt, ...)
 	if (options.verbosity < 1)
 		return;
 
+	report_function (e);
 	va_start (args, fmt);
 	{
-		string_t    file = pr.source_file;
-		int         line = pr.source_line;
+		dstring_t  *message = dstring_new ();
 
-		report_function (e);
-		if (e) {
-			file = e->file;
-			line = e->line;
-		}
-		fprintf (stderr, "%s:%d: debug: ", GETSTR (file), line);
-		vfprintf (stderr, fmt, args);
-		fputs ("\n", stderr);
+		format_message (message, "debug", e, fmt, args);
+		fprintf (stderr, "%s\n", message->str);
+		dstring_delete (message);
 	}
 	va_end (args);
 }
@@ -123,19 +131,17 @@ void
 bug (expr_t *e, const char *fmt, ...)
 {
 	va_list     args;
-	string_t    file = pr.source_file;
-	int         line = pr.source_line;
-
-	va_start (args, fmt);
 
 	report_function (e);
-	if (e) {
-		file = e->file;
-		line = e->line;
+
+	va_start (args, fmt);
+	{
+		dstring_t  *message = dstring_new ();
+
+		format_message (message, "BUG", e, fmt, args);
+		fprintf (stderr, "%s\n", message->str);
+		dstring_delete (message);
 	}
-	fprintf (stderr, "%s:%d: BUG: ", GETSTR (file), line);
-	vfprintf (stderr, fmt, args);
-	fputs ("\n", stderr);
 	va_end (args);
 }
 
@@ -151,17 +157,13 @@ notice (expr_t *e, const char *fmt, ...)
 	if (options.notices.promote) {
 		_warning (e, fmt, args);
 	} else {
-		string_t    file = pr.source_file;
-		int         line = pr.source_line;
+		dstring_t  *message = dstring_new ();
 
 		report_function (e);
-		if (e) {
-			file = e->file;
-			line = e->line;
-		}
-		fprintf (stderr, "%s:%d: notice: ", GETSTR (file), line);
-		vfprintf (stderr, fmt, args);
-		fputs ("\n", stderr);
+
+		format_message (message, "notice", e, fmt, args);
+		fprintf (stderr, "%s\n", message->str);
+		dstring_delete (message);
 	}
 	va_end (args);
 	return e;
@@ -178,33 +180,21 @@ warning (expr_t *e, const char *fmt, ...)
 	return e;
 }
 
-static void
-_error (expr_t *e, const char *err, const char *fmt, va_list args)
-{
-	string_t    file = pr.source_file;
-	int         line = pr.source_line;
-
-	report_function (e);
-
-	if (e) {
-		file = e->file;
-		line = e->line;
-	}
-	fprintf (stderr, "%s:%d: %s%s", GETSTR (file), line, err,
-			 fmt ? ": " : "");
-	if (fmt)
-		vfprintf (stderr, fmt, args);
-	fputs ("\n", stderr);
-	pr.error_count++;
-}
-
 void
 internal_error (expr_t *e, const char *fmt, ...)
 {
 	va_list     args;
 
+	report_function (e);
+
 	va_start (args, fmt);
-	_error (e, "internal error", fmt, args);
+	{
+		dstring_t  *message = dstring_new ();
+
+		format_message (message, "internal error", e, fmt, args);
+		fprintf (stderr, "%s\n", message->str);
+		dstring_delete (message);
+	}
 	va_end (args);
 	abort ();
 }
@@ -214,8 +204,16 @@ error (expr_t *e, const char *fmt, ...)
 {
 	va_list     args;
 
+	report_function (e);
+
 	va_start (args, fmt);
-	_error (e, "error", fmt, args);
+	{
+		dstring_t  *message = dstring_new ();
+
+		format_message (message, "error", e, fmt, args);
+		fprintf (stderr, "%s\n", message->str);
+		dstring_delete (message);
+	}
 	va_end (args);
 
 	if (!e)

From d1cb15664f7535eb62057d0dd84d05f4832d00f9 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 9 Sep 2018 22:34:24 +0900
Subject: [PATCH 0155/1519] Fix some spelling issues in a comment.

---
 tools/qfcc/include/defspace.h | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/tools/qfcc/include/defspace.h b/tools/qfcc/include/defspace.h
index 371af492e..8e7f034d6 100644
--- a/tools/qfcc/include/defspace.h
+++ b/tools/qfcc/include/defspace.h
@@ -115,14 +115,14 @@ int defspace_alloc_loc (defspace_t *space, int size);
 	first word of the block and \a size indicating the number of words in the
 	block.
 
-	If the block to be freed has 0 words, or if the is partly or fully outside
-	the defspace (as defined by defspace_t::size), or if the block overlaps
-	any unallocated space in the defspace, then an internal error will be
-	generated. However, it is perfectly valid to allocate a large block and
-	subsequently free a small block from anywhere within the larger block.
-	This is because when memory is not fragmented, there is no difference
-	between allocating one large block and allocating several smaller blocks
-	when allocating the same amount of memory.
+	If the block to be freed has 0 words, or if the block is partly or fully
+	outside the defspace (as defined by defspace_t::size), or if the block
+	overlaps any unallocated space in the defspace, then an internal error
+	will be generated. However, it is perfectly valid to allocate a large
+	block and subsequently free a small block from anywhere within the larger
+	block.  This is because when memory is not fragmented, there is no
+	difference between allocating one large block and allocating several
+	smaller blocks when allocating the same amount of memory.
 
 	\param space	The space to which the freed block will be returned.
 	\param ofs		The first word of the block to be freed.
@@ -136,7 +136,7 @@ void defspace_free_loc (defspace_t *space, int ofs, int size);
 	defspace_alloc_loc().
 
 	If \a data is null, then the copying stage is skipped and this function
-	because a synonym for defspace_alloc_loc().
+	becomes a synonym for defspace_alloc_loc().
 
 	\param space	The space to which the data will be added.
 	\param data		The data to be copied into the space.

From 3a4667318c2063c2e3041aabf0cad293abb7ff7c Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 9 Sep 2018 22:36:20 +0900
Subject: [PATCH 0156/1519] Fix the qfcc test autodependencies.

---
 tools/qfcc/test/Makefile.am | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/tools/qfcc/test/Makefile.am b/tools/qfcc/test/Makefile.am
index 9bb48d112..23e366078 100644
--- a/tools/qfcc/test/Makefile.am
+++ b/tools/qfcc/test/Makefile.am
@@ -38,8 +38,7 @@ test_progs_dat=\
 	while.dat \
 	voidfor.dat
 
-fail_progs_dat=\
-	$E
+fail_progs_dat=
 
 TESTS=$(test_progs_dat:.dat=.run)
 XFAIL_TESTS=$(fail_progs_dat:.dat=.run)
@@ -56,6 +55,7 @@ chewed-alias.dat$(EXEEXT): $(chewed_alias_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(chewed_alias_obj)
 chewed-alias.run: Makefile build-run
 	$(srcdir)/build-run $@
+include ./$(DEPDIR)/chewed-alias.Qo
 
 chewed_return_dat_SOURCES=chewed-return.r
 chewed_return_obj=$(chewed_return_dat_SOURCES:.r=.qfo)
@@ -63,6 +63,7 @@ chewed-return.dat$(EXEEXT): $(chewed_return_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(chewed_return_obj)
 chewed-return.run: Makefile build-run
 	TEST_HARNESS_OPTS=--float $(srcdir)/build-run $@
+include ./$(DEPDIR)/chewed-return.Qo
 
 func_expr_dat_SOURCES=func-expr.r
 func_expr_obj=$(func_expr_dat_SOURCES:.r=.qfo)
@@ -70,6 +71,7 @@ func-expr.dat$(EXEEXT): $(func_expr_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(func_expr_obj)
 func-expr.run: Makefile build-run
 	$(srcdir)/build-run $@
+include ./$(DEPDIR)/func-expr.Qo
 
 func_static_dat_SOURCES=func-static.r
 func_static_obj=$(func_static_dat_SOURCES:.r=.qfo)
@@ -77,6 +79,7 @@ func-static.dat$(EXEEXT): $(func_static_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(func_static_obj)
 func-static.run: Makefile build-run
 	$(srcdir)/build-run $@
+include ./$(DEPDIR)/func-static.Qo
 
 deadbool_dat_SOURCES=deadbool.r
 deadbool_obj=$(deadbool_dat_SOURCES:.r=.qfo)
@@ -84,6 +87,7 @@ deadbool.dat$(EXEEXT): $(deadbool_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(deadbool_obj)
 deadbool.run: Makefile build-run
 	$(srcdir)/build-run $@
+include ./$(DEPDIR)/deadbool.Qo
 
 infloop_dat_SOURCES=infloop.r
 infloop_obj=$(infloop_dat_SOURCES:.r=.qfo)
@@ -91,6 +95,7 @@ infloop.dat$(EXEEXT): $(infloop_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(infloop_obj)
 infloop.run: Makefile build-run
 	$(srcdir)/build-run $@
+include ./$(DEPDIR)/infloop.Qo
 
 modulo_dat_SOURCES=modulo.r
 modulo_obj=$(modulo_dat_SOURCES:.r=.qfo)
@@ -98,6 +103,7 @@ modulo.dat$(EXEEXT): $(modulo_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(modulo_obj)
 modulo.run: Makefile build-run
 	TEST_HARNESS_OPTS=--float $(srcdir)/build-run $@
+include ./$(DEPDIR)/modulo.Qo
 
 paramret_dat_SOURCES=paramret.r
 paramret_obj=$(paramret_dat_SOURCES:.r=.qfo)
@@ -105,6 +111,7 @@ paramret.dat$(EXEEXT): $(paramret_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(paramret_obj)
 paramret.run: Makefile build-run
 	TEST_HARNESS_OPTS=--float $(srcdir)/build-run $@
+include ./$(DEPDIR)/paramret.Qo
 
 return_ivar_dat_SOURCES=return-ivar.r
 return_ivar_obj=$(return_ivar_dat_SOURCES:.r=.qfo)
@@ -112,6 +119,7 @@ return-ivar.dat$(EXEEXT): $(return_ivar_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(return_ivar_obj)
 return-ivar.run: Makefile build-run
 	$(srcdir)/build-run $@
+include ./$(DEPDIR)/return-ivar.Qo
 
 sendv_dat_SOURCES=sendv.r
 sendv_obj=$(sendv_dat_SOURCES:.r=.qfo)
@@ -119,6 +127,7 @@ sendv.dat$(EXEEXT): $(sendv_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(sendv_obj)
 sendv.run: Makefile build-run
 	$(srcdir)/build-run $@
+include ./$(DEPDIR)/sendv.Qo
 
 state_dat_SOURCES=state.r
 state_obj=$(state_dat_SOURCES:.r=.qfo)
@@ -126,6 +135,7 @@ state.dat$(EXEEXT): $(state_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(state_obj)
 state.run: Makefile build-run
 	$(srcdir)/build-run $@
+include ./$(DEPDIR)/state.Qo
 
 structlive_dat_SOURCES=structlive.r
 structlive_obj=$(structlive_dat_SOURCES:.r=.qfo)
@@ -133,6 +143,7 @@ structlive.dat$(EXEEXT): $(structlive_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(structlive_obj)
 structlive.run: Makefile build-run
 	$(srcdir)/build-run $@
+include ./$(DEPDIR)/structlive.Qo
 
 structptr_dat_SOURCES=structptr.r
 structptr_obj=$(structptr_dat_SOURCES:.r=.qfo)
@@ -140,6 +151,7 @@ structptr.dat$(EXEEXT): $(structptr_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(structptr_obj)
 structptr.run: Makefile build-run
 	$(srcdir)/build-run $@
+include ./$(DEPDIR)/structptr.Qo
 
 swap_dat_SOURCES=swap.r
 swap_obj=$(swap_dat_SOURCES:.r=.qfo)
@@ -147,6 +159,7 @@ swap.dat$(EXEEXT): $(swap_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(swap_obj)
 swap.run: Makefile build-run
 	$(srcdir)/build-run $@
+include ./$(DEPDIR)/swap.Qo
 
 triangle_dat_SOURCES=triangle.r
 triangle_obj=$(triangle_dat_SOURCES:.r=.qfo)
@@ -154,6 +167,7 @@ triangle.dat$(EXEEXT): $(triangle_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(triangle_obj)
 triangle.run: Makefile build-run
 	$(srcdir)/build-run $@ 100000 100000 1.00005 50002.4961
+include ./$(DEPDIR)/triangle.Qo
 
 vecinit_dat_SOURCES=vecinit.r
 vecinit_obj=$(vecinit_dat_SOURCES:.r=.qfo)
@@ -161,6 +175,7 @@ vecinit.dat$(EXEEXT): $(vecinit_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(vecinit_obj)
 vecinit.run: Makefile build-run
 	$(srcdir)/build-run $@
+include ./$(DEPDIR)/vecinit.Qo
 
 while_dat_SOURCES=while.r
 while_obj=$(while_dat_SOURCES:.r=.qfo)
@@ -168,6 +183,7 @@ while.dat$(EXEEXT): $(while_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(while_obj)
 while.run: Makefile build-run
 	$(srcdir)/build-run $@
+include ./$(DEPDIR)/while.Qo
 
 voidfor_dat_SOURCES=voidfor.r
 voidfor_obj=$(voidfor_dat_SOURCES:.r=.qfo)
@@ -175,8 +191,8 @@ voidfor.dat$(EXEEXT): $(voidfor_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(voidfor_obj)
 voidfor.run: Makefile build-run
 	$(srcdir)/build-run $@
+include ./$(DEPDIR)/voidfor.Qo
 
-include ./$(DEPDIR)/*.Qo
 
 EXTRA_DIST= test-bi.h build-run
 CLEANFILES= *.dat *.sym *.qfo *.run *.frame

From 05fd2d8cddadc248434b5f17759d11874373b31f Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 9 Sep 2018 22:37:09 +0900
Subject: [PATCH 0157/1519] Start work on a unit test for defspace.

---
 tools/qfcc/test/Makefile.am     |  23 ++++++-
 tools/qfcc/test/test-defspace.c | 110 ++++++++++++++++++++++++++++++++
 tools/qfcc/test/tw-defspace.c   |   1 +
 tools/qfcc/test/tw-diagnostic.c |   1 +
 tools/qfcc/test/tw-strpool.c    |   1 +
 5 files changed, 133 insertions(+), 3 deletions(-)
 create mode 100644 tools/qfcc/test/test-defspace.c
 create mode 100644 tools/qfcc/test/tw-defspace.c
 create mode 100644 tools/qfcc/test/tw-diagnostic.c
 create mode 100644 tools/qfcc/test/tw-strpool.c

diff --git a/tools/qfcc/test/Makefile.am b/tools/qfcc/test/Makefile.am
index 23e366078..cf982bd69 100644
--- a/tools/qfcc/test/Makefile.am
+++ b/tools/qfcc/test/Makefile.am
@@ -1,4 +1,9 @@
 AUTOMAKE_OPTIONS= foreign
+
+QFCC_LIBS=@QFCC_LIBS@
+QFCC_DEPS=@QFCC_DEPS@
+QFCC_INCS=@QFCC_INCS@
+
 AM_CPPFLAGS= -I$(top_srcdir)/include $(QFCC_INCS)
 
 QFCC_DEP=$(builddir)/../source/qfcc$(EXEEXT)
@@ -18,6 +23,11 @@ QFCC_TEST_LIBS=@QFCC_TEST_LIBS@
 QFCC_TEST_DEPS=@QFCC_TEST_DEPS@
 QFCC_TEST_INCS=@QFCC_TEST_INCS@
 
+test_bins=\
+	test-defspace
+
+fail_bins=
+
 test_progs_dat=\
 	chewed-alias.dat \
 	chewed-return.dat \
@@ -40,10 +50,17 @@ test_progs_dat=\
 
 fail_progs_dat=
 
-TESTS=$(test_progs_dat:.dat=.run)
-XFAIL_TESTS=$(fail_progs_dat:.dat=.run)
+test_defspace_src=\
+	tw-defspace.c tw-diagnostic.c tw-strpool.c
 
-check_PROGRAMS=test-harness $(test_progs_dat)
+TESTS=$(test_bins) $(test_progs_dat:.dat=.run)
+XFAIL_TESTS=$(fail_bins) $(fail_progs_dat:.dat=.run)
+
+check_PROGRAMS=test-harness $(test_progs_dat) $(test_bins)
+
+test_defspace_SOURCES=		test-defspace.c $(test_defspace_src)
+test_defspace_LDADD=		$(QFCC_LIBS)
+test_defspace_DEPENDENCIES=	$(QFCC_DEPS)
 
 test_harness_SOURCES=		test-bi.c test-harness.c
 test_harness_LDADD=			$(QFCC_TEST_LIBS)
diff --git a/tools/qfcc/test/test-defspace.c b/tools/qfcc/test/test-defspace.c
new file mode 100644
index 000000000..bc5f45077
--- /dev/null
+++ b/tools/qfcc/test/test-defspace.c
@@ -0,0 +1,110 @@
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "class.h"
+#include "defspace.h"
+#include "expr.h"
+#include "function.h"
+#include "options.h"
+#include "strpool.h"
+#include "qfcc.h"
+
+options_t   options;
+pr_info_t   pr;
+function_t *current_func;
+class_type_t *current_class;
+
+const char *
+get_class_name (class_type_t *class_type, int prett)
+{
+	return 0;
+}
+
+expr_t *
+new_expr (void)
+{
+	return calloc(1, sizeof (expr_t));
+}
+
+static int
+check_init_state (const defspace_t *space, const char *name)
+{
+	int pass = 1;
+
+	if (space->free_locs) {
+		printf ("%s free_locs not null\n", name);
+		pass = 0;
+	}
+	if (space->defs) {
+		printf ("%s defs not null\n", name);
+		pass = 0;
+	}
+	if (space->def_tail != &space->defs) {
+		printf ("%s def_tail not pointing to defs\n", name);
+		pass = 0;
+	}
+	if (space->data) {
+		printf ("%s data not null\n", name);
+		pass = 0;
+	}
+	if (space->size) {
+		printf ("%s size not 0\n", name);
+		pass = 0;
+	}
+	if (space->max_size) {
+		printf ("%s max_size not 0\n", name);
+		pass = 0;
+	}
+	if (!space->grow) {
+		printf ("%s grow is null\n", name);
+		pass = 0;
+	}
+	if (space->qfo_space) {
+		printf ("%s qfo_space not 0\n", name);
+		pass = 0;
+	}
+	return pass;
+}
+
+static int
+test_init (void)
+{
+	int pass = 1;
+	defspace_t *backed = defspace_new (ds_backed);
+	defspace_t *virtual = defspace_new (ds_virtual);
+
+	if (backed->grow == virtual->grow) {
+		printf ("expected different grow functions for backed and virtual\n");
+		pass = 0;
+	}
+
+	if (backed->type != ds_backed) {
+		printf ("backed ds has wrong type\n");
+		pass = 0;
+	}
+
+	if (virtual->type != ds_virtual) {
+		printf ("virtual ds has wrong type\n");
+		pass = 0;
+	}
+
+	pass &= check_init_state (backed, "backed");
+	pass &= check_init_state (virtual, "virtual");
+
+	return pass;
+}
+
+int
+main (int argc, const char **argv)
+{
+	pr.strings = strpool_new ();
+
+	int pass = 1;
+
+	pass &= test_init ();
+
+	return !pass;
+}
diff --git a/tools/qfcc/test/tw-defspace.c b/tools/qfcc/test/tw-defspace.c
new file mode 100644
index 000000000..c3b950324
--- /dev/null
+++ b/tools/qfcc/test/tw-defspace.c
@@ -0,0 +1 @@
+#include "../source/defspace.c"
diff --git a/tools/qfcc/test/tw-diagnostic.c b/tools/qfcc/test/tw-diagnostic.c
new file mode 100644
index 000000000..d84f8ad33
--- /dev/null
+++ b/tools/qfcc/test/tw-diagnostic.c
@@ -0,0 +1 @@
+#include "../source/diagnostic.c"
diff --git a/tools/qfcc/test/tw-strpool.c b/tools/qfcc/test/tw-strpool.c
new file mode 100644
index 000000000..74fbb8d75
--- /dev/null
+++ b/tools/qfcc/test/tw-strpool.c
@@ -0,0 +1 @@
+#include "../source/strpool.c"

From 34bcf7faab89298a031677866f248f5531aece88 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 9 Oct 2018 12:35:01 +0900
Subject: [PATCH 0158/1519] Do a pure/const/noreturn/format attribute pass.

I always wanted these, but as gcc now provides warnings for functions that
could do with such attributes, finding all the functions is much easier.
---
 config.d/compiling.m4                  |  4 ++
 hw/source/master.c                     |  4 +-
 include/QF/GLSL/qf_lightmap.h          |  2 +-
 include/QF/GLSL/qf_textures.h          |  2 +-
 include/QF/cmd.h                       | 10 ++---
 include/QF/console.h                   |  6 +--
 include/QF/crc.h                       |  4 +-
 include/QF/cvar.h                      |  4 +-
 include/QF/dstring.h                   |  4 +-
 include/QF/gib.h                       |  8 ++--
 include/QF/hash.h                      |  6 +--
 include/QF/info.h                      |  4 +-
 include/QF/joystick.h                  |  8 ++--
 include/QF/keys.h                      |  8 ++--
 include/QF/llist.h                     |  4 +-
 include/QF/locs.h                      |  4 +-
 include/QF/math/half.h                 |  4 +-
 include/QF/math/matrix3.h              |  2 +-
 include/QF/math/vector.h               |  6 +--
 include/QF/mathlib.h                   | 12 +++---
 include/QF/model.h                     |  4 +-
 include/QF/msg.h                       |  2 +-
 include/QF/plugin.h                    |  2 +-
 include/QF/plugin/console.h            |  2 +-
 include/QF/progs.h                     | 30 +++++++-------
 include/QF/qargs.h                     |  2 +-
 include/QF/qendian.h                   | 12 +++---
 include/QF/qfplist.h                   | 10 ++---
 include/QF/quakefs.h                   |  4 +-
 include/QF/quakeio.h                   |  2 +-
 include/QF/script.h                    |  2 +-
 include/QF/set.h                       | 16 ++++----
 include/QF/sys.h                       |  4 +-
 include/QF/zone.h                      |  4 +-
 include/d_iface.h                      |  2 +-
 include/d_local.h                      |  6 +--
 include/exp.h                          |  2 +-
 include/gib_buffer.h                   |  2 +-
 include/gib_parse.h                    |  4 +-
 include/gib_regex.h                    |  6 +--
 include/netchan.h                      |  8 ++--
 include/ops.h                          | 56 +++++++++++++-------------
 include/qstring.h                      |  4 +-
 include/qw/msg_backbuf.h               |  2 +-
 include/qw/pmove.h                     |  4 +-
 include/r_internal.h                   |  4 +-
 include/r_local.h                      |  2 +-
 include/r_screen.h                     |  2 +-
 include/snd_internal.h                 | 10 ++---
 include/world.h                        |  6 +--
 libs/audio/targets/snd_alsa.c          |  2 +-
 libs/console/client.c                  |  2 +-
 libs/console/server.c                  |  2 +-
 libs/gamecode/pr_strings.c             |  4 +-
 libs/gib/exp.c                         |  2 +-
 libs/net/nm/net_dgrm.c                 |  4 +-
 libs/net/nm/net_loop.c                 |  6 +--
 libs/net/nm/net_udp.c                  |  6 +--
 libs/net/nm/net_vcr.c                  |  4 +-
 libs/util/dstring.c                    |  2 +-
 libs/util/set.c                        | 12 +++---
 libs/util/sys.c                        |  4 +-
 libs/util/test/test-vrect.c            |  2 +-
 libs/video/renderer/gl/qfgl_ext.c      |  2 +-
 libs/video/renderer/glsl/glsl_bsp.c    |  2 +-
 libs/video/renderer/glsl/glsl_screen.c |  2 +-
 libs/video/renderer/sw32/screen.c      |  2 +-
 libs/video/targets/keys.c              |  2 +-
 nq/include/host.h                      |  6 +--
 nq/include/server.h                    |  4 +-
 nq/source/host_cmd.c                   |  2 +-
 nq/source/sv_ded.c                     |  4 +-
 nq/source/sv_pr_cmds.c                 |  2 +-
 nq/source/world.c                      |  2 +-
 qtv/source/qtv.c                       |  2 +-
 qw/include/cl_cam.h                    |  6 +--
 qw/include/cl_parse.h                  |  2 +-
 qw/include/crudefile.h                 |  2 +-
 qw/include/host.h                      |  4 +-
 qw/include/server.h                    | 10 ++---
 qw/include/sv_recorder.h               |  4 +-
 qw/source/cl_slist.c                   |  4 +-
 qw/source/sv_main.c                    |  4 +-
 qw/source/sv_pr_cmds.c                 |  4 +-
 qw/source/world.c                      |  4 +-
 tools/qfbsp/include/brush.h            |  2 +-
 tools/qfbsp/include/map.h              |  2 +-
 tools/qfbsp/source/outside.c           |  2 +-
 tools/qfbsp/source/portals.c           |  8 ++--
 tools/qfbsp/source/solidbsp.c          |  4 +-
 tools/qfcc/include/class.h             | 16 ++++----
 tools/qfcc/include/def.h               |  6 +--
 tools/qfcc/include/expr.h              | 38 ++++++++---------
 tools/qfcc/include/qfcc.h              |  2 +-
 tools/qfcc/include/statements.h        | 14 +++----
 tools/qfcc/include/symtab.h            |  2 +-
 tools/qfcc/include/type.h              | 22 +++++-----
 tools/qfcc/source/class.c              |  2 +-
 tools/qfcc/source/constfold.c          |  2 +-
 tools/qfcc/source/dags.c               |  2 +-
 tools/qfcc/source/diagnostic.c         |  4 +-
 tools/qfcc/source/expr.c               |  4 +-
 tools/qfcc/source/flow.c               |  2 +-
 tools/qfcc/source/method.c             |  2 +-
 tools/qfcc/source/obj_file.c           |  2 +-
 tools/qfcc/source/qc-lex.l             |  7 ++++
 tools/qfcc/source/qfcc.c               |  2 +-
 tools/qfcc/source/qp-lex.l             |  9 ++++-
 tools/qfcc/source/stub.c               | 10 ++---
 tools/qfcc/source/switch.c             |  6 +--
 tools/qfcc/source/type.c               |  2 +-
 tools/qfcc/source/value.c              |  4 +-
 tools/qfcc/test/test-defspace.c        |  2 +-
 tools/qflight/include/light.h          |  2 +-
 tools/qflight/include/noise.h          |  8 ++--
 tools/qflight/include/options.h        |  2 +-
 tools/qflight/source/vis.c             |  2 +-
 tools/qfvis/include/options.h          |  2 +-
 118 files changed, 332 insertions(+), 314 deletions(-)

diff --git a/config.d/compiling.m4 b/config.d/compiling.m4
index 457882d09..343218d35 100644
--- a/config.d/compiling.m4
+++ b/config.d/compiling.m4
@@ -213,6 +213,10 @@ if test $CC_MAJ -gt 4 -o $CC_MAJ -eq 4 -a $CC_MIN -ge 5; then
 fi
 QF_CC_OPTION(-Wtype-limits)
 QF_CC_OPTION_TEST([-fvisibility=hidden], [VISIBILITY=-fvisibility=hidden])
+QF_CC_OPTION(-Wsuggest-attribute=pure)
+QF_CC_OPTION(-Wsuggest-attribute=const)
+QF_CC_OPTION(-Wsuggest-attribute=noreturn)
+QF_CC_OPTION(-Wsuggest-attribute=format)
 
 dnl QuakeForge uses lots of BCPL-style (//) comments, which can cause problems
 dnl with many compilers that do not support the latest ISO standards. Well,
diff --git a/hw/source/master.c b/hw/source/master.c
index 4617e3c7d..6e744c4ac 100644
--- a/hw/source/master.c
+++ b/hw/source/master.c
@@ -121,7 +121,7 @@ FL_Add (filter_t * filter)
 	filter_list = filter;
 }
 
-static filter_t *
+static __attribute__((pure)) filter_t *
 FL_Find (netadr_t adr)
 {
 	filter_t   *filter;
@@ -209,7 +209,7 @@ SVL_Add (server_t *sv)
 	sv_list = sv;
 }
 
-static server_t *
+static __attribute__((pure)) server_t *
 SVL_Find (netadr_t adr)
 {
 	server_t   *sv;
diff --git a/include/QF/GLSL/qf_lightmap.h b/include/QF/GLSL/qf_lightmap.h
index ef828d6d8..7619ed890 100644
--- a/include/QF/GLSL/qf_lightmap.h
+++ b/include/QF/GLSL/qf_lightmap.h
@@ -37,7 +37,7 @@ void glsl_lightmap_init (void);
 void glsl_R_BuildLightmaps (struct model_s **models, int num_models);
 void glsl_R_CalcLightmaps (void);
 extern void (*glsl_R_BuildLightMap) (msurface_t *surf);
-int  glsl_R_LightmapTexture (void);
+int  glsl_R_LightmapTexture (void) __attribute__((pure));
 void glsl_R_FlushLightmaps (void);
 
 #endif//__QF_GLSL_lightmap_h
diff --git a/include/QF/GLSL/qf_textures.h b/include/QF/GLSL/qf_textures.h
index 1447d797a..5f30fbf68 100644
--- a/include/QF/GLSL/qf_textures.h
+++ b/include/QF/GLSL/qf_textures.h
@@ -55,7 +55,7 @@ void GLSL_TextureInit (void);
 scrap_t *GLSL_CreateScrap (int size, int format, int linear);
 void GLSL_DestroyScrap (scrap_t *scrap);
 void GLSL_ScrapClear (scrap_t *scrap);
-int GLSL_ScrapTexture (scrap_t *scrap);
+int GLSL_ScrapTexture (scrap_t *scrap) __attribute__((pure));
 subpic_t *GLSL_ScrapSubpic (scrap_t *scrap, int width, int height);	//XXX slow!
 void GLSL_SubpicDelete (subpic_t *subpic);	//XXX slow!
 void GLSL_SubpicUpdate (subpic_t *subpic, byte *data, int batch);
diff --git a/include/QF/cmd.h b/include/QF/cmd.h
index 85131083e..2ac508b9f 100644
--- a/include/QF/cmd.h
+++ b/include/QF/cmd.h
@@ -60,14 +60,14 @@ int		Cmd_AddCommand (const char *cmd_name, xcommand_t function, const char *desc
 int		Cmd_RemoveCommand (const char *cmd_name);
 
 qboolean Cmd_Exists (const char *cmd_name);
-const char 	*Cmd_CompleteCommand (const char *partial);
-int		Cmd_CompleteCountPossible (const char *partial);
+const char 	*Cmd_CompleteCommand (const char *partial) __attribute__((pure));
+int		Cmd_CompleteCountPossible (const char *partial) __attribute__((pure));
 const char	**Cmd_CompleteBuildList (const char *partial);
 
 
-int Cmd_Argc (void);
-const char *Cmd_Argv (int arg);
-const char *Cmd_Args (int start);
+int Cmd_Argc (void) __attribute__((pure));
+const char *Cmd_Argv (int arg) __attribute__((pure));
+const char *Cmd_Args (int start) __attribute__((pure));
 struct cbuf_args_s;
 int Cmd_Command (struct cbuf_args_s *args);
 int Cmd_ExecuteString (const char *text, cmd_source_t src);
diff --git a/include/QF/console.h b/include/QF/console.h
index eeb9010d6..4f3bcb3c8 100644
--- a/include/QF/console.h
+++ b/include/QF/console.h
@@ -92,8 +92,8 @@ extern struct console_data_s con_data;
 void Con_CheckResize (void);
 void Con_DrawConsole (void);
 
-void Con_Printf (const char *fmt, ...);
-void Con_Print (const char *fmt, va_list args);
+void Con_Printf (const char *fmt, ...) __attribute__((format(printf, 1, 2)));
+void Con_Print (const char *fmt, va_list args) __attribute__((format(printf, 1, 0)));
 void Con_ToggleConsole_f (void);
 
 // wrapper function to attempt to either complete the command line
@@ -105,7 +105,7 @@ void Con_BasicCompleteCommandLine (inputline_t *il);
 // Generic libs/util/console.c function to display a list
 // formatted in columns on the console
 void Con_DisplayList(const char **list, int con_linewidth);
-extern void (*con_list_print)(const char *fmt, ...);
+extern void (*con_list_print)(const char *fmt, ...) __attribute__((format(printf, 1, 2)));
 
 inputline_t *Con_CreateInputLine (int lines, int lsize, char prompt);
 void Con_DestroyInputLine (inputline_t *inputline);
diff --git a/include/QF/crc.h b/include/QF/crc.h
index 8c3154137..2aa16b616 100644
--- a/include/QF/crc.h
+++ b/include/QF/crc.h
@@ -38,8 +38,8 @@
 void CRC_Init(unsigned short *crcvalue);
 void CRC_ProcessByte(unsigned short *crcvalue, byte data);
 void CRC_ProcessBlock (const byte *start, unsigned short *crcvalue, int count);
-unsigned short CRC_Value(unsigned short crcvalue);
-unsigned short CRC_Block (const byte *start, int count);
+unsigned short CRC_Value(unsigned short crcvalue) __attribute__((const));
+unsigned short CRC_Block (const byte *start, int count) __attribute__((pure));
 
 //@}
 
diff --git a/include/QF/cvar.h b/include/QF/cvar.h
index 4f182d285..091a13b61 100644
--- a/include/QF/cvar.h
+++ b/include/QF/cvar.h
@@ -122,12 +122,12 @@ void 	Cvar_WriteVariables (QFile *f);
 
 // attempts to match a partial variable name for command line completion
 // returns NULL if nothing fits
-const char 	*Cvar_CompleteVariable (const char *partial);
+const char 	*Cvar_CompleteVariable (const char *partial) __attribute__((pure));
 
 // Added by EvilTypeGuy - functions for tab completion system
 // Thanks to Fett erich@heintz.com
 // Thanks to taniwha
-int		Cvar_CompleteCountPossible (const char *partial);
+int		Cvar_CompleteCountPossible (const char *partial) __attribute__((pure));
 const char	**Cvar_CompleteBuildList (const char *partial);
 
 // Returns a pointer to the Cvar, NULL if not found
diff --git a/include/QF/dstring.h b/include/QF/dstring.h
index 85ea7d61f..1075bc04b 100644
--- a/include/QF/dstring.h
+++ b/include/QF/dstring.h
@@ -164,14 +164,14 @@ void dstring_clearstr (dstring_t *dstr);
 /** Formatted printing to dstrings. Existing data is replaced by the formatted
 	string.
 */
-int dvsprintf (dstring_t *dstr, const char *fmt, va_list args);
+int dvsprintf (dstring_t *dstr, const char *fmt, va_list args) __attribute__((format(printf,2,0)));
 int dsprintf (dstring_t *dstr, const char *fmt, ...) __attribute__((format(printf,2,3)));
 //@}
 //@{
 /** Formatted printing to dstrings. Formatted string is appened to the dstring.
 	Embedded nulls in the dstring are ignored.
 */
-int davsprintf (dstring_t *dstr, const char *fmt, va_list args);
+int davsprintf (dstring_t *dstr, const char *fmt, va_list args) __attribute__((format(printf,2,0)));
 int dasprintf (dstring_t *dstr, const char *fmt, ...) __attribute__((format(printf,2,3)));
 //@}
 
diff --git a/include/QF/gib.h b/include/QF/gib.h
index aa97e3b05..34c187ac7 100644
--- a/include/QF/gib.h
+++ b/include/QF/gib.h
@@ -182,7 +182,7 @@ extern char * const gib_null_string;
 #define GIB_CanReturn() (GIB_DATA(cbuf_active)->waitret)
 
 dstring_t *GIB_Return (const char *str);
-void GIB_Error (const char *type, const char *fmt, ...);
+void GIB_Error (const char *type, const char *fmt, ...) __attribute__((format(printf, 2, 3)));
 void GIB_Builtin_Add (const char *name, void (*func) (void));
 void GIB_Builtin_Remove (const char *name);
 qboolean GIB_Builtin_Exists (const char *name);
@@ -199,12 +199,12 @@ void GIB_Event_Callback (gib_event_t *event, unsigned int argc, ...);
 
 // Interpreter interface (for creating GIB cbufs)
 
-cbuf_interpreter_t *GIB_Interpreter (void);
+cbuf_interpreter_t *GIB_Interpreter (void) __attribute__((const));
 
 // Thread interface
 
 void GIB_Thread_Execute (void);
-unsigned int GIB_Thread_Count (void);
+unsigned int GIB_Thread_Count (void) __attribute__((pure));
 
 // Init interface
 
@@ -214,6 +214,6 @@ void GIB_Init (qboolean sandbox);
 
 unsigned long int GIB_Handle_New (gib_object_t *data);
 void GIB_Handle_Free (unsigned long int num);
-gib_object_t *GIB_Handle_Get (unsigned long int num);
+gib_object_t *GIB_Handle_Get (unsigned long int num) __attribute__((pure));
 
 #endif
diff --git a/include/QF/hash.h b/include/QF/hash.h
index 5cff9d115..1a8a8f912 100644
--- a/include/QF/hash.h
+++ b/include/QF/hash.h
@@ -177,20 +177,20 @@ void Hash_Free (hashtab_t *tab, void *ele);
 
 	this is the same function as used internally.
 */
-unsigned long Hash_String (const char *str);
+unsigned long Hash_String (const char *str) __attribute__((pure));
 
 /** hash a buffer.
 	\param buf	the buffer to hash
 	\param len	the size of the buffer
 	\return		the hash value of the string.
 */
-unsigned long Hash_Buffer (const void *buf, int len);
+unsigned long Hash_Buffer (const void *buf, int len) __attribute__((pure));
 
 /** get the size of the table
 	\param tab	the table in question
 	\return		the number of elements in the table.
 */
-size_t Hash_NumElements (hashtab_t *tab);
+size_t Hash_NumElements (hashtab_t *tab) __attribute__((pure));
 
 /** list of all elements in the table.
 	\param tab	the table to list
diff --git a/include/QF/info.h b/include/QF/info.h
index 518a35c23..d57a221f6 100644
--- a/include/QF/info.h
+++ b/include/QF/info.h
@@ -47,10 +47,10 @@ typedef struct info_key_s {
 	const char			*value;
 } info_key_t;
 
-qboolean Info_FilterForKey (const char *key, const char **filter_list);
+qboolean Info_FilterForKey (const char *key, const char **filter_list) __attribute__((pure));
 
 void Info_Print (info_t *info);
-int Info_CurrentSize (info_t *info);
+int Info_CurrentSize (info_t *info) __attribute__((pure));
 info_key_t *Info_Key (info_t *info, const char *key);
 info_key_t **Info_KeyList (info_t *info);
 void Info_RemoveKey (info_t *info, const char *key);
diff --git a/include/QF/joystick.h b/include/QF/joystick.h
index 781f783a9..1eeba5d49 100644
--- a/include/QF/joystick.h
+++ b/include/QF/joystick.h
@@ -144,11 +144,11 @@ void JOY_Close (void);
 void JOY_Read (void);
 
 
-const char *JOY_GetOption_c (int i);
-int JOY_GetOption_i (const char *c);
+const char *JOY_GetOption_c (int i) __attribute__((pure));
+int JOY_GetOption_i (const char *c) __attribute__((pure));
 
-const char *JOY_GetDest_c (int i);
-int JOY_GetDest_i (const char *c);
+const char *JOY_GetDest_c (int i) __attribute__((pure));
+int JOY_GetDest_i (const char *c) __attribute__((pure));
 int JOY_GetAxis_i (int dest, const char *c);
 
 
diff --git a/include/QF/keys.h b/include/QF/keys.h
index f79291dc0..ada46a265 100644
--- a/include/QF/keys.h
+++ b/include/QF/keys.h
@@ -544,7 +544,7 @@ void Key_Init_Cvars (void);
 	\param imt_name	The name of the imt to find. Case insensitive.
 	\return			The named imt, or null if not found.
 */
-imt_t *Key_FindIMT (const char *imt_name);
+imt_t *Key_FindIMT (const char *imt_name) __attribute__((pure));
 
 /**	Create a new imt and attach it to the specified keydest target.
 
@@ -599,7 +599,7 @@ void Key_ClearStates (void);
 	\param key		The key for which to get the binding.
 	\return			The command string bound to the key, or null if unbound.
 */
-const char *Key_GetBinding (imt_t *imt, knum_t key);
+const char *Key_GetBinding (imt_t *imt, knum_t key) __attribute__((pure));
 
 /** Bind a command string to a key in the specified input mapping table.
 
@@ -639,7 +639,7 @@ void Key_KeydestCallback (keydest_callback_t *callback);
 	\param keynum	The key for which to get the string.
 	\return			The string representation of the key.
 */
-const char *Key_KeynumToString (knum_t keynum);
+const char *Key_KeynumToString (knum_t keynum) __attribute__((pure));
 
 /**	Get the keynum for the named key.
 
@@ -650,7 +650,7 @@ const char *Key_KeynumToString (knum_t keynum);
 	\param str		The name of the key.
 	\return			The named key if valid, otherwise -1
 */
-int Key_StringToKeynum (const char *str);
+int Key_StringToKeynum (const char *str) __attribute__((pure));
 
 struct progs_s;
 
diff --git a/include/QF/llist.h b/include/QF/llist.h
index 7253618b2..a7488b312 100644
--- a/include/QF/llist.h
+++ b/include/QF/llist.h
@@ -53,11 +53,11 @@ void llist_flush (llist_t *list);
 void llist_delete (llist_t *list);
 llist_node_t *llist_append (llist_t *list, void *element);
 llist_node_t *llist_prefix (llist_t *list, void *element);
-llist_node_t *llist_getnode (llist_t *list, void *element);
+llist_node_t *llist_getnode (llist_t *list, void *element) __attribute__((pure));
 llist_node_t *llist_insertafter (llist_node_t *ref, void *element);
 llist_node_t *llist_insertbefore (llist_node_t *ref, void *element);
 void *llist_remove (llist_node_t *ref);
-unsigned int llist_size (llist_t *llist);
+unsigned int llist_size (llist_t *llist) __attribute__((pure));
 void llist_iterate (llist_t *list, llist_iterator_t iterate);
 void *llist_find (llist_t *list, void *comparison);
 llist_node_t *llist_findnode (llist_t *list, void *comparison);
diff --git a/include/QF/locs.h b/include/QF/locs.h
index 32cb4ea0d..425e8980d 100644
--- a/include/QF/locs.h
+++ b/include/QF/locs.h
@@ -36,13 +36,13 @@ typedef struct
 	char	*name;
 } location_t;
 
-location_t *locs_find(const vec3_t target);
+location_t *locs_find(const vec3_t target) __attribute__((pure));
 void locs_add (const vec3_t location, const char *name);
 void locs_del (const vec3_t loc);
 void locs_edit (const vec3_t loc, const char *desc);
 void locs_load(const char *filename);
 void locs_mark (const vec3_t loc, const char *desc);
-int  locs_nearest (const vec3_t loc);
+int  locs_nearest (const vec3_t loc) __attribute__((pure));
 void locs_reset (void);
 void locs_save (const char *filename, qboolean gz);
 void map_to_loc (const char *mapname, char *filename);
diff --git a/include/QF/math/half.h b/include/QF/math/half.h
index 61baf8f09..1fe474cd3 100644
--- a/include/QF/math/half.h
+++ b/include/QF/math/half.h
@@ -39,8 +39,8 @@
 #include "QF/qtypes.h"
 
 
-int16_t FloatToHalf (float x);
-float HalfToFloat (int16_t x);
+int16_t FloatToHalf (float x) __attribute__((const));
+float HalfToFloat (int16_t x) __attribute__((const));
 
 //@}
 
diff --git a/include/QF/math/matrix3.h b/include/QF/math/matrix3.h
index 7a54938dd..ce2474a99 100644
--- a/include/QF/math/matrix3.h
+++ b/include/QF/math/matrix3.h
@@ -101,7 +101,7 @@
 
 void Mat3Init (const quat_t rot, const vec3_t scale, mat3_t mat);
 void Mat3Transpose (const mat3_t a, mat3_t b);
-vec_t Mat3Determinant (const mat3_t m);
+vec_t Mat3Determinant (const mat3_t m) __attribute__((pure));
 int Mat3Inverse (const mat3_t a, mat3_t b);
 void Mat3Mult (const mat3_t a, const mat3_t b, mat3_t c);
 void Mat3MultVec (const mat3_t a, const vec3_t b, vec3_t c);
diff --git a/include/QF/math/vector.h b/include/QF/math/vector.h
index 994ffee62..73cc1f708 100644
--- a/include/QF/math/vector.h
+++ b/include/QF/math/vector.h
@@ -171,11 +171,11 @@ extern const vec_t *const vec3_origin;
 	 (((a)[2] - (b)[2]) * ((a)[2] - (b)[2])))
 #define VectorDistance(a, b)	sqrt(VectorDistance_fast(a, b))
 
-vec_t _DotProduct (const vec3_t v1, const vec3_t v2);
+vec_t _DotProduct (const vec3_t v1, const vec3_t v2) __attribute__((pure));
 void _VectorAdd (const vec3_t veca, const vec3_t vecb, vec3_t out);
 void _VectorCopy (const vec3_t in, vec3_t out);
-int _VectorCompare (const vec3_t v1, const vec3_t v2);	// uses EQUAL_EPSILON
-vec_t _VectorLength (const vec3_t v);
+int _VectorCompare (const vec3_t v1, const vec3_t v2) __attribute__((pure));	// uses EQUAL_EPSILON
+vec_t _VectorLength (const vec3_t v) __attribute__((pure));
 void _VectorMA (const vec3_t veca, float scale, const vec3_t vecb,
 				vec3_t vecc);
 void _VectorScale (const vec3_t in, vec_t scale, vec3_t out);
diff --git a/include/QF/mathlib.h b/include/QF/mathlib.h
index 498dbd2d0..c4575705e 100644
--- a/include/QF/mathlib.h
+++ b/include/QF/mathlib.h
@@ -73,15 +73,15 @@ extern int		nanmask;
 // fall over
 #define	ROLL	2
 
-int Q_log2(int val);
+int Q_log2(int val) __attribute__((const));
 
 void R_ConcatRotations (float in1[3][3], float in2[3][3], float out[3][3]);
 void R_ConcatTransforms (float in1[3][4], float in2[3][4], float out[3][4]);
 
 void FloorDivMod (double numer, double denom, int *quotient, int *rem);
-fixed16_t Invert24To16(fixed16_t val);
+fixed16_t Invert24To16(fixed16_t val) __attribute__((const));
 fixed16_t Mul16_30(fixed16_t multiplier, fixed16_t multiplicand);
-int GreatestCommonDivisor (int i1, int i2);
+int GreatestCommonDivisor (int i1, int i2) __attribute__((const));
 
 /**	Convert quake angles to basis vectors.
 
@@ -139,8 +139,8 @@ void AngleVectors (const vec3_t angles, vec3_t forward, vec3_t right,
 void AngleQuat (const vec3_t angles, quat_t q);
 void VectorVectors (const vec3_t forward, vec3_t right, vec3_t up);
 int BoxOnPlaneSide (const vec3_t emins, const vec3_t emaxs,
-					struct plane_s *plane);
-float anglemod (float a);
+					struct plane_s *plane) __attribute__((pure));
+float anglemod (float a) __attribute__((const));
 
 void RotatePointAroundVector (vec3_t dst, const vec3_t axis,
 							  const vec3_t point, float degrees);
@@ -174,7 +174,7 @@ void RotatePointAroundVector (vec3_t dst, const vec3_t axis,
 	} while (0)
 
 extern plane_t * const frustum;
-GNU89INLINE inline qboolean R_CullBox (const vec3_t mins, const vec3_t maxs);
+GNU89INLINE inline qboolean R_CullBox (const vec3_t mins, const vec3_t maxs) __attribute__((pure));
 GNU89INLINE inline qboolean R_CullSphere (const vec3_t origin, const float radius);
 
 #ifndef IMPLEMENT_R_Cull
diff --git a/include/QF/model.h b/include/QF/model.h
index 641e025ec..6b3fbc3b5 100644
--- a/include/QF/model.h
+++ b/include/QF/model.h
@@ -433,7 +433,7 @@ typedef struct model_s {
 
 // ============================================================================
 
-extern float RadiusFromBounds (const vec3_t mins, const vec3_t maxs);
+extern float RadiusFromBounds (const vec3_t mins, const vec3_t maxs) __attribute__((pure));
 void	Mod_Init (void);
 void	Mod_Init_Cvars (void);
 void	Mod_ClearAll (void);
@@ -441,7 +441,7 @@ model_t *Mod_ForName (const char *name, qboolean crash);
 void	*Mod_Extradata (model_t *mod);	// handles caching
 void	Mod_TouchModel (const char *name);
 
-mleaf_t *Mod_PointInLeaf (const vec3_t p, model_t *model);
+mleaf_t *Mod_PointInLeaf (const vec3_t p, model_t *model) __attribute__((pure));
 byte	*Mod_LeafPVS (mleaf_t *leaf, model_t *model);
 model_t	*Mod_FindName (const char *name);
 int     Mod_CalcFullbright (byte *in, byte *out, int pixels);
diff --git a/include/QF/msg.h b/include/QF/msg.h
index 63da220e9..6e550a191 100644
--- a/include/QF/msg.h
+++ b/include/QF/msg.h
@@ -73,7 +73,7 @@ void MSG_BeginReading (qmsg_t *msg);
 	\param msg		The message to check.
 	\return			The number of bytes that have been read.
 */
-int MSG_GetReadCount(qmsg_t *msg);
+int MSG_GetReadCount(qmsg_t *msg) __attribute__((pure));
 
 /** Read a single byte from the message.
 
diff --git a/include/QF/plugin.h b/include/QF/plugin.h
index 995b72750..57a4ba9ff 100644
--- a/include/QF/plugin.h
+++ b/include/QF/plugin.h
@@ -38,7 +38,7 @@
 #include <QF/qtypes.h>
 
 #ifdef STATIC_PLUGINS
-#define PLUGIN_INFO(type,name) plugin_t *type##_##name##_PluginInfo (void); plugin_t * type##_##name##_PluginInfo (void)
+#define PLUGIN_INFO(type,name) plugin_t *type##_##name##_PluginInfo (void); __attribute__((const)) plugin_t * type##_##name##_PluginInfo (void)
 #else
 #define PLUGIN_INFO(type,name) plugin_t *PluginInfo (void); __attribute__((visibility ("default"))) plugin_t *PluginInfo (void)
 #endif
diff --git a/include/QF/plugin/console.h b/include/QF/plugin/console.h
index e743d20e7..b404728e3 100644
--- a/include/QF/plugin/console.h
+++ b/include/QF/plugin/console.h
@@ -34,7 +34,7 @@
 #include <QF/plugin.h>
 #include <QF/qtypes.h>
 
-typedef void (*P_C_Print) (const char *fmt, va_list args);
+typedef void (*P_C_Print) (const char *fmt, va_list args) __attribute__((format(printf, 1, 0)));
 typedef void (*P_C_ProcessInput) (void);
 typedef void (*P_C_KeyEvent) (knum_t key, short unicode, qboolean down);
 typedef void (*P_C_DrawConsole) (void);
diff --git a/include/QF/progs.h b/include/QF/progs.h
index 1c706ae4c..72eea81cc 100644
--- a/include/QF/progs.h
+++ b/include/QF/progs.h
@@ -228,10 +228,10 @@ struct edict_s {
 void ED_ClearEdict (progs_t *pr, edict_t *e, int val);
 edict_t *ED_Alloc (progs_t *pr);
 void ED_Free (progs_t *pr, edict_t *ed);
-edict_t *ED_EdictNum(progs_t *pr, pr_int_t n);
-pr_int_t ED_NumForEdict(progs_t *pr, edict_t *e);
+edict_t *ED_EdictNum(progs_t *pr, pr_int_t n) __attribute__((pure));
+pr_int_t ED_NumForEdict(progs_t *pr, edict_t *e) __attribute__((pure));
 void ED_Count (progs_t *pr);
-qboolean PR_EdictValid (progs_t *pr, pr_int_t e);
+qboolean PR_EdictValid (progs_t *pr, pr_int_t e) __attribute__((pure));
 
 // pr_debug.c
 void ED_Print (progs_t *pr, edict_t *ed);
@@ -274,8 +274,8 @@ void ED_EntityParseFunction (progs_t *pr);
 */
 //@{
 
-ddef_t *PR_FieldAtOfs (progs_t *pr, pr_int_t ofs);
-ddef_t *PR_GlobalAtOfs (progs_t *pr, pr_int_t ofs);
+ddef_t *PR_FieldAtOfs (progs_t *pr, pr_int_t ofs) __attribute__((pure));
+ddef_t *PR_GlobalAtOfs (progs_t *pr, pr_int_t ofs) __attribute__((pure));
 
 ddef_t *PR_FindField (progs_t *pr, const char *name);
 ddef_t *PR_FindGlobal (progs_t *pr, const char *name);
@@ -1112,21 +1112,21 @@ int PR_LoadStrings (progs_t *pr);
 	\param num		string index to be validated
 	\return			true if the index is valid, false otherwise
 */
-qboolean PR_StringValid (progs_t *pr, string_t num);
+qboolean PR_StringValid (progs_t *pr, string_t num) __attribute__((pure));
 
 /** Convert a string index to a C string.
 	\param pr		pointer to ::progs_t VM struct
 	\param num		string index to be converted
 	\return			C pointer to the string.
 */
-const char *PR_GetString(progs_t *pr, string_t num);
+const char *PR_GetString(progs_t *pr, string_t num) __attribute__((pure));
 
 /** Retrieve the dstring_t associated with a mutable string.
 	\param pr		pointer to ::progs_t VM struct
 	\param num		string index of the mutable string
 	\return			the dstring implementing the mutable string
 */
-struct dstring_s *PR_GetMutableString(progs_t *pr, string_t num);
+struct dstring_s *PR_GetMutableString(progs_t *pr, string_t num) __attribute__((pure));
 
 /** Make a permanent progs string from the given C string. Will not create a
 	duplicate permanent string (temporary and mutable strings are not checked).
@@ -1450,14 +1450,14 @@ void PR_Debug_Init_Cvars (void);
 int PR_LoadDebug (progs_t *pr);
 void PR_Debug_Watch (progs_t *pr, const char *expr);
 void PR_Debug_Print (progs_t *pr, const char *expr);
-pr_auxfunction_t *PR_Get_Lineno_Func (progs_t *pr, pr_lineno_t *lineno);
-pr_uint_t PR_Get_Lineno_Addr (progs_t *pr, pr_lineno_t *lineno);
-pr_uint_t PR_Get_Lineno_Line (progs_t *pr, pr_lineno_t *lineno);
-pr_lineno_t *PR_Find_Lineno (progs_t *pr, pr_uint_t addr);
-const char *PR_Get_Source_File (progs_t *pr, pr_lineno_t *lineno);
+pr_auxfunction_t *PR_Get_Lineno_Func (progs_t *pr, pr_lineno_t *lineno) __attribute__((pure));
+pr_uint_t PR_Get_Lineno_Addr (progs_t *pr, pr_lineno_t *lineno) __attribute__((pure));
+pr_uint_t PR_Get_Lineno_Line (progs_t *pr, pr_lineno_t *lineno) __attribute__((pure));
+pr_lineno_t *PR_Find_Lineno (progs_t *pr, pr_uint_t addr) __attribute__((pure));
+const char *PR_Get_Source_File (progs_t *pr, pr_lineno_t *lineno) __attribute__((pure));
 const char *PR_Get_Source_Line (progs_t *pr, pr_uint_t addr);
-ddef_t *PR_Get_Param_Def (progs_t *pr, dfunction_t *func, unsigned parm);
-ddef_t *PR_Get_Local_Def (progs_t *pr, pr_int_t offs);
+ddef_t *PR_Get_Param_Def (progs_t *pr, dfunction_t *func, unsigned parm) __attribute__((pure));
+ddef_t *PR_Get_Local_Def (progs_t *pr, pr_int_t offs) __attribute__((pure));
 void PR_PrintStatement (progs_t *pr, dstatement_t *s, int contents);
 void PR_DumpState (progs_t *pr);
 void PR_StackTrace (progs_t *pr);
diff --git a/include/QF/qargs.h b/include/QF/qargs.h
index 5b4252075..fe4eb98f8 100644
--- a/include/QF/qargs.h
+++ b/include/QF/qargs.h
@@ -42,7 +42,7 @@ extern const char *com_cmdline;
 extern struct cvar_s *fs_globalcfg;
 extern struct cvar_s *fs_usercfg;
 
-int COM_CheckParm (const char *parm);
+int COM_CheckParm (const char *parm) __attribute__((pure));
 void COM_AddParm (const char *parm);
 
 void COM_Init (void);
diff --git a/include/QF/qendian.h b/include/QF/qendian.h
index 49e60c2aa..d63ca2d0c 100644
--- a/include/QF/qendian.h
+++ b/include/QF/qendian.h
@@ -75,12 +75,12 @@
 
 extern qboolean		bigendien;
 
-uint16_t	_ShortSwap (uint16_t l);
-uint16_t	_ShortNoSwap (uint16_t l);
-uint32_t _LongSwap (uint32_t l);
-uint32_t _LongNoSwap (uint32_t l);
-float	_FloatSwap (float f);
-float	_FloatNoSwap (float f);
+uint16_t	_ShortSwap (uint16_t l) __attribute__((const));
+uint16_t	_ShortNoSwap (uint16_t l) __attribute__((const));
+uint32_t _LongSwap (uint32_t l) __attribute__((const));
+uint32_t _LongNoSwap (uint32_t l) __attribute__((const));
+float	_FloatSwap (float f) __attribute__((const));
+float	_FloatNoSwap (float f) __attribute__((const));
 
 
 #ifdef __GNUC__
diff --git a/include/QF/qfplist.h b/include/QF/qfplist.h
index 713eb6dbb..6c5d61202 100644
--- a/include/QF/qfplist.h
+++ b/include/QF/qfplist.h
@@ -75,7 +75,7 @@ char *PL_WritePropertyList (plitem_t *pl);
 	\param item The object
 	\return the type of the object
 */
-pltype_t PL_Type (plitem_t *item);
+pltype_t PL_Type (plitem_t *item) __attribute__((pure));
 
 /** Retrieve a string from a string object.
 
@@ -85,7 +85,7 @@ pltype_t PL_Type (plitem_t *item);
 	\note	You are NOT responsible for freeing the returned object. It will
 	be destroyed when its container is.
 */
-const char *PL_String (plitem_t *string);
+const char *PL_String (plitem_t *string) __attribute__((pure));
 
 /** Retrieve a value from a dictionary object.
 
@@ -117,7 +117,7 @@ plitem_t *PL_RemoveObjectForKey (plitem_t *dict, const char *key);
 	\note	You are NOT responsible for freeing the returned object. It will
 	be destroyed when its container is.
 */
-plitem_t *PL_ObjectAtIndex (plitem_t *array, int index);
+plitem_t *PL_ObjectAtIndex (plitem_t *array, int index) __attribute__((pure));
 
 /** Retrieve a list of all keys in a dictionary.
 
@@ -133,7 +133,7 @@ plitem_t *PL_D_AllKeys (plitem_t *dict);
 
 	\return Returns the number of keys in the dictionary.
 */
-int PL_D_NumKeys (plitem_t *dict);
+int PL_D_NumKeys (plitem_t *dict) __attribute__((pure));
 
 /** Add a key/value pair to a dictionary.
 
@@ -164,7 +164,7 @@ qboolean PL_A_AddObject (plitem_t *array, plitem_t *item);
 
 	\return number of objects in the array
 */
-int PL_A_NumObjects (plitem_t *array);
+int PL_A_NumObjects (plitem_t *array) __attribute__((pure));
 
 /** Insert an item into an array before the specified location.
 
diff --git a/include/QF/quakefs.h b/include/QF/quakefs.h
index aab034381..336537495 100644
--- a/include/QF/quakefs.h
+++ b/include/QF/quakefs.h
@@ -356,7 +356,7 @@ char *QFS_CompressPath (const char *pth);
 	\return			Pointer to the beginning of the filename. This points
 					inside \a pathname.
 */
-const char *QFS_SkipPath (const char *pathname);
+const char *QFS_SkipPath (const char *pathname) __attribute__((pure));
 
 /**	Return a pointer to the start of the extention part of the path.
 
@@ -366,7 +366,7 @@ const char *QFS_SkipPath (const char *pathname);
 					the returned pointer will point to the terminating nul
 					of the path.
 */
-const char *QFS_FileExtension (const char *in);
+const char *QFS_FileExtension (const char *in) __attribute__((pure));
 
 /**	Register a callback function for when the gamedir changes.
 
diff --git a/include/QF/quakeio.h b/include/QF/quakeio.h
index 0664bd0b6..d72d8ec29 100644
--- a/include/QF/quakeio.h
+++ b/include/QF/quakeio.h
@@ -40,7 +40,7 @@ typedef struct QFile_s QFile;
 
 int Qrename(const char *old_path, const char *new_path);
 int Qremove(const char *path);
-int Qfilesize (QFile *file);
+int Qfilesize (QFile *file) __attribute__((pure));
 QFile *Qopen(const char *path, const char *mode);
 QFile *Qdopen(int fd, const char *mode);
 QFile *Qfopen (FILE *file, const char *mode);
diff --git a/include/QF/script.h b/include/QF/script.h
index bc11b0e2a..2fe21c215 100644
--- a/include/QF/script.h
+++ b/include/QF/script.h
@@ -95,7 +95,7 @@ void Script_UngetToken (script_t *script);
 /** Return a pointer to the current token.
 	\param script The script_t object being parsed
 */
-const char *Script_Token (script_t *script);
+const char *Script_Token (script_t *script) __attribute__((pure));
 
 //@}
 
diff --git a/include/QF/set.h b/include/QF/set.h
index a30840b18..0d50700da 100644
--- a/include/QF/set.h
+++ b/include/QF/set.h
@@ -256,14 +256,14 @@ set_t *set_everything (set_t *set);
 	\param set		The set to test.
 	\return			1 if \a set is empty (non-inverted).
 */
-int set_is_empty (const set_t *set);
+int set_is_empty (const set_t *set) __attribute__((pure));
 
 /** Test if a set is the set of everything.
 
 	\param set		The set to test.
 	\return			1 if \a set is the set of everything (empty inverted set).
 */
-int set_is_everything (const set_t *set);
+int set_is_everything (const set_t *set) __attribute__((pure));
 
 /** Test if two sets are disjoint.
 
@@ -273,7 +273,7 @@ int set_is_everything (const set_t *set);
 
 	\note	The emtpy set is disjoint with itself.
 */
-int set_is_disjoint (const set_t *s1, const set_t *s2);
+int set_is_disjoint (const set_t *s1, const set_t *s2) __attribute__((pure));
 
 /** Test if two sets intersect.
 
@@ -283,7 +283,7 @@ int set_is_disjoint (const set_t *s1, const set_t *s2);
 
 	\note	Equivalent non-empty sets are treated as intersecting.
 */
-int set_is_intersecting (const set_t *s1, const set_t *s2);
+int set_is_intersecting (const set_t *s1, const set_t *s2) __attribute__((pure));
 
 /** Test if two sets are equivalent.
 
@@ -291,7 +291,7 @@ int set_is_intersecting (const set_t *s1, const set_t *s2);
 	\param s2		The second set to test.
 	\return			1 if \a s2 is equivalent to \a s1, 0 if not.
 */
-int set_is_equivalent (const set_t *s1, const set_t *s2);
+int set_is_equivalent (const set_t *s1, const set_t *s2) __attribute__((pure));
 
 /** Test if a set is a subset of another set.
 
@@ -302,7 +302,7 @@ int set_is_equivalent (const set_t *s1, const set_t *s2);
 	\return			1 if \a sub is a subset of \a set, or if the sets are
 					equivalent.
 */
-int set_is_subset (const set_t *set, const set_t *sub);
+int set_is_subset (const set_t *set, const set_t *sub) __attribute__((pure));
 
 /** Test an element for membership in a set.
 
@@ -310,7 +310,7 @@ int set_is_subset (const set_t *set, const set_t *sub);
 	\param x		The element to test.
 	\return			1 if the element is a member of the set, otherwise 0.
 */
-int set_is_member (const set_t *set, unsigned x);
+int set_is_member (const set_t *set, unsigned x) __attribute__((pure));
 
 /** Obtain the number of members (or non-members) of a set.
 
@@ -322,7 +322,7 @@ int set_is_member (const set_t *set, unsigned x);
 	\return			The number of (non-)members. Both empty sets and sets of
 					evertything will return 0.
 */
-unsigned set_size (const set_t *set);
+unsigned set_size (const set_t *set) __attribute__((pure));
 
 /** Find the first "member" of the set.
 
diff --git a/include/QF/sys.h b/include/QF/sys.h
index 8bbb08781..f93432d65 100644
--- a/include/QF/sys.h
+++ b/include/QF/sys.h
@@ -62,7 +62,7 @@ int	Sys_FileExists (const char *path);
 int Sys_isdir (const char *path);
 int Sys_mkdir (const char *path);
 
-typedef void (*sys_printf_t) (const char *fmt, va_list args);
+typedef void (*sys_printf_t) (const char *fmt, va_list args) __attribute__((format(printf, 1, 0)));
 typedef void (*sys_error_t) (void *data);
 
 void Sys_SetStdPrintf (sys_printf_t func);
@@ -71,7 +71,7 @@ void Sys_SetErrPrintf (sys_printf_t func);
 void Sys_PushErrorHandler (sys_error_t func, void *data);
 void Sys_PopErrorHandler (void);
 
-void Sys_Print (FILE *stream, const char *fmt, va_list args);
+void Sys_Print (FILE *stream, const char *fmt, va_list args) __attribute__((format(printf, 2, 0)));
 void Sys_Printf (const char *fmt, ...) __attribute__((format(printf,1,2)));
 void Sys_Error (const char *error, ...) __attribute__((format(printf,1,2), noreturn));
 void Sys_FatalError (const char *error, ...) __attribute__((format(printf,1,2), noreturn));
diff --git a/include/QF/zone.h b/include/QF/zone.h
index 22c7bc19f..379f4557a 100644
--- a/include/QF/zone.h
+++ b/include/QF/zone.h
@@ -107,7 +107,7 @@ void Z_CheckPointer (const memzone_t *zone, const void *ptr, int size);
 
 void *Hunk_Alloc (int size);		// returns 0 filled memory
 void *Hunk_AllocName (int size, const char *name);
-int	Hunk_LowMark (void);
+int	Hunk_LowMark (void) __attribute__((pure));
 void Hunk_FreeToLowMark (int mark);
 void *Hunk_TempAlloc (int size);
 void Hunk_Check (void);
@@ -138,7 +138,7 @@ void Cache_Remove (cache_user_t *c);
 void *Cache_TryGet (cache_user_t *c);
 void *Cache_Get (cache_user_t *c);
 void Cache_Release (cache_user_t *c);
-int Cache_ReadLock (cache_user_t *c);
+int Cache_ReadLock (cache_user_t *c) __attribute__((pure));
 
 //@}
 
diff --git a/include/d_iface.h b/include/d_iface.h
index f7d6a72a2..4f45aa4fa 100644
--- a/include/d_iface.h
+++ b/include/d_iface.h
@@ -65,7 +65,7 @@ typedef enum {
 typedef struct particle_s particle_t;
 typedef void (*pt_phys_func)(particle_t *);
 
-pt_phys_func R_ParticlePhysics (ptype_t type);
+pt_phys_func R_ParticlePhysics (ptype_t type) __attribute__((pure));
 
 // !!! if this is changed, it must be changed in d_ifacea.h too !!!
 struct particle_s
diff --git a/include/d_local.h b/include/d_local.h
index cc7c4591c..7143277b1 100644
--- a/include/d_local.h
+++ b/include/d_local.h
@@ -94,11 +94,11 @@ void R_ShowSubDiv (void);
 extern void (*prealspandrawer)(void);
 surfcache_t	*D_CacheSurface (msurface_t *surface, int miplevel);
 
-extern int D_MipLevelForScale (float scale);
+int D_MipLevelForScale (float scale) __attribute__((pure));
 
 #ifdef USE_INTEL_ASM
-extern void D_PolysetAff8Start (void);
-extern void D_PolysetAff8End (void);
+void D_PolysetAff8Start (void);
+void D_PolysetAff8End (void);
 #endif
 
 extern short *d_pzbuffer;
diff --git a/include/exp.h b/include/exp.h
index a3c40a7ca..f4a46514e 100644
--- a/include/exp.h
+++ b/include/exp.h
@@ -80,7 +80,7 @@ typedef union token_u
 
 extern exp_error_t EXP_ERROR;
 
-const char *EXP_GetErrorMsg (void);
+const char *EXP_GetErrorMsg (void) __attribute__((pure));
 token *EXP_ParseString (char *str);
 exp_error_t EXP_SimplifyTokens (token *chain);
 void EXP_RemoveToken (token *tok);
diff --git a/include/gib_buffer.h b/include/gib_buffer.h
index e3944287e..b0e9219d2 100644
--- a/include/gib_buffer.h
+++ b/include/gib_buffer.h
@@ -40,7 +40,7 @@ void GIB_Buffer_Push_Sstack (struct cbuf_s *cbuf);
 void GIB_Buffer_Pop_Sstack (struct cbuf_s *cbuf);
 dstring_t *GIB_Buffer_Dsarray_Get (struct cbuf_s *cbuf);
 void GIB_Buffer_Reply_Callback (int argc, const char **argv, void *data);
-void GIB_Buffer_Error (cbuf_t *cbuf, const char *type, const char *fmt, va_list args);
+void GIB_Buffer_Error (cbuf_t *cbuf, const char *type, const char *fmt, va_list args) __attribute__((format(printf, 3, 0)));
 
 extern struct cbuf_interpreter_s gib_interp;
 
diff --git a/include/gib_parse.h b/include/gib_parse.h
index a6dae25c0..6c6ee06e4 100644
--- a/include/gib_parse.h
+++ b/include/gib_parse.h
@@ -43,5 +43,5 @@ gib_tree_t *GIB_Parse_Embedded (gib_tree_t *token);
 
 extern qboolean gib_parse_error;
 void GIB_Parse_Error (const char *msg, unsigned int pos);
-const char *GIB_Parse_ErrorMsg (void);
-unsigned int GIB_Parse_ErrorPos (void);
+const char *GIB_Parse_ErrorMsg (void) __attribute__((pure));
+unsigned int GIB_Parse_ErrorPos (void) __attribute__((pure));
diff --git a/include/gib_regex.h b/include/gib_regex.h
index 2970a21c1..aeccd78a1 100644
--- a/include/gib_regex.h
+++ b/include/gib_regex.h
@@ -39,7 +39,7 @@ typedef struct gib_regex_s {
 
 void GIB_Regex_Init (void);
 regex_t *GIB_Regex_Compile (const char *regex, int cflags);
-const char *GIB_Regex_Error (void);
-int GIB_Regex_Translate_Options (const char *opstr);
-int GIB_Regex_Translate_Runtime_Options (const char *opstr);
+const char *GIB_Regex_Error (void) __attribute__((const));
+int GIB_Regex_Translate_Options (const char *opstr) __attribute__((pure));
+int GIB_Regex_Translate_Runtime_Options (const char *opstr) __attribute__((pure));
 unsigned int GIB_Regex_Apply_Match (regmatch_t match[10], dstring_t *dstr, unsigned int ofs, const char *replace);
diff --git a/include/netchan.h b/include/netchan.h
index 5b361009e..556732ba2 100644
--- a/include/netchan.h
+++ b/include/netchan.h
@@ -116,7 +116,7 @@ void NET_SendPacket (int length, const void *data, netadr_t to);
 	\param b		The second address to compare.
 	\return			True of the addresses match, otherwise false.
 */
-qboolean NET_CompareAdr (netadr_t a, netadr_t b);
+qboolean NET_CompareAdr (netadr_t a, netadr_t b) __attribute__((pure));
 
 /** Compare two network addresses.
 
@@ -126,7 +126,7 @@ qboolean NET_CompareAdr (netadr_t a, netadr_t b);
 	\param b		The second address to compare.
 	\return			True of the addresses match, otherwise false.
 */
-qboolean NET_CompareBaseAdr (netadr_t a, netadr_t b);
+qboolean NET_CompareBaseAdr (netadr_t a, netadr_t b) __attribute__((pure));
 
 /** Convert an address to a string.
 
@@ -362,7 +362,7 @@ void Netchan_Setup (netchan_t *chan, netadr_t adr, int qport, ncqport_e flags);
 	\param chan     The netchan representing the connection.
 	\return			True if the connection isn't chocked.
 */
-qboolean Netchan_CanPacket (netchan_t *chan);
+qboolean Netchan_CanPacket (netchan_t *chan) __attribute__((pure));
 
 /** Check if a reliable packet can be sent to the connection.
 
@@ -370,7 +370,7 @@ qboolean Netchan_CanPacket (netchan_t *chan);
 	\return			True if there is no outstanding reliable packet and the
 					connection isn't chocked.
 */
-qboolean Netchan_CanReliable (netchan_t *chan);
+qboolean Netchan_CanReliable (netchan_t *chan) __attribute__((pure));
 
 /** Send a packet.
 
diff --git a/include/ops.h b/include/ops.h
index cc988e56a..8793d5663 100644
--- a/include/ops.h
+++ b/include/ops.h
@@ -22,34 +22,34 @@
 #ifndef __ops_h
 #define __ops_h
 
-double OP_Not (double op1, double op2);
-double OP_Negate (double op1, double op2);
-double OP_Add (double op1, double op2);
-double OP_Sub (double op1, double op2);
-double OP_Mult (double op1, double op2);
-double OP_Div (double op1, double op2);
-double OP_Exp (double op1, double op2);
-double OP_Eq (double op1, double op2);
-double OP_Neq (double op1, double op2);
-double OP_Or (double op1, double op2);
-double OP_And (double op1, double op2);
-double OP_GreaterThan (double op1, double op2);
-double OP_LessThan (double op1, double op2);
-double OP_GreaterThanEqual (double op1, double op2);
-double OP_LessThanEqual (double op1, double op2);
-double OP_BitAnd (double op1, double op2);
-double OP_BitOr (double op1, double op2);
-double OP_BitXor (double op1, double op2);
-double OP_BitInv (double op1, double op2);
+double OP_Not (double op1, double op2) __attribute__((const));
+double OP_Negate (double op1, double op2) __attribute__((const));
+double OP_Add (double op1, double op2) __attribute__((const));
+double OP_Sub (double op1, double op2) __attribute__((const));
+double OP_Mult (double op1, double op2) __attribute__((const));
+double OP_Div (double op1, double op2) __attribute__((const));
+double OP_Exp (double op1, double op2) __attribute__((const));
+double OP_Eq (double op1, double op2) __attribute__((const));
+double OP_Neq (double op1, double op2) __attribute__((const));
+double OP_Or (double op1, double op2) __attribute__((const));
+double OP_And (double op1, double op2) __attribute__((const));
+double OP_GreaterThan (double op1, double op2) __attribute__((const));
+double OP_LessThan (double op1, double op2) __attribute__((const));
+double OP_GreaterThanEqual (double op1, double op2) __attribute__((const));
+double OP_LessThanEqual (double op1, double op2) __attribute__((const));
+double OP_BitAnd (double op1, double op2) __attribute__((const));
+double OP_BitOr (double op1, double op2) __attribute__((const));
+double OP_BitXor (double op1, double op2) __attribute__((const));
+double OP_BitInv (double op1, double op2) __attribute__((const));
 
-double Func_Sin (double *oplist, unsigned int numops);
-double Func_Cos (double *oplist, unsigned int numops);
-double Func_Tan (double *oplist, unsigned int numops);
-double Func_Asin (double *oplist, unsigned int numops);
-double Func_Acos (double *oplist, unsigned int numops);
-double Func_Atan (double *oplist, unsigned int numops);
-double Func_Sqrt (double *oplist, unsigned int numops);
-double Func_Abs (double *oplist, unsigned int numops);
+double Func_Sin (double *oplist, unsigned int numops) __attribute__((pure));
+double Func_Cos (double *oplist, unsigned int numops) __attribute__((pure));
+double Func_Tan (double *oplist, unsigned int numops) __attribute__((pure));
+double Func_Asin (double *oplist, unsigned int numops) __attribute__((pure));
+double Func_Acos (double *oplist, unsigned int numops) __attribute__((pure));
+double Func_Atan (double *oplist, unsigned int numops) __attribute__((pure));
+double Func_Sqrt (double *oplist, unsigned int numops) __attribute__((pure));
+double Func_Abs (double *oplist, unsigned int numops) __attribute__((pure));
 double Func_Rand (double *oplist, unsigned int numops);
-double Func_Trunc (double *oplist, unsigned int numops);
+double Func_Trunc (double *oplist, unsigned int numops) __attribute__((pure));
 #endif // __ops_h
diff --git a/include/qstring.h b/include/qstring.h
index acea2f2e2..55b7ff30d 100644
--- a/include/qstring.h
+++ b/include/qstring.h
@@ -31,8 +31,8 @@
 #include <sys/types.h>
 #include <stdarg.h>
 
-const char * Q_strcasestr (const char *haystack, const char *needle);
-size_t Q_strnlen (const char *s, size_t maxlen);
+const char * Q_strcasestr (const char *haystack, const char *needle) __attribute__((pure));
+size_t Q_strnlen (const char *s, size_t maxlen) __attribute__((pure));
 size_t Q_snprintfz (char *dest, size_t size, const char *fmt, ...) __attribute__((format(printf,3,4)));
 size_t Q_vsnprintfz (char *dest, size_t size, const char *fmt, va_list argptr);
 
diff --git a/include/qw/msg_backbuf.h b/include/qw/msg_backbuf.h
index 787612d38..12cbb0b06 100644
--- a/include/qw/msg_backbuf.h
+++ b/include/qw/msg_backbuf.h
@@ -43,7 +43,7 @@ typedef struct backbuf_s {
 	const char *name;
 } backbuf_t;
 
-int MSG_ReliableCheckSize (backbuf_t *rel, int maxsize, int minsize);
+int MSG_ReliableCheckSize (backbuf_t *rel, int maxsize, int minsize) __attribute__((pure));
 sizebuf_t *MSG_ReliableCheckBlock(backbuf_t *rel, int maxsize);
 void MSG_Reliable_FinishWrite(backbuf_t *rel);
 sizebuf_t *MSG_ReliableWrite_Begin(backbuf_t *rel, int c, int maxsize);
diff --git a/include/qw/pmove.h b/include/qw/pmove.h
index 285513a75..b8c436e56 100644
--- a/include/qw/pmove.h
+++ b/include/qw/pmove.h
@@ -106,9 +106,9 @@ void PlayerMove (void);
 void Pmove_Init (void);
 void Pmove_Init_Cvars (void);
 
-int PM_HullPointContents (hull_t *hull, int num, const vec3_t p);
+int PM_HullPointContents (hull_t *hull, int num, const vec3_t p) __attribute__((pure));
 
-int PM_PointContents (const vec3_t point);
+int PM_PointContents (const vec3_t point) __attribute__((pure));
 qboolean PM_TestPlayerPosition (const vec3_t point);
 trace_t PM_PlayerMove (const vec3_t start, const vec3_t stop);
 
diff --git a/include/r_internal.h b/include/r_internal.h
index 3d5e69206..31272a5a8 100644
--- a/include/r_internal.h
+++ b/include/r_internal.h
@@ -32,7 +32,7 @@ struct plitem_s;
 void Fog_ParseWorldspawn (struct plitem_s *worldspawn);
 
 float *Fog_GetColor (void);
-float Fog_GetDensity (void);
+float Fog_GetDensity (void) __attribute__((pure));
 void Fog_SetupFrame (void);
 void Fog_EnableGFog (void);
 void Fog_DisableGFog (void);
@@ -63,7 +63,7 @@ void R_NewMap (model_t *worldmodel, model_t **models, int num_models);
 void R_PushDlights (const vec3_t entorigin);
 void R_DrawWaterSurfaces (void);
 
-void *D_SurfaceCacheAddress (void);
+void *D_SurfaceCacheAddress (void) __attribute__((pure));
 int D_SurfaceCacheForRes (int width, int height);
 void D_FlushCaches (void);
 void D_DeleteSurfaceCache (void);
diff --git a/include/r_local.h b/include/r_local.h
index 5f9eb2ef0..189d38d38 100644
--- a/include/r_local.h
+++ b/include/r_local.h
@@ -151,7 +151,7 @@ void R_TransformPlane (plane_t *p, float *normal, float *dist);
 void R_TransformFrustum (void);
 void R_SetSkyFrame (void);
 void R_DrawSurfaceBlock (void);
-texture_t *R_TextureAnimation (msurface_t *surf);
+texture_t *R_TextureAnimation (msurface_t *surf) __attribute__((pure));
 
 void R_GenSkyTile (void *pdest);
 void R_SurfPatch (void);
diff --git a/include/r_screen.h b/include/r_screen.h
index 8d3b08e91..4fb5e91cd 100644
--- a/include/r_screen.h
+++ b/include/r_screen.h
@@ -71,7 +71,7 @@ extern vrect_t     scr_vrect;
 
 extern qboolean    scr_skipupdate;
 
-float CalcFov (float fov_x, float width, float height);
+float CalcFov (float fov_x, float width, float height) __attribute__((const));
 void SCR_SetUpToDrawConsole (void);
 void SCR_ScreenShot_f (void);
 
diff --git a/include/snd_internal.h b/include/snd_internal.h
index 0d8f5ba3e..0b1e87a21 100644
--- a/include/snd_internal.h
+++ b/include/snd_internal.h
@@ -502,13 +502,13 @@ int SND_LoadMidi (QFile *file, sfx_t *sfx, char *realname);
 	\param sfx		sound reference
 	\return			pointer to sound's wavinfo
 */
-wavinfo_t *SND_CacheWavinfo (sfx_t *sfx);
+wavinfo_t *SND_CacheWavinfo (sfx_t *sfx) __attribute__((pure));
 
 /** Retrieve wavinfo from a streamed sound.
 	\param sfx		sound reference
 	\return			pointer to sound's wavinfo
 */
-wavinfo_t *SND_StreamWavinfo (sfx_t *sfx);
+wavinfo_t *SND_StreamWavinfo (sfx_t *sfx) __attribute__((pure));
 
 /** Ensure a cached sound is in memory.
 	\param sfx		sound reference
@@ -522,7 +522,7 @@ sfxbuffer_t *SND_CacheTouch (sfx_t *sfx);
 	\note	The sound must be retained with SND_CacheRetain() for the returned
 			buffer to be valid.
 */
-sfxbuffer_t *SND_CacheGetBuffer (sfx_t *sfx);
+sfxbuffer_t *SND_CacheGetBuffer (sfx_t *sfx) __attribute__((pure));
 
 /** Lock a cached sound into memory. After calling this, SND_CacheGetBffer()
 	will return a valid buffer.
@@ -541,14 +541,14 @@ void SND_CacheRelease (sfx_t *sfx);
 	\param sfx		sound reference
 	\return			poitner to sound buffer
 */
-sfxbuffer_t *SND_StreamGetBuffer (sfx_t *sfx);
+sfxbuffer_t *SND_StreamGetBuffer (sfx_t *sfx) __attribute__((pure));
 
 /** Lock a streamed sound into memory. Doesn't actually do anything other than
 	return a pointer to the buffer.
 	\param sfx		sound reference
 	\return			poitner to sound buffer
 */
-sfxbuffer_t *SND_StreamRetain (sfx_t *sfx);
+sfxbuffer_t *SND_StreamRetain (sfx_t *sfx) __attribute__((pure));
 
 /** Unlock a streamed sound from memory. Doesn't actually do anything.
 	\param sfx		sound reference
diff --git a/include/world.h b/include/world.h
index e6ebc90ee..57bc973a6 100644
--- a/include/world.h
+++ b/include/world.h
@@ -98,8 +98,8 @@ void SV_LinkEdict (struct edict_s *ent, qboolean touch_triggers);
 // sets ent->v.absmin and ent->v.absmax
 // if touchtriggers, calls prog functions for the intersected triggers
 
-int SV_PointContents (const vec3_t p);
-int SV_TruePointContents (const vec3_t p);
+int SV_PointContents (const vec3_t p) __attribute__((pure));
+int SV_TruePointContents (const vec3_t p) __attribute__((pure));
 // returns the CONTENTS_* value from the world at the given point.
 // does not check any entities at all
 // the non-true version remaps the water current contents to content_water
@@ -123,7 +123,7 @@ trace_t SV_Move (const vec3_t start, const vec3_t mins, const vec3_t maxs,
 struct edict_s	*SV_TestPlayerPosition (struct edict_s *ent,
 										const vec3_t origin);
 
-int SV_HullPointContents (hull_t *hull, int num, const vec3_t p);
+int SV_HullPointContents (hull_t *hull, int num, const vec3_t p) __attribute__((pure));
 hull_t *SV_HullForEntity (struct edict_s *ent, const vec3_t mins,
 						  const vec3_t maxs, vec3_t extents, vec3_t offset);
 void MOD_TraceLine (hull_t *hull, int num,
diff --git a/libs/audio/targets/snd_alsa.c b/libs/audio/targets/snd_alsa.c
index 864055ccc..76450bcc9 100644
--- a/libs/audio/targets/snd_alsa.c
+++ b/libs/audio/targets/snd_alsa.c
@@ -103,7 +103,7 @@ SNDDMA_Init_Cvars (void)
 
 static int SNDDMA_GetDMAPos (void);
 
-static snd_pcm_uframes_t
+static __attribute__((const)) snd_pcm_uframes_t
 round_buffer_size (snd_pcm_uframes_t sz)
 {
 	snd_pcm_uframes_t mask = ~0;
diff --git a/libs/console/client.c b/libs/console/client.c
index f31ccada9..ad31462a0 100644
--- a/libs/console/client.c
+++ b/libs/console/client.c
@@ -360,7 +360,7 @@ Linefeed (void)
 	All console printing must go through this in order to be logged to disk
 	If no console is visible, the notify window will pop up.
 */
-static void
+static __attribute__((format(printf, 1, 0))) void
 C_Print (const char *fmt, va_list args)
 {
 	char       *s;
diff --git a/libs/console/server.c b/libs/console/server.c
index 5bf9061ec..83cce7f3d 100644
--- a/libs/console/server.c
+++ b/libs/console/server.c
@@ -708,7 +708,7 @@ C_Shutdown (void)
 #endif
 }
 
-static void
+static __attribute__((format(printf, 1, 0))) void
 C_Print (const char *fmt, va_list args)
 {
 	static dstring_t *buffer;
diff --git a/libs/gamecode/pr_strings.c b/libs/gamecode/pr_strings.c
index ac957e23b..b0edefa63 100644
--- a/libs/gamecode/pr_strings.c
+++ b/libs/gamecode/pr_strings.c
@@ -144,7 +144,7 @@ free_string_ref (progs_t *pr, strref_t *sr)
 	pr->free_string_refs = sr;
 }
 
-static string_t
+static __attribute__((pure)) string_t
 string_index (progs_t *pr, strref_t *sr)
 {
 	long        o = (long) (sr - pr->static_strings);
@@ -251,7 +251,7 @@ get_strref (progs_t *pr, string_t num)
 	return 0;
 }
 
-static inline const char *
+static inline __attribute__((pure)) const char *
 get_string (progs_t *pr, string_t num)
 {
 	if (num < 0) {
diff --git a/libs/gib/exp.c b/libs/gib/exp.c
index 7f831a122..f56159e71 100644
--- a/libs/gib/exp.c
+++ b/libs/gib/exp.c
@@ -154,7 +154,7 @@ EXP_FindFuncByStr (const char *str)
 		return 0;
 }
 
-static int
+static __attribute__((pure)) int
 EXP_ContainsCommas (token * chain)
 {
 	token      *cur;
diff --git a/libs/net/nm/net_dgrm.c b/libs/net/nm/net_dgrm.c
index 7f7e302c7..20160e228 100644
--- a/libs/net/nm/net_dgrm.c
+++ b/libs/net/nm/net_dgrm.c
@@ -104,7 +104,7 @@ NET_Ban_f (void)
 {
 	char        addrStr[32];		//FIXME: overflow
 	char        maskStr[32];		//FIXME: overflow
-	void        (*print) (const char *fmt, ...);
+	__attribute__((format(printf, 1, 2))) void (*print) (const char *fmt, ...);
 
 	if (cmd_source == src_command) {
 		if (!sv.active) {
@@ -262,7 +262,7 @@ Datagram_CanSendMessage (qsocket_t *sock)
 }
 
 
-qboolean
+__attribute__((const)) qboolean
 Datagram_CanSendUnreliableMessage (qsocket_t *sock)
 {
 	return true;
diff --git a/libs/net/nm/net_loop.c b/libs/net/nm/net_loop.c
index 0323b760d..0624688b9 100644
--- a/libs/net/nm/net_loop.c
+++ b/libs/net/nm/net_loop.c
@@ -42,7 +42,7 @@ qboolean    localconnectpending = false;
 qsocket_t  *loop_client = NULL;
 qsocket_t  *loop_server = NULL;
 
-int
+__attribute__((pure)) int
 Loop_Init (void)
 {
 	if (cls.state == ca_dedicated)
@@ -240,7 +240,7 @@ Loop_SendUnreliableMessage (qsocket_t * sock, sizebuf_t *data)
 }
 
 
-qboolean
+__attribute__((pure)) qboolean
 Loop_CanSendMessage (qsocket_t * sock)
 {
 	if (!sock->driverdata)
@@ -249,7 +249,7 @@ Loop_CanSendMessage (qsocket_t * sock)
 }
 
 
-qboolean
+__attribute__((const)) qboolean
 Loop_CanSendUnreliableMessage (qsocket_t * sock)
 {
 	return true;
diff --git a/libs/net/nm/net_udp.c b/libs/net/nm/net_udp.c
index cf2348256..41cf8b9ec 100644
--- a/libs/net/nm/net_udp.c
+++ b/libs/net/nm/net_udp.c
@@ -433,7 +433,7 @@ error:
 	return -1;
 }
 
-int
+__attribute__((const)) int
 UDP_Connect (int socket, netadr_t *addr)
 {
 	return 0;
@@ -651,7 +651,7 @@ UDP_GetAddrFromName (const char *name, netadr_t *addr)
 	return 0;
 }
 
-int
+__attribute__((pure)) int
 UDP_AddrCompare (netadr_t *addr1, netadr_t *addr2)
 {
 	if (addr1->family != addr2->family)
@@ -666,7 +666,7 @@ UDP_AddrCompare (netadr_t *addr1, netadr_t *addr2)
 	return 0;
 }
 
-int
+__attribute__((pure)) int
 UDP_GetSocketPort (netadr_t *addr)
 {
 	return ntohs (addr->port);
diff --git a/libs/net/nm/net_vcr.c b/libs/net/nm/net_vcr.c
index 603257813..f997d3034 100644
--- a/libs/net/nm/net_vcr.c
+++ b/libs/net/nm/net_vcr.c
@@ -166,14 +166,14 @@ VCR_SearchForHosts (qboolean xmit)
 }
 
 
-qsocket_t  *
+__attribute__((const)) qsocket_t *
 VCR_Connect (const char *host)
 {
 	return NULL;
 }
 
 
-qsocket_t  *
+qsocket_t *
 VCR_CheckNewConnections (void)
 {
 	qsocket_t  *sock;
diff --git a/libs/util/dstring.c b/libs/util/dstring.c
index 4e43a0aae..18d83f44a 100644
--- a/libs/util/dstring.c
+++ b/libs/util/dstring.c
@@ -299,7 +299,7 @@ dstring_clearstr (dstring_t *dstr)
 	dstr->str[0] = 0;
 }
 
-static int
+static __attribute__((format(printf, 3, 0))) int
 _dvsprintf (dstring_t *dstr, int offs, const char *fmt, va_list args)
 {
 	int         size;
diff --git a/libs/util/set.c b/libs/util/set.c
index 4b3b3a033..dfdd55b4e 100644
--- a/libs/util/set.c
+++ b/libs/util/set.c
@@ -343,7 +343,7 @@ set_everything (set_t *set)
 	return set;
 }
 
-static inline int
+static inline __attribute__((pure)) int
 _set_is_empty (const set_t *set)
 {
 	unsigned    i;
@@ -370,7 +370,7 @@ set_is_everything (const set_t *set)
 	return _set_is_empty (set);
 }
 
-static int
+static __attribute__((pure)) int
 set_test_n_n (const set_t *s1, const set_t *s2)
 {
 	unsigned    i, end;
@@ -394,7 +394,7 @@ set_test_n_n (const set_t *s1, const set_t *s2)
 	return (difference != 0) | ((intersection != 0) << 1);
 }
 
-static int
+static __attribute__((pure)) int
 set_test_n_i (const set_t *s1, const set_t *s2)
 {
 	unsigned    i, end;
@@ -419,7 +419,7 @@ set_test_n_i (const set_t *s1, const set_t *s2)
 	return (difference != 0) | ((intersection != 0) << 1);
 }
 
-static int
+static __attribute__((pure)) int
 set_test_i_n (const set_t *s1, const set_t *s2)
 {
 	unsigned    i, end;
@@ -444,7 +444,7 @@ set_test_i_n (const set_t *s1, const set_t *s2)
 	return (difference != 0) | ((intersection != 0) << 1);
 }
 
-static int
+static __attribute__((pure)) int
 set_test_i_i (const set_t *s1, const set_t *s2)
 {
 	unsigned    i, end;
@@ -470,7 +470,7 @@ set_test_i_i (const set_t *s1, const set_t *s2)
 	return (difference != 0) | ((intersection != 0) << 1);
 }
 
-static int
+static __attribute__((pure)) int
 set_test (const set_t *s1, const set_t *s2)
 {
 	if (s1->inverted && s2->inverted)
diff --git a/libs/util/sys.c b/libs/util/sys.c
index 1b6a9c269..b2e28f71d 100644
--- a/libs/util/sys.c
+++ b/libs/util/sys.c
@@ -90,8 +90,8 @@
 
 #include "compat.h"
 
-static void Sys_StdPrintf (const char *fmt, va_list args);
-static void Sys_ErrPrintf (const char *fmt, va_list args);
+static void Sys_StdPrintf (const char *fmt, va_list args) __attribute__((format(printf, 1, 0)));
+static void Sys_ErrPrintf (const char *fmt, va_list args) __attribute__((format(printf, 1, 0)));
 
 VISIBLE cvar_t *sys_nostdout;
 VISIBLE cvar_t *sys_extrasleep;
diff --git a/libs/util/test/test-vrect.c b/libs/util/test/test-vrect.c
index b1ba859bc..ab2558e8f 100644
--- a/libs/util/test/test-vrect.c
+++ b/libs/util/test/test-vrect.c
@@ -134,7 +134,7 @@ print_rects (vrect_t *rect)
 	printf ("\n");
 }
 
-static int
+static __attribute__((pure)) int
 compare_rects (vrect_t *r1, vrect_t *r2)
 {
 	if (!r1 && !r2)
diff --git a/libs/video/renderer/gl/qfgl_ext.c b/libs/video/renderer/gl/qfgl_ext.c
index fa28797d5..a46472609 100644
--- a/libs/video/renderer/gl/qfgl_ext.c
+++ b/libs/video/renderer/gl/qfgl_ext.c
@@ -91,7 +91,7 @@ GLF_FindFunctions (void)
   It takes a bit of care to be fool-proof about parsing an OpenGL extensions
   string. Don't be fooled by sub-strings, etc.
 */
-static qboolean
+static __attribute__((pure)) qboolean
 QFGL_ParseExtensionList (const GLubyte *list, const char *name)
 {
 	const char *start;
diff --git a/libs/video/renderer/glsl/glsl_bsp.c b/libs/video/renderer/glsl/glsl_bsp.c
index e52402660..f212cbe7a 100644
--- a/libs/video/renderer/glsl/glsl_bsp.c
+++ b/libs/video/renderer/glsl/glsl_bsp.c
@@ -1321,7 +1321,7 @@ glsl_R_InitBsp (void)
 	GLSL_FreeShader (frag_shader);
 }
 
-static inline int
+static inline __attribute__((const)) int
 is_pow2 (unsigned x)
 {
 	int         count;
diff --git a/libs/video/renderer/glsl/glsl_screen.c b/libs/video/renderer/glsl/glsl_screen.c
index 56e481c41..eab755325 100644
--- a/libs/video/renderer/glsl/glsl_screen.c
+++ b/libs/video/renderer/glsl/glsl_screen.c
@@ -227,7 +227,7 @@ glsl_SCR_CaptureBGR (void)
 	return tex;
 }
 
-tex_t *
+__attribute__((const)) tex_t *
 glsl_SCR_ScreenShot (int width, int height)
 {
 	return 0;
diff --git a/libs/video/renderer/sw32/screen.c b/libs/video/renderer/sw32/screen.c
index 63f0ce6e1..bcadb5c9b 100644
--- a/libs/video/renderer/sw32/screen.c
+++ b/libs/video/renderer/sw32/screen.c
@@ -87,7 +87,7 @@ sw32_SCR_CaptureBGR (void)
 	return tex;
 }
 
-tex_t *
+__attribute__((const)) tex_t *
 sw32_SCR_ScreenShot (int width, int height)
 {
 	return 0;
diff --git a/libs/video/targets/keys.c b/libs/video/targets/keys.c
index 5538f07cb..daa9eeda8 100644
--- a/libs/video/targets/keys.c
+++ b/libs/video/targets/keys.c
@@ -511,7 +511,7 @@ keyname_t   keynames[] = {
 	{NULL, 0}
 };
 
-static imt_t *
+static __attribute__((pure)) imt_t *
 key_target_find_imt (keytarget_t *kt, const char *imt_name)
 {
 	imt_t      *imt;
diff --git a/nq/include/host.h b/nq/include/host.h
index 2e17ca341..8601ea4c2 100644
--- a/nq/include/host.h
+++ b/nq/include/host.h
@@ -62,10 +62,10 @@ void Host_ServerFrame (void);
 void Host_InitCommands (void);
 void Host_Init (void);
 void Host_Shutdown(void);
-void Host_Error (const char *error, ...) __attribute__((format(printf,1,2)));
-void Host_EndGame (const char *message, ...) __attribute__((format(printf,1,2)));
+void Host_Error (const char *error, ...) __attribute__((format(printf,1,2), noreturn));
+void Host_EndGame (const char *message, ...) __attribute__((format(printf,1,2), noreturn));
 void Host_Frame (float time);
-void Host_Quit_f (void);
+void Host_Quit_f (void) __attribute__((noreturn));
 void Host_ClientCommands (const char *fmt, ...) __attribute__((format(printf,1,2)));
 void Host_ShutdownServer (qboolean crash);
 
diff --git a/nq/include/server.h b/nq/include/server.h
index 0d83a4e7c..4960fee5c 100644
--- a/nq/include/server.h
+++ b/nq/include/server.h
@@ -255,7 +255,7 @@ void SV_DropClient (qboolean crash);
 void SV_SendClientMessages (void);
 void SV_ClearDatagram (void);
 
-int SV_ModelIndex (const char *name);
+int SV_ModelIndex (const char *name) __attribute__((pure));
 
 void SV_SetIdealPitch (void);
 
@@ -268,7 +268,7 @@ void SV_ClientPrintf (const char *fmt, ...) __attribute__((format(printf,1,2)));
 void SV_BroadcastPrintf (const char *fmt, ...) __attribute__((format(printf,1,2)));
 
 struct trace_s SV_PushEntity (edict_t *ent, vec3_t push);
-int SV_EntCanSupportJump (edict_t *ent);
+int SV_EntCanSupportJump (edict_t *ent) __attribute__((pure));
 int SV_FlyMove (edict_t *ent, float time, struct trace_s *steptrace);
 void SV_CheckVelocity (edict_t *ent);
 qboolean SV_RunThink (edict_t *ent);
diff --git a/nq/source/host_cmd.c b/nq/source/host_cmd.c
index 5aaf60e73..fa75e33e8 100644
--- a/nq/source/host_cmd.c
+++ b/nq/source/host_cmd.c
@@ -78,7 +78,7 @@ Host_Status_f (void)
 	int         minutes;
 	int         hours = 0;
 	int         j;
-	void        (*print) (const char *fmt, ...);
+	__attribute__((format(printf, 1, 2))) void (*print) (const char *fmt, ...);
 
 	if (cmd_source == src_command) {
 		if (!sv.active) {
diff --git a/nq/source/sv_ded.c b/nq/source/sv_ded.c
index 37fd93f2b..c22f9cc3a 100644
--- a/nq/source/sv_ded.c
+++ b/nq/source/sv_ded.c
@@ -113,7 +113,7 @@ CL_NextDemo (void)
 {
 }
 
-int
+__attribute__((const)) int
 CL_ReadFromServer (void)
 {
 	return 0;
@@ -156,7 +156,7 @@ S_UnblockSound (void)
 }
 
 plugin_t *console_client_PluginInfo (void);
-plugin_t *
+__attribute__((const)) plugin_t *
 console_client_PluginInfo (void)
 {
 	return 0;
diff --git a/nq/source/sv_pr_cmds.c b/nq/source/sv_pr_cmds.c
index c95669eb4..d6982bc3a 100644
--- a/nq/source/sv_pr_cmds.c
+++ b/nq/source/sv_pr_cmds.c
@@ -1069,7 +1069,7 @@ PF_changeyaw (progs_t *pr)
 #define	MSG_ALL			2				// reliable to all
 #define	MSG_INIT		3				// write to the init string
 
-static sizebuf_t *
+static __attribute__((pure)) sizebuf_t *
 WriteDest (progs_t *pr)
 {
 	int         entnum;
diff --git a/nq/source/world.c b/nq/source/world.c
index e00208900..6d404f39c 100644
--- a/nq/source/world.c
+++ b/nq/source/world.c
@@ -705,7 +705,7 @@ ctl_pretest_triggers (edict_t *touch, moveclip_t *clip)
 	return 1;
 }
 
-static always_inline int
+static always_inline __attribute__((pure)) int
 ctl_pretest_other (edict_t *touch, moveclip_t *clip)
 {
 	if (SVfloat (touch, solid) == SOLID_NOT)
diff --git a/qtv/source/qtv.c b/qtv/source/qtv.c
index 7f12d013f..4980dea9b 100644
--- a/qtv/source/qtv.c
+++ b/qtv/source/qtv.c
@@ -87,7 +87,7 @@ redirect_t  qtv_redirected;
 client_t   *qtv_redirect_client;
 dstring_t   outputbuf = {&dstring_default_mem};
 
-static void
+static __attribute__((format(printf, 1, 0))) void
 qtv_print (const char *fmt, va_list args)
 {
 	static int pending;
diff --git a/qw/include/cl_cam.h b/qw/include/cl_cam.h
index 2bd74f644..0fbb1c0e7 100644
--- a/qw/include/cl_cam.h
+++ b/qw/include/cl_cam.h
@@ -43,9 +43,9 @@ extern	int	spec_track; // player# of who we are tracking
 extern	int ideal_track;
 
 void Cam_Lock (int playernum);
-int Cam_TrackNum (void);
-qboolean Cam_DrawViewModel(void);
-qboolean Cam_DrawPlayer(int playernum);
+int Cam_TrackNum (void) __attribute__((pure));
+qboolean Cam_DrawViewModel(void) __attribute__((pure));
+qboolean Cam_DrawPlayer(int playernum) __attribute__((pure));
 void Cam_Track(usercmd_t *cmd);
 void Cam_FinishMove(usercmd_t *cmd);
 void Cam_Reset(void);
diff --git a/qw/include/cl_parse.h b/qw/include/cl_parse.h
index 12bc89e12..4dd3646c6 100644
--- a/qw/include/cl_parse.h
+++ b/qw/include/cl_parse.h
@@ -52,7 +52,7 @@ void CL_ParseServerMessage (void);
 void CL_ParseClientdata (void);
 void CL_NewTranslation (int slot, struct skin_s *skin);
 qboolean	CL_CheckOrDownloadFile (const char *filename);
-qboolean CL_IsUploading(void);
+qboolean CL_IsUploading(void) __attribute__((pure));
 void CL_NextUpload(void);
 void CL_FinishDownload (void);
 void CL_FailDownload (void);
diff --git a/qw/include/crudefile.h b/qw/include/crudefile.h
index 384b6126c..be827be33 100644
--- a/qw/include/crudefile.h
+++ b/qw/include/crudefile.h
@@ -35,6 +35,6 @@ void CF_Close (int desc);
 const char * CF_Read (int desc);
 int CF_Write (int desc, const char *buf);
 int CF_EOF (int desc);
-int CF_Quota (void);
+int CF_Quota (void) __attribute__((pure));
 
 #endif // _CRUDEFILE_H
diff --git a/qw/include/host.h b/qw/include/host.h
index 87404b019..0c1492f47 100644
--- a/qw/include/host.h
+++ b/qw/include/host.h
@@ -51,8 +51,8 @@ void Host_ServerFrame (void);
 void Host_InitCommands (void);
 void Host_Init (void);
 void Host_Shutdown(void);
-void Host_Error (const char *error, ...) __attribute__((format(printf,1,2)));
-void Host_EndGame (const char *message, ...) __attribute__((format(printf,1,2)));
+void Host_Error (const char *error, ...) __attribute__((format(printf,1,2), noreturn));
+void Host_EndGame (const char *message, ...) __attribute__((format(printf,1,2), noreturn));
 void Host_Frame (float time);
 void Host_Quit_f (void);
 void Host_ClientCommands (const char *fmt, ...) __attribute__((format(printf,1,2)));
diff --git a/qw/include/server.h b/qw/include/server.h
index 642f296f8..abc5fdd9d 100644
--- a/qw/include/server.h
+++ b/qw/include/server.h
@@ -492,11 +492,11 @@ void SV_Shutdown (void);
 void SV_Frame (float time);
 void SV_FinalMessage (const char *message);
 void SV_DropClient (client_t *drop);
-int SV_CalcPing (client_t *cl);
+int SV_CalcPing (client_t *cl) __attribute__((pure));
 void SV_FullClientUpdate (client_t *client, sizebuf_t *buf);
 void SV_FullClientUpdateToClient (client_t *client, backbuf_t *backbuf);
 
-int SV_ModelIndex (const char *name);
+int SV_ModelIndex (const char *name) __attribute__((pure));
 
 qboolean SV_CheckBottom (struct edict_s *ent);
 qboolean SV_movestep (struct edict_s *ent, const vec3_t move,
@@ -549,12 +549,12 @@ struct trace_s;
 int SV_FlyMove (struct edict_s *ent, float time, struct trace_s *steptrace);
 struct trace_s SV_PushEntity (struct edict_s *ent, vec3_t push,
 							  unsigned traceflags);
-int SV_EntCanSupportJump (struct edict_s *ent);
+int SV_EntCanSupportJump (struct edict_s *ent) __attribute__((pure));
 
 //
 // sv_send.c
 //
-void SV_Print (const char *fmt, va_list args);
+void SV_Print (const char *fmt, va_list args) __attribute__((format(printf, 1, 0)));
 void SV_Printf (const char *fmt, ...) __attribute__((format(printf,1,2)));
 void SV_SendClientMessages (void);
 void SV_GetStats (struct edict_s *ent, int spectator, int stats[]);
@@ -611,7 +611,7 @@ extern struct dstring_s outputbuf;
 // sv_ccmds.c
 //
 void SV_Status_f (void);
-const char *SV_Current_Map (void);
+const char *SV_Current_Map (void) __attribute__((pure));
 void SV_SetLocalinfo (const char *key, const char *value);
 
 
diff --git a/qw/include/sv_recorder.h b/qw/include/sv_recorder.h
index 80b55d419..f8be8b97f 100644
--- a/qw/include/sv_recorder.h
+++ b/qw/include/sv_recorder.h
@@ -42,12 +42,12 @@ recorder_t *SVR_AddUser (void (*writer)(void *, struct sizebuf_s *, int),
 						 int demo, void *user);
 void SVR_RemoveUser (recorder_t *r);
 struct sizebuf_s *SVR_WriteBegin (byte type, int to, int size);
-struct sizebuf_s *SVR_Datagram (void);
+struct sizebuf_s *SVR_Datagram (void) __attribute__((const));
 void SVR_ForceFrame (void);
 void SVR_Pause (recorder_t *r);
 void SVR_Continue (recorder_t *r);
 void SVR_SetDelta (recorder_t *r, int delta, int in_frame);
 void SVR_SendMessages (void);
-int SVR_NumRecorders (void);
+int SVR_NumRecorders (void) __attribute__((pure));
 
 #endif//__sv_recorder_h
diff --git a/qw/source/cl_slist.c b/qw/source/cl_slist.c
index 9efafd73b..21497f142 100644
--- a/qw/source/cl_slist.c
+++ b/qw/source/cl_slist.c
@@ -314,7 +314,7 @@ SL_Shutdown (void)
 		SL_Del_All (all_slist);
 }
 
-static char *
+static __attribute__((pure)) char *
 gettokstart (char *str, int req, char delim)
 {
 	char       *start = str;
@@ -340,7 +340,7 @@ gettokstart (char *str, int req, char delim)
 	return start;
 }
 
-static int
+static __attribute__((pure)) int
 gettoklen (char *str, int req, char delim)
 {
 	char       *start = 0;
diff --git a/qw/source/sv_main.c b/qw/source/sv_main.c
index 685dfd0a7..c69e23594 100644
--- a/qw/source/sv_main.c
+++ b/qw/source/sv_main.c
@@ -257,7 +257,7 @@ SV_Shutdown (void)
 	Sends a datagram to all the clients informing them of the server crash,
 	then exits
 */
-static void
+static __attribute__((format(printf, 1, 0))) void
 SV_Error (const char *error, va_list argptr)
 {
 	static qboolean inerror = false;
@@ -1206,7 +1206,7 @@ SV_MaskIPTrim (byte *ip, int mask)
 }
 
 // assumes b has already been masked
-static inline qboolean
+static inline __attribute__((pure)) qboolean
 SV_MaskIPCompare (byte *a, byte *b, int mask)
 {
 	int i;
diff --git a/qw/source/sv_pr_cmds.c b/qw/source/sv_pr_cmds.c
index 4f832e5a2..46a9cc4e3 100644
--- a/qw/source/sv_pr_cmds.c
+++ b/qw/source/sv_pr_cmds.c
@@ -1061,7 +1061,7 @@ PF_changeyaw (progs_t *pr)
 #define	MSG_INIT		3				// write to the init string
 #define	MSG_MULTICAST	4				// for multicast ()
 
-static sizebuf_t *
+static __attribute__((pure)) sizebuf_t *
 WriteDest (progs_t *pr)
 {
 	int         dest;
@@ -1094,7 +1094,7 @@ WriteDest (progs_t *pr)
 	return NULL;
 }
 
-static client_t *
+static __attribute__((pure)) client_t *
 Write_GetClient (progs_t *pr)
 {
 	edict_t    *ent;
diff --git a/qw/source/world.c b/qw/source/world.c
index ac5dd641b..0664c197e 100644
--- a/qw/source/world.c
+++ b/qw/source/world.c
@@ -677,7 +677,7 @@ SV_ClipMoveToEntity (edict_t *touched, const vec3_t start,
 	return trace;
 }
 
-static always_inline int
+static always_inline __attribute__((pure)) int
 ctl_pretest_everything (edict_t *touch, moveclip_t *clip)
 {
 	if (touch->free)
@@ -705,7 +705,7 @@ ctl_pretest_triggers (edict_t *touch, moveclip_t *clip)
 	return 1;
 }
 
-static always_inline int
+static always_inline __attribute__((pure)) int
 ctl_pretest_other (edict_t *touch, moveclip_t *clip)
 {
 	if (SVfloat (touch, solid) == SOLID_NOT)
diff --git a/tools/qfbsp/include/brush.h b/tools/qfbsp/include/brush.h
index 66cdff5a4..f51beab00 100644
--- a/tools/qfbsp/include/brush.h
+++ b/tools/qfbsp/include/brush.h
@@ -69,7 +69,7 @@ brushset_t *Brush_LoadEntity (entity_t *ent, int hullnum);
 
 	\param normal	Must be canonical.
 */
-int	PlaneTypeForNormal (const vec3_t normal);
+int	PlaneTypeForNormal (const vec3_t normal) __attribute__((pure));
 
 /**	Make the plane canonical.
 
diff --git a/tools/qfbsp/include/map.h b/tools/qfbsp/include/map.h
index 1e6c18f29..e531fad8a 100644
--- a/tools/qfbsp/include/map.h
+++ b/tools/qfbsp/include/map.h
@@ -95,7 +95,7 @@ void PrintEntity (const entity_t *ent);
 	\return			The value for the key, or the empty string if the key
 					does not exist in this entity.
 */
-const char *ValueForKey (const entity_t *ent, const char *key);
+const char *ValueForKey (const entity_t *ent, const char *key) __attribute__((pure));
 
 /**	Set the value of the entity's key.
 	If the key does not exist, one will be added.
diff --git a/tools/qfbsp/source/outside.c b/tools/qfbsp/source/outside.c
index 0907d4dee..3002f468b 100644
--- a/tools/qfbsp/source/outside.c
+++ b/tools/qfbsp/source/outside.c
@@ -41,7 +41,7 @@ int         outleafs;
 	\param point	The point's location.
 	\return			The leaf node in which the point is.
 */
-static node_t *
+static __attribute__((pure)) node_t *
 PointInLeaf (node_t *node, const vec3_t point)
 {
 	vec_t       d;
diff --git a/tools/qfbsp/source/portals.c b/tools/qfbsp/source/portals.c
index 6b99cefda..4871aefbe 100644
--- a/tools/qfbsp/source/portals.c
+++ b/tools/qfbsp/source/portals.c
@@ -422,7 +422,7 @@ int         num_realleafs;
 	\param cont		The contents for which to check.
 	\return			1 if the node has the specified contents, otherwise 0.
 */
-static int
+static __attribute__((pure)) int
 HasContents (const node_t *n, int cont)
 {
 	if (n->contents == cont)
@@ -439,7 +439,7 @@ HasContents (const node_t *n, int cont)
 	\param n1		The first node to check.
 	\param n2		The second node to check.
 */
-static int
+static __attribute__((pure)) int
 ShareContents (const node_t *n1, const node_t *n2)
 {
 	if (n1->contents) {
@@ -461,7 +461,7 @@ ShareContents (const node_t *n1, const node_t *n2)
 	\param n1		The first node to check.
 	\param n2		The second node to check.
 */
-static int
+static __attribute__((pure)) int
 SameContents (const node_t *n1, const node_t *n2)
 {
 	if (n1->contents == CONTENTS_SOLID || n2->contents == CONTENTS_SOLID)
@@ -471,7 +471,7 @@ SameContents (const node_t *n1, const node_t *n2)
 	if (options.watervis)	//FIXME be more picky?
 		return 1;
 	if (n1->detail && n2->detail)
-		ShareContents (n1, n2);
+		return ShareContents (n1, n2);
 	if (n1->detail)
 		return HasContents (n1, n2->contents);
 	if (n2->detail)
diff --git a/tools/qfbsp/source/solidbsp.c b/tools/qfbsp/source/solidbsp.c
index 5e04f3c32..d4c9e0f7d 100644
--- a/tools/qfbsp/source/solidbsp.c
+++ b/tools/qfbsp/source/solidbsp.c
@@ -121,7 +121,7 @@ FaceSide (const face_t *in, const plane_t *split)
 	\param maxs		The maximum coordinate of the boundiing box.
 	\return			The chosen surface.
 */
-static surface_t *
+static __attribute__((pure)) surface_t *
 ChooseMidPlaneFromList (surface_t *surfaces,
 						const vec3_t mins, const vec3_t maxs)
 {
@@ -186,7 +186,7 @@ ChooseMidPlaneFromList (surface_t *surfaces,
 	\return			The chosen surface, or NULL if a suitable surface could
 					not be found.
 */
-static surface_t *
+static __attribute__((pure)) surface_t *
 ChoosePlaneFromList (surface_t *surfaces, const vec3_t mins, const vec3_t maxs,
 					 qboolean usefloors, qboolean usedetail)
 {
diff --git a/tools/qfcc/include/class.h b/tools/qfcc/include/class.h
index a2cf55182..323912591 100644
--- a/tools/qfcc/include/class.h
+++ b/tools/qfcc/include/class.h
@@ -107,13 +107,13 @@ struct expr_s;
 struct method_s;
 struct symbol_s;
 
-int obj_is_id (const struct type_s *type);
-int obj_is_class (const struct type_s *type);
-int obj_is_Class (const struct type_s *type);
-int obj_is_classptr (const struct type_s *type);
+int obj_is_id (const struct type_s *type) __attribute__((pure));
+int obj_is_class (const struct type_s *type) __attribute__((pure));
+int obj_is_Class (const struct type_s *type) __attribute__((pure));
+int obj_is_classptr (const struct type_s *type) __attribute__((pure));
 int obj_types_assignable (const struct type_s *dst, const struct type_s *src);
 
-class_t *extract_class (class_type_t *class_type);
+class_t *extract_class (class_type_t *class_type) __attribute__((pure));
 const char *get_class_name (class_type_t *class_type, int pretty);
 struct symbol_s *class_symbol (class_type_t *class_type, int external);
 void class_init (void);
@@ -125,7 +125,7 @@ void class_add_ivars (class_t *class, struct symtab_s *ivars);
 void class_check_ivars (class_t *class, struct symtab_s *ivars);
 void class_begin (class_type_t *class_type);
 void class_finish (class_type_t *class_type);
-int class_access (class_type_t *current_class, class_t *class);
+int class_access (class_type_t *current_class, class_t *class) __attribute__((pure));
 struct symbol_s *class_find_ivar (class_t *class, int vis, const char *name);
 struct symtab_s *class_ivar_scope (class_type_t *class_type,
 								   struct symtab_s *parent);
@@ -153,8 +153,8 @@ void protocol_add_protocols (protocol_t *protocol, protocollist_t *protocols);
 struct def_s *protocol_def (protocol_t *protocol);
 protocollist_t *new_protocol_list (void);
 protocollist_t *add_protocol (protocollist_t *protocollist, const char *name);
-int procollist_find_protocol (protocollist_t *protocollist, protocol_t *proto);
-int compare_protocols (protocollist_t *protos1, protocollist_t *protos2);
+int procollist_find_protocol (protocollist_t *protocollist, protocol_t *proto) __attribute__((pure));
+int compare_protocols (protocollist_t *protos1, protocollist_t *protos2) __attribute__((pure));
 void print_protocollist (struct dstring_s *dstr, protocollist_t *protocollist);
 struct def_s *emit_protocol (protocol_t *protocol);
 struct def_s *emit_protocol_list (protocollist_t *protocols, const char *name);
diff --git a/tools/qfcc/include/def.h b/tools/qfcc/include/def.h
index 7e24506b9..e22ab8c7e 100644
--- a/tools/qfcc/include/def.h
+++ b/tools/qfcc/include/def.h
@@ -254,7 +254,7 @@ void initialize_def (struct symbol_s *sym, struct type_s *type,
 	\return			1 if the defs overlap, 2 if \a d1 fully overlaps \a d2,
 					otherwise 0.
 */
-int def_overlap (def_t *d1, def_t *d2);
+int def_overlap (def_t *d1, def_t *d2) __attribute__((pure));
 
 /** Convenience function for obtaining a def's actual offset.
 
@@ -263,7 +263,7 @@ int def_overlap (def_t *d1, def_t *d2);
 	\param def		The def of which to obtain the offset. May be an alias def.
 	\return			The actual offset of the def in the def's defspace.
 */
-int def_offset (def_t *def);
+int def_offset (def_t *def) __attribute__((pure));
 
 /** Convenience function for obtaining a def's size.
 
@@ -272,7 +272,7 @@ int def_offset (def_t *def);
 	\param def		The def of which to obtain the size.
 	\return			The size of the def.
 */
-int def_size (def_t *def);
+int def_size (def_t *def) __attribute__((pure));
 
 /** Visit all defs that alias the given def, including itself.
 
diff --git a/tools/qfcc/include/expr.h b/tools/qfcc/include/expr.h
index 5b1c6d1e7..73d3f2399 100644
--- a/tools/qfcc/include/expr.h
+++ b/tools/qfcc/include/expr.h
@@ -384,7 +384,7 @@ expr_t *new_name_expr (const char *name);
 					(expr_t::e::string_val).
 */
 expr_t *new_string_expr (const char *string_val);
-const char *expr_string (expr_t *e);
+const char *expr_string (expr_t *e) __attribute__((pure));
 
 /** Create a new float constant expression node.
 
@@ -393,7 +393,7 @@ const char *expr_string (expr_t *e);
 					(expr_t::e::float_val).
 */
 expr_t *new_float_expr (float float_val);
-float expr_float (expr_t *e);
+float expr_float (expr_t *e) __attribute__((pure));
 
 /** Create a new vector constant expression node.
 
@@ -402,7 +402,7 @@ float expr_float (expr_t *e);
 					(expr_t::e::vector_val).
 */
 expr_t *new_vector_expr (const float *vector_val);
-const float *expr_vector (expr_t *e);
+const float *expr_vector (expr_t *e) __attribute__((pure));
 expr_t *new_vector_list (expr_t *e);
 
 /** Create a new entity constant expression node.
@@ -449,7 +449,7 @@ expr_t *new_pointer_expr (int val, struct type_s *type, struct def_s *def);
 					(expr_t::e::quaternion_val).
 */
 expr_t *new_quaternion_expr (const float *quaternion_val);
-const float *expr_quaternion (expr_t *e);
+const float *expr_quaternion (expr_t *e) __attribute__((pure));
 
 /** Create a new integer constant expression node.
 
@@ -458,7 +458,7 @@ const float *expr_quaternion (expr_t *e);
 					(expr_t::e::integer_val).
 */
 expr_t *new_integer_expr (int integer_val);
-int expr_integer (expr_t *e);
+int expr_integer (expr_t *e) __attribute__((pure));
 
 /** Create a new integer constant expression node.
 
@@ -467,7 +467,7 @@ int expr_integer (expr_t *e);
 					(expr_t::e::integer_val).
 */
 expr_t *new_uinteger_expr (unsigned uinteger_val);
-unsigned expr_uinteger (expr_t *e);
+unsigned expr_uinteger (expr_t *e) __attribute__((pure));
 
 /** Create a new short constant expression node.
 
@@ -476,14 +476,14 @@ unsigned expr_uinteger (expr_t *e);
 					(expr_t::e::short_val).
 */
 expr_t *new_short_expr (short short_val);
-short expr_short (expr_t *e);
+short expr_short (expr_t *e) __attribute__((pure));
 
 /**	Check of the expression refers to a constant value.
 
 	\param e		The expression to check.
 	\return			True if the expression is constant.
 */
-int is_constant (expr_t *e);
+int is_constant (expr_t *e) __attribute__((pure));
 
 /**	Return a value expression representing the constant stored in \a e.
 
@@ -500,30 +500,30 @@ expr_t *constant_expr (expr_t *e);
 	\param op		The op-code to check.
 	\return			True if the op-code is a comparison operator.
 */
-int is_compare (int op);
+int is_compare (int op) __attribute__((const));
 
 /**	Check if the op-code is a math operator.
 
 	\param op		The op-code to check.
 	\return			True if the op-code is a math operator.
 */
-int is_math_op (int op);
+int is_math_op (int op) __attribute__((const));
 
 /**	Check if the op-code is a logic operator.
 
 	\param op		The op-code to check.
 	\return			True if the op-code is a logic operator.
 */
-int is_logic (int op);
+int is_logic (int op) __attribute__((const));
 
-int has_function_call (expr_t *e);
+int has_function_call (expr_t *e) __attribute__((pure));
 
-int is_string_val (expr_t *e);
-int is_float_val (expr_t *e);
-int is_vector_val (expr_t *e);
-int is_quaternion_val (expr_t *e);
-int is_integer_val (expr_t *e);
-int is_short_val (expr_t *e);
+int is_string_val (expr_t *e) __attribute__((pure));
+int is_float_val (expr_t *e) __attribute__((pure));
+int is_vector_val (expr_t *e) __attribute__((pure));
+int is_quaternion_val (expr_t *e) __attribute__((pure));
+int is_integer_val (expr_t *e) __attribute__((pure));
+int is_short_val (expr_t *e) __attribute__((pure));
 
 /**	Create a reference to the global <code>.self</code> entity variable.
 
@@ -627,7 +627,7 @@ expr_t *think_expr (struct symbol_s *think_sym);
 expr_t *assign_expr (expr_t *e1, expr_t *e2);
 expr_t *cast_expr (struct type_s *t, expr_t *e);
 
-const char *get_op_string (int op);
+const char *get_op_string (int op) __attribute__((const));
 
 struct keywordarg_s;
 struct class_type_s;
diff --git a/tools/qfcc/include/qfcc.h b/tools/qfcc/include/qfcc.h
index 3aa464185..0bec07d37 100644
--- a/tools/qfcc/include/qfcc.h
+++ b/tools/qfcc/include/qfcc.h
@@ -107,7 +107,7 @@ extern	pr_info_t	pr;
 
 #define POINTER_OFS(s,p)	((pr_type_t *) (p) - (s)->data)
 
-const char *strip_path (const char *filename);
+const char *strip_path (const char *filename) __attribute__((pure));
 
 extern FILE *qc_yyin;
 extern FILE *qp_yyin;
diff --git a/tools/qfcc/include/statements.h b/tools/qfcc/include/statements.h
index 565cc9295..356d66b8f 100644
--- a/tools/qfcc/include/statements.h
+++ b/tools/qfcc/include/statements.h
@@ -111,7 +111,7 @@ struct expr_s;
 struct type_s;
 struct dstring_s;
 
-const char *optype_str (op_type_e type);
+const char *optype_str (op_type_e type) __attribute__((const));
 
 operand_t *def_operand (struct def_s *def, struct type_s *type);
 operand_t *value_operand (struct ex_value_s *value);
@@ -122,12 +122,12 @@ void free_operand (operand_t *op);
 sblock_t *new_sblock (void);
 statement_t *new_statement (st_type_t type, const char *opcode,
 							struct expr_s *expr);
-int statement_is_cond (statement_t *s);
-int statement_is_goto (statement_t *s);
-int statement_is_jumpb (statement_t *s);
-int statement_is_call (statement_t *s);
-int statement_is_return (statement_t *s);
-sblock_t *statement_get_target (statement_t *s);
+int statement_is_cond (statement_t *s) __attribute__((pure));
+int statement_is_goto (statement_t *s) __attribute__((pure));
+int statement_is_jumpb (statement_t *s) __attribute__((pure));
+int statement_is_call (statement_t *s) __attribute__((pure));
+int statement_is_return (statement_t *s) __attribute__((pure));
+sblock_t *statement_get_target (statement_t *s) __attribute__((pure));
 sblock_t **statement_get_targetlist (statement_t *s);
 void sblock_add_statement (sblock_t *sblock, statement_t *statement);
 sblock_t *make_statements (struct expr_s *expr);
diff --git a/tools/qfcc/include/symtab.h b/tools/qfcc/include/symtab.h
index 0a89a39e7..626d7a484 100644
--- a/tools/qfcc/include/symtab.h
+++ b/tools/qfcc/include/symtab.h
@@ -92,7 +92,7 @@ typedef struct symtab_s {
 	struct defspace_s *space;	///< storage for vars in scope symtabs
 } symtab_t;
 
-const char *symtype_str (sy_type_e type);
+const char *symtype_str (sy_type_e type) __attribute__((const));
 
 /**	Create a new, empty named symbol.
 
diff --git a/tools/qfcc/include/type.h b/tools/qfcc/include/type.h
index 2020e8a95..2e1fa6c87 100644
--- a/tools/qfcc/include/type.h
+++ b/tools/qfcc/include/type.h
@@ -123,7 +123,7 @@ extern struct symtab_s *quaternion_struct;
 
 struct dstring_s;
 
-etype_t low_level_type (type_t *type);
+etype_t low_level_type (type_t *type) __attribute__((pure));
 type_t *new_type (void);
 void free_type (type_t *type);
 void chain_type (type_t *type);
@@ -150,17 +150,17 @@ void print_type (const type_t *type);
 const char *encode_params (const type_t *type);
 void encode_type (struct dstring_s *encoding, const type_t *type);
 const char *type_get_encoding (const type_t *type);
-int is_void (const type_t *type);
-int is_enum (const type_t *type);
-int is_integral (const type_t *type);
-int is_float (const type_t *type);
-int is_scalar (const type_t *type);
-int is_math (const type_t *type);
-int is_pointer (const type_t *type);
-int is_struct (const type_t *type);
-int is_array (const type_t *type);
+int is_void (const type_t *type) __attribute__((pure));
+int is_enum (const type_t *type) __attribute__((pure));
+int is_integral (const type_t *type) __attribute__((pure));
+int is_float (const type_t *type) __attribute__((pure));
+int is_scalar (const type_t *type) __attribute__((pure));
+int is_math (const type_t *type) __attribute__((pure));
+int is_pointer (const type_t *type) __attribute__((pure));
+int is_struct (const type_t *type) __attribute__((pure));
+int is_array (const type_t *type) __attribute__((pure));
 int type_assignable (const type_t *dst, const type_t *src);
-int type_size (const type_t *type);
+int type_size (const type_t *type) __attribute__((pure));
 
 void init_types (void);
 void chain_initial_types (void);
diff --git a/tools/qfcc/source/class.c b/tools/qfcc/source/class.c
index 6edb3f7da..52b67823d 100644
--- a/tools/qfcc/source/class.c
+++ b/tools/qfcc/source/class.c
@@ -281,7 +281,7 @@ obj_classname (const type_t *type)
 	return str->str;
 }
 
-static int
+static __attribute__((pure)) int
 category_implements (category_t *cat, protocol_t *protocol)
 {
 	for (; cat; cat = cat->next) {
diff --git a/tools/qfcc/source/constfold.c b/tools/qfcc/source/constfold.c
index 799b2ff0f..33c156cca 100644
--- a/tools/qfcc/source/constfold.c
+++ b/tools/qfcc/source/constfold.c
@@ -60,7 +60,7 @@ cf_cast_expr (type_t *type, expr_t *e)
 	return e;
 }
 
-static int
+static __attribute__((pure)) int
 valid_op (int op, int *valid_ops)
 {
 	while (*valid_ops && op != *valid_ops)
diff --git a/tools/qfcc/source/dags.c b/tools/qfcc/source/dags.c
index 5daf3060e..fc87e31eb 100644
--- a/tools/qfcc/source/dags.c
+++ b/tools/qfcc/source/dags.c
@@ -208,7 +208,7 @@ leaf_node (dag_t *dag, operand_t *op, expr_t *expr)
 	return node;
 }
 
-static dagnode_t *
+static __attribute__((pure)) dagnode_t *
 dag_node (operand_t *op)
 {
 	def_t      *def;
diff --git a/tools/qfcc/source/diagnostic.c b/tools/qfcc/source/diagnostic.c
index 6f198851e..746a99ac2 100644
--- a/tools/qfcc/source/diagnostic.c
+++ b/tools/qfcc/source/diagnostic.c
@@ -72,7 +72,7 @@ report_function (expr_t *e)
 	last_func = current_func;
 }
 
-static void
+static __attribute__((format(printf, 4, 0))) void
 format_message (dstring_t *message, const char *msg_type, expr_t *e,
 				const char *fmt, va_list args)
 {
@@ -90,7 +90,7 @@ format_message (dstring_t *message, const char *msg_type, expr_t *e,
 	}
 }
 
-static void
+static __attribute__((format(printf, 2, 0))) void
 _warning (expr_t *e, const char *fmt, va_list args)
 {
 	dstring_t  *message = dstring_new ();
diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index 45aa50882..0270ff58f 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -2462,7 +2462,7 @@ think_expr (symbol_t *think_sym)
 	return new_symbol_expr (think_sym);
 }
 
-static int
+static __attribute__((pure)) int
 is_indirect (expr_t *e)
 {
 	if (e->type == ex_block && e->e.block.result)
@@ -2480,7 +2480,7 @@ is_indirect (expr_t *e)
 	return 0;
 }
 
-static inline int
+static inline __attribute__((pure)) int
 is_lvalue (expr_t *e)
 {
 	if (e->type == ex_symbol) {
diff --git a/tools/qfcc/source/flow.c b/tools/qfcc/source/flow.c
index bb398e045..4170c2970 100644
--- a/tools/qfcc/source/flow.c
+++ b/tools/qfcc/source/flow.c
@@ -153,7 +153,7 @@ delete_graph (flowgraph_t *graph)
 	FREE (graphs, graph);
 }
 
-static def_t *
+static __attribute__((pure)) def_t *
 flowvar_get_def (flowvar_t *var)
 {
 	operand_t  *op = var->op;
diff --git a/tools/qfcc/source/method.c b/tools/qfcc/source/method.c
index ab1c873a8..e5102a6cf 100644
--- a/tools/qfcc/source/method.c
+++ b/tools/qfcc/source/method.c
@@ -212,7 +212,7 @@ copy_methods (methodlist_t *dst, methodlist_t *src)
 	}
 }
 
-int
+__attribute__((pure)) int
 method_compare (method_t *m1, method_t *m2)
 {
 	if (m1->instance != m2->instance)
diff --git a/tools/qfcc/source/obj_file.c b/tools/qfcc/source/obj_file.c
index b7d5a389e..db4bcc3df 100644
--- a/tools/qfcc/source/obj_file.c
+++ b/tools/qfcc/source/obj_file.c
@@ -643,7 +643,7 @@ get_def_type (qfo_t *qfo, pointer_t type)
 	return ev_invalid;
 }
 
-static etype_t
+static __attribute__((pure)) etype_t
 get_type_size (qfo_t *qfo, pointer_t type)
 {
 	qfot_type_t *type_def;
diff --git a/tools/qfcc/source/qc-lex.l b/tools/qfcc/source/qc-lex.l
index 14cc1265f..1b234e9e4 100644
--- a/tools/qfcc/source/qc-lex.l
+++ b/tools/qfcc/source/qc-lex.l
@@ -72,6 +72,13 @@
 #define YY_DECL int yylex YY_PROTO(( void ))
 YY_DECL;
 
+int yyget_lineno (void) __attribute__((pure));
+int yyget_leng (void) __attribute__((pure));
+int yywrap (void) __attribute__((const));
+char *yyget_text (void) __attribute__((pure));
+int yyget_debug (void) __attribute__((pure));
+FILE *yyget_in (void) __attribute__((pure));
+FILE *yyget_out (void) __attribute__((pure));
 
 static int keyword_or_id (char *token);
 
diff --git a/tools/qfcc/source/qfcc.c b/tools/qfcc/source/qfcc.c
index e53cdc077..cf6d1257f 100644
--- a/tools/qfcc/source/qfcc.c
+++ b/tools/qfcc/source/qfcc.c
@@ -460,7 +460,7 @@ finish_link (void)
 	return 0;
 }
 
-static lang_t
+static __attribute__((pure)) lang_t
 file_language (const char *file, const char *ext)
 {
 	static ext_lang_t ext_lang[] = {
diff --git a/tools/qfcc/source/qp-lex.l b/tools/qfcc/source/qp-lex.l
index 0bca559c9..423aaf4e0 100644
--- a/tools/qfcc/source/qp-lex.l
+++ b/tools/qfcc/source/qp-lex.l
@@ -57,9 +57,16 @@
 #define YY_DECL int yylex YY_PROTO(( void ))
 YY_DECL;
 
+int yyget_lineno (void) __attribute__((pure));
+int yyget_leng (void) __attribute__((pure));
+int yywrap (void) __attribute__((const));
+char *yyget_text (void) __attribute__((pure));
+int yyget_debug (void) __attribute__((pure));
+FILE *yyget_in (void) __attribute__((pure));
+FILE *yyget_out (void) __attribute__((pure));
 
 static int keyword_or_id (const char *token);
-static int convert_relop (const char *relop);
+static int convert_relop (const char *relop) __attribute__((pure));
 
 %}
 
diff --git a/tools/qfcc/source/stub.c b/tools/qfcc/source/stub.c
index af6e70131..117b19a8e 100644
--- a/tools/qfcc/source/stub.c
+++ b/tools/qfcc/source/stub.c
@@ -23,11 +23,11 @@ options_t options;
 int num_linenos;
 pr_lineno_t *linenos;
 pr_info_t pr;
-string_t ReuseString (const char *str) {return 0;}
+__attribute__((const)) string_t ReuseString (const char *str) {return 0;}
 void encode_type (struct dstring_s *str, const type_t *type) {}
-codespace_t *codespace_new (void) {return 0;}
+__attribute__((const)) codespace_t *codespace_new (void) {return 0;}
 void codespace_addcode (codespace_t *codespace, struct dstatement_s *code, int size) {}
-int function_parms (function_t *f, byte *parm_size) {return 0;}
+__attribute__((const)) int function_parms (function_t *f, byte *parm_size) {return 0;}
 void def_to_ddef (def_t *def, ddef_t *ddef, int aux) {}
-expr_t *warning (expr_t *e, const char *fmt, ...) {return 0;}
-expr_t *error (expr_t *e, const char *fmt, ...) {return 0;}
+__attribute__((const)) expr_t *warning (expr_t *e, const char *fmt, ...) {return 0;}
+__attribute__((const)) expr_t *error (expr_t *e, const char *fmt, ...) {return 0;}
diff --git a/tools/qfcc/source/switch.c b/tools/qfcc/source/switch.c
index 718e1ea04..839f7ef4a 100644
--- a/tools/qfcc/source/switch.c
+++ b/tools/qfcc/source/switch.c
@@ -63,7 +63,7 @@ typedef struct case_node_s {
 	struct case_node_s *left, *right;
 } case_node_t;
 
-static ex_value_t *
+static __attribute__((pure)) ex_value_t *
 get_value (expr_t *e)
 {
 	if (e->type == ex_symbol)
@@ -73,7 +73,7 @@ get_value (expr_t *e)
 	return e->e.value;
 }
 
-static uintptr_t
+static __attribute__((pure)) uintptr_t
 get_hash (const void *_cl, void *unused)
 {
 	case_label_t *cl = (case_label_t *) _cl;
@@ -172,7 +172,7 @@ new_switch_block (void)
 	return switch_block;
 }
 
-static int
+static __attribute__((pure)) int
 label_compare (const void *_a, const void *_b)
 {
 	const case_label_t **a = (const case_label_t **) _a;
diff --git a/tools/qfcc/source/type.c b/tools/qfcc/source/type.c
index 586a7b1a0..bb1e3d7c2 100644
--- a/tools/qfcc/source/type.c
+++ b/tools/qfcc/source/type.c
@@ -218,7 +218,7 @@ append_type (type_t *type, type_t *new)
 	return type;
 }
 
-static int
+static __attribute__((pure)) int
 types_same (type_t *a, type_t *b)
 {
 	int         i, count;
diff --git a/tools/qfcc/source/value.c b/tools/qfcc/source/value.c
index 0d323ac99..ad84f25ae 100644
--- a/tools/qfcc/source/value.c
+++ b/tools/qfcc/source/value.c
@@ -259,7 +259,7 @@ imm_free (void *_imm, void *unused)
 	free (_imm);
 }
 
-static uintptr_t
+static __attribute__((pure)) uintptr_t
 imm_get_hash (const void *_imm, void *_tab)
 {
 	immediate_t *imm = (immediate_t *) _imm;
@@ -290,7 +290,7 @@ imm_get_hash (const void *_imm, void *_tab)
 	}
 }
 
-static int
+static __attribute__((pure)) int
 imm_compare (const void *_imm1, const void *_imm2, void *_tab)
 {
 	immediate_t *imm1 = (immediate_t *) _imm1;
diff --git a/tools/qfcc/test/test-defspace.c b/tools/qfcc/test/test-defspace.c
index bc5f45077..cf2af5f58 100644
--- a/tools/qfcc/test/test-defspace.c
+++ b/tools/qfcc/test/test-defspace.c
@@ -17,7 +17,7 @@ pr_info_t   pr;
 function_t *current_func;
 class_type_t *current_class;
 
-const char *
+__attribute__((const))const char *
 get_class_name (class_type_t *class_type, int prett)
 {
 	return 0;
diff --git a/tools/qflight/include/light.h b/tools/qflight/include/light.h
index 0899bc1b8..e06a9157a 100644
--- a/tools/qflight/include/light.h
+++ b/tools/qflight/include/light.h
@@ -128,7 +128,7 @@ extern vec3_t *surfaceorgs;
 extern struct entity_s **novislights;
 extern int num_novislights;
 
-const char *get_tex_name (int texindex);
+const char *get_tex_name (int texindex) __attribute__((pure));
 
 //@}
 
diff --git a/tools/qflight/include/noise.h b/tools/qflight/include/noise.h
index 0017ab107..30625ae13 100644
--- a/tools/qflight/include/noise.h
+++ b/tools/qflight/include/noise.h
@@ -33,10 +33,10 @@
 */
 //@{
 
-float noise3d (vec3_t v, int num);
-float noiseXYZ (float x, float y, float z, int num);
-float noise_scaled (vec3_t v, float s, int num);
-float noise_perlin (vec3_t v, float p, int num);
+float noise3d (vec3_t v, int num) __attribute__((pure));
+float noiseXYZ (float x, float y, float z, int num) __attribute__((pure));
+float noise_scaled (vec3_t v, float s, int num) __attribute__((pure));
+float noise_perlin (vec3_t v, float p, int num) __attribute__((pure));
 void snap_vector (vec3_t v_old, vec3_t v_new, float scale);
 
 //@}
diff --git a/tools/qflight/include/options.h b/tools/qflight/include/options.h
index 22443ccae..a90592519 100644
--- a/tools/qflight/include/options.h
+++ b/tools/qflight/include/options.h
@@ -57,7 +57,7 @@ extern struct dstring_s *bspfile;
 extern const char *this_program;
 
 int DecodeArgs (int argc, char **argv);
-void usage (int status);
+void usage (int status) __attribute__((noreturn));
 
 //@}
 
diff --git a/tools/qflight/source/vis.c b/tools/qflight/source/vis.c
index 44ed4ecca..e8267146c 100644
--- a/tools/qflight/source/vis.c
+++ b/tools/qflight/source/vis.c
@@ -73,7 +73,7 @@ int num_alllights;
 entity_t **novislights;
 int num_novislights;
 
-static dleaf_t *
+static __attribute__((pure)) dleaf_t *
 Light_PointInLeaf (vec3_t point)
 {
 	int         num = 0, side;
diff --git a/tools/qfvis/include/options.h b/tools/qfvis/include/options.h
index 0af22f520..521a4ef94 100644
--- a/tools/qfvis/include/options.h
+++ b/tools/qfvis/include/options.h
@@ -40,7 +40,7 @@ typedef struct {
 
 extern options_t options;
 int DecodeArgs (int argc, char **argv);
-void usage (int status);
+void usage (int status) __attribute__((noreturn));
 extern const char *this_program;
 
 #endif//__options_h

From ba3220e4d16f032d6deb16563ecb67e19a2d437c Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 9 Oct 2018 12:36:39 +0900
Subject: [PATCH 0159/1519] Fix a format oops.

I had never noticed the error...
---
 nq/source/host_cmd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nq/source/host_cmd.c b/nq/source/host_cmd.c
index fa75e33e8..31bf539b5 100644
--- a/nq/source/host_cmd.c
+++ b/nq/source/host_cmd.c
@@ -90,7 +90,7 @@ Host_Status_f (void)
 		print = SV_ClientPrintf;
 
 	print ("host:    %s\n", Cvar_VariableString ("hostname"));
-	print ("version: %4.2f\n", PACKAGE_VERSION);
+	print ("version: %4.2s\n", PACKAGE_VERSION);
 	if (tcpipAvailable)
 		print ("tcp/ip:  %s\n", my_tcpip_address);
 	print ("map:     %s\n", sv.name);

From 6f28ab2a681162d4b5338318343b0d42752dc3de Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 9 Oct 2018 12:44:46 +0900
Subject: [PATCH 0160/1519] Add basic quaternion multiplication tests.

---
 libs/util/test/test-quat.c | 79 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 79 insertions(+)

diff --git a/libs/util/test/test-quat.c b/libs/util/test/test-quat.c
index 58a3e0a2f..ce679771c 100644
--- a/libs/util/test/test-quat.c
+++ b/libs/util/test/test-quat.c
@@ -4,6 +4,15 @@
 
 #include "QF/mathlib.h"
 
+static struct {
+	quat_t      q1;
+	quat_t      q2;
+	quat_t      expect;
+} quat_mult_tests[] = {
+	{{4, 1, 2, 3}, {8, 5, 6, 7}, {-6, 24, 48, 48}},
+};
+#define num_quat_mult_tests (sizeof (quat_mult_tests) / sizeof (quat_mult_tests[0]))
+
 //PITCH YAW ROLL
 static vec3_t test_angles[] = {
 	{0, 0, 0},
@@ -28,6 +37,41 @@ compare (vec_t a, vec_t b)
 	return diff * diff < 0.001;
 }
 
+static int
+test_quat_mult(const quat_t q1, const quat_t q2, const quat_t expect)
+{
+	int         i;
+	quat_t      r;
+
+	QuatMult (q1, q2, r);
+
+	for (i = 0; i < 4; i++)
+		if (!compare (r[i], expect[i]))
+			goto fail;
+	return 1;
+fail:
+	printf ("%g %g %g %g\n", QuatExpand (q1));
+	printf ("%g %g %g %g\n", QuatExpand (q2));
+	printf ("%g %g %g %g\n", QuatExpand (r));
+	printf ("%g %g %g %g\n", QuatExpand (expect));
+	return 0;
+}
+
+
+static void
+rotate_vec (const quat_t r, const vec3_t v, vec3_t out)
+{
+	quat_t      qv = {0, 0, 0, 0};
+	quat_t      t;
+
+	VectorCopy (v, qv + 1);
+
+	QuatConj (r, t);
+	QuatMult (qv, t, t);
+	QuatMult (r, t, t);
+	VectorCopy (t + 1, out);
+}
+
 static int
 test_rotation (const vec3_t angles)
 {
@@ -131,12 +175,42 @@ fail:
 	return 0;
 }
 
+static int
+test_rotation3 (const vec3_t angles)
+{
+	int         i;
+	quat_t      quat;
+	vec3_t      v = {1, 1, 1};
+	vec3_t      a, b;
+
+	AngleQuat (angles, quat);
+	QuatMultVec (quat, v, a);
+	rotate_vec (quat, v, b);
+
+	for (i = 0; i < 3; i++)
+		if (!compare (a[i], b[i]))
+			goto fail;
+	return 1;
+fail:
+	printf ("%g %g %g\n", VectorExpand(a));
+	printf ("%g %g %g\n", VectorExpand(b));
+	return 0;
+}
+
 int
 main (int argc, const char **argv)
 {
 	int         res = 0;
 	size_t      i;
 
+	for (i = 0; i < num_quat_mult_tests; i ++) {
+		vec_t      *q1 = quat_mult_tests[i].q1;
+		vec_t      *q2 = quat_mult_tests[i].q2;
+		vec_t      *expect = quat_mult_tests[i].expect;
+		if (!test_quat_mult (q1, q2, expect))
+			res = 1;
+	}
+
 	for (i = 0; i < num_angle_tests; i ++) {
 		if (!test_rotation (test_angles[i]))
 			res = 1;
@@ -146,5 +220,10 @@ main (int argc, const char **argv)
 		if (!test_rotation2 (test_angles[i]))
 			res = 1;
 	}
+
+	for (i = 0; i < num_angle_tests; i ++) {
+		if (!test_rotation3 (test_angles[i]))
+			res = 1;
+	}
 	return res;
 }

From d95c01be1a60fd83feaeb156e5e1d43dc01cda9d Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 9 Oct 2018 12:45:26 +0900
Subject: [PATCH 0161/1519] More defspace tests.

---
 tools/qfcc/test/Makefile.am     |  2 +-
 tools/qfcc/test/test-defspace.c |  3 +-
 tools/qfcc/test/test-defspace.h |  6 ++++
 tools/qfcc/test/tw-defspace.c   | 54 +++++++++++++++++++++++++++++++++
 4 files changed, 63 insertions(+), 2 deletions(-)
 create mode 100644 tools/qfcc/test/test-defspace.h

diff --git a/tools/qfcc/test/Makefile.am b/tools/qfcc/test/Makefile.am
index cf982bd69..b1a199fff 100644
--- a/tools/qfcc/test/Makefile.am
+++ b/tools/qfcc/test/Makefile.am
@@ -211,5 +211,5 @@ voidfor.run: Makefile build-run
 include ./$(DEPDIR)/voidfor.Qo
 
 
-EXTRA_DIST= test-bi.h build-run
+EXTRA_DIST= test-bi.h build-run test-defspace.h
 CLEANFILES= *.dat *.sym *.qfo *.run *.frame
diff --git a/tools/qfcc/test/test-defspace.c b/tools/qfcc/test/test-defspace.c
index cf2af5f58..5d14c5013 100644
--- a/tools/qfcc/test/test-defspace.c
+++ b/tools/qfcc/test/test-defspace.c
@@ -5,13 +5,14 @@
 #include <stdlib.h>
 
 #include "class.h"
-#include "defspace.h"
 #include "expr.h"
 #include "function.h"
 #include "options.h"
 #include "strpool.h"
 #include "qfcc.h"
 
+#include "test-defspace.h"
+
 options_t   options;
 pr_info_t   pr;
 function_t *current_func;
diff --git a/tools/qfcc/test/test-defspace.h b/tools/qfcc/test/test-defspace.h
new file mode 100644
index 000000000..1735003bf
--- /dev/null
+++ b/tools/qfcc/test/test-defspace.h
@@ -0,0 +1,6 @@
+#include "def.h"
+#include "defspace.h"
+
+int def_list_is_empty (const defspace_t *space);
+int def_list_is_valid (const defspace_t *space);
+int free_locs_is_valid (const defspace_t *space);
diff --git a/tools/qfcc/test/tw-defspace.c b/tools/qfcc/test/tw-defspace.c
index c3b950324..c1f599810 100644
--- a/tools/qfcc/test/tw-defspace.c
+++ b/tools/qfcc/test/tw-defspace.c
@@ -1 +1,55 @@
 #include "../source/defspace.c"
+#include "test-defspace.h"
+
+__attribute__((pure)) int
+def_list_is_empty (const defspace_t *space)
+{
+	return (!space->defs && space->def_tail == &space->defs);
+}
+
+__attribute__((pure)) int
+def_list_is_valid (const defspace_t *space)
+{
+	def_t *const *d = &space->defs;
+
+	while (*d) {
+		d = &(*d)->next;
+	}
+	return d == space->def_tail;
+}
+
+int
+free_locs_is_valid (const defspace_t *space)
+{
+	int         free_space = 0;
+	const locref_t *loc;
+
+	for (loc = space->free_locs; loc; loc = loc->next) {
+		if (loc->ofs < 0) {
+			printf ("negative offset in free_locs\n");
+			return 0;
+		}
+		if (loc->size <= 0) {
+			printf ("zero or negative size in free_locs\n");
+			return 0;
+		}
+		if (loc->next && loc->ofs > loc->next->ofs) {
+			printf ("free_locs not in ascending order\n");
+			return 0;
+		}
+		if (loc->next && loc->ofs + loc->size > loc->next->ofs) {
+			printf ("overlap in free_locs\n");
+			return 0;
+		}
+		if (loc->next && loc->ofs + loc->size == loc->next->ofs) {
+			printf ("adjoining nodes in free_locs\n");
+			return 0;
+		}
+		free_space += loc->size;
+	}
+	if (free_space > space->size) {
+		printf ("free_locs describes too much free space\n");
+		return 0;
+	}
+	return 1;
+}

From 673b45be05fc6bbcabf0a1fe51972ee1fd62a8ff Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 9 Oct 2018 12:46:13 +0900
Subject: [PATCH 0162/1519] Add diagnostic hooks.

---
 tools/qfcc/include/diagnostic.h |  6 ++++++
 tools/qfcc/source/diagnostic.c  | 26 +++++++++++++++++++++++++-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/tools/qfcc/include/diagnostic.h b/tools/qfcc/include/diagnostic.h
index 51eea07a5..6c28ccd41 100644
--- a/tools/qfcc/include/diagnostic.h
+++ b/tools/qfcc/include/diagnostic.h
@@ -38,6 +38,12 @@
 */
 //@{
 
+typedef void (*diagnostic_hook)(const char *message);
+extern diagnostic_hook bug_hook;
+extern diagnostic_hook error_hook;
+extern diagnostic_hook warning_hook;
+extern diagnostic_hook notice_hook;
+
 struct expr_s *error (struct expr_s *e, const char *fmt, ...)
 	__attribute__ ((format (printf, 2, 3)));
 void
diff --git a/tools/qfcc/source/diagnostic.c b/tools/qfcc/source/diagnostic.c
index 746a99ac2..aa57ea19f 100644
--- a/tools/qfcc/source/diagnostic.c
+++ b/tools/qfcc/source/diagnostic.c
@@ -41,6 +41,11 @@
 #include "options.h"
 #include "strpool.h"
 
+diagnostic_hook bug_hook;
+diagnostic_hook error_hook;
+diagnostic_hook warning_hook;
+diagnostic_hook notice_hook;
+
 static void
 report_function (expr_t *e)
 {
@@ -103,6 +108,11 @@ _warning (expr_t *e, const char *fmt, va_list args)
 	}
 
 	format_message (message, "warning", e, fmt, args);
+	if (warning_hook) {
+		warning_hook (message->str);
+	} else {
+		fprintf (stderr, "%s\n", message->str);
+	}
 	fprintf (stderr, "%s\n", message->str);
 	dstring_delete (message);
 }
@@ -139,7 +149,11 @@ bug (expr_t *e, const char *fmt, ...)
 		dstring_t  *message = dstring_new ();
 
 		format_message (message, "BUG", e, fmt, args);
-		fprintf (stderr, "%s\n", message->str);
+		if (bug_hook) {
+			bug_hook (message->str);
+		} else {
+			fprintf (stderr, "%s\n", message->str);
+		}
 		dstring_delete (message);
 	}
 	va_end (args);
@@ -162,6 +176,11 @@ notice (expr_t *e, const char *fmt, ...)
 		report_function (e);
 
 		format_message (message, "notice", e, fmt, args);
+		if (notice_hook) {
+			notice_hook (message->str);
+		} else {
+			fprintf (stderr, "%s\n", message->str);
+		}
 		fprintf (stderr, "%s\n", message->str);
 		dstring_delete (message);
 	}
@@ -211,6 +230,11 @@ error (expr_t *e, const char *fmt, ...)
 		dstring_t  *message = dstring_new ();
 
 		format_message (message, "error", e, fmt, args);
+		if (error_hook) {
+			error_hook (message->str);
+		} else {
+			fprintf (stderr, "%s\n", message->str);
+		}
 		fprintf (stderr, "%s\n", message->str);
 		dstring_delete (message);
 	}

From 4872c56e2dbfd9c7be6030dfdf34e9802879abc4 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 11 Oct 2018 10:05:36 +0900
Subject: [PATCH 0163/1519] Mark the end of the v6 opcodes.

---
 include/QF/pr_comp.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/QF/pr_comp.h b/include/QF/pr_comp.h
index 7bac7eb01..89782ce9b 100644
--- a/include/QF/pr_comp.h
+++ b/include/QF/pr_comp.h
@@ -140,7 +140,7 @@ typedef enum {
 	OP_OR,
 
 	OP_BITAND,
-	OP_BITOR,
+	OP_BITOR,	// end of v6 opcodes
 
 	OP_ADD_S,
 	OP_LE_S,

From 82809eb856c64d86ffadfa44158eed83ec75d380 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 11 Oct 2018 10:06:48 +0900
Subject: [PATCH 0164/1519] Simplify the call to PR_LoadProgsFile.

I've decided that setting pr.max_edicts and pr.zone_size as part of the
local progs initialization rather than in PR_LoadProgsFile makes more
sense. For one, it is unlikely for the limits to change every time progs is
reloaded. Also, they seem to be a property of the VM rather than the progs.
However, there is nothing stopping the caller from updating max_edicts and
zone_size every call.
---
 include/QF/progs.h          | 23 +++++++++--------------
 libs/console/menu.c         |  5 ++++-
 libs/gamecode/pr_load.c     | 11 ++++-------
 nq/source/sv_progs.c        |  5 +++--
 qw/source/sv_progs.c        |  5 +++--
 tools/qfcc/source/qfprogs.c |  4 +++-
 tools/qwaq/main.c           |  4 +++-
 tools/qwaq/qwaq.c           |  4 +++-
 8 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/include/QF/progs.h b/include/QF/progs.h
index 72eea81cc..38fed81f5 100644
--- a/include/QF/progs.h
+++ b/include/QF/progs.h
@@ -145,27 +145,22 @@ typedef int pr_load_func_t (progs_t *pr);
 	\param pr		pointer to ::progs_t VM struct
 	\param file		handle of file to read progs data from
 	\param size		bytes of \p file to read
-	\param max_edicts \e number of entities to allocate space for
-	\param zone		minimum size of dynamic memory to allocate space for
-					dynamic memory (bytes).
 
 	\note \e All runtime strings (permanent or temporary) are allocated from
-	the VM's dynamic memory space, so be sure \p zone is of sufficient size.
-	So far, 1MB has proven more than sufficient for Quakeword, even when using
-	Ruamoko objects.
+	the VM's dynamic memory space, so be sure \p zone is of sufficient size
+	(by setting pr->zone_size prior to calling).  So far, 1MB has proven more
+	than sufficient for Quakeword, even when using Ruamoko objects.
+	\note If entities are used, ensure pr->max_edicts is set appropriately
+	prior to calling.
 */
-void PR_LoadProgsFile (progs_t *pr, struct QFile_s *file, int size,
-					   int max_edicts, int zone);
+void PR_LoadProgsFile (progs_t *pr, struct QFile_s *file, int size);
 
 /** Convenience wrapper for PR_LoadProgsFile() and PR_RunLoadFuncs().
 	Searches for the specified file in the Quake filesystem.
 	\param pr		pointer to ::progs_t VM struct
 	\param progsname name of the file to load as progs data
-	\param max_edicts \e number of entities to allocate space for
-	\param zone		minimum size of dynamic memory to allocate space for
 */
-void PR_LoadProgs (progs_t *pr, const char *progsname, int max_edicts,
-				   int zone);
+void PR_LoadProgs (progs_t *pr, const char *progsname);
 
 /** Register a primary function to be called after the progs code has been
 	loaded. These functions are remembered across progs loads. They will be
@@ -1521,7 +1516,7 @@ struct progs_s {
 	int         denorm_found;
 
 	struct memzone_s *zone;
-	int         zone_size;
+	int         zone_size;			///< set by user
 
 	/// \name builtin functions
 	//@{
@@ -1593,7 +1588,7 @@ struct progs_s {
 	/// \name edicts
 	//@{
 	edict_t   **edicts;
-	int         max_edicts;
+	int         max_edicts;			///< set by user
 	int        *num_edicts;
 	int        *reserved_edicts;	///< alloc will start at reserved_edicts+1
 	void      (*unlink) (edict_t *ent);
diff --git a/libs/console/menu.c b/libs/console/menu.c
index 48df52b7d..e65fff1cb 100644
--- a/libs/console/menu.c
+++ b/libs/console/menu.c
@@ -578,6 +578,9 @@ Menu_Init (void)
 	menu_pr_state.load_file = menu_load_file;
 	menu_pr_state.resolve = menu_resolve_globals;
 
+	menu_pr_state.max_edicts = 0;
+	menu_pr_state.zone_size = 1024 * 1024;
+
 	menu_hash = Hash_NewTable (61, menu_get_key, menu_free, 0);
 
 	PR_RegisterBuiltins (&menu_pr_state, builtins);
@@ -617,7 +620,7 @@ Menu_Load (void)
 	menu_pr_state.progs = 0;
 	if ((file = QFS_FOpenFile (menu_pr_state.progs_name))) {
 		size = Qfilesize (file);
-		PR_LoadProgsFile (&menu_pr_state, file, size, 0, 1024 * 1024);
+		PR_LoadProgsFile (&menu_pr_state, file, size);
 		Qclose (file);
 
 		if (!PR_RunLoadFuncs (&menu_pr_state)) {
diff --git a/libs/gamecode/pr_load.c b/libs/gamecode/pr_load.c
index 82864b096..3fe00eb00 100644
--- a/libs/gamecode/pr_load.c
+++ b/libs/gamecode/pr_load.c
@@ -98,7 +98,7 @@ free_progs_mem (progs_t *pr, void *mem)
 }
 
 VISIBLE void
-PR_LoadProgsFile (progs_t *pr, QFile *file, int size, int max_edicts, int zone)
+PR_LoadProgsFile (progs_t *pr, QFile *file, int size)
 {
 	size_t      i;
 	int         mem_size;
@@ -166,8 +166,6 @@ PR_LoadProgsFile (progs_t *pr, QFile *file, int size, int max_edicts, int zone)
 	pr->progs_size += sizeof (void*) - 1;
 	pr->progs_size &= ~(sizeof (void*) - 1);
 
-	// size of heap asked for by vm-subsystem
-	pr->zone_size = zone;
 	// round off to next highest whole word address (esp for Alpha)
 	// this ensures that pointers in the engine data area are always
 	// properly aligned
@@ -183,8 +181,7 @@ PR_LoadProgsFile (progs_t *pr, QFile *file, int size, int max_edicts, int zone)
 	// properly aligned
 	pr->pr_edict_size += sizeof (void*) - 1;
 	pr->pr_edict_size &= ~(sizeof (void*) - 1);
-	pr->pr_edictareasize = max_edicts * pr->pr_edict_size;
-	pr->max_edicts = max_edicts;
+	pr->pr_edictareasize = pr->max_edicts * pr->pr_edict_size;
 
 	mem_size = pr->progs_size + pr->zone_size + pr->pr_edictareasize;
 	pr->progs = pr->allocate_progs_mem (pr, mem_size + 1);
@@ -379,14 +376,14 @@ PR_RunLoadFuncs (progs_t *pr)
 	PR_LoadProgs
 */
 VISIBLE void
-PR_LoadProgs (progs_t *pr, const char *progsname, int max_edicts, int zone)
+PR_LoadProgs (progs_t *pr, const char *progsname)
 {
 	QFile      *file;
 	file = QFS_FOpenFile (progsname);
 
 	pr->progs_name = progsname;
 	if (file) {
-		PR_LoadProgsFile (pr, file, qfs_filesize, max_edicts, zone);
+		PR_LoadProgsFile (pr, file, qfs_filesize);
 		Qclose (file);
 	}
 	if (!pr->progs)
diff --git a/nq/source/sv_progs.c b/nq/source/sv_progs.c
index 37b915e9c..c289b6e44 100644
--- a/nq/source/sv_progs.c
+++ b/nq/source/sv_progs.c
@@ -498,8 +498,9 @@ SV_LoadProgs (void)
 	if (*sv_progs->string)
 		progs_name = sv_progs->string;
 
-	PR_LoadProgs (&sv_pr_state, progs_name, sv.max_edicts,
-				  sv_progs_zone->int_val * 1024);
+	sv_pr_state.max_edicts = sv.max_edicts;
+	sv_pr_state.zone_size = sv_progs_zone->int_val * 1024;
+	PR_LoadProgs (&sv_pr_state, progs_name);
 	if (!sv_pr_state.progs)
 		Host_Error ("SV_LoadProgs: couldn't load %s", progs_name);
 
diff --git a/qw/source/sv_progs.c b/qw/source/sv_progs.c
index e11805c17..cad265b11 100644
--- a/qw/source/sv_progs.c
+++ b/qw/source/sv_progs.c
@@ -521,8 +521,9 @@ SV_LoadProgs (void)
 	if (*sv_progs->string)
 		progs_name = sv_progs->string;
 
-	PR_LoadProgs (&sv_pr_state, progs_name, MAX_EDICTS,
-				  sv_progs_zone->int_val * 1024);
+	sv_pr_state.max_edicts = MAX_EDICTS;
+	sv_pr_state.zone_size = sv_progs_zone->int_val * 1024;
+	PR_LoadProgs (&sv_pr_state, progs_name);
 	if (!sv_pr_state.progs)
 		Sys_Error ("SV_LoadProgs: couldn't load %s", progs_name);
 
diff --git a/tools/qfcc/source/qfprogs.c b/tools/qfcc/source/qfprogs.c
index d6bf84927..10ddf8abd 100644
--- a/tools/qfcc/source/qfprogs.c
+++ b/tools/qfcc/source/qfprogs.c
@@ -322,7 +322,9 @@ load_progs (const char *name)
 		convert_qfo ();
 	} else {
 		pr.progs_name = name;
-		PR_LoadProgsFile (&pr, file, size, 1, 0);
+		pr.max_edicts = 1;
+		pr.zone_size = 0;
+		PR_LoadProgsFile (&pr, file, size);
 		Qclose (file);
 
 		if (!pr.progs)
diff --git a/tools/qwaq/main.c b/tools/qwaq/main.c
index edb7c0229..570b6a3b7 100644
--- a/tools/qwaq/main.c
+++ b/tools/qwaq/main.c
@@ -133,7 +133,9 @@ load_progs (const char *name)
 		return 0;
 	}
 	pr.progs_name = name;
-	PR_LoadProgsFile (&pr, file, size, 1, 1024 * 1024);
+	pr.max_edicts = 1;
+	pr.zone_size = 1024*1024;
+	PR_LoadProgsFile (&pr, file, size);
 	Qclose (file);
 	if (!PR_RunLoadFuncs (&pr))
 		PR_Error (&pr, "unable to load %s", pr.progs_name);
diff --git a/tools/qwaq/qwaq.c b/tools/qwaq/qwaq.c
index f1197ccfb..a6294887e 100644
--- a/tools/qwaq/qwaq.c
+++ b/tools/qwaq/qwaq.c
@@ -144,7 +144,9 @@ load_progs (const char *name)
 		return 0;
 	}
 	pr.progs_name = name;
-	PR_LoadProgsFile (&pr, file, size, 1, 1024 * 1024);
+	pr.max_edicts = 1;
+	pr.zone_size = 1024*1024;
+	PR_LoadProgsFile (&pr, file, size);
 	Qclose (file);
 	if (!PR_RunLoadFuncs (&pr))
 		PR_Error (&pr, "unable to load %s", pr.progs_name);

From 61185813faa970826dd91ec6479310558d6735f3 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 11 Oct 2018 10:22:10 +0900
Subject: [PATCH 0165/1519] Cleaner handling of zone_size/zone.

---
 libs/gamecode/pr_load.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/libs/gamecode/pr_load.c b/libs/gamecode/pr_load.c
index 3fe00eb00..81135dc5a 100644
--- a/libs/gamecode/pr_load.c
+++ b/libs/gamecode/pr_load.c
@@ -197,8 +197,12 @@ PR_LoadProgsFile (progs_t *pr, QFile *file, int size)
 
 	if (pr->edicts)
 		*pr->edicts = (edict_t *)((byte *) pr->progs + pr->progs_size);
-	pr->zone = (memzone_t *)((byte *) pr->progs + pr->progs_size
-						   + pr->pr_edictareasize);
+	if (pr->zone_size) {
+		//FIXME zone_size needs to be at least as big as memzone_t, but
+		//memzone_t is opaque so its size is unknown
+		pr->zone = (memzone_t *)((byte *) pr->progs + pr->progs_size
+								 + pr->pr_edictareasize);
+	}
 
 	pr->pr_functions =
 		(dfunction_t *) (base + pr->progs->ofs_functions);
@@ -212,8 +216,9 @@ PR_LoadProgsFile (progs_t *pr, QFile *file, int size)
 
 	pr->globals_size = (pr_type_t*)((byte *) pr->zone + pr->zone_size)
 						- pr->pr_globals;
-	if (pr->zone_size)
+	if (pr->zone) {
 		PR_Zone_Init (pr);
+	}
 
 	if (pr->function_hash) {
 		Hash_FlushTable (pr->function_hash);

From 9501d30a8f88d0776b6b628a79589b8c6f6fac56 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 11 Oct 2018 11:29:12 +0900
Subject: [PATCH 0166/1519] Fix up a missing const attribute.

The problem with having such a complex build system :P
---
 include/QF/plugin.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/QF/plugin.h b/include/QF/plugin.h
index 57a4ba9ff..28cb9962f 100644
--- a/include/QF/plugin.h
+++ b/include/QF/plugin.h
@@ -40,7 +40,7 @@
 #ifdef STATIC_PLUGINS
 #define PLUGIN_INFO(type,name) plugin_t *type##_##name##_PluginInfo (void); __attribute__((const)) plugin_t * type##_##name##_PluginInfo (void)
 #else
-#define PLUGIN_INFO(type,name) plugin_t *PluginInfo (void); __attribute__((visibility ("default"))) plugin_t *PluginInfo (void)
+#define PLUGIN_INFO(type,name) plugin_t *PluginInfo (void); __attribute__((visibility ("default"),const)) plugin_t *PluginInfo (void)
 #endif
 
 typedef enum {

From 364c2d2c2b24e7d86be65cc5ca16cce24c463edd Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 11 Oct 2018 13:24:03 +0900
Subject: [PATCH 0167/1519] Add a stack and push and pop instructions.

The stack is for data, not return addresses.
---
 include/QF/pr_comp.h       |  60 +++++++
 include/QF/progs.h         |  14 ++
 libs/gamecode/pr_exec.c    | 325 +++++++++++++++++++++++++++++++++-
 libs/gamecode/pr_load.c    |  47 +++--
 libs/gamecode/pr_opcode.c  | 353 ++++++++++++++++++++++++++++++++++++-
 libs/gamecode/pr_resolve.c |   7 +
 6 files changed, 785 insertions(+), 21 deletions(-)

diff --git a/include/QF/pr_comp.h b/include/QF/pr_comp.h
index 89782ce9b..c657a7ca1 100644
--- a/include/QF/pr_comp.h
+++ b/include/QF/pr_comp.h
@@ -295,6 +295,66 @@ typedef enum {
 	OP_RCALL8,
 
 	OP_RETURN_V,
+
+	OP_PUSH_S,
+	OP_PUSH_F,
+	OP_PUSH_V,
+	OP_PUSH_ENT,
+	OP_PUSH_FLD,
+	OP_PUSH_FN,
+	OP_PUSH_P,
+	OP_PUSH_Q,
+	OP_PUSH_I,
+
+	OP_PUSHB_S,
+	OP_PUSHB_F,
+	OP_PUSHB_V,
+	OP_PUSHB_ENT,
+	OP_PUSHB_FLD,
+	OP_PUSHB_FN,
+	OP_PUSHB_P,
+	OP_PUSHB_Q,
+	OP_PUSHB_I,
+
+	OP_PUSHBI_S,
+	OP_PUSHBI_F,
+	OP_PUSHBI_V,
+	OP_PUSHBI_ENT,
+	OP_PUSHBI_FLD,
+	OP_PUSHBI_FN,
+	OP_PUSHBI_P,
+	OP_PUSHBI_Q,
+	OP_PUSHBI_I,
+
+	OP_POP_S,
+	OP_POP_F,
+	OP_POP_V,
+	OP_POP_ENT,
+	OP_POP_FLD,
+	OP_POP_FN,
+	OP_POP_P,
+	OP_POP_Q,
+	OP_POP_I,
+
+	OP_POPB_S,
+	OP_POPB_F,
+	OP_POPB_V,
+	OP_POPB_ENT,
+	OP_POPB_FLD,
+	OP_POPB_FN,
+	OP_POPB_P,
+	OP_POPB_Q,
+	OP_POPB_I,
+
+	OP_POPBI_S,
+	OP_POPBI_F,
+	OP_POPBI_V,
+	OP_POPBI_ENT,
+	OP_POPBI_FLD,
+	OP_POPBI_FN,
+	OP_POPBI_P,
+	OP_POPBI_Q,
+	OP_POPBI_I,
 } pr_opcode_e;
 
 typedef struct opcode_s {
diff --git a/include/QF/progs.h b/include/QF/progs.h
index 38fed81f5..5b834d1f0 100644
--- a/include/QF/progs.h
+++ b/include/QF/progs.h
@@ -1612,6 +1612,19 @@ struct progs_s {
 	prstack_t   pr_stack[MAX_STACK_DEPTH];
 	int         pr_depth;
 
+	/// \name progs visible stack
+	/// Usable by the progs for any purpose. Will not be accessible unless
+	/// a .stack global is found. Space is allocated from the top of the stack
+	/// (as is common for hardware). The push and pop instructions will not
+	/// be considered valid if there is no .stack global.
+	/// \note The return address and saved locals will not ever be on this
+	/// stack.
+	//@{
+	pr_type_t  *stack;
+	pointer_t   stack_bottom;
+	int         stack_size;			///< set by user
+	//@}
+
 	int         localstack[LOCALSTACK_SIZE];
 	int         localstack_used;
 	//@}
@@ -1656,6 +1669,7 @@ struct progs_s {
 	struct {
 		float      *time;		///< required for OP_STATE
 		pr_int_t   *self;		///< required for OP_STATE
+		pointer_t  *stack;		///< required for OP_(PUSH|POP)*
 	} globals;
 	struct {
 		pr_int_t    nextthink;	///< required for OP_STATE
diff --git a/libs/gamecode/pr_exec.c b/libs/gamecode/pr_exec.c
index 579992271..65fa0cc35 100644
--- a/libs/gamecode/pr_exec.c
+++ b/libs/gamecode/pr_exec.c
@@ -358,13 +358,24 @@ PR_CallFunction (progs_t *pr, func_t fnum)
 	}
 }
 
+static void
+check_stack_pointer (progs_t *pr, pointer_t stack, int size)
+{
+	if (stack < pr->stack_bottom) {
+		PR_RunError (pr, "Progs stack overflow");
+	}
+	if (stack > pr->globals_size - size) {
+		PR_RunError (pr, "Progs stack underflow");
+	}
+}
+
 /*
 	PR_ExecuteProgram
 
 	The interpretation main loop
 */
 VISIBLE void
-PR_ExecuteProgram (progs_t * pr, func_t fnum)
+PR_ExecuteProgram (progs_t *pr, func_t fnum)
 {
 	int         exitdepth, profile, startprofile;
 	pr_uint_t   pointer;
@@ -859,6 +870,318 @@ PR_ExecuteProgram (progs_t * pr, func_t fnum)
 				QuatCopy (OPA.quat_var, ptr->quat_var);
 				break;
 
+			case OP_PUSH_F:
+			case OP_PUSH_FLD:
+			case OP_PUSH_ENT:
+			case OP_PUSH_S:
+			case OP_PUSH_FN:
+			case OP_PUSH_I:
+			case OP_PUSH_P:
+				{
+					pointer_t   stack = *pr->globals.stack - 1;
+					pr_type_t  *stk = pr->pr_globals + stack;
+					if (pr_boundscheck->int_val) {
+						check_stack_pointer (pr, stack, 1);
+					}
+					stk->integer_var = OPA.integer_var;
+					*pr->globals.stack = stack;
+				}
+				break;
+			case OP_PUSH_V:
+				{
+					pointer_t   stack = *pr->globals.stack - 3;
+					pr_type_t  *stk = pr->pr_globals + stack;
+					if (pr_boundscheck->int_val) {
+						check_stack_pointer (pr, stack, 3);
+					}
+					memcpy (stk, &OPA, 3 * sizeof (OPC));
+					*pr->globals.stack = stack;
+				}
+				break;
+			case OP_PUSH_Q:
+				{
+					pointer_t   stack = *pr->globals.stack - 4;
+					pr_type_t  *stk = pr->pr_globals + stack;
+					if (pr_boundscheck->int_val) {
+						check_stack_pointer (pr, stack, 4);
+					}
+					memcpy (stk, &OPA, 4 * sizeof (OPC));
+					*pr->globals.stack = stack;
+				}
+				break;
+
+			case OP_PUSHB_F:
+			case OP_PUSHB_S:
+			case OP_PUSHB_ENT:
+			case OP_PUSHB_FLD:
+			case OP_PUSHB_FN:
+			case OP_PUSHB_I:
+			case OP_PUSHB_P:
+				{
+					pointer_t   stack = *pr->globals.stack - 1;
+					pr_type_t  *stk = pr->pr_globals + stack;
+
+					pointer = OPA.integer_var + OPB.integer_var;
+					ptr = pr->pr_globals + pointer;
+
+					if (pr_boundscheck->int_val) {
+						check_stack_pointer (pr, stack, 1);
+						PR_BoundsCheck (pr, pointer, ev_integer);
+					}
+
+					stk->integer_var = ptr->integer_var;
+					*pr->globals.stack = stack;
+				}
+				break;
+			case OP_PUSHB_V:
+				{
+					pointer_t   stack = *pr->globals.stack - 3;
+					pr_type_t  *stk = pr->pr_globals + stack;
+
+					pointer = OPA.integer_var + OPB.integer_var;
+					ptr = pr->pr_globals + pointer;
+
+					if (pr_boundscheck->int_val) {
+						check_stack_pointer (pr, stack, 3);
+						PR_BoundsCheck (pr, pointer, ev_integer);
+					}
+
+					VectorCopy (ptr->vector_var, stk->vector_var);
+					*pr->globals.stack = stack;
+				}
+				break;
+			case OP_PUSHB_Q:
+				{
+					pointer_t   stack = *pr->globals.stack - 4;
+					pr_type_t  *stk = pr->pr_globals + stack;
+
+					pointer = OPA.integer_var + OPB.integer_var;
+					ptr = pr->pr_globals + pointer;
+
+					if (pr_boundscheck->int_val) {
+						check_stack_pointer (pr, stack, 4);
+						PR_BoundsCheck (pr, pointer, ev_quat);
+					}
+
+					QuatCopy (ptr->quat_var, stk->quat_var);
+					*pr->globals.stack = stack;
+				}
+				break;
+
+			case OP_PUSHBI_F:
+			case OP_PUSHBI_S:
+			case OP_PUSHBI_ENT:
+			case OP_PUSHBI_FLD:
+			case OP_PUSHBI_FN:
+			case OP_PUSHBI_I:
+			case OP_PUSHBI_P:
+				{
+					pointer_t   stack = *pr->globals.stack - 1;
+					pr_type_t  *stk = pr->pr_globals + stack;
+
+					pointer = OPA.integer_var + st->b;
+					ptr = pr->pr_globals + pointer;
+
+					if (pr_boundscheck->int_val) {
+						check_stack_pointer (pr, stack, 1);
+						PR_BoundsCheck (pr, pointer, ev_integer);
+					}
+
+					stk->integer_var = ptr->integer_var;
+					*pr->globals.stack = stack;
+				}
+				break;
+			case OP_PUSHBI_V:
+				{
+					pointer_t   stack = *pr->globals.stack - 3;
+					pr_type_t  *stk = pr->pr_globals + stack;
+
+					pointer = OPA.integer_var + st->b;
+					ptr = pr->pr_globals + pointer;
+
+					if (pr_boundscheck->int_val) {
+						check_stack_pointer (pr, stack, 3);
+						PR_BoundsCheck (pr, pointer, ev_integer);
+					}
+
+					VectorCopy (ptr->vector_var, stk->vector_var);
+					*pr->globals.stack = stack;
+				}
+				break;
+			case OP_PUSHBI_Q:
+				{
+					pointer_t   stack = *pr->globals.stack - 4;
+					pr_type_t  *stk = pr->pr_globals + stack;
+
+					pointer = OPA.integer_var + st->b;
+					ptr = pr->pr_globals + pointer;
+
+					if (pr_boundscheck->int_val) {
+						check_stack_pointer (pr, stack, 4);
+						PR_BoundsCheck (pr, pointer, ev_quat);
+					}
+
+					QuatCopy (ptr->quat_var, stk->quat_var);
+					*pr->globals.stack = stack;
+				}
+				break;
+
+			case OP_POP_F:
+			case OP_POP_FLD:
+			case OP_POP_ENT:
+			case OP_POP_S:
+			case OP_POP_FN:
+			case OP_POP_I:
+			case OP_POP_P:
+				{
+					pointer_t   stack = *pr->globals.stack;
+					pr_type_t  *stk = pr->pr_globals + stack;
+					if (pr_boundscheck->int_val) {
+						check_stack_pointer (pr, stack, 1);
+					}
+					stk->integer_var = OPA.integer_var;
+					*pr->globals.stack = stack + 1;
+				}
+				break;
+			case OP_POP_V:
+				{
+					pointer_t   stack = *pr->globals.stack;
+					pr_type_t  *stk = pr->pr_globals + stack;
+					if (pr_boundscheck->int_val) {
+						check_stack_pointer (pr, stack, 3);
+					}
+					memcpy (stk, &OPA, 3 * sizeof (OPC));
+					*pr->globals.stack = stack + 3;
+				}
+				break;
+			case OP_POP_Q:
+				{
+					pointer_t   stack = *pr->globals.stack;
+					pr_type_t  *stk = pr->pr_globals + stack;
+					if (pr_boundscheck->int_val) {
+						check_stack_pointer (pr, stack, 4);
+					}
+					memcpy (stk, &OPA, 4 * sizeof (OPC));
+					*pr->globals.stack = stack + 4;
+				}
+				break;
+
+			case OP_POPB_F:
+			case OP_POPB_S:
+			case OP_POPB_ENT:
+			case OP_POPB_FLD:
+			case OP_POPB_FN:
+			case OP_POPB_I:
+			case OP_POPB_P:
+				{
+					pointer_t   stack = *pr->globals.stack;
+					pr_type_t  *stk = pr->pr_globals + stack;
+
+					pointer = OPA.integer_var + OPB.integer_var;
+					ptr = pr->pr_globals + pointer;
+
+					if (pr_boundscheck->int_val) {
+						check_stack_pointer (pr, stack, 1);
+						PR_BoundsCheck (pr, pointer, ev_integer);
+					}
+
+					stk->integer_var = ptr->integer_var;
+					*pr->globals.stack = stack + 1;
+				}
+				break;
+			case OP_POPB_V:
+				{
+					pointer_t   stack = *pr->globals.stack;
+					pr_type_t  *stk = pr->pr_globals + stack;
+
+					pointer = OPA.integer_var + OPB.integer_var;
+					ptr = pr->pr_globals + pointer;
+
+					if (pr_boundscheck->int_val) {
+						check_stack_pointer (pr, stack, 3);
+						PR_BoundsCheck (pr, pointer, ev_integer);
+					}
+
+					VectorCopy (ptr->vector_var, stk->vector_var);
+					*pr->globals.stack = stack + 3;
+				}
+				break;
+			case OP_POPB_Q:
+				{
+					pointer_t   stack = *pr->globals.stack;
+					pr_type_t  *stk = pr->pr_globals + stack;
+
+					pointer = OPA.integer_var + OPB.integer_var;
+					ptr = pr->pr_globals + pointer;
+
+					if (pr_boundscheck->int_val) {
+						check_stack_pointer (pr, stack, 4);
+						PR_BoundsCheck (pr, pointer, ev_quat);
+					}
+
+					QuatCopy (ptr->quat_var, stk->quat_var);
+					*pr->globals.stack = stack + 4;
+				}
+				break;
+
+			case OP_POPBI_F:
+			case OP_POPBI_S:
+			case OP_POPBI_ENT:
+			case OP_POPBI_FLD:
+			case OP_POPBI_FN:
+			case OP_POPBI_I:
+			case OP_POPBI_P:
+				{
+					pointer_t   stack = *pr->globals.stack;
+					pr_type_t  *stk = pr->pr_globals + stack;
+
+					pointer = OPA.integer_var + st->b;
+					ptr = pr->pr_globals + pointer;
+
+					if (pr_boundscheck->int_val) {
+						check_stack_pointer (pr, stack, 1);
+						PR_BoundsCheck (pr, pointer, ev_integer);
+					}
+
+					stk->integer_var = ptr->integer_var;
+					*pr->globals.stack = stack + 1;
+				}
+				break;
+			case OP_POPBI_V:
+				{
+					pointer_t   stack = *pr->globals.stack;
+					pr_type_t  *stk = pr->pr_globals + stack;
+
+					pointer = OPA.integer_var + st->b;
+					ptr = pr->pr_globals + pointer;
+
+					if (pr_boundscheck->int_val) {
+						check_stack_pointer (pr, stack, 3);
+						PR_BoundsCheck (pr, pointer, ev_integer);
+					}
+
+					VectorCopy (ptr->vector_var, stk->vector_var);
+					*pr->globals.stack = stack + 3;
+				}
+				break;
+			case OP_POPBI_Q:
+				{
+					pointer_t   stack = *pr->globals.stack;
+					pr_type_t  *stk = pr->pr_globals + stack;
+
+					pointer = OPA.integer_var + st->b;
+					ptr = pr->pr_globals + pointer;
+
+					if (pr_boundscheck->int_val) {
+						check_stack_pointer (pr, stack, 4);
+						PR_BoundsCheck (pr, pointer, ev_quat);
+					}
+
+					QuatCopy (ptr->quat_var, stk->quat_var);
+					*pr->globals.stack = stack + 4;
+				}
+				break;
+
 			// ==================
 			case OP_IFNOT:
 				if (!OPA.integer_var) {
diff --git a/libs/gamecode/pr_load.c b/libs/gamecode/pr_load.c
index 81135dc5a..b00efd12e 100644
--- a/libs/gamecode/pr_load.c
+++ b/libs/gamecode/pr_load.c
@@ -97,6 +97,17 @@ free_progs_mem (progs_t *pr, void *mem)
 {
 }
 
+static int
+align_size (int size)
+{
+	// round off to next highest whole word address (esp for Alpha)
+	// this ensures that pointers in the engine data area are always
+	// properly aligned
+	size += sizeof (void*) - 1;
+	size &= ~(sizeof (void*) - 1);
+	return size;
+}
+
 VISIBLE void
 PR_LoadProgsFile (progs_t *pr, QFile *file, int size)
 {
@@ -160,33 +171,27 @@ PR_LoadProgsFile (progs_t *pr, QFile *file, int size)
 	// size of progs themselves
 	pr->progs_size = size + offset_tweak;
 	Sys_MaskPrintf (SYS_DEV, "Programs occupy %iK.\n", size / 1024);
-	// round off to next highest whole word address (esp for Alpha)
-	// this ensures that pointers in the engine data area are always
-	// properly aligned
-	pr->progs_size += sizeof (void*) - 1;
-	pr->progs_size &= ~(sizeof (void*) - 1);
 
-	// round off to next highest whole word address (esp for Alpha)
-	// this ensures that pointers in the engine data area are always
-	// properly aligned
-	pr->zone_size += sizeof (void*) - 1;
-	pr->zone_size &= ~(sizeof (void*) - 1);
+	pr->progs_size = align_size (pr->progs_size);
+	pr->zone_size = align_size (pr->zone_size);
+	pr->stack_size = align_size (pr->stack_size);
 
 	// size of edict asked for by progs
 	pr->pr_edict_size = max (1, progs.entityfields) * 4;
 	// size of engine data
 	pr->pr_edict_size += sizeof (edict_t);
-	// round off to next highest whole word address (esp for Alpha)
-	// this ensures that pointers in the engine data area are always
-	// properly aligned
-	pr->pr_edict_size += sizeof (void*) - 1;
-	pr->pr_edict_size &= ~(sizeof (void*) - 1);
+	pr->pr_edict_size = align_size (pr->progs_size);
+
 	pr->pr_edictareasize = pr->max_edicts * pr->pr_edict_size;
 
-	mem_size = pr->progs_size + pr->zone_size + pr->pr_edictareasize;
+	mem_size = pr->progs_size + pr->zone_size + pr->pr_edictareasize
+			   + pr->stack_size;
+	// +1 for a nul terminator
 	pr->progs = pr->allocate_progs_mem (pr, mem_size + 1);
 	if (!pr->progs)
 		return;
+	// Place a nul at the end of progs memory to ensure any unterminated
+	// strings within progs memory don't run off the end.
 	((byte *) pr->progs)[mem_size] = 0;
 
 	memcpy (pr->progs, &progs, sizeof (progs));
@@ -195,8 +200,10 @@ PR_LoadProgsFile (progs_t *pr, QFile *file, int size)
 	CRC_ProcessBlock (base, &pr->crc, size - sizeof (progs));
 	base -= sizeof (progs);	// offsets are from file start
 
-	if (pr->edicts)
+	if (pr->edicts) {
 		*pr->edicts = (edict_t *)((byte *) pr->progs + pr->progs_size);
+	}
+
 	if (pr->zone_size) {
 		//FIXME zone_size needs to be at least as big as memzone_t, but
 		//memzone_t is opaque so its size is unknown
@@ -213,9 +220,11 @@ PR_LoadProgsFile (progs_t *pr, QFile *file, int size)
 	pr->pr_statements = (dstatement_t *) (base + pr->progs->ofs_statements);
 
 	pr->pr_globals = (pr_type_t *) (base + pr->progs->ofs_globals);
-
-	pr->globals_size = (pr_type_t*)((byte *) pr->zone + pr->zone_size)
+	pr->stack = (pr_type_t *) ((byte *) pr->zone + pr->zone_size);
+	pr->stack_bottom = pr->stack - pr->pr_globals;
+	pr->globals_size = (pr_type_t *) ((byte *) pr->stack + pr->stack_size)
 						- pr->pr_globals;
+
 	if (pr->zone) {
 		PR_Zone_Init (pr);
 	}
diff --git a/libs/gamecode/pr_opcode.c b/libs/gamecode/pr_opcode.c
index d93e7340c..9e970c781 100644
--- a/libs/gamecode/pr_opcode.c
+++ b/libs/gamecode/pr_opcode.c
@@ -44,6 +44,8 @@
 #include "QF/progs.h"
 #include "QF/sys.h"
 
+#include "compat.h"
+
 hashtab_t *opcode_table;
 
 VISIBLE int pr_type_size[ev_type_count] = {
@@ -1041,6 +1043,282 @@ VISIBLE opcode_t pr_opcodes[] = {
 	 "%Ga, %Gb, %Gc",
 	},
 
+	{"<PUSH>", "push.s", OP_PUSH_S, false,
+	 ev_string, ev_invalid, ev_invalid,
+	 PROG_VERSION,
+	 "%Ga",
+	},
+	{"<PUSH>", "push.f", OP_PUSH_F, false,
+	 ev_float, ev_invalid, ev_invalid,
+	 PROG_VERSION,
+	 "%Ga",
+	},
+	{"<PUSH>", "push.v", OP_PUSH_V, false,
+	 ev_vector, ev_invalid, ev_invalid,
+	 PROG_VERSION,
+	 "%Ga",
+	},
+	{"<PUSH>", "push.ent", OP_PUSH_ENT, false,
+	 ev_entity, ev_invalid, ev_invalid,
+	 PROG_VERSION,
+	 "%Ga",
+	},
+	{"<PUSH>", "push.fld", OP_PUSH_FLD, false,
+	 ev_field, ev_invalid, ev_invalid,
+	 PROG_VERSION,
+	 "%Ga",
+	},
+	{"<PUSH>", "push.fn", OP_PUSH_FN, false,
+	 ev_func, ev_invalid, ev_invalid,
+	 PROG_VERSION,
+	 "%Ga",
+	},
+	{"<PUSH>", "push.p", OP_PUSH_P, false,
+	 ev_pointer, ev_invalid, ev_invalid,
+	 PROG_VERSION,
+	 "%Ga",
+	},
+	{"<PUSH>", "push.q", OP_PUSH_Q, false,
+	 ev_quat, ev_invalid, ev_invalid,
+	 PROG_VERSION,
+	 "%Ga",
+	},
+	{"<PUSH>", "push.i", OP_PUSH_I, false,
+	 ev_integer, ev_invalid, ev_invalid,
+	 PROG_VERSION,
+	 "%Ga",
+	},
+
+	{"<PUSH>", "pushb.s", OP_PUSHB_S, false,
+	 ev_pointer, ev_integer, ev_string,
+	 PROG_VERSION,
+	 "*(%Ga + %Gb)",
+	},
+	{"<PUSH>", "pushb.f", OP_PUSHB_F, false,
+	 ev_pointer, ev_integer, ev_float,
+	 PROG_VERSION,
+	 "*(%Ga + %Gb)",
+	},
+	{"<PUSH>", "pushb.v", OP_PUSHB_V, false,
+	 ev_pointer, ev_integer, ev_vector,
+	 PROG_VERSION,
+	 "*(%Ga + %Gb)",
+	},
+	{"<PUSH>", "pushb.ent", OP_PUSHB_ENT, false,
+	 ev_pointer, ev_integer, ev_entity,
+	 PROG_VERSION,
+	 "*(%Ga + %Gb)",
+	},
+	{"<PUSH>", "pushb.fld", OP_PUSHB_FLD, false,
+	 ev_pointer, ev_integer, ev_field,
+	 PROG_VERSION,
+	 "*(%Ga + %Gb)",
+	},
+	{"<PUSH>", "pushb.fn", OP_PUSHB_FN, false,
+	 ev_pointer, ev_integer, ev_func,
+	 PROG_VERSION,
+	 "*(%Ga + %Gb)",
+	},
+	{"<PUSH>", "pushb.p", OP_PUSHB_P, false,
+	 ev_pointer, ev_integer, ev_pointer,
+	 PROG_VERSION,
+	 "*(%Ga + %Gb)",
+	},
+	{"<PUSH>", "pushb.q", OP_PUSHB_Q, false,
+	 ev_pointer, ev_integer, ev_quat,
+	 PROG_VERSION,
+	 "*(%Ga + %Gb)",
+	},
+	{"<PUSH>", "pushb.i", OP_PUSHB_I, false,
+	 ev_pointer, ev_integer, ev_integer,
+	 PROG_VERSION,
+	 "*(%Ga + %Gb)",
+	},
+
+	{"<PUSH>", "pushbi.s", OP_PUSHBI_S, false,
+	 ev_pointer, ev_short, ev_string,
+	 PROG_VERSION,
+	 "*(%Ga + %sb)",
+	},
+	{"<PUSH>", "pushbi.f", OP_PUSHBI_F, false,
+	 ev_pointer, ev_short, ev_float,
+	 PROG_VERSION,
+	 "*(%Ga + %sb)",
+	},
+	{"<PUSH>", "pushbi.v", OP_PUSHBI_V, false,
+	 ev_pointer, ev_short, ev_vector,
+	 PROG_VERSION,
+	 "*(%Ga + %sb)",
+	},
+	{"<PUSH>", "pushbi.ent", OP_PUSHBI_ENT, false,
+	 ev_pointer, ev_short, ev_entity,
+	 PROG_VERSION,
+	 "*(%Ga + %sb)",
+	},
+	{"<PUSH>", "pushbi.fld", OP_PUSHBI_FLD, false,
+	 ev_pointer, ev_short, ev_field,
+	 PROG_VERSION,
+	 "*(%Ga + %sb)",
+	},
+	{"<PUSH>", "pushbi.fn", OP_PUSHBI_FN, false,
+	 ev_pointer, ev_short, ev_func,
+	 PROG_VERSION,
+	 "*(%Ga + %sb)",
+	},
+	{"<PUSH>", "pushbi.p", OP_PUSHBI_P, false,
+	 ev_pointer, ev_short, ev_pointer,
+	 PROG_VERSION,
+	 "*(%Ga + %sb)",
+	},
+	{"<PUSH>", "pushbi.q", OP_PUSHBI_Q, false,
+	 ev_pointer, ev_short, ev_quat,
+	 PROG_VERSION,
+	 "*(%Ga + %sb)",
+	},
+	{"<PUSH>", "pushbi.i", OP_PUSHBI_I, false,
+	 ev_pointer, ev_short, ev_integer,
+	 PROG_VERSION,
+	 "*(%Ga + %sb)",
+	},
+
+	{"<POP>", "pop.s", OP_POP_S, false,
+	 ev_string, ev_invalid, ev_invalid,
+	 PROG_VERSION,
+	 "%ga",
+	},
+	{"<POP>", "pop.f", OP_POP_F, false,
+	 ev_float, ev_invalid, ev_invalid,
+	 PROG_VERSION,
+	 "%ga",
+	},
+	{"<POP>", "pop.v", OP_POP_V, false,
+	 ev_vector, ev_invalid, ev_invalid,
+	 PROG_VERSION,
+	 "%ga",
+	},
+	{"<POP>", "pop.ent", OP_POP_ENT, false,
+	 ev_entity, ev_invalid, ev_invalid,
+	 PROG_VERSION,
+	 "%ga",
+	},
+	{"<POP>", "pop.fld", OP_POP_FLD, false,
+	 ev_field, ev_invalid, ev_invalid,
+	 PROG_VERSION,
+	 "%ga",
+	},
+	{"<POP>", "pop.fn", OP_POP_FN, false,
+	 ev_func, ev_invalid, ev_invalid,
+	 PROG_VERSION,
+	 "%ga",
+	},
+	{"<POP>", "pop.p", OP_POP_P, false,
+	 ev_pointer, ev_invalid, ev_invalid,
+	 PROG_VERSION,
+	 "%ga",
+	},
+	{"<POP>", "pop.q", OP_POP_Q, false,
+	 ev_quat, ev_invalid, ev_invalid,
+	 PROG_VERSION,
+	 "%ga",
+	},
+	{"<POP>", "pop.i", OP_POP_I, false,
+	 ev_integer, ev_invalid, ev_invalid,
+	 PROG_VERSION,
+	 "%ga",
+	},
+
+	{"<POP>", "popb.s", OP_POPB_S, false,
+	 ev_pointer, ev_integer, ev_string,
+	 PROG_VERSION,
+	 "*(%Ga + %Gb)",
+	},
+	{"<POP>", "popb.f", OP_POPB_F, false,
+	 ev_pointer, ev_integer, ev_float,
+	 PROG_VERSION,
+	 "*(%Ga + %Gb)",
+	},
+	{"<POP>", "popb.v", OP_POPB_V, false,
+	 ev_pointer, ev_integer, ev_vector,
+	 PROG_VERSION,
+	 "*(%Ga + %Gb)",
+	},
+	{"<POP>", "popb.ent", OP_POPB_ENT, false,
+	 ev_pointer, ev_integer, ev_entity,
+	 PROG_VERSION,
+	 "*(%Ga + %Gb)",
+	},
+	{"<POP>", "popb.fld", OP_POPB_FLD, false,
+	 ev_pointer, ev_integer, ev_field,
+	 PROG_VERSION,
+	 "*(%Ga + %Gb)",
+	},
+	{"<POP>", "popb.fn", OP_POPB_FN, false,
+	 ev_pointer, ev_integer, ev_func,
+	 PROG_VERSION,
+	 "*(%Ga + %Gb)",
+	},
+	{"<POP>", "popb.p", OP_POPB_P, false,
+	 ev_pointer, ev_integer, ev_pointer,
+	 PROG_VERSION,
+	 "*(%Ga + %Gb)",
+	},
+	{"<POP>", "popb.q", OP_POPB_Q, false,
+	 ev_pointer, ev_integer, ev_quat,
+	 PROG_VERSION,
+	 "*(%Ga + %Gb)",
+	},
+	{"<POP>", "popb.i", OP_POPB_I, false,
+	 ev_pointer, ev_integer, ev_integer,
+	 PROG_VERSION,
+	 "*(%Ga + %Gb)",
+	},
+
+	{"<POP>", "popbi.s", OP_POPBI_S, false,
+	 ev_pointer, ev_short, ev_string,
+	 PROG_VERSION,
+	 "*(%Ga + %sb)",
+	},
+	{"<POP>", "popbi.f", OP_POPBI_F, false,
+	 ev_pointer, ev_short, ev_float,
+	 PROG_VERSION,
+	 "*(%Ga + %sb)",
+	},
+	{"<POP>", "popbi.v", OP_POPBI_V, false,
+	 ev_pointer, ev_short, ev_vector,
+	 PROG_VERSION,
+	 "*(%Ga + %sb)",
+	},
+	{"<POP>", "popbi.ent", OP_POPBI_ENT, false,
+	 ev_pointer, ev_short, ev_entity,
+	 PROG_VERSION,
+	 "*(%Ga + %sb)",
+	},
+	{"<POP>", "popbi.fld", OP_POPBI_FLD, false,
+	 ev_pointer, ev_short, ev_field,
+	 PROG_VERSION,
+	 "*(%Ga + %sb)",
+	},
+	{"<POP>", "popbi.fn", OP_POPBI_FN, false,
+	 ev_pointer, ev_short, ev_func,
+	 PROG_VERSION,
+	 "*(%Ga + %sb)",
+	},
+	{"<POP>", "popbi.p", OP_POPBI_P, false,
+	 ev_pointer, ev_short, ev_pointer,
+	 PROG_VERSION,
+	 "*(%Ga + %sb)",
+	},
+	{"<POP>", "popbi.q", OP_POPBI_Q, false,
+	 ev_pointer, ev_short, ev_quat,
+	 PROG_VERSION,
+	 "*(%Ga + %sb)",
+	},
+	{"<POP>", "popbi.i", OP_POPBI_I, false,
+	 ev_pointer, ev_short, ev_integer,
+	 PROG_VERSION,
+	 "*(%Ga + %sb)",
+	},
+
 	// end of table
 	{0},
 };
@@ -1192,11 +1470,16 @@ PR_Check_Opcodes (progs_t *pr)
 	opcode_t   *op;
 	dstatement_t *st;
 	int         state_ok = 0;
+	int         pushpop_ok = 0;
 	pr_uint_t   i;
 
 	if (pr->globals.time && pr->globals.self && pr->fields.nextthink != -1
-		&& pr->fields.think != -1 && pr->fields.frame != -1)
+		&& pr->fields.think != -1 && pr->fields.frame != -1) {
 		state_ok = 1;
+	}
+	if (pr->globals.stack) {
+		pushpop_ok = 1;
+	}
 
 	//FIXME need to decide if I really want to always do static bounds checking
 	// the only problem is that it slows progs load a little, but it's the only
@@ -1214,6 +1497,11 @@ PR_Check_Opcodes (progs_t *pr)
 				PR_Error (pr, "PR_Check_Opcodes: %s used with missing fields "
 						  "or globals", op->opname);
 			}
+			if ((strequal(op->name, "<PUSH>") || strequal(op->name, "<POP>"))
+				&& !pushpop_ok) {
+				PR_Error (pr, "PR_Check_Opcodes: %s used with missing .stack "
+						  "globals", op->opname);
+			}
 		}
 	} else {
 		for (i = 0, st = pr->pr_statements; i < pr->progs->numstatements;
@@ -1267,6 +1555,69 @@ PR_Check_Opcodes (progs_t *pr)
 					check_global_size (pr, st, op, st->b, st->a);
 					check_global_size (pr, st, op, st->b, st->c);
 					break;
+				case OP_PUSHB_F:
+				case OP_PUSHB_S:
+				case OP_PUSHB_ENT:
+				case OP_PUSHB_FLD:
+				case OP_PUSHB_FN:
+				case OP_PUSHB_I:
+				case OP_PUSHB_P:
+				case OP_PUSHB_V:
+				case OP_PUSHB_Q:
+				case OP_PUSHBI_F:
+				case OP_PUSHBI_S:
+				case OP_PUSHBI_ENT:
+				case OP_PUSHBI_FLD:
+				case OP_PUSHBI_FN:
+				case OP_PUSHBI_I:
+				case OP_PUSHBI_P:
+				case OP_PUSHBI_V:
+				case OP_PUSHBI_Q:
+					// op->type_c is used for selecting the operator during
+					// compilation, but is invalid when running
+					check_global (pr, st, op, op->type_a, st->a, 1);
+					check_global (pr, st, op, op->type_b, st->b, 1);
+					check_global (pr, st, op, ev_invalid, st->c, 1);
+					break;
+				case OP_POP_F:
+				case OP_POP_FLD:
+				case OP_POP_ENT:
+				case OP_POP_S:
+				case OP_POP_FN:
+				case OP_POP_I:
+				case OP_POP_P:
+				case OP_POP_V:
+				case OP_POP_Q:
+					// don't want to check for denormal floats, otherwise
+					// OP_POP_* could use the defualt rule
+					check_global (pr, st, op, op->type_a, st->a, 0);
+					check_global (pr, st, op, ev_invalid, st->b, 1);
+					check_global (pr, st, op, ev_invalid, st->c, 1);
+					break;
+				case OP_POPB_F:
+				case OP_POPB_S:
+				case OP_POPB_ENT:
+				case OP_POPB_FLD:
+				case OP_POPB_FN:
+				case OP_POPB_I:
+				case OP_POPB_P:
+				case OP_POPB_V:
+				case OP_POPB_Q:
+				case OP_POPBI_F:
+				case OP_POPBI_S:
+				case OP_POPBI_ENT:
+				case OP_POPBI_FLD:
+				case OP_POPBI_FN:
+				case OP_POPBI_I:
+				case OP_POPBI_P:
+				case OP_POPBI_V:
+				case OP_POPBI_Q:
+					// op->type_c is used for selecting the operator during
+					// compilation, but is invalid when running
+					check_global (pr, st, op, op->type_a, st->a, 1);
+					check_global (pr, st, op, op->type_b, st->b, 1);
+					check_global (pr, st, op, ev_invalid, st->c, 1);
+					break;
 				default:
 					check_global (pr, st, op, op->type_a, st->a, 1);
 					check_global (pr, st, op, op->type_b, st->b,
diff --git a/libs/gamecode/pr_resolve.c b/libs/gamecode/pr_resolve.c
index 626540fda..c506c97ac 100644
--- a/libs/gamecode/pr_resolve.c
+++ b/libs/gamecode/pr_resolve.c
@@ -149,6 +149,13 @@ PR_ResolveGlobals (progs_t *pr)
 			|| (def = PR_FindGlobal (pr, "self")))
 			pr->globals.self = &G_INT (pr, def->ofs);
 	}
+	if (!pr->globals.stack) {
+		if ((def = PR_FindGlobal (pr, ".stack"))
+			|| (def = PR_FindGlobal (pr, "stack")))
+			pr->globals.stack = &G_POINTER (pr, def->ofs);
+		// the stack is at the very end of the progs memory map
+		*pr->globals.stack = pr->globals_size;
+	}
 	if (pr->fields.nextthink == -1)
 		if ((def = PR_FindField (pr, "nextthink")))
 			pr->fields.nextthink = def->ofs;

From 6252faa069ae7c5ae435dd48f4aff32e513d9b1a Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 11 Oct 2018 13:25:32 +0900
Subject: [PATCH 0168/1519] Fix a size error in OP_LOAD_Q.

C&P from OP_LOAD_V :/
---
 libs/gamecode/pr_exec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/gamecode/pr_exec.c b/libs/gamecode/pr_exec.c
index 65fa0cc35..56d5b0401 100644
--- a/libs/gamecode/pr_exec.c
+++ b/libs/gamecode/pr_exec.c
@@ -733,7 +733,7 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 									 "field in an edict");
 				}
 				ed = PROG_TO_EDICT (pr, OPA.entity_var);
-				memcpy (&OPC, &ed->v[OPB.integer_var], 3 * sizeof (OPC));
+				memcpy (&OPC, &ed->v[OPB.integer_var], 4 * sizeof (OPC));
 				break;
 
 			case OP_LOADB_F:

From 33cbc500e84c646e9d42b35d080efc2d14501cdb Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 11 Oct 2018 13:34:08 +0900
Subject: [PATCH 0169/1519] Fix a segfault when setting up the stack.

Yup, putting {}s around even single statements under flow control (if, etc)
is a good idea. Wonder if there's a gcc warning for that...
---
 libs/gamecode/pr_resolve.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/libs/gamecode/pr_resolve.c b/libs/gamecode/pr_resolve.c
index c506c97ac..ba82b48e8 100644
--- a/libs/gamecode/pr_resolve.c
+++ b/libs/gamecode/pr_resolve.c
@@ -151,10 +151,11 @@ PR_ResolveGlobals (progs_t *pr)
 	}
 	if (!pr->globals.stack) {
 		if ((def = PR_FindGlobal (pr, ".stack"))
-			|| (def = PR_FindGlobal (pr, "stack")))
+			|| (def = PR_FindGlobal (pr, "stack"))) {
 			pr->globals.stack = &G_POINTER (pr, def->ofs);
-		// the stack is at the very end of the progs memory map
-		*pr->globals.stack = pr->globals_size;
+			// the stack is at the very end of the progs memory map
+			*pr->globals.stack = pr->globals_size;
+		}
 	}
 	if (pr->fields.nextthink == -1)
 		if ((def = PR_FindField (pr, "nextthink")))

From f673ab9c3d408efec49863cd8b568c2b1483c7e3 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 11 Oct 2018 13:39:48 +0900
Subject: [PATCH 0170/1519] Fix misreporting of failed progs load.

---
 tools/qwaq/main.c | 2 +-
 tools/qwaq/qwaq.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/qwaq/main.c b/tools/qwaq/main.c
index 570b6a3b7..15270d5e4 100644
--- a/tools/qwaq/main.c
+++ b/tools/qwaq/main.c
@@ -157,7 +157,7 @@ main (int argc, char **argv)
 		name = argv[1];
 
 	if (!load_progs (name))
-		Sys_Error ("couldn't load %s", "qwaq.dat");
+		Sys_Error ("couldn't load %s", name);
 
 	PR_PushFrame (&pr);
 	if (argc > 2)
diff --git a/tools/qwaq/qwaq.c b/tools/qwaq/qwaq.c
index a6294887e..40576e868 100644
--- a/tools/qwaq/qwaq.c
+++ b/tools/qwaq/qwaq.c
@@ -169,7 +169,7 @@ main (int argc, const char **argv)
 		name = argv[1];
 
 	if (!load_progs (name))
-		Sys_Error ("couldn't load %s", "qwaq.dat");
+		Sys_Error ("couldn't load %s", name);
 
 	PR_PushFrame (&pr);
 	if (argc > 2)

From a096babb1f2743a78b4e5e1467dddd64b06f8821 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 11 Oct 2018 21:36:29 +0900
Subject: [PATCH 0171/1519] Duplicate memory when creating a qfo from progs.

Fixes some double-free bugs when linking after compiling.
---
 tools/qfcc/source/obj_file.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/tools/qfcc/source/obj_file.c b/tools/qfcc/source/obj_file.c
index db4bcc3df..cdd18f991 100644
--- a/tools/qfcc/source/obj_file.c
+++ b/tools/qfcc/source/obj_file.c
@@ -188,11 +188,13 @@ qfo_count_stuff (qfo_t *qfo, pr_info_t *pr)
 static void
 qfo_init_string_space (qfo_t *qfo, qfo_mspace_t *space, strpool_t *strings)
 {
+	size_t      size = strings->size * sizeof (*strings->strings);
 	strings->qfo_space = space - qfo->spaces;
 	space->type = qfos_string;
 	space->num_defs = 0;
 	space->defs = 0;
-	space->d.strings = strings->strings;
+	space->d.strings = malloc (size);
+	memcpy (space->d.strings, strings->strings, size);
 	space->data_size = strings->size;
 	space->id = qfo_strings_space;
 }
@@ -200,11 +202,13 @@ qfo_init_string_space (qfo_t *qfo, qfo_mspace_t *space, strpool_t *strings)
 static void
 qfo_init_code_space (qfo_t *qfo, qfo_mspace_t *space, codespace_t *code)
 {
+	size_t      size = code->size * sizeof (*code->code);
 	code->qfo_space = space - qfo->spaces;
 	space->type = qfos_code;
 	space->num_defs = 0;
 	space->defs = 0;
-	space->d.code = code->code;
+	space->d.code = malloc (size);
+	memcpy (space->d.code, code->code, size);
 	space->data_size = code->size;
 	space->id = qfo_code_space;
 }
@@ -213,11 +217,13 @@ static void
 qfo_init_data_space (qfo_t *qfo, qfo_def_t **defs, qfo_reloc_t **relocs,
 					 qfo_mspace_t *space, defspace_t *data)
 {
+	size_t      size = data->size * sizeof (*data->data);
 	data->qfo_space = space - qfo->spaces;
 	space->type = qfos_data;
 	space->defs = *defs;
 	space->num_defs = qfo_encode_defs (qfo, data->defs, defs, relocs);
-	space->d.data = data->data;
+	space->d.data = malloc (size);
+	memcpy (space->d.data, data->data, size);
 	space->data_size = data->size;
 }
 
@@ -238,11 +244,13 @@ static void
 qfo_init_type_space (qfo_t *qfo, qfo_def_t **defs, qfo_reloc_t **relocs,
 					 qfo_mspace_t *space, defspace_t *data)
 {
+	size_t      size = data->size * sizeof (*data->data);
 	data->qfo_space = space - qfo->spaces;
 	space->type = qfos_type;
 	space->defs = *defs;
 	space->num_defs = qfo_encode_defs (qfo, data->defs, defs, relocs);
-	space->d.data = data->data;
+	space->d.data = malloc (size);
+	memcpy (space->d.data, data->data, size);
 	space->data_size = data->size;
 	space->id = qfo_type_space;
 }

From 3bc664811e9f13503c71451f336e7df94c4520f0 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 11 Oct 2018 22:03:14 +0900
Subject: [PATCH 0172/1519] Fix lost error count tracking.

---
 tools/qfcc/source/diagnostic.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/qfcc/source/diagnostic.c b/tools/qfcc/source/diagnostic.c
index aa57ea19f..e2511a837 100644
--- a/tools/qfcc/source/diagnostic.c
+++ b/tools/qfcc/source/diagnostic.c
@@ -223,6 +223,8 @@ error (expr_t *e, const char *fmt, ...)
 {
 	va_list     args;
 
+	pr.error_count++;
+
 	report_function (e);
 
 	va_start (args, fmt);

From 3656cb966ca83da9c99d32b782d882f8302e74bd Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 12 Oct 2018 09:32:49 +0900
Subject: [PATCH 0173/1519] Fix some bison deprecation warnings.

---
 tools/qfcc/source/Makefile.am | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/qfcc/source/Makefile.am b/tools/qfcc/source/Makefile.am
index 58011ea08..fb0c42782 100644
--- a/tools/qfcc/source/Makefile.am
+++ b/tools/qfcc/source/Makefile.am
@@ -59,12 +59,12 @@ qfprogs_DEPENDENCIES= $(QFCC_DEPS)
 BUILT_SOURCES=qc-parse.c qc-parse.h qc-lex.c qp-parse.c qp-parse.h qp-lex.c
 
 qc-parse.c: qc-parse.y
-	$(YACC) $(YFLAGS) -Dapi.prefix=qc_yy $< -o $@
-qc-lex.c: qc-lex.l
+	$(YACC) $(YFLAGS) -Dapi.prefix={qc_yy} $< -o $@
+qc-lex.c: qc-lex.l qc-parse.h
 	$(LEX) $(LFLAGS) $(AM_LFLAGS) -Pqc_yy -o$@ $<
 qp-parse.c: qp-parse.y
-	$(YACC) $(YFLAGS) -Dapi.prefix=qp_yy $< -o $@
-qp-lex.c: qp-lex.l
+	$(YACC) $(YFLAGS) -Dapi.prefix={qp_yy} $< -o $@
+qp-lex.c: qp-lex.l qp-parse.h
 	$(LEX) $(LFLAGS) $(AM_LFLAGS) -Pqp_yy -o$@ $<
 
 EXTRA_DIST=qc-lex.c qc-parse.c qc-parse.h qfpreqcc \

From 3bd9f96b07adab081c389a608e40ec4904b7ffc4 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 12 Oct 2018 13:57:59 +0900
Subject: [PATCH 0174/1519] Make internal error messages a little more helpful.

They now include the file and line of the compiler as well.
---
 tools/qfcc/include/diagnostic.h | 6 ++++--
 tools/qfcc/source/diagnostic.c  | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/tools/qfcc/include/diagnostic.h b/tools/qfcc/include/diagnostic.h
index 6c28ccd41..1c0ee51bc 100644
--- a/tools/qfcc/include/diagnostic.h
+++ b/tools/qfcc/include/diagnostic.h
@@ -47,8 +47,10 @@ extern diagnostic_hook notice_hook;
 struct expr_s *error (struct expr_s *e, const char *fmt, ...)
 	__attribute__ ((format (printf, 2, 3)));
 void
-internal_error (struct expr_s *e, const char *fmt, ...)
-	__attribute__ ((format (printf, 2, 3), noreturn));
+_internal_error (struct expr_s *e, const char *file, int line,
+				 const char *fmt, ...)
+	__attribute__ ((format (printf, 4, 5), noreturn));
+#define internal_error(e, fmt...) _internal_error(e, __FILE__, __LINE__, fmt)
 struct expr_s *warning (struct expr_s *e, const char *fmt, ...)
 	__attribute__ ((format (printf, 2, 3)));
 struct expr_s *notice (struct expr_s *e, const char *fmt, ...)
diff --git a/tools/qfcc/source/diagnostic.c b/tools/qfcc/source/diagnostic.c
index e2511a837..dbf71142c 100644
--- a/tools/qfcc/source/diagnostic.c
+++ b/tools/qfcc/source/diagnostic.c
@@ -200,7 +200,7 @@ warning (expr_t *e, const char *fmt, ...)
 }
 
 void
-internal_error (expr_t *e, const char *fmt, ...)
+_internal_error (expr_t *e, const char *file, int line, const char *fmt, ...)
 {
 	va_list     args;
 
@@ -211,6 +211,7 @@ internal_error (expr_t *e, const char *fmt, ...)
 		dstring_t  *message = dstring_new ();
 
 		format_message (message, "internal error", e, fmt, args);
+		dasprintf (message, " (%s:%d)", file, line);
 		fprintf (stderr, "%s\n", message->str);
 		dstring_delete (message);
 	}

From f8606ebab87d2b20fa442769265f739958d94ca5 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 12 Oct 2018 14:00:34 +0900
Subject: [PATCH 0175/1519] Fix a object file segfault when spaces have no
 data.

ie, don't attempt to copy memory from a null pointer (just copy the null
pointer).
---
 tools/qfcc/source/obj_file.c | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/tools/qfcc/source/obj_file.c b/tools/qfcc/source/obj_file.c
index cdd18f991..1ebd97f4b 100644
--- a/tools/qfcc/source/obj_file.c
+++ b/tools/qfcc/source/obj_file.c
@@ -193,8 +193,11 @@ qfo_init_string_space (qfo_t *qfo, qfo_mspace_t *space, strpool_t *strings)
 	space->type = qfos_string;
 	space->num_defs = 0;
 	space->defs = 0;
-	space->d.strings = malloc (size);
-	memcpy (space->d.strings, strings->strings, size);
+	space->d.strings = 0;
+	if (strings->strings) {
+		space->d.strings = malloc (size);
+		memcpy (space->d.strings, strings->strings, size);
+	}
 	space->data_size = strings->size;
 	space->id = qfo_strings_space;
 }
@@ -207,8 +210,11 @@ qfo_init_code_space (qfo_t *qfo, qfo_mspace_t *space, codespace_t *code)
 	space->type = qfos_code;
 	space->num_defs = 0;
 	space->defs = 0;
-	space->d.code = malloc (size);
-	memcpy (space->d.code, code->code, size);
+	space->d.code = 0;
+	if (code->code) {
+		space->d.code = malloc (size);
+		memcpy (space->d.code, code->code, size);
+	}
 	space->data_size = code->size;
 	space->id = qfo_code_space;
 }
@@ -222,8 +228,11 @@ qfo_init_data_space (qfo_t *qfo, qfo_def_t **defs, qfo_reloc_t **relocs,
 	space->type = qfos_data;
 	space->defs = *defs;
 	space->num_defs = qfo_encode_defs (qfo, data->defs, defs, relocs);
-	space->d.data = malloc (size);
-	memcpy (space->d.data, data->data, size);
+	space->d.data = 0;
+	if (data->data) {
+		space->d.data = malloc (size);
+		memcpy (space->d.data, data->data, size);
+	}
 	space->data_size = data->size;
 }
 
@@ -249,8 +258,11 @@ qfo_init_type_space (qfo_t *qfo, qfo_def_t **defs, qfo_reloc_t **relocs,
 	space->type = qfos_type;
 	space->defs = *defs;
 	space->num_defs = qfo_encode_defs (qfo, data->defs, defs, relocs);
-	space->d.data = malloc (size);
-	memcpy (space->d.data, data->data, size);
+	space->d.data = 0;
+	if (data->data) {
+		space->d.data = malloc (size);
+		memcpy (space->d.data, data->data, size);
+	}
 	space->data_size = data->size;
 	space->id = qfo_type_space;
 }

From b7aa5bb8fe869e6df2b2c8ad29ad26e12cc017ec Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 12 Oct 2018 14:33:26 +0900
Subject: [PATCH 0176/1519] Fix an oops messing up edict size.

---
 libs/gamecode/pr_load.c      |  2 +-
 tools/qfcc/source/obj_file.c | 28 ++++++++--------------------
 2 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/libs/gamecode/pr_load.c b/libs/gamecode/pr_load.c
index b00efd12e..721b26bd7 100644
--- a/libs/gamecode/pr_load.c
+++ b/libs/gamecode/pr_load.c
@@ -180,7 +180,7 @@ PR_LoadProgsFile (progs_t *pr, QFile *file, int size)
 	pr->pr_edict_size = max (1, progs.entityfields) * 4;
 	// size of engine data
 	pr->pr_edict_size += sizeof (edict_t);
-	pr->pr_edict_size = align_size (pr->progs_size);
+	pr->pr_edict_size = align_size (pr->pr_edict_size);
 
 	pr->pr_edictareasize = pr->max_edicts * pr->pr_edict_size;
 
diff --git a/tools/qfcc/source/obj_file.c b/tools/qfcc/source/obj_file.c
index 1ebd97f4b..cdd18f991 100644
--- a/tools/qfcc/source/obj_file.c
+++ b/tools/qfcc/source/obj_file.c
@@ -193,11 +193,8 @@ qfo_init_string_space (qfo_t *qfo, qfo_mspace_t *space, strpool_t *strings)
 	space->type = qfos_string;
 	space->num_defs = 0;
 	space->defs = 0;
-	space->d.strings = 0;
-	if (strings->strings) {
-		space->d.strings = malloc (size);
-		memcpy (space->d.strings, strings->strings, size);
-	}
+	space->d.strings = malloc (size);
+	memcpy (space->d.strings, strings->strings, size);
 	space->data_size = strings->size;
 	space->id = qfo_strings_space;
 }
@@ -210,11 +207,8 @@ qfo_init_code_space (qfo_t *qfo, qfo_mspace_t *space, codespace_t *code)
 	space->type = qfos_code;
 	space->num_defs = 0;
 	space->defs = 0;
-	space->d.code = 0;
-	if (code->code) {
-		space->d.code = malloc (size);
-		memcpy (space->d.code, code->code, size);
-	}
+	space->d.code = malloc (size);
+	memcpy (space->d.code, code->code, size);
 	space->data_size = code->size;
 	space->id = qfo_code_space;
 }
@@ -228,11 +222,8 @@ qfo_init_data_space (qfo_t *qfo, qfo_def_t **defs, qfo_reloc_t **relocs,
 	space->type = qfos_data;
 	space->defs = *defs;
 	space->num_defs = qfo_encode_defs (qfo, data->defs, defs, relocs);
-	space->d.data = 0;
-	if (data->data) {
-		space->d.data = malloc (size);
-		memcpy (space->d.data, data->data, size);
-	}
+	space->d.data = malloc (size);
+	memcpy (space->d.data, data->data, size);
 	space->data_size = data->size;
 }
 
@@ -258,11 +249,8 @@ qfo_init_type_space (qfo_t *qfo, qfo_def_t **defs, qfo_reloc_t **relocs,
 	space->type = qfos_type;
 	space->defs = *defs;
 	space->num_defs = qfo_encode_defs (qfo, data->defs, defs, relocs);
-	space->d.data = 0;
-	if (data->data) {
-		space->d.data = malloc (size);
-		memcpy (space->d.data, data->data, size);
-	}
+	space->d.data = malloc (size);
+	memcpy (space->d.data, data->data, size);
 	space->data_size = data->size;
 	space->id = qfo_type_space;
 }

From f58c2fef5aa61d71f35bfda19e26bf0118387577 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 12 Oct 2018 14:33:55 +0900
Subject: [PATCH 0177/1519] Switch QF's quaterions from wxyz to xyzw.

After messing with SIMD stuff for a little, I think I now understand why
the industry went with xyzw instead of the mathematical wxyz. Anyway, this
will make for less pain in the future (assuming I got everything).
---
 include/QF/math/quaternion.h             |   4 +-
 include/QF/qtypes.h                      |   2 +-
 libs/models/iqm/model_iqm.c              |  22 ++---
 libs/util/mathlib.c                      | 104 +++++++++++------------
 libs/util/test/test-mat3.c               |  12 ++-
 libs/util/test/test-quat.c               |  81 +++++++++---------
 libs/video/renderer/glsl/glsl_bsp.c      |   4 +-
 libs/video/renderer/glsl/quakeforge.glsl |   4 +-
 libs/video/renderer/r_iqm.c              |   2 +-
 tools/qfcc/source/constfold.c            |   6 +-
 tools/qfcc/source/expr.c                 |  61 ++++++++-----
 tools/qfcc/source/obj_file.c             |  28 ++++--
 tools/qfcc/source/type.c                 |  10 +--
 tools/qfcc/source/value.c                |   4 +-
 tools/qfcc/test/Makefile.am              |   9 ++
 tools/qfcc/test/quaternion.r             |  73 ++++++++++++++++
 tools/qfcc/test/test-harness.c           |   5 +-
 17 files changed, 272 insertions(+), 159 deletions(-)
 create mode 100644 tools/qfcc/test/quaternion.r

diff --git a/include/QF/math/quaternion.h b/include/QF/math/quaternion.h
index c6bec188b..84d7b64b4 100644
--- a/include/QF/math/quaternion.h
+++ b/include/QF/math/quaternion.h
@@ -58,10 +58,10 @@ extern const vec_t *const quat_origin;
 	} while (0)
 #define QuatConj(a,b) \
 	do { \
-		(b)[0] = (a)[0]; \
+		(b)[0] = -(a)[0]; \
 		(b)[1] = -(a)[1]; \
 		(b)[2] = -(a)[2]; \
-		(b)[3] = -(a)[3]; \
+		(b)[3] = (a)[3]; \
 	} while (0)
 #define QuatAdd(a,b,c) \
 	do { \
diff --git a/include/QF/qtypes.h b/include/QF/qtypes.h
index 05c93af59..e328ff2fc 100644
--- a/include/QF/qtypes.h
+++ b/include/QF/qtypes.h
@@ -76,8 +76,8 @@ typedef vec_t	quat_t[4];	///< A quaternion.
 typedef vec_t	vec5_t[5];
 typedef union {
 	struct {
-		vec_t       s;
 		vec3_t      v;
+		vec_t       s;
 	} sv;
 	quat_t      q;
 } Quat_t;
diff --git a/libs/models/iqm/model_iqm.c b/libs/models/iqm/model_iqm.c
index 6eabf7117..6d6e8de0b 100644
--- a/libs/models/iqm/model_iqm.c
+++ b/libs/models/iqm/model_iqm.c
@@ -118,7 +118,6 @@ get_joints (const iqmheader *hdr, byte *buffer)
 {
 	iqmjoint   *joint;
 	uint32_t    i, j;
-	float       t;
 
 	if (hdr->ofs_joints + hdr->num_joints * sizeof (iqmjoint) > hdr->filesize)
 		return 0;
@@ -135,10 +134,6 @@ get_joints (const iqmheader *hdr, byte *buffer)
 			joint[i].translate[j] = LittleFloat (joint[i].translate[j]);
 		for (j = 0; j < 4; j++)
 			joint[i].rotate[j] = LittleFloat (joint[i].rotate[j]);
-		// iqm quaternions use xyzw but QF quaternions use wxyz
-		t = joint[i].rotate[3];
-		memmove (&joint[i].rotate[1], &joint[i].rotate[0], 3 * sizeof (float));
-		joint[i].rotate[0] = t;
 		for (j = 0; j < 3; j++)
 			joint[i].scale[j] = LittleFloat (joint[i].scale[j]);
 	}
@@ -442,19 +437,18 @@ load_iqm_anims (model_t *mod, const iqmheader *hdr, byte *buffer)
 			if (p->mask & 0x004)
 				translation[2] += *framedata++ * p->channelscale[2];
 
-			// QF's quaternions are wxyz while IQM's quaternions are xyzw
-			rotation[1] = p->channeloffset[3];
+			rotation[0] = p->channeloffset[3];
 			if (p->mask & 0x008)
-				rotation[1] += *framedata++ * p->channelscale[3];
-			rotation[2] = p->channeloffset[4];
+				rotation[0] += *framedata++ * p->channelscale[3];
+			rotation[1] = p->channeloffset[4];
 			if (p->mask & 0x010)
-				rotation[2] += *framedata++ * p->channelscale[4];
-			rotation[3] = p->channeloffset[5];
+				rotation[1] += *framedata++ * p->channelscale[4];
+			rotation[2] = p->channeloffset[5];
 			if (p->mask & 0x020)
-				rotation[3] += *framedata++ * p->channelscale[5];
-			rotation[0] = p->channeloffset[6];
+				rotation[2] += *framedata++ * p->channelscale[5];
+			rotation[3] = p->channeloffset[6];
 			if (p->mask & 0x040)
-				rotation[0] += *framedata++ * p->channelscale[6];
+				rotation[3] += *framedata++ * p->channelscale[6];
 
 			scale[0] = p->channeloffset[7];
 			if (p->mask & 0x080)
diff --git a/libs/util/mathlib.c b/libs/util/mathlib.c
index 9f1053025..a1e11f48b 100644
--- a/libs/util/mathlib.c
+++ b/libs/util/mathlib.c
@@ -248,11 +248,11 @@ QuatMult (const quat_t q1, const quat_t q2, quat_t out)
 	vec_t      s;
 	vec3_t     v;
 
-	s = q1[0] * q2[0] - DotProduct (q1 + 1, q2 + 1);
-	CrossProduct (q1 + 1, q2 + 1, v);
-	VectorMultAdd (v, q1[0], q2 + 1, v);
-	VectorMultAdd (v, q2[0], q1 + 1, out + 1);
-	out[0] = s;
+	s = q1[3] * q2[3] - DotProduct (q1, q2);
+	CrossProduct (q1, q2, v);
+	VectorMultAdd (v, q1[3], q2, v);
+	VectorMultAdd (v, q2[3], q1, out);
+	out[3] = s;
 }
 
 VISIBLE void
@@ -261,12 +261,12 @@ QuatMultVec (const quat_t q, const vec3_t v, vec3_t out)
 	vec_t      s;
 	vec3_t     tv;
 
-	s = -DotProduct (q + 1, v);
-	CrossProduct (q + 1, v, tv);
-	VectorMultAdd (tv, q[0], v, tv);
-	CrossProduct (q + 1, tv, out);
-	VectorMultSub (out, s, q + 1, out);
-	VectorMultAdd (out, q[0], tv, out);
+	s = -DotProduct (q, v);
+	CrossProduct (q, v, tv);
+	VectorMultAdd (tv, q[3], v, tv);
+	CrossProduct (q, tv, out);
+	VectorMultSub (out, s, q, out);
+	VectorMultAdd (out, q[3], tv, out);
 }
 
 VISIBLE void
@@ -288,19 +288,19 @@ QuatExp (const quat_t a, quat_t b)
 	vec_t       r;
 	vec_t       c, s;
 
-	VectorCopy (a + 1, n);
+	VectorCopy (a, n);
 	th = VectorNormalize (n);
-	r = expf (a[0]);
+	r = expf (a[3]);
 	c = cosf (th);
 	s = sinf (th);
-	VectorScale (n, r * s, b + 1);
-	b[0] = r * c;
+	VectorScale (n, r * s, b);
+	b[3] = r * c;
 }
 
 VISIBLE void
 QuatToMatrix (const quat_t q, vec_t *m, int homogenous, int vertical)
 {
-	vec_t       aa, ab, ac, ad, bb, bc, bd, cc, cd, dd;
+	vec_t       xx, xy, xz, xw, yy, yz, yw, zz, zw, ww;
 	vec_t       *_m[4] = {
 		m + (homogenous ? 0 : 0),
 		m + (homogenous ? 4 : 3),
@@ -308,28 +308,28 @@ QuatToMatrix (const quat_t q, vec_t *m, int homogenous, int vertical)
 		m + (homogenous ? 12 : 9),
 	};
 
-	aa = q[0] * q[0];
-	ab = q[0] * q[1];
-	ac = q[0] * q[2];
-	ad = q[0] * q[3];
+	xx = q[0] * q[0];
+	xy = q[0] * q[1];
+	xz = q[0] * q[2];
+	xw = q[0] * q[3];
 
-	bb = q[1] * q[1];
-	bc = q[1] * q[2];
-	bd = q[1] * q[3];
+	yy = q[1] * q[1];
+	yz = q[1] * q[2];
+	yw = q[1] * q[3];
 
-	cc = q[2] * q[2];
-	cd = q[2] * q[3];
+	zz = q[2] * q[2];
+	zw = q[2] * q[3];
 
-	dd = q[3] * q[3];
+	ww = q[3] * q[3];
 
 	if (vertical) {
-		VectorSet (aa + bb - cc - dd, 2 * (bc + ad), 2 * (bd - ac), _m[0]);
-		VectorSet (2 * (bc - ad), aa - bb + cc - dd, 2 * (cd + ab), _m[1]);
-		VectorSet (2 * (bd + ac), 2 * (cd - ab), aa - bb - cc + dd, _m[2]);
+		VectorSet (ww + xx - yy - zz, 2 * (xy + zw), 2 * (xz - yw), _m[0]);
+		VectorSet (2 * (xy - zw), ww - xx + yy - zz, 2 * (yz + xw), _m[1]);
+		VectorSet (2 * (xz + yw), 2 * (yz - xw), ww - xx - yy + zz, _m[2]);
 	} else {
-		VectorSet (aa + bb - cc - dd, 2 * (bc - ad), 2 * (bd + ac), _m[0]);
-		VectorSet (2 * (bc + ad), aa - bb + cc - dd, 2 * (cd - ab), _m[1]);
-		VectorSet (2 * (bd - ac), 2 * (cd + ab), aa - bb - cc + dd, _m[2]);
+		VectorSet (ww + xx - yy - zz, 2 * (xy - zw), 2 * (xz + yw), _m[0]);
+		VectorSet (2 * (xy + zw), ww - xx + yy - zz, 2 * (yz - xw), _m[1]);
+		VectorSet (2 * (xz - yw), 2 * (yz + xw), ww - xx - yy + zz, _m[2]);
 	}
 	if (homogenous) {
 		_m[0][3] = 0;
@@ -555,10 +555,10 @@ AngleQuat (const vec3_t angles, quat_t q)
 	sr = sin (alpha);
 	cr = cos (alpha);
 
-	QuatSet (cy * cp * cr + sy * sp * sr,
-			 cy * cp * sr - sy * sp * cr,
-			 cy * sp * cr + sy * cp * sr,
-			 sy * cp * cr - cy * sp * sr,
+	QuatSet (cy * cp * sr - sy * sp * cr,	// x
+			 cy * sp * cr + sy * cp * sr,	// y
+			 sy * cp * cr - cy * sp * sr,	// z
+			 cy * cp * cr + sy * sp * sr,	// w
 			 q);
 }
 
@@ -1112,29 +1112,29 @@ Mat3Decompose (const mat3_t mat, quat_t rot, vec3_t shear, vec3_t scale)
 	t = 1 + row[0][0] + row[1][1] + row[2][2];
 	if (t >= 1e-5) {
 		vec_t       s = sqrt (t) * 2;
-		rot[0] = s / 4;
-		rot[1] = (row[2][1] - row[1][2]) / s;
-		rot[2] = (row[0][2] - row[2][0]) / s;
-		rot[3] = (row[1][0] - row[0][1]) / s;
+		rot[0] = (row[2][1] - row[1][2]) / s;
+		rot[1] = (row[0][2] - row[2][0]) / s;
+		rot[2] = (row[1][0] - row[0][1]) / s;
+		rot[3] = s / 4;
 	} else {
 		if (row[0][0] > row[1][1] && row[0][0] > row[2][2]) {
 			vec_t       s = sqrt (1 + row[0][0] - row[1][1] - row[2][2]) * 2;
-			rot[0] = (row[2][1] - row[1][2]) / s;
-			rot[1] = s / 4;
-			rot[2] = (row[1][0] + row[0][1]) / s;
-			rot[3] = (row[0][2] + row[2][0]) / s;
+			rot[0] = s / 4;
+			rot[1] = (row[1][0] + row[0][1]) / s;
+			rot[2] = (row[0][2] + row[2][0]) / s;
+			rot[3] = (row[2][1] - row[1][2]) / s;
 		} else if (row[1][1] > row[2][2]) {
 			vec_t       s = sqrt (1 + row[1][1] - row[0][0] - row[2][2]) * 2;
-			rot[0] = (row[0][2] - row[2][0]) / s;
-			rot[1] = (row[1][0] + row[0][1]) / s;
-			rot[2] = s / 4;
-			rot[3] = (row[2][1] + row[1][2]) / s;
+			rot[0] = (row[1][0] + row[0][1]) / s;
+			rot[1] = s / 4;
+			rot[2] = (row[2][1] + row[1][2]) / s;
+			rot[3] = (row[0][2] - row[2][0]) / s;
 		} else {
 			vec_t       s = sqrt (1 + row[2][2] - row[0][0] - row[1][1]) * 2;
-			rot[0] = (row[1][0] - row[0][1]) / s;
-			rot[1] = (row[0][2] + row[2][0]) / s;
-			rot[2] = (row[2][1] + row[1][2]) / s;
-			rot[3] = s / 4;
+			rot[0] = (row[0][2] + row[2][0]) / s;
+			rot[1] = (row[2][1] + row[1][2]) / s;
+			rot[2] = s / 4;
+			rot[3] = (row[1][0] - row[0][1]) / s;
 		}
 	}
 	return 1;
diff --git a/libs/util/test/test-mat3.c b/libs/util/test/test-mat3.c
index 385200750..f852d281a 100644
--- a/libs/util/test/test-mat3.c
+++ b/libs/util/test/test-mat3.c
@@ -80,7 +80,8 @@ negate:
 
 	return 1;
 fail:
-	printf ("\n\n(%g %g %g)\n", VectorExpand (angles));
+	printf ("\ntest_angle\n");
+	printf ("(%g %g %g)\n", VectorExpand (angles));
 	printf ("  [%g %g %g %g]\n", QuatExpand (rotation));
 	printf ("  [%g %g %g %g] [%g %g %g] [%g %g %g]\n",
 			QuatExpand (r), VectorExpand (scale), VectorExpand (shear));
@@ -110,7 +111,8 @@ test_transform (const vec3_t angles, const vec3_t scale)
 
 	return 1;
 fail:
-	printf ("\n\n(%g %g %g) (%g %g %g)\n", VectorExpand (angles),
+	printf ("\ntest_transform\n");
+	printf ("(%g %g %g) (%g %g %g)\n", VectorExpand (angles),
 			VectorExpand (scale));
 	printf ("  (%g %g %g)\n", VectorExpand (x));
 	printf ("  (%g %g %g)\n", VectorExpand (y));
@@ -146,7 +148,8 @@ test_transform2 (const vec3_t angles, const vec3_t scale)
 
 	return 1;
 fail:
-	printf ("\n\n(%g %g %g) (%g %g %g) (%g %g %g)\n",
+	printf ("\ntest_transform2\n");
+	printf ("(%g %g %g) (%g %g %g) (%g %g %g)\n",
 			VectorExpand (angles), VectorExpand (scale), VectorExpand (v));
 	printf ("  (%g %g %g)\n", VectorExpand (x));
 	printf ("  (%g %g %g)\n", VectorExpand (y));
@@ -173,7 +176,8 @@ test_inverse (const vec3_t angles, const vec3_t scale)
 
 	return 1;
 fail:
-	printf ("\n\n(%g %g %g) (%g %g %g)\n",
+	printf ("\ntest_inverse\n");
+	printf ("(%g %g %g) (%g %g %g)\n",
 			VectorExpand (angles), VectorExpand (scale));
 	printf ("  [%g %g %g]\n  [%g %g %g]\n  [%g %g %g]\n\n", Mat3Expand (mat));
 	printf ("  [%g %g %g]\n  [%g %g %g]\n  [%g %g %g]\n\n", Mat3Expand (inv));
diff --git a/libs/util/test/test-quat.c b/libs/util/test/test-quat.c
index ce679771c..47539d144 100644
--- a/libs/util/test/test-quat.c
+++ b/libs/util/test/test-quat.c
@@ -9,7 +9,7 @@ static struct {
 	quat_t      q2;
 	quat_t      expect;
 } quat_mult_tests[] = {
-	{{4, 1, 2, 3}, {8, 5, 6, 7}, {-6, 24, 48, 48}},
+	{{1, 2, 3, 4}, {5, 6, 7, 8}, {24, 48, 48, -6}},
 };
 #define num_quat_mult_tests (sizeof (quat_mult_tests) / sizeof (quat_mult_tests[0]))
 
@@ -50,10 +50,10 @@ test_quat_mult(const quat_t q1, const quat_t q2, const quat_t expect)
 			goto fail;
 	return 1;
 fail:
-	printf ("%g %g %g %g\n", QuatExpand (q1));
-	printf ("%g %g %g %g\n", QuatExpand (q2));
-	printf ("%g %g %g %g\n", QuatExpand (r));
-	printf ("%g %g %g %g\n", QuatExpand (expect));
+	printf ("%11.9g %11.9g %11.9g %11.9g\n", QuatExpand (q1));
+	printf ("%11.9g %11.9g %11.9g %11.9g\n", QuatExpand (q2));
+	printf ("%11.9g %11.9g %11.9g %11.9g\n", QuatExpand (r));
+	printf ("%11.9g %11.9g %11.9g %11.9g\n", QuatExpand (expect));
 	return 0;
 }
 
@@ -64,12 +64,12 @@ rotate_vec (const quat_t r, const vec3_t v, vec3_t out)
 	quat_t      qv = {0, 0, 0, 0};
 	quat_t      t;
 
-	VectorCopy (v, qv + 1);
+	VectorCopy (v, qv);
 
 	QuatConj (r, t);
 	QuatMult (qv, t, t);
 	QuatMult (r, t, t);
-	VectorCopy (t + 1, out);
+	VectorCopy (t, out);
 }
 
 static int
@@ -78,54 +78,55 @@ test_rotation (const vec3_t angles)
 	int         i;
 	vec3_t      forward, right, up;
 
-	quat_t      quat, f, r, u, t;
-	quat_t      qf = {0, 1,  0, 0};
-	quat_t      qr = {0, 0, -1, 0};
-	quat_t      qu = {0, 0,  0, 1};
+	quat_t      quat, conj, f, r, u, t;
+	quat_t      qf = {1,  0, 0, 0};
+	quat_t      qr = {0, -1, 0, 0};
+	quat_t      qu = {0,  0, 1, 0};
 
 	AngleVectors (angles, forward, right, up);
 
 	AngleQuat (angles, quat);
+	QuatConj (quat, conj);
 	// rotate forward vector
-	QuatConj (quat, t);
-	QuatMult (qf, t, t);
+	QuatMult (qf, conj, t);
 	QuatMult (quat, t, f);
 	// rotate right vector
-	QuatConj (quat, t);
-	QuatMult (qr, t, t);
+	QuatMult (qr, conj, t);
 	QuatMult (quat, t, r);
 	// rotate up vector
-	QuatConj (quat, t);
-	QuatMult (qu, t, t);
+	QuatMult (qu, conj, t);
 	QuatMult (quat, t, u);
 
-	if (!compare (f[0], 0))
+	if (!compare (f[3], 0))
 		goto fail;
 	for (i = 0; i < 3; i++)
-		if (!compare (forward[i], f[i + 1]))
+		if (!compare (forward[i], f[i]))
 			goto fail;
 
-	if (!compare (r[0], 0))
+	if (!compare (r[3], 0))
 		goto fail;
 	for (i = 0; i < 3; i++)
-		if (!compare (right[i], r[i + 1]))
+		if (!compare (right[i], r[i]))
 			goto fail;
 
-	if (!compare (u[0], 0))
+	if (!compare (u[3], 0))
 		goto fail;
 	for (i = 0; i < 3; i++)
-		if (!compare (up[i], u[i + 1]))
+		if (!compare (up[i], u[i]))
 			goto fail;
 	return 1;
 fail:
-	printf ("\n\n%g %g %g\n\n", angles[0], angles[1], angles[2]);
-	printf ("%g %g %g\n", forward[0], forward[1], forward[2]);
-	printf ("%g %g %g\n", right[0], right[1], right[2]);
-	printf ("%g %g %g\n\n", up[0], up[1], up[2]);
+	printf ("\ntest_rotation\n");
+	printf ("%11.9g %11.9g %11.9g\n", VectorExpand (angles));
+	printf ("%11.9g %11.9g %11.9g %11.9g\n", QuatExpand (quat));
+	printf ("%11.9g %11.9g %11.9g %11.9g\n\n", QuatExpand (conj));
+	printf ("%11.9g %11.9g %11.9g\n", VectorExpand (forward));
+	printf ("%11.9g %11.9g %11.9g\n", VectorExpand (right));
+	printf ("%11.9g %11.9g %11.9g\n\n", VectorExpand (up));
 
-	printf ("%g %g %g %g\n", f[0], f[1], f[2], f[3]);
-	printf ("%g %g %g %g\n", r[0], r[1], r[2], r[3]);
-	printf ("%g %g %g %g\n", u[0], u[1], u[2], u[3]);
+	printf ("%11.9g %11.9g %11.9g %11.9g\n", QuatExpand (f));
+	printf ("%11.9g %11.9g %11.9g %11.9g\n", QuatExpand (r));
+	printf ("%11.9g %11.9g %11.9g %11.9g\n", QuatExpand (u));
 	return 0;
 }
 
@@ -164,14 +165,15 @@ test_rotation2 (const vec3_t angles)
 			goto fail;
 	return 1;
 fail:
-	printf ("\n\n%g %g %g\n\n", angles[0], angles[1], angles[2]);
-	printf ("%g %g %g\n", forward[0], forward[1], forward[2]);
-	printf ("%g %g %g\n", right[0], right[1], right[2]);
-	printf ("%g %g %g\n\n", up[0], up[1], up[2]);
+	printf ("\ntest_rotation2\n");
+	printf ("\n\n%11.9g %11.9g %11.9g\n\n", angles[0], angles[1], angles[2]);
+	printf ("%11.9g %11.9g %11.9g\n", forward[0], forward[1], forward[2]);
+	printf ("%11.9g %11.9g %11.9g\n", right[0], right[1], right[2]);
+	printf ("%11.9g %11.9g %11.9g\n\n", up[0], up[1], up[2]);
 
-	printf ("%g %g %g\n", f[0], f[1], f[2]);
-	printf ("%g %g %g\n", r[0], r[1], r[2]);
-	printf ("%g %g %g\n", u[0], u[1], u[2]);
+	printf ("%11.9g %11.9g %11.9g\n", f[0], f[1], f[2]);
+	printf ("%11.9g %11.9g %11.9g\n", r[0], r[1], r[2]);
+	printf ("%11.9g %11.9g %11.9g\n", u[0], u[1], u[2]);
 	return 0;
 }
 
@@ -192,8 +194,9 @@ test_rotation3 (const vec3_t angles)
 			goto fail;
 	return 1;
 fail:
-	printf ("%g %g %g\n", VectorExpand(a));
-	printf ("%g %g %g\n", VectorExpand(b));
+	printf ("\ntest_rotation3\n");
+	printf ("%11.9g %11.9g %11.9g\n", VectorExpand(a));
+	printf ("%11.9g %11.9g %11.9g\n", VectorExpand(b));
 	return 0;
 }
 
diff --git a/libs/video/renderer/glsl/glsl_bsp.c b/libs/video/renderer/glsl/glsl_bsp.c
index f212cbe7a..682ffb628 100644
--- a/libs/video/renderer/glsl/glsl_bsp.c
+++ b/libs/video/renderer/glsl/glsl_bsp.c
@@ -543,8 +543,8 @@ glsl_R_BuildDisplayLists (model_t **models, int num_models)
 	msurface_t *surf;
 	dstring_t  *vertices;
 
-	QuatSet (sqrt(0.5), 0, 0, sqrt(0.5), sky_fix);	// proper skies
-	QuatSet (1, 0, 0, 0, sky_rotation[0]);
+	QuatSet (0, 0, sqrt(0.5), sqrt(0.5), sky_fix);	// proper skies
+	QuatSet (0, 0, 0, 1, sky_rotation[0]);
 	QuatCopy (sky_rotation[0], sky_rotation[1]);
 	QuatSet (0, 0, 0, 0, sky_velocity);
 	QuatExp (sky_velocity, sky_velocity);
diff --git a/libs/video/renderer/glsl/quakeforge.glsl b/libs/video/renderer/glsl/quakeforge.glsl
index e346b31af..2a912fcb0 100644
--- a/libs/video/renderer/glsl/quakeforge.glsl
+++ b/libs/video/renderer/glsl/quakeforge.glsl
@@ -464,8 +464,8 @@ main (void)
 	m += bonemats[int (vbones.z)] * vweights.z;
 	m += bonemats[int (vbones.w)] * vweights.w;
 #if 0
-	q0 = m[0].yzwx; //swizzle for conversion betwen QF and GL
-	qe = m[1].yzwx; //swizzle for conversion betwen QF and GL
+	q0 = m[0];
+	qe = m[1];
 	sh = m[2].xyz;
 	sc = m[3].xyz;
 
diff --git a/libs/video/renderer/r_iqm.c b/libs/video/renderer/r_iqm.c
index 4fa961228..224182a79 100644
--- a/libs/video/renderer/r_iqm.c
+++ b/libs/video/renderer/r_iqm.c
@@ -99,7 +99,7 @@ R_IQMBlendFrames (const iqm_t *iqm, int frame1, int frame2, float blend,
 	} else {
 #if 0
 		for (i = 0; i < iqm->num_joints; i++) {
-			QuatSet (1, 0, 0, 0, frame[i].rt.q0.q);
+			QuatSet (0, 0, 0, 1, frame[i].rt.q0.q);
 			QuatSet (0, 0, 0, 0, frame[i].rt.qe.q);
 			QuatSet (0, 0, 0, 0, frame[i].shear);
 			QuatSet (1, 1, 1, 0, frame[i].scale);
diff --git a/tools/qfcc/source/constfold.c b/tools/qfcc/source/constfold.c
index 33c156cca..ee754f587 100644
--- a/tools/qfcc/source/constfold.c
+++ b/tools/qfcc/source/constfold.c
@@ -593,11 +593,11 @@ do_op_quaternion (int op, expr_t *e, expr_t *e1, expr_t *e2)
 		return e;
 
 	if (is_float_val (e1)) {
-		float_quat[0] = expr_float (e1);
+		QuatSet (0, 0, 0, expr_float (e1), float_quat);
 		q2 = float_quat;
 		q1 = expr_quaternion (e2);
 	} else if (is_float_val (e2)) {
-		float_quat[0] = expr_float (e2);
+		QuatSet (0, 0, 0, expr_float (e2), float_quat);
 		q2 = float_quat;
 		q1 = expr_quaternion (e1);
 	} else {
@@ -627,7 +627,7 @@ do_op_quaternion (int op, expr_t *e, expr_t *e1, expr_t *e2)
 			if (get_type (e2) == &type_quaternion) {
 				QuatMult (q1, q2, q);
 			} else {
-				QuatScale (q1, q2[0], q);
+				QuatScale (q1, q2[3], q);
 			}
 			e = new_quaternion_expr (q);
 			break;
diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index 0270ff58f..c8aebc5e0 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -163,35 +163,42 @@ convert_vector (expr_t *e)
 	if (e->e.vector.type == &type_quaternion) {
 		// guaranteed to have two or four elements
 		if (e->e.vector.list->next->next) {
-			// four vals: w, x, y, z
-			expr_t     *w = e->e.vector.list;
-			expr_t     *x = w->next;
+			// four vals: x, y, z, w
+			expr_t     *x = e->e.vector.list;
 			expr_t     *y = x->next;
 			expr_t     *z = y->next;
-			w = fold_constants (cast_expr (&type_float, w));
+			expr_t     *w = z->next;
 			x = fold_constants (cast_expr (&type_float, x));
 			y = fold_constants (cast_expr (&type_float, y));
 			z = fold_constants (cast_expr (&type_float, z));
-			if (is_constant (w) && is_constant (x) && is_constant (y)
-				&& is_constant (z)) {
-				val[0] = expr_float(w);
-				val[1] = expr_float(x);
-				val[2] = expr_float(y);
-				val[3] = expr_float(z);
+			w = fold_constants (cast_expr (&type_float, w));
+			if (is_constant (x) && is_constant (y) && is_constant (z)
+				&& is_constant (w)) {
+				val[0] = expr_float(x);
+				val[1] = expr_float(y);
+				val[2] = expr_float(z);
+				val[3] = expr_float(w);
 				return new_quaternion_expr (val);
 			}
 		} else {
-			// s, v
-			expr_t     *s = e->e.vector.list;
-			expr_t     *v = s->next;
+			// v, s
+			expr_t     *v = e->e.vector.list;
+			expr_t     *s = v->next;
 
-			s = fold_constants (cast_expr (&type_float, s));
 			v = convert_vector (v);
-			if (is_constant (s) && is_constant (v)) {
-				val[0] = expr_float (s);
-				memcpy (val + 1, expr_vector (v), 3 * sizeof (float));
+			s = fold_constants (cast_expr (&type_float, s));
+			if (is_constant (v) && is_constant (s)) {
+				memcpy (val, expr_vector (v), 3 * sizeof (float));
+				val[3] = expr_float (s);
 				return new_quaternion_expr (val);
 			}
+			// Either v or is is not constant, so can't convert to a quaternion
+			// constant.
+			// Rebuild the list in case v or s is a new expression
+			s->next = 0;
+			v->next = s;
+			e->e.vector.list = v;
+			return e;
 		}
 	}
 	internal_error (e, "bogus vector expression");
@@ -645,13 +652,23 @@ new_vector_list (expr_t *e)
 			vec->e.vector.list = e;
 			break;
 		case 2:
-			// quaternion. first expression must be compatible with a float,
-			// the other must be a vector
-			if (!type_assignable (&type_float, get_type (e))
-				|| !type_assignable (&type_vector, get_type(e->next))) {
+			// quaternion. either float-ish, vector or vector, float-ish
+			if (type_assignable (&type_float, get_type (e))
+				&& type_assignable (&type_vector, get_type(e->next))) {
+				// float-ish, vector
+				// swap expressions
+				t = e;
+				e = e->next;
+				e->next = t;
+				t->next = 0;
+			} else if (type_assignable (&type_vector, get_type (e))
+					   && type_assignable (&type_float, get_type(e->next))) {
+				// vector, float-ish
+				// do nothing
+			} else {
 				return error (t, "invalid types for vector elements");
 			}
-			// s, v
+			// v, s
 			vec = new_expr ();
 			vec->type = ex_vector;
 			vec->e.vector.type = &type_quaternion;
diff --git a/tools/qfcc/source/obj_file.c b/tools/qfcc/source/obj_file.c
index cdd18f991..1ebd97f4b 100644
--- a/tools/qfcc/source/obj_file.c
+++ b/tools/qfcc/source/obj_file.c
@@ -193,8 +193,11 @@ qfo_init_string_space (qfo_t *qfo, qfo_mspace_t *space, strpool_t *strings)
 	space->type = qfos_string;
 	space->num_defs = 0;
 	space->defs = 0;
-	space->d.strings = malloc (size);
-	memcpy (space->d.strings, strings->strings, size);
+	space->d.strings = 0;
+	if (strings->strings) {
+		space->d.strings = malloc (size);
+		memcpy (space->d.strings, strings->strings, size);
+	}
 	space->data_size = strings->size;
 	space->id = qfo_strings_space;
 }
@@ -207,8 +210,11 @@ qfo_init_code_space (qfo_t *qfo, qfo_mspace_t *space, codespace_t *code)
 	space->type = qfos_code;
 	space->num_defs = 0;
 	space->defs = 0;
-	space->d.code = malloc (size);
-	memcpy (space->d.code, code->code, size);
+	space->d.code = 0;
+	if (code->code) {
+		space->d.code = malloc (size);
+		memcpy (space->d.code, code->code, size);
+	}
 	space->data_size = code->size;
 	space->id = qfo_code_space;
 }
@@ -222,8 +228,11 @@ qfo_init_data_space (qfo_t *qfo, qfo_def_t **defs, qfo_reloc_t **relocs,
 	space->type = qfos_data;
 	space->defs = *defs;
 	space->num_defs = qfo_encode_defs (qfo, data->defs, defs, relocs);
-	space->d.data = malloc (size);
-	memcpy (space->d.data, data->data, size);
+	space->d.data = 0;
+	if (data->data) {
+		space->d.data = malloc (size);
+		memcpy (space->d.data, data->data, size);
+	}
 	space->data_size = data->size;
 }
 
@@ -249,8 +258,11 @@ qfo_init_type_space (qfo_t *qfo, qfo_def_t **defs, qfo_reloc_t **relocs,
 	space->type = qfos_type;
 	space->defs = *defs;
 	space->num_defs = qfo_encode_defs (qfo, data->defs, defs, relocs);
-	space->d.data = malloc (size);
-	memcpy (space->d.data, data->data, size);
+	space->d.data = 0;
+	if (data->data) {
+		space->d.data = malloc (size);
+		memcpy (space->d.data, data->data, size);
+	}
 	space->data_size = data->size;
 	space->id = qfo_type_space;
 }
diff --git a/tools/qfcc/source/type.c b/tools/qfcc/source/type.c
index bb1e3d7c2..c81222db0 100644
--- a/tools/qfcc/source/type.c
+++ b/tools/qfcc/source/type.c
@@ -843,8 +843,8 @@ init_types (void)
 		{0, 0}
 	};
 	static struct_def_t quaternion_struct[] = {
-		{"s", &type_float},
 		{"v", &type_vector},
+		{"s", &type_float},
 		{0, 0}
 	};
 	static struct_def_t type_encoding_struct[] = {
@@ -882,16 +882,16 @@ init_types (void)
 	type_quaternion.meta = ty_none;
 	{
 		symbol_t   *sym;
-		sym = new_symbol_type ("w", &type_float);
+		sym = new_symbol_type ("x", &type_float);
 		sym->s.offset = 0;
 		symtab_addsymbol (type_quaternion.t.symtab, sym);
-		sym = new_symbol_type ("x", &type_float);
+		sym = new_symbol_type ("y", &type_float);
 		sym->s.offset = 1;
 		symtab_addsymbol (type_quaternion.t.symtab, sym);
-		sym = new_symbol_type ("y", &type_float);
+		sym = new_symbol_type ("z", &type_float);
 		sym->s.offset = 2;
 		symtab_addsymbol (type_quaternion.t.symtab, sym);
-		sym = new_symbol_type ("z", &type_float);
+		sym = new_symbol_type ("w", &type_float);
 		sym->s.offset = 3;
 		symtab_addsymbol (type_quaternion.t.symtab, sym);
 	}
diff --git a/tools/qfcc/source/value.c b/tools/qfcc/source/value.c
index ad84f25ae..f530f3b3a 100644
--- a/tools/qfcc/source/value.c
+++ b/tools/qfcc/source/value.c
@@ -316,9 +316,7 @@ imm_compare (const void *_imm1, const void *_imm2, void *_tab)
 		return !memcmp (&imm1->i.pointer, &imm2->i.pointer,
 						sizeof (imm1->i.pointer));
 	} else if (tab == &quaternion_imm_defs) {
-		return (VectorCompare (imm1->i.quaternion_val,
-							   imm2->i.quaternion_val)
-				&& imm1->i.quaternion_val[3] == imm2->i.quaternion_val[3]);
+		return QuatCompare (imm1->i.quaternion_val, imm2->i.quaternion_val);
 	} else if (tab == &integer_imm_defs) {
 		return imm1->i.integer_val == imm2->i.integer_val;
 	} else {
diff --git a/tools/qfcc/test/Makefile.am b/tools/qfcc/test/Makefile.am
index b1a199fff..1ecb95fb4 100644
--- a/tools/qfcc/test/Makefile.am
+++ b/tools/qfcc/test/Makefile.am
@@ -37,6 +37,7 @@ test_progs_dat=\
 	infloop.dat \
 	modulo.dat \
 	paramret.dat \
+	quaternion.dat \
 	return-ivar.dat \
 	sendv.dat \
 	state.dat \
@@ -130,6 +131,14 @@ paramret.run: Makefile build-run
 	TEST_HARNESS_OPTS=--float $(srcdir)/build-run $@
 include ./$(DEPDIR)/paramret.Qo
 
+quaternion_dat_SOURCES=quaternion.r
+quaternion_obj=$(quaternion_dat_SOURCES:.r=.qfo)
+quaternion.dat$(EXEEXT): $(quaternion_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(quaternion_obj)
+quaternion.run: Makefile build-run
+	$(srcdir)/build-run $@
+include ./$(DEPDIR)/quaternion.Qo
+
 return_ivar_dat_SOURCES=return-ivar.r
 return_ivar_obj=$(return_ivar_dat_SOURCES:.r=.qfo)
 return-ivar.dat$(EXEEXT): $(return_ivar_obj) $(QFCC_DEP)
diff --git a/tools/qfcc/test/quaternion.r b/tools/qfcc/test/quaternion.r
new file mode 100644
index 000000000..f5f2c889a
--- /dev/null
+++ b/tools/qfcc/test/quaternion.r
@@ -0,0 +1,73 @@
+void printf (string fmt, ...) = #0;
+
+int
+test_format ()
+{
+	int         fail = 0;
+	quaternion  q = '1 2 3 4';
+	vector      v = '-1 -2 -3';
+	float       s = -4;
+
+	if (q.x != 1 || q.y != 2 || q.z != 3 || q.w != 4) {
+		printf ("q = '1 2 3 4' -> %q\n", q);
+		fail = 1;
+	}
+	if (q.v != '1 2 3' || q.s != 4) {
+		printf ("q = '1 2 3 4' -> %v, %g\n", q.v, q.s);
+		fail = 1;
+	}
+	q = nil;
+	if (q.x != 0 || q.y != 0 || q.z != 0 || q.w != 0) {
+		printf ("q = nil -> %q\n", q);
+		fail = 1;
+	}
+	if (q.v != '0 0 0' || q.s != 0) {
+		printf ("q = nil -> %v, %g\n", q.v, q.s);
+		fail = 1;
+	}
+	q = [1, [2, 3, 4]];
+	if (q.x != 2 || q.y != 3 || q.z != 4 || q.w != 1) {
+		printf ("q = [1, [2, 3, 4]] -> %q\n", q);
+		fail = 1;
+	}
+	if (q.v != '2 3 4' || q.s != 1) {
+		printf ("q = [1, [2, 3, 4]] -> %v, %g\n", q.v, q.s);
+		fail = 1;
+	}
+	q = [[5, 6, 7], 8];
+	if (q.x != 5 || q.y != 6 || q.z != 7 || q.w != 8) {
+		printf ("q = [[5, 6, 7], 8] -> %q\n", q);
+		fail = 1;
+	}
+	if (q.v != '5 6 7' || q.s != 8) {
+		printf ("q = [[5, 6, 7], 8] -> %v, %g\n", q.v, q.s);
+		fail = 1;
+	}
+/*	q = [s, v];
+	if (q.x != v.x || q.y != v.y || q.z != v.z || q.w != s) {
+		printf ("q = [s, v] -> %q (%v)\n", q, v);
+		fail = 1;
+	}
+	if (q.v != v || q.s != s) {
+		printf ("q = [s, v] -> %v, %g (%v)\n", q.v, q.s, v);
+		fail = 1;
+	}
+	q = [v, s];
+	if (q.x != v.x || q.y != v.y || q.z != v.z || q.w != s) {
+		printf ("q = [v, s] -> %q (%v %s)\n", q, v, s);
+		fail = 1;
+	}
+	if (q.v != v || q.s != s) {
+		printf ("q = [v, s] -> %v, %g (%v %s)\n", q.v, q.s, v, s);
+		fail = 1;
+	}*/
+	return fail;
+}
+
+int
+main ()
+{
+	int         fail = 0;
+	fail |= test_format ();
+	return fail;
+}
diff --git a/tools/qfcc/test/test-harness.c b/tools/qfcc/test/test-harness.c
index b364a7f0c..dcb251037 100644
--- a/tools/qfcc/test/test-harness.c
+++ b/tools/qfcc/test/test-harness.c
@@ -165,7 +165,10 @@ load_progs (const char *name)
 		return 0;
 	}
 	pr.progs_name = name;
-	PR_LoadProgsFile (&pr, file, size, 16, 1024 * 1024);
+	pr.max_edicts = 16;
+	pr.zone_size = 1024 * 1024;
+	pr.stack_size = 64 * 1024;
+	PR_LoadProgsFile (&pr, file, size);
 	Qclose (file);
 	if (!PR_RunLoadFuncs (&pr))
 		PR_Error (&pr, "unable to load %s", pr.progs_name);

From 71b3d30aa1b936c0d847bc1b831d73092eede928 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 12 Oct 2018 14:50:55 +0900
Subject: [PATCH 0178/1519] Make the ice a little more informative.

---
 tools/qfcc/include/expr.h      | 1 +
 tools/qfcc/source/dot_expr.c   | 2 +-
 tools/qfcc/source/statements.c | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/tools/qfcc/include/expr.h b/tools/qfcc/include/expr.h
index 73d3f2399..f52930730 100644
--- a/tools/qfcc/include/expr.h
+++ b/tools/qfcc/include/expr.h
@@ -211,6 +211,7 @@ typedef struct expr_s {
 } expr_t;
 
 extern struct type_s *ev_types[];
+extern const char *expr_names[];
 
 /**	Report a type mismatch error.
 
diff --git a/tools/qfcc/source/dot_expr.c b/tools/qfcc/source/dot_expr.c
index accd8485a..43578a1c8 100644
--- a/tools/qfcc/source/dot_expr.c
+++ b/tools/qfcc/source/dot_expr.c
@@ -52,7 +52,7 @@
 #include "qc-parse.h"
 #include "strpool.h"
 
-static const char *expr_names[] =
+const char *expr_names[] =
 {
 	"error",
 	"state",
diff --git a/tools/qfcc/source/statements.c b/tools/qfcc/source/statements.c
index 7c0fb693f..f86ae8d47 100644
--- a/tools/qfcc/source/statements.c
+++ b/tools/qfcc/source/statements.c
@@ -1017,7 +1017,8 @@ statement_subexpr (sblock_t *sblock, expr_t *e, operand_t **op)
 	if (e->type > ex_value)
 		internal_error (e, "bad expression type");
 	if (!sfuncs[e->type])
-		internal_error (e, "unexpected expression type");
+		internal_error (e, "unexpected expression type; %s",
+						expr_names[e->type]);
 
 	sblock = sfuncs[e->type] (sblock, e, op);
 	return sblock;

From 668896aa82bba9b46642825406002157ee876397 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 12 Oct 2018 16:01:11 +0900
Subject: [PATCH 0179/1519] More diagnostic improvements.

---
 tools/qfcc/include/diagnostic.h | 11 +++++++----
 tools/qfcc/source/diagnostic.c  |  6 ++++--
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/tools/qfcc/include/diagnostic.h b/tools/qfcc/include/diagnostic.h
index 1c0ee51bc..99a542762 100644
--- a/tools/qfcc/include/diagnostic.h
+++ b/tools/qfcc/include/diagnostic.h
@@ -55,10 +55,13 @@ struct expr_s *warning (struct expr_s *e, const char *fmt, ...)
 	__attribute__ ((format (printf, 2, 3)));
 struct expr_s *notice (struct expr_s *e, const char *fmt, ...)
 	__attribute__ ((format (printf, 2, 3)));
-void debug (struct expr_s *e, const char *fmt, ...)
-	__attribute__ ((format (printf, 2, 3)));
-void bug (struct expr_s *e, const char *fmt, ...)
-	__attribute__ ((format (printf, 2, 3)));
+void _debug (struct expr_s *e, const char *file, int line,
+			 const char *fmt, ...)
+	__attribute__ ((format (printf, 4, 5)));
+#define debug(e, fmt...) _debug(e, __FILE__, __LINE__, fmt)
+void _bug (struct expr_s *e, const char *file, int line, const char *fmt, ...)
+	__attribute__ ((format (printf, 4, 5)));
+#define bug(e, fmt...) _bug(e, __FILE__, __LINE__, fmt)
 
 //@}
 
diff --git a/tools/qfcc/source/diagnostic.c b/tools/qfcc/source/diagnostic.c
index dbf71142c..67a6644e0 100644
--- a/tools/qfcc/source/diagnostic.c
+++ b/tools/qfcc/source/diagnostic.c
@@ -118,7 +118,7 @@ _warning (expr_t *e, const char *fmt, va_list args)
 }
 
 void
-debug (expr_t *e, const char *fmt, ...)
+_debug (expr_t *e, const char *file, int line, const char *fmt, ...)
 {
 	va_list     args;
 
@@ -131,6 +131,7 @@ debug (expr_t *e, const char *fmt, ...)
 		dstring_t  *message = dstring_new ();
 
 		format_message (message, "debug", e, fmt, args);
+		dasprintf (message, " (%s:%d)", file, line);
 		fprintf (stderr, "%s\n", message->str);
 		dstring_delete (message);
 	}
@@ -138,7 +139,7 @@ debug (expr_t *e, const char *fmt, ...)
 }
 
 void
-bug (expr_t *e, const char *fmt, ...)
+_bug (expr_t *e, const char *file, int line, const char *fmt, ...)
 {
 	va_list     args;
 
@@ -149,6 +150,7 @@ bug (expr_t *e, const char *fmt, ...)
 		dstring_t  *message = dstring_new ();
 
 		format_message (message, "BUG", e, fmt, args);
+		dasprintf (message, " (%s:%d)", file, line);
 		if (bug_hook) {
 			bug_hook (message->str);
 		} else {

From f56d25cda61485d64b4709e179f4788ffa1a72f6 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 12 Oct 2018 20:46:45 +0900
Subject: [PATCH 0180/1519] Don't double print messages.

---
 tools/qfcc/source/diagnostic.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tools/qfcc/source/diagnostic.c b/tools/qfcc/source/diagnostic.c
index 67a6644e0..da2f01969 100644
--- a/tools/qfcc/source/diagnostic.c
+++ b/tools/qfcc/source/diagnostic.c
@@ -113,7 +113,6 @@ _warning (expr_t *e, const char *fmt, va_list args)
 	} else {
 		fprintf (stderr, "%s\n", message->str);
 	}
-	fprintf (stderr, "%s\n", message->str);
 	dstring_delete (message);
 }
 
@@ -183,7 +182,6 @@ notice (expr_t *e, const char *fmt, ...)
 		} else {
 			fprintf (stderr, "%s\n", message->str);
 		}
-		fprintf (stderr, "%s\n", message->str);
 		dstring_delete (message);
 	}
 	va_end (args);
@@ -240,7 +238,6 @@ error (expr_t *e, const char *fmt, ...)
 		} else {
 			fprintf (stderr, "%s\n", message->str);
 		}
-		fprintf (stderr, "%s\n", message->str);
 		dstring_delete (message);
 	}
 	va_end (args);

From e03dfa29b464dd53e81e548ddf3b6b97a22ebafa Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 12 Oct 2018 21:09:36 +0900
Subject: [PATCH 0181/1519] Clean up the module .ctor construction a little.

---
 tools/qfcc/source/class.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tools/qfcc/source/class.c b/tools/qfcc/source/class.c
index 52b67823d..21dc210c6 100644
--- a/tools/qfcc/source/class.c
+++ b/tools/qfcc/source/class.c
@@ -1265,6 +1265,7 @@ class_finish_module (void)
 	category_t **ca;
 	def_t      *symtab_def;
 	symbol_t   *module_sym;
+	expr_t     *module_expr;
 	pr_module_t *module;
 	symbol_t   *exec_class_sym;
 	symbol_t   *init_sym;
@@ -1314,12 +1315,12 @@ class_finish_module (void)
 	init_sym = new_symbol_type (".ctor", &type_function);
 	init_sym = function_symbol (init_sym, 0, 1);
 
+	module_expr = address_expr (new_symbol_expr (module_sym), 0, 0);
+
 	init_expr = new_block_expr ();
 	append_expr (init_expr,
-			build_function_call (new_symbol_expr (exec_class_sym),
-								 exec_class_sym->type,
-								 address_expr (new_symbol_expr (module_sym),
-									 		   0, 0)));
+				 build_function_call (new_symbol_expr (exec_class_sym),
+									  exec_class_sym->type, module_expr));
 
 	save_storage = current_storage;
 	current_storage = sc_static;

From 78e0a8dc522429509d36ddae862b781dea13da85 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 12 Oct 2018 22:05:17 +0900
Subject: [PATCH 0182/1519] Support assigning non-constant vector expressions.

---
 tools/qfcc/include/expr.h       |   3 +-
 tools/qfcc/include/type.h       |   3 +
 tools/qfcc/source/Makefile.am   |   3 +-
 tools/qfcc/source/constfold.c   |   2 +-
 tools/qfcc/source/dags.c        |   2 +-
 tools/qfcc/source/def.c         |  12 +-
 tools/qfcc/source/dot_expr.c    |   2 +-
 tools/qfcc/source/expr.c        | 222 +++---------------
 tools/qfcc/source/expr_assign.c | 396 ++++++++++++++++++++++++++++++++
 tools/qfcc/source/flow.c        |   2 +-
 tools/qfcc/source/obj_file.c    |   4 +-
 tools/qfcc/source/qfcc.c        |   9 +-
 tools/qfcc/source/statements.c  |  21 +-
 tools/qfcc/source/switch.c      |   2 +-
 tools/qfcc/source/type.c        |  20 ++
 tools/qfcc/source/value.c       |  82 ++++---
 tools/qfcc/test/quaternion.r    |   4 +-
 17 files changed, 536 insertions(+), 253 deletions(-)
 create mode 100644 tools/qfcc/source/expr_assign.c

diff --git a/tools/qfcc/include/expr.h b/tools/qfcc/include/expr.h
index f52930730..466a11ec1 100644
--- a/tools/qfcc/include/expr.h
+++ b/tools/qfcc/include/expr.h
@@ -171,7 +171,8 @@ typedef struct {
 typedef struct ex_value_s {
 	struct ex_value_s *next;
 	struct daglabel_s *daglabel;///< dag label for this value
-	etype_t     type;
+	struct type_s *type;
+	etype_t     lltype;
 	union {
 		const char *string_val;			///< string constant
 		float       float_val;			///< float constant
diff --git a/tools/qfcc/include/type.h b/tools/qfcc/include/type.h
index 2e1fa6c87..e886ac444 100644
--- a/tools/qfcc/include/type.h
+++ b/tools/qfcc/include/type.h
@@ -155,10 +155,13 @@ int is_enum (const type_t *type) __attribute__((pure));
 int is_integral (const type_t *type) __attribute__((pure));
 int is_float (const type_t *type) __attribute__((pure));
 int is_scalar (const type_t *type) __attribute__((pure));
+int is_vector (const type_t *type) __attribute__((pure));
+int is_quaternion (const type_t *type) __attribute__((pure));
 int is_math (const type_t *type) __attribute__((pure));
 int is_pointer (const type_t *type) __attribute__((pure));
 int is_struct (const type_t *type) __attribute__((pure));
 int is_array (const type_t *type) __attribute__((pure));
+int is_func (const type_t *type) __attribute__((pure));
 int type_assignable (const type_t *dst, const type_t *src);
 int type_size (const type_t *type) __attribute__((pure));
 
diff --git a/tools/qfcc/source/Makefile.am b/tools/qfcc/source/Makefile.am
index fb0c42782..b0bf53fb7 100644
--- a/tools/qfcc/source/Makefile.am
+++ b/tools/qfcc/source/Makefile.am
@@ -41,7 +41,8 @@ bin_SCRIPTS=	qfpreqcc
 common_src=\
 	class.c codespace.c constfold.c cpp.c dags.c debug.c def.c defspace.c \
 	diagnostic.c dot.c dot_dag.c dot_expr.c dot_flow.c dot_sblock.c emit.c \
-	expr.c expr_binary.c flow.c function.c grab.c idstuff.c linker.c method.c \
+	expr.c expr_assign.c expr_binary.c flow.c function.c grab.c idstuff.c \
+	linker.c method.c \
 	obj_file.c \
 	obj_type.c opcodes.c options.c pragma.c qfcc.c reloc.c shared.c \
 	statements.c strpool.c struct.c switch.c symtab.c type.c value.c
diff --git a/tools/qfcc/source/constfold.c b/tools/qfcc/source/constfold.c
index ee754f587..f44cb2b68 100644
--- a/tools/qfcc/source/constfold.c
+++ b/tools/qfcc/source/constfold.c
@@ -140,7 +140,7 @@ convert_to_float (expr_t *e)
 
 	switch (e->type) {
 		case ex_value:
-			switch (e->e.value->type) {
+			switch (e->e.value->lltype) {
 				case ev_integer:
 					convert_int (e);
 					return e;
diff --git a/tools/qfcc/source/dags.c b/tools/qfcc/source/dags.c
index fc87e31eb..0f07edbbf 100644
--- a/tools/qfcc/source/dags.c
+++ b/tools/qfcc/source/dags.c
@@ -356,7 +356,7 @@ dagnode_set_edges (dag_t *dag, dagnode_t *n)
 				if (node != child && node != n)
 					set_add (node->edges, n->number);
 				if (op->op_type == op_value
-					&& op->o.value->type == ev_pointer
+					&& op->o.value->lltype == ev_pointer
 					&& op->o.value->v.pointer.def)
 					def_visit_all (op->o.value->v.pointer.def, 1,
 								   dagnode_set_edges_visit, n);
diff --git a/tools/qfcc/source/def.c b/tools/qfcc/source/def.c
index c16aa9912..346ee9b9d 100644
--- a/tools/qfcc/source/def.c
+++ b/tools/qfcc/source/def.c
@@ -350,7 +350,7 @@ init_elements (struct def_s *def, expr_t *eles)
 			reloc_def_op (c->e.labelref.label, &loc);
 			continue;
 		} else if (c->type == ex_value) {
-			if (c->e.value->type == ev_integer
+			if (c->e.value->lltype == ev_integer
 				&& elements[i].type->type == ev_float)
 				convert_int (c);
 			if (get_type (c) != elements[i].type) {
@@ -372,7 +372,7 @@ init_elements (struct def_s *def, expr_t *eles)
 		} else {
 			if (c->type != ex_value)
 				internal_error (c, "bogus expression type in init_elements()");
-			if (c->e.value->type == ev_string) {
+			if (c->e.value->lltype == ev_string) {
 				EMIT_STRING (def->space, g->string_var,
 							 c->e.value->v.string_val);
 			} else {
@@ -407,7 +407,7 @@ init_vector_components (symbol_t *vector_sym, int is_field)
 					expr = sym->s.expr;
 					if (is_field) {
 						if (expr->type != ex_value
-							|| expr->e.value->type != ev_field) {
+							|| expr->e.value->lltype != ev_field) {
 							error (0, "%s redefined", name);
 							sym = 0;
 						} else {
@@ -574,8 +574,8 @@ initialize_def (symbol_t *sym, type_t *type, expr_t *init, defspace_t *space,
 				error (0, "non-constant initializier");
 				return;
 			}
-			if (init->e.value->type == ev_pointer
-				|| init->e.value->type == ev_field) {
+			if (init->e.value->lltype == ev_pointer
+				|| init->e.value->lltype == ev_field) {
 				// FIXME offset pointers
 				D_INT (sym->s.def) = init->e.value->v.pointer.val;
 				if (init->e.value->v.pointer.def)
@@ -584,7 +584,7 @@ initialize_def (symbol_t *sym, type_t *type, expr_t *init, defspace_t *space,
 				ex_value_t *v = init->e.value;
 				if (is_scalar (sym->type))
 					v = convert_value (v, sym->type);
-				if (v->type == ev_string) {
+				if (v->lltype == ev_string) {
 					EMIT_STRING (sym->s.def->space, D_STRING (sym->s.def),
 								 v->v.string_val);
 				} else {
diff --git a/tools/qfcc/source/dot_expr.c b/tools/qfcc/source/dot_expr.c
index 43578a1c8..191c8208d 100644
--- a/tools/qfcc/source/dot_expr.c
+++ b/tools/qfcc/source/dot_expr.c
@@ -386,7 +386,7 @@ print_value (dstring_t *dstr, expr_t *e, int level, int id, expr_t *next)
 	type_t     *type;
 	const char *label = "?!?";
 
-	switch (e->e.value->type) {
+	switch (e->e.value->lltype) {
 		case ev_string:
 			label = va ("\\\"%s\\\"", quote_string (e->e.value->v.string_val));
 			break;
diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index c8aebc5e0..a4fbf76ac 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -159,6 +159,13 @@ convert_vector (expr_t *e)
 			val[2] = expr_float(z);
 			return new_vector_expr (val);
 		}
+		// at least one of x, y, z is not constant, so rebuild the
+		// list incase any of them are new expressions
+		z->next = 0;
+		y->next = z;
+		x->next = y;
+		e->e.vector.list = x;
+		return e;
 	}
 	if (e->e.vector.type == &type_quaternion) {
 		// guaranteed to have two or four elements
@@ -180,6 +187,14 @@ convert_vector (expr_t *e)
 				val[3] = expr_float(w);
 				return new_quaternion_expr (val);
 			}
+			// at least one of x, y, z, w is not constant, so rebuild the
+			// list incase any of them are new expressions
+			w->next = 0;
+			z->next = w;
+			y->next = z;
+			x->next = y;
+			e->e.vector.list = x;
+			return e;
 		} else {
 			// v, s
 			expr_t     *v = e->e.vector.list;
@@ -192,7 +207,7 @@ convert_vector (expr_t *e)
 				val[3] = expr_float (s);
 				return new_quaternion_expr (val);
 			}
-			// Either v or is is not constant, so can't convert to a quaternion
+			// Either v or s is not constant, so can't convert to a quaternion
 			// constant.
 			// Rebuild the list in case v or s is a new expression
 			s->next = 0;
@@ -233,17 +248,7 @@ get_type (expr_t *e)
 		case ex_temp:
 			return e->e.temp.type;
 		case ex_value:
-			if (e->e.value->type == ev_func)
-				return e->e.value->v.func_val.type;
-			if (e->e.value->type == ev_pointer)
-				return pointer_type (e->e.value->v.pointer.type);
-			if (e->e.value->type == ev_field)
-				return field_type (e->e.value->v.pointer.type);
-			if (e->e.value->type == ev_integer
-				&& options.code.progsversion == PROG_ID_VERSION) {
-				convert_int (e);
-			}
-			return ev_types[e->e.value->type];
+			return e->e.value->type;
 		case ex_vector:
 			return e->e.vector.type;
 	}
@@ -801,7 +806,7 @@ is_string_val (expr_t *e)
 {
 	if (e->type == ex_nil)
 		return 1;
-	if (e->type == ex_value && e->e.value->type == ev_string)
+	if (e->type == ex_value && e->e.value->lltype == ev_string)
 		return 1;
 	if (e->type == ex_symbol && e->e.symbol->sy_type == sy_const
 		&& e->e.symbol->type->type == ev_string)
@@ -814,7 +819,7 @@ expr_string (expr_t *e)
 {
 	if (e->type == ex_nil)
 		return 0;
-	if (e->type == ex_value && e->e.value->type == ev_string)
+	if (e->type == ex_value && e->e.value->lltype == ev_string)
 		return e->e.value->v.string_val;
 	internal_error (e, "not a string constant");
 }
@@ -824,7 +829,7 @@ is_float_val (expr_t *e)
 {
 	if (e->type == ex_nil)
 		return 1;
-	if (e->type == ex_value && e->e.value->type == ev_float)
+	if (e->type == ex_value && e->e.value->lltype == ev_float)
 		return 1;
 	if (e->type == ex_symbol && e->e.symbol->sy_type == sy_const
 		&& e->e.symbol->type->type == ev_float)
@@ -837,7 +842,7 @@ expr_float (expr_t *e)
 {
 	if (e->type == ex_nil)
 		return 0;
-	if (e->type == ex_value && e->e.value->type == ev_float)
+	if (e->type == ex_value && e->e.value->lltype == ev_float)
 		return e->e.value->v.float_val;
 	if (e->type == ex_symbol && e->e.symbol->sy_type == sy_const
 		&& e->e.symbol->type->type == ev_float)
@@ -854,7 +859,7 @@ is_vector_val (expr_t *e)
 {
 	if (e->type == ex_nil)
 		return 1;
-	if (e->type == ex_value && e->e.value->type == ev_vector)
+	if (e->type == ex_value && e->e.value->lltype == ev_vector)
 		return 1;
 	if (e->type == ex_symbol && e->e.symbol->sy_type == sy_const
 		&& e->e.symbol->type->type == ev_vector)
@@ -867,7 +872,7 @@ expr_vector (expr_t *e)
 {
 	if (e->type == ex_nil)
 		return vec3_origin;
-	if (e->type == ex_value && e->e.value->type == ev_vector)
+	if (e->type == ex_value && e->e.value->lltype == ev_vector)
 		return e->e.value->v.vector_val;
 	if (e->type == ex_symbol && e->e.symbol->sy_type == sy_const
 		&& e->e.symbol->type->type == ev_vector)
@@ -884,7 +889,7 @@ is_quaternion_val (expr_t *e)
 {
 	if (e->type == ex_nil)
 		return 1;
-	if (e->type == ex_value && e->e.value->type == ev_quat)
+	if (e->type == ex_value && e->e.value->lltype == ev_quat)
 		return 1;
 	if (e->type == ex_symbol && e->e.symbol->sy_type == sy_const
 		&& e->e.symbol->type->type == ev_quat)
@@ -897,7 +902,7 @@ expr_quaternion (expr_t *e)
 {
 	if (e->type == ex_nil)
 		return quat_origin;
-	if (e->type == ex_value && e->e.value->type == ev_quat)
+	if (e->type == ex_value && e->e.value->lltype == ev_quat)
 		return e->e.value->v.quaternion_val;
 	if (e->type == ex_symbol && e->e.symbol->sy_type == sy_const
 		&& e->e.symbol->type->type == ev_quat)
@@ -914,7 +919,7 @@ is_integer_val (expr_t *e)
 {
 	if (e->type == ex_nil)
 		return 1;
-	if (e->type == ex_value && e->e.value->type == ev_integer)
+	if (e->type == ex_value && e->e.value->lltype == ev_integer)
 		return 1;
 	if (e->type == ex_symbol && e->e.symbol->sy_type == sy_const
 		&& (e->e.symbol->type->type == ev_integer
@@ -928,7 +933,7 @@ expr_integer (expr_t *e)
 {
 	if (e->type == ex_nil)
 		return 0;
-	if (e->type == ex_value && e->e.value->type == ev_integer)
+	if (e->type == ex_value && e->e.value->lltype == ev_integer)
 		return e->e.value->v.integer_val;
 	if (e->type == ex_symbol && e->e.symbol->sy_type == sy_const
 		&& (e->e.symbol->type->type == ev_integer
@@ -946,7 +951,7 @@ expr_uinteger (expr_t *e)
 {
 	if (e->type == ex_nil)
 		return 0;
-	if (e->type == ex_value && e->e.value->type == ev_uinteger)
+	if (e->type == ex_value && e->e.value->lltype == ev_uinteger)
 		return e->e.value->v.uinteger_val;
 	if (e->type == ex_symbol && e->e.symbol->sy_type == sy_const
 		&& e->e.symbol->type->type == ev_uinteger)
@@ -963,7 +968,7 @@ is_short_val (expr_t *e)
 {
 	if (e->type == ex_nil)
 		return 1;
-	if (e->type == ex_value && e->e.value->type == ev_short)
+	if (e->type == ex_value && e->e.value->lltype == ev_short)
 		return 1;
 	if (e->type == ex_symbol && e->e.symbol->sy_type == sy_const
 		&& e->e.symbol->type->type == ev_short)
@@ -976,7 +981,7 @@ expr_short (expr_t *e)
 {
 	if (e->type == ex_nil)
 		return 0;
-	if (e->type == ex_value && e->e.value->type == ev_short)
+	if (e->type == ex_value && e->e.value->lltype == ev_short)
 		return e->e.value->v.short_val;
 	if (e->type == ex_symbol && e->e.symbol->sy_type == sy_const
 		&& e->e.symbol->type->type == ev_short)
@@ -1172,7 +1177,8 @@ field_expr (expr_t *e1, expr_t *e2)
 				}
 				def = sym->s.def;
 				e2 = new_field_expr (0, field->type, def);
-			} else if (e2->type != ex_value || e2->e.value->type != ev_field) {
+			} else if (e2->type != ex_value
+					   || e2->e.value->lltype != ev_field) {
 				internal_error (e2, "unexpected field exression");
 			}
 			e2->e.value = new_field_val (e2->e.value->v.pointer.val + field->s.offset, field->type, e2->e.value->v.pointer.def);
@@ -2215,7 +2221,7 @@ address_expr (expr_t *e1, expr_t *e2, type_t *t)
 	if (e2) {
 		if (e2->type == ex_error)
 			return e2;
-		if (e->type == ex_value && e->e.value->type == ev_pointer
+		if (e->type == ex_value && e->e.value->lltype == ev_pointer
 			&& is_short_val (e2)) {
 			e->e.value = new_pointer_val (e->e.value->v.pointer.val + expr_short (e2), t, e->e.value->v.pointer.def);
 		} else {
@@ -2479,24 +2485,6 @@ think_expr (symbol_t *think_sym)
 	return new_symbol_expr (think_sym);
 }
 
-static __attribute__((pure)) int
-is_indirect (expr_t *e)
-{
-	if (e->type == ex_block && e->e.block.result)
-		return is_indirect (e->e.block.result);
-	if (e->type == ex_expr && e->e.expr.op == '.')
-		return 1;
-	if (!(e->type == ex_uexpr && e->e.expr.op == '.'))
-		return 0;
-	e = e->e.expr.e1;
-	if (e->type != ex_value || e->e.value->type != ev_pointer
-		|| !(POINTER_VAL (e->e.value->v.pointer) >= 0
-			 && POINTER_VAL (e->e.value->v.pointer) < 65536)) {
-		return 1;
-	}
-	return 0;
-}
-
 static inline __attribute__((pure)) int
 is_lvalue (expr_t *e)
 {
@@ -2527,150 +2515,6 @@ is_lvalue (expr_t *e)
 	return 0;
 }
 
-expr_t *
-assign_expr (expr_t *e1, expr_t *e2)
-{
-	int         op = '=';
-	type_t     *t1, *t2, *type;
-	expr_t     *e;
-
-	convert_name (e1);
-	convert_name (e2);
-	e2 = convert_vector (e2);
-
-	if (e1->type == ex_error)
-		return e1;
-	if (e2->type == ex_error)
-		return e2;
-
-	e1 = fold_constants (e1);
-	e2 = fold_constants (e2);
-
-	if (options.traditional) {
-		if (e2->type == ex_expr && !e2->paren
-			&& (e2->e.expr.op == AND || e2->e.expr.op == OR)) {
-			notice (e2, "precedence of `%s' and `%s' inverted for "
-						"traditional code", get_op_string (op),
-						get_op_string (e2->e.expr.op));
-			e1 = assign_expr (e1, e2->e.expr.e1);
-			e1->paren = 1;
-			return binary_expr (e2->e.expr.op, e1, e2->e.expr.e2);
-		}
-	}
-
-	if (!is_lvalue (e1)) {
-		if (options.traditional)
-			warning (e1, "invalid lvalue in assignment");
-		else
-			return error (e1, "invalid lvalue in assignment");
-	}
-	t1 = get_type (e1);
-	t2 = get_type (e2);
-	if (!t1 || !t2)
-		internal_error (e1, 0);
-	//XXX func = func ???
-	if (t1->type == ev_pointer && is_array (t2)) {
-		e2 = address_expr (e2, 0, t2->t.fldptr.type);
-		t2 = get_type (e2);
-	}
-	if (e2->type == ex_bool)
-		e2 = convert_from_bool (e2, t1);
-
-	if (t1->type != ev_void && e2->type == ex_nil) {
-		t2 = t1;
-		convert_nil (e2, t2);
-	}
-
-	e2->rvalue = 1;
-
-	if (!type_assignable (t1, t2)) {
-		if (options.traditional) {
-			if (t1->type == ev_func && t2->type == ev_func) {
-				warning (e1, "assignment between disparate function types");
-			} else if (t1->type == ev_float && t2->type == ev_vector) {
-				warning (e1, "assignment of vector to float");
-				e2 = field_expr (e2, new_name_expr ("x"));
-			} else if (t1->type == ev_vector && t2->type == ev_float) {
-				warning (e1, "assignment of float to vector");
-				e1 = field_expr (e1, new_name_expr ("x"));
-			} else {
-				return type_mismatch (e1, e2, op);
-			}
-		} else {
-			return type_mismatch (e1, e2, op);
-		}
-	}
-	type = t1;
-	if (is_indirect (e1) && is_indirect (e2)) {
-		if (is_struct (get_type (e2))) {
-			e1 = address_expr (e1, 0, 0);
-			e2 = address_expr (e2, 0, 0);
-			e = new_move_expr (e1, e2, t2, 1);
-		} else {
-			expr_t     *temp = new_temp_def_expr (t1);
-
-			e = new_block_expr ();
-			append_expr (e, assign_expr (temp, e2));
-			append_expr (e, assign_expr (e1, temp));
-			e->e.block.result = temp;
-		}
-		return e;
-	} else if (is_indirect (e1)) {
-		if (is_struct (get_type (e1))) {
-			e1 = address_expr (e1, 0, 0);
-			e2 = address_expr (e2, 0, 0);
-			return new_move_expr (e1, e2, t1, 1);
-		}
-		if (e1->type == ex_expr) {
-			if (get_type (e1->e.expr.e1) == &type_entity) {
-				type = e1->e.expr.type;
-				e1->e.expr.type = pointer_type (type);
-				e1->e.expr.op = '&';
-			}
-			op = PAS;
-		} else {
-			e = e1->e.expr.e1;
-			if ((e->type != ex_value || e->e.value->type != ev_pointer)
-				|| !(POINTER_VAL (e->e.value->v.pointer) > 0
-					 && POINTER_VAL (e->e.value->v.pointer) < 65536)) {
-				e1 = e;
-				op = PAS;
-			}
-		}
-	} else if (is_indirect (e2)) {
-		if (is_struct (get_type (e1))) {
-			e1 = address_expr (e1, 0, 0);
-			e2 = address_expr (e2, 0, 0);
-			e2->rvalue = 1;
-			return new_move_expr (e1, e2, t2, 1);
-		}
-		if (e2->type == ex_uexpr) {
-			e = e2->e.expr.e1;
-			if ((e->type != ex_value || e->e.value->type != ev_pointer)
-				|| !(POINTER_VAL (e->e.value->v.pointer) > 0
-					 && POINTER_VAL (e->e.value->v.pointer) < 65536)) {
-				if (e->type == ex_expr && e->e.expr.op == '&'
-					&& e->e.expr.type->type == ev_pointer
-					&& !is_constant (e)) {
-					e2 = e;
-					e2->e.expr.op = '.';
-					e2->e.expr.type = t2;
-					e2->rvalue = 1;
-				}
-			}
-		}
-	}
-	if (is_struct (get_type (e1))) {
-		return new_move_expr (e1, e2, get_type (e1), 0);
-	}
-	if (!type)
-		internal_error (e1, 0);
-
-	e = new_binary_expr (op, e1, e2);
-	e->e.expr.type = type;
-	return e;
-}
-
 expr_t *
 cast_expr (type_t *type, expr_t *e)
 {
diff --git a/tools/qfcc/source/expr_assign.c b/tools/qfcc/source/expr_assign.c
new file mode 100644
index 000000000..0a1a82b6d
--- /dev/null
+++ b/tools/qfcc/source/expr_assign.c
@@ -0,0 +1,396 @@
+/*
+	expr_assign.c
+
+	assignment expression construction and manipulations
+
+	Copyright (C) 2001 Bill Currie <bill@taniwha.org>
+
+	Author: Bill Currie <bill@taniwha.org>
+	Date: 2001/06/15
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#include <stdlib.h>
+
+#include "QF/alloc.h"
+#include "QF/dstring.h"
+#include "QF/mathlib.h"
+#include "QF/sys.h"
+#include "QF/va.h"
+
+#include "qfcc.h"
+#include "class.h"
+#include "def.h"
+#include "defspace.h"
+#include "diagnostic.h"
+#include "emit.h"
+#include "expr.h"
+#include "function.h"
+#include "idstuff.h"
+#include "method.h"
+#include "options.h"
+#include "reloc.h"
+#include "shared.h"
+#include "strpool.h"
+#include "struct.h"
+#include "symtab.h"
+#include "type.h"
+#include "value.h"
+#include "qc-parse.h"
+
+static expr_t *
+check_assign_logic_precedence (expr_t *dst, expr_t *src)
+{
+	if (src->type == ex_expr && !src->paren && is_logic (src->e.expr.op)) {
+		// traditional QuakeC gives = higher precedence than && and ||
+		expr_t     *assignment;
+		notice (src, "precedence of `=' and `%s' inverted for "
+					 "traditional code", get_op_string (src->e.expr.op));
+		// change {a = (b logic c)} to {(a = b) logic c}
+		assignment = assign_expr (dst, src->e.expr.e1);
+		assignment->paren = 1;	// protect assignment from binary_expr
+		return binary_expr (src->e.expr.op, assignment, src->e.expr.e2);
+	}
+	return 0;
+}
+
+static expr_t *
+check_valid_lvalue (expr_t *expr)
+{
+	switch (expr->type) {
+		case ex_symbol:
+			switch (expr->e.symbol->sy_type) {
+				case sy_var:
+					return 0;
+				case sy_const:
+					break;
+				case sy_type:
+					break;
+				case sy_expr:
+					break;
+				case sy_func:
+					break;
+				case sy_class:
+					break;
+			}
+			break;
+		case ex_temp:
+			return 0;
+		case ex_expr:
+			if (expr->e.expr.op == '.') {
+				return 0;
+			}
+			break;
+		case ex_uexpr:
+			if (expr->e.expr.op == '.') {
+				return 0;
+			}
+			if (expr->e.expr.op == 'A') {
+				return check_valid_lvalue (expr->e.expr.e1);
+			}
+			break;
+		case ex_state:
+		case ex_bool:
+		case ex_label:
+		case ex_labelref:
+		case ex_block:
+		case ex_vector:
+		case ex_nil:
+		case ex_value:
+		case ex_error:
+			break;
+	}
+	if (options.traditional) {
+		warning (expr, "invalid lvalue in assignment");
+		return 0;
+	}
+	return error (expr, "invalid lvalue in assignment");
+}
+
+static expr_t *
+check_types_compatible (expr_t *dst, expr_t *src)
+{
+	type_t     *dst_type = get_type (dst);
+	type_t     *src_type = get_type (src);
+
+	if (type_assignable (dst_type, src_type)) {
+		return 0;
+	}
+	// traditional qcc is a little sloppy
+	if (!options.traditional) {
+		return type_mismatch (dst, src, '=');
+	}
+	if (is_func (dst_type) && is_func (src_type)) {
+		warning (dst, "assignment between disparate function types");
+		return 0;
+	}
+	if (is_float (dst_type) && is_vector (src_type)) {
+		warning (dst, "assignment of vector to float");
+		src = field_expr (src, new_name_expr ("x"));
+		return assign_expr (dst, src);
+	}
+	if (is_vector (dst_type) && is_float (src_type)) {
+		warning (dst, "assignment of float to vector");
+		dst = field_expr (dst, new_name_expr ("x"));
+		return assign_expr (dst, src);
+	}
+	return type_mismatch (dst, src, '=');
+}
+
+static expr_t *
+assign_vector_expr (expr_t *dst, expr_t *src)
+{
+	expr_t     *dx, *sx;
+	expr_t     *dy, *sy;
+	expr_t     *dz, *sz;
+	expr_t     *dw, *sw;
+	expr_t     *ds, *ss;
+	expr_t     *dv, *sv;
+	expr_t     *block;
+
+	if (src->type == ex_vector) {
+		src = convert_vector (src);
+		if (src->type != ex_vector) {
+			// src was constant and thus converted
+			return assign_expr (dst, src);
+		}
+	}
+	if (src->type == ex_vector && dst->type != ex_vector) {
+		if (src->e.vector.type == &type_vector) {
+			// guaranteed to have three elements
+			sx = src->e.vector.list;
+			sy = sx->next;
+			sz = sy->next;
+			dx = field_expr (dst, new_name_expr ("x"));
+			dy = field_expr (dst, new_name_expr ("y"));
+			dz = field_expr (dst, new_name_expr ("z"));
+			block = new_block_expr ();
+			append_expr (block, assign_expr (dx, sx));
+			append_expr (block, assign_expr (dy, sy));
+			append_expr (block, assign_expr (dz, sz));
+			block->e.block.result = dst;
+			return block;
+		}
+		if (src->e.vector.type == &type_quaternion) {
+			// guaranteed to have two or four elements
+			if (src->e.vector.list->next->next) {
+				// four vals: x, y, z, w
+				sx = src->e.vector.list;
+				sy = sx->next;
+				sz = sy->next;
+				sw = sz->next;
+				dx = field_expr (dst, new_name_expr ("x"));
+				dy = field_expr (dst, new_name_expr ("y"));
+				dz = field_expr (dst, new_name_expr ("z"));
+				dw = field_expr (dst, new_name_expr ("w"));
+				block = new_block_expr ();
+				append_expr (block, assign_expr (dx, sx));
+				append_expr (block, assign_expr (dy, sy));
+				append_expr (block, assign_expr (dz, sz));
+				append_expr (block, assign_expr (dw, sw));
+				block->e.block.result = dst;
+				return block;
+			} else {
+				// v, s
+				sv = src->e.vector.list;
+				ss = sv->next;
+				dv = field_expr (dst, new_name_expr ("v"));
+				ds = field_expr (dst, new_name_expr ("s"));
+				block = new_block_expr ();
+				append_expr (block, assign_expr (dv, sv));
+				append_expr (block, assign_expr (ds, ss));
+				block->e.block.result = dst;
+				return block;
+			}
+		}
+		internal_error (src, "bogus vector expression");
+	}
+	return 0;
+}
+
+static __attribute__((pure)) int
+is_const_ptr (expr_t *e)
+{
+	if ((e->type != ex_value || e->e.value->lltype != ev_pointer)
+		|| !(POINTER_VAL (e->e.value->v.pointer) > 0
+			 && POINTER_VAL (e->e.value->v.pointer) < 65536)) {
+		return 1;
+	}
+	return 0;
+}
+
+static __attribute__((pure)) int
+is_indirect (expr_t *e)
+{
+	if (e->type == ex_block && e->e.block.result)
+		return is_indirect (e->e.block.result);
+	if (e->type == ex_expr && e->e.expr.op == '.')
+		return 1;
+	if (!(e->type == ex_uexpr && e->e.expr.op == '.'))
+		return 0;
+	return is_const_ptr (e->e.expr.e1);
+}
+
+expr_t *
+aassign_expr (expr_t *dst, expr_t *src);
+expr_t *
+assign_expr (expr_t *dst, expr_t *src)
+{
+	int         op = '=';
+	expr_t     *expr;
+	type_t     *dst_type, *src_type;
+
+	convert_name (dst);
+	convert_name (src);
+
+	if (dst->type == ex_error) {
+		return dst;
+	}
+	if (src->type == ex_error) {
+		return src;
+	}
+
+	if (options.traditional
+		&& (expr = check_assign_logic_precedence (dst, src))) {
+		return expr;
+	}
+
+	dst = fold_constants (dst);
+	src = fold_constants (src);
+
+	if ((expr = check_valid_lvalue (dst))) {
+		return expr;
+	}
+
+	dst_type = get_type (dst);
+	src_type = get_type (src);
+	if (!dst_type) {
+		internal_error (dst, "dst_type broke in assign_expr");
+	}
+	if (!src_type) {
+		internal_error (src, "src_type broke in assign_expr");
+	}
+
+	if (is_pointer (dst_type) && is_array (src_type)) {
+		// assigning an array to a pointer is the same as taking the address of
+		// the array but using the type of the array elements
+		src = address_expr (src, 0, src_type->t.fldptr.type);
+		src_type = get_type (src);
+	}
+	if (src->type == ex_bool) {
+		src = convert_from_bool (src, dst_type);
+		if (src->type == ex_error) {
+			return src;
+		}
+		src_type = get_type (src);
+	}
+	if (!is_void (dst_type) && src->type == ex_nil) {
+		// nil is a type-agnostic 0
+		// FIXME: assignment to compound types? error or memset?
+		src_type = dst_type;
+		convert_nil (src, src_type);
+	}
+
+	if ((expr = check_types_compatible (dst, src))) {
+		// expr might be a valid expression, but if so, check_types_compatible
+		// will take care of everything
+		return expr;
+	}
+
+	if ((expr = assign_vector_expr (dst, src))) {
+		return expr;
+	}
+
+	if (is_indirect (dst) && is_indirect (src)) {
+		debug (dst, "here");
+		if (is_struct (src_type)) {
+			dst = address_expr (dst, 0, 0);
+			src = address_expr (src, 0, 0);
+			expr = new_move_expr (dst, src, src_type, 1);
+		} else {
+			expr_t     *temp = new_temp_def_expr (dst_type);
+
+			expr = new_block_expr ();
+			append_expr (expr, assign_expr (temp, src));
+			append_expr (expr, assign_expr (dst, temp));
+			expr->e.block.result = temp;
+		}
+		return expr;
+	} else if (is_indirect (dst)) {
+		debug (dst, "here");
+		if (is_struct (dst_type)) {
+			dst = address_expr (dst, 0, 0);
+			src = address_expr (src, 0, 0);
+			return new_move_expr (dst, src, dst_type, 1);
+		}
+		if (dst->type == ex_expr) {
+			if (get_type (dst->e.expr.e1) == &type_entity) {
+				dst_type = dst->e.expr.type;
+				dst->e.expr.type = pointer_type (dst_type);
+				dst->e.expr.op = '&';
+			}
+			op = PAS;
+		} else {
+			if (is_const_ptr (dst->e.expr.e1)) {
+				dst = dst->e.expr.e1;
+				op = PAS;
+			}
+		}
+	} else if (is_indirect (src)) {
+		debug (dst, "here");
+		if (is_struct (dst_type)) {
+			dst = address_expr (dst, 0, 0);
+			src = address_expr (src, 0, 0);
+			src->rvalue = 1;
+			return new_move_expr (dst, src, src_type, 1);
+		}
+		if (src->type == ex_uexpr) {
+			expr = src->e.expr.e1;
+			if (is_const_ptr (expr)) {
+				if (expr->type == ex_expr && expr->e.expr.op == '&'
+					&& expr->e.expr.type->type == ev_pointer
+					&& !is_constant (expr)) {
+					src = expr;
+					src->e.expr.op = '.';
+					src->e.expr.type = src_type;
+					src->rvalue = 1;
+				}
+			}
+		}
+	}
+
+	if (is_struct (dst_type)) {
+		return new_move_expr (dst, src, dst_type, 0);
+	}
+
+	expr = new_binary_expr (op, dst, src);
+	expr->e.expr.type = dst_type;
+	return expr;
+}
diff --git a/tools/qfcc/source/flow.c b/tools/qfcc/source/flow.c
index 4170c2970..cd26be5b9 100644
--- a/tools/qfcc/source/flow.c
+++ b/tools/qfcc/source/flow.c
@@ -830,7 +830,7 @@ flow_analyze_statement (statement_t *s, set_t *use, set_t *def, set_t *kill,
 			} else if (!strcmp (s->opcode, "<MOVEP>")) {
 				flow_add_op_var (use, s->opc);
 				if (s->opc->op_type == op_value
-					&& s->opc->o.value->type == ev_pointer
+					&& s->opc->o.value->lltype == ev_pointer
 					&& s->opc->o.value->v.pointer.def) {
 					operand_t  *op;
 					ex_pointer_t *ptr = &s->opc->o.value->v.pointer;
diff --git a/tools/qfcc/source/obj_file.c b/tools/qfcc/source/obj_file.c
index 1ebd97f4b..428b733dc 100644
--- a/tools/qfcc/source/obj_file.c
+++ b/tools/qfcc/source/obj_file.c
@@ -428,8 +428,10 @@ qfo_write (qfo_t *qfo, const char *filename)
 	QFile      *file;
 
 	file = Qopen (filename, options.gzip ? "wbz9" : "wb");
-	if (!file)
+	if (!file) {
+		perror (va ("failed to open %s for writing", filename));
 		return -1;
+	}
 
 	size = sizeof (qfo_header_t);
 	size += sizeof (qfo_space_t) * qfo->num_spaces;
diff --git a/tools/qfcc/source/qfcc.c b/tools/qfcc/source/qfcc.c
index cf6d1257f..0da2caf88 100644
--- a/tools/qfcc/source/qfcc.c
+++ b/tools/qfcc/source/qfcc.c
@@ -396,9 +396,12 @@ compile_to_obj (const char *file, const char *obj, lang_t lang)
 		qfo_t      *qfo;
 
 		class_finish_module ();
-		qfo = qfo_from_progs (&pr);
-		err = qfo_write (qfo, obj);
-		qfo_delete (qfo);
+		err = pr.error_count;
+		if (!err) {
+			qfo = qfo_from_progs (&pr);
+			err = qfo_write (qfo, obj);
+			qfo_delete (qfo);
+		}
 	}
 	return err;
 }
diff --git a/tools/qfcc/source/statements.c b/tools/qfcc/source/statements.c
index f86ae8d47..fae48f153 100644
--- a/tools/qfcc/source/statements.c
+++ b/tools/qfcc/source/statements.c
@@ -83,7 +83,7 @@ operand_string (operand_t *op)
 		case op_def:
 			return op->o.def->name;
 		case op_value:
-			switch (op->o.value->type) {
+			switch (op->o.value->lltype) {
 				case ev_string:
 					return va ("\"%s\"",
 							   quote_string (op->o.value->v.string_val));
@@ -154,7 +154,7 @@ print_operand (operand_t *op)
 			break;
 		case op_value:
 			printf ("(%s) ", pr_type_name[op->type]);
-			switch (op->o.value->type) {
+			switch (op->o.value->lltype) {
 				case ev_string:
 					printf ("\"%s\"", op->o.value->v.string_val);
 					break;
@@ -316,7 +316,7 @@ value_operand (ex_value_t *value)
 {
 	operand_t  *op;
 	op = new_operand (op_value);
-	op->type = value->type;
+	op->type = value->lltype;
 	op->o.value = value;
 	return op;
 }
@@ -337,8 +337,11 @@ alias_operand (etype_t type, operand_t *op)
 {
 	operand_t  *aop;
 
-	if (pr_type_size[type] != pr_type_size[op->type])
-		internal_error (0, "aliasing operand with type of diffent size");
+	if (pr_type_size[type] != pr_type_size[op->type]) {
+		internal_error (0, "\naliasing operand with type of diffent size"
+						" (%d, %d)", pr_type_size[type],
+						pr_type_size[op->type]);
+	}
 	aop = new_operand (op_alias);
 	aop->o.alias = op;
 	aop->type = type;
@@ -659,7 +662,7 @@ expr_call (sblock_t *sblock, expr_t *call, operand_t **op)
 			pref = "R";
 			sblock = statement_subexpr (sblock, param, &arguments[ind]);
 			if (options.code.vector_calls && a->type == ex_value
-				&& a->e.value->type == ev_vector)
+				&& a->e.value->lltype == ev_vector)
 				sblock = vector_call (sblock, a, param, ind, &arguments[ind]);
 			else
 				sblock = statement_subexpr (sblock, a, &arguments[ind]);
@@ -673,7 +676,7 @@ expr_call (sblock_t *sblock, expr_t *call, operand_t **op)
 			sblock = statement_slist (sblock, mov);
 		} else {
 			if (options.code.vector_calls && a->type == ex_value
-				&& a->e.value->type == ev_vector) {
+				&& a->e.value->lltype == ev_vector) {
 				sblock = vector_call (sblock, a, param, ind, 0);
 			} else {
 				operand_t  *p = 0;
@@ -774,7 +777,7 @@ expr_deref (sblock_t *sblock, expr_t *deref, operand_t **op)
 			s->opc = *op;
 			sblock_add_statement (sblock, s);
 		}
-	} else if (e->type == ex_value && e->e.value->type == ev_pointer) {
+	} else if (e->type == ex_value && e->e.value->lltype == ev_pointer) {
 		ex_pointer_t *ptr = &e->e.value->v.pointer;
 		*op = def_operand (alias_def (ptr->def, ptr->type, ptr->val),
 						   ptr->type);
@@ -1017,7 +1020,7 @@ statement_subexpr (sblock_t *sblock, expr_t *e, operand_t **op)
 	if (e->type > ex_value)
 		internal_error (e, "bad expression type");
 	if (!sfuncs[e->type])
-		internal_error (e, "unexpected expression type; %s",
+		internal_error (e, "unexpected expression type: %s",
 						expr_names[e->type]);
 
 	sblock = sfuncs[e->type] (sblock, e, op);
diff --git a/tools/qfcc/source/switch.c b/tools/qfcc/source/switch.c
index 839f7ef4a..e37e5628a 100644
--- a/tools/qfcc/source/switch.c
+++ b/tools/qfcc/source/switch.c
@@ -82,7 +82,7 @@ get_hash (const void *_cl, void *unused)
 	if (!cl->value)
 		return 0;
 	val = get_value (cl->value);
-	return Hash_Buffer (&val->v, sizeof (val->v)) + val->type;
+	return Hash_Buffer (&val->v, sizeof (val->v)) + val->lltype;
 }
 
 static int
diff --git a/tools/qfcc/source/type.c b/tools/qfcc/source/type.c
index c81222db0..2814d8bfd 100644
--- a/tools/qfcc/source/type.c
+++ b/tools/qfcc/source/type.c
@@ -681,6 +681,18 @@ is_scalar (const type_t *type)
 	return is_float (type) || is_integral (type);
 }
 
+int
+is_vector (const type_t *type)
+{
+	return type->type == ev_vector;
+}
+
+int
+is_quaternion (const type_t *type)
+{
+	return type->type == ev_quat;
+}
+
 int
 is_math (const type_t *type)
 {
@@ -714,6 +726,14 @@ is_array (const type_t *type)
 	return 0;
 }
 
+int
+is_func (const type_t *type)
+{
+	if (type->type == ev_func)
+		return 1;
+	return 0;
+}
+
 int
 type_assignable (const type_t *dst, const type_t *src)
 {
diff --git a/tools/qfcc/source/value.c b/tools/qfcc/source/value.c
index f530f3b3a..bdaa9c6f3 100644
--- a/tools/qfcc/source/value.c
+++ b/tools/qfcc/source/value.c
@@ -79,7 +79,7 @@ static uintptr_t
 value_get_hash (const void *_val, void *unused)
 {
 	const ex_value_t *val = (const ex_value_t *) _val;
-	return Hash_Buffer (&val->v, sizeof (val->v)) + val->type;
+	return Hash_Buffer (&val->v, sizeof (val->v)) + val->lltype;
 }
 
 static int
@@ -87,7 +87,7 @@ value_compare (const void *_val1, const void *_val2, void *unused)
 {
 	const ex_value_t *val1 = (const ex_value_t *) _val1;
 	const ex_value_t *val2 = (const ex_value_t *) _val2;
-	if (val1->type != val2->type)
+	if (val1->lltype != val2->lltype)
 		return 0;
 	return memcmp (&val1->v, &val2->v, sizeof (val1->v)) == 0;
 }
@@ -100,6 +100,13 @@ new_value (void)
 	return value;
 }
 
+static void
+set_val_type (ex_value_t *val, type_t *type)
+{
+	val->type = type;
+	val->lltype = low_level_type (type);
+}
+
 static ex_value_t *
 find_value (const ex_value_t *val)
 {
@@ -119,7 +126,7 @@ new_string_val (const char *string_val)
 {
 	ex_value_t  val;
 	memset (&val, 0, sizeof (val));
-	val.type = ev_string;
+	set_val_type (&val, &type_string);
 	if (string_val)
 		val.v.string_val = save_string (string_val);
 	return find_value (&val);
@@ -130,7 +137,7 @@ new_float_val (float float_val)
 {
 	ex_value_t  val;
 	memset (&val, 0, sizeof (val));
-	val.type = ev_float;
+	set_val_type (&val, &type_float);
 	val.v.float_val = float_val;
 	return find_value (&val);
 }
@@ -140,7 +147,7 @@ new_vector_val (const float *vector_val)
 {
 	ex_value_t  val;
 	memset (&val, 0, sizeof (val));
-	val.type = ev_vector;
+	set_val_type (&val, &type_vector);
 	VectorCopy (vector_val, val.v.vector_val);
 	return find_value (&val);
 }
@@ -150,7 +157,7 @@ new_entity_val (int entity_val)
 {
 	ex_value_t  val;
 	memset (&val, 0, sizeof (val));
-	val.type = ev_entity;
+	set_val_type (&val, &type_entity);
 	val.v.entity_val = entity_val;
 	return find_value (&val);
 }
@@ -160,7 +167,7 @@ new_field_val (int field_val, type_t *type, def_t *def)
 {
 	ex_value_t  val;
 	memset (&val, 0, sizeof (val));
-	val.type = ev_field;
+	set_val_type (&val, field_type (type));
 	val.v.pointer.val = field_val;
 	val.v.pointer.type = type;
 	val.v.pointer.def = def;
@@ -172,7 +179,7 @@ new_func_val (int func_val, type_t *type)
 {
 	ex_value_t  val;
 	memset (&val, 0, sizeof (val));
-	val.type = ev_func;
+	set_val_type (&val, type);
 	val.v.func_val.val = func_val;
 	val.v.func_val.type = type;
 	return find_value (&val);
@@ -183,7 +190,7 @@ new_pointer_val (int pointer_val, type_t *type, def_t *def)
 {
 	ex_value_t  val;
 	memset (&val, 0, sizeof (val));
-	val.type = ev_pointer;
+	set_val_type (&val, pointer_type (type));
 	val.v.pointer.val = pointer_val;
 	val.v.pointer.type = type;
 	val.v.pointer.def = def;
@@ -195,7 +202,7 @@ new_quaternion_val (const float *quaternion_val)
 {
 	ex_value_t  val;
 	memset (&val, 0, sizeof (val));
-	val.type = ev_quat;
+	set_val_type (&val, &type_quaternion);
 	QuatCopy (quaternion_val, val.v.quaternion_val);
 	return find_value (&val);
 }
@@ -205,7 +212,7 @@ new_integer_val (int integer_val)
 {
 	ex_value_t  val;
 	memset (&val, 0, sizeof (val));
-	val.type = ev_integer;
+	set_val_type (&val, &type_integer);
 	val.v.integer_val = integer_val;
 	return find_value (&val);
 }
@@ -215,7 +222,7 @@ new_uinteger_val (int uinteger_val)
 {
 	ex_value_t  val;
 	memset (&val, 0, sizeof (val));
-	val.type = ev_uinteger;
+	set_val_type (&val, &type_uinteger);
 	val.v.uinteger_val = uinteger_val;
 	return find_value (&val);
 }
@@ -225,7 +232,7 @@ new_short_val (short short_val)
 {
 	ex_value_t  val;
 	memset (&val, 0, sizeof (val));
-	val.type = ev_short;
+	set_val_type (&val, &type_short);
 	val.v.short_val = short_val;
 	return find_value (&val);
 }
@@ -235,10 +242,13 @@ new_nil_val (type_t *type)
 {
 	ex_value_t  val;
 	memset (&val, 0, sizeof (val));
-	val.type = low_level_type (type);
-	if (val.type == ev_pointer|| val.type == ev_field )
+	set_val_type (&val, type);
+	if (val.lltype == ev_void) {
+		val.lltype = type_nil->type;
+	}
+	if (val.lltype == ev_pointer || val.lltype == ev_field )
 		val.v.pointer.type = type->t.fldptr.type;
-	if (val.type == ev_func)
+	if (val.lltype == ev_func)
 		val.v.func_val.type = type;
 	return find_value (&val);
 }
@@ -333,13 +343,13 @@ ReuseString (const char *str)
 static float
 value_as_float (ex_value_t *value)
 {
-	if (value->type == ev_uinteger)
+	if (value->lltype == ev_uinteger)
 		return value->v.uinteger_val;
-	if (value->type == ev_integer)
+	if (value->lltype == ev_integer)
 		return value->v.integer_val;
-	if (value->type == ev_short)
+	if (value->lltype == ev_short)
 		return value->v.short_val;
-	if (value->type == ev_float)
+	if (value->lltype == ev_float)
 		return value->v.float_val;
 	return 0;
 }
@@ -347,13 +357,13 @@ value_as_float (ex_value_t *value)
 static int
 value_as_int (ex_value_t *value)
 {
-	if (value->type == ev_uinteger)
+	if (value->lltype == ev_uinteger)
 		return value->v.uinteger_val;
-	if (value->type == ev_integer)
+	if (value->lltype == ev_integer)
 		return value->v.integer_val;
-	if (value->type == ev_short)
+	if (value->lltype == ev_short)
 		return value->v.short_val;
-	if (value->type == ev_float)
+	if (value->lltype == ev_float)
 		return value->v.float_val;
 	return 0;
 }
@@ -361,13 +371,13 @@ value_as_int (ex_value_t *value)
 static unsigned
 value_as_uint (ex_value_t *value)
 {
-	if (value->type == ev_uinteger)
+	if (value->lltype == ev_uinteger)
 		return value->v.uinteger_val;
-	if (value->type == ev_integer)
+	if (value->lltype == ev_integer)
 		return value->v.integer_val;
-	if (value->type == ev_short)
+	if (value->lltype == ev_short)
 		return value->v.short_val;
-	if (value->type == ev_float)
+	if (value->lltype == ev_float)
 		return value->v.float_val;
 	return 0;
 }
@@ -375,7 +385,7 @@ value_as_uint (ex_value_t *value)
 ex_value_t *
 convert_value (ex_value_t *value, type_t *type)
 {
-	if (!is_scalar (type) || !is_scalar (ev_types[value->type])) {
+	if (!is_scalar (type) || !is_scalar (ev_types[value->lltype])) {
 		error (0, "unable to convert non-scalar value");
 		return value;
 	}
@@ -400,12 +410,12 @@ alias_value (ex_value_t *value, type_t *type)
 {
 	ex_value_t  new;
 
-	if (type_size (type) != type_size (ev_types[value->type])) {
+	if (type_size (type) != type_size (ev_types[value->lltype])) {
 		error (0, "unable to alias different sized values");
 		return value;
 	}
 	new = *value;
-	new.type = type->type;
+	set_val_type (&new, type);
 	return find_value (&new);
 }
 
@@ -436,9 +446,9 @@ emit_value (ex_value_t *value, def_t *def)
 		clear_immediates ();
 	}
 	cn = 0;
-	if (val.type == ev_void)
-		val.type = type_nil->type;
-	switch (val.type) {
+//	if (val.type == ev_void)
+//		val.type = type_nil->type;
+	switch (val.lltype) {
 		case ev_entity:
 			tab = entity_imm_defs;
 			type = &type_entity;
@@ -463,7 +473,7 @@ emit_value (ex_value_t *value, def_t *def)
 				break;
 			}
 			val.v.float_val = val.v.integer_val;
-			val.type = ev_float;
+			val.lltype = ev_float;
 		case ev_float:
 			tab = float_imm_defs;
 			type = &type_float;
@@ -528,7 +538,7 @@ emit_value (ex_value_t *value, def_t *def)
 	cn->initialized = cn->constant = 1;
 	cn->nosave = 1;
 	// copy the immediate to the global area
-	switch (val.type) {
+	switch (val.lltype) {
 		case ev_string:
 			reloc_def_string (cn);
 			break;
diff --git a/tools/qfcc/test/quaternion.r b/tools/qfcc/test/quaternion.r
index f5f2c889a..6ac67911a 100644
--- a/tools/qfcc/test/quaternion.r
+++ b/tools/qfcc/test/quaternion.r
@@ -43,7 +43,7 @@ test_format ()
 		printf ("q = [[5, 6, 7], 8] -> %v, %g\n", q.v, q.s);
 		fail = 1;
 	}
-/*	q = [s, v];
+	q = [s, v];
 	if (q.x != v.x || q.y != v.y || q.z != v.z || q.w != s) {
 		printf ("q = [s, v] -> %q (%v)\n", q, v);
 		fail = 1;
@@ -60,7 +60,7 @@ test_format ()
 	if (q.v != v || q.s != s) {
 		printf ("q = [v, s] -> %v, %g (%v %s)\n", q.v, q.s, v, s);
 		fail = 1;
-	}*/
+	}
 	return fail;
 }
 

From 4828934e50c3eab8063ac55a150067758524ecf9 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 12 Oct 2018 23:39:05 +0900
Subject: [PATCH 0183/1519] Fix a equality check typo.

Fixes bad code generation when assigning to vector.x in a function with no
parameters and the vector is the first local var.
---
 tools/qfcc/source/expr_assign.c |  2 +-
 tools/qfcc/test/vecinit.r       | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/tools/qfcc/source/expr_assign.c b/tools/qfcc/source/expr_assign.c
index 0a1a82b6d..6ba4690e2 100644
--- a/tools/qfcc/source/expr_assign.c
+++ b/tools/qfcc/source/expr_assign.c
@@ -239,7 +239,7 @@ static __attribute__((pure)) int
 is_const_ptr (expr_t *e)
 {
 	if ((e->type != ex_value || e->e.value->lltype != ev_pointer)
-		|| !(POINTER_VAL (e->e.value->v.pointer) > 0
+		|| !(POINTER_VAL (e->e.value->v.pointer) >= 0
 			 && POINTER_VAL (e->e.value->v.pointer) < 65536)) {
 		return 1;
 	}
diff --git a/tools/qfcc/test/vecinit.r b/tools/qfcc/test/vecinit.r
index 6503b390d..d26a94404 100644
--- a/tools/qfcc/test/vecinit.r
+++ b/tools/qfcc/test/vecinit.r
@@ -8,6 +8,20 @@ foo (float x, float y, float z)
 	return v;
 }
 
+float w;
+float h;
+
+vector
+bar (void)
+{
+	vector      pos;
+
+	pos.x = w;
+	pos.y = h;
+	pos.z = 0;
+	return pos;
+}
+
 int
 main ()
 {

From 2f2edae43b9b5d316ad1d4cbf45c45860a1bee18 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 13 Oct 2018 09:31:00 +0900
Subject: [PATCH 0184/1519] Make error, warning and notice give compiler
 file/line too.

But only when verbosity > 1 (-vv).
---
 tools/qfcc/include/diagnostic.h | 28 +++++++++++++++++++---------
 tools/qfcc/source/diagnostic.c  | 24 +++++++++++++++++-------
 tools/qfcc/source/stub.c        |  4 ++--
 3 files changed, 38 insertions(+), 18 deletions(-)

diff --git a/tools/qfcc/include/diagnostic.h b/tools/qfcc/include/diagnostic.h
index 99a542762..bd32711f8 100644
--- a/tools/qfcc/include/diagnostic.h
+++ b/tools/qfcc/include/diagnostic.h
@@ -44,21 +44,31 @@ extern diagnostic_hook error_hook;
 extern diagnostic_hook warning_hook;
 extern diagnostic_hook notice_hook;
 
-struct expr_s *error (struct expr_s *e, const char *fmt, ...)
-	__attribute__ ((format (printf, 2, 3)));
-void
-_internal_error (struct expr_s *e, const char *file, int line,
-				 const char *fmt, ...)
+struct expr_s *_error (struct expr_s *e, const char *file, int line,
+					   const char *fmt, ...)
+	__attribute__ ((format (printf, 4, 5)));
+#define error(e, fmt...) _error(e, __FILE__, __LINE__, fmt)
+
+void _internal_error (struct expr_s *e, const char *file, int line,
+					  const char *fmt, ...)
 	__attribute__ ((format (printf, 4, 5), noreturn));
 #define internal_error(e, fmt...) _internal_error(e, __FILE__, __LINE__, fmt)
-struct expr_s *warning (struct expr_s *e, const char *fmt, ...)
-	__attribute__ ((format (printf, 2, 3)));
-struct expr_s *notice (struct expr_s *e, const char *fmt, ...)
-	__attribute__ ((format (printf, 2, 3)));
+
+struct expr_s *_warning (struct expr_s *e, const char *file, int line,
+						 const char *fmt, ...)
+	__attribute__ ((format (printf, 4, 5)));
+#define warning(e, fmt...) _warning(e, __FILE__, __LINE__, fmt)
+
+struct expr_s *_notice (struct expr_s *e, const char *file, int line,
+						const char *fmt, ...)
+	__attribute__ ((format (printf, 4, 5)));
+#define notice(e, fmt...) _notice(e, __FILE__, __LINE__, fmt)
+
 void _debug (struct expr_s *e, const char *file, int line,
 			 const char *fmt, ...)
 	__attribute__ ((format (printf, 4, 5)));
 #define debug(e, fmt...) _debug(e, __FILE__, __LINE__, fmt)
+
 void _bug (struct expr_s *e, const char *file, int line, const char *fmt, ...)
 	__attribute__ ((format (printf, 4, 5)));
 #define bug(e, fmt...) _bug(e, __FILE__, __LINE__, fmt)
diff --git a/tools/qfcc/source/diagnostic.c b/tools/qfcc/source/diagnostic.c
index da2f01969..85e2b6d27 100644
--- a/tools/qfcc/source/diagnostic.c
+++ b/tools/qfcc/source/diagnostic.c
@@ -95,8 +95,9 @@ format_message (dstring_t *message, const char *msg_type, expr_t *e,
 	}
 }
 
-static __attribute__((format(printf, 2, 0))) void
-_warning (expr_t *e, const char *fmt, va_list args)
+static __attribute__((format(printf, 4, 0))) void
+__warning (expr_t *e, const char *file, int line,
+		   const char *fmt, va_list args)
 {
 	dstring_t  *message = dstring_new ();
 
@@ -108,6 +109,9 @@ _warning (expr_t *e, const char *fmt, va_list args)
 	}
 
 	format_message (message, "warning", e, fmt, args);
+	if (options.verbosity > 1) {
+		dasprintf (message, " (%s:%d)", file, line);
+	}
 	if (warning_hook) {
 		warning_hook (message->str);
 	} else {
@@ -161,7 +165,7 @@ _bug (expr_t *e, const char *file, int line, const char *fmt, ...)
 }
 
 expr_t *
-notice (expr_t *e, const char *fmt, ...)
+_notice (expr_t *e, const char *file, int line, const char *fmt, ...)
 {
 	va_list     args;
 
@@ -170,13 +174,16 @@ notice (expr_t *e, const char *fmt, ...)
 
 	va_start (args, fmt);
 	if (options.notices.promote) {
-		_warning (e, fmt, args);
+		__warning (e, file, line, fmt, args);
 	} else {
 		dstring_t  *message = dstring_new ();
 
 		report_function (e);
 
 		format_message (message, "notice", e, fmt, args);
+		if (options.verbosity > 1) {
+			dasprintf (message, " (%s:%d)", file, line);
+		}
 		if (notice_hook) {
 			notice_hook (message->str);
 		} else {
@@ -189,12 +196,12 @@ notice (expr_t *e, const char *fmt, ...)
 }
 
 expr_t *
-warning (expr_t *e, const char *fmt, ...)
+_warning (expr_t *e, const char *file, int line, const char *fmt, ...)
 {
 	va_list     args;
 
 	va_start (args, fmt);
-	_warning (e, fmt, args);
+	__warning (e, file, line, fmt, args);
 	va_end (args);
 	return e;
 }
@@ -220,7 +227,7 @@ _internal_error (expr_t *e, const char *file, int line, const char *fmt, ...)
 }
 
 expr_t *
-error (expr_t *e, const char *fmt, ...)
+_error (expr_t *e, const char *file, int line, const char *fmt, ...)
 {
 	va_list     args;
 
@@ -233,6 +240,9 @@ error (expr_t *e, const char *fmt, ...)
 		dstring_t  *message = dstring_new ();
 
 		format_message (message, "error", e, fmt, args);
+		if (options.verbosity > 1) {
+			dasprintf (message, " (%s:%d)", file, line);
+		}
 		if (error_hook) {
 			error_hook (message->str);
 		} else {
diff --git a/tools/qfcc/source/stub.c b/tools/qfcc/source/stub.c
index 117b19a8e..c10aff34a 100644
--- a/tools/qfcc/source/stub.c
+++ b/tools/qfcc/source/stub.c
@@ -29,5 +29,5 @@ __attribute__((const)) codespace_t *codespace_new (void) {return 0;}
 void codespace_addcode (codespace_t *codespace, struct dstatement_s *code, int size) {}
 __attribute__((const)) int function_parms (function_t *f, byte *parm_size) {return 0;}
 void def_to_ddef (def_t *def, ddef_t *ddef, int aux) {}
-__attribute__((const)) expr_t *warning (expr_t *e, const char *fmt, ...) {return 0;}
-__attribute__((const)) expr_t *error (expr_t *e, const char *fmt, ...) {return 0;}
+__attribute__((const)) expr_t *_warning (expr_t *e, const char *file, int line, const char *fmt, ...) {return 0;}
+__attribute__((const)) expr_t *_error (expr_t *e, const char *file, int line, const char *fmt, ...) {return 0;}

From aaab18c9a7bf8a37f773f88426a103ea909a1c9f Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 13 Oct 2018 12:07:50 +0900
Subject: [PATCH 0185/1519] Nuke a dead field.

It looks like ex_temp_t.expr was never really used, and I have no idea
what I had intended (not surprising after ~17 years).
---
 tools/qfcc/include/expr.h | 1 -
 tools/qfcc/source/expr.c  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/tools/qfcc/include/expr.h b/tools/qfcc/include/expr.h
index 466a11ec1..1b0206995 100644
--- a/tools/qfcc/include/expr.h
+++ b/tools/qfcc/include/expr.h
@@ -91,7 +91,6 @@ typedef struct {
 } ex_block_t;
 
 typedef struct {
-	struct expr_s *expr;
 	struct operand_s *op;	///< The operand for the temporary variable, if
 							///< allocated
 	struct type_s *type;	///< The type of the temporary variable.
diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index a4fbf76ac..94fda5f37 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -426,7 +426,6 @@ copy_expr (expr_t *e)
 			*n = *e;
 			n->line = pr.source_line;
 			n->file = pr.source_file;
-			n->e.temp.expr = copy_expr (e->e.temp.expr);
 			return n;
 		case ex_vector:
 			n = new_expr ();

From 0f5f2a125a6fa5c00f4f7ed5500eb7e344159bc7 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 13 Oct 2018 23:23:45 +0900
Subject: [PATCH 0186/1519] Use a reliable reference for calculating progs
 offsets.

Now that pr->zone can be null, it cannot be used as a reference. Fixes
random crashes when using qfprogs (random due to heap randomization).
---
 libs/gamecode/pr_load.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/libs/gamecode/pr_load.c b/libs/gamecode/pr_load.c
index 721b26bd7..9fee72574 100644
--- a/libs/gamecode/pr_load.c
+++ b/libs/gamecode/pr_load.c
@@ -116,6 +116,7 @@ PR_LoadProgsFile (progs_t *pr, QFile *file, int size)
 	int         offset_tweak;
 	dprograms_t progs;
 	byte       *base;
+	byte       *heap;
 
 	if (!pr->file_error)
 		pr->file_error = file_error;
@@ -199,6 +200,7 @@ PR_LoadProgsFile (progs_t *pr, QFile *file, int size)
 	Qread (file, base, size - sizeof (progs));
 	CRC_ProcessBlock (base, &pr->crc, size - sizeof (progs));
 	base -= sizeof (progs);	// offsets are from file start
+	heap = ((byte *) pr->progs + pr->progs_size + pr->pr_edictareasize);
 
 	if (pr->edicts) {
 		*pr->edicts = (edict_t *)((byte *) pr->progs + pr->progs_size);
@@ -207,20 +209,19 @@ PR_LoadProgsFile (progs_t *pr, QFile *file, int size)
 	if (pr->zone_size) {
 		//FIXME zone_size needs to be at least as big as memzone_t, but
 		//memzone_t is opaque so its size is unknown
-		pr->zone = (memzone_t *)((byte *) pr->progs + pr->progs_size
-								 + pr->pr_edictareasize);
+		pr->zone = (memzone_t *) heap;
 	}
 
 	pr->pr_functions =
 		(dfunction_t *) (base + pr->progs->ofs_functions);
 	pr->pr_strings = (char *) base + pr->progs->ofs_strings;
-	pr->pr_stringsize = (char *) pr->zone + pr->zone_size - (char *) base;
+	pr->pr_stringsize = (char *) heap + pr->zone_size - (char *) base;
 	pr->pr_globaldefs = (ddef_t *) (base + pr->progs->ofs_globaldefs);
 	pr->pr_fielddefs = (ddef_t *) (base + pr->progs->ofs_fielddefs);
 	pr->pr_statements = (dstatement_t *) (base + pr->progs->ofs_statements);
 
 	pr->pr_globals = (pr_type_t *) (base + pr->progs->ofs_globals);
-	pr->stack = (pr_type_t *) ((byte *) pr->zone + pr->zone_size);
+	pr->stack = (pr_type_t *) ((byte *) heap + pr->zone_size);
 	pr->stack_bottom = pr->stack - pr->pr_globals;
 	pr->globals_size = (pr_type_t *) ((byte *) pr->stack + pr->stack_size)
 						- pr->pr_globals;

From 6c53be928bb8588067944d3adf4c66b7e7cc6959 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 13 Oct 2018 23:32:53 +0900
Subject: [PATCH 0187/1519] Support returning vector expressions.

Currently fails due to a scheduling problem when the vector expression
contains functions.
---
 tools/qfcc/include/expr.h       |  2 +-
 tools/qfcc/source/expr.c        |  7 ++++++-
 tools/qfcc/source/expr_assign.c |  2 --
 tools/qfcc/test/Makefile.am     |  9 +++++++++
 tools/qfcc/test/vecexpr.r       | 23 +++++++++++++++++++++++
 5 files changed, 39 insertions(+), 4 deletions(-)
 create mode 100644 tools/qfcc/test/vecexpr.r

diff --git a/tools/qfcc/include/expr.h b/tools/qfcc/include/expr.h
index 1b0206995..08614f2ce 100644
--- a/tools/qfcc/include/expr.h
+++ b/tools/qfcc/include/expr.h
@@ -625,7 +625,7 @@ expr_t *build_for_statement (expr_t *init, expr_t *test, expr_t *next,
 							 expr_t *break_label, expr_t *continue_label);
 expr_t *build_state_expr (expr_t *e);
 expr_t *think_expr (struct symbol_s *think_sym);
-expr_t *assign_expr (expr_t *e1, expr_t *e2);
+expr_t *assign_expr (expr_t *dst, expr_t *src);
 expr_t *cast_expr (struct type_s *t, expr_t *e);
 
 const char *get_op_string (int op) __attribute__((const));
diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index 94fda5f37..30473cdea 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -1999,8 +1999,13 @@ return_expr (function_t *f, expr_t *e)
 			warning (e, "type mismatch for return value of %s",
 					 f->sym->name);
 	} else {
-		if (f->sym->type->t.func.type != t)
+		if (f->sym->type->t.func.type != t) {
 			e = cast_expr (f->sym->type->t.func.type, e);
+			t = f->sym->type->t.func.type;
+		}
+	}
+	if (e->type == ex_vector) {
+		e = assign_expr (new_ret_expr (t), e);
 	}
 	return new_unary_expr ('r', e);
 }
diff --git a/tools/qfcc/source/expr_assign.c b/tools/qfcc/source/expr_assign.c
index 6ba4690e2..730396dfa 100644
--- a/tools/qfcc/source/expr_assign.c
+++ b/tools/qfcc/source/expr_assign.c
@@ -258,8 +258,6 @@ is_indirect (expr_t *e)
 	return is_const_ptr (e->e.expr.e1);
 }
 
-expr_t *
-aassign_expr (expr_t *dst, expr_t *src);
 expr_t *
 assign_expr (expr_t *dst, expr_t *src)
 {
diff --git a/tools/qfcc/test/Makefile.am b/tools/qfcc/test/Makefile.am
index 1ecb95fb4..352254f9b 100644
--- a/tools/qfcc/test/Makefile.am
+++ b/tools/qfcc/test/Makefile.am
@@ -45,6 +45,7 @@ test_progs_dat=\
 	structptr.dat \
 	swap.dat \
 	triangle.dat \
+	vecexpr.dat \
 	vecinit.dat \
 	while.dat \
 	voidfor.dat
@@ -195,6 +196,14 @@ triangle.run: Makefile build-run
 	$(srcdir)/build-run $@ 100000 100000 1.00005 50002.4961
 include ./$(DEPDIR)/triangle.Qo
 
+vecexpr_dat_SOURCES=vecexpr.r
+vecexpr_obj=$(vecexpr_dat_SOURCES:.r=.qfo)
+vecexpr.dat$(EXEEXT): $(vecexpr_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(vecexpr_obj)
+vecexpr.run: Makefile build-run
+	$(srcdir)/build-run $@
+include ./$(DEPDIR)/vecexpr.Qo
+
 vecinit_dat_SOURCES=vecinit.r
 vecinit_obj=$(vecinit_dat_SOURCES:.r=.qfo)
 vecinit.dat$(EXEEXT): $(vecinit_obj) $(QFCC_DEP)
diff --git a/tools/qfcc/test/vecexpr.r b/tools/qfcc/test/vecexpr.r
new file mode 100644
index 000000000..74bf6e0b1
--- /dev/null
+++ b/tools/qfcc/test/vecexpr.r
@@ -0,0 +1,23 @@
+vector
+t1()
+{
+	return [1, 2, 3];
+}
+
+vector
+t2(float x)
+{
+	return [x, x, x];
+}
+
+vector
+t3(float x)
+{
+	return [x, t2(9).z, x];
+}
+
+int
+main ()
+{
+	return t3(5) == '5 9 5' ? 0 : 1;
+}

From 2a2754e5811d12d4d19b5f89666a6fec3fdeaed1 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 15 Oct 2018 19:48:19 +0900
Subject: [PATCH 0188/1519] More ways to break qfcc :/

---
 tools/qfcc/test/vecexpr.r | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/qfcc/test/vecexpr.r b/tools/qfcc/test/vecexpr.r
index 74bf6e0b1..59cc66b4a 100644
--- a/tools/qfcc/test/vecexpr.r
+++ b/tools/qfcc/test/vecexpr.r
@@ -19,5 +19,5 @@ t3(float x)
 int
 main ()
 {
-	return t3(5) == '5 9 5' ? 0 : 1;
+	return t3(5) == [5, 9, 5] ? 0 : 1;
 }

From 302934a1e4042c2579f42f1d6666180386d33a15 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 15 Oct 2018 20:52:46 +0900
Subject: [PATCH 0189/1519] Remove some dead code.

---
 tools/qfcc/source/expr.c | 30 ------------------------------
 1 file changed, 30 deletions(-)

diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index 30473cdea..0d82e9629 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -2489,36 +2489,6 @@ think_expr (symbol_t *think_sym)
 	return new_symbol_expr (think_sym);
 }
 
-static inline __attribute__((pure)) int
-is_lvalue (expr_t *e)
-{
-	if (e->type == ex_symbol) {
-		switch (e->e.symbol->sy_type) {
-			case sy_var:
-				return 1;
-			case sy_const:
-				return 0;
-			case sy_type:
-				return 0;
-			case sy_expr:
-				return 0;
-			case sy_func:
-				return 0;
-			case sy_class:
-				return 0;
-		}
-	}
-	if (e->type == ex_temp)
-		return 1;
-	if (e->type == ex_expr && e->e.expr.op == '.')
-		return 1;
-	if (e->type == ex_uexpr && e->e.expr.op == '.')
-		return 1;
-	if (e->type == ex_uexpr && e->e.expr.op == 'A')
-		return is_lvalue (e->e.expr.e1);
-	return 0;
-}
-
 expr_t *
 cast_expr (type_t *type, expr_t *e)
 {

From 1746ce3af564484d032cc81352500d829675d6b5 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 15 Oct 2018 20:54:05 +0900
Subject: [PATCH 0190/1519] Make int type name reflect its keyword.

Makes qc error messages make more sense.
---
 tools/qfcc/source/type.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/qfcc/source/type.c b/tools/qfcc/source/type.c
index 2814d8bfd..cc95de7ee 100644
--- a/tools/qfcc/source/type.c
+++ b/tools/qfcc/source/type.c
@@ -73,8 +73,8 @@ type_t      type_field = {ev_field, "field", ty_none, {{&type_void}} };
 type_t      type_function = { ev_func, "function", ty_none, {{&type_void}} };
 type_t      type_pointer = { ev_pointer, "pointer", ty_none, {{&type_void}} };
 type_t      type_quaternion = { ev_quat, "quaternion" };
-type_t      type_integer = { ev_integer, "integer" };
-type_t      type_uinteger = { ev_uinteger, "uinteger" };
+type_t      type_integer = { ev_integer, "int" };
+type_t      type_uinteger = { ev_uinteger, "uint" };
 type_t      type_short = { ev_short, "short" };
 
 type_t     *type_nil;

From ff5c1cd4c2756000754057e9ebb1f62aa9aaa45f Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 15 Oct 2018 22:11:20 +0900
Subject: [PATCH 0191/1519] Clean up redundant type parameter to
 initialize_def.

---
 tools/qfcc/include/def.h     |  4 +--
 tools/qfcc/source/def.c      | 28 ++++++++----------
 tools/qfcc/source/expr.c     |  5 ++--
 tools/qfcc/source/function.c |  6 ++--
 tools/qfcc/source/qc-parse.y | 57 ++++++++++++++++--------------------
 tools/qfcc/source/qp-parse.y |  4 +--
 tools/qfcc/source/switch.c   |  7 +++--
 7 files changed, 49 insertions(+), 62 deletions(-)

diff --git a/tools/qfcc/include/def.h b/tools/qfcc/include/def.h
index e22ab8c7e..db2332cb1 100644
--- a/tools/qfcc/include/def.h
+++ b/tools/qfcc/include/def.h
@@ -237,13 +237,11 @@ void def_to_ddef (def_t *def, ddef_t *ddef, int aux);
 	For \a space and \a storage, see new_def().
 
 	\param sym		The symbol for which to create and initialize a def.
-	\param type		The type of the def. sym_t::type is set to this. If null,
-					the default type is used.
 	\param init		If not null, the expressions to use to initialize the def.
 	\param space	The space from which to allocate space for the def.
 	\param storage	The storage class of the def.
 */
-void initialize_def (struct symbol_s *sym, struct type_s *type,
+void initialize_def (struct symbol_s *sym,
 					 struct expr_s *init, struct defspace_s *space,
 					 storage_class_t storage);
 
diff --git a/tools/qfcc/source/def.c b/tools/qfcc/source/def.c
index 346ee9b9d..2f5d97c5d 100644
--- a/tools/qfcc/source/def.c
+++ b/tools/qfcc/source/def.c
@@ -484,19 +484,14 @@ init_field_def (def_t *def, expr_t *init, storage_class_t storage)
 }
 
 void
-initialize_def (symbol_t *sym, type_t *type, expr_t *init, defspace_t *space,
+initialize_def (symbol_t *sym, expr_t *init, defspace_t *space,
 				storage_class_t storage)
 {
 	symbol_t   *check = symtab_lookup (current_symtab, sym->name);
 	reloc_t    *relocs = 0;
 
-	if (!type) {
-		warning (0, "type for %s defaults to %s", sym->name,
-				 type_default->name);
-		type = type_default;
-	}
 	if (check && check->table == current_symtab) {
-		if (check->sy_type != sy_var || check->type != type) {
+		if (check->sy_type != sy_var || check->type != sym->type) {
 			error (0, "%s redefined", sym->name);
 		} else {
 			// is var and same type
@@ -514,7 +509,7 @@ initialize_def (symbol_t *sym, type_t *type, expr_t *init, defspace_t *space,
 			sym = check;
 		}
 	}
-	sym->type = type;
+	sym->sy_type = sy_var;
 	if (!sym->table)
 		symtab_addsymbol (current_symtab, sym);
 //	if (storage == sc_global && init && is_scalar (type)) {
@@ -535,12 +530,13 @@ initialize_def (symbol_t *sym, type_t *type, expr_t *init, defspace_t *space,
 		sym->s.def = 0;
 	}
 	if (!sym->s.def) {
-		sym->s.def = new_def (sym->name, type, space, storage);
+		sym->s.def = new_def (sym->name, sym->type, space, storage);
 		reloc_attach_relocs (relocs, &sym->s.def->relocs);
 	}
-	if (type == &type_vector && options.code.vector_components)
+	if (sym->type == &type_vector && options.code.vector_components)
 		init_vector_components (sym, 0);
-	if (type->type == ev_field && storage != sc_local && storage != sc_param)
+	if (sym->type->type == ev_field && storage != sc_local
+		&& storage != sc_param)
 		init_field_def (sym->s.def, init, storage);
 	if (storage == sc_extern) {
 		if (init)
@@ -553,14 +549,14 @@ initialize_def (symbol_t *sym, type_t *type, expr_t *init, defspace_t *space,
 	if (init->type == ex_error)
 		return;
 	if (init->type == ex_nil)
-		convert_nil (init, type);
-	if ((is_array (type) || is_struct (type)
-		 || type == &type_vector || type == &type_quaternion)
+		convert_nil (init, sym->type);
+	if ((is_array (sym->type) || is_struct (sym->type)
+		 || sym->type == &type_vector || sym->type == &type_quaternion)
 		&& init->type == ex_block && !init->e.block.result) {
 		init_elements (sym->s.def, init);
 		sym->s.def->initialized = 1;
 	} else {
-		if (!type_assignable (type, get_type (init))) {
+		if (!type_assignable (sym->type, get_type (init))) {
 			error (init, "type mismatch in initializer");
 			return;
 		}
@@ -589,7 +585,7 @@ initialize_def (symbol_t *sym, type_t *type, expr_t *init, defspace_t *space,
 								 v->v.string_val);
 				} else {
 					memcpy (D_POINTER (void, sym->s.def), &v->v,
-							type_size (type) * sizeof (pr_type_t));
+							type_size (sym->type) * sizeof (pr_type_t));
 				}
 			}
 			sym->s.def->initialized = sym->s.def->constant = 1;
diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index 0d82e9629..53b17987f 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -2615,9 +2615,8 @@ super_expr (class_type_t *class_type)
 
 	sym = symtab_lookup (current_symtab, ".super");
 	if (!sym || sym->table != current_symtab) {
-		sym = new_symbol (".super");
-		initialize_def (sym, &type_obj_super, 0, current_symtab->space,
-						sc_local);
+		sym = new_symbol_type (".super", &type_obj_super);
+		initialize_def (sym, 0, current_symtab->space, sc_local);
 	}
 	super = new_symbol_expr (sym);
 
diff --git a/tools/qfcc/source/function.c b/tools/qfcc/source/function.c
index 873f734b6..c5736f8cc 100644
--- a/tools/qfcc/source/function.c
+++ b/tools/qfcc/source/function.c
@@ -463,7 +463,7 @@ build_scope (symbol_t *fsym, symtab_t *parent)
 
 	if (fsym->type->t.func.num_params < 0) {
 		args = new_symbol_type (".args", &type_va_list);
-		initialize_def (args, args->type, 0, symtab->space, sc_param);
+		initialize_def (args, 0, symtab->space, sc_param);
 	}
 
 	for (p = fsym->params, i = 0; p; p = p->next) {
@@ -476,14 +476,14 @@ build_scope (symbol_t *fsym, symtab_t *parent)
 			p->name = save_string ("");
 		}
 		param = new_symbol_type (p->name, p->type);
-		initialize_def (param, param->type, 0, symtab->space, sc_param);
+		initialize_def (param, 0, symtab->space, sc_param);
 		i++;
 	}
 
 	if (args) {
 		while (i < MAX_PARMS) {
 			param = new_symbol_type (va (".par%d", i), &type_param);
-			initialize_def (param, &type_param, 0, symtab->space, sc_param);
+			initialize_def (param, 0, symtab->space, sc_param);
 			i++;
 		}
 	}
diff --git a/tools/qfcc/source/qc-parse.y b/tools/qfcc/source/qc-parse.y
index 2ab9d4144..5ec3ad2f2 100644
--- a/tools/qfcc/source/qc-parse.y
+++ b/tools/qfcc/source/qc-parse.y
@@ -252,6 +252,17 @@ spec_merge (specifier_t spec, specifier_t new)
 	return spec;
 }
 
+static specifier_t
+default_type (specifier_t spec, symbol_t *sym)
+{
+	if (!spec.type) {
+		spec.type = type_default;
+		warning (0, "type defaults to '%s' in declaration of '%s'",
+				 type_default->name, sym->name);
+	}
+	return spec;
+}
+
 %}
 
 %expect 0
@@ -382,48 +393,35 @@ external_decl_list
 external_decl
 	: var_decl
 		{
-			specifier_t spec = $<spec>0;
-			type_t     *type;
-
-			if (!spec.type)
-				spec.type = type_default;
-			type = find_type (append_type ($1->type, spec.type));
+			specifier_t spec = default_type ($<spec>0, $1);
+			$1->type = find_type (append_type ($1->type, spec.type));
 			if (spec.is_typedef) {
-				$1->type = type;
 				$1->sy_type = sy_type;
 				symtab_addsymbol (current_symtab, $1);
 			} else {
-				initialize_def ($1, type, 0, current_symtab->space,
-								spec.storage);
+				initialize_def ($1, 0, current_symtab->space, spec.storage);
 				if ($1->s.def)
 					$1->s.def->nosave |= spec.nosave;
 			}
 		}
 	| var_decl var_initializer
 		{
-			specifier_t spec = $<spec>0;
-			type_t     *type;
+			specifier_t spec = default_type ($<spec>0, $1);
 
-			if (!spec.type)
-				spec.type = type_default;
-			type = find_type (append_type ($1->type, spec.type));
+			$1->type = find_type (append_type ($1->type, spec.type));
 			if (spec.is_typedef) {
 				error (0, "typedef %s is initialized", $1->name);
-				$1->type = type;
 				$1->sy_type = sy_type;
 				symtab_addsymbol (current_symtab, $1);
 			} else {
-				initialize_def ($1, type, $2, current_symtab->space,
-								spec.storage);
+				initialize_def ($1, $2, current_symtab->space, spec.storage);
 				if ($1->s.def)
 					$1->s.def->nosave |= spec.nosave;
 			}
 		}
 	| function_decl
 		{
-			specifier_t spec = $<spec>0;
-			if (!spec.type)
-				spec.type = type_default;
+			specifier_t spec = default_type ($<spec>0, $1);
 			$1->type = find_type (append_type ($1->type, spec.type));
 			if (spec.is_typedef) {
 				$1->sy_type = sy_type;
@@ -903,19 +901,16 @@ decl
 	: function_decl							{}
 	| var_decl opt_initializer
 		{
-			specifier_t spec = $<spec>0;
-			type_t     *type;
-			storage_class_t sc = $<spec>0.storage;
+			specifier_t spec = default_type ($<spec>0, $1);
+			storage_class_t sc = spec.storage;
 			struct defspace_s *space = current_symtab->space;
 
-			if (!spec.type)
-				spec.type = type_default;
 			if (sc == sc_static)
 				space = pr.near_data;
-			type = find_type (append_type ($1->type, spec.type));
-			initialize_def ($1, type, $2, space, sc);
+			$1->type = find_type (append_type ($1->type, spec.type));
+			initialize_def ($1, $2, space, sc);
 			if ($1->s.def)
-				$1->s.def->nosave |= $<spec>0.nosave;
+				$1->s.def->nosave |= spec.nosave;
 		}
 	;
 
@@ -974,8 +969,7 @@ non_code_func
 		{
 			symbol_t   *sym = $<symbol>0;
 			specifier_t spec = $<spec>-1;
-			initialize_def (sym, sym->type, $2, current_symtab->space,
-							spec.storage);
+			initialize_def (sym, $2, current_symtab->space, spec.storage);
 			if (sym->s.def)
 				sym->s.def->nosave |= spec.nosave;
 		}
@@ -988,8 +982,7 @@ non_code_func
 				if (sym->sy_type == sy_func)
 					make_function (sym, 0, sym->table->space, spec.storage);
 			} else {
-				initialize_def (sym, sym->type, 0, current_symtab->space,
-								spec.storage);
+				initialize_def (sym, 0, current_symtab->space, spec.storage);
 				if (sym->s.def)
 					sym->s.def->nosave |= spec.nosave;
 			}
diff --git a/tools/qfcc/source/qp-parse.y b/tools/qfcc/source/qp-parse.y
index 9731402a5..922068b02 100644
--- a/tools/qfcc/source/qp-parse.y
+++ b/tools/qfcc/source/qp-parse.y
@@ -207,8 +207,8 @@ declarations
 		{
 			while ($3) {
 				symbol_t   *next = $3->next;
-				initialize_def ($3, $5, 0, current_symtab->space,
-								current_storage);
+				$3->type = $5;
+				initialize_def ($3, 0, current_symtab->space, current_storage);
 				$3 = next;
 			}
 		}
diff --git a/tools/qfcc/source/switch.c b/tools/qfcc/source/switch.c
index e37e5628a..0ff624b95 100644
--- a/tools/qfcc/source/switch.c
+++ b/tools/qfcc/source/switch.c
@@ -345,9 +345,10 @@ build_switch (expr_t *sw, case_node_t *tree, int op, expr_t *sw_val,
 			tree->labels[i]->e.label.used++;
 			append_expr (table_init, address_expr (tree->labels[i], 0, 0));
 		}
-		table_sym = new_symbol (table_name);
-		initialize_def (table_sym, array_type (&type_integer, high - low + 1),
-						table_init, pr.near_data, sc_static);
+		table_sym = new_symbol_type (table_name,
+									 array_type (&type_integer,
+												 high - low + 1));
+		initialize_def (table_sym, table_init, pr.near_data, sc_static);
 		table_expr = new_symbol_expr (table_sym);
 
 		if (tree->left) {

From 607ec3124ec2191fc43408bb2b2d94d7d458efa9 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 15 Oct 2018 22:12:40 +0900
Subject: [PATCH 0192/1519] More dead code removal.

I have no idea why this hung around. It appears to be old array/struct
initialization.
---
 tools/qfcc/source/def.c | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/tools/qfcc/source/def.c b/tools/qfcc/source/def.c
index 2f5d97c5d..1bc1faf81 100644
--- a/tools/qfcc/source/def.c
+++ b/tools/qfcc/source/def.c
@@ -512,17 +512,7 @@ initialize_def (symbol_t *sym, expr_t *init, defspace_t *space,
 	sym->sy_type = sy_var;
 	if (!sym->table)
 		symtab_addsymbol (current_symtab, sym);
-//	if (storage == sc_global && init && is_scalar (type)) {
-//		sym->sy_type = sy_const;
-//		memset (&sym->s.value, 0, sizeof (&sym->s.value));
-//		if (init->type != ex_value) {	//FIXME arrays/structs
-//			error (0, "non-constant initializier");
-//		} else {
-//			sym->s.value = init->e.value;
-//			convert_value (&sym->s.value, sym->type);
-//		}
-//		return;
-//	}
+
 	if (sym->s.def && sym->s.def->external) {
 		//FIXME this really is not the right way
 		relocs = sym->s.def->relocs;

From 319ecfbbfaef23a807ac0d2cba59afe223754ad0 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 6 Jun 2019 06:42:31 +0900
Subject: [PATCH 0193/1519] Create a usable dot for vector expressions

It leaves a lot to be desired, but it beats "FIXME".
---
 tools/qfcc/source/dot_expr.c | 37 +++++++++++++++++++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/tools/qfcc/source/dot_expr.c b/tools/qfcc/source/dot_expr.c
index 191c8208d..175b8c800 100644
--- a/tools/qfcc/source/dot_expr.c
+++ b/tools/qfcc/source/dot_expr.c
@@ -367,7 +367,42 @@ print_vector (dstring_t *dstr, expr_t *e, int level, int id, expr_t *next)
 {
 	int         indent = level * 2 + 2;
 
-	dasprintf (dstr, "%*se_%p [label=\"vector FIXME\"];\n", indent, "", e);
+	if (e->e.vector.type == &type_vector) {
+		expr_t     *x = e->e.vector.list;
+		expr_t     *y = x->next;
+		expr_t     *z = y->next;
+		_print_expr (dstr, x, level, id, next);
+		_print_expr (dstr, y, level, id, next);
+		_print_expr (dstr, z, level, id, next);
+		dasprintf (dstr, "%*se_%p -> \"e_%p\";\n", indent, "", e, x);
+		dasprintf (dstr, "%*se_%p -> \"e_%p\";\n", indent, "", e, y);
+		dasprintf (dstr, "%*se_%p -> \"e_%p\";\n", indent, "", e, z);
+	}
+	if (e->e.vector.type == &type_quaternion) {
+		if (e->e.vector.list->next->next) {
+			expr_t     *x = e->e.vector.list;
+			expr_t     *y = x->next;
+			expr_t     *z = y->next;
+			expr_t     *w = z->next;
+			_print_expr (dstr, x, level, id, next);
+			_print_expr (dstr, y, level, id, next);
+			_print_expr (dstr, z, level, id, next);
+			_print_expr (dstr, w, level, id, next);
+			dasprintf (dstr, "%*se_%p -> \"e_%p\";\n", indent, "", e, x);
+			dasprintf (dstr, "%*se_%p -> \"e_%p\";\n", indent, "", e, y);
+			dasprintf (dstr, "%*se_%p -> \"e_%p\";\n", indent, "", e, z);
+			dasprintf (dstr, "%*se_%p -> \"e_%p\";\n", indent, "", e, w);
+		} else {
+			expr_t     *v = e->e.vector.list;
+			expr_t     *s = v->next;
+			_print_expr (dstr, v, level, id, next);
+			_print_expr (dstr, s, level, id, next);
+			dasprintf (dstr, "%*se_%p -> \"e_%p\";\n", indent, "", e, v);
+			dasprintf (dstr, "%*se_%p -> \"e_%p\";\n", indent, "", e, s);
+		}
+	}
+	dasprintf (dstr, "%*se_%p [label=\"vector %d\"];\n", indent, "", e,
+			   e->line);
 }
 
 static void

From d00a2ef82d6981b56f903a88ed69676924f502f2 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 6 Jun 2019 06:44:19 +0900
Subject: [PATCH 0194/1519] Convert constant vector expressions in binary
 expressions

Fixes not being able to compare with eg [1, 2, 3]
---
 tools/qfcc/source/expr_binary.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/qfcc/source/expr_binary.c b/tools/qfcc/source/expr_binary.c
index 2aa963b3a..b3717c1e8 100644
--- a/tools/qfcc/source/expr_binary.c
+++ b/tools/qfcc/source/expr_binary.c
@@ -726,6 +726,7 @@ binary_expr (int op, expr_t *e1, expr_t *e2)
 	expr_type_t *expr_type;
 
 	convert_name (e1);
+	e1 = convert_vector (e1);
 	if (e1->type == ex_block && e1->e.block.is_call
 		&& has_function_call (e2) && e1->e.block.result) {
 		e = new_temp_def_expr (get_type (e1->e.block.result));
@@ -735,6 +736,7 @@ binary_expr (int op, expr_t *e1, expr_t *e2)
 		return e1;
 
 	convert_name (e2);
+	e2 = convert_vector (e2);
 	if (e2->type == ex_error)
 		return e2;
 

From a5da8da1dcc429761aed55f2da0883a242a6a3c1 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 6 Jun 2019 06:45:48 +0900
Subject: [PATCH 0195/1519] Be more informative for symbol type internal errors

---
 tools/qfcc/source/statements.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/qfcc/source/statements.c b/tools/qfcc/source/statements.c
index fae48f153..f78575fe0 100644
--- a/tools/qfcc/source/statements.c
+++ b/tools/qfcc/source/statements.c
@@ -972,8 +972,8 @@ expr_symbol (sblock_t *sblock, expr_t *e, operand_t **op)
 	} else if (sym->sy_type == sy_func) {
 		*op = def_operand (sym->s.func->def, 0);
 	} else {
-		internal_error (e, "unexpected symbol type: %s",
-						symtype_str(sym->sy_type));
+		internal_error (e, "unexpected symbol type: %s for %s",
+						symtype_str(sym->sy_type), sym->name);
 	}
 	return sblock;
 }

From 7e31704ebe92adbd7fa162250a673a46ceb7e585 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 6 Jun 2019 06:46:38 +0900
Subject: [PATCH 0196/1519] Be more informative for pass by value size errors

---
 tools/qfcc/source/function.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/qfcc/source/function.c b/tools/qfcc/source/function.c
index c5736f8cc..7f28a77b9 100644
--- a/tools/qfcc/source/function.c
+++ b/tools/qfcc/source/function.c
@@ -427,7 +427,8 @@ check_function (symbol_t *fsym)
 		fsym->type->t.func.type = &type_void;//FIXME better type?
 	}
 	if (type_size (fsym->type->t.func.type) > type_size (&type_param)) {
-		error (0, "return value too large to be passed by value");
+		error (0, "return value too large to be passed by value (%d)",
+			   type_size (&type_param));
 		fsym->type->t.func.type = &type_void;//FIXME better type?
 	}
 	for (p = params, i = 0; p; p = p->next, i++) {

From 4ef4a7e955b5f09fb8c58a0c492b9d664c440e1e Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 6 Jun 2019 07:01:44 +0900
Subject: [PATCH 0197/1519] Start work on simple names in symbol tables

I don't remember what the goal was (stopped working on it eight months
ago), but some possibilities include:
 - better handling of nil (have trouble with assigning into struts)
 - automatic forward declarations ala C# and jai (I was watching vids
   about jai at the time)
 - something for pascal
 - simply that the default symbol type should not be var (in which case,
   goal accomplished)
---
 tools/qfcc/include/symtab.h     | 1 +
 tools/qfcc/source/expr_assign.c | 2 ++
 tools/qfcc/source/qc-parse.y    | 2 ++
 tools/qfcc/source/struct.c      | 1 +
 tools/qfcc/source/symtab.c      | 2 ++
 5 files changed, 8 insertions(+)

diff --git a/tools/qfcc/include/symtab.h b/tools/qfcc/include/symtab.h
index 626d7a484..f338077eb 100644
--- a/tools/qfcc/include/symtab.h
+++ b/tools/qfcc/include/symtab.h
@@ -48,6 +48,7 @@ typedef enum vis_e {
 } vis_t;
 
 typedef enum {
+	sy_name,					///< just a name (referent tbd)
 	sy_var,						///< symbol refers to a variable
 	sy_const,					///< symbol refers to a constant
 	sy_type,					///< symbol refers to a type
diff --git a/tools/qfcc/source/expr_assign.c b/tools/qfcc/source/expr_assign.c
index 730396dfa..f6071a9f4 100644
--- a/tools/qfcc/source/expr_assign.c
+++ b/tools/qfcc/source/expr_assign.c
@@ -87,6 +87,8 @@ check_valid_lvalue (expr_t *expr)
 	switch (expr->type) {
 		case ex_symbol:
 			switch (expr->e.symbol->sy_type) {
+				case sy_name:
+					break;
 				case sy_var:
 					return 0;
 				case sy_const:
diff --git a/tools/qfcc/source/qc-parse.y b/tools/qfcc/source/qc-parse.y
index 5ec3ad2f2..3e05a55e5 100644
--- a/tools/qfcc/source/qc-parse.y
+++ b/tools/qfcc/source/qc-parse.y
@@ -650,6 +650,7 @@ struct_decl
 				$<spec>0.type = type_default;
 			$1->type = append_type ($1->type, $<spec>0.type);
 			$1->type = find_type ($1->type);
+			$1->sy_type = sy_var;
 			symtab_addsymbol (current_symtab, $1);
 		}
 	| var_decl
@@ -658,6 +659,7 @@ struct_decl
 				$<spec>0.type = type_default;
 			$1->type = append_type ($1->type, $<spec>0.type);
 			$1->type = find_type ($1->type);
+			$1->sy_type = sy_var;
 			symtab_addsymbol (current_symtab, $1);
 		}
 	| var_decl ':' expr		%prec COMMA		{}
diff --git a/tools/qfcc/source/struct.c b/tools/qfcc/source/struct.c
index 4cb81fa74..ddf30f8ea 100644
--- a/tools/qfcc/source/struct.c
+++ b/tools/qfcc/source/struct.c
@@ -246,6 +246,7 @@ make_structure (const char *name, int su, struct_def_t *defs, type_t *type)
 		strct = new_symtab (0, stab_struct);
 	while (defs->name) {
 		field = new_symbol_type (defs->name, defs->type);
+		field->sy_type = sy_var;
 		if (!symtab_addsymbol (strct, field))
 			internal_error (0, "duplicate symbol: %s", defs->name);
 		defs++;
diff --git a/tools/qfcc/source/symtab.c b/tools/qfcc/source/symtab.c
index 3e18cf615..f26a690e7 100644
--- a/tools/qfcc/source/symtab.c
+++ b/tools/qfcc/source/symtab.c
@@ -52,6 +52,7 @@ static symtab_t *symtabs_freelist;
 static symbol_t *symbols_freelist;
 
 static const char *sy_type_names[] = {
+	"sy_name",
 	"sy_var",
 	"sy_const",
 	"sy_type",
@@ -234,5 +235,6 @@ make_symbol (const char *name, type_t *type, defspace_t *space,
 		sym->s.def = new_def (name, type, space, storage);
 		reloc_attach_relocs (relocs, &sym->s.def->relocs);
 	}
+	sym->sy_type = sy_var;
 	return sym;
 }

From 3327127e3649860724e61b6d436d58c270ae0d95 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 8 Jun 2019 13:28:29 +0900
Subject: [PATCH 0198/1519] Fix a typo in a comment

---
 tools/qfcc/include/def.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/qfcc/include/def.h b/tools/qfcc/include/def.h
index db2332cb1..d538d111d 100644
--- a/tools/qfcc/include/def.h
+++ b/tools/qfcc/include/def.h
@@ -71,7 +71,7 @@ typedef struct def_s {
 		def they alias, including relocation records. However, they do keep
 		track of the source file and line that first created the alias.
 
-		The relations between a def an any of its aliases are maintained by
+		The relations between a def and any of its aliases are maintained by
 		a linked list headed by def_t::alias_defs and connected by
 		def_t::next. def_t::alias is used to find the main def via one if its
 		aliases. The order of the aliases in the list is arbitrary: it is the

From 398e1cf83ad200cc5870b5edbab406165221f4be Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 8 Jun 2019 13:30:06 +0900
Subject: [PATCH 0199/1519] Use output file as base for dot files

Ensures the output goes not go into the source directory when using a
separate build tree.
---
 tools/qfcc/source/dot.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/qfcc/source/dot.c b/tools/qfcc/source/dot.c
index 1844a1fe9..54d67c241 100644
--- a/tools/qfcc/source/dot.c
+++ b/tools/qfcc/source/dot.c
@@ -37,7 +37,7 @@
 
 #include "dot.h"
 #include "function.h"
-#include "qfcc.h"
+#include "options.h"
 #include "strpool.h"
 
 void
@@ -46,7 +46,7 @@ dump_dot (const char *stage, void *data,
 {
 	char       *fname;
 
-	fname = nva ("%s.%s.%s.dot", GETSTR (pr.source_file), current_func->name,
+	fname = nva ("%s.%s.%s.dot", options.output_file, current_func->name,
 				 stage);
 	dump_func (data, fname);
 	free (fname);

From e27da9c7dbfcff1e78f4ecdc7088868d1d59577a Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 8 Jun 2019 13:31:30 +0900
Subject: [PATCH 0200/1519] Avoid folding constants in assign_expr

This prevents fold_constants from complaining about attempts to take
the address of a vector.
---
 tools/qfcc/source/expr_assign.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tools/qfcc/source/expr_assign.c b/tools/qfcc/source/expr_assign.c
index f6071a9f4..7cf1d8b4d 100644
--- a/tools/qfcc/source/expr_assign.c
+++ b/tools/qfcc/source/expr_assign.c
@@ -282,8 +282,6 @@ assign_expr (expr_t *dst, expr_t *src)
 		return expr;
 	}
 
-	dst = fold_constants (dst);
-	src = fold_constants (src);
 
 	if ((expr = check_valid_lvalue (dst))) {
 		return expr;

From ebab6574b956fad1437f1394c1b074aaecc7cace Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 8 Jun 2019 13:35:47 +0900
Subject: [PATCH 0201/1519] Allow taking the address of a temporary variable

---
 tools/qfcc/source/expr.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index 53b17987f..51f302947 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -2219,6 +2219,9 @@ address_expr (expr_t *e1, expr_t *e2, type_t *t)
 			return e1;
 		case ex_label:
 			return new_label_ref (&e1->e.label);
+		case ex_temp:
+			e = new_unary_expr ('&', e1);
+			break;
 		default:
 			return error (e1, "invalid type for unary &");
 	}

From e217bdd55f8f4f3119bbd08812df61abe7f9a6da Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 8 Jun 2019 13:36:03 +0900
Subject: [PATCH 0202/1519] Assign vector expressions to a temp for return

Rather than direct to .return, allowing return of vector expressions
with function calls without trashing the vector.
---
 tools/qfcc/source/expr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index 51f302947..104963189 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -2005,7 +2005,7 @@ return_expr (function_t *f, expr_t *e)
 		}
 	}
 	if (e->type == ex_vector) {
-		e = assign_expr (new_ret_expr (t), e);
+		e = assign_expr (new_temp_def_expr (t), e);
 	}
 	return new_unary_expr ('r', e);
 }

From df0316bb13fc2e82cf13d411e403bfdfa0e4a7d0 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 8 Jun 2019 19:22:29 +0900
Subject: [PATCH 0203/1519] Clean up some comment FIXMEs

---
 tools/qfcc/include/def.h      | 4 +++-
 tools/qfcc/include/expr.h     | 2 +-
 tools/qfcc/include/function.h | 6 +++---
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/tools/qfcc/include/def.h b/tools/qfcc/include/def.h
index d538d111d..79502a7d0 100644
--- a/tools/qfcc/include/def.h
+++ b/tools/qfcc/include/def.h
@@ -222,7 +222,9 @@ void def_to_ddef (def_t *def, ddef_t *ddef, int aux);
 
 /** Initialize a def referenced by the given symbol.
 
-	The symbol is checked for redefinition. (FIXME check rules)
+	The symbol is checked for redefinition. A symbol is considered to be
+	redefined if the previous definition is in the same symbol table and
+	of a different type or already initialized.
 
 	If \a type is null, then the def will be given the default type (as
 	specified by ::type_default).
diff --git a/tools/qfcc/include/expr.h b/tools/qfcc/include/expr.h
index 08614f2ce..f1987bb8a 100644
--- a/tools/qfcc/include/expr.h
+++ b/tools/qfcc/include/expr.h
@@ -416,7 +416,7 @@ expr_t *new_entity_expr (int entity_val);
 
 /** Create a new field constant expression node.
 
-	\param field_val	XXX
+	\param field_val	offset? XXX
 	\param type		The type of the field.
 	\param def
 	\return			The new field constant expression node
diff --git a/tools/qfcc/include/function.h b/tools/qfcc/include/function.h
index a1a5c19bf..b4b546fa6 100644
--- a/tools/qfcc/include/function.h
+++ b/tools/qfcc/include/function.h
@@ -105,9 +105,9 @@ extern function_t *current_func;
 typedef struct param_s {
 	struct param_s *next;
 	const char *selector;
-	struct type_s *type;		//FIXME redundant
-	const char *name;			//FIXME redundant
-	struct symbol_s *symbol;
+	struct type_s *type;
+	const char *name;
+	struct symbol_s *symbol;	//FIXME what is this for?
 } param_t;
 
 struct expr_s;

From 6acbdcb3e57a1ef0ca68eac4097a4966c8d8934b Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 8 Jun 2019 19:23:10 +0900
Subject: [PATCH 0204/1519] Correct a typo

---
 tools/qfcc/source/method.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/qfcc/source/method.c b/tools/qfcc/source/method.c
index e5102a6cf..883133b64 100644
--- a/tools/qfcc/source/method.c
+++ b/tools/qfcc/source/method.c
@@ -511,7 +511,7 @@ emit_method_list_item (def_t *def, void *data, int index)
 	pr_method_description_t *desc;
 
 	if (def->type != &type_obj_method_description)
-		internal_error (0, "%s: expected method_descripting def",
+		internal_error (0, "%s: expected method_description def",
 						__FUNCTION__);
 	if (index < 0 || index >= methods->count)
 		internal_error (0, "%s: out of bounds index: %d %d",

From f2102187b9b00dde5c100d3c004b17fa079a6a2d Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 8 Jun 2019 19:23:49 +0900
Subject: [PATCH 0205/1519] Clean up emit_protocol_list

Now it uses emit_structure, which will make it easier should things go
wrong.
---
 tools/qfcc/source/class.c | 64 +++++++++++++++++++++++++--------------
 1 file changed, 41 insertions(+), 23 deletions(-)

diff --git a/tools/qfcc/source/class.c b/tools/qfcc/source/class.c
index 21dc210c6..adeb4d4bf 100644
--- a/tools/qfcc/source/class.c
+++ b/tools/qfcc/source/class.c
@@ -1470,39 +1470,57 @@ emit_protocol (protocol_t *protocol)
 	return proto_def;
 }
 
+static void
+emit_protocol_next (def_t *def, void *data, int index)
+{
+	if (def->type != &type_pointer) {
+		internal_error (0, "%s: expected pointer def", __FUNCTION__);
+	}
+	D_INT (def) = 0;
+}
+
+static void
+emit_protocol_count (def_t *def, void *data, int index)
+{
+	protocollist_t *protocols = (protocollist_t *) data;
+
+	if (def->type != &type_integer) {
+		internal_error (0, "%s: expected integer def", __FUNCTION__);
+	}
+	D_INT (def) = protocols->count;
+}
+
+static void
+emit_protocol_list_item (def_t *def, void *data, int index)
+{
+	protocollist_t *protocols = (protocollist_t *) data;
+	protocol_t *protocol = protocols->list[index];
+
+	if (!is_array (def->type) || def->type->t.array.type != &type_pointer) {
+		internal_error (0, "%s: expected array of pointer def", __FUNCTION__);
+	}
+	if (index < 0 || index >= protocols->count) {
+		internal_error (0, "%s: out of bounds index: %d %d",
+						__FUNCTION__, index, protocols->count);
+	}
+	EMIT_DEF (def->space, D_INT(def), emit_protocol (protocol));
+}
+
 def_t *
 emit_protocol_list (protocollist_t *protocols, const char *name)
 {
-	//FIXME use emit_struct
 	static struct_def_t proto_list_struct[] = {
-		{"next",	&type_pointer},
-		{"count",	&type_integer},
-		{"list",	0},				// type will be filled in at run time
+		{"next",  &type_pointer, emit_protocol_next},
+		{"count", &type_integer, emit_protocol_count},
+		{"list",  0,             emit_protocol_list_item},
 		{0, 0},
 	};
-	type_t     *proto_list_type;
-	def_t      *proto_list_def;
-	defspace_t *space;
-	pr_protocol_list_t *proto_list;
-	int         i;
 
 	if (!protocols)
 		return 0;
 	proto_list_struct[2].type = array_type (&type_pointer, protocols->count);
-	proto_list_type = make_structure (0, 's', proto_list_struct, 0)->type;
-	proto_list_def = make_symbol (va ("_OBJ_PROTOCOLS_%s", name),
-								  proto_list_type,
-								  pr.far_data, sc_static)->s.def;
-	proto_list_def->initialized = proto_list_def->constant = 1;
-	proto_list_def->nosave = 1;
-	space = proto_list_def->space;
-	proto_list = &D_STRUCT (pr_protocol_list_t, proto_list_def);
-	proto_list->next = 0;
-	proto_list->count = protocols->count;
-	for (i = 0; i < protocols->count; i++)
-		EMIT_DEF (space, proto_list->list[i],
-				  emit_protocol (protocols->list[i]));
-	return proto_list_def;
+	return emit_structure (va ("_OBJ_PROTOCOLS_%s", name), 's',
+						   proto_list_struct, 0, protocols, sc_static);
 }
 
 void

From be4c3a82a2e120859c0eee641c7309bf3b67b977 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 8 Jun 2019 19:25:25 +0900
Subject: [PATCH 0206/1519] Detect redefinitions of structs and unions

While the redefinition was being detected, it was misreported as the tag
being wrong, and on the wrong line, too.
---
 tools/qfcc/source/qc-parse.y | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/tools/qfcc/source/qc-parse.y b/tools/qfcc/source/qc-parse.y
index 3e05a55e5..15edcb0ee 100644
--- a/tools/qfcc/source/qc-parse.y
+++ b/tools/qfcc/source/qc-parse.y
@@ -584,8 +584,13 @@ struct_specifier
 		{
 			symbol_t   *sym;
 			sym = find_struct ($1, $2, 0);
-			if (!sym->table)
+			if (!sym->table) {
 				symtab_addsymbol (current_symtab, sym);
+			} else {
+				error (0, "%s %s redefined", $1 == 's' ? "struct" : "union",
+					   $2->name);
+				$1 = 0;
+			}
 			current_symtab = new_symtab (current_symtab, stab_local);
 		}
 	  struct_defs '}'
@@ -594,10 +599,12 @@ struct_specifier
 			symtab_t   *symtab = current_symtab;
 			current_symtab = symtab->parent;
 
-			sym = build_struct ($1, $2, symtab, 0);
-			$$ = make_spec (sym->type, 0, 0, 0);
-			if (!sym->table)
-				symtab_addsymbol (current_symtab, sym);
+			if ($1) {
+				sym = build_struct ($1, $2, symtab, 0);
+				$$ = make_spec (sym->type, 0, 0, 0);
+				if (!sym->table)
+					symtab_addsymbol (current_symtab, sym);
+			}
 		}
 	| STRUCT tag
 		{

From 5bd3c8c985e03c18acc37c633f209f1fdfc99176 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 8 Jun 2019 21:52:17 +0900
Subject: [PATCH 0207/1519] Allow variable declarations in for loops

Matches C, C++ and C#
---
 tools/qfcc/source/qc-parse.y | 55 ++++++++++++++++++++++++++++--------
 1 file changed, 44 insertions(+), 11 deletions(-)

diff --git a/tools/qfcc/source/qc-parse.y b/tools/qfcc/source/qc-parse.y
index 15edcb0ee..945e3b5fb 100644
--- a/tools/qfcc/source/qc-parse.y
+++ b/tools/qfcc/source/qc-parse.y
@@ -180,11 +180,12 @@ int yylex (void);
 %type	<symbol>	methoddef
 %type	<expr>		opt_initializer var_initializer local_def
 
-%type	<expr>		opt_expr fexpr expr element_list element vector_expr
-%type	<expr>		optional_state_expr texpr
+%type	<expr>		opt_init opt_expr fexpr expr element_list element
+%type	<expr>		optional_state_expr texpr vector_expr
 %type	<expr>		statement statements compound_statement
 %type	<expr>		else label break_label continue_label
 %type	<expr>		unary_expr cast_expr opt_arg_list arg_list
+%type	<expr>		init_var_decl_list init_var_decl
 %type	<switch_block> switch_block
 %type	<symbol>	identifier
 
@@ -1053,22 +1054,28 @@ optional_comma
 	| ','
 	;
 
-compound_statement
-	: '{'
+push_scope
+	: /* empty */
 		{
 			if (!options.traditional) {
 				current_symtab = new_symtab (current_symtab, stab_local);
 				current_symtab->space = current_symtab->parent->space;
 			}
 		}
-	  statements '}'
+	;
+
+pop_scope
+	: /* empty */
 		{
 			if (!options.traditional)
 				current_symtab = current_symtab->parent;
-			$$ = $3;
 		}
 	;
 
+compound_statement
+	: '{' push_scope statements '}' pop_scope { $$ = $3; }
+	;
+
 statements
 	: /*empty*/
 		{
@@ -1143,13 +1150,13 @@ statement
 		{
 			$$ = build_if_statement ($2, $4, $6, $7, $8);
 		}
-	| FOR break_label continue_label
-			'(' opt_expr ';' opt_expr ';' opt_expr ')' statement
+	| FOR push_scope break_label continue_label
+			'(' opt_init ';' opt_expr ';' opt_expr ')' statement pop_scope
 		{
-			$$ = build_for_statement ($5, $7, $9, $11,
+			$$ = build_for_statement ($6, $8, $10, $12,
 									  break_label, continue_label);
-			break_label = $2;
-			continue_label = $3;
+			break_label = $3;
+			continue_label = $4;
 		}
 	| WHILE break_label continue_label not '(' texpr ')' statement
 		{
@@ -1216,6 +1223,32 @@ switch_block
 		}
 	;
 
+opt_init
+	: fexpr
+	| type init_var_decl_list { $$ = $2; }
+	| /* empty */
+		{
+			$$ = 0;
+		}
+	;
+
+init_var_decl_list
+	: init_var_decl
+	| init_var_decl_list ',' init_var_decl
+	;
+
+init_var_decl
+	: var_decl opt_initializer
+		{
+			specifier_t spec = $<spec>0;
+			$1->type = append_type ($1->type, spec.type);
+			$1->type = find_type ($1->type);
+			$1->sy_type = sy_var;
+			initialize_def ($1, 0, current_symtab->space, spec.storage);
+			$$ = assign_expr (new_symbol_expr ($1), $2);
+		}
+	;
+
 opt_expr
 	: fexpr
 	| /* empty */

From 625e767684b904b83cba021e318c525847e704b0 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 9 Jun 2019 13:00:55 +0900
Subject: [PATCH 0208/1519] Update qf dependency stuff for recent automake

Not sure just what version of automake broke things, but I do remember
having a bad time getting the dependencies to work in the first place.
At least now they should be more reliable (until automake changes
things).
---
 tools/qfcc/test/Makefile.am | 116 ++++++++++++++++++++++--------------
 1 file changed, 72 insertions(+), 44 deletions(-)

diff --git a/tools/qfcc/test/Makefile.am b/tools/qfcc/test/Makefile.am
index 352254f9b..469ba261a 100644
--- a/tools/qfcc/test/Makefile.am
+++ b/tools/qfcc/test/Makefile.am
@@ -31,9 +31,9 @@ fail_bins=
 test_progs_dat=\
 	chewed-alias.dat \
 	chewed-return.dat \
+	deadbool.dat \
 	func-expr.dat \
 	func-static.dat \
-	deadbool.dat \
 	infloop.dat \
 	modulo.dat \
 	paramret.dat \
@@ -47,8 +47,8 @@ test_progs_dat=\
 	triangle.dat \
 	vecexpr.dat \
 	vecinit.dat \
-	while.dat \
-	voidfor.dat
+	voidfor.dat \
+	while.dat
 
 fail_progs_dat=
 
@@ -68,13 +68,16 @@ test_harness_SOURCES=		test-bi.c test-harness.c
 test_harness_LDADD=			$(QFCC_TEST_LIBS)
 test_harness_DEPENDENCIES=	$(QFCC_TEST_DEPS)
 
+r_depfiles_remade=
+
 chewed_alias_dat_SOURCES=chewed-alias.r
 chewed_alias_obj=$(chewed_alias_dat_SOURCES:.r=.qfo)
 chewed-alias.dat$(EXEEXT): $(chewed_alias_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(chewed_alias_obj)
 chewed-alias.run: Makefile build-run
 	$(srcdir)/build-run $@
-include ./$(DEPDIR)/chewed-alias.Qo
+include ./$(DEPDIR)/chewed-alias.Qo # am--include-marker
+r_depfiles_remade += ./$(DEPDIR)/chewed-alias.Qo
 
 chewed_return_dat_SOURCES=chewed-return.r
 chewed_return_obj=$(chewed_return_dat_SOURCES:.r=.qfo)
@@ -82,23 +85,8 @@ chewed-return.dat$(EXEEXT): $(chewed_return_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(chewed_return_obj)
 chewed-return.run: Makefile build-run
 	TEST_HARNESS_OPTS=--float $(srcdir)/build-run $@
-include ./$(DEPDIR)/chewed-return.Qo
-
-func_expr_dat_SOURCES=func-expr.r
-func_expr_obj=$(func_expr_dat_SOURCES:.r=.qfo)
-func-expr.dat$(EXEEXT): $(func_expr_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(func_expr_obj)
-func-expr.run: Makefile build-run
-	$(srcdir)/build-run $@
-include ./$(DEPDIR)/func-expr.Qo
-
-func_static_dat_SOURCES=func-static.r
-func_static_obj=$(func_static_dat_SOURCES:.r=.qfo)
-func-static.dat$(EXEEXT): $(func_static_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(func_static_obj)
-func-static.run: Makefile build-run
-	$(srcdir)/build-run $@
-include ./$(DEPDIR)/func-static.Qo
+include ./$(DEPDIR)/chewed-return.Qo # am--include-marker
+r_depfiles_remade += ./$(DEPDIR)/chewed-return.Qo
 
 deadbool_dat_SOURCES=deadbool.r
 deadbool_obj=$(deadbool_dat_SOURCES:.r=.qfo)
@@ -106,7 +94,26 @@ deadbool.dat$(EXEEXT): $(deadbool_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(deadbool_obj)
 deadbool.run: Makefile build-run
 	$(srcdir)/build-run $@
-include ./$(DEPDIR)/deadbool.Qo
+include ./$(DEPDIR)/deadbool.Qo # am--include-marker
+r_depfiles_remade += ./$(DEPDIR)/deadbool.Qo
+
+func_expr_dat_SOURCES=func-expr.r
+func_expr_obj=$(func_expr_dat_SOURCES:.r=.qfo)
+func-expr.dat$(EXEEXT): $(func_expr_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(func_expr_obj)
+func-expr.run: Makefile build-run
+	$(srcdir)/build-run $@
+include ./$(DEPDIR)/func-expr.Qo # am--include-marker
+r_depfiles_remade += ./$(DEPDIR)/func-expr.Qo
+
+func_static_dat_SOURCES=func-static.r
+func_static_obj=$(func_static_dat_SOURCES:.r=.qfo)
+func-static.dat$(EXEEXT): $(func_static_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(func_static_obj)
+func-static.run: Makefile build-run
+	$(srcdir)/build-run $@
+include ./$(DEPDIR)/func-static.Qo # am--include-marker
+r_depfiles_remade += ./$(DEPDIR)/func-static.Qo
 
 infloop_dat_SOURCES=infloop.r
 infloop_obj=$(infloop_dat_SOURCES:.r=.qfo)
@@ -114,7 +121,8 @@ infloop.dat$(EXEEXT): $(infloop_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(infloop_obj)
 infloop.run: Makefile build-run
 	$(srcdir)/build-run $@
-include ./$(DEPDIR)/infloop.Qo
+include ./$(DEPDIR)/infloop.Qo # am--include-marker
+r_depfiles_remade += ./$(DEPDIR)/infloop.Qo
 
 modulo_dat_SOURCES=modulo.r
 modulo_obj=$(modulo_dat_SOURCES:.r=.qfo)
@@ -122,7 +130,8 @@ modulo.dat$(EXEEXT): $(modulo_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(modulo_obj)
 modulo.run: Makefile build-run
 	TEST_HARNESS_OPTS=--float $(srcdir)/build-run $@
-include ./$(DEPDIR)/modulo.Qo
+include ./$(DEPDIR)/modulo.Qo # am--include-marker
+r_depfiles_remade += ./$(DEPDIR)/modulo.Qo
 
 paramret_dat_SOURCES=paramret.r
 paramret_obj=$(paramret_dat_SOURCES:.r=.qfo)
@@ -130,7 +139,8 @@ paramret.dat$(EXEEXT): $(paramret_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(paramret_obj)
 paramret.run: Makefile build-run
 	TEST_HARNESS_OPTS=--float $(srcdir)/build-run $@
-include ./$(DEPDIR)/paramret.Qo
+include ./$(DEPDIR)/paramret.Qo # am--include-marker
+r_depfiles_remade += ./$(DEPDIR)/paramret.Qo
 
 quaternion_dat_SOURCES=quaternion.r
 quaternion_obj=$(quaternion_dat_SOURCES:.r=.qfo)
@@ -138,7 +148,8 @@ quaternion.dat$(EXEEXT): $(quaternion_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(quaternion_obj)
 quaternion.run: Makefile build-run
 	$(srcdir)/build-run $@
-include ./$(DEPDIR)/quaternion.Qo
+include ./$(DEPDIR)/quaternion.Qo # am--include-marker
+r_depfiles_remade += ./$(DEPDIR)/quaternion.Qo
 
 return_ivar_dat_SOURCES=return-ivar.r
 return_ivar_obj=$(return_ivar_dat_SOURCES:.r=.qfo)
@@ -146,7 +157,8 @@ return-ivar.dat$(EXEEXT): $(return_ivar_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(return_ivar_obj)
 return-ivar.run: Makefile build-run
 	$(srcdir)/build-run $@
-include ./$(DEPDIR)/return-ivar.Qo
+include ./$(DEPDIR)/return-ivar.Qo # am--include-marker
+r_depfiles_remade += ./$(DEPDIR)/return-ivar.Qo
 
 sendv_dat_SOURCES=sendv.r
 sendv_obj=$(sendv_dat_SOURCES:.r=.qfo)
@@ -154,7 +166,8 @@ sendv.dat$(EXEEXT): $(sendv_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(sendv_obj)
 sendv.run: Makefile build-run
 	$(srcdir)/build-run $@
-include ./$(DEPDIR)/sendv.Qo
+include ./$(DEPDIR)/sendv.Qo # am--include-marker
+r_depfiles_remade += ./$(DEPDIR)/sendv.Qo
 
 state_dat_SOURCES=state.r
 state_obj=$(state_dat_SOURCES:.r=.qfo)
@@ -162,7 +175,8 @@ state.dat$(EXEEXT): $(state_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(state_obj)
 state.run: Makefile build-run
 	$(srcdir)/build-run $@
-include ./$(DEPDIR)/state.Qo
+include ./$(DEPDIR)/state.Qo # am--include-marker
+r_depfiles_remade += ./$(DEPDIR)/state.Qo
 
 structlive_dat_SOURCES=structlive.r
 structlive_obj=$(structlive_dat_SOURCES:.r=.qfo)
@@ -170,7 +184,8 @@ structlive.dat$(EXEEXT): $(structlive_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(structlive_obj)
 structlive.run: Makefile build-run
 	$(srcdir)/build-run $@
-include ./$(DEPDIR)/structlive.Qo
+include ./$(DEPDIR)/structlive.Qo # am--include-marker
+r_depfiles_remade += ./$(DEPDIR)/structlive.Qo
 
 structptr_dat_SOURCES=structptr.r
 structptr_obj=$(structptr_dat_SOURCES:.r=.qfo)
@@ -178,7 +193,8 @@ structptr.dat$(EXEEXT): $(structptr_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(structptr_obj)
 structptr.run: Makefile build-run
 	$(srcdir)/build-run $@
-include ./$(DEPDIR)/structptr.Qo
+include ./$(DEPDIR)/structptr.Qo # am--include-marker
+r_depfiles_remade += ./$(DEPDIR)/structptr.Qo
 
 swap_dat_SOURCES=swap.r
 swap_obj=$(swap_dat_SOURCES:.r=.qfo)
@@ -186,7 +202,8 @@ swap.dat$(EXEEXT): $(swap_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(swap_obj)
 swap.run: Makefile build-run
 	$(srcdir)/build-run $@
-include ./$(DEPDIR)/swap.Qo
+include ./$(DEPDIR)/swap.Qo # am--include-marker
+r_depfiles_remade += ./$(DEPDIR)/swap.Qo
 
 triangle_dat_SOURCES=triangle.r
 triangle_obj=$(triangle_dat_SOURCES:.r=.qfo)
@@ -194,7 +211,8 @@ triangle.dat$(EXEEXT): $(triangle_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(triangle_obj)
 triangle.run: Makefile build-run
 	$(srcdir)/build-run $@ 100000 100000 1.00005 50002.4961
-include ./$(DEPDIR)/triangle.Qo
+include ./$(DEPDIR)/triangle.Qo # am--include-marker
+r_depfiles_remade += ./$(DEPDIR)/triangle.Qo
 
 vecexpr_dat_SOURCES=vecexpr.r
 vecexpr_obj=$(vecexpr_dat_SOURCES:.r=.qfo)
@@ -202,7 +220,8 @@ vecexpr.dat$(EXEEXT): $(vecexpr_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(vecexpr_obj)
 vecexpr.run: Makefile build-run
 	$(srcdir)/build-run $@
-include ./$(DEPDIR)/vecexpr.Qo
+include ./$(DEPDIR)/vecexpr.Qo # am--include-marker
+r_depfiles_remade += ./$(DEPDIR)/vecexpr.Qo
 
 vecinit_dat_SOURCES=vecinit.r
 vecinit_obj=$(vecinit_dat_SOURCES:.r=.qfo)
@@ -210,15 +229,8 @@ vecinit.dat$(EXEEXT): $(vecinit_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(vecinit_obj)
 vecinit.run: Makefile build-run
 	$(srcdir)/build-run $@
-include ./$(DEPDIR)/vecinit.Qo
-
-while_dat_SOURCES=while.r
-while_obj=$(while_dat_SOURCES:.r=.qfo)
-while.dat$(EXEEXT): $(while_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(while_obj)
-while.run: Makefile build-run
-	$(srcdir)/build-run $@
-include ./$(DEPDIR)/while.Qo
+include ./$(DEPDIR)/vecinit.Qo # am--include-marker
+r_depfiles_remade += ./$(DEPDIR)/vecinit.Qo
 
 voidfor_dat_SOURCES=voidfor.r
 voidfor_obj=$(voidfor_dat_SOURCES:.r=.qfo)
@@ -226,8 +238,24 @@ voidfor.dat$(EXEEXT): $(voidfor_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(voidfor_obj)
 voidfor.run: Makefile build-run
 	$(srcdir)/build-run $@
-include ./$(DEPDIR)/voidfor.Qo
+include ./$(DEPDIR)/voidfor.Qo # am--include-marker
+r_depfiles_remade += ./$(DEPDIR)/voidfor.Qo
 
+while_dat_SOURCES=while.r
+while_obj=$(while_dat_SOURCES:.r=.qfo)
+while.dat$(EXEEXT): $(while_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(while_obj)
+while.run: Makefile build-run
+	$(srcdir)/build-run $@
+include ./$(DEPDIR)/while.Qo # am--include-marker
+r_depfiles_remade += ./$(DEPDIR)/while.Qo
+
+$(r_depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+
+am--depfiles: $(am__depfiles_remade) $(r_depfiles_remade)
 
 EXTRA_DIST= test-bi.h build-run test-defspace.h
 CLEANFILES= *.dat *.sym *.qfo *.run *.frame

From d29ea55826cfc748a750e8fbf7002d8299c79ae3 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 9 Jun 2019 13:02:36 +0900
Subject: [PATCH 0209/1519] Add a test for for loop declarations

I think the compiler segfaulting indicates a test failure.
---
 tools/qfcc/test/Makefile.am | 10 ++++++++++
 tools/qfcc/test/fordecl.r   | 26 ++++++++++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 tools/qfcc/test/fordecl.r

diff --git a/tools/qfcc/test/Makefile.am b/tools/qfcc/test/Makefile.am
index 469ba261a..87742d8e0 100644
--- a/tools/qfcc/test/Makefile.am
+++ b/tools/qfcc/test/Makefile.am
@@ -32,6 +32,7 @@ test_progs_dat=\
 	chewed-alias.dat \
 	chewed-return.dat \
 	deadbool.dat \
+	fordecl.dat \
 	func-expr.dat \
 	func-static.dat \
 	infloop.dat \
@@ -97,6 +98,15 @@ deadbool.run: Makefile build-run
 include ./$(DEPDIR)/deadbool.Qo # am--include-marker
 r_depfiles_remade += ./$(DEPDIR)/deadbool.Qo
 
+fordecl_dat_SOURCES=fordecl.r
+fordecl_obj=$(fordecl_dat_SOURCES:.r=.qfo)
+fordecl.dat$(EXEEXT): $(fordecl_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(fordecl_obj)
+fordecl.run: Makefile build-run
+	$(srcdir)/build-run $@
+include ./$(DEPDIR)/fordecl.Qo # am--include-marker
+r_depfiles_remade += ./$(DEPDIR)/fordecl.Qo
+
 func_expr_dat_SOURCES=func-expr.r
 func_expr_obj=$(func_expr_dat_SOURCES:.r=.qfo)
 func-expr.dat$(EXEEXT): $(func_expr_obj) $(QFCC_DEP)
diff --git a/tools/qfcc/test/fordecl.r b/tools/qfcc/test/fordecl.r
new file mode 100644
index 000000000..9277dc828
--- /dev/null
+++ b/tools/qfcc/test/fordecl.r
@@ -0,0 +1,26 @@
+void printf (string fmt, ...) = #0;
+
+int
+test_fordecl ()
+{
+	int         fail = 1;
+	int         count = 5;
+
+	for (int i = 3, j = 5; count-- > 0; ) {
+		i += 2;
+		j += 3;
+	}
+	if (i == 13 && j == 20) {
+		fail = 0;
+	}
+
+	return fail;
+}
+
+int
+main ()
+{
+	int         fail = 0;
+	fail |= test_fordecl ();
+	return fail;
+}

From ec89149b2902e328da28b96beb1e6ad9c5875b10 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 9 Jun 2019 13:54:03 +0900
Subject: [PATCH 0210/1519] Build for loop decl inits correctly

The multiple expressions are chained together and evaluate in left to
right order.
---
 tools/qfcc/include/expr.h    | 11 +++++++++++
 tools/qfcc/source/expr.c     | 14 ++++++++++++++
 tools/qfcc/source/qc-parse.y | 15 ++++++++++++++-
 3 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/tools/qfcc/include/expr.h b/tools/qfcc/include/expr.h
index f1987bb8a..d8831b766 100644
--- a/tools/qfcc/include/expr.h
+++ b/tools/qfcc/include/expr.h
@@ -314,6 +314,17 @@ expr_t *new_bool_expr (ex_list_t *true_list, ex_list_t *false_list, expr_t *e);
 */
 expr_t *new_block_expr (void);
 
+/**	Create a new statement block expression node from an expression list
+
+	The returned block holds the expression list in reverse order. This makes
+	it easy to build the list in a parser.
+
+	\param expr_list The expression list to convert to an expression block.
+					Note that the evaluation order will be reversed.
+	\return		The new block expression (::ex_block_t) node.
+*/
+expr_t *build_block_expr (expr_t *expr_list);
+
 /**	Create a new binary expression node node.
 
 	If either \a e1 or \a e2 are error expressions, then that expression will
diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index 104963189..c6bed8e39 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -539,6 +539,20 @@ new_binary_expr (int op, expr_t *e1, expr_t *e2)
 	return e;
 }
 
+expr_t *
+build_block_expr (expr_t *expr_list)
+{
+	expr_t     *b = new_block_expr ();
+
+	while (expr_list) {
+		expr_t     *e = expr_list;
+		expr_list = e->next;
+		e->next = 0;
+		append_expr (b, e);
+	}
+	return b;
+}
+
 expr_t *
 new_unary_expr (int op, expr_t *e1)
 {
diff --git a/tools/qfcc/source/qc-parse.y b/tools/qfcc/source/qc-parse.y
index 945e3b5fb..8e9c38af8 100644
--- a/tools/qfcc/source/qc-parse.y
+++ b/tools/qfcc/source/qc-parse.y
@@ -1153,6 +1153,9 @@ statement
 	| FOR push_scope break_label continue_label
 			'(' opt_init ';' opt_expr ';' opt_expr ')' statement pop_scope
 		{
+			if ($6) {
+				$6 = build_block_expr ($6);
+			}
 			$$ = build_for_statement ($6, $8, $10, $12,
 									  break_label, continue_label);
 			break_label = $3;
@@ -1234,12 +1237,22 @@ opt_init
 
 init_var_decl_list
 	: init_var_decl
-	| init_var_decl_list ',' init_var_decl
+		{
+			printf ("a\n");
+			$$ = $1;
+		}
+	| init_var_decl_list ',' { $<spec>$ = $<spec>0; } init_var_decl
+		{
+			printf ("b\n");
+			$4->next = $1;
+			$$ = $4;
+		}
 	;
 
 init_var_decl
 	: var_decl opt_initializer
 		{
+			printf ("c\n");
 			specifier_t spec = $<spec>0;
 			$1->type = append_type ($1->type, spec.type);
 			$1->type = find_type ($1->type);

From 1db600548e7406253e830e1e78e9fa50caf1516c Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 9 Jun 2019 13:55:07 +0900
Subject: [PATCH 0211/1519] Fix for decl test scope issue

---
 tools/qfcc/test/fordecl.r | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tools/qfcc/test/fordecl.r b/tools/qfcc/test/fordecl.r
index 9277dc828..70d57690a 100644
--- a/tools/qfcc/test/fordecl.r
+++ b/tools/qfcc/test/fordecl.r
@@ -5,12 +5,15 @@ test_fordecl ()
 {
 	int         fail = 1;
 	int         count = 5;
+	int         ti = -1, tj = -1;
 
 	for (int i = 3, j = 5; count-- > 0; ) {
 		i += 2;
 		j += 3;
+		ti = i;
+		tj = j;
 	}
-	if (i == 13 && j == 20) {
+	if (ti == 13 && tj == 20) {
 		fail = 0;
 	}
 

From 33c2eb430fa098f438463a43a120e2e7bf7ac8f7 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 9 Jun 2019 16:19:27 +0900
Subject: [PATCH 0212/1519] Stop bison complaining about %expect

And make sure warnings get fixed.
---
 tools/qfcc/source/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/qfcc/source/Makefile.am b/tools/qfcc/source/Makefile.am
index b0bf53fb7..e63edc20d 100644
--- a/tools/qfcc/source/Makefile.am
+++ b/tools/qfcc/source/Makefile.am
@@ -33,7 +33,7 @@ QFCC_DEPS=@QFCC_DEPS@
 QFCC_INCS=@QFCC_INCS@
 
 AM_CPPFLAGS=	-I$(top_srcdir)/include $(QFCC_INCS)
-YFLAGS = -v -d
+YFLAGS = -v -d -Wno-yacc -Werror
 
 bin_PROGRAMS=	qfcc qfprogs
 bin_SCRIPTS=	qfpreqcc

From 689d1ad3ece314f9c07a2ea5a03de3bd106a1244 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 9 Jun 2019 16:45:01 +0900
Subject: [PATCH 0213/1519] Remove some debug prints

---
 tools/qfcc/source/qc-parse.y | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tools/qfcc/source/qc-parse.y b/tools/qfcc/source/qc-parse.y
index 8e9c38af8..308512b6b 100644
--- a/tools/qfcc/source/qc-parse.y
+++ b/tools/qfcc/source/qc-parse.y
@@ -1238,12 +1238,10 @@ opt_init
 init_var_decl_list
 	: init_var_decl
 		{
-			printf ("a\n");
 			$$ = $1;
 		}
 	| init_var_decl_list ',' { $<spec>$ = $<spec>0; } init_var_decl
 		{
-			printf ("b\n");
 			$4->next = $1;
 			$$ = $4;
 		}
@@ -1252,7 +1250,6 @@ init_var_decl_list
 init_var_decl
 	: var_decl opt_initializer
 		{
-			printf ("c\n");
 			specifier_t spec = $<spec>0;
 			$1->type = append_type ($1->type, spec.type);
 			$1->type = find_type ($1->type);

From 7fce68649af1e2248f8658221bd2d29573548417 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 9 Jun 2019 16:56:20 +0900
Subject: [PATCH 0214/1519] Implement comma expressions

Doesn't quite work (attempt to suppress warning for return a = 3, 5;
failed).
---
 tools/qfcc/source/qc-parse.y | 20 ++++++++++++---
 tools/qfcc/test/Makefile.am  | 10 ++++++++
 tools/qfcc/test/comma-expr.r | 50 ++++++++++++++++++++++++++++++++++++
 3 files changed, 76 insertions(+), 4 deletions(-)
 create mode 100644 tools/qfcc/test/comma-expr.r

diff --git a/tools/qfcc/source/qc-parse.y b/tools/qfcc/source/qc-parse.y
index 308512b6b..c8c269d27 100644
--- a/tools/qfcc/source/qc-parse.y
+++ b/tools/qfcc/source/qc-parse.y
@@ -180,7 +180,7 @@ int yylex (void);
 %type	<symbol>	methoddef
 %type	<expr>		opt_initializer var_initializer local_def
 
-%type	<expr>		opt_init opt_expr fexpr expr element_list element
+%type	<expr>		opt_init opt_expr cexpr fexpr expr element_list element
 %type	<expr>		optional_state_expr texpr vector_expr
 %type	<expr>		statement statements compound_statement
 %type	<expr>		else label break_label continue_label
@@ -1175,7 +1175,7 @@ statement
 			break_label = $2;
 			continue_label = $3;
 		}
-	| fexpr ';'
+	| cexpr ';'
 		{
 			$$ = $1;
 		}
@@ -1227,7 +1227,7 @@ switch_block
 	;
 
 opt_init
-	: fexpr
+	: cexpr
 	| type init_var_decl_list { $$ = $2; }
 	| /* empty */
 		{
@@ -1260,7 +1260,7 @@ init_var_decl
 	;
 
 opt_expr
-	: fexpr
+	: cexpr
 	| /* empty */
 		{
 			$$ = 0;
@@ -1346,6 +1346,18 @@ texpr
 	: fexpr						{ $$ = convert_bool ($1, 1); }
 	;
 
+cexpr
+	: arg_list
+		{
+			if ($1->next) {
+				expr_t     *res = $1;
+				$1 = build_block_expr ($1->next);
+				$1->e.block.result = res;
+			}
+			$$ = $1;
+		}
+	;
+
 opt_arg_list
 	: /* emtpy */				{ $$ = 0; }
 	| arg_list					{ $$ = $1; }
diff --git a/tools/qfcc/test/Makefile.am b/tools/qfcc/test/Makefile.am
index 87742d8e0..c0d7bade0 100644
--- a/tools/qfcc/test/Makefile.am
+++ b/tools/qfcc/test/Makefile.am
@@ -31,6 +31,7 @@ fail_bins=
 test_progs_dat=\
 	chewed-alias.dat \
 	chewed-return.dat \
+	comma-expr.dat \
 	deadbool.dat \
 	fordecl.dat \
 	func-expr.dat \
@@ -89,6 +90,15 @@ chewed-return.run: Makefile build-run
 include ./$(DEPDIR)/chewed-return.Qo # am--include-marker
 r_depfiles_remade += ./$(DEPDIR)/chewed-return.Qo
 
+comma_expr_dat_SOURCES=comma-expr.r
+comma_expr_obj=$(comma_expr_dat_SOURCES:.r=.qfo)
+comma-expr.dat$(EXEEXT): $(comma_expr_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(comma_expr_obj)
+comma-expr.run: Makefile build-run
+	$(srcdir)/build-run $@
+include ./$(DEPDIR)/comma-expr.Qo # am--include-marker
+r_depfiles_remade += ./$(DEPDIR)/comma-expr.Qo
+
 deadbool_dat_SOURCES=deadbool.r
 deadbool_obj=$(deadbool_dat_SOURCES:.r=.qfo)
 deadbool.dat$(EXEEXT): $(deadbool_obj) $(QFCC_DEP)
diff --git a/tools/qfcc/test/comma-expr.r b/tools/qfcc/test/comma-expr.r
new file mode 100644
index 000000000..ea145c0a2
--- /dev/null
+++ b/tools/qfcc/test/comma-expr.r
@@ -0,0 +1,50 @@
+void printf (string fmt, ...) = #0;
+
+int a = 0;
+int b = 0;
+
+int
+return_comma()
+{
+	return a = 3, 5;
+}
+
+int
+test_for_comma ()
+{
+	int         fail = 1;
+	int         count = 5;
+	int         i = -1;
+	float       j = -1;
+
+	for (i = 3, j = 5; count-- > 0; ) {
+		i += 2;
+		j += 3;
+	}
+	if (i == 13 && j == 20) {
+		fail = 0;
+	}
+
+	return fail;
+}
+
+int
+test_comma ()
+{
+	int fail = 1;
+	if (return_comma() == 5) {
+		if (a == 3) {
+			fail = 0;
+		}
+	}
+	return fail;
+}
+
+int
+main ()
+{
+	int         fail = 0;
+	fail |= test_comma ();
+	fail |= test_for_comma ();
+	return fail;
+}

From f093516962c30923a3e184466d298d8148630623 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 9 Jun 2019 18:07:58 +0900
Subject: [PATCH 0215/1519] Move qfo type encoding structs

This makes them available to the gamecode VM, and thus the debugger.
---
 include/QF/Makefile.am        |   3 +-
 include/QF/pr_type.h          | 107 ++++++++++++++++++++++++++++++++++
 tools/qfcc/include/obj_type.h |  71 +---------------------
 3 files changed, 110 insertions(+), 71 deletions(-)
 create mode 100644 include/QF/pr_type.h

diff --git a/include/QF/Makefile.am b/include/QF/Makefile.am
index ffb0ff56b..8bf956359 100644
--- a/include/QF/Makefile.am
+++ b/include/QF/Makefile.am
@@ -6,7 +6,8 @@ nobase_pkginclude_HEADERS = \
 	idparse.h image.h in_event.h info.h input.h iqm.h joystick.h keys.h \
 	link.h llist.h locs.h mathlib.h mdfour.h mersenne.h model.h modelgen.h \
 	msg.h object.h pak.h pakfile.h pcx.h png.h plugin.h pr_comp.h pr_debug.h \
-	pr_obj.h progs.h qargs.h qdefs.h qendian.h qfplist.h qtypes.h quakefs.h \
+	pr_obj.h pr_type.h progs.h qargs.h qdefs.h qendian.h qfplist.h qtypes.h \
+	quakefs.h \
 	quakeio.h render.h riff.h ruamoko.h screen.h script.h segtext.h set.h \
 	sizebuf.h skin.h sound.h spritegn.h sys.h teamplay.h tga.h uint32.h va.h \
 	ver_check.h vid.h vrect.h view.h wad.h wadfile.h winding.h zone.h \
diff --git a/include/QF/pr_type.h b/include/QF/pr_type.h
new file mode 100644
index 000000000..8e3f771df
--- /dev/null
+++ b/include/QF/pr_type.h
@@ -0,0 +1,107 @@
+/*
+	pr_type.h
+
+	object file type encoding support
+
+	Copyright (C) 2011 Bill Currie <bill@taniwha.org>
+
+	Author: Bill Currie <bill@taniwha.org>
+	Date: 2011/02/18
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+
+#ifndef __pr_type_h
+#define __pr_type_h
+
+/** \defgroup qfcc_qfo_type Object file type encoding
+	\ingroup progs
+
+	All \c pointer_t \c type fields are pointers within the type qfo_space.
+*/
+//@{
+
+#include "QF/pr_comp.h"
+
+typedef struct qfot_fldptr_s {
+	pr_int_t    type;				///< ev_field or ev_pointer
+	pointer_t   aux_type;			///< referenced type
+} qfot_fldptr_t;
+
+typedef struct qfot_func_s {
+	pr_int_t    type;				///< always ev_func
+	pointer_t   return_type;		///< return type of the function
+	pr_int_t    num_params;			///< ones compliment count of the
+									///< parameters. -ve values indicate the
+									///< number of real parameters before the
+									///< ellipsis
+	pointer_t   param_types[1];		///< variable length list of parameter
+									///< types
+} qfot_func_t;
+
+typedef struct qfot_var_s {
+	pointer_t   type;				///< type of field or self reference for
+									///< enum
+	string_t    name;				///< name of field/enumerator
+	pr_int_t    offset;				///< value for enum, 0 for union
+} qfot_var_t;
+
+typedef struct qfot_struct_s {
+	string_t    tag;				///< struct/union/enum tag
+	pr_int_t    num_fields;			///< number of fields/enumerators
+	qfot_var_t  fields[1];			///< variable length list of
+									///< fields/enumerators
+} qfot_struct_t;
+
+typedef struct qfot_array_s {
+	pointer_t   type;				///< element type
+	pr_int_t    base;				///< start index of array
+	pr_int_t    size;				///< number of elements in array
+} qfot_array_t;
+
+/**	QFO type encoding.
+
+	\note As this holds a union of all type representations, and those
+	representations may contain variable arrays, sizeof() will return only
+	one, rather useless, value. It is also not suitable for direct use in
+	arrays.
+*/
+typedef struct qfot_type_s {
+	pr_int_t    ty;					///< meta type: ty_meta_e
+	pr_int_t    size;				///< total word size of this encoding
+	string_t    encoding;			///< Objective-QC encoding
+	union {
+		pr_int_t    type;			///< basic type: etype_t
+		qfot_fldptr_t fldptr;		///< ty_none, ev_pointer/ev_field
+		qfot_func_t func;			///< ty_none, ev_func
+		qfot_struct_t strct;		///< ty_struct/ty_union/ty_enum
+		qfot_array_t array;			///< ty_array
+		pointer_t   class;			///< ty_class
+	}           t;
+} qfot_type_t;
+
+typedef struct qfot_type_encodings_s {
+	pointer_t   types;
+	pr_int_t    size;
+} qfot_type_encodings_t;
+
+//@}
+
+#endif//__pr_type_h
diff --git a/tools/qfcc/include/obj_type.h b/tools/qfcc/include/obj_type.h
index 1e559f45e..d9c677641 100644
--- a/tools/qfcc/include/obj_type.h
+++ b/tools/qfcc/include/obj_type.h
@@ -31,79 +31,10 @@
 #ifndef __obj_type_h
 #define __obj_type_h
 
-/** \defgroup qfcc_qfo_type Object file type encoding
-	\ingroup qfcc_qfo
-
-	All \c pointer_t \c type fields are pointers within the type qfo_space.
-*/
-//@{
-
-#include "QF/pr_comp.h"
+#include "QF/pr_type.h"
 
 #include "type.h"
 
-typedef struct qfot_fldptr_s {
-	pr_int_t    type;				///< ev_field or ev_pointer
-	pointer_t   aux_type;			///< referenced type
-} qfot_fldptr_t;
-
-typedef struct qfot_func_s {
-	pr_int_t    type;				///< always ev_func
-	pointer_t   return_type;		///< return type of the function
-	pr_int_t    num_params;			///< ones compliment count of the
-									///< parameters. -ve values indicate the
-									///< number of real parameters before the
-									///< ellipsis
-	pointer_t   param_types[1];		///< variable length list of parameter
-									///< types
-} qfot_func_t;
-
-typedef struct qfot_var_s {
-	pointer_t   type;				///< type of field or self reference for
-									///< enum
-	string_t    name;				///< name of field/enumerator
-	pr_int_t    offset;				///< value for enum, 0 for union
-} qfot_var_t;
-
-typedef struct qfot_struct_s {
-	string_t    tag;				///< struct/union/enum tag
-	pr_int_t    num_fields;			///< number of fields/enumerators
-	qfot_var_t  fields[1];			///< variable length list of
-									///< fields/enumerators
-} qfot_struct_t;
-
-typedef struct qfot_array_s {
-	pointer_t   type;				///< element type
-	pr_int_t    base;				///< start index of array
-	pr_int_t    size;				///< number of elements in array
-} qfot_array_t;
-
-/**	QFO type encoding.
-
-	\note As this holds a union of all type representations, and those
-	representations may contain variable arrays, sizeof() will return only
-	one, rather useless, value. It is also not suitable for direct use in
-	arrays.
-*/
-typedef struct qfot_type_s {
-	pr_int_t    ty;					///< meta type: ty_meta_e
-	pr_int_t    size;				///< total word size of this encoding
-	string_t    encoding;			///< Objective-QC encoding
-	union {
-		pr_int_t    type;			///< basic type: etype_t
-		qfot_fldptr_t fldptr;		///< ty_none, ev_pointer/ev_field
-		qfot_func_t func;			///< ty_none, ev_func
-		qfot_struct_t strct;		///< ty_struct/ty_union/ty_enum
-		qfot_array_t array;			///< ty_array
-		pointer_t   class;			///< ty_class
-	}           t;
-} qfot_type_t;
-
-typedef struct qfot_type_encodings_s {
-	pointer_t   types;
-	pr_int_t    size;
-} qfot_type_encodings_t;
-
 struct type_s;
 struct def_s *qfo_encode_type (struct type_s *type);
 

From 2ee36e8b9927f0a8fd6f37f38101ff1f92c402c0 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 9 Jun 2019 18:10:07 +0900
Subject: [PATCH 0216/1519] Rename qfot_type_t.ty to meta

When I did up a ruamoko implementation of a type encoding dumper, I
named the field meta, which feels much better than ty.
---
 include/QF/pr_type.h             |  2 +-
 tools/qfcc/source/dump_globals.c | 10 +++++-----
 tools/qfcc/source/linker.c       |  2 +-
 tools/qfcc/source/obj_file.c     |  6 +++---
 tools/qfcc/source/obj_type.c     |  2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/include/QF/pr_type.h b/include/QF/pr_type.h
index 8e3f771df..4cc6cf82e 100644
--- a/include/QF/pr_type.h
+++ b/include/QF/pr_type.h
@@ -84,7 +84,7 @@ typedef struct qfot_array_s {
 	arrays.
 */
 typedef struct qfot_type_s {
-	pr_int_t    ty;					///< meta type: ty_meta_e
+	pr_int_t    meta;				///< meta type: ty_meta_e
 	pr_int_t    size;				///< total word size of this encoding
 	string_t    encoding;			///< Objective-QC encoding
 	union {
diff --git a/tools/qfcc/source/dump_globals.c b/tools/qfcc/source/dump_globals.c
index 4361b7a57..71b769629 100644
--- a/tools/qfcc/source/dump_globals.c
+++ b/tools/qfcc/source/dump_globals.c
@@ -445,17 +445,17 @@ dump_qfo_types (qfo_t *qfo, int base_address)
 					qfo->spaces[qfo_type_space].data_size);
 			continue;
 		}
-		if (type->ty < 0 || type->ty >= NUM_META)
-			meta = va ("invalid meta: %d", type->ty);
+		if (type->meta < 0 || type->meta >= NUM_META)
+			meta = va ("invalid meta: %d", type->meta);
 		else
-			meta = ty_meta_names[type->ty];
+			meta = ty_meta_names[type->meta];
 		printf ("%-5x %-9s %-20s", type_ptr + base_address, meta,
 				QFO_TYPESTR (qfo, type_ptr));
-		if (type->ty < 0 || type->ty >= NUM_META) {
+		if (type->meta < 0 || type->meta >= NUM_META) {
 			puts ("");
 			break;
 		}
-		switch ((ty_meta_e) type->ty) {
+		switch ((ty_meta_e) type->meta) {
 			case ty_none:
 				printf (" %-10s", (type->t.type < 0
 								   || type->t.type >= ev_type_count)
diff --git a/tools/qfcc/source/linker.c b/tools/qfcc/source/linker.c
index 4d1c86e31..3f07ba7b0 100644
--- a/tools/qfcc/source/linker.c
+++ b/tools/qfcc/source/linker.c
@@ -414,7 +414,7 @@ process_type_def (defref_t *ref, qfo_mspace_t *space, qfo_def_t *old)
 		// mark the old type encoding as having been transfered, and save the
 		// new address in the encoding's class field so def and function types
 		// can be updated easily.
-		old_type->ty = -1;
+		old_type->meta = -1;
 		old_type->t.class = REF (ref)->offset;
 	}
 }
diff --git a/tools/qfcc/source/obj_file.c b/tools/qfcc/source/obj_file.c
index 428b733dc..10ca126f9 100644
--- a/tools/qfcc/source/obj_file.c
+++ b/tools/qfcc/source/obj_file.c
@@ -646,7 +646,7 @@ get_def_type (qfo_t *qfo, pointer_t type)
 	if (type >= qfo->spaces[qfo_type_space].data_size)
 		return ev_void;
 	type_def = QFO_POINTER (qfo, qfo_type_space, qfot_type_t, type);
-	switch ((ty_meta_e)type_def->ty) {
+	switch ((ty_meta_e)type_def->meta) {
 		case ty_none:
 			// field, pointer and function types store their basic type in
 			// the same location.
@@ -673,7 +673,7 @@ get_type_size (qfo_t *qfo, pointer_t type)
 	if (type >= qfo->spaces[qfo_type_space].data_size)
 		return 1;
 	type_def = QFO_POINTER (qfo, qfo_type_space, qfot_type_t, type);
-	switch ((ty_meta_e)type_def->ty) {
+	switch ((ty_meta_e)type_def->meta) {
 		case ty_none:
 			// field, pointer and function types store their basic type in
 			// the same location.
@@ -711,7 +711,7 @@ function_params (qfo_t *qfo, qfo_func_t *func, dfunction_t *df)
 	if (func->type >= qfo->spaces[qfo_type_space].data_size)
 		return;
 	type = QFO_POINTER (qfo, qfo_type_space, qfot_type_t, func->type);
-	if (type->ty != ty_none && type->t.type != ev_func)
+	if (type->meta != ty_none && type->t.type != ev_func)
 		return;
 	df->numparms = num_params = type->t.func.num_params;
 	if (num_params < 0)
diff --git a/tools/qfcc/source/obj_type.c b/tools/qfcc/source/obj_type.c
index 2b77a864f..55da5c137 100644
--- a/tools/qfcc/source/obj_type.c
+++ b/tools/qfcc/source/obj_type.c
@@ -87,7 +87,7 @@ qfo_new_encoding (type_t *type, int size)
 	def->offset = defspace_alloc_loc (pr.type_data, size);
 
 	enc = D_POINTER (qfot_type_t, def);
-	enc->ty = type->meta;
+	enc->meta = type->meta;
 	enc->size = size;
 	ENC_STR (enc->encoding, type->encoding);
 	return def;

From f68129dc0f457aac9964f1e30994feac0d773174 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 9 Jun 2019 18:11:56 +0900
Subject: [PATCH 0217/1519] Try to use type encodings for function return type

Now return statements in traces make much more sense.
---
 libs/gamecode/pr_debug.c | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/libs/gamecode/pr_debug.c b/libs/gamecode/pr_debug.c
index 9f5cdc818..8973e318c 100644
--- a/libs/gamecode/pr_debug.c
+++ b/libs/gamecode/pr_debug.c
@@ -46,6 +46,7 @@
 #include "QF/hash.h"
 #include "QF/mathlib.h"
 #include "QF/pr_debug.h"
+#include "QF/pr_type.h"
 #include "QF/progs.h"
 #include "QF/qendian.h"
 #include "QF/quakefs.h"
@@ -514,6 +515,26 @@ get_aux_function (progs_t *pr)
 	return pr->auxfunction_map[func - pr->pr_functions];
 }
 
+static etype_t
+get_etype (progs_t *pr, int typeptr)
+{
+	//FIXME cache .type_encodings def
+	ddef_t     *te_def = PR_FindGlobal (pr, ".type_encodings");
+	qfot_type_encodings_t *encodings;
+	qfot_type_t *type;
+
+	if (!te_def) {
+		// can't decode the type, so make no assumptions about it
+		return typeptr;
+	}
+	encodings = &G_STRUCT (pr, qfot_type_encodings_t, te_def->ofs);
+	type = &G_STRUCT (pr, qfot_type_t, encodings->types + typeptr);
+	if (type->meta == 0) {
+		return type->t.type;
+	}
+	return ev_void;
+}
+
 ddef_t *
 PR_Get_Local_Def (progs_t *pr, pr_int_t offs)
 {
@@ -885,7 +906,7 @@ PR_PrintStatement (progs_t *pr, dstatement_t *s, int contents)
 						optype = ev_void;
 						aux_func = get_aux_function (pr);
 						if (aux_func)
-							optype = aux_func->return_type;
+							optype = get_etype (pr, aux_func->return_type);
 						str = global_string (pr, opval, optype, contents & 1);
 						break;
 					case 'F':

From b7b6a89b91754ce28905f4a94cb01fe60f82b30d Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 9 Jun 2019 19:20:35 +0900
Subject: [PATCH 0218/1519] Simplify fold_constants

While this does break automatic type promotion, it does stop
fold_constants recursing through complex expressions: only the top level
expression needs to be folded, and then only if both sides are actually
constant.
---
 tools/qfcc/source/constfold.c | 78 +++++++++++------------------------
 1 file changed, 23 insertions(+), 55 deletions(-)

diff --git a/tools/qfcc/source/constfold.c b/tools/qfcc/source/constfold.c
index f44cb2b68..c4816907e 100644
--- a/tools/qfcc/source/constfold.c
+++ b/tools/qfcc/source/constfold.c
@@ -1456,34 +1456,12 @@ fold_constants (expr_t *e)
 	expr_t     *e1, *e2;
 	etype_t     t1, t2;
 
-	if (e->type == ex_block) {
-		expr_t     *block = new_block_expr ();
-		expr_t     *next;
-
-		block->e.block.result = e->e.block.result;
-		block->line = e->line;
-		block->file = e->file;
-
-		for (e = e->e.block.head; e; e = next) {
-			next = e->next;
-			e = fold_constants (e);
-			e->next = 0;
-			append_expr (block, e);
-		}
-
-		return block;
-	}
-	if (e->type == ex_bool) {
-		e->e.bool.e = fold_constants (e->e.bool.e);
-		return e;
-	}
 	if (e->type == ex_uexpr) {
-		if (!e->e.expr.e1)
+		e1 = e->e.expr.e1;
+		if (!e1 || !is_constant (e1)) {
 			return e;
+		}
 		op = e->e.expr.op;
-		e->e.expr.e1 = e1 = fold_constants (e->e.expr.e1);
-		if (e1->type == ex_error)
-			return e1;
 		if (op == 'A' || op == 'g' || op == 'r')
 			return e;
 		t1 = extract_type (e1);
@@ -1492,35 +1470,25 @@ fold_constants (expr_t *e)
 			internal_error (e, "invalid type: %d", t1);
 		}
 		return do_unary_op[t1] (op, e, e1);
+	} else if (e->type == ex_expr) {
+		e1 = e->e.expr.e1;
+		e2 = e->e.expr.e2;
+		if (!is_constant (e1) || !is_constant (e2)) {
+			return e;
+		}
+
+		op = e->e.expr.op;
+		if (op == 'i' || op == 'n' || op == 'c' || op == 's') {
+			return e;
+		}
+
+		t1 = extract_type (e1);
+		t2 = extract_type (e2);
+
+		if (t1 >= ev_type_count || t2 >= ev_type_count
+			|| !do_op[t1] || !do_op[t1][t2])
+			internal_error (e, "invalid type");
+		return do_op[t1][t2] (op, e, e1, e2);
 	}
-
-	if (e->type != ex_expr)
-		return e;
-
-	op = e->e.expr.op;
-
-	e->e.expr.e1 = e1 = fold_constants (e->e.expr.e1);
-	if (e1->type == ex_error)
-		return e1;
-	t1 = extract_type (e1);
-
-	if (op == 'i' || op == 'n' || op == 'c')
-		return e;
-
-	e->e.expr.e2 = e2 = fold_constants (e->e.expr.e2);
-	if (e2->type == ex_error)
-		return e2;
-
-	if (e2->type == ex_label || e2->type == ex_labelref)
-		return e;
-
-	t2 = extract_type (e2);
-
-	if (op == 's')
-		return e;
-
-	if (t1 >= ev_type_count || t2 >= ev_type_count
-		|| !do_op[t1] || !do_op[t1][t2])
-		internal_error (e, "invalid type");
-	return do_op[t1][t2] (op, e, e1, e2);
+	return e;
 }

From d9c96862883926e89e6cb11fb61cdab109c8ffcf Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 9 Jun 2019 19:23:23 +0900
Subject: [PATCH 0219/1519] Make initialized globals non-constant

This is for modern code. Traditional code still treats initialized
globals as constant and nosave. This will make a bit of a mess of
modern code that expects traditional behavior.
---
 tools/qfcc/source/def.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tools/qfcc/source/def.c b/tools/qfcc/source/def.c
index 1bc1faf81..6b4b6449f 100644
--- a/tools/qfcc/source/def.c
+++ b/tools/qfcc/source/def.c
@@ -578,8 +578,11 @@ initialize_def (symbol_t *sym, expr_t *init, defspace_t *space,
 							type_size (sym->type) * sizeof (pr_type_t));
 				}
 			}
-			sym->s.def->initialized = sym->s.def->constant = 1;
-			sym->s.def->nosave = 1;
+			sym->s.def->initialized = 1;
+			if (options.traditional) {
+				sym->s.def->constant = 1;
+				sym->s.def->nosave = 1;
+			}
 		}
 	}
 	sym->s.def->initializer = init;

From e849c2d1ceb1bf9fd297ca5fbedf38805f285932 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 9 Jun 2019 19:29:21 +0900
Subject: [PATCH 0220/1519] Mark block expr result as rvalue when used as one

At least for return. There may be other cases that need it, but this
fixes comma-expr.r (minus int->float promotion issues).
---
 tools/qfcc/source/expr.c       | 3 +++
 tools/qfcc/source/qc-parse.y   | 2 +-
 tools/qfcc/source/statements.c | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index c6bed8e39..257d5bd19 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -2021,6 +2021,9 @@ return_expr (function_t *f, expr_t *e)
 	if (e->type == ex_vector) {
 		e = assign_expr (new_temp_def_expr (t), e);
 	}
+	if (e->type == ex_block) {
+		e->e.block.result->rvalue = 1;
+	}
 	return new_unary_expr ('r', e);
 }
 
diff --git a/tools/qfcc/source/qc-parse.y b/tools/qfcc/source/qc-parse.y
index c8c269d27..cb1b28ea3 100644
--- a/tools/qfcc/source/qc-parse.y
+++ b/tools/qfcc/source/qc-parse.y
@@ -1351,7 +1351,7 @@ cexpr
 		{
 			if ($1->next) {
 				expr_t     *res = $1;
-				$1 = build_block_expr ($1->next);
+				$1 = build_block_expr ($1);
 				$1->e.block.result = res;
 			}
 			$$ = $1;
diff --git a/tools/qfcc/source/statements.c b/tools/qfcc/source/statements.c
index f78575fe0..948b5558f 100644
--- a/tools/qfcc/source/statements.c
+++ b/tools/qfcc/source/statements.c
@@ -1273,7 +1273,7 @@ statement_uexpr (sblock_t *sblock, expr_t *e)
 static sblock_t *
 statement_nonexec (sblock_t *sblock, expr_t *e)
 {
-	if (options.warnings.executable)
+	if (!e->rvalue && options.warnings.executable)
 		warning (e, "Non-executable statement; executing programmer instead.");
 	return sblock;
 }

From 8cef85e5de451c4e00c298c5e9d64f16fe248288 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 9 Jun 2019 20:12:50 +0900
Subject: [PATCH 0221/1519] Cast scalar types when necessary on assignment

This fixes type promotion errors that broke some tests.
---
 tools/qfcc/source/expr_assign.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tools/qfcc/source/expr_assign.c b/tools/qfcc/source/expr_assign.c
index 7cf1d8b4d..1662d6b10 100644
--- a/tools/qfcc/source/expr_assign.c
+++ b/tools/qfcc/source/expr_assign.c
@@ -142,7 +142,15 @@ check_types_compatible (expr_t *dst, expr_t *src)
 	type_t     *dst_type = get_type (dst);
 	type_t     *src_type = get_type (src);
 
+	if (dst_type == src_type) {
+		return 0;
+	}
+
 	if (type_assignable (dst_type, src_type)) {
+		if (is_scalar (dst_type) && is_scalar (src_type)) {
+			// the types are different but cast-compatible
+			return assign_expr (dst, cast_expr (dst_type, src));
+		}
 		return 0;
 	}
 	// traditional qcc is a little sloppy

From f49303e774c8b6696048a610210cd0a04bfece99 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 9 Jun 2019 21:21:41 +0900
Subject: [PATCH 0222/1519] Emit code for address expressions

It helps if the necessary code is actually emitted in the first place.
---
 tools/qfcc/source/expr.c       |  1 +
 tools/qfcc/source/statements.c | 10 ++++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index 257d5bd19..9bc14fa9d 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -2238,6 +2238,7 @@ address_expr (expr_t *e1, expr_t *e2, type_t *t)
 			return new_label_ref (&e1->e.label);
 		case ex_temp:
 			e = new_unary_expr ('&', e1);
+			e->e.expr.type = pointer_type (t);
 			break;
 		default:
 			return error (e1, "invalid type for unary &");
diff --git a/tools/qfcc/source/statements.c b/tools/qfcc/source/statements.c
index 948b5558f..79f2ba3d3 100644
--- a/tools/qfcc/source/statements.c
+++ b/tools/qfcc/source/statements.c
@@ -706,10 +706,12 @@ expr_call (sblock_t *sblock, expr_t *call, operand_t **op)
 static sblock_t *
 expr_address (sblock_t *sblock, expr_t *e, operand_t **op)
 {
-	if (e->type == ex_uexpr) {
-		sblock = statement_subexpr (sblock, e->e.expr.e1, op);
-		(*op)->type = ev_pointer;
-	}
+	statement_t *s;
+	s = new_statement (st_expr, "&", e);
+	sblock = statement_subexpr (sblock, e->e.expr.e1, &s->opa);
+	s->opc = temp_operand (e->e.expr.type);
+	sblock_add_statement (sblock, s);
+	*(op) = s->opc;
 	return sblock;
 }
 

From 6253623e9b5909fe0b2d7bf7691d422b5e38ede4 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 9 Jun 2019 21:23:06 +0900
Subject: [PATCH 0223/1519] Remove some weird dereference code

It appears to have been an attempt at optimizing dereferences, but it
instead just utterly mangled them.
---
 tools/qfcc/source/statements.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/tools/qfcc/source/statements.c b/tools/qfcc/source/statements.c
index 79f2ba3d3..fb55412e1 100644
--- a/tools/qfcc/source/statements.c
+++ b/tools/qfcc/source/statements.c
@@ -567,11 +567,6 @@ expr_assign (sblock_t *sblock, expr_t *e, operand_t **op)
 			sblock = statement_subexpr (sblock, dst_expr->e.expr.e1, &dst);
 			sblock = statement_subexpr (sblock, dst_expr->e.expr.e2, &ofs);
 		} else {
-			if (dst_expr->type == ex_uexpr
-				&& dst_expr->e.expr.op == '&') {
-				opcode = "=";
-				dst_expr = unary_expr ('.', dst_expr);
-			}
 			sblock = statement_subexpr (sblock, dst_expr, &dst);
 			ofs = 0;
 		}

From e46a44d9c641ed1efa020724259f98ea6fc0b038 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 9 Jun 2019 21:25:03 +0900
Subject: [PATCH 0224/1519] Update TODO

---
 tools/qfcc/TODO | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/qfcc/TODO b/tools/qfcc/TODO
index ed68de57c..5bce50696 100644
--- a/tools/qfcc/TODO
+++ b/tools/qfcc/TODO
@@ -12,7 +12,7 @@ M	unnamed function parameters for prototypes/typdefs etc.
 I	optimizations (esp CSE)
 I	fix used/uninitialized warnings
 o	id id;
-o	vec = [x, y, z]; expressions (nice feature in fteqcc)
+M	vec = [x, y, z]; expressions (nice feature in fteqcc)
 M	finish -Fifstring
 o	isset() intrinsic for more consistent string handling.
 o	arrays in entities

From f70801fa52dbf4bb414a70ba35d07bb1356d49b4 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 9 Jun 2019 21:44:58 +0900
Subject: [PATCH 0225/1519] Add a test for accessing an array in a struct

That's accessed via a pointer. Whee. However, at this stage, the problem
is really a promotion issue for short -> integer.
---
 tools/qfcc/test/Makefile.am   | 10 ++++++++++
 tools/qfcc/test/structarray.r | 20 ++++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 tools/qfcc/test/structarray.r

diff --git a/tools/qfcc/test/Makefile.am b/tools/qfcc/test/Makefile.am
index c0d7bade0..0e9e39e81 100644
--- a/tools/qfcc/test/Makefile.am
+++ b/tools/qfcc/test/Makefile.am
@@ -43,6 +43,7 @@ test_progs_dat=\
 	return-ivar.dat \
 	sendv.dat \
 	state.dat \
+	structarray.dat \
 	structlive.dat \
 	structptr.dat \
 	swap.dat \
@@ -198,6 +199,15 @@ state.run: Makefile build-run
 include ./$(DEPDIR)/state.Qo # am--include-marker
 r_depfiles_remade += ./$(DEPDIR)/state.Qo
 
+structarray_dat_SOURCES=structarray.r
+structarray_obj=$(structarray_dat_SOURCES:.r=.qfo)
+structarray.dat$(EXEEXT): $(structarray_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(structarray_obj)
+structarray.run: Makefile build-run
+	$(srcdir)/build-run $@
+include ./$(DEPDIR)/structarray.Qo # am--include-marker
+r_depfiles_remade += ./$(DEPDIR)/structarray.Qo
+
 structlive_dat_SOURCES=structlive.r
 structlive_obj=$(structlive_dat_SOURCES:.r=.qfo)
 structlive.dat$(EXEEXT): $(structlive_obj) $(QFCC_DEP)
diff --git a/tools/qfcc/test/structarray.r b/tools/qfcc/test/structarray.r
new file mode 100644
index 000000000..d6c67171a
--- /dev/null
+++ b/tools/qfcc/test/structarray.r
@@ -0,0 +1,20 @@
+void printf (string fmt, ...) = #0;
+void *obj_malloc (int size) = #0;
+
+typedef struct {
+	int         val;
+	int         cap;
+	int         ofs[];
+} valstruct_t;
+
+valstruct_t *vs;
+int dst;
+
+int
+main ()
+{
+	for (int i = 0; i < 2; i++) {
+		dst = vs.ofs[i];
+	}
+	return 1;
+}

From 227ac46ffe972a990e7d78a0fcb7d7c113194c0b Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 9 Jun 2019 22:25:55 +0900
Subject: [PATCH 0226/1519] Clean up array expression processing

And make sure constants are folded since fold_constants is no longer
recursive.
---
 tools/qfcc/source/expr.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index 9bc14fa9d..609d602e0 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -2106,6 +2106,8 @@ array_expr (expr_t *array, expr_t *index)
 	type_t     *array_type = get_type (array);
 	type_t     *index_type = get_type (index);
 	expr_t     *scale;
+	expr_t     *offset;
+	expr_t     *base;
 	expr_t     *e;
 	int         ind = 0;
 
@@ -2128,12 +2130,10 @@ array_expr (expr_t *array, expr_t *index)
 			|| ind - array_type->t.array.base >= array_type->t.array.size))
 			return error (index, "array index out of bounds");
 	scale = new_integer_expr (type_size (array_type->t.array.type));
-	index = binary_expr ('*', index, scale);
-	index = binary_expr ('-', index,
-				 binary_expr ('*',
-							  new_integer_expr (array_type->t.array.base),
-							  scale));
-	index = fold_constants (index);
+	index = fold_constants (binary_expr ('*', index, scale));
+	base = new_integer_expr (array_type->t.array.base);
+	offset = fold_constants (binary_expr ('*', base, scale));
+	index = fold_constants (binary_expr ('-', index, offset));
 	if (is_short_val (index))
 		ind = expr_short (index);
 	if (is_integer_val (index))

From 439cd15620af1c556aeeec9b722b660ba6e2f90f Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 9 Jun 2019 22:26:57 +0900
Subject: [PATCH 0227/1519] Do type promotion for short

fold_constants used to do this when it was overly aggressive. Fixes the
ICE when accessing an array in a struct via a pointer.
---
 tools/qfcc/source/expr_binary.c | 88 ++++++++++++++++-----------------
 1 file changed, 44 insertions(+), 44 deletions(-)

diff --git a/tools/qfcc/source/expr_binary.c b/tools/qfcc/source/expr_binary.c
index b3717c1e8..8b0c5a485 100644
--- a/tools/qfcc/source/expr_binary.c
+++ b/tools/qfcc/source/expr_binary.c
@@ -269,22 +269,22 @@ static expr_type_t integer_uinteger[] = {
 };
 
 static expr_type_t integer_short[] = {
-	{'+',	&type_integer},
-	{'-',	&type_integer},
-	{'*',	&type_integer},
-	{'/',	&type_integer},
-	{'&',	&type_integer},
-	{'|',	&type_integer},
-	{'^',	&type_integer},
-	{'%',	&type_integer},
-	{SHL,	&type_integer},
-	{SHR,	&type_integer},
-	{EQ,	&type_integer},
-	{NE,	&type_integer},
-	{LE,	&type_integer},
-	{GE,	&type_integer},
-	{LT,	&type_integer},
-	{GT,	&type_integer},
+	{'+',	&type_integer, 0, &type_integer},
+	{'-',	&type_integer, 0, &type_integer},
+	{'*',	&type_integer, 0, &type_integer},
+	{'/',	&type_integer, 0, &type_integer},
+	{'&',	&type_integer, 0, &type_integer},
+	{'|',	&type_integer, 0, &type_integer},
+	{'^',	&type_integer, 0, &type_integer},
+	{'%',	&type_integer, 0, &type_integer},
+	{SHL,	&type_integer, 0, &type_integer},
+	{SHR,	&type_integer, 0, &type_integer},
+	{EQ,	&type_integer, 0, &type_integer},
+	{NE,	&type_integer, 0, &type_integer},
+	{LE,	&type_integer, 0, &type_integer},
+	{GE,	&type_integer, 0, &type_integer},
+	{LT,	&type_integer, 0, &type_integer},
+	{GT,	&type_integer, 0, &type_integer},
 	{0, 0}
 };
 
@@ -340,42 +340,42 @@ static expr_type_t uinteger_uinteger[] = {
 #define short_quat integer_quat
 
 static expr_type_t short_integer[] = {
-	{'+',	&type_integer},
-	{'-',	&type_integer},
-	{'*',	&type_integer},
-	{'/',	&type_integer},
-	{'&',	&type_integer},
-	{'|',	&type_integer},
-	{'^',	&type_integer},
-	{'%',	&type_integer},
+	{'+',	&type_integer, &type_integer, 0},
+	{'-',	&type_integer, &type_integer, 0},
+	{'*',	&type_integer, &type_integer, 0},
+	{'/',	&type_integer, &type_integer, 0},
+	{'&',	&type_integer, &type_integer, 0},
+	{'|',	&type_integer, &type_integer, 0},
+	{'^',	&type_integer, &type_integer, 0},
+	{'%',	&type_integer, &type_integer, 0},
 	{SHL,	&type_short},
 	{SHR,	&type_short},
-	{EQ,	&type_integer},
-	{NE,	&type_integer},
-	{LE,	&type_integer},
-	{GE,	&type_integer},
-	{LT,	&type_integer},
-	{GT,	&type_integer},
+	{EQ,	&type_integer, &type_integer, 0},
+	{NE,	&type_integer, &type_integer, 0},
+	{LE,	&type_integer, &type_integer, 0},
+	{GE,	&type_integer, &type_integer, 0},
+	{LT,	&type_integer, &type_integer, 0},
+	{GT,	&type_integer, &type_integer, 0},
 	{0, 0}
 };
 
 static expr_type_t short_uinteger[] = {
-	{'+',	&type_uinteger},
-	{'-',	&type_uinteger},
-	{'*',	&type_uinteger},
-	{'/',	&type_uinteger},
-	{'&',	&type_uinteger},
-	{'|',	&type_uinteger},
-	{'^',	&type_uinteger},
-	{'%',	&type_uinteger},
+	{'+',	&type_uinteger, &type_uinteger, 0},
+	{'-',	&type_uinteger, &type_uinteger, 0},
+	{'*',	&type_uinteger, &type_uinteger, 0},
+	{'/',	&type_uinteger, &type_uinteger, 0},
+	{'&',	&type_uinteger, &type_uinteger, 0},
+	{'|',	&type_uinteger, &type_uinteger, 0},
+	{'^',	&type_uinteger, &type_uinteger, 0},
+	{'%',	&type_uinteger, &type_uinteger, 0},
 	{SHL,	&type_short},
 	{SHR,	&type_short},
-	{EQ,	&type_integer},
-	{NE,	&type_integer},
-	{LE,	&type_integer},
-	{GE,	&type_integer},
-	{LT,	&type_integer},
-	{GT,	&type_integer},
+	{EQ,	&type_integer, &type_uinteger, 0},
+	{NE,	&type_integer, &type_uinteger, 0},
+	{LE,	&type_integer, &type_uinteger, 0},
+	{GE,	&type_integer, &type_uinteger, 0},
+	{LT,	&type_integer, &type_uinteger, 0},
+	{GT,	&type_integer, &type_uinteger, 0},
 	{0, 0}
 };
 

From c98d1ff08c8551d861c1434453ce60c211598e94 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 9 Jun 2019 22:29:51 +0900
Subject: [PATCH 0228/1519] Document some problems with nil

While he's a pretty cool character in HZD, he seems to have some
identity problems when in a compiler.
---
 ruamoko/cl_menu/plistmenu.r            |  2 +-
 tools/qfcc/source/problem_with_nil.txt | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 tools/qfcc/source/problem_with_nil.txt

diff --git a/ruamoko/cl_menu/plistmenu.r b/ruamoko/cl_menu/plistmenu.r
index 04d4355b7..d5e722377 100644
--- a/ruamoko/cl_menu/plistmenu.r
+++ b/ruamoko/cl_menu/plistmenu.r
@@ -142,7 +142,7 @@ string_from_plist (PLString *plstring)
 	local @param ret;
 	local string str = [plstring string];
 
-	ret.quaternion_val = nil;	//FIXME should be ret = nil;
+	ret = nil;	//FIXME should be ret = nil;
 	if (str_mid (str, 0, 1) == "[")
 		return rect_from_plist (plstring);
 
diff --git a/tools/qfcc/source/problem_with_nil.txt b/tools/qfcc/source/problem_with_nil.txt
new file mode 100644
index 000000000..4172aea0e
--- /dev/null
+++ b/tools/qfcc/source/problem_with_nil.txt
@@ -0,0 +1,12 @@
+The problem with nil is more a problem with @param and values.
+
+@param values used type_nil's low-level type, which is either quaternion
+or vector (v6 progs). Thus returning (or passing?) nil through @param
+creates a value that has type_param built low-level type quaternion.
+Then assigning nil to a quaternion finds the param nil (because the
+value and low-level type is checked) which has the wrong type for type
+checks.
+
+one solution is to create an ev_param type (convert to quaternion or
+vector for v6 progs) that the VM either ignores or can copy around
+ev_param data.

From 3196bcc851c327829ded885f3fd2656e3c3b1a59 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 9 Jun 2019 22:34:23 +0900
Subject: [PATCH 0229/1519] Allow fold_constants to handle some math identities

Such as x*0 -> 0, x*1 -> x, x+0 ->x, etc.
---
 tools/qfcc/source/constfold.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/qfcc/source/constfold.c b/tools/qfcc/source/constfold.c
index c4816907e..33746c8e9 100644
--- a/tools/qfcc/source/constfold.c
+++ b/tools/qfcc/source/constfold.c
@@ -1458,7 +1458,7 @@ fold_constants (expr_t *e)
 
 	if (e->type == ex_uexpr) {
 		e1 = e->e.expr.e1;
-		if (!e1 || !is_constant (e1)) {
+		if (!e1) {
 			return e;
 		}
 		op = e->e.expr.op;
@@ -1473,7 +1473,7 @@ fold_constants (expr_t *e)
 	} else if (e->type == ex_expr) {
 		e1 = e->e.expr.e1;
 		e2 = e->e.expr.e2;
-		if (!is_constant (e1) || !is_constant (e2)) {
+		if (!is_constant (e1) && !is_constant (e2)) {
 			return e;
 		}
 

From 00f12263cafd73c51f7146624c80bca6bb1294de Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 9 Jun 2019 22:55:38 +0900
Subject: [PATCH 0230/1519] Fix casting arrays to pointers

---
 tools/qfcc/source/expr.c      | 5 +++--
 tools/qfcc/test/structarray.r | 5 ++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index 609d602e0..74a81369f 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -2537,8 +2537,9 @@ cast_expr (type_t *type, expr_t *e)
 		&& !(is_scalar (type) && is_scalar (e_type))) {
 		return cast_error (e, e_type, type);
 	}
-	if (is_array (e_type))
-		return address_expr (e, 0, 0);
+	if (is_array (e_type)) {
+		return address_expr (e, 0, type->t.fldptr.type);
+	}
 	if (is_constant (e) && is_scalar (type) && is_scalar (e_type)) {
 		ex_value_t *val = 0;
 		if (e->type == ex_symbol && e->e.symbol->sy_type == sy_const) {
diff --git a/tools/qfcc/test/structarray.r b/tools/qfcc/test/structarray.r
index d6c67171a..7cdb58d99 100644
--- a/tools/qfcc/test/structarray.r
+++ b/tools/qfcc/test/structarray.r
@@ -7,14 +7,17 @@ typedef struct {
 	int         ofs[];
 } valstruct_t;
 
+int foo[5] = {1, 2, 3, 4, 5};
 valstruct_t *vs;
 int dst;
 
 int
 main ()
 {
+	vs = (valstruct_t *)foo;
 	for (int i = 0; i < 2; i++) {
 		dst = vs.ofs[i];
 	}
-	return 1;
+	printf("dst = %d\n", dst);
+	return dst != 4;
 }

From 28a2b968005a0908e9731a21dc6a29045f8809b0 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 9 Jun 2019 23:11:38 +0900
Subject: [PATCH 0231/1519] Implement automatic array sizing from initializer

---
 tools/qfcc/source/def.c       | 15 +++++++++++++++
 tools/qfcc/test/structarray.r |  4 ++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/tools/qfcc/source/def.c b/tools/qfcc/source/def.c
index 6b4b6449f..4c16060ea 100644
--- a/tools/qfcc/source/def.c
+++ b/tools/qfcc/source/def.c
@@ -483,6 +483,16 @@ init_field_def (def_t *def, expr_t *init, storage_class_t storage)
 	}
 }
 
+static int
+num_elements (expr_t *e)
+{
+	int         count = 0;
+	for (e = e->e.block.head; e; e = e->next) {
+		count++;
+	}
+	return count;
+}
+
 void
 initialize_def (symbol_t *sym, expr_t *init, defspace_t *space,
 				storage_class_t storage)
@@ -520,6 +530,11 @@ initialize_def (symbol_t *sym, expr_t *init, defspace_t *space,
 		sym->s.def = 0;
 	}
 	if (!sym->s.def) {
+		if (is_array (sym->type) && !type_size (sym->type)
+			&& init->type == ex_block && !init->e.block.result) {
+			sym->type = array_type (sym->type->t.array.type,
+									num_elements (init));
+		}
 		sym->s.def = new_def (sym->name, sym->type, space, storage);
 		reloc_attach_relocs (relocs, &sym->s.def->relocs);
 	}
diff --git a/tools/qfcc/test/structarray.r b/tools/qfcc/test/structarray.r
index 7cdb58d99..74d64214e 100644
--- a/tools/qfcc/test/structarray.r
+++ b/tools/qfcc/test/structarray.r
@@ -7,7 +7,7 @@ typedef struct {
 	int         ofs[];
 } valstruct_t;
 
-int foo[5] = {1, 2, 3, 4, 5};
+int foo[] = {1, 2, 3, 4, 5};
 valstruct_t *vs;
 int dst;
 
@@ -19,5 +19,5 @@ main ()
 		dst = vs.ofs[i];
 	}
 	printf("dst = %d\n", dst);
-	return dst != 4;
+	return sizeof(foo) != 5 || dst != 4;
 }

From bf0543f7fbf9c534becc710b3d7ea9fd062da5f3 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 10 Jun 2019 00:19:48 +0900
Subject: [PATCH 0232/1519] Be paranoid about temp var sizes

Prevents array index errors.
---
 tools/qfcc/source/def.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/qfcc/source/def.c b/tools/qfcc/source/def.c
index 4c16060ea..facf82348 100644
--- a/tools/qfcc/source/def.c
+++ b/tools/qfcc/source/def.c
@@ -199,6 +199,9 @@ temp_def (etype_t type, int size)
 	def_t      *temp;
 	defspace_t *space = current_func->symtab->space;
 
+	if (size < 1 || size > 4) {
+		internal_error (0, "%d invalid size for temp def", size);
+	}
 	if ((temp = current_func->temp_defs[size - 1])) {
 		current_func->temp_defs[size - 1] = temp->temp_next;
 		temp->temp_next = 0;

From ef4ad52239f9be8ca68987b8a85f698b806444f3 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 10 Jun 2019 00:36:13 +0900
Subject: [PATCH 0233/1519] Make binary_expr fold constants

This is where constant folding should have happened all along. While
unary_expr should fold constants too, it seems to already try to do so
and it's a bit much of a mess to clean up right now.
---
 tools/qfcc/source/expr.c        |  8 ++++----
 tools/qfcc/source/expr_binary.c | 35 ++++++++++++++++++++++++++++-----
 tools/qfcc/source/qc-parse.y    | 33 +++++++++++++------------------
 tools/qfcc/source/switch.c      |  2 --
 4 files changed, 48 insertions(+), 30 deletions(-)

diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index 74a81369f..e2225d2bc 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -1280,7 +1280,7 @@ test_expr (expr_t *e)
 	new = binary_expr (NE, e, new);
 	new->line = e->line;
 	new->file = e->file;
-	return fold_constants (new);
+	return new;
 }
 
 void
@@ -2130,10 +2130,10 @@ array_expr (expr_t *array, expr_t *index)
 			|| ind - array_type->t.array.base >= array_type->t.array.size))
 			return error (index, "array index out of bounds");
 	scale = new_integer_expr (type_size (array_type->t.array.type));
-	index = fold_constants (binary_expr ('*', index, scale));
+	index = binary_expr ('*', index, scale);
 	base = new_integer_expr (array_type->t.array.base);
-	offset = fold_constants (binary_expr ('*', base, scale));
-	index = fold_constants (binary_expr ('-', index, offset));
+	offset = binary_expr ('*', base, scale);
+	index = binary_expr ('-', index, offset);
 	if (is_short_val (index))
 		ind = expr_short (index);
 	if (is_integer_val (index))
diff --git a/tools/qfcc/source/expr_binary.c b/tools/qfcc/source/expr_binary.c
index 8b0c5a485..d53d3677c 100644
--- a/tools/qfcc/source/expr_binary.c
+++ b/tools/qfcc/source/expr_binary.c
@@ -42,8 +42,11 @@ typedef struct {
 	type_t     *type;
 	type_t     *a_cast;
 	type_t     *b_cast;
+	expr_t     *(*process)(int op, expr_t *e1, expr_t *e2);
 } expr_type_t;
 
+static expr_t *pointer_arithmetic (int op, expr_t *e1, expr_t *e2);
+
 static expr_type_t string_string[] = {
 	{'+',	&type_string},
 	{EQ,	&type_integer},
@@ -157,8 +160,8 @@ static expr_type_t pointer_pointer[] = {
 };
 
 static expr_type_t pointer_integer[] = {
-	{'+',	&type_pointer},
-	{'-',	&type_pointer},
+	{'+',	0, 0, 0, pointer_arithmetic},
+	{'-',	0, 0, 0, pointer_arithmetic},
 	{0, 0}
 };
 #define pointer_uinteger pointer_integer
@@ -218,7 +221,7 @@ static expr_type_t integer_vector[] = {
 };
 
 static expr_type_t integer_pointer[] = {
-	{'+',	&type_pointer},
+	{'+',	&type_pointer, 0, &type_integer},
 	{0, 0}
 };
 
@@ -579,6 +582,25 @@ static expr_type_t **binary_expr_types[] = {
 	short_x,
 };
 
+static expr_t *
+pointer_arithmetic (int op, expr_t *e1, expr_t *e2)
+{
+	expr_t     *e;
+	type_t     *ptype = get_type (e1);
+
+	if (!is_pointer (ptype)) {
+		ptype = get_type (e2);
+	}
+	if (!is_pointer (ptype)) {
+		internal_error (e1, "pointer arithmetic on non-pointers");
+	}
+
+	e1 = cast_expr (&type_integer, e1);
+	e2 = cast_expr (&type_integer, e2);
+	e = binary_expr (op, e1, e2);
+	return cast_expr (ptype, e);
+}
+
 static expr_t *
 invalid_binary_expr (int op, expr_t *e1, expr_t *e2)
 {
@@ -780,9 +802,12 @@ binary_expr (int op, expr_t *e1, expr_t *e2)
 		e1 = cast_expr (expr_type->a_cast, e1);
 	if (expr_type->b_cast)
 		e2 = cast_expr (expr_type->b_cast, e2);
+	if (expr_type->process) {
+		return fold_constants (expr_type->process (op, e1, e2));
+	}
 
 	if ((e = reimplement_binary_expr (op, e1, e2)))
-		return e;
+		return fold_constants (e);
 
 	e = new_binary_expr (op, e1, e2);
 	e->e.expr.type = expr_type->type;
@@ -790,5 +815,5 @@ binary_expr (int op, expr_t *e1, expr_t *e2)
 		if (options.code.progsversion == PROG_ID_VERSION)
 			e->e.expr.type = &type_float;
 	}
-	return e;
+	return fold_constants (e);
 }
diff --git a/tools/qfcc/source/qc-parse.y b/tools/qfcc/source/qc-parse.y
index cb1b28ea3..eba38584d 100644
--- a/tools/qfcc/source/qc-parse.y
+++ b/tools/qfcc/source/qc-parse.y
@@ -180,7 +180,7 @@ int yylex (void);
 %type	<symbol>	methoddef
 %type	<expr>		opt_initializer var_initializer local_def
 
-%type	<expr>		opt_init opt_expr cexpr fexpr expr element_list element
+%type	<expr>		opt_init opt_expr cexpr expr element_list element
 %type	<expr>		optional_state_expr texpr vector_expr
 %type	<expr>		statement statements compound_statement
 %type	<expr>		else label break_label continue_label
@@ -577,7 +577,7 @@ enumerator_list
 
 enumerator
 	: identifier				{ add_enum ($<symbol>0, $1, 0); }
-	| identifier '=' fexpr		{ add_enum ($<symbol>0, $1, $3); }
+	| identifier '=' expr		{ add_enum ($<symbol>0, $1, $3); }
 	;
 
 struct_specifier
@@ -846,9 +846,8 @@ abs_decl
 	;
 
 array_decl
-	: '[' fexpr ']'
+	: '[' expr ']'
 		{
-			$2 = fold_constants ($2);
 			if (!is_integer_val ($2) || expr_integer ($2) < 1) {
 				error (0, "invalid array size");
 				$$ = 0;
@@ -971,11 +970,11 @@ overloaded_identifier
 	;
 
 non_code_func
-	: '=' '#' fexpr
+	: '=' '#' expr
 		{
 			build_builtin_function ($<symbol>0, $3, 0);
 		}
-	| '=' fexpr
+	| '=' expr
 		{
 			symbol_t   *sym = $<symbol>0;
 			specifier_t spec = $<spec>-1;
@@ -1023,7 +1022,7 @@ opt_initializer
 	;
 
 var_initializer
-	: '=' fexpr									{ $$ = $2; }
+	: '=' expr									{ $$ = $2; }
 	| '=' '{' element_list optional_comma '}'	{ $$ = $3; }
 	;
 
@@ -1046,7 +1045,7 @@ element_list
 
 element
 	: '{' element_list optional_comma '}'		{ $$ = $2; }
-	| fexpr									{ $$ = $1; }
+	| expr										{ $$ = $1; }
 	;
 
 optional_comma
@@ -1128,7 +1127,7 @@ statement
 			else
 				error (0, "continue outside of loop");
 		}
-	| CASE fexpr ':'
+	| CASE expr ':'
 		{
 			$$ = case_label_expr (switch_block, $2);
 		}
@@ -1136,7 +1135,7 @@ statement
 		{
 			$$ = case_label_expr (switch_block, 0);
 		}
-	| SWITCH break_label '(' fexpr switch_block ')' compound_statement
+	| SWITCH break_label '(' expr switch_block ')' compound_statement
 		{
 			$$ = switch_expr (switch_block, break_label, $7);
 			switch_block = $5;
@@ -1295,7 +1294,7 @@ unary_expr
 	;
 
 vector_expr
-	: '[' fexpr ',' arg_list ']'
+	: '[' expr ',' arg_list ']'
 		{
 			expr_t     *t = $4;
 			while (t->next)
@@ -1338,12 +1337,8 @@ expr
 	| expr '%' expr				{ $$ = binary_expr ('%', $1, $3); }
 	;
 
-fexpr
-	: expr						{ $$ = fold_constants ($1); }
-	;
-
 texpr
-	: fexpr						{ $$ = convert_bool ($1, 1); }
+	: expr						{ $$ = convert_bool ($1, 1); }
 	;
 
 cexpr
@@ -1364,8 +1359,8 @@ opt_arg_list
 	;
 
 arg_list
-	: fexpr
-	| arg_list ',' fexpr
+	: expr
+	| arg_list ',' expr
 		{
 			$3->next = $1;
 			$$ = $3;
@@ -1874,7 +1869,7 @@ obj_messageexpr
 	;
 
 receiver
-	: fexpr
+	: expr
 	| CLASS_NAME
 		{
 			$$ = new_symbol_expr ($1);
diff --git a/tools/qfcc/source/switch.c b/tools/qfcc/source/switch.c
index 0ff624b95..7e76ef6f4 100644
--- a/tools/qfcc/source/switch.c
+++ b/tools/qfcc/source/switch.c
@@ -338,8 +338,6 @@ build_switch (expr_t *sw, case_node_t *tree, int op, expr_t *sw_val,
 		int         i;
 		expr_t     *range = binary_expr ('-', tree->high, tree->low);
 
-		range = fold_constants (range);
-
 		table_init = new_block_expr ();
 		for (i = 0; i <= high - low; i++) {
 			tree->labels[i]->e.label.used++;

From f81484a068eb948c2f6555eb0942045b52165f58 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 10 Jun 2019 07:17:41 +0900
Subject: [PATCH 0234/1519] Test compiling enums

It turns out the enumerator type and enum type wind up with different
instances of the same type (due to the way type chaining works). This
results in infinite recursion in assign_expr and check_types_compatible.
---
 tools/qfcc/test/Makefile.am | 10 ++++++++++
 tools/qfcc/test/enum.r      | 12 ++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 tools/qfcc/test/enum.r

diff --git a/tools/qfcc/test/Makefile.am b/tools/qfcc/test/Makefile.am
index 0e9e39e81..96351e926 100644
--- a/tools/qfcc/test/Makefile.am
+++ b/tools/qfcc/test/Makefile.am
@@ -33,6 +33,7 @@ test_progs_dat=\
 	chewed-return.dat \
 	comma-expr.dat \
 	deadbool.dat \
+	enum.dat \
 	fordecl.dat \
 	func-expr.dat \
 	func-static.dat \
@@ -109,6 +110,15 @@ deadbool.run: Makefile build-run
 include ./$(DEPDIR)/deadbool.Qo # am--include-marker
 r_depfiles_remade += ./$(DEPDIR)/deadbool.Qo
 
+enum_dat_SOURCES=enum.r
+enum_obj=$(enum_dat_SOURCES:.r=.qfo)
+enum.dat$(EXEEXT): $(enum_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(enum_obj)
+enum.run: Makefile build-run
+	$(srcdir)/build-run $@
+include ./$(DEPDIR)/enum.Qo # am--include-marker
+r_depfiles_remade += ./$(DEPDIR)/enum.Qo
+
 fordecl_dat_SOURCES=fordecl.r
 fordecl_obj=$(fordecl_dat_SOURCES:.r=.qfo)
 fordecl.dat$(EXEEXT): $(fordecl_obj) $(QFCC_DEP)
diff --git a/tools/qfcc/test/enum.r b/tools/qfcc/test/enum.r
new file mode 100644
index 000000000..b6ffb09c1
--- /dev/null
+++ b/tools/qfcc/test/enum.r
@@ -0,0 +1,12 @@
+typedef enum {
+	NO = 0,
+	YES
+} BOOL;
+
+int
+main()
+{
+	BOOL b;
+	b = YES;
+	return !b;
+}

From 7dc1a0640a520710a5ecb0c2dc3b63523340423d Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 10 Jun 2019 07:44:23 +0900
Subject: [PATCH 0235/1519] Delay creating actual enum symbols

In order to keep enumerator type and enum type the same, the values need
to have their type set after the enum type is finalized, and then the
appropriate symbols created in the parent scope. This fixes the infinite
recursion when assigning an enum value to its own type.
---
 tools/qfcc/source/struct.c | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/tools/qfcc/source/struct.c b/tools/qfcc/source/struct.c
index ddf30f8ea..d3f014111 100644
--- a/tools/qfcc/source/struct.c
+++ b/tools/qfcc/source/struct.c
@@ -159,25 +159,38 @@ start_enum (symbol_t *sym)
 symbol_t *
 finish_enum (symbol_t *sym)
 {
-	sym->type = find_type (sym->type);
+	symbol_t   *enum_sym;
+	symbol_t   *name;
+	type_t     *enum_type;
+	symtab_t   *enum_tab;
+
+	enum_type = sym->type = find_type (sym->type);
+	enum_tab = enum_type->t.symtab;
+
+	for (name = enum_tab->symbols; name; name = name->next) {
+		name->type = sym->type;
+
+		enum_sym = new_symbol_type (name->name, enum_type);
+		enum_sym->sy_type = sy_const;
+		enum_sym->s.value = name->s.value;
+		symtab_addsymbol (enum_tab->parent, enum_sym);
+	}
 	return sym;
 }
 
 void
 add_enum (symbol_t *enm, symbol_t *name, expr_t *val)
 {
-	symbol_t   *sym;
 	type_t     *enum_type = enm->type;
-	symtab_t   *enum_tab;
+	symtab_t   *enum_tab = enum_type->t.symtab;
 	int         value;
 
-	if (name->table == current_symtab)
+	if (name->table == current_symtab || name->table == enum_tab)
 		error (0, "%s redefined", name->name);
 	if (name->table)
 		name = new_symbol (name->name);
 	name->sy_type = sy_const;
 	name->type = enum_type;
-	enum_tab = enum_type->t.symtab;
 	value = 0;
 	if (enum_tab->symbols)
 		value = ((symbol_t *)(enum_tab->symtail))->s.value->v.integer_val + 1;
@@ -191,10 +204,6 @@ add_enum (symbol_t *enm, symbol_t *name, expr_t *val)
 	}
 	name->s.value = new_integer_val (value);
 	symtab_addsymbol (enum_tab, name);
-	sym = new_symbol_type (name->name, name->type);
-	sym->sy_type = sy_const;
-	sym->s.value = name->s.value;
-	symtab_addsymbol (enum_tab->parent, sym);
 }
 
 int

From 83fb5887273fa9d9900ff966801a66c5ecdf7d53 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 10 Jun 2019 08:44:36 +0900
Subject: [PATCH 0236/1519] Support vector/quaternion division by float

Implemented via v*(1/f) or q*(1/f) to give CSE a chance to optimize the
division if necessary as otherwise the engine would have to divide every
time.
---
 tools/qfcc/source/expr_binary.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/tools/qfcc/source/expr_binary.c b/tools/qfcc/source/expr_binary.c
index d53d3677c..2029726af 100644
--- a/tools/qfcc/source/expr_binary.c
+++ b/tools/qfcc/source/expr_binary.c
@@ -46,6 +46,7 @@ typedef struct {
 } expr_type_t;
 
 static expr_t *pointer_arithmetic (int op, expr_t *e1, expr_t *e2);
+static expr_t *inverse_multiply (int op, expr_t *e1, expr_t *e2);
 
 static expr_type_t string_string[] = {
 	{'+',	&type_string},
@@ -85,7 +86,7 @@ static expr_type_t float_vector[] = {
 
 static expr_type_t float_quat[] = {
 	{'*',	&type_quaternion},
-	{'/',	&type_quaternion},
+	{'/',	0, 0, 0, inverse_multiply},
 	{0, 0}
 };
 
@@ -113,7 +114,7 @@ static expr_type_t float_integer[] = {
 
 static expr_type_t vector_float[] = {
 	{'*',	&type_vector},
-	{'/',	&type_vector},
+	{'/',	0, 0, 0, inverse_multiply},
 	{0, 0}
 };
 
@@ -601,6 +602,15 @@ pointer_arithmetic (int op, expr_t *e1, expr_t *e2)
 	return cast_expr (ptype, e);
 }
 
+static expr_t *
+inverse_multiply (int op, expr_t *e1, expr_t *e2)
+{
+	// There is no vector/float or quaternion/float instruction and adding
+	// one would mean the engine would have to do 1/f every time
+	expr_t     *one = new_float_expr (1);
+	return binary_expr ('*', e1, binary_expr ('/', one, e2));
+}
+
 static expr_t *
 invalid_binary_expr (int op, expr_t *e1, expr_t *e2)
 {

From 49ed4310fdba52fe946a7eac062a8b972d6087c2 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 10 Jun 2019 08:46:40 +0900
Subject: [PATCH 0237/1519] Fix assigning int to enum or enum to int

Or float, for v6 progs.
---
 tools/qfcc/source/expr_assign.c | 7 ++++++-
 tools/qfcc/test/enum.r          | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/tools/qfcc/source/expr_assign.c b/tools/qfcc/source/expr_assign.c
index 1662d6b10..b32f6de9e 100644
--- a/tools/qfcc/source/expr_assign.c
+++ b/tools/qfcc/source/expr_assign.c
@@ -149,7 +149,12 @@ check_types_compatible (expr_t *dst, expr_t *src)
 	if (type_assignable (dst_type, src_type)) {
 		if (is_scalar (dst_type) && is_scalar (src_type)) {
 			// the types are different but cast-compatible
-			return assign_expr (dst, cast_expr (dst_type, src));
+			expr_t     *new = cast_expr (dst_type, src);
+			// the cast was a no-op, so the types are compatible at the
+			// low level (very true for default type <-> enum)
+			if (new != src) {
+				return assign_expr (dst, new);
+			}
 		}
 		return 0;
 	}
diff --git a/tools/qfcc/test/enum.r b/tools/qfcc/test/enum.r
index b6ffb09c1..f1565cdf0 100644
--- a/tools/qfcc/test/enum.r
+++ b/tools/qfcc/test/enum.r
@@ -7,6 +7,7 @@ int
 main()
 {
 	BOOL b;
+	b = 0;
 	b = YES;
 	return !b;
 }

From 08ab42fc153bf28130b085590b44b7c74ee41add Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 10 Jun 2019 15:50:35 +0900
Subject: [PATCH 0238/1519] Handle vector expressions as sub-expressions

Now my little game builds again :)
---
 tools/qfcc/source/expr.c       |  1 +
 tools/qfcc/source/statements.c | 63 +++++++++++++++++++++++++++++++++-
 tools/qfcc/test/vecexpr.r      |  4 +--
 3 files changed, 65 insertions(+), 3 deletions(-)

diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index e2225d2bc..27732dd5f 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -210,6 +210,7 @@ convert_vector (expr_t *e)
 			// Either v or s is not constant, so can't convert to a quaternion
 			// constant.
 			// Rebuild the list in case v or s is a new expression
+			// the list will always be v, s
 			s->next = 0;
 			v->next = s;
 			e->e.vector.list = v;
diff --git a/tools/qfcc/source/statements.c b/tools/qfcc/source/statements.c
index fb55412e1..e59092d54 100644
--- a/tools/qfcc/source/statements.c
+++ b/tools/qfcc/source/statements.c
@@ -984,6 +984,67 @@ expr_temp (sblock_t *sblock, expr_t *e, operand_t **op)
 	return sblock;
 }
 
+static sblock_t *
+expr_vector_e (sblock_t *sblock, expr_t *e, operand_t **op)
+{
+	expr_t     *x, *y, *z, *w;
+	expr_t     *s, *v;
+	expr_t     *ax, *ay, *az, *aw;
+	expr_t     *as, *av;
+	expr_t     *tmp;
+	type_t     *vec_type = get_type(e);
+
+	tmp = new_temp_def_expr(vec_type);
+	if (vec_type == &type_vector) {
+		// guaranteed to have three elements
+		x = e->e.vector.list;
+		y = x->next;
+		z = y->next;
+		ax = new_name_expr ("x");
+		ay = new_name_expr ("y");
+		az = new_name_expr ("z");
+		ax = assign_expr (field_expr (tmp, ax), x);
+		ay = assign_expr (field_expr (tmp, ay), y);
+		az = assign_expr (field_expr (tmp, az), z);
+		sblock = statement_slist (sblock, ax);
+		sblock = statement_slist (sblock, ay);
+		sblock = statement_slist (sblock, az);
+	} else {
+		// guaranteed to have two or four elements
+		if (e->e.vector.list->next->next) {
+			// four vals: x, y, z, w
+			x = e->e.vector.list;
+			y = x->next;
+			z = y->next;
+			w = z->next;
+			ax = new_name_expr ("x");
+			ay = new_name_expr ("y");
+			az = new_name_expr ("z");
+			aw = new_name_expr ("w");
+			ax = assign_expr (field_expr (tmp, ax), x);
+			ay = assign_expr (field_expr (tmp, ay), y);
+			az = assign_expr (field_expr (tmp, az), z);
+			aw = assign_expr (field_expr (tmp, aw), w);
+			sblock = statement_slist (sblock, ax);
+			sblock = statement_slist (sblock, ay);
+			sblock = statement_slist (sblock, az);
+			sblock = statement_slist (sblock, aw);
+		} else {
+			// v, s
+			v = e->e.vector.list;
+			s = v->next;
+			av = new_name_expr ("v");
+			as = new_name_expr ("s");
+			av = assign_expr (field_expr (tmp, av), v);
+			as = assign_expr (field_expr (tmp, as), s);
+			sblock = statement_slist (sblock, av);
+			sblock = statement_slist (sblock, as);
+		}
+	}
+	sblock = statement_subexpr (sblock, tmp, op);
+	return sblock;
+}
+
 static sblock_t *
 expr_value (sblock_t *sblock, expr_t *e, operand_t **op)
 {
@@ -1005,7 +1066,7 @@ statement_subexpr (sblock_t *sblock, expr_t *e, operand_t **op)
 		expr_uexpr,
 		expr_symbol,
 		expr_temp,
-		0,					// ex_vector
+		expr_vector_e,		// ex_vector
 		0,					// ex_nil
 		expr_value,
 	};
diff --git a/tools/qfcc/test/vecexpr.r b/tools/qfcc/test/vecexpr.r
index 59cc66b4a..de6b3af7c 100644
--- a/tools/qfcc/test/vecexpr.r
+++ b/tools/qfcc/test/vecexpr.r
@@ -13,11 +13,11 @@ t2(float x)
 vector
 t3(float x)
 {
-	return [x, t2(9).z, x];
+	return [x, t2(9).z, x] * 2;
 }
 
 int
 main ()
 {
-	return t3(5) == [5, 9, 5] ? 0 : 1;
+	return t3(5) == [10, 18, 10] ? 0 : 1;
 }

From efdfc7436f2b0e206f764f8ecc04f9470eb8df0f Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 10 Jun 2019 18:04:25 +0900
Subject: [PATCH 0239/1519] Move ev_types into types.[ch]

No wonder I couldn't find it the other day...
---
 tools/qfcc/include/expr.h |  1 -
 tools/qfcc/include/type.h |  2 ++
 tools/qfcc/source/expr.c  | 16 ----------------
 tools/qfcc/source/type.c  | 16 ++++++++++++++++
 4 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/tools/qfcc/include/expr.h b/tools/qfcc/include/expr.h
index d8831b766..486af55be 100644
--- a/tools/qfcc/include/expr.h
+++ b/tools/qfcc/include/expr.h
@@ -210,7 +210,6 @@ typedef struct expr_s {
 	} e;
 } expr_t;
 
-extern struct type_s *ev_types[];
 extern const char *expr_names[];
 
 /**	Report a type mismatch error.
diff --git a/tools/qfcc/include/type.h b/tools/qfcc/include/type.h
index e886ac444..92b495753 100644
--- a/tools/qfcc/include/type.h
+++ b/tools/qfcc/include/type.h
@@ -170,4 +170,6 @@ void chain_initial_types (void);
 
 void clear_typedefs (void);
 
+extern type_t *ev_types[];
+
 #endif//__type_h
diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index 27732dd5f..aa530c04c 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -67,22 +67,6 @@
 
 static expr_t *exprs_freelist;
 
-type_t     *ev_types[ev_type_count] = {
-	&type_void,
-	&type_string,
-	&type_float,
-	&type_vector,
-	&type_entity,
-	&type_field,
-	&type_function,
-	&type_pointer,
-	&type_quaternion,
-	&type_integer,
-	&type_uinteger,
-	&type_short,
-	&type_invalid,
-};
-
 void
 convert_name (expr_t *e)
 {
diff --git a/tools/qfcc/source/type.c b/tools/qfcc/source/type.c
index cc95de7ee..d63563524 100644
--- a/tools/qfcc/source/type.c
+++ b/tools/qfcc/source/type.c
@@ -88,6 +88,22 @@ type_t      type_type_encodings = { ev_invalid, "@type_encodings", ty_struct };
 
 type_t      type_floatfield = { ev_field, ".float", ty_none, {{&type_float}} };
 
+type_t     *ev_types[ev_type_count] = {
+	&type_void,
+	&type_string,
+	&type_float,
+	&type_vector,
+	&type_entity,
+	&type_field,
+	&type_function,
+	&type_pointer,
+	&type_quaternion,
+	&type_integer,
+	&type_uinteger,
+	&type_short,
+	&type_invalid,
+};
+
 static type_t *types_freelist;
 
 etype_t

From 913b9f52e0450f17bdc73c813a13e9e9105c66b6 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 10 Jun 2019 18:13:28 +0900
Subject: [PATCH 0240/1519] Add an offset alias expression

This should make dealing with def elements (vector etc) easier.
---
 tools/qfcc/include/expr.h |  1 +
 tools/qfcc/source/expr.c  | 12 ++++++++++++
 2 files changed, 13 insertions(+)

diff --git a/tools/qfcc/include/expr.h b/tools/qfcc/include/expr.h
index 486af55be..5109b364e 100644
--- a/tools/qfcc/include/expr.h
+++ b/tools/qfcc/include/expr.h
@@ -558,6 +558,7 @@ expr_t *new_this_expr (void);
 expr_t *new_ret_expr (struct type_s *type);
 
 expr_t *new_alias_expr (struct type_s *type, expr_t *expr);
+expr_t *new_offset_alias_expr (struct type_s *type, expr_t *expr, int offset);
 
 /**	Create an expression of the correct type that references the specified
 	parameter slot.
diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index aa530c04c..3353521b6 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -1025,6 +1025,18 @@ new_alias_expr (type_t *type, expr_t *expr)
 	return alias;
 }
 
+expr_t *
+new_offset_alias_expr (type_t *type, expr_t *expr, int offset)
+{
+	expr_t     *alias;
+
+	alias = new_binary_expr ('A', expr, new_integer_expr (offset));
+	alias->e.expr.type = type;
+	alias->file = expr->file;
+	alias->line = expr->line;
+	return alias;
+}
+
 static expr_t *
 param_expr (const char *name, type_t *type)
 {

From ee1f5f94781dc11508d61e8b045bd22d6f90a8b6 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 10 Jun 2019 23:48:58 +0900
Subject: [PATCH 0241/1519] Add support for binary alias expressions

Doesn't quite work yet.
---
 tools/qfcc/include/statements.h |  1 +
 tools/qfcc/source/dot_expr.c    | 12 +++-
 tools/qfcc/source/expr_assign.c |  3 +
 tools/qfcc/source/statements.c  | 99 +++++++++++++++++++--------------
 4 files changed, 70 insertions(+), 45 deletions(-)

diff --git a/tools/qfcc/include/statements.h b/tools/qfcc/include/statements.h
index 356d66b8f..9afe4ef91 100644
--- a/tools/qfcc/include/statements.h
+++ b/tools/qfcc/include/statements.h
@@ -42,6 +42,7 @@ typedef enum {
 
 typedef struct {
 	struct def_s   *def;
+	int             offset;
 	struct type_s *type;
 	struct flowvar_s *flowvar;
 	struct daglabel_s *daglabel;
diff --git a/tools/qfcc/source/dot_expr.c b/tools/qfcc/source/dot_expr.c
index 175b8c800..2925ffcc7 100644
--- a/tools/qfcc/source/dot_expr.c
+++ b/tools/qfcc/source/dot_expr.c
@@ -320,8 +320,16 @@ print_subexpr (dstring_t *dstr, expr_t *e, int level, int id, expr_t *next)
 		dasprintf (dstr, "%*se_%p -> \"e_%p\" [label=\"r\"];\n", indent, "", e,
 				   e->e.expr.e2);
 	}
-	dasprintf (dstr, "%*se_%p [label=\"%s\\n%d\"];\n", indent, "", e,
-			   get_op_string (e->e.expr.op), e->line);
+	if (e->e.expr.op == 'A') {
+		dstring_t  *typestr = dstring_newstr();
+		print_type_str (typestr, e->e.expr.type);
+		dasprintf (dstr, "%*se_%p [label=\"%s (%s)\\n%d\"];\n", indent, "", e,
+				   get_op_string (e->e.expr.op), typestr->str, e->line);
+		dstring_delete (typestr);
+	} else {
+		dasprintf (dstr, "%*se_%p [label=\"%s\\n%d\"];\n", indent, "", e,
+				   get_op_string (e->e.expr.op), e->line);
+	}
 }
 
 static void
diff --git a/tools/qfcc/source/expr_assign.c b/tools/qfcc/source/expr_assign.c
index b32f6de9e..1797f7677 100644
--- a/tools/qfcc/source/expr_assign.c
+++ b/tools/qfcc/source/expr_assign.c
@@ -109,6 +109,9 @@ check_valid_lvalue (expr_t *expr)
 			if (expr->e.expr.op == '.') {
 				return 0;
 			}
+			if (expr->e.expr.op == 'A') {
+				return check_valid_lvalue (expr->e.expr.e1);
+			}
 			break;
 		case ex_uexpr:
 			if (expr->e.expr.op == '.') {
diff --git a/tools/qfcc/source/statements.c b/tools/qfcc/source/statements.c
index e59092d54..73d5d5cbd 100644
--- a/tools/qfcc/source/statements.c
+++ b/tools/qfcc/source/statements.c
@@ -804,6 +804,59 @@ expr_block (sblock_t *sblock, expr_t *e, operand_t **op)
 	return sblock;
 }
 
+static sblock_t *
+expr_alias (sblock_t *sblock, expr_t *e, operand_t **op)
+{
+	operand_t *aop = 0;
+	operand_t *top;
+	etype_t    type;
+	def_t     *def;
+	int        offset = 0;
+
+	if (e->type == ex_expr) {
+		offset = expr_integer (e->e.expr.e2);
+	}
+	type = low_level_type (e->e.expr.type);
+	sblock = statement_subexpr (sblock, e->e.expr.e1, &aop);
+	if (aop->type == type) {
+		if (offset) {
+			internal_error (e, "offset alias of same type");
+		}
+		*op = aop;
+		return sblock;
+	}
+	if (aop->op_type == op_temp) {
+		while (aop->o.tempop.alias) {
+			aop = aop->o.tempop.alias;
+			if (aop->op_type != op_temp)
+				internal_error (e, "temp alias of non-temp var");
+		}
+		for (top = aop->o.tempop.alias_ops; top; top = top->next) {
+			if (top->type == type && top->o.tempop.offset == offset) {
+				break;
+			}
+		}
+		if (!top) {
+			top = new_operand (op_temp);
+			top->type = type;
+			top->o.tempop.alias = aop;
+			top->o.tempop.offset = offset;
+			top->next = aop->o.tempop.alias_ops;
+			aop->o.tempop.alias_ops = top;
+		}
+		*op = top;
+	} else if (aop->op_type == op_def) {
+		def = aop->o.def;
+		while (def->alias)
+			def = def->alias;
+		*op = def_operand (alias_def (def, ev_types[type], offset), 0);
+	} else {
+		internal_error (e, "invalid alias target: %s: %s",
+						optype_str (aop->op_type), operand_string (aop));
+	}
+	return sblock;
+}
+
 static sblock_t *
 expr_expr (sblock_t *sblock, expr_t *e, operand_t **op)
 {
@@ -822,6 +875,9 @@ expr_expr (sblock_t *sblock, expr_t *e, operand_t **op)
 		case 'M':
 			sblock = expr_move (sblock, e, op);
 			break;
+		case 'A':
+			sblock = expr_alias (sblock, e, op);
+			break;
 		default:
 			opcode = convert_op (e->e.expr.op);
 			if (!opcode)
@@ -838,49 +894,6 @@ expr_expr (sblock_t *sblock, expr_t *e, operand_t **op)
 	return sblock;
 }
 
-static sblock_t *
-expr_alias (sblock_t *sblock, expr_t *e, operand_t **op)
-{
-	operand_t *aop = 0;
-	operand_t *top;
-	etype_t    type;
-	def_t     *def;
-
-	type = low_level_type (e->e.expr.type);
-	sblock = statement_subexpr (sblock, e->e.expr.e1, &aop);
-	if (aop->type == type) {
-		*op = aop;
-		return sblock;
-	}
-	if (aop->op_type == op_temp) {
-		while (aop->o.tempop.alias) {
-			aop = aop->o.tempop.alias;
-			if (aop->op_type != op_temp)
-				internal_error (e, "temp alias of non-temp var");
-		}
-		for (top = aop->o.tempop.alias_ops; top; top = top->next)
-			if (top->type == type)
-				break;
-		if (!top) {
-			top = new_operand (op_temp);
-			top->type = type;
-			top->o.tempop.alias = aop;
-			top->next = aop->o.tempop.alias_ops;
-			aop->o.tempop.alias_ops = top;
-		}
-		*op = top;
-	} else if (aop->op_type == op_def) {
-		def = aop->o.def;
-		while (def->alias)
-			def = def->alias;
-		*op = def_operand (alias_def (def, ev_types[type], 0), 0);
-	} else {
-		internal_error (e, "invalid alias target: %s: %s",
-						optype_str (aop->op_type), operand_string (aop));
-	}
-	return sblock;
-}
-
 static sblock_t *
 expr_cast (sblock_t *sblock, expr_t *e, operand_t **op)
 {

From cc27949a34588ab80b3f2d4730f446dd2ac4e623 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 10 Jun 2019 23:52:39 +0900
Subject: [PATCH 0242/1519] Ensure pointer values always have a type

The dags generator was creating a pointer value with no type which
caused print_statement to segfault.
---
 tools/qfcc/source/dags.c  | 4 +++-
 tools/qfcc/source/value.c | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/tools/qfcc/source/dags.c b/tools/qfcc/source/dags.c
index 0f07edbbf..69a5100a8 100644
--- a/tools/qfcc/source/dags.c
+++ b/tools/qfcc/source/dags.c
@@ -787,6 +787,7 @@ generate_moveps (dag_t *dag, sblock_t *block, dagnode_t *dagnode)
 	operand_t   *operands[3] = {0, 0, 0};
 	statement_t *st;
 	operand_t   *dst = 0;
+	type_t      *type;
 
 	operands[0] = make_operand (dag, block, dagnode, 0);
 	operands[1] = make_operand (dag, block, dagnode, 1);
@@ -794,7 +795,8 @@ generate_moveps (dag_t *dag, sblock_t *block, dagnode_t *dagnode)
 		 var_iter = set_next (var_iter)) {
 		var = dag->labels[var_iter->element];
 		dst = var->op;
-		operands[2] = value_operand (new_pointer_val (0, 0, dst->o.def));
+		type = dst->o.def->type;
+		operands[2] = value_operand (new_pointer_val (0, type, dst->o.def));
 		st = build_statement ("<MOVEP>", operands, var->expr);
 		sblock_add_statement (block, st);
 	}
diff --git a/tools/qfcc/source/value.c b/tools/qfcc/source/value.c
index bdaa9c6f3..29d6eabed 100644
--- a/tools/qfcc/source/value.c
+++ b/tools/qfcc/source/value.c
@@ -189,6 +189,9 @@ ex_value_t *
 new_pointer_val (int pointer_val, type_t *type, def_t *def)
 {
 	ex_value_t  val;
+	if (!type) {
+		internal_error (0, "pointer value with no type");
+	}
 	memset (&val, 0, sizeof (val));
 	set_val_type (&val, pointer_type (type));
 	val.v.pointer.val = pointer_val;

From b18a74428815aae4ae11d86e6021cbc40d0206ab Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 10 Jun 2019 23:55:16 +0900
Subject: [PATCH 0243/1519] Use offset alias expressions

They are not quite working yet as the operand generator does not use the
offset yet.
---
 tools/qfcc/source/expr.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index 3353521b6..7b5b8edbb 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -1195,10 +1195,14 @@ field_expr (expr_t *e1, expr_t *e2)
 			// create a new . expression
 			return field_expr (e1, e2);
 		} else {
-			e2->type = ex_value;
-			e2->e.value = new_short_val (field->s.offset);
-			e = address_expr (e1, e2, field->type);
-			return unary_expr ('.', e);
+			if (e1->type == ex_uexpr && e1->e.expr.op == '.') {
+				e2->type = ex_value;
+				e2->e.value = new_short_val (field->s.offset);
+				e = address_expr (e1, e2, field->type);
+				return unary_expr ('.', e);
+			} else {
+				return new_offset_alias_expr (field->type, e1, field->s.offset);
+			}
 		}
 	} else if (obj_is_class (t1)) {
 		//Class instance variables aren't allowed and thus declaring one

From fa69aeef0f5f1a21fd920e47cbd185345d50152d Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 12 Jun 2019 00:37:02 +0900
Subject: [PATCH 0244/1519] Improve handling of temp aliases

This makes all tests pass when not optimizing. More work needs to be
done in dags.
---
 tools/qfcc/include/flow.h       |  1 +
 tools/qfcc/include/function.h   |  1 +
 tools/qfcc/include/statements.h |  1 +
 tools/qfcc/source/constfold.c   |  2 +-
 tools/qfcc/source/dags.c        |  4 +--
 tools/qfcc/source/emit.c        | 14 +++++++--
 tools/qfcc/source/flow.c        | 55 +++++++++++++++++++++++----------
 tools/qfcc/source/statements.c  |  7 ++++-
 8 files changed, 62 insertions(+), 23 deletions(-)

diff --git a/tools/qfcc/include/flow.h b/tools/qfcc/include/flow.h
index c605b1d22..591704a01 100644
--- a/tools/qfcc/include/flow.h
+++ b/tools/qfcc/include/flow.h
@@ -46,6 +46,7 @@ typedef struct flowvar_s {
 	struct set_s *define;		///< set of statements that define this var
 	struct operand_s *op;		///< an operand using this var
 	int         number;			///< number of variable in func's ref list
+	int         flowaddr;		///< psuedo address for local and temp vars
 } flowvar_t;
 
 typedef struct flowloop_s {
diff --git a/tools/qfcc/include/function.h b/tools/qfcc/include/function.h
index b4b546fa6..d145fc53e 100644
--- a/tools/qfcc/include/function.h
+++ b/tools/qfcc/include/function.h
@@ -94,6 +94,7 @@ typedef struct function_s {
 	struct set_s       *global_vars;///< set indicating which vars are global
 	struct statement_s **statements;
 	int                 num_statements;
+	int                 tmpaddr;	///< tmp var "address" for flow analysis
 } function_t;
 
 extern function_t *current_func;
diff --git a/tools/qfcc/include/statements.h b/tools/qfcc/include/statements.h
index 9afe4ef91..eeb3bfdbf 100644
--- a/tools/qfcc/include/statements.h
+++ b/tools/qfcc/include/statements.h
@@ -49,6 +49,7 @@ typedef struct {
 	struct operand_s *alias;
 	struct operand_s *alias_ops;
 	int         users;
+	int         flowaddr;		///< "address" of temp in flow analysis, != 0
 } tempop_t;
 
 typedef struct operand_s {
diff --git a/tools/qfcc/source/constfold.c b/tools/qfcc/source/constfold.c
index 33746c8e9..817703945 100644
--- a/tools/qfcc/source/constfold.c
+++ b/tools/qfcc/source/constfold.c
@@ -1478,7 +1478,7 @@ fold_constants (expr_t *e)
 		}
 
 		op = e->e.expr.op;
-		if (op == 'i' || op == 'n' || op == 'c' || op == 's') {
+		if (op == 'A' || op == 'i' || op == 'n' || op == 'c' || op == 's') {
 			return e;
 		}
 
diff --git a/tools/qfcc/source/dags.c b/tools/qfcc/source/dags.c
index 69a5100a8..7596a8646 100644
--- a/tools/qfcc/source/dags.c
+++ b/tools/qfcc/source/dags.c
@@ -158,8 +158,8 @@ operand_label (dag_t *dag, operand_t *op)
 		return 0;
 
 	if (op->op_type == op_temp) {
-		while (op->o.tempop.alias)
-			op = op->o.tempop.alias;
+		//while (op->o.tempop.alias)
+		//	op = op->o.tempop.alias;
 		if (op->o.tempop.daglabel)
 			return op->o.tempop.daglabel;
 		label = new_label (dag);
diff --git a/tools/qfcc/source/emit.c b/tools/qfcc/source/emit.c
index 34a5de3f2..003204dcb 100644
--- a/tools/qfcc/source/emit.c
+++ b/tools/qfcc/source/emit.c
@@ -91,10 +91,18 @@ get_operand_def (expr_t *expr, operand_t *op)
 			zero_def.type = &type_short;
 			return &zero_def;	//FIXME
 		case op_temp:
-			while (op->o.tempop.alias)
-				op = op->o.tempop.alias;
-			if (!op->o.tempop.def)
+			if (op->o.tempop.def) {
+				return op->o.tempop.def;
+			}
+			if (op->o.tempop.alias) {
+				def_t      *tdef = get_operand_def (expr, op->o.tempop.alias);
+				int         offset = op->o.tempop.offset;
+				type_t     *type = ev_types[op->type];
+				op->o.tempop.def = alias_def (tdef, type, offset);
+			}
+			if (!op->o.tempop.def) {
 				op->o.tempop.def = temp_def (op->type, op->size);
+			}
 			return op->o.tempop.def;
 		case op_alias:
 			return get_operand_def (expr, op->o.alias);
diff --git a/tools/qfcc/source/flow.c b/tools/qfcc/source/flow.c
index cd26be5b9..d60a1c5ac 100644
--- a/tools/qfcc/source/flow.c
+++ b/tools/qfcc/source/flow.c
@@ -204,6 +204,12 @@ flowvar_is_param (flowvar_t *var)
 		return 0;
 	return 1;
 }
+
+static int
+flowvar_is_local (flowvar_t *var)
+{
+	return !(flowvar_is_global (var) || flowvar_is_param (var));
+}
 #if 0
 static int
 flowvar_is_initialized (flowvar_t *var)
@@ -263,6 +269,24 @@ count_operand (operand_t *op)
 	return 0;
 }
 
+static int
+get_temp_address (function_t *func, operand_t *op)
+{
+	operand_t  *top = op;
+	if (op->o.tempop.flowaddr) {
+		return op->o.tempop.flowaddr;
+	}
+	while (top->o.tempop.alias) {
+		top = top->o.tempop.alias;
+	}
+	if (!top->o.tempop.flowaddr) {
+		top->o.tempop.flowaddr = func->tmpaddr;
+		func->tmpaddr += top->size;
+	}
+	op->o.tempop.flowaddr = top->o.tempop.flowaddr + op->o.tempop.offset;
+	return op->o.tempop.flowaddr;
+}
+
 static void
 add_operand (function_t *func, operand_t *op)
 {
@@ -280,6 +304,11 @@ add_operand (function_t *func, operand_t *op)
 		var->number = func->num_vars++;
 		var->op = op;
 		func->vars[var->number] = var;
+		if (op->op_type == op_temp) {
+			var->flowaddr = get_temp_address (func, op);
+		} else if (flowvar_is_local (var)) {
+			var->flowaddr = func->num_statements + def_offset (var->op->o.def);
+		}
 	}
 }
 
@@ -348,6 +377,9 @@ flow_build_vars (function_t *func)
 	stuse = set_new ();
 	stdef = set_new ();
 
+	// set up pseudo address space for temp vars so accessing tmp vars
+	// though aliases analyses correctly
+	func->tmpaddr = func->num_statements + func->symtab->space->size;
 	func->num_vars = 0;	// incremented by add_operand
 	// first, add .return and .param_[0-7] as they are always needed
 	for (i = 0; i < num_flow_params; i++)
@@ -382,27 +414,18 @@ flow_build_vars (function_t *func)
 	//     ([num_statements ... num_statements+localsize])
 	// with a set element for each def used in the local space
 	//
-	// temporary vars add their var number to the size of the local space
-	// before adding the number of statements in the function:
-	//     ([num_statements+localsize ... num_vars])
-	// temporary vars are always accessed as a full var, so only one set
-	// element per temporary var is needed. This can lead to holes in the
-	// temporary var set element space, but it does keep things simple
+	// temporary vars are pseudo allocated and their addresses are added as for
+	// locals
+	// add_operand takes care of setting flowaddr for both locals and temps
 	for (i = 0; i < func->num_vars; i++) {
-		int         offset, size;
 		int         j;
 
 		var = func->vars[i];
-		if (flowvar_is_global (var) || flowvar_is_param (var))
+		if (flowvar_is_global (var) || flowvar_is_param (var)) {
 			continue;
-		if (var->op->op_type == op_temp) {
-			j = func->symtab->space->size + var->number;
-			set_add (var->define, func->num_statements + j);
-		} else {
-			offset = def_offset (var->op->o.def);
-			size = def_size (var->op->o.def);
-			for (j = offset; j < offset + size; j++)
-				set_add (var->define, func->num_statements + j);
+		}
+		for (j = 0; j < var->op->size; j++) {
+			set_add (var->define, var->flowaddr + j);
 		}
 	}
 
diff --git a/tools/qfcc/source/statements.c b/tools/qfcc/source/statements.c
index 73d5d5cbd..e0500aab6 100644
--- a/tools/qfcc/source/statements.c
+++ b/tools/qfcc/source/statements.c
@@ -126,10 +126,11 @@ operand_string (operand_t *op)
 			return op->o.label->name;
 		case op_temp:
 			if (op->o.tempop.alias)
-				return va ("<tmp %s %p:%d:%p:%d>",
+				return va ("<tmp %s %p:%d:%p:%d:%d>",
 						   pr_type_name[op->type],
 						   op, op->o.tempop.users,
 						   op->o.tempop.alias,
+						   op->o.tempop.offset,
 						   op->o.tempop.alias->o.tempop.users);
 			return va ("<tmp %s %p:%d>", pr_type_name[op->o.tempop.type->type],
 					   op, op->o.tempop.users);
@@ -307,6 +308,7 @@ def_operand (def_t *def, type_t *type)
 		type = def->type;
 	op = new_operand (op_def);
 	op->type = low_level_type (type);
+	op->size = type_size (type);
 	op->o.def = def;
 	return op;
 }
@@ -830,6 +832,8 @@ expr_alias (sblock_t *sblock, expr_t *e, operand_t **op)
 			aop = aop->o.tempop.alias;
 			if (aop->op_type != op_temp)
 				internal_error (e, "temp alias of non-temp var");
+			if (aop->o.tempop.alias)
+				bug (e, "aliased temp alias");
 		}
 		for (top = aop->o.tempop.alias_ops; top; top = top->next) {
 			if (top->type == type && top->o.tempop.offset == offset) {
@@ -839,6 +843,7 @@ expr_alias (sblock_t *sblock, expr_t *e, operand_t **op)
 		if (!top) {
 			top = new_operand (op_temp);
 			top->type = type;
+			top->size = pr_type_size[type];
 			top->o.tempop.alias = aop;
 			top->o.tempop.offset = offset;
 			top->next = aop->o.tempop.alias_ops;

From bc271d8a02b47a5c9a02f58ffdc09303df226d7f Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 16 Jun 2019 16:52:49 +0900
Subject: [PATCH 0245/1519] Add tempop_visit_all

Works the same as def_visit_all, but for temp operands.
---
 tools/qfcc/include/statements.h |  3 ++
 tools/qfcc/source/statements.c  | 49 +++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+)

diff --git a/tools/qfcc/include/statements.h b/tools/qfcc/include/statements.h
index eeb3bfdbf..e0e3dca98 100644
--- a/tools/qfcc/include/statements.h
+++ b/tools/qfcc/include/statements.h
@@ -117,7 +117,10 @@ const char *optype_str (op_type_e type) __attribute__((const));
 
 operand_t *def_operand (struct def_s *def, struct type_s *type);
 operand_t *value_operand (struct ex_value_s *value);
+int tempop_overlap (tempop_t *t1, tempop_t *t2);
 operand_t *temp_operand (struct type_s *type);
+int tempop_visit_all (tempop_t *tempop, int overlap,
+					  int (*visit) (tempop_t *, void *), void *data);
 operand_t *alias_operand (etype_t type, operand_t *op);
 void free_operand (operand_t *op);
 
diff --git a/tools/qfcc/source/statements.c b/tools/qfcc/source/statements.c
index e0500aab6..d476aeeaf 100644
--- a/tools/qfcc/source/statements.c
+++ b/tools/qfcc/source/statements.c
@@ -334,6 +334,55 @@ temp_operand (type_t *type)
 	return op;
 }
 
+int
+tempop_overlap (tempop_t *t1, tempop_t *t2)
+{
+	int         offs1 = t1->offset;
+	int         offs2 = t2->offset;
+	int         size1 = type_size (t1->type);
+	int         size2 = type_size (t2->type);
+
+	if (offs1 <= offs2 && offs1 + size1 >= offs2 + size2)
+		return 2;	// t1 fully overlaps t2
+	if (offs1 < offs2 + size2 && offs2 < offs1 + size1)
+		return 1;	// t1 and t2 at least partially overlap
+	return 0;
+}
+
+int
+tempop_visit_all (tempop_t *tempop, int overlap,
+			   int (*visit) (tempop_t *, void *), void *data)
+{
+	tempop_t   *start_tempop = tempop;
+	operand_t  *top;
+	int         ret;
+
+	if ((ret = visit (tempop, data)))
+		return ret;
+	if (tempop->alias) {
+		top = tempop->alias;
+		if (top->op_type != op_temp) {
+			internal_error (0, "temp alias of non-temp operand");
+		}
+		tempop = &top->o.tempop;
+		if ((ret = visit (tempop, data)))
+			return ret;
+	}
+	for (top = tempop->alias_ops; top; top = top->next) {
+		if (top->op_type != op_temp) {
+			internal_error (0, "temp alias of non-temp operand");
+		}
+		tempop = &top->o.tempop;
+		if (tempop == start_tempop)
+			continue;
+		if (overlap && tempop_overlap (tempop, start_tempop) < overlap)
+			continue;
+		if ((ret = visit (tempop, data)))
+			return ret;
+	}
+	return 0;
+}
+
 operand_t *
 alias_operand (etype_t type, operand_t *op)
 {

From 3c4903245a08e2be69830e753eb09f6cc2b6541c Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 16 Jun 2019 16:55:54 +0900
Subject: [PATCH 0246/1519] Fix some curly space

---
 tools/qfcc/source/dags.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/tools/qfcc/source/dags.c b/tools/qfcc/source/dags.c
index 7596a8646..1af758cbb 100644
--- a/tools/qfcc/source/dags.c
+++ b/tools/qfcc/source/dags.c
@@ -353,15 +353,17 @@ dagnode_set_edges (dag_t *dag, dagnode_t *n)
 			if (child->label->op) {
 				dagnode_t  *node = child->label->dagnode;
 				operand_t  *op = child->label->op;
-				if (node != child && node != n)
+				if (node != child && node != n) {
 					set_add (node->edges, n->number);
+				}
 				if (op->op_type == op_value
 					&& op->o.value->lltype == ev_pointer
-					&& op->o.value->v.pointer.def)
+					&& op->o.value->v.pointer.def) {
 					def_visit_all (op->o.value->v.pointer.def, 1,
 								   dagnode_set_edges_visit, n);
+				}
 				if (op->op_type == op_def
-					&& (op->o.def->alias || op->o.def->alias_defs))
+					&& (op->o.def->alias || op->o.def->alias_defs)) {
 					def_visit_all (op->o.def, 1, dagnode_set_edges_visit, n);
 			}
 			if (n != child)
@@ -449,8 +451,9 @@ dag_kill_aliases (daglabel_t *l)
 
 	if (op->op_type == op_temp) {
 	} else if (op->op_type == op_def) {
-		if (op->o.def->alias || op->o.def->alias_defs)
+		if (op->o.def->alias || op->o.def->alias_defs) {
 			def_visit_all (op->o.def, 1, dag_kill_aliases_visit, l);
+		}
 	} else {
 		internal_error (0, "rvalue assignment?");
 	}
@@ -494,7 +497,7 @@ dagnode_attach_label (dagnode_t *n, daglabel_t *l)
 		// FIXME it would be better to propogate the aliasing
 		if (n->label->op->op_type == op_def
 			&& (n->label->op->o.def->alias
-				|| n->label->op->o.def->alias_defs))
+				|| n->label->op->o.def->alias_defs)) {
 			def_visit_all (n->label->op->o.def, 1, dag_live_aliases,
 						   n->label->op->o.def);
 	}

From c40f4194e9fcbccaa27357aa0f220845ebe04c54 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 16 Jun 2019 16:56:39 +0900
Subject: [PATCH 0247/1519] Use tempop_visit_all for flow and dags

Fixes t3 of vecexpr, but t2 is broken (lost first assignment).
---
 tools/qfcc/source/dags.c  | 86 ++++++++++++++++++++++++++++++++++-----
 tools/qfcc/source/flow.c  | 29 +++++++------
 tools/qfcc/test/vecexpr.r | 16 +++++++-
 3 files changed, 107 insertions(+), 24 deletions(-)

diff --git a/tools/qfcc/source/dags.c b/tools/qfcc/source/dags.c
index 1af758cbb..1d773066b 100644
--- a/tools/qfcc/source/dags.c
+++ b/tools/qfcc/source/dags.c
@@ -311,7 +311,21 @@ dagnode_add_children (dag_t *dag, dagnode_t *n, operand_t *operands[4],
 }
 
 static int
-dagnode_set_edges_visit (def_t *def, void *_node)
+dagnode_tempop_set_edges_visit (tempop_t *tempop, void *_node)
+{
+	dagnode_t  *node = (dagnode_t *) _node;
+	daglabel_t *label;
+
+	label = tempop->daglabel;
+	if (label && label->dagnode) {
+		set_add (node->edges, label->dagnode->number);
+		label->live = 1;
+	}
+	return 0;
+}
+
+static int
+dagnode_def_set_edges_visit (def_t *def, void *_node)
 {
 	dagnode_t  *node = (dagnode_t *) _node;
 	daglabel_t *label;
@@ -360,11 +374,17 @@ dagnode_set_edges (dag_t *dag, dagnode_t *n)
 					&& op->o.value->lltype == ev_pointer
 					&& op->o.value->v.pointer.def) {
 					def_visit_all (op->o.value->v.pointer.def, 1,
-								   dagnode_set_edges_visit, n);
+								   dagnode_def_set_edges_visit, n);
 				}
 				if (op->op_type == op_def
 					&& (op->o.def->alias || op->o.def->alias_defs)) {
-					def_visit_all (op->o.def, 1, dagnode_set_edges_visit, n);
+					def_visit_all (op->o.def, 1,
+								   dagnode_def_set_edges_visit, n);
+				}
+				if (op->op_type == op_temp) {
+					tempop_visit_all (&op->o.tempop, 1,
+									  dagnode_tempop_set_edges_visit, n);
+				}
 			}
 			if (n != child)
 				set_add (n->edges, child->number);
@@ -427,7 +447,25 @@ op_is_identifier (operand_t *op)
 }
 
 static int
-dag_kill_aliases_visit (def_t *def, void *_l)
+dag_tempop_kill_aliases_visit (tempop_t *tempop, void *_l)
+{
+	daglabel_t *l = (daglabel_t *) _l;
+	dagnode_t  *node = l->dagnode;;
+	daglabel_t *label;
+
+	if (tempop == &l->op->o.tempop)
+		return 0;
+	label = tempop->daglabel;
+	if (label && label->dagnode) {
+		set_add (node->edges, label->dagnode->number);
+		set_remove (node->edges, node->number);
+		label->dagnode->killed = 1;
+	}
+	return 0;
+}
+
+static int
+dag_def_kill_aliases_visit (def_t *def, void *_l)
 {
 	daglabel_t *l = (daglabel_t *) _l;
 	dagnode_t  *node = l->dagnode;;
@@ -450,9 +488,10 @@ dag_kill_aliases (daglabel_t *l)
 	operand_t  *op = l->op;
 
 	if (op->op_type == op_temp) {
+		tempop_visit_all (&op->o.tempop, 1, dag_tempop_kill_aliases_visit, l);
 	} else if (op->op_type == op_def) {
 		if (op->o.def->alias || op->o.def->alias_defs) {
-			def_visit_all (op->o.def, 1, dag_kill_aliases_visit, l);
+			def_visit_all (op->o.def, 1, dag_def_kill_aliases_visit, l);
 		}
 	} else {
 		internal_error (0, "rvalue assignment?");
@@ -460,7 +499,16 @@ dag_kill_aliases (daglabel_t *l)
 }
 
 static int
-dag_live_aliases (def_t *def, void *_d)
+dag_tempop_live_aliases (tempop_t *tempop, void *_t)
+{
+
+	if (tempop != _t && tempop->daglabel)
+		tempop->daglabel->live = 1;
+	return 0;
+}
+
+static int
+dag_def_live_aliases (def_t *def, void *_d)
 {
 
 	if (def != _d && def->daglabel)
@@ -493,18 +541,32 @@ dagnode_attach_label (dagnode_t *n, daglabel_t *l)
 	set_add (n->identifiers, l->number);
 	dag_kill_aliases (l);
 	if (n->label->op) {
-		// FIXME temps
 		// FIXME it would be better to propogate the aliasing
+		if (n->label->op->op_type == op_temp) {
+			tempop_visit_all (&n->label->op->o.tempop, 1,
+							  dag_tempop_live_aliases,
+							  &n->label->op->o.tempop);
+		}
 		if (n->label->op->op_type == op_def
 			&& (n->label->op->o.def->alias
 				|| n->label->op->o.def->alias_defs)) {
-			def_visit_all (n->label->op->o.def, 1, dag_live_aliases,
+			def_visit_all (n->label->op->o.def, 1, dag_def_live_aliases,
 						   n->label->op->o.def);
+		}
 	}
 }
 
 static int
-dag_alias_live (def_t *def, void *_live_vars)
+dag_tempop_alias_live (tempop_t *tempop, void *_live_vars)
+{
+	set_t      *live_vars = (set_t *) _live_vars;
+	if (!tempop->flowvar)
+		return 0;
+	return set_is_member (live_vars, tempop->flowvar->number);
+}
+
+static int
+dag_def_alias_live (def_t *def, void *_live_vars)
 {
 	set_t      *live_vars = (set_t *) _live_vars;
 	if (!def->flowvar)
@@ -531,7 +593,11 @@ dag_remove_dead_vars (dag_t *dag, set_t *live_vars)
 		if (set_is_member (dag->flownode->global_vars, var->number))
 			continue;
 		if (l->op->op_type == op_def
-			&& def_visit_all (l->op->o.def, 1, dag_alias_live, live_vars))
+			&& def_visit_all (l->op->o.def, 1, dag_def_alias_live, live_vars))
+			continue;
+		if (l->op->op_type == op_temp
+			&& tempop_visit_all (&l->op->o.tempop, 1, dag_tempop_alias_live,
+								 live_vars))
 			continue;
 		if (!set_is_member (live_vars, var->number))
 			set_remove (l->dagnode->identifiers, l->number);
diff --git a/tools/qfcc/source/flow.c b/tools/qfcc/source/flow.c
index d60a1c5ac..995aa5b7d 100644
--- a/tools/qfcc/source/flow.c
+++ b/tools/qfcc/source/flow.c
@@ -434,7 +434,18 @@ flow_build_vars (function_t *func)
 }
 
 static int
-flow_kill_aliases_visit (def_t *def, void *_kill)
+flow_tempop_kill_aliases_visit (tempop_t *tempop, void *_kill)
+{
+	set_t      *kill = (set_t *) _kill;
+	flowvar_t  *var;
+	var = tempop->flowvar;
+	if (var)
+		set_union (kill, var->define);
+	return 0;
+}
+
+static int
+flow_def_kill_aliases_visit (def_t *def, void *_kill)
 {
 	set_t      *kill = (set_t *) _kill;
 	flowvar_t  *var;
@@ -454,19 +465,11 @@ flow_kill_aliases (set_t *kill, flowvar_t *var, const set_t *uninit)
 	op = var->op;
 	tmp = set_new ();
 	if (op->op_type == op_temp) {
-		if (op->o.tempop.alias) {
-			op = op->o.tempop.alias;
-			var = op->o.tempop.flowvar;
-			if (var)
-				set_union (tmp, var->define);
-		}
-		for (op = op->o.tempop.alias_ops; op; op = op->next) {
-			var = op->o.tempop.flowvar;
-			if (var)
-				set_union (tmp, var->define);
-		}
+		tempop_visit_all (&op->o.tempop, 1, flow_tempop_kill_aliases_visit,
+						  tmp);
+		set_difference (tmp, uninit);
 	} else if (op->op_type == op_def) {
-		def_visit_all (op->o.def, 1, flow_kill_aliases_visit, tmp);
+		def_visit_all (op->o.def, 1, flow_def_kill_aliases_visit, tmp);
 		// don't allow aliases to kill definitions in the entry dummy block
 		set_difference (tmp, uninit);
 	}
diff --git a/tools/qfcc/test/vecexpr.r b/tools/qfcc/test/vecexpr.r
index de6b3af7c..4007348e1 100644
--- a/tools/qfcc/test/vecexpr.r
+++ b/tools/qfcc/test/vecexpr.r
@@ -1,3 +1,4 @@
+#include "test-harness.h"
 vector
 t1()
 {
@@ -19,5 +20,18 @@ t3(float x)
 int
 main ()
 {
-	return t3(5) == [10, 18, 10] ? 0 : 1;
+	int ret = 0;
+	vector v;
+
+	v = t2(5);
+	if (v != [5, 5, 5]) {
+		printf("t2(5) = %v\n", v);
+		ret |= 1;
+	}
+	v = t3 (5);
+	if (v != [10, 18, 10]) {
+		printf("t3(5) = %v\n", v);
+		ret |= 1;
+	}
+	return ret;
 }

From 82b334e919ddc61047ad2921c5e3f7350c5ce423 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 16 Jun 2019 19:12:18 +0900
Subject: [PATCH 0248/1519] Number dot dumps to help identify order

---
 tools/qfcc/source/dot.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/tools/qfcc/source/dot.c b/tools/qfcc/source/dot.c
index 54d67c241..5d72b5150 100644
--- a/tools/qfcc/source/dot.c
+++ b/tools/qfcc/source/dot.c
@@ -40,14 +40,23 @@
 #include "options.h"
 #include "strpool.h"
 
+static function_t *last_func;
+static int dot_index;
+
 void
 dump_dot (const char *stage, void *data,
 		  void (*dump_func) (void *data, const char *fname))
 {
 	char       *fname;
 
-	fname = nva ("%s.%s.%s.dot", options.output_file, current_func->name,
-				 stage);
+	if (last_func != current_func) {
+		last_func = current_func;
+		dot_index = 0;
+	} else {
+		dot_index++;
+	}
+	fname = nva ("%s.%s.%03d.%s.dot", options.output_file, current_func->name,
+				 dot_index, stage);
 	dump_func (data, fname);
 	free (fname);
 }

From 2977c145d0521b9464028c5eabc3f0b9457e52ea Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 16 Jun 2019 19:17:01 +0900
Subject: [PATCH 0249/1519] Clean up dag live alias code a little

Mainly, this makes it possible to reuse the alias code.
---
 tools/qfcc/source/dags.c | 36 ++++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/tools/qfcc/source/dags.c b/tools/qfcc/source/dags.c
index 1d773066b..78fdd7f1d 100644
--- a/tools/qfcc/source/dags.c
+++ b/tools/qfcc/source/dags.c
@@ -381,7 +381,8 @@ dagnode_set_edges (dag_t *dag, dagnode_t *n)
 					def_visit_all (op->o.def, 1,
 								   dagnode_def_set_edges_visit, n);
 				}
-				if (op->op_type == op_temp) {
+				if (op->op_type == op_temp
+					&& (op->o.tempop.alias || op->o.tempop.alias_ops)) {
 					tempop_visit_all (&op->o.tempop, 1,
 									  dagnode_tempop_set_edges_visit, n);
 				}
@@ -488,7 +489,10 @@ dag_kill_aliases (daglabel_t *l)
 	operand_t  *op = l->op;
 
 	if (op->op_type == op_temp) {
-		tempop_visit_all (&op->o.tempop, 1, dag_tempop_kill_aliases_visit, l);
+		if (op->o.tempop.alias || op->o.tempop.alias_ops) {
+			tempop_visit_all (&op->o.tempop, 1,
+							  dag_tempop_kill_aliases_visit, l);
+		}
 	} else if (op->op_type == op_def) {
 		if (op->o.def->alias || op->o.def->alias_defs) {
 			def_visit_all (op->o.def, 1, dag_def_kill_aliases_visit, l);
@@ -516,6 +520,21 @@ dag_def_live_aliases (def_t *def, void *_d)
 	return 0;
 }
 
+static void
+dag_live_aliases(operand_t *op)
+{
+	// FIXME it would be better to propogate the aliasing
+	if (op->op_type == op_temp
+		&& (op->o.tempop.alias || op->o.tempop.alias_ops)) {
+		tempop_visit_all (&op->o.tempop, 1, dag_tempop_live_aliases,
+						  &op->o.tempop);
+	}
+	if (op->op_type == op_def
+		&& (op->o.def->alias || op->o.def->alias_defs)) {
+		def_visit_all (op->o.def, 1, dag_def_live_aliases, op->o.def);
+	}
+}
+
 static void
 dagnode_attach_label (dagnode_t *n, daglabel_t *l)
 {
@@ -541,18 +560,7 @@ dagnode_attach_label (dagnode_t *n, daglabel_t *l)
 	set_add (n->identifiers, l->number);
 	dag_kill_aliases (l);
 	if (n->label->op) {
-		// FIXME it would be better to propogate the aliasing
-		if (n->label->op->op_type == op_temp) {
-			tempop_visit_all (&n->label->op->o.tempop, 1,
-							  dag_tempop_live_aliases,
-							  &n->label->op->o.tempop);
-		}
-		if (n->label->op->op_type == op_def
-			&& (n->label->op->o.def->alias
-				|| n->label->op->o.def->alias_defs)) {
-			def_visit_all (n->label->op->o.def, 1, dag_def_live_aliases,
-						   n->label->op->o.def);
-		}
+		dag_live_aliases (n->label->op);
 	}
 }
 

From db4a7a139ef22e350417502575de1a9ebd28e43f Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 16 Jun 2019 19:17:45 +0900
Subject: [PATCH 0250/1519] Use the alias code when making vars live

Not sure the live forcing flag is needed anymore (need to test).
---
 tools/qfcc/source/dags.c | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/tools/qfcc/source/dags.c b/tools/qfcc/source/dags.c
index 78fdd7f1d..1acf9031a 100644
--- a/tools/qfcc/source/dags.c
+++ b/tools/qfcc/source/dags.c
@@ -535,6 +535,19 @@ dag_live_aliases(operand_t *op)
 	}
 }
 
+static void
+dag_make_var_live (set_t *live_vars, operand_t *op)
+{
+	flowvar_t  *var = 0;
+
+	if (op) {
+		dag_live_aliases (op);
+		var = flow_get_var (op);
+	}
+	if (var)
+		set_add (live_vars, var->number);
+}
+
 static void
 dagnode_attach_label (dagnode_t *n, daglabel_t *l)
 {
@@ -650,17 +663,6 @@ dag_sort_nodes (dag_t *dag)
 	dag->num_topo = topo;
 }
 
-static void
-dag_make_var_live (set_t *live_vars, operand_t *op)
-{
-	flowvar_t  *var = 0;
-
-	if (op)
-		var = flow_get_var (op);
-	if (var)
-		set_add (live_vars, var->number);
-}
-
 static void
 dag_kill_nodes (dag_t *dag, dagnode_t *n)
 {

From 6e21c3ae2e0a6fec63e9a1f27f93d1ebe1321e1a Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 16 Jun 2019 19:19:03 +0900
Subject: [PATCH 0251/1519] Treat func statements similarly to flow statements

func statements need their operands marked live like flow statements do
because usage is more indirect.
---
 tools/qfcc/source/dags.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/qfcc/source/dags.c b/tools/qfcc/source/dags.c
index 1acf9031a..ee3ccfb1a 100644
--- a/tools/qfcc/source/dags.c
+++ b/tools/qfcc/source/dags.c
@@ -724,7 +724,7 @@ dag_create (flownode_t *flownode)
 		int         i;
 
 		dag_make_children (dag, s, operands, children);
-		if (s->type == st_flow)
+		if (s->type == st_flow || s->type == st_func)
 			for (i = 0; i < 3; i++)
 				if (children[i])
 					dag_make_var_live (live_vars, operands[i]);

From d6d302741117e16d558e581eaa1871aaea981590 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 16 Jun 2019 19:21:02 +0900
Subject: [PATCH 0252/1519] Mark the correct operand as live

This fixes vecexpr (and possibly other cases).
---
 tools/qfcc/source/dags.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/qfcc/source/dags.c b/tools/qfcc/source/dags.c
index ee3ccfb1a..3b9300527 100644
--- a/tools/qfcc/source/dags.c
+++ b/tools/qfcc/source/dags.c
@@ -727,7 +727,7 @@ dag_create (flownode_t *flownode)
 		if (s->type == st_flow || s->type == st_func)
 			for (i = 0; i < 3; i++)
 				if (children[i])
-					dag_make_var_live (live_vars, operands[i]);
+					dag_make_var_live (live_vars, operands[i + 1]);
 		op = opcode_label (dag, s->opcode, s->expr);
 		n = children[0];
 		if (s->type != st_assign

From ec128ffeee43f591471c372b14ae1f00f43a1661 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 16 Jun 2019 19:24:19 +0900
Subject: [PATCH 0253/1519] Leave a FIXME for daglabel_t.live

---
 tools/qfcc/include/dags.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/qfcc/include/dags.h b/tools/qfcc/include/dags.h
index 7b624ea2e..c083b8502 100644
--- a/tools/qfcc/include/dags.h
+++ b/tools/qfcc/include/dags.h
@@ -46,7 +46,7 @@ typedef struct daglabel_s {
 	struct daglabel_s *next;
 	struct daglabel_s *daglabel_chain;	///< all labels created for a dag
 	int         number;			///< index into array of labels in dag_t
-	unsigned    live:1;			///< accessed via an alias
+	unsigned    live:1;			///< accessed via an alias FIXME redundant?
 	const char *opcode;			///< not if op
 	struct operand_s *op;		///< not if opcode;
 	struct dagnode_s *dagnode;	///< node with which this label is associated

From e9c24dbf1cbcca8178fce5bcb1f0e88aefe53186 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 17 Jun 2019 22:47:44 +0900
Subject: [PATCH 0254/1519] Test case for accessing nested struct fields

Currently fails.
---
 tools/qfcc/test/Makefile.am    | 10 +++++++
 tools/qfcc/test/structstruct.r | 53 ++++++++++++++++++++++++++++++++++
 tools/qfcc/test/test-harness.h |  1 +
 3 files changed, 64 insertions(+)
 create mode 100644 tools/qfcc/test/structstruct.r

diff --git a/tools/qfcc/test/Makefile.am b/tools/qfcc/test/Makefile.am
index 96351e926..680fdbdd7 100644
--- a/tools/qfcc/test/Makefile.am
+++ b/tools/qfcc/test/Makefile.am
@@ -47,6 +47,7 @@ test_progs_dat=\
 	structarray.dat \
 	structlive.dat \
 	structptr.dat \
+	structstruct.dat \
 	swap.dat \
 	triangle.dat \
 	vecexpr.dat \
@@ -236,6 +237,15 @@ structptr.run: Makefile build-run
 include ./$(DEPDIR)/structptr.Qo # am--include-marker
 r_depfiles_remade += ./$(DEPDIR)/structptr.Qo
 
+structstruct_dat_SOURCES=structstruct.r
+structstruct_obj=$(structstruct_dat_SOURCES:.r=.qfo)
+structstruct.dat$(EXEEXT): $(structstruct_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(structstruct_obj)
+structstruct.run: Makefile build-run
+	$(srcdir)/build-run $@
+include ./$(DEPDIR)/structstruct.Qo # am--include-marker
+r_depfiles_remade += ./$(DEPDIR)/structstruct.Qo
+
 swap_dat_SOURCES=swap.r
 swap_obj=$(swap_dat_SOURCES:.r=.qfo)
 swap.dat$(EXEEXT): $(swap_obj) $(QFCC_DEP)
diff --git a/tools/qfcc/test/structstruct.r b/tools/qfcc/test/structstruct.r
new file mode 100644
index 000000000..5ae1e06e5
--- /dev/null
+++ b/tools/qfcc/test/structstruct.r
@@ -0,0 +1,53 @@
+#include "test-harness.h"
+
+typedef struct Point {
+    int x;
+    int y;
+} Point;
+
+typedef struct Size {
+    int width;
+    int height;
+} Size;
+
+typedef struct Rect {
+    Point   origin;
+    Size    size;
+} Rect;
+
+Rect rect = {{1, 2}, {3, 4}};
+
+int
+test_struct_1(Rect rect)
+{
+	return rect.origin.x;
+}
+
+int
+test_struct_2(Rect rect)
+{
+	return rect.origin.y;
+}
+
+int
+test_struct_3(Rect rect)
+{
+	return rect.size.width;
+}
+
+int
+test_struct_4(Rect rect)
+{
+	return rect.size.height;
+}
+
+int
+main()
+{
+	int ret = 0;
+	ret |= test_struct_1(rect) != 1;
+	ret |= test_struct_2(rect) != 2;
+	ret |= test_struct_3(rect) != 3;
+	ret |= test_struct_4(rect) != 4;
+	return ret;
+}
diff --git a/tools/qfcc/test/test-harness.h b/tools/qfcc/test/test-harness.h
index 959910534..f350c7ec7 100644
--- a/tools/qfcc/test/test-harness.h
+++ b/tools/qfcc/test/test-harness.h
@@ -1,3 +1,4 @@
+void *obj_malloc (int size) = #0;
 void printf (string fmt, ...) = #0;
 int errno (void) = #0;
 string strerror (int err) = #0;

From dd52b7fea1a40a0ebc18de3264d7597a81064045 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 17 Jun 2019 22:48:42 +0900
Subject: [PATCH 0255/1519] Merge aliased alias expressions

This comes up when accessing struct fields nested in another struct.
Fixes the nested struct fields test.
---
 tools/qfcc/source/expr.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index 7b5b8edbb..5b2a3b129 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -1020,6 +1020,9 @@ new_alias_expr (type_t *type, expr_t *expr)
 	alias->e.expr.type = type;
 	//if (expr->type == ex_uexpr && expr->e.expr.op == 'A')
 	//	bug (alias, "aliasing an alias expression");
+	if (expr->type == ex_expr && expr->e.expr.op == 'A') {
+		return new_offset_alias_expr (type, expr, 0);
+	}
 	alias->file = expr->file;
 	alias->line = expr->line;
 	return alias;
@@ -1030,6 +1033,14 @@ new_offset_alias_expr (type_t *type, expr_t *expr, int offset)
 {
 	expr_t     *alias;
 
+	if (expr->type == ex_expr && expr->e.expr.op == 'A') {
+		expr_t     *ofs_expr = expr->e.expr.e2;
+		expr = expr->e.expr.e1;
+		if (!is_constant (ofs_expr)) {
+			internal_error (ofs_expr, "non-constant offset for alias expr");
+		}
+		offset += expr_integer (ofs_expr);
+	}
 	alias = new_binary_expr ('A', expr, new_integer_expr (offset));
 	alias->e.expr.type = type;
 	alias->file = expr->file;

From e0c8285f075e394f5370300451e7767b9d94a761 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 17 Jun 2019 22:57:21 +0900
Subject: [PATCH 0256/1519] Extend nested struct test to cover struct copy

Fails :P
---
 tools/qfcc/test/structstruct.r | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tools/qfcc/test/structstruct.r b/tools/qfcc/test/structstruct.r
index 5ae1e06e5..c8ef25fad 100644
--- a/tools/qfcc/test/structstruct.r
+++ b/tools/qfcc/test/structstruct.r
@@ -16,6 +16,8 @@ typedef struct Rect {
 } Rect;
 
 Rect rect = {{1, 2}, {3, 4}};
+Point origin = {5, 6};
+Size size = {7, 8};
 
 int
 test_struct_1(Rect rect)
@@ -49,5 +51,11 @@ main()
 	ret |= test_struct_2(rect) != 2;
 	ret |= test_struct_3(rect) != 3;
 	ret |= test_struct_4(rect) != 4;
+	rect.origin = origin;
+	rect.size = size;
+	ret |= test_struct_1(rect) != 5;
+	ret |= test_struct_2(rect) != 6;
+	ret |= test_struct_3(rect) != 7;
+	ret |= test_struct_4(rect) != 8;
 	return ret;
 }

From b996fb7aa43a0393558b47a49535436de89a6ed4 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 17 Jun 2019 23:38:34 +0900
Subject: [PATCH 0257/1519] Make operand->type actual type instead of low-level

And clean up the resulting mess. This fixes struct copy, but uncovers
another bug :/
---
 tools/qfcc/include/dags.h       |  4 ++--
 tools/qfcc/include/def.h        |  7 +++---
 tools/qfcc/include/statements.h |  4 ++--
 tools/qfcc/source/dags.c        |  8 +++----
 tools/qfcc/source/def.c         |  5 ++--
 tools/qfcc/source/emit.c        | 14 +++++------
 tools/qfcc/source/opcodes.c     |  6 ++---
 tools/qfcc/source/statements.c  | 41 ++++++++++++++++-----------------
 8 files changed, 44 insertions(+), 45 deletions(-)

diff --git a/tools/qfcc/include/dags.h b/tools/qfcc/include/dags.h
index c083b8502..c0d07c4b3 100644
--- a/tools/qfcc/include/dags.h
+++ b/tools/qfcc/include/dags.h
@@ -62,7 +62,7 @@ typedef struct dagnode_s {
 	unsigned    killed:1;		///< node is unavailable for cse
 	st_type_t   type;			///< type of node (st_none = leaf)
 	daglabel_t *label;			///< ident/const if leaf node, or operator
-	etype_t     tl;
+	struct type_s *tl;
 	struct operand_s *value;	///< operand holding the value of this node
 	/// \name child nodes
 	/// if \a children[0] is null, the rest must be null as well. Similar for
@@ -75,7 +75,7 @@ typedef struct dagnode_s {
 	/// topological sort of the DAG.
 	//@{
 	struct dagnode_s *children[3];
-	etype_t     types[3];		///< desired type of each operand (to alias)
+	struct type_s *types[3];	///< desired type of each operand (to alias)
 	struct set_s *edges;		///< includes nodes pointed to by \a children
 	//@}
 	struct set_s *identifiers;	///< set of identifiers attached to this node
diff --git a/tools/qfcc/include/def.h b/tools/qfcc/include/def.h
index 79502a7d0..68b946fab 100644
--- a/tools/qfcc/include/def.h
+++ b/tools/qfcc/include/def.h
@@ -190,14 +190,13 @@ void free_def (def_t *def);
 
 	\note ::current_func must be valid.
 
-	\param type		The low-level type of the temporary variable.
-	\param size		The amount of space to allocate to the temp.
+	\param type		The type of the temporary variable.
 	\return			The def for the temparary variable.
 
-	\bug \a size is not checked for validity (must be 1-4).
+	\bug size of type must be 1 to 4.
 	\todo support arbitrary sizes
 */
-def_t *temp_def (etype_t type, int size);
+def_t *temp_def (struct type_s *type);
 
 /** Free a tempary def so it may be recycled.
 
diff --git a/tools/qfcc/include/statements.h b/tools/qfcc/include/statements.h
index e0e3dca98..0d91c874f 100644
--- a/tools/qfcc/include/statements.h
+++ b/tools/qfcc/include/statements.h
@@ -55,7 +55,7 @@ typedef struct {
 typedef struct operand_s {
 	struct operand_s *next;
 	op_type_e   op_type;
-	etype_t     type;			///< possibly override def's type
+	struct type_s *type;		///< possibly override def's type
 	int         size;			///< for structures
 	union {
 		struct def_s *def;
@@ -121,7 +121,7 @@ int tempop_overlap (tempop_t *t1, tempop_t *t2);
 operand_t *temp_operand (struct type_s *type);
 int tempop_visit_all (tempop_t *tempop, int overlap,
 					  int (*visit) (tempop_t *, void *), void *data);
-operand_t *alias_operand (etype_t type, operand_t *op);
+operand_t *alias_operand (struct type_s *type, operand_t *op);
 void free_operand (operand_t *op);
 
 sblock_t *new_sblock (void);
diff --git a/tools/qfcc/source/dags.c b/tools/qfcc/source/dags.c
index 3b9300527..8de4d0e54 100644
--- a/tools/qfcc/source/dags.c
+++ b/tools/qfcc/source/dags.c
@@ -818,7 +818,7 @@ dag_calc_node_costs (dagnode_t *dagnode)
 }
 #endif
 static operand_t *
-fix_op_type (operand_t *op, etype_t type)
+fix_op_type (operand_t *op, type_t *type)
 {
 	if (op && op->op_type != op_label && op->type != type)
 		op = alias_operand (type, op);
@@ -884,7 +884,7 @@ generate_moveps (dag_t *dag, sblock_t *block, dagnode_t *dagnode)
 
 static operand_t *
 generate_assignments (dag_t *dag, sblock_t *block, operand_t *src,
-					  set_iter_t *var_iter, etype_t type)
+					  set_iter_t *var_iter, type_t *type)
 {
 	statement_t *st;
 	operand_t   *dst = 0;
@@ -912,7 +912,7 @@ dag_gencode (dag_t *dag, sblock_t *block, dagnode_t *dagnode)
 	statement_t *st;
 	set_iter_t *var_iter;
 	int         i;
-	etype_t     type;
+	type_t     *type;
 
 	switch (dagnode->type) {
 		case st_none:
@@ -928,7 +928,7 @@ dag_gencode (dag_t *dag, sblock_t *block, dagnode_t *dagnode)
 			operands[0] = make_operand (dag, block, dagnode, 0);
 			if (dagnode->children[1])
 				operands[1] = make_operand (dag, block, dagnode, 1);
-			type = low_level_type (get_type (dagnode->label->expr));
+			type = get_type (dagnode->label->expr);
 			if (!(var_iter = set_first (dagnode->identifiers))) {
 				operands[2] = temp_operand (get_type (dagnode->label->expr));
 			} else {
diff --git a/tools/qfcc/source/def.c b/tools/qfcc/source/def.c
index facf82348..5848c20c5 100644
--- a/tools/qfcc/source/def.c
+++ b/tools/qfcc/source/def.c
@@ -194,10 +194,11 @@ alias_def (def_t *def, type_t *type, int offset)
 }
 
 def_t *
-temp_def (etype_t type, int size)
+temp_def (type_t *type)
 {
 	def_t      *temp;
 	defspace_t *space = current_func->symtab->space;
+	int         size = type_size (type);
 
 	if (size < 1 || size > 4) {
 		internal_error (0, "%d invalid size for temp def", size);
@@ -213,7 +214,7 @@ temp_def (etype_t type, int size)
 		temp->name = save_string (va (".tmp%d", current_func->temp_num++));
 	}
 	temp->return_addr = __builtin_return_address (0);
-	temp->type = ev_types[type];
+	temp->type = type;
 	temp->file = pr.source_file;
 	temp->line = pr.source_line;
 	set_storage_bits (temp, sc_local);
diff --git a/tools/qfcc/source/emit.c b/tools/qfcc/source/emit.c
index 003204dcb..253502206 100644
--- a/tools/qfcc/source/emit.c
+++ b/tools/qfcc/source/emit.c
@@ -61,18 +61,18 @@
 static def_t zero_def;
 
 static def_t *
-get_value_def (ex_value_t *value, etype_t type)
+get_value_def (ex_value_t *value, type_t *type)
 {
 	def_t      *def;
 
-	if (type == ev_short) {
+	if (type == &type_short) {
 		def = new_def (0, &type_short, 0, sc_extern);
 		def->offset = value->v.short_val;
 		return def;
 	}
 	def = emit_value (value, 0);
-	if (type != def->type->type)
-		return alias_def (def, ev_types[type], 0);
+	if (type != def->type)
+		return alias_def (def, type, 0);
 	return def;
 }
 
@@ -87,7 +87,7 @@ get_operand_def (expr_t *expr, operand_t *op)
 		case op_value:
 			return get_value_def (op->o.value, op->type);
 		case op_label:
-			op->type = ev_short;
+			op->type = &type_short;
 			zero_def.type = &type_short;
 			return &zero_def;	//FIXME
 		case op_temp:
@@ -97,11 +97,11 @@ get_operand_def (expr_t *expr, operand_t *op)
 			if (op->o.tempop.alias) {
 				def_t      *tdef = get_operand_def (expr, op->o.tempop.alias);
 				int         offset = op->o.tempop.offset;
-				type_t     *type = ev_types[op->type];
+				type_t     *type = op->type;
 				op->o.tempop.def = alias_def (tdef, type, offset);
 			}
 			if (!op->o.tempop.def) {
-				op->o.tempop.def = temp_def (op->type, op->size);
+				op->o.tempop.def = temp_def (op->type);
 			}
 			return op->o.tempop.def;
 		case op_alias:
diff --git a/tools/qfcc/source/opcodes.c b/tools/qfcc/source/opcodes.c
index 4d8bb4678..bf8b5b189 100644
--- a/tools/qfcc/source/opcodes.c
+++ b/tools/qfcc/source/opcodes.c
@@ -102,9 +102,9 @@ opcode_find (const char *name, operand_t *op_a, operand_t *op_b,
 	int         i;
 
 	search_op.name = name;
-	search_op.type_a = op_a ? op_a->type : ev_invalid;
-	search_op.type_b = op_b ? op_b->type : ev_invalid;
-	search_op.type_c = op_c ? op_c->type : ev_invalid;
+	search_op.type_a = op_a ? low_level_type (op_a->type) : ev_invalid;
+	search_op.type_b = op_b ? low_level_type (op_b->type) : ev_invalid;
+	search_op.type_c = op_c ? low_level_type (op_c->type) : ev_invalid;
 	op = Hash_FindElement (opcode_type_table, &search_op);
 	if (op)
 		return op;
diff --git a/tools/qfcc/source/statements.c b/tools/qfcc/source/statements.c
index d476aeeaf..1be5432d1 100644
--- a/tools/qfcc/source/statements.c
+++ b/tools/qfcc/source/statements.c
@@ -127,7 +127,7 @@ operand_string (operand_t *op)
 		case op_temp:
 			if (op->o.tempop.alias)
 				return va ("<tmp %s %p:%d:%p:%d:%d>",
-						   pr_type_name[op->type],
+						   pr_type_name[op->type->type],
 						   op, op->o.tempop.users,
 						   op->o.tempop.alias,
 						   op->o.tempop.offset,
@@ -139,7 +139,7 @@ operand_string (operand_t *op)
 				const char *alias = operand_string (op->o.alias);
 				char       *buf = alloca (strlen (alias) + 1);
 				strcpy (buf, alias);
-				return va ("alias(%s,%s)", pr_type_name[op->type], buf);
+				return va ("alias(%s,%s)", pr_type_name[op->type->type], buf);
 			}
 	}
 	return ("??");
@@ -150,11 +150,11 @@ print_operand (operand_t *op)
 {
 	switch (op->op_type) {
 		case op_def:
-			printf ("(%s) ", pr_type_name[op->type]);
+			printf ("(%s) ", pr_type_name[op->type->type]);
 			printf ("%s", op->o.def->name);
 			break;
 		case op_value:
-			printf ("(%s) ", pr_type_name[op->type]);
+			printf ("(%s) ", pr_type_name[op->type->type]);
 			switch (op->o.value->lltype) {
 				case ev_string:
 					printf ("\"%s\"", op->o.value->v.string_val);
@@ -202,12 +202,12 @@ print_operand (operand_t *op)
 			printf ("block %p", op->o.label->dest);
 			break;
 		case op_temp:
-			printf ("tmp (%s) %p", pr_type_name[op->type], op);
+			printf ("tmp (%s) %p", pr_type_name[op->type->type], op);
 			if (op->o.tempop.def)
 				printf (" %s", op->o.tempop.def->name);
 			break;
 		case op_alias:
-			printf ("alias(%s,", pr_type_name[op->type]);
+			printf ("alias(%s,", pr_type_name[op->type->type]);
 			print_operand (op->o.alias);
 			printf (")");
 	}
@@ -307,7 +307,7 @@ def_operand (def_t *def, type_t *type)
 	if (!type)
 		type = def->type;
 	op = new_operand (op_def);
-	op->type = low_level_type (type);
+	op->type = type;
 	op->size = type_size (type);
 	op->o.def = def;
 	return op;
@@ -318,7 +318,7 @@ value_operand (ex_value_t *value)
 {
 	operand_t  *op;
 	op = new_operand (op_value);
-	op->type = value->lltype;
+	op->type = value->type;
 	op->o.value = value;
 	return op;
 }
@@ -329,7 +329,7 @@ temp_operand (type_t *type)
 	operand_t  *op = new_operand (op_temp);
 
 	op->o.tempop.type = type;
-	op->type = low_level_type (type);
+	op->type = type;
 	op->size = type_size (type);
 	return op;
 }
@@ -384,19 +384,18 @@ tempop_visit_all (tempop_t *tempop, int overlap,
 }
 
 operand_t *
-alias_operand (etype_t type, operand_t *op)
+alias_operand (type_t *type, operand_t *op)
 {
 	operand_t  *aop;
 
-	if (pr_type_size[type] != pr_type_size[op->type]) {
+	if (type_size (type) != type_size (op->type)) {
 		internal_error (0, "\naliasing operand with type of diffent size"
-						" (%d, %d)", pr_type_size[type],
-						pr_type_size[op->type]);
+						" (%d, %d)", type_size (type), type_size (op->type));
 	}
 	aop = new_operand (op_alias);
 	aop->o.alias = op;
 	aop->type = type;
-	aop->size = pr_type_size[type];
+	aop->size = type_size (type);
 	return aop;
 }
 
@@ -860,14 +859,14 @@ expr_alias (sblock_t *sblock, expr_t *e, operand_t **op)
 {
 	operand_t *aop = 0;
 	operand_t *top;
-	etype_t    type;
+	type_t    *type;
 	def_t     *def;
 	int        offset = 0;
 
 	if (e->type == ex_expr) {
 		offset = expr_integer (e->e.expr.e2);
 	}
-	type = low_level_type (e->e.expr.type);
+	type = e->e.expr.type;
 	sblock = statement_subexpr (sblock, e->e.expr.e1, &aop);
 	if (aop->type == type) {
 		if (offset) {
@@ -892,7 +891,7 @@ expr_alias (sblock_t *sblock, expr_t *e, operand_t **op)
 		if (!top) {
 			top = new_operand (op_temp);
 			top->type = type;
-			top->size = pr_type_size[type];
+			top->size = type_size (type);
 			top->o.tempop.alias = aop;
 			top->o.tempop.offset = offset;
 			top->next = aop->o.tempop.alias_ops;
@@ -903,7 +902,7 @@ expr_alias (sblock_t *sblock, expr_t *e, operand_t **op)
 		def = aop->o.def;
 		while (def->alias)
 			def = def->alias;
-		*op = def_operand (alias_def (def, ev_types[type], offset), 0);
+		*op = def_operand (alias_def (def, type, offset), 0);
 	} else {
 		internal_error (e, "invalid alias target: %s: %s",
 						optype_str (aop->op_type), operand_string (aop));
@@ -1037,7 +1036,7 @@ expr_symbol (sblock_t *sblock, expr_t *e, operand_t **op)
 		*op = def_operand (sym->s.func->def, 0);
 	} else {
 		internal_error (e, "unexpected symbol type: %s for %s",
-						symtype_str(sym->sy_type), sym->name);
+						symtype_str (sym->sy_type), sym->name);
 	}
 	return sblock;
 }
@@ -1059,9 +1058,9 @@ expr_vector_e (sblock_t *sblock, expr_t *e, operand_t **op)
 	expr_t     *ax, *ay, *az, *aw;
 	expr_t     *as, *av;
 	expr_t     *tmp;
-	type_t     *vec_type = get_type(e);
+	type_t     *vec_type = get_type (e);
 
-	tmp = new_temp_def_expr(vec_type);
+	tmp = new_temp_def_expr (vec_type);
 	if (vec_type == &type_vector) {
 		// guaranteed to have three elements
 		x = e->e.vector.list;

From f7825fe7cf52dc1b9629fc395d7ce1a1d48f7979 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 18 Jun 2019 00:03:02 +0900
Subject: [PATCH 0258/1519] Print types properly in pointer value expressions

---
 tools/qfcc/source/dot_expr.c | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/tools/qfcc/source/dot_expr.c b/tools/qfcc/source/dot_expr.c
index 2925ffcc7..b98cc7b99 100644
--- a/tools/qfcc/source/dot_expr.c
+++ b/tools/qfcc/source/dot_expr.c
@@ -428,6 +428,11 @@ print_value (dstring_t *dstr, expr_t *e, int level, int id, expr_t *next)
 	int         indent = level * 2 + 2;
 	type_t     *type;
 	const char *label = "?!?";
+	static dstring_t *type_str;
+
+	if (!type_str) {
+		type_str = dstring_newstr ();
+	}
 
 	switch (e->e.value->lltype) {
 		case ev_string:
@@ -451,14 +456,18 @@ print_value (dstring_t *dstr, expr_t *e, int level, int id, expr_t *next)
 			break;
 		case ev_pointer:
 			type = e->e.value->v.pointer.type;
+			dstring_clearstr(type_str);
+			if (type) {
+				print_type_str (type_str, type);
+			}
 			if (e->e.value->v.pointer.def)
-				label = va ("(%s)[%d]<%s>",
-							type ? pr_type_name[type->type] : "???",
+				label = va ("(*%s)[%d]<%s>",
+							type ? type_str->str : "???",
 							e->e.value->v.pointer.val,
 							e->e.value->v.pointer.def->name);
 			else
-				label = va ("(%s)[%d]",
-							type ? pr_type_name[type->type] : "???",
+				label = va ("(*%s)[%d]",
+							type ? type_str->str : "???",
 							e->e.value->v.pointer.val);
 			break;
 		case ev_field:

From fe73547f43528f93113d3810cb363650ba6aee59 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 18 Jun 2019 08:53:05 +0900
Subject: [PATCH 0259/1519] Update alias type sameness check

This one seems to be fairly robust. Fixes alias being used to cast
pointers (maybe a better way, but this works for now).
---
 tools/qfcc/include/type.h      |  2 ++
 tools/qfcc/source/statements.c |  4 ++--
 tools/qfcc/source/type.c       | 27 +++++++++++++++++++++++++++
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/tools/qfcc/include/type.h b/tools/qfcc/include/type.h
index 92b495753..14f1038f7 100644
--- a/tools/qfcc/include/type.h
+++ b/tools/qfcc/include/type.h
@@ -159,9 +159,11 @@ int is_vector (const type_t *type) __attribute__((pure));
 int is_quaternion (const type_t *type) __attribute__((pure));
 int is_math (const type_t *type) __attribute__((pure));
 int is_pointer (const type_t *type) __attribute__((pure));
+int is_field (const type_t *type) __attribute__((pure));
 int is_struct (const type_t *type) __attribute__((pure));
 int is_array (const type_t *type) __attribute__((pure));
 int is_func (const type_t *type) __attribute__((pure));
+int type_compatible (const type_t *dst, const type_t *src);
 int type_assignable (const type_t *dst, const type_t *src);
 int type_size (const type_t *type) __attribute__((pure));
 
diff --git a/tools/qfcc/source/statements.c b/tools/qfcc/source/statements.c
index 1be5432d1..a0f9b54bf 100644
--- a/tools/qfcc/source/statements.c
+++ b/tools/qfcc/source/statements.c
@@ -868,9 +868,9 @@ expr_alias (sblock_t *sblock, expr_t *e, operand_t **op)
 	}
 	type = e->e.expr.type;
 	sblock = statement_subexpr (sblock, e->e.expr.e1, &aop);
-	if (aop->type == type) {
+	if (type_compatible (aop->type, type)) {
 		if (offset) {
-			internal_error (e, "offset alias of same type");
+			internal_error (e, "offset alias of same size type");
 		}
 		*op = aop;
 		return sblock;
diff --git a/tools/qfcc/source/type.c b/tools/qfcc/source/type.c
index d63563524..55879f520 100644
--- a/tools/qfcc/source/type.c
+++ b/tools/qfcc/source/type.c
@@ -734,6 +734,14 @@ is_pointer (const type_t *type)
 	return 0;
 }
 
+int
+is_field (const type_t *type)
+{
+	if (type->type == ev_field)
+		return 1;
+	return 0;
+}
+
 int
 is_array (const type_t *type)
 {
@@ -750,6 +758,25 @@ is_func (const type_t *type)
 	return 0;
 }
 
+int
+type_compatible (const type_t *dst, const type_t *src)
+{
+	// same type
+	if (dst == src) {
+		return 1;
+	}
+	if (is_field (dst) && is_field (src)) {
+		return 1;
+	}
+	if (is_func (dst) && is_func (src)) {
+		return 1;
+	}
+	if (is_pointer (dst) && is_pointer (src)) {
+		return 1;
+	}
+	return 0;
+}
+
 int
 type_assignable (const type_t *dst, const type_t *src)
 {

From fc50376297d1b7fce1141dd36248f974270ed20c Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 18 Jun 2019 08:54:18 +0900
Subject: [PATCH 0260/1519] Fix a minor error check mistake

---
 tools/qfcc/source/type.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/qfcc/source/type.c b/tools/qfcc/source/type.c
index 55879f520..d3f286597 100644
--- a/tools/qfcc/source/type.c
+++ b/tools/qfcc/source/type.c
@@ -109,7 +109,7 @@ static type_t *types_freelist;
 etype_t
 low_level_type (type_t *type)
 {
-	if (type->type >= ev_type_count)
+	if (type->type > ev_type_count)
 		internal_error (0, "invalid type");
 	if (type->type == ev_type_count)
 		internal_error (0, "found 'type count' type");

From 0f1f477e64910a8c8a900fc2d15ae131f84e8e09 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 18 Jun 2019 10:38:19 +0900
Subject: [PATCH 0261/1519] Set up temp aliases correctly

Fixes vector expressions as sub-expresses. I really don't know why I did
the temp alias setup that way.
---
 tools/qfcc/source/statements.c |  4 +---
 tools/qfcc/test/vecexpr.r      |  8 ++++++++
 tools/qfcc/test/vecinit.r      | 17 ++++++++++++++---
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/tools/qfcc/source/statements.c b/tools/qfcc/source/statements.c
index a0f9b54bf..545d5524b 100644
--- a/tools/qfcc/source/statements.c
+++ b/tools/qfcc/source/statements.c
@@ -889,9 +889,7 @@ expr_alias (sblock_t *sblock, expr_t *e, operand_t **op)
 			}
 		}
 		if (!top) {
-			top = new_operand (op_temp);
-			top->type = type;
-			top->size = type_size (type);
+			top = temp_operand (type);
 			top->o.tempop.alias = aop;
 			top->o.tempop.offset = offset;
 			top->next = aop->o.tempop.alias_ops;
diff --git a/tools/qfcc/test/vecexpr.r b/tools/qfcc/test/vecexpr.r
index 4007348e1..131709bf4 100644
--- a/tools/qfcc/test/vecexpr.r
+++ b/tools/qfcc/test/vecexpr.r
@@ -21,6 +21,8 @@ int
 main ()
 {
 	int ret = 0;
+	float x = 4;
+	float y = 5;
 	vector v;
 
 	v = t2(5);
@@ -33,5 +35,11 @@ main ()
 		printf("t3(5) = %v\n", v);
 		ret |= 1;
 	}
+	v = [x, y, 0] / 2;
+	if (v != [2, 2.5, 0]) {
+		printf("v = %v\n", v);
+		ret |= 1;
+	}
+
 	return ret;
 }
diff --git a/tools/qfcc/test/vecinit.r b/tools/qfcc/test/vecinit.r
index d26a94404..653f9e25d 100644
--- a/tools/qfcc/test/vecinit.r
+++ b/tools/qfcc/test/vecinit.r
@@ -8,8 +8,8 @@ foo (float x, float y, float z)
 	return v;
 }
 
-float w;
-float h;
+float w = 2;
+float h = 4;
 
 vector
 bar (void)
@@ -22,8 +22,19 @@ bar (void)
 	return pos;
 }
 
+vector
+baz (float w, float h)
+{
+	vector p = [w, h, 0] / 2;
+	return p;
+}
+
 int
 main ()
 {
-	return 0;
+	int ret = 0;
+	ret |= foo(1,2,3) != [1, 2, 3];
+	ret |= bar() != [2, 4, 0];
+	ret |= baz(5, 6) != [2.5, 3, 0];
+	return ret;
 }

From b37c331e76f8fbec575f9ae142c8f0ec33faa6c8 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 18 Jun 2019 10:39:17 +0900
Subject: [PATCH 0262/1519] Catch taking size of null type

This should help catch similar errors in the future.
---
 tools/qfcc/source/type.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tools/qfcc/source/type.c b/tools/qfcc/source/type.c
index d3f286597..d99a89cc4 100644
--- a/tools/qfcc/source/type.c
+++ b/tools/qfcc/source/type.c
@@ -817,8 +817,6 @@ type_assignable (const type_t *dst, const type_t *src)
 int
 type_size (const type_t *type)
 {
-	if (!type)
-		return 0;
 	switch (type->type) {
 		case ev_void:
 		case ev_string:

From 83fac13a0cc77f174f98f5a247b34843f7e0882d Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 18 Jun 2019 11:53:58 +0900
Subject: [PATCH 0263/1519] Fix debug line numbers for vector expressions

---
 tools/qfcc/source/statements.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tools/qfcc/source/statements.c b/tools/qfcc/source/statements.c
index 545d5524b..c4c92f254 100644
--- a/tools/qfcc/source/statements.c
+++ b/tools/qfcc/source/statements.c
@@ -1057,6 +1057,11 @@ expr_vector_e (sblock_t *sblock, expr_t *e, operand_t **op)
 	expr_t     *as, *av;
 	expr_t     *tmp;
 	type_t     *vec_type = get_type (e);
+	int         file = pr.source_file;
+	int         line = pr.source_line;
+
+	pr.source_file = e->file;
+	pr.source_line = e->line;
 
 	tmp = new_temp_def_expr (vec_type);
 	if (vec_type == &type_vector) {
@@ -1105,6 +1110,8 @@ expr_vector_e (sblock_t *sblock, expr_t *e, operand_t **op)
 			sblock = statement_slist (sblock, as);
 		}
 	}
+	pr.source_file = file;
+	pr.source_line = line;
 	sblock = statement_subexpr (sblock, tmp, op);
 	return sblock;
 }

From a5ee58cebbe542dec148325734fed6be36305e34 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 18 Jun 2019 11:54:45 +0900
Subject: [PATCH 0264/1519] Support 2d vector expressions

[x, y] expands to [x, y, 0] (for now, might add a 2d vector type).
---
 tools/qfcc/source/expr.c | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index 5b2a3b129..4970cc7cd 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -645,9 +645,9 @@ new_vector_list (expr_t *e)
 			type = &type_quaternion;
 		case 3:
 			// quaternion or vector. all expressions must be compatible with
-			// a float
+			// a float (ie, a scalar)
 			for (t = e; t; t = t->next)
-				if (!type_assignable (&type_float, get_type (t)))
+				if (!is_scalar (get_type (t)))
 					return error (t, "invalid type for vector element");
 			vec = new_expr ();
 			vec->type = ex_vector;
@@ -655,18 +655,28 @@ new_vector_list (expr_t *e)
 			vec->e.vector.list = e;
 			break;
 		case 2:
-			// quaternion. either float-ish, vector or vector, float-ish
-			if (type_assignable (&type_float, get_type (e))
-				&& type_assignable (&type_vector, get_type(e->next))) {
-				// float-ish, vector
+			if (is_scalar (get_type (e)) && is_scalar (get_type (e->next))) {
+				// scalar, scalar
+				// expand [x, y] to [x, y, 0]
+				e->next->next = new_float_expr (0);
+				vec = new_expr ();
+				vec->type = ex_vector;
+				vec->e.vector.type = type;
+				vec->e.vector.list = e;
+				break;
+			}
+			// quaternion. either scalar, vector or vector, scalar
+			if (is_scalar (get_type (e))
+				&& is_vector (get_type (e->next))) {
+				// scalar, vector
 				// swap expressions
 				t = e;
 				e = e->next;
 				e->next = t;
 				t->next = 0;
-			} else if (type_assignable (&type_vector, get_type (e))
-					   && type_assignable (&type_float, get_type(e->next))) {
-				// vector, float-ish
+			} else if (is_vector (get_type (e))
+					   && is_scalar (get_type (e->next))) {
+				// vector, scalar
 				// do nothing
 			} else {
 				return error (t, "invalid types for vector elements");

From 8caf2eb584bd68fd4344c020b6011e28dee47eb1 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 27 Jun 2019 21:37:48 +0900
Subject: [PATCH 0265/1519] Mark some new functions as pure

---
 tools/qfcc/include/statements.h | 2 +-
 tools/qfcc/include/type.h       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/qfcc/include/statements.h b/tools/qfcc/include/statements.h
index 0d91c874f..14a95ae0a 100644
--- a/tools/qfcc/include/statements.h
+++ b/tools/qfcc/include/statements.h
@@ -117,7 +117,7 @@ const char *optype_str (op_type_e type) __attribute__((const));
 
 operand_t *def_operand (struct def_s *def, struct type_s *type);
 operand_t *value_operand (struct ex_value_s *value);
-int tempop_overlap (tempop_t *t1, tempop_t *t2);
+int tempop_overlap (tempop_t *t1, tempop_t *t2) __attribute__((pure));
 operand_t *temp_operand (struct type_s *type);
 int tempop_visit_all (tempop_t *tempop, int overlap,
 					  int (*visit) (tempop_t *, void *), void *data);
diff --git a/tools/qfcc/include/type.h b/tools/qfcc/include/type.h
index 14f1038f7..d064de8ca 100644
--- a/tools/qfcc/include/type.h
+++ b/tools/qfcc/include/type.h
@@ -163,7 +163,7 @@ int is_field (const type_t *type) __attribute__((pure));
 int is_struct (const type_t *type) __attribute__((pure));
 int is_array (const type_t *type) __attribute__((pure));
 int is_func (const type_t *type) __attribute__((pure));
-int type_compatible (const type_t *dst, const type_t *src);
+int type_compatible (const type_t *dst, const type_t *src) __attribute__((pure));
 int type_assignable (const type_t *dst, const type_t *src);
 int type_size (const type_t *type) __attribute__((pure));
 

From ab71311174f2c4aaa9c02222747f6e7f2afedb1b Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 6 Jul 2019 14:44:22 +0900
Subject: [PATCH 0266/1519] Correct some comments

---
 include/QF/set.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/QF/set.h b/include/QF/set.h
index 0d50700da..2f4dd76e5 100644
--- a/include/QF/set.h
+++ b/include/QF/set.h
@@ -251,7 +251,7 @@ set_t *set_empty (set_t *set);
 */
 set_t *set_everything (set_t *set);
 
-/** Test if a set is the set of everything.
+/** Test if a set is the empty set.
 
 	\param set		The set to test.
 	\return			1 if \a set is empty (non-inverted).
@@ -358,8 +358,8 @@ set_iter_t *set_next_r (set_pool_t *set_pool, set_iter_t *set_iter);
 
 /** Return a human-readable string representing the set.
 
-	Empty sets will be represented by the string "[empty]". Sets of everything
-	will be represented by the string "[everything]". Inverted sets will have
+	Empty sets will be represented by the string "{}". Sets of everything
+	will be represented by the string "{...}". Inverted sets will have
 	the first implicit member followed by "..." (eg, "256 ...").
 
 	\param set		The set to be converted to a string.

From c727f6a130ba9bbffd69fbe9a7a0f59b5c104f0d Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 6 Jul 2019 14:45:40 +0900
Subject: [PATCH 0267/1519] Rewrite QuatMultVec to be faster

Could be faster still using SSE, but that's another project.
---
 libs/util/mathlib.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/libs/util/mathlib.c b/libs/util/mathlib.c
index a1e11f48b..db68455f3 100644
--- a/libs/util/mathlib.c
+++ b/libs/util/mathlib.c
@@ -258,15 +258,18 @@ QuatMult (const quat_t q1, const quat_t q2, quat_t out)
 VISIBLE void
 QuatMultVec (const quat_t q, const vec3_t v, vec3_t out)
 {
-	vec_t      s;
 	vec3_t     tv;
+	vec_t      dqv, dqq;
+	vec_t      s;
 
-	s = -DotProduct (q, v);
+	s = q[3];
 	CrossProduct (q, v, tv);
-	VectorMultAdd (tv, q[3], v, tv);
-	CrossProduct (q, tv, out);
-	VectorMultSub (out, s, q, out);
-	VectorMultAdd (out, q[3], tv, out);
+	dqv = DotProduct (q, v);
+	dqq = DotProduct (q, q);
+	VectorScale (tv, s, tv);
+	VectorMultAdd (tv, dqv, q, tv);
+	VectorAdd (tv, tv, tv);
+	VectorMultAdd (tv, s * s - dqq, v, out);
 }
 
 VISIBLE void

From c3fa78ef4df9a48d43a031ac04a49f3de0cdac33 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 6 Jul 2019 14:49:28 +0900
Subject: [PATCH 0268/1519] Include test for 2d vector expressions

---
 tools/qfcc/test/vecexpr.r | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/qfcc/test/vecexpr.r b/tools/qfcc/test/vecexpr.r
index 131709bf4..8667b0c93 100644
--- a/tools/qfcc/test/vecexpr.r
+++ b/tools/qfcc/test/vecexpr.r
@@ -35,8 +35,8 @@ main ()
 		printf("t3(5) = %v\n", v);
 		ret |= 1;
 	}
-	v = [x, y, 0] / 2;
-	if (v != [2, 2.5, 0]) {
+	v = [x, y] / 2;
+	if (v != [2, 2.5]) {
 		printf("v = %v\n", v);
 		ret |= 1;
 	}

From 2bc78e7f0a56e0ac696841be5899f44246b449f4 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 6 Jul 2019 14:42:53 +0900
Subject: [PATCH 0269/1519] Start work on a Vulkan-based renderer

Doesn't do much other than create an instance and enumerate some stuff,
but the build system is working.
---
 config.d/ac_config_files.m4                   |   1 +
 config.d/build_control.m4                     |  10 +-
 config.d/vulkan.m4                            |  24 ++
 configure.ac                                  |   1 +
 include/QF/Vulkan/cvars.h                     |   7 +
 include/QF/Vulkan/funclist.h                  |  55 +++
 include/QF/Vulkan/funcs.h                     |   9 +
 include/QF/Vulkan/init.h                      |  65 +++
 include/QF/Vulkan/qf_draw.h                   |  37 ++
 include/QF/Vulkan/qf_vid.h                    |  36 ++
 libs/video/renderer/Makefile.am               |  10 +-
 libs/video/renderer/vid_render_vulkan.c       | 193 +++++++++
 libs/video/renderer/vulkan/Makefile.am        |  26 ++
 libs/video/renderer/vulkan/init.c             | 390 ++++++++++++++++++
 libs/video/renderer/vulkan/namehack.h         | 137 ++++++
 libs/video/renderer/vulkan/vulkan_draw.c      | 189 +++++++++
 libs/video/renderer/vulkan/vulkan_funcs.c     |   6 +
 .../video/renderer/vulkan/vulkan_vid_common.c | 129 ++++++
 18 files changed, 1319 insertions(+), 6 deletions(-)
 create mode 100644 config.d/vulkan.m4
 create mode 100644 include/QF/Vulkan/cvars.h
 create mode 100644 include/QF/Vulkan/funclist.h
 create mode 100644 include/QF/Vulkan/funcs.h
 create mode 100644 include/QF/Vulkan/init.h
 create mode 100644 include/QF/Vulkan/qf_draw.h
 create mode 100644 include/QF/Vulkan/qf_vid.h
 create mode 100644 libs/video/renderer/vid_render_vulkan.c
 create mode 100644 libs/video/renderer/vulkan/Makefile.am
 create mode 100644 libs/video/renderer/vulkan/init.c
 create mode 100644 libs/video/renderer/vulkan/namehack.h
 create mode 100644 libs/video/renderer/vulkan/vulkan_draw.c
 create mode 100644 libs/video/renderer/vulkan/vulkan_funcs.c
 create mode 100644 libs/video/renderer/vulkan/vulkan_vid_common.c

diff --git a/config.d/ac_config_files.m4 b/config.d/ac_config_files.m4
index 587a515d9..499c93099 100644
--- a/config.d/ac_config_files.m4
+++ b/config.d/ac_config_files.m4
@@ -32,6 +32,7 @@
 	libs/video/renderer/glsl/Makefile
 	libs/video/renderer/sw/Makefile
 	libs/video/renderer/sw32/Makefile
+	libs/video/renderer/vulkan/Makefile
 	libs/video/targets/Makefile
 
 	hw/Makefile
diff --git a/config.d/build_control.m4 b/config.d/build_control.m4
index abc60cd75..94a7415af 100644
--- a/config.d/build_control.m4
+++ b/config.d/build_control.m4
@@ -71,7 +71,7 @@ if test "x$HAVE_X" = xyes; then
 		NQ_DESKTOP_DATA="$NQ_DESKTOP_DATA quakeforge-nq-x11.desktop"
 		CL_TARGETS="$CL_TARGETS X11"
 		VID_TARGETS="$VID_TARGETS libQFx11.la"
-		QF_NEED(vid_render, [sw sw32 gl glsl])
+		QF_NEED(vid_render, [sw sw32 gl glsl vulkan])
 		QF_NEED(models, [sw gl glsl])
 		QF_NEED(alias, [sw gl glsl])
 		QF_NEED(brush, [sw gl glsl])
@@ -95,7 +95,7 @@ if test "x$HAVE_SDL" = xyes; then
 		NQ_DESKTOP_DATA="$NQ_DESKTOP_DATA quakeforge-nq-sdl.desktop"
 		CL_TARGETS="$CL_TARGETS SDL"
 		VID_TARGETS="$VID_TARGETS libQFsdl.la"
-		QF_NEED(vid_render, [sw sw32 gl glsl])
+		QF_NEED(vid_render, [sw sw32 gl glsl vulkan])
 		QF_NEED(models, [sw gl glsl])
 		QF_NEED(alias, [sw gl glsl])
 		QF_NEED(brush, [sw gl glsl])
@@ -258,7 +258,7 @@ QF_SUBST(progs_gz)
 QF_PROCESS_NEED_DIRS(top, [libs hw nq qtv qw tools ruamoko])
 
 QF_PROCESS_NEED_LIBS(swrend, [asm])
-QF_PROCESS_NEED_DIRS(vid_render, [gl glsl sw sw32])
+QF_PROCESS_NEED_DIRS(vid_render, [gl glsl sw sw32 vulkan])
 QF_PROCESS_NEED_LIBS(models, [gl glsl sw])
 QF_PROCESS_NEED_LIBS(alias, [gl glsl sw])
 QF_PROCESS_NEED_LIBS(brush, [gl glsl sw])
@@ -308,7 +308,7 @@ if test "x$static_plugins" = xauto; then
 	fi
 fi
 if test "x$static_plugins" = xyes; then
-	QF_PROCESS_NEED_STATIC_PLUGINS(vid_render, [sw sw32 glsl gl])
+	QF_PROCESS_NEED_STATIC_PLUGINS(vid_render, [sw sw32 glsl gl vulkan])
 	QF_PROCESS_NEED_STATIC_PLUGINS(console, [server], [\$(top_builddir)/libs/console], [server])
 	QF_PROCESS_NEED_STATIC_PLUGINS(console, [client], [\$(top_builddir)/libs/console], [client])
 
@@ -323,7 +323,7 @@ if test "x$static_plugins" = xyes; then
 		CDTYPE="$CDTYPE (static)"
 	fi
 else
-	QF_PROCESS_NEED_PLUGINS(vid_render, [sw sw32 glsl gl])
+	QF_PROCESS_NEED_PLUGINS(vid_render, [sw sw32 glsl gl vulkan])
 	QF_PROCESS_NEED_PLUGINS(console, [server], [server])
 	QF_PROCESS_NEED_PLUGINS(console, [client], [client])
 	QF_PROCESS_NEED_PLUGINS(snd_output, [sdl mme sgi sun win dx oss alsa])
diff --git a/config.d/vulkan.m4 b/config.d/vulkan.m4
new file mode 100644
index 000000000..c82900f58
--- /dev/null
+++ b/config.d/vulkan.m4
@@ -0,0 +1,24 @@
+dnl Check for vulkan support
+AC_ARG_ENABLE(vulkan,
+[  --disable-vulkan        do not use Vulkan],
+	HAVE_VULKAN=$enable_vulkan, HAVE_VULKAN=auto)
+if test "x$HAVE_VULKAN" != xno; then
+	save_CPPFLAGS="$CPPFLAGS"
+	AS_IF([test x"$VULKAN_SDK" != x], [
+		CPPFLAGS="$CPPFLAGS -I$VULKAN_SDK/include"
+		LDFLAGS="$LDFLAGS -L$VULKAN_SDK/lib"
+		glslangvalidator="$VULKAN_SDK/bin/glslangValidator"
+	  ], [glslangvalidator="glslangValidator"])
+	AC_CHECK_HEADER(
+		[vulkan/vulkan.h],
+		dnl Make sure the library "works"
+		[AC_CHECK_LIB([vulkan], [vkCreateInstance],
+			[AC_DEFINE([HAVE_VULKAN], [1], [Define if yhou have the Vulkan libs])
+			 VULKAN_LIBS=-lvulkan],
+			[AC_MSG_RESULT(no)])
+		],
+		[AC_MSG_RESULT(no)]
+	)
+	CPPFLAGS="$save_CPPFLAGS"
+fi
+AC_SUBST(VULKAN_LIBS)
diff --git a/configure.ac b/configure.ac
index ea203472c..aaf6492ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -64,6 +64,7 @@ m4_include(config.d/mgl.m4)
 m4_include(config.d/fbdev.m4)
 m4_include(config.d/svga.m4)
 m4_include(config.d/x11.m4)
+m4_include(config.d/vulkan.m4)
 m4_include(config.d/sdl.m4)
 
 m4_include(config.d/curses.m4)
diff --git a/include/QF/Vulkan/cvars.h b/include/QF/Vulkan/cvars.h
new file mode 100644
index 000000000..9f318b8f0
--- /dev/null
+++ b/include/QF/Vulkan/cvars.h
@@ -0,0 +1,7 @@
+#ifndef __QF_Vulkan_cvars_h
+#define __QF_Vulkan_cvars_h
+
+extern struct cvar_s *vulkan_library_name;
+extern struct cvar_s *vulkan_use_validation;
+
+#endif//__QF_Vulkan_cvars_h
diff --git a/include/QF/Vulkan/funclist.h b/include/QF/Vulkan/funclist.h
new file mode 100644
index 000000000..1ab96300c
--- /dev/null
+++ b/include/QF/Vulkan/funclist.h
@@ -0,0 +1,55 @@
+#ifndef EXPORTED_VULKAN_FUNCTION
+#define EXPORTED_VULKAN_FUNCTION(function)
+#endif
+
+EXPORTED_VULKAN_FUNCTION (vkGetInstanceProcAddr)
+
+#undef EXPORTED_VULKAN_FUNCTION
+
+#ifndef GLOBAL_LEVEL_VULKAN_FUNCTION
+#define GLOBAL_LEVEL_VULKAN_FUNCTION(function)
+#endif
+
+GLOBAL_LEVEL_VULKAN_FUNCTION (vkEnumerateInstanceVersion)
+GLOBAL_LEVEL_VULKAN_FUNCTION (vkEnumerateInstanceExtensionProperties)
+GLOBAL_LEVEL_VULKAN_FUNCTION (vkEnumerateInstanceLayerProperties)
+GLOBAL_LEVEL_VULKAN_FUNCTION (vkCreateInstance)
+
+#undef GLOBAL_LEVEL_VULKAN_FUNCTION
+
+#ifndef INSTANCE_LEVEL_VULKAN_FUNCTION
+#define INSTANCE_LEVEL_VULKAN_FUNCTION(function)
+#endif
+
+INSTANCE_LEVEL_VULKAN_FUNCTION (vkEnumeratePhysicalDevices)
+INSTANCE_LEVEL_VULKAN_FUNCTION (vkGetPhysicalDeviceProperties)
+INSTANCE_LEVEL_VULKAN_FUNCTION (vkGetPhysicalDeviceFeatures)
+INSTANCE_LEVEL_VULKAN_FUNCTION (vkCreateDevice)
+INSTANCE_LEVEL_VULKAN_FUNCTION (vkGetDeviceProcAddr)
+INSTANCE_LEVEL_VULKAN_FUNCTION (vkEnumerateDeviceLayerProperties)
+INSTANCE_LEVEL_VULKAN_FUNCTION (vkEnumerateDeviceExtensionProperties)
+INSTANCE_LEVEL_VULKAN_FUNCTION (vkGetPhysicalDeviceMemoryProperties)
+INSTANCE_LEVEL_VULKAN_FUNCTION (vkGetPhysicalDeviceQueueFamilyProperties)
+INSTANCE_LEVEL_VULKAN_FUNCTION (vkDestroyInstance)
+
+#undef INSTANCE_LEVEL_VULKAN_FUNCTION
+
+#ifndef INSTANCE_LEVEL_VULKAN_FUNCTION_EXTENSION
+#define INSTANCE_LEVEL_VULKAN_FUNCTION_EXTENSION(function)
+#endif
+
+INSTANCE_LEVEL_VULKAN_FUNCTION_EXTENSION (vkCreateDebugUtilsMessengerEXT)
+
+#undef INSTANCE_LEVEL_VULKAN_FUNCTION_EXTENSION
+
+#ifndef DEVICE_LEVEL_VULKAN_FUNCTION
+#define DEVICE_LEVEL_VULKAN_FUNCTION(function)
+#endif
+
+#undef DEVICE_LEVEL_VULKAN_FUNCTION
+
+#ifndef DEVICE_LEVEL_VULKAN_FUNCTION_EXTENSION
+#define DEVICE_LEVEL_VULKAN_FUNCTION_EXTENSION(function)
+#endif
+
+#undef DEVICE_LEVEL_VULKAN_FUNCTION_EXTENSION
diff --git a/include/QF/Vulkan/funcs.h b/include/QF/Vulkan/funcs.h
new file mode 100644
index 000000000..975f5485b
--- /dev/null
+++ b/include/QF/Vulkan/funcs.h
@@ -0,0 +1,9 @@
+#ifndef __QF_Vulkan_funcs_h
+#define __QF_Vulkan_funcs_h
+
+#define EXPORTED_VULKAN_FUNCTION(fname) extern PFN_##fname fname;
+#define GLOBAL_LEVEL_VULKAN_FUNCTION(fname) extern PFN_##fname fname;
+
+#include "QF/Vulkan/funclist.h"
+
+#endif//__QF_Vulkan_funcs_h
diff --git a/include/QF/Vulkan/init.h b/include/QF/Vulkan/init.h
new file mode 100644
index 000000000..b12dcd42e
--- /dev/null
+++ b/include/QF/Vulkan/init.h
@@ -0,0 +1,65 @@
+/*
+	Copyright (C) 2019 Bill Currie <bill@taniwha.org>
+
+	Author: Bill Currie
+	Date: 2019/6/29
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifndef __QF_Vulkan_init_h
+#define __QF_Vulkan_init_h
+
+#include <vulkan/vulkan.h>
+
+#include "QF/qtypes.h"
+#include "QF/Vulkan/funcs.h"
+
+typedef struct {
+	VkPhysicalDevice device;
+	VkPhysicalDeviceProperties properties;
+	uint32_t    numLayers;
+	VkLayerProperties *layers;
+	uint32_t    numExtensions;
+	VkExtensionProperties *extensions;
+	VkPhysicalDeviceFeatures features;
+	VkPhysicalDeviceMemoryProperties memory;
+	uint32_t    numQueueFamilies;
+	VkQueueFamilyProperties *queueFamilies;
+} VulkanPhysDevice_t;
+
+typedef struct {
+	VkInstance  instance;
+	VkDebugUtilsMessengerEXT debug_callback;
+	uint32_t    numDevices;
+	VulkanPhysDevice_t *devices;
+
+    #define INSTANCE_LEVEL_VULKAN_FUNCTION(name) PFN_##name name;
+    #define INSTANCE_LEVEL_VULKAN_FUNCTION_EXTENSION(name) PFN_##name name;
+	#include "QF/Vulkan/funclist.h"
+} VulkanInstance_t;
+
+void Vulkan_Init_Cvars (void);
+VulkanInstance_t *Vulkan_CreateInstance (const char *appName,
+										 uint32_t appVersion,
+										 const char **layers,
+										 const char **extensions);
+void Vulkan_DestroyInstance (VulkanInstance_t *instance);
+
+#endif // __QF_Vulkan_init_h
diff --git a/include/QF/Vulkan/qf_draw.h b/include/QF/Vulkan/qf_draw.h
new file mode 100644
index 000000000..e4716f7ed
--- /dev/null
+++ b/include/QF/Vulkan/qf_draw.h
@@ -0,0 +1,37 @@
+/*
+	qf_draw.h
+
+	vulkan specific draw function
+
+	Copyright (C) 1996-1997  Id Software, Inc.
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+
+#ifndef __gl_draw_h
+#define __gl_draw_h
+
+void Vulkan_Set2D (void);
+void Vulkan_Set2DScaled (void);
+void Vulkan_End2D (void);
+void Vulkan_DrawReset (void);
+void Vulkan_FlushText (void);
+
+#endif//__gl_draw_h
diff --git a/include/QF/Vulkan/qf_vid.h b/include/QF/Vulkan/qf_vid.h
new file mode 100644
index 000000000..d032a075a
--- /dev/null
+++ b/include/QF/Vulkan/qf_vid.h
@@ -0,0 +1,36 @@
+/*
+	Vulkan/qf_vid.h
+
+	vulkan vid stuff from the renderer.
+
+	Copyright (C) 1996-1997  Id Software, Inc.
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+
+#ifndef __QF_Vulkan_vid_h
+#define __QF_Vulkan_vid_h
+
+#include "QF/Vulkan/cvars.h"
+
+void Vulkan_Init_Common (void);
+void Vulkan_Shutdown_Common (void);
+
+#endif // __QF_Vulkan_vid_h
diff --git a/libs/video/renderer/Makefile.am b/libs/video/renderer/Makefile.am
index 2c234fe33..f7a0fa0cd 100644
--- a/libs/video/renderer/Makefile.am
+++ b/libs/video/renderer/Makefile.am
@@ -16,7 +16,8 @@ noinst_LTLIBRARIES= libQFrenderer.la @vid_render_static_plugins@
 
 EXTRA_LTLIBRARIES=	\
 					vid_render_sw.la vid_render_sw32.la \
-					vid_render_gl.la vid_render_glsl.la
+					vid_render_gl.la vid_render_glsl.la \
+					vid_render_vulkan.la
 
 common_sources= \
 	crosshair.c noisetextures.c r_alias.c r_bsp.c r_cvar.c r_dyn_textures.c \
@@ -63,3 +64,10 @@ vid_render_sw32_la_LDFLAGS=		$(plugin_ldflags)
 vid_render_sw32_la_LIBADD=		$(sw32_libs)
 vid_render_sw32_la_DEPENDENCIES=$(sw32_libs)
 vid_render_sw32_la_SOURCES=		$(common_sources) vid_render_sw32.c
+
+vulkan_libs= \
+	vulkan/libvulkan.la
+vid_render_vulkan_la_LDFLAGS=		$(plugin_ldflags)
+vid_render_vulkan_la_LIBADD=		$(vulkan_libs)
+vid_render_vulkan_la_DEPENDENCIES=$(vulkan_libs)
+vid_render_vulkan_la_SOURCES=		$(common_sources) vid_render_vulkan.c
diff --git a/libs/video/renderer/vid_render_vulkan.c b/libs/video/renderer/vid_render_vulkan.c
new file mode 100644
index 000000000..820d58fa6
--- /dev/null
+++ b/libs/video/renderer/vid_render_vulkan.c
@@ -0,0 +1,193 @@
+/*
+	vid_render_vulkan.c
+
+	Vulkan version of the renderer
+
+	Copyright (C) 2019 Bill Currie <bill@taniwha.org>
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#define NH_DEFINE
+#include "vulkan/namehack.h"
+
+#include "QF/plugin/general.h"
+#include "QF/plugin/vid_render.h"
+
+#include "QF/Vulkan/qf_vid.h"
+
+#include "mod_internal.h"
+#include "r_internal.h"
+
+#include "vulkan/namehack.h"
+
+static vid_model_funcs_t model_funcs = {
+/*	vulkan_Mod_LoadExternalTextures,
+	vulkan_Mod_LoadLighting,
+	vulkan_Mod_SubdivideSurface,
+	vulkan_Mod_ProcessTexture,
+
+	Mod_LoadIQM,
+	Mod_LoadAliasModel,
+	Mod_LoadSpriteModel,
+
+	vulkan_Mod_MakeAliasModelDisplayLists,
+	vulkan_Mod_LoadSkin,
+	vulkan_Mod_FinalizeAliasModel,
+	vulkan_Mod_LoadExternalSkins,
+	vulkan_Mod_IQMFinish,
+	0,
+	vulkan_Mod_SpriteLoadTexture,
+
+	Skin_SetColormap,
+	Skin_SetSkin,
+	vulkan_Skin_SetupSkin,
+	Skin_SetTranslation,
+	vulkan_Skin_ProcessTranslation,
+	vulkan_Skin_InitTranslations,*/
+};
+
+vid_render_funcs_t vulkan_vid_render_funcs = {
+	vulkan_Draw_Init,
+	vulkan_Draw_Character,
+	vulkan_Draw_String,
+	vulkan_Draw_nString,
+	vulkan_Draw_AltString,
+	vulkan_Draw_ConsoleBackground,
+	vulkan_Draw_Crosshair,
+	vulkan_Draw_CrosshairAt,
+	vulkan_Draw_TileClear,
+	vulkan_Draw_Fill,
+	vulkan_Draw_TextBox,
+	vulkan_Draw_FadeScreen,
+	vulkan_Draw_BlendScreen,
+	vulkan_Draw_CachePic,
+	vulkan_Draw_UncachePic,
+	vulkan_Draw_MakePic,
+	vulkan_Draw_DestroyPic,
+	vulkan_Draw_PicFromWad,
+	vulkan_Draw_Pic,
+	vulkan_Draw_Picf,
+	vulkan_Draw_SubPic,
+
+/*	vulkan_SCR_UpdateScreen,
+	SCR_DrawRam,
+	SCR_DrawTurtle,
+	SCR_DrawPause,
+	vulkan_SCR_CaptureBGR,
+	vulkan_SCR_ScreenShot,
+	SCR_DrawStringToSnap,
+
+	vulkan_Fog_Update,
+	vulkan_Fog_ParseWorldspawn,
+
+	vulkan_R_Init,
+	vulkan_R_ClearState,
+	vulkan_R_LoadSkys,
+	vulkan_R_NewMap,
+	R_AddEfrags,
+	R_RemoveEfrags,
+	R_EnqueueEntity,
+	vulkan_R_LineGraph,
+	R_AllocDlight,
+	R_AllocEntity,
+	vulkan_R_RenderView,
+	R_DecayLights,
+	vulkan_R_ViewChanged,
+	vulkan_R_ClearParticles,
+	vulkan_R_InitParticles,
+	vulkan_SCR_ScreenShot_f,
+	vulkan_r_easter_eggs_f,
+	vulkan_r_particles_style_f,
+	0,
+	&model_funcs*/
+};
+
+static void
+set_palette (const byte *palette)
+{
+	//FIXME really don't want this here: need an application domain
+	//so Quake can be separated from QuakeForge (ie, Quake itself becomes
+	//an app using the QuakeForge engine)
+}
+
+static void
+vulkan_vid_render_init (void)
+{
+	vr_data.vid->set_palette = set_palette;
+	vr_data.vid->init_gl = Vulkan_Init_Common;
+	vr_data.vid->load_gl ();
+	vr_funcs = &vulkan_vid_render_funcs;
+	m_funcs = &model_funcs;
+}
+
+static void
+vulkan_vid_render_shutdown (void)
+{
+	Vulkan_Shutdown_Common ();
+}
+
+static general_funcs_t plugin_info_general_funcs = {
+	vulkan_vid_render_init,
+	vulkan_vid_render_shutdown,
+};
+
+static general_data_t plugin_info_general_data;
+
+static plugin_funcs_t plugin_info_funcs = {
+	&plugin_info_general_funcs,
+	0,
+	0,
+	0,
+	0,
+	0,
+	&vulkan_vid_render_funcs,
+};
+
+static plugin_data_t plugin_info_data = {
+	&plugin_info_general_data,
+	0,
+	0,
+	0,
+	0,
+	0,
+	&vid_render_data,
+};
+
+static plugin_t plugin_info = {
+	qfp_snd_render,
+	0,
+	QFPLUGIN_VERSION,
+	"0.1",
+	"GLSL Renderer",
+	"Copyright (C) 1996-1997  Id Software, Inc.\n"
+	"Copyright (C) 1999-2012  contributors of the QuakeForge project\n"
+	"Please see the file \"AUTHORS\" for a list of contributors",
+	&plugin_info_funcs,
+	&plugin_info_data,
+};
+
+PLUGIN_INFO(vid_render, vulkan)
+{
+	return &plugin_info;
+}
diff --git a/libs/video/renderer/vulkan/Makefile.am b/libs/video/renderer/vulkan/Makefile.am
new file mode 100644
index 000000000..f3b3d32c5
--- /dev/null
+++ b/libs/video/renderer/vulkan/Makefile.am
@@ -0,0 +1,26 @@
+AUTOMAKE_OPTIONS= foreign
+
+AM_CFLAGS= @PREFER_PIC@
+AM_CPPFLAGS= -I$(top_srcdir)/include -DVK_NO_PROTOTYPES
+
+vulkan_src = \
+	init.c \
+	vulkan_draw.c \
+	vulkan_funcs.c \
+	vulkan_vid_common.c
+
+noinst_LTLIBRARIES=	libvulkan.la
+BUILT_SOURCES= $(shader_gen)
+
+SUFFICES=.frag .vert .fc .vc .slc .glsl
+.glsl.slc:
+	sed -e 's/^/"/' -e 's/$$/\\n"/' $< > $@
+.frag.fc:
+	sed -e 's/^/"/' -e 's/$$/\\n"/' $< > $@
+.vert.vc:
+	sed -e 's/^/"/' -e 's/$$/\\n"/' $< > $@
+
+libvulkan_la_SOURCES= $(vulkan_src)
+
+EXTRA_DIST = $(vulkan_src) $(shader_src) namehack.h
+CLEANFILES= *.vc *.fc *.slc
diff --git a/libs/video/renderer/vulkan/init.c b/libs/video/renderer/vulkan/init.c
new file mode 100644
index 000000000..4967c8125
--- /dev/null
+++ b/libs/video/renderer/vulkan/init.c
@@ -0,0 +1,390 @@
+/*
+	int.c
+
+	Copyright (C) 2019      Bill Currie <bill@taniwha.org>
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+
+#include "QF/cvar.h"
+#include "QF/dstring.h"
+#include "QF/input.h"
+#include "QF/qargs.h"
+#include "QF/quakefs.h"
+#include "QF/sys.h"
+#include "QF/va.h"
+#include "QF/vid.h"
+#include "QF/Vulkan/init.h"
+
+cvar_t *vulkan_library_name;
+cvar_t *vulkan_use_validation;
+
+static uint32_t numLayers;
+static VkLayerProperties *instanceLayerProperties;
+static const char **instanceLayerNames;
+static uint32_t numExtensions;
+static VkExtensionProperties *instanceExtensionProperties;
+static const char **instanceExtensionNames;
+
+static const char *validationLayers[] = {
+	"VK_LAYER_LUNARG_standard_validation",
+	0,
+};
+
+static const char *debugExtensions[] = {
+	VK_EXT_DEBUG_UTILS_EXTENSION_NAME,
+	0,
+};
+
+static const char *device_types[] = {
+	"other",
+	"integrated gpu",
+	"discrete gpu",
+	"virtual gpu",
+	"cpu",
+};
+
+static void
+get_instance_layers_and_extensions  (void)
+{
+	uint32_t    i;
+	VkLayerProperties *properties;
+	VkExtensionProperties *extensions;
+
+	vkEnumerateInstanceLayerProperties (&numLayers, 0);
+	properties = malloc (numLayers * sizeof (VkLayerProperties));
+	vkEnumerateInstanceLayerProperties (&numLayers, properties);
+	instanceLayerNames = (const char **) malloc ((numLayers + 1)
+												 * sizeof (const char **));
+	for (i = 0; i < numLayers; i++) {
+		instanceLayerNames[i] = properties[i].layerName;
+	}
+	instanceLayerNames[i] = 0;
+
+	vkEnumerateInstanceExtensionProperties (0, &numExtensions, 0);
+	extensions = malloc (numExtensions * sizeof (VkLayerProperties));
+	vkEnumerateInstanceExtensionProperties (0, &numExtensions, extensions);
+	instanceExtensionNames = (const char **) malloc ((numExtensions + 1)
+													 * sizeof (const char **));
+	for (i = 0; i < numExtensions; i++) {
+		instanceExtensionNames[i] = extensions[i].extensionName;
+	}
+	instanceExtensionNames[i] = 0;
+
+	if (developer->int_val & SYS_VID) {
+		for (i = 0; i < numLayers; i++) {
+			Sys_Printf ("%s %x %u %s\n",
+						properties[i].layerName,
+						properties[i].specVersion,
+						properties[i].implementationVersion,
+						properties[i].description);
+		}
+		for (i = 0; i < numExtensions; i++) {
+			Sys_Printf ("%d %s\n",
+						extensions[i].specVersion,
+						extensions[i].extensionName);
+		}
+	}
+	instanceLayerProperties = properties;
+	instanceExtensionProperties = extensions;
+}
+
+static void
+init_physdev (VulkanInstance_t *instance, VkPhysicalDevice dev, VulkanPhysDevice_t *physdev)
+{
+	physdev->device = dev;
+
+	instance->vkGetPhysicalDeviceProperties (dev, &physdev->properties);
+
+	instance->vkEnumerateDeviceLayerProperties (dev, &physdev->numLayers, 0);
+	physdev->layers = malloc (physdev->numLayers * sizeof (VkLayerProperties));
+	instance->vkEnumerateDeviceLayerProperties (dev, &physdev->numLayers,
+												physdev->layers);
+
+	instance->vkEnumerateDeviceExtensionProperties (dev, 0,
+													&physdev->numExtensions,
+													0);
+	physdev->extensions = malloc (physdev->numExtensions
+								  * sizeof (VkExtensionProperties));
+	instance->vkEnumerateDeviceExtensionProperties (dev, 0,
+													&physdev->numExtensions,
+													physdev->extensions);
+
+	instance->vkGetPhysicalDeviceFeatures (dev, &physdev->features);
+
+	instance->vkGetPhysicalDeviceMemoryProperties (dev, &physdev->memory);
+
+	instance->vkGetPhysicalDeviceQueueFamilyProperties (dev,
+														&physdev->numQueueFamilies,
+														0);
+	physdev->queueFamilies = malloc (physdev->numQueueFamilies
+								  * sizeof (VkQueueFamilyProperties));
+	instance->vkGetPhysicalDeviceQueueFamilyProperties (dev,
+														&physdev->numQueueFamilies,
+														physdev->queueFamilies);
+
+	if (developer->int_val & SYS_VID) {
+		VkPhysicalDeviceProperties *prop = &physdev->properties;
+		Sys_Printf ("dev: %p\n", dev);
+		Sys_Printf ("  %x %x\n", prop->apiVersion, prop->driverVersion);
+		Sys_Printf ("  %x %x\n", prop->vendorID, prop->deviceID);
+		Sys_Printf ("  %s: %s\n", device_types[prop->deviceType],
+					prop->deviceName);
+		for (uint32_t i = 0; i < physdev->numLayers; i++) {
+			Sys_Printf ("  %s %x %u %s\n",
+						physdev->layers[i].layerName,
+						physdev->layers[i].specVersion,
+						physdev->layers[i].implementationVersion,
+						physdev->layers[i].description);
+		}
+		for (uint32_t i = 0; i < physdev->numExtensions; i++) {
+			Sys_Printf ("  %u %s\n",
+						physdev->extensions[i].specVersion,
+						physdev->extensions[i].extensionName);
+		}
+		Sys_Printf ("  memory types:\n");
+		for (uint32_t i = 0; i < physdev->memory.memoryTypeCount; i++) {
+			Sys_Printf ("    %x %d\n",
+						physdev->memory.memoryTypes[i].propertyFlags,
+						physdev->memory.memoryTypes[i].heapIndex);
+		}
+		Sys_Printf ("  memory heaps:\n");
+		for (uint32_t i = 0; i < physdev->memory.memoryHeapCount; i++) {
+			Sys_Printf ("    %x %ld\n",
+						physdev->memory.memoryHeaps[i].flags,
+						physdev->memory.memoryHeaps[i].size);
+		}
+		Sys_Printf ("  queue families:\n");
+		for (uint32_t i = 0; i < physdev->numQueueFamilies; i++) {
+			VkQueueFamilyProperties *queue = &physdev->queueFamilies[i];
+			VkExtent3D  gran = queue->minImageTransferGranularity;
+			Sys_Printf ("    %x %3d %3d [%d %d %d]\n",
+						queue->queueFlags,
+						queue->queueCount,
+						queue->timestampValidBits,
+						gran.width, gran.height, gran.depth);
+		}
+	}
+}
+
+static int
+count_strings (const char **str)
+{
+	int         count = 0;
+
+	if (str) {
+		while (*str++) {
+			count++;
+		}
+	}
+	return count;
+}
+
+static void
+merge_strings (const char **out, const char **in1, const char **in2)
+{
+	if (in1) {
+		while (*in1) {
+			*out++ = *in1++;
+		}
+	}
+	if (in2) {
+		while (*in2) {
+			*out++ = *in2++;
+		}
+	}
+}
+
+static void
+prune_strings (const char * const *reference, const char **strings,
+			   uint32_t *count)
+{
+	for (int i = *count; i-- > 0; ) {
+		const char *str = strings[i];
+		const char * const *ref;
+		for (ref = reference; *ref; ref++) {
+			if (!strcmp (*ref, str)) {
+				break;
+			}
+		}
+		if (!*ref) {
+			memmove (strings + i, strings + i + 1,
+					 (--(*count) - i) * sizeof (const char **));
+		}
+	}
+}
+
+static int message_severities =
+	VK_DEBUG_UTILS_MESSAGE_SEVERITY_VERBOSE_BIT_EXT |
+	VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT |
+	VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT;
+static int message_types =
+	VK_DEBUG_UTILS_MESSAGE_TYPE_GENERAL_BIT_EXT |
+	VK_DEBUG_UTILS_MESSAGE_TYPE_VALIDATION_BIT_EXT |
+	VK_DEBUG_UTILS_MESSAGE_TYPE_PERFORMANCE_BIT_EXT;
+
+static VKAPI_ATTR VkBool32 VKAPI_CALL
+debug_callback (VkDebugUtilsMessageSeverityFlagBitsEXT messageSeverity,
+				VkDebugUtilsMessageTypeFlagsEXT messageType,
+				const VkDebugUtilsMessengerCallbackDataEXT* callbackData,
+				void *data)
+{
+	fprintf (stderr, "validation layer: %s\n", callbackData->pMessage);
+	return VK_FALSE;
+}
+
+static void
+setup_debug_callback (VulkanInstance_t *instance)
+{
+	VkDebugUtilsMessengerCreateInfoEXT createInfo = {
+		.sType = VK_STRUCTURE_TYPE_DEBUG_UTILS_MESSENGER_CREATE_INFO_EXT,
+		.messageSeverity = message_severities,
+		.messageType = message_types,
+		.pfnUserCallback = debug_callback,
+		.pUserData = instance,
+	};
+	instance->vkCreateDebugUtilsMessengerEXT(instance->instance, &createInfo,
+											 0, &instance->debug_callback);
+}
+
+static void
+load_instance_funcs (VulkanInstance_t *instance)
+{
+#define INSTANCE_LEVEL_VULKAN_FUNCTION(name) \
+	instance->name = (PFN_##name) vkGetInstanceProcAddr (instance->instance, \
+														 #name); \
+	if (!instance->name) { \
+		Sys_Error ("Couldn't find instance level function %s", #name); \
+	}
+
+#define INSTANCE_LEVEL_VULKAN_FUNCTION_EXTENSION(name) \
+	instance->name = (PFN_##name) vkGetInstanceProcAddr (instance->instance,\
+														 #name); \
+	if (!instance->name) { \
+		Sys_Printf ("Couldn't find instance level function %s", #name); \
+	}
+
+#include "QF/Vulkan/funclist.h"
+}
+
+VulkanInstance_t *
+Vulkan_CreateInstance (const char *appName, uint32_t appVersion,
+					   const char **layers, const char **extensions)
+{
+	VkApplicationInfo appInfo = {
+		VK_STRUCTURE_TYPE_APPLICATION_INFO, 0,
+		appName, appVersion,
+		PACKAGE_STRING, 0x000702ff, //FIXME version
+		VK_API_VERSION_1_0,
+	};
+	VkInstanceCreateInfo createInfo = {
+		VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO, 0, 0,
+		&appInfo,
+		0, 0,
+		0, 0,
+	};
+	VkResult    res;
+	VkInstance  instance;
+	uint32_t    numDev, i;
+	VkPhysicalDevice *devices;
+	VulkanInstance_t *inst;
+
+	if (!instanceLayerProperties) {
+		get_instance_layers_and_extensions ();
+	}
+
+	createInfo.enabledLayerCount = count_strings (layers);
+	createInfo.ppEnabledLayerNames = layers;
+	createInfo.enabledExtensionCount = count_strings (extensions);
+	createInfo.ppEnabledExtensionNames = extensions;
+	if (vulkan_use_validation->int_val) {
+		createInfo.enabledLayerCount += count_strings (validationLayers);
+		createInfo.enabledExtensionCount += count_strings (debugExtensions);
+	}
+	const char **lay = alloca (createInfo.enabledLayerCount * sizeof (const char *));
+	const char **ext = alloca (createInfo.enabledExtensionCount * sizeof (const char *));
+	if (vulkan_use_validation->int_val) {
+		merge_strings (lay, layers, validationLayers);
+		merge_strings (ext, extensions, debugExtensions);
+	} else {
+		merge_strings (lay, layers, 0);
+		merge_strings (ext, extensions, 0);
+	}
+	prune_strings (instanceLayerNames, lay,
+				   &createInfo.enabledLayerCount);
+	prune_strings (instanceExtensionNames, ext,
+				   &createInfo.enabledExtensionCount);
+	createInfo.ppEnabledLayerNames = lay;
+	createInfo.ppEnabledExtensionNames = ext;
+
+	res = vkCreateInstance (&createInfo, 0, &instance);
+	if (res != VK_SUCCESS) {
+		Sys_Error ("unable to create vulkan instance\n");
+	}
+	inst = malloc (sizeof(VulkanInstance_t));
+	inst->instance = instance;
+	load_instance_funcs (inst);
+
+	if (vulkan_use_validation->int_val) {
+		setup_debug_callback (inst);
+	}
+
+	res = inst->vkEnumeratePhysicalDevices (instance, &numDev, 0);
+	if (res != VK_SUCCESS) {
+		Sys_Error ("unable to query vulkan device count: %d\n", res);
+	}
+	devices = malloc(numDev * sizeof (VkPhysicalDevice));
+	res = inst->vkEnumeratePhysicalDevices (instance, &numDev, devices);
+	if (res != VK_SUCCESS) {
+		Sys_Error ("unable to query vulkan device properties: %d\n", res);
+	}
+
+	inst->numDevices = numDev;
+	inst->devices = malloc (numDev * sizeof (VulkanPhysDevice_t));
+
+	for (i = 0; i < numDev; i++) {
+		init_physdev (inst, devices[i], &inst->devices[i]);
+	}
+
+	return inst;
+}
+
+void
+Vulkan_DestroyInstance (VulkanInstance_t *instance)
+{
+	for (uint32_t i = 0; i < instance->numDevices; i++) {
+		free (instance->devices[i].queueFamilies);
+		free (instance->devices[i].extensions);
+		free (instance->devices[i].layers);
+	}
+	free (instance->devices);
+	instance->vkDestroyInstance (instance->instance, 0);
+	free (instance);
+}
diff --git a/libs/video/renderer/vulkan/namehack.h b/libs/video/renderer/vulkan/namehack.h
new file mode 100644
index 000000000..7289995f2
--- /dev/null
+++ b/libs/video/renderer/vulkan/namehack.h
@@ -0,0 +1,137 @@
+#ifdef NH_DEFINE
+#undef NH_DEFINE
+#define Draw_Init vulkan_Draw_Init
+#define Draw_Character vulkan_Draw_Character
+#define Draw_String vulkan_Draw_String
+#define Draw_nString vulkan_Draw_nString
+#define Draw_AltString vulkan_Draw_AltString
+#define Draw_ConsoleBackground vulkan_Draw_ConsoleBackground
+#define Draw_Crosshair vulkan_Draw_Crosshair
+#define Draw_CrosshairAt vulkan_Draw_CrosshairAt
+#define Draw_TileClear vulkan_Draw_TileClear
+#define Draw_Fill vulkan_Draw_Fill
+#define Draw_TextBox vulkan_Draw_TextBox
+#define Draw_FadeScreen vulkan_Draw_FadeScreen
+#define Draw_BlendScreen vulkan_Draw_BlendScreen
+#define Draw_CachePic vulkan_Draw_CachePic
+#define Draw_UncachePic vulkan_Draw_UncachePic
+#define Draw_MakePic vulkan_Draw_MakePic
+#define Draw_DestroyPic vulkan_Draw_DestroyPic
+#define Draw_PicFromWad vulkan_Draw_PicFromWad
+#define Draw_Pic vulkan_Draw_Pic
+#define Draw_Picf vulkan_Draw_Picf
+#define Draw_SubPic vulkan_Draw_SubPic
+#define Fog_DisableGFog vulkan_Fog_DisableGFog
+#define Fog_EnableGFog vulkan_Fog_EnableGFog
+#define Fog_GetColor vulkan_Fog_GetColor
+#define Fog_GetDensity vulkan_Fog_GetDensity
+#define Fog_Init vulkan_Fog_Init
+#define Fog_ParseWorldspawn vulkan_Fog_ParseWorldspawn
+#define Fog_SetupFrame vulkan_Fog_SetupFrame
+#define Fog_StartAdditive vulkan_Fog_StartAdditive
+#define Fog_StopAdditive vulkan_Fog_StopAdditive
+#define Fog_Update vulkan_Fog_Update
+#define R_AddTexture vulkan_R_AddTexture
+#define R_BlendLightmaps vulkan_R_BlendLightmaps
+#define R_BuildLightMap vulkan_R_BuildLightMap
+#define R_CalcLightmaps vulkan_R_CalcLightmaps
+#define R_ClearParticles vulkan_R_ClearParticles
+#define R_ClearState vulkan_R_ClearState
+#define R_ClearTextures vulkan_R_ClearTextures
+#define R_DrawAliasModel vulkan_R_DrawAliasModel
+#define R_DrawBrushModel vulkan_R_DrawBrushModel
+#define R_DrawParticles vulkan_R_DrawParticles
+#define R_DrawSky vulkan_R_DrawSky
+#define R_DrawSkyChain vulkan_R_DrawSkyChain
+#define R_DrawSprite vulkan_R_DrawSprite
+#define R_DrawSpriteModel vulkan_R_DrawSpriteModel
+#define R_DrawWaterSurfaces vulkan_R_DrawWaterSurfaces
+#define R_DrawWorld vulkan_R_DrawWorld
+#define R_InitBubble vulkan_R_InitBubble
+#define R_InitGraphTextures vulkan_R_InitGraphTextures
+#define R_InitParticles vulkan_R_InitParticles
+#define R_InitSky vulkan_R_InitSky
+#define R_InitSprites vulkan_R_InitSprites
+#define R_InitSurfaceChains vulkan_R_InitSurfaceChains
+#define R_LineGraph vulkan_R_LineGraph
+#define R_LoadSky_f vulkan_R_LoadSky_f
+#define R_LoadSkys vulkan_R_LoadSkys
+#define R_NewMap vulkan_R_NewMap
+#define R_Particle_New vulkan_R_Particle_New
+#define R_Particle_NewRandom vulkan_R_Particle_NewRandom
+#define R_Particles_Init_Cvars vulkan_R_Particles_Init_Cvars
+#define R_ReadPointFile_f vulkan_R_ReadPointFile_f
+#define R_RenderDlights vulkan_R_RenderDlights
+#define R_RenderView vulkan_R_RenderView
+#define R_RotateForEntity vulkan_R_RotateForEntity
+#define R_SetupFrame vulkan_R_SetupFrame
+#define R_SpriteBegin vulkan_R_SpriteBegin
+#define R_SpriteEnd vulkan_R_SpriteEnd
+#define R_TimeRefresh_f vulkan_R_TimeRefresh_f
+#define R_ViewChanged vulkan_R_ViewChanged
+#define SCR_CaptureBGR vulkan_SCR_CaptureBGR
+#define SCR_ScreenShot vulkan_SCR_ScreenShot
+#define SCR_ScreenShot_f vulkan_SCR_ScreenShot_f
+#define SCR_UpdateScreen vulkan_SCR_UpdateScreen
+#define c_alias_polys vulkan_c_alias_polys
+#define c_brush_polys vulkan_c_brush_polys
+#define r_easter_eggs_f vulkan_r_easter_eggs_f
+#define r_particles_style_f vulkan_r_particles_style_f
+#define r_world_matrix vulkan_r_world_matrix
+#else
+#undef Fog_DisableGFog
+#undef Fog_EnableGFog
+#undef Fog_GetColor
+#undef Fog_GetDensity
+#undef Fog_Init
+#undef Fog_ParseWorldspawn
+#undef Fog_SetupFrame
+#undef Fog_StartAdditive
+#undef Fog_StopAdditive
+#undef Fog_Update
+#undef R_AddTexture
+#undef R_BlendLightmaps
+#undef R_BuildLightMap
+#undef R_CalcLightmaps
+#undef R_ClearParticles
+#undef R_ClearState
+#undef R_ClearTextures
+#undef R_DrawAliasModel
+#undef R_DrawBrushModel
+#undef R_DrawParticles
+#undef R_DrawSky
+#undef R_DrawSkyChain
+#undef R_DrawSpriteModel
+#undef R_DrawWaterSurfaces
+#undef R_DrawWorld
+#undef R_Init
+#undef R_InitBubble
+#undef R_InitGraphTextures
+#undef R_InitParticles
+#undef R_InitSky
+#undef R_InitSprites
+#undef R_InitSurfaceChains
+#undef R_LineGraph
+#undef R_LoadSky_f
+#undef R_LoadSkys
+#undef R_NewMap
+#undef R_Particle_New
+#undef R_Particle_NewRandom
+#undef R_Particles_Init_Cvars
+#undef R_ReadPointFile_f
+#undef R_RenderDlights
+#undef R_RenderView
+#undef R_RotateForEntity
+#undef R_SetupFrame
+#undef R_TimeRefresh_f
+#undef R_ViewChanged
+#undef SCR_CaptureBGR
+#undef SCR_ScreenShot
+#undef SCR_ScreenShot_f
+#undef SCR_UpdateScreen
+#undef c_alias_polys
+#undef c_brush_polys
+#undef r_easter_eggs_f
+#undef r_particles_style_f
+#undef r_world_matrix
+#endif
diff --git a/libs/video/renderer/vulkan/vulkan_draw.c b/libs/video/renderer/vulkan/vulkan_draw.c
new file mode 100644
index 000000000..3c8dcc8e4
--- /dev/null
+++ b/libs/video/renderer/vulkan/vulkan_draw.c
@@ -0,0 +1,189 @@
+/*
+	vulkan_draw.c
+
+	2D drawing support for Vulkan
+
+	Copyright (C) 2011 Bill Currie <bill@taniwha.org>
+
+	Author: Bill Currie <bill@taniwha.org>
+	Date: 2011/12/23
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#define NH_DEFINE
+#include "namehack.h"
+
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+
+#include "QF/cvar.h"
+#include "QF/draw.h"
+#include "QF/dstring.h"
+#include "QF/hash.h"
+#include "QF/quakefs.h"
+#include "QF/sys.h"
+#include "QF/vid.h"
+
+#include "QF/Vulkan/qf_draw.h"
+#include "QF/Vulkan/qf_vid.h"
+
+#include "r_internal.h"
+
+qpic_t *
+vulkan_Draw_MakePic (int width, int height, const byte *data)
+{
+	return 0;
+}
+
+void
+vulkan_Draw_DestroyPic (qpic_t *pic)
+{
+}
+
+qpic_t *
+vulkan_Draw_PicFromWad (const char *name)
+{
+	return 0;
+}
+
+qpic_t *
+vulkan_Draw_CachePic (const char *path, qboolean alpha)
+{
+	return 0;
+}
+
+void
+vulkan_Draw_UncachePic (const char *path)
+{
+}
+
+void
+vulkan_Draw_TextBox (int x, int y, int width, int lines, byte alpha)
+{
+}
+
+void
+vulkan_Draw_Init (void)
+{
+}
+
+void
+vulkan_Draw_Character (int x, int y, unsigned int chr)
+{
+}
+
+void
+vulkan_Draw_String (int x, int y, const char *str)
+{
+}
+
+void
+vulkan_Draw_nString (int x, int y, const char *str, int count)
+{
+}
+
+void
+vulkan_Draw_AltString (int x, int y, const char *str)
+{
+}
+
+void
+vulkan_Draw_CrosshairAt (int ch, int x, int y)
+{
+}
+
+void
+vulkan_Draw_Crosshair (void)
+{
+}
+
+void
+vulkan_Draw_Pic (int x, int y, qpic_t *pic)
+{
+}
+
+void
+vulkan_Draw_Picf (float x, float y, qpic_t *pic)
+{
+}
+
+void
+vulkan_Draw_SubPic (int x, int y, qpic_t *pic, int srcx, int srcy, int width,
+				  int height)
+{
+}
+
+void
+vulkan_Draw_ConsoleBackground (int lines, byte alpha)
+{
+}
+
+void
+vulkan_Draw_TileClear (int x, int y, int w, int h)
+{
+}
+
+void
+vulkan_Draw_Fill (int x, int y, int w, int h, int c)
+{
+}
+
+void
+vulkan_Draw_FadeScreen (void)
+{
+}
+
+void
+Vulkan_Set2D (void)
+{
+}
+
+void
+Vulkan_Set2DScaled (void)
+{
+}
+
+void
+Vulkan_End2D (void)
+{
+}
+
+void
+Vulkan_DrawReset (void)
+{
+}
+
+void
+Vulkan_FlushText (void)
+{
+}
+
+void
+vulkan_Draw_BlendScreen (quat_t color)
+{
+}
diff --git a/libs/video/renderer/vulkan/vulkan_funcs.c b/libs/video/renderer/vulkan/vulkan_funcs.c
new file mode 100644
index 000000000..2d8f79c9a
--- /dev/null
+++ b/libs/video/renderer/vulkan/vulkan_funcs.c
@@ -0,0 +1,6 @@
+#include <vulkan/vulkan.h>
+
+#define EXPORTED_VULKAN_FUNCTION(fname) PFN_##fname fname;
+#define GLOBAL_LEVEL_VULKAN_FUNCTION(fname) PFN_##fname fname;
+
+#include "QF/Vulkan/funclist.h"
diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c
new file mode 100644
index 000000000..099135be7
--- /dev/null
+++ b/libs/video/renderer/vulkan/vulkan_vid_common.c
@@ -0,0 +1,129 @@
+/*
+	vid_common_vulkan.c
+
+	Common Vulkan video driver functions
+
+	Copyright (C) 1996-1997 Id Software, Inc.
+	Copyright (C) 2019      Bill Currie <bill@taniwha.org>
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifdef HAVE_MATH_H
+# include <math.h>
+#endif
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+
+#include <dlfcn.h>
+
+#include "QF/cvar.h"
+#include "QF/dstring.h"
+#include "QF/input.h"
+#include "QF/qargs.h"
+#include "QF/quakefs.h"
+#include "QF/sys.h"
+#include "QF/va.h"
+#include "QF/vid.h"
+#include "QF/Vulkan/qf_vid.h"
+#include "QF/Vulkan/init.h"
+
+#include "compat.h"
+#include "d_iface.h"
+#include "r_internal.h"
+
+static void *vulkan_library;
+
+static VulkanInstance_t *vulkan_instance;
+
+static void
+load_vulkan_library (void)
+{
+	vulkan_library = dlopen (vulkan_library_name->string, RTLD_NOW);
+	if (!vulkan_library) {
+		Sys_Error ("Couldn't load vulkan library %s: %s",
+				   vulkan_library_name->name, dlerror ());
+	}
+
+	#define EXPORTED_VULKAN_FUNCTION(name) \
+	name = (PFN_##name) dlsym (vulkan_library, #name); \
+	if (!name) { \
+		Sys_Error ("Couldn't find exported vulkan function %s", #name); \
+	}
+
+	// Can't use vkGetInstanceProcAddr (0, ...) here because it grabs from
+	// the whole exe and thus sees the function pointers instead of the actual
+	// functions. Sure, could rename all the function pointers, but while that
+	// worked for gl and glsl, it also made it a real pain to work with the
+	// spec (or man pages, etc). Of course, namespaces would help, too.
+	#define GLOBAL_LEVEL_VULKAN_FUNCTION(name) \
+	name = (PFN_##name) dlsym (vulkan_library, #name); \
+	if (!name) { \
+		Sys_Error ("Couldn't find global-level function %s", #name); \
+	}
+
+	#include "QF/Vulkan/funclist.h"
+}
+
+void
+Vulkan_Init_Cvars ()
+{
+	vulkan_library_name = Cvar_Get ("vulkan_library", "libvulkan.so.1",
+									CVAR_ROM, 0,
+									"the name of the vulkan shared library");
+	vulkan_use_validation = Cvar_Get ("vulkan_use_validation", "1", CVAR_NONE,
+									  0,
+									  "enable LunarG Standard Validation "
+									  "Layer if available (requires instance "
+									  "restart).");
+}
+
+const char *extensions[] = {
+	"foo",
+	0,
+};
+
+void
+Vulkan_Init_Common (void)
+{
+	Vulkan_Init_Cvars ();
+
+	load_vulkan_library ();
+
+	vulkan_instance = Vulkan_CreateInstance (PACKAGE_STRING, 0x000702ff, 0, extensions);//FIXME version
+	Sys_Printf ("Vulkan_Init_Common\n");
+	if (developer->int_val & SYS_VID) {
+		Vulkan_DestroyInstance (vulkan_instance);
+		Sys_Quit();
+	}
+}
+
+void
+Vulkan_Shutdown_Common (void)
+{
+	Vulkan_DestroyInstance (vulkan_instance);
+}

From ab08e4f20738e7ee9aca220489008c17bb00e662 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 7 Jul 2019 01:28:05 +0900
Subject: [PATCH 0270/1519] Create a logical device with a single queue

A single graphics-capable queue should be enough for now. However, I'm
not sure I'm happy with a lot of the code: it's a bit difficult to write
flexibly configured code for Vulkan (or seems to be at this stage),
especially in C.
---
 include/QF/Vulkan/funclist.h                  |   6 +-
 include/QF/Vulkan/init.h                      |  14 ++-
 libs/video/renderer/vulkan/init.c             |  20 ++++
 .../video/renderer/vulkan/vulkan_vid_common.c | 105 +++++++++++++++++-
 4 files changed, 138 insertions(+), 7 deletions(-)

diff --git a/include/QF/Vulkan/funclist.h b/include/QF/Vulkan/funclist.h
index 1ab96300c..d0cc47a6f 100644
--- a/include/QF/Vulkan/funclist.h
+++ b/include/QF/Vulkan/funclist.h
@@ -24,13 +24,13 @@ GLOBAL_LEVEL_VULKAN_FUNCTION (vkCreateInstance)
 INSTANCE_LEVEL_VULKAN_FUNCTION (vkEnumeratePhysicalDevices)
 INSTANCE_LEVEL_VULKAN_FUNCTION (vkGetPhysicalDeviceProperties)
 INSTANCE_LEVEL_VULKAN_FUNCTION (vkGetPhysicalDeviceFeatures)
+INSTANCE_LEVEL_VULKAN_FUNCTION (vkGetPhysicalDeviceQueueFamilyProperties)
 INSTANCE_LEVEL_VULKAN_FUNCTION (vkCreateDevice)
 INSTANCE_LEVEL_VULKAN_FUNCTION (vkGetDeviceProcAddr)
+INSTANCE_LEVEL_VULKAN_FUNCTION (vkDestroyInstance)
 INSTANCE_LEVEL_VULKAN_FUNCTION (vkEnumerateDeviceLayerProperties)
 INSTANCE_LEVEL_VULKAN_FUNCTION (vkEnumerateDeviceExtensionProperties)
 INSTANCE_LEVEL_VULKAN_FUNCTION (vkGetPhysicalDeviceMemoryProperties)
-INSTANCE_LEVEL_VULKAN_FUNCTION (vkGetPhysicalDeviceQueueFamilyProperties)
-INSTANCE_LEVEL_VULKAN_FUNCTION (vkDestroyInstance)
 
 #undef INSTANCE_LEVEL_VULKAN_FUNCTION
 
@@ -46,6 +46,8 @@ INSTANCE_LEVEL_VULKAN_FUNCTION_EXTENSION (vkCreateDebugUtilsMessengerEXT)
 #define DEVICE_LEVEL_VULKAN_FUNCTION(function)
 #endif
 
+DEVICE_LEVEL_VULKAN_FUNCTION (vkGetDeviceQueue)
+
 #undef DEVICE_LEVEL_VULKAN_FUNCTION
 
 #ifndef DEVICE_LEVEL_VULKAN_FUNCTION_EXTENSION
diff --git a/include/QF/Vulkan/init.h b/include/QF/Vulkan/init.h
index b12dcd42e..4a97b82f8 100644
--- a/include/QF/Vulkan/init.h
+++ b/include/QF/Vulkan/init.h
@@ -31,14 +31,23 @@
 #include "QF/qtypes.h"
 #include "QF/Vulkan/funcs.h"
 
+typedef struct {
+	VkDevice device;
+	VkQueue queue;
+
+    #define DEVICE_LEVEL_VULKAN_FUNCTION(name) PFN_##name name;
+    #define DEVICE_LEVEL_VULKAN_FUNCTION_EXTENSION(name) PFN_##name name;
+	#include "QF/Vulkan/funclist.h"
+} VulkanDevice_t;
+
 typedef struct {
 	VkPhysicalDevice device;
+	VkPhysicalDeviceFeatures features;
 	VkPhysicalDeviceProperties properties;
 	uint32_t    numLayers;
 	VkLayerProperties *layers;
 	uint32_t    numExtensions;
 	VkExtensionProperties *extensions;
-	VkPhysicalDeviceFeatures features;
 	VkPhysicalDeviceMemoryProperties memory;
 	uint32_t    numQueueFamilies;
 	VkQueueFamilyProperties *queueFamilies;
@@ -61,5 +70,8 @@ VulkanInstance_t *Vulkan_CreateInstance (const char *appName,
 										 const char **layers,
 										 const char **extensions);
 void Vulkan_DestroyInstance (VulkanInstance_t *instance);
+int Vulkan_ExtensionsSupported (const VkExtensionProperties *extensions,
+								int numExtensions,
+								const char * const *requested);
 
 #endif // __QF_Vulkan_init_h
diff --git a/libs/video/renderer/vulkan/init.c b/libs/video/renderer/vulkan/init.c
index 4967c8125..2c4fb7ca1 100644
--- a/libs/video/renderer/vulkan/init.c
+++ b/libs/video/renderer/vulkan/init.c
@@ -388,3 +388,23 @@ Vulkan_DestroyInstance (VulkanInstance_t *instance)
 	instance->vkDestroyInstance (instance->instance, 0);
 	free (instance);
 }
+
+int
+Vulkan_ExtensionsSupported (const VkExtensionProperties *extensions,
+							int numExtensions,
+							const char * const *requested)
+{
+	while (*requested) {
+		int         i;
+		for (i = 0; i < numExtensions; i++) {
+			if (!strcmp (*requested, extensions[i].extensionName)) {
+				break;
+			}
+		}
+		if (i < numExtensions) {
+			// requested extension not found
+			break;
+		}
+	}
+	return !*requested;
+}
diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c
index 099135be7..43921df30 100644
--- a/libs/video/renderer/vulkan/vulkan_vid_common.c
+++ b/libs/video/renderer/vulkan/vulkan_vid_common.c
@@ -59,6 +59,7 @@
 static void *vulkan_library;
 
 static VulkanInstance_t *vulkan_instance;
+static VulkanDevice_t *vulkan_device;
 
 static void
 load_vulkan_library (void)
@@ -102,21 +103,117 @@ Vulkan_Init_Cvars ()
 									  "restart).");
 }
 
-const char *extensions[] = {
-	"foo",
+static const char *instance_extensions[] = {
 	0,
 };
 
+static const char *device_extensions[] = {
+	0,
+};
+
+static int
+count_bits (uint32_t val)
+{
+	int         bits = 0;
+	while (val) {
+		bits += val & 1;
+		val >>= 1;
+	}
+	return bits;
+}
+
+static int
+find_queue_family (VulkanPhysDevice_t *dev, uint32_t flags)
+{
+	int         best_diff = 32;
+	uint32_t    family = -1;
+
+	for (uint32_t i = 0; i < dev->numQueueFamilies; i++) {
+		VkQueueFamilyProperties *queue = &dev->queueFamilies[i];
+
+		if ((queue->queueFlags & flags) == flags) {
+			int diff = count_bits (queue->queueFlags & ~flags);
+			if (diff < best_diff) {
+				best_diff = diff;
+				family = i;
+			}
+		}
+	}
+	return family;
+}
+
+static void
+load_device_funcs (VulkanInstance_t *inst, VulkanDevice_t *dev)
+{
+#define DEVICE_LEVEL_VULKAN_FUNCTION(name) \
+	dev->name = (PFN_##name) inst->vkGetDeviceProcAddr (dev->device, #name); \
+	if (!dev->name) { \
+		Sys_Error ("Couldn't find device level function %s", #name); \
+	}
+
+#define DEVICE_LEVEL_VULKAN_FUNCTION_EXTENSION(name) \
+	dev->name = (PFN_##name) inst->vkGetDeviceProcAddr (dev->device, #name); \
+	if (!dev->name) { \
+		Sys_Printf ("Couldn't find device level function %s", #name); \
+	}
+
+#include "QF/Vulkan/funclist.h"
+}
+
+static VulkanDevice_t *
+create_suitable_device (VulkanInstance_t *instance)
+{
+	for (uint32_t i = 0; i < instance->numDevices; i++) {
+		VulkanPhysDevice_t *phys = &instance->devices[i];
+		if (!Vulkan_ExtensionsSupported (phys->extensions, phys->numExtensions,
+										 device_extensions)) {
+			return 0;
+		}
+		int family = find_queue_family (phys, VK_QUEUE_GRAPHICS_BIT);
+		if (family < 0) {
+			return 0;
+		}
+		float priority = 1;
+		VkDeviceQueueCreateInfo qCreateInfo = {
+			VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO, 0, 0,
+			family, 1, &priority
+		};
+		VkPhysicalDeviceFeatures features;
+		VkDeviceCreateInfo dCreateInfo = {
+			VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO, 0, 0,
+			1, &qCreateInfo,
+			0, 0,
+			0, device_extensions,
+			&features
+		};
+		memset (&features, 0, sizeof (features));
+		VulkanDevice_t *device = calloc (1, sizeof (VulkanDevice_t));
+		if (instance->vkCreateDevice (phys->device, &dCreateInfo, 0,
+									  &device->device) == VK_SUCCESS) {
+			load_device_funcs (instance, device);
+			device->vkGetDeviceQueue (device->device, family,
+									  0, &device->queue);
+			return device;
+		}
+	}
+	return 0;
+}
+
 void
 Vulkan_Init_Common (void)
 {
+	Sys_Printf ("Vulkan_Init_Common\n");
 	Vulkan_Init_Cvars ();
 
 	load_vulkan_library ();
 
-	vulkan_instance = Vulkan_CreateInstance (PACKAGE_STRING, 0x000702ff, 0, extensions);//FIXME version
-	Sys_Printf ("Vulkan_Init_Common\n");
+	vulkan_instance = Vulkan_CreateInstance (PACKAGE_STRING, 0x000702ff, 0, instance_extensions);//FIXME version
+	vulkan_device = create_suitable_device (vulkan_instance);
+	if (!vulkan_device) {
+		Sys_Error ("no suitable vulkan device found");
+	}
 	if (developer->int_val & SYS_VID) {
+		Sys_Printf ("%p %p\n", vulkan_device->device, vulkan_device->queue);
 		Vulkan_DestroyInstance (vulkan_instance);
 		Sys_Quit();
 	}

From 940ef833ae1541af9623c1c797045787a1b133a5 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 7 Jul 2019 14:34:02 +0900
Subject: [PATCH 0271/1519] Shutdown Vulkan properly

Well, as properly as can be considering how little is started up :P
---
 include/QF/Vulkan/funclist.h                   |  1 +
 libs/video/renderer/vulkan/vulkan_vid_common.c | 10 +++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/include/QF/Vulkan/funclist.h b/include/QF/Vulkan/funclist.h
index d0cc47a6f..2b755889e 100644
--- a/include/QF/Vulkan/funclist.h
+++ b/include/QF/Vulkan/funclist.h
@@ -46,6 +46,7 @@ INSTANCE_LEVEL_VULKAN_FUNCTION_EXTENSION (vkCreateDebugUtilsMessengerEXT)
 #define DEVICE_LEVEL_VULKAN_FUNCTION(function)
 #endif
 
+DEVICE_LEVEL_VULKAN_FUNCTION (vkDestroyDevice)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkGetDeviceQueue)
 
 #undef DEVICE_LEVEL_VULKAN_FUNCTION
diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c
index 43921df30..ba4a16915 100644
--- a/libs/video/renderer/vulkan/vulkan_vid_common.c
+++ b/libs/video/renderer/vulkan/vulkan_vid_common.c
@@ -214,7 +214,7 @@ Vulkan_Init_Common (void)
 	}
 	if (developer->int_val & SYS_VID) {
 		Sys_Printf ("%p %p\n", vulkan_device->device, vulkan_device->queue);
-		Vulkan_DestroyInstance (vulkan_instance);
+		Vulkan_Shutdown_Common ();
 		Sys_Quit();
 	}
 }
@@ -222,5 +222,13 @@ Vulkan_Init_Common (void)
 void
 Vulkan_Shutdown_Common (void)
 {
+	if (vulkan_device) {
+		vulkan_device->vkDestroyDevice (vulkan_device->device, 0);
+		free (vulkan_device);
+		vulkan_device = 0;
+	}
 	Vulkan_DestroyInstance (vulkan_instance);
+	vulkan_instance = 0;
+	dlclose (vulkan_library);
+	vulkan_library = 0;
 }

From 77afc3048637e9cd7b63cfa96169d74195e2ceeb Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 7 Jul 2019 14:57:56 +0900
Subject: [PATCH 0272/1519] Fix vid renderer plugin types

I guess that plugin type is currently not checked, otherwise I doubt the
mistake would have gone unnoticed.
---
 libs/video/renderer/vid_render_gl.c     | 2 +-
 libs/video/renderer/vid_render_glsl.c   | 2 +-
 libs/video/renderer/vid_render_sw.c     | 2 +-
 libs/video/renderer/vid_render_sw32.c   | 2 +-
 libs/video/renderer/vid_render_vulkan.c | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libs/video/renderer/vid_render_gl.c b/libs/video/renderer/vid_render_gl.c
index c79bfaa20..42f5df1dc 100644
--- a/libs/video/renderer/vid_render_gl.c
+++ b/libs/video/renderer/vid_render_gl.c
@@ -166,7 +166,7 @@ static plugin_data_t plugin_info_data = {
 };
 
 static plugin_t plugin_info = {
-	qfp_snd_render,
+	qfp_vid_render,
 	0,
 	QFPLUGIN_VERSION,
 	"0.1",
diff --git a/libs/video/renderer/vid_render_glsl.c b/libs/video/renderer/vid_render_glsl.c
index f09820ab3..f162231d1 100644
--- a/libs/video/renderer/vid_render_glsl.c
+++ b/libs/video/renderer/vid_render_glsl.c
@@ -166,7 +166,7 @@ static plugin_data_t plugin_info_data = {
 };
 
 static plugin_t plugin_info = {
-	qfp_snd_render,
+	qfp_vid_render,
 	0,
 	QFPLUGIN_VERSION,
 	"0.1",
diff --git a/libs/video/renderer/vid_render_sw.c b/libs/video/renderer/vid_render_sw.c
index 7ac10a4d4..7c2485911 100644
--- a/libs/video/renderer/vid_render_sw.c
+++ b/libs/video/renderer/vid_render_sw.c
@@ -156,7 +156,7 @@ static plugin_data_t plugin_info_data = {
 };
 
 static plugin_t plugin_info = {
-	qfp_snd_render,
+	qfp_vid_render,
 	0,
 	QFPLUGIN_VERSION,
 	"0.1",
diff --git a/libs/video/renderer/vid_render_sw32.c b/libs/video/renderer/vid_render_sw32.c
index 9bc135c78..40034c0dc 100644
--- a/libs/video/renderer/vid_render_sw32.c
+++ b/libs/video/renderer/vid_render_sw32.c
@@ -161,7 +161,7 @@ static plugin_data_t plugin_info_data = {
 };
 
 static plugin_t plugin_info = {
-	qfp_snd_render,
+	qfp_vid_render,
 	0,
 	QFPLUGIN_VERSION,
 	"0.1",
diff --git a/libs/video/renderer/vid_render_vulkan.c b/libs/video/renderer/vid_render_vulkan.c
index 820d58fa6..165d5d832 100644
--- a/libs/video/renderer/vid_render_vulkan.c
+++ b/libs/video/renderer/vid_render_vulkan.c
@@ -175,7 +175,7 @@ static plugin_data_t plugin_info_data = {
 };
 
 static plugin_t plugin_info = {
-	qfp_snd_render,
+	qfp_vid_render,
 	0,
 	QFPLUGIN_VERSION,
 	"0.1",

From d95e9f9af35010e493e5658bd317c0033a0ba679 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 7 Jul 2019 14:59:20 +0900
Subject: [PATCH 0273/1519] Correct vulkan plugin strings

---
 libs/video/renderer/vid_render_vulkan.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libs/video/renderer/vid_render_vulkan.c b/libs/video/renderer/vid_render_vulkan.c
index 165d5d832..ec5ee4ea3 100644
--- a/libs/video/renderer/vid_render_vulkan.c
+++ b/libs/video/renderer/vid_render_vulkan.c
@@ -179,9 +179,9 @@ static plugin_t plugin_info = {
 	0,
 	QFPLUGIN_VERSION,
 	"0.1",
-	"GLSL Renderer",
+	"Vulkan Renderer",
 	"Copyright (C) 1996-1997  Id Software, Inc.\n"
-	"Copyright (C) 1999-2012  contributors of the QuakeForge project\n"
+	"Copyright (C) 1999-2019  contributors of the QuakeForge project\n"
 	"Please see the file \"AUTHORS\" for a list of contributors",
 	&plugin_info_funcs,
 	&plugin_info_data,

From a755e50c847c00f5018cac27a7f545a7233d2a8d Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 7 Jul 2019 15:38:29 +0900
Subject: [PATCH 0274/1519] Clean up vid access a little

Things are still a mess, but a proper cleanup will be a lot of work and
will, really, involve properly splitting quake-specific code* out from
the rest of the renderer.

* data loading and format specific stuff
---
 include/r_screen.h               | 2 --
 libs/video/renderer/r_screen.c   | 3 ---
 libs/video/renderer/vid_common.c | 2 ++
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/include/r_screen.h b/include/r_screen.h
index 4fb5e91cd..7955fdd3d 100644
--- a/include/r_screen.h
+++ b/include/r_screen.h
@@ -64,8 +64,6 @@ extern struct qpic_s *scr_turtle;
 extern int         clearconsole;
 extern int         clearnotify;
 
-extern viddef_t    vid;						// global video state
-
 extern vrect_t    *pconupdate;
 extern vrect_t     scr_vrect;
 
diff --git a/libs/video/renderer/r_screen.c b/libs/video/renderer/r_screen.c
index a6d129674..6eb307229 100644
--- a/libs/video/renderer/r_screen.c
+++ b/libs/video/renderer/r_screen.c
@@ -104,8 +104,6 @@ qpic_t     *scr_turtle;
 
 int         clearconsole;
 
-viddef_t    vid;						// global video state
-
 vrect_t    *pconupdate;
 vrect_t     scr_vrect;
 
@@ -365,6 +363,5 @@ SCR_Init (void)
 	scr_ram = vr_funcs->Draw_PicFromWad ("ram");
 	scr_turtle = vr_funcs->Draw_PicFromWad ("turtle");
 
-	vid = *vr_data.vid;	// cache
 	scr_initialized = true;
 }
diff --git a/libs/video/renderer/vid_common.c b/libs/video/renderer/vid_common.c
index 5a2cd9d43..74a1140b0 100644
--- a/libs/video/renderer/vid_common.c
+++ b/libs/video/renderer/vid_common.c
@@ -34,6 +34,8 @@
 #include "mod_internal.h"
 #include "r_internal.h"
 
+viddef_t    vid;					// global video state
+
 vid_render_data_t vid_render_data = {
 	&vid, &r_refdef, &scr_vrect,
 	0, 0, 0,

From 7137d61c3698a0664c64ed27824b972b8b19b842 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 7 Jul 2019 16:27:55 +0900
Subject: [PATCH 0275/1519] Add some extensions needed for presentation

---
 libs/video/renderer/vulkan/Makefile.am         | 2 +-
 libs/video/renderer/vulkan/vulkan_vid_common.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/libs/video/renderer/vulkan/Makefile.am b/libs/video/renderer/vulkan/Makefile.am
index f3b3d32c5..5d2f65d8e 100644
--- a/libs/video/renderer/vulkan/Makefile.am
+++ b/libs/video/renderer/vulkan/Makefile.am
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS= foreign
 
 AM_CFLAGS= @PREFER_PIC@
-AM_CPPFLAGS= -I$(top_srcdir)/include -DVK_NO_PROTOTYPES
+AM_CPPFLAGS= -I$(top_srcdir)/include -DVK_NO_PROTOTYPES -DVK_USE_PLATFORM_XLIB_KHR
 
 vulkan_src = \
 	init.c \
diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c
index ba4a16915..42b751de0 100644
--- a/libs/video/renderer/vulkan/vulkan_vid_common.c
+++ b/libs/video/renderer/vulkan/vulkan_vid_common.c
@@ -104,6 +104,8 @@ Vulkan_Init_Cvars ()
 }
 
 static const char *instance_extensions[] = {
+	VK_KHR_SURFACE_EXTENSION_NAME,
+	VK_KHR_XLIB_SURFACE_EXTENSION_NAME,
 	0,
 };
 

From 613779568291aee01dd3656dfe2bcfb12f64b9fd Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 7 Jul 2019 16:48:53 +0900
Subject: [PATCH 0276/1519] Use deep binding for the vulkan loader

This fixes the problem with using vkGetInstanceProcAddr to find global
vulkan functions.
---
 libs/video/renderer/vulkan/vulkan_vid_common.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c
index 42b751de0..9366799cb 100644
--- a/libs/video/renderer/vulkan/vulkan_vid_common.c
+++ b/libs/video/renderer/vulkan/vulkan_vid_common.c
@@ -64,7 +64,8 @@ static VulkanDevice_t *vulkan_device;
 static void
 load_vulkan_library (void)
 {
-	vulkan_library = dlopen (vulkan_library_name->string, RTLD_NOW);
+	vulkan_library = dlopen (vulkan_library_name->string,
+							 RTLD_DEEPBIND | RTLD_NOW);
 	if (!vulkan_library) {
 		Sys_Error ("Couldn't load vulkan library %s: %s",
 				   vulkan_library_name->name, dlerror ());
@@ -76,13 +77,8 @@ load_vulkan_library (void)
 		Sys_Error ("Couldn't find exported vulkan function %s", #name); \
 	}
 
-	// Can't use vkGetInstanceProcAddr (0, ...) here because it grabs from
-	// the whole exe and thus sees the function pointers instead of the actual
-	// functions. Sure, could rename all the function pointers, but while that
-	// worked for gl and glsl, it also made it a real pain to work with the
-	// spec (or man pages, etc). Of course, namespaces would help, too.
 	#define GLOBAL_LEVEL_VULKAN_FUNCTION(name) \
-	name = (PFN_##name) dlsym (vulkan_library, #name); \
+	name = (PFN_##name) vkGetInstanceProcAddr (0, #name); \
 	if (!name) { \
 		Sys_Error ("Couldn't find global-level function %s", #name); \
 	}

From 3e1520c2469bf40b63fc2661db095878d67e6bad Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 8 Jul 2019 12:46:22 +0900
Subject: [PATCH 0277/1519] Move vid callback access into vid

The plan is to move the callbacks into a "private" struct.
---
 include/QF/vid.h         | 1 +
 libs/video/targets/vid.c | 7 +++++++
 nq/include/client.h      | 1 +
 nq/source/cl_main.c      | 8 ++++++++
 nq/source/host.c         | 5 +----
 nq/source/sv_ded.c       | 5 +++++
 qw/source/cl_main.c      | 3 +--
 7 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/include/QF/vid.h b/include/QF/vid.h
index 70298fa8b..057414b2f 100644
--- a/include/QF/vid.h
+++ b/include/QF/vid.h
@@ -88,5 +88,6 @@ void VID_Init_Cvars (void);
 void VID_Init (byte *palette, byte *colormap);
 void VID_Shutdown (void);
 void VID_SetCaption (const char *text);
+void VID_ClearMemory (void);
 
 #endif	// __vid_h_
diff --git a/libs/video/targets/vid.c b/libs/video/targets/vid.c
index 46507e26d..d7aeb3b2d 100644
--- a/libs/video/targets/vid.c
+++ b/libs/video/targets/vid.c
@@ -305,3 +305,10 @@ VID_InitBuffers (void)
 	if (viddef.init_caches)
 		viddef.init_caches (viddef.surfcache, cachesize);
 }
+
+void
+VID_ClearMemory (void)
+{
+	if (viddef.flush_caches)
+		viddef.flush_caches ();
+}
diff --git a/nq/include/client.h b/nq/include/client.h
index e6dc80e97..54477f7b4 100644
--- a/nq/include/client.h
+++ b/nq/include/client.h
@@ -287,6 +287,7 @@ struct cbuf_s;
 void CL_Init (struct cbuf_s *cbuf);
 void CL_InitCvars (void);
 void CL_Shutdown (void);
+void CL_ClearMemory (void);
 
 void CL_EstablishConnection (const char *host);
 void CL_Signon1 (void);
diff --git a/nq/source/cl_main.c b/nq/source/cl_main.c
index 7f6dd9e82..3f8e7bde6 100644
--- a/nq/source/cl_main.c
+++ b/nq/source/cl_main.c
@@ -130,6 +130,14 @@ CL_Shutdown (void)
 	VID_Shutdown ();
 }
 
+void
+CL_ClearMemory (void)
+{
+	VID_ClearMemory ();
+	if (r_data)
+		r_data->force_fullscreen = 0;
+}
+
 void
 CL_InitCvars (void)
 {
diff --git a/nq/source/host.c b/nq/source/host.c
index f6b59cf8b..d15dd0431 100644
--- a/nq/source/host.c
+++ b/nq/source/host.c
@@ -495,8 +495,7 @@ void
 Host_ClearMemory (void)
 {
 	Sys_MaskPrintf (SYS_DEV, "Clearing memory\n");
-	if (viddef.flush_caches)
-		viddef.flush_caches ();
+	CL_ClearMemory ();
 	Mod_ClearAll ();
 	if (host_hunklevel)
 		Hunk_FreeToLowMark (host_hunklevel);
@@ -504,8 +503,6 @@ Host_ClearMemory (void)
 	cls.signon = 0;
 	memset (&sv, 0, sizeof (sv));
 	memset (&cl, 0, sizeof (cl));
-	if (r_data)
-		r_data->force_fullscreen = 0;
 }
 
 /*
diff --git a/nq/source/sv_ded.c b/nq/source/sv_ded.c
index c22f9cc3a..44dd57408 100644
--- a/nq/source/sv_ded.c
+++ b/nq/source/sv_ded.c
@@ -68,6 +68,11 @@ CL_UpdateScreen (double realtime)
 {
 }
 
+void
+CL_ClearMemory (void)
+{
+}
+
 void
 CL_Cmd_ForwardToServer (void)
 {
diff --git a/qw/source/cl_main.c b/qw/source/cl_main.c
index 09fb1aec2..c2b3c3a35 100644
--- a/qw/source/cl_main.c
+++ b/qw/source/cl_main.c
@@ -412,8 +412,7 @@ CL_ClearState (void)
 	CL_Init_Entity (&cl.viewent);
 
 	Sys_MaskPrintf (SYS_DEV, "Clearing memory\n");
-	if (viddef.flush_caches)
-		viddef.flush_caches ();
+	VID_ClearMemory ();
 	Mod_ClearAll ();
 	if (host_hunklevel)					// FIXME: check this...
 		Hunk_FreeToLowMark (host_hunklevel);

From 6ee2df84452ab6a8fc25dfbafb993815a1d9fbf4 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 8 Jul 2019 13:40:29 +0900
Subject: [PATCH 0278/1519] Move vid callbacks into vid_internal

Currently segfaults because viddef is an alias for *r_data->vid, which
has not yet been initialized (chicken and egg).
---
 include/QF/vid.h                        | 12 +-----------
 include/vid_internal.h                  | 14 ++++++++++++++
 libs/video/renderer/gl/gl_rmisc.c       |  7 ++++---
 libs/video/renderer/gl/gl_screen.c      |  5 +++--
 libs/video/renderer/gl/qfgl_ext.c       |  7 ++++---
 libs/video/renderer/glsl/glsl_main.c    |  5 +++--
 libs/video/renderer/glsl/glsl_screen.c  |  3 ++-
 libs/video/renderer/glsl/qfglsl.c       |  5 +++--
 libs/video/renderer/r_init.c            |  5 +++--
 libs/video/renderer/sw/d_init.c         |  6 +++---
 libs/video/renderer/sw/draw.c           |  2 +-
 libs/video/renderer/sw32/d_init.c       |  6 +++---
 libs/video/renderer/sw32/draw.c         |  2 +-
 libs/video/renderer/vid_render_gl.c     |  7 ++++---
 libs/video/renderer/vid_render_glsl.c   |  7 ++++---
 libs/video/renderer/vid_render_vulkan.c |  7 ++++---
 libs/video/targets/vid.c                | 23 ++++++++++++-----------
 libs/video/targets/vid_sdl.c            | 14 +++++++++-----
 libs/video/targets/vid_x11.c            | 13 ++++++++-----
 19 files changed, 86 insertions(+), 64 deletions(-)

diff --git a/include/QF/vid.h b/include/QF/vid.h
index 057414b2f..93975ced6 100644
--- a/include/QF/vid.h
+++ b/include/QF/vid.h
@@ -61,17 +61,7 @@ typedef struct {
 	int				 conheight;
 	byte			*direct;		// direct drawing to framebuffer, if not
 									//  NULL
-	int			   (*surf_cache_size)(int width, int height);
-	void		   (*flush_caches)(void);
-	void		   (*init_caches)(void *cache, int size);
-	void		   (*do_screen_buffer)(void);
-	void           (*set_palette)(const byte *palette);
-
-	// gl stuff
-	void           (*load_gl)(void);
-	void           (*init_gl)(void);
-	void          *(*get_proc_address)(const char *name, qboolean crit);
-	void           (*end_rendering)(void);
+	struct vid_internal_s *vid_internal;
 } viddef_t;
 
 #define viddef (*r_data->vid)
diff --git a/include/vid_internal.h b/include/vid_internal.h
index bf1803270..fc1538202 100644
--- a/include/vid_internal.h
+++ b/include/vid_internal.h
@@ -4,6 +4,20 @@
 #include "QF/vid.h"
 #include "QF/plugin/vid_render.h"
 
+typedef struct vid_internal_s {
+	int         (*surf_cache_size) (int width, int height);
+	void        (*flush_caches) (void);
+	void        (*init_caches) (void *cache, int size);
+	void        (*do_screen_buffer) (void);
+	void        (*set_palette) (const byte *palette);
+
+	// gl stuff
+	void        (*load_gl) (void);
+	void        (*init_gl) (void);
+	void        *(*get_proc_address) (const char *name, qboolean crit);
+	void        (*end_rendering) (void);
+} vid_internal_t;
+
 extern struct cvar_s *vid_fullscreen;
 extern struct cvar_s *vid_system_gamma;
 extern struct cvar_s *vid_gamma;
diff --git a/libs/video/renderer/gl/gl_rmisc.c b/libs/video/renderer/gl/gl_rmisc.c
index a399c26bd..e054e37bf 100644
--- a/libs/video/renderer/gl/gl_rmisc.c
+++ b/libs/video/renderer/gl/gl_rmisc.c
@@ -64,6 +64,7 @@
 #include "mod_internal.h"
 #include "r_internal.h"
 #include "varrays.h"
+#include "vid_internal.h"
 
 /*
 	R_Envmap_f
@@ -121,7 +122,7 @@ R_Envmap_f (void)
 	gl_envmap = false;
 	qfglDrawBuffer (GL_BACK);
 	qfglReadBuffer (GL_BACK);
-	vid.end_rendering ();
+	vid.vid_internal->end_rendering ();
 }
 
 void
@@ -249,13 +250,13 @@ gl_R_TimeRefresh_f (void)
 	double      start, stop, time;
 	int         i;
 
-	vid.end_rendering ();
+	vid.vid_internal->end_rendering ();
 
 	start = Sys_DoubleTime ();
 	for (i = 0; i < 128; i++) {
 		r_refdef.viewangles[1] = i * (360.0 / 128.0);
 		gl_R_RenderView ();
-		vid.end_rendering ();
+		vid.vid_internal->end_rendering ();
 	}
 
 	stop = Sys_DoubleTime ();
diff --git a/libs/video/renderer/gl/gl_screen.c b/libs/video/renderer/gl/gl_screen.c
index d463880d8..73674e70c 100644
--- a/libs/video/renderer/gl/gl_screen.c
+++ b/libs/video/renderer/gl/gl_screen.c
@@ -59,6 +59,7 @@
 #include "compat.h"
 #include "r_internal.h"
 #include "sbar.h"
+#include "vid_internal.h"
 
 /* SCREEN SHOTS */
 
@@ -206,7 +207,7 @@ gl_SCR_UpdateScreen (double realtime, SCR_Func scr_3dfunc, SCR_Func *scr_funcs)
 		return;
 
 	if (begun)
-		vid.end_rendering ();
+		vid.vid_internal->end_rendering ();
 
 	vr_data.realtime = realtime;
 
@@ -263,7 +264,7 @@ gl_SCR_UpdateScreen (double realtime, SCR_Func scr_3dfunc, SCR_Func *scr_funcs)
 	qfglFlush ();
 
 	if (gl_finish->int_val) {
-		vid.end_rendering ();
+		vid.vid_internal->end_rendering ();
 		begun = 0;
 	}
 }
diff --git a/libs/video/renderer/gl/qfgl_ext.c b/libs/video/renderer/gl/qfgl_ext.c
index a46472609..41fe1f52b 100644
--- a/libs/video/renderer/gl/qfgl_ext.c
+++ b/libs/video/renderer/gl/qfgl_ext.c
@@ -61,6 +61,7 @@
 #include "QF/GL/funcs.h"
 
 #include "r_internal.h"
+#include "vid_internal.h"
 
 // First we need to get all the function pointers declared.
 #define QFGL_WANT(ret, name, args) \
@@ -75,9 +76,9 @@ qboolean
 GLF_FindFunctions (void)
 {
 #define QFGL_WANT(ret, name, args) \
-	qf##name = vid.get_proc_address (#name, false);
+	qf##name = vid.vid_internal->get_proc_address (#name, false);
 #define QFGL_NEED(ret, name, args) \
-	qf##name = vid.get_proc_address (#name, true);
+	qf##name = vid.vid_internal->get_proc_address (#name, true);
 #include "QF/GL/qf_funcs_list.h"
 #undef QFGL_NEED
 #undef QFGL_WANT
@@ -135,6 +136,6 @@ void *
 QFGL_ExtensionAddress (const char *name)
 {
 	if (name)
-		return vid.get_proc_address (name, false);
+		return vid.vid_internal->get_proc_address (name, false);
 	return NULL;
 }
diff --git a/libs/video/renderer/glsl/glsl_main.c b/libs/video/renderer/glsl/glsl_main.c
index 9fd3a9c0c..2bc60bdd4 100644
--- a/libs/video/renderer/glsl/glsl_main.c
+++ b/libs/video/renderer/glsl/glsl_main.c
@@ -58,6 +58,7 @@
 
 #include "mod_internal.h"
 #include "r_internal.h"
+#include "vid_internal.h"
 
 mat4_t glsl_projection;
 mat4_t glsl_view;
@@ -304,13 +305,13 @@ glsl_R_TimeRefresh_f (void)
 	double      start, stop, time;
 	int         i;
 
-	vid.end_rendering ();
+	vid.vid_internal->end_rendering ();
 
 	start = Sys_DoubleTime ();
 	for (i = 0; i < 128; i++) {
 		r_refdef.viewangles[1] = i * (360.0 / 128.0);
 		glsl_R_RenderView ();
-		vid.end_rendering ();
+		vid.vid_internal->end_rendering ();
 	}
 
 	stop = Sys_DoubleTime ();
diff --git a/libs/video/renderer/glsl/glsl_screen.c b/libs/video/renderer/glsl/glsl_screen.c
index eab755325..ecdda6ec8 100644
--- a/libs/video/renderer/glsl/glsl_screen.c
+++ b/libs/video/renderer/glsl/glsl_screen.c
@@ -60,6 +60,7 @@
 #include "QF/GLSL/qf_vid.h"
 
 #include "r_internal.h"
+#include "vid_internal.h"
 
 /* Unknown renamed to GLErr_Unknown to solve conflict with winioctl.h */
 static unsigned int GLErr_InvalidEnum;
@@ -165,7 +166,7 @@ glsl_SCR_UpdateScreen (double realtime, SCR_Func scr_3dfunc,
 
 	if (begun) {
 		begun = 0;
-		vid.end_rendering ();
+		vid.vid_internal->end_rendering ();
 	}
 
 	vr_data.realtime = realtime;
diff --git a/libs/video/renderer/glsl/qfglsl.c b/libs/video/renderer/glsl/qfglsl.c
index af3a2f839..b4fd25662 100644
--- a/libs/video/renderer/glsl/qfglsl.c
+++ b/libs/video/renderer/glsl/qfglsl.c
@@ -60,6 +60,7 @@
 #include "QF/GLSL/funcs.h"
 
 #include "r_internal.h"
+#include "vid_internal.h"
 
 // First we need to get all the function pointers declared.
 #define QFGL_WANT(ret, name, args) \
@@ -74,9 +75,9 @@ qboolean
 EGLF_FindFunctions (void)
 {
 #define QFGL_WANT(ret, name, args) \
-	qfe##name = vid.get_proc_address (#name, false);
+	qfe##name = vid.vid_internal->get_proc_address (#name, false);
 #define QFGL_NEED(ret, name, args) \
-	qfe##name = vid.get_proc_address (#name, true);
+	qfe##name = vid.vid_internal->get_proc_address (#name, true);
 #include "QF/GLSL/qf_funcs_list.h"
 #undef QFGL_NEED
 #undef QFGL_WANT
diff --git a/libs/video/renderer/r_init.c b/libs/video/renderer/r_init.c
index d4a7e91cd..98acc39ad 100644
--- a/libs/video/renderer/r_init.c
+++ b/libs/video/renderer/r_init.c
@@ -46,6 +46,7 @@
 #include "QF/plugin/general.h"
 
 #include "r_internal.h"
+#include "vid_internal.h"
 
 cvar_t         *vidrend_plugin;
 plugin_t       *vidrendmodule = NULL;
@@ -76,8 +77,8 @@ R_LoadModule (void (*load_gl)(void), void (*set_palette) (const byte *palette))
 	r_funcs = vidrendmodule->functions->vid_render;
 	mod_funcs = r_funcs->model_funcs;
 	r_data = vidrendmodule->data->vid_render;
-	r_data->vid->load_gl = load_gl;
-	r_data->vid->set_palette = set_palette;
+	r_data->vid->vid_internal->load_gl = load_gl;
+	r_data->vid->vid_internal->set_palette = set_palette;
 
 	vidrendmodule->functions->general->p_Init ();
 }
diff --git a/libs/video/renderer/sw/d_init.c b/libs/video/renderer/sw/d_init.c
index 67e48e71b..00fb21a89 100644
--- a/libs/video/renderer/sw/d_init.c
+++ b/libs/video/renderer/sw/d_init.c
@@ -56,9 +56,9 @@ D_Init (void)
 	r_worldpolysbacktofront = false;
 	r_recursiveaffinetriangles = true;
 
-	vr_data.vid->surf_cache_size = D_SurfaceCacheForRes;
-	vr_data.vid->flush_caches = D_FlushCaches;
-	vr_data.vid->init_caches = D_InitCaches;
+	vr_data.vid->vid_internal->surf_cache_size = D_SurfaceCacheForRes;
+	vr_data.vid->vid_internal->flush_caches = D_FlushCaches;
+	vr_data.vid->vid_internal->init_caches = D_InitCaches;
 
 	VID_InitBuffers ();
 }
diff --git a/libs/video/renderer/sw/draw.c b/libs/video/renderer/sw/draw.c
index e3728af66..775888a21 100644
--- a/libs/video/renderer/sw/draw.c
+++ b/libs/video/renderer/sw/draw.c
@@ -825,5 +825,5 @@ Draw_BlendScreen (quat_t color)
 		newpal[2] = vid.gammatable[b];
 		newpal += 3;
 	}
-	vid.set_palette (pal);
+	vid.vid_internal->set_palette (pal);
 }
diff --git a/libs/video/renderer/sw32/d_init.c b/libs/video/renderer/sw32/d_init.c
index ccb5f7392..e786cf32b 100644
--- a/libs/video/renderer/sw32/d_init.c
+++ b/libs/video/renderer/sw32/d_init.c
@@ -66,9 +66,9 @@ sw32_D_Init (void)
 			sw32_d_zitable[i] = (65536.0 * 65536.0 / (double) i);
 	}
 
-	vr_data.vid->surf_cache_size = sw32_D_SurfaceCacheForRes;
-	vr_data.vid->flush_caches = sw32_D_FlushCaches;
-	vr_data.vid->init_caches = sw32_D_InitCaches;
+	vr_data.vid->vid_internal->surf_cache_size = sw32_D_SurfaceCacheForRes;
+	vr_data.vid->vid_internal->flush_caches = sw32_D_FlushCaches;
+	vr_data.vid->vid_internal->init_caches = sw32_D_InitCaches;
 
 	VID_InitBuffers ();
 	VID_MakeColormaps();
diff --git a/libs/video/renderer/sw32/draw.c b/libs/video/renderer/sw32/draw.c
index a420c8ac0..13454c437 100644
--- a/libs/video/renderer/sw32/draw.c
+++ b/libs/video/renderer/sw32/draw.c
@@ -1299,7 +1299,7 @@ sw32_Draw_BlendScreen (quat_t color)
 			newpal[2] = vid.gammatable[b];
 			newpal += 3;
 		}
-		vid.set_palette (pal);
+		vid.vid_internal->set_palette (pal);
 	}
 	break;
 	case 2:
diff --git a/libs/video/renderer/vid_render_gl.c b/libs/video/renderer/vid_render_gl.c
index 42f5df1dc..91f4178b5 100644
--- a/libs/video/renderer/vid_render_gl.c
+++ b/libs/video/renderer/vid_render_gl.c
@@ -38,6 +38,7 @@
 
 #include "mod_internal.h"
 #include "r_internal.h"
+#include "vid_internal.h"
 
 #include "gl/namehack.h"
 
@@ -126,9 +127,9 @@ vid_render_funcs_t gl_vid_render_funcs = {
 static void
 gl_vid_render_init (void)
 {
-	vr_data.vid->set_palette = GL_SetPalette;
-	vr_data.vid->init_gl = GL_Init_Common;
-	vr_data.vid->load_gl ();
+	vr_data.vid->vid_internal->set_palette = GL_SetPalette;
+	vr_data.vid->vid_internal->init_gl = GL_Init_Common;
+	vr_data.vid->vid_internal->load_gl ();
 	vr_funcs = &gl_vid_render_funcs;
 	m_funcs = &model_funcs;
 }
diff --git a/libs/video/renderer/vid_render_glsl.c b/libs/video/renderer/vid_render_glsl.c
index f162231d1..d1f380ae5 100644
--- a/libs/video/renderer/vid_render_glsl.c
+++ b/libs/video/renderer/vid_render_glsl.c
@@ -38,6 +38,7 @@
 
 #include "mod_internal.h"
 #include "r_internal.h"
+#include "vid_internal.h"
 
 #include "glsl/namehack.h"
 
@@ -126,9 +127,9 @@ vid_render_funcs_t glsl_vid_render_funcs = {
 static void
 glsl_vid_render_init (void)
 {
-	vr_data.vid->set_palette = GLSL_SetPalette;
-	vr_data.vid->init_gl = GLSL_Init_Common;
-	vr_data.vid->load_gl ();
+	vr_data.vid->vid_internal->set_palette = GLSL_SetPalette;
+	vr_data.vid->vid_internal->init_gl = GLSL_Init_Common;
+	vr_data.vid->vid_internal->load_gl ();
 	vr_funcs = &glsl_vid_render_funcs;
 	m_funcs = &model_funcs;
 }
diff --git a/libs/video/renderer/vid_render_vulkan.c b/libs/video/renderer/vid_render_vulkan.c
index ec5ee4ea3..c71264fcb 100644
--- a/libs/video/renderer/vid_render_vulkan.c
+++ b/libs/video/renderer/vid_render_vulkan.c
@@ -38,6 +38,7 @@
 
 #include "mod_internal.h"
 #include "r_internal.h"
+#include "vid_internal.h"
 
 #include "vulkan/namehack.h"
 
@@ -134,9 +135,9 @@ set_palette (const byte *palette)
 static void
 vulkan_vid_render_init (void)
 {
-	vr_data.vid->set_palette = set_palette;
-	vr_data.vid->init_gl = Vulkan_Init_Common;
-	vr_data.vid->load_gl ();
+	vr_data.vid->vid_internal->set_palette = set_palette;
+	vr_data.vid->vid_internal->init_gl = Vulkan_Init_Common;
+	vr_data.vid->vid_internal->load_gl ();
 	vr_funcs = &vulkan_vid_render_funcs;
 	m_funcs = &model_funcs;
 }
diff --git a/libs/video/targets/vid.c b/libs/video/targets/vid.c
index d7aeb3b2d..651101539 100644
--- a/libs/video/targets/vid.c
+++ b/libs/video/targets/vid.c
@@ -214,7 +214,7 @@ VID_UpdateGamma (cvar_t *vid_gamma)
 		VID_BuildGammaTable (gamma);
 		for (i = 0; i < 256 * 3; i++)
 			viddef.palette[i] = viddef.gammatable[viddef.basepal[i]];
-		viddef.set_palette (viddef.palette); // update with the new palette
+		viddef.vid_internal->set_palette (viddef.palette); // update with the new palette
 	}
 }
 
@@ -256,8 +256,9 @@ VID_InitBuffers (void)
 	// Calculate the sizes we want first
 	buffersize = viddef.rowbytes * viddef.height;
 	zbuffersize = viddef.width * viddef.height * sizeof (*viddef.zbuffer);
-	if (viddef.surf_cache_size)
-		cachesize = viddef.surf_cache_size (viddef.width, viddef.height);
+	if (viddef.vid_internal->surf_cache_size)
+		cachesize = viddef.vid_internal->surf_cache_size (viddef.width,
+														  viddef.height);
 
 	// Free the old z-buffer
 	if (viddef.zbuffer) {
@@ -266,13 +267,13 @@ VID_InitBuffers (void)
 	}
 	// Free the old surface cache
 	if (viddef.surfcache) {
-		if (viddef.flush_caches)
-			viddef.flush_caches ();
+		if (viddef.vid_internal->flush_caches)
+			viddef.vid_internal->flush_caches ();
 		free (viddef.surfcache);
 		viddef.surfcache = NULL;
 	}
-	if (viddef.do_screen_buffer) {
-		viddef.do_screen_buffer ();
+	if (viddef.vid_internal->do_screen_buffer) {
+		viddef.vid_internal->do_screen_buffer ();
 	} else {
 		// Free the old screen buffer
 		if (viddef.buffer) {
@@ -302,13 +303,13 @@ VID_InitBuffers (void)
 		Sys_Error ("Not enough memory for video mode");
 	}
 
-	if (viddef.init_caches)
-		viddef.init_caches (viddef.surfcache, cachesize);
+	if (viddef.vid_internal->init_caches)
+		viddef.vid_internal->init_caches (viddef.surfcache, cachesize);
 }
 
 void
 VID_ClearMemory (void)
 {
-	if (viddef.flush_caches)
-		viddef.flush_caches ();
+	if (viddef.vid_internal->flush_caches)
+		viddef.vid_internal->flush_caches ();
 }
diff --git a/libs/video/targets/vid_sdl.c b/libs/video/targets/vid_sdl.c
index b32efbee1..e48baea51 100644
--- a/libs/video/targets/vid_sdl.c
+++ b/libs/video/targets/vid_sdl.c
@@ -78,6 +78,8 @@ SDL_Surface *screen = NULL;
 # endif
 #endif
 
+static vid_internal_t vid_internal;
+
 static void (*set_vid_mode) (Uint32 flags);
 
 static void (GLAPIENTRY *qfglFinish) (void);
@@ -157,7 +159,7 @@ sdlgl_set_vid_mode (Uint32 flags)
 success:
 	viddef.numpages = 2;
 
-	viddef.init_gl ();
+	viddef.vid_internal->init_gl ();
 }
 
 static void
@@ -170,8 +172,8 @@ sdlgl_end_rendering (void)
 static void
 sdl_load_gl (void)
 {
-	viddef.get_proc_address = QFGL_ProcAddress;
-	viddef.end_rendering = sdlgl_end_rendering;
+	viddef.vid_internal->get_proc_address = QFGL_ProcAddress;
+	viddef.vid_internal->end_rendering = sdlgl_end_rendering;
 	set_vid_mode = sdlgl_set_vid_mode;
 
 	if (SDL_GL_LoadLibrary (gl_driver->string) != 0)
@@ -220,7 +222,7 @@ sdl_set_vid_mode (Uint32 flags)
 	// now know everything we need to know about the buffer
 	VGA_width = viddef.width;
 	VGA_height = viddef.height;
-	viddef.do_screen_buffer = do_screen_buffer;
+	viddef.vid_internal->do_screen_buffer = do_screen_buffer;
 	VGA_pagebase = viddef.buffer = screen->pixels;
 	VGA_rowbytes = viddef.rowbytes = screen->pitch;
 	viddef.conbuffer = viddef.buffer;
@@ -235,6 +237,8 @@ VID_Init (byte *palette, byte *colormap)
 {
 	Uint32      flags;
 
+	viddef.vid_internal = &vid_internal;
+
 	set_vid_mode = sdl_set_vid_mode;
 
 	// Load the SDL library
@@ -269,7 +273,7 @@ VID_Init (byte *palette, byte *colormap)
 
 	VID_SDL_GammaCheck ();
 	VID_InitGamma (palette);
-	viddef.set_palette (viddef.palette);
+	viddef.vid_internal->set_palette (viddef.palette);
 
 	viddef.initialized = true;
 
diff --git a/libs/video/targets/vid_x11.c b/libs/video/targets/vid_x11.c
index 1050d6adb..905620080 100644
--- a/libs/video/targets/vid_x11.c
+++ b/libs/video/targets/vid_x11.c
@@ -79,6 +79,7 @@
 #include "dga_check.h"
 #include "vid_internal.h"
 
+static vid_internal_t vid_internal;
 int XShmGetEventBase (Display *x);	// for broken X11 headers
 
 static GC		x_gc;
@@ -209,7 +210,7 @@ glx_create_context (void)
 	XSync (x_disp, 0);
 	ctx = qfglXCreateContext (x_disp, x_visinfo, NULL, True);
 	qfglXMakeCurrent (x_disp, x_win, ctx);
-	viddef.init_gl ();
+	viddef.vid_internal->init_gl ();
 }
 
 static void
@@ -227,8 +228,8 @@ glx_load_gl (void)
 	choose_visual = glx_choose_visual;
 	create_context = glx_create_context;
 
-	viddef.get_proc_address = QFGL_ProcAddress;
-	viddef.end_rendering = glx_end_rendering;
+	viddef.vid_internal->get_proc_address = QFGL_ProcAddress;
+	viddef.vid_internal->end_rendering = glx_end_rendering;
 
 #ifdef RTLD_GLOBAL
 	flags |= RTLD_GLOBAL;
@@ -623,7 +624,7 @@ x11_create_context (void)
 		x_shmeventtype = XShmGetEventBase (x_disp) + ShmCompletion;
 	}
 
-	viddef.do_screen_buffer = x11_init_buffers;
+	viddef.vid_internal->do_screen_buffer = x11_init_buffers;
 	VID_InitBuffers ();
 
 //  XSynchronize (x_disp, False);
@@ -666,6 +667,8 @@ VID_SetPalette (const byte *palette)
 void
 VID_Init (byte *palette, byte *colormap)
 {
+	viddef.vid_internal = &vid_internal;
+
 	choose_visual = x11_choose_visual;
 	create_context = x11_create_context;
 
@@ -686,7 +689,7 @@ VID_Init (byte *palette, byte *colormap)
 	create_context ();
 
 	VID_InitGamma (palette);
-	viddef.set_palette (viddef.palette);
+	viddef.vid_internal->set_palette (viddef.palette);
 
 	Sys_MaskPrintf (SYS_VID, "Video mode %dx%d initialized.\n",
 					viddef.width, viddef.height);

From cb10175824d9c829b95b92cef8956c3e7d2a6cd2 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 8 Jul 2019 14:02:24 +0900
Subject: [PATCH 0279/1519] Pass vid_internal to R_LoadModule

This fixes the segfault and pushes things very much in the desired
direction of proper system independence for rendering and presentation
separation (though things were headed in the right direction before).
---
 include/QF/render.h          | 4 ++--
 libs/video/renderer/r_init.c | 5 ++---
 libs/video/targets/vid_sdl.c | 5 +++--
 libs/video/targets/vid_x11.c | 5 +++--
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/include/QF/render.h b/include/QF/render.h
index cc08c3800..03cebfa1c 100644
--- a/include/QF/render.h
+++ b/include/QF/render.h
@@ -172,8 +172,8 @@ extern	struct texture_s	*r_notexture_mip;
 extern entity_t r_worldentity;
 
 void R_Init (void);
-void R_LoadModule (void (*load_gl)(void),
-				   void (*set_palette) (const byte *palette));
+struct vid_internal_s;
+void R_LoadModule (struct vid_internal_s *vid_internal);
 struct progs_s;
 void R_Progs_Init (struct progs_s *pr);
 
diff --git a/libs/video/renderer/r_init.c b/libs/video/renderer/r_init.c
index 98acc39ad..330d0d76d 100644
--- a/libs/video/renderer/r_init.c
+++ b/libs/video/renderer/r_init.c
@@ -64,7 +64,7 @@ static U void (*const r_progs_init)(struct progs_s *) = R_Progs_Init;
 #undef U
 
 VISIBLE void
-R_LoadModule (void (*load_gl)(void), void (*set_palette) (const byte *palette))
+R_LoadModule (vid_internal_t *vid_internal)
 {
 	PI_RegisterPlugins (vidrend_plugin_list);
 	vidrend_plugin = Cvar_Get ("vid_render", VID_RENDER_DEFAULT, CVAR_ROM, 0,
@@ -77,8 +77,7 @@ R_LoadModule (void (*load_gl)(void), void (*set_palette) (const byte *palette))
 	r_funcs = vidrendmodule->functions->vid_render;
 	mod_funcs = r_funcs->model_funcs;
 	r_data = vidrendmodule->data->vid_render;
-	r_data->vid->vid_internal->load_gl = load_gl;
-	r_data->vid->vid_internal->set_palette = set_palette;
+	r_data->vid->vid_internal = vid_internal;
 
 	vidrendmodule->functions->general->p_Init ();
 }
diff --git a/libs/video/targets/vid_sdl.c b/libs/video/targets/vid_sdl.c
index e48baea51..514b8020e 100644
--- a/libs/video/targets/vid_sdl.c
+++ b/libs/video/targets/vid_sdl.c
@@ -237,7 +237,8 @@ VID_Init (byte *palette, byte *colormap)
 {
 	Uint32      flags;
 
-	viddef.vid_internal = &vid_internal;
+	vid_internal.set_palette = VID_SetPalette;
+	vid_internal.load_gl = sdl_load_gl;
 
 	set_vid_mode = sdl_set_vid_mode;
 
@@ -245,7 +246,7 @@ VID_Init (byte *palette, byte *colormap)
 	if (SDL_Init (SDL_INIT_VIDEO) < 0)
 		Sys_Error ("VID: Couldn't load SDL: %s", SDL_GetError ());
 
-	R_LoadModule (sdl_load_gl, VID_SetPalette);
+	R_LoadModule (&vid_internal);
 
 	viddef.numpages = 1;
 	viddef.colormap8 = colormap;
diff --git a/libs/video/targets/vid_x11.c b/libs/video/targets/vid_x11.c
index 905620080..bc4b4b6dc 100644
--- a/libs/video/targets/vid_x11.c
+++ b/libs/video/targets/vid_x11.c
@@ -667,12 +667,13 @@ VID_SetPalette (const byte *palette)
 void
 VID_Init (byte *palette, byte *colormap)
 {
-	viddef.vid_internal = &vid_internal;
+	vid_internal.load_gl = glx_load_gl;
+	vid_internal.set_palette = VID_SetPalette;
 
 	choose_visual = x11_choose_visual;
 	create_context = x11_create_context;
 
-	R_LoadModule (glx_load_gl, VID_SetPalette);
+	R_LoadModule (&vid_internal);
 
 	viddef.numpages = 2;
 	viddef.colormap8 = colormap;

From 53a62e4d623828d199d12d641daabd3e42fb1341 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 9 Jul 2019 00:44:48 +0900
Subject: [PATCH 0280/1519] Add checks for some dlopen flags

Checks aren't used yet, though.
---
 config.d/library_functions.m4 | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/config.d/library_functions.m4 b/config.d/library_functions.m4
index 66ff31edc..ba76c574e 100644
--- a/config.d/library_functions.m4
+++ b/config.d/library_functions.m4
@@ -35,6 +35,25 @@ if test "x$ac_cv_func_dlopen" != "xyes"; then
 fi
 AC_SUBST(DL_LIBS)
 
+if test "x$DL_LIBS" != "x"; then
+AC_MSG_CHECKING([for RTLD_NOW])
+AC_TRY_COMPILE(
+	[#include <dlfcn.h>],
+	[int foo = RTLD_NOW],
+	AC_DEFINE(HAVE_RTLD_NOW, 1, [Define if you have RTLD_NOW.])
+	AC_MSG_RESULT(yes),
+	AC_MSG_RESULT(no)
+)
+AC_MSG_CHECKING([for RTLD_DEEPBIND])
+AC_TRY_COMPILE(
+	[#include <dlfcn.h>],
+	[int foo = RTLD_DEEPBIND],
+	AC_DEFINE(HAVE_RTLD_DEEPBIND, 1, [Define if you have RTLD_DEEPBIND.])
+	AC_MSG_RESULT(yes),
+	AC_MSG_RESULT(no)
+)
+fi
+
 dnl Checks for stricmp/strcasecmp
 #AC_CHECK_FUNC(strcasecmp,
 #	,

From 8ee06d75a9547a143c7054c1fb615a38a44c0f9b Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 9 Jul 2019 01:00:47 +0900
Subject: [PATCH 0281/1519] Separate render and presentation initialization

This paves the way for clean initialization of the Vulkan renderer, and
very much cleans up the older renderer initialization code as gl and sw
are no longer intertwined.
---
 config.d/vulkan.m4                            |  16 +-
 configure.ac                                  |   2 +-
 include/QF/Vulkan/cvars.h                     |   1 -
 include/QF/Vulkan/funclist.h                  |  11 +
 include/QF/Vulkan/funcs.h                     |   9 -
 include/QF/Vulkan/init.h                      |   1 -
 include/context_sdl.h                         |  12 +
 include/context_x11.h                         |   9 +
 include/r_cvar.h                              |   1 -
 include/vid_gl.h                              |  20 +
 include/vid_internal.h                        |  13 +-
 include/vid_sw.h                              |  18 +
 include/vid_vulkan.h                          |  29 +
 libs/video/renderer/gl/gl_rmisc.c             |   8 +-
 libs/video/renderer/gl/gl_screen.c            |   6 +-
 libs/video/renderer/gl/qfgl_ext.c             |   8 +-
 libs/video/renderer/glsl/glsl_main.c          |   6 +-
 libs/video/renderer/glsl/glsl_screen.c        |   4 +-
 libs/video/renderer/glsl/qfglsl.c             |   6 +-
 libs/video/renderer/sw/screen.c               |   3 +-
 libs/video/renderer/sw/sw_rmisc.c             |   3 +-
 libs/video/renderer/sw32/screen.c             |   3 +-
 libs/video/renderer/sw32/sw32_rmisc.c         |   4 +-
 libs/video/renderer/vid_render_gl.c           |  24 +-
 libs/video/renderer/vid_render_glsl.c         |  23 +-
 libs/video/renderer/vid_render_sw.c           |  24 +-
 libs/video/renderer/vid_render_sw32.c         |  22 +
 libs/video/renderer/vid_render_vulkan.c       |   9 +-
 libs/video/renderer/vulkan/Makefile.am        |   3 +-
 libs/video/renderer/vulkan/init.c             |  22 +-
 libs/video/renderer/vulkan/vulkan_funcs.c     |   6 -
 .../video/renderer/vulkan/vulkan_vid_common.c |  39 +-
 libs/video/targets/Makefile.am                |  14 +-
 libs/video/targets/context_sdl.c              |   9 +-
 libs/video/targets/vid_sdl.c                  | 244 +------
 libs/video/targets/vid_sdl_gl.c               | 178 +++++
 libs/video/targets/vid_sdl_sw.c               | 183 +++++
 libs/video/targets/vid_x11.c                  | 643 +-----------------
 libs/video/targets/vid_x11_gl.c               | 209 ++++++
 libs/video/targets/vid_x11_sw.c               | 542 +++++++++++++++
 libs/video/targets/vid_x11_vulkan.c           | 169 +++++
 41 files changed, 1576 insertions(+), 980 deletions(-)
 delete mode 100644 include/QF/Vulkan/funcs.h
 create mode 100644 include/vid_gl.h
 create mode 100644 include/vid_sw.h
 create mode 100644 include/vid_vulkan.h
 delete mode 100644 libs/video/renderer/vulkan/vulkan_funcs.c
 create mode 100644 libs/video/targets/vid_sdl_gl.c
 create mode 100644 libs/video/targets/vid_sdl_sw.c
 create mode 100644 libs/video/targets/vid_x11_gl.c
 create mode 100644 libs/video/targets/vid_x11_sw.c
 create mode 100644 libs/video/targets/vid_x11_vulkan.c

diff --git a/config.d/vulkan.m4 b/config.d/vulkan.m4
index c82900f58..4c9df43f4 100644
--- a/config.d/vulkan.m4
+++ b/config.d/vulkan.m4
@@ -9,16 +9,12 @@ if test "x$HAVE_VULKAN" != xno; then
 		LDFLAGS="$LDFLAGS -L$VULKAN_SDK/lib"
 		glslangvalidator="$VULKAN_SDK/bin/glslangValidator"
 	  ], [glslangvalidator="glslangValidator"])
-	AC_CHECK_HEADER(
-		[vulkan/vulkan.h],
-		dnl Make sure the library "works"
-		[AC_CHECK_LIB([vulkan], [vkCreateInstance],
-			[AC_DEFINE([HAVE_VULKAN], [1], [Define if yhou have the Vulkan libs])
-			 VULKAN_LIBS=-lvulkan],
-			[AC_MSG_RESULT(no)])
-		],
-		[AC_MSG_RESULT(no)]
-	)
+	AC_CHECK_HEADER([vulkan/vulkan.h], [HAVE_VULKAN=yes], [HAVE_VULKAN=no])
 	CPPFLAGS="$save_CPPFLAGS"
 fi
+if test "x$HAVE_VULKAN" = xyes; then
+	AC_DEFINE([HAVE_VULKAN], [1], [Define if yhou have the Vulkan libs])
+fi
 AC_SUBST(VULKAN_LIBS)
+
+AM_CONDITIONAL(X11_VULKAN, test "x$HAVE_VULKAN" = "xyes")
diff --git a/configure.ac b/configure.ac
index aaf6492ea..fe398b273 100644
--- a/configure.ac
+++ b/configure.ac
@@ -63,8 +63,8 @@ m4_include(config.d/compression.m4)
 m4_include(config.d/mgl.m4)
 m4_include(config.d/fbdev.m4)
 m4_include(config.d/svga.m4)
-m4_include(config.d/x11.m4)
 m4_include(config.d/vulkan.m4)
+m4_include(config.d/x11.m4)
 m4_include(config.d/sdl.m4)
 
 m4_include(config.d/curses.m4)
diff --git a/include/QF/Vulkan/cvars.h b/include/QF/Vulkan/cvars.h
index 9f318b8f0..b6110e353 100644
--- a/include/QF/Vulkan/cvars.h
+++ b/include/QF/Vulkan/cvars.h
@@ -1,7 +1,6 @@
 #ifndef __QF_Vulkan_cvars_h
 #define __QF_Vulkan_cvars_h
 
-extern struct cvar_s *vulkan_library_name;
 extern struct cvar_s *vulkan_use_validation;
 
 #endif//__QF_Vulkan_cvars_h
diff --git a/include/QF/Vulkan/funclist.h b/include/QF/Vulkan/funclist.h
index 2b755889e..79af14277 100644
--- a/include/QF/Vulkan/funclist.h
+++ b/include/QF/Vulkan/funclist.h
@@ -21,6 +21,16 @@ GLOBAL_LEVEL_VULKAN_FUNCTION (vkCreateInstance)
 #define INSTANCE_LEVEL_VULKAN_FUNCTION(function)
 #endif
 
+#if defined(VK_USE_PLATFORM_XLIB_KHR)
+INSTANCE_LEVEL_VULKAN_FUNCTION (vkGetPhysicalDeviceXlibPresentationSupportKHR)
+INSTANCE_LEVEL_VULKAN_FUNCTION (vkCreateXlibSurfaceKHR)
+#elif defined(VK_USE_PLATFORM_WIN32_KHR)
+INSTANCE_LEVEL_VULKAN_FUNCTION (vkGetPhysicalDeviceWin32PresentationSupportKHR)
+INSTANCE_LEVEL_VULKAN_FUNCTION (vkCreateWin32SurfaceKHR)
+#elif defined(VK_USE_PLATFORM_XCB_KHR)
+INSTANCE_LEVEL_VULKAN_FUNCTION (vkGetPhysicalDeviceXcbPresentationSupportKHR)
+INSTANCE_LEVEL_VULKAN_FUNCTION (vkCreateXcbSurfaceKHR)
+#else
 INSTANCE_LEVEL_VULKAN_FUNCTION (vkEnumeratePhysicalDevices)
 INSTANCE_LEVEL_VULKAN_FUNCTION (vkGetPhysicalDeviceProperties)
 INSTANCE_LEVEL_VULKAN_FUNCTION (vkGetPhysicalDeviceFeatures)
@@ -31,6 +41,7 @@ INSTANCE_LEVEL_VULKAN_FUNCTION (vkDestroyInstance)
 INSTANCE_LEVEL_VULKAN_FUNCTION (vkEnumerateDeviceLayerProperties)
 INSTANCE_LEVEL_VULKAN_FUNCTION (vkEnumerateDeviceExtensionProperties)
 INSTANCE_LEVEL_VULKAN_FUNCTION (vkGetPhysicalDeviceMemoryProperties)
+#endif
 
 #undef INSTANCE_LEVEL_VULKAN_FUNCTION
 
diff --git a/include/QF/Vulkan/funcs.h b/include/QF/Vulkan/funcs.h
deleted file mode 100644
index 975f5485b..000000000
--- a/include/QF/Vulkan/funcs.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef __QF_Vulkan_funcs_h
-#define __QF_Vulkan_funcs_h
-
-#define EXPORTED_VULKAN_FUNCTION(fname) extern PFN_##fname fname;
-#define GLOBAL_LEVEL_VULKAN_FUNCTION(fname) extern PFN_##fname fname;
-
-#include "QF/Vulkan/funclist.h"
-
-#endif//__QF_Vulkan_funcs_h
diff --git a/include/QF/Vulkan/init.h b/include/QF/Vulkan/init.h
index 4a97b82f8..85efb44e1 100644
--- a/include/QF/Vulkan/init.h
+++ b/include/QF/Vulkan/init.h
@@ -29,7 +29,6 @@
 #include <vulkan/vulkan.h>
 
 #include "QF/qtypes.h"
-#include "QF/Vulkan/funcs.h"
 
 typedef struct {
 	VkDevice device;
diff --git a/include/context_sdl.h b/include/context_sdl.h
index b097587f1..f6f1dbbe7 100644
--- a/include/context_sdl.h
+++ b/include/context_sdl.h
@@ -30,7 +30,19 @@
 #ifndef __context_sdl_h_
 #define __context_sdl_h_
 
+#include <SDL.h>
+
+extern SDL_Surface *sdl_screen;
+
 void VID_SDL_GammaCheck (void);
 void SDL_Init_Cvars (void);
 
+struct gl_ctx_s *SDL_GL_Context (void);
+void SDL_GL_Init_Cvars (void);
+
+struct sw_ctx_s *SDL_SW_Context (void);
+void SDL_SW_Init_Cvars (void);
+
+extern uint32_t sdl_flags;
+
 #endif	// __context_sdl_h_
diff --git a/include/context_x11.h b/include/context_x11.h
index b513e587a..884fafe9e 100644
--- a/include/context_x11.h
+++ b/include/context_x11.h
@@ -77,4 +77,13 @@ void X11_SaveMouseAcceleration (void);
 void X11_RemoveMouseAcceleration (void);
 void X11_RestoreMouseAcceleration (void);
 
+struct gl_ctx_s *X11_GL_Context (void);
+void X11_GL_Init_Cvars (void);
+
+struct sw_ctx_s *X11_SW_Context (void);
+void X11_SW_Init_Cvars (void);
+
+struct vulkan_ctx_s *X11_Vulkan_Context (void);
+void X11_Vulkan_Init_Cvars (void);
+
 #endif	// __context_x11_h_
diff --git a/include/r_cvar.h b/include/r_cvar.h
index 8383f4705..e8a85a679 100644
--- a/include/r_cvar.h
+++ b/include/r_cvar.h
@@ -16,7 +16,6 @@ extern quat_t crosshair_color;
 extern struct cvar_s     *d_mipcap;
 extern struct cvar_s     *d_mipscale;
 
-extern struct cvar_s     *gl_driver;
 extern struct cvar_s     *gl_affinemodels;
 extern struct cvar_s	 *gl_anisotropy;
 extern struct cvar_s     *gl_clear;
diff --git a/include/vid_gl.h b/include/vid_gl.h
new file mode 100644
index 000000000..2561af575
--- /dev/null
+++ b/include/vid_gl.h
@@ -0,0 +1,20 @@
+#ifndef __vid_gl_h
+#define __vid_gl_h
+
+// GLXContext is a pointer to opaque data
+typedef struct __GLXcontextRec *GLXContext;
+
+typedef struct gl_ctx_s {
+	GLXContext  context;
+	void        (*load_gl) (void);
+	void        (*choose_visual) (struct gl_ctx_s *ctx);
+	void        (*create_context) (struct gl_ctx_s *ctx);
+	void        (*init_gl) (void);
+	void        *(*get_proc_address) (const char *name, qboolean crit);
+	void        (*end_rendering) (void);
+} gl_ctx_t;
+
+extern gl_ctx_t *gl_ctx;
+extern gl_ctx_t *glsl_ctx;
+
+#endif//__vid_gl_h
diff --git a/include/vid_internal.h b/include/vid_internal.h
index fc1538202..e922508a4 100644
--- a/include/vid_internal.h
+++ b/include/vid_internal.h
@@ -11,11 +11,12 @@ typedef struct vid_internal_s {
 	void        (*do_screen_buffer) (void);
 	void        (*set_palette) (const byte *palette);
 
-	// gl stuff
-	void        (*load_gl) (void);
-	void        (*init_gl) (void);
-	void        *(*get_proc_address) (const char *name, qboolean crit);
-	void        (*end_rendering) (void);
+	void        (*choose_visual) (void);
+	void        (*create_context) (void);
+
+	struct gl_ctx_s *(*gl_context) (void);
+	struct sw_ctx_s *(*sw_context) (void);
+	struct vulkan_ctx_s *(*vulkan_context) (void);
 } vid_internal_t;
 
 extern struct cvar_s *vid_fullscreen;
@@ -30,11 +31,9 @@ void VID_InitGamma (unsigned char *);
 qboolean VID_SetGamma (double);
 void VID_UpdateGamma (struct cvar_s *);
 
-void VID_Update (vrect_t *rects);
 void VID_LockBuffer (void);
 void VID_UnlockBuffer (void);
 void VID_InitBuffers (void);
 void VID_MakeColormaps (void);
 
-
 #endif//__vid_internal_h
diff --git a/include/vid_sw.h b/include/vid_sw.h
new file mode 100644
index 000000000..2a5ab20a5
--- /dev/null
+++ b/include/vid_sw.h
@@ -0,0 +1,18 @@
+#ifndef __vid_sw_h
+#define __vid_sw_h
+
+// GLXContext is a pointer to opaque data
+typedef struct __GLXcontextRec *GLXContext;
+struct vrect_s;
+typedef struct sw_ctx_s {
+	GLXContext  context;
+	void        (*choose_visual) (struct sw_ctx_s *ctx);
+	void        (*create_context) (struct sw_ctx_s *ctx);
+	void        (*set_palette) (const byte *palette);
+	void        (*update) (struct vrect_s *rects);
+} sw_ctx_t;
+
+extern sw_ctx_t *sw_ctx;
+extern sw_ctx_t *sw32_ctx;
+
+#endif//__vid_sw_h
diff --git a/include/vid_vulkan.h b/include/vid_vulkan.h
new file mode 100644
index 000000000..627269cdb
--- /dev/null
+++ b/include/vid_vulkan.h
@@ -0,0 +1,29 @@
+#ifndef __vid_vulkan_h
+#define __vid_vulkan_h
+
+#ifndef VK_NO_PROTOTYPES
+#define VK_NO_PROTOTYPES
+#endif
+#include <vulkan/vulkan.h>
+
+typedef struct vulkan_ctx_s {
+	void        (*load_vulkan) (struct vulkan_ctx_s *ctx);
+	void        (*unload_vulkan) (struct vulkan_ctx_s *ctx);
+	void        (*init_vulkan) (void);
+
+	const char * const *required_extensions;
+	struct vulkan_presentation_s *presentation;
+	int (*get_presentation_support) (struct vulkan_ctx_s *ctx,
+									 VkPhysicalDevice physicalDevice,
+									 uint32_t queueFamilyIndex);
+	VkSurfaceKHR (*create_surface) (struct vulkan_ctx_s *ctx);
+	VkInstance  instance;
+	VkPhysicalDevice physicalDevice;
+#define EXPORTED_VULKAN_FUNCTION(fname) PFN_##fname fname;
+#define GLOBAL_LEVEL_VULKAN_FUNCTION(fname) PFN_##fname fname;
+#include "QF/Vulkan/funclist.h"
+} vulkan_ctx_t;
+
+extern vulkan_ctx_t *vulkan_ctx;
+
+#endif//__vid_vulkan_h
diff --git a/libs/video/renderer/gl/gl_rmisc.c b/libs/video/renderer/gl/gl_rmisc.c
index e054e37bf..a47e6ba42 100644
--- a/libs/video/renderer/gl/gl_rmisc.c
+++ b/libs/video/renderer/gl/gl_rmisc.c
@@ -64,7 +64,7 @@
 #include "mod_internal.h"
 #include "r_internal.h"
 #include "varrays.h"
-#include "vid_internal.h"
+#include "vid_gl.h"
 
 /*
 	R_Envmap_f
@@ -122,7 +122,7 @@ R_Envmap_f (void)
 	gl_envmap = false;
 	qfglDrawBuffer (GL_BACK);
 	qfglReadBuffer (GL_BACK);
-	vid.vid_internal->end_rendering ();
+	gl_ctx->end_rendering ();
 }
 
 void
@@ -250,13 +250,13 @@ gl_R_TimeRefresh_f (void)
 	double      start, stop, time;
 	int         i;
 
-	vid.vid_internal->end_rendering ();
+	gl_ctx->end_rendering ();
 
 	start = Sys_DoubleTime ();
 	for (i = 0; i < 128; i++) {
 		r_refdef.viewangles[1] = i * (360.0 / 128.0);
 		gl_R_RenderView ();
-		vid.vid_internal->end_rendering ();
+		gl_ctx->end_rendering ();
 	}
 
 	stop = Sys_DoubleTime ();
diff --git a/libs/video/renderer/gl/gl_screen.c b/libs/video/renderer/gl/gl_screen.c
index 73674e70c..fbe47106f 100644
--- a/libs/video/renderer/gl/gl_screen.c
+++ b/libs/video/renderer/gl/gl_screen.c
@@ -59,7 +59,7 @@
 #include "compat.h"
 #include "r_internal.h"
 #include "sbar.h"
-#include "vid_internal.h"
+#include "vid_gl.h"
 
 /* SCREEN SHOTS */
 
@@ -207,7 +207,7 @@ gl_SCR_UpdateScreen (double realtime, SCR_Func scr_3dfunc, SCR_Func *scr_funcs)
 		return;
 
 	if (begun)
-		vid.vid_internal->end_rendering ();
+		gl_ctx->end_rendering ();
 
 	vr_data.realtime = realtime;
 
@@ -264,7 +264,7 @@ gl_SCR_UpdateScreen (double realtime, SCR_Func scr_3dfunc, SCR_Func *scr_funcs)
 	qfglFlush ();
 
 	if (gl_finish->int_val) {
-		vid.vid_internal->end_rendering ();
+		gl_ctx->end_rendering ();
 		begun = 0;
 	}
 }
diff --git a/libs/video/renderer/gl/qfgl_ext.c b/libs/video/renderer/gl/qfgl_ext.c
index 41fe1f52b..f012726de 100644
--- a/libs/video/renderer/gl/qfgl_ext.c
+++ b/libs/video/renderer/gl/qfgl_ext.c
@@ -61,7 +61,7 @@
 #include "QF/GL/funcs.h"
 
 #include "r_internal.h"
-#include "vid_internal.h"
+#include "vid_gl.h"
 
 // First we need to get all the function pointers declared.
 #define QFGL_WANT(ret, name, args) \
@@ -76,9 +76,9 @@ qboolean
 GLF_FindFunctions (void)
 {
 #define QFGL_WANT(ret, name, args) \
-	qf##name = vid.vid_internal->get_proc_address (#name, false);
+	qf##name = gl_ctx->get_proc_address (#name, false);
 #define QFGL_NEED(ret, name, args) \
-	qf##name = vid.vid_internal->get_proc_address (#name, true);
+	qf##name = gl_ctx->get_proc_address (#name, true);
 #include "QF/GL/qf_funcs_list.h"
 #undef QFGL_NEED
 #undef QFGL_WANT
@@ -136,6 +136,6 @@ void *
 QFGL_ExtensionAddress (const char *name)
 {
 	if (name)
-		return vid.vid_internal->get_proc_address (name, false);
+		return gl_ctx->get_proc_address (name, false);
 	return NULL;
 }
diff --git a/libs/video/renderer/glsl/glsl_main.c b/libs/video/renderer/glsl/glsl_main.c
index 2bc60bdd4..32688b2ae 100644
--- a/libs/video/renderer/glsl/glsl_main.c
+++ b/libs/video/renderer/glsl/glsl_main.c
@@ -58,7 +58,7 @@
 
 #include "mod_internal.h"
 #include "r_internal.h"
-#include "vid_internal.h"
+#include "vid_gl.h"
 
 mat4_t glsl_projection;
 mat4_t glsl_view;
@@ -305,13 +305,13 @@ glsl_R_TimeRefresh_f (void)
 	double      start, stop, time;
 	int         i;
 
-	vid.vid_internal->end_rendering ();
+	glsl_ctx->end_rendering ();
 
 	start = Sys_DoubleTime ();
 	for (i = 0; i < 128; i++) {
 		r_refdef.viewangles[1] = i * (360.0 / 128.0);
 		glsl_R_RenderView ();
-		vid.vid_internal->end_rendering ();
+		glsl_ctx->end_rendering ();
 	}
 
 	stop = Sys_DoubleTime ();
diff --git a/libs/video/renderer/glsl/glsl_screen.c b/libs/video/renderer/glsl/glsl_screen.c
index ecdda6ec8..89276999d 100644
--- a/libs/video/renderer/glsl/glsl_screen.c
+++ b/libs/video/renderer/glsl/glsl_screen.c
@@ -60,7 +60,7 @@
 #include "QF/GLSL/qf_vid.h"
 
 #include "r_internal.h"
-#include "vid_internal.h"
+#include "vid_gl.h"
 
 /* Unknown renamed to GLErr_Unknown to solve conflict with winioctl.h */
 static unsigned int GLErr_InvalidEnum;
@@ -166,7 +166,7 @@ glsl_SCR_UpdateScreen (double realtime, SCR_Func scr_3dfunc,
 
 	if (begun) {
 		begun = 0;
-		vid.vid_internal->end_rendering ();
+		glsl_ctx->end_rendering ();
 	}
 
 	vr_data.realtime = realtime;
diff --git a/libs/video/renderer/glsl/qfglsl.c b/libs/video/renderer/glsl/qfglsl.c
index b4fd25662..0e48e9354 100644
--- a/libs/video/renderer/glsl/qfglsl.c
+++ b/libs/video/renderer/glsl/qfglsl.c
@@ -60,7 +60,7 @@
 #include "QF/GLSL/funcs.h"
 
 #include "r_internal.h"
-#include "vid_internal.h"
+#include "vid_gl.h"
 
 // First we need to get all the function pointers declared.
 #define QFGL_WANT(ret, name, args) \
@@ -75,9 +75,9 @@ qboolean
 EGLF_FindFunctions (void)
 {
 #define QFGL_WANT(ret, name, args) \
-	qfe##name = vid.vid_internal->get_proc_address (#name, false);
+	qfe##name = glsl_ctx->get_proc_address (#name, false);
 #define QFGL_NEED(ret, name, args) \
-	qfe##name = vid.vid_internal->get_proc_address (#name, true);
+	qfe##name = glsl_ctx->get_proc_address (#name, true);
 #include "QF/GLSL/qf_funcs_list.h"
 #undef QFGL_NEED
 #undef QFGL_WANT
diff --git a/libs/video/renderer/sw/screen.c b/libs/video/renderer/sw/screen.c
index d425f6549..5b69e7a0d 100644
--- a/libs/video/renderer/sw/screen.c
+++ b/libs/video/renderer/sw/screen.c
@@ -51,6 +51,7 @@
 #include "compat.h"
 #include "r_internal.h"
 #include "vid_internal.h"
+#include "vid_sw.h"
 
 /* SCREEN SHOTS */
 
@@ -263,5 +264,5 @@ SCR_UpdateScreen (double realtime, SCR_Func scr_3dfunc, SCR_Func *scr_funcs)
 		vrect.height = scr_vrect.height;
 		vrect.next = 0;
 	}
-	VID_Update (&vrect);
+	sw_ctx->update (&vrect);
 }
diff --git a/libs/video/renderer/sw/sw_rmisc.c b/libs/video/renderer/sw/sw_rmisc.c
index f30200ffa..b2272ff14 100644
--- a/libs/video/renderer/sw/sw_rmisc.c
+++ b/libs/video/renderer/sw/sw_rmisc.c
@@ -37,6 +37,7 @@
 #include "compat.h"
 #include "r_internal.h"
 #include "vid_internal.h"
+#include "vid_sw.h"
 
 
 static void
@@ -74,7 +75,7 @@ R_TimeRefresh_f (void)
 		vr.width = r_refdef.vrect.width;
 		vr.height = r_refdef.vrect.height;
 		vr.next = NULL;
-		VID_Update (&vr);
+		sw_ctx->update (&vr);
 	}
 	stop = Sys_DoubleTime ();
 	time = stop - start;
diff --git a/libs/video/renderer/sw32/screen.c b/libs/video/renderer/sw32/screen.c
index bcadb5c9b..e4779d8da 100644
--- a/libs/video/renderer/sw32/screen.c
+++ b/libs/video/renderer/sw32/screen.c
@@ -54,6 +54,7 @@
 #include "compat.h"
 #include "r_internal.h"
 #include "vid_internal.h"
+#include "vid_sw.h"
 
 /* SCREEN SHOTS */
 
@@ -221,5 +222,5 @@ sw32_SCR_UpdateScreen (double realtime, SCR_Func scr_3dfunc, SCR_Func *scr_funcs
 		vrect.height = scr_vrect.height;
 		vrect.next = 0;
 	}
-	VID_Update (&vrect);
+	sw32_ctx->update (&vrect);
 }
diff --git a/libs/video/renderer/sw32/sw32_rmisc.c b/libs/video/renderer/sw32/sw32_rmisc.c
index cb12395d3..1b329b54f 100644
--- a/libs/video/renderer/sw32/sw32_rmisc.c
+++ b/libs/video/renderer/sw32/sw32_rmisc.c
@@ -40,7 +40,7 @@
 #include "compat.h"
 #include "r_internal.h"
 #include "vid_internal.h"
-
+#include "vid_sw.h"
 
 static void
 R_CheckVariables (void)
@@ -77,7 +77,7 @@ sw32_R_TimeRefresh_f (void)
 		vr.width = r_refdef.vrect.width;
 		vr.height = r_refdef.vrect.height;
 		vr.next = NULL;
-		VID_Update (&vr);
+		sw32_ctx->update (&vr);
 	}
 	stop = Sys_DoubleTime ();
 	time = stop - start;
diff --git a/libs/video/renderer/vid_render_gl.c b/libs/video/renderer/vid_render_gl.c
index 91f4178b5..9085e751d 100644
--- a/libs/video/renderer/vid_render_gl.c
+++ b/libs/video/renderer/vid_render_gl.c
@@ -39,9 +39,12 @@
 #include "mod_internal.h"
 #include "r_internal.h"
 #include "vid_internal.h"
+#include "vid_gl.h"
 
 #include "gl/namehack.h"
 
+gl_ctx_t *gl_ctx;
+
 static vid_model_funcs_t model_funcs = {
 	gl_Mod_LoadExternalTextures,
 	gl_Mod_LoadLighting,
@@ -124,12 +127,29 @@ vid_render_funcs_t gl_vid_render_funcs = {
 	&model_funcs
 };
 
+static void
+gl_vid_render_choose_visual (void)
+{
+	gl_ctx->choose_visual (gl_ctx);
+}
+
+static void
+gl_vid_render_create_context (void)
+{
+	gl_ctx->create_context (gl_ctx);
+}
+
 static void
 gl_vid_render_init (void)
 {
+	gl_ctx = vr_data.vid->vid_internal->gl_context ();
+	gl_ctx->init_gl = GL_Init_Common;
+	gl_ctx->load_gl ();
+
 	vr_data.vid->vid_internal->set_palette = GL_SetPalette;
-	vr_data.vid->vid_internal->init_gl = GL_Init_Common;
-	vr_data.vid->vid_internal->load_gl ();
+	vr_data.vid->vid_internal->choose_visual = gl_vid_render_choose_visual;
+	vr_data.vid->vid_internal->create_context = gl_vid_render_create_context;
+
 	vr_funcs = &gl_vid_render_funcs;
 	m_funcs = &model_funcs;
 }
diff --git a/libs/video/renderer/vid_render_glsl.c b/libs/video/renderer/vid_render_glsl.c
index d1f380ae5..22de04ea3 100644
--- a/libs/video/renderer/vid_render_glsl.c
+++ b/libs/video/renderer/vid_render_glsl.c
@@ -39,9 +39,12 @@
 #include "mod_internal.h"
 #include "r_internal.h"
 #include "vid_internal.h"
+#include "vid_gl.h"
 
 #include "glsl/namehack.h"
 
+gl_ctx_t *glsl_ctx;
+
 static vid_model_funcs_t model_funcs = {
 	glsl_Mod_LoadExternalTextures,
 	glsl_Mod_LoadLighting,
@@ -124,12 +127,28 @@ vid_render_funcs_t glsl_vid_render_funcs = {
 	&model_funcs
 };
 
+static void
+glsl_vid_render_choose_visual (void)
+{
+	glsl_ctx->choose_visual (glsl_ctx);
+}
+
+static void
+glsl_vid_render_create_context (void)
+{
+	glsl_ctx->create_context (glsl_ctx);
+}
+
 static void
 glsl_vid_render_init (void)
 {
+	glsl_ctx = vr_data.vid->vid_internal->gl_context ();
+	glsl_ctx->init_gl = GLSL_Init_Common;
+	glsl_ctx->load_gl ();
+
 	vr_data.vid->vid_internal->set_palette = GLSL_SetPalette;
-	vr_data.vid->vid_internal->init_gl = GLSL_Init_Common;
-	vr_data.vid->vid_internal->load_gl ();
+	vr_data.vid->vid_internal->choose_visual = glsl_vid_render_choose_visual;
+	vr_data.vid->vid_internal->create_context = glsl_vid_render_create_context;
 	vr_funcs = &glsl_vid_render_funcs;
 	m_funcs = &model_funcs;
 }
diff --git a/libs/video/renderer/vid_render_sw.c b/libs/video/renderer/vid_render_sw.c
index 7c2485911..dcfb4abc7 100644
--- a/libs/video/renderer/vid_render_sw.c
+++ b/libs/video/renderer/vid_render_sw.c
@@ -1,5 +1,5 @@
 /*
-	vid_render_gl.c
+	vid_render_sw.c
 
 	SW version of the renderer
 
@@ -33,6 +33,10 @@
 
 #include "mod_internal.h"
 #include "r_internal.h"
+#include "vid_internal.h"
+#include "vid_sw.h"
+
+sw_ctx_t *sw_ctx;
 
 static vid_model_funcs_t model_funcs = {
 	sw_Mod_LoadExternalTextures,
@@ -116,9 +120,27 @@ vid_render_funcs_t sw_vid_render_funcs = {
 	&model_funcs
 };
 
+static void
+sw_vid_render_choose_visual (void)
+{
+    sw_ctx->choose_visual (sw_ctx);
+}
+
+static void
+sw_vid_render_create_context (void)
+{
+    sw_ctx->create_context (sw_ctx);
+}
+
 static void
 sw_vid_render_init (void)
 {
+	sw_ctx = vr_data.vid->vid_internal->sw_context ();
+
+	vr_data.vid->vid_internal->set_palette = sw_ctx->set_palette;
+	vr_data.vid->vid_internal->choose_visual = sw_vid_render_choose_visual;
+	vr_data.vid->vid_internal->create_context = sw_vid_render_create_context;
+
 	vr_funcs = &sw_vid_render_funcs;
 	m_funcs = &model_funcs;
 }
diff --git a/libs/video/renderer/vid_render_sw32.c b/libs/video/renderer/vid_render_sw32.c
index 40034c0dc..ed7414a85 100644
--- a/libs/video/renderer/vid_render_sw32.c
+++ b/libs/video/renderer/vid_render_sw32.c
@@ -36,9 +36,13 @@
 
 #include "mod_internal.h"
 #include "r_internal.h"
+#include "vid_internal.h"
+#include "vid_sw.h"
 
 #include "sw32/namehack.h"
 
+sw_ctx_t *sw32_ctx;
+
 static vid_model_funcs_t model_funcs = {
 	sw_Mod_LoadExternalTextures,
 	sw_Mod_LoadLighting,
@@ -121,9 +125,27 @@ vid_render_funcs_t sw32_vid_render_funcs = {
 	&model_funcs
 };
 
+static void
+sw32_vid_render_choose_visual (void)
+{
+    sw32_ctx->choose_visual (sw32_ctx);
+}
+
+static void
+sw32_vid_render_create_context (void)
+{
+    sw32_ctx->create_context (sw32_ctx);
+}
+
 static void
 sw32_vid_render_init (void)
 {
+	sw32_ctx = vr_data.vid->vid_internal->sw_context ();
+
+	vr_data.vid->vid_internal->set_palette = sw32_ctx->set_palette;
+	vr_data.vid->vid_internal->choose_visual = sw32_vid_render_choose_visual;
+	vr_data.vid->vid_internal->create_context = sw32_vid_render_create_context;
+
 	vr_funcs = &sw32_vid_render_funcs;
 	m_funcs = &model_funcs;
 }
diff --git a/libs/video/renderer/vid_render_vulkan.c b/libs/video/renderer/vid_render_vulkan.c
index c71264fcb..2a94f31cb 100644
--- a/libs/video/renderer/vid_render_vulkan.c
+++ b/libs/video/renderer/vid_render_vulkan.c
@@ -39,9 +39,12 @@
 #include "mod_internal.h"
 #include "r_internal.h"
 #include "vid_internal.h"
+#include "vid_vulkan.h"
 
 #include "vulkan/namehack.h"
 
+vulkan_ctx_t *vulkan_ctx;
+
 static vid_model_funcs_t model_funcs = {
 /*	vulkan_Mod_LoadExternalTextures,
 	vulkan_Mod_LoadLighting,
@@ -135,9 +138,11 @@ set_palette (const byte *palette)
 static void
 vulkan_vid_render_init (void)
 {
+	vulkan_ctx = vr_data.vid->vid_internal->vulkan_context ();
+	vulkan_ctx->init_vulkan = Vulkan_Init_Common;
+	vulkan_ctx->load_vulkan (vulkan_ctx);
+
 	vr_data.vid->vid_internal->set_palette = set_palette;
-	vr_data.vid->vid_internal->init_gl = Vulkan_Init_Common;
-	vr_data.vid->vid_internal->load_gl ();
 	vr_funcs = &vulkan_vid_render_funcs;
 	m_funcs = &model_funcs;
 }
diff --git a/libs/video/renderer/vulkan/Makefile.am b/libs/video/renderer/vulkan/Makefile.am
index 5d2f65d8e..e4102ec9d 100644
--- a/libs/video/renderer/vulkan/Makefile.am
+++ b/libs/video/renderer/vulkan/Makefile.am
@@ -1,12 +1,11 @@
 AUTOMAKE_OPTIONS= foreign
 
 AM_CFLAGS= @PREFER_PIC@
-AM_CPPFLAGS= -I$(top_srcdir)/include -DVK_NO_PROTOTYPES -DVK_USE_PLATFORM_XLIB_KHR
+AM_CPPFLAGS= -I$(top_srcdir)/include -DVK_NO_PROTOTYPES
 
 vulkan_src = \
 	init.c \
 	vulkan_draw.c \
-	vulkan_funcs.c \
 	vulkan_vid_common.c
 
 noinst_LTLIBRARIES=	libvulkan.la
diff --git a/libs/video/renderer/vulkan/init.c b/libs/video/renderer/vulkan/init.c
index 2c4fb7ca1..e3181fc07 100644
--- a/libs/video/renderer/vulkan/init.c
+++ b/libs/video/renderer/vulkan/init.c
@@ -43,7 +43,8 @@
 #include "QF/vid.h"
 #include "QF/Vulkan/init.h"
 
-cvar_t *vulkan_library_name;
+#include "vid_vulkan.h"
+
 cvar_t *vulkan_use_validation;
 
 static uint32_t numLayers;
@@ -78,9 +79,9 @@ get_instance_layers_and_extensions  (void)
 	VkLayerProperties *properties;
 	VkExtensionProperties *extensions;
 
-	vkEnumerateInstanceLayerProperties (&numLayers, 0);
+	vulkan_ctx->vkEnumerateInstanceLayerProperties (&numLayers, 0);
 	properties = malloc (numLayers * sizeof (VkLayerProperties));
-	vkEnumerateInstanceLayerProperties (&numLayers, properties);
+	vulkan_ctx->vkEnumerateInstanceLayerProperties (&numLayers, properties);
 	instanceLayerNames = (const char **) malloc ((numLayers + 1)
 												 * sizeof (const char **));
 	for (i = 0; i < numLayers; i++) {
@@ -88,9 +89,10 @@ get_instance_layers_and_extensions  (void)
 	}
 	instanceLayerNames[i] = 0;
 
-	vkEnumerateInstanceExtensionProperties (0, &numExtensions, 0);
+	vulkan_ctx->vkEnumerateInstanceExtensionProperties (0, &numExtensions, 0);
 	extensions = malloc (numExtensions * sizeof (VkLayerProperties));
-	vkEnumerateInstanceExtensionProperties (0, &numExtensions, extensions);
+	vulkan_ctx->vkEnumerateInstanceExtensionProperties (0, &numExtensions,
+														extensions);
 	instanceExtensionNames = (const char **) malloc ((numExtensions + 1)
 													 * sizeof (const char **));
 	for (i = 0; i < numExtensions; i++) {
@@ -278,15 +280,15 @@ static void
 load_instance_funcs (VulkanInstance_t *instance)
 {
 #define INSTANCE_LEVEL_VULKAN_FUNCTION(name) \
-	instance->name = (PFN_##name) vkGetInstanceProcAddr (instance->instance, \
-														 #name); \
+	instance->name = (PFN_##name) \
+		vulkan_ctx->vkGetInstanceProcAddr (instance->instance, #name); \
 	if (!instance->name) { \
 		Sys_Error ("Couldn't find instance level function %s", #name); \
 	}
 
 #define INSTANCE_LEVEL_VULKAN_FUNCTION_EXTENSION(name) \
-	instance->name = (PFN_##name) vkGetInstanceProcAddr (instance->instance,\
-														 #name); \
+	instance->name = (PFN_##name) \
+		vulkan_ctx->vkGetInstanceProcAddr (instance->instance, #name); \
 	if (!instance->name) { \
 		Sys_Printf ("Couldn't find instance level function %s", #name); \
 	}
@@ -344,7 +346,7 @@ Vulkan_CreateInstance (const char *appName, uint32_t appVersion,
 	createInfo.ppEnabledLayerNames = lay;
 	createInfo.ppEnabledExtensionNames = ext;
 
-	res = vkCreateInstance (&createInfo, 0, &instance);
+	res = vulkan_ctx->vkCreateInstance (&createInfo, 0, &instance);
 	if (res != VK_SUCCESS) {
 		Sys_Error ("unable to create vulkan instance\n");
 	}
diff --git a/libs/video/renderer/vulkan/vulkan_funcs.c b/libs/video/renderer/vulkan/vulkan_funcs.c
deleted file mode 100644
index 2d8f79c9a..000000000
--- a/libs/video/renderer/vulkan/vulkan_funcs.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <vulkan/vulkan.h>
-
-#define EXPORTED_VULKAN_FUNCTION(fname) PFN_##fname fname;
-#define GLOBAL_LEVEL_VULKAN_FUNCTION(fname) PFN_##fname fname;
-
-#include "QF/Vulkan/funclist.h"
diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c
index 9366799cb..98a4d3dc3 100644
--- a/libs/video/renderer/vulkan/vulkan_vid_common.c
+++ b/libs/video/renderer/vulkan/vulkan_vid_common.c
@@ -39,8 +39,6 @@
 # include <strings.h>
 #endif
 
-#include <dlfcn.h>
-
 #include "QF/cvar.h"
 #include "QF/dstring.h"
 #include "QF/input.h"
@@ -55,43 +53,14 @@
 #include "compat.h"
 #include "d_iface.h"
 #include "r_internal.h"
-
-static void *vulkan_library;
+#include "vid_vulkan.h"
 
 static VulkanInstance_t *vulkan_instance;
 static VulkanDevice_t *vulkan_device;
 
-static void
-load_vulkan_library (void)
-{
-	vulkan_library = dlopen (vulkan_library_name->string,
-							 RTLD_DEEPBIND | RTLD_NOW);
-	if (!vulkan_library) {
-		Sys_Error ("Couldn't load vulkan library %s: %s",
-				   vulkan_library_name->name, dlerror ());
-	}
-
-	#define EXPORTED_VULKAN_FUNCTION(name) \
-	name = (PFN_##name) dlsym (vulkan_library, #name); \
-	if (!name) { \
-		Sys_Error ("Couldn't find exported vulkan function %s", #name); \
-	}
-
-	#define GLOBAL_LEVEL_VULKAN_FUNCTION(name) \
-	name = (PFN_##name) vkGetInstanceProcAddr (0, #name); \
-	if (!name) { \
-		Sys_Error ("Couldn't find global-level function %s", #name); \
-	}
-
-	#include "QF/Vulkan/funclist.h"
-}
-
 void
 Vulkan_Init_Cvars ()
 {
-	vulkan_library_name = Cvar_Get ("vulkan_library", "libvulkan.so.1",
-									CVAR_ROM, 0,
-									"the name of the vulkan shared library");
 	vulkan_use_validation = Cvar_Get ("vulkan_use_validation", "1", CVAR_NONE,
 									  0,
 									  "enable LunarG Standard Validation "
@@ -101,7 +70,6 @@ Vulkan_Init_Cvars ()
 
 static const char *instance_extensions[] = {
 	VK_KHR_SURFACE_EXTENSION_NAME,
-	VK_KHR_XLIB_SURFACE_EXTENSION_NAME,
 	0,
 };
 
@@ -203,8 +171,6 @@ Vulkan_Init_Common (void)
 	Sys_Printf ("Vulkan_Init_Common\n");
 	Vulkan_Init_Cvars ();
 
-	load_vulkan_library ();
-
 	vulkan_instance = Vulkan_CreateInstance (PACKAGE_STRING, 0x000702ff, 0, instance_extensions);//FIXME version
 	vulkan_device = create_suitable_device (vulkan_instance);
 	if (!vulkan_device) {
@@ -227,6 +193,5 @@ Vulkan_Shutdown_Common (void)
 	}
 	Vulkan_DestroyInstance (vulkan_instance);
 	vulkan_instance = 0;
-	dlclose (vulkan_library);
-	vulkan_library = 0;
+	vulkan_ctx->unload_vulkan (vulkan_ctx);
 }
diff --git a/libs/video/targets/Makefile.am b/libs/video/targets/Makefile.am
index b883b676b..d7241f528 100644
--- a/libs/video/targets/Makefile.am
+++ b/libs/video/targets/Makefile.am
@@ -27,6 +27,15 @@ joy_src=      $(joy_null_src)
 endif
 endif
 
+x11_gl_src=vid_x11_gl.c
+x11_sw_src=vid_x11_sw.c
+x11_vulkan_src=vid_x11_vulkan.c
+if X11_VULKAN
+x11_src=      $(x11_gl_src) $(x11_sw_src) $(x11_vulkan_src)
+else
+x11_src=      $(x11_gl_src) $(x11_sw_src)
+endif
+
 js_libs=$(top_builddir)/libs/util/libQFutil.la
 
 libQFjs_la_LDFLAGS=		$(lib_ldflags)
@@ -41,15 +50,16 @@ libvid_common_la_SOURCES=	\
 libvid_common_la_CFLAGS=	@PREFER_NON_PIC@
 libvid_common_la_LDFLAGS=	@STATIC@
 
-libvid_x11_la_SOURCES=		in_x11.c context_x11.c dga_check.c
+libvid_x11_la_SOURCES=		in_x11.c context_x11.c dga_check.c $(x11_src)
 libvid_x11_la_CFLAGS=		@PREFER_NON_PIC@ $(X_CFLAGS)
 libvid_x11_la_LDFLAGS=		@STATIC@
+EXTRA_libvid_x11_la_SOURCES= $(x11_vulkan_src)
 
 libvid_svga_la_SOURCES=		in_svgalib.c
 libvid_svga_la_CFLAGS=		@PREFER_NON_PIC@ $(SVGA_CFLAGS)
 libvid_svga_la_LDFLAGS=		@STATIC@
 
-libvid_sdl_la_SOURCES=		in_sdl.c context_sdl.c
+libvid_sdl_la_SOURCES=		in_sdl.c context_sdl.c vid_sdl_gl.c vid_sdl_sw.c
 libvid_sdl_la_CFLAGS=		@PREFER_NON_PIC@ $(SDL_CFLAGS)
 libvid_sdl_la_LDFLAGS=		@STATIC@
 
diff --git a/libs/video/targets/context_sdl.c b/libs/video/targets/context_sdl.c
index 105d7e1f6..7426ea8f8 100644
--- a/libs/video/targets/context_sdl.c
+++ b/libs/video/targets/context_sdl.c
@@ -23,9 +23,6 @@
 
 cvar_t     *vid_bitdepth;
 
-extern SDL_Surface *screen;
-
-
 void
 VID_SDL_GammaCheck (void)
 {
@@ -67,9 +64,9 @@ VID_UpdateFullscreen (cvar_t *vid_fullscreen)
 {
 	if (!r_data || !viddef.initialized)
 		return;
-	if ((vid_fullscreen->int_val && !(screen->flags & SDL_FULLSCREEN))
-		|| (!vid_fullscreen->int_val && screen->flags & SDL_FULLSCREEN))
-		if (!SDL_WM_ToggleFullScreen (screen))
+	if ((vid_fullscreen->int_val && !(sdl_screen->flags & SDL_FULLSCREEN))
+		|| (!vid_fullscreen->int_val && sdl_screen->flags & SDL_FULLSCREEN))
+		if (!SDL_WM_ToggleFullScreen (sdl_screen))
 			Sys_Printf ("VID_UpdateFullscreen: error setting fullscreen\n");
 	IN_UpdateGrab (in_grab);
 }
diff --git a/libs/video/targets/vid_sdl.c b/libs/video/targets/vid_sdl.c
index 514b8020e..9b1938d30 100644
--- a/libs/video/targets/vid_sdl.c
+++ b/libs/video/targets/vid_sdl.c
@@ -58,190 +58,17 @@ HWND 		mainwindow;
 #define BASEWIDTH 320
 #define BASEHEIGHT 200
 
-byte       *VGA_pagebase;
-int         VGA_width, VGA_height, VGA_rowbytes, VGA_bufferrowbytes = 0;
-
-SDL_Surface *screen = NULL;
-
-// Define GLAPIENTRY to a useful value
-#ifndef GLAPIENTRY
-# ifdef _WIN32
-#  include <windows.h>
-#  define GLAPIENTRY WINAPI
-#  undef LoadImage
-# else
-#  ifdef APIENTRY
-#   define GLAPIENTRY APIENTRY
-#  else
-#   define GLAPIENTRY
-#  endif
-# endif
-#endif
+SDL_Surface *sdl_screen = NULL;
 
 static vid_internal_t vid_internal;
 
-static void (*set_vid_mode) (Uint32 flags);
-
-static void (GLAPIENTRY *qfglFinish) (void);
-static int use_gl_procaddress = 0;
-static cvar_t  *gl_driver;
-
-static byte cached_palette[256 * 3];
-static int update_palette;
-
-static void *
-QFGL_ProcAddress (const char *name, qboolean crit)
-{
-	void    *glfunc = NULL;
-
-	Sys_MaskPrintf (SYS_VID, "DEBUG: Finding symbol %s ... ", name);
-
-	glfunc = SDL_GL_GetProcAddress (name);
-	if (glfunc) {
-		Sys_MaskPrintf (SYS_VID, "found [%p]\n", glfunc);
-		return glfunc;
-	}
-	Sys_MaskPrintf (SYS_VID, "not found\n");
-
-	if (crit) {
-		if (strncmp ("fxMesa", name, 6) == 0) {
-			Sys_Printf ("This target requires a special version of Mesa with "
-						"support for Glide and SVGAlib.\n");
-			Sys_Printf ("If you are in X, try using a GLX or SGL target.\n");
-		}
-		Sys_Error ("Couldn't load critical OpenGL function %s, exiting...",
-				   name);
-	}
-	return NULL;
-}
-
-static void
-sdlgl_set_vid_mode (Uint32 flags)
-{
-	int         i, j;
-
-	flags |= SDL_OPENGL;
-
-	// Setup GL Attributes
-	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
-//	SDL_GL_SetAttribute (SDL_GL_STENCIL_SIZE, 0);	// Try for 0, 8
-//	SDL_GL_SetAttribute (SDL_GL_STEREO, 1);			// Someday...
-
-	for (i = 0; i < 5; i++) {
-		int k;
-		int color[5] = {32, 24, 16, 15, 0};
-		int rgba[5][4] = {
-			{8, 8, 8, 0},
-			{8, 8, 8, 8},
-			{5, 6, 5, 0},
-			{5, 5, 5, 0},
-			{5, 5, 5, 1},
-		};
-
-		SDL_GL_SetAttribute (SDL_GL_RED_SIZE, rgba[i][0]);
-		SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgba[i][1]);
-		SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, rgba[i][2]);
-		SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, rgba[i][3]);
-
-		for (j = 0; j < 5; j++) {
-			for (k = 32; k >= 16; k -= 8) {
-				SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, k);
-				if ((screen = SDL_SetVideoMode (viddef.width, viddef.height,
-												color[j], flags)))
-					goto success;
-			}
-		}
-	}
-
-	Sys_Error ("Couldn't set video mode: %s", SDL_GetError ());
-	SDL_Quit ();
-
-success:
-	viddef.numpages = 2;
-
-	viddef.vid_internal->init_gl ();
-}
-
-static void
-sdlgl_end_rendering (void)
-{
-	qfglFinish ();
-	SDL_GL_SwapBuffers ();
-}
-
-static void
-sdl_load_gl (void)
-{
-	viddef.vid_internal->get_proc_address = QFGL_ProcAddress;
-	viddef.vid_internal->end_rendering = sdlgl_end_rendering;
-	set_vid_mode = sdlgl_set_vid_mode;
-
-	if (SDL_GL_LoadLibrary (gl_driver->string) != 0)
-		Sys_Error ("Couldn't load OpenGL library %s!", gl_driver->string);
-
-	use_gl_procaddress = 1;
-
-	qfglFinish = QFGL_ProcAddress ("glFinish", true);
-}
-
-static void
-sdl_update_palette (const byte *palette)
-{
-	SDL_Color   colors[256];
-	int         i;
-
-	for (i = 0; i < 256; ++i) {
-		colors[i].r = *palette++;
-		colors[i].g = *palette++;
-		colors[i].b = *palette++;
-	}
-	SDL_SetColors (screen, colors, 0, 256);
-}
-
-static void
-VID_SetPalette (const byte *palette)
-{
-	if (memcmp (cached_palette, palette, sizeof (cached_palette))) {
-		memcpy (cached_palette, palette, sizeof (cached_palette));
-		update_palette = 1;
-	}
-}
-
-static void
-do_screen_buffer (void)
-{
-}
-
-static void
-sdl_set_vid_mode (Uint32 flags)
-{
-	// Initialize display
-	if (!(screen = SDL_SetVideoMode (viddef.width, viddef.height, 8, flags)))
-		Sys_Error ("VID: Couldn't set video mode: %s", SDL_GetError ());
-
-	// now know everything we need to know about the buffer
-	VGA_width = viddef.width;
-	VGA_height = viddef.height;
-	viddef.vid_internal->do_screen_buffer = do_screen_buffer;
-	VGA_pagebase = viddef.buffer = screen->pixels;
-	VGA_rowbytes = viddef.rowbytes = screen->pitch;
-	viddef.conbuffer = viddef.buffer;
-	viddef.conrowbytes = viddef.rowbytes;
-	viddef.direct = 0;
-
-	VID_InitBuffers ();		// allocate z buffer and surface cache
-}
+uint32_t    sdl_flags;
 
 void
 VID_Init (byte *palette, byte *colormap)
 {
-	Uint32      flags;
-
-	vid_internal.set_palette = VID_SetPalette;
-	vid_internal.load_gl = sdl_load_gl;
-
-	set_vid_mode = sdl_set_vid_mode;
-
+	vid_internal.gl_context = SDL_GL_Context;
+	vid_internal.sw_context = SDL_SW_Context;
 	// Load the SDL library
 	if (SDL_Init (SDL_INIT_VIDEO) < 0)
 		Sys_Error ("VID: Couldn't load SDL: %s", SDL_GetError ());
@@ -256,9 +83,9 @@ VID_Init (byte *palette, byte *colormap)
 	VID_GetWindowSize (BASEWIDTH, BASEHEIGHT);
 
 	// Set video width, height and flags
-	flags = (SDL_SWSURFACE | SDL_HWPALETTE);
+	sdl_flags = (SDL_SWSURFACE | SDL_HWPALETTE);
 	if (vid_fullscreen->int_val) {
-		flags |= SDL_FULLSCREEN;
+		sdl_flags |= SDL_FULLSCREEN;
 #ifndef _WIN32      // Don't annoy Mesa/3dfx folks
 		// doesn't hurt if not using a gl renderer
 		// FIXME: Maybe this could be put in a different spot, but I don't
@@ -270,11 +97,10 @@ VID_Init (byte *palette, byte *colormap)
 #endif
 	}
 
-	set_vid_mode (flags);
+	vid_internal.create_context ();
 
 	VID_SDL_GammaCheck ();
 	VID_InitGamma (palette);
-	viddef.vid_internal->set_palette (viddef.palette);
 
 	viddef.initialized = true;
 
@@ -296,46 +122,8 @@ void
 VID_Init_Cvars ()
 {
 	SDL_Init_Cvars ();
-	gl_driver = Cvar_Get ("gl_driver", GL_DRIVER, CVAR_ROM, NULL,
-						  "The OpenGL library to use. (path optional)");
-}
-
-void
-VID_Update (vrect_t *rects)
-{
-	static SDL_Rect *sdlrects;
-	static int  num_sdlrects;
-	int         i, n;
-	vrect_t    *rect;
-
-	if (update_palette) {
-		update_palette = 0;
-		sdl_update_palette (cached_palette);
-	}
-	// Two-pass system, since Quake doesn't do it the SDL way...
-
-	// First, count the number of rectangles
-	n = 0;
-	for (rect = rects; rect; rect = rect->next)
-		++n;
-
-	if (n > num_sdlrects) {
-		num_sdlrects = n;
-		sdlrects = realloc (sdlrects, n * sizeof (SDL_Rect));
-		if (!sdlrects)
-			Sys_Error ("Out of memory!");
-	}
-
-	// Second, copy them to SDL rectangles and update
-	i = 0;
-	for (rect = rects; rect; rect = rect->next) {
-		sdlrects[i].x = rect->x;
-		sdlrects[i].y = rect->y;
-		sdlrects[i].w = rect->width;
-		sdlrects[i].h = rect->height;
-		++i;
-	}
-	SDL_UpdateRects (screen, n, sdlrects);
+	SDL_GL_Init_Cvars ();
+	SDL_SW_Init_Cvars ();
 }
 
 void
@@ -343,14 +131,14 @@ D_BeginDirectRect (int x, int y, byte *pbitmap, int width, int height)
 {
 	Uint8      *offset;
 
-	if (!screen)
+	if (!sdl_screen)
 		return;
 	if (x < 0)
-		x = screen->w + x - 1;
-	offset = (Uint8 *) screen->pixels + y * screen->pitch + x;
+		x = sdl_screen->w + x - 1;
+	offset = (Uint8 *) sdl_screen->pixels + y * sdl_screen->pitch + x;
 	while (height--) {
 		memcpy (offset, pbitmap, width);
-		offset += screen->pitch;
+		offset += sdl_screen->pitch;
 		pbitmap += width;
 	}
 }
@@ -358,11 +146,11 @@ D_BeginDirectRect (int x, int y, byte *pbitmap, int width, int height)
 void
 D_EndDirectRect (int x, int y, int width, int height)
 {
-	if (!screen)
+	if (!sdl_screen)
 		return;
 	if (x < 0)
-		x = screen->w + x - 1;
-	SDL_UpdateRect (screen, x, y, width, height);
+		x = sdl_screen->w + x - 1;
+	SDL_UpdateRect (sdl_screen, x, y, width, height);
 }
 
 void
diff --git a/libs/video/targets/vid_sdl_gl.c b/libs/video/targets/vid_sdl_gl.c
new file mode 100644
index 000000000..829ca2860
--- /dev/null
+++ b/libs/video/targets/vid_sdl_gl.c
@@ -0,0 +1,178 @@
+/*
+	vid_sdl.c
+
+	Video driver for Sam Lantinga's Simple DirectMedia Layer
+
+	Copyright (C) 1996-1997  Id Software, Inc.
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+
+#include <stdlib.h>
+#include <SDL.h>
+
+#include "QF/console.h"
+#include "QF/cvar.h"
+#include "QF/qendian.h"
+#include "QF/sys.h"
+#include "QF/vid.h"
+
+#include "context_sdl.h"
+#include "d_iface.h"
+#include "vid_internal.h"
+#include "vid_gl.h"
+
+// Define GLAPIENTRY to a useful value
+#ifndef GLAPIENTRY
+# ifdef _WIN32
+#  include <windows.h>
+#  define GLAPIENTRY WINAPI
+#  undef LoadImage
+# else
+#  ifdef APIENTRY
+#   define GLAPIENTRY APIENTRY
+#  else
+#   define GLAPIENTRY
+#  endif
+# endif
+#endif
+
+static void (GLAPIENTRY *qfglFinish) (void);
+static int use_gl_procaddress = 0;
+static cvar_t  *gl_driver;
+
+static void *
+QFGL_ProcAddress (const char *name, qboolean crit)
+{
+	void    *glfunc = NULL;
+
+	Sys_MaskPrintf (SYS_VID, "DEBUG: Finding symbol %s ... ", name);
+
+	glfunc = SDL_GL_GetProcAddress (name);
+	if (glfunc) {
+		Sys_MaskPrintf (SYS_VID, "found [%p]\n", glfunc);
+		return glfunc;
+	}
+	Sys_MaskPrintf (SYS_VID, "not found\n");
+
+	if (crit) {
+		if (strncmp ("fxMesa", name, 6) == 0) {
+			Sys_Printf ("This target requires a special version of Mesa with "
+						"support for Glide and SVGAlib.\n");
+			Sys_Printf ("If you are in X, try using a GLX or SGL target.\n");
+		}
+		Sys_Error ("Couldn't load critical OpenGL function %s, exiting...",
+				   name);
+	}
+	return NULL;
+}
+
+static void
+sdlgl_set_vid_mode (gl_ctx_t *ctx)
+{
+	int         i, j;
+
+	sdl_flags |= SDL_OPENGL;
+
+	// Setup GL Attributes
+	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
+//	SDL_GL_SetAttribute (SDL_GL_STENCIL_SIZE, 0);	// Try for 0, 8
+//	SDL_GL_SetAttribute (SDL_GL_STEREO, 1);			// Someday...
+
+	for (i = 0; i < 5; i++) {
+		int k;
+		int color[5] = {32, 24, 16, 15, 0};
+		int rgba[5][4] = {
+			{8, 8, 8, 0},
+			{8, 8, 8, 8},
+			{5, 6, 5, 0},
+			{5, 5, 5, 0},
+			{5, 5, 5, 1},
+		};
+
+		SDL_GL_SetAttribute (SDL_GL_RED_SIZE, rgba[i][0]);
+		SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgba[i][1]);
+		SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, rgba[i][2]);
+		SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, rgba[i][3]);
+
+		for (j = 0; j < 5; j++) {
+			for (k = 32; k >= 16; k -= 8) {
+				SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, k);
+				if ((sdl_screen = SDL_SetVideoMode (viddef.width, viddef.height,
+													color[j], sdl_flags)))
+					goto success;
+			}
+		}
+	}
+
+	Sys_Error ("Couldn't set video mode: %s", SDL_GetError ());
+	SDL_Quit ();
+
+success:
+	viddef.numpages = 2;
+
+	ctx->init_gl ();
+}
+
+static void
+sdlgl_end_rendering (void)
+{
+	qfglFinish ();
+	SDL_GL_SwapBuffers ();
+}
+
+static void
+sdl_load_gl (void)
+{
+	if (SDL_GL_LoadLibrary (gl_driver->string) != 0)
+		Sys_Error ("Couldn't load OpenGL library %s!", gl_driver->string);
+
+	use_gl_procaddress = 1;
+
+	qfglFinish = QFGL_ProcAddress ("glFinish", true);
+}
+
+gl_ctx_t *
+SDL_GL_Context (void)
+{
+	gl_ctx_t *ctx = calloc (1, sizeof (gl_ctx_t));
+	ctx->load_gl = sdl_load_gl;
+	ctx->create_context = sdlgl_set_vid_mode;
+	ctx->get_proc_address = QFGL_ProcAddress;
+	ctx->end_rendering = sdlgl_end_rendering;
+	return ctx;
+}
+
+void
+SDL_GL_Init_Cvars ()
+{
+	gl_driver = Cvar_Get ("gl_driver", GL_DRIVER, CVAR_ROM, NULL,
+						  "The OpenGL library to use. (path optional)");
+}
diff --git a/libs/video/targets/vid_sdl_sw.c b/libs/video/targets/vid_sdl_sw.c
new file mode 100644
index 000000000..2d4f806d4
--- /dev/null
+++ b/libs/video/targets/vid_sdl_sw.c
@@ -0,0 +1,183 @@
+/*
+	vid_sdl.c
+
+	Video driver for Sam Lantinga's Simple DirectMedia Layer
+
+	Copyright (C) 1996-1997  Id Software, Inc.
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+
+#include <stdlib.h>
+#include <SDL.h>
+
+#include "QF/console.h"
+#include "QF/cvar.h"
+#include "QF/qendian.h"
+#include "QF/sys.h"
+#include "QF/vid.h"
+
+#include "context_sdl.h"
+#include "d_iface.h"
+#include "vid_internal.h"
+#include "vid_sw.h"
+
+#ifdef _WIN32	// FIXME: evil hack to get full DirectSound support with SDL
+#include <windows.h>
+#include <SDL_syswm.h>
+HWND 		mainwindow;
+#endif
+
+// The original defaults
+#define BASEWIDTH 320
+#define BASEHEIGHT 200
+
+byte       *VGA_pagebase;
+int         VGA_width, VGA_height, VGA_rowbytes, VGA_bufferrowbytes = 0;
+
+// Define GLAPIENTRY to a useful value
+#ifndef GLAPIENTRY
+# ifdef _WIN32
+#  include <windows.h>
+#  define GLAPIENTRY WINAPI
+#  undef LoadImage
+# else
+#  ifdef APIENTRY
+#   define GLAPIENTRY APIENTRY
+#  else
+#   define GLAPIENTRY
+#  endif
+# endif
+#endif
+
+static byte cached_palette[256 * 3];
+static int update_palette;
+
+static void
+sdl_update_palette (const byte *palette)
+{
+	SDL_Color   colors[256];
+	int         i;
+
+	for (i = 0; i < 256; ++i) {
+		colors[i].r = *palette++;
+		colors[i].g = *palette++;
+		colors[i].b = *palette++;
+	}
+	SDL_SetColors (sdl_screen, colors, 0, 256);
+}
+
+static void
+VID_SetPalette (const byte *palette)
+{
+	if (memcmp (cached_palette, palette, sizeof (cached_palette))) {
+		memcpy (cached_palette, palette, sizeof (cached_palette));
+		update_palette = 1;
+	}
+}
+
+static void
+do_screen_buffer (void)
+{
+}
+
+static void
+sdl_set_vid_mode (sw_ctx_t *ctx)
+{
+	// Initialize display
+	if (!(sdl_screen = SDL_SetVideoMode (viddef.width, viddef.height, 8,
+									 sdl_flags)))
+		Sys_Error ("VID: Couldn't set video mode: %s", SDL_GetError ());
+
+	// now know everything we need to know about the buffer
+	VGA_width = viddef.width;
+	VGA_height = viddef.height;
+	viddef.vid_internal->do_screen_buffer = do_screen_buffer;
+	VGA_pagebase = viddef.buffer = sdl_screen->pixels;
+	VGA_rowbytes = viddef.rowbytes = sdl_screen->pitch;
+	viddef.conbuffer = viddef.buffer;
+	viddef.conrowbytes = viddef.rowbytes;
+	viddef.direct = 0;
+
+	VID_InitBuffers ();		// allocate z buffer and surface cache
+}
+
+static void
+sdl_sw_update (vrect_t *rects)
+{
+	static SDL_Rect *sdlrects;
+	static int  num_sdlrects;
+	int         i, n;
+	vrect_t    *rect;
+
+	if (update_palette) {
+		update_palette = 0;
+		sdl_update_palette (cached_palette);
+	}
+	// Two-pass system, since Quake doesn't do it the SDL way...
+
+	// First, count the number of rectangles
+	n = 0;
+	for (rect = rects; rect; rect = rect->next)
+		++n;
+
+	if (n > num_sdlrects) {
+		num_sdlrects = n;
+		sdlrects = realloc (sdlrects, n * sizeof (SDL_Rect));
+		if (!sdlrects)
+			Sys_Error ("Out of memory!");
+	}
+
+	// Second, copy them to SDL rectangles and update
+	i = 0;
+	for (rect = rects; rect; rect = rect->next) {
+		sdlrects[i].x = rect->x;
+		sdlrects[i].y = rect->y;
+		sdlrects[i].w = rect->width;
+		sdlrects[i].h = rect->height;
+		++i;
+	}
+	SDL_UpdateRects (sdl_screen, n, sdlrects);
+}
+
+sw_ctx_t *
+SDL_SW_Context (void)
+{
+	sw_ctx_t *ctx = calloc (1, sizeof (sw_ctx_t));
+    ctx->set_palette = VID_SetPalette;
+    ctx->create_context = sdl_set_vid_mode;
+    ctx->update = sdl_sw_update;
+    return ctx;
+}
+
+void
+SDL_SW_Init_Cvars ()
+{
+}
diff --git a/libs/video/targets/vid_x11.c b/libs/video/targets/vid_x11.c
index bc4b4b6dc..946824547 100644
--- a/libs/video/targets/vid_x11.c
+++ b/libs/video/targets/vid_x11.c
@@ -44,21 +44,10 @@
 # include <unistd.h>
 #endif
 
-#include <ctype.h>
-#include <dlfcn.h>
-#include <errno.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/ipc.h>
-#include <sys/shm.h>
-#include <sys/time.h>
-#include <sys/types.h>
 #include <X11/Xatom.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/keysym.h>
-#include <X11/extensions/XShm.h>
 
 #ifdef HAVE_VIDMODE
 # include <X11/extensions/xf86vmode.h>
@@ -67,7 +56,6 @@
 #include "QF/cmd.h"
 #include "QF/console.h"
 #include "QF/cvar.h"
-#include "QF/qargs.h"
 #include "QF/qendian.h"
 #include "QF/screen.h"
 #include "QF/sys.h"
@@ -80,339 +68,9 @@
 #include "vid_internal.h"
 
 static vid_internal_t vid_internal;
-int XShmGetEventBase (Display *x);	// for broken X11 headers
-
-static GC		x_gc;
-
-static qboolean doShm;
-static XShmSegmentInfo x_shminfo[2];
-
-static int	current_framebuffer;
-static XImage *x_framebuffer[2] = { 0, 0 };
 
 int 		VID_options_items = 1;
 
-static byte current_palette[768];
-
-typedef unsigned char PIXEL8;
-typedef unsigned short PIXEL16;
-typedef unsigned int PIXEL24;
-
-static PIXEL16	st2d_8to16table[256];
-static PIXEL24	st2d_8to24table[256];
-static int		shiftmask_fl = 0;
-static long 	r_shift, g_shift, b_shift;
-static unsigned long r_mask, g_mask, b_mask;
-
-#define GLX_RGBA				4		// true if RGBA mode
-#define GLX_DOUBLEBUFFER		5		// double buffering supported
-#define GLX_RED_SIZE			8		// number of red component bits
-#define GLX_GREEN_SIZE			9		// number of green component bits
-#define GLX_BLUE_SIZE			10		// number of blue component bits
-#define GLX_DEPTH_SIZE			12		// number of depth bits
-
-// GLXContext is a pointer to opaque data
-typedef struct __GLXcontextRec *GLXContext;
-typedef XID GLXDrawable;
-
-// Define GLAPIENTRY to a useful value
-#ifndef GLAPIENTRY
-# ifdef _WIN32
-#  include <windows.h>
-#  define GLAPIENTRY WINAPI
-#  undef LoadImage
-# else
-#  ifdef APIENTRY
-#   define GLAPIENTRY APIENTRY
-#  else
-#   define GLAPIENTRY
-#  endif
-# endif
-#endif
-static GLXContext ctx = NULL;
-static void    *libgl_handle;
-static void (*qfglXSwapBuffers) (Display *dpy, GLXDrawable drawable);
-static XVisualInfo* (*qfglXChooseVisual) (Display *dpy, int screen,
-										  int *attribList);
-static GLXContext (*qfglXCreateContext) (Display *dpy, XVisualInfo *vis,
-										 GLXContext shareList, Bool direct);
-static Bool (*qfglXMakeCurrent) (Display *dpy, GLXDrawable drawable,
-								 GLXContext ctx);
-static void (GLAPIENTRY *qfglFinish) (void);
-static void *(*glGetProcAddress) (const char *symbol) = NULL;
-static int use_gl_procaddress = 0;
-static cvar_t  *gl_driver;
-
-static void (*choose_visual) (void);
-static void (*create_context) (void);
-
-static void *
-QFGL_GetProcAddress (void *handle, const char *name)
-{
-	void       *glfunc = NULL;
-
-	if (use_gl_procaddress && glGetProcAddress)
-		glfunc = glGetProcAddress (name);
-	if (!glfunc)
-		glfunc = dlsym (handle, name);
-	return glfunc;
-}
-
-static void *
-QFGL_ProcAddress (const char *name, qboolean crit)
-{
-	void    *glfunc = NULL;
-
-	Sys_MaskPrintf (SYS_VID, "DEBUG: Finding symbol %s ... ", name);
-
-	glfunc = QFGL_GetProcAddress (libgl_handle, name);
-	if (glfunc) {
-		Sys_MaskPrintf (SYS_VID, "found [%p]\n", glfunc);
-		return glfunc;
-	}
-	Sys_MaskPrintf (SYS_VID, "not found\n");
-
-	if (crit) {
-		if (strncmp ("fxMesa", name, 6) == 0) {
-			Sys_Printf ("This target requires a special version of Mesa with "
-						"support for Glide and SVGAlib.\n");
-			Sys_Printf ("If you are in X, try using a GLX or SGL target.\n");
-		}
-		Sys_Error ("Couldn't load critical OpenGL function %s, exiting...",
-				   name);
-	}
-	return NULL;
-}
-
-static void
-glx_choose_visual (void)
-{
-	int         attrib[] = {
-		GLX_RGBA,
-		GLX_RED_SIZE, 1,
-		GLX_GREEN_SIZE, 1,
-		GLX_BLUE_SIZE, 1,
-		GLX_DOUBLEBUFFER,
-		GLX_DEPTH_SIZE, 1,
-		None
-	};
-
-	x_visinfo = qfglXChooseVisual (x_disp, x_screen, attrib);
-	if (!x_visinfo) {
-		Sys_Error ("Error couldn't get an RGB, Double-buffered, Depth visual");
-	}
-	x_vis = x_visinfo->visual;
-}
-
-static void
-glx_create_context (void)
-{
-	XSync (x_disp, 0);
-	ctx = qfglXCreateContext (x_disp, x_visinfo, NULL, True);
-	qfglXMakeCurrent (x_disp, x_win, ctx);
-	viddef.vid_internal->init_gl ();
-}
-
-static void
-glx_end_rendering (void)
-{
-	qfglFinish ();
-	qfglXSwapBuffers (x_disp, x_win);
-}
-
-static void
-glx_load_gl (void)
-{
-	int          flags = RTLD_NOW;
-
-	choose_visual = glx_choose_visual;
-	create_context = glx_create_context;
-
-	viddef.vid_internal->get_proc_address = QFGL_ProcAddress;
-	viddef.vid_internal->end_rendering = glx_end_rendering;
-
-#ifdef RTLD_GLOBAL
-	flags |= RTLD_GLOBAL;
-#endif
-	if (!(libgl_handle = dlopen (gl_driver->string, flags))) {
-		Sys_Error ("Couldn't load OpenGL library %s: %s", gl_driver->string,
-				   dlerror ());
-	}
-	glGetProcAddress = dlsym (libgl_handle, "glXGetProcAddress");
-	if (!glGetProcAddress)
-		glGetProcAddress = dlsym (libgl_handle, "glXGetProcAddressARB");
-
-	qfglXSwapBuffers = QFGL_ProcAddress ("glXSwapBuffers", true);
-	qfglXChooseVisual = QFGL_ProcAddress ("glXChooseVisual", true);
-	qfglXCreateContext = QFGL_ProcAddress ("glXCreateContext", true);
-	qfglXMakeCurrent = QFGL_ProcAddress ("glXMakeCurrent", true);
-
-	use_gl_procaddress = 1;
-
-	qfglFinish = QFGL_ProcAddress ("glFinish", true);
-}
-
-static void
-shiftmask_init (void)
-{
-	unsigned long long x;
-
-	r_mask = x_vis->red_mask;
-	g_mask = x_vis->green_mask;
-	b_mask = x_vis->blue_mask;
-
-	for (r_shift = -8, x = 1; x < r_mask; x <<= 1)
-		r_shift++;
-	for (g_shift = -8, x = 1; x < g_mask; x <<= 1)
-		g_shift++;
-	for (b_shift = -8, x = 1; x < b_mask; x <<= 1)
-		b_shift++;
-	shiftmask_fl = 1;
-}
-
-static PIXEL16
-xlib_rgb16 (int r, int g, int b)
-{
-	PIXEL16 	p = 0;
-
-	if (!shiftmask_fl)
-		shiftmask_init ();
-
-	if (r_shift > 0) {
-		p = (r << (r_shift)) & r_mask;
-	} else {
-		if (r_shift < 0) {
-			p = (r >> (-r_shift)) & r_mask;
-		} else {
-			p |= (r & r_mask);
-		}
-	}
-
-	if (g_shift > 0) {
-		p |= (g << (g_shift)) & g_mask;
-	} else {
-		if (g_shift < 0) {
-			p |= (g >> (-g_shift)) & g_mask;
-		} else {
-			p |= (g & g_mask);
-		}
-	}
-
-	if (b_shift > 0) {
-		p |= (b << (b_shift)) & b_mask;
-	} else {
-		if (b_shift < 0) {
-			p |= (b >> (-b_shift)) & b_mask;
-		} else {
-			p |= (b & b_mask);
-		}
-	}
-
-	return p;
-}
-
-static PIXEL24
-xlib_rgb24 (int r, int g, int b)
-{
-	PIXEL24 	p = 0;
-
-	if (!shiftmask_fl)
-		shiftmask_init ();
-
-	if (r_shift > 0) {
-		p = (r << (r_shift)) & r_mask;
-	} else {
-		if (r_shift < 0) {
-			p = (r >> (-r_shift)) & r_mask;
-		} else {
-			p |= (r & r_mask);
-		}
-	}
-
-	if (g_shift > 0) {
-		p |= (g << (g_shift)) & g_mask;
-	} else {
-		if (g_shift < 0) {
-			p |= (g >> (-g_shift)) & g_mask;
-		} else {
-			p |= (g & g_mask);
-		}
-	}
-
-	if (b_shift > 0) {
-		p |= (b << (b_shift)) & b_mask;
-	} else {
-		if (b_shift < 0) {
-			p |= (b >> (-b_shift)) & b_mask;
-		} else {
-			p |= (b & b_mask);
-		}
-	}
-
-	return p;
-}
-
-static void
-st2_fixup (XImage *framebuf, int x, int y, int width, int height)
-{
-	int 		xi, yi;
-	unsigned char *src;
-	PIXEL16 	*dest;
-
-	if (x < 0 || y < 0)
-		return;
-
-	for (yi = y; yi < (y + height); yi++) {
-		src = &((byte *)viddef.buffer)[yi * viddef.width];
-		dest = (PIXEL16 *) &framebuf->data[yi * framebuf->bytes_per_line];
-		for (xi = x; xi < x + width; xi++) {
-			dest[xi] = st2d_8to16table[src[xi]];
-		}
-	}
-}
-
-static void
-st3_fixup (XImage * framebuf, int x, int y, int width, int height)
-{
-	int 		yi;
-	unsigned char *src;
-	PIXEL24 	*dest;
-	register int count, n;
-
-	if (x < 0 || y < 0)
-		return;
-
-	for (yi = y; yi < (y + height); yi++) {
-		src = &((byte *)viddef.buffer)[yi * viddef.width + x];
-		dest = (PIXEL24 *) &framebuf->data[yi * framebuf->bytes_per_line + x];
-
-		// Duff's Device
-		count = width;
-		n = (count + 7) / 8;
-
-		switch (count % 8) {
-			case 0:
-				do {
-					*dest++ = st2d_8to24table[*src++];
-			case 7:
-					*dest++ = st2d_8to24table[*src++];
-			case 6:
-					*dest++ = st2d_8to24table[*src++];
-			case 5:
-					*dest++ = st2d_8to24table[*src++];
-			case 4:
-					*dest++ = st2d_8to24table[*src++];
-			case 3:
-					*dest++ = st2d_8to24table[*src++];
-			case 2:
-					*dest++ = st2d_8to24table[*src++];
-			case 1:
-					*dest++ = st2d_8to24table[*src++];
-				} while (--n > 0);
-		}
-	}
-}
-
 void
 D_BeginDirectRect (int x, int y, byte *pbitmap, int width, int height)
 {
@@ -425,240 +83,6 @@ D_EndDirectRect (int x, int y, int width, int height)
 // direct drawing of the "accessing disk" icon isn't supported
 }
 
-static void
-ResetFrameBuffer (void)
-{
-	int         mem, pwidth;
-	char       *buf;
-
-	if (x_framebuffer[0]) {
-		XDestroyImage (x_framebuffer[0]);
-	}
-
-	pwidth = x_visinfo->depth / 8;
-
-	if (pwidth == 3)
-		pwidth = 4;
-	mem = ((viddef.width * pwidth + 7) & ~7) * viddef.height;
-	buf = malloc (mem);
-	SYS_CHECKMEM (buf);
-
-	// allocate new screen buffer
-	x_framebuffer[0] = XCreateImage (x_disp, x_vis, x_visinfo->depth,
-									 ZPixmap, 0, buf, viddef.width,
-									 viddef.height, 32, 0);
-
-	if (!x_framebuffer[0]) {
-		Sys_Error ("VID: XCreateImage failed");
-	}
-}
-
-static void
-ResetSharedFrameBuffers (void)
-{
-	int 	size;
-	int 	key;
-	int 	minsize = getpagesize ();
-	int 	frm;
-
-	for (frm = 0; frm < 2; frm++) {
-
-		// free up old frame buffer memory
-		if (x_framebuffer[frm]) {
-			XShmDetach (x_disp, &x_shminfo[frm]);
-			free (x_framebuffer[frm]);
-			shmdt (x_shminfo[frm].shmaddr);
-		}
-		// create the image
-		x_framebuffer[frm] = XShmCreateImage (x_disp, x_vis, x_visinfo->depth,
-											  ZPixmap, 0, &x_shminfo[frm],
-											  viddef.width, viddef.height);
-
-		// grab shared memory
-		size = x_framebuffer[frm]->bytes_per_line * x_framebuffer[frm]->height;
-
-		if (size < minsize)
-			Sys_Error ("VID: Window must use at least %d bytes", minsize);
-
-		key = random ();
-		x_shminfo[frm].shmid = shmget ((key_t) key, size, IPC_CREAT | 0777);
-		if (x_shminfo[frm].shmid == -1)
-			Sys_Error ("VID: Could not get any shared memory (%s)",
-					   strerror (errno));
-
-		// attach to the shared memory segment
-		x_shminfo[frm].shmaddr = (void *) shmat (x_shminfo[frm].shmid, 0, 0);
-
-		Sys_MaskPrintf (SYS_VID, "VID: shared memory id=%d, addr=0x%lx\n",
-						x_shminfo[frm].shmid, (long) x_shminfo[frm].shmaddr);
-
-		x_framebuffer[frm]->data = x_shminfo[frm].shmaddr;
-
-		// get the X server to attach to it
-		if (!XShmAttach (x_disp, &x_shminfo[frm]))
-			Sys_Error ("VID: XShmAttach() failed");
-		XSync (x_disp, 0);
-		shmctl (x_shminfo[frm].shmid, IPC_RMID, 0);
-
-	}
-}
-
-static void
-x11_init_buffers (void)
-{
-	if (doShm)
-		ResetSharedFrameBuffers ();
-	else
-		ResetFrameBuffer ();
-
-	current_framebuffer = 0;
-
-	viddef.direct = 0;
-	viddef.rowbytes = viddef.width;
-	if (x_visinfo->depth != 8) {
-		if (viddef.buffer)
-			free (viddef.buffer);
-		viddef.buffer = calloc (viddef.width, viddef.height);
-		if (!viddef.buffer)
-			Sys_Error ("Not enough memory for video mode");
-	} else {
-		viddef.buffer = x_framebuffer[current_framebuffer]->data;
-	}
-	viddef.conbuffer = viddef.buffer;
-
-	viddef.conrowbytes = viddef.rowbytes;
-}
-
-static void
-x11_choose_visual (void)
-{
-	int         pnum, i;
-	XVisualInfo template;
-	int         num_visuals;
-	int         template_mask;
-
-	// specify a visual id
-	if ((pnum = COM_CheckParm ("-visualid"))) {
-		if (pnum >= com_argc - 1)
-			Sys_Error ("VID: -visualid <id#>");
-		template.visualid = atoi (com_argv[pnum + 1]);
-		template_mask = VisualIDMask;
-	} else {							// If not specified, use default
-										// visual
-		template.visualid =
-			XVisualIDFromVisual (XDefaultVisual (x_disp, x_screen));
-		template_mask = VisualIDMask;
-	}
-
-	// pick a visual -- warn if more than one was available
-	x_visinfo = XGetVisualInfo (x_disp, template_mask, &template,
-								&num_visuals);
-
-	if (x_visinfo->depth == 8 && x_visinfo->class == PseudoColor)
-		x_cmap = XCreateColormap (x_disp, x_win, x_vis, AllocAll);
-	x_vis = x_visinfo->visual;
-
-	if (num_visuals > 1) {
-		Sys_MaskPrintf (SYS_VID,
-						"Found more than one visual id at depth %d:\n",
-						template.depth);
-		for (i = 0; i < num_visuals; i++)
-			Sys_MaskPrintf (SYS_VID, "    -visualid %d\n",
-							(int) x_visinfo[i].visualid);
-	} else {
-		if (num_visuals == 0) {
-			if (template_mask == VisualIDMask) {
-				Sys_Error ("VID: Bad visual ID %ld", template.visualid);
-			} else {
-				Sys_Error ("VID: No visuals at depth %d", template.depth);
-			}
-		}
-	}
-
-	Sys_MaskPrintf (SYS_VID, "Using visualid %d:\n",
-					(int) x_visinfo->visualid);
-	Sys_MaskPrintf (SYS_VID, "    class %d\n", x_visinfo->class);
-	Sys_MaskPrintf (SYS_VID, "    screen %d\n", x_visinfo->screen);
-	Sys_MaskPrintf (SYS_VID, "    depth %d\n", x_visinfo->depth);
-	Sys_MaskPrintf (SYS_VID, "    red_mask 0x%x\n",
-					(int) x_visinfo->red_mask);
-	Sys_MaskPrintf (SYS_VID, "    green_mask 0x%x\n",
-					(int) x_visinfo->green_mask);
-	Sys_MaskPrintf (SYS_VID, "    blue_mask 0x%x\n",
-					(int) x_visinfo->blue_mask);
-	Sys_MaskPrintf (SYS_VID, "    colormap_size %d\n",
-					x_visinfo->colormap_size);
-	Sys_MaskPrintf (SYS_VID, "    bits_per_rgb %d\n",
-					x_visinfo->bits_per_rgb);
-}
-
-static void
-x11_create_context (void)
-{
-	// create the GC
-	{
-		XGCValues   xgcvalues;
-		int         valuemask = GCGraphicsExposures;
-
-		xgcvalues.graphics_exposures = False;
-		x_gc = XCreateGC (x_disp, x_win, valuemask, &xgcvalues);
-	}
-
-	// even if MITSHM is available, make sure it's a local connection
-	if (XShmQueryExtension (x_disp)) {
-		char       *displayname;
-		char       *d;
-
-		doShm = true;
-
-		if ((displayname = XDisplayName (NULL))) {
-			if ((d = strchr (displayname, ':')))
-				*d = '\0';
-
-			if (!(!strcasecmp (displayname, "unix") || !*displayname))
-				doShm = false;
-		}
-	}
-
-	if (doShm) {
-		x_shmeventtype = XShmGetEventBase (x_disp) + ShmCompletion;
-	}
-
-	viddef.vid_internal->do_screen_buffer = x11_init_buffers;
-	VID_InitBuffers ();
-
-//  XSynchronize (x_disp, False);
-//	X11_AddEvent (x_shmeventtype, event_shm);
-}
-
-static void
-VID_SetPalette (const byte *palette)
-{
-	int         i;
-	XColor      colors[256];
-
-	for (i = 0; i < 256; i++) {
-		st2d_8to16table[i] = xlib_rgb16 (palette[i * 3], palette[i * 3 + 1],
-										 palette[i * 3 + 2]);
-		st2d_8to24table[i] = xlib_rgb24 (palette[i * 3], palette[i * 3 + 1],
-										 palette[i * 3 + 2]);
-	}
-
-	if (x_visinfo->class == PseudoColor && x_visinfo->depth == 8) {
-		if (palette != current_palette) {
-			memcpy (current_palette, palette, 768);
-		}
-		for (i = 0; i < 256; i++) {
-			colors[i].pixel = i;
-			colors[i].flags = DoRed | DoGreen | DoBlue;
-			colors[i].red = palette[(i * 3)] << 8;
-			colors[i].green = palette[(i * 3) + 1] << 8;
-			colors[i].blue = palette[(i * 3) + 2] << 8;
-		}
-		XStoreColors (x_disp, x_cmap, colors, 256);
-	}
-}
-
 /*
 	Set up color translation tables and the window.  Takes a 256-color 8-bit
 	palette.  Palette data will go away after the call, so copy it if you'll
@@ -667,11 +91,11 @@ VID_SetPalette (const byte *palette)
 void
 VID_Init (byte *palette, byte *colormap)
 {
-	vid_internal.load_gl = glx_load_gl;
-	vid_internal.set_palette = VID_SetPalette;
-
-	choose_visual = x11_choose_visual;
-	create_context = x11_create_context;
+	vid_internal.gl_context = X11_GL_Context;
+	vid_internal.sw_context = X11_SW_Context;
+#ifdef HAVE_VULKAN
+	vid_internal.vulkan_context = X11_Vulkan_Context;
+#endif
 
 	R_LoadModule (&vid_internal);
 
@@ -683,11 +107,11 @@ VID_Init (byte *palette, byte *colormap)
 
 	VID_GetWindowSize (320, 200);
 	X11_OpenDisplay ();
-	choose_visual ();
+	vid_internal.choose_visual ();
 	X11_SetVidMode (viddef.width, viddef.height);
 	X11_CreateWindow (viddef.width, viddef.height);
 	X11_CreateNullCursor ();	// hide mouse pointer
-	create_context ();
+	vid_internal.create_context ();
 
 	VID_InitGamma (palette);
 	viddef.vid_internal->set_palette (viddef.palette);
@@ -703,8 +127,10 @@ void
 VID_Init_Cvars ()
 {
 	X11_Init_Cvars ();
-	gl_driver = Cvar_Get ("gl_driver", GL_DRIVER, CVAR_ROM, NULL,
-						  "The OpenGL library to use. (path optional)");
+#ifdef HAVE_VULKAN
+	X11_Vulkan_Init_Cvars ();
+#endif
+	X11_GL_Init_Cvars ();
 }
 
 /*
@@ -719,17 +145,13 @@ VID_Shutdown (void)
 	X11_CloseDisplay ();
 }
 
+#if 0
 static int  config_notify = 0;
 static int  config_notify_width;
 static int  config_notify_height;
 
-/*
-	VID_Update
-
-	Flush the given rectangles from the view buffer to the screen.
-*/
-void
-VID_Update (vrect_t *rects)
+static void
+update ()
 {
 	/* If the window changes dimension, skip this frame. */
 	if (config_notify) {
@@ -744,43 +166,8 @@ VID_Update (vrect_t *rects)
 		Con_CheckResize ();
 		return;
 	}
-
-	while (rects) {
-		switch (x_visinfo->depth) {
-			case 16:
-				st2_fixup (x_framebuffer[current_framebuffer],
-						   rects->x, rects->y, rects->width, rects->height);
-				break;
-			case 24:
-				st3_fixup (x_framebuffer[current_framebuffer],
-						   rects->x, rects->y, rects->width, rects->height);
-				break;
-		}
-		if (doShm) {
-			if (!XShmPutImage (x_disp, x_win, x_gc,
-							   x_framebuffer[current_framebuffer],
-							   rects->x, rects->y, rects->x, rects->y,
-							   rects->width, rects->height, True)) {
-				Sys_Error ("VID_Update: XShmPutImage failed");
-			}
-			oktodraw = false;
-			while (!oktodraw)
-				X11_ProcessEvent ();
-			rects = rects->next;
-
-			current_framebuffer = !current_framebuffer;
-		} else {
-			if (XPutImage (x_disp, x_win, x_gc, x_framebuffer[0],
-							rects->x, rects->y, rects->x, rects->y,
-							rects->width, rects->height)) {
-				Sys_Error ("VID_Update: XPutImage failed");
-			}
-			rects = rects->next;
-		}
-	}
-	XSync (x_disp, False);
-	r_data->scr_fullupdate = 0;
 }
+#endif
 
 void
 VID_LockBuffer (void)
diff --git a/libs/video/targets/vid_x11_gl.c b/libs/video/targets/vid_x11_gl.c
new file mode 100644
index 000000000..28b2f3294
--- /dev/null
+++ b/libs/video/targets/vid_x11_gl.c
@@ -0,0 +1,209 @@
+/*
+	vid_x11_gl.c
+
+	GLX X11 video driver
+
+	Copyright (C) 1996-1997  Id Software, Inc.
+	Copyright (C) 1999-2000  contributors of the QuakeForge project
+	Copyright (C) 2000       Marcus Sundberg [mackan@stacken.kth.se]
+	Copyright (C) 1999,2000  contributors of the QuakeForge project
+	Please see the file "AUTHORS" for a list of contributors
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
+#include <dlfcn.h>
+#include <stdlib.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+
+#include "QF/cvar.h"
+#include "QF/sys.h"
+#include "QF/vid.h"
+
+#include "context_x11.h"
+#include "r_internal.h"
+#include "vid_internal.h"
+#include "vid_gl.h"
+
+#define GLX_RGBA				4		// true if RGBA mode
+#define GLX_DOUBLEBUFFER		5		// double buffering supported
+#define GLX_RED_SIZE			8		// number of red component bits
+#define GLX_GREEN_SIZE			9		// number of green component bits
+#define GLX_BLUE_SIZE			10		// number of blue component bits
+#define GLX_DEPTH_SIZE			12		// number of depth bits
+
+typedef XID GLXDrawable;
+
+// Define GLAPIENTRY to a useful value
+#ifndef GLAPIENTRY
+# ifdef _WIN32
+#  include <windows.h>
+#  define GLAPIENTRY WINAPI
+#  undef LoadImage
+# else
+#  ifdef APIENTRY
+#   define GLAPIENTRY APIENTRY
+#  else
+#   define GLAPIENTRY
+#  endif
+# endif
+#endif
+static void    *libgl_handle;
+static void (*qfglXSwapBuffers) (Display *dpy, GLXDrawable drawable);
+static XVisualInfo* (*qfglXChooseVisual) (Display *dpy, int screen,
+										  int *attribList);
+static GLXContext (*qfglXCreateContext) (Display *dpy, XVisualInfo *vis,
+										 GLXContext shareList, Bool direct);
+static Bool (*qfglXMakeCurrent) (Display *dpy, GLXDrawable drawable,
+								 GLXContext ctx);
+static void (GLAPIENTRY *qfglFinish) (void);
+static void *(*glGetProcAddress) (const char *symbol) = NULL;
+static int use_gl_procaddress = 0;
+
+static cvar_t  *gl_driver;
+
+static void *
+QFGL_GetProcAddress (void *handle, const char *name)
+{
+	void       *glfunc = NULL;
+
+	if (use_gl_procaddress && glGetProcAddress)
+		glfunc = glGetProcAddress (name);
+	if (!glfunc)
+		glfunc = dlsym (handle, name);
+	return glfunc;
+}
+
+static void *
+QFGL_ProcAddress (const char *name, qboolean crit)
+{
+	void    *glfunc = NULL;
+
+	Sys_MaskPrintf (SYS_VID, "DEBUG: Finding symbol %s ... ", name);
+
+	glfunc = QFGL_GetProcAddress (libgl_handle, name);
+	if (glfunc) {
+		Sys_MaskPrintf (SYS_VID, "found [%p]\n", glfunc);
+		return glfunc;
+	}
+	Sys_MaskPrintf (SYS_VID, "not found\n");
+
+	if (crit) {
+		if (strncmp ("fxMesa", name, 6) == 0) {
+			Sys_Printf ("This target requires a special version of Mesa with "
+						"support for Glide and SVGAlib.\n");
+			Sys_Printf ("If you are in X, try using a GLX or SGL target.\n");
+		}
+		Sys_Error ("Couldn't load critical OpenGL function %s, exiting...",
+				   name);
+	}
+	return NULL;
+}
+
+static void
+glx_choose_visual (gl_ctx_t *ctx)
+{
+	int         attrib[] = {
+		GLX_RGBA,
+		GLX_RED_SIZE, 1,
+		GLX_GREEN_SIZE, 1,
+		GLX_BLUE_SIZE, 1,
+		GLX_DOUBLEBUFFER,
+		GLX_DEPTH_SIZE, 1,
+		None
+	};
+
+	x_visinfo = qfglXChooseVisual (x_disp, x_screen, attrib);
+	if (!x_visinfo) {
+		Sys_Error ("Error couldn't get an RGB, Double-buffered, Depth visual");
+	}
+	x_vis = x_visinfo->visual;
+}
+
+static void
+glx_create_context (gl_ctx_t *ctx)
+{
+	XSync (x_disp, 0);
+	ctx->context = qfglXCreateContext (x_disp, x_visinfo, NULL, True);
+	qfglXMakeCurrent (x_disp, x_win, ctx->context);
+	ctx->init_gl ();
+}
+
+static void
+glx_end_rendering (void)
+{
+	qfglFinish ();
+	qfglXSwapBuffers (x_disp, x_win);
+}
+
+static void
+glx_load_gl (void)
+{
+	libgl_handle = dlopen (gl_driver->string, RTLD_NOW);
+	if (!libgl_handle) {
+		Sys_Error ("Couldn't load OpenGL library %s: %s", gl_driver->string,
+				   dlerror ());
+	}
+	glGetProcAddress = dlsym (libgl_handle, "glXGetProcAddress");
+	if (!glGetProcAddress)
+		glGetProcAddress = dlsym (libgl_handle, "glXGetProcAddressARB");
+
+	qfglXSwapBuffers = QFGL_ProcAddress ("glXSwapBuffers", true);
+	qfglXChooseVisual = QFGL_ProcAddress ("glXChooseVisual", true);
+	qfglXCreateContext = QFGL_ProcAddress ("glXCreateContext", true);
+	qfglXMakeCurrent = QFGL_ProcAddress ("glXMakeCurrent", true);
+
+	use_gl_procaddress = 1;
+
+	qfglFinish = QFGL_ProcAddress ("glFinish", true);
+}
+
+gl_ctx_t *
+X11_GL_Context (void)
+{
+	gl_ctx_t *ctx = calloc (1, sizeof (gl_ctx_t));
+	ctx->load_gl = glx_load_gl;
+	ctx->choose_visual = glx_choose_visual;
+	ctx->create_context = glx_create_context;
+	ctx->get_proc_address = QFGL_ProcAddress;
+	ctx->end_rendering = glx_end_rendering;
+	return ctx;
+}
+
+void
+X11_GL_Init_Cvars (void)
+{
+	gl_driver = Cvar_Get ("gl_driver", GL_DRIVER, CVAR_ROM, NULL,
+						  "The OpenGL library to use. (path optional)");
+}
diff --git a/libs/video/targets/vid_x11_sw.c b/libs/video/targets/vid_x11_sw.c
new file mode 100644
index 000000000..9c734a635
--- /dev/null
+++ b/libs/video/targets/vid_x11_sw.c
@@ -0,0 +1,542 @@
+/*
+	vid_x11_sw.c
+
+	Software X11 video driver (8/32 bit)
+
+	Copyright (C) 1996-1997  Id Software, Inc.
+	Copyright (C) 1999-2000  contributors of the QuakeForge project
+	Copyright (C) 2000       Marcus Sundberg [mackan@stacken.kth.se]
+	Copyright (C) 1999,2000  contributors of the QuakeForge project
+	Please see the file "AUTHORS" for a list of contributors
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
+#include <ctype.h>
+#include <errno.h>
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/ipc.h>
+#include <sys/shm.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/extensions/XShm.h>
+
+#include "QF/cvar.h"
+#include "QF/qargs.h"
+#include "QF/sys.h"
+#include "QF/vid.h"
+
+#include "context_x11.h"
+#include "r_internal.h"
+#include "vid_internal.h"
+#include "vid_sw.h"
+
+int XShmGetEventBase (Display *x);	// for broken X11 headers
+
+static GC		x_gc;
+
+static qboolean doShm;
+static XShmSegmentInfo x_shminfo[2];
+
+static int	current_framebuffer;
+static XImage *x_framebuffer[2] = { 0, 0 };
+
+typedef unsigned char PIXEL8;
+typedef unsigned short PIXEL16;
+typedef unsigned int PIXEL24;
+
+static PIXEL16	st2d_8to16table[256];
+static PIXEL24	st2d_8to24table[256];
+
+static byte current_palette[768];
+static int		shiftmask_fl = 0;
+static long 	r_shift, g_shift, b_shift;
+static unsigned long r_mask, g_mask, b_mask;
+
+static void
+shiftmask_init (void)
+{
+	unsigned long long x;
+
+	r_mask = x_vis->red_mask;
+	g_mask = x_vis->green_mask;
+	b_mask = x_vis->blue_mask;
+
+	for (r_shift = -8, x = 1; x < r_mask; x <<= 1)
+		r_shift++;
+	for (g_shift = -8, x = 1; x < g_mask; x <<= 1)
+		g_shift++;
+	for (b_shift = -8, x = 1; x < b_mask; x <<= 1)
+		b_shift++;
+	shiftmask_fl = 1;
+}
+
+static PIXEL16
+xlib_rgb16 (int r, int g, int b)
+{
+	PIXEL16 	p = 0;
+
+	if (!shiftmask_fl)
+		shiftmask_init ();
+
+	if (r_shift > 0) {
+		p = (r << (r_shift)) & r_mask;
+	} else {
+		if (r_shift < 0) {
+			p = (r >> (-r_shift)) & r_mask;
+		} else {
+			p |= (r & r_mask);
+		}
+	}
+
+	if (g_shift > 0) {
+		p |= (g << (g_shift)) & g_mask;
+	} else {
+		if (g_shift < 0) {
+			p |= (g >> (-g_shift)) & g_mask;
+		} else {
+			p |= (g & g_mask);
+		}
+	}
+
+	if (b_shift > 0) {
+		p |= (b << (b_shift)) & b_mask;
+	} else {
+		if (b_shift < 0) {
+			p |= (b >> (-b_shift)) & b_mask;
+		} else {
+			p |= (b & b_mask);
+		}
+	}
+
+	return p;
+}
+
+static PIXEL24
+xlib_rgb24 (int r, int g, int b)
+{
+	PIXEL24 	p = 0;
+
+	if (!shiftmask_fl)
+		shiftmask_init ();
+
+	if (r_shift > 0) {
+		p = (r << (r_shift)) & r_mask;
+	} else {
+		if (r_shift < 0) {
+			p = (r >> (-r_shift)) & r_mask;
+		} else {
+			p |= (r & r_mask);
+		}
+	}
+
+	if (g_shift > 0) {
+		p |= (g << (g_shift)) & g_mask;
+	} else {
+		if (g_shift < 0) {
+			p |= (g >> (-g_shift)) & g_mask;
+		} else {
+			p |= (g & g_mask);
+		}
+	}
+
+	if (b_shift > 0) {
+		p |= (b << (b_shift)) & b_mask;
+	} else {
+		if (b_shift < 0) {
+			p |= (b >> (-b_shift)) & b_mask;
+		} else {
+			p |= (b & b_mask);
+		}
+	}
+
+	return p;
+}
+
+static void
+VID_SetPalette (const byte *palette)
+{
+	int         i;
+	XColor      colors[256];
+
+	for (i = 0; i < 256; i++) {
+		st2d_8to16table[i] = xlib_rgb16 (palette[i * 3], palette[i * 3 + 1],
+										 palette[i * 3 + 2]);
+		st2d_8to24table[i] = xlib_rgb24 (palette[i * 3], palette[i * 3 + 1],
+										 palette[i * 3 + 2]);
+	}
+
+	if (x_visinfo->class == PseudoColor && x_visinfo->depth == 8) {
+		if (palette != current_palette) {
+			memcpy (current_palette, palette, 768);
+		}
+		for (i = 0; i < 256; i++) {
+			colors[i].pixel = i;
+			colors[i].flags = DoRed | DoGreen | DoBlue;
+			colors[i].red = palette[(i * 3)] << 8;
+			colors[i].green = palette[(i * 3) + 1] << 8;
+			colors[i].blue = palette[(i * 3) + 2] << 8;
+		}
+		XStoreColors (x_disp, x_cmap, colors, 256);
+	}
+}
+
+static void
+st2_fixup (XImage *framebuf, int x, int y, int width, int height)
+{
+	int 		xi, yi;
+	unsigned char *src;
+	PIXEL16 	*dest;
+
+	if (x < 0 || y < 0)
+		return;
+
+	for (yi = y; yi < (y + height); yi++) {
+		src = &((byte *)viddef.buffer)[yi * viddef.width];
+		dest = (PIXEL16 *) &framebuf->data[yi * framebuf->bytes_per_line];
+		for (xi = x; xi < x + width; xi++) {
+			dest[xi] = st2d_8to16table[src[xi]];
+		}
+	}
+}
+
+static void
+st3_fixup (XImage * framebuf, int x, int y, int width, int height)
+{
+	int 		yi;
+	unsigned char *src;
+	PIXEL24 	*dest;
+	register int count, n;
+
+	if (x < 0 || y < 0)
+		return;
+
+	for (yi = y; yi < (y + height); yi++) {
+		src = &((byte *)viddef.buffer)[yi * viddef.width + x];
+		dest = (PIXEL24 *) &framebuf->data[yi * framebuf->bytes_per_line + x];
+
+		// Duff's Device
+		count = width;
+		n = (count + 7) / 8;
+
+		switch (count % 8) {
+			case 0:
+				do {
+					*dest++ = st2d_8to24table[*src++];
+			case 7:
+					*dest++ = st2d_8to24table[*src++];
+			case 6:
+					*dest++ = st2d_8to24table[*src++];
+			case 5:
+					*dest++ = st2d_8to24table[*src++];
+			case 4:
+					*dest++ = st2d_8to24table[*src++];
+			case 3:
+					*dest++ = st2d_8to24table[*src++];
+			case 2:
+					*dest++ = st2d_8to24table[*src++];
+			case 1:
+					*dest++ = st2d_8to24table[*src++];
+				} while (--n > 0);
+		}
+	}
+}
+
+/*
+	Flush the given rectangles from the view buffer to the screen.
+*/
+static void
+x11_sw_update (vrect_t *rects)
+{
+	while (rects) {
+		switch (x_visinfo->depth) {
+			case 16:
+				st2_fixup (x_framebuffer[current_framebuffer],
+						   rects->x, rects->y, rects->width, rects->height);
+				break;
+			case 24:
+				st3_fixup (x_framebuffer[current_framebuffer],
+						   rects->x, rects->y, rects->width, rects->height);
+				break;
+		}
+		if (doShm) {
+			if (!XShmPutImage (x_disp, x_win, x_gc,
+							   x_framebuffer[current_framebuffer],
+							   rects->x, rects->y, rects->x, rects->y,
+							   rects->width, rects->height, True)) {
+				Sys_Error ("VID_Update: XShmPutImage failed");
+			}
+			oktodraw = false;
+			while (!oktodraw)
+				X11_ProcessEvent ();
+			rects = rects->next;
+
+			current_framebuffer = !current_framebuffer;
+		} else {
+			if (XPutImage (x_disp, x_win, x_gc, x_framebuffer[0],
+							rects->x, rects->y, rects->x, rects->y,
+							rects->width, rects->height)) {
+				Sys_Error ("VID_Update: XPutImage failed");
+			}
+			rects = rects->next;
+		}
+	}
+	XSync (x_disp, False);
+	r_data->scr_fullupdate = 0;
+}
+
+static void
+x11_choose_visual (sw_ctx_t *ctx)
+{
+	int         pnum, i;
+	XVisualInfo template;
+	int         num_visuals;
+	int         template_mask;
+
+	// specify a visual id
+	if ((pnum = COM_CheckParm ("-visualid"))) {
+		if (pnum >= com_argc - 1)
+			Sys_Error ("VID: -visualid <id#>");
+		template.visualid = atoi (com_argv[pnum + 1]);
+		template_mask = VisualIDMask;
+	} else {							// If not specified, use default
+										// visual
+		template.visualid =
+			XVisualIDFromVisual (XDefaultVisual (x_disp, x_screen));
+		template_mask = VisualIDMask;
+	}
+
+	// pick a visual -- warn if more than one was available
+	x_visinfo = XGetVisualInfo (x_disp, template_mask, &template,
+								&num_visuals);
+
+	if (x_visinfo->depth == 8 && x_visinfo->class == PseudoColor)
+		x_cmap = XCreateColormap (x_disp, x_win, x_vis, AllocAll);
+	x_vis = x_visinfo->visual;
+
+	if (num_visuals > 1) {
+		Sys_MaskPrintf (SYS_VID,
+						"Found more than one visual id at depth %d:\n",
+						template.depth);
+		for (i = 0; i < num_visuals; i++)
+			Sys_MaskPrintf (SYS_VID, "    -visualid %d\n",
+							(int) x_visinfo[i].visualid);
+	} else {
+		if (num_visuals == 0) {
+			if (template_mask == VisualIDMask) {
+				Sys_Error ("VID: Bad visual ID %ld", template.visualid);
+			} else {
+				Sys_Error ("VID: No visuals at depth %d", template.depth);
+			}
+		}
+	}
+
+	Sys_MaskPrintf (SYS_VID, "Using visualid %d:\n",
+					(int) x_visinfo->visualid);
+	Sys_MaskPrintf (SYS_VID, "    class %d\n", x_visinfo->class);
+	Sys_MaskPrintf (SYS_VID, "    screen %d\n", x_visinfo->screen);
+	Sys_MaskPrintf (SYS_VID, "    depth %d\n", x_visinfo->depth);
+	Sys_MaskPrintf (SYS_VID, "    red_mask 0x%x\n",
+					(int) x_visinfo->red_mask);
+	Sys_MaskPrintf (SYS_VID, "    green_mask 0x%x\n",
+					(int) x_visinfo->green_mask);
+	Sys_MaskPrintf (SYS_VID, "    blue_mask 0x%x\n",
+					(int) x_visinfo->blue_mask);
+	Sys_MaskPrintf (SYS_VID, "    colormap_size %d\n",
+					x_visinfo->colormap_size);
+	Sys_MaskPrintf (SYS_VID, "    bits_per_rgb %d\n",
+					x_visinfo->bits_per_rgb);
+}
+
+static void
+ResetFrameBuffer (void)
+{
+	int         mem, pwidth;
+	char       *buf;
+
+	if (x_framebuffer[0]) {
+		XDestroyImage (x_framebuffer[0]);
+	}
+
+	pwidth = x_visinfo->depth / 8;
+
+	if (pwidth == 3)
+		pwidth = 4;
+	mem = ((viddef.width * pwidth + 7) & ~7) * viddef.height;
+	buf = malloc (mem);
+	SYS_CHECKMEM (buf);
+
+	// allocate new screen buffer
+	x_framebuffer[0] = XCreateImage (x_disp, x_vis, x_visinfo->depth,
+									 ZPixmap, 0, buf, viddef.width,
+									 viddef.height, 32, 0);
+
+	if (!x_framebuffer[0]) {
+		Sys_Error ("VID: XCreateImage failed");
+	}
+}
+
+static void
+ResetSharedFrameBuffers (void)
+{
+	int 	size;
+	int 	key;
+	int 	minsize = getpagesize ();
+	int 	frm;
+
+	for (frm = 0; frm < 2; frm++) {
+
+		// free up old frame buffer memory
+		if (x_framebuffer[frm]) {
+			XShmDetach (x_disp, &x_shminfo[frm]);
+			free (x_framebuffer[frm]);
+			shmdt (x_shminfo[frm].shmaddr);
+		}
+		// create the image
+		x_framebuffer[frm] = XShmCreateImage (x_disp, x_vis, x_visinfo->depth,
+											  ZPixmap, 0, &x_shminfo[frm],
+											  viddef.width, viddef.height);
+
+		// grab shared memory
+		size = x_framebuffer[frm]->bytes_per_line * x_framebuffer[frm]->height;
+
+		if (size < minsize)
+			Sys_Error ("VID: Window must use at least %d bytes", minsize);
+
+		key = random ();
+		x_shminfo[frm].shmid = shmget ((key_t) key, size, IPC_CREAT | 0777);
+		if (x_shminfo[frm].shmid == -1)
+			Sys_Error ("VID: Could not get any shared memory (%s)",
+					   strerror (errno));
+
+		// attach to the shared memory segment
+		x_shminfo[frm].shmaddr = (void *) shmat (x_shminfo[frm].shmid, 0, 0);
+
+		Sys_MaskPrintf (SYS_VID, "VID: shared memory id=%d, addr=0x%lx\n",
+						x_shminfo[frm].shmid, (long) x_shminfo[frm].shmaddr);
+
+		x_framebuffer[frm]->data = x_shminfo[frm].shmaddr;
+
+		// get the X server to attach to it
+		if (!XShmAttach (x_disp, &x_shminfo[frm]))
+			Sys_Error ("VID: XShmAttach() failed");
+		XSync (x_disp, 0);
+		shmctl (x_shminfo[frm].shmid, IPC_RMID, 0);
+
+	}
+}
+
+static void
+x11_init_buffers (void)
+{
+	if (doShm)
+		ResetSharedFrameBuffers ();
+	else
+		ResetFrameBuffer ();
+
+	current_framebuffer = 0;
+
+	viddef.direct = 0;
+	viddef.rowbytes = viddef.width;
+	if (x_visinfo->depth != 8) {
+		if (viddef.buffer)
+			free (viddef.buffer);
+		viddef.buffer = calloc (viddef.width, viddef.height);
+		if (!viddef.buffer)
+			Sys_Error ("Not enough memory for video mode");
+	} else {
+		viddef.buffer = x_framebuffer[current_framebuffer]->data;
+	}
+	viddef.conbuffer = viddef.buffer;
+
+	viddef.conrowbytes = viddef.rowbytes;
+}
+
+static void
+x11_create_context (sw_ctx_t *ctx)
+{
+	// create the GC
+	{
+		XGCValues   xgcvalues;
+		int         valuemask = GCGraphicsExposures;
+
+		xgcvalues.graphics_exposures = False;
+		x_gc = XCreateGC (x_disp, x_win, valuemask, &xgcvalues);
+	}
+
+	// even if MITSHM is available, make sure it's a local connection
+	if (XShmQueryExtension (x_disp)) {
+		char       *displayname;
+		char       *d;
+
+		doShm = true;
+
+		if ((displayname = XDisplayName (NULL))) {
+			if ((d = strchr (displayname, ':')))
+				*d = '\0';
+
+			if (!(!strcasecmp (displayname, "unix") || !*displayname))
+				doShm = false;
+		}
+	}
+
+	if (doShm) {
+		x_shmeventtype = XShmGetEventBase (x_disp) + ShmCompletion;
+	}
+
+	viddef.vid_internal->do_screen_buffer = x11_init_buffers;
+	VID_InitBuffers ();
+
+//  XSynchronize (x_disp, False);
+//	X11_AddEvent (x_shmeventtype, event_shm);
+}
+
+sw_ctx_t *
+X11_SW_Context (void)
+{
+	sw_ctx_t *ctx = calloc (1, sizeof (sw_ctx_t));
+	ctx->set_palette = VID_SetPalette;
+	ctx->choose_visual = x11_choose_visual;
+	ctx->create_context = x11_create_context;
+	ctx->update = x11_sw_update;
+	return ctx;
+}
+
+void
+X11_SW_Init_Cvars (void)
+{
+}
diff --git a/libs/video/targets/vid_x11_vulkan.c b/libs/video/targets/vid_x11_vulkan.c
new file mode 100644
index 000000000..e472c0c0e
--- /dev/null
+++ b/libs/video/targets/vid_x11_vulkan.c
@@ -0,0 +1,169 @@
+/*
+	vid_x11_vulkan.c
+
+	Vulkan X11 video driver
+
+	Copyright (C) 1996-1997  Id Software, Inc.
+	Copyright (C) 1999-2000  contributors of the QuakeForge project
+	Copyright (C) 2000       Marcus Sundberg [mackan@stacken.kth.se]
+	Copyright (C) 1999,2000  contributors of the QuakeForge project
+	Please see the file "AUTHORS" for a list of contributors
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
+#include <dlfcn.h>
+#include <stdlib.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#define VK_NO_PROTOTYPES
+#define VK_USE_PLATFORM_XLIB_KHR
+#include <vulkan/vulkan.h>
+
+#include "QF/cvar.h"
+#include "QF/set.h"
+#include "QF/sys.h"
+
+#include "context_x11.h"
+#include "vid_internal.h"
+#include "vid_vulkan.h"
+
+static cvar_t *vulkan_library_name;
+
+typedef struct vulkan_presentation_s {
+#define INSTANCE_LEVEL_VULKAN_FUNCTION(name) PFN_##name name;
+#include "QF/Vulkan/funclist.h"
+
+	Display    *display;
+	Window      window;
+	int         num_visuals;
+	XVisualInfo *visinfo;
+	set_t      *usable_visuals;
+} vulkan_presentation_t;
+
+static const char *required_extensions[] = {
+	VK_KHR_XLIB_SURFACE_EXTENSION_NAME,
+	0
+};
+
+static void *vulkan_library;
+
+static void
+load_vulkan_library (vulkan_ctx_t *ctx)
+{
+	vulkan_library = dlopen (vulkan_library_name->string,
+							 RTLD_DEEPBIND | RTLD_NOW);
+	if (!vulkan_library) {
+		Sys_Error ("Couldn't load vulkan library %s: %s",
+				   vulkan_library_name->name, dlerror ());
+	}
+
+	#define EXPORTED_VULKAN_FUNCTION(name) \
+	ctx->name = (PFN_##name) dlsym (vulkan_library, #name); \
+	if (!ctx->name) { \
+		Sys_Error ("Couldn't find exported vulkan function %s", #name); \
+	}
+
+	#define GLOBAL_LEVEL_VULKAN_FUNCTION(name) \
+	ctx->name = (PFN_##name) ctx->vkGetInstanceProcAddr (0, #name); \
+	if (!ctx->name) { \
+		Sys_Error ("Couldn't find global-level function %s", #name); \
+	}
+
+	#include "QF/Vulkan/funclist.h"
+}
+
+static void
+unload_vulkan_library (vulkan_ctx_t *ctx)
+{
+	dlclose (vulkan_library);
+	vulkan_library = 0;
+}
+
+static int
+x11_vulkan_get_presentation_support (vulkan_ctx_t *ctx,
+									 VkPhysicalDevice physicalDevice,
+									 uint32_t queueFamilyIndex)
+{
+	vulkan_presentation_t *pres = ctx->presentation;
+
+	set_empty (pres->usable_visuals);
+	for (int i = 0; i < pres->num_visuals; i++) {
+		VisualID    visID = pres->visinfo[i].visualid;
+
+		if (pres->vkGetPhysicalDeviceXlibPresentationSupportKHR (
+				physicalDevice, queueFamilyIndex, pres->display, visID)) {
+			set_add (pres->usable_visuals, i);
+		}
+	}
+	return !set_is_empty (pres->usable_visuals);
+}
+
+static VkSurfaceKHR
+x11_vulkan_create_surface (vulkan_ctx_t *ctx)
+{
+	vulkan_presentation_t *pres = ctx->presentation;
+	VkSurfaceKHR surface;
+	VkXlibSurfaceCreateInfoKHR createInfo = {
+		.sType = VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR,
+		.flags = 0,
+		.dpy = pres->display,
+		.window = pres->window
+	};
+
+	if (pres->vkCreateXlibSurfaceKHR (ctx->instance, &createInfo, 0, &surface)
+		!= VK_SUCCESS) {
+		return 0;
+	}
+	return surface;
+}
+
+vulkan_ctx_t *
+X11_Vulkan_Context (void)
+{
+	vulkan_ctx_t *ctx = calloc (1, sizeof (vulkan_ctx_t));
+	ctx->load_vulkan = load_vulkan_library;
+	ctx->unload_vulkan = unload_vulkan_library;
+	ctx->get_presentation_support = x11_vulkan_get_presentation_support;
+	ctx->create_surface = x11_vulkan_create_surface;
+	ctx->required_extensions = required_extensions;
+	return ctx;
+}
+
+void
+X11_Vulkan_Init_Cvars (void)
+{
+	vulkan_library_name = Cvar_Get ("vulkan_library", "libvulkan.so.1",
+									CVAR_ROM, 0,
+									"the name of the vulkan shared library");
+}

From e9f1bc7b30b77d41a733f914ffd507524a056c3a Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 9 Jul 2019 01:03:26 +0900
Subject: [PATCH 0282/1519] Make vulkan building actually conditional

---
 config.d/build_control.m4 | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/config.d/build_control.m4 b/config.d/build_control.m4
index 94a7415af..a4df4a3a4 100644
--- a/config.d/build_control.m4
+++ b/config.d/build_control.m4
@@ -71,7 +71,11 @@ if test "x$HAVE_X" = xyes; then
 		NQ_DESKTOP_DATA="$NQ_DESKTOP_DATA quakeforge-nq-x11.desktop"
 		CL_TARGETS="$CL_TARGETS X11"
 		VID_TARGETS="$VID_TARGETS libQFx11.la"
-		QF_NEED(vid_render, [sw sw32 gl glsl vulkan])
+		if test "$HAVE_VULKAN" = "yes"; then
+			QF_NEED(vid_render, [sw sw32 gl glsl vulkan])
+		else
+			QF_NEED(vid_render, [sw sw32 gl glsl])
+		fi
 		QF_NEED(models, [sw gl glsl])
 		QF_NEED(alias, [sw gl glsl])
 		QF_NEED(brush, [sw gl glsl])
@@ -95,7 +99,11 @@ if test "x$HAVE_SDL" = xyes; then
 		NQ_DESKTOP_DATA="$NQ_DESKTOP_DATA quakeforge-nq-sdl.desktop"
 		CL_TARGETS="$CL_TARGETS SDL"
 		VID_TARGETS="$VID_TARGETS libQFsdl.la"
-		QF_NEED(vid_render, [sw sw32 gl glsl vulkan])
+		if test "$HAVE_VULKAN" = "yes"; then
+			QF_NEED(vid_render, [sw sw32 gl glsl vulkan])
+		else
+			QF_NEED(vid_render, [sw sw32 gl glsl])
+		fi
 		QF_NEED(models, [sw gl glsl])
 		QF_NEED(alias, [sw gl glsl])
 		QF_NEED(brush, [sw gl glsl])

From 707bdfc5f24fed2ac8b72c79b9c84ad835afe605 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 9 Jul 2019 09:06:35 +0900
Subject: [PATCH 0283/1519] Get vulkan back to where it was

---
 include/vid_vulkan.h                           |  2 --
 libs/video/renderer/vid_render_vulkan.c        | 18 +++++++++++++++++-
 libs/video/renderer/vulkan/vulkan_vid_common.c | 12 +++++++-----
 3 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/include/vid_vulkan.h b/include/vid_vulkan.h
index 627269cdb..ae83ae397 100644
--- a/include/vid_vulkan.h
+++ b/include/vid_vulkan.h
@@ -9,7 +9,6 @@
 typedef struct vulkan_ctx_s {
 	void        (*load_vulkan) (struct vulkan_ctx_s *ctx);
 	void        (*unload_vulkan) (struct vulkan_ctx_s *ctx);
-	void        (*init_vulkan) (void);
 
 	const char * const *required_extensions;
 	struct vulkan_presentation_s *presentation;
@@ -18,7 +17,6 @@ typedef struct vulkan_ctx_s {
 									 uint32_t queueFamilyIndex);
 	VkSurfaceKHR (*create_surface) (struct vulkan_ctx_s *ctx);
 	VkInstance  instance;
-	VkPhysicalDevice physicalDevice;
 #define EXPORTED_VULKAN_FUNCTION(fname) PFN_##fname fname;
 #define GLOBAL_LEVEL_VULKAN_FUNCTION(fname) PFN_##fname fname;
 #include "QF/Vulkan/funclist.h"
diff --git a/libs/video/renderer/vid_render_vulkan.c b/libs/video/renderer/vid_render_vulkan.c
index 2a94f31cb..840505e10 100644
--- a/libs/video/renderer/vid_render_vulkan.c
+++ b/libs/video/renderer/vid_render_vulkan.c
@@ -135,14 +135,30 @@ set_palette (const byte *palette)
 	//an app using the QuakeForge engine)
 }
 
+static void
+vulkan_vid_render_choose_visual (void)
+{
+	//vulkan_ctx->coose_visual (vulkan_ctx);
+}
+
+static void
+vulkan_vid_render_create_context (void)
+{
+	vulkan_ctx->create_surface (vulkan_ctx);
+}
+
 static void
 vulkan_vid_render_init (void)
 {
 	vulkan_ctx = vr_data.vid->vid_internal->vulkan_context ();
-	vulkan_ctx->init_vulkan = Vulkan_Init_Common;
 	vulkan_ctx->load_vulkan (vulkan_ctx);
 
+	Vulkan_Init_Common ();
+
 	vr_data.vid->vid_internal->set_palette = set_palette;
+	vr_data.vid->vid_internal->choose_visual = vulkan_vid_render_choose_visual;
+	vr_data.vid->vid_internal->create_context = vulkan_vid_render_create_context;
+
 	vr_funcs = &vulkan_vid_render_funcs;
 	m_funcs = &model_funcs;
 }
diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c
index 98a4d3dc3..cfd2a980f 100644
--- a/libs/video/renderer/vulkan/vulkan_vid_common.c
+++ b/libs/video/renderer/vulkan/vulkan_vid_common.c
@@ -165,6 +165,8 @@ create_suitable_device (VulkanInstance_t *instance)
 	return 0;
 }
 
+int x = 1;
+
 void
 Vulkan_Init_Common (void)
 {
@@ -176,11 +178,11 @@ Vulkan_Init_Common (void)
 	if (!vulkan_device) {
 		Sys_Error ("no suitable vulkan device found");
 	}
-	if (developer->int_val & SYS_VID) {
-		Sys_Printf ("%p %p\n", vulkan_device->device, vulkan_device->queue);
-		Vulkan_Shutdown_Common ();
-		Sys_Quit();
-	}
+	// only for now...
+	Sys_Printf ("%p %p\n", vulkan_device->device, vulkan_device->queue);
+	Vulkan_Shutdown_Common ();
+	if (x)
+	Sys_Quit();
 }
 
 void

From b3d982bfc3a053e7058cace4e058050ff916c801 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 9 Jul 2019 11:54:23 +0900
Subject: [PATCH 0284/1519] Remove global vulkan_ctx

While I can't say that I'm happy with the details of vulkan_ctx_t, I am
pretty sure I don't want to be limited to having only one.
---
 include/QF/Vulkan/init.h                      |  6 ++--
 include/QF/Vulkan/qf_vid.h                    |  5 +--
 include/vid_vulkan.h                          |  6 ++--
 libs/video/renderer/vid_render_vulkan.c       |  6 ++--
 libs/video/renderer/vulkan/init.c             | 34 ++++++++++---------
 .../video/renderer/vulkan/vulkan_vid_common.c | 10 +++---
 6 files changed, 36 insertions(+), 31 deletions(-)

diff --git a/include/QF/Vulkan/init.h b/include/QF/Vulkan/init.h
index 85efb44e1..c964e6c41 100644
--- a/include/QF/Vulkan/init.h
+++ b/include/QF/Vulkan/init.h
@@ -52,7 +52,7 @@ typedef struct {
 	VkQueueFamilyProperties *queueFamilies;
 } VulkanPhysDevice_t;
 
-typedef struct {
+typedef struct VulkanInstance_s {
 	VkInstance  instance;
 	VkDebugUtilsMessengerEXT debug_callback;
 	uint32_t    numDevices;
@@ -64,7 +64,9 @@ typedef struct {
 } VulkanInstance_t;
 
 void Vulkan_Init_Cvars (void);
-VulkanInstance_t *Vulkan_CreateInstance (const char *appName,
+struct vulkan_ctx_s;
+VulkanInstance_t *Vulkan_CreateInstance (struct vulkan_ctx_s *ctx,
+										 const char *appName,
 										 uint32_t appVersion,
 										 const char **layers,
 										 const char **extensions);
diff --git a/include/QF/Vulkan/qf_vid.h b/include/QF/Vulkan/qf_vid.h
index d032a075a..8e1825b48 100644
--- a/include/QF/Vulkan/qf_vid.h
+++ b/include/QF/Vulkan/qf_vid.h
@@ -30,7 +30,8 @@
 
 #include "QF/Vulkan/cvars.h"
 
-void Vulkan_Init_Common (void);
-void Vulkan_Shutdown_Common (void);
+struct vulkan_ctx_s;
+void Vulkan_Init_Common (struct vulkan_ctx_s *ctx);
+void Vulkan_Shutdown_Common (struct vulkan_ctx_s *ctx);
 
 #endif // __QF_Vulkan_vid_h
diff --git a/include/vid_vulkan.h b/include/vid_vulkan.h
index ae83ae397..eea285ae4 100644
--- a/include/vid_vulkan.h
+++ b/include/vid_vulkan.h
@@ -10,18 +10,18 @@ typedef struct vulkan_ctx_s {
 	void        (*load_vulkan) (struct vulkan_ctx_s *ctx);
 	void        (*unload_vulkan) (struct vulkan_ctx_s *ctx);
 
-	const char * const *required_extensions;
+	const char **required_extensions;
 	struct vulkan_presentation_s *presentation;
 	int (*get_presentation_support) (struct vulkan_ctx_s *ctx,
 									 VkPhysicalDevice physicalDevice,
 									 uint32_t queueFamilyIndex);
 	VkSurfaceKHR (*create_surface) (struct vulkan_ctx_s *ctx);
+
+	struct VulkanInstance_s *vtx;
 	VkInstance  instance;
 #define EXPORTED_VULKAN_FUNCTION(fname) PFN_##fname fname;
 #define GLOBAL_LEVEL_VULKAN_FUNCTION(fname) PFN_##fname fname;
 #include "QF/Vulkan/funclist.h"
 } vulkan_ctx_t;
 
-extern vulkan_ctx_t *vulkan_ctx;
-
 #endif//__vid_vulkan_h
diff --git a/libs/video/renderer/vid_render_vulkan.c b/libs/video/renderer/vid_render_vulkan.c
index 840505e10..60c7c1b5e 100644
--- a/libs/video/renderer/vid_render_vulkan.c
+++ b/libs/video/renderer/vid_render_vulkan.c
@@ -43,7 +43,7 @@
 
 #include "vulkan/namehack.h"
 
-vulkan_ctx_t *vulkan_ctx;
+static vulkan_ctx_t *vulkan_ctx;
 
 static vid_model_funcs_t model_funcs = {
 /*	vulkan_Mod_LoadExternalTextures,
@@ -153,7 +153,7 @@ vulkan_vid_render_init (void)
 	vulkan_ctx = vr_data.vid->vid_internal->vulkan_context ();
 	vulkan_ctx->load_vulkan (vulkan_ctx);
 
-	Vulkan_Init_Common ();
+	Vulkan_Init_Common (vulkan_ctx);
 
 	vr_data.vid->vid_internal->set_palette = set_palette;
 	vr_data.vid->vid_internal->choose_visual = vulkan_vid_render_choose_visual;
@@ -166,7 +166,7 @@ vulkan_vid_render_init (void)
 static void
 vulkan_vid_render_shutdown (void)
 {
-	Vulkan_Shutdown_Common ();
+	Vulkan_Shutdown_Common (vulkan_ctx);
 }
 
 static general_funcs_t plugin_info_general_funcs = {
diff --git a/libs/video/renderer/vulkan/init.c b/libs/video/renderer/vulkan/init.c
index e3181fc07..af3f21b4b 100644
--- a/libs/video/renderer/vulkan/init.c
+++ b/libs/video/renderer/vulkan/init.c
@@ -73,15 +73,15 @@ static const char *device_types[] = {
 };
 
 static void
-get_instance_layers_and_extensions  (void)
+get_instance_layers_and_extensions  (vulkan_ctx_t *ctx)
 {
 	uint32_t    i;
 	VkLayerProperties *properties;
 	VkExtensionProperties *extensions;
 
-	vulkan_ctx->vkEnumerateInstanceLayerProperties (&numLayers, 0);
+	ctx->vkEnumerateInstanceLayerProperties (&numLayers, 0);
 	properties = malloc (numLayers * sizeof (VkLayerProperties));
-	vulkan_ctx->vkEnumerateInstanceLayerProperties (&numLayers, properties);
+	ctx->vkEnumerateInstanceLayerProperties (&numLayers, properties);
 	instanceLayerNames = (const char **) malloc ((numLayers + 1)
 												 * sizeof (const char **));
 	for (i = 0; i < numLayers; i++) {
@@ -89,9 +89,9 @@ get_instance_layers_and_extensions  (void)
 	}
 	instanceLayerNames[i] = 0;
 
-	vulkan_ctx->vkEnumerateInstanceExtensionProperties (0, &numExtensions, 0);
+	ctx->vkEnumerateInstanceExtensionProperties (0, &numExtensions, 0);
 	extensions = malloc (numExtensions * sizeof (VkLayerProperties));
-	vulkan_ctx->vkEnumerateInstanceExtensionProperties (0, &numExtensions,
+	ctx->vkEnumerateInstanceExtensionProperties (0, &numExtensions,
 														extensions);
 	instanceExtensionNames = (const char **) malloc ((numExtensions + 1)
 													 * sizeof (const char **));
@@ -277,19 +277,19 @@ setup_debug_callback (VulkanInstance_t *instance)
 }
 
 static void
-load_instance_funcs (VulkanInstance_t *instance)
+load_instance_funcs (vulkan_ctx_t *ctx)
 {
+	VulkanInstance_t *vtx = ctx->vtx;
+	VkInstance instance = vtx->instance;
 #define INSTANCE_LEVEL_VULKAN_FUNCTION(name) \
-	instance->name = (PFN_##name) \
-		vulkan_ctx->vkGetInstanceProcAddr (instance->instance, #name); \
-	if (!instance->name) { \
+	vtx->name = (PFN_##name) ctx->vkGetInstanceProcAddr (instance, #name); \
+	if (!vtx->name) { \
 		Sys_Error ("Couldn't find instance level function %s", #name); \
 	}
 
 #define INSTANCE_LEVEL_VULKAN_FUNCTION_EXTENSION(name) \
-	instance->name = (PFN_##name) \
-		vulkan_ctx->vkGetInstanceProcAddr (instance->instance, #name); \
-	if (!instance->name) { \
+	vtx->name = (PFN_##name) ctx->vkGetInstanceProcAddr (instance, #name); \
+	if (!vtx->name) { \
 		Sys_Printf ("Couldn't find instance level function %s", #name); \
 	}
 
@@ -297,7 +297,8 @@ load_instance_funcs (VulkanInstance_t *instance)
 }
 
 VulkanInstance_t *
-Vulkan_CreateInstance (const char *appName, uint32_t appVersion,
+Vulkan_CreateInstance (vulkan_ctx_t *ctx,
+					   const char *appName, uint32_t appVersion,
 					   const char **layers, const char **extensions)
 {
 	VkApplicationInfo appInfo = {
@@ -319,7 +320,7 @@ Vulkan_CreateInstance (const char *appName, uint32_t appVersion,
 	VulkanInstance_t *inst;
 
 	if (!instanceLayerProperties) {
-		get_instance_layers_and_extensions ();
+		get_instance_layers_and_extensions (ctx);
 	}
 
 	createInfo.enabledLayerCount = count_strings (layers);
@@ -346,13 +347,14 @@ Vulkan_CreateInstance (const char *appName, uint32_t appVersion,
 	createInfo.ppEnabledLayerNames = lay;
 	createInfo.ppEnabledExtensionNames = ext;
 
-	res = vulkan_ctx->vkCreateInstance (&createInfo, 0, &instance);
+	res = ctx->vkCreateInstance (&createInfo, 0, &instance);
 	if (res != VK_SUCCESS) {
 		Sys_Error ("unable to create vulkan instance\n");
 	}
 	inst = malloc (sizeof(VulkanInstance_t));
 	inst->instance = instance;
-	load_instance_funcs (inst);
+	ctx->vtx = inst;
+	load_instance_funcs (ctx);
 
 	if (vulkan_use_validation->int_val) {
 		setup_debug_callback (inst);
diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c
index cfd2a980f..96094303a 100644
--- a/libs/video/renderer/vulkan/vulkan_vid_common.c
+++ b/libs/video/renderer/vulkan/vulkan_vid_common.c
@@ -168,25 +168,25 @@ create_suitable_device (VulkanInstance_t *instance)
 int x = 1;
 
 void
-Vulkan_Init_Common (void)
+Vulkan_Init_Common (vulkan_ctx_t *ctx)
 {
 	Sys_Printf ("Vulkan_Init_Common\n");
 	Vulkan_Init_Cvars ();
 
-	vulkan_instance = Vulkan_CreateInstance (PACKAGE_STRING, 0x000702ff, 0, instance_extensions);//FIXME version
+	vulkan_instance = Vulkan_CreateInstance (ctx, PACKAGE_STRING, 0x000702ff, 0, instance_extensions);//FIXME version
 	vulkan_device = create_suitable_device (vulkan_instance);
 	if (!vulkan_device) {
 		Sys_Error ("no suitable vulkan device found");
 	}
 	// only for now...
 	Sys_Printf ("%p %p\n", vulkan_device->device, vulkan_device->queue);
-	Vulkan_Shutdown_Common ();
+	Vulkan_Shutdown_Common (ctx);
 	if (x)
 	Sys_Quit();
 }
 
 void
-Vulkan_Shutdown_Common (void)
+Vulkan_Shutdown_Common (vulkan_ctx_t *ctx)
 {
 	if (vulkan_device) {
 		vulkan_device->vkDestroyDevice (vulkan_device->device, 0);
@@ -195,5 +195,5 @@ Vulkan_Shutdown_Common (void)
 	}
 	Vulkan_DestroyInstance (vulkan_instance);
 	vulkan_instance = 0;
-	vulkan_ctx->unload_vulkan (vulkan_ctx);
+	ctx->unload_vulkan (ctx);
 }

From 0f511e8342e5ce27a419ef4504defa3db6f3234d Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 9 Jul 2019 14:24:55 +0900
Subject: [PATCH 0285/1519] Move the string list funcs to their own file

They're not (at this stage, at least) worthy of being promoted out to
the utils lib.
---
 libs/video/renderer/vulkan/Makefile.am |  3 +-
 libs/video/renderer/vulkan/init.c      | 51 +---------------
 libs/video/renderer/vulkan/util.c      | 83 ++++++++++++++++++++++++++
 libs/video/renderer/vulkan/util.h      |  9 +++
 4 files changed, 97 insertions(+), 49 deletions(-)
 create mode 100644 libs/video/renderer/vulkan/util.c
 create mode 100644 libs/video/renderer/vulkan/util.h

diff --git a/libs/video/renderer/vulkan/Makefile.am b/libs/video/renderer/vulkan/Makefile.am
index e4102ec9d..b134d1f91 100644
--- a/libs/video/renderer/vulkan/Makefile.am
+++ b/libs/video/renderer/vulkan/Makefile.am
@@ -5,6 +5,7 @@ AM_CPPFLAGS= -I$(top_srcdir)/include -DVK_NO_PROTOTYPES
 
 vulkan_src = \
 	init.c \
+	util.c \
 	vulkan_draw.c \
 	vulkan_vid_common.c
 
@@ -21,5 +22,5 @@ SUFFICES=.frag .vert .fc .vc .slc .glsl
 
 libvulkan_la_SOURCES= $(vulkan_src)
 
-EXTRA_DIST = $(vulkan_src) $(shader_src) namehack.h
+EXTRA_DIST = $(vulkan_src) $(shader_src) namehack.h util.h
 CLEANFILES= *.vc *.fc *.slc
diff --git a/libs/video/renderer/vulkan/init.c b/libs/video/renderer/vulkan/init.c
index af3f21b4b..7b553d5f6 100644
--- a/libs/video/renderer/vulkan/init.c
+++ b/libs/video/renderer/vulkan/init.c
@@ -1,5 +1,5 @@
 /*
-	int.c
+	init.c
 
 	Copyright (C) 2019      Bill Currie <bill@taniwha.org>
 
@@ -45,6 +45,8 @@
 
 #include "vid_vulkan.h"
 
+#include "util.h"
+
 cvar_t *vulkan_use_validation;
 
 static uint32_t numLayers;
@@ -196,53 +198,6 @@ init_physdev (VulkanInstance_t *instance, VkPhysicalDevice dev, VulkanPhysDevice
 	}
 }
 
-static int
-count_strings (const char **str)
-{
-	int         count = 0;
-
-	if (str) {
-		while (*str++) {
-			count++;
-		}
-	}
-	return count;
-}
-
-static void
-merge_strings (const char **out, const char **in1, const char **in2)
-{
-	if (in1) {
-		while (*in1) {
-			*out++ = *in1++;
-		}
-	}
-	if (in2) {
-		while (*in2) {
-			*out++ = *in2++;
-		}
-	}
-}
-
-static void
-prune_strings (const char * const *reference, const char **strings,
-			   uint32_t *count)
-{
-	for (int i = *count; i-- > 0; ) {
-		const char *str = strings[i];
-		const char * const *ref;
-		for (ref = reference; *ref; ref++) {
-			if (!strcmp (*ref, str)) {
-				break;
-			}
-		}
-		if (!*ref) {
-			memmove (strings + i, strings + i + 1,
-					 (--(*count) - i) * sizeof (const char **));
-		}
-	}
-}
-
 static int message_severities =
 	VK_DEBUG_UTILS_MESSAGE_SEVERITY_VERBOSE_BIT_EXT |
 	VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT |
diff --git a/libs/video/renderer/vulkan/util.c b/libs/video/renderer/vulkan/util.c
new file mode 100644
index 000000000..5603bbd5d
--- /dev/null
+++ b/libs/video/renderer/vulkan/util.c
@@ -0,0 +1,83 @@
+/*
+	util.c
+
+	Copyright (C) 2019      Bill Currie <bill@taniwha.org>
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+
+#include "util.h"
+
+int
+count_strings (const char **str)
+{
+	int         count = 0;
+
+	if (str) {
+		while (*str++) {
+			count++;
+		}
+	}
+	return count;
+}
+
+void
+merge_strings (const char **out, const char **in1, const char **in2)
+{
+	if (in1) {
+		while (*in1) {
+			*out++ = *in1++;
+		}
+	}
+	if (in2) {
+		while (*in2) {
+			*out++ = *in2++;
+		}
+	}
+}
+
+void
+prune_strings (const char * const *reference, const char **strings,
+			   uint32_t *count)
+{
+	for (int i = *count; i-- > 0; ) {
+		const char *str = strings[i];
+		const char * const *ref;
+		for (ref = reference; *ref; ref++) {
+			if (!strcmp (*ref, str)) {
+				break;
+			}
+		}
+		if (!*ref) {
+			memmove (strings + i, strings + i + 1,
+					 (--(*count) - i) * sizeof (const char **));
+		}
+	}
+}
diff --git a/libs/video/renderer/vulkan/util.h b/libs/video/renderer/vulkan/util.h
new file mode 100644
index 000000000..8d1a967a3
--- /dev/null
+++ b/libs/video/renderer/vulkan/util.h
@@ -0,0 +1,9 @@
+#ifndef __util_h
+#define __util_h
+
+#include <stdint.h>
+int count_strings (const char **str);
+void merge_strings (const char **out, const char **in1, const char **in2);
+void prune_strings (const char * const *reference, const char **strings, uint32_t *count);
+
+#endif//__util_h

From 68449d0f6f5ccd98aeb6b2d5b5fa159675e0d164 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 9 Jul 2019 16:33:44 +0900
Subject: [PATCH 0286/1519] Create a window and a surface for vulkan

Yay, segfaults in R_Init :)
---
 include/QF/Vulkan/init.h                      |   8 +-
 include/QF/Vulkan/qf_vid.h                    |   1 +
 include/vid_vulkan.h                          |   4 +
 libs/video/renderer/vid_render_vulkan.c       |  10 +-
 libs/video/renderer/vulkan/init.c             |  66 +++++++----
 libs/video/renderer/vulkan/util.c             |   5 +-
 libs/video/renderer/vulkan/util.h             |   8 +-
 .../video/renderer/vulkan/vulkan_vid_common.c | 107 ++++++++++--------
 libs/video/targets/vid_x11_vulkan.c           |  48 ++++++++
 9 files changed, 180 insertions(+), 77 deletions(-)

diff --git a/include/QF/Vulkan/init.h b/include/QF/Vulkan/init.h
index c964e6c41..3afab0179 100644
--- a/include/QF/Vulkan/init.h
+++ b/include/QF/Vulkan/init.h
@@ -30,9 +30,10 @@
 
 #include "QF/qtypes.h"
 
-typedef struct {
+typedef struct VulkanDevice_s {
 	VkDevice device;
 	VkQueue queue;
+	VkSurfaceKHR surface;
 
     #define DEVICE_LEVEL_VULKAN_FUNCTION(name) PFN_##name name;
     #define DEVICE_LEVEL_VULKAN_FUNCTION_EXTENSION(name) PFN_##name name;
@@ -63,6 +64,8 @@ typedef struct VulkanInstance_s {
 	#include "QF/Vulkan/funclist.h"
 } VulkanInstance_t;
 
+extern const char * const vulkanValidationLayers[];
+
 void Vulkan_Init_Cvars (void);
 struct vulkan_ctx_s;
 VulkanInstance_t *Vulkan_CreateInstance (struct vulkan_ctx_s *ctx,
@@ -74,5 +77,8 @@ void Vulkan_DestroyInstance (VulkanInstance_t *instance);
 int Vulkan_ExtensionsSupported (const VkExtensionProperties *extensions,
 								int numExtensions,
 								const char * const *requested);
+int Vulkan_LayersSupported (const VkLayerProperties *extensions,
+								int numLayers,
+								const char * const *requested);
 
 #endif // __QF_Vulkan_init_h
diff --git a/include/QF/Vulkan/qf_vid.h b/include/QF/Vulkan/qf_vid.h
index 8e1825b48..877bebaa3 100644
--- a/include/QF/Vulkan/qf_vid.h
+++ b/include/QF/Vulkan/qf_vid.h
@@ -31,6 +31,7 @@
 #include "QF/Vulkan/cvars.h"
 
 struct vulkan_ctx_s;
+void Vulkan_CreateDevice (struct vulkan_ctx_s *ctx);
 void Vulkan_Init_Common (struct vulkan_ctx_s *ctx);
 void Vulkan_Shutdown_Common (struct vulkan_ctx_s *ctx);
 
diff --git a/include/vid_vulkan.h b/include/vid_vulkan.h
index eea285ae4..387a82078 100644
--- a/include/vid_vulkan.h
+++ b/include/vid_vulkan.h
@@ -15,10 +15,14 @@ typedef struct vulkan_ctx_s {
 	int (*get_presentation_support) (struct vulkan_ctx_s *ctx,
 									 VkPhysicalDevice physicalDevice,
 									 uint32_t queueFamilyIndex);
+	void        (*choose_visual) (struct vulkan_ctx_s *ctx);
+	void        (*create_window) (struct vulkan_ctx_s *ctx);
 	VkSurfaceKHR (*create_surface) (struct vulkan_ctx_s *ctx);
 
 	struct VulkanInstance_s *vtx;
+	struct VulkanDevice_s *dev;
 	VkInstance  instance;
+	VkDevice    device;
 #define EXPORTED_VULKAN_FUNCTION(fname) PFN_##fname fname;
 #define GLOBAL_LEVEL_VULKAN_FUNCTION(fname) PFN_##fname fname;
 #include "QF/Vulkan/funclist.h"
diff --git a/libs/video/renderer/vid_render_vulkan.c b/libs/video/renderer/vid_render_vulkan.c
index 60c7c1b5e..c09bfe5e4 100644
--- a/libs/video/renderer/vid_render_vulkan.c
+++ b/libs/video/renderer/vid_render_vulkan.c
@@ -31,10 +31,13 @@
 #define NH_DEFINE
 #include "vulkan/namehack.h"
 
+#include "QF/sys.h"
+
 #include "QF/plugin/general.h"
 #include "QF/plugin/vid_render.h"
 
 #include "QF/Vulkan/qf_vid.h"
+#include "QF/Vulkan/init.h"
 
 #include "mod_internal.h"
 #include "r_internal.h"
@@ -138,13 +141,16 @@ set_palette (const byte *palette)
 static void
 vulkan_vid_render_choose_visual (void)
 {
-	//vulkan_ctx->coose_visual (vulkan_ctx);
+	Vulkan_CreateDevice (vulkan_ctx);
+	vulkan_ctx->choose_visual (vulkan_ctx);
+	Sys_Printf ("%p %p\n", vulkan_ctx->dev->device, vulkan_ctx->dev->queue);
 }
 
 static void
 vulkan_vid_render_create_context (void)
 {
-	vulkan_ctx->create_surface (vulkan_ctx);
+	vulkan_ctx->create_window (vulkan_ctx);
+	vulkan_ctx->dev->surface = vulkan_ctx->create_surface (vulkan_ctx);
 }
 
 static void
diff --git a/libs/video/renderer/vulkan/init.c b/libs/video/renderer/vulkan/init.c
index 7b553d5f6..eba6fa4be 100644
--- a/libs/video/renderer/vulkan/init.c
+++ b/libs/video/renderer/vulkan/init.c
@@ -56,17 +56,17 @@ static uint32_t numExtensions;
 static VkExtensionProperties *instanceExtensionProperties;
 static const char **instanceExtensionNames;
 
-static const char *validationLayers[] = {
+const char * const vulkanValidationLayers[] = {
 	"VK_LAYER_LUNARG_standard_validation",
 	0,
 };
 
-static const char *debugExtensions[] = {
+static const char * const debugExtensions[] = {
 	VK_EXT_DEBUG_UTILS_EXTENSION_NAME,
 	0,
 };
 
-static const char *device_types[] = {
+static const char * const device_types[] = {
 	"other",
 	"integrated gpu",
 	"discrete gpu",
@@ -278,28 +278,30 @@ Vulkan_CreateInstance (vulkan_ctx_t *ctx,
 		get_instance_layers_and_extensions (ctx);
 	}
 
-	createInfo.enabledLayerCount = count_strings (layers);
-	createInfo.ppEnabledLayerNames = layers;
-	createInfo.enabledExtensionCount = count_strings (extensions);
-	createInfo.ppEnabledExtensionNames = extensions;
+	uint32_t nlay = count_strings (layers);
+	uint32_t next = count_strings (extensions)
+					+ count_strings (ctx->required_extensions);
 	if (vulkan_use_validation->int_val) {
-		createInfo.enabledLayerCount += count_strings (validationLayers);
-		createInfo.enabledExtensionCount += count_strings (debugExtensions);
+		nlay += count_strings (vulkanValidationLayers);
+		next += count_strings (debugExtensions);
 	}
-	const char **lay = alloca (createInfo.enabledLayerCount * sizeof (const char *));
-	const char **ext = alloca (createInfo.enabledExtensionCount * sizeof (const char *));
+	const char **lay = alloca (nlay * sizeof (const char *));
+	const char **ext = alloca (next * sizeof (const char *));
+	// ensure there are null pointers so merge_strings can act as append
+	// since it does not add a null
+	memset (lay, 0, nlay * sizeof (const char *));
+	memset (ext, 0, next * sizeof (const char *));
+	merge_strings (lay, layers, 0);
+	merge_strings (ext, extensions, ctx->required_extensions);
 	if (vulkan_use_validation->int_val) {
-		merge_strings (lay, layers, validationLayers);
-		merge_strings (ext, extensions, debugExtensions);
-	} else {
-		merge_strings (lay, layers, 0);
-		merge_strings (ext, extensions, 0);
+		merge_strings (lay, lay, vulkanValidationLayers);
+		merge_strings (ext, ext, debugExtensions);
 	}
-	prune_strings (instanceLayerNames, lay,
-				   &createInfo.enabledLayerCount);
-	prune_strings (instanceExtensionNames, ext,
-				   &createInfo.enabledExtensionCount);
+	prune_strings (instanceLayerNames, lay, &nlay);
+	prune_strings (instanceExtensionNames, ext, &next);
+	createInfo.enabledLayerCount = nlay;
 	createInfo.ppEnabledLayerNames = lay;
+	createInfo.enabledExtensionCount = next;
 	createInfo.ppEnabledExtensionNames = ext;
 
 	res = ctx->vkCreateInstance (&createInfo, 0, &instance);
@@ -348,6 +350,27 @@ Vulkan_DestroyInstance (VulkanInstance_t *instance)
 	free (instance);
 }
 
+int
+Vulkan_LayersSupported (const VkLayerProperties *layers,
+						int numLayers,
+						const char * const *requested)
+{
+	while (*requested) {
+		int         i;
+		for (i = 0; i < numLayers; i++) {
+			if (!strcmp (*requested, layers[i].layerName)) {
+				break;
+			}
+		}
+		if (i == numLayers) {
+			// requested layer not found
+			break;
+		}
+		requested++;
+	}
+	return !*requested;
+}
+
 int
 Vulkan_ExtensionsSupported (const VkExtensionProperties *extensions,
 							int numExtensions,
@@ -360,10 +383,11 @@ Vulkan_ExtensionsSupported (const VkExtensionProperties *extensions,
 				break;
 			}
 		}
-		if (i < numExtensions) {
+		if (i == numExtensions) {
 			// requested extension not found
 			break;
 		}
+		requested++;
 	}
 	return !*requested;
 }
diff --git a/libs/video/renderer/vulkan/util.c b/libs/video/renderer/vulkan/util.c
index 5603bbd5d..8fa5c2a72 100644
--- a/libs/video/renderer/vulkan/util.c
+++ b/libs/video/renderer/vulkan/util.c
@@ -36,7 +36,7 @@
 #include "util.h"
 
 int
-count_strings (const char **str)
+count_strings (const char * const *str)
 {
 	int         count = 0;
 
@@ -49,7 +49,8 @@ count_strings (const char **str)
 }
 
 void
-merge_strings (const char **out, const char **in1, const char **in2)
+merge_strings (const char **out, const char * const *in1,
+			   const char * const *in2)
 {
 	if (in1) {
 		while (*in1) {
diff --git a/libs/video/renderer/vulkan/util.h b/libs/video/renderer/vulkan/util.h
index 8d1a967a3..0948a1bbd 100644
--- a/libs/video/renderer/vulkan/util.h
+++ b/libs/video/renderer/vulkan/util.h
@@ -2,8 +2,10 @@
 #define __util_h
 
 #include <stdint.h>
-int count_strings (const char **str);
-void merge_strings (const char **out, const char **in1, const char **in2);
-void prune_strings (const char * const *reference, const char **strings, uint32_t *count);
+int count_strings (const char * const *str);
+void merge_strings (const char **out, const char * const *in1,
+					const char * const *in2);
+void prune_strings (const char * const *reference, const char **strings,
+					uint32_t *count);
 
 #endif//__util_h
diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c
index 96094303a..c7060ef58 100644
--- a/libs/video/renderer/vulkan/vulkan_vid_common.c
+++ b/libs/video/renderer/vulkan/vulkan_vid_common.c
@@ -55,8 +55,7 @@
 #include "r_internal.h"
 #include "vid_vulkan.h"
 
-static VulkanInstance_t *vulkan_instance;
-static VulkanDevice_t *vulkan_device;
+#include "util.h"
 
 void
 Vulkan_Init_Cvars ()
@@ -74,6 +73,7 @@ static const char *instance_extensions[] = {
 };
 
 static const char *device_extensions[] = {
+	VK_KHR_SWAPCHAIN_EXTENSION_NAME,
 	0,
 };
 
@@ -126,18 +126,61 @@ load_device_funcs (VulkanInstance_t *inst, VulkanDevice_t *dev)
 #include "QF/Vulkan/funclist.h"
 }
 
-static VulkanDevice_t *
-create_suitable_device (VulkanInstance_t *instance)
+void
+Vulkan_Init_Common (vulkan_ctx_t *ctx)
 {
-	for (uint32_t i = 0; i < instance->numDevices; i++) {
-		VulkanPhysDevice_t *phys = &instance->devices[i];
+	Sys_Printf ("Vulkan_Init_Common\n");
+	Vulkan_Init_Cvars ();
+
+	ctx->vtx = Vulkan_CreateInstance (ctx, PACKAGE_STRING, 0x000702ff, 0, instance_extensions);//FIXME version
+	ctx->instance = ctx->vtx->instance;
+}
+
+void
+Vulkan_Shutdown_Common (vulkan_ctx_t *ctx)
+{
+	Vulkan_DestroyInstance (ctx->vtx);
+	ctx->vtx = 0;
+	ctx->unload_vulkan (ctx);
+}
+
+void
+Vulkan_CreateDevice (vulkan_ctx_t *ctx)
+{
+	VulkanInstance_t *inst = ctx->vtx;
+
+	uint32_t nlay = 1;	// ensure alloca doesn't see 0 and terminated
+	uint32_t next = count_strings (device_extensions) + 1; // ensure terminated
+	if (vulkan_use_validation->int_val) {
+		nlay += count_strings (vulkanValidationLayers);
+	}
+	const char **lay = alloca (nlay * sizeof (const char *));
+	const char **ext = alloca (next * sizeof (const char *));
+	// ensure there are null pointers so merge_strings can act as append
+	// since it does not add a null, but also make sure the counts reflect
+	// actual numbers
+	memset (lay, 0, nlay-- * sizeof (const char *));
+	memset (ext, 0, next-- * sizeof (const char *));
+	merge_strings (ext, device_extensions, 0);
+	if (vulkan_use_validation->int_val) {
+		merge_strings (lay, lay, vulkanValidationLayers);
+	}
+
+	for (uint32_t i = 0; i < inst->numDevices; i++) {
+		VulkanPhysDevice_t *phys = &inst->devices[i];
+		if (!Vulkan_LayersSupported (phys->layers, phys->numLayers, lay)) {
+			continue;
+		}
 		if (!Vulkan_ExtensionsSupported (phys->extensions, phys->numExtensions,
-										 device_extensions)) {
-			return 0;
+										 ext)) {
+			continue;
 		}
 		int family = find_queue_family (phys, VK_QUEUE_GRAPHICS_BIT);
 		if (family < 0) {
-			return 0;
+			continue;
+		}
+		if (!ctx->get_presentation_support (ctx, phys->device, family)) {
+			continue;
 		}
 		float priority = 1;
 		VkDeviceQueueCreateInfo qCreateInfo = {
@@ -148,52 +191,20 @@ create_suitable_device (VulkanInstance_t *instance)
 		VkDeviceCreateInfo dCreateInfo = {
 			VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO, 0, 0,
 			1, &qCreateInfo,
-			0, 0,
-			0, device_extensions,
+			nlay, lay,
+			next, ext,
 			&features
 		};
 		memset (&features, 0, sizeof (features));
 		VulkanDevice_t *device = calloc (1, sizeof (VulkanDevice_t));
-		if (instance->vkCreateDevice (phys->device, &dCreateInfo, 0,
+		if (inst->vkCreateDevice (phys->device, &dCreateInfo, 0,
 									  &device->device) == VK_SUCCESS) {
-			load_device_funcs (instance, device);
+			load_device_funcs (inst, device);
 			device->vkGetDeviceQueue (device->device, family,
 									  0, &device->queue);
-			return device;
+			ctx->dev = device;
+			ctx->device = device->device;
+			return;
 		}
 	}
-	return 0;
-}
-
-int x = 1;
-
-void
-Vulkan_Init_Common (vulkan_ctx_t *ctx)
-{
-	Sys_Printf ("Vulkan_Init_Common\n");
-	Vulkan_Init_Cvars ();
-
-	vulkan_instance = Vulkan_CreateInstance (ctx, PACKAGE_STRING, 0x000702ff, 0, instance_extensions);//FIXME version
-	vulkan_device = create_suitable_device (vulkan_instance);
-	if (!vulkan_device) {
-		Sys_Error ("no suitable vulkan device found");
-	}
-	// only for now...
-	Sys_Printf ("%p %p\n", vulkan_device->device, vulkan_device->queue);
-	Vulkan_Shutdown_Common (ctx);
-	if (x)
-	Sys_Quit();
-}
-
-void
-Vulkan_Shutdown_Common (vulkan_ctx_t *ctx)
-{
-	if (vulkan_device) {
-		vulkan_device->vkDestroyDevice (vulkan_device->device, 0);
-		free (vulkan_device);
-		vulkan_device = 0;
-	}
-	Vulkan_DestroyInstance (vulkan_instance);
-	vulkan_instance = 0;
-	ctx->unload_vulkan (ctx);
 }
diff --git a/libs/video/targets/vid_x11_vulkan.c b/libs/video/targets/vid_x11_vulkan.c
index e472c0c0e..b7b88d1b1 100644
--- a/libs/video/targets/vid_x11_vulkan.c
+++ b/libs/video/targets/vid_x11_vulkan.c
@@ -110,11 +110,38 @@ unload_vulkan_library (vulkan_ctx_t *ctx)
 	vulkan_library = 0;
 }
 
+static void
+x11_vulkan_init_presentation (vulkan_ctx_t *ctx)
+{
+	ctx->presentation = calloc (1, sizeof (vulkan_presentation_t));
+	vulkan_presentation_t *pres = ctx->presentation;
+	VkInstance  instance = ctx->instance;
+
+#define INSTANCE_LEVEL_VULKAN_FUNCTION(name) \
+	pres->name = (PFN_##name) ctx->vkGetInstanceProcAddr (instance, #name); \
+	if (!pres->name) { \
+		Sys_Error ("Couldn't find instance-level function %s", #name); \
+	}
+#include "QF/Vulkan/funclist.h"
+
+	XVisualInfo template;
+	Visual *defaultVisual = XDefaultVisual (x_disp, x_screen);
+	template.visualid = XVisualIDFromVisual (defaultVisual);
+	int template_mask = VisualIDMask;
+	pres->display = x_disp;
+	pres->usable_visuals = set_new ();
+	pres->visinfo = XGetVisualInfo (x_disp, template_mask, &template,
+									&pres->num_visuals);
+}
+
 static int
 x11_vulkan_get_presentation_support (vulkan_ctx_t *ctx,
 									 VkPhysicalDevice physicalDevice,
 									 uint32_t queueFamilyIndex)
 {
+	if (!ctx->presentation) {
+		x11_vulkan_init_presentation (ctx);
+	}
 	vulkan_presentation_t *pres = ctx->presentation;
 
 	set_empty (pres->usable_visuals);
@@ -129,6 +156,25 @@ x11_vulkan_get_presentation_support (vulkan_ctx_t *ctx,
 	return !set_is_empty (pres->usable_visuals);
 }
 
+static void
+x11_vulkan_choose_visual (vulkan_ctx_t *ctx)
+{
+	vulkan_presentation_t *pres = ctx->presentation;
+	set_iter_t *first = set_first (pres->usable_visuals);
+	if (first) {
+		x_visinfo = pres->visinfo + first->element;
+		x_vis = x_visinfo->visual;
+		set_del_iter (first);
+	}
+}
+
+static void
+x11_vulkan_create_window (vulkan_ctx_t *ctx)
+{
+	vulkan_presentation_t *pres = ctx->presentation;
+	pres->window = x_win;
+}
+
 static VkSurfaceKHR
 x11_vulkan_create_surface (vulkan_ctx_t *ctx)
 {
@@ -155,6 +201,8 @@ X11_Vulkan_Context (void)
 	ctx->load_vulkan = load_vulkan_library;
 	ctx->unload_vulkan = unload_vulkan_library;
 	ctx->get_presentation_support = x11_vulkan_get_presentation_support;
+	ctx->choose_visual = x11_vulkan_choose_visual;
+	ctx->create_window = x11_vulkan_create_window;
 	ctx->create_surface = x11_vulkan_create_surface;
 	ctx->required_extensions = required_extensions;
 	return ctx;

From 8a3cd224a36a9bb1c8fba84e5e77113c3d7f3fe3 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 9 Jul 2019 20:14:30 +0900
Subject: [PATCH 0287/1519] Add vulkan developer flag

---
 include/QF/sys.h                  | 1 +
 libs/video/renderer/vulkan/init.c | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/include/QF/sys.h b/include/QF/sys.h
index f93432d65..4dd61bacd 100644
--- a/include/QF/sys.h
+++ b/include/QF/sys.h
@@ -97,6 +97,7 @@ void Sys_MaskPrintf (int mask, const char *fmt, ...) __attribute__((format(print
 #define SYS_GLSL    (1|2048)
 #define SYS_SKIN    (1|4096)
 #define SYS_MODEL   (1|8192)
+#define SYS_VULKAN  (1|16384)
 
 int Sys_CheckInput (int idle, int net_socket);
 const char *Sys_ConsoleInput (void);
diff --git a/libs/video/renderer/vulkan/init.c b/libs/video/renderer/vulkan/init.c
index eba6fa4be..19091bb8a 100644
--- a/libs/video/renderer/vulkan/init.c
+++ b/libs/video/renderer/vulkan/init.c
@@ -102,7 +102,7 @@ get_instance_layers_and_extensions  (vulkan_ctx_t *ctx)
 	}
 	instanceExtensionNames[i] = 0;
 
-	if (developer->int_val & SYS_VID) {
+	if (developer->int_val & SYS_VULKAN) {
 		for (i = 0; i < numLayers; i++) {
 			Sys_Printf ("%s %x %u %s\n",
 						properties[i].layerName,
@@ -154,7 +154,7 @@ init_physdev (VulkanInstance_t *instance, VkPhysicalDevice dev, VulkanPhysDevice
 														&physdev->numQueueFamilies,
 														physdev->queueFamilies);
 
-	if (developer->int_val & SYS_VID) {
+	if (developer->int_val & SYS_VULKAN) {
 		VkPhysicalDeviceProperties *prop = &physdev->properties;
 		Sys_Printf ("dev: %p\n", dev);
 		Sys_Printf ("  %x %x\n", prop->apiVersion, prop->driverVersion);

From 8c238d3def13ef509272f2f9889d57aa00fe4eaa Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 9 Jul 2019 20:14:57 +0900
Subject: [PATCH 0288/1519] Parse developer flag names when cvar is set

So much easier to remember "vulkan" instead of which power of two it
is.
---
 libs/util/cvar.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 78 insertions(+), 1 deletion(-)

diff --git a/libs/util/cvar.c b/libs/util/cvar.c
index 64ef200ab..3b30b00f9 100644
--- a/libs/util/cvar.c
+++ b/libs/util/cvar.c
@@ -37,6 +37,7 @@
 # include <strings.h>
 #endif
 
+#include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -327,6 +328,82 @@ Cvar_WriteVariables (QFile *f)
 			Qprintf (f, "seta %s \"%s\"\n", var->name, var->string);
 }
 
+// XXX make sure in sync with SYS_* in sys.h
+static const char *developer_flags[] = {
+	"dev",
+	"warn",
+	"vid",
+	"fs_nf",
+	"fs_f",
+	"fs",
+	"net",
+	"rua_obj",
+	"rua_msg",
+	"snd",
+	"glt",
+	"glsl",
+	"skin",
+	"model",
+	"vulkan",
+	0
+};
+
+static int
+parse_developer_flag (const char *flag)
+{
+	const char **devflag;
+	char       *end;
+	int         val;
+
+	val = strtol (flag, &end, 0);
+	if (!*end) {
+		return val;
+	}
+	for (devflag = developer_flags; *devflag; devflag++) {
+		if (!strcmp (*devflag, flag)) {
+			return 1 << (devflag - developer_flags);
+		}
+	}
+	return 0;
+}
+
+static void
+developer_f (cvar_t *var)
+{
+	char       *buf = alloca (strlen (var->string) + 1);
+	const char *s;
+	char       *b;
+	char        c;
+	int         parse = 0;
+
+	for (s = var->string; *s; s++) {
+		if (isalpha (*s) || *s == '|') {
+			parse = 1;
+			break;
+		}
+	}
+	if (!parse) {
+		return;
+	}
+	var->int_val = 0;
+	for (s = var->string, b = buf; (c = *s++); ) {
+		if (isspace (c)) {
+			continue;
+		}
+		if (c == '|') {
+			*b = 0;
+			var->int_val |= parse_developer_flag (buf);
+			b = buf;
+			continue;
+		}
+		*b++ = c;
+	}
+	if (b != buf) {
+		*b = 0;
+		var->int_val |= parse_developer_flag (buf);
+	}
+}
+
 static void
 set_cvar (const char *cmd, int orflags)
 {
@@ -587,7 +664,7 @@ Cvar_Init_Hash (void)
 VISIBLE void
 Cvar_Init (void)
 {
-	developer = Cvar_Get ("developer", "0", CVAR_NONE, NULL,
+	developer = Cvar_Get ("developer", "0", CVAR_NONE, developer_f,
 			"set to enable extra debugging information");
 
 	Cmd_AddCommand ("set", Cvar_Set_f, "Set the selected variable, useful on "

From 452eb5a83d85db2d0c38215472fde386f8696aff Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 9 Jul 2019 20:16:08 +0900
Subject: [PATCH 0289/1519] Preserve parsed cvar values when string is same

Fixes parsed developer flags on the command line getting reset.
---
 libs/util/cvar.c | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/libs/util/cvar.c b/libs/util/cvar.c
index 3b30b00f9..e3e14236f 100644
--- a/libs/util/cvar.c
+++ b/libs/util/cvar.c
@@ -264,19 +264,21 @@ Cvar_Set (cvar_t *var, const char *value)
 	}
 
 	changed = !strequal (var->string, value);
-	free ((char*)var->string);					// free the old value string
+	if (changed) {
+		free ((char*)var->string);				// free the old value string
 
-	var->string = strdup (value);
-	var->value = atof (var->string);
-	var->int_val = atoi (var->string);
-	VectorZero (var->vec);
-	vals = sscanf (var->string, "%f %f %f",
-				   &var->vec[0], &var->vec[1], &var->vec[2]);
-	if (vals == 1)
-		var->vec[2] = var->vec[1] = var->vec[0];
+		var->string = strdup (value);
+		var->value = atof (var->string);
+		var->int_val = atoi (var->string);
+		VectorZero (var->vec);
+		vals = sscanf (var->string, "%f %f %f",
+					   &var->vec[0], &var->vec[1], &var->vec[2]);
+		if (vals == 1)
+			var->vec[2] = var->vec[1] = var->vec[0];
 
-	if (changed && var->callback)
-		var->callback (var);
+		if (var->callback)
+			var->callback (var);
+	}
 }
 
 VISIBLE void

From 3191604641aba1e4775fabc4c4565c81e6719039 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 9 Jul 2019 21:07:59 +0900
Subject: [PATCH 0290/1519] Uncomment already implemented functions

---
 libs/video/renderer/vid_render_vulkan.c | 62 ++++++++++++-------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/libs/video/renderer/vid_render_vulkan.c b/libs/video/renderer/vid_render_vulkan.c
index c09bfe5e4..693a85d14 100644
--- a/libs/video/renderer/vid_render_vulkan.c
+++ b/libs/video/renderer/vid_render_vulkan.c
@@ -49,29 +49,29 @@
 static vulkan_ctx_t *vulkan_ctx;
 
 static vid_model_funcs_t model_funcs = {
-/*	vulkan_Mod_LoadExternalTextures,
-	vulkan_Mod_LoadLighting,
-	vulkan_Mod_SubdivideSurface,
-	vulkan_Mod_ProcessTexture,
+	0,//vulkan_Mod_LoadExternalTextures,
+	0,//vulkan_Mod_LoadLighting,
+	0,//vulkan_Mod_SubdivideSurface,
+	0,//vulkan_Mod_ProcessTexture,
 
 	Mod_LoadIQM,
 	Mod_LoadAliasModel,
 	Mod_LoadSpriteModel,
 
-	vulkan_Mod_MakeAliasModelDisplayLists,
-	vulkan_Mod_LoadSkin,
-	vulkan_Mod_FinalizeAliasModel,
-	vulkan_Mod_LoadExternalSkins,
-	vulkan_Mod_IQMFinish,
+	0,//vulkan_Mod_MakeAliasModelDisplayLists,
+	0,//vulkan_Mod_LoadSkin,
+	0,//vulkan_Mod_FinalizeAliasModel,
+	0,//vulkan_Mod_LoadExternalSkins,
+	0,//vulkan_Mod_IQMFinish,
 	0,
-	vulkan_Mod_SpriteLoadTexture,
+	0,//vulkan_Mod_SpriteLoadTexture,
 
 	Skin_SetColormap,
 	Skin_SetSkin,
-	vulkan_Skin_SetupSkin,
+	0,//vulkan_Skin_SetupSkin,
 	Skin_SetTranslation,
-	vulkan_Skin_ProcessTranslation,
-	vulkan_Skin_InitTranslations,*/
+	0,//vulkan_Skin_ProcessTranslation,
+	0,//vulkan_Skin_InitTranslations,
 };
 
 vid_render_funcs_t vulkan_vid_render_funcs = {
@@ -97,37 +97,37 @@ vid_render_funcs_t vulkan_vid_render_funcs = {
 	vulkan_Draw_Picf,
 	vulkan_Draw_SubPic,
 
-/*	vulkan_SCR_UpdateScreen,
+	0,//vulkan_SCR_UpdateScreen,
 	SCR_DrawRam,
 	SCR_DrawTurtle,
 	SCR_DrawPause,
-	vulkan_SCR_CaptureBGR,
-	vulkan_SCR_ScreenShot,
+	0,//vulkan_SCR_CaptureBGR,
+	0,//vulkan_SCR_ScreenShot,
 	SCR_DrawStringToSnap,
 
-	vulkan_Fog_Update,
-	vulkan_Fog_ParseWorldspawn,
+	0,//vulkan_Fog_Update,
+	0,//vulkan_Fog_ParseWorldspawn,
 
-	vulkan_R_Init,
-	vulkan_R_ClearState,
-	vulkan_R_LoadSkys,
-	vulkan_R_NewMap,
+	0,//vulkan_R_Init,
+	0,//vulkan_R_ClearState,
+	0,//vulkan_R_LoadSkys,
+	0,//vulkan_R_NewMap,
 	R_AddEfrags,
 	R_RemoveEfrags,
 	R_EnqueueEntity,
-	vulkan_R_LineGraph,
+	0,//vulkan_R_LineGraph,
 	R_AllocDlight,
 	R_AllocEntity,
-	vulkan_R_RenderView,
+	0,//vulkan_R_RenderView,
 	R_DecayLights,
-	vulkan_R_ViewChanged,
-	vulkan_R_ClearParticles,
-	vulkan_R_InitParticles,
-	vulkan_SCR_ScreenShot_f,
-	vulkan_r_easter_eggs_f,
-	vulkan_r_particles_style_f,
+	0,//vulkan_R_ViewChanged,
+	0,//vulkan_R_ClearParticles,
+	0,//vulkan_R_InitParticles,
+	0,//vulkan_SCR_ScreenShot_f,
+	0,//vulkan_r_easter_eggs_f,
+	0,//vulkan_r_particles_style_f,
 	0,
-	&model_funcs*/
+	&model_funcs
 };
 
 static void

From 31ead15e9688bde056a91967a200915d10f6f149 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 9 Jul 2019 22:04:48 +0900
Subject: [PATCH 0291/1519] Add comment about developer flags

---
 include/QF/sys.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/QF/sys.h b/include/QF/sys.h
index 4dd61bacd..7c669563e 100644
--- a/include/QF/sys.h
+++ b/include/QF/sys.h
@@ -83,6 +83,7 @@ double Sys_DoubleTime (void);
 void Sys_TimeOfDay(date_t *date);
 
 void Sys_MaskPrintf (int mask, const char *fmt, ...) __attribute__((format(printf,2,3)));
+// remember to update developer_flags in cvar.c
 #define SYS_DEV     (1|0)
 #define SYS_WARN    (1|2)	// bit 0 so developer 1 will pick it up
 #define SYS_VID     (1|4)

From ed3c5cb9ec0fc47abd29a597c2d91b73505d7bff Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 10 Jul 2019 13:09:16 +0900
Subject: [PATCH 0292/1519] Add a strset "class"

It's just a wrapper around hashtab, but it makes checking if a string is
in a set easy. Way overkill when only a few extensions are enabled, but
more might come later.
---
 libs/video/renderer/vulkan/util.c | 27 +++++++++++++++++++++++++++
 libs/video/renderer/vulkan/util.h |  5 +++++
 2 files changed, 32 insertions(+)

diff --git a/libs/video/renderer/vulkan/util.c b/libs/video/renderer/vulkan/util.c
index 8fa5c2a72..09e1b146a 100644
--- a/libs/video/renderer/vulkan/util.c
+++ b/libs/video/renderer/vulkan/util.c
@@ -33,8 +33,35 @@
 # include <strings.h>
 #endif
 
+#include "QF/hash.h"
+
 #include "util.h"
 
+static const char *
+strset_get_key (const void *_str, void *unused)
+{
+	return (const char *)_str;
+}
+
+strset_t *
+new_strset (const char * const *strings)
+{
+	hashtab_t  *tab = Hash_NewTable (61, strset_get_key, 0, 0);
+	for ( ; *strings; strings++) {
+		Hash_Add (tab, (void *) *strings);
+	}
+	return (strset_t *) tab;
+}
+void del_strset (strset_t *strset)
+{
+	Hash_DelTable ((hashtab_t *) strset);
+}
+
+int strset_contains (strset_t *strset, const char *str)
+{
+	return Hash_Find ((hashtab_t *) strset, str) != 0;
+}
+
 int
 count_strings (const char * const *str)
 {
diff --git a/libs/video/renderer/vulkan/util.h b/libs/video/renderer/vulkan/util.h
index 0948a1bbd..a15aac4c8 100644
--- a/libs/video/renderer/vulkan/util.h
+++ b/libs/video/renderer/vulkan/util.h
@@ -8,4 +8,9 @@ void merge_strings (const char **out, const char * const *in1,
 void prune_strings (const char * const *reference, const char **strings,
 					uint32_t *count);
 
+typedef struct strset_s strset_t;
+strset_t *new_strset (const char * const *strings);
+void del_strset (strset_t *strset);
+int strset_contains (strset_t *strset, const char *str);
+
 #endif//__util_h

From 2771e9c5736b5e96e313e40a59c0c93a128c8d2d Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 10 Jul 2019 13:16:46 +0900
Subject: [PATCH 0293/1519] Correct extension handling

I had missed a critical bit from the cookbook.
---
 include/QF/Vulkan/funclist.h                  | 49 ++++++++++++-------
 include/QF/Vulkan/init.h                      | 15 +++---
 include/vid_vulkan.h                          |  4 ++
 libs/video/renderer/vid_render_vulkan.c       | 10 +++-
 libs/video/renderer/vulkan/init.c             | 30 +++++++++---
 .../video/renderer/vulkan/vulkan_vid_common.c | 12 +++--
 libs/video/targets/vid_x11_vulkan.c           | 13 +++--
 7 files changed, 91 insertions(+), 42 deletions(-)

diff --git a/include/QF/Vulkan/funclist.h b/include/QF/Vulkan/funclist.h
index 79af14277..e54ce6f50 100644
--- a/include/QF/Vulkan/funclist.h
+++ b/include/QF/Vulkan/funclist.h
@@ -21,16 +21,6 @@ GLOBAL_LEVEL_VULKAN_FUNCTION (vkCreateInstance)
 #define INSTANCE_LEVEL_VULKAN_FUNCTION(function)
 #endif
 
-#if defined(VK_USE_PLATFORM_XLIB_KHR)
-INSTANCE_LEVEL_VULKAN_FUNCTION (vkGetPhysicalDeviceXlibPresentationSupportKHR)
-INSTANCE_LEVEL_VULKAN_FUNCTION (vkCreateXlibSurfaceKHR)
-#elif defined(VK_USE_PLATFORM_WIN32_KHR)
-INSTANCE_LEVEL_VULKAN_FUNCTION (vkGetPhysicalDeviceWin32PresentationSupportKHR)
-INSTANCE_LEVEL_VULKAN_FUNCTION (vkCreateWin32SurfaceKHR)
-#elif defined(VK_USE_PLATFORM_XCB_KHR)
-INSTANCE_LEVEL_VULKAN_FUNCTION (vkGetPhysicalDeviceXcbPresentationSupportKHR)
-INSTANCE_LEVEL_VULKAN_FUNCTION (vkCreateXcbSurfaceKHR)
-#else
 INSTANCE_LEVEL_VULKAN_FUNCTION (vkEnumeratePhysicalDevices)
 INSTANCE_LEVEL_VULKAN_FUNCTION (vkGetPhysicalDeviceProperties)
 INSTANCE_LEVEL_VULKAN_FUNCTION (vkGetPhysicalDeviceFeatures)
@@ -41,17 +31,40 @@ INSTANCE_LEVEL_VULKAN_FUNCTION (vkDestroyInstance)
 INSTANCE_LEVEL_VULKAN_FUNCTION (vkEnumerateDeviceLayerProperties)
 INSTANCE_LEVEL_VULKAN_FUNCTION (vkEnumerateDeviceExtensionProperties)
 INSTANCE_LEVEL_VULKAN_FUNCTION (vkGetPhysicalDeviceMemoryProperties)
-#endif
 
 #undef INSTANCE_LEVEL_VULKAN_FUNCTION
 
-#ifndef INSTANCE_LEVEL_VULKAN_FUNCTION_EXTENSION
-#define INSTANCE_LEVEL_VULKAN_FUNCTION_EXTENSION(function)
+#ifndef INSTANCE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION
+#define INSTANCE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION(function, extension)
 #endif
 
-INSTANCE_LEVEL_VULKAN_FUNCTION_EXTENSION (vkCreateDebugUtilsMessengerEXT)
+#if defined(VK_USE_PLATFORM_XLIB_KHR)
+INSTANCE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION
+	(vkGetPhysicalDeviceXlibPresentationSupportKHR,
+	 VK_KHR_XLIB_SURFACE_EXTENSION_NAME)
+INSTANCE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION
+	(vkCreateXlibSurfaceKHR,
+	 VK_KHR_XLIB_SURFACE_EXTENSION_NAME)
+#elif defined(VK_USE_PLATFORM_WIN32_KHR)
+INSTANCE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION
+	(vkGetPhysicalDeviceWin32PresentationSupportKHR,
+	 VK_KHR_WIN32_SURFACE_EXTENSION_NAME)
+INSTANCE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION
+	(vkCreateWin32SurfaceKHR,
+	 VK_KHR_WIN32_SURFACE_EXTENSION_NAME)
+#elif defined(VK_USE_PLATFORM_XCB_KHR)
+INSTANCE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION
+	(vkGetPhysicalDeviceXcbPresentationSupportKHR,
+	 VK_KHR_XCB_SURFACE_EXTENSION_NAME)
+INSTANCE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION
+	(vkCreateXcbSurfaceKHR,
+	 VK_KHR_XCB_SURFACE_EXTENSION_NAME)
+#else
+INSTANCE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION
+	(vkCreateDebugUtilsMessengerEXT, VK_EXT_DEBUG_UTILS_EXTENSION_NAME)
+#endif
 
-#undef INSTANCE_LEVEL_VULKAN_FUNCTION_EXTENSION
+#undef INSTANCE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION
 
 #ifndef DEVICE_LEVEL_VULKAN_FUNCTION
 #define DEVICE_LEVEL_VULKAN_FUNCTION(function)
@@ -62,8 +75,8 @@ DEVICE_LEVEL_VULKAN_FUNCTION (vkGetDeviceQueue)
 
 #undef DEVICE_LEVEL_VULKAN_FUNCTION
 
-#ifndef DEVICE_LEVEL_VULKAN_FUNCTION_EXTENSION
-#define DEVICE_LEVEL_VULKAN_FUNCTION_EXTENSION(function)
+#ifndef DEVICE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION
+#define DEVICE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION(function, extension)
 #endif
 
-#undef DEVICE_LEVEL_VULKAN_FUNCTION_EXTENSION
+#undef DEVICE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION
diff --git a/include/QF/Vulkan/init.h b/include/QF/Vulkan/init.h
index 3afab0179..961c72d84 100644
--- a/include/QF/Vulkan/init.h
+++ b/include/QF/Vulkan/init.h
@@ -35,9 +35,9 @@ typedef struct VulkanDevice_s {
 	VkQueue queue;
 	VkSurfaceKHR surface;
 
-    #define DEVICE_LEVEL_VULKAN_FUNCTION(name) PFN_##name name;
-    #define DEVICE_LEVEL_VULKAN_FUNCTION_EXTENSION(name) PFN_##name name;
-	#include "QF/Vulkan/funclist.h"
+#define DEVICE_LEVEL_VULKAN_FUNCTION(name) PFN_##name name;
+#define DEVICE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION(name,ext) PFN_##name name;
+#include "QF/Vulkan/funclist.h"
 } VulkanDevice_t;
 
 typedef struct {
@@ -55,13 +55,16 @@ typedef struct {
 
 typedef struct VulkanInstance_s {
 	VkInstance  instance;
+	struct strset_s *enabled_extensions;
+	int         (*extension_enabled) (struct VulkanInstance_s *inst,
+									  const char *ext);
 	VkDebugUtilsMessengerEXT debug_callback;
 	uint32_t    numDevices;
 	VulkanPhysDevice_t *devices;
 
-    #define INSTANCE_LEVEL_VULKAN_FUNCTION(name) PFN_##name name;
-    #define INSTANCE_LEVEL_VULKAN_FUNCTION_EXTENSION(name) PFN_##name name;
-	#include "QF/Vulkan/funclist.h"
+#define INSTANCE_LEVEL_VULKAN_FUNCTION(name) PFN_##name name;
+#define INSTANCE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION(name,ext) PFN_##name name;
+#include "QF/Vulkan/funclist.h"
 } VulkanInstance_t;
 
 extern const char * const vulkanValidationLayers[];
diff --git a/include/vid_vulkan.h b/include/vid_vulkan.h
index 387a82078..924a3a1d4 100644
--- a/include/vid_vulkan.h
+++ b/include/vid_vulkan.h
@@ -6,11 +6,14 @@
 #endif
 #include <vulkan/vulkan.h>
 
+struct VulkanInstance_s;
 typedef struct vulkan_ctx_s {
 	void        (*load_vulkan) (struct vulkan_ctx_s *ctx);
 	void        (*unload_vulkan) (struct vulkan_ctx_s *ctx);
 
 	const char **required_extensions;
+	int         (*extension_enabled) (struct VulkanInstance_s *inst,
+									  const char *ext);
 	struct vulkan_presentation_s *presentation;
 	int (*get_presentation_support) (struct vulkan_ctx_s *ctx,
 									 VkPhysicalDevice physicalDevice,
@@ -22,6 +25,7 @@ typedef struct vulkan_ctx_s {
 	struct VulkanInstance_s *vtx;
 	struct VulkanDevice_s *dev;
 	VkInstance  instance;
+	VkPhysicalDevice physDevice;
 	VkDevice    device;
 #define EXPORTED_VULKAN_FUNCTION(fname) PFN_##fname fname;
 #define GLOBAL_LEVEL_VULKAN_FUNCTION(fname) PFN_##fname fname;
diff --git a/libs/video/renderer/vid_render_vulkan.c b/libs/video/renderer/vid_render_vulkan.c
index 693a85d14..11fe640f2 100644
--- a/libs/video/renderer/vid_render_vulkan.c
+++ b/libs/video/renderer/vid_render_vulkan.c
@@ -48,6 +48,13 @@
 
 static vulkan_ctx_t *vulkan_ctx;
 
+static void
+vulkan_R_Init (void)
+{
+	if (vulkan_ctx)
+		Sys_Quit ();
+}
+
 static vid_model_funcs_t model_funcs = {
 	0,//vulkan_Mod_LoadExternalTextures,
 	0,//vulkan_Mod_LoadLighting,
@@ -108,7 +115,7 @@ vid_render_funcs_t vulkan_vid_render_funcs = {
 	0,//vulkan_Fog_Update,
 	0,//vulkan_Fog_ParseWorldspawn,
 
-	0,//vulkan_R_Init,
+	vulkan_R_Init,
 	0,//vulkan_R_ClearState,
 	0,//vulkan_R_LoadSkys,
 	0,//vulkan_R_NewMap,
@@ -151,6 +158,7 @@ vulkan_vid_render_create_context (void)
 {
 	vulkan_ctx->create_window (vulkan_ctx);
 	vulkan_ctx->dev->surface = vulkan_ctx->create_surface (vulkan_ctx);
+	Sys_Printf ("%p\n", vulkan_ctx->dev->surface);
 }
 
 static void
diff --git a/libs/video/renderer/vulkan/init.c b/libs/video/renderer/vulkan/init.c
index 19091bb8a..529969014 100644
--- a/libs/video/renderer/vulkan/init.c
+++ b/libs/video/renderer/vulkan/init.c
@@ -198,6 +198,12 @@ init_physdev (VulkanInstance_t *instance, VkPhysicalDevice dev, VulkanPhysDevice
 	}
 }
 
+static int
+instance_extension_enabled (VulkanInstance_t *inst, const char *ext)
+{
+	return strset_contains (inst->enabled_extensions, ext);
+}
+
 static int message_severities =
 	VK_DEBUG_UTILS_MESSAGE_SEVERITY_VERBOSE_BIT_EXT |
 	VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT |
@@ -242,10 +248,13 @@ load_instance_funcs (vulkan_ctx_t *ctx)
 		Sys_Error ("Couldn't find instance level function %s", #name); \
 	}
 
-#define INSTANCE_LEVEL_VULKAN_FUNCTION_EXTENSION(name) \
-	vtx->name = (PFN_##name) ctx->vkGetInstanceProcAddr (instance, #name); \
-	if (!vtx->name) { \
-		Sys_Printf ("Couldn't find instance level function %s", #name); \
+#define INSTANCE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION(name, ext) \
+	if (vtx->extension_enabled (vtx, ext)) { \
+		vtx->name = (PFN_##name) ctx->vkGetInstanceProcAddr (instance, \
+															 #name); \
+		if (!vtx->name) { \
+			Sys_Error ("Couldn't find instance level function %s", #name); \
+		} \
 	}
 
 #include "QF/Vulkan/funclist.h"
@@ -278,9 +287,9 @@ Vulkan_CreateInstance (vulkan_ctx_t *ctx,
 		get_instance_layers_and_extensions (ctx);
 	}
 
-	uint32_t nlay = count_strings (layers);
+	uint32_t nlay = count_strings (layers) + 1;
 	uint32_t next = count_strings (extensions)
-					+ count_strings (ctx->required_extensions);
+					+ count_strings (ctx->required_extensions) + 1;
 	if (vulkan_use_validation->int_val) {
 		nlay += count_strings (vulkanValidationLayers);
 		next += count_strings (debugExtensions);
@@ -289,8 +298,8 @@ Vulkan_CreateInstance (vulkan_ctx_t *ctx,
 	const char **ext = alloca (next * sizeof (const char *));
 	// ensure there are null pointers so merge_strings can act as append
 	// since it does not add a null
-	memset (lay, 0, nlay * sizeof (const char *));
-	memset (ext, 0, next * sizeof (const char *));
+	memset (lay, 0, nlay-- * sizeof (const char *));
+	memset (ext, 0, next-- * sizeof (const char *));
 	merge_strings (lay, layers, 0);
 	merge_strings (ext, extensions, ctx->required_extensions);
 	if (vulkan_use_validation->int_val) {
@@ -299,6 +308,8 @@ Vulkan_CreateInstance (vulkan_ctx_t *ctx,
 	}
 	prune_strings (instanceLayerNames, lay, &nlay);
 	prune_strings (instanceExtensionNames, ext, &next);
+	lay[nlay] = 0;
+	ext[next] = 0;
 	createInfo.enabledLayerCount = nlay;
 	createInfo.ppEnabledLayerNames = lay;
 	createInfo.enabledExtensionCount = next;
@@ -310,6 +321,9 @@ Vulkan_CreateInstance (vulkan_ctx_t *ctx,
 	}
 	inst = malloc (sizeof(VulkanInstance_t));
 	inst->instance = instance;
+	inst->enabled_extensions = new_strset (ext);
+	inst->extension_enabled = instance_extension_enabled;
+	ctx->extension_enabled = instance_extension_enabled;
 	ctx->vtx = inst;
 	load_instance_funcs (ctx);
 
diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c
index c7060ef58..561eb64f5 100644
--- a/libs/video/renderer/vulkan/vulkan_vid_common.c
+++ b/libs/video/renderer/vulkan/vulkan_vid_common.c
@@ -117,10 +117,13 @@ load_device_funcs (VulkanInstance_t *inst, VulkanDevice_t *dev)
 		Sys_Error ("Couldn't find device level function %s", #name); \
 	}
 
-#define DEVICE_LEVEL_VULKAN_FUNCTION_EXTENSION(name) \
-	dev->name = (PFN_##name) inst->vkGetDeviceProcAddr (dev->device, #name); \
-	if (!dev->name) { \
-		Sys_Printf ("Couldn't find device level function %s", #name); \
+#define DEVICE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION(name, ext) \
+	if (inst->extension_enabled (vtx, ext)) { \
+		dev->name = (PFN_##name) inst->vkGetDeviceProcAddr (dev->device, \
+															#name); \
+		if (!dev->name) { \
+			Sys_Printf ("Couldn't find device level function %s", #name); \
+		} \
 	}
 
 #include "QF/Vulkan/funclist.h"
@@ -204,6 +207,7 @@ Vulkan_CreateDevice (vulkan_ctx_t *ctx)
 									  0, &device->queue);
 			ctx->dev = device;
 			ctx->device = device->device;
+			ctx->physDevice = phys->device;
 			return;
 		}
 	}
diff --git a/libs/video/targets/vid_x11_vulkan.c b/libs/video/targets/vid_x11_vulkan.c
index b7b88d1b1..812e74dad 100644
--- a/libs/video/targets/vid_x11_vulkan.c
+++ b/libs/video/targets/vid_x11_vulkan.c
@@ -61,7 +61,7 @@
 static cvar_t *vulkan_library_name;
 
 typedef struct vulkan_presentation_s {
-#define INSTANCE_LEVEL_VULKAN_FUNCTION(name) PFN_##name name;
+#define INSTANCE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION(name,ext) PFN_##name name;
 #include "QF/Vulkan/funclist.h"
 
 	Display    *display;
@@ -117,10 +117,13 @@ x11_vulkan_init_presentation (vulkan_ctx_t *ctx)
 	vulkan_presentation_t *pres = ctx->presentation;
 	VkInstance  instance = ctx->instance;
 
-#define INSTANCE_LEVEL_VULKAN_FUNCTION(name) \
-	pres->name = (PFN_##name) ctx->vkGetInstanceProcAddr (instance, #name); \
-	if (!pres->name) { \
-		Sys_Error ("Couldn't find instance-level function %s", #name); \
+#define INSTANCE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION(name, ext) \
+	if (ctx->extension_enabled (ctx->vtx, ext)) { \
+		pres->name = (PFN_##name) ctx->vkGetInstanceProcAddr (instance, \
+															  #name); \
+		if (!pres->name) { \
+			Sys_Error ("Couldn't find instance-level function %s", #name); \
+		} \
 	}
 #include "QF/Vulkan/funclist.h"
 

From d5cb4329112dcb766bbd337edd6bac4b1bc63e79 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 10 Jul 2019 22:15:39 +0900
Subject: [PATCH 0294/1519] Add a cvar to block use of x11 vidmode

Or really, allow it if the user specifically requests it: the default is
blocked. Modern systems (particularly displays) do not really like
changing resolution, so doing so by default seems rather wrong.
---
 libs/video/targets/context_x11.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/libs/video/targets/context_x11.c b/libs/video/targets/context_x11.c
index 41045fcdf..5c23d1875 100644
--- a/libs/video/targets/context_x11.c
+++ b/libs/video/targets/context_x11.c
@@ -125,6 +125,8 @@ static int	accel_threshold;
 static Atom x_net_state;
 static Atom x_net_fullscreen;
 
+static cvar_t *x11_vidmode;
+
 static void
 set_fullscreen (int full)
 {
@@ -387,6 +389,10 @@ X11_SetVidMode (int width, int height)
 	if (vidmode_active)
 		return;
 
+	if (!x11_vidmode->int_val) {
+		return;
+	}
+
 	if (str && (tolower (*str) == 'f')) {
 		Cvar_Set (vid_fullscreen, "1");
 	}
@@ -506,6 +512,9 @@ X11_Init_Cvars (void)
 							   "Toggles fullscreen game mode");
 	vid_system_gamma = Cvar_Get ("vid_system_gamma", "1", CVAR_ARCHIVE, NULL,
 								 "Use system gamma control if available");
+	x11_vidmode = Cvar_Get ("x11_vidmode", "0", CVAR_ROM, 0,
+							"Use x11 vidmode extension to set video mode "
+							"(not recommended for modern systems)");
 }
 
 void

From 203d981675fe869fc3eb171ce28b6365d189a045 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 10 Jul 2019 22:18:51 +0900
Subject: [PATCH 0295/1519] Wait for the window to be visible before mouse
 warping

This fixes the hang during fullscreen startup on my system (the motion
events weren't being generated because there was no window to see the
motion).
---
 libs/video/targets/context_x11.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libs/video/targets/context_x11.c b/libs/video/targets/context_x11.c
index 5c23d1875..5a6556ce0 100644
--- a/libs/video/targets/context_x11.c
+++ b/libs/video/targets/context_x11.c
@@ -574,10 +574,11 @@ X11_CreateWindow (int width, int height)
 	X11_WaitForEvent (ConfigureNotify);
 
 	vid_context_created = true;
+	XRaiseWindow (x_disp, x_win);
+	X11_WaitForEvent (VisibilityNotify);
 	if (vid_fullscreen->int_val) {
 		X11_UpdateFullscreen (vid_fullscreen);
 	}
-	XRaiseWindow (x_disp, x_win);
 }
 
 void

From 4eb6cf6f9ebd1633c57edfc2f6f0667fa7a83912 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 10 Jul 2019 22:24:11 +0900
Subject: [PATCH 0296/1519] Make SetMouse timeout after 2 seconds

This makes sure that some unchecked event doesn't cause a lockup.
However, blocking input is really not the way to go: need to implement a
state machine and use non-blocking event reads.
---
 libs/video/targets/context_x11.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/libs/video/targets/context_x11.c b/libs/video/targets/context_x11.c
index 5a6556ce0..614f83ebd 100644
--- a/libs/video/targets/context_x11.c
+++ b/libs/video/targets/context_x11.c
@@ -354,7 +354,14 @@ X11_SetMouse (void)
 	XWarpPointer (x_disp, None, x_win, 0, 0, 0, 0, 0, 0);
 	XWarpPointer (x_disp, None, x_win, 0, 0, 0, 0,
 				  viddef.width / 2, viddef.height / 2);
-	XPeekIfEvent (x_disp, &ev, check_mouse_event, 0);
+	//FIXME this should be done in a state machine that handles events without
+	//blocking
+	double start = Sys_DoubleTime ();
+	while (!XCheckIfEvent (x_disp, &ev, check_mouse_event, 0)) {
+		if (Sys_DoubleTime () - start > 2) {
+			break;
+		}
+	}
 	x_mouse_time = ev.xmotion.time;
 }
 

From a4f963f67b36920db3aaabccf8b966cb45c26e67 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 10 Jul 2019 22:15:39 +0900
Subject: [PATCH 0297/1519] Add a cvar to block use of x11 vidmode

Or really, allow it if the user specifically requests it: the default is
blocked. Modern systems (particularly displays) do not really like
changing resolution, so doing so by default seems rather wrong.
---
 libs/video/targets/context_x11.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/libs/video/targets/context_x11.c b/libs/video/targets/context_x11.c
index 41045fcdf..5c23d1875 100644
--- a/libs/video/targets/context_x11.c
+++ b/libs/video/targets/context_x11.c
@@ -125,6 +125,8 @@ static int	accel_threshold;
 static Atom x_net_state;
 static Atom x_net_fullscreen;
 
+static cvar_t *x11_vidmode;
+
 static void
 set_fullscreen (int full)
 {
@@ -387,6 +389,10 @@ X11_SetVidMode (int width, int height)
 	if (vidmode_active)
 		return;
 
+	if (!x11_vidmode->int_val) {
+		return;
+	}
+
 	if (str && (tolower (*str) == 'f')) {
 		Cvar_Set (vid_fullscreen, "1");
 	}
@@ -506,6 +512,9 @@ X11_Init_Cvars (void)
 							   "Toggles fullscreen game mode");
 	vid_system_gamma = Cvar_Get ("vid_system_gamma", "1", CVAR_ARCHIVE, NULL,
 								 "Use system gamma control if available");
+	x11_vidmode = Cvar_Get ("x11_vidmode", "0", CVAR_ROM, 0,
+							"Use x11 vidmode extension to set video mode "
+							"(not recommended for modern systems)");
 }
 
 void

From 980cf58ac5068c9123c77e1c6d335eefe8e39010 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 10 Jul 2019 22:18:51 +0900
Subject: [PATCH 0298/1519] Wait for the window to be visible before mouse
 warping

This fixes the hang during fullscreen startup on my system (the motion
events weren't being generated because there was no window to see the
motion).
---
 libs/video/targets/context_x11.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libs/video/targets/context_x11.c b/libs/video/targets/context_x11.c
index 5c23d1875..5a6556ce0 100644
--- a/libs/video/targets/context_x11.c
+++ b/libs/video/targets/context_x11.c
@@ -574,10 +574,11 @@ X11_CreateWindow (int width, int height)
 	X11_WaitForEvent (ConfigureNotify);
 
 	vid_context_created = true;
+	XRaiseWindow (x_disp, x_win);
+	X11_WaitForEvent (VisibilityNotify);
 	if (vid_fullscreen->int_val) {
 		X11_UpdateFullscreen (vid_fullscreen);
 	}
-	XRaiseWindow (x_disp, x_win);
 }
 
 void

From 302a462c32e3e7c78b5afc7d9fcef94b8bed20ed Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 10 Jul 2019 22:24:11 +0900
Subject: [PATCH 0299/1519] Make SetMouse timeout after 2 seconds

This makes sure that some unchecked event doesn't cause a lockup.
However, blocking input is really not the way to go: need to implement a
state machine and use non-blocking event reads.
---
 libs/video/targets/context_x11.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/libs/video/targets/context_x11.c b/libs/video/targets/context_x11.c
index 5a6556ce0..614f83ebd 100644
--- a/libs/video/targets/context_x11.c
+++ b/libs/video/targets/context_x11.c
@@ -354,7 +354,14 @@ X11_SetMouse (void)
 	XWarpPointer (x_disp, None, x_win, 0, 0, 0, 0, 0, 0);
 	XWarpPointer (x_disp, None, x_win, 0, 0, 0, 0,
 				  viddef.width / 2, viddef.height / 2);
-	XPeekIfEvent (x_disp, &ev, check_mouse_event, 0);
+	//FIXME this should be done in a state machine that handles events without
+	//blocking
+	double start = Sys_DoubleTime ();
+	while (!XCheckIfEvent (x_disp, &ev, check_mouse_event, 0)) {
+		if (Sys_DoubleTime () - start > 2) {
+			break;
+		}
+	}
 	x_mouse_time = ev.xmotion.time;
 }
 

From c0bc5cfad609891e383f0a5c25f4d6dc4230acf6 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 11 Jul 2019 00:58:14 +0900
Subject: [PATCH 0300/1519] Implement swapchain creation

---
 include/QF/Vulkan/funclist.h                  |  15 ++
 include/QF/Vulkan/init.h                      |   1 +
 include/QF/Vulkan/qf_vid.h                    |   1 +
 include/vid_vulkan.h                          |   3 +
 libs/video/renderer/vid_render_vulkan.c       |   7 +
 .../video/renderer/vulkan/vulkan_vid_common.c | 140 +++++++++++++++++-
 6 files changed, 166 insertions(+), 1 deletion(-)

diff --git a/include/QF/Vulkan/funclist.h b/include/QF/Vulkan/funclist.h
index e54ce6f50..8418aeb6a 100644
--- a/include/QF/Vulkan/funclist.h
+++ b/include/QF/Vulkan/funclist.h
@@ -62,6 +62,14 @@ INSTANCE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION
 #else
 INSTANCE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION
 	(vkCreateDebugUtilsMessengerEXT, VK_EXT_DEBUG_UTILS_EXTENSION_NAME)
+INSTANCE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION
+	(vkGetPhysicalDeviceSurfaceSupportKHR, VK_KHR_SURFACE_EXTENSION_NAME)
+INSTANCE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION
+	(vkGetPhysicalDeviceSurfacePresentModesKHR, VK_KHR_SURFACE_EXTENSION_NAME)
+INSTANCE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION
+	(vkGetPhysicalDeviceSurfaceCapabilitiesKHR, VK_KHR_SURFACE_EXTENSION_NAME)
+INSTANCE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION
+	(vkGetPhysicalDeviceSurfaceFormatsKHR, VK_KHR_SURFACE_EXTENSION_NAME)
 #endif
 
 #undef INSTANCE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION
@@ -79,4 +87,11 @@ DEVICE_LEVEL_VULKAN_FUNCTION (vkGetDeviceQueue)
 #define DEVICE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION(function, extension)
 #endif
 
+DEVICE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION
+	(vkCreateSwapchainKHR, VK_KHR_SURFACE_EXTENSION_NAME)
+DEVICE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION
+	(vkDestroySwapchainKHR, VK_KHR_SURFACE_EXTENSION_NAME)
+DEVICE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION
+	(vkGetSwapchainImagesKHR, VK_KHR_SURFACE_EXTENSION_NAME)
+
 #undef DEVICE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION
diff --git a/include/QF/Vulkan/init.h b/include/QF/Vulkan/init.h
index 961c72d84..0988dd25a 100644
--- a/include/QF/Vulkan/init.h
+++ b/include/QF/Vulkan/init.h
@@ -32,6 +32,7 @@
 
 typedef struct VulkanDevice_s {
 	VkDevice device;
+	int32_t queueFamily;
 	VkQueue queue;
 	VkSurfaceKHR surface;
 
diff --git a/include/QF/Vulkan/qf_vid.h b/include/QF/Vulkan/qf_vid.h
index 877bebaa3..fe04da536 100644
--- a/include/QF/Vulkan/qf_vid.h
+++ b/include/QF/Vulkan/qf_vid.h
@@ -31,6 +31,7 @@
 #include "QF/Vulkan/cvars.h"
 
 struct vulkan_ctx_s;
+void Vulkan_CreateSwapchain (struct vulkan_ctx_s *ctx);
 void Vulkan_CreateDevice (struct vulkan_ctx_s *ctx);
 void Vulkan_Init_Common (struct vulkan_ctx_s *ctx);
 void Vulkan_Shutdown_Common (struct vulkan_ctx_s *ctx);
diff --git a/include/vid_vulkan.h b/include/vid_vulkan.h
index 924a3a1d4..fabaa088b 100644
--- a/include/vid_vulkan.h
+++ b/include/vid_vulkan.h
@@ -27,6 +27,9 @@ typedef struct vulkan_ctx_s {
 	VkInstance  instance;
 	VkPhysicalDevice physDevice;
 	VkDevice    device;
+	VkSwapchainKHR swapchain;
+	int32_t     numSwapchainImages;
+	VkImage    *swapchainImages;
 #define EXPORTED_VULKAN_FUNCTION(fname) PFN_##fname fname;
 #define GLOBAL_LEVEL_VULKAN_FUNCTION(fname) PFN_##fname fname;
 #include "QF/Vulkan/funclist.h"
diff --git a/libs/video/renderer/vid_render_vulkan.c b/libs/video/renderer/vid_render_vulkan.c
index 11fe640f2..46d475917 100644
--- a/libs/video/renderer/vid_render_vulkan.c
+++ b/libs/video/renderer/vid_render_vulkan.c
@@ -159,6 +159,13 @@ vulkan_vid_render_create_context (void)
 	vulkan_ctx->create_window (vulkan_ctx);
 	vulkan_ctx->dev->surface = vulkan_ctx->create_surface (vulkan_ctx);
 	Sys_Printf ("%p\n", vulkan_ctx->dev->surface);
+	Vulkan_CreateSwapchain (vulkan_ctx);
+	Sys_Printf ("%p %d", vulkan_ctx->swapchain,
+				vulkan_ctx->numSwapchainImages);
+	for (int32_t i = 0; i < vulkan_ctx->numSwapchainImages; i++) {
+		Sys_Printf (" %p", vulkan_ctx->swapchainImages[i]);
+	}
+	Sys_Printf ("\n");
 }
 
 static void
diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c
index 561eb64f5..22ce1d71e 100644
--- a/libs/video/renderer/vulkan/vulkan_vid_common.c
+++ b/libs/video/renderer/vulkan/vulkan_vid_common.c
@@ -42,6 +42,7 @@
 #include "QF/cvar.h"
 #include "QF/dstring.h"
 #include "QF/input.h"
+#include "QF/mathlib.h"
 #include "QF/qargs.h"
 #include "QF/quakefs.h"
 #include "QF/sys.h"
@@ -57,6 +58,25 @@
 
 #include "util.h"
 
+static cvar_t *vulkan_presentation_mode;
+
+static void
+vulkan_presentation_mode_f (cvar_t *var)
+{
+	if (!strcmp (var->string, "immediate")) {
+		var->int_val = VK_PRESENT_MODE_IMMEDIATE_KHR;
+	} else if (!strcmp (var->string, "fifo")) {
+		var->int_val = VK_PRESENT_MODE_FIFO_KHR;
+	} else if (!strcmp (var->string, "relaxed")) {
+		var->int_val = VK_PRESENT_MODE_FIFO_RELAXED_KHR;
+	} else if (!strcmp (var->string, "mailbox")) {
+		var->int_val = VK_PRESENT_MODE_MAILBOX_KHR;
+	} else {
+		Sys_Printf ("Invalid presentation mode, using fifo\n");
+		var->int_val = VK_PRESENT_MODE_FIFO_KHR;
+	}
+}
+
 void
 Vulkan_Init_Cvars ()
 {
@@ -65,6 +85,11 @@ Vulkan_Init_Cvars ()
 									  "enable LunarG Standard Validation "
 									  "Layer if available (requires instance "
 									  "restart).");
+	// FIXME implement fallback choices (instead of just fifo)
+	vulkan_presentation_mode = Cvar_Get ("vulkan_presentation_mode", "mailbox",
+										 CVAR_NONE, vulkan_presentation_mode_f,
+										 "desired presentation mode (may fall "
+										 "back to fifo).");
 }
 
 static const char *instance_extensions[] = {
@@ -118,7 +143,7 @@ load_device_funcs (VulkanInstance_t *inst, VulkanDevice_t *dev)
 	}
 
 #define DEVICE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION(name, ext) \
-	if (inst->extension_enabled (vtx, ext)) { \
+	if (inst->extension_enabled (inst, ext)) { \
 		dev->name = (PFN_##name) inst->vkGetDeviceProcAddr (dev->device, \
 															#name); \
 		if (!dev->name) { \
@@ -208,7 +233,120 @@ Vulkan_CreateDevice (vulkan_ctx_t *ctx)
 			ctx->dev = device;
 			ctx->device = device->device;
 			ctx->physDevice = phys->device;
+			device->queueFamily = family;
 			return;
 		}
 	}
 }
+
+void
+Vulkan_CreateSwapchain (vulkan_ctx_t *ctx)
+{
+	VkBool32    supported;
+	ctx->vtx->vkGetPhysicalDeviceSurfaceSupportKHR (ctx->physDevice,
+													ctx->dev->queueFamily,
+													ctx->dev->surface,
+													&supported);
+	if (!supported) {
+		Sys_Error ("unsupported surface for swapchain");
+	}
+	uint32_t    numModes;
+	VkPresentModeKHR *modes;
+	VkPresentModeKHR useMode = VK_PRESENT_MODE_FIFO_KHR;;
+	ctx->vtx->vkGetPhysicalDeviceSurfacePresentModesKHR (ctx->physDevice,
+														 ctx->dev->surface,
+														 &numModes, 0);
+	modes = alloca (numModes * sizeof (VkPresentModeKHR));
+	ctx->vtx->vkGetPhysicalDeviceSurfacePresentModesKHR (ctx->physDevice,
+														 ctx->dev->surface,
+														 &numModes, modes);
+	for (uint32_t i = 0; i < numModes; i++) {
+		if ((int) modes[i] == vulkan_presentation_mode->int_val) {
+			useMode = modes[i];
+		}
+	}
+	Sys_MaskPrintf (SYS_VULKAN, "presentation mode: %d (%d)\n", useMode,
+					vulkan_presentation_mode->int_val);
+
+	VkSurfaceCapabilitiesKHR surfCaps;
+	ctx->vtx->vkGetPhysicalDeviceSurfaceCapabilitiesKHR (ctx->physDevice,
+														 ctx->dev->surface,
+														 &surfCaps);
+	uint32_t numImages = surfCaps.minImageCount + 1;
+	if (surfCaps.maxImageCount > 0 && numImages > surfCaps.maxImageCount) {
+		numImages = surfCaps.maxImageCount;
+	}
+
+	VkExtent2D imageSize = {viddef.width, viddef.height};
+	if (surfCaps.currentExtent.width == ~0u) {
+		imageSize.width = bound (surfCaps.minImageExtent.width,
+								 imageSize.width,
+								 surfCaps.maxImageExtent.width);
+		imageSize.height = bound (surfCaps.minImageExtent.height,
+								  imageSize.height,
+								  surfCaps.maxImageExtent.height);
+	} else {
+		imageSize = surfCaps.currentExtent;
+	}
+	Sys_MaskPrintf (SYS_VULKAN, "%d [%d, %d]\n", numImages,
+					imageSize.width, imageSize.height);
+
+	VkImageUsageFlags imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT;
+	imageUsage &= surfCaps.supportedUsageFlags;
+
+	VkSurfaceTransformFlagBitsKHR surfTransform = VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR;
+
+	uint32_t numFormats;
+	ctx->vtx->vkGetPhysicalDeviceSurfaceFormatsKHR (ctx->physDevice,
+													ctx->dev->surface,
+													&numFormats, 0);
+	VkSurfaceFormatKHR *formats = alloca (numFormats * sizeof (*formats));
+	ctx->vtx->vkGetPhysicalDeviceSurfaceFormatsKHR (ctx->physDevice,
+													ctx->dev->surface,
+													&numFormats, formats);
+	VkSurfaceFormatKHR useFormat = {VK_FORMAT_R8G8B8A8_UNORM,
+									VK_COLOR_SPACE_SRGB_NONLINEAR_KHR};
+	if (numFormats > 1) {
+		uint32_t i;
+		for (i = 0; i < numFormats; i++) {
+			if (formats[i].format == useFormat.format
+				&& formats[i].colorSpace == useFormat.colorSpace) {
+				break;
+			}
+		}
+		if (i == numFormats) {
+			useFormat = formats[0];
+		}
+	} else if (numFormats == 1 && formats[0].format != VK_FORMAT_UNDEFINED) {
+		useFormat = formats[0];
+	}
+
+	VkSwapchainCreateInfoKHR createInfo = {
+		VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR, 0, 0,
+		ctx->dev->surface,
+		numImages,
+		useFormat.format, useFormat.colorSpace,
+		imageSize,
+		1, // array layers
+		imageUsage,
+		VK_SHARING_MODE_EXCLUSIVE,
+		0, 0,
+		surfTransform,
+		VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR,
+		useMode,
+		VK_TRUE,
+		ctx->swapchain
+	};
+	VkSwapchainKHR swapchain;
+	ctx->dev->vkCreateSwapchainKHR (ctx->device, &createInfo, 0, &swapchain);
+	if (ctx->swapchain != swapchain) {
+		ctx->dev->vkDestroySwapchainKHR (ctx->device, ctx->swapchain, 0);
+	}
+	ctx->swapchain = swapchain;
+
+	ctx->dev->vkGetSwapchainImagesKHR (ctx->device, swapchain, &numImages, 0);
+	ctx->swapchainImages = malloc (numImages * sizeof (*ctx->swapchainImages));
+	ctx->dev->vkGetSwapchainImagesKHR (ctx->device, swapchain, &numImages,
+									   ctx->swapchainImages);
+	ctx->numSwapchainImages = numImages;
+}

From b5828bc2cefb98e59f533a0bcd8b7dec2ebfbbde Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 11 Jul 2019 00:58:37 +0900
Subject: [PATCH 0301/1519] Output validation message severity

It's nice knowing if something is an error or otherwise.
---
 libs/video/renderer/vulkan/init.c | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/libs/video/renderer/vulkan/init.c b/libs/video/renderer/vulkan/init.c
index 529969014..2ba5bfc06 100644
--- a/libs/video/renderer/vulkan/init.c
+++ b/libs/video/renderer/vulkan/init.c
@@ -219,7 +219,20 @@ debug_callback (VkDebugUtilsMessageSeverityFlagBitsEXT messageSeverity,
 				const VkDebugUtilsMessengerCallbackDataEXT* callbackData,
 				void *data)
 {
-	fprintf (stderr, "validation layer: %s\n", callbackData->pMessage);
+	const char *msgSev = "";
+	if (messageSeverity & VK_DEBUG_UTILS_MESSAGE_SEVERITY_VERBOSE_BIT_EXT) {
+		msgSev = "verbose: ";
+	}
+	if (messageSeverity & VK_DEBUG_UTILS_MESSAGE_SEVERITY_INFO_BIT_EXT) {
+		msgSev = "info: ";
+	}
+	if (messageSeverity & VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT) {
+		msgSev = "warning: ";
+	}
+	if (messageSeverity & VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT) {
+		msgSev = "error: ";
+	}
+	fprintf (stderr, "validation layer: %s%s\n", msgSev, callbackData->pMessage);
 	return VK_FALSE;
 }
 

From 75f19f724373afb7e6fa0bc00fdda6815f3eb127 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 12 Jul 2019 13:15:25 +0900
Subject: [PATCH 0302/1519] Completely rework the vulkan related api

Things don't work yet, but this feels much cleaner.
---
 include/QF/Vulkan/cvars.h                     |   1 +
 include/QF/Vulkan/device.h                    |  26 ++
 include/QF/Vulkan/funclist.h                  |  52 ++-
 include/QF/Vulkan/init.h                      |  88 ----
 include/QF/Vulkan/instance.h                  |  55 +++
 include/QF/Vulkan/qf_vid.h                    |   5 +
 include/QF/Vulkan/swapchain.h                 |  17 +
 include/vid_vulkan.h                          |  15 +-
 libs/video/renderer/vid_render_vulkan.c       |  18 +-
 libs/video/renderer/vulkan/Makefile.am        |   4 +-
 libs/video/renderer/vulkan/device.c           | 211 +++++++++
 libs/video/renderer/vulkan/init.c             | 420 ------------------
 libs/video/renderer/vulkan/instance.c         | 266 +++++++++++
 libs/video/renderer/vulkan/swapchain.c        | 148 ++++++
 libs/video/renderer/vulkan/util.c             |  32 +-
 libs/video/renderer/vulkan/util.h             |   8 +-
 .../video/renderer/vulkan/vulkan_vid_common.c | 238 +---------
 libs/video/targets/vid_x11_vulkan.c           |  17 +-
 18 files changed, 817 insertions(+), 804 deletions(-)
 create mode 100644 include/QF/Vulkan/device.h
 delete mode 100644 include/QF/Vulkan/init.h
 create mode 100644 include/QF/Vulkan/instance.h
 create mode 100644 include/QF/Vulkan/swapchain.h
 create mode 100644 libs/video/renderer/vulkan/device.c
 delete mode 100644 libs/video/renderer/vulkan/init.c
 create mode 100644 libs/video/renderer/vulkan/instance.c
 create mode 100644 libs/video/renderer/vulkan/swapchain.c

diff --git a/include/QF/Vulkan/cvars.h b/include/QF/Vulkan/cvars.h
index b6110e353..706bc44de 100644
--- a/include/QF/Vulkan/cvars.h
+++ b/include/QF/Vulkan/cvars.h
@@ -2,5 +2,6 @@
 #define __QF_Vulkan_cvars_h
 
 extern struct cvar_s *vulkan_use_validation;
+extern struct cvar_s *vulkan_presentation_mode;
 
 #endif//__QF_Vulkan_cvars_h
diff --git a/include/QF/Vulkan/device.h b/include/QF/Vulkan/device.h
new file mode 100644
index 000000000..ae0c26ffc
--- /dev/null
+++ b/include/QF/Vulkan/device.h
@@ -0,0 +1,26 @@
+#ifndef __QF_Vulkan_device_h
+#define __QF_Vulkan_device_h
+
+typedef struct qfv_devfuncs_s {
+#define DEVICE_LEVEL_VULKAN_FUNCTION(name) PFN_##name name;
+#define DEVICE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION(name,ext) PFN_##name name;
+#include "QF/Vulkan/funclist.h"
+} qfv_devfuncs_t;
+
+struct qfv_instance_s;
+typedef struct qfv_device_s {
+	VkDevice    dev;
+	VkPhysicalDevice physDev;
+	qfv_devfuncs_t *funcs;
+	int32_t     queueFamily;
+	VkQueue     queue;
+	struct strset_s *enabled_extensions;
+	int         (*extension_enabled) (struct qfv_device_s *inst,
+									  const char *ext);
+} qfv_device_t;
+
+struct vulkan_ctx_s;
+qfv_device_t *QFV_CreateDevice(struct vulkan_ctx_s *ctx,
+							   const char **extensions);
+
+#endif//__QF_Vulkan_swapchain_h
diff --git a/include/QF/Vulkan/funclist.h b/include/QF/Vulkan/funclist.h
index 8418aeb6a..719335699 100644
--- a/include/QF/Vulkan/funclist.h
+++ b/include/QF/Vulkan/funclist.h
@@ -38,28 +38,6 @@ INSTANCE_LEVEL_VULKAN_FUNCTION (vkGetPhysicalDeviceMemoryProperties)
 #define INSTANCE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION(function, extension)
 #endif
 
-#if defined(VK_USE_PLATFORM_XLIB_KHR)
-INSTANCE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION
-	(vkGetPhysicalDeviceXlibPresentationSupportKHR,
-	 VK_KHR_XLIB_SURFACE_EXTENSION_NAME)
-INSTANCE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION
-	(vkCreateXlibSurfaceKHR,
-	 VK_KHR_XLIB_SURFACE_EXTENSION_NAME)
-#elif defined(VK_USE_PLATFORM_WIN32_KHR)
-INSTANCE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION
-	(vkGetPhysicalDeviceWin32PresentationSupportKHR,
-	 VK_KHR_WIN32_SURFACE_EXTENSION_NAME)
-INSTANCE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION
-	(vkCreateWin32SurfaceKHR,
-	 VK_KHR_WIN32_SURFACE_EXTENSION_NAME)
-#elif defined(VK_USE_PLATFORM_XCB_KHR)
-INSTANCE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION
-	(vkGetPhysicalDeviceXcbPresentationSupportKHR,
-	 VK_KHR_XCB_SURFACE_EXTENSION_NAME)
-INSTANCE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION
-	(vkCreateXcbSurfaceKHR,
-	 VK_KHR_XCB_SURFACE_EXTENSION_NAME)
-#else
 INSTANCE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION
 	(vkCreateDebugUtilsMessengerEXT, VK_EXT_DEBUG_UTILS_EXTENSION_NAME)
 INSTANCE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION
@@ -70,10 +48,38 @@ INSTANCE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION
 	(vkGetPhysicalDeviceSurfaceCapabilitiesKHR, VK_KHR_SURFACE_EXTENSION_NAME)
 INSTANCE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION
 	(vkGetPhysicalDeviceSurfaceFormatsKHR, VK_KHR_SURFACE_EXTENSION_NAME)
-#endif
 
 #undef INSTANCE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION
 
+#ifndef PRESENTATION_VULKAN_FUNCTION_FROM_EXTENSION
+#define PRESENTATION_VULKAN_FUNCTION_FROM_EXTENSION(function, extension)
+#endif
+
+#if defined(VK_USE_PLATFORM_XLIB_KHR)
+PRESENTATION_VULKAN_FUNCTION_FROM_EXTENSION
+	(vkGetPhysicalDeviceXlibPresentationSupportKHR,
+	 VK_KHR_XLIB_SURFACE_EXTENSION_NAME)
+PRESENTATION_VULKAN_FUNCTION_FROM_EXTENSION
+	(vkCreateXlibSurfaceKHR,
+	 VK_KHR_XLIB_SURFACE_EXTENSION_NAME)
+#elif defined(VK_USE_PLATFORM_WIN32_KHR)
+PRESENTATION_VULKAN_FUNCTION_FROM_EXTENSION
+	(vkGetPhysicalDeviceWin32PresentationSupportKHR,
+	 VK_KHR_WIN32_SURFACE_EXTENSION_NAME)
+PRESENTATION_VULKAN_FUNCTION_FROM_EXTENSION
+	(vkCreateWin32SurfaceKHR,
+	 VK_KHR_WIN32_SURFACE_EXTENSION_NAME)
+#elif defined(VK_USE_PLATFORM_XCB_KHR)
+PRESENTATION_VULKAN_FUNCTION_FROM_EXTENSION
+	(vkGetPhysicalDeviceXcbPresentationSupportKHR,
+	 VK_KHR_XCB_SURFACE_EXTENSION_NAME)
+PRESENTATION_VULKAN_FUNCTION_FROM_EXTENSION
+	(vkCreateXcbSurfaceKHR,
+	 VK_KHR_XCB_SURFACE_EXTENSION_NAME)
+#endif
+
+#undef PRESENTATION_VULKAN_FUNCTION_FROM_EXTENSION
+
 #ifndef DEVICE_LEVEL_VULKAN_FUNCTION
 #define DEVICE_LEVEL_VULKAN_FUNCTION(function)
 #endif
diff --git a/include/QF/Vulkan/init.h b/include/QF/Vulkan/init.h
deleted file mode 100644
index 0988dd25a..000000000
--- a/include/QF/Vulkan/init.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-	Copyright (C) 2019 Bill Currie <bill@taniwha.org>
-
-	Author: Bill Currie
-	Date: 2019/6/29
-
-	This program is free software; you can redistribute it and/or
-	modify it under the terms of the GNU General Public License
-	as published by the Free Software Foundation; either version 2
-	of the License, or (at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-	See the GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to:
-
-		Free Software Foundation, Inc.
-		59 Temple Place - Suite 330
-		Boston, MA  02111-1307, USA
-
-*/
-#ifndef __QF_Vulkan_init_h
-#define __QF_Vulkan_init_h
-
-#include <vulkan/vulkan.h>
-
-#include "QF/qtypes.h"
-
-typedef struct VulkanDevice_s {
-	VkDevice device;
-	int32_t queueFamily;
-	VkQueue queue;
-	VkSurfaceKHR surface;
-
-#define DEVICE_LEVEL_VULKAN_FUNCTION(name) PFN_##name name;
-#define DEVICE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION(name,ext) PFN_##name name;
-#include "QF/Vulkan/funclist.h"
-} VulkanDevice_t;
-
-typedef struct {
-	VkPhysicalDevice device;
-	VkPhysicalDeviceFeatures features;
-	VkPhysicalDeviceProperties properties;
-	uint32_t    numLayers;
-	VkLayerProperties *layers;
-	uint32_t    numExtensions;
-	VkExtensionProperties *extensions;
-	VkPhysicalDeviceMemoryProperties memory;
-	uint32_t    numQueueFamilies;
-	VkQueueFamilyProperties *queueFamilies;
-} VulkanPhysDevice_t;
-
-typedef struct VulkanInstance_s {
-	VkInstance  instance;
-	struct strset_s *enabled_extensions;
-	int         (*extension_enabled) (struct VulkanInstance_s *inst,
-									  const char *ext);
-	VkDebugUtilsMessengerEXT debug_callback;
-	uint32_t    numDevices;
-	VulkanPhysDevice_t *devices;
-
-#define INSTANCE_LEVEL_VULKAN_FUNCTION(name) PFN_##name name;
-#define INSTANCE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION(name,ext) PFN_##name name;
-#include "QF/Vulkan/funclist.h"
-} VulkanInstance_t;
-
-extern const char * const vulkanValidationLayers[];
-
-void Vulkan_Init_Cvars (void);
-struct vulkan_ctx_s;
-VulkanInstance_t *Vulkan_CreateInstance (struct vulkan_ctx_s *ctx,
-										 const char *appName,
-										 uint32_t appVersion,
-										 const char **layers,
-										 const char **extensions);
-void Vulkan_DestroyInstance (VulkanInstance_t *instance);
-int Vulkan_ExtensionsSupported (const VkExtensionProperties *extensions,
-								int numExtensions,
-								const char * const *requested);
-int Vulkan_LayersSupported (const VkLayerProperties *extensions,
-								int numLayers,
-								const char * const *requested);
-
-#endif // __QF_Vulkan_init_h
diff --git a/include/QF/Vulkan/instance.h b/include/QF/Vulkan/instance.h
new file mode 100644
index 000000000..1cc05d6cf
--- /dev/null
+++ b/include/QF/Vulkan/instance.h
@@ -0,0 +1,55 @@
+/*
+	Copyright (C) 2019 Bill Currie <bill@taniwha.org>
+
+	Author: Bill Currie
+	Date: 2019/6/29
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifndef __QF_Vulkan_instance_h
+#define __QF_Vulkan_instance_h
+
+#include <vulkan/vulkan.h>
+
+#include "QF/qtypes.h"
+
+typedef struct qfv_instfuncs_s {
+#define INSTANCE_LEVEL_VULKAN_FUNCTION(name) PFN_##name name;
+#define INSTANCE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION(name,ext) PFN_##name name;
+#include "QF/Vulkan/funclist.h"
+} qfv_instfuncs_t;
+
+typedef struct qfv_instance_s {
+	VkInstance  instance;
+	qfv_instfuncs_t *funcs;
+	struct strset_s *enabled_extensions;
+	int         (*extension_enabled) (struct qfv_instance_s *inst,
+									  const char *ext);
+} qfv_instance_t;
+
+struct vulkan_ctx_s;
+qfv_instance_t *QFV_CreateInstance (struct vulkan_ctx_s *ctx,
+									const char *appName,
+									uint32_t appVersion,
+									const char **layers,
+									const char **extensions);
+void QFV_DestroyInstance (qfv_instance_t *instance);
+
+#endif // __QF_Vulkan_instance_h
diff --git a/include/QF/Vulkan/qf_vid.h b/include/QF/Vulkan/qf_vid.h
index fe04da536..bfa543c46 100644
--- a/include/QF/Vulkan/qf_vid.h
+++ b/include/QF/Vulkan/qf_vid.h
@@ -30,6 +30,11 @@
 
 #include "QF/Vulkan/cvars.h"
 
+#ifndef VK_NO_PROTOTYPES
+#define VK_NO_PROTOTYPES
+#endif
+#include <vulkan/vulkan.h>
+
 struct vulkan_ctx_s;
 void Vulkan_CreateSwapchain (struct vulkan_ctx_s *ctx);
 void Vulkan_CreateDevice (struct vulkan_ctx_s *ctx);
diff --git a/include/QF/Vulkan/swapchain.h b/include/QF/Vulkan/swapchain.h
new file mode 100644
index 000000000..71d0b6d75
--- /dev/null
+++ b/include/QF/Vulkan/swapchain.h
@@ -0,0 +1,17 @@
+#ifndef __QF_Vulkan_swapchain_h
+#define __QF_Vulkan_swapchain_h
+
+typedef struct qfv_swapchain_s {
+	VkDevice    dev;
+	struct qfv_devfuncs_s *funcs;
+	VkSurfaceKHR surface;
+	VkSwapchainKHR swapchain;
+	int32_t     numImages;
+	VkImage    *images;
+} qfv_swapchain_t;
+
+struct vulkan_ctx_s;
+qfv_swapchain_t *QFV_CreateSwapchain (struct vulkan_ctx_s *ctx,
+									  VkSwapchainKHR old_swapchain);
+
+#endif//__QF_Vulkan_swapchain_h
diff --git a/include/vid_vulkan.h b/include/vid_vulkan.h
index fabaa088b..9cfb3ad8a 100644
--- a/include/vid_vulkan.h
+++ b/include/vid_vulkan.h
@@ -6,14 +6,11 @@
 #endif
 #include <vulkan/vulkan.h>
 
-struct VulkanInstance_s;
 typedef struct vulkan_ctx_s {
 	void        (*load_vulkan) (struct vulkan_ctx_s *ctx);
 	void        (*unload_vulkan) (struct vulkan_ctx_s *ctx);
 
 	const char **required_extensions;
-	int         (*extension_enabled) (struct VulkanInstance_s *inst,
-									  const char *ext);
 	struct vulkan_presentation_s *presentation;
 	int (*get_presentation_support) (struct vulkan_ctx_s *ctx,
 									 VkPhysicalDevice physicalDevice,
@@ -22,14 +19,10 @@ typedef struct vulkan_ctx_s {
 	void        (*create_window) (struct vulkan_ctx_s *ctx);
 	VkSurfaceKHR (*create_surface) (struct vulkan_ctx_s *ctx);
 
-	struct VulkanInstance_s *vtx;
-	struct VulkanDevice_s *dev;
-	VkInstance  instance;
-	VkPhysicalDevice physDevice;
-	VkDevice    device;
-	VkSwapchainKHR swapchain;
-	int32_t     numSwapchainImages;
-	VkImage    *swapchainImages;
+	struct qfv_instance_s *instance;
+	struct qfv_device_s *device;
+	struct qfv_swapchain_s *swapchain;
+	VkSurfaceKHR surface;	//FIXME surface = window, so "contains" swapchain
 #define EXPORTED_VULKAN_FUNCTION(fname) PFN_##fname fname;
 #define GLOBAL_LEVEL_VULKAN_FUNCTION(fname) PFN_##fname fname;
 #include "QF/Vulkan/funclist.h"
diff --git a/libs/video/renderer/vid_render_vulkan.c b/libs/video/renderer/vid_render_vulkan.c
index 46d475917..506406394 100644
--- a/libs/video/renderer/vid_render_vulkan.c
+++ b/libs/video/renderer/vid_render_vulkan.c
@@ -37,7 +37,9 @@
 #include "QF/plugin/vid_render.h"
 
 #include "QF/Vulkan/qf_vid.h"
-#include "QF/Vulkan/init.h"
+#include "QF/Vulkan/device.h"
+#include "QF/Vulkan/instance.h"
+#include "QF/Vulkan/swapchain.h"
 
 #include "mod_internal.h"
 #include "r_internal.h"
@@ -150,20 +152,20 @@ vulkan_vid_render_choose_visual (void)
 {
 	Vulkan_CreateDevice (vulkan_ctx);
 	vulkan_ctx->choose_visual (vulkan_ctx);
-	Sys_Printf ("%p %p\n", vulkan_ctx->dev->device, vulkan_ctx->dev->queue);
+	Sys_Printf ("%p %p\n", vulkan_ctx->device->dev, vulkan_ctx->device->queue);
 }
 
 static void
 vulkan_vid_render_create_context (void)
 {
 	vulkan_ctx->create_window (vulkan_ctx);
-	vulkan_ctx->dev->surface = vulkan_ctx->create_surface (vulkan_ctx);
-	Sys_Printf ("%p\n", vulkan_ctx->dev->surface);
+	vulkan_ctx->surface = vulkan_ctx->create_surface (vulkan_ctx);
+	Sys_Printf ("%p\n", vulkan_ctx->surface);
 	Vulkan_CreateSwapchain (vulkan_ctx);
-	Sys_Printf ("%p %d", vulkan_ctx->swapchain,
-				vulkan_ctx->numSwapchainImages);
-	for (int32_t i = 0; i < vulkan_ctx->numSwapchainImages; i++) {
-		Sys_Printf (" %p", vulkan_ctx->swapchainImages[i]);
+	Sys_Printf ("%p %d", vulkan_ctx->swapchain->swapchain,
+				vulkan_ctx->swapchain->numImages);
+	for (int32_t i = 0; i < vulkan_ctx->swapchain->numImages; i++) {
+		Sys_Printf (" %p", vulkan_ctx->swapchain->images[i]);
 	}
 	Sys_Printf ("\n");
 }
diff --git a/libs/video/renderer/vulkan/Makefile.am b/libs/video/renderer/vulkan/Makefile.am
index b134d1f91..e59e29551 100644
--- a/libs/video/renderer/vulkan/Makefile.am
+++ b/libs/video/renderer/vulkan/Makefile.am
@@ -4,7 +4,9 @@ AM_CFLAGS= @PREFER_PIC@
 AM_CPPFLAGS= -I$(top_srcdir)/include -DVK_NO_PROTOTYPES
 
 vulkan_src = \
-	init.c \
+	device.c \
+	instance.c \
+	swapchain.c \
 	util.c \
 	vulkan_draw.c \
 	vulkan_vid_common.c
diff --git a/libs/video/renderer/vulkan/device.c b/libs/video/renderer/vulkan/device.c
new file mode 100644
index 000000000..1579c0633
--- /dev/null
+++ b/libs/video/renderer/vulkan/device.c
@@ -0,0 +1,211 @@
+/*
+	vid_common_vulkan.c
+
+	Common Vulkan video driver functions
+
+	Copyright (C) 1996-1997 Id Software, Inc.
+	Copyright (C) 2019      Bill Currie <bill@taniwha.org>
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifdef HAVE_MATH_H
+# include <math.h>
+#endif
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+
+#include "QF/cvar.h"
+#include "QF/dstring.h"
+#include "QF/input.h"
+#include "QF/mathlib.h"
+#include "QF/qargs.h"
+#include "QF/quakefs.h"
+#include "QF/sys.h"
+#include "QF/va.h"
+#include "QF/vid.h"
+#include "QF/Vulkan/qf_vid.h"
+#include "QF/Vulkan/device.h"
+#include "QF/Vulkan/instance.h"
+
+#include "compat.h"
+#include "d_iface.h"
+#include "r_internal.h"
+#include "vid_vulkan.h"
+
+#include "util.h"
+
+static int
+count_bits (uint32_t val)
+{
+	int         bits = 0;
+	while (val) {
+		bits += val & 1;
+		val >>= 1;
+	}
+	return bits;
+}
+
+static int
+find_queue_family (qfv_instance_t *instance, VkPhysicalDevice dev,
+				   uint32_t flags)
+{
+	qfv_instfuncs_t *funcs = instance->funcs;
+	uint32_t    numFamilies;
+	VkQueueFamilyProperties *queueFamilies;
+	int         best_diff = 32;
+	uint32_t    family = -1;
+
+	funcs->vkGetPhysicalDeviceQueueFamilyProperties (dev, &numFamilies, 0);
+	queueFamilies = alloca (numFamilies * sizeof (*queueFamilies));
+	funcs->vkGetPhysicalDeviceQueueFamilyProperties (dev, &numFamilies,
+													 queueFamilies);
+
+	for (uint32_t i = 0; i < numFamilies; i++) {
+		VkQueueFamilyProperties *queue = &queueFamilies[i];
+
+		if ((queue->queueFlags & flags) == flags) {
+			int diff = count_bits (queue->queueFlags & ~flags);
+			if (diff < best_diff) {
+				best_diff = diff;
+				family = i;
+			}
+		}
+	}
+	return family;
+}
+
+static void
+load_device_funcs (qfv_instance_t *inst, qfv_device_t *dev)
+{
+	qfv_instfuncs_t *ifunc = inst->funcs;
+	qfv_devfuncs_t *dfunc = dev->funcs;
+	VkDevice    device = dev->dev;
+#define DEVICE_LEVEL_VULKAN_FUNCTION(name) \
+	dfunc->name = (PFN_##name) ifunc->vkGetDeviceProcAddr (device, #name); \
+	if (!dfunc->name) { \
+		Sys_Error ("Couldn't find device level function %s", #name); \
+	}
+
+#define DEVICE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION(name, ext) \
+	if (dev->extension_enabled (dev, ext)) { \
+		dfunc->name = (PFN_##name) ifunc->vkGetDeviceProcAddr (device, #name); \
+		if (!dfunc->name) { \
+			Sys_Printf ("Couldn't find device level function %s", #name); \
+		} \
+	}
+
+#include "QF/Vulkan/funclist.h"
+}
+
+static int
+device_extension_enabled (qfv_device_t *device, const char *ext)
+{
+	return strset_contains (device->enabled_extensions, ext);
+}
+
+qfv_device_t *
+QFV_CreateDevice (vulkan_ctx_t *ctx, const char **extensions)
+{
+	uint32_t nlay = 1;	// ensure alloca doesn't see 0 and terminated
+	uint32_t next = count_strings (extensions) + 1; // ensure terminated
+	//if (vulkan_use_validation->int_val) {
+	//	nlay += count_strings (vulkanValidationLayers);
+	//}
+	const char **lay = alloca (nlay * sizeof (const char *));
+	const char **ext = alloca (next * sizeof (const char *));
+	// ensure there are null pointers so merge_strings can act as append
+	// since it does not add a null, but also make sure the counts reflect
+	// actual numbers
+	memset (lay, 0, nlay-- * sizeof (const char *));
+	memset (ext, 0, next-- * sizeof (const char *));
+	merge_strings (ext, extensions, 0);
+	//if (vulkan_use_validation->int_val) {
+	//	merge_strings (lay, lay, vulkanValidationLayers);
+	//}
+
+	qfv_instance_t *inst = ctx->instance;
+	VkInstance  instance = inst->instance;
+	qfv_instfuncs_t *ifunc = inst->funcs;
+
+	uint32_t numDevices;
+	ifunc->vkEnumeratePhysicalDevices (instance, &numDevices, 0);
+	VkPhysicalDevice *devices = alloca (numDevices * sizeof (*devices));
+	ifunc->vkEnumeratePhysicalDevices (instance, &numDevices, devices);
+
+	for (uint32_t i = 0; i < numDevices; i++) {
+		VkPhysicalDevice physdev = devices[i];
+		/*
+		if (!Vulkan_LayersSupported (phys->layers, phys->numLayers, lay)) {
+			continue;
+		}
+		if (!Vulkan_ExtensionsSupported (phys->extensions, phys->numExtensions,
+										 ext)) {
+			continue;
+		}
+		*/
+		int family = find_queue_family (inst, physdev, VK_QUEUE_GRAPHICS_BIT);
+		if (family < 0) {
+			continue;
+		}
+		if (!ctx->get_presentation_support (ctx, physdev, family)) {
+			continue;
+		}
+		float priority = 1;
+		VkDeviceQueueCreateInfo qCreateInfo = {
+			VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO, 0, 0,
+			family, 1, &priority
+		};
+		VkPhysicalDeviceFeatures features;
+		VkDeviceCreateInfo dCreateInfo = {
+			VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO, 0, 0,
+			1, &qCreateInfo,
+			nlay, lay,
+			next, ext,
+			&features
+		};
+		memset (&features, 0, sizeof (features));
+		qfv_device_t *device = calloc (1, sizeof (qfv_device_t)
+										  + sizeof (qfv_devfuncs_t));
+		device->funcs = (qfv_devfuncs_t *) (device + 1);
+		if (ifunc->vkCreateDevice (physdev, &dCreateInfo, 0,
+								   &device->dev) == VK_SUCCESS) {
+			qfv_devfuncs_t *dfunc = device->funcs;
+
+			device->physDev = physdev;
+			load_device_funcs (inst, device);
+			device->queueFamily = family;
+			dfunc->vkGetDeviceQueue (device->dev, family, 0, &device->queue);
+			device->enabled_extensions = new_strset (ext);
+			device->extension_enabled = device_extension_enabled;
+			ctx->device = device;
+			return device;
+		}
+		free (device);
+	}
+	return 0;
+}
diff --git a/libs/video/renderer/vulkan/init.c b/libs/video/renderer/vulkan/init.c
deleted file mode 100644
index 2ba5bfc06..000000000
--- a/libs/video/renderer/vulkan/init.c
+++ /dev/null
@@ -1,420 +0,0 @@
-/*
-	init.c
-
-	Copyright (C) 2019      Bill Currie <bill@taniwha.org>
-
-	This program is free software; you can redistribute it and/or
-	modify it under the terms of the GNU General Public License
-	as published by the Free Software Foundation; either version 2
-	of the License, or (at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-	See the GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to:
-
-		Free Software Foundation, Inc.
-		59 Temple Place - Suite 330
-		Boston, MA  02111-1307, USA
-
-*/
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#ifdef HAVE_STRING_H
-# include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-
-#include "QF/cvar.h"
-#include "QF/dstring.h"
-#include "QF/input.h"
-#include "QF/qargs.h"
-#include "QF/quakefs.h"
-#include "QF/sys.h"
-#include "QF/va.h"
-#include "QF/vid.h"
-#include "QF/Vulkan/init.h"
-
-#include "vid_vulkan.h"
-
-#include "util.h"
-
-cvar_t *vulkan_use_validation;
-
-static uint32_t numLayers;
-static VkLayerProperties *instanceLayerProperties;
-static const char **instanceLayerNames;
-static uint32_t numExtensions;
-static VkExtensionProperties *instanceExtensionProperties;
-static const char **instanceExtensionNames;
-
-const char * const vulkanValidationLayers[] = {
-	"VK_LAYER_LUNARG_standard_validation",
-	0,
-};
-
-static const char * const debugExtensions[] = {
-	VK_EXT_DEBUG_UTILS_EXTENSION_NAME,
-	0,
-};
-
-static const char * const device_types[] = {
-	"other",
-	"integrated gpu",
-	"discrete gpu",
-	"virtual gpu",
-	"cpu",
-};
-
-static void
-get_instance_layers_and_extensions  (vulkan_ctx_t *ctx)
-{
-	uint32_t    i;
-	VkLayerProperties *properties;
-	VkExtensionProperties *extensions;
-
-	ctx->vkEnumerateInstanceLayerProperties (&numLayers, 0);
-	properties = malloc (numLayers * sizeof (VkLayerProperties));
-	ctx->vkEnumerateInstanceLayerProperties (&numLayers, properties);
-	instanceLayerNames = (const char **) malloc ((numLayers + 1)
-												 * sizeof (const char **));
-	for (i = 0; i < numLayers; i++) {
-		instanceLayerNames[i] = properties[i].layerName;
-	}
-	instanceLayerNames[i] = 0;
-
-	ctx->vkEnumerateInstanceExtensionProperties (0, &numExtensions, 0);
-	extensions = malloc (numExtensions * sizeof (VkLayerProperties));
-	ctx->vkEnumerateInstanceExtensionProperties (0, &numExtensions,
-														extensions);
-	instanceExtensionNames = (const char **) malloc ((numExtensions + 1)
-													 * sizeof (const char **));
-	for (i = 0; i < numExtensions; i++) {
-		instanceExtensionNames[i] = extensions[i].extensionName;
-	}
-	instanceExtensionNames[i] = 0;
-
-	if (developer->int_val & SYS_VULKAN) {
-		for (i = 0; i < numLayers; i++) {
-			Sys_Printf ("%s %x %u %s\n",
-						properties[i].layerName,
-						properties[i].specVersion,
-						properties[i].implementationVersion,
-						properties[i].description);
-		}
-		for (i = 0; i < numExtensions; i++) {
-			Sys_Printf ("%d %s\n",
-						extensions[i].specVersion,
-						extensions[i].extensionName);
-		}
-	}
-	instanceLayerProperties = properties;
-	instanceExtensionProperties = extensions;
-}
-
-static void
-init_physdev (VulkanInstance_t *instance, VkPhysicalDevice dev, VulkanPhysDevice_t *physdev)
-{
-	physdev->device = dev;
-
-	instance->vkGetPhysicalDeviceProperties (dev, &physdev->properties);
-
-	instance->vkEnumerateDeviceLayerProperties (dev, &physdev->numLayers, 0);
-	physdev->layers = malloc (physdev->numLayers * sizeof (VkLayerProperties));
-	instance->vkEnumerateDeviceLayerProperties (dev, &physdev->numLayers,
-												physdev->layers);
-
-	instance->vkEnumerateDeviceExtensionProperties (dev, 0,
-													&physdev->numExtensions,
-													0);
-	physdev->extensions = malloc (physdev->numExtensions
-								  * sizeof (VkExtensionProperties));
-	instance->vkEnumerateDeviceExtensionProperties (dev, 0,
-													&physdev->numExtensions,
-													physdev->extensions);
-
-	instance->vkGetPhysicalDeviceFeatures (dev, &physdev->features);
-
-	instance->vkGetPhysicalDeviceMemoryProperties (dev, &physdev->memory);
-
-	instance->vkGetPhysicalDeviceQueueFamilyProperties (dev,
-														&physdev->numQueueFamilies,
-														0);
-	physdev->queueFamilies = malloc (physdev->numQueueFamilies
-								  * sizeof (VkQueueFamilyProperties));
-	instance->vkGetPhysicalDeviceQueueFamilyProperties (dev,
-														&physdev->numQueueFamilies,
-														physdev->queueFamilies);
-
-	if (developer->int_val & SYS_VULKAN) {
-		VkPhysicalDeviceProperties *prop = &physdev->properties;
-		Sys_Printf ("dev: %p\n", dev);
-		Sys_Printf ("  %x %x\n", prop->apiVersion, prop->driverVersion);
-		Sys_Printf ("  %x %x\n", prop->vendorID, prop->deviceID);
-		Sys_Printf ("  %s: %s\n", device_types[prop->deviceType],
-					prop->deviceName);
-		for (uint32_t i = 0; i < physdev->numLayers; i++) {
-			Sys_Printf ("  %s %x %u %s\n",
-						physdev->layers[i].layerName,
-						physdev->layers[i].specVersion,
-						physdev->layers[i].implementationVersion,
-						physdev->layers[i].description);
-		}
-		for (uint32_t i = 0; i < physdev->numExtensions; i++) {
-			Sys_Printf ("  %u %s\n",
-						physdev->extensions[i].specVersion,
-						physdev->extensions[i].extensionName);
-		}
-		Sys_Printf ("  memory types:\n");
-		for (uint32_t i = 0; i < physdev->memory.memoryTypeCount; i++) {
-			Sys_Printf ("    %x %d\n",
-						physdev->memory.memoryTypes[i].propertyFlags,
-						physdev->memory.memoryTypes[i].heapIndex);
-		}
-		Sys_Printf ("  memory heaps:\n");
-		for (uint32_t i = 0; i < physdev->memory.memoryHeapCount; i++) {
-			Sys_Printf ("    %x %ld\n",
-						physdev->memory.memoryHeaps[i].flags,
-						physdev->memory.memoryHeaps[i].size);
-		}
-		Sys_Printf ("  queue families:\n");
-		for (uint32_t i = 0; i < physdev->numQueueFamilies; i++) {
-			VkQueueFamilyProperties *queue = &physdev->queueFamilies[i];
-			VkExtent3D  gran = queue->minImageTransferGranularity;
-			Sys_Printf ("    %x %3d %3d [%d %d %d]\n",
-						queue->queueFlags,
-						queue->queueCount,
-						queue->timestampValidBits,
-						gran.width, gran.height, gran.depth);
-		}
-	}
-}
-
-static int
-instance_extension_enabled (VulkanInstance_t *inst, const char *ext)
-{
-	return strset_contains (inst->enabled_extensions, ext);
-}
-
-static int message_severities =
-	VK_DEBUG_UTILS_MESSAGE_SEVERITY_VERBOSE_BIT_EXT |
-	VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT |
-	VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT;
-static int message_types =
-	VK_DEBUG_UTILS_MESSAGE_TYPE_GENERAL_BIT_EXT |
-	VK_DEBUG_UTILS_MESSAGE_TYPE_VALIDATION_BIT_EXT |
-	VK_DEBUG_UTILS_MESSAGE_TYPE_PERFORMANCE_BIT_EXT;
-
-static VKAPI_ATTR VkBool32 VKAPI_CALL
-debug_callback (VkDebugUtilsMessageSeverityFlagBitsEXT messageSeverity,
-				VkDebugUtilsMessageTypeFlagsEXT messageType,
-				const VkDebugUtilsMessengerCallbackDataEXT* callbackData,
-				void *data)
-{
-	const char *msgSev = "";
-	if (messageSeverity & VK_DEBUG_UTILS_MESSAGE_SEVERITY_VERBOSE_BIT_EXT) {
-		msgSev = "verbose: ";
-	}
-	if (messageSeverity & VK_DEBUG_UTILS_MESSAGE_SEVERITY_INFO_BIT_EXT) {
-		msgSev = "info: ";
-	}
-	if (messageSeverity & VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT) {
-		msgSev = "warning: ";
-	}
-	if (messageSeverity & VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT) {
-		msgSev = "error: ";
-	}
-	fprintf (stderr, "validation layer: %s%s\n", msgSev, callbackData->pMessage);
-	return VK_FALSE;
-}
-
-static void
-setup_debug_callback (VulkanInstance_t *instance)
-{
-	VkDebugUtilsMessengerCreateInfoEXT createInfo = {
-		.sType = VK_STRUCTURE_TYPE_DEBUG_UTILS_MESSENGER_CREATE_INFO_EXT,
-		.messageSeverity = message_severities,
-		.messageType = message_types,
-		.pfnUserCallback = debug_callback,
-		.pUserData = instance,
-	};
-	instance->vkCreateDebugUtilsMessengerEXT(instance->instance, &createInfo,
-											 0, &instance->debug_callback);
-}
-
-static void
-load_instance_funcs (vulkan_ctx_t *ctx)
-{
-	VulkanInstance_t *vtx = ctx->vtx;
-	VkInstance instance = vtx->instance;
-#define INSTANCE_LEVEL_VULKAN_FUNCTION(name) \
-	vtx->name = (PFN_##name) ctx->vkGetInstanceProcAddr (instance, #name); \
-	if (!vtx->name) { \
-		Sys_Error ("Couldn't find instance level function %s", #name); \
-	}
-
-#define INSTANCE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION(name, ext) \
-	if (vtx->extension_enabled (vtx, ext)) { \
-		vtx->name = (PFN_##name) ctx->vkGetInstanceProcAddr (instance, \
-															 #name); \
-		if (!vtx->name) { \
-			Sys_Error ("Couldn't find instance level function %s", #name); \
-		} \
-	}
-
-#include "QF/Vulkan/funclist.h"
-}
-
-VulkanInstance_t *
-Vulkan_CreateInstance (vulkan_ctx_t *ctx,
-					   const char *appName, uint32_t appVersion,
-					   const char **layers, const char **extensions)
-{
-	VkApplicationInfo appInfo = {
-		VK_STRUCTURE_TYPE_APPLICATION_INFO, 0,
-		appName, appVersion,
-		PACKAGE_STRING, 0x000702ff, //FIXME version
-		VK_API_VERSION_1_0,
-	};
-	VkInstanceCreateInfo createInfo = {
-		VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO, 0, 0,
-		&appInfo,
-		0, 0,
-		0, 0,
-	};
-	VkResult    res;
-	VkInstance  instance;
-	uint32_t    numDev, i;
-	VkPhysicalDevice *devices;
-	VulkanInstance_t *inst;
-
-	if (!instanceLayerProperties) {
-		get_instance_layers_and_extensions (ctx);
-	}
-
-	uint32_t nlay = count_strings (layers) + 1;
-	uint32_t next = count_strings (extensions)
-					+ count_strings (ctx->required_extensions) + 1;
-	if (vulkan_use_validation->int_val) {
-		nlay += count_strings (vulkanValidationLayers);
-		next += count_strings (debugExtensions);
-	}
-	const char **lay = alloca (nlay * sizeof (const char *));
-	const char **ext = alloca (next * sizeof (const char *));
-	// ensure there are null pointers so merge_strings can act as append
-	// since it does not add a null
-	memset (lay, 0, nlay-- * sizeof (const char *));
-	memset (ext, 0, next-- * sizeof (const char *));
-	merge_strings (lay, layers, 0);
-	merge_strings (ext, extensions, ctx->required_extensions);
-	if (vulkan_use_validation->int_val) {
-		merge_strings (lay, lay, vulkanValidationLayers);
-		merge_strings (ext, ext, debugExtensions);
-	}
-	prune_strings (instanceLayerNames, lay, &nlay);
-	prune_strings (instanceExtensionNames, ext, &next);
-	lay[nlay] = 0;
-	ext[next] = 0;
-	createInfo.enabledLayerCount = nlay;
-	createInfo.ppEnabledLayerNames = lay;
-	createInfo.enabledExtensionCount = next;
-	createInfo.ppEnabledExtensionNames = ext;
-
-	res = ctx->vkCreateInstance (&createInfo, 0, &instance);
-	if (res != VK_SUCCESS) {
-		Sys_Error ("unable to create vulkan instance\n");
-	}
-	inst = malloc (sizeof(VulkanInstance_t));
-	inst->instance = instance;
-	inst->enabled_extensions = new_strset (ext);
-	inst->extension_enabled = instance_extension_enabled;
-	ctx->extension_enabled = instance_extension_enabled;
-	ctx->vtx = inst;
-	load_instance_funcs (ctx);
-
-	if (vulkan_use_validation->int_val) {
-		setup_debug_callback (inst);
-	}
-
-	res = inst->vkEnumeratePhysicalDevices (instance, &numDev, 0);
-	if (res != VK_SUCCESS) {
-		Sys_Error ("unable to query vulkan device count: %d\n", res);
-	}
-	devices = malloc(numDev * sizeof (VkPhysicalDevice));
-	res = inst->vkEnumeratePhysicalDevices (instance, &numDev, devices);
-	if (res != VK_SUCCESS) {
-		Sys_Error ("unable to query vulkan device properties: %d\n", res);
-	}
-
-	inst->numDevices = numDev;
-	inst->devices = malloc (numDev * sizeof (VulkanPhysDevice_t));
-
-	for (i = 0; i < numDev; i++) {
-		init_physdev (inst, devices[i], &inst->devices[i]);
-	}
-
-	return inst;
-}
-
-void
-Vulkan_DestroyInstance (VulkanInstance_t *instance)
-{
-	for (uint32_t i = 0; i < instance->numDevices; i++) {
-		free (instance->devices[i].queueFamilies);
-		free (instance->devices[i].extensions);
-		free (instance->devices[i].layers);
-	}
-	free (instance->devices);
-	instance->vkDestroyInstance (instance->instance, 0);
-	free (instance);
-}
-
-int
-Vulkan_LayersSupported (const VkLayerProperties *layers,
-						int numLayers,
-						const char * const *requested)
-{
-	while (*requested) {
-		int         i;
-		for (i = 0; i < numLayers; i++) {
-			if (!strcmp (*requested, layers[i].layerName)) {
-				break;
-			}
-		}
-		if (i == numLayers) {
-			// requested layer not found
-			break;
-		}
-		requested++;
-	}
-	return !*requested;
-}
-
-int
-Vulkan_ExtensionsSupported (const VkExtensionProperties *extensions,
-							int numExtensions,
-							const char * const *requested)
-{
-	while (*requested) {
-		int         i;
-		for (i = 0; i < numExtensions; i++) {
-			if (!strcmp (*requested, extensions[i].extensionName)) {
-				break;
-			}
-		}
-		if (i == numExtensions) {
-			// requested extension not found
-			break;
-		}
-		requested++;
-	}
-	return !*requested;
-}
diff --git a/libs/video/renderer/vulkan/instance.c b/libs/video/renderer/vulkan/instance.c
new file mode 100644
index 000000000..74b0ea756
--- /dev/null
+++ b/libs/video/renderer/vulkan/instance.c
@@ -0,0 +1,266 @@
+/*
+	init.c
+
+	Copyright (C) 2019      Bill Currie <bill@taniwha.org>
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+
+#include "QF/cvar.h"
+#include "QF/dstring.h"
+#include "QF/input.h"
+#include "QF/qargs.h"
+#include "QF/quakefs.h"
+#include "QF/sys.h"
+#include "QF/va.h"
+#include "QF/vid.h"
+#include "QF/Vulkan/instance.h"
+
+#include "vid_vulkan.h"
+
+#include "util.h"
+
+cvar_t *vulkan_use_validation;
+
+static uint32_t numLayers;
+static VkLayerProperties *instanceLayerProperties;
+static strset_t *instanceLayers;
+
+static uint32_t numExtensions;
+static VkExtensionProperties *instanceExtensionProperties;
+static strset_t *instanceExtensions;
+
+const char * const vulkanValidationLayers[] = {
+	"VK_LAYER_LUNARG_standard_validation",
+	0,
+};
+
+static const char * const debugExtensions[] = {
+	VK_EXT_DEBUG_UTILS_EXTENSION_NAME,
+	0,
+};
+
+static void
+get_instance_layers_and_extensions  (vulkan_ctx_t *ctx)
+{
+	uint32_t    i;
+	VkLayerProperties *layers;
+	VkExtensionProperties *extensions;
+
+	ctx->vkEnumerateInstanceLayerProperties (&numLayers, 0);
+	layers = malloc (numLayers * sizeof (VkLayerProperties));
+	ctx->vkEnumerateInstanceLayerProperties (&numLayers, layers);
+	instanceLayers = new_strset (0);
+	for (i = 0; i < numLayers; i++) {
+		strset_add (instanceLayers, layers[i].layerName);
+	}
+
+	ctx->vkEnumerateInstanceExtensionProperties (0, &numExtensions, 0);
+	extensions = malloc (numExtensions * sizeof (VkLayerProperties));
+	ctx->vkEnumerateInstanceExtensionProperties (0, &numExtensions,
+														extensions);
+	instanceExtensions = new_strset (0);
+	for (i = 0; i < numExtensions; i++) {
+		strset_add (instanceExtensions, extensions[i].extensionName);
+	}
+
+	if (developer->int_val & SYS_VULKAN) {
+		for (i = 0; i < numLayers; i++) {
+			Sys_Printf ("%s %x %u %s\n",
+						layers[i].layerName,
+						layers[i].specVersion,
+						layers[i].implementationVersion,
+						layers[i].description);
+		}
+		for (i = 0; i < numExtensions; i++) {
+			Sys_Printf ("%d %s\n",
+						extensions[i].specVersion,
+						extensions[i].extensionName);
+		}
+	}
+	instanceLayerProperties = layers;
+	instanceExtensionProperties = extensions;
+}
+
+static int
+instance_extension_enabled (qfv_instance_t *inst, const char *ext)
+{
+	return strset_contains (inst->enabled_extensions, ext);
+}
+
+static int message_severities =
+	VK_DEBUG_UTILS_MESSAGE_SEVERITY_VERBOSE_BIT_EXT |
+	VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT |
+	VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT;
+static int message_types =
+	VK_DEBUG_UTILS_MESSAGE_TYPE_GENERAL_BIT_EXT |
+	VK_DEBUG_UTILS_MESSAGE_TYPE_VALIDATION_BIT_EXT |
+	VK_DEBUG_UTILS_MESSAGE_TYPE_PERFORMANCE_BIT_EXT;
+
+static VKAPI_ATTR VkBool32 VKAPI_CALL
+debug_callback (VkDebugUtilsMessageSeverityFlagBitsEXT messageSeverity,
+				VkDebugUtilsMessageTypeFlagsEXT messageType,
+				const VkDebugUtilsMessengerCallbackDataEXT* callbackData,
+				void *data)
+{
+	const char *msgSev = "";
+	if (messageSeverity & VK_DEBUG_UTILS_MESSAGE_SEVERITY_VERBOSE_BIT_EXT) {
+		msgSev = "verbose: ";
+	}
+	if (messageSeverity & VK_DEBUG_UTILS_MESSAGE_SEVERITY_INFO_BIT_EXT) {
+		msgSev = "info: ";
+	}
+	if (messageSeverity & VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT) {
+		msgSev = "warning: ";
+	}
+	if (messageSeverity & VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT) {
+		msgSev = "error: ";
+	}
+	fprintf (stderr, "validation layer: %s%s\n", msgSev, callbackData->pMessage);
+	return VK_FALSE;
+}
+
+static void
+setup_debug_callback (qfv_instance_t *instance)
+{
+	VkDebugUtilsMessengerEXT debug_callback_handle;
+	VkDebugUtilsMessengerCreateInfoEXT createInfo = {
+		.sType = VK_STRUCTURE_TYPE_DEBUG_UTILS_MESSENGER_CREATE_INFO_EXT,
+		.messageSeverity = message_severities,
+		.messageType = message_types,
+		.pfnUserCallback = debug_callback,
+		.pUserData = instance,
+	};
+	instance->funcs->vkCreateDebugUtilsMessengerEXT(instance->instance,
+													&createInfo, 0,
+													&debug_callback_handle);
+}
+
+static void
+load_instance_funcs (vulkan_ctx_t *ctx)
+{
+	qfv_instance_t *instance = ctx->instance;
+	qfv_instfuncs_t *funcs = instance->funcs;
+	VkInstance inst = instance->instance;
+#define INSTANCE_LEVEL_VULKAN_FUNCTION(name) \
+	funcs->name = (PFN_##name) ctx->vkGetInstanceProcAddr (inst, #name); \
+	if (!funcs->name) { \
+		Sys_Error ("Couldn't find instance level function %s", #name); \
+	}
+
+#define INSTANCE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION(name, ext) \
+	if (instance->extension_enabled (instance, ext)) { \
+		funcs->name = (PFN_##name) ctx->vkGetInstanceProcAddr (inst, #name); \
+		if (!funcs->name) { \
+			Sys_Error ("Couldn't find instance level function %s", #name); \
+		} \
+	}
+
+#include "QF/Vulkan/funclist.h"
+}
+
+qfv_instance_t *
+QFV_CreateInstance (vulkan_ctx_t *ctx,
+					const char *appName, uint32_t appVersion,
+					const char **layers, const char **extensions)
+{
+	VkApplicationInfo appInfo = {
+		VK_STRUCTURE_TYPE_APPLICATION_INFO, 0,
+		appName, appVersion,
+		PACKAGE_STRING, 0x000702ff, //FIXME version
+		VK_API_VERSION_1_0,
+	};
+	VkInstanceCreateInfo createInfo = {
+		VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO, 0, 0,
+		&appInfo,
+		0, 0,
+		0, 0,
+	};
+	VkResult    res;
+	VkInstance  instance;
+
+	if (!instanceLayerProperties) {
+		get_instance_layers_and_extensions (ctx);
+	}
+
+	uint32_t nlay = count_strings (layers) + 1;
+	uint32_t next = count_strings (extensions)
+					+ count_strings (ctx->required_extensions) + 1;
+	if (vulkan_use_validation->int_val) {
+		nlay += count_strings (vulkanValidationLayers);
+		next += count_strings (debugExtensions);
+	}
+	const char **lay = alloca (nlay * sizeof (const char *));
+	const char **ext = alloca (next * sizeof (const char *));
+	// ensure there are null pointers so merge_strings can act as append
+	// since it does not add a null
+	memset (lay, 0, nlay-- * sizeof (const char *));
+	memset (ext, 0, next-- * sizeof (const char *));
+	merge_strings (lay, layers, 0);
+	merge_strings (ext, extensions, ctx->required_extensions);
+	if (vulkan_use_validation->int_val) {
+		merge_strings (lay, lay, vulkanValidationLayers);
+		merge_strings (ext, ext, debugExtensions);
+	}
+	prune_strings (instanceLayers, lay, &nlay);
+	prune_strings (instanceExtensions, ext, &next);
+	lay[nlay] = 0;
+	ext[next] = 0;
+	createInfo.enabledLayerCount = nlay;
+	createInfo.ppEnabledLayerNames = lay;
+	createInfo.enabledExtensionCount = next;
+	createInfo.ppEnabledExtensionNames = ext;
+
+	res = ctx->vkCreateInstance (&createInfo, 0, &instance);
+	if (res != VK_SUCCESS) {
+		Sys_Error ("unable to create vulkan instance\n");
+	}
+	qfv_instance_t *inst = malloc (sizeof(qfv_instance_t)
+								   + sizeof (qfv_instfuncs_t));
+	inst->instance = instance;
+	inst->funcs = (qfv_instfuncs_t *)(inst + 1);
+	inst->enabled_extensions = new_strset (ext);
+	inst->extension_enabled = instance_extension_enabled;
+	ctx->instance = inst;
+	load_instance_funcs (ctx);
+
+	if (vulkan_use_validation->int_val) {
+		setup_debug_callback (inst);
+	}
+
+	return inst;
+}
+
+void
+QFV_DestroyInstance (qfv_instance_t *instance)
+{
+	instance->funcs->vkDestroyInstance (instance->instance, 0);
+	free (instance);
+}
diff --git a/libs/video/renderer/vulkan/swapchain.c b/libs/video/renderer/vulkan/swapchain.c
new file mode 100644
index 000000000..91f8280c9
--- /dev/null
+++ b/libs/video/renderer/vulkan/swapchain.c
@@ -0,0 +1,148 @@
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifdef HAVE_MATH_H
+# include <math.h>
+#endif
+
+#include "QF/cvar.h"
+#include "QF/mathlib.h"
+#include "QF/sys.h"
+#include "QF/Vulkan/qf_vid.h"
+#include "QF/Vulkan/cvars.h"
+#include "QF/Vulkan/device.h"
+#include "QF/Vulkan/instance.h"
+#include "QF/Vulkan/swapchain.h"
+
+#include "compat.h"
+#include "d_iface.h"
+#include "r_internal.h"
+#include "vid_vulkan.h"
+
+#include "util.h"
+
+qfv_swapchain_t *
+QFV_CreateSwapchain (vulkan_ctx_t *ctx, VkSwapchainKHR old_swapchain)
+{
+	qfv_instfuncs_t *ifuncs = ctx->instance->funcs;
+	qfv_devfuncs_t *dfuncs = ctx->device->funcs;
+
+	VkBool32    supported;
+	ifuncs->vkGetPhysicalDeviceSurfaceSupportKHR (ctx->device->physDev,
+												  ctx->device->queueFamily,
+												  ctx->surface,
+												  &supported);
+	if (!supported) {
+		Sys_Error ("unsupported surface for swapchain");
+	}
+
+	uint32_t    numModes;
+	VkPresentModeKHR *modes;
+	VkPresentModeKHR useMode = VK_PRESENT_MODE_FIFO_KHR;;
+	ifuncs->vkGetPhysicalDeviceSurfacePresentModesKHR (ctx->device->physDev,
+													   ctx->surface,
+													   &numModes, 0);
+	modes = alloca (numModes * sizeof (VkPresentModeKHR));
+	ifuncs->vkGetPhysicalDeviceSurfacePresentModesKHR (ctx->device->physDev,
+													   ctx->surface,
+													   &numModes, modes);
+	for (uint32_t i = 0; i < numModes; i++) {
+		if ((int) modes[i] == vulkan_presentation_mode->int_val) {
+			useMode = modes[i];
+		}
+	}
+	Sys_MaskPrintf (SYS_VULKAN, "presentation mode: %d (%d)\n", useMode,
+					vulkan_presentation_mode->int_val);
+
+	VkSurfaceCapabilitiesKHR surfCaps;
+	ifuncs->vkGetPhysicalDeviceSurfaceCapabilitiesKHR (ctx->device->physDev,
+													   ctx->surface,
+													   &surfCaps);
+	uint32_t numImages = surfCaps.minImageCount + 1;
+	if (surfCaps.maxImageCount > 0 && numImages > surfCaps.maxImageCount) {
+		numImages = surfCaps.maxImageCount;
+	}
+
+	VkExtent2D imageSize = {viddef.width, viddef.height};
+	if (surfCaps.currentExtent.width == ~0u) {
+		imageSize.width = bound (surfCaps.minImageExtent.width,
+								 imageSize.width,
+								 surfCaps.maxImageExtent.width);
+		imageSize.height = bound (surfCaps.minImageExtent.height,
+								  imageSize.height,
+								  surfCaps.maxImageExtent.height);
+	} else {
+		imageSize = surfCaps.currentExtent;
+	}
+	Sys_MaskPrintf (SYS_VULKAN, "%d [%d, %d]\n", numImages,
+					imageSize.width, imageSize.height);
+
+	VkImageUsageFlags imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT;
+	imageUsage &= surfCaps.supportedUsageFlags;
+
+	VkSurfaceTransformFlagBitsKHR surfTransform = VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR;
+
+	uint32_t numFormats;
+	ifuncs->vkGetPhysicalDeviceSurfaceFormatsKHR (ctx->device->physDev,
+												  ctx->surface,
+												  &numFormats, 0);
+	VkSurfaceFormatKHR *formats = alloca (numFormats * sizeof (*formats));
+	ifuncs->vkGetPhysicalDeviceSurfaceFormatsKHR (ctx->device->physDev,
+												  ctx->surface,
+												  &numFormats, formats);
+	VkSurfaceFormatKHR useFormat = {VK_FORMAT_R8G8B8A8_UNORM,
+									VK_COLOR_SPACE_SRGB_NONLINEAR_KHR};
+	if (numFormats > 1) {
+		uint32_t i;
+		for (i = 0; i < numFormats; i++) {
+			if (formats[i].format == useFormat.format
+				&& formats[i].colorSpace == useFormat.colorSpace) {
+				break;
+			}
+		}
+		if (i == numFormats) {
+			useFormat = formats[0];
+		}
+	} else if (numFormats == 1 && formats[0].format != VK_FORMAT_UNDEFINED) {
+		useFormat = formats[0];
+	}
+
+	VkSwapchainCreateInfoKHR createInfo = {
+		VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR, 0, 0,
+		ctx->surface,
+		numImages,
+		useFormat.format, useFormat.colorSpace,
+		imageSize,
+		1, // array layers
+		imageUsage,
+		VK_SHARING_MODE_EXCLUSIVE,
+		0, 0,
+		surfTransform,
+		VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR,
+		useMode,
+		VK_TRUE,
+		old_swapchain
+	};
+
+	VkDevice device = ctx->device->dev;
+	VkSwapchainKHR swapchain;
+	dfuncs->vkCreateSwapchainKHR (device, &createInfo, 0, &swapchain);
+
+	if (old_swapchain != swapchain) {
+		dfuncs->vkDestroySwapchainKHR (device, old_swapchain, 0);
+	}
+
+	dfuncs->vkGetSwapchainImagesKHR (device, swapchain, &numImages, 0);
+	qfv_swapchain_t *sc = malloc (sizeof (qfv_swapchain_t)
+								  + numImages * sizeof (VkImage));
+	sc->dev = device;
+	sc->funcs = ctx->device->funcs;
+	sc->surface = ctx->surface;
+	sc->swapchain = swapchain;
+	sc->numImages = numImages;
+	sc->images = (VkImage *) (sc + 1);
+	dfuncs->vkGetSwapchainImagesKHR (device, swapchain, &numImages,
+									 sc->images);
+	return sc;
+}
diff --git a/libs/video/renderer/vulkan/util.c b/libs/video/renderer/vulkan/util.c
index 09e1b146a..854557e95 100644
--- a/libs/video/renderer/vulkan/util.c
+++ b/libs/video/renderer/vulkan/util.c
@@ -47,17 +47,27 @@ strset_t *
 new_strset (const char * const *strings)
 {
 	hashtab_t  *tab = Hash_NewTable (61, strset_get_key, 0, 0);
-	for ( ; *strings; strings++) {
+	for ( ; strings && *strings; strings++) {
 		Hash_Add (tab, (void *) *strings);
 	}
 	return (strset_t *) tab;
 }
-void del_strset (strset_t *strset)
+
+void
+del_strset (strset_t *strset)
 {
 	Hash_DelTable ((hashtab_t *) strset);
 }
 
-int strset_contains (strset_t *strset, const char *str)
+void
+strset_add (strset_t *strset, const char *str)
+{
+	hashtab_t  *tab = (hashtab_t *) strset;
+	Hash_Add (tab, (void *) str);
+}
+
+int
+strset_contains (strset_t *strset, const char *str)
 {
 	return Hash_Find ((hashtab_t *) strset, str) != 0;
 }
@@ -92,18 +102,12 @@ merge_strings (const char **out, const char * const *in1,
 }
 
 void
-prune_strings (const char * const *reference, const char **strings,
-			   uint32_t *count)
+prune_strings (strset_t *strset, const char **strings, uint32_t *count)
 {
-	for (int i = *count; i-- > 0; ) {
-		const char *str = strings[i];
-		const char * const *ref;
-		for (ref = reference; *ref; ref++) {
-			if (!strcmp (*ref, str)) {
-				break;
-			}
-		}
-		if (!*ref) {
+	hashtab_t  *tab = (hashtab_t *) strset;
+
+	for (uint32_t i = *count; i-- > 0; ) {
+		if (!Hash_Find (tab, strings[i])) {
 			memmove (strings + i, strings + i + 1,
 					 (--(*count) - i) * sizeof (const char **));
 		}
diff --git a/libs/video/renderer/vulkan/util.h b/libs/video/renderer/vulkan/util.h
index a15aac4c8..ae87b8096 100644
--- a/libs/video/renderer/vulkan/util.h
+++ b/libs/video/renderer/vulkan/util.h
@@ -2,15 +2,17 @@
 #define __util_h
 
 #include <stdint.h>
+
+typedef struct strset_s strset_t;
+
 int count_strings (const char * const *str);
 void merge_strings (const char **out, const char * const *in1,
 					const char * const *in2);
-void prune_strings (const char * const *reference, const char **strings,
-					uint32_t *count);
+void prune_strings (strset_t *strset, const char **strings, uint32_t *count);
 
-typedef struct strset_s strset_t;
 strset_t *new_strset (const char * const *strings);
 void del_strset (strset_t *strset);
+void strset_add (strset_t *strset, const char *str);
 int strset_contains (strset_t *strset, const char *str);
 
 #endif//__util_h
diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c
index 22ce1d71e..f7988c26c 100644
--- a/libs/video/renderer/vulkan/vulkan_vid_common.c
+++ b/libs/video/renderer/vulkan/vulkan_vid_common.c
@@ -49,7 +49,8 @@
 #include "QF/va.h"
 #include "QF/vid.h"
 #include "QF/Vulkan/qf_vid.h"
-#include "QF/Vulkan/init.h"
+#include "QF/Vulkan/device.h"
+#include "QF/Vulkan/instance.h"
 
 #include "compat.h"
 #include "d_iface.h"
@@ -58,7 +59,7 @@
 
 #include "util.h"
 
-static cvar_t *vulkan_presentation_mode;
+cvar_t *vulkan_presentation_mode;
 
 static void
 vulkan_presentation_mode_f (cvar_t *var)
@@ -77,8 +78,8 @@ vulkan_presentation_mode_f (cvar_t *var)
 	}
 }
 
-void
-Vulkan_Init_Cvars ()
+static void
+Vulkan_Init_Cvars (void)
 {
 	vulkan_use_validation = Cvar_Get ("vulkan_use_validation", "1", CVAR_NONE,
 									  0,
@@ -102,251 +103,30 @@ static const char *device_extensions[] = {
 	0,
 };
 
-static int
-count_bits (uint32_t val)
-{
-	int         bits = 0;
-	while (val) {
-		bits += val & 1;
-		val >>= 1;
-	}
-	return bits;
-}
-
-static int
-find_queue_family (VulkanPhysDevice_t *dev, uint32_t flags)
-{
-	int         best_diff = 32;
-	uint32_t    family = -1;
-
-	for (uint32_t i = 0; i < dev->numQueueFamilies; i++) {
-		VkQueueFamilyProperties *queue = &dev->queueFamilies[i];
-
-		if ((queue->queueFlags & flags) == flags) {
-			int diff = count_bits (queue->queueFlags & ~flags);
-			if (diff < best_diff) {
-				best_diff = diff;
-				family = i;
-			}
-		}
-	}
-	return family;
-}
-
-static void
-load_device_funcs (VulkanInstance_t *inst, VulkanDevice_t *dev)
-{
-#define DEVICE_LEVEL_VULKAN_FUNCTION(name) \
-	dev->name = (PFN_##name) inst->vkGetDeviceProcAddr (dev->device, #name); \
-	if (!dev->name) { \
-		Sys_Error ("Couldn't find device level function %s", #name); \
-	}
-
-#define DEVICE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION(name, ext) \
-	if (inst->extension_enabled (inst, ext)) { \
-		dev->name = (PFN_##name) inst->vkGetDeviceProcAddr (dev->device, \
-															#name); \
-		if (!dev->name) { \
-			Sys_Printf ("Couldn't find device level function %s", #name); \
-		} \
-	}
-
-#include "QF/Vulkan/funclist.h"
-}
-
 void
 Vulkan_Init_Common (vulkan_ctx_t *ctx)
 {
 	Sys_Printf ("Vulkan_Init_Common\n");
 	Vulkan_Init_Cvars ();
 
-	ctx->vtx = Vulkan_CreateInstance (ctx, PACKAGE_STRING, 0x000702ff, 0, instance_extensions);//FIXME version
-	ctx->instance = ctx->vtx->instance;
+	ctx->instance = QFV_CreateInstance (ctx, PACKAGE_STRING, 0x000702ff, 0, instance_extensions);//FIXME version
 }
 
 void
 Vulkan_Shutdown_Common (vulkan_ctx_t *ctx)
 {
-	Vulkan_DestroyInstance (ctx->vtx);
-	ctx->vtx = 0;
+	QFV_DestroyInstance (ctx->instance);
+	ctx->instance = 0;
 	ctx->unload_vulkan (ctx);
 }
 
 void
 Vulkan_CreateDevice (vulkan_ctx_t *ctx)
 {
-	VulkanInstance_t *inst = ctx->vtx;
-
-	uint32_t nlay = 1;	// ensure alloca doesn't see 0 and terminated
-	uint32_t next = count_strings (device_extensions) + 1; // ensure terminated
-	if (vulkan_use_validation->int_val) {
-		nlay += count_strings (vulkanValidationLayers);
-	}
-	const char **lay = alloca (nlay * sizeof (const char *));
-	const char **ext = alloca (next * sizeof (const char *));
-	// ensure there are null pointers so merge_strings can act as append
-	// since it does not add a null, but also make sure the counts reflect
-	// actual numbers
-	memset (lay, 0, nlay-- * sizeof (const char *));
-	memset (ext, 0, next-- * sizeof (const char *));
-	merge_strings (ext, device_extensions, 0);
-	if (vulkan_use_validation->int_val) {
-		merge_strings (lay, lay, vulkanValidationLayers);
-	}
-
-	for (uint32_t i = 0; i < inst->numDevices; i++) {
-		VulkanPhysDevice_t *phys = &inst->devices[i];
-		if (!Vulkan_LayersSupported (phys->layers, phys->numLayers, lay)) {
-			continue;
-		}
-		if (!Vulkan_ExtensionsSupported (phys->extensions, phys->numExtensions,
-										 ext)) {
-			continue;
-		}
-		int family = find_queue_family (phys, VK_QUEUE_GRAPHICS_BIT);
-		if (family < 0) {
-			continue;
-		}
-		if (!ctx->get_presentation_support (ctx, phys->device, family)) {
-			continue;
-		}
-		float priority = 1;
-		VkDeviceQueueCreateInfo qCreateInfo = {
-			VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO, 0, 0,
-			family, 1, &priority
-		};
-		VkPhysicalDeviceFeatures features;
-		VkDeviceCreateInfo dCreateInfo = {
-			VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO, 0, 0,
-			1, &qCreateInfo,
-			nlay, lay,
-			next, ext,
-			&features
-		};
-		memset (&features, 0, sizeof (features));
-		VulkanDevice_t *device = calloc (1, sizeof (VulkanDevice_t));
-		if (inst->vkCreateDevice (phys->device, &dCreateInfo, 0,
-									  &device->device) == VK_SUCCESS) {
-			load_device_funcs (inst, device);
-			device->vkGetDeviceQueue (device->device, family,
-									  0, &device->queue);
-			ctx->dev = device;
-			ctx->device = device->device;
-			ctx->physDevice = phys->device;
-			device->queueFamily = family;
-			return;
-		}
-	}
+	ctx->device = QFV_CreateDevice (ctx, device_extensions);
 }
 
 void
 Vulkan_CreateSwapchain (vulkan_ctx_t *ctx)
 {
-	VkBool32    supported;
-	ctx->vtx->vkGetPhysicalDeviceSurfaceSupportKHR (ctx->physDevice,
-													ctx->dev->queueFamily,
-													ctx->dev->surface,
-													&supported);
-	if (!supported) {
-		Sys_Error ("unsupported surface for swapchain");
-	}
-	uint32_t    numModes;
-	VkPresentModeKHR *modes;
-	VkPresentModeKHR useMode = VK_PRESENT_MODE_FIFO_KHR;;
-	ctx->vtx->vkGetPhysicalDeviceSurfacePresentModesKHR (ctx->physDevice,
-														 ctx->dev->surface,
-														 &numModes, 0);
-	modes = alloca (numModes * sizeof (VkPresentModeKHR));
-	ctx->vtx->vkGetPhysicalDeviceSurfacePresentModesKHR (ctx->physDevice,
-														 ctx->dev->surface,
-														 &numModes, modes);
-	for (uint32_t i = 0; i < numModes; i++) {
-		if ((int) modes[i] == vulkan_presentation_mode->int_val) {
-			useMode = modes[i];
-		}
-	}
-	Sys_MaskPrintf (SYS_VULKAN, "presentation mode: %d (%d)\n", useMode,
-					vulkan_presentation_mode->int_val);
-
-	VkSurfaceCapabilitiesKHR surfCaps;
-	ctx->vtx->vkGetPhysicalDeviceSurfaceCapabilitiesKHR (ctx->physDevice,
-														 ctx->dev->surface,
-														 &surfCaps);
-	uint32_t numImages = surfCaps.minImageCount + 1;
-	if (surfCaps.maxImageCount > 0 && numImages > surfCaps.maxImageCount) {
-		numImages = surfCaps.maxImageCount;
-	}
-
-	VkExtent2D imageSize = {viddef.width, viddef.height};
-	if (surfCaps.currentExtent.width == ~0u) {
-		imageSize.width = bound (surfCaps.minImageExtent.width,
-								 imageSize.width,
-								 surfCaps.maxImageExtent.width);
-		imageSize.height = bound (surfCaps.minImageExtent.height,
-								  imageSize.height,
-								  surfCaps.maxImageExtent.height);
-	} else {
-		imageSize = surfCaps.currentExtent;
-	}
-	Sys_MaskPrintf (SYS_VULKAN, "%d [%d, %d]\n", numImages,
-					imageSize.width, imageSize.height);
-
-	VkImageUsageFlags imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT;
-	imageUsage &= surfCaps.supportedUsageFlags;
-
-	VkSurfaceTransformFlagBitsKHR surfTransform = VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR;
-
-	uint32_t numFormats;
-	ctx->vtx->vkGetPhysicalDeviceSurfaceFormatsKHR (ctx->physDevice,
-													ctx->dev->surface,
-													&numFormats, 0);
-	VkSurfaceFormatKHR *formats = alloca (numFormats * sizeof (*formats));
-	ctx->vtx->vkGetPhysicalDeviceSurfaceFormatsKHR (ctx->physDevice,
-													ctx->dev->surface,
-													&numFormats, formats);
-	VkSurfaceFormatKHR useFormat = {VK_FORMAT_R8G8B8A8_UNORM,
-									VK_COLOR_SPACE_SRGB_NONLINEAR_KHR};
-	if (numFormats > 1) {
-		uint32_t i;
-		for (i = 0; i < numFormats; i++) {
-			if (formats[i].format == useFormat.format
-				&& formats[i].colorSpace == useFormat.colorSpace) {
-				break;
-			}
-		}
-		if (i == numFormats) {
-			useFormat = formats[0];
-		}
-	} else if (numFormats == 1 && formats[0].format != VK_FORMAT_UNDEFINED) {
-		useFormat = formats[0];
-	}
-
-	VkSwapchainCreateInfoKHR createInfo = {
-		VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR, 0, 0,
-		ctx->dev->surface,
-		numImages,
-		useFormat.format, useFormat.colorSpace,
-		imageSize,
-		1, // array layers
-		imageUsage,
-		VK_SHARING_MODE_EXCLUSIVE,
-		0, 0,
-		surfTransform,
-		VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR,
-		useMode,
-		VK_TRUE,
-		ctx->swapchain
-	};
-	VkSwapchainKHR swapchain;
-	ctx->dev->vkCreateSwapchainKHR (ctx->device, &createInfo, 0, &swapchain);
-	if (ctx->swapchain != swapchain) {
-		ctx->dev->vkDestroySwapchainKHR (ctx->device, ctx->swapchain, 0);
-	}
-	ctx->swapchain = swapchain;
-
-	ctx->dev->vkGetSwapchainImagesKHR (ctx->device, swapchain, &numImages, 0);
-	ctx->swapchainImages = malloc (numImages * sizeof (*ctx->swapchainImages));
-	ctx->dev->vkGetSwapchainImagesKHR (ctx->device, swapchain, &numImages,
-									   ctx->swapchainImages);
-	ctx->numSwapchainImages = numImages;
 }
diff --git a/libs/video/targets/vid_x11_vulkan.c b/libs/video/targets/vid_x11_vulkan.c
index 812e74dad..cd228b051 100644
--- a/libs/video/targets/vid_x11_vulkan.c
+++ b/libs/video/targets/vid_x11_vulkan.c
@@ -54,6 +54,8 @@
 #include "QF/set.h"
 #include "QF/sys.h"
 
+#include "QF/Vulkan/instance.h"
+
 #include "context_x11.h"
 #include "vid_internal.h"
 #include "vid_vulkan.h"
@@ -61,7 +63,7 @@
 static cvar_t *vulkan_library_name;
 
 typedef struct vulkan_presentation_s {
-#define INSTANCE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION(name,ext) PFN_##name name;
+#define PRESENTATION_VULKAN_FUNCTION_FROM_EXTENSION(name,ext) PFN_##name name;
 #include "QF/Vulkan/funclist.h"
 
 	Display    *display;
@@ -115,12 +117,12 @@ x11_vulkan_init_presentation (vulkan_ctx_t *ctx)
 {
 	ctx->presentation = calloc (1, sizeof (vulkan_presentation_t));
 	vulkan_presentation_t *pres = ctx->presentation;
-	VkInstance  instance = ctx->instance;
+	qfv_instance_t *instance = ctx->instance;
+	VkInstance  inst = instance->instance;
 
-#define INSTANCE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION(name, ext) \
-	if (ctx->extension_enabled (ctx->vtx, ext)) { \
-		pres->name = (PFN_##name) ctx->vkGetInstanceProcAddr (instance, \
-															  #name); \
+#define PRESENTATION_VULKAN_FUNCTION_FROM_EXTENSION(name, ext) \
+	if (instance->extension_enabled (instance, ext)) { \
+		pres->name = (PFN_##name) ctx->vkGetInstanceProcAddr (inst, #name); \
 		if (!pres->name) { \
 			Sys_Error ("Couldn't find instance-level function %s", #name); \
 		} \
@@ -182,6 +184,7 @@ static VkSurfaceKHR
 x11_vulkan_create_surface (vulkan_ctx_t *ctx)
 {
 	vulkan_presentation_t *pres = ctx->presentation;
+	VkInstance inst = ctx->instance->instance;
 	VkSurfaceKHR surface;
 	VkXlibSurfaceCreateInfoKHR createInfo = {
 		.sType = VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR,
@@ -190,7 +193,7 @@ x11_vulkan_create_surface (vulkan_ctx_t *ctx)
 		.window = pres->window
 	};
 
-	if (pres->vkCreateXlibSurfaceKHR (ctx->instance, &createInfo, 0, &surface)
+	if (pres->vkCreateXlibSurfaceKHR (inst, &createInfo, 0, &surface)
 		!= VK_SUCCESS) {
 		return 0;
 	}

From 66e7336b624015ae8590eeed16fcbb0da1c36f9b Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 12 Jul 2019 13:37:30 +0900
Subject: [PATCH 0303/1519] Initialize device extension checks early

They need to be initialized before attempting to load the function
pointers.
---
 libs/video/renderer/vulkan/device.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libs/video/renderer/vulkan/device.c b/libs/video/renderer/vulkan/device.c
index 1579c0633..36b81b025 100644
--- a/libs/video/renderer/vulkan/device.c
+++ b/libs/video/renderer/vulkan/device.c
@@ -195,13 +195,13 @@ QFV_CreateDevice (vulkan_ctx_t *ctx, const char **extensions)
 		if (ifunc->vkCreateDevice (physdev, &dCreateInfo, 0,
 								   &device->dev) == VK_SUCCESS) {
 			qfv_devfuncs_t *dfunc = device->funcs;
+			device->enabled_extensions = new_strset (ext);
+			device->extension_enabled = device_extension_enabled;
 
 			device->physDev = physdev;
 			load_device_funcs (inst, device);
 			device->queueFamily = family;
 			dfunc->vkGetDeviceQueue (device->dev, family, 0, &device->queue);
-			device->enabled_extensions = new_strset (ext);
-			device->extension_enabled = device_extension_enabled;
 			ctx->device = device;
 			return device;
 		}

From b2e12d701bc151e7ec284b340e122e83fd1decd8 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 12 Jul 2019 14:09:12 +0900
Subject: [PATCH 0304/1519] Fix up swapchain creation

Things are working again.
---
 include/QF/Vulkan/funclist.h                   |  6 +++---
 libs/video/renderer/vulkan/vulkan_vid_common.c | 11 +++++++++++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/include/QF/Vulkan/funclist.h b/include/QF/Vulkan/funclist.h
index 719335699..1419aebd4 100644
--- a/include/QF/Vulkan/funclist.h
+++ b/include/QF/Vulkan/funclist.h
@@ -94,10 +94,10 @@ DEVICE_LEVEL_VULKAN_FUNCTION (vkGetDeviceQueue)
 #endif
 
 DEVICE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION
-	(vkCreateSwapchainKHR, VK_KHR_SURFACE_EXTENSION_NAME)
+	(vkCreateSwapchainKHR, VK_KHR_SWAPCHAIN_EXTENSION_NAME)
 DEVICE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION
-	(vkDestroySwapchainKHR, VK_KHR_SURFACE_EXTENSION_NAME)
+	(vkDestroySwapchainKHR, VK_KHR_SWAPCHAIN_EXTENSION_NAME)
 DEVICE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION
-	(vkGetSwapchainImagesKHR, VK_KHR_SURFACE_EXTENSION_NAME)
+	(vkGetSwapchainImagesKHR, VK_KHR_SWAPCHAIN_EXTENSION_NAME)
 
 #undef DEVICE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION
diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c
index f7988c26c..70890ab7a 100644
--- a/libs/video/renderer/vulkan/vulkan_vid_common.c
+++ b/libs/video/renderer/vulkan/vulkan_vid_common.c
@@ -51,6 +51,7 @@
 #include "QF/Vulkan/qf_vid.h"
 #include "QF/Vulkan/device.h"
 #include "QF/Vulkan/instance.h"
+#include "QF/Vulkan/swapchain.h"
 
 #include "compat.h"
 #include "d_iface.h"
@@ -129,4 +130,14 @@ Vulkan_CreateDevice (vulkan_ctx_t *ctx)
 void
 Vulkan_CreateSwapchain (vulkan_ctx_t *ctx)
 {
+	VkSwapchainKHR old_swapchain = 0;
+	if (ctx->swapchain) {
+		old_swapchain = ctx->swapchain->swapchain;
+		free (ctx->swapchain);
+	}
+	ctx->swapchain = QFV_CreateSwapchain (ctx, old_swapchain);
+	if (ctx->swapchain->swapchain == old_swapchain) {
+		ctx->device->funcs->vkDestroySwapchainKHR (ctx->device->dev,
+												   old_swapchain, 0);
+	}
 }

From 4e4d1b99b48b06d67b271c92d7095b0c55d3970c Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 12 Jul 2019 23:15:26 +0900
Subject: [PATCH 0305/1519] Clean up all the system shutdown calls

I added Sys_RegisterShutdown years ago and never really did anything
with it: now any system that needs to be shutdown can ensure it gets
shutdown on program exit, and in the correct order (ie, reverse to init
order).
---
 hw/source/master.c                |  3 --
 include/QF/cdaudio.h              |  1 -
 include/QF/console.h              |  1 -
 include/QF/input.h                |  2 --
 include/QF/sound.h                |  4 ---
 include/QF/vid.h                  |  1 -
 include/netchan.h                 |  4 ---
 include/netmain.h                 |  4 ---
 libs/audio/cd.c                   |  6 ++--
 libs/audio/snd.c                  | 29 ++++++++--------
 libs/audio/targets/snd_alsa.c     |  4 +--
 libs/audio/targets/snd_disk.c     |  4 +--
 libs/audio/targets/snd_dx.c       | 13 +++----
 libs/audio/targets/snd_oss.c      |  4 +--
 libs/audio/targets/snd_sdl.c      |  4 +--
 libs/audio/targets/snd_sgi.c      |  4 +--
 libs/audio/targets/snd_sun.c      |  4 +--
 libs/audio/targets/snd_win.c      |  9 ++---
 libs/console/client.c             |  4 +--
 libs/console/console.c            | 20 ++++++-----
 libs/console/server.c             |  4 +--
 libs/net/nc/net_udp.c             | 23 +++++++------
 libs/net/nc/net_udp6.c            |  4 +--
 libs/net/net_main.c               | 56 ++++++++++++++++---------------
 libs/video/targets/context_sdl.c  |  6 ----
 libs/video/targets/in_common.c    |  6 ++--
 libs/video/targets/vid_3dfxsvga.c |  6 ++--
 libs/video/targets/vid_fbdev.c    |  6 ++--
 libs/video/targets/vid_sdl.c      |  8 +++++
 libs/video/targets/vid_svgalib.c  |  6 ++--
 libs/video/targets/vid_wgl.c      |  6 ++--
 libs/video/targets/vid_x11.c      | 21 +++++-------
 nq/include/client.h               |  1 -
 nq/source/cl_main.c               |  8 ++---
 nq/source/host.c                  |  7 ----
 nq/source/sv_ded.c                |  5 ---
 qtv/source/qtv.c                  |  2 --
 qw/source/cl_main.c               |  5 ---
 qw/source/sv_main.c               |  3 --
 tools/qwaq/qwaq-bi.c              |  3 --
 40 files changed, 135 insertions(+), 176 deletions(-)

diff --git a/hw/source/master.c b/hw/source/master.c
index 6e744c4ac..31f457f5a 100644
--- a/hw/source/master.c
+++ b/hw/source/master.c
@@ -471,11 +471,8 @@ SV_WriteFilterList (void)
 static void
 SV_Shutdown (void)
 {
-	NET_Shutdown ();
-
 	// write filter list
 	SV_WriteFilterList ();
-	Con_Shutdown ();
 }
 
 static void
diff --git a/include/QF/cdaudio.h b/include/QF/cdaudio.h
index e7596ad78..12d3aa2a9 100644
--- a/include/QF/cdaudio.h
+++ b/include/QF/cdaudio.h
@@ -35,7 +35,6 @@ void CDAudio_Play(int track, qboolean looping);
 void CDAudio_Stop(void);
 void CDAudio_Pause(void);
 void CDAudio_Resume(void);
-void CDAudio_Shutdown(void);
 void CDAudio_Update(void);
 
 #endif // _CDAUDIO_H
diff --git a/include/QF/console.h b/include/QF/console.h
index 4f3bcb3c8..b18e66401 100644
--- a/include/QF/console.h
+++ b/include/QF/console.h
@@ -119,7 +119,6 @@ void Con_BufferAddText (con_buffer_t *buf, const char *text);
 
 // init/shutdown functions
 void Con_Init (const char *plugin_name);
-void Con_Shutdown (void);
 void Con_ExecLine (const char *line);
 
 void Con_ProcessInput (void);
diff --git a/include/QF/input.h b/include/QF/input.h
index 8f0438071..ab808386f 100644
--- a/include/QF/input.h
+++ b/include/QF/input.h
@@ -44,8 +44,6 @@ struct cvar_s;
 void IN_Init (struct cbuf_s *cbuf);
 void IN_Init_Cvars (void);
 
-void IN_Shutdown (void);
-
 void IN_ProcessEvents (void);
 
 void IN_UpdateGrab (struct cvar_s *);
diff --git a/include/QF/sound.h b/include/QF/sound.h
index 874469ea4..3e37a5871 100644
--- a/include/QF/sound.h
+++ b/include/QF/sound.h
@@ -81,10 +81,6 @@ void S_Init (int *viewentity, double *host_frametime);
 */
 void S_Init_Cvars (void);
 
-/** Shutdown the sound engine. Allows audio output modules to shutdown
-	gracefully.
-*/
-void S_Shutdown (void);
 //@}
 
 /** \defgroup sound_stuff Unclassified
diff --git a/include/QF/vid.h b/include/QF/vid.h
index 93975ced6..e1228fcd7 100644
--- a/include/QF/vid.h
+++ b/include/QF/vid.h
@@ -76,7 +76,6 @@ void VID_Init_Cvars (void);
 // the palette data will go away after the call, so it must be copied off if
 // the video driver will need it again
 void VID_Init (byte *palette, byte *colormap);
-void VID_Shutdown (void);
 void VID_SetCaption (const char *text);
 void VID_ClearMemory (void);
 
diff --git a/include/netchan.h b/include/netchan.h
index 556732ba2..4aa266fc8 100644
--- a/include/netchan.h
+++ b/include/netchan.h
@@ -90,10 +90,6 @@ extern struct cvar_s *net_packetlog;
 */
 void NET_Init (int port);
 
-/** Shutdown the UDP network interface.
-*/
-void NET_Shutdown (void);
-
 /** Read a single packet from the network into net_message.
 
 	\return			True if successfully read, otherwise false.
diff --git a/include/netmain.h b/include/netmain.h
index a35171415..fdb870628 100644
--- a/include/netmain.h
+++ b/include/netmain.h
@@ -273,10 +273,6 @@ extern	int			net_activeconnections;
 */
 void		NET_Init (void);
 
-/** Shutdown the networking sub-system.
-*/
-void		NET_Shutdown (void);
-
 /** Check for new connections.
 
 	\return			Pointer to the qsocket for the new connection if there
diff --git a/libs/audio/cd.c b/libs/audio/cd.c
index bf4245ba6..e025abbe2 100644
--- a/libs/audio/cd.c
+++ b/libs/audio/cd.c
@@ -69,8 +69,8 @@ CDAudio_Resume (void)
 		cdmodule->functions->cd->pCDAudio_Resume ();
 }
 
-VISIBLE void
-CDAudio_Shutdown (void)
+static void
+CDAudio_shutdown (void)
 {
 	if (cdmodule)
 		cdmodule->functions->general->p_Shutdown ();
@@ -93,6 +93,8 @@ CD_f (void)
 VISIBLE int
 CDAudio_Init (void)
 {
+	Sys_RegisterShutdown (CDAudio_shutdown);
+
 	PI_RegisterPlugins (cd_plugin_list);
 	cd_plugin = Cvar_Get ("cd_plugin", CD_DEFAULT, CVAR_ROM, NULL,
 						  "CD Plugin to use");
diff --git a/libs/audio/snd.c b/libs/audio/snd.c
index 6f4ecba05..e76c548e0 100644
--- a/libs/audio/snd.c
+++ b/libs/audio/snd.c
@@ -53,6 +53,19 @@ static plugin_list_t snd_render_list[] = {
 	SND_RENDER_PLUGIN_LIST
 };
 
+static void
+S_shutdown (void)
+{
+	if (snd_render_module) {
+		PI_UnloadPlugin (snd_render_module);
+		snd_render_module = NULL;
+		snd_render_funcs = NULL;
+	}
+	if (snd_output_module) {
+		PI_UnloadPlugin (snd_output_module);
+		snd_output_module = NULL;
+	}
+}
 
 VISIBLE void
 S_Init (int *viewentity, double *host_frametime)
@@ -65,6 +78,8 @@ S_Init (int *viewentity, double *host_frametime)
 		return;
 	}
 
+	Sys_RegisterShutdown (S_shutdown);
+
 	PI_RegisterPlugins (snd_output_list);
 	PI_RegisterPlugins (snd_render_list);
 	snd_output_module = PI_LoadPlugin ("snd_output", snd_output->string);
@@ -120,20 +135,6 @@ S_AmbientOn (void)
 		snd_render_funcs->pS_AmbientOn ();
 }
 
-VISIBLE void
-S_Shutdown (void)
-{
-	if (snd_render_module) {
-		PI_UnloadPlugin (snd_render_module);
-		snd_render_module = NULL;
-		snd_render_funcs = NULL;
-	}
-	if (snd_output_module) {
-		PI_UnloadPlugin (snd_output_module);
-		snd_output_module = NULL;
-	}
-}
-
 VISIBLE void
 S_StaticSound (sfx_t *sfx, const vec3_t origin, float vol, float attenuation)
 {
diff --git a/libs/audio/targets/snd_alsa.c b/libs/audio/targets/snd_alsa.c
index 76450bcc9..205153752 100644
--- a/libs/audio/targets/snd_alsa.c
+++ b/libs/audio/targets/snd_alsa.c
@@ -463,7 +463,7 @@ SNDDMA_GetDMAPos (void)
 }
 
 static void
-SNDDMA_Shutdown (void)
+SNDDMA_shutdown (void)
 {
 	if (snd_inited) {
 		qfsnd_pcm_close (pcm);
@@ -549,7 +549,7 @@ PLUGIN_INFO(snd_output, alsa)
 	plugin_info_general_funcs.p_Init = SNDDMA_Init_Cvars;
 	plugin_info_general_funcs.p_Shutdown = NULL;
 	plugin_info_snd_output_funcs.pS_O_Init = SNDDMA_Init;
-	plugin_info_snd_output_funcs.pS_O_Shutdown = SNDDMA_Shutdown;
+	plugin_info_snd_output_funcs.pS_O_Shutdown = SNDDMA_shutdown;
 	plugin_info_snd_output_funcs.pS_O_GetDMAPos = SNDDMA_GetDMAPos;
 	plugin_info_snd_output_funcs.pS_O_Submit = SNDDMA_Submit;
 	plugin_info_snd_output_funcs.pS_O_BlockSound = SNDDMA_BlockSound;
diff --git a/libs/audio/targets/snd_disk.c b/libs/audio/targets/snd_disk.c
index e24bc0e9f..878ca90ca 100644
--- a/libs/audio/targets/snd_disk.c
+++ b/libs/audio/targets/snd_disk.c
@@ -108,7 +108,7 @@ SNDDMA_GetDMAPos (void)
 }
 
 static void
-SNDDMA_Shutdown (void)
+SNDDMA_shutdown (void)
 {
 	if (snd_inited) {
 		Qclose (snd_file);
@@ -174,7 +174,7 @@ PLUGIN_INFO(snd_output, disk)
 	plugin_info_general_funcs.p_Init = SNDDMA_Init_Cvars;
 	plugin_info_general_funcs.p_Shutdown = NULL;
 	plugin_info_snd_output_funcs.pS_O_Init = SNDDMA_Init;
-	plugin_info_snd_output_funcs.pS_O_Shutdown = SNDDMA_Shutdown;
+	plugin_info_snd_output_funcs.pS_O_Shutdown = SNDDMA_shutdown;
 	plugin_info_snd_output_funcs.pS_O_GetDMAPos = SNDDMA_GetDMAPos;
 	plugin_info_snd_output_funcs.pS_O_Submit = SNDDMA_Submit;
 	plugin_info_snd_output_funcs.pS_O_BlockSound = SNDDMA_BlockSound;
diff --git a/libs/audio/targets/snd_dx.c b/libs/audio/targets/snd_dx.c
index 1bae2c3d0..3852a17a5 100644
--- a/libs/audio/targets/snd_dx.c
+++ b/libs/audio/targets/snd_dx.c
@@ -417,13 +417,8 @@ SNDDMA_Submit (void)
 	DSOUND_LockBuffer (false);
 }
 
-/*
-	SNDDMA_Shutdown
-
-	Reset the sound device for exiting
-*/
 static void
-SNDDMA_Shutdown (void)
+SNDDMA_shutdown (void)
 {
 	FreeSound ();
 }
@@ -450,7 +445,7 @@ DSOUND_LockBuffer (qboolean lockit)
 			if (hresult != DSERR_BUFFERLOST) {
 				Sys_Printf
 					("S_TransferStereo16: DS::Lock Sound Buffer Failed\n");
-				SNDDMA_Shutdown ();
+				SNDDMA_shutdown ();
 				SNDDMA_Init ();
 				return NULL;
 			}
@@ -458,7 +453,7 @@ DSOUND_LockBuffer (qboolean lockit)
 			if (++reps > 10000) {
 				Sys_Printf
 					("S_TransferStereo16: DS: couldn't restore buffer\n");
-				SNDDMA_Shutdown ();
+				SNDDMA_shutdown ();
 				SNDDMA_Init ();
 				return NULL;
 			}
@@ -529,7 +524,7 @@ PLUGIN_INFO(snd_output, dx)
 	plugin_info_general_funcs.p_Init = SNDDMA_Init_Cvars;
 	plugin_info_general_funcs.p_Shutdown = NULL;
 	plugin_info_snd_output_funcs.pS_O_Init = SNDDMA_Init;
-	plugin_info_snd_output_funcs.pS_O_Shutdown = SNDDMA_Shutdown;
+	plugin_info_snd_output_funcs.pS_O_Shutdown = SNDDMA_shutdown;
 	plugin_info_snd_output_funcs.pS_O_GetDMAPos = SNDDMA_GetDMAPos;
 	plugin_info_snd_output_funcs.pS_O_Submit = SNDDMA_Submit;
 	plugin_info_snd_output_funcs.pS_O_BlockSound = SNDDMA_BlockSound;
diff --git a/libs/audio/targets/snd_oss.c b/libs/audio/targets/snd_oss.c
index 33349dc98..97383ff82 100644
--- a/libs/audio/targets/snd_oss.c
+++ b/libs/audio/targets/snd_oss.c
@@ -331,7 +331,7 @@ SNDDMA_GetDMAPos (void)
 }
 
 static void
-SNDDMA_Shutdown (void)
+SNDDMA_shutdown (void)
 {
 	if (snd_inited) {
 		if (mmaped_io)
@@ -413,7 +413,7 @@ PLUGIN_INFO(snd_output, oss)
 	plugin_info_general_funcs.p_Init = SNDDMA_Init_Cvars;
 	plugin_info_general_funcs.p_Shutdown = NULL;
 	plugin_info_snd_output_funcs.pS_O_Init = SNDDMA_Init;
-	plugin_info_snd_output_funcs.pS_O_Shutdown = SNDDMA_Shutdown;
+	plugin_info_snd_output_funcs.pS_O_Shutdown = SNDDMA_shutdown;
 	plugin_info_snd_output_funcs.pS_O_GetDMAPos = SNDDMA_GetDMAPos;
 	plugin_info_snd_output_funcs.pS_O_Submit = SNDDMA_Submit;
 	plugin_info_snd_output_funcs.pS_O_BlockSound = SNDDMA_BlockSound;
diff --git a/libs/audio/targets/snd_sdl.c b/libs/audio/targets/snd_sdl.c
index 91d5500f5..5e8dfc409 100644
--- a/libs/audio/targets/snd_sdl.c
+++ b/libs/audio/targets/snd_sdl.c
@@ -206,7 +206,7 @@ SNDDMA_GetDMAPos (void)
 }
 
 static void
-SNDDMA_Shutdown (void)
+SNDDMA_shutdown (void)
 {
 	if (snd_inited) {
 		SDL_CloseAudio ();
@@ -297,7 +297,7 @@ PLUGIN_INFO(snd_output, sdl)
 	plugin_info_general_funcs.p_Init = SNDDMA_Init_Cvars;
 	plugin_info_general_funcs.p_Shutdown = NULL;
 	plugin_info_snd_output_funcs.pS_O_Init = SNDDMA_Init;
-	plugin_info_snd_output_funcs.pS_O_Shutdown = SNDDMA_Shutdown;
+	plugin_info_snd_output_funcs.pS_O_Shutdown = SNDDMA_shutdown;
 	plugin_info_snd_output_funcs.pS_O_GetDMAPos = SNDDMA_GetDMAPos;
 	plugin_info_snd_output_funcs.pS_O_Submit = SNDDMA_Submit;
 	plugin_info_snd_output_funcs.pS_O_BlockSound = SNDDMA_BlockSound;
diff --git a/libs/audio/targets/snd_sgi.c b/libs/audio/targets/snd_sgi.c
index 4b431dbaf..27ae12d64 100644
--- a/libs/audio/targets/snd_sgi.c
+++ b/libs/audio/targets/snd_sgi.c
@@ -269,7 +269,7 @@ SNDDMA_GetDMAPos (void)
 }
 
 static void
-SNDDMA_Shutdown (void)
+SNDDMA_shutdown (void)
 {
 	if (snd_inited) {
 		free (write_buffer);
@@ -357,7 +357,7 @@ PLUGIN_INFO(snd_output, sgi)
 	plugin_info_general_funcs.p_Init = SNDDMA_Init_Cvars;
 	plugin_info_general_funcs.p_Shutdown = NULL;
 	plugin_info_snd_output_funcs.pS_O_Init = SNDDMA_Init;
-	plugin_info_snd_output_funcs.pS_O_Shutdown = SNDDMA_Shutdown;
+	plugin_info_snd_output_funcs.pS_O_Shutdown = SNDDMA_shutdown;
 	plugin_info_snd_output_funcs.pS_O_GetDMAPos = SNDDMA_GetDMAPos;
 	plugin_info_snd_output_funcs.pS_O_Submit = SNDDMA_Submit;
 	plugin_info_snd_output_funcs.pS_O_BlockSound = SNDDMA_BlockSound;
diff --git a/libs/audio/targets/snd_sun.c b/libs/audio/targets/snd_sun.c
index 89c649416..702757a34 100644
--- a/libs/audio/targets/snd_sun.c
+++ b/libs/audio/targets/snd_sun.c
@@ -189,7 +189,7 @@ SNDDMA_GetSamples (void)
 }
 #endif
 static void
-SNDDMA_Shutdown (void)
+SNDDMA_shutdown (void)
 {
 	if (snd_inited) {
 		close (audio_fd);
@@ -281,7 +281,7 @@ PLUGIN_INFO(snd_output, sun)
 	plugin_info_general_funcs.p_Shutdown = NULL;
 
 	plugin_info_sound_funcs.pS_O_Init = SNDDMA_Init;
-	plugin_info_sound_funcs.pS_O_Shutdown = SNDDMA_Shutdown;
+	plugin_info_sound_funcs.pS_O_Shutdown = SNDDMA_shutdown;
 	plugin_info_sound_funcs.pS_O_GetDMAPos = SNDDMA_GetDMAPos;
 	plugin_info_sound_funcs.pS_O_Submit = SNDDMA_Submit;
 	plugin_info_sound_funcs.pS_O_BlockSound = SNDDMA_BlockSound;
diff --git a/libs/audio/targets/snd_win.c b/libs/audio/targets/snd_win.c
index 91d4ce298..84465516c 100644
--- a/libs/audio/targets/snd_win.c
+++ b/libs/audio/targets/snd_win.c
@@ -344,13 +344,8 @@ SNDDMA_Submit (void)
 	}
 }
 
-/*
-	SNDDMA_Shutdown
-
-	Reset the sound device for exiting
-*/
 static void
-SNDDMA_Shutdown (void)
+SNDDMA_shutdown (void)
 {
 	FreeSound ();
 }
@@ -379,7 +374,7 @@ PLUGIN_INFO(snd_output, win)
 	plugin_info_general_funcs.p_Init = SNDDMA_Init_Cvars;
 	plugin_info_general_funcs.p_Shutdown = NULL;
 	plugin_info_snd_output_funcs.pS_O_Init = SNDDMA_Init;
-	plugin_info_snd_output_funcs.pS_O_Shutdown = SNDDMA_Shutdown;
+	plugin_info_snd_output_funcs.pS_O_Shutdown = SNDDMA_shutdown;
 	plugin_info_snd_output_funcs.pS_O_GetDMAPos = SNDDMA_GetDMAPos;
 	plugin_info_snd_output_funcs.pS_O_Submit = SNDDMA_Submit;
 	plugin_info_snd_output_funcs.pS_O_BlockSound = SNDDMA_BlockSound;
diff --git a/libs/console/client.c b/libs/console/client.c
index ad31462a0..582113703 100644
--- a/libs/console/client.c
+++ b/libs/console/client.c
@@ -931,13 +931,13 @@ C_Init (void)
 }
 
 static void
-C_Shutdown (void)
+C_shutdown (void)
 {
 }
 
 static general_funcs_t plugin_info_general_funcs = {
 	C_Init,
-	C_Shutdown,
+	C_shutdown,
 };
 
 static console_funcs_t plugin_info_console_funcs = {
diff --git a/libs/console/console.c b/libs/console/console.c
index fbfdbd608..4801c0fdb 100644
--- a/libs/console/console.c
+++ b/libs/console/console.c
@@ -84,9 +84,20 @@ Con_Interp_f (cvar_t *var)
 	}
 }
 
+static void
+Con_shutdown (void)
+{
+	if (con_module) {
+		con_module->functions->general->p_Shutdown ();
+		PI_UnloadPlugin (con_module);
+	}
+}
+
 VISIBLE void
 Con_Init (const char *plugin_name)
 {
+	Sys_RegisterShutdown (Con_shutdown);
+
 	con_module = PI_LoadPlugin ("console", plugin_name);
 	if (con_module) {
 		con_module->functions->general->p_Init ();
@@ -123,15 +134,6 @@ Con_ExecLine (const char *line)
 		Sys_Printf ("%s\n", line);
 }
 
-VISIBLE void
-Con_Shutdown (void)
-{
-	if (con_module) {
-		con_module->functions->general->p_Shutdown ();
-		PI_UnloadPlugin (con_module);
-	}
-}
-
 VISIBLE void
 Con_Printf (const char *fmt, ...)
 {
diff --git a/libs/console/server.c b/libs/console/server.c
index 83cce7f3d..5edd2a669 100644
--- a/libs/console/server.c
+++ b/libs/console/server.c
@@ -696,7 +696,7 @@ C_Init (void)
 }
 
 static void
-C_Shutdown (void)
+C_shutdown (void)
 {
 	if (log_file) {
 		Qclose (log_file);
@@ -780,7 +780,7 @@ C_NewMap (void)
 
 static general_funcs_t plugin_info_general_funcs = {
 	C_Init,
-	C_Shutdown,
+	C_shutdown,
 };
 static general_data_t plugin_info_general_data;
 
diff --git a/libs/net/nc/net_udp.c b/libs/net/nc/net_udp.c
index 051785c5e..e349d5cd6 100644
--- a/libs/net/nc/net_udp.c
+++ b/libs/net/nc/net_udp.c
@@ -403,6 +403,17 @@ NET_GetLocalAddress (void)
 	Sys_Printf ("IP address %s\n", NET_AdrToString (net_local_adr));
 }
 
+static void
+NET_shutdown (void)
+{
+#ifdef _WIN32
+	closesocket (net_socket);
+	WSACleanup ();
+#else
+	close (net_socket);
+#endif
+}
+
 void
 NET_Init (int port)
 {
@@ -416,6 +427,7 @@ NET_Init (int port)
 	if (r)
 		Sys_Error ("Winsock initialization failed.");
 #endif /* _WIN32 */
+	Sys_RegisterShutdown (NET_shutdown);
 
 	net_socket = UDP_OpenSocket (port);
 
@@ -431,14 +443,3 @@ NET_Init (int port)
 
 	Sys_Printf ("UDP (IPv4) Initialized\n");
 }
-
-void
-NET_Shutdown (void)
-{
-#ifdef _WIN32
-	closesocket (net_socket);
-	WSACleanup ();
-#else
-	close (net_socket);
-#endif
-}
diff --git a/libs/net/nc/net_udp6.c b/libs/net/nc/net_udp6.c
index bad834082..c04092a83 100644
--- a/libs/net/nc/net_udp6.c
+++ b/libs/net/nc/net_udp6.c
@@ -600,8 +600,8 @@ NET_Init (int port)
 	Sys_Printf ("UDP (IPv6) Initialized\n");
 }
 
-void
-NET_Shutdown (void)
+static void
+NET_shutdown (void)
 {
 #ifdef _WIN32
 	closesocket (net_socket);
diff --git a/libs/net/net_main.c b/libs/net/net_main.c
index 7c235f4a9..051598003 100644
--- a/libs/net/net_main.c
+++ b/libs/net/net_main.c
@@ -718,6 +718,33 @@ NET_SendToAll (sizebuf_t *data, double blocktime)
 
 //=============================================================================
 
+static void
+NET_shutdown (void)
+{
+	qsocket_t  *sock;
+
+	SetNetTime ();
+
+	for (sock = net_activeSockets; sock; sock = sock->next)
+		NET_Close (sock);
+
+//
+// shutdown the drivers
+//
+	for (net_driverlevel = 0; net_driverlevel < net_numdrivers;
+		 net_driverlevel++) {
+		if (net_drivers[net_driverlevel].initialized == true) {
+			net_drivers[net_driverlevel].Shutdown ();
+			net_drivers[net_driverlevel].initialized = false;
+		}
+	}
+
+	if (vcrFile) {
+		Sys_Printf ("Closing vcrfile.\n");
+		Qclose (vcrFile);
+	}
+}
+
 void
 NET_Init (void)
 {
@@ -725,6 +752,8 @@ NET_Init (void)
 	int         controlSocket;
 	qsocket_t  *s;
 
+	Sys_RegisterShutdown (NET_shutdown);
+
 	if (COM_CheckParm ("-playback")) {
 		net_numdrivers = 1;
 		net_drivers[0].Init = VCR_Init;
@@ -790,33 +819,6 @@ NET_Init (void)
 		Sys_MaskPrintf (SYS_NET, "TCP/IP address %s\n", my_tcpip_address);
 }
 
-void
-NET_Shutdown (void)
-{
-	qsocket_t  *sock;
-
-	SetNetTime ();
-
-	for (sock = net_activeSockets; sock; sock = sock->next)
-		NET_Close (sock);
-
-//
-// shutdown the drivers
-//
-	for (net_driverlevel = 0; net_driverlevel < net_numdrivers;
-		 net_driverlevel++) {
-		if (net_drivers[net_driverlevel].initialized == true) {
-			net_drivers[net_driverlevel].Shutdown ();
-			net_drivers[net_driverlevel].initialized = false;
-		}
-	}
-
-	if (vcrFile) {
-		Sys_Printf ("Closing vcrfile.\n");
-		Qclose (vcrFile);
-	}
-}
-
 
 static PollProcedure *pollProcedureList = NULL;
 
diff --git a/libs/video/targets/context_sdl.c b/libs/video/targets/context_sdl.c
index 7426ea8f8..7a764553a 100644
--- a/libs/video/targets/context_sdl.c
+++ b/libs/video/targets/context_sdl.c
@@ -53,12 +53,6 @@ VID_SetGamma (double gamma)
 	return SDL_SetGamma((float) gamma, (float) gamma, (float) gamma);
 }
 
-void
-VID_Shutdown (void)
-{
-	SDL_Quit ();
-}
-
 static void
 VID_UpdateFullscreen (cvar_t *vid_fullscreen)
 {
diff --git a/libs/video/targets/in_common.c b/libs/video/targets/in_common.c
index d5bdf8bda..4b37f23d1 100644
--- a/libs/video/targets/in_common.c
+++ b/libs/video/targets/in_common.c
@@ -128,8 +128,8 @@ IN_Move (void)
 }
 
 /* Called at shutdown */
-void
-IN_Shutdown (void)
+static void
+IN_shutdown (void)
 {
 	JOY_Shutdown ();
 
@@ -142,6 +142,8 @@ IN_Shutdown (void)
 void
 IN_Init (cbuf_t *cbuf)
 {
+	Sys_RegisterShutdown (IN_shutdown);
+
 	IE_Init ();
 	IN_LL_Init ();
 	Key_Init (cbuf);
diff --git a/libs/video/targets/vid_3dfxsvga.c b/libs/video/targets/vid_3dfxsvga.c
index e7df1f342..68078703f 100644
--- a/libs/video/targets/vid_3dfxsvga.c
+++ b/libs/video/targets/vid_3dfxsvga.c
@@ -150,8 +150,8 @@ QFGL_LoadLibrary (void)
 #endif  // HAVE_DLOPEN
 
 
-void
-VID_Shutdown (void)
+static void
+VID_shutdown (void)
 {
 	if (!fc)
 		return;
@@ -271,6 +271,8 @@ VID_Init (byte *palette, byte *colormap)
 {
 	GLint       attribs[32];
 
+	Sys_RegisterShutdown (VID_shutdown);
+
 	GLF_Init ();
 
 	qf_fxMesaCreateContext = QFGL_ProcAddress (libgl_handle,
diff --git a/libs/video/targets/vid_fbdev.c b/libs/video/targets/vid_fbdev.c
index 5cd81cc47..84e3db80a 100644
--- a/libs/video/targets/vid_fbdev.c
+++ b/libs/video/targets/vid_fbdev.c
@@ -209,8 +209,8 @@ static unsigned long fb_map_length = 0;
 
 static struct fb_var_screeninfo orig_var;
 
-void
-VID_Shutdown (void)
+static void
+VID_shutdown (void)
 {
 	Sys_MaskPrintf (SYS_VID, "VID_Shutdown\n");
 
@@ -406,6 +406,8 @@ VID_Init (byte *palette, byte *colormap)
 	if (fbdev_inited)
 		return;
 
+	Sys_RegisterShutdown (VID_shutdown);
+
 	R_LoadModule (0, VID_SetPalette);
 
 	if (COM_CheckParm ("-novideo")) {
diff --git a/libs/video/targets/vid_sdl.c b/libs/video/targets/vid_sdl.c
index 9b1938d30..80f005328 100644
--- a/libs/video/targets/vid_sdl.c
+++ b/libs/video/targets/vid_sdl.c
@@ -64,9 +64,17 @@ static vid_internal_t vid_internal;
 
 uint32_t    sdl_flags;
 
+static void
+VID_shutdown (void)
+{
+	SDL_Quit ();
+}
+
 void
 VID_Init (byte *palette, byte *colormap)
 {
+	Sys_RegisterShutdown (VID_shutdown);
+
 	vid_internal.gl_context = SDL_GL_Context;
 	vid_internal.sw_context = SDL_SW_Context;
 	// Load the SDL library
diff --git a/libs/video/targets/vid_svgalib.c b/libs/video/targets/vid_svgalib.c
index 8849a4eb5..91e0414b8 100644
--- a/libs/video/targets/vid_svgalib.c
+++ b/libs/video/targets/vid_svgalib.c
@@ -239,8 +239,8 @@ get_mode (int width, int height, int depth)
 	return i;
 }
 
-void
-VID_Shutdown (void)
+static void
+VID_shutdown (void)
 {
 	Sys_MaskPrintf (SYS_VID, "VID_Shutdown\n");
 
@@ -358,6 +358,8 @@ VID_Init (byte *palette, byte *colormap)
 	if (svgalib_inited)
 		return;
 
+	Sys_RegisterShutdown (VID_shutdown);
+
 	err = vga_init ();
 	if (err)
 		Sys_Error ("SVGALib failed to allocate a new VC");
diff --git a/libs/video/targets/vid_wgl.c b/libs/video/targets/vid_wgl.c
index bec07fe19..a9054510b 100644
--- a/libs/video/targets/vid_wgl.c
+++ b/libs/video/targets/vid_wgl.c
@@ -372,8 +372,8 @@ GL_EndRendering (void)
 	}
 }
 
-void
-VID_Shutdown (void)
+static void
+VID_shutdown (void)
 {
 	HGLRC		hRC;
 	HDC			hDC;
@@ -454,6 +454,8 @@ VID_Init (byte *palette, byte *colormap)
 	DWORD		lasterror;
 	WNDCLASS	wc;
 
+	Sys_RegisterShutdown (VID_shutdown);
+
 	vid_fullscreen = Cvar_Get ("vid_fullscreen", "0", CVAR_ROM | CVAR_ARCHIVE,
 							   NULL, "Run WGL client at fullscreen");
 	GLF_Init ();
diff --git a/libs/video/targets/vid_x11.c b/libs/video/targets/vid_x11.c
index 946824547..18f56c305 100644
--- a/libs/video/targets/vid_x11.c
+++ b/libs/video/targets/vid_x11.c
@@ -83,6 +83,13 @@ D_EndDirectRect (int x, int y, int width, int height)
 // direct drawing of the "accessing disk" icon isn't supported
 }
 
+static void
+VID_shutdown (void)
+{
+	Sys_MaskPrintf (SYS_VID, "VID_shutdown\n");
+	X11_CloseDisplay ();
+}
+
 /*
 	Set up color translation tables and the window.  Takes a 256-color 8-bit
 	palette.  Palette data will go away after the call, so copy it if you'll
@@ -91,6 +98,8 @@ D_EndDirectRect (int x, int y, int width, int height)
 void
 VID_Init (byte *palette, byte *colormap)
 {
+	Sys_RegisterShutdown (VID_shutdown);
+
 	vid_internal.gl_context = X11_GL_Context;
 	vid_internal.sw_context = X11_SW_Context;
 #ifdef HAVE_VULKAN
@@ -133,18 +142,6 @@ VID_Init_Cvars ()
 	X11_GL_Init_Cvars ();
 }
 
-/*
-	VID_Shutdown
-
-	Restore video mode
-*/
-void
-VID_Shutdown (void)
-{
-	Sys_MaskPrintf (SYS_VID, "VID_Shutdown\n");
-	X11_CloseDisplay ();
-}
-
 #if 0
 static int  config_notify = 0;
 static int  config_notify_width;
diff --git a/nq/include/client.h b/nq/include/client.h
index 54477f7b4..817bebaf6 100644
--- a/nq/include/client.h
+++ b/nq/include/client.h
@@ -286,7 +286,6 @@ extern void (*write_angles) (sizebuf_t *sb, const vec3_t angles);
 struct cbuf_s;
 void CL_Init (struct cbuf_s *cbuf);
 void CL_InitCvars (void);
-void CL_Shutdown (void);
 void CL_ClearMemory (void);
 
 void CL_EstablishConnection (const char *host);
diff --git a/nq/source/cl_main.c b/nq/source/cl_main.c
index 3f8e7bde6..672269c9f 100644
--- a/nq/source/cl_main.c
+++ b/nq/source/cl_main.c
@@ -120,14 +120,10 @@ CL_WriteConfiguration (void)
 	}
 }
 
-void
+static void
 CL_Shutdown (void)
 {
 	CL_WriteConfiguration ();
-	CDAudio_Shutdown ();
-	S_Shutdown ();
-	IN_Shutdown ();
-	VID_Shutdown ();
 }
 
 void
@@ -537,6 +533,8 @@ CL_Init (cbuf_t *cbuf)
 {
 	byte       *basepal, *colormap;
 
+	Sys_RegisterShutdown (CL_Shutdown);
+
 	basepal = (byte *) QFS_LoadHunkFile (QFS_FOpenFile ("gfx/palette.lmp"));
 	if (!basepal)
 		Sys_Error ("Couldn't load gfx/palette.lmp");
diff --git a/nq/source/host.c b/nq/source/host.c
index d15dd0431..0d85b9a1a 100644
--- a/nq/source/host.c
+++ b/nq/source/host.c
@@ -968,11 +968,4 @@ Host_Shutdown (void)
 		return;
 	}
 	isdown = true;
-
-
-	NET_Shutdown ();
-	if (cls.state != ca_dedicated) {
-		CL_Shutdown ();
-	}
-	Con_Shutdown ();
 }
diff --git a/nq/source/sv_ded.c b/nq/source/sv_ded.c
index 44dd57408..7db231bd2 100644
--- a/nq/source/sv_ded.c
+++ b/nq/source/sv_ded.c
@@ -98,11 +98,6 @@ CL_EstablishConnection (const char *host)
 {
 }
 
-void
-CL_Shutdown ()
-{
-}
-
 void
 CL_Init (struct cbuf_s *cbuf)
 {
diff --git a/qtv/source/qtv.c b/qtv/source/qtv.c
index 4980dea9b..2f9f826ad 100644
--- a/qtv/source/qtv.c
+++ b/qtv/source/qtv.c
@@ -222,8 +222,6 @@ qtv_memory_init (void)
 static void
 qtv_shutdown (void)
 {
-	NET_Shutdown ();
-	Con_Shutdown ();
 	Cbuf_Delete (qtv_cbuf);
 	Cbuf_ArgsDelete (qtv_args);
 }
diff --git a/qw/source/cl_main.c b/qw/source/cl_main.c
index c2b3c3a35..3cb0e1432 100644
--- a/qw/source/cl_main.c
+++ b/qw/source/cl_main.c
@@ -1882,10 +1882,5 @@ Host_Shutdown (void)
 
 	Host_WriteConfiguration ();
 
-	CDAudio_Shutdown ();
 	CL_HTTP_Shutdown ();
-	NET_Shutdown ();
-	S_Shutdown ();
-	IN_Shutdown ();
-	VID_Shutdown ();
 }
diff --git a/qw/source/sv_main.c b/qw/source/sv_main.c
index c69e23594..a121ba5ce 100644
--- a/qw/source/sv_main.c
+++ b/qw/source/sv_main.c
@@ -246,9 +246,6 @@ SV_Shutdown (void)
 	}
 	if (sv.recording_demo)
 		SV_Stop (0);
-
-	NET_Shutdown ();
-	Con_Shutdown ();
 }
 
 /*
diff --git a/tools/qwaq/qwaq-bi.c b/tools/qwaq/qwaq-bi.c
index 7e21a9259..cad5108f3 100644
--- a/tools/qwaq/qwaq-bi.c
+++ b/tools/qwaq/qwaq-bi.c
@@ -161,9 +161,6 @@ static builtin_t builtins[] = {
 static void
 bi_shutdown (void)
 {
-	S_Shutdown ();
-	IN_Shutdown ();
-	VID_Shutdown ();
 }
 
 void

From 1eafc330527ae738dd2e088ca4837cded151c067 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 13 Jul 2019 00:36:21 +0900
Subject: [PATCH 0306/1519] Ensure vulkan gets shut down

---
 include/QF/Vulkan/device.h                     |  5 +++--
 include/QF/Vulkan/funclist.h                   |  6 ++++++
 include/QF/Vulkan/swapchain.h                  |  1 +
 libs/video/renderer/r_init.c                   |  9 +++++++++
 libs/video/renderer/vulkan/device.c            | 17 ++++++++---------
 libs/video/renderer/vulkan/swapchain.c         |  8 ++++++++
 libs/video/renderer/vulkan/vulkan_vid_common.c |  2 ++
 7 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/include/QF/Vulkan/device.h b/include/QF/Vulkan/device.h
index ae0c26ffc..8dc4df371 100644
--- a/include/QF/Vulkan/device.h
+++ b/include/QF/Vulkan/device.h
@@ -20,7 +20,8 @@ typedef struct qfv_device_s {
 } qfv_device_t;
 
 struct vulkan_ctx_s;
-qfv_device_t *QFV_CreateDevice(struct vulkan_ctx_s *ctx,
-							   const char **extensions);
+qfv_device_t *QFV_CreateDevice (struct vulkan_ctx_s *ctx,
+								const char **extensions);
+void QFV_DestroyDevice (qfv_device_t *device);
 
 #endif//__QF_Vulkan_swapchain_h
diff --git a/include/QF/Vulkan/funclist.h b/include/QF/Vulkan/funclist.h
index 1419aebd4..43bad39c7 100644
--- a/include/QF/Vulkan/funclist.h
+++ b/include/QF/Vulkan/funclist.h
@@ -48,6 +48,8 @@ INSTANCE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION
 	(vkGetPhysicalDeviceSurfaceCapabilitiesKHR, VK_KHR_SURFACE_EXTENSION_NAME)
 INSTANCE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION
 	(vkGetPhysicalDeviceSurfaceFormatsKHR, VK_KHR_SURFACE_EXTENSION_NAME)
+INSTANCE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION
+	(vkDestroySurfaceKHR, VK_KHR_SURFACE_EXTENSION_NAME)
 
 #undef INSTANCE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION
 
@@ -99,5 +101,9 @@ DEVICE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION
 	(vkDestroySwapchainKHR, VK_KHR_SWAPCHAIN_EXTENSION_NAME)
 DEVICE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION
 	(vkGetSwapchainImagesKHR, VK_KHR_SWAPCHAIN_EXTENSION_NAME)
+DEVICE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION
+	(vkAcquireNextImageKHR, VK_KHR_SWAPCHAIN_EXTENSION_NAME)
+DEVICE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION
+	(vkQueuePresentKHR, VK_KHR_SWAPCHAIN_EXTENSION_NAME)
 
 #undef DEVICE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION
diff --git a/include/QF/Vulkan/swapchain.h b/include/QF/Vulkan/swapchain.h
index 71d0b6d75..91d158c89 100644
--- a/include/QF/Vulkan/swapchain.h
+++ b/include/QF/Vulkan/swapchain.h
@@ -13,5 +13,6 @@ typedef struct qfv_swapchain_s {
 struct vulkan_ctx_s;
 qfv_swapchain_t *QFV_CreateSwapchain (struct vulkan_ctx_s *ctx,
 									  VkSwapchainKHR old_swapchain);
+void QFV_DestroySwapchain (qfv_swapchain_t *swapchain);
 
 #endif//__QF_Vulkan_swapchain_h
diff --git a/libs/video/renderer/r_init.c b/libs/video/renderer/r_init.c
index 330d0d76d..df2392a6b 100644
--- a/libs/video/renderer/r_init.c
+++ b/libs/video/renderer/r_init.c
@@ -63,6 +63,14 @@ vid_render_funcs_t *r_funcs;
 static U void (*const r_progs_init)(struct progs_s *) = R_Progs_Init;
 #undef U
 
+static void
+R_shutdown (void)
+{
+	if (vidrendmodule->functions->general->p_Shutdown) {
+		vidrendmodule->functions->general->p_Shutdown ();
+	}
+}
+
 VISIBLE void
 R_LoadModule (vid_internal_t *vid_internal)
 {
@@ -80,6 +88,7 @@ R_LoadModule (vid_internal_t *vid_internal)
 	r_data->vid->vid_internal = vid_internal;
 
 	vidrendmodule->functions->general->p_Init ();
+	Sys_RegisterShutdown (R_shutdown);
 }
 
 VISIBLE void
diff --git a/libs/video/renderer/vulkan/device.c b/libs/video/renderer/vulkan/device.c
index 36b81b025..736b5e915 100644
--- a/libs/video/renderer/vulkan/device.c
+++ b/libs/video/renderer/vulkan/device.c
@@ -133,9 +133,6 @@ QFV_CreateDevice (vulkan_ctx_t *ctx, const char **extensions)
 {
 	uint32_t nlay = 1;	// ensure alloca doesn't see 0 and terminated
 	uint32_t next = count_strings (extensions) + 1; // ensure terminated
-	//if (vulkan_use_validation->int_val) {
-	//	nlay += count_strings (vulkanValidationLayers);
-	//}
 	const char **lay = alloca (nlay * sizeof (const char *));
 	const char **ext = alloca (next * sizeof (const char *));
 	// ensure there are null pointers so merge_strings can act as append
@@ -144,9 +141,6 @@ QFV_CreateDevice (vulkan_ctx_t *ctx, const char **extensions)
 	memset (lay, 0, nlay-- * sizeof (const char *));
 	memset (ext, 0, next-- * sizeof (const char *));
 	merge_strings (ext, extensions, 0);
-	//if (vulkan_use_validation->int_val) {
-	//	merge_strings (lay, lay, vulkanValidationLayers);
-	//}
 
 	qfv_instance_t *inst = ctx->instance;
 	VkInstance  instance = inst->instance;
@@ -160,9 +154,6 @@ QFV_CreateDevice (vulkan_ctx_t *ctx, const char **extensions)
 	for (uint32_t i = 0; i < numDevices; i++) {
 		VkPhysicalDevice physdev = devices[i];
 		/*
-		if (!Vulkan_LayersSupported (phys->layers, phys->numLayers, lay)) {
-			continue;
-		}
 		if (!Vulkan_ExtensionsSupported (phys->extensions, phys->numExtensions,
 										 ext)) {
 			continue;
@@ -209,3 +200,11 @@ QFV_CreateDevice (vulkan_ctx_t *ctx, const char **extensions)
 	}
 	return 0;
 }
+
+void
+QFV_DestroyDevice (qfv_device_t *device)
+{
+	device->funcs->vkDestroyDevice (device->dev, 0);
+	del_strset (device->enabled_extensions);
+	free (device);
+}
diff --git a/libs/video/renderer/vulkan/swapchain.c b/libs/video/renderer/vulkan/swapchain.c
index 91f8280c9..2707676d6 100644
--- a/libs/video/renderer/vulkan/swapchain.c
+++ b/libs/video/renderer/vulkan/swapchain.c
@@ -146,3 +146,11 @@ QFV_CreateSwapchain (vulkan_ctx_t *ctx, VkSwapchainKHR old_swapchain)
 									 sc->images);
 	return sc;
 }
+
+void
+QFV_DestroySwapchain (qfv_swapchain_t *swapchain)
+{
+	swapchain->funcs->vkDestroySwapchainKHR (swapchain->dev,
+											 swapchain->swapchain, 0);
+	free (swapchain);
+}
diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c
index 70890ab7a..ed5369c9c 100644
--- a/libs/video/renderer/vulkan/vulkan_vid_common.c
+++ b/libs/video/renderer/vulkan/vulkan_vid_common.c
@@ -116,6 +116,8 @@ Vulkan_Init_Common (vulkan_ctx_t *ctx)
 void
 Vulkan_Shutdown_Common (vulkan_ctx_t *ctx)
 {
+	Sys_Printf ("are we here?\n");
+	QFV_DestroyDevice (ctx->device);
 	QFV_DestroyInstance (ctx->instance);
 	ctx->instance = 0;
 	ctx->unload_vulkan (ctx);

From b4dc746a66886319e1a2a607fd53ee2ba6e12cc8 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 13 Jul 2019 01:11:34 +0900
Subject: [PATCH 0307/1519] Clean up the debug callback

---
 include/QF/Vulkan/funclist.h          |  2 ++
 include/QF/Vulkan/instance.h          |  1 +
 libs/video/renderer/vulkan/instance.c | 12 +++++++++---
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/include/QF/Vulkan/funclist.h b/include/QF/Vulkan/funclist.h
index 43bad39c7..5fe467937 100644
--- a/include/QF/Vulkan/funclist.h
+++ b/include/QF/Vulkan/funclist.h
@@ -40,6 +40,8 @@ INSTANCE_LEVEL_VULKAN_FUNCTION (vkGetPhysicalDeviceMemoryProperties)
 
 INSTANCE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION
 	(vkCreateDebugUtilsMessengerEXT, VK_EXT_DEBUG_UTILS_EXTENSION_NAME)
+INSTANCE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION
+	(vkDestroyDebugUtilsMessengerEXT, VK_EXT_DEBUG_UTILS_EXTENSION_NAME)
 INSTANCE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION
 	(vkGetPhysicalDeviceSurfaceSupportKHR, VK_KHR_SURFACE_EXTENSION_NAME)
 INSTANCE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION
diff --git a/include/QF/Vulkan/instance.h b/include/QF/Vulkan/instance.h
index 1cc05d6cf..0a677c945 100644
--- a/include/QF/Vulkan/instance.h
+++ b/include/QF/Vulkan/instance.h
@@ -42,6 +42,7 @@ typedef struct qfv_instance_s {
 	struct strset_s *enabled_extensions;
 	int         (*extension_enabled) (struct qfv_instance_s *inst,
 									  const char *ext);
+	VkDebugUtilsMessengerEXT debug_handle;
 } qfv_instance_t;
 
 struct vulkan_ctx_s;
diff --git a/libs/video/renderer/vulkan/instance.c b/libs/video/renderer/vulkan/instance.c
index 74b0ea756..25ccdb306 100644
--- a/libs/video/renderer/vulkan/instance.c
+++ b/libs/video/renderer/vulkan/instance.c
@@ -150,7 +150,7 @@ debug_callback (VkDebugUtilsMessageSeverityFlagBitsEXT messageSeverity,
 static void
 setup_debug_callback (qfv_instance_t *instance)
 {
-	VkDebugUtilsMessengerEXT debug_callback_handle;
+	VkDebugUtilsMessengerEXT debug_handle;
 	VkDebugUtilsMessengerCreateInfoEXT createInfo = {
 		.sType = VK_STRUCTURE_TYPE_DEBUG_UTILS_MESSENGER_CREATE_INFO_EXT,
 		.messageSeverity = message_severities,
@@ -160,7 +160,8 @@ setup_debug_callback (qfv_instance_t *instance)
 	};
 	instance->funcs->vkCreateDebugUtilsMessengerEXT(instance->instance,
 													&createInfo, 0,
-													&debug_callback_handle);
+													&debug_handle);
+	instance->debug_handle = debug_handle;
 }
 
 static void
@@ -242,7 +243,7 @@ QFV_CreateInstance (vulkan_ctx_t *ctx,
 	if (res != VK_SUCCESS) {
 		Sys_Error ("unable to create vulkan instance\n");
 	}
-	qfv_instance_t *inst = malloc (sizeof(qfv_instance_t)
+	qfv_instance_t *inst = calloc (1, sizeof(qfv_instance_t)
 								   + sizeof (qfv_instfuncs_t));
 	inst->instance = instance;
 	inst->funcs = (qfv_instfuncs_t *)(inst + 1);
@@ -261,6 +262,11 @@ QFV_CreateInstance (vulkan_ctx_t *ctx,
 void
 QFV_DestroyInstance (qfv_instance_t *instance)
 {
+	qfv_instfuncs_t *ifunc = instance->funcs;
+	if (instance->debug_handle) {
+		ifunc->vkDestroyDebugUtilsMessengerEXT (instance->instance,
+												instance->debug_handle, 0);
+	}
 	instance->funcs->vkDestroyInstance (instance->instance, 0);
 	free (instance);
 }

From dd1c2db2496ad55eb7cbc9fe1251ec4dff8c3e4f Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 13 Jul 2019 01:14:21 +0900
Subject: [PATCH 0308/1519] Clean up the swapchain

And be a little safer about it
---
 libs/video/renderer/vulkan/vulkan_vid_common.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c
index ed5369c9c..6d8c32505 100644
--- a/libs/video/renderer/vulkan/vulkan_vid_common.c
+++ b/libs/video/renderer/vulkan/vulkan_vid_common.c
@@ -116,9 +116,15 @@ Vulkan_Init_Common (vulkan_ctx_t *ctx)
 void
 Vulkan_Shutdown_Common (vulkan_ctx_t *ctx)
 {
-	Sys_Printf ("are we here?\n");
-	QFV_DestroyDevice (ctx->device);
-	QFV_DestroyInstance (ctx->instance);
+	if (ctx->swapchain) {
+		QFV_DestroySwapchain (ctx->swapchain);
+	}
+	if (ctx->device) {
+		QFV_DestroyDevice (ctx->device);
+	}
+	if (ctx->instance) {
+		QFV_DestroyInstance (ctx->instance);
+	}
 	ctx->instance = 0;
 	ctx->unload_vulkan (ctx);
 }

From 1f24a1408acdcc48be2010cc38d5e936fb2ee0b7 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 13 Jul 2019 01:20:02 +0900
Subject: [PATCH 0309/1519] Destroy the surface

---
 libs/video/renderer/vulkan/vulkan_vid_common.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c
index 6d8c32505..37fe9c564 100644
--- a/libs/video/renderer/vulkan/vulkan_vid_common.c
+++ b/libs/video/renderer/vulkan/vulkan_vid_common.c
@@ -119,6 +119,8 @@ Vulkan_Shutdown_Common (vulkan_ctx_t *ctx)
 	if (ctx->swapchain) {
 		QFV_DestroySwapchain (ctx->swapchain);
 	}
+	ctx->instance->funcs->vkDestroySurfaceKHR (ctx->instance->instance,
+											   ctx->surface, 0);
 	if (ctx->device) {
 		QFV_DestroyDevice (ctx->device);
 	}

From e16400205027956978fec72c895264b93251d41d Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 23 Jul 2019 08:52:15 +0900
Subject: [PATCH 0310/1519] Make QuatToMat faster and more accurate

The better accuracy is for specific cases (90 degree rotations around a
main axis: the matrix element for that axis is now 1 instead of
0.99999994). The speedup comes from doing fewer additions (multiply
seems to be faster than add for fp, at least in this situation).
---
 libs/util/mathlib.c        | 34 ++++++++++----------
 libs/util/test/test-quat.c | 64 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 80 insertions(+), 18 deletions(-)

diff --git a/libs/util/mathlib.c b/libs/util/mathlib.c
index db68455f3..3e6540636 100644
--- a/libs/util/mathlib.c
+++ b/libs/util/mathlib.c
@@ -303,7 +303,7 @@ QuatExp (const quat_t a, quat_t b)
 VISIBLE void
 QuatToMatrix (const quat_t q, vec_t *m, int homogenous, int vertical)
 {
-	vec_t       xx, xy, xz, xw, yy, yz, yw, zz, zw, ww;
+	vec_t       xx, xy, xz, xw, yy, yz, yw, zz, zw;
 	vec_t       *_m[4] = {
 		m + (homogenous ? 0 : 0),
 		m + (homogenous ? 4 : 3),
@@ -311,28 +311,26 @@ QuatToMatrix (const quat_t q, vec_t *m, int homogenous, int vertical)
 		m + (homogenous ? 12 : 9),
 	};
 
-	xx = q[0] * q[0];
-	xy = q[0] * q[1];
-	xz = q[0] * q[2];
-	xw = q[0] * q[3];
+	xx = 2 * q[0] * q[0];
+	xy = 2 * q[0] * q[1];
+	xz = 2 * q[0] * q[2];
+	xw = 2 * q[0] * q[3];
 
-	yy = q[1] * q[1];
-	yz = q[1] * q[2];
-	yw = q[1] * q[3];
+	yy = 2 * q[1] * q[1];
+	yz = 2 * q[1] * q[2];
+	yw = 2 * q[1] * q[3];
 
-	zz = q[2] * q[2];
-	zw = q[2] * q[3];
-
-	ww = q[3] * q[3];
+	zz = 2 * q[2] * q[2];
+	zw = 2 * q[2] * q[3];
 
 	if (vertical) {
-		VectorSet (ww + xx - yy - zz, 2 * (xy + zw), 2 * (xz - yw), _m[0]);
-		VectorSet (2 * (xy - zw), ww - xx + yy - zz, 2 * (yz + xw), _m[1]);
-		VectorSet (2 * (xz + yw), 2 * (yz - xw), ww - xx - yy + zz, _m[2]);
+		VectorSet (1.0f - yy - zz, xy + zw, xz - yw, _m[0]);
+		VectorSet (xy - zw, 1.0f - xx - zz, yz + xw, _m[1]);
+		VectorSet (xz + yw, yz - xw, 1.0f - xx - yy, _m[2]);
 	} else {
-		VectorSet (ww + xx - yy - zz, 2 * (xy - zw), 2 * (xz + yw), _m[0]);
-		VectorSet (2 * (xy + zw), ww - xx + yy - zz, 2 * (yz - xw), _m[1]);
-		VectorSet (2 * (xz - yw), 2 * (yz + xw), ww - xx - yy + zz, _m[2]);
+		VectorSet (1.0f - yy - zz, xy - zw, xz + yw, _m[0]);
+		VectorSet (xy + zw, 1.0f - xx - zz, yz - xw, _m[1]);
+		VectorSet (xz - yw, yz + xw, 1.0f - xx - yy, _m[2]);
 	}
 	if (homogenous) {
 		_m[0][3] = 0;
diff --git a/libs/util/test/test-quat.c b/libs/util/test/test-quat.c
index 47539d144..44c8923b3 100644
--- a/libs/util/test/test-quat.c
+++ b/libs/util/test/test-quat.c
@@ -200,6 +200,62 @@ fail:
 	return 0;
 }
 
+#define s05 0.70710678118654757
+
+static struct {
+	quat_t      q;
+	vec_t       expect[9];
+} quat_mat_tests[] = {
+	{{0, 0, 0, 1},
+		{1, 0, 0,
+		 0, 1, 0,
+		 0, 0, 1}},
+	{{1, 0, 0, 0},
+		{1,  0,  0,
+		 0, -1,  0,
+		 0,  0, -1}},
+	{{0, 1, 0, 0},
+		{-1, 0,  0,
+		  0, 1,  0,
+		  0, 0, -1}},
+	{{0, 0, 1, 0},
+		{-1,  0, 0,
+		  0, -1, 0,
+		  0,  0, 1}},
+	{{0.5, 0.5, 0.5, 0.5},
+		{0, 0, 1,
+		 1, 0, 0,
+		 0, 1, 0}},
+	{{s05, 0.0, 0.0, s05},
+		{1,             0,             0,
+		 0, 5.96046448e-8,   -0.99999994,
+		 0,    0.99999994, 5.96046448e-8}},
+};
+#define num_quat_mat_tests (sizeof (quat_mat_tests) / sizeof (quat_mat_tests[0]))
+
+static int
+test_quat_mat(const quat_t q, const quat_t expect)
+{
+	int         i;
+	vec_t       m[9];
+
+	QuatToMatrix (q, m, 0, 0);
+
+	for (i = 0; i < 9; i++)
+		if (m[i] != expect[i])	// exact tests here
+			goto fail;
+	return 1;
+fail:
+	printf ("%11.9g %11.9g %11.9g %11.9g\n", QuatExpand (q));
+	printf ("%11.9g %11.9g %11.9g   %11.9g %11.9g %11.9g\n",
+			VectorExpand (m + 0), VectorExpand (expect + 0));
+	printf ("%11.9g %11.9g %11.9g   %11.9g %11.9g %11.9g\n",
+			VectorExpand (m + 3), VectorExpand (expect + 3));
+	printf ("%11.9g %11.9g %11.9g   %11.9g %11.9g %11.9g\n",
+			VectorExpand (m + 6), VectorExpand (expect + 6));
+	return 0;
+}
+
 int
 main (int argc, const char **argv)
 {
@@ -228,5 +284,13 @@ main (int argc, const char **argv)
 		if (!test_rotation3 (test_angles[i]))
 			res = 1;
 	}
+
+	for (i = 0; i < num_quat_mat_tests; i ++) {
+		vec_t      *q = quat_mat_tests[i].q;
+		vec_t      *expect = quat_mat_tests[i].expect;
+		if (!test_quat_mat (q, expect))
+			res = 1;
+	}
+
 	return res;
 }

From ae11a70147c05ba5e15ff29c213d49b362bdc039 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 23 Jul 2019 12:27:57 +0900
Subject: [PATCH 0311/1519] Correct a comment

---
 include/QF/Vulkan/device.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/QF/Vulkan/device.h b/include/QF/Vulkan/device.h
index 8dc4df371..0a90ea539 100644
--- a/include/QF/Vulkan/device.h
+++ b/include/QF/Vulkan/device.h
@@ -24,4 +24,4 @@ qfv_device_t *QFV_CreateDevice (struct vulkan_ctx_s *ctx,
 								const char **extensions);
 void QFV_DestroyDevice (qfv_device_t *device);
 
-#endif//__QF_Vulkan_swapchain_h
+#endif//__QF_Vulkan_device_h

From 411b897f09f8d89c19c361cf86ffef044dce5441 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 23 Jul 2019 12:28:57 +0900
Subject: [PATCH 0312/1519] Implement most of the stuff for command submission

---
 include/QF/Vulkan/command.h            |  79 +++++++
 include/QF/Vulkan/funclist.h           |  11 +
 libs/video/renderer/vulkan/Makefile.am |   1 +
 libs/video/renderer/vulkan/command.c   | 316 +++++++++++++++++++++++++
 4 files changed, 407 insertions(+)
 create mode 100644 include/QF/Vulkan/command.h
 create mode 100644 libs/video/renderer/vulkan/command.c

diff --git a/include/QF/Vulkan/command.h b/include/QF/Vulkan/command.h
new file mode 100644
index 000000000..1fe12df6d
--- /dev/null
+++ b/include/QF/Vulkan/command.h
@@ -0,0 +1,79 @@
+#ifndef __QF_Vulkan_command_h
+#define __QF_Vulkan_command_h
+
+typedef struct qfv_cmdpool_s {
+	VkDevice    dev;
+	struct qfv_devfuncs_s *funcs;
+	VkCommandPool cmdpool;
+} qfv_cmdpool_t;
+
+typedef struct qfv_cmdbuffer_s {
+	VkDevice    dev;
+	struct qfv_devfuncs_s *funcs;
+	VkCommandBuffer buffer;
+} qfv_cmdbuffer_t;
+
+typedef struct qfv_cmdbufferset_s {
+	VkDevice    dev;
+	struct qfv_devfuncs_s *funcs;
+	VkCommandBuffer *buffers;
+	int         numBuffers;
+} qfv_cmdbufferset_t;
+
+typedef struct qfv_semaphore_s {
+	VkDevice    dev;
+	struct qfv_devfuncs_s *funcs;
+	VkSemaphore semaphore;
+} qfv_semaphore_t;
+
+typedef struct qfv_semaphoreset_s {
+	VkDevice    dev;
+	struct qfv_devfuncs_s *funcs;
+	VkSemaphore *semaphores;
+	VkPipelineStageFlags *stages;
+	int         numSemaphores;
+} qfv_semaphoreset_t;
+
+typedef struct qfv_fence_s {
+	VkDevice    dev;
+	struct qfv_devfuncs_s *funcs;
+	VkFence     fence;
+} qfv_fence_t;
+
+typedef struct qfv_fenceset_s {
+	VkDevice    dev;
+	struct qfv_devfuncs_s *funcs;
+	VkFence    *fences;
+	int         numFences;
+} qfv_fenceset_t;
+
+struct qfv_device_s;
+qfv_cmdpool_t *QFV_CreateCommandPool (struct qfv_device_s *device,
+									  uint32_t queueFamily,
+									  int transient, int reset);
+int QFV_ResetCommandPool (qfv_cmdpool_t *pool, int release);
+qfv_cmdbuffer_t *QFV_AllocateCommandBuffers (qfv_cmdpool_t *pool,
+											 int secondary, int count);
+qfv_cmdbufferset_t *QFV_CreateCommandBufferSet (qfv_cmdbuffer_t **buffers,
+												int numBuffers);
+int QFV_BeginCommandBuffer (qfv_cmdbuffer_t *buffer, int oneTime,
+							int rpContinue, int simultaneous,
+							VkCommandBufferInheritanceInfo *inheritanceInfo);
+int QFV_EndCommandBuffer (qfv_cmdbuffer_t *buffer);
+int QFV_ResetCommandBuffer (qfv_cmdbuffer_t *buffer, int release);
+
+qfv_semaphore_t *QFV_CreateSemaphore (struct qfv_device_s *device);
+qfv_semaphoreset_t *QFV_CreateSemaphoreSet (qfv_semaphore_t **semaphores,
+											int numSemaphores);
+
+qfv_fence_t *QFV_CreateFence (struct qfv_device_s *device, int signaled);
+qfv_fenceset_t *QFV_CreateFenceSet (qfv_fence_t **fences, int numFences);
+int QFV_WaitForFences (qfv_fenceset_t *fences, int all, uint64_t timeout);
+int QFV_ResetFences (qfv_fenceset_t *fences);
+int QFV_QueueSubmit (struct qfv_device_s *device,
+					 qfv_semaphoreset_t *waitSemaphores,
+					 qfv_cmdbufferset_t *buffers,
+					 qfv_semaphoreset_t *signalSemaphores, qfv_fence_t *fence);
+
+
+#endif//__QF_Vulkan_command_h
diff --git a/include/QF/Vulkan/funclist.h b/include/QF/Vulkan/funclist.h
index 5fe467937..20ccbe275 100644
--- a/include/QF/Vulkan/funclist.h
+++ b/include/QF/Vulkan/funclist.h
@@ -90,6 +90,17 @@ PRESENTATION_VULKAN_FUNCTION_FROM_EXTENSION
 
 DEVICE_LEVEL_VULKAN_FUNCTION (vkDestroyDevice)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkGetDeviceQueue)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkCreateCommandPool)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkResetCommandPool)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkAllocateCommandBuffers)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkBeginCommandBuffer)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkEndCommandBuffer)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkResetCommandBuffer)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkCreateSemaphore)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkCreateFence)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkWaitForFences)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkResetFences)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkQueueSubmit)
 
 #undef DEVICE_LEVEL_VULKAN_FUNCTION
 
diff --git a/libs/video/renderer/vulkan/Makefile.am b/libs/video/renderer/vulkan/Makefile.am
index e59e29551..f754853f2 100644
--- a/libs/video/renderer/vulkan/Makefile.am
+++ b/libs/video/renderer/vulkan/Makefile.am
@@ -4,6 +4,7 @@ AM_CFLAGS= @PREFER_PIC@
 AM_CPPFLAGS= -I$(top_srcdir)/include -DVK_NO_PROTOTYPES
 
 vulkan_src = \
+	command.c \
 	device.c \
 	instance.c \
 	swapchain.c \
diff --git a/libs/video/renderer/vulkan/command.c b/libs/video/renderer/vulkan/command.c
new file mode 100644
index 000000000..13dbde1a6
--- /dev/null
+++ b/libs/video/renderer/vulkan/command.c
@@ -0,0 +1,316 @@
+/*
+	vid_common_vulkan.c
+
+	Common Vulkan video driver functions
+
+	Copyright (C) 1996-1997 Id Software, Inc.
+	Copyright (C) 2019      Bill Currie <bill@taniwha.org>
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifdef HAVE_MATH_H
+# include <math.h>
+#endif
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+
+#include "QF/cvar.h"
+#include "QF/dstring.h"
+#include "QF/input.h"
+#include "QF/mathlib.h"
+#include "QF/qargs.h"
+#include "QF/quakefs.h"
+#include "QF/sys.h"
+#include "QF/va.h"
+#include "QF/vid.h"
+#include "QF/Vulkan/qf_vid.h"
+#include "QF/Vulkan/command.h"
+#include "QF/Vulkan/device.h"
+#include "QF/Vulkan/instance.h"
+
+#include "compat.h"
+#include "d_iface.h"
+#include "r_internal.h"
+#include "vid_vulkan.h"
+
+#include "util.h"
+
+qfv_cmdpool_t *
+QFV_CreateCommandPool (qfv_device_t *device, uint32_t queueFamily,
+					   int transient, int reset)
+{
+	VkDevice    dev = device->dev;
+	qfv_devfuncs_t *dfunc = device->funcs;
+	uint32_t    flags = 0;
+	if (transient) {
+		flags |= VK_COMMAND_POOL_CREATE_TRANSIENT_BIT;
+	}
+	if (reset) {
+		flags |= VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT;
+	}
+	VkCommandPoolCreateInfo createInfo = {
+		VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO, 0,
+		flags,
+		queueFamily
+	};
+	qfv_cmdpool_t *cmdpool = malloc (sizeof (*cmdpool));
+	dfunc->vkCreateCommandPool (dev, &createInfo, 0, &cmdpool->cmdpool);
+	cmdpool->dev = dev;
+	cmdpool->funcs = dfunc;
+	return cmdpool;
+}
+
+int
+QFV_ResetCommandPool (qfv_cmdpool_t *pool, int release)
+{
+	VkDevice    dev = pool->dev;
+	VkCommandPool cmdpool = pool->cmdpool;
+	qfv_devfuncs_t *dfunc = pool->funcs;
+	VkCommandPoolResetFlags release_flag = 0;
+
+	if (release) {
+		release_flag = VK_COMMAND_POOL_RESET_RELEASE_RESOURCES_BIT;
+	}
+
+	return dfunc->vkResetCommandPool (dev, cmdpool, release_flag) == VK_SUCCESS;
+}
+
+qfv_cmdbuffer_t *
+QFV_AllocateCommandBuffers (qfv_cmdpool_t *pool, int secondary, int count)
+{
+	VkDevice    dev = pool->dev;
+	qfv_devfuncs_t *dfunc = pool->funcs;
+	uint32_t    level = VK_COMMAND_BUFFER_LEVEL_PRIMARY;
+	if (secondary) {
+		level = VK_COMMAND_BUFFER_LEVEL_SECONDARY;
+	}
+	VkCommandBufferAllocateInfo allocInfo = {
+		VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, 0,
+		pool->cmdpool, level, count
+	};
+	qfv_cmdbuffer_t *cmdbuffers = malloc (count * sizeof (*cmdbuffers));
+	VkCommandBuffer *buffers = alloca (count * sizeof (*buffers));
+	dfunc->vkAllocateCommandBuffers (dev, &allocInfo, buffers);
+	for (int i = 0; i < count; i++) {
+		cmdbuffers[i].dev = dev;
+		cmdbuffers[i].funcs = dfunc;
+		cmdbuffers[i].buffer = buffers[i];
+	}
+	return cmdbuffers;
+}
+
+qfv_cmdbufferset_t *
+QFV_CreateCommandBufferSet (qfv_cmdbuffer_t **buffers, int numBuffers)
+{
+	VkDevice    dev = buffers[0]->dev;
+	qfv_devfuncs_t *dfunc = buffers[0]->funcs;
+	qfv_cmdbufferset_t *bufferset = malloc (sizeof (*bufferset)
+											+ sizeof (VkCommandBuffer)
+											  * numBuffers);
+
+	bufferset->dev = dev;
+	bufferset->funcs = dfunc;
+	bufferset->buffers = (VkCommandBuffer *) (bufferset + 1);
+	bufferset->numBuffers = numBuffers;
+
+	for (int i = 0; i < numBuffers; i++) {
+		bufferset->buffers[i] = buffers[i]->buffer;
+	}
+	return bufferset;
+}
+
+int
+QFV_BeginCommandBuffer (qfv_cmdbuffer_t *buffer, int oneTime, int rpContinue,
+						int simultaneous,
+						VkCommandBufferInheritanceInfo *inheritanceInfo)
+{
+	VkCommandBuffer buff = buffer->buffer;
+	qfv_devfuncs_t *dfunc = buffer->funcs;
+	VkCommandBufferUsageFlags usage = 0;
+
+	if (oneTime) {
+		usage |= VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT;
+	}
+	if (rpContinue) {
+		usage |= VK_COMMAND_BUFFER_USAGE_RENDER_PASS_CONTINUE_BIT;
+	}
+	if (simultaneous) {
+		usage |= VK_COMMAND_BUFFER_USAGE_SIMULTANEOUS_USE_BIT;
+	}
+
+	VkCommandBufferBeginInfo beginInfo = {
+		VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, 0,
+		usage,
+		0
+	};
+
+	return dfunc->vkBeginCommandBuffer (buff, &beginInfo) == VK_SUCCESS;
+}
+
+int
+QFV_EndCommandBuffer (qfv_cmdbuffer_t *buffer)
+{
+	VkCommandBuffer buff = buffer->buffer;
+	qfv_devfuncs_t *dfunc = buffer->funcs;
+
+	return dfunc->vkEndCommandBuffer (buff) == VK_SUCCESS;
+}
+
+int
+QFV_ResetCommandBuffer (qfv_cmdbuffer_t *buffer, int release)
+{
+	VkCommandBuffer buff = buffer->buffer;
+	qfv_devfuncs_t *dfunc = buffer->funcs;
+	VkCommandBufferResetFlags release_flag = 0;
+
+	if (release) {
+		release_flag = VK_COMMAND_BUFFER_RESET_RELEASE_RESOURCES_BIT;
+	}
+
+	return dfunc->vkResetCommandBuffer (buff, release_flag) == VK_SUCCESS;
+}
+
+qfv_semaphore_t *
+QFV_CreateSemaphore (qfv_device_t *device)
+{
+	VkDevice    dev = device->dev;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	VkSemaphoreCreateInfo createInfo = {
+		VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO, 0,
+		0
+	};
+
+	qfv_semaphore_t *semaphore = malloc (sizeof (*semaphore));
+	semaphore->dev = dev;
+	semaphore->funcs = dfunc;
+
+	dfunc->vkCreateSemaphore (dev, &createInfo, 0, &semaphore->semaphore);
+	return semaphore;
+}
+
+qfv_semaphoreset_t *
+QFV_CreateSemaphoreSet (qfv_semaphore_t **semaphores, int numSemaphores)
+{
+	VkDevice    dev = semaphores[0]->dev;
+	qfv_devfuncs_t *dfunc = semaphores[0]->funcs;
+	qfv_semaphoreset_t *semaphoreset;
+	semaphoreset = calloc (1, sizeof (*semaphoreset)
+						   + sizeof (VkSemaphore) * numSemaphores
+						   + sizeof (VkPipelineStageFlags) * numSemaphores);
+
+	semaphoreset->dev = dev;
+	semaphoreset->funcs = dfunc;
+	semaphoreset->semaphores = (VkSemaphore *) (semaphoreset + 1);
+	semaphoreset->stages = (VkPipelineStageFlags *)
+							&semaphoreset->semaphores[numSemaphores];
+	semaphoreset->numSemaphores = numSemaphores;
+
+	for (int i = 0; i < numSemaphores; i++) {
+		semaphoreset->semaphores[i] = semaphores[i]->semaphore;
+	}
+	return semaphoreset;
+}
+
+qfv_fence_t *
+QFV_CreateFence (qfv_device_t *device, int signaled)
+{
+	VkDevice    dev = device->dev;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	VkFenceCreateInfo createInfo = {
+		VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, 0,
+		signaled ? VK_FENCE_CREATE_SIGNALED_BIT : 0,
+	};
+
+	qfv_fence_t *fence = malloc (sizeof (*fence));
+	fence->dev = dev;
+	fence->funcs = dfunc;
+
+	dfunc->vkCreateFence (dev, &createInfo, 0, &fence->fence);
+	return fence;
+}
+
+qfv_fenceset_t *
+QFV_CreateFenceSet (qfv_fence_t **fences, int numFences)
+{
+	VkDevice    dev = fences[0]->dev;
+	qfv_devfuncs_t *dfunc = fences[0]->funcs;
+	qfv_fenceset_t *fenceset = malloc (sizeof (*fenceset)
+									   + sizeof (VkFence) * numFences);
+
+	fenceset->dev = dev;
+	fenceset->funcs = dfunc;
+	fenceset->fences = (VkFence *) (fenceset + 1);
+	fenceset->numFences = numFences;
+
+	for (int i = 0; i < numFences; i++) {
+		fenceset->fences[i] = fences[i]->fence;
+	}
+	return fenceset;
+}
+
+int
+QFV_WaitForFences (qfv_fenceset_t *fences, int all, uint64_t timeout)
+{
+	VkDevice    dev = fences->dev;
+	qfv_devfuncs_t *dfunc = fences->funcs;
+
+	VkResult res = dfunc->vkWaitForFences (dev, fences->numFences,
+										   fences->fences, all, timeout);
+	return res == VK_SUCCESS;
+}
+
+int
+QFV_ResetFences (qfv_fenceset_t *fences)
+{
+	VkDevice    dev = fences->dev;
+	qfv_devfuncs_t *dfunc = fences->funcs;
+
+	return dfunc->vkResetFences (dev, fences->numFences,
+								 fences->fences) == VK_SUCCESS;
+}
+
+int
+QFV_QueueSubmit (qfv_device_t *device, qfv_semaphoreset_t *waitSemaphores,
+				 qfv_cmdbufferset_t *buffers,
+				 qfv_semaphoreset_t *signalSemaphores, qfv_fence_t *fence)
+{
+	qfv_devfuncs_t *dfunc = device->funcs;
+	VkSubmitInfo submitInfo = {
+		VK_STRUCTURE_TYPE_SUBMIT_INFO, 0,
+		waitSemaphores->numSemaphores,
+		waitSemaphores->semaphores, waitSemaphores->stages,
+		buffers->numBuffers, buffers->buffers,
+		signalSemaphores->numSemaphores,
+		signalSemaphores->semaphores
+	};
+	//FIXME multi-batch
+	return dfunc->vkQueueSubmit (device->queue, 1, &submitInfo,
+								 fence->fence) == VK_SUCCESS;
+}

From a165d67dfa324bad91b94b1ecaeb5c621742edfe Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 23 Jul 2019 12:37:47 +0900
Subject: [PATCH 0313/1519] Add a queue type

---
 include/QF/Vulkan/command.h            |  3 ++-
 include/QF/Vulkan/device.h             | 12 ++++++++++--
 libs/video/renderer/vulkan/command.c   |  6 +++---
 libs/video/renderer/vulkan/device.c    |  7 +++++--
 libs/video/renderer/vulkan/swapchain.c |  3 ++-
 5 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/include/QF/Vulkan/command.h b/include/QF/Vulkan/command.h
index 1fe12df6d..3ad1164ff 100644
--- a/include/QF/Vulkan/command.h
+++ b/include/QF/Vulkan/command.h
@@ -48,6 +48,7 @@ typedef struct qfv_fenceset_s {
 } qfv_fenceset_t;
 
 struct qfv_device_s;
+struct qfv_queue_s;
 qfv_cmdpool_t *QFV_CreateCommandPool (struct qfv_device_s *device,
 									  uint32_t queueFamily,
 									  int transient, int reset);
@@ -70,7 +71,7 @@ qfv_fence_t *QFV_CreateFence (struct qfv_device_s *device, int signaled);
 qfv_fenceset_t *QFV_CreateFenceSet (qfv_fence_t **fences, int numFences);
 int QFV_WaitForFences (qfv_fenceset_t *fences, int all, uint64_t timeout);
 int QFV_ResetFences (qfv_fenceset_t *fences);
-int QFV_QueueSubmit (struct qfv_device_s *device,
+int QFV_QueueSubmit (struct qfv_queue_s *queue,
 					 qfv_semaphoreset_t *waitSemaphores,
 					 qfv_cmdbufferset_t *buffers,
 					 qfv_semaphoreset_t *signalSemaphores, qfv_fence_t *fence);
diff --git a/include/QF/Vulkan/device.h b/include/QF/Vulkan/device.h
index 0a90ea539..959b3d956 100644
--- a/include/QF/Vulkan/device.h
+++ b/include/QF/Vulkan/device.h
@@ -7,13 +7,21 @@ typedef struct qfv_devfuncs_s {
 #include "QF/Vulkan/funclist.h"
 } qfv_devfuncs_t;
 
+struct qfv_device_s;
+typedef struct qfv_queue_s {
+	VkDevice    dev;
+	qfv_devfuncs_t *funcs;
+
+	int32_t     queueFamily;
+	VkQueue     queue;
+} qfv_queue_t;
+
 struct qfv_instance_s;
 typedef struct qfv_device_s {
 	VkDevice    dev;
 	VkPhysicalDevice physDev;
 	qfv_devfuncs_t *funcs;
-	int32_t     queueFamily;
-	VkQueue     queue;
+	qfv_queue_t queue;
 	struct strset_s *enabled_extensions;
 	int         (*extension_enabled) (struct qfv_device_s *inst,
 									  const char *ext);
diff --git a/libs/video/renderer/vulkan/command.c b/libs/video/renderer/vulkan/command.c
index 13dbde1a6..fab0a1966 100644
--- a/libs/video/renderer/vulkan/command.c
+++ b/libs/video/renderer/vulkan/command.c
@@ -297,11 +297,11 @@ QFV_ResetFences (qfv_fenceset_t *fences)
 }
 
 int
-QFV_QueueSubmit (qfv_device_t *device, qfv_semaphoreset_t *waitSemaphores,
+QFV_QueueSubmit (qfv_queue_t *queue, qfv_semaphoreset_t *waitSemaphores,
 				 qfv_cmdbufferset_t *buffers,
 				 qfv_semaphoreset_t *signalSemaphores, qfv_fence_t *fence)
 {
-	qfv_devfuncs_t *dfunc = device->funcs;
+	qfv_devfuncs_t *dfunc = queue->funcs;
 	VkSubmitInfo submitInfo = {
 		VK_STRUCTURE_TYPE_SUBMIT_INFO, 0,
 		waitSemaphores->numSemaphores,
@@ -311,6 +311,6 @@ QFV_QueueSubmit (qfv_device_t *device, qfv_semaphoreset_t *waitSemaphores,
 		signalSemaphores->semaphores
 	};
 	//FIXME multi-batch
-	return dfunc->vkQueueSubmit (device->queue, 1, &submitInfo,
+	return dfunc->vkQueueSubmit (queue->queue, 1, &submitInfo,
 								 fence->fence) == VK_SUCCESS;
 }
diff --git a/libs/video/renderer/vulkan/device.c b/libs/video/renderer/vulkan/device.c
index 736b5e915..a90b58744 100644
--- a/libs/video/renderer/vulkan/device.c
+++ b/libs/video/renderer/vulkan/device.c
@@ -191,8 +191,11 @@ QFV_CreateDevice (vulkan_ctx_t *ctx, const char **extensions)
 
 			device->physDev = physdev;
 			load_device_funcs (inst, device);
-			device->queueFamily = family;
-			dfunc->vkGetDeviceQueue (device->dev, family, 0, &device->queue);
+			device->queue.dev = device->dev;
+			device->queue.funcs = dfunc;
+			device->queue.queueFamily = family;
+			dfunc->vkGetDeviceQueue (device->dev, family, 0,
+									 &device->queue.queue);
 			ctx->device = device;
 			return device;
 		}
diff --git a/libs/video/renderer/vulkan/swapchain.c b/libs/video/renderer/vulkan/swapchain.c
index 2707676d6..c9487a913 100644
--- a/libs/video/renderer/vulkan/swapchain.c
+++ b/libs/video/renderer/vulkan/swapchain.c
@@ -27,10 +27,11 @@ QFV_CreateSwapchain (vulkan_ctx_t *ctx, VkSwapchainKHR old_swapchain)
 {
 	qfv_instfuncs_t *ifuncs = ctx->instance->funcs;
 	qfv_devfuncs_t *dfuncs = ctx->device->funcs;
+	qfv_queue_t *queue = &ctx->device->queue;
 
 	VkBool32    supported;
 	ifuncs->vkGetPhysicalDeviceSurfaceSupportKHR (ctx->device->physDev,
-												  ctx->device->queueFamily,
+												  queue->queueFamily,
 												  ctx->surface,
 												  &supported);
 	if (!supported) {

From 4957c4f31adc2e50b176ea112b074d348e839f30 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 23 Jul 2019 13:05:32 +0900
Subject: [PATCH 0314/1519] Implement the rest of the command stuff

---
 include/QF/Vulkan/command.h          | 13 +++++-
 include/QF/Vulkan/device.h           |  1 +
 include/QF/Vulkan/funclist.h         |  6 +++
 libs/video/renderer/vulkan/command.c | 70 ++++++++++++++++++++++++++++
 libs/video/renderer/vulkan/device.c  |  7 +++
 5 files changed, 96 insertions(+), 1 deletion(-)

diff --git a/include/QF/Vulkan/command.h b/include/QF/Vulkan/command.h
index 3ad1164ff..2af925f29 100644
--- a/include/QF/Vulkan/command.h
+++ b/include/QF/Vulkan/command.h
@@ -10,6 +10,7 @@ typedef struct qfv_cmdpool_s {
 typedef struct qfv_cmdbuffer_s {
 	VkDevice    dev;
 	struct qfv_devfuncs_s *funcs;
+	VkCommandPool cmdpool;
 	VkCommandBuffer buffer;
 } qfv_cmdbuffer_t;
 
@@ -53,10 +54,14 @@ qfv_cmdpool_t *QFV_CreateCommandPool (struct qfv_device_s *device,
 									  uint32_t queueFamily,
 									  int transient, int reset);
 int QFV_ResetCommandPool (qfv_cmdpool_t *pool, int release);
+void QFV_DestroyCommandPool (qfv_cmdpool_t *pool);
 qfv_cmdbuffer_t *QFV_AllocateCommandBuffers (qfv_cmdpool_t *pool,
 											 int secondary, int count);
 qfv_cmdbufferset_t *QFV_CreateCommandBufferSet (qfv_cmdbuffer_t **buffers,
 												int numBuffers);
+void QFV_FreeCommandBuffers (qfv_cmdbuffer_t *buffer, int count);
+// NOTE: does not destroy buffers
+void QFV_DestroyCommandBufferSet (qfv_cmdbufferset_t *buffers);
 int QFV_BeginCommandBuffer (qfv_cmdbuffer_t *buffer, int oneTime,
 							int rpContinue, int simultaneous,
 							VkCommandBufferInheritanceInfo *inheritanceInfo);
@@ -66,15 +71,21 @@ int QFV_ResetCommandBuffer (qfv_cmdbuffer_t *buffer, int release);
 qfv_semaphore_t *QFV_CreateSemaphore (struct qfv_device_s *device);
 qfv_semaphoreset_t *QFV_CreateSemaphoreSet (qfv_semaphore_t **semaphores,
 											int numSemaphores);
-
+void QFV_DestroySemaphore (qfv_semaphore_t *semaphore);
+// NOTE: does not destroy semaphores
+void QFV_DestroySemaphoreSet (qfv_semaphoreset_t *semaphores);
 qfv_fence_t *QFV_CreateFence (struct qfv_device_s *device, int signaled);
 qfv_fenceset_t *QFV_CreateFenceSet (qfv_fence_t **fences, int numFences);
+void QFV_DestroyFence (qfv_fence_t *fence);
+// NOTE: does not destroy fences
+void QFV_DestroyFenceSet (qfv_fenceset_t *fences);
 int QFV_WaitForFences (qfv_fenceset_t *fences, int all, uint64_t timeout);
 int QFV_ResetFences (qfv_fenceset_t *fences);
 int QFV_QueueSubmit (struct qfv_queue_s *queue,
 					 qfv_semaphoreset_t *waitSemaphores,
 					 qfv_cmdbufferset_t *buffers,
 					 qfv_semaphoreset_t *signalSemaphores, qfv_fence_t *fence);
+int QFV_QueueWaitIdle (struct qfv_queue_s *queue);
 
 
 #endif//__QF_Vulkan_command_h
diff --git a/include/QF/Vulkan/device.h b/include/QF/Vulkan/device.h
index 959b3d956..6f6907148 100644
--- a/include/QF/Vulkan/device.h
+++ b/include/QF/Vulkan/device.h
@@ -31,5 +31,6 @@ struct vulkan_ctx_s;
 qfv_device_t *QFV_CreateDevice (struct vulkan_ctx_s *ctx,
 								const char **extensions);
 void QFV_DestroyDevice (qfv_device_t *device);
+int QFV_DeviceWaitIdle (qfv_device_t *device);
 
 #endif//__QF_Vulkan_device_h
diff --git a/include/QF/Vulkan/funclist.h b/include/QF/Vulkan/funclist.h
index 20ccbe275..5d649d5c2 100644
--- a/include/QF/Vulkan/funclist.h
+++ b/include/QF/Vulkan/funclist.h
@@ -101,6 +101,12 @@ DEVICE_LEVEL_VULKAN_FUNCTION (vkCreateFence)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkWaitForFences)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkResetFences)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkQueueSubmit)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkQueueWaitIdle)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkDeviceWaitIdle)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkDestroyFence)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkDestroySemaphore)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkFreeCommandBuffers)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkDestroyCommandPool)
 
 #undef DEVICE_LEVEL_VULKAN_FUNCTION
 
diff --git a/libs/video/renderer/vulkan/command.c b/libs/video/renderer/vulkan/command.c
index fab0a1966..4031f0be4 100644
--- a/libs/video/renderer/vulkan/command.c
+++ b/libs/video/renderer/vulkan/command.c
@@ -100,6 +100,16 @@ QFV_ResetCommandPool (qfv_cmdpool_t *pool, int release)
 	return dfunc->vkResetCommandPool (dev, cmdpool, release_flag) == VK_SUCCESS;
 }
 
+void
+QFV_DestroyCommandPool (qfv_cmdpool_t *pool)
+{
+	VkDevice    dev = pool->dev;
+	qfv_devfuncs_t *dfunc = pool->funcs;
+
+	dfunc->vkDestroyCommandPool (dev, pool->cmdpool, 0);
+	free (pool);
+}
+
 qfv_cmdbuffer_t *
 QFV_AllocateCommandBuffers (qfv_cmdpool_t *pool, int secondary, int count)
 {
@@ -119,6 +129,7 @@ QFV_AllocateCommandBuffers (qfv_cmdpool_t *pool, int secondary, int count)
 	for (int i = 0; i < count; i++) {
 		cmdbuffers[i].dev = dev;
 		cmdbuffers[i].funcs = dfunc;
+		cmdbuffers[i].cmdpool = pool->cmdpool;
 		cmdbuffers[i].buffer = buffers[i];
 	}
 	return cmdbuffers;
@@ -144,6 +155,26 @@ QFV_CreateCommandBufferSet (qfv_cmdbuffer_t **buffers, int numBuffers)
 	return bufferset;
 }
 
+void QFV_FreeCommandBuffers (qfv_cmdbuffer_t *buffer, int count)
+{
+	VkDevice    dev = buffer->dev;
+	qfv_devfuncs_t *dfunc = buffer->funcs;
+	VkCommandBuffer *buffers = alloca (sizeof (*buffers) * count);
+
+	for (int i = 0; i < count; i++) {
+		buffers[i] = buffer[i].buffer;
+	}
+
+	dfunc->vkFreeCommandBuffers (dev, buffer->cmdpool, count, buffers);
+	free (buffer);
+}
+
+void
+QFV_DestroyCommandBufferSet (qfv_cmdbufferset_t *buffers)
+{
+	free (buffers);
+}
+
 int
 QFV_BeginCommandBuffer (qfv_cmdbuffer_t *buffer, int oneTime, int rpContinue,
 						int simultaneous,
@@ -237,6 +268,22 @@ QFV_CreateSemaphoreSet (qfv_semaphore_t **semaphores, int numSemaphores)
 	return semaphoreset;
 }
 
+void
+QFV_DestroySemaphore (qfv_semaphore_t *semaphore)
+{
+	VkDevice    dev = semaphore->dev;
+	qfv_devfuncs_t *dfunc = semaphore->funcs;
+
+	dfunc->vkDestroySemaphore (dev, semaphore->semaphore, 0);
+	free (semaphore);
+}
+
+void
+QFV_DestroySemaphoreSet (qfv_semaphoreset_t *semaphores)
+{
+	free (semaphores);
+}
+
 qfv_fence_t *
 QFV_CreateFence (qfv_device_t *device, int signaled)
 {
@@ -275,6 +322,22 @@ QFV_CreateFenceSet (qfv_fence_t **fences, int numFences)
 	return fenceset;
 }
 
+void
+QFV_DestroyFence (qfv_fence_t *fence)
+{
+	VkDevice    dev = fence->dev;
+	qfv_devfuncs_t *dfunc = fence->funcs;
+
+	dfunc->vkDestroyFence (dev, fence->fence, 0);
+	free (fence);
+}
+
+void
+QFV_DestroyFenceSet (qfv_fenceset_t *fences)
+{
+	free (fences);
+}
+
 int
 QFV_WaitForFences (qfv_fenceset_t *fences, int all, uint64_t timeout)
 {
@@ -314,3 +377,10 @@ QFV_QueueSubmit (qfv_queue_t *queue, qfv_semaphoreset_t *waitSemaphores,
 	return dfunc->vkQueueSubmit (queue->queue, 1, &submitInfo,
 								 fence->fence) == VK_SUCCESS;
 }
+
+int
+QFV_QueueWaitIdle (qfv_queue_t *queue)
+{
+	qfv_devfuncs_t *dfunc = queue->funcs;
+	return dfunc->vkQueueWaitIdle (queue->queue) == VK_SUCCESS;
+}
diff --git a/libs/video/renderer/vulkan/device.c b/libs/video/renderer/vulkan/device.c
index a90b58744..85f200956 100644
--- a/libs/video/renderer/vulkan/device.c
+++ b/libs/video/renderer/vulkan/device.c
@@ -211,3 +211,10 @@ QFV_DestroyDevice (qfv_device_t *device)
 	del_strset (device->enabled_extensions);
 	free (device);
 }
+
+int
+QFV_DeviceWaitIdle (qfv_device_t *device)
+{
+	qfv_devfuncs_t *dfunc = device->funcs;
+	return dfunc->vkDeviceWaitIdle (device->dev) == VK_SUCCESS;
+}

From 90a707f7f96762f581d59936964f4e0fa627db62 Mon Sep 17 00:00:00 2001
From: khreathor <khreathor@khreathor.xyz>
Date: Tue, 20 Nov 2018 18:28:42 +0100
Subject: [PATCH 0315/1519] Export animation range selected with start/end
 playback range in Timeline Editor

---
 tools/io_mesh_qfmdl/export_mdl.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/io_mesh_qfmdl/export_mdl.py b/tools/io_mesh_qfmdl/export_mdl.py
index 9b98ee20a..e2260e372 100644
--- a/tools/io_mesh_qfmdl/export_mdl.py
+++ b/tools/io_mesh_qfmdl/export_mdl.py
@@ -300,7 +300,7 @@ def export_mdl(operator, context, filepath):
         make_skin(operator, mdl, mesh)
     if not mdl.frames:
         curframe = context.scene.frame_current
-        for fno in range(1, curframe + 1):
+        for fno in range(context.scene.frame_start, context.scene.frame_end + 1):
             context.scene.frame_set(fno)
             mesh = obj.to_mesh(context.scene, True, 'PREVIEW') #wysiwyg?
             if mdl.obj.qfmdl.xform:

From 8112c4e8b6265ae6c35e247802f80ef76bbeb053 Mon Sep 17 00:00:00 2001
From: khreathor <khreathor@khreathor.xyz>
Date: Sat, 24 Nov 2018 02:59:41 +0100
Subject: [PATCH 0316/1519] Moved MDL settings from Object tab to export
 options/presets

---
 tools/io_mesh_qfmdl/__init__.py   | 33 +++++++++++++++++--
 tools/io_mesh_qfmdl/export_mdl.py | 54 ++++++++++++++++++++++++-------
 2 files changed, 73 insertions(+), 14 deletions(-)

diff --git a/tools/io_mesh_qfmdl/__init__.py b/tools/io_mesh_qfmdl/__init__.py
index 03eb35e71..a3abea3cd 100644
--- a/tools/io_mesh_qfmdl/__init__.py
+++ b/tools/io_mesh_qfmdl/__init__.py
@@ -66,6 +66,7 @@ EFFECTS=(
 )
 
 class QFMDLSettings(bpy.types.PropertyGroup):
+    '''
     eyeposition = FloatVectorProperty(
         name="Eye Position",
         description="View possion relative to object origin")
@@ -85,9 +86,7 @@ class QFMDLSettings(bpy.types.PropertyGroup):
     #    type=bpy.types.Object,
     #    name="Script",
     #    description="Script for animating frames and skins")
-    script = StringProperty(
-        name="Script",
-        description="Script for animating frames and skins")
+
     xform = BoolProperty(
         name="Auto transform",
         description="Auto-apply location/rotation/scale when exporting",
@@ -95,6 +94,10 @@ class QFMDLSettings(bpy.types.PropertyGroup):
     md16 = BoolProperty(
         name="16-bit",
         description="16 bit vertex coordinates: QuakeForge only")
+    '''
+    script = StringProperty(
+        name="Script",
+        description="Script for animating frames and skins")
 
 class ImportMDL6(bpy.types.Operator, ImportHelper):
     '''Load a Quake MDL (v6) File'''
@@ -114,10 +117,34 @@ class ExportMDL6(bpy.types.Operator, ExportHelper):
 
     bl_idname = "export_mesh.quake_mdl_v6"
     bl_label = "Export MDL"
+    bl_options = {'PRESET'};
 
     filename_ext = ".mdl"
     filter_glob = StringProperty(default="*.mdl", options={'HIDDEN'})
 
+    eyeposition = FloatVectorProperty(
+        name="Eye Position",
+        description="View possion relative to object origin")
+    synctype = EnumProperty(
+        items=SYNCTYPE,
+        name="Sync Type",
+        description="Add random time offset for automatic animations")
+    rotate = BoolProperty(
+        name="Rotate",
+        description="Rotate automatically (for pickup items)",
+        default=False)
+    effects = EnumProperty(
+        items=EFFECTS,
+        name="Effects",
+        description="Particle trail effects")
+    xform = BoolProperty(
+        name="Auto transform",
+        description="Auto-apply location/rotation/scale when exporting",
+        default=True)
+    md16 = BoolProperty(
+        name="16-bit",
+        description="16 bit vertex coordinates: QuakeForge only")
+
     @classmethod
     def poll(cls, context):
         return (context.active_object != None
diff --git a/tools/io_mesh_qfmdl/export_mdl.py b/tools/io_mesh_qfmdl/export_mdl.py
index e2260e372..d6f7371d0 100644
--- a/tools/io_mesh_qfmdl/export_mdl.py
+++ b/tools/io_mesh_qfmdl/export_mdl.py
@@ -27,6 +27,7 @@ from .qfplist import pldata, PListError
 from .quakepal import palette
 from .quakenorm import map_normal
 from .mdl import MDL
+from .__init__ import SYNCTYPE, EFFECTS
 
 def check_faces(mesh):
     #Check that all faces are tris because mdl does not support anything else.
@@ -185,14 +186,25 @@ def calc_average_area(mdl):
         totalarea += (c * c) ** 0.5 / 2.0
     return totalarea / len(mdl.tris)
 
-def get_properties(operator, mdl, obj):
-    mdl.eyeposition = tuple(obj.qfmdl.eyeposition)
-    mdl.synctype = MDL.SYNCTYPE[obj.qfmdl.synctype]
-    mdl.flags = ((obj.qfmdl.rotate and MDL.EF_ROTATE or 0)
-                 | MDL.EFFECTS[obj.qfmdl.effects])
-    if obj.qfmdl.md16:
+def get_properties(
+            operator,
+            mdl,
+            eyeposition,
+            synctype,
+            rotate,
+            effects,
+            xform,
+            md16):
+    mdl.eyeposition = eyeposition
+    mdl.synctype = MDL.SYNCTYPE[synctype]
+    mdl.flags = ((rotate and MDL.EF_ROTATE or 0)
+                 | MDL.EFFECTS[effects])
+    if md16:
         mdl.ident = "MD16"
-    script = obj.qfmdl.script
+
+    #tomporarily disabled
+    #script = obj.qfmdl.script
+    script = None
     mdl.script = None
     if script:
         try:
@@ -276,7 +288,18 @@ def process_frame(mdl, scene, frame, vertmap, ingroup = False,
     fr.name = name
     return fr
 
-def export_mdl(operator, context, filepath):
+def export_mdl(
+    operator,
+    context,
+    filepath = "",
+    eyeposition = (0.0, 0.0, 0.0),
+    synctype = SYNCTYPE[1],
+    rotate = False,
+    effects = EFFECTS[1],
+    xform = True,
+    md16 = False
+    ):
+
     obj = context.active_object
     mesh = obj.to_mesh(context.scene, True, 'PREVIEW') #wysiwyg?
     #if not check_faces(mesh):
@@ -285,8 +308,17 @@ def export_mdl(operator, context, filepath):
     #    return {'CANCELLED'}
     mdl = MDL(obj.name)
     mdl.obj = obj
-    if not get_properties(operator, mdl, obj):
-        return {'CANCELLED'}
+    if not get_properties(
+            operator,
+            mdl,
+            eyeposition,
+            synctype,
+            rotate,
+            effects,
+            xform,
+            md16):
+                return {'CANCELLED'}
+
     mdl.tris, mdl.stverts, vertmap = build_tris(mesh)
     if mdl.script:
         if 'skins' in mdl.script:
@@ -303,7 +335,7 @@ def export_mdl(operator, context, filepath):
         for fno in range(context.scene.frame_start, context.scene.frame_end + 1):
             context.scene.frame_set(fno)
             mesh = obj.to_mesh(context.scene, True, 'PREVIEW') #wysiwyg?
-            if mdl.obj.qfmdl.xform:
+            if xform:
                 mesh.transform(mdl.obj.matrix_world)
             mdl.frames.append(make_frame(mesh, vertmap))
     convert_stverts(mdl, mdl.stverts)

From ae86790e6ccc1e77d9d9448cb5fbdc966ec49fad Mon Sep 17 00:00:00 2001
From: khreathor <khreathor@khreathor.xyz>
Date: Tue, 8 Jan 2019 03:02:11 +0100
Subject: [PATCH 0317/1519] Initial Blender 2.8 changes - it works, now it's
 time for improvements

---
 tools/io_mesh_qfmdl/__init__.py   | 83 ++++++++++++++++++-------------
 tools/io_mesh_qfmdl/export_mdl.py | 23 +++++++--
 tools/io_mesh_qfmdl/import_mdl.py | 81 +++++++++++++++++++-----------
 3 files changed, 119 insertions(+), 68 deletions(-)

diff --git a/tools/io_mesh_qfmdl/__init__.py b/tools/io_mesh_qfmdl/__init__.py
index a3abea3cd..1f4a682c6 100644
--- a/tools/io_mesh_qfmdl/__init__.py
+++ b/tools/io_mesh_qfmdl/__init__.py
@@ -24,14 +24,14 @@
 bl_info = {
     "name": "Quake MDL format",
     "author": "Bill Currie",
-    "blender": (2, 6, 3),
+    "blender": (2, 80, 0),
     "api": 35622,
     "location": "File > Import-Export",
     "description": "Import-Export Quake MDL (version 6) files. (.mdl)",
-    "warning": "not even alpha",
+    "warning": "still work in progress",
     "wiki_url": "",
     "tracker_url": "",
-#    "support": 'OFFICIAL',
+#   "support": 'OFFICIAL',
     "category": "Import-Export"}
 
 # To support reload properly, try to access a package var, if it's there,
@@ -64,28 +64,35 @@ EFFECTS=(
     ('EF_TRACER2', "Tracer 2", "Orange split trail + rotate"),
     ('EF_TRACER3', "Tracer 3", "Purple split trail"),
 )
+'''
+ class QFMDLSettings(bpy.types.PropertyGroup):
+#     eyeposition = FloatVectorProperty(
+#         name="Eye Position",
+#         description="View possion relative to object origin")
+#     synctype = EnumProperty(
+#         items=SYNCTYPE,
+#         name="Sync Type",
+#         description="Add random time offset for automatic animations")
+#     rotate = BoolProperty(
+#         name="Rotate",
+#         description="Rotate automatically (for pickup items)")
+#     effects = EnumProperty(
+#         items=EFFECTS,
+#         name="Effects",
+#         description="Particle trail effects")
+#     #doesn't work :(
+#     #script = PointerProperty(
+#     #    type=bpy.types.Object,
+#     #    name="Script",
+#     #    description="Script for animating frames and skins")
 
-class QFMDLSettings(bpy.types.PropertyGroup):
-    '''
-    eyeposition = FloatVectorProperty(
-        name="Eye Position",
-        description="View possion relative to object origin")
-    synctype = EnumProperty(
-        items=SYNCTYPE,
-        name="Sync Type",
-        description="Add random time offset for automatic animations")
-    rotate = BoolProperty(
-        name="Rotate",
-        description="Rotate automatically (for pickup items)")
-    effects = EnumProperty(
-        items=EFFECTS,
-        name="Effects",
-        description="Particle trail effects")
-    #doesn't work :(
-    #script = PointerProperty(
-    #    type=bpy.types.Object,
-    #    name="Script",
-    #    description="Script for animating frames and skins")
+#     xform = BoolProperty(
+#         name="Auto transform",
+#         description="Auto-apply location/rotation/scale when exporting",
+#         default=True)
+#     md16 = BoolProperty(
+#         name="16-bit",
+#         description="16 bit vertex coordinates: QuakeForge only")
 
     xform = BoolProperty(
         name="Auto transform",
@@ -94,10 +101,10 @@ class QFMDLSettings(bpy.types.PropertyGroup):
     md16 = BoolProperty(
         name="16-bit",
         description="16 bit vertex coordinates: QuakeForge only")
-    '''
     script = StringProperty(
         name="Script",
-        description="Script for animating frames and skins")
+       description="Script for animating frames and skins")
+'''
 
 class ImportMDL6(bpy.types.Operator, ImportHelper):
     '''Load a Quake MDL (v6) File'''
@@ -155,6 +162,7 @@ class ExportMDL6(bpy.types.Operator, ExportHelper):
         keywords = self.as_keywords (ignore=("check_existing", "filter_glob"))
         return export_mdl.export_mdl(self, context, **keywords)
 
+'''
 class OBJECT_PT_MDLPanel(bpy.types.Panel):
     bl_space_type = 'PROPERTIES'
     bl_region_type = 'WINDOW'
@@ -176,6 +184,7 @@ class OBJECT_PT_MDLPanel(bpy.types.Panel):
         layout.prop(obj.qfmdl, "script")
         layout.prop(obj.qfmdl, "xform")
         layout.prop(obj.qfmdl, "md16")
+'''
 
 def menu_func_import(self, context):
     self.layout.operator(ImportMDL6.bl_idname, text="Quake MDL (.mdl)")
@@ -184,21 +193,25 @@ def menu_func_import(self, context):
 def menu_func_export(self, context):
     self.layout.operator(ExportMDL6.bl_idname, text="Quake MDL (.mdl)")
 
+classes = (
+    #OBJECT_PT_MDLPanel,
+    ImportMDL6,
+    ExportMDL6
+)
 
 def register():
-    bpy.utils.register_module(__name__)
-
-    bpy.types.Object.qfmdl = PointerProperty(type=QFMDLSettings)
-
-    bpy.types.INFO_MT_file_import.append(menu_func_import)
-    bpy.types.INFO_MT_file_export.append(menu_func_export)
+    for cls in classes:
+        bpy.utils.register_class(cls)
 
+    bpy.types.TOPBAR_MT_file_import.append(menu_func_import)
+    bpy.types.TOPBAR_MT_file_export.append(menu_func_export)
 
 def unregister():
-    bpy.utils.unregister_module(__name__)
+    for cls in classes:
+        bpy.utils.unregister_class(cls)
 
-    bpy.types.INFO_MT_file_import.remove(menu_func_import)
-    bpy.types.INFO_MT_file_export.remove(menu_func_export)
+    bpy.types.TOPBAR_MT_file_import.remove(menu_func_import)
+    bpy.types.TOPBAR_MT_file_export.remove(menu_func_export)
 
 if __name__ == "__main__":
     register()
diff --git a/tools/io_mesh_qfmdl/export_mdl.py b/tools/io_mesh_qfmdl/export_mdl.py
index d6f7371d0..0344c4561 100644
--- a/tools/io_mesh_qfmdl/export_mdl.py
+++ b/tools/io_mesh_qfmdl/export_mdl.py
@@ -86,7 +86,7 @@ def null_skin(size):
     return skin
 
 def active_uv(mesh):
-    for uvt in mesh.uv_textures:
+    for uvt in mesh.uv_layers:
         if uvt.active:
             return uvt
     return None
@@ -95,6 +95,18 @@ def make_skin(operator, mdl, mesh):
     uvt = active_uv(mesh)
     mdl.skinwidth, mdl.skinheight = (4, 4)
     skin = null_skin((mdl.skinwidth, mdl.skinheight))
+
+    mat = bpy.context.object.data.materials[0]
+    allNodes = mat.node_tree.nodes
+
+    for node in allNodes:
+        if node.type == "TEX_IMAGE":
+            image = node.image
+            mdl.skinwidth, mdl.skinheight = image.size
+            skin = convert_image(image)
+            mdl.skins.append(skin)
+
+    '''
     if (uvt and uvt.data and uvt.data[0].image):
         image = uvt.data[0].image
         if (uvt.data[0].image.size[0] and uvt.data[0].image.size[1]):
@@ -103,7 +115,9 @@ def make_skin(operator, mdl, mesh):
         else:
             operator.report({'WARNING'},
                             "Texture '%s' invalid (missing?)." % image.name)
+    
     mdl.skins.append(skin)
+    '''
 
 def build_tris(mesh):
     # mdl files have a 1:1 relationship between stverts and 3d verts.
@@ -183,7 +197,7 @@ def calc_average_area(mdl):
         a = Vector(verts[0].r) - Vector(verts[1].r)
         b = Vector(verts[2].r) - Vector(verts[1].r)
         c = a.cross(b)
-        totalarea += (c * c) ** 0.5 / 2.0
+        totalarea += (c @ c) ** 0.5 / 2.0
     return totalarea / len(mdl.tris)
 
 def get_properties(
@@ -301,7 +315,8 @@ def export_mdl(
     ):
 
     obj = context.active_object
-    mesh = obj.to_mesh(context.scene, True, 'PREVIEW') #wysiwyg?
+    #mesh = obj.to_mesh(context.scene, True, 'PREVIEW') #wysiwyg?
+    mesh = obj.to_mesh(context.depsgraph, True, calc_undeformed=False)
     #if not check_faces(mesh):
     #    operator.report({'ERROR'},
     #                    "Mesh has faces with more than 3 vertices.")
@@ -334,7 +349,7 @@ def export_mdl(
         curframe = context.scene.frame_current
         for fno in range(context.scene.frame_start, context.scene.frame_end + 1):
             context.scene.frame_set(fno)
-            mesh = obj.to_mesh(context.scene, True, 'PREVIEW') #wysiwyg?
+            mesh = obj.to_mesh(context.depsgraph, True, calc_undeformed=False) #wysiwyg?
             if xform:
                 mesh.transform(mdl.obj.matrix_world)
             mdl.frames.append(make_frame(mesh, vertmap))
diff --git a/tools/io_mesh_qfmdl/import_mdl.py b/tools/io_mesh_qfmdl/import_mdl.py
index feca0fa08..c3e64b3c0 100644
--- a/tools/io_mesh_qfmdl/import_mdl.py
+++ b/tools/io_mesh_qfmdl/import_mdl.py
@@ -39,7 +39,7 @@ def make_verts(mdl, framenum, subframenum=0):
                 (  0,  0,s.z,o.z),
                 (  0,  0,  0,  1)))
     for v in frame.verts:
-        verts.append(m * Vector(v.r))
+        verts.append(m @ Vector(v.r))
     return verts
 
 def make_faces(mdl):
@@ -87,7 +87,7 @@ def load_skins(mdl):
                 p[l + 2] = c[2] / 255.0
                 p[l + 3] = 1.0
         img.pixels[:] = p[:]
-        img.pack(True)
+        img.pack(as_png=True)
         img.use_fake_user = True
 
     mdl.images=[]
@@ -100,27 +100,47 @@ def load_skins(mdl):
 
 def setup_skins(mdl, uvs):
     load_skins(mdl)
-    img = mdl.images[0]   # use the first skin for now
-    uvlay = mdl.mesh.uv_textures.new(mdl.name)
-    uvloop = mdl.mesh.uv_layers[0]
-    for i, texpoly in enumerate(uvlay.data):
+#    img = mdl.images[0]   # use the first skin for now
+#    uvlay = mdl.mesh.uv_textures.new(mdl.name)
+#    uvloop = mdl.mesh.uv_layers[0]
+#    for i, texpoly in enumerate(uvlay.data):
+    uvloop = mdl.mesh.uv_layers.new(name = mdl.name)
+    for i in range(len(mdl.mesh.polygons)):
         poly = mdl.mesh.polygons[i]
         mdl_uv = uvs[i]
-        texpoly.image = img
+#        texpoly.image = img	# TODO: commented out by jazz
         for j,k in enumerate(poly.loop_indices):
             uvloop.data[k].uv = mdl_uv[j]
+
+    # Create main material
     mat = bpy.data.materials.new(mdl.name)
+    mat.blend_method = 'OPAQUE'
     mat.diffuse_color = (1,1,1)
-    mat.use_raytrace = False
-    tex = bpy.data.textures.new(mdl.name, 'IMAGE')
-    tex.extension = 'CLIP'
-    tex.use_preview_alpha = True
-    tex.image = img
-    mat.texture_slots.add()
-    ts = mat.texture_slots[0]
-    ts.texture = tex
-    ts.use_map_alpha = True
-    ts.texture_coords = 'UV'
+    mat.metallic = 1
+    mat.roughness = 1
+    mat.specular_intensity = 0
+    mat.use_nodes = True
+
+    # TODO: turn transform to True and position it properly in editor
+    emissionNode = mat.node_tree.nodes.new("ShaderNodeEmission")
+    shaderOut = mat.node_tree.nodes["Material Output"]
+    bdsf_node = mat.node_tree.nodes["Principled BSDF"]
+    mat.node_tree.nodes.remove(bdsf_node)
+
+    #Add skingroup
+    #bpy.ops.object.material_slot_add()
+    #bpy.ops.material.new()
+
+    #Add all existing textures to shader node
+    for i in range(len(mdl.images)):
+        tex_node = mat.node_tree.nodes.new("ShaderNodeTexImage")
+        tex_node.image = mdl.images[i]
+        tex_node.interpolation = "Closest"
+        if i == 0:
+            # connect only first texture (we'll need something smarter in the future)
+            mat.node_tree.links.new(tex_node.outputs[0], emissionNode.inputs[0])
+
+    mat.node_tree.links.new(emissionNode.outputs[0], shaderOut.inputs[0])
     mdl.mesh.materials.append(mat)
 
 def make_shape_key(mdl, framenum, subframenum=0):
@@ -133,7 +153,7 @@ def make_shape_key(mdl, framenum, subframenum=0):
         name = frame.name
     else:
         frame.name = name
-    frame.key = mdl.obj.shape_key_add(name)
+    frame.key = mdl.obj.shape_key_add(name=name)
     frame.key.value = 0.0
     mdl.keys.append(frame.key)
     s = Vector(mdl.scale)
@@ -143,11 +163,11 @@ def make_shape_key(mdl, framenum, subframenum=0):
                 (  0,  0,s.z,o.z),
                 (  0,  0,  0,  1)))
     for i, v in enumerate(frame.verts):
-        frame.key.data[i].co = m * Vector(v.r)
+        frame.key.data[i].co = m @ Vector(v.r)
 
 def build_shape_keys(mdl):
     mdl.keys = []
-    mdl.obj.shape_key_add("Basis")
+    mdl.obj.shape_key_add(name="Basis",from_mix=False)
     mdl.mesh.shape_keys.name = mdl.name
     mdl.obj.active_shape_key_index = 0
     for i, frame in enumerate(mdl.frames):
@@ -327,6 +347,7 @@ def parse_flags(flags):
     else:
         return 'EF_NONE'
 
+'''
 def set_properties(mdl):
     mdl.obj.qfmdl.eyeposition = mdl.eyeposition
     try:
@@ -337,12 +358,13 @@ def set_properties(mdl):
     mdl.obj.qfmdl.effects = parse_flags(mdl.flags)
     mdl.obj.qfmdl.script = mdl.text.name #FIXME really want the text object
     mdl.obj.qfmdl.md16 = (mdl.ident == "MD16")
+'''
 
-def import_mdl(operator, context, filepath):
-    bpy.context.user_preferences.edit.use_global_undo = False
+def import_mdl(operator, context, filepath, **opts):
+    bpy.context.preferences.edit.use_global_undo = False
 
-    for obj in bpy.context.scene.objects:
-        obj.select = False
+    for obj in bpy.context.scene.collection.objects:
+        obj.select_set(False)
 
     mdl = MDL()
     if not mdl.read(filepath):
@@ -354,18 +376,19 @@ def import_mdl(operator, context, filepath):
     mdl.mesh = bpy.data.meshes.new(mdl.name)
     mdl.mesh.from_pydata(verts, [], faces)
     mdl.obj = bpy.data.objects.new(mdl.name, mdl.mesh)
-    bpy.context.scene.objects.link(mdl.obj)
-    bpy.context.scene.objects.active = mdl.obj
-    mdl.obj.select = True
+
+    bpy.context.scene.collection.objects.link(mdl.obj)
+    mdl.obj.select_set(True)
+    bpy.context.view_layer.objects.active = mdl.obj
     setup_skins(mdl, uvs)
     if len(mdl.frames) > 1 or mdl.frames[0].type:
         build_shape_keys(mdl)
         merge_frames(mdl)
         build_actions(mdl)
     write_text(mdl)
-    set_properties(mdl)
+    #set_properties(mdl) #TODO: bring it back
 
     mdl.mesh.update()
 
-    bpy.context.user_preferences.edit.use_global_undo = True
+    bpy.context.preferences.edit.use_global_undo = True
     return {'FINISHED'}

From 66fe862a8736c171df7562110ab231b7f4c249e4 Mon Sep 17 00:00:00 2001
From: khreathor <khreathor@khreathor.xyz>
Date: Tue, 8 Jan 2019 03:55:13 +0100
Subject: [PATCH 0318/1519] Import skingroups as separate materials with skins
 as textures

---
 tools/io_mesh_qfmdl/import_mdl.py | 66 +++++++++++++++++++------------
 1 file changed, 40 insertions(+), 26 deletions(-)

diff --git a/tools/io_mesh_qfmdl/import_mdl.py b/tools/io_mesh_qfmdl/import_mdl.py
index c3e64b3c0..7b67d6d09 100644
--- a/tools/io_mesh_qfmdl/import_mdl.py
+++ b/tools/io_mesh_qfmdl/import_mdl.py
@@ -98,6 +98,16 @@ def load_skins(mdl):
         else:
             load_skin(skin, "%s_%d" % (mdl.name, i))
 
+def setup_main_material(mdl):
+    mat = bpy.data.materials.new(mdl.name)
+    mat.blend_method = 'OPAQUE'
+    mat.diffuse_color = (1, 1, 1)
+    mat.metallic = 1
+    mat.roughness = 1
+    mat.specular_intensity = 0
+    mat.use_nodes = True
+    return mat
+
 def setup_skins(mdl, uvs):
     load_skins(mdl)
 #    img = mdl.images[0]   # use the first skin for now
@@ -112,36 +122,40 @@ def setup_skins(mdl, uvs):
         for j,k in enumerate(poly.loop_indices):
             uvloop.data[k].uv = mdl_uv[j]
 
-    # Create main material
-    mat = bpy.data.materials.new(mdl.name)
-    mat.blend_method = 'OPAQUE'
-    mat.diffuse_color = (1,1,1)
-    mat.metallic = 1
-    mat.roughness = 1
-    mat.specular_intensity = 0
-    mat.use_nodes = True
+    #Load all skins
+    for i, skin in enumerate(mdl.skins):
+        if skin.type:
+            mat = setup_main_material(mdl)
+            emissionNode = mat.node_tree.nodes.new("ShaderNodeEmission")
+            shaderOut = mat.node_tree.nodes["Material Output"]
+            mat.node_tree.nodes.remove(mat.node_tree.nodes["Principled BSDF"])
 
-    # TODO: turn transform to True and position it properly in editor
-    emissionNode = mat.node_tree.nodes.new("ShaderNodeEmission")
-    shaderOut = mat.node_tree.nodes["Material Output"]
-    bdsf_node = mat.node_tree.nodes["Principled BSDF"]
-    mat.node_tree.nodes.remove(bdsf_node)
+            for j, subskin in enumerate(skin.skins):
+                tex_node = mat.node_tree.nodes.new("ShaderNodeTexImage")
+                tex_node.image = mdl.images[i + j]
+                tex_node.interpolation = "Closest"
+                if j == 0:
+                    # connect only first texture (we'll need something smarter in the future)
+                    mat.node_tree.links.new(tex_node.outputs[0], emissionNode.inputs[0])
 
-    #Add skingroup
-    #bpy.ops.object.material_slot_add()
-    #bpy.ops.material.new()
+            mat.node_tree.links.new(emissionNode.outputs[0], shaderOut.inputs[0])
+            mdl.mesh.materials.append(mat)
+
+        else:
+            mat = setup_main_material(mdl)
+
+            # TODO: turn transform to True and position it properly in editor
+            emissionNode = mat.node_tree.nodes.new("ShaderNodeEmission")
+            shaderOut = mat.node_tree.nodes["Material Output"]
+            mat.node_tree.nodes.remove(mat.node_tree.nodes["Principled BSDF"])
+
+            tex_node = mat.node_tree.nodes.new("ShaderNodeTexImage")
+            tex_node.image = mdl.images[i]
+            tex_node.interpolation = "Closest"
 
-    #Add all existing textures to shader node
-    for i in range(len(mdl.images)):
-        tex_node = mat.node_tree.nodes.new("ShaderNodeTexImage")
-        tex_node.image = mdl.images[i]
-        tex_node.interpolation = "Closest"
-        if i == 0:
-            # connect only first texture (we'll need something smarter in the future)
             mat.node_tree.links.new(tex_node.outputs[0], emissionNode.inputs[0])
-
-    mat.node_tree.links.new(emissionNode.outputs[0], shaderOut.inputs[0])
-    mdl.mesh.materials.append(mat)
+            mat.node_tree.links.new(emissionNode.outputs[0], shaderOut.inputs[0])
+            mdl.mesh.materials.append(mat)
 
 def make_shape_key(mdl, framenum, subframenum=0):
     frame = mdl.frames[framenum]

From 17e76149a13329e4d8e0200679006a80f587a1f7 Mon Sep 17 00:00:00 2001
From: khreathor <khreathor@khreathor.xyz>
Date: Wed, 9 Jan 2019 02:04:05 +0100
Subject: [PATCH 0319/1519] Adjust playback range on import, to fit mdl's
 animation length

---
 tools/io_mesh_qfmdl/export_mdl.py | 1 -
 tools/io_mesh_qfmdl/import_mdl.py | 6 ++++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/tools/io_mesh_qfmdl/export_mdl.py b/tools/io_mesh_qfmdl/export_mdl.py
index 0344c4561..5e9ea43e0 100644
--- a/tools/io_mesh_qfmdl/export_mdl.py
+++ b/tools/io_mesh_qfmdl/export_mdl.py
@@ -346,7 +346,6 @@ def export_mdl(
     if not mdl.skins:
         make_skin(operator, mdl, mesh)
     if not mdl.frames:
-        curframe = context.scene.frame_current
         for fno in range(context.scene.frame_start, context.scene.frame_end + 1):
             context.scene.frame_set(fno)
             mesh = obj.to_mesh(context.depsgraph, True, calc_undeformed=False) #wysiwyg?
diff --git a/tools/io_mesh_qfmdl/import_mdl.py b/tools/io_mesh_qfmdl/import_mdl.py
index 7b67d6d09..15e1cf063 100644
--- a/tools/io_mesh_qfmdl/import_mdl.py
+++ b/tools/io_mesh_qfmdl/import_mdl.py
@@ -184,13 +184,16 @@ def build_shape_keys(mdl):
     mdl.obj.shape_key_add(name="Basis",from_mix=False)
     mdl.mesh.shape_keys.name = mdl.name
     mdl.obj.active_shape_key_index = 0
+    bpy.context.scene.frame_end = 0
     for i, frame in enumerate(mdl.frames):
         frame = mdl.frames[i]
         if frame.type:
             for j in range(len(frame.frames)):
                 make_shape_key(mdl, i, j)
+                bpy.context.scene.frame_end += 1
         else:
             make_shape_key(mdl, i)
+            bpy.context.scene.frame_end += 1
 
 def set_keys(act, data):
     for d in data:
@@ -395,6 +398,9 @@ def import_mdl(operator, context, filepath, **opts):
     mdl.obj.select_set(True)
     bpy.context.view_layer.objects.active = mdl.obj
     setup_skins(mdl, uvs)
+
+    bpy.context.scene.frame_start = 1
+    bpy.context.scene.frame_end = 1
     if len(mdl.frames) > 1 or mdl.frames[0].type:
         build_shape_keys(mdl)
         merge_frames(mdl)

From 4d1f05186b995414169bc8515ca86eef648f9d91 Mon Sep 17 00:00:00 2001
From: khreathor <khreathor@khreathor.xyz>
Date: Thu, 10 Jan 2019 04:56:21 +0100
Subject: [PATCH 0320/1519] Skingroups export added

---
 tools/io_mesh_qfmdl/export_mdl.py | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/tools/io_mesh_qfmdl/export_mdl.py b/tools/io_mesh_qfmdl/export_mdl.py
index 5e9ea43e0..baf97e72c 100644
--- a/tools/io_mesh_qfmdl/export_mdl.py
+++ b/tools/io_mesh_qfmdl/export_mdl.py
@@ -96,15 +96,30 @@ def make_skin(operator, mdl, mesh):
     mdl.skinwidth, mdl.skinheight = (4, 4)
     skin = null_skin((mdl.skinwidth, mdl.skinheight))
 
-    mat = bpy.context.object.data.materials[0]
-    allNodes = mat.node_tree.nodes
+    materials = bpy.context.object.data.materials
 
-    for node in allNodes:
-        if node.type == "TEX_IMAGE":
-            image = node.image
-            mdl.skinwidth, mdl.skinheight = image.size
-            skin = convert_image(image)
-            mdl.skins.append(skin)
+    for mat in materials:
+        allNodes = mat.node_tree.nodes
+        if len(allNodes) > 1:
+            skingroup = MDL.Skin()
+            skingroup.type = 1
+            skingroup.skins = []
+            skingroup.times = []
+            for node in allNodes:
+                if node.type == "TEX_IMAGE":
+                    image = node.image
+                    mdl.skinwidth, mdl.skinheight = image.size
+                    skin = convert_image(image)
+                    skingroup.skins.append(skin)
+                    skingroup.times.append(0.1)  # hardcoded at the moment
+            mdl.skins.append(skingroup)
+        else:
+            for node in allNodes:
+                if node.type == "TEX_IMAGE":
+                    image = node.image
+                    mdl.skinwidth, mdl.skinheight = image.size
+                    skin = convert_image(image)
+                    mdl.skins.append(skin)
 
     '''
     if (uvt and uvt.data and uvt.data[0].image):

From a13c382969691adcd5ec8d15183b9cf5e580f70f Mon Sep 17 00:00:00 2001
From: khreathor <khreathor@khreathor.xyz>
Date: Thu, 10 Jan 2019 05:40:56 +0100
Subject: [PATCH 0321/1519] Skingroup images import order fix

---
 tools/io_mesh_qfmdl/import_mdl.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tools/io_mesh_qfmdl/import_mdl.py b/tools/io_mesh_qfmdl/import_mdl.py
index 15e1cf063..28ac24762 100644
--- a/tools/io_mesh_qfmdl/import_mdl.py
+++ b/tools/io_mesh_qfmdl/import_mdl.py
@@ -123,6 +123,7 @@ def setup_skins(mdl, uvs):
             uvloop.data[k].uv = mdl_uv[j]
 
     #Load all skins
+    img_counter = 0
     for i, skin in enumerate(mdl.skins):
         if skin.type:
             mat = setup_main_material(mdl)
@@ -132,7 +133,8 @@ def setup_skins(mdl, uvs):
 
             for j, subskin in enumerate(skin.skins):
                 tex_node = mat.node_tree.nodes.new("ShaderNodeTexImage")
-                tex_node.image = mdl.images[i + j]
+                tex_node.image = mdl.images[img_counter]
+                img_counter += 1
                 tex_node.interpolation = "Closest"
                 if j == 0:
                     # connect only first texture (we'll need something smarter in the future)
@@ -150,7 +152,8 @@ def setup_skins(mdl, uvs):
             mat.node_tree.nodes.remove(mat.node_tree.nodes["Principled BSDF"])
 
             tex_node = mat.node_tree.nodes.new("ShaderNodeTexImage")
-            tex_node.image = mdl.images[i]
+            tex_node.image = mdl.images[img_counter]
+            img_counter += 1
             tex_node.interpolation = "Closest"
 
             mat.node_tree.links.new(tex_node.outputs[0], emissionNode.inputs[0])

From 4f29f57e77a503fefb8b7d16fb4ba9691f18f9cd Mon Sep 17 00:00:00 2001
From: khreathor <khreathor@khreathor.xyz>
Date: Thu, 10 Jan 2019 20:56:40 +0100
Subject: [PATCH 0322/1519] Proper node positioning after import

---
 tools/io_mesh_qfmdl/import_mdl.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/tools/io_mesh_qfmdl/import_mdl.py b/tools/io_mesh_qfmdl/import_mdl.py
index 28ac24762..272f8de1b 100644
--- a/tools/io_mesh_qfmdl/import_mdl.py
+++ b/tools/io_mesh_qfmdl/import_mdl.py
@@ -131,11 +131,20 @@ def setup_skins(mdl, uvs):
             shaderOut = mat.node_tree.nodes["Material Output"]
             mat.node_tree.nodes.remove(mat.node_tree.nodes["Principled BSDF"])
 
+            emissionNode.location = (0, 0)
+            shaderOut.location = (200, 0)
+
+            yPos = 0
+
             for j, subskin in enumerate(skin.skins):
                 tex_node = mat.node_tree.nodes.new("ShaderNodeTexImage")
                 tex_node.image = mdl.images[img_counter]
                 img_counter += 1
                 tex_node.interpolation = "Closest"
+
+                tex_node.location = (-300, yPos)
+                yPos -= 280
+
                 if j == 0:
                     # connect only first texture (we'll need something smarter in the future)
                     mat.node_tree.links.new(tex_node.outputs[0], emissionNode.inputs[0])
@@ -156,6 +165,10 @@ def setup_skins(mdl, uvs):
             img_counter += 1
             tex_node.interpolation = "Closest"
 
+            emissionNode.location = (0, 0)
+            shaderOut.location = (200, 0)
+            tex_node.location = (-300, 0)
+
             mat.node_tree.links.new(tex_node.outputs[0], emissionNode.inputs[0])
             mat.node_tree.links.new(emissionNode.outputs[0], shaderOut.inputs[0])
             mdl.mesh.materials.append(mat)

From 94c3c8c2cb2cb71f0a4204aa50e7587310021733 Mon Sep 17 00:00:00 2001
From: khreathor <khreathor@khreathor.xyz>
Date: Fri, 11 Jan 2019 01:40:05 +0100
Subject: [PATCH 0323/1519] Skingroup image export order based on texture node
 position (height) in shader editor. Nodes with higher position are exported
 first.

---
 tools/io_mesh_qfmdl/export_mdl.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/io_mesh_qfmdl/export_mdl.py b/tools/io_mesh_qfmdl/export_mdl.py
index baf97e72c..25eca68fa 100644
--- a/tools/io_mesh_qfmdl/export_mdl.py
+++ b/tools/io_mesh_qfmdl/export_mdl.py
@@ -105,7 +105,9 @@ def make_skin(operator, mdl, mesh):
             skingroup.type = 1
             skingroup.skins = []
             skingroup.times = []
-            for node in allNodes:
+            sortedNodes = list(allNodes)
+            sortedNodes.sort(key=lambda x: x.location[1], reverse=True)
+            for node in sortedNodes:
                 if node.type == "TEX_IMAGE":
                     image = node.image
                     mdl.skinwidth, mdl.skinheight = image.size

From 31fa7a81efb24c7631c207fb628f0102c054fbf8 Mon Sep 17 00:00:00 2001
From: khreathor <khreathor@khreathor.xyz>
Date: Wed, 16 Jan 2019 03:08:48 +0100
Subject: [PATCH 0324/1519] Fix for single skin being marked as skingroup

---
 tools/io_mesh_qfmdl/export_mdl.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/io_mesh_qfmdl/export_mdl.py b/tools/io_mesh_qfmdl/export_mdl.py
index 25eca68fa..9dcdd8577 100644
--- a/tools/io_mesh_qfmdl/export_mdl.py
+++ b/tools/io_mesh_qfmdl/export_mdl.py
@@ -99,7 +99,7 @@ def make_skin(operator, mdl, mesh):
     materials = bpy.context.object.data.materials
 
     for mat in materials:
-        allNodes = mat.node_tree.nodes
+        allNodes = list(filter(lambda node: node.type == "TEX_IMAGE", mat.node_tree.nodes))
         if len(allNodes) > 1:
             skingroup = MDL.Skin()
             skingroup.type = 1

From 3913febacee35c47c21ffc7c7bf2007d5e97dd4a Mon Sep 17 00:00:00 2001
From: khreathor <khreathor@khreathor.xyz>
Date: Wed, 16 Jan 2019 05:15:37 +0100
Subject: [PATCH 0325/1519] MDL properties in object panel are back

---
 tools/io_mesh_qfmdl/__init__.py   | 78 +++++++++++++++++--------------
 tools/io_mesh_qfmdl/import_mdl.py |  6 +--
 2 files changed, 44 insertions(+), 40 deletions(-)

diff --git a/tools/io_mesh_qfmdl/__init__.py b/tools/io_mesh_qfmdl/__init__.py
index 1f4a682c6..6ea6b2ea6 100644
--- a/tools/io_mesh_qfmdl/__init__.py
+++ b/tools/io_mesh_qfmdl/__init__.py
@@ -64,35 +64,28 @@ EFFECTS=(
     ('EF_TRACER2', "Tracer 2", "Orange split trail + rotate"),
     ('EF_TRACER3', "Tracer 3", "Purple split trail"),
 )
-'''
- class QFMDLSettings(bpy.types.PropertyGroup):
-#     eyeposition = FloatVectorProperty(
-#         name="Eye Position",
-#         description="View possion relative to object origin")
-#     synctype = EnumProperty(
-#         items=SYNCTYPE,
-#         name="Sync Type",
-#         description="Add random time offset for automatic animations")
-#     rotate = BoolProperty(
-#         name="Rotate",
-#         description="Rotate automatically (for pickup items)")
-#     effects = EnumProperty(
-#         items=EFFECTS,
-#         name="Effects",
-#         description="Particle trail effects")
-#     #doesn't work :(
-#     #script = PointerProperty(
-#     #    type=bpy.types.Object,
-#     #    name="Script",
-#     #    description="Script for animating frames and skins")
 
-#     xform = BoolProperty(
-#         name="Auto transform",
-#         description="Auto-apply location/rotation/scale when exporting",
-#         default=True)
-#     md16 = BoolProperty(
-#         name="16-bit",
-#         description="16 bit vertex coordinates: QuakeForge only")
+class QFMDLSettings(bpy.types.PropertyGroup):
+    eyeposition = FloatVectorProperty(
+        name="Eye Position",
+        description="View possion relative to object origin")
+    synctype = EnumProperty(
+        items=SYNCTYPE,
+        name="Sync Type",
+        description="Add random time offset for automatic animations")
+    rotate = BoolProperty(
+        name="Rotate",
+        description="Rotate automatically (for pickup items)")
+    effects = EnumProperty(
+        items=EFFECTS,
+        name="Effects",
+        description="Particle trail effects")
+
+    #doesn't work :(
+    #script = PointerProperty(
+    #    type=bpy.types.Object,
+    #    name="Script",
+    #    description="Script for animating frames and skins")
 
     xform = BoolProperty(
         name="Auto transform",
@@ -101,10 +94,16 @@ EFFECTS=(
     md16 = BoolProperty(
         name="16-bit",
         description="16 bit vertex coordinates: QuakeForge only")
-    script = StringProperty(
-        name="Script",
-       description="Script for animating frames and skins")
-'''
+    xform = BoolProperty(
+        name="Auto transform",
+        description="Auto-apply location/rotation/scale when exporting",
+        default=True)
+    md16 = BoolProperty(
+        name="16-bit",
+        description="16 bit vertex coordinates: QuakeForge only")
+    #script = StringProperty(
+    #    name="Script",
+    #    description="Script for animating frames and skins")
 
 class ImportMDL6(bpy.types.Operator, ImportHelper):
     '''Load a Quake MDL (v6) File'''
@@ -162,18 +161,23 @@ class ExportMDL6(bpy.types.Operator, ExportHelper):
         keywords = self.as_keywords (ignore=("check_existing", "filter_glob"))
         return export_mdl.export_mdl(self, context, **keywords)
 
-'''
 class OBJECT_PT_MDLPanel(bpy.types.Panel):
+    bl_label = "MDL Properties"
     bl_space_type = 'PROPERTIES'
     bl_region_type = 'WINDOW'
     bl_context = 'object'
-    bl_label = 'QF MDL'
+    bl_options = {'DEFAULT_CLOSED'}
 
     @classmethod
     def poll(cls, context):
         obj = context.active_object
         return obj and obj.type == 'MESH'
 
+    def draw_header(self, context):
+        layout = self.layout
+        obj = context.object
+        layout.prop(obj, "select", text="")
+
     def draw(self, context):
         layout = self.layout
         obj = context.active_object
@@ -184,7 +188,6 @@ class OBJECT_PT_MDLPanel(bpy.types.Panel):
         layout.prop(obj.qfmdl, "script")
         layout.prop(obj.qfmdl, "xform")
         layout.prop(obj.qfmdl, "md16")
-'''
 
 def menu_func_import(self, context):
     self.layout.operator(ImportMDL6.bl_idname, text="Quake MDL (.mdl)")
@@ -194,7 +197,8 @@ def menu_func_export(self, context):
     self.layout.operator(ExportMDL6.bl_idname, text="Quake MDL (.mdl)")
 
 classes = (
-    #OBJECT_PT_MDLPanel,
+    QFMDLSettings,
+    OBJECT_PT_MDLPanel,
     ImportMDL6,
     ExportMDL6
 )
@@ -203,6 +207,8 @@ def register():
     for cls in classes:
         bpy.utils.register_class(cls)
 
+    bpy.types.Object.qfmdl = PointerProperty(type=QFMDLSettings)
+
     bpy.types.TOPBAR_MT_file_import.append(menu_func_import)
     bpy.types.TOPBAR_MT_file_export.append(menu_func_export)
 
diff --git a/tools/io_mesh_qfmdl/import_mdl.py b/tools/io_mesh_qfmdl/import_mdl.py
index 272f8de1b..545d1873d 100644
--- a/tools/io_mesh_qfmdl/import_mdl.py
+++ b/tools/io_mesh_qfmdl/import_mdl.py
@@ -380,7 +380,6 @@ def parse_flags(flags):
     else:
         return 'EF_NONE'
 
-'''
 def set_properties(mdl):
     mdl.obj.qfmdl.eyeposition = mdl.eyeposition
     try:
@@ -389,9 +388,8 @@ def set_properties(mdl):
         mdl.obj.qfmdl.synctype = 'ST_SYNC'
     mdl.obj.qfmdl.rotate = (mdl.flags & MDL.EF_ROTATE) and True or False
     mdl.obj.qfmdl.effects = parse_flags(mdl.flags)
-    mdl.obj.qfmdl.script = mdl.text.name #FIXME really want the text object
+    #mdl.obj.qfmdl.script = mdl.text.name #FIXME really want the text object
     mdl.obj.qfmdl.md16 = (mdl.ident == "MD16")
-'''
 
 def import_mdl(operator, context, filepath, **opts):
     bpy.context.preferences.edit.use_global_undo = False
@@ -422,7 +420,7 @@ def import_mdl(operator, context, filepath, **opts):
         merge_frames(mdl)
         build_actions(mdl)
     write_text(mdl)
-    #set_properties(mdl) #TODO: bring it back
+    set_properties(mdl)
 
     mdl.mesh.update()
 

From ff5f9f18316b22faba91bb2d107fb4aa5200f68c Mon Sep 17 00:00:00 2001
From: khreathor <khreathor@khreathor.xyz>
Date: Wed, 16 Jan 2019 21:40:34 +0100
Subject: [PATCH 0326/1519] Add "empty" skin during export for models with no
 materials or texture nodes

---
 tools/io_mesh_qfmdl/export_mdl.py | 53 +++++++++++++++++--------------
 1 file changed, 29 insertions(+), 24 deletions(-)

diff --git a/tools/io_mesh_qfmdl/export_mdl.py b/tools/io_mesh_qfmdl/export_mdl.py
index 9dcdd8577..d68c7a6cd 100644
--- a/tools/io_mesh_qfmdl/export_mdl.py
+++ b/tools/io_mesh_qfmdl/export_mdl.py
@@ -98,30 +98,35 @@ def make_skin(operator, mdl, mesh):
 
     materials = bpy.context.object.data.materials
 
-    for mat in materials:
-        allNodes = list(filter(lambda node: node.type == "TEX_IMAGE", mat.node_tree.nodes))
-        if len(allNodes) > 1:
-            skingroup = MDL.Skin()
-            skingroup.type = 1
-            skingroup.skins = []
-            skingroup.times = []
-            sortedNodes = list(allNodes)
-            sortedNodes.sort(key=lambda x: x.location[1], reverse=True)
-            for node in sortedNodes:
-                if node.type == "TEX_IMAGE":
-                    image = node.image
-                    mdl.skinwidth, mdl.skinheight = image.size
-                    skin = convert_image(image)
-                    skingroup.skins.append(skin)
-                    skingroup.times.append(0.1)  # hardcoded at the moment
-            mdl.skins.append(skingroup)
-        else:
-            for node in allNodes:
-                if node.type == "TEX_IMAGE":
-                    image = node.image
-                    mdl.skinwidth, mdl.skinheight = image.size
-                    skin = convert_image(image)
-                    mdl.skins.append(skin)
+    if len(materials) > 0:
+        for mat in materials:
+            allTextureNodes = list(filter(lambda node: node.type == "TEX_IMAGE", mat.node_tree.nodes))
+            if len(allTextureNodes) > 1:                            #=== skingroup
+                skingroup = MDL.Skin()
+                skingroup.type = 1
+                skingroup.skins = []
+                skingroup.times = []
+                sortedNodes = list(allTextureNodes)
+                sortedNodes.sort(key=lambda x: x.location[1], reverse=True)
+                for node in sortedNodes:
+                    if node.type == "TEX_IMAGE":
+                        image = node.image
+                        mdl.skinwidth, mdl.skinheight = image.size
+                        skin = convert_image(image)
+                        skingroup.skins.append(skin)
+                        skingroup.times.append(0.1)                 # hardcoded at the moment
+                mdl.skins.append(skingroup)
+            elif len(allTextureNodes) == 1:                         #=== single skin
+                for node in allTextureNodes:
+                    if node.type == "TEX_IMAGE":
+                        image = node.image
+                        mdl.skinwidth, mdl.skinheight = image.size
+                        skin = convert_image(image)
+                        mdl.skins.append(skin)
+            else:
+                mdl.skins.append(skin)                              # add empty skin - no texture nodes
+    else:
+        mdl.skins.append(skin)                                      # add empty skin - no materials
 
     '''
     if (uvt and uvt.data and uvt.data[0].image):

From 33d114c09e358f7c0bbc304a525ef0e60e408f06 Mon Sep 17 00:00:00 2001
From: khreathor <khreathor@khreathor.xyz>
Date: Thu, 17 Jan 2019 22:34:45 +0100
Subject: [PATCH 0327/1519] Set playback/animation range to start from frame 1

---
 tools/io_mesh_qfmdl/import_mdl.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/io_mesh_qfmdl/import_mdl.py b/tools/io_mesh_qfmdl/import_mdl.py
index 545d1873d..1eb057b68 100644
--- a/tools/io_mesh_qfmdl/import_mdl.py
+++ b/tools/io_mesh_qfmdl/import_mdl.py
@@ -211,6 +211,8 @@ def build_shape_keys(mdl):
             make_shape_key(mdl, i)
             bpy.context.scene.frame_end += 1
 
+    bpy.context.scene.frame_start = 1
+
 def set_keys(act, data):
     for d in data:
         key, co = d

From 36da80c0d0b7891c9c639772ce9eaeac1d8a7132 Mon Sep 17 00:00:00 2001
From: khreathor <khreathor@khreathor.xyz>
Date: Fri, 18 Jan 2019 03:16:16 +0100
Subject: [PATCH 0328/1519] Export proper frame names

---
 tools/io_mesh_qfmdl/export_mdl.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/tools/io_mesh_qfmdl/export_mdl.py b/tools/io_mesh_qfmdl/export_mdl.py
index d68c7a6cd..f9aa5ac2b 100644
--- a/tools/io_mesh_qfmdl/export_mdl.py
+++ b/tools/io_mesh_qfmdl/export_mdl.py
@@ -189,8 +189,14 @@ def convert_stverts(mdl, stverts):
         t = ((t % mdl.skinheight) + mdl.skinheight) % mdl.skinheight
         stverts[i] = MDL.STVert((s, t))
 
-def make_frame(mesh, vertmap):
+def make_frame(mesh, vertmap, idx):
     frame = MDL.Frame()
+    frame.name = "frame" + str(idx)
+
+    shape_keys_amount = len(bpy.context.object.data.shape_keys.key_blocks)
+    if shape_keys_amount > idx:
+        frame.name = bpy.context.object.data.shape_keys.key_blocks[idx].name
+
     for v in vertmap:
         mv = mesh.vertices[v]
         vert = MDL.Vert(tuple(mv.co), map_normal(mv.normal))
@@ -373,7 +379,7 @@ def export_mdl(
             mesh = obj.to_mesh(context.depsgraph, True, calc_undeformed=False) #wysiwyg?
             if xform:
                 mesh.transform(mdl.obj.matrix_world)
-            mdl.frames.append(make_frame(mesh, vertmap))
+            mdl.frames.append(make_frame(mesh, vertmap, fno))
     convert_stverts(mdl, mdl.stverts)
     mdl.size = calc_average_area(mdl)
     scale_verts(mdl)

From 11e5f39fdc7732e8f13fd6b861d798959af0bae9 Mon Sep 17 00:00:00 2001
From: khreathor <khreathor@khreathor.xyz>
Date: Sat, 19 Jan 2019 05:10:21 +0100
Subject: [PATCH 0329/1519] Fix for the export error when there is no Shape
 Keys available

---
 tools/io_mesh_qfmdl/export_mdl.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tools/io_mesh_qfmdl/export_mdl.py b/tools/io_mesh_qfmdl/export_mdl.py
index f9aa5ac2b..6b7237c4f 100644
--- a/tools/io_mesh_qfmdl/export_mdl.py
+++ b/tools/io_mesh_qfmdl/export_mdl.py
@@ -193,9 +193,10 @@ def make_frame(mesh, vertmap, idx):
     frame = MDL.Frame()
     frame.name = "frame" + str(idx)
 
-    shape_keys_amount = len(bpy.context.object.data.shape_keys.key_blocks)
-    if shape_keys_amount > idx:
-        frame.name = bpy.context.object.data.shape_keys.key_blocks[idx].name
+    if bpy.context.object.data.shape_keys:
+        shape_keys_amount = len(bpy.context.object.data.shape_keys.key_blocks)
+        if shape_keys_amount > idx:
+            frame.name = bpy.context.object.data.shape_keys.key_blocks[idx].name
 
     for v in vertmap:
         mv = mesh.vertices[v]

From 008b5a4d2c3e7113b2ac3ffd307e0e9a80326178 Mon Sep 17 00:00:00 2001
From: khreathor <khreathor@khreathor.xyz>
Date: Wed, 29 May 2019 02:08:37 +0200
Subject: [PATCH 0330/1519] Import/Export fixes after some Blender 2.8 API
 changes

---
 tools/io_mesh_qfmdl/export_mdl.py | 11 ++++++++---
 tools/io_mesh_qfmdl/import_mdl.py |  4 ++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/tools/io_mesh_qfmdl/export_mdl.py b/tools/io_mesh_qfmdl/export_mdl.py
index 6b7237c4f..8391baeb9 100644
--- a/tools/io_mesh_qfmdl/export_mdl.py
+++ b/tools/io_mesh_qfmdl/export_mdl.py
@@ -344,8 +344,10 @@ def export_mdl(
     ):
 
     obj = context.active_object
-    #mesh = obj.to_mesh(context.scene, True, 'PREVIEW') #wysiwyg?
-    mesh = obj.to_mesh(context.depsgraph, True, calc_undeformed=False)
+    obj.update_from_editmode()
+    depsgraph = context.evaluated_depsgraph_get()
+    ob_eval = obj.evaluated_get(depsgraph)
+    mesh = ob_eval.to_mesh()
     #if not check_faces(mesh):
     #    operator.report({'ERROR'},
     #                    "Mesh has faces with more than 3 vertices.")
@@ -377,7 +379,10 @@ def export_mdl(
     if not mdl.frames:
         for fno in range(context.scene.frame_start, context.scene.frame_end + 1):
             context.scene.frame_set(fno)
-            mesh = obj.to_mesh(context.depsgraph, True, calc_undeformed=False) #wysiwyg?
+            obj.update_from_editmode()
+            depsgraph = context.evaluated_depsgraph_get()
+            ob_eval = obj.evaluated_get(depsgraph)
+            mesh = ob_eval.to_mesh()
             if xform:
                 mesh.transform(mdl.obj.matrix_world)
             mdl.frames.append(make_frame(mesh, vertmap, fno))
diff --git a/tools/io_mesh_qfmdl/import_mdl.py b/tools/io_mesh_qfmdl/import_mdl.py
index 1eb057b68..adfa8f610 100644
--- a/tools/io_mesh_qfmdl/import_mdl.py
+++ b/tools/io_mesh_qfmdl/import_mdl.py
@@ -87,7 +87,7 @@ def load_skins(mdl):
                 p[l + 2] = c[2] / 255.0
                 p[l + 3] = 1.0
         img.pixels[:] = p[:]
-        img.pack(as_png=True)
+        img.pack()
         img.use_fake_user = True
 
     mdl.images=[]
@@ -101,7 +101,7 @@ def load_skins(mdl):
 def setup_main_material(mdl):
     mat = bpy.data.materials.new(mdl.name)
     mat.blend_method = 'OPAQUE'
-    mat.diffuse_color = (1, 1, 1)
+    mat.diffuse_color = (1, 1, 1, 1)
     mat.metallic = 1
     mat.roughness = 1
     mat.specular_intensity = 0

From 839d90981d851d984ad2f80f4231ccbfb087985a Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 16 Aug 2019 22:32:37 +0900
Subject: [PATCH 0331/1519] Clean up a few last things for blender 2.80

Many many thanks to Aleksander Marhall for the initial work.
---
 tools/io_mesh_qfmdl/__init__.py   | 33 +++++++++++++------------------
 tools/io_mesh_qfmdl/export_mdl.py |  8 ++++----
 2 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/tools/io_mesh_qfmdl/__init__.py b/tools/io_mesh_qfmdl/__init__.py
index 6ea6b2ea6..fd1520346 100644
--- a/tools/io_mesh_qfmdl/__init__.py
+++ b/tools/io_mesh_qfmdl/__init__.py
@@ -66,17 +66,17 @@ EFFECTS=(
 )
 
 class QFMDLSettings(bpy.types.PropertyGroup):
-    eyeposition = FloatVectorProperty(
+    eyeposition : FloatVectorProperty(
         name="Eye Position",
         description="View possion relative to object origin")
-    synctype = EnumProperty(
+    synctype : EnumProperty(
         items=SYNCTYPE,
         name="Sync Type",
         description="Add random time offset for automatic animations")
-    rotate = BoolProperty(
+    rotate : BoolProperty(
         name="Rotate",
         description="Rotate automatically (for pickup items)")
-    effects = EnumProperty(
+    effects : EnumProperty(
         items=EFFECTS,
         name="Effects",
         description="Particle trail effects")
@@ -87,11 +87,11 @@ class QFMDLSettings(bpy.types.PropertyGroup):
     #    name="Script",
     #    description="Script for animating frames and skins")
 
-    xform = BoolProperty(
+    xform : BoolProperty(
         name="Auto transform",
         description="Auto-apply location/rotation/scale when exporting",
         default=True)
-    md16 = BoolProperty(
+    md16 : BoolProperty(
         name="16-bit",
         description="16 bit vertex coordinates: QuakeForge only")
     xform = BoolProperty(
@@ -111,7 +111,7 @@ class ImportMDL6(bpy.types.Operator, ImportHelper):
     bl_label = "Import MDL"
 
     filename_ext = ".mdl"
-    filter_glob = StringProperty(default="*.mdl", options={'HIDDEN'})
+    filter_glob : StringProperty(default="*.mdl", options={'HIDDEN'})
 
     def execute(self, context):
         from . import import_mdl
@@ -126,28 +126,28 @@ class ExportMDL6(bpy.types.Operator, ExportHelper):
     bl_options = {'PRESET'};
 
     filename_ext = ".mdl"
-    filter_glob = StringProperty(default="*.mdl", options={'HIDDEN'})
+    filter_glob : StringProperty(default="*.mdl", options={'HIDDEN'})
 
-    eyeposition = FloatVectorProperty(
+    eyeposition : FloatVectorProperty(
         name="Eye Position",
         description="View possion relative to object origin")
-    synctype = EnumProperty(
+    synctype : EnumProperty(
         items=SYNCTYPE,
         name="Sync Type",
         description="Add random time offset for automatic animations")
-    rotate = BoolProperty(
+    rotate : BoolProperty(
         name="Rotate",
         description="Rotate automatically (for pickup items)",
         default=False)
-    effects = EnumProperty(
+    effects : EnumProperty(
         items=EFFECTS,
         name="Effects",
         description="Particle trail effects")
-    xform = BoolProperty(
+    xform : BoolProperty(
         name="Auto transform",
         description="Auto-apply location/rotation/scale when exporting",
         default=True)
-    md16 = BoolProperty(
+    md16 : BoolProperty(
         name="16-bit",
         description="16 bit vertex coordinates: QuakeForge only")
 
@@ -173,11 +173,6 @@ class OBJECT_PT_MDLPanel(bpy.types.Panel):
         obj = context.active_object
         return obj and obj.type == 'MESH'
 
-    def draw_header(self, context):
-        layout = self.layout
-        obj = context.object
-        layout.prop(obj, "select", text="")
-
     def draw(self, context):
         layout = self.layout
         obj = context.active_object
diff --git a/tools/io_mesh_qfmdl/export_mdl.py b/tools/io_mesh_qfmdl/export_mdl.py
index 8391baeb9..39b7d8295 100644
--- a/tools/io_mesh_qfmdl/export_mdl.py
+++ b/tools/io_mesh_qfmdl/export_mdl.py
@@ -36,17 +36,17 @@ def check_faces(mesh):
     faces_ok = True
     save_select = []
     for f in mesh.polygons:
-        save_select.append(f.select)
-        f.select = False
+        save_select.append(f.select_get())
+        f.select_set('DESELECT')
         if len(f.vertices) > 3:
-            f.select = True
+            f.select_set('SELECT')
             faces_ok = False
     if not faces_ok:
         mesh.update()
         return False
     #reset selection to what it was before the check.
     for f, s in map(lambda x, y: (x, y), mesh.polygons, save_select):
-        f.select = s
+        f.select_set('SELECT' if s else 'DESELECT')
     mesh.update()
     return True
 

From c14e5623ad2ba0b8b27b179e6f0bcdd8b28105e6 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 16 Aug 2019 22:34:45 +0900
Subject: [PATCH 0332/1519] Get the mdl frames script property working

Maybe late 2.78+, blender added the ability to use any ID type in
PointerProperty, which is just what I wanted for the frames script.
---
 tools/io_mesh_qfmdl/__init__.py   | 12 ++++--------
 tools/io_mesh_qfmdl/export_mdl.py | 12 ++----------
 tools/io_mesh_qfmdl/import_mdl.py |  2 +-
 3 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/tools/io_mesh_qfmdl/__init__.py b/tools/io_mesh_qfmdl/__init__.py
index fd1520346..7a1c8afcb 100644
--- a/tools/io_mesh_qfmdl/__init__.py
+++ b/tools/io_mesh_qfmdl/__init__.py
@@ -81,11 +81,10 @@ class QFMDLSettings(bpy.types.PropertyGroup):
         name="Effects",
         description="Particle trail effects")
 
-    #doesn't work :(
-    #script = PointerProperty(
-    #    type=bpy.types.Object,
-    #    name="Script",
-    #    description="Script for animating frames and skins")
+    script : PointerProperty(
+        type=bpy.types.Text,
+        name="Script",
+        description="Script for animating frames and skins")
 
     xform : BoolProperty(
         name="Auto transform",
@@ -101,9 +100,6 @@ class QFMDLSettings(bpy.types.PropertyGroup):
     md16 = BoolProperty(
         name="16-bit",
         description="16 bit vertex coordinates: QuakeForge only")
-    #script = StringProperty(
-    #    name="Script",
-    #    description="Script for animating frames and skins")
 
 class ImportMDL6(bpy.types.Operator, ImportHelper):
     '''Load a Quake MDL (v6) File'''
diff --git a/tools/io_mesh_qfmdl/export_mdl.py b/tools/io_mesh_qfmdl/export_mdl.py
index 39b7d8295..c11529cba 100644
--- a/tools/io_mesh_qfmdl/export_mdl.py
+++ b/tools/io_mesh_qfmdl/export_mdl.py
@@ -245,18 +245,10 @@ def get_properties(
     if md16:
         mdl.ident = "MD16"
 
-    #tomporarily disabled
-    #script = obj.qfmdl.script
-    script = None
+    script = obj.qfmdl.script
     mdl.script = None
     if script:
-        try:
-            script = bpy.data.texts[script].as_string()
-        except KeyError:
-            operator.report({'ERROR'},
-                            "Script '%s' not found." % script)
-            return False
-        pl = pldata(script)
+        pl = pldata(script.as_string())
         try:
             mdl.script = pl.parse()
         except PListError as err:
diff --git a/tools/io_mesh_qfmdl/import_mdl.py b/tools/io_mesh_qfmdl/import_mdl.py
index adfa8f610..1f6a1a8c3 100644
--- a/tools/io_mesh_qfmdl/import_mdl.py
+++ b/tools/io_mesh_qfmdl/import_mdl.py
@@ -390,7 +390,7 @@ def set_properties(mdl):
         mdl.obj.qfmdl.synctype = 'ST_SYNC'
     mdl.obj.qfmdl.rotate = (mdl.flags & MDL.EF_ROTATE) and True or False
     mdl.obj.qfmdl.effects = parse_flags(mdl.flags)
-    #mdl.obj.qfmdl.script = mdl.text.name #FIXME really want the text object
+    mdl.obj.qfmdl.script = mdl.text
     mdl.obj.qfmdl.md16 = (mdl.ident == "MD16")
 
 def import_mdl(operator, context, filepath, **opts):

From 9d09d65d9a90e9e437c2747feaf96b631fce167b Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 20 Aug 2019 16:52:43 +0900
Subject: [PATCH 0333/1519] Clean up some export stuff

While it's not there yet, the eventual goal is to support multiple
models in the one blend file, so per-object settings is a requirement.
---
 tools/io_mesh_qfmdl/__init__.py   | 24 ----------
 tools/io_mesh_qfmdl/export_mdl.py | 77 +++++++++++--------------------
 tools/io_mesh_qfmdl/import_mdl.py |  4 +-
 3 files changed, 30 insertions(+), 75 deletions(-)

diff --git a/tools/io_mesh_qfmdl/__init__.py b/tools/io_mesh_qfmdl/__init__.py
index 7a1c8afcb..3d9be7b20 100644
--- a/tools/io_mesh_qfmdl/__init__.py
+++ b/tools/io_mesh_qfmdl/__init__.py
@@ -119,34 +119,10 @@ class ExportMDL6(bpy.types.Operator, ExportHelper):
 
     bl_idname = "export_mesh.quake_mdl_v6"
     bl_label = "Export MDL"
-    bl_options = {'PRESET'};
 
     filename_ext = ".mdl"
     filter_glob : StringProperty(default="*.mdl", options={'HIDDEN'})
 
-    eyeposition : FloatVectorProperty(
-        name="Eye Position",
-        description="View possion relative to object origin")
-    synctype : EnumProperty(
-        items=SYNCTYPE,
-        name="Sync Type",
-        description="Add random time offset for automatic animations")
-    rotate : BoolProperty(
-        name="Rotate",
-        description="Rotate automatically (for pickup items)",
-        default=False)
-    effects : EnumProperty(
-        items=EFFECTS,
-        name="Effects",
-        description="Particle trail effects")
-    xform : BoolProperty(
-        name="Auto transform",
-        description="Auto-apply location/rotation/scale when exporting",
-        default=True)
-    md16 : BoolProperty(
-        name="16-bit",
-        description="16 bit vertex coordinates: QuakeForge only")
-
     @classmethod
     def poll(cls, context):
         return (context.active_object != None
diff --git a/tools/io_mesh_qfmdl/export_mdl.py b/tools/io_mesh_qfmdl/export_mdl.py
index c11529cba..e82d08ca6 100644
--- a/tools/io_mesh_qfmdl/export_mdl.py
+++ b/tools/io_mesh_qfmdl/export_mdl.py
@@ -96,7 +96,7 @@ def make_skin(operator, mdl, mesh):
     mdl.skinwidth, mdl.skinheight = (4, 4)
     skin = null_skin((mdl.skinwidth, mdl.skinheight))
 
-    materials = bpy.context.object.data.materials
+    materials = mesh.materials
 
     if len(materials) > 0:
         for mat in materials:
@@ -189,15 +189,8 @@ def convert_stverts(mdl, stverts):
         t = ((t % mdl.skinheight) + mdl.skinheight) % mdl.skinheight
         stverts[i] = MDL.STVert((s, t))
 
-def make_frame(mesh, vertmap, idx):
+def make_frame(mesh, vertmap):
     frame = MDL.Frame()
-    frame.name = "frame" + str(idx)
-
-    if bpy.context.object.data.shape_keys:
-        shape_keys_amount = len(bpy.context.object.data.shape_keys.key_blocks)
-        if shape_keys_amount > idx:
-            frame.name = bpy.context.object.data.shape_keys.key_blocks[idx].name
-
     for v in vertmap:
         mv = mesh.vertices[v]
         vert = MDL.Vert(tuple(mv.co), map_normal(mv.normal))
@@ -229,20 +222,12 @@ def calc_average_area(mdl):
         totalarea += (c @ c) ** 0.5 / 2.0
     return totalarea / len(mdl.tris)
 
-def get_properties(
-            operator,
-            mdl,
-            eyeposition,
-            synctype,
-            rotate,
-            effects,
-            xform,
-            md16):
-    mdl.eyeposition = eyeposition
-    mdl.synctype = MDL.SYNCTYPE[synctype]
-    mdl.flags = ((rotate and MDL.EF_ROTATE or 0)
-                 | MDL.EFFECTS[effects])
-    if md16:
+def get_properties(operator, mdl, obj):
+    mdl.eyeposition = tuple(obj.qfmdl.eyeposition)
+    mdl.synctype = MDL.SYNCTYPE[obj.qfmdl.synctype]
+    mdl.flags = ((obj.qfmdl.rotate and MDL.EF_ROTATE or 0)
+                 | MDL.EFFECTS[obj.qfmdl.effects])
+    if obj.qfmdl.md16:
         mdl.ident = "MD16"
 
     script = obj.qfmdl.script
@@ -315,26 +300,24 @@ def process_frame(mdl, scene, frame, vertmap, ingroup = False,
             return fr
         mdl.frames += fr.frames[:-1]
         return fr.frames[-1]
-    scene.frame_set(int(frameno), frameno - int(frameno))
-    mesh = mdl.obj.to_mesh(scene, True, 'PREVIEW') #wysiwyg?
+    scene.frame_set(int(frameno), subframe = frameno - int(frameno))
+    depsgraph = bpy.context.evaluated_depsgraph_get()
+    mesh = mdl.obj.evaluated_get(depsgraph).to_mesh() #wysiwyg?
     if mdl.obj.qfmdl.xform:
         mesh.transform(mdl.obj.matrix_world)
     fr = make_frame(mesh, vertmap)
     fr.name = name
     return fr
 
-def export_mdl(
-    operator,
-    context,
-    filepath = "",
-    eyeposition = (0.0, 0.0, 0.0),
-    synctype = SYNCTYPE[1],
-    rotate = False,
-    effects = EFFECTS[1],
-    xform = True,
-    md16 = False
-    ):
+def get_frame_name(mesh, idx):
+    name = "frame" + str(idx)
+    if mesh.shape_keys:
+        shape_keys_amount = len(mesh.shape_keys.key_blocks)
+        if shape_keys_amount > idx:
+            name = mesh.shape_keys.key_blocks[idx].name
+    return name
 
+def export_mdl(operator, context, filepath):
     obj = context.active_object
     obj.update_from_editmode()
     depsgraph = context.evaluated_depsgraph_get()
@@ -346,16 +329,8 @@ def export_mdl(
     #    return {'CANCELLED'}
     mdl = MDL(obj.name)
     mdl.obj = obj
-    if not get_properties(
-            operator,
-            mdl,
-            eyeposition,
-            synctype,
-            rotate,
-            effects,
-            xform,
-            md16):
-                return {'CANCELLED'}
+    if not get_properties(operator, mdl, obj):
+        return {'CANCELLED'}
 
     mdl.tris, mdl.stverts, vertmap = build_tris(mesh)
     if mdl.script:
@@ -369,15 +344,19 @@ def export_mdl(
     if not mdl.skins:
         make_skin(operator, mdl, mesh)
     if not mdl.frames:
-        for fno in range(context.scene.frame_start, context.scene.frame_end + 1):
+        scene = context.scene
+        for fno in range(scene.frame_start, scene.frame_end + 1):
             context.scene.frame_set(fno)
             obj.update_from_editmode()
             depsgraph = context.evaluated_depsgraph_get()
             ob_eval = obj.evaluated_get(depsgraph)
             mesh = ob_eval.to_mesh()
-            if xform:
+            if obj.qfmdl.xform:
                 mesh.transform(mdl.obj.matrix_world)
-            mdl.frames.append(make_frame(mesh, vertmap, fno))
+            frame = make_frame(mesh, vertmap)
+            frame.name = get_frame_name(obj.data, fno)
+            mdl.frames.append(frame)
+
     convert_stverts(mdl, mdl.stverts)
     mdl.size = calc_average_area(mdl)
     scale_verts(mdl)
diff --git a/tools/io_mesh_qfmdl/import_mdl.py b/tools/io_mesh_qfmdl/import_mdl.py
index 1f6a1a8c3..d27ed45a1 100644
--- a/tools/io_mesh_qfmdl/import_mdl.py
+++ b/tools/io_mesh_qfmdl/import_mdl.py
@@ -296,8 +296,8 @@ def write_text(mdl):
     /*  This script represents the animation data within the model file. It
         is generated automatically on import, and is optional when exporting.
         If no script is used when exporting, frames will be exported one per
-        blender frame from frame 1 to the current frame (inclusive), and only
-        one skin will be exported.
+        blender frame from the scene start frame to the scene end frame
+        (inclusive), and one skin per teximage node will be exported.
 
         The fundamental format of the script is documented at
         http://quakeforge.net/doxygen/property-list.html

From 8819d26c95870b7d3b4e6d9018d8068a080e8d63 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 16 Oct 2019 20:57:39 +0900
Subject: [PATCH 0334/1519] Fix a compile error

not sure how that one got through
---
 libs/video/renderer/vid_render_vulkan.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libs/video/renderer/vid_render_vulkan.c b/libs/video/renderer/vid_render_vulkan.c
index 506406394..7fce05272 100644
--- a/libs/video/renderer/vid_render_vulkan.c
+++ b/libs/video/renderer/vid_render_vulkan.c
@@ -152,7 +152,8 @@ vulkan_vid_render_choose_visual (void)
 {
 	Vulkan_CreateDevice (vulkan_ctx);
 	vulkan_ctx->choose_visual (vulkan_ctx);
-	Sys_Printf ("%p %p\n", vulkan_ctx->device->dev, vulkan_ctx->device->queue);
+	Sys_Printf ("vk choose visual %p %p\n", vulkan_ctx->device->dev,
+				vulkan_ctx->device->queue.queue);
 }
 
 static void
@@ -160,7 +161,7 @@ vulkan_vid_render_create_context (void)
 {
 	vulkan_ctx->create_window (vulkan_ctx);
 	vulkan_ctx->surface = vulkan_ctx->create_surface (vulkan_ctx);
-	Sys_Printf ("%p\n", vulkan_ctx->surface);
+	Sys_Printf ("vk create context %p\n", vulkan_ctx->surface);
 	Vulkan_CreateSwapchain (vulkan_ctx);
 	Sys_Printf ("%p %d", vulkan_ctx->swapchain->swapchain,
 				vulkan_ctx->swapchain->numImages);

From 494f673def819dca44e9ac9dd10fea31b84d0e7c Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 6 Feb 2020 17:38:51 +0900
Subject: [PATCH 0335/1519] Fix a potential buffer overflow

Highly unlikely to have that many sub models, but it does keep gcc
quiet.
---
 libs/models/brush/model_brush.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/models/brush/model_brush.c b/libs/models/brush/model_brush.c
index 33e67b952..c81fbabe9 100644
--- a/libs/models/brush/model_brush.c
+++ b/libs/models/brush/model_brush.c
@@ -962,7 +962,7 @@ Mod_LoadBrushModel (model_t *mod, void *buffer)
 
 		if (i < mod->numsubmodels - 1) {
 			// duplicate the basic information
-			char	name[10];
+			char	name[12];
 
 			snprintf (name, sizeof (name), "*%i", i + 1);
 			loadmodel = Mod_FindName (name);

From 6ce87497f384a58cdb3b86587501de58ad07ffaa Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 6 Feb 2020 17:38:51 +0900
Subject: [PATCH 0336/1519] Fix a potential buffer overflow

Highly unlikely to have that many sub models, but it does keep gcc
quiet.
---
 libs/models/brush/model_brush.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/models/brush/model_brush.c b/libs/models/brush/model_brush.c
index 33e67b952..c81fbabe9 100644
--- a/libs/models/brush/model_brush.c
+++ b/libs/models/brush/model_brush.c
@@ -962,7 +962,7 @@ Mod_LoadBrushModel (model_t *mod, void *buffer)
 
 		if (i < mod->numsubmodels - 1) {
 			// duplicate the basic information
-			char	name[10];
+			char	name[12];
 
 			snprintf (name, sizeof (name), "*%i", i + 1);
 			loadmodel = Mod_FindName (name);

From d3b4e4653e30ffb5d789095e5806cdcb0e7def45 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 6 Feb 2020 19:04:28 +0900
Subject: [PATCH 0337/1519] Cache physical devices in the instance

---
 include/QF/Vulkan/device.h             |  2 +-
 include/QF/Vulkan/instance.h           |  7 +++++++
 libs/video/renderer/vulkan/device.c    | 12 +++---------
 libs/video/renderer/vulkan/instance.c  | 12 ++++++++++++
 libs/video/renderer/vulkan/swapchain.c | 13 +++++++------
 5 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/include/QF/Vulkan/device.h b/include/QF/Vulkan/device.h
index 6f6907148..28a8fe229 100644
--- a/include/QF/Vulkan/device.h
+++ b/include/QF/Vulkan/device.h
@@ -19,7 +19,7 @@ typedef struct qfv_queue_s {
 struct qfv_instance_s;
 typedef struct qfv_device_s {
 	VkDevice    dev;
-	VkPhysicalDevice physDev;
+	struct qfv_physdev_s *physDev;
 	qfv_devfuncs_t *funcs;
 	qfv_queue_t queue;
 	struct strset_s *enabled_extensions;
diff --git a/include/QF/Vulkan/instance.h b/include/QF/Vulkan/instance.h
index 0a677c945..6c393d140 100644
--- a/include/QF/Vulkan/instance.h
+++ b/include/QF/Vulkan/instance.h
@@ -36,6 +36,11 @@ typedef struct qfv_instfuncs_s {
 #include "QF/Vulkan/funclist.h"
 } qfv_instfuncs_t;
 
+typedef struct qfv_physdev_s {
+	VkPhysicalDevice dev;
+	VkPhysicalDeviceMemoryProperties memory_properties;
+} qfv_physdev_t;
+
 typedef struct qfv_instance_s {
 	VkInstance  instance;
 	qfv_instfuncs_t *funcs;
@@ -43,6 +48,8 @@ typedef struct qfv_instance_s {
 	int         (*extension_enabled) (struct qfv_instance_s *inst,
 									  const char *ext);
 	VkDebugUtilsMessengerEXT debug_handle;
+	uint32_t    numDevices;
+	qfv_physdev_t *devices;
 } qfv_instance_t;
 
 struct vulkan_ctx_s;
diff --git a/libs/video/renderer/vulkan/device.c b/libs/video/renderer/vulkan/device.c
index 85f200956..1c838fdfa 100644
--- a/libs/video/renderer/vulkan/device.c
+++ b/libs/video/renderer/vulkan/device.c
@@ -143,16 +143,10 @@ QFV_CreateDevice (vulkan_ctx_t *ctx, const char **extensions)
 	merge_strings (ext, extensions, 0);
 
 	qfv_instance_t *inst = ctx->instance;
-	VkInstance  instance = inst->instance;
 	qfv_instfuncs_t *ifunc = inst->funcs;
 
-	uint32_t numDevices;
-	ifunc->vkEnumeratePhysicalDevices (instance, &numDevices, 0);
-	VkPhysicalDevice *devices = alloca (numDevices * sizeof (*devices));
-	ifunc->vkEnumeratePhysicalDevices (instance, &numDevices, devices);
-
-	for (uint32_t i = 0; i < numDevices; i++) {
-		VkPhysicalDevice physdev = devices[i];
+	for (uint32_t i = 0; i < inst->numDevices; i++) {
+		VkPhysicalDevice physdev = inst->devices[i].dev;
 		/*
 		if (!Vulkan_ExtensionsSupported (phys->extensions, phys->numExtensions,
 										 ext)) {
@@ -189,7 +183,7 @@ QFV_CreateDevice (vulkan_ctx_t *ctx, const char **extensions)
 			device->enabled_extensions = new_strset (ext);
 			device->extension_enabled = device_extension_enabled;
 
-			device->physDev = physdev;
+			device->physDev = &inst->devices[i];
 			load_device_funcs (inst, device);
 			device->queue.dev = device->dev;
 			device->queue.funcs = dfunc;
diff --git a/libs/video/renderer/vulkan/instance.c b/libs/video/renderer/vulkan/instance.c
index 25ccdb306..a744c2608 100644
--- a/libs/video/renderer/vulkan/instance.c
+++ b/libs/video/renderer/vulkan/instance.c
@@ -256,6 +256,18 @@ QFV_CreateInstance (vulkan_ctx_t *ctx,
 		setup_debug_callback (inst);
 	}
 
+	qfv_instfuncs_t *ifunc = inst->funcs;
+	ifunc->vkEnumeratePhysicalDevices (instance, &inst->numDevices, 0);
+	inst->devices = malloc (inst->numDevices * sizeof (*inst->devices));
+	VkPhysicalDevice *devices = alloca (inst->numDevices * sizeof (*devices));
+	ifunc->vkEnumeratePhysicalDevices (instance, &inst->numDevices, devices);
+	for (uint32_t i = 0; i < inst->numDevices; i++) {
+		VkPhysicalDevice physDev = devices[i];
+		qfv_physdev_t *dev = &inst->devices[i];
+		dev->dev = physDev;
+		ifunc->vkGetPhysicalDeviceMemoryProperties (physDev,
+													&dev->memory_properties);
+	}
 	return inst;
 }
 
diff --git a/libs/video/renderer/vulkan/swapchain.c b/libs/video/renderer/vulkan/swapchain.c
index c9487a913..5a7a2ecac 100644
--- a/libs/video/renderer/vulkan/swapchain.c
+++ b/libs/video/renderer/vulkan/swapchain.c
@@ -28,9 +28,10 @@ QFV_CreateSwapchain (vulkan_ctx_t *ctx, VkSwapchainKHR old_swapchain)
 	qfv_instfuncs_t *ifuncs = ctx->instance->funcs;
 	qfv_devfuncs_t *dfuncs = ctx->device->funcs;
 	qfv_queue_t *queue = &ctx->device->queue;
+	VkPhysicalDevice physDev = ctx->device->physDev->dev;
 
 	VkBool32    supported;
-	ifuncs->vkGetPhysicalDeviceSurfaceSupportKHR (ctx->device->physDev,
+	ifuncs->vkGetPhysicalDeviceSurfaceSupportKHR (physDev,
 												  queue->queueFamily,
 												  ctx->surface,
 												  &supported);
@@ -41,11 +42,11 @@ QFV_CreateSwapchain (vulkan_ctx_t *ctx, VkSwapchainKHR old_swapchain)
 	uint32_t    numModes;
 	VkPresentModeKHR *modes;
 	VkPresentModeKHR useMode = VK_PRESENT_MODE_FIFO_KHR;;
-	ifuncs->vkGetPhysicalDeviceSurfacePresentModesKHR (ctx->device->physDev,
+	ifuncs->vkGetPhysicalDeviceSurfacePresentModesKHR (physDev,
 													   ctx->surface,
 													   &numModes, 0);
 	modes = alloca (numModes * sizeof (VkPresentModeKHR));
-	ifuncs->vkGetPhysicalDeviceSurfacePresentModesKHR (ctx->device->physDev,
+	ifuncs->vkGetPhysicalDeviceSurfacePresentModesKHR (physDev,
 													   ctx->surface,
 													   &numModes, modes);
 	for (uint32_t i = 0; i < numModes; i++) {
@@ -57,7 +58,7 @@ QFV_CreateSwapchain (vulkan_ctx_t *ctx, VkSwapchainKHR old_swapchain)
 					vulkan_presentation_mode->int_val);
 
 	VkSurfaceCapabilitiesKHR surfCaps;
-	ifuncs->vkGetPhysicalDeviceSurfaceCapabilitiesKHR (ctx->device->physDev,
+	ifuncs->vkGetPhysicalDeviceSurfaceCapabilitiesKHR (physDev,
 													   ctx->surface,
 													   &surfCaps);
 	uint32_t numImages = surfCaps.minImageCount + 1;
@@ -85,11 +86,11 @@ QFV_CreateSwapchain (vulkan_ctx_t *ctx, VkSwapchainKHR old_swapchain)
 	VkSurfaceTransformFlagBitsKHR surfTransform = VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR;
 
 	uint32_t numFormats;
-	ifuncs->vkGetPhysicalDeviceSurfaceFormatsKHR (ctx->device->physDev,
+	ifuncs->vkGetPhysicalDeviceSurfaceFormatsKHR (physDev,
 												  ctx->surface,
 												  &numFormats, 0);
 	VkSurfaceFormatKHR *formats = alloca (numFormats * sizeof (*formats));
-	ifuncs->vkGetPhysicalDeviceSurfaceFormatsKHR (ctx->device->physDev,
+	ifuncs->vkGetPhysicalDeviceSurfaceFormatsKHR (physDev,
 												  ctx->surface,
 												  &numFormats, formats);
 	VkSurfaceFormatKHR useFormat = {VK_FORMAT_R8G8B8A8_UNORM,

From 8148f256f5653a3902dc43ec07a1c25a3a76d79e Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 7 Feb 2020 11:45:05 +0900
Subject: [PATCH 0338/1519] Rework object device caching

It turned out I needed access to the physical device from a buffer
object, so rather than storing the vulkan logical device directly in
buffer (and other) objects, store the qfv logical device.
---
 include/QF/Vulkan/command.h            | 22 +++----
 include/QF/Vulkan/device.h             |  4 +-
 include/QF/Vulkan/swapchain.h          |  3 +-
 libs/video/renderer/vulkan/command.c   | 85 +++++++++++++-------------
 libs/video/renderer/vulkan/device.c    |  3 +-
 libs/video/renderer/vulkan/swapchain.c |  9 +--
 6 files changed, 59 insertions(+), 67 deletions(-)

diff --git a/include/QF/Vulkan/command.h b/include/QF/Vulkan/command.h
index 2af925f29..94165ce13 100644
--- a/include/QF/Vulkan/command.h
+++ b/include/QF/Vulkan/command.h
@@ -2,53 +2,45 @@
 #define __QF_Vulkan_command_h
 
 typedef struct qfv_cmdpool_s {
-	VkDevice    dev;
-	struct qfv_devfuncs_s *funcs;
+	struct qfv_device_s *device;
 	VkCommandPool cmdpool;
 } qfv_cmdpool_t;
 
 typedef struct qfv_cmdbuffer_s {
-	VkDevice    dev;
-	struct qfv_devfuncs_s *funcs;
+	struct qfv_device_s *device;
 	VkCommandPool cmdpool;
 	VkCommandBuffer buffer;
 } qfv_cmdbuffer_t;
 
 typedef struct qfv_cmdbufferset_s {
-	VkDevice    dev;
-	struct qfv_devfuncs_s *funcs;
+	struct qfv_device_s *device;
 	VkCommandBuffer *buffers;
 	int         numBuffers;
 } qfv_cmdbufferset_t;
 
 typedef struct qfv_semaphore_s {
-	VkDevice    dev;
-	struct qfv_devfuncs_s *funcs;
+	struct qfv_device_s *device;
 	VkSemaphore semaphore;
 } qfv_semaphore_t;
 
 typedef struct qfv_semaphoreset_s {
-	VkDevice    dev;
-	struct qfv_devfuncs_s *funcs;
+	struct qfv_device_s *device;
 	VkSemaphore *semaphores;
 	VkPipelineStageFlags *stages;
 	int         numSemaphores;
 } qfv_semaphoreset_t;
 
 typedef struct qfv_fence_s {
-	VkDevice    dev;
-	struct qfv_devfuncs_s *funcs;
+	struct qfv_device_s *device;
 	VkFence     fence;
 } qfv_fence_t;
 
 typedef struct qfv_fenceset_s {
-	VkDevice    dev;
-	struct qfv_devfuncs_s *funcs;
+	struct qfv_device_s *device;
 	VkFence    *fences;
 	int         numFences;
 } qfv_fenceset_t;
 
-struct qfv_device_s;
 struct qfv_queue_s;
 qfv_cmdpool_t *QFV_CreateCommandPool (struct qfv_device_s *device,
 									  uint32_t queueFamily,
diff --git a/include/QF/Vulkan/device.h b/include/QF/Vulkan/device.h
index 28a8fe229..c05b2ba7e 100644
--- a/include/QF/Vulkan/device.h
+++ b/include/QF/Vulkan/device.h
@@ -7,10 +7,8 @@ typedef struct qfv_devfuncs_s {
 #include "QF/Vulkan/funclist.h"
 } qfv_devfuncs_t;
 
-struct qfv_device_s;
 typedef struct qfv_queue_s {
-	VkDevice    dev;
-	qfv_devfuncs_t *funcs;
+	struct qfv_device_s *device;
 
 	int32_t     queueFamily;
 	VkQueue     queue;
diff --git a/include/QF/Vulkan/swapchain.h b/include/QF/Vulkan/swapchain.h
index 91d158c89..cd9323009 100644
--- a/include/QF/Vulkan/swapchain.h
+++ b/include/QF/Vulkan/swapchain.h
@@ -2,8 +2,7 @@
 #define __QF_Vulkan_swapchain_h
 
 typedef struct qfv_swapchain_s {
-	VkDevice    dev;
-	struct qfv_devfuncs_s *funcs;
+	struct qfv_device_s *device;
 	VkSurfaceKHR surface;
 	VkSwapchainKHR swapchain;
 	int32_t     numImages;
diff --git a/libs/video/renderer/vulkan/command.c b/libs/video/renderer/vulkan/command.c
index 4031f0be4..d3f3d4082 100644
--- a/libs/video/renderer/vulkan/command.c
+++ b/libs/video/renderer/vulkan/command.c
@@ -80,17 +80,17 @@ QFV_CreateCommandPool (qfv_device_t *device, uint32_t queueFamily,
 	};
 	qfv_cmdpool_t *cmdpool = malloc (sizeof (*cmdpool));
 	dfunc->vkCreateCommandPool (dev, &createInfo, 0, &cmdpool->cmdpool);
-	cmdpool->dev = dev;
-	cmdpool->funcs = dfunc;
+	cmdpool->device = device;
 	return cmdpool;
 }
 
 int
 QFV_ResetCommandPool (qfv_cmdpool_t *pool, int release)
 {
-	VkDevice    dev = pool->dev;
+	qfv_device_t *device = pool->device;
+	VkDevice    dev = device->dev;
+	qfv_devfuncs_t *dfunc = device->funcs;
 	VkCommandPool cmdpool = pool->cmdpool;
-	qfv_devfuncs_t *dfunc = pool->funcs;
 	VkCommandPoolResetFlags release_flag = 0;
 
 	if (release) {
@@ -103,8 +103,9 @@ QFV_ResetCommandPool (qfv_cmdpool_t *pool, int release)
 void
 QFV_DestroyCommandPool (qfv_cmdpool_t *pool)
 {
-	VkDevice    dev = pool->dev;
-	qfv_devfuncs_t *dfunc = pool->funcs;
+	qfv_device_t *device = pool->device;
+	VkDevice    dev = device->dev;
+	qfv_devfuncs_t *dfunc = device->funcs;
 
 	dfunc->vkDestroyCommandPool (dev, pool->cmdpool, 0);
 	free (pool);
@@ -113,8 +114,9 @@ QFV_DestroyCommandPool (qfv_cmdpool_t *pool)
 qfv_cmdbuffer_t *
 QFV_AllocateCommandBuffers (qfv_cmdpool_t *pool, int secondary, int count)
 {
-	VkDevice    dev = pool->dev;
-	qfv_devfuncs_t *dfunc = pool->funcs;
+	qfv_device_t *device = pool->device;
+	VkDevice    dev = device->dev;
+	qfv_devfuncs_t *dfunc = device->funcs;
 	uint32_t    level = VK_COMMAND_BUFFER_LEVEL_PRIMARY;
 	if (secondary) {
 		level = VK_COMMAND_BUFFER_LEVEL_SECONDARY;
@@ -127,8 +129,7 @@ QFV_AllocateCommandBuffers (qfv_cmdpool_t *pool, int secondary, int count)
 	VkCommandBuffer *buffers = alloca (count * sizeof (*buffers));
 	dfunc->vkAllocateCommandBuffers (dev, &allocInfo, buffers);
 	for (int i = 0; i < count; i++) {
-		cmdbuffers[i].dev = dev;
-		cmdbuffers[i].funcs = dfunc;
+		cmdbuffers[i].device = device;
 		cmdbuffers[i].cmdpool = pool->cmdpool;
 		cmdbuffers[i].buffer = buffers[i];
 	}
@@ -138,14 +139,12 @@ QFV_AllocateCommandBuffers (qfv_cmdpool_t *pool, int secondary, int count)
 qfv_cmdbufferset_t *
 QFV_CreateCommandBufferSet (qfv_cmdbuffer_t **buffers, int numBuffers)
 {
-	VkDevice    dev = buffers[0]->dev;
-	qfv_devfuncs_t *dfunc = buffers[0]->funcs;
+	qfv_device_t *device = buffers[0]->device;
 	qfv_cmdbufferset_t *bufferset = malloc (sizeof (*bufferset)
 											+ sizeof (VkCommandBuffer)
 											  * numBuffers);
 
-	bufferset->dev = dev;
-	bufferset->funcs = dfunc;
+	bufferset->device = device;
 	bufferset->buffers = (VkCommandBuffer *) (bufferset + 1);
 	bufferset->numBuffers = numBuffers;
 
@@ -157,8 +156,9 @@ QFV_CreateCommandBufferSet (qfv_cmdbuffer_t **buffers, int numBuffers)
 
 void QFV_FreeCommandBuffers (qfv_cmdbuffer_t *buffer, int count)
 {
-	VkDevice    dev = buffer->dev;
-	qfv_devfuncs_t *dfunc = buffer->funcs;
+	qfv_device_t *device = buffer->device;
+	VkDevice    dev = device->dev;
+	qfv_devfuncs_t *dfunc = device->funcs;
 	VkCommandBuffer *buffers = alloca (sizeof (*buffers) * count);
 
 	for (int i = 0; i < count; i++) {
@@ -180,8 +180,9 @@ QFV_BeginCommandBuffer (qfv_cmdbuffer_t *buffer, int oneTime, int rpContinue,
 						int simultaneous,
 						VkCommandBufferInheritanceInfo *inheritanceInfo)
 {
+	qfv_device_t *device = buffer->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
 	VkCommandBuffer buff = buffer->buffer;
-	qfv_devfuncs_t *dfunc = buffer->funcs;
 	VkCommandBufferUsageFlags usage = 0;
 
 	if (oneTime) {
@@ -206,8 +207,9 @@ QFV_BeginCommandBuffer (qfv_cmdbuffer_t *buffer, int oneTime, int rpContinue,
 int
 QFV_EndCommandBuffer (qfv_cmdbuffer_t *buffer)
 {
+	qfv_device_t *device = buffer->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
 	VkCommandBuffer buff = buffer->buffer;
-	qfv_devfuncs_t *dfunc = buffer->funcs;
 
 	return dfunc->vkEndCommandBuffer (buff) == VK_SUCCESS;
 }
@@ -215,8 +217,9 @@ QFV_EndCommandBuffer (qfv_cmdbuffer_t *buffer)
 int
 QFV_ResetCommandBuffer (qfv_cmdbuffer_t *buffer, int release)
 {
+	qfv_device_t *device = buffer->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
 	VkCommandBuffer buff = buffer->buffer;
-	qfv_devfuncs_t *dfunc = buffer->funcs;
 	VkCommandBufferResetFlags release_flag = 0;
 
 	if (release) {
@@ -238,8 +241,7 @@ QFV_CreateSemaphore (qfv_device_t *device)
 	};
 
 	qfv_semaphore_t *semaphore = malloc (sizeof (*semaphore));
-	semaphore->dev = dev;
-	semaphore->funcs = dfunc;
+	semaphore->device = device;
 
 	dfunc->vkCreateSemaphore (dev, &createInfo, 0, &semaphore->semaphore);
 	return semaphore;
@@ -248,15 +250,13 @@ QFV_CreateSemaphore (qfv_device_t *device)
 qfv_semaphoreset_t *
 QFV_CreateSemaphoreSet (qfv_semaphore_t **semaphores, int numSemaphores)
 {
-	VkDevice    dev = semaphores[0]->dev;
-	qfv_devfuncs_t *dfunc = semaphores[0]->funcs;
+	qfv_device_t *device = semaphores[0]->device;
 	qfv_semaphoreset_t *semaphoreset;
 	semaphoreset = calloc (1, sizeof (*semaphoreset)
 						   + sizeof (VkSemaphore) * numSemaphores
 						   + sizeof (VkPipelineStageFlags) * numSemaphores);
 
-	semaphoreset->dev = dev;
-	semaphoreset->funcs = dfunc;
+	semaphoreset->device = device;
 	semaphoreset->semaphores = (VkSemaphore *) (semaphoreset + 1);
 	semaphoreset->stages = (VkPipelineStageFlags *)
 							&semaphoreset->semaphores[numSemaphores];
@@ -271,8 +271,9 @@ QFV_CreateSemaphoreSet (qfv_semaphore_t **semaphores, int numSemaphores)
 void
 QFV_DestroySemaphore (qfv_semaphore_t *semaphore)
 {
-	VkDevice    dev = semaphore->dev;
-	qfv_devfuncs_t *dfunc = semaphore->funcs;
+	qfv_device_t *device = semaphore->device;
+	VkDevice    dev = device->dev;
+	qfv_devfuncs_t *dfunc = device->funcs;
 
 	dfunc->vkDestroySemaphore (dev, semaphore->semaphore, 0);
 	free (semaphore);
@@ -296,8 +297,7 @@ QFV_CreateFence (qfv_device_t *device, int signaled)
 	};
 
 	qfv_fence_t *fence = malloc (sizeof (*fence));
-	fence->dev = dev;
-	fence->funcs = dfunc;
+	fence->device = device;
 
 	dfunc->vkCreateFence (dev, &createInfo, 0, &fence->fence);
 	return fence;
@@ -306,13 +306,11 @@ QFV_CreateFence (qfv_device_t *device, int signaled)
 qfv_fenceset_t *
 QFV_CreateFenceSet (qfv_fence_t **fences, int numFences)
 {
-	VkDevice    dev = fences[0]->dev;
-	qfv_devfuncs_t *dfunc = fences[0]->funcs;
+	qfv_device_t *device = fences[0]->device;
 	qfv_fenceset_t *fenceset = malloc (sizeof (*fenceset)
 									   + sizeof (VkFence) * numFences);
 
-	fenceset->dev = dev;
-	fenceset->funcs = dfunc;
+	fenceset->device = device;
 	fenceset->fences = (VkFence *) (fenceset + 1);
 	fenceset->numFences = numFences;
 
@@ -325,8 +323,9 @@ QFV_CreateFenceSet (qfv_fence_t **fences, int numFences)
 void
 QFV_DestroyFence (qfv_fence_t *fence)
 {
-	VkDevice    dev = fence->dev;
-	qfv_devfuncs_t *dfunc = fence->funcs;
+	qfv_device_t *device = fence->device;
+	VkDevice    dev = device->dev;
+	qfv_devfuncs_t *dfunc = device->funcs;
 
 	dfunc->vkDestroyFence (dev, fence->fence, 0);
 	free (fence);
@@ -341,8 +340,9 @@ QFV_DestroyFenceSet (qfv_fenceset_t *fences)
 int
 QFV_WaitForFences (qfv_fenceset_t *fences, int all, uint64_t timeout)
 {
-	VkDevice    dev = fences->dev;
-	qfv_devfuncs_t *dfunc = fences->funcs;
+	qfv_device_t *device = fences->device;
+	VkDevice    dev = device->dev;
+	qfv_devfuncs_t *dfunc = device->funcs;
 
 	VkResult res = dfunc->vkWaitForFences (dev, fences->numFences,
 										   fences->fences, all, timeout);
@@ -352,8 +352,9 @@ QFV_WaitForFences (qfv_fenceset_t *fences, int all, uint64_t timeout)
 int
 QFV_ResetFences (qfv_fenceset_t *fences)
 {
-	VkDevice    dev = fences->dev;
-	qfv_devfuncs_t *dfunc = fences->funcs;
+	qfv_device_t *device = fences->device;
+	VkDevice    dev = device->dev;
+	qfv_devfuncs_t *dfunc = device->funcs;
 
 	return dfunc->vkResetFences (dev, fences->numFences,
 								 fences->fences) == VK_SUCCESS;
@@ -364,7 +365,8 @@ QFV_QueueSubmit (qfv_queue_t *queue, qfv_semaphoreset_t *waitSemaphores,
 				 qfv_cmdbufferset_t *buffers,
 				 qfv_semaphoreset_t *signalSemaphores, qfv_fence_t *fence)
 {
-	qfv_devfuncs_t *dfunc = queue->funcs;
+	qfv_device_t *device = queue->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
 	VkSubmitInfo submitInfo = {
 		VK_STRUCTURE_TYPE_SUBMIT_INFO, 0,
 		waitSemaphores->numSemaphores,
@@ -381,6 +383,7 @@ QFV_QueueSubmit (qfv_queue_t *queue, qfv_semaphoreset_t *waitSemaphores,
 int
 QFV_QueueWaitIdle (qfv_queue_t *queue)
 {
-	qfv_devfuncs_t *dfunc = queue->funcs;
+	qfv_device_t *device = queue->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
 	return dfunc->vkQueueWaitIdle (queue->queue) == VK_SUCCESS;
 }
diff --git a/libs/video/renderer/vulkan/device.c b/libs/video/renderer/vulkan/device.c
index 1c838fdfa..0ed7ec808 100644
--- a/libs/video/renderer/vulkan/device.c
+++ b/libs/video/renderer/vulkan/device.c
@@ -185,8 +185,7 @@ QFV_CreateDevice (vulkan_ctx_t *ctx, const char **extensions)
 
 			device->physDev = &inst->devices[i];
 			load_device_funcs (inst, device);
-			device->queue.dev = device->dev;
-			device->queue.funcs = dfunc;
+			device->queue.device = device;
 			device->queue.queueFamily = family;
 			dfunc->vkGetDeviceQueue (device->dev, family, 0,
 									 &device->queue.queue);
diff --git a/libs/video/renderer/vulkan/swapchain.c b/libs/video/renderer/vulkan/swapchain.c
index 5a7a2ecac..bae8e4ff4 100644
--- a/libs/video/renderer/vulkan/swapchain.c
+++ b/libs/video/renderer/vulkan/swapchain.c
@@ -138,8 +138,7 @@ QFV_CreateSwapchain (vulkan_ctx_t *ctx, VkSwapchainKHR old_swapchain)
 	dfuncs->vkGetSwapchainImagesKHR (device, swapchain, &numImages, 0);
 	qfv_swapchain_t *sc = malloc (sizeof (qfv_swapchain_t)
 								  + numImages * sizeof (VkImage));
-	sc->dev = device;
-	sc->funcs = ctx->device->funcs;
+	sc->device = ctx->device;
 	sc->surface = ctx->surface;
 	sc->swapchain = swapchain;
 	sc->numImages = numImages;
@@ -152,7 +151,9 @@ QFV_CreateSwapchain (vulkan_ctx_t *ctx, VkSwapchainKHR old_swapchain)
 void
 QFV_DestroySwapchain (qfv_swapchain_t *swapchain)
 {
-	swapchain->funcs->vkDestroySwapchainKHR (swapchain->dev,
-											 swapchain->swapchain, 0);
+	qfv_device_t *device = swapchain->device;
+	VkDevice dev = device->dev;
+	qfv_devfuncs_t *dfunc = device->funcs;
+	dfunc->vkDestroySwapchainKHR (dev, swapchain->swapchain, 0);
 	free (swapchain);
 }

From 2f9ad73f789d4f83e459db1cfa2be0c330bc82c6 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 10 Feb 2020 15:07:35 +0900
Subject: [PATCH 0339/1519] Implement buffer memory up to barriers

Still lots to go (views, destruction, transfer...) and I'm uncertain
about the location of the pipeline barrier function.
---
 include/QF/Vulkan/buffer.h             |  47 ++++++++
 include/QF/Vulkan/command.h            |  10 ++
 include/QF/Vulkan/funclist.h           |   6 +
 libs/video/renderer/vulkan/Makefile.am |   1 +
 libs/video/renderer/vulkan/buffer.c    | 161 +++++++++++++++++++++++++
 libs/video/renderer/vulkan/command.c   |  30 +++++
 6 files changed, 255 insertions(+)
 create mode 100644 include/QF/Vulkan/buffer.h
 create mode 100644 libs/video/renderer/vulkan/buffer.c

diff --git a/include/QF/Vulkan/buffer.h b/include/QF/Vulkan/buffer.h
new file mode 100644
index 000000000..dfd8c2313
--- /dev/null
+++ b/include/QF/Vulkan/buffer.h
@@ -0,0 +1,47 @@
+#ifndef __QF_Vulkan_buffer_h
+#define __QF_Vulkan_buffer_h
+
+typedef struct qfv_buffer_s {
+	struct qfv_device_s *device;
+	VkBuffer    buffer;
+} qfv_buffer_t;
+
+typedef struct qfv_memory_s {
+	struct qfv_device_s *device;
+	VkDeviceMemory object;
+} qfv_memory_t;
+
+typedef struct qfv_buffertransition_s {
+	qfv_buffer_t *buffer;
+	VkAccessFlags srcAccess;
+	VkAccessFlags dstAccess;
+	uint32_t      srcQueueFamily;
+	uint32_t      dstQueueFamily;
+	VkDeviceSize  offset;
+	VkDeviceSize  size;
+} qfv_buffertransition_t;
+
+typedef struct qfv_bufferbarrierset_s {
+	struct qfv_device_s *device;
+	uint32_t    numBarriers;
+	VkBufferMemoryBarrier *barriers;
+} qfv_bufferbarrierset_t;
+
+struct qfv_device_s;
+qfv_buffer_t *QFV_CreateBuffer (struct qfv_device_s *device,
+								VkDeviceSize size,
+								VkBufferUsageFlags usage);
+
+qfv_memory_t *QFV_AllocMemory (qfv_buffer_t *buffer,
+							   VkMemoryPropertyFlags properties,
+							   VkDeviceSize size, VkDeviceSize offset);
+
+int QFV_BindBufferMemory (qfv_buffer_t *buffer, qfv_memory_t *memory,
+						  VkDeviceSize offset);
+
+qfv_bufferbarrierset_t *
+QFV_CreateBufferTransitionSet (qfv_buffertransition_t **transitions,
+							   int numTransitions);
+
+
+#endif//__QF_Vulkan_buffer_h
diff --git a/include/QF/Vulkan/command.h b/include/QF/Vulkan/command.h
index 94165ce13..a19ff7bd3 100644
--- a/include/QF/Vulkan/command.h
+++ b/include/QF/Vulkan/command.h
@@ -79,5 +79,15 @@ int QFV_QueueSubmit (struct qfv_queue_s *queue,
 					 qfv_semaphoreset_t *signalSemaphores, qfv_fence_t *fence);
 int QFV_QueueWaitIdle (struct qfv_queue_s *queue);
 
+struct qfv_memorybarrierset_s *memBarriers;
+struct qfv_bufferbarrierset_s *buffBarriers;
+struct qfv_imagebarrierset_s *imgBarriers;
+void QFV_CmdPipelineBarrier (qfv_cmdbuffer_t *cmdBuffer,
+							 VkPipelineStageFlags srcStageMask,
+							 VkPipelineStageFlags dstStageMask,
+							 VkDependencyFlags dependencyFlags,
+							 struct qfv_memorybarrierset_s *memBarriers,
+							 struct qfv_bufferbarrierset_s *buffBarriers,
+							 struct qfv_imagebarrierset_s *imgBarriers);
 
 #endif//__QF_Vulkan_command_h
diff --git a/include/QF/Vulkan/funclist.h b/include/QF/Vulkan/funclist.h
index 5d649d5c2..5337bd472 100644
--- a/include/QF/Vulkan/funclist.h
+++ b/include/QF/Vulkan/funclist.h
@@ -107,6 +107,12 @@ DEVICE_LEVEL_VULKAN_FUNCTION (vkDestroyFence)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkDestroySemaphore)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkFreeCommandBuffers)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkDestroyCommandPool)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkCreateBuffer)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkGetBufferMemoryRequirements)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkAllocateMemory)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkBindBufferMemory)
+
+DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdPipelineBarrier)
 
 #undef DEVICE_LEVEL_VULKAN_FUNCTION
 
diff --git a/libs/video/renderer/vulkan/Makefile.am b/libs/video/renderer/vulkan/Makefile.am
index f754853f2..cfe2acb0d 100644
--- a/libs/video/renderer/vulkan/Makefile.am
+++ b/libs/video/renderer/vulkan/Makefile.am
@@ -4,6 +4,7 @@ AM_CFLAGS= @PREFER_PIC@
 AM_CPPFLAGS= -I$(top_srcdir)/include -DVK_NO_PROTOTYPES
 
 vulkan_src = \
+	buffer.c \
 	command.c \
 	device.c \
 	instance.c \
diff --git a/libs/video/renderer/vulkan/buffer.c b/libs/video/renderer/vulkan/buffer.c
new file mode 100644
index 000000000..6a69b201d
--- /dev/null
+++ b/libs/video/renderer/vulkan/buffer.c
@@ -0,0 +1,161 @@
+/*
+	buffer.c
+
+	Vulkan buffer functions
+
+	Copyright (C) 1996-1997 Id Software, Inc.
+	Copyright (C) 2020      Bill Currie <bill@taniwha.org>
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifdef HAVE_MATH_H
+# include <math.h>
+#endif
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+
+#include "QF/cvar.h"
+#include "QF/dstring.h"
+#include "QF/input.h"
+#include "QF/mathlib.h"
+#include "QF/qargs.h"
+#include "QF/quakefs.h"
+#include "QF/sys.h"
+#include "QF/va.h"
+#include "QF/vid.h"
+#include "QF/Vulkan/qf_vid.h"
+#include "QF/Vulkan/buffer.h"
+#include "QF/Vulkan/device.h"
+#include "QF/Vulkan/instance.h"
+
+#include "compat.h"
+#include "d_iface.h"
+#include "r_internal.h"
+#include "vid_vulkan.h"
+
+#include "util.h"
+
+qfv_buffer_t *
+QFV_CreateBuffer (qfv_device_t *device, VkDeviceSize size,
+				  VkBufferUsageFlags usage)
+{
+	VkDevice    dev = device->dev;
+	qfv_devfuncs_t *dfunc = device->funcs;
+	VkBufferCreateInfo createInfo = {
+		VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO, 0,
+		0,
+		size, usage, VK_SHARING_MODE_EXCLUSIVE,
+		0, 0
+	};
+	qfv_buffer_t *buffer = malloc (sizeof (*buffer));
+	dfunc->vkCreateBuffer (dev, &createInfo, 0, &buffer->buffer);
+	buffer->device = device;
+	return buffer;
+}
+
+qfv_memory_t *
+QFV_AllocMemory (qfv_buffer_t *buffer, VkMemoryPropertyFlags properties,
+				 VkDeviceSize size, VkDeviceSize offset)
+{
+	qfv_device_t *device = buffer->device;
+	VkDevice    dev = device->dev;
+	qfv_physdev_t *physdev = device->physDev;
+	VkPhysicalDeviceMemoryProperties *memprops = &physdev->memory_properties;
+    qfv_devfuncs_t *dfunc = device->funcs;
+
+	VkMemoryRequirements requirements;
+	dfunc->vkGetBufferMemoryRequirements (dev, buffer->buffer, &requirements);
+
+	size = max (size, offset + requirements.size);
+	VkDeviceMemory object = 0;
+
+	for (uint32_t type = 0; type < memprops->memoryTypeCount; type++) {
+		if ((requirements.memoryTypeBits & (1 << type))
+			&& ((memprops->memoryTypes[type].propertyFlags & properties)
+				== properties)) {
+			VkMemoryAllocateInfo allocate_info = {
+				VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO, 0,
+				size, type
+			};
+
+			VkResult res = dfunc->vkAllocateMemory (dev, &allocate_info,
+													0, &object);
+			if (res == VK_SUCCESS) {
+				break;
+			}
+		}
+	}
+
+	qfv_memory_t *memory = 0;
+
+	if (object) {
+		memory = malloc (sizeof (*memory));
+		memory->device = device;
+		memory->object = object;
+	}
+	return memory;
+}
+
+int
+QFV_BindBufferMemory (qfv_buffer_t *buffer, qfv_memory_t *memory,
+					  VkDeviceSize offset)
+{
+	qfv_device_t *device = buffer->device;
+	VkDevice    dev = device->dev;
+    qfv_devfuncs_t *dfunc = device->funcs;
+	VkResult res = dfunc->vkBindBufferMemory (dev, buffer->buffer,
+											  memory->object, offset);
+	return res == VK_SUCCESS;
+}
+
+qfv_bufferbarrierset_t *
+QFV_CreateBufferTransitionSet (qfv_buffertransition_t **transitions,
+							   int numTransitions)
+{
+	qfv_device_t *device = transitions[0]->buffer->device;
+	qfv_bufferbarrierset_t *barrierset = malloc (sizeof (*barrierset)
+									   + sizeof (VkBufferMemoryBarrier) * numTransitions);
+
+	barrierset->device = device;
+	barrierset->numBarriers = numTransitions;
+	barrierset->barriers = (VkBufferMemoryBarrier *) (barrierset + 1);
+
+	for (int i = 0; i < numTransitions; i++) {
+		VkBufferMemoryBarrier *barrier = &barrierset->barriers[i];
+		barrier->sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER;
+		barrier->pNext = 0;
+		barrier->srcAccessMask = transitions[i]->srcAccess;
+		barrier->dstAccessMask = transitions[i]->dstAccess;
+		barrier->srcQueueFamilyIndex = transitions[i]->srcQueueFamily;
+		barrier->dstQueueFamilyIndex = transitions[i]->dstQueueFamily;
+		barrier->buffer = transitions[i]->buffer->buffer;
+		barrier->offset = transitions[i]->offset;
+		barrier->size = transitions[i]->size;
+	}
+	return barrierset;
+}
diff --git a/libs/video/renderer/vulkan/command.c b/libs/video/renderer/vulkan/command.c
index d3f3d4082..f30b1dfeb 100644
--- a/libs/video/renderer/vulkan/command.c
+++ b/libs/video/renderer/vulkan/command.c
@@ -49,6 +49,7 @@
 #include "QF/va.h"
 #include "QF/vid.h"
 #include "QF/Vulkan/qf_vid.h"
+#include "QF/Vulkan/buffer.h"//FIXME should QFV_CmdPipelineBarrier be here?
 #include "QF/Vulkan/command.h"
 #include "QF/Vulkan/device.h"
 #include "QF/Vulkan/instance.h"
@@ -387,3 +388,32 @@ QFV_QueueWaitIdle (qfv_queue_t *queue)
 	qfv_devfuncs_t *dfunc = device->funcs;
 	return dfunc->vkQueueWaitIdle (queue->queue) == VK_SUCCESS;
 }
+
+void
+QFV_CmdPipelineBarrier (qfv_cmdbuffer_t *cmdBuffer,
+						VkPipelineStageFlags srcStageMask,
+						VkPipelineStageFlags dstStageMask,
+						VkDependencyFlags dependencyFlags,
+						struct qfv_memorybarrierset_s *memBarrierSet,
+						qfv_bufferbarrierset_t *buffBarrierSet,
+						struct qfv_imagebarrierset_s *imgBarrierSet)
+{
+	qfv_device_t *device = cmdBuffer->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+	uint32_t    numMemBarriers = 0;
+	VkMemoryBarrier *memBarriers = 0;
+	uint32_t    numBuffBarriers = 0;
+	VkBufferMemoryBarrier *buffBarriers = 0;
+	uint32_t    numImgBarriers = 0;
+	VkImageMemoryBarrier *imgBarriers = 0;
+
+	if (buffBarrierSet) {
+		numBuffBarriers = buffBarrierSet->numBarriers;
+		buffBarriers = buffBarrierSet->barriers;
+	}
+	dfunc->vkCmdPipelineBarrier (cmdBuffer->buffer,
+								  srcStageMask, dstStageMask, dependencyFlags,
+								  numMemBarriers, memBarriers,
+								  numBuffBarriers, buffBarriers,
+								  numImgBarriers, imgBarriers);
+}

From f4c0d0ebcfea88821884abc9a93bff2d8461169e Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 10 Feb 2020 18:17:58 +0900
Subject: [PATCH 0340/1519] Implement buffer view creation

And rename memory allocation as it's buffer-specific.
---
 include/QF/Vulkan/buffer.h          | 17 ++++++++++++++---
 include/QF/Vulkan/funclist.h        |  1 +
 libs/video/renderer/vulkan/buffer.c | 28 ++++++++++++++++++++++++++--
 3 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/include/QF/Vulkan/buffer.h b/include/QF/Vulkan/buffer.h
index dfd8c2313..e61e4c744 100644
--- a/include/QF/Vulkan/buffer.h
+++ b/include/QF/Vulkan/buffer.h
@@ -27,14 +27,23 @@ typedef struct qfv_bufferbarrierset_s {
 	VkBufferMemoryBarrier *barriers;
 } qfv_bufferbarrierset_t;
 
+typedef struct qfv_bufferview_s {
+	struct qfv_device_s *device;
+	VkBufferView view;
+	qfv_buffer_t *buffer;
+	VkFormat    format;
+	VkDeviceSize offset;
+	VkDeviceSize size;
+} qfv_bufferview_t;
+
 struct qfv_device_s;
 qfv_buffer_t *QFV_CreateBuffer (struct qfv_device_s *device,
 								VkDeviceSize size,
 								VkBufferUsageFlags usage);
 
-qfv_memory_t *QFV_AllocMemory (qfv_buffer_t *buffer,
-							   VkMemoryPropertyFlags properties,
-							   VkDeviceSize size, VkDeviceSize offset);
+qfv_memory_t *QFV_AllocBufferMemory (qfv_buffer_t *buffer,
+									 VkMemoryPropertyFlags properties,
+									 VkDeviceSize size, VkDeviceSize offset);
 
 int QFV_BindBufferMemory (qfv_buffer_t *buffer, qfv_memory_t *memory,
 						  VkDeviceSize offset);
@@ -43,5 +52,7 @@ qfv_bufferbarrierset_t *
 QFV_CreateBufferTransitionSet (qfv_buffertransition_t **transitions,
 							   int numTransitions);
 
+qfv_bufferview_t *QFV_CreateBufferView (qfv_buffer_t *buffer, VkFormat format,
+										VkDeviceSize offset, VkDeviceSize size);
 
 #endif//__QF_Vulkan_buffer_h
diff --git a/include/QF/Vulkan/funclist.h b/include/QF/Vulkan/funclist.h
index 5337bd472..597cb1dc7 100644
--- a/include/QF/Vulkan/funclist.h
+++ b/include/QF/Vulkan/funclist.h
@@ -111,6 +111,7 @@ DEVICE_LEVEL_VULKAN_FUNCTION (vkCreateBuffer)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkGetBufferMemoryRequirements)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkAllocateMemory)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkBindBufferMemory)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkCreateBufferView)
 
 DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdPipelineBarrier)
 
diff --git a/libs/video/renderer/vulkan/buffer.c b/libs/video/renderer/vulkan/buffer.c
index 6a69b201d..3f67c80bb 100644
--- a/libs/video/renderer/vulkan/buffer.c
+++ b/libs/video/renderer/vulkan/buffer.c
@@ -79,8 +79,8 @@ QFV_CreateBuffer (qfv_device_t *device, VkDeviceSize size,
 }
 
 qfv_memory_t *
-QFV_AllocMemory (qfv_buffer_t *buffer, VkMemoryPropertyFlags properties,
-				 VkDeviceSize size, VkDeviceSize offset)
+QFV_AllocBufferMemory (qfv_buffer_t *buffer, VkMemoryPropertyFlags properties,
+					   VkDeviceSize size, VkDeviceSize offset)
 {
 	qfv_device_t *device = buffer->device;
 	VkDevice    dev = device->dev;
@@ -159,3 +159,27 @@ QFV_CreateBufferTransitionSet (qfv_buffertransition_t **transitions,
 	}
 	return barrierset;
 }
+
+qfv_bufferview_t *
+QFV_CreateBufferView (qfv_buffer_t *buffer, VkFormat format,
+					  VkDeviceSize offset, VkDeviceSize size)
+{
+	qfv_device_t *device = buffer->device;
+	VkDevice    dev = device->dev;
+    qfv_devfuncs_t *dfunc = device->funcs;
+
+	VkBufferViewCreateInfo createInfo = {
+		VK_STRUCTURE_TYPE_BUFFER_VIEW_CREATE_INFO, 0,
+		0,
+		buffer->buffer, format, offset, size,
+	};
+
+	qfv_bufferview_t *view = malloc (sizeof (*view));
+	view->device = device;
+	view->buffer = buffer;
+	view->format = format;
+	view->offset = offset;
+	view->size = size;
+	dfunc->vkCreateBufferView (dev, &createInfo, 0, &view->view);
+	return view;
+}

From 9fdc15c439bf29c497ba676b35bff4540745fd24 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 10 Feb 2020 18:18:37 +0900
Subject: [PATCH 0341/1519] Implement image stuff up to view creation

---
 include/QF/Vulkan/funclist.h           |   5 +
 include/QF/Vulkan/image.h              |  60 +++++++
 libs/video/renderer/vulkan/Makefile.am |   1 +
 libs/video/renderer/vulkan/command.c   |   7 +-
 libs/video/renderer/vulkan/image.c     | 214 +++++++++++++++++++++++++
 5 files changed, 286 insertions(+), 1 deletion(-)
 create mode 100644 include/QF/Vulkan/image.h
 create mode 100644 libs/video/renderer/vulkan/image.c

diff --git a/include/QF/Vulkan/funclist.h b/include/QF/Vulkan/funclist.h
index 597cb1dc7..c5d79af7b 100644
--- a/include/QF/Vulkan/funclist.h
+++ b/include/QF/Vulkan/funclist.h
@@ -113,6 +113,11 @@ DEVICE_LEVEL_VULKAN_FUNCTION (vkAllocateMemory)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkBindBufferMemory)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkCreateBufferView)
 
+DEVICE_LEVEL_VULKAN_FUNCTION (vkCreateImage)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkGetImageMemoryRequirements)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkBindImageMemory)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkCreateImageView)
+
 DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdPipelineBarrier)
 
 #undef DEVICE_LEVEL_VULKAN_FUNCTION
diff --git a/include/QF/Vulkan/image.h b/include/QF/Vulkan/image.h
new file mode 100644
index 000000000..9c927e6b6
--- /dev/null
+++ b/include/QF/Vulkan/image.h
@@ -0,0 +1,60 @@
+#ifndef __QF_Vulkan_image_h
+#define __QF_Vulkan_image_h
+
+typedef struct qfv_image_s {
+	struct qfv_device_s *device;
+	VkImage    image;
+} qfv_image_t;
+
+typedef struct qfv_imagetransition_s {
+	qfv_image_t *image;
+	VkAccessFlags srcAccess;
+	VkAccessFlags dstAccess;
+	VkImageLayout oldLayout;
+	VkImageLayout newLayout;
+	uint32_t      srcQueueFamily;
+	uint32_t      dstQueueFamily;
+	VkImageAspectFlags aspect;
+} qfv_imagetransition_t;
+
+typedef struct qfv_imagebarrierset_s {
+	struct qfv_device_s *device;
+	uint32_t    numBarriers;
+	VkImageMemoryBarrier *barriers;
+} qfv_imagebarrierset_t;
+
+typedef struct qfv_imageview_s {
+	struct qfv_device_s *device;
+	VkImageView view;
+	qfv_image_t *image;
+	VkImageViewType type;
+	VkFormat    format;
+	VkImageAspectFlags aspect;
+} qfv_imageview_t;
+
+struct qfv_device_s;
+qfv_image_t *QFV_CreateImage (struct qfv_device_s *device, int cubemap,
+							  VkImageType type,
+							  VkFormat format,
+							  VkExtent3D size,
+							  uint32_t num_mipmaps,
+							  uint32_t num_layers,
+							  VkSampleCountFlagBits samples,
+							  VkImageUsageFlags usage_scenarios);
+
+struct qfv_memory_s *QFV_AllocImageMemory (qfv_image_t *image,
+									 VkMemoryPropertyFlags properties,
+									 VkDeviceSize size, VkDeviceSize offset);
+
+int QFV_BindImageMemory (qfv_image_t *image, struct qfv_memory_s *memory,
+						  VkDeviceSize offset);
+
+qfv_imagebarrierset_t *
+QFV_CreateImageTransitionSet (qfv_imagetransition_t **transitions,
+							   int numTransitions);
+
+qfv_imageview_t *QFV_CreateImageView (qfv_image_t *image, VkImageViewType type,
+									  VkFormat format,
+									  VkImageAspectFlags aspect);
+
+#endif//__QF_Vulkan_image_h
diff --git a/libs/video/renderer/vulkan/Makefile.am b/libs/video/renderer/vulkan/Makefile.am
index cfe2acb0d..810e86d29 100644
--- a/libs/video/renderer/vulkan/Makefile.am
+++ b/libs/video/renderer/vulkan/Makefile.am
@@ -7,6 +7,7 @@ vulkan_src = \
 	buffer.c \
 	command.c \
 	device.c \
+	image.c \
 	instance.c \
 	swapchain.c \
 	util.c \
diff --git a/libs/video/renderer/vulkan/command.c b/libs/video/renderer/vulkan/command.c
index f30b1dfeb..ecc6f7975 100644
--- a/libs/video/renderer/vulkan/command.c
+++ b/libs/video/renderer/vulkan/command.c
@@ -50,6 +50,7 @@
 #include "QF/vid.h"
 #include "QF/Vulkan/qf_vid.h"
 #include "QF/Vulkan/buffer.h"//FIXME should QFV_CmdPipelineBarrier be here?
+#include "QF/Vulkan/image.h"//FIXME should QFV_CmdPipelineBarrier be here?
 #include "QF/Vulkan/command.h"
 #include "QF/Vulkan/device.h"
 #include "QF/Vulkan/instance.h"
@@ -396,7 +397,7 @@ QFV_CmdPipelineBarrier (qfv_cmdbuffer_t *cmdBuffer,
 						VkDependencyFlags dependencyFlags,
 						struct qfv_memorybarrierset_s *memBarrierSet,
 						qfv_bufferbarrierset_t *buffBarrierSet,
-						struct qfv_imagebarrierset_s *imgBarrierSet)
+						qfv_imagebarrierset_t *imgBarrierSet)
 {
 	qfv_device_t *device = cmdBuffer->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
@@ -411,6 +412,10 @@ QFV_CmdPipelineBarrier (qfv_cmdbuffer_t *cmdBuffer,
 		numBuffBarriers = buffBarrierSet->numBarriers;
 		buffBarriers = buffBarrierSet->barriers;
 	}
+	if (imgBarrierSet) {
+		numImgBarriers = imgBarrierSet->numBarriers;
+		imgBarriers = imgBarrierSet->barriers;
+	}
 	dfunc->vkCmdPipelineBarrier (cmdBuffer->buffer,
 								  srcStageMask, dstStageMask, dependencyFlags,
 								  numMemBarriers, memBarriers,
diff --git a/libs/video/renderer/vulkan/image.c b/libs/video/renderer/vulkan/image.c
new file mode 100644
index 000000000..18057278f
--- /dev/null
+++ b/libs/video/renderer/vulkan/image.c
@@ -0,0 +1,214 @@
+/*
+	image.c
+
+	Vulkan image functions
+
+	Copyright (C) 1996-1997 Id Software, Inc.
+	Copyright (C) 2020      Bill Currie <bill@taniwha.org>
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifdef HAVE_MATH_H
+# include <math.h>
+#endif
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+
+#include "QF/cvar.h"
+#include "QF/dstring.h"
+#include "QF/input.h"
+#include "QF/mathlib.h"
+#include "QF/qargs.h"
+#include "QF/quakefs.h"
+#include "QF/sys.h"
+#include "QF/va.h"
+#include "QF/vid.h"
+#include "QF/Vulkan/qf_vid.h"
+#include "QF/Vulkan/buffer.h"//FIXME qfv_memory_t
+#include "QF/Vulkan/device.h"
+#include "QF/Vulkan/image.h"
+#include "QF/Vulkan/instance.h"
+
+#include "compat.h"
+#include "d_iface.h"
+#include "r_internal.h"
+#include "vid_vulkan.h"
+
+#include "util.h"
+
+qfv_image_t *
+QFV_CreateImage (qfv_device_t *device, int cubemap,
+				 VkImageType type,
+				 VkFormat format,
+				 VkExtent3D size,
+				 uint32_t num_mipmaps,
+				 uint32_t num_layers,
+				 VkSampleCountFlagBits samples,
+				 VkImageUsageFlags usage_scenarios)
+{
+	VkDevice    dev = device->dev;
+	qfv_devfuncs_t *dfunc = device->funcs;
+	VkImageCreateInfo createInfo = {
+		VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO, 0,
+		cubemap ? VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT : 0,
+		type, format, size, num_mipmaps,
+		cubemap ? 6 * num_layers : num_layers,
+		samples,
+		VK_IMAGE_TILING_OPTIMAL,
+		usage_scenarios,
+		VK_SHARING_MODE_EXCLUSIVE,
+		0, 0,
+		VK_IMAGE_LAYOUT_UNDEFINED,
+	};
+	qfv_image_t *image = malloc (sizeof (*image));
+	dfunc->vkCreateImage (dev, &createInfo, 0, &image->image);
+	image->device = device;
+	return image;
+}
+
+qfv_memory_t *
+QFV_AllocImageMemory (qfv_image_t *image, VkMemoryPropertyFlags properties,
+					   VkDeviceSize size, VkDeviceSize offset)
+{
+	qfv_device_t *device = image->device;
+	VkDevice    dev = device->dev;
+	qfv_physdev_t *physdev = device->physDev;
+	VkPhysicalDeviceMemoryProperties *memprops = &physdev->memory_properties;
+    qfv_devfuncs_t *dfunc = device->funcs;
+
+	VkMemoryRequirements requirements;
+	dfunc->vkGetImageMemoryRequirements (dev, image->image, &requirements);
+
+	size = max (size, offset + requirements.size);
+	VkDeviceMemory object = 0;
+
+	for (uint32_t type = 0; type < memprops->memoryTypeCount; type++) {
+		if ((requirements.memoryTypeBits & (1 << type))
+			&& ((memprops->memoryTypes[type].propertyFlags & properties)
+				== properties)) {
+			VkMemoryAllocateInfo allocate_info = {
+				VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO, 0,
+				size, type
+			};
+
+			VkResult res = dfunc->vkAllocateMemory (dev, &allocate_info,
+													0, &object);
+			if (res == VK_SUCCESS) {
+				break;
+			}
+		}
+	}
+
+	qfv_memory_t *memory = 0;
+
+	if (object) {
+		memory = malloc (sizeof (*memory));
+		memory->device = device;
+		memory->object = object;
+	}
+	return memory;
+}
+
+int
+QFV_BindImageMemory (qfv_image_t *image, qfv_memory_t *memory,
+					  VkDeviceSize offset)
+{
+	qfv_device_t *device = image->device;
+	VkDevice    dev = device->dev;
+    qfv_devfuncs_t *dfunc = device->funcs;
+	VkResult res = dfunc->vkBindImageMemory (dev, image->image,
+											  memory->object, offset);
+	return res == VK_SUCCESS;
+}
+
+qfv_imagebarrierset_t *
+QFV_CreateImageTransitionSet (qfv_imagetransition_t **transitions,
+							   int numTransitions)
+{
+	qfv_device_t *device = transitions[0]->image->device;
+	qfv_imagebarrierset_t *barrierset = malloc (sizeof (*barrierset)
+									   + sizeof (VkImageMemoryBarrier) * numTransitions);
+
+	barrierset->device = device;
+	barrierset->numBarriers = numTransitions;
+	barrierset->barriers = (VkImageMemoryBarrier *) (barrierset + 1);
+
+	for (int i = 0; i < numTransitions; i++) {
+		VkImageMemoryBarrier *barrier = &barrierset->barriers[i];
+		barrier->sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER;
+		barrier->pNext = 0;
+		barrier->srcAccessMask = transitions[i]->srcAccess;
+		barrier->dstAccessMask = transitions[i]->dstAccess;
+		barrier->oldLayout = transitions[i]->oldLayout;
+		barrier->newLayout = transitions[i]->newLayout;
+		barrier->srcQueueFamilyIndex = transitions[i]->srcQueueFamily;
+		barrier->dstQueueFamilyIndex = transitions[i]->dstQueueFamily;
+		barrier->image = transitions[i]->image->image;
+		barrier->subresourceRange.aspectMask = transitions[i]->aspect;
+		barrier->subresourceRange.baseMipLevel = 0;
+		barrier->subresourceRange.levelCount = VK_REMAINING_MIP_LEVELS;
+		barrier->subresourceRange.baseArrayLayer = 0;
+		barrier->subresourceRange.layerCount = VK_REMAINING_ARRAY_LAYERS;
+	}
+	return barrierset;
+}
+
+qfv_imageview_t *
+QFV_CreateImageView (qfv_image_t *image, VkImageViewType type, VkFormat format,
+					 VkImageAspectFlags aspect)
+{
+	qfv_device_t *device = image->device;
+	VkDevice    dev = device->dev;
+    qfv_devfuncs_t *dfunc = device->funcs;
+
+	VkImageViewCreateInfo createInfo = {
+		VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO, 0,
+		0,
+		image->image, type, format,
+		{
+			VK_COMPONENT_SWIZZLE_IDENTITY,
+			VK_COMPONENT_SWIZZLE_IDENTITY,
+			VK_COMPONENT_SWIZZLE_IDENTITY,
+			VK_COMPONENT_SWIZZLE_IDENTITY,
+		},
+		{
+			aspect,
+			0, VK_REMAINING_MIP_LEVELS,
+			0, VK_REMAINING_ARRAY_LAYERS,
+		}
+	};
+
+	qfv_imageview_t *view = malloc (sizeof (*view));
+	view->device = device;
+	view->image = image;
+	view->type = type;
+	view->format = format;
+	view->aspect = aspect;
+	dfunc->vkCreateImageView (dev, &createInfo, 0, &view->view);
+	return view;
+}

From 43e37aa31e62ace1b3195d8962c3ced465d38cdd Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 10 Feb 2020 18:33:29 +0900
Subject: [PATCH 0342/1519] Separate out the generic memory stuff

---
 include/QF/Vulkan/buffer.h          | 9 ++-------
 include/QF/Vulkan/memory.h          | 9 +++++++++
 libs/video/renderer/vulkan/buffer.c | 1 +
 libs/video/renderer/vulkan/image.c  | 2 +-
 4 files changed, 13 insertions(+), 8 deletions(-)
 create mode 100644 include/QF/Vulkan/memory.h

diff --git a/include/QF/Vulkan/buffer.h b/include/QF/Vulkan/buffer.h
index e61e4c744..09ff14c2b 100644
--- a/include/QF/Vulkan/buffer.h
+++ b/include/QF/Vulkan/buffer.h
@@ -6,11 +6,6 @@ typedef struct qfv_buffer_s {
 	VkBuffer    buffer;
 } qfv_buffer_t;
 
-typedef struct qfv_memory_s {
-	struct qfv_device_s *device;
-	VkDeviceMemory object;
-} qfv_memory_t;
-
 typedef struct qfv_buffertransition_s {
 	qfv_buffer_t *buffer;
 	VkAccessFlags srcAccess;
@@ -41,11 +36,11 @@ qfv_buffer_t *QFV_CreateBuffer (struct qfv_device_s *device,
 								VkDeviceSize size,
 								VkBufferUsageFlags usage);
 
-qfv_memory_t *QFV_AllocBufferMemory (qfv_buffer_t *buffer,
+struct qfv_memory_s *QFV_AllocBufferMemory (qfv_buffer_t *buffer,
 									 VkMemoryPropertyFlags properties,
 									 VkDeviceSize size, VkDeviceSize offset);
 
-int QFV_BindBufferMemory (qfv_buffer_t *buffer, qfv_memory_t *memory,
+int QFV_BindBufferMemory (qfv_buffer_t *buffer, struct qfv_memory_s *memory,
 						  VkDeviceSize offset);
 
 qfv_bufferbarrierset_t *
diff --git a/include/QF/Vulkan/memory.h b/include/QF/Vulkan/memory.h
new file mode 100644
index 000000000..d50bddd00
--- /dev/null
+++ b/include/QF/Vulkan/memory.h
@@ -0,0 +1,9 @@
+#ifndef __QF_Vulkan_memory_h
+#define __QF_Vulkan_memory_h
+
+typedef struct qfv_memory_s {
+	struct qfv_device_s *device;
+	VkDeviceMemory object;
+} qfv_memory_t;
+
+#endif//__QF_Vulkan_memory_h
diff --git a/libs/video/renderer/vulkan/buffer.c b/libs/video/renderer/vulkan/buffer.c
index 3f67c80bb..f2053c5db 100644
--- a/libs/video/renderer/vulkan/buffer.c
+++ b/libs/video/renderer/vulkan/buffer.c
@@ -52,6 +52,7 @@
 #include "QF/Vulkan/buffer.h"
 #include "QF/Vulkan/device.h"
 #include "QF/Vulkan/instance.h"
+#include "QF/Vulkan/memory.h"
 
 #include "compat.h"
 #include "d_iface.h"
diff --git a/libs/video/renderer/vulkan/image.c b/libs/video/renderer/vulkan/image.c
index 18057278f..4564fd2fe 100644
--- a/libs/video/renderer/vulkan/image.c
+++ b/libs/video/renderer/vulkan/image.c
@@ -49,10 +49,10 @@
 #include "QF/va.h"
 #include "QF/vid.h"
 #include "QF/Vulkan/qf_vid.h"
-#include "QF/Vulkan/buffer.h"//FIXME qfv_memory_t
 #include "QF/Vulkan/device.h"
 #include "QF/Vulkan/image.h"
 #include "QF/Vulkan/instance.h"
+#include "QF/Vulkan/memory.h"
 
 #include "compat.h"
 #include "d_iface.h"

From 1baee0cbba5c8fc530d6641dd19a6ce4d3f8766b Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 10 Feb 2020 20:42:19 +0900
Subject: [PATCH 0343/1519] Implement mem mapping and buffer/image copying

---
 include/QF/Vulkan/command.h            |  18 +++++
 include/QF/Vulkan/funclist.h           |   7 ++
 include/QF/Vulkan/memory.h             |  11 +++
 libs/video/renderer/vulkan/Makefile.am |   1 +
 libs/video/renderer/vulkan/command.c   |  40 ++++++++++
 libs/video/renderer/vulkan/memory.c    | 102 +++++++++++++++++++++++++
 6 files changed, 179 insertions(+)
 create mode 100644 libs/video/renderer/vulkan/memory.c

diff --git a/include/QF/Vulkan/command.h b/include/QF/Vulkan/command.h
index a19ff7bd3..9326617ca 100644
--- a/include/QF/Vulkan/command.h
+++ b/include/QF/Vulkan/command.h
@@ -90,4 +90,22 @@ void QFV_CmdPipelineBarrier (qfv_cmdbuffer_t *cmdBuffer,
 							 struct qfv_bufferbarrierset_s *buffBarriers,
 							 struct qfv_imagebarrierset_s *imgBarriers);
 
+struct qfv_buffer_s;
+struct qfv_image_s;
+void QFV_CmdCopyBuffer (qfv_cmdbuffer_t *cmdBuffer,
+						struct qfv_buffer_s *src, struct qfv_buffer_s *dst,
+						VkBufferCopy *regions, uint32_t numRegions);
+void QFV_CmdCopyBufferToImage (qfv_cmdbuffer_t *cmdBuffer,
+							   struct qfv_buffer_s *src,
+							   struct qfv_image_s *dst,
+							   VkImageLayout layout,
+							   VkBufferImageCopy *regions,
+							   uint32_t numRegions);
+void QFV_CmdCopyImageToBuffer (qfv_cmdbuffer_t *cmdBuffer,
+							   struct qfv_image_s *src,
+							   VkImageLayout layout,
+							   struct qfv_buffer_s *dst,
+							   VkBufferImageCopy *regions,
+							   uint32_t numRegions);
+
 #endif//__QF_Vulkan_command_h
diff --git a/include/QF/Vulkan/funclist.h b/include/QF/Vulkan/funclist.h
index c5d79af7b..aded86eb6 100644
--- a/include/QF/Vulkan/funclist.h
+++ b/include/QF/Vulkan/funclist.h
@@ -118,7 +118,14 @@ DEVICE_LEVEL_VULKAN_FUNCTION (vkGetImageMemoryRequirements)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkBindImageMemory)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkCreateImageView)
 
+DEVICE_LEVEL_VULKAN_FUNCTION (vkMapMemory)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkUnmapMemory)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkFlushMappedMemoryRanges)
+
 DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdPipelineBarrier)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdCopyBuffer)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdCopyBufferToImage)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdCopyImageToBuffer)
 
 #undef DEVICE_LEVEL_VULKAN_FUNCTION
 
diff --git a/include/QF/Vulkan/memory.h b/include/QF/Vulkan/memory.h
index d50bddd00..bae79d9b7 100644
--- a/include/QF/Vulkan/memory.h
+++ b/include/QF/Vulkan/memory.h
@@ -6,4 +6,15 @@ typedef struct qfv_memory_s {
 	VkDeviceMemory object;
 } qfv_memory_t;
 
+typedef struct qfv_mappedmemrange_s {
+	qfv_memory_t *memory;
+	VkDeviceSize offset;
+	VkDeviceSize size;
+} qfv_mappedmemrange_t;
+
+void *QFV_MapMemory (qfv_memory_t *memory,
+					 VkDeviceSize offset, VkDeviceSize size);
+void QFV_UnmapMemory (qfv_memory_t *memory);
+void QFV_FlushMemory (qfv_mappedmemrange_t *ranges, uint32_t numRanges);
+
 #endif//__QF_Vulkan_memory_h
diff --git a/libs/video/renderer/vulkan/Makefile.am b/libs/video/renderer/vulkan/Makefile.am
index 810e86d29..ba9b64948 100644
--- a/libs/video/renderer/vulkan/Makefile.am
+++ b/libs/video/renderer/vulkan/Makefile.am
@@ -9,6 +9,7 @@ vulkan_src = \
 	device.c \
 	image.c \
 	instance.c \
+	memory.c \
 	swapchain.c \
 	util.c \
 	vulkan_draw.c \
diff --git a/libs/video/renderer/vulkan/command.c b/libs/video/renderer/vulkan/command.c
index ecc6f7975..46c2ed83f 100644
--- a/libs/video/renderer/vulkan/command.c
+++ b/libs/video/renderer/vulkan/command.c
@@ -422,3 +422,43 @@ QFV_CmdPipelineBarrier (qfv_cmdbuffer_t *cmdBuffer,
 								  numBuffBarriers, buffBarriers,
 								  numImgBarriers, imgBarriers);
 }
+
+void
+QFV_CmdCopyBuffer (qfv_cmdbuffer_t *cmdBuffer,
+				   struct qfv_buffer_s *src, struct qfv_buffer_s *dst,
+				   VkBufferCopy *regions, uint32_t numRegions)
+{
+	qfv_device_t *device = cmdBuffer->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	dfunc->vkCmdCopyBuffer (cmdBuffer->buffer, src->buffer, dst->buffer,
+							numRegions, regions);
+}
+
+void
+QFV_CmdCopyBufferToImage (qfv_cmdbuffer_t *cmdBuffer,
+						  struct qfv_buffer_s *src,
+						  struct qfv_image_s *dst,
+						  VkImageLayout layout,
+						  VkBufferImageCopy *regions, uint32_t numRegions)
+{
+	qfv_device_t *device = cmdBuffer->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	dfunc->vkCmdCopyBufferToImage (cmdBuffer->buffer, src->buffer, dst->image,
+								   layout, numRegions, regions);
+}
+
+void
+QFV_CmdCopyImageToBuffer (qfv_cmdbuffer_t *cmdBuffer,
+						  struct qfv_image_s *src,
+						  VkImageLayout layout,
+						  struct qfv_buffer_s *dst,
+						  VkBufferImageCopy *regions, uint32_t numRegions)
+{
+	qfv_device_t *device = cmdBuffer->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	dfunc->vkCmdCopyImageToBuffer (cmdBuffer->buffer, src->image, layout,
+								   dst->buffer, numRegions, regions);
+}
diff --git a/libs/video/renderer/vulkan/memory.c b/libs/video/renderer/vulkan/memory.c
new file mode 100644
index 000000000..4ed912edb
--- /dev/null
+++ b/libs/video/renderer/vulkan/memory.c
@@ -0,0 +1,102 @@
+/*
+	memory.c
+
+	Vulkan memory functions
+
+	Copyright (C) 1996-1997 Id Software, Inc.
+	Copyright (C) 2020      Bill Currie <bill@taniwha.org>
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifdef HAVE_MATH_H
+# include <math.h>
+#endif
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+
+#include "QF/cvar.h"
+#include "QF/dstring.h"
+#include "QF/input.h"
+#include "QF/mathlib.h"
+#include "QF/qargs.h"
+#include "QF/quakefs.h"
+#include "QF/sys.h"
+#include "QF/va.h"
+#include "QF/vid.h"
+#include "QF/Vulkan/qf_vid.h"
+#include "QF/Vulkan/device.h"
+#include "QF/Vulkan/instance.h"
+#include "QF/Vulkan/memory.h"
+
+#include "compat.h"
+#include "d_iface.h"
+#include "r_internal.h"
+#include "vid_vulkan.h"
+
+#include "util.h"
+
+void *
+QFV_MapMemory (qfv_memory_t *memory, VkDeviceSize offset, VkDeviceSize size)
+{
+	qfv_device_t *device = memory->device;
+	VkDevice    dev = device->dev;
+	qfv_devfuncs_t *dfunc = device->funcs;
+	void       *map = 0;
+
+	dfunc->vkMapMemory (dev, memory->object, offset, size, 0, &map);
+	return map;
+}
+
+void
+QFV_UnmapMemory (qfv_memory_t *memory)
+{
+	qfv_device_t *device = memory->device;
+	VkDevice    dev = device->dev;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	dfunc->vkUnmapMemory (dev, memory->object);
+}
+
+void
+QFV_FlushMemory (qfv_mappedmemrange_t *flushRanges, uint32_t numFlushRanges)
+{
+	qfv_device_t *device = flushRanges[0].memory->device;
+	VkDevice    dev = device->dev;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	VkMappedMemoryRange *ranges = alloca(sizeof (*ranges) * numFlushRanges);
+
+	for (uint32_t i = 0; i < numFlushRanges; i++) {
+		ranges[i].sType = VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE;
+		ranges[i].pNext = 0;
+		ranges[i].memory = flushRanges[i].memory->object;
+		ranges[i].offset = flushRanges[i].offset;
+		ranges[i].size = flushRanges[i].size;
+	}
+	dfunc->vkFlushMappedMemoryRanges (dev, numFlushRanges, ranges);
+}

From 29b1d6baf8f94d31f4472798f6699abac5e832d5 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 11 Feb 2020 09:37:04 +0900
Subject: [PATCH 0344/1519] Finish up memory stuff

For now, of course.
---
 include/QF/Vulkan/buffer.h          |  4 ++++
 include/QF/Vulkan/funclist.h        |  8 +++++++-
 include/QF/Vulkan/image.h           |  4 ++++
 include/QF/Vulkan/memory.h          |  1 +
 libs/video/renderer/vulkan/buffer.c | 22 ++++++++++++++++++++++
 libs/video/renderer/vulkan/image.c  | 22 ++++++++++++++++++++++
 libs/video/renderer/vulkan/memory.c | 11 +++++++++++
 7 files changed, 71 insertions(+), 1 deletion(-)

diff --git a/include/QF/Vulkan/buffer.h b/include/QF/Vulkan/buffer.h
index 09ff14c2b..ef11ae8b7 100644
--- a/include/QF/Vulkan/buffer.h
+++ b/include/QF/Vulkan/buffer.h
@@ -50,4 +50,8 @@ QFV_CreateBufferTransitionSet (qfv_buffertransition_t **transitions,
 qfv_bufferview_t *QFV_CreateBufferView (qfv_buffer_t *buffer, VkFormat format,
 										VkDeviceSize offset, VkDeviceSize size);
 
+void QFV_DestroyBufferView (qfv_bufferview_t *view);
+
+void QFV_DestroyBuffer (qfv_buffer_t *buffer);
+
 #endif//__QF_Vulkan_buffer_h
diff --git a/include/QF/Vulkan/funclist.h b/include/QF/Vulkan/funclist.h
index aded86eb6..1f00d0b54 100644
--- a/include/QF/Vulkan/funclist.h
+++ b/include/QF/Vulkan/funclist.h
@@ -107,17 +107,23 @@ DEVICE_LEVEL_VULKAN_FUNCTION (vkDestroyFence)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkDestroySemaphore)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkFreeCommandBuffers)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkDestroyCommandPool)
+
 DEVICE_LEVEL_VULKAN_FUNCTION (vkCreateBuffer)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkGetBufferMemoryRequirements)
-DEVICE_LEVEL_VULKAN_FUNCTION (vkAllocateMemory)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkBindBufferMemory)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkCreateBufferView)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkDestroyBufferView)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkDestroyBuffer)
 
 DEVICE_LEVEL_VULKAN_FUNCTION (vkCreateImage)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkGetImageMemoryRequirements)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkBindImageMemory)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkCreateImageView)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkDestroyImageView)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkDestroyImage)
 
+DEVICE_LEVEL_VULKAN_FUNCTION (vkAllocateMemory)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkFreeMemory)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkMapMemory)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkUnmapMemory)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkFlushMappedMemoryRanges)
diff --git a/include/QF/Vulkan/image.h b/include/QF/Vulkan/image.h
index 9c927e6b6..4258fe2e0 100644
--- a/include/QF/Vulkan/image.h
+++ b/include/QF/Vulkan/image.h
@@ -57,4 +57,8 @@ qfv_imageview_t *QFV_CreateImageView (qfv_image_t *image, VkImageViewType type,
 									  VkFormat format,
 									  VkImageAspectFlags aspect);
 
+void QFV_DestroyImageView (qfv_imageview_t *view);
+
+void QFV_DestroyImage (qfv_image_t *image);
+
 #endif//__QF_Vulkan_image_h
diff --git a/include/QF/Vulkan/memory.h b/include/QF/Vulkan/memory.h
index bae79d9b7..55b87f6c6 100644
--- a/include/QF/Vulkan/memory.h
+++ b/include/QF/Vulkan/memory.h
@@ -12,6 +12,7 @@ typedef struct qfv_mappedmemrange_s {
 	VkDeviceSize size;
 } qfv_mappedmemrange_t;
 
+void QFV_FreeMemory (qfv_memory_t *memory);
 void *QFV_MapMemory (qfv_memory_t *memory,
 					 VkDeviceSize offset, VkDeviceSize size);
 void QFV_UnmapMemory (qfv_memory_t *memory);
diff --git a/libs/video/renderer/vulkan/buffer.c b/libs/video/renderer/vulkan/buffer.c
index f2053c5db..e2d598b81 100644
--- a/libs/video/renderer/vulkan/buffer.c
+++ b/libs/video/renderer/vulkan/buffer.c
@@ -184,3 +184,25 @@ QFV_CreateBufferView (qfv_buffer_t *buffer, VkFormat format,
 	dfunc->vkCreateBufferView (dev, &createInfo, 0, &view->view);
 	return view;
 }
+
+void
+QFV_DestroyBufferView (qfv_bufferview_t *view)
+{
+	qfv_device_t *device = view->device;
+	VkDevice    dev = device->dev;
+    qfv_devfuncs_t *dfunc = device->funcs;
+
+	dfunc->vkDestroyBufferView (dev, view->view, 0);
+	free (view);
+}
+
+void
+QFV_DestroyBuffer (qfv_buffer_t *buffer)
+{
+	qfv_device_t *device = buffer->device;
+	VkDevice    dev = device->dev;
+    qfv_devfuncs_t *dfunc = device->funcs;
+
+	dfunc->vkDestroyBuffer (dev, buffer->buffer, 0);
+	free (buffer);
+}
diff --git a/libs/video/renderer/vulkan/image.c b/libs/video/renderer/vulkan/image.c
index 4564fd2fe..63b836be5 100644
--- a/libs/video/renderer/vulkan/image.c
+++ b/libs/video/renderer/vulkan/image.c
@@ -212,3 +212,25 @@ QFV_CreateImageView (qfv_image_t *image, VkImageViewType type, VkFormat format,
 	dfunc->vkCreateImageView (dev, &createInfo, 0, &view->view);
 	return view;
 }
+
+void
+QFV_DestroyImageView (qfv_imageview_t *view)
+{
+	qfv_device_t *device = view->device;
+	VkDevice    dev = device->dev;
+    qfv_devfuncs_t *dfunc = device->funcs;
+
+	dfunc->vkDestroyImageView (dev, view->view, 0);
+	free (view);
+}
+
+void
+QFV_DestroyImage (qfv_image_t *image)
+{
+	qfv_device_t *device = image->device;
+	VkDevice    dev = device->dev;
+    qfv_devfuncs_t *dfunc = device->funcs;
+
+	dfunc->vkDestroyImage (dev, image->image, 0);
+	free (image);
+}
diff --git a/libs/video/renderer/vulkan/memory.c b/libs/video/renderer/vulkan/memory.c
index 4ed912edb..c18a8144f 100644
--- a/libs/video/renderer/vulkan/memory.c
+++ b/libs/video/renderer/vulkan/memory.c
@@ -60,6 +60,17 @@
 
 #include "util.h"
 
+void
+QFV_FreeMemory (qfv_memory_t *memory)
+{
+	qfv_device_t *device = memory->device;
+	VkDevice    dev = device->dev;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	dfunc->vkFreeMemory (dev, memory->object, 0);
+	free (memory);
+}
+
 void *
 QFV_MapMemory (qfv_memory_t *memory, VkDeviceSize offset, VkDeviceSize size)
 {

From 3144443a822a52ac465953042c441ae9f592ca72 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 11 Feb 2020 12:19:16 +0900
Subject: [PATCH 0345/1519] Allow vulkan_draw to compile when optimizing

Even though it's nowhere near done
---
 libs/video/renderer/vulkan/vulkan_draw.c | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/libs/video/renderer/vulkan/vulkan_draw.c b/libs/video/renderer/vulkan/vulkan_draw.c
index 3c8dcc8e4..628306044 100644
--- a/libs/video/renderer/vulkan/vulkan_draw.c
+++ b/libs/video/renderer/vulkan/vulkan_draw.c
@@ -54,10 +54,22 @@
 
 #include "r_internal.h"
 
+static qpic_t *
+pic_data (const char *name, int w, int h, const byte *data)
+{
+	qpic_t     *pic;
+
+	pic = malloc (field_offset (qpic_t, data[w * h]));
+	pic->width = w;
+	pic->height = h;
+	memcpy (pic->data, data, pic->width * pic->height);
+	return pic;
+}
+
 qpic_t *
 vulkan_Draw_MakePic (int width, int height, const byte *data)
 {
-	return 0;
+	return pic_data (0, width, height, data);
 }
 
 void
@@ -68,13 +80,13 @@ vulkan_Draw_DestroyPic (qpic_t *pic)
 qpic_t *
 vulkan_Draw_PicFromWad (const char *name)
 {
-	return 0;
+	return pic_data (0, 1, 1, (const byte *)"");
 }
 
 qpic_t *
 vulkan_Draw_CachePic (const char *path, qboolean alpha)
 {
-	return 0;
+	return pic_data (0, 1, 1, (const byte *)"");
 }
 
 void

From fbd79963bbbbf384cca33a61db8c97b088930c7f Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 11 Feb 2020 15:20:49 +0900
Subject: [PATCH 0346/1519] Update for doxygen 1.8.16

---
 doc/quakeforge.dox.conf.in         | 299 +++++++++++++++++++++--------
 include/QF/alloc.h                 |   4 +-
 include/QF/cbuf.h                  |   4 +-
 include/QF/checksum.h              |   4 +-
 include/QF/cmd.h                   |   4 +-
 include/QF/crc.h                   |   4 +-
 include/QF/cvar.h                  |   8 +-
 include/QF/draw.h                  |   8 +-
 include/QF/dstring.h               |  20 +-
 include/QF/hash.h                  |   4 +-
 include/QF/idparse.h               |   4 +-
 include/QF/info.h                  |   4 +-
 include/QF/keys.h                  |   4 +-
 include/QF/math/dual.h             |   4 +-
 include/QF/math/half.h             |   4 +-
 include/QF/math/matrix3.h          |   4 +-
 include/QF/math/matrix4.h          |   4 +-
 include/QF/math/quaternion.h       |   4 +-
 include/QF/math/vector.h           |   4 +-
 include/QF/mathlib.h               |   4 +-
 include/QF/mdfour.h                |   4 +-
 include/QF/msg.h                   |   4 +-
 include/QF/pak.h                   |   4 +-
 include/QF/pakfile.h               |   4 +-
 include/QF/plugin.h                |   4 +-
 include/QF/pr_type.h               |   4 +-
 include/QF/progs.h                 |  73 +++----
 include/QF/qargs.h                 |   4 +-
 include/QF/qendian.h               |   4 +-
 include/QF/qfplist.h               |   4 +-
 include/QF/quakefs.h               |   4 +-
 include/QF/quakeio.h               |   4 +-
 include/QF/script.h                |   4 +-
 include/QF/set.h                   |   4 +-
 include/QF/sizebuf.h               |   4 +-
 include/QF/sound.h                 |  12 +-
 include/QF/sys.h                   |   4 +-
 include/QF/va.h                    |   4 +-
 include/QF/ver_check.h             |   4 +-
 include/QF/view.h                  |   4 +-
 include/QF/wad.h                   |   4 +-
 include/QF/wadfile.h               |   4 +-
 include/QF/winding.h               |   4 +-
 include/QF/zone.h                  |   4 +-
 include/net_dgrm.h                 |   4 +-
 include/net_loop.h                 |   4 +-
 include/net_udp.h                  |   4 +-
 include/net_vcr.h                  |   4 +-
 include/net_wins.h                 |   4 +-
 include/netchan.h                  |  12 +-
 include/netmain.h                  |  28 +--
 include/snd_internal.h             |  28 +--
 libs/models/winding.c              |   6 -
 qtv/include/connection.h           |   4 +-
 qtv/include/qtv.h                  |   4 +-
 ruamoko/include/gui/Group.h        |   4 +-
 ruamoko/include/gui/InputLine.h    |   8 +-
 ruamoko/include/gui/Pic.h          |   4 +-
 ruamoko/include/gui/Point.h        |   4 +-
 ruamoko/include/gui/Rect.h         |   4 +-
 ruamoko/include/gui/Size.h         |   4 +-
 ruamoko/include/gui/Slider.h       |   4 +-
 ruamoko/include/gui/Text.h         |   4 +-
 ruamoko/include/gui/View.h         |   4 +-
 tools/qfbsp/include/brush.h        |   4 +-
 tools/qfbsp/include/bsp5.h         |   4 +-
 tools/qfbsp/include/csg4.h         |   4 +-
 tools/qfbsp/include/draw.h         |   4 +-
 tools/qfbsp/include/map.h          |   4 +-
 tools/qfbsp/include/merge.h        |   4 +-
 tools/qfbsp/include/options.h      |   4 +-
 tools/qfbsp/include/outside.h      |   4 +-
 tools/qfbsp/include/portals.h      |   4 +-
 tools/qfbsp/include/readbsp.h      |   4 +-
 tools/qfbsp/include/region.h       |   4 +-
 tools/qfbsp/include/solidbsp.h     |   4 +-
 tools/qfbsp/include/surfaces.h     |   4 +-
 tools/qfbsp/include/tjunc.h        |   4 +-
 tools/qfbsp/include/writebsp.h     |   4 +-
 tools/qfcc/include/dags.h          |   4 +-
 tools/qfcc/include/def.h           |   8 +-
 tools/qfcc/include/defspace.h      |   4 +-
 tools/qfcc/include/diagnostic.h    |   4 +-
 tools/qfcc/include/expr.h          |   4 +-
 tools/qfcc/include/flow.h          |   4 +-
 tools/qfcc/include/function.h      |   4 +-
 tools/qfcc/include/obj_file.h      |  21 +-
 tools/qfcc/include/obj_type.h      |   2 -
 tools/qfcc/include/pragma.h        |   4 +-
 tools/qfcc/include/qfcc.h          |   4 +-
 tools/qfcc/include/symtab.h        |   4 +-
 tools/qfcc/include/value.h         |   4 +-
 tools/qflight/include/entities.h   |   4 +-
 tools/qflight/include/light.h      |   4 +-
 tools/qflight/include/noise.h      |   4 +-
 tools/qflight/include/options.h    |   4 +-
 tools/qflight/include/properties.h |   4 +-
 tools/qflight/include/threads.h    |   4 +-
 98 files changed, 496 insertions(+), 373 deletions(-)

diff --git a/doc/quakeforge.dox.conf.in b/doc/quakeforge.dox.conf.in
index 9db22207d..64028f578 100644
--- a/doc/quakeforge.dox.conf.in
+++ b/doc/quakeforge.dox.conf.in
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.9.1
+# Doxyfile 1.8.16
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -17,11 +17,11 @@
 # Project related configuration options
 #---------------------------------------------------------------------------
 
-# This tag specifies the encoding used for all characters in the config file
-# that follow. The default is UTF-8 which is also the encoding used for all text
-# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
-# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv
-# for the list of possible encodings.
+# This tag specifies the encoding used for all characters in the configuration
+# file that follow. The default is UTF-8 which is also the encoding used for all
+# text before the first occurrence of this tag. Doxygen uses libiconv (or the
+# iconv built into libc) for the transcoding. See
+# https://www.gnu.org/software/libiconv/ for the list of possible encodings.
 # The default value is: UTF-8.
 
 DOXYFILE_ENCODING      = UTF-8
@@ -93,6 +93,14 @@ ALLOW_UNICODE_NAMES    = NO
 
 OUTPUT_LANGUAGE        = English
 
+# The OUTPUT_TEXT_DIRECTION tag is used to specify the direction in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all generated output in the proper direction.
+# Possible values are: None, LTR, RTL and Context.
+# The default value is: None.
+
+OUTPUT_TEXT_DIRECTION  = None
+
 # If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
 # descriptions after the members that are listed in the file and class
 # documentation (similar to Javadoc). Set to NO to disable this.
@@ -179,6 +187,16 @@ SHORT_NAMES            = NO
 
 JAVADOC_AUTOBRIEF      = YES
 
+# If the JAVADOC_BANNER tag is set to YES then doxygen will interpret a line
+# such as
+# /***************
+# as being the beginning of a Javadoc-style comment "banner". If set to NO, the
+# Javadoc-style will behave just like regular comments and it will not be
+# interpreted by doxygen.
+# The default value is: NO.
+
+JAVADOC_BANNER         = NO
+
 # If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
 # line (until the first dot) of a Qt-style comment as the brief description. If
 # set to NO, the Qt-style will behave just like regular Qt-style comments (thus
@@ -226,7 +244,12 @@ TAB_SIZE               = 4
 # will allow you to put the command \sideeffect (or @sideeffect) in the
 # documentation, which will result in a user-defined paragraph with heading
 # "Side Effects:". You can put \n's in the value part of an alias to insert
-# newlines.
+# newlines (in the resulting output). You can put ^^ in the value part of an
+# alias to insert a newline as if a physical newline was in the original file.
+# When you need a literal { or } or , in the value part of an alias you have to
+# escape them by means of a backslash (\), this can lead to conflicts with the
+# commands \{ and \} for these it is advised to use the version @{ and @} or use
+# a double escape (\\{ and \\})
 
 ALIASES                = QF=QuakeForge
 
@@ -264,17 +287,26 @@ OPTIMIZE_FOR_FORTRAN   = NO
 
 OPTIMIZE_OUTPUT_VHDL   = NO
 
+# Set the OPTIMIZE_OUTPUT_SLICE tag to YES if your project consists of Slice
+# sources only. Doxygen will then generate output that is more tailored for that
+# language. For instance, namespaces will be presented as modules, types will be
+# separated into more groups, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_SLICE  = NO
+
 # Doxygen selects the parser to use depending on the extension of the files it
 # parses. With this tag you can assign which parser to use for a given
 # extension. Doxygen has a built-in mapping, but you can override or extend it
 # using this tag. The format is ext=language, where ext is a file extension, and
 # language is one of the parsers supported by doxygen: IDL, Java, Javascript,
-# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran:
-# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran:
-# Fortran. In the later case the parser tries to guess whether the code is fixed
-# or free formatted code, this is the default for Fortran type files), VHDL. For
-# instance to make doxygen treat .inc files as Fortran files (default is PHP),
-# and .f files as C (default is Fortran), use: inc=Fortran f=C.
+# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
+# FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
+# tries to guess whether the code is fixed or free formatted code, this is the
+# default for Fortran type files), VHDL, tcl. For instance to make doxygen treat
+# .inc files as Fortran files (default is PHP), and .f files as C (default is
+# Fortran), use: inc=Fortran f=C.
 #
 # Note: For files without extension you can use no_extension as a placeholder.
 #
@@ -285,7 +317,7 @@ EXTENSION_MAPPING      = no_extension=C
 
 # If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
 # according to the Markdown format, which allows for more readable
-# documentation. See http://daringfireball.net/projects/markdown/ for details.
+# documentation. See https://daringfireball.net/projects/markdown/ for details.
 # The output of markdown processing is further processed by doxygen, so you can
 # mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
 # case of backward compatibilities issues.
@@ -293,6 +325,15 @@ EXTENSION_MAPPING      = no_extension=C
 
 MARKDOWN_SUPPORT       = YES
 
+# When the TOC_INCLUDE_HEADINGS tag is set to a non-zero value, all headings up
+# to that level are automatically included in the table of contents, even if
+# they do not have an id attribute.
+# Note: This feature currently applies only to Markdown headings.
+# Minimum value: 0, maximum value: 99, default value: 5.
+# This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
+
+TOC_INCLUDE_HEADINGS   = 5
+
 # When enabled doxygen tries to link words that correspond to documented
 # classes, or namespaces to their corresponding documentation. Such a link can
 # be prevented in individual cases by putting a % sign in front of the word or
@@ -318,7 +359,7 @@ BUILTIN_STL_SUPPORT    = NO
 CPP_CLI_SUPPORT        = NO
 
 # Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
-# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen
+# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen
 # will parse them like normal C++ but will assume all classes use public instead
 # of private inheritance when no explicit protection keyword is present.
 # The default value is: NO.
@@ -343,6 +384,13 @@ IDL_PROPERTY_SUPPORT   = YES
 
 DISTRIBUTE_GROUP_DOC   = NO
 
+# If one adds a struct or class to a group and this option is enabled, then also
+# any nested class or struct is added to the same group. By default this option
+# is disabled and one has to add nested compounds explicitly via \ingroup.
+# The default value is: NO.
+
+GROUP_NESTED_COMPOUNDS = YES
+
 # Set the SUBGROUPING tag to YES to allow class member groups of the same type
 # (for instance a group of public functions) to be put as a subgroup of that
 # type (e.g. under the Public Functions section). Set it to NO to prevent
@@ -417,6 +465,12 @@ EXTRACT_ALL            = YES
 
 EXTRACT_PRIVATE        = NO
 
+# If the EXTRACT_PRIV_VIRTUAL tag is set to YES, documented private virtual
+# methods of a class will be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PRIV_VIRTUAL   = NO
+
 # If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal
 # scope will be included in the documentation.
 # The default value is: NO.
@@ -437,7 +491,7 @@ EXTRACT_STATIC         = @STATIC_DOC@
 
 EXTRACT_LOCAL_CLASSES  = NO
 
-# This flag is only useful for Objective-C code. When set to YES, local methods,
+# This flag is only useful for Objective-C code. If set to YES, local methods,
 # which are defined in the implementation section but not in the interface are
 # included in the documentation. If set to NO, only methods in the interface are
 # included.
@@ -495,7 +549,7 @@ INTERNAL_DOCS          = NO
 # names in lower-case letters. If set to YES, upper-case letters are also
 # allowed. This is useful if you have classes or files whose names only differ
 # in case and if your file system supports case sensitive file names. Windows
-# and Mac users are advised to set this option to NO.
+# (including Cygwin) ands Mac users are advised to set this option to NO.
 # The default value is: system dependent.
 
 CASE_SENSE_NAMES       = NO
@@ -682,7 +736,7 @@ LAYOUT_FILE            =
 # The CITE_BIB_FILES tag can be used to specify one or more bib files containing
 # the reference definitions. This must be a list of .bib files. The .bib
 # extension is automatically appended if omitted. This requires the bibtex tool
-# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info.
+# to be installed. See also https://en.wikipedia.org/wiki/BibTeX for more info.
 # For LaTeX the style of the bibliography can be controlled using
 # LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
 # search path. See also \cite for info how to create references.
@@ -727,11 +781,18 @@ WARN_IF_DOC_ERROR      = YES
 # This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
 # are documented, but have no documentation for their parameters or return
 # value. If set to NO, doxygen will only warn about wrong or incomplete
-# parameter documentation, but not about the absence of documentation.
+# parameter documentation, but not about the absence of documentation. If
+# EXTRACT_ALL is set to YES then this flag will automatically be disabled.
 # The default value is: NO.
 
 WARN_NO_PARAMDOC       = NO
 
+# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when
+# a warning is encountered.
+# The default value is: NO.
+
+WARN_AS_ERROR          = NO
+
 # The WARN_FORMAT tag determines the format of the warning messages that doxygen
 # can produce. The string should contain the $file, $line, and $text tags, which
 # will be replaced by the file and line number from which the warning originated
@@ -755,7 +816,7 @@ WARN_LOGFILE           =
 # The INPUT tag is used to specify the files and/or directories that contain
 # documented source files. You may enter file names like myfile.cpp or
 # directories like /usr/src/myproject. Separate the files or directories with
-# spaces.
+# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
 # Note: If this tag is empty the current directory is searched.
 
 INPUT                  = @TOPSRC@/include \
@@ -770,7 +831,7 @@ INPUT                  = @TOPSRC@/include \
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
 # libiconv (or the iconv built into libc) for the transcoding. See the libiconv
-# documentation (see: http://www.gnu.org/software/libiconv) for the list of
+# documentation (see: https://www.gnu.org/software/libiconv/) for the list of
 # possible encodings.
 # The default value is: UTF-8.
 
@@ -778,12 +839,17 @@ INPUT_ENCODING         = UTF-8
 
 # If the value of the INPUT tag contains directories, you can use the
 # FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
-# *.h) to filter out the source-files in the directories. If left blank the
-# following patterns are tested:*.c, *.cc, *.cxx, *.cpp, *.c++, *.java, *.ii,
-# *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h, *.hh, *.hxx, *.hpp,
-# *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc, *.m, *.markdown,
-# *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf,
-# *.qsf, *.as and *.js.
+# *.h) to filter out the source-files in the directories.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# read by doxygen.
+#
+# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
+# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
+# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
+# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
+# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
 
 FILE_PATTERNS          = *.c \
                          *.h \
@@ -889,6 +955,10 @@ IMAGE_PATH             = @TOPSRC@/doc \
 # Note that the filter must not add or remove lines; it is applied before the
 # code is scanned, but not when the output code is generated. If lines are added
 # or removed, the anchors will not be placed correctly.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# properly processed by doxygen.
 
 INPUT_FILTER           =
 
@@ -898,6 +968,10 @@ INPUT_FILTER           =
 # (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
 # filters are used. If the FILTER_PATTERNS tag is empty or if none of the
 # patterns match the file name, INPUT_FILTER is applied.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# properly processed by doxygen.
 
 FILTER_PATTERNS        =
 
@@ -950,7 +1024,7 @@ INLINE_SOURCES         = NO
 STRIP_CODE_COMMENTS    = YES
 
 # If the REFERENCED_BY_RELATION tag is set to YES then for each documented
-# function all documented functions referencing it will be listed.
+# entity all documented functions referencing it will be listed.
 # The default value is: NO.
 
 REFERENCED_BY_RELATION = NO
@@ -982,12 +1056,12 @@ SOURCE_TOOLTIPS        = YES
 # If the USE_HTAGS tag is set to YES then the references to source code will
 # point to the HTML generated by the htags(1) tool instead of doxygen built-in
 # source browser. The htags tool is part of GNU's global source tagging system
-# (see http://www.gnu.org/software/global/global.html). You will need version
+# (see https://www.gnu.org/software/global/global.html). You will need version
 # 4.8.6 or higher.
 #
 # To use it do the following:
 # - Install the latest version of global
-# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
+# - Enable SOURCE_BROWSER and USE_HTAGS in the configuration file
 # - Make sure the INPUT points to the root of the source tree
 # - Run doxygen as normal
 #
@@ -1015,7 +1089,7 @@ VERBATIM_HEADERS       = NO
 # rich C++ code for which doxygen's built-in parser lacks the necessary type
 # information.
 # Note: The availability of this option depends on whether or not doxygen was
-# compiled with the --with-libclang option.
+# generated with the -Duse_libclang=ON option for CMake.
 # The default value is: NO.
 
 CLANG_ASSISTED_PARSING = NO
@@ -1028,6 +1102,16 @@ CLANG_ASSISTED_PARSING = NO
 
 CLANG_OPTIONS          =
 
+# If clang assisted parsing is enabled you can provide the clang parser with the
+# path to the compilation database (see:
+# http://clang.llvm.org/docs/HowToSetupToolingForLLVM.html) used when the files
+# were built. This is equivalent to specifying the "-p" option to a clang tool,
+# such as clang-check. These options will then be passed to the parser.
+# Note: The availability of this option depends on whether or not doxygen was
+# generated with the -Duse_libclang=ON option for CMake.
+
+CLANG_DATABASE_PATH    =
+
 #---------------------------------------------------------------------------
 # Configuration options related to the alphabetical class index
 #---------------------------------------------------------------------------
@@ -1146,7 +1230,7 @@ HTML_EXTRA_FILES       =
 # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
 # will adjust the colors in the style sheet and background images according to
 # this color. Hue is specified as an angle on a colorwheel, see
-# http://en.wikipedia.org/wiki/Hue for more information. For instance the value
+# https://en.wikipedia.org/wiki/Hue for more information. For instance the value
 # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
 # purple, and 360 is red again.
 # Minimum value: 0, maximum value: 359, default value: 220.
@@ -1182,6 +1266,17 @@ HTML_COLORSTYLE_GAMMA  = 100
 
 HTML_TIMESTAMP         = NO
 
+# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
+# documentation will contain a main index with vertical navigation menus that
+# are dynamically created via Javascript. If disabled, the navigation index will
+# consists of multiple levels of tabs that are statically embedded in every HTML
+# page. Disable this option to support browsers that do not have Javascript,
+# like the Qt help browser.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_DYNAMIC_MENUS     = YES
+
 # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
 # documentation will contain sections that can be hidden and shown after the
 # page has loaded.
@@ -1205,13 +1300,13 @@ HTML_INDEX_NUM_ENTRIES = 100
 
 # If the GENERATE_DOCSET tag is set to YES, additional index files will be
 # generated that can be used as input for Apple's Xcode 3 integrated development
-# environment (see: http://developer.apple.com/tools/xcode/), introduced with
-# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a
+# environment (see: https://developer.apple.com/xcode/), introduced with OSX
+# 10.5 (Leopard). To create a documentation set, doxygen will generate a
 # Makefile in the HTML output directory. Running make will produce the docset in
 # that directory and running make install will install the docset in
 # ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
-# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
-# for more information.
+# startup. See https://developer.apple.com/library/archive/featuredarticles/Doxy
+# genXcode/_index.html for more information.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
@@ -1250,7 +1345,7 @@ DOCSET_PUBLISHER_NAME  = Publisher
 # If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
 # additional HTML index files: index.hhp, index.hhc, and index.hhk. The
 # index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on
+# (see: https://www.microsoft.com/en-us/download/details.aspx?id=21138) on
 # Windows.
 #
 # The HTML Help Workshop contains a compiler that can convert all HTML output
@@ -1326,7 +1421,7 @@ QCH_FILE               =
 
 # The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
 # Project output. For more information please see Qt Help Project / Namespace
-# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace).
+# (see: https://doc.qt.io/archives/qt-4.8/qthelpproject.html#namespace).
 # The default value is: org.doxygen.Project.
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
@@ -1334,7 +1429,7 @@ QHP_NAMESPACE          = org.doxygen.Project
 
 # The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
 # Help Project output. For more information please see Qt Help Project / Virtual
-# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual-
+# Folders (see: https://doc.qt.io/archives/qt-4.8/qthelpproject.html#virtual-
 # folders).
 # The default value is: doc.
 # This tag requires that the tag GENERATE_QHP is set to YES.
@@ -1343,7 +1438,7 @@ QHP_VIRTUAL_FOLDER     = doc
 
 # If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
 # filter to add. For more information please see Qt Help Project / Custom
-# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# Filters (see: https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-
 # filters).
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
@@ -1351,7 +1446,7 @@ QHP_CUST_FILTER_NAME   =
 
 # The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
 # custom filter to add. For more information please see Qt Help Project / Custom
-# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# Filters (see: https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-
 # filters).
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
@@ -1359,7 +1454,7 @@ QHP_CUST_FILTER_ATTRS  =
 
 # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
 # project's filter section matches. Qt Help Project / Filter Attributes (see:
-# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes).
+# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#filter-attributes).
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_SECT_FILTER_ATTRS  =
@@ -1452,7 +1547,7 @@ EXT_LINKS_IN_WINDOW    = NO
 
 FORMULA_FONTSIZE       = 10
 
-# Use the FORMULA_TRANPARENT tag to determine whether or not the images
+# Use the FORMULA_TRANSPARENT tag to determine whether or not the images
 # generated for formulas are transparent PNGs. Transparent PNGs are not
 # supported properly for IE 6.0, but are supported on all modern browsers.
 #
@@ -1464,7 +1559,7 @@ FORMULA_FONTSIZE       = 10
 FORMULA_TRANSPARENT    = YES
 
 # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# http://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side Javascript for the rendering
 # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
 # installed or if you want to formulas look prettier in the HTML output. When
 # enabled you may also need to install MathJax separately and configure the path
@@ -1491,8 +1586,8 @@ MATHJAX_FORMAT         = HTML-CSS
 # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
 # Content Delivery Network so you can quickly see the result without installing
 # MathJax. However, it is strongly recommended to install a local copy of
-# MathJax from http://www.mathjax.org before deployment.
-# The default value is: http://cdn.mathjax.org/mathjax/latest.
+# MathJax from https://www.mathjax.org before deployment.
+# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
@@ -1553,7 +1648,7 @@ SERVER_BASED_SEARCH    = NO
 #
 # Doxygen ships with an example indexer (doxyindexer) and search engine
 # (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see: http://xapian.org/).
+# Xapian (see: https://xapian.org/).
 #
 # See the section "External Indexing and Searching" for details.
 # The default value is: NO.
@@ -1566,7 +1661,7 @@ EXTERNAL_SEARCH        = NO
 #
 # Doxygen ships with an example indexer (doxyindexer) and search engine
 # (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see: http://xapian.org/). See the section "External Indexing and
+# Xapian (see: https://xapian.org/). See the section "External Indexing and
 # Searching" for details.
 # This tag requires that the tag SEARCHENGINE is set to YES.
 
@@ -1618,21 +1713,35 @@ LATEX_OUTPUT           = latex
 # The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
 # invoked.
 #
-# Note that when enabling USE_PDFLATEX this option is only used for generating
-# bitmaps for formulas in the HTML output, but not in the Makefile that is
-# written to the output directory.
-# The default file is: latex.
+# Note that when not enabling USE_PDFLATEX the default is latex when enabling
+# USE_PDFLATEX the default is pdflatex and when in the later case latex is
+# chosen this is overwritten by pdflatex. For specific output languages the
+# default can have been set differently, this depends on the implementation of
+# the output language.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_CMD_NAME         = latex
 
 # The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
 # index for LaTeX.
+# Note: This tag is used in the Makefile / make.bat.
+# See also: LATEX_MAKEINDEX_CMD for the part in the generated output file
+# (.tex).
 # The default file is: makeindex.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 MAKEINDEX_CMD_NAME     = makeindex
 
+# The LATEX_MAKEINDEX_CMD tag can be used to specify the command name to
+# generate index for LaTeX. In case there is no backslash (\) as first character
+# it will be automatically added in the LaTeX code.
+# Note: This tag is used in the generated output file (.tex).
+# See also: MAKEINDEX_CMD_NAME for the part in the Makefile / make.bat.
+# The default value is: makeindex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_MAKEINDEX_CMD    = makeindex
+
 # If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX
 # documents. This may be useful for small projects and may help to save some
 # trees in general.
@@ -1651,9 +1760,12 @@ COMPACT_LATEX          = YES
 PAPER_TYPE             = a4wide
 
 # The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
-# that should be included in the LaTeX output. To get the times font for
-# instance you can specify
-# EXTRA_PACKAGES=times
+# that should be included in the LaTeX output. The package can be specified just
+# by its name or with the correct syntax as to be used with the LaTeX
+# \usepackage command. To get the times font for instance you can specify :
+# EXTRA_PACKAGES=times or EXTRA_PACKAGES={times}
+# To use the option intlimits with the amsmath package you can specify:
+# EXTRA_PACKAGES=[intlimits]{amsmath}
 # If left blank no extra packages will be included.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
@@ -1750,12 +1862,28 @@ LATEX_SOURCE_CODE      = NO
 
 # The LATEX_BIB_STYLE tag can be used to specify the style to use for the
 # bibliography, e.g. plainnat, or ieeetr. See
-# http://en.wikipedia.org/wiki/BibTeX and \cite for more info.
+# https://en.wikipedia.org/wiki/BibTeX and \cite for more info.
 # The default value is: plain.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_BIB_STYLE        = plain
 
+# If the LATEX_TIMESTAMP tag is set to YES then the footer of each generated
+# page will contain the date and time when the page was generated. Setting this
+# to NO can help when comparing the output of multiple runs.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_TIMESTAMP        = NO
+
+# The LATEX_EMOJI_DIRECTORY tag is used to specify the (relative or absolute)
+# path from which the emoji images will be read. If a relative path is entered,
+# it will be relative to the LATEX_OUTPUT directory. If left blank the
+# LATEX_OUTPUT directory will be used.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EMOJI_DIRECTORY  =
+
 #---------------------------------------------------------------------------
 # Configuration options related to the RTF output
 #---------------------------------------------------------------------------
@@ -1795,9 +1923,9 @@ COMPACT_RTF            = NO
 
 RTF_HYPERLINKS         = NO
 
-# Load stylesheet definitions from file. Syntax is similar to doxygen's config
-# file, i.e. a series of assignments. You only have to provide replacements,
-# missing definitions are set to their default value.
+# Load stylesheet definitions from file. Syntax is similar to doxygen's
+# configuration file, i.e. a series of assignments. You only have to provide
+# replacements, missing definitions are set to their default value.
 #
 # See also section "Doxygen usage" for information on how to generate the
 # default style sheet that doxygen normally uses.
@@ -1806,8 +1934,8 @@ RTF_HYPERLINKS         = NO
 RTF_STYLESHEET_FILE    =
 
 # Set optional variables used in the generation of an RTF document. Syntax is
-# similar to doxygen's config file. A template extensions file can be generated
-# using doxygen -e rtf extensionFile.
+# similar to doxygen's configuration file. A template extensions file can be
+# generated using doxygen -e rtf extensionFile.
 # This tag requires that the tag GENERATE_RTF is set to YES.
 
 RTF_EXTENSIONS_FILE    =
@@ -1893,6 +2021,13 @@ XML_OUTPUT             = xml
 
 XML_PROGRAMLISTING     = YES
 
+# If the XML_NS_MEMB_FILE_SCOPE tag is set to YES, doxygen will include
+# namespace members in file scope as well, matching the HTML output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_NS_MEMB_FILE_SCOPE = NO
+
 #---------------------------------------------------------------------------
 # Configuration options related to the DOCBOOK output
 #---------------------------------------------------------------------------
@@ -1925,9 +2060,9 @@ DOCBOOK_PROGRAMLISTING = NO
 #---------------------------------------------------------------------------
 
 # If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an
-# AutoGen Definitions (see http://autogen.sf.net) file that captures the
-# structure of the code including all documentation. Note that this feature is
-# still experimental and incomplete at the moment.
+# AutoGen Definitions (see http://autogen.sourceforge.net/) file that captures
+# the structure of the code including all documentation. Note that this feature
+# is still experimental and incomplete at the moment.
 # The default value is: NO.
 
 GENERATE_AUTOGEN_DEF   = NO
@@ -2101,12 +2236,6 @@ EXTERNAL_GROUPS        = YES
 
 EXTERNAL_PAGES         = YES
 
-# The PERL_PATH should be the absolute path and name of the perl script
-# interpreter (i.e. the result of 'which perl').
-# The default file (with absolute path) is: /usr/bin/perl.
-
-PERL_PATH              = /usr/bin/perl
-
 #---------------------------------------------------------------------------
 # Configuration options related to the dot tool
 #---------------------------------------------------------------------------
@@ -2120,15 +2249,6 @@ PERL_PATH              = /usr/bin/perl
 
 CLASS_DIAGRAMS         = YES
 
-# You can define message sequence charts within doxygen comments using the \msc
-# command. Doxygen will then run the mscgen tool (see:
-# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
-# documentation. The MSCGEN_PATH tag allows you to specify the directory where
-# the mscgen tool resides. If left empty the tool is assumed to be found in the
-# default search path.
-
-MSCGEN_PATH            =
-
 # You can include diagrams made with dia in doxygen documentation. Doxygen will
 # then run dia to produce the diagram and insert it in the documentation. The
 # DIA_PATH tag allows you to specify the directory where the dia binary resides.
@@ -2207,7 +2327,7 @@ COLLABORATION_GRAPH    = YES
 # The default value is: YES.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-GROUP_GRAPHS           = NO
+GROUP_GRAPHS           = YES
 
 # If the UML_LOOK tag is set to YES, doxygen will generate inheritance and
 # collaboration diagrams in a style similar to the OMG's Unified Modeling
@@ -2261,7 +2381,8 @@ INCLUDED_BY_GRAPH      = YES
 #
 # Note that enabling this option will significantly increase the time of a run.
 # So in most cases it will be better to enable call graphs for selected
-# functions only using the \callgraph command.
+# functions only using the \callgraph command. Disabling a call graph can be
+# accomplished by means of the command \hidecallgraph.
 # The default value is: NO.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
@@ -2272,7 +2393,8 @@ CALL_GRAPH             = NO
 #
 # Note that enabling this option will significantly increase the time of a run.
 # So in most cases it will be better to enable caller graphs for selected
-# functions only using the \callergraph command.
+# functions only using the \callergraph command. Disabling a caller graph can be
+# accomplished by means of the command \hidecallergraph.
 # The default value is: NO.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
@@ -2295,13 +2417,17 @@ GRAPHICAL_HIERARCHY    = YES
 DIRECTORY_GRAPH        = NO
 
 # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
-# generated by dot.
+# generated by dot. For an explanation of the image formats see the section
+# output formats in the documentation of the dot tool (Graphviz (see:
+# http://www.graphviz.org/)).
 # Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
 # to make the SVG files visible in IE 9+ (other browsers do not have this
 # requirement).
 # Possible values are: png, png:cairo, png:cairo:cairo, png:cairo:gd, png:gd,
 # png:gd:gd, jpg, jpg:cairo, jpg:cairo:gd, jpg:gd, jpg:gd:gd, gif, gif:cairo,
-# gif:cairo:gd, gif:gd, gif:gd:gd and svg.
+# gif:cairo:gd, gif:gd, gif:gd:gd, svg, png:gd, png:gd:gd, png:cairo,
+# png:cairo:gd, png:cairo:cairo, png:cairo:gdiplus, png:gdiplus and
+# png:gdiplus:gdiplus.
 # The default value is: png.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
@@ -2352,6 +2478,11 @@ DIAFILE_DIRS           =
 
 PLANTUML_JAR_PATH      =
 
+# When using plantuml, the PLANTUML_CFG_FILE tag can be used to specify a
+# configuration file for plantuml.
+
+PLANTUML_CFG_FILE      =
+
 # When using plantuml, the specified paths are searched for files specified by
 # the !include statement in a plantuml block.
 
diff --git a/include/QF/alloc.h b/include/QF/alloc.h
index 59a57bdf1..f67fe7176 100644
--- a/include/QF/alloc.h
+++ b/include/QF/alloc.h
@@ -37,7 +37,7 @@
 /** \defgroup alloc High-tide allocator.
 	\ingroup utils
 */
-//@{
+///@{
 
 #ifndef DEBUG_QF_MEMORY
 /**	High-tide structure allocator for use in linked lists.
@@ -93,6 +93,6 @@
 #define FREE(n, p)			do { free (p); } while (0)
 #endif
 
-//@}
+///@}
 
 #endif//__QF_alloc_h
diff --git a/include/QF/cbuf.h b/include/QF/cbuf.h
index 9018fa6b6..29a89588e 100644
--- a/include/QF/cbuf.h
+++ b/include/QF/cbuf.h
@@ -34,7 +34,7 @@
 /** \defgroup cbuf Command buffer management.
 	\ingroup utils
 */
-//@{
+///@{
 
 #include <stdarg.h>
 
@@ -100,6 +100,6 @@ void Cbuf_Execute (cbuf_t *cbuf);
 void Cbuf_Execute_Stack (cbuf_t *cbuf);
 void Cbuf_Execute_Sets (cbuf_t *cbuf);
 
-//@}
+///@}
 
 #endif//__QF_cbuf_h
diff --git a/include/QF/checksum.h b/include/QF/checksum.h
index 9a7dfb8e6..ed6f035b1 100644
--- a/include/QF/checksum.h
+++ b/include/QF/checksum.h
@@ -30,7 +30,7 @@
 
 /** \addtogroup crc
 */
-//@{
+///@{
 
 #include "QF/qtypes.h"
 
@@ -38,6 +38,6 @@ unsigned int Com_BlockChecksum (const void *buffer, int length);
 void Com_BlockFullChecksum (const void *buffer, int len, unsigned char *outbuf);
 byte	COM_BlockSequenceCRCByte (const byte *base, int length, int sequence);
 
-//@}
+///@}
 
 #endif // __checksum_h
diff --git a/include/QF/cmd.h b/include/QF/cmd.h
index 2ac508b9f..35846a063 100644
--- a/include/QF/cmd.h
+++ b/include/QF/cmd.h
@@ -31,7 +31,7 @@
 /** \defgroup cmd Command management.
 	\ingroup utils
 */
-//@{
+///@{
 
 #include "QF/qtypes.h"
 #include "QF/cbuf.h"
@@ -81,6 +81,6 @@ struct cbuf_interpreter_s *Cmd_GetProvider(const char *name);
 extern struct cbuf_args_s *cmd_args;
 extern struct cvar_s *cmd_warncmd;
 
-//@}
+///@}
 
 #endif//__QF_cmd_h
diff --git a/include/QF/crc.h b/include/QF/crc.h
index 2aa16b616..cc635e7b9 100644
--- a/include/QF/crc.h
+++ b/include/QF/crc.h
@@ -31,7 +31,7 @@
 /** \defgroup crc Checksum generation.
 	\ingroup utils
 */
-//@{
+///@{
 
 #include "QF/qtypes.h"
 
@@ -41,6 +41,6 @@ void CRC_ProcessBlock (const byte *start, unsigned short *crcvalue, int count);
 unsigned short CRC_Value(unsigned short crcvalue) __attribute__((const));
 unsigned short CRC_Block (const byte *start, int count) __attribute__((pure));
 
-//@}
+///@}
 
 #endif // __crc_h
diff --git a/include/QF/cvar.h b/include/QF/cvar.h
index 091a13b61..3d81a3b1c 100644
--- a/include/QF/cvar.h
+++ b/include/QF/cvar.h
@@ -31,7 +31,7 @@
 /** \defgroup cvar Configuration variables
 	\ingroup utils
 */
-//@{
+///@{
 
 #include "QF/qtypes.h"
 #include "QF/quakeio.h"
@@ -72,7 +72,7 @@ typedef struct cvar_alias_s {
 	code goes "look, the user made fs_basepath already", uses the users value,
 	but sets CVAR_ROM as per the call.
 */
-//@{
+///@{
 #define CVAR_NONE			0		///< normal cvar
 #define	CVAR_ARCHIVE		1		///< set to cause it to be saved to
 									///< config.cfg
@@ -85,7 +85,7 @@ typedef struct cvar_alias_s {
 #define CVAR_LATCH			2048	///< will change only when C code next does
 									///< a Cvar_Get(), so it can't be changed
 									///< (not implemented)
-//@}
+///@}
 
 
 // Returns the Cvar if found, creates it with value if not.  Description and
@@ -138,6 +138,6 @@ void Cvar_Init (void);
 
 extern cvar_t	*cvar_vars;
 
-//@}
+///@}
 
 #endif // __cvar_h
diff --git a/include/QF/draw.h b/include/QF/draw.h
index d8067a4c7..529f3e892 100644
--- a/include/QF/draw.h
+++ b/include/QF/draw.h
@@ -37,7 +37,7 @@
 /** \defgroup video_renderer_draw Generic draw functions
 	\ingroup video_renderer
 */
-//@{
+///@{
 
 #include "QF/wad.h"
 
@@ -160,12 +160,12 @@ void Draw_FadeScreen (void);
 /** Shift the screen colors.
 */
 void Draw_BlendScreen (quat_t color);
-//@}
+///@}
 
 /** \defgroup video_renderer_draw_qpic QPic functions
 	\ingroup video_renderer_draw
 */
-//@{
+///@{
 /** Load a qpic from the filesystem.
 	\param path	path of the file within the quake filesystem
 	\param alpha transparency level of the pic.
@@ -232,6 +232,6 @@ void Draw_Picf (float x, float y, qpic_t *pic);
 	\param height vertical size of the sub-region to be drawn
 */
 void Draw_SubPic(int x, int y, qpic_t *pic, int srcx, int srcy, int width, int height);
-//@}
+///@}
 
 #endif // _DRAW_H
diff --git a/include/QF/dstring.h b/include/QF/dstring.h
index 1075bc04b..638d9e340 100644
--- a/include/QF/dstring.h
+++ b/include/QF/dstring.h
@@ -31,7 +31,7 @@
 /** \defgroup dstring Dynamic Strings
 	\ingroup utils
 */
-//@{
+///@{
 
 #include <stdarg.h>
 #include <stdlib.h>
@@ -52,13 +52,13 @@ typedef struct dstring_s {
 extern dstring_mem_t dstring_default_mem;
 
 // General buffer functions
-//@{
+///@{
 /** Create a new dstring. size and truesize start at 0 and no string buffer
 	is allocated.
 */
 dstring_t *_dstring_new (dstring_mem_t *mem);
 dstring_t *dstring_new (void);
-//@}
+///@}
 /** Delete a dstring. Both the string buffer and dstring object are freed.
 */
 void dstring_delete (dstring_t *dstr);
@@ -103,13 +103,13 @@ void dstring_replace (dstring_t *dstr, unsigned int pos, unsigned int rlen,
 char *dstring_freeze (dstring_t *dstr);
 
 // String-specific functions
-//@{
+///@{
 /** Allocate a new dstring pre-initialized as a null terminated string. size
 	will be 1 and the first byte 0.
 */
 dstring_t *_dstring_newstr (dstring_mem_t *mem);
 dstring_t *dstring_newstr (void);
-//@}
+///@}
 /** Create a new dstring from a string. Similar to strdup().
 	\param str		the string to copy
 	\return			inititialized dstring
@@ -160,21 +160,21 @@ void dstring_insertsubstr (dstring_t *dstr, unsigned int pos, const char *str,
 */
 void dstring_clearstr (dstring_t *dstr);
 
-//@{
+///@{
 /** Formatted printing to dstrings. Existing data is replaced by the formatted
 	string.
 */
 int dvsprintf (dstring_t *dstr, const char *fmt, va_list args) __attribute__((format(printf,2,0)));
 int dsprintf (dstring_t *dstr, const char *fmt, ...) __attribute__((format(printf,2,3)));
-//@}
-//@{
+///@}
+///@{
 /** Formatted printing to dstrings. Formatted string is appened to the dstring.
 	Embedded nulls in the dstring are ignored.
 */
 int davsprintf (dstring_t *dstr, const char *fmt, va_list args) __attribute__((format(printf,2,0)));
 int dasprintf (dstring_t *dstr, const char *fmt, ...) __attribute__((format(printf,2,3)));
-//@}
+///@}
 
-//@}
+///@}
 
 #endif // __dstring_h
diff --git a/include/QF/hash.h b/include/QF/hash.h
index 1a8a8f912..ae040cfa9 100644
--- a/include/QF/hash.h
+++ b/include/QF/hash.h
@@ -34,7 +34,7 @@
 /** \defgroup hash Hash tables
 	\ingroup utils
 */
-//@{
+///@{
 
 typedef struct hashtab_s hashtab_t;
 
@@ -209,6 +209,6 @@ void **Hash_GetList (hashtab_t *tab);
 */
 void Hash_Stats (hashtab_t *tab);
 
-//@}
+///@}
 
 #endif // __hash_h
diff --git a/include/QF/idparse.h b/include/QF/idparse.h
index 07b5c322e..e48cf30e6 100644
--- a/include/QF/idparse.h
+++ b/include/QF/idparse.h
@@ -33,7 +33,7 @@
 
 /** \addtogroup cbuf
 */
-//@{
+///@{
 
 extern const char *com_token;
 
@@ -44,6 +44,6 @@ void COM_TokenizeString (const char *str, struct cbuf_args_s *args);
 
 extern struct cbuf_interpreter_s id_interp;
 
-//@}
+///@}
 
 #endif//__QF_idparse_h
diff --git a/include/QF/info.h b/include/QF/info.h
index d57a221f6..4e34f6fa2 100644
--- a/include/QF/info.h
+++ b/include/QF/info.h
@@ -31,7 +31,7 @@
 /** \defgroup info Info Keys
 	\ingroup utils
 */
-//@{
+///@{
 
 #include <stdlib.h> // for size_t. sys/types.h SHOULD be used, but can't :(bc)
 #include <QF/qtypes.h>
@@ -63,6 +63,6 @@ void Info_Destroy (info_t *info);
 char *Info_MakeString (info_t *info, int (*filter)(const char *));
 void Info_AddKeys (info_t *info, info_t *keys);
 
-//@}
+///@}
 
 #endif	// _INFO_H
diff --git a/include/QF/keys.h b/include/QF/keys.h
index ada46a265..66ef8d99e 100644
--- a/include/QF/keys.h
+++ b/include/QF/keys.h
@@ -39,7 +39,7 @@
 /** \defgroup input_keybinding Key Binding Sub-system
 	\ingroup input
 */
-//@{
+///@{
 
 /// these are the key numbers that should be passed to Key_Event
 typedef enum {
@@ -659,6 +659,6 @@ struct progs_s;
 void Key_Progs_Init (struct progs_s *pr);
 #endif
 
-//@}
+///@}
 
 #endif // _KEYS_H
diff --git a/include/QF/math/dual.h b/include/QF/math/dual.h
index eba9b8bf0..34c58a984 100644
--- a/include/QF/math/dual.h
+++ b/include/QF/math/dual.h
@@ -34,7 +34,7 @@
 /** \defgroup mathlib_dual Dual and dual quaternion functions
 	\ingroup utils
 */
-//@{
+///@{
 
 #include "QF/qtypes.h"
 
@@ -189,6 +189,6 @@
 	} while (0)
 #define DualQuatExpand(dq) QuatExpand ((dq).q0.q), QuatExpand ((dq).qe.q)
 
-//@}
+///@}
 
 #endif // __QF_math_dual_h
diff --git a/include/QF/math/half.h b/include/QF/math/half.h
index 1fe474cd3..bc9133fc6 100644
--- a/include/QF/math/half.h
+++ b/include/QF/math/half.h
@@ -34,7 +34,7 @@
 /** \defgroup mathlib_half Half-float functions
 	\ingroup utils
 */
-//@{
+///@{
 
 #include "QF/qtypes.h"
 
@@ -42,6 +42,6 @@
 int16_t FloatToHalf (float x) __attribute__((const));
 float HalfToFloat (int16_t x) __attribute__((const));
 
-//@}
+///@}
 
 #endif // __QF_math_half_h
diff --git a/include/QF/math/matrix3.h b/include/QF/math/matrix3.h
index ce2474a99..dfe9b530f 100644
--- a/include/QF/math/matrix3.h
+++ b/include/QF/math/matrix3.h
@@ -34,7 +34,7 @@
 /** \defgroup mathlib_matrix3 3x3 matrix functions
 	\ingroup utils
 */
-//@{
+///@{
 
 #include "QF/qtypes.h"
 
@@ -118,6 +118,6 @@ void Mat3SymEigen (const mat3_t m, vec3_t e);
 */
 int Mat3Decompose (const mat4_t mat, quat_t rot, vec3_t shear, vec3_t scale);
 
-//@}
+///@}
 
 #endif // __QF_math_matrix3_h
diff --git a/include/QF/math/matrix4.h b/include/QF/math/matrix4.h
index 4f0e0dfb5..a55c8ed94 100644
--- a/include/QF/math/matrix4.h
+++ b/include/QF/math/matrix4.h
@@ -34,7 +34,7 @@
 /** \defgroup mathlib_matrix4 4x4 matrix functions
 	\ingroup utils
 */
-//@{
+///@{
 
 #include "QF/qtypes.h"
 
@@ -130,6 +130,6 @@ void Mat4as3MultVec (const mat4_t a, const vec3_t b, vec3_t c);
 int Mat4Decompose (const mat4_t mat, quat_t rot, vec3_t shear, vec3_t scale,
 				   vec3_t trans);
 
-//@}
+///@}
 
 #endif // __QF_math_matrix4_h
diff --git a/include/QF/math/quaternion.h b/include/QF/math/quaternion.h
index 84d7b64b4..d6e34814a 100644
--- a/include/QF/math/quaternion.h
+++ b/include/QF/math/quaternion.h
@@ -34,7 +34,7 @@
 /** \defgroup mathlib_quaternion Quaternion functions
 	\ingroup utils
 */
-//@{
+///@{
 
 #include "QF/qtypes.h"
 
@@ -168,6 +168,6 @@ void QuatInverse (const quat_t in, quat_t out);
 void QuatExp (const quat_t a, quat_t b);
 void QuatToMatrix (const quat_t q, vec_t *m, int homogenous, int vertical);
 
-//@}
+///@}
 
 #endif // __QF_math_quaternion_h
diff --git a/include/QF/math/vector.h b/include/QF/math/vector.h
index 73cc1f708..6a8b80809 100644
--- a/include/QF/math/vector.h
+++ b/include/QF/math/vector.h
@@ -31,7 +31,7 @@
 /** \defgroup mathlib_vector Vector functions
 	\ingroup mathlib
 */
-//@{
+///@{
 
 #include "QF/qtypes.h"
 
@@ -209,6 +209,6 @@ VectorNormalize (vec3_t v)
 	return length;
 }
 
-//@}
+///@}
 
 #endif // __QF_math_vector_h
diff --git a/include/QF/mathlib.h b/include/QF/mathlib.h
index c4575705e..5c9b854fe 100644
--- a/include/QF/mathlib.h
+++ b/include/QF/mathlib.h
@@ -31,7 +31,7 @@
 /** \defgroup mathlib Vector and matrix functions
 	\ingroup utils
 */
-//@{
+///@{
 
 #include <math.h>
 #include "QF/qtypes.h"
@@ -218,6 +218,6 @@ int CircumSphere (const vec3_t points[], int num_points, sphere_t *sphere);
 void BarycentricCoords (const vec_t **points, int num_points, const vec3_t p,
 		                vec_t *lambda);
 
-//@}
+///@}
 
 #endif // __mathlib_h
diff --git a/include/QF/mdfour.h b/include/QF/mdfour.h
index 94fe99da0..19360e838 100644
--- a/include/QF/mdfour.h
+++ b/include/QF/mdfour.h
@@ -31,7 +31,7 @@
 
 /** \addtogroup crc
 */
-//@{
+///@{
 
 #include "QF/uint32.h"
 
@@ -47,6 +47,6 @@ void mdfour_update(struct mdfour *md, const unsigned char *in, int n); //old: MD
 void mdfour_result(struct mdfour *md, unsigned char *out); // old: MD4Final
 void mdfour(unsigned char *out, const unsigned char *in, int n);
 
-//@}
+///@}
 
 #endif	// __mdfour_h
diff --git a/include/QF/msg.h b/include/QF/msg.h
index 6e550a191..6a92e2d54 100644
--- a/include/QF/msg.h
+++ b/include/QF/msg.h
@@ -30,7 +30,7 @@
 /** \defgroup msg Message reading and writing
 	\ingroup utils
 */
-//@{
+///@{
 
 #include "QF/sizebuf.h"
 
@@ -249,6 +249,6 @@ void MSG_ReadAngle16V (qmsg_t *msg, vec3_t angles);
 */
 int MSG_ReadUTF8 (qmsg_t *msg);
 
-//@}
+///@}
 
 #endif
diff --git a/include/QF/pak.h b/include/QF/pak.h
index f176e5733..ea86ffd14 100644
--- a/include/QF/pak.h
+++ b/include/QF/pak.h
@@ -33,7 +33,7 @@
 
 /** \addtogroup pak
 */
-//@{
+///@{
 
 // little-endian PACK
 #define IDPAKHEADER		(('K'<<24)+('C'<<16)+('A'<<8)+'P')
@@ -51,6 +51,6 @@ typedef struct {
 	int			dirlen;
 } dpackheader_t;
 
-//@}
+///@}
 
 #endif//__qf_pak_h
diff --git a/include/QF/pakfile.h b/include/QF/pakfile.h
index ecb6738f0..7bb4f3a0e 100644
--- a/include/QF/pakfile.h
+++ b/include/QF/pakfile.h
@@ -33,7 +33,7 @@
 /** \defgroup pak pakfile proccessing
 	\ingroup utils
 */
-//@{
+///@{
 
 #include "QF/hash.h"
 #include "QF/pak.h"
@@ -64,6 +64,6 @@ int pack_add (pack_t *pack, const char *filename);
 int pack_extract (pack_t *pack, dpackfile_t *pf);
 dpackfile_t *pack_find_file (pack_t *pack, const char *filename);
 
-//@}
+///@}
 
 #endif//__QF_pakfile_h
diff --git a/include/QF/plugin.h b/include/QF/plugin.h
index 28cb9962f..0a06f73f2 100644
--- a/include/QF/plugin.h
+++ b/include/QF/plugin.h
@@ -31,7 +31,7 @@
 /** \defgroup plugin Plugins
 	\ingroup utils
 */
-//@{
+///@{
 
 #define QFPLUGIN_VERSION	"1.0"
 
@@ -111,6 +111,6 @@ void PI_Shutdown (void);
 
 // FIXME: we need a generic function to initialize unused fields
 
-//@}
+///@}
 
 #endif	// __QF_plugin_h_
diff --git a/include/QF/pr_type.h b/include/QF/pr_type.h
index 4cc6cf82e..0c8b37664 100644
--- a/include/QF/pr_type.h
+++ b/include/QF/pr_type.h
@@ -36,7 +36,7 @@
 
 	All \c pointer_t \c type fields are pointers within the type qfo_space.
 */
-//@{
+///@{
 
 #include "QF/pr_comp.h"
 
@@ -102,6 +102,6 @@ typedef struct qfot_type_encodings_s {
 	pr_int_t    size;
 } qfot_type_encodings_t;
 
-//@}
+///@}
 
 #endif//__pr_type_h
diff --git a/include/QF/progs.h b/include/QF/progs.h
index 5b834d1f0..7631f1de1 100644
--- a/include/QF/progs.h
+++ b/include/QF/progs.h
@@ -39,18 +39,18 @@
 struct QFile_s;
 
 /** \ingroup progs */
-//@{
+///@{
 typedef struct progs_s progs_t;
 typedef struct pr_resource_s pr_resource_t;
 typedef struct edict_s edict_t;
-//@}
+///@}
 
 //============================================================================
 
 /** \defgroup progs_misc Miscelaneous functions
 	\ingroup progs
 */
-//@{
+///@{
 
 /** Initialize the progs engine.
 */
@@ -63,12 +63,12 @@ void PR_Init_Cvars (void);
 void PR_Error (progs_t *pr, const char *error, ...) __attribute__((format(printf,2,3), noreturn));
 void PR_RunError (progs_t *pr, const char *error, ...) __attribute__((format(printf,2,3), noreturn));
 
-//@}
+///@}
 
 /** \defgroup progs_execution Execution
 	\ingroup progs
 */
-//@{
+///@{
 
 /** Ensure P_* macros point to the right place for passing parameters to progs
 	functions.
@@ -128,12 +128,12 @@ void PR_ExecuteProgram (progs_t *pr, func_t fnum);
 */
 int PR_CallFunction (progs_t *pr, func_t fnum);
 
-//@}
+///@}
 
 /** \defgroup progs_load Loading
 	\ingroup progs
 */
-//@{
+///@{
 
 /** Type of functions that are called at progs load.
 	\param pr		pointer to ::progs_t VM struct
@@ -204,12 +204,12 @@ int PR_Check_Opcodes (progs_t *pr);
 void PR_BoundsCheckSize (progs_t *pr, pointer_t addr, unsigned size);
 void PR_BoundsCheck (progs_t *pr, int addr, etype_t type);
 
-//@}
+///@}
 
 /** \defgroup progs_edict Edict management
 	\ingroup progs
 */
-//@{
+///@{
 
 struct edict_s {
 	qboolean    free;
@@ -261,13 +261,13 @@ void ED_EntityParseFunction (progs_t *pr);
 # define NUM_FOR_EDICT(p,e)	ED_NumForEdict (p, e)
 #endif
 
-//@}
+///@}
 
 /** \defgroup pr_symbols Symbol Management
 	\ingroup progs
 	Lookup functions for symbol name resolution.
 */
-//@{
+///@{
 
 ddef_t *PR_FieldAtOfs (progs_t *pr, pr_int_t ofs) __attribute__((pure));
 ddef_t *PR_GlobalAtOfs (progs_t *pr, pr_int_t ofs) __attribute__((pure));
@@ -282,7 +282,7 @@ int PR_AccessField (progs_t *pr, const char *name, etype_t type,
 					const char *file, int line);
 
 void PR_Undefined (progs_t *pr, const char *type, const char *name) __attribute__((noreturn));
-//@}
+///@}
 
 //============================================================================
 
@@ -296,7 +296,7 @@ void PR_Undefined (progs_t *pr, const char *type, const char *name) __attribute_
 	Typed global access macros. No checking is done against the QC type, but
 	the appropriate C type will be used.
 */
-//@{
+///@{
 
 /** \internal
 	\param p		pointer to ::progs_t VM struct
@@ -479,14 +479,14 @@ void PR_Undefined (progs_t *pr, const char *type, const char *name) __attribute_
 	\hideinitializer
 */
 #define G_STRUCT(p,t,o)	(*(t *)G_GPOINTER (p, o))
-//@}
+///@}
 
 /** \defgroup prda_parameters Parameters
 	\ingroup progs_data_access
 	Typed parameter access macros. No checking is done against the QC type, but
 	the appropriate C type will be used.
 */
-//@{
+///@{
 
 /** \internal
 	\param p		pointer to ::progs_t VM struct
@@ -669,7 +669,7 @@ void PR_Undefined (progs_t *pr, const char *type, const char *name) __attribute_
 	\hideinitializer
 */
 #define P_STRUCT(p,t,n)	(*(t *)P_GPOINTER (p, n))
-//@}
+///@}
 
 /** \defgroup prda_return Return Values
 	\ingroup progs_data_access
@@ -680,7 +680,7 @@ void PR_Undefined (progs_t *pr, const char *type, const char *name) __attribute_
 	ask for an \c int from a function that returned a \c float, you're asking
 	for trouble.
 */
-//@{
+///@{
 
 /** \internal
 	\param p		pointer to ::progs_t VM struct
@@ -836,14 +836,14 @@ void PR_Undefined (progs_t *pr, const char *type, const char *name) __attribute_
 	\hideinitializer
 */
 #define RETURN_QUAT(p,q)		VectorCopy (q, R_QUAT (p))
-//@}
+///@}
 
 /** \defgroup prda_entity_fields Entity Fields
 	\ingroup progs_data_access
 	Typed entity field access macros. No checking is done against the QC type,
 	but the appropriate C type will be used.
 */
-//@{
+///@{
 
 /** \internal
 	\param e		pointer to the entity
@@ -980,7 +980,7 @@ void PR_Undefined (progs_t *pr, const char *type, const char *name) __attribute_
 	\hideinitializer
 */
 #define E_DSTRING(p,e,o) (PR_GetMutableString (p, E_STRING (e, o)))
-//@}
+///@}
 
 /** \defgroup pr_builtins VM Builtin functions
 	\ingroup progs
@@ -993,7 +993,7 @@ void PR_Undefined (progs_t *pr, const char *type, const char *name) __attribute_
 	0x8000000 to 0xffffffff is unavailable due to the builtin number being
 	a negative statement address.
 */
-//@{
+///@{
 
 #define PR_RANGE_SHIFT	16
 #define PR_RANGE_MASK	0xffff0000
@@ -1067,7 +1067,7 @@ builtin_t *PR_FindBuiltinNum (progs_t *pr, pr_int_t num);
 */
 int PR_RelocateBuiltins (progs_t *pr);
 
-//@}
+///@}
 
 /** \defgroup pr_strings String Management
 	\ingroup progs
@@ -1093,7 +1093,7 @@ int PR_RelocateBuiltins (progs_t *pr);
 	They can be created, altered, and destroyed at any time by the main
 	program (or the progs code via an appropriate builtin function).
 */
-//@{
+///@{
 
 /** Initialize the string tables using the strings supplied by the progs.
 	Called automatically during progs load.
@@ -1254,13 +1254,13 @@ void PR_FreeTempStrings (progs_t *pr);
 void PR_Sprintf (progs_t *pr, struct dstring_s *result, const char *name,
 				 const char *format, int count, pr_type_t **args);
 
-//@}
+///@}
 
 /** \defgroup pr_resources Resource Management
 	\ingroup progs
 	Builtin module private data management.
 */
-//@{
+///@{
 
 /** Initialize the resource management fields.
 
@@ -1314,7 +1314,7 @@ void *PR_Resources_Find (progs_t *pr, const char *name);
 	\note			\p map is the resource map itself, not a pointer to the
 					resource map.
 */
-//@{
+///@{
 
 /** Type delcaration for the resource map.
 
@@ -1416,29 +1416,30 @@ void *PR_Resources_Find (progs_t *pr, const char *name);
 			return ~(i * 1024 + d);							\
 	}														\
 	return 0
-//@}
+///@}
 
-//@}
+///@}
 
 /** \defgroup pr_zone VM memory management.
 	\ingroup progs
 
 	Used to allocate and free memory in the VM address space.
 */
-//@{
+///@{
 
 void PR_Zone_Init (progs_t *pr);
 void PR_Zone_Free (progs_t *pr, void *ptr);
 void *PR_Zone_Malloc (progs_t *pr, pr_int_t size);
 void *PR_Zone_Realloc (progs_t *pr, void *ptr, pr_int_t size);
 
-//@}
+///@}
 
 /** \defgroup debug VM Debugging
 	\ingroup progs
 	Progs debugging support.
 */
-//@{
+/// \addtogroup debug
+///@{
 
 void PR_Debug_Init (void);
 void PR_Debug_Init_Cvars (void);
@@ -1464,20 +1465,20 @@ extern struct cvar_s *pr_deadbeef_locals;
 extern struct cvar_s *pr_boundscheck;
 extern struct cvar_s *pr_faultchecks;
 
-//@}
+///@}
 
 /** \defgroup pr_cmds Quake and Quakeworld common builtins
 	\ingroup progs
 	\todo This really doesn't belong in progs.
 */
-//@{
+///@{
 
 char *PF_VarString (progs_t *pr, int first);
 void PR_Cmds_Init (progs_t *pr);
 
 extern const char *pr_gametype;
 
-//@}
+///@}
 
 //============================================================================
 
@@ -1682,7 +1683,7 @@ struct progs_s {
 
 /** \addtogroup progs_data_access
 */
-//@{
+///@{
 
 /** Convert a progs offset/pointer to a C pointer.
 	\param pr		pointer to ::progs_t VM struct
@@ -1706,7 +1707,7 @@ PR_SetPointer (progs_t *pr, void *p)
 	return p ? (pr_type_t *) p - pr->pr_globals : 0;
 }
 
-//@}
+///@}
 
 /** \example vm-exec.c
 */
diff --git a/include/QF/qargs.h b/include/QF/qargs.h
index fe4eb98f8..50dfbd35a 100644
--- a/include/QF/qargs.h
+++ b/include/QF/qargs.h
@@ -32,7 +32,7 @@
 
 /** \addtogroup misc
 */
-//@{
+///@{
 
 #include "QF/qtypes.h"
 
@@ -50,6 +50,6 @@ void COM_Init_Cvars (void);
 void COM_InitArgv (int argc, const char **argv);
 void COM_ParseConfig (void);
 
-//@}
+///@}
 
 #endif // __qargs_h
diff --git a/include/QF/qendian.h b/include/QF/qendian.h
index d63ca2d0c..a42bd749f 100644
--- a/include/QF/qendian.h
+++ b/include/QF/qendian.h
@@ -33,7 +33,7 @@
 /** \defgroup qendian Endian handling functions
 	\ingroup utils
 */
-//@{
+///@{
 
 #include "QF/qtypes.h"
 
@@ -118,6 +118,6 @@ byte ReadByte (struct QFile_s *file);
 unsigned short ReadShort (struct QFile_s *file);
 unsigned int ReadLong (struct QFile_s *file);
 
-//@}
+///@}
 
 #endif // __qendian_h
diff --git a/include/QF/qfplist.h b/include/QF/qfplist.h
index 6c5d61202..e0c2557ca 100644
--- a/include/QF/qfplist.h
+++ b/include/QF/qfplist.h
@@ -31,7 +31,7 @@
 /** \defgroup qfplist Property lists
 	\ingroup utils
 */
-//@{
+///@{
 
 #include "QF/qtypes.h"
 
@@ -226,6 +226,6 @@ plitem_t *PL_NewString (const char *str);
 */
 void PL_Free (plitem_t *item);
 
-//@}
+///@}
 
 #endif	// __QF_qfplist_h_
diff --git a/include/QF/quakefs.h b/include/QF/quakefs.h
index 336537495..364718db0 100644
--- a/include/QF/quakefs.h
+++ b/include/QF/quakefs.h
@@ -33,7 +33,7 @@
 /** \defgroup quakefs Quake Filesystem
 	\ingroup utils
 */
-//@{
+///@{
 
 #include "QF/qtypes.h"
 #include "QF/quakeio.h"
@@ -418,6 +418,6 @@ void QFS_FilelistFill (filelist_t *list, const char *path, const char *ext,
 */
 void QFS_FilelistFree (filelist_t *list);
 
-//@}
+///@}
 
 #endif // __quakefs_h
diff --git a/include/QF/quakeio.h b/include/QF/quakeio.h
index d72d8ec29..08b14af69 100644
--- a/include/QF/quakeio.h
+++ b/include/QF/quakeio.h
@@ -34,7 +34,7 @@
 /** \defgroup quakeio File IO
 	\ingroup utils
 */
-//@{
+///@{
 
 typedef struct QFile_s QFile;
 
@@ -60,6 +60,6 @@ int Qflush(QFile *file);
 int Qeof(QFile *file);
 const char *Qgetline(QFile *file);
 
-//@}
+///@}
 
 #endif /*__quakeio_h*/
diff --git a/include/QF/script.h b/include/QF/script.h
index 2fe21c215..357e5100b 100644
--- a/include/QF/script.h
+++ b/include/QF/script.h
@@ -25,7 +25,7 @@
 	Line oriented script parsing. Multiple scripts being parsed at the same
 	time is supported.
 */
-//@{
+///@{
 
 #include "QF/qtypes.h"
 
@@ -97,6 +97,6 @@ void Script_UngetToken (script_t *script);
 */
 const char *Script_Token (script_t *script) __attribute__((pure));
 
-//@}
+///@}
 
 #endif//__QF_script_h
diff --git a/include/QF/set.h b/include/QF/set.h
index 2f4dd76e5..1261bdb40 100644
--- a/include/QF/set.h
+++ b/include/QF/set.h
@@ -36,7 +36,7 @@
 /**	\defgroup set Set handling
 	\ingroup utils
 */
-//@{
+///@{
 
 //FIXME other archs
 #ifdef __x86_64__
@@ -370,5 +370,5 @@ set_iter_t *set_next_r (set_pool_t *set_pool, set_iter_t *set_iter);
 */
 const char *set_as_string (const set_t *set);
 
-//@}
+///@}
 #endif//__QF_set_h
diff --git a/include/QF/sizebuf.h b/include/QF/sizebuf.h
index 8605f803d..7f6fc4ac3 100644
--- a/include/QF/sizebuf.h
+++ b/include/QF/sizebuf.h
@@ -31,7 +31,7 @@
 	\ingroup utils
 	Fixed size buffer management
 */
-//@{
+///@{
 
 #include "QF/qtypes.h"
 
@@ -51,6 +51,6 @@ void *SZ_GetSpace (sizebuf_t *buf, int length);
 void SZ_Write (sizebuf_t *buf, const void *data, int length);
 void SZ_Print (sizebuf_t *buf, const char *data);	// strcats onto the sizebuf
 
-//@}
+///@}
 
 #endif // __sizebuf_h
diff --git a/include/QF/sound.h b/include/QF/sound.h
index 3e37a5871..11f103080 100644
--- a/include/QF/sound.h
+++ b/include/QF/sound.h
@@ -37,7 +37,7 @@
 /**
 	\ingroup sound
 */
-//@{
+///@{
 typedef struct sfx_s sfx_t;
 struct sfx_s
 {
@@ -62,14 +62,14 @@ struct sfx_s
 	sfx_t      *(*open) (sfx_t *sfx);
 	void        (*close) (sfx_t *sfx);
 };
-//@}
+///@}
 
 struct model_s;
 
 /** \defgroup sound_init Initialization functions
 	\ingroup sound
 */
-//@{
+///@{
 
 /** Initialize the sound engine.
 	\param viewentity pointer to view entity index
@@ -81,12 +81,12 @@ void S_Init (int *viewentity, double *host_frametime);
 */
 void S_Init_Cvars (void);
 
-//@}
+///@}
 
 /** \defgroup sound_stuff Unclassified
 	\ingroup sound
 */
-//@{
+///@{
 
 /** Start a sound playing.
 	\param entnum	index of entity the sound is associated with.
@@ -189,6 +189,6 @@ void S_AmbientOn (void);
 struct progs_s;
 void S_Progs_Init (struct progs_s *pr);
 
-//@}
+///@}
 
 #endif // _SOUND_H
diff --git a/include/QF/sys.h b/include/QF/sys.h
index 7c669563e..10c1c902e 100644
--- a/include/QF/sys.h
+++ b/include/QF/sys.h
@@ -32,7 +32,7 @@
 	\ingroup utils
 	Non-portable functions
 */
-//@{
+///@{
 
 #include <stdio.h>
 #include <stdint.h>
@@ -159,6 +159,6 @@ int Sys_CreatePath (const char *path);
 */
 char *Sys_ExpandSquiggle (const char *path);
 
-//@}
+///@}
 
 #endif // __sys_h
diff --git a/include/QF/va.h b/include/QF/va.h
index 6a5e54465..40c794712 100644
--- a/include/QF/va.h
+++ b/include/QF/va.h
@@ -32,13 +32,13 @@
 /** \addtogroup misc
 	Formatted printing.
 */
-//@{
+///@{
 
 // does a varargs printf into a temp buffer
 char	*va(const char *format, ...) __attribute__((format(printf,1,2)));
 // does a varargs printf into a malloced buffer
 char	*nva(const char *format, ...) __attribute__((format(printf,1,2)));
 
-//@}
+///@}
 
 #endif // __va_h
diff --git a/include/QF/ver_check.h b/include/QF/ver_check.h
index 5d8c1061c..8ac943796 100644
--- a/include/QF/ver_check.h
+++ b/include/QF/ver_check.h
@@ -34,7 +34,7 @@
 /** \defgroup misc Miscellaneous functions
 	\ingroup utils
 */
-//@{
+///@{
 
 /*
 	ver_compare
@@ -45,6 +45,6 @@
 */
 int ver_compare (const char *, const char *);
 
-//@}
+///@}
 
 #endif	// __ver_check_h_
diff --git a/include/QF/view.h b/include/QF/view.h
index ecb2ea920..570935ae8 100644
--- a/include/QF/view.h
+++ b/include/QF/view.h
@@ -34,7 +34,7 @@
 /** \defgroup console_view Console View Objects
 	\ingroup console
 */
-//@{
+///@{
 
 /** Control the positioning of a view within its parent. The directions are
 	the standard compass rose (north, east, south, west in clockwise order)
@@ -215,6 +215,6 @@ void view_resize (view_t *view, int xl, int yl);
 */
 void view_move (view_t *view, int xp, int yp);
 
-//@}
+///@}
 
 #endif//__qf_view_h
diff --git a/include/QF/wad.h b/include/QF/wad.h
index 805a69925..82e836dc9 100644
--- a/include/QF/wad.h
+++ b/include/QF/wad.h
@@ -32,7 +32,7 @@
 /** \addtogroup wad
 	Wad Files
 */
-//@{
+///@{
 
 #include "QF/wadfile.h"
 
@@ -46,6 +46,6 @@ void	*W_GetLumpName (const char *name);
 
 void SwapPic (qpic_t *pic);
 
-//@}
+///@}
 
 #endif // _WAD_H
diff --git a/include/QF/wadfile.h b/include/QF/wadfile.h
index 79e5e2055..9e6c220f6 100644
--- a/include/QF/wadfile.h
+++ b/include/QF/wadfile.h
@@ -29,7 +29,7 @@
 	\ingroup utils
 	Wadfile processing
 */
-//@{
+///@{
 
 #ifndef __QF_wadfile_h
 #define __QF_wadfile_h
@@ -102,6 +102,6 @@ int wad_add_data (wad_t *wad, const char *lumpname, byte type,
 				  const void *data, int bytes);
 lumpinfo_t *wad_find_lump (wad_t *wad, const char *filename);
 
-//@}
+///@}
 
 #endif//__QF_wadfile_h
diff --git a/include/QF/winding.h b/include/QF/winding.h
index 5ef3d8094..5815ac793 100644
--- a/include/QF/winding.h
+++ b/include/QF/winding.h
@@ -26,7 +26,7 @@
 
 /**	\defgroup winding Winding Manipulation
 */
-//@{
+///@{
 
 struct plane_s;
 
@@ -138,6 +138,6 @@ winding_t *ClipWinding (winding_t *in, struct plane_s *split, qboolean keepon);
 void DivideWinding (winding_t *in, struct plane_s *split,
 					winding_t **front, winding_t **back);
 
-//@}
+///@}
 
 #endif//__QF_winding_h
diff --git a/include/QF/zone.h b/include/QF/zone.h
index 379f4557a..1f968737f 100644
--- a/include/QF/zone.h
+++ b/include/QF/zone.h
@@ -88,7 +88,7 @@
 
 	----- Bottom of Memory -----
 */
-//@{
+///@{
 
 typedef struct memzone_s memzone_t;
 
@@ -140,6 +140,6 @@ void *Cache_Get (cache_user_t *c);
 void Cache_Release (cache_user_t *c);
 int Cache_ReadLock (cache_user_t *c) __attribute__((pure));
 
-//@}
+///@}
 
 #endif // __zone_h
diff --git a/include/net_dgrm.h b/include/net_dgrm.h
index 712864dd3..38c2f7e19 100644
--- a/include/net_dgrm.h
+++ b/include/net_dgrm.h
@@ -29,7 +29,7 @@
 /** \defgroup nq-dgrm NetQuake Datagram network driver.
 	\ingroup nq-nd
 */
-//@{
+///@{
 
 /** Initialize the Datagram net driver.
 
@@ -125,4 +125,4 @@ void		Datagram_Close (qsocket_t *sock);
 */
 void		Datagram_Shutdown (void);
 
-//@}
+///@}
diff --git a/include/net_loop.h b/include/net_loop.h
index a0f58a34a..9247f949e 100644
--- a/include/net_loop.h
+++ b/include/net_loop.h
@@ -34,7 +34,7 @@
 /** \defgroup nq-loop NetQuake loopback network driver.
 	\ingroup nq-nd
 */
-//@{
+///@{
 
 int			Loop_Init (void);
 void		Loop_Listen (qboolean state);
@@ -49,6 +49,6 @@ qboolean	Loop_CanSendUnreliableMessage (qsocket_t *sock);
 void		Loop_Close (qsocket_t *sock);
 void		Loop_Shutdown (void);
 
-//@}
+///@}
 
 #endif//__net_loop_h
diff --git a/include/net_udp.h b/include/net_udp.h
index 78f26a6ec..bd414513d 100644
--- a/include/net_udp.h
+++ b/include/net_udp.h
@@ -33,7 +33,7 @@
 /** \defgroup nq-udp NetQuake UDP lan driver.
 	\ingroup nq-ld
 */
-//@{
+///@{
 
 /** Initialize the UDP network interface.
 
@@ -193,6 +193,6 @@ int UDP_GetSocketPort (netadr_t *addr);
 */
 int UDP_SetSocketPort (netadr_t *addr, int port);
 
-//@}
+///@}
 
 #endif // __net_udp_h
diff --git a/include/net_vcr.h b/include/net_vcr.h
index f5383b572..9f5446453 100644
--- a/include/net_vcr.h
+++ b/include/net_vcr.h
@@ -29,7 +29,7 @@
 /** \defgroup nq-vcr NetQuake VCR network driver.
 	\ingroup nq-nd
 */
-//@{
+///@{
 
 #define VCR_OP_CONNECT					1
 #define VCR_OP_GETMESSAGE				2
@@ -48,4 +48,4 @@ qboolean	VCR_CanSendMessage (qsocket_t *sock);
 void		VCR_Close (qsocket_t *sock);
 void		VCR_Shutdown (void);
 
-//@}
+///@}
diff --git a/include/net_wins.h b/include/net_wins.h
index fe4133f50..c4954f9ac 100644
--- a/include/net_wins.h
+++ b/include/net_wins.h
@@ -35,7 +35,7 @@
 /** \defgroup nq-wins NetQuake Winsock lan driver.
 	\ingroup nq-ld
 */
-//@{
+///@{
 
 extern int winsock_initialized;
 extern WSADATA winsockdata;
@@ -58,6 +58,6 @@ int  WINS_AddrCompare (netadr_t *addr1, netadr_t *addr2);
 int  WINS_GetSocketPort (netadr_t *addr);
 int  WINS_SetSocketPort (netadr_t *addr, int port);
 
-//@}
+///@}
 
 #endif//__net_wins_h
diff --git a/include/netchan.h b/include/netchan.h
index 4aa266fc8..cebfe4bd4 100644
--- a/include/netchan.h
+++ b/include/netchan.h
@@ -39,7 +39,7 @@
 /** \defgroup qw-net QuakeWorld network support.
 	\ingroup network
 */
-//{
+///@{
 #define MAX_MSGLEN		1450		///< max length of a reliable message
 #define MAX_DATAGRAM	1450		///< max length of unreliable message
 
@@ -75,12 +75,12 @@ void Analyze_Client_Packet (const byte * data, int len, int has_sequence);
 void Analyze_Server_Packet (const byte * data, int len, int has_sequence);
 
 extern struct cvar_s *net_packetlog;
-//@}
+///@}
 
 /** \defgroup qw-udp QuakeWorld udp support.
 	\ingroup qw-net
 */
-//@{
+///@{
 
 /** Initialize the UDP network interface.
 
@@ -161,7 +161,7 @@ const char *NET_BaseAdrToString (netadr_t a);
 */
 qboolean NET_StringToAdr (const char *s, netadr_t *a);
 
-//@}
+///@}
 
 /** \defgroup netchan Netchan
 	\ingroup qw-net
@@ -216,7 +216,7 @@ qboolean NET_StringToAdr (const char *s, netadr_t *a);
 	the channel matches even if the IP port differs.  The IP port should be
 	updated to the new value before sending out any replies.
 */
-//@{
+///@{
 #define	OLD_AVG		0.99		// total = oldtotal*OLD_AVG + new*(1-OLD_AVG)
 
 #define	MAX_LATENT	32
@@ -377,6 +377,6 @@ qboolean Netchan_CanReliable (netchan_t *chan) __attribute__((pure));
 */
 void Netchan_SendPacket (int length, const void *data, netadr_t to);
 
-//@}
+///@}
 
 #endif // _NET_H
diff --git a/include/netmain.h b/include/netmain.h
index fdb870628..351e615ba 100644
--- a/include/netmain.h
+++ b/include/netmain.h
@@ -34,7 +34,7 @@
 /** \defgroup nq-net NetQuake network support.
 	\ingroup network
 */
-//@{
+///@{
 
 typedef struct
 {
@@ -56,7 +56,7 @@ typedef struct
 
 /** \name NetHeader flags
 */
-//@{
+///@{
 #define NETFLAG_LENGTH_MASK	0x0000ffff
 #define NETFLAG_DATA		0x00010000
 #define NETFLAG_ACK			0x00020000
@@ -64,7 +64,7 @@ typedef struct
 #define NETFLAG_EOM			0x00080000
 #define NETFLAG_UNRELIABLE	0x00100000
 #define NETFLAG_CTL			0x80000000
-//@}
+///@}
 
 
 #define NET_PROTOCOL_VERSION	3
@@ -86,7 +86,7 @@ typedef struct
 		a full address and port in a string.  It is used for returning the
 		address of a server that is not running locally.
 */
-//@{
+///@{
 
 /** Connect Request:
 	\arg \b string	\c game_name			\em "QUAKE"
@@ -153,7 +153,7 @@ typedef struct
 	\arg \b string	\c value
 */
 #define CCREP_RULE_INFO		0x85
-//@}
+///@}
 
 typedef struct qsocket_s {
 	struct qsocket_s	*next;
@@ -205,11 +205,11 @@ typedef struct qsocket_s {
 
 /** \name socket management
 */
-//@{
+///@{
 extern qsocket_t	*net_activeSockets;
 extern qsocket_t	*net_freeSockets;
 extern int			net_numsockets;
-//@}
+///@}
 
 #define	MAX_NET_DRIVERS		8
 
@@ -220,12 +220,12 @@ extern int net_driverlevel;
 
 /** \name message statistics
 */
-//@{
+///@{
 extern int		messagesSent;
 extern int		messagesReceived;
 extern int		unreliableMessagesSent;
 extern int		unreliableMessagesReceived;
-//@}
+///@}
 
 /** Create and initialize a new qsocket.
 
@@ -386,12 +386,12 @@ extern struct cvar_s	*hostname;
 
 extern QFile *vcrFile;
 
-//@}
+///@}
 
 /** \defgroup nq-ld NetQuake lan drivers.
 	\ingroup nq-net
 */
-//@{
+///@{
 
 typedef struct {
 	const char		*name;
@@ -419,12 +419,12 @@ typedef struct {
 extern int 				net_numlandrivers;
 extern net_landriver_t	net_landrivers[MAX_NET_DRIVERS];
 
-//@}
+///@}
 
 /** \defgroup nq-nd NetQuake network drivers.
 	\ingroup nq-net
 */
-//@{
+///@{
 
 typedef struct {
 	const char		*name;
@@ -447,6 +447,6 @@ typedef struct {
 extern int			net_numdrivers;
 extern net_driver_t	net_drivers[MAX_NET_DRIVERS];
 
-//@}
+///@}
 
 #endif // __net_h
diff --git a/include/snd_internal.h b/include/snd_internal.h
index 0b1e87a21..ca4dc76c6 100644
--- a/include/snd_internal.h
+++ b/include/snd_internal.h
@@ -35,7 +35,7 @@
 /** \defgroup sound_render Sound rendering sub-system.
 	\ingroup sound
 */
-//@{
+///@{
 
 #include "QF/plugin/general.h"
 #include "QF/plugin/snd_render.h"
@@ -234,12 +234,12 @@ extern snd_render_data_t snd_render_data;
 #define PAINTBUFFER_SIZE    512
 extern portable_samplepair_t snd_paintbuffer[PAINTBUFFER_SIZE * 2];
 
-//@}
+///@}
 
 /** \defgroup sound_render_sfx Sound sfx
 	\ingroup sound_render_mix
 */
-//@{
+///@{
 /** Cache sound data. Initializes caching fields of sfx.
 	\param sfx
 	\param realname
@@ -289,7 +289,7 @@ sfx_t *SND_LoadSound (const char *name);
 */
 void SND_SFX_Init (void);
 
-//@}
+///@}
 
 /** \defgroup sound_render_mix_channels Sound channels
 	\ingroup sound_render_mix
@@ -302,7 +302,7 @@ void SND_SFX_Init (void);
 	- MAX_DYNAMIC_CHANNELS + NUM_AMBIENTS to total_channels - 1 <br>
 		static sounds
 */
-//@{
+///@{
 #define	MAX_CHANNELS			512	//!< number of available mixing channels
 #define	MAX_DYNAMIC_CHANNELS	128	//!< number of dynamic channels
 #define MAX_STATIC_CHANNELS		256	//!< number of static channels
@@ -390,13 +390,13 @@ void SND_StopSound (int entnum, int entchannel);
 	\param s name of sound to play
 */
 void SND_LocalSound (const char *s);
-//@}
+///@}
 
 
 /** \defgroup sound_render_mix Mixer engine.
 	\ingroup sound_render
 */
-//@{
+///@{
 /** sound clock in samples
 */
 extern unsigned snd_paintedtime;
@@ -414,13 +414,13 @@ void SND_InitScaletable (void);
 	\param sc		sfxbuffer to set.
 */
 void SND_SetPaint (sfxbuffer_t *sc);
-//@}
+///@}
 
 
 /** \defgroup sound_render_resample Resampling functions
 	\ingroup sound_render
 */
-//@{
+///@{
 /** Set up the various parameters that depend on the actual sample rate.
 	\param sc		buffer to setup
 	\param streamed	non-zero if this is for a stream.
@@ -448,13 +448,13 @@ void SND_Resample (sfxbuffer_t *sc, float *data, int length);
 */
 void SND_Convert (byte *idata, float *fdata, int frames, int channels,
 				  int width);
-//@}
+///@}
 
 
 /** \defgroup sound_render_load Sound loading functions
 	\ingroup sound_render
 */
-//@{
+///@{
 /** Load the referenced sound.
 	\param sfx		sound reference
 	\return			0 if ok, -1 on error
@@ -492,12 +492,12 @@ int SND_LoadWav (QFile *file, sfx_t *sfx, char *realname);
 	\return			0 if ok, -1 on error
 */
 int SND_LoadMidi (QFile *file, sfx_t *sfx, char *realname);
-//@}
+///@}
 
 /** \defgroup sound_render_cache_stream Cache/Stream Functions.
 	\ingroup sound_render
 */
-//@{
+///@{
 /** Retrieve wavinfo from a cached sound.
 	\param sfx		sound reference
 	\return			pointer to sound's wavinfo
@@ -579,6 +579,6 @@ void SND_StreamSetPos (sfxbuffer_t *buffer, unsigned int pos);
 */
 sfxbuffer_t *SND_GetCache (long samples, int rate, int channels,
 						   sfxblock_t *block, cache_allocator_t allocator);
-//@}
+///@}
 
 #endif//__snd_internal_h
diff --git a/libs/models/winding.c b/libs/models/winding.c
index d065224f7..62ae9fcb8 100644
--- a/libs/models/winding.c
+++ b/libs/models/winding.c
@@ -40,10 +40,6 @@
 
 #define BOGUS (18000.0)
 
-/**	\addtogroup qfbsp_winding
-*/
-//@{
-
 int         c_activewindings, c_peakwindings;
 
 winding_t *
@@ -326,5 +322,3 @@ FreeWinding (winding_t *w)
 	c_activewindings--;
 	free (w);
 }
-
-//@}
diff --git a/qtv/include/connection.h b/qtv/include/connection.h
index d02e4b971..18bbbc277 100644
--- a/qtv/include/connection.h
+++ b/qtv/include/connection.h
@@ -36,7 +36,7 @@
 /**	\defgroup qtv_connection Connection Management
 	\ingroup qtv
 */
-//@{
+///@{
 
 typedef struct connection_s {
 	netadr_t    address;		///< Address of the remote end.
@@ -77,6 +77,6 @@ void Connection_Del (connection_t *con);
 */
 connection_t *Connection_Find (netadr_t *address);
 
-//@}
+///@}
 
 #endif//__connection_h
diff --git a/qtv/include/qtv.h b/qtv/include/qtv.h
index 57947af16..732febfb3 100644
--- a/qtv/include/qtv.h
+++ b/qtv/include/qtv.h
@@ -40,7 +40,7 @@
 /**	\defgroup qtv_general General Functions
 	\ingroup qtv
 */
-//@{
+///@{
 
 #define PORT_QTV 27501	///< Default port to listen for connecting clients.
 
@@ -91,6 +91,6 @@ void qtv_end_redirect (void);
 
 void qtv_sbar_init (void);
 
-//@}
+///@}
 
 #endif//__qtv_h
diff --git a/ruamoko/include/gui/Group.h b/ruamoko/include/gui/Group.h
index b9ea99386..f20cca09c 100644
--- a/ruamoko/include/gui/Group.h
+++ b/ruamoko/include/gui/Group.h
@@ -4,7 +4,7 @@
 #include "View.h"
 
 /**	\addtogroup gui */
-//@{
+///@{
 
 @class Array;
 
@@ -41,6 +41,6 @@
 - (id) addViews: (Array*)viewlist;
 @end
 
-//@}
+///@}
 
 #endif//__ruamoko_gui_Group_h
diff --git a/ruamoko/include/gui/InputLine.h b/ruamoko/include/gui/InputLine.h
index 692562a08..363cc0b8c 100644
--- a/ruamoko/include/gui/InputLine.h
+++ b/ruamoko/include/gui/InputLine.h
@@ -8,7 +8,7 @@
 
 	Interface functions to the engine implementation.
 */
-//@{
+///@{
 
 /**	Opaque handle to an inputline.
 
@@ -118,10 +118,10 @@ typedef void (il_enterfunc)(string, void*);
 	\return			The current text of the intputline.
 */
 @extern string InputLine_GetText (inputline_t il);
-//@}
+///@}
 
 /**	\addtogroup gui */
-//@{
+///@{
 
 /**	Class representation of the low-level inputline objects.
 */
@@ -252,6 +252,6 @@ typedef void (il_enterfunc)(string, void*);
 - (string) text;
 @end
 
-//@}
+///@}
 
 #endif //__ruamoko_gui_InputLine_h
diff --git a/ruamoko/include/gui/Pic.h b/ruamoko/include/gui/Pic.h
index f19e8b6e4..9ed9e3380 100644
--- a/ruamoko/include/gui/Pic.h
+++ b/ruamoko/include/gui/Pic.h
@@ -4,7 +4,7 @@
 #include "gui/View.h"
 
 /**	\addtogroup gui */
-//@{
+///@{
 
 @interface Pic : View
 {
@@ -18,6 +18,6 @@
 -(void)draw;
 @end
 
-//@}
+///@}
 
 #endif//__ruamoko_gui_Pic_h
diff --git a/ruamoko/include/gui/Point.h b/ruamoko/include/gui/Point.h
index 4ac36391a..9de4d7f5e 100644
--- a/ruamoko/include/gui/Point.h
+++ b/ruamoko/include/gui/Point.h
@@ -2,7 +2,7 @@
 #define __ruamoko_gui_Point_h
 
 /**	\addtogroup gui */
-//@{
+///@{
 
 struct Point {
 	int x;
@@ -15,6 +15,6 @@ typedef struct Point Point;
 @extern Point addPoint (Point a, Point b);
 @extern Point subtractPoint (Point a, Point b);
 
-//@}
+///@}
 
 #endif //__ruamoko_gui_Point_h
diff --git a/ruamoko/include/gui/Rect.h b/ruamoko/include/gui/Rect.h
index 145815d66..005ce4a70 100644
--- a/ruamoko/include/gui/Rect.h
+++ b/ruamoko/include/gui/Rect.h
@@ -5,7 +5,7 @@
 #include "gui/Size.h"
 
 /**	\addtogroup gui */
-//@{
+///@{
 
 struct Rect {
 	Point	origin;
@@ -30,6 +30,6 @@ typedef struct Rect Rect;
 - (Rect) offsetBySize: (Size)aSize;
 #endif
 
-//@}
+///@}
 
 #endif //__ruamoko_gui_Rect_h
diff --git a/ruamoko/include/gui/Size.h b/ruamoko/include/gui/Size.h
index 0f6b387a3..dd48c6259 100644
--- a/ruamoko/include/gui/Size.h
+++ b/ruamoko/include/gui/Size.h
@@ -2,7 +2,7 @@
 #define __ruamoko_gui_Size_h
 
 /**	\addtogroup gui */
-//@{
+///@{
 
 struct Size {
 	int width;
@@ -15,6 +15,6 @@ typedef struct Size Size;
 @extern Size addSize (Size a, Size b);
 @extern Size subtractSize (Size a, Size b);
 
-//@}
+///@}
 
 #endif //__ruamoko_gui_Size_h
diff --git a/ruamoko/include/gui/Slider.h b/ruamoko/include/gui/Slider.h
index 13a68f492..66710d28e 100644
--- a/ruamoko/include/gui/Slider.h
+++ b/ruamoko/include/gui/Slider.h
@@ -4,7 +4,7 @@
 #include "View.h"
 
 /**	\addtogroup gui */
-//@{
+///@{
 
 @interface Slider: View
 {
@@ -19,6 +19,6 @@
 
 @end
 
-//@}
+///@}
 
 #endif //__ruamoko_gui_Slider_h
diff --git a/ruamoko/include/gui/Text.h b/ruamoko/include/gui/Text.h
index d9c6a1311..d5654d555 100644
--- a/ruamoko/include/gui/Text.h
+++ b/ruamoko/include/gui/Text.h
@@ -4,7 +4,7 @@
 #include "View.h"
 
 /**	\addtogroup gui */
-//@{
+///@{
 
 @interface Text: View
 {
@@ -18,6 +18,6 @@
 - (void) draw;
 @end
 
-//@}
+///@}
 
 #endif //__ruamoko_gui_Text_h
diff --git a/ruamoko/include/gui/View.h b/ruamoko/include/gui/View.h
index a84f05e06..c2a99e036 100644
--- a/ruamoko/include/gui/View.h
+++ b/ruamoko/include/gui/View.h
@@ -8,7 +8,7 @@
 */
 
 /**	\addtogroup gui */
-//@{
+///@{
 
 /** The View class.
 */
@@ -34,6 +34,6 @@
 - (int) keyEvent:(int)key unicode:(int)unicode down:(int)down;
 @end
 
-//@}
+///@}
 
 #endif //__ruamoko_gui_View_h
diff --git a/tools/qfbsp/include/brush.h b/tools/qfbsp/include/brush.h
index f51beab00..345b14747 100644
--- a/tools/qfbsp/include/brush.h
+++ b/tools/qfbsp/include/brush.h
@@ -30,7 +30,7 @@
 /**	\defgroup qfbsp_brush Brush Functions
 	\ingroup qfbsp
 */
-//@{
+///@{
 
 #define	NUM_HULLS		2				// normal and +16
 
@@ -95,6 +95,6 @@ int NormalizePlane (plane_t *dp);
 */
 int	FindPlane (const plane_t *dplane, int *side);
 
-//@}
+///@}
 
 #endif//qfbsp_brush_h
diff --git a/tools/qfbsp/include/bsp5.h b/tools/qfbsp/include/bsp5.h
index 4cacb23ae..b949cf77c 100644
--- a/tools/qfbsp/include/bsp5.h
+++ b/tools/qfbsp/include/bsp5.h
@@ -32,7 +32,7 @@
 /**	\defgroup qfbsp_general General functions
 	\ingroup qfbsp
 */
-//@{
+///@{
 
 #define MAX_THREADS 4
 
@@ -129,6 +129,6 @@ node_t *AllocNode (void);
 
 extern bsp_t *bsp;
 
-//@}
+///@}
 
 #endif//qfbsp_bsp5_h
diff --git a/tools/qfbsp/include/csg4.h b/tools/qfbsp/include/csg4.h
index dd48047f4..e6ff8b4a3 100644
--- a/tools/qfbsp/include/csg4.h
+++ b/tools/qfbsp/include/csg4.h
@@ -27,7 +27,7 @@
 /**	\defgroup qfbsp_csg4 CSG Functions
 	\ingroup qfbsp
 */
-//@{
+///@{
 
 struct plane_s;
 struct visfacet_s;
@@ -84,6 +84,6 @@ struct surface_s *CSGFaces (struct brushset_s *bs);
 void SplitFace (struct visfacet_s *in, struct plane_s *split,
 				struct visfacet_s **front, struct visfacet_s **back);
 
-//@}
+///@}
 
 #endif//qfbsp_csg4_h
diff --git a/tools/qfbsp/include/draw.h b/tools/qfbsp/include/draw.h
index ecaa3fd53..740fa9050 100644
--- a/tools/qfbsp/include/draw.h
+++ b/tools/qfbsp/include/draw.h
@@ -27,7 +27,7 @@
 /**	\defgroup qfbsp_draw Debug Drawing Functions
 	\ingroup qfbsp
 */
-//@{
+///@{
 
 struct visfacet_s;
 struct portal_s;
@@ -53,6 +53,6 @@ void DrawBrush (const struct brush_s *b);
 void DrawWinding (const struct winding_s *w);
 void DrawTri (const vec3_t p1, const vec3_t p2, const vec3_t p3);
 
-//@}
+///@}
 
 #endif//qfbsp_draw_h
diff --git a/tools/qfbsp/include/map.h b/tools/qfbsp/include/map.h
index e531fad8a..25c56d4ef 100644
--- a/tools/qfbsp/include/map.h
+++ b/tools/qfbsp/include/map.h
@@ -27,7 +27,7 @@
 /**	\defgroup qfbsp_map Map Parser
 	\ingroup qfbsp
 */
-//@{
+///@{
 
 #define MAX_FACES 256
 typedef struct mface_s {
@@ -120,6 +120,6 @@ void GetVectorForKey (const entity_t *ent, const char *key, vec3_t vec);
 */
 void WriteEntitiesToString (void);
 
-//@}
+///@}
 
 #endif//qfbsp_map_h
diff --git a/tools/qfbsp/include/merge.h b/tools/qfbsp/include/merge.h
index 81e8b2c1c..c65ee15ff 100644
--- a/tools/qfbsp/include/merge.h
+++ b/tools/qfbsp/include/merge.h
@@ -25,7 +25,7 @@
 /**	\defgroup qfbsp_merge Merge Functions
 	\ingroup qfbsp
 */
-//@{
+///@{
 
 /**	Add a face to the list of faces, doing any possible merging.
 
@@ -63,6 +63,6 @@ void MergePlaneFaces (surface_t *plane);
 */
 void MergeAll (surface_t *surfhead);
 
-//@}
+///@}
 
 #endif//qfbsp_merge_h
diff --git a/tools/qfbsp/include/options.h b/tools/qfbsp/include/options.h
index 4b062f27e..47a8e0df7 100644
--- a/tools/qfbsp/include/options.h
+++ b/tools/qfbsp/include/options.h
@@ -33,7 +33,7 @@
 /**	\defgroup qfbsp_options Command-line Options Parsing
 	\ingroup qfbsp
 */
-//@{
+///@{
 
 typedef struct {
 	int         verbosity;		// 0=silent
@@ -65,6 +65,6 @@ extern options_t options;
 int DecodeArgs (int argc, char **argv);
 extern const char *this_program;
 
-//@}
+///@}
 
 #endif//qfbsp_options_h
diff --git a/tools/qfbsp/include/outside.h b/tools/qfbsp/include/outside.h
index 8ad85fe49..e45e11496 100644
--- a/tools/qfbsp/include/outside.h
+++ b/tools/qfbsp/include/outside.h
@@ -25,7 +25,7 @@
 /**	\defgroup qfbsp_outside Outside Functions
 	\ingroup qfbsp
 */
-//@{
+///@{
 
 struct node_s;
 
@@ -41,6 +41,6 @@ struct node_s;
 */
 qboolean FillOutside (struct node_s *node);
 
-//@}
+///@}
 
 #endif//qfbsp_outside_h
diff --git a/tools/qfbsp/include/portals.h b/tools/qfbsp/include/portals.h
index 381bbf0f9..6d5da460e 100644
--- a/tools/qfbsp/include/portals.h
+++ b/tools/qfbsp/include/portals.h
@@ -31,7 +31,7 @@
 	Decision nodes will not have portals on them, though as part of the
 	portal building process, they will temporarily have portals.
 */
-//@{
+///@{
 
 struct node_s;
 
@@ -89,6 +89,6 @@ void FreeAllPortals (struct node_s *node);
 */
 void WritePortalfile (struct node_s *headnode);
 
-//@}
+///@}
 
 #endif//qfbsp_portals_h
diff --git a/tools/qfbsp/include/readbsp.h b/tools/qfbsp/include/readbsp.h
index 17f1b2890..5887a68ea 100644
--- a/tools/qfbsp/include/readbsp.h
+++ b/tools/qfbsp/include/readbsp.h
@@ -25,7 +25,7 @@
 /**	\defgroup qfbsp_readbsp BSP Reading Functions
 	\ingroup qfbsp
 */
-//@{
+///@{
 
 /**	Load the bspfile into memory.
 */
@@ -47,6 +47,6 @@ void extract_entities (void);
 */
 void extract_hull (void);
 
-//@}
+///@}
 
 #endif//qfbsp_readbsp_h
diff --git a/tools/qfbsp/include/region.h b/tools/qfbsp/include/region.h
index ce30e71f7..2a17734c5 100644
--- a/tools/qfbsp/include/region.h
+++ b/tools/qfbsp/include/region.h
@@ -25,7 +25,7 @@
 /**	\defgroup qfbsp_region Region Functions
 	\ingroup qfbsp
 */
-//@{
+///@{
 
 struct node_s;
 
@@ -35,6 +35,6 @@ struct node_s;
 */
 void GrowNodeRegions (struct node_s *headnode);
 
-//@}
+///@}
 
 #endif//qfbsp_region_h
diff --git a/tools/qfbsp/include/solidbsp.h b/tools/qfbsp/include/solidbsp.h
index 18bd306a6..5a3d7fbe4 100644
--- a/tools/qfbsp/include/solidbsp.h
+++ b/tools/qfbsp/include/solidbsp.h
@@ -27,7 +27,7 @@
 /**	\defgroup qfbsp_solidbsp BSP Creation Functions
 	\ingroup qfbsp
 */
-//@{
+///@{
 
 struct visfacet_s;
 struct plane_s;
@@ -48,6 +48,6 @@ void CalcSurfaceInfo (struct surface_s *surf);
 */
 struct node_s *SolidBSP (struct surface_s *surfhead, qboolean midsplit);
 
-//@}
+///@}
 
 #endif//qfbsp_solidbsp_h
diff --git a/tools/qfbsp/include/surfaces.h b/tools/qfbsp/include/surfaces.h
index ebb8314cc..561d21048 100644
--- a/tools/qfbsp/include/surfaces.h
+++ b/tools/qfbsp/include/surfaces.h
@@ -27,7 +27,7 @@
 /**	\defgroup qfbsp_surface Surface Functions
 	\ingroup qfbsp
 */
-//@{
+///@{
 
 struct visfacet_s;
 struct node_s;
@@ -104,6 +104,6 @@ struct surface_s *GatherNodeFaces (struct node_s *headnode);
 */
 void MakeFaceEdges (struct node_s *headnode);
 
-//@}
+///@}
 
 #endif//surfaces_h
diff --git a/tools/qfbsp/include/tjunc.h b/tools/qfbsp/include/tjunc.h
index 46fa939fc..3557e4df7 100644
--- a/tools/qfbsp/include/tjunc.h
+++ b/tools/qfbsp/include/tjunc.h
@@ -25,7 +25,7 @@
 /**	\defgroup qfbsp_tjunc T-Junction Repair
 	\ingroup qfbsp
 */
-//@{
+///@{
 
 struct node_s;
 
@@ -35,6 +35,6 @@ struct node_s;
 */
 void tjunc (struct node_s *headnode);
 
-//@}
+///@}
 
 #endif//qfbsp_tjunc_h
diff --git a/tools/qfbsp/include/writebsp.h b/tools/qfbsp/include/writebsp.h
index 6d2a5cf0f..759220904 100644
--- a/tools/qfbsp/include/writebsp.h
+++ b/tools/qfbsp/include/writebsp.h
@@ -27,7 +27,7 @@
 /**	\defgroup qfbsp_writebsp BSP Writing Functions
 	\ingroup qfbsp
 */
-//@{
+///@{
 
 struct node_s;
 
@@ -78,6 +78,6 @@ void BeginBSPFile (void);
 */
 void FinishBSPFile (void);
 
-//@}
+///@}
 
 #endif//qfbsp_writebsp_h
diff --git a/tools/qfcc/include/dags.h b/tools/qfcc/include/dags.h
index c0d07c4b3..c83c029f6 100644
--- a/tools/qfcc/include/dags.h
+++ b/tools/qfcc/include/dags.h
@@ -33,7 +33,7 @@
 /** \defgroup qfcc_dags DAG building
 	\ingroup qfcc
 */
-//@{
+///@{
 
 #include "QF/pr_comp.h"
 
@@ -110,6 +110,6 @@ dag_t *dag_create (struct flownode_s *flownode);
 void dag_remove_dead_nodes (dag_t *dag);
 void dag_generate (dag_t *dag, sblock_t *block);
 
-//@}
+///@}
 
 #endif//dags_h
diff --git a/tools/qfcc/include/def.h b/tools/qfcc/include/def.h
index 68b946fab..df0104178 100644
--- a/tools/qfcc/include/def.h
+++ b/tools/qfcc/include/def.h
@@ -37,7 +37,7 @@
 /** \defgroup qfcc_def Def handling
 	\ingroup qfcc
 */
-//@{
+///@{
 
 struct symbol_s;
 struct expr_s;
@@ -180,7 +180,7 @@ void free_def (def_t *def);
 	Temporary defs are bound to the current function (::current_func must
 	be valid). They are always allocated from the funciont's local defspace.
 */
-//@{
+///@{
 /** Get a temporary def.
 
 	If the current function has a free temp def of the same size as \a size,
@@ -207,7 +207,7 @@ def_t *temp_def (struct type_s *type);
 	\param temp		The temp def to be recycled.
 */
 void free_temp_def (def_t *temp);
-//@}
+///@}
 
 /** Initialize a vm def from a qfcc def.
 
@@ -306,6 +306,6 @@ int def_size (def_t *def) __attribute__((pure));
 */
 int def_visit_all (def_t *def, int overlap,
 				   int (*visit) (def_t *, void *), void *data);
-//@}
+///@}
 
 #endif//__def_h
diff --git a/tools/qfcc/include/defspace.h b/tools/qfcc/include/defspace.h
index 8e7f034d6..bd4b68920 100644
--- a/tools/qfcc/include/defspace.h
+++ b/tools/qfcc/include/defspace.h
@@ -37,7 +37,7 @@
 /** \defgroup qfcc_defspace Defspace handling
 	\ingroup qfcc
 */
-//@{
+///@{
 
 typedef enum {
 	ds_backed,		///< data space is globally addressable (near/far/type) and
@@ -145,6 +145,6 @@ void defspace_free_loc (defspace_t *space, int ofs, int size);
 */
 int defspace_add_data (defspace_t *space, pr_type_t *data, int size);
 
-//@}
+///@}
 
 #endif//__defspace_h
diff --git a/tools/qfcc/include/diagnostic.h b/tools/qfcc/include/diagnostic.h
index bd32711f8..3a19c9722 100644
--- a/tools/qfcc/include/diagnostic.h
+++ b/tools/qfcc/include/diagnostic.h
@@ -36,7 +36,7 @@
 /**	\defgroup qfcc_diagnostic Diagnostic Messages
 	\ingroup qfcc
 */
-//@{
+///@{
 
 typedef void (*diagnostic_hook)(const char *message);
 extern diagnostic_hook bug_hook;
@@ -73,6 +73,6 @@ void _bug (struct expr_s *e, const char *file, int line, const char *fmt, ...)
 	__attribute__ ((format (printf, 4, 5)));
 #define bug(e, fmt...) _bug(e, __FILE__, __LINE__, fmt)
 
-//@}
+///@}
 
 #endif//__diagnostic_h
diff --git a/tools/qfcc/include/expr.h b/tools/qfcc/include/expr.h
index 5109b364e..d83610b7f 100644
--- a/tools/qfcc/include/expr.h
+++ b/tools/qfcc/include/expr.h
@@ -36,7 +36,7 @@
 /**	\defgroup qfcc_expr Expressions
 	\ingroup qfcc
 */
-//@{
+///@{
 
 /**	Type of the exression node in an expression tree.
 */
@@ -652,6 +652,6 @@ expr_t *sizeof_expr (expr_t *expr, struct type_s *type);
 
 expr_t *fold_constants (expr_t *e);
 
-//@}
+///@}
 
 #endif//__expr_h
diff --git a/tools/qfcc/include/flow.h b/tools/qfcc/include/flow.h
index 591704a01..b4cc48cf5 100644
--- a/tools/qfcc/include/flow.h
+++ b/tools/qfcc/include/flow.h
@@ -33,7 +33,7 @@
 /** \defgroup qfcc_flow Flow graph analysis
 	\ingroup qfcc
 */
-//@{
+///@{
 
 struct function_s;
 struct sblock_s;
@@ -120,6 +120,6 @@ void dump_dot_flow_live (void *g, const char *filename);
 void dump_dot_flow_reaching (void *g, const char *filename);
 void dump_dot_flow_statements (void *g, const char *filename);
 
-//@}
+///@}
 
 #endif//flow_h
diff --git a/tools/qfcc/include/function.h b/tools/qfcc/include/function.h
index d145fc53e..88ea05dc8 100644
--- a/tools/qfcc/include/function.h
+++ b/tools/qfcc/include/function.h
@@ -34,7 +34,7 @@
 /** \defgroup qfcc_function Internal function structures.
 	\ingroup qfcc
 */
-//@{
+///@{
 
 #include "QF/pr_comp.h"
 #include "QF/pr_debug.h"
@@ -147,6 +147,6 @@ void emit_function (function_t *f, struct expr_s *e);
 int function_parms (function_t *f, byte *parm_size);
 void clear_functions (void);
 
-//@}
+///@}
 
 #endif//__function_h
diff --git a/tools/qfcc/include/obj_file.h b/tools/qfcc/include/obj_file.h
index 1fe1d3690..0e6096028 100644
--- a/tools/qfcc/include/obj_file.h
+++ b/tools/qfcc/include/obj_file.h
@@ -34,7 +34,7 @@
 /** \defgroup qfcc_qfo Object file functions
 	\ingroup qfcc
 */
-//@{
+///@{
 
 #include "QF/pr_comp.h"
 #include "QF/pr_debug.h"
@@ -106,12 +106,12 @@ typedef struct qfo_def_s {
 	string_t    file;			///< source file name
 	pr_uint_t   line;			///< source line number
 } qfo_def_t;
-//@}
+///@}
 
 /** \defgroup qfcc_qfo_QFOD QFOD flags
 	\ingroup qfcc_qfo
 */
-//@{
+///@{
 
 /** The def has been initialized.
 
@@ -168,11 +168,11 @@ typedef struct qfo_def_s {
 	\hideinitializer
 */
 #define QFOD_PARAM			(1u<<8)
-//@}
+///@}
 
 /** \addtogroup qfcc_qfo
 */
-//@{
+///@{
 
 /** Representation of a function in the object file.
 */
@@ -286,13 +286,13 @@ enum {
 
 	qfo_num_spaces
 };
-//@}
+///@}
 
 /** \defgroup qfcc_qfo_data_access QFO Data Acess
 	\ingroup qfcc_qfo
 	Macros for accessing data in the QFO address space
 */
-//@{
+///@{
 
 /** \internal
 	\param q pointer to ::qfo_t struct
@@ -361,7 +361,6 @@ enum {
 
 	\param q pointer to ::qfo_t struct
 	\param s space index
-	\param s offset into object file string space
 	\return (char *)
 
 	\hideinitializer
@@ -439,11 +438,11 @@ enum {
 */
 #define QFO_STRUCT(q, s, t, o)	(*QFO_POINTER (q, s, t, o))
 
-//@}
+///@}
 
 /** \addtogroup qfcc_qfo
 */
-//@{
+///@{
 
 struct pr_info_s;
 
@@ -485,6 +484,6 @@ qfo_t *qfo_new (void);
 */
 void qfo_delete (qfo_t *qfo);
 
-//@}
+///@}
 
 #endif//__obj_file_h
diff --git a/tools/qfcc/include/obj_type.h b/tools/qfcc/include/obj_type.h
index d9c677641..13ce701e4 100644
--- a/tools/qfcc/include/obj_type.h
+++ b/tools/qfcc/include/obj_type.h
@@ -38,6 +38,4 @@
 struct type_s;
 struct def_s *qfo_encode_type (struct type_s *type);
 
-//@}
-
 #endif//__obj_type_h
diff --git a/tools/qfcc/include/pragma.h b/tools/qfcc/include/pragma.h
index 1f6726f28..5f660ac23 100644
--- a/tools/qfcc/include/pragma.h
+++ b/tools/qfcc/include/pragma.h
@@ -33,10 +33,10 @@
 /** \defgroup qfcc_pragma pragma handling
 	\ingroup qfcc
 */
-//@{
+///@{
 
 void pragma (const char *id);
 
-//@}
+///@}
 
 #endif//pragma_h
diff --git a/tools/qfcc/include/qfcc.h b/tools/qfcc/include/qfcc.h
index 0bec07d37..1a1793b34 100644
--- a/tools/qfcc/include/qfcc.h
+++ b/tools/qfcc/include/qfcc.h
@@ -39,7 +39,7 @@
 /** \defgroup qfcc_general General functions
 	\ingroup qfcc
 */
-//@{
+///@{
 
 typedef struct srcline_s srcline_t;
 struct srcline_s {
@@ -132,6 +132,6 @@ char *fix_backslash (char *path);
 */
 #define RUP(x,a) (((x) + ((a) - 1)) & ~((a) - 1))
 
-//@}
+///@}
 
 #endif//__qfcc_h
diff --git a/tools/qfcc/include/symtab.h b/tools/qfcc/include/symtab.h
index f338077eb..c0c064f3e 100644
--- a/tools/qfcc/include/symtab.h
+++ b/tools/qfcc/include/symtab.h
@@ -39,7 +39,7 @@ enum storage_class_e;
 /**	\defgroup qfcc_symtab Symbol Table Management
 	\ingroup qfcc
 */
-//@{
+///@{
 
 typedef enum vis_e {
 	vis_public,
@@ -235,6 +235,6 @@ symtab_t *symtab_flat_copy (symtab_t *symtab, symtab_t *parent);
 symbol_t *make_symbol (const char *name, struct type_s *type,
 					   struct defspace_s *space, enum storage_class_e storage);
 
-//@}
+///@}
 
 #endif//__symtab_h
diff --git a/tools/qfcc/include/value.h b/tools/qfcc/include/value.h
index 11bee26e6..883af01e0 100644
--- a/tools/qfcc/include/value.h
+++ b/tools/qfcc/include/value.h
@@ -34,7 +34,7 @@
 /** \defgroup qfcc_value Constant values.
 	\ingroup qfcc_expr
 */
-//@{
+///@{
 
 struct ex_value_s;
 struct type_s;
@@ -63,6 +63,6 @@ int	ReuseString (const char *str);
 
 void clear_immediates (void);
 
-//@}
+///@}
 
 #endif//__value_h
diff --git a/tools/qflight/include/entities.h b/tools/qflight/include/entities.h
index 82bf378cc..6f3d1dd12 100644
--- a/tools/qflight/include/entities.h
+++ b/tools/qflight/include/entities.h
@@ -34,7 +34,7 @@
 /** \defgroup qflight_entities Light entity data.
 	\ingroup qflight
 */
-//@{
+///@{
 
 #define DEFAULTLIGHTLEVEL	300
 #define DEFAULTFALLOFF 1.0f
@@ -106,6 +106,6 @@ void GetVectorForKey (entity_t *ent, const char *key, vec3_t vec);
 void LoadEntities (void);
 void WriteEntitiesToString (void);
 
-//@}
+///@}
 
 #endif// __entities_h
diff --git a/tools/qflight/include/light.h b/tools/qflight/include/light.h
index e06a9157a..350b7e442 100644
--- a/tools/qflight/include/light.h
+++ b/tools/qflight/include/light.h
@@ -37,7 +37,7 @@
 /** \defgroup qflight_general General functions
 	\ingroup qflight
 */
-//@{
+///@{
 
 #define	ON_EPSILON	0.1
 #define	MAXLIGHTS	1024
@@ -130,6 +130,6 @@ extern int num_novislights;
 
 const char *get_tex_name (int texindex) __attribute__((pure));
 
-//@}
+///@}
 
 #endif// __light_h
diff --git a/tools/qflight/include/noise.h b/tools/qflight/include/noise.h
index 30625ae13..be63d9de1 100644
--- a/tools/qflight/include/noise.h
+++ b/tools/qflight/include/noise.h
@@ -31,7 +31,7 @@
 /** \defgroup qflight_noise Light noise functions.
 	\ingroup qflight
 */
-//@{
+///@{
 
 float noise3d (vec3_t v, int num) __attribute__((pure));
 float noiseXYZ (float x, float y, float z, int num) __attribute__((pure));
@@ -39,4 +39,4 @@ float noise_scaled (vec3_t v, float s, int num) __attribute__((pure));
 float noise_perlin (vec3_t v, float p, int num) __attribute__((pure));
 void snap_vector (vec3_t v_old, vec3_t v_new, float scale);
 
-//@}
+///@}
diff --git a/tools/qflight/include/options.h b/tools/qflight/include/options.h
index a90592519..32c6d6755 100644
--- a/tools/qflight/include/options.h
+++ b/tools/qflight/include/options.h
@@ -33,7 +33,7 @@
 /** \defgroup qflight_options Light command line options.
 	\ingroup qflight
 */
-//@{
+///@{
 
 typedef struct {
 	int			verbosity;		// 0=silent
@@ -59,6 +59,6 @@ extern const char *this_program;
 int DecodeArgs (int argc, char **argv);
 void usage (int status) __attribute__((noreturn));
 
-//@}
+///@}
 
 #endif//__options_h
diff --git a/tools/qflight/include/properties.h b/tools/qflight/include/properties.h
index a6b724d19..d5e73db7f 100644
--- a/tools/qflight/include/properties.h
+++ b/tools/qflight/include/properties.h
@@ -33,7 +33,7 @@
 /** \defgroup qflight_properties Lighting properties
 	\ingroup qflight
 */
-//@{
+///@{
 
 struct plitem_s;
 
@@ -199,6 +199,6 @@ void set_properties (entity_t *ent, struct plitem_s *dict);
 */
 void LoadProperties (const char *filename);
 
-//@}
+///@}
 
 #endif//__properties_h
diff --git a/tools/qflight/include/threads.h b/tools/qflight/include/threads.h
index 30b9cc59f..0fd5c00af 100644
--- a/tools/qflight/include/threads.h
+++ b/tools/qflight/include/threads.h
@@ -32,7 +32,7 @@
 /** \defgroup qflight_threads Light thread handling.
 	\ingroup qflight
 */
-//@{
+///@{
 
 #if defined (HAVE_PTHREAD_H) && defined (HAVE_PTHREAD)
 
@@ -66,6 +66,6 @@ typedef void *(threadfunc_t) (void *);
 void InitThreads (void);
 void RunThreadsOn (threadfunc_t func);
 
-//@}
+///@}
 
 #endif// __threads_h

From 9248e8cf014f69341fd55a4fea5f8933a24af0ff Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 11 Feb 2020 15:20:49 +0900
Subject: [PATCH 0347/1519] Update for doxygen 1.8.16

---
 doc/quakeforge.dox.conf.in         | 299 +++++++++++++++++++++--------
 include/QF/alloc.h                 |   4 +-
 include/QF/cbuf.h                  |   4 +-
 include/QF/checksum.h              |   4 +-
 include/QF/cmd.h                   |   4 +-
 include/QF/crc.h                   |   4 +-
 include/QF/cvar.h                  |   8 +-
 include/QF/draw.h                  |   8 +-
 include/QF/dstring.h               |  20 +-
 include/QF/hash.h                  |   4 +-
 include/QF/idparse.h               |   4 +-
 include/QF/info.h                  |   4 +-
 include/QF/keys.h                  |   4 +-
 include/QF/math/dual.h             |   4 +-
 include/QF/math/half.h             |   4 +-
 include/QF/math/matrix3.h          |   4 +-
 include/QF/math/matrix4.h          |   4 +-
 include/QF/math/quaternion.h       |   4 +-
 include/QF/math/vector.h           |   4 +-
 include/QF/mathlib.h               |   4 +-
 include/QF/mdfour.h                |   4 +-
 include/QF/msg.h                   |   4 +-
 include/QF/pak.h                   |   4 +-
 include/QF/pakfile.h               |   4 +-
 include/QF/plugin.h                |   4 +-
 include/QF/pr_type.h               |   4 +-
 include/QF/progs.h                 |  73 +++----
 include/QF/qargs.h                 |   4 +-
 include/QF/qendian.h               |   4 +-
 include/QF/qfplist.h               |   4 +-
 include/QF/quakefs.h               |   4 +-
 include/QF/quakeio.h               |   4 +-
 include/QF/script.h                |   4 +-
 include/QF/set.h                   |   4 +-
 include/QF/sizebuf.h               |   4 +-
 include/QF/sound.h                 |  12 +-
 include/QF/sys.h                   |   4 +-
 include/QF/va.h                    |   4 +-
 include/QF/ver_check.h             |   4 +-
 include/QF/view.h                  |   4 +-
 include/QF/wad.h                   |   4 +-
 include/QF/wadfile.h               |   4 +-
 include/QF/winding.h               |   4 +-
 include/QF/zone.h                  |   4 +-
 include/net_dgrm.h                 |   4 +-
 include/net_loop.h                 |   4 +-
 include/net_udp.h                  |   4 +-
 include/net_vcr.h                  |   4 +-
 include/net_wins.h                 |   4 +-
 include/netchan.h                  |  12 +-
 include/netmain.h                  |  28 +--
 include/snd_internal.h             |  28 +--
 libs/models/winding.c              |   6 -
 qtv/include/connection.h           |   4 +-
 qtv/include/qtv.h                  |   4 +-
 ruamoko/include/gui/Group.h        |   4 +-
 ruamoko/include/gui/InputLine.h    |   8 +-
 ruamoko/include/gui/Pic.h          |   4 +-
 ruamoko/include/gui/Point.h        |   4 +-
 ruamoko/include/gui/Rect.h         |   4 +-
 ruamoko/include/gui/Size.h         |   4 +-
 ruamoko/include/gui/Slider.h       |   4 +-
 ruamoko/include/gui/Text.h         |   4 +-
 ruamoko/include/gui/View.h         |   4 +-
 tools/qfbsp/include/brush.h        |   4 +-
 tools/qfbsp/include/bsp5.h         |   4 +-
 tools/qfbsp/include/csg4.h         |   4 +-
 tools/qfbsp/include/draw.h         |   4 +-
 tools/qfbsp/include/map.h          |   4 +-
 tools/qfbsp/include/merge.h        |   4 +-
 tools/qfbsp/include/options.h      |   4 +-
 tools/qfbsp/include/outside.h      |   4 +-
 tools/qfbsp/include/portals.h      |   4 +-
 tools/qfbsp/include/readbsp.h      |   4 +-
 tools/qfbsp/include/region.h       |   4 +-
 tools/qfbsp/include/solidbsp.h     |   4 +-
 tools/qfbsp/include/surfaces.h     |   4 +-
 tools/qfbsp/include/tjunc.h        |   4 +-
 tools/qfbsp/include/writebsp.h     |   4 +-
 tools/qfcc/include/dags.h          |   4 +-
 tools/qfcc/include/def.h           |   8 +-
 tools/qfcc/include/defspace.h      |   4 +-
 tools/qfcc/include/diagnostic.h    |   4 +-
 tools/qfcc/include/expr.h          |   4 +-
 tools/qfcc/include/flow.h          |   4 +-
 tools/qfcc/include/function.h      |   4 +-
 tools/qfcc/include/obj_file.h      |  21 +-
 tools/qfcc/include/obj_type.h      |   2 -
 tools/qfcc/include/pragma.h        |   4 +-
 tools/qfcc/include/qfcc.h          |   4 +-
 tools/qfcc/include/symtab.h        |   4 +-
 tools/qfcc/include/value.h         |   4 +-
 tools/qflight/include/entities.h   |   4 +-
 tools/qflight/include/light.h      |   4 +-
 tools/qflight/include/noise.h      |   4 +-
 tools/qflight/include/options.h    |   4 +-
 tools/qflight/include/properties.h |   4 +-
 tools/qflight/include/threads.h    |   4 +-
 98 files changed, 496 insertions(+), 373 deletions(-)

diff --git a/doc/quakeforge.dox.conf.in b/doc/quakeforge.dox.conf.in
index 9db22207d..64028f578 100644
--- a/doc/quakeforge.dox.conf.in
+++ b/doc/quakeforge.dox.conf.in
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.9.1
+# Doxyfile 1.8.16
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -17,11 +17,11 @@
 # Project related configuration options
 #---------------------------------------------------------------------------
 
-# This tag specifies the encoding used for all characters in the config file
-# that follow. The default is UTF-8 which is also the encoding used for all text
-# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
-# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv
-# for the list of possible encodings.
+# This tag specifies the encoding used for all characters in the configuration
+# file that follow. The default is UTF-8 which is also the encoding used for all
+# text before the first occurrence of this tag. Doxygen uses libiconv (or the
+# iconv built into libc) for the transcoding. See
+# https://www.gnu.org/software/libiconv/ for the list of possible encodings.
 # The default value is: UTF-8.
 
 DOXYFILE_ENCODING      = UTF-8
@@ -93,6 +93,14 @@ ALLOW_UNICODE_NAMES    = NO
 
 OUTPUT_LANGUAGE        = English
 
+# The OUTPUT_TEXT_DIRECTION tag is used to specify the direction in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all generated output in the proper direction.
+# Possible values are: None, LTR, RTL and Context.
+# The default value is: None.
+
+OUTPUT_TEXT_DIRECTION  = None
+
 # If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
 # descriptions after the members that are listed in the file and class
 # documentation (similar to Javadoc). Set to NO to disable this.
@@ -179,6 +187,16 @@ SHORT_NAMES            = NO
 
 JAVADOC_AUTOBRIEF      = YES
 
+# If the JAVADOC_BANNER tag is set to YES then doxygen will interpret a line
+# such as
+# /***************
+# as being the beginning of a Javadoc-style comment "banner". If set to NO, the
+# Javadoc-style will behave just like regular comments and it will not be
+# interpreted by doxygen.
+# The default value is: NO.
+
+JAVADOC_BANNER         = NO
+
 # If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
 # line (until the first dot) of a Qt-style comment as the brief description. If
 # set to NO, the Qt-style will behave just like regular Qt-style comments (thus
@@ -226,7 +244,12 @@ TAB_SIZE               = 4
 # will allow you to put the command \sideeffect (or @sideeffect) in the
 # documentation, which will result in a user-defined paragraph with heading
 # "Side Effects:". You can put \n's in the value part of an alias to insert
-# newlines.
+# newlines (in the resulting output). You can put ^^ in the value part of an
+# alias to insert a newline as if a physical newline was in the original file.
+# When you need a literal { or } or , in the value part of an alias you have to
+# escape them by means of a backslash (\), this can lead to conflicts with the
+# commands \{ and \} for these it is advised to use the version @{ and @} or use
+# a double escape (\\{ and \\})
 
 ALIASES                = QF=QuakeForge
 
@@ -264,17 +287,26 @@ OPTIMIZE_FOR_FORTRAN   = NO
 
 OPTIMIZE_OUTPUT_VHDL   = NO
 
+# Set the OPTIMIZE_OUTPUT_SLICE tag to YES if your project consists of Slice
+# sources only. Doxygen will then generate output that is more tailored for that
+# language. For instance, namespaces will be presented as modules, types will be
+# separated into more groups, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_SLICE  = NO
+
 # Doxygen selects the parser to use depending on the extension of the files it
 # parses. With this tag you can assign which parser to use for a given
 # extension. Doxygen has a built-in mapping, but you can override or extend it
 # using this tag. The format is ext=language, where ext is a file extension, and
 # language is one of the parsers supported by doxygen: IDL, Java, Javascript,
-# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran:
-# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran:
-# Fortran. In the later case the parser tries to guess whether the code is fixed
-# or free formatted code, this is the default for Fortran type files), VHDL. For
-# instance to make doxygen treat .inc files as Fortran files (default is PHP),
-# and .f files as C (default is Fortran), use: inc=Fortran f=C.
+# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
+# FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
+# tries to guess whether the code is fixed or free formatted code, this is the
+# default for Fortran type files), VHDL, tcl. For instance to make doxygen treat
+# .inc files as Fortran files (default is PHP), and .f files as C (default is
+# Fortran), use: inc=Fortran f=C.
 #
 # Note: For files without extension you can use no_extension as a placeholder.
 #
@@ -285,7 +317,7 @@ EXTENSION_MAPPING      = no_extension=C
 
 # If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
 # according to the Markdown format, which allows for more readable
-# documentation. See http://daringfireball.net/projects/markdown/ for details.
+# documentation. See https://daringfireball.net/projects/markdown/ for details.
 # The output of markdown processing is further processed by doxygen, so you can
 # mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
 # case of backward compatibilities issues.
@@ -293,6 +325,15 @@ EXTENSION_MAPPING      = no_extension=C
 
 MARKDOWN_SUPPORT       = YES
 
+# When the TOC_INCLUDE_HEADINGS tag is set to a non-zero value, all headings up
+# to that level are automatically included in the table of contents, even if
+# they do not have an id attribute.
+# Note: This feature currently applies only to Markdown headings.
+# Minimum value: 0, maximum value: 99, default value: 5.
+# This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
+
+TOC_INCLUDE_HEADINGS   = 5
+
 # When enabled doxygen tries to link words that correspond to documented
 # classes, or namespaces to their corresponding documentation. Such a link can
 # be prevented in individual cases by putting a % sign in front of the word or
@@ -318,7 +359,7 @@ BUILTIN_STL_SUPPORT    = NO
 CPP_CLI_SUPPORT        = NO
 
 # Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
-# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen
+# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen
 # will parse them like normal C++ but will assume all classes use public instead
 # of private inheritance when no explicit protection keyword is present.
 # The default value is: NO.
@@ -343,6 +384,13 @@ IDL_PROPERTY_SUPPORT   = YES
 
 DISTRIBUTE_GROUP_DOC   = NO
 
+# If one adds a struct or class to a group and this option is enabled, then also
+# any nested class or struct is added to the same group. By default this option
+# is disabled and one has to add nested compounds explicitly via \ingroup.
+# The default value is: NO.
+
+GROUP_NESTED_COMPOUNDS = YES
+
 # Set the SUBGROUPING tag to YES to allow class member groups of the same type
 # (for instance a group of public functions) to be put as a subgroup of that
 # type (e.g. under the Public Functions section). Set it to NO to prevent
@@ -417,6 +465,12 @@ EXTRACT_ALL            = YES
 
 EXTRACT_PRIVATE        = NO
 
+# If the EXTRACT_PRIV_VIRTUAL tag is set to YES, documented private virtual
+# methods of a class will be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PRIV_VIRTUAL   = NO
+
 # If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal
 # scope will be included in the documentation.
 # The default value is: NO.
@@ -437,7 +491,7 @@ EXTRACT_STATIC         = @STATIC_DOC@
 
 EXTRACT_LOCAL_CLASSES  = NO
 
-# This flag is only useful for Objective-C code. When set to YES, local methods,
+# This flag is only useful for Objective-C code. If set to YES, local methods,
 # which are defined in the implementation section but not in the interface are
 # included in the documentation. If set to NO, only methods in the interface are
 # included.
@@ -495,7 +549,7 @@ INTERNAL_DOCS          = NO
 # names in lower-case letters. If set to YES, upper-case letters are also
 # allowed. This is useful if you have classes or files whose names only differ
 # in case and if your file system supports case sensitive file names. Windows
-# and Mac users are advised to set this option to NO.
+# (including Cygwin) ands Mac users are advised to set this option to NO.
 # The default value is: system dependent.
 
 CASE_SENSE_NAMES       = NO
@@ -682,7 +736,7 @@ LAYOUT_FILE            =
 # The CITE_BIB_FILES tag can be used to specify one or more bib files containing
 # the reference definitions. This must be a list of .bib files. The .bib
 # extension is automatically appended if omitted. This requires the bibtex tool
-# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info.
+# to be installed. See also https://en.wikipedia.org/wiki/BibTeX for more info.
 # For LaTeX the style of the bibliography can be controlled using
 # LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
 # search path. See also \cite for info how to create references.
@@ -727,11 +781,18 @@ WARN_IF_DOC_ERROR      = YES
 # This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
 # are documented, but have no documentation for their parameters or return
 # value. If set to NO, doxygen will only warn about wrong or incomplete
-# parameter documentation, but not about the absence of documentation.
+# parameter documentation, but not about the absence of documentation. If
+# EXTRACT_ALL is set to YES then this flag will automatically be disabled.
 # The default value is: NO.
 
 WARN_NO_PARAMDOC       = NO
 
+# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when
+# a warning is encountered.
+# The default value is: NO.
+
+WARN_AS_ERROR          = NO
+
 # The WARN_FORMAT tag determines the format of the warning messages that doxygen
 # can produce. The string should contain the $file, $line, and $text tags, which
 # will be replaced by the file and line number from which the warning originated
@@ -755,7 +816,7 @@ WARN_LOGFILE           =
 # The INPUT tag is used to specify the files and/or directories that contain
 # documented source files. You may enter file names like myfile.cpp or
 # directories like /usr/src/myproject. Separate the files or directories with
-# spaces.
+# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
 # Note: If this tag is empty the current directory is searched.
 
 INPUT                  = @TOPSRC@/include \
@@ -770,7 +831,7 @@ INPUT                  = @TOPSRC@/include \
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
 # libiconv (or the iconv built into libc) for the transcoding. See the libiconv
-# documentation (see: http://www.gnu.org/software/libiconv) for the list of
+# documentation (see: https://www.gnu.org/software/libiconv/) for the list of
 # possible encodings.
 # The default value is: UTF-8.
 
@@ -778,12 +839,17 @@ INPUT_ENCODING         = UTF-8
 
 # If the value of the INPUT tag contains directories, you can use the
 # FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
-# *.h) to filter out the source-files in the directories. If left blank the
-# following patterns are tested:*.c, *.cc, *.cxx, *.cpp, *.c++, *.java, *.ii,
-# *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h, *.hh, *.hxx, *.hpp,
-# *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc, *.m, *.markdown,
-# *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf,
-# *.qsf, *.as and *.js.
+# *.h) to filter out the source-files in the directories.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# read by doxygen.
+#
+# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
+# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
+# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
+# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
+# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
 
 FILE_PATTERNS          = *.c \
                          *.h \
@@ -889,6 +955,10 @@ IMAGE_PATH             = @TOPSRC@/doc \
 # Note that the filter must not add or remove lines; it is applied before the
 # code is scanned, but not when the output code is generated. If lines are added
 # or removed, the anchors will not be placed correctly.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# properly processed by doxygen.
 
 INPUT_FILTER           =
 
@@ -898,6 +968,10 @@ INPUT_FILTER           =
 # (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
 # filters are used. If the FILTER_PATTERNS tag is empty or if none of the
 # patterns match the file name, INPUT_FILTER is applied.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# properly processed by doxygen.
 
 FILTER_PATTERNS        =
 
@@ -950,7 +1024,7 @@ INLINE_SOURCES         = NO
 STRIP_CODE_COMMENTS    = YES
 
 # If the REFERENCED_BY_RELATION tag is set to YES then for each documented
-# function all documented functions referencing it will be listed.
+# entity all documented functions referencing it will be listed.
 # The default value is: NO.
 
 REFERENCED_BY_RELATION = NO
@@ -982,12 +1056,12 @@ SOURCE_TOOLTIPS        = YES
 # If the USE_HTAGS tag is set to YES then the references to source code will
 # point to the HTML generated by the htags(1) tool instead of doxygen built-in
 # source browser. The htags tool is part of GNU's global source tagging system
-# (see http://www.gnu.org/software/global/global.html). You will need version
+# (see https://www.gnu.org/software/global/global.html). You will need version
 # 4.8.6 or higher.
 #
 # To use it do the following:
 # - Install the latest version of global
-# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
+# - Enable SOURCE_BROWSER and USE_HTAGS in the configuration file
 # - Make sure the INPUT points to the root of the source tree
 # - Run doxygen as normal
 #
@@ -1015,7 +1089,7 @@ VERBATIM_HEADERS       = NO
 # rich C++ code for which doxygen's built-in parser lacks the necessary type
 # information.
 # Note: The availability of this option depends on whether or not doxygen was
-# compiled with the --with-libclang option.
+# generated with the -Duse_libclang=ON option for CMake.
 # The default value is: NO.
 
 CLANG_ASSISTED_PARSING = NO
@@ -1028,6 +1102,16 @@ CLANG_ASSISTED_PARSING = NO
 
 CLANG_OPTIONS          =
 
+# If clang assisted parsing is enabled you can provide the clang parser with the
+# path to the compilation database (see:
+# http://clang.llvm.org/docs/HowToSetupToolingForLLVM.html) used when the files
+# were built. This is equivalent to specifying the "-p" option to a clang tool,
+# such as clang-check. These options will then be passed to the parser.
+# Note: The availability of this option depends on whether or not doxygen was
+# generated with the -Duse_libclang=ON option for CMake.
+
+CLANG_DATABASE_PATH    =
+
 #---------------------------------------------------------------------------
 # Configuration options related to the alphabetical class index
 #---------------------------------------------------------------------------
@@ -1146,7 +1230,7 @@ HTML_EXTRA_FILES       =
 # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
 # will adjust the colors in the style sheet and background images according to
 # this color. Hue is specified as an angle on a colorwheel, see
-# http://en.wikipedia.org/wiki/Hue for more information. For instance the value
+# https://en.wikipedia.org/wiki/Hue for more information. For instance the value
 # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
 # purple, and 360 is red again.
 # Minimum value: 0, maximum value: 359, default value: 220.
@@ -1182,6 +1266,17 @@ HTML_COLORSTYLE_GAMMA  = 100
 
 HTML_TIMESTAMP         = NO
 
+# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
+# documentation will contain a main index with vertical navigation menus that
+# are dynamically created via Javascript. If disabled, the navigation index will
+# consists of multiple levels of tabs that are statically embedded in every HTML
+# page. Disable this option to support browsers that do not have Javascript,
+# like the Qt help browser.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_DYNAMIC_MENUS     = YES
+
 # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
 # documentation will contain sections that can be hidden and shown after the
 # page has loaded.
@@ -1205,13 +1300,13 @@ HTML_INDEX_NUM_ENTRIES = 100
 
 # If the GENERATE_DOCSET tag is set to YES, additional index files will be
 # generated that can be used as input for Apple's Xcode 3 integrated development
-# environment (see: http://developer.apple.com/tools/xcode/), introduced with
-# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a
+# environment (see: https://developer.apple.com/xcode/), introduced with OSX
+# 10.5 (Leopard). To create a documentation set, doxygen will generate a
 # Makefile in the HTML output directory. Running make will produce the docset in
 # that directory and running make install will install the docset in
 # ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
-# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
-# for more information.
+# startup. See https://developer.apple.com/library/archive/featuredarticles/Doxy
+# genXcode/_index.html for more information.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
@@ -1250,7 +1345,7 @@ DOCSET_PUBLISHER_NAME  = Publisher
 # If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
 # additional HTML index files: index.hhp, index.hhc, and index.hhk. The
 # index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on
+# (see: https://www.microsoft.com/en-us/download/details.aspx?id=21138) on
 # Windows.
 #
 # The HTML Help Workshop contains a compiler that can convert all HTML output
@@ -1326,7 +1421,7 @@ QCH_FILE               =
 
 # The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
 # Project output. For more information please see Qt Help Project / Namespace
-# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace).
+# (see: https://doc.qt.io/archives/qt-4.8/qthelpproject.html#namespace).
 # The default value is: org.doxygen.Project.
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
@@ -1334,7 +1429,7 @@ QHP_NAMESPACE          = org.doxygen.Project
 
 # The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
 # Help Project output. For more information please see Qt Help Project / Virtual
-# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual-
+# Folders (see: https://doc.qt.io/archives/qt-4.8/qthelpproject.html#virtual-
 # folders).
 # The default value is: doc.
 # This tag requires that the tag GENERATE_QHP is set to YES.
@@ -1343,7 +1438,7 @@ QHP_VIRTUAL_FOLDER     = doc
 
 # If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
 # filter to add. For more information please see Qt Help Project / Custom
-# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# Filters (see: https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-
 # filters).
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
@@ -1351,7 +1446,7 @@ QHP_CUST_FILTER_NAME   =
 
 # The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
 # custom filter to add. For more information please see Qt Help Project / Custom
-# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# Filters (see: https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-
 # filters).
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
@@ -1359,7 +1454,7 @@ QHP_CUST_FILTER_ATTRS  =
 
 # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
 # project's filter section matches. Qt Help Project / Filter Attributes (see:
-# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes).
+# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#filter-attributes).
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_SECT_FILTER_ATTRS  =
@@ -1452,7 +1547,7 @@ EXT_LINKS_IN_WINDOW    = NO
 
 FORMULA_FONTSIZE       = 10
 
-# Use the FORMULA_TRANPARENT tag to determine whether or not the images
+# Use the FORMULA_TRANSPARENT tag to determine whether or not the images
 # generated for formulas are transparent PNGs. Transparent PNGs are not
 # supported properly for IE 6.0, but are supported on all modern browsers.
 #
@@ -1464,7 +1559,7 @@ FORMULA_FONTSIZE       = 10
 FORMULA_TRANSPARENT    = YES
 
 # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# http://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side Javascript for the rendering
 # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
 # installed or if you want to formulas look prettier in the HTML output. When
 # enabled you may also need to install MathJax separately and configure the path
@@ -1491,8 +1586,8 @@ MATHJAX_FORMAT         = HTML-CSS
 # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
 # Content Delivery Network so you can quickly see the result without installing
 # MathJax. However, it is strongly recommended to install a local copy of
-# MathJax from http://www.mathjax.org before deployment.
-# The default value is: http://cdn.mathjax.org/mathjax/latest.
+# MathJax from https://www.mathjax.org before deployment.
+# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
@@ -1553,7 +1648,7 @@ SERVER_BASED_SEARCH    = NO
 #
 # Doxygen ships with an example indexer (doxyindexer) and search engine
 # (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see: http://xapian.org/).
+# Xapian (see: https://xapian.org/).
 #
 # See the section "External Indexing and Searching" for details.
 # The default value is: NO.
@@ -1566,7 +1661,7 @@ EXTERNAL_SEARCH        = NO
 #
 # Doxygen ships with an example indexer (doxyindexer) and search engine
 # (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see: http://xapian.org/). See the section "External Indexing and
+# Xapian (see: https://xapian.org/). See the section "External Indexing and
 # Searching" for details.
 # This tag requires that the tag SEARCHENGINE is set to YES.
 
@@ -1618,21 +1713,35 @@ LATEX_OUTPUT           = latex
 # The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
 # invoked.
 #
-# Note that when enabling USE_PDFLATEX this option is only used for generating
-# bitmaps for formulas in the HTML output, but not in the Makefile that is
-# written to the output directory.
-# The default file is: latex.
+# Note that when not enabling USE_PDFLATEX the default is latex when enabling
+# USE_PDFLATEX the default is pdflatex and when in the later case latex is
+# chosen this is overwritten by pdflatex. For specific output languages the
+# default can have been set differently, this depends on the implementation of
+# the output language.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_CMD_NAME         = latex
 
 # The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
 # index for LaTeX.
+# Note: This tag is used in the Makefile / make.bat.
+# See also: LATEX_MAKEINDEX_CMD for the part in the generated output file
+# (.tex).
 # The default file is: makeindex.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 MAKEINDEX_CMD_NAME     = makeindex
 
+# The LATEX_MAKEINDEX_CMD tag can be used to specify the command name to
+# generate index for LaTeX. In case there is no backslash (\) as first character
+# it will be automatically added in the LaTeX code.
+# Note: This tag is used in the generated output file (.tex).
+# See also: MAKEINDEX_CMD_NAME for the part in the Makefile / make.bat.
+# The default value is: makeindex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_MAKEINDEX_CMD    = makeindex
+
 # If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX
 # documents. This may be useful for small projects and may help to save some
 # trees in general.
@@ -1651,9 +1760,12 @@ COMPACT_LATEX          = YES
 PAPER_TYPE             = a4wide
 
 # The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
-# that should be included in the LaTeX output. To get the times font for
-# instance you can specify
-# EXTRA_PACKAGES=times
+# that should be included in the LaTeX output. The package can be specified just
+# by its name or with the correct syntax as to be used with the LaTeX
+# \usepackage command. To get the times font for instance you can specify :
+# EXTRA_PACKAGES=times or EXTRA_PACKAGES={times}
+# To use the option intlimits with the amsmath package you can specify:
+# EXTRA_PACKAGES=[intlimits]{amsmath}
 # If left blank no extra packages will be included.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
@@ -1750,12 +1862,28 @@ LATEX_SOURCE_CODE      = NO
 
 # The LATEX_BIB_STYLE tag can be used to specify the style to use for the
 # bibliography, e.g. plainnat, or ieeetr. See
-# http://en.wikipedia.org/wiki/BibTeX and \cite for more info.
+# https://en.wikipedia.org/wiki/BibTeX and \cite for more info.
 # The default value is: plain.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_BIB_STYLE        = plain
 
+# If the LATEX_TIMESTAMP tag is set to YES then the footer of each generated
+# page will contain the date and time when the page was generated. Setting this
+# to NO can help when comparing the output of multiple runs.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_TIMESTAMP        = NO
+
+# The LATEX_EMOJI_DIRECTORY tag is used to specify the (relative or absolute)
+# path from which the emoji images will be read. If a relative path is entered,
+# it will be relative to the LATEX_OUTPUT directory. If left blank the
+# LATEX_OUTPUT directory will be used.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EMOJI_DIRECTORY  =
+
 #---------------------------------------------------------------------------
 # Configuration options related to the RTF output
 #---------------------------------------------------------------------------
@@ -1795,9 +1923,9 @@ COMPACT_RTF            = NO
 
 RTF_HYPERLINKS         = NO
 
-# Load stylesheet definitions from file. Syntax is similar to doxygen's config
-# file, i.e. a series of assignments. You only have to provide replacements,
-# missing definitions are set to their default value.
+# Load stylesheet definitions from file. Syntax is similar to doxygen's
+# configuration file, i.e. a series of assignments. You only have to provide
+# replacements, missing definitions are set to their default value.
 #
 # See also section "Doxygen usage" for information on how to generate the
 # default style sheet that doxygen normally uses.
@@ -1806,8 +1934,8 @@ RTF_HYPERLINKS         = NO
 RTF_STYLESHEET_FILE    =
 
 # Set optional variables used in the generation of an RTF document. Syntax is
-# similar to doxygen's config file. A template extensions file can be generated
-# using doxygen -e rtf extensionFile.
+# similar to doxygen's configuration file. A template extensions file can be
+# generated using doxygen -e rtf extensionFile.
 # This tag requires that the tag GENERATE_RTF is set to YES.
 
 RTF_EXTENSIONS_FILE    =
@@ -1893,6 +2021,13 @@ XML_OUTPUT             = xml
 
 XML_PROGRAMLISTING     = YES
 
+# If the XML_NS_MEMB_FILE_SCOPE tag is set to YES, doxygen will include
+# namespace members in file scope as well, matching the HTML output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_NS_MEMB_FILE_SCOPE = NO
+
 #---------------------------------------------------------------------------
 # Configuration options related to the DOCBOOK output
 #---------------------------------------------------------------------------
@@ -1925,9 +2060,9 @@ DOCBOOK_PROGRAMLISTING = NO
 #---------------------------------------------------------------------------
 
 # If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an
-# AutoGen Definitions (see http://autogen.sf.net) file that captures the
-# structure of the code including all documentation. Note that this feature is
-# still experimental and incomplete at the moment.
+# AutoGen Definitions (see http://autogen.sourceforge.net/) file that captures
+# the structure of the code including all documentation. Note that this feature
+# is still experimental and incomplete at the moment.
 # The default value is: NO.
 
 GENERATE_AUTOGEN_DEF   = NO
@@ -2101,12 +2236,6 @@ EXTERNAL_GROUPS        = YES
 
 EXTERNAL_PAGES         = YES
 
-# The PERL_PATH should be the absolute path and name of the perl script
-# interpreter (i.e. the result of 'which perl').
-# The default file (with absolute path) is: /usr/bin/perl.
-
-PERL_PATH              = /usr/bin/perl
-
 #---------------------------------------------------------------------------
 # Configuration options related to the dot tool
 #---------------------------------------------------------------------------
@@ -2120,15 +2249,6 @@ PERL_PATH              = /usr/bin/perl
 
 CLASS_DIAGRAMS         = YES
 
-# You can define message sequence charts within doxygen comments using the \msc
-# command. Doxygen will then run the mscgen tool (see:
-# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
-# documentation. The MSCGEN_PATH tag allows you to specify the directory where
-# the mscgen tool resides. If left empty the tool is assumed to be found in the
-# default search path.
-
-MSCGEN_PATH            =
-
 # You can include diagrams made with dia in doxygen documentation. Doxygen will
 # then run dia to produce the diagram and insert it in the documentation. The
 # DIA_PATH tag allows you to specify the directory where the dia binary resides.
@@ -2207,7 +2327,7 @@ COLLABORATION_GRAPH    = YES
 # The default value is: YES.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-GROUP_GRAPHS           = NO
+GROUP_GRAPHS           = YES
 
 # If the UML_LOOK tag is set to YES, doxygen will generate inheritance and
 # collaboration diagrams in a style similar to the OMG's Unified Modeling
@@ -2261,7 +2381,8 @@ INCLUDED_BY_GRAPH      = YES
 #
 # Note that enabling this option will significantly increase the time of a run.
 # So in most cases it will be better to enable call graphs for selected
-# functions only using the \callgraph command.
+# functions only using the \callgraph command. Disabling a call graph can be
+# accomplished by means of the command \hidecallgraph.
 # The default value is: NO.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
@@ -2272,7 +2393,8 @@ CALL_GRAPH             = NO
 #
 # Note that enabling this option will significantly increase the time of a run.
 # So in most cases it will be better to enable caller graphs for selected
-# functions only using the \callergraph command.
+# functions only using the \callergraph command. Disabling a caller graph can be
+# accomplished by means of the command \hidecallergraph.
 # The default value is: NO.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
@@ -2295,13 +2417,17 @@ GRAPHICAL_HIERARCHY    = YES
 DIRECTORY_GRAPH        = NO
 
 # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
-# generated by dot.
+# generated by dot. For an explanation of the image formats see the section
+# output formats in the documentation of the dot tool (Graphviz (see:
+# http://www.graphviz.org/)).
 # Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
 # to make the SVG files visible in IE 9+ (other browsers do not have this
 # requirement).
 # Possible values are: png, png:cairo, png:cairo:cairo, png:cairo:gd, png:gd,
 # png:gd:gd, jpg, jpg:cairo, jpg:cairo:gd, jpg:gd, jpg:gd:gd, gif, gif:cairo,
-# gif:cairo:gd, gif:gd, gif:gd:gd and svg.
+# gif:cairo:gd, gif:gd, gif:gd:gd, svg, png:gd, png:gd:gd, png:cairo,
+# png:cairo:gd, png:cairo:cairo, png:cairo:gdiplus, png:gdiplus and
+# png:gdiplus:gdiplus.
 # The default value is: png.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
@@ -2352,6 +2478,11 @@ DIAFILE_DIRS           =
 
 PLANTUML_JAR_PATH      =
 
+# When using plantuml, the PLANTUML_CFG_FILE tag can be used to specify a
+# configuration file for plantuml.
+
+PLANTUML_CFG_FILE      =
+
 # When using plantuml, the specified paths are searched for files specified by
 # the !include statement in a plantuml block.
 
diff --git a/include/QF/alloc.h b/include/QF/alloc.h
index 59a57bdf1..f67fe7176 100644
--- a/include/QF/alloc.h
+++ b/include/QF/alloc.h
@@ -37,7 +37,7 @@
 /** \defgroup alloc High-tide allocator.
 	\ingroup utils
 */
-//@{
+///@{
 
 #ifndef DEBUG_QF_MEMORY
 /**	High-tide structure allocator for use in linked lists.
@@ -93,6 +93,6 @@
 #define FREE(n, p)			do { free (p); } while (0)
 #endif
 
-//@}
+///@}
 
 #endif//__QF_alloc_h
diff --git a/include/QF/cbuf.h b/include/QF/cbuf.h
index 9018fa6b6..29a89588e 100644
--- a/include/QF/cbuf.h
+++ b/include/QF/cbuf.h
@@ -34,7 +34,7 @@
 /** \defgroup cbuf Command buffer management.
 	\ingroup utils
 */
-//@{
+///@{
 
 #include <stdarg.h>
 
@@ -100,6 +100,6 @@ void Cbuf_Execute (cbuf_t *cbuf);
 void Cbuf_Execute_Stack (cbuf_t *cbuf);
 void Cbuf_Execute_Sets (cbuf_t *cbuf);
 
-//@}
+///@}
 
 #endif//__QF_cbuf_h
diff --git a/include/QF/checksum.h b/include/QF/checksum.h
index 9a7dfb8e6..ed6f035b1 100644
--- a/include/QF/checksum.h
+++ b/include/QF/checksum.h
@@ -30,7 +30,7 @@
 
 /** \addtogroup crc
 */
-//@{
+///@{
 
 #include "QF/qtypes.h"
 
@@ -38,6 +38,6 @@ unsigned int Com_BlockChecksum (const void *buffer, int length);
 void Com_BlockFullChecksum (const void *buffer, int len, unsigned char *outbuf);
 byte	COM_BlockSequenceCRCByte (const byte *base, int length, int sequence);
 
-//@}
+///@}
 
 #endif // __checksum_h
diff --git a/include/QF/cmd.h b/include/QF/cmd.h
index 2ac508b9f..35846a063 100644
--- a/include/QF/cmd.h
+++ b/include/QF/cmd.h
@@ -31,7 +31,7 @@
 /** \defgroup cmd Command management.
 	\ingroup utils
 */
-//@{
+///@{
 
 #include "QF/qtypes.h"
 #include "QF/cbuf.h"
@@ -81,6 +81,6 @@ struct cbuf_interpreter_s *Cmd_GetProvider(const char *name);
 extern struct cbuf_args_s *cmd_args;
 extern struct cvar_s *cmd_warncmd;
 
-//@}
+///@}
 
 #endif//__QF_cmd_h
diff --git a/include/QF/crc.h b/include/QF/crc.h
index 2aa16b616..cc635e7b9 100644
--- a/include/QF/crc.h
+++ b/include/QF/crc.h
@@ -31,7 +31,7 @@
 /** \defgroup crc Checksum generation.
 	\ingroup utils
 */
-//@{
+///@{
 
 #include "QF/qtypes.h"
 
@@ -41,6 +41,6 @@ void CRC_ProcessBlock (const byte *start, unsigned short *crcvalue, int count);
 unsigned short CRC_Value(unsigned short crcvalue) __attribute__((const));
 unsigned short CRC_Block (const byte *start, int count) __attribute__((pure));
 
-//@}
+///@}
 
 #endif // __crc_h
diff --git a/include/QF/cvar.h b/include/QF/cvar.h
index 091a13b61..3d81a3b1c 100644
--- a/include/QF/cvar.h
+++ b/include/QF/cvar.h
@@ -31,7 +31,7 @@
 /** \defgroup cvar Configuration variables
 	\ingroup utils
 */
-//@{
+///@{
 
 #include "QF/qtypes.h"
 #include "QF/quakeio.h"
@@ -72,7 +72,7 @@ typedef struct cvar_alias_s {
 	code goes "look, the user made fs_basepath already", uses the users value,
 	but sets CVAR_ROM as per the call.
 */
-//@{
+///@{
 #define CVAR_NONE			0		///< normal cvar
 #define	CVAR_ARCHIVE		1		///< set to cause it to be saved to
 									///< config.cfg
@@ -85,7 +85,7 @@ typedef struct cvar_alias_s {
 #define CVAR_LATCH			2048	///< will change only when C code next does
 									///< a Cvar_Get(), so it can't be changed
 									///< (not implemented)
-//@}
+///@}
 
 
 // Returns the Cvar if found, creates it with value if not.  Description and
@@ -138,6 +138,6 @@ void Cvar_Init (void);
 
 extern cvar_t	*cvar_vars;
 
-//@}
+///@}
 
 #endif // __cvar_h
diff --git a/include/QF/draw.h b/include/QF/draw.h
index d8067a4c7..529f3e892 100644
--- a/include/QF/draw.h
+++ b/include/QF/draw.h
@@ -37,7 +37,7 @@
 /** \defgroup video_renderer_draw Generic draw functions
 	\ingroup video_renderer
 */
-//@{
+///@{
 
 #include "QF/wad.h"
 
@@ -160,12 +160,12 @@ void Draw_FadeScreen (void);
 /** Shift the screen colors.
 */
 void Draw_BlendScreen (quat_t color);
-//@}
+///@}
 
 /** \defgroup video_renderer_draw_qpic QPic functions
 	\ingroup video_renderer_draw
 */
-//@{
+///@{
 /** Load a qpic from the filesystem.
 	\param path	path of the file within the quake filesystem
 	\param alpha transparency level of the pic.
@@ -232,6 +232,6 @@ void Draw_Picf (float x, float y, qpic_t *pic);
 	\param height vertical size of the sub-region to be drawn
 */
 void Draw_SubPic(int x, int y, qpic_t *pic, int srcx, int srcy, int width, int height);
-//@}
+///@}
 
 #endif // _DRAW_H
diff --git a/include/QF/dstring.h b/include/QF/dstring.h
index 1075bc04b..638d9e340 100644
--- a/include/QF/dstring.h
+++ b/include/QF/dstring.h
@@ -31,7 +31,7 @@
 /** \defgroup dstring Dynamic Strings
 	\ingroup utils
 */
-//@{
+///@{
 
 #include <stdarg.h>
 #include <stdlib.h>
@@ -52,13 +52,13 @@ typedef struct dstring_s {
 extern dstring_mem_t dstring_default_mem;
 
 // General buffer functions
-//@{
+///@{
 /** Create a new dstring. size and truesize start at 0 and no string buffer
 	is allocated.
 */
 dstring_t *_dstring_new (dstring_mem_t *mem);
 dstring_t *dstring_new (void);
-//@}
+///@}
 /** Delete a dstring. Both the string buffer and dstring object are freed.
 */
 void dstring_delete (dstring_t *dstr);
@@ -103,13 +103,13 @@ void dstring_replace (dstring_t *dstr, unsigned int pos, unsigned int rlen,
 char *dstring_freeze (dstring_t *dstr);
 
 // String-specific functions
-//@{
+///@{
 /** Allocate a new dstring pre-initialized as a null terminated string. size
 	will be 1 and the first byte 0.
 */
 dstring_t *_dstring_newstr (dstring_mem_t *mem);
 dstring_t *dstring_newstr (void);
-//@}
+///@}
 /** Create a new dstring from a string. Similar to strdup().
 	\param str		the string to copy
 	\return			inititialized dstring
@@ -160,21 +160,21 @@ void dstring_insertsubstr (dstring_t *dstr, unsigned int pos, const char *str,
 */
 void dstring_clearstr (dstring_t *dstr);
 
-//@{
+///@{
 /** Formatted printing to dstrings. Existing data is replaced by the formatted
 	string.
 */
 int dvsprintf (dstring_t *dstr, const char *fmt, va_list args) __attribute__((format(printf,2,0)));
 int dsprintf (dstring_t *dstr, const char *fmt, ...) __attribute__((format(printf,2,3)));
-//@}
-//@{
+///@}
+///@{
 /** Formatted printing to dstrings. Formatted string is appened to the dstring.
 	Embedded nulls in the dstring are ignored.
 */
 int davsprintf (dstring_t *dstr, const char *fmt, va_list args) __attribute__((format(printf,2,0)));
 int dasprintf (dstring_t *dstr, const char *fmt, ...) __attribute__((format(printf,2,3)));
-//@}
+///@}
 
-//@}
+///@}
 
 #endif // __dstring_h
diff --git a/include/QF/hash.h b/include/QF/hash.h
index 1a8a8f912..ae040cfa9 100644
--- a/include/QF/hash.h
+++ b/include/QF/hash.h
@@ -34,7 +34,7 @@
 /** \defgroup hash Hash tables
 	\ingroup utils
 */
-//@{
+///@{
 
 typedef struct hashtab_s hashtab_t;
 
@@ -209,6 +209,6 @@ void **Hash_GetList (hashtab_t *tab);
 */
 void Hash_Stats (hashtab_t *tab);
 
-//@}
+///@}
 
 #endif // __hash_h
diff --git a/include/QF/idparse.h b/include/QF/idparse.h
index 07b5c322e..e48cf30e6 100644
--- a/include/QF/idparse.h
+++ b/include/QF/idparse.h
@@ -33,7 +33,7 @@
 
 /** \addtogroup cbuf
 */
-//@{
+///@{
 
 extern const char *com_token;
 
@@ -44,6 +44,6 @@ void COM_TokenizeString (const char *str, struct cbuf_args_s *args);
 
 extern struct cbuf_interpreter_s id_interp;
 
-//@}
+///@}
 
 #endif//__QF_idparse_h
diff --git a/include/QF/info.h b/include/QF/info.h
index d57a221f6..4e34f6fa2 100644
--- a/include/QF/info.h
+++ b/include/QF/info.h
@@ -31,7 +31,7 @@
 /** \defgroup info Info Keys
 	\ingroup utils
 */
-//@{
+///@{
 
 #include <stdlib.h> // for size_t. sys/types.h SHOULD be used, but can't :(bc)
 #include <QF/qtypes.h>
@@ -63,6 +63,6 @@ void Info_Destroy (info_t *info);
 char *Info_MakeString (info_t *info, int (*filter)(const char *));
 void Info_AddKeys (info_t *info, info_t *keys);
 
-//@}
+///@}
 
 #endif	// _INFO_H
diff --git a/include/QF/keys.h b/include/QF/keys.h
index ada46a265..66ef8d99e 100644
--- a/include/QF/keys.h
+++ b/include/QF/keys.h
@@ -39,7 +39,7 @@
 /** \defgroup input_keybinding Key Binding Sub-system
 	\ingroup input
 */
-//@{
+///@{
 
 /// these are the key numbers that should be passed to Key_Event
 typedef enum {
@@ -659,6 +659,6 @@ struct progs_s;
 void Key_Progs_Init (struct progs_s *pr);
 #endif
 
-//@}
+///@}
 
 #endif // _KEYS_H
diff --git a/include/QF/math/dual.h b/include/QF/math/dual.h
index eba9b8bf0..34c58a984 100644
--- a/include/QF/math/dual.h
+++ b/include/QF/math/dual.h
@@ -34,7 +34,7 @@
 /** \defgroup mathlib_dual Dual and dual quaternion functions
 	\ingroup utils
 */
-//@{
+///@{
 
 #include "QF/qtypes.h"
 
@@ -189,6 +189,6 @@
 	} while (0)
 #define DualQuatExpand(dq) QuatExpand ((dq).q0.q), QuatExpand ((dq).qe.q)
 
-//@}
+///@}
 
 #endif // __QF_math_dual_h
diff --git a/include/QF/math/half.h b/include/QF/math/half.h
index 1fe474cd3..bc9133fc6 100644
--- a/include/QF/math/half.h
+++ b/include/QF/math/half.h
@@ -34,7 +34,7 @@
 /** \defgroup mathlib_half Half-float functions
 	\ingroup utils
 */
-//@{
+///@{
 
 #include "QF/qtypes.h"
 
@@ -42,6 +42,6 @@
 int16_t FloatToHalf (float x) __attribute__((const));
 float HalfToFloat (int16_t x) __attribute__((const));
 
-//@}
+///@}
 
 #endif // __QF_math_half_h
diff --git a/include/QF/math/matrix3.h b/include/QF/math/matrix3.h
index ce2474a99..dfe9b530f 100644
--- a/include/QF/math/matrix3.h
+++ b/include/QF/math/matrix3.h
@@ -34,7 +34,7 @@
 /** \defgroup mathlib_matrix3 3x3 matrix functions
 	\ingroup utils
 */
-//@{
+///@{
 
 #include "QF/qtypes.h"
 
@@ -118,6 +118,6 @@ void Mat3SymEigen (const mat3_t m, vec3_t e);
 */
 int Mat3Decompose (const mat4_t mat, quat_t rot, vec3_t shear, vec3_t scale);
 
-//@}
+///@}
 
 #endif // __QF_math_matrix3_h
diff --git a/include/QF/math/matrix4.h b/include/QF/math/matrix4.h
index 4f0e0dfb5..a55c8ed94 100644
--- a/include/QF/math/matrix4.h
+++ b/include/QF/math/matrix4.h
@@ -34,7 +34,7 @@
 /** \defgroup mathlib_matrix4 4x4 matrix functions
 	\ingroup utils
 */
-//@{
+///@{
 
 #include "QF/qtypes.h"
 
@@ -130,6 +130,6 @@ void Mat4as3MultVec (const mat4_t a, const vec3_t b, vec3_t c);
 int Mat4Decompose (const mat4_t mat, quat_t rot, vec3_t shear, vec3_t scale,
 				   vec3_t trans);
 
-//@}
+///@}
 
 #endif // __QF_math_matrix4_h
diff --git a/include/QF/math/quaternion.h b/include/QF/math/quaternion.h
index 84d7b64b4..d6e34814a 100644
--- a/include/QF/math/quaternion.h
+++ b/include/QF/math/quaternion.h
@@ -34,7 +34,7 @@
 /** \defgroup mathlib_quaternion Quaternion functions
 	\ingroup utils
 */
-//@{
+///@{
 
 #include "QF/qtypes.h"
 
@@ -168,6 +168,6 @@ void QuatInverse (const quat_t in, quat_t out);
 void QuatExp (const quat_t a, quat_t b);
 void QuatToMatrix (const quat_t q, vec_t *m, int homogenous, int vertical);
 
-//@}
+///@}
 
 #endif // __QF_math_quaternion_h
diff --git a/include/QF/math/vector.h b/include/QF/math/vector.h
index 73cc1f708..6a8b80809 100644
--- a/include/QF/math/vector.h
+++ b/include/QF/math/vector.h
@@ -31,7 +31,7 @@
 /** \defgroup mathlib_vector Vector functions
 	\ingroup mathlib
 */
-//@{
+///@{
 
 #include "QF/qtypes.h"
 
@@ -209,6 +209,6 @@ VectorNormalize (vec3_t v)
 	return length;
 }
 
-//@}
+///@}
 
 #endif // __QF_math_vector_h
diff --git a/include/QF/mathlib.h b/include/QF/mathlib.h
index c4575705e..5c9b854fe 100644
--- a/include/QF/mathlib.h
+++ b/include/QF/mathlib.h
@@ -31,7 +31,7 @@
 /** \defgroup mathlib Vector and matrix functions
 	\ingroup utils
 */
-//@{
+///@{
 
 #include <math.h>
 #include "QF/qtypes.h"
@@ -218,6 +218,6 @@ int CircumSphere (const vec3_t points[], int num_points, sphere_t *sphere);
 void BarycentricCoords (const vec_t **points, int num_points, const vec3_t p,
 		                vec_t *lambda);
 
-//@}
+///@}
 
 #endif // __mathlib_h
diff --git a/include/QF/mdfour.h b/include/QF/mdfour.h
index 94fe99da0..19360e838 100644
--- a/include/QF/mdfour.h
+++ b/include/QF/mdfour.h
@@ -31,7 +31,7 @@
 
 /** \addtogroup crc
 */
-//@{
+///@{
 
 #include "QF/uint32.h"
 
@@ -47,6 +47,6 @@ void mdfour_update(struct mdfour *md, const unsigned char *in, int n); //old: MD
 void mdfour_result(struct mdfour *md, unsigned char *out); // old: MD4Final
 void mdfour(unsigned char *out, const unsigned char *in, int n);
 
-//@}
+///@}
 
 #endif	// __mdfour_h
diff --git a/include/QF/msg.h b/include/QF/msg.h
index 6e550a191..6a92e2d54 100644
--- a/include/QF/msg.h
+++ b/include/QF/msg.h
@@ -30,7 +30,7 @@
 /** \defgroup msg Message reading and writing
 	\ingroup utils
 */
-//@{
+///@{
 
 #include "QF/sizebuf.h"
 
@@ -249,6 +249,6 @@ void MSG_ReadAngle16V (qmsg_t *msg, vec3_t angles);
 */
 int MSG_ReadUTF8 (qmsg_t *msg);
 
-//@}
+///@}
 
 #endif
diff --git a/include/QF/pak.h b/include/QF/pak.h
index f176e5733..ea86ffd14 100644
--- a/include/QF/pak.h
+++ b/include/QF/pak.h
@@ -33,7 +33,7 @@
 
 /** \addtogroup pak
 */
-//@{
+///@{
 
 // little-endian PACK
 #define IDPAKHEADER		(('K'<<24)+('C'<<16)+('A'<<8)+'P')
@@ -51,6 +51,6 @@ typedef struct {
 	int			dirlen;
 } dpackheader_t;
 
-//@}
+///@}
 
 #endif//__qf_pak_h
diff --git a/include/QF/pakfile.h b/include/QF/pakfile.h
index ecb6738f0..7bb4f3a0e 100644
--- a/include/QF/pakfile.h
+++ b/include/QF/pakfile.h
@@ -33,7 +33,7 @@
 /** \defgroup pak pakfile proccessing
 	\ingroup utils
 */
-//@{
+///@{
 
 #include "QF/hash.h"
 #include "QF/pak.h"
@@ -64,6 +64,6 @@ int pack_add (pack_t *pack, const char *filename);
 int pack_extract (pack_t *pack, dpackfile_t *pf);
 dpackfile_t *pack_find_file (pack_t *pack, const char *filename);
 
-//@}
+///@}
 
 #endif//__QF_pakfile_h
diff --git a/include/QF/plugin.h b/include/QF/plugin.h
index 28cb9962f..0a06f73f2 100644
--- a/include/QF/plugin.h
+++ b/include/QF/plugin.h
@@ -31,7 +31,7 @@
 /** \defgroup plugin Plugins
 	\ingroup utils
 */
-//@{
+///@{
 
 #define QFPLUGIN_VERSION	"1.0"
 
@@ -111,6 +111,6 @@ void PI_Shutdown (void);
 
 // FIXME: we need a generic function to initialize unused fields
 
-//@}
+///@}
 
 #endif	// __QF_plugin_h_
diff --git a/include/QF/pr_type.h b/include/QF/pr_type.h
index 4cc6cf82e..0c8b37664 100644
--- a/include/QF/pr_type.h
+++ b/include/QF/pr_type.h
@@ -36,7 +36,7 @@
 
 	All \c pointer_t \c type fields are pointers within the type qfo_space.
 */
-//@{
+///@{
 
 #include "QF/pr_comp.h"
 
@@ -102,6 +102,6 @@ typedef struct qfot_type_encodings_s {
 	pr_int_t    size;
 } qfot_type_encodings_t;
 
-//@}
+///@}
 
 #endif//__pr_type_h
diff --git a/include/QF/progs.h b/include/QF/progs.h
index 5b834d1f0..7631f1de1 100644
--- a/include/QF/progs.h
+++ b/include/QF/progs.h
@@ -39,18 +39,18 @@
 struct QFile_s;
 
 /** \ingroup progs */
-//@{
+///@{
 typedef struct progs_s progs_t;
 typedef struct pr_resource_s pr_resource_t;
 typedef struct edict_s edict_t;
-//@}
+///@}
 
 //============================================================================
 
 /** \defgroup progs_misc Miscelaneous functions
 	\ingroup progs
 */
-//@{
+///@{
 
 /** Initialize the progs engine.
 */
@@ -63,12 +63,12 @@ void PR_Init_Cvars (void);
 void PR_Error (progs_t *pr, const char *error, ...) __attribute__((format(printf,2,3), noreturn));
 void PR_RunError (progs_t *pr, const char *error, ...) __attribute__((format(printf,2,3), noreturn));
 
-//@}
+///@}
 
 /** \defgroup progs_execution Execution
 	\ingroup progs
 */
-//@{
+///@{
 
 /** Ensure P_* macros point to the right place for passing parameters to progs
 	functions.
@@ -128,12 +128,12 @@ void PR_ExecuteProgram (progs_t *pr, func_t fnum);
 */
 int PR_CallFunction (progs_t *pr, func_t fnum);
 
-//@}
+///@}
 
 /** \defgroup progs_load Loading
 	\ingroup progs
 */
-//@{
+///@{
 
 /** Type of functions that are called at progs load.
 	\param pr		pointer to ::progs_t VM struct
@@ -204,12 +204,12 @@ int PR_Check_Opcodes (progs_t *pr);
 void PR_BoundsCheckSize (progs_t *pr, pointer_t addr, unsigned size);
 void PR_BoundsCheck (progs_t *pr, int addr, etype_t type);
 
-//@}
+///@}
 
 /** \defgroup progs_edict Edict management
 	\ingroup progs
 */
-//@{
+///@{
 
 struct edict_s {
 	qboolean    free;
@@ -261,13 +261,13 @@ void ED_EntityParseFunction (progs_t *pr);
 # define NUM_FOR_EDICT(p,e)	ED_NumForEdict (p, e)
 #endif
 
-//@}
+///@}
 
 /** \defgroup pr_symbols Symbol Management
 	\ingroup progs
 	Lookup functions for symbol name resolution.
 */
-//@{
+///@{
 
 ddef_t *PR_FieldAtOfs (progs_t *pr, pr_int_t ofs) __attribute__((pure));
 ddef_t *PR_GlobalAtOfs (progs_t *pr, pr_int_t ofs) __attribute__((pure));
@@ -282,7 +282,7 @@ int PR_AccessField (progs_t *pr, const char *name, etype_t type,
 					const char *file, int line);
 
 void PR_Undefined (progs_t *pr, const char *type, const char *name) __attribute__((noreturn));
-//@}
+///@}
 
 //============================================================================
 
@@ -296,7 +296,7 @@ void PR_Undefined (progs_t *pr, const char *type, const char *name) __attribute_
 	Typed global access macros. No checking is done against the QC type, but
 	the appropriate C type will be used.
 */
-//@{
+///@{
 
 /** \internal
 	\param p		pointer to ::progs_t VM struct
@@ -479,14 +479,14 @@ void PR_Undefined (progs_t *pr, const char *type, const char *name) __attribute_
 	\hideinitializer
 */
 #define G_STRUCT(p,t,o)	(*(t *)G_GPOINTER (p, o))
-//@}
+///@}
 
 /** \defgroup prda_parameters Parameters
 	\ingroup progs_data_access
 	Typed parameter access macros. No checking is done against the QC type, but
 	the appropriate C type will be used.
 */
-//@{
+///@{
 
 /** \internal
 	\param p		pointer to ::progs_t VM struct
@@ -669,7 +669,7 @@ void PR_Undefined (progs_t *pr, const char *type, const char *name) __attribute_
 	\hideinitializer
 */
 #define P_STRUCT(p,t,n)	(*(t *)P_GPOINTER (p, n))
-//@}
+///@}
 
 /** \defgroup prda_return Return Values
 	\ingroup progs_data_access
@@ -680,7 +680,7 @@ void PR_Undefined (progs_t *pr, const char *type, const char *name) __attribute_
 	ask for an \c int from a function that returned a \c float, you're asking
 	for trouble.
 */
-//@{
+///@{
 
 /** \internal
 	\param p		pointer to ::progs_t VM struct
@@ -836,14 +836,14 @@ void PR_Undefined (progs_t *pr, const char *type, const char *name) __attribute_
 	\hideinitializer
 */
 #define RETURN_QUAT(p,q)		VectorCopy (q, R_QUAT (p))
-//@}
+///@}
 
 /** \defgroup prda_entity_fields Entity Fields
 	\ingroup progs_data_access
 	Typed entity field access macros. No checking is done against the QC type,
 	but the appropriate C type will be used.
 */
-//@{
+///@{
 
 /** \internal
 	\param e		pointer to the entity
@@ -980,7 +980,7 @@ void PR_Undefined (progs_t *pr, const char *type, const char *name) __attribute_
 	\hideinitializer
 */
 #define E_DSTRING(p,e,o) (PR_GetMutableString (p, E_STRING (e, o)))
-//@}
+///@}
 
 /** \defgroup pr_builtins VM Builtin functions
 	\ingroup progs
@@ -993,7 +993,7 @@ void PR_Undefined (progs_t *pr, const char *type, const char *name) __attribute_
 	0x8000000 to 0xffffffff is unavailable due to the builtin number being
 	a negative statement address.
 */
-//@{
+///@{
 
 #define PR_RANGE_SHIFT	16
 #define PR_RANGE_MASK	0xffff0000
@@ -1067,7 +1067,7 @@ builtin_t *PR_FindBuiltinNum (progs_t *pr, pr_int_t num);
 */
 int PR_RelocateBuiltins (progs_t *pr);
 
-//@}
+///@}
 
 /** \defgroup pr_strings String Management
 	\ingroup progs
@@ -1093,7 +1093,7 @@ int PR_RelocateBuiltins (progs_t *pr);
 	They can be created, altered, and destroyed at any time by the main
 	program (or the progs code via an appropriate builtin function).
 */
-//@{
+///@{
 
 /** Initialize the string tables using the strings supplied by the progs.
 	Called automatically during progs load.
@@ -1254,13 +1254,13 @@ void PR_FreeTempStrings (progs_t *pr);
 void PR_Sprintf (progs_t *pr, struct dstring_s *result, const char *name,
 				 const char *format, int count, pr_type_t **args);
 
-//@}
+///@}
 
 /** \defgroup pr_resources Resource Management
 	\ingroup progs
 	Builtin module private data management.
 */
-//@{
+///@{
 
 /** Initialize the resource management fields.
 
@@ -1314,7 +1314,7 @@ void *PR_Resources_Find (progs_t *pr, const char *name);
 	\note			\p map is the resource map itself, not a pointer to the
 					resource map.
 */
-//@{
+///@{
 
 /** Type delcaration for the resource map.
 
@@ -1416,29 +1416,30 @@ void *PR_Resources_Find (progs_t *pr, const char *name);
 			return ~(i * 1024 + d);							\
 	}														\
 	return 0
-//@}
+///@}
 
-//@}
+///@}
 
 /** \defgroup pr_zone VM memory management.
 	\ingroup progs
 
 	Used to allocate and free memory in the VM address space.
 */
-//@{
+///@{
 
 void PR_Zone_Init (progs_t *pr);
 void PR_Zone_Free (progs_t *pr, void *ptr);
 void *PR_Zone_Malloc (progs_t *pr, pr_int_t size);
 void *PR_Zone_Realloc (progs_t *pr, void *ptr, pr_int_t size);
 
-//@}
+///@}
 
 /** \defgroup debug VM Debugging
 	\ingroup progs
 	Progs debugging support.
 */
-//@{
+/// \addtogroup debug
+///@{
 
 void PR_Debug_Init (void);
 void PR_Debug_Init_Cvars (void);
@@ -1464,20 +1465,20 @@ extern struct cvar_s *pr_deadbeef_locals;
 extern struct cvar_s *pr_boundscheck;
 extern struct cvar_s *pr_faultchecks;
 
-//@}
+///@}
 
 /** \defgroup pr_cmds Quake and Quakeworld common builtins
 	\ingroup progs
 	\todo This really doesn't belong in progs.
 */
-//@{
+///@{
 
 char *PF_VarString (progs_t *pr, int first);
 void PR_Cmds_Init (progs_t *pr);
 
 extern const char *pr_gametype;
 
-//@}
+///@}
 
 //============================================================================
 
@@ -1682,7 +1683,7 @@ struct progs_s {
 
 /** \addtogroup progs_data_access
 */
-//@{
+///@{
 
 /** Convert a progs offset/pointer to a C pointer.
 	\param pr		pointer to ::progs_t VM struct
@@ -1706,7 +1707,7 @@ PR_SetPointer (progs_t *pr, void *p)
 	return p ? (pr_type_t *) p - pr->pr_globals : 0;
 }
 
-//@}
+///@}
 
 /** \example vm-exec.c
 */
diff --git a/include/QF/qargs.h b/include/QF/qargs.h
index fe4eb98f8..50dfbd35a 100644
--- a/include/QF/qargs.h
+++ b/include/QF/qargs.h
@@ -32,7 +32,7 @@
 
 /** \addtogroup misc
 */
-//@{
+///@{
 
 #include "QF/qtypes.h"
 
@@ -50,6 +50,6 @@ void COM_Init_Cvars (void);
 void COM_InitArgv (int argc, const char **argv);
 void COM_ParseConfig (void);
 
-//@}
+///@}
 
 #endif // __qargs_h
diff --git a/include/QF/qendian.h b/include/QF/qendian.h
index d63ca2d0c..a42bd749f 100644
--- a/include/QF/qendian.h
+++ b/include/QF/qendian.h
@@ -33,7 +33,7 @@
 /** \defgroup qendian Endian handling functions
 	\ingroup utils
 */
-//@{
+///@{
 
 #include "QF/qtypes.h"
 
@@ -118,6 +118,6 @@ byte ReadByte (struct QFile_s *file);
 unsigned short ReadShort (struct QFile_s *file);
 unsigned int ReadLong (struct QFile_s *file);
 
-//@}
+///@}
 
 #endif // __qendian_h
diff --git a/include/QF/qfplist.h b/include/QF/qfplist.h
index 6c5d61202..e0c2557ca 100644
--- a/include/QF/qfplist.h
+++ b/include/QF/qfplist.h
@@ -31,7 +31,7 @@
 /** \defgroup qfplist Property lists
 	\ingroup utils
 */
-//@{
+///@{
 
 #include "QF/qtypes.h"
 
@@ -226,6 +226,6 @@ plitem_t *PL_NewString (const char *str);
 */
 void PL_Free (plitem_t *item);
 
-//@}
+///@}
 
 #endif	// __QF_qfplist_h_
diff --git a/include/QF/quakefs.h b/include/QF/quakefs.h
index 336537495..364718db0 100644
--- a/include/QF/quakefs.h
+++ b/include/QF/quakefs.h
@@ -33,7 +33,7 @@
 /** \defgroup quakefs Quake Filesystem
 	\ingroup utils
 */
-//@{
+///@{
 
 #include "QF/qtypes.h"
 #include "QF/quakeio.h"
@@ -418,6 +418,6 @@ void QFS_FilelistFill (filelist_t *list, const char *path, const char *ext,
 */
 void QFS_FilelistFree (filelist_t *list);
 
-//@}
+///@}
 
 #endif // __quakefs_h
diff --git a/include/QF/quakeio.h b/include/QF/quakeio.h
index d72d8ec29..08b14af69 100644
--- a/include/QF/quakeio.h
+++ b/include/QF/quakeio.h
@@ -34,7 +34,7 @@
 /** \defgroup quakeio File IO
 	\ingroup utils
 */
-//@{
+///@{
 
 typedef struct QFile_s QFile;
 
@@ -60,6 +60,6 @@ int Qflush(QFile *file);
 int Qeof(QFile *file);
 const char *Qgetline(QFile *file);
 
-//@}
+///@}
 
 #endif /*__quakeio_h*/
diff --git a/include/QF/script.h b/include/QF/script.h
index 2fe21c215..357e5100b 100644
--- a/include/QF/script.h
+++ b/include/QF/script.h
@@ -25,7 +25,7 @@
 	Line oriented script parsing. Multiple scripts being parsed at the same
 	time is supported.
 */
-//@{
+///@{
 
 #include "QF/qtypes.h"
 
@@ -97,6 +97,6 @@ void Script_UngetToken (script_t *script);
 */
 const char *Script_Token (script_t *script) __attribute__((pure));
 
-//@}
+///@}
 
 #endif//__QF_script_h
diff --git a/include/QF/set.h b/include/QF/set.h
index 2f4dd76e5..1261bdb40 100644
--- a/include/QF/set.h
+++ b/include/QF/set.h
@@ -36,7 +36,7 @@
 /**	\defgroup set Set handling
 	\ingroup utils
 */
-//@{
+///@{
 
 //FIXME other archs
 #ifdef __x86_64__
@@ -370,5 +370,5 @@ set_iter_t *set_next_r (set_pool_t *set_pool, set_iter_t *set_iter);
 */
 const char *set_as_string (const set_t *set);
 
-//@}
+///@}
 #endif//__QF_set_h
diff --git a/include/QF/sizebuf.h b/include/QF/sizebuf.h
index 8605f803d..7f6fc4ac3 100644
--- a/include/QF/sizebuf.h
+++ b/include/QF/sizebuf.h
@@ -31,7 +31,7 @@
 	\ingroup utils
 	Fixed size buffer management
 */
-//@{
+///@{
 
 #include "QF/qtypes.h"
 
@@ -51,6 +51,6 @@ void *SZ_GetSpace (sizebuf_t *buf, int length);
 void SZ_Write (sizebuf_t *buf, const void *data, int length);
 void SZ_Print (sizebuf_t *buf, const char *data);	// strcats onto the sizebuf
 
-//@}
+///@}
 
 #endif // __sizebuf_h
diff --git a/include/QF/sound.h b/include/QF/sound.h
index 874469ea4..3382d4b91 100644
--- a/include/QF/sound.h
+++ b/include/QF/sound.h
@@ -37,7 +37,7 @@
 /**
 	\ingroup sound
 */
-//@{
+///@{
 typedef struct sfx_s sfx_t;
 struct sfx_s
 {
@@ -62,14 +62,14 @@ struct sfx_s
 	sfx_t      *(*open) (sfx_t *sfx);
 	void        (*close) (sfx_t *sfx);
 };
-//@}
+///@}
 
 struct model_s;
 
 /** \defgroup sound_init Initialization functions
 	\ingroup sound
 */
-//@{
+///@{
 
 /** Initialize the sound engine.
 	\param viewentity pointer to view entity index
@@ -85,12 +85,12 @@ void S_Init_Cvars (void);
 	gracefully.
 */
 void S_Shutdown (void);
-//@}
+///@}
 
 /** \defgroup sound_stuff Unclassified
 	\ingroup sound
 */
-//@{
+///@{
 
 /** Start a sound playing.
 	\param entnum	index of entity the sound is associated with.
@@ -193,6 +193,6 @@ void S_AmbientOn (void);
 struct progs_s;
 void S_Progs_Init (struct progs_s *pr);
 
-//@}
+///@}
 
 #endif // _SOUND_H
diff --git a/include/QF/sys.h b/include/QF/sys.h
index f93432d65..85785ed6e 100644
--- a/include/QF/sys.h
+++ b/include/QF/sys.h
@@ -32,7 +32,7 @@
 	\ingroup utils
 	Non-portable functions
 */
-//@{
+///@{
 
 #include <stdio.h>
 #include <stdint.h>
@@ -157,6 +157,6 @@ int Sys_CreatePath (const char *path);
 */
 char *Sys_ExpandSquiggle (const char *path);
 
-//@}
+///@}
 
 #endif // __sys_h
diff --git a/include/QF/va.h b/include/QF/va.h
index 6a5e54465..40c794712 100644
--- a/include/QF/va.h
+++ b/include/QF/va.h
@@ -32,13 +32,13 @@
 /** \addtogroup misc
 	Formatted printing.
 */
-//@{
+///@{
 
 // does a varargs printf into a temp buffer
 char	*va(const char *format, ...) __attribute__((format(printf,1,2)));
 // does a varargs printf into a malloced buffer
 char	*nva(const char *format, ...) __attribute__((format(printf,1,2)));
 
-//@}
+///@}
 
 #endif // __va_h
diff --git a/include/QF/ver_check.h b/include/QF/ver_check.h
index 5d8c1061c..8ac943796 100644
--- a/include/QF/ver_check.h
+++ b/include/QF/ver_check.h
@@ -34,7 +34,7 @@
 /** \defgroup misc Miscellaneous functions
 	\ingroup utils
 */
-//@{
+///@{
 
 /*
 	ver_compare
@@ -45,6 +45,6 @@
 */
 int ver_compare (const char *, const char *);
 
-//@}
+///@}
 
 #endif	// __ver_check_h_
diff --git a/include/QF/view.h b/include/QF/view.h
index ecb2ea920..570935ae8 100644
--- a/include/QF/view.h
+++ b/include/QF/view.h
@@ -34,7 +34,7 @@
 /** \defgroup console_view Console View Objects
 	\ingroup console
 */
-//@{
+///@{
 
 /** Control the positioning of a view within its parent. The directions are
 	the standard compass rose (north, east, south, west in clockwise order)
@@ -215,6 +215,6 @@ void view_resize (view_t *view, int xl, int yl);
 */
 void view_move (view_t *view, int xp, int yp);
 
-//@}
+///@}
 
 #endif//__qf_view_h
diff --git a/include/QF/wad.h b/include/QF/wad.h
index 805a69925..82e836dc9 100644
--- a/include/QF/wad.h
+++ b/include/QF/wad.h
@@ -32,7 +32,7 @@
 /** \addtogroup wad
 	Wad Files
 */
-//@{
+///@{
 
 #include "QF/wadfile.h"
 
@@ -46,6 +46,6 @@ void	*W_GetLumpName (const char *name);
 
 void SwapPic (qpic_t *pic);
 
-//@}
+///@}
 
 #endif // _WAD_H
diff --git a/include/QF/wadfile.h b/include/QF/wadfile.h
index 79e5e2055..9e6c220f6 100644
--- a/include/QF/wadfile.h
+++ b/include/QF/wadfile.h
@@ -29,7 +29,7 @@
 	\ingroup utils
 	Wadfile processing
 */
-//@{
+///@{
 
 #ifndef __QF_wadfile_h
 #define __QF_wadfile_h
@@ -102,6 +102,6 @@ int wad_add_data (wad_t *wad, const char *lumpname, byte type,
 				  const void *data, int bytes);
 lumpinfo_t *wad_find_lump (wad_t *wad, const char *filename);
 
-//@}
+///@}
 
 #endif//__QF_wadfile_h
diff --git a/include/QF/winding.h b/include/QF/winding.h
index 5ef3d8094..5815ac793 100644
--- a/include/QF/winding.h
+++ b/include/QF/winding.h
@@ -26,7 +26,7 @@
 
 /**	\defgroup winding Winding Manipulation
 */
-//@{
+///@{
 
 struct plane_s;
 
@@ -138,6 +138,6 @@ winding_t *ClipWinding (winding_t *in, struct plane_s *split, qboolean keepon);
 void DivideWinding (winding_t *in, struct plane_s *split,
 					winding_t **front, winding_t **back);
 
-//@}
+///@}
 
 #endif//__QF_winding_h
diff --git a/include/QF/zone.h b/include/QF/zone.h
index 379f4557a..1f968737f 100644
--- a/include/QF/zone.h
+++ b/include/QF/zone.h
@@ -88,7 +88,7 @@
 
 	----- Bottom of Memory -----
 */
-//@{
+///@{
 
 typedef struct memzone_s memzone_t;
 
@@ -140,6 +140,6 @@ void *Cache_Get (cache_user_t *c);
 void Cache_Release (cache_user_t *c);
 int Cache_ReadLock (cache_user_t *c) __attribute__((pure));
 
-//@}
+///@}
 
 #endif // __zone_h
diff --git a/include/net_dgrm.h b/include/net_dgrm.h
index 712864dd3..38c2f7e19 100644
--- a/include/net_dgrm.h
+++ b/include/net_dgrm.h
@@ -29,7 +29,7 @@
 /** \defgroup nq-dgrm NetQuake Datagram network driver.
 	\ingroup nq-nd
 */
-//@{
+///@{
 
 /** Initialize the Datagram net driver.
 
@@ -125,4 +125,4 @@ void		Datagram_Close (qsocket_t *sock);
 */
 void		Datagram_Shutdown (void);
 
-//@}
+///@}
diff --git a/include/net_loop.h b/include/net_loop.h
index a0f58a34a..9247f949e 100644
--- a/include/net_loop.h
+++ b/include/net_loop.h
@@ -34,7 +34,7 @@
 /** \defgroup nq-loop NetQuake loopback network driver.
 	\ingroup nq-nd
 */
-//@{
+///@{
 
 int			Loop_Init (void);
 void		Loop_Listen (qboolean state);
@@ -49,6 +49,6 @@ qboolean	Loop_CanSendUnreliableMessage (qsocket_t *sock);
 void		Loop_Close (qsocket_t *sock);
 void		Loop_Shutdown (void);
 
-//@}
+///@}
 
 #endif//__net_loop_h
diff --git a/include/net_udp.h b/include/net_udp.h
index 78f26a6ec..bd414513d 100644
--- a/include/net_udp.h
+++ b/include/net_udp.h
@@ -33,7 +33,7 @@
 /** \defgroup nq-udp NetQuake UDP lan driver.
 	\ingroup nq-ld
 */
-//@{
+///@{
 
 /** Initialize the UDP network interface.
 
@@ -193,6 +193,6 @@ int UDP_GetSocketPort (netadr_t *addr);
 */
 int UDP_SetSocketPort (netadr_t *addr, int port);
 
-//@}
+///@}
 
 #endif // __net_udp_h
diff --git a/include/net_vcr.h b/include/net_vcr.h
index f5383b572..9f5446453 100644
--- a/include/net_vcr.h
+++ b/include/net_vcr.h
@@ -29,7 +29,7 @@
 /** \defgroup nq-vcr NetQuake VCR network driver.
 	\ingroup nq-nd
 */
-//@{
+///@{
 
 #define VCR_OP_CONNECT					1
 #define VCR_OP_GETMESSAGE				2
@@ -48,4 +48,4 @@ qboolean	VCR_CanSendMessage (qsocket_t *sock);
 void		VCR_Close (qsocket_t *sock);
 void		VCR_Shutdown (void);
 
-//@}
+///@}
diff --git a/include/net_wins.h b/include/net_wins.h
index fe4133f50..c4954f9ac 100644
--- a/include/net_wins.h
+++ b/include/net_wins.h
@@ -35,7 +35,7 @@
 /** \defgroup nq-wins NetQuake Winsock lan driver.
 	\ingroup nq-ld
 */
-//@{
+///@{
 
 extern int winsock_initialized;
 extern WSADATA winsockdata;
@@ -58,6 +58,6 @@ int  WINS_AddrCompare (netadr_t *addr1, netadr_t *addr2);
 int  WINS_GetSocketPort (netadr_t *addr);
 int  WINS_SetSocketPort (netadr_t *addr, int port);
 
-//@}
+///@}
 
 #endif//__net_wins_h
diff --git a/include/netchan.h b/include/netchan.h
index 556732ba2..d811ba913 100644
--- a/include/netchan.h
+++ b/include/netchan.h
@@ -39,7 +39,7 @@
 /** \defgroup qw-net QuakeWorld network support.
 	\ingroup network
 */
-//{
+///@{
 #define MAX_MSGLEN		1450		///< max length of a reliable message
 #define MAX_DATAGRAM	1450		///< max length of unreliable message
 
@@ -75,12 +75,12 @@ void Analyze_Client_Packet (const byte * data, int len, int has_sequence);
 void Analyze_Server_Packet (const byte * data, int len, int has_sequence);
 
 extern struct cvar_s *net_packetlog;
-//@}
+///@}
 
 /** \defgroup qw-udp QuakeWorld udp support.
 	\ingroup qw-net
 */
-//@{
+///@{
 
 /** Initialize the UDP network interface.
 
@@ -165,7 +165,7 @@ const char *NET_BaseAdrToString (netadr_t a);
 */
 qboolean NET_StringToAdr (const char *s, netadr_t *a);
 
-//@}
+///@}
 
 /** \defgroup netchan Netchan
 	\ingroup qw-net
@@ -220,7 +220,7 @@ qboolean NET_StringToAdr (const char *s, netadr_t *a);
 	the channel matches even if the IP port differs.  The IP port should be
 	updated to the new value before sending out any replies.
 */
-//@{
+///@{
 #define	OLD_AVG		0.99		// total = oldtotal*OLD_AVG + new*(1-OLD_AVG)
 
 #define	MAX_LATENT	32
@@ -381,6 +381,6 @@ qboolean Netchan_CanReliable (netchan_t *chan) __attribute__((pure));
 */
 void Netchan_SendPacket (int length, const void *data, netadr_t to);
 
-//@}
+///@}
 
 #endif // _NET_H
diff --git a/include/netmain.h b/include/netmain.h
index a35171415..8cae78d60 100644
--- a/include/netmain.h
+++ b/include/netmain.h
@@ -34,7 +34,7 @@
 /** \defgroup nq-net NetQuake network support.
 	\ingroup network
 */
-//@{
+///@{
 
 typedef struct
 {
@@ -56,7 +56,7 @@ typedef struct
 
 /** \name NetHeader flags
 */
-//@{
+///@{
 #define NETFLAG_LENGTH_MASK	0x0000ffff
 #define NETFLAG_DATA		0x00010000
 #define NETFLAG_ACK			0x00020000
@@ -64,7 +64,7 @@ typedef struct
 #define NETFLAG_EOM			0x00080000
 #define NETFLAG_UNRELIABLE	0x00100000
 #define NETFLAG_CTL			0x80000000
-//@}
+///@}
 
 
 #define NET_PROTOCOL_VERSION	3
@@ -86,7 +86,7 @@ typedef struct
 		a full address and port in a string.  It is used for returning the
 		address of a server that is not running locally.
 */
-//@{
+///@{
 
 /** Connect Request:
 	\arg \b string	\c game_name			\em "QUAKE"
@@ -153,7 +153,7 @@ typedef struct
 	\arg \b string	\c value
 */
 #define CCREP_RULE_INFO		0x85
-//@}
+///@}
 
 typedef struct qsocket_s {
 	struct qsocket_s	*next;
@@ -205,11 +205,11 @@ typedef struct qsocket_s {
 
 /** \name socket management
 */
-//@{
+///@{
 extern qsocket_t	*net_activeSockets;
 extern qsocket_t	*net_freeSockets;
 extern int			net_numsockets;
-//@}
+///@}
 
 #define	MAX_NET_DRIVERS		8
 
@@ -220,12 +220,12 @@ extern int net_driverlevel;
 
 /** \name message statistics
 */
-//@{
+///@{
 extern int		messagesSent;
 extern int		messagesReceived;
 extern int		unreliableMessagesSent;
 extern int		unreliableMessagesReceived;
-//@}
+///@}
 
 /** Create and initialize a new qsocket.
 
@@ -390,12 +390,12 @@ extern struct cvar_s	*hostname;
 
 extern QFile *vcrFile;
 
-//@}
+///@}
 
 /** \defgroup nq-ld NetQuake lan drivers.
 	\ingroup nq-net
 */
-//@{
+///@{
 
 typedef struct {
 	const char		*name;
@@ -423,12 +423,12 @@ typedef struct {
 extern int 				net_numlandrivers;
 extern net_landriver_t	net_landrivers[MAX_NET_DRIVERS];
 
-//@}
+///@}
 
 /** \defgroup nq-nd NetQuake network drivers.
 	\ingroup nq-net
 */
-//@{
+///@{
 
 typedef struct {
 	const char		*name;
@@ -451,6 +451,6 @@ typedef struct {
 extern int			net_numdrivers;
 extern net_driver_t	net_drivers[MAX_NET_DRIVERS];
 
-//@}
+///@}
 
 #endif // __net_h
diff --git a/include/snd_internal.h b/include/snd_internal.h
index 0b1e87a21..ca4dc76c6 100644
--- a/include/snd_internal.h
+++ b/include/snd_internal.h
@@ -35,7 +35,7 @@
 /** \defgroup sound_render Sound rendering sub-system.
 	\ingroup sound
 */
-//@{
+///@{
 
 #include "QF/plugin/general.h"
 #include "QF/plugin/snd_render.h"
@@ -234,12 +234,12 @@ extern snd_render_data_t snd_render_data;
 #define PAINTBUFFER_SIZE    512
 extern portable_samplepair_t snd_paintbuffer[PAINTBUFFER_SIZE * 2];
 
-//@}
+///@}
 
 /** \defgroup sound_render_sfx Sound sfx
 	\ingroup sound_render_mix
 */
-//@{
+///@{
 /** Cache sound data. Initializes caching fields of sfx.
 	\param sfx
 	\param realname
@@ -289,7 +289,7 @@ sfx_t *SND_LoadSound (const char *name);
 */
 void SND_SFX_Init (void);
 
-//@}
+///@}
 
 /** \defgroup sound_render_mix_channels Sound channels
 	\ingroup sound_render_mix
@@ -302,7 +302,7 @@ void SND_SFX_Init (void);
 	- MAX_DYNAMIC_CHANNELS + NUM_AMBIENTS to total_channels - 1 <br>
 		static sounds
 */
-//@{
+///@{
 #define	MAX_CHANNELS			512	//!< number of available mixing channels
 #define	MAX_DYNAMIC_CHANNELS	128	//!< number of dynamic channels
 #define MAX_STATIC_CHANNELS		256	//!< number of static channels
@@ -390,13 +390,13 @@ void SND_StopSound (int entnum, int entchannel);
 	\param s name of sound to play
 */
 void SND_LocalSound (const char *s);
-//@}
+///@}
 
 
 /** \defgroup sound_render_mix Mixer engine.
 	\ingroup sound_render
 */
-//@{
+///@{
 /** sound clock in samples
 */
 extern unsigned snd_paintedtime;
@@ -414,13 +414,13 @@ void SND_InitScaletable (void);
 	\param sc		sfxbuffer to set.
 */
 void SND_SetPaint (sfxbuffer_t *sc);
-//@}
+///@}
 
 
 /** \defgroup sound_render_resample Resampling functions
 	\ingroup sound_render
 */
-//@{
+///@{
 /** Set up the various parameters that depend on the actual sample rate.
 	\param sc		buffer to setup
 	\param streamed	non-zero if this is for a stream.
@@ -448,13 +448,13 @@ void SND_Resample (sfxbuffer_t *sc, float *data, int length);
 */
 void SND_Convert (byte *idata, float *fdata, int frames, int channels,
 				  int width);
-//@}
+///@}
 
 
 /** \defgroup sound_render_load Sound loading functions
 	\ingroup sound_render
 */
-//@{
+///@{
 /** Load the referenced sound.
 	\param sfx		sound reference
 	\return			0 if ok, -1 on error
@@ -492,12 +492,12 @@ int SND_LoadWav (QFile *file, sfx_t *sfx, char *realname);
 	\return			0 if ok, -1 on error
 */
 int SND_LoadMidi (QFile *file, sfx_t *sfx, char *realname);
-//@}
+///@}
 
 /** \defgroup sound_render_cache_stream Cache/Stream Functions.
 	\ingroup sound_render
 */
-//@{
+///@{
 /** Retrieve wavinfo from a cached sound.
 	\param sfx		sound reference
 	\return			pointer to sound's wavinfo
@@ -579,6 +579,6 @@ void SND_StreamSetPos (sfxbuffer_t *buffer, unsigned int pos);
 */
 sfxbuffer_t *SND_GetCache (long samples, int rate, int channels,
 						   sfxblock_t *block, cache_allocator_t allocator);
-//@}
+///@}
 
 #endif//__snd_internal_h
diff --git a/libs/models/winding.c b/libs/models/winding.c
index d065224f7..62ae9fcb8 100644
--- a/libs/models/winding.c
+++ b/libs/models/winding.c
@@ -40,10 +40,6 @@
 
 #define BOGUS (18000.0)
 
-/**	\addtogroup qfbsp_winding
-*/
-//@{
-
 int         c_activewindings, c_peakwindings;
 
 winding_t *
@@ -326,5 +322,3 @@ FreeWinding (winding_t *w)
 	c_activewindings--;
 	free (w);
 }
-
-//@}
diff --git a/qtv/include/connection.h b/qtv/include/connection.h
index d02e4b971..18bbbc277 100644
--- a/qtv/include/connection.h
+++ b/qtv/include/connection.h
@@ -36,7 +36,7 @@
 /**	\defgroup qtv_connection Connection Management
 	\ingroup qtv
 */
-//@{
+///@{
 
 typedef struct connection_s {
 	netadr_t    address;		///< Address of the remote end.
@@ -77,6 +77,6 @@ void Connection_Del (connection_t *con);
 */
 connection_t *Connection_Find (netadr_t *address);
 
-//@}
+///@}
 
 #endif//__connection_h
diff --git a/qtv/include/qtv.h b/qtv/include/qtv.h
index 57947af16..732febfb3 100644
--- a/qtv/include/qtv.h
+++ b/qtv/include/qtv.h
@@ -40,7 +40,7 @@
 /**	\defgroup qtv_general General Functions
 	\ingroup qtv
 */
-//@{
+///@{
 
 #define PORT_QTV 27501	///< Default port to listen for connecting clients.
 
@@ -91,6 +91,6 @@ void qtv_end_redirect (void);
 
 void qtv_sbar_init (void);
 
-//@}
+///@}
 
 #endif//__qtv_h
diff --git a/ruamoko/include/gui/Group.h b/ruamoko/include/gui/Group.h
index b9ea99386..f20cca09c 100644
--- a/ruamoko/include/gui/Group.h
+++ b/ruamoko/include/gui/Group.h
@@ -4,7 +4,7 @@
 #include "View.h"
 
 /**	\addtogroup gui */
-//@{
+///@{
 
 @class Array;
 
@@ -41,6 +41,6 @@
 - (id) addViews: (Array*)viewlist;
 @end
 
-//@}
+///@}
 
 #endif//__ruamoko_gui_Group_h
diff --git a/ruamoko/include/gui/InputLine.h b/ruamoko/include/gui/InputLine.h
index 692562a08..363cc0b8c 100644
--- a/ruamoko/include/gui/InputLine.h
+++ b/ruamoko/include/gui/InputLine.h
@@ -8,7 +8,7 @@
 
 	Interface functions to the engine implementation.
 */
-//@{
+///@{
 
 /**	Opaque handle to an inputline.
 
@@ -118,10 +118,10 @@ typedef void (il_enterfunc)(string, void*);
 	\return			The current text of the intputline.
 */
 @extern string InputLine_GetText (inputline_t il);
-//@}
+///@}
 
 /**	\addtogroup gui */
-//@{
+///@{
 
 /**	Class representation of the low-level inputline objects.
 */
@@ -252,6 +252,6 @@ typedef void (il_enterfunc)(string, void*);
 - (string) text;
 @end
 
-//@}
+///@}
 
 #endif //__ruamoko_gui_InputLine_h
diff --git a/ruamoko/include/gui/Pic.h b/ruamoko/include/gui/Pic.h
index f19e8b6e4..9ed9e3380 100644
--- a/ruamoko/include/gui/Pic.h
+++ b/ruamoko/include/gui/Pic.h
@@ -4,7 +4,7 @@
 #include "gui/View.h"
 
 /**	\addtogroup gui */
-//@{
+///@{
 
 @interface Pic : View
 {
@@ -18,6 +18,6 @@
 -(void)draw;
 @end
 
-//@}
+///@}
 
 #endif//__ruamoko_gui_Pic_h
diff --git a/ruamoko/include/gui/Point.h b/ruamoko/include/gui/Point.h
index 4ac36391a..9de4d7f5e 100644
--- a/ruamoko/include/gui/Point.h
+++ b/ruamoko/include/gui/Point.h
@@ -2,7 +2,7 @@
 #define __ruamoko_gui_Point_h
 
 /**	\addtogroup gui */
-//@{
+///@{
 
 struct Point {
 	int x;
@@ -15,6 +15,6 @@ typedef struct Point Point;
 @extern Point addPoint (Point a, Point b);
 @extern Point subtractPoint (Point a, Point b);
 
-//@}
+///@}
 
 #endif //__ruamoko_gui_Point_h
diff --git a/ruamoko/include/gui/Rect.h b/ruamoko/include/gui/Rect.h
index 145815d66..005ce4a70 100644
--- a/ruamoko/include/gui/Rect.h
+++ b/ruamoko/include/gui/Rect.h
@@ -5,7 +5,7 @@
 #include "gui/Size.h"
 
 /**	\addtogroup gui */
-//@{
+///@{
 
 struct Rect {
 	Point	origin;
@@ -30,6 +30,6 @@ typedef struct Rect Rect;
 - (Rect) offsetBySize: (Size)aSize;
 #endif
 
-//@}
+///@}
 
 #endif //__ruamoko_gui_Rect_h
diff --git a/ruamoko/include/gui/Size.h b/ruamoko/include/gui/Size.h
index 0f6b387a3..dd48c6259 100644
--- a/ruamoko/include/gui/Size.h
+++ b/ruamoko/include/gui/Size.h
@@ -2,7 +2,7 @@
 #define __ruamoko_gui_Size_h
 
 /**	\addtogroup gui */
-//@{
+///@{
 
 struct Size {
 	int width;
@@ -15,6 +15,6 @@ typedef struct Size Size;
 @extern Size addSize (Size a, Size b);
 @extern Size subtractSize (Size a, Size b);
 
-//@}
+///@}
 
 #endif //__ruamoko_gui_Size_h
diff --git a/ruamoko/include/gui/Slider.h b/ruamoko/include/gui/Slider.h
index 13a68f492..66710d28e 100644
--- a/ruamoko/include/gui/Slider.h
+++ b/ruamoko/include/gui/Slider.h
@@ -4,7 +4,7 @@
 #include "View.h"
 
 /**	\addtogroup gui */
-//@{
+///@{
 
 @interface Slider: View
 {
@@ -19,6 +19,6 @@
 
 @end
 
-//@}
+///@}
 
 #endif //__ruamoko_gui_Slider_h
diff --git a/ruamoko/include/gui/Text.h b/ruamoko/include/gui/Text.h
index d9c6a1311..d5654d555 100644
--- a/ruamoko/include/gui/Text.h
+++ b/ruamoko/include/gui/Text.h
@@ -4,7 +4,7 @@
 #include "View.h"
 
 /**	\addtogroup gui */
-//@{
+///@{
 
 @interface Text: View
 {
@@ -18,6 +18,6 @@
 - (void) draw;
 @end
 
-//@}
+///@}
 
 #endif //__ruamoko_gui_Text_h
diff --git a/ruamoko/include/gui/View.h b/ruamoko/include/gui/View.h
index a84f05e06..c2a99e036 100644
--- a/ruamoko/include/gui/View.h
+++ b/ruamoko/include/gui/View.h
@@ -8,7 +8,7 @@
 */
 
 /**	\addtogroup gui */
-//@{
+///@{
 
 /** The View class.
 */
@@ -34,6 +34,6 @@
 - (int) keyEvent:(int)key unicode:(int)unicode down:(int)down;
 @end
 
-//@}
+///@}
 
 #endif //__ruamoko_gui_View_h
diff --git a/tools/qfbsp/include/brush.h b/tools/qfbsp/include/brush.h
index f51beab00..345b14747 100644
--- a/tools/qfbsp/include/brush.h
+++ b/tools/qfbsp/include/brush.h
@@ -30,7 +30,7 @@
 /**	\defgroup qfbsp_brush Brush Functions
 	\ingroup qfbsp
 */
-//@{
+///@{
 
 #define	NUM_HULLS		2				// normal and +16
 
@@ -95,6 +95,6 @@ int NormalizePlane (plane_t *dp);
 */
 int	FindPlane (const plane_t *dplane, int *side);
 
-//@}
+///@}
 
 #endif//qfbsp_brush_h
diff --git a/tools/qfbsp/include/bsp5.h b/tools/qfbsp/include/bsp5.h
index 4cacb23ae..b949cf77c 100644
--- a/tools/qfbsp/include/bsp5.h
+++ b/tools/qfbsp/include/bsp5.h
@@ -32,7 +32,7 @@
 /**	\defgroup qfbsp_general General functions
 	\ingroup qfbsp
 */
-//@{
+///@{
 
 #define MAX_THREADS 4
 
@@ -129,6 +129,6 @@ node_t *AllocNode (void);
 
 extern bsp_t *bsp;
 
-//@}
+///@}
 
 #endif//qfbsp_bsp5_h
diff --git a/tools/qfbsp/include/csg4.h b/tools/qfbsp/include/csg4.h
index dd48047f4..e6ff8b4a3 100644
--- a/tools/qfbsp/include/csg4.h
+++ b/tools/qfbsp/include/csg4.h
@@ -27,7 +27,7 @@
 /**	\defgroup qfbsp_csg4 CSG Functions
 	\ingroup qfbsp
 */
-//@{
+///@{
 
 struct plane_s;
 struct visfacet_s;
@@ -84,6 +84,6 @@ struct surface_s *CSGFaces (struct brushset_s *bs);
 void SplitFace (struct visfacet_s *in, struct plane_s *split,
 				struct visfacet_s **front, struct visfacet_s **back);
 
-//@}
+///@}
 
 #endif//qfbsp_csg4_h
diff --git a/tools/qfbsp/include/draw.h b/tools/qfbsp/include/draw.h
index ecaa3fd53..740fa9050 100644
--- a/tools/qfbsp/include/draw.h
+++ b/tools/qfbsp/include/draw.h
@@ -27,7 +27,7 @@
 /**	\defgroup qfbsp_draw Debug Drawing Functions
 	\ingroup qfbsp
 */
-//@{
+///@{
 
 struct visfacet_s;
 struct portal_s;
@@ -53,6 +53,6 @@ void DrawBrush (const struct brush_s *b);
 void DrawWinding (const struct winding_s *w);
 void DrawTri (const vec3_t p1, const vec3_t p2, const vec3_t p3);
 
-//@}
+///@}
 
 #endif//qfbsp_draw_h
diff --git a/tools/qfbsp/include/map.h b/tools/qfbsp/include/map.h
index e531fad8a..25c56d4ef 100644
--- a/tools/qfbsp/include/map.h
+++ b/tools/qfbsp/include/map.h
@@ -27,7 +27,7 @@
 /**	\defgroup qfbsp_map Map Parser
 	\ingroup qfbsp
 */
-//@{
+///@{
 
 #define MAX_FACES 256
 typedef struct mface_s {
@@ -120,6 +120,6 @@ void GetVectorForKey (const entity_t *ent, const char *key, vec3_t vec);
 */
 void WriteEntitiesToString (void);
 
-//@}
+///@}
 
 #endif//qfbsp_map_h
diff --git a/tools/qfbsp/include/merge.h b/tools/qfbsp/include/merge.h
index 81e8b2c1c..c65ee15ff 100644
--- a/tools/qfbsp/include/merge.h
+++ b/tools/qfbsp/include/merge.h
@@ -25,7 +25,7 @@
 /**	\defgroup qfbsp_merge Merge Functions
 	\ingroup qfbsp
 */
-//@{
+///@{
 
 /**	Add a face to the list of faces, doing any possible merging.
 
@@ -63,6 +63,6 @@ void MergePlaneFaces (surface_t *plane);
 */
 void MergeAll (surface_t *surfhead);
 
-//@}
+///@}
 
 #endif//qfbsp_merge_h
diff --git a/tools/qfbsp/include/options.h b/tools/qfbsp/include/options.h
index 4b062f27e..47a8e0df7 100644
--- a/tools/qfbsp/include/options.h
+++ b/tools/qfbsp/include/options.h
@@ -33,7 +33,7 @@
 /**	\defgroup qfbsp_options Command-line Options Parsing
 	\ingroup qfbsp
 */
-//@{
+///@{
 
 typedef struct {
 	int         verbosity;		// 0=silent
@@ -65,6 +65,6 @@ extern options_t options;
 int DecodeArgs (int argc, char **argv);
 extern const char *this_program;
 
-//@}
+///@}
 
 #endif//qfbsp_options_h
diff --git a/tools/qfbsp/include/outside.h b/tools/qfbsp/include/outside.h
index 8ad85fe49..e45e11496 100644
--- a/tools/qfbsp/include/outside.h
+++ b/tools/qfbsp/include/outside.h
@@ -25,7 +25,7 @@
 /**	\defgroup qfbsp_outside Outside Functions
 	\ingroup qfbsp
 */
-//@{
+///@{
 
 struct node_s;
 
@@ -41,6 +41,6 @@ struct node_s;
 */
 qboolean FillOutside (struct node_s *node);
 
-//@}
+///@}
 
 #endif//qfbsp_outside_h
diff --git a/tools/qfbsp/include/portals.h b/tools/qfbsp/include/portals.h
index 381bbf0f9..6d5da460e 100644
--- a/tools/qfbsp/include/portals.h
+++ b/tools/qfbsp/include/portals.h
@@ -31,7 +31,7 @@
 	Decision nodes will not have portals on them, though as part of the
 	portal building process, they will temporarily have portals.
 */
-//@{
+///@{
 
 struct node_s;
 
@@ -89,6 +89,6 @@ void FreeAllPortals (struct node_s *node);
 */
 void WritePortalfile (struct node_s *headnode);
 
-//@}
+///@}
 
 #endif//qfbsp_portals_h
diff --git a/tools/qfbsp/include/readbsp.h b/tools/qfbsp/include/readbsp.h
index 17f1b2890..5887a68ea 100644
--- a/tools/qfbsp/include/readbsp.h
+++ b/tools/qfbsp/include/readbsp.h
@@ -25,7 +25,7 @@
 /**	\defgroup qfbsp_readbsp BSP Reading Functions
 	\ingroup qfbsp
 */
-//@{
+///@{
 
 /**	Load the bspfile into memory.
 */
@@ -47,6 +47,6 @@ void extract_entities (void);
 */
 void extract_hull (void);
 
-//@}
+///@}
 
 #endif//qfbsp_readbsp_h
diff --git a/tools/qfbsp/include/region.h b/tools/qfbsp/include/region.h
index ce30e71f7..2a17734c5 100644
--- a/tools/qfbsp/include/region.h
+++ b/tools/qfbsp/include/region.h
@@ -25,7 +25,7 @@
 /**	\defgroup qfbsp_region Region Functions
 	\ingroup qfbsp
 */
-//@{
+///@{
 
 struct node_s;
 
@@ -35,6 +35,6 @@ struct node_s;
 */
 void GrowNodeRegions (struct node_s *headnode);
 
-//@}
+///@}
 
 #endif//qfbsp_region_h
diff --git a/tools/qfbsp/include/solidbsp.h b/tools/qfbsp/include/solidbsp.h
index 18bd306a6..5a3d7fbe4 100644
--- a/tools/qfbsp/include/solidbsp.h
+++ b/tools/qfbsp/include/solidbsp.h
@@ -27,7 +27,7 @@
 /**	\defgroup qfbsp_solidbsp BSP Creation Functions
 	\ingroup qfbsp
 */
-//@{
+///@{
 
 struct visfacet_s;
 struct plane_s;
@@ -48,6 +48,6 @@ void CalcSurfaceInfo (struct surface_s *surf);
 */
 struct node_s *SolidBSP (struct surface_s *surfhead, qboolean midsplit);
 
-//@}
+///@}
 
 #endif//qfbsp_solidbsp_h
diff --git a/tools/qfbsp/include/surfaces.h b/tools/qfbsp/include/surfaces.h
index ebb8314cc..561d21048 100644
--- a/tools/qfbsp/include/surfaces.h
+++ b/tools/qfbsp/include/surfaces.h
@@ -27,7 +27,7 @@
 /**	\defgroup qfbsp_surface Surface Functions
 	\ingroup qfbsp
 */
-//@{
+///@{
 
 struct visfacet_s;
 struct node_s;
@@ -104,6 +104,6 @@ struct surface_s *GatherNodeFaces (struct node_s *headnode);
 */
 void MakeFaceEdges (struct node_s *headnode);
 
-//@}
+///@}
 
 #endif//surfaces_h
diff --git a/tools/qfbsp/include/tjunc.h b/tools/qfbsp/include/tjunc.h
index 46fa939fc..3557e4df7 100644
--- a/tools/qfbsp/include/tjunc.h
+++ b/tools/qfbsp/include/tjunc.h
@@ -25,7 +25,7 @@
 /**	\defgroup qfbsp_tjunc T-Junction Repair
 	\ingroup qfbsp
 */
-//@{
+///@{
 
 struct node_s;
 
@@ -35,6 +35,6 @@ struct node_s;
 */
 void tjunc (struct node_s *headnode);
 
-//@}
+///@}
 
 #endif//qfbsp_tjunc_h
diff --git a/tools/qfbsp/include/writebsp.h b/tools/qfbsp/include/writebsp.h
index 6d2a5cf0f..759220904 100644
--- a/tools/qfbsp/include/writebsp.h
+++ b/tools/qfbsp/include/writebsp.h
@@ -27,7 +27,7 @@
 /**	\defgroup qfbsp_writebsp BSP Writing Functions
 	\ingroup qfbsp
 */
-//@{
+///@{
 
 struct node_s;
 
@@ -78,6 +78,6 @@ void BeginBSPFile (void);
 */
 void FinishBSPFile (void);
 
-//@}
+///@}
 
 #endif//qfbsp_writebsp_h
diff --git a/tools/qfcc/include/dags.h b/tools/qfcc/include/dags.h
index c0d07c4b3..c83c029f6 100644
--- a/tools/qfcc/include/dags.h
+++ b/tools/qfcc/include/dags.h
@@ -33,7 +33,7 @@
 /** \defgroup qfcc_dags DAG building
 	\ingroup qfcc
 */
-//@{
+///@{
 
 #include "QF/pr_comp.h"
 
@@ -110,6 +110,6 @@ dag_t *dag_create (struct flownode_s *flownode);
 void dag_remove_dead_nodes (dag_t *dag);
 void dag_generate (dag_t *dag, sblock_t *block);
 
-//@}
+///@}
 
 #endif//dags_h
diff --git a/tools/qfcc/include/def.h b/tools/qfcc/include/def.h
index 68b946fab..df0104178 100644
--- a/tools/qfcc/include/def.h
+++ b/tools/qfcc/include/def.h
@@ -37,7 +37,7 @@
 /** \defgroup qfcc_def Def handling
 	\ingroup qfcc
 */
-//@{
+///@{
 
 struct symbol_s;
 struct expr_s;
@@ -180,7 +180,7 @@ void free_def (def_t *def);
 	Temporary defs are bound to the current function (::current_func must
 	be valid). They are always allocated from the funciont's local defspace.
 */
-//@{
+///@{
 /** Get a temporary def.
 
 	If the current function has a free temp def of the same size as \a size,
@@ -207,7 +207,7 @@ def_t *temp_def (struct type_s *type);
 	\param temp		The temp def to be recycled.
 */
 void free_temp_def (def_t *temp);
-//@}
+///@}
 
 /** Initialize a vm def from a qfcc def.
 
@@ -306,6 +306,6 @@ int def_size (def_t *def) __attribute__((pure));
 */
 int def_visit_all (def_t *def, int overlap,
 				   int (*visit) (def_t *, void *), void *data);
-//@}
+///@}
 
 #endif//__def_h
diff --git a/tools/qfcc/include/defspace.h b/tools/qfcc/include/defspace.h
index 8e7f034d6..bd4b68920 100644
--- a/tools/qfcc/include/defspace.h
+++ b/tools/qfcc/include/defspace.h
@@ -37,7 +37,7 @@
 /** \defgroup qfcc_defspace Defspace handling
 	\ingroup qfcc
 */
-//@{
+///@{
 
 typedef enum {
 	ds_backed,		///< data space is globally addressable (near/far/type) and
@@ -145,6 +145,6 @@ void defspace_free_loc (defspace_t *space, int ofs, int size);
 */
 int defspace_add_data (defspace_t *space, pr_type_t *data, int size);
 
-//@}
+///@}
 
 #endif//__defspace_h
diff --git a/tools/qfcc/include/diagnostic.h b/tools/qfcc/include/diagnostic.h
index bd32711f8..3a19c9722 100644
--- a/tools/qfcc/include/diagnostic.h
+++ b/tools/qfcc/include/diagnostic.h
@@ -36,7 +36,7 @@
 /**	\defgroup qfcc_diagnostic Diagnostic Messages
 	\ingroup qfcc
 */
-//@{
+///@{
 
 typedef void (*diagnostic_hook)(const char *message);
 extern diagnostic_hook bug_hook;
@@ -73,6 +73,6 @@ void _bug (struct expr_s *e, const char *file, int line, const char *fmt, ...)
 	__attribute__ ((format (printf, 4, 5)));
 #define bug(e, fmt...) _bug(e, __FILE__, __LINE__, fmt)
 
-//@}
+///@}
 
 #endif//__diagnostic_h
diff --git a/tools/qfcc/include/expr.h b/tools/qfcc/include/expr.h
index 5109b364e..d83610b7f 100644
--- a/tools/qfcc/include/expr.h
+++ b/tools/qfcc/include/expr.h
@@ -36,7 +36,7 @@
 /**	\defgroup qfcc_expr Expressions
 	\ingroup qfcc
 */
-//@{
+///@{
 
 /**	Type of the exression node in an expression tree.
 */
@@ -652,6 +652,6 @@ expr_t *sizeof_expr (expr_t *expr, struct type_s *type);
 
 expr_t *fold_constants (expr_t *e);
 
-//@}
+///@}
 
 #endif//__expr_h
diff --git a/tools/qfcc/include/flow.h b/tools/qfcc/include/flow.h
index 591704a01..b4cc48cf5 100644
--- a/tools/qfcc/include/flow.h
+++ b/tools/qfcc/include/flow.h
@@ -33,7 +33,7 @@
 /** \defgroup qfcc_flow Flow graph analysis
 	\ingroup qfcc
 */
-//@{
+///@{
 
 struct function_s;
 struct sblock_s;
@@ -120,6 +120,6 @@ void dump_dot_flow_live (void *g, const char *filename);
 void dump_dot_flow_reaching (void *g, const char *filename);
 void dump_dot_flow_statements (void *g, const char *filename);
 
-//@}
+///@}
 
 #endif//flow_h
diff --git a/tools/qfcc/include/function.h b/tools/qfcc/include/function.h
index d145fc53e..88ea05dc8 100644
--- a/tools/qfcc/include/function.h
+++ b/tools/qfcc/include/function.h
@@ -34,7 +34,7 @@
 /** \defgroup qfcc_function Internal function structures.
 	\ingroup qfcc
 */
-//@{
+///@{
 
 #include "QF/pr_comp.h"
 #include "QF/pr_debug.h"
@@ -147,6 +147,6 @@ void emit_function (function_t *f, struct expr_s *e);
 int function_parms (function_t *f, byte *parm_size);
 void clear_functions (void);
 
-//@}
+///@}
 
 #endif//__function_h
diff --git a/tools/qfcc/include/obj_file.h b/tools/qfcc/include/obj_file.h
index 1fe1d3690..0e6096028 100644
--- a/tools/qfcc/include/obj_file.h
+++ b/tools/qfcc/include/obj_file.h
@@ -34,7 +34,7 @@
 /** \defgroup qfcc_qfo Object file functions
 	\ingroup qfcc
 */
-//@{
+///@{
 
 #include "QF/pr_comp.h"
 #include "QF/pr_debug.h"
@@ -106,12 +106,12 @@ typedef struct qfo_def_s {
 	string_t    file;			///< source file name
 	pr_uint_t   line;			///< source line number
 } qfo_def_t;
-//@}
+///@}
 
 /** \defgroup qfcc_qfo_QFOD QFOD flags
 	\ingroup qfcc_qfo
 */
-//@{
+///@{
 
 /** The def has been initialized.
 
@@ -168,11 +168,11 @@ typedef struct qfo_def_s {
 	\hideinitializer
 */
 #define QFOD_PARAM			(1u<<8)
-//@}
+///@}
 
 /** \addtogroup qfcc_qfo
 */
-//@{
+///@{
 
 /** Representation of a function in the object file.
 */
@@ -286,13 +286,13 @@ enum {
 
 	qfo_num_spaces
 };
-//@}
+///@}
 
 /** \defgroup qfcc_qfo_data_access QFO Data Acess
 	\ingroup qfcc_qfo
 	Macros for accessing data in the QFO address space
 */
-//@{
+///@{
 
 /** \internal
 	\param q pointer to ::qfo_t struct
@@ -361,7 +361,6 @@ enum {
 
 	\param q pointer to ::qfo_t struct
 	\param s space index
-	\param s offset into object file string space
 	\return (char *)
 
 	\hideinitializer
@@ -439,11 +438,11 @@ enum {
 */
 #define QFO_STRUCT(q, s, t, o)	(*QFO_POINTER (q, s, t, o))
 
-//@}
+///@}
 
 /** \addtogroup qfcc_qfo
 */
-//@{
+///@{
 
 struct pr_info_s;
 
@@ -485,6 +484,6 @@ qfo_t *qfo_new (void);
 */
 void qfo_delete (qfo_t *qfo);
 
-//@}
+///@}
 
 #endif//__obj_file_h
diff --git a/tools/qfcc/include/obj_type.h b/tools/qfcc/include/obj_type.h
index d9c677641..13ce701e4 100644
--- a/tools/qfcc/include/obj_type.h
+++ b/tools/qfcc/include/obj_type.h
@@ -38,6 +38,4 @@
 struct type_s;
 struct def_s *qfo_encode_type (struct type_s *type);
 
-//@}
-
 #endif//__obj_type_h
diff --git a/tools/qfcc/include/pragma.h b/tools/qfcc/include/pragma.h
index 1f6726f28..5f660ac23 100644
--- a/tools/qfcc/include/pragma.h
+++ b/tools/qfcc/include/pragma.h
@@ -33,10 +33,10 @@
 /** \defgroup qfcc_pragma pragma handling
 	\ingroup qfcc
 */
-//@{
+///@{
 
 void pragma (const char *id);
 
-//@}
+///@}
 
 #endif//pragma_h
diff --git a/tools/qfcc/include/qfcc.h b/tools/qfcc/include/qfcc.h
index 0bec07d37..1a1793b34 100644
--- a/tools/qfcc/include/qfcc.h
+++ b/tools/qfcc/include/qfcc.h
@@ -39,7 +39,7 @@
 /** \defgroup qfcc_general General functions
 	\ingroup qfcc
 */
-//@{
+///@{
 
 typedef struct srcline_s srcline_t;
 struct srcline_s {
@@ -132,6 +132,6 @@ char *fix_backslash (char *path);
 */
 #define RUP(x,a) (((x) + ((a) - 1)) & ~((a) - 1))
 
-//@}
+///@}
 
 #endif//__qfcc_h
diff --git a/tools/qfcc/include/symtab.h b/tools/qfcc/include/symtab.h
index f338077eb..c0c064f3e 100644
--- a/tools/qfcc/include/symtab.h
+++ b/tools/qfcc/include/symtab.h
@@ -39,7 +39,7 @@ enum storage_class_e;
 /**	\defgroup qfcc_symtab Symbol Table Management
 	\ingroup qfcc
 */
-//@{
+///@{
 
 typedef enum vis_e {
 	vis_public,
@@ -235,6 +235,6 @@ symtab_t *symtab_flat_copy (symtab_t *symtab, symtab_t *parent);
 symbol_t *make_symbol (const char *name, struct type_s *type,
 					   struct defspace_s *space, enum storage_class_e storage);
 
-//@}
+///@}
 
 #endif//__symtab_h
diff --git a/tools/qfcc/include/value.h b/tools/qfcc/include/value.h
index 11bee26e6..883af01e0 100644
--- a/tools/qfcc/include/value.h
+++ b/tools/qfcc/include/value.h
@@ -34,7 +34,7 @@
 /** \defgroup qfcc_value Constant values.
 	\ingroup qfcc_expr
 */
-//@{
+///@{
 
 struct ex_value_s;
 struct type_s;
@@ -63,6 +63,6 @@ int	ReuseString (const char *str);
 
 void clear_immediates (void);
 
-//@}
+///@}
 
 #endif//__value_h
diff --git a/tools/qflight/include/entities.h b/tools/qflight/include/entities.h
index 82bf378cc..6f3d1dd12 100644
--- a/tools/qflight/include/entities.h
+++ b/tools/qflight/include/entities.h
@@ -34,7 +34,7 @@
 /** \defgroup qflight_entities Light entity data.
 	\ingroup qflight
 */
-//@{
+///@{
 
 #define DEFAULTLIGHTLEVEL	300
 #define DEFAULTFALLOFF 1.0f
@@ -106,6 +106,6 @@ void GetVectorForKey (entity_t *ent, const char *key, vec3_t vec);
 void LoadEntities (void);
 void WriteEntitiesToString (void);
 
-//@}
+///@}
 
 #endif// __entities_h
diff --git a/tools/qflight/include/light.h b/tools/qflight/include/light.h
index e06a9157a..350b7e442 100644
--- a/tools/qflight/include/light.h
+++ b/tools/qflight/include/light.h
@@ -37,7 +37,7 @@
 /** \defgroup qflight_general General functions
 	\ingroup qflight
 */
-//@{
+///@{
 
 #define	ON_EPSILON	0.1
 #define	MAXLIGHTS	1024
@@ -130,6 +130,6 @@ extern int num_novislights;
 
 const char *get_tex_name (int texindex) __attribute__((pure));
 
-//@}
+///@}
 
 #endif// __light_h
diff --git a/tools/qflight/include/noise.h b/tools/qflight/include/noise.h
index 30625ae13..be63d9de1 100644
--- a/tools/qflight/include/noise.h
+++ b/tools/qflight/include/noise.h
@@ -31,7 +31,7 @@
 /** \defgroup qflight_noise Light noise functions.
 	\ingroup qflight
 */
-//@{
+///@{
 
 float noise3d (vec3_t v, int num) __attribute__((pure));
 float noiseXYZ (float x, float y, float z, int num) __attribute__((pure));
@@ -39,4 +39,4 @@ float noise_scaled (vec3_t v, float s, int num) __attribute__((pure));
 float noise_perlin (vec3_t v, float p, int num) __attribute__((pure));
 void snap_vector (vec3_t v_old, vec3_t v_new, float scale);
 
-//@}
+///@}
diff --git a/tools/qflight/include/options.h b/tools/qflight/include/options.h
index a90592519..32c6d6755 100644
--- a/tools/qflight/include/options.h
+++ b/tools/qflight/include/options.h
@@ -33,7 +33,7 @@
 /** \defgroup qflight_options Light command line options.
 	\ingroup qflight
 */
-//@{
+///@{
 
 typedef struct {
 	int			verbosity;		// 0=silent
@@ -59,6 +59,6 @@ extern const char *this_program;
 int DecodeArgs (int argc, char **argv);
 void usage (int status) __attribute__((noreturn));
 
-//@}
+///@}
 
 #endif//__options_h
diff --git a/tools/qflight/include/properties.h b/tools/qflight/include/properties.h
index a6b724d19..d5e73db7f 100644
--- a/tools/qflight/include/properties.h
+++ b/tools/qflight/include/properties.h
@@ -33,7 +33,7 @@
 /** \defgroup qflight_properties Lighting properties
 	\ingroup qflight
 */
-//@{
+///@{
 
 struct plitem_s;
 
@@ -199,6 +199,6 @@ void set_properties (entity_t *ent, struct plitem_s *dict);
 */
 void LoadProperties (const char *filename);
 
-//@}
+///@}
 
 #endif//__properties_h
diff --git a/tools/qflight/include/threads.h b/tools/qflight/include/threads.h
index 30b9cc59f..0fd5c00af 100644
--- a/tools/qflight/include/threads.h
+++ b/tools/qflight/include/threads.h
@@ -32,7 +32,7 @@
 /** \defgroup qflight_threads Light thread handling.
 	\ingroup qflight
 */
-//@{
+///@{
 
 #if defined (HAVE_PTHREAD_H) && defined (HAVE_PTHREAD)
 
@@ -66,6 +66,6 @@ typedef void *(threadfunc_t) (void *);
 void InitThreads (void);
 void RunThreadsOn (threadfunc_t func);
 
-//@}
+///@}
 
 #endif// __threads_h

From bdf2443d010f2e9fe32413bde1281a8881736091 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 11 Feb 2020 15:27:32 +0900
Subject: [PATCH 0348/1519] Fix ambiguous image file name warnings

Most of the warnings are due to a bug in doxygen (fixed in 1.8.17,
but...), however some were legit due to overzealous image search paths
wildly including the doxygen output tree.
---
 doc/quakeforge.dox.conf.in | 1 -
 1 file changed, 1 deletion(-)

diff --git a/doc/quakeforge.dox.conf.in b/doc/quakeforge.dox.conf.in
index 64028f578..3781f222a 100644
--- a/doc/quakeforge.dox.conf.in
+++ b/doc/quakeforge.dox.conf.in
@@ -937,7 +937,6 @@ EXAMPLE_RECURSIVE      = NO
 # \image command).
 
 IMAGE_PATH             = @TOPSRC@/doc \
-                         @builddir@ \
                          @builddir@/progs \
                          @builddir@/qtv
 

From 729ac22267c36fa0b55a52ef0c9a795506d39346 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 11 Feb 2020 15:54:45 +0900
Subject: [PATCH 0349/1519] Make qw connection sequence visible

Black lines with transparent background on a black backdrop...
---
 doc/connect.dox | 67 +++++++++++++++++++++++++------------------------
 1 file changed, 34 insertions(+), 33 deletions(-)

diff --git a/doc/connect.dox b/doc/connect.dox
index 44d83586a..14295294e 100644
--- a/doc/connect.dox
+++ b/doc/connect.dox
@@ -3,38 +3,39 @@
 /**
 \page connection_sequence QW Connection Sequence
 \msc
-Client,Server;
-Client=>Server [label = "getchallenge\n"];
-Server=>Client [label = "c[challenge][ext]"];
-Client=>Server [label = "connect [protover] [qport] [challenge] [userinfo]"];
-Server=>Client [label = "j"];
-Client->Server [label = "[clc_stringcmd]new"];
-Server->Client [label = "[svc_serverdata][data]"];
-|||;
-Client->Server [label = "[clc_stringcmd]soundlist [svcount] 0"];
---- [label = "soundlist loop start"];
-Server->Client [label = "[svc_soundlist][data][next]"];
-Client->Server [label = "[clc_stringcmd]soundlist [svcount] [next]"];
---- [label = "soundlist loop end"];
-Server->Client [label = "[svc_soundlist][data]0"];
-|||;
-Client->Server [label = "[clc_stringcmd]modellist [svcount] 0"];
---- [label = "modellist list loop start"];
-Server->Client [label = "[svc_modellist][data][next]"];
-Client->Server [label = "[clc_stringcmd]modellist [svcount] [next]"];
---- [label = "modellist list loop end"];
-Server->Client [label = "[svc_modellist][data]0"];
-|||;
-Client->Server [label = "[clc_stringcmd]prespawn [svcount] [n=0] [wcsum]"];
---- [label = "prespawn loop start"];
-Server->Client [label = "[signon buffer n][stuffcmd]prespawn..."];
-Client->Server [label = "[clc_stringcmd]prespawn [svcount] [n]"];
---- [label = "prespawn loop end"];
-Server->Client [label = "[signon buffer n][stuffcmd]spawn..."];
-|||;
-Client->Server [label = "[clc_stringcmd]spawn [svcount] 0"];
-Server->Client [label = "[spawn info][stuffcmd]skins"];
-Client->Server [label = "[clc_stringcmd]begin [svcount]"];
-#... [label = "in game message sequence"];
+Client [linecolor=white, textcolor=white, arclinecolor=white, arctextcolor=white, textbgcolor=black, arctextbgcolor=black],
+Server [linecolor=white, textcolor=white, arclinecolor=white, arctextcolor=white, textbgcolor=black, arctextbgcolor=black];
+Client=>Server [label = "getchallenge\n", linecolor=white, textcolor=white, arclinecolor=white, arctextcolor=white, textbgcolor=black, arctextbgcolor=black];
+Server=>Client [label = "c[challenge][ext]", linecolor=white, textcolor=white, arclinecolor=white, arctextcolor=white, textbgcolor=black, arctextbgcolor=black];
+Client=>Server [label = "connect [protover] [qport] [challenge] [userinfo]", linecolor=white, textcolor=white, arclinecolor=white, arctextcolor=white, textbgcolor=black, arctextbgcolor=black];
+Server=>Client [label = "j", linecolor=white, textcolor=white, arclinecolor=white, arctextcolor=white, textbgcolor=black, arctextbgcolor=black];
+Client->Server [label = "[clc_stringcmd]new", linecolor=white, textcolor=white, arclinecolor=white, arctextcolor=white, textbgcolor=black, arctextbgcolor=black];
+Server->Client [label = "[svc_serverdata][data]", linecolor=white, textcolor=white, arclinecolor=white, arctextcolor=white, textbgcolor=black, arctextbgcolor=black];
+||| [linecolor=white, textcolor=white, arclinecolor=white, arctextcolor=white, textbgcolor=black, arctextbgcolor=black];
+Client->Server [label = "[clc_stringcmd]soundlist [svcount] 0", linecolor=white, textcolor=white, arclinecolor=white, arctextcolor=white, textbgcolor=black, arctextbgcolor=black];
+--- [label = "soundlist loop start", linecolor=white, textcolor=white, arclinecolor=white, arctextcolor=white, textbgcolor=black, arctextbgcolor=black];
+Server->Client [label = "[svc_soundlist][data][next]", linecolor=white, textcolor=white, arclinecolor=white, arctextcolor=white, textbgcolor=black, arctextbgcolor=black];
+Client->Server [label = "[clc_stringcmd]soundlist [svcount] [next]", linecolor=white, textcolor=white, arclinecolor=white, arctextcolor=white, textbgcolor=black, arctextbgcolor=black];
+--- [label = "soundlist loop end", linecolor=white, textcolor=white, arclinecolor=white, arctextcolor=white, textbgcolor=black, arctextbgcolor=black];
+Server->Client [label = "[svc_soundlist][data]0", linecolor=white, textcolor=white, arclinecolor=white, arctextcolor=white, textbgcolor=black, arctextbgcolor=black];
+||| [linecolor=white, textcolor=white, arclinecolor=white, arctextcolor=white, textbgcolor=black, arctextbgcolor=black];
+Client->Server [label = "[clc_stringcmd]modellist [svcount] 0", linecolor=white, textcolor=white, arclinecolor=white, arctextcolor=white, textbgcolor=black, arctextbgcolor=black];
+--- [label = "modellist list loop start", linecolor=white, textcolor=white, arclinecolor=white, arctextcolor=white, textbgcolor=black, arctextbgcolor=black];
+Server->Client [label = "[svc_modellist][data][next]", linecolor=white, textcolor=white, arclinecolor=white, arctextcolor=white, textbgcolor=black, arctextbgcolor=black];
+Client->Server [label = "[clc_stringcmd]modellist [svcount] [next]", linecolor=white, textcolor=white, arclinecolor=white, arctextcolor=white, textbgcolor=black, arctextbgcolor=black];
+--- [label = "modellist list loop end", linecolor=white, textcolor=white, arclinecolor=white, arctextcolor=white, textbgcolor=black, arctextbgcolor=black];
+Server->Client [label = "[svc_modellist][data]0", linecolor=white, textcolor=white, arclinecolor=white, arctextcolor=white, textbgcolor=black, arctextbgcolor=black];
+||| [linecolor=white, textcolor=white, arclinecolor=white, arctextcolor=white, textbgcolor=black, arctextbgcolor=black];
+Client->Server [label = "[clc_stringcmd]prespawn [svcount] [n=0] [wcsum]", linecolor=white, textcolor=white, arclinecolor=white, arctextcolor=white, textbgcolor=black, arctextbgcolor=black];
+--- [label = "prespawn loop start", linecolor=white, textcolor=white, arclinecolor=white, arctextcolor=white, textbgcolor=black, arctextbgcolor=black];
+Server->Client [label = "[signon buffer n][stuffcmd]prespawn...", linecolor=white, textcolor=white, arclinecolor=white, arctextcolor=white, textbgcolor=black, arctextbgcolor=black];
+Client->Server [label = "[clc_stringcmd]prespawn [svcount] [n]", linecolor=white, textcolor=white, arclinecolor=white, arctextcolor=white, textbgcolor=black, arctextbgcolor=black];
+--- [label = "prespawn loop end", linecolor=white, textcolor=white, arclinecolor=white, arctextcolor=white, textbgcolor=black, arctextbgcolor=black];
+Server->Client [label = "[signon buffer n][stuffcmd]spawn...", linecolor=white, textcolor=white, arclinecolor=white, arctextcolor=white, textbgcolor=black, arctextbgcolor=black];
+||| [linecolor=white, textcolor=white, arclinecolor=white, arctextcolor=white, textbgcolor=black, arctextbgcolor=black];
+Client->Server [label = "[clc_stringcmd]spawn [svcount] 0", linecolor=white, textcolor=white, arclinecolor=white, arctextcolor=white, textbgcolor=black, arctextbgcolor=black];
+Server->Client [label = "[spawn info][stuffcmd]skins", linecolor=white, textcolor=white, arclinecolor=white, arctextcolor=white, textbgcolor=black, arctextbgcolor=black];
+Client->Server [label = "[clc_stringcmd]begin [svcount]", linecolor=white, textcolor=white, arclinecolor=white, arctextcolor=white, textbgcolor=black, arctextbgcolor=black];
+... [label = "in game message sequence", linecolor=white, textcolor=white, arclinecolor=white, arctextcolor=white, textbgcolor=black, arctextbgcolor=black];
 \endmsc
 */

From 3208fce42e7b497a8cf129bc223fdc7007482814 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 11 Feb 2020 15:27:32 +0900
Subject: [PATCH 0350/1519] Fix ambiguous image file name warnings

Most of the warnings are due to a bug in doxygen (fixed in 1.8.17,
but...), however some were legit due to overzealous image search paths
wildly including the doxygen output tree.
---
 doc/quakeforge.dox.conf.in | 1 -
 1 file changed, 1 deletion(-)

diff --git a/doc/quakeforge.dox.conf.in b/doc/quakeforge.dox.conf.in
index 64028f578..3781f222a 100644
--- a/doc/quakeforge.dox.conf.in
+++ b/doc/quakeforge.dox.conf.in
@@ -937,7 +937,6 @@ EXAMPLE_RECURSIVE      = NO
 # \image command).
 
 IMAGE_PATH             = @TOPSRC@/doc \
-                         @builddir@ \
                          @builddir@/progs \
                          @builddir@/qtv
 

From 6e96b91aa1b34815027f3a8a21f7443603de1ea2 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 11 Feb 2020 15:59:12 +0900
Subject: [PATCH 0351/1519] Fix a couple more optimization warnings

---
 libs/video/renderer/vulkan/device.c | 2 +-
 libs/video/renderer/vulkan/util.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libs/video/renderer/vulkan/device.c b/libs/video/renderer/vulkan/device.c
index 0ed7ec808..750534f53 100644
--- a/libs/video/renderer/vulkan/device.c
+++ b/libs/video/renderer/vulkan/device.c
@@ -59,7 +59,7 @@
 
 #include "util.h"
 
-static int
+static int __attribute__((const))
 count_bits (uint32_t val)
 {
 	int         bits = 0;
diff --git a/libs/video/renderer/vulkan/util.h b/libs/video/renderer/vulkan/util.h
index ae87b8096..41181ff9e 100644
--- a/libs/video/renderer/vulkan/util.h
+++ b/libs/video/renderer/vulkan/util.h
@@ -5,7 +5,7 @@
 
 typedef struct strset_s strset_t;
 
-int count_strings (const char * const *str);
+int count_strings (const char * const *str) __attribute__((const));
 void merge_strings (const char **out, const char * const *in1,
 					const char * const *in2);
 void prune_strings (strset_t *strset, const char **strings, uint32_t *count);

From 31501ad641a9682ea083e4e726beecf9b641fc6f Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 12 Feb 2020 10:52:47 +0900
Subject: [PATCH 0352/1519] Add some docs for linked lists

Found in an old stash
---
 include/QF/llist.h | 62 +++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 56 insertions(+), 6 deletions(-)

diff --git a/include/QF/llist.h b/include/QF/llist.h
index a7488b312..b9a3a0140 100644
--- a/include/QF/llist.h
+++ b/include/QF/llist.h
@@ -30,16 +30,28 @@
 
 #include "QF/qtypes.h"
 
+/**	\defgroup llist Linked lists
+	\ingroup utils
+*/
+//@{
+
 typedef struct llist_node_s {
-	struct llist_s *parent;
-	struct llist_node_s *prev, *next;
-	void *data;
+	struct llist_s *parent;		///< The list owning this node.
+	struct llist_node_s *prev;	///< The previous node in the list, or null.
+	struct llist_node_s *next;	///< The flowing node in the list, or null.
+	void *data;					///< The actual list item.
 } llist_node_t;
 
 typedef struct llist_s {
-	struct llist_node_s *start, *end, *iter;
+	struct llist_node_s *start;	///< The first node in the list, or null.
+	struct llist_node_s *end;	///< The last node in the list, or null.
+	struct llist_node_s *iter;
+	/// Function called when deleting a list item.
+	/// \param element	The item being deleted.
+	///	\param userdata	Pointer to user data supplied to llist_new().
 	void (*freedata)(void *element, void *userdata);
-	qboolean (*cmpdata)(const void *element, const void *comparison, void *userdata);
+	qboolean (*cmpdata)(const void *element, const void *comparison,
+						void *userdata);
 	void *userdata;
 } llist_t;
 
@@ -48,8 +60,43 @@ typedef qboolean (*llist_iterator_t)(void *element, llist_node_t *node);
 #define LLIST_ICAST(x) (llist_iterator_t)(x)
 #define LLIST_DATA(node, type) ((type *)((node)->data))
 
-llist_t *llist_new (void (*freedata)(void *element, void *userdata), qboolean (*cmpdata)(const void *element, const void *comparison, void *userdata), void *userdata);
+/**	Create a new, empty, linked list.
+
+	\param freedata	Function to call when deleting a list item.
+	\param cmpdata	Function to call to compare two list items. It must
+					return true when the items are the same and false when
+					they differ.
+	\param userdata	User data pointer. Set to whatever you want, it will be
+					passed to the \a freedata and \a cmpdata functions as
+					their final parameter.
+	\return			Pointer to the list's control structure, which is to be
+					passed to the other functions accessing the list.
+*/
+llist_t *llist_new (void (*freedata)(void *element, void *userdata),
+					qboolean (*cmpdata)(const void *element,
+										const void *comparison,
+										void *userdata),
+					void *userdata);
+
+/** Empty a linked list.
+	All of the items in the list will be deleted via the list's \a freedata
+	function and the list will become empty.
+
+	\param list		Pointer to the list's control structure created by
+					llist_new(). May be null, in which case no operation is
+					performed.
+*/
 void llist_flush (llist_t *list);
+
+/** Delete a linked list.
+	All of the items in the list will be deleted via the list's \a freedata
+	function and the list will be destroyed. Do not attempt to use the list
+	pointer after destroying the list.
+
+	\param list		Pointer to the list's control structure created by
+					llist_new(). May be null, in which case no operation is
+					performed.
+*/
 void llist_delete (llist_t *list);
 llist_node_t *llist_append (llist_t *list, void *element);
 llist_node_t *llist_prefix (llist_t *list, void *element);
@@ -62,4 +109,7 @@ void llist_iterate (llist_t *list, llist_iterator_t iterate);
 void *llist_find (llist_t *list, void *comparison);
 llist_node_t *llist_findnode (llist_t *list, void *comparison);
 void *llist_createarray (llist_t *list, size_t esize);
+
+//@}
+
 #endif

From de64be1d67d4619af573c09ad4cfba20dd33fddf Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 12 Feb 2020 11:04:28 +0900
Subject: [PATCH 0353/1519] Show more info when dumping x11 video modes

Found in an old stash. Probably the start of xrandr support.
---
 libs/video/targets/context_x11.c | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/libs/video/targets/context_x11.c b/libs/video/targets/context_x11.c
index 614f83ebd..7f952aa99 100644
--- a/libs/video/targets/context_x11.c
+++ b/libs/video/targets/context_x11.c
@@ -439,19 +439,23 @@ X11_SetVidMode (int width, int height)
 										&vidmodes);
 			XF86VidModeGetModeLine (x_disp, x_screen, &dotclock, &orig_data);
 
-			if (developer->int_val & SYS_VID) {
-				Sys_Printf ("VID: %d modes\n", nummodes);
-				for (i = 0; i < nummodes; i++) {
-					Sys_Printf ("VID: %xx%d\n", vidmodes[i]->hdisplay,
-								vidmodes[i]->vdisplay);
-				}
-			}
-
+			Sys_MaskPrintf (SYS_VID, "VID: %d modes\n", nummodes);
+			original_mode = -1;
 			for (i = 0; i < nummodes; i++) {
-				if ((vidmodes[i]->hdisplay == orig_data.hdisplay) &&
-						(vidmodes[i]->vdisplay == orig_data.vdisplay)) {
+				if (original_mode == -1
+					&& (vidmodes[i]->hdisplay == orig_data.hdisplay) &&
+					   (vidmodes[i]->vdisplay == orig_data.vdisplay)) {
 					original_mode = i;
-					break;
+				}
+				if (developer->int_val & SYS_VID) {
+					Sys_Printf ("VID:%c%dx%d\n",
+								original_mode == i ? '*' : ' ',
+								vidmodes[i]->hdisplay, vidmodes[i]->vdisplay);
+					Sys_Printf ("\t%d %d %d %d:%d %d %d:%d\n",
+								vidmodes[i]->hsyncstart, vidmodes[i]->hsyncend,
+								vidmodes[i]->htotal, vidmodes[i]->hskew,
+								vidmodes[i]->vsyncstart, vidmodes[i]->vsyncend,
+								vidmodes[i]->vtotal, vidmodes[i]->flags);
 				}
 			}
 
@@ -468,8 +472,10 @@ X11_SetVidMode (int width, int height)
 				Sys_MaskPrintf (SYS_VID, "VID: Chose video mode: %dx%d\n",
 								viddef.width, viddef.height);
 
+				if (0) {
 				XF86VidModeSwitchToMode (x_disp, x_screen,
 										 vidmodes[best_mode]);
+				}
 				vidmode_active = true;
 				X11_SetScreenSaver ();
 			} else {
@@ -594,7 +600,7 @@ X11_RestoreVidMode (void)
 #ifdef HAVE_VIDMODE
 	if (vidmode_active) {
 		X11_RestoreScreenSaver ();
-		XF86VidModeSwitchToMode (x_disp, x_screen, vidmodes[original_mode]);
+		//XF86VidModeSwitchToMode (x_disp, x_screen, vidmodes[original_mode]);
 		XFree (vidmodes);
 		vidmode_active = false;
 	}

From 85a2f9f621e67b6db5691c5da01573e6671475b3 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 12 Feb 2020 16:36:01 +0900
Subject: [PATCH 0354/1519] Implement descriptor stuff

---
 include/QF/Vulkan/descriptor.h          | 123 +++++++++
 include/QF/Vulkan/funclist.h            |  11 +
 libs/video/renderer/vulkan/Makefile.am  |   1 +
 libs/video/renderer/vulkan/descriptor.c | 342 ++++++++++++++++++++++++
 4 files changed, 477 insertions(+)
 create mode 100644 include/QF/Vulkan/descriptor.h
 create mode 100644 libs/video/renderer/vulkan/descriptor.c

diff --git a/include/QF/Vulkan/descriptor.h b/include/QF/Vulkan/descriptor.h
new file mode 100644
index 000000000..ced2805a1
--- /dev/null
+++ b/include/QF/Vulkan/descriptor.h
@@ -0,0 +1,123 @@
+#ifndef __QF_Vulkan_descriptor_h
+#define __QF_Vulkan_descriptor_h
+
+typedef struct qfv_sampler_s {
+	struct qfv_device_s *device;
+	VkSampler   sampler;
+} qfv_sampler_t;
+
+typedef struct qfv_bindingset_s {
+	int         numBindings;
+	VkDescriptorSetLayoutBinding bindings[];
+} qfv_bindingset_t;
+
+typedef struct qfv_descriptorsetlayout_s {
+	struct qfv_device_s *device;
+	VkDescriptorSetLayout layout;
+} qfv_descriptorsetlayout_t;
+
+typedef struct qfv_descriptorpool_s {
+	struct qfv_device_s *device;
+	VkDescriptorPool pool;
+} qfv_descriptorpool_t;
+
+typedef struct qfv_descriptorset_s {
+	struct qfv_device_s *device;
+	qfv_descriptorpool_t *pool;
+	VkDescriptorSet set;
+} qfv_descriptorset_t;
+
+typedef struct qfv_imagedescriptorinfo_s {
+	qfv_descriptorset_t *descriptorset;
+	uint32_t    binding;
+	uint32_t    arrayElement;
+	VkDescriptorType type;
+	uint32_t    numInfo;
+	VkDescriptorImageInfo infos[];
+} qfv_imagedescriptorinfo_t;
+
+typedef struct qfv_bufferdescriptorinfo_s {
+	qfv_descriptorset_t *descriptorset;
+	uint32_t    binding;
+	uint32_t    arrayElement;
+	VkDescriptorType type;
+	uint32_t    numInfo;
+	VkDescriptorBufferInfo infos[];
+} qfv_bufferdescriptorinfo_t;
+
+typedef struct qfv_texelbufferdescriptorinfo_s {
+	qfv_descriptorset_t *descriptorset;
+	uint32_t    binding;
+	uint32_t    arrayElement;
+	VkDescriptorType type;
+	uint32_t    numInfo;
+	VkBufferView infos[];
+} qfv_texelbufferdescriptorinfo_t;
+
+typedef struct qfv_copydescriptorinfo_s {
+	qfv_descriptorset_t *dstSet;
+	uint32_t    dstBinding;
+	uint32_t    dstArrayElement;
+	qfv_descriptorset_t *srcSet;
+	uint32_t    srcBinding;
+	uint32_t    srcArrayElement;
+	uint32_t    descriptorCount;
+} qfv_copydescriptorinfo_t;
+
+qfv_sampler_t *QFV_CreateSampler (struct qfv_device_s *device,
+								  VkFilter magFilter, VkFilter minFilter,
+								  VkSamplerMipmapMode mipmapMode,
+								  VkSamplerAddressMode addressModeU,
+								  VkSamplerAddressMode addressModeV,
+								  VkSamplerAddressMode addressModeW,
+								  float mipLodBias,
+								  VkBool32 anisotryEnable, float maxAnisotropy,
+								  VkBool32 compareEnable, VkCompareOp compareOp,
+								  float minLod, float maxLod,
+								  VkBorderColor borderColor,
+								  VkBool32 unnormalizedCoordinates);
+
+qfv_bindingset_t *QFV_CreateBindingSet (int numBindings);
+void QFV_DestroyBindingSet (qfv_bindingset_t *bindingset);
+
+qfv_descriptorsetlayout_t *
+QFV_CreateDescriptorSetLayout (struct qfv_device_s *device,
+							   qfv_bindingset_t *bindings);
+
+qfv_descriptorpool_t *
+QFV_CreateDescriptorPool (struct qfv_device_s *device,
+						  VkDescriptorPoolCreateFlags flags, uint32_t maxSets,
+						  qfv_bindingset_t *bindings);
+
+qfv_descriptorset_t *
+QFV_AllocateDescriptorSet (qfv_descriptorpool_t *pool,
+						   qfv_descriptorsetlayout_t *layout);
+
+#define QFV_allocateinfo(type, num, allocator) \
+	allocator (field_offset (type, infos[num]))
+#define QFV_ImageDescriptorInfo(num, allocator) \
+	QFV_allocateinfo(qfv_imagedescriptorinfo_t, num, allocator)
+#define QFV_BufferDescriptorInfo(num, allocator) \
+	QFV_allocateinfo(qfv_bufferdescriptorinfo_t, num, allocator)
+#define QFV_TexelBufferDescriptorInfo(num, allocator) \
+	QFV_allocateinfo(qfv_texelbufferdescriptorinfo_t, num, allocator)
+
+void
+QFV_UpdateDescriptorSets (struct qfv_device_s *device,
+						  uint32_t numImageInfos,
+                          qfv_imagedescriptorinfo_t *imageInfos,
+                          uint32_t numBufferInfos,
+                          qfv_bufferdescriptorinfo_t *bufferInfos,
+                          uint32_t numTexelBufferInfos,
+                          qfv_texelbufferdescriptorinfo_t *texelbufferInfos,
+                          uint32_t numCopyInfos,
+                          qfv_copydescriptorinfo_t *copyInfos);
+
+void QFV_FreeDescriptorSet (qfv_descriptorset_t *set);
+void QFV_ResetDescriptorPool (qfv_descriptorpool_t *pool);
+void QFV_DestroyDescriptorPool (qfv_descriptorpool_t *pool);
+void QFV_DestroyDescriptorSetLayout (qfv_descriptorsetlayout_t *layout);
+void QFV_DestroySampler (qfv_sampler_t *sampler);
+
+
+#endif//__QF_Vulkan_descriptor_h
diff --git a/include/QF/Vulkan/funclist.h b/include/QF/Vulkan/funclist.h
index 1f00d0b54..e25188999 100644
--- a/include/QF/Vulkan/funclist.h
+++ b/include/QF/Vulkan/funclist.h
@@ -128,6 +128,17 @@ DEVICE_LEVEL_VULKAN_FUNCTION (vkMapMemory)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkUnmapMemory)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkFlushMappedMemoryRanges)
 
+DEVICE_LEVEL_VULKAN_FUNCTION (vkCreateSampler)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkCreateDescriptorSetLayout)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkCreateDescriptorPool)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkAllocateDescriptorSets)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkUpdateDescriptorSets)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkFreeDescriptorSets)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkResetDescriptorPool)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkDestroyDescriptorPool)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkDestroyDescriptorSetLayout)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkDestroySampler)
+
 DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdPipelineBarrier)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdCopyBuffer)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdCopyBufferToImage)
diff --git a/libs/video/renderer/vulkan/Makefile.am b/libs/video/renderer/vulkan/Makefile.am
index ba9b64948..ec888d6cd 100644
--- a/libs/video/renderer/vulkan/Makefile.am
+++ b/libs/video/renderer/vulkan/Makefile.am
@@ -6,6 +6,7 @@ AM_CPPFLAGS= -I$(top_srcdir)/include -DVK_NO_PROTOTYPES
 vulkan_src = \
 	buffer.c \
 	command.c \
+	descriptor.c \
 	device.c \
 	image.c \
 	instance.c \
diff --git a/libs/video/renderer/vulkan/descriptor.c b/libs/video/renderer/vulkan/descriptor.c
new file mode 100644
index 000000000..4662cb9b4
--- /dev/null
+++ b/libs/video/renderer/vulkan/descriptor.c
@@ -0,0 +1,342 @@
+/*
+	descriptor.c
+
+	Vulkan descriptor functions
+
+	Copyright (C) 1996-1997 Id Software, Inc.
+	Copyright (C) 2020      Bill Currie <bill@taniwha.org>
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifdef HAVE_MATH_H
+# include <math.h>
+#endif
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+
+#include "QF/cvar.h"
+#include "QF/dstring.h"
+#include "QF/hash.h"
+#include "QF/input.h"
+#include "QF/mathlib.h"
+#include "QF/qargs.h"
+#include "QF/quakefs.h"
+#include "QF/sys.h"
+#include "QF/va.h"
+#include "QF/vid.h"
+#include "QF/Vulkan/qf_vid.h"
+#include "QF/Vulkan/descriptor.h"
+#include "QF/Vulkan/device.h"
+#include "QF/Vulkan/instance.h"
+
+#include "compat.h"
+#include "d_iface.h"
+#include "r_internal.h"
+#include "vid_vulkan.h"
+
+#include "util.h"
+
+qfv_sampler_t *
+QFV_CreateSampler (qfv_device_t *device,
+				   VkFilter magFilter, VkFilter minFilter,
+                   VkSamplerMipmapMode mipmapMode,
+                   VkSamplerAddressMode addressModeU,
+                   VkSamplerAddressMode addressModeV,
+                   VkSamplerAddressMode addressModeW,
+                   float mipLodBias,
+                   VkBool32 anisotryEnable, float maxAnisotropy,
+                   VkBool32 compareEnable, VkCompareOp compareOp,
+                   float minLod, float maxLod,
+                   VkBorderColor borderColor,
+                   VkBool32 unnormalizedCoordinates)
+{
+	VkDevice    dev = device->dev;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	VkSamplerCreateInfo createInfo = {
+		VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO, 0,
+		0,
+		magFilter, minFilter, mipmapMode,
+		addressModeU, addressModeV, addressModeW,
+		mipLodBias,
+		anisotryEnable, maxAnisotropy,
+		compareEnable, compareOp,
+		minLod, maxLod,
+		borderColor, unnormalizedCoordinates,
+	};
+
+	qfv_sampler_t *sampler = malloc (sizeof (*sampler));
+	sampler->device = device;
+	dfunc->vkCreateSampler (dev, &createInfo, 0, &sampler->sampler);
+	return sampler;
+}
+
+qfv_bindingset_t *
+QFV_CreateBindingSet (int numBindings)
+{
+	qfv_bindingset_t *bindingset;
+	bindingset = malloc (field_offset (qfv_bindingset_t,
+									   bindings[numBindings]));
+	bindingset->numBindings = numBindings;
+	return bindingset;
+}
+
+void
+QFV_DestroyBindingSet (qfv_bindingset_t *bindingset)
+{
+	free (bindingset);
+}
+
+qfv_descriptorsetlayout_t *
+QFV_CreateDescriptorSetLayout (qfv_device_t *device,
+                               qfv_bindingset_t *bindingset)
+{
+	VkDevice    dev = device->dev;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	VkDescriptorSetLayoutCreateInfo createInfo = {
+		VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO, 0,
+		0,
+		bindingset->numBindings, bindingset->bindings,
+	};
+
+	qfv_descriptorsetlayout_t *layout = malloc (sizeof (layout));
+	layout->device = device;
+	dfunc->vkCreateDescriptorSetLayout (dev, &createInfo, 0, &layout->layout);
+	return layout;
+}
+
+// There are currently only 13 descriptor types, so 16 should be plenty
+static VkDescriptorPoolSize poolsize_pool[16];
+static VkDescriptorPoolSize *poolsize_next;
+
+static uintptr_t
+poolsize_gethash (const void *ele, void *unused)
+{
+	const VkDescriptorPoolSize *poolsize = ele;
+	return poolsize->type;
+}
+
+static int
+poolsize_compmare (const void *ele1, const void *ele2, void *unused)
+{
+	const VkDescriptorPoolSize *poolsize1 = ele1;
+	const VkDescriptorPoolSize *poolsize2 = ele2;
+	return poolsize1->type == poolsize2->type;
+}
+
+//FIXME not thread-safe
+qfv_descriptorpool_t *
+QFV_CreateDescriptorPool (qfv_device_t *device,
+						  VkDescriptorPoolCreateFlags flags, uint32_t maxSets,
+                          qfv_bindingset_t *bindings)
+{
+	VkDevice    dev = device->dev;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	static hashtab_t *poolsizes;
+
+	if (!poolsizes) {
+		poolsizes = Hash_NewTable (16, 0, 0, 0);
+		Hash_SetHashCompare (poolsizes, poolsize_gethash, poolsize_compmare);
+	} else {
+		Hash_FlushTable (poolsizes);
+	}
+	poolsize_next = poolsize_pool;
+
+	VkDescriptorPoolSize *ps;
+	for (int i = 0; i < bindings->numBindings; i++) {
+		VkDescriptorPoolSize test = { bindings->bindings[i].descriptorType, 0 };
+		ps = Hash_FindElement (poolsizes, &test);
+		if (!ps) {
+			ps = poolsize_next++;
+			if ((size_t) (poolsize_next - poolsize_pool)
+				> sizeof (poolsize_pool) / sizeof (poolsize_pool[0])) {
+				Sys_Error ("Too many descriptor types");
+			}
+			Hash_AddElement (poolsizes, ps);
+		}
+		//XXX is descriptorCount correct?
+		//FIXME assumes only one layout is used with this pool
+		ps->descriptorCount += bindings->bindings[i].descriptorCount * maxSets;
+	}
+
+	VkDescriptorPoolCreateInfo createInfo = {
+		VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO, 0,
+		flags, maxSets, ps - poolsize_pool, poolsize_pool,
+	};
+
+	qfv_descriptorpool_t *descriptorpool = malloc (sizeof (descriptorpool));
+	descriptorpool->device = device;
+	dfunc->vkCreateDescriptorPool (dev, &createInfo, 0, &descriptorpool->pool);
+	return descriptorpool;
+}
+
+qfv_descriptorset_t *
+QFV_AllocateDescriptorSet (qfv_descriptorpool_t *pool,
+                           qfv_descriptorsetlayout_t *layout)
+{
+	qfv_device_t *device = pool->device;
+	VkDevice    dev = device->dev;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	VkDescriptorSetAllocateInfo allocateInfo = {
+		VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO, 0,
+		pool->pool, 1, &layout->layout,
+	};
+
+	qfv_descriptorset_t *descriptorset = malloc (sizeof (*descriptorset));
+	descriptorset->device = device;
+	descriptorset->pool = pool;
+	dfunc->vkAllocateDescriptorSets (dev, &allocateInfo, &descriptorset->set);
+	return descriptorset;
+}
+
+void
+QFV_UpdateDescriptorSets (qfv_device_t *device,
+						  uint32_t numImageInfos,
+						  qfv_imagedescriptorinfo_t *imageInfos,
+						  uint32_t numBufferInfos,
+						  qfv_bufferdescriptorinfo_t *bufferInfos,
+						  uint32_t numTexelBufferInfos,
+						  qfv_texelbufferdescriptorinfo_t *texelbufferInfos,
+						  uint32_t numCopyInfos,
+						  qfv_copydescriptorinfo_t *copyInfos)
+{
+	VkDevice    dev = device->dev;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	uint32_t numWrite = 0;
+	numWrite += numImageInfos;
+	numWrite += numBufferInfos;
+	numWrite += numTexelBufferInfos;
+	VkWriteDescriptorSet *writeSets = alloca (numWrite * sizeof (*writeSets));
+	VkWriteDescriptorSet *writeSet = writeSets;
+	for (uint32_t i = 0; i < numImageInfos; i++, writeSet++) {
+		writeSet->sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
+		writeSet->pNext = 0;
+		writeSet->dstSet = imageInfos[i].descriptorset->set;
+		writeSet->dstBinding = imageInfos[i].binding;
+		writeSet->dstArrayElement = imageInfos[i].arrayElement;
+		writeSet->descriptorCount = imageInfos[i].numInfo;
+		writeSet->descriptorType = imageInfos[i].type;
+		writeSet->pImageInfo = imageInfos[i].infos;
+		writeSet->pBufferInfo = 0;
+		writeSet->pTexelBufferView = 0;
+	}
+	for (uint32_t i = 0; i < numBufferInfos; i++, writeSet++) {
+		writeSet->sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
+		writeSet->pNext = 0;
+		writeSet->dstSet = bufferInfos[i].descriptorset->set;
+		writeSet->dstBinding = bufferInfos[i].binding;
+		writeSet->dstArrayElement = bufferInfos[i].arrayElement;
+		writeSet->descriptorCount = bufferInfos[i].numInfo;
+		writeSet->descriptorType = bufferInfos[i].type;
+		writeSet->pImageInfo = 0;
+		writeSet->pBufferInfo = bufferInfos[i].infos;
+		writeSet->pTexelBufferView = 0;
+	}
+	for (uint32_t i = 0; i < numTexelBufferInfos; i++, writeSet++) {
+		writeSet->sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
+		writeSet->pNext = 0;
+		writeSet->dstSet = bufferInfos[i].descriptorset->set;
+		writeSet->dstBinding = texelbufferInfos[i].binding;
+		writeSet->dstArrayElement = texelbufferInfos[i].arrayElement;
+		writeSet->descriptorCount = texelbufferInfos[i].numInfo;
+		writeSet->descriptorType = texelbufferInfos[i].type;
+		writeSet->pImageInfo = 0;
+		writeSet->pBufferInfo = 0;
+		writeSet->pTexelBufferView = texelbufferInfos[i].infos;
+	}
+	VkCopyDescriptorSet *copySets = alloca (numWrite * sizeof (*copySets));
+	VkCopyDescriptorSet *copySet = copySets;
+	for (uint32_t i = 0; i < numCopyInfos; i++, copySet++) {
+		copySet->sType = VK_STRUCTURE_TYPE_COPY_DESCRIPTOR_SET;
+		copySet->pNext = 0;
+		copySet->srcSet = copyInfos[i].srcSet->set;
+		copySet->srcBinding = copyInfos[i].srcBinding;
+		copySet->srcArrayElement = copyInfos[i].srcArrayElement;
+		copySet->dstSet = copyInfos[i].dstSet->set;
+		copySet->dstBinding = copyInfos[i].dstBinding;
+		copySet->dstArrayElement = copyInfos[i].dstArrayElement;
+		copySet->descriptorCount = copyInfos[i].descriptorCount;
+	}
+	dfunc->vkUpdateDescriptorSets (dev, numWrite, writeSets,
+								   numCopyInfos, copySets);
+}
+
+void
+QFV_FreeDescriptorSet (qfv_descriptorset_t *set)
+{
+	qfv_device_t *device = set->device;
+	VkDevice    dev = device->dev;
+	qfv_devfuncs_t *dfunc = device->funcs;
+	VkDescriptorPool pool = set->pool->pool;
+
+	dfunc->vkFreeDescriptorSets (dev, pool, 1, &set->set);
+}
+
+void
+QFV_ResetDescriptorPool (qfv_descriptorpool_t *pool)
+{
+	qfv_device_t *device = pool->device;
+	VkDevice    dev = device->dev;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	dfunc->vkResetDescriptorPool (dev, pool->pool, 0);
+}
+
+void
+QFV_DestroyDescriptorPool (qfv_descriptorpool_t *pool)
+{
+	qfv_device_t *device = pool->device;
+	VkDevice    dev = device->dev;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	dfunc->vkDestroyDescriptorPool (dev, pool->pool, 0);
+}
+
+void
+QFV_DestroyDescriptorSetLayout (qfv_descriptorsetlayout_t *layout)
+{
+	qfv_device_t *device = layout->device;
+	VkDevice    dev = device->dev;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	dfunc->vkDestroyDescriptorSetLayout (dev, layout->layout, 0);
+}
+
+void
+QFV_DestroySampler (qfv_sampler_t *sampler)
+{
+	qfv_device_t *device = sampler->device;
+	VkDevice    dev = device->dev;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	dfunc->vkDestroySampler (dev, sampler->sampler, 0);
+}

From 44f5b134e6d2589071842a4fab5f7930a59c721d Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 12 Feb 2020 18:55:22 +0900
Subject: [PATCH 0355/1519] Free custom descriptor structs

Forgot this earlier
---
 libs/video/renderer/vulkan/descriptor.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libs/video/renderer/vulkan/descriptor.c b/libs/video/renderer/vulkan/descriptor.c
index 4662cb9b4..d0b2031c1 100644
--- a/libs/video/renderer/vulkan/descriptor.c
+++ b/libs/video/renderer/vulkan/descriptor.c
@@ -319,6 +319,7 @@ QFV_DestroyDescriptorPool (qfv_descriptorpool_t *pool)
 	qfv_devfuncs_t *dfunc = device->funcs;
 
 	dfunc->vkDestroyDescriptorPool (dev, pool->pool, 0);
+	free (pool);
 }
 
 void
@@ -329,6 +330,7 @@ QFV_DestroyDescriptorSetLayout (qfv_descriptorsetlayout_t *layout)
 	qfv_devfuncs_t *dfunc = device->funcs;
 
 	dfunc->vkDestroyDescriptorSetLayout (dev, layout->layout, 0);
+	free (layout);
 }
 
 void
@@ -339,4 +341,5 @@ QFV_DestroySampler (qfv_sampler_t *sampler)
 	qfv_devfuncs_t *dfunc = device->funcs;
 
 	dfunc->vkDestroySampler (dev, sampler->sampler, 0);
+	free (sampler);
 }

From 61036378e2d7670f2de5564ee94c23bd71c2ef02 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 12 Feb 2020 18:55:51 +0900
Subject: [PATCH 0356/1519] Implement render pass stuff

---
 include/QF/Vulkan/command.h             |  12 ++
 include/QF/Vulkan/funclist.h            |   8 ++
 include/QF/Vulkan/renderpass.h          |  72 +++++++++++
 libs/video/renderer/vulkan/Makefile.am  |   1 +
 libs/video/renderer/vulkan/command.c    |  42 +++++++
 libs/video/renderer/vulkan/renderpass.c | 151 ++++++++++++++++++++++++
 6 files changed, 286 insertions(+)
 create mode 100644 include/QF/Vulkan/renderpass.h
 create mode 100644 libs/video/renderer/vulkan/renderpass.c

diff --git a/include/QF/Vulkan/command.h b/include/QF/Vulkan/command.h
index 9326617ca..ffb462b98 100644
--- a/include/QF/Vulkan/command.h
+++ b/include/QF/Vulkan/command.h
@@ -92,6 +92,8 @@ void QFV_CmdPipelineBarrier (qfv_cmdbuffer_t *cmdBuffer,
 
 struct qfv_buffer_s;
 struct qfv_image_s;
+struct qfv_renderpass_s;
+struct qfv_framebuffer_s;
 void QFV_CmdCopyBuffer (qfv_cmdbuffer_t *cmdBuffer,
 						struct qfv_buffer_s *src, struct qfv_buffer_s *dst,
 						VkBufferCopy *regions, uint32_t numRegions);
@@ -107,5 +109,15 @@ void QFV_CmdCopyImageToBuffer (qfv_cmdbuffer_t *cmdBuffer,
 							   struct qfv_buffer_s *dst,
 							   VkBufferImageCopy *regions,
 							   uint32_t numRegions);
+void QFV_CmdBeginRenderPass (qfv_cmdbuffer_t *cmdBuffer,
+							 struct qfv_renderpass_s *renderPass,
+							 struct qfv_framebuffer_s *framebuffer,
+							 VkRect2D renderArea,
+							 uint32_t numClearValues,
+							 VkClearValue *clearValues,
+							 VkSubpassContents subpassContents);
+void QFV_CmdNextSubpass (qfv_cmdbuffer_t *cmdBuffer,
+						 VkSubpassContents subpassContents);
+void QFV_CmdEndRenderPass (qfv_cmdbuffer_t *cmdBuffer);
 
 #endif//__QF_Vulkan_command_h
diff --git a/include/QF/Vulkan/funclist.h b/include/QF/Vulkan/funclist.h
index e25188999..f51e53478 100644
--- a/include/QF/Vulkan/funclist.h
+++ b/include/QF/Vulkan/funclist.h
@@ -139,10 +139,18 @@ DEVICE_LEVEL_VULKAN_FUNCTION (vkDestroyDescriptorPool)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkDestroyDescriptorSetLayout)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkDestroySampler)
 
+DEVICE_LEVEL_VULKAN_FUNCTION (vkCreateRenderPass)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkCreateFramebuffer)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkDestroyRenderPass)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkDestroyFramebuffer)
+
 DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdPipelineBarrier)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdCopyBuffer)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdCopyBufferToImage)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdCopyImageToBuffer)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdBeginRenderPass)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdNextSubpass)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdEndRenderPass)
 
 #undef DEVICE_LEVEL_VULKAN_FUNCTION
 
diff --git a/include/QF/Vulkan/renderpass.h b/include/QF/Vulkan/renderpass.h
new file mode 100644
index 000000000..c8fdc2965
--- /dev/null
+++ b/include/QF/Vulkan/renderpass.h
@@ -0,0 +1,72 @@
+#ifndef __QF_Vulkan_renderpass_h
+#define __QF_Vulkan_renderpass_h
+
+typedef struct qfv_attachmentdescription_s {
+	uint32_t    numAttachments;
+	VkAttachmentDescription attachments[];
+} qfv_attachmentdescription_t;
+
+#define QFV_AllocAttachmentDescription(num, allocator) \
+	allocator (field_offset (qfv_attachmentdescription_t, attachments[num]))
+
+typedef struct qfv_attachmentreference_s {
+	uint32_t    numReferences;
+	VkAttachmentReference references[];
+} qfv_attachmentreference_t;
+
+#define QFV_AllocAttachmentReference(num, allocator) \
+	allocator (field_offset (qfv_attachmentreference_t, references[num]))
+
+typedef struct qfv_subpassparameters_s {
+	VkPipelineBindPoint pipelineBindPoint;
+	qfv_attachmentreference_t *inputAttachments;
+	qfv_attachmentreference_t *colorAttachments;
+	qfv_attachmentreference_t *resolveAttachments;
+	VkAttachmentReference *depthStencilAttachment;
+	uint32_t    numPreserve;
+	uint32_t   *preserveAttachments;
+} qfv_subpassparameters_t;
+
+typedef struct qfv_subpassparametersset_s {
+	uint32_t    numSubpasses;
+	qfv_subpassparameters_t subpasses[];
+} qfv_subpassparametersset_t;
+
+#define QFV_AllocSubpassParametersSet(num, allocator) \
+	allocator (field_offset (qfv_subpassparametersset_t, subpasses[num]))
+
+typedef struct qfv_subpassdependency_s {
+	uint32_t    numDependencies;
+	VkSubpassDependency dependencies[];
+} qfv_subpassdependency_t;
+
+#define QFV_AllocSubpassDependencies(num, allocator) \
+	allocator (field_offset (qfv_subpassdependency_t, dependencies[num]))
+
+typedef struct qfv_renderpass_s {
+	struct qfv_device_s *device;
+	VkRenderPass renderPass;
+} qfv_renderpass_t;
+
+typedef struct qfv_framebuffer_s {
+	struct qfv_device_s *device;
+	VkFramebuffer framebuffer;
+} qfv_framebuffer_t;
+
+qfv_renderpass_t *
+QFV_CreateRenderPass (struct qfv_device_s *device,
+					  qfv_attachmentdescription_t *attachments,
+					  qfv_subpassparametersset_t *subpasses,
+					  qfv_subpassdependency_t *dependencies);
+
+struct qfv_imageview_s;
+qfv_framebuffer_t *
+QFV_CreateFramebuffer (qfv_renderpass_t *renderPass,
+					   uint32_t numAttachments,
+					   struct qfv_imageview_s **attachments,
+					   uint32_t width, uint32_t height, uint32_t layers);
+
+void QFV_DestroyFramebuffer (qfv_framebuffer_t *framebuffer);
+void QFV_DestroyRenderPass (qfv_renderpass_t *renderPass);
+
+#endif//__QF_Vulkan_renderpass_h
diff --git a/libs/video/renderer/vulkan/Makefile.am b/libs/video/renderer/vulkan/Makefile.am
index ec888d6cd..936dd504d 100644
--- a/libs/video/renderer/vulkan/Makefile.am
+++ b/libs/video/renderer/vulkan/Makefile.am
@@ -11,6 +11,7 @@ vulkan_src = \
 	image.c \
 	instance.c \
 	memory.c \
+	renderpass.c \
 	swapchain.c \
 	util.c \
 	vulkan_draw.c \
diff --git a/libs/video/renderer/vulkan/command.c b/libs/video/renderer/vulkan/command.c
index 46c2ed83f..15e884b64 100644
--- a/libs/video/renderer/vulkan/command.c
+++ b/libs/video/renderer/vulkan/command.c
@@ -51,6 +51,7 @@
 #include "QF/Vulkan/qf_vid.h"
 #include "QF/Vulkan/buffer.h"//FIXME should QFV_CmdPipelineBarrier be here?
 #include "QF/Vulkan/image.h"//FIXME should QFV_CmdPipelineBarrier be here?
+#include "QF/Vulkan/renderpass.h"//FIXME should QFV_CmdPipelineBarrier be here?
 #include "QF/Vulkan/command.h"
 #include "QF/Vulkan/device.h"
 #include "QF/Vulkan/instance.h"
@@ -462,3 +463,44 @@ QFV_CmdCopyImageToBuffer (qfv_cmdbuffer_t *cmdBuffer,
 	dfunc->vkCmdCopyImageToBuffer (cmdBuffer->buffer, src->image, layout,
 								   dst->buffer, numRegions, regions);
 }
+
+void
+QFV_CmdBeginRenderPass (qfv_cmdbuffer_t *cmdBuffer,
+						qfv_renderpass_t *renderPass,
+						qfv_framebuffer_t *framebuffer,
+						VkRect2D renderArea,
+						uint32_t numClearValues,
+						VkClearValue *clearValues,
+						VkSubpassContents subpassContents)
+{
+	qfv_device_t *device = cmdBuffer->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	VkRenderPassBeginInfo beginInfo = {
+		VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO, 0,
+		renderPass->renderPass, framebuffer->framebuffer, renderArea,
+		numClearValues, clearValues,
+	};
+
+	dfunc->vkCmdBeginRenderPass (cmdBuffer->buffer, &beginInfo,
+								 subpassContents);
+}
+
+void
+QFV_CmdNextSubpass (qfv_cmdbuffer_t *cmdBuffer,
+					VkSubpassContents subpassContents)
+{
+	qfv_device_t *device = cmdBuffer->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	dfunc->vkCmdNextSubpass (cmdBuffer->buffer, subpassContents);
+}
+
+void
+QFV_CmdEndRenderPass (qfv_cmdbuffer_t *cmdBuffer)
+{
+	qfv_device_t *device = cmdBuffer->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	dfunc->vkCmdEndRenderPass (cmdBuffer->buffer);
+}
diff --git a/libs/video/renderer/vulkan/renderpass.c b/libs/video/renderer/vulkan/renderpass.c
new file mode 100644
index 000000000..9c1064192
--- /dev/null
+++ b/libs/video/renderer/vulkan/renderpass.c
@@ -0,0 +1,151 @@
+/*
+	descriptor.c
+
+	Vulkan descriptor functions
+
+	Copyright (C) 1996-1997 Id Software, Inc.
+	Copyright (C) 2020      Bill Currie <bill@taniwha.org>
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifdef HAVE_MATH_H
+# include <math.h>
+#endif
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+
+#include "QF/cvar.h"
+#include "QF/dstring.h"
+#include "QF/hash.h"
+#include "QF/input.h"
+#include "QF/mathlib.h"
+#include "QF/qargs.h"
+#include "QF/quakefs.h"
+#include "QF/sys.h"
+#include "QF/va.h"
+#include "QF/vid.h"
+#include "QF/Vulkan/qf_vid.h"
+#include "QF/Vulkan/device.h"
+#include "QF/Vulkan/image.h"
+#include "QF/Vulkan/instance.h"
+#include "QF/Vulkan/renderpass.h"
+
+#include "compat.h"
+#include "d_iface.h"
+#include "r_internal.h"
+#include "vid_vulkan.h"
+
+#include "util.h"
+
+qfv_renderpass_t *
+QFV_CreateRenderPass (qfv_device_t *device,
+					  qfv_attachmentdescription_t *attachments,
+					  qfv_subpassparametersset_t *subpassparams,
+					  qfv_subpassdependency_t *dependencies)
+{
+	VkDevice    dev = device->dev;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	VkSubpassDescription *subpasses = alloca (subpassparams->numSubpasses
+											  * sizeof (*subpasses));
+
+	for (uint32_t i =  0; i < subpassparams->numSubpasses; i++) {
+		qfv_subpassparameters_t *params = &subpassparams->subpasses[i];
+		subpasses[i].flags = 0;
+		subpasses[i].pipelineBindPoint = params->pipelineBindPoint;
+		subpasses[i].inputAttachmentCount = params->inputAttachments->numReferences;
+		subpasses[i].pInputAttachments = params->inputAttachments->references;
+		subpasses[i].colorAttachmentCount = params->colorAttachments->numReferences;
+		subpasses[i].pColorAttachments = params->colorAttachments->references;
+		if (params->resolveAttachments) {
+			subpasses[i].pResolveAttachments = params->resolveAttachments->references;
+		}
+		subpasses[i].pDepthStencilAttachment = params->depthStencilAttachment;
+		subpasses[i].preserveAttachmentCount = params->numPreserve;
+		subpasses[i].pPreserveAttachments = params->preserveAttachments;
+	}
+
+	VkRenderPassCreateInfo createInfo = {
+		VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO, 0, 0,
+		attachments->numAttachments, attachments->attachments,
+		subpassparams->numSubpasses, subpasses,
+		dependencies->numDependencies, dependencies->dependencies,
+	};
+
+	qfv_renderpass_t *renderpass = malloc (sizeof (*renderpass));
+	renderpass->device = device;
+	dfunc->vkCreateRenderPass (dev, &createInfo, 0, &renderpass->renderPass);
+	return renderpass;
+}
+
+qfv_framebuffer_t *
+QFV_CreateFramebuffer (qfv_renderpass_t *renderPass,
+					   uint32_t numAttachments, qfv_imageview_t **attachments,
+					   uint32_t width, uint32_t height, uint32_t layers)
+{
+	qfv_device_t *device = renderPass->device;
+	VkDevice    dev = device->dev;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	VkImageView *views = alloca (numAttachments * sizeof (*views));
+	for (uint32_t i = 0; i < numAttachments; i++) {
+		views[i] = attachments[i]->view;
+	}
+
+	VkFramebufferCreateInfo createInfo = {
+		VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO, 0, 0,
+		renderPass->renderPass, numAttachments, views, width, height, layers,
+	};
+
+	qfv_framebuffer_t *framebuffer = malloc (sizeof (*framebuffer));
+	framebuffer->device = device;
+	dfunc->vkCreateFramebuffer (dev, &createInfo, 0, &framebuffer->framebuffer);
+	return framebuffer;
+}
+
+void
+QFV_DestroyFramebuffer (qfv_framebuffer_t *framebuffer)
+{
+	qfv_device_t *device = framebuffer->device;
+	VkDevice    dev = device->dev;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	dfunc->vkDestroyFramebuffer (dev, framebuffer->framebuffer, 0);
+	free (framebuffer);
+}
+
+void
+QFV_DestroyRenderPass (qfv_renderpass_t *renderPass)
+{
+	qfv_device_t *device = renderPass->device;
+	VkDevice    dev = device->dev;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	dfunc->vkDestroyRenderPass (dev, renderPass->renderPass, 0);
+	free (renderPass);
+}

From 69c110193aefc07a8c1fdd9792071542c1d79050 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 13 Feb 2020 04:20:54 +0900
Subject: [PATCH 0357/1519] Fix a thinko

Wrong var for computing number of slots used.
---
 libs/video/renderer/vulkan/descriptor.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/video/renderer/vulkan/descriptor.c b/libs/video/renderer/vulkan/descriptor.c
index d0b2031c1..cc9cce6d4 100644
--- a/libs/video/renderer/vulkan/descriptor.c
+++ b/libs/video/renderer/vulkan/descriptor.c
@@ -188,7 +188,7 @@ QFV_CreateDescriptorPool (qfv_device_t *device,
 
 	VkDescriptorPoolCreateInfo createInfo = {
 		VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO, 0,
-		flags, maxSets, ps - poolsize_pool, poolsize_pool,
+		flags, maxSets, poolsize_next - poolsize_pool, poolsize_pool,
 	};
 
 	qfv_descriptorpool_t *descriptorpool = malloc (sizeof (descriptorpool));

From 53b46f05416ca3eaa8ad00180d3d0b074a60152d Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 13 Feb 2020 04:21:35 +0900
Subject: [PATCH 0358/1519] Implement pipeline stuff

---
 include/QF/Vulkan/command.h            |   4 +
 include/QF/Vulkan/descriptor.h         |   9 +
 include/QF/Vulkan/funclist.h           |  13 +
 include/QF/Vulkan/pipeline.h           | 244 ++++++++++++
 libs/video/renderer/vulkan/Makefile.am |   1 +
 libs/video/renderer/vulkan/command.c   |  12 +
 libs/video/renderer/vulkan/pipeline.c  | 525 +++++++++++++++++++++++++
 7 files changed, 808 insertions(+)
 create mode 100644 include/QF/Vulkan/pipeline.h
 create mode 100644 libs/video/renderer/vulkan/pipeline.c

diff --git a/include/QF/Vulkan/command.h b/include/QF/Vulkan/command.h
index ffb462b98..c1d54d43d 100644
--- a/include/QF/Vulkan/command.h
+++ b/include/QF/Vulkan/command.h
@@ -119,5 +119,9 @@ void QFV_CmdBeginRenderPass (qfv_cmdbuffer_t *cmdBuffer,
 void QFV_CmdNextSubpass (qfv_cmdbuffer_t *cmdBuffer,
 						 VkSubpassContents subpassContents);
 void QFV_CmdEndRenderPass (qfv_cmdbuffer_t *cmdBuffer);
+struct qfv_pipeline_s;
+void QFV_CmdBindPipeline (qfv_cmdbuffer_t *cmdBuffer,
+						  VkPipelineBindPoint bindPoint,
+						  struct qfv_pipeline_s *pipeline);
 
 #endif//__QF_Vulkan_command_h
diff --git a/include/QF/Vulkan/descriptor.h b/include/QF/Vulkan/descriptor.h
index ced2805a1..48a1cd92d 100644
--- a/include/QF/Vulkan/descriptor.h
+++ b/include/QF/Vulkan/descriptor.h
@@ -16,6 +16,15 @@ typedef struct qfv_descriptorsetlayout_s {
 	VkDescriptorSetLayout layout;
 } qfv_descriptorsetlayout_t;
 
+typedef struct qfv_descriptorsetlayoutset_s {
+	uint32_t    numLayouts;
+	qfv_descriptorsetlayout_t *layouts[];
+} qfv_descriptorsetlayoutset_t;
+
+#define QFV_AllocDescriptorSetLayoutSet(num, allocator) \
+    allocator (field_offset (qfv_descriptorsetlayoutset_t, layouts[num]))
+
+
 typedef struct qfv_descriptorpool_s {
 	struct qfv_device_s *device;
 	VkDescriptorPool pool;
diff --git a/include/QF/Vulkan/funclist.h b/include/QF/Vulkan/funclist.h
index f51e53478..5bacf29eb 100644
--- a/include/QF/Vulkan/funclist.h
+++ b/include/QF/Vulkan/funclist.h
@@ -144,6 +144,18 @@ DEVICE_LEVEL_VULKAN_FUNCTION (vkCreateFramebuffer)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkDestroyRenderPass)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkDestroyFramebuffer)
 
+DEVICE_LEVEL_VULKAN_FUNCTION (vkCreateShaderModule)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkDestroyShaderModule)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkCreatePipelineCache)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkGetPipelineCacheData)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkMergePipelineCaches)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkDestroyPipelineCache)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkCreatePipelineLayout)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkDestroyPipelineLayout)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkCreateGraphicsPipelines)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkCreateComputePipelines)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkDestroyPipeline)
+
 DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdPipelineBarrier)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdCopyBuffer)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdCopyBufferToImage)
@@ -151,6 +163,7 @@ DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdCopyImageToBuffer)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdBeginRenderPass)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdNextSubpass)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdEndRenderPass)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdBindPipeline)
 
 #undef DEVICE_LEVEL_VULKAN_FUNCTION
 
diff --git a/include/QF/Vulkan/pipeline.h b/include/QF/Vulkan/pipeline.h
new file mode 100644
index 000000000..6a532102b
--- /dev/null
+++ b/include/QF/Vulkan/pipeline.h
@@ -0,0 +1,244 @@
+#ifndef __QF_Vulkan_pipeline_h
+#define __QF_Vulkan_pipeline_h
+
+typedef struct qfv_shadermodule_s {
+	struct qfv_device_s *device;
+	VkShaderModule module;
+} qfv_shadermodule_t;
+
+typedef struct qfv_shaderstageparams_s {
+	VkShaderStageFlagBits stageFlags;
+	qfv_shadermodule_t *module;
+	const char *entryPointName;
+	const VkSpecializationInfo *specializationInfo;
+} qfv_shaderstageparams_t;
+
+typedef struct qfv_shaderstageparamsset_s {
+	uint32_t    numParams;
+	qfv_shaderstageparams_t params[];
+} qfv_shaderstageparamsset_t;
+
+#define QFV_AllocShaderParamsSet(num, allocator) \
+    allocator (field_offset (qfv_shaderstageparamsset_t, params[num]))
+
+typedef struct qfv_vertexinputbindingset_s {
+	uint32_t    numBindings;
+	VkVertexInputBindingDescription bindings[];
+} qfv_vertexinputbindingset_t;
+
+#define QFV_AllocVertexInputBindingSet(num, allocator) \
+    allocator (field_offset (qfv_vertexinputbindingset_t, bindings[num]))
+
+typedef struct qfv_vertexinputattributeset_s {
+	uint32_t    numAttributes;
+	VkVertexInputAttributeDescription attributes[];
+} qfv_vertexinputattributeset_t;
+
+#define QFV_AllocVertexInputAttributeSet(num, allocator) \
+    allocator (field_offset (qfv_vertexinputattributeset_t, bindings[num]))
+
+typedef struct qfv_vertexinputstate_s {
+	qfv_vertexinputbindingset_t *bindings;
+	qfv_vertexinputattributeset_t *attributes;
+} qfv_vertexinputstate_t;
+
+typedef struct qfv_pipelineinputassembly_s {
+	VkPrimitiveTopology topology;
+	VkBool32    primativeRestartEnable;
+} qfv_pipelineinputassembly_t;
+
+typedef struct qfv_pipelinetessellation_s {
+	uint32_t    patchControlPoints;
+} qfv_pipelinetessellation_t;
+
+typedef struct qfv_viewportset_s {
+	uint32_t    numViewports;
+	VkViewport  viewports[];
+} qfv_viewportset_t;
+
+#define QFV_AllocViewportSet(num, allocator) \
+    allocator (field_offset (qfv_viewportset_t, viewports[num]))
+
+typedef struct qfv_scissorsset_s {
+	uint32_t    numScissors;
+	VkRect2D    scissors[];
+} qfv_scissorsset_t;
+
+#define QFV_AllocScissorsSet(num, allocator) \
+    allocator (field_offset (qfv_scissorsset_t, scissors[num]))
+
+typedef struct qfv_viewportinfo_s {
+	qfv_viewportset_t *viewportset;
+	qfv_scissorsset_t *scissorsset;
+} qfv_viewportinfo_t;
+
+typedef struct qfv_pipelinerasterization_s {
+	VkBool32    depthClampEnable;
+	VkBool32    rasterizerDiscardEnable;
+	VkPolygonMode polygonMode;
+	VkCullModeFlags cullMode;
+	VkFrontFace frontFace;
+	VkBool32    depthBiasEnable;
+	float       depthBiasConstantFactor;
+	float       depthBiasClamp;
+	float       depthBiasSlopeFactor;
+	float       lineWidth;
+} qfv_pipelinerasterization_t;
+
+typedef struct qfv_pipelinemultisample_s {
+	VkSampleCountFlagBits rasterizationSamples;
+	VkBool32    sampleShadingEnable;
+	float       minSampleShading;
+	const VkSampleMask *sampleMask;
+	VkBool32    alphaToCoverageEnable;
+	VkBool32    alphaToOneEnable;
+} qfv_pipelinemultisample_t;
+
+typedef struct qfv_pipelinedepthandstencil_s {
+	VkBool32    depthTestEnable;
+	VkBool32    depthWriteEnable;
+	VkCompareOp depthCompareOp;
+	VkBool32    depthBoundsTestEnable;
+	VkBool32    stencilTestEnable;
+	VkStencilOpState front;
+	VkStencilOpState back;
+	float       minDepthBounds;
+	float       maxDepthBounds;
+} qfv_pipelinedepthandstencil_t;
+
+typedef struct qfv_blendattachmentset_s {
+	uint32_t    numAttachments;
+	VkPipelineColorBlendAttachmentState attachments[];
+} qfv_blendattachmentset_t;
+
+#define QFV_AllocBlendAttachmentSet(num, allocator) \
+    allocator (field_offset (qfv_blendattachmentset_t, attachments[num]))
+
+typedef struct qfv_pipelineblend_s {
+	VkBool32    logicOpEnable;
+	VkLogicOp   logicOp;
+	qfv_blendattachmentset_t *blendAttachments;
+	float       blendConstants[4];
+} qfv_pipelineblend_t;
+
+typedef struct qfv_dynamicstateset_s {
+	uint32_t    numStates;
+	VkDynamicState states[];
+} qfv_dynamicstateset_t;
+
+#define QFV_AllocDynamicStateSet(num, allocator) \
+    allocator (field_offset (qfv_dynamicstateset_t, states[num]))
+
+typedef struct qfv_pushconstantrangeset_s {
+	uint32_t    numRanges;
+	VkPushConstantRange ranges[];
+} qfv_pushconstantrangeset_t;
+
+#define QFV_AllocPushConstantRangeSet(num, allocator) \
+    allocator (field_offset (qfv_pushconstantrangeset_t, ranges[num]))
+
+typedef struct qfv_pipelinelayout_s {
+	struct qfv_device_s *device;
+	VkPipelineLayout  layout;
+} qfv_pipelinelayout_t;
+
+typedef struct qfv_pipeline_s {
+	struct qfv_device_s *device;
+	VkPipeline  pipeline;
+} qfv_pipeline_t;
+
+typedef struct qfv_pipelineset_s {
+	uint32_t    numPipelines;
+	qfv_pipeline_t *pipelines[];
+} qfv_pipelineset_t;
+
+#define QFV_AllocPipelineSet(num, allocator) \
+    allocator (field_offset (qfv_pipelineset_t, pipelines[num]))
+
+typedef struct qfv_graphicspipelinecreateinfo_s {
+	VkPipelineCreateFlags flags;
+	qfv_shaderstageparamsset_t *stages;
+	qfv_vertexinputstate_t *vertexState;
+	qfv_pipelineinputassembly_t *inputAssemblyState;
+	qfv_pipelinetessellation_t *tessellationState;
+	qfv_viewportinfo_t *viewportState;
+	qfv_pipelinerasterization_t *rasterizationState;
+	qfv_pipelinemultisample_t *multisampleState;
+	qfv_pipelinedepthandstencil_t *depthStencilState;
+	qfv_pipelineblend_t *colorBlendState;
+	qfv_dynamicstateset_t *dynamicState;
+	qfv_pipelinelayout_t *layout;
+	struct qfv_renderpass_s *renderPass;
+	uint32_t    subpass;
+	qfv_pipeline_t *basePipeline;
+	int32_t     basePipelineIndex;
+} qfv_graphicspipelinecreateinfo_t;
+
+typedef struct qfv_graphicspipelinecreateinfoset_s {
+	uint32_t    numPipelines;
+	qfv_graphicspipelinecreateinfo_t *pipelines[];
+} qfv_graphicspipelinecreateinfoset_t;
+
+#define QFV_AllocGraphicsPipelineCreateInfoSet(num, allocator) \
+    allocator (field_offset (qfv_graphicspipelinecreateinfoset_t, \
+							 pipelines[num]))
+
+typedef struct qfv_computepipelinecreateinfo_s {
+	VkPipelineCreateFlags flags;
+	qfv_shaderstageparams_t *stage;
+	qfv_pipelinelayout_t *layout;
+	qfv_pipeline_t *basePipeline;
+	int32_t     basePipelineIndex;
+} qfv_computepipelinecreateinfo_t;
+
+typedef struct qfv_computepipelinecreateinfoset_s {
+	uint32_t    numPipelines;
+	qfv_computepipelinecreateinfo_t *pipelines[];
+} qfv_computepipelinecreateinfoset_t;
+
+#define QFV_AllocComputePipelineCreateInfoSet(num, allocator) \
+    allocator (field_offset (qfv_computepipelinecreateinfoset_t, \
+							 pipelines[num]))
+
+typedef struct qfv_pipelinecache_s {
+	struct qfv_device_s *device;
+	VkPipelineCache cache;
+} qfv_pipelinecache_t;
+
+typedef struct qfv_pipelinecacheset_s {
+	uint32_t    numCaches;
+	qfv_pipelinecache_t *caches[];
+} qfv_pipelinecacheset_t;
+
+#define QFV_AllocPipelineCacheSet(num, allocator) \
+    allocator (field_offset (qfv_pipelinecacheset_t, caches[num]))
+
+qfv_shadermodule_t *QFV_CreateShaderModule (struct qfv_device_s *device,
+											size_t size, const uint32_t *code);
+void QFV_DestroyShaderModule (qfv_shadermodule_t *module);
+
+struct dstring_s;
+qfv_pipelinecache_t *QFV_CreatePipelineCache (struct qfv_device_s *device,
+											  struct dstring_s *cacheData);
+struct dstring_s *QFV_GetPipelineCacheData (qfv_pipelinecache_t *cache);
+void QFV_MergePipelineCaches (qfv_pipelinecache_t *targetCache,
+							  qfv_pipelinecacheset_t *sourceCaches);
+void QFV_DestroyPipelineCache (qfv_pipelinecache_t *cache);
+
+struct qfv_descriptorsetlayoutset_s;
+qfv_pipelinelayout_t *
+QFV_CreatePipelineLayout (struct qfv_device_s *device,
+						  struct qfv_descriptorsetlayoutset_s *layouts,
+						  qfv_pushconstantrangeset_t *pushConstants);
+void QFV_DestroyPipelineLayout (qfv_pipelinelayout_t *layout);
+qfv_pipelineset_t *
+QFV_CreateGraphicsPipelines (struct qfv_device_s *device,
+							 qfv_pipelinecache_t *cache,
+							 qfv_graphicspipelinecreateinfoset_t *gpciSet);
+qfv_pipelineset_t *
+QFV_CreateComputePipelines (struct qfv_device_s *device,
+							qfv_pipelinecache_t *cache,
+							qfv_computepipelinecreateinfoset_t *cpciSet);
+void QFV_DestroyPipeline (qfv_pipeline_t *pipeline);
+
+#endif//__QF_Vulkan_pipeline_h
diff --git a/libs/video/renderer/vulkan/Makefile.am b/libs/video/renderer/vulkan/Makefile.am
index 936dd504d..707b6b064 100644
--- a/libs/video/renderer/vulkan/Makefile.am
+++ b/libs/video/renderer/vulkan/Makefile.am
@@ -11,6 +11,7 @@ vulkan_src = \
 	image.c \
 	instance.c \
 	memory.c \
+	pipeline.c \
 	renderpass.c \
 	swapchain.c \
 	util.c \
diff --git a/libs/video/renderer/vulkan/command.c b/libs/video/renderer/vulkan/command.c
index 15e884b64..09621ede5 100644
--- a/libs/video/renderer/vulkan/command.c
+++ b/libs/video/renderer/vulkan/command.c
@@ -52,6 +52,7 @@
 #include "QF/Vulkan/buffer.h"//FIXME should QFV_CmdPipelineBarrier be here?
 #include "QF/Vulkan/image.h"//FIXME should QFV_CmdPipelineBarrier be here?
 #include "QF/Vulkan/renderpass.h"//FIXME should QFV_CmdPipelineBarrier be here?
+#include "QF/Vulkan/pipeline.h"//FIXME should QFV_CmdPipelineBarrier be here?
 #include "QF/Vulkan/command.h"
 #include "QF/Vulkan/device.h"
 #include "QF/Vulkan/instance.h"
@@ -504,3 +505,14 @@ QFV_CmdEndRenderPass (qfv_cmdbuffer_t *cmdBuffer)
 
 	dfunc->vkCmdEndRenderPass (cmdBuffer->buffer);
 }
+
+void
+QFV_CmdBindPipeline (qfv_cmdbuffer_t *cmdBuffer,
+					 VkPipelineBindPoint bindPoint,
+					 qfv_pipeline_t *pipeline)
+{
+	qfv_device_t *device = cmdBuffer->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	dfunc->vkCmdBindPipeline (cmdBuffer->buffer, bindPoint, pipeline->pipeline);
+}
diff --git a/libs/video/renderer/vulkan/pipeline.c b/libs/video/renderer/vulkan/pipeline.c
new file mode 100644
index 000000000..168ec100d
--- /dev/null
+++ b/libs/video/renderer/vulkan/pipeline.c
@@ -0,0 +1,525 @@
+/*
+	pipeline.c
+
+	Vulkan pipeline functions
+
+	Copyright (C) 1996-1997 Id Software, Inc.
+	Copyright (C) 2020      Bill Currie <bill@taniwha.org>
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifdef HAVE_MATH_H
+# include <math.h>
+#endif
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+
+#include "QF/cvar.h"
+#include "QF/dstring.h"
+#include "QF/hash.h"
+#include "QF/input.h"
+#include "QF/mathlib.h"
+#include "QF/qargs.h"
+#include "QF/quakefs.h"
+#include "QF/sys.h"
+#include "QF/va.h"
+#include "QF/vid.h"
+#include "QF/Vulkan/qf_vid.h"
+#include "QF/Vulkan/descriptor.h"
+#include "QF/Vulkan/device.h"
+#include "QF/Vulkan/image.h"
+#include "QF/Vulkan/instance.h"
+#include "QF/Vulkan/pipeline.h"
+#include "QF/Vulkan/renderpass.h"
+
+#include "compat.h"
+#include "d_iface.h"
+#include "r_internal.h"
+#include "vid_vulkan.h"
+
+#include "util.h"
+
+qfv_shadermodule_t *
+QFV_CreateShaderModule (qfv_device_t *device,
+						size_t size, const uint32_t *code)
+{
+	VkDevice    dev = device->dev;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	VkShaderModuleCreateInfo createInfo = {
+		VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO, 0, 0,
+		size, code,
+	};
+
+	qfv_shadermodule_t *module = malloc (sizeof (*module));
+	module->device = device;
+	dfunc->vkCreateShaderModule (dev, &createInfo, 0, &module->module);
+	return module;
+}
+
+void
+QFV_DestroyShaderModule (qfv_shadermodule_t *module)
+{
+	qfv_device_t *device = module->device;
+	VkDevice    dev = device->dev;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	dfunc->vkDestroyShaderModule (dev, module->module, 0);
+	free (module);
+}
+
+qfv_pipelinecache_t *
+QFV_CreatePipelineCache (qfv_device_t *device, dstring_t *cacheData)
+{
+	VkDevice    dev = device->dev;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	VkPipelineCacheCreateInfo createInfo = {
+		VK_STRUCTURE_TYPE_PIPELINE_CACHE_CREATE_INFO, 0, 0,
+		cacheData->size, cacheData->str,
+	};
+
+	qfv_pipelinecache_t *cache = malloc (sizeof (*cache));
+	cache->device = device;
+	dfunc->vkCreatePipelineCache (dev, &createInfo, 0, &cache->cache);
+	return cache;
+}
+
+dstring_t *
+QFV_GetPipelineCacheData (qfv_pipelinecache_t *cache)
+{
+	qfv_device_t *device = cache->device;
+	VkDevice    dev = device->dev;
+	qfv_devfuncs_t *dfunc = device->funcs;
+	dstring_t  *cacheData = dstring_new ();
+
+	dfunc->vkGetPipelineCacheData (dev, cache->cache, &cacheData->size, 0);
+	dstring_adjust (cacheData);
+	dfunc->vkGetPipelineCacheData (dev, cache->cache, &cacheData->size,
+								   cacheData->str);
+	return cacheData;
+}
+
+void
+QFV_MergePipelineCaches (qfv_pipelinecache_t *targetCache,
+						 qfv_pipelinecacheset_t *sourceCaches)
+{
+	qfv_device_t *device = targetCache->device;
+	VkDevice    dev = device->dev;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	VkPipelineCache *srcCaches = alloca (sourceCaches->numCaches
+										 * sizeof (*srcCaches));
+	for (uint32_t i = 0; i < sourceCaches->numCaches; i++) {
+		srcCaches[i] = sourceCaches->caches[i]->cache;
+	}
+	dfunc->vkMergePipelineCaches (dev, targetCache->cache,
+								  sourceCaches->numCaches, srcCaches);
+}
+
+void
+QFV_DestroyPipelineCache (qfv_pipelinecache_t *cache)
+{
+	qfv_device_t *device = cache->device;
+	VkDevice    dev = device->dev;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	dfunc->vkDestroyPipelineCache (dev, cache->cache, 0);
+}
+
+qfv_pipelinelayout_t *
+QFV_CreatePipelineLayout (qfv_device_t *device,
+						  qfv_descriptorsetlayoutset_t *layoutset,
+                          qfv_pushconstantrangeset_t *pushConstants)
+{
+	VkDevice    dev = device->dev;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	uint32_t    numLayouts = layoutset->numLayouts;
+	VkDescriptorSetLayout *layouts = alloca (numLayouts * sizeof (*layouts));
+
+	for (uint32_t i = 0; i < numLayouts; i++) {
+		layouts[i] = layoutset->layouts[i]->layout;
+	}
+
+	VkPipelineLayoutCreateInfo createInfo = {
+		VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO, 0, 0,
+		numLayouts, layouts, pushConstants->numRanges, pushConstants->ranges,
+	};
+
+	qfv_pipelinelayout_t *layout = malloc (sizeof (layout));
+	layout->device = device;
+	dfunc->vkCreatePipelineLayout (dev, &createInfo, 0, &layout->layout);
+	return layout;
+}
+
+void
+QFV_DestroyPipelineLayout (qfv_pipelinelayout_t *layout)
+{
+	qfv_device_t *device = layout->device;
+	VkDevice    dev = device->dev;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	dfunc->vkDestroyPipelineLayout (dev, layout->layout, 0);
+	free (layout);
+}
+
+static VkPipelineShaderStageCreateInfo
+shaderStageCI (qfv_shaderstageparams_t params)
+{
+	VkPipelineShaderStageCreateInfo createInfo = {
+		VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO, 0, 0,
+		params.stageFlags, params.module->module,
+		params.entryPointName, params.specializationInfo,
+	};
+	return createInfo;
+}
+
+static VkPipelineVertexInputStateCreateInfo
+vertexInputSCI (qfv_vertexinputstate_t vertexState)
+{
+	VkPipelineVertexInputStateCreateInfo createInfo = {
+		VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO, 0, 0,
+		vertexState.bindings->numBindings,
+		vertexState.bindings->bindings,
+		vertexState.attributes->numAttributes,
+		vertexState.attributes->attributes,
+	};
+	return createInfo;
+}
+
+static VkPipelineInputAssemblyStateCreateInfo
+inputAssemblySCI (qfv_pipelineinputassembly_t inputAssemblyState)
+{
+	VkPipelineInputAssemblyStateCreateInfo createInfo = {
+		VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO, 0, 0,
+		inputAssemblyState.topology,
+		inputAssemblyState.primativeRestartEnable,
+	};
+	return createInfo;
+}
+
+static VkPipelineTessellationStateCreateInfo
+tessellationSCI (qfv_pipelinetessellation_t tessellationState)
+{
+	VkPipelineTessellationStateCreateInfo createInfo = {
+		VK_STRUCTURE_TYPE_PIPELINE_TESSELLATION_STATE_CREATE_INFO, 0, 0,
+		tessellationState.patchControlPoints
+	};
+	return createInfo;
+}
+
+static VkPipelineViewportStateCreateInfo
+viewportSCI (qfv_viewportinfo_t viewportState)
+{
+	VkPipelineViewportStateCreateInfo createInfo = {
+		VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO, 0, 0,
+		viewportState.viewportset->numViewports,
+		viewportState.viewportset->viewports,
+		viewportState.scissorsset->numScissors,
+		viewportState.scissorsset->scissors,
+	};
+	return createInfo;
+}
+
+static VkPipelineRasterizationStateCreateInfo
+rasterizationSCI (qfv_pipelinerasterization_t rasterizationState)
+{
+	VkPipelineRasterizationStateCreateInfo createInfo = {
+		VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO, 0, 0,
+		rasterizationState.depthClampEnable,
+		rasterizationState.rasterizerDiscardEnable,
+		rasterizationState.polygonMode,
+		rasterizationState.cullMode,
+		rasterizationState.frontFace,
+		rasterizationState.depthBiasEnable,
+		rasterizationState.depthBiasConstantFactor,
+		rasterizationState.depthBiasClamp,
+		rasterizationState.depthBiasSlopeFactor,
+		rasterizationState.lineWidth,
+	};
+	return createInfo;
+}
+
+static VkPipelineMultisampleStateCreateInfo
+multisampleSCI (qfv_pipelinemultisample_t multisampleState)
+{
+	VkPipelineMultisampleStateCreateInfo createInfo = {
+		VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO, 0, 0,
+		multisampleState.rasterizationSamples,
+		multisampleState.sampleShadingEnable,
+		multisampleState.minSampleShading,
+		multisampleState.sampleMask,
+		multisampleState.alphaToCoverageEnable,
+		multisampleState.alphaToOneEnable,
+	};
+	return createInfo;
+}
+
+static VkPipelineDepthStencilStateCreateInfo
+depthStencilSCI (qfv_pipelinedepthandstencil_t depthStencilState)
+{
+	VkPipelineDepthStencilStateCreateInfo createInfo = {
+		VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO, 0, 0,
+		depthStencilState.depthTestEnable,
+		depthStencilState.depthWriteEnable,
+		depthStencilState.depthCompareOp,
+		depthStencilState.depthBoundsTestEnable,
+		depthStencilState.stencilTestEnable,
+		depthStencilState.front,
+		depthStencilState.back,
+		depthStencilState.minDepthBounds,
+		depthStencilState.maxDepthBounds,
+	};
+	return createInfo;
+}
+
+static VkPipelineColorBlendStateCreateInfo
+colorBlendSCI (qfv_pipelineblend_t colorBlendState)
+{
+	VkPipelineColorBlendStateCreateInfo createInfo = {
+		VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO, 0, 0,
+		colorBlendState.logicOpEnable,
+		colorBlendState.logicOp,
+		colorBlendState.blendAttachments->numAttachments,
+		colorBlendState.blendAttachments->attachments,
+		{
+			colorBlendState.blendConstants[0],
+			colorBlendState.blendConstants[1],
+			colorBlendState.blendConstants[2],
+			colorBlendState.blendConstants[3],
+		},
+	};
+	return createInfo;
+}
+
+static VkPipelineDynamicStateCreateInfo
+dynamicSCI (qfv_dynamicstateset_t *dynamicState)
+{
+	VkPipelineDynamicStateCreateInfo createInfo = {
+		VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO, 0, 0,
+		dynamicState->numStates, dynamicState->states,
+	};
+	return createInfo;
+}
+
+qfv_pipelineset_t *
+QFV_CreateGraphicsPipelines (qfv_device_t *device,
+							 qfv_pipelinecache_t *cache,
+							 qfv_graphicspipelinecreateinfoset_t *gpciSet)
+{
+	VkDevice    dev = device->dev;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	uint32_t numPipelines = gpciSet->numPipelines;
+	uint32_t stageCount = 0;
+	for (uint32_t i = 0; i < numPipelines; i++) {
+		stageCount += gpciSet->pipelines[i]->stages->numParams;
+	}
+
+	size_t blockSize = numPipelines
+		* (sizeof (VkGraphicsPipelineCreateInfo)
+		   + sizeof (VkPipelineVertexInputStateCreateInfo)
+		   + sizeof (VkPipelineInputAssemblyStateCreateInfo)
+		   + sizeof (VkPipelineTessellationStateCreateInfo)
+		   + sizeof (VkPipelineViewportStateCreateInfo)
+		   + sizeof (VkPipelineRasterizationStateCreateInfo)
+		   + sizeof (VkPipelineMultisampleStateCreateInfo)
+		   + sizeof (VkPipelineDepthStencilStateCreateInfo)
+		   + sizeof (VkPipelineColorBlendStateCreateInfo)
+		   + sizeof (VkPipelineDynamicStateCreateInfo))
+		+ stageCount * sizeof (VkPipelineShaderStageCreateInfo);
+	VkGraphicsPipelineCreateInfo *pipelineInfos = malloc (blockSize);
+
+	pipelineInfos->pStages = (void *)(pipelineInfos + numPipelines);
+	pipelineInfos->pVertexInputState
+		= (void *)(pipelineInfos->pStages + stageCount);
+	pipelineInfos->pInputAssemblyState
+		= (void *)(pipelineInfos->pVertexInputState + numPipelines);
+	pipelineInfos->pTessellationState
+		= (void *)(pipelineInfos->pInputAssemblyState + numPipelines);
+	pipelineInfos->pViewportState
+		= (void *)(pipelineInfos->pTessellationState + numPipelines);
+	pipelineInfos->pRasterizationState
+		= (void *)(pipelineInfos->pViewportState + numPipelines);
+	pipelineInfos->pMultisampleState
+		= (void *)(pipelineInfos->pRasterizationState + numPipelines);
+	pipelineInfos->pDepthStencilState
+		= (void *)(pipelineInfos->pMultisampleState + numPipelines);
+	pipelineInfos->pColorBlendState
+		= (void *)(pipelineInfos->pDepthStencilState + numPipelines);
+	pipelineInfos->pDynamicState
+		= (void *)(pipelineInfos->pColorBlendState + numPipelines);
+	for (uint32_t i = 1; i < gpciSet->numPipelines; i++) {
+		pipelineInfos[i].pStages = pipelineInfos[i - 1].pStages
+			+ gpciSet->pipelines[i - 1]->stages->numParams;
+		pipelineInfos[i].pVertexInputState
+			= pipelineInfos[i - 1].pVertexInputState + 1;
+		pipelineInfos[i].pInputAssemblyState
+			= pipelineInfos[i - 1].pInputAssemblyState + 1;
+		pipelineInfos[i].pTessellationState
+			= pipelineInfos[i - 1].pTessellationState + 1;
+		pipelineInfos[i].pViewportState
+			= pipelineInfos[i - 1].pViewportState + 1;
+		pipelineInfos[i].pRasterizationState
+			= pipelineInfos[i - 1].pRasterizationState + 1;
+		pipelineInfos[i].pMultisampleState
+			= pipelineInfos[i - 1].pMultisampleState + 1;
+		pipelineInfos[i].pDepthStencilState
+			= pipelineInfos[i - 1].pDepthStencilState + 1;
+		pipelineInfos[i].pColorBlendState
+			= pipelineInfos[i - 1].pColorBlendState + 1;
+		pipelineInfos[i].pDynamicState
+			= pipelineInfos[i - 1].pDynamicState + 1;
+	}
+	for (uint32_t i = 0; i < gpciSet->numPipelines; i++) {
+		VkGraphicsPipelineCreateInfo *gci = pipelineInfos + i;
+		qfv_graphicspipelinecreateinfo_t *ci = gpciSet->pipelines[i];
+		gci->sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO;
+		gci->pNext = 0;
+		gci->flags = ci->flags;
+		gci->stageCount = ci->stages->numParams;
+		for (uint32_t j = 0; j < gci->stageCount; j++) {
+			((VkPipelineShaderStageCreateInfo *)gci->pStages)[i] = shaderStageCI (ci->stages->params[j]);
+		}
+		if (ci->vertexState) {
+			*(VkPipelineVertexInputStateCreateInfo *)gci->pVertexInputState = vertexInputSCI (*ci->vertexState);
+		} else {
+			gci->pVertexInputState = 0;
+		}
+		if (ci->inputAssemblyState) {
+			*(VkPipelineInputAssemblyStateCreateInfo *)gci->pInputAssemblyState = inputAssemblySCI (*ci->inputAssemblyState);
+		} else {
+			gci->pInputAssemblyState = 0;
+		}
+		if (ci->tessellationState) {
+			*(VkPipelineTessellationStateCreateInfo *)gci->pTessellationState = tessellationSCI (*ci->tessellationState);
+		} else {
+			gci->pTessellationState = 0;
+		}
+		if (ci->viewportState) {
+			*(VkPipelineViewportStateCreateInfo *)gci->pViewportState = viewportSCI (*ci->viewportState);
+		} else {
+			gci->pViewportState = 0;
+		}
+		if (ci->rasterizationState) {
+			*(VkPipelineRasterizationStateCreateInfo *)gci->pRasterizationState = rasterizationSCI (*ci->rasterizationState);
+		} else {
+			gci->pRasterizationState = 0;
+		}
+		if (ci->multisampleState) {
+			*(VkPipelineMultisampleStateCreateInfo *)gci->pMultisampleState = multisampleSCI (*ci->multisampleState);
+		} else {
+			gci->pMultisampleState = 0;
+		}
+		if (ci->depthStencilState) {
+			*(VkPipelineDepthStencilStateCreateInfo *)gci->pDepthStencilState = depthStencilSCI (*ci->depthStencilState);
+		} else {
+			gci->pDepthStencilState = 0;
+		}
+		if (ci->colorBlendState) {
+			*(VkPipelineColorBlendStateCreateInfo *)gci->pColorBlendState = colorBlendSCI (*ci->colorBlendState);
+		} else {
+			gci->pColorBlendState = 0;
+		}
+		if (ci->dynamicState) {
+			*(VkPipelineDynamicStateCreateInfo *)gci->pDynamicState = dynamicSCI (ci->dynamicState);
+		} else {
+			gci->pDynamicState = 0;
+		}
+		gci->layout = ci->layout->layout;
+		gci->renderPass = ci->renderPass->renderPass;
+		gci->subpass = ci->subpass;
+		gci->basePipelineHandle = ci->basePipeline->pipeline;
+		gci->basePipelineIndex = ci->basePipelineIndex;
+	}
+
+	VkPipeline *pipelines = alloca (numPipelines * sizeof (pipelines));
+	dfunc->vkCreateGraphicsPipelines (dev, cache->cache,
+									  numPipelines, pipelineInfos, 0,
+									  pipelines);
+
+	qfv_pipelineset_t *pipelineset = QFV_AllocPipelineSet (numPipelines, malloc);
+	pipelineset->numPipelines = numPipelines;
+	for (uint32_t i = 0; i < numPipelines; i++) {
+		pipelineset->pipelines[i] = malloc (sizeof (qfv_pipeline_t));
+		pipelineset->pipelines[i]->device = device;
+		pipelineset->pipelines[i]->pipeline = pipelines[i];
+	}
+	return pipelineset;
+}
+
+qfv_pipelineset_t *
+QFV_CreateComputePipelines (qfv_device_t *device,
+							qfv_pipelinecache_t *cache,
+							qfv_computepipelinecreateinfoset_t *cpciSet)
+{
+	VkDevice    dev = device->dev;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	uint32_t numPipelines = cpciSet->numPipelines;
+
+	size_t blockSize = numPipelines * (sizeof (VkComputePipelineCreateInfo));
+	VkComputePipelineCreateInfo *pipelineInfos = malloc (blockSize);
+
+	for (uint32_t i = 0; i < cpciSet->numPipelines; i++) {
+		VkComputePipelineCreateInfo *cci = pipelineInfos + i;
+		qfv_computepipelinecreateinfo_t *ci = cpciSet->pipelines[i];
+		cci->sType = VK_STRUCTURE_TYPE_COMPUTE_PIPELINE_CREATE_INFO;
+		cci->pNext = 0;
+		cci->flags = ci->flags;
+		cci->stage = shaderStageCI (*ci->stage);
+		cci->layout = ci->layout->layout;
+		cci->basePipelineHandle = ci->basePipeline->pipeline;
+		cci->basePipelineIndex = ci->basePipelineIndex;
+	}
+
+	VkPipeline *pipelines = alloca (numPipelines * sizeof (pipelines));
+	dfunc->vkCreateComputePipelines (dev, cache->cache,
+									 numPipelines, pipelineInfos, 0,
+									 pipelines);
+
+	qfv_pipelineset_t *pipelineset = QFV_AllocPipelineSet (numPipelines, malloc);
+	pipelineset->numPipelines = numPipelines;
+	for (uint32_t i = 0; i < numPipelines; i++) {
+		pipelineset->pipelines[i] = malloc (sizeof (qfv_pipeline_t));
+		pipelineset->pipelines[i]->device = device;
+		pipelineset->pipelines[i]->pipeline = pipelines[i];
+	}
+	return pipelineset;
+}
+
+void
+QFV_DestroyPipeline (qfv_pipeline_t *pipeline)
+{
+	qfv_device_t *device = pipeline->device;
+	VkDevice    dev = device->dev;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	dfunc->vkDestroyPipeline (dev, pipeline->pipeline, 0);
+}

From d56f88f779e9abbf52173a5fc4af48de057eb00c Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 14 Feb 2020 11:11:27 +0900
Subject: [PATCH 0359/1519] Implement swapchain image acquisition

---
 include/QF/Vulkan/swapchain.h          |  5 +++++
 libs/video/renderer/vulkan/swapchain.c | 28 ++++++++++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/include/QF/Vulkan/swapchain.h b/include/QF/Vulkan/swapchain.h
index cd9323009..1a9abb896 100644
--- a/include/QF/Vulkan/swapchain.h
+++ b/include/QF/Vulkan/swapchain.h
@@ -13,5 +13,10 @@ struct vulkan_ctx_s;
 qfv_swapchain_t *QFV_CreateSwapchain (struct vulkan_ctx_s *ctx,
 									  VkSwapchainKHR old_swapchain);
 void QFV_DestroySwapchain (qfv_swapchain_t *swapchain);
+struct qfv_semaphore_s;
+struct qfv_fence_s;
+int QFV_AcquireNextImage (qfv_swapchain_t *swapchain,
+						  struct qfv_semaphore_s *semaphore,
+						  struct qfv_fence_s *fence, uint32_t *imageIndex);
 
 #endif//__QF_Vulkan_swapchain_h
diff --git a/libs/video/renderer/vulkan/swapchain.c b/libs/video/renderer/vulkan/swapchain.c
index bae8e4ff4..b32e3b3ed 100644
--- a/libs/video/renderer/vulkan/swapchain.c
+++ b/libs/video/renderer/vulkan/swapchain.c
@@ -11,6 +11,7 @@
 #include "QF/sys.h"
 #include "QF/Vulkan/qf_vid.h"
 #include "QF/Vulkan/cvars.h"
+#include "QF/Vulkan/command.h"
 #include "QF/Vulkan/device.h"
 #include "QF/Vulkan/instance.h"
 #include "QF/Vulkan/swapchain.h"
@@ -157,3 +158,30 @@ QFV_DestroySwapchain (qfv_swapchain_t *swapchain)
 	dfunc->vkDestroySwapchainKHR (dev, swapchain->swapchain, 0);
 	free (swapchain);
 }
+
+int
+QFV_AcquireNextImage (qfv_swapchain_t *swapchain, qfv_semaphore_t *semaphore,
+					  qfv_fence_t *fence, uint32_t *imageIndex)
+{
+	qfv_device_t *device = swapchain->device;
+	VkDevice dev = device->dev;
+	qfv_devfuncs_t *dfunc = device->funcs;
+	uint64_t timeout = 2000000000;
+	VkSemaphore sem = semaphore ? semaphore->semaphore : VK_NULL_HANDLE;
+	VkFence fnc = fence ? fence->fence : VK_NULL_HANDLE;
+	*imageIndex = ~0u;
+	VkResult res = dfunc->vkAcquireNextImageKHR (dev, swapchain->swapchain,
+												 timeout, sem, fnc,
+												 imageIndex);
+	switch (res) {
+		case VK_SUCCESS:
+		case VK_TIMEOUT:
+		case VK_NOT_READY:
+			return 1;
+		case VK_SUBOPTIMAL_KHR:
+		case VK_ERROR_OUT_OF_DATE_KHR:
+			return 0;
+		default:
+			Sys_Error ("vkAcquireNextImageKHR failed: %d", res);
+	}
+}

From 8654ac44bb5736272f8f5e4c85de36d6b61779d0 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 14 Feb 2020 16:34:14 +0900
Subject: [PATCH 0360/1519] Fix incorrect struct forward declaraction

---
 include/QF/Vulkan/command.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/QF/Vulkan/command.h b/include/QF/Vulkan/command.h
index c1d54d43d..7f28e7c88 100644
--- a/include/QF/Vulkan/command.h
+++ b/include/QF/Vulkan/command.h
@@ -79,9 +79,9 @@ int QFV_QueueSubmit (struct qfv_queue_s *queue,
 					 qfv_semaphoreset_t *signalSemaphores, qfv_fence_t *fence);
 int QFV_QueueWaitIdle (struct qfv_queue_s *queue);
 
-struct qfv_memorybarrierset_s *memBarriers;
-struct qfv_bufferbarrierset_s *buffBarriers;
-struct qfv_imagebarrierset_s *imgBarriers;
+struct qfv_memorybarrierset_s;
+struct qfv_bufferbarrierset_s;
+struct qfv_imagebarrierset_s;
 void QFV_CmdPipelineBarrier (qfv_cmdbuffer_t *cmdBuffer,
 							 VkPipelineStageFlags srcStageMask,
 							 VkPipelineStageFlags dstStageMask,

From c50dda1d08b2a32c9dc2c1ab489c2a02848a7ffe Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 12 Feb 2020 10:40:38 +0900
Subject: [PATCH 0361/1519] Document segmented text

---
 include/QF/segtext.h | 92 +++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 87 insertions(+), 5 deletions(-)

diff --git a/include/QF/segtext.h b/include/QF/segtext.h
index 1c781fcb9..79020356c 100644
--- a/include/QF/segtext.h
+++ b/include/QF/segtext.h
@@ -31,28 +31,110 @@
 #ifndef __QF_segtext_h
 #define __QF_segtext_h
 
-/** \defgroup segtext Segmented text files.
+/** \defgroup segtext Segmented text files
 	\ingroup utils
 
-	Based on The OpenGL Shader Wrangler: http://prideout.net/blog/?p=11
+	Based on The OpenGL Shader Wrangler:
+	https://prideout.net/blog/old/blog/index.html@p=11.html
+	However, nothing is assumed about any of the segments: they are all nothing
+	more than chunks of mostly random (lines cannot start with --) text with
+	identifying tags. Also, the identifying tag represents only the shader_key
+	of OpenGL Shader Wrangler's Effect.shader_key identifier.
 */
+///@{
 
+/** Represent a single text segment
+
+	Segments are separated by lines beginning with "--" (without the quotes).
+
+	The first word ([A-Za-z0-9_.]+) following the double-hyphen is used as an
+	identifying tag for the segment. Whitespace and any additional characters
+	are ignored.
+
+	The segment itself starts on the following line.
+*/
 typedef struct segchunk_s {
 	struct segchunk_s *next;
-	const char *tag;
-	const char *text;
-	int         start_line;
+	const char *tag;		///< identifying tag or null if no tag
+	const char *text;		///< nul-terminated string holding the segment
+	int         start_line;	///< line number for first line of the segment
 } segchunk_t;
 
+/** Container for all the segments extracted from the provided text
+
+	The first segment has no tag and may or may not be empty.
+	Segments are stored sequentially in \a chunk_list are indexed by
+	identifying tag (if present) in \a tab.
+	Segments that have no identifying tag are not in \a tab, but can
+	be accessed by walking \a chunk_list its \a next field.
+*/
 typedef struct segtext_s {
 	struct segtext_s *next;
 	segchunk_t *chunk_list;
 	struct hashtab_s *tab;
 } segtext_t;
 
+/** Parse a nul-terminated string into (optionally) tagged segments
+
+	The segments are separated by lines beginning with a double-hyphen ("--"),
+	with an optional tag following the double-hyphen on the same line. Valid
+	tag characters are ASCII alpha-numerics, "." and "_". Whitespace is ignored
+	and invalid characters are treated as whitespace. Only the first tag on the
+	line is significant.
+
+	\param src	nul-terminated string to be parsed into segments
+	\return		Pointer to container of parsed segments. Can be freed using
+				Segtext_delete().
+*/
 segtext_t *Segtext_new (const char *src);
+/** Free a segmented text container created by Segtext_new()
+
+	\param st	Pointer to segmented text container to be freed. Must have been
+				created by Segtext_new().
+*/
 void Segtext_delete (segtext_t *st);
+/** Find a text segment via its identifying tag
+
+	Like OpenGL Shader Wrangler, the segment tag does not have to be a perfect
+	match with the specified tag: the segment with the longest string of
+	sub-tags matching the leading subtags of the specified tag is selected.
+	Tags are logically broken into sub-tag by the "." character. Thus in a
+	collection of segments with tags "foo" and "foo.b", "foo.bar" will find the
+	segment tagged "foo". However, if a segment tagged "foo.bar" is present, it
+	will be returned. A segment tagged "foo.bar.baz" will not.
+
+	\param st	Pointer to segmented text container
+	\param tag	String specifying the tag identifying the segment to be
+				returned. Valid tag characters are alphanumerics, "_" and "."
+				(ie, [A-Za-z0-9._]). "." is used as a sub-tag separator for
+				partial matches.
+	\return		Pointer to segment data block with the best matching tag,
+				providing access to the segment's tag and starting line number,
+				as well as the segment contents. Null if no matching tag was
+				found.
+*/
 const segchunk_t *Segtext_FindChunk (const segtext_t *st, const char *tag);
+
+/** Find a text segment via its identifying tag
+
+	Like OpenGL Shader Wrangler, the segment tag does not have to be a perfect
+	match with the specified tag: the segment with the longest string of
+	sub-tags matching the leading subtags of the specified tag is selected.
+	Tags are logically broken into sub-tag by the "." character. Thus in a
+	collection of segments with tags "foo" and "foo.b", "foo.bar" will find the
+	segment tagged "foo". However, if a segment tagged "foo.bar" is present, it
+	will be returned. A segment tagged "foo.bar.baz" will not.
+
+	\param st	Pointer to segmented text container
+	\param tag	String specifying the tag identifying the segment to be
+				returned. Valid tag characters are alphanumerics, "_" and "."
+				(ie, [A-Za-z0-9._]). "." is used as a sub-tag separator for
+				partial matches.
+	\return		Contents of the segment with the best matching tag, or null if
+				no matching tag was found.
+*/
 const char *Segtext_Find (const segtext_t *st, const char *tag);
 
+///@}
+
 #endif//__QF_segtext_h

From 197f856a3012186706a071a09a5cf45e2c26db06 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 14 Feb 2020 10:27:38 +0900
Subject: [PATCH 0362/1519] Fix incorrect scalar/quaternion division

It's just not possible.
---
 tools/qfcc/source/expr_binary.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/tools/qfcc/source/expr_binary.c b/tools/qfcc/source/expr_binary.c
index 2029726af..103cd1e7d 100644
--- a/tools/qfcc/source/expr_binary.c
+++ b/tools/qfcc/source/expr_binary.c
@@ -86,7 +86,6 @@ static expr_type_t float_vector[] = {
 
 static expr_type_t float_quat[] = {
 	{'*',	&type_quaternion},
-	{'/',	0, 0, 0, inverse_multiply},
 	{0, 0}
 };
 
@@ -170,7 +169,7 @@ static expr_type_t pointer_integer[] = {
 
 static expr_type_t quat_float[] = {
 	{'*',	&type_quaternion},
-	{'/',	&type_quaternion},
+	{'/',	0, 0, 0, inverse_multiply},
 	{0, 0}
 };
 
@@ -190,7 +189,7 @@ static expr_type_t quat_quat[] = {
 
 static expr_type_t quat_integer[] = {
 	{'*',	&type_quaternion, 0, &type_float},
-	{'/',	&type_quaternion, 0, &type_float},
+	{'/',	0, 0, 0, inverse_multiply},
 	{0, 0}
 };
 #define quat_uinteger quat_integer
@@ -228,7 +227,6 @@ static expr_type_t integer_pointer[] = {
 
 static expr_type_t integer_quat[] = {
 	{'*',	&type_quaternion, &type_float, 0},
-	{'/',	&type_quaternion, &type_float, 0},
 	{0, 0}
 };
 
@@ -478,7 +476,7 @@ static expr_type_t *field_x[] = {
 	0,				// ev_short
 };
 
-static expr_type_t *funcx[] = {
+static expr_type_t *func_x[] = {
 	0,				// ev_void
 	0,				// ev_string
 	0,				// ev_float
@@ -575,7 +573,7 @@ static expr_type_t **binary_expr_types[] = {
 	vector_x,
 	entity_x,
 	field_x,
-	funcx,
+	func_x,
 	pointer_x,
 	quat_x,
 	integer_x,

From 16f8dca72e8772ca50c968599bfa18ce34966e56 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 14 Feb 2020 10:56:25 +0900
Subject: [PATCH 0363/1519] Align local and far data spaces

I plan on adding doubles, and so it's necessary to ensure that attempts
to align doubles in local or far data spaces remain aligned after final
linking.
---
 tools/qfcc/source/obj_file.c | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/tools/qfcc/source/obj_file.c b/tools/qfcc/source/obj_file.c
index 10ca126f9..e0b6c668f 100644
--- a/tools/qfcc/source/obj_file.c
+++ b/tools/qfcc/source/obj_file.c
@@ -795,6 +795,14 @@ qfo_relocate_refs (qfo_t *qfo)
 	}
 }
 
+static unsigned
+align_globals_size (unsigned size)
+{
+	if (options.code.progsversion == PROG_ID_VERSION)
+		return size;
+	return RUP (size, 16 / sizeof (pr_type_t));
+}
+
 dprograms_t *
 qfo_to_progs (qfo_t *qfo, int *size)
 {
@@ -811,6 +819,7 @@ qfo_to_progs (qfo_t *qfo, int *size)
 	dprograms_t *progs;
 	qfo_def_t  *types_def = 0;
 	unsigned    i, j;
+	unsigned    near_data_size = 0;
 	unsigned    locals_size = 0;
 	int         locals_start;
 	unsigned    big_locals = 0;
@@ -827,9 +836,8 @@ qfo_to_progs (qfo_t *qfo, int *size)
 	progs->numfunctions = qfo->num_funcs + 1;
 	progs->numstrings = qfo->spaces[qfo_strings_space].data_size;
 	progs->numglobals = qfo->spaces[qfo_near_data_space].data_size;
-	progs->numglobals += qfo->spaces[qfo_far_data_space].data_size;
-	progs->numglobals += qfo->spaces[qfo_type_space].data_size;
-	locals_start = qfo->spaces[qfo_near_data_space].data_size;
+	progs->numglobals = align_globals_size (progs->numglobals);
+	locals_start = progs->numglobals;
 	for (i = qfo_num_spaces; i < qfo->num_spaces; i++) {
 		if (options.code.local_merging) {
 			if (locals_size < qfo->spaces[i].data_size) {
@@ -837,11 +845,14 @@ qfo_to_progs (qfo_t *qfo, int *size)
 				big_locals = i;
 			}
 		} else {
-			locals_size += qfo->spaces[i].data_size;
+			locals_size += align_globals_size (qfo->spaces[i].data_size);
 		}
 	}
 	progs->numglobals += locals_size;
+	near_data_size = progs->numglobals;
 	progs->numglobals = RUP (progs->numglobals, 16 / sizeof (pr_type_t));
+	progs->numglobals += qfo->spaces[qfo_far_data_space].data_size;
+	progs->numglobals += qfo->spaces[qfo_type_space].data_size;
 	progs->entityfields = qfo->spaces[qfo_entity_space].data_size;
 	*size += progs->numstatements * sizeof (dstatement_t);
 	*size += progs->numglobaldefs * sizeof (ddef_t);
@@ -902,7 +913,7 @@ qfo_to_progs (qfo_t *qfo, int *size)
 		for (j = 0; j < space->num_defs; j++)
 			space->defs[j].offset += locals_start;
 		if (!options.code.local_merging)
-			locals_start += df->locals;
+			locals_start += align_globals_size (df->locals);
 		df->profile = 0;
 		df->s_name = qf->name;
 		df->s_file = qf->file;
@@ -978,8 +989,7 @@ qfo_to_progs (qfo_t *qfo, int *size)
 		printf ("%6i global defs\n", progs->numglobaldefs);
 		printf ("%6i fielddefs\n", progs->numfielddefs);
 		printf ("%6i globals\n", progs->numglobals);
-		printf ("    %6i near globals\n",
-				qfo->spaces[qfo_near_data_space].data_size + locals_size);
+		printf ("    %6i near globals\n", near_data_size);
 		printf ("        %6i locals size%s\n", locals_size, big_function);
 		printf ("    %6i far globals\n",
 				qfo->spaces[qfo_far_data_space].data_size);

From 13b608f40c890578a5805b5f1127306eb1d590b8 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 14 Feb 2020 13:54:26 +0900
Subject: [PATCH 0364/1519] Don't truncat float % float

This allows full usage, eg, x % pi, but otherwise maintains
compatibility with integer %
---
 libs/gamecode/pr_exec.c         |  6 +++++-
 tools/qfcc/source/expr_binary.c | 26 ++++----------------------
 2 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/libs/gamecode/pr_exec.c b/libs/gamecode/pr_exec.c
index 56d5b0401..27c3f9c50 100644
--- a/libs/gamecode/pr_exec.c
+++ b/libs/gamecode/pr_exec.c
@@ -1337,7 +1337,11 @@ op_call:
 				OPC.integer_var = OPA.integer_var % OPB.integer_var;
 				break;
 			case OP_MOD_F:
-				OPC.float_var = (int) OPA.float_var % (int) OPB.float_var;
+				{
+					float       a = OPA.float_var;
+					float       b = OPB.float_var;
+					OPC.float_var = a - b * truncf (a / b);
+				}
 				break;
 			case OP_CONV_IF:
 				OPC.float_var = OPA.integer_var;
diff --git a/tools/qfcc/source/expr_binary.c b/tools/qfcc/source/expr_binary.c
index 103cd1e7d..6dd7c1177 100644
--- a/tools/qfcc/source/expr_binary.c
+++ b/tools/qfcc/source/expr_binary.c
@@ -628,32 +628,14 @@ reimplement_binary_expr (int op, expr_t *e1, expr_t *e2)
 		switch (op) {
 			case '%':
 				{
-					expr_t     *tmp1, *tmp2, *tmp3, *tmp4, *t1, *t2;
+					expr_t     *tmp1, *tmp2;
 					e = new_block_expr ();
-					t1 = new_temp_def_expr (&type_float);
-					t2 = new_temp_def_expr (&type_float);
 					tmp1 = new_temp_def_expr (&type_float);
 					tmp2 = new_temp_def_expr (&type_float);
-					tmp3 = new_temp_def_expr (&type_float);
-					tmp4 = new_temp_def_expr (&type_float);
 
-					append_expr (e, assign_expr (t1, e1));
-					e1 = binary_expr ('&', t1, t1);
-					append_expr (e, assign_expr (tmp1, e1));
-
-					append_expr (e, assign_expr (t2, e2));
-					e2 = binary_expr ('&', t2, t2);
-					append_expr (e, assign_expr (tmp2, e2));
-
-					e1 = binary_expr ('/', tmp1, tmp2);
-					append_expr (e, assign_expr (tmp3, e1));
-
-					e2 = binary_expr ('&', tmp3, tmp3);
-					append_expr (e, assign_expr (tmp4, e2));
-
-					e1 = binary_expr ('*', tmp2, tmp4);
-					e2 = binary_expr ('-', tmp1, e1);
-					e->e.block.result = e2;
+					append_expr (e, assign_expr (tmp1, binary_expr ('/', e1, e2)));
+					append_expr (e, assign_expr (tmp2, binary_expr ('&', tmp1, tmp1)));
+					e->e.block.result = binary_expr ('-', e1, binary_expr ('*', e2, tmp2));
 					return e;
 				}
 				break;

From df7c08a01033f49c5d0bfb2e1d05a1854f4552e9 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 14 Feb 2020 16:38:37 +0900
Subject: [PATCH 0365/1519] Add support for doubles to Ruamoko

Only as scalars, I still need to think about what to do for vectors and
quaternions due to param size issues. Also, doubles are not yet
guaranteed to be correctly aligned.
---
 include/QF/pr_comp.h           |  38 +++++-
 include/QF/progs.h             |  48 +++++++
 libs/gamecode/pr_exec.c        | 158 +++++++++++++++++++++--
 libs/gamecode/pr_opcode.c      | 126 +++++++++++++++++++
 libs/gamecode/pr_strings.c     |  31 +++--
 libs/ruamoko/rua_math.c        | 223 +++++++++++++++++++++++++++------
 nq/include/sv_progs.h          |   5 +
 nq/source/sv_progs.c           |   3 +
 qw/include/sv_progs.h          |   5 +
 qw/source/sv_progs.c           |   3 +
 ruamoko/include/math.h         |  73 +++++++----
 ruamoko/lib/math.r             |  24 ++++
 tools/qfcc/include/expr.h      |  10 ++
 tools/qfcc/include/type.h      |   2 +
 tools/qfcc/include/value.h     |   1 +
 tools/qfcc/source/constfold.c  | 222 +++++++++++++++++++++++++++++++-
 tools/qfcc/source/dot_expr.c   |   3 +
 tools/qfcc/source/expr.c       |  34 +++++
 tools/qfcc/source/qc-lex.l     |   1 +
 tools/qfcc/source/statements.c |   5 +
 tools/qfcc/source/type.c       |  19 ++-
 tools/qfcc/source/value.c      |  10 ++
 22 files changed, 958 insertions(+), 86 deletions(-)

diff --git a/include/QF/pr_comp.h b/include/QF/pr_comp.h
index c657a7ca1..122de60b9 100644
--- a/include/QF/pr_comp.h
+++ b/include/QF/pr_comp.h
@@ -44,6 +44,7 @@ typedef enum {
 	ev_integer,
 	ev_uinteger,
 	ev_short,			// value is embedded in the opcode
+	ev_double,
 
 	ev_invalid,			// invalid type. used for instruction checking
 	ev_type_count		// not a type, gives number of types
@@ -305,6 +306,7 @@ typedef enum {
 	OP_PUSH_P,
 	OP_PUSH_Q,
 	OP_PUSH_I,
+	OP_PUSH_D,
 
 	OP_PUSHB_S,
 	OP_PUSHB_F,
@@ -315,6 +317,7 @@ typedef enum {
 	OP_PUSHB_P,
 	OP_PUSHB_Q,
 	OP_PUSHB_I,
+	OP_PUSHB_D,
 
 	OP_PUSHBI_S,
 	OP_PUSHBI_F,
@@ -325,6 +328,7 @@ typedef enum {
 	OP_PUSHBI_P,
 	OP_PUSHBI_Q,
 	OP_PUSHBI_I,
+	OP_PUSHBI_D,
 
 	OP_POP_S,
 	OP_POP_F,
@@ -335,6 +339,7 @@ typedef enum {
 	OP_POP_P,
 	OP_POP_Q,
 	OP_POP_I,
+	OP_POP_D,
 
 	OP_POPB_S,
 	OP_POPB_F,
@@ -345,6 +350,7 @@ typedef enum {
 	OP_POPB_P,
 	OP_POPB_Q,
 	OP_POPB_I,
+	OP_POPB_D,
 
 	OP_POPBI_S,
 	OP_POPBI_F,
@@ -355,6 +361,36 @@ typedef enum {
 	OP_POPBI_P,
 	OP_POPBI_Q,
 	OP_POPBI_I,
+	OP_POPBI_D,
+
+	OP_ADD_D,
+	OP_SUB_D,
+	OP_MUL_D,
+	OP_MUL_QD,
+	OP_MUL_DQ,
+	OP_MUL_VD,
+	OP_MUL_DV,
+	OP_DIV_D,
+	OP_MOD_D,
+	OP_GE_D,
+	OP_LE_D,
+	OP_GT_D,
+	OP_LT_D,
+	OP_NOT_D,
+	OP_EQ_D,
+	OP_NE_D,
+	OP_CONV_FD,
+	OP_CONV_DF,
+	OP_CONV_ID,
+	OP_CONV_DI,
+	OP_STORE_D,
+	OP_STOREB_D,
+	OP_STOREBI_D,
+	OP_STOREP_D,
+	OP_LOAD_D,
+	OP_LOADB_D,
+	OP_LOADBI_D,
+	OP_ADDRESS_D,
 } pr_opcode_e;
 
 typedef struct opcode_s {
@@ -423,7 +459,7 @@ typedef struct pr_va_list_s {
 	 |(((0x##b) & 0xfff) << 12)		\
 	 |(((0x##c) & 0xfff) <<  0) )
 #define	PROG_ID_VERSION	6
-#define	PROG_VERSION	PROG_VERSION_ENCODE(0,fff,009)
+#define	PROG_VERSION	PROG_VERSION_ENCODE(0,fff,00a)
 
 typedef struct dprograms_s {
 	pr_uint_t   version;
diff --git a/include/QF/progs.h b/include/QF/progs.h
index 7631f1de1..f3358c708 100644
--- a/include/QF/progs.h
+++ b/include/QF/progs.h
@@ -320,6 +320,18 @@ void PR_Undefined (progs_t *pr, const char *type, const char *name) __attribute_
 */
 #define G_FLOAT(p,o)	G_var (p, o, float)
 
+/** Access a double global. Can be assigned to.
+
+	\par QC type:
+		\c double
+	\param p		pointer to ::progs_t VM struct
+	\param o		offset into global data space
+	\return			double lvalue
+
+	\hideinitializer
+*/
+#define G_DOUBLE(p,o)	(*(double *) ((p)->pr_globals + o))
+
 /** Access an integer global. Can be assigned to.
 
 	\par QC type:
@@ -510,6 +522,18 @@ void PR_Undefined (progs_t *pr, const char *type, const char *name) __attribute_
 */
 #define P_FLOAT(p,n)	P_var (p, n, float)
 
+/** Access a double parameter. Can be assigned to.
+
+	\par QC type:
+		\c double
+	\param p		pointer to ::progs_t VM struct
+	\param n		parameter number (0-7)
+	\return			double lvalue
+
+	\hideinitializer
+*/
+#define P_DOUBLE(p,n)	(*(double *) ((p)->pr_params[n]))
+
 /** Access an integer parameter. Can be assigned to.
 
 	\par QC type:
@@ -702,6 +726,17 @@ void PR_Undefined (progs_t *pr, const char *type, const char *name) __attribute_
 */
 #define R_FLOAT(p)		R_var (p, float)
 
+/** Access the VM function return value as a \c double
+
+	\par QC type:
+		\c double
+	\param p		pointer to ::progs_t VM struct
+	\return			double lvalue
+
+	\hideinitializer
+*/
+#define R_DOUBLE(p)		(*(double *) ((p)->pr_return))
+
 /** Access the VM function return value as a \c ::pr_int_t (AKA int32_t)
 
 	\par QC type:
@@ -868,6 +903,18 @@ void PR_Undefined (progs_t *pr, const char *type, const char *name) __attribute_
 */
 #define E_FLOAT(e,o)	E_var (e, o, float)
 
+/** Access a double entity field. Can be assigned to.
+
+	\par QC type:
+		\c double
+	\param e		pointer to the entity
+	\param o		field offset into entity data space
+	\return			double lvalue
+
+	\hideinitializer
+*/
+#define E_DOUBLE(e,o)	(*(double *) ((e)->v + o))
+
 /** Access an integer entity field. Can be assigned to.
 
 	\par QC type:
@@ -1560,6 +1607,7 @@ struct progs_s {
 	struct hashtab_s *strref_hash;
 	int         num_strings;
 	strref_t   *pr_xtstr;
+	int         float_promoted;	///< for PR_Sprintf
 	//@}
 
 	/// \name memory map
diff --git a/libs/gamecode/pr_exec.c b/libs/gamecode/pr_exec.c
index 27c3f9c50..3ea2c3bd5 100644
--- a/libs/gamecode/pr_exec.c
+++ b/libs/gamecode/pr_exec.c
@@ -280,12 +280,15 @@ PR_BoundsCheck (progs_t *pr, int addr, etype_t type)
 #define OPB (*op_b)
 #define OPC (*op_c)
 
+#define OPA_double_var (*((double *) (op_a)))
+#define OPB_double_var (*((double *) (op_b)))
+#define OPC_double_var (*((double *) (op_c)))
+
 /*
 	This gets around the problem of needing to test for -0.0 but denormals
 	causing exceptions (or wrong results for what we need) on the alpha.
 */
-#define FNZ(x) ((x).uinteger_var && (x).uinteger_var != 0x80000000u)
-
+#define FNZ(x) ((x).uinteger_var & ~0x80000000u)
 
 static int
 signal_hook (int sig, void *data)
@@ -421,6 +424,9 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 			PR_PrintStatement (pr, st, 1);
 
 		switch (st->op) {
+			case OP_ADD_D:
+				OPC_double_var = OPA_double_var + OPB_double_var;
+				break;
 			case OP_ADD_F:
 				OPC.float_var = OPA.float_var + OPB.float_var;
 				break;
@@ -437,6 +443,9 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 												PR_GetString (pr,
 															  OPB.string_var));
 				break;
+			case OP_SUB_D:
+				OPC_double_var = OPA_double_var - OPB_double_var;
+				break;
 			case OP_SUB_F:
 				OPC.float_var = OPA.float_var - OPB.float_var;
 				break;
@@ -446,12 +455,31 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 			case OP_SUB_Q:
 				QuatSubtract (OPA.quat_var, OPB.quat_var, OPC.quat_var);
 				break;
+			case OP_MUL_D:
+				OPC_double_var = OPA_double_var * OPB_double_var;
+				break;
 			case OP_MUL_F:
 				OPC.float_var = OPA.float_var * OPB.float_var;
 				break;
 			case OP_MUL_V:
 				OPC.float_var = DotProduct (OPA.vector_var, OPB.vector_var);
 				break;
+			case OP_MUL_DV:
+				{
+					// avoid issues with the likes of x = x.x * x;
+					// makes for faster code, too
+					double      scale = OPA_double_var;
+					VectorScale (OPB.vector_var, scale, OPC.vector_var);
+				}
+				break;
+			case OP_MUL_VD:
+				{
+					// avoid issues with the likes of x = x * x.x;
+					// makes for faster code, too
+					double      scale = OPB_double_var;
+					VectorScale (OPA.vector_var, scale, OPC.vector_var);
+				}
+				break;
 			case OP_MUL_FV:
 				{
 					// avoid issues with the likes of x = x.x * x;
@@ -474,6 +502,22 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 			case OP_MUL_QV:
 				QuatMultVec (OPA.quat_var, OPB.vector_var, OPC.vector_var);
 				break;
+			case OP_MUL_DQ:
+				{
+					// avoid issues with the likes of x = x.s * x;
+					// makes for faster code, too
+					double      scale = OPA_double_var;
+					QuatScale (OPB.quat_var, scale, OPC.quat_var);
+				}
+				break;
+			case OP_MUL_QD:
+				{
+					// avoid issues with the likes of x = x * x.s;
+					// makes for faster code, too
+					double      scale = OPB_double_var;
+					QuatScale (OPA.quat_var, scale, OPC.quat_var);
+				}
+				break;
 			case OP_MUL_FQ:
 				{
 					// avoid issues with the likes of x = x.s * x;
@@ -493,6 +537,9 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 			case OP_CONJ_Q:
 				QuatConj (OPA.quat_var, OPC.quat_var);
 				break;
+			case OP_DIV_D:
+				OPC_double_var = OPA_double_var / OPB_double_var;
+				break;
 			case OP_DIV_F:
 				OPC.float_var = OPA.float_var / OPB.float_var;
 				break;
@@ -630,6 +677,9 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 			case OP_STORE_Q:
 				QuatCopy (OPA.quat_var, OPB.quat_var);
 				break;
+			case OP_STORE_D:
+				OPB_double_var = OPA_double_var;
+				break;
 
 			case OP_STOREP_F:
 			case OP_STOREP_ENT:
@@ -661,6 +711,14 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 				ptr = pr->pr_globals + pointer;
 				QuatCopy (OPA.quat_var, ptr->quat_var);
 				break;
+			case OP_STOREP_D:
+				pointer = OPB.integer_var;
+				if (pr_boundscheck->int_val) {
+					PR_BoundsCheck (pr, pointer, ev_double);
+				}
+				ptr = pr->pr_globals + pointer;
+				*(double *) ptr = OPA_double_var;
+				break;
 
 			case OP_ADDRESS:
 				if (pr_boundscheck->int_val) {
@@ -687,6 +745,7 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 			case OP_ADDRESS_FN:
 			case OP_ADDRESS_I:
 			case OP_ADDRESS_P:
+			case OP_ADDRESS_D:
 				OPC.integer_var = st->a;
 				break;
 
@@ -735,6 +794,19 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 				ed = PROG_TO_EDICT (pr, OPA.entity_var);
 				memcpy (&OPC, &ed->v[OPB.integer_var], 4 * sizeof (OPC));
 				break;
+			case OP_LOAD_D:
+				if (pr_boundscheck->int_val) {
+					if (OPA.entity_var < 0
+						|| OPA.entity_var >= pr->pr_edictareasize)
+						PR_RunError (pr, "Progs attempted to read an out of "
+									 "bounds edict number");
+					if (OPB.uinteger_var + 1 >= pr->progs->entityfields)
+						PR_RunError (pr, "Progs attempted to read an invalid "
+									 "field in an edict");
+				}
+				ed = PROG_TO_EDICT (pr, OPA.entity_var);
+				OPC_double_var = *(double *) (ed->v + OPB.integer_var);
+				break;
 
 			case OP_LOADB_F:
 			case OP_LOADB_S:
@@ -766,6 +838,14 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 				ptr = pr->pr_globals + pointer;
 				QuatCopy (ptr->quat_var, OPC.quat_var);
 				break;
+			case OP_LOADB_D:
+				pointer = OPA.integer_var + OPB.integer_var;
+				if (pr_boundscheck->int_val) {
+					PR_BoundsCheck (pr, pointer, ev_double);
+				}
+				ptr = pr->pr_globals + pointer;
+				OPC_double_var = *(double *) ptr;
+				break;
 
 			case OP_LOADBI_F:
 			case OP_LOADBI_S:
@@ -797,6 +877,14 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 				ptr = pr->pr_globals + pointer;
 				QuatCopy (ptr->quat_var, OPC.quat_var);
 				break;
+			case OP_LOADBI_D:
+				pointer = OPA.integer_var + (short) st->b;
+				if (pr_boundscheck->int_val) {
+					PR_BoundsCheck (pr, pointer, ev_quat);
+				}
+				ptr = pr->pr_globals + pointer;
+				OPC_double_var = *(double *) ptr;
+				break;
 
 			case OP_LEA:
 				pointer = OPA.integer_var + OPB.integer_var;
@@ -838,6 +926,14 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 				ptr = pr->pr_globals + pointer;
 				QuatCopy (OPA.quat_var, ptr->quat_var);
 				break;
+			case OP_STOREB_D:
+				pointer = OPB.integer_var + OPC.integer_var;
+				if (pr_boundscheck->int_val) {
+					PR_BoundsCheck (pr, pointer, ev_quat);
+				}
+				ptr = pr->pr_globals + pointer;
+				*(double *) ptr = OPA_double_var;
+				break;
 
 			case OP_STOREBI_F:
 			case OP_STOREBI_S:
@@ -869,6 +965,14 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 				ptr = pr->pr_globals + pointer;
 				QuatCopy (OPA.quat_var, ptr->quat_var);
 				break;
+			case OP_STOREBI_D:
+				pointer = OPB.integer_var + (short) st->c;
+				if (pr_boundscheck->int_val) {
+					PR_BoundsCheck (pr, pointer, ev_quat);
+				}
+				ptr = pr->pr_globals + pointer;
+				*(double *) ptr = OPA_double_var;
+				break;
 
 			case OP_PUSH_F:
 			case OP_PUSH_FLD:
@@ -1322,20 +1426,19 @@ op_call:
 			case OP_MUL_I:
 				OPC.integer_var = OPA.integer_var * OPB.integer_var;
 				break;
-/*
-			case OP_DIV_VF:
-				{
-					float       temp = 1.0f / OPB.float_var;
-					VectorScale (OPA.vector_var, temp, OPC.vector_var);
-				}
-				break;
-*/
 			case OP_DIV_I:
 				OPC.integer_var = OPA.integer_var / OPB.integer_var;
 				break;
 			case OP_MOD_I:
 				OPC.integer_var = OPA.integer_var % OPB.integer_var;
 				break;
+			case OP_MOD_D:
+				{
+					double      a = OPA_double_var;
+					double      b = OPB_double_var;
+					OPC_double_var = a - b * trunc (a / b);
+				}
+				break;
 			case OP_MOD_F:
 				{
 					float       a = OPA.float_var;
@@ -1432,6 +1535,41 @@ op_call:
 						 st->b * 4);
 				break;
 
+			case OP_GE_D:
+				OPC.float_var = OPA_double_var >= OPB_double_var;
+				break;
+			case OP_LE_D:
+				OPC.float_var = OPA_double_var <= OPB_double_var;
+				break;
+			case OP_GT_D:
+				OPC.float_var = OPA_double_var > OPB_double_var;
+				break;
+			case OP_LT_D:
+				OPC.float_var = OPA_double_var < OPB_double_var;
+				break;
+			case OP_NOT_D:
+				OPC.integer_var = (op_a[0].integer_var
+								   || (op_a[1].integer_var & ~0x80000000u));
+				break;
+			case OP_EQ_D:
+				OPC.integer_var = OPA_double_var == OPB_double_var;
+				break;
+			case OP_NE_D:
+				OPC.integer_var = OPA_double_var != OPB_double_var;
+				break;
+			case OP_CONV_ID:
+				OPC_double_var = OPA.integer_var;
+				break;
+			case OP_CONV_DI:
+				OPC.integer_var = OPA_double_var;
+				break;
+			case OP_CONV_FD:
+				OPC_double_var = OPA.float_var;
+				break;
+			case OP_CONV_DF:
+				OPC.float_var = OPA_double_var;
+				break;
+
 // LordHavoc: to be enabled when Progs version 7 (or whatever it will be numbered) is finalized
 /*
 			case OP_BOUNDCHECK:
diff --git a/libs/gamecode/pr_opcode.c b/libs/gamecode/pr_opcode.c
index 9e970c781..a2a344a1e 100644
--- a/libs/gamecode/pr_opcode.c
+++ b/libs/gamecode/pr_opcode.c
@@ -61,6 +61,7 @@ VISIBLE int pr_type_size[ev_type_count] = {
 	1,			// ev_integer
 	1,			// ev_uinteger
 	0,			// ev_short        value in opcode
+	2,			// ev_double
 };
 
 VISIBLE const char *pr_type_name[ev_type_count] = {
@@ -102,6 +103,10 @@ VISIBLE opcode_t pr_opcodes[] = {
 	 "%Va",
 	},
 
+	{"*", "mul.d", OP_MUL_D, false,
+	 ev_double, ev_double, ev_double,
+	 PROG_VERSION,
+	},
 	{"*", "mul.f", OP_MUL_F, false,
 	 ev_float, ev_float, ev_float,
 	 PROG_ID_VERSION,
@@ -118,6 +123,14 @@ VISIBLE opcode_t pr_opcodes[] = {
 	 ev_vector, ev_float, ev_vector,
 	 PROG_ID_VERSION,
 	},
+	{"*", "mul.dv", OP_MUL_DV, false,
+	 ev_double, ev_vector, ev_vector,
+	 PROG_ID_VERSION,
+	},
+	{"*", "mul.vd", OP_MUL_VD, false,
+	 ev_vector, ev_double, ev_vector,
+	 PROG_ID_VERSION,
+	},
 	{"*", "mul.q", OP_MUL_Q, false,
 	 ev_quat, ev_quat, ev_quat,
 	 PROG_VERSION,
@@ -130,6 +143,14 @@ VISIBLE opcode_t pr_opcodes[] = {
 	 ev_quat, ev_float, ev_quat,
 	 PROG_VERSION,
 	},
+	{"*", "mul.dq", OP_MUL_DQ, false,
+	 ev_double, ev_quat, ev_quat,
+	 PROG_VERSION,
+	},
+	{"*", "mul.qd", OP_MUL_QD, false,
+	 ev_quat, ev_double, ev_quat,
+	 PROG_VERSION,
+	},
 	{"*", "mul.qv", OP_MUL_QV, false,
 	 ev_quat, ev_vector, ev_vector,
 	 PROG_VERSION,
@@ -145,7 +166,19 @@ VISIBLE opcode_t pr_opcodes[] = {
 	 ev_float, ev_float, ev_float,
 	 PROG_ID_VERSION,
 	},
+	{"/", "div.d", OP_DIV_D, false,
+	 ev_double, ev_double, ev_double,
+	 PROG_VERSION,
+	},
+	{"%", "mod.d", OP_MOD_D, false,
+	 ev_double, ev_double, ev_double,
+	 PROG_VERSION,
+	},
 
+	{"+", "add.d", OP_ADD_D, false,
+	 ev_double, ev_double, ev_double,
+	 PROG_VERSION,
+	},
 	{"+", "add.f", OP_ADD_F, false,
 	 ev_float, ev_float, ev_float,
 	 PROG_ID_VERSION,
@@ -163,6 +196,10 @@ VISIBLE opcode_t pr_opcodes[] = {
 	 PROG_VERSION,
 	},
 
+	{"-", "sub.d", OP_SUB_D, false,
+	 ev_double, ev_double, ev_double,
+	 PROG_VERSION,
+	},
 	{"-", "sub.f", OP_SUB_F, false,
 	 ev_float, ev_float, ev_float,
 	 PROG_ID_VERSION,
@@ -176,6 +213,10 @@ VISIBLE opcode_t pr_opcodes[] = {
 	 PROG_VERSION,
 	},
 
+	{"==", "eq.d", OP_EQ_D, false,
+	 ev_double, ev_double, ev_integer,
+	 PROG_VERSION,
+	},
 	{"==", "eq.f", OP_EQ_F, false,
 	 ev_float, ev_float, ev_integer,
 	 PROG_ID_VERSION,
@@ -201,6 +242,10 @@ VISIBLE opcode_t pr_opcodes[] = {
 	 PROG_ID_VERSION,
 	},
 
+	{"!=", "ne.d", OP_NE_D, false,
+	 ev_double, ev_double, ev_integer,
+	 PROG_VERSION,
+	},
 	{"!=", "ne.f", OP_NE_F, false,
 	 ev_float, ev_float, ev_integer,
 	 PROG_ID_VERSION,
@@ -226,10 +271,18 @@ VISIBLE opcode_t pr_opcodes[] = {
 	 PROG_ID_VERSION,
 	},
 
+	{"<=", "le.d", OP_LE_D,	false,
+	 ev_double, ev_double, ev_integer,
+	 PROG_VERSION,
+	},
 	{"<=", "le.f", OP_LE_F,	false,
 	 ev_float, ev_float, ev_integer,
 	 PROG_ID_VERSION,
 	},
+	{">=", "ge.d", OP_GE_D,	false,
+	 ev_double, ev_double, ev_integer,
+	 PROG_VERSION,
+	},
 	{">=", "ge.f", OP_GE_F,	false,
 	 ev_float, ev_float, ev_integer,
 	 PROG_ID_VERSION,
@@ -242,10 +295,18 @@ VISIBLE opcode_t pr_opcodes[] = {
 	 ev_string, ev_string, ev_integer,
 	 PROG_VERSION,
 	},
+	{"<", "lt.d", OP_LT_D,	false,
+	 ev_double, ev_double, ev_integer,
+	 PROG_VERSION,
+	},
 	{"<", "lt.f", OP_LT_F,	false,
 	 ev_float, ev_float, ev_integer,
 	 PROG_ID_VERSION,
 	},
+	{">", "gt.d", OP_GT_D,	false,
+	 ev_double, ev_double, ev_integer,
+	 PROG_VERSION,
+	},
 	{">", "gt.f", OP_GT_F,	false,
 	 ev_float, ev_float, ev_integer,
 	 PROG_ID_VERSION,
@@ -264,6 +325,11 @@ VISIBLE opcode_t pr_opcodes[] = {
 	 PROG_ID_VERSION,
 	 "%Ga.%Gb(%Ec), %gc",//FIXME %E more flexible?
 	},
+	{".", "load.d", OP_LOAD_D, false,
+	 ev_entity, ev_field, ev_double,
+	 PROG_VERSION,
+	 "%Ga.%Gb(%Ec), %gc",
+	},
 	{".", "load.v", OP_LOAD_V, false,
 	 ev_entity, ev_field, ev_vector,
 	 PROG_ID_VERSION,
@@ -305,6 +371,11 @@ VISIBLE opcode_t pr_opcodes[] = {
 	 "%Ga.%Gb(%Ec), %gc",
 	},
 
+	{".", "loadb.d", OP_LOADB_D, false,
+	 ev_pointer, ev_integer, ev_double,
+	 PROG_VERSION,
+	 "*(%Ga + %Gb), %gc",
+	},
 	{".", "loadb.f", OP_LOADB_F, false,
 	 ev_pointer, ev_integer, ev_float,
 	 PROG_VERSION,
@@ -351,6 +422,11 @@ VISIBLE opcode_t pr_opcodes[] = {
 	 "*(%Ga + %Gb), %gc",
 	},
 
+	{".", "loadbi.d", OP_LOADBI_D, false,
+	 ev_pointer, ev_short, ev_double,
+	 PROG_VERSION,
+	 "*(%Ga + %sb), %gc",
+	},
 	{".", "loadbi.f", OP_LOADBI_F, false,
 	 ev_pointer, ev_short, ev_float,
 	 PROG_VERSION,
@@ -408,6 +484,11 @@ VISIBLE opcode_t pr_opcodes[] = {
 	 PROG_VERSION,
 	 "%Ga, %gc",
 	},
+	{"&", "address.d", OP_ADDRESS_D, false,
+	 ev_double, ev_invalid, ev_pointer,
+	 PROG_VERSION,
+	 "%Ga, %gc",
+	},
 	{"&", "address.f", OP_ADDRESS_F, false,
 	 ev_float, ev_invalid, ev_pointer,
 	 PROG_VERSION,
@@ -475,7 +556,32 @@ VISIBLE opcode_t pr_opcodes[] = {
 	 PROG_VERSION,
 	 "%Ga, %gc",
 	},
+	{"<CONV>", "conv.id", OP_CONV_ID, false,
+	 ev_integer, ev_invalid, ev_double,
+	 PROG_VERSION,
+	 "%Ga, %gc",
+	},
+	{"<CONV>", "conv.di", OP_CONV_DI, false,
+	 ev_double, ev_invalid, ev_integer,
+	 PROG_VERSION,
+	 "%Ga, %gc",
+	},
+	{"<CONV>", "conv.fd", OP_CONV_FD, false,
+	 ev_float, ev_invalid, ev_double,
+	 PROG_VERSION,
+	 "%Ga, %gc",
+	},
+	{"<CONV>", "conv.df", OP_CONV_DF, false,
+	 ev_double, ev_invalid, ev_float,
+	 PROG_VERSION,
+	 "%Ga, %gc",
+	},
 
+	{"=", "store.d", OP_STORE_D, true,
+	 ev_double, ev_double, ev_invalid,
+	 PROG_VERSION,
+	 "%Ga, %gb",
+	},
 	{"=", "store.f", OP_STORE_F, true,
 	 ev_float, ev_float, ev_invalid,
 	 PROG_ID_VERSION,
@@ -522,6 +628,11 @@ VISIBLE opcode_t pr_opcodes[] = {
 	 "%Ga, %gb",
 	},
 
+	{".=", "storep.d", OP_STOREP_D, true,
+	 ev_double, ev_pointer, ev_invalid,
+	 PROG_ID_VERSION,
+	 "%Ga, *%Gb",
+	},
 	{".=", "storep.f", OP_STOREP_F, true,
 	 ev_float, ev_pointer, ev_invalid,
 	 PROG_ID_VERSION,
@@ -568,6 +679,11 @@ VISIBLE opcode_t pr_opcodes[] = {
 	 "%Ga, *%Gb",
 	},
 
+	{".=", "storeb.d", OP_STOREB_D, true,
+	 ev_double, ev_pointer, ev_integer,
+	 PROG_VERSION,
+	 "%Ga, *(%Gb + %Gc)",
+	},
 	{".=", "storeb.f", OP_STOREB_F, true,
 	 ev_float, ev_pointer, ev_integer,
 	 PROG_VERSION,
@@ -614,6 +730,11 @@ VISIBLE opcode_t pr_opcodes[] = {
 	 "%Ga, *(%Gb + %Gc)",
 	},
 
+	{".=", "storebi.d", OP_STOREBI_D, true,
+	 ev_double, ev_pointer, ev_short,
+	 PROG_VERSION,
+	 "%Ga, *(%Gb + %sc)",
+	},
 	{".=", "storebi.f", OP_STOREBI_F, true,
 	 ev_float, ev_pointer, ev_short,
 	 PROG_VERSION,
@@ -672,6 +793,11 @@ VISIBLE opcode_t pr_opcodes[] = {
 	 "",
 	},
 
+	{"!", "not.d", OP_NOT_D, false,
+	 ev_double, ev_invalid, ev_integer,
+	 PROG_VERSION,
+	 "%Ga, %gc",
+	},
 	{"!", "not.f", OP_NOT_F, false,
 	 ev_float, ev_invalid, ev_integer,
 	 PROG_ID_VERSION,
diff --git a/libs/gamecode/pr_strings.c b/libs/gamecode/pr_strings.c
index b0edefa63..684551fda 100644
--- a/libs/gamecode/pr_strings.c
+++ b/libs/gamecode/pr_strings.c
@@ -70,6 +70,7 @@ struct strref_s {
 #define FMT_ADDSIGN		(1<<3)
 #define FMT_ADDBLANK	(1<<4)
 #define FMT_HEX			(1<<5)
+#define FMT_LONG		(1<<6)
 
 typedef struct fmt_item_s {
 	byte        type;
@@ -81,6 +82,7 @@ typedef struct fmt_item_s {
 		int         integer_var;
 		unsigned    uinteger_var;
 		float       float_var;
+		double      double_var;
 	}           data;
 	struct fmt_item_s *next;
 } fmt_item_t;
@@ -596,11 +598,19 @@ I_DoPrint (dstring_t *result, fmt_item_t *formatting)
 				break;
 			case 'f':
 				dstring_appendstr (tmp, "f");
-				PRINT (float);
+				if (current->flags & FMT_LONG) {
+					PRINT (double);
+				} else {
+					PRINT (float);
+				}
 				break;
 			case 'g':
 				dstring_appendstr (tmp, "g");
-				PRINT (float);
+				if (current->flags & FMT_LONG) {
+					PRINT (double);
+				} else {
+					PRINT (float);
+				}
 				break;
 			default:
 				break;
@@ -650,7 +660,7 @@ PR_Sprintf (progs_t *pr, dstring_t *result, const char *name,
 	int         fmt_count = 0;
 
 	if (!name)
-		name = "PF_InternalSprintf";
+		name = "PR_Sprintf";
 
 	*fi = new_fmt_item ();
 	c = l = format;
@@ -742,12 +752,19 @@ PR_Sprintf (progs_t *pr, dstring_t *result, const char *name,
 							fi = &(*fi)->next;
 							break;
 						case 'f':
-							// float
+							// float or double
 						case 'g':
-							// float, no trailing zeroes, trim "." if nothing
-							// after
+							// float or double, no trailing zeroes, trim "."
+							// if nothing after
 							(*fi)->type = *c;
-							(*fi)->data.float_var = P_FLOAT (pr, fmt_count);
+							if (pr->float_promoted) {
+								(*fi)->flags |= FMT_LONG;
+								(*fi)->data.double_var
+									= P_DOUBLE (pr, fmt_count);
+							} else {
+								(*fi)->data.float_var
+									= P_FLOAT (pr, fmt_count);
+							}
 
 							fmt_count++;
 							(*fi)->next = new_fmt_item ();
diff --git a/libs/ruamoko/rua_math.c b/libs/ruamoko/rua_math.c
index 0cc5e5636..167db865f 100644
--- a/libs/ruamoko/rua_math.c
+++ b/libs/ruamoko/rua_math.c
@@ -42,55 +42,55 @@
 #include "rua_internal.h"
 
 static void
-bi_sin (progs_t *pr)
+bi_sinf (progs_t *pr)
 {
 	R_FLOAT (pr) = sinf (P_FLOAT (pr, 0));
 }
 
 static void
-bi_cos (progs_t *pr)
+bi_cosf (progs_t *pr)
 {
 	R_FLOAT (pr) = cosf (P_FLOAT (pr, 0));
 }
 
 static void
-bi_tan (progs_t *pr)
+bi_tanf (progs_t *pr)
 {
 	R_FLOAT (pr) = tanf (P_FLOAT (pr, 0));
 }
 
 static void
-bi_asin (progs_t *pr)
+bi_asinf (progs_t *pr)
 {
 	R_FLOAT (pr) = asinf (P_FLOAT (pr, 0));
 }
 
 static void
-bi_acos (progs_t *pr)
+bi_acosf (progs_t *pr)
 {
 	R_FLOAT (pr) = acosf (P_FLOAT (pr, 0));
 }
 
 static void
-bi_atan (progs_t *pr)
+bi_atanf (progs_t *pr)
 {
 	R_FLOAT (pr) = atanf (P_FLOAT (pr, 0));
 }
 
 static void
-bi_atan2 (progs_t *pr)
+bi_atan2f (progs_t *pr)
 {
 	R_FLOAT (pr) = atan2f (P_FLOAT (pr, 0), P_FLOAT (pr, 1));
 }
 
 static void
-bi_log (progs_t *pr)
+bi_logf (progs_t *pr)
 {
 	R_FLOAT (pr) = logf (P_FLOAT (pr, 0));
 }
 
 static void
-bi_log2 (progs_t *pr)
+bi_log2f (progs_t *pr)
 {
 #ifdef HAVE_LOG2F
 	R_FLOAT (pr) = log2f (P_FLOAT (pr, 0));
@@ -100,95 +100,238 @@ bi_log2 (progs_t *pr)
 }
 
 static void
-bi_log10 (progs_t *pr)
+bi_log10f (progs_t *pr)
 {
 	R_FLOAT (pr) = log10f (P_FLOAT (pr, 0));
 }
 
 static void
-bi_pow (progs_t *pr)
+bi_powf (progs_t *pr)
 {
 	R_FLOAT (pr) = powf (P_FLOAT (pr, 0), P_FLOAT (pr, 1));
 }
 
 static void
-bi_sqrt (progs_t *pr)
+bi_sqrtf (progs_t *pr)
 {
 	R_FLOAT (pr) = sqrtf (P_FLOAT (pr, 0));
 }
 
 static void
-bi_cbrt (progs_t *pr)
+bi_cbrtf (progs_t *pr)
 {
 	R_FLOAT (pr) = cbrtf (P_FLOAT (pr, 0));
 }
 
 static void
-bi_hypot (progs_t *pr)
+bi_hypotf (progs_t *pr)
 {
 	R_FLOAT (pr) = hypotf (P_FLOAT (pr, 0), P_FLOAT (pr, 1));
 }
 
 static void
-bi_sinh (progs_t *pr)
+bi_sinhf (progs_t *pr)
 {
 	R_FLOAT (pr) = sinhf (P_FLOAT (pr, 0));
 }
 
 static void
-bi_cosh (progs_t *pr)
+bi_coshf (progs_t *pr)
 {
 	R_FLOAT (pr) = coshf (P_FLOAT (pr, 0));
 }
 
 static void
-bi_tanh (progs_t *pr)
+bi_tanhf (progs_t *pr)
 {
 	R_FLOAT (pr) = tanhf (P_FLOAT (pr, 0));
 }
 
 static void
-bi_asinh (progs_t *pr)
+bi_asinhf (progs_t *pr)
 {
 	double      y = P_FLOAT (pr, 0);
 	R_FLOAT (pr) = logf (y + sqrtf (y * y + 1));
 }
 
 static void
-bi_acosh (progs_t *pr)
+bi_acoshf (progs_t *pr)
 {
 	double      y = P_FLOAT (pr, 0);
 	R_FLOAT (pr) = logf (y + sqrtf (y * y - 1));
 }
 
 static void
-bi_atanh (progs_t *pr)
+bi_atanhf (progs_t *pr)
 {
 	double      y = P_FLOAT (pr, 0);
 	R_FLOAT (pr) = logf ((1 + y) / (1 - y)) / 2;
 }
 
+static void
+bi_sin (progs_t *pr)
+{
+	R_DOUBLE (pr) = sin (P_DOUBLE (pr, 0));
+}
+
+static void
+bi_cos (progs_t *pr)
+{
+	R_DOUBLE (pr) = cos (P_DOUBLE (pr, 0));
+}
+
+static void
+bi_tan (progs_t *pr)
+{
+	R_DOUBLE (pr) = tan (P_DOUBLE (pr, 0));
+}
+
+static void
+bi_asin (progs_t *pr)
+{
+	R_DOUBLE (pr) = asin (P_DOUBLE (pr, 0));
+}
+
+static void
+bi_acos (progs_t *pr)
+{
+	R_DOUBLE (pr) = acos (P_DOUBLE (pr, 0));
+}
+
+static void
+bi_atan (progs_t *pr)
+{
+	R_DOUBLE (pr) = atan (P_DOUBLE (pr, 0));
+}
+
+static void
+bi_atan2 (progs_t *pr)
+{
+	R_DOUBLE (pr) = atan2 (P_DOUBLE (pr, 0), P_DOUBLE (pr, 1));
+}
+
+static void
+bi_log (progs_t *pr)
+{
+	R_DOUBLE (pr) = log (P_DOUBLE (pr, 0));
+}
+
+static void
+bi_log2 (progs_t *pr)
+{
+	R_DOUBLE (pr) = log (P_DOUBLE (pr, 0)) / M_LOG2E;
+}
+
+static void
+bi_log10 (progs_t *pr)
+{
+	R_DOUBLE (pr) = log10 (P_DOUBLE (pr, 0));
+}
+
+static void
+bi_pow (progs_t *pr)
+{
+	R_DOUBLE (pr) = pow (P_DOUBLE (pr, 0), P_DOUBLE (pr, 1));
+}
+
+static void
+bi_sqrt (progs_t *pr)
+{
+	R_DOUBLE (pr) = sqrt (P_DOUBLE (pr, 0));
+}
+
+static void
+bi_cbrt (progs_t *pr)
+{
+	R_DOUBLE (pr) = cbrt (P_DOUBLE (pr, 0));
+}
+
+static void
+bi_hypot (progs_t *pr)
+{
+	R_DOUBLE (pr) = hypot (P_DOUBLE (pr, 0), P_DOUBLE (pr, 1));
+}
+
+static void
+bi_sinh (progs_t *pr)
+{
+	R_DOUBLE (pr) = sinh (P_DOUBLE (pr, 0));
+}
+
+static void
+bi_cosh (progs_t *pr)
+{
+	R_DOUBLE (pr) = cosh (P_DOUBLE (pr, 0));
+}
+
+static void
+bi_tanh (progs_t *pr)
+{
+	R_DOUBLE (pr) = tanh (P_DOUBLE (pr, 0));
+}
+
+static void
+bi_asinh (progs_t *pr)
+{
+	double      y = P_DOUBLE (pr, 0);
+	R_DOUBLE (pr) = log (y + sqrt (y * y + 1));
+}
+
+static void
+bi_acosh (progs_t *pr)
+{
+	double      y = P_DOUBLE (pr, 0);
+	R_DOUBLE (pr) = log (y + sqrt (y * y - 1));
+}
+
+static void
+bi_atanh (progs_t *pr)
+{
+	double      y = P_DOUBLE (pr, 0);
+	R_DOUBLE (pr) = log ((1 + y) / (1 - y)) / 2;
+}
+
 static builtin_t builtins[] = {
-	{"sin",		bi_sin,		-1},
-	{"cos",		bi_cos,		-1},
-	{"tan",		bi_tan,		-1},
-	{"asin",	bi_asin,	-1},
-	{"acos",	bi_acos,	-1},
-	{"atan",	bi_atan,	-1},
-	{"atan2", 	bi_atan2, 	-1},
-	{"log",		bi_log,		-1},
-	{"log2",	bi_log2,	-1},
-	{"log10",	bi_log10,	-1},
-	{"pow",		bi_pow,		-1},
-	{"sqrt",	bi_sqrt,	-1},
-	{"cbrt",	bi_cbrt,	-1},
-	{"hypot",	bi_hypot,	-1},
-	{"sinh",	bi_sinh,	-1},
-	{"cosh",	bi_cosh,	-1},
-	{"tanh",	bi_tanh,	-1},
-	{"asinh",	bi_asinh,	-1},
-	{"acosh",	bi_acosh,	-1},
-	{"atanh",	bi_atanh,	-1},
+	{"sin|f",	bi_sinf,	-1},
+	{"cos|f",	bi_cosf,	-1},
+	{"tan|f",	bi_tanf,	-1},
+	{"asin|f",	bi_asinf,	-1},
+	{"acos|f",	bi_acosf,	-1},
+	{"atan|f",	bi_atanf,	-1},
+	{"atan2|f",	bi_atan2f, 	-1},
+	{"log|f",	bi_logf,	-1},
+	{"log2|f",	bi_log2f,	-1},
+	{"log10|f",	bi_log10f,	-1},
+	{"pow|f",	bi_powf,	-1},
+	{"sqrt|f",	bi_sqrtf,	-1},
+	{"cbrt|f",	bi_cbrtf,	-1},
+	{"hypot|f",	bi_hypotf,	-1},
+	{"sinh|f",	bi_sinhf,	-1},
+	{"cosh|f",	bi_coshf,	-1},
+	{"tanh|f",	bi_tanhf,	-1},
+	{"asinh|f",	bi_asinhf,	-1},
+	{"acosh|f",	bi_acoshf,	-1},
+	{"atanh|f",	bi_atanhf,	-1},
+	{"sin|d",	bi_sin,		-1},
+	{"cos|d",	bi_cos,		-1},
+	{"tan|d",	bi_tan,		-1},
+	{"asin|d",	bi_asin,	-1},
+	{"acos|d",	bi_acos,	-1},
+	{"atan|d",	bi_atan,	-1},
+	{"atan2|d",	bi_atan2, 	-1},
+	{"log|d",	bi_log,		-1},
+	{"log2|d",	bi_log2,	-1},
+	{"log10|d",	bi_log10,	-1},
+	{"pow|d",	bi_pow,		-1},
+	{"sqrt|d",	bi_sqrt,	-1},
+	{"cbrt|d",	bi_cbrt,	-1},
+	{"hypot|d",	bi_hypot,	-1},
+	{"sinh|d",	bi_sinh,	-1},
+	{"cosh|d",	bi_cosh,	-1},
+	{"tanh|d",	bi_tanh,	-1},
+	{"asinh|d",	bi_asinh,	-1},
+	{"acosh|d",	bi_acosh,	-1},
+	{"atanh|d",	bi_atanh,	-1},
 	{0}
 };
 
diff --git a/nq/include/sv_progs.h b/nq/include/sv_progs.h
index e1b8d4e4a..07a8c8f7c 100644
--- a/nq/include/sv_progs.h
+++ b/nq/include/sv_progs.h
@@ -210,6 +210,11 @@ extern progs_t sv_pr_state;
 #define SVentity(e,f)	SVFIELD (e, f, entity)
 #define SVvector(e,f)	SVFIELD (e, f, vector)
 #define SVinteger(e,f)	SVFIELD (e, f, integer)
+#if TYPECHECK_PROGS
+#define SVdouble(e,f) E_DOUBLE (e, PR_AccessField (&sv_pr_state, #f, ev_##t, __FILE__, __LINE__))
+#else
+#define SVdouble(e,f) E_DOUBLE (e, sv_fields.f)
+#endif
 
 typedef struct edict_leaf_s {
 	struct edict_leaf_s *next;
diff --git a/nq/source/sv_progs.c b/nq/source/sv_progs.c
index c289b6e44..7e98550d4 100644
--- a/nq/source/sv_progs.c
+++ b/nq/source/sv_progs.c
@@ -361,6 +361,9 @@ set_address (sv_def_t *def, void *address)
 		case ev_quat:
 			*(float **)def->field = (float *) address;
 			break;
+		case ev_double:
+			*(double **)def->field = (double *) address;
+			break;
 		case ev_string:
 		case ev_entity:
 		case ev_field:
diff --git a/qw/include/sv_progs.h b/qw/include/sv_progs.h
index ca96f7de5..18bdde503 100644
--- a/qw/include/sv_progs.h
+++ b/qw/include/sv_progs.h
@@ -195,6 +195,11 @@ extern progs_t sv_pr_state;
 #define SVentity(e,f)	SVFIELD (e, f, entity)
 #define SVvector(e,f)	SVFIELD (e, f, vector)
 #define SVinteger(e,f)	SVFIELD (e, f, integer)
+#if TYPECHECK_PROGS
+#define SVdouble(e,f) E_DOUBLE (e, PR_AccessField (&sv_pr_state, #f, ev_##t, __FILE__, __LINE__))
+#else
+#define SVdouble(e,f) E_DOUBLE (e, sv_fields.f)
+#endif
 
 typedef struct edict_leaf_s {
 	struct edict_leaf_s *next;
diff --git a/qw/source/sv_progs.c b/qw/source/sv_progs.c
index cad265b11..e4856f69b 100644
--- a/qw/source/sv_progs.c
+++ b/qw/source/sv_progs.c
@@ -371,6 +371,9 @@ set_address (sv_def_t *def, void *address)
 		case ev_quat:
 			*(float **)def->field = (float *) address;
 			break;
+		case ev_double:
+			*(double **)def->field = (double *) address;
+			break;
 		case ev_string:
 		case ev_entity:
 		case ev_field:
diff --git a/ruamoko/include/math.h b/ruamoko/include/math.h
index fad67a9de..d6ad33342 100644
--- a/ruamoko/include/math.h
+++ b/ruamoko/include/math.h
@@ -60,17 +60,20 @@
 /**
 	Returns \a f, rounded down to the next lower integer
 */
-@extern float floor (float f);
+@extern @overload float floor (float f);
+@extern @overload double floor (double f);
 
 /**
 	Returns \a f, rounded up to the next highest integer
 */
-@extern float ceil (float f);
+@extern @overload float ceil (float f);
+@extern @overload double ceil (double f);
 
 /**
 	Returns the absolute value of \a f
 */
-@extern float fabs (float f);
+@extern @overload float fabs (float f);
+@extern @overload double fabs (double f);
 //\}
 
 ///\name Exponentials and Logarithms
@@ -78,32 +81,38 @@
 /**
 	Returns the natural log of \a x.
 */
-@extern float log (float x);
+@extern @overload float log (float x);
+@extern @overload double log (double x);
 
 /**
 	Returns the base-2 log of \a x.
 */
-@extern float log2 (float x);
+@extern @overload float log2 (float x);
+@extern @overload double log2 (double x);
 
 /**
 	Returns the base-10 log of \a x.
 */
-@extern float log10 (float x);
+@extern @overload float log10 (float x);
+@extern @overload double log10 (double x);
 
 /**
 	Returns \a x to the \a y power
 */
-@extern float pow (float x, float y);
+@extern @overload float pow (float x, float y);
+@extern @overload double pow (double x, double y);
 
 /**
 	Returns the square root of \a x
 */
-@extern float sqrt (float x);
+@extern @overload float sqrt (float x);
+@extern @overload double sqrt (double x);
 
 /**
 	Returns the cube root of \a x
 */
-@extern float cbrt (float x);
+@extern @overload float cbrt (float x);
+@extern @overload double cbrt (double x);
 //\}
 
 ///\name Trigonometric functions
@@ -112,40 +121,52 @@
 /**
 	Returns the sine of \a x.
 */
-@extern float sin (float x);
+@extern @overload float sin (float x);
+@extern @overload double sin (double x);
 
 /**
 	Returns the cosine of \a x.
 */
-@extern float cos (float x);
+@extern @overload float cos (float x);
+@extern @overload double cos (double x);
 
 /**
 	Returns the tangent of \a x.
 */
-@extern float tan (float x);
+@extern @overload float tan (float x);
+@extern @overload double tan (double x);
 
 /**
 	Returns the arcsine of \a x.
 */
-@extern float asin (float x);
+@extern @overload float asin (float x);
+@extern @overload double asin (double x);
 
 /**
 	Returns the arccosine of \a x.
 */
-@extern float acos (float x);
+@extern @overload float acos (float x);
+@extern @overload double acos (double x);
 
 /**
 	Returns the arctangent of \a x.
 */
-@extern float atan (float x);
-@extern float atan2 (float y, float x);
+@extern @overload float atan (float x);
+@extern @overload double atan (double x);
+
+/**
+	Returns the arctangent of \a y / \a x preserving the quadrant.
+*/
+@extern @overload float atan2 (float y, float x);
+@extern @overload double atan2 (double y, double x);
 
 /**
 	Returns the length of the hypotenuse of a right triangle with sides \a x
 	and \a y. That is, this function returns
 	<code>sqrt (\a x*\a x + \a y*\a y)</code>.
 */
-@extern float hypot (float x, float y);
+@extern @overload float hypot (float x, float y);
+@extern @overload double hypot (double x, double y);
 //\}
 
 ///\name Hyperbolic functions
@@ -153,32 +174,38 @@
 /**
 	Returns the hyperbolic sine of \a x
 */
-@extern float sinh (float x);
+@extern @overload float sinh (float x);
+@extern @overload double sinh (double x);
 
 /**
 	Returns the hyperbolic cosine of \a x
 */
-@extern float cosh (float x);
+@extern @overload float cosh (float x);
+@extern @overload double cosh (double x);
 
 /**
 	Returns the hyperbolic tangent of \a x
 */
-@extern float tanh (float x);
+@extern @overload float tanh (float x);
+@extern @overload double tanh (double x);
 
 /**
 	Returns the area hyperbolic sine of \a x
 */
-@extern float asinh (float x);
+@extern @overload float asinh (float x);
+@extern @overload double asinh (double x);
 
 /**
 	Returns the area hyperbolic cosine of \a x
 */
-@extern float acosh (float x);
+@extern @overload float acosh (float x);
+@extern @overload double acosh (double x);
 
 /**
 	Returns the area hyperbolic tangent of \a x
 */
-@extern float atanh (float x);
+@extern @overload float atanh (float x);
+@extern @overload double atanh (double x);
 //\}
 
 ///\name Vector Functions
diff --git a/ruamoko/lib/math.r b/ruamoko/lib/math.r
index 8d0c51342..80db2b710 100644
--- a/ruamoko/lib/math.r
+++ b/ruamoko/lib/math.r
@@ -34,3 +34,27 @@ float (float x) atanh = #0;
 float (float x) sqrt = #0;
 float (float x) cbrt = #0;
 float (float x, float y) hypot = #0;
+
+double (double v) floor = #0;
+double (double v) ceil = #0;
+double (double f) fabs = #0;
+double (double x) sin = #0;
+double (double x) cos = #0;
+double (double x) tan = #0;
+double (double x) asin = #0;
+double (double x) acos = #0;
+double (double x) atan = #0;
+double (double y, double x) atan2 = #0;
+double (double x) log = #0;
+double (double x) log2 = #0;
+double (double x) log10 = #0;
+double (double x, double y) pow = #0;
+double (double x) sinh = #0;
+double (double x) cosh = #0;
+double (double x) tanh = #0;
+double (double x) asinh = #0;
+double (double x) acosh = #0;
+double (double x) atanh = #0;
+double (double x) sqrt = #0;
+double (double x) cbrt = #0;
+double (double x, double y) hypot = #0;
diff --git a/tools/qfcc/include/expr.h b/tools/qfcc/include/expr.h
index d83610b7f..b11e93c2c 100644
--- a/tools/qfcc/include/expr.h
+++ b/tools/qfcc/include/expr.h
@@ -174,6 +174,7 @@ typedef struct ex_value_s {
 	etype_t     lltype;
 	union {
 		const char *string_val;			///< string constant
+		float       double_val;			///< double constant
 		float       float_val;			///< float constant
 		float       vector_val[3];		///< vector constant
 		int         entity_val;			///< entity constant
@@ -397,6 +398,15 @@ expr_t *new_name_expr (const char *name);
 expr_t *new_string_expr (const char *string_val);
 const char *expr_string (expr_t *e) __attribute__((pure));
 
+/** Create a new double constant expression node.
+
+	\param double_val	The double constant being represented.
+	\return			The new double constant expression node
+					(expr_t::e::double_val).
+*/
+expr_t *new_double_expr (double double_val);
+double expr_double (expr_t *e) __attribute__((pure));
+
 /** Create a new float constant expression node.
 
 	\param float_val	The float constant being represented.
diff --git a/tools/qfcc/include/type.h b/tools/qfcc/include/type.h
index d064de8ca..d6a43816e 100644
--- a/tools/qfcc/include/type.h
+++ b/tools/qfcc/include/type.h
@@ -98,6 +98,7 @@ typedef struct {
 extern	type_t	type_invalid;
 extern	type_t	type_void;
 extern	type_t	type_string;
+extern	type_t	type_double;
 extern	type_t	type_float;
 extern	type_t	type_vector;
 extern	type_t	type_entity;
@@ -153,6 +154,7 @@ const char *type_get_encoding (const type_t *type);
 int is_void (const type_t *type) __attribute__((pure));
 int is_enum (const type_t *type) __attribute__((pure));
 int is_integral (const type_t *type) __attribute__((pure));
+int is_double (const type_t *type) __attribute__((pure));
 int is_float (const type_t *type) __attribute__((pure));
 int is_scalar (const type_t *type) __attribute__((pure));
 int is_vector (const type_t *type) __attribute__((pure));
diff --git a/tools/qfcc/include/value.h b/tools/qfcc/include/value.h
index 883af01e0..aaac286b7 100644
--- a/tools/qfcc/include/value.h
+++ b/tools/qfcc/include/value.h
@@ -40,6 +40,7 @@ struct ex_value_s;
 struct type_s;
 
 struct ex_value_s *new_string_val (const char *string_val);
+struct ex_value_s *new_double_val (double double_val);
 struct ex_value_s *new_float_val (float float_val);
 struct ex_value_s *new_vector_val (const float *vector_val);
 struct ex_value_s *new_entity_val (int entity_val);
diff --git a/tools/qfcc/source/constfold.c b/tools/qfcc/source/constfold.c
index 817703945..3cba7f467 100644
--- a/tools/qfcc/source/constfold.c
+++ b/tools/qfcc/source/constfold.c
@@ -48,6 +48,7 @@
 #include "qfcc.h"
 #include "strpool.h"
 #include "type.h"
+#include "value.h"
 #include "qc-parse.h"
 
 typedef expr_t *(*operation_t) (int op, expr_t *e, expr_t *e1, expr_t *e2);
@@ -163,6 +164,40 @@ convert_to_float (expr_t *e)
 	}
 }
 
+static expr_t *
+convert_to_double (expr_t *e)
+{
+	if (get_type (e) == &type_double)
+		return e;
+
+	switch (e->type) {
+		case ex_value:
+			switch (e->e.value->lltype) {
+				case ev_integer:
+					e->e.value = new_double_val (expr_integer (e));
+					return e;
+				case ev_short:
+					e->e.value = new_double_val (expr_short (e));
+					return e;
+				case ev_float:
+					e->e.value = new_double_val (expr_float (e));
+					return e;
+				default:
+					internal_error (e, 0);
+			}
+			break;
+		case ex_symbol:
+		case ex_expr:
+		case ex_uexpr:
+		case ex_temp:
+		case ex_block:
+			e = cf_cast_expr (&type_float, e);
+			return e;
+		default:
+			internal_error (e, 0);
+	}
+}
+
 static expr_t *
 do_op_float (int op, expr_t *e, expr_t *e1, expr_t *e2)
 {
@@ -292,6 +327,111 @@ do_op_float (int op, expr_t *e, expr_t *e1, expr_t *e2)
 	return e;
 }
 
+static expr_t *
+do_op_double (int op, expr_t *e, expr_t *e1, expr_t *e2)
+{
+	double      d1, d2;
+	expr_t     *conv;
+	type_t     *type = &type_double;
+	static int  valid[] = {
+		'=', '+', '-', '*', '/', '%',
+		LT, GT, LE, GE, EQ, NE, 0
+	};
+
+	if (!valid_op (op, valid))
+		return error (e1, "invalid operator for double");
+
+	if (op == '=' || op == PAS) {
+		if ((type = get_type (e1)) != &type_double) {
+			//FIXME optimize casting a constant
+			e->e.expr.e2 = e2 = cf_cast_expr (type, e2);
+		} else if ((conv = convert_to_double (e2)) != e2) {
+			e->e.expr.e2 = e2 = conv;
+		}
+	} else {
+		if ((conv = convert_to_double (e1)) != e1) {
+			e->e.expr.e1 = e1 = conv;
+		}
+		if ((conv = convert_to_double (e2)) != e2) {
+			e->e.expr.e2 = e2 = conv;
+		}
+	}
+	if (is_compare (op) || is_logic (op)) {
+		type = &type_integer;
+	}
+	e->e.expr.type = type;
+
+	if (op == '*' && is_constant (e1) && expr_double (e1) == 1)
+		return e2;
+	if (op == '*' && is_constant (e2) && expr_double (e2) == 1)
+		return e1;
+	if (op == '*' && is_constant (e1) && expr_double (e1) == 0)
+		return e1;
+	if (op == '*' && is_constant (e2) && expr_double (e2) == 0)
+		return e2;
+	if (op == '/' && is_constant (e2) && expr_double (e2) == 1)
+		return e1;
+	if (op == '/' && is_constant (e2) && expr_double (e2) == 0)
+		return error (e, "division by zero");
+	if (op == '/' && is_constant (e1) && expr_double (e1) == 0)
+		return e1;
+	if (op == '+' && is_constant (e1) && expr_double (e1) == 0)
+		return e2;
+	if (op == '+' && is_constant (e2) && expr_double (e2) == 0)
+		return e1;
+	if (op == '-' && is_constant (e2) && expr_double (e2) == 0)
+		return e1;
+
+	if (op == '=' || !is_constant (e1) || !is_constant (e2))
+		return e;
+
+	d1 = expr_double (e1);
+	d2 = expr_double (e2);
+
+	switch (op) {
+		case '+':
+			e = new_double_expr (d1 + d2);
+			break;
+		case '-':
+			e = new_double_expr (d1 - d2);
+			break;
+		case '*':
+			e = new_double_expr (d1 * d2);
+			break;
+		case '/':
+			if (!d2)
+				return error (e1, "divide by zero");
+			e = new_double_expr (d1 / d2);
+			break;
+		case '%':
+			e = new_double_expr ((int)d1 % (int)d2);
+			break;
+		case LT:
+			e = new_integer_expr (d1 < d2);
+			break;
+		case GT:
+			e = new_integer_expr (d1 > d2);
+			break;
+		case LE:
+			e = new_integer_expr (d1 <= d2);
+			break;
+		case GE:
+			e = new_integer_expr (d1 >= d2);
+			break;
+		case EQ:
+			e = new_integer_expr (d1 == d2);
+			break;
+		case NE:
+			e = new_integer_expr (d1 != d2);
+			break;
+		default:
+			internal_error (e1, 0);
+	}
+	e->file = e1->file;
+	e->line = e1->line;
+	return e;
+}
+
 static expr_t *
 do_op_vector (int op, expr_t *e, expr_t *e1, expr_t *e2)
 {
@@ -884,11 +1024,15 @@ do_op_compound (int op, expr_t *e, expr_t *e1, expr_t *e2)
 		return do_op_struct (op, e, e1, e2);
 	if (is_scalar (t1) && is_scalar (t2)) {
 		if (is_enum (t1)) {
-			if (t2->type == ev_float)
+			if (t2->type == ev_double)
+				return do_op_float (op, e, e1, e2);
+			if (t2->type == ev_double)
 				return do_op_float (op, e, e1, e2);
 			return do_op_integer (op, e, e1, e2);
 		}
 		if (is_enum (t2)) {
+			if (t1->type == ev_double)
+				return do_op_double (op, e, e1, e2);
 			if (t1->type == ev_float)
 				return do_op_float (op, e, e1, e2);
 			return do_op_integer (op, e, e1, e2);
@@ -947,6 +1091,7 @@ static operation_t op_void[ev_type_count] = {
 	do_op_invalid,						// ev_integer
 	do_op_invalid,						// ev_uinteger
 	do_op_invalid,						// ev_short
+	do_op_invalid,						// ev_double
 	do_op_invalid,						// ev_invalid
 };
 
@@ -963,6 +1108,7 @@ static operation_t op_string[ev_type_count] = {
 	do_op_invalid,						// ev_integer
 	do_op_invalid,						// ev_uinteger
 	do_op_invalid,						// ev_short
+	do_op_invalid,						// ev_double
 	do_op_invalid,						// ev_invalid
 };
 
@@ -979,6 +1125,7 @@ static operation_t op_float[ev_type_count] = {
 	do_op_float,						// ev_integer
 	do_op_float,						// ev_uinteger
 	do_op_float,						// ev_short
+	do_op_double,						// ev_double
 	do_op_invalid,						// ev_invalid
 };
 
@@ -995,6 +1142,7 @@ static operation_t op_vector[ev_type_count] = {
 	do_op_vector,						// ev_integer
 	do_op_vector,						// ev_uinteger
 	do_op_vector,						// ev_short
+	do_op_vector,						// ev_double
 	do_op_invalid,						// ev_invalid
 };
 
@@ -1011,6 +1159,7 @@ static operation_t op_entity[ev_type_count] = {
 	do_op_invalid,						// ev_integer
 	do_op_invalid,						// ev_uinteger
 	do_op_invalid,						// ev_short
+	do_op_invalid,						// ev_double
 	do_op_invalid,						// ev_invalid
 };
 
@@ -1027,6 +1176,7 @@ static operation_t op_field[ev_type_count] = {
 	do_op_invalid,						// ev_integer
 	do_op_invalid,						// ev_uinteger
 	do_op_invalid,						// ev_short
+	do_op_invalid,						// ev_double
 	do_op_invalid,						// ev_invalid
 };
 
@@ -1043,6 +1193,7 @@ static operation_t op_func[ev_type_count] = {
 	do_op_func,							// ev_integer
 	do_op_func,							// ev_uinteger
 	do_op_func,							// ev_short
+	do_op_func,							// ev_double
 	do_op_func,							// ev_invalid
 };
 
@@ -1059,6 +1210,7 @@ static operation_t op_pointer[ev_type_count] = {
 	do_op_pointer,						// ev_integer
 	do_op_pointer,						// ev_uinteger
 	do_op_pointer,						// ev_short
+	do_op_pointer,						// ev_double
 	do_op_pointer,						// ev_invalid
 };
 
@@ -1075,6 +1227,7 @@ static operation_t op_quaternion[ev_type_count] = {
 	do_op_quaternion,					// ev_integer
 	do_op_quaternion,					// ev_uinteger
 	do_op_quaternion,					// ev_short
+	do_op_quaternion,					// ev_double
 	do_op_invalid,						// ev_invalid
 };
 
@@ -1091,6 +1244,7 @@ static operation_t op_integer[ev_type_count] = {
 	do_op_integer,						// ev_integer
 	do_op_uinteger,						// ev_uinteger
 	do_op_integer,						// ev_short
+	do_op_double,						// ev_double
 	do_op_invalid,						// ev_invalid
 };
 
@@ -1107,6 +1261,7 @@ static operation_t op_uinteger[ev_type_count] = {
 	do_op_uinteger,						// ev_integer
 	do_op_uinteger,						// ev_uinteger
 	do_op_uinteger,						// ev_short
+	do_op_double,						// ev_double
 	do_op_invalid,						// ev_invalid
 };
 
@@ -1123,6 +1278,24 @@ static operation_t op_short[ev_type_count] = {
 	do_op_integer,						// ev_integer
 	do_op_uinteger,						// ev_uinteger
 	do_op_short,						// ev_short
+	do_op_double,						// ev_double
+	do_op_invalid,						// ev_invalid
+};
+
+static operation_t op_double[ev_type_count] = {
+	do_op_invalid,						// ev_void
+	do_op_invalid,						// ev_string
+	do_op_float,						// ev_float
+	do_op_vector,						// ev_vector
+	do_op_invalid,						// ev_entity
+	do_op_invalid,						// ev_field
+	do_op_invalid,						// ev_func
+	do_op_invalid,						// ev_pointer
+	do_op_quaternion,					// ev_quaternion
+	do_op_integer,						// ev_integer
+	do_op_uinteger,						// ev_uinteger
+	do_op_short,						// ev_short
+	do_op_double,						// ev_double
 	do_op_invalid,						// ev_invalid
 };
 
@@ -1139,6 +1312,7 @@ static operation_t op_compound[ev_type_count] = {
 	do_op_compound,						// ev_integer
 	do_op_compound,						// ev_uinteger
 	do_op_compound,						// ev_short
+	do_op_compound,						// ev_double
 	do_op_compound,						// ev_invalid
 };
 
@@ -1155,6 +1329,7 @@ static operation_t *do_op[ev_type_count] = {
 	op_integer,							// ev_integer
 	op_uinteger,						// ev_uinteger
 	op_short,							// ev_short
+	op_double,							// ev_double
 	op_compound,						// ev_invalid
 };
 
@@ -1203,13 +1378,15 @@ static expr_t *
 uop_float (int op, expr_t *e, expr_t *e1)
 {
 	static int  valid[] = { '+', '-', '!', '~', 'C', 0 };
+	type_t     *type;
 
 	if (!valid_op (op, valid))
 		return error (e1, "invalid unary operator for float: %s",
 					  get_op_string (op));
 	if (op == '+')
 		return e1;
-	if (op == 'C' && get_type (e) != &type_integer)
+	type = get_type (e);
+	if (op == 'C' && type != &type_integer && type != &type_double)
 		return error (e1, "invalid cast of float");
 	if (!is_constant (e1))
 		return e;
@@ -1222,7 +1399,11 @@ uop_float (int op, expr_t *e, expr_t *e1)
 		case '~':
 			return new_float_expr (~(int) expr_float (e1));
 		case 'C':
-			return new_integer_expr (expr_float (e1));
+			if (type == &type_integer) {
+				return new_integer_expr (expr_float (e1));
+			} else {
+				return new_double_expr (expr_float (e1));
+			}
 	}
 	internal_error (e, "float unary op blew up");
 }
@@ -1420,6 +1601,38 @@ uop_short (int op, expr_t *e, expr_t *e1)
 	internal_error (e, "short unary op blew up");
 }
 
+static expr_t *
+uop_double (int op, expr_t *e, expr_t *e1)
+{
+	static int  valid[] = { '+', '-', '!', 'C', 0 };
+	type_t     *type;
+
+	if (!valid_op (op, valid))
+		return error (e1, "invalid unary operator for double: %s",
+					  get_op_string (op));
+	if (op == '+')
+		return e1;
+	type = get_type (e);
+	if (op == 'C' && type != &type_integer && type != &type_float)
+		return error (e1, "invalid cast of double");
+	if (!is_constant (e1))
+		return e;
+	switch (op) {
+		case '-':
+			return new_double_expr (-expr_double (e1));
+		case '!':
+			print_type (get_type (e));
+			return new_integer_expr (!expr_double (e1));
+		case 'C':
+			if (type == &type_integer) {
+				return new_integer_expr (expr_double (e1));
+			} else {
+				return new_float_expr (expr_double (e1));
+			}
+	}
+	internal_error (e, "float unary op blew up");
+}
+
 static expr_t *
 uop_compound (int op, expr_t *e, expr_t *e1)
 {
@@ -1446,6 +1659,7 @@ static unaryop_t do_unary_op[ev_type_count] = {
 	uop_integer,						// ev_integer
 	uop_uinteger,						// ev_uinteger
 	uop_short,							// ev_short
+	uop_double,							// ev_double
 	uop_compound,						// ev_invalid
 };
 
@@ -1487,7 +1701,7 @@ fold_constants (expr_t *e)
 
 		if (t1 >= ev_type_count || t2 >= ev_type_count
 			|| !do_op[t1] || !do_op[t1][t2])
-			internal_error (e, "invalid type");
+			internal_error (e, "invalid type %d %d", t1, t2);
 		return do_op[t1][t2] (op, e, e1, e2);
 	}
 	return e;
diff --git a/tools/qfcc/source/dot_expr.c b/tools/qfcc/source/dot_expr.c
index b98cc7b99..675488e93 100644
--- a/tools/qfcc/source/dot_expr.c
+++ b/tools/qfcc/source/dot_expr.c
@@ -438,6 +438,9 @@ print_value (dstring_t *dstr, expr_t *e, int level, int id, expr_t *next)
 		case ev_string:
 			label = va ("\\\"%s\\\"", quote_string (e->e.value->v.string_val));
 			break;
+		case ev_double:
+			label = va ("f %g", e->e.value->v.double_val);
+			break;
 		case ev_float:
 			label = va ("f %g", e->e.value->v.float_val);
 			break;
diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index 4970cc7cd..0773e0a8f 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -611,6 +611,15 @@ new_string_expr (const char *string_val)
 	return e;
 }
 
+expr_t *
+new_double_expr (double double_val)
+{
+	expr_t     *e = new_expr ();
+	e->type = ex_value;
+	e->e.value = new_double_val (double_val);
+	return e;
+}
+
 expr_t *
 new_float_expr (float float_val)
 {
@@ -845,6 +854,23 @@ is_float_val (expr_t *e)
 	return 0;
 }
 
+double
+expr_double (expr_t *e)
+{
+	if (e->type == ex_nil)
+		return 0;
+	if (e->type == ex_value && e->e.value->lltype == ev_double)
+		return e->e.value->v.double_val;
+	if (e->type == ex_symbol && e->e.symbol->sy_type == sy_const
+		&& e->e.symbol->type->type == ev_double)
+		return e->e.symbol->s.value->v.double_val;
+	if (e->type == ex_symbol && e->e.symbol->sy_type == sy_var
+		&& e->e.symbol->s.def->constant
+		&& is_double (e->e.symbol->s.def->type))
+		return D_FLOAT (e->e.symbol->s.def);
+	internal_error (e, "not a double constant");
+}
+
 float
 expr_float (expr_t *e)
 {
@@ -1276,6 +1302,9 @@ test_expr (expr_t *e)
 			}
 			new = new_float_expr (0);
 			break;
+		case ev_double:
+			new = new_double_expr (0);
+			break;
 		case ev_vector:
 			new = new_vector_expr (zero);
 			break;
@@ -1610,6 +1639,8 @@ unary_expr (int op, expr_t *e)
 					case ev_func:
 					case ev_pointer:
 						internal_error (e, "type check failed!");
+					case ev_double:
+						return new_double_expr (-expr_double (e));
 					case ev_float:
 						return new_float_expr (-expr_float (e));
 					case ev_vector:
@@ -1676,6 +1707,8 @@ unary_expr (int op, expr_t *e)
 					case ev_string:
 						s = expr_string (e);
 						return new_integer_expr (!s || !s[0]);
+					case ev_double:
+						return new_integer_expr (!expr_double (e));
 					case ev_float:
 						return new_integer_expr (!expr_float (e));
 					case ev_vector:
@@ -1735,6 +1768,7 @@ unary_expr (int op, expr_t *e)
 					case ev_func:
 					case ev_pointer:
 					case ev_vector:
+					case ev_double:
 						return error (e, "invalid type for unary ~");
 					case ev_float:
 						return new_float_expr (~(int) expr_float (e));
diff --git a/tools/qfcc/source/qc-lex.l b/tools/qfcc/source/qc-lex.l
index 1b234e9e4..0c9fea604 100644
--- a/tools/qfcc/source/qc-lex.l
+++ b/tools/qfcc/source/qc-lex.l
@@ -333,6 +333,7 @@ static keyword_t at_keywords[] = {
 // be supported (sanely) by v6 progs.
 static keyword_t qf_keywords[] = {
 	{"quaternion",	TYPE,	&type_quaternion},
+	{"double",		TYPE,	&type_double},
 	{"int",			TYPE,	&type_integer	},
 	{"unsigned",	TYPE,	&type_integer	},//FIXME
 	{"function",	TYPE,	&type_function	},
diff --git a/tools/qfcc/source/statements.c b/tools/qfcc/source/statements.c
index c4c92f254..cd49b3970 100644
--- a/tools/qfcc/source/statements.c
+++ b/tools/qfcc/source/statements.c
@@ -87,6 +87,8 @@ operand_string (operand_t *op)
 				case ev_string:
 					return va ("\"%s\"",
 							   quote_string (op->o.value->v.string_val));
+				case ev_double:
+					return va ("%g", op->o.value->v.double_val);
 				case ev_float:
 					return va ("%g", op->o.value->v.float_val);
 				case ev_vector:
@@ -159,6 +161,9 @@ print_operand (operand_t *op)
 				case ev_string:
 					printf ("\"%s\"", op->o.value->v.string_val);
 					break;
+				case ev_double:
+					printf ("%g", op->o.value->v.double_val);
+					break;
 				case ev_float:
 					printf ("%g", op->o.value->v.float_val);
 					break;
diff --git a/tools/qfcc/source/type.c b/tools/qfcc/source/type.c
index d99a89cc4..81bd21ef9 100644
--- a/tools/qfcc/source/type.c
+++ b/tools/qfcc/source/type.c
@@ -76,6 +76,7 @@ type_t      type_quaternion = { ev_quat, "quaternion" };
 type_t      type_integer = { ev_integer, "int" };
 type_t      type_uinteger = { ev_uinteger, "uint" };
 type_t      type_short = { ev_short, "short" };
+type_t      type_double = { ev_double, "double" };
 
 type_t     *type_nil;
 type_t     *type_default;
@@ -101,6 +102,7 @@ type_t     *ev_types[ev_type_count] = {
 	&type_integer,
 	&type_uinteger,
 	&type_short,
+	&type_double,
 	&type_invalid,
 };
 
@@ -180,6 +182,7 @@ free_type (type_t *type)
 		case ev_integer:
 		case ev_uinteger:
 		case ev_short:
+		case ev_double:
 			break;
 		case ev_field:
 		case ev_pointer:
@@ -214,6 +217,7 @@ append_type (type_t *type, type_t *new)
 			case ev_integer:
 			case ev_uinteger:
 			case ev_short:
+			case ev_double:
 				internal_error (0, "append to basic type");
 			case ev_field:
 			case ev_pointer:
@@ -582,6 +586,9 @@ encode_type (dstring_t *encoding, const type_t *type)
 		case ev_string:
 			dasprintf (encoding, "*");
 			break;
+		case ev_double:
+			dasprintf (encoding, "d");
+			break;
 		case ev_float:
 			dasprintf (encoding, "f");
 			break;
@@ -685,6 +692,12 @@ is_integral (const type_t *type)
 	return is_enum (type);
 }
 
+int
+is_double (const type_t *type)
+{
+	return type->type == ev_double;
+}
+
 int
 is_float (const type_t *type)
 {
@@ -694,7 +707,7 @@ is_float (const type_t *type)
 int
 is_scalar (const type_t *type)
 {
-	return is_float (type) || is_integral (type);
+	return is_float (type) || is_integral (type) || is_double (type);
 }
 
 int
@@ -830,6 +843,7 @@ type_size (const type_t *type)
 		case ev_integer:
 		case ev_uinteger:
 		case ev_short:
+		case ev_double:
 		case ev_type_count:
 			return pr_type_size[type->type];
 		case ev_invalid:
@@ -869,6 +883,7 @@ init_types (void)
 {
 	static struct_def_t zero_struct[] = {
 		{"string_val",       &type_string},
+		{"double_val",       &type_double},
 		{"float_val",        &type_float},
 		{"entity_val",       &type_entity},
 		{"field_val",        &type_field},
@@ -884,6 +899,7 @@ init_types (void)
 	};
 	static struct_def_t param_struct[] = {
 		{"string_val",       &type_string},
+		{"double_val",       &type_double},
 		{"float_val",        &type_float},
 		{"vector_val",       &type_vector},
 		{"entity_val",       &type_entity},
@@ -982,6 +998,7 @@ chain_initial_types (void)
 		chain_type (&type_integer);
 		chain_type (&type_uinteger);
 		chain_type (&type_short);
+		chain_type (&type_double);
 	}
 
 	chain_type (&type_param);
diff --git a/tools/qfcc/source/value.c b/tools/qfcc/source/value.c
index 29d6eabed..4f1ae9f82 100644
--- a/tools/qfcc/source/value.c
+++ b/tools/qfcc/source/value.c
@@ -132,6 +132,16 @@ new_string_val (const char *string_val)
 	return find_value (&val);
 }
 
+ex_value_t *
+new_double_val (double double_val)
+{
+	ex_value_t  val;
+	memset (&val, 0, sizeof (val));
+	set_val_type (&val, &type_double);
+	val.v.double_val = double_val;
+	return find_value (&val);
+}
+
 ex_value_t *
 new_float_val (float float_val)
 {

From 98216c6eb06fe5956e63230de31cc3bdaaf2f313 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 14 Feb 2020 16:40:38 +0900
Subject: [PATCH 0366/1519] Fixed some missed doxygen updates

---
 include/QF/progs.h | 56 +++++++++++++++++++++++-----------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/include/QF/progs.h b/include/QF/progs.h
index f3358c708..945145bd3 100644
--- a/include/QF/progs.h
+++ b/include/QF/progs.h
@@ -1567,36 +1567,36 @@ struct progs_s {
 	int         zone_size;			///< set by user
 
 	/// \name builtin functions
-	//@{
+	///@{
 	struct hashtab_s *builtin_hash;
 	struct hashtab_s *builtin_num_hash;
 	unsigned    bi_next;
 	unsigned  (*bi_map) (progs_t *pr, unsigned binum);
-	//@}
+	///@}
 
 	/// \name symbol management
-	//@{
+	///@{
 	struct hashtab_s *function_hash;
 	struct hashtab_s *global_hash;
 	struct hashtab_s *field_hash;
-	//@}
+	///@}
 
 	/// \name load hooks
-	//@{
+	///@{
 	int         num_load_funcs;
 	int         max_load_funcs;
 	pr_load_func_t **load_funcs;
 
 	/// cleared each load
-	//@{
+	///@{
 	int         num_load_finish_funcs;
 	int         max_load_finish_funcs;
 	pr_load_func_t **load_finish_funcs;
-	//@}
-	//@}
+	///@}
+	///@}
 
 	/// \name string management
-	//@{
+	///@{
 	struct dstring_mem_s *ds_mem;
 	strref_t   *free_string_refs;
 	strref_t   *static_strings;
@@ -1608,10 +1608,10 @@ struct progs_s {
 	int         num_strings;
 	strref_t   *pr_xtstr;
 	int         float_promoted;	///< for PR_Sprintf
-	//@}
+	///@}
 
 	/// \name memory map
-	//@{
+	///@{
 	dfunction_t *pr_functions;
 	bfunction_t *function_table;
 	char       *pr_strings;
@@ -1621,10 +1621,10 @@ struct progs_s {
 	dstatement_t *pr_statements;
 	pr_type_t  *pr_globals;
 	unsigned    globals_size;
-	//@}
+	///@}
 
 	/// \name parameter block
-	//@{
+	///@{
 	pr_type_t  *pr_return;
 	pr_type_t  *pr_params[MAX_PARMS];
 	pr_type_t  *pr_real_params[MAX_PARMS];
@@ -1632,10 +1632,10 @@ struct progs_s {
 	pr_type_t  *pr_saved_params;
 	int         pr_saved_argc;
 	int         pr_param_size;		///< covers both params and return
-	//@}
+	///@}
 
 	/// \name edicts
-	//@{
+	///@{
 	edict_t   **edicts;
 	int         max_edicts;			///< set by user
 	int        *num_edicts;
@@ -1647,10 +1647,10 @@ struct progs_s {
 	int         pr_edict_size;		///< in bytes
 	int         pr_edictareasize;	///< for bounds checking, starts at 0
 	func_t      edict_parse;
-	//@}
+	///@}
 
 	/// \name execution state
-	//@{
+	///@{
 	int         pr_argc;
 
 	qboolean    pr_trace;
@@ -1668,24 +1668,24 @@ struct progs_s {
 	/// be considered valid if there is no .stack global.
 	/// \note The return address and saved locals will not ever be on this
 	/// stack.
-	//@{
+	///@{
 	pr_type_t  *stack;
 	pointer_t   stack_bottom;
 	int         stack_size;			///< set by user
-	//@}
+	///@}
 
 	int         localstack[LOCALSTACK_SIZE];
 	int         localstack_used;
-	//@}
+	///@}
 
 	/// \name resources
-	//@{
+	///@{
 	pr_resource_t *resources;
 	struct hashtab_s *resource_hash;
-	//@}
+	///@}
 
 	/// \name obj info
-	//@{
+	///@{
 	unsigned    selector_index;
 	unsigned    selector_index_max;
 	struct obj_list_s **selector_sels;
@@ -1698,10 +1698,10 @@ struct progs_s {
 	struct obj_list_s *unclaimed_proto_list;
 	struct obj_list_s *module_list;
 	struct obj_list_s *class_tree_list;
-	//@}
+	///@}
 
 	/// \name debug info
-	//@{
+	///@{
 	const char *debugfile;
 	struct pr_debug_header_s *debug;
 	struct pr_auxfunction_s *auxfunctions;
@@ -1711,10 +1711,10 @@ struct progs_s {
 	pr_type_t  *watch;
 	int         wp_conditional;
 	pr_type_t   wp_val;
-	//@}
+	///@}
 
 	/// \name globals and fields needed by the VM
-	//@{
+	///@{
 	struct {
 		float      *time;		///< required for OP_STATE
 		pr_int_t   *self;		///< required for OP_STATE
@@ -1726,7 +1726,7 @@ struct progs_s {
 		pr_int_t    think;		///< required for OP_STATE
 		pr_int_t    this;		///< optional for entity<->object linking
 	} fields;
-	//@}
+	///@}
 };
 
 /** \addtogroup progs_data_access

From 8920c59515eed6db31e6a47e5c54e3489bca8285 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 14 Feb 2020 18:13:55 +0900
Subject: [PATCH 0367/1519] Find @override functions even when there's only one

---
 tools/qfcc/source/function.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/qfcc/source/function.c b/tools/qfcc/source/function.c
index 7f28a77b9..9120386b5 100644
--- a/tools/qfcc/source/function.c
+++ b/tools/qfcc/source/function.c
@@ -338,7 +338,7 @@ find_function (expr_t *fexpr, expr_t *params)
 		return fexpr;
 	for (func_count = 0; funcs[func_count]; func_count++)
 		;
-	if (func_count < 2) {
+	if (func_count < 1) {
 		free (funcs);
 		return fexpr;
 	}

From eb7f8251580cd8515bc87fb7e96f1b8f7a0aa3ce Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 14 Feb 2020 18:14:22 +0900
Subject: [PATCH 0368/1519] Test for full-float %

---
 tools/qfcc/test/modulo.r | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/qfcc/test/modulo.r b/tools/qfcc/test/modulo.r
index 4d59fdf87..1e02fcaa0 100644
--- a/tools/qfcc/test/modulo.r
+++ b/tools/qfcc/test/modulo.r
@@ -57,5 +57,8 @@ float main (void)
 	res |= test ("foo", foo, -5, -3, -2);
 	res |= test ("bar", bar, -5, -3, -2);
 	res |= test ("baz", baz, -5, -3, 0);
+
+	res |= test ("foo", foo, 5, 3.5, 1.5);
+	res |= test ("foo", foo, -5, 3.5, -1.5);
 	return res;
 }

From 2cd62fe01b5ada4cd333359889e678fe21874cc9 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 14 Feb 2020 18:15:34 +0900
Subject: [PATCH 0369/1519] Fix several double-related bug

float is promoted to double through ... for non-v6 code.
PR_Sprintf has custom param access via P_*, messed up doubles.
---
 libs/gamecode/pr_load.c        |  2 ++
 libs/gamecode/pr_opcode.c      |  1 +
 libs/gamecode/pr_strings.c     |  2 ++
 tools/qfcc/include/obj_file.h  | 13 +++++++++++++
 tools/qfcc/include/qfcc.h      |  1 +
 tools/qfcc/source/expr.c       |  9 ++++++---
 tools/qfcc/source/statements.c |  3 +--
 tools/qfcc/test/triangle.r     |  2 +-
 8 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/libs/gamecode/pr_load.c b/libs/gamecode/pr_load.c
index 9fee72574..8bc554296 100644
--- a/libs/gamecode/pr_load.c
+++ b/libs/gamecode/pr_load.c
@@ -202,6 +202,8 @@ PR_LoadProgsFile (progs_t *pr, QFile *file, int size)
 	base -= sizeof (progs);	// offsets are from file start
 	heap = ((byte *) pr->progs + pr->progs_size + pr->pr_edictareasize);
 
+	pr->float_promoted = progs.version == PROG_VERSION;
+
 	if (pr->edicts) {
 		*pr->edicts = (edict_t *)((byte *) pr->progs + pr->progs_size);
 	}
diff --git a/libs/gamecode/pr_opcode.c b/libs/gamecode/pr_opcode.c
index a2a344a1e..f18fd2b42 100644
--- a/libs/gamecode/pr_opcode.c
+++ b/libs/gamecode/pr_opcode.c
@@ -77,6 +77,7 @@ VISIBLE const char *pr_type_name[ev_type_count] = {
 	"integer",
 	"uinteger",
 	"short",
+	"double",
 	"invalid",
 };
 
diff --git a/libs/gamecode/pr_strings.c b/libs/gamecode/pr_strings.c
index 684551fda..85602e3d2 100644
--- a/libs/gamecode/pr_strings.c
+++ b/libs/gamecode/pr_strings.c
@@ -649,6 +649,8 @@ free_fmt_item (fmt_item_t *fi)
 
 #undef P_var
 #define P_var(p,n,t) (args[n]->t##_var)
+#undef P_DOUBLE
+#define P_DOUBLE(p,n) (*(double *) (args[n]))
 VISIBLE void
 PR_Sprintf (progs_t *pr, dstring_t *result, const char *name,
 			const char *format, int count, pr_type_t **args)
diff --git a/tools/qfcc/include/obj_file.h b/tools/qfcc/include/obj_file.h
index 0e6096028..c32c67eb2 100644
--- a/tools/qfcc/include/obj_file.h
+++ b/tools/qfcc/include/obj_file.h
@@ -305,6 +305,19 @@ enum {
 */
 #define QFO_var(q, s, t, o)	((q)->spaces[s].d.data[o].t##_var)
 
+/** Access a double variable in the object file. Can be assigned to.
+
+	\par QC type:
+		\c double
+	\param q pointer to ::qfo_t struct
+	\param s space index
+	\param o offset into object file data space
+	\return double lvalue
+
+	\hideinitializer
+*/
+#define	QFO_DOUBLE(q, s, o)		(*(double *) ((q)->spaces[s].d.data + o))
+
 /** Access a float variable in the object file. Can be assigned to.
 
 	\par QC type:
diff --git a/tools/qfcc/include/qfcc.h b/tools/qfcc/include/qfcc.h
index 1a1793b34..e428831cb 100644
--- a/tools/qfcc/include/qfcc.h
+++ b/tools/qfcc/include/qfcc.h
@@ -92,6 +92,7 @@ extern	pr_info_t	pr;
 
 #define GETSTR(s)			(pr.strings->strings + (s))
 #define D_var(t, d)			((d)->space->data[(d)->offset].t##_var)
+#define	D_DOUBLE(d)			(*(double *) ((d)->space->data + (d)->offset))
 #define	D_FLOAT(d)			D_var (float, d)
 #define	D_INT(d)			D_var (integer, d)
 #define	D_VECTOR(d)			D_var (vector, d)
diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index 0773e0a8f..d40214d77 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -867,7 +867,7 @@ expr_double (expr_t *e)
 	if (e->type == ex_symbol && e->e.symbol->sy_type == sy_var
 		&& e->e.symbol->s.def->constant
 		&& is_double (e->e.symbol->s.def->type))
-		return D_FLOAT (e->e.symbol->s.def);
+		return D_DOUBLE (e->e.symbol->s.def);
 	internal_error (e, "not a double constant");
 }
 
@@ -1915,6 +1915,10 @@ build_function_call (expr_t *fexpr, type_t *ftype, expr_t *params)
 			if (is_integer_val (e)
 				&& options.code.progsversion == PROG_ID_VERSION)
 				convert_int (e);
+			if (is_float (get_type (e))
+				&& options.code.progsversion != PROG_ID_VERSION) {
+				t = &type_double;
+			}
 			if (is_integer_val (e) && options.warnings.vararg_integer)
 				warning (e, "passing integer constant into ... function");
 		}
@@ -2611,8 +2615,7 @@ cast_expr (type_t *type, expr_t *e)
 		e->e.value = convert_value (val, type);
 		e->type = ex_value;
 		c = e;
-	} else if ((is_float (type) && is_integral (e_type))
-		|| (is_integral (type) && is_float (e_type))) {
+	} else if (is_scalar (type) && is_scalar (e_type)) {
 		c = new_unary_expr ('C', e);
 		c->e.expr.type = type;
 	} else if (e->type == ex_uexpr && e->e.expr.op == '.') {
diff --git a/tools/qfcc/source/statements.c b/tools/qfcc/source/statements.c
index cd49b3970..072d175cf 100644
--- a/tools/qfcc/source/statements.c
+++ b/tools/qfcc/source/statements.c
@@ -958,8 +958,7 @@ expr_cast (sblock_t *sblock, expr_t *e, operand_t **op)
 	statement_t *s;
 
 	src_type = get_type (e->e.expr.e1);
-	if ((src_type->type == ev_integer && type->type == ev_float)
-		|| (src_type->type == ev_float && type->type == ev_integer)) {
+	if (is_scalar (src_type) && is_scalar (type)) {
 		operand_t  *src = 0;
 		sblock = statement_subexpr (sblock, e->e.expr.e1, &src);
 		*op = temp_operand (e->e.expr.type);
diff --git a/tools/qfcc/test/triangle.r b/tools/qfcc/test/triangle.r
index 6ef592ace..cec1f6884 100644
--- a/tools/qfcc/test/triangle.r
+++ b/tools/qfcc/test/triangle.r
@@ -1,6 +1,6 @@
 void printf (string fmt, ...) = #0;
 float (string s) stof = #0;
-float (float x) sqrt = #0;
+@overload float (float x) sqrt = #0;
 
 float
 heron (float a, float b, float c)

From 533fb8acc9383d3ea2d0198263adf138f9202b03 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 14 Feb 2020 20:08:59 +0900
Subject: [PATCH 0370/1519] Implement double constants

---
 libs/gamecode/pr_debug.c         |  7 +++++-
 tools/qfcc/include/expr.h        |  2 +-
 tools/qfcc/source/dump_globals.c |  3 +++
 tools/qfcc/source/expr.c         |  8 +++++++
 tools/qfcc/source/qc-lex.l       | 27 +++++++++++++++++++++
 tools/qfcc/source/value.c        | 40 ++++++++++++++++++++++++++++++++
 tools/qfcc/test/Makefile.am      | 10 ++++++++
 tools/qfcc/test/deadbool.r       |  2 +-
 tools/qfcc/test/double.r         | 25 ++++++++++++++++++++
 tools/qfcc/test/state.r          | 10 ++++----
 tools/qfcc/test/test-harness.c   |  8 +++++--
 11 files changed, 132 insertions(+), 10 deletions(-)
 create mode 100644 tools/qfcc/test/double.r

diff --git a/libs/gamecode/pr_debug.c b/libs/gamecode/pr_debug.c
index 8973e318c..174987135 100644
--- a/libs/gamecode/pr_debug.c
+++ b/libs/gamecode/pr_debug.c
@@ -692,7 +692,12 @@ value_string (progs_t *pr, etype_t type, pr_type_t *val)
 		case ev_uinteger:
 			dsprintf (line, "$%08x", val->uinteger_var);
 			break;
-		default:
+		case ev_double:
+			dsprintf (line, "%g", *(double *)val);
+			break;
+		case ev_short:
+		case ev_invalid:
+		case ev_type_count:
 			//dsprintf (line, "bad type %i", type);
 			dsprintf (line, "<%x %x %x %x>",
 					  val[0].integer_var, val[1].integer_var,
diff --git a/tools/qfcc/include/expr.h b/tools/qfcc/include/expr.h
index b11e93c2c..90e4f6313 100644
--- a/tools/qfcc/include/expr.h
+++ b/tools/qfcc/include/expr.h
@@ -174,7 +174,7 @@ typedef struct ex_value_s {
 	etype_t     lltype;
 	union {
 		const char *string_val;			///< string constant
-		float       double_val;			///< double constant
+		double      double_val;			///< double constant
 		float       float_val;			///< float constant
 		float       vector_val[3];		///< vector constant
 		int         entity_val;			///< entity constant
diff --git a/tools/qfcc/source/dump_globals.c b/tools/qfcc/source/dump_globals.c
index 71b769629..6bebf5bb5 100644
--- a/tools/qfcc/source/dump_globals.c
+++ b/tools/qfcc/source/dump_globals.c
@@ -97,6 +97,9 @@ dump_def (progs_t *pr, ddef_t *def, int indent)
 			case ev_float:
 				comment = va (" %g", G_FLOAT (pr, offset));
 				break;
+			case ev_double:
+				comment = va (" %.17g", G_DOUBLE (pr, offset));
+				break;
 			case ev_vector:
 				comment = va (" '%g %g %g'",
 							  G_VECTOR (pr, offset)[0],
diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index d40214d77..46ed0aeaa 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -2273,6 +2273,14 @@ address_expr (expr_t *e1, expr_t *e2, type_t *t)
 				e = e1->e.expr.e2;
 				break;
 			}
+			if (e1->e.expr.op == 'A') {
+				if (!t)
+					t = e1->e.expr.type;
+				if (e2) {
+					e2 = binary_expr ('+', e1->e.expr.e2, e2);
+				}
+				return address_expr (e1->e.expr.e1, e2, t);
+			}
 			return error (e1, "invalid type for unary &");
 		case ex_uexpr:
 			if (e1->e.expr.op == '.') {
diff --git a/tools/qfcc/source/qc-lex.l b/tools/qfcc/source/qc-lex.l
index 0c9fea604..d17cad55e 100644
--- a/tools/qfcc/source/qc-lex.l
+++ b/tools/qfcc/source/qc-lex.l
@@ -93,6 +93,8 @@ B			[01]
 X			[0-9a-fA-F]
 ID			[a-zA-Z_][a-zA-Z_0-9]*
 FLOAT		({D}+|{D}*\.{D}+|{D}+\.{D}*)([eE]{m}?{D}+)?
+FLOATf		{FLOAT}[fF]
+FLOATd		{FLOAT}[dD]
 INT			({D}+|0[xX]{X}+|0[bB]{B})
 RANGE		\.\.
 ELLIPSIS	\.\.\.
@@ -136,10 +138,35 @@ STRING		\"(\\.|[^"\\])*\"
 					}
 
 {FLOAT}				{
+						// advanced code defaults to double, but traditional
+						// and extended code defaults to float
+						if (options.traditional < 1) {
+							double      d = strtod (yytext, 0);
+							qc_yylval.expr = new_double_expr (d);
+						} else {
+							float       f = strtof (yytext, 0);
+							qc_yylval.expr = new_float_expr (f);
+						}
+						return VALUE;
+					}
+{FLOATf}			{
 						float       f = strtof (yytext, 0);
 						qc_yylval.expr = new_float_expr (f);
 						return VALUE;
 					}
+{FLOATd}			{
+						// advanced code defaults to double, but traditional
+						// and extended code defaults to float
+						if (options.traditional < 1) {
+							double      d = strtod (yytext, 0);
+							qc_yylval.expr = new_double_expr (d);
+						} else {
+							float       f = strtof (yytext, 0);
+							qc_yylval.expr = new_float_expr (f);
+							warning (0, "truncating double constant to float");
+						}
+						return VALUE;
+					}
 
 {ID}				{
 						int         tok = keyword_or_id(yytext);
diff --git a/tools/qfcc/source/value.c b/tools/qfcc/source/value.c
index 4f1ae9f82..fc2024a57 100644
--- a/tools/qfcc/source/value.c
+++ b/tools/qfcc/source/value.c
@@ -69,6 +69,7 @@ typedef struct {
 		ex_pointer_t pointer;
 		float       quaternion_val[4];
 		int         integer_val;
+		double      double_val;
 	} i;
 } immediate_t;
 
@@ -275,6 +276,7 @@ static hashtab_t *func_imm_defs;
 static hashtab_t *pointer_imm_defs;
 static hashtab_t *quaternion_imm_defs;
 static hashtab_t *integer_imm_defs;
+static hashtab_t *double_imm_defs;
 
 static void
 imm_free (void *_imm, void *unused)
@@ -306,6 +308,8 @@ imm_get_hash (const void *_imm, void *_tab)
 	} else if (tab == &quaternion_imm_defs) {
 		return Hash_Buffer (&imm->i.quaternion_val,
 							sizeof (&imm->i.quaternion_val));
+	} else if (tab == &double_imm_defs) {
+		return Hash_Buffer (&imm->i.double_val, sizeof (&imm->i.double_val));
 	} else if (tab == &integer_imm_defs) {
 		return imm->i.integer_val;
 	} else {
@@ -340,6 +344,8 @@ imm_compare (const void *_imm1, const void *_imm2, void *_tab)
 						sizeof (imm1->i.pointer));
 	} else if (tab == &quaternion_imm_defs) {
 		return QuatCompare (imm1->i.quaternion_val, imm2->i.quaternion_val);
+	} else if (tab == &double_imm_defs) {
+		return imm1->i.double_val == imm2->i.double_val;
 	} else if (tab == &integer_imm_defs) {
 		return imm1->i.integer_val == imm2->i.integer_val;
 	} else {
@@ -362,6 +368,24 @@ value_as_float (ex_value_t *value)
 		return value->v.integer_val;
 	if (value->lltype == ev_short)
 		return value->v.short_val;
+	if (value->lltype == ev_double)
+		return value->v.double_val;
+	if (value->lltype == ev_float)
+		return value->v.float_val;
+	return 0;
+}
+
+static double
+value_as_double (ex_value_t *value)
+{
+	if (value->lltype == ev_uinteger)
+		return value->v.uinteger_val;
+	if (value->lltype == ev_integer)
+		return value->v.integer_val;
+	if (value->lltype == ev_short)
+		return value->v.short_val;
+	if (value->lltype == ev_double)
+		return value->v.double_val;
 	if (value->lltype == ev_float)
 		return value->v.float_val;
 	return 0;
@@ -376,6 +400,8 @@ value_as_int (ex_value_t *value)
 		return value->v.integer_val;
 	if (value->lltype == ev_short)
 		return value->v.short_val;
+	if (value->lltype == ev_double)
+		return value->v.double_val;
 	if (value->lltype == ev_float)
 		return value->v.float_val;
 	return 0;
@@ -390,6 +416,8 @@ value_as_uint (ex_value_t *value)
 		return value->v.integer_val;
 	if (value->lltype == ev_short)
 		return value->v.short_val;
+	if (value->lltype == ev_double)
+		return value->v.double_val;
 	if (value->lltype == ev_float)
 		return value->v.float_val;
 	return 0;
@@ -405,6 +433,9 @@ convert_value (ex_value_t *value, type_t *type)
 	if (is_float (type)) {
 		float       val = value_as_float (value);
 		return new_float_val (val);
+	} else if (is_double (type)) {
+		double      val = value_as_double (value);
+		return new_double_val (val);
 	} else if (type->type == ev_short) {
 		int         val = value_as_int (value);
 		return new_short_val (val);
@@ -504,6 +535,10 @@ emit_value (ex_value_t *value, def_t *def)
 			tab = quaternion_imm_defs;
 			type = &type_quaternion;
 			break;
+		case ev_double:
+			tab = double_imm_defs;
+			type = &type_double;
+			break;
 		default:
 			internal_error (0, 0);
 	}
@@ -601,6 +636,7 @@ clear_immediates (void)
 		Hash_FlushTable (pointer_imm_defs);
 		Hash_FlushTable (quaternion_imm_defs);
 		Hash_FlushTable (integer_imm_defs);
+		Hash_FlushTable (double_imm_defs);
 	} else {
 		value_table = Hash_NewTable (16381, 0, 0, 0);
 		Hash_SetHashCompare (value_table, value_get_hash, value_compare);
@@ -634,6 +670,10 @@ clear_immediates (void)
 		integer_imm_defs =
 			Hash_NewTable (16381, 0, imm_free, &integer_imm_defs);
 		Hash_SetHashCompare (integer_imm_defs, imm_get_hash, imm_compare);
+
+		double_imm_defs =
+			Hash_NewTable (16381, 0, imm_free, &double_imm_defs);
+		Hash_SetHashCompare (double_imm_defs, imm_get_hash, imm_compare);
 	}
 
 	def = make_symbol (".zero", &type_zero, 0, sc_extern)->s.def;
diff --git a/tools/qfcc/test/Makefile.am b/tools/qfcc/test/Makefile.am
index 680fdbdd7..d3510f5d9 100644
--- a/tools/qfcc/test/Makefile.am
+++ b/tools/qfcc/test/Makefile.am
@@ -33,6 +33,7 @@ test_progs_dat=\
 	chewed-return.dat \
 	comma-expr.dat \
 	deadbool.dat \
+	double.dat \
 	enum.dat \
 	fordecl.dat \
 	func-expr.dat \
@@ -111,6 +112,15 @@ deadbool.run: Makefile build-run
 include ./$(DEPDIR)/deadbool.Qo # am--include-marker
 r_depfiles_remade += ./$(DEPDIR)/deadbool.Qo
 
+double_dat_SOURCES=double.r
+double_obj=$(double_dat_SOURCES:.r=.qfo)
+double.dat$(EXEEXT): $(double_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(double_obj)
+double.run: Makefile build-run
+	$(srcdir)/build-run $@
+include ./$(DEPDIR)/double.Qo # am--include-marker
+r_depfiles_remade += ./$(DEPDIR)/double.Qo
+
 enum_dat_SOURCES=enum.r
 enum_obj=$(enum_dat_SOURCES:.r=.qfo)
 enum.dat$(EXEEXT): $(enum_obj) $(QFCC_DEP)
diff --git a/tools/qfcc/test/deadbool.r b/tools/qfcc/test/deadbool.r
index c4869b293..c56aa0f10 100644
--- a/tools/qfcc/test/deadbool.r
+++ b/tools/qfcc/test/deadbool.r
@@ -9,7 +9,7 @@ void foo (void)
 	return;
 	if (!time) {
 		ent = spawn ();
-		ent.f = time + 0.1;
+		ent.f = time + 0.1f;
 	}
 }
 
diff --git a/tools/qfcc/test/double.r b/tools/qfcc/test/double.r
new file mode 100644
index 000000000..db02adbac
--- /dev/null
+++ b/tools/qfcc/test/double.r
@@ -0,0 +1,25 @@
+void printf (string fmt, ...) = #0;
+# define M_PI 3.14159265358979323846
+
+union {
+	double d;
+	int    i[2];
+} type_pun;
+
+int
+test_format ()
+{
+	int         fail = 0;
+	type_pun.d = M_PI;
+	printf ("%g %08x%08x\n", type_pun.d, type_pun.i[1], type_pun.i[0]);
+	//printf ("%08x%08x\n", type_pun.i[1], type_pun.i[0]);
+	return fail;
+}
+
+int
+main ()
+{
+	int         fail = 0;
+	fail |= test_format ();
+	return fail;
+}
diff --git a/tools/qfcc/test/state.r b/tools/qfcc/test/state.r
index 7fec3c2d0..a7be65754 100644
--- a/tools/qfcc/test/state.r
+++ b/tools/qfcc/test/state.r
@@ -13,7 +13,7 @@ state0 (void)
 [$frame1, state1]
 {
 	if (self.frame != $frame1 || self.think != state1
-		|| self.nextthink != 0.1) {
+		|| self.nextthink != 0.1f) {
 		printf ("state0: %g %x %g\n", self.frame, self.think, self.nextthink);
 		exit (1);
 	}
@@ -21,10 +21,10 @@ state0 (void)
 
 void
 state1 (void)
-[$frame2, state2, 0.2]
+[$frame2, state2, 0.2f]
 {
 	if (self.frame != $frame2 || self.think != state2
-		|| self.nextthink != 0.2) {
+		|| self.nextthink != 0.2f) {
 		printf ("state0: %g %x %g\n", self.frame, self.think, self.nextthink);
 		exit (1);
 	}
@@ -32,10 +32,10 @@ state1 (void)
 
 void
 state2 (void)
-[$frame0, state0, 0.5]
+[$frame0, state0, 0.5f]
 {
 	if (self.frame != $frame0 || self.think != state0
-		|| self.nextthink != 0.5) {
+		|| self.nextthink != 0.5f) {
 		printf ("state0: %g %x %g\n", self.frame, self.think, self.nextthink);
 		exit (1);
 	}
diff --git a/tools/qfcc/test/test-harness.c b/tools/qfcc/test/test-harness.c
index dcb251037..a8f829cd9 100644
--- a/tools/qfcc/test/test-harness.c
+++ b/tools/qfcc/test/test-harness.c
@@ -135,9 +135,13 @@ init_qf (void)
 
 	Memory_Init (malloc (1024 * 1024), 1024 * 1024);
 
-	Cvar_Get ("pr_debug", "2", 0, 0, 0);
+	cvar_t *debug = Cvar_Get ("pr_debug", "2", 0, 0, 0);
 	Cvar_Get ("pr_boundscheck", "2", 0, 0, 0);
 
+	if (options.trace > 1) {
+		Cvar_SetValue (debug, 4);
+	}
+
 	pr.edicts = &edicts;
 	pr.num_edicts = &num_edicts;
 	pr.reserved_edicts = &reserved_edicts;
@@ -207,7 +211,7 @@ parse_options (int argc, char **argv)
 				options.flote = 1;
 				break;
 			case 't':
-				options.trace = 1;
+				options.trace++;
 				break;
 			case 'h':
 				usage (0);

From 5d8d805b60e98f80bbdf9e8db5067301ab4be064 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 14 Feb 2020 20:39:12 +0900
Subject: [PATCH 0371/1519] Fix test for single overload functions

All functions are stored in the overload functions table, even those
that are never explicitly overloaded, but only explicitly overloaded
functions (those with @overload) use the type-qualified naming.
---
 tools/qfcc/source/function.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/tools/qfcc/source/function.c b/tools/qfcc/source/function.c
index 9120386b5..bd37d6d05 100644
--- a/tools/qfcc/source/function.c
+++ b/tools/qfcc/source/function.c
@@ -338,9 +338,12 @@ find_function (expr_t *fexpr, expr_t *params)
 		return fexpr;
 	for (func_count = 0; funcs[func_count]; func_count++)
 		;
-	if (func_count < 1) {
-		free (funcs);
-		return fexpr;
+	if (func_count < 2) {
+		f = (overloaded_function_t *) funcs[0];
+		if (func_count && !f->overloaded) {
+			free (funcs);
+			return fexpr;
+		}
 	}
 	type.t.func.type = ((overloaded_function_t *) funcs[0])->type->t.func.type;
 	dummy.type = find_type (&type);

From 7e09a944691971fdebb7cd08db896d11866e2cac Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 14 Feb 2020 20:42:12 +0900
Subject: [PATCH 0372/1519] Fix "casts" between signed and unsigned int

---
 tools/qfcc/source/expr.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index 46ed0aeaa..013d55d81 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -2623,6 +2623,8 @@ cast_expr (type_t *type, expr_t *e)
 		e->e.value = convert_value (val, type);
 		e->type = ex_value;
 		c = e;
+	} else if (is_integral (type) && is_integral (e_type)) {
+		c = new_alias_expr (type, e);
 	} else if (is_scalar (type) && is_scalar (e_type)) {
 		c = new_unary_expr ('C', e);
 		c->e.expr.type = type;

From 7e7e0526dd3c63ee23ed89fd2f055799169e76d6 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 14 Feb 2020 20:42:36 +0900
Subject: [PATCH 0373/1519] Fix a double constant issue

There will be more of these :/
---
 ruamoko/game/Axe.r | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ruamoko/game/Axe.r b/ruamoko/game/Axe.r
index 06c4ca083..2ea71f0ef 100644
--- a/ruamoko/game/Axe.r
+++ b/ruamoko/game/Axe.r
@@ -32,7 +32,7 @@
 	source = s.origin + '0 0 16';
 
 	traceline (source, source + v_forward * 64, NO, s);
-	if (trace_fraction == 1.0)
+	if (trace_fraction == 1.0f)
 		return;
 
 	org = trace_endpos - v_forward * 4;

From 0542daacdf1a315ffa40f2931cb4561aecbfca43 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 14 Feb 2020 23:36:36 +0900
Subject: [PATCH 0374/1519] Create more double related tests

Including catching warnings :) (yay -Werror)
---
 tools/qfcc/source/expr_binary.c        | 188 +++++++++++++++++++++++--
 tools/qfcc/test/Makefile.am            |  22 ++-
 tools/qfcc/test/build-compile-fail-run |  15 ++
 tools/qfcc/test/double-float-compare.r |   7 +
 tools/qfcc/test/double-int-compare.r   |   7 +
 tools/qfcc/test/double.r               |  43 +++++-
 6 files changed, 265 insertions(+), 17 deletions(-)
 create mode 100755 tools/qfcc/test/build-compile-fail-run
 create mode 100644 tools/qfcc/test/double-float-compare.r
 create mode 100644 tools/qfcc/test/double-int-compare.r

diff --git a/tools/qfcc/source/expr_binary.c b/tools/qfcc/source/expr_binary.c
index 6dd7c1177..0f2a1e256 100644
--- a/tools/qfcc/source/expr_binary.c
+++ b/tools/qfcc/source/expr_binary.c
@@ -47,6 +47,7 @@ typedef struct {
 
 static expr_t *pointer_arithmetic (int op, expr_t *e1, expr_t *e2);
 static expr_t *inverse_multiply (int op, expr_t *e1, expr_t *e2);
+static expr_t *double_compare (int op, expr_t *e1, expr_t *e2);
 
 static expr_type_t string_string[] = {
 	{'+',	&type_string},
@@ -111,6 +112,21 @@ static expr_type_t float_integer[] = {
 #define float_uinteger float_integer
 #define float_short float_integer
 
+static expr_type_t float_double[] = {
+	{'+',	&type_double, &type_double, 0},
+	{'-',	&type_double, &type_double, 0},
+	{'*',	&type_double, &type_double, 0},
+	{'/',	&type_double, &type_double, 0},
+	{'%',	&type_double, &type_double, 0},
+	{EQ,	0, 0, 0, double_compare},
+	{NE,	0, 0, 0, double_compare},
+	{LE,	0, 0, 0, double_compare},
+	{GE,	0, 0, 0, double_compare},
+	{LT,	0, 0, 0, double_compare},
+	{GT,	0, 0, 0, double_compare},
+	{0, 0}
+};
+
 static expr_type_t vector_float[] = {
 	{'*',	&type_vector},
 	{'/',	0, 0, 0, inverse_multiply},
@@ -130,6 +146,12 @@ static expr_type_t vector_vector[] = {
 #define vector_uinteger vector_float
 #define vector_short vector_float
 
+static expr_type_t vector_double[] = {
+	{'*',	&type_vector},
+	{'/',	0, 0, 0, inverse_multiply},
+	{0, 0}
+};
+
 static expr_type_t entity_entity[] = {
 	{EQ,	&type_integer},
 	{NE,	&type_integer},
@@ -195,6 +217,12 @@ static expr_type_t quat_integer[] = {
 #define quat_uinteger quat_integer
 #define quat_short quat_integer
 
+static expr_type_t quat_double[] = {
+	{'*',	&type_quaternion},
+	{'/',	0, 0, 0, inverse_multiply},
+	{0, 0}
+};
+
 static expr_type_t integer_float[] = {
 	{'+',	&type_float, &type_float, 0},
 	{'-',	&type_float, &type_float, 0},
@@ -290,6 +318,21 @@ static expr_type_t integer_short[] = {
 	{0, 0}
 };
 
+static expr_type_t integer_double[] = {
+	{'+',	&type_double, &type_double, 0},
+	{'-',	&type_double, &type_double, 0},
+	{'*',	&type_double, &type_double, 0},
+	{'/',	&type_double, &type_double, 0},
+	{'%',	&type_double, &type_double, 0},
+	{EQ,	&type_integer, &type_double, 0},
+	{NE,	&type_integer, &type_double, 0},
+	{LE,	&type_integer, &type_double, 0},
+	{GE,	&type_integer, &type_double, 0},
+	{LT,	&type_integer, &type_double, 0},
+	{GT,	&type_integer, &type_double, 0},
+	{0, 0}
+};
+
 #define uinteger_float integer_float
 #define uinteger_vector integer_vector
 #define uinteger_pointer integer_pointer
@@ -335,6 +378,7 @@ static expr_type_t uinteger_uinteger[] = {
 	{0, 0}
 };
 #define uinteger_short uinteger_integer
+#define uinteger_double integer_double
 
 #define short_float integer_float
 #define short_vector integer_vector
@@ -400,8 +444,66 @@ static expr_type_t short_short[] = {
 	{GT,	&type_integer},
 	{0, 0}
 };
+#define short_double integer_double
 
-static expr_type_t *string_x[] = {
+static expr_type_t double_float[] = {
+	{'+',	&type_double, 0, &type_double},
+	{'-',	&type_double, 0, &type_double},
+	{'*',	&type_double, 0, &type_double},
+	{'/',	&type_double, 0, &type_double},
+	{'%',	&type_double, 0, &type_double},
+	{EQ,	0, 0, 0, double_compare},
+	{NE,	0, 0, 0, double_compare},
+	{LE,	0, 0, 0, double_compare},
+	{GE,	0, 0, 0, double_compare},
+	{LT,	0, 0, 0, double_compare},
+	{GT,	0, 0, 0, double_compare},
+	{0, 0}
+};
+
+static expr_type_t double_vector[] = {
+	{'*',	&type_vector},
+	{0, 0}
+};
+
+static expr_type_t double_quat[] = {
+	{'*',	&type_quaternion},
+	{0, 0}
+};
+
+static expr_type_t double_integer[] = {
+	{'+',	&type_double, 0, &type_double},
+	{'-',	&type_double, 0, &type_double},
+	{'*',	&type_double, 0, &type_double},
+	{'/',	&type_double, 0, &type_double},
+	{'%',	&type_double, 0, &type_double},
+	{EQ,	0, 0, 0, double_compare},
+	{NE,	0, 0, 0, double_compare},
+	{LE,	0, 0, 0, double_compare},
+	{GE,	0, 0, 0, double_compare},
+	{LT,	0, 0, 0, double_compare},
+	{GT,	0, 0, 0, double_compare},
+	{0, 0}
+};
+#define double_uinteger double_integer
+#define double_short double_integer
+
+static expr_type_t double_double[] = {
+	{'+',	&type_double},
+	{'-',	&type_double},
+	{'*',	&type_double},
+	{'/',	&type_double},
+	{'%',	&type_double},
+	{EQ,	&type_integer},
+	{NE,	&type_integer},
+	{LE,	&type_integer},
+	{GE,	&type_integer},
+	{LT,	&type_integer},
+	{GT,	&type_integer},
+	{0, 0}
+};
+
+static expr_type_t *string_x[ev_type_count] = {
 	0,				// ev_void
 	string_string,
 	0,				// ev_float
@@ -414,9 +516,10 @@ static expr_type_t *string_x[] = {
 	0,				// ev_integer
 	0,				// ev_uinteger
 	0,				// ev_short
+	0,				// ev_double
 };
 
-static expr_type_t *float_x[] = {
+static expr_type_t *float_x[ev_type_count] = {
 	0,				// ev_void
 	0,				// ev_string
 	float_float,
@@ -429,9 +532,10 @@ static expr_type_t *float_x[] = {
 	float_integer,
 	float_uinteger,
 	float_short,
+	float_double,
 };
 
-static expr_type_t *vector_x[] = {
+static expr_type_t *vector_x[ev_type_count] = {
 	0,				// ev_void
 	0,				// ev_string
 	vector_float,
@@ -444,9 +548,10 @@ static expr_type_t *vector_x[] = {
 	vector_integer,
 	vector_uinteger,
 	vector_short,
+	vector_double,
 };
 
-static expr_type_t *entity_x[] = {
+static expr_type_t *entity_x[ev_type_count] = {
 	0,				// ev_void
 	0,				// ev_string
 	0,				// ev_float
@@ -459,9 +564,10 @@ static expr_type_t *entity_x[] = {
 	0,				// ev_integer
 	0,				// ev_uinteger
 	0,				// ev_short
+	0,				// ev_double
 };
 
-static expr_type_t *field_x[] = {
+static expr_type_t *field_x[ev_type_count] = {
 	0,				// ev_void
 	0,				// ev_string
 	0,				// ev_float
@@ -474,9 +580,10 @@ static expr_type_t *field_x[] = {
 	0,				// ev_integer
 	0,				// ev_uinteger
 	0,				// ev_short
+	0,				// ev_double
 };
 
-static expr_type_t *func_x[] = {
+static expr_type_t *func_x[ev_type_count] = {
 	0,				// ev_void
 	0,				// ev_string
 	0,				// ev_float
@@ -489,9 +596,10 @@ static expr_type_t *func_x[] = {
 	0,				// ev_integer
 	0,				// ev_uinteger
 	0,				// ev_short
+	0,				// ev_double
 };
 
-static expr_type_t *pointer_x[] = {
+static expr_type_t *pointer_x[ev_type_count] = {
 	0,				// ev_void
 	0,				// ev_string
 	0,				// ev_float
@@ -504,9 +612,10 @@ static expr_type_t *pointer_x[] = {
 	pointer_integer,
 	pointer_uinteger,
 	pointer_short,
+	0,				// ev_double
 };
 
-static expr_type_t *quat_x[] = {
+static expr_type_t *quat_x[ev_type_count] = {
 	0,				// ev_void
 	0,				// ev_string
 	quat_float,
@@ -519,9 +628,10 @@ static expr_type_t *quat_x[] = {
 	quat_integer,
 	quat_uinteger,
 	quat_short,
+	quat_double,
 };
 
-static expr_type_t *integer_x[] = {
+static expr_type_t *integer_x[ev_type_count] = {
 	0,				// ev_void
 	0,				// ev_string
 	integer_float,
@@ -534,9 +644,10 @@ static expr_type_t *integer_x[] = {
 	integer_integer,
 	integer_uinteger,
 	integer_short,
+	integer_double,
 };
 
-static expr_type_t *uinteger_x[] = {
+static expr_type_t *uinteger_x[ev_type_count] = {
 	0,				// ev_void
 	0,				// ev_string
 	uinteger_float,
@@ -549,9 +660,10 @@ static expr_type_t *uinteger_x[] = {
 	uinteger_integer,
 	uinteger_uinteger,
 	uinteger_short,
+	uinteger_double,
 };
 
-static expr_type_t *short_x[] = {
+static expr_type_t *short_x[ev_type_count] = {
 	0,				// ev_void
 	0,				// ev_string
 	short_float,
@@ -564,9 +676,26 @@ static expr_type_t *short_x[] = {
 	short_integer,
 	short_uinteger,
 	short_short,
+	short_double,
 };
 
-static expr_type_t **binary_expr_types[] = {
+static expr_type_t *double_x[ev_type_count] = {
+	0,				// ev_void
+	0,				// ev_string
+	double_float,
+	double_vector,
+	0,				// ev_entity
+	0,				// ev_field
+	0,				// ev_func
+	0,				// ev_pointer
+	double_quat,
+	double_integer,
+	double_uinteger,
+	double_short,
+	double_double,
+};
+
+static expr_type_t **binary_expr_types[ev_type_count] = {
 	0,				// ev_void
 	string_x,
 	float_x,
@@ -579,6 +708,7 @@ static expr_type_t **binary_expr_types[] = {
 	integer_x,
 	uinteger_x,
 	short_x,
+	double_x
 };
 
 static expr_t *
@@ -609,6 +739,36 @@ inverse_multiply (int op, expr_t *e1, expr_t *e2)
 	return binary_expr ('*', e1, binary_expr ('/', one, e2));
 }
 
+static expr_t *
+double_compare (int op, expr_t *e1, expr_t *e2)
+{
+	type_t     *t1 = get_type (e1);
+	type_t     *t2 = get_type (e2);
+	expr_t     *e;
+
+	if ((is_double (t1) && is_float (t2))
+		|| (is_float (t1) && is_double (t2))) {
+	}
+	if (is_double (t1)) {
+		if (is_float (t2)) {
+			warning (e2, "comparison between double and float");
+		} else if (!is_constant (e2)) {
+			warning (e2, "comparison between double and integer");
+		}
+		e2 = cast_expr (&type_double, e2);
+	} else {
+		if (is_float (t1)) {
+			warning (e1, "comparison between float and double");
+		} else if (!is_constant (e1)) {
+			warning (e1, "comparison between integer and double");
+		}
+		e1 = cast_expr (&type_double, e1);
+	}
+	e = new_binary_expr (op, e1, e2);
+	e->e.expr.type = &type_double;
+	return e;
+}
+
 static expr_t *
 invalid_binary_expr (int op, expr_t *e1, expr_t *e2)
 {
@@ -778,9 +938,9 @@ binary_expr (int op, expr_t *e1, expr_t *e2)
 	et1 = low_level_type (t1);
 	et2 = low_level_type (t2);
 
-	if (et1 > ev_short || !binary_expr_types[et1])
+	if (et1 >= ev_type_count || !binary_expr_types[et1])
 		return invalid_binary_expr(op, e1, e2);
-	if (et2 > ev_short || !binary_expr_types[et1][et2])
+	if (et2 >= ev_type_count || !binary_expr_types[et1][et2])
 		return invalid_binary_expr(op, e1, e2);
 	expr_type = binary_expr_types[et1][et2];
 	while (expr_type->op && expr_type->op != op)
diff --git a/tools/qfcc/test/Makefile.am b/tools/qfcc/test/Makefile.am
index d3510f5d9..531c621a1 100644
--- a/tools/qfcc/test/Makefile.am
+++ b/tools/qfcc/test/Makefile.am
@@ -58,11 +58,23 @@ test_progs_dat=\
 
 fail_progs_dat=
 
+test_build_errors=\
+	double-int-compare.r \
+	double-float-compare.r
+
+fail_build_errors=
+
 test_defspace_src=\
 	tw-defspace.c tw-diagnostic.c tw-strpool.c
 
-TESTS=$(test_bins) $(test_progs_dat:.dat=.run)
-XFAIL_TESTS=$(fail_bins) $(fail_progs_dat:.dat=.run)
+TESTS=\
+	$(test_bins) \
+	$(test_progs_dat:.dat=.run) \
+	$(test_build_errors:.r=.run)
+XFAIL_TESTS=\
+	$(fail_bins) \
+	$(fail_progs_dat:.dat=.run) \
+	$(fail_build_errors:.r=.run)
 
 check_PROGRAMS=test-harness $(test_progs_dat) $(test_bins)
 
@@ -121,6 +133,12 @@ double.run: Makefile build-run
 include ./$(DEPDIR)/double.Qo # am--include-marker
 r_depfiles_remade += ./$(DEPDIR)/double.Qo
 
+double-int-compare.run$(EXEEXT): double-int-compare.r Makefile build-compile-fail-run
+	$(srcdir)/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $<
+
+double-float-compare.run$(EXEEXT): double-float-compare.r Makefile build-compile-fail-run
+	$(srcdir)/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $<
+
 enum_dat_SOURCES=enum.r
 enum_obj=$(enum_dat_SOURCES:.r=.qfo)
 enum.dat$(EXEEXT): $(enum_obj) $(QFCC_DEP)
diff --git a/tools/qfcc/test/build-compile-fail-run b/tools/qfcc/test/build-compile-fail-run
new file mode 100755
index 000000000..294727d96
--- /dev/null
+++ b/tools/qfcc/test/build-compile-fail-run
@@ -0,0 +1,15 @@
+#! /bin/sh
+
+script=$1
+shift
+
+cat > $script <<EOF
+#! /bin/sh
+# compile must fail
+$@
+if test \$? != 1; then
+	exit 1
+fi
+exit 0
+EOF
+chmod +x $script
diff --git a/tools/qfcc/test/double-float-compare.r b/tools/qfcc/test/double-float-compare.r
new file mode 100644
index 000000000..a219b0d4a
--- /dev/null
+++ b/tools/qfcc/test/double-float-compare.r
@@ -0,0 +1,7 @@
+double a;
+float b;
+int main ()
+{
+	int x = a == b;
+	return 1;	// test fails if compile succeeds
+}
diff --git a/tools/qfcc/test/double-int-compare.r b/tools/qfcc/test/double-int-compare.r
new file mode 100644
index 000000000..221516ed8
--- /dev/null
+++ b/tools/qfcc/test/double-int-compare.r
@@ -0,0 +1,7 @@
+double a;
+int b;
+int main ()
+{
+	int x = a == b;
+	return 1;	// test fails if compile succeeds
+}
diff --git a/tools/qfcc/test/double.r b/tools/qfcc/test/double.r
index db02adbac..623d9f0ae 100644
--- a/tools/qfcc/test/double.r
+++ b/tools/qfcc/test/double.r
@@ -12,7 +12,46 @@ test_format ()
 	int         fail = 0;
 	type_pun.d = M_PI;
 	printf ("%g %08x%08x\n", type_pun.d, type_pun.i[1], type_pun.i[0]);
-	//printf ("%08x%08x\n", type_pun.i[1], type_pun.i[0]);
+	// this will fail on big-endian systems
+	fail = type_pun.i[0] != 0x54442d18 || type_pun.i[1] != 0x400921fb;
+	return fail;
+}
+
+int
+test_constant ()
+{
+	int         fail = 0;
+	double      a, b, c, d, e;
+	a = 1;
+	b = 2.0;
+	c = 3.2f;
+	d = 3.2d;
+	e = 3.2;
+	printf ("%.17g %.17g %.17g %.17g %.17g\n", a, b, c, d, e);
+	// this will fail on big-endian systems
+	fail |= c == d; // 3.2 is not exactly representable, so must be different
+	fail |= c == e; // 3.2 is not exactly representable, so must be different
+	fail |= d != e;	// 3.2d and 3.2 are both double, so must be the same
+	return fail;
+}
+
+int
+test_ops ()
+{
+	int         fail = 0;
+	double      a = 6.25, b = 2.375;
+	double      c;
+
+	c = a + b;
+	fail |= c != 8.625;
+	c = a - b;
+	fail |= c != 3.875;
+	c = a * b;
+	fail |= c != 14.84375;
+	c = a / b;
+	fail |= c != 50d/19d;
+	c = a % b;
+	fail |= c != 1.5;
 	return fail;
 }
 
@@ -21,5 +60,7 @@ main ()
 {
 	int         fail = 0;
 	fail |= test_format ();
+	fail |= test_constant ();
+	fail |= test_ops ();
 	return fail;
 }

From 293f10211a7504be911fc9183aed176a32a98803 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 15 Feb 2020 02:19:55 +0900
Subject: [PATCH 0375/1519] Start on alignment test

Currently fails (deliberately, WIP)
---
 tools/qfcc/test/Makefile.am | 10 ++++++++++
 tools/qfcc/test/alignment.r |  9 +++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 tools/qfcc/test/alignment.r

diff --git a/tools/qfcc/test/Makefile.am b/tools/qfcc/test/Makefile.am
index 531c621a1..cdc9d8c01 100644
--- a/tools/qfcc/test/Makefile.am
+++ b/tools/qfcc/test/Makefile.am
@@ -29,6 +29,7 @@ test_bins=\
 fail_bins=
 
 test_progs_dat=\
+	alignment.dat \
 	chewed-alias.dat \
 	chewed-return.dat \
 	comma-expr.dat \
@@ -88,6 +89,15 @@ test_harness_DEPENDENCIES=	$(QFCC_TEST_DEPS)
 
 r_depfiles_remade=
 
+alignment_dat_SOURCES=alignment.r
+alignment_obj=$(alignment_dat_SOURCES:.r=.qfo)
+alignment.dat$(EXEEXT): $(alignment_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(alignment_obj)
+alignment.run: Makefile build-run
+	$(srcdir)/build-run $@
+include ./$(DEPDIR)/alignment.Qo # am--include-marker
+r_depfiles_remade += ./$(DEPDIR)/alignment.Qo
+
 chewed_alias_dat_SOURCES=chewed-alias.r
 chewed_alias_obj=$(chewed_alias_dat_SOURCES:.r=.qfo)
 chewed-alias.dat$(EXEEXT): $(chewed_alias_obj) $(QFCC_DEP)
diff --git a/tools/qfcc/test/alignment.r b/tools/qfcc/test/alignment.r
new file mode 100644
index 000000000..819f45d30
--- /dev/null
+++ b/tools/qfcc/test/alignment.r
@@ -0,0 +1,9 @@
+int a;
+double b;
+int c;
+double d;
+
+int main()
+{
+	return 1;
+}

From a4a57b6ffda8bae97c49677b1a1a8511bb185d1f Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 15 Feb 2020 02:21:21 +0900
Subject: [PATCH 0376/1519] Implement aligned allocations

---
 tools/qfcc/include/defspace.h | 21 ++++++++
 tools/qfcc/include/type.h     |  1 +
 tools/qfcc/source/class.c     | 37 +++++++-------
 tools/qfcc/source/def.c       | 14 +++++-
 tools/qfcc/source/defspace.c  | 94 ++++++++++++++++++++++++++---------
 tools/qfcc/source/function.c  |  1 +
 tools/qfcc/source/struct.c    |  6 +++
 tools/qfcc/source/type.c      | 46 +++++++++++------
 8 files changed, 161 insertions(+), 59 deletions(-)

diff --git a/tools/qfcc/include/defspace.h b/tools/qfcc/include/defspace.h
index bd4b68920..ef6036286 100644
--- a/tools/qfcc/include/defspace.h
+++ b/tools/qfcc/include/defspace.h
@@ -109,6 +109,27 @@ defspace_t *defspace_new (ds_type_t type);
 */
 int defspace_alloc_loc (defspace_t *space, int size);
 
+/** Allocate space from the defspace's backing memory.
+
+	If the memory is fragmented, then the first available location at least
+	as large as \a size plus padding for alignment is returned. This means
+	that freeing a location then allocating the same amount of space may
+	return a different location.
+
+	If memory cannot be allocated (there is no free space in the currently
+	available memory and defspace_t::grow is null), then an internal error
+	will be generated.
+
+	\param space	The space from which to allocate data.
+	\param size		The amount of pr_type_t words to allocated. int and float
+					need 1 word, vector 3 words, and quaternion 4.
+	\param alignment The alignment of the allocated space.
+	\return			The offset of the first word of the freshly allocated
+					space. May be 0 if the allocated space is at the beginning
+					of the defspace.
+*/
+int defspace_alloc_aligned_loc (defspace_t *space, int size, int alignment);
+
 /** Free a block of contiguous words, returning them to the defspace.
 
 	The block to be freed is specified by \a ofs indicating the offset of the
diff --git a/tools/qfcc/include/type.h b/tools/qfcc/include/type.h
index d6a43816e..6944db353 100644
--- a/tools/qfcc/include/type.h
+++ b/tools/qfcc/include/type.h
@@ -63,6 +63,7 @@ typedef enum {
 typedef struct type_s {
 	etype_t     type;		///< ev_invalid means structure/array etc
 	const char *name;
+	int         alignment;	///< required alignment for instances
 	/// function/pointer/array/struct types are more complex
 	ty_meta_e   meta;
 	union {
diff --git a/tools/qfcc/source/class.c b/tools/qfcc/source/class.c
index adeb4d4bf..e0d601aa9 100644
--- a/tools/qfcc/source/class.c
+++ b/tools/qfcc/source/class.c
@@ -68,28 +68,29 @@ static hashtab_t *category_hash;
 static hashtab_t *protocol_hash;
 
 // these will be built up further
-type_t      type_obj_selector = { ev_invalid, 0, ty_struct};
-type_t      type_SEL = { ev_pointer, "SEL", ty_none, {{&type_obj_selector}}};
-type_t      type_IMP = { ev_func, "IMP", ty_none,
+type_t      type_obj_selector = { ev_invalid, 0, 0, ty_struct};
+type_t      type_SEL = { ev_pointer, "SEL", 1, ty_none, {{&type_obj_selector}}};
+type_t      type_IMP = { ev_func, "IMP", 1, ty_none,
 						 {{&type_id, -3, {&type_id, &type_SEL}}}};
-type_t      type_obj_super = { ev_invalid, 0 };
-type_t      type_SuperPtr = { ev_pointer, 0, ty_none, {{&type_obj_super}}};
-type_t      type_supermsg = { ev_func, ".supermsg", ty_none,
+type_t      type_obj_super = { ev_invalid, 0, 0 };
+type_t      type_SuperPtr = { ev_pointer, 0, 1, ty_none, {{&type_obj_super}}};
+type_t      type_supermsg = { ev_func, ".supermsg", 1, ty_none,
 							  {{&type_id, -3, {&type_SuperPtr, &type_SEL}}}};
-type_t      type_obj_method = { ev_invalid, 0, ty_struct };
-type_t      type_obj_method_description = { ev_invalid, 0, ty_struct };
-type_t      type_obj_category = { ev_invalid, 0, ty_struct};
-type_t      type_obj_ivar = { ev_invalid, 0, ty_struct};
-type_t      type_obj_module = { ev_invalid, 0, ty_struct};
-type_t      type_moduleptr = { ev_pointer, 0, ty_none, {{&type_obj_module}}};
-type_t      type_obj_exec_class = { ev_func, 0, ty_none,
+type_t      type_obj_method = { ev_invalid, 0, 0, ty_struct };
+type_t      type_obj_method_description = { ev_invalid, 0, 0, ty_struct };
+type_t      type_obj_category = { ev_invalid, 0, 0, ty_struct};
+type_t      type_obj_ivar = { ev_invalid, 0, 0, ty_struct};
+type_t      type_obj_module = { ev_invalid, 0, 0, ty_struct};
+type_t      type_moduleptr = { ev_pointer, 0, 1, ty_none,
+									{{&type_obj_module}}};
+type_t      type_obj_exec_class = { ev_func, 0, 1, ty_none,
 									{{&type_void, 1, { &type_moduleptr }}}};
 
-type_t      type_obj_object = {ev_invalid, 0, ty_struct};
-type_t      type_id = { ev_pointer, "id", ty_none, {{&type_obj_object}}};
-type_t      type_obj_class = { ev_invalid, 0, ty_struct};
-type_t      type_Class = { ev_pointer, 0, ty_none, {{&type_obj_class}}};
-type_t      type_obj_protocol = { ev_invalid, 0, ty_struct};
+type_t      type_obj_object = {ev_invalid, 0, 0, ty_struct};
+type_t      type_id = { ev_pointer, "id", 1, ty_none, {{&type_obj_object}}};
+type_t      type_obj_class = { ev_invalid, 0, 0, ty_struct};
+type_t      type_Class = { ev_pointer, 0, 1, ty_none, {{&type_obj_class}}};
+type_t      type_obj_protocol = { ev_invalid, 0, 0, ty_struct};
 
 int         obj_initialized = 0;
 
diff --git a/tools/qfcc/source/def.c b/tools/qfcc/source/def.c
index 5848c20c5..2b946a72c 100644
--- a/tools/qfcc/source/def.c
+++ b/tools/qfcc/source/def.c
@@ -148,11 +148,17 @@ new_def (const char *name, type_t *type, defspace_t *space,
 
 	if (storage != sc_extern) {
 		int         size = type_size (type);
+		int         alignment = type->alignment;
+
 		if (!size) {
 			error (0, "%s has incomplete type", name);
 			size = 1;
 		}
-		def->offset = defspace_alloc_loc (space, size);
+		if (alignment < 1) {
+			print_type (type);
+			internal_error (0, "temp type has no alignment");
+		}
+		def->offset = defspace_alloc_aligned_loc (space, size, alignment);
 	}
 
 	return def;
@@ -199,16 +205,20 @@ temp_def (type_t *type)
 	def_t      *temp;
 	defspace_t *space = current_func->symtab->space;
 	int         size = type_size (type);
+	int         alignment = type->alignment;
 
 	if (size < 1 || size > 4) {
 		internal_error (0, "%d invalid size for temp def", size);
 	}
+	if (alignment < 1) {
+		internal_error (0, "temp type has no alignment");
+	}
 	if ((temp = current_func->temp_defs[size - 1])) {
 		current_func->temp_defs[size - 1] = temp->temp_next;
 		temp->temp_next = 0;
 	} else {
 		ALLOC (16384, def_t, defs, temp);
-		temp->offset = defspace_alloc_loc (space, size);
+		temp->offset = defspace_alloc_aligned_loc (space, size, alignment);
 		*space->def_tail = temp;
 		space->def_tail = &temp->next;
 		temp->name = save_string (va (".tmp%d", current_func->temp_num++));
diff --git a/tools/qfcc/source/defspace.c b/tools/qfcc/source/defspace.c
index f227209d3..f2c9f7011 100644
--- a/tools/qfcc/source/defspace.c
+++ b/tools/qfcc/source/defspace.c
@@ -63,6 +63,33 @@ typedef struct locref_s {
 static defspace_t *spaces_freelist;
 static locref_t *locrefs_freelist;
 
+static locref_t *
+new_locref (int ofs, int size, locref_t *next)
+{
+	locref_t   *loc;
+
+	ALLOC (1024, locref_t, locrefs, loc);
+	loc->ofs = ofs;
+	loc->size = size;
+	loc->next = next;
+	return loc;
+}
+
+static void
+del_locref (locref_t *loc)
+{
+	FREE (locrefs, loc);
+}
+
+static defspace_t *
+new_defspace (void)
+{
+	defspace_t *space;
+
+	ALLOC (1024, defspace_t, spaces, space);
+	return space;
+}
+
 #define GROW 1024
 
 static int
@@ -98,9 +125,8 @@ grow_space_virtual (defspace_t *space)
 defspace_t *
 defspace_new (ds_type_t type)
 {
-	defspace_t *space;
+	defspace_t *space = new_defspace ();
 
-	ALLOC (1024, defspace_t, spaces, space);
 	space->def_tail = &space->defs;
 	space->type = type;
 	if (type == ds_backed) {
@@ -116,33 +142,59 @@ defspace_new (ds_type_t type)
 int
 defspace_alloc_loc (defspace_t *space, int size)
 {
-	int         ofs;
+	return defspace_alloc_aligned_loc (space, size, 1);
+}
+
+int
+defspace_alloc_aligned_loc (defspace_t *space, int size, int alignment)
+{
+	int         ofs, pad;
 	locref_t   *loc;
 	locref_t  **l = &space->free_locs;
 
 	if (size <= 0)
 		internal_error (0, "invalid number of words requested: %d", size);
-	while (*l && (*l)->size < size)
-		l = &(*l)->next;
-	if ((loc = *l)) {
-		ofs = (*l)->ofs;
-		if ((*l)->size == size) {
-			loc = *l;
-			*l = (*l)->next;
-			FREE (locrefs, loc);
-		} else {
-			(*l)->ofs += size;
-			(*l)->size -= size;
+	if (alignment <= 0)
+		internal_error (0, "invalid alignment requested: %d", alignment);
+	while ((loc = *l)) {
+		ofs = loc->ofs;
+		pad = alignment * ((ofs + alignment - 1) / alignment) - ofs;
+		// exact fit, so just shrink the block or remove it if there is no
+		// padding (any padding remains free)
+		if (size + pad == loc->size) {
+			if (!pad) {
+				*l = loc->next;
+				del_locref (loc);
+			}
+			return ofs + pad;
 		}
-		return ofs;
+		// there's excess space in the block. If there's no padding, then
+		// just shrink it, otherwise split it into two, one on either side
+		// of the allocated block, such that the padding remains free
+		if (size + pad < loc->size) {
+			if (!pad) {
+				loc->ofs += size;
+				loc->size -= size;
+			} else {
+				loc->next = new_locref (ofs + pad + size,
+										loc->size - ofs - pad, loc->next);
+				loc->size = pad;
+			}
+			return ofs + pad;
+		}
+		l = &(*l)->next;
 	}
 	ofs = space->size;
-	space->size += size;
+	pad = alignment * ((ofs + alignment - 1) / alignment) - ofs;
+	space->size += size + pad;
 	if (space->size > space->max_size) {
 		if (!space->grow || !space->grow (space))
 			internal_error (0, "unable to allocate %d words", size);
 	}
-	return ofs;
+	if (pad) {
+		*l = new_locref (ofs, pad, 0);
+	}
+	return ofs + pad;
 }
 
 void
@@ -184,17 +236,13 @@ defspace_free_loc (defspace_t *space, int ofs, int size)
 				loc->size += loc->next->size;
 				loc = loc->next;
 				*l = loc->next;
-				FREE (locrefs, loc);
+				del_locref (loc);
 			}
 			return;
 		}
 	}
 	// insert a new free block for the location to be freed
-	ALLOC (1024, locref_t, locrefs, loc);
-	loc->ofs = ofs;
-	loc->size = size;
-	loc->next = *l;
-	*l = loc;
+	*l = new_locref (ofs, size, *l);
 }
 
 int
diff --git a/tools/qfcc/source/function.c b/tools/qfcc/source/function.c
index bd37d6d05..b150e4baf 100644
--- a/tools/qfcc/source/function.c
+++ b/tools/qfcc/source/function.c
@@ -158,6 +158,7 @@ parse_params (type_t *type, param_t *parms)
 
 	new = new_type ();
 	new->type = ev_func;
+	new->alignment = 1;
 	new->t.func.type = type;
 	new->t.func.num_params = 0;
 
diff --git a/tools/qfcc/source/struct.c b/tools/qfcc/source/struct.c
index d3f014111..358b337f0 100644
--- a/tools/qfcc/source/struct.c
+++ b/tools/qfcc/source/struct.c
@@ -112,6 +112,7 @@ build_struct (int su, symbol_t *tag, symtab_t *symtab, type_t *type)
 {
 	symbol_t   *sym = find_struct (su, tag, type);
 	symbol_t   *s;
+	int         alignment = 1;
 
 	symtab->parent = 0;		// disconnect struct's symtab from parent scope
 
@@ -130,10 +131,14 @@ build_struct (int su, symbol_t *tag, symtab_t *symtab, type_t *type)
 			if (size > symtab->size)
 				symtab->size = size;
 		}
+		if (s->type->alignment > alignment) {
+			alignment = s->type->alignment;
+		}
 	}
 	if (!type)
 		sym->type = find_type (sym->type);	// checks the tag, not the symtab
 	sym->type->t.symtab = symtab;
+	sym->type->alignment = alignment;
 	if (!type && sym->type->type_def->external)	//FIXME should not be necessary
 		sym->type->type_def = qfo_encode_type (sym->type);
 	return sym;
@@ -166,6 +171,7 @@ finish_enum (symbol_t *sym)
 
 	enum_type = sym->type = find_type (sym->type);
 	enum_tab = enum_type->t.symtab;
+	enum_type->alignment = 1;
 
 	for (name = enum_tab->symbols; name; name = name->next) {
 		name->type = sym->type;
diff --git a/tools/qfcc/source/type.c b/tools/qfcc/source/type.c
index 81bd21ef9..d326a5f33 100644
--- a/tools/qfcc/source/type.c
+++ b/tools/qfcc/source/type.c
@@ -63,20 +63,20 @@
 // simple types.  function types are dynamically allocated
 type_t      type_invalid = { ev_invalid, "invalid" };
 type_t      type_void = { ev_void, "void" };
-type_t      type_string = { ev_string, "string" };
-type_t      type_float = { ev_float, "float" };
-type_t      type_vector = { ev_vector, "vector" };
-type_t      type_entity = { ev_entity, "entity" };
-type_t      type_field = {ev_field, "field", ty_none, {{&type_void}} };
+type_t      type_string = { ev_string, "string", 1 };
+type_t      type_float = { ev_float, "float", 1 };
+type_t      type_vector = { ev_vector, "vector", 1 };
+type_t      type_entity = { ev_entity, "entity", 1 };
+type_t      type_field = {ev_field, "field", 1, ty_none, {{&type_void}} };
 
 // type_function is a void() function used for state defs
-type_t      type_function = { ev_func, "function", ty_none, {{&type_void}} };
-type_t      type_pointer = { ev_pointer, "pointer", ty_none, {{&type_void}} };
-type_t      type_quaternion = { ev_quat, "quaternion" };
-type_t      type_integer = { ev_integer, "int" };
-type_t      type_uinteger = { ev_uinteger, "uint" };
-type_t      type_short = { ev_short, "short" };
-type_t      type_double = { ev_double, "double" };
+type_t      type_function = { ev_func, "function", 1, ty_none, {{&type_void}} };
+type_t      type_pointer = { ev_pointer, "pointer", 1, ty_none, {{&type_void}} };
+type_t      type_quaternion = { ev_quat, "quaternion", 1 };
+type_t      type_integer = { ev_integer, "int", 1 };
+type_t      type_uinteger = { ev_uinteger, "uint", 1 };
+type_t      type_short = { ev_short, "short", 1 };
+type_t      type_double = { ev_double, "double", 2 };
 
 type_t     *type_nil;
 type_t     *type_default;
@@ -85,9 +85,11 @@ type_t     *type_default;
 type_t      type_va_list = { ev_invalid, 0, ty_struct };
 type_t      type_param = { ev_invalid, 0, ty_struct };
 type_t      type_zero = { ev_invalid, 0, ty_struct };
-type_t      type_type_encodings = { ev_invalid, "@type_encodings", ty_struct };
+type_t      type_type_encodings = { ev_invalid, "@type_encodings", 0,
+									ty_struct };
 
-type_t      type_floatfield = { ev_field, ".float", ty_none, {{&type_float}} };
+type_t      type_floatfield = { ev_field, ".float", 1, ty_none,
+								{{&type_float}} };
 
 type_t     *ev_types[ev_type_count] = {
 	&type_void,
@@ -222,15 +224,19 @@ append_type (type_t *type, type_t *new)
 			case ev_field:
 			case ev_pointer:
 				t = &(*t)->t.fldptr.type;
+				type->alignment = 1;
 				break;
 			case ev_func:
 				t = &(*t)->t.func.type;
+				type->alignment = 1;
 				break;
 			case ev_invalid:
-				if ((*t)->meta == ty_array)
+				if ((*t)->meta == ty_array) {
 					t = &(*t)->t.array.type;
-				else
+					type->alignment = new->alignment;
+				} else {
 					internal_error (0, "append to object type");
+				}
 				break;
 		}
 	}
@@ -364,6 +370,7 @@ field_type (type_t *aux)
 	else
 		new = new_type ();
 	new->type = ev_field;
+	new->alignment = 1;
 	new->t.fldptr.type = aux;
 	if (aux)
 		new = find_type (new);
@@ -381,6 +388,7 @@ pointer_type (type_t *aux)
 	else
 		new = new_type ();
 	new->type = ev_pointer;
+	new->alignment = 1;
 	new->t.fldptr.type = aux;
 	if (aux)
 		new = find_type (new);
@@ -398,6 +406,9 @@ array_type (type_t *aux, int size)
 	else
 		new = new_type ();
 	new->type = ev_invalid;
+	if (aux) {
+		new->alignment = aux->alignment;
+	}
 	new->meta = ty_array;
 	new->t.array.type = aux;
 	new->t.array.size = size;
@@ -417,6 +428,9 @@ based_array_type (type_t *aux, int base, int top)
 	else
 		new = new_type ();
 	new->type = ev_invalid;
+	if (aux) {
+		new->alignment = aux->alignment;
+	}
 	new->meta = ty_array;
 	new->t.array.type = aux;
 	new->t.array.base = base;

From 4caa875442b929f78dfee1d8e02d09ab5b289f64 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 15 Feb 2020 10:10:01 +0900
Subject: [PATCH 0377/1519] Finish up alignment tests and add address cast

It turns out that initializing a local int with a pointer cast doesn't
work.
---
 tools/qfcc/test/Makefile.am    | 10 ++++++++++
 tools/qfcc/test/address-cast.r | 17 +++++++++++++++++
 tools/qfcc/test/alignment.r    | 29 ++++++++++++++++++++++++++++-
 3 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 tools/qfcc/test/address-cast.r

diff --git a/tools/qfcc/test/Makefile.am b/tools/qfcc/test/Makefile.am
index cdc9d8c01..c13bfd9d0 100644
--- a/tools/qfcc/test/Makefile.am
+++ b/tools/qfcc/test/Makefile.am
@@ -29,6 +29,7 @@ test_bins=\
 fail_bins=
 
 test_progs_dat=\
+	address-cast.dat \
 	alignment.dat \
 	chewed-alias.dat \
 	chewed-return.dat \
@@ -89,6 +90,15 @@ test_harness_DEPENDENCIES=	$(QFCC_TEST_DEPS)
 
 r_depfiles_remade=
 
+address_cast_dat_SOURCES=address-cast.r
+address_cast_obj=$(address_cast_dat_SOURCES:.r=.qfo)
+address-cast.dat$(EXEEXT): $(address_cast_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(address_cast_obj)
+address-cast.run: Makefile build-run
+	$(srcdir)/build-run $@
+include ./$(DEPDIR)/address-cast.Qo # am--include-marker
+r_depfiles_remade += ./$(DEPDIR)/address-cast.Qo
+
 alignment_dat_SOURCES=alignment.r
 alignment_obj=$(alignment_dat_SOURCES:.r=.qfo)
 alignment.dat$(EXEEXT): $(alignment_obj) $(QFCC_DEP)
diff --git a/tools/qfcc/test/address-cast.r b/tools/qfcc/test/address-cast.r
new file mode 100644
index 000000000..b9f11640d
--- /dev/null
+++ b/tools/qfcc/test/address-cast.r
@@ -0,0 +1,17 @@
+int a;
+double b;
+int c;
+double d;
+void printf (string fmt, ...) = #0;
+
+int main()
+{
+	int         di = (int) &d;
+	int         fail = 0;
+
+	if (!di) {
+		printf ("address cast fail: %d\n", di);
+		fail |= 1;
+	}
+	return fail;
+}
diff --git a/tools/qfcc/test/alignment.r b/tools/qfcc/test/alignment.r
index 819f45d30..9b867b2d6 100644
--- a/tools/qfcc/test/alignment.r
+++ b/tools/qfcc/test/alignment.r
@@ -2,8 +2,35 @@ int a;
 double b;
 int c;
 double d;
+void printf (string fmt, ...) = #0;
 
 int main()
 {
-	return 1;
+	int         fail = 0;
+	void       *ap = &a;
+	void       *bp = &b;
+	void       *cp = &c;
+	void       *dp = &d;
+	int         aa = (int) ap;
+	int         ba = (int) bp;
+	int         ca = (int) cp;
+	int         da = (int) dp;
+
+	if (ba & 1) {
+		printf ("double b is not aligned: %d\n", ba);
+		fail |= 1;
+	}
+	if (da & 1) {
+		printf ("double d is not aligned: %d\n", da);
+		fail |= 1;
+	}
+	if (ca - aa != 1) {
+		printf ("int c (%d) is not adjacant to int a (%d)\n", ca, aa);
+		fail |= 1;
+	}
+	if (ba <= ca) {
+		printf ("double b does not come after int c: %d %d\n", ba, ca);
+		fail |= 1;
+	}
+	return fail;
 }

From 3257e7145b26287f1e19b41ec370984f8aa3ebc7 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 15 Feb 2020 10:12:33 +0900
Subject: [PATCH 0378/1519] Add failing global init test too

---
 tools/qfcc/test/address-cast.r | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tools/qfcc/test/address-cast.r b/tools/qfcc/test/address-cast.r
index b9f11640d..ed853f9e5 100644
--- a/tools/qfcc/test/address-cast.r
+++ b/tools/qfcc/test/address-cast.r
@@ -1,6 +1,6 @@
 int a;
 double b;
-int c;
+int c = (int) &b;
 double d;
 void printf (string fmt, ...) = #0;
 
@@ -9,8 +9,12 @@ int main()
 	int         di = (int) &d;
 	int         fail = 0;
 
+	if (!c) {
+		printf ("global init address cast fail: %d\n", c);
+		fail |= 1;
+	}
 	if (!di) {
-		printf ("address cast fail: %d\n", di);
+		printf ("local init address cast fail: %d\n", di);
 		fail |= 1;
 	}
 	return fail;

From ce9902baed172b69b3cdcb4dd83afeba9c8240c5 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 15 Feb 2020 15:32:01 +0900
Subject: [PATCH 0379/1519] Don't short-circuit aliased values

Not sure why I thought it was a good idea as it turns out this is why
cast pointer initializers were being lost.
---
 tools/qfcc/source/expr.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index 013d55d81..842da5ad8 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -1050,8 +1050,6 @@ new_alias_expr (type_t *type, expr_t *expr)
 {
 	expr_t     *alias;
 
-	if (expr->type == ex_value)
-		return new_value_expr (alias_value (expr->e.value, type));
 	alias = new_unary_expr ('A', expr);
 	alias->e.expr.type = type;
 	//if (expr->type == ex_uexpr && expr->e.expr.op == 'A')

From e4eb793fb31dbb19b13db1849b1d95f143d4c044 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 15 Feb 2020 15:37:16 +0900
Subject: [PATCH 0380/1519] Treat aliased values as constant

One step closer to cast address initializers working.
---
 tools/qfcc/source/def.c  | 14 +++++++++++++-
 tools/qfcc/source/expr.c |  4 ++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/tools/qfcc/source/def.c b/tools/qfcc/source/def.c
index 2b946a72c..f7735d8c3 100644
--- a/tools/qfcc/source/def.c
+++ b/tools/qfcc/source/def.c
@@ -585,8 +585,20 @@ initialize_def (symbol_t *sym, expr_t *init, defspace_t *space,
 			// fold_constants takes care of int/float conversions
 			append_expr (local_expr, fold_constants (init));
 		} else {
+			int         offset = 0;
+			if (!is_constant (init)) {
+				error (init, "non-constant initializier");
+				return;
+			}
+			while ((init->type == ex_uexpr || init->type == ex_expr)
+				   && init->e.expr.op == 'A') {
+				if (init->type == ex_expr) {
+					offset += expr_integer (init->e.expr.e2);
+				}
+				init = init->e.expr.e1;
+			}
 			if (init->type != ex_value) {	//FIXME enum etc
-				error (0, "non-constant initializier");
+				internal_error (0, "initializier not a value");
 				return;
 			}
 			if (init->e.value->lltype == ev_pointer
diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index 842da5ad8..7d7e55a21 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -777,6 +777,10 @@ new_short_expr (short short_val)
 int
 is_constant (expr_t *e)
 {
+	while ((e->type == ex_uexpr || e->type == ex_expr)
+		   && e->e.expr.op == 'A') {
+		e = e->e.expr.e1;
+	}
 	if (e->type == ex_nil || e->type == ex_value || e->type == ex_labelref
 		|| (e->type == ex_symbol && e->e.symbol->sy_type == sy_const)
 		|| (e->type == ex_symbol && e->e.symbol->sy_type == sy_var

From 3e651b43f8411c40967f7e5be8f5581a81a490b8 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 15 Feb 2020 15:38:15 +0900
Subject: [PATCH 0381/1519] Handle aliased values when emitting statements

With this, cast address initializers work. I have to wonder if the alias
value short-circuit was legacy from long before the rewrite, as it was
quite trivial to handle in the back-end.
---
 tools/qfcc/source/statements.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/qfcc/source/statements.c b/tools/qfcc/source/statements.c
index 072d175cf..6ec05d593 100644
--- a/tools/qfcc/source/statements.c
+++ b/tools/qfcc/source/statements.c
@@ -906,6 +906,8 @@ expr_alias (sblock_t *sblock, expr_t *e, operand_t **op)
 		while (def->alias)
 			def = def->alias;
 		*op = def_operand (alias_def (def, type, offset), 0);
+	} else if (aop->op_type == op_value) {
+		*op = value_operand (aop->o.value);
 	} else {
 		internal_error (e, "invalid alias target: %s: %s",
 						optype_str (aop->op_type), operand_string (aop));

From be30a0eb19a526f07ebab48856289d5bc0952c74 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 15 Feb 2020 16:08:21 +0900
Subject: [PATCH 0382/1519] Fix missing alignment init on zero and param types

---
 tools/qfcc/source/type.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/qfcc/source/type.c b/tools/qfcc/source/type.c
index d326a5f33..981d2fbed 100644
--- a/tools/qfcc/source/type.c
+++ b/tools/qfcc/source/type.c
@@ -82,9 +82,9 @@ type_t     *type_nil;
 type_t     *type_default;
 
 // these will be built up further
-type_t      type_va_list = { ev_invalid, 0, ty_struct };
-type_t      type_param = { ev_invalid, 0, ty_struct };
-type_t      type_zero = { ev_invalid, 0, ty_struct };
+type_t      type_va_list = { ev_invalid, 0, 0, ty_struct };
+type_t      type_param = { ev_invalid, 0, 0, ty_struct };
+type_t      type_zero = { ev_invalid, 0, 0, ty_struct };
 type_t      type_type_encodings = { ev_invalid, "@type_encodings", 0,
 									ty_struct };
 

From 4bf37b274bb3c04c6bb3cba85066a408bcdd2685 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 15 Feb 2020 16:08:55 +0900
Subject: [PATCH 0383/1519] Ensure double is not in zero or param structs for
 v6

---
 tools/qfcc/source/type.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/qfcc/source/type.c b/tools/qfcc/source/type.c
index 981d2fbed..289b76563 100644
--- a/tools/qfcc/source/type.c
+++ b/tools/qfcc/source/type.c
@@ -913,7 +913,6 @@ init_types (void)
 	};
 	static struct_def_t param_struct[] = {
 		{"string_val",       &type_string},
-		{"double_val",       &type_double},
 		{"float_val",        &type_float},
 		{"vector_val",       &type_vector},
 		{"entity_val",       &type_entity},
@@ -925,6 +924,7 @@ init_types (void)
 		{"integer_val",      &type_integer},
 		{"uinteger_val",     &type_uinteger},
 		{"quaternion_val",   &type_quaternion},
+		{"double_val",       &type_double},
 		{0, 0}
 	};
 	static struct_def_t vector_struct[] = {

From 08ca59d0df5f206665660bd7b159bb4ee7fd5507 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 15 Feb 2020 17:00:14 +0900
Subject: [PATCH 0384/1519] Add tests for double demotion

---
 tools/qfcc/test/Makefile.am           | 8 ++++++++
 tools/qfcc/test/double-demote-float.r | 7 +++++++
 tools/qfcc/test/double-demote-int.r   | 7 +++++++
 3 files changed, 22 insertions(+)
 create mode 100644 tools/qfcc/test/double-demote-float.r
 create mode 100644 tools/qfcc/test/double-demote-int.r

diff --git a/tools/qfcc/test/Makefile.am b/tools/qfcc/test/Makefile.am
index c13bfd9d0..32e5cd5ec 100644
--- a/tools/qfcc/test/Makefile.am
+++ b/tools/qfcc/test/Makefile.am
@@ -61,6 +61,8 @@ test_progs_dat=\
 fail_progs_dat=
 
 test_build_errors=\
+	double-demote-int.r \
+	double-demote-float.r \
 	double-int-compare.r \
 	double-float-compare.r
 
@@ -153,6 +155,12 @@ double.run: Makefile build-run
 include ./$(DEPDIR)/double.Qo # am--include-marker
 r_depfiles_remade += ./$(DEPDIR)/double.Qo
 
+double-demote-int.run$(EXEEXT): double-demote-int.r Makefile build-compile-fail-run
+	$(srcdir)/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $<
+
+double-demote-float.run$(EXEEXT): double-demote-float.r Makefile build-compile-fail-run
+	$(srcdir)/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $<
+
 double-int-compare.run$(EXEEXT): double-int-compare.r Makefile build-compile-fail-run
 	$(srcdir)/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $<
 
diff --git a/tools/qfcc/test/double-demote-float.r b/tools/qfcc/test/double-demote-float.r
new file mode 100644
index 000000000..330a0bdef
--- /dev/null
+++ b/tools/qfcc/test/double-demote-float.r
@@ -0,0 +1,7 @@
+double a;
+float b;
+int main ()
+{
+	b = a;
+	return 1;	// test fails if compile succeeds
+}
diff --git a/tools/qfcc/test/double-demote-int.r b/tools/qfcc/test/double-demote-int.r
new file mode 100644
index 000000000..bebef5436
--- /dev/null
+++ b/tools/qfcc/test/double-demote-int.r
@@ -0,0 +1,7 @@
+double a;
+int b;
+int main ()
+{
+	b = a;
+	return 1;	// test fails if compile succeeds
+}

From c5ce18591f9cf3fd9b6658a8844fa1039f425e2f Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 15 Feb 2020 17:24:53 +0900
Subject: [PATCH 0385/1519] Catch and warn demotion of double in assignments

---
 tools/qfcc/source/expr_assign.c             |  4 ++++
 tools/qfcc/test/Makefile.am                 | 10 +++++++++-
 tools/qfcc/test/double-demote-float-linit.r |  6 ++++++
 tools/qfcc/test/double-demote-int-linit.r   |  6 ++++++
 4 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 tools/qfcc/test/double-demote-float-linit.r
 create mode 100644 tools/qfcc/test/double-demote-int-linit.r

diff --git a/tools/qfcc/source/expr_assign.c b/tools/qfcc/source/expr_assign.c
index 1797f7677..600c6140a 100644
--- a/tools/qfcc/source/expr_assign.c
+++ b/tools/qfcc/source/expr_assign.c
@@ -151,6 +151,10 @@ check_types_compatible (expr_t *dst, expr_t *src)
 
 	if (type_assignable (dst_type, src_type)) {
 		if (is_scalar (dst_type) && is_scalar (src_type)) {
+			if (is_double (src_type)) {
+				warning (dst, "assignment of double to %s (use a cast)\n",
+						 dst_type->name);
+			}
 			// the types are different but cast-compatible
 			expr_t     *new = cast_expr (dst_type, src);
 			// the cast was a no-op, so the types are compatible at the
diff --git a/tools/qfcc/test/Makefile.am b/tools/qfcc/test/Makefile.am
index 32e5cd5ec..1d3d9de9c 100644
--- a/tools/qfcc/test/Makefile.am
+++ b/tools/qfcc/test/Makefile.am
@@ -61,8 +61,10 @@ test_progs_dat=\
 fail_progs_dat=
 
 test_build_errors=\
-	double-demote-int.r \
 	double-demote-float.r \
+	double-demote-float-linit.r \
+	double-demote-int.r \
+	double-demote-int-linit.r \
 	double-int-compare.r \
 	double-float-compare.r
 
@@ -161,6 +163,12 @@ double-demote-int.run$(EXEEXT): double-demote-int.r Makefile build-compile-fail-
 double-demote-float.run$(EXEEXT): double-demote-float.r Makefile build-compile-fail-run
 	$(srcdir)/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $<
 
+double-demote-int-linit.run$(EXEEXT): double-demote-int-linit.r Makefile build-compile-fail-run
+	$(srcdir)/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $<
+
+double-demote-float-linit.run$(EXEEXT): double-demote-float-linit.r Makefile build-compile-fail-run
+	$(srcdir)/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $<
+
 double-int-compare.run$(EXEEXT): double-int-compare.r Makefile build-compile-fail-run
 	$(srcdir)/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $<
 
diff --git a/tools/qfcc/test/double-demote-float-linit.r b/tools/qfcc/test/double-demote-float-linit.r
new file mode 100644
index 000000000..796b2040f
--- /dev/null
+++ b/tools/qfcc/test/double-demote-float-linit.r
@@ -0,0 +1,6 @@
+double a;
+int main ()
+{
+	float b = a;
+	return 1;	// test fails if compile succeeds
+}
diff --git a/tools/qfcc/test/double-demote-int-linit.r b/tools/qfcc/test/double-demote-int-linit.r
new file mode 100644
index 000000000..3a206f4b5
--- /dev/null
+++ b/tools/qfcc/test/double-demote-int-linit.r
@@ -0,0 +1,6 @@
+double a;
+int main ()
+{
+	int b = a;
+	return 1;	// test fails if compile succeeds
+}

From 6ce99afa5bd7260937a0b74d3cb07fcdc87a8488 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 15 Feb 2020 17:42:46 +0900
Subject: [PATCH 0386/1519] Catch double demotion in global initializers

Local initializers are handled by regular assignments
---
 tools/qfcc/source/def.c                     | 8 +++++++-
 tools/qfcc/test/Makefile.am                 | 8 ++++++++
 tools/qfcc/test/double-demote-float-ginit.r | 6 ++++++
 tools/qfcc/test/double-demote-int-ginit.r   | 6 ++++++
 4 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 tools/qfcc/test/double-demote-float-ginit.r
 create mode 100644 tools/qfcc/test/double-demote-int-ginit.r

diff --git a/tools/qfcc/source/def.c b/tools/qfcc/source/def.c
index f7735d8c3..6e545ba40 100644
--- a/tools/qfcc/source/def.c
+++ b/tools/qfcc/source/def.c
@@ -575,7 +575,8 @@ initialize_def (symbol_t *sym, expr_t *init, defspace_t *space,
 		init_elements (sym->s.def, init);
 		sym->s.def->initialized = 1;
 	} else {
-		if (!type_assignable (sym->type, get_type (init))) {
+		type_t     *init_type = get_type (init);
+		if (!type_assignable (sym->type, init_type)) {
 			error (init, "type mismatch in initializer");
 			return;
 		}
@@ -609,6 +610,11 @@ initialize_def (symbol_t *sym, expr_t *init, defspace_t *space,
 					reloc_def_field (init->e.value->v.pointer.def, sym->s.def);
 			} else {
 				ex_value_t *v = init->e.value;
+				if (is_double (init_type)
+					&& (is_integral (sym->type) || is_float (sym->type))) {
+					warning (init, "assigning double to %s in initializer "
+							 "(use a cast)", sym->type->name);
+				}
 				if (is_scalar (sym->type))
 					v = convert_value (v, sym->type);
 				if (v->lltype == ev_string) {
diff --git a/tools/qfcc/test/Makefile.am b/tools/qfcc/test/Makefile.am
index 1d3d9de9c..748f779c1 100644
--- a/tools/qfcc/test/Makefile.am
+++ b/tools/qfcc/test/Makefile.am
@@ -62,8 +62,10 @@ fail_progs_dat=
 
 test_build_errors=\
 	double-demote-float.r \
+	double-demote-float-ginit.r \
 	double-demote-float-linit.r \
 	double-demote-int.r \
+	double-demote-int-ginit.r \
 	double-demote-int-linit.r \
 	double-int-compare.r \
 	double-float-compare.r
@@ -163,6 +165,12 @@ double-demote-int.run$(EXEEXT): double-demote-int.r Makefile build-compile-fail-
 double-demote-float.run$(EXEEXT): double-demote-float.r Makefile build-compile-fail-run
 	$(srcdir)/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $<
 
+double-demote-int-ginit.run$(EXEEXT): double-demote-int-ginit.r Makefile build-compile-fail-run
+	$(srcdir)/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $<
+
+double-demote-float-ginit.run$(EXEEXT): double-demote-float-ginit.r Makefile build-compile-fail-run
+	$(srcdir)/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $<
+
 double-demote-int-linit.run$(EXEEXT): double-demote-int-linit.r Makefile build-compile-fail-run
 	$(srcdir)/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $<
 
diff --git a/tools/qfcc/test/double-demote-float-ginit.r b/tools/qfcc/test/double-demote-float-ginit.r
new file mode 100644
index 000000000..c88b5e987
--- /dev/null
+++ b/tools/qfcc/test/double-demote-float-ginit.r
@@ -0,0 +1,6 @@
+double a;
+float b = 1.0d;
+int main ()
+{
+	return 1;	// test fails if compile succeeds
+}
diff --git a/tools/qfcc/test/double-demote-int-ginit.r b/tools/qfcc/test/double-demote-int-ginit.r
new file mode 100644
index 000000000..767328715
--- /dev/null
+++ b/tools/qfcc/test/double-demote-int-ginit.r
@@ -0,0 +1,6 @@
+double a;
+int b = 1.0d;
+int main ()
+{
+	return 1;	// test fails if compile succeeds
+}

From 344d42913430dc8d45bf4732bfc645ff80fa4281 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 15 Feb 2020 17:49:26 +0900
Subject: [PATCH 0387/1519] Test array initializer double demotions

Turns out array inits are very strict about types (bug?).
---
 tools/qfcc/test/Makefile.am                 | 8 ++++++++
 tools/qfcc/test/double-demote-float-ainit.r | 6 ++++++
 tools/qfcc/test/double-demote-int-ainit.r   | 6 ++++++
 3 files changed, 20 insertions(+)
 create mode 100644 tools/qfcc/test/double-demote-float-ainit.r
 create mode 100644 tools/qfcc/test/double-demote-int-ainit.r

diff --git a/tools/qfcc/test/Makefile.am b/tools/qfcc/test/Makefile.am
index 748f779c1..7c51613e8 100644
--- a/tools/qfcc/test/Makefile.am
+++ b/tools/qfcc/test/Makefile.am
@@ -62,9 +62,11 @@ fail_progs_dat=
 
 test_build_errors=\
 	double-demote-float.r \
+	double-demote-float-ainit.r \
 	double-demote-float-ginit.r \
 	double-demote-float-linit.r \
 	double-demote-int.r \
+	double-demote-int-ainit.r \
 	double-demote-int-ginit.r \
 	double-demote-int-linit.r \
 	double-int-compare.r \
@@ -165,6 +167,12 @@ double-demote-int.run$(EXEEXT): double-demote-int.r Makefile build-compile-fail-
 double-demote-float.run$(EXEEXT): double-demote-float.r Makefile build-compile-fail-run
 	$(srcdir)/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $<
 
+double-demote-int-ainit.run$(EXEEXT): double-demote-int-ainit.r Makefile build-compile-fail-run
+	$(srcdir)/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $<
+
+double-demote-float-ainit.run$(EXEEXT): double-demote-float-ainit.r Makefile build-compile-fail-run
+	$(srcdir)/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $<
+
 double-demote-int-ginit.run$(EXEEXT): double-demote-int-ginit.r Makefile build-compile-fail-run
 	$(srcdir)/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $<
 
diff --git a/tools/qfcc/test/double-demote-float-ainit.r b/tools/qfcc/test/double-demote-float-ainit.r
new file mode 100644
index 000000000..6d380447d
--- /dev/null
+++ b/tools/qfcc/test/double-demote-float-ainit.r
@@ -0,0 +1,6 @@
+double a;
+int b[] = {1.0d};
+int main ()
+{
+	return 1;	// test fails if compile succeeds
+}
diff --git a/tools/qfcc/test/double-demote-int-ainit.r b/tools/qfcc/test/double-demote-int-ainit.r
new file mode 100644
index 000000000..6d380447d
--- /dev/null
+++ b/tools/qfcc/test/double-demote-int-ainit.r
@@ -0,0 +1,6 @@
+double a;
+int b[] = {1.0d};
+int main ()
+{
+	return 1;	// test fails if compile succeeds
+}

From 39df9c0c87785d3fbc5589bd7bf403b7d012464c Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 15 Feb 2020 18:17:18 +0900
Subject: [PATCH 0388/1519] Fix some more double related warnings

Fewer than I expected
---
 ruamoko/cl_menu/HUD.r | 4 ++--
 ruamoko/game/Axe.r    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ruamoko/cl_menu/HUD.r b/ruamoko/cl_menu/HUD.r
index 48bfc916f..b0ff525b2 100644
--- a/ruamoko/cl_menu/HUD.r
+++ b/ruamoko/cl_menu/HUD.r
@@ -166,7 +166,7 @@ int HUDHandleClass;
 			if (looping)
 				currentFrame = 0;
 			else {
-				nextFrameTime = 0.0;
+				nextFrameTime = 0.0f;
 				currentFrame = 0;
 				return;
 			}
@@ -201,7 +201,7 @@ int HUDHandleClass;
 
 - (void) stop
 {
-	nextFrameTime = 0.0;
+	nextFrameTime = 0.0f;
 	currentFrame = 0;
 }
 
diff --git a/ruamoko/game/Axe.r b/ruamoko/game/Axe.r
index 2ea71f0ef..7e3c49745 100644
--- a/ruamoko/game/Axe.r
+++ b/ruamoko/game/Axe.r
@@ -14,7 +14,7 @@
 - (id) init
 {
 	[super init];
-	damage = (deathmatch > 3) ? 75.0 : 20.0;
+	damage = (deathmatch > 3) ? 75.0f : 20.0f;
 	return self;
 }
 

From 91f5023681c8e7baddffffea796483f12ea01492 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 15 Feb 2020 18:44:53 +0900
Subject: [PATCH 0389/1519] Promote bugs to internal errors

Mostly so I can catch them in test cases
---
 tools/qfcc/include/options.h   |  6 ++++++
 tools/qfcc/source/diagnostic.c | 36 ++++++++++++++++++++++------------
 tools/qfcc/source/options.c    | 35 +++++++++++++++++++++++++++++++++
 3 files changed, 65 insertions(+), 12 deletions(-)

diff --git a/tools/qfcc/include/options.h b/tools/qfcc/include/options.h
index b66d9b19a..cfcd350de 100644
--- a/tools/qfcc/include/options.h
+++ b/tools/qfcc/include/options.h
@@ -70,6 +70,11 @@ typedef struct {
 	qboolean	silent;				// don't even bother (overrides promote)
 } notice_options_t;
 
+typedef struct {
+	qboolean	promote;			// Promote bugs to internal errors
+	qboolean	silent;				// don't even bother (overrides promote)
+} bug_options_t;
+
 typedef struct {
 	qboolean    initial;
 	qboolean    thread;
@@ -88,6 +93,7 @@ typedef struct {
 	code_options_t	code;			// Code generation options
 	warn_options_t	warnings;		// Warning options
 	notice_options_t notices;		// Notice options
+	bug_options_t   bug;			// Bug options
 	blockdot_options_t block_dot;	// Statement block flow diagrams
 
 	int				verbosity;		// 0=silent, goes up to 2 currently
diff --git a/tools/qfcc/source/diagnostic.c b/tools/qfcc/source/diagnostic.c
index 85e2b6d27..d38c1eecb 100644
--- a/tools/qfcc/source/diagnostic.c
+++ b/tools/qfcc/source/diagnostic.c
@@ -141,17 +141,39 @@ _debug (expr_t *e, const char *file, int line, const char *fmt, ...)
 	va_end (args);
 }
 
+static __attribute__((noreturn, format(printf, 4, 0))) void
+__internal_error (expr_t *e, const char *file, int line,
+				  const char *fmt, va_list args)
+{
+	dstring_t  *message = dstring_new ();
+
+	report_function (e);
+
+	format_message (message, "internal error", e, fmt, args);
+	dasprintf (message, " (%s:%d)", file, line);
+	fprintf (stderr, "%s\n", message->str);
+	dstring_delete (message);
+	abort ();
+}
+
 void
 _bug (expr_t *e, const char *file, int line, const char *fmt, ...)
 {
 	va_list     args;
 
-	report_function (e);
+	if (options.bug.silent)
+		return;
 
 	va_start (args, fmt);
+	if (options.bug.promote) {
+		__internal_error (e, file, line, fmt, args);
+	}
+
 	{
 		dstring_t  *message = dstring_new ();
 
+		report_function (e);
+
 		format_message (message, "BUG", e, fmt, args);
 		dasprintf (message, " (%s:%d)", file, line);
 		if (bug_hook) {
@@ -211,19 +233,9 @@ _internal_error (expr_t *e, const char *file, int line, const char *fmt, ...)
 {
 	va_list     args;
 
-	report_function (e);
-
 	va_start (args, fmt);
-	{
-		dstring_t  *message = dstring_new ();
-
-		format_message (message, "internal error", e, fmt, args);
-		dasprintf (message, " (%s:%d)", file, line);
-		fprintf (stderr, "%s\n", message->str);
-		dstring_delete (message);
-	}
+	__internal_error (e, file, line, fmt, args);
 	va_end (args);
-	abort ();
 }
 
 expr_t *
diff --git a/tools/qfcc/source/options.c b/tools/qfcc/source/options.c
index a0e7f83a9..cfd1e27bf 100644
--- a/tools/qfcc/source/options.c
+++ b/tools/qfcc/source/options.c
@@ -69,11 +69,13 @@ enum {
 	OPT_PROGDEFS,
 	OPT_QCCX_ESCAPES,
 	OPT_TRADITIONAL,
+	OPT_BUG,
 };
 
 static struct option const long_options[] = {
 	{"advanced", no_argument, 0, OPT_ADVANCED},
 	{"block-dot", optional_argument, 0, OPT_BLOCK_DOT},
+	{"bug", required_argument, 0, OPT_BUG},
 	{"code", required_argument, 0, 'C'},
 	{"cpp", required_argument, 0, OPT_CPP},
 	{"define", required_argument, 0, 'D'},
@@ -139,6 +141,7 @@ usage (int status)
 "Options:\n"
 "        --advanced            Advanced Ruamoko mode\n"
 "                              default for separate compilation mode\n"
+"        --bug OPTION,...      Set bug options\n"
 "    -C, --code OPTION,...     Set code generation options\n"
 "    -c                        Only compile, don't link\n"
 "        --cpp CPPSPEC         cpp execution command line\n"
@@ -264,6 +267,21 @@ notice_usage (void)
 	exit (0);
 }
 
+static void
+bug_usage (void)
+{
+	printf ("%s - QuakeForge Code Compiler\n", this_program);
+	printf ("Bug options\n");
+	printf (
+"    help                    Display his text.\n"
+"    none                    Turn off all bugs (don't we wish: messages).\n"
+"    die                     Change bugs to internal errors.\n"
+"\n"
+"This is a developer feature and thus not in the manual page\n"
+	);
+	exit (0);
+}
+
 static void
 add_file (const char *file)
 {
@@ -590,6 +608,23 @@ DecodeArgs (int argc, char **argv)
 					free (opts);
 				}
 				break;
+			case OPT_BUG:{
+					char       *opts = strdup (optarg);
+					char       *temp = strtok (opts, ",");
+
+					while (temp) {
+						if (!strcasecmp (temp, "help")) {
+							bug_usage ();
+						} else if (!(strcasecmp (temp, "none"))) {
+							options.bug.silent = true;
+						} else if (!(strcasecmp (temp, "die"))) {
+							options.bug.promote = true;
+						}
+						temp = strtok (NULL, ",");
+					}
+					free (opts);
+				}
+				break;
 			case OPT_CPP:				// --cpp=
 				cpp_name = save_string (optarg);
 				break;

From 7bfa0f7a9250c3e68aa1abfb374f8faf8fd10157 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 15 Feb 2020 19:41:20 +0900
Subject: [PATCH 0390/1519] Allow pragmas to have arguments

It does mean only one pragma per line, but that's not such a big deal.
---
 tools/qfcc/include/pragma.h |  3 +-
 tools/qfcc/source/pragma.c  | 69 +++++++++++++++++++++++++++++++------
 tools/qfcc/source/qc-lex.l  |  5 ++-
 3 files changed, 65 insertions(+), 12 deletions(-)

diff --git a/tools/qfcc/include/pragma.h b/tools/qfcc/include/pragma.h
index 5f660ac23..2fad5a357 100644
--- a/tools/qfcc/include/pragma.h
+++ b/tools/qfcc/include/pragma.h
@@ -35,7 +35,8 @@
 */
 ///@{
 
-void pragma (const char *id);
+void pragma_process (void);
+void pragma_add_arg (const char *id);
 
 ///@}
 
diff --git a/tools/qfcc/source/pragma.c b/tools/qfcc/source/pragma.c
index c5e8e816d..e1a465b53 100644
--- a/tools/qfcc/source/pragma.c
+++ b/tools/qfcc/source/pragma.c
@@ -39,14 +39,25 @@
 #endif
 #include <stdlib.h>
 
+#include "QF/alloc.h"
 #include "QF/pr_comp.h"
 
 #include "diagnostic.h"
 #include "opcodes.h"
 #include "options.h"
 #include "pragma.h"
+#include "strpool.h"
 #include "type.h"
 
+typedef struct pragma_arg_s {
+	struct pragma_arg_s *next;
+	const char *arg;
+} pragma_arg_t;
+
+static pragma_arg_t *pragma_args_freelist;
+static pragma_arg_t *pragma_args;
+static pragma_arg_t **pragma_args_tail = &pragma_args;
+
 static void
 set_traditional (int traditional)
 {
@@ -73,20 +84,58 @@ set_traditional (int traditional)
 	opcode_init ();		// reset the opcode table
 }
 
-void
-pragma (const char *id)
+static void
+set_bug (pragma_arg_t *args)
 {
+	if (!args) {
+		warning (0, "missing bug flag");
+		return;
+	}
+	const char *flag = args->arg;
+	if (!strcmp (flag, "none")) {
+		options.bug.silent = true;
+	} else if (!strcmp (flag, "!none")) {
+		options.bug.silent = false;
+	} else if (!strcmp (flag, "die")) {
+		options.bug.promote = true;
+	} else if (!strcmp (flag, "!die")) {
+		options.bug.promote = false;
+	}
+	if (args->next) {
+		warning (0, "pragma bug: ignoring extra arguments");
+	}
+}
+
+void
+pragma_process ()
+{
+	if (!pragma_args) {
+		warning (0, "empty pragma");
+		return;
+	}
+	const char *id = pragma_args->arg;
 	if (!strcmp (id, "traditional")) {
 		set_traditional (2);
-		return;
-	}
-	if (!strcmp (id, "extended")) {
+	} else if (!strcmp (id, "extended")) {
 		set_traditional (1);
-		return;
-	}
-	if (!strcmp (id, "advanced")) {
+	} else if (!strcmp (id, "advanced")) {
 		set_traditional (0);
-		return;
+	} else if (!strcmp (id, "bug")) {
+		set_bug (pragma_args->next);
+	} else {
+		warning (0, "unknown pragma: '%s'", id);
 	}
-	warning (0, "unknown pragma: %s", id);
+	*pragma_args_tail = pragma_args_freelist;
+	pragma_args_tail = &pragma_args;
+	pragma_args = 0;
+}
+
+void
+pragma_add_arg (const char *id)
+{
+	pragma_arg_t *arg;
+	ALLOC (16, pragma_arg_t, pragma_args, arg);
+	arg->arg = save_string (id);
+	*pragma_args_tail = arg;
+	pragma_args_tail = &arg->next;
 }
diff --git a/tools/qfcc/source/qc-lex.l b/tools/qfcc/source/qc-lex.l
index d17cad55e..5b97a0938 100644
--- a/tools/qfcc/source/qc-lex.l
+++ b/tools/qfcc/source/qc-lex.l
@@ -272,9 +272,12 @@ STRING		\"(\\.|[^"\\])*\"
 							write_frame_macros (s);
 							BEGIN (GRAB_OTHER);	// ignore rest of line
 						}
-<PRAGMA>{ID}		{ pragma (yytext); }
+<PRAGMA>{ID}		{ pragma_add_arg (yytext); }
 
 <*>\r*\n			{
+						if (YY_START == PRAGMA) {
+							pragma_process ();
+						}
 						pr.source_line++;
 						BEGIN (INITIAL);
 					}

From 9c996df7b4689228b6177521dcea4180deb2b925 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 15 Feb 2020 19:42:32 +0900
Subject: [PATCH 0391/1519] Add a test case for the uninit temp in HUD.r

---
 tools/qfcc/test/Makefile.am          | 10 ++++++++++
 tools/qfcc/test/ivar-struct-return.r | 26 ++++++++++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 tools/qfcc/test/ivar-struct-return.r

diff --git a/tools/qfcc/test/Makefile.am b/tools/qfcc/test/Makefile.am
index 7c51613e8..d9d66090a 100644
--- a/tools/qfcc/test/Makefile.am
+++ b/tools/qfcc/test/Makefile.am
@@ -41,6 +41,7 @@ test_progs_dat=\
 	func-expr.dat \
 	func-static.dat \
 	infloop.dat \
+	ivar-struct-return.dat \
 	modulo.dat \
 	paramret.dat \
 	quaternion.dat \
@@ -236,6 +237,15 @@ infloop.run: Makefile build-run
 include ./$(DEPDIR)/infloop.Qo # am--include-marker
 r_depfiles_remade += ./$(DEPDIR)/infloop.Qo
 
+ivar_struct_return_dat_SOURCES=ivar-struct-return.r
+ivar_struct_return_obj=$(ivar_struct_return_dat_SOURCES:.r=.qfo)
+ivar-struct-return.dat$(EXEEXT): $(ivar_struct_return_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(ivar_struct_return_obj)
+ivar-struct-return.run: Makefile build-run
+	$(srcdir)/build-run $@
+include ./$(DEPDIR)/ivar-struct-return.Qo # am--include-marker
+r_depfiles_remade += ./$(DEPDIR)/ivar-struct-return.Qo
+
 modulo_dat_SOURCES=modulo.r
 modulo_obj=$(modulo_dat_SOURCES:.r=.qfo)
 modulo.dat$(EXEEXT): $(modulo_obj) $(QFCC_DEP)
diff --git a/tools/qfcc/test/ivar-struct-return.r b/tools/qfcc/test/ivar-struct-return.r
new file mode 100644
index 000000000..a96cafac7
--- /dev/null
+++ b/tools/qfcc/test/ivar-struct-return.r
@@ -0,0 +1,26 @@
+#pragma bug die
+
+struct Point {
+	int x;
+	int y;
+};
+typedef struct Point Point;
+
+@interface Object
+{
+	Point origin;
+}
+-(Point) origin;
+@end
+
+@implementation Object
+-(Point) origin
+{
+	return origin;
+}
+@end
+void __obj_exec_class (struct obj_module *msg) = #0;
+int main()
+{
+	return 0;	// to survive and prevail
+}

From 1985b6d4fd2a39c8717ceedaf1d6fe46ac7ebcde Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 15 Feb 2020 22:10:46 +0900
Subject: [PATCH 0392/1519] Avoid creating a struct temp for ivar struct return

This fixed the uninitialized temp warning in HUD.r. The problem was
caused by the flow analyzer not being able to detect that the struct
temp was being initialized by the move statement due to the address of
the temp being in a pointer temp. While it would be good to use a
constant pointer for the address of the struct temp or improving the
flow analyzer to track actual data, avoiding the temp in the first place
results in nicer code as it removes a move statement.
---
 tools/qfcc/include/statements.h      |  1 +
 tools/qfcc/source/statements.c       | 30 +++++++++++++++-------------
 tools/qfcc/test/ivar-struct-return.r |  1 +
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/tools/qfcc/include/statements.h b/tools/qfcc/include/statements.h
index 14a95ae0a..ce230d9ec 100644
--- a/tools/qfcc/include/statements.h
+++ b/tools/qfcc/include/statements.h
@@ -116,6 +116,7 @@ struct dstring_s;
 const char *optype_str (op_type_e type) __attribute__((const));
 
 operand_t *def_operand (struct def_s *def, struct type_s *type);
+operand_t *return_operand (struct type_s *type);
 operand_t *value_operand (struct ex_value_s *value);
 int tempop_overlap (tempop_t *t1, tempop_t *t2) __attribute__((pure));
 operand_t *temp_operand (struct type_s *type);
diff --git a/tools/qfcc/source/statements.c b/tools/qfcc/source/statements.c
index 6ec05d593..5dc5d878c 100644
--- a/tools/qfcc/source/statements.c
+++ b/tools/qfcc/source/statements.c
@@ -318,6 +318,15 @@ def_operand (def_t *def, type_t *type)
 	return op;
 }
 
+operand_t *
+return_operand (type_t *type)
+{
+	symbol_t   *return_symbol;
+	return_symbol = make_symbol (".return", &type_param, pr.symtab->space,
+								 sc_extern);
+	return def_operand (return_symbol->s.def, type);
+}
+
 operand_t *
 value_operand (ex_value_t *value)
 {
@@ -394,7 +403,7 @@ alias_operand (type_t *type, operand_t *op)
 	operand_t  *aop;
 
 	if (type_size (type) != type_size (op->type)) {
-		internal_error (0, "\naliasing operand with type of diffent size"
+		internal_error (0, "\naliasing operand with type of different size"
 						" (%d, %d)", type_size (type), type_size (op->type));
 	}
 	aop = new_operand (op_alias);
@@ -1387,8 +1396,10 @@ statement_uexpr (sblock_t *sblock, expr_t *e)
 				}
 			}
 			s = new_statement (st_func, opcode, e);
-			if (e->e.expr.e1)
+			if (e->e.expr.e1) {
+				s->opa = return_operand (get_type (e->e.expr.e1));
 				sblock = statement_subexpr (sblock, e->e.expr.e1, &s->opa);
+			}
 			sblock_add_statement (sblock, s);
 			sblock->next = new_sblock ();
 			sblock = sblock->next;
@@ -1667,10 +1678,6 @@ static void
 check_final_block (sblock_t *sblock)
 {
 	statement_t *s = 0;
-	symbol_t   *return_symbol = 0;
-	def_t      *return_def = 0;
-	operand_t  *return_operand = 0;
-	const char *return_opcode = "<RETURN_V>";
 
 	if (!sblock)
 		return;
@@ -1691,16 +1698,11 @@ check_final_block (sblock_t *sblock)
 		sblock->next = new_sblock ();
 		sblock = sblock->next;
 	}
+	s = new_statement (st_func, "<RETURN_V>", 0);
 	if (options.traditional || options.code.progsversion == PROG_ID_VERSION) {
-		return_symbol = make_symbol (".return", &type_param, pr.symtab->space,
-									 sc_extern);
-		return_def = return_symbol->s.def;
-		return_opcode = "<RETURN>";
+		s->opcode = save_string ("<RETURN>");
+		s->opa = return_operand (&type_void);
 	}
-	if (return_symbol)
-		return_operand = def_operand (return_def, &type_void);
-	s = new_statement (st_func, return_opcode, 0);
-	s->opa = return_operand;
 	sblock_add_statement (sblock, s);
 }
 
diff --git a/tools/qfcc/test/ivar-struct-return.r b/tools/qfcc/test/ivar-struct-return.r
index a96cafac7..5e212a5ba 100644
--- a/tools/qfcc/test/ivar-struct-return.r
+++ b/tools/qfcc/test/ivar-struct-return.r
@@ -8,6 +8,7 @@ typedef struct Point Point;
 
 @interface Object
 {
+	int   foo;
 	Point origin;
 }
 -(Point) origin;

From 14acfad7c4c73f8931fea35fe19e4170c1b9d00e Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 15 Feb 2020 22:53:21 +0900
Subject: [PATCH 0393/1519] Fix incorrect placement of far data

All the care in aligning things was undone by not updating the
calculations of the pointers.
---
 tools/qfcc/source/obj_file.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/qfcc/source/obj_file.c b/tools/qfcc/source/obj_file.c
index e0b6c668f..c809a4a8b 100644
--- a/tools/qfcc/source/obj_file.c
+++ b/tools/qfcc/source/obj_file.c
@@ -889,8 +889,8 @@ qfo_to_progs (qfo_t *qfo, int *size)
 
 	progs->ofs_globals = data - (byte *) progs;
 	globals = (pr_type_t*) data;
-	locals = globals + qfo->spaces[qfo_near_data_space].data_size;
-	far_data = locals + locals_size;
+	locals = globals + locals_start;
+	far_data = globals + near_data_size;
 	type_data = far_data + qfo->spaces[qfo_far_data_space].data_size;
 
 	memcpy (strings, qfo->spaces[qfo_strings_space].d.strings,
@@ -947,7 +947,7 @@ qfo_to_progs (qfo_t *qfo, int *size)
 	memcpy (globals, qfo->spaces[qfo_near_data_space].d.data,
 			qfo->spaces[qfo_near_data_space].data_size * sizeof (pr_type_t));
 	qfo->spaces[qfo_near_data_space].d.data = globals;
-	// lcear locals data
+	// clear locals data
 	memset (locals, 0, locals_size * sizeof (pr_type_t));
 	// copy far data
 	memcpy (far_data, qfo->spaces[qfo_far_data_space].d.data,

From bab3752e989c9e92f06affeebbcbaecac133c5d1 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 15 Feb 2020 23:22:56 +0900
Subject: [PATCH 0394/1519] Add missed overridden math functions

And fix misspelled ones too.
---
 libs/ruamoko/rua_math.c | 33 +++++++++++++++++++++++++++------
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/libs/ruamoko/rua_math.c b/libs/ruamoko/rua_math.c
index 167db865f..a81d33356 100644
--- a/libs/ruamoko/rua_math.c
+++ b/libs/ruamoko/rua_math.c
@@ -168,6 +168,24 @@ bi_atanhf (progs_t *pr)
 	R_FLOAT (pr) = logf ((1 + y) / (1 - y)) / 2;
 }
 
+static void
+bi_floor (progs_t *pr)
+{
+	R_DOUBLE (pr) = floor (P_DOUBLE (pr, 0));
+}
+
+static void
+bi_ceil (progs_t *pr)
+{
+	R_DOUBLE (pr) = ceil (P_DOUBLE (pr, 0));
+}
+
+static void
+bi_fabs (progs_t *pr)
+{
+	R_DOUBLE (pr) = fabs (P_DOUBLE (pr, 0));
+}
+
 static void
 bi_sin (progs_t *pr)
 {
@@ -298,34 +316,37 @@ static builtin_t builtins[] = {
 	{"asin|f",	bi_asinf,	-1},
 	{"acos|f",	bi_acosf,	-1},
 	{"atan|f",	bi_atanf,	-1},
-	{"atan2|f",	bi_atan2f, 	-1},
+	{"atan2|ff",bi_atan2f, 	-1},
 	{"log|f",	bi_logf,	-1},
 	{"log2|f",	bi_log2f,	-1},
 	{"log10|f",	bi_log10f,	-1},
-	{"pow|f",	bi_powf,	-1},
+	{"pow|ff",	bi_powf,	-1},
 	{"sqrt|f",	bi_sqrtf,	-1},
 	{"cbrt|f",	bi_cbrtf,	-1},
-	{"hypot|f",	bi_hypotf,	-1},
+	{"hypot|ff",bi_hypotf,	-1},
 	{"sinh|f",	bi_sinhf,	-1},
 	{"cosh|f",	bi_coshf,	-1},
 	{"tanh|f",	bi_tanhf,	-1},
 	{"asinh|f",	bi_asinhf,	-1},
 	{"acosh|f",	bi_acoshf,	-1},
 	{"atanh|f",	bi_atanhf,	-1},
+	{"floor|d",	bi_floor,	-1},	// float version in pr_cmds
+	{"ceil|d",	bi_ceil,	-1},	// float version in pr_cmds
+	{"fabs|d",	bi_fabs,	-1},	// float version in pr_cmds
 	{"sin|d",	bi_sin,		-1},
 	{"cos|d",	bi_cos,		-1},
 	{"tan|d",	bi_tan,		-1},
 	{"asin|d",	bi_asin,	-1},
 	{"acos|d",	bi_acos,	-1},
 	{"atan|d",	bi_atan,	-1},
-	{"atan2|d",	bi_atan2, 	-1},
+	{"atan2|dd",bi_atan2, 	-1},
 	{"log|d",	bi_log,		-1},
 	{"log2|d",	bi_log2,	-1},
 	{"log10|d",	bi_log10,	-1},
-	{"pow|d",	bi_pow,		-1},
+	{"pow|dd",	bi_pow,		-1},
 	{"sqrt|d",	bi_sqrt,	-1},
 	{"cbrt|d",	bi_cbrt,	-1},
-	{"hypot|d",	bi_hypot,	-1},
+	{"hypot|dd",bi_hypot,	-1},
 	{"sinh|d",	bi_sinh,	-1},
 	{"cosh|d",	bi_cosh,	-1},
 	{"tanh|d",	bi_tanh,	-1},

From db9996023fcdcc4d057e3c068434c92e62b3450b Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 15 Feb 2020 23:43:33 +0900
Subject: [PATCH 0395/1519] Add some tests for double comparison

More testing the engine than the compiler, but hey :)
---
 tools/qfcc/test/double.r | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/tools/qfcc/test/double.r b/tools/qfcc/test/double.r
index 623d9f0ae..326ccf906 100644
--- a/tools/qfcc/test/double.r
+++ b/tools/qfcc/test/double.r
@@ -35,6 +35,46 @@ test_constant ()
 	return fail;
 }
 
+double less = 3;
+double greater_equal = 3;
+double less_equal = 5;
+double greater = 5;
+
+int
+test_copare ()
+{
+	int fail = 0;
+
+	fail |= !(less < greater);
+	fail |= (less > greater);
+	fail |= !(less != greater);
+	fail |= (less == greater);
+	fail |= !(less <= greater);
+	fail |= (less >= greater);
+
+	fail |= (less_equal < greater);
+	fail |= (less_equal > greater);
+	fail |= !(less_equal == greater);
+	fail |= (less_equal != greater);
+	fail |= !(less_equal <= greater);
+	fail |= !(less_equal >= greater);
+
+	fail |= (greater < less);
+	fail |= !(greater > less);
+	fail |= !(greater != less);
+	fail |= (greater == less);
+	fail |= (greater <= less);
+	fail |= !(greater >= less);
+
+	fail |= (greater_equal < less);
+	fail |= (greater_equal > less);
+	fail |= !(greater_equal == less);
+	fail |= (greater_equal != less);
+	fail |= !(greater_equal <= less);
+	fail |= !(greater_equal >= less);
+	return fail;
+}
+
 int
 test_ops ()
 {

From 4269c8cb07db4748b444e0f191901bef49cf33ec Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 16 Feb 2020 11:04:30 +0900
Subject: [PATCH 0396/1519] Rename the mod instruction to rem

Because % really implements remainder rather than true modulo, and I
plan on adding %% to implement true modulo.
---
 include/QF/pr_comp.h      |  6 +++---
 libs/gamecode/pr_exec.c   | 10 +++++-----
 libs/gamecode/pr_opcode.c |  6 +++---
 tools/qfcc/test/modulo.r  | 20 ++++++++++++++++++--
 4 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/include/QF/pr_comp.h b/include/QF/pr_comp.h
index 122de60b9..0fb09da41 100644
--- a/include/QF/pr_comp.h
+++ b/include/QF/pr_comp.h
@@ -181,8 +181,8 @@ typedef enum {
 	OP_SHL_I,
 	OP_SHR_I,
 
-	OP_MOD_F,
-	OP_MOD_I,
+	OP_REM_F,
+	OP_REM_I,
 
 	OP_LOADB_F,
 	OP_LOADB_V,
@@ -371,7 +371,7 @@ typedef enum {
 	OP_MUL_VD,
 	OP_MUL_DV,
 	OP_DIV_D,
-	OP_MOD_D,
+	OP_REM_D,
 	OP_GE_D,
 	OP_LE_D,
 	OP_GT_D,
diff --git a/libs/gamecode/pr_exec.c b/libs/gamecode/pr_exec.c
index 3ea2c3bd5..8cb6ecbb8 100644
--- a/libs/gamecode/pr_exec.c
+++ b/libs/gamecode/pr_exec.c
@@ -318,8 +318,8 @@ signal_hook (int sig, void *data)
 				else
 					OPC.integer_var = 0x7fffffff;
 				return 1;
-			case OP_MOD_I:
-			case OP_MOD_F:
+			case OP_REM_I:
+			case OP_REM_F:
 				OPC.integer_var = 0x00000000;
 				return 1;
 			default:
@@ -1429,17 +1429,17 @@ op_call:
 			case OP_DIV_I:
 				OPC.integer_var = OPA.integer_var / OPB.integer_var;
 				break;
-			case OP_MOD_I:
+			case OP_REM_I:
 				OPC.integer_var = OPA.integer_var % OPB.integer_var;
 				break;
-			case OP_MOD_D:
+			case OP_REM_D:
 				{
 					double      a = OPA_double_var;
 					double      b = OPB_double_var;
 					OPC_double_var = a - b * trunc (a / b);
 				}
 				break;
-			case OP_MOD_F:
+			case OP_REM_F:
 				{
 					float       a = OPA.float_var;
 					float       b = OPB.float_var;
diff --git a/libs/gamecode/pr_opcode.c b/libs/gamecode/pr_opcode.c
index f18fd2b42..01dd172ae 100644
--- a/libs/gamecode/pr_opcode.c
+++ b/libs/gamecode/pr_opcode.c
@@ -171,7 +171,7 @@ VISIBLE opcode_t pr_opcodes[] = {
 	 ev_double, ev_double, ev_double,
 	 PROG_VERSION,
 	},
-	{"%", "mod.d", OP_MOD_D, false,
+	{"%", "rem.d", OP_REM_D, false,
 	 ev_double, ev_double, ev_double,
 	 PROG_VERSION,
 	},
@@ -1036,7 +1036,7 @@ VISIBLE opcode_t pr_opcodes[] = {
 	 ev_integer, ev_integer, ev_integer,
 	 PROG_VERSION,
 	},
-	{"%", "mod.i", OP_MOD_I, false,
+	{"%", "rem.i", OP_REM_I, false,
 	 ev_integer, ev_integer, ev_integer,
 	 PROG_VERSION,
 	},
@@ -1049,7 +1049,7 @@ VISIBLE opcode_t pr_opcodes[] = {
 	 PROG_VERSION,
 	},
 
-	{"%", "mod.f", OP_MOD_F, false,
+	{"%", "rem.f", OP_REM_F, false,
 	 ev_float, ev_float, ev_float,
 	 PROG_VERSION,
 	},
diff --git a/tools/qfcc/test/modulo.r b/tools/qfcc/test/modulo.r
index 1e02fcaa0..81366c134 100644
--- a/tools/qfcc/test/modulo.r
+++ b/tools/qfcc/test/modulo.r
@@ -1,11 +1,19 @@
-#pragma traditional
+void printf (string ftm, ...) = #0;
 
-void (...) printf = #0;
+float snafu (float a, float b)
+{
+	float c = a % b;
+	return c;
+}
+
+#pragma traditional
 float foo (float a, float b)
 {
 	float c = a % b;
 	return c;
 }
+#pragma advanced
+
 float bar (float a, float b)
 {
 	float c;
@@ -15,11 +23,13 @@ float bar (float a, float b)
 	return c;
 }
 
+#pragma traditional
 float baz (float a, float b)
 {
 	float c = (a + b) % (a - b);
 	return c;
 }
+#pragma advanced
 
 float test (string name, float (func)(float a, float b),
 			float a, float b, float c)
@@ -45,20 +55,26 @@ float main (void)
 	res |= test ("foo", foo, 5, 3, 2);
 	res |= test ("bar", bar, 5, 3, 2);
 	res |= test ("baz", baz, 5, 3, 0);
+	res |= test ("snafu", snafu, 5, 3, 2);
 
 	res |= test ("foo", foo, -5, 3, -2);
 	res |= test ("bar", bar, -5, 3, -2);
 	res |= test ("baz", baz, -5, 3, -2);
+	res |= test ("snafu", snafu, -5, 3, -2);
 
 	res |= test ("foo", foo, 5, -3, 2);
 	res |= test ("bar", bar, 5, -3, 2);
 	res |= test ("baz", baz, 5, -3, 2);
+	res |= test ("snafu", snafu, 5, -3, 2);
 
 	res |= test ("foo", foo, -5, -3, -2);
 	res |= test ("bar", bar, -5, -3, -2);
 	res |= test ("baz", baz, -5, -3, 0);
+	res |= test ("snafu", snafu, -5, -3, -2);
 
 	res |= test ("foo", foo, 5, 3.5, 1.5);
 	res |= test ("foo", foo, -5, 3.5, -1.5);
+	res |= test ("snafu", snafu, 5, 3.5, 1.5);
+	res |= test ("snafu", snafu, -5, 3.5, -1.5);
 	return res;
 }

From b4fd804e4e9cfa9bfc484704f80a87c0146eb0d7 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 16 Feb 2020 11:53:56 +0900
Subject: [PATCH 0397/1519] Implement true modulo in the engine

---
 include/QF/pr_comp.h      |  4 ++++
 libs/gamecode/pr_exec.c   | 35 +++++++++++++++++++++++++++++++++++
 libs/gamecode/pr_opcode.c | 13 +++++++++++++
 3 files changed, 52 insertions(+)

diff --git a/include/QF/pr_comp.h b/include/QF/pr_comp.h
index 0fb09da41..7d7589c4d 100644
--- a/include/QF/pr_comp.h
+++ b/include/QF/pr_comp.h
@@ -391,6 +391,10 @@ typedef enum {
 	OP_LOADB_D,
 	OP_LOADBI_D,
 	OP_ADDRESS_D,
+
+	OP_MOD_I,
+	OP_MOD_F,
+	OP_MOD_D,
 } pr_opcode_e;
 
 typedef struct opcode_s {
diff --git a/libs/gamecode/pr_exec.c b/libs/gamecode/pr_exec.c
index 8cb6ecbb8..c6f376c62 100644
--- a/libs/gamecode/pr_exec.c
+++ b/libs/gamecode/pr_exec.c
@@ -318,6 +318,8 @@ signal_hook (int sig, void *data)
 				else
 					OPC.integer_var = 0x7fffffff;
 				return 1;
+			case OP_MOD_I:
+			case OP_MOD_F:
 			case OP_REM_I:
 			case OP_REM_F:
 				OPC.integer_var = 0x00000000;
@@ -1429,9 +1431,35 @@ op_call:
 			case OP_DIV_I:
 				OPC.integer_var = OPA.integer_var / OPB.integer_var;
 				break;
+			case OP_MOD_I:
+				{
+					// implement true modulo for integers:
+					//  5 mod  3 = 2
+					// -5 mod  3 = 1
+					//  5 mod -3 = -1
+					// -5 mod -3 = -2
+					int         a = OPA.integer_var;
+					int         b = OPB.integer_var;
+					int         c = a % b;
+					// % is really remainder and so has the same sign rules
+					// as division: -5 % 3 = -2, so need to add b (3 here)
+					// if c's sign is incorrect, but only if c is non-zero
+					int         mask = (a ^ b) >> 31;
+					mask &= ~!!c + 1;
+					OPC.integer_var = c + (mask & b);
+				}
+				break;
 			case OP_REM_I:
 				OPC.integer_var = OPA.integer_var % OPB.integer_var;
 				break;
+			case OP_MOD_D:
+				{
+					double      a = OPA_double_var;
+					double      b = OPB_double_var;
+					// floating point modulo is so much easier :P
+					OPC_double_var = a - b * floor (a / b);
+				}
+				break;
 			case OP_REM_D:
 				{
 					double      a = OPA_double_var;
@@ -1439,6 +1467,13 @@ op_call:
 					OPC_double_var = a - b * trunc (a / b);
 				}
 				break;
+			case OP_MOD_F:
+				{
+					float       a = OPA.float_var;
+					float       b = OPB.float_var;
+					OPC.float_var = a - b * floorf (a / b);
+				}
+				break;
 			case OP_REM_F:
 				{
 					float       a = OPA.float_var;
diff --git a/libs/gamecode/pr_opcode.c b/libs/gamecode/pr_opcode.c
index 01dd172ae..15185b37d 100644
--- a/libs/gamecode/pr_opcode.c
+++ b/libs/gamecode/pr_opcode.c
@@ -175,6 +175,10 @@ VISIBLE opcode_t pr_opcodes[] = {
 	 ev_double, ev_double, ev_double,
 	 PROG_VERSION,
 	},
+	{"%%", "mod.d", OP_MOD_D, false,
+	 ev_double, ev_double, ev_double,
+	 PROG_VERSION,
+	},
 
 	{"+", "add.d", OP_ADD_D, false,
 	 ev_double, ev_double, ev_double,
@@ -1040,6 +1044,10 @@ VISIBLE opcode_t pr_opcodes[] = {
 	 ev_integer, ev_integer, ev_integer,
 	 PROG_VERSION,
 	},
+	{"%%", "mod.i", OP_MOD_I, false,
+	 ev_integer, ev_integer, ev_integer,
+	 PROG_VERSION,
+	},
 	{"&", "bitand.i", OP_BITAND_I, false,
 	 ev_integer, ev_integer, ev_integer,
 	 PROG_VERSION,
@@ -1054,6 +1062,11 @@ VISIBLE opcode_t pr_opcodes[] = {
 	 PROG_VERSION,
 	},
 
+	{"%%", "mod.f", OP_MOD_F, false,
+	 ev_float, ev_float, ev_float,
+	 PROG_VERSION,
+	},
+
 	{">=", "ge.i", OP_GE_I, false,
 	 ev_integer, ev_integer, ev_integer,
 	 PROG_VERSION,

From 9d2d33fa50acd65a5ec59edc2a1e740b7f33bad3 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 16 Feb 2020 11:57:58 +0900
Subject: [PATCH 0398/1519] Implement %% (true modulo) support in qfcc

However, it's not quite working yet
---
 tools/qfcc/source/dot_expr.c    |  1 +
 tools/qfcc/source/expr_binary.c | 16 ++++++++++++++++
 tools/qfcc/source/qc-lex.l      | 10 ++++++++++
 tools/qfcc/source/qc-parse.y    |  3 ++-
 tools/qfcc/test/modulo.r        | 15 +++++++++++++++
 5 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/tools/qfcc/source/dot_expr.c b/tools/qfcc/source/dot_expr.c
index 675488e93..081dbecec 100644
--- a/tools/qfcc/source/dot_expr.c
+++ b/tools/qfcc/source/dot_expr.c
@@ -88,6 +88,7 @@ get_op_string (int op)
 		case '*':	return "*";
 		case '/':	return "/";
 		case '%':	return "%";
+		case MOD:	return "%%";
 		case '&':	return "&";
 		case '|':	return "|";
 		case '^':	return "^";
diff --git a/tools/qfcc/source/expr_binary.c b/tools/qfcc/source/expr_binary.c
index 0f2a1e256..2e31116f3 100644
--- a/tools/qfcc/source/expr_binary.c
+++ b/tools/qfcc/source/expr_binary.c
@@ -69,6 +69,7 @@ static expr_type_t float_float[] = {
 	{'|',	&type_float},
 	{'^',	&type_float},
 	{'%',	&type_float},
+	{MOD,	&type_float},
 	{SHL,	&type_float},
 	{SHR,	&type_float},
 	{EQ,	&type_integer},
@@ -99,6 +100,7 @@ static expr_type_t float_integer[] = {
 	{'|',	&type_float, 0, &type_float},
 	{'^',	&type_float, 0, &type_float},
 	{'%',	&type_float, 0, &type_float},
+	{MOD,	&type_float, 0, &type_float},
 	{SHL,	&type_float, 0, &type_float},
 	{SHR,	&type_float, 0, &type_float},
 	{EQ,	&type_integer, 0, &type_float},
@@ -118,6 +120,7 @@ static expr_type_t float_double[] = {
 	{'*',	&type_double, &type_double, 0},
 	{'/',	&type_double, &type_double, 0},
 	{'%',	&type_double, &type_double, 0},
+	{MOD,	&type_double, &type_double, 0},
 	{EQ,	0, 0, 0, double_compare},
 	{NE,	0, 0, 0, double_compare},
 	{LE,	0, 0, 0, double_compare},
@@ -232,6 +235,7 @@ static expr_type_t integer_float[] = {
 	{'|',	&type_float, &type_float, 0},
 	{'^',	&type_float, &type_float, 0},
 	{'%',	&type_float, &type_float, 0},
+	{MOD,	&type_float, &type_float, 0},
 	{SHL,	&type_integer, 0, &type_integer},	//FIXME?
 	{SHR,	&type_integer, 0, &type_integer},	//FIXME?
 	{EQ,	&type_integer, &type_float, 0},
@@ -267,6 +271,7 @@ static expr_type_t integer_integer[] = {
 	{'|',	&type_integer},
 	{'^',	&type_integer},
 	{'%',	&type_integer},
+	{MOD,	&type_integer},
 	{SHL,	&type_integer},
 	{SHR,	&type_integer},
 	{EQ,	&type_integer},
@@ -287,6 +292,7 @@ static expr_type_t integer_uinteger[] = {
 	{'|',	&type_integer},
 	{'^',	&type_integer},
 	{'%',	&type_integer},
+	{MOD,	&type_integer},
 	{SHL,	&type_integer},
 	{SHR,	&type_integer},
 	{EQ,	&type_integer},
@@ -307,6 +313,7 @@ static expr_type_t integer_short[] = {
 	{'|',	&type_integer, 0, &type_integer},
 	{'^',	&type_integer, 0, &type_integer},
 	{'%',	&type_integer, 0, &type_integer},
+	{MOD,	&type_integer, 0, &type_integer},
 	{SHL,	&type_integer, 0, &type_integer},
 	{SHR,	&type_integer, 0, &type_integer},
 	{EQ,	&type_integer, 0, &type_integer},
@@ -324,6 +331,7 @@ static expr_type_t integer_double[] = {
 	{'*',	&type_double, &type_double, 0},
 	{'/',	&type_double, &type_double, 0},
 	{'%',	&type_double, &type_double, 0},
+	{MOD,	&type_double, &type_double, 0},
 	{EQ,	&type_integer, &type_double, 0},
 	{NE,	&type_integer, &type_double, 0},
 	{LE,	&type_integer, &type_double, 0},
@@ -347,6 +355,7 @@ static expr_type_t uinteger_integer[] = {
 	{'|',	&type_integer},
 	{'^',	&type_integer},
 	{'%',	&type_integer},
+	{MOD,	&type_integer},
 	{SHL,	&type_uinteger},
 	{SHR,	&type_uinteger},
 	{EQ,	&type_integer},
@@ -367,6 +376,7 @@ static expr_type_t uinteger_uinteger[] = {
 	{'|',	&type_uinteger},
 	{'^',	&type_uinteger},
 	{'%',	&type_uinteger},
+	{MOD,	&type_uinteger},
 	{SHL,	&type_uinteger},
 	{SHR,	&type_uinteger},
 	{EQ,	&type_integer},
@@ -394,6 +404,7 @@ static expr_type_t short_integer[] = {
 	{'|',	&type_integer, &type_integer, 0},
 	{'^',	&type_integer, &type_integer, 0},
 	{'%',	&type_integer, &type_integer, 0},
+	{MOD,	&type_integer, &type_integer, 0},
 	{SHL,	&type_short},
 	{SHR,	&type_short},
 	{EQ,	&type_integer, &type_integer, 0},
@@ -414,6 +425,7 @@ static expr_type_t short_uinteger[] = {
 	{'|',	&type_uinteger, &type_uinteger, 0},
 	{'^',	&type_uinteger, &type_uinteger, 0},
 	{'%',	&type_uinteger, &type_uinteger, 0},
+	{MOD,	&type_uinteger, &type_uinteger, 0},
 	{SHL,	&type_short},
 	{SHR,	&type_short},
 	{EQ,	&type_integer, &type_uinteger, 0},
@@ -434,6 +446,7 @@ static expr_type_t short_short[] = {
 	{'|',	&type_short},
 	{'^',	&type_short},
 	{'%',	&type_short},
+	{MOD,	&type_short},
 	{SHL,	&type_short},
 	{SHR,	&type_short},
 	{EQ,	&type_integer},
@@ -452,6 +465,7 @@ static expr_type_t double_float[] = {
 	{'*',	&type_double, 0, &type_double},
 	{'/',	&type_double, 0, &type_double},
 	{'%',	&type_double, 0, &type_double},
+	{MOD,	&type_double, 0, &type_double},
 	{EQ,	0, 0, 0, double_compare},
 	{NE,	0, 0, 0, double_compare},
 	{LE,	0, 0, 0, double_compare},
@@ -477,6 +491,7 @@ static expr_type_t double_integer[] = {
 	{'*',	&type_double, 0, &type_double},
 	{'/',	&type_double, 0, &type_double},
 	{'%',	&type_double, 0, &type_double},
+	{MOD,	&type_double, 0, &type_double},
 	{EQ,	0, 0, 0, double_compare},
 	{NE,	0, 0, 0, double_compare},
 	{LE,	0, 0, 0, double_compare},
@@ -494,6 +509,7 @@ static expr_type_t double_double[] = {
 	{'*',	&type_double},
 	{'/',	&type_double},
 	{'%',	&type_double},
+	{MOD,	&type_double},
 	{EQ,	&type_integer},
 	{NE,	&type_integer},
 	{LE,	&type_integer},
diff --git a/tools/qfcc/source/qc-lex.l b/tools/qfcc/source/qc-lex.l
index 5b97a0938..58b661220 100644
--- a/tools/qfcc/source/qc-lex.l
+++ b/tools/qfcc/source/qc-lex.l
@@ -216,6 +216,11 @@ STRING		\"(\\.|[^"\\])*\"
 						return ASX;
 					}
 
+"%%="				{
+						qc_yylval.op = MOD;
+						return ASX;
+					}
+
 "<<="				{
 						qc_yylval.op = SHL;
 						return ASX;
@@ -231,6 +236,11 @@ STRING		\"(\\.|[^"\\])*\"
 						return yytext[0];
 					}
 
+"%%"				{
+						qc_yylval.pointer = 0;	// ensure pointer vals are null
+						return MOD;
+					}
+
 {ELLIPSIS}			return ELLIPSIS;
 
 "<<"				return SHL;
diff --git a/tools/qfcc/source/qc-parse.y b/tools/qfcc/source/qc-parse.y
index eba38584d..c34efd0a0 100644
--- a/tools/qfcc/source/qc-parse.y
+++ b/tools/qfcc/source/qc-parse.y
@@ -135,7 +135,7 @@ int yylex (void);
 
 %left			SHL SHR
 %left			'+' '-'
-%left			'*' '/' '%'
+%left			'*' '/' '%' MOD
 %right	<op>	SIZEOF UNARY INCOP
 %left			HYPERUNARY
 %left			'.' '(' '['
@@ -1335,6 +1335,7 @@ expr
 	| expr '|' expr				{ $$ = binary_expr ('|', $1, $3); }
 	| expr '^' expr				{ $$ = binary_expr ('^', $1, $3); }
 	| expr '%' expr				{ $$ = binary_expr ('%', $1, $3); }
+	| expr MOD expr				{ $$ = binary_expr (MOD, $1, $3); }
 	;
 
 texpr
diff --git a/tools/qfcc/test/modulo.r b/tools/qfcc/test/modulo.r
index 81366c134..9d529a0b8 100644
--- a/tools/qfcc/test/modulo.r
+++ b/tools/qfcc/test/modulo.r
@@ -6,6 +6,21 @@ float snafu (float a, float b)
 	return c;
 }
 
+@overload int modulo (int a, int b)
+{
+	return a %% b;
+}
+
+@overload float modulo (float a, float b)
+{
+	return a %% b;
+}
+
+@overload double modulo (double a, double b)
+{
+	return a %% b;
+}
+
 #pragma traditional
 float foo (float a, float b)
 {

From 32c21ec559f6d335ca5da2b9bf4013d42bd2e96c Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 16 Feb 2020 12:08:08 +0900
Subject: [PATCH 0399/1519] Make gcc accept the bitwise-boolean magic

Forgot to compile check...
---
 libs/gamecode/pr_exec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/gamecode/pr_exec.c b/libs/gamecode/pr_exec.c
index c6f376c62..3d5e938ec 100644
--- a/libs/gamecode/pr_exec.c
+++ b/libs/gamecode/pr_exec.c
@@ -1445,7 +1445,7 @@ op_call:
 					// as division: -5 % 3 = -2, so need to add b (3 here)
 					// if c's sign is incorrect, but only if c is non-zero
 					int         mask = (a ^ b) >> 31;
-					mask &= ~!!c + 1;
+					mask &= ~(!!c + 0) + 1;	// +0 to convert bool to int (gcc)
 					OPC.integer_var = c + (mask & b);
 				}
 				break;

From 1a9510834a33ff6baf422dfd8b9505420bc693e7 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 16 Feb 2020 12:10:09 +0900
Subject: [PATCH 0400/1519] Add a missed opcode conversion for %%

---
 tools/qfcc/source/statements.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/qfcc/source/statements.c b/tools/qfcc/source/statements.c
index 5dc5d878c..239c11f49 100644
--- a/tools/qfcc/source/statements.c
+++ b/tools/qfcc/source/statements.c
@@ -439,6 +439,7 @@ convert_op (int op)
 		case '*':	return "*";
 		case '/':	return "/";
 		case '%':	return "%";
+		case MOD:	return "%%";
 		case '&':	return "&";
 		case '|':	return "|";
 		case '^':	return "^";

From 1bc08c59f679e1e6abed4a6043358663075d5b44 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 16 Feb 2020 17:02:38 +0900
Subject: [PATCH 0401/1519] Add tests for %%

double fails due to qfcc aligning double param locals, but the engine
not doing so.
---
 tools/qfcc/test/modulo.r | 119 ++++++++++++++++++++++++++++++---------
 1 file changed, 92 insertions(+), 27 deletions(-)

diff --git a/tools/qfcc/test/modulo.r b/tools/qfcc/test/modulo.r
index 9d529a0b8..2d31a69a2 100644
--- a/tools/qfcc/test/modulo.r
+++ b/tools/qfcc/test/modulo.r
@@ -6,17 +6,17 @@ float snafu (float a, float b)
 	return c;
 }
 
-@overload int modulo (int a, int b)
+int imodulo (int a, int b)
 {
 	return a %% b;
 }
 
-@overload float modulo (float a, float b)
+float fmodulo (float a, float b)
 {
 	return a %% b;
 }
 
-@overload double modulo (double a, double b)
+double dmodulo (double a, double b)
 {
 	return a %% b;
 }
@@ -46,8 +46,27 @@ float baz (float a, float b)
 }
 #pragma advanced
 
-float test (string name, float (func)(float a, float b),
-			float a, float b, float c)
+@overload int
+test (string name, string op, int (func)(int a, int b), int a, int b, int c)
+{
+	int ret;
+
+	ret = func (a, b);
+	if (ret != c) {
+		if (func == baz)
+			printf ("%s: (%d + %d) %% (%d - %d): %d != %d\n",
+					name, a, b, a, b, ret, c);
+		else
+			printf ("%s: %d %s %d: %d != %d\n",
+					name, a, op, b, ret, c);
+		return 1;
+	}
+	return 0;
+}
+
+@overload int
+test (string name, string op, float (func)(float a, float b),
+	  float a, float b, float c)
 {
 	float ret;
 
@@ -57,8 +76,27 @@ float test (string name, float (func)(float a, float b),
 			printf ("%s: (%g + %g) %% (%g - %g): %g != %g\n",
 					name, a, b, a, b, ret, c);
 		else
-			printf ("%s: %g %% %g: %g != %g\n",
-					name, a, b, ret, c);
+			printf ("%s: %g %s %g: %g != %g\n",
+					name, a, op, b, ret, c);
+		return 1;
+	}
+	return 0;
+}
+
+@overload int
+test (string name, string op, double (func)(double a, double b),
+	  double a, double b, double c)
+{
+	double ret;
+
+	ret = func (a, b);
+	if (ret != c) {
+		if (func == baz)
+			printf ("%s: (%g + %g) %% (%g - %g): %g != %g\n",
+					name, a, b, a, b, ret, c);
+		else
+			printf ("%s: %g %s %g: %g != %g\n",
+					name, a, op, b, ret, c);
 		return 1;
 	}
 	return 0;
@@ -67,29 +105,56 @@ float test (string name, float (func)(float a, float b),
 float main (void)
 {
 	float res = 0;
-	res |= test ("foo", foo, 5, 3, 2);
-	res |= test ("bar", bar, 5, 3, 2);
-	res |= test ("baz", baz, 5, 3, 0);
-	res |= test ("snafu", snafu, 5, 3, 2);
+	res |= test ("foo", "%", foo, 5, 3, 2);
+	res |= test ("bar", "%", bar, 5, 3, 2);
+	res |= test ("baz", "%", baz, 5, 3, 0);
+	res |= test ("snafu", "%", snafu, 5, 3, 2);
 
-	res |= test ("foo", foo, -5, 3, -2);
-	res |= test ("bar", bar, -5, 3, -2);
-	res |= test ("baz", baz, -5, 3, -2);
-	res |= test ("snafu", snafu, -5, 3, -2);
+	res |= test ("foo", "%", foo, -5, 3, -2);
+	res |= test ("bar", "%", bar, -5, 3, -2);
+	res |= test ("baz", "%", baz, -5, 3, -2);
+	res |= test ("snafu", "%", snafu, -5, 3, -2);
 
-	res |= test ("foo", foo, 5, -3, 2);
-	res |= test ("bar", bar, 5, -3, 2);
-	res |= test ("baz", baz, 5, -3, 2);
-	res |= test ("snafu", snafu, 5, -3, 2);
+	res |= test ("foo", "%", foo, 5, -3, 2);
+	res |= test ("bar", "%", bar, 5, -3, 2);
+	res |= test ("baz", "%", baz, 5, -3, 2);
+	res |= test ("snafu", "%", snafu, 5, -3, 2);
 
-	res |= test ("foo", foo, -5, -3, -2);
-	res |= test ("bar", bar, -5, -3, -2);
-	res |= test ("baz", baz, -5, -3, 0);
-	res |= test ("snafu", snafu, -5, -3, -2);
+	res |= test ("foo", "%", foo, -5, -3, -2);
+	res |= test ("bar", "%", bar, -5, -3, -2);
+	res |= test ("baz", "%", baz, -5, -3, 0);
+	res |= test ("snafu", "%", snafu, -5, -3, -2);
 
-	res |= test ("foo", foo, 5, 3.5, 1.5);
-	res |= test ("foo", foo, -5, 3.5, -1.5);
-	res |= test ("snafu", snafu, 5, 3.5, 1.5);
-	res |= test ("snafu", snafu, -5, 3.5, -1.5);
+	res |= test ("foo", "%", foo, 5, 3.5, 1.5);
+	res |= test ("foo", "%", foo, -5, 3.5, -1.5);
+	res |= test ("snafu", "%", snafu, 5, 3.5, 1.5);
+	res |= test ("snafu", "%", snafu, -5, 3.5, -1.5);
+
+	res |= test ("int modulo", "%%", imodulo, 5, 3, 2);
+	res |= test ("int modulo", "%%", imodulo, -5, 3, 1);
+	res |= test ("int modulo", "%%", imodulo, 5, -3, -1);
+	res |= test ("int modulo", "%%", imodulo, -5, -3, -2);
+	res |= test ("int modulo", "%%", imodulo, 6, 3, 0);
+	res |= test ("int modulo", "%%", imodulo, -6, 3, 0);
+	res |= test ("int modulo", "%%", imodulo, 6, -3, 0);
+	res |= test ("int modulo", "%%", imodulo, -6, -3, 0);
+
+	res |= test ("float modulo", "%%", fmodulo, 5, 3, 2);
+	res |= test ("float modulo", "%%", fmodulo, -5, 3, 1);
+	res |= test ("float modulo", "%%", fmodulo, 5, -3, -1);
+	res |= test ("float modulo", "%%", fmodulo, -5, -3, -2);
+	res |= test ("float modulo", "%%", fmodulo, 6, 3, 0);
+	res |= test ("float modulo", "%%", fmodulo, -6, 3, 0);
+	res |= test ("float modulo", "%%", fmodulo, 6, -3, 0);
+	res |= test ("float modulo", "%%", fmodulo, -6, -3, 0);
+
+	res |= test ("double modulo", "%%", dmodulo, 5, 3, 2);
+	res |= test ("double modulo", "%%", dmodulo, -5, 3, 1);
+	res |= test ("double modulo", "%%", dmodulo, 5, -3, -1);
+	res |= test ("double modulo", "%%", dmodulo, -5, -3, -2);
+	res |= test ("double modulo", "%%", dmodulo, 6, 3, 0);
+	res |= test ("double modulo", "%%", dmodulo, -6, 3, 0);
+	res |= test ("double modulo", "%%", dmodulo, 6, -3, 0);
+	res |= test ("double modulo", "%%", dmodulo, -6, -3, 0);
 	return res;
 }

From 7a399c956be525b386c232047a38dea441b6a688 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 16 Feb 2020 17:10:43 +0900
Subject: [PATCH 0402/1519] Encode function parameter alignment

The encoding is 3:5 giving 3 bits for alignment (log2) and 5 bits for
size, with alignment in the 3 most significant bits. This keeps the
format backwards compatible as until doubles were added, all types were
aligned to 1 word which gets encoded as 0, and the size is unaffected.
---
 include/QF/pr_comp.h             |  7 +++-
 tools/qfcc/include/obj_file.h    |  2 +
 tools/qfcc/source/Makefile.am    |  2 +-
 tools/qfcc/source/dump_globals.c |  3 +-
 tools/qfcc/source/obj_file.c     | 63 ++++++++++++++++++++++++++++++--
 tools/qfcc/source/qfcc.c         |  3 ++
 tools/qfcc/source/stub.c         | 18 ++++++++-
 7 files changed, 91 insertions(+), 7 deletions(-)

diff --git a/include/QF/pr_comp.h b/include/QF/pr_comp.h
index 7d7589c4d..185a802ad 100644
--- a/include/QF/pr_comp.h
+++ b/include/QF/pr_comp.h
@@ -423,6 +423,11 @@ typedef struct ddef_s {
 	pr_int_t    s_name;
 } ddef_t;
 
+typedef struct dparmsize_s {
+	uint8_t     size:5;
+	uint8_t     alignment:3;
+} dparmsize_t;
+
 #define	DEF_SAVEGLOBAL	(1<<15)
 
 #define	MAX_PARMS	8
@@ -438,7 +443,7 @@ typedef struct dfunction_s {
 	pr_int_t    s_file;				// source file defined in
 
 	pr_int_t    numparms;
-	uint8_t     parm_size[MAX_PARMS];
+	dparmsize_t parm_size[MAX_PARMS];
 } dfunction_t;
 
 typedef union pr_type_u {
diff --git a/tools/qfcc/include/obj_file.h b/tools/qfcc/include/obj_file.h
index c32c67eb2..ae1986245 100644
--- a/tools/qfcc/include/obj_file.h
+++ b/tools/qfcc/include/obj_file.h
@@ -497,6 +497,8 @@ qfo_t *qfo_new (void);
 */
 void qfo_delete (qfo_t *qfo);
 
+__attribute__((const)) int qfo_log2 (unsigned x);
+
 ///@}
 
 #endif//__obj_file_h
diff --git a/tools/qfcc/source/Makefile.am b/tools/qfcc/source/Makefile.am
index e63edc20d..7feed1dca 100644
--- a/tools/qfcc/source/Makefile.am
+++ b/tools/qfcc/source/Makefile.am
@@ -53,7 +53,7 @@ qfcc_DEPENDENCIES=	$(QFCC_DEPS)
 
 qfprogs_SOURCES= \
 	disassemble.c dump_globals.c dump_lines.c dump_modules.c dump_strings.c \
-	obj_file.c qfprogs.c strpool.c stub.c
+	obj_file.c qfprogs.c strpool.c stub.c type.c
 qfprogs_LDADD=	$(QFCC_LIBS)
 qfprogs_DEPENDENCIES= $(QFCC_DEPS)
 
diff --git a/tools/qfcc/source/dump_globals.c b/tools/qfcc/source/dump_globals.c
index 6bebf5bb5..9e0b5bd5f 100644
--- a/tools/qfcc/source/dump_globals.c
+++ b/tools/qfcc/source/dump_globals.c
@@ -217,7 +217,8 @@ dump_functions (progs_t *pr)
 		else
 			count = func->numparms;
 		for (j = 0; j < count; j++)
-			printf (" %d", func->parm_size[j]);
+			printf (" %d:%d", func->parm_size[j].alignment,
+					func->parm_size[j].size);
 		printf (") %d @ %x", func->locals, func->parm_start);
 		puts ("");
 		if (pr->debug) {
diff --git a/tools/qfcc/source/obj_file.c b/tools/qfcc/source/obj_file.c
index c809a4a8b..44148eec8 100644
--- a/tools/qfcc/source/obj_file.c
+++ b/tools/qfcc/source/obj_file.c
@@ -665,7 +665,7 @@ get_def_type (qfo_t *qfo, pointer_t type)
 	return ev_invalid;
 }
 
-static __attribute__((pure)) etype_t
+static __attribute__((pure)) int
 get_type_size (qfo_t *qfo, pointer_t type)
 {
 	qfot_type_t *type_def;
@@ -701,6 +701,62 @@ get_type_size (qfo_t *qfo, pointer_t type)
 	return 0;
 }
 
+int
+qfo_log2 (unsigned x)
+{
+	int         log2 = 0;
+
+	while (x > 1) {
+		x >>= 1;
+		log2++;
+	}
+	return log2;
+}
+
+static __attribute__((pure)) int
+get_type_alignment_log (qfo_t *qfo, pointer_t type)
+{
+	qfot_type_t *type_def;
+	int          i, alignment;
+	if (type >= qfo->spaces[qfo_type_space].data_size)
+		return 0;
+	type_def = QFO_POINTER (qfo, qfo_type_space, qfot_type_t, type);
+	switch ((ty_meta_e)type_def->meta) {
+		case ty_none:
+			// field, pointer and function types store their basic type in
+			// the same location.
+			return qfo_log2 (ev_types[type_def->t.type]->alignment);
+		case ty_struct:
+		case ty_union:
+			for (i = alignment = 0; i < type_def->t.strct.num_fields; i++) {
+				qfot_var_t *field = type_def->t.strct.fields + i;
+				int         a;
+				a = get_type_alignment_log (qfo, field->type);
+				if (a > alignment) {
+					alignment = a;
+				}
+			}
+			return alignment;
+		case ty_enum:
+			return qfo_log2 (ev_types[ev_integer]->alignment);
+		case ty_array:
+			return get_type_alignment_log (qfo, type_def->t.array.type);
+		case ty_class:
+			return 0;	// FIXME
+	}
+	return 0;
+}
+
+static __attribute__((pure)) dparmsize_t
+get_parmsize (qfo_t *qfo, pointer_t type)
+{
+	dparmsize_t parmsize = {
+		get_type_size (qfo, type),
+		get_type_alignment_log (qfo, type),
+	};
+	return parmsize;
+}
+
 static void
 function_params (qfo_t *qfo, qfo_func_t *func, dfunction_t *df)
 {
@@ -716,8 +772,9 @@ function_params (qfo_t *qfo, qfo_func_t *func, dfunction_t *df)
 	df->numparms = num_params = type->t.func.num_params;
 	if (num_params < 0)
 		num_params = ~num_params;
-	for (i = 0; i < num_params; i++)
-		df->parm_size[i] = get_type_size (qfo, type->t.func.param_types[i]);
+	for (i = 0; i < num_params; i++) {
+		df->parm_size[i] = get_parmsize (qfo, type->t.func.param_types[i]);
+	}
 }
 
 static void
diff --git a/tools/qfcc/source/qfcc.c b/tools/qfcc/source/qfcc.c
index 0da2caf88..780db073a 100644
--- a/tools/qfcc/source/qfcc.c
+++ b/tools/qfcc/source/qfcc.c
@@ -418,8 +418,11 @@ finish_link (void)
 	flags = (QFOD_GLOBAL | QFOD_CONSTANT | QFOD_INITIALIZED | QFOD_NOSAVE);
 	if (options.code.progsversion != PROG_ID_VERSION) {
 		pr_int_t    param_size = type_size (&type_param);
+		pr_int_t    param_alignment = qfo_log2 (type_param.alignment);
 		linker_add_def (".param_size", &type_integer, flags,
 						&param_size);
+		linker_add_def (".param_alignment", &type_integer, flags,
+						&param_alignment);
 	}
 
 	if (options.code.debug) {
diff --git a/tools/qfcc/source/stub.c b/tools/qfcc/source/stub.c
index c10aff34a..4ff08975c 100644
--- a/tools/qfcc/source/stub.c
+++ b/tools/qfcc/source/stub.c
@@ -2,6 +2,8 @@
 # include "config.h"
 #endif
 
+#include <stdlib.h>
+
 #include "class.h"
 #include "codespace.h"
 #include "diagnostic.h"
@@ -12,9 +14,12 @@
 #include "expr.h"
 #include "function.h"
 #include "obj_file.h"
+#include "obj_type.h"
 #include "options.h"
 #include "qfcc.h"
 #include "strpool.h"
+#include "struct.h"
+#include "symtab.h"
 #include "type.h"
 #include "value.h"
 
@@ -23,11 +28,22 @@ options_t options;
 int num_linenos;
 pr_lineno_t *linenos;
 pr_info_t pr;
+type_t type_Class;
+type_t type_SEL;
+type_t type_id;
 __attribute__((const)) string_t ReuseString (const char *str) {return 0;}
-void encode_type (struct dstring_s *str, const type_t *type) {}
 __attribute__((const)) codespace_t *codespace_new (void) {return 0;}
 void codespace_addcode (codespace_t *codespace, struct dstatement_s *code, int size) {}
 __attribute__((const)) int function_parms (function_t *f, byte *parm_size) {return 0;}
 void def_to_ddef (def_t *def, ddef_t *ddef, int aux) {}
+__attribute__((noreturn)) void _internal_error (expr_t *e, const char *file, int line, const char *fmt, ...) {abort();}
 __attribute__((const)) expr_t *_warning (expr_t *e, const char *file, int line, const char *fmt, ...) {return 0;}
 __attribute__((const)) expr_t *_error (expr_t *e, const char *file, int line, const char *fmt, ...) {return 0;}
+__attribute__((const)) symbol_t *make_structure (const char *name, int su, struct_def_t *defs, type_t *type) {return 0;}
+__attribute__((const)) symbol_t *symtab_addsymbol (symtab_t *symtab, symbol_t *symbol) {return 0;}
+__attribute__((const)) symbol_t *new_symbol_type (const char *name, type_t *type) {return 0;}
+__attribute__((const)) def_t *qfo_encode_type (type_t *type) {return 0;}
+__attribute__((const)) int obj_types_assignable (const type_t *dst, const type_t *src) {return 0;}
+void print_protocollist (struct dstring_s *dstr, protocollist_t *protocollist) {}
+int obj_is_id (const type_t *type){return type->type;}
+int compare_protocols (protocollist_t *protos1, protocollist_t *protos2){return protos1->count - protos2->count;}

From f5741a979e5d5db7dcef2816262519fc65eeb576 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 16 Feb 2020 17:13:45 +0900
Subject: [PATCH 0403/1519] Implement parameter alignment in the engine

The engine now requires non-v6 progs to store the log2 alignment for the
param struct in .param_alignment.

PR_EnterFunction is clearer and possibly more efficient.
---
 include/QF/progs.h         |   3 +-
 libs/gamecode/pr_exec.c    | 107 ++++++++++++++++++++-----------------
 libs/gamecode/pr_resolve.c |   4 ++
 3 files changed, 64 insertions(+), 50 deletions(-)

diff --git a/include/QF/progs.h b/include/QF/progs.h
index 945145bd3..e7953883e 100644
--- a/include/QF/progs.h
+++ b/include/QF/progs.h
@@ -1079,7 +1079,7 @@ typedef struct {
 	pr_int_t    locals;
 	pr_int_t    profile;
 	pr_int_t    numparms;
-	uint8_t     parm_size[MAX_PARMS];
+	dparmsize_t parm_size[MAX_PARMS];
 	dfunction_t *descriptor;
 	builtin_proc func;
 } bfunction_t;
@@ -1632,6 +1632,7 @@ struct progs_s {
 	pr_type_t  *pr_saved_params;
 	int         pr_saved_argc;
 	int         pr_param_size;		///< covers both params and return
+	int         pr_param_alignment;	///< covers both params and return
 	///@}
 
 	/// \name edicts
diff --git a/libs/gamecode/pr_exec.c b/libs/gamecode/pr_exec.c
index 3d5e938ec..500d5e922 100644
--- a/libs/gamecode/pr_exec.c
+++ b/libs/gamecode/pr_exec.c
@@ -142,6 +142,21 @@ PR_PopFrame (progs_t *pr)
 	pr->pr_xtstr      = frame->tstr;
 }
 
+static __attribute__((pure)) long
+align_offset (long offset, dparmsize_t parmsize)
+{
+	int         mask = (1 << parmsize.alignment) - 1;
+	return (offset + mask) & ~mask;
+}
+
+static void
+copy_param (pr_type_t *dst, pr_type_t *src, size_t size)
+{
+	while (size--) {
+		memcpy (dst++, src++, sizeof (pr_type_t));
+	}
+}
+
 /** Setup the stackframe prior to calling a progs function. Saves all local
 	data the called function will trample on and copies the parameters used
 	by the function into the function's local data space.
@@ -153,39 +168,44 @@ PR_PopFrame (progs_t *pr)
 static void
 PR_EnterFunction (progs_t *pr, bfunction_t *f)
 {
-	pr_int_t    i, j, c, o;
-	pr_int_t    k;
-	pr_int_t    count = 0;
-	int         size[2] = {0, 0};
+	pr_int_t    i;
+	pr_type_t  *dstParams[MAX_PARMS];
 	long        paramofs = 0;
-	long        offs;
 
 	PR_PushFrame (pr);
 
 	if (f->numparms > 0) {
-		for (i = 0; i < 2 && i < f->numparms; i++) {
-			paramofs += f->parm_size[i];
-			size[i] = f->parm_size[i];
+		paramofs = f->parm_start;
+		for (i = 0; i < f->numparms; i++) {
+			paramofs = align_offset (paramofs, f->parm_size[i]);
+			dstParams[i] = pr->pr_globals + paramofs;
+			paramofs += f->parm_size[i].size;
+			if (pr->pr_params[i] != pr->pr_real_params[i]) {
+				copy_param (pr->pr_real_params[i], pr->pr_params[i],
+							f->parm_size[i].size);
+			}
 		}
-		count = i;
 	} else if (f->numparms < 0) {
-		for (i = 0; i < 2 && i < -f->numparms - 1; i++) {
-			paramofs += f->parm_size[i];
-			size[i] = f->parm_size[i];
+		paramofs = f->parm_start + 2;	// argc and argv
+		for (i = 0; i < -f->numparms - 1; i++) {
+			paramofs = align_offset (paramofs, f->parm_size[i]);
+			dstParams[i] = pr->pr_globals + paramofs;
+			paramofs += f->parm_size[i].size;
+			if (pr->pr_params[i] != pr->pr_real_params[i]) {
+				copy_param (pr->pr_real_params[i], pr->pr_params[i],
+							f->parm_size[i].size);
+			}
 		}
-		for (; i < 2; i++) {
-			paramofs += pr->pr_param_size;
-			size[i] = pr->pr_param_size;
+		dparmsize_t parmsize = { pr->pr_param_size, pr->pr_param_alignment };
+		paramofs = align_offset (paramofs, parmsize );
+		if (i < MAX_PARMS) {
+			dstParams[i] = pr->pr_globals + paramofs;
 		}
-		count = i;
-	}
-
-	for (i = 0; i < count && i < pr->pr_argc; i++) {
-		offs = (pr->pr_params[i] - pr->pr_globals) - f->parm_start;
-		if (offs >= 0 && offs < paramofs) {
-			memcpy (pr->pr_real_params[i], pr->pr_params[i],
-					size[i] * sizeof (pr_type_t));
-			pr->pr_params[i] = pr->pr_real_params[i];
+		for (; i < MAX_PARMS; i++) {
+			if (pr->pr_params[i] != pr->pr_real_params[i]) {
+				copy_param (pr->pr_real_params[i], pr->pr_params[i],
+							f->parm_size[i].size);
+			}
 		}
 	}
 
@@ -194,43 +214,33 @@ PR_EnterFunction (progs_t *pr, bfunction_t *f)
 	pr->pr_xstatement = f->first_statement - 1;      		// offset the st++
 
 	// save off any locals that the new function steps on
-	c = f->locals;
-	if (pr->localstack_used + c > LOCALSTACK_SIZE)
+	if (pr->localstack_used + f->locals > LOCALSTACK_SIZE)
 		PR_RunError (pr, "PR_EnterFunction: locals stack overflow");
 
 	memcpy (&pr->localstack[pr->localstack_used],
 			&pr->pr_globals[f->parm_start],
-			sizeof (pr_type_t) * c);
-	pr->localstack_used += c;
+			sizeof (pr_type_t) * f->locals);
+	pr->localstack_used += f->locals;
 
 	if (pr_deadbeef_locals->int_val)
-		for (k = f->parm_start; k < f->parm_start + c; k++)
-			pr->pr_globals[k].integer_var = 0xdeadbeef;
+		for (i = f->parm_start; i < f->parm_start + f->locals; i++)
+			pr->pr_globals[i].integer_var = 0xdeadbeef;
 
 	// copy parameters
-	o = f->parm_start;
 	if (f->numparms >= 0) {
 		for (i = 0; i < f->numparms; i++) {
-			for (j = 0; j < f->parm_size[i]; j++) {
-				memcpy (&pr->pr_globals[o], &P_INT (pr, i) + j,
-						sizeof (pr_type_t));
-				o++;
-			}
+			copy_param (dstParams[i], pr->pr_params[i], f->parm_size[i].size);
 		}
 	} else {
-		pr_type_t  *argc = &pr->pr_globals[o++];
-		pr_type_t  *argv = &pr->pr_globals[o++];
+		pr_type_t  *argc = &pr->pr_globals[f->parm_start + 0];
+		pr_type_t  *argv = &pr->pr_globals[f->parm_start + 1];
 		for (i = 0; i < -f->numparms - 1; i++) {
-			for (j = 0; j < f->parm_size[i]; j++) {
-				memcpy (&pr->pr_globals[o], &P_INT (pr, i) + j,
-						sizeof (pr_type_t));
-				o++;
-			}
+			copy_param (dstParams[i], pr->pr_params[i], f->parm_size[i].size);
 		}
 		argc->integer_var = pr->pr_argc - i;
-		argv->integer_var = o;
+		argv->integer_var = dstParams[i] - pr->pr_globals;
 		if (i < MAX_PARMS) {
-			memcpy (&pr->pr_globals[o], &P_INT (pr, i),
+			memcpy (dstParams[i], &P_INT (pr, i),
 					(MAX_PARMS - i) * pr->pr_param_size * sizeof (pr_type_t));
 		}
 	}
@@ -239,19 +249,18 @@ PR_EnterFunction (progs_t *pr, bfunction_t *f)
 static void
 PR_LeaveFunction (progs_t *pr)
 {
-	int			c;
 	bfunction_t *f = pr->pr_xfunction;
 
 	PR_PopFrame (pr);
 
 	// restore locals from the stack
-	c = f->locals;
-	pr->localstack_used -= c;
+	pr->localstack_used -= f->locals;
 	if (pr->localstack_used < 0)
 		PR_RunError (pr, "PR_LeaveFunction: locals stack underflow");
 
 	memcpy (&pr->pr_globals[f->parm_start],
-			&pr->localstack[pr->localstack_used], sizeof (pr_type_t) * c);
+			&pr->localstack[pr->localstack_used],
+			sizeof (pr_type_t) * f->locals);
 }
 
 VISIBLE void
diff --git a/libs/gamecode/pr_resolve.c b/libs/gamecode/pr_resolve.c
index ba82b48e8..3238e774e 100644
--- a/libs/gamecode/pr_resolve.c
+++ b/libs/gamecode/pr_resolve.c
@@ -122,6 +122,7 @@ PR_ResolveGlobals (progs_t *pr)
 		pr->pr_params[6] = &pr->pr_globals[OFS_PARM6];
 		pr->pr_params[7] = &pr->pr_globals[OFS_PARM7];
 		pr->pr_param_size = OFS_PARM1 - OFS_PARM0;
+		pr->pr_param_alignment = 0;	// log2
 	} else {
 		if (!(def = PR_FindGlobal (pr, sym = ".return")))
 			goto error;
@@ -134,6 +135,9 @@ PR_ResolveGlobals (progs_t *pr)
 		if (!(def = PR_FindGlobal (pr, sym = ".param_size")))
 			goto error;
 		pr->pr_param_size = G_INT (pr, def->ofs);
+		if (!(def = PR_FindGlobal (pr, sym = ".param_alignment")))
+			goto error;
+		pr->pr_param_alignment = G_INT (pr, def->ofs);
 	}
 	if (pr->pr_saved_params)
 		free (pr->pr_saved_params);

From 12d2a0ff75b4d63aca183324579f301d9a059302 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 16 Feb 2020 17:58:36 +0900
Subject: [PATCH 0404/1519] Copy the correct number of words for rcall

---
 libs/gamecode/pr_exec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/gamecode/pr_exec.c b/libs/gamecode/pr_exec.c
index 500d5e922..5f9e09790 100644
--- a/libs/gamecode/pr_exec.c
+++ b/libs/gamecode/pr_exec.c
@@ -204,7 +204,7 @@ PR_EnterFunction (progs_t *pr, bfunction_t *f)
 		for (; i < MAX_PARMS; i++) {
 			if (pr->pr_params[i] != pr->pr_real_params[i]) {
 				copy_param (pr->pr_real_params[i], pr->pr_params[i],
-							f->parm_size[i].size);
+							parmsize.size);
 			}
 		}
 	}

From ed283a9e7f8f086f9731c31f81d7c5ec2105bc45 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 16 Feb 2020 18:00:29 +0900
Subject: [PATCH 0405/1519] Copy only the necessary number of vararg parameters

---
 libs/gamecode/pr_exec.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/libs/gamecode/pr_exec.c b/libs/gamecode/pr_exec.c
index 5f9e09790..f7becdfa5 100644
--- a/libs/gamecode/pr_exec.c
+++ b/libs/gamecode/pr_exec.c
@@ -170,7 +170,7 @@ PR_EnterFunction (progs_t *pr, bfunction_t *f)
 {
 	pr_int_t    i;
 	pr_type_t  *dstParams[MAX_PARMS];
-	long        paramofs = 0;
+	pointer_t   paramofs = 0;
 
 	PR_PushFrame (pr);
 
@@ -201,7 +201,7 @@ PR_EnterFunction (progs_t *pr, bfunction_t *f)
 		if (i < MAX_PARMS) {
 			dstParams[i] = pr->pr_globals + paramofs;
 		}
-		for (; i < MAX_PARMS; i++) {
+		for (; i < pr->pr_argc; i++) {
 			if (pr->pr_params[i] != pr->pr_real_params[i]) {
 				copy_param (pr->pr_real_params[i], pr->pr_params[i],
 							parmsize.size);
@@ -232,16 +232,18 @@ PR_EnterFunction (progs_t *pr, bfunction_t *f)
 			copy_param (dstParams[i], pr->pr_params[i], f->parm_size[i].size);
 		}
 	} else {
+		int         copy_args;
 		pr_type_t  *argc = &pr->pr_globals[f->parm_start + 0];
 		pr_type_t  *argv = &pr->pr_globals[f->parm_start + 1];
 		for (i = 0; i < -f->numparms - 1; i++) {
 			copy_param (dstParams[i], pr->pr_params[i], f->parm_size[i].size);
 		}
-		argc->integer_var = pr->pr_argc - i;
+		copy_args = pr->pr_argc - i;
+		argc->integer_var = copy_args;
 		argv->integer_var = dstParams[i] - pr->pr_globals;
 		if (i < MAX_PARMS) {
-			memcpy (dstParams[i], &P_INT (pr, i),
-					(MAX_PARMS - i) * pr->pr_param_size * sizeof (pr_type_t));
+			memcpy (dstParams[i], pr->pr_params[i],
+					(copy_args * pr->pr_param_size) * sizeof (pr_type_t));
 		}
 	}
 }

From b947cc1791a37e8f483d43d07950cd7c212ce5fd Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 16 Feb 2020 22:43:57 +0900
Subject: [PATCH 0406/1519] Rework command buffer and fence-set management

I found command buffer handling to be totally redundant and fence-set
management to be a bit awkward.
---
 include/QF/Vulkan/command.h          |  28 ++---
 libs/video/renderer/vulkan/command.c | 150 ++++++++++++++-------------
 2 files changed, 92 insertions(+), 86 deletions(-)

diff --git a/include/QF/Vulkan/command.h b/include/QF/Vulkan/command.h
index 7f28e7c88..14eb625ac 100644
--- a/include/QF/Vulkan/command.h
+++ b/include/QF/Vulkan/command.h
@@ -8,13 +8,14 @@ typedef struct qfv_cmdpool_s {
 
 typedef struct qfv_cmdbuffer_s {
 	struct qfv_device_s *device;
-	VkCommandPool cmdpool;
-	VkCommandBuffer buffer;
+	VkCommandBuffer *buffer;
 } qfv_cmdbuffer_t;
 
 typedef struct qfv_cmdbufferset_s {
 	struct qfv_device_s *device;
-	VkCommandBuffer *buffers;
+	qfv_cmdbuffer_t **buffers;
+	VkCommandBuffer *vkBuffers;
+	VkCommandPool cmdpool;
 	int         numBuffers;
 } qfv_cmdbufferset_t;
 
@@ -37,7 +38,8 @@ typedef struct qfv_fence_s {
 
 typedef struct qfv_fenceset_s {
 	struct qfv_device_s *device;
-	VkFence    *fences;
+	qfv_fence_t **fences;
+	VkFence    *vkFences;
 	int         numFences;
 } qfv_fenceset_t;
 
@@ -47,13 +49,9 @@ qfv_cmdpool_t *QFV_CreateCommandPool (struct qfv_device_s *device,
 									  int transient, int reset);
 int QFV_ResetCommandPool (qfv_cmdpool_t *pool, int release);
 void QFV_DestroyCommandPool (qfv_cmdpool_t *pool);
-qfv_cmdbuffer_t *QFV_AllocateCommandBuffers (qfv_cmdpool_t *pool,
-											 int secondary, int count);
-qfv_cmdbufferset_t *QFV_CreateCommandBufferSet (qfv_cmdbuffer_t **buffers,
-												int numBuffers);
-void QFV_FreeCommandBuffers (qfv_cmdbuffer_t *buffer, int count);
-// NOTE: does not destroy buffers
-void QFV_DestroyCommandBufferSet (qfv_cmdbufferset_t *buffers);
+qfv_cmdbufferset_t *QFV_AllocateCommandBuffers (qfv_cmdpool_t *pool,
+											    int secondary, int count);
+void QFV_FreeCommandBuffers (qfv_cmdbufferset_t *buffer);
 int QFV_BeginCommandBuffer (qfv_cmdbuffer_t *buffer, int oneTime,
 							int rpContinue, int simultaneous,
 							VkCommandBufferInheritanceInfo *inheritanceInfo);
@@ -70,9 +68,11 @@ qfv_fence_t *QFV_CreateFence (struct qfv_device_s *device, int signaled);
 qfv_fenceset_t *QFV_CreateFenceSet (qfv_fence_t **fences, int numFences);
 void QFV_DestroyFence (qfv_fence_t *fence);
 // NOTE: does not destroy fences
-void QFV_DestroyFenceSet (qfv_fenceset_t *fences);
-int QFV_WaitForFences (qfv_fenceset_t *fences, int all, uint64_t timeout);
-int QFV_ResetFences (qfv_fenceset_t *fences);
+void QFV_DestroyFenceSet (qfv_fenceset_t *fenceset);
+int QFV_WaitForFences (qfv_fenceset_t *fenceset, int all, uint64_t timeout);
+int QFV_WaitForFence (qfv_fence_t *fence, uint64_t timeout);
+int QFV_ResetFences (qfv_fenceset_t *fenceset);
+int QFV_ResetFence (qfv_fence_t *fence);
 int QFV_QueueSubmit (struct qfv_queue_s *queue,
 					 qfv_semaphoreset_t *waitSemaphores,
 					 qfv_cmdbufferset_t *buffers,
diff --git a/libs/video/renderer/vulkan/command.c b/libs/video/renderer/vulkan/command.c
index 09621ede5..9f581ded6 100644
--- a/libs/video/renderer/vulkan/command.c
+++ b/libs/video/renderer/vulkan/command.c
@@ -115,7 +115,7 @@ QFV_DestroyCommandPool (qfv_cmdpool_t *pool)
 	free (pool);
 }
 
-qfv_cmdbuffer_t *
+qfv_cmdbufferset_t *
 QFV_AllocateCommandBuffers (qfv_cmdpool_t *pool, int secondary, int count)
 {
 	qfv_device_t *device = pool->device;
@@ -129,54 +129,34 @@ QFV_AllocateCommandBuffers (qfv_cmdpool_t *pool, int secondary, int count)
 		VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, 0,
 		pool->cmdpool, level, count
 	};
-	qfv_cmdbuffer_t *cmdbuffers = malloc (count * sizeof (*cmdbuffers));
-	VkCommandBuffer *buffers = alloca (count * sizeof (*buffers));
-	dfunc->vkAllocateCommandBuffers (dev, &allocInfo, buffers);
+	qfv_cmdbufferset_t *cmdbufferset;
+	cmdbufferset = malloc (sizeof (qfv_cmdbufferset_t)
+						   + count * sizeof (qfv_buffer_t *)
+						   + count * sizeof (qfv_buffer_t)
+						   + count * sizeof (VkCommandBuffer));
+	cmdbufferset->buffers = (qfv_cmdbuffer_t **) (cmdbufferset + 1);
+	cmdbufferset->vkBuffers = (VkCommandBuffer *) (cmdbufferset->buffers
+												   + count);
+	cmdbufferset->cmdpool = pool->cmdpool;
+	cmdbufferset->numBuffers = count;
+	dfunc->vkAllocateCommandBuffers (dev, &allocInfo, cmdbufferset->vkBuffers);
 	for (int i = 0; i < count; i++) {
-		cmdbuffers[i].device = device;
-		cmdbuffers[i].cmdpool = pool->cmdpool;
-		cmdbuffers[i].buffer = buffers[i];
+		cmdbufferset->buffers[i]->device = device;
+		cmdbufferset->buffers[i]->buffer = &cmdbufferset->vkBuffers[i];
 	}
-	return cmdbuffers;
+	return cmdbufferset;
 }
 
-qfv_cmdbufferset_t *
-QFV_CreateCommandBufferSet (qfv_cmdbuffer_t **buffers, int numBuffers)
+void QFV_FreeCommandBuffers (qfv_cmdbufferset_t *bufferset)
 {
-	qfv_device_t *device = buffers[0]->device;
-	qfv_cmdbufferset_t *bufferset = malloc (sizeof (*bufferset)
-											+ sizeof (VkCommandBuffer)
-											  * numBuffers);
-
-	bufferset->device = device;
-	bufferset->buffers = (VkCommandBuffer *) (bufferset + 1);
-	bufferset->numBuffers = numBuffers;
-
-	for (int i = 0; i < numBuffers; i++) {
-		bufferset->buffers[i] = buffers[i]->buffer;
-	}
-	return bufferset;
-}
-
-void QFV_FreeCommandBuffers (qfv_cmdbuffer_t *buffer, int count)
-{
-	qfv_device_t *device = buffer->device;
+	qfv_device_t *device = bufferset->device;
 	VkDevice    dev = device->dev;
 	qfv_devfuncs_t *dfunc = device->funcs;
-	VkCommandBuffer *buffers = alloca (sizeof (*buffers) * count);
 
-	for (int i = 0; i < count; i++) {
-		buffers[i] = buffer[i].buffer;
-	}
-
-	dfunc->vkFreeCommandBuffers (dev, buffer->cmdpool, count, buffers);
-	free (buffer);
-}
-
-void
-QFV_DestroyCommandBufferSet (qfv_cmdbufferset_t *buffers)
-{
-	free (buffers);
+	dfunc->vkFreeCommandBuffers (dev, bufferset->cmdpool,
+								 bufferset->numBuffers,
+								 bufferset->vkBuffers);
+	free (bufferset);
 }
 
 int
@@ -186,7 +166,7 @@ QFV_BeginCommandBuffer (qfv_cmdbuffer_t *buffer, int oneTime, int rpContinue,
 {
 	qfv_device_t *device = buffer->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
-	VkCommandBuffer buff = buffer->buffer;
+	VkCommandBuffer buff = *buffer->buffer;
 	VkCommandBufferUsageFlags usage = 0;
 
 	if (oneTime) {
@@ -213,7 +193,7 @@ QFV_EndCommandBuffer (qfv_cmdbuffer_t *buffer)
 {
 	qfv_device_t *device = buffer->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
-	VkCommandBuffer buff = buffer->buffer;
+	VkCommandBuffer buff = *buffer->buffer;
 
 	return dfunc->vkEndCommandBuffer (buff) == VK_SUCCESS;
 }
@@ -223,7 +203,7 @@ QFV_ResetCommandBuffer (qfv_cmdbuffer_t *buffer, int release)
 {
 	qfv_device_t *device = buffer->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
-	VkCommandBuffer buff = buffer->buffer;
+	VkCommandBuffer buff = *buffer->buffer;
 	VkCommandBufferResetFlags release_flag = 0;
 
 	if (release) {
@@ -310,16 +290,20 @@ QFV_CreateFence (qfv_device_t *device, int signaled)
 qfv_fenceset_t *
 QFV_CreateFenceSet (qfv_fence_t **fences, int numFences)
 {
-	qfv_device_t *device = fences[0]->device;
 	qfv_fenceset_t *fenceset = malloc (sizeof (*fenceset)
+									   + sizeof (qfv_fence_t) * numFences
 									   + sizeof (VkFence) * numFences);
 
-	fenceset->device = device;
-	fenceset->fences = (VkFence *) (fenceset + 1);
+	fenceset->fences = (qfv_fence_t **) (fenceset + 1);
+	fenceset->vkFences = (VkFence *) (fenceset->fences + numFences);
 	fenceset->numFences = numFences;
 
-	for (int i = 0; i < numFences; i++) {
-		fenceset->fences[i] = fences[i]->fence;
+	if (fences) {
+		fenceset->device = fences[0]->device;
+		for (int i = 0; i < numFences; i++) {
+			fenceset->fences[i] = fences[i];
+			fenceset->vkFences[i] = fences[i]->fence;
+		}
 	}
 	return fenceset;
 }
@@ -336,32 +320,53 @@ QFV_DestroyFence (qfv_fence_t *fence)
 }
 
 void
-QFV_DestroyFenceSet (qfv_fenceset_t *fences)
+QFV_DestroyFenceSet (qfv_fenceset_t *fenceset)
 {
-	free (fences);
+	free (fenceset);
 }
 
 int
-QFV_WaitForFences (qfv_fenceset_t *fences, int all, uint64_t timeout)
+QFV_WaitForFences (qfv_fenceset_t *fenceset, int all, uint64_t timeout)
 {
-	qfv_device_t *device = fences->device;
+	qfv_device_t *device = fenceset->device;
 	VkDevice    dev = device->dev;
 	qfv_devfuncs_t *dfunc = device->funcs;
 
-	VkResult res = dfunc->vkWaitForFences (dev, fences->numFences,
-										   fences->fences, all, timeout);
+	VkResult res = dfunc->vkWaitForFences (dev, fenceset->numFences,
+										   fenceset->vkFences, all, timeout);
 	return res == VK_SUCCESS;
 }
 
 int
-QFV_ResetFences (qfv_fenceset_t *fences)
+QFV_WaitForFence (qfv_fence_t *fence, uint64_t timeout)
 {
-	qfv_device_t *device = fences->device;
+	qfv_device_t *device = fence->device;
 	VkDevice    dev = device->dev;
 	qfv_devfuncs_t *dfunc = device->funcs;
 
-	return dfunc->vkResetFences (dev, fences->numFences,
-								 fences->fences) == VK_SUCCESS;
+	VkResult res = dfunc->vkWaitForFences (dev, 1, &fence->fence, 1, timeout);
+	return res == VK_SUCCESS;
+}
+
+int
+QFV_ResetFences (qfv_fenceset_t *fenceset)
+{
+	qfv_device_t *device = fenceset->device;
+	VkDevice    dev = device->dev;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	return dfunc->vkResetFences (dev, fenceset->numFences,
+								 fenceset->vkFences) == VK_SUCCESS;
+}
+
+int
+QFV_ResetFence (qfv_fence_t *fence)
+{
+	qfv_device_t *device = fence->device;
+	VkDevice    dev = device->dev;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	return dfunc->vkResetFences (dev, 1, &fence->fence) == VK_SUCCESS;
 }
 
 int
@@ -375,7 +380,7 @@ QFV_QueueSubmit (qfv_queue_t *queue, qfv_semaphoreset_t *waitSemaphores,
 		VK_STRUCTURE_TYPE_SUBMIT_INFO, 0,
 		waitSemaphores->numSemaphores,
 		waitSemaphores->semaphores, waitSemaphores->stages,
-		buffers->numBuffers, buffers->buffers,
+		buffers->numBuffers, buffers->vkBuffers,
 		signalSemaphores->numSemaphores,
 		signalSemaphores->semaphores
 	};
@@ -418,11 +423,11 @@ QFV_CmdPipelineBarrier (qfv_cmdbuffer_t *cmdBuffer,
 		numImgBarriers = imgBarrierSet->numBarriers;
 		imgBarriers = imgBarrierSet->barriers;
 	}
-	dfunc->vkCmdPipelineBarrier (cmdBuffer->buffer,
-								  srcStageMask, dstStageMask, dependencyFlags,
-								  numMemBarriers, memBarriers,
-								  numBuffBarriers, buffBarriers,
-								  numImgBarriers, imgBarriers);
+	dfunc->vkCmdPipelineBarrier (*cmdBuffer->buffer,
+								 srcStageMask, dstStageMask, dependencyFlags,
+								 numMemBarriers, memBarriers,
+								 numBuffBarriers, buffBarriers,
+								 numImgBarriers, imgBarriers);
 }
 
 void
@@ -433,7 +438,7 @@ QFV_CmdCopyBuffer (qfv_cmdbuffer_t *cmdBuffer,
 	qfv_device_t *device = cmdBuffer->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
 
-	dfunc->vkCmdCopyBuffer (cmdBuffer->buffer, src->buffer, dst->buffer,
+	dfunc->vkCmdCopyBuffer (*cmdBuffer->buffer, src->buffer, dst->buffer,
 							numRegions, regions);
 }
 
@@ -447,7 +452,7 @@ QFV_CmdCopyBufferToImage (qfv_cmdbuffer_t *cmdBuffer,
 	qfv_device_t *device = cmdBuffer->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
 
-	dfunc->vkCmdCopyBufferToImage (cmdBuffer->buffer, src->buffer, dst->image,
+	dfunc->vkCmdCopyBufferToImage (*cmdBuffer->buffer, src->buffer, dst->image,
 								   layout, numRegions, regions);
 }
 
@@ -461,7 +466,7 @@ QFV_CmdCopyImageToBuffer (qfv_cmdbuffer_t *cmdBuffer,
 	qfv_device_t *device = cmdBuffer->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
 
-	dfunc->vkCmdCopyImageToBuffer (cmdBuffer->buffer, src->image, layout,
+	dfunc->vkCmdCopyImageToBuffer (*cmdBuffer->buffer, src->image, layout,
 								   dst->buffer, numRegions, regions);
 }
 
@@ -483,7 +488,7 @@ QFV_CmdBeginRenderPass (qfv_cmdbuffer_t *cmdBuffer,
 		numClearValues, clearValues,
 	};
 
-	dfunc->vkCmdBeginRenderPass (cmdBuffer->buffer, &beginInfo,
+	dfunc->vkCmdBeginRenderPass (*cmdBuffer->buffer, &beginInfo,
 								 subpassContents);
 }
 
@@ -494,7 +499,7 @@ QFV_CmdNextSubpass (qfv_cmdbuffer_t *cmdBuffer,
 	qfv_device_t *device = cmdBuffer->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
 
-	dfunc->vkCmdNextSubpass (cmdBuffer->buffer, subpassContents);
+	dfunc->vkCmdNextSubpass (*cmdBuffer->buffer, subpassContents);
 }
 
 void
@@ -503,7 +508,7 @@ QFV_CmdEndRenderPass (qfv_cmdbuffer_t *cmdBuffer)
 	qfv_device_t *device = cmdBuffer->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
 
-	dfunc->vkCmdEndRenderPass (cmdBuffer->buffer);
+	dfunc->vkCmdEndRenderPass (*cmdBuffer->buffer);
 }
 
 void
@@ -514,5 +519,6 @@ QFV_CmdBindPipeline (qfv_cmdbuffer_t *cmdBuffer,
 	qfv_device_t *device = cmdBuffer->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
 
-	dfunc->vkCmdBindPipeline (cmdBuffer->buffer, bindPoint, pipeline->pipeline);
+	dfunc->vkCmdBindPipeline (*cmdBuffer->buffer, bindPoint,
+							  pipeline->pipeline);
 }

From 559bd2e636778e0721212a730285972bb0a70e42 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 16 Feb 2020 22:45:27 +0900
Subject: [PATCH 0407/1519] Create command pool and frame timing fences

Nothing is actually done yet, so the reported fps is around 172k (yes,
k), but startup and shutdown seems to be clean (yay validation layers).
---
 include/vid_vulkan.h                    |  11 +++
 libs/video/renderer/vid_render_vulkan.c | 114 +++++++++++++++++-------
 2 files changed, 92 insertions(+), 33 deletions(-)

diff --git a/include/vid_vulkan.h b/include/vid_vulkan.h
index 9cfb3ad8a..cd1964ff7 100644
--- a/include/vid_vulkan.h
+++ b/include/vid_vulkan.h
@@ -6,6 +6,13 @@
 #endif
 #include <vulkan/vulkan.h>
 
+typedef struct vulkan_frameset_s {
+	int         curFrame;	// index into fences
+	int         curImage;	// index into cmdBuffers and swapchain images
+	struct qfv_fenceset_s *fences;
+	struct qfv_cmdbufferset_s *cmdBuffers;
+} vulkan_frameset_t;
+
 typedef struct vulkan_ctx_s {
 	void        (*load_vulkan) (struct vulkan_ctx_s *ctx);
 	void        (*unload_vulkan) (struct vulkan_ctx_s *ctx);
@@ -23,6 +30,10 @@ typedef struct vulkan_ctx_s {
 	struct qfv_device_s *device;
 	struct qfv_swapchain_s *swapchain;
 	VkSurfaceKHR surface;	//FIXME surface = window, so "contains" swapchain
+
+	struct qfv_cmdpool_s *cmdpool;
+	vulkan_frameset_t frameset;
+
 #define EXPORTED_VULKAN_FUNCTION(fname) PFN_##fname fname;
 #define GLOBAL_LEVEL_VULKAN_FUNCTION(fname) PFN_##fname fname;
 #include "QF/Vulkan/funclist.h"
diff --git a/libs/video/renderer/vid_render_vulkan.c b/libs/video/renderer/vid_render_vulkan.c
index 7fce05272..0699ced5c 100644
--- a/libs/video/renderer/vid_render_vulkan.c
+++ b/libs/video/renderer/vid_render_vulkan.c
@@ -28,8 +28,10 @@
 # include "config.h"
 #endif
 
-#define NH_DEFINE
-#include "vulkan/namehack.h"
+#include <stdlib.h>
+
+//#define NH_DEFINE
+//#include "vulkan/namehack.h"
 
 #include "QF/sys.h"
 
@@ -37,6 +39,7 @@
 #include "QF/plugin/vid_render.h"
 
 #include "QF/Vulkan/qf_vid.h"
+#include "QF/Vulkan/command.h"
 #include "QF/Vulkan/device.h"
 #include "QF/Vulkan/instance.h"
 #include "QF/Vulkan/swapchain.h"
@@ -53,8 +56,43 @@ static vulkan_ctx_t *vulkan_ctx;
 static void
 vulkan_R_Init (void)
 {
-	if (vulkan_ctx)
-		Sys_Quit ();
+	Vulkan_CreateSwapchain (vulkan_ctx);
+	Sys_Printf ("R_Init %p %d", vulkan_ctx->swapchain->swapchain,
+				vulkan_ctx->swapchain->numImages);
+	for (int32_t i = 0; i < vulkan_ctx->swapchain->numImages; i++) {
+		Sys_Printf (" %p", vulkan_ctx->swapchain->images[i]);
+	}
+	Sys_Printf ("\n");
+}
+
+static void
+vulkan_SCR_UpdateScreen (double time,  void (*f)(void), void (**g)(void))
+{
+	static int count = 0;
+	static double startTime;
+
+	if (++count >= 100) {
+		double currenTime = Sys_DoubleTime ();
+		double time = currenTime - startTime;
+		startTime = currenTime;
+		printf ("%d frames in %g s: %g fps     \r", count, time, count / time);
+		fflush (stdout);
+		count = 0;
+	}
+}
+
+static qpic_t *
+vulkan_Draw_CachePic (const char *path, qboolean alpha)
+{
+	return 0;
+}
+
+static qpic_t qpic = { 1, 1, {0} };
+
+static qpic_t *
+vulkan_Draw_MakePic (int width, int height, const byte *data)
+{
+	return &qpic;
 }
 
 static vid_model_funcs_t model_funcs = {
@@ -84,29 +122,29 @@ static vid_model_funcs_t model_funcs = {
 };
 
 vid_render_funcs_t vulkan_vid_render_funcs = {
-	vulkan_Draw_Init,
-	vulkan_Draw_Character,
-	vulkan_Draw_String,
-	vulkan_Draw_nString,
-	vulkan_Draw_AltString,
-	vulkan_Draw_ConsoleBackground,
-	vulkan_Draw_Crosshair,
-	vulkan_Draw_CrosshairAt,
-	vulkan_Draw_TileClear,
-	vulkan_Draw_Fill,
-	vulkan_Draw_TextBox,
-	vulkan_Draw_FadeScreen,
-	vulkan_Draw_BlendScreen,
+	0,//vulkan_Draw_Init,
+	0,//vulkan_Draw_Character,
+	0,//vulkan_Draw_String,
+	0,//vulkan_Draw_nString,
+	0,//vulkan_Draw_AltString,
+	0,//vulkan_Draw_ConsoleBackground,
+	0,//vulkan_Draw_Crosshair,
+	0,//vulkan_Draw_CrosshairAt,
+	0,//vulkan_Draw_TileClear,
+	0,//vulkan_Draw_Fill,
+	0,//vulkan_Draw_TextBox,
+	0,//vulkan_Draw_FadeScreen,
+	0,//vulkan_Draw_BlendScreen,
 	vulkan_Draw_CachePic,
-	vulkan_Draw_UncachePic,
+	0,//vulkan_Draw_UncachePic,
 	vulkan_Draw_MakePic,
-	vulkan_Draw_DestroyPic,
-	vulkan_Draw_PicFromWad,
-	vulkan_Draw_Pic,
-	vulkan_Draw_Picf,
-	vulkan_Draw_SubPic,
+	0,//vulkan_Draw_DestroyPic,
+	0,//vulkan_Draw_PicFromWad,
+	0,//vulkan_Draw_Pic,
+	0,//vulkan_Draw_Picf,
+	0,//vulkan_Draw_SubPic,
 
-	0,//vulkan_SCR_UpdateScreen,
+	vulkan_SCR_UpdateScreen,
 	SCR_DrawRam,
 	SCR_DrawTurtle,
 	SCR_DrawPause,
@@ -152,8 +190,13 @@ vulkan_vid_render_choose_visual (void)
 {
 	Vulkan_CreateDevice (vulkan_ctx);
 	vulkan_ctx->choose_visual (vulkan_ctx);
-	Sys_Printf ("vk choose visual %p %p\n", vulkan_ctx->device->dev,
-				vulkan_ctx->device->queue.queue);
+	vulkan_ctx->cmdpool = QFV_CreateCommandPool (vulkan_ctx->device,
+									 vulkan_ctx->device->queue.queueFamily,
+									 0, 0);
+	Sys_Printf ("vk choose visual %p %p %d %p\n", vulkan_ctx->device->dev,
+				vulkan_ctx->device->queue.queue,
+				vulkan_ctx->device->queue.queueFamily,
+				vulkan_ctx->cmdpool->cmdpool);
 }
 
 static void
@@ -161,14 +204,14 @@ vulkan_vid_render_create_context (void)
 {
 	vulkan_ctx->create_window (vulkan_ctx);
 	vulkan_ctx->surface = vulkan_ctx->create_surface (vulkan_ctx);
-	Sys_Printf ("vk create context %p\n", vulkan_ctx->surface);
-	Vulkan_CreateSwapchain (vulkan_ctx);
-	Sys_Printf ("%p %d", vulkan_ctx->swapchain->swapchain,
-				vulkan_ctx->swapchain->numImages);
-	for (int32_t i = 0; i < vulkan_ctx->swapchain->numImages; i++) {
-		Sys_Printf (" %p", vulkan_ctx->swapchain->images[i]);
+	vulkan_ctx->frameset.curFrame = 0;
+	vulkan_ctx->frameset.curImage = -1;	// not acquired yet
+	qfv_fence_t **fences = alloca (2 * sizeof (*fences));
+	for (int i = 0; i < 2; i++) {
+		fences[i]= QFV_CreateFence (vulkan_ctx->device, 1);
 	}
-	Sys_Printf ("\n");
+	vulkan_ctx->frameset.fences = QFV_CreateFenceSet (fences, 2);
+	Sys_Printf ("vk create context %p\n", vulkan_ctx->surface);
 }
 
 static void
@@ -190,6 +233,11 @@ vulkan_vid_render_init (void)
 static void
 vulkan_vid_render_shutdown (void)
 {
+	for (int i = 0; i < vulkan_ctx->frameset.fences->numFences; i++) {
+		QFV_DestroyFence (vulkan_ctx->frameset.fences->fences[i]);
+	}
+	QFV_DestroyFenceSet (vulkan_ctx->frameset.fences);
+	QFV_DestroyCommandPool (vulkan_ctx->cmdpool);
 	Vulkan_Shutdown_Common (vulkan_ctx);
 }
 

From 4b152a4492b500dc06a7c85c48b3cf4d1f61c464 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 17 Feb 2020 00:10:32 +0900
Subject: [PATCH 0408/1519] Rework semaphore sets

---
 include/QF/Vulkan/command.h          |  3 ++-
 libs/video/renderer/vulkan/command.c | 18 ++++++++++++------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/include/QF/Vulkan/command.h b/include/QF/Vulkan/command.h
index 14eb625ac..7ef36a7f4 100644
--- a/include/QF/Vulkan/command.h
+++ b/include/QF/Vulkan/command.h
@@ -26,7 +26,8 @@ typedef struct qfv_semaphore_s {
 
 typedef struct qfv_semaphoreset_s {
 	struct qfv_device_s *device;
-	VkSemaphore *semaphores;
+	qfv_semaphore_t **semaphores;
+	VkSemaphore *vkSemaphores;
 	VkPipelineStageFlags *stages;
 	int         numSemaphores;
 } qfv_semaphoreset_t;
diff --git a/libs/video/renderer/vulkan/command.c b/libs/video/renderer/vulkan/command.c
index 9f581ded6..f4cf4bc14 100644
--- a/libs/video/renderer/vulkan/command.c
+++ b/libs/video/renderer/vulkan/command.c
@@ -237,17 +237,23 @@ QFV_CreateSemaphoreSet (qfv_semaphore_t **semaphores, int numSemaphores)
 	qfv_device_t *device = semaphores[0]->device;
 	qfv_semaphoreset_t *semaphoreset;
 	semaphoreset = calloc (1, sizeof (*semaphoreset)
+						   + sizeof (qfv_semaphore_t *) * numSemaphores
 						   + sizeof (VkSemaphore) * numSemaphores
 						   + sizeof (VkPipelineStageFlags) * numSemaphores);
 
 	semaphoreset->device = device;
-	semaphoreset->semaphores = (VkSemaphore *) (semaphoreset + 1);
+	semaphoreset->vkSemaphores = (VkSemaphore *) (semaphoreset + 1);
 	semaphoreset->stages = (VkPipelineStageFlags *)
-							&semaphoreset->semaphores[numSemaphores];
+							&semaphoreset->vkSemaphores[numSemaphores];
+	semaphoreset->semaphores = (qfv_semaphore_t **) (semaphoreset->stages
+													 + numSemaphores);
 	semaphoreset->numSemaphores = numSemaphores;
 
-	for (int i = 0; i < numSemaphores; i++) {
-		semaphoreset->semaphores[i] = semaphores[i]->semaphore;
+	if (semaphores) {
+		for (int i = 0; i < numSemaphores; i++) {
+			semaphoreset->semaphores[i] = semaphores[i];
+			semaphoreset->vkSemaphores[i] = semaphores[i]->semaphore;
+		}
 	}
 	return semaphoreset;
 }
@@ -379,10 +385,10 @@ QFV_QueueSubmit (qfv_queue_t *queue, qfv_semaphoreset_t *waitSemaphores,
 	VkSubmitInfo submitInfo = {
 		VK_STRUCTURE_TYPE_SUBMIT_INFO, 0,
 		waitSemaphores->numSemaphores,
-		waitSemaphores->semaphores, waitSemaphores->stages,
+		waitSemaphores->vkSemaphores, waitSemaphores->stages,
 		buffers->numBuffers, buffers->vkBuffers,
 		signalSemaphores->numSemaphores,
-		signalSemaphores->semaphores
+		signalSemaphores->vkSemaphores
 	};
 	//FIXME multi-batch
 	return dfunc->vkQueueSubmit (queue->queue, 1, &submitInfo,

From ce72135e70776d9efe82838f87b5de97049991af Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 17 Feb 2020 00:10:59 +0900
Subject: [PATCH 0409/1519] Fix incorrect init of command buffer set

---
 libs/video/renderer/vulkan/command.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/libs/video/renderer/vulkan/command.c b/libs/video/renderer/vulkan/command.c
index f4cf4bc14..fa671fa5d 100644
--- a/libs/video/renderer/vulkan/command.c
+++ b/libs/video/renderer/vulkan/command.c
@@ -137,12 +137,15 @@ QFV_AllocateCommandBuffers (qfv_cmdpool_t *pool, int secondary, int count)
 	cmdbufferset->buffers = (qfv_cmdbuffer_t **) (cmdbufferset + 1);
 	cmdbufferset->vkBuffers = (VkCommandBuffer *) (cmdbufferset->buffers
 												   + count);
+	qfv_cmdbuffer_t *buffer = (qfv_cmdbuffer_t *) (cmdbufferset->vkBuffers
+												   + count);
 	cmdbufferset->cmdpool = pool->cmdpool;
 	cmdbufferset->numBuffers = count;
 	dfunc->vkAllocateCommandBuffers (dev, &allocInfo, cmdbufferset->vkBuffers);
 	for (int i = 0; i < count; i++) {
-		cmdbufferset->buffers[i]->device = device;
-		cmdbufferset->buffers[i]->buffer = &cmdbufferset->vkBuffers[i];
+		buffer->device = device;
+		buffer->buffer = &cmdbufferset->vkBuffers[i];
+		cmdbufferset->buffers[i] = buffer++;
 	}
 	return cmdbufferset;
 }

From 916e57de3741a7baf9706e74e608c968dbee1491 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 17 Feb 2020 00:50:39 +0900
Subject: [PATCH 0410/1519] Get the swapchain image switching sort of working

The render pass isn't set up yet, so the validation layer is having a
fit, but cycling through the swapchain images does seem to be working.
---
 include/vid_vulkan.h                    |  3 +-
 libs/video/renderer/vid_render_vulkan.c | 59 +++++++++++++++++++++++--
 2 files changed, 58 insertions(+), 4 deletions(-)

diff --git a/include/vid_vulkan.h b/include/vid_vulkan.h
index cd1964ff7..5b9a31daf 100644
--- a/include/vid_vulkan.h
+++ b/include/vid_vulkan.h
@@ -8,9 +8,10 @@
 
 typedef struct vulkan_frameset_s {
 	int         curFrame;	// index into fences
-	int         curImage;	// index into cmdBuffers and swapchain images
 	struct qfv_fenceset_s *fences;
 	struct qfv_cmdbufferset_s *cmdBuffers;
+	struct qfv_semaphoreset_s *imageSemaphores;
+	struct qfv_semaphoreset_s *renderDoneSemaphores;
 } vulkan_frameset_t;
 
 typedef struct vulkan_ctx_s {
diff --git a/libs/video/renderer/vid_render_vulkan.c b/libs/video/renderer/vid_render_vulkan.c
index 0699ced5c..de0917310 100644
--- a/libs/video/renderer/vid_render_vulkan.c
+++ b/libs/video/renderer/vid_render_vulkan.c
@@ -56,7 +56,15 @@ static vulkan_ctx_t *vulkan_ctx;
 static void
 vulkan_R_Init (void)
 {
+	qfv_cmdbufferset_t *cmdBuffers;
 	Vulkan_CreateSwapchain (vulkan_ctx);
+	cmdBuffers = QFV_AllocateCommandBuffers (vulkan_ctx->cmdpool, 0,
+											 vulkan_ctx->swapchain->numImages);
+	vulkan_ctx->frameset.cmdBuffers = cmdBuffers;
+	for (int i = 0; i < cmdBuffers->numBuffers; i++) {
+		QFV_BeginCommandBuffer (cmdBuffers->buffers[i], 0, 0, 0, 0);
+		QFV_EndCommandBuffer (cmdBuffers->buffers[i]);
+	}
 	Sys_Printf ("R_Init %p %d", vulkan_ctx->swapchain->swapchain,
 				vulkan_ctx->swapchain->numImages);
 	for (int32_t i = 0; i < vulkan_ctx->swapchain->numImages; i++) {
@@ -70,6 +78,40 @@ vulkan_SCR_UpdateScreen (double time,  void (*f)(void), void (**g)(void))
 {
 	static int count = 0;
 	static double startTime;
+	uint32_t imageIndex = 0;
+	qfv_devfuncs_t *dfunc = vulkan_ctx->device->funcs;
+	qfv_queue_t *queue = &vulkan_ctx->device->queue;
+	vulkan_frameset_t *frameset = &vulkan_ctx->frameset;
+
+	QFV_WaitForFence (frameset->fences->fences[frameset->curFrame],
+					  2000000000);
+	QFV_AcquireNextImage (vulkan_ctx->swapchain,
+				  frameset->imageSemaphores->semaphores[frameset->curFrame],
+				  0, &imageIndex);
+
+	VkPipelineStageFlags waitStage = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
+	VkSubmitInfo submitInfo = {
+		VK_STRUCTURE_TYPE_SUBMIT_INFO, 0,
+		1,
+		&frameset->imageSemaphores->vkSemaphores[frameset->curFrame],
+		&waitStage,
+		1, &frameset->cmdBuffers->vkBuffers[imageIndex],
+		1, &frameset->renderDoneSemaphores->vkSemaphores[frameset->curFrame],
+	};
+	QFV_ResetFence (frameset->fences->fences[frameset->curFrame]);
+	dfunc->vkQueueSubmit (queue->queue, 1, &submitInfo,
+						  frameset->fences->vkFences[frameset->curFrame]);
+
+	VkPresentInfoKHR presentInfo = {
+		VK_STRUCTURE_TYPE_PRESENT_INFO_KHR, 0,
+		1, &frameset->renderDoneSemaphores->vkSemaphores[frameset->curFrame],
+		1, &vulkan_ctx->swapchain->swapchain, &imageIndex,
+		0
+	};
+	dfunc->vkQueuePresentKHR (queue->queue, &presentInfo);
+
+	frameset->curFrame++;
+	frameset->curFrame %= frameset->fences->numFences;
 
 	if (++count >= 100) {
 		double currenTime = Sys_DoubleTime ();
@@ -205,12 +247,19 @@ vulkan_vid_render_create_context (void)
 	vulkan_ctx->create_window (vulkan_ctx);
 	vulkan_ctx->surface = vulkan_ctx->create_surface (vulkan_ctx);
 	vulkan_ctx->frameset.curFrame = 0;
-	vulkan_ctx->frameset.curImage = -1;	// not acquired yet
 	qfv_fence_t **fences = alloca (2 * sizeof (*fences));
+	qfv_semaphore_t **imageSems = alloca (2 * sizeof (*imageSems));
+	qfv_semaphore_t **renderDoneSems = alloca (2 * sizeof (*renderDoneSems));
 	for (int i = 0; i < 2; i++) {
 		fences[i]= QFV_CreateFence (vulkan_ctx->device, 1);
+		imageSems[i] = QFV_CreateSemaphore (vulkan_ctx->device);
+		renderDoneSems[i] = QFV_CreateSemaphore (vulkan_ctx->device);
 	}
 	vulkan_ctx->frameset.fences = QFV_CreateFenceSet (fences, 2);
+	vulkan_ctx->frameset.imageSemaphores
+		= QFV_CreateSemaphoreSet (imageSems, 2);
+	vulkan_ctx->frameset.renderDoneSemaphores
+		= QFV_CreateSemaphoreSet (renderDoneSems, 2);
 	Sys_Printf ("vk create context %p\n", vulkan_ctx->surface);
 }
 
@@ -233,8 +282,12 @@ vulkan_vid_render_init (void)
 static void
 vulkan_vid_render_shutdown (void)
 {
-	for (int i = 0; i < vulkan_ctx->frameset.fences->numFences; i++) {
-		QFV_DestroyFence (vulkan_ctx->frameset.fences->fences[i]);
+	QFV_DeviceWaitIdle (vulkan_ctx->device);
+	vulkan_frameset_t *frameset = &vulkan_ctx->frameset;
+	for (int i = 0; i < frameset->fences->numFences; i++) {
+		QFV_DestroyFence (frameset->fences->fences[i]);
+		QFV_DestroySemaphore (frameset->imageSemaphores->semaphores[i]);
+		QFV_DestroySemaphore (frameset->renderDoneSemaphores->semaphores[i]);
 	}
 	QFV_DestroyFenceSet (vulkan_ctx->frameset.fences);
 	QFV_DestroyCommandPool (vulkan_ctx->cmdpool);

From e37aba364a6bd71b5252480f6f7663c5457daea5 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 17 Feb 2020 12:58:23 +0900
Subject: [PATCH 0411/1519] Correct an apparent typo

Black makes much more sense than Slack, especially if the text is from a
quake mod (no idea where, though).
---
 libs/util/test/test-plist.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/util/test/test-plist.c b/libs/util/test/test-plist.c
index 20ab1e94e..0335493f2 100644
--- a/libs/util/test/test-plist.c
+++ b/libs/util/test/test-plist.c
@@ -11,7 +11,7 @@ static const char *test_strings[] = {
 	"of the Shadow cult.\n\n"
 	"For years the Shadow Gate existed in\n"
 	"obscurity but after the cult discovered\n"
-	"the \3023\354\341\343\353\240\307\341\364\345 in the caves below\n"
+	"the \302\354\341\343\353\240\307\341\364\345 in the caves below\n"
 	"the empire took notice.\n"
 	"A batallion of Imperial Knights were\n"
 	"sent to the gate to destroy the cult\n"

From 0cb04dc49028990091a083332a016394caa556b2 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 17 Feb 2020 16:17:21 +0900
Subject: [PATCH 0412/1519] Add a set of macros for dynamic arrays

Includes docs and test cases.
---
 include/QF/darray.h          | 301 +++++++++++++++++++++++++++++++++++
 libs/util/test/Makefile.am   |   8 +-
 libs/util/test/test-darray.c | 213 +++++++++++++++++++++++++
 3 files changed, 520 insertions(+), 2 deletions(-)
 create mode 100644 include/QF/darray.h
 create mode 100644 libs/util/test/test-darray.c

diff --git a/include/QF/darray.h b/include/QF/darray.h
new file mode 100644
index 000000000..88792715f
--- /dev/null
+++ b/include/QF/darray.h
@@ -0,0 +1,301 @@
+/*
+	darray.h
+
+	Dynamic arrays
+
+	Copyright (C) 2020 Bill Currie <bill@taniwha.org>
+
+	Author: Bill Currie <bill@taniwha.org>
+	Date: 2020/02/17
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+
+#ifndef __pr_type_h
+#define __pr_type_h
+
+/** \defgroup darray Dynamic Arrays
+	\ingroup utils
+
+	Dynamic array container object
+*/
+///@{
+
+/**	The structure defs for a dynamic array with elements of the given type.
+
+	This is just the defs of a struct delcaration: it is useless on its own.
+	The intended usage is something like:
+
+		typedef struct dynamic_array_s DARRAY_TYPE(int) dynamic_array_t;
+
+	This allows full flexibility in just how the actual type is used.
+
+	The \a size field is the number of elements currently in the array, and
+	the \a maxSize field is the number of elements the array can hold without
+	being resized.
+
+	The \a grow field specifies the number of elements by which \a maxSize is
+	to grow when the array needs to be resized. Setting this to 0 prevents
+	resizing and any attempt to do so is a fatal error.
+
+	\param ele_type	The type to use for the element array, which is accessed
+					by the \a a field.
+	\hideinitializer
+*/
+#define DARRAY_TYPE(ele_type)	\
+	{							\
+		size_t      size;		\
+		size_t      maxSize;	\
+		size_t      grow;		\
+		ele_type   *a;			\
+	}
+
+/**	Clear the array.
+
+	If the array can grow, its backing will be freed and maxSize and a reset,
+	otherwise maxSize and a are left untouched.
+
+	\param array	*Address* of the array to be modified (ie, pointer to the
+					array struct instance, not the instance itself: use & for
+					static instances of the array struct).
+	\hideinitializer
+*/
+#define DARRAY_CLEAR(array)												\
+	do {																\
+		__auto_type ar = (array);										\
+		free (ar->a);													\
+		ar->size = 0;													\
+		if (ar->grow) {													\
+			ar->maxSize = 0;											\
+			ar->a = 0;													\
+		}																\
+	} while (0)
+
+/**	Set the size of the array.
+
+	If the new size is greater than maxSize, and the array can grow (grow is
+	non-zero), then maxSize will be increased to the smallest multiple of grow
+	greater than or equal to size (ie, maxSize >= size, maxSize % grow == 0).
+
+	Attempting to increase maxSize on an array that cannot grow is an error:
+	it is assumed that the array struct does not own the backing memory.
+
+	\param array	*Address* of the array to be modified (ie, pointer to the
+					array struct instance, not the instance itself: use & for
+					static instances of the array struct).
+	\param newSize	The new size of the array: newly opened slots are
+					uninitialized, but old slots retain their values.
+	\hideinitializer
+*/
+#define DARRAY_RESIZE(array, newSize)									\
+	do {																\
+		__auto_type ar = (array);										\
+		size_t ns = (newSize);											\
+		if (__builtin_expect (ns > ar->maxSize, 0)) {					\
+			if (__builtin_expect (!ar->grow, 0)) {						\
+				Sys_Error ("Attempt to grow fixed-size darray: %s:%d",	\
+						   __FILE__, __LINE__);							\
+			}															\
+			ar->maxSize = ar->grow * ((ns + ar->grow - 1) / ar->grow);	\
+			ar->a = realloc (ar->a, ar->maxSize * sizeof (*ar->a));		\
+			if (__builtin_expect (!ar->a, 0)) {							\
+				Sys_Error ("failed to realloc darray: %s:%d",			\
+						   __FILE__, __LINE__);							\
+			}															\
+		}																\
+		ar->size = ns;													\
+	} while (0)
+
+/**	Append a value to the end of the array.
+
+	The array is grown by one and the value written to the newly opened slot.
+
+	If the new array size is greater than maxSize and the array can be grown,
+	the array backing will be resized to the next multiple of grow.
+
+	Attempting to grow an array that cannot grow is an error: it is assumed
+	that the array struct does not own the backing memory.
+
+	\param array	*Address* of the array to be modified (ie, pointer to the
+					array struct instance, not the instance itself: use & for
+					static instances of the array struct).
+	\param value	The value to be appended to the array. Must be of a type
+					compatible with that used for creating the array struct.
+	\return			The appended value: can be assigned to another compatible
+					value.
+	\hideinitializer
+*/
+#define DARRAY_APPEND(array, value)										\
+	({																	\
+		__auto_type ar = (array);										\
+		__auto_type ob = (value);										\
+		size_t      sz = ar->size;										\
+		DARRAY_RESIZE (ar, ar->size + 1);								\
+		ar->a[sz] = ob;											\
+	})
+
+/**	Open a hole in the array for bulk copying of data.
+
+	The array is grown by the requested size, opening a hole at the specified
+	index. Values beyond the index are copied to just after the newly opened
+	hole.
+
+	If the new array size is greater than maxSize and the array can be grown,
+	the array backing will be resized to the next multiple of grow.
+
+	Attempting to grow an array that cannot grow is an error: it is assumed
+	that the array struct does not own the backing memory.
+
+	\param array	*Address* of the array to be modified (ie, pointer to the
+					array struct instance, not the instance itself: use & for
+					static instances of the array struct).
+	\param index	The index at which the hole will begin.
+	\param space	The sized of the hole to be opened, in array elements.
+	\return			The *address* of the newly opened hole: can be passed to
+					memcpy and friends.
+
+						memcpy (DARRAY_OPEN_AT(array, index, size), data,
+								size * sizeof (*data));
+	\hideinitializer
+*/
+#define DARRAY_OPEN_AT(array, index, space)								\
+	({																	\
+		__auto_type ar = (array);										\
+		size_t po = (index);											\
+		size_t sp = (space);											\
+		if (__builtin_expect (po > ar->size, 0)) {						\
+			Sys_Error ("Attempt to insert elements outside darray: "	\
+					   "%s:%d", __FILE__, __LINE__);					\
+		}																\
+		DARRAY_RESIZE (ar, ar->size + sp);								\
+		memmove (&ar->a[po + sp], &ar->a[po],							\
+				 (ar->size - po) * sizeof (*ar->a));					\
+		&ar->a[po];														\
+	})
+
+/**	Insert a value into the array at the specified index.
+
+	The array is grown by one at the specified index and the value written
+	to the newly opened slot. Values beyond the index are copied to just
+	after the newly opened slot.
+
+	If the new array size is greater than maxSize and the array can be grown,
+	the array backing will be resized to the next multiple of grow.
+
+	Attempting to grow an array that cannot grow is an error: it is assumed
+	that the array struct does not own the backing memory.
+
+	Attempting to insert a value beyond one past the end of the array is an
+	error (inserting at index = size is valid).
+
+	\param array	*Address* of the array to be modified (ie, pointer to the
+					array struct instance, not the instance itself: use & for
+					static instances of the array struct).
+	\param value	The value to be inserted into the array. Must be of a type
+					compatible with that used for creating the array struct.
+	\param index	The index at which the value will be inserted
+	\return			The inserted value: can be assigned to another compatible
+					value.
+	\hideinitializer
+*/
+#define DARRAY_INSERT_AT(array, value, index)							\
+	({																	\
+		__auto_type ar = (array);										\
+		__auto_type ob = (value);										\
+		*DARRAY_OPEN_AT (ar, index, 1) = ob;							\
+	})
+
+/**	Close a segment of an array.
+
+	The values beyond the segment are copied to the beginning of the segment
+	and the array size reduced by the size of the segment. All but the first
+	one of the values previously in the segment are lost and gone forever.
+
+	Attempting to close a segment that extends outside the array is an error.
+
+	\param array	*Address* of the array to be modified (ie, pointer to the
+					array struct instance, not the instance itself: use & for
+					static instances of the array struct).
+	\param index	The index of the beginning of the segment.
+	\param count	The number of values in the segment.
+	\return			The single value at the beginning of the segment: can be
+					assigned to another compatible value.
+	\hideinitializer
+*/
+#define DARRAY_CLOSE_AT(array, index, count)							\
+	({																	\
+		__auto_type ar = (array);										\
+		size_t po = (index);											\
+		size_t co = (count);											\
+		if (__builtin_expect (po + co > ar->size						\
+							  || po >= ar->size, 0)) {					\
+			Sys_Error ("Attempt to remove elements outside darray: "	\
+					   "%s:%d", __FILE__, __LINE__);					\
+		}																\
+		__auto_type ob = ar->a[po];										\
+		memmove (&ar->a[po], &ar->a[po + co],							\
+				 (ar->size - po - co) * sizeof (ob));					\
+		ar->size -= co;													\
+		ob;																\
+	})
+
+/**	Remove a value from an array at the specified index.
+
+	The values beyond the index are moved down to fill the hole left by the
+	single value and the array size reduced by one.
+
+	Attempting to remove a value from beyond the array is an error.
+
+	\param array	*Address* of the array to be modified (ie, pointer to the
+					array struct instance, not the instance itself: use & for
+					static instances of the array struct).
+	\param index	The index of the value to be removed.
+	\return			The removed value: can be assigned to another compatible
+					value.
+	\hideinitializer
+*/
+#define DARRAY_REMOVE_AT(array, index)									\
+	({																	\
+		__auto_type ar = (array);										\
+		DARRAY_CLOSE_AT (ar, index, 1);									\
+	})
+
+/**	Remove (pop) a value from the end of an array.
+
+	The size of the array size reduced by one.
+
+	Attempting to remove a value from an empty array is an error.
+
+	\param array	*Address* of the array to be modified (ie, pointer to the
+					array struct instance, not the instance itself: use & for
+					static instances of the array struct).
+	\return			The removed value: can be assigned to another compatible
+					value.
+	\hideinitializer
+*/
+#define DARRAY_REMOVE(array)											\
+	({																	\
+		__auto_type ar = (array);										\
+		DARRAY_CLOSE_AT (ar, ar->size - 1, 1);							\
+	})
+
+///@}
+
+#endif//__pr_type_h
diff --git a/libs/util/test/Makefile.am b/libs/util/test/Makefile.am
index a7bdb5d4e..f6dd4115a 100644
--- a/libs/util/test/Makefile.am
+++ b/libs/util/test/Makefile.am
@@ -3,8 +3,8 @@ AUTOMAKE_OPTIONS= foreign
 AM_CPPFLAGS= -I$(top_srcdir)/include
 
 check_PROGRAMS= \
-	test-bary test-cs test-dq test-half test-mat3 test-mat4 test-plist \
-	test-qfs test-quat test-seb test-seg test-set test-vrect
+	test-bary test-cs test-darray test-dq test-half test-mat3 test-mat4 \
+	test-plist test-qfs test-quat test-seb test-seg test-set test-vrect
 
 test_bary_SOURCES=test-bary.c
 test_bary_LDADD=$(top_builddir)/libs/util/libQFutil.la
@@ -14,6 +14,10 @@ test_cs_SOURCES=test-cs.c
 test_cs_LDADD=$(top_builddir)/libs/util/libQFutil.la
 test_cs_DEPENDENCIES=$(top_builddir)/libs/util/libQFutil.la
 
+test_darray_SOURCES=test-darray.c
+test_darray_LDADD=$(top_builddir)/libs/util/libQFutil.la
+test_darray_DEPENDENCIES=$(top_builddir)/libs/util/libQFutil.la
+
 test_dq_SOURCES=test-dq.c
 test_dq_LDADD=$(top_builddir)/libs/util/libQFutil.la
 test_dq_DEPENDENCIES=$(top_builddir)/libs/util/libQFutil.la
diff --git a/libs/util/test/test-darray.c b/libs/util/test/test-darray.c
new file mode 100644
index 000000000..59dbad0ab
--- /dev/null
+++ b/libs/util/test/test-darray.c
@@ -0,0 +1,213 @@
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#define remove remove_renamed
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include "QF/darray.h"
+#include "QF/sys.h"
+#undef remove
+
+typedef int (*test_func) (int a, int b);
+typedef struct intarray_s DARRAY_TYPE(int) intarray_t;
+
+intarray_t  intarray = {0, 0, 16, 0};
+
+static int
+append (int val, int b)
+{
+	return DARRAY_APPEND (&intarray, val);
+}
+
+static int
+check_size (int a, int b)
+{
+	return intarray.size;
+}
+
+static int
+check_maxSize (int a, int b)
+{
+	return intarray.maxSize;
+}
+
+static  int
+check_grow (int a, int b)
+{
+	return intarray.grow;
+}
+
+static int
+check_maxSizeGrowth (int a, int b)
+{
+	return intarray.maxSize % intarray.grow;
+}
+
+static int
+check_array (int a, int b)
+{
+	return !!intarray.a;
+}
+
+static int
+check_value (int index, int b)
+{
+	if ((size_t) index >= intarray.size) {
+		Sys_Error ("indexing beyond array");
+	}
+	return intarray.a[index];
+}
+
+static int
+insert_at (int val, int pos)
+{
+	return DARRAY_INSERT_AT (&intarray, val, pos);
+}
+
+static int
+open_at (int pos, int size)
+{
+	return DARRAY_OPEN_AT (&intarray, pos, size) - intarray.a;
+}
+
+static const char text[] = "Aloy is an awesome huntress.";
+static int
+open_at2 (int pos, int size)
+{
+	memcpy(DARRAY_OPEN_AT (&intarray, pos, size), text, size * sizeof (int));
+	return strcmp((char*) (intarray.a + pos), text);
+}
+
+static int
+remove_at (int pos, int b)
+{
+	return DARRAY_REMOVE_AT (&intarray, pos);
+}
+
+static int
+remove (int pos, int b)
+{
+	return DARRAY_REMOVE (&intarray);
+}
+
+static int
+close_at (int pos, int size)
+{
+	return DARRAY_CLOSE_AT (&intarray, pos, size);
+}
+
+static int
+clear (int a, int b)
+{
+	DARRAY_CLEAR (&intarray);
+	return 0;
+}
+
+static int
+resize (int size, int b)
+{
+	DARRAY_RESIZE (&intarray, size);
+	return 0;
+}
+
+struct {
+	test_func   test;
+	int         param1, param2;
+	int         test_expect;
+} tests[] = {
+	{check_size,              0,  0,  0},	// confirm array empty but can grow
+	{check_maxSize,           0,  0,  0},
+	{check_grow,              0,  0, 16},
+	{check_array,             0,  0,  0},
+	{append,                  5,  0,  5},	// test first append to emtpty array
+	{check_size,              0,  0,  1},
+	{check_maxSizeGrowth,     0,  0,  0},
+	{check_maxSize,           0,  0, 16},
+	{check_array,             0,  0,  1},
+	{check_value,             0,  0,  5},
+	{append,                 42,  0, 42},	// test a second append
+	{check_size,              0,  0,  2},
+	{check_maxSize,           0,  0, 16},
+	{check_value,             0,  0,  5},
+	{check_value,             1,  0, 42},
+	{insert_at,              69,  1, 69},	// test insertions
+	{insert_at,              96,  0, 96},
+	{check_size,              0,  0,  4},
+	{check_maxSize,           0,  0, 16},
+	{check_value,             0,  0, 96},
+	{check_value,             1,  0,  5},
+	{check_value,             2,  0, 69},
+	{check_value,             3,  0, 42},
+	{open_at,                 2, 14,  2},	// test opening a large hole
+	{check_maxSizeGrowth,     0,  0,  0},
+	{check_maxSize,           0,  0, 32},
+	{check_size,              0,  0, 18},
+	{check_value,             0,  0, 96},
+	{check_value,             1,  0,  5},
+	{check_value,            16,  0, 69},
+	{check_value,            17,  0, 42},
+	{close_at,                1, 15,  5},	// test block removal
+	{check_maxSize,           0,  0, 32},
+	{check_size,              0,  0,  3},
+	{check_value,             0,  0, 96},
+	{check_value,             1,  0, 69},
+	{check_value,             2,  0, 42},
+	{remove,                  0,  0, 42},	// test "pop"
+	{check_maxSize,           0,  0, 32},
+	{check_size,              0,  0,  2},
+	{check_value,             0,  0, 96},
+	{check_value,             1,  0, 69},
+	{remove_at,               0,  0, 96},	// test remove at
+	{check_maxSize,           0,  0, 32},
+	{check_size,              0,  0,  1},
+	{check_value,             0,  0, 69},
+	{insert_at,              71,  1, 71},	// test insertion at end
+	{resize,                  48, 0,  0},	// test resize bigger
+	{check_maxSizeGrowth,     0,  0,  0},
+	{check_maxSize,           0,  0, 48},
+	{check_size,              0,  0, 48},
+	{check_value,             0,  0, 69},
+	{check_value,             1,  0, 71},
+	{resize,                  24, 0,  0},	// test resize smaller
+	{check_maxSizeGrowth,     0,  0,  0},
+	{check_maxSize,           0,  0, 48},
+	{check_size,              0,  0, 24},
+	{check_value,             0,  0, 69},
+	{check_value,             1,  0, 71},
+	{open_at2,                1,  (sizeof (text) + sizeof (int) - 1) / sizeof (int), 0},
+	{check_value,             0,  0, 69},
+	{check_value,             1,  0, 0x796f6c41},
+	{check_value,             9,  0, 71},
+	{clear,		              0,  0,  0},	// test clearing
+	{check_size,              0,  0,  0},
+	{check_maxSize,           0,  0,  0},
+	{check_array,             0,  0,  0},
+};
+#define num_tests (sizeof (tests) / sizeof (tests[0]))
+int test_start_line = __LINE__ - num_tests - 2;
+
+int
+main (int argc, const char **argv)
+{
+	int         res = 0;
+
+	size_t      i;
+
+	for (i = 0; i < num_tests; i++) {
+		if (tests[i].test) {
+			int         test_res;
+			test_res = tests[i].test (tests[i].param1, tests[i].param2);
+			if (test_res != tests[i].test_expect) {
+				res |= 1;
+				printf ("test %d (line %d) failed\n", (int) i,
+						(int) i + test_start_line);
+				printf ("expect: %d\n", tests[i].test_expect);
+				printf ("got   : %d\n", test_res);
+				continue;
+			}
+		}
+	}
+	return res;
+}

From cb70dc7212e176929d43efab5b37e791aaa15ef0 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 17 Feb 2020 16:40:12 +0900
Subject: [PATCH 0413/1519] Fix incorrect include protection

---
 include/QF/Makefile.am | 2 +-
 include/QF/darray.h    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/QF/Makefile.am b/include/QF/Makefile.am
index 8bf956359..aa9eaf1f8 100644
--- a/include/QF/Makefile.am
+++ b/include/QF/Makefile.am
@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = foreign
 pkgincludedir = $(includedir)/QF
 nobase_pkginclude_HEADERS = \
 	alloc.h bspfile.h cbuf.h cdaudio.h checksum.h clip_hull.h cmd.h \
-	console.h crc.h csqc.h cvar.h dstring.h draw.h gib.h hash.h hl.h \
+	console.h crc.h csqc.h cvar.h darray.h dstring.h draw.h gib.h hash.h hl.h \
 	idparse.h image.h in_event.h info.h input.h iqm.h joystick.h keys.h \
 	link.h llist.h locs.h mathlib.h mdfour.h mersenne.h model.h modelgen.h \
 	msg.h object.h pak.h pakfile.h pcx.h png.h plugin.h pr_comp.h pr_debug.h \
diff --git a/include/QF/darray.h b/include/QF/darray.h
index 88792715f..0287f958f 100644
--- a/include/QF/darray.h
+++ b/include/QF/darray.h
@@ -28,8 +28,8 @@
 
 */
 
-#ifndef __pr_type_h
-#define __pr_type_h
+#ifndef __darray_h
+#define __darray_h
 
 /** \defgroup darray Dynamic Arrays
 	\ingroup utils
@@ -298,4 +298,4 @@
 
 ///@}
 
-#endif//__pr_type_h
+#endif//__darray_h

From 65890dd2fb12e6751bb747221364ed9234f6b543 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 17 Feb 2020 20:27:43 +0900
Subject: [PATCH 0414/1519] Add a fixed-array allocator

Turned out to be very convenient.
---
 include/QF/darray.h | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/include/QF/darray.h b/include/QF/darray.h
index 0287f958f..7a4484575 100644
--- a/include/QF/darray.h
+++ b/include/QF/darray.h
@@ -67,6 +67,27 @@
 		ele_type   *a;			\
 	}
 
+/**	Allocate a fixed-size array using the given allocator
+
+	The allocated array is initilized to be ungrowable, and with both size
+	and maxSize set to the given size.
+
+	\param array_type	Expression acceptable by typeof for determining the
+						type of the array.
+	\param array_size   The size of the array.
+	\param alloc		Allocator compatible with malloc (eg, alloca).
+*/
+#define DARRAY_ALLOCFIXED(array_type, array_size, alloc)				\
+	({																	\
+		__auto_type s = (array_size);									\
+		typeof (array_type) *ar = alloc (sizeof(*ar)					\
+										 + s * sizeof (*ar->a));		\
+		ar->size = ar->maxSize = s;										\
+		ar->grow = 0;													\
+		ar->a = (typeof (ar->a)) (ar + 1);								\
+		ar;																\
+	})
+
 /**	Clear the array.
 
 	If the array can grow, its backing will be freed and maxSize and a reset,

From 94565c23820960d106c33bff4d25161596ac9470 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 17 Feb 2020 20:29:35 +0900
Subject: [PATCH 0415/1519] Rework much of the Vulkan array handling

So much for all those little wrappers hiding the device. Some survived,
but mostly just the bigger things like device, swapchain, etc.
---
 include/QF/Vulkan/buffer.h              |  62 ++--
 include/QF/Vulkan/command.h             | 125 +-------
 include/QF/Vulkan/device.h              |   5 +
 include/QF/Vulkan/funclist.h            |   1 +
 include/QF/Vulkan/image.h               |  62 ++--
 include/QF/Vulkan/instance.h            |   2 +
 include/QF/Vulkan/memory.h              |  19 +-
 include/QF/Vulkan/renderpass.h          |   2 +-
 include/QF/Vulkan/swapchain.h           |  10 +-
 include/vid_vulkan.h                    |   2 +-
 libs/video/renderer/vid_render_vulkan.c |  83 ++---
 libs/video/renderer/vulkan/buffer.c     | 101 ++----
 libs/video/renderer/vulkan/command.c    | 410 ++----------------------
 libs/video/renderer/vulkan/device.c     |  21 ++
 libs/video/renderer/vulkan/image.c      | 118 ++-----
 libs/video/renderer/vulkan/instance.c   |   2 +
 libs/video/renderer/vulkan/memory.c     |  42 +--
 libs/video/renderer/vulkan/renderpass.c |  10 +-
 libs/video/renderer/vulkan/swapchain.c  |  42 ++-
 19 files changed, 282 insertions(+), 837 deletions(-)

diff --git a/include/QF/Vulkan/buffer.h b/include/QF/Vulkan/buffer.h
index ef11ae8b7..9346d0466 100644
--- a/include/QF/Vulkan/buffer.h
+++ b/include/QF/Vulkan/buffer.h
@@ -1,57 +1,43 @@
 #ifndef __QF_Vulkan_buffer_h
 #define __QF_Vulkan_buffer_h
 
-typedef struct qfv_buffer_s {
-	struct qfv_device_s *device;
-	VkBuffer    buffer;
-} qfv_buffer_t;
+#include "QF/darray.h"
 
 typedef struct qfv_buffertransition_s {
-	qfv_buffer_t *buffer;
+	VkBuffer    buffer;
 	VkAccessFlags srcAccess;
 	VkAccessFlags dstAccess;
-	uint32_t      srcQueueFamily;
-	uint32_t      dstQueueFamily;
-	VkDeviceSize  offset;
-	VkDeviceSize  size;
-} qfv_buffertransition_t;
-
-typedef struct qfv_bufferbarrierset_s {
-	struct qfv_device_s *device;
-	uint32_t    numBarriers;
-	VkBufferMemoryBarrier *barriers;
-} qfv_bufferbarrierset_t;
-
-typedef struct qfv_bufferview_s {
-	struct qfv_device_s *device;
-	VkBufferView view;
-	qfv_buffer_t *buffer;
-	VkFormat    format;
+	uint32_t    srcQueueFamily;
+	uint32_t    dstQueueFamily;
 	VkDeviceSize offset;
 	VkDeviceSize size;
-} qfv_bufferview_t;
+} qfv_buffertransition_t;
+
+typedef struct qfv_buffertransitionset_s
+	DARRAY_TYPE (qfv_buffertransition_t) qfv_buffertransitionset_t;
+typedef struct qfv_bufferbarrierset_s
+	DARRAY_TYPE (VkBufferMemoryBarrier) qfv_bufferbarrierset_t;
 
 struct qfv_device_s;
-qfv_buffer_t *QFV_CreateBuffer (struct qfv_device_s *device,
-								VkDeviceSize size,
-								VkBufferUsageFlags usage);
+VkBuffer QFV_CreateBuffer (struct qfv_device_s *device,
+						   VkDeviceSize size,
+						   VkBufferUsageFlags usage);
 
-struct qfv_memory_s *QFV_AllocBufferMemory (qfv_buffer_t *buffer,
-									 VkMemoryPropertyFlags properties,
-									 VkDeviceSize size, VkDeviceSize offset);
+VkDeviceMemory QFV_AllocBufferMemory (struct qfv_device_s *device,
+									  VkBuffer buffer,
+									  VkMemoryPropertyFlags properties,
+									  VkDeviceSize size, VkDeviceSize offset);
 
-int QFV_BindBufferMemory (qfv_buffer_t *buffer, struct qfv_memory_s *memory,
+int QFV_BindBufferMemory (struct qfv_device_s *device,
+						  VkBuffer buffer, VkDeviceMemory object,
 						  VkDeviceSize offset);
 
 qfv_bufferbarrierset_t *
-QFV_CreateBufferTransitionSet (qfv_buffertransition_t **transitions,
-							   int numTransitions);
+QFV_CreateBufferTransitions (qfv_buffertransition_t *transitions,
+							 int numTransitions);
 
-qfv_bufferview_t *QFV_CreateBufferView (qfv_buffer_t *buffer, VkFormat format,
-										VkDeviceSize offset, VkDeviceSize size);
-
-void QFV_DestroyBufferView (qfv_bufferview_t *view);
-
-void QFV_DestroyBuffer (qfv_buffer_t *buffer);
+VkBufferView QFV_CreateBufferView (struct qfv_device_s *device,
+								   VkBuffer buffer, VkFormat format,
+								   VkDeviceSize offset, VkDeviceSize size);
 
 #endif//__QF_Vulkan_buffer_h
diff --git a/include/QF/Vulkan/command.h b/include/QF/Vulkan/command.h
index 7ef36a7f4..046c8b2b3 100644
--- a/include/QF/Vulkan/command.h
+++ b/include/QF/Vulkan/command.h
@@ -1,128 +1,33 @@
 #ifndef __QF_Vulkan_command_h
 #define __QF_Vulkan_command_h
 
-typedef struct qfv_cmdpool_s {
-	struct qfv_device_s *device;
-	VkCommandPool cmdpool;
-} qfv_cmdpool_t;
+#include "QF/darray.h"
 
-typedef struct qfv_cmdbuffer_s {
-	struct qfv_device_s *device;
-	VkCommandBuffer *buffer;
-} qfv_cmdbuffer_t;
+typedef struct qfv_cmdbufferset_s
+	DARRAY_TYPE (VkCommandBuffer) qfv_cmdbufferset_t;
 
-typedef struct qfv_cmdbufferset_s {
-	struct qfv_device_s *device;
-	qfv_cmdbuffer_t **buffers;
-	VkCommandBuffer *vkBuffers;
-	VkCommandPool cmdpool;
-	int         numBuffers;
-} qfv_cmdbufferset_t;
+typedef struct qfv_semaphoreset_s
+	DARRAY_TYPE (VkSemaphore) qfv_semaphoreset_t;
 
-typedef struct qfv_semaphore_s {
-	struct qfv_device_s *device;
-	VkSemaphore semaphore;
-} qfv_semaphore_t;
-
-typedef struct qfv_semaphoreset_s {
-	struct qfv_device_s *device;
-	qfv_semaphore_t **semaphores;
-	VkSemaphore *vkSemaphores;
-	VkPipelineStageFlags *stages;
-	int         numSemaphores;
-} qfv_semaphoreset_t;
-
-typedef struct qfv_fence_s {
-	struct qfv_device_s *device;
-	VkFence     fence;
-} qfv_fence_t;
-
-typedef struct qfv_fenceset_s {
-	struct qfv_device_s *device;
-	qfv_fence_t **fences;
-	VkFence    *vkFences;
-	int         numFences;
-} qfv_fenceset_t;
+typedef struct qfv_fenceset_s
+	DARRAY_TYPE (VkFence) qfv_fenceset_t;
 
 struct qfv_queue_s;
-qfv_cmdpool_t *QFV_CreateCommandPool (struct qfv_device_s *device,
+struct qfv_device_s;
+VkCommandPool QFV_CreateCommandPool (struct qfv_device_s *device,
 									  uint32_t queueFamily,
 									  int transient, int reset);
-int QFV_ResetCommandPool (qfv_cmdpool_t *pool, int release);
-void QFV_DestroyCommandPool (qfv_cmdpool_t *pool);
-qfv_cmdbufferset_t *QFV_AllocateCommandBuffers (qfv_cmdpool_t *pool,
+qfv_cmdbufferset_t *QFV_AllocateCommandBuffers (struct qfv_device_s *device,
+												VkCommandPool pool,
 											    int secondary, int count);
-void QFV_FreeCommandBuffers (qfv_cmdbufferset_t *buffer);
-int QFV_BeginCommandBuffer (qfv_cmdbuffer_t *buffer, int oneTime,
-							int rpContinue, int simultaneous,
-							VkCommandBufferInheritanceInfo *inheritanceInfo);
-int QFV_EndCommandBuffer (qfv_cmdbuffer_t *buffer);
-int QFV_ResetCommandBuffer (qfv_cmdbuffer_t *buffer, int release);
 
-qfv_semaphore_t *QFV_CreateSemaphore (struct qfv_device_s *device);
-qfv_semaphoreset_t *QFV_CreateSemaphoreSet (qfv_semaphore_t **semaphores,
-											int numSemaphores);
-void QFV_DestroySemaphore (qfv_semaphore_t *semaphore);
-// NOTE: does not destroy semaphores
-void QFV_DestroySemaphoreSet (qfv_semaphoreset_t *semaphores);
-qfv_fence_t *QFV_CreateFence (struct qfv_device_s *device, int signaled);
-qfv_fenceset_t *QFV_CreateFenceSet (qfv_fence_t **fences, int numFences);
-void QFV_DestroyFence (qfv_fence_t *fence);
-// NOTE: does not destroy fences
-void QFV_DestroyFenceSet (qfv_fenceset_t *fenceset);
-int QFV_WaitForFences (qfv_fenceset_t *fenceset, int all, uint64_t timeout);
-int QFV_WaitForFence (qfv_fence_t *fence, uint64_t timeout);
-int QFV_ResetFences (qfv_fenceset_t *fenceset);
-int QFV_ResetFence (qfv_fence_t *fence);
+VkSemaphore QFV_CreateSemaphore (struct qfv_device_s *device);
+VkFence QFV_CreateFence (struct qfv_device_s *device, int signaled);
 int QFV_QueueSubmit (struct qfv_queue_s *queue,
 					 qfv_semaphoreset_t *waitSemaphores,
+					 VkPipelineStageFlags *stages,
 					 qfv_cmdbufferset_t *buffers,
-					 qfv_semaphoreset_t *signalSemaphores, qfv_fence_t *fence);
+					 qfv_semaphoreset_t *signalSemaphores, VkFence fence);
 int QFV_QueueWaitIdle (struct qfv_queue_s *queue);
 
-struct qfv_memorybarrierset_s;
-struct qfv_bufferbarrierset_s;
-struct qfv_imagebarrierset_s;
-void QFV_CmdPipelineBarrier (qfv_cmdbuffer_t *cmdBuffer,
-							 VkPipelineStageFlags srcStageMask,
-							 VkPipelineStageFlags dstStageMask,
-							 VkDependencyFlags dependencyFlags,
-							 struct qfv_memorybarrierset_s *memBarriers,
-							 struct qfv_bufferbarrierset_s *buffBarriers,
-							 struct qfv_imagebarrierset_s *imgBarriers);
-
-struct qfv_buffer_s;
-struct qfv_image_s;
-struct qfv_renderpass_s;
-struct qfv_framebuffer_s;
-void QFV_CmdCopyBuffer (qfv_cmdbuffer_t *cmdBuffer,
-						struct qfv_buffer_s *src, struct qfv_buffer_s *dst,
-						VkBufferCopy *regions, uint32_t numRegions);
-void QFV_CmdCopyBufferToImage (qfv_cmdbuffer_t *cmdBuffer,
-							   struct qfv_buffer_s *src,
-							   struct qfv_image_s *dst,
-							   VkImageLayout layout,
-							   VkBufferImageCopy *regions,
-							   uint32_t numRegions);
-void QFV_CmdCopyImageToBuffer (qfv_cmdbuffer_t *cmdBuffer,
-							   struct qfv_image_s *src,
-							   VkImageLayout layout,
-							   struct qfv_buffer_s *dst,
-							   VkBufferImageCopy *regions,
-							   uint32_t numRegions);
-void QFV_CmdBeginRenderPass (qfv_cmdbuffer_t *cmdBuffer,
-							 struct qfv_renderpass_s *renderPass,
-							 struct qfv_framebuffer_s *framebuffer,
-							 VkRect2D renderArea,
-							 uint32_t numClearValues,
-							 VkClearValue *clearValues,
-							 VkSubpassContents subpassContents);
-void QFV_CmdNextSubpass (qfv_cmdbuffer_t *cmdBuffer,
-						 VkSubpassContents subpassContents);
-void QFV_CmdEndRenderPass (qfv_cmdbuffer_t *cmdBuffer);
-struct qfv_pipeline_s;
-void QFV_CmdBindPipeline (qfv_cmdbuffer_t *cmdBuffer,
-						  VkPipelineBindPoint bindPoint,
-						  struct qfv_pipeline_s *pipeline);
-
 #endif//__QF_Vulkan_command_h
diff --git a/include/QF/Vulkan/device.h b/include/QF/Vulkan/device.h
index c05b2ba7e..2ebc7b1d9 100644
--- a/include/QF/Vulkan/device.h
+++ b/include/QF/Vulkan/device.h
@@ -31,4 +31,9 @@ qfv_device_t *QFV_CreateDevice (struct vulkan_ctx_s *ctx,
 void QFV_DestroyDevice (qfv_device_t *device);
 int QFV_DeviceWaitIdle (qfv_device_t *device);
 
+VkFormat QFV_FindSupportedFormat (qfv_device_t *device, VkImageTiling tiling,
+								  VkFormatFeatureFlags features,
+								  int numCandidates,
+								  const VkFormat *candidates);
+
 #endif//__QF_Vulkan_device_h
diff --git a/include/QF/Vulkan/funclist.h b/include/QF/Vulkan/funclist.h
index 5bacf29eb..426b0fa62 100644
--- a/include/QF/Vulkan/funclist.h
+++ b/include/QF/Vulkan/funclist.h
@@ -31,6 +31,7 @@ INSTANCE_LEVEL_VULKAN_FUNCTION (vkDestroyInstance)
 INSTANCE_LEVEL_VULKAN_FUNCTION (vkEnumerateDeviceLayerProperties)
 INSTANCE_LEVEL_VULKAN_FUNCTION (vkEnumerateDeviceExtensionProperties)
 INSTANCE_LEVEL_VULKAN_FUNCTION (vkGetPhysicalDeviceMemoryProperties)
+INSTANCE_LEVEL_VULKAN_FUNCTION (vkGetPhysicalDeviceFormatProperties)
 
 #undef INSTANCE_LEVEL_VULKAN_FUNCTION
 
diff --git a/include/QF/Vulkan/image.h b/include/QF/Vulkan/image.h
index 4258fe2e0..8db6ee632 100644
--- a/include/QF/Vulkan/image.h
+++ b/include/QF/Vulkan/image.h
@@ -1,13 +1,13 @@
 #ifndef __QF_Vulkan_image_h
 #define __QF_Vulkan_image_h
 
-typedef struct qfv_image_s {
-	struct qfv_device_s *device;
-	VkImage    image;
-} qfv_image_t;
+#include "QF/darray.h"
+
+typedef struct qfv_imageset_s DARRAY_TYPE (VkImage) qfv_imageset_t;
+typedef struct qfv_imageviewset_s DARRAY_TYPE (VkImageView) qfv_imageviewset_t;
 
 typedef struct qfv_imagetransition_s {
-	qfv_image_t *image;
+	VkImage       image;
 	VkAccessFlags srcAccess;
 	VkAccessFlags dstAccess;
 	VkImageLayout oldLayout;
@@ -17,48 +17,32 @@ typedef struct qfv_imagetransition_s {
 	VkImageAspectFlags aspect;
 } qfv_imagetransition_t;
 
-typedef struct qfv_imagebarrierset_s {
-	struct qfv_device_s *device;
-	uint32_t    numBarriers;
-	VkImageMemoryBarrier *barriers;
-} qfv_imagebarrierset_t;
-
-typedef struct qfv_imageview_s {
-	struct qfv_device_s *device;
-	VkImageView view;
-	qfv_image_t *image;
-	VkImageViewType type;
-	VkFormat    format;
-	VkImageAspectFlags aspect;
-} qfv_imageview_t;
+typedef struct qfv_imagetransitionset_s
+	DARRAY_TYPE (qfv_imagetransition_t) qfv_imagetransitionset_t;
+typedef struct qfv_imagebarrierset_s
+	DARRAY_TYPE (VkImageMemoryBarrier) qfv_imagebarrierset_t;
 
 struct qfv_device_s;
-qfv_image_t *QFV_CreateImage (struct qfv_device_s *device, int cubemap,
-							  VkImageType type,
-							  VkFormat format,
-							  VkExtent3D size,
-							  uint32_t num_mipmaps,
-							  uint32_t num_layers,
-							  VkSampleCountFlagBits samples,
-							  VkImageUsageFlags usage_scenarios);
+VkImage QFV_CreateImage (struct qfv_device_s *device, int cubemap,
+						 VkImageType type,
+						 VkFormat format,
+						 VkExtent3D size,
+						 uint32_t num_mipmaps,
+						 uint32_t num_layers,
+						 VkSampleCountFlagBits samples,
+						 VkImageUsageFlags usage_scenarios);
 
-struct qfv_memory_s *QFV_AllocImageMemory (qfv_image_t *image,
+VkDeviceMemory QFV_AllocImageMemory (struct qfv_device_s *device,
+									 VkImage image,
 									 VkMemoryPropertyFlags properties,
 									 VkDeviceSize size, VkDeviceSize offset);
 
-int QFV_BindImageMemory (qfv_image_t *image, struct qfv_memory_s *memory,
-						  VkDeviceSize offset);
-
 qfv_imagebarrierset_t *
-QFV_CreateImageTransitionSet (qfv_imagetransition_t **transitions,
+QFV_CreateImageTransitionSet (qfv_imagetransition_t *transitions,
 							   int numTransitions);
 
-qfv_imageview_t *QFV_CreateImageView (qfv_image_t *image, VkImageViewType type,
-									  VkFormat format,
-									  VkImageAspectFlags aspect);
-
-void QFV_DestroyImageView (qfv_imageview_t *view);
-
-void QFV_DestroyImage (qfv_image_t *image);
+VkImageView QFV_CreateImageView (struct qfv_device_s *device,
+								 VkImage image, VkImageViewType type,
+								 VkFormat format, VkImageAspectFlags aspect);
 
 #endif//__QF_Vulkan_image_h
diff --git a/include/QF/Vulkan/instance.h b/include/QF/Vulkan/instance.h
index 6c393d140..0cf5b2226 100644
--- a/include/QF/Vulkan/instance.h
+++ b/include/QF/Vulkan/instance.h
@@ -37,7 +37,9 @@ typedef struct qfv_instfuncs_s {
 } qfv_instfuncs_t;
 
 typedef struct qfv_physdev_s {
+	struct qfv_instance_s *instance;
 	VkPhysicalDevice dev;
+	VkPhysicalDeviceProperties properties;
 	VkPhysicalDeviceMemoryProperties memory_properties;
 } qfv_physdev_t;
 
diff --git a/include/QF/Vulkan/memory.h b/include/QF/Vulkan/memory.h
index 55b87f6c6..91885d31b 100644
--- a/include/QF/Vulkan/memory.h
+++ b/include/QF/Vulkan/memory.h
@@ -1,21 +1,22 @@
 #ifndef __QF_Vulkan_memory_h
 #define __QF_Vulkan_memory_h
 
-typedef struct qfv_memory_s {
-	struct qfv_device_s *device;
-	VkDeviceMemory object;
-} qfv_memory_t;
+#include "QF/darray.h"
 
 typedef struct qfv_mappedmemrange_s {
-	qfv_memory_t *memory;
+	VkDeviceMemory object;
 	VkDeviceSize offset;
 	VkDeviceSize size;
 } qfv_mappedmemrange_t;
 
-void QFV_FreeMemory (qfv_memory_t *memory);
-void *QFV_MapMemory (qfv_memory_t *memory,
+typedef struct qfv_mappedmemrangeset_s
+	DARRAY_TYPE (qfv_mappedmemrange_t) qfv_mappedmemrangeset_t;
+
+struct qfv_device_s;
+
+void *QFV_MapMemory (struct qfv_device_s *device, VkDeviceMemory object,
 					 VkDeviceSize offset, VkDeviceSize size);
-void QFV_UnmapMemory (qfv_memory_t *memory);
-void QFV_FlushMemory (qfv_mappedmemrange_t *ranges, uint32_t numRanges);
+void QFV_FlushMemory (struct qfv_device_s *device,
+					  qfv_mappedmemrangeset_t *ranges);
 
 #endif//__QF_Vulkan_memory_h
diff --git a/include/QF/Vulkan/renderpass.h b/include/QF/Vulkan/renderpass.h
index c8fdc2965..3dd4acc63 100644
--- a/include/QF/Vulkan/renderpass.h
+++ b/include/QF/Vulkan/renderpass.h
@@ -63,7 +63,7 @@ struct qfv_imageview_s;
 qfv_framebuffer_t *
 QFV_CreateFramebuffer (qfv_renderpass_t *renderPass,
 					   uint32_t numAttachments,
-					   struct qfv_imageview_s **attachments,
+					   VkImageView *attachments,
 					   uint32_t width, uint32_t height, uint32_t layers);
 
 void QFV_DestroyFramebuffer (qfv_framebuffer_t *framebuffer);
diff --git a/include/QF/Vulkan/swapchain.h b/include/QF/Vulkan/swapchain.h
index 1a9abb896..9d04b35e4 100644
--- a/include/QF/Vulkan/swapchain.h
+++ b/include/QF/Vulkan/swapchain.h
@@ -5,8 +5,11 @@ typedef struct qfv_swapchain_s {
 	struct qfv_device_s *device;
 	VkSurfaceKHR surface;
 	VkSwapchainKHR swapchain;
+	VkFormat    format;
+	VkExtent2D  extent;
 	int32_t     numImages;
-	VkImage    *images;
+	struct qfv_imageset_s *images;
+	struct qfv_imageviewset_s *imageViews;
 } qfv_swapchain_t;
 
 struct vulkan_ctx_s;
@@ -15,8 +18,7 @@ qfv_swapchain_t *QFV_CreateSwapchain (struct vulkan_ctx_s *ctx,
 void QFV_DestroySwapchain (qfv_swapchain_t *swapchain);
 struct qfv_semaphore_s;
 struct qfv_fence_s;
-int QFV_AcquireNextImage (qfv_swapchain_t *swapchain,
-						  struct qfv_semaphore_s *semaphore,
-						  struct qfv_fence_s *fence, uint32_t *imageIndex);
+int QFV_AcquireNextImage (qfv_swapchain_t *swapchain, VkSemaphore semaphore,
+						  VkFence fence, uint32_t *imageIndex);
 
 #endif//__QF_Vulkan_swapchain_h
diff --git a/include/vid_vulkan.h b/include/vid_vulkan.h
index 5b9a31daf..77718ab9c 100644
--- a/include/vid_vulkan.h
+++ b/include/vid_vulkan.h
@@ -32,7 +32,7 @@ typedef struct vulkan_ctx_s {
 	struct qfv_swapchain_s *swapchain;
 	VkSurfaceKHR surface;	//FIXME surface = window, so "contains" swapchain
 
-	struct qfv_cmdpool_s *cmdpool;
+	VkCommandPool cmdpool;
 	vulkan_frameset_t frameset;
 
 #define EXPORTED_VULKAN_FUNCTION(fname) PFN_##fname fname;
diff --git a/libs/video/renderer/vid_render_vulkan.c b/libs/video/renderer/vid_render_vulkan.c
index de0917310..0373867de 100644
--- a/libs/video/renderer/vid_render_vulkan.c
+++ b/libs/video/renderer/vid_render_vulkan.c
@@ -33,6 +33,7 @@
 //#define NH_DEFINE
 //#include "vulkan/namehack.h"
 
+#include "QF/darray.h"
 #include "QF/sys.h"
 
 #include "QF/plugin/general.h"
@@ -41,6 +42,7 @@
 #include "QF/Vulkan/qf_vid.h"
 #include "QF/Vulkan/command.h"
 #include "QF/Vulkan/device.h"
+#include "QF/Vulkan/image.h"
 #include "QF/Vulkan/instance.h"
 #include "QF/Vulkan/swapchain.h"
 
@@ -56,19 +58,24 @@ static vulkan_ctx_t *vulkan_ctx;
 static void
 vulkan_R_Init (void)
 {
+	qfv_device_t *device = vulkan_ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
 	qfv_cmdbufferset_t *cmdBuffers;
+
 	Vulkan_CreateSwapchain (vulkan_ctx);
-	cmdBuffers = QFV_AllocateCommandBuffers (vulkan_ctx->cmdpool, 0,
+	cmdBuffers = QFV_AllocateCommandBuffers (device, vulkan_ctx->cmdpool, 0,
 											 vulkan_ctx->swapchain->numImages);
 	vulkan_ctx->frameset.cmdBuffers = cmdBuffers;
-	for (int i = 0; i < cmdBuffers->numBuffers; i++) {
-		QFV_BeginCommandBuffer (cmdBuffers->buffers[i], 0, 0, 0, 0);
-		QFV_EndCommandBuffer (cmdBuffers->buffers[i]);
+	VkCommandBufferBeginInfo beginInfo
+		= { VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO };
+	for (size_t i = 0; i < cmdBuffers->size; i++) {
+		dfunc->vkBeginCommandBuffer (cmdBuffers->a[i], &beginInfo);
+		dfunc->vkEndCommandBuffer (cmdBuffers->a[i]);
 	}
 	Sys_Printf ("R_Init %p %d", vulkan_ctx->swapchain->swapchain,
 				vulkan_ctx->swapchain->numImages);
 	for (int32_t i = 0; i < vulkan_ctx->swapchain->numImages; i++) {
-		Sys_Printf (" %p", vulkan_ctx->swapchain->images[i]);
+		Sys_Printf (" %p", vulkan_ctx->swapchain->images->a[i]);
 	}
 	Sys_Printf ("\n");
 }
@@ -79,39 +86,42 @@ vulkan_SCR_UpdateScreen (double time,  void (*f)(void), void (**g)(void))
 	static int count = 0;
 	static double startTime;
 	uint32_t imageIndex = 0;
-	qfv_devfuncs_t *dfunc = vulkan_ctx->device->funcs;
+	qfv_device_t *device = vulkan_ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+	VkDevice    dev = device->dev;
 	qfv_queue_t *queue = &vulkan_ctx->device->queue;
 	vulkan_frameset_t *frameset = &vulkan_ctx->frameset;
 
-	QFV_WaitForFence (frameset->fences->fences[frameset->curFrame],
-					  2000000000);
+	dfunc->vkWaitForFences (dev, 1, & frameset->fences->a[frameset->curFrame],
+							VK_TRUE, 2000000000);
 	QFV_AcquireNextImage (vulkan_ctx->swapchain,
-				  frameset->imageSemaphores->semaphores[frameset->curFrame],
+				  frameset->imageSemaphores->a[frameset->curFrame],
 				  0, &imageIndex);
 
-	VkPipelineStageFlags waitStage = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
+	VkPipelineStageFlags waitStage
+		= VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
 	VkSubmitInfo submitInfo = {
 		VK_STRUCTURE_TYPE_SUBMIT_INFO, 0,
 		1,
-		&frameset->imageSemaphores->vkSemaphores[frameset->curFrame],
+		&frameset->imageSemaphores->a[frameset->curFrame],
 		&waitStage,
-		1, &frameset->cmdBuffers->vkBuffers[imageIndex],
-		1, &frameset->renderDoneSemaphores->vkSemaphores[frameset->curFrame],
+		1, &frameset->cmdBuffers->a[imageIndex],
+		1, &frameset->renderDoneSemaphores->a[frameset->curFrame],
 	};
-	QFV_ResetFence (frameset->fences->fences[frameset->curFrame]);
+	dfunc->vkResetFences (dev, 1, &frameset->fences->a[frameset->curFrame]);
 	dfunc->vkQueueSubmit (queue->queue, 1, &submitInfo,
-						  frameset->fences->vkFences[frameset->curFrame]);
+						  frameset->fences->a[frameset->curFrame]);
 
 	VkPresentInfoKHR presentInfo = {
 		VK_STRUCTURE_TYPE_PRESENT_INFO_KHR, 0,
-		1, &frameset->renderDoneSemaphores->vkSemaphores[frameset->curFrame],
+		1, &frameset->renderDoneSemaphores->a[frameset->curFrame],
 		1, &vulkan_ctx->swapchain->swapchain, &imageIndex,
 		0
 	};
 	dfunc->vkQueuePresentKHR (queue->queue, &presentInfo);
 
 	frameset->curFrame++;
-	frameset->curFrame %= frameset->fences->numFences;
+	frameset->curFrame %= frameset->fences->size;
 
 	if (++count >= 100) {
 		double currenTime = Sys_DoubleTime ();
@@ -238,7 +248,7 @@ vulkan_vid_render_choose_visual (void)
 	Sys_Printf ("vk choose visual %p %p %d %p\n", vulkan_ctx->device->dev,
 				vulkan_ctx->device->queue.queue,
 				vulkan_ctx->device->queue.queueFamily,
-				vulkan_ctx->cmdpool->cmdpool);
+				vulkan_ctx->cmdpool);
 }
 
 static void
@@ -247,19 +257,18 @@ vulkan_vid_render_create_context (void)
 	vulkan_ctx->create_window (vulkan_ctx);
 	vulkan_ctx->surface = vulkan_ctx->create_surface (vulkan_ctx);
 	vulkan_ctx->frameset.curFrame = 0;
-	qfv_fence_t **fences = alloca (2 * sizeof (*fences));
-	qfv_semaphore_t **imageSems = alloca (2 * sizeof (*imageSems));
-	qfv_semaphore_t **renderDoneSems = alloca (2 * sizeof (*renderDoneSems));
+	qfv_fenceset_t *fences = DARRAY_ALLOCFIXED (*fences, 2, malloc);
+	qfv_semaphoreset_t *imageSems = DARRAY_ALLOCFIXED (*imageSems, 2, malloc);
+	qfv_semaphoreset_t *renderDoneSems = DARRAY_ALLOCFIXED (*renderDoneSems, 2,
+															malloc);
 	for (int i = 0; i < 2; i++) {
-		fences[i]= QFV_CreateFence (vulkan_ctx->device, 1);
-		imageSems[i] = QFV_CreateSemaphore (vulkan_ctx->device);
-		renderDoneSems[i] = QFV_CreateSemaphore (vulkan_ctx->device);
+		fences->a[i]= QFV_CreateFence (vulkan_ctx->device, 1);
+		imageSems->a[i] = QFV_CreateSemaphore (vulkan_ctx->device);
+		renderDoneSems->a[i] = QFV_CreateSemaphore (vulkan_ctx->device);
 	}
-	vulkan_ctx->frameset.fences = QFV_CreateFenceSet (fences, 2);
-	vulkan_ctx->frameset.imageSemaphores
-		= QFV_CreateSemaphoreSet (imageSems, 2);
-	vulkan_ctx->frameset.renderDoneSemaphores
-		= QFV_CreateSemaphoreSet (renderDoneSems, 2);
+	vulkan_ctx->frameset.fences = fences;
+	vulkan_ctx->frameset.imageSemaphores = imageSems;
+	vulkan_ctx->frameset.renderDoneSemaphores = renderDoneSems;
 	Sys_Printf ("vk create context %p\n", vulkan_ctx->surface);
 }
 
@@ -282,15 +291,17 @@ vulkan_vid_render_init (void)
 static void
 vulkan_vid_render_shutdown (void)
 {
-	QFV_DeviceWaitIdle (vulkan_ctx->device);
+	qfv_device_t *device = vulkan_ctx->device;
+	qfv_devfuncs_t *df = device->funcs;
+	VkDevice    dev = device->dev;
+	QFV_DeviceWaitIdle (device);
 	vulkan_frameset_t *frameset = &vulkan_ctx->frameset;
-	for (int i = 0; i < frameset->fences->numFences; i++) {
-		QFV_DestroyFence (frameset->fences->fences[i]);
-		QFV_DestroySemaphore (frameset->imageSemaphores->semaphores[i]);
-		QFV_DestroySemaphore (frameset->renderDoneSemaphores->semaphores[i]);
+	for (size_t i = 0; i < frameset->fences->size; i++) {
+		df->vkDestroyFence (dev, frameset->fences->a[i], 0);
+		df->vkDestroySemaphore (dev, frameset->imageSemaphores->a[i], 0);
+		df->vkDestroySemaphore (dev, frameset->renderDoneSemaphores->a[i], 0);
 	}
-	QFV_DestroyFenceSet (vulkan_ctx->frameset.fences);
-	QFV_DestroyCommandPool (vulkan_ctx->cmdpool);
+	df->vkDestroyCommandPool (dev, vulkan_ctx->cmdpool, 0);
 	Vulkan_Shutdown_Common (vulkan_ctx);
 }
 
diff --git a/libs/video/renderer/vulkan/buffer.c b/libs/video/renderer/vulkan/buffer.c
index e2d598b81..71b094e68 100644
--- a/libs/video/renderer/vulkan/buffer.c
+++ b/libs/video/renderer/vulkan/buffer.c
@@ -61,7 +61,7 @@
 
 #include "util.h"
 
-qfv_buffer_t *
+VkBuffer
 QFV_CreateBuffer (qfv_device_t *device, VkDeviceSize size,
 				  VkBufferUsageFlags usage)
 {
@@ -73,24 +73,23 @@ QFV_CreateBuffer (qfv_device_t *device, VkDeviceSize size,
 		size, usage, VK_SHARING_MODE_EXCLUSIVE,
 		0, 0
 	};
-	qfv_buffer_t *buffer = malloc (sizeof (*buffer));
-	dfunc->vkCreateBuffer (dev, &createInfo, 0, &buffer->buffer);
-	buffer->device = device;
+	VkBuffer buffer;
+	dfunc->vkCreateBuffer (dev, &createInfo, 0, &buffer);
 	return buffer;
 }
 
-qfv_memory_t *
-QFV_AllocBufferMemory (qfv_buffer_t *buffer, VkMemoryPropertyFlags properties,
+VkDeviceMemory
+QFV_AllocBufferMemory (qfv_device_t *device,
+					   VkBuffer buffer, VkMemoryPropertyFlags properties,
 					   VkDeviceSize size, VkDeviceSize offset)
 {
-	qfv_device_t *device = buffer->device;
 	VkDevice    dev = device->dev;
 	qfv_physdev_t *physdev = device->physDev;
 	VkPhysicalDeviceMemoryProperties *memprops = &physdev->memory_properties;
     qfv_devfuncs_t *dfunc = device->funcs;
 
 	VkMemoryRequirements requirements;
-	dfunc->vkGetBufferMemoryRequirements (dev, buffer->buffer, &requirements);
+	dfunc->vkGetBufferMemoryRequirements (dev, buffer, &requirements);
 
 	size = max (size, offset + requirements.size);
 	VkDeviceMemory object = 0;
@@ -112,97 +111,55 @@ QFV_AllocBufferMemory (qfv_buffer_t *buffer, VkMemoryPropertyFlags properties,
 		}
 	}
 
-	qfv_memory_t *memory = 0;
-
-	if (object) {
-		memory = malloc (sizeof (*memory));
-		memory->device = device;
-		memory->object = object;
-	}
-	return memory;
+	return object;
 }
 
 int
-QFV_BindBufferMemory (qfv_buffer_t *buffer, qfv_memory_t *memory,
+QFV_BindBufferMemory (qfv_device_t *device,
+					  VkBuffer buffer, VkDeviceMemory object,
 					  VkDeviceSize offset)
 {
-	qfv_device_t *device = buffer->device;
 	VkDevice    dev = device->dev;
     qfv_devfuncs_t *dfunc = device->funcs;
-	VkResult res = dfunc->vkBindBufferMemory (dev, buffer->buffer,
-											  memory->object, offset);
+	VkResult res = dfunc->vkBindBufferMemory (dev, buffer, object, offset);
 	return res == VK_SUCCESS;
 }
 
 qfv_bufferbarrierset_t *
-QFV_CreateBufferTransitionSet (qfv_buffertransition_t **transitions,
-							   int numTransitions)
+QFV_CreateBufferTransitions (qfv_buffertransition_t *transitions,
+							 int numTransitions)
 {
-	qfv_device_t *device = transitions[0]->buffer->device;
-	qfv_bufferbarrierset_t *barrierset = malloc (sizeof (*barrierset)
-									   + sizeof (VkBufferMemoryBarrier) * numTransitions);
-
-	barrierset->device = device;
-	barrierset->numBarriers = numTransitions;
-	barrierset->barriers = (VkBufferMemoryBarrier *) (barrierset + 1);
+	qfv_bufferbarrierset_t *barrierset;
+	barrierset = DARRAY_ALLOCFIXED (*barrierset, numTransitions, malloc);
 
 	for (int i = 0; i < numTransitions; i++) {
-		VkBufferMemoryBarrier *barrier = &barrierset->barriers[i];
-		barrier->sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER;
-		barrier->pNext = 0;
-		barrier->srcAccessMask = transitions[i]->srcAccess;
-		barrier->dstAccessMask = transitions[i]->dstAccess;
-		barrier->srcQueueFamilyIndex = transitions[i]->srcQueueFamily;
-		barrier->dstQueueFamilyIndex = transitions[i]->dstQueueFamily;
-		barrier->buffer = transitions[i]->buffer->buffer;
-		barrier->offset = transitions[i]->offset;
-		barrier->size = transitions[i]->size;
+		barrierset->a[i].sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER;
+		barrierset->a[i].pNext = 0;
+		barrierset->a[i].srcAccessMask = transitions[i].srcAccess;
+		barrierset->a[i].dstAccessMask = transitions[i].dstAccess;
+		barrierset->a[i].srcQueueFamilyIndex = transitions[i].srcQueueFamily;
+		barrierset->a[i].dstQueueFamilyIndex = transitions[i].dstQueueFamily;
+		barrierset->a[i].buffer = transitions[i].buffer;
+		barrierset->a[i].offset = transitions[i].offset;
+		barrierset->a[i].size = transitions[i].size;
 	}
 	return barrierset;
 }
 
-qfv_bufferview_t *
-QFV_CreateBufferView (qfv_buffer_t *buffer, VkFormat format,
+VkBufferView
+QFV_CreateBufferView (qfv_device_t *device, VkBuffer buffer, VkFormat format,
 					  VkDeviceSize offset, VkDeviceSize size)
 {
-	qfv_device_t *device = buffer->device;
 	VkDevice    dev = device->dev;
     qfv_devfuncs_t *dfunc = device->funcs;
 
 	VkBufferViewCreateInfo createInfo = {
 		VK_STRUCTURE_TYPE_BUFFER_VIEW_CREATE_INFO, 0,
 		0,
-		buffer->buffer, format, offset, size,
+		buffer, format, offset, size,
 	};
 
-	qfv_bufferview_t *view = malloc (sizeof (*view));
-	view->device = device;
-	view->buffer = buffer;
-	view->format = format;
-	view->offset = offset;
-	view->size = size;
-	dfunc->vkCreateBufferView (dev, &createInfo, 0, &view->view);
+	VkBufferView view;
+	dfunc->vkCreateBufferView (dev, &createInfo, 0, &view);
 	return view;
 }
-
-void
-QFV_DestroyBufferView (qfv_bufferview_t *view)
-{
-	qfv_device_t *device = view->device;
-	VkDevice    dev = device->dev;
-    qfv_devfuncs_t *dfunc = device->funcs;
-
-	dfunc->vkDestroyBufferView (dev, view->view, 0);
-	free (view);
-}
-
-void
-QFV_DestroyBuffer (qfv_buffer_t *buffer)
-{
-	qfv_device_t *device = buffer->device;
-	VkDevice    dev = device->dev;
-    qfv_devfuncs_t *dfunc = device->funcs;
-
-	dfunc->vkDestroyBuffer (dev, buffer->buffer, 0);
-	free (buffer);
-}
diff --git a/libs/video/renderer/vulkan/command.c b/libs/video/renderer/vulkan/command.c
index fa671fa5d..8ba60ab32 100644
--- a/libs/video/renderer/vulkan/command.c
+++ b/libs/video/renderer/vulkan/command.c
@@ -64,7 +64,7 @@
 
 #include "util.h"
 
-qfv_cmdpool_t *
+VkCommandPool
 QFV_CreateCommandPool (qfv_device_t *device, uint32_t queueFamily,
 					   int transient, int reset)
 {
@@ -82,43 +82,15 @@ QFV_CreateCommandPool (qfv_device_t *device, uint32_t queueFamily,
 		flags,
 		queueFamily
 	};
-	qfv_cmdpool_t *cmdpool = malloc (sizeof (*cmdpool));
-	dfunc->vkCreateCommandPool (dev, &createInfo, 0, &cmdpool->cmdpool);
-	cmdpool->device = device;
-	return cmdpool;
-}
-
-int
-QFV_ResetCommandPool (qfv_cmdpool_t *pool, int release)
-{
-	qfv_device_t *device = pool->device;
-	VkDevice    dev = device->dev;
-	qfv_devfuncs_t *dfunc = device->funcs;
-	VkCommandPool cmdpool = pool->cmdpool;
-	VkCommandPoolResetFlags release_flag = 0;
-
-	if (release) {
-		release_flag = VK_COMMAND_POOL_RESET_RELEASE_RESOURCES_BIT;
-	}
-
-	return dfunc->vkResetCommandPool (dev, cmdpool, release_flag) == VK_SUCCESS;
-}
-
-void
-QFV_DestroyCommandPool (qfv_cmdpool_t *pool)
-{
-	qfv_device_t *device = pool->device;
-	VkDevice    dev = device->dev;
-	qfv_devfuncs_t *dfunc = device->funcs;
-
-	dfunc->vkDestroyCommandPool (dev, pool->cmdpool, 0);
-	free (pool);
+	VkCommandPool pool;
+	dfunc->vkCreateCommandPool (dev, &createInfo, 0, &pool);
+	return pool;
 }
 
 qfv_cmdbufferset_t *
-QFV_AllocateCommandBuffers (qfv_cmdpool_t *pool, int secondary, int count)
+QFV_AllocateCommandBuffers (qfv_device_t *device, VkCommandPool pool,
+							int secondary, int count)
 {
-	qfv_device_t *device = pool->device;
 	VkDevice    dev = device->dev;
 	qfv_devfuncs_t *dfunc = device->funcs;
 	uint32_t    level = VK_COMMAND_BUFFER_LEVEL_PRIMARY;
@@ -127,96 +99,15 @@ QFV_AllocateCommandBuffers (qfv_cmdpool_t *pool, int secondary, int count)
 	}
 	VkCommandBufferAllocateInfo allocInfo = {
 		VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, 0,
-		pool->cmdpool, level, count
+		pool, level, count
 	};
 	qfv_cmdbufferset_t *cmdbufferset;
-	cmdbufferset = malloc (sizeof (qfv_cmdbufferset_t)
-						   + count * sizeof (qfv_buffer_t *)
-						   + count * sizeof (qfv_buffer_t)
-						   + count * sizeof (VkCommandBuffer));
-	cmdbufferset->buffers = (qfv_cmdbuffer_t **) (cmdbufferset + 1);
-	cmdbufferset->vkBuffers = (VkCommandBuffer *) (cmdbufferset->buffers
-												   + count);
-	qfv_cmdbuffer_t *buffer = (qfv_cmdbuffer_t *) (cmdbufferset->vkBuffers
-												   + count);
-	cmdbufferset->cmdpool = pool->cmdpool;
-	cmdbufferset->numBuffers = count;
-	dfunc->vkAllocateCommandBuffers (dev, &allocInfo, cmdbufferset->vkBuffers);
-	for (int i = 0; i < count; i++) {
-		buffer->device = device;
-		buffer->buffer = &cmdbufferset->vkBuffers[i];
-		cmdbufferset->buffers[i] = buffer++;
-	}
+	cmdbufferset = DARRAY_ALLOCFIXED (*cmdbufferset, count, malloc);
+	dfunc->vkAllocateCommandBuffers (dev, &allocInfo, cmdbufferset->a);
 	return cmdbufferset;
 }
 
-void QFV_FreeCommandBuffers (qfv_cmdbufferset_t *bufferset)
-{
-	qfv_device_t *device = bufferset->device;
-	VkDevice    dev = device->dev;
-	qfv_devfuncs_t *dfunc = device->funcs;
-
-	dfunc->vkFreeCommandBuffers (dev, bufferset->cmdpool,
-								 bufferset->numBuffers,
-								 bufferset->vkBuffers);
-	free (bufferset);
-}
-
-int
-QFV_BeginCommandBuffer (qfv_cmdbuffer_t *buffer, int oneTime, int rpContinue,
-						int simultaneous,
-						VkCommandBufferInheritanceInfo *inheritanceInfo)
-{
-	qfv_device_t *device = buffer->device;
-	qfv_devfuncs_t *dfunc = device->funcs;
-	VkCommandBuffer buff = *buffer->buffer;
-	VkCommandBufferUsageFlags usage = 0;
-
-	if (oneTime) {
-		usage |= VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT;
-	}
-	if (rpContinue) {
-		usage |= VK_COMMAND_BUFFER_USAGE_RENDER_PASS_CONTINUE_BIT;
-	}
-	if (simultaneous) {
-		usage |= VK_COMMAND_BUFFER_USAGE_SIMULTANEOUS_USE_BIT;
-	}
-
-	VkCommandBufferBeginInfo beginInfo = {
-		VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, 0,
-		usage,
-		0
-	};
-
-	return dfunc->vkBeginCommandBuffer (buff, &beginInfo) == VK_SUCCESS;
-}
-
-int
-QFV_EndCommandBuffer (qfv_cmdbuffer_t *buffer)
-{
-	qfv_device_t *device = buffer->device;
-	qfv_devfuncs_t *dfunc = device->funcs;
-	VkCommandBuffer buff = *buffer->buffer;
-
-	return dfunc->vkEndCommandBuffer (buff) == VK_SUCCESS;
-}
-
-int
-QFV_ResetCommandBuffer (qfv_cmdbuffer_t *buffer, int release)
-{
-	qfv_device_t *device = buffer->device;
-	qfv_devfuncs_t *dfunc = device->funcs;
-	VkCommandBuffer buff = *buffer->buffer;
-	VkCommandBufferResetFlags release_flag = 0;
-
-	if (release) {
-		release_flag = VK_COMMAND_BUFFER_RESET_RELEASE_RESOURCES_BIT;
-	}
-
-	return dfunc->vkResetCommandBuffer (buff, release_flag) == VK_SUCCESS;
-}
-
-qfv_semaphore_t *
+VkSemaphore
 QFV_CreateSemaphore (qfv_device_t *device)
 {
 	VkDevice    dev = device->dev;
@@ -227,58 +118,12 @@ QFV_CreateSemaphore (qfv_device_t *device)
 		0
 	};
 
-	qfv_semaphore_t *semaphore = malloc (sizeof (*semaphore));
-	semaphore->device = device;
-
-	dfunc->vkCreateSemaphore (dev, &createInfo, 0, &semaphore->semaphore);
+	VkSemaphore semaphore;
+	dfunc->vkCreateSemaphore (dev, &createInfo, 0, &semaphore);
 	return semaphore;
 }
 
-qfv_semaphoreset_t *
-QFV_CreateSemaphoreSet (qfv_semaphore_t **semaphores, int numSemaphores)
-{
-	qfv_device_t *device = semaphores[0]->device;
-	qfv_semaphoreset_t *semaphoreset;
-	semaphoreset = calloc (1, sizeof (*semaphoreset)
-						   + sizeof (qfv_semaphore_t *) * numSemaphores
-						   + sizeof (VkSemaphore) * numSemaphores
-						   + sizeof (VkPipelineStageFlags) * numSemaphores);
-
-	semaphoreset->device = device;
-	semaphoreset->vkSemaphores = (VkSemaphore *) (semaphoreset + 1);
-	semaphoreset->stages = (VkPipelineStageFlags *)
-							&semaphoreset->vkSemaphores[numSemaphores];
-	semaphoreset->semaphores = (qfv_semaphore_t **) (semaphoreset->stages
-													 + numSemaphores);
-	semaphoreset->numSemaphores = numSemaphores;
-
-	if (semaphores) {
-		for (int i = 0; i < numSemaphores; i++) {
-			semaphoreset->semaphores[i] = semaphores[i];
-			semaphoreset->vkSemaphores[i] = semaphores[i]->semaphore;
-		}
-	}
-	return semaphoreset;
-}
-
-void
-QFV_DestroySemaphore (qfv_semaphore_t *semaphore)
-{
-	qfv_device_t *device = semaphore->device;
-	VkDevice    dev = device->dev;
-	qfv_devfuncs_t *dfunc = device->funcs;
-
-	dfunc->vkDestroySemaphore (dev, semaphore->semaphore, 0);
-	free (semaphore);
-}
-
-void
-QFV_DestroySemaphoreSet (qfv_semaphoreset_t *semaphores)
-{
-	free (semaphores);
-}
-
-qfv_fence_t *
+VkFence
 QFV_CreateFence (qfv_device_t *device, int signaled)
 {
 	VkDevice    dev = device->dev;
@@ -289,113 +134,28 @@ QFV_CreateFence (qfv_device_t *device, int signaled)
 		signaled ? VK_FENCE_CREATE_SIGNALED_BIT : 0,
 	};
 
-	qfv_fence_t *fence = malloc (sizeof (*fence));
-	fence->device = device;
-
-	dfunc->vkCreateFence (dev, &createInfo, 0, &fence->fence);
+	VkFence fence;
+	dfunc->vkCreateFence (dev, &createInfo, 0, &fence);
 	return fence;
 }
 
-qfv_fenceset_t *
-QFV_CreateFenceSet (qfv_fence_t **fences, int numFences)
-{
-	qfv_fenceset_t *fenceset = malloc (sizeof (*fenceset)
-									   + sizeof (qfv_fence_t) * numFences
-									   + sizeof (VkFence) * numFences);
-
-	fenceset->fences = (qfv_fence_t **) (fenceset + 1);
-	fenceset->vkFences = (VkFence *) (fenceset->fences + numFences);
-	fenceset->numFences = numFences;
-
-	if (fences) {
-		fenceset->device = fences[0]->device;
-		for (int i = 0; i < numFences; i++) {
-			fenceset->fences[i] = fences[i];
-			fenceset->vkFences[i] = fences[i]->fence;
-		}
-	}
-	return fenceset;
-}
-
-void
-QFV_DestroyFence (qfv_fence_t *fence)
-{
-	qfv_device_t *device = fence->device;
-	VkDevice    dev = device->dev;
-	qfv_devfuncs_t *dfunc = device->funcs;
-
-	dfunc->vkDestroyFence (dev, fence->fence, 0);
-	free (fence);
-}
-
-void
-QFV_DestroyFenceSet (qfv_fenceset_t *fenceset)
-{
-	free (fenceset);
-}
-
-int
-QFV_WaitForFences (qfv_fenceset_t *fenceset, int all, uint64_t timeout)
-{
-	qfv_device_t *device = fenceset->device;
-	VkDevice    dev = device->dev;
-	qfv_devfuncs_t *dfunc = device->funcs;
-
-	VkResult res = dfunc->vkWaitForFences (dev, fenceset->numFences,
-										   fenceset->vkFences, all, timeout);
-	return res == VK_SUCCESS;
-}
-
-int
-QFV_WaitForFence (qfv_fence_t *fence, uint64_t timeout)
-{
-	qfv_device_t *device = fence->device;
-	VkDevice    dev = device->dev;
-	qfv_devfuncs_t *dfunc = device->funcs;
-
-	VkResult res = dfunc->vkWaitForFences (dev, 1, &fence->fence, 1, timeout);
-	return res == VK_SUCCESS;
-}
-
-int
-QFV_ResetFences (qfv_fenceset_t *fenceset)
-{
-	qfv_device_t *device = fenceset->device;
-	VkDevice    dev = device->dev;
-	qfv_devfuncs_t *dfunc = device->funcs;
-
-	return dfunc->vkResetFences (dev, fenceset->numFences,
-								 fenceset->vkFences) == VK_SUCCESS;
-}
-
-int
-QFV_ResetFence (qfv_fence_t *fence)
-{
-	qfv_device_t *device = fence->device;
-	VkDevice    dev = device->dev;
-	qfv_devfuncs_t *dfunc = device->funcs;
-
-	return dfunc->vkResetFences (dev, 1, &fence->fence) == VK_SUCCESS;
-}
-
 int
 QFV_QueueSubmit (qfv_queue_t *queue, qfv_semaphoreset_t *waitSemaphores,
+				 VkPipelineStageFlags *stages,
 				 qfv_cmdbufferset_t *buffers,
-				 qfv_semaphoreset_t *signalSemaphores, qfv_fence_t *fence)
+				 qfv_semaphoreset_t *signalSemaphores, VkFence fence)
 {
 	qfv_device_t *device = queue->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
 	VkSubmitInfo submitInfo = {
 		VK_STRUCTURE_TYPE_SUBMIT_INFO, 0,
-		waitSemaphores->numSemaphores,
-		waitSemaphores->vkSemaphores, waitSemaphores->stages,
-		buffers->numBuffers, buffers->vkBuffers,
-		signalSemaphores->numSemaphores,
-		signalSemaphores->vkSemaphores
+		waitSemaphores->size, waitSemaphores->a, stages,
+		buffers->size, buffers->a,
+		signalSemaphores->size, signalSemaphores->a
 	};
 	//FIXME multi-batch
-	return dfunc->vkQueueSubmit (queue->queue, 1, &submitInfo,
-								 fence->fence) == VK_SUCCESS;
+	return dfunc->vkQueueSubmit (queue->queue, 1, &submitInfo, fence)
+			== VK_SUCCESS;
 }
 
 int
@@ -405,129 +165,3 @@ QFV_QueueWaitIdle (qfv_queue_t *queue)
 	qfv_devfuncs_t *dfunc = device->funcs;
 	return dfunc->vkQueueWaitIdle (queue->queue) == VK_SUCCESS;
 }
-
-void
-QFV_CmdPipelineBarrier (qfv_cmdbuffer_t *cmdBuffer,
-						VkPipelineStageFlags srcStageMask,
-						VkPipelineStageFlags dstStageMask,
-						VkDependencyFlags dependencyFlags,
-						struct qfv_memorybarrierset_s *memBarrierSet,
-						qfv_bufferbarrierset_t *buffBarrierSet,
-						qfv_imagebarrierset_t *imgBarrierSet)
-{
-	qfv_device_t *device = cmdBuffer->device;
-	qfv_devfuncs_t *dfunc = device->funcs;
-	uint32_t    numMemBarriers = 0;
-	VkMemoryBarrier *memBarriers = 0;
-	uint32_t    numBuffBarriers = 0;
-	VkBufferMemoryBarrier *buffBarriers = 0;
-	uint32_t    numImgBarriers = 0;
-	VkImageMemoryBarrier *imgBarriers = 0;
-
-	if (buffBarrierSet) {
-		numBuffBarriers = buffBarrierSet->numBarriers;
-		buffBarriers = buffBarrierSet->barriers;
-	}
-	if (imgBarrierSet) {
-		numImgBarriers = imgBarrierSet->numBarriers;
-		imgBarriers = imgBarrierSet->barriers;
-	}
-	dfunc->vkCmdPipelineBarrier (*cmdBuffer->buffer,
-								 srcStageMask, dstStageMask, dependencyFlags,
-								 numMemBarriers, memBarriers,
-								 numBuffBarriers, buffBarriers,
-								 numImgBarriers, imgBarriers);
-}
-
-void
-QFV_CmdCopyBuffer (qfv_cmdbuffer_t *cmdBuffer,
-				   struct qfv_buffer_s *src, struct qfv_buffer_s *dst,
-				   VkBufferCopy *regions, uint32_t numRegions)
-{
-	qfv_device_t *device = cmdBuffer->device;
-	qfv_devfuncs_t *dfunc = device->funcs;
-
-	dfunc->vkCmdCopyBuffer (*cmdBuffer->buffer, src->buffer, dst->buffer,
-							numRegions, regions);
-}
-
-void
-QFV_CmdCopyBufferToImage (qfv_cmdbuffer_t *cmdBuffer,
-						  struct qfv_buffer_s *src,
-						  struct qfv_image_s *dst,
-						  VkImageLayout layout,
-						  VkBufferImageCopy *regions, uint32_t numRegions)
-{
-	qfv_device_t *device = cmdBuffer->device;
-	qfv_devfuncs_t *dfunc = device->funcs;
-
-	dfunc->vkCmdCopyBufferToImage (*cmdBuffer->buffer, src->buffer, dst->image,
-								   layout, numRegions, regions);
-}
-
-void
-QFV_CmdCopyImageToBuffer (qfv_cmdbuffer_t *cmdBuffer,
-						  struct qfv_image_s *src,
-						  VkImageLayout layout,
-						  struct qfv_buffer_s *dst,
-						  VkBufferImageCopy *regions, uint32_t numRegions)
-{
-	qfv_device_t *device = cmdBuffer->device;
-	qfv_devfuncs_t *dfunc = device->funcs;
-
-	dfunc->vkCmdCopyImageToBuffer (*cmdBuffer->buffer, src->image, layout,
-								   dst->buffer, numRegions, regions);
-}
-
-void
-QFV_CmdBeginRenderPass (qfv_cmdbuffer_t *cmdBuffer,
-						qfv_renderpass_t *renderPass,
-						qfv_framebuffer_t *framebuffer,
-						VkRect2D renderArea,
-						uint32_t numClearValues,
-						VkClearValue *clearValues,
-						VkSubpassContents subpassContents)
-{
-	qfv_device_t *device = cmdBuffer->device;
-	qfv_devfuncs_t *dfunc = device->funcs;
-
-	VkRenderPassBeginInfo beginInfo = {
-		VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO, 0,
-		renderPass->renderPass, framebuffer->framebuffer, renderArea,
-		numClearValues, clearValues,
-	};
-
-	dfunc->vkCmdBeginRenderPass (*cmdBuffer->buffer, &beginInfo,
-								 subpassContents);
-}
-
-void
-QFV_CmdNextSubpass (qfv_cmdbuffer_t *cmdBuffer,
-					VkSubpassContents subpassContents)
-{
-	qfv_device_t *device = cmdBuffer->device;
-	qfv_devfuncs_t *dfunc = device->funcs;
-
-	dfunc->vkCmdNextSubpass (*cmdBuffer->buffer, subpassContents);
-}
-
-void
-QFV_CmdEndRenderPass (qfv_cmdbuffer_t *cmdBuffer)
-{
-	qfv_device_t *device = cmdBuffer->device;
-	qfv_devfuncs_t *dfunc = device->funcs;
-
-	dfunc->vkCmdEndRenderPass (*cmdBuffer->buffer);
-}
-
-void
-QFV_CmdBindPipeline (qfv_cmdbuffer_t *cmdBuffer,
-					 VkPipelineBindPoint bindPoint,
-					 qfv_pipeline_t *pipeline)
-{
-	qfv_device_t *device = cmdBuffer->device;
-	qfv_devfuncs_t *dfunc = device->funcs;
-
-	dfunc->vkCmdBindPipeline (*cmdBuffer->buffer, bindPoint,
-							  pipeline->pipeline);
-}
diff --git a/libs/video/renderer/vulkan/device.c b/libs/video/renderer/vulkan/device.c
index 750534f53..0457d0570 100644
--- a/libs/video/renderer/vulkan/device.c
+++ b/libs/video/renderer/vulkan/device.c
@@ -211,3 +211,24 @@ QFV_DeviceWaitIdle (qfv_device_t *device)
 	qfv_devfuncs_t *dfunc = device->funcs;
 	return dfunc->vkDeviceWaitIdle (device->dev) == VK_SUCCESS;
 }
+
+VkFormat
+QFV_FindSupportedFormat (qfv_device_t *device,
+						 VkImageTiling tiling, VkFormatFeatureFlags features,
+						 int numCandidates, const VkFormat *candidates)
+{
+	VkPhysicalDevice pdev = device->physDev->dev;
+	qfv_instfuncs_t *ifuncs = device->physDev->instance->funcs;
+	for (int i = 0; i < numCandidates; i++) {
+		VkFormat    format = candidates[i];
+		VkFormatProperties props;
+		ifuncs->vkGetPhysicalDeviceFormatProperties (pdev, format, &props);
+		if ((tiling == VK_IMAGE_TILING_LINEAR
+			 && (props.linearTilingFeatures & features) == features)
+			|| (tiling == VK_IMAGE_TILING_OPTIMAL
+				&& (props.optimalTilingFeatures & features) == features)) {
+			return format;
+		}
+	}
+	Sys_Error ("no supported format");
+}
diff --git a/libs/video/renderer/vulkan/image.c b/libs/video/renderer/vulkan/image.c
index 63b836be5..65f0dcdd3 100644
--- a/libs/video/renderer/vulkan/image.c
+++ b/libs/video/renderer/vulkan/image.c
@@ -61,7 +61,7 @@
 
 #include "util.h"
 
-qfv_image_t *
+VkImage
 QFV_CreateImage (qfv_device_t *device, int cubemap,
 				 VkImageType type,
 				 VkFormat format,
@@ -85,24 +85,23 @@ QFV_CreateImage (qfv_device_t *device, int cubemap,
 		0, 0,
 		VK_IMAGE_LAYOUT_UNDEFINED,
 	};
-	qfv_image_t *image = malloc (sizeof (*image));
-	dfunc->vkCreateImage (dev, &createInfo, 0, &image->image);
-	image->device = device;
+	VkImage image;
+	dfunc->vkCreateImage (dev, &createInfo, 0, &image);
 	return image;
 }
 
-qfv_memory_t *
-QFV_AllocImageMemory (qfv_image_t *image, VkMemoryPropertyFlags properties,
-					   VkDeviceSize size, VkDeviceSize offset)
+VkDeviceMemory
+QFV_AllocImageMemory (qfv_device_t *device,
+					  VkImage image, VkMemoryPropertyFlags properties,
+					  VkDeviceSize size, VkDeviceSize offset)
 {
-	qfv_device_t *device = image->device;
 	VkDevice    dev = device->dev;
 	qfv_physdev_t *physdev = device->physDev;
 	VkPhysicalDeviceMemoryProperties *memprops = &physdev->memory_properties;
     qfv_devfuncs_t *dfunc = device->funcs;
 
 	VkMemoryRequirements requirements;
-	dfunc->vkGetImageMemoryRequirements (dev, image->image, &requirements);
+	dfunc->vkGetImageMemoryRequirements (dev, image, &requirements);
 
 	size = max (size, offset + requirements.size);
 	VkDeviceMemory object = 0;
@@ -124,72 +123,48 @@ QFV_AllocImageMemory (qfv_image_t *image, VkMemoryPropertyFlags properties,
 		}
 	}
 
-	qfv_memory_t *memory = 0;
-
-	if (object) {
-		memory = malloc (sizeof (*memory));
-		memory->device = device;
-		memory->object = object;
-	}
-	return memory;
-}
-
-int
-QFV_BindImageMemory (qfv_image_t *image, qfv_memory_t *memory,
-					  VkDeviceSize offset)
-{
-	qfv_device_t *device = image->device;
-	VkDevice    dev = device->dev;
-    qfv_devfuncs_t *dfunc = device->funcs;
-	VkResult res = dfunc->vkBindImageMemory (dev, image->image,
-											  memory->object, offset);
-	return res == VK_SUCCESS;
+	return object;
 }
 
 qfv_imagebarrierset_t *
-QFV_CreateImageTransitionSet (qfv_imagetransition_t **transitions,
+QFV_CreateImageTransitionSet (qfv_imagetransition_t *transitions,
 							   int numTransitions)
 {
-	qfv_device_t *device = transitions[0]->image->device;
-	qfv_imagebarrierset_t *barrierset = malloc (sizeof (*barrierset)
-									   + sizeof (VkImageMemoryBarrier) * numTransitions);
-
-	barrierset->device = device;
-	barrierset->numBarriers = numTransitions;
-	barrierset->barriers = (VkImageMemoryBarrier *) (barrierset + 1);
+	qfv_imagebarrierset_t *barrierset;
+    barrierset = DARRAY_ALLOCFIXED (*barrierset, numTransitions, malloc);
 
 	for (int i = 0; i < numTransitions; i++) {
-		VkImageMemoryBarrier *barrier = &barrierset->barriers[i];
-		barrier->sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER;
-		barrier->pNext = 0;
-		barrier->srcAccessMask = transitions[i]->srcAccess;
-		barrier->dstAccessMask = transitions[i]->dstAccess;
-		barrier->oldLayout = transitions[i]->oldLayout;
-		barrier->newLayout = transitions[i]->newLayout;
-		barrier->srcQueueFamilyIndex = transitions[i]->srcQueueFamily;
-		barrier->dstQueueFamilyIndex = transitions[i]->dstQueueFamily;
-		barrier->image = transitions[i]->image->image;
-		barrier->subresourceRange.aspectMask = transitions[i]->aspect;
-		barrier->subresourceRange.baseMipLevel = 0;
-		barrier->subresourceRange.levelCount = VK_REMAINING_MIP_LEVELS;
-		barrier->subresourceRange.baseArrayLayer = 0;
-		barrier->subresourceRange.layerCount = VK_REMAINING_ARRAY_LAYERS;
+		barrierset->a[i].sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER;
+		barrierset->a[i].pNext = 0;
+		barrierset->a[i].srcAccessMask = transitions[i].srcAccess;
+		barrierset->a[i].dstAccessMask = transitions[i].dstAccess;
+		barrierset->a[i].oldLayout = transitions[i].oldLayout;
+		barrierset->a[i].newLayout = transitions[i].newLayout;
+		barrierset->a[i].srcQueueFamilyIndex = transitions[i].srcQueueFamily;
+		barrierset->a[i].dstQueueFamilyIndex = transitions[i].dstQueueFamily;
+		barrierset->a[i].image = transitions[i].image;
+		barrierset->a[i].subresourceRange.aspectMask = transitions[i].aspect;
+		barrierset->a[i].subresourceRange.baseMipLevel = 0;
+		barrierset->a[i].subresourceRange.levelCount = VK_REMAINING_MIP_LEVELS;
+		barrierset->a[i].subresourceRange.baseArrayLayer = 0;
+		barrierset->a[i].subresourceRange.layerCount
+			= VK_REMAINING_ARRAY_LAYERS;
 	}
 	return barrierset;
 }
 
-qfv_imageview_t *
-QFV_CreateImageView (qfv_image_t *image, VkImageViewType type, VkFormat format,
+VkImageView
+QFV_CreateImageView (qfv_device_t *device, VkImage image,
+					 VkImageViewType type, VkFormat format,
 					 VkImageAspectFlags aspect)
 {
-	qfv_device_t *device = image->device;
 	VkDevice    dev = device->dev;
     qfv_devfuncs_t *dfunc = device->funcs;
 
 	VkImageViewCreateInfo createInfo = {
 		VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO, 0,
 		0,
-		image->image, type, format,
+		image, type, format,
 		{
 			VK_COMPONENT_SWIZZLE_IDENTITY,
 			VK_COMPONENT_SWIZZLE_IDENTITY,
@@ -203,34 +178,7 @@ QFV_CreateImageView (qfv_image_t *image, VkImageViewType type, VkFormat format,
 		}
 	};
 
-	qfv_imageview_t *view = malloc (sizeof (*view));
-	view->device = device;
-	view->image = image;
-	view->type = type;
-	view->format = format;
-	view->aspect = aspect;
-	dfunc->vkCreateImageView (dev, &createInfo, 0, &view->view);
+	VkImageView view;
+	dfunc->vkCreateImageView (dev, &createInfo, 0, &view);
 	return view;
 }
-
-void
-QFV_DestroyImageView (qfv_imageview_t *view)
-{
-	qfv_device_t *device = view->device;
-	VkDevice    dev = device->dev;
-    qfv_devfuncs_t *dfunc = device->funcs;
-
-	dfunc->vkDestroyImageView (dev, view->view, 0);
-	free (view);
-}
-
-void
-QFV_DestroyImage (qfv_image_t *image)
-{
-	qfv_device_t *device = image->device;
-	VkDevice    dev = device->dev;
-    qfv_devfuncs_t *dfunc = device->funcs;
-
-	dfunc->vkDestroyImage (dev, image->image, 0);
-	free (image);
-}
diff --git a/libs/video/renderer/vulkan/instance.c b/libs/video/renderer/vulkan/instance.c
index a744c2608..234236014 100644
--- a/libs/video/renderer/vulkan/instance.c
+++ b/libs/video/renderer/vulkan/instance.c
@@ -264,7 +264,9 @@ QFV_CreateInstance (vulkan_ctx_t *ctx,
 	for (uint32_t i = 0; i < inst->numDevices; i++) {
 		VkPhysicalDevice physDev = devices[i];
 		qfv_physdev_t *dev = &inst->devices[i];
+		dev->instance = inst;
 		dev->dev = physDev;
+		ifunc->vkGetPhysicalDeviceProperties (physDev, &dev->properties);
 		ifunc->vkGetPhysicalDeviceMemoryProperties (physDev,
 													&dev->memory_properties);
 	}
diff --git a/libs/video/renderer/vulkan/memory.c b/libs/video/renderer/vulkan/memory.c
index c18a8144f..9397f4366 100644
--- a/libs/video/renderer/vulkan/memory.c
+++ b/libs/video/renderer/vulkan/memory.c
@@ -60,54 +60,32 @@
 
 #include "util.h"
 
-void
-QFV_FreeMemory (qfv_memory_t *memory)
-{
-	qfv_device_t *device = memory->device;
-	VkDevice    dev = device->dev;
-	qfv_devfuncs_t *dfunc = device->funcs;
-
-	dfunc->vkFreeMemory (dev, memory->object, 0);
-	free (memory);
-}
-
 void *
-QFV_MapMemory (qfv_memory_t *memory, VkDeviceSize offset, VkDeviceSize size)
+QFV_MapMemory (qfv_device_t *device, VkDeviceMemory object,
+			   VkDeviceSize offset, VkDeviceSize size)
 {
-	qfv_device_t *device = memory->device;
 	VkDevice    dev = device->dev;
 	qfv_devfuncs_t *dfunc = device->funcs;
 	void       *map = 0;
 
-	dfunc->vkMapMemory (dev, memory->object, offset, size, 0, &map);
+	dfunc->vkMapMemory (dev, object, offset, size, 0, &map);
 	return map;
 }
 
 void
-QFV_UnmapMemory (qfv_memory_t *memory)
+QFV_FlushMemory (qfv_device_t *device, qfv_mappedmemrangeset_t *flushRanges)
 {
-	qfv_device_t *device = memory->device;
 	VkDevice    dev = device->dev;
 	qfv_devfuncs_t *dfunc = device->funcs;
 
-	dfunc->vkUnmapMemory (dev, memory->object);
-}
+	VkMappedMemoryRange *ranges = alloca(sizeof (*ranges) * flushRanges->size);
 
-void
-QFV_FlushMemory (qfv_mappedmemrange_t *flushRanges, uint32_t numFlushRanges)
-{
-	qfv_device_t *device = flushRanges[0].memory->device;
-	VkDevice    dev = device->dev;
-	qfv_devfuncs_t *dfunc = device->funcs;
-
-	VkMappedMemoryRange *ranges = alloca(sizeof (*ranges) * numFlushRanges);
-
-	for (uint32_t i = 0; i < numFlushRanges; i++) {
+	for (uint32_t i = 0; i < flushRanges->size; i++) {
 		ranges[i].sType = VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE;
 		ranges[i].pNext = 0;
-		ranges[i].memory = flushRanges[i].memory->object;
-		ranges[i].offset = flushRanges[i].offset;
-		ranges[i].size = flushRanges[i].size;
+		ranges[i].memory = flushRanges->a[i].object;
+		ranges[i].offset = flushRanges->a[i].offset;
+		ranges[i].size = flushRanges->a[i].size;
 	}
-	dfunc->vkFlushMappedMemoryRanges (dev, numFlushRanges, ranges);
+	dfunc->vkFlushMappedMemoryRanges (dev, flushRanges->size, ranges);
 }
diff --git a/libs/video/renderer/vulkan/renderpass.c b/libs/video/renderer/vulkan/renderpass.c
index 9c1064192..7a64d10a3 100644
--- a/libs/video/renderer/vulkan/renderpass.c
+++ b/libs/video/renderer/vulkan/renderpass.c
@@ -105,21 +105,17 @@ QFV_CreateRenderPass (qfv_device_t *device,
 
 qfv_framebuffer_t *
 QFV_CreateFramebuffer (qfv_renderpass_t *renderPass,
-					   uint32_t numAttachments, qfv_imageview_t **attachments,
+					   uint32_t numAttachments, VkImageView *attachments,
 					   uint32_t width, uint32_t height, uint32_t layers)
 {
 	qfv_device_t *device = renderPass->device;
 	VkDevice    dev = device->dev;
 	qfv_devfuncs_t *dfunc = device->funcs;
 
-	VkImageView *views = alloca (numAttachments * sizeof (*views));
-	for (uint32_t i = 0; i < numAttachments; i++) {
-		views[i] = attachments[i]->view;
-	}
-
 	VkFramebufferCreateInfo createInfo = {
 		VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO, 0, 0,
-		renderPass->renderPass, numAttachments, views, width, height, layers,
+		renderPass->renderPass, numAttachments, attachments,
+		width, height, layers,
 	};
 
 	qfv_framebuffer_t *framebuffer = malloc (sizeof (*framebuffer));
diff --git a/libs/video/renderer/vulkan/swapchain.c b/libs/video/renderer/vulkan/swapchain.c
index b32e3b3ed..4ea0a36dc 100644
--- a/libs/video/renderer/vulkan/swapchain.c
+++ b/libs/video/renderer/vulkan/swapchain.c
@@ -13,6 +13,7 @@
 #include "QF/Vulkan/cvars.h"
 #include "QF/Vulkan/command.h"
 #include "QF/Vulkan/device.h"
+#include "QF/Vulkan/image.h"
 #include "QF/Vulkan/instance.h"
 #include "QF/Vulkan/swapchain.h"
 
@@ -84,7 +85,8 @@ QFV_CreateSwapchain (vulkan_ctx_t *ctx, VkSwapchainKHR old_swapchain)
 	VkImageUsageFlags imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT;
 	imageUsage &= surfCaps.supportedUsageFlags;
 
-	VkSurfaceTransformFlagBitsKHR surfTransform = VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR;
+	VkSurfaceTransformFlagBitsKHR surfTransform
+		= VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR;
 
 	uint32_t numFormats;
 	ifuncs->vkGetPhysicalDeviceSurfaceFormatsKHR (physDev,
@@ -128,24 +130,31 @@ QFV_CreateSwapchain (vulkan_ctx_t *ctx, VkSwapchainKHR old_swapchain)
 		old_swapchain
 	};
 
-	VkDevice device = ctx->device->dev;
+	VkDevice dev = ctx->device->dev;
 	VkSwapchainKHR swapchain;
-	dfuncs->vkCreateSwapchainKHR (device, &createInfo, 0, &swapchain);
+	dfuncs->vkCreateSwapchainKHR (dev, &createInfo, 0, &swapchain);
 
 	if (old_swapchain != swapchain) {
-		dfuncs->vkDestroySwapchainKHR (device, old_swapchain, 0);
+		dfuncs->vkDestroySwapchainKHR (dev, old_swapchain, 0);
 	}
 
-	dfuncs->vkGetSwapchainImagesKHR (device, swapchain, &numImages, 0);
-	qfv_swapchain_t *sc = malloc (sizeof (qfv_swapchain_t)
-								  + numImages * sizeof (VkImage));
+	dfuncs->vkGetSwapchainImagesKHR (dev, swapchain, &numImages, 0);
+	qfv_swapchain_t *sc = malloc (sizeof (qfv_swapchain_t));
 	sc->device = ctx->device;
 	sc->surface = ctx->surface;
 	sc->swapchain = swapchain;
+	sc->format = useFormat.format;
+	sc->extent = imageSize;
 	sc->numImages = numImages;
-	sc->images = (VkImage *) (sc + 1);
-	dfuncs->vkGetSwapchainImagesKHR (device, swapchain, &numImages,
-									 sc->images);
+	sc->images = DARRAY_ALLOCFIXED (qfv_imageset_t, numImages, malloc);
+	sc->imageViews = DARRAY_ALLOCFIXED (qfv_imageviewset_t, numImages, malloc);
+	dfuncs->vkGetSwapchainImagesKHR (dev, swapchain, &numImages, sc->images->a);
+	for (uint32_t i = 0; i < numImages; i++) {
+		sc->imageViews->a[i]
+			= QFV_CreateImageView (ctx->device, sc->images->a[i],
+								   VK_IMAGE_VIEW_TYPE_2D, sc->format,
+								   VK_IMAGE_ASPECT_COLOR_BIT);
+	}
 	return sc;
 }
 
@@ -155,23 +164,26 @@ QFV_DestroySwapchain (qfv_swapchain_t *swapchain)
 	qfv_device_t *device = swapchain->device;
 	VkDevice dev = device->dev;
 	qfv_devfuncs_t *dfunc = device->funcs;
+	for (size_t i = 0; i < swapchain->imageViews->size; i++) {
+		dfunc->vkDestroyImageView (dev, swapchain->imageViews->a[i], 0);
+	}
+	free (swapchain->images);
+	free (swapchain->imageViews);
 	dfunc->vkDestroySwapchainKHR (dev, swapchain->swapchain, 0);
 	free (swapchain);
 }
 
 int
-QFV_AcquireNextImage (qfv_swapchain_t *swapchain, qfv_semaphore_t *semaphore,
-					  qfv_fence_t *fence, uint32_t *imageIndex)
+QFV_AcquireNextImage (qfv_swapchain_t *swapchain, VkSemaphore semaphore,
+					  VkFence fence, uint32_t *imageIndex)
 {
 	qfv_device_t *device = swapchain->device;
 	VkDevice dev = device->dev;
 	qfv_devfuncs_t *dfunc = device->funcs;
 	uint64_t timeout = 2000000000;
-	VkSemaphore sem = semaphore ? semaphore->semaphore : VK_NULL_HANDLE;
-	VkFence fnc = fence ? fence->fence : VK_NULL_HANDLE;
 	*imageIndex = ~0u;
 	VkResult res = dfunc->vkAcquireNextImageKHR (dev, swapchain->swapchain,
-												 timeout, sem, fnc,
+												 timeout, semaphore, fence,
 												 imageIndex);
 	switch (res) {
 		case VK_SUCCESS:

From 73fde40cad512c8b6842791ea4aa0a3c017fadd6 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 17 Feb 2020 23:30:25 +0900
Subject: [PATCH 0416/1519] Sanitize some more structs

---
 include/QF/Vulkan/pipeline.h            | 29 +++++------
 include/QF/Vulkan/renderpass.h          | 56 +++++++--------------
 libs/video/renderer/vulkan/pipeline.c   | 18 +++----
 libs/video/renderer/vulkan/renderpass.c | 67 ++++++++-----------------
 4 files changed, 62 insertions(+), 108 deletions(-)

diff --git a/include/QF/Vulkan/pipeline.h b/include/QF/Vulkan/pipeline.h
index 6a532102b..2120e2317 100644
--- a/include/QF/Vulkan/pipeline.h
+++ b/include/QF/Vulkan/pipeline.h
@@ -1,6 +1,8 @@
 #ifndef __QF_Vulkan_pipeline_h
 #define __QF_Vulkan_pipeline_h
 
+#include "QF/darray.h"
+
 typedef struct qfv_shadermodule_s {
 	struct qfv_device_s *device;
 	VkShaderModule module;
@@ -13,29 +15,24 @@ typedef struct qfv_shaderstageparams_s {
 	const VkSpecializationInfo *specializationInfo;
 } qfv_shaderstageparams_t;
 
-typedef struct qfv_shaderstageparamsset_s {
-	uint32_t    numParams;
-	qfv_shaderstageparams_t params[];
-} qfv_shaderstageparamsset_t;
+typedef struct qfv_shaderstageparamsset_s
+	DARRAY_TYPE (qfv_shaderstageparams_t) qfv_shaderstageparamsset_t;
 
 #define QFV_AllocShaderParamsSet(num, allocator) \
-    allocator (field_offset (qfv_shaderstageparamsset_t, params[num]))
+	DARRAY_ALLOCFIXED (qfv_shaderstageparamsset_t, num, allocator)
 
-typedef struct qfv_vertexinputbindingset_s {
-	uint32_t    numBindings;
-	VkVertexInputBindingDescription bindings[];
-} qfv_vertexinputbindingset_t;
+typedef struct qfv_vertexinputbindingset_s
+	DARRAY_TYPE (VkVertexInputBindingDescription)  qfv_vertexinputbindingset_t;
 
 #define QFV_AllocVertexInputBindingSet(num, allocator) \
-    allocator (field_offset (qfv_vertexinputbindingset_t, bindings[num]))
+	DARRAY_ALLOCFIXED (qfv_vertexinputbindingset_t, num, allocator)
 
-typedef struct qfv_vertexinputattributeset_s {
-	uint32_t    numAttributes;
-	VkVertexInputAttributeDescription attributes[];
-} qfv_vertexinputattributeset_t;
+typedef struct qfv_vertexinputattributeset_s
+	DARRAY_TYPE (VkVertexInputAttributeDescription)
+		qfv_vertexinputattributeset_t;
 
 #define QFV_AllocVertexInputAttributeSet(num, allocator) \
-    allocator (field_offset (qfv_vertexinputattributeset_t, bindings[num]))
+	DARRAY_ALLOCFIXED (qfv_vertexinputattributeset_t, num, allocator)
 
 typedef struct qfv_vertexinputstate_s {
 	qfv_vertexinputbindingset_t *bindings;
@@ -168,7 +165,7 @@ typedef struct qfv_graphicspipelinecreateinfo_s {
 	qfv_pipelineblend_t *colorBlendState;
 	qfv_dynamicstateset_t *dynamicState;
 	qfv_pipelinelayout_t *layout;
-	struct qfv_renderpass_s *renderPass;
+	VkRenderPass renderPass;
 	uint32_t    subpass;
 	qfv_pipeline_t *basePipeline;
 	int32_t     basePipelineIndex;
diff --git a/include/QF/Vulkan/renderpass.h b/include/QF/Vulkan/renderpass.h
index 3dd4acc63..257441ca1 100644
--- a/include/QF/Vulkan/renderpass.h
+++ b/include/QF/Vulkan/renderpass.h
@@ -1,21 +1,19 @@
 #ifndef __QF_Vulkan_renderpass_h
 #define __QF_Vulkan_renderpass_h
 
-typedef struct qfv_attachmentdescription_s {
-	uint32_t    numAttachments;
-	VkAttachmentDescription attachments[];
-} qfv_attachmentdescription_t;
+#include "QF/darray.h"
+
+typedef struct qfv_attachmentdescription_s
+	DARRAY_TYPE (VkAttachmentDescription) qfv_attachmentdescription_t;
 
 #define QFV_AllocAttachmentDescription(num, allocator) \
-	allocator (field_offset (qfv_attachmentdescription_t, attachments[num]))
+	DARRAY_ALLOCFIXED (qfv_attachmentdescription_t, num, allocator)
 
-typedef struct qfv_attachmentreference_s {
-	uint32_t    numReferences;
-	VkAttachmentReference references[];
-} qfv_attachmentreference_t;
+typedef struct qfv_attachmentreference_s
+	DARRAY_TYPE (VkAttachmentReference) qfv_attachmentreference_t;
 
 #define QFV_AllocAttachmentReference(num, allocator) \
-	allocator (field_offset (qfv_attachmentreference_t, references[num]))
+	DARRAY_ALLOCFIXED (qfv_attachmentreference_t, num, allocator)
 
 typedef struct qfv_subpassparameters_s {
 	VkPipelineBindPoint pipelineBindPoint;
@@ -27,46 +25,30 @@ typedef struct qfv_subpassparameters_s {
 	uint32_t   *preserveAttachments;
 } qfv_subpassparameters_t;
 
-typedef struct qfv_subpassparametersset_s {
-	uint32_t    numSubpasses;
-	qfv_subpassparameters_t subpasses[];
-} qfv_subpassparametersset_t;
+typedef struct qfv_subpassparametersset_s
+	DARRAY_TYPE (qfv_subpassparameters_t) qfv_subpassparametersset_t;
 
 #define QFV_AllocSubpassParametersSet(num, allocator) \
-	allocator (field_offset (qfv_subpassparametersset_t, subpasses[num]))
+	DARRAY_ALLOCFIXED (qfv_subpassparametersset_t, num, allocator)
 
-typedef struct qfv_subpassdependency_s {
-	uint32_t    numDependencies;
-	VkSubpassDependency dependencies[];
-} qfv_subpassdependency_t;
+typedef struct qfv_subpassdependency_s
+	DARRAY_TYPE (VkSubpassDependency) qfv_subpassdependency_t;
 
 #define QFV_AllocSubpassDependencies(num, allocator) \
-	allocator (field_offset (qfv_subpassdependency_t, dependencies[num]))
+	DARRAY_ALLOCFIXED (qfv_subpassdependency_t, num, allocator)
 
-typedef struct qfv_renderpass_s {
-	struct qfv_device_s *device;
-	VkRenderPass renderPass;
-} qfv_renderpass_t;
-
-typedef struct qfv_framebuffer_s {
-	struct qfv_device_s *device;
-	VkFramebuffer framebuffer;
-} qfv_framebuffer_t;
-
-qfv_renderpass_t *
+struct qfv_device_s;
+VkRenderPass
 QFV_CreateRenderPass (struct qfv_device_s *device,
 					  qfv_attachmentdescription_t *attachments,
 					  qfv_subpassparametersset_t *subpasses,
 					  qfv_subpassdependency_t *dependencies);
 
-struct qfv_imageview_s;
-qfv_framebuffer_t *
-QFV_CreateFramebuffer (qfv_renderpass_t *renderPass,
+VkFramebuffer
+QFV_CreateFramebuffer (struct qfv_device_s *device,
+					   VkRenderPass renderPass,
 					   uint32_t numAttachments,
 					   VkImageView *attachments,
 					   uint32_t width, uint32_t height, uint32_t layers);
 
-void QFV_DestroyFramebuffer (qfv_framebuffer_t *framebuffer);
-void QFV_DestroyRenderPass (qfv_renderpass_t *renderPass);
-
 #endif//__QF_Vulkan_renderpass_h
diff --git a/libs/video/renderer/vulkan/pipeline.c b/libs/video/renderer/vulkan/pipeline.c
index 168ec100d..0dd5f260e 100644
--- a/libs/video/renderer/vulkan/pipeline.c
+++ b/libs/video/renderer/vulkan/pipeline.c
@@ -205,10 +205,10 @@ vertexInputSCI (qfv_vertexinputstate_t vertexState)
 {
 	VkPipelineVertexInputStateCreateInfo createInfo = {
 		VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO, 0, 0,
-		vertexState.bindings->numBindings,
-		vertexState.bindings->bindings,
-		vertexState.attributes->numAttributes,
-		vertexState.attributes->attributes,
+		vertexState.bindings->size,
+		vertexState.bindings->a,
+		vertexState.attributes->size,
+		vertexState.attributes->a,
 	};
 	return createInfo;
 }
@@ -339,7 +339,7 @@ QFV_CreateGraphicsPipelines (qfv_device_t *device,
 	uint32_t numPipelines = gpciSet->numPipelines;
 	uint32_t stageCount = 0;
 	for (uint32_t i = 0; i < numPipelines; i++) {
-		stageCount += gpciSet->pipelines[i]->stages->numParams;
+		stageCount += gpciSet->pipelines[i]->stages->size;
 	}
 
 	size_t blockSize = numPipelines
@@ -377,7 +377,7 @@ QFV_CreateGraphicsPipelines (qfv_device_t *device,
 		= (void *)(pipelineInfos->pColorBlendState + numPipelines);
 	for (uint32_t i = 1; i < gpciSet->numPipelines; i++) {
 		pipelineInfos[i].pStages = pipelineInfos[i - 1].pStages
-			+ gpciSet->pipelines[i - 1]->stages->numParams;
+			+ gpciSet->pipelines[i - 1]->stages->size;
 		pipelineInfos[i].pVertexInputState
 			= pipelineInfos[i - 1].pVertexInputState + 1;
 		pipelineInfos[i].pInputAssemblyState
@@ -403,9 +403,9 @@ QFV_CreateGraphicsPipelines (qfv_device_t *device,
 		gci->sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO;
 		gci->pNext = 0;
 		gci->flags = ci->flags;
-		gci->stageCount = ci->stages->numParams;
+		gci->stageCount = ci->stages->size;
 		for (uint32_t j = 0; j < gci->stageCount; j++) {
-			((VkPipelineShaderStageCreateInfo *)gci->pStages)[i] = shaderStageCI (ci->stages->params[j]);
+			((VkPipelineShaderStageCreateInfo *)gci->pStages)[i] = shaderStageCI (ci->stages->a[j]);
 		}
 		if (ci->vertexState) {
 			*(VkPipelineVertexInputStateCreateInfo *)gci->pVertexInputState = vertexInputSCI (*ci->vertexState);
@@ -453,7 +453,7 @@ QFV_CreateGraphicsPipelines (qfv_device_t *device,
 			gci->pDynamicState = 0;
 		}
 		gci->layout = ci->layout->layout;
-		gci->renderPass = ci->renderPass->renderPass;
+		gci->renderPass = ci->renderPass;
 		gci->subpass = ci->subpass;
 		gci->basePipelineHandle = ci->basePipeline->pipeline;
 		gci->basePipelineIndex = ci->basePipelineIndex;
diff --git a/libs/video/renderer/vulkan/renderpass.c b/libs/video/renderer/vulkan/renderpass.c
index 7a64d10a3..60e279e18 100644
--- a/libs/video/renderer/vulkan/renderpass.c
+++ b/libs/video/renderer/vulkan/renderpass.c
@@ -1,7 +1,7 @@
 /*
-	descriptor.c
+	renderpass.c
 
-	Vulkan descriptor functions
+	Vulkan render pass and frame buffer functions
 
 	Copyright (C) 1996-1997 Id Software, Inc.
 	Copyright (C) 2020      Bill Currie <bill@taniwha.org>
@@ -62,7 +62,7 @@
 
 #include "util.h"
 
-qfv_renderpass_t *
+VkRenderPass
 QFV_CreateRenderPass (qfv_device_t *device,
 					  qfv_attachmentdescription_t *attachments,
 					  qfv_subpassparametersset_t *subpassparams,
@@ -71,19 +71,19 @@ QFV_CreateRenderPass (qfv_device_t *device,
 	VkDevice    dev = device->dev;
 	qfv_devfuncs_t *dfunc = device->funcs;
 
-	VkSubpassDescription *subpasses = alloca (subpassparams->numSubpasses
+	VkSubpassDescription *subpasses = alloca (subpassparams->size
 											  * sizeof (*subpasses));
 
-	for (uint32_t i =  0; i < subpassparams->numSubpasses; i++) {
-		qfv_subpassparameters_t *params = &subpassparams->subpasses[i];
+	for (uint32_t i =  0; i < subpassparams->size; i++) {
+		qfv_subpassparameters_t *params = &subpassparams->a[i];
 		subpasses[i].flags = 0;
 		subpasses[i].pipelineBindPoint = params->pipelineBindPoint;
-		subpasses[i].inputAttachmentCount = params->inputAttachments->numReferences;
-		subpasses[i].pInputAttachments = params->inputAttachments->references;
-		subpasses[i].colorAttachmentCount = params->colorAttachments->numReferences;
-		subpasses[i].pColorAttachments = params->colorAttachments->references;
+		subpasses[i].inputAttachmentCount = params->inputAttachments->size;
+		subpasses[i].pInputAttachments = params->inputAttachments->a;
+		subpasses[i].colorAttachmentCount = params->colorAttachments->size;
+		subpasses[i].pColorAttachments = params->colorAttachments->a;
 		if (params->resolveAttachments) {
-			subpasses[i].pResolveAttachments = params->resolveAttachments->references;
+			subpasses[i].pResolveAttachments = params->resolveAttachments->a;
 		}
 		subpasses[i].pDepthStencilAttachment = params->depthStencilAttachment;
 		subpasses[i].preserveAttachmentCount = params->numPreserve;
@@ -92,56 +92,31 @@ QFV_CreateRenderPass (qfv_device_t *device,
 
 	VkRenderPassCreateInfo createInfo = {
 		VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO, 0, 0,
-		attachments->numAttachments, attachments->attachments,
-		subpassparams->numSubpasses, subpasses,
-		dependencies->numDependencies, dependencies->dependencies,
+		attachments->size, attachments->a,
+		subpassparams->size, subpasses,
+		dependencies->size, dependencies->a,
 	};
 
-	qfv_renderpass_t *renderpass = malloc (sizeof (*renderpass));
-	renderpass->device = device;
-	dfunc->vkCreateRenderPass (dev, &createInfo, 0, &renderpass->renderPass);
+	VkRenderPass renderpass;
+	dfunc->vkCreateRenderPass (dev, &createInfo, 0, &renderpass);
 	return renderpass;
 }
 
-qfv_framebuffer_t *
-QFV_CreateFramebuffer (qfv_renderpass_t *renderPass,
+VkFramebuffer
+QFV_CreateFramebuffer (qfv_device_t *device, VkRenderPass renderPass,
 					   uint32_t numAttachments, VkImageView *attachments,
 					   uint32_t width, uint32_t height, uint32_t layers)
 {
-	qfv_device_t *device = renderPass->device;
 	VkDevice    dev = device->dev;
 	qfv_devfuncs_t *dfunc = device->funcs;
 
 	VkFramebufferCreateInfo createInfo = {
 		VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO, 0, 0,
-		renderPass->renderPass, numAttachments, attachments,
+		renderPass, numAttachments, attachments,
 		width, height, layers,
 	};
 
-	qfv_framebuffer_t *framebuffer = malloc (sizeof (*framebuffer));
-	framebuffer->device = device;
-	dfunc->vkCreateFramebuffer (dev, &createInfo, 0, &framebuffer->framebuffer);
+	VkFramebuffer framebuffer;
+	dfunc->vkCreateFramebuffer (dev, &createInfo, 0, &framebuffer);
 	return framebuffer;
 }
-
-void
-QFV_DestroyFramebuffer (qfv_framebuffer_t *framebuffer)
-{
-	qfv_device_t *device = framebuffer->device;
-	VkDevice    dev = device->dev;
-	qfv_devfuncs_t *dfunc = device->funcs;
-
-	dfunc->vkDestroyFramebuffer (dev, framebuffer->framebuffer, 0);
-	free (framebuffer);
-}
-
-void
-QFV_DestroyRenderPass (qfv_renderpass_t *renderPass)
-{
-	qfv_device_t *device = renderPass->device;
-	VkDevice    dev = device->dev;
-	qfv_devfuncs_t *dfunc = device->funcs;
-
-	dfunc->vkDestroyRenderPass (dev, renderPass->renderPass, 0);
-	free (renderPass);
-}

From 89d48b56507fa3546b06a131e0daaf2266c6f4b4 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 18 Feb 2020 01:03:36 +0900
Subject: [PATCH 0417/1519] Output first pixels

Just clearing the screen to 0xbada55, but the validation layer is quiet.
---
 include/QF/Vulkan/funclist.h            |  1 +
 libs/video/renderer/vid_render_vulkan.c | 47 +++++++++++++++++++++++++
 libs/video/renderer/vulkan/swapchain.c  |  1 +
 3 files changed, 49 insertions(+)

diff --git a/include/QF/Vulkan/funclist.h b/include/QF/Vulkan/funclist.h
index 426b0fa62..8ab62852a 100644
--- a/include/QF/Vulkan/funclist.h
+++ b/include/QF/Vulkan/funclist.h
@@ -165,6 +165,7 @@ DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdBeginRenderPass)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdNextSubpass)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdEndRenderPass)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdBindPipeline)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdClearColorImage)
 
 #undef DEVICE_LEVEL_VULKAN_FUNCTION
 
diff --git a/libs/video/renderer/vid_render_vulkan.c b/libs/video/renderer/vid_render_vulkan.c
index 0373867de..fec8afa24 100644
--- a/libs/video/renderer/vid_render_vulkan.c
+++ b/libs/video/renderer/vid_render_vulkan.c
@@ -68,8 +68,55 @@ vulkan_R_Init (void)
 	vulkan_ctx->frameset.cmdBuffers = cmdBuffers;
 	VkCommandBufferBeginInfo beginInfo
 		= { VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO };
+	VkClearColorValue clearColor = { {0.7294, 0.8549, 0.3333, 1.0} };
+	VkImageSubresourceRange image_subresource_range = {
+		VK_IMAGE_ASPECT_COLOR_BIT,
+		0, 1, 0, 1,
+	};
+	VkImageMemoryBarrier pc_barrier = {
+		VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER, 0,
+		VK_ACCESS_TRANSFER_WRITE_BIT,
+		VK_ACCESS_MEMORY_READ_BIT,
+		VK_IMAGE_LAYOUT_UNDEFINED,
+		VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
+		device->queue.queueFamily,
+		device->queue.queueFamily,
+		0,	// filled in later
+		image_subresource_range
+    };
+	VkImageMemoryBarrier cp_barrier = {
+		VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER, 0,
+		VK_ACCESS_TRANSFER_WRITE_BIT,
+		VK_ACCESS_MEMORY_READ_BIT,
+		VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
+		VK_IMAGE_LAYOUT_PRESENT_SRC_KHR,
+		device->queue.queueFamily,
+		device->queue.queueFamily,
+		0,	// filled in later
+		image_subresource_range
+    };
 	for (size_t i = 0; i < cmdBuffers->size; i++) {
+		pc_barrier.image = vulkan_ctx->swapchain->images->a[i];
+		cp_barrier.image = vulkan_ctx->swapchain->images->a[i];
 		dfunc->vkBeginCommandBuffer (cmdBuffers->a[i], &beginInfo);
+		dfunc->vkCmdPipelineBarrier (cmdBuffers->a[i],
+				VK_PIPELINE_STAGE_TRANSFER_BIT,
+				VK_PIPELINE_STAGE_TRANSFER_BIT,
+				0,
+				0, 0,	// memory barriers
+				0, 0,	// buffer barriers
+				1, &pc_barrier);
+		dfunc->vkCmdClearColorImage (cmdBuffers->a[i], pc_barrier.image,
+									 VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
+									 &clearColor, 1,
+									 &image_subresource_range);
+		dfunc->vkCmdPipelineBarrier (cmdBuffers->a[i],
+				VK_PIPELINE_STAGE_TRANSFER_BIT,
+				VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT,
+				0,
+				0, 0,
+				0, 0,
+				1, &cp_barrier);
 		dfunc->vkEndCommandBuffer (cmdBuffers->a[i]);
 	}
 	Sys_Printf ("R_Init %p %d", vulkan_ctx->swapchain->swapchain,
diff --git a/libs/video/renderer/vulkan/swapchain.c b/libs/video/renderer/vulkan/swapchain.c
index 4ea0a36dc..b2007953a 100644
--- a/libs/video/renderer/vulkan/swapchain.c
+++ b/libs/video/renderer/vulkan/swapchain.c
@@ -83,6 +83,7 @@ QFV_CreateSwapchain (vulkan_ctx_t *ctx, VkSwapchainKHR old_swapchain)
 					imageSize.width, imageSize.height);
 
 	VkImageUsageFlags imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT;
+	imageUsage |= VK_IMAGE_USAGE_TRANSFER_DST_BIT;
 	imageUsage &= surfCaps.supportedUsageFlags;
 
 	VkSurfaceTransformFlagBitsKHR surfTransform

From 1f4c019abc0381d2120f5d4cf7be214899e90dd7 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 18 Feb 2020 14:28:28 +0900
Subject: [PATCH 0418/1519] Create and destroy color/depth resources

---
 include/QF/Vulkan/image.h                     |  10 +
 include/QF/Vulkan/qf_vid.h                    |   2 +
 include/vid_vulkan.h                          |   8 +
 libs/video/renderer/vid_render_vulkan.c       |  17 +-
 libs/video/renderer/vulkan/image.c            |  10 +
 .../video/renderer/vulkan/vulkan_vid_common.c | 192 ++++++++++++++++++
 6 files changed, 235 insertions(+), 4 deletions(-)

diff --git a/include/QF/Vulkan/image.h b/include/QF/Vulkan/image.h
index 8db6ee632..edb5e025e 100644
--- a/include/QF/Vulkan/image.h
+++ b/include/QF/Vulkan/image.h
@@ -6,6 +6,13 @@
 typedef struct qfv_imageset_s DARRAY_TYPE (VkImage) qfv_imageset_t;
 typedef struct qfv_imageviewset_s DARRAY_TYPE (VkImageView) qfv_imageviewset_t;
 
+typedef struct qfv_imageresource_s {
+	struct qfv_device_s *device;
+	VkImage     image;
+	VkDeviceMemory object;
+	VkImageView view;
+} qfv_imageresource_t;
+
 typedef struct qfv_imagetransition_s {
 	VkImage       image;
 	VkAccessFlags srcAccess;
@@ -37,6 +44,9 @@ VkDeviceMemory QFV_AllocImageMemory (struct qfv_device_s *device,
 									 VkMemoryPropertyFlags properties,
 									 VkDeviceSize size, VkDeviceSize offset);
 
+int QFV_BindImageMemory (struct qfv_device_s *device, VkImage image,
+						 VkDeviceMemory object, VkDeviceSize offset);
+
 qfv_imagebarrierset_t *
 QFV_CreateImageTransitionSet (qfv_imagetransition_t *transitions,
 							   int numTransitions);
diff --git a/include/QF/Vulkan/qf_vid.h b/include/QF/Vulkan/qf_vid.h
index bfa543c46..26d9d288c 100644
--- a/include/QF/Vulkan/qf_vid.h
+++ b/include/QF/Vulkan/qf_vid.h
@@ -36,6 +36,8 @@
 #include <vulkan/vulkan.h>
 
 struct vulkan_ctx_s;
+void Vulkan_DestroyRenderPass (struct vulkan_ctx_s *ctx);
+void Vulkan_CreateRenderPass (struct vulkan_ctx_s *ctx);
 void Vulkan_CreateSwapchain (struct vulkan_ctx_s *ctx);
 void Vulkan_CreateDevice (struct vulkan_ctx_s *ctx);
 void Vulkan_Init_Common (struct vulkan_ctx_s *ctx);
diff --git a/include/vid_vulkan.h b/include/vid_vulkan.h
index 77718ab9c..a158f0a77 100644
--- a/include/vid_vulkan.h
+++ b/include/vid_vulkan.h
@@ -14,6 +14,11 @@ typedef struct vulkan_frameset_s {
 	struct qfv_semaphoreset_s *renderDoneSemaphores;
 } vulkan_frameset_t;
 
+typedef struct vulkan_renderpass_s {
+	struct qfv_imageresource_s *colorImage;
+	struct qfv_imageresource_s *depthImage;
+} vulkan_renderpass_t;
+
 typedef struct vulkan_ctx_s {
 	void        (*load_vulkan) (struct vulkan_ctx_s *ctx);
 	void        (*unload_vulkan) (struct vulkan_ctx_s *ctx);
@@ -33,7 +38,10 @@ typedef struct vulkan_ctx_s {
 	VkSurfaceKHR surface;	//FIXME surface = window, so "contains" swapchain
 
 	VkCommandPool cmdpool;
+	VkCommandBuffer cmdbuffer;
+	VkFence     fence;			// for ctx->cmdbuffer only
 	vulkan_frameset_t frameset;
+	vulkan_renderpass_t renderpass;
 
 #define EXPORTED_VULKAN_FUNCTION(fname) PFN_##fname fname;
 #define GLOBAL_LEVEL_VULKAN_FUNCTION(fname) PFN_##fname fname;
diff --git a/libs/video/renderer/vid_render_vulkan.c b/libs/video/renderer/vid_render_vulkan.c
index fec8afa24..5c0b602d0 100644
--- a/libs/video/renderer/vid_render_vulkan.c
+++ b/libs/video/renderer/vid_render_vulkan.c
@@ -63,6 +63,7 @@ vulkan_R_Init (void)
 	qfv_cmdbufferset_t *cmdBuffers;
 
 	Vulkan_CreateSwapchain (vulkan_ctx);
+	Vulkan_CreateRenderPass (vulkan_ctx);
 	cmdBuffers = QFV_AllocateCommandBuffers (device, vulkan_ctx->cmdpool, 0,
 											 vulkan_ctx->swapchain->numImages);
 	vulkan_ctx->frameset.cmdBuffers = cmdBuffers;
@@ -139,7 +140,7 @@ vulkan_SCR_UpdateScreen (double time,  void (*f)(void), void (**g)(void))
 	qfv_queue_t *queue = &vulkan_ctx->device->queue;
 	vulkan_frameset_t *frameset = &vulkan_ctx->frameset;
 
-	dfunc->vkWaitForFences (dev, 1, & frameset->fences->a[frameset->curFrame],
+	dfunc->vkWaitForFences (dev, 1, &frameset->fences->a[frameset->curFrame],
 							VK_TRUE, 2000000000);
 	QFV_AcquireNextImage (vulkan_ctx->swapchain,
 				  frameset->imageSemaphores->a[frameset->curFrame],
@@ -174,7 +175,8 @@ vulkan_SCR_UpdateScreen (double time,  void (*f)(void), void (**g)(void))
 		double currenTime = Sys_DoubleTime ();
 		double time = currenTime - startTime;
 		startTime = currenTime;
-		printf ("%d frames in %g s: %g fps     \r", count, time, count / time);
+		printf ("%d frames in %g s: %g fps         \r",
+				count, time, count / time);
 		fflush (stdout);
 		count = 0;
 	}
@@ -291,7 +293,13 @@ vulkan_vid_render_choose_visual (void)
 	vulkan_ctx->choose_visual (vulkan_ctx);
 	vulkan_ctx->cmdpool = QFV_CreateCommandPool (vulkan_ctx->device,
 									 vulkan_ctx->device->queue.queueFamily,
-									 0, 0);
+									 0, 1);
+	__auto_type cmdset = QFV_AllocateCommandBuffers (vulkan_ctx->device,
+													 vulkan_ctx->cmdpool,
+													 0, 1);
+	vulkan_ctx->cmdbuffer = cmdset->a[0];
+	free (cmdset);
+	vulkan_ctx->fence = QFV_CreateFence (vulkan_ctx->device, 1);
 	Sys_Printf ("vk choose visual %p %p %d %p\n", vulkan_ctx->device->dev,
 				vulkan_ctx->device->queue.queue,
 				vulkan_ctx->device->queue.queueFamily,
@@ -309,7 +317,7 @@ vulkan_vid_render_create_context (void)
 	qfv_semaphoreset_t *renderDoneSems = DARRAY_ALLOCFIXED (*renderDoneSems, 2,
 															malloc);
 	for (int i = 0; i < 2; i++) {
-		fences->a[i]= QFV_CreateFence (vulkan_ctx->device, 1);
+		fences->a[i] = QFV_CreateFence (vulkan_ctx->device, 1);
 		imageSems->a[i] = QFV_CreateSemaphore (vulkan_ctx->device);
 		renderDoneSems->a[i] = QFV_CreateSemaphore (vulkan_ctx->device);
 	}
@@ -348,6 +356,7 @@ vulkan_vid_render_shutdown (void)
 		df->vkDestroySemaphore (dev, frameset->imageSemaphores->a[i], 0);
 		df->vkDestroySemaphore (dev, frameset->renderDoneSemaphores->a[i], 0);
 	}
+	df->vkDestroyFence (dev, vulkan_ctx->fence, 0);
 	df->vkDestroyCommandPool (dev, vulkan_ctx->cmdpool, 0);
 	Vulkan_Shutdown_Common (vulkan_ctx);
 }
diff --git a/libs/video/renderer/vulkan/image.c b/libs/video/renderer/vulkan/image.c
index 65f0dcdd3..68decb94a 100644
--- a/libs/video/renderer/vulkan/image.c
+++ b/libs/video/renderer/vulkan/image.c
@@ -126,6 +126,16 @@ QFV_AllocImageMemory (qfv_device_t *device,
 	return object;
 }
 
+int
+QFV_BindImageMemory (qfv_device_t *device,
+					 VkImage image, VkDeviceMemory object, VkDeviceSize offset)
+{
+	VkDevice    dev = device->dev;
+	qfv_devfuncs_t *dfunc = device->funcs;
+	VkResult res = dfunc->vkBindImageMemory (dev, image, object, offset);
+	return res == VK_SUCCESS;
+}
+
 qfv_imagebarrierset_t *
 QFV_CreateImageTransitionSet (qfv_imagetransition_t *transitions,
 							   int numTransitions)
diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c
index 37fe9c564..4d4160caf 100644
--- a/libs/video/renderer/vulkan/vulkan_vid_common.c
+++ b/libs/video/renderer/vulkan/vulkan_vid_common.c
@@ -51,6 +51,7 @@
 #include "QF/Vulkan/qf_vid.h"
 #include "QF/Vulkan/device.h"
 #include "QF/Vulkan/instance.h"
+#include "QF/Vulkan/image.h"
 #include "QF/Vulkan/swapchain.h"
 
 #include "compat.h"
@@ -116,6 +117,9 @@ Vulkan_Init_Common (vulkan_ctx_t *ctx)
 void
 Vulkan_Shutdown_Common (vulkan_ctx_t *ctx)
 {
+	if (ctx->renderpass.colorImage) {
+		Vulkan_DestroyRenderPass (ctx);
+	}
 	if (ctx->swapchain) {
 		QFV_DestroySwapchain (ctx->swapchain);
 	}
@@ -151,3 +155,191 @@ Vulkan_CreateSwapchain (vulkan_ctx_t *ctx)
 												   old_swapchain, 0);
 	}
 }
+
+typedef struct {
+	VkPipelineStageFlags src;
+	VkPipelineStageFlags dst;
+} qfv_pipelinestagepair_t;
+
+//XXX Note: imageLayoutTransitionBarriers, imageLayoutTransitionStages and
+// the enum be kept in sync
+enum {
+	qfv_LT_Undefined_to_TransferDst,
+	qfv_LT_TransferDst_to_ShaderReadOnly,
+	qfv_LT_Undefined_to_DepthStencil,
+	qfv_LT_Undefined_to_Color,
+};
+
+static VkImageMemoryBarrier imageLayoutTransitionBarriers[] = {
+	// undefined -> transfer dst optimal
+	{	VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER, 0,
+		0,
+		VK_ACCESS_TRANSFER_WRITE_BIT,
+		VK_IMAGE_LAYOUT_UNDEFINED,
+		VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
+		VK_QUEUE_FAMILY_IGNORED, VK_QUEUE_FAMILY_IGNORED, 0,
+		{ VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1 }
+	},
+	// transfer dst optimal -> shader read only optimal
+	{	VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER, 0,
+		VK_ACCESS_TRANSFER_WRITE_BIT,
+		VK_ACCESS_SHADER_READ_BIT,
+		VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
+		VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL,
+		VK_QUEUE_FAMILY_IGNORED, VK_QUEUE_FAMILY_IGNORED, 0,
+		{ VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1 }
+	},
+	// undefined -> depth stencil attachment optimal
+	{	VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER, 0,
+		0,
+		VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT
+			| VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT,
+		VK_IMAGE_LAYOUT_UNDEFINED,
+		VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL,
+		VK_QUEUE_FAMILY_IGNORED, VK_QUEUE_FAMILY_IGNORED, 0,
+		{ VK_IMAGE_ASPECT_DEPTH_BIT, 0, 1, 0, 1 }
+	},
+	// undefined -> color attachment optimal
+	{	VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER, 0,
+		0,
+		VK_ACCESS_COLOR_ATTACHMENT_READ_BIT
+			| VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT,
+		VK_IMAGE_LAYOUT_UNDEFINED,
+		VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL,
+		VK_QUEUE_FAMILY_IGNORED, VK_QUEUE_FAMILY_IGNORED, 0,
+		{ VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1 }
+	},
+	{ /* end of transition barriers */ }
+};
+
+static qfv_pipelinestagepair_t imageLayoutTransitionStages[] = {
+	// undefined -> transfer dst optimal
+	{	VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT,
+		VK_PIPELINE_STAGE_TRANSFER_BIT },
+	// transfer dst optimal -> shader read only optimal
+	{	VK_PIPELINE_STAGE_TRANSFER_BIT,
+		VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT },
+	// undefined -> depth stencil attachment optimal
+	{	VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT,
+		VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT },
+	// undefined -> color attachment optimal
+	{	VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT,
+		VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT },
+};
+
+void
+Vulkan_CreateRenderPass (vulkan_ctx_t *ctx)
+{
+	qfv_device_t *device = ctx->device;
+	VkDevice    dev = device->dev;
+	qfv_devfuncs_t *df = device->funcs;
+	VkCommandBuffer cmd = ctx->cmdbuffer;
+	qfv_swapchain_t *sc = ctx->swapchain;
+
+	qfv_imageresource_t *colorImage = malloc (sizeof (*colorImage));
+	qfv_imageresource_t *depthImage = malloc (sizeof (*depthImage));
+
+	VkExtent3D extent = {sc->extent.width, sc->extent.height, 1};
+
+	Sys_MaskPrintf (SYS_VULKAN, "color resource\n");
+	colorImage->image
+		= QFV_CreateImage (device, 0, VK_IMAGE_TYPE_2D,
+						   sc->format, extent, 1, 1,
+						   VK_SAMPLE_COUNT_1_BIT, // FIXME
+						   VK_IMAGE_USAGE_TRANSIENT_ATTACHMENT_BIT
+							   | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT);
+	colorImage->object
+		= QFV_AllocImageMemory (device, colorImage->image,
+								VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, 0, 0);
+	QFV_BindImageMemory (device, colorImage->image, colorImage->object, 0);
+	colorImage->view
+		= QFV_CreateImageView (device, colorImage->image,
+							   VK_IMAGE_VIEW_TYPE_2D,
+							   sc->format, VK_IMAGE_ASPECT_COLOR_BIT);
+	Sys_MaskPrintf (SYS_VULKAN, "	image: %p object: %p view:%p\n",
+					colorImage->image, colorImage->object, colorImage->view);
+
+	Sys_MaskPrintf (SYS_VULKAN, "depth resource\n");
+	VkFormat depthFormat = VK_FORMAT_D32_SFLOAT;
+	depthImage->image
+		= QFV_CreateImage (device, 0, VK_IMAGE_TYPE_2D,
+						   depthFormat, extent, 1, 1,
+						   VK_SAMPLE_COUNT_1_BIT, // FIXME (for depth?!?)
+						   VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT);
+	depthImage->object
+		= QFV_AllocImageMemory (device, depthImage->image,
+								VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, 0, 0);
+	QFV_BindImageMemory (device, depthImage->image, depthImage->object, 0);
+	depthImage->view
+		= QFV_CreateImageView (device, depthImage->image,
+							   VK_IMAGE_VIEW_TYPE_2D,
+							   depthFormat, VK_IMAGE_ASPECT_DEPTH_BIT);
+	Sys_MaskPrintf (SYS_VULKAN, "	image: %p object: %p view:%p\n",
+					depthImage->image, depthImage->object, depthImage->view);
+
+	VkImageMemoryBarrier barrier;
+	qfv_pipelinestagepair_t stages;
+
+	df->vkWaitForFences (dev, 1, &ctx->fence, VK_TRUE, ~0ul);
+	df->vkResetCommandBuffer (cmd, 0);
+	VkCommandBufferBeginInfo beginInfo = {
+		VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, 0,
+		VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT, 0,
+	};
+	df->vkBeginCommandBuffer (cmd, &beginInfo);
+
+	stages = imageLayoutTransitionStages[qfv_LT_Undefined_to_Color];
+	barrier = imageLayoutTransitionBarriers[qfv_LT_Undefined_to_Color];
+	barrier.image = colorImage->image;
+
+	df->vkCmdPipelineBarrier (cmd, stages.src, stages.dst, 0,
+							  0, 0,
+							  0, 0,
+							  1, &barrier);
+
+	stages = imageLayoutTransitionStages[qfv_LT_Undefined_to_DepthStencil];
+	barrier = imageLayoutTransitionBarriers[qfv_LT_Undefined_to_DepthStencil];
+	barrier.image = depthImage->image;
+	if (depthFormat == VK_FORMAT_D32_SFLOAT_S8_UINT
+		|| depthFormat == VK_FORMAT_D24_UNORM_S8_UINT) {
+		barrier.subresourceRange.aspectMask |= VK_IMAGE_ASPECT_STENCIL_BIT;
+	}
+
+	df->vkCmdPipelineBarrier (cmd, stages.src, stages.dst, 0,
+							  0, 0,
+							  0, 0,
+							  1, &barrier);
+	df->vkEndCommandBuffer (cmd);
+
+	VkSubmitInfo submitInfo = {
+		VK_STRUCTURE_TYPE_SUBMIT_INFO, 0,
+		0, 0, 0,
+		1, &cmd,
+		0, 0
+	};
+	df->vkResetFences (dev, 1, &ctx->fence);
+	df->vkQueueSubmit (device->queue.queue, 1, &submitInfo, ctx->fence);
+
+	ctx->renderpass.colorImage = colorImage;
+	ctx->renderpass.depthImage = depthImage;
+}
+
+void
+Vulkan_DestroyRenderPass (vulkan_ctx_t *ctx)
+{
+	qfv_device_t *device = ctx->device;
+	VkDevice    dev = device->dev;
+	qfv_devfuncs_t *df = device->funcs;
+
+	df->vkDestroyImageView (dev, ctx->renderpass.colorImage->view, 0);
+	df->vkDestroyImage (dev, ctx->renderpass.colorImage->image, 0);
+	df->vkFreeMemory (dev, ctx->renderpass.colorImage->object, 0);
+	free (ctx->renderpass.colorImage);
+	ctx->renderpass.colorImage = 0;
+
+	df->vkDestroyImageView (dev, ctx->renderpass.depthImage->view, 0);
+	df->vkDestroyImage (dev, ctx->renderpass.depthImage->image, 0);
+	df->vkFreeMemory (dev, ctx->renderpass.depthImage->object, 0);
+	free (ctx->renderpass.depthImage);
+	ctx->renderpass.depthImage = 0;
+}

From ba654b09f7dbe9dbe8b9d1d9311785df9fcbd5f1 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 18 Feb 2020 17:18:37 +0900
Subject: [PATCH 0419/1519] Create and destroy render pass and frame buffers

---
 include/QF/Vulkan/instance.h                  |   2 +
 include/QF/Vulkan/qf_vid.h                    |   2 +
 include/QF/Vulkan/renderpass.h                |  14 +-
 include/QF/darray.h                           |  19 +++
 include/vid_vulkan.h                          |  23 +--
 libs/video/renderer/vid_render_vulkan.c       |  66 +++------
 libs/video/renderer/vulkan/instance.c         |  15 ++
 libs/video/renderer/vulkan/renderpass.c       |  25 +---
 .../video/renderer/vulkan/vulkan_vid_common.c | 135 +++++++++++++++++-
 9 files changed, 212 insertions(+), 89 deletions(-)

diff --git a/include/QF/Vulkan/instance.h b/include/QF/Vulkan/instance.h
index 0cf5b2226..4df1827c5 100644
--- a/include/QF/Vulkan/instance.h
+++ b/include/QF/Vulkan/instance.h
@@ -62,4 +62,6 @@ qfv_instance_t *QFV_CreateInstance (struct vulkan_ctx_s *ctx,
 									const char **extensions);
 void QFV_DestroyInstance (qfv_instance_t *instance);
 
+VkSampleCountFlagBits QFV_GetMaxSampleCount (qfv_physdev_t *physdev);
+
 #endif // __QF_Vulkan_instance_h
diff --git a/include/QF/Vulkan/qf_vid.h b/include/QF/Vulkan/qf_vid.h
index 26d9d288c..d7ef64a97 100644
--- a/include/QF/Vulkan/qf_vid.h
+++ b/include/QF/Vulkan/qf_vid.h
@@ -36,6 +36,8 @@
 #include <vulkan/vulkan.h>
 
 struct vulkan_ctx_s;
+void Vulkan_DestroyFramebuffers (struct vulkan_ctx_s *ctx);
+void Vulkan_CreateFramebuffers (struct vulkan_ctx_s *ctx);
 void Vulkan_DestroyRenderPass (struct vulkan_ctx_s *ctx);
 void Vulkan_CreateRenderPass (struct vulkan_ctx_s *ctx);
 void Vulkan_CreateSwapchain (struct vulkan_ctx_s *ctx);
diff --git a/include/QF/Vulkan/renderpass.h b/include/QF/Vulkan/renderpass.h
index 257441ca1..9a197ac70 100644
--- a/include/QF/Vulkan/renderpass.h
+++ b/include/QF/Vulkan/renderpass.h
@@ -15,18 +15,8 @@ typedef struct qfv_attachmentreference_s
 #define QFV_AllocAttachmentReference(num, allocator) \
 	DARRAY_ALLOCFIXED (qfv_attachmentreference_t, num, allocator)
 
-typedef struct qfv_subpassparameters_s {
-	VkPipelineBindPoint pipelineBindPoint;
-	qfv_attachmentreference_t *inputAttachments;
-	qfv_attachmentreference_t *colorAttachments;
-	qfv_attachmentreference_t *resolveAttachments;
-	VkAttachmentReference *depthStencilAttachment;
-	uint32_t    numPreserve;
-	uint32_t   *preserveAttachments;
-} qfv_subpassparameters_t;
-
 typedef struct qfv_subpassparametersset_s
-	DARRAY_TYPE (qfv_subpassparameters_t) qfv_subpassparametersset_t;
+	DARRAY_TYPE (VkSubpassDescription) qfv_subpassparametersset_t;
 
 #define QFV_AllocSubpassParametersSet(num, allocator) \
 	DARRAY_ALLOCFIXED (qfv_subpassparametersset_t, num, allocator)
@@ -49,6 +39,6 @@ QFV_CreateFramebuffer (struct qfv_device_s *device,
 					   VkRenderPass renderPass,
 					   uint32_t numAttachments,
 					   VkImageView *attachments,
-					   uint32_t width, uint32_t height, uint32_t layers);
+					   VkExtent2D, uint32_t layers);
 
 #endif//__QF_Vulkan_renderpass_h
diff --git a/include/QF/darray.h b/include/QF/darray.h
index 7a4484575..9f8c9630b 100644
--- a/include/QF/darray.h
+++ b/include/QF/darray.h
@@ -88,6 +88,25 @@
 		ar;																\
 	})
 
+/**	Initialized the array.
+
+	The array will be initialized to be empty but with grow set to the
+	specifed value.
+
+	\param array	*Address* of the array to be modified (ie, pointer to the
+					array struct instance, not the instance itself: use & for
+					static instances of the array struct).
+	\param growSize Number of elements by which the array is to grow when
+					required.
+	\hideinitializer
+*/
+#define DARRAY_INIT(array, growSize)									\
+	do {																\
+		__auto_type ar = (array);										\
+		ar->size = ar->maxSize = 0;										\
+		ar->grow = (growSize);											\
+	} while (0)
+
 /**	Clear the array.
 
 	If the array can grow, its backing will be freed and maxSize and a reset,
diff --git a/include/vid_vulkan.h b/include/vid_vulkan.h
index a158f0a77..2675d3036 100644
--- a/include/vid_vulkan.h
+++ b/include/vid_vulkan.h
@@ -6,19 +6,25 @@
 #endif
 #include <vulkan/vulkan.h>
 
-typedef struct vulkan_frameset_s {
-	int         curFrame;	// index into fences
-	struct qfv_fenceset_s *fences;
-	struct qfv_cmdbufferset_s *cmdBuffers;
-	struct qfv_semaphoreset_s *imageSemaphores;
-	struct qfv_semaphoreset_s *renderDoneSemaphores;
-} vulkan_frameset_t;
+#include "QF/darray.h"
 
 typedef struct vulkan_renderpass_s {
+	VkRenderPass renderpass;
 	struct qfv_imageresource_s *colorImage;
 	struct qfv_imageresource_s *depthImage;
 } vulkan_renderpass_t;
 
+typedef struct vulkan_framebuffer_s {
+	VkFramebuffer framebuffer;
+	VkFence     fence;
+	VkSemaphore imageAvailableSemaphore;
+	VkSemaphore renderDoneSemaphore;
+	VkCommandBuffer cmdBuffer;
+} vulkan_framebuffer_t;
+
+typedef struct vulkan_framebufferset_s
+	DARRAY_TYPE (vulkan_framebuffer_t) vulkan_framebufferset_t;
+
 typedef struct vulkan_ctx_s {
 	void        (*load_vulkan) (struct vulkan_ctx_s *ctx);
 	void        (*unload_vulkan) (struct vulkan_ctx_s *ctx);
@@ -40,8 +46,9 @@ typedef struct vulkan_ctx_s {
 	VkCommandPool cmdpool;
 	VkCommandBuffer cmdbuffer;
 	VkFence     fence;			// for ctx->cmdbuffer only
-	vulkan_frameset_t frameset;
 	vulkan_renderpass_t renderpass;
+	size_t      curFrame;
+	vulkan_framebufferset_t framebuffers;
 
 #define EXPORTED_VULKAN_FUNCTION(fname) PFN_##fname fname;
 #define GLOBAL_LEVEL_VULKAN_FUNCTION(fname) PFN_##fname fname;
diff --git a/libs/video/renderer/vid_render_vulkan.c b/libs/video/renderer/vid_render_vulkan.c
index 5c0b602d0..ce6863753 100644
--- a/libs/video/renderer/vid_render_vulkan.c
+++ b/libs/video/renderer/vid_render_vulkan.c
@@ -60,13 +60,11 @@ vulkan_R_Init (void)
 {
 	qfv_device_t *device = vulkan_ctx->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
-	qfv_cmdbufferset_t *cmdBuffers;
 
 	Vulkan_CreateSwapchain (vulkan_ctx);
 	Vulkan_CreateRenderPass (vulkan_ctx);
-	cmdBuffers = QFV_AllocateCommandBuffers (device, vulkan_ctx->cmdpool, 0,
-											 vulkan_ctx->swapchain->numImages);
-	vulkan_ctx->frameset.cmdBuffers = cmdBuffers;
+	Vulkan_CreateFramebuffers (vulkan_ctx);
+
 	VkCommandBufferBeginInfo beginInfo
 		= { VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO };
 	VkClearColorValue clearColor = { {0.7294, 0.8549, 0.3333, 1.0} };
@@ -96,29 +94,30 @@ vulkan_R_Init (void)
 		0,	// filled in later
 		image_subresource_range
     };
-	for (size_t i = 0; i < cmdBuffers->size; i++) {
+	for (size_t i = 0; i < vulkan_ctx->framebuffers.size; i++) {
+		__auto_type framebuffer = &vulkan_ctx->framebuffers.a[i];
 		pc_barrier.image = vulkan_ctx->swapchain->images->a[i];
 		cp_barrier.image = vulkan_ctx->swapchain->images->a[i];
-		dfunc->vkBeginCommandBuffer (cmdBuffers->a[i], &beginInfo);
-		dfunc->vkCmdPipelineBarrier (cmdBuffers->a[i],
+		dfunc->vkBeginCommandBuffer (framebuffer->cmdBuffer, &beginInfo);
+		dfunc->vkCmdPipelineBarrier (framebuffer->cmdBuffer,
 				VK_PIPELINE_STAGE_TRANSFER_BIT,
 				VK_PIPELINE_STAGE_TRANSFER_BIT,
 				0,
 				0, 0,	// memory barriers
 				0, 0,	// buffer barriers
 				1, &pc_barrier);
-		dfunc->vkCmdClearColorImage (cmdBuffers->a[i], pc_barrier.image,
+		dfunc->vkCmdClearColorImage (framebuffer->cmdBuffer, pc_barrier.image,
 									 VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
 									 &clearColor, 1,
 									 &image_subresource_range);
-		dfunc->vkCmdPipelineBarrier (cmdBuffers->a[i],
+		dfunc->vkCmdPipelineBarrier (framebuffer->cmdBuffer,
 				VK_PIPELINE_STAGE_TRANSFER_BIT,
 				VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT,
 				0,
 				0, 0,
 				0, 0,
 				1, &cp_barrier);
-		dfunc->vkEndCommandBuffer (cmdBuffers->a[i]);
+		dfunc->vkEndCommandBuffer (framebuffer->cmdBuffer);
 	}
 	Sys_Printf ("R_Init %p %d", vulkan_ctx->swapchain->swapchain,
 				vulkan_ctx->swapchain->numImages);
@@ -138,38 +137,38 @@ vulkan_SCR_UpdateScreen (double time,  void (*f)(void), void (**g)(void))
 	qfv_devfuncs_t *dfunc = device->funcs;
 	VkDevice    dev = device->dev;
 	qfv_queue_t *queue = &vulkan_ctx->device->queue;
-	vulkan_frameset_t *frameset = &vulkan_ctx->frameset;
 
-	dfunc->vkWaitForFences (dev, 1, &frameset->fences->a[frameset->curFrame],
-							VK_TRUE, 2000000000);
+	__auto_type framebuffer
+		= &vulkan_ctx->framebuffers.a[vulkan_ctx->curFrame];
+
+	dfunc->vkWaitForFences (dev, 1, &framebuffer->fence, VK_TRUE, 2000000000);
 	QFV_AcquireNextImage (vulkan_ctx->swapchain,
-				  frameset->imageSemaphores->a[frameset->curFrame],
-				  0, &imageIndex);
+						  framebuffer->imageAvailableSemaphore,
+						  0, &imageIndex);
 
 	VkPipelineStageFlags waitStage
 		= VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
 	VkSubmitInfo submitInfo = {
 		VK_STRUCTURE_TYPE_SUBMIT_INFO, 0,
 		1,
-		&frameset->imageSemaphores->a[frameset->curFrame],
+		&framebuffer->imageAvailableSemaphore,
 		&waitStage,
-		1, &frameset->cmdBuffers->a[imageIndex],
-		1, &frameset->renderDoneSemaphores->a[frameset->curFrame],
+		1, &framebuffer->cmdBuffer,
+		1, &framebuffer->renderDoneSemaphore,
 	};
-	dfunc->vkResetFences (dev, 1, &frameset->fences->a[frameset->curFrame]);
-	dfunc->vkQueueSubmit (queue->queue, 1, &submitInfo,
-						  frameset->fences->a[frameset->curFrame]);
+	dfunc->vkResetFences (dev, 1, &framebuffer->fence);
+	dfunc->vkQueueSubmit (queue->queue, 1, &submitInfo, framebuffer->fence);
 
 	VkPresentInfoKHR presentInfo = {
 		VK_STRUCTURE_TYPE_PRESENT_INFO_KHR, 0,
-		1, &frameset->renderDoneSemaphores->a[frameset->curFrame],
+		1, &framebuffer->renderDoneSemaphore,
 		1, &vulkan_ctx->swapchain->swapchain, &imageIndex,
 		0
 	};
 	dfunc->vkQueuePresentKHR (queue->queue, &presentInfo);
 
-	frameset->curFrame++;
-	frameset->curFrame %= frameset->fences->size;
+	vulkan_ctx->curFrame++;
+	vulkan_ctx->curFrame %= vulkan_ctx->framebuffers.size;
 
 	if (++count >= 100) {
 		double currenTime = Sys_DoubleTime ();
@@ -311,19 +310,6 @@ vulkan_vid_render_create_context (void)
 {
 	vulkan_ctx->create_window (vulkan_ctx);
 	vulkan_ctx->surface = vulkan_ctx->create_surface (vulkan_ctx);
-	vulkan_ctx->frameset.curFrame = 0;
-	qfv_fenceset_t *fences = DARRAY_ALLOCFIXED (*fences, 2, malloc);
-	qfv_semaphoreset_t *imageSems = DARRAY_ALLOCFIXED (*imageSems, 2, malloc);
-	qfv_semaphoreset_t *renderDoneSems = DARRAY_ALLOCFIXED (*renderDoneSems, 2,
-															malloc);
-	for (int i = 0; i < 2; i++) {
-		fences->a[i] = QFV_CreateFence (vulkan_ctx->device, 1);
-		imageSems->a[i] = QFV_CreateSemaphore (vulkan_ctx->device);
-		renderDoneSems->a[i] = QFV_CreateSemaphore (vulkan_ctx->device);
-	}
-	vulkan_ctx->frameset.fences = fences;
-	vulkan_ctx->frameset.imageSemaphores = imageSems;
-	vulkan_ctx->frameset.renderDoneSemaphores = renderDoneSems;
 	Sys_Printf ("vk create context %p\n", vulkan_ctx->surface);
 }
 
@@ -350,12 +336,6 @@ vulkan_vid_render_shutdown (void)
 	qfv_devfuncs_t *df = device->funcs;
 	VkDevice    dev = device->dev;
 	QFV_DeviceWaitIdle (device);
-	vulkan_frameset_t *frameset = &vulkan_ctx->frameset;
-	for (size_t i = 0; i < frameset->fences->size; i++) {
-		df->vkDestroyFence (dev, frameset->fences->a[i], 0);
-		df->vkDestroySemaphore (dev, frameset->imageSemaphores->a[i], 0);
-		df->vkDestroySemaphore (dev, frameset->renderDoneSemaphores->a[i], 0);
-	}
 	df->vkDestroyFence (dev, vulkan_ctx->fence, 0);
 	df->vkDestroyCommandPool (dev, vulkan_ctx->cmdpool, 0);
 	Vulkan_Shutdown_Common (vulkan_ctx);
diff --git a/libs/video/renderer/vulkan/instance.c b/libs/video/renderer/vulkan/instance.c
index 234236014..4d23b5a75 100644
--- a/libs/video/renderer/vulkan/instance.c
+++ b/libs/video/renderer/vulkan/instance.c
@@ -36,6 +36,7 @@
 #include "QF/cvar.h"
 #include "QF/dstring.h"
 #include "QF/input.h"
+#include "QF/mathlib.h"
 #include "QF/qargs.h"
 #include "QF/quakefs.h"
 #include "QF/sys.h"
@@ -284,3 +285,17 @@ QFV_DestroyInstance (qfv_instance_t *instance)
 	instance->funcs->vkDestroyInstance (instance->instance, 0);
 	free (instance);
 }
+
+VkSampleCountFlagBits
+QFV_GetMaxSampleCount (qfv_physdev_t *physdev)
+{
+	VkSampleCountFlagBits maxSamples = VK_SAMPLE_COUNT_64_BIT;
+	VkSampleCountFlagBits counts;
+	counts = min (physdev->properties.limits.framebufferColorSampleCounts,
+				  physdev->properties.limits.framebufferDepthSampleCounts);
+	while (maxSamples && maxSamples > counts) {
+		maxSamples >>= 1;
+	}
+	Sys_MaskPrintf (SYS_VULKAN, "Max samples: %x\n", maxSamples);
+	return maxSamples;
+}
diff --git a/libs/video/renderer/vulkan/renderpass.c b/libs/video/renderer/vulkan/renderpass.c
index 60e279e18..e61005278 100644
--- a/libs/video/renderer/vulkan/renderpass.c
+++ b/libs/video/renderer/vulkan/renderpass.c
@@ -71,29 +71,10 @@ QFV_CreateRenderPass (qfv_device_t *device,
 	VkDevice    dev = device->dev;
 	qfv_devfuncs_t *dfunc = device->funcs;
 
-	VkSubpassDescription *subpasses = alloca (subpassparams->size
-											  * sizeof (*subpasses));
-
-	for (uint32_t i =  0; i < subpassparams->size; i++) {
-		qfv_subpassparameters_t *params = &subpassparams->a[i];
-		subpasses[i].flags = 0;
-		subpasses[i].pipelineBindPoint = params->pipelineBindPoint;
-		subpasses[i].inputAttachmentCount = params->inputAttachments->size;
-		subpasses[i].pInputAttachments = params->inputAttachments->a;
-		subpasses[i].colorAttachmentCount = params->colorAttachments->size;
-		subpasses[i].pColorAttachments = params->colorAttachments->a;
-		if (params->resolveAttachments) {
-			subpasses[i].pResolveAttachments = params->resolveAttachments->a;
-		}
-		subpasses[i].pDepthStencilAttachment = params->depthStencilAttachment;
-		subpasses[i].preserveAttachmentCount = params->numPreserve;
-		subpasses[i].pPreserveAttachments = params->preserveAttachments;
-	}
-
 	VkRenderPassCreateInfo createInfo = {
 		VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO, 0, 0,
 		attachments->size, attachments->a,
-		subpassparams->size, subpasses,
+		subpassparams->size, subpassparams->a,
 		dependencies->size, dependencies->a,
 	};
 
@@ -105,7 +86,7 @@ QFV_CreateRenderPass (qfv_device_t *device,
 VkFramebuffer
 QFV_CreateFramebuffer (qfv_device_t *device, VkRenderPass renderPass,
 					   uint32_t numAttachments, VkImageView *attachments,
-					   uint32_t width, uint32_t height, uint32_t layers)
+					   VkExtent2D extent, uint32_t layers)
 {
 	VkDevice    dev = device->dev;
 	qfv_devfuncs_t *dfunc = device->funcs;
@@ -113,7 +94,7 @@ QFV_CreateFramebuffer (qfv_device_t *device, VkRenderPass renderPass,
 	VkFramebufferCreateInfo createInfo = {
 		VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO, 0, 0,
 		renderPass, numAttachments, attachments,
-		width, height, layers,
+		extent.width, extent.height, layers,
 	};
 
 	VkFramebuffer framebuffer;
diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c
index 4d4160caf..151f6ea55 100644
--- a/libs/video/renderer/vulkan/vulkan_vid_common.c
+++ b/libs/video/renderer/vulkan/vulkan_vid_common.c
@@ -50,8 +50,10 @@
 #include "QF/vid.h"
 #include "QF/Vulkan/qf_vid.h"
 #include "QF/Vulkan/device.h"
+#include "QF/Vulkan/command.h"
 #include "QF/Vulkan/instance.h"
 #include "QF/Vulkan/image.h"
+#include "QF/Vulkan/renderpass.h"
 #include "QF/Vulkan/swapchain.h"
 
 #include "compat.h"
@@ -117,6 +119,9 @@ Vulkan_Init_Common (vulkan_ctx_t *ctx)
 void
 Vulkan_Shutdown_Common (vulkan_ctx_t *ctx)
 {
+	if (ctx->framebuffers.size) {
+		Vulkan_DestroyFramebuffers (ctx);
+	}
 	if (ctx->renderpass.colorImage) {
 		Vulkan_DestroyRenderPass (ctx);
 	}
@@ -241,11 +246,13 @@ Vulkan_CreateRenderPass (vulkan_ctx_t *ctx)
 
 	VkExtent3D extent = {sc->extent.width, sc->extent.height, 1};
 
+	VkSampleCountFlagBits msaaSamples
+		= QFV_GetMaxSampleCount (device->physDev);
+
 	Sys_MaskPrintf (SYS_VULKAN, "color resource\n");
 	colorImage->image
 		= QFV_CreateImage (device, 0, VK_IMAGE_TYPE_2D,
-						   sc->format, extent, 1, 1,
-						   VK_SAMPLE_COUNT_1_BIT, // FIXME
+						   sc->format, extent, 1, 1, msaaSamples,
 						   VK_IMAGE_USAGE_TRANSIENT_ATTACHMENT_BIT
 							   | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT);
 	colorImage->object
@@ -263,8 +270,7 @@ Vulkan_CreateRenderPass (vulkan_ctx_t *ctx)
 	VkFormat depthFormat = VK_FORMAT_D32_SFLOAT;
 	depthImage->image
 		= QFV_CreateImage (device, 0, VK_IMAGE_TYPE_2D,
-						   depthFormat, extent, 1, 1,
-						   VK_SAMPLE_COUNT_1_BIT, // FIXME (for depth?!?)
+						   depthFormat, extent, 1, 1, msaaSamples,
 						   VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT);
 	depthImage->object
 		= QFV_AllocImageMemory (device, depthImage->image,
@@ -322,6 +328,72 @@ Vulkan_CreateRenderPass (vulkan_ctx_t *ctx)
 
 	ctx->renderpass.colorImage = colorImage;
 	ctx->renderpass.depthImage = depthImage;
+
+	__auto_type attachments = QFV_AllocAttachmentDescription (3, alloca);
+	__auto_type attachmentRefs = QFV_AllocAttachmentReference (3, alloca);
+
+	// color attachment
+	attachments->a[0].flags = 0;
+	attachments->a[0].format = sc->format;
+	attachments->a[0].samples = msaaSamples;
+	attachments->a[0].loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR;
+	attachments->a[0].storeOp = VK_ATTACHMENT_STORE_OP_STORE;
+	attachments->a[0].stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
+	attachments->a[0].stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
+	attachments->a[0].initialLayout = VK_IMAGE_LAYOUT_UNDEFINED;
+	attachments->a[0].finalLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
+	attachmentRefs->a[0].attachment = 0;
+	attachmentRefs->a[0].layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
+
+	// depth attachment
+	attachments->a[1].flags = 0;
+	attachments->a[1].format = depthFormat;
+	attachments->a[1].samples = msaaSamples;
+	attachments->a[1].loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR;
+	attachments->a[1].storeOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
+	attachments->a[1].stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
+	attachments->a[1].stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
+	attachments->a[1].initialLayout = VK_IMAGE_LAYOUT_UNDEFINED;
+	attachments->a[1].finalLayout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL;
+	attachmentRefs->a[1].attachment = 1;
+	attachmentRefs->a[1].layout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL;
+
+	// resolve attachment
+	attachments->a[2].flags = 0;
+	attachments->a[2].format = sc->format;
+	attachments->a[2].samples = VK_SAMPLE_COUNT_1_BIT;
+	attachments->a[2].loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR;
+	attachments->a[2].storeOp = VK_ATTACHMENT_STORE_OP_STORE;
+	attachments->a[2].stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
+	attachments->a[2].stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
+	attachments->a[2].initialLayout = VK_IMAGE_LAYOUT_UNDEFINED;
+	attachments->a[2].finalLayout = VK_IMAGE_LAYOUT_PRESENT_SRC_KHR;
+	attachmentRefs->a[2].attachment = 2;
+	attachmentRefs->a[2].layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
+
+	__auto_type subpasses = QFV_AllocSubpassParametersSet (1, alloca);
+	subpasses->a[0].flags = 0;
+	subpasses->a[0].pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS;
+	subpasses->a[0].inputAttachmentCount = 0;
+	subpasses->a[0].pInputAttachments = 0;
+	subpasses->a[0].colorAttachmentCount = 1;
+	subpasses->a[0].pColorAttachments = &attachmentRefs->a[0];
+	subpasses->a[0].pResolveAttachments = &attachmentRefs->a[2];
+	subpasses->a[0].pDepthStencilAttachment = &attachmentRefs->a[1];
+	subpasses->a[0].preserveAttachmentCount = 0;
+	subpasses->a[0].pPreserveAttachments = 0;
+
+	__auto_type depenencies = QFV_AllocSubpassDependencies (1, alloca);
+	depenencies->a[0].srcSubpass = VK_SUBPASS_EXTERNAL;
+	depenencies->a[0].dstSubpass = 0;
+	depenencies->a[0].srcStageMask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
+	depenencies->a[0].dstStageMask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
+	depenencies->a[0].srcAccessMask = 0;
+	depenencies->a[0].dstAccessMask = VK_ACCESS_COLOR_ATTACHMENT_READ_BIT | VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT;
+	depenencies->a[0].dependencyFlags = 0;
+
+	ctx->renderpass.renderpass = QFV_CreateRenderPass (device, attachments,
+													   subpasses, depenencies);
 }
 
 void
@@ -331,6 +403,8 @@ Vulkan_DestroyRenderPass (vulkan_ctx_t *ctx)
 	VkDevice    dev = device->dev;
 	qfv_devfuncs_t *df = device->funcs;
 
+	df->vkDestroyRenderPass (dev, ctx->renderpass.renderpass, 0);
+
 	df->vkDestroyImageView (dev, ctx->renderpass.colorImage->view, 0);
 	df->vkDestroyImage (dev, ctx->renderpass.colorImage->image, 0);
 	df->vkFreeMemory (dev, ctx->renderpass.colorImage->object, 0);
@@ -343,3 +417,56 @@ Vulkan_DestroyRenderPass (vulkan_ctx_t *ctx)
 	free (ctx->renderpass.depthImage);
 	ctx->renderpass.depthImage = 0;
 }
+
+void
+Vulkan_CreateFramebuffers (vulkan_ctx_t *ctx)
+{
+	qfv_device_t *device = ctx->device;
+	VkCommandPool cmdpool = ctx->cmdpool;
+	qfv_swapchain_t *sc = ctx->swapchain;
+	VkRenderPass renderpass = ctx->renderpass.renderpass;
+
+	if (!ctx->framebuffers.grow) {
+		DARRAY_INIT (&ctx->framebuffers, 4);
+	}
+
+	DARRAY_RESIZE (&ctx->framebuffers, sc->numImages);
+
+	__auto_type attachments = DARRAY_ALLOCFIXED (qfv_imageviewset_t, 3,
+												 alloca);
+	attachments->a[0] = ctx->renderpass.colorImage->view;
+	attachments->a[1] = ctx->renderpass.depthImage->view;
+
+	__auto_type cmdBuffers
+		= QFV_AllocateCommandBuffers (device, cmdpool, 0,
+									  ctx->framebuffers.size);
+
+	for (size_t i = 0; i < ctx->framebuffers.size; i++) {
+		attachments->a[2] = sc->imageViews->a[i];
+		__auto_type frame = &ctx->framebuffers.a[i];
+		frame->framebuffer = QFV_CreateFramebuffer (device, renderpass,
+												   attachments->size,
+												   attachments->a,
+												   sc->extent, 1);
+		frame->fence = QFV_CreateFence (device, 1);
+		frame->imageAvailableSemaphore = QFV_CreateSemaphore (device);
+		frame->renderDoneSemaphore = QFV_CreateSemaphore (device);
+		frame->cmdBuffer = cmdBuffers->a[i];
+	}
+}
+
+void
+Vulkan_DestroyFramebuffers (vulkan_ctx_t *ctx)
+{
+	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *df = device->funcs;
+	VkDevice    dev = device->dev;
+
+	for (size_t i = 0; i < ctx->framebuffers.size; i++) {
+		__auto_type frame = &ctx->framebuffers.a[i];
+		df->vkDestroyFence (dev, frame->fence, 0);
+		df->vkDestroySemaphore (dev, frame->imageAvailableSemaphore, 0);
+		df->vkDestroySemaphore (dev, frame->renderDoneSemaphore, 0);
+		df->vkDestroyFramebuffer (dev, frame->framebuffer, 0);
+	}
+}

From 0a0035e5e5e7771e28563684dbea1d34f2043e55 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 18 Feb 2020 17:48:22 +0900
Subject: [PATCH 0420/1519] Use the render pass to clear the window

Very satisfying to get to this point.
---
 libs/video/renderer/vid_render_vulkan.c       | 63 +++++--------------
 .../video/renderer/vulkan/vulkan_vid_common.c |  4 +-
 2 files changed, 20 insertions(+), 47 deletions(-)

diff --git a/libs/video/renderer/vid_render_vulkan.c b/libs/video/renderer/vid_render_vulkan.c
index ce6863753..85181547c 100644
--- a/libs/video/renderer/vid_render_vulkan.c
+++ b/libs/video/renderer/vid_render_vulkan.c
@@ -65,58 +65,29 @@ vulkan_R_Init (void)
 	Vulkan_CreateRenderPass (vulkan_ctx);
 	Vulkan_CreateFramebuffers (vulkan_ctx);
 
+	qfv_swapchain_t *sc = vulkan_ctx->swapchain;
+
 	VkCommandBufferBeginInfo beginInfo
 		= { VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO };
-	VkClearColorValue clearColor = { {0.7294, 0.8549, 0.3333, 1.0} };
-	VkImageSubresourceRange image_subresource_range = {
-		VK_IMAGE_ASPECT_COLOR_BIT,
-		0, 1, 0, 1,
+	VkClearValue clearValues[3] = {
+		{ { {0.7294, 0.8549, 0.3333, 1.0} } },
+		{ { {1.0, 0.0} } },
+		{ { {0, 0, 0, 0} } },
+	};
+	VkRenderPassBeginInfo renderPassInfo = {
+		VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO, 0,
+		vulkan_ctx->renderpass.renderpass, 0,
+		{ {0, 0}, sc->extent },
+		2, clearValues
 	};
-	VkImageMemoryBarrier pc_barrier = {
-		VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER, 0,
-		VK_ACCESS_TRANSFER_WRITE_BIT,
-		VK_ACCESS_MEMORY_READ_BIT,
-		VK_IMAGE_LAYOUT_UNDEFINED,
-		VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
-		device->queue.queueFamily,
-		device->queue.queueFamily,
-		0,	// filled in later
-		image_subresource_range
-    };
-	VkImageMemoryBarrier cp_barrier = {
-		VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER, 0,
-		VK_ACCESS_TRANSFER_WRITE_BIT,
-		VK_ACCESS_MEMORY_READ_BIT,
-		VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
-		VK_IMAGE_LAYOUT_PRESENT_SRC_KHR,
-		device->queue.queueFamily,
-		device->queue.queueFamily,
-		0,	// filled in later
-		image_subresource_range
-    };
 	for (size_t i = 0; i < vulkan_ctx->framebuffers.size; i++) {
 		__auto_type framebuffer = &vulkan_ctx->framebuffers.a[i];
-		pc_barrier.image = vulkan_ctx->swapchain->images->a[i];
-		cp_barrier.image = vulkan_ctx->swapchain->images->a[i];
 		dfunc->vkBeginCommandBuffer (framebuffer->cmdBuffer, &beginInfo);
-		dfunc->vkCmdPipelineBarrier (framebuffer->cmdBuffer,
-				VK_PIPELINE_STAGE_TRANSFER_BIT,
-				VK_PIPELINE_STAGE_TRANSFER_BIT,
-				0,
-				0, 0,	// memory barriers
-				0, 0,	// buffer barriers
-				1, &pc_barrier);
-		dfunc->vkCmdClearColorImage (framebuffer->cmdBuffer, pc_barrier.image,
-									 VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
-									 &clearColor, 1,
-									 &image_subresource_range);
-		dfunc->vkCmdPipelineBarrier (framebuffer->cmdBuffer,
-				VK_PIPELINE_STAGE_TRANSFER_BIT,
-				VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT,
-				0,
-				0, 0,
-				0, 0,
-				1, &cp_barrier);
+		renderPassInfo.framebuffer = framebuffer->framebuffer;
+		dfunc->vkCmdBeginRenderPass (framebuffer->cmdBuffer, &renderPassInfo,
+				VK_SUBPASS_CONTENTS_INLINE);
+
+		dfunc->vkCmdEndRenderPass (framebuffer->cmdBuffer);
 		dfunc->vkEndCommandBuffer (framebuffer->cmdBuffer);
 	}
 	Sys_Printf ("R_Init %p %d", vulkan_ctx->swapchain->swapchain,
diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c
index 151f6ea55..882aede78 100644
--- a/libs/video/renderer/vulkan/vulkan_vid_common.c
+++ b/libs/video/renderer/vulkan/vulkan_vid_common.c
@@ -362,7 +362,7 @@ Vulkan_CreateRenderPass (vulkan_ctx_t *ctx)
 	attachments->a[2].flags = 0;
 	attachments->a[2].format = sc->format;
 	attachments->a[2].samples = VK_SAMPLE_COUNT_1_BIT;
-	attachments->a[2].loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR;
+	attachments->a[2].loadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
 	attachments->a[2].storeOp = VK_ATTACHMENT_STORE_OP_STORE;
 	attachments->a[2].stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
 	attachments->a[2].stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
@@ -469,4 +469,6 @@ Vulkan_DestroyFramebuffers (vulkan_ctx_t *ctx)
 		df->vkDestroySemaphore (dev, frame->renderDoneSemaphore, 0);
 		df->vkDestroyFramebuffer (dev, frame->framebuffer, 0);
 	}
+
+	DARRAY_CLEAR (&ctx->framebuffers);
 }

From c740dea2120d24723c97efc84f80e5fd43a40427 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 18 Feb 2020 19:44:40 +0900
Subject: [PATCH 0421/1519] Use the correct constant for "infinity"

---
 libs/video/renderer/vulkan/vulkan_vid_common.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c
index 882aede78..452a74eb8 100644
--- a/libs/video/renderer/vulkan/vulkan_vid_common.c
+++ b/libs/video/renderer/vulkan/vulkan_vid_common.c
@@ -286,7 +286,7 @@ Vulkan_CreateRenderPass (vulkan_ctx_t *ctx)
 	VkImageMemoryBarrier barrier;
 	qfv_pipelinestagepair_t stages;
 
-	df->vkWaitForFences (dev, 1, &ctx->fence, VK_TRUE, ~0ul);
+	df->vkWaitForFences (dev, 1, &ctx->fence, VK_TRUE, ~0ull);
 	df->vkResetCommandBuffer (cmd, 0);
 	VkCommandBufferBeginInfo beginInfo = {
 		VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, 0,

From 264c4ccdacff051bffca85f1a97e5ca0907b048c Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 18 Feb 2020 21:18:03 +0900
Subject: [PATCH 0422/1519] Sanitize descriptors

I'm sure it will end soon, I think pipelines is the end of it.
---
 include/QF/Vulkan/descriptor.h          | 144 +++++-------------
 libs/video/renderer/vulkan/descriptor.c | 193 +++---------------------
 libs/video/renderer/vulkan/pipeline.c   |  12 +-
 3 files changed, 63 insertions(+), 286 deletions(-)

diff --git a/include/QF/Vulkan/descriptor.h b/include/QF/Vulkan/descriptor.h
index 48a1cd92d..6dd09bff4 100644
--- a/include/QF/Vulkan/descriptor.h
+++ b/include/QF/Vulkan/descriptor.h
@@ -1,132 +1,62 @@
 #ifndef __QF_Vulkan_descriptor_h
 #define __QF_Vulkan_descriptor_h
 
-typedef struct qfv_sampler_s {
-	struct qfv_device_s *device;
-	VkSampler   sampler;
-} qfv_sampler_t;
+#include "QF/darray.h"
 
-typedef struct qfv_bindingset_s {
-	int         numBindings;
-	VkDescriptorSetLayoutBinding bindings[];
-} qfv_bindingset_t;
+typedef struct qfv_bindingset_s
+	DARRAY_TYPE (VkDescriptorSetLayoutBinding) qfv_bindingset_t;
 
-typedef struct qfv_descriptorsetlayout_s {
-	struct qfv_device_s *device;
-	VkDescriptorSetLayout layout;
-} qfv_descriptorsetlayout_t;
-
-typedef struct qfv_descriptorsetlayoutset_s {
-	uint32_t    numLayouts;
-	qfv_descriptorsetlayout_t *layouts[];
-} qfv_descriptorsetlayoutset_t;
+typedef struct qfv_descriptorsetlayoutset_s
+	DARRAY_TYPE (VkDescriptorSetLayout) qfv_descriptorsetlayoutset_t;
 
 #define QFV_AllocDescriptorSetLayoutSet(num, allocator) \
-    allocator (field_offset (qfv_descriptorsetlayoutset_t, layouts[num]))
+	DARRAY_ALLOCFIXED (qfv_descriptorsetlayoutset_t, num, allocator)
 
+typedef struct qfv_descriptorsets_s
+	DARRAY_TYPE (VkDescriptorSet) qfv_descriptorsets_t;
 
-typedef struct qfv_descriptorpool_s {
-	struct qfv_device_s *device;
-	VkDescriptorPool pool;
-} qfv_descriptorpool_t;
+#define QFV_AllocDescriptorSets(num, allocator) \
+	DARRAY_ALLOCFIXED (qfv_descriptorsets_t, num, allocator)
 
-typedef struct qfv_descriptorset_s {
-	struct qfv_device_s *device;
-	qfv_descriptorpool_t *pool;
-	VkDescriptorSet set;
-} qfv_descriptorset_t;
+typedef struct qfv_writedescriptorsets_s
+	DARRAY_TYPE (VkWriteDescriptorSet) qfv_writedescriptorsets_t;
 
-typedef struct qfv_imagedescriptorinfo_s {
-	qfv_descriptorset_t *descriptorset;
-	uint32_t    binding;
-	uint32_t    arrayElement;
-	VkDescriptorType type;
-	uint32_t    numInfo;
-	VkDescriptorImageInfo infos[];
-} qfv_imagedescriptorinfo_t;
+#define QFV_AllocWriteDescriptorSets(num, allocator) \
+	DARRAY_ALLOCFIXED (qfv_writedescriptorsets_t, num, allocator)
 
-typedef struct qfv_bufferdescriptorinfo_s {
-	qfv_descriptorset_t *descriptorset;
-	uint32_t    binding;
-	uint32_t    arrayElement;
-	VkDescriptorType type;
-	uint32_t    numInfo;
-	VkDescriptorBufferInfo infos[];
-} qfv_bufferdescriptorinfo_t;
+typedef struct qfv_copydescriptorsets_s
+	DARRAY_TYPE (VkCopyDescriptorSet) qfv_copydescriptorsets_t;
 
-typedef struct qfv_texelbufferdescriptorinfo_s {
-	qfv_descriptorset_t *descriptorset;
-	uint32_t    binding;
-	uint32_t    arrayElement;
-	VkDescriptorType type;
-	uint32_t    numInfo;
-	VkBufferView infos[];
-} qfv_texelbufferdescriptorinfo_t;
+#define QFV_AllocCopyDescriptorSets(num, allocator) \
+	DARRAY_ALLOCFIXED (qfv_descriptorsetlayoutset_t, num, allocator)
 
-typedef struct qfv_copydescriptorinfo_s {
-	qfv_descriptorset_t *dstSet;
-	uint32_t    dstBinding;
-	uint32_t    dstArrayElement;
-	qfv_descriptorset_t *srcSet;
-	uint32_t    srcBinding;
-	uint32_t    srcArrayElement;
-	uint32_t    descriptorCount;
-} qfv_copydescriptorinfo_t;
+struct qfv_device_s;
 
-qfv_sampler_t *QFV_CreateSampler (struct qfv_device_s *device,
-								  VkFilter magFilter, VkFilter minFilter,
-								  VkSamplerMipmapMode mipmapMode,
-								  VkSamplerAddressMode addressModeU,
-								  VkSamplerAddressMode addressModeV,
-								  VkSamplerAddressMode addressModeW,
-								  float mipLodBias,
-								  VkBool32 anisotryEnable, float maxAnisotropy,
-								  VkBool32 compareEnable, VkCompareOp compareOp,
-								  float minLod, float maxLod,
-								  VkBorderColor borderColor,
-								  VkBool32 unnormalizedCoordinates);
+VkSampler QFV_CreateSampler (struct qfv_device_s *device,
+							 VkFilter magFilter, VkFilter minFilter,
+							 VkSamplerMipmapMode mipmapMode,
+							 VkSamplerAddressMode addressModeU,
+							 VkSamplerAddressMode addressModeV,
+							 VkSamplerAddressMode addressModeW,
+							 float mipLodBias,
+							 VkBool32 anisotryEnable, float maxAnisotropy,
+							 VkBool32 compareEnable, VkCompareOp compareOp,
+							 float minLod, float maxLod,
+							 VkBorderColor borderColor,
+							 VkBool32 unnormalizedCoordinates);
 
-qfv_bindingset_t *QFV_CreateBindingSet (int numBindings);
-void QFV_DestroyBindingSet (qfv_bindingset_t *bindingset);
-
-qfv_descriptorsetlayout_t *
+VkDescriptorSetLayout
 QFV_CreateDescriptorSetLayout (struct qfv_device_s *device,
 							   qfv_bindingset_t *bindings);
 
-qfv_descriptorpool_t *
+VkDescriptorPool
 QFV_CreateDescriptorPool (struct qfv_device_s *device,
 						  VkDescriptorPoolCreateFlags flags, uint32_t maxSets,
 						  qfv_bindingset_t *bindings);
 
-qfv_descriptorset_t *
-QFV_AllocateDescriptorSet (qfv_descriptorpool_t *pool,
-						   qfv_descriptorsetlayout_t *layout);
-
-#define QFV_allocateinfo(type, num, allocator) \
-	allocator (field_offset (type, infos[num]))
-#define QFV_ImageDescriptorInfo(num, allocator) \
-	QFV_allocateinfo(qfv_imagedescriptorinfo_t, num, allocator)
-#define QFV_BufferDescriptorInfo(num, allocator) \
-	QFV_allocateinfo(qfv_bufferdescriptorinfo_t, num, allocator)
-#define QFV_TexelBufferDescriptorInfo(num, allocator) \
-	QFV_allocateinfo(qfv_texelbufferdescriptorinfo_t, num, allocator)
-
-void
-QFV_UpdateDescriptorSets (struct qfv_device_s *device,
-						  uint32_t numImageInfos,
-                          qfv_imagedescriptorinfo_t *imageInfos,
-                          uint32_t numBufferInfos,
-                          qfv_bufferdescriptorinfo_t *bufferInfos,
-                          uint32_t numTexelBufferInfos,
-                          qfv_texelbufferdescriptorinfo_t *texelbufferInfos,
-                          uint32_t numCopyInfos,
-                          qfv_copydescriptorinfo_t *copyInfos);
-
-void QFV_FreeDescriptorSet (qfv_descriptorset_t *set);
-void QFV_ResetDescriptorPool (qfv_descriptorpool_t *pool);
-void QFV_DestroyDescriptorPool (qfv_descriptorpool_t *pool);
-void QFV_DestroyDescriptorSetLayout (qfv_descriptorsetlayout_t *layout);
-void QFV_DestroySampler (qfv_sampler_t *sampler);
-
+qfv_descriptorsets_t *
+QFV_AllocateDescriptorSet (struct qfv_device_s *device,
+						   VkDescriptorPool pool,
+						   qfv_descriptorsetlayoutset_t *layouts);
 
 #endif//__QF_Vulkan_descriptor_h
diff --git a/libs/video/renderer/vulkan/descriptor.c b/libs/video/renderer/vulkan/descriptor.c
index cc9cce6d4..7610a8fd9 100644
--- a/libs/video/renderer/vulkan/descriptor.c
+++ b/libs/video/renderer/vulkan/descriptor.c
@@ -61,7 +61,7 @@
 
 #include "util.h"
 
-qfv_sampler_t *
+VkSampler
 QFV_CreateSampler (qfv_device_t *device,
 				   VkFilter magFilter, VkFilter minFilter,
                    VkSamplerMipmapMode mipmapMode,
@@ -90,29 +90,12 @@ QFV_CreateSampler (qfv_device_t *device,
 		borderColor, unnormalizedCoordinates,
 	};
 
-	qfv_sampler_t *sampler = malloc (sizeof (*sampler));
-	sampler->device = device;
-	dfunc->vkCreateSampler (dev, &createInfo, 0, &sampler->sampler);
+	VkSampler sampler;
+	dfunc->vkCreateSampler (dev, &createInfo, 0, &sampler);
 	return sampler;
 }
 
-qfv_bindingset_t *
-QFV_CreateBindingSet (int numBindings)
-{
-	qfv_bindingset_t *bindingset;
-	bindingset = malloc (field_offset (qfv_bindingset_t,
-									   bindings[numBindings]));
-	bindingset->numBindings = numBindings;
-	return bindingset;
-}
-
-void
-QFV_DestroyBindingSet (qfv_bindingset_t *bindingset)
-{
-	free (bindingset);
-}
-
-qfv_descriptorsetlayout_t *
+VkDescriptorSetLayout
 QFV_CreateDescriptorSetLayout (qfv_device_t *device,
                                qfv_bindingset_t *bindingset)
 {
@@ -122,12 +105,11 @@ QFV_CreateDescriptorSetLayout (qfv_device_t *device,
 	VkDescriptorSetLayoutCreateInfo createInfo = {
 		VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO, 0,
 		0,
-		bindingset->numBindings, bindingset->bindings,
+		bindingset->size, bindingset->a,
 	};
 
-	qfv_descriptorsetlayout_t *layout = malloc (sizeof (layout));
-	layout->device = device;
-	dfunc->vkCreateDescriptorSetLayout (dev, &createInfo, 0, &layout->layout);
+	VkDescriptorSetLayout layout;
+	dfunc->vkCreateDescriptorSetLayout (dev, &createInfo, 0, &layout);
 	return layout;
 }
 
@@ -151,7 +133,7 @@ poolsize_compmare (const void *ele1, const void *ele2, void *unused)
 }
 
 //FIXME not thread-safe
-qfv_descriptorpool_t *
+VkDescriptorPool
 QFV_CreateDescriptorPool (qfv_device_t *device,
 						  VkDescriptorPoolCreateFlags flags, uint32_t maxSets,
                           qfv_bindingset_t *bindings)
@@ -170,8 +152,8 @@ QFV_CreateDescriptorPool (qfv_device_t *device,
 	poolsize_next = poolsize_pool;
 
 	VkDescriptorPoolSize *ps;
-	for (int i = 0; i < bindings->numBindings; i++) {
-		VkDescriptorPoolSize test = { bindings->bindings[i].descriptorType, 0 };
+	for (size_t i = 0; i < bindings->size; i++) {
+		VkDescriptorPoolSize test = { bindings->a[i].descriptorType, 0 };
 		ps = Hash_FindElement (poolsizes, &test);
 		if (!ps) {
 			ps = poolsize_next++;
@@ -183,7 +165,7 @@ QFV_CreateDescriptorPool (qfv_device_t *device,
 		}
 		//XXX is descriptorCount correct?
 		//FIXME assumes only one layout is used with this pool
-		ps->descriptorCount += bindings->bindings[i].descriptorCount * maxSets;
+		ps->descriptorCount += bindings->a[i].descriptorCount * maxSets;
 	}
 
 	VkDescriptorPoolCreateInfo createInfo = {
@@ -191,155 +173,26 @@ QFV_CreateDescriptorPool (qfv_device_t *device,
 		flags, maxSets, poolsize_next - poolsize_pool, poolsize_pool,
 	};
 
-	qfv_descriptorpool_t *descriptorpool = malloc (sizeof (descriptorpool));
-	descriptorpool->device = device;
-	dfunc->vkCreateDescriptorPool (dev, &createInfo, 0, &descriptorpool->pool);
-	return descriptorpool;
+	VkDescriptorPool pool;
+	dfunc->vkCreateDescriptorPool (dev, &createInfo, 0, &pool);
+	return pool;
 }
 
-qfv_descriptorset_t *
-QFV_AllocateDescriptorSet (qfv_descriptorpool_t *pool,
-                           qfv_descriptorsetlayout_t *layout)
+qfv_descriptorsets_t *
+QFV_AllocateDescriptorSet (qfv_device_t *device,
+						   VkDescriptorPool pool,
+                           qfv_descriptorsetlayoutset_t *layouts)
 {
-	qfv_device_t *device = pool->device;
 	VkDevice    dev = device->dev;
 	qfv_devfuncs_t *dfunc = device->funcs;
 
 	VkDescriptorSetAllocateInfo allocateInfo = {
 		VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO, 0,
-		pool->pool, 1, &layout->layout,
+		pool, layouts->size, layouts->a,
 	};
 
-	qfv_descriptorset_t *descriptorset = malloc (sizeof (*descriptorset));
-	descriptorset->device = device;
-	descriptorset->pool = pool;
-	dfunc->vkAllocateDescriptorSets (dev, &allocateInfo, &descriptorset->set);
-	return descriptorset;
-}
-
-void
-QFV_UpdateDescriptorSets (qfv_device_t *device,
-						  uint32_t numImageInfos,
-						  qfv_imagedescriptorinfo_t *imageInfos,
-						  uint32_t numBufferInfos,
-						  qfv_bufferdescriptorinfo_t *bufferInfos,
-						  uint32_t numTexelBufferInfos,
-						  qfv_texelbufferdescriptorinfo_t *texelbufferInfos,
-						  uint32_t numCopyInfos,
-						  qfv_copydescriptorinfo_t *copyInfos)
-{
-	VkDevice    dev = device->dev;
-	qfv_devfuncs_t *dfunc = device->funcs;
-
-	uint32_t numWrite = 0;
-	numWrite += numImageInfos;
-	numWrite += numBufferInfos;
-	numWrite += numTexelBufferInfos;
-	VkWriteDescriptorSet *writeSets = alloca (numWrite * sizeof (*writeSets));
-	VkWriteDescriptorSet *writeSet = writeSets;
-	for (uint32_t i = 0; i < numImageInfos; i++, writeSet++) {
-		writeSet->sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
-		writeSet->pNext = 0;
-		writeSet->dstSet = imageInfos[i].descriptorset->set;
-		writeSet->dstBinding = imageInfos[i].binding;
-		writeSet->dstArrayElement = imageInfos[i].arrayElement;
-		writeSet->descriptorCount = imageInfos[i].numInfo;
-		writeSet->descriptorType = imageInfos[i].type;
-		writeSet->pImageInfo = imageInfos[i].infos;
-		writeSet->pBufferInfo = 0;
-		writeSet->pTexelBufferView = 0;
-	}
-	for (uint32_t i = 0; i < numBufferInfos; i++, writeSet++) {
-		writeSet->sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
-		writeSet->pNext = 0;
-		writeSet->dstSet = bufferInfos[i].descriptorset->set;
-		writeSet->dstBinding = bufferInfos[i].binding;
-		writeSet->dstArrayElement = bufferInfos[i].arrayElement;
-		writeSet->descriptorCount = bufferInfos[i].numInfo;
-		writeSet->descriptorType = bufferInfos[i].type;
-		writeSet->pImageInfo = 0;
-		writeSet->pBufferInfo = bufferInfos[i].infos;
-		writeSet->pTexelBufferView = 0;
-	}
-	for (uint32_t i = 0; i < numTexelBufferInfos; i++, writeSet++) {
-		writeSet->sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
-		writeSet->pNext = 0;
-		writeSet->dstSet = bufferInfos[i].descriptorset->set;
-		writeSet->dstBinding = texelbufferInfos[i].binding;
-		writeSet->dstArrayElement = texelbufferInfos[i].arrayElement;
-		writeSet->descriptorCount = texelbufferInfos[i].numInfo;
-		writeSet->descriptorType = texelbufferInfos[i].type;
-		writeSet->pImageInfo = 0;
-		writeSet->pBufferInfo = 0;
-		writeSet->pTexelBufferView = texelbufferInfos[i].infos;
-	}
-	VkCopyDescriptorSet *copySets = alloca (numWrite * sizeof (*copySets));
-	VkCopyDescriptorSet *copySet = copySets;
-	for (uint32_t i = 0; i < numCopyInfos; i++, copySet++) {
-		copySet->sType = VK_STRUCTURE_TYPE_COPY_DESCRIPTOR_SET;
-		copySet->pNext = 0;
-		copySet->srcSet = copyInfos[i].srcSet->set;
-		copySet->srcBinding = copyInfos[i].srcBinding;
-		copySet->srcArrayElement = copyInfos[i].srcArrayElement;
-		copySet->dstSet = copyInfos[i].dstSet->set;
-		copySet->dstBinding = copyInfos[i].dstBinding;
-		copySet->dstArrayElement = copyInfos[i].dstArrayElement;
-		copySet->descriptorCount = copyInfos[i].descriptorCount;
-	}
-	dfunc->vkUpdateDescriptorSets (dev, numWrite, writeSets,
-								   numCopyInfos, copySets);
-}
-
-void
-QFV_FreeDescriptorSet (qfv_descriptorset_t *set)
-{
-	qfv_device_t *device = set->device;
-	VkDevice    dev = device->dev;
-	qfv_devfuncs_t *dfunc = device->funcs;
-	VkDescriptorPool pool = set->pool->pool;
-
-	dfunc->vkFreeDescriptorSets (dev, pool, 1, &set->set);
-}
-
-void
-QFV_ResetDescriptorPool (qfv_descriptorpool_t *pool)
-{
-	qfv_device_t *device = pool->device;
-	VkDevice    dev = device->dev;
-	qfv_devfuncs_t *dfunc = device->funcs;
-
-	dfunc->vkResetDescriptorPool (dev, pool->pool, 0);
-}
-
-void
-QFV_DestroyDescriptorPool (qfv_descriptorpool_t *pool)
-{
-	qfv_device_t *device = pool->device;
-	VkDevice    dev = device->dev;
-	qfv_devfuncs_t *dfunc = device->funcs;
-
-	dfunc->vkDestroyDescriptorPool (dev, pool->pool, 0);
-	free (pool);
-}
-
-void
-QFV_DestroyDescriptorSetLayout (qfv_descriptorsetlayout_t *layout)
-{
-	qfv_device_t *device = layout->device;
-	VkDevice    dev = device->dev;
-	qfv_devfuncs_t *dfunc = device->funcs;
-
-	dfunc->vkDestroyDescriptorSetLayout (dev, layout->layout, 0);
-	free (layout);
-}
-
-void
-QFV_DestroySampler (qfv_sampler_t *sampler)
-{
-	qfv_device_t *device = sampler->device;
-	VkDevice    dev = device->dev;
-	qfv_devfuncs_t *dfunc = device->funcs;
-
-	dfunc->vkDestroySampler (dev, sampler->sampler, 0);
-	free (sampler);
+	__auto_type descriptorsets
+		= QFV_AllocDescriptorSets (layouts->size, malloc);
+	dfunc->vkAllocateDescriptorSets (dev, &allocateInfo, descriptorsets->a);
+	return descriptorsets;
 }
diff --git a/libs/video/renderer/vulkan/pipeline.c b/libs/video/renderer/vulkan/pipeline.c
index 0dd5f260e..18babb115 100644
--- a/libs/video/renderer/vulkan/pipeline.c
+++ b/libs/video/renderer/vulkan/pipeline.c
@@ -154,22 +154,16 @@ QFV_DestroyPipelineCache (qfv_pipelinecache_t *cache)
 
 qfv_pipelinelayout_t *
 QFV_CreatePipelineLayout (qfv_device_t *device,
-						  qfv_descriptorsetlayoutset_t *layoutset,
+						  qfv_descriptorsetlayoutset_t *layouts,
                           qfv_pushconstantrangeset_t *pushConstants)
 {
 	VkDevice    dev = device->dev;
 	qfv_devfuncs_t *dfunc = device->funcs;
 
-	uint32_t    numLayouts = layoutset->numLayouts;
-	VkDescriptorSetLayout *layouts = alloca (numLayouts * sizeof (*layouts));
-
-	for (uint32_t i = 0; i < numLayouts; i++) {
-		layouts[i] = layoutset->layouts[i]->layout;
-	}
-
 	VkPipelineLayoutCreateInfo createInfo = {
 		VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO, 0, 0,
-		numLayouts, layouts, pushConstants->numRanges, pushConstants->ranges,
+		layouts->size, layouts->a,
+		pushConstants->numRanges, pushConstants->ranges,
 	};
 
 	qfv_pipelinelayout_t *layout = malloc (sizeof (layout));

From ad175d054bfb2fb3cd11b3018deb2d5a8ceb5803 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 18 Feb 2020 22:38:01 +0900
Subject: [PATCH 0423/1519] Sanitize pipelines

wow, talk about doing things the wrong way. I guess that's the problem
with following a book targeted for C++: you get all that safety-goat
nonsense.
---
 include/QF/Vulkan/pipeline.h          | 164 +++--------
 libs/video/renderer/vulkan/pipeline.c | 403 ++------------------------
 2 files changed, 68 insertions(+), 499 deletions(-)

diff --git a/include/QF/Vulkan/pipeline.h b/include/QF/Vulkan/pipeline.h
index 2120e2317..f77585217 100644
--- a/include/QF/Vulkan/pipeline.h
+++ b/include/QF/Vulkan/pipeline.h
@@ -3,23 +3,11 @@
 
 #include "QF/darray.h"
 
-typedef struct qfv_shadermodule_s {
-	struct qfv_device_s *device;
-	VkShaderModule module;
-} qfv_shadermodule_t;
+typedef struct qfv_pipelineshaderstateset_s
+	DARRAY_TYPE (VkPipelineShaderStageCreateInfo) qfv_pipelineshaderstateset_s;
 
-typedef struct qfv_shaderstageparams_s {
-	VkShaderStageFlagBits stageFlags;
-	qfv_shadermodule_t *module;
-	const char *entryPointName;
-	const VkSpecializationInfo *specializationInfo;
-} qfv_shaderstageparams_t;
-
-typedef struct qfv_shaderstageparamsset_s
-	DARRAY_TYPE (qfv_shaderstageparams_t) qfv_shaderstageparamsset_t;
-
-#define QFV_AllocShaderParamsSet(num, allocator) \
-	DARRAY_ALLOCFIXED (qfv_shaderstageparamsset_t, num, allocator)
+#define QFV_AllocPipelineShaderStageSet(num, allocator) \
+	DARRAY_ALLOCFIXED (qfv_pipelineshaderstateset_s, num, allocator)
 
 typedef struct qfv_vertexinputbindingset_s
 	DARRAY_TYPE (VkVertexInputBindingDescription)  qfv_vertexinputbindingset_t;
@@ -48,21 +36,15 @@ typedef struct qfv_pipelinetessellation_s {
 	uint32_t    patchControlPoints;
 } qfv_pipelinetessellation_t;
 
-typedef struct qfv_viewportset_s {
-	uint32_t    numViewports;
-	VkViewport  viewports[];
-} qfv_viewportset_t;
+typedef struct qfv_viewportset_s DARRAY_TYPE (VkViewport) qfv_viewportset_t;
 
 #define QFV_AllocViewportSet(num, allocator) \
-    allocator (field_offset (qfv_viewportset_t, viewports[num]))
+    DARRAY_ALLOCFIXED (qfv_viewportset_t, num, allocator)
 
-typedef struct qfv_scissorsset_s {
-	uint32_t    numScissors;
-	VkRect2D    scissors[];
-} qfv_scissorsset_t;
+typedef struct qfv_scissorsset_s DARRAY_TYPE (VkRect2D) qfv_scissorsset_t;
 
 #define QFV_AllocScissorsSet(num, allocator) \
-    allocator (field_offset (qfv_scissorsset_t, scissors[num]))
+    DARRAY_ALLOCFIXED (qfv_scissorsset_t, num, allocator)
 
 typedef struct qfv_viewportinfo_s {
 	qfv_viewportset_t *viewportset;
@@ -103,139 +85,73 @@ typedef struct qfv_pipelinedepthandstencil_s {
 	float       maxDepthBounds;
 } qfv_pipelinedepthandstencil_t;
 
-typedef struct qfv_blendattachmentset_s {
-	uint32_t    numAttachments;
-	VkPipelineColorBlendAttachmentState attachments[];
-} qfv_blendattachmentset_t;
+typedef struct qfv_blendattachmentset_s
+	DARRAY_TYPE (VkPipelineColorBlendAttachmentState) qfv_blendattachmentset_t;
 
 #define QFV_AllocBlendAttachmentSet(num, allocator) \
-    allocator (field_offset (qfv_blendattachmentset_t, attachments[num]))
+    DARRAY_ALLOCFIXED (qfv_blendattachmentset_t, num, allocator)
 
-typedef struct qfv_pipelineblend_s {
-	VkBool32    logicOpEnable;
-	VkLogicOp   logicOp;
-	qfv_blendattachmentset_t *blendAttachments;
-	float       blendConstants[4];
-} qfv_pipelineblend_t;
-
-typedef struct qfv_dynamicstateset_s {
-	uint32_t    numStates;
-	VkDynamicState states[];
-} qfv_dynamicstateset_t;
+typedef struct qfv_dynamicstateset_s
+	DARRAY_TYPE (VkDynamicState) qfv_dynamicstateset_t;
 
 #define QFV_AllocDynamicStateSet(num, allocator) \
-    allocator (field_offset (qfv_dynamicstateset_t, states[num]))
+    DARRAY_ALLOCFIXED (qfv_dynamicstateset_t, num, allocator)
 
-typedef struct qfv_pushconstantrangeset_s {
-	uint32_t    numRanges;
-	VkPushConstantRange ranges[];
-} qfv_pushconstantrangeset_t;
+typedef struct qfv_pushconstantrangeset_s
+	DARRAY_TYPE (VkPushConstantRange) qfv_pushconstantrangeset_t;
 
 #define QFV_AllocPushConstantRangeSet(num, allocator) \
-    allocator (field_offset (qfv_pushconstantrangeset_t, ranges[num]))
+    DARRAY_ALLOCFIXED (qfv_pushconstantrangeset_t, num, allocator)
 
-typedef struct qfv_pipelinelayout_s {
-	struct qfv_device_s *device;
-	VkPipelineLayout  layout;
-} qfv_pipelinelayout_t;
-
-typedef struct qfv_pipeline_s {
-	struct qfv_device_s *device;
-	VkPipeline  pipeline;
-} qfv_pipeline_t;
-
-typedef struct qfv_pipelineset_s {
-	uint32_t    numPipelines;
-	qfv_pipeline_t *pipelines[];
-} qfv_pipelineset_t;
+typedef struct qfv_pipelineset_s DARRAY_TYPE (VkPipeline) qfv_pipelineset_t;
 
 #define QFV_AllocPipelineSet(num, allocator) \
-    allocator (field_offset (qfv_pipelineset_t, pipelines[num]))
+    DARRAY_ALLOCFIXED (qfv_pipelineset_t, num, allocator)
 
-typedef struct qfv_graphicspipelinecreateinfo_s {
-	VkPipelineCreateFlags flags;
-	qfv_shaderstageparamsset_t *stages;
-	qfv_vertexinputstate_t *vertexState;
-	qfv_pipelineinputassembly_t *inputAssemblyState;
-	qfv_pipelinetessellation_t *tessellationState;
-	qfv_viewportinfo_t *viewportState;
-	qfv_pipelinerasterization_t *rasterizationState;
-	qfv_pipelinemultisample_t *multisampleState;
-	qfv_pipelinedepthandstencil_t *depthStencilState;
-	qfv_pipelineblend_t *colorBlendState;
-	qfv_dynamicstateset_t *dynamicState;
-	qfv_pipelinelayout_t *layout;
-	VkRenderPass renderPass;
-	uint32_t    subpass;
-	qfv_pipeline_t *basePipeline;
-	int32_t     basePipelineIndex;
-} qfv_graphicspipelinecreateinfo_t;
-
-typedef struct qfv_graphicspipelinecreateinfoset_s {
-	uint32_t    numPipelines;
-	qfv_graphicspipelinecreateinfo_t *pipelines[];
-} qfv_graphicspipelinecreateinfoset_t;
+typedef struct qfv_graphicspipelinecreateinfoset_s
+	DARRAY_TYPE (VkGraphicsPipelineCreateInfo)
+		qfv_graphicspipelinecreateinfoset_t;
 
 #define QFV_AllocGraphicsPipelineCreateInfoSet(num, allocator) \
-    allocator (field_offset (qfv_graphicspipelinecreateinfoset_t, \
-							 pipelines[num]))
+    DARRAY_ALLOCFIXED (qfv_graphicspipelinecreateinfoset_t, num, allocator)
 
-typedef struct qfv_computepipelinecreateinfo_s {
-	VkPipelineCreateFlags flags;
-	qfv_shaderstageparams_t *stage;
-	qfv_pipelinelayout_t *layout;
-	qfv_pipeline_t *basePipeline;
-	int32_t     basePipelineIndex;
-} qfv_computepipelinecreateinfo_t;
-
-typedef struct qfv_computepipelinecreateinfoset_s {
-	uint32_t    numPipelines;
-	qfv_computepipelinecreateinfo_t *pipelines[];
-} qfv_computepipelinecreateinfoset_t;
+typedef struct qfv_computepipelinecreateinfoset_s
+	DARRAY_TYPE (VkComputePipelineCreateInfo)
+		qfv_computepipelinecreateinfoset_t;
 
 #define QFV_AllocComputePipelineCreateInfoSet(num, allocator) \
-    allocator (field_offset (qfv_computepipelinecreateinfoset_t, \
-							 pipelines[num]))
+    DARRAY_ALLOCFIXED (qfv_computepipelinecreateinfoset_t, num, allocator)
 
-typedef struct qfv_pipelinecache_s {
-	struct qfv_device_s *device;
-	VkPipelineCache cache;
-} qfv_pipelinecache_t;
-
-typedef struct qfv_pipelinecacheset_s {
-	uint32_t    numCaches;
-	qfv_pipelinecache_t *caches[];
-} qfv_pipelinecacheset_t;
+typedef struct qfv_pipelinecacheset_s
+	DARRAY_TYPE (VkPipelineCache) qfv_pipelinecacheset_t;
 
 #define QFV_AllocPipelineCacheSet(num, allocator) \
-    allocator (field_offset (qfv_pipelinecacheset_t, caches[num]))
+    DARRAY_ALLOCFIXED (qfv_pipelinecacheset_t, num, allocator)
 
-qfv_shadermodule_t *QFV_CreateShaderModule (struct qfv_device_s *device,
+VkShaderModule QFV_CreateShaderModule (struct qfv_device_s *device,
 											size_t size, const uint32_t *code);
-void QFV_DestroyShaderModule (qfv_shadermodule_t *module);
 
 struct dstring_s;
-qfv_pipelinecache_t *QFV_CreatePipelineCache (struct qfv_device_s *device,
-											  struct dstring_s *cacheData);
-struct dstring_s *QFV_GetPipelineCacheData (qfv_pipelinecache_t *cache);
-void QFV_MergePipelineCaches (qfv_pipelinecache_t *targetCache,
+VkPipelineCache QFV_CreatePipelineCache (struct qfv_device_s *device,
+										 struct dstring_s *cacheData);
+struct dstring_s *QFV_GetPipelineCacheData (struct qfv_device_s *device,
+											VkPipelineCache cache);
+void QFV_MergePipelineCaches (struct qfv_device_s *device,
+							  VkPipelineCache targetCache,
 							  qfv_pipelinecacheset_t *sourceCaches);
-void QFV_DestroyPipelineCache (qfv_pipelinecache_t *cache);
 
 struct qfv_descriptorsetlayoutset_s;
-qfv_pipelinelayout_t *
+VkPipelineLayout
 QFV_CreatePipelineLayout (struct qfv_device_s *device,
 						  struct qfv_descriptorsetlayoutset_s *layouts,
 						  qfv_pushconstantrangeset_t *pushConstants);
-void QFV_DestroyPipelineLayout (qfv_pipelinelayout_t *layout);
 qfv_pipelineset_t *
 QFV_CreateGraphicsPipelines (struct qfv_device_s *device,
-							 qfv_pipelinecache_t *cache,
+							 VkPipelineCache cache,
 							 qfv_graphicspipelinecreateinfoset_t *gpciSet);
 qfv_pipelineset_t *
 QFV_CreateComputePipelines (struct qfv_device_s *device,
-							qfv_pipelinecache_t *cache,
+							VkPipelineCache cache,
 							qfv_computepipelinecreateinfoset_t *cpciSet);
-void QFV_DestroyPipeline (qfv_pipeline_t *pipeline);
 
 #endif//__QF_Vulkan_pipeline_h
diff --git a/libs/video/renderer/vulkan/pipeline.c b/libs/video/renderer/vulkan/pipeline.c
index 18babb115..119fbf303 100644
--- a/libs/video/renderer/vulkan/pipeline.c
+++ b/libs/video/renderer/vulkan/pipeline.c
@@ -64,7 +64,7 @@
 
 #include "util.h"
 
-qfv_shadermodule_t *
+VkShaderModule
 QFV_CreateShaderModule (qfv_device_t *device,
 						size_t size, const uint32_t *code)
 {
@@ -76,24 +76,12 @@ QFV_CreateShaderModule (qfv_device_t *device,
 		size, code,
 	};
 
-	qfv_shadermodule_t *module = malloc (sizeof (*module));
-	module->device = device;
-	dfunc->vkCreateShaderModule (dev, &createInfo, 0, &module->module);
+	VkShaderModule module;
+	dfunc->vkCreateShaderModule (dev, &createInfo, 0, &module);
 	return module;
 }
 
-void
-QFV_DestroyShaderModule (qfv_shadermodule_t *module)
-{
-	qfv_device_t *device = module->device;
-	VkDevice    dev = device->dev;
-	qfv_devfuncs_t *dfunc = device->funcs;
-
-	dfunc->vkDestroyShaderModule (dev, module->module, 0);
-	free (module);
-}
-
-qfv_pipelinecache_t *
+VkPipelineCache
 QFV_CreatePipelineCache (qfv_device_t *device, dstring_t *cacheData)
 {
 	VkDevice    dev = device->dev;
@@ -104,55 +92,38 @@ QFV_CreatePipelineCache (qfv_device_t *device, dstring_t *cacheData)
 		cacheData->size, cacheData->str,
 	};
 
-	qfv_pipelinecache_t *cache = malloc (sizeof (*cache));
-	cache->device = device;
-	dfunc->vkCreatePipelineCache (dev, &createInfo, 0, &cache->cache);
+	VkPipelineCache cache;
+	dfunc->vkCreatePipelineCache (dev, &createInfo, 0, &cache);
 	return cache;
 }
 
 dstring_t *
-QFV_GetPipelineCacheData (qfv_pipelinecache_t *cache)
+QFV_GetPipelineCacheData (qfv_device_t *device, VkPipelineCache cache)
 {
-	qfv_device_t *device = cache->device;
 	VkDevice    dev = device->dev;
 	qfv_devfuncs_t *dfunc = device->funcs;
 	dstring_t  *cacheData = dstring_new ();
 
-	dfunc->vkGetPipelineCacheData (dev, cache->cache, &cacheData->size, 0);
+	dfunc->vkGetPipelineCacheData (dev, cache, &cacheData->size, 0);
 	dstring_adjust (cacheData);
-	dfunc->vkGetPipelineCacheData (dev, cache->cache, &cacheData->size,
-								   cacheData->str);
+	dfunc->vkGetPipelineCacheData (dev, cache,
+								   &cacheData->size, cacheData->str);
 	return cacheData;
 }
 
 void
-QFV_MergePipelineCaches (qfv_pipelinecache_t *targetCache,
+QFV_MergePipelineCaches (qfv_device_t *device,
+						 VkPipelineCache targetCache,
 						 qfv_pipelinecacheset_t *sourceCaches)
 {
-	qfv_device_t *device = targetCache->device;
 	VkDevice    dev = device->dev;
 	qfv_devfuncs_t *dfunc = device->funcs;
 
-	VkPipelineCache *srcCaches = alloca (sourceCaches->numCaches
-										 * sizeof (*srcCaches));
-	for (uint32_t i = 0; i < sourceCaches->numCaches; i++) {
-		srcCaches[i] = sourceCaches->caches[i]->cache;
-	}
-	dfunc->vkMergePipelineCaches (dev, targetCache->cache,
-								  sourceCaches->numCaches, srcCaches);
+	dfunc->vkMergePipelineCaches (dev, targetCache,
+								  sourceCaches->size, sourceCaches->a);
 }
 
-void
-QFV_DestroyPipelineCache (qfv_pipelinecache_t *cache)
-{
-	qfv_device_t *device = cache->device;
-	VkDevice    dev = device->dev;
-	qfv_devfuncs_t *dfunc = device->funcs;
-
-	dfunc->vkDestroyPipelineCache (dev, cache->cache, 0);
-}
-
-qfv_pipelinelayout_t *
+VkPipelineLayout
 QFV_CreatePipelineLayout (qfv_device_t *device,
 						  qfv_descriptorsetlayoutset_t *layouts,
                           qfv_pushconstantrangeset_t *pushConstants)
@@ -163,357 +134,39 @@ QFV_CreatePipelineLayout (qfv_device_t *device,
 	VkPipelineLayoutCreateInfo createInfo = {
 		VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO, 0, 0,
 		layouts->size, layouts->a,
-		pushConstants->numRanges, pushConstants->ranges,
+		pushConstants->size, pushConstants->a,
 	};
 
-	qfv_pipelinelayout_t *layout = malloc (sizeof (layout));
-	layout->device = device;
-	dfunc->vkCreatePipelineLayout (dev, &createInfo, 0, &layout->layout);
+	VkPipelineLayout layout;
+	dfunc->vkCreatePipelineLayout (dev, &createInfo, 0, &layout);
 	return layout;
 }
 
-void
-QFV_DestroyPipelineLayout (qfv_pipelinelayout_t *layout)
-{
-	qfv_device_t *device = layout->device;
-	VkDevice    dev = device->dev;
-	qfv_devfuncs_t *dfunc = device->funcs;
-
-	dfunc->vkDestroyPipelineLayout (dev, layout->layout, 0);
-	free (layout);
-}
-
-static VkPipelineShaderStageCreateInfo
-shaderStageCI (qfv_shaderstageparams_t params)
-{
-	VkPipelineShaderStageCreateInfo createInfo = {
-		VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO, 0, 0,
-		params.stageFlags, params.module->module,
-		params.entryPointName, params.specializationInfo,
-	};
-	return createInfo;
-}
-
-static VkPipelineVertexInputStateCreateInfo
-vertexInputSCI (qfv_vertexinputstate_t vertexState)
-{
-	VkPipelineVertexInputStateCreateInfo createInfo = {
-		VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO, 0, 0,
-		vertexState.bindings->size,
-		vertexState.bindings->a,
-		vertexState.attributes->size,
-		vertexState.attributes->a,
-	};
-	return createInfo;
-}
-
-static VkPipelineInputAssemblyStateCreateInfo
-inputAssemblySCI (qfv_pipelineinputassembly_t inputAssemblyState)
-{
-	VkPipelineInputAssemblyStateCreateInfo createInfo = {
-		VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO, 0, 0,
-		inputAssemblyState.topology,
-		inputAssemblyState.primativeRestartEnable,
-	};
-	return createInfo;
-}
-
-static VkPipelineTessellationStateCreateInfo
-tessellationSCI (qfv_pipelinetessellation_t tessellationState)
-{
-	VkPipelineTessellationStateCreateInfo createInfo = {
-		VK_STRUCTURE_TYPE_PIPELINE_TESSELLATION_STATE_CREATE_INFO, 0, 0,
-		tessellationState.patchControlPoints
-	};
-	return createInfo;
-}
-
-static VkPipelineViewportStateCreateInfo
-viewportSCI (qfv_viewportinfo_t viewportState)
-{
-	VkPipelineViewportStateCreateInfo createInfo = {
-		VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO, 0, 0,
-		viewportState.viewportset->numViewports,
-		viewportState.viewportset->viewports,
-		viewportState.scissorsset->numScissors,
-		viewportState.scissorsset->scissors,
-	};
-	return createInfo;
-}
-
-static VkPipelineRasterizationStateCreateInfo
-rasterizationSCI (qfv_pipelinerasterization_t rasterizationState)
-{
-	VkPipelineRasterizationStateCreateInfo createInfo = {
-		VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO, 0, 0,
-		rasterizationState.depthClampEnable,
-		rasterizationState.rasterizerDiscardEnable,
-		rasterizationState.polygonMode,
-		rasterizationState.cullMode,
-		rasterizationState.frontFace,
-		rasterizationState.depthBiasEnable,
-		rasterizationState.depthBiasConstantFactor,
-		rasterizationState.depthBiasClamp,
-		rasterizationState.depthBiasSlopeFactor,
-		rasterizationState.lineWidth,
-	};
-	return createInfo;
-}
-
-static VkPipelineMultisampleStateCreateInfo
-multisampleSCI (qfv_pipelinemultisample_t multisampleState)
-{
-	VkPipelineMultisampleStateCreateInfo createInfo = {
-		VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO, 0, 0,
-		multisampleState.rasterizationSamples,
-		multisampleState.sampleShadingEnable,
-		multisampleState.minSampleShading,
-		multisampleState.sampleMask,
-		multisampleState.alphaToCoverageEnable,
-		multisampleState.alphaToOneEnable,
-	};
-	return createInfo;
-}
-
-static VkPipelineDepthStencilStateCreateInfo
-depthStencilSCI (qfv_pipelinedepthandstencil_t depthStencilState)
-{
-	VkPipelineDepthStencilStateCreateInfo createInfo = {
-		VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO, 0, 0,
-		depthStencilState.depthTestEnable,
-		depthStencilState.depthWriteEnable,
-		depthStencilState.depthCompareOp,
-		depthStencilState.depthBoundsTestEnable,
-		depthStencilState.stencilTestEnable,
-		depthStencilState.front,
-		depthStencilState.back,
-		depthStencilState.minDepthBounds,
-		depthStencilState.maxDepthBounds,
-	};
-	return createInfo;
-}
-
-static VkPipelineColorBlendStateCreateInfo
-colorBlendSCI (qfv_pipelineblend_t colorBlendState)
-{
-	VkPipelineColorBlendStateCreateInfo createInfo = {
-		VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO, 0, 0,
-		colorBlendState.logicOpEnable,
-		colorBlendState.logicOp,
-		colorBlendState.blendAttachments->numAttachments,
-		colorBlendState.blendAttachments->attachments,
-		{
-			colorBlendState.blendConstants[0],
-			colorBlendState.blendConstants[1],
-			colorBlendState.blendConstants[2],
-			colorBlendState.blendConstants[3],
-		},
-	};
-	return createInfo;
-}
-
-static VkPipelineDynamicStateCreateInfo
-dynamicSCI (qfv_dynamicstateset_t *dynamicState)
-{
-	VkPipelineDynamicStateCreateInfo createInfo = {
-		VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO, 0, 0,
-		dynamicState->numStates, dynamicState->states,
-	};
-	return createInfo;
-}
-
 qfv_pipelineset_t *
 QFV_CreateGraphicsPipelines (qfv_device_t *device,
-							 qfv_pipelinecache_t *cache,
+							 VkPipelineCache cache,
 							 qfv_graphicspipelinecreateinfoset_t *gpciSet)
 {
 	VkDevice    dev = device->dev;
 	qfv_devfuncs_t *dfunc = device->funcs;
 
-	uint32_t numPipelines = gpciSet->numPipelines;
-	uint32_t stageCount = 0;
-	for (uint32_t i = 0; i < numPipelines; i++) {
-		stageCount += gpciSet->pipelines[i]->stages->size;
-	}
+	__auto_type pipelines = QFV_AllocPipelineSet (gpciSet->size, malloc);
+	dfunc->vkCreateGraphicsPipelines (dev, cache, gpciSet->size, gpciSet->a, 0,
+									  pipelines->a);
 
-	size_t blockSize = numPipelines
-		* (sizeof (VkGraphicsPipelineCreateInfo)
-		   + sizeof (VkPipelineVertexInputStateCreateInfo)
-		   + sizeof (VkPipelineInputAssemblyStateCreateInfo)
-		   + sizeof (VkPipelineTessellationStateCreateInfo)
-		   + sizeof (VkPipelineViewportStateCreateInfo)
-		   + sizeof (VkPipelineRasterizationStateCreateInfo)
-		   + sizeof (VkPipelineMultisampleStateCreateInfo)
-		   + sizeof (VkPipelineDepthStencilStateCreateInfo)
-		   + sizeof (VkPipelineColorBlendStateCreateInfo)
-		   + sizeof (VkPipelineDynamicStateCreateInfo))
-		+ stageCount * sizeof (VkPipelineShaderStageCreateInfo);
-	VkGraphicsPipelineCreateInfo *pipelineInfos = malloc (blockSize);
-
-	pipelineInfos->pStages = (void *)(pipelineInfos + numPipelines);
-	pipelineInfos->pVertexInputState
-		= (void *)(pipelineInfos->pStages + stageCount);
-	pipelineInfos->pInputAssemblyState
-		= (void *)(pipelineInfos->pVertexInputState + numPipelines);
-	pipelineInfos->pTessellationState
-		= (void *)(pipelineInfos->pInputAssemblyState + numPipelines);
-	pipelineInfos->pViewportState
-		= (void *)(pipelineInfos->pTessellationState + numPipelines);
-	pipelineInfos->pRasterizationState
-		= (void *)(pipelineInfos->pViewportState + numPipelines);
-	pipelineInfos->pMultisampleState
-		= (void *)(pipelineInfos->pRasterizationState + numPipelines);
-	pipelineInfos->pDepthStencilState
-		= (void *)(pipelineInfos->pMultisampleState + numPipelines);
-	pipelineInfos->pColorBlendState
-		= (void *)(pipelineInfos->pDepthStencilState + numPipelines);
-	pipelineInfos->pDynamicState
-		= (void *)(pipelineInfos->pColorBlendState + numPipelines);
-	for (uint32_t i = 1; i < gpciSet->numPipelines; i++) {
-		pipelineInfos[i].pStages = pipelineInfos[i - 1].pStages
-			+ gpciSet->pipelines[i - 1]->stages->size;
-		pipelineInfos[i].pVertexInputState
-			= pipelineInfos[i - 1].pVertexInputState + 1;
-		pipelineInfos[i].pInputAssemblyState
-			= pipelineInfos[i - 1].pInputAssemblyState + 1;
-		pipelineInfos[i].pTessellationState
-			= pipelineInfos[i - 1].pTessellationState + 1;
-		pipelineInfos[i].pViewportState
-			= pipelineInfos[i - 1].pViewportState + 1;
-		pipelineInfos[i].pRasterizationState
-			= pipelineInfos[i - 1].pRasterizationState + 1;
-		pipelineInfos[i].pMultisampleState
-			= pipelineInfos[i - 1].pMultisampleState + 1;
-		pipelineInfos[i].pDepthStencilState
-			= pipelineInfos[i - 1].pDepthStencilState + 1;
-		pipelineInfos[i].pColorBlendState
-			= pipelineInfos[i - 1].pColorBlendState + 1;
-		pipelineInfos[i].pDynamicState
-			= pipelineInfos[i - 1].pDynamicState + 1;
-	}
-	for (uint32_t i = 0; i < gpciSet->numPipelines; i++) {
-		VkGraphicsPipelineCreateInfo *gci = pipelineInfos + i;
-		qfv_graphicspipelinecreateinfo_t *ci = gpciSet->pipelines[i];
-		gci->sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO;
-		gci->pNext = 0;
-		gci->flags = ci->flags;
-		gci->stageCount = ci->stages->size;
-		for (uint32_t j = 0; j < gci->stageCount; j++) {
-			((VkPipelineShaderStageCreateInfo *)gci->pStages)[i] = shaderStageCI (ci->stages->a[j]);
-		}
-		if (ci->vertexState) {
-			*(VkPipelineVertexInputStateCreateInfo *)gci->pVertexInputState = vertexInputSCI (*ci->vertexState);
-		} else {
-			gci->pVertexInputState = 0;
-		}
-		if (ci->inputAssemblyState) {
-			*(VkPipelineInputAssemblyStateCreateInfo *)gci->pInputAssemblyState = inputAssemblySCI (*ci->inputAssemblyState);
-		} else {
-			gci->pInputAssemblyState = 0;
-		}
-		if (ci->tessellationState) {
-			*(VkPipelineTessellationStateCreateInfo *)gci->pTessellationState = tessellationSCI (*ci->tessellationState);
-		} else {
-			gci->pTessellationState = 0;
-		}
-		if (ci->viewportState) {
-			*(VkPipelineViewportStateCreateInfo *)gci->pViewportState = viewportSCI (*ci->viewportState);
-		} else {
-			gci->pViewportState = 0;
-		}
-		if (ci->rasterizationState) {
-			*(VkPipelineRasterizationStateCreateInfo *)gci->pRasterizationState = rasterizationSCI (*ci->rasterizationState);
-		} else {
-			gci->pRasterizationState = 0;
-		}
-		if (ci->multisampleState) {
-			*(VkPipelineMultisampleStateCreateInfo *)gci->pMultisampleState = multisampleSCI (*ci->multisampleState);
-		} else {
-			gci->pMultisampleState = 0;
-		}
-		if (ci->depthStencilState) {
-			*(VkPipelineDepthStencilStateCreateInfo *)gci->pDepthStencilState = depthStencilSCI (*ci->depthStencilState);
-		} else {
-			gci->pDepthStencilState = 0;
-		}
-		if (ci->colorBlendState) {
-			*(VkPipelineColorBlendStateCreateInfo *)gci->pColorBlendState = colorBlendSCI (*ci->colorBlendState);
-		} else {
-			gci->pColorBlendState = 0;
-		}
-		if (ci->dynamicState) {
-			*(VkPipelineDynamicStateCreateInfo *)gci->pDynamicState = dynamicSCI (ci->dynamicState);
-		} else {
-			gci->pDynamicState = 0;
-		}
-		gci->layout = ci->layout->layout;
-		gci->renderPass = ci->renderPass;
-		gci->subpass = ci->subpass;
-		gci->basePipelineHandle = ci->basePipeline->pipeline;
-		gci->basePipelineIndex = ci->basePipelineIndex;
-	}
-
-	VkPipeline *pipelines = alloca (numPipelines * sizeof (pipelines));
-	dfunc->vkCreateGraphicsPipelines (dev, cache->cache,
-									  numPipelines, pipelineInfos, 0,
-									  pipelines);
-
-	qfv_pipelineset_t *pipelineset = QFV_AllocPipelineSet (numPipelines, malloc);
-	pipelineset->numPipelines = numPipelines;
-	for (uint32_t i = 0; i < numPipelines; i++) {
-		pipelineset->pipelines[i] = malloc (sizeof (qfv_pipeline_t));
-		pipelineset->pipelines[i]->device = device;
-		pipelineset->pipelines[i]->pipeline = pipelines[i];
-	}
-	return pipelineset;
+	return pipelines;
 }
 
 qfv_pipelineset_t *
 QFV_CreateComputePipelines (qfv_device_t *device,
-							qfv_pipelinecache_t *cache,
+							VkPipelineCache cache,
 							qfv_computepipelinecreateinfoset_t *cpciSet)
 {
 	VkDevice    dev = device->dev;
 	qfv_devfuncs_t *dfunc = device->funcs;
 
-	uint32_t numPipelines = cpciSet->numPipelines;
-
-	size_t blockSize = numPipelines * (sizeof (VkComputePipelineCreateInfo));
-	VkComputePipelineCreateInfo *pipelineInfos = malloc (blockSize);
-
-	for (uint32_t i = 0; i < cpciSet->numPipelines; i++) {
-		VkComputePipelineCreateInfo *cci = pipelineInfos + i;
-		qfv_computepipelinecreateinfo_t *ci = cpciSet->pipelines[i];
-		cci->sType = VK_STRUCTURE_TYPE_COMPUTE_PIPELINE_CREATE_INFO;
-		cci->pNext = 0;
-		cci->flags = ci->flags;
-		cci->stage = shaderStageCI (*ci->stage);
-		cci->layout = ci->layout->layout;
-		cci->basePipelineHandle = ci->basePipeline->pipeline;
-		cci->basePipelineIndex = ci->basePipelineIndex;
-	}
-
-	VkPipeline *pipelines = alloca (numPipelines * sizeof (pipelines));
-	dfunc->vkCreateComputePipelines (dev, cache->cache,
-									 numPipelines, pipelineInfos, 0,
-									 pipelines);
-
-	qfv_pipelineset_t *pipelineset = QFV_AllocPipelineSet (numPipelines, malloc);
-	pipelineset->numPipelines = numPipelines;
-	for (uint32_t i = 0; i < numPipelines; i++) {
-		pipelineset->pipelines[i] = malloc (sizeof (qfv_pipeline_t));
-		pipelineset->pipelines[i]->device = device;
-		pipelineset->pipelines[i]->pipeline = pipelines[i];
-	}
-	return pipelineset;
-}
-
-void
-QFV_DestroyPipeline (qfv_pipeline_t *pipeline)
-{
-	qfv_device_t *device = pipeline->device;
-	VkDevice    dev = device->dev;
-	qfv_devfuncs_t *dfunc = device->funcs;
-
-	dfunc->vkDestroyPipeline (dev, pipeline->pipeline, 0);
+	__auto_type pipelines = QFV_AllocPipelineSet (cpciSet->size, malloc);
+	dfunc->vkCreateComputePipelines (dev, cache, cpciSet->size, cpciSet->a, 0,
+									 pipelines->a);
+	return pipelines;
 }

From e658c0d5cde846cffa90d4675c37af62592908ce Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 19 Feb 2020 01:28:09 +0900
Subject: [PATCH 0424/1519] Fix self-referenced enum declarations

eg:
typedef enum foo {
    bar = 1,
    baz = bar,
} foo;
---
 tools/qfcc/source/qc-parse.y | 2 ++
 tools/qfcc/source/struct.c   | 1 +
 2 files changed, 3 insertions(+)

diff --git a/tools/qfcc/source/qc-parse.y b/tools/qfcc/source/qc-parse.y
index c34efd0a0..a2bbf1c03 100644
--- a/tools/qfcc/source/qc-parse.y
+++ b/tools/qfcc/source/qc-parse.y
@@ -553,6 +553,7 @@ optional_enum_list
 enum_list
 	: '{' enum_init enumerator_list optional_comma '}'
 		{
+			current_symtab = current_symtab->parent;
 			$$ = finish_enum ($3);
 		}
 	;
@@ -562,6 +563,7 @@ enum_init
 		{
 			$$ = find_enum ($<symbol>-1);
 			start_enum ($$);
+			current_symtab = $$->type->t.symtab;
 		}
 	;
 
diff --git a/tools/qfcc/source/struct.c b/tools/qfcc/source/struct.c
index 358b337f0..800a1aa66 100644
--- a/tools/qfcc/source/struct.c
+++ b/tools/qfcc/source/struct.c
@@ -201,6 +201,7 @@ add_enum (symbol_t *enm, symbol_t *name, expr_t *val)
 	if (enum_tab->symbols)
 		value = ((symbol_t *)(enum_tab->symtail))->s.value->v.integer_val + 1;
 	if (val) {
+		convert_name (val);
 		if (!is_constant (val))
 			error (val, "non-constant initializer");
 		else if (!is_integer_val (val))

From 501174e14f4dc0a8e2709af0a0fd41ef18bf541a Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 19 Feb 2020 01:51:24 +0900
Subject: [PATCH 0425/1519] Allow unlimited parameters in function declarations

However, definitions are still limited to 8 parameters. This allows
processing of C headers for type information.
---
 tools/qfcc/include/function.h |  1 -
 tools/qfcc/include/type.h     |  2 +-
 tools/qfcc/source/class.c     |  9 ++++++---
 tools/qfcc/source/cpp.c       |  3 ---
 tools/qfcc/source/function.c  | 36 ++++++++++++++++++++---------------
 5 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/tools/qfcc/include/function.h b/tools/qfcc/include/function.h
index 88ea05dc8..209f40026 100644
--- a/tools/qfcc/include/function.h
+++ b/tools/qfcc/include/function.h
@@ -141,7 +141,6 @@ function_t *build_code_function (struct symbol_s *fsym,
 								 struct expr_s *statements);
 function_t *build_builtin_function (struct symbol_s *sym,
 									struct expr_s *bi_val, int far);
-void build_function (function_t *f);
 void finish_function (function_t *f);
 void emit_function (function_t *f, struct expr_s *e);
 int function_parms (function_t *f, byte *parm_size);
diff --git a/tools/qfcc/include/type.h b/tools/qfcc/include/type.h
index 6944db353..fcb4a808a 100644
--- a/tools/qfcc/include/type.h
+++ b/tools/qfcc/include/type.h
@@ -38,7 +38,7 @@
 typedef struct ty_func_s {
 	struct type_s *type;
 	int         num_params;
-	struct type_s *param_types[MAX_PARMS];
+	struct type_s **param_types;
 } ty_func_t;
 
 typedef struct ty_fldptr_s {
diff --git a/tools/qfcc/source/class.c b/tools/qfcc/source/class.c
index e0d601aa9..b249069c2 100644
--- a/tools/qfcc/source/class.c
+++ b/tools/qfcc/source/class.c
@@ -70,12 +70,14 @@ static hashtab_t *protocol_hash;
 // these will be built up further
 type_t      type_obj_selector = { ev_invalid, 0, 0, ty_struct};
 type_t      type_SEL = { ev_pointer, "SEL", 1, ty_none, {{&type_obj_selector}}};
+type_t     *IMP_params[] = {&type_id, &type_SEL};
 type_t      type_IMP = { ev_func, "IMP", 1, ty_none,
-						 {{&type_id, -3, {&type_id, &type_SEL}}}};
+						 {{&type_id, -3, IMP_params}}};
 type_t      type_obj_super = { ev_invalid, 0, 0 };
 type_t      type_SuperPtr = { ev_pointer, 0, 1, ty_none, {{&type_obj_super}}};
+type_t     *supermsg_params[] = {&type_SuperPtr, &type_SEL};
 type_t      type_supermsg = { ev_func, ".supermsg", 1, ty_none,
-							  {{&type_id, -3, {&type_SuperPtr, &type_SEL}}}};
+							  {{&type_id, -3, supermsg_params}}};
 type_t      type_obj_method = { ev_invalid, 0, 0, ty_struct };
 type_t      type_obj_method_description = { ev_invalid, 0, 0, ty_struct };
 type_t      type_obj_category = { ev_invalid, 0, 0, ty_struct};
@@ -83,8 +85,9 @@ type_t      type_obj_ivar = { ev_invalid, 0, 0, ty_struct};
 type_t      type_obj_module = { ev_invalid, 0, 0, ty_struct};
 type_t      type_moduleptr = { ev_pointer, 0, 1, ty_none,
 									{{&type_obj_module}}};
+type_t     *obj_exec_class_params[] = { &type_moduleptr };
 type_t      type_obj_exec_class = { ev_func, 0, 1, ty_none,
-									{{&type_void, 1, { &type_moduleptr }}}};
+									{{&type_void, 1, obj_exec_class_params}}};
 
 type_t      type_obj_object = {ev_invalid, 0, 0, ty_struct};
 type_t      type_id = { ev_pointer, "id", 1, ty_none, {{&type_obj_object}}};
diff --git a/tools/qfcc/source/cpp.c b/tools/qfcc/source/cpp.c
index 9bea8741d..7e8affb49 100644
--- a/tools/qfcc/source/cpp.c
+++ b/tools/qfcc/source/cpp.c
@@ -141,9 +141,6 @@ build_cpp_args (const char *in_name, const char *out_name)
 		}
 	}
 	*arg = 0;
-	//for (arg = cpp_argv; *arg; arg++)
-	//	printf ("%s ", *arg);
-	//puts ("");
 }
 
 //============================================================================
diff --git a/tools/qfcc/source/function.c b/tools/qfcc/source/function.c
index b150e4baf..884dce1da 100644
--- a/tools/qfcc/source/function.c
+++ b/tools/qfcc/source/function.c
@@ -155,6 +155,7 @@ parse_params (type_t *type, param_t *parms)
 {
 	param_t    *p;
 	type_t     *new;
+	int         count;
 
 	new = new_type ();
 	new->type = ev_func;
@@ -163,10 +164,12 @@ parse_params (type_t *type, param_t *parms)
 	new->t.func.num_params = 0;
 
 	for (p = parms; p; p = p->next) {
-		if (new->t.func.num_params > MAX_PARMS) {
-			error (0, "too many params");
-			return type;
+		if (p->type) {
+			count++;
 		}
+	}
+	new->t.func.param_types = malloc (count * sizeof (type_t));
+	for (p = parms; p; p = p->next) {
 		if (!p->selector && !p->type && !p->name) {
 			if (p->next)
 				internal_error (0, 0);
@@ -581,12 +584,25 @@ begin_function (symbol_t *sym, const char *nicename, symtab_t *parent,
 	return sym->s.func;
 }
 
+static void
+build_function (symbol_t *fsym)
+{
+	if (fsym->type->t.func.num_params > MAX_PARMS) {
+		error (0, "too many params");
+	}
+	//	FIXME
+//	f->def->constant = 1;
+//	f->def->nosave = 1;
+//	f->def->initialized = 1;
+//	G_FUNCTION (f->def->ofs) = f->function_num;
+}
+
 function_t *
 build_code_function (symbol_t *fsym, expr_t *state_expr, expr_t *statements)
 {
 	if (fsym->sy_type != sy_func)	// probably in error recovery
 		return 0;
-	build_function (fsym->s.func);
+	build_function (fsym);
 	if (state_expr) {
 		state_expr->next = statements;
 		statements = state_expr;
@@ -629,7 +645,7 @@ build_builtin_function (symbol_t *sym, expr_t *bi_val, int far)
 		bi = expr_float (bi_val);
 	sym->s.func->builtin = bi;
 	reloc_def_func (sym->s.func, sym->s.func->def);
-	build_function (sym->s.func);
+	build_function (sym);
 	finish_function (sym->s.func);
 
 	// for debug info
@@ -638,16 +654,6 @@ build_builtin_function (symbol_t *sym, expr_t *bi_val, int far)
 	return sym->s.func;
 }
 
-void
-build_function (function_t *f)
-{
-	//	FIXME
-//	f->def->constant = 1;
-//	f->def->nosave = 1;
-//	f->def->initialized = 1;
-//	G_FUNCTION (f->def->ofs) = f->function_num;
-}
-
 void
 finish_function (function_t *f)
 {

From 2f726a497b6e853f7e2c4e0b5c83cb63932841bc Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 19 Feb 2020 02:30:50 +0900
Subject: [PATCH 0426/1519] Fix segfault in unlimited params

---
 tools/qfcc/source/function.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/qfcc/source/function.c b/tools/qfcc/source/function.c
index 884dce1da..4d3a617e9 100644
--- a/tools/qfcc/source/function.c
+++ b/tools/qfcc/source/function.c
@@ -330,8 +330,9 @@ find_function (expr_t *fexpr, expr_t *params)
 			return e;
 		type.t.func.num_params++;
 	}
-	if (type.t.func.num_params > MAX_PARMS)
-		return fexpr;
+	i = type.t.func.num_params * sizeof (type_t);
+	type.t.func.param_types = alloca(i);
+	memset (type.t.func.param_types, 0, i);
 	for (i = 0, e = params; e; i++, e = e->next) {
 		type.t.func.param_types[type.t.func.num_params - 1 - i] = get_type (e);
 		if (e->type == ex_error)

From d4574111b528155e0e8e14018f36a2992b6598a0 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 19 Feb 2020 02:31:16 +0900
Subject: [PATCH 0427/1519] Replace system defines/includes with qfcc's

Right now, it probably works only with modern gcc.
---
 config.d/qfcc.m4            |  2 +-
 tools/qfcc/configure.in     |  2 +-
 tools/qfcc/include/cpp.h    |  2 ++
 tools/qfcc/source/cpp.c     | 46 +++++++++++++++++++++++++++++++++----
 tools/qfcc/source/options.c |  5 +++-
 5 files changed, 50 insertions(+), 7 deletions(-)

diff --git a/config.d/qfcc.m4 b/config.d/qfcc.m4
index 3e1d87ae7..380e6a31c 100644
--- a/config.d/qfcc.m4
+++ b/config.d/qfcc.m4
@@ -9,7 +9,7 @@ AC_ARG_WITH(cpp,
 if test "x$cpp_name" != xauto; then
 	CPP_NAME="$cpp_name"
 else
-	CPP_NAME="cpp %d -o %o %i"
+	CPP_NAME="cpp %u %d %s -o %o %i"
 	case "$host_os" in
 		*freebsd*)
 			CPP_NAME="cpp %d %i %o"
diff --git a/tools/qfcc/configure.in b/tools/qfcc/configure.in
index 21934d623..3c6383d5a 100644
--- a/tools/qfcc/configure.in
+++ b/tools/qfcc/configure.in
@@ -30,7 +30,7 @@ AC_ARG_WITH(cpp,
 if test "x$cpp_name" != xauto; then
 	CPP_NAME="$cpp_name"
 else
-	CPP_NAME="cpp %d -o %o %i"
+	CPP_NAME="cpp %u %d %s -o %o %i"
 	case "$target_os" in
 		*bsd*)
 			touch conftest.c
diff --git a/tools/qfcc/include/cpp.h b/tools/qfcc/include/cpp.h
index 6b599b439..81274c353 100644
--- a/tools/qfcc/include/cpp.h
+++ b/tools/qfcc/include/cpp.h
@@ -34,6 +34,8 @@
 struct dstring_s;
 
 void parse_cpp_name (void);
+void add_cpp_sysinc (const char *arg);
+void add_cpp_undef (const char *arg);
 void add_cpp_def (const char *arg);
 void intermediate_file (struct dstring_s *ifile, const char *filename,
 						const char *ext, int local);
diff --git a/tools/qfcc/source/cpp.c b/tools/qfcc/source/cpp.c
index 7e8affb49..71b42c6d1 100644
--- a/tools/qfcc/source/cpp.c
+++ b/tools/qfcc/source/cpp.c
@@ -67,11 +67,25 @@ cpp_arg_t  *cpp_arg_list;
 cpp_arg_t **cpp_arg_tail = &cpp_arg_list;
 cpp_arg_t  *cpp_def_list;
 cpp_arg_t **cpp_def_tail = &cpp_def_list;
+cpp_arg_t  *cpp_undef_list;
+cpp_arg_t **cpp_undef_tail = &cpp_undef_list;
+cpp_arg_t  *cpp_sysinc_list;
+cpp_arg_t **cpp_sysinc_tail = &cpp_sysinc_list;
 const char **cpp_argv;
 const char *cpp_name = CPP_NAME;
 static int  cpp_argc = 0;
 dstring_t  *tempname;
 
+static const char **
+append_cpp_args (const char **arg, cpp_arg_t *arg_list)
+{
+	cpp_arg_t *cpp_arg;
+
+	for (cpp_arg = arg_list; cpp_arg; cpp_arg = cpp_arg->next)
+		*arg++ = cpp_arg->arg;
+	return arg;
+}
+
 static void
 add_cpp_arg (const char *arg)
 {
@@ -83,6 +97,28 @@ add_cpp_arg (const char *arg)
 	cpp_argc++;
 }
 
+void
+add_cpp_sysinc (const char *arg)
+{
+	cpp_arg_t  *cpp_arg = malloc (sizeof (cpp_arg_t));
+	cpp_arg->next = 0;
+	cpp_arg->arg = arg;
+	*cpp_sysinc_tail = cpp_arg;
+	cpp_sysinc_tail = &(*cpp_sysinc_tail)->next;
+	cpp_argc++;
+}
+
+void
+add_cpp_undef (const char *arg)
+{
+	cpp_arg_t  *cpp_arg = malloc (sizeof (cpp_arg_t));
+	cpp_arg->next = 0;
+	cpp_arg->arg = arg;
+	*cpp_undef_tail = cpp_arg;
+	cpp_undef_tail = &(*cpp_undef_tail)->next;
+	cpp_argc++;
+}
+
 void
 add_cpp_def (const char *arg)
 {
@@ -117,7 +153,6 @@ static void
 build_cpp_args (const char *in_name, const char *out_name)
 {
 	cpp_arg_t  *cpp_arg;
-	cpp_arg_t  *cpp_def;
 	const char **arg;
 
 	if (cpp_argv)
@@ -126,9 +161,12 @@ build_cpp_args (const char *in_name, const char *out_name)
 	for (arg = cpp_argv, cpp_arg = cpp_arg_list;
 		 cpp_arg;
 		 cpp_arg = cpp_arg->next) {
-		if (!strcmp (cpp_arg->arg, "%d")) {
-			for (cpp_def = cpp_def_list; cpp_def; cpp_def = cpp_def->next)
-				*arg++ = cpp_def->arg;
+		if (!strcmp (cpp_arg->arg, "%u")) {
+			arg = append_cpp_args (arg, cpp_undef_list);
+		} else if (!strcmp (cpp_arg->arg, "%s")) {
+			arg = append_cpp_args (arg, cpp_sysinc_list);
+		} else if (!strcmp (cpp_arg->arg, "%d")) {
+			arg = append_cpp_args (arg, cpp_def_list);
 		} else if (!strcmp (cpp_arg->arg, "%i")) {
 			*arg++ = in_name;
 		} else if (!strcmp (cpp_arg->arg, "%o")) {
diff --git a/tools/qfcc/source/options.c b/tools/qfcc/source/options.c
index cfd1e27bf..c3f283e89 100644
--- a/tools/qfcc/source/options.c
+++ b/tools/qfcc/source/options.c
@@ -299,6 +299,8 @@ DecodeArgs (int argc, char **argv)
 	int         c;
 	int         saw_E = 0, saw_MD = 0;
 
+	add_cpp_undef ("-undef");
+	add_cpp_undef ("-nostdinc");
 	add_cpp_def ("-D__QFCC__=1");
 	add_cpp_def ("-D__QUAKEC__=1");
 
@@ -720,7 +722,8 @@ DecodeArgs (int argc, char **argv)
 
 	// add the default paths
 	if (!options.no_default_paths) {
-		add_cpp_def (nva ("-I%s", QFCC_INCLUDE_PATH));
+		add_cpp_sysinc ("-isystem");
+		add_cpp_sysinc (QFCC_INCLUDE_PATH);
 		linker_add_path (QFCC_LIB_PATH);
 	}
 

From ee228504aa96c18a1f677607ace95afbec427ca4 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 19 Feb 2020 01:28:09 +0900
Subject: [PATCH 0428/1519] Fix self-referenced enum declarations

eg:
typedef enum foo {
    bar = 1,
    baz = bar,
} foo;
---
 tools/qfcc/source/qc-parse.y | 2 ++
 tools/qfcc/source/struct.c   | 1 +
 2 files changed, 3 insertions(+)

diff --git a/tools/qfcc/source/qc-parse.y b/tools/qfcc/source/qc-parse.y
index c34efd0a0..a2bbf1c03 100644
--- a/tools/qfcc/source/qc-parse.y
+++ b/tools/qfcc/source/qc-parse.y
@@ -553,6 +553,7 @@ optional_enum_list
 enum_list
 	: '{' enum_init enumerator_list optional_comma '}'
 		{
+			current_symtab = current_symtab->parent;
 			$$ = finish_enum ($3);
 		}
 	;
@@ -562,6 +563,7 @@ enum_init
 		{
 			$$ = find_enum ($<symbol>-1);
 			start_enum ($$);
+			current_symtab = $$->type->t.symtab;
 		}
 	;
 
diff --git a/tools/qfcc/source/struct.c b/tools/qfcc/source/struct.c
index 358b337f0..800a1aa66 100644
--- a/tools/qfcc/source/struct.c
+++ b/tools/qfcc/source/struct.c
@@ -201,6 +201,7 @@ add_enum (symbol_t *enm, symbol_t *name, expr_t *val)
 	if (enum_tab->symbols)
 		value = ((symbol_t *)(enum_tab->symtail))->s.value->v.integer_val + 1;
 	if (val) {
+		convert_name (val);
 		if (!is_constant (val))
 			error (val, "non-constant initializer");
 		else if (!is_integer_val (val))

From c61d0b6ff00800d6e8a9beaf924730cef885a081 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 19 Feb 2020 01:51:24 +0900
Subject: [PATCH 0429/1519] Allow unlimited parameters in function declarations

However, definitions are still limited to 8 parameters. This allows
processing of C headers for type information.
---
 tools/qfcc/include/function.h |  1 -
 tools/qfcc/include/type.h     |  2 +-
 tools/qfcc/source/class.c     |  9 ++++++---
 tools/qfcc/source/cpp.c       |  3 ---
 tools/qfcc/source/function.c  | 36 ++++++++++++++++++++---------------
 5 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/tools/qfcc/include/function.h b/tools/qfcc/include/function.h
index 88ea05dc8..209f40026 100644
--- a/tools/qfcc/include/function.h
+++ b/tools/qfcc/include/function.h
@@ -141,7 +141,6 @@ function_t *build_code_function (struct symbol_s *fsym,
 								 struct expr_s *statements);
 function_t *build_builtin_function (struct symbol_s *sym,
 									struct expr_s *bi_val, int far);
-void build_function (function_t *f);
 void finish_function (function_t *f);
 void emit_function (function_t *f, struct expr_s *e);
 int function_parms (function_t *f, byte *parm_size);
diff --git a/tools/qfcc/include/type.h b/tools/qfcc/include/type.h
index 6944db353..fcb4a808a 100644
--- a/tools/qfcc/include/type.h
+++ b/tools/qfcc/include/type.h
@@ -38,7 +38,7 @@
 typedef struct ty_func_s {
 	struct type_s *type;
 	int         num_params;
-	struct type_s *param_types[MAX_PARMS];
+	struct type_s **param_types;
 } ty_func_t;
 
 typedef struct ty_fldptr_s {
diff --git a/tools/qfcc/source/class.c b/tools/qfcc/source/class.c
index e0d601aa9..b249069c2 100644
--- a/tools/qfcc/source/class.c
+++ b/tools/qfcc/source/class.c
@@ -70,12 +70,14 @@ static hashtab_t *protocol_hash;
 // these will be built up further
 type_t      type_obj_selector = { ev_invalid, 0, 0, ty_struct};
 type_t      type_SEL = { ev_pointer, "SEL", 1, ty_none, {{&type_obj_selector}}};
+type_t     *IMP_params[] = {&type_id, &type_SEL};
 type_t      type_IMP = { ev_func, "IMP", 1, ty_none,
-						 {{&type_id, -3, {&type_id, &type_SEL}}}};
+						 {{&type_id, -3, IMP_params}}};
 type_t      type_obj_super = { ev_invalid, 0, 0 };
 type_t      type_SuperPtr = { ev_pointer, 0, 1, ty_none, {{&type_obj_super}}};
+type_t     *supermsg_params[] = {&type_SuperPtr, &type_SEL};
 type_t      type_supermsg = { ev_func, ".supermsg", 1, ty_none,
-							  {{&type_id, -3, {&type_SuperPtr, &type_SEL}}}};
+							  {{&type_id, -3, supermsg_params}}};
 type_t      type_obj_method = { ev_invalid, 0, 0, ty_struct };
 type_t      type_obj_method_description = { ev_invalid, 0, 0, ty_struct };
 type_t      type_obj_category = { ev_invalid, 0, 0, ty_struct};
@@ -83,8 +85,9 @@ type_t      type_obj_ivar = { ev_invalid, 0, 0, ty_struct};
 type_t      type_obj_module = { ev_invalid, 0, 0, ty_struct};
 type_t      type_moduleptr = { ev_pointer, 0, 1, ty_none,
 									{{&type_obj_module}}};
+type_t     *obj_exec_class_params[] = { &type_moduleptr };
 type_t      type_obj_exec_class = { ev_func, 0, 1, ty_none,
-									{{&type_void, 1, { &type_moduleptr }}}};
+									{{&type_void, 1, obj_exec_class_params}}};
 
 type_t      type_obj_object = {ev_invalid, 0, 0, ty_struct};
 type_t      type_id = { ev_pointer, "id", 1, ty_none, {{&type_obj_object}}};
diff --git a/tools/qfcc/source/cpp.c b/tools/qfcc/source/cpp.c
index 9bea8741d..7e8affb49 100644
--- a/tools/qfcc/source/cpp.c
+++ b/tools/qfcc/source/cpp.c
@@ -141,9 +141,6 @@ build_cpp_args (const char *in_name, const char *out_name)
 		}
 	}
 	*arg = 0;
-	//for (arg = cpp_argv; *arg; arg++)
-	//	printf ("%s ", *arg);
-	//puts ("");
 }
 
 //============================================================================
diff --git a/tools/qfcc/source/function.c b/tools/qfcc/source/function.c
index b150e4baf..884dce1da 100644
--- a/tools/qfcc/source/function.c
+++ b/tools/qfcc/source/function.c
@@ -155,6 +155,7 @@ parse_params (type_t *type, param_t *parms)
 {
 	param_t    *p;
 	type_t     *new;
+	int         count;
 
 	new = new_type ();
 	new->type = ev_func;
@@ -163,10 +164,12 @@ parse_params (type_t *type, param_t *parms)
 	new->t.func.num_params = 0;
 
 	for (p = parms; p; p = p->next) {
-		if (new->t.func.num_params > MAX_PARMS) {
-			error (0, "too many params");
-			return type;
+		if (p->type) {
+			count++;
 		}
+	}
+	new->t.func.param_types = malloc (count * sizeof (type_t));
+	for (p = parms; p; p = p->next) {
 		if (!p->selector && !p->type && !p->name) {
 			if (p->next)
 				internal_error (0, 0);
@@ -581,12 +584,25 @@ begin_function (symbol_t *sym, const char *nicename, symtab_t *parent,
 	return sym->s.func;
 }
 
+static void
+build_function (symbol_t *fsym)
+{
+	if (fsym->type->t.func.num_params > MAX_PARMS) {
+		error (0, "too many params");
+	}
+	//	FIXME
+//	f->def->constant = 1;
+//	f->def->nosave = 1;
+//	f->def->initialized = 1;
+//	G_FUNCTION (f->def->ofs) = f->function_num;
+}
+
 function_t *
 build_code_function (symbol_t *fsym, expr_t *state_expr, expr_t *statements)
 {
 	if (fsym->sy_type != sy_func)	// probably in error recovery
 		return 0;
-	build_function (fsym->s.func);
+	build_function (fsym);
 	if (state_expr) {
 		state_expr->next = statements;
 		statements = state_expr;
@@ -629,7 +645,7 @@ build_builtin_function (symbol_t *sym, expr_t *bi_val, int far)
 		bi = expr_float (bi_val);
 	sym->s.func->builtin = bi;
 	reloc_def_func (sym->s.func, sym->s.func->def);
-	build_function (sym->s.func);
+	build_function (sym);
 	finish_function (sym->s.func);
 
 	// for debug info
@@ -638,16 +654,6 @@ build_builtin_function (symbol_t *sym, expr_t *bi_val, int far)
 	return sym->s.func;
 }
 
-void
-build_function (function_t *f)
-{
-	//	FIXME
-//	f->def->constant = 1;
-//	f->def->nosave = 1;
-//	f->def->initialized = 1;
-//	G_FUNCTION (f->def->ofs) = f->function_num;
-}
-
 void
 finish_function (function_t *f)
 {

From 2d52da9c0d9ec87c5fa3931b65445596478febe7 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 19 Feb 2020 02:30:50 +0900
Subject: [PATCH 0430/1519] Fix segfault in unlimited params

---
 tools/qfcc/source/function.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/qfcc/source/function.c b/tools/qfcc/source/function.c
index 884dce1da..4d3a617e9 100644
--- a/tools/qfcc/source/function.c
+++ b/tools/qfcc/source/function.c
@@ -330,8 +330,9 @@ find_function (expr_t *fexpr, expr_t *params)
 			return e;
 		type.t.func.num_params++;
 	}
-	if (type.t.func.num_params > MAX_PARMS)
-		return fexpr;
+	i = type.t.func.num_params * sizeof (type_t);
+	type.t.func.param_types = alloca(i);
+	memset (type.t.func.param_types, 0, i);
 	for (i = 0, e = params; e; i++, e = e->next) {
 		type.t.func.param_types[type.t.func.num_params - 1 - i] = get_type (e);
 		if (e->type == ex_error)

From bd6dcafdc89c1a3c1ab7a41931838b784d17f913 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 19 Feb 2020 02:31:16 +0900
Subject: [PATCH 0431/1519] Replace system defines/includes with qfcc's

Right now, it probably works only with modern gcc.
---
 config.d/qfcc.m4            |  2 +-
 tools/qfcc/configure.in     |  2 +-
 tools/qfcc/include/cpp.h    |  2 ++
 tools/qfcc/source/cpp.c     | 46 +++++++++++++++++++++++++++++++++----
 tools/qfcc/source/options.c |  5 +++-
 5 files changed, 50 insertions(+), 7 deletions(-)

diff --git a/config.d/qfcc.m4 b/config.d/qfcc.m4
index 3e1d87ae7..380e6a31c 100644
--- a/config.d/qfcc.m4
+++ b/config.d/qfcc.m4
@@ -9,7 +9,7 @@ AC_ARG_WITH(cpp,
 if test "x$cpp_name" != xauto; then
 	CPP_NAME="$cpp_name"
 else
-	CPP_NAME="cpp %d -o %o %i"
+	CPP_NAME="cpp %u %d %s -o %o %i"
 	case "$host_os" in
 		*freebsd*)
 			CPP_NAME="cpp %d %i %o"
diff --git a/tools/qfcc/configure.in b/tools/qfcc/configure.in
index 21934d623..3c6383d5a 100644
--- a/tools/qfcc/configure.in
+++ b/tools/qfcc/configure.in
@@ -30,7 +30,7 @@ AC_ARG_WITH(cpp,
 if test "x$cpp_name" != xauto; then
 	CPP_NAME="$cpp_name"
 else
-	CPP_NAME="cpp %d -o %o %i"
+	CPP_NAME="cpp %u %d %s -o %o %i"
 	case "$target_os" in
 		*bsd*)
 			touch conftest.c
diff --git a/tools/qfcc/include/cpp.h b/tools/qfcc/include/cpp.h
index 6b599b439..81274c353 100644
--- a/tools/qfcc/include/cpp.h
+++ b/tools/qfcc/include/cpp.h
@@ -34,6 +34,8 @@
 struct dstring_s;
 
 void parse_cpp_name (void);
+void add_cpp_sysinc (const char *arg);
+void add_cpp_undef (const char *arg);
 void add_cpp_def (const char *arg);
 void intermediate_file (struct dstring_s *ifile, const char *filename,
 						const char *ext, int local);
diff --git a/tools/qfcc/source/cpp.c b/tools/qfcc/source/cpp.c
index 7e8affb49..71b42c6d1 100644
--- a/tools/qfcc/source/cpp.c
+++ b/tools/qfcc/source/cpp.c
@@ -67,11 +67,25 @@ cpp_arg_t  *cpp_arg_list;
 cpp_arg_t **cpp_arg_tail = &cpp_arg_list;
 cpp_arg_t  *cpp_def_list;
 cpp_arg_t **cpp_def_tail = &cpp_def_list;
+cpp_arg_t  *cpp_undef_list;
+cpp_arg_t **cpp_undef_tail = &cpp_undef_list;
+cpp_arg_t  *cpp_sysinc_list;
+cpp_arg_t **cpp_sysinc_tail = &cpp_sysinc_list;
 const char **cpp_argv;
 const char *cpp_name = CPP_NAME;
 static int  cpp_argc = 0;
 dstring_t  *tempname;
 
+static const char **
+append_cpp_args (const char **arg, cpp_arg_t *arg_list)
+{
+	cpp_arg_t *cpp_arg;
+
+	for (cpp_arg = arg_list; cpp_arg; cpp_arg = cpp_arg->next)
+		*arg++ = cpp_arg->arg;
+	return arg;
+}
+
 static void
 add_cpp_arg (const char *arg)
 {
@@ -83,6 +97,28 @@ add_cpp_arg (const char *arg)
 	cpp_argc++;
 }
 
+void
+add_cpp_sysinc (const char *arg)
+{
+	cpp_arg_t  *cpp_arg = malloc (sizeof (cpp_arg_t));
+	cpp_arg->next = 0;
+	cpp_arg->arg = arg;
+	*cpp_sysinc_tail = cpp_arg;
+	cpp_sysinc_tail = &(*cpp_sysinc_tail)->next;
+	cpp_argc++;
+}
+
+void
+add_cpp_undef (const char *arg)
+{
+	cpp_arg_t  *cpp_arg = malloc (sizeof (cpp_arg_t));
+	cpp_arg->next = 0;
+	cpp_arg->arg = arg;
+	*cpp_undef_tail = cpp_arg;
+	cpp_undef_tail = &(*cpp_undef_tail)->next;
+	cpp_argc++;
+}
+
 void
 add_cpp_def (const char *arg)
 {
@@ -117,7 +153,6 @@ static void
 build_cpp_args (const char *in_name, const char *out_name)
 {
 	cpp_arg_t  *cpp_arg;
-	cpp_arg_t  *cpp_def;
 	const char **arg;
 
 	if (cpp_argv)
@@ -126,9 +161,12 @@ build_cpp_args (const char *in_name, const char *out_name)
 	for (arg = cpp_argv, cpp_arg = cpp_arg_list;
 		 cpp_arg;
 		 cpp_arg = cpp_arg->next) {
-		if (!strcmp (cpp_arg->arg, "%d")) {
-			for (cpp_def = cpp_def_list; cpp_def; cpp_def = cpp_def->next)
-				*arg++ = cpp_def->arg;
+		if (!strcmp (cpp_arg->arg, "%u")) {
+			arg = append_cpp_args (arg, cpp_undef_list);
+		} else if (!strcmp (cpp_arg->arg, "%s")) {
+			arg = append_cpp_args (arg, cpp_sysinc_list);
+		} else if (!strcmp (cpp_arg->arg, "%d")) {
+			arg = append_cpp_args (arg, cpp_def_list);
 		} else if (!strcmp (cpp_arg->arg, "%i")) {
 			*arg++ = in_name;
 		} else if (!strcmp (cpp_arg->arg, "%o")) {
diff --git a/tools/qfcc/source/options.c b/tools/qfcc/source/options.c
index cfd1e27bf..c3f283e89 100644
--- a/tools/qfcc/source/options.c
+++ b/tools/qfcc/source/options.c
@@ -299,6 +299,8 @@ DecodeArgs (int argc, char **argv)
 	int         c;
 	int         saw_E = 0, saw_MD = 0;
 
+	add_cpp_undef ("-undef");
+	add_cpp_undef ("-nostdinc");
 	add_cpp_def ("-D__QFCC__=1");
 	add_cpp_def ("-D__QUAKEC__=1");
 
@@ -720,7 +722,8 @@ DecodeArgs (int argc, char **argv)
 
 	// add the default paths
 	if (!options.no_default_paths) {
-		add_cpp_def (nva ("-I%s", QFCC_INCLUDE_PATH));
+		add_cpp_sysinc ("-isystem");
+		add_cpp_sysinc (QFCC_INCLUDE_PATH);
 		linker_add_path (QFCC_LIB_PATH);
 	}
 

From a65d6bce09d08fdc1d33f56eb21033dc321684d5 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 19 Feb 2020 02:43:27 +0900
Subject: [PATCH 0432/1519] Fix a warning that got through

I forgot to compile test in optimized...
---
 tools/qfcc/source/function.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tools/qfcc/source/function.c b/tools/qfcc/source/function.c
index 4d3a617e9..538bb8f65 100644
--- a/tools/qfcc/source/function.c
+++ b/tools/qfcc/source/function.c
@@ -155,7 +155,7 @@ parse_params (type_t *type, param_t *parms)
 {
 	param_t    *p;
 	type_t     *new;
-	int         count;
+	int         count = 0;
 
 	new = new_type ();
 	new->type = ev_func;
@@ -168,7 +168,9 @@ parse_params (type_t *type, param_t *parms)
 			count++;
 		}
 	}
-	new->t.func.param_types = malloc (count * sizeof (type_t));
+	if (count) {
+		new->t.func.param_types = malloc (count * sizeof (type_t));
+	}
 	for (p = parms; p; p = p->next) {
 		if (!p->selector && !p->type && !p->name) {
 			if (p->next)

From 4c40928112099d7c736a6b5819d0dc84411fde11 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 19 Feb 2020 02:53:38 +0900
Subject: [PATCH 0433/1519] Remove what appears to be a redundant check

It was long wrong anyway as it checked past the end of the function's
parameters, which caused a segfault when calling varargs functions with
no formal parameters.
---
 tools/qfcc/source/expr.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index 7d7e55a21..03e3ddc6a 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -1892,11 +1892,6 @@ build_function_call (expr_t *fexpr, type_t *ftype, expr_t *params)
 		if (type_size (t) > type_size (&type_param))
 			err = error (e, "formal parameter %d is too large to be passed by"
 						 " value", i + 1);
-		if (ftype->t.func.param_types[i] == &type_float
-			&& is_integer_val (e)) {
-			convert_int (e);
-			t = &type_float;
-		}
 		if (i < parm_count) {
 			if (e->type == ex_nil)
 				convert_nil (e, t = ftype->t.func.param_types[i]);
@@ -1934,7 +1929,8 @@ build_function_call (expr_t *fexpr, type_t *ftype, expr_t *params)
 	for (e = params, i = 0; e; e = e->next, i++) {
 		if (has_function_call (e)) {
 			*a = new_temp_def_expr (arg_types[i]);
-			arg_exprs[arg_expr_count][0] = cast_expr (arg_types[i], convert_vector (e));
+			arg_exprs[arg_expr_count][0] = cast_expr (arg_types[i],
+													  convert_vector (e));
 			arg_exprs[arg_expr_count][1] = *a;
 			arg_expr_count++;
 		} else {

From 67e183c8b65cad0745c063f5e830a9a45552ea1b Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 19 Feb 2020 10:46:16 +0900
Subject: [PATCH 0434/1519] Put the guts of qwaq's reflection code into ruamoko

---
 ruamoko/include/Makefile.am |  2 +-
 ruamoko/include/types.h     | 84 +++++++++++++++++++++++++++++++++++++
 ruamoko/lib/Makefile.am     |  2 +-
 ruamoko/lib/types.r         | 28 +++++++++++++
 tools/qwaq/types.r          |  2 +
 5 files changed, 116 insertions(+), 2 deletions(-)
 create mode 100644 ruamoko/include/types.h
 create mode 100644 ruamoko/lib/types.r

diff --git a/ruamoko/include/Makefile.am b/ruamoko/include/Makefile.am
index d978b3a70..b11080d13 100644
--- a/ruamoko/include/Makefile.am
+++ b/ruamoko/include/Makefile.am
@@ -3,7 +3,7 @@ pkgincludedir=	$(datarootdir)/qfcc/include
 nobase_pkginclude_HEADERS= \
 	crudefile.h debug.h entities.h infokey.h math.h message.h nq_message.h \
 	physics.h msgbuf.h qfile.h qfs.h qw_message.h qw_physics.h qw_sys.h \
-	server.h sound.h script.h string.h sv_sound.h system.h \
+	server.h sound.h script.h string.h sv_sound.h system.h types.h \
 	\
 	draw.h key.h \
 	\
diff --git a/ruamoko/include/types.h b/ruamoko/include/types.h
new file mode 100644
index 000000000..8ff66e10c
--- /dev/null
+++ b/ruamoko/include/types.h
@@ -0,0 +1,84 @@
+#ifndef __types_h
+#define __types_h
+
+typedef enum {
+	ev_void,
+	ev_string,
+	ev_float,
+	ev_vector,
+	ev_entity,
+	ev_field,
+	ev_func,
+	ev_pointer,			// end of v6 types
+	ev_quat,
+	ev_integer,
+	ev_uinteger,
+	ev_short,			// value is embedded in the opcode
+	ev_double,
+
+	ev_invalid,			// invalid type. used for instruction checking
+	ev_type_count		// not a type, gives number of types
+} etype_t;
+
+typedef enum {
+    ty_none,				///< func/field/pointer or not used
+	ty_struct,
+	ty_union,
+	ty_enum,
+	ty_array,
+	ty_class,
+} ty_meta_e;
+
+typedef struct qfot_fldptr_s {
+	etype_t     type;
+	struct qfot_type_s *aux_type;
+} qfot_fldptr_t;
+
+typedef struct qfot_func_s {
+	etype_t     type;
+	struct qfot_type_s *return_type;
+	int         num_params;
+	struct qfot_type_s *param_types[1];
+} qfot_func_t;
+
+typedef struct qfot_var_s {
+	struct qfot_type_s *type;
+	string      name;
+	int         offset;				// value for enum, 0 for union
+} qfot_var_t;
+
+typedef struct qfot_struct_s {
+	string      tag;
+	int         num_fields;
+	qfot_var_t  fields[1];
+} qfot_struct_t;
+
+typedef struct qfot_array_s {
+	struct qfot_type_s *type;
+	int         base;
+	int         size;
+} qfot_array_t;
+
+typedef struct qfot_type_s {
+	ty_meta_e   meta;
+	int         size;
+	string      encoding;
+	union {
+		etype_t     type;
+		qfot_fldptr_t fldptr;
+		qfot_func_t func;
+		qfot_struct_t strct;
+		qfot_array_t array;
+		string      class;
+	}           t;
+} qfot_type_t;
+
+typedef struct qfot_type_encodings_s {
+	qfot_type_t *types;
+	int         size;
+} qfot_type_encodings_t;
+
+@extern string ty_meta_name[6];
+@extern string pr_type_name[ev_type_count];
+
+#endif
diff --git a/ruamoko/lib/Makefile.am b/ruamoko/lib/Makefile.am
index 53a20875b..e4b475d64 100644
--- a/ruamoko/lib/Makefile.am
+++ b/ruamoko/lib/Makefile.am
@@ -27,7 +27,7 @@ SUFFIXES= .o .r .qc
 
 libr_a_SOURCES=\
 	cbuf.r cmd.r cvar.r file.r hash.r msgbuf.r plist.r qfile.r qfs.r script.r \
-	sound.r string.r math.r \
+	sound.r string.r math.r types.r \
 	Object.r Protocol.r \
 	AutoreleasePool.r Array.r Array+Private.r Entity.r PropertyList.r Set.r
 libr_a_AR=$(PAK) -cf
diff --git a/ruamoko/lib/types.r b/ruamoko/lib/types.r
new file mode 100644
index 000000000..66140b83f
--- /dev/null
+++ b/ruamoko/lib/types.r
@@ -0,0 +1,28 @@
+#include <runtime.h>
+#include <types.h>
+
+string ty_meta_name[6] = {
+	"basic",
+	"struct",
+	"union",
+	"enum",
+	"array",
+	"class",
+};
+
+string pr_type_name[ev_type_count] = {
+	"void",
+	"string",
+	"float",
+	"vector",
+	"entity",
+	"field",
+	"function",
+	"pointer",
+	"quaternion",
+	"integer",
+	"uinteger",
+	"short",
+	"double"
+	"invalid",
+};
diff --git a/tools/qwaq/types.r b/tools/qwaq/types.r
index 82665e20a..324185b93 100644
--- a/tools/qwaq/types.r
+++ b/tools/qwaq/types.r
@@ -12,6 +12,7 @@ typedef enum {
 	ev_integer,
 	ev_uinteger,
 	ev_short,			// value is embedded in the opcode
+	ev_double,
 
 	ev_invalid,			// invalid type. used for instruction checking
 	ev_type_count		// not a type, gives number of types
@@ -107,6 +108,7 @@ string pr_type_name[ev_type_count] = {
 	"integer",
 	"uinteger",
 	"short",
+	"double"
 	"invalid",
 };
 

From 7a315b4a893393709e0cba381f889ccafaaee798 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 19 Feb 2020 10:50:15 +0900
Subject: [PATCH 0435/1519] Fix storage class for for-loop declarations

Getting "i redeclared" when i was declared in a for loop in two
different functions was a tad unexpected.
---
 tools/qfcc/source/qc-parse.y | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/tools/qfcc/source/qc-parse.y b/tools/qfcc/source/qc-parse.y
index a2bbf1c03..a71563abb 100644
--- a/tools/qfcc/source/qc-parse.y
+++ b/tools/qfcc/source/qc-parse.y
@@ -153,7 +153,7 @@ int yylex (void);
 %token				PROTECTED PROTOCOL PUBLIC SELECTOR REFERENCE SELF THIS
 
 %type	<spec>		optional_specifiers specifiers local_specifiers
-%type	<spec>		storage_class save_storage
+%type	<spec>		storage_class save_storage set_spec_storage
 %type	<spec>		type_specifier type_specifier_or_storage_class
 %type	<spec>		type
 
@@ -349,6 +349,14 @@ save_storage
 		}
 	;
 
+set_spec_storage
+	: /* emtpy */
+		{
+			$$ = $<spec>0;
+			$$.storage = current_storage;
+		}
+	;
+
 function_body
 	: optional_state_expr
 		{
@@ -1229,7 +1237,7 @@ switch_block
 
 opt_init
 	: cexpr
-	| type init_var_decl_list { $$ = $2; }
+	| type set_spec_storage init_var_decl_list { $$ = $3; }
 	| /* empty */
 		{
 			$$ = 0;

From a6f3e1753a1376a4ffead4b943d39fe6a8b229e0 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 19 Feb 2020 12:58:55 +0900
Subject: [PATCH 0436/1519] Fix ruamoko's hashtab_t typedef

Being typedefed directly to a pointer is a holdover from when pointer
declarations were really awkward.
---
 ruamoko/include/hash.h   | 32 ++++++++++++++++----------------
 ruamoko/lib/hash.r       | 30 +++++++++++++++---------------
 ruamoko/scheme/Machine.h |  2 +-
 ruamoko/scheme/Symbol.r  |  2 +-
 4 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/ruamoko/include/hash.h b/ruamoko/include/hash.h
index 8c07169aa..2d0aa80fc 100644
--- a/ruamoko/include/hash.h
+++ b/ruamoko/include/hash.h
@@ -1,24 +1,24 @@
 #ifndef __ruamoko_hash_h
 #define __ruamoko_hash_h
 
-typedef struct _hashtab_t *hashtab_t;
+typedef struct _hashtab_t hashtab_t;
 
-@extern hashtab_t Hash_NewTable (int size, string gk (void *ele, void *data), void f (void *ele, void *data), void *ud);
-@extern void Hash_SetHashCompare (hashtab_t tab, unsigned gh (void *ele, void *data), int cmp (void *ele1, void *ele2, void *data));
-@extern void Hash_DelTable (hashtab_t tab);
-@extern void Hash_FlushTable (hashtab_t tab);
-@extern int Hash_Add (hashtab_t tab, void *ele);
-@extern int Hash_AddElement (hashtab_t tab, void *ele);
-@extern void *Hash_Find (hashtab_t tab, string key);
-@extern void *Hash_FindElement (hashtab_t tab, void *ele);
-@extern void **Hash_FindList (hashtab_t tab, string key);
-@extern void **Hash_FindElementList (hashtab_t tab, void *ele);
-@extern void *Hash_Del (hashtab_t tab, string key);
-@extern void *Hash_DelElement (hashtab_t tab, void *ele);
-@extern void Hash_Free (hashtab_t tab, void *ele);
+@extern hashtab_t *Hash_NewTable (int size, string gk (void *ele, void *data), void f (void *ele, void *data), void *ud);
+@extern void Hash_SetHashCompare (hashtab_t *tab, unsigned gh (void *ele, void *data), int cmp (void *ele1, void *ele2, void *data));
+@extern void Hash_DelTable (hashtab_t *tab);
+@extern void Hash_FlushTable (hashtab_t *tab);
+@extern int Hash_Add (hashtab_t *tab, void *ele);
+@extern int Hash_AddElement (hashtab_t *tab, void *ele);
+@extern void *Hash_Find (hashtab_t *tab, string key);
+@extern void *Hash_FindElement (hashtab_t *tab, void *ele);
+@extern void **Hash_FindList (hashtab_t *tab, string key);
+@extern void **Hash_FindElementList (hashtab_t *tab, void *ele);
+@extern void *Hash_Del (hashtab_t *tab, string key);
+@extern void *Hash_DelElement (hashtab_t *tab, void *ele);
+@extern void Hash_Free (hashtab_t *tab, void *ele);
 @extern int Hash_String (string str);
 @extern int Hash_Buffer (void *buf, int len);
-@extern void **Hash_GetList (hashtab_t tab);
-@extern void Hash_Stats (hashtab_t tab);
+@extern void **Hash_GetList (hashtab_t *tab);
+@extern void Hash_Stats (hashtab_t *tab);
 
 #endif	// __ruamoko_hash_h
diff --git a/ruamoko/lib/hash.r b/ruamoko/lib/hash.r
index 24844bfc2..a70d59b10 100644
--- a/ruamoko/lib/hash.r
+++ b/ruamoko/lib/hash.r
@@ -1,19 +1,19 @@
 #include "hash.h"
 
-hashtab_t Hash_NewTable (int size, string gk (void *ele, void *data), void f (void *ele, void *data), void *ud) = #0;
-void Hash_SetHashCompare (hashtab_t tab, unsigned gh (void *ele, void *data), int cmp (void *ele1, void *ele2, void *data)) = #0;
-void Hash_DelTable (hashtab_t tab) = #0;
-void Hash_FlushTable (hashtab_t tab) = #0;
-int Hash_Add (hashtab_t tab, void *ele) = #0;
-int Hash_AddElement (hashtab_t tab, void *ele) = #0;
-void *Hash_Find (hashtab_t tab, string key) = #0;
-void *Hash_FindElement (hashtab_t tab, void *ele) = #0;
-void **Hash_FindList (hashtab_t tab, string key) = #0;
-void **Hash_FindElementList (hashtab_t tab, void *ele) = #0;
-void *Hash_Del (hashtab_t tab, string key) = #0;
-void *Hash_DelElement (hashtab_t tab, void *ele) = #0;
-void Hash_Free (hashtab_t tab, void *ele) = #0;
+hashtab_t *Hash_NewTable (int size, string gk (void *ele, void *data), void f (void *ele, void *data), void *ud) = #0;
+void Hash_SetHashCompare (hashtab_t *tab, unsigned gh (void *ele, void *data), int cmp (void *ele1, void *ele2, void *data)) = #0;
+void Hash_DelTable (hashtab_t *tab) = #0;
+void Hash_FlushTable (hashtab_t *tab) = #0;
+int Hash_Add (hashtab_t *tab, void *ele) = #0;
+int Hash_AddElement (hashtab_t *tab, void *ele) = #0;
+void *Hash_Find (hashtab_t *tab, string key) = #0;
+void *Hash_FindElement (hashtab_t *tab, void *ele) = #0;
+void **Hash_FindList (hashtab_t *tab, string key) = #0;
+void **Hash_FindElementList (hashtab_t *tab, void *ele) = #0;
+void *Hash_Del (hashtab_t *tab, string key) = #0;
+void *Hash_DelElement (hashtab_t *tab, void *ele) = #0;
+void Hash_Free (hashtab_t *tab, void *ele) = #0;
 int Hash_String (string str) = #0;
 int Hash_Buffer (void *buf, int len) = #0;
-void **Hash_GetList (hashtab_t tab) = #0;
-void Hash_Stats (hashtab_t tab) = #0;
+void **Hash_GetList (hashtab_t *tab) = #0;
+void Hash_Stats (hashtab_t *tab) = #0;
diff --git a/ruamoko/scheme/Machine.h b/ruamoko/scheme/Machine.h
index 7c99a2433..a7da59f61 100644
--- a/ruamoko/scheme/Machine.h
+++ b/ruamoko/scheme/Machine.h
@@ -11,7 +11,7 @@
 {
     state_t state;
     SchemeObject *value;
-    hashtab_t globals;
+    hashtab_t *globals;
     SchemeObject *all_globals;
 }
 - (void) loadCode: (CompiledCode *) code;
diff --git a/ruamoko/scheme/Symbol.r b/ruamoko/scheme/Symbol.r
index 0704b3a50..b83f3dbd6 100644
--- a/ruamoko/scheme/Symbol.r
+++ b/ruamoko/scheme/Symbol.r
@@ -16,7 +16,7 @@ void SymbolFree (void *ele, void *data)
     [s release];
 }
     
-hashtab_t symbols;
+hashtab_t *symbols;
 Symbol *lparen;
 Symbol *rparen;
 Symbol *quote;

From b00c866c4e32d109de7c2dc683eff4f3c4e0378f Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 19 Feb 2020 13:00:36 +0900
Subject: [PATCH 0437/1519] Allow casting between string and pointer types

---
 tools/qfcc/include/type.h | 1 +
 tools/qfcc/source/expr.c  | 5 +++++
 tools/qfcc/source/type.c  | 8 ++++++++
 3 files changed, 14 insertions(+)

diff --git a/tools/qfcc/include/type.h b/tools/qfcc/include/type.h
index fcb4a808a..33d283462 100644
--- a/tools/qfcc/include/type.h
+++ b/tools/qfcc/include/type.h
@@ -166,6 +166,7 @@ int is_field (const type_t *type) __attribute__((pure));
 int is_struct (const type_t *type) __attribute__((pure));
 int is_array (const type_t *type) __attribute__((pure));
 int is_func (const type_t *type) __attribute__((pure));
+int is_string (const type_t *type) __attribute__((pure));
 int type_compatible (const type_t *dst, const type_t *src) __attribute__((pure));
 int type_assignable (const type_t *dst, const type_t *src);
 int type_size (const type_t *type) __attribute__((pure));
diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index 03e3ddc6a..691a03162 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -2595,6 +2595,11 @@ cast_expr (type_t *type, expr_t *e)
 	if ((type == type_default && is_enum (e_type))
 		|| (is_enum (type) && e_type == type_default))
 		return e;
+	if ((is_pointer (type) && is_string (e_type))
+		|| (is_string (type) && is_pointer (e_type))) {
+		c = new_alias_expr (type, e);
+		return c;
+	}
 	if (!(type->type == ev_pointer
 		  && (e_type->type == ev_pointer || is_integral (e_type)
 			  || is_array (e_type)))
diff --git a/tools/qfcc/source/type.c b/tools/qfcc/source/type.c
index 289b76563..c0d5b58e3 100644
--- a/tools/qfcc/source/type.c
+++ b/tools/qfcc/source/type.c
@@ -785,6 +785,14 @@ is_func (const type_t *type)
 	return 0;
 }
 
+int
+is_string (const type_t *type)
+{
+	if (type->type == ev_string)
+		return 1;
+	return 0;
+}
+
 int
 type_compatible (const type_t *dst, const type_t *src)
 {

From 2db5d04e3f5cfdd76e2cf3ab0214f3cae7e52caf Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 19 Feb 2020 14:40:01 +0900
Subject: [PATCH 0438/1519] Reduce the ephemeral nature of str_mid

When the substring is the tail of the supplied string, return a
"pointer" to within the supplied string rather than a new "return"
string. This means that tail-end substrings of string constants are
themselves constants.
---
 libs/ruamoko/rua_string.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libs/ruamoko/rua_string.c b/libs/ruamoko/rua_string.c
index 7f233e362..fcd78c1cc 100644
--- a/libs/ruamoko/rua_string.c
+++ b/libs/ruamoko/rua_string.c
@@ -112,6 +112,10 @@ bi_str_mid (progs_t *pr)
 		end = size;
 	if (pos < 0 || pos >= size || end <= pos)
 		return;
+	if (end == size) {
+		R_STRING (pr) = str + pos - pr->pr_strings;
+		return;
+	}
 	temp = alloca (end - pos + 1);
 	strncpy (temp, str + pos, end - pos);
 	temp[end - pos] = 0;

From adb7f5d601b793a077b033cef3d4b4340f6d06de Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 19 Feb 2020 16:21:55 +0900
Subject: [PATCH 0439/1519] Quieten the test script build rules

---
 tools/qfcc/test/Makefile.am | 78 ++++++++++++++++++-------------------
 1 file changed, 39 insertions(+), 39 deletions(-)

diff --git a/tools/qfcc/test/Makefile.am b/tools/qfcc/test/Makefile.am
index d9d66090a..fd2603f61 100644
--- a/tools/qfcc/test/Makefile.am
+++ b/tools/qfcc/test/Makefile.am
@@ -104,7 +104,7 @@ address_cast_obj=$(address_cast_dat_SOURCES:.r=.qfo)
 address-cast.dat$(EXEEXT): $(address_cast_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(address_cast_obj)
 address-cast.run: Makefile build-run
-	$(srcdir)/build-run $@
+	@$(srcdir)/build-run $@
 include ./$(DEPDIR)/address-cast.Qo # am--include-marker
 r_depfiles_remade += ./$(DEPDIR)/address-cast.Qo
 
@@ -113,7 +113,7 @@ alignment_obj=$(alignment_dat_SOURCES:.r=.qfo)
 alignment.dat$(EXEEXT): $(alignment_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(alignment_obj)
 alignment.run: Makefile build-run
-	$(srcdir)/build-run $@
+	@$(srcdir)/build-run $@
 include ./$(DEPDIR)/alignment.Qo # am--include-marker
 r_depfiles_remade += ./$(DEPDIR)/alignment.Qo
 
@@ -122,7 +122,7 @@ chewed_alias_obj=$(chewed_alias_dat_SOURCES:.r=.qfo)
 chewed-alias.dat$(EXEEXT): $(chewed_alias_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(chewed_alias_obj)
 chewed-alias.run: Makefile build-run
-	$(srcdir)/build-run $@
+	@$(srcdir)/build-run $@
 include ./$(DEPDIR)/chewed-alias.Qo # am--include-marker
 r_depfiles_remade += ./$(DEPDIR)/chewed-alias.Qo
 
@@ -131,7 +131,7 @@ chewed_return_obj=$(chewed_return_dat_SOURCES:.r=.qfo)
 chewed-return.dat$(EXEEXT): $(chewed_return_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(chewed_return_obj)
 chewed-return.run: Makefile build-run
-	TEST_HARNESS_OPTS=--float $(srcdir)/build-run $@
+	@TEST_HARNESS_OPTS=--float $(srcdir)/build-run $@
 include ./$(DEPDIR)/chewed-return.Qo # am--include-marker
 r_depfiles_remade += ./$(DEPDIR)/chewed-return.Qo
 
@@ -140,7 +140,7 @@ comma_expr_obj=$(comma_expr_dat_SOURCES:.r=.qfo)
 comma-expr.dat$(EXEEXT): $(comma_expr_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(comma_expr_obj)
 comma-expr.run: Makefile build-run
-	$(srcdir)/build-run $@
+	@$(srcdir)/build-run $@
 include ./$(DEPDIR)/comma-expr.Qo # am--include-marker
 r_depfiles_remade += ./$(DEPDIR)/comma-expr.Qo
 
@@ -149,7 +149,7 @@ deadbool_obj=$(deadbool_dat_SOURCES:.r=.qfo)
 deadbool.dat$(EXEEXT): $(deadbool_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(deadbool_obj)
 deadbool.run: Makefile build-run
-	$(srcdir)/build-run $@
+	@$(srcdir)/build-run $@
 include ./$(DEPDIR)/deadbool.Qo # am--include-marker
 r_depfiles_remade += ./$(DEPDIR)/deadbool.Qo
 
@@ -158,46 +158,46 @@ double_obj=$(double_dat_SOURCES:.r=.qfo)
 double.dat$(EXEEXT): $(double_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(double_obj)
 double.run: Makefile build-run
-	$(srcdir)/build-run $@
+	@$(srcdir)/build-run $@
 include ./$(DEPDIR)/double.Qo # am--include-marker
 r_depfiles_remade += ./$(DEPDIR)/double.Qo
 
 double-demote-int.run$(EXEEXT): double-demote-int.r Makefile build-compile-fail-run
-	$(srcdir)/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $<
+	@$(srcdir)/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $<
 
 double-demote-float.run$(EXEEXT): double-demote-float.r Makefile build-compile-fail-run
-	$(srcdir)/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $<
+	@$(srcdir)/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $<
 
 double-demote-int-ainit.run$(EXEEXT): double-demote-int-ainit.r Makefile build-compile-fail-run
-	$(srcdir)/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $<
+	@$(srcdir)/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $<
 
 double-demote-float-ainit.run$(EXEEXT): double-demote-float-ainit.r Makefile build-compile-fail-run
-	$(srcdir)/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $<
+	@$(srcdir)/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $<
 
 double-demote-int-ginit.run$(EXEEXT): double-demote-int-ginit.r Makefile build-compile-fail-run
-	$(srcdir)/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $<
+	@$(srcdir)/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $<
 
 double-demote-float-ginit.run$(EXEEXT): double-demote-float-ginit.r Makefile build-compile-fail-run
-	$(srcdir)/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $<
+	@$(srcdir)/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $<
 
 double-demote-int-linit.run$(EXEEXT): double-demote-int-linit.r Makefile build-compile-fail-run
-	$(srcdir)/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $<
+	@$(srcdir)/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $<
 
 double-demote-float-linit.run$(EXEEXT): double-demote-float-linit.r Makefile build-compile-fail-run
-	$(srcdir)/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $<
+	@$(srcdir)/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $<
 
 double-int-compare.run$(EXEEXT): double-int-compare.r Makefile build-compile-fail-run
-	$(srcdir)/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $<
+	@$(srcdir)/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $<
 
 double-float-compare.run$(EXEEXT): double-float-compare.r Makefile build-compile-fail-run
-	$(srcdir)/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $<
+	@$(srcdir)/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $<
 
 enum_dat_SOURCES=enum.r
 enum_obj=$(enum_dat_SOURCES:.r=.qfo)
 enum.dat$(EXEEXT): $(enum_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(enum_obj)
 enum.run: Makefile build-run
-	$(srcdir)/build-run $@
+	@$(srcdir)/build-run $@
 include ./$(DEPDIR)/enum.Qo # am--include-marker
 r_depfiles_remade += ./$(DEPDIR)/enum.Qo
 
@@ -206,7 +206,7 @@ fordecl_obj=$(fordecl_dat_SOURCES:.r=.qfo)
 fordecl.dat$(EXEEXT): $(fordecl_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(fordecl_obj)
 fordecl.run: Makefile build-run
-	$(srcdir)/build-run $@
+	@$(srcdir)/build-run $@
 include ./$(DEPDIR)/fordecl.Qo # am--include-marker
 r_depfiles_remade += ./$(DEPDIR)/fordecl.Qo
 
@@ -215,7 +215,7 @@ func_expr_obj=$(func_expr_dat_SOURCES:.r=.qfo)
 func-expr.dat$(EXEEXT): $(func_expr_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(func_expr_obj)
 func-expr.run: Makefile build-run
-	$(srcdir)/build-run $@
+	@$(srcdir)/build-run $@
 include ./$(DEPDIR)/func-expr.Qo # am--include-marker
 r_depfiles_remade += ./$(DEPDIR)/func-expr.Qo
 
@@ -224,7 +224,7 @@ func_static_obj=$(func_static_dat_SOURCES:.r=.qfo)
 func-static.dat$(EXEEXT): $(func_static_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(func_static_obj)
 func-static.run: Makefile build-run
-	$(srcdir)/build-run $@
+	@$(srcdir)/build-run $@
 include ./$(DEPDIR)/func-static.Qo # am--include-marker
 r_depfiles_remade += ./$(DEPDIR)/func-static.Qo
 
@@ -233,7 +233,7 @@ infloop_obj=$(infloop_dat_SOURCES:.r=.qfo)
 infloop.dat$(EXEEXT): $(infloop_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(infloop_obj)
 infloop.run: Makefile build-run
-	$(srcdir)/build-run $@
+	@$(srcdir)/build-run $@
 include ./$(DEPDIR)/infloop.Qo # am--include-marker
 r_depfiles_remade += ./$(DEPDIR)/infloop.Qo
 
@@ -242,7 +242,7 @@ ivar_struct_return_obj=$(ivar_struct_return_dat_SOURCES:.r=.qfo)
 ivar-struct-return.dat$(EXEEXT): $(ivar_struct_return_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(ivar_struct_return_obj)
 ivar-struct-return.run: Makefile build-run
-	$(srcdir)/build-run $@
+	@$(srcdir)/build-run $@
 include ./$(DEPDIR)/ivar-struct-return.Qo # am--include-marker
 r_depfiles_remade += ./$(DEPDIR)/ivar-struct-return.Qo
 
@@ -251,7 +251,7 @@ modulo_obj=$(modulo_dat_SOURCES:.r=.qfo)
 modulo.dat$(EXEEXT): $(modulo_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(modulo_obj)
 modulo.run: Makefile build-run
-	TEST_HARNESS_OPTS=--float $(srcdir)/build-run $@
+	@TEST_HARNESS_OPTS=--float $(srcdir)/build-run $@
 include ./$(DEPDIR)/modulo.Qo # am--include-marker
 r_depfiles_remade += ./$(DEPDIR)/modulo.Qo
 
@@ -260,7 +260,7 @@ paramret_obj=$(paramret_dat_SOURCES:.r=.qfo)
 paramret.dat$(EXEEXT): $(paramret_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(paramret_obj)
 paramret.run: Makefile build-run
-	TEST_HARNESS_OPTS=--float $(srcdir)/build-run $@
+	@TEST_HARNESS_OPTS=--float $(srcdir)/build-run $@
 include ./$(DEPDIR)/paramret.Qo # am--include-marker
 r_depfiles_remade += ./$(DEPDIR)/paramret.Qo
 
@@ -269,7 +269,7 @@ quaternion_obj=$(quaternion_dat_SOURCES:.r=.qfo)
 quaternion.dat$(EXEEXT): $(quaternion_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(quaternion_obj)
 quaternion.run: Makefile build-run
-	$(srcdir)/build-run $@
+	@$(srcdir)/build-run $@
 include ./$(DEPDIR)/quaternion.Qo # am--include-marker
 r_depfiles_remade += ./$(DEPDIR)/quaternion.Qo
 
@@ -278,7 +278,7 @@ return_ivar_obj=$(return_ivar_dat_SOURCES:.r=.qfo)
 return-ivar.dat$(EXEEXT): $(return_ivar_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(return_ivar_obj)
 return-ivar.run: Makefile build-run
-	$(srcdir)/build-run $@
+	@$(srcdir)/build-run $@
 include ./$(DEPDIR)/return-ivar.Qo # am--include-marker
 r_depfiles_remade += ./$(DEPDIR)/return-ivar.Qo
 
@@ -287,7 +287,7 @@ sendv_obj=$(sendv_dat_SOURCES:.r=.qfo)
 sendv.dat$(EXEEXT): $(sendv_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(sendv_obj)
 sendv.run: Makefile build-run
-	$(srcdir)/build-run $@
+	@$(srcdir)/build-run $@
 include ./$(DEPDIR)/sendv.Qo # am--include-marker
 r_depfiles_remade += ./$(DEPDIR)/sendv.Qo
 
@@ -296,7 +296,7 @@ state_obj=$(state_dat_SOURCES:.r=.qfo)
 state.dat$(EXEEXT): $(state_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(state_obj)
 state.run: Makefile build-run
-	$(srcdir)/build-run $@
+	@$(srcdir)/build-run $@
 include ./$(DEPDIR)/state.Qo # am--include-marker
 r_depfiles_remade += ./$(DEPDIR)/state.Qo
 
@@ -305,7 +305,7 @@ structarray_obj=$(structarray_dat_SOURCES:.r=.qfo)
 structarray.dat$(EXEEXT): $(structarray_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(structarray_obj)
 structarray.run: Makefile build-run
-	$(srcdir)/build-run $@
+	@$(srcdir)/build-run $@
 include ./$(DEPDIR)/structarray.Qo # am--include-marker
 r_depfiles_remade += ./$(DEPDIR)/structarray.Qo
 
@@ -314,7 +314,7 @@ structlive_obj=$(structlive_dat_SOURCES:.r=.qfo)
 structlive.dat$(EXEEXT): $(structlive_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(structlive_obj)
 structlive.run: Makefile build-run
-	$(srcdir)/build-run $@
+	@$(srcdir)/build-run $@
 include ./$(DEPDIR)/structlive.Qo # am--include-marker
 r_depfiles_remade += ./$(DEPDIR)/structlive.Qo
 
@@ -323,7 +323,7 @@ structptr_obj=$(structptr_dat_SOURCES:.r=.qfo)
 structptr.dat$(EXEEXT): $(structptr_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(structptr_obj)
 structptr.run: Makefile build-run
-	$(srcdir)/build-run $@
+	@$(srcdir)/build-run $@
 include ./$(DEPDIR)/structptr.Qo # am--include-marker
 r_depfiles_remade += ./$(DEPDIR)/structptr.Qo
 
@@ -332,7 +332,7 @@ structstruct_obj=$(structstruct_dat_SOURCES:.r=.qfo)
 structstruct.dat$(EXEEXT): $(structstruct_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(structstruct_obj)
 structstruct.run: Makefile build-run
-	$(srcdir)/build-run $@
+	@$(srcdir)/build-run $@
 include ./$(DEPDIR)/structstruct.Qo # am--include-marker
 r_depfiles_remade += ./$(DEPDIR)/structstruct.Qo
 
@@ -341,7 +341,7 @@ swap_obj=$(swap_dat_SOURCES:.r=.qfo)
 swap.dat$(EXEEXT): $(swap_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(swap_obj)
 swap.run: Makefile build-run
-	$(srcdir)/build-run $@
+	@$(srcdir)/build-run $@
 include ./$(DEPDIR)/swap.Qo # am--include-marker
 r_depfiles_remade += ./$(DEPDIR)/swap.Qo
 
@@ -350,7 +350,7 @@ triangle_obj=$(triangle_dat_SOURCES:.r=.qfo)
 triangle.dat$(EXEEXT): $(triangle_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(triangle_obj)
 triangle.run: Makefile build-run
-	$(srcdir)/build-run $@ 100000 100000 1.00005 50002.4961
+	@$(srcdir)/build-run $@ 100000 100000 1.00005 50002.4961
 include ./$(DEPDIR)/triangle.Qo # am--include-marker
 r_depfiles_remade += ./$(DEPDIR)/triangle.Qo
 
@@ -359,7 +359,7 @@ vecexpr_obj=$(vecexpr_dat_SOURCES:.r=.qfo)
 vecexpr.dat$(EXEEXT): $(vecexpr_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(vecexpr_obj)
 vecexpr.run: Makefile build-run
-	$(srcdir)/build-run $@
+	@$(srcdir)/build-run $@
 include ./$(DEPDIR)/vecexpr.Qo # am--include-marker
 r_depfiles_remade += ./$(DEPDIR)/vecexpr.Qo
 
@@ -368,7 +368,7 @@ vecinit_obj=$(vecinit_dat_SOURCES:.r=.qfo)
 vecinit.dat$(EXEEXT): $(vecinit_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(vecinit_obj)
 vecinit.run: Makefile build-run
-	$(srcdir)/build-run $@
+	@$(srcdir)/build-run $@
 include ./$(DEPDIR)/vecinit.Qo # am--include-marker
 r_depfiles_remade += ./$(DEPDIR)/vecinit.Qo
 
@@ -377,7 +377,7 @@ voidfor_obj=$(voidfor_dat_SOURCES:.r=.qfo)
 voidfor.dat$(EXEEXT): $(voidfor_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(voidfor_obj)
 voidfor.run: Makefile build-run
-	$(srcdir)/build-run $@
+	@$(srcdir)/build-run $@
 include ./$(DEPDIR)/voidfor.Qo # am--include-marker
 r_depfiles_remade += ./$(DEPDIR)/voidfor.Qo
 
@@ -386,7 +386,7 @@ while_obj=$(while_dat_SOURCES:.r=.qfo)
 while.dat$(EXEEXT): $(while_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(while_obj)
 while.run: Makefile build-run
-	$(srcdir)/build-run $@
+	@$(srcdir)/build-run $@
 include ./$(DEPDIR)/while.Qo # am--include-marker
 r_depfiles_remade += ./$(DEPDIR)/while.Qo
 

From 2f18364364ee1340b8108ddee315c288ccde2978 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 19 Feb 2020 17:05:25 +0900
Subject: [PATCH 0440/1519] Start work on encoding typedef chains

---
 include/QF/pr_type.h             |  7 ++++
 ruamoko/include/types.h          |  8 +++++
 tools/qfcc/include/type.h        |  6 ++++
 tools/qfcc/source/dump_globals.c |  4 +++
 tools/qfcc/source/obj_file.c     |  6 ++++
 tools/qfcc/source/type.c         | 15 ++++++++
 tools/qfcc/test/Makefile.am      | 14 ++++++--
 tools/qfcc/test/typedef.r        | 62 ++++++++++++++++++++++++++++++++
 8 files changed, 120 insertions(+), 2 deletions(-)
 create mode 100644 tools/qfcc/test/typedef.r

diff --git a/include/QF/pr_type.h b/include/QF/pr_type.h
index 0c8b37664..0e33b0fd6 100644
--- a/include/QF/pr_type.h
+++ b/include/QF/pr_type.h
@@ -40,6 +40,12 @@
 
 #include "QF/pr_comp.h"
 
+typedef struct qfot_alias_s {
+	pr_int_t    type;				///< type at end of alias chain
+	pointer_t   aux_type;			///< referenced type
+	string_t    name;				///< alias name
+} qfot_alias_t;
+
 typedef struct qfot_fldptr_s {
 	pr_int_t    type;				///< ev_field or ev_pointer
 	pointer_t   aux_type;			///< referenced type
@@ -94,6 +100,7 @@ typedef struct qfot_type_s {
 		qfot_struct_t strct;		///< ty_struct/ty_union/ty_enum
 		qfot_array_t array;			///< ty_array
 		pointer_t   class;			///< ty_class
+		qfot_alias_t alias;			///< ty_alias
 	}           t;
 } qfot_type_t;
 
diff --git a/ruamoko/include/types.h b/ruamoko/include/types.h
index 8ff66e10c..deb480ebf 100644
--- a/ruamoko/include/types.h
+++ b/ruamoko/include/types.h
@@ -27,8 +27,15 @@ typedef enum {
 	ty_enum,
 	ty_array,
 	ty_class,
+	ty_alias,
 } ty_meta_e;
 
+typedef struct qfot_alias_s {
+	etype_t     type;
+	struct qfot_type_s *aux_type;
+	string      name;
+} qfot_alias_t;
+
 typedef struct qfot_fldptr_s {
 	etype_t     type;
 	struct qfot_type_s *aux_type;
@@ -70,6 +77,7 @@ typedef struct qfot_type_s {
 		qfot_struct_t strct;
 		qfot_array_t array;
 		string      class;
+		qfot_alias_t alias;
 	}           t;
 } qfot_type_t;
 
diff --git a/tools/qfcc/include/type.h b/tools/qfcc/include/type.h
index 33d283462..45aecd293 100644
--- a/tools/qfcc/include/type.h
+++ b/tools/qfcc/include/type.h
@@ -51,6 +51,10 @@ typedef struct ty_array_s {
 	int         size;
 } ty_array_t;
 
+typedef struct ty_alias_s {
+	struct type_s *type;
+} ty_alias_t;
+
 typedef enum {
 	ty_none,				///< func/field/pointer or not used
 	ty_struct,
@@ -58,6 +62,7 @@ typedef enum {
 	ty_enum,
 	ty_array,
 	ty_class,
+	ty_alias,
 } ty_meta_e;
 
 typedef struct type_s {
@@ -72,6 +77,7 @@ typedef struct type_s {
 		ty_array_t  array;
 		struct symtab_s *symtab;
 		struct class_s *class;
+		ty_alias_t  alias;
 	} t;
 	struct type_s *next;
 	int         freeable;
diff --git a/tools/qfcc/source/dump_globals.c b/tools/qfcc/source/dump_globals.c
index 9e0b5bd5f..d77f5af32 100644
--- a/tools/qfcc/source/dump_globals.c
+++ b/tools/qfcc/source/dump_globals.c
@@ -493,6 +493,10 @@ dump_qfo_types (qfo_t *qfo, int base_address)
 				printf (" %-5x %d %d\n", type->t.array.type,
 						type->t.array.base, type->t.array.size);
 				break;
+			case ty_alias:
+				printf (" %s %-5x\n", QFO_GETSTR (qfo, type->t.alias.name),
+						type->t.alias.type);
+				break;
 			case ty_class:
 				printf (" %-5x\n", type->t.class);
 				break;
diff --git a/tools/qfcc/source/obj_file.c b/tools/qfcc/source/obj_file.c
index 44148eec8..e49d64c46 100644
--- a/tools/qfcc/source/obj_file.c
+++ b/tools/qfcc/source/obj_file.c
@@ -648,8 +648,10 @@ get_def_type (qfo_t *qfo, pointer_t type)
 	type_def = QFO_POINTER (qfo, qfo_type_space, qfot_type_t, type);
 	switch ((ty_meta_e)type_def->meta) {
 		case ty_none:
+		case ty_alias:
 			// field, pointer and function types store their basic type in
 			// the same location.
+			// alias types store the basic type at the end of the alias chain
 			return type_def->t.type;
 		case ty_struct:
 		case ty_union:
@@ -674,9 +676,11 @@ get_type_size (qfo_t *qfo, pointer_t type)
 		return 1;
 	type_def = QFO_POINTER (qfo, qfo_type_space, qfot_type_t, type);
 	switch ((ty_meta_e)type_def->meta) {
+		case ty_alias:
 		case ty_none:
 			// field, pointer and function types store their basic type in
 			// the same location.
+			// alias types store the basic type at the end of the alias chain
 			return pr_type_size[type_def->t.type];
 		case ty_struct:
 			for (i = size = 0; i < type_def->t.strct.num_fields; i++)
@@ -723,8 +727,10 @@ get_type_alignment_log (qfo_t *qfo, pointer_t type)
 	type_def = QFO_POINTER (qfo, qfo_type_space, qfot_type_t, type);
 	switch ((ty_meta_e)type_def->meta) {
 		case ty_none:
+		case ty_alias:
 			// field, pointer and function types store their basic type in
 			// the same location.
+			// alias types store the basic type at the end of the alias chain
 			return qfo_log2 (ev_types[type_def->t.type]->alignment);
 		case ty_struct:
 		case ty_union:
diff --git a/tools/qfcc/source/type.c b/tools/qfcc/source/type.c
index c0d5b58e3..5ffd2b7be 100644
--- a/tools/qfcc/source/type.c
+++ b/tools/qfcc/source/type.c
@@ -292,6 +292,8 @@ types_same (type_t *a, type_t *b)
 			if (a->t.class != b->t.class)
 				return 0;
 			return compare_protocols (a->protos, b->protos);
+		case ty_alias:
+			return !strcmp (a->name, b->name);
 	}
 	internal_error (0, "we be broke");
 }
@@ -341,6 +343,9 @@ find_type (type_t *type)
 				break;
 			case ty_class:
 				break;
+			case ty_alias:
+				type->t.alias.type = find_type (type->t.alias.type);
+				break;
 		}
 	}
 
@@ -512,6 +517,11 @@ print_type_str (dstring_t *str, const type_t *type)
 						dasprintf (str, "[%d]", type->t.array.size);
 					}
 					break;
+				case ty_alias:
+					dasprintf (str, "({%s=", type->name);
+					print_type_str (str, type->t.alias.type);
+					dstring_appendstr (str, "})");
+					break;
 				case ty_none:
 					break;
 			}
@@ -671,6 +681,9 @@ encode_type (dstring_t *encoding, const type_t *type)
 					encode_type (encoding, type->t.array.type);
 					dasprintf (encoding, "]");
 					break;
+				case ty_alias:
+					encode_type (encoding, type->t.alias.type);
+					break;
 				case ty_none:
 					dasprintf (encoding, "?");
 					break;
@@ -892,6 +905,8 @@ type_size (const type_t *type)
 					}
 				case ty_array:
 					return type->t.array.size * type_size (type->t.array.type);
+				case ty_alias:
+					return type_size (type->t.alias.type);
 				case ty_none:
 					return 0;
 			}
diff --git a/tools/qfcc/test/Makefile.am b/tools/qfcc/test/Makefile.am
index fd2603f61..e715b38ed 100644
--- a/tools/qfcc/test/Makefile.am
+++ b/tools/qfcc/test/Makefile.am
@@ -9,8 +9,8 @@ AM_CPPFLAGS= -I$(top_srcdir)/include $(QFCC_INCS)
 QFCC_DEP=$(builddir)/../source/qfcc$(EXEEXT)
 QFCC=$(QFCC_DEP)
 
-QCFLAGS=-qq -O -g --no-default-paths -Werror
-QCPPFLAGS=
+QCFLAGS=-qq -O -g -Werror
+QCPPFLAGS=--no-default-paths -I$(top_srcdir)/ruamoko/include
 QCOMPILE=$(QFCC) $(QCFLAGS) $(QCPPFLAGS)
 
 SUFFIXES=.qfo .r
@@ -54,6 +54,7 @@ test_progs_dat=\
 	structstruct.dat \
 	swap.dat \
 	triangle.dat \
+	typedef.dat \
 	vecexpr.dat \
 	vecinit.dat \
 	voidfor.dat \
@@ -354,6 +355,15 @@ triangle.run: Makefile build-run
 include ./$(DEPDIR)/triangle.Qo # am--include-marker
 r_depfiles_remade += ./$(DEPDIR)/triangle.Qo
 
+typedef_dat_SOURCES=typedef.r
+typedef_obj=$(typedef_dat_SOURCES:.r=.qfo)
+typedef.dat$(EXEEXT): $(typedef_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(typedef_obj)
+typedef.run: Makefile build-run
+	@$(srcdir)/build-run $@
+include ./$(DEPDIR)/typedef.Qo # am--include-marker
+r_depfiles_remade += ./$(DEPDIR)/typedef.Qo
+
 vecexpr_dat_SOURCES=vecexpr.r
 vecexpr_obj=$(vecexpr_dat_SOURCES:.r=.qfo)
 vecexpr.dat$(EXEEXT): $(vecexpr_obj) $(QFCC_DEP)
diff --git a/tools/qfcc/test/typedef.r b/tools/qfcc/test/typedef.r
new file mode 100644
index 000000000..48ea84478
--- /dev/null
+++ b/tools/qfcc/test/typedef.r
@@ -0,0 +1,62 @@
+#include <types.h>
+
+// can't link against libr.a (may not be built)
+void *PR_FindGlobal (string name) = #0;
+void printf (string fmt, ...) = #0;
+
+qfot_type_encodings_t *encodings;
+
+typedef int *foo;
+typedef int *bar;
+
+foo baz;
+bar snafu;
+
+qfot_type_t *
+next_type (qfot_type_t *type)
+{
+	int         size = type.size;
+	if (!size)
+		size = 4;
+	return (qfot_type_t *) ((int *) type + size);
+}
+
+int
+main (void)
+{
+	int         found_foo = 0;
+	int         found_bar = 0;
+	qfot_type_t *type;
+	qfot_type_t *alias;
+
+	baz = snafu;	// must be able to assign without warnings (won't compile)
+
+	encodings = PR_FindGlobal (".type_encodings");
+
+	for (type = encodings.types;
+		 ((int *)type - (int *) encodings.types) < encodings.size;
+		type = next_type (type)) {
+		if (type.meta == ty_alias && type.t.alias.type == ev_integer) {
+			alias = type.t.alias.aux_type;
+			if (type.t.alias.name == "foo") {
+				if (alias.meta == ty_none && alias.t.type == ev_integer) {
+					found_foo = 1;
+				} else {
+					printf ("foo type not aliased to int\n");
+				}
+			}
+			if (type.t.alias.name == "bar") {
+				if (alias.meta == ty_none && alias.t.type == ev_integer) {
+					found_bar = 1;
+				} else {
+					printf ("bar type not aliased to int\n");
+				}
+			}
+		}
+	}
+	if (!(found_bar && found_foo)) {
+		printf ("missing typedef: foo: %d bar:%d\n", found_foo, found_bar);
+		return 1;
+	}
+	return 0;
+}

From a5aba6c8ac80dc680ba9f0e324cee01d397b0fc9 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 19 Feb 2020 18:11:43 +0900
Subject: [PATCH 0441/1519] Implement type aliasing

The separate types are in the file, but there are multiple issues
---
 tools/qfcc/include/type.h        |  6 ++++--
 tools/qfcc/source/dump_globals.c |  1 +
 tools/qfcc/source/obj_type.c     | 19 ++++++++++++++++++-
 tools/qfcc/source/qc-parse.y     |  1 +
 tools/qfcc/source/type.c         | 19 +++++++++++++++++++
 5 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/tools/qfcc/include/type.h b/tools/qfcc/include/type.h
index 45aecd293..1efbfc21a 100644
--- a/tools/qfcc/include/type.h
+++ b/tools/qfcc/include/type.h
@@ -138,8 +138,9 @@ void chain_type (type_t *type);
 
 /**	Append a type to the end of a type chain.
 
-	The type chain must be made up of only field, pointer, function and array
-	types, as other types do not have auxiliary type fields.
+	The type chain must be made up of only field, pointer, function, array
+	and alias (typedef) types, as other types do not have auxiliary type
+	fields.
 
 	\param type		The type chain to which the type will be appended.
 	\param new		The type to be appended. May be any type.
@@ -153,6 +154,7 @@ type_t *field_type (type_t *aux);
 type_t *pointer_type (type_t *aux);
 type_t *array_type (type_t *aux, int size);
 type_t *based_array_type (type_t *aux, int base, int top);
+type_t *alias_type (type_t *aux, const char *name);
 void print_type_str (struct dstring_s *str, const type_t *type);
 void print_type (const type_t *type);
 const char *encode_params (const type_t *type);
diff --git a/tools/qfcc/source/dump_globals.c b/tools/qfcc/source/dump_globals.c
index d77f5af32..7f4adbbc9 100644
--- a/tools/qfcc/source/dump_globals.c
+++ b/tools/qfcc/source/dump_globals.c
@@ -423,6 +423,7 @@ static const char *ty_meta_names[] = {
 	"ty_enum",
 	"ty_array",
 	"ty_class",
+	"ty_alias",
 };
 #define NUM_META ((int)(sizeof (ty_meta_names) / sizeof (ty_meta_names[0])))
 
diff --git a/tools/qfcc/source/obj_type.c b/tools/qfcc/source/obj_type.c
index 55da5c137..e67f7a0b5 100644
--- a/tools/qfcc/source/obj_type.c
+++ b/tools/qfcc/source/obj_type.c
@@ -253,6 +253,22 @@ qfo_encode_class (type_t *type)
 	return def;
 }
 
+static def_t *
+qfo_encode_alias (type_t *type)
+{
+	qfot_type_t *enc;
+	def_t      *def;
+	def_t      *alias_type_def;
+
+	alias_type_def = qfo_encode_type (type->t.alias.type);
+
+	def = qfo_new_encoding (type, sizeof (enc->t.alias));
+	enc = D_POINTER (qfot_type_t, def);
+	ENC_DEF (enc->t.alias.type, alias_type_def);
+	ENC_STR (enc->t.alias.name, type->name);
+	return def;
+}
+
 def_t *
 qfo_encode_type (type_t *type)
 {
@@ -265,6 +281,7 @@ qfo_encode_type (type_t *type)
 		qfo_encode_struct,	// ty_enum
 		qfo_encode_array,	// ty_array
 		qfo_encode_class,	// ty_class
+		qfo_encode_alias,	// ty_alias
 	};
 
 	if (type->type_def && type->type_def->external) {
@@ -274,7 +291,7 @@ qfo_encode_type (type_t *type)
 	}
 	if (type->type_def)
 		return type->type_def;
-	if (type->meta > ty_class)
+	if (type->meta > sizeof (funcs) / (sizeof (funcs[0])))
 		internal_error (0, "bad type meta type");
 	if (!type->encoding)
 		type->encoding = type_get_encoding (type);
diff --git a/tools/qfcc/source/qc-parse.y b/tools/qfcc/source/qc-parse.y
index a71563abb..4773eb303 100644
--- a/tools/qfcc/source/qc-parse.y
+++ b/tools/qfcc/source/qc-parse.y
@@ -406,6 +406,7 @@ external_decl
 			$1->type = find_type (append_type ($1->type, spec.type));
 			if (spec.is_typedef) {
 				$1->sy_type = sy_type;
+				$1->type = alias_type ($1->type, $1->name);
 				symtab_addsymbol (current_symtab, $1);
 			} else {
 				initialize_def ($1, 0, current_symtab->space, spec.storage);
diff --git a/tools/qfcc/source/type.c b/tools/qfcc/source/type.c
index 5ffd2b7be..964d2d367 100644
--- a/tools/qfcc/source/type.c
+++ b/tools/qfcc/source/type.c
@@ -445,6 +445,25 @@ based_array_type (type_t *aux, int base, int top)
 	return new;
 }
 
+type_t *
+alias_type (type_t *aux, const char *name)
+{
+	type_t      _new;
+	type_t     *new = &_new;
+
+	if (!aux || !name) {
+		internal_error (0, "alias to null type or with no name");
+	}
+	memset (&_new, 0, sizeof (_new));
+	new->name = save_string (name);
+	new->meta = ty_alias;
+	new->type = aux->type;
+	new->alignment = aux->alignment;
+	new->t.alias.type = aux;
+	new = find_type (new);
+	return new;
+}
+
 void
 print_type_str (dstring_t *str, const type_t *type)
 {

From d50a27a045a9fb7cbe6a15cd3557b88e5d75a4ba Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 19 Feb 2020 18:28:11 +0900
Subject: [PATCH 0442/1519] Race down the alias chain before checking types

This takes care of some of the type aliasing issues.
---
 tools/qfcc/include/type.h |   1 +
 tools/qfcc/source/type.c  | 337 ++++++++++++++++++++------------------
 2 files changed, 182 insertions(+), 156 deletions(-)

diff --git a/tools/qfcc/include/type.h b/tools/qfcc/include/type.h
index 1efbfc21a..098df5e00 100644
--- a/tools/qfcc/include/type.h
+++ b/tools/qfcc/include/type.h
@@ -160,6 +160,7 @@ void print_type (const type_t *type);
 const char *encode_params (const type_t *type);
 void encode_type (struct dstring_s *encoding, const type_t *type);
 const char *type_get_encoding (const type_t *type);
+const type_t *unalias_type (const type_t *type) __attribute__((pure));
 int is_void (const type_t *type) __attribute__((pure));
 int is_enum (const type_t *type) __attribute__((pure));
 int is_integral (const type_t *type) __attribute__((pure));
diff --git a/tools/qfcc/source/type.c b/tools/qfcc/source/type.c
index 964d2d367..2aff5c5d1 100644
--- a/tools/qfcc/source/type.c
+++ b/tools/qfcc/source/type.c
@@ -471,84 +471,95 @@ print_type_str (dstring_t *str, const type_t *type)
 		dasprintf (str, " (null)");
 		return;
 	}
-	switch (type->type) {
-		case ev_field:
-			dasprintf (str, ".(");
-			print_type_str (str, type->t.fldptr.type);
-			dasprintf (str, ")");
-			break;
-		case ev_func:
-			print_type_str (str, type->t.func.type);
-			if (type->t.func.num_params == -1) {
-				dasprintf (str, "(...)");
+	switch (type->meta) {
+		case ty_class:
+			dasprintf (str, " %s", type->t.class->name);
+			if (type->protos)
+				print_protocollist (str, type->protos);
+			return;
+		case ty_enum:
+			dasprintf (str, " enum %s", type->name);
+			return;
+		case ty_struct:
+			dasprintf (str, " struct %s", type->name);
+			return;
+		case ty_union:
+			dasprintf (str, " union %s", type->name);
+			return;
+		case ty_array:
+			print_type_str (str, type->t.array.type);
+			if (type->t.array.base) {
+				dasprintf (str, "[%d..%d]", type->t.array.base,
+						type->t.array.base + type->t.array.size - 1);
 			} else {
-				int         c, i;
-				dasprintf (str, "(");
-				if ((c = type->t.func.num_params) < 0)
-					c = ~c;		// num_params is one's compliment
-				for (i = 0; i < c; i++) {
-					if (i)
-						dasprintf (str, ", ");
-					print_type_str (str, type->t.func.param_types[i]);
-				}
-				if (type->t.func.num_params < 0)
-						dasprintf (str, ", ...");
-				dasprintf (str, ")");
+				dasprintf (str, "[%d]", type->t.array.size);
 			}
-			break;
-		case ev_pointer:
-			if (obj_is_id (type)) {
-				dasprintf (str, "id");
-				if (type->t.fldptr.type->protos)
-					print_protocollist (str, type->t.fldptr.type->protos);
-				break;
-			}
-			if (type == &type_SEL) {
-				dasprintf (str, "SEL");
-				break;
-			}
-			dasprintf (str, "(*");
-			print_type_str (str, type->t.fldptr.type);
-			dasprintf (str, ")");
-			break;
-		case ev_invalid:
-			switch (type->meta) {
-				case ty_class:
-					dasprintf (str, " %s", type->t.class->name);
-					if (type->protos)
-						print_protocollist (str, type->protos);
-					break;
-				case ty_enum:
-					dasprintf (str, " enum %s", type->name);
-					break;
-				case ty_struct:
-					dasprintf (str, " struct %s", type->name);
-					break;
-				case ty_union:
-					dasprintf (str, " union %s", type->name);
-					break;
-				case ty_array:
-					print_type_str (str, type->t.array.type);
-					if (type->t.array.base) {
-						dasprintf (str, "[%d..%d]", type->t.array.base,
-								type->t.array.base + type->t.array.size - 1);
+			return;
+		case ty_alias:
+			dasprintf (str, "({%s=", type->name);
+			print_type_str (str, type->t.alias.type);
+			dstring_appendstr (str, "})");
+			return;
+		case ty_none:
+			switch (type->type) {
+				case ev_field:
+					dasprintf (str, ".(");
+					print_type_str (str, type->t.fldptr.type);
+					dasprintf (str, ")");
+					return;
+				case ev_func:
+					print_type_str (str, type->t.func.type);
+					if (type->t.func.num_params == -1) {
+						dasprintf (str, "(...)");
 					} else {
-						dasprintf (str, "[%d]", type->t.array.size);
+						int         c, i;
+						dasprintf (str, "(");
+						if ((c = type->t.func.num_params) < 0)
+							c = ~c;		// num_params is one's compliment
+						for (i = 0; i < c; i++) {
+							if (i)
+								dasprintf (str, ", ");
+							print_type_str (str, type->t.func.param_types[i]);
+						}
+						if (type->t.func.num_params < 0)
+								dasprintf (str, ", ...");
+						dasprintf (str, ")");
 					}
-					break;
-				case ty_alias:
-					dasprintf (str, "({%s=", type->name);
-					print_type_str (str, type->t.alias.type);
-					dstring_appendstr (str, "})");
-					break;
-				case ty_none:
+					return;
+				case ev_pointer:
+					if (obj_is_id (type)) {
+						dasprintf (str, "id");
+						if (type->t.fldptr.type->protos)
+							print_protocollist (str, type->t.fldptr.type->protos);
+						return;
+					}
+					if (type == &type_SEL) {
+						dasprintf (str, "SEL");
+						return;
+					}
+					dasprintf (str, "(*");
+					print_type_str (str, type->t.fldptr.type);
+					dasprintf (str, ")");
+					return;
+				case ev_void:
+				case ev_string:
+				case ev_float:
+				case ev_vector:
+				case ev_entity:
+				case ev_quat:
+				case ev_integer:
+				case ev_uinteger:
+				case ev_short:
+				case ev_double:
+					dasprintf (str, " %s", pr_type_name[type->type]);
+					return;
+				case ev_invalid:
+				case ev_type_count:
 					break;
 			}
 			break;
-		default:
-			dasprintf (str, " %s", pr_type_name[type->type]);
-			break;
 	}
+	internal_error (0, "bad type meta:type %d:%d", type->meta, type->type);
 }
 
 void
@@ -622,96 +633,103 @@ encode_type (dstring_t *encoding, const type_t *type)
 {
 	if (!type)
 		return;
-	switch (type->type) {
-		case ev_void:
-			dasprintf (encoding, "v");
-			break;
-		case ev_string:
-			dasprintf (encoding, "*");
-			break;
-		case ev_double:
-			dasprintf (encoding, "d");
-			break;
-		case ev_float:
-			dasprintf (encoding, "f");
-			break;
-		case ev_vector:
-			dasprintf (encoding, "V");
-			break;
-		case ev_entity:
-			dasprintf (encoding, "E");
-			break;
-		case ev_field:
-			dasprintf (encoding, "F");
-			encode_type (encoding, type->t.fldptr.type);
-			break;
-		case ev_func:
-			dasprintf (encoding, "(");
-			encode_type (encoding, type->t.func.type);
-			dasprintf (encoding, "%s)", encode_params (type));
-			break;
-		case ev_pointer:
-			if (type == &type_id) {
-				dasprintf (encoding, "@");
+	switch (type->meta) {
+		case ty_class:
+			encode_class (encoding, type);
+			return;
+		case ty_enum:
+			encode_enum (encoding, type);
+			return;
+		case ty_struct:
+		case ty_union:
+			encode_struct (encoding, type);
+			return;
+		case ty_array:
+			dasprintf (encoding, "[");
+			dasprintf (encoding, "%d", type->t.array.size);
+			if (type->t.array.base)
+				dasprintf (encoding, ":%d", type->t.array.base);
+			dasprintf (encoding, "=");
+			encode_type (encoding, type->t.array.type);
+			dasprintf (encoding, "]");
+			return;
+		case ty_alias:
+			encode_type (encoding, type->t.alias.type);
+			return;
+		case ty_none:
+			switch (type->type) {
+				case ev_void:
+					dasprintf (encoding, "v");
+					return;
+				case ev_string:
+					dasprintf (encoding, "*");
+					return;
+				case ev_double:
+					dasprintf (encoding, "d");
+					return;
+				case ev_float:
+					dasprintf (encoding, "f");
+					return;
+				case ev_vector:
+					dasprintf (encoding, "V");
+					return;
+				case ev_entity:
+					dasprintf (encoding, "E");
+					return;
+				case ev_field:
+					dasprintf (encoding, "F");
+					encode_type (encoding, type->t.fldptr.type);
+					return;
+				case ev_func:
+					dasprintf (encoding, "(");
+					encode_type (encoding, type->t.func.type);
+					dasprintf (encoding, "%s)", encode_params (type));
+					return;
+				case ev_pointer:
+					if (type == &type_id) {
+						dasprintf (encoding, "@");
+						return;
+					}
+					if (type == &type_SEL) {
+						dasprintf (encoding, ":");
+						return;
+					}
+					if (type == &type_Class) {
+						dasprintf (encoding, "#");
+						return;
+					}
+					type = type->t.fldptr.type;
+					dasprintf (encoding, "^");
+					encode_type (encoding, type);
+					return;
+				case ev_quat:
+					dasprintf (encoding, "Q");
+					return;
+				case ev_integer:
+					dasprintf (encoding, "i");
+					return;
+				case ev_uinteger:
+					dasprintf (encoding, "I");
+					return;
+				case ev_short:
+					dasprintf (encoding, "s");
+					return;
+				case ev_invalid:
+				case ev_type_count:
 				break;
 			}
-			if (type == &type_SEL) {
-				dasprintf (encoding, ":");
-				break;
-			}
-			if (type == &type_Class) {
-				dasprintf (encoding, "#");
-				break;
-			}
-			type = type->t.fldptr.type;
-			dasprintf (encoding, "^");
-			encode_type (encoding, type);
-			break;
-		case ev_quat:
-			dasprintf (encoding, "Q");
-			break;
-		case ev_integer:
-			dasprintf (encoding, "i");
-			break;
-		case ev_uinteger:
-			dasprintf (encoding, "I");
-			break;
-		case ev_short:
-			dasprintf (encoding, "s");
-			break;
-		case ev_invalid:
-			switch (type->meta) {
-				case ty_class:
-					encode_class (encoding, type);
-					break;
-				case ty_enum:
-					encode_enum (encoding, type);
-					break;
-				case ty_struct:
-				case ty_union:
-					encode_struct (encoding, type);
-					break;
-				case ty_array:
-					dasprintf (encoding, "[");
-					dasprintf (encoding, "%d", type->t.array.size);
-					if (type->t.array.base)
-						dasprintf (encoding, ":%d", type->t.array.base);
-					dasprintf (encoding, "=");
-					encode_type (encoding, type->t.array.type);
-					dasprintf (encoding, "]");
-					break;
-				case ty_alias:
-					encode_type (encoding, type->t.alias.type);
-					break;
-				case ty_none:
-					dasprintf (encoding, "?");
-					break;
-			}
-			break;
-		case ev_type_count:
-			dasprintf (encoding, "?");
 			break;
 	}
+	internal_error (0, "bad type meta:type %d:%d", type->meta, type->type);
+}
+
+const type_t *
+unalias_type (const type_t *type)
+{
+	while (type->meta == ty_alias) {
+		type = type->t.alias.type;
+	}
+	return type;
 }
 
 int
@@ -723,6 +741,7 @@ is_void (const type_t *type)
 int
 is_enum (const type_t *type)
 {
+	type = unalias_type (type);
 	if (type->type == ev_invalid && type->meta == ty_enum)
 		return 1;
 	return 0;
@@ -779,6 +798,7 @@ is_math (const type_t *type)
 int
 is_struct (const type_t *type)
 {
+	type = unalias_type (type);
 	if (type->type == ev_invalid
 		&& (type->meta == ty_struct || type->meta == ty_union))
 		return 1;
@@ -804,6 +824,7 @@ is_field (const type_t *type)
 int
 is_array (const type_t *type)
 {
+	type = unalias_type (type);
 	if (type->type == ev_invalid && type->meta == ty_array)
 		return 1;
 	return 0;
@@ -828,6 +849,8 @@ is_string (const type_t *type)
 int
 type_compatible (const type_t *dst, const type_t *src)
 {
+	dst = unalias_type (dst);
+	src = unalias_type (src);
 	// same type
 	if (dst == src) {
 		return 1;
@@ -847,6 +870,8 @@ type_compatible (const type_t *dst, const type_t *src)
 int
 type_assignable (const type_t *dst, const type_t *src)
 {
+	dst = unalias_type (dst);
+	src = unalias_type (src);
 	int         ret;
 
 	// same type

From 9610788deac044bae7d8dd68762ae390a368c7e7 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 19 Feb 2020 19:16:07 +0900
Subject: [PATCH 0443/1519] Fix some more type aliasing issues

Getting there... (I knew this would be a big job)
---
 tools/qfcc/source/expr.c     | 8 ++++----
 tools/qfcc/source/qc-parse.y | 2 ++
 tools/qfcc/source/type.c     | 7 +++++--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index 691a03162..da96bd5fc 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -1138,9 +1138,9 @@ append_expr (expr_t *block, expr_t *e)
 }
 
 static symbol_t *
-get_struct_field (type_t *t1, expr_t *e1, expr_t *e2)
+get_struct_field (const type_t *t1, expr_t *e1, expr_t *e2)
 {
-	symtab_t   *strct = t1->t.symtab;
+	symtab_t   *strct = unalias_type (t1)->t.symtab;
 	symbol_t   *sym = e2->e.symbol;//FIXME need to check
 	symbol_t   *field;
 
@@ -1159,12 +1159,12 @@ get_struct_field (type_t *t1, expr_t *e1, expr_t *e2)
 expr_t *
 field_expr (expr_t *e1, expr_t *e2)
 {
-	type_t     *t1, *t2;
+	const type_t *t1, *t2;
 	expr_t     *e;
 
 	if (e1->type == ex_error)
 		return e1;
-	t1 = get_type (e1);
+	t1 = unalias_type (get_type (e1));
 	if (t1->type == ev_entity) {
 		symbol_t   *field = 0;
 
diff --git a/tools/qfcc/source/qc-parse.y b/tools/qfcc/source/qc-parse.y
index 4773eb303..e64bb748e 100644
--- a/tools/qfcc/source/qc-parse.y
+++ b/tools/qfcc/source/qc-parse.y
@@ -422,6 +422,7 @@ external_decl
 			if (spec.is_typedef) {
 				error (0, "typedef %s is initialized", $1->name);
 				$1->sy_type = sy_type;
+				$1->type = alias_type ($1->type, $1->name);
 				symtab_addsymbol (current_symtab, $1);
 			} else {
 				initialize_def ($1, $2, current_symtab->space, spec.storage);
@@ -435,6 +436,7 @@ external_decl
 			$1->type = find_type (append_type ($1->type, spec.type));
 			if (spec.is_typedef) {
 				$1->sy_type = sy_type;
+				$1->type = alias_type ($1->type, $1->name);
 				symtab_addsymbol (current_symtab, $1);
 			} else {
 				$1 = function_symbol ($1, spec.is_overload, 1);
diff --git a/tools/qfcc/source/type.c b/tools/qfcc/source/type.c
index 2aff5c5d1..2c3064405 100644
--- a/tools/qfcc/source/type.c
+++ b/tools/qfcc/source/type.c
@@ -897,8 +897,11 @@ type_assignable (const type_t *dst, const type_t *src)
 	if (ret >= 0)
 		return ret;
 
-	dst = dst->t.fldptr.type;
-	src = src->t.fldptr.type;
+	dst = unalias_type (dst->t.fldptr.type);
+	src = unalias_type (src->t.fldptr.type);
+	if (dst == src) {
+		return 1;
+	}
 	if (is_void (dst))
 		return 1;
 	if (is_void (src))

From 6bcc2c49ab829fc370c7f783e79cedd72fdb7a20 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 19 Feb 2020 20:52:27 +0900
Subject: [PATCH 0444/1519] Use helper functions for type checks

They hide the evil details of aliased types. More to come :/
---
 tools/qfcc/source/def.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/tools/qfcc/source/def.c b/tools/qfcc/source/def.c
index 6e545ba40..7bef8790b 100644
--- a/tools/qfcc/source/def.c
+++ b/tools/qfcc/source/def.c
@@ -307,10 +307,9 @@ init_elements (struct def_s *def, expr_t *eles)
 			elements[i].offset = base_offset + i * type_size (array_type);
 		}
 		num_elements = i;
-	} else if (is_struct (def->type)
-			   || def->type == &type_vector
-			   || def->type == &type_quaternion) {
-		symtab_t   *symtab = def->type->t.symtab;
+	} else if (is_struct (def->type) || is_vector (def->type)
+			   || is_quaternion (def->type)) {
+		symtab_t   *symtab = unalias_type (def->type)->t.symtab;
 		symbol_t   *field;
 
 		for (i = 0, field = symtab->symbols; field; field = field->next) {

From 6bc803c72d31d37319c9be3adaae7ec4f8f7e662 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 19 Feb 2020 20:53:50 +0900
Subject: [PATCH 0445/1519] Use correct encoding for alias types

I got confused which field was which.
---
 tools/qfcc/source/dump_globals.c | 4 ++--
 tools/qfcc/source/obj_type.c     | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/tools/qfcc/source/dump_globals.c b/tools/qfcc/source/dump_globals.c
index 7f4adbbc9..7d7d29f9e 100644
--- a/tools/qfcc/source/dump_globals.c
+++ b/tools/qfcc/source/dump_globals.c
@@ -495,8 +495,8 @@ dump_qfo_types (qfo_t *qfo, int base_address)
 						type->t.array.base, type->t.array.size);
 				break;
 			case ty_alias:
-				printf (" %s %-5x\n", QFO_GETSTR (qfo, type->t.alias.name),
-						type->t.alias.type);
+				printf (" %s %d %-5x\n", QFO_GETSTR (qfo, type->t.alias.name),
+						type->t.alias.type, type->t.alias.aux_type);
 				break;
 			case ty_class:
 				printf (" %-5x\n", type->t.class);
diff --git a/tools/qfcc/source/obj_type.c b/tools/qfcc/source/obj_type.c
index e67f7a0b5..ff2409986 100644
--- a/tools/qfcc/source/obj_type.c
+++ b/tools/qfcc/source/obj_type.c
@@ -264,7 +264,8 @@ qfo_encode_alias (type_t *type)
 
 	def = qfo_new_encoding (type, sizeof (enc->t.alias));
 	enc = D_POINTER (qfot_type_t, def);
-	ENC_DEF (enc->t.alias.type, alias_type_def);
+	enc->t.alias.type = type->type;
+	ENC_DEF (enc->t.alias.aux_type, alias_type_def);
 	ENC_STR (enc->t.alias.name, type->name);
 	return def;
 }

From 6a70d2e362077a73ec6fad1ac250c39a8ce60c41 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 19 Feb 2020 20:56:01 +0900
Subject: [PATCH 0446/1519] Give alias types a unique encoding

The encoding is used as the def name and it needs to be different than
the alias target or the linker throws it away as an external def.
---
 tools/qfcc/source/type.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/qfcc/source/type.c b/tools/qfcc/source/type.c
index 2c3064405..4453e6284 100644
--- a/tools/qfcc/source/type.c
+++ b/tools/qfcc/source/type.c
@@ -654,7 +654,9 @@ encode_type (dstring_t *encoding, const type_t *type)
 			dasprintf (encoding, "]");
 			return;
 		case ty_alias:
+			dasprintf (encoding, "{%s>", type->name);
 			encode_type (encoding, type->t.alias.type);
+			dasprintf (encoding, "}");
 			return;
 		case ty_none:
 			switch (type->type) {

From a0914e1ec86612c8d0d493c406c3349342ef75a9 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 19 Feb 2020 20:58:02 +0900
Subject: [PATCH 0447/1519] Fix the typedef test case to actually work

---
 tools/qfcc/test/typedef.r | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/tools/qfcc/test/typedef.r b/tools/qfcc/test/typedef.r
index 48ea84478..ff5015c9e 100644
--- a/tools/qfcc/test/typedef.r
+++ b/tools/qfcc/test/typedef.r
@@ -21,36 +21,36 @@ next_type (qfot_type_t *type)
 	return (qfot_type_t *) ((int *) type + size);
 }
 
+int
+check_alias (qfot_type_t *alias)
+{
+	if (alias.meta != ty_none && alias.t.type != ev_pointer) {
+		printf ("%s is not a *int alias\n", alias.t.alias.name);
+		return 0;
+	}
+	return 1;
+}
+
 int
 main (void)
 {
+	baz = snafu;
+
 	int         found_foo = 0;
 	int         found_bar = 0;
 	qfot_type_t *type;
-	qfot_type_t *alias;
-
-	baz = snafu;	// must be able to assign without warnings (won't compile)
 
 	encodings = PR_FindGlobal (".type_encodings");
 
 	for (type = encodings.types;
 		 ((int *)type - (int *) encodings.types) < encodings.size;
 		type = next_type (type)) {
-		if (type.meta == ty_alias && type.t.alias.type == ev_integer) {
-			alias = type.t.alias.aux_type;
+		if (type.meta == ty_alias) {
 			if (type.t.alias.name == "foo") {
-				if (alias.meta == ty_none && alias.t.type == ev_integer) {
-					found_foo = 1;
-				} else {
-					printf ("foo type not aliased to int\n");
-				}
+				found_foo = check_alias (type.t.alias.aux_type);
 			}
 			if (type.t.alias.name == "bar") {
-				if (alias.meta == ty_none && alias.t.type == ev_integer) {
-					found_bar = 1;
-				} else {
-					printf ("bar type not aliased to int\n");
-				}
+				found_bar = check_alias (type.t.alias.aux_type);
 			}
 		}
 	}

From a6003ed08a8e82a5c4d4766c668f0132d099a4b3 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 19 Feb 2020 21:04:45 +0900
Subject: [PATCH 0448/1519] Walk qfo alias chain for type size and alignment

While the basic type is stored in the alias type record, it's no good
for size or alignment as it will give incorrect results for complex
types.
---
 tools/qfcc/source/obj_file.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/qfcc/source/obj_file.c b/tools/qfcc/source/obj_file.c
index e49d64c46..803f9995c 100644
--- a/tools/qfcc/source/obj_file.c
+++ b/tools/qfcc/source/obj_file.c
@@ -677,10 +677,10 @@ get_type_size (qfo_t *qfo, pointer_t type)
 	type_def = QFO_POINTER (qfo, qfo_type_space, qfot_type_t, type);
 	switch ((ty_meta_e)type_def->meta) {
 		case ty_alias:
+			return get_type_size (qfo, type_def->t.alias.aux_type);
 		case ty_none:
 			// field, pointer and function types store their basic type in
 			// the same location.
-			// alias types store the basic type at the end of the alias chain
 			return pr_type_size[type_def->t.type];
 		case ty_struct:
 			for (i = size = 0; i < type_def->t.strct.num_fields; i++)
@@ -726,11 +726,11 @@ get_type_alignment_log (qfo_t *qfo, pointer_t type)
 		return 0;
 	type_def = QFO_POINTER (qfo, qfo_type_space, qfot_type_t, type);
 	switch ((ty_meta_e)type_def->meta) {
-		case ty_none:
 		case ty_alias:
+			return get_type_alignment_log (qfo, type_def->t.alias.aux_type);
+		case ty_none:
 			// field, pointer and function types store their basic type in
 			// the same location.
-			// alias types store the basic type at the end of the alias chain
 			return qfo_log2 (ev_types[type_def->t.type]->alignment);
 		case ty_struct:
 		case ty_union:

From fd2b7ee6f9caedc870ef0ea2a1d2d18540a317d6 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 19 Feb 2020 21:13:36 +0900
Subject: [PATCH 0449/1519] Use more type checking helper functions

---
 tools/qfcc/include/type.h |  3 +++
 tools/qfcc/source/expr.c  |  6 +++---
 tools/qfcc/source/type.c  | 32 ++++++++++++++++++++++++++++++--
 3 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/tools/qfcc/include/type.h b/tools/qfcc/include/type.h
index 098df5e00..17f21665d 100644
--- a/tools/qfcc/include/type.h
+++ b/tools/qfcc/include/type.h
@@ -163,6 +163,9 @@ const char *type_get_encoding (const type_t *type);
 const type_t *unalias_type (const type_t *type) __attribute__((pure));
 int is_void (const type_t *type) __attribute__((pure));
 int is_enum (const type_t *type) __attribute__((pure));
+int is_integer (const type_t *type) __attribute__((pure));
+int is_uinteger (const type_t *type) __attribute__((pure));
+int is_short (const type_t *type) __attribute__((pure));
 int is_integral (const type_t *type) __attribute__((pure));
 int is_double (const type_t *type) __attribute__((pure));
 int is_float (const type_t *type) __attribute__((pure));
diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index da96bd5fc..44032eb5d 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -1459,15 +1459,15 @@ convert_from_bool (expr_t *e, type_t *type)
 	expr_t     *one;
 	expr_t     *cond;
 
-	if (type == &type_float) {
+	if (is_float (type)) {
 		one = new_float_expr (1);
 		zero = new_float_expr (0);
-	} else if (type == &type_integer) {
+	} else if (is_integer (type)) {
 		one = new_integer_expr (1);
 		zero = new_integer_expr (0);
 	} else if (is_enum (type) && enum_as_bool (type, &zero, &one)) {
 		// don't need to do anything
-	} else if (type == &type_uinteger) {
+	} else if (is_uinteger (type)) {
 		one = new_uinteger_expr (1);
 		zero = new_uinteger_expr (0);
 	} else {
diff --git a/tools/qfcc/source/type.c b/tools/qfcc/source/type.c
index 4453e6284..0622d392e 100644
--- a/tools/qfcc/source/type.c
+++ b/tools/qfcc/source/type.c
@@ -750,11 +750,39 @@ is_enum (const type_t *type)
 }
 
 int
-is_integral (const type_t *type)
+is_integer (const type_t *type)
 {
 	etype_t     t = type->type;
 
-	if (t == ev_integer || t == ev_uinteger || t == ev_short)
+	if (t == ev_integer)
+		return 1;
+	return is_enum (type);
+}
+
+int
+is_uinteger (const type_t *type)
+{
+	etype_t     t = type->type;
+
+	if (t == ev_uinteger)
+		return 1;
+	return is_enum (type);
+}
+
+int
+is_short (const type_t *type)
+{
+	etype_t     t = type->type;
+
+	if (t == ev_short)
+		return 1;
+	return is_enum (type);
+}
+
+int
+is_integral (const type_t *type)
+{
+	if (is_integer (type) || is_uinteger (type) || is_short (type))
 		return 1;
 	return is_enum (type);
 }

From 1b43046c8a1e06d96ff78641b12ed386450070dd Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 19 Feb 2020 21:28:32 +0900
Subject: [PATCH 0450/1519] Handle aliased types when building function calls

---
 tools/qfcc/include/expr.h | 2 +-
 tools/qfcc/source/expr.c  | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/tools/qfcc/include/expr.h b/tools/qfcc/include/expr.h
index 90e4f6313..36d785be0 100644
--- a/tools/qfcc/include/expr.h
+++ b/tools/qfcc/include/expr.h
@@ -623,7 +623,7 @@ expr_t *binary_expr (int op, expr_t *e1, expr_t *e2);
 expr_t *field_expr (expr_t *e1, expr_t *e2);
 expr_t *asx_expr (int op, expr_t *e1, expr_t *e2);
 expr_t *unary_expr (int op, expr_t *e);
-expr_t *build_function_call (expr_t *fexpr, struct type_s *ftype,
+expr_t *build_function_call (expr_t *fexpr, const struct type_s *ftype,
 							 expr_t *params);
 expr_t *function_expr (expr_t *e1, expr_t *e2);
 struct function_s;
diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index 44032eb5d..efddb5427 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -1843,7 +1843,7 @@ bitnot_expr:
 }
 
 expr_t *
-build_function_call (expr_t *fexpr, type_t *ftype, expr_t *params)
+build_function_call (expr_t *fexpr, const type_t *ftype, expr_t *params)
 {
 	expr_t     *e;
 	int         arg_count = 0, parm_count = 0;
@@ -1855,6 +1855,8 @@ build_function_call (expr_t *fexpr, type_t *ftype, expr_t *params)
 	expr_t     *call;
 	expr_t     *err = 0;
 
+	ftype = unalias_type (ftype);
+
 	for (e = params; e; e = e->next) {
 		if (e->type == ex_error)
 			return e;

From caf78b5422ac3883a13dd80b6997aed9ee2a2a6e Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 21 Feb 2020 17:47:16 +0900
Subject: [PATCH 0451/1519] Rename ty_none to ty_basic

This far better reflects the actual meaning. It is very likely that
ty_none is a holdover from long before there was full type encoding and
it meant that the union in qfcc's type_t had no data. This is still
true for basic types, but only if not a function, field or pointer type.
If the type was function, field or pointer, it was not true, so it was
misnamed pretty much from the start.
---
 include/QF/pr_type.h             |  6 +++---
 ruamoko/include/types.h          |  2 +-
 tools/qfcc/include/type.h        |  3 ++-
 tools/qfcc/source/class.c        | 17 +++++++++--------
 tools/qfcc/source/dump_globals.c |  4 ++--
 tools/qfcc/source/linker.c       |  2 +-
 tools/qfcc/source/obj_file.c     |  8 ++++----
 tools/qfcc/source/type.c         | 24 +++++++++++++-----------
 8 files changed, 35 insertions(+), 31 deletions(-)

diff --git a/include/QF/pr_type.h b/include/QF/pr_type.h
index 0e33b0fd6..80f90b309 100644
--- a/include/QF/pr_type.h
+++ b/include/QF/pr_type.h
@@ -94,9 +94,9 @@ typedef struct qfot_type_s {
 	pr_int_t    size;				///< total word size of this encoding
 	string_t    encoding;			///< Objective-QC encoding
 	union {
-		pr_int_t    type;			///< basic type: etype_t
-		qfot_fldptr_t fldptr;		///< ty_none, ev_pointer/ev_field
-		qfot_func_t func;			///< ty_none, ev_func
+		pr_int_t    type;			///< ty_basic: etype_t
+		qfot_fldptr_t fldptr;		///< ty_basic, ev_pointer/ev_field
+		qfot_func_t func;			///< ty_basic, ev_func
 		qfot_struct_t strct;		///< ty_struct/ty_union/ty_enum
 		qfot_array_t array;			///< ty_array
 		pointer_t   class;			///< ty_class
diff --git a/ruamoko/include/types.h b/ruamoko/include/types.h
index deb480ebf..b435a6bab 100644
--- a/ruamoko/include/types.h
+++ b/ruamoko/include/types.h
@@ -21,7 +21,7 @@ typedef enum {
 } etype_t;
 
 typedef enum {
-    ty_none,				///< func/field/pointer or not used
+	ty_basic,				///< VM type (float, int, pointer, field, etc)
 	ty_struct,
 	ty_union,
 	ty_enum,
diff --git a/tools/qfcc/include/type.h b/tools/qfcc/include/type.h
index 17f21665d..34afd4449 100644
--- a/tools/qfcc/include/type.h
+++ b/tools/qfcc/include/type.h
@@ -56,7 +56,7 @@ typedef struct ty_alias_s {
 } ty_alias_t;
 
 typedef enum {
-	ty_none,				///< func/field/pointer or not used
+	ty_basic,				///< VM type (float, int, pointer, field, etc)
 	ty_struct,
 	ty_union,
 	ty_enum,
@@ -72,6 +72,7 @@ typedef struct type_s {
 	/// function/pointer/array/struct types are more complex
 	ty_meta_e   meta;
 	union {
+		// no data for ty_basic when not a func, field or pointer
 		ty_func_t   func;
 		ty_fldptr_t fldptr;
 		ty_array_t  array;
diff --git a/tools/qfcc/source/class.c b/tools/qfcc/source/class.c
index b249069c2..caa1967cd 100644
--- a/tools/qfcc/source/class.c
+++ b/tools/qfcc/source/class.c
@@ -69,30 +69,31 @@ static hashtab_t *protocol_hash;
 
 // these will be built up further
 type_t      type_obj_selector = { ev_invalid, 0, 0, ty_struct};
-type_t      type_SEL = { ev_pointer, "SEL", 1, ty_none, {{&type_obj_selector}}};
+type_t      type_SEL = { ev_pointer, "SEL", 1, ty_basic,
+						{{&type_obj_selector}}};
 type_t     *IMP_params[] = {&type_id, &type_SEL};
-type_t      type_IMP = { ev_func, "IMP", 1, ty_none,
+type_t      type_IMP = { ev_func, "IMP", 1, ty_basic,
 						 {{&type_id, -3, IMP_params}}};
 type_t      type_obj_super = { ev_invalid, 0, 0 };
-type_t      type_SuperPtr = { ev_pointer, 0, 1, ty_none, {{&type_obj_super}}};
+type_t      type_SuperPtr = { ev_pointer, 0, 1, ty_basic, {{&type_obj_super}}};
 type_t     *supermsg_params[] = {&type_SuperPtr, &type_SEL};
-type_t      type_supermsg = { ev_func, ".supermsg", 1, ty_none,
+type_t      type_supermsg = { ev_func, ".supermsg", 1, ty_basic,
 							  {{&type_id, -3, supermsg_params}}};
 type_t      type_obj_method = { ev_invalid, 0, 0, ty_struct };
 type_t      type_obj_method_description = { ev_invalid, 0, 0, ty_struct };
 type_t      type_obj_category = { ev_invalid, 0, 0, ty_struct};
 type_t      type_obj_ivar = { ev_invalid, 0, 0, ty_struct};
 type_t      type_obj_module = { ev_invalid, 0, 0, ty_struct};
-type_t      type_moduleptr = { ev_pointer, 0, 1, ty_none,
+type_t      type_moduleptr = { ev_pointer, 0, 1, ty_basic,
 									{{&type_obj_module}}};
 type_t     *obj_exec_class_params[] = { &type_moduleptr };
-type_t      type_obj_exec_class = { ev_func, 0, 1, ty_none,
+type_t      type_obj_exec_class = { ev_func, 0, 1, ty_basic,
 									{{&type_void, 1, obj_exec_class_params}}};
 
 type_t      type_obj_object = {ev_invalid, 0, 0, ty_struct};
-type_t      type_id = { ev_pointer, "id", 1, ty_none, {{&type_obj_object}}};
+type_t      type_id = { ev_pointer, "id", 1, ty_basic, {{&type_obj_object}}};
 type_t      type_obj_class = { ev_invalid, 0, 0, ty_struct};
-type_t      type_Class = { ev_pointer, 0, 1, ty_none, {{&type_obj_class}}};
+type_t      type_Class = { ev_pointer, 0, 1, ty_basic, {{&type_obj_class}}};
 type_t      type_obj_protocol = { ev_invalid, 0, 0, ty_struct};
 
 int         obj_initialized = 0;
diff --git a/tools/qfcc/source/dump_globals.c b/tools/qfcc/source/dump_globals.c
index 7d7d29f9e..89dbb50fa 100644
--- a/tools/qfcc/source/dump_globals.c
+++ b/tools/qfcc/source/dump_globals.c
@@ -417,7 +417,7 @@ qfo_functions (qfo_t *qfo)
 }
 
 static const char *ty_meta_names[] = {
-	"ty_none",
+	"ty_basic",
 	"ty_struct",
 	"ty_union",
 	"ty_enum",
@@ -461,7 +461,7 @@ dump_qfo_types (qfo_t *qfo, int base_address)
 			break;
 		}
 		switch ((ty_meta_e) type->meta) {
-			case ty_none:
+			case ty_basic:
 				printf (" %-10s", (type->t.type < 0
 								   || type->t.type >= ev_type_count)
 								  ? "invalid type"
diff --git a/tools/qfcc/source/linker.c b/tools/qfcc/source/linker.c
index 3f07ba7b0..3ce5ca3fd 100644
--- a/tools/qfcc/source/linker.c
+++ b/tools/qfcc/source/linker.c
@@ -1164,7 +1164,7 @@ check_defs (void)
 			defref_t   *_d = Hash_Find (defined_data_defs, "self");
 			if (_d) {
 				qfo_def_t  *d = REF (_d);
-				if (QFO_TYPEMETA (work, d->type) == ty_none
+				if (QFO_TYPEMETA (work, d->type) == ty_basic
 					&& QFO_TYPETYPE (work, d->type) == ev_entity)
 					def_warning (d, "@self and self used together");
 			}
diff --git a/tools/qfcc/source/obj_file.c b/tools/qfcc/source/obj_file.c
index 803f9995c..d4db18377 100644
--- a/tools/qfcc/source/obj_file.c
+++ b/tools/qfcc/source/obj_file.c
@@ -647,7 +647,7 @@ get_def_type (qfo_t *qfo, pointer_t type)
 		return ev_void;
 	type_def = QFO_POINTER (qfo, qfo_type_space, qfot_type_t, type);
 	switch ((ty_meta_e)type_def->meta) {
-		case ty_none:
+		case ty_basic:
 		case ty_alias:
 			// field, pointer and function types store their basic type in
 			// the same location.
@@ -678,7 +678,7 @@ get_type_size (qfo_t *qfo, pointer_t type)
 	switch ((ty_meta_e)type_def->meta) {
 		case ty_alias:
 			return get_type_size (qfo, type_def->t.alias.aux_type);
-		case ty_none:
+		case ty_basic:
 			// field, pointer and function types store their basic type in
 			// the same location.
 			return pr_type_size[type_def->t.type];
@@ -728,7 +728,7 @@ get_type_alignment_log (qfo_t *qfo, pointer_t type)
 	switch ((ty_meta_e)type_def->meta) {
 		case ty_alias:
 			return get_type_alignment_log (qfo, type_def->t.alias.aux_type);
-		case ty_none:
+		case ty_basic:
 			// field, pointer and function types store their basic type in
 			// the same location.
 			return qfo_log2 (ev_types[type_def->t.type]->alignment);
@@ -773,7 +773,7 @@ function_params (qfo_t *qfo, qfo_func_t *func, dfunction_t *df)
 	if (func->type >= qfo->spaces[qfo_type_space].data_size)
 		return;
 	type = QFO_POINTER (qfo, qfo_type_space, qfot_type_t, func->type);
-	if (type->meta != ty_none && type->t.type != ev_func)
+	if (type->meta != ty_basic && type->t.type != ev_func)
 		return;
 	df->numparms = num_params = type->t.func.num_params;
 	if (num_params < 0)
diff --git a/tools/qfcc/source/type.c b/tools/qfcc/source/type.c
index 0622d392e..e33f0ec34 100644
--- a/tools/qfcc/source/type.c
+++ b/tools/qfcc/source/type.c
@@ -67,11 +67,13 @@ type_t      type_string = { ev_string, "string", 1 };
 type_t      type_float = { ev_float, "float", 1 };
 type_t      type_vector = { ev_vector, "vector", 1 };
 type_t      type_entity = { ev_entity, "entity", 1 };
-type_t      type_field = {ev_field, "field", 1, ty_none, {{&type_void}} };
+type_t      type_field = {ev_field, "field", 1, ty_basic, {{&type_void}} };
 
 // type_function is a void() function used for state defs
-type_t      type_function = { ev_func, "function", 1, ty_none, {{&type_void}} };
-type_t      type_pointer = { ev_pointer, "pointer", 1, ty_none, {{&type_void}} };
+type_t      type_function = { ev_func, "function", 1, ty_basic,
+								{{&type_void}} };
+type_t      type_pointer = { ev_pointer, "pointer", 1, ty_basic,
+								{{&type_void}} };
 type_t      type_quaternion = { ev_quat, "quaternion", 1 };
 type_t      type_integer = { ev_integer, "int", 1 };
 type_t      type_uinteger = { ev_uinteger, "uint", 1 };
@@ -88,7 +90,7 @@ type_t      type_zero = { ev_invalid, 0, 0, ty_struct };
 type_t      type_type_encodings = { ev_invalid, "@type_encodings", 0,
 									ty_struct };
 
-type_t      type_floatfield = { ev_field, ".float", 1, ty_none,
+type_t      type_floatfield = { ev_field, ".float", 1, ty_basic,
 								{{&type_float}} };
 
 type_t     *ev_types[ev_type_count] = {
@@ -252,7 +254,7 @@ types_same (type_t *a, type_t *b)
 	if (a->type != b->type || a->meta != b->meta)
 		return 0;
 	switch (a->meta) {
-		case ty_none:
+		case ty_basic:
 			switch (a->type) {
 				case ev_field:
 				case ev_pointer:
@@ -315,7 +317,7 @@ find_type (type_t *type)
 
 	if (type->freeable) {
 		switch (type->meta) {
-			case ty_none:
+			case ty_basic:
 				switch (type->type) {
 					case ev_field:
 					case ev_pointer:
@@ -500,7 +502,7 @@ print_type_str (dstring_t *str, const type_t *type)
 			print_type_str (str, type->t.alias.type);
 			dstring_appendstr (str, "})");
 			return;
-		case ty_none:
+		case ty_basic:
 			switch (type->type) {
 				case ev_field:
 					dasprintf (str, ".(");
@@ -658,7 +660,7 @@ encode_type (dstring_t *encoding, const type_t *type)
 			encode_type (encoding, type->t.alias.type);
 			dasprintf (encoding, "}");
 			return;
-		case ty_none:
+		case ty_basic:
 			switch (type->type) {
 				case ev_void:
 					dasprintf (encoding, "v");
@@ -984,7 +986,7 @@ type_size (const type_t *type)
 					return type->t.array.size * type_size (type->t.array.type);
 				case ty_alias:
 					return type_size (type->t.alias.type);
-				case ty_none:
+				case ty_basic:
 					return 0;
 			}
 			break;
@@ -1060,7 +1062,7 @@ init_types (void)
 	make_structure ("@param", 'u', param_struct, &type_param);
 	make_structure ("@vector", 's', vector_struct, &type_vector);
 	type_vector.type = ev_vector;
-	type_vector.meta = ty_none;
+	type_vector.meta = ty_basic;
 
 	make_structure ("@type_encodings", 's', type_encoding_struct,
 					&type_type_encodings);
@@ -1070,7 +1072,7 @@ init_types (void)
 
 	make_structure ("@quaternion", 's', quaternion_struct, &type_quaternion);
 	type_quaternion.type = ev_quat;
-	type_quaternion.meta = ty_none;
+	type_quaternion.meta = ty_basic;
 	{
 		symbol_t   *sym;
 		sym = new_symbol_type ("x", &type_float);

From 8b225dbfc10962c113e2cb32cc1594c3e7bcd301 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 21 Feb 2020 17:53:27 +0900
Subject: [PATCH 0452/1519] Ensure .ctor functions do not reset tracing

---
 tools/qfcc/test/test-harness.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/qfcc/test/test-harness.c b/tools/qfcc/test/test-harness.c
index a8f829cd9..ed8a5c929 100644
--- a/tools/qfcc/test/test-harness.c
+++ b/tools/qfcc/test/test-harness.c
@@ -149,6 +149,7 @@ init_qf (void)
 	pr.allocate_progs_mem = allocate_progs_mem;
 	pr.free_progs_mem = free_progs_mem;
 	pr.no_exec_limit = 0;	// absolutely want a limit!
+	pr.pr_trace_depth = -1;
 	pr.pr_trace = options.trace;
 
 	PR_Init_Cvars ();

From 3c9e2a6451f331be6c9fc3f01f846475e1c7a8fd Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 21 Feb 2020 17:54:42 +0900
Subject: [PATCH 0453/1519] Rename the sys documentation group

---
 include/QF/sys.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/QF/sys.h b/include/QF/sys.h
index 85785ed6e..10ef6999f 100644
--- a/include/QF/sys.h
+++ b/include/QF/sys.h
@@ -28,7 +28,7 @@
 #ifndef __sys_h
 #define __sys_h
 
-/** \defgroup sys Portability
+/** \defgroup sys System Portability
 	\ingroup utils
 	Non-portable functions
 */

From fe796eee68906a8f31f0f743708af226a486e84f Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 21 Feb 2020 17:58:19 +0900
Subject: [PATCH 0454/1519] Move the meta type enum ino pr_type.h

---
 include/QF/pr_type.h      | 10 ++++++++++
 tools/qfcc/include/type.h | 12 +-----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/include/QF/pr_type.h b/include/QF/pr_type.h
index 80f90b309..b2ea05060 100644
--- a/include/QF/pr_type.h
+++ b/include/QF/pr_type.h
@@ -40,6 +40,16 @@
 
 #include "QF/pr_comp.h"
 
+typedef enum {
+	ty_basic,				///< VM type (float, int, pointer, field, etc)
+	ty_struct,
+	ty_union,
+	ty_enum,
+	ty_array,
+	ty_class,
+	ty_alias,
+} ty_meta_e;
+
 typedef struct qfot_alias_s {
 	pr_int_t    type;				///< type at end of alias chain
 	pointer_t   aux_type;			///< referenced type
diff --git a/tools/qfcc/include/type.h b/tools/qfcc/include/type.h
index 34afd4449..784ed6f9a 100644
--- a/tools/qfcc/include/type.h
+++ b/tools/qfcc/include/type.h
@@ -31,7 +31,7 @@
 #ifndef __type_h
 #define __type_h
 
-#include "QF/pr_comp.h"
+#include "QF/pr_type.h"
 
 #include "def.h"
 
@@ -55,16 +55,6 @@ typedef struct ty_alias_s {
 	struct type_s *type;
 } ty_alias_t;
 
-typedef enum {
-	ty_basic,				///< VM type (float, int, pointer, field, etc)
-	ty_struct,
-	ty_union,
-	ty_enum,
-	ty_array,
-	ty_class,
-	ty_alias,
-} ty_meta_e;
-
 typedef struct type_s {
 	etype_t     type;		///< ev_invalid means structure/array etc
 	const char *name;

From 7e76a96f7d0c963ca98899e6196c98b87f8d6a71 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 21 Feb 2020 21:13:18 +0900
Subject: [PATCH 0455/1519] Fix a missed ty_none

---
 tools/qfcc/test/typedef.r | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/qfcc/test/typedef.r b/tools/qfcc/test/typedef.r
index ff5015c9e..bb5d52e4a 100644
--- a/tools/qfcc/test/typedef.r
+++ b/tools/qfcc/test/typedef.r
@@ -24,7 +24,7 @@ next_type (qfot_type_t *type)
 int
 check_alias (qfot_type_t *alias)
 {
-	if (alias.meta != ty_none && alias.t.type != ev_pointer) {
+	if (alias.meta != ty_basic && alias.t.type != ev_pointer) {
 		printf ("%s is not a *int alias\n", alias.t.alias.name);
 		return 0;
 	}

From c296514b950ad2956e2da00d85dadf27406ee40a Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 21 Feb 2020 21:17:28 +0900
Subject: [PATCH 0456/1519] Make pr.load_file 'return' the file size

---
 include/QF/progs.h             | 2 +-
 libs/console/menu.c            | 6 ++++--
 libs/gamecode/pr_debug.c       | 7 +++++--
 libs/gamecode/pr_load.c        | 6 ++++--
 tools/qfcc/source/qfprogs.c    | 3 ++-
 tools/qfcc/test/test-harness.c | 3 ++-
 tools/qwaq/main.c              | 3 ++-
 tools/qwaq/qwaq.c              | 3 ++-
 8 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/include/QF/progs.h b/include/QF/progs.h
index e7953883e..87fd87c89 100644
--- a/include/QF/progs.h
+++ b/include/QF/progs.h
@@ -1550,7 +1550,7 @@ struct progs_s {
 	int         no_exec_limit;
 
 	void      (*file_error) (progs_t *pr, const char *path);
-	void     *(*load_file) (progs_t *pr, const char *path);
+	void     *(*load_file) (progs_t *pr, const char *path, off_t *size);
 	void     *(*allocate_progs_mem) (progs_t *pr, int size);
 	void      (*free_progs_mem) (progs_t *pr, void *mem);
 
diff --git a/libs/console/menu.c b/libs/console/menu.c
index e65fff1cb..043532023 100644
--- a/libs/console/menu.c
+++ b/libs/console/menu.c
@@ -510,9 +510,11 @@ menu_free_progs_mem (progs_t *pr, void *mem)
 }
 
 static void *
-menu_load_file (progs_t *pr, const char *path)
+menu_load_file (progs_t *pr, const char *path, off_t *size)
 {
-	return QFS_LoadFile (QFS_FOpenFile (path), 0);
+	void *data = QFS_LoadFile (QFS_FOpenFile (path), 0);
+	*size = qfs_filesize;
+	return data;
 }
 
 static builtin_t builtins[] = {
diff --git a/libs/gamecode/pr_debug.c b/libs/gamecode/pr_debug.c
index 174987135..7f86c2c8f 100644
--- a/libs/gamecode/pr_debug.c
+++ b/libs/gamecode/pr_debug.c
@@ -65,6 +65,7 @@ typedef struct {
 typedef struct {
 	char *name;
 	char *text;
+	off_t size;
 	line_t *lines;
 	pr_uint_t   num_lines;
 	progs_t *pr;
@@ -227,7 +228,8 @@ PR_Load_Source_File (progs_t *pr, const char *fname)
 		return 0;
 	for (dir = source_paths; *dir && !f->text; dir++) {
 		f->text = pr->load_file (pr, va ("%s%s%s", *dir, **dir ? "/" : "",
-										 fname));
+										 fname),
+								 &f->size);
 	}
 	if (!f->text) {
 		pr->file_error (pr, fname);
@@ -273,6 +275,7 @@ PR_LoadDebug (progs_t *pr)
 {
 	char       *sym_path;
 	const char *path_end, *sym_file;
+	off_t       debug_size;
 	pr_uint_t   i;
 	ddef_t	   *def;
 	pr_type_t  *str = 0;
@@ -303,7 +306,7 @@ PR_LoadDebug (progs_t *pr)
 	sym_path = malloc (strlen (sym_file) + (path_end - pr->progs_name) + 1);
 	strncpy (sym_path, pr->progs_name, path_end - pr->progs_name);
 	strcpy (sym_path + (path_end - pr->progs_name), sym_file);
-	pr->debug = pr->load_file (pr, sym_path);
+	pr->debug = pr->load_file (pr, sym_path, &debug_size);
 	if (!pr->debug) {
 		Sys_Printf ("can't load %s for debug info\n", sym_path);
 		free (sym_path);
diff --git a/libs/gamecode/pr_load.c b/libs/gamecode/pr_load.c
index 8bc554296..cadfebca3 100644
--- a/libs/gamecode/pr_load.c
+++ b/libs/gamecode/pr_load.c
@@ -81,9 +81,11 @@ file_error (progs_t *pr, const char *path)
 }
 
 static void *
-load_file (progs_t *pr, const char *path)
+load_file (progs_t *pr, const char *path, off_t *size)
 {
-	return QFS_LoadHunkFile (QFS_FOpenFile (path));
+	void *data = QFS_LoadHunkFile (QFS_FOpenFile (path));
+	*size = qfs_filesize;
+	return data;
 }
 
 static void *
diff --git a/tools/qfcc/source/qfprogs.c b/tools/qfcc/source/qfprogs.c
index 10ddf8abd..be14d144f 100644
--- a/tools/qfcc/source/qfprogs.c
+++ b/tools/qfcc/source/qfprogs.c
@@ -176,7 +176,7 @@ file_error (progs_t *pr, const char *name)
 }
 
 static void *
-load_file (progs_t *pr, const char *name)
+load_file (progs_t *pr, const char *name, off_t *_size)
 {
 	QFile      *file;
 	int         size;
@@ -191,6 +191,7 @@ load_file (progs_t *pr, const char *name)
 	sym = malloc (size + 1);
 	sym[size] = 0;
 	Qread (file, sym, size);
+	*_size = size;
 	return sym;
 }
 
diff --git a/tools/qfcc/test/test-harness.c b/tools/qfcc/test/test-harness.c
index ed8a5c929..78c657d05 100644
--- a/tools/qfcc/test/test-harness.c
+++ b/tools/qfcc/test/test-harness.c
@@ -96,7 +96,7 @@ open_file (const char *path, int *len)
 }
 
 static void *
-load_file (progs_t *pr, const char *name)
+load_file (progs_t *pr, const char *name, off_t *_size)
 {
 	QFile      *file;
 	int         size;
@@ -112,6 +112,7 @@ load_file (progs_t *pr, const char *name)
 	sym = malloc (size + 1);
 	sym[size] = 0;
 	Qread (file, sym, size);
+	*_size = size;
 	return sym;
 }
 
diff --git a/tools/qwaq/main.c b/tools/qwaq/main.c
index 15270d5e4..035e4f73b 100644
--- a/tools/qwaq/main.c
+++ b/tools/qwaq/main.c
@@ -65,7 +65,7 @@ open_file (const char *path, int *len)
 }
 
 static void *
-load_file (progs_t *pr, const char *name)
+load_file (progs_t *pr, const char *name, off_t *_size)
 {
 	QFile      *file;
 	int         size;
@@ -81,6 +81,7 @@ load_file (progs_t *pr, const char *name)
 	sym = malloc (size + 1);
 	sym[size] = 0;
 	Qread (file, sym, size);
+	*_size = size;
 	return sym;
 }
 
diff --git a/tools/qwaq/qwaq.c b/tools/qwaq/qwaq.c
index 40576e868..24a14d217 100644
--- a/tools/qwaq/qwaq.c
+++ b/tools/qwaq/qwaq.c
@@ -71,7 +71,7 @@ open_file (const char *path, int *len)
 }
 
 static void *
-load_file (progs_t *pr, const char *name)
+load_file (progs_t *pr, const char *name, off_t *_size)
 {
 	QFile      *file;
 	int         size;
@@ -87,6 +87,7 @@ load_file (progs_t *pr, const char *name)
 	sym = malloc (size + 1);
 	sym[size] = 0;
 	Qread (file, sym, size);
+	*_size = size;
 	return sym;
 }
 

From e7b4eedc07526d925f3538e00ed905dbddd2fb54 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 22 Feb 2020 14:04:10 +0900
Subject: [PATCH 0457/1519] Fix segfault in dereferencing undefined field
 containers

---
 tools/qfcc/source/expr.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index efddb5427..ab9672813 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -1162,9 +1162,10 @@ field_expr (expr_t *e1, expr_t *e2)
 	const type_t *t1, *t2;
 	expr_t     *e;
 
+	t1 = get_type (e1);
 	if (e1->type == ex_error)
 		return e1;
-	t1 = unalias_type (get_type (e1));
+	t1 = unalias_type (t1);
 	if (t1->type == ev_entity) {
 		symbol_t   *field = 0;
 

From 4df926e531fe203e293e9e7c3d0ec326bc05fe61 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 22 Feb 2020 14:11:15 +0900
Subject: [PATCH 0458/1519] Write extended ddef information to progs far data

I was originally going to put it in the debug syms file, but I realized
that the data persistence code would need access to both def type and
certainly correct def offsets for defs in far data.
---
 include/QF/pr_comp.h         | 10 +++++++++
 tools/qfcc/include/type.h    |  3 +++
 tools/qfcc/source/obj_file.c | 43 +++++++++++++++++++++++++++++++-----
 tools/qfcc/source/qfcc.c     |  1 +
 tools/qfcc/source/type.c     | 18 +++++++++++++++
 tools/qwaq/main.qc           |  1 +
 tools/qwaq/types.r           | 27 ++++++++++++++++++++++
 7 files changed, 98 insertions(+), 5 deletions(-)

diff --git a/include/QF/pr_comp.h b/include/QF/pr_comp.h
index 185a802ad..6b39ff1bc 100644
--- a/include/QF/pr_comp.h
+++ b/include/QF/pr_comp.h
@@ -423,6 +423,16 @@ typedef struct ddef_s {
 	pr_int_t    s_name;
 } ddef_t;
 
+typedef struct xdef_s {
+	pointer_t   type;			///< pointer to type definition
+	pointer_t   ofs;			///< 32-bit version of ddef_t.ofs
+} xdef_t;
+
+typedef struct pr_xdefs_s {
+	pointer_t   xdefs;
+	pr_int_t    num_xdefs;
+} pr_xdefs_t;
+
 typedef struct dparmsize_s {
 	uint8_t     size:5;
 	uint8_t     alignment:3;
diff --git a/tools/qfcc/include/type.h b/tools/qfcc/include/type.h
index 784ed6f9a..c8913933e 100644
--- a/tools/qfcc/include/type.h
+++ b/tools/qfcc/include/type.h
@@ -116,6 +116,9 @@ extern	type_t	type_va_list;
 extern	type_t	type_param;
 extern	type_t	type_zero;
 extern	type_t	type_type_encodings;
+extern	type_t	type_xdef;
+extern	type_t	type_xdef_pointer;
+extern	type_t	type_xdefs;
 
 extern struct symtab_s *vector_struct;
 extern struct symtab_s *quaternion_struct;
diff --git a/tools/qfcc/source/obj_file.c b/tools/qfcc/source/obj_file.c
index d4db18377..79c4effeb 100644
--- a/tools/qfcc/source/obj_file.c
+++ b/tools/qfcc/source/obj_file.c
@@ -879,12 +879,16 @@ qfo_to_progs (qfo_t *qfo, int *size)
 	pr_type_t  *locals;
 	pr_type_t  *far_data;
 	pr_type_t  *type_data;
+	pr_type_t  *xdef_data;
 	dprograms_t *progs;
 	qfo_def_t  *types_def = 0;
+	qfo_def_t  *xdefs_def = 0;
 	unsigned    i, j;
 	unsigned    near_data_size = 0;
 	unsigned    locals_size = 0;
 	int         locals_start;
+	int         type_encodings_start;
+	int         xdefs_start;
 	unsigned    big_locals = 0;
 	int         big_func = 0;
 
@@ -893,7 +897,9 @@ qfo_to_progs (qfo_t *qfo, int *size)
 	progs->version = options.code.progsversion;
 	progs->numstatements = qfo->spaces[qfo_code_space].data_size;
 	progs->numglobaldefs = qfo->spaces[qfo_near_data_space].num_defs;
-	//FIXME ddef offsets are 16 bits
+	//ddef offsets are 16 bits so the ddef ofs will likely be invalid
+	//thus it will be forced invalid and the true offset written to the
+	//symbols file if it is created (fa
 	progs->numglobaldefs += qfo->spaces[qfo_far_data_space].num_defs;
 	progs->numfielddefs = qfo->spaces[qfo_entity_space].num_defs;
 	progs->numfunctions = qfo->num_funcs + 1;
@@ -915,7 +921,11 @@ qfo_to_progs (qfo_t *qfo, int *size)
 	near_data_size = progs->numglobals;
 	progs->numglobals = RUP (progs->numglobals, 16 / sizeof (pr_type_t));
 	progs->numglobals += qfo->spaces[qfo_far_data_space].data_size;
+	type_encodings_start = progs->numglobals;
 	progs->numglobals += qfo->spaces[qfo_type_space].data_size;
+	progs->numglobals = RUP (progs->numglobals, type_xdef.alignment);
+	xdefs_start = progs->numglobals;
+	progs->numglobals += progs->numglobaldefs * type_size (&type_xdef);
 	progs->entityfields = qfo->spaces[qfo_entity_space].data_size;
 	*size += progs->numstatements * sizeof (dstatement_t);
 	*size += progs->numglobaldefs * sizeof (ddef_t);
@@ -954,7 +964,8 @@ qfo_to_progs (qfo_t *qfo, int *size)
 	globals = (pr_type_t*) data;
 	locals = globals + locals_start;
 	far_data = globals + near_data_size;
-	type_data = far_data + qfo->spaces[qfo_far_data_space].data_size;
+	type_data = globals + type_encodings_start;
+	xdef_data = globals + xdefs_start;
 
 	memcpy (strings, qfo->spaces[qfo_strings_space].d.strings,
 			qfo->spaces[qfo_strings_space].data_size * sizeof (char));
@@ -987,14 +998,18 @@ qfo_to_progs (qfo_t *qfo, int *size)
 		qfo_def_t  *def = qfo->spaces[qfo_near_data_space].defs + i;
 		if (!strcmp (QFO_GETSTR (qfo, def->name), ".type_encodings"))
 			types_def = def;
+		if (!strcmp (QFO_GETSTR (qfo, def->name), ".xdefs"))
+			xdefs_def = def;
 		convert_def (qfo, def, globaldefs++);
 	}
 
-	//FIXME ddef offsets are 16 bits
 	for (i = 0; i < qfo->spaces[qfo_far_data_space].num_defs; i++) {
 		qfo_def_t  *def = qfo->spaces[qfo_far_data_space].defs + i;
 		def->offset += far_data - globals;
-		convert_def (qfo, def, globaldefs++);
+		convert_def (qfo, def, globaldefs);
+		// the correct offset will be written to the far data space
+		globaldefs->ofs = -1;
+		globaldefs++;
 	}
 
 	for (i = 0; i < qfo->spaces[qfo_type_space].num_defs; i++) {
@@ -1025,9 +1040,27 @@ qfo_to_progs (qfo_t *qfo, int *size)
 	if (types_def) {
 		qfot_type_encodings_t *encodings;
 		encodings = (qfot_type_encodings_t *) &globals[types_def->offset];
-		encodings->types = type_data - globals;
+		encodings->types = type_encodings_start;
 		encodings->size = qfo->spaces[qfo_type_space].data_size;
 	}
+	if (xdefs_def) {
+		int xdef_data_size = type_size (&type_xdef);
+		pr_xdefs_t  *xdefs = (pr_xdefs_t *) &globals[xdefs_def->offset];
+		xdefs->xdefs = xdefs_start;
+		xdefs->num_xdefs = progs->numglobaldefs;
+		for (i = 0; i < qfo->spaces[qfo_near_data_space].num_defs; i++) {
+			qfo_def_t  *def = qfo->spaces[qfo_near_data_space].defs + i;
+			xdef_data[0].pointer_var = def->type + type_encodings_start;
+			xdef_data[1].pointer_var = def->offset;
+			xdef_data += xdef_data_size;
+		}
+		for (i = 0; i < qfo->spaces[qfo_far_data_space].num_defs; i++) {
+			qfo_def_t  *def = qfo->spaces[qfo_far_data_space].defs + i;
+			xdef_data[0].pointer_var = def->type + type_encodings_start;
+			xdef_data[1].pointer_var = def->offset;
+			xdef_data += xdef_data_size;
+		}
+	}
 
 	// undo the relocation of the offsets of local defs so the local defs have
 	// the correct offset in the debug info
diff --git a/tools/qfcc/source/qfcc.c b/tools/qfcc/source/qfcc.c
index 780db073a..9e292d136 100644
--- a/tools/qfcc/source/qfcc.c
+++ b/tools/qfcc/source/qfcc.c
@@ -423,6 +423,7 @@ finish_link (void)
 						&param_size);
 		linker_add_def (".param_alignment", &type_integer, flags,
 						&param_alignment);
+		linker_add_def (".xdefs", &type_xdefs, flags, 0);
 	}
 
 	if (options.code.debug) {
diff --git a/tools/qfcc/source/type.c b/tools/qfcc/source/type.c
index e33f0ec34..04c8d7442 100644
--- a/tools/qfcc/source/type.c
+++ b/tools/qfcc/source/type.c
@@ -89,6 +89,9 @@ type_t      type_param = { ev_invalid, 0, 0, ty_struct };
 type_t      type_zero = { ev_invalid, 0, 0, ty_struct };
 type_t      type_type_encodings = { ev_invalid, "@type_encodings", 0,
 									ty_struct };
+type_t      type_xdef = { ev_invalid, "@xdef", 0, ty_struct };
+type_t      type_xdef_pointer = { ev_pointer, 0, 1, ty_basic, {{&type_xdef}} };
+type_t      type_xdefs = { ev_invalid, "@xdefs", 0, ty_struct };
 
 type_t      type_floatfield = { ev_field, ".float", 1, ty_basic,
 								{{&type_float}} };
@@ -1045,6 +1048,16 @@ init_types (void)
 		{"size",	&type_integer},
 		{0, 0}
 	};
+	static struct_def_t xdef_struct[] = {
+		{"types",	&type_pointer},
+		{"offset",	&type_pointer},
+		{0, 0}
+	};
+	static struct_def_t xdefs_struct[] = {
+		{"xdefs",	&type_xdef_pointer},
+		{"num_xdefs", &type_pointer},
+		{0, 0}
+	};
 
 	type_nil = &type_quaternion;
 	type_default = &type_integer;
@@ -1066,6 +1079,8 @@ init_types (void)
 
 	make_structure ("@type_encodings", 's', type_encoding_struct,
 					&type_type_encodings);
+	make_structure ("@xdef", 's', xdef_struct, &type_xdef);
+	make_structure ("@xdefs", 's', xdefs_struct, &type_xdefs);
 
 	if (options.traditional)
 		return;
@@ -1120,6 +1135,9 @@ chain_initial_types (void)
 	chain_type (&type_param);
 	chain_type (&type_zero);
 	chain_type (&type_type_encodings);
+	chain_type (&type_xdef);
+	chain_type (&type_xdef_pointer);
+	chain_type (&type_xdefs);
 
 	va_list_struct[1].type = pointer_type (&type_param);
 	make_structure ("@va_list", 's', va_list_struct, &type_va_list);
diff --git a/tools/qwaq/main.qc b/tools/qwaq/main.qc
index 1014c1f4d..25cfaabdb 100644
--- a/tools/qwaq/main.qc
+++ b/tools/qwaq/main.qc
@@ -109,5 +109,6 @@ int main (int argc, string *argv)
 	test_script ();
 	test_plist ();
 	test_types ();
+	test_xdefs ();
 	return 0;
 };
diff --git a/tools/qwaq/types.r b/tools/qwaq/types.r
index 324185b93..5cf874c61 100644
--- a/tools/qwaq/types.r
+++ b/tools/qwaq/types.r
@@ -77,6 +77,16 @@ typedef struct qfot_type_encodings_s {
 	int         size;
 } qfot_type_encodings_t;
 
+typedef struct xdef_s {
+	qfot_type_t *type;
+	void        *offset;
+} xdef_t;
+
+typedef struct pr_xdefs_s {
+	xdef_t     *xdefs;
+	int         num_xdefs;
+} pr_xdefs_t;
+
 qfot_type_t *
 next_type (qfot_type_t *type)
 {
@@ -174,3 +184,20 @@ test_types (void)
 		}
 	 }
 }
+
+void
+test_xdefs (void)
+{
+	pr_xdefs_t *xdefs;
+	int         i;
+
+	xdefs = PR_FindGlobal (".xdefs");
+	if (!xdefs) {
+		printf ("Can't find xdefs\n");
+		return;
+	}
+	printf ("%p %i\n", xdefs.xdefs, xdefs.num_xdefs);
+	for (i = 0; i < xdefs.num_xdefs; i++) {
+		printf ("%p %p\n", xdefs.xdefs[i].type, xdefs.xdefs[i].offset);
+	}
+}

From 81083698a8958137ba91d28fdaf21416eb4a93a8 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 22 Feb 2020 22:33:44 +0900
Subject: [PATCH 0459/1519] Move to using an in-memory form of ddef_t

This allows the VM to work with extended ddefs transparently. It seems
to have uncovered a typedef alias relocation bug, though.
---
 include/QF/pr_comp.h             | 13 ++++++--
 include/QF/pr_debug.h            |  2 +-
 include/QF/progs.h               | 22 +++++++------
 libs/console/menu.c              |  2 +-
 libs/gamecode/pr_debug.c         | 56 ++++++++++++++++----------------
 libs/gamecode/pr_edict.c         |  6 ++--
 libs/gamecode/pr_load.c          | 56 ++++++++++++++++++++++++++------
 libs/gamecode/pr_opcode.c        |  2 +-
 libs/gamecode/pr_parse.c         | 22 ++++++-------
 libs/gamecode/pr_resolve.c       | 20 ++++++------
 libs/ruamoko/pr_cmds.c           |  4 +--
 libs/ruamoko/rua_obj.c           |  4 +--
 nq/source/sv_progs.c             |  4 +--
 qw/source/sv_pr_qwe.c            |  2 +-
 qw/source/sv_progs.c             |  4 +--
 tools/qfcc/source/dump_globals.c | 24 +++++++-------
 tools/qfcc/source/dump_modules.c |  6 ++--
 tools/qfcc/source/obj_file.c     | 48 +++++++++++++++------------
 tools/qfcc/source/qfprogs.c      | 41 +++++++++++++++++++++--
 19 files changed, 213 insertions(+), 125 deletions(-)

diff --git a/include/QF/pr_comp.h b/include/QF/pr_comp.h
index 6b39ff1bc..d1865d1cc 100644
--- a/include/QF/pr_comp.h
+++ b/include/QF/pr_comp.h
@@ -420,7 +420,7 @@ typedef struct ddef_s {
 	pr_ushort_t type;			// if DEF_SAVEGLOBGAL bit is set
 								// the variable needs to be saved in savegames
 	pr_ushort_t ofs;
-	pr_int_t    s_name;
+	string_t    s_name;
 } ddef_t;
 
 typedef struct xdef_s {
@@ -433,6 +433,13 @@ typedef struct pr_xdefs_s {
 	pr_int_t    num_xdefs;
 } pr_xdefs_t;
 
+typedef struct pr_def_s {
+	pr_uint_t   type;
+	pointer_t   ofs;
+	string_t    name;
+	pointer_t   type_encoding;
+} pr_def_t;
+
 typedef struct dparmsize_s {
 	uint8_t     size:5;
 	uint8_t     alignment:3;
@@ -445,11 +452,11 @@ typedef struct dparmsize_s {
 typedef struct dfunction_s {
 	pr_int_t    first_statement;	// negative numbers are builtins
 	pr_int_t    parm_start;
-	pr_int_t    locals;				// total ints of parms + locals
+	pr_uint_t   locals;				// total ints of parms + locals
 
 	pr_int_t    profile;			// runtime
 
-	pr_int_t    s_name;
+	string_t    s_name;
 	pr_int_t    s_file;				// source file defined in
 
 	pr_int_t    numparms;
diff --git a/include/QF/pr_debug.h b/include/QF/pr_debug.h
index 65b953381..d80b9f417 100644
--- a/include/QF/pr_debug.h
+++ b/include/QF/pr_debug.h
@@ -51,7 +51,7 @@ typedef struct pr_lineno_s {
 	pr_uint_t   line;
 } pr_lineno_t;
 
-#define PROG_DEBUG_VERSION 0x00001002	// MMmmmRRR 0.001.002 (hex)
+#define PROG_DEBUG_VERSION 0x00001003	// MMmmmRRR 0.001.002 (hex)
 
 typedef struct pr_debug_header_s {
 	pr_int_t    version;
diff --git a/include/QF/progs.h b/include/QF/progs.h
index 87fd87c89..e93bea597 100644
--- a/include/QF/progs.h
+++ b/include/QF/progs.h
@@ -236,7 +236,7 @@ void ED_PrintNum (progs_t *pr, pr_int_t ent);
 // pr_parse.c
 struct script_s;
 struct plitem_s;
-qboolean ED_ParseEpair (progs_t *pr, pr_type_t *base, ddef_t *key,
+qboolean ED_ParseEpair (progs_t *pr, pr_type_t *base, pr_def_t *key,
 						const char *s);
 struct plitem_s *ED_EntityDict (progs_t *pr, edict_t *ed);
 struct plitem_s *ED_GlobalsDict (progs_t *pr);
@@ -269,11 +269,11 @@ void ED_EntityParseFunction (progs_t *pr);
 */
 ///@{
 
-ddef_t *PR_FieldAtOfs (progs_t *pr, pr_int_t ofs) __attribute__((pure));
-ddef_t *PR_GlobalAtOfs (progs_t *pr, pr_int_t ofs) __attribute__((pure));
+pr_def_t *PR_FieldAtOfs (progs_t *pr, pointer_t ofs) __attribute__((pure));
+pr_def_t *PR_GlobalAtOfs (progs_t *pr, pointer_t ofs) __attribute__((pure));
 
-ddef_t *PR_FindField (progs_t *pr, const char *name);
-ddef_t *PR_FindGlobal (progs_t *pr, const char *name);
+pr_def_t *PR_FindField (progs_t *pr, const char *name);
+pr_def_t *PR_FindGlobal (progs_t *pr, const char *name);
 dfunction_t *PR_FindFunction (progs_t *pr, const char *name);
 
 int PR_ResolveGlobals (progs_t *pr);
@@ -1499,8 +1499,8 @@ pr_uint_t PR_Get_Lineno_Line (progs_t *pr, pr_lineno_t *lineno) __attribute__((p
 pr_lineno_t *PR_Find_Lineno (progs_t *pr, pr_uint_t addr) __attribute__((pure));
 const char *PR_Get_Source_File (progs_t *pr, pr_lineno_t *lineno) __attribute__((pure));
 const char *PR_Get_Source_Line (progs_t *pr, pr_uint_t addr);
-ddef_t *PR_Get_Param_Def (progs_t *pr, dfunction_t *func, unsigned parm) __attribute__((pure));
-ddef_t *PR_Get_Local_Def (progs_t *pr, pr_int_t offs) __attribute__((pure));
+pr_def_t *PR_Get_Param_Def (progs_t *pr, dfunction_t *func, unsigned parm) __attribute__((pure));
+pr_def_t *PR_Get_Local_Def (progs_t *pr, pointer_t offs) __attribute__((pure));
 void PR_PrintStatement (progs_t *pr, dstatement_t *s, int contents);
 void PR_DumpState (progs_t *pr);
 void PR_StackTrace (progs_t *pr);
@@ -1616,8 +1616,10 @@ struct progs_s {
 	bfunction_t *function_table;
 	char       *pr_strings;
 	int         pr_stringsize;
-	ddef_t     *pr_globaldefs;
-	ddef_t     *pr_fielddefs;
+	ddef_t     *pr_globalddefs;
+	ddef_t     *pr_fieldddefs;
+	pr_def_t   *pr_globaldefs;
+	pr_def_t   *pr_fielddefs;
 	dstatement_t *pr_statements;
 	pr_type_t  *pr_globals;
 	unsigned    globals_size;
@@ -1708,7 +1710,7 @@ struct progs_s {
 	struct pr_auxfunction_s *auxfunctions;
 	struct pr_auxfunction_s **auxfunction_map;
 	struct pr_lineno_s *linenos;
-	ddef_t     *local_defs;
+	pr_def_t   *local_defs;
 	pr_type_t  *watch;
 	int         wp_conditional;
 	pr_type_t   wp_val;
diff --git a/libs/console/menu.c b/libs/console/menu.c
index 043532023..8320bc405 100644
--- a/libs/console/menu.c
+++ b/libs/console/menu.c
@@ -117,7 +117,7 @@ static int
 menu_resolve_globals (progs_t *pr)
 {
 	const char *sym;
-	ddef_t     *def;
+	pr_def_t   *def;
 	dfunction_t *f;
 	size_t      i;
 
diff --git a/libs/gamecode/pr_debug.c b/libs/gamecode/pr_debug.c
index 7f86c2c8f..0c388eaff 100644
--- a/libs/gamecode/pr_debug.c
+++ b/libs/gamecode/pr_debug.c
@@ -126,17 +126,17 @@ pr_debug_expression_error (script_t *script, const char *msg)
 	Sys_Printf ("%s\n", msg);
 }
 
-static ddef_t
+static pr_def_t
 parse_expression (progs_t *pr, const char *expr, int conditional)
 {
 	script_t   *es;
 	char       *e;
 	pr_type_t  *expr_ptr;
-	ddef_t      d;
+	pr_def_t    d;
 
 	d.ofs = 0;
 	d.type = ev_invalid;
-	d.s_name = 0;
+	d.name = 0;
 	es = Script_New ();
 	es->error = pr_debug_expression_error;
 	Script_Start (es, "<console>", expr);
@@ -145,7 +145,7 @@ parse_expression (progs_t *pr, const char *expr, int conditional)
 	if (Script_GetToken (es, 1)) {
 		if (strequal (es->token->str, "[")) {
 			edict_t    *ent;
-			ddef_t     *field;
+			pr_def_t   *field;
 
 			if (!Script_GetToken (es, 1))
 				goto error;
@@ -169,7 +169,7 @@ parse_expression (progs_t *pr, const char *expr, int conditional)
 			d.type = ev_void;
 			d.ofs = PR_SetPointer (pr, expr_ptr);
 		} else {
-			ddef_t     *global = PR_FindGlobal (pr, es->token->str);
+			pr_def_t   *global = PR_FindGlobal (pr, es->token->str);
 			if (!global)
 				goto error;
 			d = *global;
@@ -277,7 +277,7 @@ PR_LoadDebug (progs_t *pr)
 	const char *path_end, *sym_file;
 	off_t       debug_size;
 	pr_uint_t   i;
-	ddef_t	   *def;
+	pr_def_t   *def;
 	pr_type_t  *str = 0;
 
 	if (pr->debug)
@@ -348,7 +348,7 @@ PR_LoadDebug (progs_t *pr)
 	pr->auxfunctions = (pr_auxfunction_t*)((char*)pr->debug +
 										   pr->debug->auxfunctions);
 	pr->linenos = (pr_lineno_t*)((char*)pr->debug + pr->debug->linenos);
-	pr->local_defs = (ddef_t*)((char*)pr->debug + pr->debug->locals);
+	pr->local_defs = (pr_def_t*)((char*)pr->debug + pr->debug->locals);
 
 	i = pr->progs->numfunctions * sizeof (pr_auxfunction_t *);
 	pr->auxfunction_map = pr->allocate_progs_mem (pr, i);
@@ -377,7 +377,7 @@ PR_LoadDebug (progs_t *pr)
 	for (i = 0; i < pr->debug->num_locals; i++) {
 		pr->local_defs[i].type = LittleShort (pr->local_defs[i].type);
 		pr->local_defs[i].ofs = LittleShort (pr->local_defs[i].ofs);
-		pr->local_defs[i].s_name = LittleLong (pr->local_defs[i].s_name);
+		pr->local_defs[i].name = LittleLong (pr->local_defs[i].name);
 	}
 	return 1;
 }
@@ -474,12 +474,12 @@ PR_Get_Source_Line (progs_t *pr, pr_uint_t addr)
 			   file->lines[line - 1].text);
 }
 
-ddef_t *
+pr_def_t *
 PR_Get_Param_Def (progs_t *pr, dfunction_t *func, unsigned parm)
 {
 	pr_uint_t    i;
 	pr_auxfunction_t *aux_func;
-	ddef_t      *ddef = 0;
+	pr_def_t    *ddef = 0;
 	int          num_params;
 	int          param_offs = 0;
 
@@ -522,7 +522,7 @@ static etype_t
 get_etype (progs_t *pr, int typeptr)
 {
 	//FIXME cache .type_encodings def
-	ddef_t     *te_def = PR_FindGlobal (pr, ".type_encodings");
+	pr_def_t   *te_def = PR_FindGlobal (pr, ".type_encodings");
 	qfot_type_encodings_t *encodings;
 	qfot_type_t *type;
 
@@ -538,8 +538,8 @@ get_etype (progs_t *pr, int typeptr)
 	return ev_void;
 }
 
-ddef_t *
-PR_Get_Local_Def (progs_t *pr, pr_int_t offs)
+pr_def_t *
+PR_Get_Local_Def (progs_t *pr, pointer_t offs)
 {
 	pr_uint_t   i;
 	dfunction_t *func;
@@ -554,7 +554,7 @@ PR_Get_Local_Def (progs_t *pr, pr_int_t offs)
 	if (!aux_func)
 		return 0;
 	offs -= func->parm_start;
-	if (offs < 0 || offs >= func->locals)
+	if (offs >= func->locals)
 		return 0;
 	for (i = 0; i < aux_func->num_locals; i++)
 		if (pr->local_defs[aux_func->local_defs + i].ofs == offs)
@@ -594,7 +594,7 @@ static const char *
 value_string (progs_t *pr, etype_t type, pr_type_t *val)
 {
 	static dstring_t *line;
-	ddef_t     *def;
+	pr_def_t   *def;
 	pr_int_t    ofs;
 	edict_t    *edict;
 	dfunction_t	*f;
@@ -655,7 +655,7 @@ value_string (progs_t *pr, etype_t type, pr_type_t *val)
 		case ev_field:
 			def = PR_FieldAtOfs (pr, val->integer_var);
 			if (def)
-				dsprintf (line, ".%s", PR_GetString (pr, def->s_name));
+				dsprintf (line, ".%s", PR_GetString (pr, def->name));
 			else
 				dsprintf (line, ".<$%04x>", val->integer_var);
 			break;
@@ -679,8 +679,8 @@ value_string (progs_t *pr, etype_t type, pr_type_t *val)
 				def = PR_Get_Local_Def (pr, ofs);
 			if (!def)
 				def = PR_GlobalAtOfs (pr, ofs);
-			if (def && def->s_name)
-				dsprintf (line, "&%s", PR_GetString (pr, def->s_name));
+			if (def && def->name)
+				dsprintf (line, "&%s", PR_GetString (pr, def->name));
 			else
 				dsprintf (line, "[$%x]", ofs);
 			break;
@@ -711,17 +711,17 @@ value_string (progs_t *pr, etype_t type, pr_type_t *val)
 	return line->str;
 }
 
-static ddef_t *
+static pr_def_t *
 def_string (progs_t *pr, pr_int_t ofs, dstring_t *dstr)
 {
-	ddef_t     *def = 0;
+	pr_def_t   *def = 0;
 	const char *name;
 
 	if (pr_debug->int_val && pr->debug)
 		def = PR_Get_Local_Def (pr, ofs);
 	if (!def)
 		def = PR_GlobalAtOfs (pr, ofs);
-	if (!def || !*(name = PR_GetString (pr, def->s_name)))
+	if (!def || !*(name = PR_GetString (pr, def->name)))
 		dsprintf (dstr, "[$%x]", ofs);
 	else
 		dsprintf (dstr, "%s", name);
@@ -732,7 +732,7 @@ static const char *
 global_string (progs_t *pr, pointer_t ofs, etype_t type, int contents)
 {
 	static dstring_t *line = NULL;
-	ddef_t     *def = NULL;
+	pr_def_t   *def = NULL;
 	const char *s;
 
 	if (!line)
@@ -771,7 +771,7 @@ global_string (progs_t *pr, pointer_t ofs, etype_t type, int contents)
 VISIBLE void
 PR_Debug_Watch (progs_t *pr, const char *expr)
 {
-	ddef_t      watch;
+	pr_def_t    watch;
 	if (!expr) {
 		Sys_Printf ("watch <watchpoint expr>\n");
 		if (pr->watch) {
@@ -802,7 +802,7 @@ PR_Debug_Watch (progs_t *pr, const char *expr)
 VISIBLE void
 PR_Debug_Print (progs_t *pr, const char *expr)
 {
-	ddef_t      print;
+	pr_def_t    print;
 
 	if (!expr) {
 		Sys_Printf ("print <print expr>\n");
@@ -825,7 +825,7 @@ PR_PrintStatement (progs_t *pr, dstatement_t *s, int contents)
 	opcode_t   *op;
 	static dstring_t *line;
 	dfunction_t *call_func = 0;
-	ddef_t     *parm_def = 0;
+	pr_def_t   *parm_def = 0;
 	pr_auxfunction_t *aux_func = 0;
 
 	if (!line)
@@ -1075,7 +1075,7 @@ ED_Print (progs_t *pr, edict_t *ed)
 	int         type, l;
 	pr_uint_t   i;
 	const char *name;
-	ddef_t     *d;
+	pr_def_t   *d;
 	pr_type_t  *v;
 
 	if (ed->free) {
@@ -1086,9 +1086,9 @@ ED_Print (progs_t *pr, edict_t *ed)
 	Sys_Printf ("\nEDICT %d:\n", NUM_FOR_BAD_EDICT (pr, ed));
 	for (i = 0; i < pr->progs->numfielddefs; i++) {
 		d = &pr->pr_fielddefs[i];
-		if (!d->s_name)					// null field def (probably 1st)
+		if (!d->name)					// null field def (probably 1st)
 			continue;
-		name = PR_GetString (pr, d->s_name);
+		name = PR_GetString (pr, d->name);
 		if (name[strlen (name) - 2] == '_'
 			&& strchr ("xyz", name[strlen (name) -1]))
 			continue;					// skip _x, _y, _z vars
diff --git a/libs/gamecode/pr_edict.c b/libs/gamecode/pr_edict.c
index 2241e3e9f..76eb07e9b 100644
--- a/libs/gamecode/pr_edict.c
+++ b/libs/gamecode/pr_edict.c
@@ -158,7 +158,7 @@ ED_PrintEdicts (progs_t *pr, const char *fieldval)
 {
 	pr_int_t    i;
 	int         count;
-	ddef_t     *def;
+	pr_def_t   *def;
 
 	def = PR_FindField(pr, "classname");
 
@@ -188,8 +188,8 @@ ED_Count (progs_t *pr)
 {
 	pr_int_t    i;
 	int         active, models, solid, step, zombie;
-	ddef_t     *solid_def;
-	ddef_t     *model_def;
+	pr_def_t   *solid_def;
+	pr_def_t   *model_def;
 	edict_t    *ent;
 
 	solid_def = PR_FindField (pr, "solid");
diff --git a/libs/gamecode/pr_load.c b/libs/gamecode/pr_load.c
index cadfebca3..eec948d45 100644
--- a/libs/gamecode/pr_load.c
+++ b/libs/gamecode/pr_load.c
@@ -70,8 +70,8 @@ static const char *
 var_get_key (const void *d, void *_pr)
 {
 	progs_t *pr = (progs_t*)_pr;
-	ddef_t *def = (ddef_t*)d;
-	return PR_GetString (pr, def->s_name);
+	pr_def_t *def = (pr_def_t*)d;
+	return PR_GetString (pr, def->name);
 }
 
 static void
@@ -119,6 +119,8 @@ PR_LoadProgsFile (progs_t *pr, QFile *file, int size)
 	dprograms_t progs;
 	byte       *base;
 	byte       *heap;
+	pr_def_t   *xdefs_def = 0;
+
 
 	if (!pr->file_error)
 		pr->file_error = file_error;
@@ -220,8 +222,8 @@ PR_LoadProgsFile (progs_t *pr, QFile *file, int size)
 		(dfunction_t *) (base + pr->progs->ofs_functions);
 	pr->pr_strings = (char *) base + pr->progs->ofs_strings;
 	pr->pr_stringsize = (char *) heap + pr->zone_size - (char *) base;
-	pr->pr_globaldefs = (ddef_t *) (base + pr->progs->ofs_globaldefs);
-	pr->pr_fielddefs = (ddef_t *) (base + pr->progs->ofs_fielddefs);
+	pr->pr_globalddefs = (ddef_t *) (base + pr->progs->ofs_globaldefs);
+	pr->pr_fieldddefs = (ddef_t *) (base + pr->progs->ofs_fielddefs);
 	pr->pr_statements = (dstatement_t *) (base + pr->progs->ofs_statements);
 
 	pr->pr_globals = (pr_type_t *) (base + pr->progs->ofs_globals);
@@ -272,24 +274,58 @@ PR_LoadProgsFile (progs_t *pr, QFile *file, int size)
 			Hash_Add (pr->function_hash, &pr->pr_functions[i]);
 	}
 
+	if (pr->pr_globaldefs) {
+		free (pr->pr_globaldefs);
+	}
+	pr->pr_globaldefs = calloc (pr->progs->numglobaldefs, sizeof (pr_def_t));
+
 	for (i = 0; i < pr->progs->numglobaldefs; i++) {
-		pr->pr_globaldefs[i].type = LittleShort (pr->pr_globaldefs[i].type);
-		pr->pr_globaldefs[i].ofs = LittleShort (pr->pr_globaldefs[i].ofs);
-		pr->pr_globaldefs[i].s_name = LittleLong (pr->pr_globaldefs[i].s_name);
+		pr->pr_globalddefs[i].type = LittleShort (pr->pr_globalddefs[i].type);
+		pr->pr_globalddefs[i].ofs = LittleShort (pr->pr_globalddefs[i].ofs);
+		pr->pr_globalddefs[i].s_name = LittleLong (pr->pr_globalddefs[i].s_name);
+
+		pr->pr_globaldefs[i].type = pr->pr_globalddefs[i].type;
+		pr->pr_globaldefs[i].ofs = pr->pr_globalddefs[i].ofs;
+		pr->pr_globaldefs[i].name = pr->pr_globalddefs[i].s_name;
 		Hash_Add (pr->global_hash, &pr->pr_globaldefs[i]);
 	}
 
+	if (pr->pr_fielddefs) {
+		free (pr->pr_fielddefs);
+	}
+	pr->pr_fielddefs = calloc (pr->progs->numfielddefs, sizeof (pr_def_t));
 	for (i = 0; i < pr->progs->numfielddefs; i++) {
-		pr->pr_fielddefs[i].type = LittleShort (pr->pr_fielddefs[i].type);
+		pr->pr_fieldddefs[i].type = LittleShort (pr->pr_fieldddefs[i].type);
 		if (pr->pr_fielddefs[i].type & DEF_SAVEGLOBAL)
 			PR_Error (pr, "PR_LoadProgs: pr_fielddefs[i].type & DEF_SAVEGLOBAL");
-		pr->pr_fielddefs[i].ofs = LittleShort (pr->pr_fielddefs[i].ofs);
-		pr->pr_fielddefs[i].s_name = LittleLong (pr->pr_fielddefs[i].s_name);
+		pr->pr_fieldddefs[i].ofs = LittleShort (pr->pr_fieldddefs[i].ofs);
+		pr->pr_fieldddefs[i].s_name = LittleLong (pr->pr_fieldddefs[i].s_name);
+
+		pr->pr_fielddefs[i].type = pr->pr_fieldddefs[i].type;
+		pr->pr_fielddefs[i].ofs = pr->pr_fieldddefs[i].ofs;
+		pr->pr_fielddefs[i].name = pr->pr_fieldddefs[i].s_name;
 		Hash_Add (pr->field_hash, &pr->pr_fielddefs[i]);
 	}
 
 	for (i = 0; i < pr->progs->numglobals; i++)
 		((int *) pr->pr_globals)[i] = LittleLong (((int *) pr->pr_globals)[i]);
+
+	xdefs_def = PR_FindGlobal (pr, ".xdefs");
+	if (xdefs_def) {
+		pr_xdefs_t *xdefs = &G_STRUCT (pr, pr_xdefs_t, xdefs_def->ofs);
+		xdef_t     *xdef = &G_STRUCT (pr, xdef_t, xdefs->xdefs);
+		pr_def_t   *def;
+		for (def = pr->pr_globaldefs, i = 0; i < pr->progs->numglobaldefs;
+			 i++, xdef++, def++) {
+			def->ofs = xdef->ofs;
+			def->type_encoding = xdef->type;
+		}
+		for (def = pr->pr_fielddefs, i = 0; i < pr->progs->numfielddefs;
+			 i++, xdef++, def++) {
+			def->ofs = xdef->ofs;
+			def->type_encoding = xdef->type;
+		}
+	}
 }
 
 VISIBLE void
diff --git a/libs/gamecode/pr_opcode.c b/libs/gamecode/pr_opcode.c
index 15185b37d..0ad3fab4b 100644
--- a/libs/gamecode/pr_opcode.c
+++ b/libs/gamecode/pr_opcode.c
@@ -1535,7 +1535,7 @@ check_global (progs_t *pr, dstatement_t *st, opcode_t *op, etype_t type,
 			  unsigned short operand, int check_denorm)
 {
 	const char *msg;
-	ddef_t     *def;
+	pr_def_t   *def;
 
 	switch (type) {
 		case ev_short:
diff --git a/libs/gamecode/pr_parse.c b/libs/gamecode/pr_parse.c
index a8259ee78..69219651f 100644
--- a/libs/gamecode/pr_parse.c
+++ b/libs/gamecode/pr_parse.c
@@ -71,7 +71,7 @@ static const char *
 PR_UglyValueString (progs_t *pr, etype_t type, pr_type_t *val)
 {
 	static dstring_t *line = 0;
-	ddef_t		*def;
+	pr_def_t    *def;
 	dfunction_t	*f;
 
 	if (!line)
@@ -93,7 +93,7 @@ PR_UglyValueString (progs_t *pr, etype_t type, pr_type_t *val)
 			break;
 		case ev_field:
 			def = PR_FieldAtOfs (pr, val->integer_var);
-			dsprintf (line, "%s", PR_GetString (pr, def->s_name));
+			dsprintf (line, "%s", PR_GetString (pr, def->name));
 			break;
 		case ev_void:
 			dstring_copystr (line, "void");
@@ -131,9 +131,9 @@ ED_EntityDict (progs_t *pr, edict_t *ed)
 
 	if (!ed->free) {
 		for (i = 0; i < pr->progs->numfielddefs; i++) {
-			ddef_t     *d = &pr->pr_fielddefs[i];
+			pr_def_t   *d = &pr->pr_fielddefs[i];
 
-			name = PR_GetString (pr, d->s_name);
+			name = PR_GetString (pr, d->name);
 			if (!name[0])
 				continue;					// skip unnamed fields
 			if (name[strlen (name) - 2] == '_')
@@ -169,7 +169,7 @@ ED_GlobalsDict (progs_t *pr)
 	pr_uint_t   i;
 	const char *name;
 	const char *value;
-	ddef_t     *def;
+	pr_def_t   *def;
 	int         type;
 
 	for (i = 0; i < pr->progs->numglobaldefs; i++) {
@@ -182,7 +182,7 @@ ED_GlobalsDict (progs_t *pr)
 		if (type != ev_string && type != ev_float && type != ev_entity)
 			continue;
 
-		name = PR_GetString (pr, def->s_name);
+		name = PR_GetString (pr, def->name);
 		value = PR_UglyValueString (pr, type, &pr->pr_globals[def->ofs]);
 		PL_D_AddObject (globals, name, PL_NewString (value));
 	}
@@ -222,11 +222,11 @@ ED_NewString (progs_t *pr, const char *string)
 	returns false if error
 */
 VISIBLE qboolean
-ED_ParseEpair (progs_t *pr, pr_type_t *base, ddef_t *key, const char *s)
+ED_ParseEpair (progs_t *pr, pr_type_t *base, pr_def_t *key, const char *s)
 {
 	int			i;
 	char		*string;
-	ddef_t		*def;
+	pr_def_t    *def;
 	char		*v, *w;
 	pr_type_t	*d;
 	dfunction_t	*func;
@@ -357,8 +357,8 @@ ED_ConvertToPlist (script_t *script, int nohack)
 VISIBLE void
 ED_InitGlobals (progs_t *pr, plitem_t *globals)
 {
-	ddef_t      vector_def;
-	ddef_t     *global;
+	pr_def_t    vector_def;
+	pr_def_t   *global;
 	plitem_t   *keys;
 	int         count;
 	const char *global_name;
@@ -405,7 +405,7 @@ ED_InitGlobals (progs_t *pr, plitem_t *globals)
 VISIBLE void
 ED_InitEntity (progs_t *pr, plitem_t *entity, edict_t *ent)
 {
-	ddef_t     *field;
+	pr_def_t   *field;
 	plitem_t   *keys;
 	const char *field_name;
 	const char *value;
diff --git a/libs/gamecode/pr_resolve.c b/libs/gamecode/pr_resolve.c
index 3238e774e..07ef44d60 100644
--- a/libs/gamecode/pr_resolve.c
+++ b/libs/gamecode/pr_resolve.c
@@ -52,10 +52,10 @@
 #include "compat.h"
 
 
-ddef_t *
-PR_GlobalAtOfs (progs_t * pr, pr_int_t ofs)
+pr_def_t *
+PR_GlobalAtOfs (progs_t * pr, pointer_t ofs)
 {
-	ddef_t     *def;
+	pr_def_t   *def;
 	pr_uint_t   i;
 
 	for (i = 0; i < pr->progs->numglobaldefs; i++) {
@@ -66,10 +66,10 @@ PR_GlobalAtOfs (progs_t * pr, pr_int_t ofs)
 	return NULL;
 }
 
-VISIBLE ddef_t *
-PR_FieldAtOfs (progs_t * pr, pr_int_t ofs)
+VISIBLE pr_def_t *
+PR_FieldAtOfs (progs_t * pr, pointer_t ofs)
 {
-	ddef_t     *def;
+	pr_def_t   *def;
 	pr_uint_t   i;
 
 	for (i = 0; i < pr->progs->numfielddefs; i++) {
@@ -80,13 +80,13 @@ PR_FieldAtOfs (progs_t * pr, pr_int_t ofs)
 	return NULL;
 }
 
-VISIBLE ddef_t *
+VISIBLE pr_def_t *
 PR_FindField (progs_t * pr, const char *name)
 {
 	return  Hash_Find (pr->field_hash, name);
 }
 
-VISIBLE ddef_t *
+VISIBLE pr_def_t *
 PR_FindGlobal (progs_t * pr, const char *name)
 {
 	return  Hash_Find (pr->global_hash, name);
@@ -108,7 +108,7 @@ VISIBLE int
 PR_ResolveGlobals (progs_t *pr)
 {
 	const char *sym;
-	ddef_t     *def;
+	pr_def_t   *def;
 	int         i;
 
 	if (pr->progs->version == PROG_ID_VERSION) {
@@ -180,7 +180,7 @@ int
 PR_AccessField (progs_t *pr, const char *name, etype_t type,
 				const char *file, int line)
 {
-	ddef_t *def = PR_FindField (pr, name);
+	pr_def_t   *def = PR_FindField (pr, name);
 
 	if (!def)
 		PR_Error (pr, "undefined field %s accessed at %s:%d", name, file, line);
diff --git a/libs/ruamoko/pr_cmds.c b/libs/ruamoko/pr_cmds.c
index 8352228d4..8c6aa3d58 100644
--- a/libs/ruamoko/pr_cmds.c
+++ b/libs/ruamoko/pr_cmds.c
@@ -255,7 +255,7 @@ PF_Find (progs_t *pr)
 	int			i;			// ev_vector
 	int			e, f;
 	etype_t		type;
-	ddef_t	   *field_def;
+	pr_def_t   *field_def;
 	edict_t	   *ed;
 
 	e = P_EDICTNUM (pr, 0);
@@ -596,7 +596,7 @@ static void
 PF_PR_SetField (progs_t *pr)
 {
 	edict_t    *ent = P_EDICT (pr, 0);
-	ddef_t     *field = PR_FindField (pr, P_GSTRING (pr, 1));
+	pr_def_t   *field = PR_FindField (pr, P_GSTRING (pr, 1));
 	const char *value = P_GSTRING (pr, 2);
 
 	R_INT (pr) = 0;
diff --git a/libs/ruamoko/rua_obj.c b/libs/ruamoko/rua_obj.c
index ed3a1d78b..efb193bc8 100644
--- a/libs/ruamoko/rua_obj.c
+++ b/libs/ruamoko/rua_obj.c
@@ -1550,7 +1550,7 @@ static void
 rua_PR_FindGlobal (progs_t *pr)
 {
 	const char *name = P_GSTRING (pr, 0);
-	ddef_t     *def;
+	pr_def_t   *def;
 
 	R_POINTER (pr) = 0;
 	def = PR_FindGlobal (pr, name);
@@ -1654,7 +1654,7 @@ rua_init_finish (progs_t *pr)
 static int
 rua_init_runtime (progs_t *pr)
 {
-	ddef_t     *def;
+	pr_def_t   *def;
 	unsigned    i;
 
 	if (!pr->selector_hash)
diff --git a/nq/source/sv_progs.c b/nq/source/sv_progs.c
index 7e98550d4..60ee75368 100644
--- a/nq/source/sv_progs.c
+++ b/nq/source/sv_progs.c
@@ -379,7 +379,7 @@ set_address (sv_def_t *def, void *address)
 static int
 resolve_globals (progs_t *pr, sv_def_t *def, int mode)
 {
-	ddef_t     *ddef;
+	pr_def_t   *ddef;
 	int         ret = 1;
 
 	if (mode == 2) {
@@ -425,7 +425,7 @@ resolve_functions (progs_t *pr, sv_def_t *def, int mode)
 static int
 resolve_fields (progs_t *pr, sv_def_t *def, int mode)
 {
-	ddef_t     *ddef;
+	pr_def_t   *ddef;
 	int         ret = 1;
 
 	if (mode == 2) {
diff --git a/qw/source/sv_pr_qwe.c b/qw/source/sv_pr_qwe.c
index 0c844abd8..7c8a46d84 100644
--- a/qw/source/sv_pr_qwe.c
+++ b/qw/source/sv_pr_qwe.c
@@ -551,7 +551,7 @@ static int
 qwe_load_finish (progs_t *pr)
 {
 	edict_t    *ent;
-	ddef_t     *targetname;
+	pr_def_t   *targetname;
 
 	targetname = PR_FindField (pr, "targetname");
 	ent = EDICT_NUM (pr, 0);
diff --git a/qw/source/sv_progs.c b/qw/source/sv_progs.c
index e4856f69b..f5abeed3f 100644
--- a/qw/source/sv_progs.c
+++ b/qw/source/sv_progs.c
@@ -389,7 +389,7 @@ set_address (sv_def_t *def, void *address)
 static int
 resolve_globals (progs_t *pr, sv_def_t *def, int mode)
 {
-	ddef_t     *ddef;
+	pr_def_t   *ddef;
 	int         ret = 1;
 
 	if (mode == 2) {
@@ -435,7 +435,7 @@ resolve_functions (progs_t *pr, sv_def_t *def, int mode)
 static int
 resolve_fields (progs_t *pr, sv_def_t *def, int mode)
 {
-	ddef_t     *ddef;
+	pr_def_t   *ddef;
 	int         ret = 1;
 
 	if (mode == 2) {
diff --git a/tools/qfcc/source/dump_globals.c b/tools/qfcc/source/dump_globals.c
index 89dbb50fa..79024313b 100644
--- a/tools/qfcc/source/dump_globals.c
+++ b/tools/qfcc/source/dump_globals.c
@@ -52,14 +52,14 @@
 static int
 cmp (const void *_a, const void *_b)
 {
-	const ddef_t *a = (const ddef_t *)_a;
-	const ddef_t *b = (const ddef_t *)_b;
+	const pr_def_t *a = (const pr_def_t *)_a;
+	const pr_def_t *b = (const pr_def_t *)_b;
 
 	return a->ofs - b->ofs;
 }
 
 static void
-dump_def (progs_t *pr, ddef_t *def, int indent)
+dump_def (progs_t *pr, pr_def_t *def, int indent)
 {
 	const char *name;
 	const char *type;
@@ -69,10 +69,10 @@ dump_def (progs_t *pr, ddef_t *def, int indent)
 	const char *str;
 	int         saveglobal;
 
-	if (!def->type && !def->ofs && !def->s_name)
+	if (!def->type && !def->ofs && !def->name)
 		return;
 
-	name = PR_GetString (pr, def->s_name);
+	name = PR_GetString (pr, def->name);
 	type = pr_type_name[def->type & ~DEF_SAVEGLOBAL];
 	saveglobal = (def->type & DEF_SAVEGLOBAL) != 0;
 	offset = def->ofs;
@@ -148,15 +148,15 @@ dump_def (progs_t *pr, ddef_t *def, int indent)
 				break;
 		}
 	}
-	printf ("%*s %x %d %s %s%s\n", indent * 12, "",
-			offset, saveglobal, name, type, comment);
+	printf ("%*s %x %d %s %s:%x %s\n", indent * 12, "",
+			offset, saveglobal, name, type, def->type_encoding, comment);
 }
 
 void
 dump_globals (progs_t *pr)
 {
 	unsigned int i;
-	ddef_t     *global_defs = pr->pr_globaldefs;
+	pr_def_t   *global_defs = pr->pr_globaldefs;
 
 	if (sorted) {
 		global_defs = malloc (pr->progs->numglobaldefs * sizeof (ddef_t));
@@ -165,7 +165,7 @@ dump_globals (progs_t *pr)
 		qsort (global_defs, pr->progs->numglobaldefs, sizeof (ddef_t), cmp);
 	}
 	for (i = 0; i < pr->progs->numglobaldefs; i++) {
-		ddef_t *def = &global_defs[i];
+		pr_def_t   *def = &global_defs[i];
 		dump_def (pr, def, 0);
 	}
 }
@@ -180,9 +180,9 @@ dump_fields (progs_t *pr)
 	const char *comment;
 
 	for (i = 0; i < pr->progs->numfielddefs; i++) {
-		ddef_t *def = &pr->pr_fielddefs[i];
+		pr_def_t   *def = &pr->pr_fielddefs[i];
 
-		name = PR_GetString (pr, def->s_name);
+		name = PR_GetString (pr, def->name);
 		type = pr_type_name[def->type & ~DEF_SAVEGLOBAL];
 		offset = def->ofs;
 
@@ -516,7 +516,7 @@ dump_types (progs_t *pr)
 {
 	qfo_mspace_t spaces[qfo_num_spaces];
 	qfo_t       qfo;
-	ddef_t     *encodings_def;
+	pr_def_t   *encodings_def;
 	qfot_type_encodings_t *encodings;
 
 	encodings_def = PR_FindGlobal (pr, ".type_encodings");
diff --git a/tools/qfcc/source/dump_modules.c b/tools/qfcc/source/dump_modules.c
index d55195aaa..6bb559003 100644
--- a/tools/qfcc/source/dump_modules.c
+++ b/tools/qfcc/source/dump_modules.c
@@ -205,11 +205,11 @@ dump_modules (progs_t *pr)
 	unsigned int i;
 
 	for (i = 0; i < pr->progs->numglobaldefs; i++) {
-		ddef_t     *def = &pr->pr_globaldefs[i];
+		pr_def_t   *def = &pr->pr_globaldefs[i];
 		const char *name = "<invalid_string>";
 
-		if (PR_StringValid (pr, def->s_name))
-			name = PR_GetString (pr, def->s_name);
+		if (PR_StringValid (pr, def->name))
+			name = PR_GetString (pr, def->name);
 		if (strcmp (name, "_OBJ_MODULE") == 0) {
 			printf ("module @ %x\n", def->ofs);
 			dump_module (pr, &G_STRUCT (pr, pr_module_t, def->ofs));
diff --git a/tools/qfcc/source/obj_file.c b/tools/qfcc/source/obj_file.c
index 79c4effeb..f79bed688 100644
--- a/tools/qfcc/source/obj_file.c
+++ b/tools/qfcc/source/obj_file.c
@@ -926,6 +926,7 @@ qfo_to_progs (qfo_t *qfo, int *size)
 	progs->numglobals = RUP (progs->numglobals, type_xdef.alignment);
 	xdefs_start = progs->numglobals;
 	progs->numglobals += progs->numglobaldefs * type_size (&type_xdef);
+	progs->numglobals += progs->numfielddefs * type_size (&type_xdef);
 	progs->entityfields = qfo->spaces[qfo_entity_space].data_size;
 	*size += progs->numstatements * sizeof (dstatement_t);
 	*size += progs->numglobaldefs * sizeof (ddef_t);
@@ -1012,10 +1013,6 @@ qfo_to_progs (qfo_t *qfo, int *size)
 		globaldefs++;
 	}
 
-	for (i = 0; i < qfo->spaces[qfo_type_space].num_defs; i++) {
-		qfo->spaces[qfo_type_space].defs[i].offset += type_data - globals;
-	}
-
 	for (i = 0; i < qfo->spaces[qfo_entity_space].num_defs; i++) {
 		convert_def (qfo, qfo->spaces[qfo_entity_space].defs + i,
 					 fielddefs + i);
@@ -1044,21 +1041,27 @@ qfo_to_progs (qfo_t *qfo, int *size)
 		encodings->size = qfo->spaces[qfo_type_space].data_size;
 	}
 	if (xdefs_def) {
-		int xdef_data_size = type_size (&type_xdef);
-		pr_xdefs_t  *xdefs = (pr_xdefs_t *) &globals[xdefs_def->offset];
+		pr_xdefs_t *xdefs = (pr_xdefs_t *) &globals[xdefs_def->offset];
+		xdef_t     *xdef = (xdef_t *) xdef_data;
 		xdefs->xdefs = xdefs_start;
-		xdefs->num_xdefs = progs->numglobaldefs;
-		for (i = 0; i < qfo->spaces[qfo_near_data_space].num_defs; i++) {
+		xdefs->num_xdefs = progs->numglobaldefs + progs->numfielddefs;
+		for (i = 0; i < qfo->spaces[qfo_near_data_space].num_defs;
+			 i++, xdef++) {
 			qfo_def_t  *def = qfo->spaces[qfo_near_data_space].defs + i;
-			xdef_data[0].pointer_var = def->type + type_encodings_start;
-			xdef_data[1].pointer_var = def->offset;
-			xdef_data += xdef_data_size;
+			xdef->type = def->type + type_encodings_start;
+			xdef->ofs = def->offset;
 		}
-		for (i = 0; i < qfo->spaces[qfo_far_data_space].num_defs; i++) {
+		for (i = 0; i < qfo->spaces[qfo_far_data_space].num_defs;
+			 i++, xdef++) {
 			qfo_def_t  *def = qfo->spaces[qfo_far_data_space].defs + i;
-			xdef_data[0].pointer_var = def->type + type_encodings_start;
-			xdef_data[1].pointer_var = def->offset;
-			xdef_data += xdef_data_size;
+			xdef->type = def->type + type_encodings_start;
+			xdef->ofs = def->offset;
+		}
+		for (i = 0; i < qfo->spaces[qfo_entity_space].num_defs;
+			 i++, xdef++) {
+			qfo_def_t  *def =  qfo->spaces[qfo_entity_space].defs + i;
+			xdef->type = def->type + type_encodings_start;
+			xdef->ofs = def->offset;
 		}
 	}
 
@@ -1108,7 +1111,7 @@ qfo_to_sym (qfo_t *qfo, int *size)
 	pr_auxfunction_t *auxfuncs;
 	pr_auxfunction_t *aux;
 	pr_lineno_t *linenos;
-	ddef_t     *locals, *ld;
+	pr_def_t   *locals, *ld;
 
 	*size = sizeof (pr_debug_header_t);
 	sym = calloc (1, *size);
@@ -1129,12 +1132,12 @@ qfo_to_sym (qfo_t *qfo, int *size)
 
 	*size += sym->num_auxfunctions * sizeof (pr_auxfunction_t);
 	*size += sym->num_linenos * sizeof (pr_lineno_t);
-	*size += sym->num_locals * sizeof (ddef_t);
+	*size += sym->num_locals * sizeof (pr_def_t);
 	sym = realloc (sym, *size);
 
 	auxfuncs = (pr_auxfunction_t *)(sym + 1);
 	linenos = (pr_lineno_t *)(auxfuncs + sym->num_auxfunctions);
-	locals = (ddef_t *)(linenos + sym->num_linenos);
+	locals = (pr_def_t *)(linenos + sym->num_linenos);
 
 	sym->auxfunctions = (char *) auxfuncs - (char *) sym;
 	sym->linenos = (char *) linenos - (char *) sym;
@@ -1162,8 +1165,13 @@ qfo_to_sym (qfo_t *qfo, int *size)
 			qfo->lines[func->line_info].fa.func = aux - auxfuncs;
 		if (num_locals) {
 			aux->local_defs = ld - locals;
-			for (j = 0; j < num_locals; j++)
-				convert_def (qfo, def++, ld++);
+			for (j = 0; j < num_locals; j++, def++, ld++) {
+				ld->type = get_def_type (qfo, def->type);
+				ld->type = def->type;
+				ld->ofs = def->offset;
+				ld->name = def->name;
+				ld->type_encoding = def->type;
+			}
 		}
 		aux->num_locals = num_locals;
 		//FIXME check type
diff --git a/tools/qfcc/source/qfprogs.c b/tools/qfcc/source/qfprogs.c
index be14d144f..e113912fb 100644
--- a/tools/qfcc/source/qfprogs.c
+++ b/tools/qfcc/source/qfprogs.c
@@ -256,6 +256,9 @@ convert_qfo (void)
 {
 	int         size;
 	int         i;
+	xdef_t     *xdef = 0;
+	pr_xdefs_t *xdefs = 0;
+	ddef_t     *xdefs_def = 0;
 
 	pr.progs = qfo_to_progs (qfo, &size);
 
@@ -264,20 +267,52 @@ convert_qfo (void)
 	pr.pr_strings = P (char, ofs_strings);
 	pr.pr_stringsize = pr.progs->numstrings;
 	pr.pr_functions = P (dfunction_t, ofs_functions);
-	pr.pr_globaldefs = P (ddef_t, ofs_globaldefs);
-	pr.pr_fielddefs = P (ddef_t, ofs_fielddefs);
+	pr.pr_globalddefs = P (ddef_t, ofs_globaldefs);
+	pr.pr_fieldddefs = P (ddef_t, ofs_fielddefs);
 	pr.pr_globals = P (pr_type_t, ofs_globals);
 	pr.globals_size = pr.progs->numglobals;
 	pr.pr_edict_size = max (1, pr.progs->entityfields) * 4;
 	pr.pr_edictareasize = 1 * pr.pr_edict_size;
 #undef P
 
+	pr.pr_globaldefs = malloc ((pr.progs->numglobaldefs
+								+ pr.progs->numfielddefs)
+							   * sizeof (pr_def_t));
+	// can't use PR_FindGlobal yet as pr_globaldefs is still uninitialized
+	for (i = 0; i < (int) pr.progs->numglobaldefs; i++) {
+		ddef_t     *ddef = pr.pr_globalddefs + i;
+		if (!strcmp (PR_GetString (&pr, ddef->s_name), ".xdefs")) {
+			xdefs_def = ddef;
+			break;
+		}
+	}
+	if (xdefs_def) {
+		xdefs = &G_STRUCT (&pr, pr_xdefs_t, xdefs_def->ofs);
+		xdef = &G_STRUCT (&pr, xdef_t, xdefs->xdefs);
+	}
+	for (i = 0; i < (int) pr.progs->numglobaldefs; i++, xdef++) {
+		ddef_t     *ddef = pr.pr_globalddefs + i;
+		pr_def_t   *def = pr.pr_globaldefs + i;
+		def->type = ddef->type;
+		def->ofs = xdefs ? xdef->ofs : ddef->ofs;
+		def->name = ddef->s_name;
+		def->type_encoding = xdefs ? xdef->type : 0;
+	}
+	for (i = 0; i < (int) pr.progs->numfielddefs; i++, xdef++) {
+		ddef_t     *ddef = pr.pr_fieldddefs + i;
+		pr_def_t   *def = pr.pr_fielddefs + i;
+		def->type = ddef->type;
+		def->ofs = xdefs ? xdef->ofs : ddef->ofs;
+		def->name = ddef->s_name;
+		def->type_encoding = xdefs ? xdef->type : 0;
+	}
+
 	if (verbosity) {
 		pr.debug = qfo_to_sym (qfo, &size);
 #define P(t,o) ((t *)((char *)pr.debug + pr.debug->o))
 		pr.auxfunctions = P (pr_auxfunction_t, auxfunctions);
 		pr.linenos = P (pr_lineno_t, linenos);
-		pr.local_defs = P (ddef_t, locals);
+		pr.local_defs = P (pr_def_t, locals);
 #undef P
 
 		pr.local_defs = calloc (qfo->num_defs, sizeof (ddef_t));

From 806af854475f491c6facb6afb68b15e2ea9672e6 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 22 Feb 2020 22:44:08 +0900
Subject: [PATCH 0460/1519] Remove reference to ddef_t from progs.h

This cleans up some horrible names and redundant fields that were a
result of the transition to pr_def_t
---
 include/QF/progs.h          |  2 --
 libs/gamecode/pr_load.c     | 35 ++++++++++++++++++-----------------
 tools/qfcc/source/qfprogs.c | 13 ++++++++-----
 3 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/include/QF/progs.h b/include/QF/progs.h
index e93bea597..a413b2f25 100644
--- a/include/QF/progs.h
+++ b/include/QF/progs.h
@@ -1616,8 +1616,6 @@ struct progs_s {
 	bfunction_t *function_table;
 	char       *pr_strings;
 	int         pr_stringsize;
-	ddef_t     *pr_globalddefs;
-	ddef_t     *pr_fieldddefs;
 	pr_def_t   *pr_globaldefs;
 	pr_def_t   *pr_fielddefs;
 	dstatement_t *pr_statements;
diff --git a/libs/gamecode/pr_load.c b/libs/gamecode/pr_load.c
index eec948d45..99136ed4f 100644
--- a/libs/gamecode/pr_load.c
+++ b/libs/gamecode/pr_load.c
@@ -120,7 +120,8 @@ PR_LoadProgsFile (progs_t *pr, QFile *file, int size)
 	byte       *base;
 	byte       *heap;
 	pr_def_t   *xdefs_def = 0;
-
+	ddef_t     *global_ddefs;
+	ddef_t     *field_ddefs;
 
 	if (!pr->file_error)
 		pr->file_error = file_error;
@@ -222,8 +223,8 @@ PR_LoadProgsFile (progs_t *pr, QFile *file, int size)
 		(dfunction_t *) (base + pr->progs->ofs_functions);
 	pr->pr_strings = (char *) base + pr->progs->ofs_strings;
 	pr->pr_stringsize = (char *) heap + pr->zone_size - (char *) base;
-	pr->pr_globalddefs = (ddef_t *) (base + pr->progs->ofs_globaldefs);
-	pr->pr_fieldddefs = (ddef_t *) (base + pr->progs->ofs_fielddefs);
+	global_ddefs = (ddef_t *) (base + pr->progs->ofs_globaldefs);
+	field_ddefs = (ddef_t *) (base + pr->progs->ofs_fielddefs);
 	pr->pr_statements = (dstatement_t *) (base + pr->progs->ofs_statements);
 
 	pr->pr_globals = (pr_type_t *) (base + pr->progs->ofs_globals);
@@ -280,13 +281,13 @@ PR_LoadProgsFile (progs_t *pr, QFile *file, int size)
 	pr->pr_globaldefs = calloc (pr->progs->numglobaldefs, sizeof (pr_def_t));
 
 	for (i = 0; i < pr->progs->numglobaldefs; i++) {
-		pr->pr_globalddefs[i].type = LittleShort (pr->pr_globalddefs[i].type);
-		pr->pr_globalddefs[i].ofs = LittleShort (pr->pr_globalddefs[i].ofs);
-		pr->pr_globalddefs[i].s_name = LittleLong (pr->pr_globalddefs[i].s_name);
+		global_ddefs[i].type = LittleShort (global_ddefs[i].type);
+		global_ddefs[i].ofs = LittleShort (global_ddefs[i].ofs);
+		global_ddefs[i].s_name = LittleLong (global_ddefs[i].s_name);
 
-		pr->pr_globaldefs[i].type = pr->pr_globalddefs[i].type;
-		pr->pr_globaldefs[i].ofs = pr->pr_globalddefs[i].ofs;
-		pr->pr_globaldefs[i].name = pr->pr_globalddefs[i].s_name;
+		pr->pr_globaldefs[i].type = global_ddefs[i].type;
+		pr->pr_globaldefs[i].ofs = global_ddefs[i].ofs;
+		pr->pr_globaldefs[i].name = global_ddefs[i].s_name;
 		Hash_Add (pr->global_hash, &pr->pr_globaldefs[i]);
 	}
 
@@ -295,15 +296,15 @@ PR_LoadProgsFile (progs_t *pr, QFile *file, int size)
 	}
 	pr->pr_fielddefs = calloc (pr->progs->numfielddefs, sizeof (pr_def_t));
 	for (i = 0; i < pr->progs->numfielddefs; i++) {
-		pr->pr_fieldddefs[i].type = LittleShort (pr->pr_fieldddefs[i].type);
-		if (pr->pr_fielddefs[i].type & DEF_SAVEGLOBAL)
-			PR_Error (pr, "PR_LoadProgs: pr_fielddefs[i].type & DEF_SAVEGLOBAL");
-		pr->pr_fieldddefs[i].ofs = LittleShort (pr->pr_fieldddefs[i].ofs);
-		pr->pr_fieldddefs[i].s_name = LittleLong (pr->pr_fieldddefs[i].s_name);
+		field_ddefs[i].type = LittleShort (field_ddefs[i].type);
+		if (field_ddefs[i].type & DEF_SAVEGLOBAL)
+			PR_Error (pr, "PR_LoadProgs: DEF_SAVEGLOBAL on field def %zd", i);
+		field_ddefs[i].ofs = LittleShort (field_ddefs[i].ofs);
+		field_ddefs[i].s_name = LittleLong (field_ddefs[i].s_name);
 
-		pr->pr_fielddefs[i].type = pr->pr_fieldddefs[i].type;
-		pr->pr_fielddefs[i].ofs = pr->pr_fieldddefs[i].ofs;
-		pr->pr_fielddefs[i].name = pr->pr_fieldddefs[i].s_name;
+		pr->pr_fielddefs[i].type = field_ddefs[i].type;
+		pr->pr_fielddefs[i].ofs = field_ddefs[i].ofs;
+		pr->pr_fielddefs[i].name = field_ddefs[i].s_name;
 		Hash_Add (pr->field_hash, &pr->pr_fielddefs[i]);
 	}
 
diff --git a/tools/qfcc/source/qfprogs.c b/tools/qfcc/source/qfprogs.c
index e113912fb..28d9141c5 100644
--- a/tools/qfcc/source/qfprogs.c
+++ b/tools/qfcc/source/qfprogs.c
@@ -259,6 +259,8 @@ convert_qfo (void)
 	xdef_t     *xdef = 0;
 	pr_xdefs_t *xdefs = 0;
 	ddef_t     *xdefs_def = 0;
+	ddef_t     *global_ddefs;
+	ddef_t     *field_ddefs;
 
 	pr.progs = qfo_to_progs (qfo, &size);
 
@@ -267,8 +269,8 @@ convert_qfo (void)
 	pr.pr_strings = P (char, ofs_strings);
 	pr.pr_stringsize = pr.progs->numstrings;
 	pr.pr_functions = P (dfunction_t, ofs_functions);
-	pr.pr_globalddefs = P (ddef_t, ofs_globaldefs);
-	pr.pr_fieldddefs = P (ddef_t, ofs_fielddefs);
+	global_ddefs = P (ddef_t, ofs_globaldefs);
+	field_ddefs = P (ddef_t, ofs_fielddefs);
 	pr.pr_globals = P (pr_type_t, ofs_globals);
 	pr.globals_size = pr.progs->numglobals;
 	pr.pr_edict_size = max (1, pr.progs->entityfields) * 4;
@@ -278,9 +280,10 @@ convert_qfo (void)
 	pr.pr_globaldefs = malloc ((pr.progs->numglobaldefs
 								+ pr.progs->numfielddefs)
 							   * sizeof (pr_def_t));
+	pr.pr_fielddefs = pr.pr_globaldefs + pr.progs->numglobaldefs;
 	// can't use PR_FindGlobal yet as pr_globaldefs is still uninitialized
 	for (i = 0; i < (int) pr.progs->numglobaldefs; i++) {
-		ddef_t     *ddef = pr.pr_globalddefs + i;
+		ddef_t     *ddef = global_ddefs + i;
 		if (!strcmp (PR_GetString (&pr, ddef->s_name), ".xdefs")) {
 			xdefs_def = ddef;
 			break;
@@ -291,7 +294,7 @@ convert_qfo (void)
 		xdef = &G_STRUCT (&pr, xdef_t, xdefs->xdefs);
 	}
 	for (i = 0; i < (int) pr.progs->numglobaldefs; i++, xdef++) {
-		ddef_t     *ddef = pr.pr_globalddefs + i;
+		ddef_t     *ddef = global_ddefs + i;
 		pr_def_t   *def = pr.pr_globaldefs + i;
 		def->type = ddef->type;
 		def->ofs = xdefs ? xdef->ofs : ddef->ofs;
@@ -299,7 +302,7 @@ convert_qfo (void)
 		def->type_encoding = xdefs ? xdef->type : 0;
 	}
 	for (i = 0; i < (int) pr.progs->numfielddefs; i++, xdef++) {
-		ddef_t     *ddef = pr.pr_fieldddefs + i;
+		ddef_t     *ddef = field_ddefs + i;
 		pr_def_t   *def = pr.pr_fielddefs + i;
 		def->type = ddef->type;
 		def->ofs = xdefs ? xdef->ofs : ddef->ofs;

From 3aabfa71d986e75d7489dd58f3cefa3ce5a8b608 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 22 Feb 2020 23:33:56 +0900
Subject: [PATCH 0461/1519] Find lost type encoding relocations

I have no idea why I thought it was a good idea to delete those lines.
Yay for regression tests, though.
---
 tools/qfcc/source/obj_file.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/qfcc/source/obj_file.c b/tools/qfcc/source/obj_file.c
index f79bed688..8d7250abc 100644
--- a/tools/qfcc/source/obj_file.c
+++ b/tools/qfcc/source/obj_file.c
@@ -1013,6 +1013,10 @@ qfo_to_progs (qfo_t *qfo, int *size)
 		globaldefs++;
 	}
 
+	for (i = 0; i < qfo->spaces[qfo_type_space].num_defs; i++) {
+		qfo->spaces[qfo_type_space].defs[i].offset += type_encodings_start;
+	}
+
 	for (i = 0; i < qfo->spaces[qfo_entity_space].num_defs; i++) {
 		convert_def (qfo, qfo->spaces[qfo_entity_space].defs + i,
 					 fielddefs + i);

From 52d54f98bfecd16674ec71bae798ad36bc3150db Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 22 Feb 2020 23:41:09 +0900
Subject: [PATCH 0462/1519] Fix some issues in the typedef test

It wasn't being strict enough in the test (but was good enough to catch
the relocation error, at least) and was printing the alias name
incorrectly.
---
 tools/qfcc/test/typedef.r | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/tools/qfcc/test/typedef.r b/tools/qfcc/test/typedef.r
index bb5d52e4a..e6e80a92b 100644
--- a/tools/qfcc/test/typedef.r
+++ b/tools/qfcc/test/typedef.r
@@ -22,10 +22,12 @@ next_type (qfot_type_t *type)
 }
 
 int
-check_alias (qfot_type_t *alias)
+check_alias (string name, qfot_type_t *alias)
 {
-	if (alias.meta != ty_basic && alias.t.type != ev_pointer) {
-		printf ("%s is not a *int alias\n", alias.t.alias.name);
+	if (alias.meta != ty_basic || alias.t.type != ev_pointer
+		|| alias.t.fldptr.aux_type.meta != ty_basic
+		|| alias.t.fldptr.aux_type.t.type != ev_integer) {
+		printf ("%s is not a *int alias\n", name);
 		return 0;
 	}
 	return 1;
@@ -47,10 +49,12 @@ main (void)
 		type = next_type (type)) {
 		if (type.meta == ty_alias) {
 			if (type.t.alias.name == "foo") {
-				found_foo = check_alias (type.t.alias.aux_type);
+				found_foo = check_alias (type.t.alias.name,
+										 type.t.alias.aux_type);
 			}
 			if (type.t.alias.name == "bar") {
-				found_bar = check_alias (type.t.alias.aux_type);
+				found_bar = check_alias (type.t.alias.name,
+										 type.t.alias.aux_type);
 			}
 		}
 	}

From f8b1a3a89fdb40cdf4463c467388dd2ddd365071 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 23 Feb 2020 11:41:19 +0900
Subject: [PATCH 0463/1519] Return the previous sys print callbacks

This allows for temporary overrides.
---
 include/QF/sys.h | 4 ++--
 libs/util/sys.c  | 8 ++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/include/QF/sys.h b/include/QF/sys.h
index 10ef6999f..76b6ad844 100644
--- a/include/QF/sys.h
+++ b/include/QF/sys.h
@@ -65,8 +65,8 @@ int Sys_mkdir (const char *path);
 typedef void (*sys_printf_t) (const char *fmt, va_list args) __attribute__((format(printf, 1, 0)));
 typedef void (*sys_error_t) (void *data);
 
-void Sys_SetStdPrintf (sys_printf_t func);
-void Sys_SetErrPrintf (sys_printf_t func);
+sys_printf_t Sys_SetStdPrintf (sys_printf_t func);
+sys_printf_t Sys_SetErrPrintf (sys_printf_t func);
 
 void Sys_PushErrorHandler (sys_error_t func, void *data);
 void Sys_PopErrorHandler (void);
diff --git a/libs/util/sys.c b/libs/util/sys.c
index b2e28f71d..62ddfa35b 100644
--- a/libs/util/sys.c
+++ b/libs/util/sys.c
@@ -240,16 +240,20 @@ Sys_FileExists (const char *path)
 	for want of a better name, but it sets the function pointer for the
 	actual implementation of Sys_Printf.
 */
-VISIBLE void
+VISIBLE sys_printf_t
 Sys_SetStdPrintf (sys_printf_t func)
 {
+	sys_printf_t prev = sys_std_printf_function;
 	sys_std_printf_function = func;
+	return prev;
 }
 
-VISIBLE void
+VISIBLE sys_printf_t
 Sys_SetErrPrintf (sys_printf_t func)
 {
+	sys_printf_t prev = sys_err_printf_function;
 	sys_err_printf_function = func;
+	return prev;
 }
 
 void

From 6c6433dea5bb6643747960f77d430afaf6c11ff9 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 23 Feb 2020 11:52:35 +0900
Subject: [PATCH 0464/1519] Fetch the def name only once when scanning

Not that speed is critical at this point, but it feels better.
---
 tools/qfcc/source/obj_file.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/qfcc/source/obj_file.c b/tools/qfcc/source/obj_file.c
index 8d7250abc..15fc0fdf0 100644
--- a/tools/qfcc/source/obj_file.c
+++ b/tools/qfcc/source/obj_file.c
@@ -997,9 +997,10 @@ qfo_to_progs (qfo_t *qfo, int *size)
 
 	for (i = 0; i < qfo->spaces[qfo_near_data_space].num_defs; i++) {
 		qfo_def_t  *def = qfo->spaces[qfo_near_data_space].defs + i;
-		if (!strcmp (QFO_GETSTR (qfo, def->name), ".type_encodings"))
+		const char *defname = QFO_GETSTR (qfo, def->name);
+		if (!strcmp (defname, ".type_encodings"))
 			types_def = def;
-		if (!strcmp (QFO_GETSTR (qfo, def->name), ".xdefs"))
+		if (!strcmp (defname, ".xdefs"))
 			xdefs_def = def;
 		convert_def (qfo, def, globaldefs++);
 	}

From 155a633ebe0455b334e8d5605055fe4a5653e638 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 23 Feb 2020 11:53:57 +0900
Subject: [PATCH 0465/1519] Include extended defs data in the size report

---
 tools/qfcc/source/obj_file.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/tools/qfcc/source/obj_file.c b/tools/qfcc/source/obj_file.c
index 15fc0fdf0..735a68ab0 100644
--- a/tools/qfcc/source/obj_file.c
+++ b/tools/qfcc/source/obj_file.c
@@ -891,6 +891,8 @@ qfo_to_progs (qfo_t *qfo, int *size)
 	int         xdefs_start;
 	unsigned    big_locals = 0;
 	int         big_func = 0;
+	pr_xdefs_t *xdefs;
+	xdef_t     *xdef;
 
 	*size = RUP (sizeof (dprograms_t), 16);
 	progs = calloc (1, *size);
@@ -1046,8 +1048,8 @@ qfo_to_progs (qfo_t *qfo, int *size)
 		encodings->size = qfo->spaces[qfo_type_space].data_size;
 	}
 	if (xdefs_def) {
-		pr_xdefs_t *xdefs = (pr_xdefs_t *) &globals[xdefs_def->offset];
-		xdef_t     *xdef = (xdef_t *) xdef_data;
+		xdefs = (pr_xdefs_t *) &globals[xdefs_def->offset];
+		xdef = (xdef_t *) xdef_data;
 		xdefs->xdefs = xdefs_start;
 		xdefs->num_xdefs = progs->numglobaldefs + progs->numfielddefs;
 		for (i = 0; i < qfo->spaces[qfo_near_data_space].num_defs;
@@ -1091,7 +1093,7 @@ qfo_to_progs (qfo_t *qfo, int *size)
 		printf ("%6i statements\n", progs->numstatements);
 		printf ("%6i functions\n", progs->numfunctions);
 		printf ("%6i global defs\n", progs->numglobaldefs);
-		printf ("%6i fielddefs\n", progs->numfielddefs);
+		printf ("%6i field defs\n", progs->numfielddefs);
 		printf ("%6i globals\n", progs->numglobals);
 		printf ("    %6i near globals\n", near_data_size);
 		printf ("        %6i locals size%s\n", locals_size, big_function);
@@ -1099,6 +1101,10 @@ qfo_to_progs (qfo_t *qfo, int *size)
 				qfo->spaces[qfo_far_data_space].data_size);
 		printf ("    %6i type globals\n",
 				qfo->spaces[qfo_type_space].data_size);
+		if (xdefs) {
+			printf ("    %6i extended defs\n",
+					xdefs->num_xdefs * type_size (&type_xdef));
+		}
 		printf ("%6i entity fields\n", progs->entityfields);
 	}
 

From 81293d98dd2d236d647c1b6e2e72a33ba63b2bc7 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 23 Feb 2020 14:39:02 +0900
Subject: [PATCH 0466/1519] Fix qfo line info dumping

The addition of xdef data has made qfo_to_progs unusable in qfprogs,
resulting in various invalid memory accesses. It always was an ugly hack
anyway, so this is the first step to proper qfo support in qfprogs.
---
 tools/qfcc/include/qfprogs.h   |   1 +
 tools/qfcc/source/dump_lines.c | 164 ++++++++++++++++++++++++++-------
 tools/qfcc/source/qfprogs.c    |  94 +------------------
 3 files changed, 139 insertions(+), 120 deletions(-)

diff --git a/tools/qfcc/include/qfprogs.h b/tools/qfcc/include/qfprogs.h
index 09fade09d..bb64b3fb6 100644
--- a/tools/qfcc/include/qfprogs.h
+++ b/tools/qfcc/include/qfprogs.h
@@ -56,6 +56,7 @@ void dump_strings (struct progs_s *pr);
 
 void qfo_globals (struct qfo_s *qfo);
 void qfo_functions (struct qfo_s *qfo);
+void qfo_lines (struct qfo_s *qfo);
 void qfo_relocs (struct qfo_s *qfo);
 void qfo_types (struct qfo_s *qfo);
 
diff --git a/tools/qfcc/source/dump_lines.c b/tools/qfcc/source/dump_lines.c
index 847bdb5c2..ae504c03d 100644
--- a/tools/qfcc/source/dump_lines.c
+++ b/tools/qfcc/source/dump_lines.c
@@ -41,49 +41,151 @@
 #include <stdlib.h>
 
 #include "QF/progs.h"
+#include "QF/pr_type.h"
 
+#include "obj_file.h"
 #include "qfprogs.h"
 
-void
-dump_lines (progs_t *pr)
+typedef struct {
+	const char *source_name;
+	const char *source_file;
+	pr_uint_t   source_line;
+	pr_int_t    first_statement;
+	pointer_t   return_type;
+	pr_uint_t   local_defs;
+	pr_uint_t   num_locals;
+	pr_uint_t   line_info;
+	pr_uint_t   function;
+} func_data_t;
+
+typedef func_data_t *(*get_func_data_t)(unsigned func, void *data);
+
+static func_data_t *
+progs_get_func_data (unsigned func_index, void *data)
 {
-	unsigned int i, line, addr;
-	pr_lineno_t *lineno;
-	pr_auxfunction_t *aux_func = 0;
-	dfunction_t *func = 0;
+	static func_data_t func_data;
+	progs_t    *pr = (progs_t *) data;
+	pr_auxfunction_t *aux_func;
+	dfunction_t *func;
 
-	if (!pr->debug)
-		return;
-	for (i = 0; i < pr->debug->num_linenos; i++) {
-		lineno = &pr->linenos[i];
+	memset (&func_data, 0, sizeof (func_data));
+	if (func_index < pr->debug->num_auxfunctions) {
+		aux_func = pr->auxfunctions + func_index;
+		func_data.source_line = aux_func->source_line;
+		func_data.return_type = aux_func->return_type;
+		func_data.num_locals = aux_func->num_locals;
+		func_data.local_defs = aux_func->local_defs;
+		func_data.line_info = aux_func->line_info;
+		func_data.function = aux_func->function;
+		if (aux_func->function < (unsigned int) pr->progs->numfunctions) {
+			func = pr->pr_functions + aux_func->function;
+			func_data.source_file = pr->pr_strings + func->s_file;
+			func_data.source_name = pr->pr_strings + func->s_name;
+			func_data.first_statement = func->first_statement;
+		}
+		return &func_data;
+	}
+	return 0;
+}
 
+static void
+dump_line_set (pr_lineno_t *lineno, unsigned count,
+			   get_func_data_t get_func_data, void *data)
+{
+	unsigned int line, addr;
+	func_data_t *func_data = 0;
+
+	for (; count-- > 0; lineno++) {
 		if (!lineno->line) {
-			aux_func = 0;
-			func = 0;
-			if (lineno->fa.func < pr->debug->num_auxfunctions)
-				aux_func = pr->auxfunctions + lineno->fa.func;
-			if (aux_func
-				&& aux_func->function < (unsigned int) pr->progs->numfunctions)
-				func = pr->pr_functions + aux_func->function;
+			func_data = get_func_data(lineno->fa.func, data);
 		}
 
 		printf ("%5u %5u", lineno->fa.addr, lineno->line);
 		line = addr = -1;
-		if (aux_func)
-			line = aux_func->source_line + lineno->line;
-		if (func)
-			addr = lineno->line ? lineno->fa.addr
-								: (unsigned int) func->first_statement;
-		if (aux_func && func)
-			printf (" %05x %s:%u %s+%u %d", addr, pr->pr_strings + func->s_file,
-					line, pr->pr_strings + func->s_name,
-					addr - func->first_statement, aux_func->return_type);
-		else if (aux_func)
-			printf ("%u %u %u %u %u %d", aux_func->function, line,
-					aux_func->line_info, aux_func->local_defs,
-					aux_func->num_locals, aux_func->return_type);
-		else if (lineno->line)
+		if (func_data) {
+			line = func_data->source_line + lineno->line;
+			if (func_data->source_name) {
+				addr = lineno->line ? (pr_int_t) lineno->fa.addr
+									: func_data->first_statement;
+				printf (" %05x %s:%u %s+%u %d", addr, func_data->source_file,
+						line, func_data->source_name,
+						addr - func_data->first_statement,
+						func_data->return_type);
+			} else {
+				printf ("%u %u %u %u %u %d", func_data->function, line,
+						func_data->line_info, func_data->local_defs,
+						func_data->num_locals, func_data->return_type);
+			}
+		} else if (lineno->line) {
 			printf ("%5x", lineno->fa.addr);
+		}
 		printf ("\n");
 	}
 }
+
+void
+dump_lines (progs_t *pr)
+{
+	if (!pr->debug)
+		return;
+	dump_line_set (pr->linenos, pr->debug->num_linenos,
+				   progs_get_func_data, pr);
+}
+
+static func_data_t *
+qfo_get_func_data (unsigned func_index, void *data)
+{
+	return (func_data_t *) data;
+}
+
+static void
+qfo_set_func_data (qfo_t *qfo, qfo_func_t *func, func_data_t *func_data)
+{
+	qfot_type_t *type;
+
+	func_data->source_line = func->line;
+	//FIXME check type
+	type = QFO_POINTER (qfo, qfo_type_space, qfot_type_t, func->type);
+	func_data->return_type = type->t.func.return_type;
+	func_data->num_locals = -1;
+	if (func->locals_space < qfo->num_spaces) {
+		func_data->num_locals = qfo->spaces[func->locals_space].num_defs;
+	}
+	func_data->local_defs = func->locals_space;
+	func_data->line_info = func->line_info;
+	func_data->function = func - qfo->funcs;
+	func_data->source_file = QFO_GETSTR (qfo, func->file);
+	func_data->source_name = QFO_GETSTR (qfo, func->name);
+	func_data->first_statement = func->code;
+}
+
+void
+qfo_lines (qfo_t *qfo)
+{
+	static func_data_t func_data;
+	pr_lineno_t *start_lineno = 0;
+	pr_lineno_t *lineno;
+	qfo_func_t  *func = 0;
+
+	for (func = qfo->funcs; func - qfo->funcs < qfo->num_funcs; func++) {
+		if (!func->line_info) {
+			// builtin
+			continue;
+		}
+		if (func->line_info >= qfo->num_lines) {
+			printf ("%s: bad line info: %u >= %u\n",
+					QFO_GETSTR (qfo, func->name),
+					func->line_info, qfo->num_lines);
+			continue;
+		}
+		qfo_set_func_data(qfo, func, &func_data);
+		start_lineno = qfo->lines + func->line_info;
+		for (lineno = start_lineno + 1;
+			 lineno - qfo->lines < qfo->num_lines && lineno->line;
+			 lineno++)
+		{
+		}
+		dump_line_set (start_lineno, lineno-start_lineno,
+					   qfo_get_func_data, &func_data);
+	}
+}
diff --git a/tools/qfcc/source/qfprogs.c b/tools/qfcc/source/qfprogs.c
index 28d9141c5..692a4f5ed 100644
--- a/tools/qfcc/source/qfprogs.c
+++ b/tools/qfcc/source/qfprogs.c
@@ -128,7 +128,6 @@ static edict_t *edicts;
 static int      num_edicts;
 static int      reserved_edicts = 1;
 static progs_t  pr;
-static int      need_progs;
 static qfo_t   *qfo;
 
 static const char *source_path = "";
@@ -234,7 +233,7 @@ init_qf (void)
 {
 	Sys_Init ();
 
-	Cvar_Get ("pr_debug", va ("%d", verbosity), 0, 0, "");
+	Cvar_Get ("pr_debug", va ("%d", 1+verbosity), 0, 0, "");
 	Cvar_Get ("pr_source_path", source_path, 0, 0, "");
 	PR_Init_Cvars ();
 	PR_Init ();
@@ -251,87 +250,6 @@ init_qf (void)
 	Hash_SetHashCompare (func_tab, func_hash, func_compare);
 }
 
-static void
-convert_qfo (void)
-{
-	int         size;
-	int         i;
-	xdef_t     *xdef = 0;
-	pr_xdefs_t *xdefs = 0;
-	ddef_t     *xdefs_def = 0;
-	ddef_t     *global_ddefs;
-	ddef_t     *field_ddefs;
-
-	pr.progs = qfo_to_progs (qfo, &size);
-
-#define P(t,o) ((t *)((char *)pr.progs + pr.progs->o))
-	pr.pr_statements = P (dstatement_t, ofs_statements);
-	pr.pr_strings = P (char, ofs_strings);
-	pr.pr_stringsize = pr.progs->numstrings;
-	pr.pr_functions = P (dfunction_t, ofs_functions);
-	global_ddefs = P (ddef_t, ofs_globaldefs);
-	field_ddefs = P (ddef_t, ofs_fielddefs);
-	pr.pr_globals = P (pr_type_t, ofs_globals);
-	pr.globals_size = pr.progs->numglobals;
-	pr.pr_edict_size = max (1, pr.progs->entityfields) * 4;
-	pr.pr_edictareasize = 1 * pr.pr_edict_size;
-#undef P
-
-	pr.pr_globaldefs = malloc ((pr.progs->numglobaldefs
-								+ pr.progs->numfielddefs)
-							   * sizeof (pr_def_t));
-	pr.pr_fielddefs = pr.pr_globaldefs + pr.progs->numglobaldefs;
-	// can't use PR_FindGlobal yet as pr_globaldefs is still uninitialized
-	for (i = 0; i < (int) pr.progs->numglobaldefs; i++) {
-		ddef_t     *ddef = global_ddefs + i;
-		if (!strcmp (PR_GetString (&pr, ddef->s_name), ".xdefs")) {
-			xdefs_def = ddef;
-			break;
-		}
-	}
-	if (xdefs_def) {
-		xdefs = &G_STRUCT (&pr, pr_xdefs_t, xdefs_def->ofs);
-		xdef = &G_STRUCT (&pr, xdef_t, xdefs->xdefs);
-	}
-	for (i = 0; i < (int) pr.progs->numglobaldefs; i++, xdef++) {
-		ddef_t     *ddef = global_ddefs + i;
-		pr_def_t   *def = pr.pr_globaldefs + i;
-		def->type = ddef->type;
-		def->ofs = xdefs ? xdef->ofs : ddef->ofs;
-		def->name = ddef->s_name;
-		def->type_encoding = xdefs ? xdef->type : 0;
-	}
-	for (i = 0; i < (int) pr.progs->numfielddefs; i++, xdef++) {
-		ddef_t     *ddef = field_ddefs + i;
-		pr_def_t   *def = pr.pr_fielddefs + i;
-		def->type = ddef->type;
-		def->ofs = xdefs ? xdef->ofs : ddef->ofs;
-		def->name = ddef->s_name;
-		def->type_encoding = xdefs ? xdef->type : 0;
-	}
-
-	if (verbosity) {
-		pr.debug = qfo_to_sym (qfo, &size);
-#define P(t,o) ((t *)((char *)pr.debug + pr.debug->o))
-		pr.auxfunctions = P (pr_auxfunction_t, auxfunctions);
-		pr.linenos = P (pr_lineno_t, linenos);
-		pr.local_defs = P (pr_def_t, locals);
-#undef P
-
-		pr.local_defs = calloc (qfo->num_defs, sizeof (ddef_t));
-
-		pr.auxfunction_map = calloc (pr.progs->numfunctions,
-									 sizeof (pr_auxfunction_t *));
-		for (i = 0; (int) i < pr.progs->numfunctions; i++)	//FIXME (cast)
-			pr.auxfunction_map[i] = 0;
-
-		for (i = 0; i < (int) pr.debug->num_auxfunctions; i++) {
-			pr_auxfunction_t *aux = pr.auxfunctions + i;
-			pr.auxfunction_map[aux->function] = aux;
-		}
-	}
-}
-
 static int
 load_progs (const char *name)
 {
@@ -349,6 +267,7 @@ load_progs (const char *name)
 	Qread (file, buff, 4);
 	buff[4] = 0;
 	Qseek (file, 0, SEEK_SET);
+	qfo = 0;
 	if (!strcmp (buff, QFO)) {
 		qfo = qfo_read (file);
 		Qclose (file);
@@ -356,9 +275,7 @@ load_progs (const char *name)
 		if (!qfo)
 			return 0;
 
-		if (!need_progs)
-			return 1;
-		convert_qfo ();
+		return 1;
 	} else {
 		pr.progs_name = name;
 		pr.max_edicts = 1;
@@ -392,7 +309,7 @@ operation_t operations[] = {
 	{dump_strings,		0},					// strings
 	{dump_fields,		0},					// fields
 	{dump_functions,	qfo_functions},		// functions
-	{dump_lines,		0},					// lines
+	{dump_lines,		qfo_lines},			// lines
 	{dump_modules,		0},					// modules
 	{0,					qfo_relocs},		// relocs
 	{dump_types,		qfo_types},			// types
@@ -451,12 +368,11 @@ main (int argc, char **argv)
 	}
 	init_qf ();
 	while (optind < argc) {
-		need_progs = !func->qfo;
 		if (!load_progs (argv[optind++]))
 			return 1;
 		if (qfo && func->qfo)
 			func->qfo (qfo);
-		else if (func->progs)
+		else if (!qfo && func->progs)
 			func->progs (&pr);
 		else
 			fprintf (stderr, "can't process %s\n", argv[optind - 1]);

From b0157e509559a8a403dcd882f0d27fd43bc94baa Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 23 Feb 2020 14:56:50 +0900
Subject: [PATCH 0467/1519] Fix qfo field dumping

---
 tools/qfcc/include/qfprogs.h     |  1 +
 tools/qfcc/source/dump_globals.c | 35 ++++++++++++++++++++++++++++++++
 tools/qfcc/source/qfprogs.c      |  2 +-
 3 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/tools/qfcc/include/qfprogs.h b/tools/qfcc/include/qfprogs.h
index bb64b3fb6..22a4574c4 100644
--- a/tools/qfcc/include/qfprogs.h
+++ b/tools/qfcc/include/qfprogs.h
@@ -55,6 +55,7 @@ struct dfunction_s *func_find (int st_num);
 void dump_strings (struct progs_s *pr);
 
 void qfo_globals (struct qfo_s *qfo);
+void qfo_fields (struct qfo_s *qfo);
 void qfo_functions (struct qfo_s *qfo);
 void qfo_lines (struct qfo_s *qfo);
 void qfo_relocs (struct qfo_s *qfo);
diff --git a/tools/qfcc/source/dump_globals.c b/tools/qfcc/source/dump_globals.c
index 79024313b..ea94f5d9d 100644
--- a/tools/qfcc/source/dump_globals.c
+++ b/tools/qfcc/source/dump_globals.c
@@ -192,6 +192,41 @@ dump_fields (progs_t *pr)
 	}
 }
 
+void
+qfo_fields (qfo_t *qfo)
+{
+	unsigned int i;
+	const char *name;
+	const char *typestr;
+	qfot_type_t *type;
+	int         offset;
+	const char *comment;
+	qfo_mspace_t *space = &qfo->spaces[qfo_entity_space];
+
+	if (qfo_entity_space >= qfo->num_spaces) {
+		printf ("no entity space\n");
+		return;
+	}
+	if (!space->num_defs) {
+		printf ("no fields\n");
+		return;
+	}
+
+	for (i = 0; i < space->num_defs; i++) {
+		qfo_def_t  *def = space->defs + i;
+
+		name = QFO_GETSTR (qfo, def->name);
+		//FIXME check type
+		type = QFO_POINTER (qfo, qfo_type_space, qfot_type_t, def->type);
+		typestr = QFO_GETSTR (qfo, type->encoding);
+		offset = def->offset;
+
+		comment = "";
+
+		printf ("%d %s %s%s\n", offset, name, typestr, comment);
+	}
+}
+
 void
 dump_functions (progs_t *pr)
 {
diff --git a/tools/qfcc/source/qfprogs.c b/tools/qfcc/source/qfprogs.c
index 692a4f5ed..1ff2e6a85 100644
--- a/tools/qfcc/source/qfprogs.c
+++ b/tools/qfcc/source/qfprogs.c
@@ -307,7 +307,7 @@ operation_t operations[] = {
 	{disassemble_progs, 0},					// disassemble
 	{dump_globals,		qfo_globals},		// globals
 	{dump_strings,		0},					// strings
-	{dump_fields,		0},					// fields
+	{dump_fields,		qfo_fields},		// fields
 	{dump_functions,	qfo_functions},		// functions
 	{dump_lines,		qfo_lines},			// lines
 	{dump_modules,		0},					// modules

From 6009d1d02384fede00a5c53b1b4e18cf1461a9a5 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 23 Feb 2020 15:08:31 +0900
Subject: [PATCH 0468/1519] Fix qfo strings dumping

---
 tools/qfcc/include/qfprogs.h     |  1 +
 tools/qfcc/source/dump_strings.c | 42 ++++++++++++++++++++++++--------
 tools/qfcc/source/qfprogs.c      |  2 +-
 3 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/tools/qfcc/include/qfprogs.h b/tools/qfcc/include/qfprogs.h
index 22a4574c4..731a61194 100644
--- a/tools/qfcc/include/qfprogs.h
+++ b/tools/qfcc/include/qfprogs.h
@@ -59,6 +59,7 @@ void qfo_fields (struct qfo_s *qfo);
 void qfo_functions (struct qfo_s *qfo);
 void qfo_lines (struct qfo_s *qfo);
 void qfo_relocs (struct qfo_s *qfo);
+void qfo_strings (struct qfo_s *qfo);
 void qfo_types (struct qfo_s *qfo);
 
 #endif//__qfprogs_h
diff --git a/tools/qfcc/source/dump_strings.c b/tools/qfcc/source/dump_strings.c
index 91d6ca2ba..fc0c0cb7d 100644
--- a/tools/qfcc/source/dump_strings.c
+++ b/tools/qfcc/source/dump_strings.c
@@ -36,21 +36,22 @@
 #include "QF/progs.h"
 #include "QF/sys.h"
 
+#include "obj_file.h"
 #include "qfprogs.h"
 
-void
-dump_strings (progs_t *pr)
+static void
+dump_string_block (const char *strblock, unsigned size)
 {
-	int i = 0;
-	char *s = pr->pr_strings;
+	const char *s = strblock;
 
 	printf ("%d ", 0);
-	while (i++ < pr->progs->numstrings) {
-		switch (*s) {
+	while (s - strblock < size) {
+		char        c = *s++;
+		switch (c) {
 			case 0:
 				fputs ("\n", stdout);
-				if (i < pr->progs->numstrings)
-					printf ("%d ", i);
+				if (s - strblock < size)
+					printf ("%ld ", s - strblock);
 				break;
 			case 9:
 				fputs ("\\t", stdout);
@@ -62,9 +63,30 @@ dump_strings (progs_t *pr)
 				fputs ("\\r", stdout);
 				break;
 			default:
-				fputc (sys_char_map[(unsigned char)*s], stdout);
+				fputc (sys_char_map[(unsigned char)c], stdout);
 				break;
 		}
-		s++;
 	}
 }
+
+void
+dump_strings (progs_t *pr)
+{
+	dump_string_block (pr->pr_strings, pr->progs->numstrings);
+}
+
+void
+qfo_strings (qfo_t *qfo)
+{
+	qfo_mspace_t *space = &qfo->spaces[qfo_strings_space];
+
+	if (qfo_strings_space >= qfo->num_spaces) {
+		printf ("no strings space\n");
+		return;
+	}
+	if (!space->data_size) {
+		printf ("no strings\n");
+		return;
+	}
+	dump_string_block (space->d.strings, space->data_size);
+}
diff --git a/tools/qfcc/source/qfprogs.c b/tools/qfcc/source/qfprogs.c
index 1ff2e6a85..42c91b9ed 100644
--- a/tools/qfcc/source/qfprogs.c
+++ b/tools/qfcc/source/qfprogs.c
@@ -306,7 +306,7 @@ typedef struct {
 operation_t operations[] = {
 	{disassemble_progs, 0},					// disassemble
 	{dump_globals,		qfo_globals},		// globals
-	{dump_strings,		0},					// strings
+	{dump_strings,		qfo_strings},		// strings
 	{dump_fields,		qfo_fields},		// fields
 	{dump_functions,	qfo_functions},		// functions
 	{dump_lines,		qfo_lines},			// lines

From 4b7ecdf74a2ce15316879bcdb0c4d0e646d61100 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 23 Feb 2020 15:56:36 +0900
Subject: [PATCH 0469/1519] Make PR_Init take an instance to initialize

This allows internal sub-systems to do per-instance initializations
without other engine systems having to know about them.
---
 include/QF/pr_comp.h           | 2 +-
 include/QF/progs.h             | 8 ++++++--
 libs/console/menu.c            | 2 ++
 libs/gamecode/pr_debug.c       | 2 +-
 libs/gamecode/pr_load.c        | 7 ++++---
 libs/gamecode/pr_opcode.c      | 4 ++++
 libs/ruamoko/rua_init.c        | 1 -
 nq/source/host.c               | 5 -----
 nq/source/sv_progs.c           | 5 +++++
 qw/source/cl_main.c            | 4 +---
 qw/source/sv_main.c            | 3 ---
 qw/source/sv_progs.c           | 6 ++++++
 tools/qfcc/source/qfprogs.c    | 3 ++-
 tools/qfcc/test/test-harness.c | 2 +-
 tools/qwaq/main.c              | 2 +-
 tools/qwaq/qwaq.c              | 2 +-
 16 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/include/QF/pr_comp.h b/include/QF/pr_comp.h
index d1865d1cc..9df0416d3 100644
--- a/include/QF/pr_comp.h
+++ b/include/QF/pr_comp.h
@@ -409,7 +409,7 @@ typedef struct opcode_s {
 
 extern opcode_t pr_opcodes[];
 opcode_t *PR_Opcode (pr_short_t opcode);
-void PR_Opcode_Init (void);
+void PR_Opcode_Init (void);	// idempotent
 
 typedef struct dstatement_s {
 	pr_opcode_e op:16;
diff --git a/include/QF/progs.h b/include/QF/progs.h
index a413b2f25..a07f70534 100644
--- a/include/QF/progs.h
+++ b/include/QF/progs.h
@@ -53,8 +53,12 @@ typedef struct edict_s edict_t;
 ///@{
 
 /** Initialize the progs engine.
+
+	The first call will initialize subsystems common to all progs instances.
+
+	\param pr		The progs engine instance to initialize.
 */
-void PR_Init (void);
+void PR_Init (progs_t *pr);
 
 /** Initialize the Cvars for the progs engine. Call before calling PR_Init().
 */
@@ -1488,7 +1492,7 @@ void *PR_Zone_Realloc (progs_t *pr, void *ptr, pr_int_t size);
 /// \addtogroup debug
 ///@{
 
-void PR_Debug_Init (void);
+void PR_Debug_Init (progs_t *pr);
 void PR_Debug_Init_Cvars (void);
 int PR_LoadDebug (progs_t *pr);
 void PR_Debug_Watch (progs_t *pr, const char *expr);
diff --git a/libs/console/menu.c b/libs/console/menu.c
index 8320bc405..3ebf1d60a 100644
--- a/libs/console/menu.c
+++ b/libs/console/menu.c
@@ -583,6 +583,8 @@ Menu_Init (void)
 	menu_pr_state.max_edicts = 0;
 	menu_pr_state.zone_size = 1024 * 1024;
 
+	PR_Init (&menu_pr_state);
+
 	menu_hash = Hash_NewTable (61, menu_get_key, menu_free, 0);
 
 	PR_RegisterBuiltins (&menu_pr_state, builtins);
diff --git a/libs/gamecode/pr_debug.c b/libs/gamecode/pr_debug.c
index 0c388eaff..8f05793b9 100644
--- a/libs/gamecode/pr_debug.c
+++ b/libs/gamecode/pr_debug.c
@@ -200,7 +200,7 @@ error:
 }
 
 void
-PR_Debug_Init (void)
+PR_Debug_Init (progs_t *pr)
 {
 	file_hash = Hash_NewTable (1024, file_get_key, file_free, 0);
 }
diff --git a/libs/gamecode/pr_load.c b/libs/gamecode/pr_load.c
index 99136ed4f..a7dced537 100644
--- a/libs/gamecode/pr_load.c
+++ b/libs/gamecode/pr_load.c
@@ -466,10 +466,11 @@ PR_Init_Cvars (void)
 }
 
 VISIBLE void
-PR_Init (void)
+PR_Init (progs_t *pr)
 {
-	PR_Opcode_Init ();
-	PR_Debug_Init ();
+	PR_Opcode_Init ();	// idempotent
+	PR_Resources_Init (pr);
+	PR_Debug_Init (pr);
 }
 
 VISIBLE void
diff --git a/libs/gamecode/pr_opcode.c b/libs/gamecode/pr_opcode.c
index 0ad3fab4b..26ce130cb 100644
--- a/libs/gamecode/pr_opcode.c
+++ b/libs/gamecode/pr_opcode.c
@@ -1493,6 +1493,10 @@ PR_Opcode_Init (void)
 {
 	opcode_t   *op;
 
+	if (opcode_table) {
+		// already initialized
+		return;
+	}
 	opcode_table = Hash_NewTable (1021, 0, 0, 0);
 	Hash_SetHashCompare (opcode_table, opcode_get_hash, opcode_compare);
 
diff --git a/libs/ruamoko/rua_init.c b/libs/ruamoko/rua_init.c
index ab973b569..bbfc67525 100644
--- a/libs/ruamoko/rua_init.c
+++ b/libs/ruamoko/rua_init.c
@@ -56,7 +56,6 @@ RUA_Init (progs_t *pr, int secure)
 {
 	size_t      i;
 
-	PR_Resources_Init (pr);
 	for (i = 0; i < sizeof (init_funcs) / sizeof (init_funcs[0]); i++)
 		init_funcs[i] (pr, secure);
 }
diff --git a/nq/source/host.c b/nq/source/host.c
index f6b59cf8b..67b55507b 100644
--- a/nq/source/host.c
+++ b/nq/source/host.c
@@ -896,14 +896,9 @@ Host_Init (void)
 
 	Game_Init ();
 
-	PR_Init_Cvars ();
-	SV_Progs_Init_Cvars ();
-
 	if (!isDedicated)
 		CL_InitCvars ();
 
-	PR_Init ();
-
 	if (isDedicated) {
 		PI_RegisterPlugins (server_plugin_list);
 		Con_Init ("server");
diff --git a/nq/source/sv_progs.c b/nq/source/sv_progs.c
index 60ee75368..8626ade59 100644
--- a/nq/source/sv_progs.c
+++ b/nq/source/sv_progs.c
@@ -521,6 +521,8 @@ SV_LoadProgs (void)
 void
 SV_Progs_Init (void)
 {
+	SV_Progs_Init_Cvars ();
+
 	pr_gametype = "netquake";
 	sv_pr_state.edicts = &sv.edicts;
 	sv_pr_state.num_edicts = &sv.num_edicts;
@@ -531,6 +533,8 @@ SV_Progs_Init (void)
 	sv_pr_state.bi_map = bi_map;
 	sv_pr_state.resolve = resolve;
 
+	PR_Init (&sv_pr_state);
+
 	SV_PR_Cmds_Init ();
 
 	Cmd_AddCommand ("edict", ED_PrintEdict_f, "Report information on a given "
@@ -548,6 +552,7 @@ SV_Progs_Init (void)
 void
 SV_Progs_Init_Cvars (void)
 {
+	PR_Init_Cvars ();
 	sv_progs = Cvar_Get ("sv_progs", "", CVAR_NONE, NULL,
 						 "Override the default game progs.");
 	sv_progs_zone = Cvar_Get ("sv_progs_zone", "256", CVAR_NONE, NULL,
diff --git a/qw/source/cl_main.c b/qw/source/cl_main.c
index 09fb1aec2..aa223736f 100644
--- a/qw/source/cl_main.c
+++ b/qw/source/cl_main.c
@@ -1804,12 +1804,10 @@ Host_Init (void)
 
 	Netchan_Init_Cvars ();
 
-	PR_Init_Cvars ();
+	PR_Init_Cvars ();		// FIXME location
 
 	CL_Init_Cvars ();
 
-	PR_Init ();
-
 	CL_Chat_Init ();
 
 	CL_Cmd_Init ();
diff --git a/qw/source/sv_main.c b/qw/source/sv_main.c
index c69e23594..d764c012f 100644
--- a/qw/source/sv_main.c
+++ b/qw/source/sv_main.c
@@ -2523,8 +2523,6 @@ SV_Init (void)
 	Mod_Init_Cvars ();
 	Netchan_Init_Cvars ();
 	Pmove_Init_Cvars ();
-	SV_Progs_Init_Cvars ();
-	PR_Init_Cvars ();
 
 	// and now reprocess the cmdline's sets for overrides
 	Cmd_StuffCmds (sv_cbuf);
@@ -2534,7 +2532,6 @@ SV_Init (void)
 
 	Game_Init ();
 
-	PR_Init ();
 	SV_Progs_Init ();
 	Mod_Init ();
 
diff --git a/qw/source/sv_progs.c b/qw/source/sv_progs.c
index f5abeed3f..2c4ff5c3f 100644
--- a/qw/source/sv_progs.c
+++ b/qw/source/sv_progs.c
@@ -544,6 +544,8 @@ SV_LoadProgs (void)
 void
 SV_Progs_Init (void)
 {
+	SV_Progs_Init_Cvars ();
+
 	pr_gametype = "quakeworld";
 	sv_pr_state.edicts = &sv.edicts;
 	sv_pr_state.num_edicts = &sv.num_edicts;
@@ -556,6 +558,8 @@ SV_Progs_Init (void)
 	sv_pr_state.bi_map = bi_map;
 	sv_pr_state.resolve = resolve;
 
+	PR_Init (&sv_pr_state);
+
 	SV_PR_Cmds_Init ();
 	SV_PR_QWE_Init (&sv_pr_state);
 	SV_PR_CPQW_Init (&sv_pr_state);
@@ -575,6 +579,8 @@ SV_Progs_Init (void)
 void
 SV_Progs_Init_Cvars (void)
 {
+	PR_Init_Cvars ();
+
 	r_skyname = Cvar_Get ("r_skyname", "", CVAR_NONE, NULL,
 						 "Default name of skybox if none given by map");
 	sv_progs = Cvar_Get ("sv_progs", "", CVAR_NONE, NULL,
diff --git a/tools/qfcc/source/qfprogs.c b/tools/qfcc/source/qfprogs.c
index 42c91b9ed..64dab879a 100644
--- a/tools/qfcc/source/qfprogs.c
+++ b/tools/qfcc/source/qfprogs.c
@@ -236,7 +236,6 @@ init_qf (void)
 	Cvar_Get ("pr_debug", va ("%d", 1+verbosity), 0, 0, "");
 	Cvar_Get ("pr_source_path", source_path, 0, 0, "");
 	PR_Init_Cvars ();
-	PR_Init ();
 
 	pr.edicts = &edicts;
 	pr.num_edicts = &num_edicts;
@@ -246,6 +245,8 @@ init_qf (void)
 	pr.allocate_progs_mem = allocate_progs_mem;
 	pr.free_progs_mem = free_progs_mem;
 
+	PR_Init (&pr);
+
 	func_tab = Hash_NewTable (1021, 0, 0, 0);
 	Hash_SetHashCompare (func_tab, func_hash, func_compare);
 }
diff --git a/tools/qfcc/test/test-harness.c b/tools/qfcc/test/test-harness.c
index 78c657d05..cabef6ab7 100644
--- a/tools/qfcc/test/test-harness.c
+++ b/tools/qfcc/test/test-harness.c
@@ -154,7 +154,7 @@ init_qf (void)
 	pr.pr_trace = options.trace;
 
 	PR_Init_Cvars ();
-	PR_Init ();
+	PR_Init (&pr);
 	RUA_Init (&pr, 0);
 	PR_Cmds_Init(&pr);
 	BI_Init (&pr);
diff --git a/tools/qwaq/main.c b/tools/qwaq/main.c
index 035e4f73b..1ab7c027e 100644
--- a/tools/qwaq/main.c
+++ b/tools/qwaq/main.c
@@ -117,7 +117,7 @@ init_qf (void)
 	pr.no_exec_limit = 1;
 
 	PR_Init_Cvars ();
-	PR_Init ();
+	PR_Init (&pr);
 	RUA_Init (&pr, 0);
 	PR_Cmds_Init(&pr);
 	BI_Init (&pr);
diff --git a/tools/qwaq/qwaq.c b/tools/qwaq/qwaq.c
index 24a14d217..b446a02dd 100644
--- a/tools/qwaq/qwaq.c
+++ b/tools/qwaq/qwaq.c
@@ -128,7 +128,7 @@ init_qf (void)
 	pr.no_exec_limit = 1;
 
 	PR_Init_Cvars ();
-	PR_Init ();
+	PR_Init (&pr);
 	RUA_Init (&pr, 0);
 	PR_Cmds_Init (&pr);
 	BI_Init (&pr);

From b173c35eb455676a59826b700511c90352479e2e Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 23 Feb 2020 18:56:30 +0900
Subject: [PATCH 0470/1519] Rework progs debug to use the type encodings

It's only a start: the output is, if anything, slightly worse than
before, but it does have the basics going.
---
 include/QF/progs.h       |  43 +++
 libs/gamecode/pr_debug.c | 664 ++++++++++++++++++++++++++++-----------
 2 files changed, 519 insertions(+), 188 deletions(-)

diff --git a/include/QF/progs.h b/include/QF/progs.h
index a07f70534..78b3036c7 100644
--- a/include/QF/progs.h
+++ b/include/QF/progs.h
@@ -1492,6 +1492,49 @@ void *PR_Zone_Realloc (progs_t *pr, void *ptr, pr_int_t size);
 /// \addtogroup debug
 ///@{
 
+struct qfot_type_s;
+
+/**	Callback for viewing progs data
+
+	\param type		C pointer to the type definition by which to view the
+					data.
+	\param value	C pointer to the data to be viewed.
+	\param data		User data.
+*/
+typedef void (*type_view_func) (struct qfot_type_s *type, pr_type_t *value,
+								void *data);
+
+/**	Set of callbacks for viewing progs data
+
+	Each possible type has its own callback. Basic types (those for which the
+	VM has specific instructions) all have separate callbacks, one for each
+	type, but the callbacks for compound types are expected to some
+	interpretation on their own, such as displaying a simple identifier or
+	the entire contents of the data.
+*/
+typedef struct type_view_s {
+	type_view_func void_view;
+	type_view_func string_view;
+	type_view_func float_view;
+	type_view_func vector_view;
+	type_view_func entity_view;
+	type_view_func field_view;
+	type_view_func func_view;
+	type_view_func pointer_view;
+	type_view_func quat_view;
+	type_view_func integer_view;
+	type_view_func uinteger_view;
+	type_view_func short_view;
+	type_view_func double_view;
+
+	type_view_func struct_view;
+	type_view_func union_view;
+	type_view_func enum_view;
+	type_view_func array_view;
+	type_view_func class_view;
+	type_view_func alias_view;
+} type_view_t;
+
 void PR_Debug_Init (progs_t *pr);
 void PR_Debug_Init_Cvars (void);
 int PR_LoadDebug (progs_t *pr);
diff --git a/libs/gamecode/pr_debug.c b/libs/gamecode/pr_debug.c
index 8f05793b9..2a41ec61c 100644
--- a/libs/gamecode/pr_debug.c
+++ b/libs/gamecode/pr_debug.c
@@ -71,12 +71,81 @@ typedef struct {
 	progs_t *pr;
 } file_t;
 
+typedef struct {
+	dstring_t  *string;
+} pr_debug_resources_t;
+
+typedef struct {
+	progs_t    *pr;
+	dstring_t  *dstr;
+} pr_debug_data_t;
+
 cvar_t         *pr_debug;
 cvar_t         *pr_source_path;
 static hashtab_t   *file_hash;
 static char        *source_path_string;
 static char       **source_paths;
 
+static void pr_debug_void_view (qfot_type_t *type, pr_type_t *value,
+								void *_data);
+static void pr_debug_string_view (qfot_type_t *type, pr_type_t *value,
+								void *_data);
+static void pr_debug_float_view (qfot_type_t *type, pr_type_t *value,
+								void *_data);
+static void pr_debug_vector_view (qfot_type_t *type, pr_type_t *value,
+								void *_data);
+static void pr_debug_entity_view (qfot_type_t *type, pr_type_t *value,
+								void *_data);
+static void pr_debug_field_view (qfot_type_t *type, pr_type_t *value,
+								void *_data);
+static void pr_debug_func_view (qfot_type_t *type, pr_type_t *value,
+								void *_data);
+static void pr_debug_pointer_view (qfot_type_t *type, pr_type_t *value,
+								void *_data);
+static void pr_debug_quat_view (qfot_type_t *type, pr_type_t *value,
+								void *_data);
+static void pr_debug_integer_view (qfot_type_t *type, pr_type_t *value,
+								void *_data);
+static void pr_debug_uinteger_view (qfot_type_t *type, pr_type_t *value,
+								void *_data);
+static void pr_debug_short_view (qfot_type_t *type, pr_type_t *value,
+								void *_data);
+static void pr_debug_double_view (qfot_type_t *type, pr_type_t *value,
+								void *_data);
+static void pr_debug_struct_view (qfot_type_t *type, pr_type_t *value,
+								void *_data);
+static void pr_debug_union_view (qfot_type_t *type, pr_type_t *value,
+								void *_data);
+static void pr_debug_enum_view (qfot_type_t *type, pr_type_t *value,
+								void *_data);
+static void pr_debug_array_view (qfot_type_t *type, pr_type_t *value,
+								void *_data);
+static void pr_debug_class_view (qfot_type_t *type, pr_type_t *value,
+								void *_data);
+static void pr_debug_alias_view (qfot_type_t *type, pr_type_t *value,
+								void *_data);
+
+static type_view_t raw_type_view = {
+	pr_debug_void_view,
+	pr_debug_string_view,
+	pr_debug_float_view,
+	pr_debug_vector_view,
+	pr_debug_entity_view,
+	pr_debug_field_view,
+	pr_debug_func_view,
+	pr_debug_pointer_view,
+	pr_debug_quat_view,
+	pr_debug_integer_view,
+	pr_debug_uinteger_view,
+	pr_debug_short_view,
+	pr_debug_double_view,
+	pr_debug_struct_view,
+	pr_debug_union_view,
+	pr_debug_enum_view,
+	pr_debug_array_view,
+	pr_debug_class_view,
+	pr_debug_alias_view,
+};
 
 static const char *
 file_get_key (const void *_f, void *unused)
@@ -199,10 +268,28 @@ error:
 	return d;
 }
 
+static void
+pr_debug_clear (progs_t *pr, void *data)
+{
+	__auto_type res = (pr_debug_resources_t *) data;
+
+	if (res->string) {
+		dstring_clearstr (res->string);
+	} else {
+		res->string = dstring_newstr ();
+	}
+}
+
 void
 PR_Debug_Init (progs_t *pr)
 {
-	file_hash = Hash_NewTable (1024, file_get_key, file_free, 0);
+	pr_debug_resources_t *res = calloc (1, sizeof (*res));
+	res->string = 0;
+
+	PR_Resources_Register (pr, "PR_Debug", res, pr_debug_clear);
+	if (!file_hash) {
+		file_hash = Hash_NewTable (1024, file_get_key, file_free, 0);
+	}
 }
 
 void
@@ -591,181 +678,386 @@ PR_DumpState (progs_t *pr)
 #define ISDENORM(x) ((x) && !((x) & 0x7f800000))
 
 static const char *
-value_string (progs_t *pr, etype_t type, pr_type_t *val)
+value_string (pr_debug_data_t *data, qfot_type_t *type, pr_type_t *value)
 {
-	static dstring_t *line;
-	pr_def_t   *def;
-	pr_int_t    ofs;
-	edict_t    *edict;
-	dfunction_t	*f;
-	const char *str;
-
-	if (!line)
-		line = dstring_new ();
-
-	type &= ~DEF_SAVEGLOBAL;
-
-	switch (type) {
-		case ev_string:
-			if (!PR_StringValid (pr, val->string_var))
-				return "*** invalid ***";
-			str = PR_GetString (pr, val->string_var);
-			dstring_copystr (line, "\"");
-			while (*str) {
-				const char *s;
-
-				for (s = str; *s && !strchr ("\"\n\t", *s); s++)
-					;
-				if (s != str)
-					dstring_appendsubstr (line, str, s - str);
-				if (*s) {
-					switch (*s) {
-						case '\"':
-							dstring_appendstr (line, "\\\"");
-							break;
-						case '\n':
-							dstring_appendstr (line, "\\n");
-							break;
-						case '\t':
-							dstring_appendstr (line, "\\t");
-							break;
-						default:
-							dasprintf (line, "\\x%02x", *s & 0xff);
-					}
-					s++;
-				}
-				str = s;
-			}
-			dstring_appendstr (line, "\"");
-			break;
-		case ev_entity:
-			edict = PROG_TO_EDICT (pr, val->entity_var);
-			dsprintf (line, "entity %d", NUM_FOR_BAD_EDICT (pr, edict));
-			break;
-		case ev_func:
-			if (val->func_var < 0 || val->func_var >= pr->progs->numfunctions)
-				dsprintf (line, "INVALID:%d", val->func_var);
-			else if (!val->func_var)
-				return "NULL";
-			else {
-				f = pr->pr_functions + val->func_var;
-				dsprintf (line, "%s()", PR_GetString (pr, f->s_name));
+	switch (type->meta) {
+		case ty_basic:
+			switch (type->t.type) {
+				case ev_void:
+					raw_type_view.void_view (type, value, data);
+					break;
+				case ev_string:
+					raw_type_view.string_view (type, value, data);
+					break;
+				case ev_float:
+					raw_type_view.float_view (type, value, data);
+					break;
+				case ev_vector:
+					raw_type_view.vector_view (type, value, data);
+					break;
+				case ev_entity:
+					raw_type_view.entity_view (type, value, data);
+					break;
+				case ev_field:
+					raw_type_view.field_view (type, value, data);
+					break;
+				case ev_func:
+					raw_type_view.func_view (type, value, data);
+					break;
+				case ev_pointer:
+					raw_type_view.pointer_view (type, value, data);
+					break;
+				case ev_quat:
+					raw_type_view.quat_view (type, value, data);
+					break;
+				case ev_integer:
+					raw_type_view.integer_view (type, value, data);
+					break;
+				case ev_uinteger:
+					raw_type_view.uinteger_view (type, value, data);
+					break;
+				case ev_short:
+					raw_type_view.short_view (type, value, data);
+					break;
+				case ev_double:
+					raw_type_view.double_view (type, value, data);
+					break;
+				case ev_invalid:
+				case ev_type_count:
+					dstring_appendstr (data->dstr, "<?""?>");
 			}
 			break;
-		case ev_field:
-			def = PR_FieldAtOfs (pr, val->integer_var);
-			if (def)
-				dsprintf (line, ".%s", PR_GetString (pr, def->name));
-			else
-				dsprintf (line, ".<$%04x>", val->integer_var);
+		case ty_struct:
+			raw_type_view.struct_view (type, value, data);
 			break;
-		case ev_void:
-			return "void";
-		case ev_float:
-			if (ISDENORM (val->integer_var) && val->uinteger_var != 0x80000000)
-				dsprintf (line, "<%08x>", val->integer_var);
-			else
-				dsprintf (line, "%g", val->float_var);
+		case ty_union:
+			raw_type_view.union_view (type, value, data);
 			break;
-		case ev_vector:
-			dsprintf (line, "'%g %g %g'",
-					  val->vector_var[0], val->vector_var[1],
-					  val->vector_var[2]);
+		case ty_enum:
+			raw_type_view.enum_view (type, value, data);
 			break;
-		case ev_pointer:
-			def = 0;
-			ofs = val->integer_var;
-			if (pr_debug->int_val && pr->debug)
-				def = PR_Get_Local_Def (pr, ofs);
-			if (!def)
-				def = PR_GlobalAtOfs (pr, ofs);
-			if (def && def->name)
-				dsprintf (line, "&%s", PR_GetString (pr, def->name));
-			else
-				dsprintf (line, "[$%x]", ofs);
+		case ty_array:
+			raw_type_view.array_view (type, value, data);
 			break;
-		case ev_quat:
-			dsprintf (line, "'%g %g %g %g'",
-					  val->vector_var[0], val->vector_var[1],
-					  val->vector_var[2], val->vector_var[3]);
+		case ty_class:
+			raw_type_view.class_view (type, value, data);
 			break;
-		case ev_integer:
-			dsprintf (line, "%d", val->integer_var);
-			break;
-		case ev_uinteger:
-			dsprintf (line, "$%08x", val->uinteger_var);
-			break;
-		case ev_double:
-			dsprintf (line, "%g", *(double *)val);
-			break;
-		case ev_short:
-		case ev_invalid:
-		case ev_type_count:
-			//dsprintf (line, "bad type %i", type);
-			dsprintf (line, "<%x %x %x %x>",
-					  val[0].integer_var, val[1].integer_var,
-					  val[2].integer_var, val[3].integer_var);
+		case ty_alias:
+			raw_type_view.alias_view (type, value, data);
 			break;
 	}
-
-	return line->str;
+	return data->dstr->str;
 }
 
 static pr_def_t *
-def_string (progs_t *pr, pr_int_t ofs, dstring_t *dstr)
+pr_debug_find_def (progs_t *pr, pr_int_t ofs)
 {
 	pr_def_t   *def = 0;
-	const char *name;
 
 	if (pr_debug->int_val && pr->debug)
 		def = PR_Get_Local_Def (pr, ofs);
 	if (!def)
 		def = PR_GlobalAtOfs (pr, ofs);
-	if (!def || !*(name = PR_GetString (pr, def->name)))
-		dsprintf (dstr, "[$%x]", ofs);
-	else
-		dsprintf (dstr, "%s", name);
 	return def;
 }
 
 static const char *
-global_string (progs_t *pr, pointer_t ofs, etype_t type, int contents)
+global_string (pr_debug_data_t *data, pointer_t ofs, etype_t etype,
+			   int contents)
 {
-	static dstring_t *line = NULL;
+	progs_t    *pr = data->pr;
+	dstring_t  *dstr = data->dstr;
 	pr_def_t   *def = NULL;
-	const char *s;
+	qfot_type_t dummy_type = { };
+	qfot_type_t *type;
+	const char *name = 0;
 
-	if (!line)
-		line = dstring_newstr();
+	dstring_clearstr (dstr);
 
-	if (type == ev_short) {
-		dsprintf (line, "%04x", (short) ofs);
-		return line->str;
+	if (etype == ev_short) {
+		dsprintf (dstr, "%04x", (short) ofs);
+		return dstr->str;
 	}
 
-	def = def_string (pr, ofs, line);
+	if (ofs > pr->globals_size) {
+		dsprintf (dstr, "%08x out of bounds", ofs);
+		return dstr->str;
+	}
 
-	if (contents && (def || type != ev_void)) {
-		const char *oi = "";
-		if (def) {
-			if (type == ev_void)
-				type = def->type;
-			if (type != (etype_t) (def->type & ~DEF_SAVEGLOBAL))
-				oi = "?";
-		}
-
-		if (ofs > pr->globals_size)
-			s = "Out of bounds";
-		else
-			s = value_string (pr, type, &pr->pr_globals[ofs]);
-
-		if (strequal(line->str, "IMMEDIATE") || strequal(line->str, ".imm")) {
-			dsprintf (line, "%s", s);
+	def = pr_debug_find_def (pr, ofs);
+	if (!def || !PR_StringValid (pr, def->name)
+		|| !*(name = PR_GetString (pr, def->name))) {
+		dsprintf (dstr, "[$%x]", ofs);
+	}
+	if (name) {
+		if (strequal (name, "IMMEDIATE") || strequal (name, ".imm")) {
+			contents = 1;
 		} else {
-			dasprintf (line, "%s(%s)", oi, s);
+			dsprintf (dstr, "%s", name);
 		}
 	}
-	return line->str;
+	if (contents) {
+		if (name) {
+			dstring_appendstr (dstr, "(");
+		}
+		if (def) {
+			if (!def->type_encoding) {
+				dummy_type.t.type = def->type;
+				type = &dummy_type;
+			} else {
+				type = &G_STRUCT (pr, qfot_type_t, def->type_encoding);
+			}
+		} else {
+			dummy_type.t.type = etype;
+			type = &dummy_type;
+		}
+		value_string (data, type, pr->pr_globals + ofs);
+		if (name) {
+			dstring_appendstr (dstr, ")");
+		}
+	}
+	return dstr->str;
+}
+
+static void
+pr_debug_void_view (qfot_type_t *type, pr_type_t *value, void *_data)
+{
+	__auto_type data = (pr_debug_data_t *) _data;
+	dasprintf (data->dstr, "<void>");
+}
+
+static void
+pr_debug_string_view (qfot_type_t *type, pr_type_t *value, void *_data)
+{
+	__auto_type data = (pr_debug_data_t *) _data;
+	dstring_t  *dstr = data->dstr;
+	string_t    string = value->string_var;
+	if (PR_StringValid (data->pr, string)) {
+		const char *str = PR_GetString (data->pr, string);
+
+		dstring_appendstr (dstr, "\"");
+		while (*str) {
+			const char *s;
+
+			for (s = str; *s && !strchr ("\"\n\t", *s); s++) {
+			}
+			if (s != str) {
+				dstring_appendsubstr (dstr, str, s - str);
+			}
+			if (*s) {
+				switch (*s) {
+					case '\"':
+						dstring_appendstr (dstr, "\\\"");
+						break;
+					case '\n':
+						dstring_appendstr (dstr, "\\n");
+						break;
+					case '\t':
+						dstring_appendstr (dstr, "\\t");
+						break;
+					default:
+						dasprintf (dstr, "\\x%02x", *s & 0xff);
+				}
+				s++;
+			}
+			str = s;
+		}
+		dstring_appendstr (dstr, "\"");
+	} else {
+		dstring_appendstr (dstr, "*** invalid string offset ***");
+	}
+}
+
+static void
+pr_debug_float_view (qfot_type_t *type, pr_type_t *value, void *_data)
+{
+	__auto_type data = (pr_debug_data_t *) _data;
+	dstring_t  *dstr = data->dstr;
+
+	if (data->pr->progs->version == PROG_ID_VERSION
+		&& ISDENORM (value->integer_var)
+		&& value->uinteger_var != 0x80000000) {
+		dasprintf (dstr, "<%08x>", value->integer_var);
+	} else {
+		dasprintf (dstr, "%g", value->float_var);
+	}
+}
+
+static void
+pr_debug_vector_view (qfot_type_t *type, pr_type_t *value, void *_data)
+{
+	__auto_type data = (pr_debug_data_t *) _data;
+	dstring_t  *dstr = data->dstr;
+
+	dasprintf (dstr, "'%g %g %g'",
+			  value->vector_var[0], value->vector_var[1],
+			  value->vector_var[2]);
+}
+
+static void
+pr_debug_entity_view (qfot_type_t *type, pr_type_t *value, void *_data)
+{
+	__auto_type data = (pr_debug_data_t *) _data;
+	progs_t    *pr = data->pr;
+	dstring_t  *dstr = data->dstr;
+	edict_t    *edict = PROG_TO_EDICT (pr, value->entity_var);
+
+	dasprintf (dstr, "entity %d", NUM_FOR_BAD_EDICT (pr, edict));
+}
+
+static void
+pr_debug_field_view (qfot_type_t *type, pr_type_t *value, void *_data)
+{
+	__auto_type data = (pr_debug_data_t *) _data;
+	progs_t    *pr = data->pr;
+	dstring_t  *dstr = data->dstr;
+	pr_def_t   *def = PR_FieldAtOfs (pr, value->integer_var);
+
+	if (def) {
+		dasprintf (dstr, ".%s", PR_GetString (pr, def->name));
+	} else {
+		dasprintf (dstr, ".<$%04x>", value->integer_var);
+	}
+}
+
+static void
+pr_debug_func_view (qfot_type_t *type, pr_type_t *value, void *_data)
+{
+	__auto_type data = (pr_debug_data_t *) _data;
+	progs_t    *pr = data->pr;
+	dstring_t  *dstr = data->dstr;
+
+	if (value->func_var < 0 || value->func_var >= pr->progs->numfunctions) {
+		dasprintf (dstr, "INVALID:%d", value->func_var);
+	} else if (!value->func_var) {
+		dstring_appendstr (dstr, "NULL");
+	} else {
+		dfunction_t *f = pr->pr_functions + value->func_var;
+		dasprintf (dstr, "%s()", PR_GetString (pr, f->s_name));
+	}
+}
+
+static void
+pr_debug_pointer_view (qfot_type_t *type, pr_type_t *value, void *_data)
+{
+	__auto_type data = (pr_debug_data_t *) _data;
+	progs_t    *pr = data->pr;
+	dstring_t  *dstr = data->dstr;
+	pointer_t   ofs = value->integer_var;
+	pr_def_t   *def;
+
+	if (pr_debug->int_val && pr->debug) {
+		def = PR_Get_Local_Def (pr, ofs);
+	}
+	if (!def) {
+		def = PR_GlobalAtOfs (pr, ofs);
+	}
+	if (def && def->name) {
+		dasprintf (dstr, "&%s", PR_GetString (pr, def->name));
+	} else {
+		dasprintf (dstr, "[$%x]", ofs);
+	}
+}
+
+static void
+pr_debug_quat_view (qfot_type_t *type, pr_type_t *value, void *_data)
+{
+	__auto_type data = (pr_debug_data_t *) _data;
+	dstring_t  *dstr = data->dstr;
+
+	dasprintf (dstr, "'%g %g %g %g'",
+			   value->vector_var[0], value->vector_var[1],
+			   value->vector_var[2], value->vector_var[3]);
+}
+
+static void
+pr_debug_integer_view (qfot_type_t *type, pr_type_t *value, void *_data)
+{
+	__auto_type data = (pr_debug_data_t *) _data;
+	dstring_t  *dstr = data->dstr;
+
+	dasprintf (dstr, "%d", value->integer_var);
+}
+
+static void
+pr_debug_uinteger_view (qfot_type_t *type, pr_type_t *value, void *_data)
+{
+	__auto_type data = (pr_debug_data_t *) _data;
+	dstring_t  *dstr = data->dstr;
+
+	dasprintf (dstr, "$%08x", value->uinteger_var);
+}
+
+static void
+pr_debug_short_view (qfot_type_t *type, pr_type_t *value, void *_data)
+{
+	__auto_type data = (pr_debug_data_t *) _data;
+	dstring_t  *dstr = data->dstr;
+
+	dasprintf (dstr, "%d", (short)value->integer_var);
+}
+
+static void
+pr_debug_double_view (qfot_type_t *type, pr_type_t *value, void *_data)
+{
+	__auto_type data = (pr_debug_data_t *) _data;
+	dstring_t  *dstr = data->dstr;
+
+	dasprintf (dstr, "%g", *(double *)value);
+}
+
+static void
+pr_debug_struct_view (qfot_type_t *type, pr_type_t *value, void *_data)
+{
+	__auto_type data = (pr_debug_data_t *) _data;
+	dstring_t  *dstr = data->dstr;
+
+	dstring_appendstr (dstr, "<struct>");
+}
+
+static void
+pr_debug_union_view (qfot_type_t *type, pr_type_t *value, void *_data)
+{
+	__auto_type data = (pr_debug_data_t *) _data;
+	dstring_t  *dstr = data->dstr;
+
+	dstring_appendstr (dstr, "<union>");
+}
+
+static void
+pr_debug_enum_view (qfot_type_t *type, pr_type_t *value, void *_data)
+{
+	__auto_type data = (pr_debug_data_t *) _data;
+	dstring_t  *dstr = data->dstr;
+
+	dstring_appendstr (dstr, "<enum>");
+}
+
+static void
+pr_debug_array_view (qfot_type_t *type, pr_type_t *value, void *_data)
+{
+	__auto_type data = (pr_debug_data_t *) _data;
+	dstring_t  *dstr = data->dstr;
+
+	dstring_appendstr (dstr, "<array>");
+}
+
+static void
+pr_debug_class_view (qfot_type_t *type, pr_type_t *value, void *_data)
+{
+	__auto_type data = (pr_debug_data_t *) _data;
+	dstring_t  *dstr = data->dstr;
+
+	dstring_appendstr (dstr, "<class>");
+}
+
+static void
+pr_debug_alias_view (qfot_type_t *type, pr_type_t *value, void *_data)
+{
+	__auto_type data = (pr_debug_data_t *) _data;
+	dstring_t  *dstr = data->dstr;
+
+	dstring_appendstr (dstr, "<alias>");
 }
 
 VISIBLE void
@@ -780,8 +1072,7 @@ PR_Debug_Watch (progs_t *pr, const char *expr)
 			if (pr->wp_conditional)
 				Sys_Printf ("        if new val == %d\n",
 							pr->wp_val.integer_var);
-		} else {
-			Sys_Printf ("    none active\n");
+		} else { Sys_Printf ("    none active\n");
 		}
 		return;
 	}
@@ -803,6 +1094,8 @@ VISIBLE void
 PR_Debug_Print (progs_t *pr, const char *expr)
 {
 	pr_def_t    print;
+	dstring_t  *dstr = dstring_newstr();
+	pr_debug_data_t data = {pr, dstr};
 
 	if (!expr) {
 		Sys_Printf ("print <print expr>\n");
@@ -811,9 +1104,10 @@ PR_Debug_Print (progs_t *pr, const char *expr)
 
 	print = parse_expression (pr, expr, 0);
 	if (print.type != ev_invalid) {
-		const char *s = global_string (pr, print.ofs, print.type, 1);
+		const char *s = global_string (&data, print.ofs, print.type, 1);
 		Sys_Printf ("[%d] = %s\n", print.ofs, s);
 	}
+	dstring_delete (dstr);
 }
 
 VISIBLE void
@@ -824,15 +1118,21 @@ PR_PrintStatement (progs_t *pr, dstatement_t *s, int contents)
 	const char *fmt;
 	opcode_t   *op;
 	static dstring_t *line;
+	static dstring_t *dstr;
 	dfunction_t *call_func = 0;
 	pr_def_t   *parm_def = 0;
 	pr_auxfunction_t *aux_func = 0;
+	pr_debug_data_t data;
 
-	if (!line)
+	if (!line) {
 		line = dstring_new ();
-
+		dstr = dstring_new ();
+	}
 	dstring_clearstr (line);
 
+	data.pr = pr;
+	data.dstr = dstr;
+
 	if (pr_debug->int_val > 1)
 		dump_code = 1;
 
@@ -915,10 +1215,12 @@ PR_PrintStatement (progs_t *pr, dstatement_t *s, int contents)
 						aux_func = get_aux_function (pr);
 						if (aux_func)
 							optype = get_etype (pr, aux_func->return_type);
-						str = global_string (pr, opval, optype, contents & 1);
+						str = global_string (&data, opval, optype,
+											 contents & 1);
 						break;
 					case 'F':
-						str = global_string (pr, opval, optype, contents & 1);
+						str = global_string (&data, opval, optype,
+											 contents & 1);
 						if (G_FUNCTION (pr, opval) >= 0
 							&& G_FUNCTION (pr, opval)
 								< pr->progs->numfunctions)
@@ -929,16 +1231,19 @@ PR_PrintStatement (progs_t *pr, dstatement_t *s, int contents)
 						optype = ev_void;
 						if (parm_def)
 							optype = parm_def->type;
-						str = global_string (pr, opval, optype, contents & 1);
+						str = global_string (&data, opval, optype,
+											 contents & 1);
 						break;
 					case 'V':
-						str = global_string (pr, opval, ev_void, contents & 1);
+						str = global_string (&data, opval, ev_void,
+											 contents & 1);
 						break;
 					case 'G':
-						str = global_string (pr, opval, optype, contents & 1);
+						str = global_string (&data, opval, optype,
+											 contents & 1);
 						break;
 					case 'g':
-						str = global_string (pr, opval, optype, 0);
+						str = global_string (&data, opval, optype, 0);
 						break;
 					case 's':
 						str = va ("%d", (short) opval);
@@ -961,7 +1266,7 @@ PR_PrintStatement (progs_t *pr, dstatement_t *s, int contents)
 								str = "bad entity.field";
 								break;
 							}
-							str = global_string (pr, opval, optype,
+							str = global_string (&data, opval, optype,
 												 contents & 1);
 							str = va ("$%x $%x %s", s->a, s->b, str);
 						}
@@ -1072,11 +1377,15 @@ PR_Profile (progs_t * pr)
 VISIBLE void
 ED_Print (progs_t *pr, edict_t *ed)
 {
-	int         type, l;
+	int         l;
 	pr_uint_t   i;
 	const char *name;
 	pr_def_t   *d;
 	pr_type_t  *v;
+	qfot_type_t dummy_type = { };
+	qfot_type_t *type;
+	dstring_t  *dstr = dstring_newstr();
+	pr_debug_data_t data = {pr, dstr};
 
 	if (ed->free) {
 		Sys_Printf ("FREE\n");
@@ -1088,6 +1397,12 @@ ED_Print (progs_t *pr, edict_t *ed)
 		d = &pr->pr_fielddefs[i];
 		if (!d->name)					// null field def (probably 1st)
 			continue;
+		if (!d->type_encoding) {
+			dummy_type.t.type = d->type;
+			type = &dummy_type;
+		} else {
+			type = &G_STRUCT (pr, qfot_type_t, d->type_encoding);
+		}
 		name = PR_GetString (pr, d->name);
 		if (name[strlen (name) - 2] == '_'
 			&& strchr ("xyz", name[strlen (name) -1]))
@@ -1095,41 +1410,14 @@ ED_Print (progs_t *pr, edict_t *ed)
 
 		v = ed->v + d->ofs;
 
-		// if the value is still all 0, skip the field
-		type = d->type & ~DEF_SAVEGLOBAL;
-
-		switch (type) {
-			case ev_entity:
-			case ev_integer:
-			case ev_uinteger:
-			case ev_pointer:
-			case ev_func:
-			case ev_field:
-				if (!v->integer_var)
-					continue;
-				break;
-			case ev_string:
-				if (PR_StringValid (pr, v->string_var))
-					if (!PR_GetString (pr, v->string_var)[0])
-						continue;
-				break;
-			case ev_float:
-				if (!v->float_var)
-					continue;
-				break;
-			case ev_vector:
-				if (!v[0].float_var && !v[1].float_var && !v[2].float_var)
-					continue;
-				break;
-			case ev_void:
-				break;
-			default:
-				PR_Error (pr, "ED_Print: Unhandled type %d", type);
-		}
-
 		l = 15 - strlen (name);
 		if (l < 1)
 			l = 1;
-		Sys_Printf ("%s%*s%s\n", name, l, "", value_string (pr, d->type, v));
+
+		dstring_clearstr (dstr);
+		value_string (&data, type, v);
+		Sys_Printf ("%s%*s%s\n", name, l, "", dstr->str);
 	}
+
+	dstring_delete (dstr);
 }

From d0dc0e15fbb19b90e7bdfe4b873d589e2b1476bc Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 23 Feb 2020 19:02:16 +0900
Subject: [PATCH 0471/1519] Handle alias types in debug prints

---
 libs/gamecode/pr_debug.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libs/gamecode/pr_debug.c b/libs/gamecode/pr_debug.c
index 2a41ec61c..06ed76a5b 100644
--- a/libs/gamecode/pr_debug.c
+++ b/libs/gamecode/pr_debug.c
@@ -1055,9 +1055,10 @@ static void
 pr_debug_alias_view (qfot_type_t *type, pr_type_t *value, void *_data)
 {
 	__auto_type data = (pr_debug_data_t *) _data;
-	dstring_t  *dstr = data->dstr;
+	progs_t    *pr = data->pr;
 
-	dstring_appendstr (dstr, "<alias>");
+	type = &G_STRUCT (pr, qfot_type_t, type->t.alias.aux_type);
+	value_string (data, type, value);
 }
 
 VISIBLE void

From c3c55f0bccc0dff92fc1815598ae0a92c1d7a9da Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 23 Feb 2020 19:05:43 +0900
Subject: [PATCH 0472/1519] Fix some source formatting

---
 libs/util/sys.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/libs/util/sys.c b/libs/util/sys.c
index 62ddfa35b..811cac886 100644
--- a/libs/util/sys.c
+++ b/libs/util/sys.c
@@ -126,18 +126,18 @@ qboolean    stdin_ready;
 
 /* The translation table between the graphical font and plain ASCII  --KB */
 VISIBLE const char sys_char_map[256] = {
-	'\0', '#', '#', '#', '#', '.', '#', '#',
-	'#', 9, 10, '#', ' ', 13, '.', '.',
+      0, '#', '#', '#', '#', '.', '#', '#',
+	'#',   9,  10, '#', ' ',  13, '.', '.',
 	'[', ']', '0', '1', '2', '3', '4', '5',
 	'6', '7', '8', '9', '.', '<', '=', '>',
-	' ', '!', '"', '#', '$', '%', '&', '\'',
+	' ', '!', '"', '#', '$', '%', '&','\'',
 	'(', ')', '*', '+', ',', '-', '.', '/',
 	'0', '1', '2', '3', '4', '5', '6', '7',
 	'8', '9', ':', ';', '<', '=', '>', '?',
 	'@', 'A', 'B', 'C', 'D', 'E', 'F', 'G',
 	'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O',
 	'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W',
-	'X', 'Y', 'Z', '[', '\\', ']', '^', '_',
+	'X', 'Y', 'Z', '[','\\', ']', '^', '_',
 	'`', 'a', 'b', 'c', 'd', 'e', 'f', 'g',
 	'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o',
 	'p', 'q', 'r', 's', 't', 'u', 'v', 'w',
@@ -147,14 +147,14 @@ VISIBLE const char sys_char_map[256] = {
 	'#', '#', ' ', '#', ' ', '>', '.', '.',
 	'[', ']', '0', '1', '2', '3', '4', '5',
 	'6', '7', '8', '9', '.', '<', '=', '>',
-	' ', '!', '"', '#', '$', '%', '&', '\'',
+	' ', '!', '"', '#', '$', '%', '&','\'',
 	'(', ')', '*', '+', ',', '-', '.', '/',
 	'0', '1', '2', '3', '4', '5', '6', '7',
 	'8', '9', ':', ';', '<', '=', '>', '?',
 	'@', 'A', 'B', 'C', 'D', 'E', 'F', 'G',
 	'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O',
 	'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W',
-	'X', 'Y', 'Z', '[', '\\', ']', '^', '_',
+	'X', 'Y', 'Z', '[','\\', ']', '^', '_',
 	'`', 'a', 'b', 'c', 'd', 'e', 'f', 'g',
 	'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o',
 	'p', 'q', 'r', 's', 't', 'u', 'v', 'w',

From c9fca9c98a00e9002f9a9308f2a299e645a19e44 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 23 Feb 2020 20:48:12 +0900
Subject: [PATCH 0473/1519] Fix another inside-out type utility function

---
 tools/qfcc/source/type.c | 67 ++++++++++++++--------------------------
 1 file changed, 24 insertions(+), 43 deletions(-)

diff --git a/tools/qfcc/source/type.c b/tools/qfcc/source/type.c
index 04c8d7442..a22ca4f0a 100644
--- a/tools/qfcc/source/type.c
+++ b/tools/qfcc/source/type.c
@@ -947,52 +947,33 @@ type_assignable (const type_t *dst, const type_t *src)
 int
 type_size (const type_t *type)
 {
-	switch (type->type) {
-		case ev_void:
-		case ev_string:
-		case ev_float:
-		case ev_vector:
-		case ev_entity:
-		case ev_field:
-		case ev_func:
-		case ev_pointer:
-		case ev_quat:
-		case ev_integer:
-		case ev_uinteger:
-		case ev_short:
-		case ev_double:
-		case ev_type_count:
+	switch (type->meta) {
+		case ty_basic:
 			return pr_type_size[type->type];
-		case ev_invalid:
-			switch (type->meta) {
-				case ty_enum:
-					if (!type->t.symtab)
-						return 0;
-					return type_size (&type_integer);
-				case ty_struct:
-				case ty_union:
-					if (!type->t.symtab)
-						return 0;
-					return type->t.symtab->size;
-				case ty_class:
-					{
-						class_t    *class = type->t.class;
-						int         size;
-						if (!class->ivars)
-							return 0;
-						size = class->ivars->size;
-						if (class->super_class)
-							size += type_size (class->super_class->type);
-						return size;
-					}
-				case ty_array:
-					return type->t.array.size * type_size (type->t.array.type);
-				case ty_alias:
-					return type_size (type->t.alias.type);
-				case ty_basic:
+		case ty_struct:
+		case ty_union:
+			if (!type->t.symtab)
+				return 0;
+			return type->t.symtab->size;
+		case ty_enum:
+			if (!type->t.symtab)
+				return 0;
+			return type_size (&type_integer);
+		case ty_array:
+			return type->t.array.size * type_size (type->t.array.type);
+		case ty_class:
+			{
+				class_t    *class = type->t.class;
+				int         size;
+				if (!class->ivars)
 					return 0;
+				size = class->ivars->size;
+				if (class->super_class)
+					size += type_size (class->super_class->type);
+				return size;
 			}
-			break;
+		case ty_alias:
+			return type_size (type->t.alias.type);
 	}
 	return 0;
 }

From 2a392080693e8bfca2fac8a5feb60eba637deb67 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 23 Feb 2020 20:48:43 +0900
Subject: [PATCH 0474/1519] Set void alignment to 1

qcc allowed void variables.
---
 tools/qfcc/source/type.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/qfcc/source/type.c b/tools/qfcc/source/type.c
index a22ca4f0a..a583a943c 100644
--- a/tools/qfcc/source/type.c
+++ b/tools/qfcc/source/type.c
@@ -62,7 +62,7 @@
 
 // simple types.  function types are dynamically allocated
 type_t      type_invalid = { ev_invalid, "invalid" };
-type_t      type_void = { ev_void, "void" };
+type_t      type_void = { ev_void, "void", 1 };
 type_t      type_string = { ev_string, "string", 1 };
 type_t      type_float = { ev_float, "float", 1 };
 type_t      type_vector = { ev_vector, "vector", 1 };

From ea3af84baaab88050f740796445daa4d5bab3f79 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 23 Feb 2020 20:49:56 +0900
Subject: [PATCH 0475/1519] Fix ICE when const-folding doubles

I really need to rework that system.
---
 tools/qfcc/include/expr.h     | 1 +
 tools/qfcc/source/constfold.c | 6 +++++-
 tools/qfcc/source/expr.c      | 8 ++++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/tools/qfcc/include/expr.h b/tools/qfcc/include/expr.h
index 36d785be0..bfeb1b83f 100644
--- a/tools/qfcc/include/expr.h
+++ b/tools/qfcc/include/expr.h
@@ -612,6 +612,7 @@ void dump_dot_expr (void *e, const char *filename);
 void convert_int (expr_t *e);
 void convert_short (expr_t *e);
 void convert_short_int (expr_t *e);
+void convert_double (expr_t *e);
 void convert_nil (expr_t *e, struct type_s *t);
 
 expr_t *test_expr (expr_t *e);
diff --git a/tools/qfcc/source/constfold.c b/tools/qfcc/source/constfold.c
index 3cba7f467..df8ea6ae0 100644
--- a/tools/qfcc/source/constfold.c
+++ b/tools/qfcc/source/constfold.c
@@ -148,8 +148,12 @@ convert_to_float (expr_t *e)
 				case ev_short:
 					convert_short (e);
 					return e;
+				case ev_double:
+					convert_double (e);
+					return e;
 				default:
-					internal_error (e, 0);
+					internal_error (e, "bad conversion to float: %d",
+									e->e.value->lltype);
 			}
 			break;
 		case ex_symbol:
diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index ab9672813..e8505fac2 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -1546,6 +1546,14 @@ convert_short_int (expr_t *e)
 	e->e.value = new_integer_val (integer_val);
 }
 
+void
+convert_double (expr_t *e)
+{
+	float       float_val = expr_double (e);
+	e->type = ex_value;
+	e->e.value = new_float_val (float_val);
+}
+
 void
 convert_nil (expr_t *e, type_t *t)
 {

From 7efefceee2956cf2c725c2136d7b53f25f342ffd Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 23 Feb 2020 22:21:25 +0900
Subject: [PATCH 0476/1519] Fix a comment

---
 include/QF/pr_comp.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/QF/pr_comp.h b/include/QF/pr_comp.h
index 9df0416d3..40ac1aa00 100644
--- a/include/QF/pr_comp.h
+++ b/include/QF/pr_comp.h
@@ -417,7 +417,7 @@ typedef struct dstatement_s {
 } GCC_STRUCT dstatement_t;
 
 typedef struct ddef_s {
-	pr_ushort_t type;			// if DEF_SAVEGLOBGAL bit is set
+	pr_ushort_t type;			// if DEF_SAVEGLOBAL bit is set
 								// the variable needs to be saved in savegames
 	pr_ushort_t ofs;
 	string_t    s_name;

From 23573953a76626af7e6dba4e2a1b936b8bcbc4c1 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 23 Feb 2020 22:25:08 +0900
Subject: [PATCH 0477/1519] Change pr_type_size to pr_ushort_t

---
 include/QF/pr_comp.h      | 2 +-
 libs/gamecode/pr_opcode.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/QF/pr_comp.h b/include/QF/pr_comp.h
index 40ac1aa00..0430d35fe 100644
--- a/include/QF/pr_comp.h
+++ b/include/QF/pr_comp.h
@@ -50,7 +50,7 @@ typedef enum {
 	ev_type_count		// not a type, gives number of types
 } etype_t;
 
-extern int pr_type_size[ev_type_count];
+extern pr_ushort_t pr_type_size[ev_type_count];
 extern const char *pr_type_name[ev_type_count];
 
 #define	OFS_NULL		0
diff --git a/libs/gamecode/pr_opcode.c b/libs/gamecode/pr_opcode.c
index 26ce130cb..3d2bc0c4d 100644
--- a/libs/gamecode/pr_opcode.c
+++ b/libs/gamecode/pr_opcode.c
@@ -48,7 +48,7 @@
 
 hashtab_t *opcode_table;
 
-VISIBLE int pr_type_size[ev_type_count] = {
+VISIBLE pr_ushort_t pr_type_size[ev_type_count] = {
 	1,			// ev_void
 	1,			// ev_string
 	1,			// ev_float

From e6f243323e9fbbe8442d6dfd47b2d935fb380875 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 23 Feb 2020 22:26:09 +0900
Subject: [PATCH 0478/1519] Fix type of class in qfo type encodings

---
 include/QF/pr_type.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/QF/pr_type.h b/include/QF/pr_type.h
index b2ea05060..39215840f 100644
--- a/include/QF/pr_type.h
+++ b/include/QF/pr_type.h
@@ -109,7 +109,7 @@ typedef struct qfot_type_s {
 		qfot_func_t func;			///< ty_basic, ev_func
 		qfot_struct_t strct;		///< ty_struct/ty_union/ty_enum
 		qfot_array_t array;			///< ty_array
-		pointer_t   class;			///< ty_class
+		string_t    class;			///< ty_class
 		qfot_alias_t alias;			///< ty_alias
 	}           t;
 } qfot_type_t;

From 14cde99d6ebe83912191827556b0c228c1826542 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 23 Feb 2020 22:27:07 +0900
Subject: [PATCH 0479/1519] White space

of the worst sort.
---
 tools/qfcc/include/expr.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/qfcc/include/expr.h b/tools/qfcc/include/expr.h
index bfeb1b83f..e8fdccb0c 100644
--- a/tools/qfcc/include/expr.h
+++ b/tools/qfcc/include/expr.h
@@ -191,12 +191,12 @@ typedef struct ex_value_s {
 
 typedef struct expr_s {
 	struct expr_s *next;		///< the next expression in a block expression
-	expr_type	type;			///< the type of the result of this expression
-	int			line;			///< source line that generated this expression
-	string_t	file;			///< source file that generated this expression
+	expr_type   type;			///< the type of the result of this expression
+	int         line;			///< source line that generated this expression
+	string_t    file;			///< source file that generated this expression
 	int         printid;		///< avoid duplicate output when printing
-	unsigned	paren:1;		///< the expression is enclosed in ()
-	unsigned	rvalue:1;		///< the expression is on the right side of =
+	unsigned    paren:1;		///< the expression is enclosed in ()
+	unsigned    rvalue:1;		///< the expression is on the right side of =
 	union {
 		ex_label_t  label;				///< label expression
 		ex_labelref_t labelref;			///< label reference expression (&)

From e23aa40994aff978d0f78e96e7e919ab40748365 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 23 Feb 2020 22:28:54 +0900
Subject: [PATCH 0480/1519] Implicitly cast unadorned floating point constants

Floating point constants without f or d adornments will automatically
cast, without warnings, to the type appropriate to the rest of the
expression.
---
 tools/qfcc/include/expr.h       | 1 +
 tools/qfcc/source/def.c         | 3 ++-
 tools/qfcc/source/expr_assign.c | 8 +++++---
 tools/qfcc/source/expr_binary.c | 9 +++++++++
 tools/qfcc/source/qc-lex.l      | 1 +
 5 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/tools/qfcc/include/expr.h b/tools/qfcc/include/expr.h
index e8fdccb0c..0a030e75a 100644
--- a/tools/qfcc/include/expr.h
+++ b/tools/qfcc/include/expr.h
@@ -197,6 +197,7 @@ typedef struct expr_s {
 	int         printid;		///< avoid duplicate output when printing
 	unsigned    paren:1;		///< the expression is enclosed in ()
 	unsigned    rvalue:1;		///< the expression is on the right side of =
+	unsigned    implicit:1;		///< don't warn for implicit casts
 	union {
 		ex_label_t  label;				///< label expression
 		ex_labelref_t labelref;			///< label reference expression (&)
diff --git a/tools/qfcc/source/def.c b/tools/qfcc/source/def.c
index 7bef8790b..ce59166a5 100644
--- a/tools/qfcc/source/def.c
+++ b/tools/qfcc/source/def.c
@@ -609,7 +609,8 @@ initialize_def (symbol_t *sym, expr_t *init, defspace_t *space,
 					reloc_def_field (init->e.value->v.pointer.def, sym->s.def);
 			} else {
 				ex_value_t *v = init->e.value;
-				if (is_double (init_type)
+				if (!init->implicit
+					&& is_double (init_type)
 					&& (is_integral (sym->type) || is_float (sym->type))) {
 					warning (init, "assigning double to %s in initializer "
 							 "(use a cast)", sym->type->name);
diff --git a/tools/qfcc/source/expr_assign.c b/tools/qfcc/source/expr_assign.c
index 600c6140a..046f1c07b 100644
--- a/tools/qfcc/source/expr_assign.c
+++ b/tools/qfcc/source/expr_assign.c
@@ -151,9 +151,11 @@ check_types_compatible (expr_t *dst, expr_t *src)
 
 	if (type_assignable (dst_type, src_type)) {
 		if (is_scalar (dst_type) && is_scalar (src_type)) {
-			if (is_double (src_type)) {
-				warning (dst, "assignment of double to %s (use a cast)\n",
-						 dst_type->name);
+			if (!src->implicit) {
+				if (is_double (src_type)) {
+					warning (dst, "assignment of double to %s (use a cast)\n",
+							 dst_type->name);
+				}
 			}
 			// the types are different but cast-compatible
 			expr_t     *new = cast_expr (dst_type, src);
diff --git a/tools/qfcc/source/expr_binary.c b/tools/qfcc/source/expr_binary.c
index 2e31116f3..ed8dcc85d 100644
--- a/tools/qfcc/source/expr_binary.c
+++ b/tools/qfcc/source/expr_binary.c
@@ -954,6 +954,15 @@ binary_expr (int op, expr_t *e1, expr_t *e2)
 	et1 = low_level_type (t1);
 	et2 = low_level_type (t2);
 
+	if (is_constant (e1) && is_double (t1) && e1->implicit && is_float (t2)) {
+		t1 = &type_float;
+		convert_double (e1);
+	}
+	if (is_constant (e2) && is_double (t2) && e2->implicit && is_float (t1)) {
+		t2 = &type_float;
+		convert_double (e2);
+	}
+
 	if (et1 >= ev_type_count || !binary_expr_types[et1])
 		return invalid_binary_expr(op, e1, e2);
 	if (et2 >= ev_type_count || !binary_expr_types[et1][et2])
diff --git a/tools/qfcc/source/qc-lex.l b/tools/qfcc/source/qc-lex.l
index 58b661220..353191593 100644
--- a/tools/qfcc/source/qc-lex.l
+++ b/tools/qfcc/source/qc-lex.l
@@ -143,6 +143,7 @@ STRING		\"(\\.|[^"\\])*\"
 						if (options.traditional < 1) {
 							double      d = strtod (yytext, 0);
 							qc_yylval.expr = new_double_expr (d);
+							qc_yylval.expr->implicit = 1;
 						} else {
 							float       f = strtof (yytext, 0);
 							qc_yylval.expr = new_float_expr (f);

From 607fd2e30ef6e2281c83ec638934c9a56de923af Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 23 Feb 2020 22:51:00 +0900
Subject: [PATCH 0481/1519] Allow constant initialized globals in advanced code

Use -C const-initializers to enable (or no-const-initializers to disable
in traditional/extended code).
---
 tools/qfcc/doc/man/qfcc.1    | 23 ++++++++++++++++-------
 tools/qfcc/include/options.h |  1 +
 tools/qfcc/source/def.c      |  2 +-
 tools/qfcc/source/expr.c     | 13 +++++++++++++
 tools/qfcc/source/options.c  |  8 +++++++-
 5 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/tools/qfcc/doc/man/qfcc.1 b/tools/qfcc/doc/man/qfcc.1
index a5e2794e0..b4fbd2685 100644
--- a/tools/qfcc/doc/man/qfcc.1
+++ b/tools/qfcc/doc/man/qfcc.1
@@ -85,7 +85,8 @@ No compilation or linking is done.
 
 .TP
 .B \-\-extended
-Allow extended keywords in traditional mode.
+Allow extended keywords in traditional mode. Otherwise, it has \fIall\fP
+the implications of \fB\-\-traditional\fP.
 
 .TP
 .B \-F, \-\-files
@@ -198,9 +199,9 @@ Look for \*[progs.src] in \fBDIR\fP instead of the current directory.
 .TP
 .B \-\-traditional
 Use traditional QuakeC syntax, semantics and \*(lqbugs\*(rq.
-Also implies the \fBv6only\fP, \fBno-short-circuit\fP and
-\fBno-local-merging\fP code generation options (see
-\fBCODE GENERATION OPTIONS\fP).
+Also implies the \fBv6only\fP, \fBno-short-circuit\fP,
+\fBconst-initializers\fP and \fBno-local-merging\fP code generation options
+(see \fBCODE GENERATION OPTIONS\fP).
 This is the default when using \fBprogs.src\fP mode.
 
 .TP
@@ -236,15 +237,23 @@ command line.
 Unsupported options are ignored.
 The following options are supported by \*[qfcc]'s \fB\-\-code\fP argument:
 
+.TP
+.B const-initializers
+Treat initialized globals as constants.
+This option is implied by \fB\-\-traditional\fP and \fB\-\-extended\fP, and is
+turned off by \fB\-\-advanced\fP.
+
 .TP
 .B cow
 Allow assignment to initialized globals.
-In Quake-C and Ruamoko, a global that has been initialized to a value is not
-a variable, but a named constant.
+When initialized globals are treated as constants (traditional Quake-C, or
+when const-initializers is activated), a global that has been initialized to a
+value is not a variable, but a named constant.
 However, \fBqcc\fP never really enforced this.
 The \fBcow\fP option allows \*[qfcc] to gracefully cope with QuakeC source
 that assigns values to initialized globals in this manner.
-(also known as \*(lqcopy on write\*(rq\(emnever mind the bovine connotations)
+(also known as \*(lqcopy on write\*(rq\(emlo and behold the bovine
+connotations)
 
 .TP
 .B cpp
diff --git a/tools/qfcc/include/options.h b/tools/qfcc/include/options.h
index cfcd350de..01345cff4 100644
--- a/tools/qfcc/include/options.h
+++ b/tools/qfcc/include/options.h
@@ -45,6 +45,7 @@ typedef struct {
 	unsigned    progsversion;		// Progs version to generate code for
 	qboolean    vector_components;	// add *_[xyz] symbols for vectors
 	qboolean    ifstring;			// expand if (str) to if (str != "")
+	qboolean    const_initializers;	// initialied globals are constant
 } code_options_t;
 
 typedef struct {
diff --git a/tools/qfcc/source/def.c b/tools/qfcc/source/def.c
index ce59166a5..38d95ca23 100644
--- a/tools/qfcc/source/def.c
+++ b/tools/qfcc/source/def.c
@@ -626,7 +626,7 @@ initialize_def (symbol_t *sym, expr_t *init, defspace_t *space,
 				}
 			}
 			sym->s.def->initialized = 1;
-			if (options.traditional) {
+			if (options.code.const_initializers) {
 				sym->s.def->constant = 1;
 				sym->s.def->nosave = 1;
 			}
diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index e8505fac2..5e370c4b0 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -2626,6 +2626,19 @@ cast_expr (type_t *type, expr_t *e)
 		ex_value_t *val = 0;
 		if (e->type == ex_symbol && e->e.symbol->sy_type == sy_const) {
 			val = e->e.symbol->s.value;
+		} else if (e->type == ex_symbol
+				   && e->e.symbol->sy_type == sy_var) {
+			// initialized global def treated as a constant
+			// from the tests above, the def is known to be constant
+			// and of one of the three storable scalar types
+			def_t      *def = e->e.symbol->s.def;
+			if (is_float (def->type)) {
+				val = new_float_val (D_FLOAT (def));
+			} else if (is_double (def->type)) {
+				val = new_double_val (D_DOUBLE (def));
+			} else if (is_integral (def->type)) {
+				val = new_integer_val (D_INT (def));
+			}
 		} else if (e->type == ex_value) {
 			val = e->e.value;
 		} else if (e->type == ex_nil) {
diff --git a/tools/qfcc/source/options.c b/tools/qfcc/source/options.c
index c3f283e89..f9807de7b 100644
--- a/tools/qfcc/source/options.c
+++ b/tools/qfcc/source/options.c
@@ -194,12 +194,13 @@ code_usage (void)
 	printf ("%s - QuakeForge Code Compiler\n", this_program);
 	printf ("Code generation options\n");
 	printf (
+"    [no-]const-initializers Treat initialized globals as constants.\n"
 "    [no-]cow                Allow assignment to initialized globals.\n"
 "    [no-]cpp                Preprocess all input files with cpp.\n"
 "    [no-]crc                Write progdefs.h crc to progs.dat.\n"
 "    [no-]debug              Generate debug information.\n"
 "    [no-]fast-float         Use float values directly in \"if\" statements.\n"
-"    help                    Display his text.\n"
+"    help                    Display this text.\n"
 "    [no-]local-merging      Merge the local variable blocks into one.\n"
 "    [no-]optimize           Perform various optimizations on the code.\n"
 "    [no-]short-circuit      Generate short circuit code for logical\n"
@@ -392,16 +393,19 @@ DecodeArgs (int argc, char **argv)
 				options.traditional = 1;
 				options.advanced = false;
 				options.code.progsversion = PROG_ID_VERSION;
+				options.code.const_initializers = true;
 				break;
 			case OPT_TRADITIONAL:
 				options.traditional = 2;
 				options.advanced = false;
 				options.code.progsversion = PROG_ID_VERSION;
+				options.code.const_initializers = true;
 				break;
 			case OPT_ADVANCED:
 				options.traditional = 0;
 				options.advanced = true;
 				options.code.progsversion = PROG_VERSION;
+				options.code.const_initializers = false;
 				break;
 			case OPT_BLOCK_DOT:
 				if (optarg) {
@@ -506,6 +510,8 @@ DecodeArgs (int argc, char **argv)
 								options.code.progsversion = PROG_ID_VERSION;
 							else
 								options.code.progsversion = PROG_VERSION;
+						} else if (!(strcasecmp (temp, "const-initializers"))) {
+							options.code.const_initializers = flag;
 						}
 						temp = strtok (NULL, ",");
 					}

From 526c27cf03973ef60a3e5af706334b33ddd6be07 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 23 Feb 2020 23:10:10 +0900
Subject: [PATCH 0482/1519] Handle implicit casts for double/float comparisons

---
 tools/qfcc/source/expr_binary.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/tools/qfcc/source/expr_binary.c b/tools/qfcc/source/expr_binary.c
index ed8dcc85d..aad78dea5 100644
--- a/tools/qfcc/source/expr_binary.c
+++ b/tools/qfcc/source/expr_binary.c
@@ -762,8 +762,13 @@ double_compare (int op, expr_t *e1, expr_t *e2)
 	type_t     *t2 = get_type (e2);
 	expr_t     *e;
 
-	if ((is_double (t1) && is_float (t2))
-		|| (is_float (t1) && is_double (t2))) {
+	if (is_constant (e1) && e1->implicit && is_double (t1) && is_float (t2)) {
+		t1 = &type_float;
+		convert_double (e1);
+	}
+	if (is_float (t1) && is_constant (e2) && e2->implicit && is_double (t2)) {
+		t2 = &type_float;
+		convert_double (e2);
 	}
 	if (is_double (t1)) {
 		if (is_float (t2)) {
@@ -772,7 +777,7 @@ double_compare (int op, expr_t *e1, expr_t *e2)
 			warning (e2, "comparison between double and integer");
 		}
 		e2 = cast_expr (&type_double, e2);
-	} else {
+	} else if (is_double (t2)) {
 		if (is_float (t1)) {
 			warning (e1, "comparison between float and double");
 		} else if (!is_constant (e1)) {

From 05f6ddbb13f424fd8e54e6d835d3c7736945d859 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 23 Feb 2020 23:10:56 +0900
Subject: [PATCH 0483/1519] Print promoted warnings as errors

This makes it much easier to see why a compilation failed when only
warnings are visible.
---
 tools/qfcc/source/diagnostic.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/tools/qfcc/source/diagnostic.c b/tools/qfcc/source/diagnostic.c
index d38c1eecb..5ba576212 100644
--- a/tools/qfcc/source/diagnostic.c
+++ b/tools/qfcc/source/diagnostic.c
@@ -99,16 +99,21 @@ static __attribute__((format(printf, 4, 0))) void
 __warning (expr_t *e, const char *file, int line,
 		   const char *fmt, va_list args)
 {
+	static int  promoted = 0;
 	dstring_t  *message = dstring_new ();
 
 	report_function (e);
 	if (options.warnings.promote) {
-		options.warnings.promote = 0;	// want to do this only once
-		fprintf (stderr, "%s: warnings treated as errors\n", "qfcc");
+		if (!promoted) {
+			promoted = 1;	// want to do this only once
+			fprintf (stderr, "%s: warnings treated as errors\n", "qfcc");
+		}
 		pr.error_count++;
+		format_message (message, "error", e, fmt, args);
+	} else {
+		format_message (message, "warning", e, fmt, args);
 	}
 
-	format_message (message, "warning", e, fmt, args);
 	if (options.verbosity > 1) {
 		dasprintf (message, " (%s:%d)", file, line);
 	}

From 5374798ef90147afa4abc12e43dcc1bf8d826664 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 23 Feb 2020 23:18:31 +0900
Subject: [PATCH 0484/1519] Fix order of operations for implicit casts

---
 tools/qfcc/source/expr_binary.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/qfcc/source/expr_binary.c b/tools/qfcc/source/expr_binary.c
index aad78dea5..a251860bf 100644
--- a/tools/qfcc/source/expr_binary.c
+++ b/tools/qfcc/source/expr_binary.c
@@ -956,9 +956,6 @@ binary_expr (int op, expr_t *e1, expr_t *e2)
 		}
 	}
 
-	et1 = low_level_type (t1);
-	et2 = low_level_type (t2);
-
 	if (is_constant (e1) && is_double (t1) && e1->implicit && is_float (t2)) {
 		t1 = &type_float;
 		convert_double (e1);
@@ -968,6 +965,9 @@ binary_expr (int op, expr_t *e1, expr_t *e2)
 		convert_double (e2);
 	}
 
+	et1 = low_level_type (t1);
+	et2 = low_level_type (t2);
+
 	if (et1 >= ev_type_count || !binary_expr_types[et1])
 		return invalid_binary_expr(op, e1, e2);
 	if (et2 >= ev_type_count || !binary_expr_types[et1][et2])

From dda045bf96fc82596a2942227bbb98b7eb77a805 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 23 Feb 2020 23:29:58 +0900
Subject: [PATCH 0485/1519] Do lazy computation of def sizes from type
 encodings

The size is calculated when needed and cached.
---
 include/QF/pr_comp.h      |  3 +-
 libs/gamecode/pr_debug.c  | 69 +++++++++++++++++++++++++++++++++++----
 libs/gamecode/pr_load.c   |  2 ++
 libs/gamecode/pr_opcode.c |  1 +
 4 files changed, 67 insertions(+), 8 deletions(-)

diff --git a/include/QF/pr_comp.h b/include/QF/pr_comp.h
index 0430d35fe..451d3a9ab 100644
--- a/include/QF/pr_comp.h
+++ b/include/QF/pr_comp.h
@@ -434,7 +434,8 @@ typedef struct pr_xdefs_s {
 } pr_xdefs_t;
 
 typedef struct pr_def_s {
-	pr_uint_t   type;
+	pr_ushort_t type;
+	pr_ushort_t size;			///< may not be correct
 	pointer_t   ofs;
 	string_t    name;
 	pointer_t   type_encoding;
diff --git a/libs/gamecode/pr_debug.c b/libs/gamecode/pr_debug.c
index 06ed76a5b..9b0deece5 100644
--- a/libs/gamecode/pr_debug.c
+++ b/libs/gamecode/pr_debug.c
@@ -195,6 +195,57 @@ pr_debug_expression_error (script_t *script, const char *msg)
 	Sys_Printf ("%s\n", msg);
 }
 
+#define RUP(x,a) (((x) + ((a) - 1)) & ~((a) - 1))
+static pr_short_t
+pr_debug_type_size (progs_t *pr, qfot_type_t *type)
+{
+	pr_short_t  size;
+	qfot_type_t *aux_type;
+	switch (type->meta) {
+		case ty_basic:
+			return pr_type_size[type->t.type];
+		case ty_struct:
+		case ty_union:
+			size = 0;
+			for (pr_int_t i = 0; i < type->t.strct.num_fields; i++) {
+				qfot_var_t *field = &type->t.strct.fields[i];
+				aux_type = &G_STRUCT (pr, qfot_type_t, field->type);
+				size = max (size,
+							field->offset + pr_debug_type_size (pr, aux_type));
+			}
+			return size;
+		case ty_enum:
+			return pr_type_size[ev_integer];
+		case ty_array:
+			aux_type = &G_STRUCT (pr, qfot_type_t, type->t.array.type);
+			size = pr_debug_type_size (pr, aux_type);
+			return type->t.array.size * size;
+		case ty_class:
+			return 1;	//FIXME or should it return sizeof class struct?
+		case ty_alias:
+			aux_type = &G_STRUCT (pr, qfot_type_t, type->t.alias.aux_type);
+			return pr_debug_type_size (pr, aux_type);
+	}
+	return 0;
+}
+
+static qfot_type_t *
+get_def_type (progs_t *pr, pr_def_t *def, qfot_type_t *type)
+{
+	if (!def->type_encoding) {
+		// no type encoding, so use basic type data to fill in and return
+		// the dummy encoding
+		memset (type, 0, sizeof (*type));
+		type->t.type = def->type;
+	} else {
+		type = &G_STRUCT (pr, qfot_type_t, def->type_encoding);
+		if (!def->size) {
+			def->size = pr_debug_type_size (pr, type);
+		}
+	}
+	return type;
+}
+
 static pr_def_t
 parse_expression (progs_t *pr, const char *expr, int conditional)
 {
@@ -1379,7 +1430,7 @@ VISIBLE void
 ED_Print (progs_t *pr, edict_t *ed)
 {
 	int         l;
-	pr_uint_t   i;
+	pr_uint_t   i, j;
 	const char *name;
 	pr_def_t   *d;
 	pr_type_t  *v;
@@ -1398,17 +1449,21 @@ ED_Print (progs_t *pr, edict_t *ed)
 		d = &pr->pr_fielddefs[i];
 		if (!d->name)					// null field def (probably 1st)
 			continue;
-		if (!d->type_encoding) {
-			dummy_type.t.type = d->type;
-			type = &dummy_type;
-		} else {
-			type = &G_STRUCT (pr, qfot_type_t, d->type_encoding);
-		}
+		type = get_def_type (pr, d, &dummy_type);
 		name = PR_GetString (pr, d->name);
 		if (name[strlen (name) - 2] == '_'
 			&& strchr ("xyz", name[strlen (name) -1]))
 			continue;					// skip _x, _y, _z vars
 
+		for (j = 0; j < d->size; j++) {
+			if (E_INT (ed, d->ofs + j)) {
+				break;
+			}
+		}
+		if (j == d->size) {
+			continue;
+		}
+
 		v = ed->v + d->ofs;
 
 		l = 15 - strlen (name);
diff --git a/libs/gamecode/pr_load.c b/libs/gamecode/pr_load.c
index a7dced537..994e9b581 100644
--- a/libs/gamecode/pr_load.c
+++ b/libs/gamecode/pr_load.c
@@ -281,11 +281,13 @@ PR_LoadProgsFile (progs_t *pr, QFile *file, int size)
 	pr->pr_globaldefs = calloc (pr->progs->numglobaldefs, sizeof (pr_def_t));
 
 	for (i = 0; i < pr->progs->numglobaldefs; i++) {
+		pr_ushort_t safe_type = global_ddefs[i].type & ~DEF_SAVEGLOBAL;
 		global_ddefs[i].type = LittleShort (global_ddefs[i].type);
 		global_ddefs[i].ofs = LittleShort (global_ddefs[i].ofs);
 		global_ddefs[i].s_name = LittleLong (global_ddefs[i].s_name);
 
 		pr->pr_globaldefs[i].type = global_ddefs[i].type;
+		pr->pr_globaldefs[i].size = pr_type_size[safe_type];
 		pr->pr_globaldefs[i].ofs = global_ddefs[i].ofs;
 		pr->pr_globaldefs[i].name = global_ddefs[i].s_name;
 		Hash_Add (pr->global_hash, &pr->pr_globaldefs[i]);
diff --git a/libs/gamecode/pr_opcode.c b/libs/gamecode/pr_opcode.c
index 3d2bc0c4d..ab266c84c 100644
--- a/libs/gamecode/pr_opcode.c
+++ b/libs/gamecode/pr_opcode.c
@@ -62,6 +62,7 @@ VISIBLE pr_ushort_t pr_type_size[ev_type_count] = {
 	1,			// ev_uinteger
 	0,			// ev_short        value in opcode
 	2,			// ev_double
+	0,			// ev_invalid      not a valid/simple type
 };
 
 VISIBLE const char *pr_type_name[ev_type_count] = {

From f387b9aa47dc411be0238f6aec95d6bb0ad64a4a Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 23 Feb 2020 23:41:12 +0900
Subject: [PATCH 0486/1519] Propagate implicit for negating double constants

---
 tools/qfcc/source/expr.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index 5e370c4b0..16db0b57d 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -1634,6 +1634,7 @@ unary_expr (int op, expr_t *e)
 	vec3_t      v;
 	quat_t      q;
 	const char *s;
+	expr_t     *new;
 
 	convert_name (e);
 	if (e->type == ex_error)
@@ -1651,7 +1652,9 @@ unary_expr (int op, expr_t *e)
 					case ev_pointer:
 						internal_error (e, "type check failed!");
 					case ev_double:
-						return new_double_expr (-expr_double (e));
+						new = new_double_expr (-expr_double (e));
+						new->implicit = e->implicit;
+						return new;
 					case ev_float:
 						return new_float_expr (-expr_float (e));
 					case ev_vector:

From 27ae5ccfcecaff4d4ead562248bfe28b0c05ac4c Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 23 Feb 2020 23:46:47 +0900
Subject: [PATCH 0487/1519] Fix ICE after incomplete type error

Attempting to define a variable with an incomplete type is an error, and
results in a default size 1 of allocated, but I forgot to set default
alignment when implementing alignment.
---
 tools/qfcc/source/def.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/qfcc/source/def.c b/tools/qfcc/source/def.c
index 38d95ca23..ed5e69964 100644
--- a/tools/qfcc/source/def.c
+++ b/tools/qfcc/source/def.c
@@ -153,6 +153,7 @@ new_def (const char *name, type_t *type, defspace_t *space,
 		if (!size) {
 			error (0, "%s has incomplete type", name);
 			size = 1;
+			alignment = 1;
 		}
 		if (alignment < 1) {
 			print_type (type);

From 11365024d2648972dd1b76252f6b1fd6e23c2752 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 24 Feb 2020 00:07:48 +0900
Subject: [PATCH 0488/1519] Fix writing of frames files when not requested

I forgot to check for the option for separate compilation.
---
 tools/qfcc/source/qfcc.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/tools/qfcc/source/qfcc.c b/tools/qfcc/source/qfcc.c
index 9e292d136..8a363a9cd 100644
--- a/tools/qfcc/source/qfcc.c
+++ b/tools/qfcc/source/qfcc.c
@@ -391,7 +391,9 @@ compile_to_obj (const char *file, const char *obj, lang_t lang)
 			exit (1);
 		}
 	}
-	write_frame_macros (va ("%s.frame", file_basename (file)));
+	if (options.frames_files) {
+		write_frame_macros (va ("%s.frame", file_basename (file)));
+	}
 	if (!err) {
 		qfo_t      *qfo;
 
@@ -750,8 +752,10 @@ progs_src_compile (void)
 			} else {
 				if (compile_file (qc_filename->str))
 					return 1;
-				write_frame_macros (va ("%s.frame",
-										file_basename (qc_filename->str)));
+				if (options.frames_files) {
+					write_frame_macros (va ("%s.frame",
+											file_basename (qc_filename->str)));
+				}
 			}
 			if (!Script_TokenAvailable (script, 0))
 				break;

From 0bf7ec07b719bcbfb0402a292202ead3d677501b Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 24 Feb 2020 00:22:13 +0900
Subject: [PATCH 0489/1519] Make debug output verbosity 2

and internal diagnostic sources level 1.
---
 tools/qfcc/source/diagnostic.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/qfcc/source/diagnostic.c b/tools/qfcc/source/diagnostic.c
index 5ba576212..84892687f 100644
--- a/tools/qfcc/source/diagnostic.c
+++ b/tools/qfcc/source/diagnostic.c
@@ -114,7 +114,7 @@ __warning (expr_t *e, const char *file, int line,
 		format_message (message, "warning", e, fmt, args);
 	}
 
-	if (options.verbosity > 1) {
+	if (options.verbosity) {
 		dasprintf (message, " (%s:%d)", file, line);
 	}
 	if (warning_hook) {
@@ -130,7 +130,7 @@ _debug (expr_t *e, const char *file, int line, const char *fmt, ...)
 {
 	va_list     args;
 
-	if (options.verbosity < 1)
+	if (options.verbosity < 2)
 		return;
 
 	report_function (e);
@@ -208,7 +208,7 @@ _notice (expr_t *e, const char *file, int line, const char *fmt, ...)
 		report_function (e);
 
 		format_message (message, "notice", e, fmt, args);
-		if (options.verbosity > 1) {
+		if (options.verbosity) {
 			dasprintf (message, " (%s:%d)", file, line);
 		}
 		if (notice_hook) {
@@ -257,7 +257,7 @@ _error (expr_t *e, const char *file, int line, const char *fmt, ...)
 		dstring_t  *message = dstring_new ();
 
 		format_message (message, "error", e, fmt, args);
-		if (options.verbosity > 1) {
+		if (options.verbosity) {
 			dasprintf (message, " (%s:%d)", file, line);
 		}
 		if (error_hook) {

From d6752c254c649cb30157c810ae2f553f7b04816a Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 24 Feb 2020 01:20:24 +0900
Subject: [PATCH 0490/1519] Move short-circuit boolean code to its own file

---
 tools/qfcc/source/Makefile.am   |   3 +-
 tools/qfcc/source/expr.c        | 229 -------------------------
 tools/qfcc/source/expr_binary.c |   3 +-
 tools/qfcc/source/expr_bool.c   | 295 ++++++++++++++++++++++++++++++++
 4 files changed, 299 insertions(+), 231 deletions(-)
 create mode 100644 tools/qfcc/source/expr_bool.c

diff --git a/tools/qfcc/source/Makefile.am b/tools/qfcc/source/Makefile.am
index 7feed1dca..d9ceb5ba2 100644
--- a/tools/qfcc/source/Makefile.am
+++ b/tools/qfcc/source/Makefile.am
@@ -41,7 +41,8 @@ bin_SCRIPTS=	qfpreqcc
 common_src=\
 	class.c codespace.c constfold.c cpp.c dags.c debug.c def.c defspace.c \
 	diagnostic.c dot.c dot_dag.c dot_expr.c dot_flow.c dot_sblock.c emit.c \
-	expr.c expr_assign.c expr_binary.c flow.c function.c grab.c idstuff.c \
+	expr.c expr_assign.c expr_binary.c expr_bool.c flow.c function.c grab.c \
+	idstuff.c \
 	linker.c method.c \
 	obj_file.c \
 	obj_type.c opcodes.c options.c pragma.c qfcc.c reloc.c shared.c \
diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index 16db0b57d..41c3ca7a2 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -1262,197 +1262,6 @@ field_expr (expr_t *e1, expr_t *e2)
 	return type_mismatch (e1, e2, '.');
 }
 
-expr_t *
-test_expr (expr_t *e)
-{
-	static float zero[4] = {0, 0, 0, 0};
-	expr_t     *new = 0;
-	type_t     *type;
-
-	if (e->type == ex_error)
-		return e;
-
-	type = get_type (e);
-	if (e->type == ex_error)
-		return e;
-	switch (type->type) {
-		case ev_type_count:
-			internal_error (e, 0);
-		case ev_void:
-			if (options.traditional) {
-				if (options.warnings.traditional)
-					warning (e, "void has no value");
-				return e;
-			}
-			return error (e, "void has no value");
-		case ev_string:
-			if (!options.code.ifstring)
-				return new_alias_expr (type_default, e);
-			new = new_string_expr (0);
-			break;
-		case ev_uinteger:
-		case ev_integer:
-		case ev_short:
-			if (type_default != &type_integer)
-				return new_alias_expr (type_default, e);
-			return e;
-		case ev_float:
-			if (options.code.fast_float
-				|| options.code.progsversion == PROG_ID_VERSION) {
-				if (type_default != &type_float)
-					return new_alias_expr (type_default, e);
-				return e;
-			}
-			new = new_float_expr (0);
-			break;
-		case ev_double:
-			new = new_double_expr (0);
-			break;
-		case ev_vector:
-			new = new_vector_expr (zero);
-			break;
-		case ev_entity:
-			return new_alias_expr (type_default, e);
-		case ev_field:
-			return new_alias_expr (type_default, e);
-		case ev_func:
-			return new_alias_expr (type_default, e);
-		case ev_pointer:
-			return new_alias_expr (type_default, e);
-		case ev_quat:
-			new = new_quaternion_expr (zero);
-			break;
-		case ev_invalid:
-			if (is_enum (type)) {
-				new = new_nil_expr ();
-				break;
-			}
-			return test_error (e, get_type (e));
-	}
-	new->line = e->line;
-	new->file = e->file;
-	new = binary_expr (NE, e, new);
-	new->line = e->line;
-	new->file = e->file;
-	return new;
-}
-
-void
-backpatch (ex_list_t *list, expr_t *label)
-{
-	int         i;
-	expr_t     *e;
-
-	if (!list)
-		return;
-	if (!label || label->type != ex_label)
-		internal_error (label, "not a label");
-
-	for (i = 0; i < list->size; i++) {
-		e = list->e[i];
-		if (e->type == ex_uexpr && e->e.expr.op == 'g')
-			e->e.expr.e1 = label;
-		else if (e->type == ex_expr && (e->e.expr.op == 'i'
-										|| e->e.expr.op == 'n'))
-			e->e.expr.e2 = label;
-		else {
-			internal_error (e, 0);
-		}
-		label->e.label.used++;
-	}
-}
-
-static ex_list_t *
-merge (ex_list_t *l1, ex_list_t *l2)
-{
-	ex_list_t  *m;
-
-	if (!l1 && !l2)
-		internal_error (0, 0);
-	if (!l2)
-		return l1;
-	if (!l1)
-		return l2;
-	m = malloc ((size_t)&((ex_list_t *)0)->e[l1->size + l2->size]);
-	m->size = l1->size + l2->size;
-	memcpy (m->e, l1->e, l1->size * sizeof (expr_t *));
-	memcpy (m->e + l1->size, l2->e, l2->size * sizeof (expr_t *));
-	return m;
-}
-
-static ex_list_t *
-make_list (expr_t *e)
-{
-	ex_list_t  *m;
-
-	m = malloc ((size_t)&((ex_list_t *) 0)->e[1]);
-	m->size = 1;
-	m->e[0] = e;
-	return m;
-}
-
-expr_t *
-convert_bool (expr_t *e, int block)
-{
-	expr_t     *b;
-
-	if (e->type == ex_expr && (e->e.expr.op == '=' || e->e.expr.op == PAS)) {
-		expr_t     *src;
-		if (!e->paren && options.warnings.precedence)
-			warning (e, "suggest parentheses around assignment "
-					 "used as truth value");
-		src = e->e.expr.e2;
-		if (src->type == ex_block) {
-			src = new_temp_def_expr (get_type (src));
-			e = new_binary_expr (e->e.expr.op, e->e.expr.e1,
-								 assign_expr (src, e->e.expr.e2));
-		}
-		b = convert_bool (src, 1);
-		if (b->type == ex_error)
-			return b;
-		// insert the assignment into the bool's block
-		e->next = b->e.bool.e->e.block.head;
-		b->e.bool.e->e.block.head = e;
-		if (b->e.bool.e->e.block.tail == &b->e.bool.e->e.block.head) {
-			// shouldn't happen, but just in case
-			b->e.bool.e->e.block.tail = &e->next;
-		}
-		return b;
-	}
-
-	if (e->type == ex_uexpr && e->e.expr.op == '!'
-		&& get_type (e->e.expr.e1) != &type_string) {
-		e = convert_bool (e->e.expr.e1, 0);
-		if (e->type == ex_error)
-			return e;
-		e = unary_expr ('!', e);
-	}
-	if (e->type != ex_bool) {
-		e = test_expr (e);
-		if (e->type == ex_error)
-			return e;
-		if (is_integer_val (e)) {
-			b = goto_expr (0);
-			if (expr_integer (e))
-				e = new_bool_expr (make_list (b), 0, b);
-			else
-				e = new_bool_expr (0, make_list (b), b);
-		} else {
-			b = new_block_expr ();
-			append_expr (b, branch_expr ('i', e, 0));
-			append_expr (b, goto_expr (0));
-			e = new_bool_expr (make_list (b->e.block.head),
-							   make_list (b->e.block.head->next), b);
-		}
-	}
-	if (block && e->e.bool.e->type != ex_block) {
-		expr_t     *block = new_block_expr ();
-		append_expr (block, e->e.bool.e);
-		e->e.bool.e = block;
-	}
-	return e;
-}
-
 expr_t *
 convert_from_bool (expr_t *e, type_t *type)
 {
@@ -1484,44 +1293,6 @@ convert_from_bool (expr_t *e, type_t *type)
 	return e;
 }
 
-expr_t *
-bool_expr (int op, expr_t *label, expr_t *e1, expr_t *e2)
-{
-	expr_t     *block;
-
-	if (!options.code.short_circuit)
-		return binary_expr (op, e1, e2);
-
-	e1 = convert_bool (e1, 0);
-	if (e1->type == ex_error)
-		return e1;
-
-	e2 = convert_bool (e2, 0);
-	if (e2->type == ex_error)
-		return e2;
-
-	block = new_block_expr ();
-	append_expr (block, e1);
-	append_expr (block, label);
-	append_expr (block, e2);
-
-	switch (op) {
-		case OR:
-			backpatch (e1->e.bool.false_list, label);
-			return new_bool_expr (merge (e1->e.bool.true_list,
-										 e2->e.bool.true_list),
-								  e2->e.bool.false_list, block);
-			break;
-		case AND:
-			backpatch (e1->e.bool.true_list, label);
-			return new_bool_expr (e2->e.bool.true_list,
-								  merge (e1->e.bool.false_list,
-										 e2->e.bool.false_list), block);
-			break;
-	}
-	internal_error (e1, 0);
-}
-
 void
 convert_int (expr_t *e)
 {
diff --git a/tools/qfcc/source/expr_binary.c b/tools/qfcc/source/expr_binary.c
index a251860bf..ee1fb162c 100644
--- a/tools/qfcc/source/expr_binary.c
+++ b/tools/qfcc/source/expr_binary.c
@@ -992,8 +992,9 @@ binary_expr (int op, expr_t *e1, expr_t *e2)
 	e = new_binary_expr (op, e1, e2);
 	e->e.expr.type = expr_type->type;
 	if (is_compare (op) || is_logic (op)) {
-		if (options.code.progsversion == PROG_ID_VERSION)
+		if (options.code.progsversion == PROG_ID_VERSION) {
 			e->e.expr.type = &type_float;
+		}
 	}
 	return fold_constants (e);
 }
diff --git a/tools/qfcc/source/expr_bool.c b/tools/qfcc/source/expr_bool.c
new file mode 100644
index 000000000..6eda9aa8d
--- /dev/null
+++ b/tools/qfcc/source/expr_bool.c
@@ -0,0 +1,295 @@
+/*
+	expr_bool.c
+
+	short-circuit boolean expressions
+
+	Copyright (C) 2001 Bill Currie <bill@taniwha.org>
+
+	Author: Bill Currie <bill@taniwha.org>
+	Date: 2001/06/15
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#include <stdlib.h>
+
+#include "QF/alloc.h"
+#include "QF/dstring.h"
+#include "QF/mathlib.h"
+#include "QF/sys.h"
+#include "QF/va.h"
+
+#include "qfcc.h"
+#include "class.h"
+#include "def.h"
+#include "defspace.h"
+#include "diagnostic.h"
+#include "emit.h"
+#include "expr.h"
+#include "function.h"
+#include "idstuff.h"
+#include "method.h"
+#include "options.h"
+#include "reloc.h"
+#include "shared.h"
+#include "strpool.h"
+#include "struct.h"
+#include "symtab.h"
+#include "type.h"
+#include "value.h"
+#include "qc-parse.h"
+
+expr_t *
+test_expr (expr_t *e)
+{
+	static float zero[4] = {0, 0, 0, 0};
+	expr_t     *new = 0;
+	type_t     *type;
+
+	if (e->type == ex_error)
+		return e;
+
+	type = get_type (e);
+	if (e->type == ex_error)
+		return e;
+	switch (type->type) {
+		case ev_type_count:
+			internal_error (e, 0);
+		case ev_void:
+			if (options.traditional) {
+				if (options.warnings.traditional)
+					warning (e, "void has no value");
+				return e;
+			}
+			return error (e, "void has no value");
+		case ev_string:
+			if (!options.code.ifstring)
+				return new_alias_expr (type_default, e);
+			new = new_string_expr (0);
+			break;
+		case ev_uinteger:
+		case ev_integer:
+		case ev_short:
+			if (type_default != &type_integer)
+				return new_alias_expr (type_default, e);
+			return e;
+		case ev_float:
+			if (options.code.fast_float
+				|| options.code.progsversion == PROG_ID_VERSION) {
+				if (type_default != &type_float)
+					return new_alias_expr (type_default, e);
+				return e;
+			}
+			new = new_float_expr (0);
+			break;
+		case ev_double:
+			new = new_double_expr (0);
+			break;
+		case ev_vector:
+			new = new_vector_expr (zero);
+			break;
+		case ev_entity:
+			return new_alias_expr (type_default, e);
+		case ev_field:
+			return new_alias_expr (type_default, e);
+		case ev_func:
+			return new_alias_expr (type_default, e);
+		case ev_pointer:
+			return new_alias_expr (type_default, e);
+		case ev_quat:
+			new = new_quaternion_expr (zero);
+			break;
+		case ev_invalid:
+			if (is_enum (type)) {
+				new = new_nil_expr ();
+				break;
+			}
+			return test_error (e, get_type (e));
+	}
+	new->line = e->line;
+	new->file = e->file;
+	new = binary_expr (NE, e, new);
+	new->line = e->line;
+	new->file = e->file;
+	return new;
+}
+
+void
+backpatch (ex_list_t *list, expr_t *label)
+{
+	int         i;
+	expr_t     *e;
+
+	if (!list)
+		return;
+	if (!label || label->type != ex_label)
+		internal_error (label, "not a label");
+
+	for (i = 0; i < list->size; i++) {
+		e = list->e[i];
+		if (e->type == ex_uexpr && e->e.expr.op == 'g')
+			e->e.expr.e1 = label;
+		else if (e->type == ex_expr && (e->e.expr.op == 'i'
+										|| e->e.expr.op == 'n'))
+			e->e.expr.e2 = label;
+		else {
+			internal_error (e, 0);
+		}
+		label->e.label.used++;
+	}
+}
+
+static ex_list_t *
+merge (ex_list_t *l1, ex_list_t *l2)
+{
+	ex_list_t  *m;
+
+	if (!l1 && !l2)
+		internal_error (0, 0);
+	if (!l2)
+		return l1;
+	if (!l1)
+		return l2;
+	m = malloc ((size_t)&((ex_list_t *)0)->e[l1->size + l2->size]);
+	m->size = l1->size + l2->size;
+	memcpy (m->e, l1->e, l1->size * sizeof (expr_t *));
+	memcpy (m->e + l1->size, l2->e, l2->size * sizeof (expr_t *));
+	return m;
+}
+
+static ex_list_t *
+make_list (expr_t *e)
+{
+	ex_list_t  *m;
+
+	m = malloc ((size_t)&((ex_list_t *) 0)->e[1]);
+	m->size = 1;
+	m->e[0] = e;
+	return m;
+}
+
+expr_t *
+bool_expr (int op, expr_t *label, expr_t *e1, expr_t *e2)
+{
+	expr_t     *block;
+
+	if (!options.code.short_circuit)
+		return binary_expr (op, e1, e2);
+
+	e1 = convert_bool (e1, 0);
+	if (e1->type == ex_error)
+		return e1;
+
+	e2 = convert_bool (e2, 0);
+	if (e2->type == ex_error)
+		return e2;
+
+	block = new_block_expr ();
+	append_expr (block, e1);
+	append_expr (block, label);
+	append_expr (block, e2);
+
+	switch (op) {
+		case OR:
+			backpatch (e1->e.bool.false_list, label);
+			return new_bool_expr (merge (e1->e.bool.true_list,
+										 e2->e.bool.true_list),
+								  e2->e.bool.false_list, block);
+			break;
+		case AND:
+			backpatch (e1->e.bool.true_list, label);
+			return new_bool_expr (e2->e.bool.true_list,
+								  merge (e1->e.bool.false_list,
+										 e2->e.bool.false_list), block);
+			break;
+	}
+	internal_error (e1, 0);
+}
+
+expr_t *
+convert_bool (expr_t *e, int block)
+{
+	expr_t     *b;
+
+	if (e->type == ex_expr && (e->e.expr.op == '=' || e->e.expr.op == PAS)) {
+		expr_t     *src;
+		if (!e->paren && options.warnings.precedence)
+			warning (e, "suggest parentheses around assignment "
+					 "used as truth value");
+		src = e->e.expr.e2;
+		if (src->type == ex_block) {
+			src = new_temp_def_expr (get_type (src));
+			e = new_binary_expr (e->e.expr.op, e->e.expr.e1,
+								 assign_expr (src, e->e.expr.e2));
+		}
+		b = convert_bool (src, 1);
+		if (b->type == ex_error)
+			return b;
+		// insert the assignment into the bool's block
+		e->next = b->e.bool.e->e.block.head;
+		b->e.bool.e->e.block.head = e;
+		if (b->e.bool.e->e.block.tail == &b->e.bool.e->e.block.head) {
+			// shouldn't happen, but just in case
+			b->e.bool.e->e.block.tail = &e->next;
+		}
+		return b;
+	}
+
+	if (e->type == ex_uexpr && e->e.expr.op == '!'
+		&& get_type (e->e.expr.e1) != &type_string) {
+		e = convert_bool (e->e.expr.e1, 0);
+		if (e->type == ex_error)
+			return e;
+		e = unary_expr ('!', e);
+	}
+	if (e->type != ex_bool) {
+		e = test_expr (e);
+		if (e->type == ex_error)
+			return e;
+		if (is_integer_val (e)) {
+			b = goto_expr (0);
+			if (expr_integer (e))
+				e = new_bool_expr (make_list (b), 0, b);
+			else
+				e = new_bool_expr (0, make_list (b), b);
+		} else {
+			b = new_block_expr ();
+			append_expr (b, branch_expr ('i', e, 0));
+			append_expr (b, goto_expr (0));
+			e = new_bool_expr (make_list (b->e.block.head),
+							   make_list (b->e.block.head->next), b);
+		}
+	}
+	if (block && e->e.bool.e->type != ex_block) {
+		expr_t     *block = new_block_expr ();
+		append_expr (block, e->e.bool.e);
+		e->e.bool.e = block;
+	}
+	return e;
+}

From 55e53211e2711e155b1ace1a6d19e363d2a6647c Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 24 Feb 2020 02:11:31 +0900
Subject: [PATCH 0491/1519] Generate default type expressions for folded
 booleans

---
 tools/qfcc/source/constfold.c | 102 +++++++++++++++++++---------------
 1 file changed, 56 insertions(+), 46 deletions(-)

diff --git a/tools/qfcc/source/constfold.c b/tools/qfcc/source/constfold.c
index df8ea6ae0..e7c037deb 100644
--- a/tools/qfcc/source/constfold.c
+++ b/tools/qfcc/source/constfold.c
@@ -69,6 +69,16 @@ valid_op (int op, int *valid_ops)
 	return *valid_ops == op;
 }
 
+static expr_t *
+cmp_result_expr (int result)
+{
+	if (is_float (type_default)) {
+		return new_float_expr (result);
+	} else {
+		return new_integer_expr(result);
+	}
+}
+
 static expr_t *
 do_op_string (int op, expr_t *e, expr_t *e1, expr_t *e2)
 {
@@ -108,22 +118,22 @@ do_op_string (int op, expr_t *e, expr_t *e1, expr_t *e2)
 			e = new_string_expr (save_string (temp_str->str));
 			break;
 		case LT:
-			e = new_integer_expr (strcmp (s1, s2) < 0);
+			e = cmp_result_expr (strcmp (s1, s2) < 0);
 			break;
 		case GT:
-			e = new_integer_expr (strcmp (s1, s2) > 0);
+			e = cmp_result_expr (strcmp (s1, s2) > 0);
 			break;
 		case LE:
-			e = new_integer_expr (strcmp (s1, s2) <= 0);
+			e = cmp_result_expr (strcmp (s1, s2) <= 0);
 			break;
 		case GE:
-			e = new_integer_expr (strcmp (s1, s2) >= 0);
+			e = cmp_result_expr (strcmp (s1, s2) >= 0);
 			break;
 		case EQ:
-			e = new_integer_expr (strcmp (s1, s2) == 0);
+			e = cmp_result_expr (strcmp (s1, s2) == 0);
 			break;
 		case NE:
-			e = new_integer_expr (strcmp (s1, s2));
+			e = cmp_result_expr (strcmp (s1, s2));
 			break;
 		default:
 			internal_error (e1, 0);
@@ -300,28 +310,28 @@ do_op_float (int op, expr_t *e, expr_t *e1, expr_t *e2)
 			e = new_float_expr ((int)f1 >> (int)f2);
 			break;
 		case AND:
-			e = new_integer_expr (f1 && f2);
+			e = cmp_result_expr (f1 && f2);
 			break;
 		case OR:
-			e = new_integer_expr (f1 || f2);
+			e = cmp_result_expr (f1 || f2);
 			break;
 		case LT:
-			e = new_integer_expr (f1 < f2);
+			e = cmp_result_expr (f1 < f2);
 			break;
 		case GT:
-			e = new_integer_expr (f1 > f2);
+			e = cmp_result_expr (f1 > f2);
 			break;
 		case LE:
-			e = new_integer_expr (f1 <= f2);
+			e = cmp_result_expr (f1 <= f2);
 			break;
 		case GE:
-			e = new_integer_expr (f1 >= f2);
+			e = cmp_result_expr (f1 >= f2);
 			break;
 		case EQ:
-			e = new_integer_expr (f1 == f2);
+			e = cmp_result_expr (f1 == f2);
 			break;
 		case NE:
-			e = new_integer_expr (f1 != f2);
+			e = cmp_result_expr (f1 != f2);
 			break;
 		default:
 			internal_error (e1, 0);
@@ -411,22 +421,22 @@ do_op_double (int op, expr_t *e, expr_t *e1, expr_t *e2)
 			e = new_double_expr ((int)d1 % (int)d2);
 			break;
 		case LT:
-			e = new_integer_expr (d1 < d2);
+			e = cmp_result_expr (d1 < d2);
 			break;
 		case GT:
-			e = new_integer_expr (d1 > d2);
+			e = cmp_result_expr (d1 > d2);
 			break;
 		case LE:
-			e = new_integer_expr (d1 <= d2);
+			e = cmp_result_expr (d1 <= d2);
 			break;
 		case GE:
-			e = new_integer_expr (d1 >= d2);
+			e = cmp_result_expr (d1 >= d2);
 			break;
 		case EQ:
-			e = new_integer_expr (d1 == d2);
+			e = cmp_result_expr (d1 == d2);
 			break;
 		case NE:
-			e = new_integer_expr (d1 != d2);
+			e = cmp_result_expr (d1 != d2);
 			break;
 		default:
 			internal_error (e1, 0);
@@ -539,10 +549,10 @@ do_op_vector (int op, expr_t *e, expr_t *e1, expr_t *e2)
 			}
 			break;
 		case EQ:
-			e = new_integer_expr (VectorCompare (v1, v2));
+			e = cmp_result_expr (VectorCompare (v1, v2));
 			break;
 		case NE:
-			e = new_integer_expr (!VectorCompare (v1, v2));
+			e = cmp_result_expr (!VectorCompare (v1, v2));
 			break;
 		default:
 			internal_error (e1, 0);
@@ -776,10 +786,10 @@ do_op_quaternion (int op, expr_t *e, expr_t *e1, expr_t *e2)
 			e = new_quaternion_expr (q);
 			break;
 		case EQ:
-			e = new_integer_expr (QuatCompare (q1, q2));
+			e = cmp_result_expr (QuatCompare (q1, q2));
 			break;
 		case NE:
-			e = new_integer_expr (!QuatCompare (q1, q2));
+			e = cmp_result_expr (!QuatCompare (q1, q2));
 			break;
 		default:
 			internal_error (e1, 0);
@@ -877,28 +887,28 @@ do_op_integer (int op, expr_t *e, expr_t *e1, expr_t *e2)
 			e = new_integer_expr (i1 >> i2);
 			break;
 		case AND:
-			e = new_integer_expr (i1 && i2);
+			e = cmp_result_expr (i1 && i2);
 			break;
 		case OR:
-			e = new_integer_expr (i1 || i2);
+			e = cmp_result_expr (i1 || i2);
 			break;
 		case LT:
-			e = new_integer_expr (i1 < i2);
+			e = cmp_result_expr (i1 < i2);
 			break;
 		case GT:
-			e = new_integer_expr (i1 > i2);
+			e = cmp_result_expr (i1 > i2);
 			break;
 		case LE:
-			e = new_integer_expr (i1 <= i2);
+			e = cmp_result_expr (i1 <= i2);
 			break;
 		case GE:
-			e = new_integer_expr (i1 >= i2);
+			e = cmp_result_expr (i1 >= i2);
 			break;
 		case EQ:
-			e = new_integer_expr (i1 == i2);
+			e = cmp_result_expr (i1 == i2);
 			break;
 		case NE:
-			e = new_integer_expr (i1 != i2);
+			e = cmp_result_expr (i1 != i2);
 			break;
 		default:
 			internal_error (e1, 0);
@@ -981,22 +991,22 @@ do_op_short (int op, expr_t *e, expr_t *e1, expr_t *e2)
 			e = new_short_expr (i1 || i2);
 			break;
 		case LT:
-			e = new_integer_expr (i1 < i2);
+			e = cmp_result_expr (i1 < i2);
 			break;
 		case GT:
-			e = new_integer_expr (i1 > i2);
+			e = cmp_result_expr (i1 > i2);
 			break;
 		case LE:
-			e = new_integer_expr (i1 <= i2);
+			e = cmp_result_expr (i1 <= i2);
 			break;
 		case GE:
-			e = new_integer_expr (i1 >= i2);
+			e = cmp_result_expr (i1 >= i2);
 			break;
 		case EQ:
-			e = new_integer_expr (i1 == i2);
+			e = cmp_result_expr (i1 == i2);
 			break;
 		case NE:
-			e = new_integer_expr (i1 != i2);
+			e = cmp_result_expr (i1 != i2);
 			break;
 		default:
 			internal_error (e1, 0);
@@ -1375,7 +1385,7 @@ uop_string (int op, expr_t *e, expr_t *e1)
 		return e;
 
 	s = expr_string (e1);
-	return new_integer_expr (!s || !s[0]);
+	return cmp_result_expr (!s || !s[0]);
 }
 
 static expr_t *
@@ -1399,7 +1409,7 @@ uop_float (int op, expr_t *e, expr_t *e1)
 			return new_float_expr (-expr_float (e1));
 		case '!':
 			print_type (get_type (e));
-			return new_integer_expr (!expr_float (e1));
+			return cmp_result_expr (!expr_float (e1));
 		case '~':
 			return new_float_expr (~(int) expr_float (e1));
 		case 'C':
@@ -1430,7 +1440,7 @@ uop_vector (int op, expr_t *e, expr_t *e1)
 			VectorNegate (expr_vector (e), v);
 			return new_vector_expr (v);
 		case '!':
-			return new_integer_expr (!VectorIsZero (expr_vector (e1)));
+			return cmp_result_expr (!VectorIsZero (expr_vector (e1)));
 	}
 	internal_error (e, "vector unary op blew up");
 }
@@ -1524,7 +1534,7 @@ uop_quaternion (int op, expr_t *e, expr_t *e1)
 			QuatNegate (expr_vector (e), q);
 			return new_quaternion_expr (q);
 		case '!':
-			return new_integer_expr (!QuatIsZero (expr_quaternion (e1)));
+			return cmp_result_expr (!QuatIsZero (expr_quaternion (e1)));
 		case '~':
 			QuatConj (expr_vector (e), q);
 			return new_quaternion_expr (q);
@@ -1550,7 +1560,7 @@ uop_integer (int op, expr_t *e, expr_t *e1)
 		case '-':
 			return new_integer_expr (-expr_integer (e1));
 		case '!':
-			return new_integer_expr (!expr_integer (e1));
+			return cmp_result_expr (!expr_integer (e1));
 		case '~':
 			return new_integer_expr (~expr_integer (e1));
 		case 'C':
@@ -1575,7 +1585,7 @@ uop_uinteger (int op, expr_t *e, expr_t *e1)
 		case '-':
 			return new_uinteger_expr (-expr_uinteger (e1));
 		case '!':
-			return new_integer_expr (!expr_uinteger (e1));
+			return cmp_result_expr (!expr_uinteger (e1));
 		case '~':
 			return new_uinteger_expr (~expr_uinteger (e1));
 	}
@@ -1598,7 +1608,7 @@ uop_short (int op, expr_t *e, expr_t *e1)
 		case '-':
 			return new_short_expr (-expr_short (e1));
 		case '!':
-			return new_integer_expr (!expr_short (e1));
+			return cmp_result_expr (!expr_short (e1));
 		case '~':
 			return new_short_expr (~expr_short (e1));
 	}
@@ -1626,7 +1636,7 @@ uop_double (int op, expr_t *e, expr_t *e1)
 			return new_double_expr (-expr_double (e1));
 		case '!':
 			print_type (get_type (e));
-			return new_integer_expr (!expr_double (e1));
+			return cmp_result_expr (!expr_double (e1));
 		case 'C':
 			if (type == &type_integer) {
 				return new_integer_expr (expr_double (e1));

From 9c26d12f95bae7c4223dc601ed49f577ec267ae4 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 24 Feb 2020 02:13:23 +0900
Subject: [PATCH 0492/1519] Cast rather than alias for testing constants

Fixes ICE in do { ... } while (1);
---
 tools/qfcc/source/expr_bool.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/tools/qfcc/source/expr_bool.c b/tools/qfcc/source/expr_bool.c
index 6eda9aa8d..c460144b5 100644
--- a/tools/qfcc/source/expr_bool.c
+++ b/tools/qfcc/source/expr_bool.c
@@ -96,14 +96,22 @@ test_expr (expr_t *e)
 		case ev_uinteger:
 		case ev_integer:
 		case ev_short:
-			if (type_default != &type_integer)
+			if (type_default != &type_integer) {
+				if (is_constant (e)) {
+					return cast_expr (type_default, e);
+				}
 				return new_alias_expr (type_default, e);
+			}
 			return e;
 		case ev_float:
 			if (options.code.fast_float
 				|| options.code.progsversion == PROG_ID_VERSION) {
-				if (type_default != &type_float)
+				if (type_default != &type_float) {
+					if (is_constant (e)) {
+						return cast_expr (type_default, e);
+					}
 					return new_alias_expr (type_default, e);
+				}
 				return e;
 			}
 			new = new_float_expr (0);

From ac32bbca40d0dbb1f79d78e202f5a496c0005005 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 24 Feb 2020 02:14:44 +0900
Subject: [PATCH 0493/1519] Improve code for short-circuited float logic

---
 tools/qfcc/source/expr_bool.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/tools/qfcc/source/expr_bool.c b/tools/qfcc/source/expr_bool.c
index c460144b5..7f7fdbfee 100644
--- a/tools/qfcc/source/expr_bool.c
+++ b/tools/qfcc/source/expr_bool.c
@@ -280,9 +280,16 @@ convert_bool (expr_t *e, int block)
 		e = test_expr (e);
 		if (e->type == ex_error)
 			return e;
-		if (is_integer_val (e)) {
+		if (is_constant (e)) {
+			int         val;
+
 			b = goto_expr (0);
-			if (expr_integer (e))
+			if (is_integer_val (e)) {
+				val = expr_integer (e);
+			} else {
+				val = expr_float (e) != 0;
+			}
+			if (val)
 				e = new_bool_expr (make_list (b), 0, b);
 			else
 				e = new_bool_expr (0, make_list (b), b);

From 2adcad7c84e23522a94cf6f683b294b4cb5ab80a Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 24 Feb 2020 02:25:28 +0900
Subject: [PATCH 0494/1519] Allow non-short-circuited logic to work

---
 tools/qfcc/source/expr_binary.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/qfcc/source/expr_binary.c b/tools/qfcc/source/expr_binary.c
index ee1fb162c..228112311 100644
--- a/tools/qfcc/source/expr_binary.c
+++ b/tools/qfcc/source/expr_binary.c
@@ -72,6 +72,8 @@ static expr_type_t float_float[] = {
 	{MOD,	&type_float},
 	{SHL,	&type_float},
 	{SHR,	&type_float},
+	{AND,	&type_integer},
+	{OR,	&type_integer},
 	{EQ,	&type_integer},
 	{NE,	&type_integer},
 	{LE,	&type_integer},
@@ -274,6 +276,8 @@ static expr_type_t integer_integer[] = {
 	{MOD,	&type_integer},
 	{SHL,	&type_integer},
 	{SHR,	&type_integer},
+	{AND,	&type_integer},
+	{OR,	&type_integer},
 	{EQ,	&type_integer},
 	{NE,	&type_integer},
 	{LE,	&type_integer},

From c43b9681ebc62155b316f56e1d300ccec44a05e9 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 24 Feb 2020 08:43:32 +0900
Subject: [PATCH 0495/1519] Keep structure members aligned

---
 tools/qfcc/source/struct.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/qfcc/source/struct.c b/tools/qfcc/source/struct.c
index 800a1aa66..5fe569d31 100644
--- a/tools/qfcc/source/struct.c
+++ b/tools/qfcc/source/struct.c
@@ -124,6 +124,7 @@ build_struct (int su, symbol_t *tag, symtab_t *symtab, type_t *type)
 		if (s->sy_type != sy_var)
 			continue;
 		if (su == 's') {
+			symtab->size = RUP (symtab->size, s->type->alignment);
 			s->s.offset = symtab->size;
 			symtab->size += type_size (s->type);
 		} else {

From 7406e0308e85179f0104a785ea233abc989b8314 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 24 Feb 2020 11:28:43 +0900
Subject: [PATCH 0496/1519] Fix some warnings picked up in an optimized build

---
 include/QF/progs.h           | 6 +++---
 libs/console/buffer.c        | 2 +-
 libs/gamecode/pr_debug.c     | 8 ++++----
 tools/qfcc/source/obj_file.c | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/include/QF/progs.h b/include/QF/progs.h
index 78b3036c7..d007ac81f 100644
--- a/include/QF/progs.h
+++ b/include/QF/progs.h
@@ -1787,7 +1787,7 @@ struct progs_s {
 	\return			C pointer represented by the parameter. 0 offset -> NULL
 */
 static inline pr_type_t *
-PR_GetPointer (progs_t *pr, pointer_t o)
+PR_GetPointer (const progs_t *pr, pointer_t o)
 {
 	return o ? pr->pr_globals + o : 0;
 }
@@ -1798,9 +1798,9 @@ PR_GetPointer (progs_t *pr, pointer_t o)
 	\return			Progs offset/pointer represented by \c p. NULL -> 0 offset
 */
 static inline pointer_t
-PR_SetPointer (progs_t *pr, void *p)
+PR_SetPointer (const progs_t *pr, const void *p)
 {
-	return p ? (pr_type_t *) p - pr->pr_globals : 0;
+	return p ? (const pr_type_t *) p - pr->pr_globals : 0;
 }
 
 ///@}
diff --git a/libs/console/buffer.c b/libs/console/buffer.c
index d494c0655..2aa477abc 100644
--- a/libs/console/buffer.c
+++ b/libs/console/buffer.c
@@ -92,7 +92,7 @@ Con_BufferAddText (con_buffer_t *buf, const char *text)
 	}
 	while (len--) {
 		byte        c = *pos++ = *text++;
-		if ((size_t) (pos - buf->buffer) >= buf->buffer_size)
+		if (pos >= buf->buffer + buf->buffer_size)
 			pos = buf->buffer;
 		cur_line->len++;
 		if (pos == tail_line->text) {
diff --git a/libs/gamecode/pr_debug.c b/libs/gamecode/pr_debug.c
index 9b0deece5..d895f631a 100644
--- a/libs/gamecode/pr_debug.c
+++ b/libs/gamecode/pr_debug.c
@@ -196,8 +196,8 @@ pr_debug_expression_error (script_t *script, const char *msg)
 }
 
 #define RUP(x,a) (((x) + ((a) - 1)) & ~((a) - 1))
-static pr_short_t
-pr_debug_type_size (progs_t *pr, qfot_type_t *type)
+static pr_short_t __attribute__((pure))
+pr_debug_type_size (const progs_t *pr, const qfot_type_t *type)
 {
 	pr_short_t  size;
 	qfot_type_t *aux_type;
@@ -208,7 +208,7 @@ pr_debug_type_size (progs_t *pr, qfot_type_t *type)
 		case ty_union:
 			size = 0;
 			for (pr_int_t i = 0; i < type->t.strct.num_fields; i++) {
-				qfot_var_t *field = &type->t.strct.fields[i];
+				const qfot_var_t *field = &type->t.strct.fields[i];
 				aux_type = &G_STRUCT (pr, qfot_type_t, field->type);
 				size = max (size,
 							field->offset + pr_debug_type_size (pr, aux_type));
@@ -995,7 +995,7 @@ pr_debug_pointer_view (qfot_type_t *type, pr_type_t *value, void *_data)
 	progs_t    *pr = data->pr;
 	dstring_t  *dstr = data->dstr;
 	pointer_t   ofs = value->integer_var;
-	pr_def_t   *def;
+	pr_def_t   *def = 0;
 
 	if (pr_debug->int_val && pr->debug) {
 		def = PR_Get_Local_Def (pr, ofs);
diff --git a/tools/qfcc/source/obj_file.c b/tools/qfcc/source/obj_file.c
index 735a68ab0..855e48b61 100644
--- a/tools/qfcc/source/obj_file.c
+++ b/tools/qfcc/source/obj_file.c
@@ -891,7 +891,7 @@ qfo_to_progs (qfo_t *qfo, int *size)
 	int         xdefs_start;
 	unsigned    big_locals = 0;
 	int         big_func = 0;
-	pr_xdefs_t *xdefs;
+	pr_xdefs_t *xdefs = 0;
 	xdef_t     *xdef;
 
 	*size = RUP (sizeof (dprograms_t), 16);

From a30433fa9ebfa47ced0ac883e33f8d0c333c3272 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 24 Feb 2020 12:21:20 +0900
Subject: [PATCH 0497/1519] Make header protection consistent

And delete a couple of useless files.
---
 include/QF/Makefile.am |  4 ++--
 include/QF/bspfile.h   |  6 ++---
 include/QF/cdaudio.h   |  6 ++---
 include/QF/checksum.h  |  6 ++---
 include/QF/console.h   |  6 ++---
 include/QF/crc.h       |  6 ++---
 include/QF/cvar.h      |  6 ++---
 include/QF/draw.h      |  6 ++---
 include/QF/dstring.h   |  6 ++---
 include/QF/gib.h       |  6 ++---
 include/QF/hash.h      |  6 ++---
 include/QF/hl.h        | 40 --------------------------------
 include/QF/image.h     |  2 +-
 include/QF/info.h      |  6 ++---
 include/QF/input.h     |  6 ++---
 include/QF/iqm.h       |  6 ++---
 include/QF/joystick.h  |  6 ++---
 include/QF/keys.h      |  6 ++---
 include/QF/link.h      |  6 ++---
 include/QF/llist.h     |  6 ++---
 include/QF/locs.h      |  6 ++---
 include/QF/mathlib.h   |  6 ++---
 include/QF/mdfour.h    |  6 ++---
 include/QF/model.h     |  6 ++---
 include/QF/modelgen.h  |  6 ++---
 include/QF/msg.h       |  6 ++---
 include/QF/object.h    |  6 ++---
 include/QF/pak.h       |  6 ++---
 include/QF/pcx.h       |  6 ++---
 include/QF/plugin.h    |  6 ++---
 include/QF/pr_comp.h   |  6 ++---
 include/QF/pr_debug.h  |  6 ++---
 include/QF/pr_obj.h    |  6 ++---
 include/QF/pr_type.h   |  6 ++---
 include/QF/qargs.h     |  6 ++---
 include/QF/qdefs.h     |  6 ++---
 include/QF/qendian.h   |  6 ++---
 include/QF/qfplist.h   |  6 ++---
 include/QF/qtypes.h    |  6 ++---
 include/QF/quakefs.h   |  6 ++---
 include/QF/quakeio.h   |  6 ++---
 include/QF/render.h    |  6 ++---
 include/QF/screen.h    |  6 ++---
 include/QF/sizebuf.h   |  6 ++---
 include/QF/skin.h      |  6 ++---
 include/QF/sound.h     |  6 ++---
 include/QF/spritegn.h  |  6 ++---
 include/QF/sys.h       |  6 ++---
 include/QF/teamplay.h  |  6 ++---
 include/QF/tga.h       |  6 ++---
 include/QF/uint32.h    | 52 ------------------------------------------
 include/QF/va.h        |  6 ++---
 include/QF/ver_check.h |  6 ++---
 include/QF/vid.h       |  6 ++---
 include/QF/view.h      |  6 ++---
 include/QF/wad.h       |  6 ++---
 include/QF/zone.h      |  6 ++---
 57 files changed, 162 insertions(+), 254 deletions(-)
 delete mode 100644 include/QF/hl.h
 delete mode 100644 include/QF/uint32.h

diff --git a/include/QF/Makefile.am b/include/QF/Makefile.am
index 8bf956359..3041d64d6 100644
--- a/include/QF/Makefile.am
+++ b/include/QF/Makefile.am
@@ -2,14 +2,14 @@ AUTOMAKE_OPTIONS = foreign
 pkgincludedir = $(includedir)/QF
 nobase_pkginclude_HEADERS = \
 	alloc.h bspfile.h cbuf.h cdaudio.h checksum.h clip_hull.h cmd.h \
-	console.h crc.h csqc.h cvar.h dstring.h draw.h gib.h hash.h hl.h \
+	console.h crc.h csqc.h cvar.h dstring.h draw.h gib.h hash.h \
 	idparse.h image.h in_event.h info.h input.h iqm.h joystick.h keys.h \
 	link.h llist.h locs.h mathlib.h mdfour.h mersenne.h model.h modelgen.h \
 	msg.h object.h pak.h pakfile.h pcx.h png.h plugin.h pr_comp.h pr_debug.h \
 	pr_obj.h pr_type.h progs.h qargs.h qdefs.h qendian.h qfplist.h qtypes.h \
 	quakefs.h \
 	quakeio.h render.h riff.h ruamoko.h screen.h script.h segtext.h set.h \
-	sizebuf.h skin.h sound.h spritegn.h sys.h teamplay.h tga.h uint32.h va.h \
+	sizebuf.h skin.h sound.h spritegn.h sys.h teamplay.h tga.h va.h \
 	ver_check.h vid.h vrect.h view.h wad.h wadfile.h winding.h zone.h \
 	\
 	GL/ati.h GL/defines.h GL/extensions.h GL/funcs.h GL/qf_draw.h \
diff --git a/include/QF/bspfile.h b/include/QF/bspfile.h
index b7683849f..0d32c09e8 100644
--- a/include/QF/bspfile.h
+++ b/include/QF/bspfile.h
@@ -24,8 +24,8 @@
 		Boston, MA  02111-1307, USA
 
 */
-#ifndef __bspfile_h_
-#define __bspfile_h_
+#ifndef __QF_bspfile_h
+#define __QF_bspfile_h
 
 #include "QF/qtypes.h"
 #include "QF/quakeio.h"
@@ -310,4 +310,4 @@ void BSP_AddVisibility (bsp_t *bsp, const byte *visdata, size_t visdatasize);
 void BSP_AddEntities (bsp_t *bsp, const char *entdata, size_t entdatasize);
 void BSP_AddTextures (bsp_t *bsp, const byte *texdata, size_t texdatasize);
 
-#endif//__bspfile_h_
+#endif//__QF_bspfile_h
diff --git a/include/QF/cdaudio.h b/include/QF/cdaudio.h
index e7596ad78..abc07b2e7 100644
--- a/include/QF/cdaudio.h
+++ b/include/QF/cdaudio.h
@@ -25,8 +25,8 @@
 
 */
 
-#ifndef _CDAUDIO_H
-#define _CDAUDIO_H
+#ifndef __QF_cdaudio_h
+#define __QF_cdaudio_h
 
 #include "QF/qtypes.h"
 
@@ -38,4 +38,4 @@ void CDAudio_Resume(void);
 void CDAudio_Shutdown(void);
 void CDAudio_Update(void);
 
-#endif // _CDAUDIO_H
+#endif//__QF_cdaudio_h
diff --git a/include/QF/checksum.h b/include/QF/checksum.h
index ed6f035b1..12fcaf477 100644
--- a/include/QF/checksum.h
+++ b/include/QF/checksum.h
@@ -25,8 +25,8 @@
 
 */
 
-#ifndef __checksum_h
-#define __checksum_h
+#ifndef __QF_checksum_h
+#define __QF_checksum_h
 
 /** \addtogroup crc
 */
@@ -40,4 +40,4 @@ byte	COM_BlockSequenceCRCByte (const byte *base, int length, int sequence);
 
 ///@}
 
-#endif // __checksum_h
+#endif//__QF_checksum_h
diff --git a/include/QF/console.h b/include/QF/console.h
index 4f3bcb3c8..da88f8744 100644
--- a/include/QF/console.h
+++ b/include/QF/console.h
@@ -25,8 +25,8 @@
 
 */
 
-#ifndef __console_h
-#define __console_h
+#ifndef __QF_console_h
+#define __QF_console_h
 
 #include <stdarg.h>
 
@@ -151,4 +151,4 @@ void Menu_Leave_f (void);
 void Menu_Prev_f (void);
 void Menu_Next_f (void);
 
-#endif // __console_h
+#endif//__QF_console_h
diff --git a/include/QF/crc.h b/include/QF/crc.h
index cc635e7b9..ad26bacb8 100644
--- a/include/QF/crc.h
+++ b/include/QF/crc.h
@@ -25,8 +25,8 @@
 
 */
 
-#ifndef __crc_h
-#define __crc_h
+#ifndef __QF_crc_h
+#define __QF_crc_h
 
 /** \defgroup crc Checksum generation.
 	\ingroup utils
@@ -43,4 +43,4 @@ unsigned short CRC_Block (const byte *start, int count) __attribute__((pure));
 
 ///@}
 
-#endif // __crc_h
+#endif//__QF_crc_h
diff --git a/include/QF/cvar.h b/include/QF/cvar.h
index 3d81a3b1c..946a20f13 100644
--- a/include/QF/cvar.h
+++ b/include/QF/cvar.h
@@ -25,8 +25,8 @@
 
 */
 
-#ifndef __cvar_h
-#define __cvar_h
+#ifndef __QF_cvar_h
+#define __QF_cvar_h
 
 /** \defgroup cvar Configuration variables
 	\ingroup utils
@@ -140,4 +140,4 @@ extern cvar_t	*cvar_vars;
 
 ///@}
 
-#endif // __cvar_h
+#endif//__QF_cvar_h
diff --git a/include/QF/draw.h b/include/QF/draw.h
index 529f3e892..8f6b78889 100644
--- a/include/QF/draw.h
+++ b/include/QF/draw.h
@@ -25,8 +25,8 @@
 
 */
 
-#ifndef _DRAW_H
-#define _DRAW_H
+#ifndef __QF_draw_h
+#define __QF_draw_h
 
 /** \defgroup video Video Sub-sytem */
 
@@ -234,4 +234,4 @@ void Draw_Picf (float x, float y, qpic_t *pic);
 void Draw_SubPic(int x, int y, qpic_t *pic, int srcx, int srcy, int width, int height);
 ///@}
 
-#endif // _DRAW_H
+#endif//__QF_draw_h
diff --git a/include/QF/dstring.h b/include/QF/dstring.h
index 638d9e340..bb5ea9117 100644
--- a/include/QF/dstring.h
+++ b/include/QF/dstring.h
@@ -25,8 +25,8 @@
 
 */
 
-#ifndef __dstring_h
-#define __dstring_h
+#ifndef __QF_dstring_h
+#define __QF_dstring_h
 
 /** \defgroup dstring Dynamic Strings
 	\ingroup utils
@@ -177,4 +177,4 @@ int dasprintf (dstring_t *dstr, const char *fmt, ...) __attribute__((format(prin
 
 ///@}
 
-#endif // __dstring_h
+#endif//__QF_dstring_h
diff --git a/include/QF/gib.h b/include/QF/gib.h
index 34c187ac7..09bcf01ad 100644
--- a/include/QF/gib.h
+++ b/include/QF/gib.h
@@ -28,8 +28,8 @@
 
 */
 
-#ifndef __gib_h
-#define __gib_h
+#ifndef __QF_gib_h
+#define __QF_gib_h
 
 // Dependencies
 
@@ -216,4 +216,4 @@ unsigned long int GIB_Handle_New (gib_object_t *data);
 void GIB_Handle_Free (unsigned long int num);
 gib_object_t *GIB_Handle_Get (unsigned long int num) __attribute__((pure));
 
-#endif
+#endif//__QF_gib_h
diff --git a/include/QF/hash.h b/include/QF/hash.h
index ae040cfa9..7a31a06db 100644
--- a/include/QF/hash.h
+++ b/include/QF/hash.h
@@ -25,8 +25,8 @@
 
 */
 
-#ifndef __hash_h
-#define __hash_h
+#ifndef __QF_hash_h
+#define __QF_hash_h
 
 #include <stdint.h>
 #include <stdlib.h>
@@ -211,4 +211,4 @@ void Hash_Stats (hashtab_t *tab);
 
 ///@}
 
-#endif // __hash_h
+#endif//__QF_hash_h
diff --git a/include/QF/hl.h b/include/QF/hl.h
deleted file mode 100644
index 286768cc0..000000000
--- a/include/QF/hl.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-	hl_bsp.h
-
-	Half Life file definitions
-
-	Copyright (C) 1996-1997  Id Software, Inc.
-
-	This program is free software; you can redistribute it and/or
-	modify it under the terms of the GNU General Public License
-	as published by the Free Software Foundation; either version 2
-	of the License, or (at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-	See the GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to:
-
-		Free Software Foundation, Inc.
-		59 Temple Place - Suite 330
-		Boston, MA  02111-1307, USA
-
-*/
-
-
-#ifndef _HL_BSP_H
-#define _HL_BSP_H
-
-#include "QF/qtypes.h"
-
-extern void CL_ParseEntityLump(const char *entdata);
-extern void HL_Mod_LoadLighting (lump_t *l);
-extern void HL_Mod_LoadTextures (lump_t *l);
-extern byte *W_GetTexture(const char *name, int matchwidth, int matchheight);
-extern void W_LoadTextureWadFile (const char *filename, int complain);
-
-#endif	// _HL_BSP_H
diff --git a/include/QF/image.h b/include/QF/image.h
index 33c69c120..106379bb7 100644
--- a/include/QF/image.h
+++ b/include/QF/image.h
@@ -49,4 +49,4 @@ typedef struct tex_s {
 
 tex_t *LoadImage (const char *imageFile);
 
-#endif //__QF_image_h
+#endif//__QF_image_h
diff --git a/include/QF/info.h b/include/QF/info.h
index 4e34f6fa2..7bf16b0ab 100644
--- a/include/QF/info.h
+++ b/include/QF/info.h
@@ -25,8 +25,8 @@
 
 */
 
-#ifndef _INFO_H
-#define _INFO_H
+#ifndef __QF_info_h
+#define __QF_info_h
 
 /** \defgroup info Info Keys
 	\ingroup utils
@@ -65,4 +65,4 @@ void Info_AddKeys (info_t *info, info_t *keys);
 
 ///@}
 
-#endif	// _INFO_H
+#endif//__QF_info_h
diff --git a/include/QF/input.h b/include/QF/input.h
index 8f0438071..5835ee17b 100644
--- a/include/QF/input.h
+++ b/include/QF/input.h
@@ -25,8 +25,8 @@
 
 */
 
-#ifndef __QF_input_h_
-#define __QF_input_h_
+#ifndef __QF_input_h
+#define __QF_input_h
 
 #include "QF/keys.h"
 
@@ -75,4 +75,4 @@ void IN_LL_Grab_Input (int grab);
 
 extern kbutton_t   in_strafe, in_klook, in_speed, in_mlook;
 
-#endif // __QF_input_h_
+#endif//__QF_input_h
diff --git a/include/QF/iqm.h b/include/QF/iqm.h
index fb6517c76..adc5a3313 100644
--- a/include/QF/iqm.h
+++ b/include/QF/iqm.h
@@ -1,5 +1,5 @@
-#ifndef __QF_iqm_h__
-#define __QF_iqm_h__
+#ifndef __QF_iqm_h
+#define __QF_iqm_h
 
 #include "QF/qtypes.h"
 
@@ -149,4 +149,4 @@ typedef struct {
 	void       *extra_data;
 } iqm_t;
 
-#endif//__QF_iqm_h__
+#endif//__QF_iqm_h
diff --git a/include/QF/joystick.h b/include/QF/joystick.h
index 1eeba5d49..4b8163f7e 100644
--- a/include/QF/joystick.h
+++ b/include/QF/joystick.h
@@ -25,8 +25,8 @@
 
 */
 
-#ifndef __QF_joystick_h_
-#define __QF_joystick_h_
+#ifndef __QF_joystick_h
+#define __QF_joystick_h
 
 #include <QF/qtypes.h>
 #include "QF/quakeio.h"
@@ -154,4 +154,4 @@ int JOY_GetAxis_i (int dest, const char *c);
 
 void Joy_WriteBindings (QFile *f);
 
-#endif	// __QF_joystick_h_
+#endif//__QF_joystick_h
diff --git a/include/QF/keys.h b/include/QF/keys.h
index 66ef8d99e..7c9c959fd 100644
--- a/include/QF/keys.h
+++ b/include/QF/keys.h
@@ -26,8 +26,8 @@
 */
 
 
-#ifndef _KEYS_H
-#define _KEYS_H
+#ifndef __QF_keys_h
+#define __QF_keys_h
 
 #ifndef __QFCC__
 # include "QF/qtypes.h"
@@ -661,4 +661,4 @@ void Key_Progs_Init (struct progs_s *pr);
 
 ///@}
 
-#endif // _KEYS_H
+#endif//__QF_keys_h
diff --git a/include/QF/link.h b/include/QF/link.h
index de29bb454..5b6fdcf8c 100644
--- a/include/QF/link.h
+++ b/include/QF/link.h
@@ -25,8 +25,8 @@
 
 */
 
-#ifndef _LINK_H
-#define _LINK_H
+#ifndef __QF_link_h
+#define __QF_link_h
 
 // (type *)STRUCT_FROM_LINK(link_t *link, type, member)
 // ent = STRUCT_FROM_LINK(link,entity_t,order)
@@ -43,4 +43,4 @@ void RemoveLink (link_t *l);
 void InsertLinkBefore (link_t *l, link_t *before);
 void InsertLinkAfter (link_t *l, link_t *after);
 
-#endif	// _LINK_H
+#endif//__QF_link_h
diff --git a/include/QF/llist.h b/include/QF/llist.h
index b9a3a0140..e555c6bd6 100644
--- a/include/QF/llist.h
+++ b/include/QF/llist.h
@@ -25,8 +25,8 @@
 
 */
 
-#ifndef _LLIST_H
-#define _LLIST_H
+#ifndef __QF_llist_h
+#define __QF_llist_h
 
 #include "QF/qtypes.h"
 
@@ -112,4 +112,4 @@ void *llist_createarray (llist_t *list, size_t esize);
 
 //@}
 
-#endif
+#endif//__QF_llist_h
diff --git a/include/QF/locs.h b/include/QF/locs.h
index 425e8980d..4f7dc9b5c 100644
--- a/include/QF/locs.h
+++ b/include/QF/locs.h
@@ -25,8 +25,8 @@
 
 */
 
-#ifndef __locs_h
-#define __locs_h
+#ifndef __QF_locs_h
+#define __QF_locs_h
 
 #include "QF/qtypes.h"
 
@@ -47,4 +47,4 @@ void locs_reset (void);
 void locs_save (const char *filename, qboolean gz);
 void map_to_loc (const char *mapname, char *filename);
 
-#endif // __locs_h
+#endif//__QF_locs_h
diff --git a/include/QF/mathlib.h b/include/QF/mathlib.h
index 5c9b854fe..851b841eb 100644
--- a/include/QF/mathlib.h
+++ b/include/QF/mathlib.h
@@ -25,8 +25,8 @@
 
 */
 
-#ifndef __mathlib_h
-#define __mathlib_h
+#ifndef __QF_mathlib_h
+#define __QF_mathlib_h
 
 /** \defgroup mathlib Vector and matrix functions
 	\ingroup utils
@@ -220,4 +220,4 @@ void BarycentricCoords (const vec_t **points, int num_points, const vec3_t p,
 
 ///@}
 
-#endif // __mathlib_h
+#endif//__QF_mathlib_h
diff --git a/include/QF/mdfour.h b/include/QF/mdfour.h
index 19360e838..bff20aefb 100644
--- a/include/QF/mdfour.h
+++ b/include/QF/mdfour.h
@@ -26,8 +26,8 @@
 
 */
 
-#ifndef __mdfour_h
-#define __mdfour_h
+#ifndef __QF_mdfour_h
+#define __QF_mdfour_h
 
 /** \addtogroup crc
 */
@@ -49,4 +49,4 @@ void mdfour(unsigned char *out, const unsigned char *in, int n);
 
 ///@}
 
-#endif	// __mdfour_h
+#endif//__QF_mdfour_h
diff --git a/include/QF/model.h b/include/QF/model.h
index 6b3fbc3b5..d4b243241 100644
--- a/include/QF/model.h
+++ b/include/QF/model.h
@@ -25,8 +25,8 @@
 
 */
 
-#ifndef _MODEL_H
-#define _MODEL_H
+#ifndef __QF_model_h
+#define __QF_model_h
 
 #include "QF/qtypes.h"
 #include "QF/bspfile.h"
@@ -468,4 +468,4 @@ extern byte *mod_base;
 extern byte mod_novis[MAX_MAP_LEAFS / 8];
 extern int mod_lightmap_bytes;
 
-#endif	// _MODEL_H
+#endif//__QF_model_h
diff --git a/include/QF/modelgen.h b/include/QF/modelgen.h
index 447a8c864..66cdd1308 100644
--- a/include/QF/modelgen.h
+++ b/include/QF/modelgen.h
@@ -31,8 +31,8 @@
 // * pass data from one to the other via model files.      *
 // *********************************************************
 
-#ifndef _MODELGEN_H
-#define _MODELGEN_H
+#ifndef __QF_modelgen_h
+#define __QF_modelgen_h
 
 #include "QF/mathlib.h"
 
@@ -142,4 +142,4 @@ typedef struct {
 // little-endian "IDP2"
 #define IDHEADER_MD2	(('2'<<24)+('P'<<16)+('D'<<8)+'I')
 
-#endif // _MODELGEN_H
+#endif//__QF_modelgen_h
diff --git a/include/QF/msg.h b/include/QF/msg.h
index 6a92e2d54..4f696f896 100644
--- a/include/QF/msg.h
+++ b/include/QF/msg.h
@@ -24,8 +24,8 @@
 		Boston, MA  02111-1307, USA
 
 */
-#ifndef _MSG_H
-#define _MSG_H
+#ifndef __QF_msg_h
+#define __QF_msg_h
 
 /** \defgroup msg Message reading and writing
 	\ingroup utils
@@ -251,4 +251,4 @@ int MSG_ReadUTF8 (qmsg_t *msg);
 
 ///@}
 
-#endif
+#endif//__QF_msg_h
diff --git a/include/QF/object.h b/include/QF/object.h
index 39f06210b..f5c4f97f8 100644
--- a/include/QF/object.h
+++ b/include/QF/object.h
@@ -32,8 +32,8 @@
 
 */
 
-#ifndef __object_h
-#define __object_h
+#ifndef __QF_object_h
+#define __QF_object_h
 
 #include "QF/qtypes.h"
 
@@ -115,4 +115,4 @@ void Object_Garbage_Collect (void);
 
 #include "QF/classes/String.h"
 
-#endif
+#endif//__QF_object_h
diff --git a/include/QF/pak.h b/include/QF/pak.h
index ea86ffd14..e331fca6e 100644
--- a/include/QF/pak.h
+++ b/include/QF/pak.h
@@ -28,8 +28,8 @@
 
 */
 
-#ifndef __qf_pak_h
-#define __qf_pak_h
+#ifndef __QF_pak_h
+#define __QF_pak_h
 
 /** \addtogroup pak
 */
@@ -53,4 +53,4 @@ typedef struct {
 
 ///@}
 
-#endif//__qf_pak_h
+#endif//__QF_pak_h
diff --git a/include/QF/pcx.h b/include/QF/pcx.h
index 6bfeb03e5..8536b9f69 100644
--- a/include/QF/pcx.h
+++ b/include/QF/pcx.h
@@ -24,8 +24,8 @@
 		Boston, MA  02111-1307, USA
 */
 
-#ifndef __pcx_h
-#define __pcx_h
+#ifndef __QF_pcx_h
+#define __QF_pcx_h
 
 #include "QF/qtypes.h"
 #include "QF/quakeio.h"
@@ -77,4 +77,4 @@ pcx_t *EncodePCX (byte *data, int width, int height, int rowbytes,
 */
 struct tex_s *LoadPCX (QFile *f, qboolean convert, byte *pal);
 
-#endif // __pcx_h
+#endif//__QF_pcx_h
diff --git a/include/QF/plugin.h b/include/QF/plugin.h
index 0a06f73f2..f1ff974a3 100644
--- a/include/QF/plugin.h
+++ b/include/QF/plugin.h
@@ -25,8 +25,8 @@
 
 */
 
-#ifndef __QF_plugin_h_
-#define __QF_plugin_h_
+#ifndef __QF_plugin_h
+#define __QF_plugin_h
 
 /** \defgroup plugin Plugins
 	\ingroup utils
@@ -113,4 +113,4 @@ void PI_Shutdown (void);
 
 ///@}
 
-#endif	// __QF_plugin_h_
+#endif//__QF_plugin_h
diff --git a/include/QF/pr_comp.h b/include/QF/pr_comp.h
index 451d3a9ab..8c03a7981 100644
--- a/include/QF/pr_comp.h
+++ b/include/QF/pr_comp.h
@@ -18,8 +18,8 @@
 */
 
 // this file is shared by QuakeForge and qfcc
-#ifndef __pr_comp_h
-#define __pr_comp_h
+#ifndef __QF_pr_comp_h
+#define __QF_pr_comp_h
 
 #include "QF/qtypes.h"
 
@@ -513,4 +513,4 @@ typedef struct dprograms_s {
 	pr_uint_t   entityfields;
 } dprograms_t;
 
-#endif // __pr_comp_h
+#endif//__QF_pr_comp_h
diff --git a/include/QF/pr_debug.h b/include/QF/pr_debug.h
index d80b9f417..be5e1471d 100644
--- a/include/QF/pr_debug.h
+++ b/include/QF/pr_debug.h
@@ -28,8 +28,8 @@
 
 */
 
-#ifndef __pr_debug_h
-#define __pr_debug_h
+#ifndef __QF_pr_debug_h
+#define __QF_pr_debug_h
 
 #include "QF/pr_comp.h"
 
@@ -65,4 +65,4 @@ typedef struct pr_debug_header_s {
 	pr_uint_t   num_locals;
 } pr_debug_header_t;
 
-#endif//__pr_debug_h
+#endif//__QF_pr_debug_h
diff --git a/include/QF/pr_obj.h b/include/QF/pr_obj.h
index 5e4f8463c..fa3bbca84 100644
--- a/include/QF/pr_obj.h
+++ b/include/QF/pr_obj.h
@@ -28,8 +28,8 @@
 
 */
 
-#ifndef __pr_obj_h
-#define __pr_obj_h
+#ifndef __QF_pr_obj_h
+#define __QF_pr_obj_h
 
 #include "QF/pr_comp.h"
 
@@ -185,4 +185,4 @@ typedef struct pr_super_s {
 	pointer_t   class;
 } pr_super_t;
 
-#endif//__pr_obj_h
+#endif//__QF_pr_obj_h
diff --git a/include/QF/pr_type.h b/include/QF/pr_type.h
index 39215840f..179a4e407 100644
--- a/include/QF/pr_type.h
+++ b/include/QF/pr_type.h
@@ -28,8 +28,8 @@
 
 */
 
-#ifndef __pr_type_h
-#define __pr_type_h
+#ifndef __QF_pr_type_h
+#define __QF_pr_type_h
 
 /** \defgroup qfcc_qfo_type Object file type encoding
 	\ingroup progs
@@ -121,4 +121,4 @@ typedef struct qfot_type_encodings_s {
 
 ///@}
 
-#endif//__pr_type_h
+#endif//__QF_pr_type_h
diff --git a/include/QF/qargs.h b/include/QF/qargs.h
index 50dfbd35a..bf49495a4 100644
--- a/include/QF/qargs.h
+++ b/include/QF/qargs.h
@@ -27,8 +27,8 @@
 
 */
 
-#ifndef __qargs_h
-#define __qargs_h
+#ifndef __QF_qargs_h
+#define __QF_qargs_h
 
 /** \addtogroup misc
 */
@@ -52,4 +52,4 @@ void COM_ParseConfig (void);
 
 ///@}
 
-#endif // __qargs_h
+#endif//__QF_qargs_h
diff --git a/include/QF/qdefs.h b/include/QF/qdefs.h
index 1d00abee0..a0dbbfe5c 100644
--- a/include/QF/qdefs.h
+++ b/include/QF/qdefs.h
@@ -27,8 +27,8 @@
 
 */
 
-#ifndef __qdefs_h
-#define __qdefs_h
+#ifndef __QF_qdefs_h
+#define __QF_qdefs_h
 
 #define MAX_QPATH		64
 #define MAX_CL_STATS	32
@@ -40,4 +40,4 @@
 
 #define clc_stringcmd	4
 
-#endif // __qdefs_h
+#endif//__QF_qdefs_h
diff --git a/include/QF/qendian.h b/include/QF/qendian.h
index a42bd749f..7c418be53 100644
--- a/include/QF/qendian.h
+++ b/include/QF/qendian.h
@@ -27,8 +27,8 @@
 
 */
 
-#ifndef __qendian_h
-#define __qendian_h
+#ifndef __QF_qendian_h
+#define __QF_qendian_h
 
 /** \defgroup qendian Endian handling functions
 	\ingroup utils
@@ -120,4 +120,4 @@ unsigned int ReadLong (struct QFile_s *file);
 
 ///@}
 
-#endif // __qendian_h
+#endif//__QF_qendian_h
diff --git a/include/QF/qfplist.h b/include/QF/qfplist.h
index e0c2557ca..7a12b7c4c 100644
--- a/include/QF/qfplist.h
+++ b/include/QF/qfplist.h
@@ -25,8 +25,8 @@
 
 */
 
-#ifndef __QF_qfplist_h_
-#define __QF_qfplist_h_
+#ifndef __QF_qfplist_h
+#define __QF_qfplist_h
 
 /** \defgroup qfplist Property lists
 	\ingroup utils
@@ -228,4 +228,4 @@ void PL_Free (plitem_t *item);
 
 ///@}
 
-#endif	// __QF_qfplist_h_
+#endif//__QF_qfplist_h
diff --git a/include/QF/qtypes.h b/include/QF/qtypes.h
index e328ff2fc..ea3a4df6c 100644
--- a/include/QF/qtypes.h
+++ b/include/QF/qtypes.h
@@ -27,8 +27,8 @@
 
 */
 
-#ifndef __qtypes_h
-#define __qtypes_h
+#ifndef __QF_qtypes_h
+#define __QF_qtypes_h
 
 #include <stdio.h>
 #include <stdint.h>
@@ -115,4 +115,4 @@ typedef struct sphere_s {
 	vec_t       radius;
 } sphere_t;
 
-#endif // __qtypes_h
+#endif//__QF_qtypes_h
diff --git a/include/QF/quakefs.h b/include/QF/quakefs.h
index 364718db0..761997eea 100644
--- a/include/QF/quakefs.h
+++ b/include/QF/quakefs.h
@@ -27,8 +27,8 @@
 
 */
 
-#ifndef __quakefs_h
-#define __quakefs_h
+#ifndef __QF_quakefs_h
+#define __QF_quakefs_h
 
 /** \defgroup quakefs Quake Filesystem
 	\ingroup utils
@@ -420,4 +420,4 @@ void QFS_FilelistFree (filelist_t *list);
 
 ///@}
 
-#endif // __quakefs_h
+#endif//__QF_quakefs_h
diff --git a/include/QF/quakeio.h b/include/QF/quakeio.h
index 08b14af69..1fd7205a0 100644
--- a/include/QF/quakeio.h
+++ b/include/QF/quakeio.h
@@ -26,8 +26,8 @@
 		Boston, MA  02111-1307, USA
 
 */
-#ifndef __quakeio_h
-#define __quakeio_h
+#ifndef __QF_quakeio_h
+#define __QF_quakeio_h
 
 #include <stdio.h>
 
@@ -62,4 +62,4 @@ const char *Qgetline(QFile *file);
 
 ///@}
 
-#endif /*__quakeio_h*/
+#endif//__QF_quakeio_h
diff --git a/include/QF/render.h b/include/QF/render.h
index cc08c3800..86892e4ec 100644
--- a/include/QF/render.h
+++ b/include/QF/render.h
@@ -25,8 +25,8 @@
 
 */
 
-#ifndef __render_h
-#define __render_h
+#ifndef __QF_render_h
+#define __QF_render_h
 
 #include "QF/mathlib.h"
 #include "QF/model.h"
@@ -177,4 +177,4 @@ void R_LoadModule (void (*load_gl)(void),
 struct progs_s;
 void R_Progs_Init (struct progs_s *pr);
 
-#endif // __render_h
+#endif//__QF_render_h
diff --git a/include/QF/screen.h b/include/QF/screen.h
index 9586e20a1..8dda2deb4 100644
--- a/include/QF/screen.h
+++ b/include/QF/screen.h
@@ -26,8 +26,8 @@
 */
 // screen.h
 
-#ifndef __screen_h
-#define __screen_h
+#ifndef __QF_screen_h
+#define __QF_screen_h
 
 #include "QF/qtypes.h"
 
@@ -67,4 +67,4 @@ extern struct qpic_s *scr_turtle;
 
 extern struct cvar_s *hud_fps, *hud_time;
 
-#endif // __screen_h
+#endif//__QF_screen_h
diff --git a/include/QF/sizebuf.h b/include/QF/sizebuf.h
index 7f6fc4ac3..08436b1b8 100644
--- a/include/QF/sizebuf.h
+++ b/include/QF/sizebuf.h
@@ -24,8 +24,8 @@
 		Boston, MA  02111-1307, USA
 
 */
-#ifndef __sizebuf_h
-#define __sizebuf_h
+#ifndef __QF_sizebuf_h
+#define __QF_sizebuf_h
 
 /** \defgroup sizebuf Fixed Size Buffers
 	\ingroup utils
@@ -53,4 +53,4 @@ void SZ_Print (sizebuf_t *buf, const char *data);	// strcats onto the sizebuf
 
 ///@}
 
-#endif // __sizebuf_h
+#endif//__QF_sizebuf_h
diff --git a/include/QF/skin.h b/include/QF/skin.h
index b9c8a3dcb..7f520e1d6 100644
--- a/include/QF/skin.h
+++ b/include/QF/skin.h
@@ -25,8 +25,8 @@
 
 */
 
-#ifndef _SKIN_H
-#define _SKIN_H
+#ifndef __QF_skin_h
+#define __QF_skin_h
 
 #include "QF/qtypes.h"
 #include "QF/vid.h"
@@ -57,4 +57,4 @@ typedef struct skin_s {
 	int         auxtex;
 } skin_t;
 
-#endif
+#endif//__QF_skin_h
diff --git a/include/QF/sound.h b/include/QF/sound.h
index 3382d4b91..9fba9b158 100644
--- a/include/QF/sound.h
+++ b/include/QF/sound.h
@@ -26,8 +26,8 @@
 */
 // sound.h -- client sound i/o functions
 
-#ifndef _SOUND_H
-#define _SOUND_H
+#ifndef __QF_sound_h
+#define __QF_sound_h
 
 /** \defgroup sound QuakeForge sound engine
 */
@@ -195,4 +195,4 @@ void S_Progs_Init (struct progs_s *pr);
 
 ///@}
 
-#endif // _SOUND_H
+#endif//__QF_sound_h
diff --git a/include/QF/spritegn.h b/include/QF/spritegn.h
index 4505ad59f..de490f28d 100644
--- a/include/QF/spritegn.h
+++ b/include/QF/spritegn.h
@@ -45,8 +45,8 @@
 // <endrepeat>
 //-------------------------------------------------------
 
-#ifndef _SPRITEGN_H
-#define _SPRITEGN_H
+#ifndef __QF_sprintgn_h
+#define __QF_sprintgn_h
 
 #define SPR_VERSION		1
 #define SP2_VERSION		2
@@ -102,4 +102,4 @@ typedef struct {
 // little-endian "IDS2"
 #define IDHEADER_SP2 (('2'<<24)+('S'<<16)+('D'<<8)+'I')
 
-#endif // _SPRITEGN_H
+#endif//__QF_sprintgn_h
diff --git a/include/QF/sys.h b/include/QF/sys.h
index 76b6ad844..06e2590fa 100644
--- a/include/QF/sys.h
+++ b/include/QF/sys.h
@@ -25,8 +25,8 @@
 
 */
 
-#ifndef __sys_h
-#define __sys_h
+#ifndef __QF_sys_h
+#define __QF_sys_h
 
 /** \defgroup sys System Portability
 	\ingroup utils
@@ -159,4 +159,4 @@ char *Sys_ExpandSquiggle (const char *path);
 
 ///@}
 
-#endif // __sys_h
+#endif//__QF_sys_h
diff --git a/include/QF/teamplay.h b/include/QF/teamplay.h
index bf4ae9445..91b2a6f65 100644
--- a/include/QF/teamplay.h
+++ b/include/QF/teamplay.h
@@ -25,8 +25,8 @@
 
 */
 
-#ifndef __teamplay_h
-#define __teamplay_h
+#ifndef __QF_teamplay_h
+#define __QF_teamplay_h
 
 extern struct cvar_s	*cl_parsesay;
 extern struct cvar_s	*cl_nofake;
@@ -47,4 +47,4 @@ const char *Team_ParseSay (struct dstring_s *buf, const char *);
 void Locs_Init (void);
 void Team_ParseChat (const char *string);
 void Team_ResetTimers (void);
-#endif // __teamplay_h
+#endif//__QF_teamplay_h
diff --git a/include/QF/tga.h b/include/QF/tga.h
index 1d0bc8c25..365f5d366 100644
--- a/include/QF/tga.h
+++ b/include/QF/tga.h
@@ -25,8 +25,8 @@
 
 */
 
-#ifndef __tga_h
-#define __tga_h
+#ifndef __QF_tga_h
+#define __QF_tga_h
 
 #include "QF/qtypes.h"
 #include "QF/quakeio.h"
@@ -70,4 +70,4 @@ typedef struct _TargaHeader {
 struct tex_s *LoadTGA (QFile *fin);
 void WriteTGAfile (const char *tganame, byte *data, int width, int height);
 
-#endif // __tga_h
+#endif//__QF_tga_h
diff --git a/include/QF/uint32.h b/include/QF/uint32.h
deleted file mode 100644
index 513117d01..000000000
--- a/include/QF/uint32.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-	uint32.h
-
-	Definitions for portable (?) unsigned int
-
-	Copyright (C) 2000       Jeff Teunissen <d2deek@pmail.net>
-
-	Author: Jeff Teunissen	<d2deek@pmail.net>
-	Date: 01 Jan 2000
-
-	This program is free software; you can redistribute it and/or
-	modify it under the terms of the GNU General Public License
-	as published by the Free Software Foundation; either version 2
-	of the License, or (at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-	See the GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to:
-
-		Free Software Foundation, Inc.
-		59 Temple Place - Suite 330
-		Boston, MA  02111-1307, USA
-
-*/
-
-#ifndef __uint32_h
-#define __uint32_h
-
-#ifndef int32
-# if (SIZEOF_INT == 4)
-#  define int32 int
-# elif (SIZEOF_LONG == 4)
-#  define int32 long
-# elif (SIZEOF_SHORT == 4)
-#  define int32 short
-# else
-/* I hope this works */
-#  define int32 int
-#  define LARGE_INT32
-# endif
-#endif
-
-#ifndef uint32
-# define uint32 unsigned int32
-#endif
-
-#endif	// __uint32_h
diff --git a/include/QF/va.h b/include/QF/va.h
index 40c794712..1bf0eadaf 100644
--- a/include/QF/va.h
+++ b/include/QF/va.h
@@ -26,8 +26,8 @@
 
 */
 
-#ifndef __va_h
-#define __va_h
+#ifndef __QF_va_h
+#define __QF_va_h
 
 /** \addtogroup misc
 	Formatted printing.
@@ -41,4 +41,4 @@ char	*nva(const char *format, ...) __attribute__((format(printf,1,2)));
 
 ///@}
 
-#endif // __va_h
+#endif//__QF_va_h
diff --git a/include/QF/ver_check.h b/include/QF/ver_check.h
index 8ac943796..eaa4d9391 100644
--- a/include/QF/ver_check.h
+++ b/include/QF/ver_check.h
@@ -25,8 +25,8 @@
 
 */
 
-#ifndef __ver_check_h_
-#define __ver_check_h_
+#ifndef __QF_ver_check_h
+#define __QF_ver_check_h
 
 /** \defgroup utils Utils
 */
@@ -47,4 +47,4 @@ int ver_compare (const char *, const char *);
 
 ///@}
 
-#endif	// __ver_check_h_
+#endif//__QF_ver_check_h
diff --git a/include/QF/vid.h b/include/QF/vid.h
index 70298fa8b..312da65dd 100644
--- a/include/QF/vid.h
+++ b/include/QF/vid.h
@@ -25,8 +25,8 @@
 
 */
 
-#ifndef __vid_h_
-#define __vid_h_
+#ifndef __QF_vid_h
+#define __QF_vid_h
 
 #include "QF/qtypes.h"
 #include "QF/vrect.h"
@@ -89,4 +89,4 @@ void VID_Init (byte *palette, byte *colormap);
 void VID_Shutdown (void);
 void VID_SetCaption (const char *text);
 
-#endif	// __vid_h_
+#endif//__QF_vid_h
diff --git a/include/QF/view.h b/include/QF/view.h
index 570935ae8..5a6ae339f 100644
--- a/include/QF/view.h
+++ b/include/QF/view.h
@@ -28,8 +28,8 @@
 
 */
 
-#ifndef __qf_view_h
-#define __qf_view_h
+#ifndef __QF_view_h
+#define __QF_view_h
 
 /** \defgroup console_view Console View Objects
 	\ingroup console
@@ -217,4 +217,4 @@ void view_move (view_t *view, int xp, int yp);
 
 ///@}
 
-#endif//__qf_view_h
+#endif//__QF_view_h
diff --git a/include/QF/wad.h b/include/QF/wad.h
index 82e836dc9..2e6bb9c67 100644
--- a/include/QF/wad.h
+++ b/include/QF/wad.h
@@ -26,8 +26,8 @@
 */
 // wad.h
 
-#ifndef _WAD_H
-#define _WAD_H
+#ifndef __QF_wad_h
+#define __QF_wad_h
 
 /** \addtogroup wad
 	Wad Files
@@ -48,4 +48,4 @@ void SwapPic (qpic_t *pic);
 
 ///@}
 
-#endif // _WAD_H
+#endif//__QF_wad_h
diff --git a/include/QF/zone.h b/include/QF/zone.h
index 1f968737f..10063b2cc 100644
--- a/include/QF/zone.h
+++ b/include/QF/zone.h
@@ -24,8 +24,8 @@
 		Boston, MA  02111-1307, USA
 
 */
-#ifndef __zone_h
-#define __zone_h
+#ifndef __QF_zone_h
+#define __QF_zone_h
 
 /** \defgroup zone Memory Management
 	\ingroup utils
@@ -142,4 +142,4 @@ int Cache_ReadLock (cache_user_t *c) __attribute__((pure));
 
 ///@}
 
-#endif // __zone_h
+#endif//__QF_zone_h

From f7493fe8fb65a8a356c157185c647f131cf48730 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 24 Feb 2020 17:30:33 +0900
Subject: [PATCH 0498/1519] Add a buffer-gap text buffer

This should be good for text editing and working with text files in
general.
---
 include/QF/txtbuffer.h          |  98 +++++++++++++
 libs/util/Makefile.am           |   3 +-
 libs/util/test/Makefile.am      |   6 +-
 libs/util/test/test-txtbuffer.c | 240 ++++++++++++++++++++++++++++++++
 libs/util/txtbuffer.c           | 172 +++++++++++++++++++++++
 5 files changed, 517 insertions(+), 2 deletions(-)
 create mode 100644 include/QF/txtbuffer.h
 create mode 100644 libs/util/test/test-txtbuffer.c
 create mode 100644 libs/util/txtbuffer.c

diff --git a/include/QF/txtbuffer.h b/include/QF/txtbuffer.h
new file mode 100644
index 000000000..e73c7257a
--- /dev/null
+++ b/include/QF/txtbuffer.h
@@ -0,0 +1,98 @@
+/*
+	txtbuffer.h
+
+	Text buffer for edit or scrollback
+
+	Copyright (C) 2020  Bill Currie <bill@taniwha.org>
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+
+#ifndef __QF_txtbuffer_h
+#define __QF_txtbuffer_h
+
+#include <stdint.h>
+#include <stdlib.h>
+
+/** \defgroup txtbuffer Text buffers
+	\ingroup utils
+*/
+///@{
+
+/// must be a power of 2
+#define TXTBUFFER_GROW 0x4000
+
+/**	Text buffer implementing efficient editing.
+*/
+typedef struct txtbuffer_s {
+	struct txtbuffer_s *next;
+	char       *text;
+	size_t      textSize;	///< amount of text in the buffer
+	size_t      bufferSize;	///< current capacity of the buffer
+	size_t      gapOffset;	///< beginning of the gap
+	size_t      gapSize;	///< size of gap. gapSize + textSize == bufferSize
+} txtbuffer_t;
+
+/**	Create a new, empty buffer.
+*/
+txtbuffer_t *TextBuffer_Create (void);
+
+/**	Destroy a buffer, freeing all resources connected to it.
+	\param buffer	The buffer to destroy.
+*/
+void TextBuffer_Destroy (txtbuffer_t *buffer);
+
+/**	Insert a block of text at the specified offset.
+
+	Text after the offset is moved to be after the inserted block of text.
+	The buffer is resized as necessary.
+	nul characters are not significant in that they do not mark the end of
+	the text to be inserted.
+
+	\param buffer	The buffer to be updated
+	\param offset	The offset in the buffer at which to insert the text block
+	\param text		The text block to be inserted. May contain nul ('\0')
+					characters.
+	\param text_len	The number of characters to insert.
+	\return			1 for success, 0 for failure (offset not valid or out
+					of memory)
+*/
+int TextBuffer_InsertAt (txtbuffer_t *buffer, size_t offset,
+						 const char *text, size_t text_len);
+
+/**	Delete a block of text from the buffer.
+
+	The buffer is not resized. Rather, its capacity before resizing is require
+	is increased.
+
+	\param buffer	The buffer to be updated
+	\param offset	The offset of the beginning of the text block to be deleted
+	\param len		The amount of characters to be deleted. Values larger than
+					the amount of text in the buffer beyond the beginning of
+					block are truncated to the amount of remaining text. Thus
+					using excessivly large values sets the offset to be the
+					end of the buffer.
+	\return			1 for success, 0 for failure (offset not valid)
+*/
+int TextBuffer_DeleteAt (txtbuffer_t *buffer, size_t offset, size_t len);
+
+///@}
+
+#endif//__QF_txtbuffer_h
diff --git a/libs/util/Makefile.am b/libs/util/Makefile.am
index 0c6421450..c35e4e305 100644
--- a/libs/util/Makefile.am
+++ b/libs/util/Makefile.am
@@ -53,7 +53,8 @@ libQFutil_la_SOURCES= \
 	fendian.c hash.c idparse.c info.c link.c llist.c \
 	mathlib.c mdfour.c mersenne.c msg.c pakfile.c plugin.c qargs.c qendian.c \
 	qfplist.c quakefs.c quakeio.c riff.c script.c segtext.c set.c sizebuf.c \
-	string.c sys.c va.c ver_check.c vrect.c wad.c wadfile.c zone.c \
+	string.c sys.c txtbuffer.c va.c ver_check.c vrect.c wad.c wadfile.c \
+	zone.c \
 	$(dirent) $(fnmatch) $(getopt)
 
 EXTRA_DIST= $(fnmatch_src) $(getopt_src)
diff --git a/libs/util/test/Makefile.am b/libs/util/test/Makefile.am
index a7bdb5d4e..283ac561e 100644
--- a/libs/util/test/Makefile.am
+++ b/libs/util/test/Makefile.am
@@ -4,7 +4,7 @@ AM_CPPFLAGS= -I$(top_srcdir)/include
 
 check_PROGRAMS= \
 	test-bary test-cs test-dq test-half test-mat3 test-mat4 test-plist \
-	test-qfs test-quat test-seb test-seg test-set test-vrect
+	test-qfs test-quat test-seb test-seg test-set test-txtbuffer test-vrect
 
 test_bary_SOURCES=test-bary.c
 test_bary_LDADD=$(top_builddir)/libs/util/libQFutil.la
@@ -54,6 +54,10 @@ test_set_SOURCES=test-set.c
 test_set_LDADD=$(top_builddir)/libs/util/libQFutil.la
 test_set_DEPENDENCIES=$(top_builddir)/libs/util/libQFutil.la
 
+test_txtbuffer_SOURCES=test-txtbuffer.c
+test_txtbuffer_LDADD=$(top_builddir)/libs/util/libQFutil.la
+test_txtbuffer_DEPENDENCIES=$(top_builddir)/libs/util/libQFutil.la
+
 test_vrect_SOURCES=test-vrect.c
 test_vrect_LDADD=$(top_builddir)/libs/util/libQFutil.la
 test_vrect_DEPENDENCIES=$(top_builddir)/libs/util/libQFutil.la
diff --git a/libs/util/test/test-txtbuffer.c b/libs/util/test/test-txtbuffer.c
new file mode 100644
index 000000000..44ccebdc9
--- /dev/null
+++ b/libs/util/test/test-txtbuffer.c
@@ -0,0 +1,240 @@
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#include <stdio.h>
+#include <string.h>
+
+#include "QF/txtbuffer.h"
+
+static size_t
+check_text_ptr (txtbuffer_t *buffer, size_t offset, const char *txt,
+				size_t length)
+{
+	return buffer->text != 0;
+}
+
+static size_t
+get_textSize (txtbuffer_t *buffer, size_t offset, const char *txt,
+				size_t length)
+{
+	return buffer->textSize;
+}
+
+static size_t
+get_bufferSize (txtbuffer_t *buffer, size_t offset, const char *txt,
+				size_t length)
+{
+	return buffer->bufferSize;
+}
+
+static size_t
+get_gapOffset (txtbuffer_t *buffer, size_t offset, const char *txt,
+				size_t length)
+{
+	return buffer->gapOffset;
+}
+
+static size_t
+get_gapSize (txtbuffer_t *buffer, size_t offset, const char *txt,
+				size_t length)
+{
+	return buffer->gapSize;
+}
+
+static size_t
+insert_text (txtbuffer_t *buffer, size_t offset, const char *txt,
+				size_t length)
+{
+	if (TextBuffer_InsertAt (buffer, offset, txt, length)) {
+		memset (buffer->text + buffer->gapOffset, 0xff, buffer->gapSize);
+		return 1;
+	}
+	return 0;
+}
+
+static size_t
+delete_text (txtbuffer_t *buffer, size_t offset, const char *txt,
+				size_t length)
+{
+	if (TextBuffer_DeleteAt (buffer, offset, length)) {
+		memset (buffer->text + buffer->gapOffset, 0xff, buffer->gapSize);
+		return 1;
+	}
+	return 0;
+}
+
+static size_t
+destroy_buffer (txtbuffer_t *buffer, size_t offset, const char *txt,
+				size_t length)
+{
+	TextBuffer_Destroy (buffer);
+	return 0;
+}
+
+typedef size_t (*test_func) (txtbuffer_t *buffer, size_t offset,
+							 const char *text, size_t length);
+
+static const char test_text[] = {
+	"Guarding the entrance to the Grendal\n"
+	"Gorge is the Shadow Gate, a small keep\n"
+	"and monastary which was once the home\n"
+	"of the Shadow cult.\n\n"
+	"For years the Shadow Gate existed in\n"
+	"obscurity but after the cult discovered\n"
+	"the \3023\354\341\343\353\240\307\341\364\345 in the caves below\n"
+	"the empire took notice.\n"
+	"A batallion of Imperial Knights were\n"
+	"sent to the gate to destroy the cult\n"
+	"and claim the artifact for the King.",
+};
+static const char empty[TXTBUFFER_GROW] = { };
+
+static size_t
+compare_text (txtbuffer_t *buffer, size_t offset, const char *txt,
+				size_t length)
+{
+	//printf("%zd %ld %zd\n", offset, txt - test_text, length);
+	size_t res = memcmp (buffer->text + offset, txt, length) == 0;
+	if (!res) {
+		for (size_t i = 0; i < length; i++) {
+			//printf ("%02x %02x\n", txt[i] & 0xff, buffer->text[offset + i] & 0xff);
+		}
+	}
+	return res;
+}
+
+#define txtsize (sizeof (test_text) - 1)
+#define txtsize0 txtsize
+#define bufsize0 (TXTBUFFER_GROW)
+#define gapoffs0 txtsize0
+#define gapsize0 (bufsize0 - txtsize0)
+#define subtxtlen 200
+#define suboffs 200
+#define txtsize1 (txtsize0 + subtxtlen)
+#define bufsize1 (TXTBUFFER_GROW)
+#define gapoffs1 (suboffs + subtxtlen)
+#define gapsize1 (bufsize1 - txtsize1)
+#define deltxtlen 350
+#define deloffs 150
+#define txtsize2 (txtsize + subtxtlen - deltxtlen)
+#define bufsize2 (TXTBUFFER_GROW)
+#define gapoffs2 (deloffs)
+#define gapsize2 (bufsize2 - txtsize2)
+#define deltxtrem (txtsize2 - gapoffs2)
+#define emptyoffs 370
+#define txtsize3 (txtsize + sizeof (empty))
+#define bufsize3 (2 * TXTBUFFER_GROW)
+#define gapoffs3 (emptyoffs + sizeof (empty))
+#define gapsize3 (bufsize3 - txtsize3)
+#define txtsize4 (txtsize + 2 * sizeof (empty))
+#define bufsize4 (3 * TXTBUFFER_GROW)
+#define gapoffs4 (emptyoffs + sizeof (empty))
+#define gapsize4 (bufsize4 - txtsize4)
+
+struct {
+	test_func   test;
+	size_t      offset_param;
+	const char *text_param;
+	size_t      length_param;
+	int         test_expect;
+} tests[] = {
+	{ check_text_ptr, 0, 0, 0, 0 },
+	{ get_textSize,   0, 0, 0, 0 },
+	{ get_bufferSize, 0, 0, 0, 0 },
+	{ get_gapOffset,  0, 0, 0, 0 },
+	{ get_gapSize,    0, 0, 0, 0 },
+	{ insert_text,    0, test_text, txtsize, 1 },
+	{ get_textSize,   0, 0, 0, txtsize0 },
+	{ get_bufferSize, 0, 0, 0, bufsize0 },
+	{ get_gapOffset,  0, 0, 0, gapoffs0 },
+	{ get_gapSize,    0, 0, 0, gapsize0 },
+	{ compare_text,   0, test_text, txtsize, 1 },
+	{ insert_text,    suboffs, test_text, subtxtlen, 1 },
+	{ get_textSize,   0, 0, 0, txtsize1 },
+	{ get_bufferSize, 0, 0, 0, bufsize1 },
+	{ get_gapOffset,  0, 0, 0, gapoffs1 },
+	{ get_gapSize,    0, 0, 0, gapsize1 },
+	{ compare_text,   0, test_text, txtsize, 0 },
+	{ compare_text,   0, test_text, suboffs, 1 },
+	{ compare_text,   suboffs, test_text, subtxtlen, 1 },
+	{ compare_text,   gapoffs1 + gapsize1, test_text + subtxtlen, txtsize - subtxtlen, 1 },
+	{ delete_text,    deloffs, 0, deltxtlen, 1 },
+	{ get_textSize,   0, 0, 0, txtsize2 },
+	{ get_bufferSize, 0, 0, 0, bufsize2 },
+	{ get_gapOffset,  0, 0, 0, gapoffs2 },
+	{ get_gapSize,    0, 0, 0, gapsize2 },
+	{ compare_text,   0, test_text, suboffs, 0 },
+	{ compare_text,   suboffs, test_text, subtxtlen, 0 },
+	{ compare_text,   gapoffs1 + gapsize1, test_text + subtxtlen, txtsize - subtxtlen, 0 },
+	{ compare_text,   0, test_text, deloffs, 1 },
+	{ compare_text,   gapoffs2 + gapsize2, test_text + txtsize - deltxtrem, deltxtrem, 1 },
+	{ compare_text,   gapoffs2 + gapsize2 - 1, test_text + txtsize - deltxtrem - 1, 1, 0 },
+	{ delete_text,    0, 0, -1, 1 },
+	{ check_text_ptr, 0, 0, 0, 1 },
+	{ get_textSize,   0, 0, 0, 0 },
+	{ get_bufferSize, 0, 0, 0, bufsize2 },
+	{ get_gapOffset,  0, 0, 0, 0 },
+	{ get_gapSize,    0, 0, 0, bufsize2 },
+	{ insert_text,    1, test_text, txtsize, 0 },
+	{ get_textSize,   0, 0, 0, 0 },
+	{ get_bufferSize, 0, 0, 0, bufsize2 },
+	{ get_gapOffset,  0, 0, 0, 0 },
+	{ get_gapSize,    0, 0, 0, bufsize2 },
+	{ insert_text,    0, test_text, txtsize, 1 },
+	{ insert_text,    300, 0, 0, 1 },
+	{ get_textSize,   0, 0, 0, txtsize0 },
+	{ get_bufferSize, 0, 0, 0, bufsize2 },
+	{ get_gapOffset,  0, 0, 0, 300 },
+	{ get_gapSize,    0, 0, 0, gapsize0 },
+	{ compare_text,   0, test_text, 300, 1 },
+	{ compare_text,   300, test_text + 300, 1, 0 },
+	{ compare_text,   300 + gapsize0, test_text + 300, txtsize - 300, 1 },
+	{ compare_text,   300 + gapsize0 - 1, test_text + 300 - 1, 1, 0 },
+	{ insert_text,    350, 0, 0, 1 },
+	{ compare_text,   (emptyoffs - 20) + gapsize0, test_text + (emptyoffs - 20), txtsize - (emptyoffs - 20), 1 },
+	{ get_textSize,   0, 0, 0, txtsize0 },
+	{ get_bufferSize, 0, 0, 0, bufsize2 },
+	{ get_gapOffset,  0, 0, 0, (emptyoffs - 20) },
+	{ get_gapSize,    0, 0, 0, gapsize0 },
+	{ insert_text,    emptyoffs, empty, sizeof (empty), 1 },
+	{ get_textSize,   0, 0, 0, txtsize3 },
+	{ get_bufferSize, 0, 0, 0, bufsize3 },
+	{ get_gapOffset,  0, 0, 0, gapoffs3 },
+	{ get_gapSize,    0, 0, 0, gapsize3 },
+	{ insert_text,    emptyoffs, empty, sizeof (empty), 1 },
+	{ get_textSize,   0, 0, 0, txtsize4 },
+	{ get_bufferSize, 0, 0, 0, bufsize4 },
+	{ get_gapOffset,  0, 0, 0, gapoffs4 },
+	{ get_gapSize,    0, 0, 0, gapsize4 },
+	{ destroy_buffer, 0, 0, 0, 0 },
+};
+#define num_tests (sizeof (tests) / sizeof (tests[0]))
+int test_start_line = __LINE__ - num_tests - 2;
+
+int
+main (int argc, const char **argv)
+{
+	size_t      i;
+	int         res = 0;
+
+	txtbuffer_t *buffer = TextBuffer_Create ();
+
+	for (i = 0; i < num_tests; i++) {
+		if (tests[i].test) {
+			int         test_res;
+			test_res = tests[i].test (buffer,
+									  tests[i].offset_param,
+									  tests[i].text_param,
+									  tests[i].length_param);
+			if (test_res != tests[i].test_expect) {
+				res |= 1;
+				printf ("test %d (line %d) failed\n", (int) i,
+						(int) i + test_start_line);
+				printf ("expect: %d\n", tests[i].test_expect);
+				printf ("got   : %d\n", test_res);
+				continue;
+			}
+		}
+	}
+	return res;
+}
diff --git a/libs/util/txtbuffer.c b/libs/util/txtbuffer.c
new file mode 100644
index 000000000..03ad06500
--- /dev/null
+++ b/libs/util/txtbuffer.c
@@ -0,0 +1,172 @@
+/*
+	txtbuffer.c
+
+	Text buffer
+
+	Copyright (C) 2020  Bill Currie <bill@taniwha.org>
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+
+#include "QF/alloc.h"
+#include "QF/qtypes.h"
+#include "QF/sys.h"
+#include "QF/txtbuffer.h"
+
+#include "compat.h"
+
+static txtbuffer_t *txtbuffers_freelist;
+
+static char *
+txtbuffer_open_gap (txtbuffer_t *buffer, size_t offset, size_t length)
+{
+	size_t      len;
+	char       *dst;
+	char       *src;
+
+	if (offset == buffer->gapOffset && length <= buffer->gapSize) {
+		return buffer->text + buffer->gapOffset;
+	}
+	if (length <= buffer->gapSize) {
+		// no resize needed
+		if (offset < buffer->gapOffset) {
+			len = buffer->gapOffset - offset;
+			dst = buffer->text + buffer->gapOffset + buffer->gapSize - len;
+			src = buffer->text + offset;
+		} else {
+			len = offset - buffer->gapOffset;
+			dst = buffer->text + buffer->gapOffset;
+			src = buffer->text + buffer->gapOffset + buffer->gapSize;
+		}
+		memmove (dst, src, len);
+	} else {
+		// need to resize the buffer
+		// grow the buffer by the difference in lengths rounded up to the
+		// next multiple of TXTBUFFER_GROW
+		size_t      new_size = buffer->bufferSize + length - buffer->gapSize;
+		new_size = (new_size + TXTBUFFER_GROW - 1) & ~(TXTBUFFER_GROW - 1);
+		char       *new_text = realloc (buffer->text, new_size);
+
+		if (!new_text) {
+			return 0;
+		}
+		buffer->text = new_text;
+
+		if (offset < buffer->gapOffset) {
+			// move the old post-gap to the end of the new buffer
+			len = buffer->bufferSize - (buffer->gapOffset + buffer->gapSize);
+			dst = buffer->text + new_size - len;
+			src = buffer->text + buffer->gapOffset + buffer->gapSize;
+			memmove (dst, src, len);
+			// move the remaining chunk to after the end of the new gap or
+			// just before the location of the previous move
+			len = buffer->gapOffset - offset;
+			dst -= len;
+			src = buffer->text + offset;
+			memmove (dst, src, len);
+		} else if (offset > buffer->gapOffset) {
+			// move the old post-offset to the end of the new buffer
+			len = buffer->bufferSize - (offset + buffer->gapSize);
+			dst = buffer->text + new_size - len;
+			src = buffer->text + offset + buffer->gapSize;
+			memmove (dst, src, len);
+			// move the old post-gap to offset block to before the new gap
+			len = offset - buffer->gapOffset;
+			dst = buffer->text + buffer->gapOffset;
+			src = buffer->text + buffer->gapOffset + buffer->gapSize;
+			memmove (dst, src, len);
+		} else {
+			// the gap only grew, did not move
+			len = buffer->bufferSize - (offset + buffer->gapSize);
+			dst = buffer->text + new_size - len;
+			src = buffer->text + buffer->gapOffset + buffer->gapSize;
+			memmove (dst, src, len);
+		}
+		buffer->gapSize += new_size - buffer->bufferSize;
+		buffer->bufferSize = new_size;
+	}
+	buffer->gapOffset = offset;
+	return buffer->text + buffer->gapOffset;
+}
+
+VISIBLE txtbuffer_t *
+TextBuffer_Create (void)
+{
+	txtbuffer_t *buffer;
+	ALLOC (16, txtbuffer_t, txtbuffers, buffer);
+	return buffer;
+}
+
+VISIBLE void
+TextBuffer_Destroy (txtbuffer_t *buffer)
+{
+	if (buffer->text) {
+		free (buffer->text);
+	}
+	FREE (txtbuffers, buffer);
+}
+
+VISIBLE int
+TextBuffer_InsertAt (txtbuffer_t *buffer, size_t offset,
+					 const char *text, size_t text_len)
+{
+	char       *dst;
+
+	if (offset > buffer->textSize) {
+		return 0;
+	}
+	dst = txtbuffer_open_gap (buffer, offset, text_len);
+	if (!dst) {
+		return 0;
+	}
+	memcpy (dst, text, text_len);
+	buffer->textSize += text_len;
+	buffer->gapOffset += text_len;
+	buffer->gapSize -= text_len;
+	return 1;
+}
+
+VISIBLE int
+TextBuffer_DeleteAt (txtbuffer_t *buffer, size_t offset, size_t len)
+{
+	if (offset > buffer->textSize) {
+		return 0;
+	}
+	// only moves, does not resize, the gap if necessary
+	txtbuffer_open_gap (buffer, offset, buffer->gapSize);
+	// clamp len to the amount of text beyond offset
+	if (len > buffer->textSize - offset) {
+		len = buffer->textSize - offset;
+	}
+	// delete the text
+	buffer->gapSize += len;
+	buffer->textSize -= len;
+	return 1;
+}

From 3720956d8884d0aee329f79ab66237fcbed4192e Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 24 Feb 2020 18:52:46 +0900
Subject: [PATCH 0499/1519] Speed up two of the three deletion cases

The initial code was pretty much a port of the code in the editor I
wrote 25 years ago. Either I didn't think of the optimization back then,
or I tried to implement it, failed, and figured it wasn't worth it
(despite using it on a 386dx33). However, I noticed it now and it was
easy enough to get working, and it's always good to not do something
that's not needed.
---
 libs/util/txtbuffer.c | 32 +++++++++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/libs/util/txtbuffer.c b/libs/util/txtbuffer.c
index 03ad06500..59ee0da16 100644
--- a/libs/util/txtbuffer.c
+++ b/libs/util/txtbuffer.c
@@ -116,6 +116,32 @@ txtbuffer_open_gap (txtbuffer_t *buffer, size_t offset, size_t length)
 	return buffer->text + buffer->gapOffset;
 }
 
+static char *
+txtbuffer_delete_text (txtbuffer_t *buffer, size_t offset, size_t length)
+{
+	size_t      len;
+	char       *dst;
+	char       *src;
+
+	if (offset > buffer->gapOffset) {
+		len = offset - buffer->gapOffset;
+		dst = buffer->text + buffer->gapOffset;
+		src = buffer->text + buffer->gapOffset + buffer->gapSize;
+		memmove (dst, src, len);
+	} else if (offset + length < buffer->gapOffset) {
+		len = buffer->gapOffset - (offset + length);
+		dst = buffer->text + buffer->gapSize + (offset + length);
+		src = buffer->text + (offset + length);
+		memmove (dst, src, len);
+	}
+	// don't need to do any copying when offset <= gapOffset &&
+	// offset + length >= offset
+	buffer->gapOffset = offset;
+	buffer->gapSize += length;
+	buffer->textSize -= length;
+	return buffer->text + buffer->gapOffset;
+}
+
 VISIBLE txtbuffer_t *
 TextBuffer_Create (void)
 {
@@ -159,14 +185,10 @@ TextBuffer_DeleteAt (txtbuffer_t *buffer, size_t offset, size_t len)
 	if (offset > buffer->textSize) {
 		return 0;
 	}
-	// only moves, does not resize, the gap if necessary
-	txtbuffer_open_gap (buffer, offset, buffer->gapSize);
 	// clamp len to the amount of text beyond offset
 	if (len > buffer->textSize - offset) {
 		len = buffer->textSize - offset;
 	}
-	// delete the text
-	buffer->gapSize += len;
-	buffer->textSize -= len;
+	txtbuffer_delete_text (buffer, offset, len);
 	return 1;
 }

From c51c9edd9d1cdf2b374727be0d0b3a06926c50d5 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 25 Feb 2020 00:11:01 +0900
Subject: [PATCH 0500/1519] Fix incorrect encoding of local defs

---
 tools/qfcc/source/obj_file.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tools/qfcc/source/obj_file.c b/tools/qfcc/source/obj_file.c
index 855e48b61..d1c5296c4 100644
--- a/tools/qfcc/source/obj_file.c
+++ b/tools/qfcc/source/obj_file.c
@@ -1178,7 +1178,6 @@ qfo_to_sym (qfo_t *qfo, int *size)
 			aux->local_defs = ld - locals;
 			for (j = 0; j < num_locals; j++, def++, ld++) {
 				ld->type = get_def_type (qfo, def->type);
-				ld->type = def->type;
 				ld->ofs = def->offset;
 				ld->name = def->name;
 				ld->type_encoding = def->type;

From 1cfac0f11a785ff1d1556b2110845f161301a042 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 25 Feb 2020 00:12:02 +0900
Subject: [PATCH 0501/1519] Resolve local def type encodings

They need to be resolved at load-time.
---
 tools/qfcc/source/dump_globals.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/tools/qfcc/source/dump_globals.c b/tools/qfcc/source/dump_globals.c
index ea94f5d9d..ea52bd8f6 100644
--- a/tools/qfcc/source/dump_globals.c
+++ b/tools/qfcc/source/dump_globals.c
@@ -234,6 +234,13 @@ dump_functions (progs_t *pr)
 	const char *name;
 	int         start, count;
 	const char *comment;
+	pr_def_t   *encodings_def;
+	pointer_t type_encodings = 0;
+
+	encodings_def = PR_FindGlobal (pr, ".type_encodings");
+	if (encodings_def) {
+		type_encodings = encodings_def->ofs;
+	}
 
 	for (i = 0; i < pr->progs->numfunctions; i++) {
 		dfunction_t *func = &pr->pr_functions[i];
@@ -256,7 +263,7 @@ dump_functions (progs_t *pr)
 					func->parm_size[j].size);
 		printf (") %d @ %x", func->locals, func->parm_start);
 		puts ("");
-		if (pr->debug) {
+		if (pr->debug && type_encodings) {
 			pr_auxfunction_t *aux = pr->auxfunction_map[i];
 			if (!aux)
 				continue;
@@ -265,8 +272,11 @@ dump_functions (progs_t *pr)
 					aux->line_info,
 					aux->local_defs, aux->num_locals,
 					aux->return_type);
-			for (j = 0; j < (int)aux->num_locals; j++)
+			for (j = 0; j < (int)aux->num_locals; j++) {
+				pr->local_defs[+ aux->local_defs + j].type_encoding
+					+= type_encodings;
 				dump_def (pr, pr->local_defs + aux->local_defs + j, 1);
+			}
 		}
 	}
 }

From 256dee98a17d9264dceec38c730d41ad53474c64 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 25 Feb 2020 00:21:56 +0900
Subject: [PATCH 0502/1519] Make progs string resources management private

Strangely enough, using the progs resources system. This is a step
towards having progs that can be reset properly, or even dynamically
created VMs.
---
 include/QF/progs.h          |  25 +---
 libs/gamecode/pr_load.c     |   3 +-
 libs/gamecode/pr_strings.c  | 231 +++++++++++++++++++++---------------
 tools/qfcc/source/qfprogs.c |   1 -
 4 files changed, 141 insertions(+), 119 deletions(-)

diff --git a/include/QF/progs.h b/include/QF/progs.h
index d007ac81f..25f81f2b5 100644
--- a/include/QF/progs.h
+++ b/include/QF/progs.h
@@ -1146,12 +1146,12 @@ int PR_RelocateBuiltins (progs_t *pr);
 */
 ///@{
 
-/** Initialize the string tables using the strings supplied by the progs.
-	Called automatically during progs load.
-	\param pr		pointer to ::progs_t VM struct
-	\return			true for success, false for failure
+/** Initialize the string management subsystem.
+
+	\param pr		The VM of which the string management subsystem will be
+					initialized;
 */
-int PR_LoadStrings (progs_t *pr);
+void PR_Strings_Init (progs_t *pr);
 
 /** Check the validity of a string index.
 	\param pr		pointer to ::progs_t VM struct
@@ -1230,11 +1230,6 @@ string_t PR_NewMutableString (progs_t *pr);
 */
 string_t PR_SetDynamicString (progs_t *pr, const char *s);
 
-/** Clear all of the return string slots. Called at progs load.
-	\param pr		pointer to ::progs_t VM struct
-*/
-void PR_ClearReturnStrings (progs_t *pr);
-
 /** Destroy a mutable, dynamic or temporary string.
 	\param pr		pointer to ::progs_t VM struct
 	\param str		string index of the string to be destroyed
@@ -1644,15 +1639,7 @@ struct progs_s {
 
 	/// \name string management
 	///@{
-	struct dstring_mem_s *ds_mem;
-	strref_t   *free_string_refs;
-	strref_t   *static_strings;
-	strref_t  **string_map;
-	strref_t   *return_strings[PR_RS_SLOTS];
-	int         rs_slot;
-	unsigned    dyn_str_size;
-	struct hashtab_s *strref_hash;
-	int         num_strings;
+	struct prstr_resources_s *pr_string_resources;
 	strref_t   *pr_xtstr;
 	int         float_promoted;	///< for PR_Sprintf
 	///@}
diff --git a/libs/gamecode/pr_load.c b/libs/gamecode/pr_load.c
index 994e9b581..a156e99c8 100644
--- a/libs/gamecode/pr_load.c
+++ b/libs/gamecode/pr_load.c
@@ -133,7 +133,6 @@ PR_LoadProgsFile (progs_t *pr, QFile *file, int size)
 		pr->free_progs_mem = free_progs_mem;
 
 	PR_Resources_Clear (pr);
-	PR_ClearReturnStrings (pr);
 	if (pr->progs)
 		pr->free_progs_mem (pr, pr->progs);
 	pr->progs = 0;
@@ -374,7 +373,6 @@ pr_run_ctors (progs_t *pr)
 }
 
 static int (*load_funcs_1[])(progs_t *) = {
-	PR_LoadStrings,
 	PR_RelocateBuiltins,
 	PR_LoadDebug,
 	0,
@@ -472,6 +470,7 @@ PR_Init (progs_t *pr)
 {
 	PR_Opcode_Init ();	// idempotent
 	PR_Resources_Init (pr);
+	PR_Strings_Init (pr);
 	PR_Debug_Init (pr);
 }
 
diff --git a/libs/gamecode/pr_strings.c b/libs/gamecode/pr_strings.c
index 85602e3d2..a8c8c4fee 100644
--- a/libs/gamecode/pr_strings.c
+++ b/libs/gamecode/pr_strings.c
@@ -44,6 +44,19 @@
 #include "QF/progs.h"
 #include "QF/va.h"
 
+typedef struct prstr_resources_s {
+	progs_t    *pr;
+	dstring_mem_t ds_mem;
+	strref_t   *free_string_refs;
+	strref_t   *static_strings;
+	strref_t  **string_map;
+	strref_t   *return_strings[PR_RS_SLOTS];
+	int         rs_slot;
+	unsigned    dyn_str_size;
+	struct hashtab_s *strref_hash;
+	int         num_strings;
+} prstr_resources_t;
+
 typedef enum {
 	str_free,
 	str_static,
@@ -111,51 +124,51 @@ pr_strings_realloc (void *_pr, void *ptr, size_t size)
 }
 
 static strref_t *
-new_string_ref (progs_t *pr)
+new_string_ref (prstr_resources_t *res)
 {
 	strref_t *sr;
-	if (!pr->free_string_refs) {
+	if (!res->free_string_refs) {
 		int		    i;
 		size_t      size;
 
-		pr->dyn_str_size++;
-		size = pr->dyn_str_size * sizeof (strref_t *);
-		pr->string_map = realloc (pr->string_map, size);
-		if (!pr->string_map)
-			PR_Error (pr, "out of memory");
-		if (!(pr->free_string_refs = calloc (1024, sizeof (strref_t))))
-			PR_Error (pr, "out of memory");
-		pr->string_map[pr->dyn_str_size - 1] = pr->free_string_refs;
-		for (i = 0, sr = pr->free_string_refs; i < 1023; i++, sr++)
+		res->dyn_str_size++;
+		size = res->dyn_str_size * sizeof (strref_t *);
+		res->string_map = realloc (res->string_map, size);
+		if (!res->string_map)
+			PR_Error (res->pr, "out of memory");
+		if (!(res->free_string_refs = calloc (1024, sizeof (strref_t))))
+			PR_Error (res->pr, "out of memory");
+		res->string_map[res->dyn_str_size - 1] = res->free_string_refs;
+		for (i = 0, sr = res->free_string_refs; i < 1023; i++, sr++)
 			sr->next = sr + 1;
 		sr->next = 0;
 	}
-	sr = pr->free_string_refs;
-	pr->free_string_refs = sr->next;
+	sr = res->free_string_refs;
+	res->free_string_refs = sr->next;
 	sr->next = 0;
 	return sr;
 }
 
 static void
-free_string_ref (progs_t *pr, strref_t *sr)
+free_string_ref (prstr_resources_t *res, strref_t *sr)
 {
 	sr->type = str_free;
 	if (sr->prev)
 		*sr->prev = sr->next;
-	sr->next = pr->free_string_refs;
-	pr->free_string_refs = sr;
+	sr->next = res->free_string_refs;
+	res->free_string_refs = sr;
 }
 
 static __attribute__((pure)) string_t
-string_index (progs_t *pr, strref_t *sr)
+string_index (prstr_resources_t *res, strref_t *sr)
 {
-	long        o = (long) (sr - pr->static_strings);
+	long        o = (long) (sr - res->static_strings);
 	unsigned    i;
 
-	if (o >= 0 && o < pr->num_strings)
-		return sr->s.string - pr->pr_strings;
-	for (i = 0; i < pr->dyn_str_size; i++) {
-		int         d = sr - pr->string_map[i];
+	if (o >= 0 && o < res->num_strings)
+		return sr->s.string - res->pr->pr_strings;
+	for (i = 0; i < res->dyn_str_size; i++) {
+		int         d = sr - res->string_map[i];
 		if (d >= 0 && d < 1024)
 			return ~(i * 1024 + d);
 	}
@@ -172,24 +185,44 @@ strref_get_key (const void *_sr, void *notused)
 }
 
 static void
-strref_free (void *_sr, void *_pr)
+strref_free (void *_sr, void *_res)
 {
-	progs_t		*pr = (progs_t*)_pr;
-	strref_t	*sr = (strref_t*)_sr;
+	__auto_type res = (prstr_resources_t *) _res;
+	__auto_type sr = (strref_t *) _sr;
 
 	// Since this is called only by Hash_FlushTable, the memory pointed
 	// to by sr->string or sr->dstring has already been lost in the progs
 	// load/reload and thus there's no need to free it.
 
 	// free the string and ref only if it's not a static string
-	if (sr < pr->static_strings || sr >= pr->static_strings + pr->num_strings) {
-		free_string_ref (pr, sr);
+	if (sr < res->static_strings
+		|| sr >= res->static_strings + res->num_strings) {
+		free_string_ref (res, sr);
 	}
 }
 
-VISIBLE int
+static void
+pr_strings_clear (progs_t *pr, void *data)
+{
+	__auto_type res = (prstr_resources_t *) data;
+	int         i;
+
+	for (i = 0; i < PR_RS_SLOTS; i++) {
+		if (res->return_strings[i])
+			free_string_ref (res, res->return_strings[i]);
+		res->return_strings[i] = 0;
+	}
+	res->rs_slot = 0;
+
+	pr->pr_string_resources = res;
+	pr->pr_xtstr = 0;
+}
+
+static int
 PR_LoadStrings (progs_t *pr)
 {
+	prstr_resources_t *res = PR_Resources_Find (pr, "Strings");
+
 	char   *end = pr->pr_strings + pr->progs->numstrings;
 	char   *str = pr->pr_strings;
 	int		count = 0;
@@ -199,43 +232,41 @@ PR_LoadStrings (progs_t *pr)
 		str += strlen (str) + 1;
 	}
 
-	if (!pr->ds_mem) {
-		pr->ds_mem = malloc (sizeof (dstring_mem_t));
-		pr->ds_mem->alloc = pr_strings_alloc;
-		pr->ds_mem->free = pr_strings_free;
-		pr->ds_mem->realloc = pr_strings_realloc;
-		pr->ds_mem->data = pr;
-	}
-	if (pr->strref_hash) {
-		Hash_FlushTable (pr->strref_hash);
+	res->ds_mem.alloc = pr_strings_alloc;
+	res->ds_mem.free = pr_strings_free;
+	res->ds_mem.realloc = pr_strings_realloc;
+	res->ds_mem.data = pr;
+
+	if (res->strref_hash) {
+		Hash_FlushTable (res->strref_hash);
 	} else {
-		pr->strref_hash = Hash_NewTable (1021, strref_get_key, strref_free,
-										 pr);
-		pr->string_map = 0;
-		pr->free_string_refs = 0;
-		pr->dyn_str_size = 0;
+		res->strref_hash = Hash_NewTable (1021, strref_get_key, strref_free,
+										  res);
+		res->string_map = 0;
+		res->free_string_refs = 0;
+		res->dyn_str_size = 0;
 	}
 
-	if (pr->static_strings)
-		free (pr->static_strings);
-	pr->static_strings = malloc (count * sizeof (strref_t));
+	if (res->static_strings)
+		free (res->static_strings);
+	res->static_strings = malloc (count * sizeof (strref_t));
 	count = 0;
 	str = pr->pr_strings;
 	while (str < end) {
-		if (!Hash_Find (pr->strref_hash, str)) {
-			pr->static_strings[count].type = str_static;
-			pr->static_strings[count].s.string = str;
-			Hash_Add (pr->strref_hash, &pr->static_strings[count]);
+		if (!Hash_Find (res->strref_hash, str)) {
+			res->static_strings[count].type = str_static;
+			res->static_strings[count].s.string = str;
+			Hash_Add (res->strref_hash, &res->static_strings[count]);
 			count++;
 		}
 		str += strlen (str) + 1;
 	}
-	pr->num_strings = count;
+	res->num_strings = count;
 	return 1;
 }
 
 static inline strref_t *
-get_strref (progs_t *pr, string_t num)
+get_strref (prstr_resources_t *res, string_t num)
 {
 	if (num < 0) {
 		strref_t   *ref;
@@ -243,9 +274,9 @@ get_strref (progs_t *pr, string_t num)
 
 		num = ~num % 1024;
 
-		if (row >= pr->dyn_str_size)
+		if (row >= res->dyn_str_size)
 			return 0;
-		ref = &pr->string_map[row][num];
+		ref = &res->string_map[row][num];
 		if (ref->type == str_free)
 			return 0;
 		return ref;
@@ -257,7 +288,7 @@ static inline __attribute__((pure)) const char *
 get_string (progs_t *pr, string_t num)
 {
 	if (num < 0) {
-		strref_t   *ref = get_strref (pr, num);
+		strref_t   *ref = get_strref (pr->pr_string_resources, num);
 		if (!ref)
 			return 0;
 		switch (ref->type) {
@@ -299,7 +330,7 @@ PR_GetString (progs_t *pr, string_t num)
 VISIBLE dstring_t *
 PR_GetMutableString (progs_t *pr, string_t num)
 {
-	strref_t   *ref = get_strref (pr, num);
+	strref_t   *ref = get_strref (pr->pr_string_resources, num);
 	if (ref) {
 		if (ref->type == str_mutable)
 			return ref->s.dstring;
@@ -331,70 +362,60 @@ pr_strdup (progs_t *pr, const char *s)
 VISIBLE string_t
 PR_SetString (progs_t *pr, const char *s)
 {
+	prstr_resources_t *res = pr->pr_string_resources;
 	strref_t   *sr;
 
 	if (!s)
 		s = "";
-	sr = Hash_Find (pr->strref_hash, s);
+	sr = Hash_Find (res->strref_hash, s);
 
 	if (__builtin_expect (!sr, 1)) {
-		sr = new_string_ref (pr);
+		sr = new_string_ref (res);
 		sr->type = str_static;
 		sr->s.string = pr_strdup(pr, s);
-		Hash_Add (pr->strref_hash, sr);
-	}
-	return string_index (pr, sr);
-}
-
-void
-PR_ClearReturnStrings (progs_t *pr)
-{
-	int         i;
-
-	for (i = 0; i < PR_RS_SLOTS; i++) {
-		if (pr->return_strings[i])
-			free_string_ref (pr, pr->return_strings[i]);
-		pr->return_strings[i] = 0;
+		Hash_Add (res->strref_hash, sr);
 	}
+	return string_index (res, sr);
 }
 
 VISIBLE string_t
 PR_SetReturnString (progs_t *pr, const char *s)
 {
+	prstr_resources_t *res = pr->pr_string_resources;
 	strref_t   *sr;
 
 	if (!s)
 		s = "";
-	if ((sr = Hash_Find (pr->strref_hash, s))) {
-		return string_index (pr, sr);
+	if ((sr = Hash_Find (res->strref_hash, s))) {
+		return string_index (res, sr);
 	}
 
-	if ((sr = pr->return_strings[pr->rs_slot])) {
+	if ((sr = res->return_strings[res->rs_slot])) {
 		if (sr->type != str_return)
 			PR_Error (pr, "internal string error");
 		pr_strfree (pr, sr->s.string);
 	} else {
-		sr = new_string_ref (pr);
+		sr = new_string_ref (res);
 	}
 	sr->type = str_return;
 	sr->s.string = pr_strdup(pr, s);
 
-	pr->return_strings[pr->rs_slot++] = sr;
-	pr->rs_slot %= PR_RS_SLOTS;
-	return string_index (pr, sr);
+	res->return_strings[res->rs_slot++] = sr;
+	res->rs_slot %= PR_RS_SLOTS;
+	return string_index (res, sr);
 }
 
 static inline string_t
-pr_settempstring (progs_t *pr, char *s)
+pr_settempstring (progs_t *pr, prstr_resources_t *res, char *s)
 {
 	strref_t   *sr;
 
-	sr = new_string_ref (pr);
+	sr = new_string_ref (res);
 	sr->type = str_temp;
 	sr->s.string = s;
 	sr->next = pr->pr_xtstr;
 	pr->pr_xtstr = sr;
-	return string_index (pr, sr);
+	return string_index (res, sr);
 }
 
 VISIBLE string_t
@@ -410,46 +431,49 @@ PR_CatStrings (progs_t *pr, const char *a, const char *b)
 	strcpy (c, a);
 	strcpy (c + lena, b);
 
-	return pr_settempstring (pr, c);
+	return pr_settempstring (pr, pr->pr_string_resources, c);
 }
 
 VISIBLE string_t
 PR_SetTempString (progs_t *pr, const char *s)
 {
+	prstr_resources_t *res = pr->pr_string_resources;
 	strref_t   *sr;
 
 	if (!s)
 		return PR_SetString (pr, "");
 
-	if ((sr = Hash_Find (pr->strref_hash, s))) {
-		return string_index (pr, sr);
+	if ((sr = Hash_Find (res->strref_hash, s))) {
+		return string_index (res, sr);
 	}
 
-	return pr_settempstring (pr, pr_strdup (pr, s));
+	return pr_settempstring (pr, res, pr_strdup (pr, s));
 }
 
 VISIBLE string_t
 PR_SetDynamicString (progs_t *pr, const char *s)
 {
+	prstr_resources_t *res = pr->pr_string_resources;
 	strref_t   *sr;
 
 	if (!s)
 		return PR_SetString (pr, "");
 
-	if ((sr = Hash_Find (pr->strref_hash, s))) {
-		return string_index (pr, sr);
+	if ((sr = Hash_Find (res->strref_hash, s))) {
+		return string_index (res, sr);
 	}
 
-	sr = new_string_ref (pr);
+	sr = new_string_ref (res);
 	sr->type = str_dynamic;
 	sr->s.string = pr_strdup (pr, s);
-	return string_index (pr, sr);
+	return string_index (res, sr);
 }
 
 void
 PR_MakeTempString (progs_t *pr, string_t str)
 {
-	strref_t   *sr = get_strref (pr, str);
+	prstr_resources_t *res = pr->pr_string_resources;
+	strref_t   *sr = get_strref (res, str);
 
 	if (!sr)
 		PR_RunError (pr, "invalid string %d", str);
@@ -470,16 +494,18 @@ PR_MakeTempString (progs_t *pr, string_t str)
 VISIBLE string_t
 PR_NewMutableString (progs_t *pr)
 {
-	strref_t   *sr = new_string_ref (pr);
+	prstr_resources_t *res = pr->pr_string_resources;
+	strref_t   *sr = new_string_ref (res);
 	sr->type = str_mutable;
-	sr->s.dstring = _dstring_newstr (pr->ds_mem);
-	return string_index (pr, sr);
+	sr->s.dstring = _dstring_newstr (&res->ds_mem);
+	return string_index (res, sr);
 }
 
 VISIBLE void
 PR_FreeString (progs_t *pr, string_t str)
 {
-	strref_t   *sr = get_strref (pr, str);
+	prstr_resources_t *res = pr->pr_string_resources;
+	strref_t   *sr = get_strref (res, str);
 
 	if (sr) {
 		switch (sr->type) {
@@ -496,7 +522,7 @@ PR_FreeString (progs_t *pr, string_t str)
 			default:
 				PR_Error (pr, "internal string error");
 		}
-		free_string_ref (pr, sr);
+		free_string_ref (res, sr);
 		return;
 	}
 	if (!get_string (pr, str))
@@ -506,20 +532,21 @@ PR_FreeString (progs_t *pr, string_t str)
 void
 PR_FreeTempStrings (progs_t *pr)
 {
+	prstr_resources_t *res = pr->pr_string_resources;
 	strref_t   *sr, *t;
 
 	for (sr = pr->pr_xtstr; sr; sr = t) {
 		t = sr->next;
 		if (sr->type != str_temp)
 			PR_Error (pr, "internal string error");
-		if (R_STRING (pr) < 0 && string_index (pr, sr) == R_STRING (pr)
+		if (R_STRING (pr) < 0 && string_index (res, sr) == R_STRING (pr)
 			&& pr->pr_depth) {
 			prstack_t  *frame = pr->pr_stack + pr->pr_depth - 1;
 			sr->next = frame->tstr;
 			frame->tstr = sr;
 		} else {
 			pr_strfree (pr, sr->s.string);
-			free_string_ref (pr, sr);
+			free_string_ref (res, sr);
 		}
 	}
 	pr->pr_xtstr = 0;
@@ -881,3 +908,13 @@ PR_Sprintf (progs_t *pr, dstring_t *result, const char *name,
 error:
 	PR_RunError (pr, "%s: %s", name, msg);
 }
+
+void
+PR_Strings_Init (progs_t *pr)
+{
+	prstr_resources_t *res = calloc (1, sizeof (*res));
+	res->pr = pr;
+
+	PR_Resources_Register (pr, "Strings", res, pr_strings_clear);
+	PR_AddLoadFunc (pr, PR_LoadStrings);
+}
diff --git a/tools/qfcc/source/qfprogs.c b/tools/qfcc/source/qfprogs.c
index 64dab879a..37acd11fc 100644
--- a/tools/qfcc/source/qfprogs.c
+++ b/tools/qfcc/source/qfprogs.c
@@ -287,7 +287,6 @@ load_progs (const char *name)
 		if (!pr.progs)
 			return 0;
 
-		PR_LoadStrings (&pr);
 		PR_ResolveGlobals (&pr);
 		PR_LoadDebug (&pr);
 	}

From 99c818adccd15a5e823c41ac38427196ff60c71d Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 25 Feb 2020 00:25:24 +0900
Subject: [PATCH 0503/1519] Ensure progs zone is always set on load

---
 libs/gamecode/pr_load.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libs/gamecode/pr_load.c b/libs/gamecode/pr_load.c
index a156e99c8..1178fe039 100644
--- a/libs/gamecode/pr_load.c
+++ b/libs/gamecode/pr_load.c
@@ -212,6 +212,7 @@ PR_LoadProgsFile (progs_t *pr, QFile *file, int size)
 		*pr->edicts = (edict_t *)((byte *) pr->progs + pr->progs_size);
 	}
 
+	pr->zone = 0;
 	if (pr->zone_size) {
 		//FIXME zone_size needs to be at least as big as memzone_t, but
 		//memzone_t is opaque so its size is unknown

From 9bb68f2d8c047a410651d97cf814bb0c9952a82c Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 25 Feb 2020 14:30:26 +0900
Subject: [PATCH 0504/1519] Allow nested use of PR_SaveParams()

PR_SaveParams() is required for implementing the +initialize diversion
used by Objective-QuakeC because builtins do not have local def spaces
(of course, a normal stack calling convention would help). However, it
is entirely possible for a call to +initialize to trigger another call
to +initialize, thus the need for stacking parameter stashes. As a
bonus, this implementation cleans up some fields in progs_t.
---
 include/QF/progs.h         | 59 +++++++++++++++++++++++++++++++++-----
 libs/gamecode/pr_exec.c    | 31 +++++++++++---------
 libs/gamecode/pr_resolve.c |  4 ---
 libs/ruamoko/rua_obj.c     |  4 +--
 4 files changed, 71 insertions(+), 27 deletions(-)

diff --git a/include/QF/progs.h b/include/QF/progs.h
index 25f81f2b5..1162625ac 100644
--- a/include/QF/progs.h
+++ b/include/QF/progs.h
@@ -91,15 +91,63 @@ void PR_RunError (progs_t *pr, const char *error, ...) __attribute__((format(pri
 		(pr)->pr_params[1] = (pr)->pr_real_params[1];	\
 	} while (0)
 
-/** Save the current parameters.
-	\param pr		pointer to ::progs_t VM struct
+/**	\name Detouring Function Calls
+
+	These functions allow a builtin function that uses PR_CallFunction() to
+	safely insert a call to another VM function. The +initialize diversion
+	required by Objective-QuakeC uses this.
+
+		PR_PushFrame (pr);
+		__auto_type params = PR_SaveParams (pr);
+		... set up parameters to detour_function
+		PR_ExecuteProgram (pr, detour_function)
+		PR_RestoreParams (pr, params);
+		PR_PopFrame (pr);
+
 */
-void PR_SaveParams (progs_t *pr);
+///@{
+typedef struct pr_stashed_params_s {
+	pr_type_t  *param_ptrs[2];
+	int         argc;
+	pr_type_t   params[1];
+} pr_stashed_params_t;
+
+/** Save the current parameters to the provided stash.
+
+	\warning	The memory for the parameter stash is allocated using
+				alloca().
+
+	\param pr		pointer to ::progs_t VM struct
+	\return 		Pointer to a newly allocated and initialized parameter
+					stash that has the current parameters saved to it.
+	\hideinitializer
+*/
+#define PR_SaveParams(pr) \
+	_PR_SaveParams((pr), \
+				   alloca (field_offset (pr_stashed_params_t, \
+										 params[(pr)->pr_argc \
+												* (pr)->pr_param_size])))
+
+/** [INTERNAL] Save the current parameters to the provided stash.
+
+	\warning	Requires \a params to be correctly allocated. Use
+				PR_SaveParams instead as it will create a suitable stash for
+				saving the parameters.
+
+	\param pr		pointer to ::progs_t VM struct
+	\param params	location to save the parameters, must be of adequade size
+					to hold \a pr_argc * \a pr_param_size words in \a params
+	\return 		\a params Allows the likes of:
+						__auto_type params = PR_SaveParams (pr);
+*/
+pr_stashed_params_t *_PR_SaveParams (progs_t *pr, pr_stashed_params_t *params);
 
 /** Restore the parameters saved by PR_SaveParams().
 	\param pr		pointer to ::progs_t VM struct
+	\param params	pointer to stash created by PR_SaveParams()
 */
-void PR_RestoreParams (progs_t *pr);
+void PR_RestoreParams (progs_t *pr, pr_stashed_params_t *params);
+///@}
 
 /** Push an execution frame onto the VM stack. Saves current execution state.
 	\param pr		pointer to ::progs_t VM struct
@@ -1662,9 +1710,6 @@ struct progs_s {
 	pr_type_t  *pr_return;
 	pr_type_t  *pr_params[MAX_PARMS];
 	pr_type_t  *pr_real_params[MAX_PARMS];
-	pr_type_t  *pr_param_ptrs[2];
-	pr_type_t  *pr_saved_params;
-	int         pr_saved_argc;
 	int         pr_param_size;		///< covers both params and return
 	int         pr_param_alignment;	///< covers both params and return
 	///@}
diff --git a/libs/gamecode/pr_exec.c b/libs/gamecode/pr_exec.c
index f7becdfa5..e7e9d28eb 100644
--- a/libs/gamecode/pr_exec.c
+++ b/libs/gamecode/pr_exec.c
@@ -72,37 +72,40 @@ PR_RunError (progs_t * pr, const char *error, ...)
 	PR_Error (pr, "Program error: %s", string->str);
 }
 
-VISIBLE void
-PR_SaveParams (progs_t *pr)
+VISIBLE pr_stashed_params_t *
+_PR_SaveParams (progs_t *pr, pr_stashed_params_t *params)
 {
 	int         i;
 	int         size = pr->pr_param_size * sizeof (pr_type_t);
 
-	pr->pr_param_ptrs[0] = pr->pr_params[0];
-	pr->pr_param_ptrs[1] = pr->pr_params[1];
+	params->param_ptrs[0] = pr->pr_params[0];
+	params->param_ptrs[1] = pr->pr_params[1];
 	pr->pr_params[0] = pr->pr_real_params[0];
 	pr->pr_params[1] = pr->pr_real_params[1];
 	for (i = 0; i < pr->pr_argc; i++) {
-		memcpy (pr->pr_saved_params + i * pr->pr_param_size,
+		memcpy (params->params + i * pr->pr_param_size,
 				pr->pr_real_params[i], size);
-		if (i < 2)
-			memcpy (pr->pr_real_params[i], pr->pr_param_ptrs[0], size);
+		if (i < 2) { //XXX FIXME what the what?!?
+			memcpy (pr->pr_real_params[i], params->param_ptrs[0], size);
+		}
 	}
-	pr->pr_saved_argc = pr->pr_argc;
+	params->argc = pr->pr_argc;
+	return params;
 }
 
 VISIBLE void
-PR_RestoreParams (progs_t *pr)
+PR_RestoreParams (progs_t *pr, pr_stashed_params_t *params)
 {
 	int         i;
 	int         size = pr->pr_param_size * sizeof (pr_type_t);
 
-	pr->pr_params[0] = pr->pr_param_ptrs[0];
-	pr->pr_params[1] = pr->pr_param_ptrs[1];
-	pr->pr_argc = pr->pr_saved_argc;
-	for (i = 0; i < pr->pr_argc; i++)
+	pr->pr_params[0] = params->param_ptrs[0];
+	pr->pr_params[1] = params->param_ptrs[1];
+	pr->pr_argc = params->argc;
+	for (i = 0; i < pr->pr_argc; i++) {
 		memcpy (pr->pr_real_params[i],
-				pr->pr_saved_params + i * pr->pr_param_size, size);
+				params->params + i * pr->pr_param_size, size);
+	}
 }
 
 VISIBLE inline void
diff --git a/libs/gamecode/pr_resolve.c b/libs/gamecode/pr_resolve.c
index 07ef44d60..0f7acaa8f 100644
--- a/libs/gamecode/pr_resolve.c
+++ b/libs/gamecode/pr_resolve.c
@@ -139,10 +139,6 @@ PR_ResolveGlobals (progs_t *pr)
 			goto error;
 		pr->pr_param_alignment = G_INT (pr, def->ofs);
 	}
-	if (pr->pr_saved_params)
-		free (pr->pr_saved_params);
-	pr->pr_saved_params = calloc (pr->pr_param_size * MAX_PARMS,
-								  sizeof (pr_type_t));
 	memcpy (pr->pr_real_params, pr->pr_params, sizeof (pr->pr_params));
 	if (!pr->globals.time) {
 		if ((def = PR_FindGlobal (pr, "time")))
diff --git a/libs/ruamoko/rua_obj.c b/libs/ruamoko/rua_obj.c
index efb193bc8..f44da87a9 100644
--- a/libs/ruamoko/rua_obj.c
+++ b/libs/ruamoko/rua_obj.c
@@ -728,12 +728,12 @@ obj_send_initialize (progs_t *pr, pr_class_t *class)
 			sel = &G_STRUCT (pr, pr_sel_t, method->method_name);
 			if (sel->sel_id == selector->sel_id) {
 				PR_PushFrame (pr);
-				PR_SaveParams (pr);
+				__auto_type params = PR_SaveParams (pr);
 				// param 0 is known to be the class pointer
 				P_POINTER (pr, 1) = method->method_name;
 				// pr->pr_argc is known to be 2
 				PR_ExecuteProgram (pr, method->method_imp);
-				PR_RestoreParams (pr);
+				PR_RestoreParams (pr, params);
 				PR_PopFrame (pr);
 				return;
 			}

From 6e56c9a4aa0eac6194be3c327a96c48e999072f4 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 25 Feb 2020 14:40:03 +0900
Subject: [PATCH 0505/1519] Ensure edict_parse is reset on progs load

A server switching from a game that sets edict_parse to one that does
not could go badly when it comes time to loading a level.
---
 libs/gamecode/pr_load.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libs/gamecode/pr_load.c b/libs/gamecode/pr_load.c
index 1178fe039..2b6e9d9ff 100644
--- a/libs/gamecode/pr_load.c
+++ b/libs/gamecode/pr_load.c
@@ -188,6 +188,7 @@ PR_LoadProgsFile (progs_t *pr, QFile *file, int size)
 	pr->pr_edict_size = align_size (pr->pr_edict_size);
 
 	pr->pr_edictareasize = pr->max_edicts * pr->pr_edict_size;
+	pr->edict_parse = 0;
 
 	mem_size = pr->progs_size + pr->zone_size + pr->pr_edictareasize
 			   + pr->stack_size;

From 6a4ef598ab3212975099d27ba38416f0714d2e28 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 25 Feb 2020 14:57:36 +0900
Subject: [PATCH 0506/1519] Allow progs num_edicts and reserved_edicts to be
 null

Really, while there are edict related instructions, edict support should
probably not be in the VM itself.
---
 include/QF/progs.h       |  1 +
 libs/gamecode/pr_edict.c | 32 +++++++++++++++++++++++++-------
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/include/QF/progs.h b/include/QF/progs.h
index 1162625ac..f5767f47c 100644
--- a/include/QF/progs.h
+++ b/include/QF/progs.h
@@ -1715,6 +1715,7 @@ struct progs_s {
 	///@}
 
 	/// \name edicts
+	/// \todo FIXME should this be outside the VM?
 	///@{
 	edict_t   **edicts;
 	int         max_edicts;			///< set by user
diff --git a/libs/gamecode/pr_edict.c b/libs/gamecode/pr_edict.c
index 76eb07e9b..29559f8f1 100644
--- a/libs/gamecode/pr_edict.c
+++ b/libs/gamecode/pr_edict.c
@@ -63,7 +63,7 @@ ED_ClearEdict (progs_t *pr, edict_t *e, int val)
 {
 	pr_uint_t   i;
 
-	if (NUM_FOR_EDICT (pr, e) < *pr->reserved_edicts)
+	if (pr->reserved_edicts && NUM_FOR_EDICT (pr, e) < *pr->reserved_edicts)
 		Sys_Printf ("clearing reserved edict %d\n", NUM_FOR_EDICT (pr, e));
 	for (i=0; i < pr->progs->entityfields; i++)
 		e->v[i].integer_var = val;
@@ -86,6 +86,9 @@ ED_Alloc (progs_t *pr)
 	edict_t    *e;
 	int         start = pr->reserved_edicts ? *pr->reserved_edicts : 0;
 
+	if (!pr->num_edicts) {
+		PR_RunError (pr, "Edicts not supported in this VM\n");
+	}
 	for (i = start + 1; i < *pr->num_edicts; i++) {
 		e = EDICT_NUM (pr, i);
 		// the first couple seconds of server time can involve a lot of
@@ -145,6 +148,10 @@ ED_Free (progs_t *pr, edict_t *ed)
 VISIBLE void
 ED_PrintNum (progs_t *pr, pr_int_t ent)
 {
+	if (!pr->num_edicts) {
+		Sys_Printf ("Edicts not supported in this VM\n");
+		return;
+	}
 	ED_Print (pr, EDICT_NUM (pr, ent));
 }
 
@@ -162,9 +169,13 @@ ED_PrintEdicts (progs_t *pr, const char *fieldval)
 
 	def = PR_FindField(pr, "classname");
 
+	if (!pr->num_edicts) {
+		Sys_Printf ("Edicts not supported in this VM\n");
+		return;
+	}
 	if (fieldval && fieldval[0] && def) {
 		count = 0;
-		for (i = 0; i < *(pr)->num_edicts; i++)
+		for (i = 0; i < *pr->num_edicts; i++)
 			if (strequal(fieldval,
 						 E_GSTRING (pr, EDICT_NUM(pr, i), def->ofs))) {
 				ED_PrintNum (pr, i);
@@ -172,9 +183,9 @@ ED_PrintEdicts (progs_t *pr, const char *fieldval)
 			}
 		Sys_Printf ("%i entities\n", count);
 	} else {
-		for (i = 0; i < *(pr)->num_edicts; i++)
+		for (i = 0; i < *pr->num_edicts; i++)
 			ED_PrintNum (pr, i);
-		Sys_Printf ("%i entities\n", *(pr)->num_edicts);
+		Sys_Printf ("%i entities\n", *pr->num_edicts);
 	}
 }
 
@@ -192,10 +203,14 @@ ED_Count (progs_t *pr)
 	pr_def_t   *model_def;
 	edict_t    *ent;
 
+	if (!pr->num_edicts) {
+		Sys_Printf ("Edicts not supported in this VM\n");
+		return;
+	}
 	solid_def = PR_FindField (pr, "solid");
 	model_def = PR_FindField (pr, "model");
 	active = models = solid = step = zombie = 0;
-	for (i = 0; i < *(pr)->num_edicts; i++) {
+	for (i = 0; i < *pr->num_edicts; i++) {
 		ent = EDICT_NUM (pr, i);
 		if (ent->free) {
 			if (pr->globals.time && *pr->globals.time - ent->freetime <= 0.5)
@@ -209,7 +224,7 @@ ED_Count (progs_t *pr)
 			models++;
 	}
 
-	Sys_Printf ("num_edicts:%3i\n", *(pr)->num_edicts);
+	Sys_Printf ("num_edicts:%3i\n", *pr->num_edicts);
 	Sys_Printf ("active    :%3i\n", active);
 	Sys_Printf ("view      :%3i\n", models);
 	Sys_Printf ("touch     :%3i\n", solid);
@@ -234,7 +249,7 @@ ED_NumForEdict (progs_t *pr, edict_t *e)
 
 	b = NUM_FOR_BAD_EDICT (pr, e);
 
-	if (b && (b < 0 || b >= *(pr)->num_edicts))
+	if (b && (b < 0 || b >= *pr->num_edicts))
 		PR_RunError (pr, "NUM_FOR_EDICT: bad pointer %d %p %p", b, e,
 					 *(pr)->edicts);
 
@@ -244,6 +259,9 @@ ED_NumForEdict (progs_t *pr, edict_t *e)
 qboolean
 PR_EdictValid (progs_t *pr, pr_int_t e)
 {
+	if (!pr->num_edicts) {
+		return false;
+	}
 	if (e < 0 || e >= pr->pr_edictareasize)
 		return false;
 	if (e % pr->pr_edict_size)

From 61d7f4f9c4145168871ad64f30e879a0860979cc Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 25 Feb 2020 15:18:15 +0900
Subject: [PATCH 0507/1519] Dump locals stack when dumping main stack

Any shutdown functions in progs will need locals too.
---
 libs/gamecode/pr_exec.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libs/gamecode/pr_exec.c b/libs/gamecode/pr_exec.c
index e7e9d28eb..345792f4d 100644
--- a/libs/gamecode/pr_exec.c
+++ b/libs/gamecode/pr_exec.c
@@ -68,6 +68,7 @@ PR_RunError (progs_t * pr, const char *error, ...)
 
 	// dump the stack so PR_Error can shutdown functions
 	pr->pr_depth = 0;
+	pr->localstack_used = 0;
 
 	PR_Error (pr, "Program error: %s", string->str);
 }

From e3953be8f8d7911052ecc08d6f2baa2d00a4e9e9 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 25 Feb 2020 15:19:21 +0900
Subject: [PATCH 0508/1519] Ensure execution state is initialized on progs load

---
 libs/gamecode/pr_load.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/libs/gamecode/pr_load.c b/libs/gamecode/pr_load.c
index 2b6e9d9ff..efa347f4b 100644
--- a/libs/gamecode/pr_load.c
+++ b/libs/gamecode/pr_load.c
@@ -330,6 +330,12 @@ PR_LoadProgsFile (progs_t *pr, QFile *file, int size)
 			def->type_encoding = xdef->type;
 		}
 	}
+	pr->pr_trace = 0;
+	pr->pr_trace_depth = 0;
+	pr->pr_xfunction = 0;
+	pr->pr_xstatement = 0;
+	pr->pr_depth = 0;
+	pr->localstack_used = 0;
 }
 
 VISIBLE void

From a55b9544ac6c876683de267d17ed7af8e9357453 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 25 Feb 2020 17:28:32 +0900
Subject: [PATCH 0509/1519] Improve handling of pr_argc

It is now set to 0 when progs are loaded and every time
PR_ExecuteProgram() returns. This takes care of the default case, but
when setting parameters, pr_argc needs to be set correctly in case a
vararg function is called.
---
 doc/progs/vm-exec.c            | 1 +
 include/QF/progs.h             | 2 +-
 libs/console/bi_inputline.c    | 2 ++
 libs/console/menu.c            | 5 +++++
 libs/gamecode/pr_exec.c        | 1 +
 libs/gamecode/pr_load.c        | 1 +
 libs/gamecode/pr_parse.c       | 1 +
 libs/gib/bi_gib.c              | 1 +
 libs/ruamoko/rua_hash.c        | 4 ++++
 qw/source/sv_ccmds.c           | 1 +
 qw/source/sv_pr_cpqw.c         | 1 +
 qw/source/sv_pr_qwe.c          | 1 +
 qw/source/sv_user.c            | 2 ++
 tools/qfcc/test/test-harness.c | 1 +
 tools/qwaq/main.c              | 1 +
 tools/qwaq/qwaq.c              | 1 +
 16 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/doc/progs/vm-exec.c b/doc/progs/vm-exec.c
index 0234c2158..1f9ae4b8e 100644
--- a/doc/progs/vm-exec.c
+++ b/doc/progs/vm-exec.c
@@ -23,6 +23,7 @@ call_progs_main (progs_t *pr, int argc, const char **argv)
 	PR_RESET_PARAMS (pr);
 	P_INT (pr, 0) = argc;
 	P_POINTER (pr, 1) = PR_SetPointer (pr, pr_argv);
+	pr->pr_argc = 2;
 	PR_ExecuteProgram (pr, progs_main);
 	PR_PopFrame (pr);
 	PR_Zone_Free (pr, pr_argv);
diff --git a/include/QF/progs.h b/include/QF/progs.h
index f5767f47c..00f948d52 100644
--- a/include/QF/progs.h
+++ b/include/QF/progs.h
@@ -1732,7 +1732,7 @@ struct progs_s {
 
 	/// \name execution state
 	///@{
-	int         pr_argc;
+	int         pr_argc;	//FIXME need a good way to ensure it is correct
 
 	qboolean    pr_trace;
 	int         pr_trace_depth;
diff --git a/libs/console/bi_inputline.c b/libs/console/bi_inputline.c
index e4a936d6f..f48a4551e 100644
--- a/libs/console/bi_inputline.c
+++ b/libs/console/bi_inputline.c
@@ -130,9 +130,11 @@ bi_inputline_enter (inputline_t *il)
 		P_POINTER (pr, 0) = data->data[0];
 		P_POINTER (pr, 1) = data->data[1];
 		P_STRING (pr, 2) = PR_SetTempString (pr, line);
+		pr->pr_argc = 3;
 	} else {
 		P_STRING (pr, 0) = PR_SetTempString (pr, line);
 		P_POINTER (pr, 1) = data->data[0];
+		pr->pr_argc = 2;
 	}
 	PR_ExecuteProgram (pr, data->enter);
 	PR_PopFrame (pr);
diff --git a/libs/console/menu.c b/libs/console/menu.c
index 3ebf1d60a..ec9fc3355 100644
--- a/libs/console/menu.c
+++ b/libs/console/menu.c
@@ -439,6 +439,7 @@ bi_Menu_Enter (progs_t *pr)
 		P_STRING (&menu_pr_state, 0) =
 			PR_SetTempString (&menu_pr_state, item->text);
 		P_INT (&menu_pr_state, 1) = 0;
+		pr->pr_argc = 2;
 		PR_ExecuteProgram (&menu_pr_state, item->func);
 		PR_PopFrame (&menu_pr_state);
 		run_menu_post ();
@@ -672,6 +673,7 @@ Menu_Draw (view_t *view)
 		PR_RESET_PARAMS (&menu_pr_state);
 		P_INT (&menu_pr_state, 0) = x;
 		P_INT (&menu_pr_state, 1) = y;
+		menu_pr_state.pr_argc = 2;
 		PR_ExecuteProgram (&menu_pr_state, menu->draw);
 		ret = R_INT (&menu_pr_state);
 		run_menu_post ();
@@ -706,6 +708,7 @@ Menu_Draw (view_t *view)
 		PR_RESET_PARAMS (&menu_pr_state);
 		P_INT (&menu_pr_state, 0) = x + item->x;
 		P_INT (&menu_pr_state, 1) = y + item->y;
+		menu_pr_state.pr_argc = 2;
 		PR_ExecuteProgram (&menu_pr_state, menu->cursor);
 		run_menu_post ();
 	} else {
@@ -738,6 +741,7 @@ Menu_KeyEvent (knum_t key, short unicode, qboolean down)
 		P_INT (&menu_pr_state, 0) = key;
 		P_INT (&menu_pr_state, 1) = unicode;
 		P_INT (&menu_pr_state, 2) = down;
+		menu_pr_state.pr_argc = 3;
 		PR_ExecuteProgram (&menu_pr_state, menu->keyevent);
 		ret = R_INT (&menu_pr_state);
 		run_menu_post ();
@@ -752,6 +756,7 @@ Menu_KeyEvent (knum_t key, short unicode, qboolean down)
 		P_STRING (&menu_pr_state, 0) = PR_SetTempString (&menu_pr_state,
 														 item->text);
 		P_INT (&menu_pr_state, 1) = key;
+		menu_pr_state.pr_argc = 2;
 		PR_ExecuteProgram (&menu_pr_state, item->func);
 		PR_PopFrame (&menu_pr_state);
 		ret = R_INT (&menu_pr_state);
diff --git a/libs/gamecode/pr_exec.c b/libs/gamecode/pr_exec.c
index 345792f4d..024594d81 100644
--- a/libs/gamecode/pr_exec.c
+++ b/libs/gamecode/pr_exec.c
@@ -1640,6 +1640,7 @@ op_call:
 						 watch->integer_var);
 	}
 exit_program:
+	pr->pr_argc = 0;
 	Sys_PopErrorHandler ();
 	Sys_PopSignalHook ();
 }
diff --git a/libs/gamecode/pr_load.c b/libs/gamecode/pr_load.c
index efa347f4b..b7790711f 100644
--- a/libs/gamecode/pr_load.c
+++ b/libs/gamecode/pr_load.c
@@ -336,6 +336,7 @@ PR_LoadProgsFile (progs_t *pr, QFile *file, int size)
 	pr->pr_xstatement = 0;
 	pr->pr_depth = 0;
 	pr->localstack_used = 0;
+	pr->pr_argc = 0;
 }
 
 VISIBLE void
diff --git a/libs/gamecode/pr_parse.c b/libs/gamecode/pr_parse.c
index 69219651f..f17b69bf1 100644
--- a/libs/gamecode/pr_parse.c
+++ b/libs/gamecode/pr_parse.c
@@ -524,6 +524,7 @@ ED_LoadFromFile (progs_t *pr, const char *data)
 		PR_PushFrame (pr);
 		PR_RESET_PARAMS (pr);
 		P_INT (pr, 0) = PR_SetTempString (pr, data);
+		pr->pr_argc = 1;
 		PR_ExecuteProgram (pr, pr->edict_parse);
 		PR_PopFrame (pr);
 		return;
diff --git a/libs/gib/bi_gib.c b/libs/gib/bi_gib.c
index b1482c030..3c462712c 100644
--- a/libs/gib/bi_gib.c
+++ b/libs/gib/bi_gib.c
@@ -91,6 +91,7 @@ bi_gib_builtin_f (void)
 	PR_RESET_PARAMS (builtin->pr);
 	P_INT (builtin->pr, 0) = GIB_Argc();
 	P_INT (builtin->pr, 1) = PR_SetPointer (builtin->pr, pr_list);
+	builtin->pr->pr_argc = 2;
 	PR_ExecuteProgram (builtin->pr, builtin->func);
 	PR_PopFrame (builtin->pr);
 	PR_Zone_Free (builtin->pr, pr_list);
diff --git a/libs/ruamoko/rua_hash.c b/libs/ruamoko/rua_hash.c
index cc6d2b8c6..fedb8c288 100644
--- a/libs/ruamoko/rua_hash.c
+++ b/libs/ruamoko/rua_hash.c
@@ -98,6 +98,7 @@ bi_get_key (const void *key, void *_ht)
 	PR_RESET_PARAMS (ht->pr);
 	P_INT (ht->pr, 0) = (intptr_t) (key);
 	P_INT (ht->pr, 1) = ht->ud;
+	ht->pr->pr_argc = 2;
 	PR_ExecuteProgram (ht->pr, ht->gk);
 	return PR_GetString (ht->pr, R_STRING (ht->pr));
 }
@@ -109,6 +110,7 @@ bi_get_hash (const void *key, void *_ht)
 	PR_RESET_PARAMS (ht->pr);
 	P_INT (ht->pr, 0) = (intptr_t) (key);
 	P_INT (ht->pr, 1) = ht->ud;
+	ht->pr->pr_argc = 2;
 	PR_ExecuteProgram (ht->pr, ht->gh);
 	return R_INT (ht->pr);
 }
@@ -121,6 +123,7 @@ bi_compare (const void *key1, const void *key2, void *_ht)
 	P_INT (ht->pr, 0) = (intptr_t) (key1);
 	P_INT (ht->pr, 1) = (intptr_t) (key2);
 	P_INT (ht->pr, 2) = ht->ud;
+	ht->pr->pr_argc = 3;
 	PR_ExecuteProgram (ht->pr, ht->cmp);
 	return R_INT (ht->pr);
 }
@@ -132,6 +135,7 @@ bi_free (void *key, void *_ht)
 	PR_RESET_PARAMS (ht->pr);
 	P_INT (ht->pr, 0) = (intptr_t) (key);
 	P_INT (ht->pr, 1) = ht->ud;
+	ht->pr->pr_argc = 2;
 	PR_ExecuteProgram (ht->pr, ht->f);
 }
 
diff --git a/qw/source/sv_ccmds.c b/qw/source/sv_ccmds.c
index aa359c576..318a2edaf 100644
--- a/qw/source/sv_ccmds.c
+++ b/qw/source/sv_ccmds.c
@@ -950,6 +950,7 @@ SV_SetLocalinfo (const char *key, const char *value)
 		P_STRING (&sv_pr_state, 0) = PR_SetTempString (&sv_pr_state, key);
 		P_STRING (&sv_pr_state, 1) = PR_SetTempString (&sv_pr_state, oldvalue);
 		P_STRING (&sv_pr_state, 2) = PR_SetTempString (&sv_pr_state, value);
+		sv_pr_state.pr_argc = 3;
 		PR_ExecuteProgram (&sv_pr_state, sv_funcs.LocalinfoChanged);
 		PR_PopFrame (&sv_pr_state);
 	}
diff --git a/qw/source/sv_pr_cpqw.c b/qw/source/sv_pr_cpqw.c
index 594f66219..e67b951b6 100644
--- a/qw/source/sv_pr_cpqw.c
+++ b/qw/source/sv_pr_cpqw.c
@@ -822,6 +822,7 @@ cpqw_user_cmd (void)
 			P_STRING (pr, i) = PR_SetTempString (pr, Cmd_Argv (i - 1));
 		for (; i < 7; i++)
 			P_STRING (pr, i) = 0;
+		pr->pr_argc = 7;
 		PR_ExecuteProgram (pr, cpqw_funcs.ClientCommand);
 		PR_PopFrame (pr);
 		return (int) R_FLOAT (pr);
diff --git a/qw/source/sv_pr_qwe.c b/qw/source/sv_pr_qwe.c
index 7c8a46d84..9a84892cf 100644
--- a/qw/source/sv_pr_qwe.c
+++ b/qw/source/sv_pr_qwe.c
@@ -353,6 +353,7 @@ PF_calltimeofday (progs_t *pr)
 		P_FLOAT (pr, 5) = (float) date.year;
 		P_STRING (pr, 6) = PR_SetReturnString (pr, date.str);
 
+		pr->pr_argc = 7;
 		PR_ExecuteProgram (pr, (func_t) (f - sv_pr_state.pr_functions));
 		PR_PopFrame (&sv_pr_state);
 	}
diff --git a/qw/source/sv_user.c b/qw/source/sv_user.c
index 5398eff6c..a6b56c219 100644
--- a/qw/source/sv_user.c
+++ b/qw/source/sv_user.c
@@ -1211,6 +1211,7 @@ SV_SetUserinfo (client_t *client, const char *key, const char *value)
 		P_STRING (&sv_pr_state, 0) = PR_SetTempString (&sv_pr_state, key);
 		P_STRING (&sv_pr_state, 1) = PR_SetTempString (&sv_pr_state, oldvalue);
 		P_STRING (&sv_pr_state, 2) = PR_SetTempString (&sv_pr_state, value);
+		sv_pr_state.pr_argc = 3;
 		PR_ExecuteProgram (&sv_pr_state, sv_funcs.UserInfoChanged);
 		PR_PopFrame (&sv_pr_state);
 		send_changes = !R_FLOAT (&sv_pr_state);
@@ -1261,6 +1262,7 @@ SV_SetInfo_f (void *unused)
 		PR_RESET_PARAMS (&sv_pr_state);
 		P_STRING (&sv_pr_state, 0) = PR_SetTempString (&sv_pr_state, key);
 		P_STRING (&sv_pr_state, 1) = PR_SetTempString (&sv_pr_state, value);
+		sv_pr_state.pr_argc = 2;
 		PR_ExecuteProgram (&sv_pr_state, sv_funcs.UserInfoCallback);
 		PR_PopFrame (&sv_pr_state);
 		if (R_FLOAT (&sv_pr_state))
diff --git a/tools/qfcc/test/test-harness.c b/tools/qfcc/test/test-harness.c
index cabef6ab7..1c6610723 100644
--- a/tools/qfcc/test/test-harness.c
+++ b/tools/qfcc/test/test-harness.c
@@ -266,6 +266,7 @@ main (int argc, char **argv)
 	PR_RESET_PARAMS (&pr);
 	P_INT (&pr, 0) = pr_argc;
 	P_POINTER (&pr, 1) = PR_SetPointer (&pr, pr_argv);
+	pr.pr_argc = 2;
 	PR_ExecuteProgram (&pr, main_func);
 	PR_PopFrame (&pr);
 	if (options.flote)
diff --git a/tools/qwaq/main.c b/tools/qwaq/main.c
index 1ab7c027e..7f51ea6df 100644
--- a/tools/qwaq/main.c
+++ b/tools/qwaq/main.c
@@ -177,6 +177,7 @@ main (int argc, char **argv)
 	PR_RESET_PARAMS (&pr);
 	P_INT (&pr, 0) = pr_argc;
 	P_POINTER (&pr, 1) = PR_SetPointer (&pr, pr_argv);
+	pr.pr_argc = 2;
 	PR_ExecuteProgram (&pr, main_func);
 	PR_PopFrame (&pr);
 	return R_INT (&pr);
diff --git a/tools/qwaq/qwaq.c b/tools/qwaq/qwaq.c
index b446a02dd..05d515f4e 100644
--- a/tools/qwaq/qwaq.c
+++ b/tools/qwaq/qwaq.c
@@ -189,6 +189,7 @@ main (int argc, const char **argv)
 	PR_RESET_PARAMS (&pr);
 	P_INT (&pr, 0) = pr_argc;
 	P_POINTER (&pr, 1) = PR_SetPointer (&pr, pr_argv);
+	pr.pr_argc = 2;
 	PR_ExecuteProgram (&pr, main_func);
 	PR_PopFrame (&pr);
 	return R_INT (&pr);

From 6739f5df4dbd3ebf72b0718a74b1cb43f1e968fe Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 25 Feb 2020 17:39:34 +0900
Subject: [PATCH 0510/1519] Fix an out-by-one error

Noticed while sorting out pr_argc
---
 qw/source/sv_pr_cpqw.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/qw/source/sv_pr_cpqw.c b/qw/source/sv_pr_cpqw.c
index e67b951b6..4263cc097 100644
--- a/qw/source/sv_pr_cpqw.c
+++ b/qw/source/sv_pr_cpqw.c
@@ -818,11 +818,11 @@ cpqw_user_cmd (void)
 
 		PR_PushFrame (pr);
 		P_FLOAT (pr, 0) = argc;
-		for (i = 1; i < argc; i++)
+		for (i = 1; i < argc + 1; i++)
 			P_STRING (pr, i) = PR_SetTempString (pr, Cmd_Argv (i - 1));
-		for (; i < 7; i++)
+		for (; i < 8; i++)
 			P_STRING (pr, i) = 0;
-		pr->pr_argc = 7;
+		pr->pr_argc = 8;
 		PR_ExecuteProgram (pr, cpqw_funcs.ClientCommand);
 		PR_PopFrame (pr);
 		return (int) R_FLOAT (pr);

From ca6fe0730bc151653043669f86f0f3f5b9c53dd9 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 25 Feb 2020 19:02:24 +0900
Subject: [PATCH 0511/1519] Fix qfcc test harness tracing

Just a consequence of progs execution state being initialized properly.
---
 tools/qfcc/test/test-harness.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/qfcc/test/test-harness.c b/tools/qfcc/test/test-harness.c
index 1c6610723..69e660941 100644
--- a/tools/qfcc/test/test-harness.c
+++ b/tools/qfcc/test/test-harness.c
@@ -150,8 +150,6 @@ init_qf (void)
 	pr.allocate_progs_mem = allocate_progs_mem;
 	pr.free_progs_mem = free_progs_mem;
 	pr.no_exec_limit = 0;	// absolutely want a limit!
-	pr.pr_trace_depth = -1;
-	pr.pr_trace = options.trace;
 
 	PR_Init_Cvars ();
 	PR_Init (&pr);
@@ -178,6 +176,8 @@ load_progs (const char *name)
 	Qclose (file);
 	if (!PR_RunLoadFuncs (&pr))
 		PR_Error (&pr, "unable to load %s", pr.progs_name);
+	pr.pr_trace_depth = -1;
+	pr.pr_trace = options.trace;
 	return 1;
 }
 

From 89e83d7d73548375af6a9750152c93bf3726e979 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 25 Feb 2020 20:07:29 +0900
Subject: [PATCH 0512/1519] Move the debug info out of progs_t

The debug subsystem now uses the resources system to ensure it cleans
up, and its data is now semi-private. Unfortunately, PR_LoadDebug had to
remain public for qfprogs because using PR_RunLoadFuncs would cause
builtin resolution to complain.
---
 include/QF/progs.h               |  14 +-
 libs/gamecode/pr_debug.c         | 291 ++++++++++++++++++++-----------
 libs/gamecode/pr_load.c          |   1 -
 tools/qfcc/source/dump_globals.c |  16 +-
 tools/qfcc/source/dump_lines.c   |  11 +-
 5 files changed, 211 insertions(+), 122 deletions(-)

diff --git a/include/QF/progs.h b/include/QF/progs.h
index 00f948d52..ebfa0a3fd 100644
--- a/include/QF/progs.h
+++ b/include/QF/progs.h
@@ -1583,6 +1583,11 @@ void PR_Debug_Init_Cvars (void);
 int PR_LoadDebug (progs_t *pr);
 void PR_Debug_Watch (progs_t *pr, const char *expr);
 void PR_Debug_Print (progs_t *pr, const char *expr);
+pr_auxfunction_t *PR_Debug_AuxFunction (progs_t *pr, pr_uint_t func) __attribute__((pure));
+pr_auxfunction_t *PR_Debug_MappedAuxFunction (progs_t *pr, pr_uint_t func) __attribute__((pure));
+pr_def_t *PR_Debug_LocalDefs (progs_t *pr, pr_auxfunction_t *aux_function) __attribute__((pure));
+pr_lineno_t *PR_Debug_Linenos (progs_t *pr, pr_auxfunction_t *aux_function,
+							   pr_uint_t *num_linenos);
 pr_auxfunction_t *PR_Get_Lineno_Func (progs_t *pr, pr_lineno_t *lineno) __attribute__((pure));
 pr_uint_t PR_Get_Lineno_Addr (progs_t *pr, pr_lineno_t *lineno) __attribute__((pure));
 pr_uint_t PR_Get_Lineno_Line (progs_t *pr, pr_lineno_t *lineno) __attribute__((pure));
@@ -1781,14 +1786,9 @@ struct progs_s {
 	struct obj_list_s *class_tree_list;
 	///@}
 
-	/// \name debug info
+	/// \name debugging
 	///@{
-	const char *debugfile;
-	struct pr_debug_header_s *debug;
-	struct pr_auxfunction_s *auxfunctions;
-	struct pr_auxfunction_s **auxfunction_map;
-	struct pr_lineno_s *linenos;
-	pr_def_t   *local_defs;
+	struct prdeb_resources_s *pr_debug_resources;
 	pr_type_t  *watch;
 	int         wp_conditional;
 	pr_type_t   wp_val;
diff --git a/libs/gamecode/pr_debug.c b/libs/gamecode/pr_debug.c
index d895f631a..898e7255a 100644
--- a/libs/gamecode/pr_debug.c
+++ b/libs/gamecode/pr_debug.c
@@ -71,9 +71,16 @@ typedef struct {
 	progs_t *pr;
 } file_t;
 
-typedef struct {
+typedef struct prdeb_resources_s {
+	progs_t    *pr;
 	dstring_t  *string;
-} pr_debug_resources_t;
+	const char *debugfile;
+	struct pr_debug_header_s *debug;
+	struct pr_auxfunction_s *auxfunctions;
+	struct pr_auxfunction_s **auxfunction_map;
+	struct pr_lineno_s *linenos;
+	pr_def_t   *local_defs;
+} prdeb_resources_t;
 
 typedef struct {
 	progs_t    *pr;
@@ -322,35 +329,28 @@ error:
 static void
 pr_debug_clear (progs_t *pr, void *data)
 {
-	__auto_type res = (pr_debug_resources_t *) data;
+	__auto_type res = (prdeb_resources_t *) data;
 
 	if (res->string) {
 		dstring_clearstr (res->string);
 	} else {
 		res->string = dstring_newstr ();
 	}
-}
 
-void
-PR_Debug_Init (progs_t *pr)
-{
-	pr_debug_resources_t *res = calloc (1, sizeof (*res));
-	res->string = 0;
+	if (res->debug)
+		pr->free_progs_mem (pr, res->debug);
+	res->debug = 0;
+	res->auxfunctions = 0;
+	if (res->auxfunction_map)
+		pr->free_progs_mem (pr, res->auxfunction_map);
+	res->auxfunction_map = 0;
+	res->linenos = 0;
+	res->local_defs = 0;
 
-	PR_Resources_Register (pr, "PR_Debug", res, pr_debug_clear);
-	if (!file_hash) {
-		file_hash = Hash_NewTable (1024, file_get_key, file_free, 0);
-	}
-}
-
-void
-PR_Debug_Init_Cvars (void)
-{
-	pr_debug = Cvar_Get ("pr_debug", "0", CVAR_NONE, NULL,
-						 "enable progs debugging");
-	pr_source_path = Cvar_Get ("pr_source_path", ".", CVAR_NONE, source_path_f,
-							   "where to look (within gamedir) for source "
-							   "files");
+	pr->pr_debug_resources = res;
+	pr->watch = 0;
+	pr->wp_conditional = 0;
+	pr->wp_val.integer_var = 0;
 }
 
 static file_t *
@@ -411,6 +411,7 @@ PR_Load_Source_File (progs_t *pr, const char *fname)
 VISIBLE int
 PR_LoadDebug (progs_t *pr)
 {
+	prdeb_resources_t *res = PR_Resources_Find (pr, "PR_Debug");
 	char       *sym_path;
 	const char *path_end, *sym_file;
 	off_t       debug_size;
@@ -418,16 +419,6 @@ PR_LoadDebug (progs_t *pr)
 	pr_def_t   *def;
 	pr_type_t  *str = 0;
 
-	if (pr->debug)
-		pr->free_progs_mem (pr, pr->debug);
-	pr->debug = 0;
-	pr->auxfunctions = 0;
-	if (pr->auxfunction_map)
-		pr->free_progs_mem (pr, pr->auxfunction_map);
-	pr->auxfunction_map = 0;
-	pr->linenos = 0;
-	pr->local_defs = 0;
-
 	if (!pr_debug->int_val)
 		return 1;
 
@@ -438,107 +429,169 @@ PR_LoadDebug (progs_t *pr)
 	Hash_FlushTable (file_hash);
 	if (!str)
 		return 1;
-	pr->debugfile = PR_GetString (pr, str->string_var);
-	sym_file = QFS_SkipPath (pr->debugfile);
+	res->debugfile = PR_GetString (pr, str->string_var);
+	sym_file = QFS_SkipPath (res->debugfile);
 	path_end = QFS_SkipPath (pr->progs_name);
 	sym_path = malloc (strlen (sym_file) + (path_end - pr->progs_name) + 1);
 	strncpy (sym_path, pr->progs_name, path_end - pr->progs_name);
 	strcpy (sym_path + (path_end - pr->progs_name), sym_file);
-	pr->debug = pr->load_file (pr, sym_path, &debug_size);
-	if (!pr->debug) {
+	res->debug = pr->load_file (pr, sym_path, &debug_size);
+	if (!res->debug) {
 		Sys_Printf ("can't load %s for debug info\n", sym_path);
 		free (sym_path);
 		return 1;
 	}
-	pr->debug->version = LittleLong (pr->debug->version);
-	if (pr->debug->version != PROG_DEBUG_VERSION) {
+	res->debug->version = LittleLong (res->debug->version);
+	if (res->debug->version != PROG_DEBUG_VERSION) {
 		Sys_Printf ("ignoring %s with unsupported version %x.%03x.%03x\n",
 					sym_path,
-					(pr->debug->version >> 24) & 0xff,
-					(pr->debug->version >> 12) & 0xfff,
-					pr->debug->version & 0xfff);
-		pr->debug = 0;
+					(res->debug->version >> 24) & 0xff,
+					(res->debug->version >> 12) & 0xfff,
+					res->debug->version & 0xfff);
+		res->debug = 0;
 		free (sym_path);
 		return 1;
 	}
-	pr->debug->crc = LittleShort (pr->debug->crc);
-	if (pr->debug->crc != pr->crc) {
+	res->debug->crc = LittleShort (res->debug->crc);
+	if (res->debug->crc != pr->crc) {
 		Sys_Printf ("ignoring %s that doesn't match %s. (CRCs: "
 					"sym:%d dat:%d)\n",
 					sym_path,
 					pr->progs_name,
-					pr->debug->crc,
+					res->debug->crc,
 					pr->crc);
-		pr->debug = 0;
+		res->debug = 0;
 		free (sym_path);
 		return 1;
 	}
 	free (sym_path);
-	pr->debug->you_tell_me_and_we_will_both_know = LittleShort
-		(pr->debug->you_tell_me_and_we_will_both_know);
-	pr->debug->auxfunctions = LittleLong (pr->debug->auxfunctions);
-	pr->debug->num_auxfunctions = LittleLong (pr->debug->num_auxfunctions);
-	pr->debug->linenos = LittleLong (pr->debug->linenos);
-	pr->debug->num_linenos = LittleLong (pr->debug->num_linenos);
-	pr->debug->locals = LittleLong (pr->debug->locals);
-	pr->debug->num_locals = LittleLong (pr->debug->num_locals);
+	res->debug->you_tell_me_and_we_will_both_know = LittleShort
+		(res->debug->you_tell_me_and_we_will_both_know);
+	res->debug->auxfunctions = LittleLong (res->debug->auxfunctions);
+	res->debug->num_auxfunctions = LittleLong (res->debug->num_auxfunctions);
+	res->debug->linenos = LittleLong (res->debug->linenos);
+	res->debug->num_linenos = LittleLong (res->debug->num_linenos);
+	res->debug->locals = LittleLong (res->debug->locals);
+	res->debug->num_locals = LittleLong (res->debug->num_locals);
 
-	pr->auxfunctions = (pr_auxfunction_t*)((char*)pr->debug +
-										   pr->debug->auxfunctions);
-	pr->linenos = (pr_lineno_t*)((char*)pr->debug + pr->debug->linenos);
-	pr->local_defs = (pr_def_t*)((char*)pr->debug + pr->debug->locals);
+	res->auxfunctions = (pr_auxfunction_t*)((char*)res->debug +
+										   res->debug->auxfunctions);
+	res->linenos = (pr_lineno_t*)((char*)res->debug + res->debug->linenos);
+	res->local_defs = (pr_def_t*)((char*)res->debug + res->debug->locals);
 
 	i = pr->progs->numfunctions * sizeof (pr_auxfunction_t *);
-	pr->auxfunction_map = pr->allocate_progs_mem (pr, i);
+	res->auxfunction_map = pr->allocate_progs_mem (pr, i);
 	for (i = 0; (int) i < pr->progs->numfunctions; i++) //FIXME (cast)
-		pr->auxfunction_map[i] = 0;
+		res->auxfunction_map[i] = 0;
 
-	for (i = 0; i < pr->debug->num_auxfunctions; i++) {
-		pr->auxfunctions[i].function = LittleLong
-			(pr->auxfunctions[i].function);
-		pr->auxfunctions[i].source_line = LittleLong
-			(pr->auxfunctions[i].source_line);
-		pr->auxfunctions[i].line_info = LittleLong
-			(pr->auxfunctions[i].line_info);
-		pr->auxfunctions[i].local_defs = LittleLong
-			(pr->auxfunctions[i].local_defs);
-		pr->auxfunctions[i].num_locals = LittleLong
-			(pr->auxfunctions[i].num_locals);
+	for (i = 0; i < res->debug->num_auxfunctions; i++) {
+		res->auxfunctions[i].function = LittleLong
+			(res->auxfunctions[i].function);
+		res->auxfunctions[i].source_line = LittleLong
+			(res->auxfunctions[i].source_line);
+		res->auxfunctions[i].line_info = LittleLong
+			(res->auxfunctions[i].line_info);
+		res->auxfunctions[i].local_defs = LittleLong
+			(res->auxfunctions[i].local_defs);
+		res->auxfunctions[i].num_locals = LittleLong
+			(res->auxfunctions[i].num_locals);
 
-		pr->auxfunction_map[pr->auxfunctions[i].function] =
-			&pr->auxfunctions[i];
+		res->auxfunction_map[res->auxfunctions[i].function] =
+			&res->auxfunctions[i];
 	}
-	for (i = 0; i < pr->debug->num_linenos; i++) {
-		pr->linenos[i].fa.func = LittleLong (pr->linenos[i].fa.func);
-		pr->linenos[i].line = LittleLong (pr->linenos[i].line);
+	for (i = 0; i < res->debug->num_linenos; i++) {
+		res->linenos[i].fa.func = LittleLong (res->linenos[i].fa.func);
+		res->linenos[i].line = LittleLong (res->linenos[i].line);
 	}
-	for (i = 0; i < pr->debug->num_locals; i++) {
-		pr->local_defs[i].type = LittleShort (pr->local_defs[i].type);
-		pr->local_defs[i].ofs = LittleShort (pr->local_defs[i].ofs);
-		pr->local_defs[i].name = LittleLong (pr->local_defs[i].name);
+	for (i = 0; i < res->debug->num_locals; i++) {
+		res->local_defs[i].type = LittleShort (res->local_defs[i].type);
+		res->local_defs[i].ofs = LittleShort (res->local_defs[i].ofs);
+		res->local_defs[i].name = LittleLong (res->local_defs[i].name);
 	}
 	return 1;
 }
 
+VISIBLE pr_auxfunction_t *
+PR_Debug_AuxFunction (progs_t *pr, pr_uint_t func)
+{
+	prdeb_resources_t *res = pr->pr_debug_resources;
+	if (!res->debug || func >= res->debug->num_auxfunctions) {
+		return 0;
+	}
+	return &res->auxfunctions[func];
+}
+
+VISIBLE pr_auxfunction_t *
+PR_Debug_MappedAuxFunction (progs_t *pr, pr_uint_t func)
+{
+	prdeb_resources_t *res = pr->pr_debug_resources;
+	if (!res->debug || (int)func >= pr->progs->numfunctions) {//FIXME (cast)
+		return 0;
+	}
+	return res->auxfunction_map[func];
+}
+
+VISIBLE pr_def_t *
+PR_Debug_LocalDefs (progs_t *pr, pr_auxfunction_t *aux_function)
+{
+	prdeb_resources_t *res = pr->pr_debug_resources;
+	if (!res->debug || !aux_function) {
+		return 0;
+	}
+	if (aux_function->local_defs > res->debug->num_locals) {
+		return 0;
+	}
+	return res->local_defs + aux_function->local_defs;
+}
+
+VISIBLE pr_lineno_t *
+PR_Debug_Linenos (progs_t *pr, pr_auxfunction_t *aux_function,
+				  pr_uint_t *num_linenos)
+{
+	pr_uint_t   i, count;
+	prdeb_resources_t *res = pr->pr_debug_resources;
+	if (!res->debug) {
+		return 0;
+	}
+	if (!aux_function) {
+		*num_linenos = res->debug->num_linenos;
+		return res->linenos;
+	}
+	if (aux_function->line_info > res->debug->num_linenos) {
+		return 0;
+	}
+	//FIXME put lineno count in sym file
+	for (count = 1, i = aux_function->line_info + 1;
+		 i < res->debug->num_linenos; i++, count++) {
+		if (!res->linenos[i].line) {
+			break;
+		}
+	}
+	*num_linenos = count;
+	return res->linenos + aux_function->line_info;
+}
+
 pr_auxfunction_t *
 PR_Get_Lineno_Func (progs_t *pr, pr_lineno_t *lineno)
 {
-	while (lineno > pr->linenos && lineno->line)
+	prdeb_resources_t *res = pr->pr_debug_resources;
+	while (lineno > res->linenos && lineno->line)
 		lineno--;
 	if (lineno->line)
 		return 0;
-	return &pr->auxfunctions[lineno->fa.func];
+	return &res->auxfunctions[lineno->fa.func];
 }
 
 pr_uint_t
 PR_Get_Lineno_Addr (progs_t *pr, pr_lineno_t *lineno)
 {
+	prdeb_resources_t *res = pr->pr_debug_resources;
 	pr_auxfunction_t *f;
 
 	if (lineno->line)
 		return lineno->fa.addr;
-	if (lineno->fa.func < pr->debug->num_auxfunctions) {
-		f = &pr->auxfunctions[lineno->fa.func];
+	if (lineno->fa.func < res->debug->num_auxfunctions) {
+		f = &res->auxfunctions[lineno->fa.func];
 		return pr->pr_functions[f->function].first_statement;
 	}
 	// take a wild guess that only the line number is bogus and return
@@ -557,16 +610,17 @@ PR_Get_Lineno_Line (progs_t *pr, pr_lineno_t *lineno)
 pr_lineno_t *
 PR_Find_Lineno (progs_t *pr, pr_uint_t addr)
 {
+	prdeb_resources_t *res = pr->pr_debug_resources;
 	pr_uint_t   i;
 	pr_lineno_t *lineno = 0;
 
-	if (!pr->debug)
+	if (!res->debug)
 		return 0;
-	if (!pr->debug->num_linenos)
+	if (!res->debug->num_linenos)
 		return 0;
-	for (i = pr->debug->num_linenos; i > 0; i--) {
-		if (PR_Get_Lineno_Addr (pr, &pr->linenos[i - 1]) <= addr) {
-			lineno = &pr->linenos[i - 1];
+	for (i = res->debug->num_linenos; i > 0; i--) {
+		if (PR_Get_Lineno_Addr (pr, &res->linenos[i - 1]) <= addr) {
+			lineno = &res->linenos[i - 1];
 			break;
 		}
 	}
@@ -615,13 +669,14 @@ PR_Get_Source_Line (progs_t *pr, pr_uint_t addr)
 pr_def_t *
 PR_Get_Param_Def (progs_t *pr, dfunction_t *func, unsigned parm)
 {
+	prdeb_resources_t *res = pr->pr_debug_resources;
 	pr_uint_t    i;
 	pr_auxfunction_t *aux_func;
 	pr_def_t    *ddef = 0;
 	int          num_params;
 	int          param_offs = 0;
 
-	if (!pr->debug)
+	if (!res->debug)
 		return 0;
 	if (!func)
 		return 0;
@@ -634,12 +689,12 @@ PR_Get_Param_Def (progs_t *pr, dfunction_t *func, unsigned parm)
 	if (parm >= (unsigned) num_params)
 		return 0;
 
-	aux_func = pr->auxfunction_map[func - pr->pr_functions];
+	aux_func = res->auxfunction_map[func - pr->pr_functions];
 	if (!aux_func)
 		return 0;
 
 	for (i = 0; i < aux_func->num_locals; i++) {
-		ddef = &pr->local_defs[aux_func->local_defs + param_offs + i];
+		ddef = &res->local_defs[aux_func->local_defs + param_offs + i];
 		if (!parm--)
 			break;
 	}
@@ -649,11 +704,12 @@ PR_Get_Param_Def (progs_t *pr, dfunction_t *func, unsigned parm)
 static pr_auxfunction_t *
 get_aux_function (progs_t *pr)
 {
+	prdeb_resources_t *res = pr->pr_debug_resources;
 	dfunction_t *func;
-	if (!pr->pr_xfunction || !pr->auxfunction_map)
+	if (!pr->pr_xfunction || !res->auxfunction_map)
 		return 0;
 	func = pr->pr_xfunction->descriptor;
-	return pr->auxfunction_map[func - pr->pr_functions];
+	return res->auxfunction_map[func - pr->pr_functions];
 }
 
 static etype_t
@@ -679,6 +735,7 @@ get_etype (progs_t *pr, int typeptr)
 pr_def_t *
 PR_Get_Local_Def (progs_t *pr, pointer_t offs)
 {
+	prdeb_resources_t *res = pr->pr_debug_resources;
 	pr_uint_t   i;
 	dfunction_t *func;
 	pr_auxfunction_t *aux_func;
@@ -688,23 +745,24 @@ PR_Get_Local_Def (progs_t *pr, pointer_t offs)
 	func = pr->pr_xfunction->descriptor;
 	if (!func)
 		return 0;
-	aux_func = pr->auxfunction_map[func - pr->pr_functions];
+	aux_func = res->auxfunction_map[func - pr->pr_functions];
 	if (!aux_func)
 		return 0;
 	offs -= func->parm_start;
 	if (offs >= func->locals)
 		return 0;
 	for (i = 0; i < aux_func->num_locals; i++)
-		if (pr->local_defs[aux_func->local_defs + i].ofs == offs)
-			return &pr->local_defs[aux_func->local_defs + i];
+		if (res->local_defs[aux_func->local_defs + i].ofs == offs)
+			return &res->local_defs[aux_func->local_defs + i];
 	return 0;
 }
 
 VISIBLE void
 PR_DumpState (progs_t *pr)
 {
+	prdeb_resources_t *res = pr->pr_debug_resources;
 	if (pr->pr_xfunction) {
-		if (pr_debug->int_val && pr->debug) {
+		if (pr_debug->int_val && res->debug) {
 			pr_lineno_t *lineno;
 			pr_auxfunction_t *func = 0;
 			dfunction_t *descriptor = pr->pr_xfunction->descriptor;
@@ -803,9 +861,10 @@ value_string (pr_debug_data_t *data, qfot_type_t *type, pr_type_t *value)
 static pr_def_t *
 pr_debug_find_def (progs_t *pr, pr_int_t ofs)
 {
+	prdeb_resources_t *res = pr->pr_debug_resources;
 	pr_def_t   *def = 0;
 
-	if (pr_debug->int_val && pr->debug)
+	if (pr_debug->int_val && res->debug)
 		def = PR_Get_Local_Def (pr, ofs);
 	if (!def)
 		def = PR_GlobalAtOfs (pr, ofs);
@@ -993,11 +1052,12 @@ pr_debug_pointer_view (qfot_type_t *type, pr_type_t *value, void *_data)
 {
 	__auto_type data = (pr_debug_data_t *) _data;
 	progs_t    *pr = data->pr;
+	prdeb_resources_t *res = pr->pr_debug_resources; //FIXME
 	dstring_t  *dstr = data->dstr;
 	pointer_t   ofs = value->integer_var;
 	pr_def_t   *def = 0;
 
-	if (pr_debug->int_val && pr->debug) {
+	if (pr_debug->int_val && res->debug) {
 		def = PR_Get_Local_Def (pr, ofs);
 	}
 	if (!def) {
@@ -1165,6 +1225,7 @@ PR_Debug_Print (progs_t *pr, const char *expr)
 VISIBLE void
 PR_PrintStatement (progs_t *pr, dstatement_t *s, int contents)
 {
+	prdeb_resources_t *res = pr->pr_debug_resources;
 	int         addr = s - pr->pr_statements;
 	int         dump_code = contents & 2;
 	const char *fmt;
@@ -1188,7 +1249,7 @@ PR_PrintStatement (progs_t *pr, dstatement_t *s, int contents)
 	if (pr_debug->int_val > 1)
 		dump_code = 1;
 
-	if (pr_debug->int_val && pr->debug) {
+	if (pr_debug->int_val && res->debug) {
 		const char *source_line = PR_Get_Source_Line (pr, addr);
 
 		if (source_line) {
@@ -1344,13 +1405,14 @@ do_print:
 static void
 dump_frame (progs_t *pr, prstack_t *frame)
 {
+	prdeb_resources_t *res = pr->pr_debug_resources;
 	dfunction_t	   *f = frame->f ? frame->f->descriptor : 0;
 
 	if (!f) {
 		Sys_Printf ("<NO FUNCTION>\n");
 		return;
 	}
-	if (pr_debug->int_val && pr->debug) {
+	if (pr_debug->int_val && res->debug) {
 		pr_lineno_t *lineno = PR_Find_Lineno (pr, frame->s);
 		pr_auxfunction_t *func = PR_Get_Lineno_Func (pr, lineno);
 		pr_uint_t   line = PR_Get_Lineno_Line (pr, lineno);
@@ -1477,3 +1539,26 @@ ED_Print (progs_t *pr, edict_t *ed)
 
 	dstring_delete (dstr);
 }
+
+void
+PR_Debug_Init (progs_t *pr)
+{
+	prdeb_resources_t *res = calloc (1, sizeof (*res));
+	res->pr = pr;
+
+	PR_Resources_Register (pr, "PR_Debug", res, pr_debug_clear);
+	if (!file_hash) {
+		file_hash = Hash_NewTable (1024, file_get_key, file_free, 0);
+	}
+	PR_AddLoadFunc (pr, PR_LoadDebug);
+}
+
+void
+PR_Debug_Init_Cvars (void)
+{
+	pr_debug = Cvar_Get ("pr_debug", "0", CVAR_NONE, NULL,
+						 "enable progs debugging");
+	pr_source_path = Cvar_Get ("pr_source_path", ".", CVAR_NONE, source_path_f,
+							   "where to look (within gamedir) for source "
+							   "files");
+}
diff --git a/libs/gamecode/pr_load.c b/libs/gamecode/pr_load.c
index b7790711f..51723cd64 100644
--- a/libs/gamecode/pr_load.c
+++ b/libs/gamecode/pr_load.c
@@ -383,7 +383,6 @@ pr_run_ctors (progs_t *pr)
 
 static int (*load_funcs_1[])(progs_t *) = {
 	PR_RelocateBuiltins,
-	PR_LoadDebug,
 	0,
 };
 
diff --git a/tools/qfcc/source/dump_globals.c b/tools/qfcc/source/dump_globals.c
index ea52bd8f6..0dba5c6dc 100644
--- a/tools/qfcc/source/dump_globals.c
+++ b/tools/qfcc/source/dump_globals.c
@@ -263,19 +263,23 @@ dump_functions (progs_t *pr)
 					func->parm_size[j].size);
 		printf (") %d @ %x", func->locals, func->parm_start);
 		puts ("");
-		if (pr->debug && type_encodings) {
-			pr_auxfunction_t *aux = pr->auxfunction_map[i];
-			if (!aux)
+		if (type_encodings) {
+			pr_auxfunction_t *aux = PR_Debug_MappedAuxFunction (pr, i);
+			if (!aux) {
 				continue;
+			}
 			printf ("        %d %s:%d %d %d %d %x\n", aux->function,
 					PR_GetString (pr, func->s_file), aux->source_line,
 					aux->line_info,
 					aux->local_defs, aux->num_locals,
 					aux->return_type);
+			pr_def_t   *local_defs = PR_Debug_LocalDefs (pr, aux);
+			if (!local_defs) {
+				continue;
+			}
 			for (j = 0; j < (int)aux->num_locals; j++) {
-				pr->local_defs[+ aux->local_defs + j].type_encoding
-					+= type_encodings;
-				dump_def (pr, pr->local_defs + aux->local_defs + j, 1);
+				local_defs[j].type_encoding += type_encodings;//FIXME do in debug
+				dump_def (pr, local_defs + j, 1);
 			}
 		}
 	}
diff --git a/tools/qfcc/source/dump_lines.c b/tools/qfcc/source/dump_lines.c
index ae504c03d..966203a72 100644
--- a/tools/qfcc/source/dump_lines.c
+++ b/tools/qfcc/source/dump_lines.c
@@ -69,8 +69,8 @@ progs_get_func_data (unsigned func_index, void *data)
 	dfunction_t *func;
 
 	memset (&func_data, 0, sizeof (func_data));
-	if (func_index < pr->debug->num_auxfunctions) {
-		aux_func = pr->auxfunctions + func_index;
+	aux_func = PR_Debug_AuxFunction (pr, func_index);
+	if (aux_func) {
 		func_data.source_line = aux_func->source_line;
 		func_data.return_type = aux_func->return_type;
 		func_data.num_locals = aux_func->num_locals;
@@ -126,10 +126,11 @@ dump_line_set (pr_lineno_t *lineno, unsigned count,
 void
 dump_lines (progs_t *pr)
 {
-	if (!pr->debug)
+	pr_lineno_t *linenos;
+	pr_uint_t   num_linenos;
+	if (!(linenos = PR_Debug_Linenos (pr, 0, &num_linenos)))
 		return;
-	dump_line_set (pr->linenos, pr->debug->num_linenos,
-				   progs_get_func_data, pr);
+	dump_line_set (linenos, num_linenos, progs_get_func_data, pr);
 }
 
 static func_data_t *

From 4bc36836a10e699cb2fbfd7a34e99e7189b8653e Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 25 Feb 2020 20:16:37 +0900
Subject: [PATCH 0513/1519] Correct the type of an aux function's return type

It was made to be the address of the type encoding long ago.
---
 include/QF/pr_debug.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/include/QF/pr_debug.h b/include/QF/pr_debug.h
index be5e1471d..be398f056 100644
--- a/include/QF/pr_debug.h
+++ b/include/QF/pr_debug.h
@@ -39,8 +39,7 @@ typedef struct pr_auxfunction_s {
 	pr_uint_t   line_info;		// index to first lineno entry
 	pr_uint_t   local_defs;		// index to the first local def
 	pr_uint_t   num_locals;		// number of local defs
-	pr_short_t  return_type;	// return type of this function
-	pr_short_t  reserved;
+	pr_uint_t   return_type;	// return type of this function
 } pr_auxfunction_t;
 
 typedef struct pr_lineno_s {

From 282132958f2dbea62e651a643aff3a82fb3f8084 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 25 Feb 2020 20:45:36 +0900
Subject: [PATCH 0514/1519] Relocate local def type encodings in debug load

For technical reasons (programmer laziness), qfcc does not fix up local
def type encodings when writing the debug symbols file (type encoding
location not readily accessible).
---
 libs/gamecode/pr_debug.c         | 29 +++++++++++++++++++----------
 tools/qfcc/source/dump_globals.c |  1 -
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/libs/gamecode/pr_debug.c b/libs/gamecode/pr_debug.c
index 898e7255a..e9bc860a9 100644
--- a/libs/gamecode/pr_debug.c
+++ b/libs/gamecode/pr_debug.c
@@ -80,6 +80,7 @@ typedef struct prdeb_resources_s {
 	struct pr_auxfunction_s **auxfunction_map;
 	struct pr_lineno_s *linenos;
 	pr_def_t   *local_defs;
+	pr_def_t   *type_encodings_def;
 } prdeb_resources_t;
 
 typedef struct {
@@ -418,6 +419,7 @@ PR_LoadDebug (progs_t *pr)
 	pr_uint_t   i;
 	pr_def_t   *def;
 	pr_type_t  *str = 0;
+	pointer_t   type_encodings = 0;
 
 	if (!pr_debug->int_val)
 		return 1;
@@ -503,10 +505,22 @@ PR_LoadDebug (progs_t *pr)
 		res->linenos[i].fa.func = LittleLong (res->linenos[i].fa.func);
 		res->linenos[i].line = LittleLong (res->linenos[i].line);
 	}
+	res->type_encodings_def = PR_FindGlobal (pr, ".type_encodings");
+	if (res->type_encodings_def) {
+		__auto_type encodings = &G_STRUCT (pr, qfot_type_encodings_t,
+										   res->type_encodings_def->ofs);
+		type_encodings = encodings->types;
+	}
 	for (i = 0; i < res->debug->num_locals; i++) {
 		res->local_defs[i].type = LittleShort (res->local_defs[i].type);
-		res->local_defs[i].ofs = LittleShort (res->local_defs[i].ofs);
+		res->local_defs[i].size = LittleShort (res->local_defs[i].size);
+		res->local_defs[i].ofs = LittleLong (res->local_defs[i].ofs);
 		res->local_defs[i].name = LittleLong (res->local_defs[i].name);
+		res->local_defs[i].type_encoding
+			= LittleLong (res->local_defs[i].type_encoding);
+		if (type_encodings) {
+			res->local_defs[i].type_encoding += type_encodings;
+		}
 	}
 	return 1;
 }
@@ -715,18 +729,13 @@ get_aux_function (progs_t *pr)
 static etype_t
 get_etype (progs_t *pr, int typeptr)
 {
-	//FIXME cache .type_encodings def
-	pr_def_t   *te_def = PR_FindGlobal (pr, ".type_encodings");
-	qfot_type_encodings_t *encodings;
 	qfot_type_t *type;
 
-	if (!te_def) {
-		// can't decode the type, so make no assumptions about it
-		return typeptr;
+	if (!typeptr) {
+		return ev_void;
 	}
-	encodings = &G_STRUCT (pr, qfot_type_encodings_t, te_def->ofs);
-	type = &G_STRUCT (pr, qfot_type_t, encodings->types + typeptr);
-	if (type->meta == 0) {
+	type = &G_STRUCT (pr, qfot_type_t, typeptr);
+	if (type->meta == ty_basic) {
 		return type->t.type;
 	}
 	return ev_void;
diff --git a/tools/qfcc/source/dump_globals.c b/tools/qfcc/source/dump_globals.c
index 0dba5c6dc..65271b289 100644
--- a/tools/qfcc/source/dump_globals.c
+++ b/tools/qfcc/source/dump_globals.c
@@ -278,7 +278,6 @@ dump_functions (progs_t *pr)
 				continue;
 			}
 			for (j = 0; j < (int)aux->num_locals; j++) {
-				local_defs[j].type_encoding += type_encodings;//FIXME do in debug
 				dump_def (pr, local_defs + j, 1);
 			}
 		}

From 66dd3ef0704bf15f8465277cd560c5db961608ef Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 25 Feb 2020 21:23:13 +0900
Subject: [PATCH 0515/1519] Make a bunch of count things positive-only

This fixes a pile of FIXMEs, because some things should never be
negative.
---
 include/QF/pr_comp.h             |  8 ++++----
 libs/gamecode/pr_builtins.c      |  3 ++-
 libs/gamecode/pr_debug.c         | 17 +++++++++--------
 libs/gamecode/pr_load.c          |  2 +-
 tools/qfcc/source/dump_globals.c | 15 ++++++++++-----
 tools/qfcc/source/qfprogs.c      |  3 ++-
 6 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/include/QF/pr_comp.h b/include/QF/pr_comp.h
index 8c03a7981..60022098f 100644
--- a/include/QF/pr_comp.h
+++ b/include/QF/pr_comp.h
@@ -27,7 +27,7 @@ typedef int16_t pr_short_t;
 typedef uint16_t pr_ushort_t;
 typedef int32_t pr_int_t;
 typedef uint32_t pr_uint_t;
-typedef pr_int_t func_t;
+typedef pr_uint_t func_t;
 typedef pr_int_t string_t;
 typedef pr_uint_t pointer_t;
 
@@ -455,7 +455,7 @@ typedef struct dfunction_s {
 	pr_int_t    parm_start;
 	pr_uint_t   locals;				// total ints of parms + locals
 
-	pr_int_t    profile;			// runtime
+	pr_uint_t   profile;			// runtime
 
 	string_t    s_name;
 	pr_int_t    s_file;				// source file defined in
@@ -502,10 +502,10 @@ typedef struct dprograms_s {
 	pr_uint_t   numfielddefs;
 
 	pr_uint_t   ofs_functions;
-	pr_int_t    numfunctions;	// function 0 is an empty
+	pr_uint_t   numfunctions;	// function 0 is an empty
 
 	pr_uint_t   ofs_strings;
-	pr_int_t    numstrings;		// first string is a null string
+	pr_uint_t   numstrings;		// first string is a null string
 
 	pr_uint_t   ofs_globals;
 	pr_uint_t   numglobals;
diff --git a/libs/gamecode/pr_builtins.c b/libs/gamecode/pr_builtins.c
index a3ab8c9d9..12c2e6050 100644
--- a/libs/gamecode/pr_builtins.c
+++ b/libs/gamecode/pr_builtins.c
@@ -158,7 +158,8 @@ bi_no_function (progs_t *pr)
 VISIBLE int
 PR_RelocateBuiltins (progs_t *pr)
 {
-	pr_int_t    i, ind;
+	pr_uint_t   i;
+	pr_int_t    ind;
 	int         bad = 0;
 	dfunction_t *desc;
 	bfunction_t *func;
diff --git a/libs/gamecode/pr_debug.c b/libs/gamecode/pr_debug.c
index e9bc860a9..9fd61b020 100644
--- a/libs/gamecode/pr_debug.c
+++ b/libs/gamecode/pr_debug.c
@@ -483,7 +483,7 @@ PR_LoadDebug (progs_t *pr)
 
 	i = pr->progs->numfunctions * sizeof (pr_auxfunction_t *);
 	res->auxfunction_map = pr->allocate_progs_mem (pr, i);
-	for (i = 0; (int) i < pr->progs->numfunctions; i++) //FIXME (cast)
+	for (i = 0; i < pr->progs->numfunctions; i++)
 		res->auxfunction_map[i] = 0;
 
 	for (i = 0; i < res->debug->num_auxfunctions; i++) {
@@ -539,7 +539,7 @@ VISIBLE pr_auxfunction_t *
 PR_Debug_MappedAuxFunction (progs_t *pr, pr_uint_t func)
 {
 	prdeb_resources_t *res = pr->pr_debug_resources;
-	if (!res->debug || (int)func >= pr->progs->numfunctions) {//FIXME (cast)
+	if (!res->debug || func >= pr->progs->numfunctions) {
 		return 0;
 	}
 	return res->auxfunction_map[func];
@@ -1046,7 +1046,7 @@ pr_debug_func_view (qfot_type_t *type, pr_type_t *value, void *_data)
 	progs_t    *pr = data->pr;
 	dstring_t  *dstr = data->dstr;
 
-	if (value->func_var < 0 || value->func_var >= pr->progs->numfunctions) {
+	if (value->func_var >= pr->progs->numfunctions) {
 		dasprintf (dstr, "INVALID:%d", value->func_var);
 	} else if (!value->func_var) {
 		dstring_appendstr (dstr, "NULL");
@@ -1300,6 +1300,7 @@ PR_PrintStatement (progs_t *pr, dstatement_t *s, int contents)
 				unsigned    parm_ind = 0;
 				pr_int_t    opval;
 				etype_t     optype = ev_void;
+				func_t      func;
 
 				if (mode == 'P') {
 					opchar = fmt[3];
@@ -1343,10 +1344,10 @@ PR_PrintStatement (progs_t *pr, dstatement_t *s, int contents)
 					case 'F':
 						str = global_string (&data, opval, optype,
 											 contents & 1);
-						if (G_FUNCTION (pr, opval) >= 0
-							&& G_FUNCTION (pr, opval)
-								< pr->progs->numfunctions)
-						call_func = pr->pr_functions + G_FUNCTION (pr, opval);
+						func = G_FUNCTION (pr, opval);
+						if (func < pr->progs->numfunctions) {
+							call_func = pr->pr_functions + func;
+						}
 						break;
 					case 'P':
 						parm_def = PR_Get_Param_Def (pr, call_func, parm_ind);
@@ -1468,7 +1469,7 @@ PR_StackTrace (progs_t *pr)
 VISIBLE void
 PR_Profile (progs_t * pr)
 {
-	pr_int_t    max, num, i;
+	pr_uint_t   max, num, i;
 	dfunction_t *best, *f;
 
 	num = 0;
diff --git a/libs/gamecode/pr_load.c b/libs/gamecode/pr_load.c
index 51723cd64..c8157efa8 100644
--- a/libs/gamecode/pr_load.c
+++ b/libs/gamecode/pr_load.c
@@ -370,7 +370,7 @@ PR_AddLoadFinishFunc (progs_t *pr, int (*func)(progs_t *))
 static int
 pr_run_ctors (progs_t *pr)
 {
-	pr_int_t    fnum;
+	pr_uint_t   fnum;
 	dfunction_t *func;
 
 	for (fnum = 0; fnum < pr->progs->numfunctions; fnum++) {
diff --git a/tools/qfcc/source/dump_globals.c b/tools/qfcc/source/dump_globals.c
index 65271b289..9343a0ac7 100644
--- a/tools/qfcc/source/dump_globals.c
+++ b/tools/qfcc/source/dump_globals.c
@@ -86,7 +86,12 @@ dump_def (progs_t *pr, pr_def_t *def, int indent)
 				break;
 			case ev_string:
 				string = G_INT (pr, offset);
-				if (string < 0 || string >= pr->progs->numstrings) {
+				// at runtime, strings can be negative (thus string_t is
+				// signed), but negative strings means they have been
+				// dynamically allocated, thus a negative string index should
+				// never appear in compiled code
+				if (string < 0
+					|| (pr_uint_t) string >= pr->progs->numstrings) {
 					str = "invalid string offset";
 					comment = va (" %d %s", string, str);
 				} else {
@@ -115,7 +120,7 @@ dump_def (progs_t *pr, pr_def_t *def, int indent)
 				{
 					func_t      func = G_FUNCTION (pr, offset);
 					int         start;
-					if (func >= 0 && func < pr->progs->numfunctions) {
+					if (func < pr->progs->numfunctions) {
 						start = pr->pr_functions[func].first_statement;
 						if (start > 0)
 							comment = va (" %d @ %x", func, start);
@@ -230,9 +235,9 @@ qfo_fields (qfo_t *qfo)
 void
 dump_functions (progs_t *pr)
 {
-	int         i, j;
+	pr_uint_t   i, j, count;
 	const char *name;
-	int         start, count;
+	int         start;
 	const char *comment;
 	pr_def_t   *encodings_def;
 	pointer_t type_encodings = 0;
@@ -277,7 +282,7 @@ dump_functions (progs_t *pr)
 			if (!local_defs) {
 				continue;
 			}
-			for (j = 0; j < (int)aux->num_locals; j++) {
+			for (j = 0; j < aux->num_locals; j++) {
 				dump_def (pr, local_defs + j, 1);
 			}
 		}
diff --git a/tools/qfcc/source/qfprogs.c b/tools/qfcc/source/qfprogs.c
index 37acd11fc..02f05bce9 100644
--- a/tools/qfcc/source/qfprogs.c
+++ b/tools/qfcc/source/qfprogs.c
@@ -255,7 +255,8 @@ static int
 load_progs (const char *name)
 {
 	QFile      *file;
-	int         i, size;
+	int         size;
+	pr_uint_t   i;
 	char        buff[5];
 
 	Hash_FlushTable (func_tab);

From 3577d27a45815a53c9f5b0dc0b5db2bdcb45efd1 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 25 Feb 2020 23:14:18 +0900
Subject: [PATCH 0516/1519] Move the ObjQC data into a resource block

This makes it nice and private (though with the cached pointer, ObjQC is
still a first-class component).
---
 include/QF/progs.h     |  15 +-
 libs/ruamoko/rua_obj.c | 488 ++++++++++++++++++++++++-----------------
 2 files changed, 288 insertions(+), 215 deletions(-)

diff --git a/include/QF/progs.h b/include/QF/progs.h
index ebfa0a3fd..369360449 100644
--- a/include/QF/progs.h
+++ b/include/QF/progs.h
@@ -1636,8 +1636,6 @@ typedef struct {
 	strref_t   *tstr;				///< Linked list of temporary strings.
 } prstack_t;
 
-struct obj_list_s;
-
 struct progs_s {
 	int       (*parse_field) (progs_t *pr, const char *key, const char *value);
 
@@ -1772,18 +1770,7 @@ struct progs_s {
 
 	/// \name obj info
 	///@{
-	unsigned    selector_index;
-	unsigned    selector_index_max;
-	struct obj_list_s **selector_sels;
-	string_t   *selector_names;
-	struct hashtab_s *selector_hash;
-	struct hashtab_s *classes;
-	struct hashtab_s *load_methods;
-	struct obj_list_s *unresolved_classes;
-	struct obj_list_s *unclaimed_categories;
-	struct obj_list_s *unclaimed_proto_list;
-	struct obj_list_s *module_list;
-	struct obj_list_s *class_tree_list;
+	struct probj_resources_s *pr_objective_resources;
 	///@}
 
 	/// \name debugging
diff --git a/libs/ruamoko/rua_obj.c b/libs/ruamoko/rua_obj.c
index f44da87a9..93fe8a68b 100644
--- a/libs/ruamoko/rua_obj.c
+++ b/libs/ruamoko/rua_obj.c
@@ -61,6 +61,22 @@ typedef struct obj_list_s {
 	void       *data;
 } obj_list;
 
+typedef struct probj_resources_s {
+	progs_t    *pr;
+	unsigned    selector_index;
+	unsigned    selector_index_max;
+	obj_list  **selector_sels;
+	string_t   *selector_names;
+	hashtab_t  *selector_hash;
+	hashtab_t  *classes;
+	hashtab_t  *load_methods;
+	obj_list   *unresolved_classes;
+	obj_list   *unclaimed_categories;
+	obj_list   *unclaimed_proto_list;
+	obj_list   *module_list;
+	obj_list   *class_tree_list;
+} probj_t;
+
 static obj_list *obj_list_free_list;
 
 static obj_list *
@@ -144,7 +160,7 @@ class_tree_new (void)
 }
 
 static int
-class_is_subclass_of_class (progs_t *pr, pr_class_t *class,
+class_is_subclass_of_class (probj_t *probj, pr_class_t *class,
 							pr_class_t *superclass)
 {
 	while (class) {
@@ -152,20 +168,22 @@ class_is_subclass_of_class (progs_t *pr, pr_class_t *class,
 			return 1;
 		if (!class->super_class)
 			break;
-		class = Hash_Find (pr->classes, PR_GetString (pr, class->super_class));
+		class = Hash_Find (probj->classes,
+						   PR_GetString (probj->pr, class->super_class));
 	}
 	return 0;
 }
 
 static class_tree *
-create_tree_of_subclasses_inherited_from (progs_t *pr, pr_class_t *bottom,
+create_tree_of_subclasses_inherited_from (probj_t *probj, pr_class_t *bottom,
 										  pr_class_t *upper)
 {
+	progs_t    *pr = probj->pr;
 	const char *super_class = PR_GetString (pr, bottom->super_class);
 	pr_class_t *superclass;
 	class_tree *tree, *prev;
 
-	superclass = bottom->super_class ? Hash_Find (pr->classes, super_class)
+	superclass = bottom->super_class ? Hash_Find (probj->classes, super_class)
 									 : 0;
 	tree = prev = class_tree_new ();
 	prev->class = bottom;
@@ -174,7 +192,7 @@ create_tree_of_subclasses_inherited_from (progs_t *pr, pr_class_t *bottom,
 		tree->class = superclass;
 		tree->subclasses = list_cons (prev, tree->subclasses);
 		super_class = PR_GetString (pr, superclass->super_class);
-		superclass = (superclass->super_class ? Hash_Find (pr->classes,
+		superclass = (superclass->super_class ? Hash_Find (probj->classes,
 														   super_class)
 											  : 0);
 		prev = tree;
@@ -183,16 +201,17 @@ create_tree_of_subclasses_inherited_from (progs_t *pr, pr_class_t *bottom,
 }
 
 static class_tree *
-_obj_tree_insert_class (progs_t *pr, class_tree *tree, pr_class_t *class)
+_obj_tree_insert_class (probj_t *probj, class_tree *tree, pr_class_t *class)
 {
+	progs_t    *pr = probj->pr;
 	obj_list   *subclasses;
 	class_tree *new_tree;
 
 	if (!tree)
-		return create_tree_of_subclasses_inherited_from (pr, class, 0);
+		return create_tree_of_subclasses_inherited_from (probj, class, 0);
 	if (class == tree->class)
 		return tree;
-	if ((class->super_class ? Hash_Find (pr->classes,
+	if ((class->super_class ? Hash_Find (probj->classes,
 										 PR_GetString (pr,
 											 		   class->super_class))
 							: 0) == tree->class) {
@@ -209,32 +228,32 @@ _obj_tree_insert_class (progs_t *pr, class_tree *tree, pr_class_t *class)
 		tree->subclasses = list_cons (node, tree->subclasses);
 		return tree;
 	}
-	if (!class_is_subclass_of_class (pr, class, tree->class))
+	if (!class_is_subclass_of_class (probj, class, tree->class))
 		return 0;
 	for (subclasses = tree->subclasses; subclasses;
 		 subclasses = subclasses->next) {
 		pr_class_t *aclass = ((class_tree *)subclasses->data)->class;
-		if (class_is_subclass_of_class (pr, class, aclass)) {
-			subclasses->data = _obj_tree_insert_class (pr, subclasses->data,
+		if (class_is_subclass_of_class (probj, class, aclass)) {
+			subclasses->data = _obj_tree_insert_class (probj, subclasses->data,
 													   class);
 			return tree;
 		}
 	}
-	new_tree = create_tree_of_subclasses_inherited_from (pr, class,
+	new_tree = create_tree_of_subclasses_inherited_from (probj, class,
 														 tree->class);
 	tree->subclasses = list_cons (new_tree, tree->subclasses);
 	return tree;
 }
 
 static void
-obj_tree_insert_class (progs_t *pr, pr_class_t *class)
+obj_tree_insert_class (probj_t *probj, pr_class_t *class)
 {
 	obj_list   *list_node;
 	class_tree *tree;
 
-	list_node = pr->class_tree_list;
+	list_node = probj->class_tree_list;
 	while (list_node) {
-		tree = _obj_tree_insert_class (pr, list_node->data, class);
+		tree = _obj_tree_insert_class (probj, list_node->data, class);
 		if (tree) {
 			list_node->data = tree;
 			break;
@@ -243,73 +262,75 @@ obj_tree_insert_class (progs_t *pr, pr_class_t *class)
 		}
 	}
 	if (!list_node) {
-		tree = _obj_tree_insert_class (pr, 0, class);
-		pr->class_tree_list = list_cons (tree, pr->class_tree_list);
+		tree = _obj_tree_insert_class (probj, 0, class);
+		probj->class_tree_list = list_cons (tree, probj->class_tree_list);
 	}
 }
 
 static void
-obj_create_classes_tree (progs_t *pr, pr_module_t *module)
+obj_create_classes_tree (probj_t *probj, pr_module_t *module)
 {
+	progs_t    *pr = probj->pr;
 	pr_symtab_t *symtab = &G_STRUCT (pr, pr_symtab_t, module->symtab);
 	int         i;
 
 	for (i = 0; i < symtab->cls_def_cnt; i++) {
 		pr_class_t *class = &G_STRUCT (pr, pr_class_t, symtab->defs[i]);
-		obj_tree_insert_class (pr, class);
+		obj_tree_insert_class (probj, class);
 	}
 }
 
 static void
-obj_destroy_class_tree_node (progs_t *pr, class_tree *tree, int level)
+obj_destroy_class_tree_node (probj_t *probj, class_tree *tree, int level)
 {
 	tree->subclasses = (obj_list *) class_tree_free_list;
 	class_tree_free_list = tree;
 }
 
 static void
-obj_preorder_traverse (progs_t *pr, class_tree *tree, int level,
-					   void (*func) (progs_t *, class_tree *, int))
+obj_preorder_traverse (probj_t *probj, class_tree *tree, int level,
+					   void (*func) (probj_t *, class_tree *, int))
 {
 	obj_list   *node;
 
-	func (pr, tree, level);
+	func (probj, tree, level);
 	for (node = tree->subclasses; node; node = node->next)
-		obj_preorder_traverse (pr, node->data, level + 1, func);
+		obj_preorder_traverse (probj, node->data, level + 1, func);
 }
 
 static void
-obj_postorder_traverse (progs_t *pr, class_tree *tree, int level,
-						void (*func) (progs_t *, class_tree *, int))
+obj_postorder_traverse (probj_t *probj, class_tree *tree, int level,
+						void (*func) (probj_t *, class_tree *, int))
 {
 	obj_list   *node;
 
 	for (node = tree->subclasses; node; node = node->next)
-		obj_postorder_traverse (pr, node->data, level + 1, func);
-	func (pr, tree, level);
+		obj_postorder_traverse (probj, node->data, level + 1, func);
+	func (probj, tree, level);
 }
 
 static const char *
-selector_get_key (const void *s, void *_pr)
+selector_get_key (const void *s, void *_probj)
 {
-	progs_t    *pr = (progs_t *) _pr;
-	return PR_GetString (pr, pr->selector_names[(intptr_t) s]);
+	__auto_type probj = (probj_t *) _probj;
+	return PR_GetString (probj->pr, probj->selector_names[(intptr_t) s]);
 }
 
 static const char *
-class_get_key (const void *c, void *pr)
+class_get_key (const void *c, void *_probj)
 {
-	return PR_GetString ((progs_t *)pr, ((pr_class_t *)c)->name);
+	__auto_type probj = (probj_t *) _probj;
+	return PR_GetString (probj->pr, ((pr_class_t *)c)->name);
 }
 
 static uintptr_t
-load_methods_get_hash (const void *m, void *pr)
+load_methods_get_hash (const void *m, void *_probj)
 {
 	return (uintptr_t) m;
 }
 
 static int
-load_methods_compare (const void *m1, const void *m2, void *pr)
+load_methods_compare (const void *m1, const void *m2, void *_probj)
 {
 	return m1 == m2;
 }
@@ -323,8 +344,9 @@ sel_eq (pr_sel_t *s1, pr_sel_t *s2)
 }
 
 static int
-object_is_instance (progs_t *pr, pr_id_t *object)
+object_is_instance (probj_t *probj, pr_id_t *object)
 {
+	progs_t *pr = probj->pr;
 	pr_class_t *class;
 
 	if (object) {
@@ -335,8 +357,9 @@ object_is_instance (progs_t *pr, pr_id_t *object)
 }
 
 static string_t
-object_get_class_name (progs_t *pr, pr_id_t *object)
+object_get_class_name (probj_t *probj, pr_id_t *object)
 {
+	progs_t    *pr = probj->pr;
 	pr_class_t *class;
 
 	if (object) {
@@ -356,8 +379,9 @@ object_get_class_name (progs_t *pr, pr_id_t *object)
 //====================================================================
 
 static void
-finish_class (progs_t *pr, pr_class_t *class, pointer_t object_ptr)
+finish_class (probj_t *probj, pr_class_t *class, pointer_t object_ptr)
 {
+	progs_t    *pr = probj->pr;
 	pr_class_t *meta = &G_STRUCT (pr, pr_class_t, class->class_pointer);
 	pr_class_t *val;
 
@@ -365,7 +389,7 @@ finish_class (progs_t *pr, pr_class_t *class, pointer_t object_ptr)
 	if (class->super_class) {
 		const char *super_class = PR_GetString (pr, class->super_class);
 		const char *class_name = PR_GetString (pr, class->name);
-		val = Hash_Find (pr->classes, super_class);
+		val = Hash_Find (probj->classes, super_class);
 		if (!val)
 			PR_Error (pr, "broken class %s: super class %s not found",
 					  class_name, super_class);
@@ -384,39 +408,40 @@ finish_class (progs_t *pr, pr_class_t *class, pointer_t object_ptr)
 //====================================================================
 
 static int
-add_sel_name (progs_t *pr, const char *name)
+add_sel_name (probj_t *probj, const char *name)
 {
-	int         ind = ++pr->selector_index;
+	int         ind = ++probj->selector_index;
 	int         size, i;
 
-	if (pr->selector_index >= pr->selector_index_max) {
-		size = pr->selector_index_max + 128;
-		pr->selector_sels = realloc (pr->selector_sels,
-									 size * sizeof (obj_list *));
-		pr->selector_names = realloc (pr->selector_names,
-									  size * sizeof (string_t));
-		for (i = pr->selector_index_max; i < size; i++) {
-			pr->selector_sels[i] = 0;
-			pr->selector_names[i] = 0;
+	if (probj->selector_index >= probj->selector_index_max) {
+		size = probj->selector_index_max + 128;
+		probj->selector_sels = realloc (probj->selector_sels,
+										size * sizeof (obj_list *));
+		probj->selector_names = realloc (probj->selector_names,
+										 size * sizeof (string_t));
+		for (i = probj->selector_index_max; i < size; i++) {
+			probj->selector_sels[i] = 0;
+			probj->selector_names[i] = 0;
 		}
-		pr->selector_index_max = size;
+		probj->selector_index_max = size;
 	}
-	pr->selector_names[ind] = PR_SetString (pr, name);
+	probj->selector_names[ind] = PR_SetString (probj->pr, name);
 	return ind;
 }
 
 static pr_sel_t *
-sel_register_typed_name (progs_t *pr, const char *name, const char *types,
+sel_register_typed_name (probj_t *probj, const char *name, const char *types,
 						 pr_sel_t *sel)
 {
+	progs_t    *pr = probj->pr;
 	intptr_t	index;
 	int			is_new = 0;
 	obj_list   *l;
 
 	Sys_MaskPrintf (SYS_RUA_OBJ, "    Registering SEL %s %s\n", name, types);
-	index = (intptr_t) Hash_Find (pr->selector_hash, name);
+	index = (intptr_t) Hash_Find (probj->selector_hash, name);
 	if (index) {
-		for (l = pr->selector_sels[index]; l; l = l->next) {
+		for (l = probj->selector_sels[index]; l; l = l->next) {
 			pr_sel_t   *s = l->data;
 			if (!types || !s->sel_types) {
 				if (!s->sel_types && !types) {
@@ -435,7 +460,7 @@ sel_register_typed_name (progs_t *pr, const char *name, const char *types,
 			}
 		}
 	} else {
-		index = add_sel_name (pr, name);
+		index = add_sel_name (probj, name);
 		is_new = 1;
 	}
 	if (!sel)
@@ -446,11 +471,11 @@ sel_register_typed_name (progs_t *pr, const char *name, const char *types,
 
 	l = obj_list_new ();
 	l->data = sel;
-	l->next = pr->selector_sels[index];
-	pr->selector_sels[index] = l;
+	l->next = probj->selector_sels[index];
+	probj->selector_sels[index] = l;
 
 	if (is_new)
-		Hash_Add (pr->selector_hash, (void *) index);
+		Hash_Add (probj->selector_hash, (void *) index);
 done:
 	Sys_MaskPrintf (SYS_RUA_OBJ, "        %d @ %x\n",
 					sel->sel_id, PR_SetPointer (pr, sel));
@@ -458,40 +483,43 @@ done:
 }
 
 static pr_sel_t *
-sel_register_name (progs_t *pr, const char *name)
+sel_register_name (probj_t *probj, const char *name)
 {
-	return sel_register_typed_name (pr, name, "", 0);
+	return sel_register_typed_name (probj, name, "", 0);
 }
 
 static void
-register_selectors_from_list (progs_t *pr, pr_method_list_t *method_list)
+register_selectors_from_list (probj_t *probj, pr_method_list_t *method_list)
 {
+	progs_t    *pr = probj->pr;
 	int         i;
 
 	for (i = 0; i < method_list->method_count; i++) {
 		pr_method_t *method = &method_list->method_list[i];
 		const char *name = PR_GetString (pr, method->method_name);
 		const char *types = PR_GetString (pr, method->method_types);
-		pr_sel_t   *sel = sel_register_typed_name (pr, name, types, 0);
+		pr_sel_t   *sel = sel_register_typed_name (probj, name, types, 0);
 		method->method_name = PR_SetPointer (pr, sel);
 	}
 }
 
 static void
-obj_register_selectors_from_class (progs_t *pr, pr_class_t *class)
+obj_register_selectors_from_class (probj_t *probj, pr_class_t *class)
 {
+	progs_t    *pr = probj->pr;
 	pr_method_list_t *method_list = &G_STRUCT (pr, pr_method_list_t,
 											   class->methods);
 	while (method_list) {
-		register_selectors_from_list (pr, method_list);
+		register_selectors_from_list (probj, method_list);
 		method_list = &G_STRUCT (pr, pr_method_list_t,
 								 method_list->method_next);
 	}
 }
 
 static void
-obj_init_protocols (progs_t *pr, pr_protocol_list_t *protos)
+obj_init_protocols (probj_t *probj, pr_protocol_list_t *protos)
 {
+	progs_t    *pr = probj->pr;
 	pr_class_t *proto_class;
 	pr_protocol_t *proto;
 	int         i;
@@ -499,9 +527,9 @@ obj_init_protocols (progs_t *pr, pr_protocol_list_t *protos)
 	if (!protos)
 		return;
 
-	if (!(proto_class = Hash_Find (pr->classes, "Protocol"))) {
-		pr->unclaimed_proto_list = list_cons (protos,
-											  pr->unclaimed_proto_list);
+	if (!(proto_class = Hash_Find (probj->classes, "Protocol"))) {
+		probj->unclaimed_proto_list = list_cons (protos,
+												 probj->unclaimed_proto_list);
 		return;
 	}
 
@@ -509,8 +537,8 @@ obj_init_protocols (progs_t *pr, pr_protocol_list_t *protos)
 		proto = &G_STRUCT (pr, pr_protocol_t, protos->list[i]);
 		if (!proto->class_pointer) {
 			proto->class_pointer = PR_SetPointer (pr, proto_class);
-			obj_init_protocols (pr, &G_STRUCT (pr, pr_protocol_list_t,
-											   proto->protocol_list));
+			obj_init_protocols (probj, &G_STRUCT (pr, pr_protocol_list_t,
+												  proto->protocol_list));
 		} else {
 			if (proto->class_pointer != PR_SetPointer (pr, proto_class))
 				PR_RunError (pr, "protocol broken");
@@ -519,8 +547,10 @@ obj_init_protocols (progs_t *pr, pr_protocol_list_t *protos)
 }
 
 static void
-class_add_method_list (progs_t *pr, pr_class_t *class, pr_method_list_t *list)
+class_add_method_list (probj_t *probj, pr_class_t *class,
+					   pr_method_list_t *list)
 {
+	progs_t    *pr = probj->pr;
 	int         i;
 
 	for (i = 0; i < list->method_count; i++) {
@@ -528,7 +558,7 @@ class_add_method_list (progs_t *pr, pr_class_t *class, pr_method_list_t *list)
 		if (method->method_name) {
 			const char *name = PR_GetString (pr, method->method_name);
 			const char *types = PR_GetString (pr, method->method_types);
-			pr_sel_t   *sel = sel_register_typed_name (pr, name, types, 0);
+			pr_sel_t   *sel = sel_register_typed_name (probj, name, types, 0);
 			method->method_name = PR_SetPointer (pr, sel);
 		}
 	}
@@ -538,7 +568,7 @@ class_add_method_list (progs_t *pr, pr_class_t *class, pr_method_list_t *list)
 }
 
 static void
-obj_class_add_protocols (progs_t *pr, pr_class_t *class,
+obj_class_add_protocols (probj_t *probj, pr_class_t *class,
 						 pr_protocol_list_t *protos)
 {
 	if (!protos)
@@ -549,50 +579,54 @@ obj_class_add_protocols (progs_t *pr, pr_class_t *class,
 }
 
 static void
-finish_category (progs_t *pr, pr_category_t *category, pr_class_t *class)
+finish_category (probj_t *probj, pr_category_t *category, pr_class_t *class)
 {
+	progs_t    *pr = probj->pr;
 	pr_method_list_t *method_list;
 	pr_protocol_list_t *protocol_list;
 
 	if (category->instance_methods) {
 		method_list = &G_STRUCT (pr, pr_method_list_t,
 								 category->instance_methods);
-		class_add_method_list (pr, class, method_list);
+		class_add_method_list (probj, class, method_list);
 	}
 	if (category->class_methods) {
 		pr_class_t *meta = &G_STRUCT (pr, pr_class_t, class->class_pointer);
 		method_list = &G_STRUCT (pr, pr_method_list_t,
 								 category->class_methods);
-		class_add_method_list (pr, meta, method_list);
+		class_add_method_list (probj, meta, method_list);
 	}
 	if (category->protocols) {
 		protocol_list = &G_STRUCT (pr, pr_protocol_list_t,
 								   category->protocols);
-		obj_init_protocols (pr, protocol_list);
-		obj_class_add_protocols (pr, class, protocol_list);
+		obj_init_protocols (probj, protocol_list);
+		obj_class_add_protocols (probj, class, protocol_list);
 	}
 }
 
 static void
-obj_send_message_in_list (progs_t *pr, pr_method_list_t *method_list,
+obj_send_message_in_list (probj_t *probj, pr_method_list_t *method_list,
 						  pr_class_t *class, pr_sel_t *op)
 {
+	progs_t    *pr = probj->pr;
 	int         i;
 
 	if (!method_list)
 		return;
 
-	obj_send_message_in_list (pr, &G_STRUCT (pr, pr_method_list_t,
-											 method_list->method_next),
+	obj_send_message_in_list (probj, &G_STRUCT (pr, pr_method_list_t,
+												method_list->method_next),
 							  class, op);
 
 	for (i = 0; i < method_list->method_count; i++) {
 		pr_method_t *mth = &method_list->method_list[i];
 		if (mth->method_name && sel_eq (&G_STRUCT (pr, pr_sel_t,
 												   mth->method_name), op)
-			&& !Hash_FindElement (pr->load_methods, (void *) (intptr_t) mth->method_imp)) {
-			Hash_AddElement (pr->load_methods, (void *) (intptr_t) mth->method_imp);
-
+			&& !Hash_FindElement (probj->load_methods,
+								  (void *) (intptr_t) mth->method_imp)) {
+			Hash_AddElement (probj->load_methods,
+							 (void *) (intptr_t) mth->method_imp);
+			//FIXME need to wrap in save/restore params?
 			PR_ExecuteProgram (pr, mth->method_imp);
 			break;
 		}
@@ -600,58 +634,62 @@ obj_send_message_in_list (progs_t *pr, pr_method_list_t *method_list,
 }
 
 static void
-send_load (progs_t *pr, class_tree *tree, int level)
+send_load (probj_t *probj, class_tree *tree, int level)
 {
-	pr_sel_t   *load_sel = sel_register_name (pr, "load");
+	progs_t    *pr = probj->pr;
+	pr_sel_t   *load_sel = sel_register_name (probj, "load");
 	pr_class_t *class = tree->class;
 	pr_class_t *meta = &G_STRUCT (pr, pr_class_t, class->class_pointer);
 	pr_method_list_t *method_list = &G_STRUCT (pr, pr_method_list_t,
 											   meta->methods);
 
-	obj_send_message_in_list (pr, method_list, class, load_sel);
+	obj_send_message_in_list (probj, method_list, class, load_sel);
 }
 
 static void
-obj_send_load (progs_t *pr)
+obj_send_load (probj_t *probj)
 {
+	progs_t    *pr = probj->pr;
 	obj_list   *m;
 
-	if (pr->unresolved_classes) {
-		pr_class_t *class = pr->unresolved_classes->data;
+	if (probj->unresolved_classes) {
+		pr_class_t *class = probj->unresolved_classes->data;
 		const char *super_class = PR_GetString (pr, class->super_class);
-		while (Hash_Find (pr->classes, super_class)) {
-			list_remove (&pr->unresolved_classes);
-			if (pr->unresolved_classes) {
-				class = pr->unresolved_classes->data;
+		while (Hash_Find (probj->classes, super_class)) {
+			list_remove (&probj->unresolved_classes);
+			if (probj->unresolved_classes) {
+				class = probj->unresolved_classes->data;
 				super_class = PR_GetString (pr, class->super_class);
 			} else {
 				break;
 			}
 		}
-		if (pr->unresolved_classes)
+		if (probj->unresolved_classes)
 			return;
 	}
 
 	//XXX constant string stuff here (see init.c in libobjc source)
 
-	for (m = pr->module_list; m; m = m->next)
-		obj_create_classes_tree (pr, m->data);
-	while (pr->class_tree_list) {
-		obj_preorder_traverse (pr, pr->class_tree_list->data, 0, send_load);
-		obj_postorder_traverse (pr, pr->class_tree_list->data, 0,
+	for (m = probj->module_list; m; m = m->next)
+		obj_create_classes_tree (probj, m->data);
+	while (probj->class_tree_list) {
+		obj_preorder_traverse (probj, probj->class_tree_list->data, 0,
+							   send_load);
+		obj_postorder_traverse (probj, probj->class_tree_list->data, 0,
 								obj_destroy_class_tree_node);
-		list_remove (&pr->class_tree_list);
+		list_remove (&probj->class_tree_list);
 	}
 	//XXX callback
-	//for (m = pr->module_list; m; m = m->next)
-	//	obj_create_classes_tree (pr, m->data);
-	obj_list_free (pr->module_list);
-	pr->module_list = 0;
+	//for (m = probj->module_list; m; m = m->next)
+	//	obj_create_classes_tree (probj, m->data);
+	obj_list_free (probj->module_list);
+	probj->module_list = 0;
 }
 
 static pr_method_t *
-obj_find_message (progs_t *pr, pr_class_t *class, pr_sel_t *selector)
+obj_find_message (probj_t *probj, pr_class_t *class, pr_sel_t *selector)
 {
+	progs_t    *pr = probj->pr;
 	pr_class_t *c = class;
 	pr_method_list_t *method_list;
 	pr_method_t *method;
@@ -661,7 +699,7 @@ obj_find_message (progs_t *pr, pr_class_t *class, pr_sel_t *selector)
 	string_t   *names;
 
 	if (dev & SYS_RUA_MSG) {
-		names = pr->selector_names;
+		names = probj->selector_names;
 		Sys_Printf ("Searching for %s\n",
 					PR_GetString (pr, names[selector->sel_id]));
 	}
@@ -680,13 +718,13 @@ obj_find_message (progs_t *pr, pr_class_t *class, pr_sel_t *selector)
 				 i < method_list->method_count; i++, method++) {
 				sel = &G_STRUCT (pr, pr_sel_t, method->method_name);
 				if (developer->int_val & SYS_RUA_MSG) {
-					names = pr->selector_names;
+					names = probj->selector_names;
 					Sys_Printf ("  %s\n",
 								PR_GetString (pr, names[sel->sel_id]));
 				}
 				if (sel->sel_id == selector->sel_id) {
 					if (dev & SYS_RUA_MSG) {
-						names = pr->selector_names;
+						names = probj->selector_names;
 						Sys_Printf ("found %s: %x\n",
 									PR_GetString (pr, names[selector->sel_id]),
 									method->method_imp);
@@ -703,13 +741,14 @@ obj_find_message (progs_t *pr, pr_class_t *class, pr_sel_t *selector)
 }
 
 static void
-obj_send_initialize (progs_t *pr, pr_class_t *class)
+obj_send_initialize (probj_t *probj, pr_class_t *class)
 {
+	progs_t    *pr = probj->pr;
 	pr_method_list_t *method_list;
 	pr_method_t *method;
 	pr_sel_t   *sel;
 	pr_class_t *class_pointer;
-	pr_sel_t   *selector = sel_register_name (pr, "initialize");
+	pr_sel_t   *selector = sel_register_name (probj, "initialize");
 	int         i;
 
 	if (PR_CLS_ISINITIALIZED (class))
@@ -718,8 +757,8 @@ obj_send_initialize (progs_t *pr, pr_class_t *class)
 	PR_CLS_SETINITIALIZED (class);
 	PR_CLS_SETINITIALIZED (class_pointer);
 	if (class->super_class)
-		obj_send_initialize (pr, &G_STRUCT (pr, pr_class_t,
-											class->super_class));
+		obj_send_initialize (probj, &G_STRUCT (pr, pr_class_t,
+											   class->super_class));
 
 	method_list = &G_STRUCT (pr, pr_method_list_t, class_pointer->methods);
 	while (method_list) {
@@ -744,47 +783,50 @@ obj_send_initialize (progs_t *pr, pr_class_t *class)
 }
 
 static func_t
-get_imp (progs_t *pr, pr_class_t *class, pr_sel_t *sel)
+get_imp (probj_t *probj, pr_class_t *class, pr_sel_t *sel)
 {
-	pr_method_t *method = obj_find_message (pr, class, sel);
+	pr_method_t *method = obj_find_message (probj, class, sel);
 
 	return method ? method->method_imp : 0;
 }
 
 static func_t
-obj_msg_lookup (progs_t *pr, pr_id_t *receiver, pr_sel_t *op)
+obj_msg_lookup (probj_t *probj, pr_id_t *receiver, pr_sel_t *op)
 {
+	progs_t    *pr = probj->pr;
 	pr_class_t *class;
 	if (!receiver)
 		return 0;
 	class = &G_STRUCT (pr, pr_class_t, receiver->class_pointer);
 	if (PR_CLS_ISCLASS (class)) {
 		if (!PR_CLS_ISINITIALIZED (class))
-			obj_send_initialize (pr, class);
+			obj_send_initialize (probj, class);
 	} else if (PR_CLS_ISMETA (class)
 			   && PR_CLS_ISCLASS ((pr_class_t *) receiver)) {
 		if (!PR_CLS_ISINITIALIZED ((pr_class_t *) receiver))
-			obj_send_initialize (pr, (pr_class_t *) receiver);
+			obj_send_initialize (probj, (pr_class_t *) receiver);
 	}
-	return get_imp (pr, class, op);
+	return get_imp (probj, class, op);
 }
 
 static func_t
-obj_msg_lookup_super (progs_t *pr, pr_super_t *super, pr_sel_t *op)
+obj_msg_lookup_super (probj_t *probj, pr_super_t *super, pr_sel_t *op)
 {
+	progs_t    *pr = probj->pr;
 	pr_class_t *class;
 
 	if (!super->self)
 		return 0;
 
 	class = &G_STRUCT (pr, pr_class_t, super->class);
-	return get_imp (pr, class, op);
+	return get_imp (probj, class, op);
 }
 
 static void
-obj_verror (progs_t *pr, pr_id_t *object, int code, const char *fmt, int count,
+obj_verror (probj_t *probj, pr_id_t *object, int code, const char *fmt, int count,
 			pr_type_t **args)
 {
+	progs_t    *pr = probj->pr;
 	dstring_t  *dstr = dstring_newstr ();
 
 	PR_Sprintf (pr, dstr, "obj_verror", fmt, count, args);
@@ -792,8 +834,9 @@ obj_verror (progs_t *pr, pr_id_t *object, int code, const char *fmt, int count,
 }
 
 static void
-dump_ivars (progs_t *pr, pointer_t _ivars)
+dump_ivars (probj_t *probj, pointer_t _ivars)
 {
+	progs_t    *pr = probj->pr;
 	pr_ivar_list_t *ivars;
 	int         i;
 
@@ -811,6 +854,7 @@ dump_ivars (progs_t *pr, pointer_t _ivars)
 static void
 rua___obj_exec_class (progs_t *pr)
 {
+	probj_t    *probj = pr->pr_objective_resources;
 	pr_module_t *module = &P_STRUCT (pr, pr_module_t, 0);
 	pr_symtab_t *symtab;
 	pr_sel_t   *sel;
@@ -833,14 +877,14 @@ rua___obj_exec_class (progs_t *pr)
 					symtab->cat_def_cnt,
 					symtab->cat_def_cnt == 1 ? "y" : "ies");
 
-	pr->module_list = list_cons (module, pr->module_list);
+	probj->module_list = list_cons (module, probj->module_list);
 
 	sel = &G_STRUCT (pr, pr_sel_t, symtab->refs);
 	for (i = 0; i < symtab->sel_ref_cnt; i++) {
 		const char *name, *types;
 		name = PR_GetString (pr, sel->sel_id);
 		types = PR_GetString (pr, sel->sel_types);
-		sel_register_typed_name (pr, name, types, sel);
+		sel_register_typed_name (probj, name, types, sel);
 		sel++;
 	}
 
@@ -860,7 +904,7 @@ rua___obj_exec_class (progs_t *pr)
 						class->instance_size,
 						class->ivars);
 		if (developer->int_val & SYS_RUA_OBJ)
-			dump_ivars (pr, class->ivars);
+			dump_ivars (probj, class->ivars);
 		Sys_MaskPrintf (SYS_RUA_OBJ, "    instance methods: %x\n",
 						class->methods);
 		Sys_MaskPrintf (SYS_RUA_OBJ, "    protocols: %x\n", class->protocols);
@@ -870,30 +914,31 @@ rua___obj_exec_class (progs_t *pr)
 						meta->instance_size,
 						meta->ivars);
 		if (developer->int_val & SYS_RUA_OBJ)
-			dump_ivars (pr, meta->ivars);
+			dump_ivars (probj, meta->ivars);
 
 		class->subclass_list = 0;
 
-		Hash_Add (pr->classes, class);
+		Hash_Add (probj->classes, class);
 
-		obj_register_selectors_from_class (pr, class);
-		obj_register_selectors_from_class (pr, meta);
+		obj_register_selectors_from_class (probj, class);
+		obj_register_selectors_from_class (probj, meta);
 
 		if (class->protocols) {
 			pr_protocol_list_t *protocol_list;
 			protocol_list = &G_STRUCT (pr, pr_protocol_list_t,
 									   class->protocols);
-			obj_init_protocols (pr, protocol_list);
+			obj_init_protocols (probj, protocol_list);
 		}
 
-		if (class->super_class && !Hash_Find (pr->classes, super_class))
-			pr->unresolved_classes = list_cons (class, pr->unresolved_classes);
+		if (class->super_class && !Hash_Find (probj->classes, super_class))
+			probj->unresolved_classes = list_cons (class,
+												   probj->unresolved_classes);
 	}
 
 	for (i = 0; i < symtab->cat_def_cnt; i++, ptr++) {
 		pr_category_t *category = &G_STRUCT (pr, pr_category_t, *ptr);
 		const char *class_name = PR_GetString (pr, category->class_name);
-		pr_class_t *class = Hash_Find (pr->classes, class_name);
+		pr_class_t *class = Hash_Find (probj->classes, class_name);
 
 		Sys_MaskPrintf (SYS_RUA_OBJ, "Category %s (%s) @ %x\n",
 						PR_GetString (pr, category->class_name),
@@ -906,36 +951,37 @@ rua___obj_exec_class (progs_t *pr)
 						category->protocols);
 
 		if (class) {
-			finish_category (pr, category, class);
+			finish_category (probj, category, class);
 		} else {
-			pr->unclaimed_categories = list_cons (category,
-												  pr->unclaimed_categories);
+			probj->unclaimed_categories
+				= list_cons (category, probj->unclaimed_categories);
 		}
 	}
 
-	for (cell = &pr->unclaimed_categories; *cell; ) {
+	for (cell = &probj->unclaimed_categories; *cell; ) {
 		pr_category_t *category = (*cell)->data;
 		const char *class_name = PR_GetString (pr, category->class_name);
-		pr_class_t *class = Hash_Find (pr->classes, class_name);
+		pr_class_t *class = Hash_Find (probj->classes, class_name);
 
 		if (class) {
 			list_remove (cell);
-			finish_category (pr, category, class);
+			finish_category (probj, category, class);
 		} else {
 			cell = &(*cell)->next;
 		}
 	}
 
-	if (pr->unclaimed_proto_list && Hash_Find (pr->classes, "Protocol")) {
-		for (cell = &pr->unclaimed_proto_list; *cell; ) {
-			obj_init_protocols (pr, (*cell)->data);
+	if (probj->unclaimed_proto_list
+		&& Hash_Find (probj->classes, "Protocol")) {
+		for (cell = &probj->unclaimed_proto_list; *cell; ) {
+			obj_init_protocols (probj, (*cell)->data);
 			list_remove (cell);
 		}
 	}
 
 	Sys_MaskPrintf (SYS_RUA_OBJ, "Finished initializing %s module\n",
 					PR_GetString (pr, module->name));
-	obj_send_load (pr);
+	obj_send_load (probj);
 	Sys_MaskPrintf (SYS_RUA_OBJ, "Leaving %s module init\n",
 					PR_GetString (pr, module->name));
 }
@@ -943,18 +989,20 @@ rua___obj_exec_class (progs_t *pr)
 static void
 rua_obj_error (progs_t *pr)
 {
+	probj_t    *probj = pr->pr_objective_resources;
 	pr_id_t    *object = &P_STRUCT (pr, pr_id_t, 0);
 	int         code = P_INT (pr, 1);
 	const char *fmt = P_GSTRING (pr, 2);
 	int         count = pr->pr_argc - 3;
 	pr_type_t **args = &pr->pr_params[3];
 
-	obj_verror (pr, object, code, fmt, count, args);
+	obj_verror (probj, object, code, fmt, count, args);
 }
 
 static void
 rua_obj_verror (progs_t *pr)
 {
+	probj_t    *probj = pr->pr_objective_resources;
 	pr_id_t    *object = &P_STRUCT (pr, pr_id_t, 0);
 	int         code = P_INT (pr, 1);
 	const char *fmt = P_GSTRING (pr, 2);
@@ -965,12 +1013,13 @@ rua_obj_verror (progs_t *pr)
 
 	for (i = 0; i < val->count; i++)
 		args[i] = params + i * pr->pr_param_size;
-	obj_verror (pr, object, code, fmt, val->count, args);
+	obj_verror (probj, object, code, fmt, val->count, args);
 }
 
 static void
 rua_obj_set_error_handler (progs_t *pr)
 {
+	//probj_t    *probj = pr->pr_objective_resources;
 	//func_t      func = P_INT (pr, 0);
 	//arglist
 	//XXX
@@ -980,38 +1029,41 @@ rua_obj_set_error_handler (progs_t *pr)
 static void
 rua_obj_msg_lookup (progs_t *pr)
 {
+	probj_t    *probj = pr->pr_objective_resources;
 	pr_id_t    *receiver = &P_STRUCT (pr, pr_id_t, 0);
 	pr_sel_t   *op = &P_STRUCT (pr, pr_sel_t, 1);
 
-	R_INT (pr) = obj_msg_lookup (pr, receiver, op);
+	R_INT (pr) = obj_msg_lookup (probj, receiver, op);
 }
 
 static void
 rua_obj_msg_lookup_super (progs_t *pr)
 {
+	probj_t    *probj = pr->pr_objective_resources;
 	pr_super_t *super = &P_STRUCT (pr, pr_super_t, 0);
 	pr_sel_t   *_cmd = &P_STRUCT (pr, pr_sel_t, 1);
 
-	R_INT (pr) = obj_msg_lookup_super (pr, super, _cmd);
+	R_INT (pr) = obj_msg_lookup_super (probj, super, _cmd);
 }
 
 static void
 rua_obj_msg_sendv (progs_t *pr)
 {
+	probj_t    *probj = pr->pr_objective_resources;
 	pr_id_t    *receiver = &P_STRUCT (pr, pr_id_t, 0);
 	pr_sel_t   *op = &P_STRUCT (pr, pr_sel_t, 1);
 	pr_va_list_t *args = (pr_va_list_t *) &P_POINTER (pr, 2);
 	pr_type_t  *params = G_GPOINTER (pr, args->list);
 	int         count = args->count;
-	func_t      imp = obj_msg_lookup (pr, receiver, op);
+	func_t      imp = obj_msg_lookup (probj, receiver, op);
 
 	count = bound (0, count, 6);
 	if (count && pr_boundscheck->int_val)
 		PR_BoundsCheckSize (pr, args->list, count * pr->pr_param_size);
 	if (!imp)
 		PR_RunError (pr, "%s does not respond to %s",
-					 PR_GetString (pr, object_get_class_name (pr, receiver)),
-					 PR_GetString (pr, pr->selector_names[op->sel_id]));
+					 PR_GetString (pr, object_get_class_name (probj, receiver)),
+					 PR_GetString (pr, probj->selector_names[op->sel_id]));
 	if (count)
 		memcpy (pr->pr_params[2], params, count * 4 * pr->pr_param_size);
 	PR_CallFunction (pr, imp);
@@ -1096,6 +1148,7 @@ rua_obj_free (progs_t *pr)
 static void
 rua_obj_get_uninstalled_dtable (progs_t *pr)
 {
+	//probj_t    *probj = pr->pr_objective_resources;
 	//XXX
 	PR_RunError (pr, "%s, not implemented", __FUNCTION__);
 }
@@ -1103,6 +1156,7 @@ rua_obj_get_uninstalled_dtable (progs_t *pr)
 static void
 rua_obj_msgSend (progs_t *pr)
 {
+	probj_t    *probj = pr->pr_objective_resources;
 	pr_id_t    *self = &P_STRUCT (pr, pr_id_t, 0);
 	pr_sel_t   *_cmd = &P_STRUCT (pr, pr_sel_t, 1);
 	func_t      imp;
@@ -1113,11 +1167,11 @@ rua_obj_msgSend (progs_t *pr)
 	}
 	if (!_cmd)
 		PR_RunError (pr, "null selector");
-	imp = obj_msg_lookup (pr, self, _cmd);
+	imp = obj_msg_lookup (probj, self, _cmd);
 	if (!imp)
 		PR_RunError (pr, "%s does not respond to %s",
-					 PR_GetString (pr, object_get_class_name (pr, self)),
-					 PR_GetString (pr, pr->selector_names[_cmd->sel_id]));
+					 PR_GetString (pr, object_get_class_name (probj, self)),
+					 PR_GetString (pr, probj->selector_names[_cmd->sel_id]));
 
 	PR_CallFunction (pr, imp);
 }
@@ -1125,16 +1179,17 @@ rua_obj_msgSend (progs_t *pr)
 static void
 rua_obj_msgSend_super (progs_t *pr)
 {
+	probj_t    *probj = pr->pr_objective_resources;
 	pr_super_t *super = &P_STRUCT (pr, pr_super_t, 0);
 	pr_sel_t   *_cmd = &P_STRUCT (pr, pr_sel_t, 1);
 	func_t      imp;
 
-	imp = obj_msg_lookup_super (pr, super, _cmd);
+	imp = obj_msg_lookup_super (probj, super, _cmd);
 	if (!imp) {
 		pr_id_t    *self = &G_STRUCT (pr, pr_id_t, super->self);
 		PR_RunError (pr, "%s does not respond to %s",
-					 PR_GetString (pr, object_get_class_name (pr, self)),
-					 PR_GetString (pr, pr->selector_names[_cmd->sel_id]));
+					 PR_GetString (pr, object_get_class_name (probj, self)),
+					 PR_GetString (pr, probj->selector_names[_cmd->sel_id]));
 	}
 	pr->pr_params[0] = pr->pr_real_params[0];
 	P_POINTER (pr, 0) = super->self;
@@ -1144,10 +1199,11 @@ rua_obj_msgSend_super (progs_t *pr)
 static void
 rua_obj_get_class (progs_t *pr)
 {
+	probj_t    *probj = pr->pr_objective_resources;
 	const char *name = P_GSTRING (pr, 0);
 	pr_class_t *class;
 
-	class = Hash_Find (pr->classes, name);
+	class = Hash_Find (probj->classes, name);
 	if (!class)
 		PR_RunError (pr, "could not find class %s", name);
 	RETURN_POINTER (pr, class);
@@ -1156,16 +1212,18 @@ rua_obj_get_class (progs_t *pr)
 static void
 rua_obj_lookup_class (progs_t *pr)
 {
+	probj_t    *probj = pr->pr_objective_resources;
 	const char *name = P_GSTRING (pr, 0);
 	pr_class_t *class;
 
-	class = Hash_Find (pr->classes, name);
+	class = Hash_Find (probj->classes, name);
 	RETURN_POINTER (pr, class);
 }
 
 static void
 rua_obj_next_class (progs_t *pr)
 {
+	//probj_t    *probj = pr->pr_objective_resources;
 	//XXX
 	PR_RunError (pr, "%s, not implemented", __FUNCTION__);
 }
@@ -1175,10 +1233,11 @@ rua_obj_next_class (progs_t *pr)
 static void
 rua_sel_get_name (progs_t *pr)
 {
+	probj_t    *probj = pr->pr_objective_resources;
 	pr_sel_t   *sel = &P_STRUCT (pr, pr_sel_t, 0);
 
-	if (sel->sel_id > 0 && sel->sel_id <= pr->selector_index)
-		R_STRING (pr) = pr->selector_names[sel->sel_id];
+	if (sel->sel_id > 0 && sel->sel_id <= probj->selector_index)
+		R_STRING (pr) = probj->selector_names[sel->sel_id];
 	else
 		R_STRING (pr) = 0;
 }
@@ -1194,25 +1253,28 @@ rua_sel_get_type (progs_t *pr)
 static void
 rua_sel_get_uid (progs_t *pr)
 {
+	probj_t    *probj = pr->pr_objective_resources;
 	const char *name = P_GSTRING (pr, 0);
 
-	RETURN_POINTER (pr, sel_register_typed_name (pr, name, "", 0));
+	RETURN_POINTER (pr, sel_register_typed_name (probj, name, "", 0));
 }
 
 static void
 rua_sel_register_name (progs_t *pr)
 {
+	probj_t    *probj = pr->pr_objective_resources;
 	const char *name = P_GSTRING (pr, 0);
 
-	RETURN_POINTER (pr, sel_register_typed_name (pr, name, "", 0));
+	RETURN_POINTER (pr, sel_register_typed_name (probj, name, "", 0));
 }
 
 static void
 rua_sel_is_mapped (progs_t *pr)
 {
+	probj_t    *probj = pr->pr_objective_resources;
 	// FIXME might correspond to a string
 	pr_sel_t   *sel = &P_STRUCT (pr, pr_sel_t, 0);
-	R_INT (pr) = sel->sel_id > 0 && sel->sel_id <= pr->selector_index;
+	R_INT (pr) = sel->sel_id > 0 && sel->sel_id <= probj->selector_index;
 }
 
 //====================================================================
@@ -1220,20 +1282,22 @@ rua_sel_is_mapped (progs_t *pr)
 static void
 rua_class_get_class_method (progs_t *pr)
 {
+	probj_t    *probj = pr->pr_objective_resources;
 	pr_class_t *class = &P_STRUCT (pr, pr_class_t, 0);
 	pr_sel_t   *aSel = &P_STRUCT (pr, pr_sel_t, 1);
 	pr_method_t *method;
 	class = &G_STRUCT (pr, pr_class_t, class->class_pointer);
-	method = obj_find_message (pr, class, aSel);
+	method = obj_find_message (probj, class, aSel);
 	RETURN_POINTER (pr, method);
 }
 
 static void
 rua_class_get_instance_method (progs_t *pr)
 {
+	probj_t    *probj = pr->pr_objective_resources;
 	pr_class_t *class = &P_STRUCT (pr, pr_class_t, 0);
 	pr_sel_t   *aSel = &P_STRUCT (pr, pr_sel_t, 1);
-	pr_method_t *method = obj_find_message (pr, class, aSel);
+	pr_method_t *method = obj_find_message (probj, class, aSel);
 	RETURN_POINTER (pr, method);
 }
 
@@ -1363,6 +1427,7 @@ rua_class_get_gc_object_type (progs_t *pr)
 static void
 rua_class_ivar_set_gcinvisible (progs_t *pr)
 {
+	//probj_t    *probj = pr->pr_objective_resources;
 	//pr_class_t *impostor = &P_STRUCT (pr, pr_class_t, 0);
 	//const char *ivarname = P_GSTRING (pr, 1);
 	//int         gcInvisible = P_INT (pr, 2);
@@ -1383,10 +1448,11 @@ rua_method_get_imp (progs_t *pr)
 static void
 rua_get_imp (progs_t *pr)
 {
+	probj_t    *probj = pr->pr_objective_resources;
 	pr_class_t *class = &P_STRUCT (pr, pr_class_t, 0);
 	pr_sel_t   *sel = &P_STRUCT (pr, pr_sel_t, 1);
 
-	R_INT (pr) = get_imp (pr, class, sel);
+	R_INT (pr) = get_imp (probj, class, sel);
 }
 
 //====================================================================
@@ -1476,9 +1542,10 @@ rua_object_get_meta_class (progs_t *pr)
 static void
 rua_object_get_class_name (progs_t *pr)
 {
+	probj_t    *probj = pr->pr_objective_resources;
 	pr_id_t    *object = &P_STRUCT (pr, pr_id_t, 0);
 
-	R_STRING (pr) = object_get_class_name (pr, object);
+	R_STRING (pr) = object_get_class_name (probj, object);
 }
 
 static void
@@ -1496,9 +1563,10 @@ rua_object_is_class (progs_t *pr)
 static void
 rua_object_is_instance (progs_t *pr)
 {
+	probj_t    *probj = pr->pr_objective_resources;
 	pr_id_t    *object = &P_STRUCT (pr, pr_id_t, 0);
 
-	R_INT (pr) = object_is_instance (pr, object);
+	R_INT (pr) = object_is_instance (probj, object);
 }
 
 static void
@@ -1524,6 +1592,7 @@ rua__i_Object__hash (progs_t *pr)
 static void
 rua__i_Object_error_error_ (progs_t *pr)
 {
+	probj_t    *probj = pr->pr_objective_resources;
 	pr_id_t    *self = &P_STRUCT (pr, pr_id_t, 0);
 	const char *fmt = P_GSTRING (pr, 2);
 	dstring_t  *dstr = dstring_new ();
@@ -1531,14 +1600,15 @@ rua__i_Object_error_error_ (progs_t *pr)
 	pr_type_t **args = &pr->pr_params[3];
 
 	dsprintf (dstr, "error: %s (%s)\n%s",
-			  PR_GetString (pr, object_get_class_name (pr, self)),
-			  object_is_instance (pr, self) ? "instance" : "class", fmt);
-	obj_verror (pr, self, 0, dstr->str, count, args);
+			  PR_GetString (pr, object_get_class_name (probj, self)),
+			  object_is_instance (probj, self) ? "instance" : "class", fmt);
+	obj_verror (probj, self, 0, dstr->str, count, args);
 }
 
 static void
 rua__c_Object__conformsToProtocol_ (progs_t *pr)
 {
+	//probj_t    *probj = pr->pr_objective_resources;
 	//pr_id_t    *object = &P_STRUCT (pr, pr_id_t, 0);
 	//pr_protocol_t *proto = &P_STRUCT (pr, pr_protocol_t, 2);
 	//...
@@ -1631,20 +1701,21 @@ static builtin_t obj_methods [] = {
 static int
 rua_init_finish (progs_t *pr)
 {
+	probj_t    *probj = pr->pr_objective_resources;
 	pr_class_t **class_list, **class;
 
-	class_list = (pr_class_t **) Hash_GetList (pr->classes);
+	class_list = (pr_class_t **) Hash_GetList (probj->classes);
 	if (*class_list) {
 		pr_class_t *object_class;
 		pointer_t   object_ptr;
 
-		object_class = Hash_Find (pr->classes, "Object");
+		object_class = Hash_Find (probj->classes, "Object");
 		if (object_class && !object_class->super_class)
 			object_ptr = (pr_type_t *)object_class - pr->pr_globals;
 		else
 			PR_Error (pr, "root class Object not found");
 		for (class = class_list; *class; class++)
-			finish_class (pr, *class, object_ptr);
+			finish_class (probj, *class, object_ptr);
 	}
 	free (class_list);
 
@@ -1652,40 +1723,42 @@ rua_init_finish (progs_t *pr)
 }
 
 static int
-rua_init_runtime (progs_t *pr)
+rua_obj_init_runtime (progs_t *pr)
 {
+	probj_t    *probj = pr->pr_objective_resources;
 	pr_def_t   *def;
 	unsigned    i;
 
-	if (!pr->selector_hash)
-		pr->selector_hash = Hash_NewTable (1021, selector_get_key, 0, pr);
+	if (!probj->selector_hash)
+		probj->selector_hash = Hash_NewTable (1021, selector_get_key, 0,
+											  probj);
 	else
-		Hash_FlushTable (pr->selector_hash);
-	pr->selector_index = 0;
-	for (i = 0; i < pr->selector_index_max; i++) {
-		obj_list_free (pr->selector_sels[i]);
-		pr->selector_sels[i] = 0;
-		pr->selector_names[i] = 0;
+		Hash_FlushTable (probj->selector_hash);
+	probj->selector_index = 0;
+	for (i = 0; i < probj->selector_index_max; i++) {
+		obj_list_free (probj->selector_sels[i]);
+		probj->selector_sels[i] = 0;
+		probj->selector_names[i] = 0;
 	}
 
-	if (!pr->classes)
-		pr->classes = Hash_NewTable (1021, class_get_key, 0, pr);
+	if (!probj->classes)
+		probj->classes = Hash_NewTable (1021, class_get_key, 0, probj);
 	else
-		Hash_FlushTable (pr->classes);
+		Hash_FlushTable (probj->classes);
 
-	if (!pr->load_methods) {
-		pr->load_methods = Hash_NewTable (1021, 0, 0, pr);
-		Hash_SetHashCompare (pr->load_methods, load_methods_get_hash,
+	if (!probj->load_methods) {
+		probj->load_methods = Hash_NewTable (1021, 0, 0, probj);
+		Hash_SetHashCompare (probj->load_methods, load_methods_get_hash,
 							 load_methods_compare);
 	} else {
-		Hash_FlushTable (pr->load_methods);
+		Hash_FlushTable (probj->load_methods);
 	}
 
-	pr->unresolved_classes = 0;
-	pr->unclaimed_categories = 0;
-	pr->unclaimed_proto_list = 0;
-	pr->module_list = 0;
-	pr->class_tree_list = 0;
+	probj->unresolved_classes = 0;
+	probj->unclaimed_categories = 0;
+	probj->unclaimed_proto_list = 0;
+	probj->module_list = 0;
+	probj->class_tree_list = 0;
 
 	if ((def = PR_FindField (pr, ".this")))
 		pr->fields.this = def->ofs;
@@ -1694,17 +1767,30 @@ rua_init_runtime (progs_t *pr)
 	return 1;
 }
 
+static void
+rua_obj_cleanup (progs_t *pr, void *data)
+{
+	__auto_type probj = (probj_t *) data;
+	pr->pr_objective_resources = probj;
+}
+
 void
 RUA_Obj_Init (progs_t *pr, int secure)
 {
+	probj_t    *probj = calloc (1, sizeof (*probj));
+	probj->pr = pr;
+
+	PR_Resources_Register (pr, "RUA_ObjectiveQuakeC", probj, rua_obj_cleanup);
+
 	PR_RegisterBuiltins (pr, obj_methods);
 
-	PR_AddLoadFunc (pr, rua_init_runtime);
+	PR_AddLoadFunc (pr, rua_obj_init_runtime);
 }
 
 func_t
 RUA_Obj_msg_lookup (progs_t *pr, pointer_t _self, pointer_t __cmd)
 {
+	probj_t    *probj = pr->pr_objective_resources;
 	pr_id_t    *self = &G_STRUCT (pr, pr_id_t, _self);
 	pr_sel_t   *_cmd = &G_STRUCT (pr, pr_sel_t, __cmd);
 	func_t      imp;
@@ -1713,11 +1799,11 @@ RUA_Obj_msg_lookup (progs_t *pr, pointer_t _self, pointer_t __cmd)
 		return 0;
 	if (!_cmd)
 		PR_RunError (pr, "null selector");
-	imp = obj_msg_lookup (pr, self, _cmd);
+	imp = obj_msg_lookup (probj, self, _cmd);
 	if (!imp)
 		PR_RunError (pr, "%s does not respond to %s",
-					 PR_GetString (pr, object_get_class_name (pr, self)),
-					 PR_GetString (pr, pr->selector_names[_cmd->sel_id]));
+					 PR_GetString (pr, object_get_class_name (probj, self)),
+					 PR_GetString (pr, probj->selector_names[_cmd->sel_id]));
 
 	return imp;
 }

From f185e07ad2ed23e64ae80655e3044c9536670d2a Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 26 Feb 2020 01:01:47 +0900
Subject: [PATCH 0517/1519] Fix some missing dependencies

Generally not a problem with libtool and its automatic dependencies, but
best to be explicit.
---
 config.d/build_control.m4 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/config.d/build_control.m4 b/config.d/build_control.m4
index abc60cd75..13004a6c8 100644
--- a/config.d/build_control.m4
+++ b/config.d/build_control.m4
@@ -372,6 +372,7 @@ QF_DEPS(QFCC,
 QF_DEPS(QFCC_TEST,
 	[],
 	[$(top_builddir)/libs/ruamoko/libQFruamoko.la
+	 $(top_builddir)/libs/gamecode/libQFgamecode.la
 	 $(top_builddir)/libs/util/libQFutil.la],
 	[$(WIN32_LIBS)],
 )
@@ -406,6 +407,7 @@ QF_DEPS(QFVIS,
 QF_DEPS(QWAQ,
 	[],
 	[$(top_builddir)/libs/ruamoko/libQFruamoko.la
+	 $(top_builddir)/libs/gamecode/libQFgamecode.la
 	 $(top_builddir)/libs/util/libQFutil.la],
 	[$(WIN32_LIBS)],
 )
@@ -413,6 +415,7 @@ QF_DEPS(CARNE,
 	[],
 	[$(top_builddir)/libs/gib/libQFgib.la
 	 $(top_builddir)/libs/ruamoko/libQFruamoko.la
+	 $(top_builddir)/libs/gamecode/libQFgamecode.la
 	 $(top_builddir)/libs/util/libQFutil.la],
 	[$(WIN32_LIBS)],
 )

From 35c9d6ee38ae3aa00097627c5ef86be520935962 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 26 Feb 2020 01:20:28 +0900
Subject: [PATCH 0518/1519] Make pr_obcode.c mostly thread safe

Its public data is all read-only, and once set up, its private data is
too (just don't call init in multiple threads).
---
 include/QF/pr_comp.h        |  6 +++---
 libs/gamecode/pr_opcode.c   | 12 ++++++------
 tools/qfcc/source/opcodes.c |  3 ++-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/include/QF/pr_comp.h b/include/QF/pr_comp.h
index 60022098f..03f5b3a46 100644
--- a/include/QF/pr_comp.h
+++ b/include/QF/pr_comp.h
@@ -50,8 +50,8 @@ typedef enum {
 	ev_type_count		// not a type, gives number of types
 } etype_t;
 
-extern pr_ushort_t pr_type_size[ev_type_count];
-extern const char *pr_type_name[ev_type_count];
+extern const pr_ushort_t pr_type_size[ev_type_count];
+extern const char * const pr_type_name[ev_type_count];
 
 #define	OFS_NULL		0
 #define	OFS_RETURN		1
@@ -407,7 +407,7 @@ typedef struct opcode_s {
 	const char	*fmt;
 } opcode_t;
 
-extern opcode_t pr_opcodes[];
+extern const opcode_t pr_opcodes[];
 opcode_t *PR_Opcode (pr_short_t opcode);
 void PR_Opcode_Init (void);	// idempotent
 
diff --git a/libs/gamecode/pr_opcode.c b/libs/gamecode/pr_opcode.c
index ab266c84c..853176925 100644
--- a/libs/gamecode/pr_opcode.c
+++ b/libs/gamecode/pr_opcode.c
@@ -46,9 +46,9 @@
 
 #include "compat.h"
 
-hashtab_t *opcode_table;
+static hashtab_t *opcode_table;
 
-VISIBLE pr_ushort_t pr_type_size[ev_type_count] = {
+VISIBLE const pr_ushort_t pr_type_size[ev_type_count] = {
 	1,			// ev_void
 	1,			// ev_string
 	1,			// ev_float
@@ -65,7 +65,7 @@ VISIBLE pr_ushort_t pr_type_size[ev_type_count] = {
 	0,			// ev_invalid      not a valid/simple type
 };
 
-VISIBLE const char *pr_type_name[ev_type_count] = {
+VISIBLE const char * const pr_type_name[ev_type_count] = {
 	"void",
 	"string",
 	"float",
@@ -98,7 +98,7 @@ VISIBLE const char *pr_type_name[ev_type_count] = {
 // c  operand c
 // x  place holder for P (padding)
 // 0-7 parameter index (for P)
-VISIBLE opcode_t pr_opcodes[] = {
+VISIBLE const opcode_t pr_opcodes[] = {
 	{"<DONE>", "done", OP_DONE, false,	// OP_DONE is actually the same as
 	 ev_entity, ev_field, ev_void,		// OP_RETURN, the types are bogus
 	 PROG_ID_VERSION,
@@ -1492,7 +1492,7 @@ PR_Opcode (pr_short_t opcode)
 VISIBLE void
 PR_Opcode_Init (void)
 {
-	opcode_t   *op;
+	const opcode_t *op;
 
 	if (opcode_table) {
 		// already initialized
@@ -1502,7 +1502,7 @@ PR_Opcode_Init (void)
 	Hash_SetHashCompare (opcode_table, opcode_get_hash, opcode_compare);
 
 	for (op = pr_opcodes; op->name; op++) {
-		Hash_AddElement (opcode_table, op);
+		Hash_AddElement (opcode_table, (void *) op);
 	}
 }
 
diff --git a/tools/qfcc/source/opcodes.c b/tools/qfcc/source/opcodes.c
index bf8b5b189..bbf10250a 100644
--- a/tools/qfcc/source/opcodes.c
+++ b/tools/qfcc/source/opcodes.c
@@ -131,7 +131,8 @@ opcode_free (void *_op, void *unused)
 void
 opcode_init (void)
 {
-	opcode_t   *op, *mop;
+	const opcode_t *op;
+	opcode_t   *mop;
 
 	if (opcode_type_table) {
 		Hash_FlushTable (opcode_void_table);

From 4c1b6ce76ce62c287f3dde86b721c8e23ad2f587 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 26 Feb 2020 01:55:56 +0900
Subject: [PATCH 0519/1519] Make pr_parse thread safe

Or at least, conversion to property list is thread safe.
---
 libs/gamecode/pr_parse.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/libs/gamecode/pr_parse.c b/libs/gamecode/pr_parse.c
index f17b69bf1..c63bb71b5 100644
--- a/libs/gamecode/pr_parse.c
+++ b/libs/gamecode/pr_parse.c
@@ -68,15 +68,11 @@
 	Easier to parse than PR_ValueString
 */
 static const char *
-PR_UglyValueString (progs_t *pr, etype_t type, pr_type_t *val)
+PR_UglyValueString (progs_t *pr, etype_t type, pr_type_t *val, dstring_t *line)
 {
-	static dstring_t *line = 0;
 	pr_def_t    *def;
 	dfunction_t	*f;
 
-	if (!line)
-		line = dstring_new ();
-
 	type &= ~DEF_SAVEGLOBAL;
 
 	switch (type) {
@@ -121,6 +117,7 @@ PR_UglyValueString (progs_t *pr, etype_t type, pr_type_t *val)
 VISIBLE plitem_t *
 ED_EntityDict (progs_t *pr, edict_t *ed)
 {
+	dstring_t  *dstr = dstring_newstr ();
 	plitem_t   *entity = PL_NewDictionary ();
 	pr_uint_t   i;
 	int         j;
@@ -149,10 +146,11 @@ ED_EntityDict (progs_t *pr, edict_t *ed)
 			if (j == pr_type_size[type])
 				continue;
 
-			value = PR_UglyValueString (pr, type, v);
+			value = PR_UglyValueString (pr, type, v, dstr);
 			PL_D_AddObject (entity, name, PL_NewString (value));
 		}
 	}
+	dstring_delete (dstr);
 	return entity;
 }
 
@@ -165,6 +163,7 @@ ED_EntityDict (progs_t *pr, edict_t *ed)
 VISIBLE plitem_t *
 ED_GlobalsDict (progs_t *pr)
 {
+	dstring_t  *dstr = dstring_newstr ();
 	plitem_t   *globals = PL_NewDictionary ();
 	pr_uint_t   i;
 	const char *name;
@@ -183,9 +182,10 @@ ED_GlobalsDict (progs_t *pr)
 			continue;
 
 		name = PR_GetString (pr, def->name);
-		value = PR_UglyValueString (pr, type, &pr->pr_globals[def->ofs]);
+		value = PR_UglyValueString (pr, type, &pr->pr_globals[def->ofs], dstr);
 		PL_D_AddObject (globals, name, PL_NewString (value));
 	}
+	dstring_delete (dstr);
 	return globals;
 }
 

From 42713cad8b13b589c4b218b3d0ccbd06ae139777 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 26 Feb 2020 09:39:03 +0900
Subject: [PATCH 0520/1519] Make script much friendlier to use

It now simply sets an error message pointer and returns false if there's
an error.
---
 include/QF/script.h       |  6 ++++--
 libs/gamecode/pr_debug.c  | 10 +++------
 libs/ruamoko/rua_script.c | 13 ++---------
 libs/util/script.c        | 45 +++++++++++++++++----------------------
 4 files changed, 28 insertions(+), 46 deletions(-)

diff --git a/include/QF/script.h b/include/QF/script.h
index 357e5100b..34e6f269a 100644
--- a/include/QF/script.h
+++ b/include/QF/script.h
@@ -41,8 +41,9 @@ typedef struct script_s {
 	/// line number of the file being processed. used only for error reporting
 	/// but updated internally.
 	int         line;
-	/// if set, will be called instead of the internal error handler
-	void      (*error)(struct script_s *script, const char *msg);
+	/// contains last error message or null if no error
+	/// if set, no tokens will be parsed.
+	const char *error;
 	/// if set, multi line quoted tokens will be treated as errors
 	int         no_quote_lines;
 	/// if set, characters in this string will always be lexed as single
@@ -65,6 +66,7 @@ void Script_Delete (script_t *script);
 /** Prepare a script_t object for parsing.
 	The caller is responsible for freeing the memory associated with file and
 	data when parsing is complete.
+	Resets \a script->error
 	\param script The script_t object being parsed
 	\param file Name of the file being parsed. used only for error reporting
 	\param data The script to be parsed
diff --git a/libs/gamecode/pr_debug.c b/libs/gamecode/pr_debug.c
index 9fd61b020..f7f3f3b7c 100644
--- a/libs/gamecode/pr_debug.c
+++ b/libs/gamecode/pr_debug.c
@@ -197,12 +197,6 @@ source_path_f (cvar_t *var)
 	source_paths[i] = 0;
 }
 
-static void
-pr_debug_expression_error (script_t *script, const char *msg)
-{
-	Sys_Printf ("%s\n", msg);
-}
-
 #define RUP(x,a) (((x) + ((a) - 1)) & ~((a) - 1))
 static pr_short_t __attribute__((pure))
 pr_debug_type_size (const progs_t *pr, const qfot_type_t *type)
@@ -266,7 +260,6 @@ parse_expression (progs_t *pr, const char *expr, int conditional)
 	d.type = ev_invalid;
 	d.name = 0;
 	es = Script_New ();
-	es->error = pr_debug_expression_error;
 	Script_Start (es, "<console>", expr);
 	expr_ptr = 0;
 	es->single = "{}()':[].";
@@ -323,6 +316,9 @@ parse_expression (progs_t *pr, const char *expr, int conditional)
 			Sys_Printf ("ignoring tail\n");
 	}
 error:
+	if (es->error) {
+		Sys_Printf (es->error);
+	}
 	Script_Delete (es);
 	return d;
 }
diff --git a/libs/ruamoko/rua_script.c b/libs/ruamoko/rua_script.c
index c6fae5750..ff5b2ab0a 100644
--- a/libs/ruamoko/rua_script.c
+++ b/libs/ruamoko/rua_script.c
@@ -48,7 +48,6 @@ typedef struct {
 	script_t    script;
 	string_t    dstr;
 	progs_t    *pr;
-	string_t    err_msg;
 } rua_script_t;
 
 typedef struct {
@@ -92,13 +91,6 @@ bi_script_clear (progs_t *pr, void *data)
 	script_reset (res);
 }
 
-static void
-bi_script_error (script_t *_script, const char *msg)
-{
-	rua_script_t *script = (rua_script_t *)_script;
-	script->err_msg = PR_SetString (script->pr, msg);
-}
-
 static void
 bi_Script_New (progs_t *pr)
 {
@@ -110,7 +102,6 @@ bi_Script_New (progs_t *pr)
 
 	script->dstr = PR_NewMutableString (pr);
 	script->script.token = PR_GetMutableString (pr, script->dstr);
-	script->script.error = bi_script_error;
 	script->pr = pr;
 	R_INT (pr) = script_index (res, script);
 }
@@ -180,8 +171,8 @@ bi_Script_Error (progs_t *pr)
 
 	if (!script)
 		PR_RunError (pr, "invalid script handle");
-	R_STRING (pr) = script->err_msg;
-	script->err_msg = 0;
+	R_STRING (pr) = PR_SetString (pr, script->script.error);
+	script->script.error = 0;
 }
 
 static void
diff --git a/libs/util/script.c b/libs/util/script.c
index eeb1df977..fa8b51ae0 100644
--- a/libs/util/script.c
+++ b/libs/util/script.c
@@ -34,19 +34,6 @@
 #include "QF/dstring.h"
 #include "QF/script.h"
 
-static void __attribute__ ((format (printf, 2, 3), noreturn))
-script_error (script_t *script, const char *fmt, ...)
-{
-	va_list     args;
-
-	va_start (args, fmt);
-	fprintf (stderr, "%s:%d: ", script->file, script->line);
-	vfprintf (stderr, fmt, args);
-	fprintf (stderr, "\n");
-	va_end (args);
-	exit (1);
-}
-
 VISIBLE script_t *
 Script_New (void)
 {
@@ -69,11 +56,16 @@ Script_Start (script_t *script, const char *file, const char *data)
 	script->file = file;
 	script->p = data;
 	script->unget = false;
+	script->error = 0;
 }
 
 VISIBLE qboolean
 Script_TokenAvailable (script_t *script, qboolean crossline)
 {
+	if (script->error) {
+		return false;
+	}
+
 	if (script->unget)
 		return true;
   skipspace:
@@ -111,6 +103,10 @@ Script_GetToken (script_t *script, qboolean crossline)
 {
 	const char *token_p;
 
+	if (script->error) {
+		return false;
+	}
+
 	if (script->unget) {				// is a token allready waiting?
 		script->unget = false;
 		return true;
@@ -118,10 +114,7 @@ Script_GetToken (script_t *script, qboolean crossline)
 
 	if (!Script_TokenAvailable (script, crossline)) {
 		if (!crossline) {
-			if (script->error)
-				script->error (script, "line is incomplete");
-			else
-				script_error (script, "line is incomplete");
+			script->error = "line is incomplete";
 		}
 		return false;
 	}
@@ -134,18 +127,13 @@ Script_GetToken (script_t *script, qboolean crossline)
 		while (*script->p != '"') {
 			if (!*script->p) {
 				script->line = start_line;
-				if (script->error)
-					script->error (script, "EOF inside quoted token");
-				else
-					script_error (script, "EOF inside quoted token");
+				script->error = "EOF inside quoted token";
 				return false;
 			}
 			if (*script->p == '\n') {
 				if (script->no_quote_lines) {
-					if (script->error)
-						script->error (script, "EOL inside quoted token");
-					else
-						script_error (script, "EOL inside quoted token");
+					script->error = "EOL inside quoted token";
+					return false;
 				}
 				script->line++;
 			}
@@ -175,11 +163,16 @@ Script_GetToken (script_t *script, qboolean crossline)
 VISIBLE void
 Script_UngetToken (script_t *script)
 {
-	script->unget = true;
+	if (!script->error) {
+		script->unget = true;
+	}
 }
 
 VISIBLE const char *
 Script_Token (script_t *script)
 {
+	if (script->error) {
+		return 0;
+	}
 	return script->token->str;
 }

From d60291a73e16308125df3ede2dc3428283bd7cca Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 26 Feb 2020 09:46:59 +0900
Subject: [PATCH 0521/1519] Clean up a lot of va usage

va is not thread-safe (it's not save even without threads), and I want
to be able to run progs in threads.
---
 libs/gamecode/pr_edict.c   | 12 ------------
 libs/gamecode/pr_load.c    |  5 -----
 libs/gamecode/pr_parse.c   | 19 +++++++------------
 libs/gamecode/pr_resolve.c | 16 +++++-----------
 libs/ruamoko/rua_qfile.c   |  4 +---
 5 files changed, 13 insertions(+), 43 deletions(-)

diff --git a/libs/gamecode/pr_edict.c b/libs/gamecode/pr_edict.c
index 29559f8f1..e3bfc778b 100644
--- a/libs/gamecode/pr_edict.c
+++ b/libs/gamecode/pr_edict.c
@@ -34,22 +34,10 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif
-#include <stdarg.h>
-#include <stdio.h>
 
-#include "QF/cbuf.h"
-#include "QF/crc.h"
 #include "QF/cvar.h"
-#include "QF/dstring.h"
-#include "QF/hash.h"
-#include "QF/idparse.h"
 #include "QF/progs.h"
-#include "QF/qdefs.h"
-#include "QF/qendian.h"
-#include "QF/quakefs.h"
 #include "QF/sys.h"
-#include "QF/zone.h"
-#include "QF/va.h"
 
 #include "compat.h"
 
diff --git a/libs/gamecode/pr_load.c b/libs/gamecode/pr_load.c
index c8157efa8..df72cbbc9 100644
--- a/libs/gamecode/pr_load.c
+++ b/libs/gamecode/pr_load.c
@@ -34,22 +34,17 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif
-#include <stdarg.h>
-#include <stdio.h>
 
-#include "QF/cmd.h"
 #include "QF/crc.h"
 #include "QF/cvar.h"
 #include "QF/dstring.h"
 #include "QF/hash.h"
 #include "QF/mathlib.h"
 #include "QF/progs.h"
-#include "QF/qdefs.h"
 #include "QF/qendian.h"
 #include "QF/quakefs.h"
 #include "QF/sys.h"
 #include "QF/zone.h"
-#include "QF/va.h"
 
 #include "compat.h"
 
diff --git a/libs/gamecode/pr_parse.c b/libs/gamecode/pr_parse.c
index c63bb71b5..2652694e8 100644
--- a/libs/gamecode/pr_parse.c
+++ b/libs/gamecode/pr_parse.c
@@ -43,21 +43,12 @@
 #include <malloc.h>
 #endif
 
-#include "QF/cbuf.h"
-#include "QF/crc.h"
-#include "QF/cvar.h"
 #include "QF/dstring.h"
-#include "QF/hash.h"
 #include "QF/mathlib.h"
 #include "QF/progs.h"
-#include "QF/qdefs.h"
 #include "QF/qfplist.h"
-#include "QF/qendian.h"
-#include "QF/quakefs.h"
 #include "QF/script.h"
 #include "QF/sys.h"
-#include "QF/zone.h"
-#include "QF/va.h"
 
 #include "compat.h"
 
@@ -301,6 +292,7 @@ ED_ParseEpair (progs_t *pr, pr_type_t *base, pr_def_t *key, const char *s)
 VISIBLE plitem_t *
 ED_ConvertToPlist (script_t *script, int nohack)
 {
+	dstring_t  *dstr = dstring_newstr ();
 	plitem_t   *plist = PL_NewArray ();
 	plitem_t   *ent;
 	plitem_t   *key;
@@ -341,15 +333,18 @@ ED_ConvertToPlist (script_t *script, int nohack)
 			token = script->token->str;
 			if (strequal (token, "}"))
 				Sys_Error ("ED_ConvertToPlist: closing brace without data");
-			if (anglehack)
-				value = PL_NewString (va ("0 %s 0", token));
-			else
+			if (anglehack) {
+				dsprintf (dstr, "0 %s 0", token);
+				value = PL_NewString (dstr->str);
+			} else {
 				value = PL_NewString (token);
+			}
 			PL_D_AddObject (ent, PL_String (key), value);
 			PL_Free (key);
 		}
 		PL_A_AddObject (plist, ent);
 	}
+	dstring_delete (dstr);
 	return plist;
 }
 
diff --git a/libs/gamecode/pr_resolve.c b/libs/gamecode/pr_resolve.c
index 0f7acaa8f..5297f101a 100644
--- a/libs/gamecode/pr_resolve.c
+++ b/libs/gamecode/pr_resolve.c
@@ -34,23 +34,14 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif
-#include <stdarg.h>
-#include <stdio.h>
 
-#include "QF/cmd.h"
-#include "QF/crc.h"
-#include "QF/cvar.h"
 #include "QF/hash.h"
 #include "QF/progs.h"
-#include "QF/qdefs.h"
-#include "QF/qendian.h"
-#include "QF/quakefs.h"
 #include "QF/sys.h"
-#include "QF/zone.h"
-#include "QF/va.h"
 
 #include "compat.h"
 
+static const char param_str[] = ".param_0";
 
 pr_def_t *
 PR_GlobalAtOfs (progs_t * pr, pointer_t ofs)
@@ -124,11 +115,14 @@ PR_ResolveGlobals (progs_t *pr)
 		pr->pr_param_size = OFS_PARM1 - OFS_PARM0;
 		pr->pr_param_alignment = 0;	// log2
 	} else {
+		char       *param_n = alloca (sizeof (param_str));
+		strcpy (param_n, param_str);
 		if (!(def = PR_FindGlobal (pr, sym = ".return")))
 			goto error;
 		pr->pr_return = &pr->pr_globals[def->ofs];
 		for (i = 0; i < MAX_PARMS; i++) {
-			if (!(def = PR_FindGlobal (pr, sym = va(".param_%d", i))))
+			param_n[sizeof (param_str) - 2] = i + '0';
+			if (!(def = PR_FindGlobal (pr, sym = param_n)))
 				goto error;
 			pr->pr_params[i] = &pr->pr_globals[def->ofs];
 		}
diff --git a/libs/ruamoko/rua_qfile.c b/libs/ruamoko/rua_qfile.c
index 057ff0ef6..d96c433a2 100644
--- a/libs/ruamoko/rua_qfile.c
+++ b/libs/ruamoko/rua_qfile.c
@@ -38,9 +38,7 @@
 
 #include "QF/dstring.h"
 #include "QF/progs.h"
-#include "QF/quakefs.h"
-#include "QF/va.h"
-#include "QF/zone.h"
+#include "QF/quakeio.h"
 
 #include "rua_internal.h"
 

From aa02069dd1c2fd2d4b85e3ee06738cefcc4999e1 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 26 Feb 2020 13:40:26 +0900
Subject: [PATCH 0522/1519] Add a breakpoint flag to opcodes

The progs execution code will call a breakpoint handler just before
executing an instruction with the flag set. This means there's no need
for the breakpoint handler to mess with execution state or even the
instruction in order to continue past the breakpoint.

The flag being set in a progs file is invalid.
---
 include/QF/pr_comp.h    |  1 +
 include/QF/progs.h      |  1 +
 libs/gamecode/pr_exec.c | 11 ++++++++++-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/include/QF/pr_comp.h b/include/QF/pr_comp.h
index 03f5b3a46..6458d3913 100644
--- a/include/QF/pr_comp.h
+++ b/include/QF/pr_comp.h
@@ -396,6 +396,7 @@ typedef enum {
 	OP_MOD_F,
 	OP_MOD_D,
 } pr_opcode_e;
+#define OP_BREAK 0x8000
 
 typedef struct opcode_s {
 	const char	*name;
diff --git a/include/QF/progs.h b/include/QF/progs.h
index 369360449..5abd0d1c6 100644
--- a/include/QF/progs.h
+++ b/include/QF/progs.h
@@ -1776,6 +1776,7 @@ struct progs_s {
 	/// \name debugging
 	///@{
 	struct prdeb_resources_s *pr_debug_resources;
+	void      (*breakpoint_handler) (progs_t *pr);
 	pr_type_t  *watch;
 	int         wp_conditional;
 	pr_type_t   wp_val;
diff --git a/libs/gamecode/pr_exec.c b/libs/gamecode/pr_exec.c
index 024594d81..b933572e4 100644
--- a/libs/gamecode/pr_exec.c
+++ b/libs/gamecode/pr_exec.c
@@ -440,7 +440,16 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 		if (pr->pr_trace)
 			PR_PrintStatement (pr, st, 1);
 
-		switch (st->op) {
+		if (st->op & OP_BREAK) {
+			if (pr->breakpoint_handler) {
+				pr->breakpoint_handler (pr);
+			} else {
+				PR_RunError (pr, "breakpoint hit");
+			}
+		}
+
+		pr_opcode_e op = st->op & ~OP_BREAK;
+		switch (op) {
 			case OP_ADD_D:
 				OPC_double_var = OPA_double_var + OPB_double_var;
 				break;

From 225a375ab96225a4ebc2bf855132241028f616f4 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 26 Feb 2020 13:43:03 +0900
Subject: [PATCH 0523/1519] Extend the lifetime of return-strings

This is done by putting the most recently used return-string at the end
of the queue for recycling.
---
 libs/gamecode/pr_strings.c | 82 +++++++++++++++++++++++++++++---------
 1 file changed, 64 insertions(+), 18 deletions(-)

diff --git a/libs/gamecode/pr_strings.c b/libs/gamecode/pr_strings.c
index a8c8c4fee..cb74797a5 100644
--- a/libs/gamecode/pr_strings.c
+++ b/libs/gamecode/pr_strings.c
@@ -44,14 +44,20 @@
 #include "QF/progs.h"
 #include "QF/va.h"
 
+typedef struct strref_slot_s {
+	struct strref_slot_s *next;
+	struct strref_slot_s **prev;
+	strref_t   *strref;
+} strref_slot_t;
+
 typedef struct prstr_resources_s {
 	progs_t    *pr;
 	dstring_mem_t ds_mem;
 	strref_t   *free_string_refs;
 	strref_t   *static_strings;
 	strref_t  **string_map;
-	strref_t   *return_strings[PR_RS_SLOTS];
-	int         rs_slot;
+	strref_slot_t return_strings[PR_RS_SLOTS];
+	strref_slot_t *rs_slot;
 	unsigned    dyn_str_size;
 	struct hashtab_s *strref_hash;
 	int         num_strings;
@@ -68,7 +74,7 @@ typedef enum {
 
 struct strref_s {
 	strref_t   *next;
-	strref_t  **prev;
+	strref_slot_t *rs_slot;
 	str_e       type;
 	union {
 		char       *string;
@@ -146,6 +152,7 @@ new_string_ref (prstr_resources_t *res)
 	sr = res->free_string_refs;
 	res->free_string_refs = sr->next;
 	sr->next = 0;
+	sr->rs_slot = 0;
 	return sr;
 }
 
@@ -153,8 +160,6 @@ static void
 free_string_ref (prstr_resources_t *res, strref_t *sr)
 {
 	sr->type = str_free;
-	if (sr->prev)
-		*sr->prev = sr->next;
 	sr->next = res->free_string_refs;
 	res->free_string_refs = sr;
 }
@@ -208,11 +213,18 @@ pr_strings_clear (progs_t *pr, void *data)
 	int         i;
 
 	for (i = 0; i < PR_RS_SLOTS; i++) {
-		if (res->return_strings[i])
-			free_string_ref (res, res->return_strings[i]);
-		res->return_strings[i] = 0;
+		if (res->return_strings[i].strref)
+			free_string_ref (res, res->return_strings[i].strref);
+		res->return_strings[i].strref = 0;
+	}
+	if (!res->rs_slot) {
+		strref_slot_t * const rs = res->return_strings;
+		for (i = 0; i < PR_RS_SLOTS; i++) {
+			rs[i].next = &rs[(i + 1) % PR_RS_SLOTS];
+			rs[i].prev = &rs[(i - 1 + PR_RS_SLOTS) % PR_RS_SLOTS].next;
+		}
+		res->rs_slot = rs;
 	}
-	res->rs_slot = 0;
 
 	pr->pr_string_resources = res;
 	pr->pr_xtstr = 0;
@@ -265,6 +277,28 @@ PR_LoadStrings (progs_t *pr)
 	return 1;
 }
 
+static void
+requeue_strref (prstr_resources_t *res, strref_t *sr)
+{
+	strref_slot_t *rs_slot = sr->rs_slot;
+	if (rs_slot->next != res->rs_slot) {
+		// this is the oldest slot, so advance res->rs_slot to the
+		// next oldest slot so this slot does not get reused just yet
+		if (res->rs_slot == rs_slot) {
+			res->rs_slot = rs_slot->next;
+		}
+		// unlink this slot from the chain
+		rs_slot->next->prev = rs_slot->prev;
+		*rs_slot->prev = rs_slot->next;
+		// link this slot just before the oldest slot: all the slots
+		// form a doubly linked circular list
+		rs_slot->prev = res->rs_slot->prev;
+		rs_slot->next = res->rs_slot;
+		*res->rs_slot->prev = rs_slot;
+		res->rs_slot->prev = &rs_slot->next;
+	}
+}
+
 static inline strref_t *
 get_strref (prstr_resources_t *res, string_t num)
 {
@@ -287,15 +321,17 @@ get_strref (prstr_resources_t *res, string_t num)
 static inline __attribute__((pure)) const char *
 get_string (progs_t *pr, string_t num)
 {
+	__auto_type res = pr->pr_string_resources;
 	if (num < 0) {
-		strref_t   *ref = get_strref (pr->pr_string_resources, num);
+		strref_t   *ref = get_strref (res, num);
 		if (!ref)
 			return 0;
 		switch (ref->type) {
+			case str_return:
+				requeue_strref (res, ref);
 			case str_static:
 			case str_temp:
 			case str_dynamic:
-			case str_return:
 				return ref->s.string;
 			case str_mutable:
 				return ref->s.dstring->str;
@@ -313,7 +349,7 @@ get_string (progs_t *pr, string_t num)
 VISIBLE qboolean
 PR_StringValid (progs_t *pr, string_t num)
 {
-	return get_string (pr, num) != 0;
+	return get_strref (pr->pr_string_resources, num) != 0;
 }
 
 VISIBLE const char *
@@ -387,21 +423,32 @@ PR_SetReturnString (progs_t *pr, const char *s)
 	if (!s)
 		s = "";
 	if ((sr = Hash_Find (res->strref_hash, s))) {
+		if (sr->type == str_return && sr->rs_slot) {
+			requeue_strref (res, sr);
+		} else if ((sr->type == str_return && !sr->rs_slot)
+				   || (sr->type != str_return && sr->rs_slot)) {
+			PR_Error (pr, "internal string error");
+		}
 		return string_index (res, sr);
 	}
 
-	if ((sr = res->return_strings[res->rs_slot])) {
-		if (sr->type != str_return)
+	// grab the string ref from the oldest slot, or make a new one if the
+	// slot is empty
+	if ((sr = res->rs_slot->strref)) {
+		if (sr->type != str_return || sr->rs_slot != res->rs_slot) {
 			PR_Error (pr, "internal string error");
+		}
 		pr_strfree (pr, sr->s.string);
 	} else {
 		sr = new_string_ref (res);
 	}
 	sr->type = str_return;
+	sr->rs_slot = res->rs_slot;
 	sr->s.string = pr_strdup(pr, s);
 
-	res->return_strings[res->rs_slot++] = sr;
-	res->rs_slot %= PR_RS_SLOTS;
+	// the oldest slot just became the newest, so advance to the next oldest
+	res->rs_slot = res->rs_slot->next;
+
 	return string_index (res, sr);
 }
 
@@ -525,8 +572,7 @@ PR_FreeString (progs_t *pr, string_t str)
 		free_string_ref (res, sr);
 		return;
 	}
-	if (!get_string (pr, str))
-		PR_RunError (pr, "attempt to free invalid string %d", str);
+	PR_RunError (pr, "attempt to free invalid string %d", str);
 }
 
 void

From 383a7fe5e1ab15edf388657f618e4dee4cb14c06 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 26 Feb 2020 13:45:14 +0900
Subject: [PATCH 0524/1519] Remove File_Open

Other than its blocking of access to certain files, it really wasn't
that useful compared to the functions in qfs, and pointless with access
to qfs anyway.
---
 include/rua_internal.h        |   2 -
 libs/ruamoko/Makefile.am      |   2 +-
 libs/ruamoko/rua_file.c       | 184 ----------------------------------
 libs/ruamoko/rua_init.c       |   1 -
 libs/ruamoko/rua_qfs.c        |   7 ++
 ruamoko/cl_menu/client_menu.r |  14 +--
 ruamoko/include/Makefile.am   |   2 +-
 ruamoko/include/file.h        |   8 --
 ruamoko/include/qfs.h         |   1 +
 ruamoko/lib/Makefile.am       |   2 +-
 ruamoko/lib/file.r            |   3 -
 ruamoko/lib/qfs.r             |   1 +
 12 files changed, 19 insertions(+), 208 deletions(-)
 delete mode 100644 libs/ruamoko/rua_file.c
 delete mode 100644 ruamoko/include/file.h
 delete mode 100644 ruamoko/lib/file.r

diff --git a/include/rua_internal.h b/include/rua_internal.h
index 0b6b34801..158d6e477 100644
--- a/include/rua_internal.h
+++ b/include/rua_internal.h
@@ -39,8 +39,6 @@ void RUA_Cmd_Init (struct progs_s *pr, int secure);
 
 void RUA_Cvar_Init (struct progs_s *pr, int secure);
 
-void RUA_File_Init (struct progs_s *pr, int secure);
-
 void RUA_Hash_Init (struct progs_s *pr, int secure);
 
 void RUA_Math_Init (struct progs_s *pr, int secure);
diff --git a/libs/ruamoko/Makefile.am b/libs/ruamoko/Makefile.am
index 64c65e972..15d4c4360 100644
--- a/libs/ruamoko/Makefile.am
+++ b/libs/ruamoko/Makefile.am
@@ -16,6 +16,6 @@ libQFruamoko_la_LIBADD=			$(rua_libs)
 libQFruamoko_la_DEPENDENCIES=	$(rua_libs)
 libQFruamoko_la_SOURCES= \
 		pr_cmds.c \
-		rua_cbuf.c rua_cmd.c rua_cvar.c rua_file.c rua_hash.c rua_init.c \
+		rua_cbuf.c rua_cmd.c rua_cvar.c rua_hash.c rua_init.c \
 		rua_math.c rua_msgbuf.c rua_obj.c rua_plist.c rua_qfile.c rua_qfs.c \
 		rua_script.c rua_set.c rua_string.c
diff --git a/libs/ruamoko/rua_file.c b/libs/ruamoko/rua_file.c
deleted file mode 100644
index 61def0a3f..000000000
--- a/libs/ruamoko/rua_file.c
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
-	bi_file.c
-
-	CSQC file builtins
-
-	Copyright (C) 1996-1997  Id Software, Inc.
-
-	This program is free software; you can redistribute it and/or
-	modify it under the terms of the GNU General Public License
-	as published by the Free Software Foundation; either version 2
-	of the License, or (at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-	See the GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to:
-
-		Free Software Foundation, Inc.
-		59 Temple Place - Suite 330
-		Boston, MA  02111-1307, USA
-
-*/
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <stdlib.h>
-#ifdef HAVE_STRING_H
-# include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-
-#ifdef HAVE_FNMATCH_H
-# define model_t sunmodel_t
-# include <fnmatch.h>
-# undef model_t
-#else
-# ifdef _WIN32
-# include "fnmatch.h"
-# endif
-#endif
-
-#ifndef HAVE_FNMATCH_PROTO
-int         fnmatch (const char *__pattern, const char *__string, int __flags);
-#endif
-
-#include "QF/cvar.h"
-#include "QF/progs.h"
-#include "QF/quakefs.h"
-#include "QF/va.h"
-#include "QF/zone.h"
-
-#include "rua_internal.h"
-
-static const char *file_ban_list[] = {
-	"default.cfg{,.gz}",
-	"demo1.dem{,.gz}",
-	"demo2.dem{,.gz}",
-	"demo3.dem{,.gz}",
-	"end1.bin{,.gz}",
-	"end2.bin{,.gz}",
-	"gfx.wad{,.gz}",
-	"progs.dat{,.gz}",
-	"quake.rc{,.gz}",
-	0,
-};
-
-static const char *dir_ban_list[] = {
-	"gfx",
-	"maps",
-	"progs",
-	"skins",
-	"sound",
-	0,
-};
-
-static int
-file_readable (char *path)
-{
-	char        t;
-	char       *p = strchr (path, '/');
-	const char **match;
-
-	if (p) {
-		t = *p;
-		*p = 0;
-		for (match = dir_ban_list; *match; match++) {
-			if (fnmatch (*match, path, FNM_PATHNAME) == 0) {
-				*p = t;
-				return 0;
-			}
-		}
-	} else {
-		for (match = file_ban_list; *match; match++) {
-			if (fnmatch (*match, path, FNM_PATHNAME) == 0) {
-				return 0;
-			}
-		}
-	}
-	return 1;
-}
-
-static int
-file_writeable (char *path)
-{
-	return file_readable (path);
-}
-
-static void
-bi_File_Open (progs_t *pr)
-{
-	QFile      *file;
-	const char *pth = P_GSTRING (pr, 0);
-	const char *mode = P_GSTRING (pr, 1);
-	char       *path;
-	char       *p;
-	int         do_write = 0;
-	int         do_read = 0;
-
-	p = strchr (mode, 'r');
-	if (p) {
-		do_read |= 1;
-		if (p[1] == '+')
-			do_write |= 1;
-	}
-
-	p = strchr (mode, 'w');
-	if (p) {
-		do_write |= 1;
-		if (p[1] == '+')
-			do_read |= 1;
-	}
-
-	p = strchr (mode, 'a');
-	if (p) {
-		do_write |= 1;
-		if (p[1] == '+')
-			do_read |= 1;
-	}
-
-	path = QFS_CompressPath (pth);
-	//printf ("'%s'  '%s'\n", P_GSTRING (pr, 0), path);
-	if (!path[0])
-		goto error;
-	if (path[0] == '.' && path[1] == '.' && (path[2] == '/' || path [2] == 0))
-		goto error;
-	if (path[strlen (path) - 1] =='/')
-		goto error;
-	if (!do_read && !do_write)
-		goto error;
-	if (do_read && !file_readable (path))
-		goto error;
-	if (do_write && !file_writeable (path))
-		goto error;
-
-	file = QFS_Open (va ("%s/%s", qfs_gamedir->dir.def, path), mode);
-	if (!file)
-		goto error;
-	free (path);
-	if ((R_INT (pr) = QFile_AllocHandle (pr, file)))
-		return;
-	Qclose (file);
-	return;
-error:
-	free (path);
-	R_INT (pr) = 0;
-}
-
-static builtin_t builtins[] = {
-	{"File_Open",	bi_File_Open,	-1},
-	{0}
-};
-
-void
-RUA_File_Init (progs_t *pr, int secure)
-{
-	PR_RegisterBuiltins (pr, builtins);
-}
diff --git a/libs/ruamoko/rua_init.c b/libs/ruamoko/rua_init.c
index bbfc67525..7741405a5 100644
--- a/libs/ruamoko/rua_init.c
+++ b/libs/ruamoko/rua_init.c
@@ -39,7 +39,6 @@ static void (*init_funcs[])(progs_t *, int) = {
 	RUA_Cbuf_Init,
 	RUA_Cmd_Init,
 	RUA_Cvar_Init,
-	RUA_File_Init,
 	RUA_Hash_Init,
 	RUA_Math_Init,
 	RUA_MsgBuf_Init,
diff --git a/libs/ruamoko/rua_qfs.c b/libs/ruamoko/rua_qfs.c
index 35d69d0c8..87b2c5add 100644
--- a/libs/ruamoko/rua_qfs.c
+++ b/libs/ruamoko/rua_qfs.c
@@ -181,6 +181,12 @@ bi_QFS_FilelistFree (progs_t *pr)
 	PR_Zone_Free (pr, list);
 }
 
+static void
+bi_QFS_GetDirectory (progs_t *pr)
+{
+	RETURN_STRING (pr, qfs_gamedir->dir.def);
+}
+
 static builtin_t builtins[] = {
 	{"QFS_Open",			bi_QFS_Open,			-1},
 	{"QFS_WOpen",			bi_QFS_WOpen,			-1},
@@ -190,6 +196,7 @@ static builtin_t builtins[] = {
 	{"QFS_WriteFile",		bi_QFS_WriteFile,		-1},
 	{"QFS_Filelist",		bi_QFS_Filelist,		-1},
 	{"QFS_FilelistFree",	bi_QFS_FilelistFree,	-1},
+	{"QFS_GetDirectory",	bi_QFS_GetDirectory,	-1},
 	{0}
 };
 
diff --git a/ruamoko/cl_menu/client_menu.r b/ruamoko/cl_menu/client_menu.r
index 769ad9cae..840eac1c8 100644
--- a/ruamoko/cl_menu/client_menu.r
+++ b/ruamoko/cl_menu/client_menu.r
@@ -1,6 +1,5 @@
 #include "AutoreleasePool.h"
 #include "menu.h"
-#include "file.h"
 #include "cmd.h"
 #include "gib.h"
 #include "draw.h"
@@ -10,6 +9,7 @@
 #include "options.h"
 #include "servlist.h"
 #include "system.h"
+#include "qfs.h"
 #include "debug.h"
 #include "HUD.h"
 #include "client_menu.h"
@@ -137,17 +137,17 @@ void (int quick) scan_saves =
 	local QFile		f;
 	local string    line;
 	local int max = MAX_SAVEGAMES;
-	if (quick)
+	string basename = "s";
+	if (quick) {
 		max = MAX_QUICK;
+		basename = "quick";
+	}
+	string gamedir = QFS_GetDirectory();
 	for (i = 0; i < max; i++) {
 		if (!filenames[i])
 			filenames[i] = str_new ();
 		loadable[i] = 0;
-		if (quick) {
-			f = File_Open (sprintf ("quick%i.sav", i + 1), "rz");
-		} else {
-			f = File_Open (sprintf ("s%i.sav", i), "rz");
-		}
+		f = QFS_OpenFile (sprintf ("%s/%s%i.sav", gamedir, basename, i));
 		if (!f) {
 			str_copy (filenames[i], "--- UNUSED SLOT ---");
 			continue;
diff --git a/ruamoko/include/Makefile.am b/ruamoko/include/Makefile.am
index b11080d13..17167cbec 100644
--- a/ruamoko/include/Makefile.am
+++ b/ruamoko/include/Makefile.am
@@ -7,7 +7,7 @@ nobase_pkginclude_HEADERS= \
 	\
 	draw.h key.h \
 	\
-	cbuf.h cmd.h cvar.h file.h gib.h hash.h plist.h runtime.h \
+	cbuf.h cmd.h cvar.h gib.h hash.h plist.h runtime.h \
 	Object.h Protocol.h \
 	AutoreleasePool.h Array.h Entity.h PropertyList.h Set.h \
 	\
diff --git a/ruamoko/include/file.h b/ruamoko/include/file.h
deleted file mode 100644
index f1c3a580b..000000000
--- a/ruamoko/include/file.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef __ruamoko_file_h
-#define __ruamoko_file_h
-
-#include "qfile.h"
-
-@extern QFile File_Open (string path, string mode);
-
-#endif//__ruamoko_file_h
diff --git a/ruamoko/include/qfs.h b/ruamoko/include/qfs.h
index 484a020c0..4a31154f9 100644
--- a/ruamoko/include/qfs.h
+++ b/ruamoko/include/qfs.h
@@ -17,5 +17,6 @@ typedef struct _qfslist_t *QFSlist;
 @extern int QFS_WriteFile (string filename, void *buf, int count);
 @extern QFSlist QFS_Filelist (string path, string ext, int strip);
 @extern void  QFS_FilelistFree (QFSlist list);
+@extern string QFS_GetDirectory (void);
 
 #endif//__ruamoko_qfs_h
diff --git a/ruamoko/lib/Makefile.am b/ruamoko/lib/Makefile.am
index e4b475d64..ee2c80ff7 100644
--- a/ruamoko/lib/Makefile.am
+++ b/ruamoko/lib/Makefile.am
@@ -26,7 +26,7 @@ SUFFIXES= .o .r .qc
 	$(QFCC) $(QCFLAGS) $(QCPPFLAGS) -c -o $@ $<
 
 libr_a_SOURCES=\
-	cbuf.r cmd.r cvar.r file.r hash.r msgbuf.r plist.r qfile.r qfs.r script.r \
+	cbuf.r cmd.r cvar.r hash.r msgbuf.r plist.r qfile.r qfs.r script.r \
 	sound.r string.r math.r types.r \
 	Object.r Protocol.r \
 	AutoreleasePool.r Array.r Array+Private.r Entity.r PropertyList.r Set.r
diff --git a/ruamoko/lib/file.r b/ruamoko/lib/file.r
deleted file mode 100644
index 02494d317..000000000
--- a/ruamoko/lib/file.r
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "file.h"
-
-QFile (string path, string mode) File_Open = #0;
diff --git a/ruamoko/lib/qfs.r b/ruamoko/lib/qfs.r
index e1d374fc4..b0632d030 100644
--- a/ruamoko/lib/qfs.r
+++ b/ruamoko/lib/qfs.r
@@ -8,3 +8,4 @@ QFile QFS_OpenFile (string filename) = #0;
 int QFS_WriteFile (string filename, void *buf, int count) = #0;
 QFSlist QFS_Filelist (string path, string ext, int strip) = #0;
 void  QFS_FilelistFree (QFSlist list) = #0;
+string QFS_GetDirectory (void) = #0;

From 5d302ff6f419041fd7feb2eb7eff2f8f2d86d518 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 26 Feb 2020 17:13:13 +0900
Subject: [PATCH 0525/1519] Fix incorrect usage of signed verbosity

---
 tools/qfcc/source/diagnostic.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/qfcc/source/diagnostic.c b/tools/qfcc/source/diagnostic.c
index 84892687f..ab830280a 100644
--- a/tools/qfcc/source/diagnostic.c
+++ b/tools/qfcc/source/diagnostic.c
@@ -114,7 +114,7 @@ __warning (expr_t *e, const char *file, int line,
 		format_message (message, "warning", e, fmt, args);
 	}
 
-	if (options.verbosity) {
+	if (options.verbosity > 0) {
 		dasprintf (message, " (%s:%d)", file, line);
 	}
 	if (warning_hook) {
@@ -208,7 +208,7 @@ _notice (expr_t *e, const char *file, int line, const char *fmt, ...)
 		report_function (e);
 
 		format_message (message, "notice", e, fmt, args);
-		if (options.verbosity) {
+		if (options.verbosity > 0) {
 			dasprintf (message, " (%s:%d)", file, line);
 		}
 		if (notice_hook) {
@@ -257,7 +257,7 @@ _error (expr_t *e, const char *file, int line, const char *fmt, ...)
 		dstring_t  *message = dstring_new ();
 
 		format_message (message, "error", e, fmt, args);
-		if (options.verbosity) {
+		if (options.verbosity > 0) {
 			dasprintf (message, " (%s:%d)", file, line);
 		}
 		if (error_hook) {

From 5c36c60005e55f64af1e26e8590ae863d7dbb40a Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 26 Feb 2020 17:41:45 +0900
Subject: [PATCH 0526/1519] Use type check helpers some more

---
 tools/qfcc/source/expr.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index 41c3ca7a2..666a3f3fd 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -291,7 +291,7 @@ cast_error (expr_t *e, type_t *t1, type_t *t2)
 	print_type_str (s1, t1);
 	print_type_str (s2, t2);
 
-	e =  error (e, "can not cast from %s to %s", s1->str, s2->str);
+	e =  error (e, "cannot cast from %s to %s", s1->str, s2->str);
 	dstring_delete (s1);
 	dstring_delete (s2);
 	return e;
@@ -2385,11 +2385,11 @@ cast_expr (type_t *type, expr_t *e)
 		c = new_alias_expr (type, e);
 		return c;
 	}
-	if (!(type->type == ev_pointer
-		  && (e_type->type == ev_pointer || is_integral (e_type)
+	if (!(is_pointer (type)
+		  && (is_pointer (e_type) || is_integral (e_type)
 			  || is_array (e_type)))
-		&& !(is_integral (type) && e_type->type == ev_pointer)
-		&& !(type->type == ev_func && e_type->type == ev_func)
+		&& !(is_integral (type) && is_pointer (e_type))
+		&& !(is_func (type) && is_func (e_type))
 		&& !(is_scalar (type) && is_scalar (e_type))) {
 		return cast_error (e, e_type, type);
 	}

From 9528c1176e28791d9fac24f725dae069c1387f86 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 26 Feb 2020 17:45:08 +0900
Subject: [PATCH 0527/1519] Rename cast_expr's type vars for better clarity

---
 tools/qfcc/source/expr.c | 54 ++++++++++++++++++++--------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index 666a3f3fd..9ad394a07 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -2362,41 +2362,41 @@ think_expr (symbol_t *think_sym)
 }
 
 expr_t *
-cast_expr (type_t *type, expr_t *e)
+cast_expr (type_t *dstType, expr_t *e)
 {
 	expr_t    *c;
-	type_t    *e_type;
+	type_t    *srcType;
 
 	convert_name (e);
 
 	if (e->type == ex_error)
 		return e;
 
-	e_type = get_type (e);
+	srcType = get_type (e);
 
-	if (type == e_type)
+	if (dstType == srcType)
 		return e;
 
-	if ((type == type_default && is_enum (e_type))
-		|| (is_enum (type) && e_type == type_default))
+	if ((dstType == type_default && is_enum (srcType))
+		|| (is_enum (dstType) && srcType == type_default))
 		return e;
-	if ((is_pointer (type) && is_string (e_type))
-		|| (is_string (type) && is_pointer (e_type))) {
-		c = new_alias_expr (type, e);
+	if ((is_pointer (dstType) && is_string (srcType))
+		|| (is_string (dstType) && is_pointer (srcType))) {
+		c = new_alias_expr (dstType, e);
 		return c;
 	}
-	if (!(is_pointer (type)
-		  && (is_pointer (e_type) || is_integral (e_type)
-			  || is_array (e_type)))
-		&& !(is_integral (type) && is_pointer (e_type))
-		&& !(is_func (type) && is_func (e_type))
-		&& !(is_scalar (type) && is_scalar (e_type))) {
-		return cast_error (e, e_type, type);
+	if (!(is_pointer (dstType)
+		  && (is_pointer (srcType) || is_integral (srcType)
+			  || is_array (srcType)))
+		&& !(is_integral (dstType) && is_pointer (srcType))
+		&& !(is_func (dstType) && is_func (srcType))
+		&& !(is_scalar (dstType) && is_scalar (srcType))) {
+		return cast_error (e, srcType, dstType);
 	}
-	if (is_array (e_type)) {
-		return address_expr (e, 0, type->t.fldptr.type);
+	if (is_array (srcType)) {
+		return address_expr (e, 0, dstType->t.fldptr.type);
 	}
-	if (is_constant (e) && is_scalar (type) && is_scalar (e_type)) {
+	if (is_constant (e) && is_scalar (dstType) && is_scalar (srcType)) {
 		ex_value_t *val = 0;
 		if (e->type == ex_symbol && e->e.symbol->sy_type == sy_const) {
 			val = e->e.symbol->s.value;
@@ -2416,24 +2416,24 @@ cast_expr (type_t *type, expr_t *e)
 		} else if (e->type == ex_value) {
 			val = e->e.value;
 		} else if (e->type == ex_nil) {
-			convert_nil (e, type);
+			convert_nil (e, dstType);
 			return e;
 		}
 		if (!val)
 			internal_error (e, "unexpected constant expression type");
-		e->e.value = convert_value (val, type);
+		e->e.value = convert_value (val, dstType);
 		e->type = ex_value;
 		c = e;
-	} else if (is_integral (type) && is_integral (e_type)) {
-		c = new_alias_expr (type, e);
-	} else if (is_scalar (type) && is_scalar (e_type)) {
+	} else if (is_integral (dstType) && is_integral (srcType)) {
+		c = new_alias_expr (dstType, e);
+	} else if (is_scalar (dstType) && is_scalar (srcType)) {
 		c = new_unary_expr ('C', e);
-		c->e.expr.type = type;
+		c->e.expr.type = dstType;
 	} else if (e->type == ex_uexpr && e->e.expr.op == '.') {
-		e->e.expr.type = type;
+		e->e.expr.type = dstType;
 		c = e;
 	} else {
-		c = new_alias_expr (type, e);
+		c = new_alias_expr (dstType, e);
 	}
 	return c;
 }

From 69b5029de5a4f28b88b84d0b8dc07549c7eb3ceb Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 26 Feb 2020 17:46:53 +0900
Subject: [PATCH 0528/1519] Throw away function parameter type alias info

typedef is meant to create a simple renaming of a potentially complex
type, not create a new type. Keeping the parameter type alias info makes
the types effectively different when it comes to overloaded function
resolution, which is quite contrary to the goal. Does expose some
breakage elsewhere, though.
---
 tools/qfcc/TODO              | 1 +
 tools/qfcc/source/function.c | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/tools/qfcc/TODO b/tools/qfcc/TODO
index 5bce50696..8180ed95d 100644
--- a/tools/qfcc/TODO
+++ b/tools/qfcc/TODO
@@ -18,5 +18,6 @@ o	isset() intrinsic for more consistent string handling.
 o	arrays in entities
 o	optional arguments for functions (alternative to overloading)
 	vector(vector fwd, optional vector up) vectoangles = #51;
+o	rewrite type system to be const-correct (hard!)
 ?	try to reduce memory consumption
 ??	embedded nul characters in strings (why?)
diff --git a/tools/qfcc/source/function.c b/tools/qfcc/source/function.c
index 538bb8f65..eb376e0ea 100644
--- a/tools/qfcc/source/function.c
+++ b/tools/qfcc/source/function.c
@@ -177,7 +177,10 @@ parse_params (type_t *type, param_t *parms)
 				internal_error (0, 0);
 			new->t.func.num_params = -(new->t.func.num_params + 1);
 		} else if (p->type) {
-			new->t.func.param_types[new->t.func.num_params] = p->type;
+			// FIXME this cast should not be necessary, but making the
+			// type system const-correct would probably take a rewrite
+			type_t     *t = (type_t *) unalias_type (p->type);
+			new->t.func.param_types[new->t.func.num_params] = t;
 			new->t.func.num_params++;
 		}
 	}

From 4cec3bbff6aa749490ae8a947b6f65c288d9278d Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 26 Feb 2020 17:49:09 +0900
Subject: [PATCH 0529/1519] Unalias types when checking cast-compatibility

This fixes the problem with passing typedefs to function parameters.
---
 tools/qfcc/source/expr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index 9ad394a07..c23460b06 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -2374,7 +2374,7 @@ cast_expr (type_t *dstType, expr_t *e)
 
 	srcType = get_type (e);
 
-	if (dstType == srcType)
+	if (unalias_type (dstType) == unalias_type (srcType))
 		return e;
 
 	if ((dstType == type_default && is_enum (srcType))

From 6fccfdf1b9888fbb76075fdb06e50e2da6ff08b1 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 26 Feb 2020 18:03:00 +0900
Subject: [PATCH 0530/1519] Fix a thinko in the save game menu

I thought I had to prepend the gamedir when using QFS_FOpenFile (or
QFS_OpenFile in rua).

Nope, it's gamedir based
---
 ruamoko/cl_menu/client_menu.r | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ruamoko/cl_menu/client_menu.r b/ruamoko/cl_menu/client_menu.r
index 840eac1c8..67f9e80f1 100644
--- a/ruamoko/cl_menu/client_menu.r
+++ b/ruamoko/cl_menu/client_menu.r
@@ -142,12 +142,13 @@ void (int quick) scan_saves =
 		max = MAX_QUICK;
 		basename = "quick";
 	}
-	string gamedir = QFS_GetDirectory();
 	for (i = 0; i < max; i++) {
 		if (!filenames[i])
 			filenames[i] = str_new ();
 		loadable[i] = 0;
-		f = QFS_OpenFile (sprintf ("%s/%s%i.sav", gamedir, basename, i));
+		string path = sprintf ("%s%i.sav", basename, i);
+		dprint(path + "\n");
+		f = QFS_OpenFile (path);
 		if (!f) {
 			str_copy (filenames[i], "--- UNUSED SLOT ---");
 			continue;

From 0f4d89a832ce285352ac9478ef0e6021a0de4a67 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 26 Feb 2020 18:19:21 +0900
Subject: [PATCH 0531/1519] Move free_fmt_items into strings resources

This will make it per-thread.
---
 libs/gamecode/pr_strings.c | 128 ++++++++++++++++++-------------------
 1 file changed, 64 insertions(+), 64 deletions(-)

diff --git a/libs/gamecode/pr_strings.c b/libs/gamecode/pr_strings.c
index cb74797a5..6d39b8481 100644
--- a/libs/gamecode/pr_strings.c
+++ b/libs/gamecode/pr_strings.c
@@ -44,44 +44,6 @@
 #include "QF/progs.h"
 #include "QF/va.h"
 
-typedef struct strref_slot_s {
-	struct strref_slot_s *next;
-	struct strref_slot_s **prev;
-	strref_t   *strref;
-} strref_slot_t;
-
-typedef struct prstr_resources_s {
-	progs_t    *pr;
-	dstring_mem_t ds_mem;
-	strref_t   *free_string_refs;
-	strref_t   *static_strings;
-	strref_t  **string_map;
-	strref_slot_t return_strings[PR_RS_SLOTS];
-	strref_slot_t *rs_slot;
-	unsigned    dyn_str_size;
-	struct hashtab_s *strref_hash;
-	int         num_strings;
-} prstr_resources_t;
-
-typedef enum {
-	str_free,
-	str_static,
-	str_dynamic,
-	str_mutable,
-	str_temp,
-	str_return,
-} str_e;
-
-struct strref_s {
-	strref_t   *next;
-	strref_slot_t *rs_slot;
-	str_e       type;
-	union {
-		char       *string;
-		dstring_t  *dstring;
-	} s;
-};
-
 // format adjustments
 #define FMT_ALTFORM		(1<<0)
 #define FMT_LJUSTIFY	(1<<1)
@@ -106,7 +68,44 @@ typedef struct fmt_item_s {
 	struct fmt_item_s *next;
 } fmt_item_t;
 
-static fmt_item_t *free_fmt_items;
+typedef struct strref_slot_s {
+	struct strref_slot_s *next;
+	struct strref_slot_s **prev;
+	strref_t   *strref;
+} strref_slot_t;
+
+typedef struct prstr_resources_s {
+	progs_t    *pr;
+	dstring_mem_t ds_mem;
+	strref_t   *free_string_refs;
+	strref_t   *static_strings;
+	strref_t  **string_map;
+	strref_slot_t return_strings[PR_RS_SLOTS];
+	strref_slot_t *rs_slot;
+	unsigned    dyn_str_size;
+	struct hashtab_s *strref_hash;
+	int         num_strings;
+	fmt_item_t *free_fmt_items;
+} prstr_resources_t;
+
+typedef enum {
+	str_free,
+	str_static,
+	str_dynamic,
+	str_mutable,
+	str_temp,
+	str_return,
+} str_e;
+
+struct strref_s {
+	strref_t   *next;
+	strref_slot_t *rs_slot;
+	str_e       type;
+	union {
+		char       *string;
+		dstring_t  *dstring;
+	} s;
+};
 
 static void *
 pr_strings_alloc (void *_pr, size_t size)
@@ -694,30 +693,30 @@ I_DoPrint (dstring_t *result, fmt_item_t *formatting)
 }
 
 static fmt_item_t *
-new_fmt_item (void)
+new_fmt_item (prstr_resources_t *res)
 {
 	int        i;
 	fmt_item_t *fi;
 
-	if (!free_fmt_items) {
-		free_fmt_items = malloc (16 * sizeof (fmt_item_t));
+	if (!res->free_fmt_items) {
+		res->free_fmt_items = malloc (16 * sizeof (fmt_item_t));
 		for (i = 0; i < 15; i++)
-			free_fmt_items[i].next = free_fmt_items + i + 1;
-		free_fmt_items[i].next = 0;
+			res->free_fmt_items[i].next = res->free_fmt_items + i + 1;
+		res->free_fmt_items[i].next = 0;
 	}
 
-	fi = free_fmt_items;
-	free_fmt_items = fi->next;
+	fi = res->free_fmt_items;
+	res->free_fmt_items = fi->next;
 	memset (fi, 0, sizeof (*fi));
 	fi->precision = -1;
 	return fi;
 }
 
 static void
-free_fmt_item (fmt_item_t *fi)
+free_fmt_item (prstr_resources_t *res, fmt_item_t *fi)
 {
-	fi->next = free_fmt_items;
-	free_fmt_items = fi;
+	fi->next = res->free_fmt_items;
+	res->free_fmt_items = fi;
 }
 
 #undef P_var
@@ -728,6 +727,7 @@ VISIBLE void
 PR_Sprintf (progs_t *pr, dstring_t *result, const char *name,
 			const char *format, int count, pr_type_t **args)
 {
+	prstr_resources_t *res = pr->pr_string_resources;
 	const char *c, *l;
 	const char *msg = "";
 	fmt_item_t *fmt_items = 0;
@@ -737,7 +737,7 @@ PR_Sprintf (progs_t *pr, dstring_t *result, const char *name,
 	if (!name)
 		name = "PR_Sprintf";
 
-	*fi = new_fmt_item ();
+	*fi = new_fmt_item (res);
 	c = l = format;
 	while (*c) {
 		if (*c++ == '%') {
@@ -747,14 +747,14 @@ PR_Sprintf (progs_t *pr, dstring_t *result, const char *name,
 				(*fi)->type = 's';
 				(*fi)->data.string_var = l;
 
-				(*fi)->next = new_fmt_item ();
+				(*fi)->next = new_fmt_item (res);
 				fi = &(*fi)->next;
 			}
 			if (*c == '%') {
 				(*fi)->type = 's';
 				(*fi)->data.string_var = "%";
 
-				(*fi)->next = new_fmt_item ();
+				(*fi)->next = new_fmt_item (res);
 				fi = &(*fi)->next;
 			} else {
 				do {
@@ -802,7 +802,7 @@ PR_Sprintf (progs_t *pr, dstring_t *result, const char *name,
 						case '@':
 							// object
 							fmt_count++;
-							(*fi)->next = new_fmt_item ();
+							(*fi)->next = new_fmt_item (res);
 							fi = &(*fi)->next;
 							break;
 						case 'e':
@@ -812,7 +812,7 @@ PR_Sprintf (progs_t *pr, dstring_t *result, const char *name,
 								P_EDICTNUM (pr, fmt_count);
 
 							fmt_count++;
-							(*fi)->next = new_fmt_item ();
+							(*fi)->next = new_fmt_item (res);
 							fi = &(*fi)->next;
 							break;
 						case 'i':
@@ -823,7 +823,7 @@ PR_Sprintf (progs_t *pr, dstring_t *result, const char *name,
 							(*fi)->data.integer_var = P_INT (pr, fmt_count);
 
 							fmt_count++;
-							(*fi)->next = new_fmt_item ();
+							(*fi)->next = new_fmt_item (res);
 							fi = &(*fi)->next;
 							break;
 						case 'f':
@@ -842,7 +842,7 @@ PR_Sprintf (progs_t *pr, dstring_t *result, const char *name,
 							}
 
 							fmt_count++;
-							(*fi)->next = new_fmt_item ();
+							(*fi)->next = new_fmt_item (res);
 							fi = &(*fi)->next;
 							break;
 						case 'p':
@@ -852,7 +852,7 @@ PR_Sprintf (progs_t *pr, dstring_t *result, const char *name,
 							(*fi)->data.uinteger_var = P_UINT (pr, fmt_count);
 
 							fmt_count++;
-							(*fi)->next = new_fmt_item ();
+							(*fi)->next = new_fmt_item (res);
 							fi = &(*fi)->next;
 							break;
 						case 's':
@@ -861,7 +861,7 @@ PR_Sprintf (progs_t *pr, dstring_t *result, const char *name,
 							(*fi)->data.string_var = P_GSTRING (pr, fmt_count);
 
 							fmt_count++;
-							(*fi)->next = new_fmt_item ();
+							(*fi)->next = new_fmt_item (res);
 							fi = &(*fi)->next;
 							break;
 						case 'v':
@@ -888,7 +888,7 @@ PR_Sprintf (progs_t *pr, dstring_t *result, const char *name,
 										(*fi)->type = 's';
 										(*fi)->data.string_var = " ";
 									}
-									(*fi)->next = new_fmt_item ();
+									(*fi)->next = new_fmt_item (res);
 									fi = &(*fi)->next;
 
 									(*fi)->flags = flags;
@@ -898,7 +898,7 @@ PR_Sprintf (progs_t *pr, dstring_t *result, const char *name,
 									(*fi)->data.float_var =
 										P_VECTOR (pr, fmt_count)[i];
 
-									(*fi)->next = new_fmt_item ();
+									(*fi)->next = new_fmt_item (res);
 									fi = &(*fi)->next;
 								}
 							}
@@ -907,7 +907,7 @@ PR_Sprintf (progs_t *pr, dstring_t *result, const char *name,
 							(*fi)->data.string_var = "'";
 
 							fmt_count++;
-							(*fi)->next = new_fmt_item ();
+							(*fi)->next = new_fmt_item (res);
 							fi = &(*fi)->next;
 							break;
 						case 'x':
@@ -916,7 +916,7 @@ PR_Sprintf (progs_t *pr, dstring_t *result, const char *name,
 							(*fi)->data.uinteger_var = P_UINT (pr, fmt_count);
 
 							fmt_count++;
-							(*fi)->next = new_fmt_item ();
+							(*fi)->next = new_fmt_item (res);
 							fi = &(*fi)->next;
 							break;
 					}
@@ -932,7 +932,7 @@ PR_Sprintf (progs_t *pr, dstring_t *result, const char *name,
 		(*fi)->type = 's';
 		(*fi)->data.string_var = l;
 
-		(*fi)->next = new_fmt_item ();
+		(*fi)->next = new_fmt_item (res);
 	}
 
 	if (fmt_count != count) {
@@ -947,7 +947,7 @@ PR_Sprintf (progs_t *pr, dstring_t *result, const char *name,
 	I_DoPrint (result, fmt_items);
 	while (fmt_items) {
 		fmt_item_t *t = fmt_items->next;
-		free_fmt_item (fmt_items);
+		free_fmt_item (res, fmt_items);
 		fmt_items = t;
 	}
 	return;

From 36bc139b274bf2279463404249fdc5159d8f45b6 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 26 Feb 2020 18:35:19 +0900
Subject: [PATCH 0532/1519] Avoid use of va in PR_Sprintf

With this, progs strings are thread safe so long as only one thread
tries to use the VM.
---
 libs/gamecode/pr_strings.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/libs/gamecode/pr_strings.c b/libs/gamecode/pr_strings.c
index 6d39b8481..4e2acca11 100644
--- a/libs/gamecode/pr_strings.c
+++ b/libs/gamecode/pr_strings.c
@@ -86,6 +86,7 @@ typedef struct prstr_resources_s {
 	struct hashtab_s *strref_hash;
 	int         num_strings;
 	fmt_item_t *free_fmt_items;
+	dstring_t  *print_str;
 } prstr_resources_t;
 
 typedef enum {
@@ -623,10 +624,9 @@ PR_FreeTempStrings (progs_t *pr)
 	list item.
 */
 static void
-I_DoPrint (dstring_t *result, fmt_item_t *formatting)
+I_DoPrint (dstring_t *tmp, dstring_t *result, fmt_item_t *formatting)
 {
 	fmt_item_t		*current = formatting;
-	dstring_t		*tmp = dstring_new ();
 
 	while (current) {
 		qboolean	doPrecision, doWidth;
@@ -689,7 +689,6 @@ I_DoPrint (dstring_t *result, fmt_item_t *formatting)
 		}
 		current = current->next;
 	}
-	dstring_delete (tmp);
 }
 
 static fmt_item_t *
@@ -940,11 +939,13 @@ PR_Sprintf (progs_t *pr, dstring_t *result, const char *name,
 			msg = "Not enough arguments for format string.";
 		else
 			msg = "Too many arguments for format string.";
-		msg = va ("%s: %d %d", msg, fmt_count, count);
+		dsprintf (res->print_str, "%s: %d %d", msg, fmt_count, count);
+		msg = res->print_str->str;
 		goto error;
 	}
 
-	I_DoPrint (result, fmt_items);
+	dstring_clear (res->print_str);
+	I_DoPrint (res->print_str, result, fmt_items);
 	while (fmt_items) {
 		fmt_item_t *t = fmt_items->next;
 		free_fmt_item (res, fmt_items);
@@ -960,6 +961,7 @@ PR_Strings_Init (progs_t *pr)
 {
 	prstr_resources_t *res = calloc (1, sizeof (*res));
 	res->pr = pr;
+	res->print_str = dstring_new ();
 
 	PR_Resources_Register (pr, "Strings", res, pr_strings_clear);
 	PR_AddLoadFunc (pr, PR_LoadStrings);

From ddd007e2d56bcff50f6aafe16a5186b389bd70c1 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 26 Feb 2020 19:00:19 +0900
Subject: [PATCH 0533/1519] [dstring] Return the string instead of printed size

Other than consistency with printf(), I'm not sure why we went with the
printed size as the return value; returning the resultant strings makes
much more sense as dsprintf() (etc) can then be used as a safe va()
---
 include/QF/dstring.h |  8 ++++----
 libs/util/dstring.c  | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/include/QF/dstring.h b/include/QF/dstring.h
index bb5ea9117..937e9be54 100644
--- a/include/QF/dstring.h
+++ b/include/QF/dstring.h
@@ -164,15 +164,15 @@ void dstring_clearstr (dstring_t *dstr);
 /** Formatted printing to dstrings. Existing data is replaced by the formatted
 	string.
 */
-int dvsprintf (dstring_t *dstr, const char *fmt, va_list args) __attribute__((format(printf,2,0)));
-int dsprintf (dstring_t *dstr, const char *fmt, ...) __attribute__((format(printf,2,3)));
+char *dvsprintf (dstring_t *dstr, const char *fmt, va_list args) __attribute__((format(printf,2,0)));
+char *dsprintf (dstring_t *dstr, const char *fmt, ...) __attribute__((format(printf,2,3)));
 ///@}
 ///@{
 /** Formatted printing to dstrings. Formatted string is appened to the dstring.
 	Embedded nulls in the dstring are ignored.
 */
-int davsprintf (dstring_t *dstr, const char *fmt, va_list args) __attribute__((format(printf,2,0)));
-int dasprintf (dstring_t *dstr, const char *fmt, ...) __attribute__((format(printf,2,3)));
+char *davsprintf (dstring_t *dstr, const char *fmt, va_list args) __attribute__((format(printf,2,0)));
+char *dasprintf (dstring_t *dstr, const char *fmt, ...) __attribute__((format(printf,2,3)));
 ///@}
 
 ///@}
diff --git a/libs/util/dstring.c b/libs/util/dstring.c
index 18d83f44a..fb495403c 100644
--- a/libs/util/dstring.c
+++ b/libs/util/dstring.c
@@ -299,7 +299,7 @@ dstring_clearstr (dstring_t *dstr)
 	dstr->str[0] = 0;
 }
 
-static __attribute__((format(printf, 3, 0))) int
+static __attribute__((format(printf, 3, 0))) char *
 _dvsprintf (dstring_t *dstr, int offs, const char *fmt, va_list args)
 {
 	int         size;
@@ -325,20 +325,20 @@ _dvsprintf (dstring_t *dstr, int offs, const char *fmt, va_list args)
 	}
 	dstr->size = size + offs + 1;
 	dstr->str[dstr->size - 1] = 0;
-	return size;
+	return dstr->str;
 }
 
-VISIBLE int
+VISIBLE char *
 dvsprintf (dstring_t *dstr, const char *fmt, va_list args)
 {
 	return _dvsprintf (dstr, 0, fmt, args);
 }
 
-VISIBLE int
+VISIBLE char *
 dsprintf (dstring_t *dstr, const char *fmt, ...)
 {
 	va_list     args;
-	int         ret;
+	char       *ret;
 
 	va_start (args, fmt);
 	ret = _dvsprintf (dstr, 0, fmt, args);
@@ -347,7 +347,7 @@ dsprintf (dstring_t *dstr, const char *fmt, ...)
 	return ret;
 }
 
-VISIBLE int
+VISIBLE char *
 davsprintf (dstring_t *dstr, const char *fmt, va_list args)
 {
 	int         offs = 0;
@@ -357,11 +357,11 @@ davsprintf (dstring_t *dstr, const char *fmt, va_list args)
 	return _dvsprintf (dstr, offs, fmt, args);
 }
 
-VISIBLE int
+VISIBLE char *
 dasprintf (dstring_t *dstr, const char *fmt, ...)
 {
 	va_list     args;
-	int         ret;
+	char       *ret;
 	int         offs = 0;
 
 	if (dstr->size)

From 62b541793dddb7a4564d1c2eab1dadaf8c4ee19a Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 26 Feb 2020 19:30:10 +0900
Subject: [PATCH 0534/1519] [gamecode] Remove all use of va

With this, the VA is very close to being safe to use in a threaded
environment (so long as each VM is used by only one thread). Just the
debug file hash and source paths to sort out.
---
 libs/gamecode/pr_builtins.c |  1 -
 libs/gamecode/pr_debug.c    | 83 ++++++++++++++++++-------------------
 libs/gamecode/pr_strings.c  |  1 -
 3 files changed, 41 insertions(+), 44 deletions(-)

diff --git a/libs/gamecode/pr_builtins.c b/libs/gamecode/pr_builtins.c
index 12c2e6050..7e4bb4431 100644
--- a/libs/gamecode/pr_builtins.c
+++ b/libs/gamecode/pr_builtins.c
@@ -47,7 +47,6 @@
 #include "QF/quakefs.h"
 #include "QF/sys.h"
 #include "QF/zone.h"
-#include "QF/va.h"
 
 #include "compat.h"
 
diff --git a/libs/gamecode/pr_debug.c b/libs/gamecode/pr_debug.c
index f7f3f3b7c..3ae9a972e 100644
--- a/libs/gamecode/pr_debug.c
+++ b/libs/gamecode/pr_debug.c
@@ -52,7 +52,6 @@
 #include "QF/quakefs.h"
 #include "QF/script.h"
 #include "QF/sys.h"
-#include "QF/va.h"
 #include "QF/zone.h"
 
 #include "compat.h"
@@ -74,6 +73,9 @@ typedef struct {
 typedef struct prdeb_resources_s {
 	progs_t    *pr;
 	dstring_t  *string;
+	dstring_t  *dva;
+	dstring_t  *line;
+	dstring_t  *dstr;
 	const char *debugfile;
 	struct pr_debug_header_s *debug;
 	struct pr_auxfunction_s *auxfunctions;
@@ -328,11 +330,10 @@ pr_debug_clear (progs_t *pr, void *data)
 {
 	__auto_type res = (prdeb_resources_t *) data;
 
-	if (res->string) {
-		dstring_clearstr (res->string);
-	} else {
-		res->string = dstring_newstr ();
-	}
+	dstring_clearstr (res->string);
+	dstring_clearstr (res->dva);
+	dstring_clearstr (res->line);
+	dstring_clearstr (res->dstr);
 
 	if (res->debug)
 		pr->free_progs_mem (pr, res->debug);
@@ -353,6 +354,7 @@ pr_debug_clear (progs_t *pr, void *data)
 static file_t *
 PR_Load_Source_File (progs_t *pr, const char *fname)
 {
+	prdeb_resources_t *res = pr->pr_debug_resources;
 	char       *l, *p, **dir;
 	file_t     *f = Hash_Find (file_hash, fname);
 
@@ -362,8 +364,8 @@ PR_Load_Source_File (progs_t *pr, const char *fname)
 	if (!f)
 		return 0;
 	for (dir = source_paths; *dir && !f->text; dir++) {
-		f->text = pr->load_file (pr, va ("%s%s%s", *dir, **dir ? "/" : "",
-										 fname),
+		f->text = pr->load_file (pr, dsprintf (res->dva, "%s%s%s", *dir,
+											   **dir ? "/" : "", fname),
 								 &f->size);
 	}
 	if (!f->text) {
@@ -651,6 +653,7 @@ PR_Get_Source_File (progs_t *pr, pr_lineno_t *lineno)
 const char *
 PR_Get_Source_Line (progs_t *pr, pr_uint_t addr)
 {
+	prdeb_resources_t *res = pr->pr_debug_resources;
 	const char *fname;
 	pr_uint_t   line;
 	file_t     *file;
@@ -670,10 +673,11 @@ PR_Get_Source_Line (progs_t *pr, pr_uint_t addr)
 	file = PR_Load_Source_File (pr, fname);
 
 	if (!file || !file->lines || !line || line > file->num_lines)
-		return va ("%s:%u", fname, line);
+		return dsprintf (res->dva, "%s:%u", fname, line);
 
-	return va ("%s:%u:%.*s", fname, line, (int)file->lines[line - 1].len,
-			   file->lines[line - 1].text);
+	return dsprintf (res->dva, "%s:%u:%.*s", fname, line,
+					 (int)file->lines[line - 1].len,
+					 file->lines[line - 1].text);
 }
 
 pr_def_t *
@@ -1210,9 +1214,9 @@ PR_Debug_Watch (progs_t *pr, const char *expr)
 VISIBLE void
 PR_Debug_Print (progs_t *pr, const char *expr)
 {
+	prdeb_resources_t *res = pr->pr_debug_resources;
 	pr_def_t    print;
-	dstring_t  *dstr = dstring_newstr();
-	pr_debug_data_t data = {pr, dstr};
+	pr_debug_data_t data = {pr, res->dstr};
 
 	if (!expr) {
 		Sys_Printf ("print <print expr>\n");
@@ -1224,7 +1228,6 @@ PR_Debug_Print (progs_t *pr, const char *expr)
 		const char *s = global_string (&data, print.ofs, print.type, 1);
 		Sys_Printf ("[%d] = %s\n", print.ofs, s);
 	}
-	dstring_delete (dstr);
 }
 
 VISIBLE void
@@ -1235,21 +1238,13 @@ PR_PrintStatement (progs_t *pr, dstatement_t *s, int contents)
 	int         dump_code = contents & 2;
 	const char *fmt;
 	opcode_t   *op;
-	static dstring_t *line;
-	static dstring_t *dstr;
 	dfunction_t *call_func = 0;
 	pr_def_t   *parm_def = 0;
 	pr_auxfunction_t *aux_func = 0;
 	pr_debug_data_t data;
 
-	if (!line) {
-		line = dstring_new ();
-		dstr = dstring_new ();
-	}
-	dstring_clearstr (line);
-
 	data.pr = pr;
-	data.dstr = dstr;
+	data.dstr = res->dstr;
 
 	if (pr_debug->int_val > 1)
 		dump_code = 1;
@@ -1258,7 +1253,7 @@ PR_PrintStatement (progs_t *pr, dstatement_t *s, int contents)
 		const char *source_line = PR_Get_Source_Line (pr, addr);
 
 		if (source_line) {
-			dasprintf (line, "%s%s", source_line, dump_code ? "\n" : "");
+			dasprintf (res->line, "%s%s", source_line, dump_code ? "\n" : "");
 			if (!dump_code)
 				goto do_print;
 		}
@@ -1268,27 +1263,27 @@ PR_PrintStatement (progs_t *pr, dstatement_t *s, int contents)
 
 	op = PR_Opcode (s->op);
 	if (!op) {
-		Sys_Printf ("%sUnknown instruction %d\n", line->str, s->op);
+		Sys_Printf ("%sUnknown instruction %d\n", res->line->str, s->op);
 		return;
 	}
 
 	if (!(fmt = op->fmt))
 		fmt = "%Ga, %Gb, %gc";
 
-	dasprintf (line, "%04x ", addr);
+	dasprintf (res->line, "%04x ", addr);
 	if (pr_debug->int_val > 2)
-		dasprintf (line, "%02x %04x(%8s) %04x(%8s) %04x(%8s)\t",
+		dasprintf (res->line, "%02x %04x(%8s) %04x(%8s) %04x(%8s)\t",
 					s->op,
 					s->a, pr_type_name[op->type_a],
 					s->b, pr_type_name[op->type_b],
 					s->c, pr_type_name[op->type_c]);
 
-	dasprintf (line, "%s ", op->opname);
+	dasprintf (res->line, "%s ", op->opname);
 
 	while (*fmt) {
 		if (*fmt == '%') {
 			if (fmt[1] == '%') {
-				dstring_appendsubstr (line, fmt + 1, 1);
+				dstring_appendsubstr (res->line, fmt + 1, 1);
 				fmt += 2;
 			} else {
 				const char *str;
@@ -1365,10 +1360,11 @@ PR_PrintStatement (progs_t *pr, dstatement_t *s, int contents)
 						str = global_string (&data, opval, optype, 0);
 						break;
 					case 's':
-						str = va ("%d", (short) opval);
+						str = dsprintf (res->dva, "%d", (short) opval);
 						break;
 					case 'O':
-						str = va ("%04x", addr + (short) opval);
+						str = dsprintf (res->dva, "%04x",
+										addr + (short) opval);
 						break;
 					case 'E':
 						{
@@ -1387,25 +1383,26 @@ PR_PrintStatement (progs_t *pr, dstatement_t *s, int contents)
 							}
 							str = global_string (&data, opval, optype,
 												 contents & 1);
-							str = va ("$%x $%x %s", s->a, s->b, str);
+							str = dsprintf (res->dva, "$%x $%x %s",
+											s->a, s->b, str);
 						}
 						break;
 					default:
 						goto err;
 				}
-				dstring_appendstr (line, str);
+				dstring_appendstr (res->line, str);
 				fmt += 3;
 				continue;
 			err:
-				dstring_appendstr (line, fmt);
+				dstring_appendstr (res->line, fmt);
 				break;
 			}
 		} else {
-			dstring_appendsubstr (line, fmt++, 1);
+			dstring_appendsubstr (res->line, fmt++, 1);
 		}
 	}
 do_print:
-	Sys_Printf ("%s\n", line->str);
+	Sys_Printf ("%s\n", res->line->str);
 }
 
 static void
@@ -1497,6 +1494,7 @@ PR_Profile (progs_t * pr)
 VISIBLE void
 ED_Print (progs_t *pr, edict_t *ed)
 {
+	prdeb_resources_t *res = pr->pr_debug_resources;
 	int         l;
 	pr_uint_t   i, j;
 	const char *name;
@@ -1504,8 +1502,7 @@ ED_Print (progs_t *pr, edict_t *ed)
 	pr_type_t  *v;
 	qfot_type_t dummy_type = { };
 	qfot_type_t *type;
-	dstring_t  *dstr = dstring_newstr();
-	pr_debug_data_t data = {pr, dstr};
+	pr_debug_data_t data = {pr, res->dstr};
 
 	if (ed->free) {
 		Sys_Printf ("FREE\n");
@@ -1538,12 +1535,10 @@ ED_Print (progs_t *pr, edict_t *ed)
 		if (l < 1)
 			l = 1;
 
-		dstring_clearstr (dstr);
+		dstring_clearstr (res->dstr);
 		value_string (&data, type, v);
-		Sys_Printf ("%s%*s%s\n", name, l, "", dstr->str);
+		Sys_Printf ("%s%*s%s\n", name, l, "", res->dstr->str);
 	}
-
-	dstring_delete (dstr);
 }
 
 void
@@ -1551,6 +1546,10 @@ PR_Debug_Init (progs_t *pr)
 {
 	prdeb_resources_t *res = calloc (1, sizeof (*res));
 	res->pr = pr;
+	res->string = dstring_newstr ();
+	res->dva = dstring_newstr ();
+	res->line = dstring_newstr ();
+	res->dstr = dstring_newstr ();
 
 	PR_Resources_Register (pr, "PR_Debug", res, pr_debug_clear);
 	if (!file_hash) {
diff --git a/libs/gamecode/pr_strings.c b/libs/gamecode/pr_strings.c
index 4e2acca11..ff5e1ffab 100644
--- a/libs/gamecode/pr_strings.c
+++ b/libs/gamecode/pr_strings.c
@@ -42,7 +42,6 @@
 #include "QF/dstring.h"
 #include "QF/hash.h"
 #include "QF/progs.h"
-#include "QF/va.h"
 
 // format adjustments
 #define FMT_ALTFORM		(1<<0)

From 126f8502bd1f1af53455ed7ed73d2e127c3a35b5 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 26 Feb 2020 22:10:59 +0900
Subject: [PATCH 0535/1519] Start working on a qwaq console tool

The intention is it will hopefully become a debugger. It will certainly
help with development of the progs engine.
---
 config.d/build_control.m4 |   5 +-
 config.d/curses.m4        |  27 ++++-
 tools/qwaq/Makefile.am    |  23 +++--
 tools/qwaq/defs.qc        |  22 -----
 tools/qwaq/main.c         |  39 ++++----
 tools/qwaq/main.qc        | 114 ---------------------
 tools/qwaq/qwaq-curses.c  |  54 ++++++++++
 tools/qwaq/test.r         |  42 --------
 tools/qwaq/types.r        | 203 --------------------------------------
 9 files changed, 119 insertions(+), 410 deletions(-)
 delete mode 100644 tools/qwaq/defs.qc
 delete mode 100644 tools/qwaq/main.qc
 create mode 100644 tools/qwaq/qwaq-curses.c
 delete mode 100644 tools/qwaq/test.r
 delete mode 100644 tools/qwaq/types.r

diff --git a/config.d/build_control.m4 b/config.d/build_control.m4
index 13004a6c8..a53bf74a4 100644
--- a/config.d/build_control.m4
+++ b/config.d/build_control.m4
@@ -227,7 +227,10 @@ if test "x$ENABLE_tools_qfvis" = xyes; then
 	QF_NEED(libs,[util])
 fi
 if test "x$ENABLE_tools_qwaq" = xyes; then
-	QF_NEED(tools,[qwaq])
+	if test "x$HAVE_PANEL" = xyes -a "x$HAVE_PTHREAD" = xyes; then
+		QWAQ_TARGETS="$QWAQ_TARGETS qwaq-curses\$(EXEEXT)"
+	fi
+	QF_NEED(tools,[qfcc qwaq])
 	QF_NEED(libs,[ruamoko gamecode util])
 fi
 if test "x$ENABLE_tools_wad" = xyes; then
diff --git a/config.d/curses.m4 b/config.d/curses.m4
index 80a2b0415..073e98217 100644
--- a/config.d/curses.m4
+++ b/config.d/curses.m4
@@ -2,7 +2,7 @@ AC_ARG_ENABLE(curses,
 [  --disable-curses        disable curses support]
 )
 if test "x$enable_curses" != "xno"; then
-	AC_CHECK_HEADERS(curses.h)
+	AC_CHECK_HEADER(curses.h)
 	AC_CHECK_LIB(ncurses, initscr,
 		CURSES_LIBS=-lncurses,
 		AC_CHECK_LIB(pdcurses, initscr,
@@ -13,7 +13,32 @@ if test "x$enable_curses" != "xno"; then
 			)
 		)
 	)
+	if test "x$CURSES_LIBS" != "x"; then
+		AC_DEFINE(HAVE_CURSES, 1, [Define if you have the ncurses library])
+		HAVE_CURSES=yes
+	else
+		HAVE_CURSES=no
+	fi
 else
+	HAVE_CURSES=no
 	CURSES_LIBS=
 fi
 AC_SUBST(CURSES_LIBS)
+
+if test "x$HAVE_CURSES" == "xyes"; then
+	AC_CHECK_HEADER(panel.h,
+		[AC_CHECK_LIB(panel, new_panel,
+			[AC_DEFINE(HAVE_PANEL, 1,
+					[Define if you have the ncurses panel library])
+				PANEL_LIBS=-lpanel
+				HAVE_PANEL=yes],
+			[HAVE_PANEL=no],
+			$CURSES_LIBS
+		)],
+		HAVE_PANEL=no,
+		[]
+	)
+else
+	PANEL_LIBS=
+fi
+AC_SUBST(PANEL_LIBS)
diff --git a/tools/qwaq/Makefile.am b/tools/qwaq/Makefile.am
index dd34fd9c5..104a7743d 100644
--- a/tools/qwaq/Makefile.am
+++ b/tools/qwaq/Makefile.am
@@ -2,21 +2,24 @@ QWAQ_LIBS=@QWAQ_LIBS@
 QWAQ_DEPS=@QWAQ_DEPS@
 QWAQ_INCS=@QWAQ_INCS@
 
-AM_CPPFLAGS=	-I$(top_srcdir)/include $(QWAQ_INCS)
+AM_CPPFLAGS=	-I$(top_srcdir)/include $(QWAQ_INCS) $(PTHREAD_CFLAGS)
 
 QFCC_DEP=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT)
 QFCC=$(top_builddir)/tools/qfcc/source/qfcc
 QCFLAGS=-qq -O -g -Werror --advanced --no-default-paths
 
-noinst_PROGRAMS=qwaq @QWAQ_TARGETS@
-noinst_DATA=qwaq.dat
+noinst_PROGRAMS=@QWAQ_TARGETS@
+noinst_DATA= #qwaq.dat
 
 qwaq_dat_src= \
-	defs.qc main.qc test.r types.r
+	$e
 
-qwaq_SOURCES= main.c builtins.c
-qwaq_LDADD= $(QWAQ_LIBS)
-qwaq_DEPENDENCIES= $(QWAQ_DEPS)
+qwaq_curses_libs=
+qwaq_curses_SOURCES=main.c qwaq-curses.c
+qwaq_curses_LDADD= $(qwaq_curses_libs) $(QWAQ_LIBS) \
+				$(PANEL_LIBS) $(CURSES_LIBS) $(PTHREAD_LDFLAGS) $(DL_LIBS)
+qwaq_curses_LDFLAGS=
+qwaq_curses_DEPENDENCIES= $(qwaq_curses_libs) $(QWAQ_DEPS)
 
 cl_plugin_libs= \
 	@client_static_plugin_libs@
@@ -42,9 +45,9 @@ qwaq_x11_LDADD= $(qwaq_x11_libs) $(QWAQ_LIBS) \
 qwaq_x11_LDFLAGS=
 qwaq_x11_DEPENDENCIES= $(qwaq_x11_libs) $(QWAQ_DEPS)
 
-qwaq.dat: progs.src $(qwaq_dat_src) $(QFCC_DEP) $(top_srcdir)/ruamoko/lib/Object.r
-	$(QFCC) $(QCFLAGS) -I$(top_srcdir)/ruamoko/include
+#qwaq.dat: $(qwaq_dat_src) $(QFCC_DEP) $(top_srcdir)/ruamoko/lib/Object.r
+#	$(QFCC) $(QCFLAGS) -I$(top_srcdir)/ruamoko/include
 
-EXTRA_PROGRAMS=qwaq-x11
+EXTRA_PROGRAMS=qwaq-curses qwaq-x11
 EXTRA_DIST=$(qwaq_dat_src) qwaq.h
 CLEANFILES= *.dat *.sym
diff --git a/tools/qwaq/defs.qc b/tools/qwaq/defs.qc
deleted file mode 100644
index e872fb799..000000000
--- a/tools/qwaq/defs.qc
+++ /dev/null
@@ -1,22 +0,0 @@
-void (string str) print = #0;
-int () errno = #0;
-string (int err) strerror = #0;
-int (...) open = #0; // string path, float flags[, float mode]
-int (int handle) close = #0;
-string read (int handle, int count, int *result) = #0;
-int (int handle, string buffer, int count) write = #0;
-int (int handle, int pos, int whence) seek = #0;
-
-//void() traceon = #0;          // turns statment trace on
-//void() traceoff = #0;
-
-void (...) printf = #0;
-
-
-float time;
-entity self;
-
-.float nextthink;
-.void() think;
-.float frame;
-.vector origin;
diff --git a/tools/qwaq/main.c b/tools/qwaq/main.c
index 7f51ea6df..357579290 100644
--- a/tools/qwaq/main.c
+++ b/tools/qwaq/main.c
@@ -33,24 +33,27 @@
 
 #include <stdlib.h>
 
-#include <QF/cmd.h>
-#include <QF/cvar.h>
-#include <QF/progs.h>
-#include <QF/quakefs.h>
+#include "QF/cbuf.h"
+#include "QF/cmd.h"
+#include "QF/cvar.h"
+#include "QF/gib.h"
+#include "QF/idparse.h"
+#include "QF/progs.h"
+#include "QF/qargs.h"
+#include "QF/quakefs.h"
 #include "QF/ruamoko.h"
-#include <QF/sys.h>
+#include "QF/sys.h"
 #include "QF/va.h"
-#include <QF/zone.h>
+#include "QF/zone.h"
 
 #include "qwaq.h"
 
 #define MAX_EDICTS 1024
 
-static edict_t *edicts;
-static int num_edicts;
-static int reserved_edicts;
 static progs_t pr;
 
+cbuf_t *qwaq_cbuf;
+
 static QFile *
 open_file (const char *path, int *len)
 {
@@ -100,17 +103,18 @@ free_progs_mem (progs_t *pr, void *mem)
 static void
 init_qf (void)
 {
-	Sys_Init ();
-	//Cvar_Get ("developer", "128", 0, 0, 0);
+	qwaq_cbuf = Cbuf_New (&id_interp);
 
-	Memory_Init (malloc (1024 * 1024), 1024 * 1024);
+	Sys_Init ();
+	COM_ParseConfig ();
+
+	//Cvar_Set (developer, "1");
+
+	Memory_Init (malloc (8 * 1024 * 1024), 8 * 1024 * 1024);
 
 	Cvar_Get ("pr_debug", "2", 0, 0, 0);
 	Cvar_Get ("pr_boundscheck", "0", 0, 0, 0);
 
-	pr.edicts = &edicts;
-	pr.num_edicts = &num_edicts;
-	pr.reserved_edicts = &reserved_edicts;
 	pr.load_file = load_file;
 	pr.allocate_progs_mem = allocate_progs_mem;
 	pr.free_progs_mem = free_progs_mem;
@@ -119,7 +123,7 @@ init_qf (void)
 	PR_Init_Cvars ();
 	PR_Init (&pr);
 	RUA_Init (&pr, 0);
-	PR_Cmds_Init(&pr);
+	PR_Cmds_Init (&pr);
 	BI_Init (&pr);
 }
 
@@ -144,7 +148,7 @@ load_progs (const char *name)
 }
 
 int
-main (int argc, char **argv)
+main (int argc, const char **argv)
 {
 	dfunction_t *dfunc;
 	func_t      main_func = 0;
@@ -152,6 +156,7 @@ main (int argc, char **argv)
 	string_t   *pr_argv;
 	int         pr_argc = 1, i;
 
+	COM_InitArgv (argc, argv);
 	init_qf ();
 
 	if (argc > 1)
diff --git a/tools/qwaq/main.qc b/tools/qwaq/main.qc
deleted file mode 100644
index 25cfaabdb..000000000
--- a/tools/qwaq/main.qc
+++ /dev/null
@@ -1,114 +0,0 @@
-string read_file (string filename)
-{
-	local QFile file;
-	local string data = nil, d;
-	file = Qopen (filename, "rtz");
-	if (!file) {
-		printf ("Can't open %s for reading."
-				" Probably a bad hardcoded filename:)\n", filename);
-		return nil;
-	}
-	while ((d = Qgetline (file)))
-		data = data + d;
-	//FIXME can't read to a string, can't convert a pointer to a string ...
-	//Qread (file, data, 1023);
-	Qclose (file);
-	d = str_new ();
-	str_copy (d, data);
-	return d;
-}
-
-void test_plist (void)
-{
-	local string data, l;
-	local plitem_t pl, item, i;
-
-	data = read_file ("/home/bill/.quakeforge/gamedir.conf");
-	pl = PL_GetPropertyList ("{" + data + "}");
-	l = PL_WritePropertyList (pl);
-	printf ("%s", data);
-	printf ("%s", l);
-	i = PL_ObjectForKey (pl, "QF");
-	item = PL_RemoveObjectForKey (pl, "QF");
-	l = PL_WritePropertyList (item);
-	printf ("%s", l);
-	PL_Free (item);
-	//Because i and item both point to the same plitem, and item has been,
-	//freed, freeing i will generate an error
-	//l = PL_WritePropertyList (i);
-	PL_Free (pl);
-	str_free (data);
-}
-
-void test_script (void)
-{
-	local script_t script;
-	local string token;
-	local string data;
-
-	data = read_file ("progs.src");
-	script = Script_New ();
-	token = Script_Start (script, "progs.src", data);
-	while (Script_GetToken (script, 1)) {
-		printf ("%s\n", token);
-	}
-	Script_Delete (script);
-	str_free (data);
-}
-
-void () test_str =
-{
-	local string a,b,c,d;
-	a = "testing ";
-	b = "temp ";
-	c = "strings ";
-	d = "\n";
-	print (a + b + c + d);
-	printf ("%i \"%.5s\" %3.4f %v\n", 14, "hi there", 3.1415926, '4 1 3');
-};
-void (...) dprint = #0;
-int main (int argc, string *argv)
-{
-	local int i;
-	local SEL sel;
-	dprint ("foo", "bar\n");
-	for (i = 0; i < argc; i++) {
-		print (argv[i]);
-		print ("\n");
-	}
-	local id foo = [[Foo alloc] init];
-	[foo run];
-	sel = sel_get_uid ("run");
-	if (sel) {
-		print ("found selector for `run'\n");
-		if ([foo respondsToSelector:sel])
-			print ("foo responds to `run'\n");
-		else
-			print ("foo does not repond to `run'\n");
-	} else
-		print ("did not find selector for `run'\n");
-	sel = sel_get_uid ("alloc");
-	if (sel) {
-		print ("found selector for `alloc'\n");
-		if ([Object instancesRespondToSelector:sel])
-			print ("Object instances respond to `alloc'\n");
-		else
-			print ("Object instances do not repond to `alloc'\n");
-	} else
-		print ("did not find selector for `alloc'\n");
-	sel = sel_get_uid ("run:with:me:");
-	if (sel) {
-		print ("found selector for `run:with:me:'\n");
-		if ([Object instancesRespondToSelector:sel])
-			print ("Object instances respond to `run:with:me:'\n");
-		else
-			print ("Object instances do not repond to `run:with:me:'\n");
-	} else
-		print ("did not find selector for `run:with:me:'\n");
-	test_str ();
-	test_script ();
-	test_plist ();
-	test_types ();
-	test_xdefs ();
-	return 0;
-};
diff --git a/tools/qwaq/qwaq-curses.c b/tools/qwaq/qwaq-curses.c
new file mode 100644
index 000000000..71439d0a9
--- /dev/null
+++ b/tools/qwaq/qwaq-curses.c
@@ -0,0 +1,54 @@
+/*
+	#FILENAME#
+
+	#DESCRIPTION#
+
+	Copyright (C) 2001 #AUTHOR#
+
+	Author: #AUTHOR#
+	Date: #DATE#
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include "QF/progs.h"
+#include "QF/sys.h"
+
+#include "qwaq.h"
+
+static builtin_t builtins[] = {
+	{0}
+};
+
+static void
+bi_shutdown (void)
+{
+}
+
+void
+BI_Init (progs_t *pr)
+{
+	PR_RegisterBuiltins (pr, builtins);
+
+	Sys_RegisterShutdown (bi_shutdown);
+}
diff --git a/tools/qwaq/test.r b/tools/qwaq/test.r
deleted file mode 100644
index 6e0afd6f2..000000000
--- a/tools/qwaq/test.r
+++ /dev/null
@@ -1,42 +0,0 @@
-@interface Foo : Object
-{
-	int x;
-}
--run;
-@end
-
-
-@implementation Foo
-
-+load
-{
-	print ("+load\n");
-	return self;
-}
-
-+alloc
-{
-	print ("+alloc\n");
-	return class_create_instance (self);
-}
-
--init
-{
-	print ("-init\n");
-	return [super init];
-}
-
-+ (void) initialize
-{
-	print ("+initialize\n");
-}
-
--run
-{
-	print ("Hello world\n");
-	printf ("%i %p [%s %s]\n", self, &self.x, [self description],
-			__PRETTY_FUNCTION__);
-	return self;
-}
-
-@end
diff --git a/tools/qwaq/types.r b/tools/qwaq/types.r
deleted file mode 100644
index 5cf874c61..000000000
--- a/tools/qwaq/types.r
+++ /dev/null
@@ -1,203 +0,0 @@
-#include "runtime.h"	//FIXME for PR_FindGlobal
-typedef enum {
-	ev_void,
-	ev_string,
-	ev_float,
-	ev_vector,
-	ev_entity,
-	ev_field,
-	ev_func,
-	ev_pointer,			// end of v6 types
-	ev_quat,
-	ev_integer,
-	ev_uinteger,
-	ev_short,			// value is embedded in the opcode
-	ev_double,
-
-	ev_invalid,			// invalid type. used for instruction checking
-	ev_type_count		// not a type, gives number of types
-} etype_t;
-
-typedef enum {
-    ty_none,				///< func/field/pointer or not used
-	ty_struct,
-	ty_union,
-	ty_enum,
-	ty_array,
-	ty_class,
-} ty_meta_e;
-
-
-typedef struct qfot_fldptr_s {
-	etype_t     type;
-	struct qfot_type_s *aux_type;
-} qfot_fldptr_t;
-
-typedef struct qfot_func_s {
-	etype_t     type;
-	struct qfot_type_s *return_type;
-	int         num_params;
-	struct qfot_type_s *param_types[1];
-} qfot_func_t;
-
-typedef struct qfot_var_s {
-	struct qfot_type_s *type;
-	string      name;
-	int         offset;				// value for enum, 0 for union
-} qfot_var_t;
-
-typedef struct qfot_struct_s {
-	string      tag;
-	int         num_fields;
-	qfot_var_t  fields[1];
-} qfot_struct_t;
-
-typedef struct qfot_array_s {
-	struct qfot_type_s *type;
-	int         base;
-	int         size;
-} qfot_array_t;
-
-typedef struct qfot_type_s {
-	ty_meta_e   meta;
-	int         size;
-	string      encoding;
-	union {
-		etype_t     type;
-		qfot_fldptr_t fldptr;
-		qfot_func_t func;
-		qfot_struct_t strct;
-		qfot_array_t array;
-		string      class;
-	}           t;
-} qfot_type_t;
-
-typedef struct qfot_type_encodings_s {
-	qfot_type_t *types;
-	int         size;
-} qfot_type_encodings_t;
-
-typedef struct xdef_s {
-	qfot_type_t *type;
-	void        *offset;
-} xdef_t;
-
-typedef struct pr_xdefs_s {
-	xdef_t     *xdefs;
-	int         num_xdefs;
-} pr_xdefs_t;
-
-qfot_type_t *
-next_type (qfot_type_t *type)
-{
-	int         size = type.size;
-	if (!size)
-		size = 4;
-	return (qfot_type_t *) ((int *) type + size);
-}
-
-string ty_meta_name[6] = {
-	"basic",
-	"struct",
-	"union",
-	"enum",
-	"array",
-	"class",
-};
-
-string pr_type_name[ev_type_count] = {
-	"void",
-	"string",
-	"float",
-	"vector",
-	"entity",
-	"field",
-	"function",
-	"pointer",
-	"quaternion",
-	"integer",
-	"uinteger",
-	"short",
-	"double"
-	"invalid",
-};
-
-void
-test_types (void)
-{
-	qfot_type_encodings_t *encodings;
-	qfot_type_t *type;
-	int         i;
-
-	encodings = PR_FindGlobal (".type_encodings");
-	if (!encodings) {
-		printf ("Can't find encodings\n");
-		return;
-	}
-	for (type = encodings.types;
-		 ((int *)type - (int *) encodings.types) < encodings.size;
-		type = next_type (type)) {
-		printf ("%p %-6s %-20s", type, ty_meta_name[type.meta],
-				type.encoding);
-		if (!type.size) {
-			printf ("\n");
-			continue;
-		}
-		switch (type.meta) {
-			case ty_none:
-				printf (" %-10s", pr_type_name[type.t.type]);
-				if (type.t.type == ev_func) {
-					int         count = type.t.func.num_params;
-					printf ("%p %d", type.t.func.return_type, count);
-					if (count < 0)
-						count = ~count;
-					for (i = 0; i < count; i++)
-						printf (" %p", type.t.func.param_types[i]);
-				} else if (type.t.type == ev_pointer) {
-					printf (" *%p", type.t.fldptr.aux_type);
-				} else if (type.t.type == ev_field) {
-					printf (" .%p", type.t.fldptr.aux_type);
-				} else {
-					printf (" %p", type.t.fldptr.aux_type);
-				}
-				printf ("\n");
-				break;
-			case ty_struct:
-			case ty_union:
-			case ty_enum:
-				printf (" %s\n", type.t.strct.tag);
-				for (i = 0; i < type.t.strct.num_fields; i++) {
-					printf ("        %p %4x %s\n",
-							type.t.strct.fields[i].type,
-							type.t.strct.fields[i].offset,
-							type.t.strct.fields[i].name);
-				}
-				break;
-			case ty_array:
-				printf (" %p %d %d\n", type.t.array.type,
-						type.t.array.base, type.t.array.size);
-				break;
-			case ty_class:
-				printf (" %s %p\n", type.t.class,
-						obj_lookup_class (type.t.class));
-				break;
-		}
-	 }
-}
-
-void
-test_xdefs (void)
-{
-	pr_xdefs_t *xdefs;
-	int         i;
-
-	xdefs = PR_FindGlobal (".xdefs");
-	if (!xdefs) {
-		printf ("Can't find xdefs\n");
-		return;
-	}
-	printf ("%p %i\n", xdefs.xdefs, xdefs.num_xdefs);
-	for (i = 0; i < xdefs.num_xdefs; i++) {
-		printf ("%p %p\n", xdefs.xdefs[i].type, xdefs.xdefs[i].offset);
-	}
-}

From edde4bad15c9f4910d4e2a333fed0a6d23b9a30b Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 27 Feb 2020 01:18:38 +0900
Subject: [PATCH 0536/1519] Create a basic hello world

And it has begun. It has some problems, but worse, it seems I broke
qfprogs and maybe pr_debug.c.
---
 tools/qwaq/Makefile.am   |  33 +++++++--
 tools/qwaq/main.c        |   6 +-
 tools/qwaq/qwaq-app.r    |  23 ++++++
 tools/qwaq/qwaq-curses.c | 153 ++++++++++++++++++++++++++++++++++++++-
 4 files changed, 204 insertions(+), 11 deletions(-)
 create mode 100644 tools/qwaq/qwaq-app.r

diff --git a/tools/qwaq/Makefile.am b/tools/qwaq/Makefile.am
index 104a7743d..b6e9b8345 100644
--- a/tools/qwaq/Makefile.am
+++ b/tools/qwaq/Makefile.am
@@ -1,15 +1,25 @@
+AUTOMAKE_OPTIONS= foreign
+
 QWAQ_LIBS=@QWAQ_LIBS@
 QWAQ_DEPS=@QWAQ_DEPS@
 QWAQ_INCS=@QWAQ_INCS@
 
 AM_CPPFLAGS=	-I$(top_srcdir)/include $(QWAQ_INCS) $(PTHREAD_CFLAGS)
 
+noinst_PROGRAMS=@QWAQ_TARGETS@ qwaq-app.dat$(EXEEXT)
+
 QFCC_DEP=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT)
 QFCC=$(top_builddir)/tools/qfcc/source/qfcc
-QCFLAGS=-qq -O -g -Werror --advanced --no-default-paths
 
-noinst_PROGRAMS=@QWAQ_TARGETS@
-noinst_DATA= #qwaq.dat
+QCFLAGS=-qq -O -g -Werror
+QCPPFLAGS=--no-default-paths -I$(top_srcdir)/ruamoko/include
+QCOMPILE=$(QFCC) $(QCFLAGS) $(QCPPFLAGS)
+
+SUFFIXES=.o .r
+.r.o:
+	$(QCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tqo -c -o $@ $<
+	sed -i -e '1s@:@: $(QFCC_DEP)@' $(DEPDIR)/$*.Tqo
+	$(am__mv) $(DEPDIR)/$*.Tqo $(DEPDIR)/$*.Qo
 
 qwaq_dat_src= \
 	$e
@@ -45,8 +55,21 @@ qwaq_x11_LDADD= $(qwaq_x11_libs) $(QWAQ_LIBS) \
 qwaq_x11_LDFLAGS=
 qwaq_x11_DEPENDENCIES= $(qwaq_x11_libs) $(QWAQ_DEPS)
 
-#qwaq.dat: $(qwaq_dat_src) $(QFCC_DEP) $(top_srcdir)/ruamoko/lib/Object.r
-#	$(QFCC) $(QCFLAGS) -I$(top_srcdir)/ruamoko/include
+r_depfiles_remade=
+
+qwaq_app_dat_SOURCES=qwaq-app.r
+qwaq_app_obj=$(qwaq_app_dat_SOURCES:.r=.o)
+qwaq_app_dep=$(addprefix ./$(DEPDIR)/,$(qwaq_app_obj:.o=.Qo))
+qwaq-app.dat$(EXEEXT): $(qwaq_app_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(qwaq_app_obj)
+include $(qwaq_app_dep) # am--include-marker
+r_depfiles_remade += $(qwaq_app_dep)
+
+$(r_depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade) $(r_depfiles_remade)
 
 EXTRA_PROGRAMS=qwaq-curses qwaq-x11
 EXTRA_DIST=$(qwaq_dat_src) qwaq.h
diff --git a/tools/qwaq/main.c b/tools/qwaq/main.c
index 357579290..3f88a428a 100644
--- a/tools/qwaq/main.c
+++ b/tools/qwaq/main.c
@@ -152,7 +152,7 @@ main (int argc, const char **argv)
 {
 	dfunction_t *dfunc;
 	func_t      main_func = 0;
-	const char *name = "qwaq.dat";
+	const char *name = "qwaq-app.dat";
 	string_t   *pr_argv;
 	int         pr_argc = 1, i;
 
@@ -162,8 +162,9 @@ main (int argc, const char **argv)
 	if (argc > 1)
 		name = argv[1];
 
-	if (!load_progs (name))
+	if (!load_progs (name)) {
 		Sys_Error ("couldn't load %s", name);
+	}
 
 	PR_PushFrame (&pr);
 	if (argc > 2)
@@ -185,5 +186,6 @@ main (int argc, const char **argv)
 	pr.pr_argc = 2;
 	PR_ExecuteProgram (&pr, main_func);
 	PR_PopFrame (&pr);
+	Sys_Shutdown ();
 	return R_INT (&pr);
 }
diff --git a/tools/qwaq/qwaq-app.r b/tools/qwaq/qwaq-app.r
new file mode 100644
index 000000000..6473ef6a8
--- /dev/null
+++ b/tools/qwaq/qwaq-app.r
@@ -0,0 +1,23 @@
+typedef struct window_s *window_t;
+
+void initialize (void) = #0;
+window_t create_window (int xpos, int ypos, int xlen, int ylen) = #0;
+void destroy_window (window_t win) = #0;
+void wprintf (window_t win, string fmt, ...) = #0;
+int wgetch (window_t win) = #0;
+
+int main (int argc, string *argv)
+{
+	int ch;
+
+	initialize ();
+	window_t win = create_window (20, 5, 50, 10);
+	wprintf (win, "Hi there!\n");
+	do {
+		ch = wgetch (win);
+		if (ch) {
+			wprintf (win, "%d\n", ch);
+		}
+	} while (ch != 27);
+	return 0;
+}
diff --git a/tools/qwaq/qwaq-curses.c b/tools/qwaq/qwaq-curses.c
index 71439d0a9..a3f055ae8 100644
--- a/tools/qwaq/qwaq-curses.c
+++ b/tools/qwaq/qwaq-curses.c
@@ -31,24 +31,169 @@
 # include "config.h"
 #endif
 
+#include <curses.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "QF/dstring.h"
 #include "QF/progs.h"
 #include "QF/sys.h"
 
 #include "qwaq.h"
 
-static builtin_t builtins[] = {
-	{0}
-};
+#define always_inline inline __attribute__((__always_inline__))
 
+typedef struct window_s {
+	WINDOW     *win;
+} window_t;
+
+typedef struct qwaq_resources_s {
+	progs_t    *pr;
+	int         initialized;
+	dstring_t  *print_buffer;
+	PR_RESMAP (window_t) window_map;
+} qwaq_resources_t;
+
+static window_t *
+window_new (qwaq_resources_t *res)
+{
+	PR_RESNEW (window_t, res->window_map);
+}
+
+static void
+window_free (qwaq_resources_t *res, window_t *win)
+{
+	PR_RESFREE (window_t, res->window_map, win);
+}
+
+static void
+window_reset (qwaq_resources_t *res)
+{
+	PR_RESRESET (window_t, res->window_map);
+}
+
+static inline window_t *
+window_get (qwaq_resources_t *res, unsigned index)
+{
+	PR_RESGET(res->window_map, index);
+}
+
+static inline int
+window_index (qwaq_resources_t *res, window_t *win)
+{
+	PR_RESINDEX (res->window_map, win);
+}
+
+static always_inline window_t *
+get_window (qwaq_resources_t *res, const char *name, int handle)
+{
+	window_t   *window = window_get (res, handle);
+
+	if (!window || !window->win) {
+		PR_RunError (res->pr, "invalid window passed to %s", name + 3);
+	}
+	return window;
+}
+
+static int need_endwin;
 static void
 bi_shutdown (void)
 {
+	if (need_endwin) {
+		endwin ();
+	}
 }
 
+static void
+bi_initialize (progs_t *pr)
+{
+	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
+
+	initscr ();
+	need_endwin = 1;
+	res->initialized = 1;
+	raw ();
+	keypad (stdscr, TRUE);
+	noecho ();
+	nonl ();
+}
+
+static void
+bi_create_window (progs_t *pr)
+{
+	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
+	int         xpos = P_INT (pr, 0);
+	int         ypos = P_INT (pr, 1);
+	int         xlen = P_INT (pr, 2);
+	int         ylen = P_INT (pr, 3);
+	window_t   *window = window_new (res);
+	window->win = newwin (ylen, xlen, ypos, xpos);
+	keypad (window->win, TRUE);
+	R_INT (pr) = window_index (res, window);
+}
+
+static void
+bi_destroy_window (progs_t *pr)
+{
+	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
+	window_t   *window = get_window (res, __FUNCTION__, P_INT (pr, 0));
+	delwin (window->win);
+	window->win = 0;
+	window_free (res, window);
+}
+
+static void
+bi_wprintf (progs_t *pr)
+{
+	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
+	window_t   *window = get_window (res, __FUNCTION__, P_INT (pr, 0));
+	const char *fmt = P_GSTRING (pr, 1);
+	int         count = pr->pr_argc - 2;
+	pr_type_t **args = pr->pr_params + 2;
+
+	PR_Sprintf (pr, res->print_buffer, "bi_wprintf", fmt, count, args);
+	waddstr (window->win, res->print_buffer->str);
+	wrefresh (window->win);
+}
+
+static void
+bi_wgetch (progs_t *pr)
+{
+	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
+	window_t   *window = get_window (res, __FUNCTION__, P_INT (pr, 0));
+
+	R_INT (pr) = wgetch (window->win);
+}
+
+static void
+bi_qwaq_clear (progs_t *pr, void *data)
+{
+	__auto_type res = (qwaq_resources_t *) data;
+
+	if (res->initialized) {
+		endwin ();
+	}
+	need_endwin = 0;
+	window_reset (res);
+}
+
+static builtin_t builtins[] = {
+	{"initialize",		bi_initialize,		-1},
+	{"create_window",	bi_create_window,	-1},
+	{"destroy_window",	bi_destroy_window,	-1},
+	{"wprintf",			bi_wprintf,			-1},
+	{"wgetch",			bi_wgetch,			-1},
+	{0}
+};
+
 void
 BI_Init (progs_t *pr)
 {
-	PR_RegisterBuiltins (pr, builtins);
+	qwaq_resources_t *res = calloc (sizeof (*res), 1);
+	res->pr = pr;
+	res->print_buffer = dstring_newstr ();
 
+	PR_Resources_Register (pr, "qwaq", res, bi_qwaq_clear);
+	PR_RegisterBuiltins (pr, builtins);
 	Sys_RegisterShutdown (bi_shutdown);
 }

From c9186c82961af767afc83a90d6e223c5cba2951c Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 27 Feb 2020 01:25:41 +0900
Subject: [PATCH 0537/1519] Clear the statement line buffer

The problem with moving to a cached buffer is it needs to be cleared.
Fixes the weird output of qfprogs and tracing (not missing local defs,
though).
---
 libs/gamecode/pr_debug.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libs/gamecode/pr_debug.c b/libs/gamecode/pr_debug.c
index 3ae9a972e..e7bf90a92 100644
--- a/libs/gamecode/pr_debug.c
+++ b/libs/gamecode/pr_debug.c
@@ -1243,6 +1243,8 @@ PR_PrintStatement (progs_t *pr, dstatement_t *s, int contents)
 	pr_auxfunction_t *aux_func = 0;
 	pr_debug_data_t data;
 
+	dstring_clearstr (res->line);
+
 	data.pr = pr;
 	data.dstr = res->dstr;
 

From 789f263855b5b94d27295b7552fcbaf580b6a99d Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 27 Feb 2020 02:07:53 +0900
Subject: [PATCH 0538/1519] Use get_strref() correctly

I had forgotten that it works only for dynamic strings.
---
 libs/gamecode/pr_strings.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libs/gamecode/pr_strings.c b/libs/gamecode/pr_strings.c
index ff5e1ffab..4d393776e 100644
--- a/libs/gamecode/pr_strings.c
+++ b/libs/gamecode/pr_strings.c
@@ -348,6 +348,9 @@ get_string (progs_t *pr, string_t num)
 VISIBLE qboolean
 PR_StringValid (progs_t *pr, string_t num)
 {
+	if (num >= 0) {
+		return num < pr->pr_stringsize;
+	}
 	return get_strref (pr->pr_string_resources, num) != 0;
 }
 

From e8c357393f369c853e7fac3932fd825254b57c5d Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 27 Feb 2020 02:11:54 +0900
Subject: [PATCH 0539/1519] [qwaq] Clear qwaq's print buffer

Didn't realized PR_Sprintf appended. Or, more likely, I had forgotten
because I imagine Deek and I discussed it at the time.
---
 tools/qwaq/qwaq-curses.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/qwaq/qwaq-curses.c b/tools/qwaq/qwaq-curses.c
index a3f055ae8..3932298d8 100644
--- a/tools/qwaq/qwaq-curses.c
+++ b/tools/qwaq/qwaq-curses.c
@@ -151,6 +151,7 @@ bi_wprintf (progs_t *pr)
 	int         count = pr->pr_argc - 2;
 	pr_type_t **args = pr->pr_params + 2;
 
+	dstring_clearstr (res->print_buffer);
 	PR_Sprintf (pr, res->print_buffer, "bi_wprintf", fmt, count, args);
 	waddstr (window->win, res->print_buffer->str);
 	wrefresh (window->win);

From dbbb8a1396de8e948ee30bb2d54fadd1890381b2 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 27 Feb 2020 17:43:39 +0900
Subject: [PATCH 0540/1519] [qfcc] Fix syntax error for id as a field name

event.e.mouse.id produced a syntax error, which is contrary to
Objective-C.
---
 tools/qfcc/source/qc-parse.y | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/tools/qfcc/source/qc-parse.y b/tools/qfcc/source/qc-parse.y
index e64bb748e..8c417a8f5 100644
--- a/tools/qfcc/source/qc-parse.y
+++ b/tools/qfcc/source/qc-parse.y
@@ -184,7 +184,7 @@ int yylex (void);
 %type	<expr>		optional_state_expr texpr vector_expr
 %type	<expr>		statement statements compound_statement
 %type	<expr>		else label break_label continue_label
-%type	<expr>		unary_expr cast_expr opt_arg_list arg_list
+%type	<expr>		unary_expr ident_expr cast_expr opt_arg_list arg_list
 %type	<expr>		init_var_decl_list init_var_decl
 %type	<switch_block> switch_block
 %type	<symbol>	identifier
@@ -1288,6 +1288,7 @@ unary_expr
 	| '(' expr ')'				{ $$ = $2; $$->paren = 1; }
 	| unary_expr '(' opt_arg_list ')' { $$ = function_expr ($1, $3); }
 	| unary_expr '[' expr ']'		{ $$ = array_expr ($1, $3); }
+	| unary_expr '.' ident_expr		{ $$ = field_expr ($1, $3); }
 	| unary_expr '.' unary_expr		{ $$ = field_expr ($1, $3); }
 	| INCOP unary_expr				{ $$ = incop_expr ($1, $2, 0); }
 	| unary_expr INCOP				{ $$ = incop_expr ($2, $1, 1); }
@@ -1306,6 +1307,12 @@ unary_expr
 	| obj_expr					{ $$ = $1; }
 	;
 
+ident_expr
+	: OBJECT					{ $$ = new_symbol_expr ($1); }
+	| CLASS_NAME				{ $$ = new_symbol_expr ($1); }
+	| TYPE_NAME					{ $$ = new_symbol_expr ($1); }
+	;
+
 vector_expr
 	: '[' expr ',' arg_list ']'
 		{

From 7c9072aebf84e6eaea4c78978ee6f1210340b004 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 27 Feb 2020 17:50:11 +0900
Subject: [PATCH 0541/1519] [qfcc] Create struct fields for "type typename"

Such declarations were being lost, thus in the following, the id field
never got added:
typedef struct qwaq_mevent_s {
    int         id;
    int         x, y, z;
    int         buttons;
} qwaq_mevent_t;
---
 tools/qfcc/include/type.h    |  1 +
 tools/qfcc/source/qc-parse.y | 28 ++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/tools/qfcc/include/type.h b/tools/qfcc/include/type.h
index c8913933e..46d524574 100644
--- a/tools/qfcc/include/type.h
+++ b/tools/qfcc/include/type.h
@@ -81,6 +81,7 @@ typedef struct type_s {
 typedef struct {
 	type_t     *type;
 	struct param_s *params;
+	struct symbol_s *sym;	///< for dealing with "int id" etc
 	storage_class_t storage;
 	unsigned    multi_type:1;
 	unsigned    multi_store:1;
diff --git a/tools/qfcc/source/qc-parse.y b/tools/qfcc/source/qc-parse.y
index 8c417a8f5..dd33aa07c 100644
--- a/tools/qfcc/source/qc-parse.y
+++ b/tools/qfcc/source/qc-parse.y
@@ -484,6 +484,15 @@ specifiers
 type
 	: type_specifier
 	| type type_specifier
+		{
+			// deal with eg "int id"
+			$1.sym = $2.sym;
+
+			if (!$1.sym) {
+				error (0, "two or more data types in declaration specifiers");
+			}
+			$$ = $1;
+		}
 	;
 
 type_specifier_or_storage_class
@@ -501,6 +510,7 @@ type_specifier
 	| TYPE_NAME
 		{
 			$$ = make_spec ($1->type, 0, 0, 0);
+			$$.sym = $1;
 		}
 	| OBJECT protocolrefs
 		{
@@ -512,6 +522,7 @@ type_specifier
 			} else {
 				$$ = make_spec (&type_id, 0, 0, 0);
 			}
+			$$.sym = $1;
 		}
 	| CLASS_NAME protocolrefs
 		{
@@ -523,6 +534,7 @@ type_specifier
 			} else {
 				$$ = make_spec ($1->type, 0, 0, 0);
 			}
+			$$.sym = $1;
 		}
 	// NOTE: fields don't parse the way they should. This is not a problem
 	// for basic types, but functions need special treatment
@@ -656,6 +668,22 @@ struct_def_list
 struct_def
 	: type struct_decl_list
 	| type
+		{
+			if ($1.sym) {
+				// a type name (id, typedef, etc) was used as a field name.
+				// this is allowed in C
+				print_type ($1.type);
+				printf ("%s\n", $1.sym->name);
+				$1.sym = new_symbol ($1.sym->name);
+				$1.sym->type = $1.type;
+				$1.sym->sy_type = sy_var;
+				symtab_addsymbol (current_symtab, $1.sym);
+			} else {
+				// bare type
+				warning (0, "declaration does not declare anything");
+			}
+			$$ = $1;
+		}
 	;
 
 struct_decl_list

From b4aebc120ee5f1355de9545b155fc43fedbea426 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 27 Feb 2020 20:30:07 +0900
Subject: [PATCH 0542/1519] [qfcc] Treat { } as nil for initializing compound
 types

---
 tools/qfcc/include/expr.h         |  2 +-
 tools/qfcc/source/def.c           | 67 ++++++++++++++++++++++++++++---
 tools/qfcc/source/expr.c          |  3 +-
 tools/qfcc/source/qc-parse.y      |  7 ++++
 tools/qfcc/test/Makefile.am       | 10 +++++
 tools/qfcc/test/struct-nil-init.r | 12 ++++++
 6 files changed, 93 insertions(+), 8 deletions(-)
 create mode 100644 tools/qfcc/test/struct-nil-init.r

diff --git a/tools/qfcc/include/expr.h b/tools/qfcc/include/expr.h
index 0a030e75a..ac2646dfe 100644
--- a/tools/qfcc/include/expr.h
+++ b/tools/qfcc/include/expr.h
@@ -614,7 +614,7 @@ void convert_int (expr_t *e);
 void convert_short (expr_t *e);
 void convert_short_int (expr_t *e);
 void convert_double (expr_t *e);
-void convert_nil (expr_t *e, struct type_s *t);
+expr_t *convert_nil (expr_t *e, struct type_s *t);
 
 expr_t *test_expr (expr_t *e);
 void backpatch (ex_list_t *list, expr_t *label);
diff --git a/tools/qfcc/source/def.c b/tools/qfcc/source/def.c
index ed5e69964..049740563 100644
--- a/tools/qfcc/source/def.c
+++ b/tools/qfcc/source/def.c
@@ -287,6 +287,21 @@ def_to_ddef (def_t *def, ddef_t *ddef, int aux)
 	ddef->s_name = ReuseString (def->name);
 }
 
+static int
+zero_memory (expr_t *local_expr, def_t *def, type_t *zero_type,
+			 int init_size, int init_offset)
+{
+	int         zero_size = type_size (zero_type);
+	expr_t     *zero = convert_nil (new_nil_expr (), zero_type);
+	expr_t     *dst;
+
+	for (; init_offset < init_size + 1 - zero_size; init_offset += zero_size) {
+		dst = new_pointer_expr (init_offset, zero_type, def);
+		append_expr (local_expr, assign_expr (unary_expr ('.', dst), zero));
+	}
+	return init_offset;
+}
+
 static void
 init_elements (struct def_s *def, expr_t *eles)
 {
@@ -298,6 +313,39 @@ init_elements (struct def_s *def, expr_t *eles)
 	base_offset = def->offset;
 	if (def->local && local_expr)
 		base_offset = 0;
+	if (eles->type == ex_nil) {
+		if (def->local && local_expr) {
+			// memset to 0
+			int         init_size = type_size (def->type);
+			int         init_offset = 0;
+
+			if (options.code.progsversion != PROG_ID_VERSION) {
+				init_offset = zero_memory (local_expr, def, &type_zero,
+										   init_size, init_offset);
+			}
+			// probably won't happen any time soon, but who knows...
+			if (options.code.progsversion != PROG_ID_VERSION
+				&& init_size - init_offset >= type_size (&type_quaternion)) {
+				init_offset = zero_memory (local_expr, def, &type_quaternion,
+										   init_size, init_offset);
+			}
+			if (init_size - init_offset >= type_size (&type_vector)) {
+				init_offset = zero_memory (local_expr, def, &type_vector,
+										   init_size, init_offset);
+			}
+			if (options.code.progsversion != PROG_ID_VERSION
+				&& init_size - init_offset >= type_size (&type_double)) {
+				init_offset = zero_memory (local_expr, def, &type_double,
+										   init_size, init_offset);
+			}
+			if (init_size - init_offset >= type_size (type_default)) {
+				zero_memory (local_expr, def, type_default,
+							 init_size, init_offset);
+			}
+		}
+		// it's a global, so already initialized to 0
+		return;
+	}
 	if (is_array (def->type)) {
 		type_t     *array_type = def->type->t.array.type;
 		int         array_size = def->type->t.array.size;
@@ -334,8 +382,11 @@ init_elements (struct def_s *def, expr_t *eles)
 	}
 	for (count = 0, e = eles->e.block.head; e; count++, e = e->next) {
 		convert_name (e);
-		if (e->type == ex_nil && count < num_elements)
+		if (e->type == ex_nil && count < num_elements
+			&& !(is_array (elements[count].type)
+				 || is_struct (elements[count].type))) {
 			convert_nil (e, elements[count].type);
+		}
 		if (e->type == ex_error) {
 			free (elements);
 			return;
@@ -349,7 +400,8 @@ init_elements (struct def_s *def, expr_t *eles)
 	for (i = 0, e = eles->e.block.head; i < count; i++, e = e->next) {
 		g = D_POINTER (pr_type_t, &elements[i]);
 		c = constant_expr (e);
-		if (c->type == ex_block) {
+		// nil will not survive as nil to this point if array or struct
+		if (c->type == ex_block || c->type == ex_nil) {
 			if (!is_array (elements[i].type)
 				&& !is_struct (elements[i].type)) {
 				error (e, "type mismatch in initializer");
@@ -567,15 +619,18 @@ initialize_def (symbol_t *sym, expr_t *init, defspace_t *space,
 	convert_name (init);
 	if (init->type == ex_error)
 		return;
-	if (init->type == ex_nil)
-		convert_nil (init, sym->type);
 	if ((is_array (sym->type) || is_struct (sym->type)
 		 || sym->type == &type_vector || sym->type == &type_quaternion)
-		&& init->type == ex_block && !init->e.block.result) {
+		&& ((init->type == ex_block && !init->e.block.result)
+			|| init->type == ex_nil)) {
 		init_elements (sym->s.def, init);
 		sym->s.def->initialized = 1;
 	} else {
-		type_t     *init_type = get_type (init);
+		type_t     *init_type;
+		if (init->type == ex_nil) {
+			convert_nil (init, sym->type);
+		}
+		init_type = get_type (init);
 		if (!type_assignable (sym->type, init_type)) {
 			error (init, "type mismatch in initializer");
 			return;
diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index c23460b06..7d5baddb9 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -1325,11 +1325,12 @@ convert_double (expr_t *e)
 	e->e.value = new_float_val (float_val);
 }
 
-void
+expr_t *
 convert_nil (expr_t *e, type_t *t)
 {
 	e->type = ex_value;
 	e->e.value = new_nil_val (t);
+	return e;
 }
 
 int
diff --git a/tools/qfcc/source/qc-parse.y b/tools/qfcc/source/qc-parse.y
index dd33aa07c..07c12692e 100644
--- a/tools/qfcc/source/qc-parse.y
+++ b/tools/qfcc/source/qc-parse.y
@@ -1065,6 +1065,13 @@ opt_initializer
 var_initializer
 	: '=' expr									{ $$ = $2; }
 	| '=' '{' element_list optional_comma '}'	{ $$ = $3; }
+	| '=' '{' '}'
+		{
+			if (is_scalar ($<spec>-1.type)) {
+				error (0, "empty scalar initializer");
+			}
+			$$ = new_nil_expr ();
+		}
 	;
 
 optional_state_expr
diff --git a/tools/qfcc/test/Makefile.am b/tools/qfcc/test/Makefile.am
index e715b38ed..c53dd7cbf 100644
--- a/tools/qfcc/test/Makefile.am
+++ b/tools/qfcc/test/Makefile.am
@@ -48,6 +48,7 @@ test_progs_dat=\
 	return-ivar.dat \
 	sendv.dat \
 	state.dat \
+	struct-nil-init.dat \
 	structarray.dat \
 	structlive.dat \
 	structptr.dat \
@@ -301,6 +302,15 @@ state.run: Makefile build-run
 include ./$(DEPDIR)/state.Qo # am--include-marker
 r_depfiles_remade += ./$(DEPDIR)/state.Qo
 
+struct_nil_init_dat_SOURCES=struct-nil-init.r
+struct_nil_init_obj=$(struct_nil_init_dat_SOURCES:.r=.qfo)
+struct-nil-init.dat$(EXEEXT): $(struct_nil_init_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(struct_nil_init_obj)
+struct-nil-init.run: Makefile build-run
+	@$(srcdir)/build-run $@
+include ./$(DEPDIR)/struct-nil-init.Qo # am--include-marker
+r_depfiles_remade += ./$(DEPDIR)/struct-nil-init.Qo
+
 structarray_dat_SOURCES=structarray.r
 structarray_obj=$(structarray_dat_SOURCES:.r=.qfo)
 structarray.dat$(EXEEXT): $(structarray_obj) $(QFCC_DEP)
diff --git a/tools/qfcc/test/struct-nil-init.r b/tools/qfcc/test/struct-nil-init.r
new file mode 100644
index 000000000..065a43b34
--- /dev/null
+++ b/tools/qfcc/test/struct-nil-init.r
@@ -0,0 +1,12 @@
+#pragma bug die
+
+struct foo {
+	quaternion x;
+	double y;
+};
+
+int main()
+{
+	struct foo bar = { };
+	return bar.y;	// to survive and prevail
+}

From 08bf8a04e4f53750b8dfb221c8c578b8ae98611a Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 27 Feb 2020 21:01:09 +0900
Subject: [PATCH 0543/1519] [qwaq] Implement an event queue

It seems to have an issue with a bogus clearing of the screen, but the
basics seem to be working.
---
 tools/qwaq/event.h       | 25 ++++++++++++
 tools/qwaq/qwaq-app.r    | 25 ++++++++++--
 tools/qwaq/qwaq-curses.c | 82 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 128 insertions(+), 4 deletions(-)
 create mode 100644 tools/qwaq/event.h

diff --git a/tools/qwaq/event.h b/tools/qwaq/event.h
new file mode 100644
index 000000000..a3591fdca
--- /dev/null
+++ b/tools/qwaq/event.h
@@ -0,0 +1,25 @@
+#ifndef __qwaq_event_h
+#define __qwaq_event_h
+
+typedef enum {
+	qe_idle,
+	qe_key,
+	qe_mouse,
+} qwaq_etype;
+
+// right now, this is just a copy of ncurses MEVENT, but all int
+typedef struct qwaq_mevent_s {
+	int         id;			// XXX does it matter?
+	int         x, y, z;	// z? what?
+	int         buttons;
+} qwaq_mevent_t;
+
+typedef struct qwaq_event_s {
+	qwaq_etype  event_type;
+	union {
+		int         key;
+		qwaq_mevent_t mouse;
+	} e;
+} qwaq_event_t;
+
+#endif//__qwaq_event_h
diff --git a/tools/qwaq/qwaq-app.r b/tools/qwaq/qwaq-app.r
index 6473ef6a8..05f07bd68 100644
--- a/tools/qwaq/qwaq-app.r
+++ b/tools/qwaq/qwaq-app.r
@@ -1,3 +1,5 @@
+#include "event.h"
+
 typedef struct window_s *window_t;
 
 void initialize (void) = #0;
@@ -6,17 +8,32 @@ void destroy_window (window_t win) = #0;
 void wprintf (window_t win, string fmt, ...) = #0;
 int wgetch (window_t win) = #0;
 
+void process_input (void) = #0;
+int get_event (qwaq_event_t *event) = #0;
+
 int main (int argc, string *argv)
 {
-	int ch;
+	int         ch = 0;
+	qwaq_event_t event = { };
 
 	initialize ();
 	window_t win = create_window (20, 5, 50, 10);
 	wprintf (win, "Hi there!\n");
 	do {
-		ch = wgetch (win);
-		if (ch) {
-			wprintf (win, "%d\n", ch);
+		process_input ();
+
+		if (get_event (&event)) {
+			if (event.event_type == qe_key) {
+				ch = event.e.key;
+				wprintf (win, "key: %d\n", ch);
+			} else if (event.event_type == qe_mouse) {
+				wprintf (win, "mouse: %d %d %d %d %d\n",
+						 event.e.mouse.id,
+						 event.e.mouse.x,
+						 event.e.mouse.y,
+						 event.e.mouse.z,
+						 event.e.mouse.buttons);
+			}
 		}
 	} while (ch != 27);
 	return 0;
diff --git a/tools/qwaq/qwaq-curses.c b/tools/qwaq/qwaq-curses.c
index 3932298d8..a281c3327 100644
--- a/tools/qwaq/qwaq-curses.c
+++ b/tools/qwaq/qwaq-curses.c
@@ -40,8 +40,11 @@
 #include "QF/sys.h"
 
 #include "qwaq.h"
+#include "event.h"
 
 #define always_inline inline __attribute__((__always_inline__))
+#define QUEUE_SIZE 16		// must be power of 2 greater than 1
+#define QUEUE_MASK (QUEUE_SIZE - 1)
 
 typedef struct window_s {
 	WINDOW     *win;
@@ -52,6 +55,9 @@ typedef struct qwaq_resources_s {
 	int         initialized;
 	dstring_t  *print_buffer;
 	PR_RESMAP (window_t) window_map;
+	qwaq_event_t event_queue[QUEUE_SIZE];
+	unsigned    queue_head;
+	unsigned    queue_tail;
 } qwaq_resources_t;
 
 static window_t *
@@ -116,6 +122,8 @@ bi_initialize (progs_t *pr)
 	keypad (stdscr, TRUE);
 	noecho ();
 	nonl ();
+	nodelay (stdscr, TRUE);
+	mousemask(ALL_MOUSE_EVENTS, NULL);
 }
 
 static void
@@ -166,6 +174,78 @@ bi_wgetch (progs_t *pr)
 	R_INT (pr) = wgetch (window->win);
 }
 
+static void
+add_event (qwaq_resources_t *res, qwaq_event_t *event)
+{
+	if (((res->queue_head - res->queue_tail) & QUEUE_MASK) != QUEUE_MASK) {
+		res->event_queue[res->queue_head] = *event;
+		res->queue_head = (res->queue_head + 1) & QUEUE_MASK;
+	}
+}
+
+static int
+get_event (qwaq_resources_t *res, qwaq_event_t *event)
+{
+	if (res->queue_head != res->queue_tail) {
+		if (event) {
+			*event = res->event_queue[res->queue_tail];
+			res->queue_tail = (res->queue_tail + 1) & QUEUE_MASK;
+		}
+		return 1;
+	}
+	return 0;
+}
+
+static void
+mouse_event (qwaq_resources_t *res, MEVENT *mevent)
+{
+	qwaq_event_t event = {};
+	event.event_type = qe_mouse;
+	event.e.mouse.id = mevent->id;
+	event.e.mouse.x = mevent->x;
+	event.e.mouse.y = mevent->y;
+	event.e.mouse.z = mevent->z;
+	event.e.mouse.buttons = mevent->bstate;
+	add_event (res, &event);
+}
+
+static void
+key_event (qwaq_resources_t *res, int key)
+{
+	qwaq_event_t event = {};
+	event.event_type = qe_key;
+	event.e.key = key;
+	add_event (res, &event);
+}
+
+static void
+bi_process_input (progs_t *pr)
+{
+	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
+	if (Sys_CheckInput (1, -1)) {
+		int         ch;
+		while ((ch = getch ()) != ERR && ch) {
+			fflush (stderr);
+			if (ch == KEY_MOUSE) {
+				MEVENT    mevent;
+				getmouse (&mevent);
+				mouse_event (res, &mevent);
+			} else {
+				key_event (res, ch);
+			}
+		}
+	}
+}
+
+static void
+bi_get_event (progs_t *pr)
+{
+	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
+	qwaq_event_t *event = &G_STRUCT (pr, qwaq_event_t, P_INT (pr, 0));
+
+	R_INT (pr) = get_event (res, event);
+}
+
 static void
 bi_qwaq_clear (progs_t *pr, void *data)
 {
@@ -184,6 +264,8 @@ static builtin_t builtins[] = {
 	{"destroy_window",	bi_destroy_window,	-1},
 	{"wprintf",			bi_wprintf,			-1},
 	{"wgetch",			bi_wgetch,			-1},
+	{"process_input",	bi_process_input,	-1},
+	{"get_event",		bi_get_event,		-1},
 	{0}
 };
 

From a3ed5926b955fa016180c039241c230a62f303b5 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 27 Feb 2020 21:08:12 +0900
Subject: [PATCH 0544/1519] [qwaq] Remove unnecessary fields from mouse events

id and z seem to always be 0.

Ironically, it turns out that the work needed for "int id" and "large"
struct nil init wasn't strictly necessary to get to this point, but
without having done that work, I wouldn't know :)
---
 tools/qwaq/event.h       | 3 +--
 tools/qwaq/qwaq-app.r    | 4 +---
 tools/qwaq/qwaq-curses.c | 2 --
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/tools/qwaq/event.h b/tools/qwaq/event.h
index a3591fdca..933c61569 100644
--- a/tools/qwaq/event.h
+++ b/tools/qwaq/event.h
@@ -9,8 +9,7 @@ typedef enum {
 
 // right now, this is just a copy of ncurses MEVENT, but all int
 typedef struct qwaq_mevent_s {
-	int         id;			// XXX does it matter?
-	int         x, y, z;	// z? what?
+	int         x, y;
 	int         buttons;
 } qwaq_mevent_t;
 
diff --git a/tools/qwaq/qwaq-app.r b/tools/qwaq/qwaq-app.r
index 05f07bd68..1bc2dcbe9 100644
--- a/tools/qwaq/qwaq-app.r
+++ b/tools/qwaq/qwaq-app.r
@@ -27,11 +27,9 @@ int main (int argc, string *argv)
 				ch = event.e.key;
 				wprintf (win, "key: %d\n", ch);
 			} else if (event.event_type == qe_mouse) {
-				wprintf (win, "mouse: %d %d %d %d %d\n",
-						 event.e.mouse.id,
+				wprintf (win, "mouse: %d %d %d\n",
 						 event.e.mouse.x,
 						 event.e.mouse.y,
-						 event.e.mouse.z,
 						 event.e.mouse.buttons);
 			}
 		}
diff --git a/tools/qwaq/qwaq-curses.c b/tools/qwaq/qwaq-curses.c
index a281c3327..ccc4b73b1 100644
--- a/tools/qwaq/qwaq-curses.c
+++ b/tools/qwaq/qwaq-curses.c
@@ -201,10 +201,8 @@ mouse_event (qwaq_resources_t *res, MEVENT *mevent)
 {
 	qwaq_event_t event = {};
 	event.event_type = qe_mouse;
-	event.e.mouse.id = mevent->id;
 	event.e.mouse.x = mevent->x;
 	event.e.mouse.y = mevent->y;
-	event.e.mouse.z = mevent->z;
 	event.e.mouse.buttons = mevent->bstate;
 	add_event (res, &event);
 }

From dd25bf5dfec0949c34f9e4eabf6275ec963dbebd Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 27 Feb 2020 21:22:10 +0900
Subject: [PATCH 0545/1519] [qwaq] Read mouse movements

Many thanks to https://gist.github.com/sylt/93d3f7b77e7f3a881603 for the
necessary escape sequence to get xterm reporting mouse movement events.
---
 tools/qwaq/qwaq-app.r    | 13 +++++++------
 tools/qwaq/qwaq-curses.c | 23 ++++++++++++++++++++++-
 2 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/tools/qwaq/qwaq-app.r b/tools/qwaq/qwaq-app.r
index 1bc2dcbe9..3cb5f85a4 100644
--- a/tools/qwaq/qwaq-app.r
+++ b/tools/qwaq/qwaq-app.r
@@ -6,6 +6,7 @@ void initialize (void) = #0;
 window_t create_window (int xpos, int ypos, int xlen, int ylen) = #0;
 void destroy_window (window_t win) = #0;
 void wprintf (window_t win, string fmt, ...) = #0;
+void mvwprintf (window_t win, int x, int y, string fmt, ...) = #0;
 int wgetch (window_t win) = #0;
 
 void process_input (void) = #0;
@@ -25,14 +26,14 @@ int main (int argc, string *argv)
 		if (get_event (&event)) {
 			if (event.event_type == qe_key) {
 				ch = event.e.key;
-				wprintf (win, "key: %d\n", ch);
+				mvwprintf (win, 1, 1, "key: %d\n", ch);
 			} else if (event.event_type == qe_mouse) {
-				wprintf (win, "mouse: %d %d %d\n",
-						 event.e.mouse.x,
-						 event.e.mouse.y,
-						 event.e.mouse.buttons);
+				mvwprintf (win, 1, 2, "mouse: %d %d %d\n",
+						   event.e.mouse.x,
+						   event.e.mouse.y,
+						   event.e.mouse.buttons);
 			}
 		}
-	} while (ch != 27);
+	} while (ch != 'q' && ch != 'Q');
 	return 0;
 }
diff --git a/tools/qwaq/qwaq-curses.c b/tools/qwaq/qwaq-curses.c
index ccc4b73b1..eb3724020 100644
--- a/tools/qwaq/qwaq-curses.c
+++ b/tools/qwaq/qwaq-curses.c
@@ -34,6 +34,7 @@
 #include <curses.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 
 #include "QF/dstring.h"
 #include "QF/progs.h"
@@ -45,6 +46,7 @@
 #define always_inline inline __attribute__((__always_inline__))
 #define QUEUE_SIZE 16		// must be power of 2 greater than 1
 #define QUEUE_MASK (QUEUE_SIZE - 1)
+#define MOUSE_MOVES "\033[?1003h"	// Make the terminal report mouse movements
 
 typedef struct window_s {
 	WINDOW     *win;
@@ -123,7 +125,8 @@ bi_initialize (progs_t *pr)
 	noecho ();
 	nonl ();
 	nodelay (stdscr, TRUE);
-	mousemask(ALL_MOUSE_EVENTS, NULL);
+	mousemask(ALL_MOUSE_EVENTS | REPORT_MOUSE_POSITION, NULL);
+	write(1, MOUSE_MOVES, sizeof (MOUSE_MOVES) - 1);
 }
 
 static void
@@ -165,6 +168,23 @@ bi_wprintf (progs_t *pr)
 	wrefresh (window->win);
 }
 
+static void
+bi_mvwprintf (progs_t *pr)
+{
+	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
+	window_t   *window = get_window (res, __FUNCTION__, P_INT (pr, 0));
+	int         x = P_INT (pr, 1);
+	int         y = P_INT (pr, 2);
+	const char *fmt = P_GSTRING (pr, 3);
+	int         count = pr->pr_argc - 4;
+	pr_type_t **args = pr->pr_params + 4;
+
+	dstring_clearstr (res->print_buffer);
+	PR_Sprintf (pr, res->print_buffer, "bi_wprintf", fmt, count, args);
+	mvwaddstr (window->win, y, x, res->print_buffer->str);
+	wrefresh (window->win);
+}
+
 static void
 bi_wgetch (progs_t *pr)
 {
@@ -261,6 +281,7 @@ static builtin_t builtins[] = {
 	{"create_window",	bi_create_window,	-1},
 	{"destroy_window",	bi_destroy_window,	-1},
 	{"wprintf",			bi_wprintf,			-1},
+	{"mvwprintf",		bi_mvwprintf,		-1},
 	{"wgetch",			bi_wgetch,			-1},
 	{"process_input",	bi_process_input,	-1},
 	{"get_event",		bi_get_event,		-1},

From 6a58dcdddd1a8efbfab49b15864585d0f2f20e19 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 27 Feb 2020 21:38:55 +0900
Subject: [PATCH 0546/1519] [qwaq] Fix lost output

Turns out all I needed was a refresh() after initialization.
---
 tools/qwaq/qwaq-curses.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/qwaq/qwaq-curses.c b/tools/qwaq/qwaq-curses.c
index eb3724020..210124e35 100644
--- a/tools/qwaq/qwaq-curses.c
+++ b/tools/qwaq/qwaq-curses.c
@@ -127,6 +127,7 @@ bi_initialize (progs_t *pr)
 	nodelay (stdscr, TRUE);
 	mousemask(ALL_MOUSE_EVENTS | REPORT_MOUSE_POSITION, NULL);
 	write(1, MOUSE_MOVES, sizeof (MOUSE_MOVES) - 1);
+	refresh();
 }
 
 static void

From 644ef93dde821e9fe16b07be1a982b0b2850a21c Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 28 Feb 2020 22:27:29 +0900
Subject: [PATCH 0547/1519] [qwaq] Create some ring-buffer macros

I expect I will need several messaging buffers, and ring buffers tend to
be quite robust. Replacing the event buffer code with the macros made
testing easy.
---
 tools/qwaq/qwaq-app.r    |  2 +-
 tools/qwaq/qwaq-curses.c | 71 ++++++++++++++++++++++++++++++++++------
 2 files changed, 62 insertions(+), 11 deletions(-)

diff --git a/tools/qwaq/qwaq-app.r b/tools/qwaq/qwaq-app.r
index 3cb5f85a4..9aa3301f2 100644
--- a/tools/qwaq/qwaq-app.r
+++ b/tools/qwaq/qwaq-app.r
@@ -28,7 +28,7 @@ int main (int argc, string *argv)
 				ch = event.e.key;
 				mvwprintf (win, 1, 1, "key: %d\n", ch);
 			} else if (event.event_type == qe_mouse) {
-				mvwprintf (win, 1, 2, "mouse: %d %d %d\n",
+				mvwprintf (win, 1, 2, "mouse: %2d %2d %08x\n",
 						   event.e.mouse.x,
 						   event.e.mouse.y,
 						   event.e.mouse.buttons);
diff --git a/tools/qwaq/qwaq-curses.c b/tools/qwaq/qwaq-curses.c
index 210124e35..1a5d08840 100644
--- a/tools/qwaq/qwaq-curses.c
+++ b/tools/qwaq/qwaq-curses.c
@@ -48,6 +48,61 @@
 #define QUEUE_MASK (QUEUE_SIZE - 1)
 #define MOUSE_MOVES "\033[?1003h"	// Make the terminal report mouse movements
 
+#define RING_BUFFER(type, size) 	\
+	struct {						\
+		type        buffer[size];	\
+		unsigned    head;			\
+		unsigned    tail;			\
+	}
+
+#define RB_buffer_size(ring_buffer)						\
+	({	__auto_type rb = (ring_buffer);					\
+		sizeof (rb->buffer) / sizeof (rb->buffer[0]);	\
+	})
+
+#define RB_SPACE_AVAILABLE(ring_buffer)										\
+	({	__auto_type rb = &(ring_buffer);									\
+		(rb->tail + RB_buffer_size(rb) - rb->head - 1) % RB_buffer_size(rb);\
+	})
+
+#define RB_DATA_AVAILABLE(ring_buffer)										\
+	({	__auto_type rb = &(ring_buffer);									\
+		(rb->head + RB_buffer_size (rb) - rb->tail) % RB_buffer_size (rb);	\
+	})
+
+#define RB_WRITE_DATA(ring_buffer, data, count)								\
+	({	__auto_type rb = &(ring_buffer);									\
+		typeof (&rb->buffer[0]) d = (data);									\
+		unsigned    c = (count);											\
+		unsigned    h = rb->head;											\
+		rb->head = (h + c) % RB_buffer_size (rb);							\
+		if (c > RB_buffer_size (rb) - h) {									\
+			memcpy (rb->buffer + h, d,										\
+					(RB_buffer_size (rb) - h) * sizeof (rb->buffer[0]));	\
+			c -= RB_buffer_size (rb) - h;									\
+			d += RB_buffer_size (rb) - h;									\
+			h = 0;															\
+		}																	\
+		memcpy (rb->buffer + h, d, c * sizeof (rb->buffer[0]));				\
+	})
+
+#define RB_READ_DATA(ring_buffer, data, count)								\
+	({	__auto_type rb = &(ring_buffer);									\
+		typeof (&rb->buffer[0]) d = (data);									\
+		unsigned    c = (count);											\
+		unsigned    oc = c;													\
+		unsigned    t = rb->tail;											\
+		if (c > RB_buffer_size (rb) - t) {									\
+			memcpy (d, rb->buffer + t,										\
+					(RB_buffer_size (rb) - t) * sizeof (rb->buffer[0]));	\
+			c -= RB_buffer_size (rb) - t;									\
+			d += RB_buffer_size (rb) - t;									\
+			t = 0;															\
+		}																	\
+		memcpy (d, rb->buffer + t, c * sizeof (rb->buffer[0]));				\
+		rb->tail = (t + oc) % RB_buffer_size (rb);							\
+	})
+
 typedef struct window_s {
 	WINDOW     *win;
 } window_t;
@@ -57,9 +112,7 @@ typedef struct qwaq_resources_s {
 	int         initialized;
 	dstring_t  *print_buffer;
 	PR_RESMAP (window_t) window_map;
-	qwaq_event_t event_queue[QUEUE_SIZE];
-	unsigned    queue_head;
-	unsigned    queue_tail;
+	RING_BUFFER (qwaq_event_t, QUEUE_SIZE) event_queue;
 } qwaq_resources_t;
 
 static window_t *
@@ -92,7 +145,7 @@ window_index (qwaq_resources_t *res, window_t *win)
 	PR_RESINDEX (res->window_map, win);
 }
 
-static always_inline window_t *
+static always_inline window_t * __attribute__((pure))
 get_window (qwaq_resources_t *res, const char *name, int handle)
 {
 	window_t   *window = window_get (res, handle);
@@ -198,19 +251,17 @@ bi_wgetch (progs_t *pr)
 static void
 add_event (qwaq_resources_t *res, qwaq_event_t *event)
 {
-	if (((res->queue_head - res->queue_tail) & QUEUE_MASK) != QUEUE_MASK) {
-		res->event_queue[res->queue_head] = *event;
-		res->queue_head = (res->queue_head + 1) & QUEUE_MASK;
+	if (RB_SPACE_AVAILABLE (res->event_queue) >= 1) {
+		RB_WRITE_DATA (res->event_queue, event, 1);
 	}
 }
 
 static int
 get_event (qwaq_resources_t *res, qwaq_event_t *event)
 {
-	if (res->queue_head != res->queue_tail) {
+	if (RB_DATA_AVAILABLE (res->event_queue) >= 1) {
 		if (event) {
-			*event = res->event_queue[res->queue_tail];
-			res->queue_tail = (res->queue_tail + 1) & QUEUE_MASK;
+			RB_READ_DATA (res->event_queue, event, 1);
 		}
 		return 1;
 	}

From bd98d1d9fb45208bec172390b9428f8b83fe1ec3 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 29 Feb 2020 01:45:33 +0900
Subject: [PATCH 0548/1519] [qwaq] Prepare for threading

So far, no threading has been set up, and only window creation and
printing have been updated, but the basics of the design seem to be
sound.

The builtin functions now no longer call ncurses directly: the build
commands and write them to a command buffer.

Commands that have return values (eg, window creation) write their
results to a results buffer that the originating builtin function
reads. Builtin functions that expect a result "poll" the results buffer
for the correct result (marked by the same command). In a single
UI-thread environment, the results should always be in the same order as
the commands, and in a multi-UI-thread environment, things should
(fingers crossed) sort themselves out as ONE of the threads will be the
originator of the next available result.

Strings in commands (eg, for printing) are handled by acquiring a string
id (index into an array of dstring_t) and including the string id in the
written command. The string id is released upon completion of the
command.

Builtin functions write commands, acquire string ids, and read results.

The command processor reads commands, releases string ids, and writes
results.

Since commands, string ids, and results are all in ring buffers, and
assuming there is only one thread running the builtin functions and only
one thread processing commands (there can be only one because ncurses is
not thread-safe), then there should never be any contention on the
buffers. Of course, if there are multiple threads running the builtin
functions, then locking will be required on the builtin function side.
---
 tools/qwaq/qwaq-app.r    |   7 +-
 tools/qwaq/qwaq-curses.c | 357 ++++++++++++++++++++++++++++++---------
 2 files changed, 280 insertions(+), 84 deletions(-)

diff --git a/tools/qwaq/qwaq-app.r b/tools/qwaq/qwaq-app.r
index 9aa3301f2..a0b2a2c63 100644
--- a/tools/qwaq/qwaq-app.r
+++ b/tools/qwaq/qwaq-app.r
@@ -5,11 +5,8 @@ typedef struct window_s *window_t;
 void initialize (void) = #0;
 window_t create_window (int xpos, int ypos, int xlen, int ylen) = #0;
 void destroy_window (window_t win) = #0;
-void wprintf (window_t win, string fmt, ...) = #0;
 void mvwprintf (window_t win, int x, int y, string fmt, ...) = #0;
-int wgetch (window_t win) = #0;
 
-void process_input (void) = #0;
 int get_event (qwaq_event_t *event) = #0;
 
 int main (int argc, string *argv)
@@ -19,10 +16,8 @@ int main (int argc, string *argv)
 
 	initialize ();
 	window_t win = create_window (20, 5, 50, 10);
-	wprintf (win, "Hi there!\n");
+	mvwprintf (win, 0, 0, "Hi there!\n");
 	do {
-		process_input ();
-
 		if (get_event (&event)) {
 			if (event.event_type == qe_key) {
 				ch = event.e.key;
diff --git a/tools/qwaq/qwaq-curses.c b/tools/qwaq/qwaq-curses.c
index 1a5d08840..bb5c3a958 100644
--- a/tools/qwaq/qwaq-curses.c
+++ b/tools/qwaq/qwaq-curses.c
@@ -32,6 +32,7 @@
 #endif
 
 #include <curses.h>
+#include <panel.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
@@ -44,9 +45,19 @@
 #include "event.h"
 
 #define always_inline inline __attribute__((__always_inline__))
-#define QUEUE_SIZE 16		// must be power of 2 greater than 1
-#define QUEUE_MASK (QUEUE_SIZE - 1)
+#define QUEUE_SIZE 16
 #define MOUSE_MOVES "\033[?1003h"	// Make the terminal report mouse movements
+#define STRING_ID_QUEUE_SIZE 8		// must be > 1
+#define COMMAND_QUEUE_SIZE 128
+#define CMD_SIZE(x) sizeof(x)/sizeof(x[0])
+
+typedef enum qwaq_commands_e {
+	qwaq_cmd_create_window,
+	qwaq_cmd_destroy_window,
+	qwaq_cmd_create_panel,
+	qwaq_cmd_destroy_panel,
+	qwaq_cmd_mvwprint,
+} qwaq_commands;
 
 #define RING_BUFFER(type, size) 	\
 	struct {						\
@@ -103,16 +114,36 @@
 		rb->tail = (t + oc) % RB_buffer_size (rb);							\
 	})
 
+#define RB_DROP_DATA(ring_buffer, count)									\
+	({	__auto_type rb = &(ring_buffer);									\
+		unsigned    c = (count);											\
+		unsigned    t = rb->tail;											\
+		rb->tail = (t + c) % RB_buffer_size (rb);							\
+	})
+
+#define RB_PEEK_DATA(ring_buffer, ahead)						\
+	({	__auto_type rb = &(ring_buffer);						\
+		rb->buffer[(rb->tail + ahead) % RB_buffer_size (rb)];	\
+	})
+
 typedef struct window_s {
 	WINDOW     *win;
 } window_t;
 
+typedef struct panel_s {
+	PANEL      *panel;
+} panel_t;
+
 typedef struct qwaq_resources_s {
 	progs_t    *pr;
 	int         initialized;
-	dstring_t  *print_buffer;
 	PR_RESMAP (window_t) window_map;
+	PR_RESMAP (panel_t) panel_map;
 	RING_BUFFER (qwaq_event_t, QUEUE_SIZE) event_queue;
+	RING_BUFFER (int, COMMAND_QUEUE_SIZE) command_queue;
+	RING_BUFFER (int, COMMAND_QUEUE_SIZE) results;
+	RING_BUFFER (int, STRING_ID_QUEUE_SIZE) string_ids;
+	dstring_t   strings[STRING_ID_QUEUE_SIZE - 1];
 } qwaq_resources_t;
 
 static window_t *
@@ -156,96 +187,127 @@ get_window (qwaq_resources_t *res, const char *name, int handle)
 	return window;
 }
 
-static int need_endwin;
-static void
-bi_shutdown (void)
+static panel_t *
+panel_new (qwaq_resources_t *res)
 {
-	if (need_endwin) {
-		endwin ();
+	PR_RESNEW (panel_t, res->panel_map);
+}
+
+static void
+panel_free (qwaq_resources_t *res, panel_t *win)
+{
+	PR_RESFREE (panel_t, res->panel_map, win);
+}
+
+static void
+panel_reset (qwaq_resources_t *res)
+{
+	PR_RESRESET (panel_t, res->panel_map);
+}
+
+static inline panel_t *
+panel_get (qwaq_resources_t *res, unsigned index)
+{
+	PR_RESGET(res->panel_map, index);
+}
+
+static inline int
+panel_index (qwaq_resources_t *res, panel_t *win)
+{
+	PR_RESINDEX (res->panel_map, win);
+}
+
+static always_inline panel_t * __attribute__((pure))
+get_panel (qwaq_resources_t *res, const char *name, int handle)
+{
+	panel_t   *panel = panel_get (res, handle);
+
+	if (!panel || !panel->panel) {
+		PR_RunError (res->pr, "invalid panel passed to %s", name + 3);
+	}
+	return panel;
+}
+
+static int
+acquire_string (qwaq_resources_t *res)
+{
+	int         string_id = -1;
+
+	// XXX add locking and loop for available
+	if (RB_DATA_AVAILABLE (res->string_ids)) {
+		RB_READ_DATA (res->string_ids, &string_id, 1);
+	}
+	// XXX unlock and end of loop
+	return string_id;
+}
+
+static void
+release_string (qwaq_resources_t *res, int string_id)
+{
+	// locking shouldn't be necessary as there should be only one writer
+	// but if it becomes such that there is more than one writer, locks as per
+	// acquire
+	if (RB_SPACE_AVAILABLE (res->string_ids)) {
+		RB_WRITE_DATA (res->string_ids, &string_id, 1);
 	}
 }
 
 static void
-bi_initialize (progs_t *pr)
+create_window (qwaq_resources_t *res)
 {
-	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
+	int         xpos = RB_PEEK_DATA (res->command_queue, 2);
+	int         ypos = RB_PEEK_DATA (res->command_queue, 3);
+	int         xlen = RB_PEEK_DATA (res->command_queue, 4);
+	int         ylen = RB_PEEK_DATA (res->command_queue, 5);
 
-	initscr ();
-	need_endwin = 1;
-	res->initialized = 1;
-	raw ();
-	keypad (stdscr, TRUE);
-	noecho ();
-	nonl ();
-	nodelay (stdscr, TRUE);
-	mousemask(ALL_MOUSE_EVENTS | REPORT_MOUSE_POSITION, NULL);
-	write(1, MOUSE_MOVES, sizeof (MOUSE_MOVES) - 1);
-	refresh();
-}
-
-static void
-bi_create_window (progs_t *pr)
-{
-	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
-	int         xpos = P_INT (pr, 0);
-	int         ypos = P_INT (pr, 1);
-	int         xlen = P_INT (pr, 2);
-	int         ylen = P_INT (pr, 3);
 	window_t   *window = window_new (res);
 	window->win = newwin (ylen, xlen, ypos, xpos);
 	keypad (window->win, TRUE);
-	R_INT (pr) = window_index (res, window);
+
+	int         window_id = window_index (res, window);
+
+	int         cmd_result[] = { qwaq_cmd_create_window, window_id };
+
+	// loop
+	if (RB_SPACE_AVAILABLE (res->results) >= CMD_SIZE (cmd_result)) {
+		RB_WRITE_DATA (res->results, cmd_result, CMD_SIZE (cmd_result));
+	}
 }
 
 static void
-bi_destroy_window (progs_t *pr)
+move_print (qwaq_resources_t *res)
 {
-	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
-	window_t   *window = get_window (res, __FUNCTION__, P_INT (pr, 0));
-	delwin (window->win);
-	window->win = 0;
-	window_free (res, window);
-}
+	int         window_id = RB_PEEK_DATA (res->command_queue, 2);
+	int         x = RB_PEEK_DATA (res->command_queue, 3);
+	int         y = RB_PEEK_DATA (res->command_queue, 4);
+	int         string_id = RB_PEEK_DATA (res->command_queue, 5);
 
-static void
-bi_wprintf (progs_t *pr)
-{
-	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
-	window_t   *window = get_window (res, __FUNCTION__, P_INT (pr, 0));
-	const char *fmt = P_GSTRING (pr, 1);
-	int         count = pr->pr_argc - 2;
-	pr_type_t **args = pr->pr_params + 2;
-
-	dstring_clearstr (res->print_buffer);
-	PR_Sprintf (pr, res->print_buffer, "bi_wprintf", fmt, count, args);
-	waddstr (window->win, res->print_buffer->str);
+	window_t   *window = get_window (res, __FUNCTION__, window_id);
+	mvwaddstr (window->win, y, x, res->strings[string_id].str);
+	release_string (res, string_id);
 	wrefresh (window->win);
 }
 
 static void
-bi_mvwprintf (progs_t *pr)
+process_commands (qwaq_resources_t *res)
 {
-	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
-	window_t   *window = get_window (res, __FUNCTION__, P_INT (pr, 0));
-	int         x = P_INT (pr, 1);
-	int         y = P_INT (pr, 2);
-	const char *fmt = P_GSTRING (pr, 3);
-	int         count = pr->pr_argc - 4;
-	pr_type_t **args = pr->pr_params + 4;
-
-	dstring_clearstr (res->print_buffer);
-	PR_Sprintf (pr, res->print_buffer, "bi_wprintf", fmt, count, args);
-	mvwaddstr (window->win, y, x, res->print_buffer->str);
-	wrefresh (window->win);
-}
-
-static void
-bi_wgetch (progs_t *pr)
-{
-	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
-	window_t   *window = get_window (res, __FUNCTION__, P_INT (pr, 0));
-
-	R_INT (pr) = wgetch (window->win);
+	while (RB_DATA_AVAILABLE (res->command_queue) > 2) {
+		switch ((qwaq_commands) RB_PEEK_DATA (res->command_queue, 0)) {
+			case qwaq_cmd_create_window:
+				create_window (res);
+				break;
+			case qwaq_cmd_destroy_window:
+				break;
+			case qwaq_cmd_create_panel:
+				break;
+			case qwaq_cmd_destroy_panel:
+				break;
+			case qwaq_cmd_mvwprint:
+				move_print (res);
+				break;
+		}
+		RB_DROP_DATA (res->command_queue, RB_PEEK_DATA (res->command_queue, 1));
+	}
 }
 
 static void
@@ -289,9 +351,8 @@ key_event (qwaq_resources_t *res, int key)
 }
 
 static void
-bi_process_input (progs_t *pr)
+process_input (qwaq_resources_t *res)
 {
-	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
 	if (Sys_CheckInput (1, -1)) {
 		int         ch;
 		while ((ch = getch ()) != ERR && ch) {
@@ -307,15 +368,143 @@ bi_process_input (progs_t *pr)
 	}
 }
 
+static int need_endwin;
+static void
+bi_shutdown (void)
+{
+	if (need_endwin) {
+		endwin ();
+	}
+}
+
+static void
+bi_create_window (progs_t *pr)
+{
+	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
+	int         xpos = P_INT (pr, 0);
+	int         ypos = P_INT (pr, 1);
+	int         xlen = P_INT (pr, 2);
+	int         ylen = P_INT (pr, 3);
+	int         command[] = {
+					qwaq_cmd_create_window, 0,
+					xpos, ypos, xlen, ylen,
+				};
+
+	command[1] = CMD_SIZE(command);
+
+	if (RB_SPACE_AVAILABLE (res->command_queue) >= CMD_SIZE(command)) {
+		RB_WRITE_DATA (res->command_queue, command, CMD_SIZE(command));
+	}
+	// XXX should just wait on the mutex
+	process_commands (res);
+	process_input (res);
+	// locking and loop until id is correct
+	if (RB_DATA_AVAILABLE (res->results)
+		&& RB_PEEK_DATA (res->results, 0) == qwaq_cmd_create_window) {
+		int         cmd_result[2];	// should results have a size?
+		RB_READ_DATA (res->results, cmd_result, CMD_SIZE (cmd_result));
+		R_INT (pr) = cmd_result[1];
+	}
+}
+
+static void
+bi_destroy_window (progs_t *pr)
+{
+	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
+	window_t   *window = get_window (res, __FUNCTION__, P_INT (pr, 0));
+	delwin (window->win);
+	window->win = 0;
+	window_free (res, window);
+}
+
+static void
+bi_create_panel (progs_t *pr)
+{
+	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
+	window_t   *window = get_window (res, __FUNCTION__, P_INT (pr, 0));
+
+	panel_t    *panel = panel_new (res);
+	panel->panel = new_panel (window->win);
+	R_INT (pr) = panel_index (res, panel);
+}
+
+static void
+bi_destroy_panel (progs_t *pr)
+{
+	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
+	panel_t   *panel = get_panel (res, __FUNCTION__, P_INT (pr, 0));
+	del_panel (panel->panel);
+	panel->panel = 0;
+	panel_free (res, panel);
+}
+
+static void
+bi_mvwprintf (progs_t *pr)
+{
+	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
+	int         window_id = P_INT (pr, 0);
+	int         x = P_INT (pr, 1);
+	int         y = P_INT (pr, 2);
+	const char *fmt = P_GSTRING (pr, 3);
+	int         count = pr->pr_argc - 4;
+	pr_type_t **args = pr->pr_params + 4;
+
+	int         string_id = acquire_string (res);
+	dstring_t  *print_buffer = res->strings + string_id;
+	int         command[] = {
+					qwaq_cmd_mvwprint, 0,
+					window_id, x, y, string_id
+				};
+
+	if (get_window (res, __FUNCTION__, window_id)) {
+		command[1] = CMD_SIZE(command);
+
+		dstring_clearstr (print_buffer);
+		PR_Sprintf (pr, print_buffer, "mvwprintf", fmt, count, args);
+		if (RB_SPACE_AVAILABLE (res->command_queue) >= CMD_SIZE(command)) {
+			RB_WRITE_DATA (res->command_queue, command, CMD_SIZE(command));
+		}
+	}
+}
+
+static void
+bi_wgetch (progs_t *pr)
+{
+	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
+	window_t   *window = get_window (res, __FUNCTION__, P_INT (pr, 0));
+
+	R_INT (pr) = wgetch (window->win);
+}
+
 static void
 bi_get_event (progs_t *pr)
 {
 	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
 	qwaq_event_t *event = &G_STRUCT (pr, qwaq_event_t, P_INT (pr, 0));
 
+	process_commands (res);
+	process_input (res);
 	R_INT (pr) = get_event (res, event);
 }
 
+static void
+bi_initialize (progs_t *pr)
+{
+	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
+
+	initscr ();
+	need_endwin = 1;
+	res->initialized = 1;
+	raw ();
+	keypad (stdscr, TRUE);
+	noecho ();
+	nonl ();
+	nodelay (stdscr, TRUE);
+	mousemask(ALL_MOUSE_EVENTS | REPORT_MOUSE_POSITION, NULL);
+	write(1, MOUSE_MOVES, sizeof (MOUSE_MOVES) - 1);
+	refresh();
+}
+
 static void
 bi_qwaq_clear (progs_t *pr, void *data)
 {
@@ -326,28 +515,40 @@ bi_qwaq_clear (progs_t *pr, void *data)
 	}
 	need_endwin = 0;
 	window_reset (res);
+	panel_reset (res);
 }
 
 static builtin_t builtins[] = {
 	{"initialize",		bi_initialize,		-1},
 	{"create_window",	bi_create_window,	-1},
 	{"destroy_window",	bi_destroy_window,	-1},
-	{"wprintf",			bi_wprintf,			-1},
+	{"create_panel",	bi_create_panel,	-1},
+	{"destroy_panel",	bi_destroy_panel,	-1},
 	{"mvwprintf",		bi_mvwprintf,		-1},
 	{"wgetch",			bi_wgetch,			-1},
-	{"process_input",	bi_process_input,	-1},
 	{"get_event",		bi_get_event,		-1},
 	{0}
 };
 
+static __attribute__((format(printf, 1, 0))) void
+qwaq_print (const char *fmt, va_list args)
+{
+	vfprintf (stderr, fmt, args);
+	fflush (stderr);
+}
+
 void
 BI_Init (progs_t *pr)
 {
 	qwaq_resources_t *res = calloc (sizeof (*res), 1);
 	res->pr = pr;
-	res->print_buffer = dstring_newstr ();
+	for (int i = 0; i < STRING_ID_QUEUE_SIZE - 1; i++) {
+		RB_WRITE_DATA (res->string_ids, &i, 1);
+		res->strings[i].mem = &dstring_default_mem;
+	}
 
 	PR_Resources_Register (pr, "qwaq", res, bi_qwaq_clear);
 	PR_RegisterBuiltins (pr, builtins);
 	Sys_RegisterShutdown (bi_shutdown);
+	Sys_SetStdPrintf (qwaq_print);
 }

From 513c808875ccaae0e9cbede9f8ba8d1b0ac97413 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 29 Feb 2020 02:07:47 +0900
Subject: [PATCH 0549/1519] [qwaq] Make some bad ascii art

---
 tools/qwaq/qwaq-app.r | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/qwaq/qwaq-app.r b/tools/qwaq/qwaq-app.r
index a0b2a2c63..bf3bfb85e 100644
--- a/tools/qwaq/qwaq-app.r
+++ b/tools/qwaq/qwaq-app.r
@@ -16,7 +16,9 @@ int main (int argc, string *argv)
 
 	initialize ();
 	window_t win = create_window (20, 5, 50, 10);
-	mvwprintf (win, 0, 0, "Hi there!\n");
+	mvwprintf (win, 0, 0, "Hi there! (q to quit)\n");
+	mvwprintf (win, 1, 1, "(?)Oo.\n");
+	mvwprintf (win, 1, 2, "   \\_O>\n");
 	do {
 		if (get_event (&event)) {
 			if (event.event_type == qe_key) {

From 0119660b01c5a8bba42915c9239bebef5df93fd4 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 29 Feb 2020 11:44:43 +0900
Subject: [PATCH 0550/1519] [qwaq] Convert remaining functions to command queue

Now that the initial prototype seems to be working well, it's time to
implement more commands. I might have to do some wrappers for actual
command writing (and result reading) as it looks like there will be a
lot of nearly identical code.
---
 tools/qwaq/qwaq-app.r    |   2 +
 tools/qwaq/qwaq-curses.c | 101 ++++++++++++++++++++++++++++++---------
 2 files changed, 80 insertions(+), 23 deletions(-)

diff --git a/tools/qwaq/qwaq-app.r b/tools/qwaq/qwaq-app.r
index bf3bfb85e..3e51b7e98 100644
--- a/tools/qwaq/qwaq-app.r
+++ b/tools/qwaq/qwaq-app.r
@@ -32,5 +32,7 @@ int main (int argc, string *argv)
 			}
 		}
 	} while (ch != 'q' && ch != 'Q');
+	destroy_window (win);
+	get_event (&event);
 	return 0;
 }
diff --git a/tools/qwaq/qwaq-curses.c b/tools/qwaq/qwaq-curses.c
index bb5c3a958..e218e969a 100644
--- a/tools/qwaq/qwaq-curses.c
+++ b/tools/qwaq/qwaq-curses.c
@@ -265,7 +265,6 @@ create_window (qwaq_resources_t *res)
 	keypad (window->win, TRUE);
 
 	int         window_id = window_index (res, window);
-
 	int         cmd_result[] = { qwaq_cmd_create_window, window_id };
 
 	// loop
@@ -274,6 +273,44 @@ create_window (qwaq_resources_t *res)
 	}
 }
 
+static void
+destroy_window (qwaq_resources_t *res)
+{
+	int         window_id = RB_PEEK_DATA (res->command_queue, 2);
+
+	window_t   *window = get_window (res, __FUNCTION__, window_id);
+	delwin (window->win);
+	window_free (res, window);
+}
+
+static void
+create_panel (qwaq_resources_t *res)
+{
+	int         window_id = RB_PEEK_DATA (res->command_queue, 2);
+
+	window_t   *window = get_window (res, __FUNCTION__, window_id);
+	panel_t    *panel = panel_new (res);
+	panel->panel = new_panel (window->win);
+
+	int         panel_id = panel_index (res, panel);
+	int         cmd_result[] = { qwaq_cmd_create_panel, panel_id };
+
+	// loop
+	if (RB_SPACE_AVAILABLE (res->results) >= CMD_SIZE (cmd_result)) {
+		RB_WRITE_DATA (res->results, cmd_result, CMD_SIZE (cmd_result));
+	}
+}
+
+static void
+destroy_panel (qwaq_resources_t *res)
+{
+	int         panel_id = RB_PEEK_DATA (res->command_queue, 2);
+
+	panel_t   *panel = get_panel (res, __FUNCTION__, panel_id);
+	del_panel (panel->panel);
+	panel_free (res, panel);
+}
+
 static void
 move_print (qwaq_resources_t *res)
 {
@@ -297,10 +334,13 @@ process_commands (qwaq_resources_t *res)
 				create_window (res);
 				break;
 			case qwaq_cmd_destroy_window:
+				destroy_window (res);
 				break;
 			case qwaq_cmd_create_panel:
+				create_panel (res);
 				break;
 			case qwaq_cmd_destroy_panel:
+				destroy_panel (res);
 				break;
 			case qwaq_cmd_mvwprint:
 				move_print (res);
@@ -411,31 +451,56 @@ static void
 bi_destroy_window (progs_t *pr)
 {
 	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
-	window_t   *window = get_window (res, __FUNCTION__, P_INT (pr, 0));
-	delwin (window->win);
-	window->win = 0;
-	window_free (res, window);
+	int         window_id = P_INT (pr, 0);
+	int         command[] = { qwaq_cmd_destroy_window, 0, window_id, };
+
+	if (get_window (res, __FUNCTION__, window_id)) {
+		command[1] = CMD_SIZE(command);
+
+		if (RB_SPACE_AVAILABLE (res->command_queue) >= CMD_SIZE(command)) {
+			RB_WRITE_DATA (res->command_queue, command, CMD_SIZE(command));
+		}
+	}
 }
 
 static void
 bi_create_panel (progs_t *pr)
 {
 	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
-	window_t   *window = get_window (res, __FUNCTION__, P_INT (pr, 0));
+	int         window_id = P_INT (pr, 0);
+	int         command[] = { qwaq_cmd_create_panel, 0, window_id, };
 
-	panel_t    *panel = panel_new (res);
-	panel->panel = new_panel (window->win);
-	R_INT (pr) = panel_index (res, panel);
+	if (get_window (res, __FUNCTION__, window_id)) {
+		command[1] = CMD_SIZE(command);
+
+		if (RB_SPACE_AVAILABLE (res->command_queue) >= CMD_SIZE(command)) {
+			RB_WRITE_DATA (res->command_queue, command, CMD_SIZE(command));
+		}
+
+		// locking and loop until id is correct
+		if (RB_DATA_AVAILABLE (res->results)
+			&& RB_PEEK_DATA (res->results, 0) == qwaq_cmd_create_panel) {
+			int         cmd_result[2];	// should results have a size?
+			RB_READ_DATA (res->results, cmd_result, CMD_SIZE (cmd_result));
+			R_INT (pr) = cmd_result[1];
+		}
+	}
 }
 
 static void
 bi_destroy_panel (progs_t *pr)
 {
 	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
-	panel_t   *panel = get_panel (res, __FUNCTION__, P_INT (pr, 0));
-	del_panel (panel->panel);
-	panel->panel = 0;
-	panel_free (res, panel);
+	int         panel_id = P_INT (pr, 0);
+	int         command[] = { qwaq_cmd_destroy_panel, 0, panel_id, };
+
+	if (get_panel (res, __FUNCTION__, panel_id)) {
+		command[1] = CMD_SIZE(command);
+
+		if (RB_SPACE_AVAILABLE (res->command_queue) >= CMD_SIZE(command)) {
+			RB_WRITE_DATA (res->command_queue, command, CMD_SIZE(command));
+		}
+	}
 }
 
 static void
@@ -467,15 +532,6 @@ bi_mvwprintf (progs_t *pr)
 	}
 }
 
-static void
-bi_wgetch (progs_t *pr)
-{
-	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
-	window_t   *window = get_window (res, __FUNCTION__, P_INT (pr, 0));
-
-	R_INT (pr) = wgetch (window->win);
-}
-
 static void
 bi_get_event (progs_t *pr)
 {
@@ -525,7 +581,6 @@ static builtin_t builtins[] = {
 	{"create_panel",	bi_create_panel,	-1},
 	{"destroy_panel",	bi_destroy_panel,	-1},
 	{"mvwprintf",		bi_mvwprintf,		-1},
-	{"wgetch",			bi_wgetch,			-1},
 	{"get_event",		bi_get_event,		-1},
 	{0}
 };

From ea69921e6a268a35b37e7f094a2bd0416ca1cc97 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 29 Feb 2020 12:33:45 +0900
Subject: [PATCH 0551/1519] [qwaq] Validate window before acquiring string

If the window is invalid and recovery is done, string ids will leak if
acquired before validation.

Afterwards, make the rest of the builtin wrappers consistent: extract
parameters, validate, [acquire resources], generate command.
---
 tools/qwaq/qwaq-curses.c | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/tools/qwaq/qwaq-curses.c b/tools/qwaq/qwaq-curses.c
index e218e969a..8460a36b4 100644
--- a/tools/qwaq/qwaq-curses.c
+++ b/tools/qwaq/qwaq-curses.c
@@ -452,9 +452,10 @@ bi_destroy_window (progs_t *pr)
 {
 	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
 	int         window_id = P_INT (pr, 0);
-	int         command[] = { qwaq_cmd_destroy_window, 0, window_id, };
 
 	if (get_window (res, __FUNCTION__, window_id)) {
+		int         command[] = { qwaq_cmd_destroy_window, 0, window_id, };
+
 		command[1] = CMD_SIZE(command);
 
 		if (RB_SPACE_AVAILABLE (res->command_queue) >= CMD_SIZE(command)) {
@@ -468,9 +469,10 @@ bi_create_panel (progs_t *pr)
 {
 	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
 	int         window_id = P_INT (pr, 0);
-	int         command[] = { qwaq_cmd_create_panel, 0, window_id, };
 
 	if (get_window (res, __FUNCTION__, window_id)) {
+		int         command[] = { qwaq_cmd_create_panel, 0, window_id, };
+
 		command[1] = CMD_SIZE(command);
 
 		if (RB_SPACE_AVAILABLE (res->command_queue) >= CMD_SIZE(command)) {
@@ -514,14 +516,14 @@ bi_mvwprintf (progs_t *pr)
 	int         count = pr->pr_argc - 4;
 	pr_type_t **args = pr->pr_params + 4;
 
-	int         string_id = acquire_string (res);
-	dstring_t  *print_buffer = res->strings + string_id;
-	int         command[] = {
-					qwaq_cmd_mvwprint, 0,
-					window_id, x, y, string_id
-				};
-
 	if (get_window (res, __FUNCTION__, window_id)) {
+		int         string_id = acquire_string (res);
+		dstring_t  *print_buffer = res->strings + string_id;
+		int         command[] = {
+						qwaq_cmd_mvwprint, 0,
+						window_id, x, y, string_id
+					};
+
 		command[1] = CMD_SIZE(command);
 
 		dstring_clearstr (print_buffer);

From 17005637cadbd74d6d3d08720c9daeb3b23adfe6 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 29 Feb 2020 12:46:25 +0900
Subject: [PATCH 0552/1519] [qwaq] Rename the internal function names

Now they reflect the curses functions they wrap. The externally visible
builtin names are not changed because the parameters are in x, y order
rather than curses' y, x order.
---
 tools/qwaq/qwaq-curses.c | 76 ++++++++++++++++++++--------------------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/tools/qwaq/qwaq-curses.c b/tools/qwaq/qwaq-curses.c
index 8460a36b4..fafbe8c80 100644
--- a/tools/qwaq/qwaq-curses.c
+++ b/tools/qwaq/qwaq-curses.c
@@ -52,11 +52,11 @@
 #define CMD_SIZE(x) sizeof(x)/sizeof(x[0])
 
 typedef enum qwaq_commands_e {
-	qwaq_cmd_create_window,
-	qwaq_cmd_destroy_window,
-	qwaq_cmd_create_panel,
-	qwaq_cmd_destroy_panel,
-	qwaq_cmd_mvwprint,
+	qwaq_cmd_newwin,
+	qwaq_cmd_delwin,
+	qwaq_cmd_new_panel,
+	qwaq_cmd_del_panel,
+	qwaq_cmd_mvwaddstr,
 } qwaq_commands;
 
 #define RING_BUFFER(type, size) 	\
@@ -253,7 +253,7 @@ release_string (qwaq_resources_t *res, int string_id)
 }
 
 static void
-create_window (qwaq_resources_t *res)
+cmd_newwin (qwaq_resources_t *res)
 {
 	int         xpos = RB_PEEK_DATA (res->command_queue, 2);
 	int         ypos = RB_PEEK_DATA (res->command_queue, 3);
@@ -265,7 +265,7 @@ create_window (qwaq_resources_t *res)
 	keypad (window->win, TRUE);
 
 	int         window_id = window_index (res, window);
-	int         cmd_result[] = { qwaq_cmd_create_window, window_id };
+	int         cmd_result[] = { qwaq_cmd_newwin, window_id };
 
 	// loop
 	if (RB_SPACE_AVAILABLE (res->results) >= CMD_SIZE (cmd_result)) {
@@ -274,7 +274,7 @@ create_window (qwaq_resources_t *res)
 }
 
 static void
-destroy_window (qwaq_resources_t *res)
+cmd_delwin (qwaq_resources_t *res)
 {
 	int         window_id = RB_PEEK_DATA (res->command_queue, 2);
 
@@ -284,7 +284,7 @@ destroy_window (qwaq_resources_t *res)
 }
 
 static void
-create_panel (qwaq_resources_t *res)
+cmd_new_panel (qwaq_resources_t *res)
 {
 	int         window_id = RB_PEEK_DATA (res->command_queue, 2);
 
@@ -293,7 +293,7 @@ create_panel (qwaq_resources_t *res)
 	panel->panel = new_panel (window->win);
 
 	int         panel_id = panel_index (res, panel);
-	int         cmd_result[] = { qwaq_cmd_create_panel, panel_id };
+	int         cmd_result[] = { qwaq_cmd_new_panel, panel_id };
 
 	// loop
 	if (RB_SPACE_AVAILABLE (res->results) >= CMD_SIZE (cmd_result)) {
@@ -302,7 +302,7 @@ create_panel (qwaq_resources_t *res)
 }
 
 static void
-destroy_panel (qwaq_resources_t *res)
+cmd_del_panel (qwaq_resources_t *res)
 {
 	int         panel_id = RB_PEEK_DATA (res->command_queue, 2);
 
@@ -312,7 +312,7 @@ destroy_panel (qwaq_resources_t *res)
 }
 
 static void
-move_print (qwaq_resources_t *res)
+cmd_mvwaddstr (qwaq_resources_t *res)
 {
 	int         window_id = RB_PEEK_DATA (res->command_queue, 2);
 	int         x = RB_PEEK_DATA (res->command_queue, 3);
@@ -330,20 +330,20 @@ process_commands (qwaq_resources_t *res)
 {
 	while (RB_DATA_AVAILABLE (res->command_queue) > 2) {
 		switch ((qwaq_commands) RB_PEEK_DATA (res->command_queue, 0)) {
-			case qwaq_cmd_create_window:
-				create_window (res);
+			case qwaq_cmd_newwin:
+				cmd_newwin (res);
 				break;
-			case qwaq_cmd_destroy_window:
-				destroy_window (res);
+			case qwaq_cmd_delwin:
+				cmd_delwin (res);
 				break;
-			case qwaq_cmd_create_panel:
-				create_panel (res);
+			case qwaq_cmd_new_panel:
+				cmd_new_panel (res);
 				break;
-			case qwaq_cmd_destroy_panel:
-				destroy_panel (res);
+			case qwaq_cmd_del_panel:
+				cmd_del_panel (res);
 				break;
-			case qwaq_cmd_mvwprint:
-				move_print (res);
+			case qwaq_cmd_mvwaddstr:
+				cmd_mvwaddstr (res);
 				break;
 		}
 		RB_DROP_DATA (res->command_queue, RB_PEEK_DATA (res->command_queue, 1));
@@ -418,7 +418,7 @@ bi_shutdown (void)
 }
 
 static void
-bi_create_window (progs_t *pr)
+bi_newwin (progs_t *pr)
 {
 	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
 	int         xpos = P_INT (pr, 0);
@@ -426,7 +426,7 @@ bi_create_window (progs_t *pr)
 	int         xlen = P_INT (pr, 2);
 	int         ylen = P_INT (pr, 3);
 	int         command[] = {
-					qwaq_cmd_create_window, 0,
+					qwaq_cmd_newwin, 0,
 					xpos, ypos, xlen, ylen,
 				};
 
@@ -440,7 +440,7 @@ bi_create_window (progs_t *pr)
 	process_input (res);
 	// locking and loop until id is correct
 	if (RB_DATA_AVAILABLE (res->results)
-		&& RB_PEEK_DATA (res->results, 0) == qwaq_cmd_create_window) {
+		&& RB_PEEK_DATA (res->results, 0) == qwaq_cmd_newwin) {
 		int         cmd_result[2];	// should results have a size?
 		RB_READ_DATA (res->results, cmd_result, CMD_SIZE (cmd_result));
 		R_INT (pr) = cmd_result[1];
@@ -448,13 +448,13 @@ bi_create_window (progs_t *pr)
 }
 
 static void
-bi_destroy_window (progs_t *pr)
+bi_delwin (progs_t *pr)
 {
 	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
 	int         window_id = P_INT (pr, 0);
 
 	if (get_window (res, __FUNCTION__, window_id)) {
-		int         command[] = { qwaq_cmd_destroy_window, 0, window_id, };
+		int         command[] = { qwaq_cmd_delwin, 0, window_id, };
 
 		command[1] = CMD_SIZE(command);
 
@@ -465,13 +465,13 @@ bi_destroy_window (progs_t *pr)
 }
 
 static void
-bi_create_panel (progs_t *pr)
+bi_new_panel (progs_t *pr)
 {
 	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
 	int         window_id = P_INT (pr, 0);
 
 	if (get_window (res, __FUNCTION__, window_id)) {
-		int         command[] = { qwaq_cmd_create_panel, 0, window_id, };
+		int         command[] = { qwaq_cmd_new_panel, 0, window_id, };
 
 		command[1] = CMD_SIZE(command);
 
@@ -481,7 +481,7 @@ bi_create_panel (progs_t *pr)
 
 		// locking and loop until id is correct
 		if (RB_DATA_AVAILABLE (res->results)
-			&& RB_PEEK_DATA (res->results, 0) == qwaq_cmd_create_panel) {
+			&& RB_PEEK_DATA (res->results, 0) == qwaq_cmd_new_panel) {
 			int         cmd_result[2];	// should results have a size?
 			RB_READ_DATA (res->results, cmd_result, CMD_SIZE (cmd_result));
 			R_INT (pr) = cmd_result[1];
@@ -490,11 +490,11 @@ bi_create_panel (progs_t *pr)
 }
 
 static void
-bi_destroy_panel (progs_t *pr)
+bi_del_panel (progs_t *pr)
 {
 	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
 	int         panel_id = P_INT (pr, 0);
-	int         command[] = { qwaq_cmd_destroy_panel, 0, panel_id, };
+	int         command[] = { qwaq_cmd_del_panel, 0, panel_id, };
 
 	if (get_panel (res, __FUNCTION__, panel_id)) {
 		command[1] = CMD_SIZE(command);
@@ -520,14 +520,14 @@ bi_mvwprintf (progs_t *pr)
 		int         string_id = acquire_string (res);
 		dstring_t  *print_buffer = res->strings + string_id;
 		int         command[] = {
-						qwaq_cmd_mvwprint, 0,
+						qwaq_cmd_mvwaddstr, 0,
 						window_id, x, y, string_id
 					};
 
 		command[1] = CMD_SIZE(command);
 
 		dstring_clearstr (print_buffer);
-		PR_Sprintf (pr, print_buffer, "mvwprintf", fmt, count, args);
+		PR_Sprintf (pr, print_buffer, "mvwaddstr", fmt, count, args);
 		if (RB_SPACE_AVAILABLE (res->command_queue) >= CMD_SIZE(command)) {
 			RB_WRITE_DATA (res->command_queue, command, CMD_SIZE(command));
 		}
@@ -578,10 +578,10 @@ bi_qwaq_clear (progs_t *pr, void *data)
 
 static builtin_t builtins[] = {
 	{"initialize",		bi_initialize,		-1},
-	{"create_window",	bi_create_window,	-1},
-	{"destroy_window",	bi_destroy_window,	-1},
-	{"create_panel",	bi_create_panel,	-1},
-	{"destroy_panel",	bi_destroy_panel,	-1},
+	{"create_window",	bi_newwin,			-1},
+	{"destroy_window",	bi_delwin,			-1},
+	{"create_panel",	bi_new_panel,		-1},
+	{"destroy_panel",	bi_del_panel,		-1},
 	{"mvwprintf",		bi_mvwprintf,		-1},
 	{"get_event",		bi_get_event,		-1},
 	{0}

From 5e4677f8d54471d2949e84d089aafcb8275dff5b Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 29 Feb 2020 13:06:58 +0900
Subject: [PATCH 0553/1519] [qwaq] Implement the immediately useful panel
 functions

---
 tools/qwaq/qwaq-curses.c | 129 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 127 insertions(+), 2 deletions(-)

diff --git a/tools/qwaq/qwaq-curses.c b/tools/qwaq/qwaq-curses.c
index fafbe8c80..eaab87c82 100644
--- a/tools/qwaq/qwaq-curses.c
+++ b/tools/qwaq/qwaq-curses.c
@@ -56,6 +56,11 @@ typedef enum qwaq_commands_e {
 	qwaq_cmd_delwin,
 	qwaq_cmd_new_panel,
 	qwaq_cmd_del_panel,
+	qwaq_cmd_hide_panel,
+	qwaq_cmd_show_panel,
+	qwaq_cmd_top_panel,
+	qwaq_cmd_bottom_panel,
+	qwaq_cmd_move_panel,
 	qwaq_cmd_mvwaddstr,
 } qwaq_commands;
 
@@ -311,6 +316,58 @@ cmd_del_panel (qwaq_resources_t *res)
 	panel_free (res, panel);
 }
 
+static void
+cmd_hide_panel (qwaq_resources_t *res)
+{
+	int         panel_id = RB_PEEK_DATA (res->command_queue, 2);
+
+	panel_t   *panel = get_panel (res, __FUNCTION__, panel_id);
+	hide_panel (panel->panel);
+	panel_free (res, panel);
+}
+
+static void
+cmd_show_panel (qwaq_resources_t *res)
+{
+	int         panel_id = RB_PEEK_DATA (res->command_queue, 2);
+
+	panel_t   *panel = get_panel (res, __FUNCTION__, panel_id);
+	show_panel (panel->panel);
+	panel_free (res, panel);
+}
+
+static void
+cmd_top_panel (qwaq_resources_t *res)
+{
+	int         panel_id = RB_PEEK_DATA (res->command_queue, 2);
+
+	panel_t   *panel = get_panel (res, __FUNCTION__, panel_id);
+	top_panel (panel->panel);
+	panel_free (res, panel);
+}
+
+static void
+cmd_bottom_panel (qwaq_resources_t *res)
+{
+	int         panel_id = RB_PEEK_DATA (res->command_queue, 2);
+
+	panel_t   *panel = get_panel (res, __FUNCTION__, panel_id);
+	bottom_panel (panel->panel);
+	panel_free (res, panel);
+}
+
+static void
+cmd_move_panel (qwaq_resources_t *res)
+{
+	int         panel_id = RB_PEEK_DATA (res->command_queue, 2);
+	int         x = RB_PEEK_DATA (res->command_queue, 3);
+	int         y = RB_PEEK_DATA (res->command_queue, 4);
+
+	panel_t   *panel = get_panel (res, __FUNCTION__, panel_id);
+	move_panel (panel->panel, y, x);
+	panel_free (res, panel);
+}
+
 static void
 cmd_mvwaddstr (qwaq_resources_t *res)
 {
@@ -342,6 +399,21 @@ process_commands (qwaq_resources_t *res)
 			case qwaq_cmd_del_panel:
 				cmd_del_panel (res);
 				break;
+			case qwaq_cmd_hide_panel:
+				cmd_hide_panel (res);
+				break;
+			case qwaq_cmd_show_panel:
+				cmd_show_panel (res);
+				break;
+			case qwaq_cmd_top_panel:
+				cmd_top_panel (res);
+				break;
+			case qwaq_cmd_bottom_panel:
+				cmd_bottom_panel (res);
+				break;
+			case qwaq_cmd_move_panel:
+				cmd_move_panel (res);
+				break;
 			case qwaq_cmd_mvwaddstr:
 				cmd_mvwaddstr (res);
 				break;
@@ -490,13 +562,61 @@ bi_new_panel (progs_t *pr)
 }
 
 static void
-bi_del_panel (progs_t *pr)
+panel_command (progs_t *pr, qwaq_commands cmd)
 {
 	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
 	int         panel_id = P_INT (pr, 0);
-	int         command[] = { qwaq_cmd_del_panel, 0, panel_id, };
 
 	if (get_panel (res, __FUNCTION__, panel_id)) {
+		int         command[] = { cmd, 0, panel_id, };
+		command[1] = CMD_SIZE(command);
+
+		if (RB_SPACE_AVAILABLE (res->command_queue) >= CMD_SIZE(command)) {
+			RB_WRITE_DATA (res->command_queue, command, CMD_SIZE(command));
+		}
+	}
+}
+
+static void
+bi_del_panel (progs_t *pr)
+{
+	panel_command (pr, qwaq_cmd_del_panel);
+}
+
+static void
+bi_hide_panel (progs_t *pr)
+{
+	panel_command (pr, qwaq_cmd_hide_panel);
+}
+
+static void
+bi_show_panel (progs_t *pr)
+{
+	panel_command (pr, qwaq_cmd_show_panel);
+}
+
+static void
+bi_top_panel (progs_t *pr)
+{
+	panel_command (pr, qwaq_cmd_top_panel);
+}
+
+static void
+bi_bottom_panel (progs_t *pr)
+{
+	panel_command (pr, qwaq_cmd_bottom_panel);
+}
+
+static void
+bi_move_panel (progs_t *pr)
+{
+	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
+	int         panel_id = P_INT (pr, 0);
+	int         x = P_INT (pr, 1);
+	int         y = P_INT (pr, 2);
+
+	if (get_panel (res, __FUNCTION__, panel_id)) {
+		int         command[] = { qwaq_cmd_move_panel, 0, panel_id, x, y, };
 		command[1] = CMD_SIZE(command);
 
 		if (RB_SPACE_AVAILABLE (res->command_queue) >= CMD_SIZE(command)) {
@@ -582,6 +702,11 @@ static builtin_t builtins[] = {
 	{"destroy_window",	bi_delwin,			-1},
 	{"create_panel",	bi_new_panel,		-1},
 	{"destroy_panel",	bi_del_panel,		-1},
+	{"hide_panel",		bi_hide_panel,		-1},
+	{"show_panel",		bi_show_panel,		-1},
+	{"top_panel",		bi_top_panel,		-1},
+	{"bottom_panel",	bi_bottom_panel,	-1},
+	{"move_panel",		bi_move_panel,		-1},
 	{"mvwprintf",		bi_mvwprintf,		-1},
 	{"get_event",		bi_get_event,		-1},
 	{0}

From f5f50ae23133f2924113be937d28ea56f6293b1a Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 29 Feb 2020 14:38:54 +0900
Subject: [PATCH 0554/1519] [qwaq] Make stdscr available to progs

---
 tools/qwaq/qwaq-app.r    | 2 ++
 tools/qwaq/qwaq-curses.c | 7 +++++++
 2 files changed, 9 insertions(+)

diff --git a/tools/qwaq/qwaq-app.r b/tools/qwaq/qwaq-app.r
index 3e51b7e98..9e8706b89 100644
--- a/tools/qwaq/qwaq-app.r
+++ b/tools/qwaq/qwaq-app.r
@@ -2,6 +2,8 @@
 
 typedef struct window_s *window_t;
 
+window_t stdscr = (window_t) 1;
+
 void initialize (void) = #0;
 window_t create_window (int xpos, int ypos, int xlen, int ylen) = #0;
 void destroy_window (window_t win) = #0;
diff --git a/tools/qwaq/qwaq-curses.c b/tools/qwaq/qwaq-curses.c
index eaab87c82..00caef9f5 100644
--- a/tools/qwaq/qwaq-curses.c
+++ b/tools/qwaq/qwaq-curses.c
@@ -142,6 +142,7 @@ typedef struct panel_s {
 typedef struct qwaq_resources_s {
 	progs_t    *pr;
 	int         initialized;
+	window_t    stdscr;
 	PR_RESMAP (window_t) window_map;
 	PR_RESMAP (panel_t) panel_map;
 	RING_BUFFER (qwaq_event_t, QUEUE_SIZE) event_queue;
@@ -184,6 +185,10 @@ window_index (qwaq_resources_t *res, window_t *win)
 static always_inline window_t * __attribute__((pure))
 get_window (qwaq_resources_t *res, const char *name, int handle)
 {
+	if (handle == 1) {
+		return &res->stdscr;
+	}
+
 	window_t   *window = window_get (res, handle);
 
 	if (!window || !window->win) {
@@ -681,6 +686,8 @@ bi_initialize (progs_t *pr)
 	mousemask(ALL_MOUSE_EVENTS | REPORT_MOUSE_POSITION, NULL);
 	write(1, MOUSE_MOVES, sizeof (MOUSE_MOVES) - 1);
 	refresh();
+
+	res->stdscr.win = stdscr;
 }
 
 static void

From ec4e9b326d1d1cc988fca1ca786073b6b04bbfbf Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 29 Feb 2020 14:43:08 +0900
Subject: [PATCH 0555/1519] [qwaq] Don't call wrefresh in cmd_mvwaddstr

There is now an implementation for wrefresh.
---
 tools/qwaq/qwaq-app.r    | 13 ++++++++-----
 tools/qwaq/qwaq-curses.c | 29 +++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/tools/qwaq/qwaq-app.r b/tools/qwaq/qwaq-app.r
index 9e8706b89..ccf7485bb 100644
--- a/tools/qwaq/qwaq-app.r
+++ b/tools/qwaq/qwaq-app.r
@@ -8,6 +8,7 @@ void initialize (void) = #0;
 window_t create_window (int xpos, int ypos, int xlen, int ylen) = #0;
 void destroy_window (window_t win) = #0;
 void mvwprintf (window_t win, int x, int y, string fmt, ...) = #0;
+void wrefresh (window_t win) = #0;
 
 int get_event (qwaq_event_t *event) = #0;
 
@@ -18,20 +19,22 @@ int main (int argc, string *argv)
 
 	initialize ();
 	window_t win = create_window (20, 5, 50, 10);
-	mvwprintf (win, 0, 0, "Hi there! (q to quit)\n");
-	mvwprintf (win, 1, 1, "(?)Oo.\n");
-	mvwprintf (win, 1, 2, "   \\_O>\n");
+	mvwprintf (win, 0, 0, "Hi there! (q to quit)");
+	mvwprintf (win, 1, 1, "(?)Oo.");
+	mvwprintf (win, 1, 2, "   \\_O>");
+	wrefresh (win);
 	do {
 		if (get_event (&event)) {
 			if (event.event_type == qe_key) {
 				ch = event.e.key;
-				mvwprintf (win, 1, 1, "key: %d\n", ch);
+				mvwprintf (win, 1, 1, "key: %d", ch);
 			} else if (event.event_type == qe_mouse) {
-				mvwprintf (win, 1, 2, "mouse: %2d %2d %08x\n",
+				mvwprintf (win, 1, 2, "mouse: %2d %2d %08x",
 						   event.e.mouse.x,
 						   event.e.mouse.y,
 						   event.e.mouse.buttons);
 			}
+			wrefresh (win);
 		}
 	} while (ch != 'q' && ch != 'Q');
 	destroy_window (win);
diff --git a/tools/qwaq/qwaq-curses.c b/tools/qwaq/qwaq-curses.c
index 00caef9f5..0f80dfc62 100644
--- a/tools/qwaq/qwaq-curses.c
+++ b/tools/qwaq/qwaq-curses.c
@@ -62,6 +62,7 @@ typedef enum qwaq_commands_e {
 	qwaq_cmd_bottom_panel,
 	qwaq_cmd_move_panel,
 	qwaq_cmd_mvwaddstr,
+	qwaq_cmd_wrefresh,
 } qwaq_commands;
 
 #define RING_BUFFER(type, size) 	\
@@ -384,6 +385,14 @@ cmd_mvwaddstr (qwaq_resources_t *res)
 	window_t   *window = get_window (res, __FUNCTION__, window_id);
 	mvwaddstr (window->win, y, x, res->strings[string_id].str);
 	release_string (res, string_id);
+}
+
+static void
+cmd_wrefresh (qwaq_resources_t *res)
+{
+	int         window_id = RB_PEEK_DATA (res->command_queue, 2);
+
+	window_t   *window = get_window (res, __FUNCTION__, window_id);
 	wrefresh (window->win);
 }
 
@@ -422,6 +431,9 @@ process_commands (qwaq_resources_t *res)
 			case qwaq_cmd_mvwaddstr:
 				cmd_mvwaddstr (res);
 				break;
+			case qwaq_cmd_wrefresh:
+				cmd_wrefresh (res);
+				break;
 		}
 		RB_DROP_DATA (res->command_queue, RB_PEEK_DATA (res->command_queue, 1));
 	}
@@ -659,6 +671,22 @@ bi_mvwprintf (progs_t *pr)
 	}
 }
 
+static void
+bi_wrefresh (progs_t *pr)
+{
+	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
+	int         window_id = P_INT (pr, 0);
+
+	if (get_window (res, __FUNCTION__, window_id)) {
+		int         command[] = { qwaq_cmd_wrefresh, 0, window_id, };
+		command[1] = CMD_SIZE(command);
+
+		if (RB_SPACE_AVAILABLE (res->command_queue) >= CMD_SIZE(command)) {
+			RB_WRITE_DATA (res->command_queue, command, CMD_SIZE(command));
+		}
+	}
+}
+
 static void
 bi_get_event (progs_t *pr)
 {
@@ -715,6 +743,7 @@ static builtin_t builtins[] = {
 	{"bottom_panel",	bi_bottom_panel,	-1},
 	{"move_panel",		bi_move_panel,		-1},
 	{"mvwprintf",		bi_mvwprintf,		-1},
+	{"wrefresh",		bi_wrefresh,		-1},
 	{"get_event",		bi_get_event,		-1},
 	{0}
 };

From ae532870c42d057bd431db8580440badfe5a3fa3 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 29 Feb 2020 14:48:18 +0900
Subject: [PATCH 0556/1519] [qwaq] Implement basic color support

---
 tools/qwaq/color.h       | 21 +++++++++++
 tools/qwaq/qwaq-app.r    | 10 +++++
 tools/qwaq/qwaq-curses.c | 79 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 110 insertions(+)
 create mode 100644 tools/qwaq/color.h

diff --git a/tools/qwaq/color.h b/tools/qwaq/color.h
new file mode 100644
index 000000000..95067b5de
--- /dev/null
+++ b/tools/qwaq/color.h
@@ -0,0 +1,21 @@
+#ifndef __qwaq_color_h
+#define __qwaq_color_h
+
+#ifndef COLOR_PAIR
+// double protection in case this header is included in a C file
+
+#define COLOR_PAIR(cp) ((cp) << 8)
+
+// taken from ncurses.h
+#define COLOR_BLACK		0
+#define COLOR_RED		1
+#define COLOR_GREEN		2
+#define COLOR_YELLOW	3
+#define COLOR_BLUE		4
+#define COLOR_MAGENTA	5
+#define COLOR_CYAN		6
+#define COLOR_WHITE		7
+
+#endif
+
+#endif//__qwaq_color_h
diff --git a/tools/qwaq/qwaq-app.r b/tools/qwaq/qwaq-app.r
index ccf7485bb..3e39f14a0 100644
--- a/tools/qwaq/qwaq-app.r
+++ b/tools/qwaq/qwaq-app.r
@@ -1,3 +1,4 @@
+#include "color.h"
 #include "event.h"
 
 typedef struct window_s *window_t;
@@ -11,6 +12,10 @@ void mvwprintf (window_t win, int x, int y, string fmt, ...) = #0;
 void wrefresh (window_t win) = #0;
 
 int get_event (qwaq_event_t *event) = #0;
+int max_colors (void) = #0;
+int max_color_pairs (void) = #0;
+int init_pair (int pair, int f, int b) = #0;
+void wbkgd (window_t win, int ch) = #0;
 
 int main (int argc, string *argv)
 {
@@ -18,10 +23,15 @@ int main (int argc, string *argv)
 	qwaq_event_t event = { };
 
 	initialize ();
+	init_pair (1, COLOR_WHITE, COLOR_BLUE);
+	wbkgd (stdscr, COLOR_PAIR(1));
+	wrefresh (stdscr);
 	window_t win = create_window (20, 5, 50, 10);
+	wbkgd (win, COLOR_PAIR(0));
 	mvwprintf (win, 0, 0, "Hi there! (q to quit)");
 	mvwprintf (win, 1, 1, "(?)Oo.");
 	mvwprintf (win, 1, 2, "   \\_O>");
+	mvwprintf (win, 1, 3, " %d %d", max_colors (), max_color_pairs ());
 	wrefresh (win);
 	do {
 		if (get_event (&event)) {
diff --git a/tools/qwaq/qwaq-curses.c b/tools/qwaq/qwaq-curses.c
index 0f80dfc62..a5db37e02 100644
--- a/tools/qwaq/qwaq-curses.c
+++ b/tools/qwaq/qwaq-curses.c
@@ -63,6 +63,8 @@ typedef enum qwaq_commands_e {
 	qwaq_cmd_move_panel,
 	qwaq_cmd_mvwaddstr,
 	qwaq_cmd_wrefresh,
+	qwaq_cmd_init_pair,
+	qwaq_cmd_wbkgd,
 } qwaq_commands;
 
 #define RING_BUFFER(type, size) 	\
@@ -396,6 +398,26 @@ cmd_wrefresh (qwaq_resources_t *res)
 	wrefresh (window->win);
 }
 
+static void
+cmd_init_pair (qwaq_resources_t *res)
+{
+	int         pair = RB_PEEK_DATA (res->command_queue, 2);
+	int         f = RB_PEEK_DATA (res->command_queue, 3);
+	int         b = RB_PEEK_DATA (res->command_queue, 4);
+
+	init_pair (pair, f, b);
+}
+
+static void
+cmd_wbkgd (qwaq_resources_t *res)
+{
+	int         window_id = RB_PEEK_DATA (res->command_queue, 2);
+	int         ch = RB_PEEK_DATA (res->command_queue, 3);
+
+	window_t   *window = get_window (res, __FUNCTION__, window_id);
+	wbkgd (window->win, ch);
+}
+
 static void
 process_commands (qwaq_resources_t *res)
 {
@@ -434,6 +456,12 @@ process_commands (qwaq_resources_t *res)
 			case qwaq_cmd_wrefresh:
 				cmd_wrefresh (res);
 				break;
+			case qwaq_cmd_init_pair:
+				cmd_init_pair (res);
+				break;
+			case qwaq_cmd_wbkgd:
+				cmd_wbkgd (res);
+				break;
 		}
 		RB_DROP_DATA (res->command_queue, RB_PEEK_DATA (res->command_queue, 1));
 	}
@@ -698,6 +726,52 @@ bi_get_event (progs_t *pr)
 	R_INT (pr) = get_event (res, event);
 }
 
+static void
+bi_max_colors (progs_t *pr)
+{
+	R_INT (pr) = COLORS;
+}
+
+static void
+bi_max_color_pairs (progs_t *pr)
+{
+	R_INT (pr) = COLOR_PAIRS;
+}
+
+static void
+bi_init_pair (progs_t *pr)
+{
+	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
+	int         pair = P_INT (pr, 0);
+	int         f = P_INT (pr, 1);
+	int         b = P_INT (pr, 2);
+
+	int         command[] = { qwaq_cmd_init_pair, 0, pair, f, b, };
+	command[1] = CMD_SIZE(command);
+
+	if (RB_SPACE_AVAILABLE (res->command_queue) >= CMD_SIZE(command)) {
+		RB_WRITE_DATA (res->command_queue, command, CMD_SIZE(command));
+	}
+}
+
+static void
+bi_wbkgd (progs_t *pr)
+{
+	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
+	int         window_id = P_INT (pr, 0);
+	int         ch = P_INT (pr, 1);
+
+	if (get_window (res, __FUNCTION__, window_id)) {
+		int         command[] = { qwaq_cmd_wbkgd, 0, window_id, ch, };
+
+		command[1] = CMD_SIZE(command);
+
+		if (RB_SPACE_AVAILABLE (res->command_queue) >= CMD_SIZE(command)) {
+			RB_WRITE_DATA (res->command_queue, command, CMD_SIZE(command));
+		}
+	}
+}
+
 static void
 bi_initialize (progs_t *pr)
 {
@@ -706,6 +780,7 @@ bi_initialize (progs_t *pr)
 	initscr ();
 	need_endwin = 1;
 	res->initialized = 1;
+	start_color ();
 	raw ();
 	keypad (stdscr, TRUE);
 	noecho ();
@@ -745,6 +820,10 @@ static builtin_t builtins[] = {
 	{"mvwprintf",		bi_mvwprintf,		-1},
 	{"wrefresh",		bi_wrefresh,		-1},
 	{"get_event",		bi_get_event,		-1},
+	{"max_colors",		bi_max_colors,		-1},
+	{"max_color_pairs",	bi_max_color_pairs,	-1},
+	{"init_pair",		bi_init_pair,		-1},
+	{"wbkgd",			bi_wbkgd,			-1},
 	{0}
 };
 

From 75f4cebf0eda783cb9bb54a4770a3369b3a7fa93 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 29 Feb 2020 16:11:07 +0900
Subject: [PATCH 0557/1519] Clean up after removal of uint32.h

I guess I forgot to check for its usage in header files, and the fact that
it didn't get cleaned out from being installed hid the error.
---
 include/QF/mdfour.h |  8 ++++----
 libs/util/mdfour.c  | 19 +++++++++----------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/include/QF/mdfour.h b/include/QF/mdfour.h
index bff20aefb..ec8648cd2 100644
--- a/include/QF/mdfour.h
+++ b/include/QF/mdfour.h
@@ -29,17 +29,17 @@
 #ifndef __QF_mdfour_h
 #define __QF_mdfour_h
 
+#include "QF/qtypes.h"
+
 /** \addtogroup crc
 */
 ///@{
 
-#include "QF/uint32.h"
-
 #define MDFOUR_DIGEST_BYTES 16
 
 struct mdfour {
-	uint32 A, B, C, D;
-	uint32 totalN;
+	uint32_t A, B, C, D;
+	uint32_t totalN;
 };
 
 void mdfour_begin(struct mdfour *md); // old: MD4Init
diff --git a/libs/util/mdfour.c b/libs/util/mdfour.c
index 99f57bef2..61bc46e9a 100644
--- a/libs/util/mdfour.c
+++ b/libs/util/mdfour.c
@@ -37,7 +37,6 @@
 #endif
 
 #include "QF/mdfour.h"
-#include "QF/uint32.h"
 
 /* NOTE: This code makes no attempt to be fast!
    It assumes that a int is at least 32 bits long
@@ -62,12 +61,12 @@ static struct mdfour *m;
 
 /* this applies md4 to 64 byte chunks */
 static void
-mdfour64 (uint32 * M)
+mdfour64 (uint32_t * M)
 {
 	int         j;
-	uint32      AA, BB, CC, DD;
-	uint32      X[16];
-	uint32      A, B, C, D;
+	uint32_t    AA, BB, CC, DD;
+	uint32_t    X[16];
+	uint32_t    A, B, C, D;
 
 	for (j = 0; j < 16; j++)
 		X[j] = M[j];
@@ -154,7 +153,7 @@ mdfour64 (uint32 * M)
 }
 
 static void
-copy64 (uint32 * M, const unsigned char *in)
+copy64 (uint32_t * M, const unsigned char *in)
 {
 	int         i;
 
@@ -164,7 +163,7 @@ copy64 (uint32 * M, const unsigned char *in)
 }
 
 static void
-copy4 (unsigned char *out, uint32 x)
+copy4 (unsigned char *out, uint32_t x)
 {
 	out[0] = x & 0xFF;
 	out[1] = (x >> 8) & 0xFF;
@@ -186,8 +185,8 @@ static void
 mdfour_tail (const unsigned char *in, int n)
 {
 	unsigned char buf[128];
-	uint32      M[16];
-	uint32      b;
+	uint32_t    M[16];
+	uint32_t    b;
 
 	m->totalN += n;
 
@@ -214,7 +213,7 @@ mdfour_tail (const unsigned char *in, int n)
 VISIBLE void
 mdfour_update (struct mdfour *md, const unsigned char *in, int n)
 {
-	uint32      M[16];
+	uint32_t    M[16];
 
 	if (n == 0)
 		mdfour_tail (in, n);

From 8b6d05a4dd2cbc95508b2fc604a353c9fd8b774c Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 29 Feb 2020 16:36:23 +0900
Subject: [PATCH 0558/1519] [qwaq] Ensure mouse motion reporting gets turned
 off

It seems that xterm automatically disables it when ncurses shuts down and
mate-terminal does not, or maybe a different version of something. Still,
good to clean up properly.
---
 tools/qwaq/qwaq-curses.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tools/qwaq/qwaq-curses.c b/tools/qwaq/qwaq-curses.c
index a5db37e02..73fe6b39b 100644
--- a/tools/qwaq/qwaq-curses.c
+++ b/tools/qwaq/qwaq-curses.c
@@ -46,7 +46,8 @@
 
 #define always_inline inline __attribute__((__always_inline__))
 #define QUEUE_SIZE 16
-#define MOUSE_MOVES "\033[?1003h"	// Make the terminal report mouse movements
+#define MOUSE_MOVES_ON "\033[?1003h"// Make the terminal report mouse movements
+#define MOUSE_MOVES_OFF "\033[?1003l"// Make the terminal report mouse movements
 #define STRING_ID_QUEUE_SIZE 8		// must be > 1
 #define COMMAND_QUEUE_SIZE 128
 #define CMD_SIZE(x) sizeof(x)/sizeof(x[0])
@@ -530,6 +531,7 @@ static void
 bi_shutdown (void)
 {
 	if (need_endwin) {
+		write(1, MOUSE_MOVES_OFF, sizeof (MOUSE_MOVES_OFF) - 1);
 		endwin ();
 	}
 }
@@ -787,7 +789,7 @@ bi_initialize (progs_t *pr)
 	nonl ();
 	nodelay (stdscr, TRUE);
 	mousemask(ALL_MOUSE_EVENTS | REPORT_MOUSE_POSITION, NULL);
-	write(1, MOUSE_MOVES, sizeof (MOUSE_MOVES) - 1);
+	write(1, MOUSE_MOVES_ON, sizeof (MOUSE_MOVES_ON) - 1);
 	refresh();
 
 	res->stdscr.win = stdscr;
@@ -799,6 +801,7 @@ bi_qwaq_clear (progs_t *pr, void *data)
 	__auto_type res = (qwaq_resources_t *) data;
 
 	if (res->initialized) {
+		write(1, MOUSE_MOVES_OFF, sizeof (MOUSE_MOVES_OFF) - 1);
 		endwin ();
 	}
 	need_endwin = 0;

From e93ca9d828c55846f42c0bea00d227d8a9983233 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 29 Feb 2020 20:13:25 +0900
Subject: [PATCH 0559/1519] [qfcc] Fix infinite loop in linker

---
 tools/qfcc/source/linker.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/tools/qfcc/source/linker.c b/tools/qfcc/source/linker.c
index 3ce5ca3fd..5a9d367ce 100644
--- a/tools/qfcc/source/linker.c
+++ b/tools/qfcc/source/linker.c
@@ -1122,12 +1122,11 @@ undefined_def (qfo_def_t *def)
 				if (func->code < 0) {
 					continue;
 				}
-				if ((pr_uint_t) func->code > reloc->offset) {
-					continue;
-				}
-				if (!best || reloc->offset - func->code < best_dist) {
-					best = func;
-					best_dist = reloc->offset - func->code;
+				if ((pr_uint_t) func->code <= reloc->offset) {
+					if (!best || reloc->offset - func->code < best_dist) {
+						best = func;
+						best_dist = reloc->offset - func->code;
+					}
 				}
 				func++;
 			}

From 271d836cd2ba2157b6ab51be740fef1fd7b60d62 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 29 Feb 2020 21:09:24 +0900
Subject: [PATCH 0560/1519] [qfcc] Catch static class instances in structs

---
 tools/qfcc/source/struct.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tools/qfcc/source/struct.c b/tools/qfcc/source/struct.c
index 5fe569d31..989b298ef 100644
--- a/tools/qfcc/source/struct.c
+++ b/tools/qfcc/source/struct.c
@@ -47,6 +47,7 @@
 #include <QF/sys.h>
 #include <QF/va.h>
 
+#include "class.h"
 #include "def.h"
 #include "defspace.h"
 #include "diagnostic.h"
@@ -123,6 +124,10 @@ build_struct (int su, symbol_t *tag, symtab_t *symtab, type_t *type)
 	for (s = symtab->symbols; s; s = s->next) {
 		if (s->sy_type != sy_var)
 			continue;
+		if (obj_is_class (s->type)) {
+			error (0, "statically allocated instance of class %s",
+				   s->type->t.class->name);
+		}
 		if (su == 's') {
 			symtab->size = RUP (symtab->size, s->type->alignment);
 			s->s.offset = symtab->size;

From c079eb851b4165c80aad33f88475f2f8465ec8f0 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 1 Mar 2020 00:40:55 +0900
Subject: [PATCH 0561/1519] [qwaq] Start work on the actual app

It doesn't look good, but it does have panel based windows working, and
using objects. Won't build reliably right now due to qwaq being in tools
and thus building before ruamoko, but I'll fix that next.
---
 tools/qwaq/Makefile.am   |   4 +-
 tools/qwaq/event.h       |  15 ++-
 tools/qwaq/qwaq-app.h    |  18 ++++
 tools/qwaq/qwaq-app.r    | 142 ++++++++++++++++++++--------
 tools/qwaq/qwaq-curses.c | 198 +++++++++++++++++++++++++++++++++++++++
 tools/qwaq/qwaq-curses.h |  37 ++++++++
 tools/qwaq/qwaq-view.h   |  44 +++++++++
 tools/qwaq/qwaq-view.r   | 105 +++++++++++++++++++++
 tools/qwaq/qwaq-window.h |  11 +++
 tools/qwaq/qwaq-window.r |   8 ++
 10 files changed, 540 insertions(+), 42 deletions(-)
 create mode 100644 tools/qwaq/qwaq-app.h
 create mode 100644 tools/qwaq/qwaq-curses.h
 create mode 100644 tools/qwaq/qwaq-view.h
 create mode 100644 tools/qwaq/qwaq-view.r
 create mode 100644 tools/qwaq/qwaq-window.h
 create mode 100644 tools/qwaq/qwaq-window.r

diff --git a/tools/qwaq/Makefile.am b/tools/qwaq/Makefile.am
index b6e9b8345..f38fc77e5 100644
--- a/tools/qwaq/Makefile.am
+++ b/tools/qwaq/Makefile.am
@@ -57,11 +57,11 @@ qwaq_x11_DEPENDENCIES= $(qwaq_x11_libs) $(QWAQ_DEPS)
 
 r_depfiles_remade=
 
-qwaq_app_dat_SOURCES=qwaq-app.r
+qwaq_app_dat_SOURCES=qwaq-app.r qwaq-view.r qwaq-window.r
 qwaq_app_obj=$(qwaq_app_dat_SOURCES:.r=.o)
 qwaq_app_dep=$(addprefix ./$(DEPDIR)/,$(qwaq_app_obj:.o=.Qo))
 qwaq-app.dat$(EXEEXT): $(qwaq_app_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(qwaq_app_obj)
+	$(QFCC) $(QCFLAGS) -o $@ $(qwaq_app_obj) -lr
 include $(qwaq_app_dep) # am--include-marker
 r_depfiles_remade += $(qwaq_app_dep)
 
diff --git a/tools/qwaq/event.h b/tools/qwaq/event.h
index 933c61569..006d37c42 100644
--- a/tools/qwaq/event.h
+++ b/tools/qwaq/event.h
@@ -2,22 +2,33 @@
 #define __qwaq_event_h
 
 typedef enum {
-	qe_idle,
+	qe_none,
 	qe_key,
 	qe_mouse,
+	qe_command,		// application level command
 } qwaq_etype;
 
-// right now, this is just a copy of ncurses MEVENT, but all int
+typedef enum {
+	qc_valid,
+	qc_exit,
+	qc_error,
+} qwaq_command;
+
 typedef struct qwaq_mevent_s {
 	int         x, y;
 	int         buttons;
 } qwaq_mevent_t;
 
+typedef struct qwaq_message_s {
+	qwaq_command command;
+} qwaq_message_t;
+
 typedef struct qwaq_event_s {
 	qwaq_etype  event_type;
 	union {
 		int         key;
 		qwaq_mevent_t mouse;
+		qwaq_message_t message;
 	} e;
 } qwaq_event_t;
 
diff --git a/tools/qwaq/qwaq-app.h b/tools/qwaq/qwaq-app.h
new file mode 100644
index 000000000..c02beac67
--- /dev/null
+++ b/tools/qwaq/qwaq-app.h
@@ -0,0 +1,18 @@
+#ifndef __qwaq_app_h
+#define __qwaq_app_h
+
+#include "qwaq-view.h"
+
+#include "event.h"
+
+@interface QwaqApplication: Object
+{
+	qwaq_event_t event;
+	qwaq_command endState;
+	View *view;
+}
+-run;
+-handleEvent: (qwaq_event_t *) event;
+@end
+
+#endif//__qwaq_app_h
diff --git a/tools/qwaq/qwaq-app.r b/tools/qwaq/qwaq-app.r
index 3e39f14a0..80ed06c41 100644
--- a/tools/qwaq/qwaq-app.r
+++ b/tools/qwaq/qwaq-app.r
@@ -1,7 +1,97 @@
-#include "color.h"
-#include "event.h"
+#include <AutoreleasePool.h>
 
-typedef struct window_s *window_t;
+#include "color.h"
+#include "qwaq-app.h"
+#include "qwaq-curses.h"
+#include "qwaq-window.h"
+
+static AutoreleasePool *autorelease_pool;
+static void
+arp_start (void)
+{
+	autorelease_pool = [[AutoreleasePool alloc] init];
+}
+
+static void
+arp_end (void)
+{
+	[autorelease_pool release];
+	autorelease_pool = nil;
+}
+
+@implementation QwaqApplication
++app
+{
+	return [[[self alloc] init] autorelease];
+}
+
+-init
+{
+	if (!(self = [super init])) {
+		return nil;
+	}
+	initialize ();
+	init_pair (1, COLOR_WHITE, COLOR_BLUE);
+	init_pair (2, COLOR_WHITE, COLOR_BLACK);
+	view = [[View viewFromWindow:stdscr] retain];
+	[view setBackground: COLOR_PAIR (1)];
+	Rect r = view.rect;
+	wprintf (view.window, "%d %d %d %d\n", r.xpos, r.ypos, r.xlen, r.ylen);
+	r.xpos = r.xlen / 4;
+	r.ypos = r.ylen / 4;
+	r.xlen /= 2;
+	r.ylen /= 2;
+	wprintf (view.window, "%d %d %d %d\n", r.xpos, r.ypos, r.xlen, r.ylen);
+	wrefresh(view.window);
+	Window *w;
+	[view addView: w=[[Window windowWithRect: r] setBackground: COLOR_PAIR (2)]];
+	wprintf (w.window, "%d %d %d %d\n", r.xpos, r.ypos, r.xlen, r.ylen);
+	return self;
+}
+
+-run
+{
+	do {
+		arp_start ();
+
+		update_panels ();
+		doupdate ();
+		get_event (&event);
+		if (event.event_type != qe_none) {
+			[self handleEvent: &event];
+		}
+
+		arp_end ();
+	} while (!endState);
+	return self;
+}
+
+-handleEvent: (qwaq_event_t *) event
+{
+	[view handleEvent: event];
+	if (event.event_type == qe_key && event.e.key == '\x18') {
+		event.event_type = qe_command;
+		event.e.message.command = qc_exit;
+	}
+	if (event.event_type == qe_command
+		&& (event.e.message.command == qc_exit
+			|| event.e.message.command == qc_error)) {
+		endState = event.e.message.command;
+	}
+	return self;
+}
+@end
+
+int main (int argc, string *argv)
+{
+	id app = [[QwaqApplication app] retain];
+
+	[app run];
+	[app release];
+	qwaq_event_t event;
+	get_event (&event);	// XXX need a "wait for queue idle"
+	return 0;
+}
 
 window_t stdscr = (window_t) 1;
 
@@ -9,45 +99,21 @@ void initialize (void) = #0;
 window_t create_window (int xpos, int ypos, int xlen, int ylen) = #0;
 void destroy_window (window_t win) = #0;
 void mvwprintf (window_t win, int x, int y, string fmt, ...) = #0;
+void wprintf (window_t win, string fmt, ...) = #0;
 void wrefresh (window_t win) = #0;
-
 int get_event (qwaq_event_t *event) = #0;
 int max_colors (void) = #0;
 int max_color_pairs (void) = #0;
 int init_pair (int pair, int f, int b) = #0;
 void wbkgd (window_t win, int ch) = #0;
 
-int main (int argc, string *argv)
-{
-	int         ch = 0;
-	qwaq_event_t event = { };
-
-	initialize ();
-	init_pair (1, COLOR_WHITE, COLOR_BLUE);
-	wbkgd (stdscr, COLOR_PAIR(1));
-	wrefresh (stdscr);
-	window_t win = create_window (20, 5, 50, 10);
-	wbkgd (win, COLOR_PAIR(0));
-	mvwprintf (win, 0, 0, "Hi there! (q to quit)");
-	mvwprintf (win, 1, 1, "(?)Oo.");
-	mvwprintf (win, 1, 2, "   \\_O>");
-	mvwprintf (win, 1, 3, " %d %d", max_colors (), max_color_pairs ());
-	wrefresh (win);
-	do {
-		if (get_event (&event)) {
-			if (event.event_type == qe_key) {
-				ch = event.e.key;
-				mvwprintf (win, 1, 1, "key: %d", ch);
-			} else if (event.event_type == qe_mouse) {
-				mvwprintf (win, 1, 2, "mouse: %2d %2d %08x",
-						   event.e.mouse.x,
-						   event.e.mouse.y,
-						   event.e.mouse.buttons);
-			}
-			wrefresh (win);
-		}
-	} while (ch != 'q' && ch != 'Q');
-	destroy_window (win);
-	get_event (&event);
-	return 0;
-}
+panel_t create_panel (window_t window) = #0;
+void destroy_panel (panel_t panel) = #0;
+void hide_panel (panel_t panel) = #0;
+void show_panel (panel_t panel) = #0;
+void top_panel (panel_t panel) = #0;
+void bottom_panel (panel_t panel) = #0;
+void move_panel (panel_t panel, int x, int y) = #0;
+window_t panel_window (panel_t panel) = #0;
+void update_panels (void) = #0;
+void doupdate (void) = #0;
diff --git a/tools/qwaq/qwaq-curses.c b/tools/qwaq/qwaq-curses.c
index 73fe6b39b..1c081e1eb 100644
--- a/tools/qwaq/qwaq-curses.c
+++ b/tools/qwaq/qwaq-curses.c
@@ -55,6 +55,7 @@
 typedef enum qwaq_commands_e {
 	qwaq_cmd_newwin,
 	qwaq_cmd_delwin,
+	qwaq_cmd_getwrect,
 	qwaq_cmd_new_panel,
 	qwaq_cmd_del_panel,
 	qwaq_cmd_hide_panel,
@@ -62,7 +63,11 @@ typedef enum qwaq_commands_e {
 	qwaq_cmd_top_panel,
 	qwaq_cmd_bottom_panel,
 	qwaq_cmd_move_panel,
+	qwaq_cmd_panel_window,
+	qwaq_cmd_update_panels,
+	qwaq_cmd_doupdate,
 	qwaq_cmd_mvwaddstr,
+	qwaq_cmd_waddstr,
 	qwaq_cmd_wrefresh,
 	qwaq_cmd_init_pair,
 	qwaq_cmd_wbkgd,
@@ -141,6 +146,7 @@ typedef struct window_s {
 
 typedef struct panel_s {
 	PANEL      *panel;
+	int         window_id;
 } panel_t;
 
 typedef struct qwaq_resources_s {
@@ -297,6 +303,28 @@ cmd_delwin (qwaq_resources_t *res)
 	window_free (res, window);
 }
 
+static void
+cmd_getwrect (qwaq_resources_t *res)
+{
+	int         window_id = RB_PEEK_DATA (res->command_queue, 2);
+	int         xpos, ypos;
+	int         xlen, ylen;
+
+	window_t   *window = get_window (res, __FUNCTION__, window_id);
+	getparyx (window->win, ypos, xpos);
+	if (xpos == -1 && ypos ==-1) {
+		getbegyx (window->win, ypos, xpos);
+	}
+	getmaxyx (window->win, ylen, xlen);
+
+	int         cmd_result[] = { qwaq_cmd_getwrect, xpos, ypos, xlen, ylen };
+
+	// loop
+	if (RB_SPACE_AVAILABLE (res->results) >= CMD_SIZE (cmd_result)) {
+		RB_WRITE_DATA (res->results, cmd_result, CMD_SIZE (cmd_result));
+	}
+}
+
 static void
 cmd_new_panel (qwaq_resources_t *res)
 {
@@ -305,6 +333,7 @@ cmd_new_panel (qwaq_resources_t *res)
 	window_t   *window = get_window (res, __FUNCTION__, window_id);
 	panel_t    *panel = panel_new (res);
 	panel->panel = new_panel (window->win);
+	panel->window_id = window_id;
 
 	int         panel_id = panel_index (res, panel);
 	int         cmd_result[] = { qwaq_cmd_new_panel, panel_id };
@@ -377,6 +406,34 @@ cmd_move_panel (qwaq_resources_t *res)
 	panel_free (res, panel);
 }
 
+static void
+cmd_panel_window (qwaq_resources_t *res)
+{
+	int         panel_id = RB_PEEK_DATA (res->command_queue, 2);
+
+	panel_t   *panel = get_panel (res, __FUNCTION__, panel_id);
+
+	int         window_id = panel->window_id;
+	int         cmd_result[] = { qwaq_cmd_panel_window, window_id, };
+
+	// loop
+	if (RB_SPACE_AVAILABLE (res->results) >= CMD_SIZE (cmd_result)) {
+		RB_WRITE_DATA (res->results, cmd_result, CMD_SIZE (cmd_result));
+	}
+}
+
+static void
+cmd_update_panels (qwaq_resources_t *res)
+{
+	update_panels ();
+}
+
+static void
+cmd_doupdate (qwaq_resources_t *res)
+{
+	doupdate ();
+}
+
 static void
 cmd_mvwaddstr (qwaq_resources_t *res)
 {
@@ -390,6 +447,17 @@ cmd_mvwaddstr (qwaq_resources_t *res)
 	release_string (res, string_id);
 }
 
+static void
+cmd_waddstr (qwaq_resources_t *res)
+{
+	int         window_id = RB_PEEK_DATA (res->command_queue, 2);
+	int         string_id = RB_PEEK_DATA (res->command_queue, 3);
+
+	window_t   *window = get_window (res, __FUNCTION__, window_id);
+	waddstr (window->win, res->strings[string_id].str);
+	release_string (res, string_id);
+}
+
 static void
 cmd_wrefresh (qwaq_resources_t *res)
 {
@@ -430,6 +498,9 @@ process_commands (qwaq_resources_t *res)
 			case qwaq_cmd_delwin:
 				cmd_delwin (res);
 				break;
+			case qwaq_cmd_getwrect:
+				cmd_getwrect (res);
+				break;
 			case qwaq_cmd_new_panel:
 				cmd_new_panel (res);
 				break;
@@ -451,9 +522,21 @@ process_commands (qwaq_resources_t *res)
 			case qwaq_cmd_move_panel:
 				cmd_move_panel (res);
 				break;
+			case qwaq_cmd_panel_window:
+				cmd_panel_window (res);
+				break;
+			case qwaq_cmd_update_panels:
+				cmd_update_panels (res);
+				break;
+			case qwaq_cmd_doupdate:
+				cmd_doupdate (res);
+				break;
 			case qwaq_cmd_mvwaddstr:
 				cmd_mvwaddstr (res);
 				break;
+			case qwaq_cmd_waddstr:
+				cmd_waddstr (res);
+				break;
 			case qwaq_cmd_wrefresh:
 				cmd_wrefresh (res);
 				break;
@@ -583,6 +666,37 @@ bi_delwin (progs_t *pr)
 	}
 }
 
+static void
+bi_getwrect (progs_t *pr)
+{
+	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
+	int         window_id = P_INT (pr, 0);
+
+	if (get_window (res, __FUNCTION__, window_id)) {
+		int         command[] = { qwaq_cmd_getwrect, 0, window_id, };
+
+		command[1] = CMD_SIZE(command);
+
+		if (RB_SPACE_AVAILABLE (res->command_queue) >= CMD_SIZE(command)) {
+			RB_WRITE_DATA (res->command_queue, command, CMD_SIZE(command));
+		}
+		// XXX should just wait on the mutex
+		process_commands (res);
+		process_input (res);
+		// locking and loop until id is correct
+		if (RB_DATA_AVAILABLE (res->results)
+			&& RB_PEEK_DATA (res->results, 0) == qwaq_cmd_getwrect) {
+			int         cmd_result[5];
+			RB_READ_DATA (res->results, cmd_result, CMD_SIZE (cmd_result));
+			// return xpos, ypos, xlen, ylen
+			(&R_INT (pr))[0] = cmd_result[1];
+			(&R_INT (pr))[1] = cmd_result[2];
+			(&R_INT (pr))[2] = cmd_result[3];
+			(&R_INT (pr))[3] = cmd_result[4];
+		}
+	}
+}
+
 static void
 bi_new_panel (progs_t *pr)
 {
@@ -672,6 +786,58 @@ bi_move_panel (progs_t *pr)
 	}
 }
 
+static void
+bi_panel_window (progs_t *pr)
+{
+	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
+	int         panel_id = P_INT (pr, 0);
+
+	if (get_panel (res, __FUNCTION__, panel_id)) {
+		int         command[] = { qwaq_cmd_panel_window, 0, panel_id, };
+		command[1] = CMD_SIZE(command);
+
+		if (RB_SPACE_AVAILABLE (res->command_queue) >= CMD_SIZE(command)) {
+			RB_WRITE_DATA (res->command_queue, command, CMD_SIZE(command));
+		}
+		// XXX should just wait on the mutex
+		process_commands (res);
+		process_input (res);
+		// locking and loop until id is correct
+		if (RB_DATA_AVAILABLE (res->results)
+			&& RB_PEEK_DATA (res->results, 0) == qwaq_cmd_panel_window) {
+			int         cmd_result[2];
+			RB_READ_DATA (res->results, cmd_result, CMD_SIZE (cmd_result));
+			(&R_INT (pr))[0] = cmd_result[0];
+		}
+	}
+}
+
+static void
+bi_update_panels (progs_t *pr)
+{
+	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
+
+	int         command[] = { qwaq_cmd_update_panels, 0, };
+	command[1] = CMD_SIZE(command);
+
+	if (RB_SPACE_AVAILABLE (res->command_queue) >= CMD_SIZE(command)) {
+		RB_WRITE_DATA (res->command_queue, command, CMD_SIZE(command));
+	}
+}
+
+static void
+bi_doupdate (progs_t *pr)
+{
+	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
+
+	int         command[] = { qwaq_cmd_doupdate, 0, };
+	command[1] = CMD_SIZE(command);
+
+	if (RB_SPACE_AVAILABLE (res->command_queue) >= CMD_SIZE(command)) {
+		RB_WRITE_DATA (res->command_queue, command, CMD_SIZE(command));
+	}
+}
+
 static void
 bi_mvwprintf (progs_t *pr)
 {
@@ -701,6 +867,33 @@ bi_mvwprintf (progs_t *pr)
 	}
 }
 
+static void
+bi_wprintf (progs_t *pr)
+{
+	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
+	int         window_id = P_INT (pr, 0);
+	const char *fmt = P_GSTRING (pr, 1);
+	int         count = pr->pr_argc - 2;
+	pr_type_t **args = pr->pr_params + 2;
+
+	if (get_window (res, __FUNCTION__, window_id)) {
+		int         string_id = acquire_string (res);
+		dstring_t  *print_buffer = res->strings + string_id;
+		int         command[] = {
+						qwaq_cmd_waddstr, 0,
+						window_id, string_id
+					};
+
+		command[1] = CMD_SIZE(command);
+
+		dstring_clearstr (print_buffer);
+		PR_Sprintf (pr, print_buffer, "waddstr", fmt, count, args);
+		if (RB_SPACE_AVAILABLE (res->command_queue) >= CMD_SIZE(command)) {
+			RB_WRITE_DATA (res->command_queue, command, CMD_SIZE(command));
+		}
+	}
+}
+
 static void
 bi_wrefresh (progs_t *pr)
 {
@@ -813,6 +1006,7 @@ static builtin_t builtins[] = {
 	{"initialize",		bi_initialize,		-1},
 	{"create_window",	bi_newwin,			-1},
 	{"destroy_window",	bi_delwin,			-1},
+	{"getwrect",		bi_getwrect,		-1},
 	{"create_panel",	bi_new_panel,		-1},
 	{"destroy_panel",	bi_del_panel,		-1},
 	{"hide_panel",		bi_hide_panel,		-1},
@@ -820,7 +1014,11 @@ static builtin_t builtins[] = {
 	{"top_panel",		bi_top_panel,		-1},
 	{"bottom_panel",	bi_bottom_panel,	-1},
 	{"move_panel",		bi_move_panel,		-1},
+	{"panel_window",	bi_panel_window,	-1},
+	{"update_panels",	bi_update_panels,	-1},
+	{"doupdate",		bi_doupdate,		-1},
 	{"mvwprintf",		bi_mvwprintf,		-1},
+	{"wprintf",			bi_wprintf,			-1},
 	{"wrefresh",		bi_wrefresh,		-1},
 	{"get_event",		bi_get_event,		-1},
 	{"max_colors",		bi_max_colors,		-1},
diff --git a/tools/qwaq/qwaq-curses.h b/tools/qwaq/qwaq-curses.h
new file mode 100644
index 000000000..751c521a7
--- /dev/null
+++ b/tools/qwaq/qwaq-curses.h
@@ -0,0 +1,37 @@
+#ifndef __qwaq_curses_h
+#define __qwaq_curses_h
+
+#include "event.h"
+
+#ifdef __QFCC__
+typedef struct window_s *window_t;
+typedef struct panel_s *panel_t;
+
+@extern window_t stdscr;
+
+@extern void initialize (void);
+@extern window_t create_window (int xpos, int ypos, int xlen, int ylen);
+@extern void destroy_window (window_t win);
+@extern void mvwprintf (window_t win, int x, int y, string fmt, ...);
+@extern void wprintf (window_t win, string fmt, ...);
+@extern void wrefresh (window_t win);
+
+@extern panel_t create_panel (window_t window);
+@extern void destroy_panel (panel_t panel);
+@extern void hide_panel (panel_t panel);
+@extern void show_panel (panel_t panel);
+@extern void top_panel (panel_t panel);
+@extern void bottom_panel (panel_t panel);
+@extern void move_panel (panel_t panel, int x, int y);
+@extern window_t panel_window (panel_t panel);
+@extern void update_panels (void);
+@extern void doupdate (void);
+
+@extern int get_event (qwaq_event_t *event);
+@extern int max_colors (void);
+@extern int max_color_pairs (void);
+@extern int init_pair (int pair, int f, int b);
+@extern void wbkgd (window_t win, int ch);
+#endif
+
+#endif//__qwaq_curses_h
diff --git a/tools/qwaq/qwaq-view.h b/tools/qwaq/qwaq-view.h
new file mode 100644
index 000000000..63a9b4db5
--- /dev/null
+++ b/tools/qwaq/qwaq-view.h
@@ -0,0 +1,44 @@
+#ifndef __qwaq_view_h
+#define __qwaq_view_h
+
+#include <Array.h>
+#include <Object.h>
+
+#include "event.h"
+#include "qwaq-curses.h"
+
+typedef struct {
+	int         xpos;
+	int         ypos;
+	int         xlen;
+	int         ylen;
+} Rect;
+
+typedef struct {
+	int         x;
+	int         y;
+} Point;
+
+@extern Rect makeRect (int xpos, int ypos, int xlen, int ylen);
+//XXX will not work if point or rect point to a local variabl
+@extern int rectContainsPoint (Rect *rect, Point *point);
+@extern Rect getwrect (window_t window);
+
+@interface View: Object
+{
+	Rect        rect;
+	Rect        absRect;
+	Array      *views;
+	Point       point;		// can't be local :(
+	View       *focusedView;
+	window_t    window;
+	panel_t     panel;
+}
++viewFromWindow: (window_t) window;
+-initWithRect: (Rect) rect;
+-handleEvent: (qwaq_event_t *) event;
+-addView: (View *) view;
+-setBackground: (int) ch;
+@end
+
+#endif//__qwaq_view_h
diff --git a/tools/qwaq/qwaq-view.r b/tools/qwaq/qwaq-view.r
new file mode 100644
index 000000000..3673b8fee
--- /dev/null
+++ b/tools/qwaq/qwaq-view.r
@@ -0,0 +1,105 @@
+#include "qwaq-curses.h"
+#include "qwaq-view.h"
+
+Rect
+makeRect (int xpos, int ypos, int xlen, int ylen)
+{
+	Rect rect = {xpos, ypos, xlen, ylen};
+	return rect;
+}
+
+int
+rectContainsPoint (Rect *rect, Point *point)
+{
+	return ((point.x >= rect.xpos && point.x < rect.xpos + rect.xlen)
+			&& (point.y >= rect.ypos && point.y < rect.ypos + rect.ylen));
+}
+
+@implementation View
+
++viewFromWindow: (window_t) window
+{
+	return [[[self alloc] initFromWindow: window] autorelease];
+}
+
+-initWithRect: (Rect) rect
+{
+	if (!(self = [super init])) {
+		return nil;
+	}
+	self.rect = rect;
+	self.absRect = rect;
+	self.window = create_window (rect.xpos, rect.ypos, rect.xlen, rect.ylen);
+	self.panel = create_panel (self.window);
+	return self;
+}
+
+-initFromWindow: (window_t) window
+{
+	if (!(self = [super init])) {
+		return nil;
+	}
+	rect = getwrect (window);
+	self.window = window;
+	self.panel = nil;
+	return self;
+}
+
+-initWithPanel: (panel_t) panel
+{
+	if (!(self = [super init])) {
+		return nil;
+	}
+	self.panel = panel;
+	self.window = panel_window (panel);
+	rect = getwrect (window);
+	return self;
+}
+
+-addView: (View *) view
+{
+	[views addObject: view];
+	return self;
+}
+
+-setBackground: (int) ch
+{
+	wbkgd (window, ch);
+	if (!panel) {
+		wrefresh (window);
+	}
+	return self;
+}
+
+-handleEvent: (qwaq_event_t *) event
+{
+	switch (event.event_type) {
+		case qe_mouse:
+			point.x = event.e.mouse.x;
+			point.y = event.e.mouse.y;
+			for (int i = [views count]; i--> 0; ) {
+				View       *v = [views objectAtIndex: i];
+				if (rectContainsPoint (&v.absRect, &point)) {
+					[v handleEvent: event];
+					break;
+				}
+			}
+			break;
+		case qe_key:
+		case qe_command:
+			if (focusedView) {
+				[focusedView handleEvent: event];
+				for (int i = [views count];
+					 event.event_type != qe_none && i--> 0; ) {
+					View       *v = [views objectAtIndex: i];
+					 [v handleEvent: event];
+				}
+			}
+			break;
+	}
+	return self;
+}
+
+@end
+
+Rect getwrect (window_t window) = #0;
diff --git a/tools/qwaq/qwaq-window.h b/tools/qwaq/qwaq-window.h
new file mode 100644
index 000000000..13730ccca
--- /dev/null
+++ b/tools/qwaq/qwaq-window.h
@@ -0,0 +1,11 @@
+#ifndef __qwaq_window_h
+#define __qwaq_window_h
+
+#include "qwaq-view.h"
+
+@interface Window: View
+{
+}
+@end
+
+#endif//__qwaq_window_h
diff --git a/tools/qwaq/qwaq-window.r b/tools/qwaq/qwaq-window.r
new file mode 100644
index 000000000..48722cdc2
--- /dev/null
+++ b/tools/qwaq/qwaq-window.r
@@ -0,0 +1,8 @@
+#include "qwaq-window.h"
+
+@implementation Window
++windowWithRect: (Rect) rect
+{
+	return [[[self alloc] initWithRect: rect] autorelease];
+}
+@end

From df2ed4b0863725c48d4c2c07532b0cfa943f7a42 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 1 Mar 2020 00:55:15 +0900
Subject: [PATCH 0562/1519] [qwaq] Move from tools to ruamoko

This fixes the dependency issues between qwaq and ruamoko. qwaq is
actually older than ruamoko. That little language feature test has come
a long way.

However, I'm considering moving to non-recursive make, but...
---
 config.d/ac_config_files.m4           | 3 +--
 config.d/build_control.m4             | 9 ++++++---
 ruamoko/Makefile.am                   | 3 ++-
 {tools => ruamoko}/qwaq/.gdbinit      | 0
 {tools => ruamoko}/qwaq/Makefile.am   | 0
 {tools => ruamoko}/qwaq/builtins.c    | 0
 {tools => ruamoko}/qwaq/color.h       | 0
 {tools => ruamoko}/qwaq/event.h       | 0
 {tools => ruamoko}/qwaq/main.c        | 0
 {tools => ruamoko}/qwaq/progs.src.in  | 0
 {tools => ruamoko}/qwaq/qwaq-app.h    | 0
 {tools => ruamoko}/qwaq/qwaq-app.r    | 0
 {tools => ruamoko}/qwaq/qwaq-bi.c     | 0
 {tools => ruamoko}/qwaq/qwaq-curses.c | 0
 {tools => ruamoko}/qwaq/qwaq-curses.h | 0
 {tools => ruamoko}/qwaq/qwaq-view.h   | 0
 {tools => ruamoko}/qwaq/qwaq-view.r   | 0
 {tools => ruamoko}/qwaq/qwaq-window.h | 0
 {tools => ruamoko}/qwaq/qwaq-window.r | 0
 {tools => ruamoko}/qwaq/qwaq.c        | 0
 {tools => ruamoko}/qwaq/qwaq.h        | 0
 tools/Makefile.am                     | 2 +-
 22 files changed, 10 insertions(+), 7 deletions(-)
 rename {tools => ruamoko}/qwaq/.gdbinit (100%)
 rename {tools => ruamoko}/qwaq/Makefile.am (100%)
 rename {tools => ruamoko}/qwaq/builtins.c (100%)
 rename {tools => ruamoko}/qwaq/color.h (100%)
 rename {tools => ruamoko}/qwaq/event.h (100%)
 rename {tools => ruamoko}/qwaq/main.c (100%)
 rename {tools => ruamoko}/qwaq/progs.src.in (100%)
 rename {tools => ruamoko}/qwaq/qwaq-app.h (100%)
 rename {tools => ruamoko}/qwaq/qwaq-app.r (100%)
 rename {tools => ruamoko}/qwaq/qwaq-bi.c (100%)
 rename {tools => ruamoko}/qwaq/qwaq-curses.c (100%)
 rename {tools => ruamoko}/qwaq/qwaq-curses.h (100%)
 rename {tools => ruamoko}/qwaq/qwaq-view.h (100%)
 rename {tools => ruamoko}/qwaq/qwaq-view.r (100%)
 rename {tools => ruamoko}/qwaq/qwaq-window.h (100%)
 rename {tools => ruamoko}/qwaq/qwaq-window.r (100%)
 rename {tools => ruamoko}/qwaq/qwaq.c (100%)
 rename {tools => ruamoko}/qwaq/qwaq.h (100%)

diff --git a/config.d/ac_config_files.m4 b/config.d/ac_config_files.m4
index 587a515d9..6f49d4bb5 100644
--- a/config.d/ac_config_files.m4
+++ b/config.d/ac_config_files.m4
@@ -74,8 +74,6 @@
 	tools/qfvis/Makefile
 	tools/qfvis/include/Makefile
 	tools/qfvis/source/Makefile
-	tools/qwaq/Makefile
-	tools/qwaq/progs.src
 	tools/wad/Makefile
 	tools/wav/Makefile
 
@@ -87,6 +85,7 @@
 	ruamoko/gui/Makefile
 	ruamoko/cl_menu/Makefile
 	ruamoko/scheme/Makefile
+	ruamoko/qwaq/Makefile
 
 	pkg-config/Makefile
 	pkg-config/qfcc.pc
diff --git a/config.d/build_control.m4 b/config.d/build_control.m4
index a53bf74a4..98517088e 100644
--- a/config.d/build_control.m4
+++ b/config.d/build_control.m4
@@ -230,7 +230,8 @@ if test "x$ENABLE_tools_qwaq" = xyes; then
 	if test "x$HAVE_PANEL" = xyes -a "x$HAVE_PTHREAD" = xyes; then
 		QWAQ_TARGETS="$QWAQ_TARGETS qwaq-curses\$(EXEEXT)"
 	fi
-	QF_NEED(tools,[qfcc qwaq])
+	QF_NEED(tools,[qfcc])
+	QF_NEED(ruamoko,[qwaq])
 	QF_NEED(libs,[ruamoko gamecode util])
 fi
 if test "x$ENABLE_tools_wad" = xyes; then
@@ -244,11 +245,13 @@ fi
 
 QF_NEED(top, [libs hw nq qtv qw])
 
-QF_PROCESS_NEED_DIRS(tools,[bsp2img carne pak qfbsp qfcc qflight qflmp qfmodelgen qfspritegen qfvis qwaq wad wav])
-QF_PROCESS_NEED_FUNC(tools,[bsp2img carne pak qfbsp qfcc qflight qflmp qfmodelgen qfspritegen qfvis qwaq wad wav], QF_NEED(top,tools))
+QF_PROCESS_NEED_DIRS(tools,[bsp2img carne pak qfbsp qfcc qflight qflmp qfmodelgen qfspritegen qfvis wad wav])
+QF_PROCESS_NEED_FUNC(tools,[bsp2img carne pak qfbsp qfcc qflight qflmp qfmodelgen qfspritegen qfvis wad wav], QF_NEED(top,tools))
 
 QF_PROCESS_NEED_DIRS(libs,[util gamecode ruamoko gib audio image models video console net qw client])
 
+QF_PROCESS_NEED_DIRS(ruamoko,[qwaq])
+
 if test "$ENABLE_tools_qfcc" = "yes" -a "$ENABLE_tools_pak" = "yes"; then
 	QF_NEED(top, [ruamoko])
 fi
diff --git a/ruamoko/Makefile.am b/ruamoko/Makefile.am
index 779fc1439..b899690f8 100644
--- a/ruamoko/Makefile.am
+++ b/ruamoko/Makefile.am
@@ -1,4 +1,5 @@
-SUBDIRS= include lib game gui cl_menu scheme
+SUBDIRS= include lib game gui cl_menu scheme @ruamoko_dirs@
+DIST_SUBDIRS=qwaq
 
 doc: Doxyfile
 	doxygen
diff --git a/tools/qwaq/.gdbinit b/ruamoko/qwaq/.gdbinit
similarity index 100%
rename from tools/qwaq/.gdbinit
rename to ruamoko/qwaq/.gdbinit
diff --git a/tools/qwaq/Makefile.am b/ruamoko/qwaq/Makefile.am
similarity index 100%
rename from tools/qwaq/Makefile.am
rename to ruamoko/qwaq/Makefile.am
diff --git a/tools/qwaq/builtins.c b/ruamoko/qwaq/builtins.c
similarity index 100%
rename from tools/qwaq/builtins.c
rename to ruamoko/qwaq/builtins.c
diff --git a/tools/qwaq/color.h b/ruamoko/qwaq/color.h
similarity index 100%
rename from tools/qwaq/color.h
rename to ruamoko/qwaq/color.h
diff --git a/tools/qwaq/event.h b/ruamoko/qwaq/event.h
similarity index 100%
rename from tools/qwaq/event.h
rename to ruamoko/qwaq/event.h
diff --git a/tools/qwaq/main.c b/ruamoko/qwaq/main.c
similarity index 100%
rename from tools/qwaq/main.c
rename to ruamoko/qwaq/main.c
diff --git a/tools/qwaq/progs.src.in b/ruamoko/qwaq/progs.src.in
similarity index 100%
rename from tools/qwaq/progs.src.in
rename to ruamoko/qwaq/progs.src.in
diff --git a/tools/qwaq/qwaq-app.h b/ruamoko/qwaq/qwaq-app.h
similarity index 100%
rename from tools/qwaq/qwaq-app.h
rename to ruamoko/qwaq/qwaq-app.h
diff --git a/tools/qwaq/qwaq-app.r b/ruamoko/qwaq/qwaq-app.r
similarity index 100%
rename from tools/qwaq/qwaq-app.r
rename to ruamoko/qwaq/qwaq-app.r
diff --git a/tools/qwaq/qwaq-bi.c b/ruamoko/qwaq/qwaq-bi.c
similarity index 100%
rename from tools/qwaq/qwaq-bi.c
rename to ruamoko/qwaq/qwaq-bi.c
diff --git a/tools/qwaq/qwaq-curses.c b/ruamoko/qwaq/qwaq-curses.c
similarity index 100%
rename from tools/qwaq/qwaq-curses.c
rename to ruamoko/qwaq/qwaq-curses.c
diff --git a/tools/qwaq/qwaq-curses.h b/ruamoko/qwaq/qwaq-curses.h
similarity index 100%
rename from tools/qwaq/qwaq-curses.h
rename to ruamoko/qwaq/qwaq-curses.h
diff --git a/tools/qwaq/qwaq-view.h b/ruamoko/qwaq/qwaq-view.h
similarity index 100%
rename from tools/qwaq/qwaq-view.h
rename to ruamoko/qwaq/qwaq-view.h
diff --git a/tools/qwaq/qwaq-view.r b/ruamoko/qwaq/qwaq-view.r
similarity index 100%
rename from tools/qwaq/qwaq-view.r
rename to ruamoko/qwaq/qwaq-view.r
diff --git a/tools/qwaq/qwaq-window.h b/ruamoko/qwaq/qwaq-window.h
similarity index 100%
rename from tools/qwaq/qwaq-window.h
rename to ruamoko/qwaq/qwaq-window.h
diff --git a/tools/qwaq/qwaq-window.r b/ruamoko/qwaq/qwaq-window.r
similarity index 100%
rename from tools/qwaq/qwaq-window.r
rename to ruamoko/qwaq/qwaq-window.r
diff --git a/tools/qwaq/qwaq.c b/ruamoko/qwaq/qwaq.c
similarity index 100%
rename from tools/qwaq/qwaq.c
rename to ruamoko/qwaq/qwaq.c
diff --git a/tools/qwaq/qwaq.h b/ruamoko/qwaq/qwaq.h
similarity index 100%
rename from tools/qwaq/qwaq.h
rename to ruamoko/qwaq/qwaq.h
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 008638b4a..768efdccb 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,5 +1,5 @@
 SUBDIRS=@tools_dirs@
-DIST_SUBDIRS=bsp2img carne pak qfbsp qfcc qflight qflmp qfmodelgen qfspritegen qfvis qwaq wad wav
+DIST_SUBDIRS=bsp2img carne pak qfbsp qfcc qflight qflmp qfmodelgen qfspritegen qfvis wad wav
 EXTRA_DIST= \
 	io_mesh_qfmdl/export_mdl.py io_mesh_qfmdl/import_mdl.py \
 	io_mesh_qfmdl/__init__.py io_mesh_qfmdl/mdl.py io_mesh_qfmdl/qfplist.py \

From 1033716b2b7c893a2d0098c299c313d80bdd89c9 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 1 Mar 2020 13:53:18 +0900
Subject: [PATCH 0563/1519] [qfcc] Fix some curly space

---
 tools/qfcc/source/class.c  | 3 ++-
 tools/qfcc/source/method.c | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/tools/qfcc/source/class.c b/tools/qfcc/source/class.c
index caa1967cd..841fa53a0 100644
--- a/tools/qfcc/source/class.c
+++ b/tools/qfcc/source/class.c
@@ -925,7 +925,7 @@ class_find_method (class_type_t *class_type, method_t *method)
 	start_methods = methods;
 	start_class = class;
 	while (class) {
-		for (m = methods->head; m; m = m->next)
+		for (m = methods->head; m; m = m->next) {
 			if (method_compare (method, m)) {
 				if (m->type != method->type)
 					error (0, "method type mismatch");
@@ -937,6 +937,7 @@ class_find_method (class_type_t *class_type, method_t *method)
 				method_set_param_names (m, method);
 				return m;
 			}
+		}
 		if (class->methods == methods)
 			class = class->super_class;
 		else
diff --git a/tools/qfcc/source/method.c b/tools/qfcc/source/method.c
index 883133b64..726acfd76 100644
--- a/tools/qfcc/source/method.c
+++ b/tools/qfcc/source/method.c
@@ -474,7 +474,7 @@ emit_methods (methodlist_t *methods, const char *name, int instance)
 	if (!methods)
 		return 0;
 
-	for (count = 0, m = methods->head; m; m = m->next)
+	for (count = 0, m = methods->head; m; m = m->next) {
 		if (!m->instance == !instance) {
 			if (!m->def && options.warnings.unimplemented) {
 				warning (0, "Method `%c%s' not implemented",
@@ -483,6 +483,7 @@ emit_methods (methodlist_t *methods, const char *name, int instance)
 			if (m->def)
 				count++;
 		}
+	}
 	if (!count)
 		return 0;
 	methods->count = count;

From caa297b756d5ced81908d66b7b23eb600e61c6c6 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 1 Mar 2020 16:13:18 +0900
Subject: [PATCH 0564/1519] [qfcc] Remove type alias encoding

It proved to be too fragile in its current implementation. It broke
pointers to incomplete structs and switch enum checking, and getting it
to work for other things was overly invasive. I still want the encoding,
but need to come up with something more robust.a
---
 include/QF/pr_type.h             |  7 ----
 tools/qfcc/include/type.h        | 12 ++-----
 tools/qfcc/source/def.c          |  2 +-
 tools/qfcc/source/dump_globals.c |  4 ---
 tools/qfcc/source/expr.c         |  6 ++--
 tools/qfcc/source/function.c     |  5 +--
 tools/qfcc/source/obj_file.c     |  6 ----
 tools/qfcc/source/obj_type.c     | 18 ----------
 tools/qfcc/source/qc-parse.y     |  3 --
 tools/qfcc/source/type.c         | 56 ++------------------------------
 tools/qfcc/test/Makefile.am      |  1 -
 11 files changed, 8 insertions(+), 112 deletions(-)

diff --git a/include/QF/pr_type.h b/include/QF/pr_type.h
index 179a4e407..c7fbc4b9c 100644
--- a/include/QF/pr_type.h
+++ b/include/QF/pr_type.h
@@ -47,14 +47,8 @@ typedef enum {
 	ty_enum,
 	ty_array,
 	ty_class,
-	ty_alias,
 } ty_meta_e;
 
-typedef struct qfot_alias_s {
-	pr_int_t    type;				///< type at end of alias chain
-	pointer_t   aux_type;			///< referenced type
-	string_t    name;				///< alias name
-} qfot_alias_t;
 
 typedef struct qfot_fldptr_s {
 	pr_int_t    type;				///< ev_field or ev_pointer
@@ -110,7 +104,6 @@ typedef struct qfot_type_s {
 		qfot_struct_t strct;		///< ty_struct/ty_union/ty_enum
 		qfot_array_t array;			///< ty_array
 		string_t    class;			///< ty_class
-		qfot_alias_t alias;			///< ty_alias
 	}           t;
 } qfot_type_t;
 
diff --git a/tools/qfcc/include/type.h b/tools/qfcc/include/type.h
index 46d524574..21f4feb2c 100644
--- a/tools/qfcc/include/type.h
+++ b/tools/qfcc/include/type.h
@@ -51,10 +51,6 @@ typedef struct ty_array_s {
 	int         size;
 } ty_array_t;
 
-typedef struct ty_alias_s {
-	struct type_s *type;
-} ty_alias_t;
-
 typedef struct type_s {
 	etype_t     type;		///< ev_invalid means structure/array etc
 	const char *name;
@@ -68,7 +64,6 @@ typedef struct type_s {
 		ty_array_t  array;
 		struct symtab_s *symtab;
 		struct class_s *class;
-		ty_alias_t  alias;
 	} t;
 	struct type_s *next;
 	int         freeable;
@@ -133,9 +128,8 @@ void chain_type (type_t *type);
 
 /**	Append a type to the end of a type chain.
 
-	The type chain must be made up of only field, pointer, function, array
-	and alias (typedef) types, as other types do not have auxiliary type
-	fields.
+	The type chain must be made up of only field, pointer, function, and
+	array types, as other types do not have auxiliary type fields.
 
 	\param type		The type chain to which the type will be appended.
 	\param new		The type to be appended. May be any type.
@@ -149,13 +143,11 @@ type_t *field_type (type_t *aux);
 type_t *pointer_type (type_t *aux);
 type_t *array_type (type_t *aux, int size);
 type_t *based_array_type (type_t *aux, int base, int top);
-type_t *alias_type (type_t *aux, const char *name);
 void print_type_str (struct dstring_s *str, const type_t *type);
 void print_type (const type_t *type);
 const char *encode_params (const type_t *type);
 void encode_type (struct dstring_s *encoding, const type_t *type);
 const char *type_get_encoding (const type_t *type);
-const type_t *unalias_type (const type_t *type) __attribute__((pure));
 int is_void (const type_t *type) __attribute__((pure));
 int is_enum (const type_t *type) __attribute__((pure));
 int is_integer (const type_t *type) __attribute__((pure));
diff --git a/tools/qfcc/source/def.c b/tools/qfcc/source/def.c
index 049740563..82e88c5ae 100644
--- a/tools/qfcc/source/def.c
+++ b/tools/qfcc/source/def.c
@@ -358,7 +358,7 @@ init_elements (struct def_s *def, expr_t *eles)
 		num_elements = i;
 	} else if (is_struct (def->type) || is_vector (def->type)
 			   || is_quaternion (def->type)) {
-		symtab_t   *symtab = unalias_type (def->type)->t.symtab;
+		symtab_t   *symtab = def->type->t.symtab;
 		symbol_t   *field;
 
 		for (i = 0, field = symtab->symbols; field; field = field->next) {
diff --git a/tools/qfcc/source/dump_globals.c b/tools/qfcc/source/dump_globals.c
index 9343a0ac7..657f016e8 100644
--- a/tools/qfcc/source/dump_globals.c
+++ b/tools/qfcc/source/dump_globals.c
@@ -547,10 +547,6 @@ dump_qfo_types (qfo_t *qfo, int base_address)
 				printf (" %-5x %d %d\n", type->t.array.type,
 						type->t.array.base, type->t.array.size);
 				break;
-			case ty_alias:
-				printf (" %s %d %-5x\n", QFO_GETSTR (qfo, type->t.alias.name),
-						type->t.alias.type, type->t.alias.aux_type);
-				break;
 			case ty_class:
 				printf (" %-5x\n", type->t.class);
 				break;
diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index 7d5baddb9..ad91a8d81 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -1140,7 +1140,7 @@ append_expr (expr_t *block, expr_t *e)
 static symbol_t *
 get_struct_field (const type_t *t1, expr_t *e1, expr_t *e2)
 {
-	symtab_t   *strct = unalias_type (t1)->t.symtab;
+	symtab_t   *strct = t1->t.symtab;
 	symbol_t   *sym = e2->e.symbol;//FIXME need to check
 	symbol_t   *field;
 
@@ -1165,7 +1165,6 @@ field_expr (expr_t *e1, expr_t *e2)
 	t1 = get_type (e1);
 	if (e1->type == ex_error)
 		return e1;
-	t1 = unalias_type (t1);
 	if (t1->type == ev_entity) {
 		symbol_t   *field = 0;
 
@@ -1639,7 +1638,6 @@ build_function_call (expr_t *fexpr, const type_t *ftype, expr_t *params)
 	expr_t     *call;
 	expr_t     *err = 0;
 
-	ftype = unalias_type (ftype);
 
 	for (e = params; e; e = e->next) {
 		if (e->type == ex_error)
@@ -2375,7 +2373,7 @@ cast_expr (type_t *dstType, expr_t *e)
 
 	srcType = get_type (e);
 
-	if (unalias_type (dstType) == unalias_type (srcType))
+	if (dstType == srcType)
 		return e;
 
 	if ((dstType == type_default && is_enum (srcType))
diff --git a/tools/qfcc/source/function.c b/tools/qfcc/source/function.c
index eb376e0ea..538bb8f65 100644
--- a/tools/qfcc/source/function.c
+++ b/tools/qfcc/source/function.c
@@ -177,10 +177,7 @@ parse_params (type_t *type, param_t *parms)
 				internal_error (0, 0);
 			new->t.func.num_params = -(new->t.func.num_params + 1);
 		} else if (p->type) {
-			// FIXME this cast should not be necessary, but making the
-			// type system const-correct would probably take a rewrite
-			type_t     *t = (type_t *) unalias_type (p->type);
-			new->t.func.param_types[new->t.func.num_params] = t;
+			new->t.func.param_types[new->t.func.num_params] = p->type;
 			new->t.func.num_params++;
 		}
 	}
diff --git a/tools/qfcc/source/obj_file.c b/tools/qfcc/source/obj_file.c
index d1c5296c4..6ceb1a74e 100644
--- a/tools/qfcc/source/obj_file.c
+++ b/tools/qfcc/source/obj_file.c
@@ -648,10 +648,8 @@ get_def_type (qfo_t *qfo, pointer_t type)
 	type_def = QFO_POINTER (qfo, qfo_type_space, qfot_type_t, type);
 	switch ((ty_meta_e)type_def->meta) {
 		case ty_basic:
-		case ty_alias:
 			// field, pointer and function types store their basic type in
 			// the same location.
-			// alias types store the basic type at the end of the alias chain
 			return type_def->t.type;
 		case ty_struct:
 		case ty_union:
@@ -676,8 +674,6 @@ get_type_size (qfo_t *qfo, pointer_t type)
 		return 1;
 	type_def = QFO_POINTER (qfo, qfo_type_space, qfot_type_t, type);
 	switch ((ty_meta_e)type_def->meta) {
-		case ty_alias:
-			return get_type_size (qfo, type_def->t.alias.aux_type);
 		case ty_basic:
 			// field, pointer and function types store their basic type in
 			// the same location.
@@ -726,8 +722,6 @@ get_type_alignment_log (qfo_t *qfo, pointer_t type)
 		return 0;
 	type_def = QFO_POINTER (qfo, qfo_type_space, qfot_type_t, type);
 	switch ((ty_meta_e)type_def->meta) {
-		case ty_alias:
-			return get_type_alignment_log (qfo, type_def->t.alias.aux_type);
 		case ty_basic:
 			// field, pointer and function types store their basic type in
 			// the same location.
diff --git a/tools/qfcc/source/obj_type.c b/tools/qfcc/source/obj_type.c
index ff2409986..c21e7e576 100644
--- a/tools/qfcc/source/obj_type.c
+++ b/tools/qfcc/source/obj_type.c
@@ -253,23 +253,6 @@ qfo_encode_class (type_t *type)
 	return def;
 }
 
-static def_t *
-qfo_encode_alias (type_t *type)
-{
-	qfot_type_t *enc;
-	def_t      *def;
-	def_t      *alias_type_def;
-
-	alias_type_def = qfo_encode_type (type->t.alias.type);
-
-	def = qfo_new_encoding (type, sizeof (enc->t.alias));
-	enc = D_POINTER (qfot_type_t, def);
-	enc->t.alias.type = type->type;
-	ENC_DEF (enc->t.alias.aux_type, alias_type_def);
-	ENC_STR (enc->t.alias.name, type->name);
-	return def;
-}
-
 def_t *
 qfo_encode_type (type_t *type)
 {
@@ -282,7 +265,6 @@ qfo_encode_type (type_t *type)
 		qfo_encode_struct,	// ty_enum
 		qfo_encode_array,	// ty_array
 		qfo_encode_class,	// ty_class
-		qfo_encode_alias,	// ty_alias
 	};
 
 	if (type->type_def && type->type_def->external) {
diff --git a/tools/qfcc/source/qc-parse.y b/tools/qfcc/source/qc-parse.y
index 07c12692e..1bcd240c1 100644
--- a/tools/qfcc/source/qc-parse.y
+++ b/tools/qfcc/source/qc-parse.y
@@ -406,7 +406,6 @@ external_decl
 			$1->type = find_type (append_type ($1->type, spec.type));
 			if (spec.is_typedef) {
 				$1->sy_type = sy_type;
-				$1->type = alias_type ($1->type, $1->name);
 				symtab_addsymbol (current_symtab, $1);
 			} else {
 				initialize_def ($1, 0, current_symtab->space, spec.storage);
@@ -422,7 +421,6 @@ external_decl
 			if (spec.is_typedef) {
 				error (0, "typedef %s is initialized", $1->name);
 				$1->sy_type = sy_type;
-				$1->type = alias_type ($1->type, $1->name);
 				symtab_addsymbol (current_symtab, $1);
 			} else {
 				initialize_def ($1, $2, current_symtab->space, spec.storage);
@@ -436,7 +434,6 @@ external_decl
 			$1->type = find_type (append_type ($1->type, spec.type));
 			if (spec.is_typedef) {
 				$1->sy_type = sy_type;
-				$1->type = alias_type ($1->type, $1->name);
 				symtab_addsymbol (current_symtab, $1);
 			} else {
 				$1 = function_symbol ($1, spec.is_overload, 1);
diff --git a/tools/qfcc/source/type.c b/tools/qfcc/source/type.c
index a583a943c..4fd77a9fd 100644
--- a/tools/qfcc/source/type.c
+++ b/tools/qfcc/source/type.c
@@ -297,8 +297,6 @@ types_same (type_t *a, type_t *b)
 			if (a->t.class != b->t.class)
 				return 0;
 			return compare_protocols (a->protos, b->protos);
-		case ty_alias:
-			return !strcmp (a->name, b->name);
 	}
 	internal_error (0, "we be broke");
 }
@@ -348,9 +346,6 @@ find_type (type_t *type)
 				break;
 			case ty_class:
 				break;
-			case ty_alias:
-				type->t.alias.type = find_type (type->t.alias.type);
-				break;
 		}
 	}
 
@@ -450,25 +445,6 @@ based_array_type (type_t *aux, int base, int top)
 	return new;
 }
 
-type_t *
-alias_type (type_t *aux, const char *name)
-{
-	type_t      _new;
-	type_t     *new = &_new;
-
-	if (!aux || !name) {
-		internal_error (0, "alias to null type or with no name");
-	}
-	memset (&_new, 0, sizeof (_new));
-	new->name = save_string (name);
-	new->meta = ty_alias;
-	new->type = aux->type;
-	new->alignment = aux->alignment;
-	new->t.alias.type = aux;
-	new = find_type (new);
-	return new;
-}
-
 void
 print_type_str (dstring_t *str, const type_t *type)
 {
@@ -500,11 +476,6 @@ print_type_str (dstring_t *str, const type_t *type)
 				dasprintf (str, "[%d]", type->t.array.size);
 			}
 			return;
-		case ty_alias:
-			dasprintf (str, "({%s=", type->name);
-			print_type_str (str, type->t.alias.type);
-			dstring_appendstr (str, "})");
-			return;
 		case ty_basic:
 			switch (type->type) {
 				case ev_field:
@@ -658,11 +629,6 @@ encode_type (dstring_t *encoding, const type_t *type)
 			encode_type (encoding, type->t.array.type);
 			dasprintf (encoding, "]");
 			return;
-		case ty_alias:
-			dasprintf (encoding, "{%s>", type->name);
-			encode_type (encoding, type->t.alias.type);
-			dasprintf (encoding, "}");
-			return;
 		case ty_basic:
 			switch (type->type) {
 				case ev_void:
@@ -730,15 +696,6 @@ encode_type (dstring_t *encoding, const type_t *type)
 	internal_error (0, "bad type meta:type %d:%d", type->meta, type->type);
 }
 
-const type_t *
-unalias_type (const type_t *type)
-{
-	while (type->meta == ty_alias) {
-		type = type->t.alias.type;
-	}
-	return type;
-}
-
 int
 is_void (const type_t *type)
 {
@@ -748,7 +705,6 @@ is_void (const type_t *type)
 int
 is_enum (const type_t *type)
 {
-	type = unalias_type (type);
 	if (type->type == ev_invalid && type->meta == ty_enum)
 		return 1;
 	return 0;
@@ -833,7 +789,6 @@ is_math (const type_t *type)
 int
 is_struct (const type_t *type)
 {
-	type = unalias_type (type);
 	if (type->type == ev_invalid
 		&& (type->meta == ty_struct || type->meta == ty_union))
 		return 1;
@@ -859,7 +814,6 @@ is_field (const type_t *type)
 int
 is_array (const type_t *type)
 {
-	type = unalias_type (type);
 	if (type->type == ev_invalid && type->meta == ty_array)
 		return 1;
 	return 0;
@@ -884,8 +838,6 @@ is_string (const type_t *type)
 int
 type_compatible (const type_t *dst, const type_t *src)
 {
-	dst = unalias_type (dst);
-	src = unalias_type (src);
 	// same type
 	if (dst == src) {
 		return 1;
@@ -905,8 +857,6 @@ type_compatible (const type_t *dst, const type_t *src)
 int
 type_assignable (const type_t *dst, const type_t *src)
 {
-	dst = unalias_type (dst);
-	src = unalias_type (src);
 	int         ret;
 
 	// same type
@@ -932,8 +882,8 @@ type_assignable (const type_t *dst, const type_t *src)
 	if (ret >= 0)
 		return ret;
 
-	dst = unalias_type (dst->t.fldptr.type);
-	src = unalias_type (src->t.fldptr.type);
+	dst = dst->t.fldptr.type;
+	src = src->t.fldptr.type;
 	if (dst == src) {
 		return 1;
 	}
@@ -972,8 +922,6 @@ type_size (const type_t *type)
 					size += type_size (class->super_class->type);
 				return size;
 			}
-		case ty_alias:
-			return type_size (type->t.alias.type);
 	}
 	return 0;
 }
diff --git a/tools/qfcc/test/Makefile.am b/tools/qfcc/test/Makefile.am
index c53dd7cbf..937686a6e 100644
--- a/tools/qfcc/test/Makefile.am
+++ b/tools/qfcc/test/Makefile.am
@@ -55,7 +55,6 @@ test_progs_dat=\
 	structstruct.dat \
 	swap.dat \
 	triangle.dat \
-	typedef.dat \
 	vecexpr.dat \
 	vecinit.dat \
 	voidfor.dat \

From 4d076da4b6b2b78f7f1b0315331eae0f3a2f7cc8 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 1 Mar 2020 16:15:33 +0900
Subject: [PATCH 0565/1519] [qwaq] Fix warning hidden by type alias bug

---
 ruamoko/qwaq/qwaq-view.r | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ruamoko/qwaq/qwaq-view.r b/ruamoko/qwaq/qwaq-view.r
index 3673b8fee..e71006846 100644
--- a/ruamoko/qwaq/qwaq-view.r
+++ b/ruamoko/qwaq/qwaq-view.r
@@ -96,6 +96,8 @@ rectContainsPoint (Rect *rect, Point *point)
 				}
 			}
 			break;
+		case qe_none:
+			break;
 	}
 	return self;
 }

From 4e4b553cc3c2fbc958007758f0c585052e445029 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 1 Mar 2020 16:20:23 +0900
Subject: [PATCH 0566/1519] [gamecode] Take care of missed type alias stuff

---
 include/QF/progs.h       |  1 -
 libs/gamecode/pr_debug.c | 19 -------------------
 2 files changed, 20 deletions(-)

diff --git a/include/QF/progs.h b/include/QF/progs.h
index 5abd0d1c6..18ea33b04 100644
--- a/include/QF/progs.h
+++ b/include/QF/progs.h
@@ -1575,7 +1575,6 @@ typedef struct type_view_s {
 	type_view_func enum_view;
 	type_view_func array_view;
 	type_view_func class_view;
-	type_view_func alias_view;
 } type_view_t;
 
 void PR_Debug_Init (progs_t *pr);
diff --git a/libs/gamecode/pr_debug.c b/libs/gamecode/pr_debug.c
index e7bf90a92..28bb97e54 100644
--- a/libs/gamecode/pr_debug.c
+++ b/libs/gamecode/pr_debug.c
@@ -132,8 +132,6 @@ static void pr_debug_array_view (qfot_type_t *type, pr_type_t *value,
 								void *_data);
 static void pr_debug_class_view (qfot_type_t *type, pr_type_t *value,
 								void *_data);
-static void pr_debug_alias_view (qfot_type_t *type, pr_type_t *value,
-								void *_data);
 
 static type_view_t raw_type_view = {
 	pr_debug_void_view,
@@ -154,7 +152,6 @@ static type_view_t raw_type_view = {
 	pr_debug_enum_view,
 	pr_debug_array_view,
 	pr_debug_class_view,
-	pr_debug_alias_view,
 };
 
 static const char *
@@ -226,9 +223,6 @@ pr_debug_type_size (const progs_t *pr, const qfot_type_t *type)
 			return type->t.array.size * size;
 		case ty_class:
 			return 1;	//FIXME or should it return sizeof class struct?
-		case ty_alias:
-			aux_type = &G_STRUCT (pr, qfot_type_t, type->t.alias.aux_type);
-			return pr_debug_type_size (pr, aux_type);
 	}
 	return 0;
 }
@@ -860,9 +854,6 @@ value_string (pr_debug_data_t *data, qfot_type_t *type, pr_type_t *value)
 		case ty_class:
 			raw_type_view.class_view (type, value, data);
 			break;
-		case ty_alias:
-			raw_type_view.alias_view (type, value, data);
-			break;
 	}
 	return data->dstr->str;
 }
@@ -1171,16 +1162,6 @@ pr_debug_class_view (qfot_type_t *type, pr_type_t *value, void *_data)
 	dstring_appendstr (dstr, "<class>");
 }
 
-static void
-pr_debug_alias_view (qfot_type_t *type, pr_type_t *value, void *_data)
-{
-	__auto_type data = (pr_debug_data_t *) _data;
-	progs_t    *pr = data->pr;
-
-	type = &G_STRUCT (pr, qfot_type_t, type->t.alias.aux_type);
-	value_string (data, type, value);
-}
-
 VISIBLE void
 PR_Debug_Watch (progs_t *pr, const char *expr)
 {

From 277c64a4607b2f5b32b01497f4b2b19a9754e231 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 1 Mar 2020 17:28:33 +0900
Subject: [PATCH 0567/1519] [qfcc] Correct a typo

---
 tools/qfcc/source/idstuff.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/qfcc/source/idstuff.c b/tools/qfcc/source/idstuff.c
index 629862003..2f195b7e2 100644
--- a/tools/qfcc/source/idstuff.c
+++ b/tools/qfcc/source/idstuff.c
@@ -295,7 +295,7 @@ WriteProgdefs (dprograms_t *progs, const char *filename)
 	crc = CRC_Block ((byte *) dstr->str, dstr->size - 1);
 
 	dasprintf (dstr, "#define PROGHEADER_CRC %u\n", crc);
-	dstring_insertstr (dstr, 0, "/* Actually, generated by qfcc, be one must "
+	dstring_insertstr (dstr, 0, "/* Actually, generated by qfcc, but one must "
 					   "maintain formalities */");
 
 	if (filename) {

From b5443216097966c06e39fb5319a4ac5bc6cc7415 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 1 Mar 2020 17:43:28 +0900
Subject: [PATCH 0568/1519] [qfcc] Catch deferences to incomplete types

Reporting an error is so much more helpful than segmentation fault.
---
 tools/qfcc/source/class.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/qfcc/source/class.c b/tools/qfcc/source/class.c
index 841fa53a0..682bf59f5 100644
--- a/tools/qfcc/source/class.c
+++ b/tools/qfcc/source/class.c
@@ -889,6 +889,10 @@ class_find_ivar (class_t *class, int vis, const char *name)
 {
 	symbol_t   *ivar;
 
+	if (!class->ivars) {
+		error (0, "accessing incomplete type %s", class->name);
+		return 0;
+	}
 	ivar = symtab_lookup (class->ivars, name);
 	if (ivar) {
 		if (ivar->visibility > (vis_t) vis)

From 80d9401eeeb58a620b4ce8344ab2ad24b9803cdb Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 1 Mar 2020 17:44:13 +0900
Subject: [PATCH 0569/1519] [qfcc] Report errors for objects in function decls

The number of time's I've forgotten the * in a declaration in objective
code (probably thanks to C#'s lack of them).
---
 tools/qfcc/source/function.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tools/qfcc/source/function.c b/tools/qfcc/source/function.c
index 538bb8f65..3b844b5a3 100644
--- a/tools/qfcc/source/function.c
+++ b/tools/qfcc/source/function.c
@@ -46,6 +46,7 @@
 
 #include "qfcc.h"
 
+#include "class.h"
 #include "codespace.h"
 #include "debug.h"
 #include "def.h"
@@ -157,6 +158,11 @@ parse_params (type_t *type, param_t *parms)
 	type_t     *new;
 	int         count = 0;
 
+	if (type && obj_is_class (type)) {
+		error (0, "cannot return an object (forgot *?)");
+		type = &type_id;
+	}
+
 	new = new_type ();
 	new->type = ev_func;
 	new->alignment = 1;
@@ -177,6 +183,10 @@ parse_params (type_t *type, param_t *parms)
 				internal_error (0, 0);
 			new->t.func.num_params = -(new->t.func.num_params + 1);
 		} else if (p->type) {
+			if (obj_is_class (p->type)) {
+				error (0, "cannot use an object as a parameter (forgot *?)");
+				p->type = &type_id;
+			}
 			new->t.func.param_types[new->t.func.num_params] = p->type;
 			new->t.func.num_params++;
 		}

From 92cb3a5285fb75538255c18e2e2dc692e4ecf74b Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 1 Mar 2020 18:25:02 +0900
Subject: [PATCH 0570/1519] [qwaq] Flatten the hierarchy and do some cleanup

---
 ruamoko/qwaq/Makefile.am   |  2 +-
 ruamoko/qwaq/qwaq-app.h    |  6 ++--
 ruamoko/qwaq/qwaq-app.r    | 18 +++++-----
 ruamoko/qwaq/qwaq-rect.h   | 21 +++++++++++
 ruamoko/qwaq/qwaq-screen.h | 22 ++++++++++++
 ruamoko/qwaq/qwaq-screen.r | 32 +++++++++++++++++
 ruamoko/qwaq/qwaq-view.h   | 30 ++--------------
 ruamoko/qwaq/qwaq-view.r   | 71 +-------------------------------------
 ruamoko/qwaq/qwaq-window.h | 18 ++++++++--
 ruamoko/qwaq/qwaq-window.r | 63 +++++++++++++++++++++++++++++++++
 10 files changed, 172 insertions(+), 111 deletions(-)
 create mode 100644 ruamoko/qwaq/qwaq-rect.h
 create mode 100644 ruamoko/qwaq/qwaq-screen.h
 create mode 100644 ruamoko/qwaq/qwaq-screen.r

diff --git a/ruamoko/qwaq/Makefile.am b/ruamoko/qwaq/Makefile.am
index f38fc77e5..38584d949 100644
--- a/ruamoko/qwaq/Makefile.am
+++ b/ruamoko/qwaq/Makefile.am
@@ -57,7 +57,7 @@ qwaq_x11_DEPENDENCIES= $(qwaq_x11_libs) $(QWAQ_DEPS)
 
 r_depfiles_remade=
 
-qwaq_app_dat_SOURCES=qwaq-app.r qwaq-view.r qwaq-window.r
+qwaq_app_dat_SOURCES=qwaq-app.r qwaq-screen.r qwaq-window.r qwaq-view.r
 qwaq_app_obj=$(qwaq_app_dat_SOURCES:.r=.o)
 qwaq_app_dep=$(addprefix ./$(DEPDIR)/,$(qwaq_app_obj:.o=.Qo))
 qwaq-app.dat$(EXEEXT): $(qwaq_app_obj) $(QFCC_DEP)
diff --git a/ruamoko/qwaq/qwaq-app.h b/ruamoko/qwaq/qwaq-app.h
index c02beac67..b603fb4b1 100644
--- a/ruamoko/qwaq/qwaq-app.h
+++ b/ruamoko/qwaq/qwaq-app.h
@@ -1,15 +1,15 @@
 #ifndef __qwaq_app_h
 #define __qwaq_app_h
 
-#include "qwaq-view.h"
-
 #include "event.h"
 
+@class Screen;
+
 @interface QwaqApplication: Object
 {
 	qwaq_event_t event;
 	qwaq_command endState;
-	View *view;
+	Screen     *screen;
 }
 -run;
 -handleEvent: (qwaq_event_t *) event;
diff --git a/ruamoko/qwaq/qwaq-app.r b/ruamoko/qwaq/qwaq-app.r
index 80ed06c41..d9051f4d9 100644
--- a/ruamoko/qwaq/qwaq-app.r
+++ b/ruamoko/qwaq/qwaq-app.r
@@ -4,6 +4,8 @@
 #include "qwaq-app.h"
 #include "qwaq-curses.h"
 #include "qwaq-window.h"
+#include "qwaq-screen.h"
+#include "qwaq-view.h"
 
 static AutoreleasePool *autorelease_pool;
 static void
@@ -33,18 +35,18 @@ arp_end (void)
 	initialize ();
 	init_pair (1, COLOR_WHITE, COLOR_BLUE);
 	init_pair (2, COLOR_WHITE, COLOR_BLACK);
-	view = [[View viewFromWindow:stdscr] retain];
-	[view setBackground: COLOR_PAIR (1)];
-	Rect r = view.rect;
-	wprintf (view.window, "%d %d %d %d\n", r.xpos, r.ypos, r.xlen, r.ylen);
+	screen = [[Screen screen] retain];
+	[screen setBackground: COLOR_PAIR (1)];
+	Rect r = screen.rect;
+	wprintf (screen.window, "%d %d %d %d\n", r.xpos, r.ypos, r.xlen, r.ylen);
 	r.xpos = r.xlen / 4;
 	r.ypos = r.ylen / 4;
 	r.xlen /= 2;
 	r.ylen /= 2;
-	wprintf (view.window, "%d %d %d %d\n", r.xpos, r.ypos, r.xlen, r.ylen);
-	wrefresh(view.window);
+	wprintf (screen.window, "%d %d %d %d\n", r.xpos, r.ypos, r.xlen, r.ylen);
+	wrefresh(screen.window);
 	Window *w;
-	[view addView: w=[[Window windowWithRect: r] setBackground: COLOR_PAIR (2)]];
+	[screen add: w=[[Window windowWithRect: r] setBackground: COLOR_PAIR (2)]];
 	wprintf (w.window, "%d %d %d %d\n", r.xpos, r.ypos, r.xlen, r.ylen);
 	return self;
 }
@@ -68,7 +70,7 @@ arp_end (void)
 
 -handleEvent: (qwaq_event_t *) event
 {
-	[view handleEvent: event];
+	[screen handleEvent: event];
 	if (event.event_type == qe_key && event.e.key == '\x18') {
 		event.event_type = qe_command;
 		event.e.message.command = qc_exit;
diff --git a/ruamoko/qwaq/qwaq-rect.h b/ruamoko/qwaq/qwaq-rect.h
new file mode 100644
index 000000000..0c26b5817
--- /dev/null
+++ b/ruamoko/qwaq/qwaq-rect.h
@@ -0,0 +1,21 @@
+#ifndef __qwaq_rect_h
+#define __qwaq_rect_h
+
+typedef struct {
+	int         xpos;
+	int         ypos;
+	int         xlen;
+	int         ylen;
+} Rect;
+
+typedef struct {
+	int         x;
+	int         y;
+} Point;
+
+@extern Rect makeRect (int xpos, int ypos, int xlen, int ylen);
+//XXX will not work if point or rect point to a local variabl
+@extern int rectContainsPoint (Rect *rect, Point *point);
+@extern Rect getwrect (struct window_s *window);
+
+#endif//__qwaq_rect_h
diff --git a/ruamoko/qwaq/qwaq-screen.h b/ruamoko/qwaq/qwaq-screen.h
new file mode 100644
index 000000000..365c54506
--- /dev/null
+++ b/ruamoko/qwaq/qwaq-screen.h
@@ -0,0 +1,22 @@
+#ifndef __qwaq_screen_h
+#define __qwaq_screen_h
+
+#include <Object.h>
+
+#include "qwaq-rect.h"
+@class View;
+@class Array;
+
+@interface Screen: Object
+{
+	Rect        rect;
+	Array      *views;
+	View       *focusedView;
+	struct window_s *window;
+}
++(Screen *) screen;
+-add: obj;
+-setBackground: (int) ch;
+@end
+
+#endif//__qwaq_screen_h
diff --git a/ruamoko/qwaq/qwaq-screen.r b/ruamoko/qwaq/qwaq-screen.r
new file mode 100644
index 000000000..cd4e25365
--- /dev/null
+++ b/ruamoko/qwaq/qwaq-screen.r
@@ -0,0 +1,32 @@
+#include "qwaq-curses.h"
+#include "qwaq-screen.h"
+
+@implementation Screen
++(Screen *) screen
+{
+	return [[[self alloc] init] autorelease];
+}
+
+-init
+{
+	if (!(self = [super init])) {
+		return nil;
+	}
+	window = stdscr;
+	rect = getwrect (window);
+	return self;
+}
+
+-add: obj
+{
+	return self;
+}
+
+-setBackground: (int) ch
+{
+	wbkgd (window, ch);
+	wrefresh (window);
+	return self;
+}
+
+@end
diff --git a/ruamoko/qwaq/qwaq-view.h b/ruamoko/qwaq/qwaq-view.h
index 63a9b4db5..811998ed0 100644
--- a/ruamoko/qwaq/qwaq-view.h
+++ b/ruamoko/qwaq/qwaq-view.h
@@ -4,41 +4,17 @@
 #include <Array.h>
 #include <Object.h>
 
-#include "event.h"
-#include "qwaq-curses.h"
-
-typedef struct {
-	int         xpos;
-	int         ypos;
-	int         xlen;
-	int         ylen;
-} Rect;
-
-typedef struct {
-	int         x;
-	int         y;
-} Point;
-
-@extern Rect makeRect (int xpos, int ypos, int xlen, int ylen);
-//XXX will not work if point or rect point to a local variabl
-@extern int rectContainsPoint (Rect *rect, Point *point);
-@extern Rect getwrect (window_t window);
+#include "qwaq-rect.h"
 
 @interface View: Object
 {
 	Rect        rect;
 	Rect        absRect;
-	Array      *views;
 	Point       point;		// can't be local :(
-	View       *focusedView;
-	window_t    window;
-	panel_t     panel;
+	struct window_s *window;
 }
-+viewFromWindow: (window_t) window;
 -initWithRect: (Rect) rect;
--handleEvent: (qwaq_event_t *) event;
--addView: (View *) view;
--setBackground: (int) ch;
+-handleEvent: (struct qwaq_event_s *) event;
 @end
 
 #endif//__qwaq_view_h
diff --git a/ruamoko/qwaq/qwaq-view.r b/ruamoko/qwaq/qwaq-view.r
index e71006846..c03d880f4 100644
--- a/ruamoko/qwaq/qwaq-view.r
+++ b/ruamoko/qwaq/qwaq-view.r
@@ -17,11 +17,6 @@ rectContainsPoint (Rect *rect, Point *point)
 
 @implementation View
 
-+viewFromWindow: (window_t) window
-{
-	return [[[self alloc] initFromWindow: window] autorelease];
-}
-
 -initWithRect: (Rect) rect
 {
 	if (!(self = [super init])) {
@@ -29,76 +24,12 @@ rectContainsPoint (Rect *rect, Point *point)
 	}
 	self.rect = rect;
 	self.absRect = rect;
-	self.window = create_window (rect.xpos, rect.ypos, rect.xlen, rect.ylen);
-	self.panel = create_panel (self.window);
-	return self;
-}
-
--initFromWindow: (window_t) window
-{
-	if (!(self = [super init])) {
-		return nil;
-	}
-	rect = getwrect (window);
-	self.window = window;
-	self.panel = nil;
-	return self;
-}
-
--initWithPanel: (panel_t) panel
-{
-	if (!(self = [super init])) {
-		return nil;
-	}
-	self.panel = panel;
-	self.window = panel_window (panel);
-	rect = getwrect (window);
-	return self;
-}
-
--addView: (View *) view
-{
-	[views addObject: view];
-	return self;
-}
-
--setBackground: (int) ch
-{
-	wbkgd (window, ch);
-	if (!panel) {
-		wrefresh (window);
-	}
+	self.window = nil;
 	return self;
 }
 
 -handleEvent: (qwaq_event_t *) event
 {
-	switch (event.event_type) {
-		case qe_mouse:
-			point.x = event.e.mouse.x;
-			point.y = event.e.mouse.y;
-			for (int i = [views count]; i--> 0; ) {
-				View       *v = [views objectAtIndex: i];
-				if (rectContainsPoint (&v.absRect, &point)) {
-					[v handleEvent: event];
-					break;
-				}
-			}
-			break;
-		case qe_key:
-		case qe_command:
-			if (focusedView) {
-				[focusedView handleEvent: event];
-				for (int i = [views count];
-					 event.event_type != qe_none && i--> 0; ) {
-					View       *v = [views objectAtIndex: i];
-					 [v handleEvent: event];
-				}
-			}
-			break;
-		case qe_none:
-			break;
-	}
 	return self;
 }
 
diff --git a/ruamoko/qwaq/qwaq-window.h b/ruamoko/qwaq/qwaq-window.h
index 13730ccca..5d777c828 100644
--- a/ruamoko/qwaq/qwaq-window.h
+++ b/ruamoko/qwaq/qwaq-window.h
@@ -1,11 +1,25 @@
 #ifndef __qwaq_window_h
 #define __qwaq_window_h
 
-#include "qwaq-view.h"
+#include "Object.h"
 
-@interface Window: View
+@class View;
+@class Array;
+
+#include "qwaq-rect.h"
+
+@interface Window: Object
 {
+	Rect        rect;
+	Point       point;	// FIXME can't be local :(
+	Array      *views;
+	View       *focusedView;
+	struct window_s *window;
+	struct panel_s *panel;
 }
++windowWithRect: (Rect) rect;
+-addView: (View *) view;
+-setBackground: (int) ch;
 @end
 
 #endif//__qwaq_window_h
diff --git a/ruamoko/qwaq/qwaq-window.r b/ruamoko/qwaq/qwaq-window.r
index 48722cdc2..70fe2c476 100644
--- a/ruamoko/qwaq/qwaq-window.r
+++ b/ruamoko/qwaq/qwaq-window.r
@@ -1,8 +1,71 @@
+#include <Array.h>
+
+#include "event.h"
+#include "qwaq-curses.h"
 #include "qwaq-window.h"
+#include "qwaq-view.h"
 
 @implementation Window
+
 +windowWithRect: (Rect) rect
 {
 	return [[[self alloc] initWithRect: rect] autorelease];
 }
+
+-initWithRect: (Rect) rect
+{
+	if (!(self = [super init])) {
+		return nil;
+	}
+	self.rect = rect;
+	window = create_window (rect.xpos, rect.ypos, rect.xlen, rect.ylen);
+	panel = create_panel (window);
+	return self;
+}
+
+-handleEvent: (qwaq_event_t *) event
+{
+	switch (event.event_type) {
+		case qe_mouse:
+			point.x = event.e.mouse.x;
+			point.y = event.e.mouse.y;
+			for (int i = [views count]; i--> 0; ) {
+				View       *v = [views objectAtIndex: i];
+				if (rectContainsPoint (&v.absRect, &point)) {
+					[v handleEvent: event];
+					break;
+				}
+			}
+			break;
+		case qe_key:
+		case qe_command:
+			if (focusedView) {
+				[focusedView handleEvent: event];
+				for (int i = [views count];
+					 event.event_type != qe_none && i--> 0; ) {
+					View       *v = [views objectAtIndex: i];
+					 [v handleEvent: event];
+				}
+			}
+			break;
+		case qe_none:
+			break;
+	}
+	return self;
+}
+
+-addView: (View *) view
+{
+	[views addObject: view];
+	view.absRect.xpos = view.rect.xpos + rect.xpos;
+	view.absRect.ypos = view.rect.ypos + rect.ypos;
+	view.window = window;
+	return self;
+}
+
+-setBackground: (int) ch
+{
+	wbkgd (window, ch);
+	return self;
+}
 @end

From 254bf29bd4f299d6afe5138e803de768b2a47413 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 1 Mar 2020 19:37:40 +0900
Subject: [PATCH 0571/1519] [qfcc] Handle protocol forward declarations

---
 tools/qfcc/source/class.c    |  8 +++++--
 tools/qfcc/source/qc-parse.y | 41 +++++++++++++++++++++++++++---------
 2 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/tools/qfcc/source/class.c b/tools/qfcc/source/class.c
index 682bf59f5..07068ecb9 100644
--- a/tools/qfcc/source/class.c
+++ b/tools/qfcc/source/class.c
@@ -515,7 +515,11 @@ class_add_protocols (class_t *class, protocollist_t *protocols)
 
 	for (i = 0; i < protocols->count; i++) {
 		p = protocols->list[i];
-		copy_methods (methods, p->methods);
+		if (p->methods) {
+			copy_methods (methods, p->methods);
+		} else {
+			warning (0, "definition of protocol `%s' not found", p->name);
+		}
 		if (p->protocols)
 			class_add_protocols (class, p->protocols);
 	}
@@ -1356,7 +1360,7 @@ get_protocol (const char *name, int create)
 
 	p = calloc (sizeof (protocol_t), 1);
 	p->name = name;
-	p->methods = new_methodlist ();
+	p->methods = 0;
 	p->class_type.type = ct_protocol;
 	p->class_type.c.protocol = p;
 	if (name)
diff --git a/tools/qfcc/source/qc-parse.y b/tools/qfcc/source/qc-parse.y
index 1bcd240c1..a7b353082 100644
--- a/tools/qfcc/source/qc-parse.y
+++ b/tools/qfcc/source/qc-parse.y
@@ -192,7 +192,7 @@ int yylex (void);
 %type	<symbol>	overloaded_identifier
 
 %type	<expr>		identifier_list
-%type	<symbol>	selector reserved_word
+%type	<symbol>	protocol_name_list selector reserved_word
 %type	<param>		optional_param_list unaryselector keyworddecl
 %type	<param>		keywordselector
 %type	<method>	methodproto methoddecl
@@ -1443,6 +1443,7 @@ identifier
 obj_def
 	: classdef					{ }
 	| classdecl
+	| protocoldecl
 	| protocoldef
 	| { if (!current_class) PARSE_ERROR; } methoddef
 	| END
@@ -1570,17 +1571,18 @@ category_reference
 		}
 	;
 
-
 protocol_name
 	: identifier
 		{
 			$$ = get_protocol ($1->name, 0);
-			if ($$) {
-				error (0, "redefinition of %s", $1->name);
+			if ($$ && $$->methods) {
+				error (0, "redefinition of protocol %s", $1->name);
 				$$ = get_protocol (0, 1);
-			} else {
+			}
+			if (!$$) {
 				$$ = get_protocol ($1->name, 1);
 			}
+			$$->methods = new_methodlist ();
 			current_class = &$$->class_type;
 		}
 	;
@@ -1673,18 +1675,33 @@ classdef
 	| REFERENCE category_reference ';'	{ }
 	;
 
+protocoldecl
+	: protocol
+	  protocol_name_list ';'
+		{
+			while ($2) {
+				get_protocol ($2->name, 1);
+				$2 = $2->next;
+			}
+		}
+	;
+
 protocoldef
-	: PROTOCOL					{ $<class_type>$ = current_class; }
+	: protocol
 	  protocol_name
-	  protocolrefs			{ protocol_add_protocols ($3, $4); $<class>$ = 0; }
-	  methodprotolist			{ protocol_add_methods ($3, $6); }
+	  protocolrefs			{ protocol_add_protocols ($2, $3); $<class>$ = 0; }
+	  methodprotolist			{ protocol_add_methods ($2, $5); }
 	  END
 		{
-			current_class = $<class_type>2;
-			(void) ($<class>5);
+			current_class = $<class_type>1;
+			(void) ($<class>4);
 		}
 	;
 
+protocol
+	: PROTOCOL					{ $<class_type>$ = current_class; }
+	;
+
 protocolrefs
 	: /* emtpy */				{ $$ = 0; }
 	| LT 						{ $<protocol_list>$ = new_protocol_list (); }
@@ -1870,6 +1887,10 @@ keywordselector
 	| keywordselector keyworddecl { $2->next = $1; $$ = $2; }
 	;
 
+protocol_name_list
+	: identifier
+	| protocol_name_list ',' identifier { $3->next = $1; $$ = $3; }
+
 selector
 	: NAME						{ $$ = $1; }
 	| CLASS_NAME				{ $$ = $1; }

From 544d7de1ec5e2b1c2b229a43a0feff34dd9d198a Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 2 Mar 2020 10:42:26 +0900
Subject: [PATCH 0572/1519] [qfcc] Implement @protocol(foo)

Unlike gcc, qfcc requires foo to be defined, not just declared (I
suspect this is a bug in gcc, or even the ObjC spec), because allowing
forward declarations causes an empty (no methods) protocol to be
emitted, and then when the protocol is actually defined, one with
methods, resulting in two different versions of the same protocol, which
comments in the gnu objc runtime specifically state is a problem but is
not checked because it "never happens in practice" (found while
investigating gcc's behavior with @protocol and just what some of the
comments about static instance lists meant).
---
 tools/qfcc/include/class.h |  1 +
 tools/qfcc/source/class.c  |  6 ++++--
 tools/qfcc/source/expr.c   | 11 +++++++++--
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/tools/qfcc/include/class.h b/tools/qfcc/include/class.h
index 323912591..a4f65538b 100644
--- a/tools/qfcc/include/class.h
+++ b/tools/qfcc/include/class.h
@@ -74,6 +74,7 @@ typedef struct protocol_s {
 	const char *name;
 	struct methodlist_s *methods;
 	struct protocollist_s *protocols;
+	struct def_s *def;
 	class_type_t class_type;
 } protocol_t;
 
diff --git a/tools/qfcc/source/class.c b/tools/qfcc/source/class.c
index 07068ecb9..64ebf692f 100644
--- a/tools/qfcc/source/class.c
+++ b/tools/qfcc/source/class.c
@@ -1387,8 +1387,10 @@ protocol_add_protocols (protocol_t *protocol, protocollist_t *protocols)
 def_t *
 protocol_def (protocol_t *protocol)
 {
-	return make_symbol (protocol->name, &type_obj_protocol,
-						pr.far_data, sc_static)->s.def;
+	if (!protocol->def) {
+		protocol->def = emit_protocol (protocol);
+	}
+	return protocol->def;
 }
 
 protocollist_t *
diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index ad91a8d81..967484f95 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -2470,9 +2470,16 @@ selector_expr (keywordarg_t *selector)
 }
 
 expr_t *
-protocol_expr (const char *protocol)
+protocol_expr (const char *protocol_name)
 {
-	return error (0, "not implemented");
+	protocol_t *protocol = get_protocol (protocol_name, 0);
+
+	if (!protocol) {
+		return error (0, "cannot find protocol declaration for `%s'",
+					  protocol_name);
+	}
+	class_t    *proto_class = get_class (new_symbol ("Protocol"), 1);
+	return new_pointer_expr (0, proto_class->type, protocol_def (protocol));
 }
 
 expr_t *

From b6b7f9675f77fcab401be1f32d2fc1c35109f26d Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 2 Mar 2020 10:48:51 +0900
Subject: [PATCH 0573/1519] [qfcc] Emit static instance lists

For now, only protocols are in the list (gcc adds only static string
objects and qfcc doesn't do those yet, so not so far behind). qfprogs
dumps them.
---
 tools/qfcc/include/class.h       |   5 +
 tools/qfcc/source/class.c        | 164 +++++++++++++++++++++++++++++--
 tools/qfcc/source/dump_modules.c |  54 +++++++++-
 tools/qfcc/source/dump_strings.c |   4 +-
 4 files changed, 216 insertions(+), 11 deletions(-)

diff --git a/tools/qfcc/include/class.h b/tools/qfcc/include/class.h
index a4f65538b..726a272be 100644
--- a/tools/qfcc/include/class.h
+++ b/tools/qfcc/include/class.h
@@ -83,6 +83,11 @@ typedef struct protocollist_s {
 	protocol_t **list;
 } protocollist_t;
 
+typedef struct static_instance_s {
+	const char *class;
+	struct def_s *instance;
+} static_instance_t;
+
 extern struct type_s type_id;
 extern struct type_s type_obj_object;
 extern struct type_s type_obj_class;
diff --git a/tools/qfcc/source/class.c b/tools/qfcc/source/class.c
index 64ebf692f..0b981d065 100644
--- a/tools/qfcc/source/class.c
+++ b/tools/qfcc/source/class.c
@@ -66,6 +66,8 @@
 static hashtab_t *class_hash;
 static hashtab_t *category_hash;
 static hashtab_t *protocol_hash;
+static hashtab_t *static_instances;
+static hashtab_t *static_instance_classes;
 
 // these will be built up further
 type_t      type_obj_selector = { ev_invalid, 0, 0, ty_struct};
@@ -178,6 +180,141 @@ static struct_def_t object_struct[] = {
 	{0, 0}
 };
 
+static const char *
+static_instance_get_key (const void *instance, void *unused)
+{
+	return ((static_instance_t *) instance)->class;
+}
+
+static void
+add_static_instance (const char *class, def_t *instance_def)
+{
+	static_instance_t *instance = malloc (sizeof (*instance));
+
+	if (!static_instances) {
+		static_instances = Hash_NewTable (1021, static_instance_get_key, 0, 0);
+		static_instance_classes = Hash_NewTable (1021, static_instance_get_key,
+												 0, 0);
+	}
+
+	instance->class = save_string (class);
+	instance->instance = instance_def;
+	Hash_Add (static_instances, instance);
+
+	// uniqued set of class names for all static instances
+	if (!Hash_Find (static_instance_classes, class)) {
+		Hash_Add (static_instance_classes, instance);
+	}
+}
+typedef struct {
+	const char *class_name;
+	int         num_instances;
+	static_instance_t **instances;
+} obj_static_instances_data_t;
+
+static void
+emit_instance_classname (def_t *def, void *data, int index)
+{
+	obj_static_instances_data_t *da = (obj_static_instances_data_t *)data;
+
+	if (def->type != &type_string)
+		internal_error (0, "%s: expected string def", __FUNCTION__);
+	EMIT_STRING (def->space, D_STRING (def), da->class_name);
+}
+
+static void
+emit_instance_defs (def_t *def, void *data, int index)
+{
+	obj_static_instances_data_t *da = (obj_static_instances_data_t *)data;
+
+	if (!is_array (def->type) || def->type->t.array.type->type != ev_pointer)
+		internal_error (0, "%s: expected array of pointers def", __FUNCTION__);
+	if (index < 0 || index >= da->num_instances + 1)
+		internal_error (0, "%s: out of bounds index: %d %d",
+						__FUNCTION__, index, da->num_instances + 1);
+	D_INT (def) = 0;
+	if (index < da->num_instances) {
+		EMIT_DEF (def->space, D_INT (def), da->instances[index]->instance);
+	}
+}
+
+static def_t *
+emit_static_instances (const char *classname)
+{
+	static struct_def_t instances_struct[] = {
+		{"class_name",	&type_string, emit_instance_classname},
+		{"instances",	0,            emit_instance_defs},
+		{0, 0}
+	};
+	obj_static_instances_data_t data = {};
+	def_t      *instances_def;
+
+	data.class_name = classname;
+	data.instances = (static_instance_t **) Hash_FindList (static_instances,
+														   classname);
+	for (static_instance_t **inst = data.instances; *inst; inst++) {
+		data.num_instances++;
+	}
+	instances_struct[1].type = array_type (&type_pointer,
+										   data.num_instances + 1);
+	instances_def = emit_structure (va ("_OBJ_STATIC_INSTANCES_%s", classname),
+									's', instances_struct, 0, &data,
+									sc_static);
+	free (data.instances);
+	return instances_def;
+}
+
+static def_t *
+emit_static_instances_list (void)
+{
+	static_instance_t **classes;
+	int         num_classes = 0;
+	def_t     **instance_lists;
+	type_t     *instance_lists_type;
+	symbol_t   *instance_lists_sym;
+	def_t      *instance_lists_def;
+	pointer_t  *list;
+	defspace_t *space;
+
+	if (!static_instance_classes || !static_instances) {
+		return 0;
+	}
+
+	classes = (static_instance_t **) Hash_GetList (static_instance_classes);
+	for (static_instance_t **c = classes; *c; c++) {
+		num_classes++;
+	}
+	if (!num_classes) {
+		free (classes);
+		return 0;
+	}
+	instance_lists = alloca (num_classes * sizeof (*instance_lists));
+	for (int i = 0; i < num_classes; i++) {
+		instance_lists[i] = emit_static_instances (classes[i]->class);
+	}
+	free (classes);
+
+	// +1 for terminating null
+	instance_lists_type = array_type (&type_pointer, num_classes + 1);
+	instance_lists_sym = make_symbol ("_OBJ_STATIC_INSTANCES",
+									  instance_lists_type,
+									  pr.far_data, sc_static);
+	if (!instance_lists_sym->table) {
+		symtab_addsymbol (pr.symtab, instance_lists_sym);
+	}
+	instance_lists_def = instance_lists_sym->s.def;
+	instance_lists_def->initialized = instance_lists_def->constant = 1;
+	instance_lists_def->nosave = 1;
+
+	list = D_POINTER (pointer_t, instance_lists_def);
+	space = instance_lists_def->space;
+	for (int i = 0; i < num_classes; i++, list++) {
+		EMIT_DEF (space, *list, instance_lists[i]);
+	}
+	*list = 0;
+	return instance_lists_def;
+}
+
 int
 obj_is_id (const type_t *type)
 {
@@ -1185,6 +1322,7 @@ typedef struct {
 	int         cls_def_cnt;
 	category_t **categories;
 	int         cat_def_cnt;
+	def_t      *instances_list;
 } obj_symtab_data_t;
 
 static void
@@ -1238,10 +1376,10 @@ emit_symtab_defs (def_t *def, void *data, int index)
 
 	if (!is_array (def->type) || def->type->t.array.type->type != ev_pointer)
 		internal_error (0, "%s: expected array of pointers def", __FUNCTION__);
-	if (index < 0 || index >= da->cls_def_cnt + da->cat_def_cnt)
+	if (index < 0 || index >= da->cls_def_cnt + da->cat_def_cnt + 1)
 		internal_error (0, "%s: out of bounds index: %d %d",
 						__FUNCTION__, index,
-						da->cls_def_cnt + da->cat_def_cnt);
+						da->cls_def_cnt + da->cat_def_cnt + 1);
 
 	if (index < da->cls_def_cnt) {
 		class_t   **cl;
@@ -1250,7 +1388,7 @@ emit_symtab_defs (def_t *def, void *data, int index)
 				if (!index--)
 					break;
 		EMIT_DEF (def->space, D_INT (def), (*cl)->def);
-	} else {
+	} else if (index < da->cls_def_cnt + da->cat_def_cnt) {
 		category_t **ca;
 		index -= da->cls_def_cnt;
 		for (ca = da->categories; *ca; ca++)
@@ -1258,6 +1396,11 @@ emit_symtab_defs (def_t *def, void *data, int index)
 				if (!index--)
 					break;
 		EMIT_DEF (def->space, D_INT (def), (*ca)->def);
+	} else {
+		D_INT (def) = 0;
+		if (da->instances_list) {
+			EMIT_DEF (def->space, D_INT (def), da->instances_list);
+		}
 	}
 }
 
@@ -1273,7 +1416,7 @@ class_finish_module (void)
 		{0, 0}
 	};
 
-	obj_symtab_data_t data = {0, 0, 0, 0, 0};
+	obj_symtab_data_t data = {};
 
 	class_t   **cl;
 	category_t **ca;
@@ -1299,10 +1442,14 @@ class_finish_module (void)
 			if ((*ca)->def && !(*ca)->def->external)
 				data.cat_def_cnt++;
 	}
-	if (!data.refs && !data.cls_def_cnt && !data.cat_def_cnt)
+	data.instances_list = emit_static_instances_list ();
+	if (!data.refs && !data.cls_def_cnt && !data.cat_def_cnt
+		&& !data.instances_list)
 		return;
 	symtab_struct[4].type = array_type (&type_pointer,
-										data.cls_def_cnt + data.cat_def_cnt);
+										data.cls_def_cnt
+										+ data.cat_def_cnt
+										+ 1);
 	symtab_def = emit_structure ("_OBJ_SYMTAB", 's', symtab_struct, 0, &data,
 								 sc_static);
 	free (data.classes);
@@ -1389,6 +1536,7 @@ protocol_def (protocol_t *protocol)
 {
 	if (!protocol->def) {
 		protocol->def = emit_protocol (protocol);
+		add_static_instance ("Protocol", protocol->def);
 	}
 	return protocol->def;
 }
@@ -1548,6 +1696,10 @@ clear_classes (void)
 		Hash_FlushTable (protocol_hash);
 	if (category_hash)
 		Hash_FlushTable (category_hash);
+	if (static_instances)
+		Hash_FlushTable (static_instances);
+	if (static_instance_classes)
+		Hash_FlushTable (static_instance_classes);
 	obj_initialized = 0;
 }
 
diff --git a/tools/qfcc/source/dump_modules.c b/tools/qfcc/source/dump_modules.c
index 6bb559003..68cee44eb 100644
--- a/tools/qfcc/source/dump_modules.c
+++ b/tools/qfcc/source/dump_modules.c
@@ -89,22 +89,41 @@ dump_selector (progs_t *pr, pr_sel_t *sel)
 		printf ("          %s\n", sel_types);
 }
 
+static void
+dump_method_description_list (progs_t *pr, char c,
+							  pr_method_description_list_t *list)
+{
+	if (list) {
+		for (int i = 0; i < list->count; i++) {
+			printf ("%*s%s\n", 20, "", PR_GetString (pr, list->list[i].name));
+			printf ("%*s%s\n", 20, "", PR_GetString (pr, list->list[i].types));
+		}
+	}
+}
+
 static void
 dump_protocol (progs_t *pr, pr_protocol_t *proto)
 {
 	const char *protocol_name = "<invalid string>";
-	printf ("                %d ", proto->class_pointer);
+	printf ("                %x %x ",
+			(pointer_t) ((pr_int_t *) proto - (pr_int_t *) pr->pr_globals),
+			proto->class_pointer);
 	if (PR_StringValid (pr, proto->protocol_name))
 		protocol_name = PR_GetString (pr, proto->protocol_name);
 	printf ("<%s>\n", protocol_name);
+	dump_method_description_list (pr, '-',
+			&G_STRUCT (pr, pr_method_description_list_t,
+					   proto->instance_methods));
+	dump_method_description_list (pr, '-',
+			&G_STRUCT (pr, pr_method_description_list_t,
+					   proto->class_methods));
 }
 
 static void
 dump_protocol_list (progs_t *pr, pr_protocol_list_t *list)
 {
 	int         i;
-	printf ("            %d\n", list->next);
-	printf ("            %d\n", list->count);
+	printf ("            %x %d\n", list->next, list->count);
 	for (i = 0; i < list->count; i++) {
 		if (list->list[i] <= 0 || list->list[i] >= pr->globals_size) {
 			printf ("invalid pointer\n");
@@ -171,6 +190,32 @@ dump_category (progs_t *pr, pr_category_t *category)
 										   category->protocols));
 }
 
+static void
+dump_static_instance_lists (progs_t *pr, pointer_t instance_lists)
+{
+	pointer_t  *ptr = &G_STRUCT (pr, pointer_t, instance_lists);
+
+	printf ("    static instance lists @ %x\n", instance_lists);
+	while (*ptr) {
+		__auto_type list = &G_STRUCT (pr, pr_static_instances_t, *ptr);
+		const char *class_name = "*** INVALID ***";
+
+		if (PR_StringValid (pr, list->class_name)) {
+			class_name = PR_GetString (pr, list->class_name);
+		}
+		printf ("        %x %s\n", *ptr, class_name);
+		for (int i = 0; list->instances[i]; i++) {
+			if (!strcmp (class_name, "Protocol")) {
+				dump_protocol (pr, &G_STRUCT (pr, pr_protocol_t,
+											  list->instances[i]));
+			} else {
+				printf ("            %x\n", list->instances[i]);
+			}
+		}
+		ptr++;
+	}
+}
+
 static void
 dump_module (progs_t *pr, pr_module_t *module)
 {
@@ -197,6 +242,9 @@ dump_module (progs_t *pr, pr_module_t *module)
 		dump_class (pr, &G_STRUCT (pr, pr_class_t, *ptr++));
 	for (i = 0; i < symtab->cat_def_cnt; i++)
 		dump_category (pr, &G_STRUCT (pr, pr_category_t, *ptr++));
+	if (*ptr) {
+		dump_static_instance_lists (pr, *ptr);
+	}
 }
 
 void
diff --git a/tools/qfcc/source/dump_strings.c b/tools/qfcc/source/dump_strings.c
index fc0c0cb7d..77f3c0ae4 100644
--- a/tools/qfcc/source/dump_strings.c
+++ b/tools/qfcc/source/dump_strings.c
@@ -44,14 +44,14 @@ dump_string_block (const char *strblock, unsigned size)
 {
 	const char *s = strblock;
 
-	printf ("%d ", 0);
+	printf ("%x ", 0);
 	while (s - strblock < size) {
 		char        c = *s++;
 		switch (c) {
 			case 0:
 				fputs ("\n", stdout);
 				if (s - strblock < size)
-					printf ("%ld ", s - strblock);
+					printf ("%lx ", s - strblock);
 				break;
 			case 9:
 				fputs ("\\t", stdout);

From 8021613b79daa56e908c34ff3d44da2e55f390c5 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 2 Mar 2020 10:52:09 +0900
Subject: [PATCH 0574/1519] [qfcc] Fix missing protocol method lists

The problem was an erroneous assumption that the methods had to be
defined. Any class implementing a protocol must implement (and thus
define) the methods, but a protocol declaration cannot: it merely
declares the methods, and it's entirely possible for a module to see
only the protocol definition and not any classes implementing the
protocol.
---
 tools/qfcc/source/method.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/tools/qfcc/source/method.c b/tools/qfcc/source/method.c
index 726acfd76..2ae50f39d 100644
--- a/tools/qfcc/source/method.c
+++ b/tools/qfcc/source/method.c
@@ -511,9 +511,11 @@ emit_method_list_item (def_t *def, void *data, int index)
 	method_t   *m;
 	pr_method_description_t *desc;
 
-	if (def->type != &type_obj_method_description)
-		internal_error (0, "%s: expected method_description def",
+	if (!is_array (def->type)
+		|| def->type->t.array.type != &type_obj_method_description) {
+		internal_error (0, "%s: expected array of method_description def",
 						__FUNCTION__);
+	}
 	if (index < 0 || index >= methods->count)
 		internal_error (0, "%s: out of bounds index: %d %d",
 						__FUNCTION__, index, methods->count);
@@ -521,7 +523,7 @@ emit_method_list_item (def_t *def, void *data, int index)
 	desc = D_POINTER (pr_method_description_t, def);
 
 	for (m = methods->head; m; m = m->next) {
-		if (!m->instance != !methods->instance || !m->def)
+		if (!m->instance != !methods->instance)
 			continue;
 		if (!index--)
 			break;
@@ -547,7 +549,7 @@ emit_method_descriptions (methodlist_t *methods, const char *name,
 		return 0;
 
 	for (count = 0, m = methods->head; m; m = m->next)
-		if (!m->instance == !instance && m->def)
+		if (!m->instance == !instance)
 			count++;
 	if (!count)
 		return 0;

From 9ccff74fcf5dac1abdcffa6c8b9bfbc7cd7094df Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 2 Mar 2020 10:55:46 +0900
Subject: [PATCH 0575/1519] [qfcc] Emit only one instance per protocol per
 module

This is actually a double issue: when a class implementing a protocol
used the protocol in @protocol(), not only would the protocol get
emitted as part of the class data specifying that the class conforms to
the protocol, a second instance would be emitted again when @protocol()
was used. On top of that, only the instance referenced by @protocol()
would be initialized. Now, both class emission and @protocol() get their
protocol def from the same place and thus only one, properly
initialized, protocol instance is emitted.
---
 tools/qfcc/source/class.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/qfcc/source/class.c b/tools/qfcc/source/class.c
index 0b981d065..381b37e1e 100644
--- a/tools/qfcc/source/class.c
+++ b/tools/qfcc/source/class.c
@@ -1667,7 +1667,7 @@ emit_protocol_list_item (def_t *def, void *data, int index)
 		internal_error (0, "%s: out of bounds index: %d %d",
 						__FUNCTION__, index, protocols->count);
 	}
-	EMIT_DEF (def->space, D_INT(def), emit_protocol (protocol));
+	EMIT_DEF (def->space, D_INT(def), protocol_def (protocol));
 }
 
 def_t *

From bc4bea79cb9af733a908915a77c428095099ed3a Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 2 Mar 2020 13:00:33 +0900
Subject: [PATCH 0576/1519] [ruamoko] Remove a stale FIXME

This was fixed when pr_def_t was introduced. I missed the comment at the
time.
---
 libs/ruamoko/rua_obj.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/ruamoko/rua_obj.c b/libs/ruamoko/rua_obj.c
index 93fe8a68b..2d30874dd 100644
--- a/libs/ruamoko/rua_obj.c
+++ b/libs/ruamoko/rua_obj.c
@@ -1625,7 +1625,7 @@ rua_PR_FindGlobal (progs_t *pr)
 	R_POINTER (pr) = 0;
 	def = PR_FindGlobal (pr, name);
 	if (def)
-		R_POINTER (pr) = def->ofs;	//FIXME def's can't access > 32k
+		R_POINTER (pr) = def->ofs;
 }
 
 //====================================================================

From 78f552aa87570ba7e9d8742198d2efc71bb50fe6 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 2 Mar 2020 13:02:29 +0900
Subject: [PATCH 0577/1519] [ruamoko] Initialize static instances

This is one step closer to implementing conformsToProtocol. However,
protocols are not yet initialized correctly: they are not registered,
nor are their selectors.

While the static initializer list pointer was not written previously,
the module struct always came immediately after the symbols struct, and
the module version has so far always been 0. Thus, the list pointer is
correctly 0 for older progs and there's no need for a version bump.
---
 libs/ruamoko/rua_obj.c | 90 +++++++++++++++++++++++++++++++++++++-----
 1 file changed, 80 insertions(+), 10 deletions(-)

diff --git a/libs/ruamoko/rua_obj.c b/libs/ruamoko/rua_obj.c
index 2d30874dd..3aa345bfa 100644
--- a/libs/ruamoko/rua_obj.c
+++ b/libs/ruamoko/rua_obj.c
@@ -72,6 +72,7 @@ typedef struct probj_resources_s {
 	hashtab_t  *load_methods;
 	obj_list   *unresolved_classes;
 	obj_list   *unclaimed_categories;
+	obj_list   *uninitialized_statics;
 	obj_list   *unclaimed_proto_list;
 	obj_list   *module_list;
 	obj_list   *class_tree_list;
@@ -516,6 +517,24 @@ obj_register_selectors_from_class (probj_t *probj, pr_class_t *class)
 	}
 }
 
+static void obj_init_protocols (probj_t *probj, pr_protocol_list_t *protos);
+
+static void
+obj_init_protocol (probj_t *probj, pr_class_t *proto_class,
+				   pr_protocol_t *proto)
+{
+	progs_t    *pr = probj->pr;
+
+	if (!proto->class_pointer) {
+		proto->class_pointer = PR_SetPointer (pr, proto_class);
+		obj_init_protocols (probj, &G_STRUCT (pr, pr_protocol_list_t,
+											  proto->protocol_list));
+	} else {
+		if (proto->class_pointer != PR_SetPointer (pr, proto_class))
+			PR_RunError (pr, "protocol broken");
+	}
+}
+
 static void
 obj_init_protocols (probj_t *probj, pr_protocol_list_t *protos)
 {
@@ -535,14 +554,7 @@ obj_init_protocols (probj_t *probj, pr_protocol_list_t *protos)
 
 	for (i = 0; i < protos->count; i++) {
 		proto = &G_STRUCT (pr, pr_protocol_t, protos->list[i]);
-		if (!proto->class_pointer) {
-			proto->class_pointer = PR_SetPointer (pr, proto_class);
-			obj_init_protocols (probj, &G_STRUCT (pr, pr_protocol_list_t,
-												  proto->protocol_list));
-		} else {
-			if (proto->class_pointer != PR_SetPointer (pr, proto_class))
-				PR_RunError (pr, "protocol broken");
-		}
+		obj_init_protocol (probj, proto_class, proto);
 	}
 }
 
@@ -851,6 +863,51 @@ dump_ivars (probj_t *probj, pointer_t _ivars)
 	}
 }
 
+static void
+obj_init_statics (probj_t *probj)
+{
+	progs_t    *pr = probj->pr;
+	obj_list  **cell = &probj->uninitialized_statics;
+	pointer_t  *ptr;
+	pointer_t  *inst;
+
+	Sys_MaskPrintf (SYS_RUA_OBJ, "Initializing statics\n");
+	while (*cell) {
+		int         initialized = 1;
+
+		for (ptr = (*cell)->data; *ptr; ptr++) {
+			__auto_type statics = &G_STRUCT (pr, pr_static_instances_t, *ptr);
+			const char *class_name = PR_GetString (pr, statics->class_name);
+			pr_class_t *class = Hash_Find (probj->classes, class_name);
+
+			Sys_MaskPrintf (SYS_RUA_OBJ, "    %s %p\n", class_name, class);
+			if (!class) {
+				initialized = 0;
+				continue;
+			}
+
+			if (strcmp (class_name, "Protocol") == 0) {
+				// protocols are special
+				for (inst = statics->instances; *inst; inst++) {
+					obj_init_protocol (probj, class,
+									   &G_STRUCT (pr, pr_protocol_t, *inst));
+				}
+			} else {
+				for (inst = statics->instances; *inst; inst++) {
+					pr_id_t    *id = &G_STRUCT (pr, pr_id_t, *inst);
+					id->class_pointer = PR_SetPointer (pr, class);
+				}
+			}
+		}
+
+		if (initialized) {
+			list_remove (cell);
+		} else {
+			cell = &(*cell)->next;
+		}
+	}
+}
+
 static void
 rua___obj_exec_class (progs_t *pr)
 {
@@ -869,13 +926,16 @@ rua___obj_exec_class (progs_t *pr)
 		return;
 	Sys_MaskPrintf (SYS_RUA_OBJ, "Initializing %s module\n"
 					"symtab @ %x : %d selector%s @ %x, "
-					"%d class%s and %d categor%s\n",
+					"%d class%s and %d categor%s\n"
+					"static instance lists: %s\n",
 					PR_GetString (pr, module->name), module->symtab,
 					symtab->sel_ref_cnt, symtab->sel_ref_cnt == 1 ? "" : "s",
 					symtab->refs,
 					symtab->cls_def_cnt, symtab->cls_def_cnt == 1 ? "" : "es",
 					symtab->cat_def_cnt,
-					symtab->cat_def_cnt == 1 ? "y" : "ies");
+					symtab->cat_def_cnt == 1 ? "y" : "ies",
+					symtab->defs[symtab->cls_def_cnt
+								 + symtab->cat_def_cnt] ? "yes" : "no");
 
 	probj->module_list = list_cons (module, probj->module_list);
 
@@ -958,6 +1018,16 @@ rua___obj_exec_class (progs_t *pr)
 		}
 	}
 
+	if (*ptr) {
+		Sys_MaskPrintf (SYS_RUA_OBJ, "Static instances lists: %x\n", *ptr);
+		probj->uninitialized_statics
+			= list_cons (&G_STRUCT (pr, pointer_t, *ptr),
+						 probj->uninitialized_statics);
+	}
+	if (probj->uninitialized_statics) {
+		obj_init_statics (probj);
+	}
+
 	for (cell = &probj->unclaimed_categories; *cell; ) {
 		pr_category_t *category = (*cell)->data;
 		const char *class_name = PR_GetString (pr, category->class_name);

From 0db617719e39faa16381d2c5cfa95d3d6850375c Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 2 Mar 2020 13:31:26 +0900
Subject: [PATCH 0578/1519] [qfcc] Improve error messages for bad qc builtins

While global quakec functions could not be initialized to another
function, the error messages were rather obscure.
---
 tools/qfcc/source/qc-parse.y | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/tools/qfcc/source/qc-parse.y b/tools/qfcc/source/qc-parse.y
index a7b353082..8d939185b 100644
--- a/tools/qfcc/source/qc-parse.y
+++ b/tools/qfcc/source/qc-parse.y
@@ -1014,11 +1014,20 @@ non_code_func
 		}
 	| '=' expr
 		{
-			symbol_t   *sym = $<symbol>0;
-			specifier_t spec = $<spec>-1;
-			initialize_def (sym, $2, current_symtab->space, spec.storage);
-			if (sym->s.def)
-				sym->s.def->nosave |= spec.nosave;
+			if (local_expr) {
+				symbol_t   *sym = $<symbol>0;
+				specifier_t spec = $<spec>-1;
+				initialize_def (sym, $2, current_symtab->space, spec.storage);
+				if (sym->s.def)
+					sym->s.def->nosave |= spec.nosave;
+			} else {
+				if (is_integer_val ($2) || is_float_val ($2)) {
+					error (0, "invalid function initializer."
+						   " did you forget #?");
+				} else {
+					error (0, "cannot create global function variables");
+				}
+			}
 		}
 	| /* emtpy */
 		{

From 5893bd750135a95222ae34f004da7c9bc27af31b Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 2 Mar 2020 13:32:58 +0900
Subject: [PATCH 0579/1519] [qfcc] Catch erroneous negative builtin numbers

Setting a builtin number negative makes it a non-builtin function, but
possibly in the middle of another function. Not good.
---
 tools/qfcc/source/function.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/qfcc/source/function.c b/tools/qfcc/source/function.c
index 3b844b5a3..e2b87d04a 100644
--- a/tools/qfcc/source/function.c
+++ b/tools/qfcc/source/function.c
@@ -656,6 +656,10 @@ build_builtin_function (symbol_t *sym, expr_t *bi_val, int far)
 		bi = expr_integer (bi_val);
 	else
 		bi = expr_float (bi_val);
+	if (bi < 0) {
+		error (bi_val, "builtin functions must be positive or 0");
+		return 0;
+	}
 	sym->s.func->builtin = bi;
 	reloc_def_func (sym->s.func, sym->s.func->def);
 	build_function (sym);

From a906efac47d804798870a1d1eb839c7db6433483 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 2 Mar 2020 15:20:34 +0900
Subject: [PATCH 0580/1519] [ruamoko] Register protocols and their selectors

---
 libs/ruamoko/rua_obj.c | 47 ++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 45 insertions(+), 2 deletions(-)

diff --git a/libs/ruamoko/rua_obj.c b/libs/ruamoko/rua_obj.c
index 3aa345bfa..028850561 100644
--- a/libs/ruamoko/rua_obj.c
+++ b/libs/ruamoko/rua_obj.c
@@ -69,6 +69,7 @@ typedef struct probj_resources_s {
 	string_t   *selector_names;
 	hashtab_t  *selector_hash;
 	hashtab_t  *classes;
+	hashtab_t  *protocols;
 	hashtab_t  *load_methods;
 	obj_list   *unresolved_classes;
 	obj_list   *unclaimed_categories;
@@ -324,6 +325,13 @@ class_get_key (const void *c, void *_probj)
 	return PR_GetString (probj->pr, ((pr_class_t *)c)->name);
 }
 
+static const char *
+protocol_get_key (const void *p, void *_probj)
+{
+	__auto_type probj = (probj_t *) _probj;
+	return PR_GetString (probj->pr, ((pr_protocol_t *)p)->protocol_name);
+}
+
 static uintptr_t
 load_methods_get_hash (const void *m, void *_probj)
 {
@@ -490,7 +498,27 @@ sel_register_name (probj_t *probj, const char *name)
 }
 
 static void
-register_selectors_from_list (probj_t *probj, pr_method_list_t *method_list)
+obj_register_selectors_from_description_list (probj_t *probj,
+		pr_method_description_list_t *method_list)
+{
+	progs_t    *pr = probj->pr;
+	int         i;
+
+	if (!method_list) {
+		return;
+	}
+	for (i = 0; i < method_list->count; i++) {
+		pr_method_description_t *method = &method_list->list[i];
+		const char *name = PR_GetString (pr, method->name);
+		const char *types = PR_GetString (pr, method->types);
+		pr_sel_t   *sel = sel_register_typed_name (probj, name, types, 0);
+		method->name = PR_SetPointer (pr, sel);
+	}
+}
+
+static void
+obj_register_selectors_from_list (probj_t *probj,
+								  pr_method_list_t *method_list)
 {
 	progs_t    *pr = probj->pr;
 	int         i;
@@ -511,7 +539,7 @@ obj_register_selectors_from_class (probj_t *probj, pr_class_t *class)
 	pr_method_list_t *method_list = &G_STRUCT (pr, pr_method_list_t,
 											   class->methods);
 	while (method_list) {
-		register_selectors_from_list (probj, method_list);
+		obj_register_selectors_from_list (probj, method_list);
 		method_list = &G_STRUCT (pr, pr_method_list_t,
 								 method_list->method_next);
 	}
@@ -526,7 +554,17 @@ obj_init_protocol (probj_t *probj, pr_class_t *proto_class,
 	progs_t    *pr = probj->pr;
 
 	if (!proto->class_pointer) {
+		const char *protocol_name = PR_GetString (pr, proto->protocol_name);
 		proto->class_pointer = PR_SetPointer (pr, proto_class);
+		obj_register_selectors_from_description_list (probj,
+				&G_STRUCT (pr, pr_method_description_list_t,
+						   proto->instance_methods));
+		obj_register_selectors_from_description_list (probj,
+				&G_STRUCT (pr, pr_method_description_list_t,
+						   proto->class_methods));
+		if (!Hash_Find (probj->protocols, protocol_name)) {
+			Hash_Add (probj->protocols, proto);
+		}
 		obj_init_protocols (probj, &G_STRUCT (pr, pr_protocol_list_t,
 											  proto->protocol_list));
 	} else {
@@ -1816,6 +1854,11 @@ rua_obj_init_runtime (progs_t *pr)
 	else
 		Hash_FlushTable (probj->classes);
 
+	if (!probj->protocols)
+		probj->protocols = Hash_NewTable (1021, protocol_get_key, 0, probj);
+	else
+		Hash_FlushTable (probj->protocols);
+
 	if (!probj->load_methods) {
 		probj->load_methods = Hash_NewTable (1021, 0, 0, probj);
 		Hash_SetHashCompare (probj->load_methods, load_methods_get_hash,

From 0e40366c7fe3a34f8f20ce52c051254721c8cc6b Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 2 Mar 2020 15:21:10 +0900
Subject: [PATCH 0581/1519] [ruamoko] Implement class conformsToProtocol

Seems to work nicely, too :)
---
 libs/ruamoko/rua_obj.c | 85 +++++++++++++++++++++++++++++++++++++++---
 1 file changed, 79 insertions(+), 6 deletions(-)

diff --git a/libs/ruamoko/rua_obj.c b/libs/ruamoko/rua_obj.c
index 028850561..e088ff140 100644
--- a/libs/ruamoko/rua_obj.c
+++ b/libs/ruamoko/rua_obj.c
@@ -1713,15 +1713,88 @@ rua__i_Object_error_error_ (progs_t *pr)
 	obj_verror (probj, self, 0, dstr->str, count, args);
 }
 
+static int
+obj_protocol_conformsToProtocol (probj_t *probj, pr_protocol_t *proto,
+								 pr_protocol_t *protocol)
+{
+	progs_t    *pr = probj->pr;
+
+	pr_protocol_list_t *proto_list;
+
+	if (!proto || !protocol) {
+		return 0;
+	}
+	if (proto == protocol) {
+		return 1;
+	}
+	if (proto->protocol_name == protocol->protocol_name
+		|| strcmp (PR_GetString (pr, proto->protocol_name),
+				   PR_GetString (pr, protocol->protocol_name)) == 0) {
+		return 1;
+	}
+	proto_list = &G_STRUCT (pr, pr_protocol_list_t, proto->protocol_list);
+	while (proto_list) {
+		Sys_MaskPrintf (SYS_RUA_OBJ, "%x %x %d\n",
+						PR_SetPointer (pr, proto_list), proto_list->next,
+						proto_list->count);
+		for (int i = 0; i < proto_list->count; i++) {
+			proto = &G_STRUCT (pr, pr_protocol_t, proto_list->list[i]);
+			if (proto == protocol
+				|| obj_protocol_conformsToProtocol (probj, proto, protocol)) {
+				return 1;
+			}
+		}
+
+		proto_list = &G_STRUCT (pr, pr_protocol_list_t, proto_list->next);
+	}
+	return 0;
+}
+
 static void
 rua__c_Object__conformsToProtocol_ (progs_t *pr)
 {
-	//probj_t    *probj = pr->pr_objective_resources;
-	//pr_id_t    *object = &P_STRUCT (pr, pr_id_t, 0);
-	//pr_protocol_t *proto = &P_STRUCT (pr, pr_protocol_t, 2);
-	//...
-	//XXX
-	PR_RunError (pr, "%s, not implemented", __FUNCTION__);
+	probj_t    *probj = pr->pr_objective_resources;
+	// class points to _OBJ_CLASS_foo, and class->class_pointer points to
+	// _OBJ_METACLASS_foo
+	pr_class_t *class = &P_STRUCT (pr, pr_class_t, 0);
+	// protocol->class_pointer must point to _OBJ_CLASS_Protocol (ie, if
+	// protocol is not actually a protocol, then the class cannot conform
+	// to it)
+	pr_protocol_t *protocol = &P_STRUCT (pr, pr_protocol_t, 2);
+	pr_protocol_list_t *proto_list;
+
+	if (!class || !protocol) {
+		goto not_conforms;
+	}
+	if (protocol->class_pointer != PR_SetPointer (pr,
+												  Hash_Find (probj->classes,
+															 "Protocol"))) {
+		goto not_conforms;
+	}
+	proto_list = &G_STRUCT (pr, pr_protocol_list_t, class->protocols);
+	while (proto_list) {
+		Sys_MaskPrintf (SYS_RUA_OBJ, "%x %x %d\n",
+						PR_SetPointer (pr, proto_list), proto_list->next,
+						proto_list->count);
+		for (int i = 0; i < proto_list->count; i++) {
+			__auto_type proto = &G_STRUCT (pr, pr_protocol_t,
+										   proto_list->list[i]);
+			if (proto == protocol
+				|| obj_protocol_conformsToProtocol (probj, proto, protocol)) {
+				goto conforms;
+			}
+		}
+
+		proto_list = &G_STRUCT (pr, pr_protocol_list_t, proto_list->next);
+	}
+not_conforms:
+	Sys_MaskPrintf (SYS_RUA_OBJ, "does not conform\n");
+	R_INT (pr) = 0;
+	return;
+conforms:
+	Sys_MaskPrintf (SYS_RUA_OBJ, "conforms\n");
+	R_INT (pr) = 1;
+	return;
 }
 
 static void

From d88a091fc658500d16fd88219e2102067ac376f1 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 2 Mar 2020 15:22:54 +0900
Subject: [PATCH 0582/1519] [qwaq] Use protocols to distinguish object
 abilities

Well, that took a fair bit more than it should have to get working: had
to implement the protocol support in qfcc and engine-side ruamoko.
---
 ruamoko/qwaq/event.h       | 12 ++++++++++++
 ruamoko/qwaq/main.c        |  3 +++
 ruamoko/qwaq/qwaq-draw.h   |  8 ++++++++
 ruamoko/qwaq/qwaq-screen.h |  4 +++-
 ruamoko/qwaq/qwaq-screen.r | 16 ++++++++++++++++
 ruamoko/qwaq/qwaq-view.h   |  4 ++--
 ruamoko/qwaq/qwaq-view.r   |  2 +-
 ruamoko/qwaq/qwaq-window.h |  3 ++-
 ruamoko/qwaq/qwaq-window.r | 15 +++++++++++++++
 9 files changed, 62 insertions(+), 5 deletions(-)
 create mode 100644 ruamoko/qwaq/qwaq-draw.h

diff --git a/ruamoko/qwaq/event.h b/ruamoko/qwaq/event.h
index 006d37c42..f494234a9 100644
--- a/ruamoko/qwaq/event.h
+++ b/ruamoko/qwaq/event.h
@@ -32,4 +32,16 @@ typedef struct qwaq_event_s {
 	} e;
 } qwaq_event_t;
 
+#ifdef __QFCC__	// don't want C gcc to see this :)
+@protocol HandleEvent
+-handleEvent: (struct qwaq_event_s *) event;
+@end
+
+@protocol TakeFocus <HandleEvent>
+-takeFocus;
+-loseFocus;
+@end
+
+#endif
+
 #endif//__qwaq_event_h
diff --git a/ruamoko/qwaq/main.c b/ruamoko/qwaq/main.c
index 3f88a428a..191714c74 100644
--- a/ruamoko/qwaq/main.c
+++ b/ruamoko/qwaq/main.c
@@ -166,6 +166,9 @@ main (int argc, const char **argv)
 		Sys_Error ("couldn't load %s", name);
 	}
 
+	//pr.pr_trace = 1;
+	//pr.pr_trace_depth = -1;
+
 	PR_PushFrame (&pr);
 	if (argc > 2)
 		pr_argc = argc - 1;
diff --git a/ruamoko/qwaq/qwaq-draw.h b/ruamoko/qwaq/qwaq-draw.h
new file mode 100644
index 000000000..4abac3e55
--- /dev/null
+++ b/ruamoko/qwaq/qwaq-draw.h
@@ -0,0 +1,8 @@
+#ifndef __qwaq_draw_h
+#define __qwaq_draw_h
+
+@protocol Draw
+-draw;
+@end
+
+#endif
diff --git a/ruamoko/qwaq/qwaq-screen.h b/ruamoko/qwaq/qwaq-screen.h
index 365c54506..cbd0a6721 100644
--- a/ruamoko/qwaq/qwaq-screen.h
+++ b/ruamoko/qwaq/qwaq-screen.h
@@ -3,14 +3,16 @@
 
 #include <Object.h>
 
+#include "qwaq-draw.h"
 #include "qwaq-rect.h"
 @class View;
 @class Array;
 
-@interface Screen: Object
+@interface Screen: Object <HandleEvent, Draw>
 {
 	Rect        rect;
 	Array      *views;
+	Array      *event_handlers;
 	View       *focusedView;
 	struct window_s *window;
 }
diff --git a/ruamoko/qwaq/qwaq-screen.r b/ruamoko/qwaq/qwaq-screen.r
index cd4e25365..e44c25481 100644
--- a/ruamoko/qwaq/qwaq-screen.r
+++ b/ruamoko/qwaq/qwaq-screen.r
@@ -19,6 +19,12 @@
 
 -add: obj
 {
+	if ([obj conformsToProtocol: @protocol (Draw)]) {
+		[views addObject: obj];
+	}
+	if ([obj conformsToProtocol: @protocol (HandleEvent)]) {
+		[event_handlers addObject: obj];
+	}
 	return self;
 }
 
@@ -29,4 +35,14 @@
 	return self;
 }
 
+-handleEvent: (qwaq_event_t *) event
+{
+	return self;
+}
+
+-draw
+{
+	return self;
+}
+
 @end
diff --git a/ruamoko/qwaq/qwaq-view.h b/ruamoko/qwaq/qwaq-view.h
index 811998ed0..e532f9f0b 100644
--- a/ruamoko/qwaq/qwaq-view.h
+++ b/ruamoko/qwaq/qwaq-view.h
@@ -4,9 +4,10 @@
 #include <Array.h>
 #include <Object.h>
 
+#include "qwaq-draw.h"
 #include "qwaq-rect.h"
 
-@interface View: Object
+@interface View: Object <Draw>
 {
 	Rect        rect;
 	Rect        absRect;
@@ -14,7 +15,6 @@
 	struct window_s *window;
 }
 -initWithRect: (Rect) rect;
--handleEvent: (struct qwaq_event_s *) event;
 @end
 
 #endif//__qwaq_view_h
diff --git a/ruamoko/qwaq/qwaq-view.r b/ruamoko/qwaq/qwaq-view.r
index c03d880f4..8cf37c53d 100644
--- a/ruamoko/qwaq/qwaq-view.r
+++ b/ruamoko/qwaq/qwaq-view.r
@@ -28,7 +28,7 @@ rectContainsPoint (Rect *rect, Point *point)
 	return self;
 }
 
--handleEvent: (qwaq_event_t *) event
+-draw
 {
 	return self;
 }
diff --git a/ruamoko/qwaq/qwaq-window.h b/ruamoko/qwaq/qwaq-window.h
index 5d777c828..66c6d440e 100644
--- a/ruamoko/qwaq/qwaq-window.h
+++ b/ruamoko/qwaq/qwaq-window.h
@@ -6,9 +6,10 @@
 @class View;
 @class Array;
 
+#include "qwaq-draw.h"
 #include "qwaq-rect.h"
 
-@interface Window: Object
+@interface Window: Object <Draw, TakeFocus>
 {
 	Rect        rect;
 	Point       point;	// FIXME can't be local :(
diff --git a/ruamoko/qwaq/qwaq-window.r b/ruamoko/qwaq/qwaq-window.r
index 70fe2c476..307f09dce 100644
--- a/ruamoko/qwaq/qwaq-window.r
+++ b/ruamoko/qwaq/qwaq-window.r
@@ -68,4 +68,19 @@
 	wbkgd (window, ch);
 	return self;
 }
+
+-takeFocus
+{
+	return self;
+}
+
+-loseFocus
+{
+	return self;
+}
+
+-draw
+{
+	return self;
+}
 @end

From fa66e9fc2f61c9b43670a822c2f051aee1f0fb7f Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 2 Mar 2020 18:15:31 +0900
Subject: [PATCH 0583/1519] [qwaq] Move queue handling into separate functions

This makes it so I need to edit only one place when I get threads
working. Also, it fixes some bugs (eg, panel creation wasn't implemented
correctly).
---
 ruamoko/qwaq/qwaq-curses.c | 196 +++++++++++++++----------------------
 1 file changed, 79 insertions(+), 117 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-curses.c b/ruamoko/qwaq/qwaq-curses.c
index 1c081e1eb..474203e47 100644
--- a/ruamoko/qwaq/qwaq-curses.c
+++ b/ruamoko/qwaq/qwaq-curses.c
@@ -97,7 +97,7 @@ typedef enum qwaq_commands_e {
 
 #define RB_WRITE_DATA(ring_buffer, data, count)								\
 	({	__auto_type rb = &(ring_buffer);									\
-		typeof (&rb->buffer[0]) d = (data);									\
+		const typeof (rb->buffer[0]) *d = (data);							\
 		unsigned    c = (count);											\
 		unsigned    h = rb->head;											\
 		rb->head = (h + c) % RB_buffer_size (rb);							\
@@ -272,6 +272,45 @@ release_string (qwaq_resources_t *res, int string_id)
 	}
 }
 
+static void
+qwaq_submit_command (qwaq_resources_t *res, const int *cmd)
+{
+	unsigned    len = cmd[1];
+
+	if (RB_SPACE_AVAILABLE (res->command_queue) >= len) {
+		RB_WRITE_DATA (res->command_queue, cmd, len);
+	} else {
+		PR_RunError (res->pr, "command buffer full");
+	}
+}
+
+static void
+qwaq_submit_result (qwaq_resources_t *res, const int *result, unsigned len)
+{
+	// loop
+	if (RB_SPACE_AVAILABLE (res->results) >= len) {
+		RB_WRITE_DATA (res->results, result, len);
+	} else {
+		PR_RunError (res->pr, "result buffer full");
+	}
+}
+
+//XXX goes away with threads
+static void process_commands (qwaq_resources_t *);
+static void process_input (qwaq_resources_t *);
+static void
+qwaq_wait_result (qwaq_resources_t *res, int *result, int cmd, unsigned len)
+{
+	// XXX should just wait on the mutex
+	process_commands (res);
+	process_input (res);
+	// locking and loop until id is correct
+	if (RB_DATA_AVAILABLE (res->results) >= len
+		&& RB_PEEK_DATA (res->results, 0) == cmd) {
+		RB_READ_DATA (res->results, result, len);
+	}
+}
+
 static void
 cmd_newwin (qwaq_resources_t *res)
 {
@@ -286,11 +325,7 @@ cmd_newwin (qwaq_resources_t *res)
 
 	int         window_id = window_index (res, window);
 	int         cmd_result[] = { qwaq_cmd_newwin, window_id };
-
-	// loop
-	if (RB_SPACE_AVAILABLE (res->results) >= CMD_SIZE (cmd_result)) {
-		RB_WRITE_DATA (res->results, cmd_result, CMD_SIZE (cmd_result));
-	}
+	qwaq_submit_result (res, cmd_result, CMD_SIZE (cmd_result));
 }
 
 static void
@@ -318,11 +353,7 @@ cmd_getwrect (qwaq_resources_t *res)
 	getmaxyx (window->win, ylen, xlen);
 
 	int         cmd_result[] = { qwaq_cmd_getwrect, xpos, ypos, xlen, ylen };
-
-	// loop
-	if (RB_SPACE_AVAILABLE (res->results) >= CMD_SIZE (cmd_result)) {
-		RB_WRITE_DATA (res->results, cmd_result, CMD_SIZE (cmd_result));
-	}
+	qwaq_submit_result (res, cmd_result, CMD_SIZE (cmd_result));
 }
 
 static void
@@ -337,11 +368,7 @@ cmd_new_panel (qwaq_resources_t *res)
 
 	int         panel_id = panel_index (res, panel);
 	int         cmd_result[] = { qwaq_cmd_new_panel, panel_id };
-
-	// loop
-	if (RB_SPACE_AVAILABLE (res->results) >= CMD_SIZE (cmd_result)) {
-		RB_WRITE_DATA (res->results, cmd_result, CMD_SIZE (cmd_result));
-	}
+	qwaq_submit_result (res, cmd_result, CMD_SIZE (cmd_result));
 }
 
 static void
@@ -415,11 +442,7 @@ cmd_panel_window (qwaq_resources_t *res)
 
 	int         window_id = panel->window_id;
 	int         cmd_result[] = { qwaq_cmd_panel_window, window_id, };
-
-	// loop
-	if (RB_SPACE_AVAILABLE (res->results) >= CMD_SIZE (cmd_result)) {
-		RB_WRITE_DATA (res->results, cmd_result, CMD_SIZE (cmd_result));
-	}
+	qwaq_submit_result (res, cmd_result, CMD_SIZE (cmd_result));
 }
 
 static void
@@ -631,22 +654,12 @@ bi_newwin (progs_t *pr)
 					qwaq_cmd_newwin, 0,
 					xpos, ypos, xlen, ylen,
 				};
-
 	command[1] = CMD_SIZE(command);
+	qwaq_submit_command (res, command);
 
-	if (RB_SPACE_AVAILABLE (res->command_queue) >= CMD_SIZE(command)) {
-		RB_WRITE_DATA (res->command_queue, command, CMD_SIZE(command));
-	}
-	// XXX should just wait on the mutex
-	process_commands (res);
-	process_input (res);
-	// locking and loop until id is correct
-	if (RB_DATA_AVAILABLE (res->results)
-		&& RB_PEEK_DATA (res->results, 0) == qwaq_cmd_newwin) {
-		int         cmd_result[2];	// should results have a size?
-		RB_READ_DATA (res->results, cmd_result, CMD_SIZE (cmd_result));
-		R_INT (pr) = cmd_result[1];
-	}
+	int         cmd_result[2];
+	qwaq_wait_result (res, cmd_result, qwaq_cmd_newwin, CMD_SIZE (cmd_result));
+	R_INT (pr) = cmd_result[1];
 }
 
 static void
@@ -657,12 +670,8 @@ bi_delwin (progs_t *pr)
 
 	if (get_window (res, __FUNCTION__, window_id)) {
 		int         command[] = { qwaq_cmd_delwin, 0, window_id, };
-
 		command[1] = CMD_SIZE(command);
-
-		if (RB_SPACE_AVAILABLE (res->command_queue) >= CMD_SIZE(command)) {
-			RB_WRITE_DATA (res->command_queue, command, CMD_SIZE(command));
-		}
+		qwaq_submit_command (res, command);
 	}
 }
 
@@ -674,26 +683,17 @@ bi_getwrect (progs_t *pr)
 
 	if (get_window (res, __FUNCTION__, window_id)) {
 		int         command[] = { qwaq_cmd_getwrect, 0, window_id, };
-
 		command[1] = CMD_SIZE(command);
+		qwaq_submit_command (res, command);
 
-		if (RB_SPACE_AVAILABLE (res->command_queue) >= CMD_SIZE(command)) {
-			RB_WRITE_DATA (res->command_queue, command, CMD_SIZE(command));
-		}
-		// XXX should just wait on the mutex
-		process_commands (res);
-		process_input (res);
-		// locking and loop until id is correct
-		if (RB_DATA_AVAILABLE (res->results)
-			&& RB_PEEK_DATA (res->results, 0) == qwaq_cmd_getwrect) {
-			int         cmd_result[5];
-			RB_READ_DATA (res->results, cmd_result, CMD_SIZE (cmd_result));
-			// return xpos, ypos, xlen, ylen
-			(&R_INT (pr))[0] = cmd_result[1];
-			(&R_INT (pr))[1] = cmd_result[2];
-			(&R_INT (pr))[2] = cmd_result[3];
-			(&R_INT (pr))[3] = cmd_result[4];
-		}
+		int         cmd_result[5];
+		qwaq_wait_result (res, cmd_result, qwaq_cmd_getwrect,
+						  CMD_SIZE (cmd_result));
+		// return xpos, ypos, xlen, ylen
+		(&R_INT (pr))[0] = cmd_result[1];
+		(&R_INT (pr))[1] = cmd_result[2];
+		(&R_INT (pr))[2] = cmd_result[3];
+		(&R_INT (pr))[3] = cmd_result[4];
 	}
 }
 
@@ -705,20 +705,13 @@ bi_new_panel (progs_t *pr)
 
 	if (get_window (res, __FUNCTION__, window_id)) {
 		int         command[] = { qwaq_cmd_new_panel, 0, window_id, };
-
 		command[1] = CMD_SIZE(command);
+		qwaq_submit_command (res, command);
 
-		if (RB_SPACE_AVAILABLE (res->command_queue) >= CMD_SIZE(command)) {
-			RB_WRITE_DATA (res->command_queue, command, CMD_SIZE(command));
-		}
-
-		// locking and loop until id is correct
-		if (RB_DATA_AVAILABLE (res->results)
-			&& RB_PEEK_DATA (res->results, 0) == qwaq_cmd_new_panel) {
-			int         cmd_result[2];	// should results have a size?
-			RB_READ_DATA (res->results, cmd_result, CMD_SIZE (cmd_result));
-			R_INT (pr) = cmd_result[1];
-		}
+		int         cmd_result[2];
+		qwaq_wait_result (res, cmd_result, qwaq_cmd_new_panel,
+						  CMD_SIZE (cmd_result));
+		R_INT (pr) = cmd_result[1];
 	}
 }
 
@@ -731,10 +724,7 @@ panel_command (progs_t *pr, qwaq_commands cmd)
 	if (get_panel (res, __FUNCTION__, panel_id)) {
 		int         command[] = { cmd, 0, panel_id, };
 		command[1] = CMD_SIZE(command);
-
-		if (RB_SPACE_AVAILABLE (res->command_queue) >= CMD_SIZE(command)) {
-			RB_WRITE_DATA (res->command_queue, command, CMD_SIZE(command));
-		}
+		qwaq_submit_command (res, command);
 	}
 }
 
@@ -779,10 +769,7 @@ bi_move_panel (progs_t *pr)
 	if (get_panel (res, __FUNCTION__, panel_id)) {
 		int         command[] = { qwaq_cmd_move_panel, 0, panel_id, x, y, };
 		command[1] = CMD_SIZE(command);
-
-		if (RB_SPACE_AVAILABLE (res->command_queue) >= CMD_SIZE(command)) {
-			RB_WRITE_DATA (res->command_queue, command, CMD_SIZE(command));
-		}
+		qwaq_submit_command (res, command);
 	}
 }
 
@@ -795,20 +782,12 @@ bi_panel_window (progs_t *pr)
 	if (get_panel (res, __FUNCTION__, panel_id)) {
 		int         command[] = { qwaq_cmd_panel_window, 0, panel_id, };
 		command[1] = CMD_SIZE(command);
+		qwaq_submit_command (res, command);
 
-		if (RB_SPACE_AVAILABLE (res->command_queue) >= CMD_SIZE(command)) {
-			RB_WRITE_DATA (res->command_queue, command, CMD_SIZE(command));
-		}
-		// XXX should just wait on the mutex
-		process_commands (res);
-		process_input (res);
-		// locking and loop until id is correct
-		if (RB_DATA_AVAILABLE (res->results)
-			&& RB_PEEK_DATA (res->results, 0) == qwaq_cmd_panel_window) {
-			int         cmd_result[2];
-			RB_READ_DATA (res->results, cmd_result, CMD_SIZE (cmd_result));
-			(&R_INT (pr))[0] = cmd_result[0];
-		}
+		int         cmd_result[2];
+		qwaq_wait_result (res, cmd_result, qwaq_cmd_panel_window,
+						  CMD_SIZE (cmd_result));
+		(&R_INT (pr))[0] = cmd_result[1];
 	}
 }
 
@@ -819,10 +798,7 @@ bi_update_panels (progs_t *pr)
 
 	int         command[] = { qwaq_cmd_update_panels, 0, };
 	command[1] = CMD_SIZE(command);
-
-	if (RB_SPACE_AVAILABLE (res->command_queue) >= CMD_SIZE(command)) {
-		RB_WRITE_DATA (res->command_queue, command, CMD_SIZE(command));
-	}
+	qwaq_submit_command (res, command);
 }
 
 static void
@@ -832,10 +808,7 @@ bi_doupdate (progs_t *pr)
 
 	int         command[] = { qwaq_cmd_doupdate, 0, };
 	command[1] = CMD_SIZE(command);
-
-	if (RB_SPACE_AVAILABLE (res->command_queue) >= CMD_SIZE(command)) {
-		RB_WRITE_DATA (res->command_queue, command, CMD_SIZE(command));
-	}
+	qwaq_submit_command (res, command);
 }
 
 static void
@@ -861,9 +834,8 @@ bi_mvwprintf (progs_t *pr)
 
 		dstring_clearstr (print_buffer);
 		PR_Sprintf (pr, print_buffer, "mvwaddstr", fmt, count, args);
-		if (RB_SPACE_AVAILABLE (res->command_queue) >= CMD_SIZE(command)) {
-			RB_WRITE_DATA (res->command_queue, command, CMD_SIZE(command));
-		}
+
+		qwaq_submit_command (res, command);
 	}
 }
 
@@ -888,9 +860,8 @@ bi_wprintf (progs_t *pr)
 
 		dstring_clearstr (print_buffer);
 		PR_Sprintf (pr, print_buffer, "waddstr", fmt, count, args);
-		if (RB_SPACE_AVAILABLE (res->command_queue) >= CMD_SIZE(command)) {
-			RB_WRITE_DATA (res->command_queue, command, CMD_SIZE(command));
-		}
+
+		qwaq_submit_command (res, command);
 	}
 }
 
@@ -903,10 +874,7 @@ bi_wrefresh (progs_t *pr)
 	if (get_window (res, __FUNCTION__, window_id)) {
 		int         command[] = { qwaq_cmd_wrefresh, 0, window_id, };
 		command[1] = CMD_SIZE(command);
-
-		if (RB_SPACE_AVAILABLE (res->command_queue) >= CMD_SIZE(command)) {
-			RB_WRITE_DATA (res->command_queue, command, CMD_SIZE(command));
-		}
+		qwaq_submit_command (res, command);
 	}
 }
 
@@ -943,10 +911,7 @@ bi_init_pair (progs_t *pr)
 
 	int         command[] = { qwaq_cmd_init_pair, 0, pair, f, b, };
 	command[1] = CMD_SIZE(command);
-
-	if (RB_SPACE_AVAILABLE (res->command_queue) >= CMD_SIZE(command)) {
-		RB_WRITE_DATA (res->command_queue, command, CMD_SIZE(command));
-	}
+	qwaq_submit_command (res, command);
 }
 
 static void
@@ -958,12 +923,9 @@ bi_wbkgd (progs_t *pr)
 
 	if (get_window (res, __FUNCTION__, window_id)) {
 		int         command[] = { qwaq_cmd_wbkgd, 0, window_id, ch, };
-
 		command[1] = CMD_SIZE(command);
+		qwaq_submit_command (res, command);
 
-		if (RB_SPACE_AVAILABLE (res->command_queue) >= CMD_SIZE(command)) {
-			RB_WRITE_DATA (res->command_queue, command, CMD_SIZE(command));
-		}
 	}
 }
 

From a0c4d566683c3e9663d94519fac00dfe52af99d6 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 2 Mar 2020 18:19:41 +0900
Subject: [PATCH 0584/1519] [qwaq] Continue processing on void commands

If the last command in the buffer had no parameters, its length would be
only 2 and thus processing would stop before reading the command from
the buffer.
---
 ruamoko/qwaq/qwaq-curses.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ruamoko/qwaq/qwaq-curses.c b/ruamoko/qwaq/qwaq-curses.c
index 474203e47..2b53efb06 100644
--- a/ruamoko/qwaq/qwaq-curses.c
+++ b/ruamoko/qwaq/qwaq-curses.c
@@ -513,7 +513,7 @@ cmd_wbkgd (qwaq_resources_t *res)
 static void
 process_commands (qwaq_resources_t *res)
 {
-	while (RB_DATA_AVAILABLE (res->command_queue) > 2) {
+	while (RB_DATA_AVAILABLE (res->command_queue) >= 2) {
 		switch ((qwaq_commands) RB_PEEK_DATA (res->command_queue, 0)) {
 			case qwaq_cmd_newwin:
 				cmd_newwin (res);

From b9ab30ff59d49cf5044332b7c1a53017471b6bac Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 2 Mar 2020 18:24:45 +0900
Subject: [PATCH 0585/1519] [qwaq] Add mvwaddch and ACS support

---
 ruamoko/qwaq/qwaq-app.r    |  2 ++
 ruamoko/qwaq/qwaq-curses.c | 50 +++++++++++++++++++++++++++++
 ruamoko/qwaq/qwaq-curses.h | 64 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 116 insertions(+)

diff --git a/ruamoko/qwaq/qwaq-app.r b/ruamoko/qwaq/qwaq-app.r
index d9051f4d9..28bf31126 100644
--- a/ruamoko/qwaq/qwaq-app.r
+++ b/ruamoko/qwaq/qwaq-app.r
@@ -103,11 +103,13 @@ void destroy_window (window_t win) = #0;
 void mvwprintf (window_t win, int x, int y, string fmt, ...) = #0;
 void wprintf (window_t win, string fmt, ...) = #0;
 void wrefresh (window_t win) = #0;
+void mvwaddch (window_t win, int x, int y, int ch) = #0;
 int get_event (qwaq_event_t *event) = #0;
 int max_colors (void) = #0;
 int max_color_pairs (void) = #0;
 int init_pair (int pair, int f, int b) = #0;
 void wbkgd (window_t win, int ch) = #0;
+int acs_char (int acs) = #0;
 
 panel_t create_panel (window_t window) = #0;
 void destroy_panel (panel_t panel) = #0;
diff --git a/ruamoko/qwaq/qwaq-curses.c b/ruamoko/qwaq/qwaq-curses.c
index 2b53efb06..e8c6548eb 100644
--- a/ruamoko/qwaq/qwaq-curses.c
+++ b/ruamoko/qwaq/qwaq-curses.c
@@ -68,6 +68,7 @@ typedef enum qwaq_commands_e {
 	qwaq_cmd_doupdate,
 	qwaq_cmd_mvwaddstr,
 	qwaq_cmd_waddstr,
+	qwaq_cmd_mvwaddch,
 	qwaq_cmd_wrefresh,
 	qwaq_cmd_init_pair,
 	qwaq_cmd_wbkgd,
@@ -481,6 +482,18 @@ cmd_waddstr (qwaq_resources_t *res)
 	release_string (res, string_id);
 }
 
+static void
+cmd_mvwaddch (qwaq_resources_t *res)
+{
+	int         window_id = RB_PEEK_DATA (res->command_queue, 2);
+	int         x = RB_PEEK_DATA (res->command_queue, 3);
+	int         y = RB_PEEK_DATA (res->command_queue, 4);
+	int         ch = RB_PEEK_DATA (res->command_queue, 5);
+
+	window_t   *window = get_window (res, __FUNCTION__, window_id);
+	mvwaddch (window->win, y, x, ch);
+}
+
 static void
 cmd_wrefresh (qwaq_resources_t *res)
 {
@@ -560,6 +573,9 @@ process_commands (qwaq_resources_t *res)
 			case qwaq_cmd_waddstr:
 				cmd_waddstr (res);
 				break;
+			case qwaq_cmd_mvwaddch:
+				cmd_mvwaddch (res);
+				break;
 			case qwaq_cmd_wrefresh:
 				cmd_wrefresh (res);
 				break;
@@ -865,6 +881,25 @@ bi_wprintf (progs_t *pr)
 	}
 }
 
+static void
+bi_mvwaddch (progs_t *pr)
+{
+	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
+	int         window_id = P_INT (pr, 0);
+	int         x = P_INT (pr, 1);
+	int         y = P_INT (pr, 2);
+	int         ch = P_INT (pr, 3);
+
+	if (get_window (res, __FUNCTION__, window_id)) {
+		int         command[] = {
+						qwaq_cmd_mvwaddch, 0,
+						window_id, x, y, ch
+					};
+		command[1] = CMD_SIZE(command);
+		qwaq_submit_command (res, command);
+	}
+}
+
 static void
 bi_wrefresh (progs_t *pr)
 {
@@ -925,7 +960,20 @@ bi_wbkgd (progs_t *pr)
 		int         command[] = { qwaq_cmd_wbkgd, 0, window_id, ch, };
 		command[1] = CMD_SIZE(command);
 		qwaq_submit_command (res, command);
+	}
+}
 
+static const char qwaq_acs_char_map[] = "lmkjtuvwqxnos`afg~,+.-hi0pryz{|}";
+static void
+bi_acs_char (progs_t *pr)
+{
+	unsigned    acs = P_INT (pr, 0);
+	if (acs < 256) {
+		R_INT (pr) = NCURSES_ACS(acs);
+	} else if (acs - 256 < sizeof (qwaq_acs_char_map)) {
+		R_INT (pr) = NCURSES_ACS(qwaq_acs_char_map[acs - 256]);
+	} else {
+		R_INT (pr) = 0;
 	}
 }
 
@@ -981,12 +1029,14 @@ static builtin_t builtins[] = {
 	{"doupdate",		bi_doupdate,		-1},
 	{"mvwprintf",		bi_mvwprintf,		-1},
 	{"wprintf",			bi_wprintf,			-1},
+	{"mvwaddch",		bi_mvwaddch,		-1},
 	{"wrefresh",		bi_wrefresh,		-1},
 	{"get_event",		bi_get_event,		-1},
 	{"max_colors",		bi_max_colors,		-1},
 	{"max_color_pairs",	bi_max_color_pairs,	-1},
 	{"init_pair",		bi_init_pair,		-1},
 	{"wbkgd",			bi_wbkgd,			-1},
+	{"acs_char",		bi_acs_char,		-1},
 	{0}
 };
 
diff --git a/ruamoko/qwaq/qwaq-curses.h b/ruamoko/qwaq/qwaq-curses.h
index 751c521a7..bf5d24191 100644
--- a/ruamoko/qwaq/qwaq-curses.h
+++ b/ruamoko/qwaq/qwaq-curses.h
@@ -4,6 +4,67 @@
 #include "event.h"
 
 #ifdef __QFCC__
+// names, order and comments lifted from ncurses.h
+typedef enum {
+/* VT100 symbols begin here */
+	ACS_ULCORNER = 256,	/* upper left corner */
+	ACS_LLCORNER,		/* lower left corner */
+	ACS_URCORNER,		/* upper right corner */
+	ACS_LRCORNER,		/* lower right corner */
+	ACS_LTEE,			/* tee pointing right */
+	ACS_RTEE,			/* tee pointing left */
+	ACS_BTEE,			/* tee pointing up */
+	ACS_TTEE,			/* tee pointing down */
+	ACS_HLINE,			/* horizontal line */
+	ACS_VLINE,			/* vertical line */
+	ACS_PLUS,			/* large plus or crossover */
+	ACS_S1,				/* scan line 1 */
+	ACS_S9,				/* scan line 9 */
+	ACS_DIAMOND,		/* diamond */
+	ACS_CKBOARD,		/* checker board (stipple) */
+	ACS_DEGREE,			/* degree symbol */
+	ACS_PLMINUS,		/* plus/minus */
+	ACS_BULLET,			/* bullet */
+/* Teletype 5410v1 symbols begin here */
+	ACS_LARROW,			/* arrow pointing left */
+	ACS_RARROW,			/* arrow pointing right */
+	ACS_DARROW,			/* arrow pointing down */
+	ACS_UARROW,			/* arrow pointing up */
+	ACS_BOARD,			/* board of squares */
+	ACS_LANTERN,		/* lantern symbol */
+	ACS_BLOCK,			/* solid square block */
+/*
+ * These aren't documented, but a lot of System Vs have them anyway
+ * (you can spot pprryyzz{{||}} in a lot of AT&T terminfo strings).
+ * The ACS_names may not match AT&T's, our source didn't know them.
+ */
+	ACS_S3,				/* scan line 3 */
+	ACS_S7,				/* scan line 7 */
+	ACS_LEQUAL,			/* less/equal */
+	ACS_GEQUAL,			/* greater/equal */
+	ACS_PI,				/* Pi */
+	ACS_NEQUAL,			/* not equal */
+	ACS_STERLING,		/* UK pound sign */
+
+/*
+ * Line drawing ACS names are of the form ACS_trbl, where t is the top, r
+ * is the right, b is the bottom, and l is the left.  t, r, b, and l might
+ * be B (blank), S (single), D (double), or T (thick).  The subset defined
+ * here only uses B and S.
+ */
+	ACS_BSSB = ACS_ULCORNER,
+	ACS_SSBB = ACS_LLCORNER,
+	ACS_BBSS = ACS_URCORNER,
+	ACS_SBBS = ACS_LRCORNER,
+	ACS_SBSS = ACS_RTEE,
+	ACS_SSSB = ACS_LTEE,
+	ACS_SSBS = ACS_BTEE,
+	ACS_BSSS = ACS_TTEE,
+	ACS_BSBS = ACS_HLINE,
+	ACS_SBSB = ACS_VLINE,
+	ACS_SSSS = ACS_PLUS,
+} qwaq_acs_chars;
+
 typedef struct window_s *window_t;
 typedef struct panel_s *panel_t;
 
@@ -15,6 +76,7 @@ typedef struct panel_s *panel_t;
 @extern void mvwprintf (window_t win, int x, int y, string fmt, ...);
 @extern void wprintf (window_t win, string fmt, ...);
 @extern void wrefresh (window_t win);
+@extern void mvwaddch (window_t win, int x, int y, int ch);
 
 @extern panel_t create_panel (window_t window);
 @extern void destroy_panel (panel_t panel);
@@ -32,6 +94,8 @@ typedef struct panel_s *panel_t;
 @extern int max_color_pairs (void);
 @extern int init_pair (int pair, int f, int b);
 @extern void wbkgd (window_t win, int ch);
+
+@extern int acs_char (int acs);
 #endif
 
 #endif//__qwaq_curses_h

From 6f1386fa0dbd77f7030ff21a31e01a06b80fea60 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 2 Mar 2020 18:29:31 +0900
Subject: [PATCH 0586/1519] [qwaq] Test out acs chars and the classes

Crashes due to flooding the command buffer, but otherwise works (with
larger buffer).
---
 ruamoko/qwaq/qwaq-app.r    |  7 ++++---
 ruamoko/qwaq/qwaq-screen.r |  5 +++++
 ruamoko/qwaq/qwaq-window.r | 16 ++++++++++++++++
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-app.r b/ruamoko/qwaq/qwaq-app.r
index 28bf31126..619001b79 100644
--- a/ruamoko/qwaq/qwaq-app.r
+++ b/ruamoko/qwaq/qwaq-app.r
@@ -44,20 +44,21 @@ arp_end (void)
 	r.xlen /= 2;
 	r.ylen /= 2;
 	wprintf (screen.window, "%d %d %d %d\n", r.xpos, r.ypos, r.xlen, r.ylen);
+	wprintf (screen.window, "%d\n", acs_char(ACS_HLINE));
+	mvwaddch(screen.window, 4, 4, acs_char(ACS_HLINE));
 	wrefresh(screen.window);
 	Window *w;
 	[screen add: w=[[Window windowWithRect: r] setBackground: COLOR_PAIR (2)]];
-	wprintf (w.window, "%d %d %d %d\n", r.xpos, r.ypos, r.xlen, r.ylen);
+	//wprintf (w.window, "%d %d %d %d\n", r.xpos, r.ypos, r.xlen, r.ylen);
 	return self;
 }
 
 -run
 {
+	[screen draw];
 	do {
 		arp_start ();
 
-		update_panels ();
-		doupdate ();
 		get_event (&event);
 		if (event.event_type != qe_none) {
 			[self handleEvent: &event];
diff --git a/ruamoko/qwaq/qwaq-screen.r b/ruamoko/qwaq/qwaq-screen.r
index e44c25481..be7400468 100644
--- a/ruamoko/qwaq/qwaq-screen.r
+++ b/ruamoko/qwaq/qwaq-screen.r
@@ -12,6 +12,8 @@
 	if (!(self = [super init])) {
 		return nil;
 	}
+	views = [[Array array] retain];
+	event_handlers = [[Array array] retain];
 	window = stdscr;
 	rect = getwrect (window);
 	return self;
@@ -42,6 +44,9 @@
 
 -draw
 {
+	[views makeObjectsPerformSelector: @selector (draw)];
+	update_panels ();
+	doupdate ();
 	return self;
 }
 
diff --git a/ruamoko/qwaq/qwaq-window.r b/ruamoko/qwaq/qwaq-window.r
index 307f09dce..bf94b177d 100644
--- a/ruamoko/qwaq/qwaq-window.r
+++ b/ruamoko/qwaq/qwaq-window.r
@@ -81,6 +81,22 @@
 
 -draw
 {
+	int x = 0, y = 0;
+	for (int i = ACS_ULCORNER; i <= ACS_STERLING; i++) {
+		int ch = acs_char (i);
+		if (ch) {
+			mvwaddch (window, x, y, ch);
+		} else {
+			mvwaddch (window, x, y, '.');
+		}
+		if (++x >= rect.xlen) {
+			x = 0;
+			if (++y >= rect.ylen) {
+				break;
+			}
+		}
+	}
+	wrefresh(window);
 	return self;
 }
 @end

From 33a07c0f6b3cecae9eb4b72bbb5387ec916ec8ec Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 2 Mar 2020 18:30:58 +0900
Subject: [PATCH 0587/1519] [qwaq] Make command buffer larger for now

A small one should be fine once threading is working.
---
 ruamoko/qwaq/qwaq-curses.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ruamoko/qwaq/qwaq-curses.c b/ruamoko/qwaq/qwaq-curses.c
index e8c6548eb..f33e01a5a 100644
--- a/ruamoko/qwaq/qwaq-curses.c
+++ b/ruamoko/qwaq/qwaq-curses.c
@@ -49,7 +49,7 @@
 #define MOUSE_MOVES_ON "\033[?1003h"// Make the terminal report mouse movements
 #define MOUSE_MOVES_OFF "\033[?1003l"// Make the terminal report mouse movements
 #define STRING_ID_QUEUE_SIZE 8		// must be > 1
-#define COMMAND_QUEUE_SIZE 128
+#define COMMAND_QUEUE_SIZE 1280
 #define CMD_SIZE(x) sizeof(x)/sizeof(x[0])
 
 typedef enum qwaq_commands_e {

From d91289ea1b37856c8d7b60d3114581f44ca06713 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 2 Mar 2020 18:43:27 +0900
Subject: [PATCH 0588/1519] [qwaq] Remove unnecessary wrefresh calls

---
 ruamoko/qwaq/qwaq-app.r    | 1 -
 ruamoko/qwaq/qwaq-screen.r | 1 -
 ruamoko/qwaq/qwaq-window.r | 1 -
 3 files changed, 3 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-app.r b/ruamoko/qwaq/qwaq-app.r
index 619001b79..e100ae69e 100644
--- a/ruamoko/qwaq/qwaq-app.r
+++ b/ruamoko/qwaq/qwaq-app.r
@@ -46,7 +46,6 @@ arp_end (void)
 	wprintf (screen.window, "%d %d %d %d\n", r.xpos, r.ypos, r.xlen, r.ylen);
 	wprintf (screen.window, "%d\n", acs_char(ACS_HLINE));
 	mvwaddch(screen.window, 4, 4, acs_char(ACS_HLINE));
-	wrefresh(screen.window);
 	Window *w;
 	[screen add: w=[[Window windowWithRect: r] setBackground: COLOR_PAIR (2)]];
 	//wprintf (w.window, "%d %d %d %d\n", r.xpos, r.ypos, r.xlen, r.ylen);
diff --git a/ruamoko/qwaq/qwaq-screen.r b/ruamoko/qwaq/qwaq-screen.r
index be7400468..770104c64 100644
--- a/ruamoko/qwaq/qwaq-screen.r
+++ b/ruamoko/qwaq/qwaq-screen.r
@@ -33,7 +33,6 @@
 -setBackground: (int) ch
 {
 	wbkgd (window, ch);
-	wrefresh (window);
 	return self;
 }
 
diff --git a/ruamoko/qwaq/qwaq-window.r b/ruamoko/qwaq/qwaq-window.r
index bf94b177d..493a6ccff 100644
--- a/ruamoko/qwaq/qwaq-window.r
+++ b/ruamoko/qwaq/qwaq-window.r
@@ -96,7 +96,6 @@
 			}
 		}
 	}
-	wrefresh(window);
 	return self;
 }
 @end

From e33d83fc9eeeb97707b5eb9fe908afbea69f32fc Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 2 Mar 2020 20:16:29 +0900
Subject: [PATCH 0589/1519] [qfcc] Accept "struct foo; struct foo { ... };"

That is, do not treat structure definition after declaration to be a
redefinition.
---
 tools/qfcc/source/qc-parse.y | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/tools/qfcc/source/qc-parse.y b/tools/qfcc/source/qc-parse.y
index 8d939185b..5658382c5 100644
--- a/tools/qfcc/source/qc-parse.y
+++ b/tools/qfcc/source/qc-parse.y
@@ -610,9 +610,18 @@ struct_specifier
 			if (!sym->table) {
 				symtab_addsymbol (current_symtab, sym);
 			} else {
-				error (0, "%s %s redefined", $1 == 's' ? "struct" : "union",
-					   $2->name);
-				$1 = 0;
+				if (!sym->type) {
+					internal_error (0, "broken structure symbol?");
+				}
+				if (sym->type->meta == ty_enum
+					|| (sym->type->meta == ty_struct && sym->type->t.symtab)) {
+					error (0, "%s %s redefined",
+						   $1 == 's' ? "struct" : "union", $2->name);
+					$1 = 0;
+				} else if (sym->type->meta != ty_struct) {
+					internal_error (0, "%s is not a struct or union",
+									$2->name);
+				}
 			}
 			current_symtab = new_symtab (current_symtab, stab_local);
 		}

From f6d650d47351ba71d4df9049436c9e8a506578b7 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 2 Mar 2020 21:15:21 +0900
Subject: [PATCH 0590/1519] [qfcc] Merge duplicate methods in interfaces

Duplicate methods in an interface (especially across protocols and
between protocols and the interface) are both harmless and even to be
expected. They certainly should not cause the compiler to demand
duplicate method implementations :)
---
 tools/qfcc/source/class.c  | 9 +++------
 tools/qfcc/source/method.c | 6 ++++++
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/tools/qfcc/source/class.c b/tools/qfcc/source/class.c
index 381b37e1e..e4861b8d2 100644
--- a/tools/qfcc/source/class.c
+++ b/tools/qfcc/source/class.c
@@ -631,8 +631,7 @@ class_add_methods (class_t *class, methodlist_t *methods)
 	if (!methods)
 		return;
 
-	*class->methods->tail = methods->head;
-	class->methods->tail = methods->tail;
+	copy_methods (class->methods, methods);
 	free (methods);
 
 	methods_set_self_type (class, class->methods);
@@ -1260,8 +1259,7 @@ category_add_methods (category_t *category, methodlist_t *methods)
 {
 	if (!methods)
 		return;
-	*category->methods->tail = methods->head;
-	category->methods->tail = methods->tail;
+	copy_methods (category->methods, methods);
 	free (methods);
 
 	methods_set_self_type (category->class, category->methods);
@@ -1520,8 +1518,7 @@ protocol_add_methods (protocol_t *protocol, methodlist_t *methods)
 {
 	if (!methods)
 		return;
-	*protocol->methods->tail = methods->head;
-	protocol->methods->tail = methods->tail;
+	copy_methods (protocol->methods, methods);
 	free (methods);
 }
 
diff --git a/tools/qfcc/source/method.c b/tools/qfcc/source/method.c
index 2ae50f39d..4bc819621 100644
--- a/tools/qfcc/source/method.c
+++ b/tools/qfcc/source/method.c
@@ -147,6 +147,12 @@ add_method (methodlist_t *methodlist, method_t *method)
 	if (method->next)
 		internal_error (0, "add_method: method loop detected");
 
+	for (method_t *m = methodlist->head; m; m = m->next) {
+		if (method_compare (m, method)) {
+			debug (0, "dropping duplicate method: %s", method->name);
+			return;
+		}
+	}
 	*methodlist->tail = method;
 	methodlist->tail = &method->next;
 }

From 8a4de6fea6159779cce78b51cb18b6d7e31accb4 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 2 Mar 2020 22:38:12 +0900
Subject: [PATCH 0591/1519] [qfcc] Fix segmentation fault for parameter errors

---
 tools/qfcc/source/expr.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index 967484f95..ea9d64881 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -1670,6 +1670,10 @@ build_function_call (expr_t *fexpr, const type_t *ftype, expr_t *params)
 	for (i = arg_count - 1, e = params; i >= 0; i--, e = e->next) {
 		type_t     *t = get_type (e);
 
+		if (!t) {
+			return e;
+		}
+
 		if (!type_size (t))
 			err = error (e, "type of formal parameter %d is incomplete",
 						 i + 1);

From f025bd96d46ba4416bb9df669473106c39888004 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 2 Mar 2020 23:38:04 +0900
Subject: [PATCH 0592/1519] [qfcc] Copy self param when copying methods

Copying methods is done when adding protocols to classes (the current
use for adding regular methods is an incorrect solution to a different
problem). However, when a method is added to a class, the type of its
self parameter is set to be a pointer to the class. Thus, not only does
the method need to be copied, the self parameter does too, otherwise
the self parameter of methods added via protocols will have their type
set to be a pointer to the last class seen adding the protocol.

That is, if, while compiling the implementation for class A, but the
interface for class B is comes after the interface for class A, and both
A and B add protocol P, then all methods in protocol P will have self
pointing to B rather than A.

@protocol P
-method;
@end

@interface A <P>
@end

@interface B <P>
@end

@implementation A
-method	{} // self is B, not A!
@end
---
 tools/qfcc/source/method.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/tools/qfcc/source/method.c b/tools/qfcc/source/method.c
index 4bc819621..e296adf3b 100644
--- a/tools/qfcc/source/method.c
+++ b/tools/qfcc/source/method.c
@@ -208,11 +208,21 @@ new_methodlist (void)
 void
 copy_methods (methodlist_t *dst, methodlist_t *src)
 {
-	method_t *s, *d;
+	method_t   *s, *d;
+	param_t    *self;
 
 	for (s = src->head; s; s = s->next) {
 		d = malloc (sizeof (method_t));
 		*d = *s;
+		// The above is only a shallow copy and thus even though the methods
+		// are not shared between the source and destination lists, the
+		// parameters are. Thus, duplicate the self (first) parameter so
+		// changing its type to match the class into which it is inserted does
+		// not affect the source list. The rest of the parameters do not need
+		// to be copied as they will not be altered.
+		self = malloc (sizeof (param_t));
+		*self = *d->params;
+		d->params = self;
 		d->next = 0;
 		add_method (dst, d);
 	}

From 679744fc7d671ad1ec90d08e090229bb5145d298 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 3 Mar 2020 00:11:07 +0900
Subject: [PATCH 0593/1519] [libr] Fix incorrect bounds check on array insert

---
 ruamoko/lib/Array.r | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ruamoko/lib/Array.r b/ruamoko/lib/Array.r
index 4673c31d8..bbf5ce883 100644
--- a/ruamoko/lib/Array.r
+++ b/ruamoko/lib/Array.r
@@ -261,7 +261,7 @@
 {
 	local unsigned	i;
 
-	if (index >= count) // FIXME: need exceptions
+	if (index > count) // FIXME: need exceptions
 		[self error: "-insertObject:atIndex: index out of range"];
 
 	if (count == capacity) {	// at capacity, expand

From ed04e6fc23b20fdd7e4dc85c7020f82533e3610d Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 3 Mar 2020 00:11:54 +0900
Subject: [PATCH 0594/1519] [qfcc] Merge method lists instead of copying

This is for adding methods to classes and protocols via their interface,
not for adding methods by adding protocols (they still get copied).
Slightly more memory efficient.
---
 tools/qfcc/include/method.h |  2 ++
 tools/qfcc/source/class.c   |  9 +++------
 tools/qfcc/source/method.c  | 40 ++++++++++++++++++++++++++++++++++++-
 3 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/tools/qfcc/include/method.h b/tools/qfcc/include/method.h
index ef51e1579..6b02bbe00 100644
--- a/tools/qfcc/include/method.h
+++ b/tools/qfcc/include/method.h
@@ -80,6 +80,8 @@ struct symbol_s *method_symbol (struct class_type_s *class_type,
 void method_set_param_names (method_t *dst, method_t *src);
 
 methodlist_t *new_methodlist (void);
+//NOTE frees the source list and any methods not copied
+void merge_method_lists (methodlist_t *dst, methodlist_t *src);
 void copy_methods (methodlist_t *dst, methodlist_t *src);
 int method_compare (method_t *m1, method_t *m2);
 
diff --git a/tools/qfcc/source/class.c b/tools/qfcc/source/class.c
index e4861b8d2..4b331d237 100644
--- a/tools/qfcc/source/class.c
+++ b/tools/qfcc/source/class.c
@@ -631,8 +631,7 @@ class_add_methods (class_t *class, methodlist_t *methods)
 	if (!methods)
 		return;
 
-	copy_methods (class->methods, methods);
-	free (methods);
+	merge_method_lists (class->methods, methods);
 
 	methods_set_self_type (class, class->methods);
 }
@@ -1259,8 +1258,7 @@ category_add_methods (category_t *category, methodlist_t *methods)
 {
 	if (!methods)
 		return;
-	copy_methods (category->methods, methods);
-	free (methods);
+	merge_method_lists (category->methods, methods);
 
 	methods_set_self_type (category->class, category->methods);
 }
@@ -1518,8 +1516,7 @@ protocol_add_methods (protocol_t *protocol, methodlist_t *methods)
 {
 	if (!methods)
 		return;
-	copy_methods (protocol->methods, methods);
-	free (methods);
+	merge_method_lists (protocol->methods, methods);
 }
 
 void
diff --git a/tools/qfcc/source/method.c b/tools/qfcc/source/method.c
index e296adf3b..d1f8dd5cd 100644
--- a/tools/qfcc/source/method.c
+++ b/tools/qfcc/source/method.c
@@ -205,6 +205,38 @@ new_methodlist (void)
 	return l;
 }
 
+static int
+method_in_list (methodlist_t *method_list, method_t *method)
+{
+	method_t    *m;
+
+	for (m = method_list->head; m; m = m->next) {
+		if (method_compare (m, method)) {
+			return 1;
+		}
+	}
+	return 0;
+}
+
+void
+merge_method_lists (methodlist_t *dst, methodlist_t *src)
+{
+	while (src->head) {
+		method_t   *s = src->head;
+		src->head = s->next;
+		s->next = 0;
+		if (method_in_list (dst, s)) {
+			debug (0, "dropping duplicate method: %s", s->name);
+			free (s);
+		} else {
+			// add_method does the duplicate check
+			*dst->tail = s;
+			dst->tail = &s->next;
+		}
+	}
+	free (src);
+}
+
 void
 copy_methods (methodlist_t *dst, methodlist_t *src)
 {
@@ -212,6 +244,10 @@ copy_methods (methodlist_t *dst, methodlist_t *src)
 	param_t    *self;
 
 	for (s = src->head; s; s = s->next) {
+		if (method_in_list (dst, s)) {
+			debug (0, "skipping duplicate method: %s", s->name);
+			continue;
+		}
 		d = malloc (sizeof (method_t));
 		*d = *s;
 		// The above is only a shallow copy and thus even though the methods
@@ -224,7 +260,9 @@ copy_methods (methodlist_t *dst, methodlist_t *src)
 		*self = *d->params;
 		d->params = self;
 		d->next = 0;
-		add_method (dst, d);
+		// add_method does the duplicate check
+		*dst->tail = d;
+		dst->tail = &d->next;
 	}
 }
 

From 50d39d64cbd77071d34a4fd2db33b1f1909ce8be Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 3 Mar 2020 09:30:20 +0900
Subject: [PATCH 0595/1519] [qwaq] Link against build ruamoko libs, not
 installed

---
 ruamoko/qwaq/Makefile.am | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ruamoko/qwaq/Makefile.am b/ruamoko/qwaq/Makefile.am
index 38584d949..f32d9d536 100644
--- a/ruamoko/qwaq/Makefile.am
+++ b/ruamoko/qwaq/Makefile.am
@@ -13,7 +13,9 @@ QFCC=$(top_builddir)/tools/qfcc/source/qfcc
 
 QCFLAGS=-qq -O -g -Werror
 QCPPFLAGS=--no-default-paths -I$(top_srcdir)/ruamoko/include
+QCLINKFLAGS=--no-default-paths -L$(top_builddir)/ruamoko/lib
 QCOMPILE=$(QFCC) $(QCFLAGS) $(QCPPFLAGS)
+QLINK=$(QFCC) $(QCFLAGS) $(QCLINKFLAGS)
 
 SUFFIXES=.o .r
 .r.o:
@@ -61,7 +63,7 @@ qwaq_app_dat_SOURCES=qwaq-app.r qwaq-screen.r qwaq-window.r qwaq-view.r
 qwaq_app_obj=$(qwaq_app_dat_SOURCES:.r=.o)
 qwaq_app_dep=$(addprefix ./$(DEPDIR)/,$(qwaq_app_obj:.o=.Qo))
 qwaq-app.dat$(EXEEXT): $(qwaq_app_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(qwaq_app_obj) -lr
+	$(QLINK) -o $@ $(qwaq_app_obj) -lr
 include $(qwaq_app_dep) # am--include-marker
 r_depfiles_remade += $(qwaq_app_dep)
 

From 16223098e52a7e981277581bd0df43202f9cb643 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 3 Mar 2020 10:42:05 +0900
Subject: [PATCH 0596/1519] [qfcc] Fix ivar visibility

It was broken by the big rewrite and I forgot to fix it.
---
 tools/qfcc/source/expr.c     | 3 ++-
 tools/qfcc/source/qc-parse.y | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index ea9d64881..dafb49c96 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -1202,8 +1202,9 @@ field_expr (expr_t *e1, expr_t *e2)
 			class_t    *class = t1->t.fldptr.type->t.class;
 			symbol_t   *sym = e2->e.symbol;//FIXME need to check
 			symbol_t   *ivar;
+			int         protected = class_access (current_class, class);
 
-			ivar = class_find_ivar (class, vis_protected, sym->name);
+			ivar = class_find_ivar (class, protected, sym->name);
 			if (!ivar)
 				return new_error_expr ();
 			e2->type = ex_value;
diff --git a/tools/qfcc/source/qc-parse.y b/tools/qfcc/source/qc-parse.y
index 5658382c5..7ae13bd6e 100644
--- a/tools/qfcc/source/qc-parse.y
+++ b/tools/qfcc/source/qc-parse.y
@@ -706,6 +706,7 @@ struct_decl
 			$1->type = append_type ($1->type, $<spec>0.type);
 			$1->type = find_type ($1->type);
 			$1->sy_type = sy_var;
+			$1->visibility = current_visibility;
 			symtab_addsymbol (current_symtab, $1);
 		}
 	| var_decl
@@ -715,6 +716,7 @@ struct_decl
 			$1->type = append_type ($1->type, $<spec>0.type);
 			$1->type = find_type ($1->type);
 			$1->sy_type = sy_var;
+			$1->visibility = current_visibility;
 			symtab_addsymbol (current_symtab, $1);
 		}
 	| var_decl ':' expr		%prec COMMA		{}
@@ -1762,6 +1764,7 @@ ivar_decl_list
 			tab = $$->parent;	// preserve the ivars inheritance chain
 			build_struct ('s', 0, $$, 0);
 			$$->parent = tab;
+			current_visibility = vis_public;
 		}
 	;
 

From c2138183dd159a2d2ee13288b5f319b7ee582ebf Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 3 Mar 2020 10:43:29 +0900
Subject: [PATCH 0597/1519] [libr] Initialize SetIterator the right way

I'd written Set.[rh] after the big rewrite so never noticed the access
error.
---
 ruamoko/lib/Set.r | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/ruamoko/lib/Set.r b/ruamoko/lib/Set.r
index 10cf6397d..06ef95193 100644
--- a/ruamoko/lib/Set.r
+++ b/ruamoko/lib/Set.r
@@ -27,6 +27,15 @@ string set_as_string (set_t *set) = #0;
 
 
 @implementation SetIterator: Object
+- initWithIterator: (set_iter_t *) iter
+{
+	if (!(self = [super init])) {
+		return nil;
+	}
+	self.iter = iter;
+	return self;
+}
+
 - (SetIterator *) next
 {
 	if ((iter = set_next (iter)))
@@ -84,8 +93,7 @@ string set_as_string (set_t *set) = #0;
 
 	if (!iter)
 		return nil;
-	iterator = [[SetIterator alloc] init];
-	iterator.iter = iter;
+	iterator = [[SetIterator alloc] initWithIterator: iter];
 	return iterator;
 }
 

From bb25057feb7a51a3420da14e14ca09da0825fc47 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 3 Mar 2020 10:46:28 +0900
Subject: [PATCH 0598/1519] [qwaq] Quickly Workaround Access Qualifications

:)
---
 ruamoko/qwaq/qwaq-screen.h | 1 +
 ruamoko/qwaq/qwaq-view.h   | 1 +
 ruamoko/qwaq/qwaq-window.h | 1 +
 3 files changed, 3 insertions(+)

diff --git a/ruamoko/qwaq/qwaq-screen.h b/ruamoko/qwaq/qwaq-screen.h
index cbd0a6721..5ded2ecaf 100644
--- a/ruamoko/qwaq/qwaq-screen.h
+++ b/ruamoko/qwaq/qwaq-screen.h
@@ -10,6 +10,7 @@
 
 @interface Screen: Object <HandleEvent, Draw>
 {
+	@public
 	Rect        rect;
 	Array      *views;
 	Array      *event_handlers;
diff --git a/ruamoko/qwaq/qwaq-view.h b/ruamoko/qwaq/qwaq-view.h
index e532f9f0b..817ec0ab7 100644
--- a/ruamoko/qwaq/qwaq-view.h
+++ b/ruamoko/qwaq/qwaq-view.h
@@ -9,6 +9,7 @@
 
 @interface View: Object <Draw>
 {
+	@public
 	Rect        rect;
 	Rect        absRect;
 	Point       point;		// can't be local :(
diff --git a/ruamoko/qwaq/qwaq-window.h b/ruamoko/qwaq/qwaq-window.h
index 66c6d440e..ae45d7e72 100644
--- a/ruamoko/qwaq/qwaq-window.h
+++ b/ruamoko/qwaq/qwaq-window.h
@@ -11,6 +11,7 @@
 
 @interface Window: Object <Draw, TakeFocus>
 {
+	@public
 	Rect        rect;
 	Point       point;	// FIXME can't be local :(
 	Array      *views;

From c7cde5f409626609665cbb847df3e0c18c896412 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 3 Mar 2020 10:59:01 +0900
Subject: [PATCH 0599/1519] [qfcc] Pass gcc's purity test

*sigh*
---
 tools/qfcc/source/method.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/qfcc/source/method.c b/tools/qfcc/source/method.c
index d1f8dd5cd..c5bd8b334 100644
--- a/tools/qfcc/source/method.c
+++ b/tools/qfcc/source/method.c
@@ -205,7 +205,7 @@ new_methodlist (void)
 	return l;
 }
 
-static int
+static int __attribute__((pure))
 method_in_list (methodlist_t *method_list, method_t *method)
 {
 	method_t    *m;

From b8984e5f660b426a5c3a994c1eb565926e801e65 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 3 Mar 2020 13:39:24 +0900
Subject: [PATCH 0600/1519] [qfcc] Fix another infinite loop in the linker

I think this should be it for infinite loops caused by undefined
symbols. I don't know why I didn't remove this continue when I removed
the other.
---
 tools/qfcc/source/linker.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tools/qfcc/source/linker.c b/tools/qfcc/source/linker.c
index 5a9d367ce..de107d1b4 100644
--- a/tools/qfcc/source/linker.c
+++ b/tools/qfcc/source/linker.c
@@ -1119,10 +1119,8 @@ undefined_def (qfo_def_t *def)
 			pr_lineno_t *line;
 
 			while (func - work->funcs < work->num_funcs) {
-				if (func->code < 0) {
-					continue;
-				}
-				if ((pr_uint_t) func->code <= reloc->offset) {
+				if (func->code >= 0
+					&& (pr_uint_t) func->code <= reloc->offset) {
 					if (!best || reloc->offset - func->code < best_dist) {
 						best = func;
 						best_dist = reloc->offset - func->code;

From cdc1f0c5e7429845243311fd563de7eb961cd773 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 3 Mar 2020 15:24:41 +0900
Subject: [PATCH 0601/1519] [libr] Treat ruamoko headers as system headers

Now that qfcc actually supports them properly.
---
 ruamoko/gui/Group.r               |  6 +++---
 ruamoko/gui/InputLine.r           |  6 +++---
 ruamoko/gui/Makefile.am           |  5 ++++-
 ruamoko/gui/Pic.r                 |  6 +++---
 ruamoko/gui/Point.r               |  2 +-
 ruamoko/gui/Rect.r                |  8 ++++----
 ruamoko/gui/Size.r                |  2 +-
 ruamoko/gui/Slider.r              |  6 +++---
 ruamoko/gui/Text.r                |  6 +++---
 ruamoko/gui/View.r                |  8 ++++----
 ruamoko/include/Array.h           |  4 ++--
 ruamoko/include/AutoreleasePool.h |  2 +-
 ruamoko/include/Entity.h          |  2 +-
 ruamoko/include/Object.h          |  2 +-
 ruamoko/include/PropertyList.h    |  4 ++--
 ruamoko/include/Protocol.h        |  2 +-
 ruamoko/include/draw.h            |  2 +-
 ruamoko/include/gui/Group.h       |  2 +-
 ruamoko/include/gui/InputLine.h   |  2 +-
 ruamoko/include/gui/Pic.h         |  2 +-
 ruamoko/include/gui/Rect.h        |  4 ++--
 ruamoko/include/gui/Slider.h      |  2 +-
 ruamoko/include/gui/Text.h        |  2 +-
 ruamoko/include/gui/View.h        |  4 ++--
 ruamoko/include/key.h             |  2 +-
 ruamoko/include/msgbuf.h          |  2 +-
 ruamoko/include/plist.h           |  2 +-
 ruamoko/include/qfs.h             |  2 +-
 ruamoko/include/qw_message.h      |  2 +-
 ruamoko/lib/Array.r               |  6 +++---
 ruamoko/lib/AutoreleasePool.r     |  5 ++---
 ruamoko/lib/Entity.r              | 12 ++++++------
 ruamoko/lib/Makefile.am           |  5 ++++-
 ruamoko/lib/Object.r              |  4 ++--
 ruamoko/lib/PropertyList.r        |  2 +-
 ruamoko/lib/Protocol.r            |  2 +-
 ruamoko/lib/Set.r                 |  2 +-
 ruamoko/lib/cbuf.r                |  2 +-
 ruamoko/lib/cmd.r                 |  2 +-
 ruamoko/lib/crudefile.r           |  2 +-
 ruamoko/lib/cvar.r                |  2 +-
 ruamoko/lib/debug.r               |  2 +-
 ruamoko/lib/draw.r                |  2 +-
 ruamoko/lib/entities.r            |  2 +-
 ruamoko/lib/gib.r                 |  2 +-
 ruamoko/lib/hash.r                |  2 +-
 ruamoko/lib/infokey.r             |  2 +-
 ruamoko/lib/key.r                 |  2 +-
 ruamoko/lib/math.r                |  2 +-
 ruamoko/lib/message.r             |  2 +-
 ruamoko/lib/msgbuf.r              |  2 +-
 ruamoko/lib/nq_message.r          |  2 +-
 ruamoko/lib/physics.r             |  2 +-
 ruamoko/lib/plist.r               |  2 +-
 ruamoko/lib/qfile.r               |  2 +-
 ruamoko/lib/qfs.r                 |  2 +-
 ruamoko/lib/qw_message.r          |  2 +-
 ruamoko/lib/qw_physics.r          |  2 +-
 ruamoko/lib/qw_sys.r              |  2 +-
 ruamoko/lib/script.r              |  2 +-
 ruamoko/lib/server.r              |  2 +-
 ruamoko/lib/sound.r               |  2 +-
 ruamoko/lib/string.r              |  2 +-
 ruamoko/lib/sv_sound.r            |  2 +-
 ruamoko/lib/system.r              |  2 +-
 65 files changed, 100 insertions(+), 95 deletions(-)

diff --git a/ruamoko/gui/Group.r b/ruamoko/gui/Group.r
index 4bcccadf1..56b7303c7 100644
--- a/ruamoko/gui/Group.r
+++ b/ruamoko/gui/Group.r
@@ -1,6 +1,6 @@
-#include "gui/Group.h"
-#include "gui/Point.h"
-#include "Array.h"
+#include <gui/Group.h>
+#include <gui/Point.h>
+#include <Array.h>
 
 @implementation Group
 
diff --git a/ruamoko/gui/InputLine.r b/ruamoko/gui/InputLine.r
index 781e56b78..e4fb8df8a 100644
--- a/ruamoko/gui/InputLine.r
+++ b/ruamoko/gui/InputLine.r
@@ -1,6 +1,6 @@
-#include "draw.h"
-#include "gui/InputLine.h"
-#include "gui/Rect.h"
+#include <draw.h>
+#include <gui/InputLine.h>
+#include <gui/Rect.h>
 
 inputline_t InputLine_Create (int lines, int size, int prompt) = #0;
 void InputLine_SetPos (inputline_t il, int x, int y) = #0;
diff --git a/ruamoko/gui/Makefile.am b/ruamoko/gui/Makefile.am
index e4866e856..91ac97245 100644
--- a/ruamoko/gui/Makefile.am
+++ b/ruamoko/gui/Makefile.am
@@ -4,7 +4,10 @@ pkglibdir=$(datarootdir)/qfcc/lib
 
 QFCC=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT)
 QCFLAGS=-qq -O -g -Werror -Wall -Wno-integer-divide --no-default-paths
-QCPPFLAGS=$(AM_CPPFLAGS)
+QCPPFLAGS=--no-default-paths -I$(top_srcdir)/ruamoko/include
+QCLINKFLAGS=--no-default-paths -L$(top_builddir)/ruamoko/lib
+QCOMPILE=$(QFCC) $(QCFLAGS) $(QCPPFLAGS)
+QLINK=$(QFCC) $(QCFLAGS) $(QCLINKFLAGS)
 PAK=$(top_builddir)/tools/pak/pak$(EXEEXT)
 RANLIB=touch
 
diff --git a/ruamoko/gui/Pic.r b/ruamoko/gui/Pic.r
index 89cf93950..748393cc5 100644
--- a/ruamoko/gui/Pic.r
+++ b/ruamoko/gui/Pic.r
@@ -1,6 +1,6 @@
-#include "draw.h"
-#include "string.h"
-#include "gui/Pic.h"
+#include <draw.h>
+#include <string.h>
+#include <gui/Pic.h>
 
 @implementation Pic
 -(id)init
diff --git a/ruamoko/gui/Point.r b/ruamoko/gui/Point.r
index c25c72000..91163087b 100644
--- a/ruamoko/gui/Point.r
+++ b/ruamoko/gui/Point.r
@@ -1,4 +1,4 @@
-#include "gui/Point.h"
+#include <gui/Point.h>
 
 Point makePoint (int x, int y)
 {
diff --git a/ruamoko/gui/Rect.r b/ruamoko/gui/Rect.r
index be1c69384..a7280cea3 100644
--- a/ruamoko/gui/Rect.r
+++ b/ruamoko/gui/Rect.r
@@ -1,7 +1,7 @@
-#include "Object.h"
-#include "gui/Point.h"
-#include "gui/Size.h"
-#include "gui/Rect.h"
+#include <Object.h>
+#include <gui/Point.h>
+#include <gui/Size.h>
+#include <gui/Rect.h>
 
 Rect makeRect (int x, int y, int w, int h)
 {
diff --git a/ruamoko/gui/Size.r b/ruamoko/gui/Size.r
index d4565a33f..da1bf04a9 100644
--- a/ruamoko/gui/Size.r
+++ b/ruamoko/gui/Size.r
@@ -1,4 +1,4 @@
-#include "gui/Size.h"
+#include <gui/Size.h>
 
 Size makeSize (int width, int height)
 {
diff --git a/ruamoko/gui/Slider.r b/ruamoko/gui/Slider.r
index d43cdcf21..275a64de4 100644
--- a/ruamoko/gui/Slider.r
+++ b/ruamoko/gui/Slider.r
@@ -1,7 +1,7 @@
-#include "draw.h"
+#include <draw.h>
 
-#include "gui/Slider.h"
-#include "gui/Rect.h"
+#include <gui/Slider.h>
+#include <gui/Rect.h>
 
 @implementation Slider
 
diff --git a/ruamoko/gui/Text.r b/ruamoko/gui/Text.r
index 731f661ce..6011273d8 100644
--- a/ruamoko/gui/Text.r
+++ b/ruamoko/gui/Text.r
@@ -1,6 +1,6 @@
-#include "gui/Text.h"
-#include "string.h"
-#include "draw.h"
+#include <gui/Text.h>
+#include <string.h>
+#include <draw.h>
 
 @implementation Text
 - (id) init
diff --git a/ruamoko/gui/View.r b/ruamoko/gui/View.r
index 2accc4fe7..a83ebeb33 100644
--- a/ruamoko/gui/View.r
+++ b/ruamoko/gui/View.r
@@ -1,7 +1,7 @@
-#include "gui/Size.h"
-#include "gui/Point.h"
-#include "gui/Rect.h"
-#include "gui/View.h"
+#include <gui/Size.h>
+#include <gui/Point.h>
+#include <gui/Rect.h>
+#include <gui/View.h>
 
 @implementation View
 
diff --git a/ruamoko/include/Array.h b/ruamoko/include/Array.h
index 8a9f91f36..113e466a9 100644
--- a/ruamoko/include/Array.h
+++ b/ruamoko/include/Array.h
@@ -1,8 +1,8 @@
 #ifndef __ruamoko_Array_h
 #define __ruamoko_Array_h
 
-#include "Object.h"
-#include "runtime.h"
+#include <Object.h>
+#include <runtime.h>
 
 /**
 	The Array class is a general ordered collection class.
diff --git a/ruamoko/include/AutoreleasePool.h b/ruamoko/include/AutoreleasePool.h
index a02600c9e..c8202e0f0 100644
--- a/ruamoko/include/AutoreleasePool.h
+++ b/ruamoko/include/AutoreleasePool.h
@@ -1,7 +1,7 @@
 #ifndef __ruamoko_AutoreleasePool_h
 #define __ruamoko_AutoreleasePool_h
 
-#include "Object.h"
+#include <Object.h>
 
 @class Array;
 
diff --git a/ruamoko/include/Entity.h b/ruamoko/include/Entity.h
index 85f304efb..8ff0f568c 100644
--- a/ruamoko/include/Entity.h
+++ b/ruamoko/include/Entity.h
@@ -30,7 +30,7 @@
 #ifndef __ruamoko_Entity_h
 #define __ruamoko_Entity_h
 
-#include "Object.h"
+#include <Object.h>
 
 @interface Entity: Object
 {
diff --git a/ruamoko/include/Object.h b/ruamoko/include/Object.h
index 23623ef06..475e0bec9 100644
--- a/ruamoko/include/Object.h
+++ b/ruamoko/include/Object.h
@@ -1,7 +1,7 @@
 #ifndef __ruamoko_Object_h
 #define __ruamoko_Object_h
 
-#include "runtime.h"
+#include <runtime.h>
 
 @class Protocol;
 
diff --git a/ruamoko/include/PropertyList.h b/ruamoko/include/PropertyList.h
index 0f255cdfe..3deb99a2b 100644
--- a/ruamoko/include/PropertyList.h
+++ b/ruamoko/include/PropertyList.h
@@ -1,8 +1,8 @@
 #ifndef __ruamoko_PropertyList_h
 #define __ruamoko_PropertyList_h
 
-#include "plist.h"
-#include "Object.h"
+#include <plist.h>
+#include <Object.h>
 
 @interface PLItem: Object
 {
diff --git a/ruamoko/include/Protocol.h b/ruamoko/include/Protocol.h
index 2894ee4fa..3d377ab75 100644
--- a/ruamoko/include/Protocol.h
+++ b/ruamoko/include/Protocol.h
@@ -1,7 +1,7 @@
 #ifndef __ruamoko_Protocol_h
 #define __ruamoko_Protocol_h
 
-#include "Object.h"
+#include <Object.h>
 
 struct obj_method_description {
 	string name;
diff --git a/ruamoko/include/draw.h b/ruamoko/include/draw.h
index df4a1470f..ae868ff36 100644
--- a/ruamoko/include/draw.h
+++ b/ruamoko/include/draw.h
@@ -1,7 +1,7 @@
 #ifndef __ruamoko_draw_h
 #define __ruamoko_draw_h
 
-#include "Object.h"
+#include <Object.h>
 
 struct _qpic_t {
 	int width;
diff --git a/ruamoko/include/gui/Group.h b/ruamoko/include/gui/Group.h
index f20cca09c..ccd4baa65 100644
--- a/ruamoko/include/gui/Group.h
+++ b/ruamoko/include/gui/Group.h
@@ -1,7 +1,7 @@
 #ifndef __ruamoko_gui_Group_h
 #define __ruamoko_gui_Group_h
 
-#include "View.h"
+#include <gui/View.h>
 
 /**	\addtogroup gui */
 ///@{
diff --git a/ruamoko/include/gui/InputLine.h b/ruamoko/include/gui/InputLine.h
index 363cc0b8c..c0b14cfb4 100644
--- a/ruamoko/include/gui/InputLine.h
+++ b/ruamoko/include/gui/InputLine.h
@@ -1,7 +1,7 @@
 #ifndef __ruamoko_gui_InputLine_h
 #define __ruamoko_gui_InputLine_h
 
-#include "View.h"
+#include <gui/View.h>
 
 /**	\defgroup inputline Low level intputline interface.
 	\ingroup gui
diff --git a/ruamoko/include/gui/Pic.h b/ruamoko/include/gui/Pic.h
index 9ed9e3380..9bfe29fbc 100644
--- a/ruamoko/include/gui/Pic.h
+++ b/ruamoko/include/gui/Pic.h
@@ -1,7 +1,7 @@
 #ifndef __ruamoko_gui_Pic_h
 #define __ruamoko_gui_Pic_h
 
-#include "gui/View.h"
+#include <gui/View.h>
 
 /**	\addtogroup gui */
 ///@{
diff --git a/ruamoko/include/gui/Rect.h b/ruamoko/include/gui/Rect.h
index 005ce4a70..d1432f460 100644
--- a/ruamoko/include/gui/Rect.h
+++ b/ruamoko/include/gui/Rect.h
@@ -1,8 +1,8 @@
 #ifndef __ruamoko_gui_Rect_h
 #define __ruamoko_gui_Rect_h
 
-#include "gui/Point.h"
-#include "gui/Size.h"
+#include <gui/Point.h>
+#include <gui/Size.h>
 
 /**	\addtogroup gui */
 ///@{
diff --git a/ruamoko/include/gui/Slider.h b/ruamoko/include/gui/Slider.h
index 66710d28e..99840af7e 100644
--- a/ruamoko/include/gui/Slider.h
+++ b/ruamoko/include/gui/Slider.h
@@ -1,7 +1,7 @@
 #ifndef __ruamoko_gui_Slider_h
 #define __ruamoko_gui_Slider_h
 
-#include "View.h"
+#include <gui/View.h>
 
 /**	\addtogroup gui */
 ///@{
diff --git a/ruamoko/include/gui/Text.h b/ruamoko/include/gui/Text.h
index d5654d555..ef389bf9c 100644
--- a/ruamoko/include/gui/Text.h
+++ b/ruamoko/include/gui/Text.h
@@ -1,7 +1,7 @@
 #ifndef __ruamoko_gui_Text_h
 #define __ruamoko_gui_Text_h
 
-#include "View.h"
+#include <gui/View.h>
 
 /**	\addtogroup gui */
 ///@{
diff --git a/ruamoko/include/gui/View.h b/ruamoko/include/gui/View.h
index c2a99e036..3cb51ee67 100644
--- a/ruamoko/include/gui/View.h
+++ b/ruamoko/include/gui/View.h
@@ -1,8 +1,8 @@
 #ifndef __ruamoko_gui_View_h
 #define __ruamoko_gui_View_h
 
-#include "Object.h"
-#include "gui/Rect.h"
+#include <Object.h>
+#include <gui/Rect.h>
 
 /**	\defgroup gui GUI goo for gooey chewing
 */
diff --git a/ruamoko/include/key.h b/ruamoko/include/key.h
index bc7d04801..f3355b3d2 100644
--- a/ruamoko/include/key.h
+++ b/ruamoko/include/key.h
@@ -1,7 +1,7 @@
 #ifndef __ruamoko_key_h
 #define __ruamoko_key_h
 
-#include "QF/keys.h"
+#include <QF/keys.h>
 
 @extern int Key_keydown (int keynum);
 @extern string Key_SetBinding (string imt, int keynum, string binding);
diff --git a/ruamoko/include/msgbuf.h b/ruamoko/include/msgbuf.h
index d26ba4de9..172d7338a 100644
--- a/ruamoko/include/msgbuf.h
+++ b/ruamoko/include/msgbuf.h
@@ -1,7 +1,7 @@
 #ifndef __ruamoko_msgbuf_h
 #define __ruamoko_msgbuf_h
 
-#include "qfile.h"
+#include <qfile.h>
 
 struct msgbuf_s;
 typedef struct msgbuf_s msgbuf_t;
diff --git a/ruamoko/include/plist.h b/ruamoko/include/plist.h
index 949419ea9..4544e00ff 100644
--- a/ruamoko/include/plist.h
+++ b/ruamoko/include/plist.h
@@ -1,7 +1,7 @@
 #ifndef __ruamoko_plist_h
 #define __ruamoko_plist_h
 
-#include "qfile.h"
+#include <qfile.h>
 
 typedef struct plitem_s *plitem_t;
 typedef enum {QFDictionary, QFArray, QFBinary, QFString} pltype_t;	// possible types
diff --git a/ruamoko/include/qfs.h b/ruamoko/include/qfs.h
index 4a31154f9..379e29ad2 100644
--- a/ruamoko/include/qfs.h
+++ b/ruamoko/include/qfs.h
@@ -1,7 +1,7 @@
 #ifndef __ruamoko_qfs_h
 #define __ruamoko_qfs_h
 
-#include "qfile.h"
+#include <qfile.h>
 
 struct _qfslist_t {
 	int count;
diff --git a/ruamoko/include/qw_message.h b/ruamoko/include/qw_message.h
index 5bd7efb0d..60c8587d1 100644
--- a/ruamoko/include/qw_message.h
+++ b/ruamoko/include/qw_message.h
@@ -1,7 +1,7 @@
 #ifndef __ruamoko_qw_message_h
 #define __ruamoko_qw_message_h
 
-#include "message.h"
+#include <message.h>
 
 @extern void multicast (vector where, float set);
 
diff --git a/ruamoko/lib/Array.r b/ruamoko/lib/Array.r
index bbf5ce883..842076f72 100644
--- a/ruamoko/lib/Array.r
+++ b/ruamoko/lib/Array.r
@@ -1,7 +1,7 @@
-#include "math.h"
+#include <math.h>
 
-#include "Array.h"
-#include "runtime.h"
+#include <Array.h>
+#include <runtime.h>
 
 #define STANDARD_CAPACITY 16
 #define ARRAY_MAX_GRANULARITY 100
diff --git a/ruamoko/lib/AutoreleasePool.r b/ruamoko/lib/AutoreleasePool.r
index 6d8077cfc..b4aadd36f 100644
--- a/ruamoko/lib/AutoreleasePool.r
+++ b/ruamoko/lib/AutoreleasePool.r
@@ -1,7 +1,6 @@
-#include "AutoreleasePool.h"
-#include "Array+Private.h"
+#include <AutoreleasePool.h>
 
-#include "Array.h"
+#include <Array.h>
 #include "Array+Private.h"
 
 @static Array	*poolStack;
diff --git a/ruamoko/lib/Entity.r b/ruamoko/lib/Entity.r
index 5cc1f4f11..474bc3db1 100644
--- a/ruamoko/lib/Entity.r
+++ b/ruamoko/lib/Entity.r
@@ -1,10 +1,10 @@
-#include "Entity.h"
+#include <Entity.h>
 
-#include "debug.h"
-#include "entities.h"
-#include "plist.h"
-#include "script.h"
-#include "string.h"
+#include <debug.h>
+#include <entities.h>
+#include <plist.h>
+#include <script.h>
+#include <string.h>
 
 typedef void () void_function;
 
diff --git a/ruamoko/lib/Makefile.am b/ruamoko/lib/Makefile.am
index ee2c80ff7..525c20d6c 100644
--- a/ruamoko/lib/Makefile.am
+++ b/ruamoko/lib/Makefile.am
@@ -4,7 +4,10 @@ pkglibdir=$(datarootdir)/qfcc/lib
 
 QFCC=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT)
 QCFLAGS=-qq -O -g -Wall -Wno-integer-divide -Werror --no-default-paths
-QCPPFLAGS=$(AM_CPPFLAGS)
+QCPPFLAGS=--no-default-paths -I$(top_srcdir)/ruamoko/include -I$(top_srcdir)/include
+QCLINKFLAGS=--no-default-paths -L$(top_builddir)/ruamoko/lib
+QCOMPILE=$(QFCC) $(QCFLAGS) $(QCPPFLAGS)
+QLINK=$(QFCC) $(QCFLAGS) $(QCLINKFLAGS)
 PAK=$(top_builddir)/tools/pak/pak$(EXEEXT)
 RANLIB=touch
 
diff --git a/ruamoko/lib/Object.r b/ruamoko/lib/Object.r
index a6b0e9d85..dba6b5071 100644
--- a/ruamoko/lib/Object.r
+++ b/ruamoko/lib/Object.r
@@ -1,5 +1,5 @@
-#include "Object.h"
-#include "AutoreleasePool.h"
+#include <Object.h>
+#include <AutoreleasePool.h>
 
 void *PR_FindGlobal (string name) = #0;	//FIXME where?
 
diff --git a/ruamoko/lib/PropertyList.r b/ruamoko/lib/PropertyList.r
index 0bcfa9850..b65edc85d 100644
--- a/ruamoko/lib/PropertyList.r
+++ b/ruamoko/lib/PropertyList.r
@@ -1,4 +1,4 @@
-#include "PropertyList.h"
+#include <PropertyList.h>
 
 @implementation PLItem
 
diff --git a/ruamoko/lib/Protocol.r b/ruamoko/lib/Protocol.r
index 715ca30a7..8893d13bb 100644
--- a/ruamoko/lib/Protocol.r
+++ b/ruamoko/lib/Protocol.r
@@ -1,4 +1,4 @@
-#include "Protocol.h"
+#include <Protocol.h>
 
 struct obj_protocol_list {
 	struct obj_protocol_list *next;
diff --git a/ruamoko/lib/Set.r b/ruamoko/lib/Set.r
index 06ef95193..9e215ec51 100644
--- a/ruamoko/lib/Set.r
+++ b/ruamoko/lib/Set.r
@@ -1,4 +1,4 @@
-#include "Set.h"
+#include <Set.h>
 
 void set_del_iter (set_iter_t *set_iter) = #0;
 set_t *set_new (void) = #0;
diff --git a/ruamoko/lib/cbuf.r b/ruamoko/lib/cbuf.r
index 496585fd5..f22498f3c 100644
--- a/ruamoko/lib/cbuf.r
+++ b/ruamoko/lib/cbuf.r
@@ -1,4 +1,4 @@
-#include "cbuf.h"
+#include <cbuf.h>
 
 void (string text) Cbuf_AddText = #0;
 void (string text) Cbuf_InsertText = #0;
diff --git a/ruamoko/lib/cmd.r b/ruamoko/lib/cmd.r
index 2ecb6d100..ba86632f8 100644
--- a/ruamoko/lib/cmd.r
+++ b/ruamoko/lib/cmd.r
@@ -1,4 +1,4 @@
-#include "cmd.h"
+#include <cmd.h>
 
 void (string name, void () func) Cmd_AddCommand = #0;
 int () Cmd_Argc = #0;
diff --git a/ruamoko/lib/crudefile.r b/ruamoko/lib/crudefile.r
index c8d4b9e27..2987af452 100644
--- a/ruamoko/lib/crudefile.r
+++ b/ruamoko/lib/crudefile.r
@@ -1,4 +1,4 @@
-#include "crudefile.h"
+#include <crudefile.h>
 
 float (string path, string mode) cfopen = #0x000f0000 + 103;
 void (float desc) cfclose = #0x000f0000 + 104;
diff --git a/ruamoko/lib/cvar.r b/ruamoko/lib/cvar.r
index 168c38e18..be12b212e 100644
--- a/ruamoko/lib/cvar.r
+++ b/ruamoko/lib/cvar.r
@@ -1,4 +1,4 @@
-#include "cvar.h"
+#include <cvar.h>
 
 float (string s) cvar = #45;
 void (string var, string val) cvar_set = #72;
diff --git a/ruamoko/lib/debug.r b/ruamoko/lib/debug.r
index 844c88eff..7cf9c8895 100644
--- a/ruamoko/lib/debug.r
+++ b/ruamoko/lib/debug.r
@@ -1,4 +1,4 @@
-#include "debug.h"
+#include <debug.h>
 
 void abort (void) = #6;
 void coredump (void) = #28;
diff --git a/ruamoko/lib/draw.r b/ruamoko/lib/draw.r
index 741857bf5..5aef3ab75 100644
--- a/ruamoko/lib/draw.r
+++ b/ruamoko/lib/draw.r
@@ -1,4 +1,4 @@
-#include "draw.h"
+#include <draw.h>
 
 void Draw_FreePic (qpic_t pic) = #0;
 qpic_t Draw_MakePic (int width, int heiight, string data) = #0;
diff --git a/ruamoko/lib/entities.r b/ruamoko/lib/entities.r
index f55bd91a7..f49cc9a53 100644
--- a/ruamoko/lib/entities.r
+++ b/ruamoko/lib/entities.r
@@ -1,4 +1,4 @@
-#include "entities.h"
+#include <entities.h>
 
 void setmodel (entity e, string m) = #3;
 void setorigin (entity e, vector o) = #2;
diff --git a/ruamoko/lib/gib.r b/ruamoko/lib/gib.r
index c3fead7b1..26baacd2f 100644
--- a/ruamoko/lib/gib.r
+++ b/ruamoko/lib/gib.r
@@ -1,4 +1,4 @@
-#include "gib.h"
+#include <gib.h>
 
 void GIB_Builtin_Add (string name, void func (int argc, string *argv)) = #0;
 int (string value) GIB_Return = #0;
diff --git a/ruamoko/lib/hash.r b/ruamoko/lib/hash.r
index a70d59b10..120d140f9 100644
--- a/ruamoko/lib/hash.r
+++ b/ruamoko/lib/hash.r
@@ -1,4 +1,4 @@
-#include "hash.h"
+#include <hash.h>
 
 hashtab_t *Hash_NewTable (int size, string gk (void *ele, void *data), void f (void *ele, void *data), void *ud) = #0;
 void Hash_SetHashCompare (hashtab_t *tab, unsigned gh (void *ele, void *data), int cmp (void *ele1, void *ele2, void *data)) = #0;
diff --git a/ruamoko/lib/infokey.r b/ruamoko/lib/infokey.r
index d0049a4fd..a2913df18 100644
--- a/ruamoko/lib/infokey.r
+++ b/ruamoko/lib/infokey.r
@@ -1,4 +1,4 @@
-#include "infokey.h"
+#include <infokey.h>
 
 string (entity e, string key) infokey = #80;
 void (entity ent, string key, string value) setinfokey = #0x000f0000 + 102;
diff --git a/ruamoko/lib/key.r b/ruamoko/lib/key.r
index 19662f138..4b8c1a09a 100644
--- a/ruamoko/lib/key.r
+++ b/ruamoko/lib/key.r
@@ -1,4 +1,4 @@
-#include "key.h"
+#include <key.h>
 
 int Key_keydown (int keynum) = #0;
 string (string imt, int keynum, string binding) Key_SetBinding = #0;
diff --git a/ruamoko/lib/math.r b/ruamoko/lib/math.r
index 80db2b710..47624527a 100644
--- a/ruamoko/lib/math.r
+++ b/ruamoko/lib/math.r
@@ -1,4 +1,4 @@
-#include "math.h"
+#include <math.h>
 
 vector v_forward, v_up, v_right;
 
diff --git a/ruamoko/lib/message.r b/ruamoko/lib/message.r
index 3136cd678..4ddb31571 100644
--- a/ruamoko/lib/message.r
+++ b/ruamoko/lib/message.r
@@ -1,4 +1,4 @@
-#include "message.h"
+#include <message.h>
 
 void (...) bprint = #23;
 void (entity client, string s) sprint = #24;
diff --git a/ruamoko/lib/msgbuf.r b/ruamoko/lib/msgbuf.r
index c1352a43e..1bd4e09b1 100644
--- a/ruamoko/lib/msgbuf.r
+++ b/ruamoko/lib/msgbuf.r
@@ -1,4 +1,4 @@
-#include "msgbuf.h"
+#include <msgbuf.h>
 
 msgbuf_t *MsgBuf_New (int size) = #0;
 void MsgBuf_Delete (msgbuf_t *msgbuf) = #0;
diff --git a/ruamoko/lib/nq_message.r b/ruamoko/lib/nq_message.r
index 14c06827a..223d1c604 100644
--- a/ruamoko/lib/nq_message.r
+++ b/ruamoko/lib/nq_message.r
@@ -1,3 +1,3 @@
-#include "nq_message.h"
+#include <nq_message.h>
 
 void (vector o, vector d, float color, float count) particle = #48;
diff --git a/ruamoko/lib/physics.r b/ruamoko/lib/physics.r
index ca19e052f..b42585d00 100644
--- a/ruamoko/lib/physics.r
+++ b/ruamoko/lib/physics.r
@@ -1,4 +1,4 @@
-#include "physics.h"
+#include <physics.h>
 
 float		trace_allsolid;
 float		trace_startsolid;
diff --git a/ruamoko/lib/plist.r b/ruamoko/lib/plist.r
index 4b01c653b..40ab2e1fc 100644
--- a/ruamoko/lib/plist.r
+++ b/ruamoko/lib/plist.r
@@ -1,4 +1,4 @@
-#include "plist.h"
+#include <plist.h>
 
 plitem_t PL_GetFromFile (QFile file) = #0;
 plitem_t PL_GetPropertyList (string str) = #0;
diff --git a/ruamoko/lib/qfile.r b/ruamoko/lib/qfile.r
index 072d72a1c..487beb5c5 100644
--- a/ruamoko/lib/qfile.r
+++ b/ruamoko/lib/qfile.r
@@ -1,4 +1,4 @@
-#include "qfile.h"
+#include <qfile.h>
 
 int Qrename (string old, string new) = #0;
 int Qremove (string path) = #0;
diff --git a/ruamoko/lib/qfs.r b/ruamoko/lib/qfs.r
index b0632d030..d467b09ce 100644
--- a/ruamoko/lib/qfs.r
+++ b/ruamoko/lib/qfs.r
@@ -1,4 +1,4 @@
-#include "qfs.h"
+#include <qfs.h>
 
 QFile QFS_Open (string path, string mode) = #0;
 QFile QFS_WOpen (string path, int zip) = #0;
diff --git a/ruamoko/lib/qw_message.r b/ruamoko/lib/qw_message.r
index fcc714c37..218db52cd 100644
--- a/ruamoko/lib/qw_message.r
+++ b/ruamoko/lib/qw_message.r
@@ -1,3 +1,3 @@
-#include "qw_message.h"
+#include <qw_message.h>
 
 void (vector where, float set) multicast = #82;
diff --git a/ruamoko/lib/qw_physics.r b/ruamoko/lib/qw_physics.r
index 431e97e63..0ff633569 100644
--- a/ruamoko/lib/qw_physics.r
+++ b/ruamoko/lib/qw_physics.r
@@ -1,4 +1,4 @@
-#include "qw_physics.h"
+#include <qw_physics.h>
 
 entity (entity ent) testentitypos = #0x000f0000 + 92;
 void (vector start, vector mins, vector maxs, vector end, float type, entity passent) checkmove = #0x000f0000 + 98;
diff --git a/ruamoko/lib/qw_sys.r b/ruamoko/lib/qw_sys.r
index 8d8643576..529f42947 100644
--- a/ruamoko/lib/qw_sys.r
+++ b/ruamoko/lib/qw_sys.r
@@ -1,3 +1,3 @@
-#include "qw_sys.h"
+#include <qw_sys.h>
 
 void (entity killer, entity killee) logfrag = #79;
diff --git a/ruamoko/lib/script.r b/ruamoko/lib/script.r
index 74c120075..e72c4b72a 100644
--- a/ruamoko/lib/script.r
+++ b/ruamoko/lib/script.r
@@ -1,4 +1,4 @@
-#include "script.h"
+#include <script.h>
 
 script_t Script_New (void) = #0;
 void Script_Delete (script_t script) = #0;
diff --git a/ruamoko/lib/server.r b/ruamoko/lib/server.r
index 42bd99eb5..b65c3ac7d 100644
--- a/ruamoko/lib/server.r
+++ b/ruamoko/lib/server.r
@@ -1,4 +1,4 @@
-#include "server.h"
+#include <server.h>
 
 void (string s) precache_sound = #19;
 void (string s) precache_model = #20;
diff --git a/ruamoko/lib/sound.r b/ruamoko/lib/sound.r
index 863800c81..000ef7047 100644
--- a/ruamoko/lib/sound.r
+++ b/ruamoko/lib/sound.r
@@ -1,3 +1,3 @@
-#include "sound.h"
+#include <sound.h>
 
 void  (string sound) S_LocalSound = #0;
diff --git a/ruamoko/lib/string.r b/ruamoko/lib/string.r
index f7eda6b48..36247bf91 100644
--- a/ruamoko/lib/string.r
+++ b/ruamoko/lib/string.r
@@ -1,4 +1,4 @@
-#include "string.h"
+#include <string.h>
 
 string (float f) ftos = #26;
 string (vector v) vtos = #27;
diff --git a/ruamoko/lib/sv_sound.r b/ruamoko/lib/sv_sound.r
index 7880c6b1b..cd4b4f43e 100644
--- a/ruamoko/lib/sv_sound.r
+++ b/ruamoko/lib/sv_sound.r
@@ -1,4 +1,4 @@
-#include "sound.h"
+#include <sound.h>
 
 void (entity e, float chan, string samp, float vol, float atten) sound = #8;
 void (vector pos, string samp, float vol, float atten) ambientsound = #74;
diff --git a/ruamoko/lib/system.r b/ruamoko/lib/system.r
index 1a387f890..753a41d99 100644
--- a/ruamoko/lib/system.r
+++ b/ruamoko/lib/system.r
@@ -1,4 +1,4 @@
-#include "system.h"
+#include <system.h>
 
 float time;
 

From 6def1fc01c8ac8adafc01c049062a3179b13b698 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 3 Mar 2020 15:26:33 +0900
Subject: [PATCH 0602/1519] [qfcc] Fix a bootstrap warning

---
 tools/qfcc/test/Makefile.am | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/tools/qfcc/test/Makefile.am b/tools/qfcc/test/Makefile.am
index 937686a6e..129240670 100644
--- a/tools/qfcc/test/Makefile.am
+++ b/tools/qfcc/test/Makefile.am
@@ -364,14 +364,14 @@ triangle.run: Makefile build-run
 include ./$(DEPDIR)/triangle.Qo # am--include-marker
 r_depfiles_remade += ./$(DEPDIR)/triangle.Qo
 
-typedef_dat_SOURCES=typedef.r
-typedef_obj=$(typedef_dat_SOURCES:.r=.qfo)
-typedef.dat$(EXEEXT): $(typedef_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(typedef_obj)
-typedef.run: Makefile build-run
-	@$(srcdir)/build-run $@
-include ./$(DEPDIR)/typedef.Qo # am--include-marker
-r_depfiles_remade += ./$(DEPDIR)/typedef.Qo
+#typedef_dat_SOURCES=typedef.r
+#typedef_obj=$(typedef_dat_SOURCES:.r=.qfo)
+#typedef.dat$(EXEEXT): $(typedef_obj) $(QFCC_DEP)
+#	$(QFCC) $(QCFLAGS) -o $@ $(typedef_obj)
+#typedef.run: Makefile build-run
+#	@$(srcdir)/build-run $@
+#include ./$(DEPDIR)/typedef.Qo # am--include-marker
+#r_depfiles_remade += ./$(DEPDIR)/typedef.Qo
 
 vecexpr_dat_SOURCES=vecexpr.r
 vecexpr_obj=$(vecexpr_dat_SOURCES:.r=.qfo)

From 051a572bcc28ef59e847960638c55613e48c6529 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 3 Mar 2020 17:24:53 +0900
Subject: [PATCH 0603/1519] [build] Dependency checking for all ruamoko code

Including dependency on qfcc itself. Getting automake to chooch the way
I want it to chooch can be a pain in the... see AvE
---
 ruamoko/cl_menu/Makefile.am |  67 ++++++++++++++++--------
 ruamoko/game/Makefile.am    |  62 +++++++++++++++-------
 ruamoko/gui/Makefile.am     |  36 +++++++++----
 ruamoko/lib/Makefile.am     |  98 ++++++++++++++++++++++++----------
 ruamoko/scheme/Makefile.am  | 101 +++++++++++++++++++++---------------
 5 files changed, 244 insertions(+), 120 deletions(-)

diff --git a/ruamoko/cl_menu/Makefile.am b/ruamoko/cl_menu/Makefile.am
index 55c21a857..ceaef7fe5 100644
--- a/ruamoko/cl_menu/Makefile.am
+++ b/ruamoko/cl_menu/Makefile.am
@@ -1,43 +1,66 @@
 ## Process this file with automake to produce Makefile.in
-AUTOMAKE_OPTIONS= foreign
-
-pkgdatadir=@sharepath@/QF
+AUTOMAKE_OPTIONS= foreign no-exeext
 
 QFCC_DEP=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT)
 QFCC=$(QFCC_DEP)
-QCFLAGS=-qq -O -g -Wall -Werror -Wno-integer-divide --no-default-paths
-QCPPFLAGS=-I. -I$(srcdir) -I$(top_builddir)/ruamoko/include -I$(top_srcdir)/ruamoko/include -I$(top_builddir)/include -I$(top_srcdir)/include
-GZIP=if echo $@ | grep -q .gz; then gzip -f `basename $@ .gz`; if test -f `basename $@ .dat.gz`.sym; then gzip -f `basename $@ .dat.gz`.sym; fi; fi
+
 GZ=@progs_gz@
+menu_libexec=menu.dat
+menu_data=menu.plist menu.sym
+
+pkglibexecdir=@sharepath@/QF
+pkgdatadir=@sharepath@/QF
+
+pkgdata_DATA= $(menu_data)
+pkglibexec_PROGRAMS= $(menu_libexec)
+EXTRA_PROGRAMS= $(menu_libexec)
+
+QCFLAGS=-qq -O -g -Wall -Werror -Wno-integer-divide
+QCPPFLAGS=--no-default-paths -I$(top_srcdir)/ruamoko/include -I$(top_srcdir)/include
+QCLINKFLAGS=--no-default-paths -L$(top_builddir)/ruamoko/lib
+QCOMPILE=$(QFCC) $(QCFLAGS) $(QCPPFLAGS)
+QLINK=$(QFCC) $(QCFLAGS) $(QCLINKFLAGS)
+
+MKDIR_P = @MKDIR_P@
+am__mv = mv -f
+
+GZIP=if echo $@ | grep -q .gz; then gzip -f `basename $@ .gz`; if test -f `basename $@ .dat.gz`.sym; then gzip -f `basename $@ .dat.gz`.sym; fi; fi
 # BSD make can't handle $(shell foo) directives, and GNU make can't handle |=
 # so we have to bite the bullet and pass this to the shell every time.
 STRIP=`echo -n $(srcdir)/ | sed -e 's/[^/]//g' | wc -c`
 
-menu_data=menu.dat$(GZ) menu.sym$(GZ) menu.plist
-
-data=$(menu_data)
-
-pkgdata_DATA= $(data)
-EXTRA_DATA= $(menu_data)
+SUFFIXES=.o .r
+.r.o:
+	$(QCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tqo -p $(STRIP) -c -o $@ $<
+	sed -i -e '1s@:@: $(QFCC_DEP)@' $(DEPDIR)/$*.Tqo
+	$(am__mv) $(DEPDIR)/$*.Tqo $(DEPDIR)/$*.Qo
 
 menu_src= \
 	client_menu.r controls_o.r options.r options_util.r servlist.r \
-	Frame.r menu.r HUD.r plistmenu.r ../lib/debug.r \
+	Frame.r HUD.r menu.r plistmenu.r \
 	\
 	CrosshairCvar.r CrosshairView.r CvarColor.r CvarColorView.r \
 	CvarObject.r CvarRange.r CvarRangeView.r CvarString.r CvarStringView.r \
 	CvarToggle.r CvarToggleView.r \
 	MenuGroup.r MouseToggle.r ProxyView.r RunToggle.r SubMenu.r
 
-SUFFIXES=.qfo .r
-.r.qfo:
-	$(QFCC) $(QCFLAGS) $(QCPPFLAGS) -p $(STRIP) -c -o $@ $<
-menu_obj=$(menu_src:.r=.qfo)
+r_depfiles_remade=
 
-menu.dat$(GZ): $(menu_obj) $(QFCC_DEP) ../lib/libcsqc.a ../lib/libr.a ../gui/libgui.a
-	$(QFCC) $(QCFLAGS) -p $(STRIP) -o menu.dat $(menu_obj) ../gui/libgui.a ../lib/libcsqc.a ../lib/libr.a
-	$(GZIP)
-menu.sym$(GZ): menu.dat$(GZ)
+menu_dat_SOURCES=$(menu_src)
+menu_obj=$(menu_src:.r=.o)
+menu_dep=$(addprefix ./$(DEPDIR)/,$(menu_obj:.o=.Qo))
+menu.dat: $(menu_obj) $(QFCC_DEP) ../lib/libcsqc.a ../lib/libr.a ../gui/libgui.a
+	$(QLINK) -p $(STRIP) -o menu.dat $(menu_obj) ../gui/libgui.a ../lib/libcsqc.a ../lib/libr.a
+include $(menu_dep) # am--include-marker
+r_depfiles_remade += $(menu_dep)
+
+menu.sym: menu.dat
+
+$(r_depfiles_remade):
+	$(MKDIR_P) $(@D)
+	echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade) $(r_depfiles_remade)
 
 EXTRA_DIST= $(menu_src) \
 	CrosshairCvar.h CrosshairView.h CvarColor.h CvarColorView.h CvarObject.h \
@@ -46,4 +69,4 @@ EXTRA_DIST= $(menu_src) \
 	MenuGroup.h MouseToggle.h ProxyView.h RunToggle.h SubMenu.h client_menu.h \
 	controls_o.h menu.h options.h options_util.h plistmenu.h servlist.h \
 	menu.plist
-CLEANFILES= *.dat *.sym *.gz *.qfo
+CLEANFILES= *.dat *.sym *.gz *.qfo *.o
diff --git a/ruamoko/game/Makefile.am b/ruamoko/game/Makefile.am
index e1ff2fbf2..95093647f 100644
--- a/ruamoko/game/Makefile.am
+++ b/ruamoko/game/Makefile.am
@@ -1,35 +1,57 @@
 ## Process this file with automake to produce Makefile.in
-AUTOMAKE_OPTIONS= foreign
-
-#FIXME should qf data be installed somewhere other than id1 that gets
-#searched after everything else?
-pkgdatadir=@sharepath@/id1
+AUTOMAKE_OPTIONS= foreign no-exeext
 
 QFCC_DEP=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT)
 QFCC=$(QFCC_DEP)
-QCFLAGS=-qq -O -g -Werror -Wall -Wno-integer-divide --no-default-paths
-QCPPFLAGS=-I. -I$(srcdir) -I$(top_builddir)/ruamoko/include -I$(top_srcdir)/ruamoko/include
-GZIP=if echo $@ | grep -q .gz; then gzip -f `basename $@ .gz`; if test -f `basename $@ .dat.gz`.sym; then gzip -f `basename $@ .dat.gz`.sym; fi; fi
+
 GZ=@progs_gz@
+game_libexec=game.dat
+
+pkglibexecdir=@sharepath@/QF
+
+# this will eventually go into pkglibexecdir, but for now...
+noinst_PROGRAMS= $(game_libexec)
+EXTRA_PROGRAMS= $(game_libexec)
+
+QCFLAGS=-qq -O -g -Werror -Wall -Wno-integer-divide
+QCPPFLAGS=--no-default-paths -I$(top_srcdir)/ruamoko/include
+QCLINKFLAGS=--no-default-paths -L$(top_builddir)/ruamoko/lib
+QCOMPILE=$(QFCC) $(QCFLAGS) $(QCPPFLAGS)
+QLINK=$(QFCC) $(QCFLAGS) $(QCLINKFLAGS)
+
+MKDIR_P = @MKDIR_P@
+am__mv = mv -f
+
+GZIP=if echo $@ | grep -q .gz; then gzip -f `basename $@ .gz`; if test -f `basename $@ .dat.gz`.sym; then gzip -f `basename $@ .dat.gz`.sym; fi; fi
 # BSD make can't handle $(shell foo) directives, and GNU make can't handle |=
 # so we have to bite the bullet and pass this to the shell every time.
 STRIP=`echo -n $(srcdir)/ | sed -e 's/[^/]//g' | wc -c`
 
-data=game.dat$(GZ)
-
-noinst_DATA= $(data)
-EXTRA_DATA= game.dat
+SUFFIXES=.o .r
+.r.o:
+	$(QCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tqo -p $(STRIP) -c -o $@ $<
+	sed -i -e '1s@:@: $(QFCC_DEP)@' $(DEPDIR)/$*.Tqo
+	$(am__mv) $(DEPDIR)/$*.Tqo $(DEPDIR)/$*.Qo
 
 game_src= Axe.r GameEntity.r World.r tempent.r
 
-SUFFIXES=.qfo .r
-.r.qfo:
-	$(QFCC) $(QCFLAGS) $(QCPPFLAGS) -p $(STRIP) -c -o $@ $<
+r_depfiles_remade=
 
-game_obj=$(game_src:.r=.qfo)
-game.dat$(GZ): $(game_obj) ../lib/libr.a ../lib/libqw.a
-	$(QFCC) $(QCFLAGS) -p $(STRIP) -o game.dat $(game_obj) ../lib/libr.a ../lib/libqw.a ../lib/libr.a
-	$(GZIP)
+game_dat_SOURCES=$(game_src)
+game_obj=$(game_src:.r=.o)
+game_dep=$(addprefix ./$(DEPDIR)/,$(game_obj:.o=.Qo))
+game.dat: $(game_obj) $(QFCC_DEP) ../lib/libr.a ../lib/libqw.a
+	$(QLINK) -p $(STRIP) -o game.dat $(game_obj) ../lib/libr.a ../lib/libqw.a ../lib/libr.a
+include $(game_dep) # am--include-marker
+r_depfiles_remade += $(game_dep)
+
+game.sym: game.dat
+
+$(r_depfiles_remade):
+	$(MKDIR_P) $(@D)
+	echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade) $(r_depfiles_remade)
 
 EXTRA_DIST= $(game_src) Axe.h GameEntity.h tempent.h Weapon.h World.h
-CLEANFILES= *.dat *.sym *.gz *.qfo
+CLEANFILES= *.dat *.sym *.gz *.o *.qfo
diff --git a/ruamoko/gui/Makefile.am b/ruamoko/gui/Makefile.am
index 91ac97245..35d2624df 100644
--- a/ruamoko/gui/Makefile.am
+++ b/ruamoko/gui/Makefile.am
@@ -1,30 +1,48 @@
 AUTOMAKE_OPTIONS=	foreign
 
+QFCC_DEP=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT)
+QFCC=$(QFCC_DEP)
+
+gui_libs=libgui.a
+libs=$(gui_libs)
+
 pkglibdir=$(datarootdir)/qfcc/lib
 
+pkglib_LIBRARIES= $(libs)
+EXTRA_LIBRARIES= $(gui_libs)
+
 QFCC=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT)
 QCFLAGS=-qq -O -g -Werror -Wall -Wno-integer-divide --no-default-paths
 QCPPFLAGS=--no-default-paths -I$(top_srcdir)/ruamoko/include
 QCLINKFLAGS=--no-default-paths -L$(top_builddir)/ruamoko/lib
 QCOMPILE=$(QFCC) $(QCFLAGS) $(QCPPFLAGS)
 QLINK=$(QFCC) $(QCFLAGS) $(QCLINKFLAGS)
+
+MKDIR_P = @MKDIR_P@
+am__mv = mv -f
+
 PAK=$(top_builddir)/tools/pak/pak$(EXEEXT)
 RANLIB=touch
 
-AM_CPPFLAGS=	-I$(top_srcdir)/ruamoko/include -I$(top_srcdir)/include
-
-gui_libs=libgui.a
-libs=$(gui_libs)
-
-pkglib_LIBRARIES= $(libs)
-EXTRA_LIBRARIES= $(gui_libs)
-
-SUFFIXES= .qfo .r .qc
+SUFFIXES= .o .r
 .r.o:
 	$(QFCC) $(QCFLAGS) $(QCPPFLAGS) -c -o $@ $<
 
+r_depfiles_remade=
+
 libgui_a_SOURCES= \
 	Group.r InputLine.r Pic.r Point.r Rect.r Size.r Slider.r Text.r View.r
+libgui_a_obj=$(libgui_a_SOURCES:.r=.o)
+libgui_a_dep=$(addprefix ./$(DEPDIR)/,$(libgui_a_obj:.o=.Qo))
 libgui_a_AR=	$(PAK) -cf
+include $(libgui_a_dep) # am--include-marker
+r_depfiles_remade += $(libgui_a_dep)
+
+$(r_depfiles_remade):
+	$(MKDIR_P) $(@D)
+	echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade) $(r_depfiles_remade)
+
 
 CLEANFILES=	*.qfo *.o
diff --git a/ruamoko/lib/Makefile.am b/ruamoko/lib/Makefile.am
index 525c20d6c..8a66a3839 100644
--- a/ruamoko/lib/Makefile.am
+++ b/ruamoko/lib/Makefile.am
@@ -1,53 +1,95 @@
 AUTOMAKE_OPTIONS=	foreign
 
-pkglibdir=$(datarootdir)/qfcc/lib
-
-QFCC=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT)
-QCFLAGS=-qq -O -g -Wall -Wno-integer-divide -Werror --no-default-paths
-QCPPFLAGS=--no-default-paths -I$(top_srcdir)/ruamoko/include -I$(top_srcdir)/include
-QCLINKFLAGS=--no-default-paths -L$(top_builddir)/ruamoko/lib
-QCOMPILE=$(QFCC) $(QCFLAGS) $(QCPPFLAGS)
-QLINK=$(QFCC) $(QCFLAGS) $(QCLINKFLAGS)
-PAK=$(top_builddir)/tools/pak/pak$(EXEEXT)
-RANLIB=touch
-
-AM_CPPFLAGS=	-I$(top_srcdir)/ruamoko/include -I$(top_srcdir)/include
-
-noinst_HEADERS= \
-	Array+Private.h
+QFCC_DEP=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT)
+QFCC=$(QFCC_DEP)
 
 ruamoko_libs=libr.a libqw.a libnq.a libcsqc.a
 libs=$(ruamoko_libs)
 
+pkglibdir=$(datarootdir)/qfcc/lib
+
 pkglib_LIBRARIES= $(libs)
 EXTRA_LIBRARIES= $(ruamoko_libs)
 
-SUFFIXES= .o .r .qc
+noinst_HEADERS= \
+	Array+Private.h
+
+QCFLAGS=-qq -O -g -Wall -Wno-integer-divide -Werror
+QCPPFLAGS=--no-default-paths -I$(top_srcdir)/ruamoko/include -I$(top_srcdir)/include
+QCLINKFLAGS=--no-default-paths -L$(top_builddir)/ruamoko/lib
+QCOMPILE=$(QFCC) $(QCFLAGS) $(QCPPFLAGS)
+QLINK=$(QFCC) $(QCFLAGS) $(QCLINKFLAGS)
+
+MKDIR_P = @MKDIR_P@
+am__mv = mv -f
+
+PAK=$(top_builddir)/tools/pak/pak$(EXEEXT)
+RANLIB=touch
+
+SUFFIXES= .o .r
 .r.o:
-	$(QFCC) $(QCFLAGS) $(QCPPFLAGS) -c -o $@ $<
-.qc.o:
-	$(QFCC) $(QCFLAGS) $(QCPPFLAGS) -c -o $@ $<
+	$(QCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tqo -p $(STRIP) -c -o $@ $<
+	sed -i -e '1s@:@: $(QFCC_DEP)@' $(DEPDIR)/$*.Tqo
+	$(am__mv) $(DEPDIR)/$*.Tqo $(DEPDIR)/$*.Qo
+
+r_depfiles_remade=
 
 libr_a_SOURCES=\
 	cbuf.r cmd.r cvar.r hash.r msgbuf.r plist.r qfile.r qfs.r script.r \
 	sound.r string.r math.r types.r \
 	Object.r Protocol.r \
 	AutoreleasePool.r Array.r Array+Private.r Entity.r PropertyList.r Set.r
+libr_a_obj=$(libr_a_SOURCES:.r=.o)
+libr_a_dep=$(addprefix ./$(DEPDIR)/,$(libr_a_obj:.o=.Qo))
 libr_a_AR=$(PAK) -cf
+include $(libr_a_dep) # am--include-marker
+r_depfiles_remade += $(libr_a_dep)
 
-libqw_a_SOURCES=\
-	crudefile.r debug.r entities.r infokey.r math.r message.r \
-	physics.r qw_message.r qw_physics.r qw_sys.r \
-	server.r sv_sound.r system.r
+common_src=debug.r system.r
+server_src= \
+	crudefile.r entities.r infokey.r message.r \
+	physics.r server.r sv_sound.r
+libqw_a_src= \
+	qw_message.r qw_physics.r qw_sys.r
+libnq_a_src= \
+	nq_message.r
+libcsqc_a_src= draw.r gib.r key.r
+
+common_obj=$(common_src:.r=.o)
+common_dep=$(addprefix ./$(DEPDIR)/,$(common_obj:.o=.Qo))
+include $(common_dep) # am--include-marker
+r_depfiles_remade += $(common_dep)
+
+server_obj=$(server_src:.r=.o)
+server_dep=$(addprefix ./$(DEPDIR)/,$(server_obj:.o=.Qo))
+include $(server_dep) # am--include-marker
+r_depfiles_remade += $(server_dep)
+
+libqw_a_SOURCES=$(libqw_a_src) $(common_src) $(server_src) math.r
+libqw_a_obj=$(libqw_a_src:.r=.o)
+libqw_a_dep=$(addprefix ./$(DEPDIR)/,$(libqw_a_obj:.o=.Qo))
 libqw_a_AR=$(PAK) -cf
+include $(libqw_a_dep) # am--include-marker
+r_depfiles_remade += $(libqw_a_dep)
 
-libnq_a_SOURCES=\
-	crudefile.r debug.r entities.r infokey.r math.r message.r \
-	nq_message.r physics.r server.r sv_sound.r system.r
+libnq_a_SOURCES=$(libnq_a_src) $(common_src) $(server_src) math.r
+libnq_a_obj=$(libnq_a_src:.r=.o)
+libnq_a_dep=$(addprefix ./$(DEPDIR)/,$(libnq_a_obj:.o=.Qo))
 libnq_a_AR=$(PAK) -cf
+include $(libnq_a_dep) # am--include-marker
+r_depfiles_remade += $(libnq_a_dep)
 
-libcsqc_a_SOURCES= \
-	debug.r draw.r gib.r key.r system.r
+libcsqc_a_SOURCES=$(libcsqc_a_src) $(common_src)
+libcsqc_a_obj=$(libcsqc_a_src:.r=.o)
+libcsqc_a_dep=$(addprefix ./$(DEPDIR)/,$(libcsqc_a_obj:.o=.Qo))
 libcsqc_a_AR=	$(PAK) -cf
+include $(libcsqc_a_dep) # am--include-marker
+r_depfiles_remade += $(libcsqc_a_dep)
+
+$(r_depfiles_remade):
+	$(MKDIR_P) $(@D)
+	echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade) $(r_depfiles_remade)
 
 CLEANFILES=	*.qfo *.o
diff --git a/ruamoko/scheme/Makefile.am b/ruamoko/scheme/Makefile.am
index 75f784ef5..f62c36191 100644
--- a/ruamoko/scheme/Makefile.am
+++ b/ruamoko/scheme/Makefile.am
@@ -1,30 +1,75 @@
-AUTOMAKE_OPTIONS=	foreign
-
-pkglibdir=$(datarootdir)/qfcc/lib
+AUTOMAKE_OPTIONS= foreign no-exeext
 
 QFCC_DEP=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT)
 QFCC=$(QFCC_DEP)
-QCFLAGS=-qq -O -g -Werror -Wall -Wno-integer-divide --no-default-paths
-QCPPFLAGS=$(AM_CPPFLAGS)
+
+GZ=@progs_gz@
+scheme_libs=libscheme.a
+scheme_libexec=main.dat
+
+pkglibdir=$(datarootdir)/qfcc/lib
+#FIXME where to put pkglibexec?
+#pkglibexecdir=$(datarootdir)/qfcc/bin
+
+pkglib_LIBRARIES= $(scheme_libs)
+EXTRA_LIBRARIES= $(scheme_libs)
+
+noinst_PROGRAMS= $(scheme_libexec)
+EXTRA_PROGRAMS = $(scheme_libexec)
+
+QCFLAGS=-qq -O -g -Werror -Wall -Wno-integer-divide
+QCPPFLAGS=--no-default-paths -I$(top_srcdir)/ruamoko/include
+QCLINKFLAGS=--no-default-paths -L$(top_builddir)/ruamoko/lib
+QCOMPILE=$(QFCC) $(QCFLAGS) $(QCPPFLAGS)
+QLINK=$(QFCC) $(QCFLAGS) $(QCLINKFLAGS)
+
+MKDIR_P = @MKDIR_P@
+am__mv = mv -f
+
 PAK=$(top_builddir)/tools/pak/pak$(EXEEXT)
 GZIP=if echo $@ | grep -q .gz; then gzip -f `basename $@ .gz`; if test -f `basename $@ .dat.gz`.sym; then gzip -f `basename $@ .dat.gz`.sym; fi; fi
-GZ=@progs_gz@
 # BSD make can't handle $(shell foo) directives, and GNU make can't handle |=
 # so we have to bite the bullet and pass this to the shell every time.
 STRIP=`echo -n $(srcdir)/ | sed -e 's/[^/]//g' | wc -c`
-
 RANLIB=touch
 
-AM_CPPFLAGS=	-I$(top_srcdir)/ruamoko/include -I$(top_srcdir)/include
+SUFFIXES=.o .r
+.r.o:
+	$(QCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tqo -p $(STRIP) -c -o $@ $<
+	sed -i -e '1s@:@: $(QFCC_DEP)@' $(DEPDIR)/$*.Tqo
+	$(am__mv) $(DEPDIR)/$*.Tqo $(DEPDIR)/$*.Qo
 
-scheme_libs=libscheme.a
-libs=$(scheme_libs)
-data=$(scheme_data)
+r_depfiles_remade=
 
-pkglib_LIBRARIES= $(libs)
-EXTRA_LIBRARIES= $(scheme_libs)
-#pkgdata_DATA= $(data)
-EXTRA_DATA = $(scheme_data)
+libscheme_a_SOURCES=\
+	SchemeObject.r Cons.r Number.r SchemeString.r Symbol.r Lexer.r Parser.r \
+	Nil.r Procedure.r Primitive.r Lambda.r Scope.r Instruction.r builtins.r \
+	Frame.r CompiledCode.r Compiler.r Continuation.r Machine.r Void.r \
+	Error.r Boolean.r BaseContinuation.r
+libscheme_a_obj=$(libscheme_a_SOURCES:.r=.o)
+libscheme_a_dep=$(addprefix ./$(DEPDIR)/,$(libscheme_a_obj:.o=.Qo))
+libscheme_a_AR=$(PAK) -cf
+include $(libscheme_a_dep) # am--include-marker
+r_depfiles_remade += $(libscheme_a_dep)
+
+scheme_src=\
+	main.r defs.r
+
+main_dat_SOURCES=$(scheme_src)
+main_obj=$(scheme_src:.r=.o)
+main_dep=$(addprefix ./$(DEPDIR)/,$(main_obj:.o=.Qo))
+main.dat: $(main_obj) $(QFCC_DEP) libscheme.a ../lib/libcsqc.a ../lib/libr.a
+	$(QLINK) -p $(STRIP) -o main.dat $(main_obj) libscheme.a ../lib/libcsqc.a ../lib/libr.a
+include $(main_dep) # am--include-marker
+r_depfiles_remade += $(main_dep)
+
+main.sym: main.dat
+
+$(r_depfiles_remade):
+	$(MKDIR_P) $(@D)
+	echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade) $(r_depfiles_remade)
 
 EXTRA_DIST = \
 		BaseContinuation.h Boolean.h CompiledCode.h Compiler.h Cons.h \
@@ -34,30 +79,4 @@ EXTRA_DIST = \
 		debug.h defs.h state.h \
 		\
 		main.r defs.r
-
-SUFFIXES=.qc .qfo .r
-.r.qfo:
-	$(QFCC) $(QCFLAGS) $(QCPPFLAGS) -p $(STRIP) -c -o $@ $<
-.r.o:
-	$(QFCC) $(QCFLAGS) $(QCPPFLAGS) -p $(STRIP) -c -o $@ $<
-
-libscheme_a_SOURCES=\
-	SchemeObject.r Cons.r Number.r SchemeString.r Symbol.r Lexer.r Parser.r \
-	Nil.r Procedure.r Primitive.r Lambda.r Scope.r Instruction.r builtins.r \
-	Frame.r CompiledCode.r Compiler.r Continuation.r Machine.r Void.r \
-	Error.r Boolean.r BaseContinuation.r
-libscheme_a_AR=$(PAK) -cf
-
-scheme_data=\
-	main.dat$(GZ)
-
-scheme_src=\
-	main.r defs.r
-
-scheme_obj=$(scheme_src:.qc=.o)
-
-main.dat$(GZ): $(scheme_obj) $(QFCC_DEP) ../lib/libcsqc.a ../lib/libr.a libscheme.a
-	$(QFCC) $(QCFLAGS) -p $(STRIP) -o main.dat $(scheme_obj) libscheme.a ../lib/libcsqc.a ../lib/libr.a
-	$(GZIP)
-
 CLEANFILES= *.dat *.sym *.gz *.qfo *.o

From b186332da0ca011a1e7c296cb5482890b122cfd9 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 3 Mar 2020 17:32:48 +0900
Subject: [PATCH 0604/1519] [qfcc] Make initialization of external vars an
 error

---
 tools/qfcc/source/def.c      | 4 ++--
 tools/qfcc/source/qc-parse.y | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/tools/qfcc/source/def.c b/tools/qfcc/source/def.c
index 82e88c5ae..c0332be60 100644
--- a/tools/qfcc/source/def.c
+++ b/tools/qfcc/source/def.c
@@ -575,7 +575,7 @@ initialize_def (symbol_t *sym, expr_t *init, defspace_t *space,
 				internal_error (0, "half defined var");
 			if (storage == sc_extern) {
 				if (init)
-					warning (0, "initializing external variable");
+					error (0, "initializing external variable");
 				return;
 			}
 			if (init && check->s.def->initialized) {
@@ -611,7 +611,7 @@ initialize_def (symbol_t *sym, expr_t *init, defspace_t *space,
 		init_field_def (sym->s.def, init, storage);
 	if (storage == sc_extern) {
 		if (init)
-			warning (0, "initializing external variable");
+			error (0, "initializing external variable");
 		return;
 	}
 	if (!init)
diff --git a/tools/qfcc/source/qc-parse.y b/tools/qfcc/source/qc-parse.y
index 7ae13bd6e..3fac0f926 100644
--- a/tools/qfcc/source/qc-parse.y
+++ b/tools/qfcc/source/qc-parse.y
@@ -1021,6 +1021,9 @@ overloaded_identifier
 non_code_func
 	: '=' '#' expr
 		{
+			if ($<spec>-1.storage == sc_extern) {
+				error (0, "initializing external variable");
+			}
 			build_builtin_function ($<symbol>0, $3, 0);
 		}
 	| '=' expr

From 7976eec2ce6b2e099ad7e020459298c566ba5170 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 3 Mar 2020 17:35:14 +0900
Subject: [PATCH 0605/1519] [scheme] Clean up a pile of rotten bits

---
 ruamoko/scheme/SchemeObject.h |  1 +
 ruamoko/scheme/defs.h         | 22 +++++++++++-----------
 ruamoko/scheme/defs.r         |  2 +-
 ruamoko/scheme/main.r         | 35 +++++++++++++++++++----------------
 4 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/ruamoko/scheme/SchemeObject.h b/ruamoko/scheme/SchemeObject.h
index 262c700f4..e831b50bd 100644
--- a/ruamoko/scheme/SchemeObject.h
+++ b/ruamoko/scheme/SchemeObject.h
@@ -14,6 +14,7 @@
     int line;
     string source;
 }
++ (void) finishCollecting;
 + (void) collectCheckPoint;
 - (void) mark;
 - (void) markReachable;
diff --git a/ruamoko/scheme/defs.h b/ruamoko/scheme/defs.h
index a1d691684..7f1e4289c 100644
--- a/ruamoko/scheme/defs.h
+++ b/ruamoko/scheme/defs.h
@@ -1,13 +1,13 @@
-@extern void (string str) print = #0;
-@extern int () errno = #0;
-@extern string (int err) strerror = #0;
-@extern int (...) open = #0; // string path, float flags[, float mode]
-@extern int (int handle) close = #0;
-@extern string read (int handle, int count, int *result) = #0;
-@extern int (int handle, string buffer, int count) write = #0;
-@extern int (int handle, int pos, int whence) seek = #0;
+@extern void (string str) print;
+@extern int () errno;
+@extern string (int err) strerror;
+@extern int (...) open; // string path, float flags[, float mode]
+@extern int (int handle) close;
+@extern string read (int handle, int count, int *result);
+@extern int (int handle, string buffer, int count) write;
+@extern int (int handle, int pos, int whence) seek;
 
-@extern void() traceon = #0;          // turns statment trace on
-@extern void() traceoff = #0;
+@extern void() traceon;          // turns statment trace on
+@extern void() traceoff;
 
-@extern void (...) printf = #0;
+@extern void (...) printf;
diff --git a/ruamoko/scheme/defs.r b/ruamoko/scheme/defs.r
index 943ef9173..1c638232d 100644
--- a/ruamoko/scheme/defs.r
+++ b/ruamoko/scheme/defs.r
@@ -3,7 +3,7 @@ int () errno = #0;
 string (int err) strerror = #0;
 int (...) open = #0; // string path, float flags[, float mode]
 int (int handle) close = #0;
-string (int handle, int count, int []result) read = #0;
+string read (int handle, int count, int *result) = #0;
 int (int handle, string buffer, int count) write = #0;
 int (int handle, int pos, int whence) seek = #0;
 
diff --git a/ruamoko/scheme/main.r b/ruamoko/scheme/main.r
index fb1fa3e33..be7d8bca6 100644
--- a/ruamoko/scheme/main.r
+++ b/ruamoko/scheme/main.r
@@ -22,23 +22,23 @@ string readfile (string filename)
     str_copy(res, acc);
     return res;
 }
-    
 
-int main (int argc, string []argv)
+int main (int argc, string *argv)
 {
-    local Parser parser; 
-    local CompiledCode code;
-    local Compiler comp;
-    local Machine vm;
-    local Lambda lm;
-    local SchemeObject stuff, res;
+    local Parser *parser;
+    local CompiledCode *code;
+    local Compiler *comp;
+    local Machine *vm;
+    local Lambda *lm;
+    local SchemeObject *stuff, *res;
+	local Error *err;
 
     if (argc < 1) {
             return -1;
     }
 
         //traceon();
-    
+
     parser = [Parser newFromSource: readfile(argv[1]) file: argv[1]];
     vm = [Machine new];
     [vm makeRootCell];
@@ -46,26 +46,29 @@ int main (int argc, string []argv)
     builtin_addtomachine (vm);
     while ((stuff = [parser read])) {
             if ([stuff isError]) {
-                    printf(">> %s: %i\n", [stuff source], [stuff line]);
-                    printf(">> Error (%s): %s\n", [stuff type], [stuff message]);
+					err = (Error *) stuff;
+                    printf(">> %s: %i\n", [err source], [err line]);
+                    printf(">> Error (%s): %s\n", [err type], [err message]);
                     return -1;
             }
             comp = [Compiler newWithLambda: cons ([Symbol forString: "lambda"],
                                                   cons ([Nil nil],
                                                         cons(stuff, [Nil nil])))
                              scope: nil];
-            code = (CompiledCode) [comp compile];
+            code = (CompiledCode *) [comp compile];
             if ([code isError]) {
-                    printf(">> %s: %i\n", [code source], [code line]);
-                    printf(">> Error (%s): %s\n", [code type], [code message]);
+					err = (Error *) code;
+                    printf(">> %s: %i\n", [err source], [err line]);
+                    printf(">> Error (%s): %s\n", [err type], [err message]);
                     return -1;
             }
             lm = [Lambda newWithCode: code environment: nil];
             [lm invokeOnMachine: vm];
             res = [vm run];
             if ([res isError]) {
-                    printf(">> %s: %i\n", [res source], [res line]);
-                    printf(">> Error (%s): %s\n", [res type], [res message]);
+					err = (Error *) res;
+                    printf(">> %s: %i\n", [err source], [err line]);
+                    printf(">> Error (%s): %s\n", [err type], [err message]);
                     return -1;
             }
             [vm reset];

From c58cf2c2d059a585c5e941418d2ea66b6f404986 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 3 Mar 2020 21:30:47 +0900
Subject: [PATCH 0606/1519] [qwaq] Fail at object oriented design 101

This is horrible, doesn't work, isn't really the direction I want to go
(that became apparent while implementing Screen's handleEvent) and
crashes anyway (Array and not-id...)

*sigh*

Still, this does have some good stuff in it, and it pushed qfcc along
some more.
---
 ruamoko/qwaq/event.h       |  6 +++-
 ruamoko/qwaq/qwaq-app.r    | 12 +++++---
 ruamoko/qwaq/qwaq-curses.c | 61 ++++++++++++++++++++++++++++++++++++
 ruamoko/qwaq/qwaq-curses.h |  2 ++
 ruamoko/qwaq/qwaq-draw.h   |  2 ++
 ruamoko/qwaq/qwaq-rect.h   |  2 +-
 ruamoko/qwaq/qwaq-screen.h |  5 ++-
 ruamoko/qwaq/qwaq-screen.r | 63 +++++++++++++++++++++++++++++++++++++-
 ruamoko/qwaq/qwaq-view.h   |  1 +
 ruamoko/qwaq/qwaq-view.r   | 11 +++++++
 ruamoko/qwaq/qwaq-window.h |  4 +--
 ruamoko/qwaq/qwaq-window.r | 22 +++++++++++++
 12 files changed, 180 insertions(+), 11 deletions(-)

diff --git a/ruamoko/qwaq/event.h b/ruamoko/qwaq/event.h
index f494234a9..9eca5158e 100644
--- a/ruamoko/qwaq/event.h
+++ b/ruamoko/qwaq/event.h
@@ -37,11 +37,15 @@ typedef struct qwaq_event_s {
 -handleEvent: (struct qwaq_event_s *) event;
 @end
 
-@protocol TakeFocus <HandleEvent>
+@protocol HandleFocusedEvent <HandleEvent>
 -takeFocus;
 -loseFocus;
 @end
 
+@protocol HandleMouseEvent <HandleEvent>
+-(struct Rect_s *)getRect;
+@end
+
 #endif
 
 #endif//__qwaq_event_h
diff --git a/ruamoko/qwaq/qwaq-app.r b/ruamoko/qwaq/qwaq-app.r
index e100ae69e..ed6339faf 100644
--- a/ruamoko/qwaq/qwaq-app.r
+++ b/ruamoko/qwaq/qwaq-app.r
@@ -37,15 +37,15 @@ arp_end (void)
 	init_pair (2, COLOR_WHITE, COLOR_BLACK);
 	screen = [[Screen screen] retain];
 	[screen setBackground: COLOR_PAIR (1)];
-	Rect r = screen.rect;
-	wprintf (screen.window, "%d %d %d %d\n", r.xpos, r.ypos, r.xlen, r.ylen);
+	Rect r = *[screen getRect];
+	[screen printf:"%d %d %d %d\n", r.xpos, r.ypos, r.xlen, r.ylen];
 	r.xpos = r.xlen / 4;
 	r.ypos = r.ylen / 4;
 	r.xlen /= 2;
 	r.ylen /= 2;
-	wprintf (screen.window, "%d %d %d %d\n", r.xpos, r.ypos, r.xlen, r.ylen);
-	wprintf (screen.window, "%d\n", acs_char(ACS_HLINE));
-	mvwaddch(screen.window, 4, 4, acs_char(ACS_HLINE));
+	[screen printf:"%d %d %d %d\n", r.xpos, r.ypos, r.xlen, r.ylen];
+	[screen printf:"%d\n", acs_char(ACS_HLINE)];
+	[screen addch: acs_char(ACS_HLINE) atX:4 Y:4];
 	Window *w;
 	[screen add: w=[[Window windowWithRect: r] setBackground: COLOR_PAIR (2)]];
 	//wprintf (w.window, "%d %d %d %d\n", r.xpos, r.ypos, r.xlen, r.ylen);
@@ -102,6 +102,7 @@ window_t create_window (int xpos, int ypos, int xlen, int ylen) = #0;
 void destroy_window (window_t win) = #0;
 void mvwprintf (window_t win, int x, int y, string fmt, ...) = #0;
 void wprintf (window_t win, string fmt, ...) = #0;
+void wvprintf (window_t win, string fmt, @va_list args) = #0;
 void wrefresh (window_t win) = #0;
 void mvwaddch (window_t win, int x, int y, int ch) = #0;
 int get_event (qwaq_event_t *event) = #0;
@@ -109,6 +110,7 @@ int max_colors (void) = #0;
 int max_color_pairs (void) = #0;
 int init_pair (int pair, int f, int b) = #0;
 void wbkgd (window_t win, int ch) = #0;
+void scrollok (window_t win, int flag) = #0;
 int acs_char (int acs) = #0;
 
 panel_t create_panel (window_t window) = #0;
diff --git a/ruamoko/qwaq/qwaq-curses.c b/ruamoko/qwaq/qwaq-curses.c
index f33e01a5a..c03a38542 100644
--- a/ruamoko/qwaq/qwaq-curses.c
+++ b/ruamoko/qwaq/qwaq-curses.c
@@ -72,6 +72,7 @@ typedef enum qwaq_commands_e {
 	qwaq_cmd_wrefresh,
 	qwaq_cmd_init_pair,
 	qwaq_cmd_wbkgd,
+	qwaq_cmd_scrollok,
 } qwaq_commands;
 
 #define RING_BUFFER(type, size) 	\
@@ -523,6 +524,16 @@ cmd_wbkgd (qwaq_resources_t *res)
 	wbkgd (window->win, ch);
 }
 
+static void
+cmd_scrollok (qwaq_resources_t *res)
+{
+	int         window_id = RB_PEEK_DATA (res->command_queue, 2);
+	int         flag = RB_PEEK_DATA (res->command_queue, 3);
+
+	window_t   *window = get_window (res, __FUNCTION__, window_id);
+	scrollok (window->win, flag);
+}
+
 static void
 process_commands (qwaq_resources_t *res)
 {
@@ -585,6 +596,9 @@ process_commands (qwaq_resources_t *res)
 			case qwaq_cmd_wbkgd:
 				cmd_wbkgd (res);
 				break;
+			case qwaq_cmd_scrollok:
+				cmd_scrollok (res);
+				break;
 		}
 		RB_DROP_DATA (res->command_queue, RB_PEEK_DATA (res->command_queue, 1));
 	}
@@ -881,6 +895,37 @@ bi_wprintf (progs_t *pr)
 	}
 }
 
+static void
+bi_wvprintf (progs_t *pr)
+{
+	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
+	int         window_id = P_INT (pr, 0);
+	const char *fmt = P_GSTRING (pr, 1);
+	__auto_type args = (pr_va_list_t *) &P_POINTER (pr, 2);
+	pr_type_t  *list_start = PR_GetPointer (pr, args->list);
+	pr_type_t **list = alloca (args->count);
+
+	for (int i = 0; i < args->count; i++) {
+		list[i] = list_start + i * pr->pr_param_size;
+	}
+
+	if (get_window (res, __FUNCTION__, window_id)) {
+		int         string_id = acquire_string (res);
+		dstring_t  *print_buffer = res->strings + string_id;
+		int         command[] = {
+						qwaq_cmd_waddstr, 0,
+						window_id, string_id
+					};
+
+		command[1] = CMD_SIZE(command);
+
+		dstring_clearstr (print_buffer);
+		PR_Sprintf (pr, print_buffer, "waddstr", fmt, args->count, list);
+
+		qwaq_submit_command (res, command);
+	}
+}
+
 static void
 bi_mvwaddch (progs_t *pr)
 {
@@ -963,6 +1008,20 @@ bi_wbkgd (progs_t *pr)
 	}
 }
 
+static void
+bi_scrollok (progs_t *pr)
+{
+	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
+	int         window_id = P_INT (pr, 0);
+	int         flag = P_INT (pr, 1);
+
+	if (get_window (res, __FUNCTION__, window_id)) {
+		int         command[] = { qwaq_cmd_scrollok, 0, window_id, flag, };
+		command[1] = CMD_SIZE(command);
+		qwaq_submit_command (res, command);
+	}
+}
+
 static const char qwaq_acs_char_map[] = "lmkjtuvwqxnos`afg~,+.-hi0pryz{|}";
 static void
 bi_acs_char (progs_t *pr)
@@ -1029,6 +1088,7 @@ static builtin_t builtins[] = {
 	{"doupdate",		bi_doupdate,		-1},
 	{"mvwprintf",		bi_mvwprintf,		-1},
 	{"wprintf",			bi_wprintf,			-1},
+	{"wvprintf",		bi_wvprintf,		-1},
 	{"mvwaddch",		bi_mvwaddch,		-1},
 	{"wrefresh",		bi_wrefresh,		-1},
 	{"get_event",		bi_get_event,		-1},
@@ -1036,6 +1096,7 @@ static builtin_t builtins[] = {
 	{"max_color_pairs",	bi_max_color_pairs,	-1},
 	{"init_pair",		bi_init_pair,		-1},
 	{"wbkgd",			bi_wbkgd,			-1},
+	{"scrollok",		bi_scrollok,		-1},
 	{"acs_char",		bi_acs_char,		-1},
 	{0}
 };
diff --git a/ruamoko/qwaq/qwaq-curses.h b/ruamoko/qwaq/qwaq-curses.h
index bf5d24191..e9574e764 100644
--- a/ruamoko/qwaq/qwaq-curses.h
+++ b/ruamoko/qwaq/qwaq-curses.h
@@ -75,6 +75,7 @@ typedef struct panel_s *panel_t;
 @extern void destroy_window (window_t win);
 @extern void mvwprintf (window_t win, int x, int y, string fmt, ...);
 @extern void wprintf (window_t win, string fmt, ...);
+@extern void wvprintf (window_t win, string fmt, @va_list args);
 @extern void wrefresh (window_t win);
 @extern void mvwaddch (window_t win, int x, int y, int ch);
 
@@ -94,6 +95,7 @@ typedef struct panel_s *panel_t;
 @extern int max_color_pairs (void);
 @extern int init_pair (int pair, int f, int b);
 @extern void wbkgd (window_t win, int ch);
+@extern void scrollok (window_t win, int flag);
 
 @extern int acs_char (int acs);
 #endif
diff --git a/ruamoko/qwaq/qwaq-draw.h b/ruamoko/qwaq/qwaq-draw.h
index 4abac3e55..7b614a29e 100644
--- a/ruamoko/qwaq/qwaq-draw.h
+++ b/ruamoko/qwaq/qwaq-draw.h
@@ -3,6 +3,8 @@
 
 @protocol Draw
 -draw;
+-redraw;
+-setParent: parent;
 @end
 
 #endif
diff --git a/ruamoko/qwaq/qwaq-rect.h b/ruamoko/qwaq/qwaq-rect.h
index 0c26b5817..c679352fc 100644
--- a/ruamoko/qwaq/qwaq-rect.h
+++ b/ruamoko/qwaq/qwaq-rect.h
@@ -1,7 +1,7 @@
 #ifndef __qwaq_rect_h
 #define __qwaq_rect_h
 
-typedef struct {
+typedef struct Rect_s {
 	int         xpos;
 	int         ypos;
 	int         xlen;
diff --git a/ruamoko/qwaq/qwaq-screen.h b/ruamoko/qwaq/qwaq-screen.h
index 5ded2ecaf..8c83abb6e 100644
--- a/ruamoko/qwaq/qwaq-screen.h
+++ b/ruamoko/qwaq/qwaq-screen.h
@@ -10,16 +10,19 @@
 
 @interface Screen: Object <HandleEvent, Draw>
 {
-	@public
 	Rect        rect;
 	Array      *views;
 	Array      *event_handlers;
+	Array      *focused_handlers;
+	Array      *mouse_handlers;
+	Array      *mouse_handler_rects;
 	View       *focusedView;
 	struct window_s *window;
 }
 +(Screen *) screen;
 -add: obj;
 -setBackground: (int) ch;
+-printf: (string) fmt, ...;
 @end
 
 #endif//__qwaq_screen_h
diff --git a/ruamoko/qwaq/qwaq-screen.r b/ruamoko/qwaq/qwaq-screen.r
index 770104c64..0c8573a83 100644
--- a/ruamoko/qwaq/qwaq-screen.r
+++ b/ruamoko/qwaq/qwaq-screen.r
@@ -1,3 +1,4 @@
+#include <Array.h>
 #include "qwaq-curses.h"
 #include "qwaq-screen.h"
 
@@ -14,7 +15,11 @@
 	}
 	views = [[Array array] retain];
 	event_handlers = [[Array array] retain];
+	focused_handlers = [[Array array] retain];
+	mouse_handlers = [[Array array] retain];
+	mouse_handler_rects = [[Array array] retain];
 	window = stdscr;
+	scrollok (window, 1);
 	rect = getwrect (window);
 	return self;
 }
@@ -22,10 +27,22 @@
 -add: obj
 {
 	if ([obj conformsToProtocol: @protocol (Draw)]) {
+		// "top" objects are drawn last
 		[views addObject: obj];
+		[obj setParent: self];
+	}
+	if ([obj conformsToProtocol: @protocol (HandleFocusedEvent)]) {
+		// want "top" objects to respond first
+		[focused_handlers insertObject: obj atIndex: 0];
+	}
+	if ([obj conformsToProtocol: @protocol (HandleMouseEvent)]) {
+		// "top" objects respond first, but the array is searched in reverse
+		[mouse_handlers addObject: obj];
+		[mouse_handler_rects addObject: (id) [obj getRect]];
 	}
 	if ([obj conformsToProtocol: @protocol (HandleEvent)]) {
-		[event_handlers addObject: obj];
+		// want "top" objects to respond first
+		[event_handlers insertObject: obj atIndex: 0];
 	}
 	return self;
 }
@@ -38,6 +55,25 @@
 
 -handleEvent: (qwaq_event_t *) event
 {
+	switch (event.event_type) {
+		case qe_none:
+			break;
+		case qe_key:
+		case qe_command:
+			[focused_handlers
+				makeObjectsPerformSelector: @selector(handleEvent:)
+				withObject: (id) event];
+			break;
+		case qe_mouse:
+			Point p = { event.e.mouse.x, event.e.mouse.y };
+			for (int i = [mouse_handler_rects count]; i-->0; ) {
+				//if (rectContainsPoint((Rect*)mouse_handler_rects._objs[i], &p)) {
+				//	[mouse_handlers._objs[i] handleEvent: event];
+				//	break;
+				//}
+			}
+			break;
+	}
 	return self;
 }
 
@@ -49,4 +85,29 @@
 	return self;
 }
 
+-redraw
+{
+	[self error:"hmm"];
+	update_panels ();
+	doupdate ();
+	return self;
+}
+
+-printf: (string) fmt, ...
+{
+	wvprintf (window, fmt, @args);
+	return self;
+}
+
+-addch: (int) ch atX: (int) x Y: (int) y
+{
+	mvwaddch(window, x, y, ch);
+	return self;
+}
+
+-setParent: parent
+{
+	return self;
+}
+
 @end
diff --git a/ruamoko/qwaq/qwaq-view.h b/ruamoko/qwaq/qwaq-view.h
index 817ec0ab7..e7c0db85e 100644
--- a/ruamoko/qwaq/qwaq-view.h
+++ b/ruamoko/qwaq/qwaq-view.h
@@ -13,6 +13,7 @@
 	Rect        rect;
 	Rect        absRect;
 	Point       point;		// can't be local :(
+	id          parent;
 	struct window_s *window;
 }
 -initWithRect: (Rect) rect;
diff --git a/ruamoko/qwaq/qwaq-view.r b/ruamoko/qwaq/qwaq-view.r
index 8cf37c53d..bc218630f 100644
--- a/ruamoko/qwaq/qwaq-view.r
+++ b/ruamoko/qwaq/qwaq-view.r
@@ -33,6 +33,17 @@ rectContainsPoint (Rect *rect, Point *point)
 	return self;
 }
 
+-setParent: parent
+{
+	self.parent = parent;
+	return self;
+}
+
+-redraw
+{
+	return [parent redraw];
+}
+
 @end
 
 Rect getwrect (window_t window) = #0;
diff --git a/ruamoko/qwaq/qwaq-window.h b/ruamoko/qwaq/qwaq-window.h
index ae45d7e72..19921301a 100644
--- a/ruamoko/qwaq/qwaq-window.h
+++ b/ruamoko/qwaq/qwaq-window.h
@@ -9,10 +9,10 @@
 #include "qwaq-draw.h"
 #include "qwaq-rect.h"
 
-@interface Window: Object <Draw, TakeFocus>
+@interface Window: Object <Draw, HandleFocusedEvent, HandleMouseEvent>
 {
-	@public
 	Rect        rect;
+	id          parent;
 	Point       point;	// FIXME can't be local :(
 	Array      *views;
 	View       *focusedView;
diff --git a/ruamoko/qwaq/qwaq-window.r b/ruamoko/qwaq/qwaq-window.r
index 493a6ccff..7e201aa9a 100644
--- a/ruamoko/qwaq/qwaq-window.r
+++ b/ruamoko/qwaq/qwaq-window.r
@@ -17,6 +17,7 @@
 	if (!(self = [super init])) {
 		return nil;
 	}
+	views = [[Array array] retain];
 	self.rect = rect;
 	window = create_window (rect.xpos, rect.ypos, rect.xlen, rect.ylen);
 	panel = create_panel (window);
@@ -27,6 +28,9 @@
 {
 	switch (event.event_type) {
 		case qe_mouse:
+			mvwprintf(window, 0, 3, "%2d %2d %08x",
+					  event.e.mouse.x, event.e.mouse.y, event.e.mouse.buttons);
+			[self redraw];
 			point.x = event.e.mouse.x;
 			point.y = event.e.mouse.y;
 			for (int i = [views count]; i--> 0; ) {
@@ -60,6 +64,7 @@
 	view.absRect.xpos = view.rect.xpos + rect.xpos;
 	view.absRect.ypos = view.rect.ypos + rect.ypos;
 	view.window = window;
+	[view setParent: self];
 	return self;
 }
 
@@ -96,6 +101,23 @@
 			}
 		}
 	}
+	[views makeObjectsPerformSelector: @selector (draw)];
 	return self;
 }
+
+-(Rect *) getRect
+{
+	return &rect;
+}
+
+-setParent: parent
+{
+	self.parent = parent;
+	return self;
+}
+
+-redraw
+{
+	return [parent redraw];
+}
 @end

From de01cff70ed2e1b1490b5c79cab11f064b0e9810 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 3 Mar 2020 22:22:53 +0900
Subject: [PATCH 0607/1519] [build] Install QF/keys.h into qfcc's include
 directory

As well as $prefix/include, of course. This fixes the problem with
external ruamoko builds failing due to keys.h and qfcc's "lockdown" on
system headers.
---
 config.d/build_control.m4 |  8 ++++++++
 include/QF/Makefile.am    | 11 ++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/config.d/build_control.m4 b/config.d/build_control.m4
index 98517088e..88b58e610 100644
--- a/config.d/build_control.m4
+++ b/config.d/build_control.m4
@@ -254,7 +254,15 @@ QF_PROCESS_NEED_DIRS(ruamoko,[qwaq])
 
 if test "$ENABLE_tools_qfcc" = "yes" -a "$ENABLE_tools_pak" = "yes"; then
 	QF_NEED(top, [ruamoko])
+	qfcc_include_qf="\$(qfcc_include_qf)"
 fi
+QF_SUBST(qfcc_include_qf)
+
+if test x"${top_need_libs}" = xyes; then
+	include_qf="\$(include_qf)"
+fi
+QF_SUBST(include_qf)
+
 progs_gz=
 if test "$HAVE_ZLIB" = "yes"; then
 	progs_gz=".gz"
diff --git a/include/QF/Makefile.am b/include/QF/Makefile.am
index 3041d64d6..724d192df 100644
--- a/include/QF/Makefile.am
+++ b/include/QF/Makefile.am
@@ -1,6 +1,9 @@
 AUTOMAKE_OPTIONS = foreign
 pkgincludedir = $(includedir)/QF
-nobase_pkginclude_HEADERS = \
+#for header files that qfcc (ruamoko) will use
+pkgdatadir = $(datarootdir)/qfcc/include/QF
+
+include_qf= \
 	alloc.h bspfile.h cbuf.h cdaudio.h checksum.h clip_hull.h cmd.h \
 	console.h crc.h csqc.h cvar.h dstring.h draw.h gib.h hash.h \
 	idparse.h image.h in_event.h info.h input.h iqm.h joystick.h keys.h \
@@ -26,3 +29,9 @@ nobase_pkginclude_HEADERS = \
 	\
 	plugin/cd.h plugin/console.h plugin/general.h plugin/input.h \
 	plugin/snd_output.h plugin/snd_render.h plugin/vid_render.h
+
+qfcc_include_qf=keys.h
+nobase_pkginclude_HEADERS = @include_qf@
+pkgdata_DATA=@qfcc_include_qf@
+
+EXTRA_HEADERS = $(include_qf) $(qfcc_include_qf)

From 57b2751732a06cf4bcc0a7ae855b17a5de9b0f46 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 4 Mar 2020 00:37:10 +0900
Subject: [PATCH 0608/1519] [qfcc] Add failing vector element address test

It's an evil thing to do, but it should at least work.
---
 tools/qfcc/test/Makefile.am | 10 ++++++++++
 tools/qfcc/test/vecaddr.r   | 16 ++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 tools/qfcc/test/vecaddr.r

diff --git a/tools/qfcc/test/Makefile.am b/tools/qfcc/test/Makefile.am
index 129240670..fc6f7692b 100644
--- a/tools/qfcc/test/Makefile.am
+++ b/tools/qfcc/test/Makefile.am
@@ -55,6 +55,7 @@ test_progs_dat=\
 	structstruct.dat \
 	swap.dat \
 	triangle.dat \
+	vecaddr.dat \
 	vecexpr.dat \
 	vecinit.dat \
 	voidfor.dat \
@@ -373,6 +374,15 @@ r_depfiles_remade += ./$(DEPDIR)/triangle.Qo
 #include ./$(DEPDIR)/typedef.Qo # am--include-marker
 #r_depfiles_remade += ./$(DEPDIR)/typedef.Qo
 
+vecaddr_dat_SOURCES=vecaddr.r
+vecaddr_obj=$(vecaddr_dat_SOURCES:.r=.qfo)
+vecaddr.dat$(EXEEXT): $(vecaddr_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(vecaddr_obj)
+vecaddr.run: Makefile build-run
+	@$(srcdir)/build-run $@
+include ./$(DEPDIR)/vecaddr.Qo # am--include-marker
+r_depfiles_remade += ./$(DEPDIR)/vecaddr.Qo
+
 vecexpr_dat_SOURCES=vecexpr.r
 vecexpr_obj=$(vecexpr_dat_SOURCES:.r=.qfo)
 vecexpr.dat$(EXEEXT): $(vecexpr_obj) $(QFCC_DEP)
diff --git a/tools/qfcc/test/vecaddr.r b/tools/qfcc/test/vecaddr.r
new file mode 100644
index 000000000..323d9205c
--- /dev/null
+++ b/tools/qfcc/test/vecaddr.r
@@ -0,0 +1,16 @@
+void printf (string fmt, ...) = #0;
+
+float foo (vector v, float z)
+{
+	return v * *(vector*)(&v.y);
+}
+
+int
+main (int argc, string *argv)
+{
+	vector v = [1, 2, 3];
+	vector w = [2, 3, 4];
+	float f;
+	printf ("%v %g %g %g\n", v, v*v, v*w, f=foo (v, 4));
+	return f != v*w;
+}

From 4fa203852acfd9aea655c798500b1a4ba70cba37 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 4 Mar 2020 00:55:31 +0900
Subject: [PATCH 0609/1519] [qfcc] Use offset alias offset when creating alias
 of offset alias

Yes, that's correct. It happens when casting the address of a structure
field (for the test case this fixes, vector field).
---
 tools/qfcc/source/expr.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index dafb49c96..00d2b60ee 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -2065,6 +2065,8 @@ address_expr (expr_t *e1, expr_t *e2, type_t *t)
 					t = e1->e.expr.type;
 				if (e2) {
 					e2 = binary_expr ('+', e1->e.expr.e2, e2);
+				} else {
+					e2 = e1->e.expr.e2;
 				}
 				return address_expr (e1->e.expr.e1, e2, t);
 			}

From e298904dc03920d0e6754cf7dc8ab496caa6673d Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 4 Mar 2020 16:31:28 +0900
Subject: [PATCH 0610/1519] [qfcc] Implement anonymous structs and unions

For struct/union scope
---
 tools/qfcc/include/symtab.h  |  1 +
 tools/qfcc/source/qc-parse.y | 39 ++++++++++++++++++++++--
 tools/qfcc/source/struct.c   | 23 +++++++++++++++
 tools/qfcc/source/symtab.c   |  2 +-
 tools/qfcc/test/Makefile.am  | 10 +++++++
 tools/qfcc/test/anonstruct.r | 57 ++++++++++++++++++++++++++++++++++++
 6 files changed, 128 insertions(+), 4 deletions(-)
 create mode 100644 tools/qfcc/test/anonstruct.r

diff --git a/tools/qfcc/include/symtab.h b/tools/qfcc/include/symtab.h
index c0c064f3e..53b42f150 100644
--- a/tools/qfcc/include/symtab.h
+++ b/tools/qfcc/include/symtab.h
@@ -45,6 +45,7 @@ typedef enum vis_e {
 	vis_public,
 	vis_protected,
 	vis_private,
+	vis_anonymous,
 } vis_t;
 
 typedef enum {
diff --git a/tools/qfcc/source/qc-parse.y b/tools/qfcc/source/qc-parse.y
index 3fac0f926..17316e79f 100644
--- a/tools/qfcc/source/qc-parse.y
+++ b/tools/qfcc/source/qc-parse.y
@@ -42,6 +42,7 @@
 
 #include <QF/hash.h>
 #include <QF/sys.h>
+#include <QF/va.h>
 
 #include "class.h"
 #include "debug.h"
@@ -264,6 +265,26 @@ default_type (specifier_t spec, symbol_t *sym)
 	return spec;
 }
 
+static int
+is_anonymous_struct (specifier_t spec)
+{
+	if (spec.sym) {
+		return 0;
+	}
+	if (!is_struct (spec.type)) {
+		return 0;
+	}
+	if (spec.type->t.symtab->parent) {
+		return 0;
+	}
+	// struct and union type names always begin with "tag ". Untagged s/u
+	// are "tag .<filename>.<id>".
+	if (spec.type->name[4] != '.') {
+		return 0;
+	}
+	return 1;
+}
+
 %}
 
 %expect 0
@@ -675,15 +696,27 @@ struct_def
 	: type struct_decl_list
 	| type
 		{
-			if ($1.sym) {
+			if ($1.sym && $1.sym->type != $1.type) {
 				// a type name (id, typedef, etc) was used as a field name.
 				// this is allowed in C
-				print_type ($1.type);
-				printf ("%s\n", $1.sym->name);
 				$1.sym = new_symbol ($1.sym->name);
 				$1.sym->type = $1.type;
 				$1.sym->sy_type = sy_var;
 				symtab_addsymbol (current_symtab, $1.sym);
+				if (!$1.sym->table) {
+					error (0, "duplicate field `%s'", $1.sym->name);
+				}
+			} else if (is_anonymous_struct ($1)) {
+				// anonymous struct/union
+				// type->name always begins with "tag "
+				$1.sym = new_symbol (va (".anonymous.%s", $1.type->name + 4));
+				$1.sym->type = $1.type;
+				$1.sym->sy_type = sy_var;
+				$1.sym->visibility = vis_anonymous;
+				symtab_addsymbol (current_symtab, $1.sym);
+				if (!$1.sym->table) {
+					error (0, "duplicate field `%s'", $1.sym->name);
+				}
 			} else {
 				// bare type
 				warning (0, "declaration does not declare anything");
diff --git a/tools/qfcc/source/struct.c b/tools/qfcc/source/struct.c
index 989b298ef..7af7f26b2 100644
--- a/tools/qfcc/source/struct.c
+++ b/tools/qfcc/source/struct.c
@@ -114,6 +114,7 @@ build_struct (int su, symbol_t *tag, symtab_t *symtab, type_t *type)
 	symbol_t   *sym = find_struct (su, tag, type);
 	symbol_t   *s;
 	int         alignment = 1;
+	symbol_t   *as;
 
 	symtab->parent = 0;		// disconnect struct's symtab from parent scope
 
@@ -140,6 +141,28 @@ build_struct (int su, symbol_t *tag, symtab_t *symtab, type_t *type)
 		if (s->type->alignment > alignment) {
 			alignment = s->type->alignment;
 		}
+		if (s->visibility == vis_anonymous) {
+			symtab_t   *anonymous;
+			symbol_t   *t = s->next;
+			int         offset = s->s.offset;
+
+			if (!is_struct (s->type)) {
+				internal_error (0, "non-struct/union anonymous field");
+			}
+			anonymous = s->type->t.symtab;
+			for (as = anonymous->symbols; as; as = as->next) {
+				if (Hash_Find (symtab->tab, as->name)) {
+					error (0, "ambiguous field `%s' in anonymous %s",
+						   as->name, su == 's' ? "struct" : "union");
+				} else {
+					s->next = copy_symbol (as);
+					s = s->next;
+					s->s.offset += offset;
+					Hash_Add (symtab->tab, s);
+				}
+			}
+			s->next = t;
+		}
 	}
 	if (!type)
 		sym->type = find_type (sym->type);	// checks the tag, not the symtab
diff --git a/tools/qfcc/source/symtab.c b/tools/qfcc/source/symtab.c
index f26a690e7..377671e8a 100644
--- a/tools/qfcc/source/symtab.c
+++ b/tools/qfcc/source/symtab.c
@@ -152,7 +152,7 @@ symtab_removesymbol (symtab_t *symtab, symbol_t *symbol)
 	for (s = &symtab->symbols; *s && *s != symbol; s = & (*s)->next)
 		;
 	if (!*s)
-		internal_error (0, "symtab_removesymbol");
+		internal_error (0, "attempt to remove symbol not in symtab");
 	*s = (*s)->next;
 	if (symtab->symtail == &symbol->next)
 		symtab->symtail = s;
diff --git a/tools/qfcc/test/Makefile.am b/tools/qfcc/test/Makefile.am
index fc6f7692b..2e1001c11 100644
--- a/tools/qfcc/test/Makefile.am
+++ b/tools/qfcc/test/Makefile.am
@@ -31,6 +31,7 @@ fail_bins=
 test_progs_dat=\
 	address-cast.dat \
 	alignment.dat \
+	anonstruct.dat \
 	chewed-alias.dat \
 	chewed-return.dat \
 	comma-expr.dat \
@@ -119,6 +120,15 @@ alignment.run: Makefile build-run
 include ./$(DEPDIR)/alignment.Qo # am--include-marker
 r_depfiles_remade += ./$(DEPDIR)/alignment.Qo
 
+anonstruct_dat_SOURCES=anonstruct.r
+anonstruct_obj=$(anonstruct_dat_SOURCES:.r=.qfo)
+anonstruct.dat$(EXEEXT): $(anonstruct_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(anonstruct_obj)
+anonstruct.run: Makefile build-run
+	@$(srcdir)/build-run $@
+include ./$(DEPDIR)/anonstruct.Qo # am--include-marker
+r_depfiles_remade += ./$(DEPDIR)/anonstruct.Qo
+
 chewed_alias_dat_SOURCES=chewed-alias.r
 chewed_alias_obj=$(chewed_alias_dat_SOURCES:.r=.qfo)
 chewed-alias.dat$(EXEEXT): $(chewed_alias_obj) $(QFCC_DEP)
diff --git a/tools/qfcc/test/anonstruct.r b/tools/qfcc/test/anonstruct.r
new file mode 100644
index 000000000..a426d8f61
--- /dev/null
+++ b/tools/qfcc/test/anonstruct.r
@@ -0,0 +1,57 @@
+void printf (string fmt, ...) = #0;
+
+typedef struct xyzzy_s {
+    int         magic;
+} xyzzy_t;
+
+typedef struct anon_s {
+	int         foo;
+	int         id;
+	struct {
+		int         bar;
+		int         baz;
+	};
+	union {
+		int         snafu;
+		float       fizzle;
+	};
+} anon_t;
+
+union {
+	int         xsnafu;
+	float       xfizzle;
+};
+
+int foo (float f)
+{
+	anon_t anon;
+	anon.fizzle = f;
+	return anon.snafu;
+}
+
+int main()
+{
+	anon_t anon;
+	int         ret = 0;
+	if (&anon.snafu != &anon.fizzle) {
+		printf ("anon union broken: %p %p\n",
+				&anon.snafu, &anon.fizzle);
+		ret |= 1;
+	}
+	if (&anon.snafu - &anon.baz != 1) {
+		printf ("snafu and baz not adjacant: snafu:%p baz:%p\n",
+				&anon.snafu, &anon.baz);
+		ret |= 1;
+	}
+	if (&anon.baz - &anon.bar != 1) {
+		printf ("baz and bar not adjacant: baz:%p bar:%p\n",
+				&anon.baz, &anon.bar);
+		ret |= 1;
+	}
+	if (&anon.bar - &anon.id != 1) {
+		printf ("bar not after id: bar:%p id:%p\n",
+				&anon.bar, &anon.id);
+		ret |= 1;
+	}
+	return ret;
+}

From 597890dda154e8817bffa96bde0104dcbe7a6130 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 4 Mar 2020 16:32:04 +0900
Subject: [PATCH 0611/1519] [qfcc] Catch duplicate field definitions

---
 tools/qfcc/source/qc-parse.y | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tools/qfcc/source/qc-parse.y b/tools/qfcc/source/qc-parse.y
index 17316e79f..f0a2f5055 100644
--- a/tools/qfcc/source/qc-parse.y
+++ b/tools/qfcc/source/qc-parse.y
@@ -741,6 +741,9 @@ struct_decl
 			$1->sy_type = sy_var;
 			$1->visibility = current_visibility;
 			symtab_addsymbol (current_symtab, $1);
+			if (!$1->table) {
+				error (0, "duplicate field `%s'", $1->name);
+			}
 		}
 	| var_decl
 		{
@@ -751,6 +754,9 @@ struct_decl
 			$1->sy_type = sy_var;
 			$1->visibility = current_visibility;
 			symtab_addsymbol (current_symtab, $1);
+			if (!$1->table) {
+				error (0, "duplicate field `%s'", $1->name);
+			}
 		}
 	| var_decl ':' expr		%prec COMMA		{}
 	| ':' expr				%prec COMMA		{}

From 4c82114547a0f39f20da22f5cade1299855bc758 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 4 Mar 2020 17:40:49 +0900
Subject: [PATCH 0612/1519] [qfcc] Catch several useless specifier expressions

---
 tools/qfcc/source/qc-parse.y | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/tools/qfcc/source/qc-parse.y b/tools/qfcc/source/qc-parse.y
index f0a2f5055..cf9c2fb9f 100644
--- a/tools/qfcc/source/qc-parse.y
+++ b/tools/qfcc/source/qc-parse.y
@@ -285,6 +285,13 @@ is_anonymous_struct (specifier_t spec)
 	return 1;
 }
 
+static int
+is_null_spec (specifier_t spec)
+{
+	static specifier_t null_spec;
+	return memcmp (&spec, &null_spec, sizeof (spec)) == 0;
+}
+
 %}
 
 %expect 0
@@ -333,7 +340,25 @@ external_def_list
 
 external_def
 	: optional_specifiers external_decl_list ';' { }
-	| optional_specifiers ';' { }
+	| optional_specifiers ';'
+		{
+			if (!is_null_spec ($1)) {
+				if (!$1.type && !$1.sym) {
+					warning (0, "useless specifiers");
+				} else if ($1.type && !$1.sym) {
+					if (is_anonymous_struct ($1)){
+						warning (0, "unnamed struct/union that defines "
+								 "no instances");
+					} else {
+						warning (0, "useless type name in empty declaration");
+					}
+				} else if (!$1.type && $1.sym) {
+					bug (0, "wha? %p %p", $1.type, $1.sym);
+				} else {
+					bug (0, "wha? %p %p", $1.type, $1.sym);
+				}
+			}
+		}
 	| optional_specifiers qc_func_params
 		{
 			type_t    **type;

From 7a2335e9f43e739baf801c5d7aca753d35b67e15 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 4 Mar 2020 18:07:10 +0900
Subject: [PATCH 0613/1519] [qfcc] Catch useless specifiers in function scope

---
 tools/qfcc/source/qc-parse.y | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/tools/qfcc/source/qc-parse.y b/tools/qfcc/source/qc-parse.y
index cf9c2fb9f..25581f8ec 100644
--- a/tools/qfcc/source/qc-parse.y
+++ b/tools/qfcc/source/qc-parse.y
@@ -1232,6 +1232,26 @@ local_def
 			local_expr = 0;
 			(void) ($<spec>2);
 		}
+	| specifiers ';'
+		{
+			if (!is_null_spec ($1)) {
+				if (!$1.type && !$1.sym) {
+					warning (0, "useless specifiers");
+				} else if ($1.type && !$1.sym) {
+					if (is_anonymous_struct ($1)){
+						warning (0, "unnamed struct/union that defines "
+								 "no instances");
+					} else {
+						warning (0, "useless type name in empty declaration");
+					}
+				} else if (!$1.type && $1.sym) {
+					bug (0, "wha? %p %p", $1.type, $1.sym);
+				} else {
+					bug (0, "wha? %p %p", $1.type, $1.sym);
+				}
+			}
+			$$ = 0;
+		}
 	;
 
 statement

From f532780dbee88efe42331ed21575089cdc1f1650 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 4 Mar 2020 18:38:04 +0900
Subject: [PATCH 0614/1519] [qfcc] Treat opaque structs as not anonymous

I don't know why the segfault happened where it did, but
forward-declared structs certainly can't be used as anonymous structs.
---
 tools/qfcc/source/qc-parse.y | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/qfcc/source/qc-parse.y b/tools/qfcc/source/qc-parse.y
index 25581f8ec..24138407d 100644
--- a/tools/qfcc/source/qc-parse.y
+++ b/tools/qfcc/source/qc-parse.y
@@ -274,7 +274,7 @@ is_anonymous_struct (specifier_t spec)
 	if (!is_struct (spec.type)) {
 		return 0;
 	}
-	if (spec.type->t.symtab->parent) {
+	if (!spec.type->t.symtab || spec.type->t.symtab->parent) {
 		return 0;
 	}
 	// struct and union type names always begin with "tag ". Untagged s/u

From 269a8a558ad51da626a9169e11d20721f6d73783 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 4 Mar 2020 18:39:41 +0900
Subject: [PATCH 0615/1519] [qfcc] Allow bare enum and named struct
 declarations

Got a little overzealous there
---
 tools/qfcc/source/qc-parse.y | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/qfcc/source/qc-parse.y b/tools/qfcc/source/qc-parse.y
index 24138407d..46cf09e7e 100644
--- a/tools/qfcc/source/qc-parse.y
+++ b/tools/qfcc/source/qc-parse.y
@@ -349,7 +349,7 @@ external_def
 					if (is_anonymous_struct ($1)){
 						warning (0, "unnamed struct/union that defines "
 								 "no instances");
-					} else {
+					} else if (!is_enum ($1.type) && !is_struct ($1.type)) {
 						warning (0, "useless type name in empty declaration");
 					}
 				} else if (!$1.type && $1.sym) {
@@ -1241,7 +1241,7 @@ local_def
 					if (is_anonymous_struct ($1)){
 						warning (0, "unnamed struct/union that defines "
 								 "no instances");
-					} else {
+					} else if (!is_enum ($1.type) && !is_struct ($1.type)) {
 						warning (0, "useless type name in empty declaration");
 					}
 				} else if (!$1.type && $1.sym) {

From d57e05258c6ae3cb80e2c41a0ba000b5f35df06c Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 4 Mar 2020 19:10:09 +0900
Subject: [PATCH 0616/1519] [qwaq] Remove now unnecessary union field name

\o/
---
 ruamoko/qwaq/event.h       |  2 +-
 ruamoko/qwaq/qwaq-app.r    | 10 +++++-----
 ruamoko/qwaq/qwaq-curses.c |  8 ++++----
 ruamoko/qwaq/qwaq-screen.r |  2 +-
 ruamoko/qwaq/qwaq-window.r |  6 +++---
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/ruamoko/qwaq/event.h b/ruamoko/qwaq/event.h
index 9eca5158e..28ddccf59 100644
--- a/ruamoko/qwaq/event.h
+++ b/ruamoko/qwaq/event.h
@@ -29,7 +29,7 @@ typedef struct qwaq_event_s {
 		int         key;
 		qwaq_mevent_t mouse;
 		qwaq_message_t message;
-	} e;
+	};
 } qwaq_event_t;
 
 #ifdef __QFCC__	// don't want C gcc to see this :)
diff --git a/ruamoko/qwaq/qwaq-app.r b/ruamoko/qwaq/qwaq-app.r
index ed6339faf..12280d2b3 100644
--- a/ruamoko/qwaq/qwaq-app.r
+++ b/ruamoko/qwaq/qwaq-app.r
@@ -71,14 +71,14 @@ arp_end (void)
 -handleEvent: (qwaq_event_t *) event
 {
 	[screen handleEvent: event];
-	if (event.event_type == qe_key && event.e.key == '\x18') {
+	if (event.event_type == qe_key && event.key == '\x18') {
 		event.event_type = qe_command;
-		event.e.message.command = qc_exit;
+		event.message.command = qc_exit;
 	}
 	if (event.event_type == qe_command
-		&& (event.e.message.command == qc_exit
-			|| event.e.message.command == qc_error)) {
-		endState = event.e.message.command;
+		&& (event.message.command == qc_exit
+			|| event.message.command == qc_error)) {
+		endState = event.message.command;
 	}
 	return self;
 }
diff --git a/ruamoko/qwaq/qwaq-curses.c b/ruamoko/qwaq/qwaq-curses.c
index c03a38542..3d8098ea7 100644
--- a/ruamoko/qwaq/qwaq-curses.c
+++ b/ruamoko/qwaq/qwaq-curses.c
@@ -629,9 +629,9 @@ mouse_event (qwaq_resources_t *res, MEVENT *mevent)
 {
 	qwaq_event_t event = {};
 	event.event_type = qe_mouse;
-	event.e.mouse.x = mevent->x;
-	event.e.mouse.y = mevent->y;
-	event.e.mouse.buttons = mevent->bstate;
+	event.mouse.x = mevent->x;
+	event.mouse.y = mevent->y;
+	event.mouse.buttons = mevent->bstate;
 	add_event (res, &event);
 }
 
@@ -640,7 +640,7 @@ key_event (qwaq_resources_t *res, int key)
 {
 	qwaq_event_t event = {};
 	event.event_type = qe_key;
-	event.e.key = key;
+	event.key = key;
 	add_event (res, &event);
 }
 
diff --git a/ruamoko/qwaq/qwaq-screen.r b/ruamoko/qwaq/qwaq-screen.r
index 0c8573a83..4e68cae30 100644
--- a/ruamoko/qwaq/qwaq-screen.r
+++ b/ruamoko/qwaq/qwaq-screen.r
@@ -65,7 +65,7 @@
 				withObject: (id) event];
 			break;
 		case qe_mouse:
-			Point p = { event.e.mouse.x, event.e.mouse.y };
+			Point p = { event.mouse.x, event.mouse.y };
 			for (int i = [mouse_handler_rects count]; i-->0; ) {
 				//if (rectContainsPoint((Rect*)mouse_handler_rects._objs[i], &p)) {
 				//	[mouse_handlers._objs[i] handleEvent: event];
diff --git a/ruamoko/qwaq/qwaq-window.r b/ruamoko/qwaq/qwaq-window.r
index 7e201aa9a..af53a6546 100644
--- a/ruamoko/qwaq/qwaq-window.r
+++ b/ruamoko/qwaq/qwaq-window.r
@@ -29,10 +29,10 @@
 	switch (event.event_type) {
 		case qe_mouse:
 			mvwprintf(window, 0, 3, "%2d %2d %08x",
-					  event.e.mouse.x, event.e.mouse.y, event.e.mouse.buttons);
+					  event.mouse.x, event.mouse.y, event.mouse.buttons);
 			[self redraw];
-			point.x = event.e.mouse.x;
-			point.y = event.e.mouse.y;
+			point.x = event.mouse.x;
+			point.y = event.mouse.y;
 			for (int i = [views count]; i--> 0; ) {
 				View       *v = [views objectAtIndex: i];
 				if (rectContainsPoint (&v.absRect, &point)) {

From c214797e973ae8124af900f8b9f8f0cd9ece9912 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 4 Mar 2020 21:09:36 +0900
Subject: [PATCH 0617/1519] [gamecode] Fix some curly space

and add some comments. took a bit to figure out what i was doing
---
 libs/gamecode/pr_debug.c | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/libs/gamecode/pr_debug.c b/libs/gamecode/pr_debug.c
index 28bb97e54..6a4703724 100644
--- a/libs/gamecode/pr_debug.c
+++ b/libs/gamecode/pr_debug.c
@@ -178,21 +178,30 @@ source_path_f (cvar_t *var)
 	int         i;
 	char       *s;
 
-	if (source_path_string)
+	if (source_path_string) {
 		free (source_path_string);
+	}
 	source_path_string = strdup (var->string);
-	if (source_paths)
+	if (source_paths) {
 		free (source_paths);
-	for (i = 2, s = source_path_string; *s; s++)
-		if (*s == ';')
+	}
+	// i starts at 2 because an empty path is equivalent to "." and the
+	// list is null terminated
+	for (i = 2, s = source_path_string; *s; s++) {
+		if (*s == ';') {
 			i++;
+		}
+	}
 	source_paths = malloc (i * sizeof (char *));
 	source_paths[0] = source_path_string;
-	for (i = 1, s = source_path_string; *s; s++)
+	// i starts at one because the first path is in 0 and any additional
+	// paths come after, then the null terminator
+	for (i = 1, s = source_path_string; *s; s++) {
 		if (*s == ';') {
 			*s++ = 0;
 			source_paths[i++] = s;
 		}
+	}
 	source_paths[i] = 0;
 }
 

From 68fc11857ad8ef4c58f5169b209ff6872b0e625c Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 4 Mar 2020 21:10:23 +0900
Subject: [PATCH 0618/1519] [gamecode] Fix a string splitting error

---
 libs/gamecode/pr_debug.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libs/gamecode/pr_debug.c b/libs/gamecode/pr_debug.c
index 6a4703724..c102b46f8 100644
--- a/libs/gamecode/pr_debug.c
+++ b/libs/gamecode/pr_debug.c
@@ -198,8 +198,8 @@ source_path_f (cvar_t *var)
 	// paths come after, then the null terminator
 	for (i = 1, s = source_path_string; *s; s++) {
 		if (*s == ';') {
-			*s++ = 0;
-			source_paths[i++] = s;
+			*s = 0;
+			source_paths[i++] = s + 1;
 		}
 	}
 	source_paths[i] = 0;

From 815ae02121e71ad77f51949394fd177b0d2b62d4 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 4 Mar 2020 21:17:17 +0900
Subject: [PATCH 0619/1519] [qwaq] Allocate enough bytes for the args list

d'oh
---
 ruamoko/qwaq/qwaq-curses.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ruamoko/qwaq/qwaq-curses.c b/ruamoko/qwaq/qwaq-curses.c
index 3d8098ea7..1a75fa4dc 100644
--- a/ruamoko/qwaq/qwaq-curses.c
+++ b/ruamoko/qwaq/qwaq-curses.c
@@ -903,7 +903,7 @@ bi_wvprintf (progs_t *pr)
 	const char *fmt = P_GSTRING (pr, 1);
 	__auto_type args = (pr_va_list_t *) &P_POINTER (pr, 2);
 	pr_type_t  *list_start = PR_GetPointer (pr, args->list);
-	pr_type_t **list = alloca (args->count);
+	pr_type_t **list = alloca (args->count * sizeof (*list));
 
 	for (int i = 0; i < args->count; i++) {
 		list[i] = list_start + i * pr->pr_param_size;

From f3236410d0460f28df9ed8fcda369e6bfe52b997 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 4 Mar 2020 22:09:40 +0900
Subject: [PATCH 0620/1519] [qwaq] Make the event system more informative

Doesn't have timestamps at this stage, but otherwise it reflects the
event system I had in my old text UI which was heavily based on
TurboVision. TV is pretty good (after looking at things a bit closer I
found it wasn't as deep as I thought), and better yet, Borland released
it to the public domain 23 years ago! (wish I'd known that).

Anyway, this commit gets something happening on the screen, even though
the current hierarchy is still a mess.
---
 ruamoko/qwaq/event.h       | 33 ++++++++++++++---
 ruamoko/qwaq/qwaq-app.r    | 15 +++++---
 ruamoko/qwaq/qwaq-curses.c | 76 ++++++++++++++++++++++++++++++++++++--
 ruamoko/qwaq/qwaq-screen.h |  2 +-
 ruamoko/qwaq/qwaq-screen.r | 34 +++++++++++------
 ruamoko/qwaq/qwaq-window.r |  4 +-
 6 files changed, 135 insertions(+), 29 deletions(-)

diff --git a/ruamoko/qwaq/event.h b/ruamoko/qwaq/event.h
index 28ddccf59..445240e54 100644
--- a/ruamoko/qwaq/event.h
+++ b/ruamoko/qwaq/event.h
@@ -2,11 +2,31 @@
 #define __qwaq_event_h
 
 typedef enum {
-	qe_none,
-	qe_key,
-	qe_mouse,
-	qe_command,		// application level command
-} qwaq_etype;
+	qe_mousedown = 0x0001,
+	qe_mouseup   = 0x0002,
+	qe_mouseclick= 0x0004,
+	qe_mousemove = 0x0008,
+	qe_mouseauto = 0x0010,
+} qwaq_mouse_event;
+
+typedef enum {
+	qe_keydown   = 0x0020,
+} qwaq_key_event;
+
+typedef enum {
+	qe_command   = 0x0200,		// application level command
+	qe_broadcast = 0x0400,
+} qwaq_message_event;
+
+typedef enum {
+	qe_none    = 0x0000,
+	qe_mouse   = 0x001f,
+	qe_key     = 0x0020,
+	qe_system  = 0x01c0,
+	qe_message = 0xfe00,
+
+	qe_focused = qe_key | qe_command,
+} qwaq_event_mask;
 
 typedef enum {
 	qc_valid,
@@ -17,6 +37,7 @@ typedef enum {
 typedef struct qwaq_mevent_s {
 	int         x, y;
 	int         buttons;
+	int         click;
 } qwaq_mevent_t;
 
 typedef struct qwaq_message_s {
@@ -24,7 +45,7 @@ typedef struct qwaq_message_s {
 } qwaq_message_t;
 
 typedef struct qwaq_event_s {
-	qwaq_etype  event_type;
+	int         what;
 	union {
 		int         key;
 		qwaq_mevent_t mouse;
diff --git a/ruamoko/qwaq/qwaq-app.r b/ruamoko/qwaq/qwaq-app.r
index 12280d2b3..3bf67706a 100644
--- a/ruamoko/qwaq/qwaq-app.r
+++ b/ruamoko/qwaq/qwaq-app.r
@@ -1,3 +1,4 @@
+int fence;
 #include <AutoreleasePool.h>
 
 #include "color.h"
@@ -47,8 +48,9 @@ arp_end (void)
 	[screen printf:"%d\n", acs_char(ACS_HLINE)];
 	[screen addch: acs_char(ACS_HLINE) atX:4 Y:4];
 	Window *w;
-	[screen add: w=[[Window windowWithRect: r] setBackground: COLOR_PAIR (2)]];
+	//[screen add: w=[[Window windowWithRect: r] setBackground: COLOR_PAIR (2)]];
 	//wprintf (w.window, "%d %d %d %d\n", r.xpos, r.ypos, r.xlen, r.ylen);
+	[screen redraw];
 	return self;
 }
 
@@ -59,7 +61,7 @@ arp_end (void)
 		arp_start ();
 
 		get_event (&event);
-		if (event.event_type != qe_none) {
+		if (event.what != qe_none) {
 			[self handleEvent: &event];
 		}
 
@@ -71,11 +73,11 @@ arp_end (void)
 -handleEvent: (qwaq_event_t *) event
 {
 	[screen handleEvent: event];
-	if (event.event_type == qe_key && event.key == '\x18') {
-		event.event_type = qe_command;
+	if (event.what == qe_key && event.key == '\x18') {
+		event.what = qe_command;
 		event.message.command = qc_exit;
 	}
-	if (event.event_type == qe_command
+	if (event.what == qe_command
 		&& (event.message.command == qc_exit
 			|| event.message.command == qc_error)) {
 		endState = event.message.command;
@@ -86,6 +88,9 @@ arp_end (void)
 
 int main (int argc, string *argv)
 {
+	fence = 0;
+	//while (!fence) {}
+
 	id app = [[QwaqApplication app] retain];
 
 	[app run];
diff --git a/ruamoko/qwaq/qwaq-curses.c b/ruamoko/qwaq/qwaq-curses.c
index 1a75fa4dc..e51c47259 100644
--- a/ruamoko/qwaq/qwaq-curses.c
+++ b/ruamoko/qwaq/qwaq-curses.c
@@ -142,6 +142,11 @@ typedef enum qwaq_commands_e {
 		rb->buffer[(rb->tail + ahead) % RB_buffer_size (rb)];	\
 	})
 
+#define RB_POKE_DATA(ring_buffer, ahead, data)							\
+	({	__auto_type rb = &(ring_buffer);								\
+		rb->buffer[(rb->tail + ahead) % RB_buffer_size (rb)] = (data);	\
+	})
+
 typedef struct window_s {
 	WINDOW     *win;
 } window_t;
@@ -607,6 +612,16 @@ process_commands (qwaq_resources_t *res)
 static void
 add_event (qwaq_resources_t *res, qwaq_event_t *event)
 {
+	// lock
+	// {
+	// merge motion events
+	unsigned    last = RB_DATA_AVAILABLE (res->event_queue);
+	if (event->what == qe_mousemove && last > 1
+		&& RB_PEEK_DATA(res->event_queue, last - 1).what == qe_mousemove) {
+		RB_POKE_DATA(res->event_queue, last - 1, *event);
+		return;	// unlock
+	}
+	// }
 	if (RB_SPACE_AVAILABLE (res->event_queue) >= 1) {
 		RB_WRITE_DATA (res->event_queue, event, 1);
 	}
@@ -624,14 +639,69 @@ get_event (qwaq_resources_t *res, qwaq_event_t *event)
 	return 0;
 }
 
+#define M_MOVE REPORT_MOUSE_POSITION
+#define M_PRESS (  BUTTON1_PRESSED \
+				 | BUTTON2_PRESSED \
+				 | BUTTON3_PRESSED \
+				 | BUTTON4_PRESSED \
+				 | BUTTON5_PRESSED)
+#define M_RELEASE (  BUTTON1_RELEASED \
+				   | BUTTON2_RELEASED \
+				   | BUTTON3_RELEASED \
+				   | BUTTON4_RELEASED \
+				   | BUTTON5_RELEASED)
+#define M_CLICK (  BUTTON1_CLICKED \
+				 | BUTTON2_CLICKED \
+				 | BUTTON3_CLICKED \
+				 | BUTTON4_CLICKED \
+				 | BUTTON5_CLICKED)
+#define M_DCLICK (  BUTTON1_DOUBLE_CLICKED \
+				  | BUTTON2_DOUBLE_CLICKED \
+				  | BUTTON3_DOUBLE_CLICKED \
+				  | BUTTON4_DOUBLE_CLICKED \
+				  | BUTTON5_DOUBLE_CLICKED)
+#define M_TCLICK (  BUTTON1_TRIPLE_CLICKED \
+				  | BUTTON2_TRIPLE_CLICKED \
+				  | BUTTON3_TRIPLE_CLICKED \
+				  | BUTTON4_TRIPLE_CLICKED \
+				  | BUTTON5_TRIPLE_CLICKED)
+
 static void
-mouse_event (qwaq_resources_t *res, MEVENT *mevent)
+mouse_event (qwaq_resources_t *res, const MEVENT *mevent)
 {
+	int         mask = mevent->bstate;
 	qwaq_event_t event = {};
-	event.event_type = qe_mouse;
+
 	event.mouse.x = mevent->x;
 	event.mouse.y = mevent->y;
 	event.mouse.buttons = mevent->bstate;
+	if (mask & M_MOVE) {
+		event.what = qe_mousemove;
+		mask &= ~M_MOVE;
+	}
+	if (mask & M_PRESS) {
+		event.what = qe_mousedown;
+		mask &= ~M_PRESS;
+	}
+	if (mask & M_RELEASE) {
+		event.what = qe_mouseup;
+		mask &= ~M_RELEASE;
+	}
+	if (mask & M_CLICK) {
+		event.what = qe_mouseclick;
+		mask &= ~M_CLICK;
+		event.mouse.click = 1;
+	}
+	if (mask & M_DCLICK) {
+		event.what = qe_mouseclick;
+		mask &= ~M_DCLICK;
+		event.mouse.click = 2;
+	}
+	if (mask & M_TCLICK) {
+		event.what = qe_mouseclick;
+		mask &= ~M_TCLICK;
+		event.mouse.click = 3;
+	}
 	add_event (res, &event);
 }
 
@@ -639,7 +709,7 @@ static void
 key_event (qwaq_resources_t *res, int key)
 {
 	qwaq_event_t event = {};
-	event.event_type = qe_key;
+	event.what = qe_keydown;
 	event.key = key;
 	add_event (res, &event);
 }
diff --git a/ruamoko/qwaq/qwaq-screen.h b/ruamoko/qwaq/qwaq-screen.h
index 8c83abb6e..1294b2e28 100644
--- a/ruamoko/qwaq/qwaq-screen.h
+++ b/ruamoko/qwaq/qwaq-screen.h
@@ -8,7 +8,7 @@
 @class View;
 @class Array;
 
-@interface Screen: Object <HandleEvent, Draw>
+@interface Screen: Object <HandleMouseEvent, Draw>
 {
 	Rect        rect;
 	Array      *views;
diff --git a/ruamoko/qwaq/qwaq-screen.r b/ruamoko/qwaq/qwaq-screen.r
index 4e68cae30..401e0e41e 100644
--- a/ruamoko/qwaq/qwaq-screen.r
+++ b/ruamoko/qwaq/qwaq-screen.r
@@ -55,23 +55,28 @@
 
 -handleEvent: (qwaq_event_t *) event
 {
-	switch (event.event_type) {
+	if (event.what & qe_mouse) {
+		[self printf:"%04x %2d %2d %d %08x\r", event.what, event.mouse.x, event.mouse.y, event.mouse.click, event.mouse.buttons];
+		[self redraw];
+		Point p = { event.mouse.x, event.mouse.y };
+		for (int i = [mouse_handler_rects count]; i-->0; ) {
+			//if (rectContainsPoint((Rect*)mouse_handler_rects._objs[i], &p)) {
+			//	[mouse_handlers._objs[i] handleEvent: event];
+			//	break;
+			//}
+		}
+	} else if (event.what & qe_focused) {
+		[focused_handlers
+			makeObjectsPerformSelector: @selector(handleEvent:)
+			withObject: (id) event];
+	}
+	switch (event.what) {
 		case qe_none:
 			break;
 		case qe_key:
 		case qe_command:
-			[focused_handlers
-				makeObjectsPerformSelector: @selector(handleEvent:)
-				withObject: (id) event];
 			break;
 		case qe_mouse:
-			Point p = { event.mouse.x, event.mouse.y };
-			for (int i = [mouse_handler_rects count]; i-->0; ) {
-				//if (rectContainsPoint((Rect*)mouse_handler_rects._objs[i], &p)) {
-				//	[mouse_handlers._objs[i] handleEvent: event];
-				//	break;
-				//}
-			}
 			break;
 	}
 	return self;
@@ -87,8 +92,8 @@
 
 -redraw
 {
-	[self error:"hmm"];
 	update_panels ();
+	wrefresh(window);
 	doupdate ();
 	return self;
 }
@@ -105,6 +110,11 @@
 	return self;
 }
 
+- (Rect *) getRect
+{
+	return &rect;
+}
+
 -setParent: parent
 {
 	return self;
diff --git a/ruamoko/qwaq/qwaq-window.r b/ruamoko/qwaq/qwaq-window.r
index af53a6546..d99b21b3c 100644
--- a/ruamoko/qwaq/qwaq-window.r
+++ b/ruamoko/qwaq/qwaq-window.r
@@ -26,7 +26,7 @@
 
 -handleEvent: (qwaq_event_t *) event
 {
-	switch (event.event_type) {
+	switch (event.what) {
 		case qe_mouse:
 			mvwprintf(window, 0, 3, "%2d %2d %08x",
 					  event.mouse.x, event.mouse.y, event.mouse.buttons);
@@ -46,7 +46,7 @@
 			if (focusedView) {
 				[focusedView handleEvent: event];
 				for (int i = [views count];
-					 event.event_type != qe_none && i--> 0; ) {
+					 event.what != qe_none && i--> 0; ) {
 					View       *v = [views objectAtIndex: i];
 					 [v handleEvent: event];
 				}

From 0bb4279a9f14aef844d810aa8c9e6351da1823b3 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 5 Mar 2020 01:45:38 +0900
Subject: [PATCH 0621/1519] [qfcc] Handle bitwise not of enums

It looks like I need to handle other unary expressions too, but another
time.
---
 tools/qfcc/source/expr.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index 00d2b60ee..ecdc3606c 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -1407,6 +1407,7 @@ unary_expr (int op, expr_t *e)
 	quat_t      q;
 	const char *s;
 	expr_t     *new;
+	type_t     *t;
 
 	convert_name (e);
 	if (e->type == ex_error)
@@ -1568,6 +1569,11 @@ unary_expr (int op, expr_t *e)
 					case ev_short:
 						return new_short_expr (~expr_short (e));
 					case ev_invalid:
+						t = get_type (e);
+						if (t->meta == ty_enum) {
+							return new_integer_expr (~expr_integer (e));
+						}
+						break;
 					case ev_type_count:
 					case ev_void:
 						break;

From 896c14f33a1afe2297ab056546e5679bd8d6020a Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 5 Mar 2020 01:46:56 +0900
Subject: [PATCH 0622/1519] [qfcc] Support anonymous structs in ivars

Missed this earlier.
---
 tools/qfcc/source/qc-parse.y | 18 ++++++++++++++++++
 tools/qfcc/source/symtab.c   |  3 ++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/tools/qfcc/source/qc-parse.y b/tools/qfcc/source/qc-parse.y
index 46cf09e7e..a6c5d99e4 100644
--- a/tools/qfcc/source/qc-parse.y
+++ b/tools/qfcc/source/qc-parse.y
@@ -1873,6 +1873,24 @@ ivar_decls
 
 ivar_decl
 	: type ivars
+	| type
+		{
+			if (is_anonymous_struct ($1)) {
+				// anonymous struct/union
+				// type->name always begins with "tag "
+				$1.sym = new_symbol (va (".anonymous.%s", $1.type->name + 4));
+				$1.sym->type = $1.type;
+				$1.sym->sy_type = sy_var;
+				$1.sym->visibility = vis_anonymous;
+				symtab_addsymbol (current_symtab, $1.sym);
+				if (!$1.sym->table) {
+					error (0, "duplicate field `%s'", $1.sym->name);
+				}
+			} else {
+				// bare type
+				warning (0, "declaration does not declare anything");
+			}
+		}
 	;
 
 ivars
diff --git a/tools/qfcc/source/symtab.c b/tools/qfcc/source/symtab.c
index 377671e8a..f94e8d71a 100644
--- a/tools/qfcc/source/symtab.c
+++ b/tools/qfcc/source/symtab.c
@@ -182,7 +182,8 @@ symtab_flat_copy (symtab_t *symtab, symtab_t *parent)
 	newtab = new_symtab (parent, stab_local);
 	do {
 		for (symbol = symtab->symbols; symbol; symbol = symbol->next) {
-			if (Hash_Find (newtab->tab, symbol->name))
+			if (symbol->visibility == vis_anonymous
+				|| Hash_Find (newtab->tab, symbol->name))
 				continue;
 			newsym = copy_symbol (symbol);
 			symtab_addsymbol (newtab, newsym);

From efcbbbb6417a8e9f45d032f3c961098e751be325 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 5 Mar 2020 08:50:29 +0900
Subject: [PATCH 0623/1519] [qfcc] Catch use of missing superclass interfaces

---
 tools/qfcc/source/qc-parse.y | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/qfcc/source/qc-parse.y b/tools/qfcc/source/qc-parse.y
index a6c5d99e4..3966b9cf9 100644
--- a/tools/qfcc/source/qc-parse.y
+++ b/tools/qfcc/source/qc-parse.y
@@ -1630,6 +1630,10 @@ class_with_super
 new_class_with_super
 	: new_class_name ':' class_name
 		{
+			if (!$3->ivars) {
+				error (0, "cannot find interface declaration for `%s', "
+					   "superclass of `%s'", $3->name, $1->name);
+			}
 			$1->super_class = $3;
 			$$ = $1;
 		}

From 78b71c28fe738028d4a130e5b403de078559e5ec Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 5 Mar 2020 11:03:23 +0900
Subject: [PATCH 0624/1519] [qfcc] Make reloc functions const-correct

---
 tools/qfcc/include/reloc.h | 19 ++++++++++---------
 tools/qfcc/source/reloc.c  | 14 +++++++-------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/tools/qfcc/include/reloc.h b/tools/qfcc/include/reloc.h
index 2272dab5d..dc6e802c8 100644
--- a/tools/qfcc/include/reloc.h
+++ b/tools/qfcc/include/reloc.h
@@ -68,7 +68,7 @@ typedef enum {
 */
 typedef struct reloc_s {
 	struct reloc_s *next;		///< next reloc in reloc chain
-	struct ex_label_s *label;	///< instruction label for *_op relocs
+	const struct ex_label_s *label;	///< instruction label for *_op relocs
 	struct defspace_s *space;	///< the space containing the location in
 								///< need of adjustment for def_* relocations
 								///< (op_* relocations always use the code
@@ -78,7 +78,7 @@ typedef struct reloc_s {
 	reloc_type	type;			///< type type of relocation to perform
 	int			line;			///< current source line when creating reloc
 	string_t	file;			///< current source file when creating reloc
-	void       *return_address;	///< for debugging
+	const void *return_address;	///< for debugging
 } reloc_t;
 
 struct statement_s;
@@ -147,7 +147,7 @@ void reloc_op_def_ofs (struct def_s *def, int offset, int field);
 					adjusted. As the def's space and offset will be copied
 					into the relocation record, a dummy def may be used.
 */
-void reloc_def_def (struct def_s *def, struct def_s *location);
+void reloc_def_def (struct def_s *def, const struct def_s *location);
 
 /**	Create a relocation record for a data location referencing a def.
 
@@ -162,7 +162,7 @@ void reloc_def_def (struct def_s *def, struct def_s *location);
 					adjusted. As the def's space and offset will be copied
 					into the relocation record, a dummy def may be used.
 */
-void reloc_def_def_ofs (struct def_s *def, struct def_s *location);
+void reloc_def_def_ofs (struct def_s *def, const struct def_s *location);
 
 /**	Create a relocation record for a data location referencing a function.
 
@@ -177,7 +177,7 @@ void reloc_def_def_ofs (struct def_s *def, struct def_s *location);
 					adjusted. As the def's space and offset will be copied
 					into the relocation record, a dummy def may be used.
 */
-void reloc_def_func (struct function_s *func, struct def_s *location);
+void reloc_def_func (struct function_s *func, const struct def_s *location);
 
 /**	Create a relocation record for a data location referencing a string.
 
@@ -191,7 +191,7 @@ void reloc_def_func (struct function_s *func, struct def_s *location);
 					adjusted. As the def's space and offset will be copied
 					into the relocation record, a dummy def may be used.
 */
-void reloc_def_string (struct def_s *location);
+void reloc_def_string (const struct def_s *location);
 
 /**	Create a relocation record for a data location referencing a field.
 
@@ -206,7 +206,7 @@ void reloc_def_string (struct def_s *location);
 					adjusted. As the def's space and offset will be copied
 					into the relocation record, a dummy def may be used.
 */
-void reloc_def_field (struct def_s *def, struct def_s *location);
+void reloc_def_field (struct def_s *def, const struct def_s *location);
 
 /**	Create a relocation record for a data location referencing a field.
 
@@ -221,7 +221,7 @@ void reloc_def_field (struct def_s *def, struct def_s *location);
 					adjusted. As the def's space and offset will be copied
 					into the relocation record, a dummy def may be used.
 */
-void reloc_def_field_ofs (struct def_s *def, struct def_s *location);
+void reloc_def_field_ofs (struct def_s *def, const struct def_s *location);
 
 /**	Create a relocation record for a data location referencing an
 	instruction.
@@ -237,7 +237,8 @@ void reloc_def_field_ofs (struct def_s *def, struct def_s *location);
 					adjusted. As the def's space and offset will be copied
 					into the relocation record, a dummy def may be used.
 */
-void reloc_def_op (struct ex_label_s *label, struct def_s *location);
+void reloc_def_op (const struct ex_label_s *label,
+				   const struct def_s *location);
 
 void reloc_attach_relocs (reloc_t *relocs, reloc_t **location);
 
diff --git a/tools/qfcc/source/reloc.c b/tools/qfcc/source/reloc.c
index 29f1663d8..7c4ed3ce3 100644
--- a/tools/qfcc/source/reloc.c
+++ b/tools/qfcc/source/reloc.c
@@ -210,7 +210,7 @@ reloc_op_def_ofs (def_t *def, int offset, int field)
 }
 
 void
-reloc_def_def (def_t *def, def_t *location)
+reloc_def_def (def_t *def, const def_t *location)
 {
 	reloc_t    *ref;
 
@@ -221,7 +221,7 @@ reloc_def_def (def_t *def, def_t *location)
 }
 
 void
-reloc_def_def_ofs (def_t *def, def_t *location)
+reloc_def_def_ofs (def_t *def, const def_t *location)
 {
 	reloc_t    *ref;
 
@@ -232,7 +232,7 @@ reloc_def_def_ofs (def_t *def, def_t *location)
 }
 
 void
-reloc_def_func (function_t *func, def_t *location)
+reloc_def_func (function_t *func, const def_t *location)
 {
 	reloc_t    *ref;
 
@@ -243,7 +243,7 @@ reloc_def_func (function_t *func, def_t *location)
 }
 
 void
-reloc_def_string (def_t *location)
+reloc_def_string (const def_t *location)
 {
 	reloc_t    *ref;
 
@@ -254,7 +254,7 @@ reloc_def_string (def_t *location)
 }
 
 void
-reloc_def_field (def_t *def, def_t *location)
+reloc_def_field (def_t *def, const def_t *location)
 {
 	reloc_t    *ref;
 
@@ -265,7 +265,7 @@ reloc_def_field (def_t *def, def_t *location)
 }
 
 void
-reloc_def_field_ofs (def_t *def, def_t *location)
+reloc_def_field_ofs (def_t *def, const def_t *location)
 {
 	reloc_t    *ref;
 
@@ -276,7 +276,7 @@ reloc_def_field_ofs (def_t *def, def_t *location)
 }
 
 void
-reloc_def_op (ex_label_t *label, def_t *location)
+reloc_def_op (const ex_label_t *label, const def_t *location)
 {
 	reloc_t    *ref;
 

From 1b2a806f2829b1b756d577e4c8e6981c7daa04f5 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 5 Mar 2020 11:04:22 +0900
Subject: [PATCH 0625/1519] [qfcc] Fix test that failed due to improved
 warnings

---
 tools/qfcc/test/anonstruct.r | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/tools/qfcc/test/anonstruct.r b/tools/qfcc/test/anonstruct.r
index a426d8f61..684ae8c2b 100644
--- a/tools/qfcc/test/anonstruct.r
+++ b/tools/qfcc/test/anonstruct.r
@@ -17,11 +17,6 @@ typedef struct anon_s {
 	};
 } anon_t;
 
-union {
-	int         xsnafu;
-	float       xfizzle;
-};
-
 int foo (float f)
 {
 	anon_t anon;

From 9ccfe8aefc2de99f2411ae080656887e113ffda7 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 5 Mar 2020 11:05:13 +0900
Subject: [PATCH 0626/1519] [qfcc] Rewrite init_elements

The end goal was to fix erroneous non-constant initializer errors for
the following (ie, nested initializer blocks):

    typedef struct { int x; int y; } Point;
    typedef struct { int width; int height; } Extent;
    typedef struct Rect_s { Point offset; Extent extent; } Rect;
    Rect makeRect (int xpos, int ypos, int xlen, int ylen)
    {
	Rect rect = {{xpos, ypos}, {xlen, ylen}};
	return rect;
    }

However, it turned out that nested initializer blocks for local
variables did not work at all in that the relocations were lost because
fake defs were being created for the generated instructions.

Thus, instead of creating fake defs, simply record the offset relative
to the base def, the type, and the basic type initializer expression,
then generate instructions that all refer to the correct def but with a
relative offset.

Other than using the new element system, static initializers are largely
unaffected.
---
 tools/qfcc/source/def.c | 285 +++++++++++++++++++++++-----------------
 1 file changed, 167 insertions(+), 118 deletions(-)

diff --git a/tools/qfcc/source/def.c b/tools/qfcc/source/def.c
index c0332be60..93152b6db 100644
--- a/tools/qfcc/source/def.c
+++ b/tools/qfcc/source/def.c
@@ -62,7 +62,37 @@
 #include "type.h"
 #include "value.h"
 
+typedef struct element_s {
+	struct element_s *next;
+	int         offset;
+	type_t     *type;
+	expr_t     *expr;
+} element_t;
+
+typedef struct element_chain_s {
+	element_t  *head;
+	element_t **tail;
+} element_chain_t;
+
 static def_t *defs_freelist;
+static element_t *elements_freelist;
+
+static element_t *
+new_element (void)
+{
+	element_t  *element;
+	ALLOC (256, element_t, elements, element);
+	return element;
+}
+
+static element_t *
+append_element (element_chain_t *element_chain, element_t *element)
+{
+	element->next = 0;
+	*element_chain->tail = element;
+	element_chain->tail = &element->next;
+	return element;
+}
 
 static void
 set_storage_bits (def_t *def, storage_class_t storage)
@@ -303,141 +333,158 @@ zero_memory (expr_t *local_expr, def_t *def, type_t *zero_type,
 }
 
 static void
-init_elements (struct def_s *def, expr_t *eles)
+init_elements_nil (def_t *def)
 {
-	expr_t     *e, *c;
-	int         count, i, num_elements, base_offset;
-	pr_type_t  *g;
-	def_t      *elements;
+	if (def->local && local_expr) {
+		// memset to 0
+		int         init_size = type_size (def->type);
+		int         init_offset = 0;
 
-	base_offset = def->offset;
-	if (def->local && local_expr)
-		base_offset = 0;
-	if (eles->type == ex_nil) {
-		if (def->local && local_expr) {
-			// memset to 0
-			int         init_size = type_size (def->type);
-			int         init_offset = 0;
-
-			if (options.code.progsversion != PROG_ID_VERSION) {
-				init_offset = zero_memory (local_expr, def, &type_zero,
-										   init_size, init_offset);
-			}
-			// probably won't happen any time soon, but who knows...
-			if (options.code.progsversion != PROG_ID_VERSION
-				&& init_size - init_offset >= type_size (&type_quaternion)) {
-				init_offset = zero_memory (local_expr, def, &type_quaternion,
-										   init_size, init_offset);
-			}
-			if (init_size - init_offset >= type_size (&type_vector)) {
-				init_offset = zero_memory (local_expr, def, &type_vector,
-										   init_size, init_offset);
-			}
-			if (options.code.progsversion != PROG_ID_VERSION
-				&& init_size - init_offset >= type_size (&type_double)) {
-				init_offset = zero_memory (local_expr, def, &type_double,
-										   init_size, init_offset);
-			}
-			if (init_size - init_offset >= type_size (type_default)) {
-				zero_memory (local_expr, def, type_default,
-							 init_size, init_offset);
-			}
+		if (options.code.progsversion != PROG_ID_VERSION) {
+			init_offset = zero_memory (local_expr, def, &type_zero,
+									   init_size, init_offset);
+		}
+		// probably won't happen any time soon, but who knows...
+		if (options.code.progsversion != PROG_ID_VERSION
+			&& init_size - init_offset >= type_size (&type_quaternion)) {
+			init_offset = zero_memory (local_expr, def, &type_quaternion,
+									   init_size, init_offset);
+		}
+		if (init_size - init_offset >= type_size (&type_vector)) {
+			init_offset = zero_memory (local_expr, def, &type_vector,
+									   init_size, init_offset);
+		}
+		if (options.code.progsversion != PROG_ID_VERSION
+			&& init_size - init_offset >= type_size (&type_double)) {
+			init_offset = zero_memory (local_expr, def, &type_double,
+									   init_size, init_offset);
+		}
+		if (init_size - init_offset >= type_size (type_default)) {
+			zero_memory (local_expr, def, type_default,
+						 init_size, init_offset);
 		}
-		// it's a global, so already initialized to 0
-		return;
 	}
-	if (is_array (def->type)) {
-		type_t     *array_type = def->type->t.array.type;
-		int         array_size = def->type->t.array.size;
-		elements = calloc (array_size, sizeof (def_t));
+	// it's a global, so already initialized to 0
+}
+
+static void
+build_element_chain (element_chain_t *element_chain, type_t *type,
+					 expr_t *eles, int base_offset)
+{
+	expr_t     *e = eles->e.block.head;
+
+	if (is_array (type)) {
+		type_t     *array_type = type->t.array.type;
+		int         array_size = type->t.array.size;
+		int         i;
+
 		for (i = 0; i < array_size; i++) {
-			elements[i].type = array_type;
-			elements[i].space = def->space;
-			elements[i].offset = base_offset + i * type_size (array_type);
+			int         offset = base_offset + i * type_size (array_type);
+			if (e && e->type == ex_block) {
+				build_element_chain (element_chain, array_type, e, offset);
+			} else {
+				element_t  *element = new_element ();
+				element->type = array_type;
+				element->offset = offset;
+				element->expr = e;	// null will be treated as nil
+				append_element (element_chain, element);
+			}
+			if (e) {
+				e = e->next;
+			}
 		}
-		num_elements = i;
-	} else if (is_struct (def->type) || is_vector (def->type)
-			   || is_quaternion (def->type)) {
-		symtab_t   *symtab = def->type->t.symtab;
+	} else if (is_struct (type) || is_vector (type) || is_quaternion (type)) {
+		symtab_t   *symtab = type->t.symtab;
 		symbol_t   *field;
 
-		for (i = 0, field = symtab->symbols; field; field = field->next) {
-			if (field->sy_type != sy_var)
+		for (field = symtab->symbols; field; field = field->next) {
+			int         offset = base_offset + field->s.offset;
+			if (field->sy_type != sy_var
+				|| field->visibility == vis_anonymous) {
 				continue;
-			i++;
+			}
+			if (e && e->type == ex_block) {
+				build_element_chain (element_chain, field->type, e, offset);
+			} else {
+				element_t  *element = new_element ();
+				element->type = field->type;
+				element->offset = offset;
+				element->expr = e;	// null will be treated as nil
+				append_element (element_chain, element);
+			}
+			if (e) {
+				e = e->next;
+			}
 		}
-		elements = calloc (i, sizeof (def_t));
-		for (i = 0, field = symtab->symbols; field; field = field->next) {
-			if (field->sy_type != sy_var)
-				continue;
-			elements[i].type = field->type;
-			elements[i].space = def->space;
-			elements[i].offset = base_offset + field->s.offset;
-			i++;
-		}
-		num_elements = i;
 	} else {
 		error (eles, "invalid initializer");
+	}
+	if (e && e->next && options.warnings.initializer) {
+		warning (eles, "excessive elements in initializer");
+	}
+}
+
+static void
+init_elements (struct def_s *def, expr_t *eles)
+{
+	expr_t     *c;
+	pr_type_t  *g;
+	element_chain_t element_chain;
+	element_t  *element;
+
+	if (eles->type == ex_nil) {
+		init_elements_nil (def);
 		return;
 	}
-	for (count = 0, e = eles->e.block.head; e; count++, e = e->next) {
-		convert_name (e);
-		if (e->type == ex_nil && count < num_elements
-			&& !(is_array (elements[count].type)
-				 || is_struct (elements[count].type))) {
-			convert_nil (e, elements[count].type);
-		}
-		if (e->type == ex_error) {
-			free (elements);
-			return;
-		}
-	}
-	if (count > num_elements) {
-		if (options.warnings.initializer)
-			warning (eles, "excessive elements in initializer");
-		count = num_elements;
-	}
-	for (i = 0, e = eles->e.block.head; i < count; i++, e = e->next) {
-		g = D_POINTER (pr_type_t, &elements[i]);
-		c = constant_expr (e);
-		// nil will not survive as nil to this point if array or struct
-		if (c->type == ex_block || c->type == ex_nil) {
-			if (!is_array (elements[i].type)
-				&& !is_struct (elements[i].type)) {
-				error (e, "type mismatch in initializer");
-				continue;
-			}
-			init_elements (&elements[i], c);
-			continue;
-		} else if (c->type == ex_labelref) {
-			def_t       loc;
-			loc.space = elements[i].space;
-			loc.offset = elements[i].offset;
-			reloc_def_op (c->e.labelref.label, &loc);
-			continue;
-		} else if (c->type == ex_value) {
-			if (c->e.value->lltype == ev_integer
-				&& elements[i].type->type == ev_float)
-				convert_int (c);
-			if (get_type (c) != elements[i].type) {
-				error (e, "type mismatch in initializer");
-				continue;
-			}
-		} else {
-			if (!def->local || !local_expr) {
-				error (e, "non-constant initializer");
-				continue;
-			}
-		}
-		if (def->local && local_expr) {
-			int         offset = elements[i].offset;
-			type_t     *type = elements[i].type;
+
+	element_chain.head = 0;
+	element_chain.tail = &element_chain.head;
+	build_element_chain (&element_chain, def->type, eles, 0);
+
+	if (def->local && local_expr) {
+		for (element = element_chain.head; element; element = element->next) {
+			int         offset = element->offset;
+			type_t     *type = element->type;
 			expr_t     *ptr = new_pointer_expr (offset, type, def);
 
+			if (element->expr) {
+				c = constant_expr (element->expr);
+			} else {
+				c = convert_nil (new_nil_expr (), type);
+			}
 			append_expr (local_expr, assign_expr (unary_expr ('.', ptr), c));
-		} else {
-			if (c->type != ex_value)
+		}
+	} else {
+		def_t       dummy = *def;
+		for (element = element_chain.head; element; element = element->next) {
+			if (element->expr) {
+				c = constant_expr (element->expr);
+			} else {
+				c = convert_nil (new_nil_expr (), element->type);
+			}
+			dummy.offset = def->offset + element->offset;
+			g = D_POINTER (pr_type_t, &dummy);
+			if (c->type == ex_labelref) {
+				reloc_def_op (c->e.labelref.label, &dummy);
+				continue;
+			} else if (c->type == ex_value) {
+				if (c->e.value->lltype == ev_integer
+					&& is_float (element->type)) {
+					convert_int (c);
+				}
+				if (get_type (c) != element->type) {
+					error (c, "type mismatch in initializer");
+					continue;
+				}
+			} else {
+				if (!def->local || !local_expr) {
+					error (c, "non-constant initializer");
+					continue;
+				}
+			}
+			if (c->type != ex_value) {
 				internal_error (c, "bogus expression type in init_elements()");
+			}
 			if (c->e.value->lltype == ev_string) {
 				EMIT_STRING (def->space, g->string_var,
 							 c->e.value->v.string_val);
@@ -446,7 +493,9 @@ init_elements (struct def_s *def, expr_t *eles)
 			}
 		}
 	}
-	free (elements);
+
+	*element_chain.tail = elements_freelist;
+	elements_freelist = element_chain.head;
 }
 
 static void

From 1459361cbdd1ca55729a0d156f10911c365172d5 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 5 Mar 2020 11:48:15 +0900
Subject: [PATCH 0627/1519] [qfcc] Set builtin function def flags

This fixes the missing redefinition error when a builtin is defined
twice (and thus corrupting the function chain).
---
 tools/qfcc/source/function.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/qfcc/source/function.c b/tools/qfcc/source/function.c
index e2b87d04a..ff54b2ce5 100644
--- a/tools/qfcc/source/function.c
+++ b/tools/qfcc/source/function.c
@@ -650,6 +650,9 @@ build_builtin_function (symbol_t *sym, expr_t *bi_val, int far)
 	if (sym->s.func->def->external)
 		return 0;
 
+	sym->s.func->def->initialized = 1;
+	sym->s.func->def->constant = 1;
+	sym->s.func->def->nosave = 1;
 	add_function (sym->s.func);
 
 	if (is_integer_val (bi_val))

From 65a5e4f2a49428629e86135f95b6bd1de15c275d Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 5 Mar 2020 12:52:37 +0900
Subject: [PATCH 0628/1519] [qfcc] Allow inherited methods to satisfy protocols

I suspect that the current state of things will produce problems later
on, but this works for now.
---
 tools/qfcc/include/method.h |  9 ++++++-
 tools/qfcc/source/class.c   | 18 +++++++++++--
 tools/qfcc/source/method.c  | 50 +++++++++++++++++++++++++++++++++++--
 3 files changed, 72 insertions(+), 5 deletions(-)

diff --git a/tools/qfcc/include/method.h b/tools/qfcc/include/method.h
index 6b02bbe00..c64f04ade 100644
--- a/tools/qfcc/include/method.h
+++ b/tools/qfcc/include/method.h
@@ -58,6 +58,10 @@ typedef struct methodlist_s {
 	int         instance;		///< used only for emitting
 } methodlist_t;
 
+typedef struct methodset_s {
+	struct hashtab_s *tab;
+} methodset_t;
+
 typedef struct keywordarg_s {
 	// the first two fields match the first two fields of param_t in
 	// functionl.h
@@ -80,9 +84,12 @@ struct symbol_s *method_symbol (struct class_type_s *class_type,
 void method_set_param_names (method_t *dst, method_t *src);
 
 methodlist_t *new_methodlist (void);
+methodset_t *new_methodset (void);
+void methodset_add_methods (methodset_t *methodset, methodlist_t *methods);
+int methodset_contains_method (methodset_t *methodset, method_t *method);
 //NOTE frees the source list and any methods not copied
 void merge_method_lists (methodlist_t *dst, methodlist_t *src);
-void copy_methods (methodlist_t *dst, methodlist_t *src);
+void copy_methods (methodlist_t *dst, methodlist_t *src, methodset_t *except);
 int method_compare (method_t *m1, method_t *m2);
 
 keywordarg_t *new_keywordarg (const char *selector, struct expr_s *expr);
diff --git a/tools/qfcc/source/class.c b/tools/qfcc/source/class.c
index 4b331d237..5a9c5c6e0 100644
--- a/tools/qfcc/source/class.c
+++ b/tools/qfcc/source/class.c
@@ -642,16 +642,23 @@ class_add_protocols (class_t *class, protocollist_t *protocols)
 	int         i;
 	protocol_t *p;
 	methodlist_t *methods;
+	methodset_t *except;
+	class_t    *super;
 
 	if (!protocols)
 		return;
 
 	methods = class->methods;
 
+	except = new_methodset ();
+	for (super = class->super_class; super; super = super->super_class) {
+		methodset_add_methods (except, super->methods);
+	}
+
 	for (i = 0; i < protocols->count; i++) {
 		p = protocols->list[i];
 		if (p->methods) {
-			copy_methods (methods, p->methods);
+			copy_methods (methods, p->methods, except);
 		} else {
 			warning (0, "definition of protocol `%s' not found", p->name);
 		}
@@ -1269,15 +1276,22 @@ category_add_protocols (category_t *category, protocollist_t *protocols)
 	int         i;
 	protocol_t *p;
 	methodlist_t *methods;
+	methodset_t *except;
+	class_t    *class;
 
 	if (!protocols)
 		return;
 
 	methods = category->methods;
 
+	except = new_methodset ();
+	for (class = category->class; class; class = class->super_class) {
+		methodset_add_methods (except, class->methods);
+	}
+
 	for (i = 0; i < protocols->count; i++) {
 		p = protocols->list[i];
-		copy_methods (methods, p->methods);
+		copy_methods (methods, p->methods, except);
 		if (p->protocols)
 			category_add_protocols (category, p->protocols);
 	}
diff --git a/tools/qfcc/source/method.c b/tools/qfcc/source/method.c
index c5bd8b334..e68ad857f 100644
--- a/tools/qfcc/source/method.c
+++ b/tools/qfcc/source/method.c
@@ -205,6 +205,52 @@ new_methodlist (void)
 	return l;
 }
 
+static uintptr_t
+methodset_get_hash (const void *_method, void *unused)
+{
+	method_t   *method = (method_t *) _method;
+	uintptr_t   hash;
+
+	hash = Hash_String (method->name);
+	return hash ^ (method->instance << 3);
+}
+
+static int
+methodset_compare (const void *_m1, const void *_m2, void *unused)
+{
+	method_t   *m1 = (method_t *) _m1;
+	method_t   *m2 = (method_t *) _m2;
+	int         cmp;
+
+	cmp = strcmp (m1->name, m2->name) == 0;
+	return cmp && m1->instance == m2->instance;
+}
+
+methodset_t *
+new_methodset (void)
+{
+	methodset_t *s = malloc (sizeof (*s));
+	s->tab = Hash_NewTable (31, 0, 0, 0);
+	Hash_SetHashCompare (s->tab, methodset_get_hash, methodset_compare);
+	return s;
+}
+
+void
+methodset_add_methods (methodset_t *methodset, methodlist_t *methods)
+{
+	method_t   *m;
+
+	for (m = methods->head; m; m = m->next) {
+		Hash_AddElement (methodset->tab, m);
+	}
+}
+
+int
+methodset_contains_method (methodset_t *methodset, method_t *method)
+{
+	return Hash_FindElement (methodset->tab, method) != 0;
+}
+
 static int __attribute__((pure))
 method_in_list (methodlist_t *method_list, method_t *method)
 {
@@ -238,13 +284,13 @@ merge_method_lists (methodlist_t *dst, methodlist_t *src)
 }
 
 void
-copy_methods (methodlist_t *dst, methodlist_t *src)
+copy_methods (methodlist_t *dst, methodlist_t *src, methodset_t *except)
 {
 	method_t   *s, *d;
 	param_t    *self;
 
 	for (s = src->head; s; s = s->next) {
-		if (method_in_list (dst, s)) {
+		if (methodset_contains_method (except, s) || method_in_list (dst, s)) {
 			debug (0, "skipping duplicate method: %s", s->name);
 			continue;
 		}

From ccaa4ad3d21334d3c59047055f31c53e8d876b49 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 5 Mar 2020 14:14:20 +0900
Subject: [PATCH 0629/1519] [qfcc] Catch assignment of void* to class pointers

id and other class pointers imply that the object can receive messages,
but void * has no such implication, so treat it as a mismatch.
---
 tools/qfcc/source/class.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tools/qfcc/source/class.c b/tools/qfcc/source/class.c
index 5a9c5c6e0..60cfe27ca 100644
--- a/tools/qfcc/source/class.c
+++ b/tools/qfcc/source/class.c
@@ -445,8 +445,14 @@ obj_types_assignable (const type_t *dst, const type_t *src)
 	int         i;
 
 	//puts ("%$$\"$#%");
-	if (!obj_is_classptr (dst) || !obj_is_classptr (src))
+	if (!obj_is_classptr (src)) {
+		// if dst is a class pointer, then the types are not compatible,
+		// otherwise unknown
+		return obj_is_classptr (dst) - 1;
+	}
+	if (!obj_is_classptr (dst)) {
 		return -1;
+	}
 
 	dst_is_proto = obj_is_id (dst) && (dst_protos = obj_get_protos (dst));
 	src_is_proto = obj_is_id (src) && (src_protos = obj_get_protos (src));

From 669c8f43d8817605acd25e14a1219121d2b9586a Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 5 Mar 2020 14:48:49 +0900
Subject: [PATCH 0630/1519] whitespace

---
 tools/qfcc/source/expr.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index ecdc3606c..c384bcfe5 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -1645,7 +1645,6 @@ build_function_call (expr_t *fexpr, const type_t *ftype, expr_t *params)
 	expr_t     *call;
 	expr_t     *err = 0;
 
-
 	for (e = params; e; e = e->next) {
 		if (e->type == ex_error)
 			return e;

From 59db90d17760536976443e8170d46e290b8dcafd Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 5 Mar 2020 14:48:53 +0900
Subject: [PATCH 0631/1519] [qfcc] Fix method not found warnings

It turns out they should not be optional, but do need to be smarter
about when and which. So another two FIXMEs gone :)
---
 tools/qfcc/source/class.c | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/tools/qfcc/source/class.c b/tools/qfcc/source/class.c
index 60cfe27ca..574a484b9 100644
--- a/tools/qfcc/source/class.c
+++ b/tools/qfcc/source/class.c
@@ -1136,19 +1136,15 @@ class_message_response (class_t *class, int class_msg, expr_t *sel)
 			}
 			c = c->super_class;
 		}
-		//FIXME right option?
-		if (options.warnings.interface_check)
-			warning (sel, "%s may not respond to %c%s", class->name,
-					 class_msg ? '+' : '-', selector->name);
+		warning (sel, "%s may not respond to %c%s", class->name,
+				 class_msg ? '+' : '-', selector->name);
 	}
 	m = find_method (selector->name);
-	if (m)
-		return m;
-	//FIXME right option?
-	if (options.warnings.interface_check)
+	if (!m && (!class || class->type == &type_obj_object)) {
 		warning (sel, "could not find method for %c%s",
 				 class_msg ? '+' : '-', selector->name);
-	return 0;
+	}
+	return m;
 }
 
 static uintptr_t

From 2ddfe2ef0721f17b31cc7c9560ea002db2646e67 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 5 Mar 2020 15:00:42 +0900
Subject: [PATCH 0632/1519] [libr] Accept void * for
 performSelector:withObject:

It's up to the receiver what the object should be.
---
 ruamoko/include/Array.h  | 2 +-
 ruamoko/include/Object.h | 6 +++---
 ruamoko/lib/Array.r      | 4 ++--
 ruamoko/lib/Object.r     | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ruamoko/include/Array.h b/ruamoko/include/Array.h
index 113e466a9..060f50956 100644
--- a/ruamoko/include/Array.h
+++ b/ruamoko/include/Array.h
@@ -271,7 +271,7 @@
 	Iteratively sends #performSelector:withObject: to each contained object.
 */
 - (void) makeObjectsPerformSelector: (SEL)selector
-                         withObject: (id)arg;
+                         withObject: (void *)arg;
 //\}
 
 @end
diff --git a/ruamoko/include/Object.h b/ruamoko/include/Object.h
index 475e0bec9..eb10e55ef 100644
--- a/ruamoko/include/Object.h
+++ b/ruamoko/include/Object.h
@@ -20,10 +20,10 @@
 
 - (id) performSelector: (SEL)aSelector;
 - (id) performSelector: (SEL)aSelector
-			withObject: (id)anObject;
+			withObject: (void *)anObject;
 - (id) performSelector: (SEL)aSelector
-			withObject: (id)anObject
-			withObject: (id)anotherObject;
+			withObject: (void *)anObject
+			withObject: (void *)anotherObject;
 - (BOOL) respondsToSelector: (SEL)aSelector;
 - (BOOL) conformsToProtocol: (Protocol *)aProtocol;
 
diff --git a/ruamoko/lib/Array.r b/ruamoko/lib/Array.r
index 842076f72..2946141cc 100644
--- a/ruamoko/lib/Array.r
+++ b/ruamoko/lib/Array.r
@@ -162,7 +162,7 @@
 - (id) objectAtIndex: (unsigned)index
 {
 	if (index >= count) // FIXME: need exceptions
-		[self error: "-replaceObjectAtIndex:withObject: index out of range"];
+		[self error: "-objectAtIndex:withObject: index out of range"];
 
 	return _objs[index];
 }
@@ -401,7 +401,7 @@
 }
 
 - (void) makeObjectsPerformSelector: (SEL)selector
-                         withObject: (id)anObject
+                         withObject: (void *)anObject
 {
 	local int	i;
 
diff --git a/ruamoko/lib/Object.r b/ruamoko/lib/Object.r
index dba6b5071..d85a78064 100644
--- a/ruamoko/lib/Object.r
+++ b/ruamoko/lib/Object.r
@@ -247,7 +247,7 @@ BOOL (id object) object_is_meta_class = #0;
 	return msg (self, aSelector);
 }
 
-- (id) performSelector: (SEL)aSelector withObject: (id)anObject
+- (id) performSelector: (SEL)aSelector withObject: (void *)anObject
 {
 	local IMP msg = nil;		// FIXME teach qfcc about noreturn
 
@@ -260,8 +260,8 @@ BOOL (id object) object_is_meta_class = #0;
 }
 
 - (id) performSelector: (SEL)aSelector
-			withObject: (id)anObject
-			withObject: (id)anotherObject
+			withObject: (void *)anObject
+			withObject: (void *)anotherObject
 {
 	local IMP msg;
 

From a4582e526d6e7cb2cf414240d24e6891d32f59ca Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 5 Mar 2020 15:02:40 +0900
Subject: [PATCH 0633/1519] [cl_menu,scheme] Clean up after tightened pointer
 checks

---
 ruamoko/cl_menu/options.r   | 12 ++++++------
 ruamoko/cl_menu/plistmenu.r |  2 +-
 ruamoko/scheme/Symbol.r     |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ruamoko/cl_menu/options.r b/ruamoko/cl_menu/options.r
index e0529c23e..a228b1062 100644
--- a/ruamoko/cl_menu/options.r
+++ b/ruamoko/cl_menu/options.r
@@ -130,7 +130,7 @@ MENU_video_options (PLItem *plist)
 
 	if (plist) {
 		ret = object_from_plist ([(PLDictionary*) plist getObjectForKey:"video_options"]);
-		video_options = ret.pointer_val;
+		video_options = (Group *) ret.pointer_val;
 	}
 
 	Menu_End ();
@@ -177,7 +177,7 @@ MENU_audio_options (PLItem *plist)
 
 	if (plist) {
 		ret = object_from_plist ([(PLDictionary*) plist getObjectForKey:"audio_options"]);
-		audio_options = ret.pointer_val;
+		audio_options = (Group *) ret.pointer_val;
 	}
 
 	Menu_End ();
@@ -224,7 +224,7 @@ MENU_control_options (PLItem *plist)
 
 	if (plist) {
 		ret = object_from_plist ([(PLDictionary*) plist getObjectForKey:"control_options"]);
-		control_options = ret.pointer_val;
+		control_options = (Group *) ret.pointer_val;
 	}
 
 	MENU_control_binding (); //FIXME how to hook in the bindings menu?
@@ -275,7 +275,7 @@ MENU_feature_options (PLItem *plist)
 
 	if (plist) {
 		ret = object_from_plist ([(PLDictionary*) plist getObjectForKey:"feature_options"]);
-		feature_options = ret.pointer_val;
+		feature_options = (Group *) ret.pointer_val;
 	}
 
 	Menu_End ();
@@ -361,7 +361,7 @@ MENU_player_options (PLItem *plist)
 
 	if (plist) {
 		ret = object_from_plist ([(PLDictionary*) plist getObjectForKey:"player_options"]);
-		player_options = ret.pointer_val;
+		player_options = (Group *) ret.pointer_val;
 	}
 
 	Menu_End ();
@@ -426,7 +426,7 @@ MENU_network_options (PLItem *plist)
 
 	if (plist) {
 		ret = object_from_plist ([(PLDictionary*) plist getObjectForKey:"network_options"]);
-		network_options = ret.pointer_val;
+		network_options = (Group *) ret.pointer_val;
 	}
 
 	Menu_End ();
diff --git a/ruamoko/cl_menu/plistmenu.r b/ruamoko/cl_menu/plistmenu.r
index d5e722377..bdece6082 100644
--- a/ruamoko/cl_menu/plistmenu.r
+++ b/ruamoko/cl_menu/plistmenu.r
@@ -103,7 +103,7 @@ array_from_plist (PLArray *plarray)
 	count = [plarray count];
 	for (i = 0; i < count; i++) {
 		ret = object_from_plist ([plarray getObjectAtIndex:i]);
-		[array addObject: ret.pointer_val];
+		[array addObject: (id) ret.pointer_val];
 	}
 	ret.pointer_val = array;
 	return ret;
diff --git a/ruamoko/scheme/Symbol.r b/ruamoko/scheme/Symbol.r
index b83f3dbd6..2adfc6a25 100644
--- a/ruamoko/scheme/Symbol.r
+++ b/ruamoko/scheme/Symbol.r
@@ -45,7 +45,7 @@ Symbol *symbol (string str)
 {
     local Symbol *res;
 
-    if ((res = Hash_Find (symbols, s))) {
+    if ((res = (Symbol *) Hash_Find (symbols, s))) {
             return res;
     } else {
             res = (Symbol*) [self newFromString: s];

From 1bf56b28ac8dd2e885c86085eb8fe5a9da0e5640 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 5 Mar 2020 15:39:34 +0900
Subject: [PATCH 0634/1519] [qfcc] Warn when messaging a forward-declared class

But only once.
---
 tools/qfcc/include/class.h   |  1 +
 tools/qfcc/source/class.c    | 10 +++++++++-
 tools/qfcc/source/qc-parse.y |  5 ++++-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/tools/qfcc/include/class.h b/tools/qfcc/include/class.h
index 726a272be..7f7f0920d 100644
--- a/tools/qfcc/include/class.h
+++ b/tools/qfcc/include/class.h
@@ -48,6 +48,7 @@ typedef struct class_type_s {
 
 typedef struct class_s {
 	int         defined;
+	int         interface_declared;
 	const char *name;
 	struct class_s *super_class;
 	struct category_s *categories;
diff --git a/tools/qfcc/source/class.c b/tools/qfcc/source/class.c
index 574a484b9..8e2d458e1 100644
--- a/tools/qfcc/source/class.c
+++ b/tools/qfcc/source/class.c
@@ -1042,7 +1042,10 @@ class_find_ivar (class_t *class, int vis, const char *name)
 	symbol_t   *ivar;
 
 	if (!class->ivars) {
-		error (0, "accessing incomplete type %s", class->name);
+		if (!class->interface_declared) {
+			class->interface_declared = 1;
+			error (0, "accessing incomplete type %s", class->name);
+		}
 		return 0;
 	}
 	ivar = symtab_lookup (class->ivars, name);
@@ -1119,6 +1122,11 @@ class_message_response (class_t *class, int class_msg, expr_t *sel)
 	if (!selector)
 		return 0;
 	if (class && class->type != &type_obj_object) {
+		if (!class->interface_declared) {
+			class->interface_declared = 1;
+			warning (0, "cannot find interface declaration for `%s'",
+					 class->name);
+		}
 		while (c) {
 			for (cat = c->categories; cat; cat = cat->next) {
 				for (m = cat->methods->head; m; m = m->next) {
diff --git a/tools/qfcc/source/qc-parse.y b/tools/qfcc/source/qc-parse.y
index 3966b9cf9..a99f8c6b5 100644
--- a/tools/qfcc/source/qc-parse.y
+++ b/tools/qfcc/source/qc-parse.y
@@ -1612,6 +1612,7 @@ new_class_name
 				$1 = check_redefined ($1);
 				$$ = get_class ($1, 1);
 			}
+			$$->interface_declared = 1;
 			current_class = &$$->class_type;
 			if (!$1->table)
 				symtab_addsymbol (current_symtab, $1);
@@ -1630,10 +1631,12 @@ class_with_super
 new_class_with_super
 	: new_class_name ':' class_name
 		{
-			if (!$3->ivars) {
+			if (!$3->interface_declared) {
+				$3->interface_declared = 1;
 				error (0, "cannot find interface declaration for `%s', "
 					   "superclass of `%s'", $3->name, $1->name);
 			}
+			$1->interface_declared = 1;
 			$1->super_class = $3;
 			$$ = $1;
 		}

From c377b324a10a5bbbbfa4ed469ea0b518e43cf0ad Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 5 Mar 2020 15:44:53 +0900
Subject: [PATCH 0635/1519] [qwaq] Add Group and clean up lots of mess

Things are finally doing something again, and getting closer to having a
moveable window.
---
 ruamoko/qwaq/Makefile.am   |  6 +--
 ruamoko/qwaq/event.h       |  1 +
 ruamoko/qwaq/qwaq-app.r    | 18 +++++----
 ruamoko/qwaq/qwaq-curses.c | 50 +++++++++++++++++++++++++
 ruamoko/qwaq/qwaq-curses.h |  2 +
 ruamoko/qwaq/qwaq-draw.h   |  3 +-
 ruamoko/qwaq/qwaq-group.h  | 17 +++++++++
 ruamoko/qwaq/qwaq-group.r  | 60 ++++++++++++++++++++++++++++++
 ruamoko/qwaq/qwaq-rect.h   | 17 +++++----
 ruamoko/qwaq/qwaq-screen.h | 18 ++-------
 ruamoko/qwaq/qwaq-screen.r | 51 +------------------------
 ruamoko/qwaq/qwaq-view.h   | 48 ++++++++++++++++++++++--
 ruamoko/qwaq/qwaq-view.r   | 76 ++++++++++++++++++++++++++++++++++----
 ruamoko/qwaq/qwaq-window.h |  7 ++--
 ruamoko/qwaq/qwaq-window.r | 30 +++++----------
 15 files changed, 287 insertions(+), 117 deletions(-)
 create mode 100644 ruamoko/qwaq/qwaq-group.h
 create mode 100644 ruamoko/qwaq/qwaq-group.r

diff --git a/ruamoko/qwaq/Makefile.am b/ruamoko/qwaq/Makefile.am
index f32d9d536..ab08a5579 100644
--- a/ruamoko/qwaq/Makefile.am
+++ b/ruamoko/qwaq/Makefile.am
@@ -23,8 +23,8 @@ SUFFIXES=.o .r
 	sed -i -e '1s@:@: $(QFCC_DEP)@' $(DEPDIR)/$*.Tqo
 	$(am__mv) $(DEPDIR)/$*.Tqo $(DEPDIR)/$*.Qo
 
-qwaq_dat_src= \
-	$e
+qwaq_app_dat_src= \
+	qwaq-app.r qwaq-group.r qwaq-screen.r qwaq-window.r qwaq-view.r
 
 qwaq_curses_libs=
 qwaq_curses_SOURCES=main.c qwaq-curses.c
@@ -59,7 +59,7 @@ qwaq_x11_DEPENDENCIES= $(qwaq_x11_libs) $(QWAQ_DEPS)
 
 r_depfiles_remade=
 
-qwaq_app_dat_SOURCES=qwaq-app.r qwaq-screen.r qwaq-window.r qwaq-view.r
+qwaq_app_dat_SOURCES=$(qwaq_app_dat_src)
 qwaq_app_obj=$(qwaq_app_dat_SOURCES:.r=.o)
 qwaq_app_dep=$(addprefix ./$(DEPDIR)/,$(qwaq_app_obj:.o=.Qo))
 qwaq-app.dat$(EXEEXT): $(qwaq_app_obj) $(QFCC_DEP)
diff --git a/ruamoko/qwaq/event.h b/ruamoko/qwaq/event.h
index 445240e54..03f479fdc 100644
--- a/ruamoko/qwaq/event.h
+++ b/ruamoko/qwaq/event.h
@@ -26,6 +26,7 @@ typedef enum {
 	qe_message = 0xfe00,
 
 	qe_focused = qe_key | qe_command,
+	qe_positional = qe_mouse,
 } qwaq_event_mask;
 
 typedef enum {
diff --git a/ruamoko/qwaq/qwaq-app.r b/ruamoko/qwaq/qwaq-app.r
index 3bf67706a..aba39ac96 100644
--- a/ruamoko/qwaq/qwaq-app.r
+++ b/ruamoko/qwaq/qwaq-app.r
@@ -39,17 +39,19 @@ arp_end (void)
 	screen = [[Screen screen] retain];
 	[screen setBackground: COLOR_PAIR (1)];
 	Rect r = *[screen getRect];
-	[screen printf:"%d %d %d %d\n", r.xpos, r.ypos, r.xlen, r.ylen];
-	r.xpos = r.xlen / 4;
-	r.ypos = r.ylen / 4;
-	r.xlen /= 2;
-	r.ylen /= 2;
-	[screen printf:"%d %d %d %d\n", r.xpos, r.ypos, r.xlen, r.ylen];
+	[screen printf:"%d %d %d %d\n",
+		r.offset.x, r.offset.y, r.extent.width, r.extent.height];
+	r.offset.x = r.extent.width / 4;
+	r.offset.y = r.extent.height / 4;
+	r.extent.width /= 2;
+	r.extent.height /= 2;
+	[screen printf:"%d %d %d %d\n",
+		r.offset.x, r.offset.y, r.extent.width, r.extent.height];
 	[screen printf:"%d\n", acs_char(ACS_HLINE)];
 	[screen addch: acs_char(ACS_HLINE) atX:4 Y:4];
 	Window *w;
 	//[screen add: w=[[Window windowWithRect: r] setBackground: COLOR_PAIR (2)]];
-	//wprintf (w.window, "%d %d %d %d\n", r.xpos, r.ypos, r.xlen, r.ylen);
+	//wprintf (w.window, "%d %d %d %d\n", r.offset.x, r.offset.y, r.extent.width, r.ylen);
 	[screen redraw];
 	return self;
 }
@@ -128,3 +130,5 @@ void move_panel (panel_t panel, int x, int y) = #0;
 window_t panel_window (panel_t panel) = #0;
 void update_panels (void) = #0;
 void doupdate (void) = #0;
+int curs_set (int visibility) = #0;
+int move (int x, int y) = #0;
diff --git a/ruamoko/qwaq/qwaq-curses.c b/ruamoko/qwaq/qwaq-curses.c
index e51c47259..9213e4bdd 100644
--- a/ruamoko/qwaq/qwaq-curses.c
+++ b/ruamoko/qwaq/qwaq-curses.c
@@ -73,6 +73,8 @@ typedef enum qwaq_commands_e {
 	qwaq_cmd_init_pair,
 	qwaq_cmd_wbkgd,
 	qwaq_cmd_scrollok,
+	qwaq_cmd_move,
+	qwaq_cmd_curs_set,
 } qwaq_commands;
 
 #define RING_BUFFER(type, size) 	\
@@ -539,6 +541,23 @@ cmd_scrollok (qwaq_resources_t *res)
 	scrollok (window->win, flag);
 }
 
+static void
+cmd_move (qwaq_resources_t *res)
+{
+	int         x = RB_PEEK_DATA (res->command_queue, 2);
+	int         y = RB_PEEK_DATA (res->command_queue, 3);
+
+	move (y, x);
+}
+
+static void
+cmd_curs_set (qwaq_resources_t *res)
+{
+	int         visibility = RB_PEEK_DATA (res->command_queue, 2);
+
+	curs_set (visibility);
+}
+
 static void
 process_commands (qwaq_resources_t *res)
 {
@@ -604,6 +623,12 @@ process_commands (qwaq_resources_t *res)
 			case qwaq_cmd_scrollok:
 				cmd_scrollok (res);
 				break;
+			case qwaq_cmd_move:
+				cmd_move (res);
+				break;
+			case qwaq_cmd_curs_set:
+				cmd_curs_set (res);
+				break;
 		}
 		RB_DROP_DATA (res->command_queue, RB_PEEK_DATA (res->command_queue, 1));
 	}
@@ -1106,6 +1131,29 @@ bi_acs_char (progs_t *pr)
 	}
 }
 
+static void
+bi_move (progs_t *pr)
+{
+	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
+	int         x = P_INT (pr, 0);
+	int         y = P_INT (pr, 1);
+
+	int         command[] = { qwaq_cmd_move, 0, x, y, };
+	command[1] = CMD_SIZE(command);
+	qwaq_submit_command (res, command);
+}
+
+static void
+bi_curs_set (progs_t *pr)
+{
+	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
+	int         visibility = P_INT (pr, 0);
+
+	int         command[] = { qwaq_cmd_curs_set, 0, visibility, };
+	command[1] = CMD_SIZE(command);
+	qwaq_submit_command (res, command);
+}
+
 static void
 bi_initialize (progs_t *pr)
 {
@@ -1168,6 +1216,8 @@ static builtin_t builtins[] = {
 	{"wbkgd",			bi_wbkgd,			-1},
 	{"scrollok",		bi_scrollok,		-1},
 	{"acs_char",		bi_acs_char,		-1},
+	{"move",			bi_move,			-1},
+	{"curs_set",		bi_curs_set,		-1},
 	{0}
 };
 
diff --git a/ruamoko/qwaq/qwaq-curses.h b/ruamoko/qwaq/qwaq-curses.h
index e9574e764..a17640bd5 100644
--- a/ruamoko/qwaq/qwaq-curses.h
+++ b/ruamoko/qwaq/qwaq-curses.h
@@ -98,6 +98,8 @@ typedef struct panel_s *panel_t;
 @extern void scrollok (window_t win, int flag);
 
 @extern int acs_char (int acs);
+@extern int curs_set (int visibility);
+@extern int move (int x, int y);
 #endif
 
 #endif//__qwaq_curses_h
diff --git a/ruamoko/qwaq/qwaq-draw.h b/ruamoko/qwaq/qwaq-draw.h
index 7b614a29e..983dd8074 100644
--- a/ruamoko/qwaq/qwaq-draw.h
+++ b/ruamoko/qwaq/qwaq-draw.h
@@ -4,7 +4,8 @@
 @protocol Draw
 -draw;
 -redraw;
--setParent: parent;
+-setOwner: owner;
+-(struct window_s*) getWindow;
 @end
 
 #endif
diff --git a/ruamoko/qwaq/qwaq-group.h b/ruamoko/qwaq/qwaq-group.h
new file mode 100644
index 000000000..a018102d6
--- /dev/null
+++ b/ruamoko/qwaq/qwaq-group.h
@@ -0,0 +1,17 @@
+#ifndef __qwaq_group_h
+#define __qwaq_group_h
+
+#include "qwaq-view.h"
+
+@class Array;
+
+@interface Group : View
+{
+	Array      *views;
+	int         focused;
+}
+-insert: (View *) view;
+-remove: (View *) view;
+@end
+
+#endif//__qwaq_group_h
diff --git a/ruamoko/qwaq/qwaq-group.r b/ruamoko/qwaq/qwaq-group.r
new file mode 100644
index 000000000..a4fc171d0
--- /dev/null
+++ b/ruamoko/qwaq/qwaq-group.r
@@ -0,0 +1,60 @@
+#include <Array.h>
+#include "event.h"
+#include "qwaq-group.h"
+
+@implementation Group
+-init
+{
+	if (!(self = [super init])) {
+		return nil;
+	}
+	views = [[Array array] retain];
+	return self;
+}
+
+-(void)dealloc
+{
+	[views release];
+}
+
+-insert: (View *) view
+{
+	[views insertObject: view atIndex: 0];
+	return self;
+}
+
+-remove: (View *) view
+{
+	int         index = [views indexOfObject: view];
+	if (index != NotFound) {
+		if (focused == index) {
+			focused = -1;
+		} else if (focused > index) {
+			focused--;
+		}
+		[views removeObjectAtIndex: index];
+	}
+	return self;
+}
+
+-draw
+{
+	[views makeObjectsPerformSelector: @selector(draw)];
+	return self;
+}
+
+-handleEvent: (qwaq_event_t *) event
+{
+	[super handleEvent: event];
+	if (event.what & qe_focused) {
+		if (focused >= 0) {
+			[[views objectAtIndex:focused] handleEvent: event];
+		}
+	} else if (event.what & qe_positional) {
+	} else {
+		// broadcast
+		[views makeObjectsPerformSelector: @selector(draw) withObject: event];
+	}
+	return self;
+}
+@end
diff --git a/ruamoko/qwaq/qwaq-rect.h b/ruamoko/qwaq/qwaq-rect.h
index c679352fc..8976d25db 100644
--- a/ruamoko/qwaq/qwaq-rect.h
+++ b/ruamoko/qwaq/qwaq-rect.h
@@ -1,18 +1,21 @@
 #ifndef __qwaq_rect_h
 #define __qwaq_rect_h
 
-typedef struct Rect_s {
-	int         xpos;
-	int         ypos;
-	int         xlen;
-	int         ylen;
-} Rect;
-
 typedef struct {
 	int         x;
 	int         y;
 } Point;
 
+typedef struct {
+	int         width;
+	int         height;
+} Extent;
+
+typedef struct Rect_s {
+	Point       offset;
+	Extent      extent;
+} Rect;
+
 @extern Rect makeRect (int xpos, int ypos, int xlen, int ylen);
 //XXX will not work if point or rect point to a local variabl
 @extern int rectContainsPoint (Rect *rect, Point *point);
diff --git a/ruamoko/qwaq/qwaq-screen.h b/ruamoko/qwaq/qwaq-screen.h
index 1294b2e28..e92daa2a4 100644
--- a/ruamoko/qwaq/qwaq-screen.h
+++ b/ruamoko/qwaq/qwaq-screen.h
@@ -1,28 +1,18 @@
 #ifndef __qwaq_screen_h
 #define __qwaq_screen_h
 
-#include <Object.h>
-
 #include "qwaq-draw.h"
 #include "qwaq-rect.h"
-@class View;
-@class Array;
+#include "qwaq-view.h"
 
-@interface Screen: Object <HandleMouseEvent, Draw>
+@interface Screen: View
 {
-	Rect        rect;
-	Array      *views;
-	Array      *event_handlers;
-	Array      *focused_handlers;
-	Array      *mouse_handlers;
-	Array      *mouse_handler_rects;
-	View       *focusedView;
-	struct window_s *window;
 }
 +(Screen *) screen;
--add: obj;
+-handleEvent: (qwaq_event_t *) event;
 -setBackground: (int) ch;
 -printf: (string) fmt, ...;
+-addch: (int) ch atX: (int) x Y: (int) y;
 @end
 
 #endif//__qwaq_screen_h
diff --git a/ruamoko/qwaq/qwaq-screen.r b/ruamoko/qwaq/qwaq-screen.r
index 401e0e41e..45ae3228b 100644
--- a/ruamoko/qwaq/qwaq-screen.r
+++ b/ruamoko/qwaq/qwaq-screen.r
@@ -13,40 +13,12 @@
 	if (!(self = [super init])) {
 		return nil;
 	}
-	views = [[Array array] retain];
-	event_handlers = [[Array array] retain];
-	focused_handlers = [[Array array] retain];
-	mouse_handlers = [[Array array] retain];
-	mouse_handler_rects = [[Array array] retain];
 	window = stdscr;
 	scrollok (window, 1);
 	rect = getwrect (window);
 	return self;
 }
 
--add: obj
-{
-	if ([obj conformsToProtocol: @protocol (Draw)]) {
-		// "top" objects are drawn last
-		[views addObject: obj];
-		[obj setParent: self];
-	}
-	if ([obj conformsToProtocol: @protocol (HandleFocusedEvent)]) {
-		// want "top" objects to respond first
-		[focused_handlers insertObject: obj atIndex: 0];
-	}
-	if ([obj conformsToProtocol: @protocol (HandleMouseEvent)]) {
-		// "top" objects respond first, but the array is searched in reverse
-		[mouse_handlers addObject: obj];
-		[mouse_handler_rects addObject: (id) [obj getRect]];
-	}
-	if ([obj conformsToProtocol: @protocol (HandleEvent)]) {
-		// want "top" objects to respond first
-		[event_handlers insertObject: obj atIndex: 0];
-	}
-	return self;
-}
-
 -setBackground: (int) ch
 {
 	wbkgd (window, ch);
@@ -58,33 +30,12 @@
 	if (event.what & qe_mouse) {
 		[self printf:"%04x %2d %2d %d %08x\r", event.what, event.mouse.x, event.mouse.y, event.mouse.click, event.mouse.buttons];
 		[self redraw];
-		Point p = { event.mouse.x, event.mouse.y };
-		for (int i = [mouse_handler_rects count]; i-->0; ) {
-			//if (rectContainsPoint((Rect*)mouse_handler_rects._objs[i], &p)) {
-			//	[mouse_handlers._objs[i] handleEvent: event];
-			//	break;
-			//}
-		}
-	} else if (event.what & qe_focused) {
-		[focused_handlers
-			makeObjectsPerformSelector: @selector(handleEvent:)
-			withObject: (id) event];
-	}
-	switch (event.what) {
-		case qe_none:
-			break;
-		case qe_key:
-		case qe_command:
-			break;
-		case qe_mouse:
-			break;
 	}
 	return self;
 }
 
 -draw
 {
-	[views makeObjectsPerformSelector: @selector (draw)];
 	update_panels ();
 	doupdate ();
 	return self;
@@ -115,7 +66,7 @@
 	return &rect;
 }
 
--setParent: parent
+-setOwner: owner
 {
 	return self;
 }
diff --git a/ruamoko/qwaq/qwaq-view.h b/ruamoko/qwaq/qwaq-view.h
index e7c0db85e..bd38962e6 100644
--- a/ruamoko/qwaq/qwaq-view.h
+++ b/ruamoko/qwaq/qwaq-view.h
@@ -7,16 +7,56 @@
 #include "qwaq-draw.h"
 #include "qwaq-rect.h"
 
-@interface View: Object <Draw>
+@class Group;
+
+enum {
+	ofCanFocus      =0x0001,
+	ofFirstClick    =0x0002,
+	ofDontDraw      =0x0004,
+	ofPreProcess    =0x0008,
+	ofPostProcess   =0x0010,
+	ofMakeFirst     =0x0020,
+	ofTileable      =0x0040,
+	ofCentered      =0x0080,
+
+	ofCallHasObject =0x8000,
+};
+
+enum {
+	sfDrawn         =0x0001,
+	sfDisabled      =0x0002,
+	sfInFocus       =0x0004,
+	sfModal         =0x0008,
+	sfLocked        =0x0010,
+};
+
+@interface View: Object
 {
-	@public
-	Rect        rect;
+	union {
+		Rect        rect;
+		struct {
+			int    xpos;
+			int    ypos;
+			int    xlen;
+			int    ylen;
+		};
+	};
 	Rect        absRect;
 	Point       point;		// can't be local :(
-	id          parent;
+	Group      *owner;
 	struct window_s *window;
+	int         state;
+	int         options;
+	int         cursorState;
+	Point       cursor;
 }
 -initWithRect: (Rect) rect;
+- (void) dealloc;
+-(struct window_s *) getWindow;
+-setOwner: (Group *) owner;
+-(struct Rect_s *)getRect;
+-draw;
+-redraw;
 @end
 
 #endif//__qwaq_view_h
diff --git a/ruamoko/qwaq/qwaq-view.r b/ruamoko/qwaq/qwaq-view.r
index bc218630f..969f1dfe2 100644
--- a/ruamoko/qwaq/qwaq-view.r
+++ b/ruamoko/qwaq/qwaq-view.r
@@ -1,18 +1,21 @@
 #include "qwaq-curses.h"
 #include "qwaq-view.h"
+#include "qwaq-group.h"
 
 Rect
 makeRect (int xpos, int ypos, int xlen, int ylen)
 {
-	Rect rect = {xpos, ypos, xlen, ylen};
+	Rect rect = {{xpos, ypos}, {xlen, ylen}};
 	return rect;
 }
 
 int
 rectContainsPoint (Rect *rect, Point *point)
 {
-	return ((point.x >= rect.xpos && point.x < rect.xpos + rect.xlen)
-			&& (point.y >= rect.ypos && point.y < rect.ypos + rect.ylen));
+	return ((point.x >= rect.offset.x
+			 && point.x < rect.offset.x + rect.extent.width)
+			&& (point.y >= rect.offset.y
+				&& point.y < rect.offset.y + rect.extent.height));
 }
 
 @implementation View
@@ -24,24 +27,83 @@ rectContainsPoint (Rect *rect, Point *point)
 	}
 	self.rect = rect;
 	self.absRect = rect;
-	self.window = nil;
 	return self;
 }
 
+- (void) dealloc
+{
+	if (owner) {
+		[owner remove:self];
+	}
+	[super dealloc];
+}
+
+static void
+updateScreenCursor (View *view)
+{
+	while ((view.state & sfInFocus) && view.owner) {
+		View       *owner = (View *) view.owner;
+		if (view.cursor.x >= 0 && view.cursor.x < view.xlen
+			&& view.cursor.y >= 0 && view.cursor.y < view.ylen) {
+			owner.cursor.x = view.cursor.x + view.xpos;
+			owner.cursor.y = view.cursor.y + view.ypos;
+			owner.cursorState = view.cursorState;
+		} else {
+			owner.cursorState = 0;
+		}
+		view = owner;
+	}
+	if (view.state & sfInFocus) {
+		if (view.cursor.x >= 0 && view.cursor.x < view.xlen
+			&& view.cursor.y >= 0 && view.cursor.y < view.ylen) {
+			curs_set (view.cursorState);
+			move(view.cursor.x, view.cursor.y);
+		} else {
+			curs_set (0);
+		}
+	}
+}
+
 -draw
 {
+	state |= sfDrawn;
+	updateScreenCursor (self);
 	return self;
 }
 
--setParent: parent
+-hide
 {
-	self.parent = parent;
+	if (state & sfDrawn) {
+		state &= ~sfDrawn;
+		updateScreenCursor (self);
+	}
 	return self;
 }
 
 -redraw
 {
-	return [parent redraw];
+	if ((state & sfDrawn) && !(options & ofDontDraw)) {
+		[self draw];
+		[owner redraw];
+	}
+	return self;
+}
+
+-setOwner: (Group *) owner
+{
+	self.owner = owner;
+	window = [owner getWindow];
+	return self;
+}
+
+-(window_t) getWindow
+{
+	return window;
+}
+
+- (Rect *) getRect
+{
+	return &rect;
 }
 
 @end
diff --git a/ruamoko/qwaq/qwaq-window.h b/ruamoko/qwaq/qwaq-window.h
index 19921301a..8073c3312 100644
--- a/ruamoko/qwaq/qwaq-window.h
+++ b/ruamoko/qwaq/qwaq-window.h
@@ -3,16 +3,15 @@
 
 #include "Object.h"
 
-@class View;
 @class Array;
 
 #include "qwaq-draw.h"
 #include "qwaq-rect.h"
+#include "qwaq-view.h"
+#include "qwaq-group.h"
 
-@interface Window: Object <Draw, HandleFocusedEvent, HandleMouseEvent>
+@interface Window: Group
 {
-	Rect        rect;
-	id          parent;
 	Point       point;	// FIXME can't be local :(
 	Array      *views;
 	View       *focusedView;
diff --git a/ruamoko/qwaq/qwaq-window.r b/ruamoko/qwaq/qwaq-window.r
index d99b21b3c..237c9dcb9 100644
--- a/ruamoko/qwaq/qwaq-window.r
+++ b/ruamoko/qwaq/qwaq-window.r
@@ -19,14 +19,14 @@
 	}
 	views = [[Array array] retain];
 	self.rect = rect;
-	window = create_window (rect.xpos, rect.ypos, rect.xlen, rect.ylen);
+	window = create_window (xpos, ypos, xlen, ylen);
 	panel = create_panel (window);
 	return self;
 }
 
 -handleEvent: (qwaq_event_t *) event
 {
-	switch (event.what) {
+/*	switch (event.what) {
 		case qe_mouse:
 			mvwprintf(window, 0, 3, "%2d %2d %08x",
 					  event.mouse.x, event.mouse.y, event.mouse.buttons);
@@ -54,17 +54,17 @@
 			break;
 		case qe_none:
 			break;
-	}
+	}*/
 	return self;
 }
 
 -addView: (View *) view
 {
-	[views addObject: view];
+/*	[views addObject: view];
 	view.absRect.xpos = view.rect.xpos + rect.xpos;
 	view.absRect.ypos = view.rect.ypos + rect.ypos;
 	view.window = window;
-	[view setParent: self];
+	[view setOwner: self];*/
 	return self;
 }
 
@@ -74,16 +74,6 @@
 	return self;
 }
 
--takeFocus
-{
-	return self;
-}
-
--loseFocus
-{
-	return self;
-}
-
 -draw
 {
 	int x = 0, y = 0;
@@ -94,9 +84,9 @@
 		} else {
 			mvwaddch (window, x, y, '.');
 		}
-		if (++x >= rect.xlen) {
+		if (++x >= xlen) {
 			x = 0;
-			if (++y >= rect.ylen) {
+			if (++y >= ylen) {
 				break;
 			}
 		}
@@ -110,14 +100,14 @@
 	return &rect;
 }
 
--setParent: parent
+-setOwner: owner
 {
-	self.parent = parent;
+	self.owner = owner;
 	return self;
 }
 
 -redraw
 {
-	return [parent redraw];
+	return [owner redraw];
 }
 @end

From 5200c3f51860906aa1866e3b895a9a9c85f3d517 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 5 Mar 2020 18:26:11 +0900
Subject: [PATCH 0636/1519] [qfcc] Update chewed-alias test for new warnings

---
 tools/qfcc/test/chewed-alias.r | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/tools/qfcc/test/chewed-alias.r b/tools/qfcc/test/chewed-alias.r
index 7f151bce5..08c060534 100644
--- a/tools/qfcc/test/chewed-alias.r
+++ b/tools/qfcc/test/chewed-alias.r
@@ -1,4 +1,9 @@
-@class Array,Object;
+@interface Array
+-count;
+-lastObject;
+@end
+@interface Object
+@end
 @static entity waypoint_thinker;
 @static Array *waypoint_queue;
 void foo (void)
@@ -18,4 +23,6 @@ void __obj_exec_class (struct obj_module *msg) = #0;
 @implementation Object
 @end
 @implementation Array
+-count { return self; }
+-lastObject { return nil; }
 @end

From 66b8ab689014435db7951c2944eb28b0b4f088ac Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 5 Mar 2020 18:45:47 +0900
Subject: [PATCH 0637/1519] [qfcc] Rework method ivar access

While expression symbols worked for what they are, they weren't so good
for ivar access because every ivar of a class (and its super classes)
would be accessed at method scope creation, generating spurious access
errors if any were private. That is, when the access checks worked at
all.
---
 tools/qfcc/include/symtab.h     |  8 ++++++++
 tools/qfcc/source/class.c       | 24 +++++++++++++++++++-----
 tools/qfcc/source/expr.c        |  4 ++++
 tools/qfcc/source/expr_assign.c |  2 ++
 tools/qfcc/source/struct.c      |  4 ++++
 tools/qfcc/source/symtab.c      |  2 ++
 6 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/tools/qfcc/include/symtab.h b/tools/qfcc/include/symtab.h
index 53b42f150..7a6904f1a 100644
--- a/tools/qfcc/include/symtab.h
+++ b/tools/qfcc/include/symtab.h
@@ -56,8 +56,14 @@ typedef enum {
 	sy_expr,					///< symbol refers to an expression
 	sy_func,					///< symbol refers to a function
 	sy_class,					///< symbol refers to a class
+	sy_convert,					///< symbol refers to a conversion function
 } sy_type_e;
 
+typedef struct symconv_s {
+	struct expr_s *(*conv) (struct symbol_s *symbol, void *data);
+	void       *data;
+} symconv_t;
+
 typedef struct symbol_s {
 	struct symbol_s *next;		///< chain of symbols in symbol table
 	struct symtab_s *table;		///< symbol table that owns this symbol
@@ -72,6 +78,7 @@ typedef struct symbol_s {
 		struct ex_value_s *value;	///< sy_const
 		struct expr_s *expr;		///< sy_expr
 		struct function_s *func;	///< sy_func
+		symconv_t   convert;		///< sy_convert
 	} s;
 } symbol_t;
 
@@ -92,6 +99,7 @@ typedef struct symtab_s {
 	symbol_t   *symbols;		///< chain of symbols in this table
 	symbol_t  **symtail;		///< keep chain in declaration order
 	struct defspace_s *space;	///< storage for vars in scope symtabs
+	struct class_s *class;		///< owning class if ivar scope
 } symtab_t;
 
 const char *symtype_str (sy_type_e type) __attribute__((const));
diff --git a/tools/qfcc/source/class.c b/tools/qfcc/source/class.c
index 8e2d458e1..50ab5dcd7 100644
--- a/tools/qfcc/source/class.c
+++ b/tools/qfcc/source/class.c
@@ -1050,8 +1050,11 @@ class_find_ivar (class_t *class, int vis, const char *name)
 	}
 	ivar = symtab_lookup (class->ivars, name);
 	if (ivar) {
-		if (ivar->visibility > (vis_t) vis)
+		if (ivar->visibility > (vis_t) vis
+			|| (ivar->table->class != class
+				&& ivar->visibility > vis_protected)) {
 			goto access_error;
+		}
 		return ivar;
 	}
 	error (0, "%s.%s does not exist", class->name, name);
@@ -1180,6 +1183,7 @@ class_new_ivars (class_t *class)
 	if (class->super_class)
 		super_ivars = class->super_class->ivars;
 	ivars = new_symtab (super_ivars, stab_local);
+	ivars->class = class;
 	return ivars;
 }
 
@@ -1756,6 +1760,15 @@ class_ivar_scope (class_type_t *class_type, symtab_t *parent)
 	return symtab_flat_copy (class->ivars, parent);
 }
 
+static expr_t *
+class_dereference_ivar (symbol_t *sym, void *_self)
+{
+	expr_t     *self = (expr_t *) _self;
+
+	return field_expr (copy_expr (self),
+					   new_symbol_expr (new_symbol (sym->name)));
+}
+
 void
 class_finish_ivar_scope (class_type_t *class_type, symtab_t *ivar_scope,
 						 symtab_t *param_scope)
@@ -1769,8 +1782,9 @@ class_finish_ivar_scope (class_type_t *class_type, symtab_t *ivar_scope,
 	if (!ivar_scope)
 		return;
 	self = symtab_lookup (param_scope, "self");
-	if (!self)
+	if (!self) {
 		internal_error (0, "I've lost my self!");
+	}
 	self_expr = new_symbol_expr (self);
 	if (self->type != class_ptr) {
 		debug (0, "class method scope");
@@ -1780,9 +1794,9 @@ class_finish_ivar_scope (class_type_t *class_type, symtab_t *ivar_scope,
 	for (sym = ivar_scope->symbols; sym; sym = sym->next) {
 		if (sym->sy_type != sy_var)
 			continue;
-		sym->sy_type = sy_expr;
-		sym->s.expr = field_expr (copy_expr (self_expr),
-								  new_symbol_expr (new_symbol (sym->name)));
+		sym->sy_type = sy_convert;
+		sym->s.convert.conv = class_dereference_ivar;
+		sym->s.convert.data = self_expr;
 	}
 }
 
diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index c384bcfe5..c82585674 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -109,6 +109,10 @@ convert_name (expr_t *e)
 		//FIXME need a def
 		return;
 	}
+	if (sym->sy_type == sy_convert) {
+		new = sym->s.convert.conv (sym, sym->s.convert.data);
+		goto convert;
+	}
 	if (sym->sy_type == sy_expr) {
 		new = copy_expr (sym->s.expr);
 		goto convert;
diff --git a/tools/qfcc/source/expr_assign.c b/tools/qfcc/source/expr_assign.c
index 046f1c07b..f0d7daf4b 100644
--- a/tools/qfcc/source/expr_assign.c
+++ b/tools/qfcc/source/expr_assign.c
@@ -101,6 +101,8 @@ check_valid_lvalue (expr_t *expr)
 					break;
 				case sy_class:
 					break;
+				case sy_convert:
+					break;
 			}
 			break;
 		case ex_temp:
diff --git a/tools/qfcc/source/struct.c b/tools/qfcc/source/struct.c
index 7af7f26b2..85c8a85ba 100644
--- a/tools/qfcc/source/struct.c
+++ b/tools/qfcc/source/struct.c
@@ -151,6 +151,9 @@ build_struct (int su, symbol_t *tag, symtab_t *symtab, type_t *type)
 			}
 			anonymous = s->type->t.symtab;
 			for (as = anonymous->symbols; as; as = as->next) {
+				if (as->visibility == vis_anonymous || as->sy_type!= sy_var) {
+					continue;
+				}
 				if (Hash_Find (symtab->tab, as->name)) {
 					error (0, "ambiguous field `%s' in anonymous %s",
 						   as->name, su == 's' ? "struct" : "union");
@@ -158,6 +161,7 @@ build_struct (int su, symbol_t *tag, symtab_t *symtab, type_t *type)
 					s->next = copy_symbol (as);
 					s = s->next;
 					s->s.offset += offset;
+					s->table = symtab;
 					Hash_Add (symtab->tab, s);
 				}
 			}
diff --git a/tools/qfcc/source/symtab.c b/tools/qfcc/source/symtab.c
index f94e8d71a..353e29142 100644
--- a/tools/qfcc/source/symtab.c
+++ b/tools/qfcc/source/symtab.c
@@ -59,6 +59,7 @@ static const char *sy_type_names[] = {
 	"sy_expr",
 	"sy_func",
 	"sy_class",
+	"sy_convert",
 };
 
 const char *
@@ -165,6 +166,7 @@ symbol_t *
 copy_symbol (symbol_t *symbol)
 {
 	symbol_t   *sym = new_symbol (symbol->name);
+	sym->visibility = symbol->visibility;
 	sym->type = symbol->type;
 	sym->params = copy_params (symbol->params);
 	sym->sy_type = symbol->sy_type;

From 94e35b5f576267d21dcad1bcb36bcc71bd0bca99 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 5 Mar 2020 21:10:15 +0900
Subject: [PATCH 0638/1519] [qfcc] Clean up error messages around superclass

---
 tools/qfcc/source/qc-parse.y | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/tools/qfcc/source/qc-parse.y b/tools/qfcc/source/qc-parse.y
index a99f8c6b5..3732e47b7 100644
--- a/tools/qfcc/source/qc-parse.y
+++ b/tools/qfcc/source/qc-parse.y
@@ -1589,9 +1589,13 @@ classdecl
 class_name
 	: identifier %prec CLASS_NOT_CATEGORY
 		{
-			$1 = check_undefined ($1);
-			if (!$1->type || !obj_is_class ($1->type)) {
-				error (0, "`%s' is not a class %p", $1->name, $1->type);
+			if (!$1->type) {
+				$$ = get_class ($1, 1);
+				if (!$1->table) {
+					symtab_addsymbol (current_symtab, $1);
+				}
+			} else if (!obj_is_class ($1->type)) {
+				error (0, "`%s' is not a class", $1->name);
 				$$ = get_class (0, 1);
 			} else {
 				$$ = $1->type->t.class;

From 3b959c3ed0d8dc29b49bbd67da53ad5ac3b22399 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 6 Mar 2020 00:23:44 +0900
Subject: [PATCH 0639/1519] [gamecode] Add a macros for arbitrary param/return
 types

Of course, the type has to be small enough to fit or bad things may
happen, but it beats having to type the crazy casting every time.
---
 include/QF/progs.h | 32 +++++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/include/QF/progs.h b/include/QF/progs.h
index 18ea33b04..ea17f533e 100644
--- a/include/QF/progs.h
+++ b/include/QF/progs.h
@@ -562,6 +562,20 @@ void PR_Undefined (progs_t *pr, const char *type, const char *name) __attribute_
 */
 #define P_var(p,n,t)	((p)->pr_params[n]->t##_var)
 
+/** Access a parameter as an arbitray type.
+
+	\par QC type:
+		\c struct etc small enough to fit in a single parameter
+	\param p		pointer to ::progs_t VM struct
+	\param t		C type of the structure
+	\param n		parameter number (0-7)
+	\return			structure lvalue. use & to make a pointer of the
+					appropriate type.
+
+	\hideinitializer
+*/
+#define P_PACKED(p,t,n)	(*(t *) (p)->pr_params[n])
+
 /** Access a float parameter. Can be assigned to.
 
 	\par QC type:
@@ -584,7 +598,7 @@ void PR_Undefined (progs_t *pr, const char *type, const char *name) __attribute_
 
 	\hideinitializer
 */
-#define P_DOUBLE(p,n)	(*(double *) ((p)->pr_params[n]))
+#define P_DOUBLE(p,n)	P_PACKED(p, double, n)
 
 /** Access an integer parameter. Can be assigned to.
 
@@ -670,7 +684,6 @@ void PR_Undefined (progs_t *pr, const char *type, const char *name) __attribute_
 */
 #define P_POINTER(p,n)	P_var (p, n, pointer)
 
-
 /** Access an entity parameter.
 
 	\par QC type:
@@ -767,6 +780,19 @@ void PR_Undefined (progs_t *pr, const char *type, const char *name) __attribute_
 */
 #define R_var(p,t)		((p)->pr_return->t##_var)
 
+/** Access the VM function return value parameter as an arbitray type.
+
+	\par QC type:
+		\c struct etc small enough to fit in the return slot
+	\param p		pointer to ::progs_t VM struct
+	\param t		C type of the structure
+	\return			structure lvalue. use & to make a pointer of the
+					appropriate type.
+
+	\hideinitializer
+*/
+#define R_PACKED(p,t)	(*(t *) (p)->pr_return)
+
 /** Access the VM function return value as a \c float
 
 	\par QC type:
@@ -787,7 +813,7 @@ void PR_Undefined (progs_t *pr, const char *type, const char *name) __attribute_
 
 	\hideinitializer
 */
-#define R_DOUBLE(p)		(*(double *) ((p)->pr_return))
+#define R_DOUBLE(p)		R_PACKED (p, double)
 
 /** Access the VM function return value as a \c ::pr_int_t (AKA int32_t)
 

From 971caf553dcd5c5aed2258ef8da6aa5ea1ec7efe Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 6 Mar 2020 00:30:11 +0900
Subject: [PATCH 0640/1519] [qwaq] Add debug output to the command queue

Be sure to redirect stderr or the screen will get messed up
---
 ruamoko/qwaq/qwaq-curses.c | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/ruamoko/qwaq/qwaq-curses.c b/ruamoko/qwaq/qwaq-curses.c
index 9213e4bdd..bab6a9283 100644
--- a/ruamoko/qwaq/qwaq-curses.c
+++ b/ruamoko/qwaq/qwaq-curses.c
@@ -77,6 +77,29 @@ typedef enum qwaq_commands_e {
 	qwaq_cmd_curs_set,
 } qwaq_commands;
 
+const char *qwaq_command_names[]= {
+	"newwin",
+	"delwin",
+	"getwrect",
+	"new_panel",
+	"del_panel",
+	"hide_panel",
+	"show_panel",
+	"top_panel",
+	"bottom_panel",
+	"move_panel",
+	"panel_window",
+	"update_panels",
+	"doupdate",
+	"mvwaddstr",
+	"waddstr",
+	"mvwaddch",
+	"wrefresh",
+	"init_pair",
+	"wbkgd",
+	"scrollok",
+	"move",
+	"curs_set",
 #define RING_BUFFER(type, size) 	\
 	struct {						\
 		type        buffer[size];	\
@@ -562,7 +585,14 @@ static void
 process_commands (qwaq_resources_t *res)
 {
 	while (RB_DATA_AVAILABLE (res->command_queue) >= 2) {
-		switch ((qwaq_commands) RB_PEEK_DATA (res->command_queue, 0)) {
+		qwaq_commands cmd = RB_PEEK_DATA (res->command_queue, 0);
+		int len = RB_PEEK_DATA (res->command_queue, 1);
+		Sys_Printf ("%s[%d]", qwaq_command_names[cmd], len);
+		for (int i = 2; i < len; i++) {
+			Sys_Printf (" %d", RB_PEEK_DATA (res->command_queue, i));
+		}
+		Sys_Printf ("\n");
+		switch (cmd) {
 			case qwaq_cmd_newwin:
 				cmd_newwin (res);
 				break;

From f18e3c3ad72679893fa2586d75637385edd69a67 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 6 Mar 2020 00:31:29 +0900
Subject: [PATCH 0641/1519] [qwaq] Add wborder command

---
 ruamoko/qwaq/qwaq-app.r    |  1 +
 ruamoko/qwaq/qwaq-curses.c | 43 ++++++++++++++++++++++++++++++++++++++
 ruamoko/qwaq/qwaq-curses.h | 17 +++++++++++++++
 3 files changed, 61 insertions(+)

diff --git a/ruamoko/qwaq/qwaq-app.r b/ruamoko/qwaq/qwaq-app.r
index aba39ac96..054b4e3c8 100644
--- a/ruamoko/qwaq/qwaq-app.r
+++ b/ruamoko/qwaq/qwaq-app.r
@@ -132,3 +132,4 @@ void update_panels (void) = #0;
 void doupdate (void) = #0;
 int curs_set (int visibility) = #0;
 int move (int x, int y) = #0;
+void wborder (window_t window, box_sides_t sides, box_corners_t corners) = #0;
diff --git a/ruamoko/qwaq/qwaq-curses.c b/ruamoko/qwaq/qwaq-curses.c
index bab6a9283..73c500368 100644
--- a/ruamoko/qwaq/qwaq-curses.c
+++ b/ruamoko/qwaq/qwaq-curses.c
@@ -43,6 +43,7 @@
 
 #include "qwaq.h"
 #include "event.h"
+#include "qwaq-curses.h"
 
 #define always_inline inline __attribute__((__always_inline__))
 #define QUEUE_SIZE 16
@@ -75,6 +76,7 @@ typedef enum qwaq_commands_e {
 	qwaq_cmd_scrollok,
 	qwaq_cmd_move,
 	qwaq_cmd_curs_set,
+	qwaq_cmd_wborder,
 } qwaq_commands;
 
 const char *qwaq_command_names[]= {
@@ -100,6 +102,9 @@ const char *qwaq_command_names[]= {
 	"scrollok",
 	"move",
 	"curs_set",
+	"wborder",
+};
+
 #define RING_BUFFER(type, size) 	\
 	struct {						\
 		type        buffer[size];	\
@@ -581,6 +586,23 @@ cmd_curs_set (qwaq_resources_t *res)
 	curs_set (visibility);
 }
 
+static void
+cmd_wborder (qwaq_resources_t *res)
+{
+	int         window_id = RB_PEEK_DATA (res->command_queue, 2);
+	int         ls = RB_PEEK_DATA (res->command_queue, 3);
+	int         rs = RB_PEEK_DATA (res->command_queue, 4);
+	int         ts = RB_PEEK_DATA (res->command_queue, 5);
+	int         bs = RB_PEEK_DATA (res->command_queue, 6);
+	int         tl = RB_PEEK_DATA (res->command_queue, 7);
+	int         tr = RB_PEEK_DATA (res->command_queue, 8);
+	int         bl = RB_PEEK_DATA (res->command_queue, 9);
+	int         br = RB_PEEK_DATA (res->command_queue, 10);
+
+	window_t   *window = get_window (res, __FUNCTION__, window_id);
+	wborder (window->win, ls, rs, ts, bs, tl, tr, bl, br);
+}
+
 static void
 process_commands (qwaq_resources_t *res)
 {
@@ -659,6 +681,9 @@ process_commands (qwaq_resources_t *res)
 			case qwaq_cmd_curs_set:
 				cmd_curs_set (res);
 				break;
+			case qwaq_cmd_wborder:
+				cmd_wborder (res);
+				break;
 		}
 		RB_DROP_DATA (res->command_queue, RB_PEEK_DATA (res->command_queue, 1));
 	}
@@ -1184,6 +1209,23 @@ bi_curs_set (progs_t *pr)
 	qwaq_submit_command (res, command);
 }
 
+static void
+bi_wborder (progs_t *pr)
+{
+	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
+	int         window_id = P_INT (pr, 0);
+	__auto_type sides = P_PACKED (pr, box_sides_t, 1);
+	__auto_type corns = P_PACKED (pr, box_corners_t, 2);
+
+	if (get_window (res, __FUNCTION__, window_id)) {
+		int         command[] = { qwaq_cmd_wborder, 0, window_id,
+								  sides.ls, sides.rs, sides.ts, sides.bs,
+								  corns.tl, corns.tr, corns.bl, corns.br, };
+		command[1] = CMD_SIZE(command);
+		qwaq_submit_command (res, command);
+	}
+}
+
 static void
 bi_initialize (progs_t *pr)
 {
@@ -1248,6 +1290,7 @@ static builtin_t builtins[] = {
 	{"acs_char",		bi_acs_char,		-1},
 	{"move",			bi_move,			-1},
 	{"curs_set",		bi_curs_set,		-1},
+	{"wborder",			bi_wborder,			-1},
 	{0}
 };
 
diff --git a/ruamoko/qwaq/qwaq-curses.h b/ruamoko/qwaq/qwaq-curses.h
index a17640bd5..62bdef880 100644
--- a/ruamoko/qwaq/qwaq-curses.h
+++ b/ruamoko/qwaq/qwaq-curses.h
@@ -3,6 +3,20 @@
 
 #include "event.h"
 
+typedef struct box_sides_s {
+	int         ls;
+	int         rs;
+	int         ts;
+	int         bs;
+} box_sides_t;
+
+typedef struct box_corners_s {
+	int         tl;
+	int         tr;
+	int         bl;
+	int         br;
+} box_corners_t;
+
 #ifdef __QFCC__
 // names, order and comments lifted from ncurses.h
 typedef enum {
@@ -100,6 +114,9 @@ typedef struct panel_s *panel_t;
 @extern int acs_char (int acs);
 @extern int curs_set (int visibility);
 @extern int move (int x, int y);
+
+@extern void wborder (window_t window,
+					  box_sides_t sides, box_corners_t corners);
 #endif
 
 #endif//__qwaq_curses_h

From ad4cde15b53e9e3e4e9ca380f200c76b9da41b24 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 6 Mar 2020 00:32:09 +0900
Subject: [PATCH 0642/1519] [qwaq] Get Window working

It even draws a border around itself.
---
 ruamoko/qwaq/qwaq-app.h    |  3 ++-
 ruamoko/qwaq/qwaq-app.r    | 14 +++++---------
 ruamoko/qwaq/qwaq-group.r  |  9 +++++++++
 ruamoko/qwaq/qwaq-screen.r | 11 +++--------
 ruamoko/qwaq/qwaq-view.r   |  5 +++++
 ruamoko/qwaq/qwaq-window.h |  4 ----
 ruamoko/qwaq/qwaq-window.r | 28 ++++++++++++++++++++++------
 7 files changed, 46 insertions(+), 28 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-app.h b/ruamoko/qwaq/qwaq-app.h
index b603fb4b1..d8b899624 100644
--- a/ruamoko/qwaq/qwaq-app.h
+++ b/ruamoko/qwaq/qwaq-app.h
@@ -2,10 +2,11 @@
 #define __qwaq_app_h
 
 #include "event.h"
+#include "qwaq-group.h"
 
 @class Screen;
 
-@interface QwaqApplication: Object
+@interface QwaqApplication: Group
 {
 	qwaq_event_t event;
 	qwaq_command endState;
diff --git a/ruamoko/qwaq/qwaq-app.r b/ruamoko/qwaq/qwaq-app.r
index 054b4e3c8..dfd82e096 100644
--- a/ruamoko/qwaq/qwaq-app.r
+++ b/ruamoko/qwaq/qwaq-app.r
@@ -33,32 +33,28 @@ arp_end (void)
 	if (!(self = [super init])) {
 		return nil;
 	}
+
 	initialize ();
 	init_pair (1, COLOR_WHITE, COLOR_BLUE);
 	init_pair (2, COLOR_WHITE, COLOR_BLACK);
+
 	screen = [[Screen screen] retain];
+	[self insert:screen];
 	[screen setBackground: COLOR_PAIR (1)];
 	Rect r = *[screen getRect];
-	[screen printf:"%d %d %d %d\n",
-		r.offset.x, r.offset.y, r.extent.width, r.extent.height];
 	r.offset.x = r.extent.width / 4;
 	r.offset.y = r.extent.height / 4;
 	r.extent.width /= 2;
 	r.extent.height /= 2;
-	[screen printf:"%d %d %d %d\n",
-		r.offset.x, r.offset.y, r.extent.width, r.extent.height];
-	[screen printf:"%d\n", acs_char(ACS_HLINE)];
-	[screen addch: acs_char(ACS_HLINE) atX:4 Y:4];
 	Window *w;
-	//[screen add: w=[[Window windowWithRect: r] setBackground: COLOR_PAIR (2)]];
+	[self insert: w=[[Window windowWithRect: r] setBackground: COLOR_PAIR (2)]];
 	//wprintf (w.window, "%d %d %d %d\n", r.offset.x, r.offset.y, r.extent.width, r.ylen);
-	[screen redraw];
 	return self;
 }
 
 -run
 {
-	[screen draw];
+	[self draw];
 	do {
 		arp_start ();
 
diff --git a/ruamoko/qwaq/qwaq-group.r b/ruamoko/qwaq/qwaq-group.r
index a4fc171d0..1b1bd5c61 100644
--- a/ruamoko/qwaq/qwaq-group.r
+++ b/ruamoko/qwaq/qwaq-group.r
@@ -12,6 +12,15 @@
 	return self;
 }
 
+-initWithRect: (Rect) rect
+{
+	if (!(self = [super initWithRect: rect])) {
+		return nil;
+	}
+	views = [[Array array] retain];
+	return self;
+}
+
 -(void)dealloc
 {
 	[views release];
diff --git a/ruamoko/qwaq/qwaq-screen.r b/ruamoko/qwaq/qwaq-screen.r
index 45ae3228b..e39406448 100644
--- a/ruamoko/qwaq/qwaq-screen.r
+++ b/ruamoko/qwaq/qwaq-screen.r
@@ -10,12 +10,11 @@
 
 -init
 {
-	if (!(self = [super init])) {
+	if (!(self = [super initWithRect:getwrect (stdscr)])) {
 		return nil;
 	}
 	window = stdscr;
 	scrollok (window, 1);
-	rect = getwrect (window);
 	return self;
 }
 
@@ -28,7 +27,7 @@
 -handleEvent: (qwaq_event_t *) event
 {
 	if (event.what & qe_mouse) {
-		[self printf:"%04x %2d %2d %d %08x\r", event.what, event.mouse.x, event.mouse.y, event.mouse.click, event.mouse.buttons];
+		[self printf:"%04x %2d %2d %d %08x        \r", event.what, event.mouse.x, event.mouse.y, event.mouse.click, event.mouse.buttons];
 		[self redraw];
 	}
 	return self;
@@ -61,13 +60,9 @@
 	return self;
 }
 
-- (Rect *) getRect
-{
-	return &rect;
-}
-
 -setOwner: owner
 {
+	self.owner = owner;
 	return self;
 }
 
diff --git a/ruamoko/qwaq/qwaq-view.r b/ruamoko/qwaq/qwaq-view.r
index 969f1dfe2..3fb5b4e77 100644
--- a/ruamoko/qwaq/qwaq-view.r
+++ b/ruamoko/qwaq/qwaq-view.r
@@ -20,6 +20,11 @@ rectContainsPoint (Rect *rect, Point *point)
 
 @implementation View
 
+-init
+{
+	return [super init];
+}
+
 -initWithRect: (Rect) rect
 {
 	if (!(self = [super init])) {
diff --git a/ruamoko/qwaq/qwaq-window.h b/ruamoko/qwaq/qwaq-window.h
index 8073c3312..c59a72f28 100644
--- a/ruamoko/qwaq/qwaq-window.h
+++ b/ruamoko/qwaq/qwaq-window.h
@@ -13,13 +13,9 @@
 @interface Window: Group
 {
 	Point       point;	// FIXME can't be local :(
-	Array      *views;
-	View       *focusedView;
-	struct window_s *window;
 	struct panel_s *panel;
 }
 +windowWithRect: (Rect) rect;
--addView: (View *) view;
 -setBackground: (int) ch;
 @end
 
diff --git a/ruamoko/qwaq/qwaq-window.r b/ruamoko/qwaq/qwaq-window.r
index 237c9dcb9..45e8c4a77 100644
--- a/ruamoko/qwaq/qwaq-window.r
+++ b/ruamoko/qwaq/qwaq-window.r
@@ -17,7 +17,6 @@
 	if (!(self = [super init])) {
 		return nil;
 	}
-	views = [[Array array] retain];
 	self.rect = rect;
 	window = create_window (xpos, ypos, xlen, ylen);
 	panel = create_panel (window);
@@ -76,22 +75,39 @@
 
 -draw
 {
-	int x = 0, y = 0;
-	for (int i = ACS_ULCORNER; i <= ACS_STERLING; i++) {
+	static box_sides_t box_sides = {
+		ACS_VLINE, ACS_VLINE,
+		ACS_HLINE, ACS_HLINE,
+	};
+	static box_corners_t box_corners = {
+		ACS_ULCORNER, ACS_URCORNER,
+		ACS_LLCORNER, ACS_LRCORNER,
+	};
+	if (box_sides.ls == ACS_VLINE) {
+		int        *foo = &box_sides.ls;
+		for (int i = 0; i < 8; i++) {
+			foo[i] = acs_char (foo[i]);
+		}
+	}
+	[super draw];
+	int x = 1, y = 1;
+	wborder (window, box_sides, box_corners);
+	//for (int i = ACS_ULCORNER; i <= ACS_STERLING; i++) {
+	for (int i = 32; i <= 127; i++) {
 		int ch = acs_char (i);
 		if (ch) {
 			mvwaddch (window, x, y, ch);
 		} else {
 			mvwaddch (window, x, y, '.');
 		}
-		if (++x >= xlen) {
-			x = 0;
+		if (++x > 32) {
+			x = 1;
 			if (++y >= ylen) {
 				break;
 			}
 		}
 	}
-	[views makeObjectsPerformSelector: @selector (draw)];
+	wrefresh (window);
 	return self;
 }
 

From 6bf2fd546d945e5171d92d1176286915e77ccebe Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 6 Mar 2020 11:27:31 +0900
Subject: [PATCH 0643/1519] [qwaq] Extend Array makeObjectsPerform methods

Added conditional message sending and reversed traversal of the array.
---
 ruamoko/qwaq/qwaq-group.h | 24 ++++++++++++++-
 ruamoko/qwaq/qwaq-group.r | 63 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 86 insertions(+), 1 deletion(-)

diff --git a/ruamoko/qwaq/qwaq-group.h b/ruamoko/qwaq/qwaq-group.h
index a018102d6..a1b58fbae 100644
--- a/ruamoko/qwaq/qwaq-group.h
+++ b/ruamoko/qwaq/qwaq-group.h
@@ -1,9 +1,31 @@
 #ifndef __qwaq_group_h
 #define __qwaq_group_h
 
+#include <Array.h>
 #include "qwaq-view.h"
 
-@class Array;
+typedef BOOL condition_func (id object, void *data);
+typedef BOOL condition_func2 (id object, void *anObject, void *data);
+
+@interface Array (Group)
+- (void) makeObjectsPerformSelector: (SEL)selector
+								 if: (condition_func)condition
+							   with: (void *)data;
+- (void) makeObjectsPerformSelector: (SEL)selector
+						 withObject: (void *)anObject
+								 if: (condition_func2)condition
+							   with: (void *)data;
+- (void) makeReversedObjectsPerformSelector: (SEL)selector;
+- (void) makeReversedObjectsPerformSelector: (SEL)selector
+								 withObject: (void *)anObject;
+- (void) makeReversedObjectsPerformSelector: (SEL)selector
+										 if: (condition_func)condition
+									   with: (void *)data;
+- (void) makeReversedObjectsPerformSelector: (SEL)selector
+								 withObject: (void *)anObject
+										 if: (condition_func2)condition
+									   with: (void *)data;
+@end
 
 @interface Group : View
 {
diff --git a/ruamoko/qwaq/qwaq-group.r b/ruamoko/qwaq/qwaq-group.r
index 1b1bd5c61..3d03c3402 100644
--- a/ruamoko/qwaq/qwaq-group.r
+++ b/ruamoko/qwaq/qwaq-group.r
@@ -2,6 +2,69 @@
 #include "event.h"
 #include "qwaq-group.h"
 
+@implementation Array (Group)
+- (void) makeObjectsPerformSelector: (SEL)selector
+								 if: (condition_func)condition
+							   with: (void *)data
+{
+	for (int i = 0; i < [self count]; i++) {
+		if (condition (_objs[i], data)) {
+			[_objs[i] performSelector: selector];
+		}
+	}
+}
+
+- (void) makeObjectsPerformSelector: (SEL)selector
+						 withObject: (void *)anObject
+								 if: (condition_func2)condition
+							   with: (void *)data
+{
+	for (int i = 0; i < [self count]; i++) {
+		if (condition (_objs[i], anObject, data)) {
+			[_objs[i] performSelector: selector withObject: anObject];
+		}
+	}
+}
+
+- (void) makeReversedObjectsPerformSelector: (SEL)selector
+{
+	for (int i = [self count]; i-->0; ) {
+		[_objs[i] performSelector: selector];
+	}
+}
+
+- (void) makeReversedObjectsPerformSelector: (SEL)selector
+								 withObject: (void *)anObject
+{
+	for (int i = [self count]; i-->0; ) {
+		[_objs[i] performSelector: selector withObject: anObject];
+	}
+}
+
+- (void) makeReversedObjectsPerformSelector: (SEL)selector
+										 if: (condition_func)condition
+									   with: (void *)data
+{
+	for (int i = [self count]; i-->0; ) {
+		if (condition (_objs[i], data)) {
+			[_objs[i] performSelector: selector];
+		}
+	}
+}
+
+- (void) makeReversedObjectsPerformSelector: (SEL)selector
+								 withObject: (void *)anObject
+										 if: (condition_func2)condition
+									   with: (void *)data
+{
+	for (int i = [self count]; i-->0; ) {
+		if (condition (_objs[i], anObject, data)) {
+			[_objs[i] performSelector: selector withObject: anObject];
+		}
+	}
+}
+@end
+
 @implementation Group
 -init
 {

From 40ae7a7f1902dceb4aae554ec852571fc2393cd4 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 6 Mar 2020 11:53:40 +0900
Subject: [PATCH 0644/1519] [qwaq] Implement ofDontDraw

The conditional selector performance seems to work nicely, but I've
found a mistake with View.window (partly, realizing why my old lib (and
probably TV in the first place) had separate textContext and buffers
between views and groups).
---
 ruamoko/qwaq/qwaq-group.h  |  1 +
 ruamoko/qwaq/qwaq-group.r  | 20 ++++++++++++++++++--
 ruamoko/qwaq/qwaq-screen.r | 18 ++++++------------
 ruamoko/qwaq/qwaq-view.h   |  3 +--
 ruamoko/qwaq/qwaq-view.r   |  6 ------
 5 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-group.h b/ruamoko/qwaq/qwaq-group.h
index a1b58fbae..a5cf5635e 100644
--- a/ruamoko/qwaq/qwaq-group.h
+++ b/ruamoko/qwaq/qwaq-group.h
@@ -31,6 +31,7 @@ typedef BOOL condition_func2 (id object, void *anObject, void *data);
 {
 	Array      *views;
 	int         focused;
+	struct window_s *window;
 }
 -insert: (View *) view;
 -remove: (View *) view;
diff --git a/ruamoko/qwaq/qwaq-group.r b/ruamoko/qwaq/qwaq-group.r
index 3d03c3402..c25c6b9ee 100644
--- a/ruamoko/qwaq/qwaq-group.r
+++ b/ruamoko/qwaq/qwaq-group.r
@@ -91,7 +91,7 @@
 
 -insert: (View *) view
 {
-	[views insertObject: view atIndex: 0];
+	[views addObject: view];
 	return self;
 }
 
@@ -109,9 +109,25 @@
 	return self;
 }
 
+static BOOL
+not_dont_draw (id aView, void *aGroup)
+{
+	View       *view = aView;
+	Group      *group = (Group *) aGroup;
+	if (!(view.options & ofDontDraw)) {
+		if (!view.textContext) {
+			view.textContext = group.window;
+		}
+		return YES;
+	}
+	return NO;
+}
+
 -draw
 {
-	[views makeObjectsPerformSelector: @selector(draw)];
+	[views makeObjectsPerformSelector: @selector(draw)
+								   if: not_dont_draw
+								 with: self];
 	return self;
 }
 
diff --git a/ruamoko/qwaq/qwaq-screen.r b/ruamoko/qwaq/qwaq-screen.r
index e39406448..7b7a9c9cd 100644
--- a/ruamoko/qwaq/qwaq-screen.r
+++ b/ruamoko/qwaq/qwaq-screen.r
@@ -13,14 +13,14 @@
 	if (!(self = [super initWithRect:getwrect (stdscr)])) {
 		return nil;
 	}
-	window = stdscr;
-	scrollok (window, 1);
+	textContext = stdscr;
+	scrollok (textContext, 1);
 	return self;
 }
 
 -setBackground: (int) ch
 {
-	wbkgd (window, ch);
+	wbkgd (textContext, ch);
 	return self;
 }
 
@@ -43,26 +43,20 @@
 -redraw
 {
 	update_panels ();
-	wrefresh(window);
+	wrefresh(textContext);
 	doupdate ();
 	return self;
 }
 
 -printf: (string) fmt, ...
 {
-	wvprintf (window, fmt, @args);
+	wvprintf (textContext, fmt, @args);
 	return self;
 }
 
 -addch: (int) ch atX: (int) x Y: (int) y
 {
-	mvwaddch(window, x, y, ch);
-	return self;
-}
-
--setOwner: owner
-{
-	self.owner = owner;
+	mvwaddch(textContext, x, y, ch);
 	return self;
 }
 
diff --git a/ruamoko/qwaq/qwaq-view.h b/ruamoko/qwaq/qwaq-view.h
index bd38962e6..a168268af 100644
--- a/ruamoko/qwaq/qwaq-view.h
+++ b/ruamoko/qwaq/qwaq-view.h
@@ -44,7 +44,7 @@ enum {
 	Rect        absRect;
 	Point       point;		// can't be local :(
 	Group      *owner;
-	struct window_s *window;
+	struct window_s *textContext;	//FIXME separate class
 	int         state;
 	int         options;
 	int         cursorState;
@@ -52,7 +52,6 @@ enum {
 }
 -initWithRect: (Rect) rect;
 - (void) dealloc;
--(struct window_s *) getWindow;
 -setOwner: (Group *) owner;
 -(struct Rect_s *)getRect;
 -draw;
diff --git a/ruamoko/qwaq/qwaq-view.r b/ruamoko/qwaq/qwaq-view.r
index 3fb5b4e77..6b6f3e80d 100644
--- a/ruamoko/qwaq/qwaq-view.r
+++ b/ruamoko/qwaq/qwaq-view.r
@@ -97,15 +97,9 @@ updateScreenCursor (View *view)
 -setOwner: (Group *) owner
 {
 	self.owner = owner;
-	window = [owner getWindow];
 	return self;
 }
 
--(window_t) getWindow
-{
-	return window;
-}
-
 - (Rect *) getRect
 {
 	return &rect;

From ba9c43d2d3b323204415cc85234a390d2a6d1852 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 6 Mar 2020 13:54:46 +0900
Subject: [PATCH 0645/1519] [qwaq] Create a TextContext class

It is essentially just a wrapper around the window versions of ncurses
functions.
---
 ruamoko/qwaq/Makefile.am        |   7 +-
 ruamoko/qwaq/qwaq-app.r         |  32 ---
 ruamoko/qwaq/qwaq-curses.c      | 376 ++++++++++++++++++++++++++++----
 ruamoko/qwaq/qwaq-curses.h      |   2 +
 ruamoko/qwaq/qwaq-rect.h        |   2 +
 ruamoko/qwaq/qwaq-textcontext.h |  46 ++++
 ruamoko/qwaq/qwaq-textcontext.r |  92 ++++++++
 7 files changed, 481 insertions(+), 76 deletions(-)
 create mode 100644 ruamoko/qwaq/qwaq-textcontext.h
 create mode 100644 ruamoko/qwaq/qwaq-textcontext.r

diff --git a/ruamoko/qwaq/Makefile.am b/ruamoko/qwaq/Makefile.am
index ab08a5579..cf71f7590 100644
--- a/ruamoko/qwaq/Makefile.am
+++ b/ruamoko/qwaq/Makefile.am
@@ -24,7 +24,12 @@ SUFFIXES=.o .r
 	$(am__mv) $(DEPDIR)/$*.Tqo $(DEPDIR)/$*.Qo
 
 qwaq_app_dat_src= \
-	qwaq-app.r qwaq-group.r qwaq-screen.r qwaq-window.r qwaq-view.r
+	qwaq-app.r \
+	qwaq-group.r \
+	qwaq-screen.r \
+	qwaq-textcontext.r \
+	qwaq-view.r \
+	qwaq-window.r
 
 qwaq_curses_libs=
 qwaq_curses_SOURCES=main.c qwaq-curses.c
diff --git a/ruamoko/qwaq/qwaq-app.r b/ruamoko/qwaq/qwaq-app.r
index dfd82e096..9d046a89f 100644
--- a/ruamoko/qwaq/qwaq-app.r
+++ b/ruamoko/qwaq/qwaq-app.r
@@ -97,35 +97,3 @@ int main (int argc, string *argv)
 	get_event (&event);	// XXX need a "wait for queue idle"
 	return 0;
 }
-
-window_t stdscr = (window_t) 1;
-
-void initialize (void) = #0;
-window_t create_window (int xpos, int ypos, int xlen, int ylen) = #0;
-void destroy_window (window_t win) = #0;
-void mvwprintf (window_t win, int x, int y, string fmt, ...) = #0;
-void wprintf (window_t win, string fmt, ...) = #0;
-void wvprintf (window_t win, string fmt, @va_list args) = #0;
-void wrefresh (window_t win) = #0;
-void mvwaddch (window_t win, int x, int y, int ch) = #0;
-int get_event (qwaq_event_t *event) = #0;
-int max_colors (void) = #0;
-int max_color_pairs (void) = #0;
-int init_pair (int pair, int f, int b) = #0;
-void wbkgd (window_t win, int ch) = #0;
-void scrollok (window_t win, int flag) = #0;
-int acs_char (int acs) = #0;
-
-panel_t create_panel (window_t window) = #0;
-void destroy_panel (panel_t panel) = #0;
-void hide_panel (panel_t panel) = #0;
-void show_panel (panel_t panel) = #0;
-void top_panel (panel_t panel) = #0;
-void bottom_panel (panel_t panel) = #0;
-void move_panel (panel_t panel, int x, int y) = #0;
-window_t panel_window (panel_t panel) = #0;
-void update_panels (void) = #0;
-void doupdate (void) = #0;
-int curs_set (int visibility) = #0;
-int move (int x, int y) = #0;
-void wborder (window_t window, box_sides_t sides, box_corners_t corners) = #0;
diff --git a/ruamoko/qwaq/qwaq-curses.c b/ruamoko/qwaq/qwaq-curses.c
index 73c500368..f625f80ec 100644
--- a/ruamoko/qwaq/qwaq-curses.c
+++ b/ruamoko/qwaq/qwaq-curses.c
@@ -44,6 +44,8 @@
 #include "qwaq.h"
 #include "event.h"
 #include "qwaq-curses.h"
+#include "qwaq-rect.h"
+#include "qwaq-textcontext.h"
 
 #define always_inline inline __attribute__((__always_inline__))
 #define QUEUE_SIZE 16
@@ -856,10 +858,9 @@ bi_delwin (progs_t *pr)
 }
 
 static void
-bi_getwrect (progs_t *pr)
+qwaq_getwrect (progs_t *pr, int window_id)
 {
 	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
-	int         window_id = P_INT (pr, 0);
 
 	if (get_window (res, __FUNCTION__, window_id)) {
 		int         command[] = { qwaq_cmd_getwrect, 0, window_id, };
@@ -876,6 +877,11 @@ bi_getwrect (progs_t *pr)
 		(&R_INT (pr))[3] = cmd_result[4];
 	}
 }
+static void
+bi_getwrect (progs_t *pr)
+{
+	qwaq_getwrect (pr, P_INT (pr, 0));
+}
 
 static void
 bi_new_panel (progs_t *pr)
@@ -992,15 +998,10 @@ bi_doupdate (progs_t *pr)
 }
 
 static void
-bi_mvwprintf (progs_t *pr)
+qwaq_mvwprintf (progs_t *pr, int window_id, int x, int y, const char *fmt,
+				int count, pr_type_t **args)
 {
 	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
-	int         window_id = P_INT (pr, 0);
-	int         x = P_INT (pr, 1);
-	int         y = P_INT (pr, 2);
-	const char *fmt = P_GSTRING (pr, 3);
-	int         count = pr->pr_argc - 4;
-	pr_type_t **args = pr->pr_params + 4;
 
 	if (get_window (res, __FUNCTION__, window_id)) {
 		int         string_id = acquire_string (res);
@@ -1018,15 +1019,24 @@ bi_mvwprintf (progs_t *pr)
 		qwaq_submit_command (res, command);
 	}
 }
+static void
+bi_mvwprintf (progs_t *pr)
+{
+	int         window_id = P_INT (pr, 0);
+	int         x = P_INT (pr, 1);
+	int         y = P_INT (pr, 2);
+	const char *fmt = P_GSTRING (pr, 3);
+	int         count = pr->pr_argc - 4;
+	pr_type_t **args = pr->pr_params + 4;
+
+	qwaq_mvwprintf (pr, window_id, x, y, fmt, count, args);
+}
 
 static void
-bi_wprintf (progs_t *pr)
+qwaq_wprintf (progs_t *pr, int window_id, const char *fmt,
+			  int count, pr_type_t **args)
 {
 	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
-	int         window_id = P_INT (pr, 0);
-	const char *fmt = P_GSTRING (pr, 1);
-	int         count = pr->pr_argc - 2;
-	pr_type_t **args = pr->pr_params + 2;
 
 	if (get_window (res, __FUNCTION__, window_id)) {
 		int         string_id = acquire_string (res);
@@ -1044,14 +1054,21 @@ bi_wprintf (progs_t *pr)
 		qwaq_submit_command (res, command);
 	}
 }
-
 static void
-bi_wvprintf (progs_t *pr)
+bi_wprintf (progs_t *pr)
 {
-	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
 	int         window_id = P_INT (pr, 0);
 	const char *fmt = P_GSTRING (pr, 1);
-	__auto_type args = (pr_va_list_t *) &P_POINTER (pr, 2);
+	int         count = pr->pr_argc - 2;
+	pr_type_t **args = pr->pr_params + 2;
+
+	qwaq_wprintf (pr, window_id, fmt, count, args);
+}
+
+static void
+qwaq_wvprintf (progs_t *pr, int window_id, const char *fmt, pr_va_list_t *args)
+{
+	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
 	pr_type_t  *list_start = PR_GetPointer (pr, args->list);
 	pr_type_t **list = alloca (args->count * sizeof (*list));
 
@@ -1075,15 +1092,60 @@ bi_wvprintf (progs_t *pr)
 		qwaq_submit_command (res, command);
 	}
 }
+static void
+bi_wvprintf (progs_t *pr)
+{
+	int         window_id = P_INT (pr, 0);
+	const char *fmt = P_GSTRING (pr, 1);
+	__auto_type args = (pr_va_list_t *) &P_POINTER (pr, 2);
+
+	qwaq_wvprintf (pr, window_id, fmt, args);
+}
 
 static void
-bi_mvwaddch (progs_t *pr)
+qwaq_mvwvprintf (progs_t *pr, int window_id, int x, int y,
+				 const char *fmt, pr_va_list_t *args)
 {
 	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
+	pr_type_t  *list_start = PR_GetPointer (pr, args->list);
+	pr_type_t **list = alloca (args->count * sizeof (*list));
+
+	for (int i = 0; i < args->count; i++) {
+		list[i] = list_start + i * pr->pr_param_size;
+	}
+
+	if (get_window (res, __FUNCTION__, window_id)) {
+		int         string_id = acquire_string (res);
+		dstring_t  *print_buffer = res->strings + string_id;
+		int         command[] = {
+						qwaq_cmd_mvwaddstr, 0,
+						window_id, x, y, string_id
+					};
+
+		command[1] = CMD_SIZE(command);
+
+		dstring_clearstr (print_buffer);
+		PR_Sprintf (pr, print_buffer, "waddstr", fmt, args->count, list);
+
+		qwaq_submit_command (res, command);
+	}
+}
+static void
+bi_mvwvprintf (progs_t *pr)
+{
 	int         window_id = P_INT (pr, 0);
 	int         x = P_INT (pr, 1);
 	int         y = P_INT (pr, 2);
-	int         ch = P_INT (pr, 3);
+	const char *fmt = P_GSTRING (pr, 2);
+	__auto_type args = (pr_va_list_t *) &P_POINTER (pr, 3);
+
+	qwaq_mvwvprintf (pr, x, y, window_id, fmt, args);
+}
+
+static void
+qwaq_mvwaddch (progs_t *pr, int window_id, int x, int y, int ch)
+{
+	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
 
 	if (get_window (res, __FUNCTION__, window_id)) {
 		int         command[] = {
@@ -1094,12 +1156,21 @@ bi_mvwaddch (progs_t *pr)
 		qwaq_submit_command (res, command);
 	}
 }
+static void
+bi_mvwaddch (progs_t *pr)
+{
+	int         window_id = P_INT (pr, 0);
+	int         x = P_INT (pr, 1);
+	int         y = P_INT (pr, 2);
+	int         ch = P_INT (pr, 3);
+
+	qwaq_mvwaddch (pr, window_id, x, y, ch);
+}
 
 static void
-bi_wrefresh (progs_t *pr)
+qwaq_wrefresh (progs_t *pr, int window_id)
 {
 	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
-	int         window_id = P_INT (pr, 0);
 
 	if (get_window (res, __FUNCTION__, window_id)) {
 		int         command[] = { qwaq_cmd_wrefresh, 0, window_id, };
@@ -1107,6 +1178,13 @@ bi_wrefresh (progs_t *pr)
 		qwaq_submit_command (res, command);
 	}
 }
+static void
+bi_wrefresh (progs_t *pr)
+{
+	int         window_id = P_INT (pr, 0);
+
+	qwaq_wrefresh (pr, window_id);
+}
 
 static void
 bi_get_event (progs_t *pr)
@@ -1132,24 +1210,28 @@ bi_max_color_pairs (progs_t *pr)
 }
 
 static void
-bi_init_pair (progs_t *pr)
+qwaq_init_pair (progs_t *pr, int pair, int f, int b)
 {
 	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
-	int         pair = P_INT (pr, 0);
-	int         f = P_INT (pr, 1);
-	int         b = P_INT (pr, 2);
 
 	int         command[] = { qwaq_cmd_init_pair, 0, pair, f, b, };
 	command[1] = CMD_SIZE(command);
 	qwaq_submit_command (res, command);
 }
+static void
+bi_init_pair (progs_t *pr)
+{
+	int         pair = P_INT (pr, 0);
+	int         f = P_INT (pr, 1);
+	int         b = P_INT (pr, 2);
+
+	qwaq_init_pair (pr, pair, f, b);
+}
 
 static void
-bi_wbkgd (progs_t *pr)
+qwaq_wbkgd (progs_t *pr, int window_id, int ch)
 {
 	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
-	int         window_id = P_INT (pr, 0);
-	int         ch = P_INT (pr, 1);
 
 	if (get_window (res, __FUNCTION__, window_id)) {
 		int         command[] = { qwaq_cmd_wbkgd, 0, window_id, ch, };
@@ -1157,13 +1239,19 @@ bi_wbkgd (progs_t *pr)
 		qwaq_submit_command (res, command);
 	}
 }
+static void
+bi_wbkgd (progs_t *pr)
+{
+	int         window_id = P_INT (pr, 0);
+	int         ch = P_INT (pr, 1);
+
+	qwaq_wbkgd (pr, window_id, ch);
+}
 
 static void
-bi_scrollok (progs_t *pr)
+qwaq_scrollok (progs_t *pr, int window_id, int flag)
 {
 	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
-	int         window_id = P_INT (pr, 0);
-	int         flag = P_INT (pr, 1);
 
 	if (get_window (res, __FUNCTION__, window_id)) {
 		int         command[] = { qwaq_cmd_scrollok, 0, window_id, flag, };
@@ -1171,12 +1259,19 @@ bi_scrollok (progs_t *pr)
 		qwaq_submit_command (res, command);
 	}
 }
+static void
+bi_scrollok (progs_t *pr)
+{
+	int         window_id = P_INT (pr, 0);
+	int         flag = P_INT (pr, 1);
+
+	qwaq_scrollok (pr, window_id, flag);
+}
 
 static const char qwaq_acs_char_map[] = "lmkjtuvwqxnos`afg~,+.-hi0pryz{|}";
 static void
-bi_acs_char (progs_t *pr)
+qwaq_acs_char (progs_t *pr, unsigned acs)
 {
-	unsigned    acs = P_INT (pr, 0);
 	if (acs < 256) {
 		R_INT (pr) = NCURSES_ACS(acs);
 	} else if (acs - 256 < sizeof (qwaq_acs_char_map)) {
@@ -1185,37 +1280,54 @@ bi_acs_char (progs_t *pr)
 		R_INT (pr) = 0;
 	}
 }
+static void
+bi_acs_char (progs_t *pr)
+{
+	int         acs = P_INT (pr, 0);
+
+	qwaq_acs_char (pr, acs);
+}
 
 static void
-bi_move (progs_t *pr)
+qwaq_move (progs_t *pr, int x, int y)
 {
 	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
-	int         x = P_INT (pr, 0);
-	int         y = P_INT (pr, 1);
 
 	int         command[] = { qwaq_cmd_move, 0, x, y, };
 	command[1] = CMD_SIZE(command);
 	qwaq_submit_command (res, command);
 }
+static void
+bi_move (progs_t *pr)
+{
+	int         x = P_INT (pr, 0);
+	int         y = P_INT (pr, 1);
+
+	qwaq_move (pr, x, y);
+}
 
 static void
-bi_curs_set (progs_t *pr)
+qwaq_curs_set (progs_t *pr, int visibility)
 {
 	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
-	int         visibility = P_INT (pr, 0);
 
 	int         command[] = { qwaq_cmd_curs_set, 0, visibility, };
 	command[1] = CMD_SIZE(command);
 	qwaq_submit_command (res, command);
 }
+static void
+bi_curs_set (progs_t *pr)
+{
+	int         visibility = P_INT (pr, 0);
+
+	qwaq_curs_set (pr, visibility);
+}
 
 static void
-bi_wborder (progs_t *pr)
+qwaq_wborder (progs_t *pr, int window_id,
+			  box_sides_t sides, box_corners_t corns)
 {
 	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
-	int         window_id = P_INT (pr, 0);
-	__auto_type sides = P_PACKED (pr, box_sides_t, 1);
-	__auto_type corns = P_PACKED (pr, box_corners_t, 2);
 
 	if (get_window (res, __FUNCTION__, window_id)) {
 		int         command[] = { qwaq_cmd_wborder, 0, window_id,
@@ -1225,6 +1337,15 @@ bi_wborder (progs_t *pr)
 		qwaq_submit_command (res, command);
 	}
 }
+static void
+bi_wborder (progs_t *pr)
+{
+	int         window_id = P_INT (pr, 0);
+	__auto_type sides = P_PACKED (pr, box_sides_t, 1);
+	__auto_type corns = P_PACKED (pr, box_corners_t, 2);
+
+	qwaq_wborder (pr, window_id, sides, corns);
+}
 
 static void
 bi_initialize (progs_t *pr)
@@ -1247,6 +1368,155 @@ bi_initialize (progs_t *pr)
 	res->stdscr.win = stdscr;
 }
 
+static void
+bi_c_TextContext__is_initialized (progs_t *pr)
+{
+	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
+	R_INT (pr) = res->initialized;
+}
+
+static void
+bi_c_TextContext__max_colors (progs_t *pr)
+{
+	bi_max_colors (pr);
+}
+
+static void
+bi_c_TextContext__max_color_pairs (progs_t *pr)
+{
+	bi_max_color_pairs (pr);
+}
+
+static void
+bi_c_TextContext__init_pair_ (progs_t *pr)
+{
+	int         pair = P_INT (pr, 2);
+	int         f = P_INT (pr, 3);
+	int         b = P_INT (pr, 4);
+
+	qwaq_init_pair (pr, pair, f, b);
+}
+
+static void
+bi_c_TextContext__acs_char_ (progs_t *pr)
+{
+	int         acs = P_INT (pr, 2);
+
+	qwaq_acs_char (pr, acs);
+}
+
+static void
+bi_c_TextContext__move_ (progs_t *pr)
+{
+	Point      *pos = &P_PACKED (pr, Point, 2);
+
+	qwaq_move (pr, pos->x, pos->y);
+}
+
+static void
+bi_c_TextContext__curs_set_ (progs_t *pr)
+{
+	int         visibility = P_INT (pr, 2);
+
+	qwaq_curs_set (pr, visibility);
+}
+
+static void
+bi_c_TextContext__doupdate (progs_t *pr)
+{
+	bi_doupdate (pr);
+}
+
+static void
+bi_i_TextContext__mvprintf_ (progs_t *pr)
+{
+	int         window_id = P_STRUCT (pr, qwaq_textcontext_t, 0).window;
+	Point      *pos = &P_PACKED (pr, Point, 2);
+	const char *fmt = P_GSTRING (pr, 3);
+	int         count = pr->pr_argc - 4;
+	pr_type_t **args = pr->pr_params + 4;
+
+	qwaq_mvwprintf (pr, window_id, pos->x, pos->y, fmt, count, args);
+}
+
+static void
+bi_i_TextContext__printf_ (progs_t *pr)
+{
+	int         window_id = P_STRUCT (pr, qwaq_textcontext_t, 0).window;
+	const char *fmt = P_GSTRING (pr, 2);
+	int         count = pr->pr_argc - 3;
+	pr_type_t **args = pr->pr_params + 3;
+
+	qwaq_wprintf (pr, window_id, fmt, count, args);
+}
+
+static void
+bi_i_TextContext__vprintf_ (progs_t *pr)
+{
+	int         window_id = P_STRUCT (pr, qwaq_textcontext_t, 0).window;
+	const char *fmt = P_GSTRING (pr, 2);
+	__auto_type args = (pr_va_list_t *) &P_POINTER (pr, 3);
+
+	qwaq_wvprintf (pr, window_id, fmt, args);
+}
+
+static void
+bi_i_TextContext__mvvprintf_ (progs_t *pr)
+{
+	int         window_id = P_STRUCT (pr, qwaq_textcontext_t, 0).window;
+	Point      *pos = &P_PACKED (pr, Point, 2);
+	const char *fmt = P_GSTRING (pr, 3);
+	__auto_type args = (pr_va_list_t *) &P_POINTER (pr, 4);
+
+	qwaq_mvwvprintf (pr, pos->x, pos->y, window_id, fmt, args);
+}
+
+static void
+bi_i_TextContext__refresh (progs_t *pr)
+{
+	int         window_id = P_STRUCT (pr, qwaq_textcontext_t, 0).window;
+
+	qwaq_wrefresh (pr, window_id);
+}
+
+static void
+bi_i_TextContext__mvaddch_ (progs_t *pr)
+{
+	int         window_id = P_STRUCT (pr, qwaq_textcontext_t, 0).window;
+	Point      *pos = &P_PACKED (pr, Point, 2);
+	int         ch = P_INT (pr, 3);
+
+	qwaq_mvwaddch (pr, window_id, pos->x, pos->y, ch);
+}
+
+static void
+bi_i_TextContext__bkgd_ (progs_t *pr)
+{
+	int         window_id = P_STRUCT (pr, qwaq_textcontext_t, 0).window;
+	int         ch = P_INT (pr, 2);
+
+	qwaq_wbkgd (pr, window_id, ch);
+}
+
+static void
+bi_i_TextContext__scrollok_ (progs_t *pr)
+{
+	int         window_id = P_STRUCT (pr, qwaq_textcontext_t, 0).window;
+	int         flag = P_INT (pr, 2);
+
+	qwaq_scrollok (pr, window_id, flag);
+}
+
+static void
+bi_i_TextContext__border_ (progs_t *pr)
+{
+	int         window_id = P_STRUCT (pr, qwaq_textcontext_t, 0).window;
+	__auto_type sides = P_PACKED (pr, box_sides_t, 2);
+	__auto_type corns = P_PACKED (pr, box_corners_t, 3);
+
+	qwaq_wborder (pr, window_id, sides, corns);
+}
+
 static void
 bi_qwaq_clear (progs_t *pr, void *data)
 {
@@ -1279,6 +1549,7 @@ static builtin_t builtins[] = {
 	{"mvwprintf",		bi_mvwprintf,		-1},
 	{"wprintf",			bi_wprintf,			-1},
 	{"wvprintf",		bi_wvprintf,		-1},
+	{"mvwvprintf",		bi_mvwvprintf,		-1},
 	{"mvwaddch",		bi_mvwaddch,		-1},
 	{"wrefresh",		bi_wrefresh,		-1},
 	{"get_event",		bi_get_event,		-1},
@@ -1291,6 +1562,25 @@ static builtin_t builtins[] = {
 	{"move",			bi_move,			-1},
 	{"curs_set",		bi_curs_set,		-1},
 	{"wborder",			bi_wborder,			-1},
+
+	{"_c_TextContext__is_initialized",	bi_c_TextContext__is_initialized,  -1},
+	{"_c_TextContext__max_colors",		bi_c_TextContext__max_colors,	   -1},
+	{"_c_TextContext__max_color_pairs",	bi_c_TextContext__max_color_pairs, -1},
+	{"_c_TextContext__init_pair_",		bi_c_TextContext__init_pair_,	   -1},
+	{"_c_TextContext__acs_char_",		bi_c_TextContext__acs_char_,	   -1},
+	{"_c_TextContext__move_",			bi_c_TextContext__move_,		   -1},
+	{"_c_TextContext__curs_set_",		bi_c_TextContext__curs_set_,	   -1},
+	{"_c_TextContext__doupdate",		bi_c_TextContext__doupdate,		   -1},
+	{"_i_TextContext__mvprintf_",		bi_i_TextContext__mvprintf_,	   -1},
+	{"_i_TextContext__printf_",			bi_i_TextContext__printf_,		   -1},
+	{"_i_TextContext__vprintf_",		bi_i_TextContext__vprintf_,		   -1},
+	{"_i_TextContext__mvvprintf_",		bi_i_TextContext__mvvprintf_,	   -1},
+	{"_i_TextContext__refresh",			bi_i_TextContext__refresh,		   -1},
+	{"_i_TextContext__mvaddch_",		bi_i_TextContext__mvaddch_,		   -1},
+	{"_i_TextContext__bkgd_",			bi_i_TextContext__bkgd_,		   -1},
+	{"_i_TextContext__scrollok_",		bi_i_TextContext__scrollok_,	   -1},
+	{"_i_TextContext__border_",			bi_i_TextContext__border_,		   -1},
+
 	{0}
 };
 
diff --git a/ruamoko/qwaq/qwaq-curses.h b/ruamoko/qwaq/qwaq-curses.h
index 62bdef880..aa9d2456d 100644
--- a/ruamoko/qwaq/qwaq-curses.h
+++ b/ruamoko/qwaq/qwaq-curses.h
@@ -90,6 +90,8 @@ typedef struct panel_s *panel_t;
 @extern void mvwprintf (window_t win, int x, int y, string fmt, ...);
 @extern void wprintf (window_t win, string fmt, ...);
 @extern void wvprintf (window_t win, string fmt, @va_list args);
+@extern void mvwvprintf (window_t win, int x, int y,
+						 string fmt, @va_list args);
 @extern void wrefresh (window_t win);
 @extern void mvwaddch (window_t win, int x, int y, int ch);
 
diff --git a/ruamoko/qwaq/qwaq-rect.h b/ruamoko/qwaq/qwaq-rect.h
index 8976d25db..92c241f40 100644
--- a/ruamoko/qwaq/qwaq-rect.h
+++ b/ruamoko/qwaq/qwaq-rect.h
@@ -16,9 +16,11 @@ typedef struct Rect_s {
 	Extent      extent;
 } Rect;
 
+#ifdef __QFCC__
 @extern Rect makeRect (int xpos, int ypos, int xlen, int ylen);
 //XXX will not work if point or rect point to a local variabl
 @extern int rectContainsPoint (Rect *rect, Point *point);
 @extern Rect getwrect (struct window_s *window);
+#endif
 
 #endif//__qwaq_rect_h
diff --git a/ruamoko/qwaq/qwaq-textcontext.h b/ruamoko/qwaq/qwaq-textcontext.h
new file mode 100644
index 000000000..8cd20d74f
--- /dev/null
+++ b/ruamoko/qwaq/qwaq-textcontext.h
@@ -0,0 +1,46 @@
+#ifndef __qwaq_textcontect_h
+#define __qwaq_textcontect_h
+
+#ifdef __QFCC__
+#include <Object.h>
+#include "qwaq-curses.h"
+#include "qwaq-rect.h"
+
+@interface TextContext : Object
+{
+	window_t    window;
+}
++ (int) max_colors;
++ (int) max_color_pairs;
++ (void) init_pair: (int) pair, int fg, int bg;
++ (int) acs_char: (int) acs;
++ (void) move: (Point) pos;
++ (void) curs_set: (int) visibility;
++ (void) doupdate;
+
+-init;
+-initWithRect: (Rect) rect;
+-initWithWindow: (window_t) window;
+- (void) mvprintf: (Point) pos, string fmt, ...;
+- (void) printf: (string) fmt, ...;
+- (void) vprintf: (string) mft, @va_list args;
+- (void) mvvprintf: (Point) pos, string mft, @va_list args;
+- (void) refresh;
+- (void) mvaddch: (Point) pos, int ch;
+- (void) bkgd: (int) ch;
+- (void) scrollok: (int) flag;
+- (void) border: (box_sides_t) sides, box_corners_t corners;
+@end
+
+#else
+
+#include "QF/pr_obj.h"
+
+typedef struct qwaq_textcontext_s {
+	pr_id_t     isa;
+	pointer_t   window;
+} qwaq_textcontext_t;
+
+#endif
+
+#endif//__qwaq_textcontect_h
diff --git a/ruamoko/qwaq/qwaq-textcontext.r b/ruamoko/qwaq/qwaq-textcontext.r
new file mode 100644
index 000000000..43c8f9320
--- /dev/null
+++ b/ruamoko/qwaq/qwaq-textcontext.r
@@ -0,0 +1,92 @@
+#include "qwaq-textcontext.h"
+
+@implementation TextContext
++ (int) is_initialized = #0;
++ (void) initialize
+{
+	if (![self is_initialized]) {
+		initialize ();
+	}
+}
+
++ (int) max_colors = #0;
++ (int) max_color_pairs = #0;
++ (void) init_pair: (int) pair, int fg, int bg = #0;
++ (int) acs_char: (int) acs = #0;
++ (void) move: (Point) pos = #0;
++ (void) curs_set: (int) visibility = #0;
++ (void) doupdate = #0;
+
+- init
+{
+	if (!(self = [super init])) {
+		return nil;
+	}
+	window = stdscr;
+	return self;
+}
+
+- initWithRect: (Rect) rect
+{
+	if (!(self = [super init])) {
+		return nil;
+	}
+	window = create_window (rect.offset.x, rect.offset.y,
+							rect.extent.width, rect.extent.height);
+	return self;
+}
+
+- initWithWindow: (window_t) window
+{
+	if (!(self = [super init])) {
+		return nil;
+	}
+	self.window = window;
+	return self;
+}
+
+- (void) mvprintf: (Point) pos, string fmt, ... = #0;
+- (void) printf: (string) fmt, ... = #0;
+- (void) vprintf: (string) mft, @va_list args = #0;
+- (void) mvvprintf: (Point) pos, string mft, @va_list args = #0;
+- (void) refresh = #0;
+- (void) mvaddch: (Point) pos, int ch = #0;
+- (void) bkgd: (int) ch = #0;
+- (void) scrollok: (int) flag = #0;
+- (void) border: (box_sides_t) sides, box_corners_t corners = #0;
+
+@end
+
+window_t stdscr = (window_t) 1;
+
+void initialize (void) = #0;
+window_t create_window (int xpos, int ypos, int xlen, int ylen) = #0;
+void destroy_window (window_t win) = #0;
+void mvwprintf (window_t win, int x, int y, string fmt, ...) = #0;
+void wprintf (window_t win, string fmt, ...) = #0;
+void wvprintf (window_t win, string fmt, @va_list args) = #0;
+void mvwvprintf (window_t win, int x, int y, string fmt, @va_list args) = #0;
+void wrefresh (window_t win) = #0;
+void mvwaddch (window_t win, int x, int y, int ch) = #0;
+int get_event (qwaq_event_t *event) = #0;
+int max_colors (void) = #0;
+int max_color_pairs (void) = #0;
+int init_pair (int pair, int f, int b) = #0;
+void wbkgd (window_t win, int ch) = #0;
+void scrollok (window_t win, int flag) = #0;
+int acs_char (int acs) = #0;
+
+panel_t create_panel (window_t window) = #0;
+void destroy_panel (panel_t panel) = #0;
+void hide_panel (panel_t panel) = #0;
+void show_panel (panel_t panel) = #0;
+void top_panel (panel_t panel) = #0;
+void bottom_panel (panel_t panel) = #0;
+void move_panel (panel_t panel, int x, int y) = #0;
+window_t panel_window (panel_t panel) = #0;
+void update_panels (void) = #0;
+
+void doupdate (void) = #0;
+int curs_set (int visibility) = #0;
+int move (int x, int y) = #0;
+void wborder (window_t window, box_sides_t sides, box_corners_t corners) = #0;

From a2cebe3cac830343202cb6246f0fd80788a05929 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 6 Mar 2020 17:36:23 +0900
Subject: [PATCH 0646/1519] [qfcc] Add failing test for method parameters

---
 tools/qfcc/test/Makefile.am    | 10 ++++++++++
 tools/qfcc/test/methodparams.r | 17 +++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 tools/qfcc/test/methodparams.r

diff --git a/tools/qfcc/test/Makefile.am b/tools/qfcc/test/Makefile.am
index 2e1001c11..7ea8e5c21 100644
--- a/tools/qfcc/test/Makefile.am
+++ b/tools/qfcc/test/Makefile.am
@@ -43,6 +43,7 @@ test_progs_dat=\
 	func-static.dat \
 	infloop.dat \
 	ivar-struct-return.dat \
+	methodparams.dat \
 	modulo.dat \
 	paramret.dat \
 	quaternion.dat \
@@ -258,6 +259,15 @@ ivar-struct-return.run: Makefile build-run
 include ./$(DEPDIR)/ivar-struct-return.Qo # am--include-marker
 r_depfiles_remade += ./$(DEPDIR)/ivar-struct-return.Qo
 
+methodparams_dat_SOURCES=methodparams.r
+methodparams_obj=$(methodparams_dat_SOURCES:.r=.qfo)
+methodparams.dat$(EXEEXT): $(methodparams_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(methodparams_obj)
+methodparams.run: Makefile build-run
+	@TEST_HARNESS_OPTS=--float $(srcdir)/build-run $@
+include ./$(DEPDIR)/methodparams.Qo # am--include-marker
+r_depfiles_remade += ./$(DEPDIR)/methodparams.Qo
+
 modulo_dat_SOURCES=modulo.r
 modulo_obj=$(modulo_dat_SOURCES:.r=.qfo)
 modulo.dat$(EXEEXT): $(modulo_obj) $(QFCC_DEP)
diff --git a/tools/qfcc/test/methodparams.r b/tools/qfcc/test/methodparams.r
new file mode 100644
index 000000000..b91322358
--- /dev/null
+++ b/tools/qfcc/test/methodparams.r
@@ -0,0 +1,17 @@
+typedef struct { int x, y; } Point;
+@interface TextContext
+- (void) mvvprintf: (Point) pos, string mft, @va_list args;
+@end
+@interface View
+{
+	TextContext *textContext;
+}
+- (void) mvprintf: (Point) pos, string mft, ...;
+@end
+
+@implementation View
+- (void) mvprintf: (Point) pos, string fmt, ...
+{
+	[textContext mvvprintf: pos, fmt, @args];
+}
+@end

From 9b269c2f8ecda23231d33be6bbda7abe3a71d758 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 6 Mar 2020 17:14:14 +0900
Subject: [PATCH 0647/1519] [qfcc] Fix mangled method parameters

Method parameters (ie, extra parameters without selector names) were
getting reversed during function type construction.
---
 tools/qfcc/include/function.h  |  2 +-
 tools/qfcc/source/function.c   | 16 +++++++++++++++-
 tools/qfcc/source/method.c     |  6 +++---
 tools/qfcc/source/qc-parse.y   |  3 +--
 tools/qfcc/test/methodparams.r | 12 ++++++++++++
 5 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/tools/qfcc/include/function.h b/tools/qfcc/include/function.h
index 209f40026..39cde918c 100644
--- a/tools/qfcc/include/function.h
+++ b/tools/qfcc/include/function.h
@@ -119,8 +119,8 @@ param_t *new_param (const char *selector, struct type_s *type,
 					const char *name);
 param_t *param_append_identifiers (param_t *params, struct symbol_s *idents,
 								   struct type_s *type);
-param_t *_reverse_params (param_t *params, param_t *next);
 param_t *reverse_params (param_t *params);
+param_t *append_params (param_t *params, param_t *more_params);
 param_t *copy_params (param_t *params);
 struct type_s *parse_params (struct type_s *type, param_t *params);
 param_t *check_params (param_t *params);
diff --git a/tools/qfcc/source/function.c b/tools/qfcc/source/function.c
index ff54b2ce5..7f53cd11d 100644
--- a/tools/qfcc/source/function.c
+++ b/tools/qfcc/source/function.c
@@ -120,7 +120,7 @@ param_append_identifiers (param_t *params, symbol_t *idents, type_t *type)
 	return params;
 }
 
-param_t *
+static param_t *
 _reverse_params (param_t *params, param_t *next)
 {
 	param_t    *p = params;
@@ -138,6 +138,20 @@ reverse_params (param_t *params)
 	return _reverse_params (params, 0);
 }
 
+param_t *
+append_params (param_t *params, param_t *more_params)
+{
+	if (params) {
+		param_t *p;
+		for (p = params; p->next; ) {
+			p = p->next;
+		}
+		p->next = more_params;
+		return params;
+	}
+	return more_params;
+}
+
 param_t *
 copy_params (param_t *params)
 {
diff --git a/tools/qfcc/source/method.c b/tools/qfcc/source/method.c
index e68ad857f..676726a5c 100644
--- a/tools/qfcc/source/method.c
+++ b/tools/qfcc/source/method.c
@@ -89,8 +89,8 @@ new_method (type_t *ret_type, param_t *selector, param_t *opt_params)
 	dstring_t  *name = dstring_newstr ();
 	dstring_t  *types = dstring_newstr ();
 
-	opt_params = reverse_params (opt_params);
-	selector = _reverse_params (selector, opt_params);
+	selector = reverse_params (selector);
+	selector = append_params (selector, opt_params);
 	cmd->next = selector;
 	self->next = cmd;
 
@@ -109,7 +109,7 @@ new_method (type_t *ret_type, param_t *selector, param_t *opt_params)
 	free (name);
 	free (types);
 
-	//print_type (meth->type); puts ("");
+	//print_type (meth->type);
 	meth->def = 0;
 
 	if (!known_methods)
diff --git a/tools/qfcc/source/qc-parse.y b/tools/qfcc/source/qc-parse.y
index 3732e47b7..93f4aeea9 100644
--- a/tools/qfcc/source/qc-parse.y
+++ b/tools/qfcc/source/qc-parse.y
@@ -2010,8 +2010,7 @@ optional_param_list
 	| ',' param_list			{ $$ = $2; }
 	| ',' param_list ',' ELLIPSIS
 		{
-			$$ = new_param (0, 0, 0);
-			$$->next = $2;
+			$$ = param_append_identifiers ($2, 0, 0);
 		}
 	;
 
diff --git a/tools/qfcc/test/methodparams.r b/tools/qfcc/test/methodparams.r
index b91322358..b29e6954b 100644
--- a/tools/qfcc/test/methodparams.r
+++ b/tools/qfcc/test/methodparams.r
@@ -15,3 +15,15 @@ typedef struct { int x, y; } Point;
 	[textContext mvvprintf: pos, fmt, @args];
 }
 @end
+id obj_msgSend (id receiver, SEL op, ...) = #0;
+void __obj_exec_class (struct obj_module *msg) = #0;
+@interface Object
+@end
+@implementation Object
+@end
+
+int
+main (void)
+{
+	return 0;		// to survive and prevail :)
+}

From bea64838cc3aac2519ce91ba8e317e57a6bfbd05 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 6 Mar 2020 17:25:19 +0900
Subject: [PATCH 0648/1519] [qwaq] Use new TextContext

Not quite right yet, but it worked first try (once I got another
compiler bug sorted).
---
 ruamoko/qwaq/qwaq-group.h       |  2 +-
 ruamoko/qwaq/qwaq-group.r       |  2 +-
 ruamoko/qwaq/qwaq-screen.h      |  2 --
 ruamoko/qwaq/qwaq-screen.r      | 26 ++++++---------------
 ruamoko/qwaq/qwaq-textcontext.h |  8 +++++--
 ruamoko/qwaq/qwaq-textcontext.r | 14 +++++++++++
 ruamoko/qwaq/qwaq-view.h        | 11 ++++++++-
 ruamoko/qwaq/qwaq-view.r        | 41 +++++++++++++++++++++++++++++++++
 ruamoko/qwaq/qwaq-window.r      | 22 +++++++++---------
 9 files changed, 91 insertions(+), 37 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-group.h b/ruamoko/qwaq/qwaq-group.h
index a5cf5635e..b599a0c36 100644
--- a/ruamoko/qwaq/qwaq-group.h
+++ b/ruamoko/qwaq/qwaq-group.h
@@ -31,7 +31,7 @@ typedef BOOL condition_func2 (id object, void *anObject, void *data);
 {
 	Array      *views;
 	int         focused;
-	struct window_s *window;
+	TextContext *buffer;
 }
 -insert: (View *) view;
 -remove: (View *) view;
diff --git a/ruamoko/qwaq/qwaq-group.r b/ruamoko/qwaq/qwaq-group.r
index c25c6b9ee..6b8296182 100644
--- a/ruamoko/qwaq/qwaq-group.r
+++ b/ruamoko/qwaq/qwaq-group.r
@@ -116,7 +116,7 @@ not_dont_draw (id aView, void *aGroup)
 	Group      *group = (Group *) aGroup;
 	if (!(view.options & ofDontDraw)) {
 		if (!view.textContext) {
-			view.textContext = group.window;
+			view.textContext = group.buffer;
 		}
 		return YES;
 	}
diff --git a/ruamoko/qwaq/qwaq-screen.h b/ruamoko/qwaq/qwaq-screen.h
index e92daa2a4..c51910d0e 100644
--- a/ruamoko/qwaq/qwaq-screen.h
+++ b/ruamoko/qwaq/qwaq-screen.h
@@ -11,8 +11,6 @@
 +(Screen *) screen;
 -handleEvent: (qwaq_event_t *) event;
 -setBackground: (int) ch;
--printf: (string) fmt, ...;
--addch: (int) ch atX: (int) x Y: (int) y;
 @end
 
 #endif//__qwaq_screen_h
diff --git a/ruamoko/qwaq/qwaq-screen.r b/ruamoko/qwaq/qwaq-screen.r
index 7b7a9c9cd..e34ddb7c9 100644
--- a/ruamoko/qwaq/qwaq-screen.r
+++ b/ruamoko/qwaq/qwaq-screen.r
@@ -13,14 +13,8 @@
 	if (!(self = [super initWithRect:getwrect (stdscr)])) {
 		return nil;
 	}
-	textContext = stdscr;
-	scrollok (textContext, 1);
-	return self;
-}
-
--setBackground: (int) ch
-{
-	wbkgd (textContext, ch);
+	textContext = [TextContext screen];
+	[textContext scrollok: 1];
 	return self;
 }
 
@@ -36,27 +30,21 @@
 -draw
 {
 	update_panels ();
-	doupdate ();
+	[TextContext doupdate];
 	return self;
 }
 
 -redraw
 {
 	update_panels ();
-	wrefresh(textContext);
-	doupdate ();
+	[textContext refresh];
+	[TextContext doupdate];
 	return self;
 }
 
--printf: (string) fmt, ...
+-setBackground: (int) ch
 {
-	wvprintf (textContext, fmt, @args);
-	return self;
-}
-
--addch: (int) ch atX: (int) x Y: (int) y
-{
-	mvwaddch(textContext, x, y, ch);
+	[textContext bkgd:ch];
 	return self;
 }
 
diff --git a/ruamoko/qwaq/qwaq-textcontext.h b/ruamoko/qwaq/qwaq-textcontext.h
index 8cd20d74f..952814f08 100644
--- a/ruamoko/qwaq/qwaq-textcontext.h
+++ b/ruamoko/qwaq/qwaq-textcontext.h
@@ -17,16 +17,20 @@
 + (void) move: (Point) pos;
 + (void) curs_set: (int) visibility;
 + (void) doupdate;
++ (TextContext *) screen;
 
 -init;
 -initWithRect: (Rect) rect;
 -initWithWindow: (window_t) window;
-- (void) mvprintf: (Point) pos, string fmt, ...;
+
+-(window_t) window;
+
 - (void) printf: (string) fmt, ...;
 - (void) vprintf: (string) mft, @va_list args;
+- (void) mvprintf: (Point) pos, string fmt, ...;
 - (void) mvvprintf: (Point) pos, string mft, @va_list args;
-- (void) refresh;
 - (void) mvaddch: (Point) pos, int ch;
+- (void) refresh;
 - (void) bkgd: (int) ch;
 - (void) scrollok: (int) flag;
 - (void) border: (box_sides_t) sides, box_corners_t corners;
diff --git a/ruamoko/qwaq/qwaq-textcontext.r b/ruamoko/qwaq/qwaq-textcontext.r
index 43c8f9320..f38947773 100644
--- a/ruamoko/qwaq/qwaq-textcontext.r
+++ b/ruamoko/qwaq/qwaq-textcontext.r
@@ -17,6 +17,15 @@
 + (void) curs_set: (int) visibility = #0;
 + (void) doupdate = #0;
 
+static TextContext *screen;
++ (TextContext *) screen
+{
+	if (!screen) {
+		screen = [[TextContext alloc] init];
+	}
+	return screen;
+}
+
 - init
 {
 	if (!(self = [super init])) {
@@ -45,6 +54,11 @@
 	return self;
 }
 
+-(window_t) window
+{
+	return window;
+}
+
 - (void) mvprintf: (Point) pos, string fmt, ... = #0;
 - (void) printf: (string) fmt, ... = #0;
 - (void) vprintf: (string) mft, @va_list args = #0;
diff --git a/ruamoko/qwaq/qwaq-view.h b/ruamoko/qwaq/qwaq-view.h
index a168268af..0f8727128 100644
--- a/ruamoko/qwaq/qwaq-view.h
+++ b/ruamoko/qwaq/qwaq-view.h
@@ -6,6 +6,7 @@
 
 #include "qwaq-draw.h"
 #include "qwaq-rect.h"
+#include "qwaq-textcontext.h"
 
 @class Group;
 
@@ -44,7 +45,7 @@ enum {
 	Rect        absRect;
 	Point       point;		// can't be local :(
 	Group      *owner;
-	struct window_s *textContext;	//FIXME separate class
+	TextContext *textContext;
 	int         state;
 	int         options;
 	int         cursorState;
@@ -56,6 +57,14 @@ enum {
 -(struct Rect_s *)getRect;
 -draw;
 -redraw;
+
+- (void) refresh;
+- (void) printf: (string) fmt, ...;
+- (void) vprintf: (string) fmt, @va_list args;
+//- (void) addch: (int) ch;
+- (void) mvprintf: (Point) pos, string fmt, ...;
+- (void) mvvprintf: (Point) pos, string fmt, @va_list args;
+- (void) mvaddch: (Point) pos, int ch;
 @end
 
 #endif//__qwaq_view_h
diff --git a/ruamoko/qwaq/qwaq-view.r b/ruamoko/qwaq/qwaq-view.r
index 6b6f3e80d..f5297c1e7 100644
--- a/ruamoko/qwaq/qwaq-view.r
+++ b/ruamoko/qwaq/qwaq-view.r
@@ -105,6 +105,47 @@ updateScreenCursor (View *view)
 	return &rect;
 }
 
+- (void) printf: (string) fmt, ...
+{
+	[textContext vprintf: fmt, @args];
+}
+
+- (void) vprintf: (string) fmt, @va_list args
+{
+	[textContext vprintf: fmt, args];
+}
+
+- (void) refresh
+{
+	[textContext refresh];
+}
+/*
+- (void) addch: (int) ch
+{
+	[textContext addch:ch];
+}*/
+
+- (void) mvprintf: (Point) pos, string fmt, ...
+{
+	pos.x += xpos;
+	pos.y += ypos;
+	[textContext mvvprintf: pos, fmt, @args];
+}
+
+- (void) mvvprintf: (Point) pos, string fmt, @va_list args
+{
+	pos.x += xpos;
+	pos.y += ypos;
+	[textContext mvvprintf: pos, fmt, args];
+}
+
+- (void) mvaddch: (Point) pos, int ch
+{
+	pos.x += xpos;
+	pos.y += ypos;
+	[textContext mvaddch: pos, ch];
+}
+
 @end
 
 Rect getwrect (window_t window) = #0;
diff --git a/ruamoko/qwaq/qwaq-window.r b/ruamoko/qwaq/qwaq-window.r
index 45e8c4a77..3cee19d48 100644
--- a/ruamoko/qwaq/qwaq-window.r
+++ b/ruamoko/qwaq/qwaq-window.r
@@ -18,8 +18,8 @@
 		return nil;
 	}
 	self.rect = rect;
-	window = create_window (xpos, ypos, xlen, ylen);
-	panel = create_panel (window);
+	buffer = [[TextContext alloc] initWithRect: rect];
+	panel = create_panel ([buffer window]);
 	return self;
 }
 
@@ -69,7 +69,7 @@
 
 -setBackground: (int) ch
 {
-	wbkgd (window, ch);
+	[buffer bkgd: ch];
 	return self;
 }
 
@@ -90,24 +90,24 @@
 		}
 	}
 	[super draw];
-	int x = 1, y = 1;
-	wborder (window, box_sides, box_corners);
+	[buffer border: box_sides, box_corners];
+	Point pos = { 1, 1 };
 	//for (int i = ACS_ULCORNER; i <= ACS_STERLING; i++) {
 	for (int i = 32; i <= 127; i++) {
 		int ch = acs_char (i);
 		if (ch) {
-			mvwaddch (window, x, y, ch);
+			[buffer mvaddch: pos, ch];
 		} else {
-			mvwaddch (window, x, y, '.');
+			[buffer mvaddch: pos, '.'];
 		}
-		if (++x > 32) {
-			x = 1;
-			if (++y >= ylen) {
+		if (++pos.x > 32) {
+			pos.x = 1;
+			if (++pos.y >= ylen) {
 				break;
 			}
 		}
 	}
-	wrefresh (window);
+	[buffer refresh];
 	return self;
 }
 

From d0a249590cfc29c07fc28918e753f2135de54616 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 6 Mar 2020 17:45:58 +0900
Subject: [PATCH 0649/1519] [qwaq] Use self where possible for drawing in
 Window

---
 ruamoko/qwaq/qwaq-window.r | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-window.r b/ruamoko/qwaq/qwaq-window.r
index 3cee19d48..53bf92d66 100644
--- a/ruamoko/qwaq/qwaq-window.r
+++ b/ruamoko/qwaq/qwaq-window.r
@@ -19,6 +19,7 @@
 	}
 	self.rect = rect;
 	buffer = [[TextContext alloc] initWithRect: rect];
+	textContext = buffer;
 	panel = create_panel ([buffer window]);
 	return self;
 }
@@ -96,9 +97,9 @@
 	for (int i = 32; i <= 127; i++) {
 		int ch = acs_char (i);
 		if (ch) {
-			[buffer mvaddch: pos, ch];
+			[self mvaddch: pos, ch];
 		} else {
-			[buffer mvaddch: pos, '.'];
+			[self mvaddch: pos, '.'];
 		}
 		if (++pos.x > 32) {
 			pos.x = 1;
@@ -107,7 +108,7 @@
 			}
 		}
 	}
-	[buffer refresh];
+	[self refresh];
 	return self;
 }
 

From 9a96a9b2c990bd8b88dec2bd411473b69cb8df54 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 6 Mar 2020 17:46:36 +0900
Subject: [PATCH 0650/1519] [qwaq] Use own version of positional drawing in
 Window

Double offsetting the prints doesn't quite look right ;)
---
 ruamoko/qwaq/qwaq-window.r | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/ruamoko/qwaq/qwaq-window.r b/ruamoko/qwaq/qwaq-window.r
index 53bf92d66..23d919648 100644
--- a/ruamoko/qwaq/qwaq-window.r
+++ b/ruamoko/qwaq/qwaq-window.r
@@ -127,4 +127,19 @@
 {
 	return [owner redraw];
 }
+
+- (void) mvprintf: (Point) pos, string fmt, ...
+{
+	[textContext mvvprintf: pos, fmt, @args];
+}
+
+- (void) mvvprintf: (Point) pos, string fmt, @va_list args
+{
+	[textContext mvvprintf: pos, fmt, args];
+}
+
+- (void) mvaddch: (Point) pos, int ch
+{
+	[textContext mvaddch: pos, ch];
+}
 @end

From b8b74fc07467d6c1f5a60e0fc73695dd15c3d52c Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 6 Mar 2020 17:57:33 +0900
Subject: [PATCH 0651/1519] [qwaq] Implement missing addch

I either forgot about it, or just didn't need it at the time, but I'm
sure it will be useful later when more stuff is implemented.
---
 ruamoko/qwaq/qwaq-curses.c      | 48 ++++++++++++++++++++++++++++++++-
 ruamoko/qwaq/qwaq-curses.h      |  1 +
 ruamoko/qwaq/qwaq-textcontext.h |  1 +
 ruamoko/qwaq/qwaq-textcontext.r |  2 ++
 ruamoko/qwaq/qwaq-view.h        |  2 +-
 ruamoko/qwaq/qwaq-view.r        |  4 +--
 6 files changed, 54 insertions(+), 4 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-curses.c b/ruamoko/qwaq/qwaq-curses.c
index f625f80ec..8b218dfad 100644
--- a/ruamoko/qwaq/qwaq-curses.c
+++ b/ruamoko/qwaq/qwaq-curses.c
@@ -72,6 +72,7 @@ typedef enum qwaq_commands_e {
 	qwaq_cmd_mvwaddstr,
 	qwaq_cmd_waddstr,
 	qwaq_cmd_mvwaddch,
+	qwaq_cmd_waddch,
 	qwaq_cmd_wrefresh,
 	qwaq_cmd_init_pair,
 	qwaq_cmd_wbkgd,
@@ -532,6 +533,16 @@ cmd_mvwaddch (qwaq_resources_t *res)
 	mvwaddch (window->win, y, x, ch);
 }
 
+static void
+cmd_waddch (qwaq_resources_t *res)
+{
+	int         window_id = RB_PEEK_DATA (res->command_queue, 2);
+	int         ch = RB_PEEK_DATA (res->command_queue, 3);
+
+	window_t   *window = get_window (res, __FUNCTION__, window_id);
+	waddch (window->win, ch);
+}
+
 static void
 cmd_wrefresh (qwaq_resources_t *res)
 {
@@ -665,6 +676,9 @@ process_commands (qwaq_resources_t *res)
 			case qwaq_cmd_mvwaddch:
 				cmd_mvwaddch (res);
 				break;
+			case qwaq_cmd_waddch:
+				cmd_waddch (res);
+				break;
 			case qwaq_cmd_wrefresh:
 				cmd_wrefresh (res);
 				break;
@@ -1102,6 +1116,27 @@ bi_wvprintf (progs_t *pr)
 	qwaq_wvprintf (pr, window_id, fmt, args);
 }
 
+static void
+qwaq_waddch (progs_t *pr, int window_id, int ch)
+{
+	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
+
+	if (get_window (res, __FUNCTION__, window_id)) {
+		int         command[] = { qwaq_cmd_waddch, 0, window_id, ch };
+
+		command[1] = CMD_SIZE(command);
+		qwaq_submit_command (res, command);
+	}
+}
+static void
+bi_waddch (progs_t *pr)
+{
+	int         window_id = P_INT (pr, 0);
+	int         ch = P_INT (pr, 0);
+
+	qwaq_waddch (pr, window_id, ch);
+}
+
 static void
 qwaq_mvwvprintf (progs_t *pr, int window_id, int x, int y,
 				 const char *fmt, pr_va_list_t *args)
@@ -1451,7 +1486,7 @@ bi_i_TextContext__printf_ (progs_t *pr)
 }
 
 static void
-bi_i_TextContext__vprintf_ (progs_t *pr)
+bi_i_TextContext__addch_ (progs_t *pr)
 {
 	int         window_id = P_STRUCT (pr, qwaq_textcontext_t, 0).window;
 	const char *fmt = P_GSTRING (pr, 2);
@@ -1460,6 +1495,15 @@ bi_i_TextContext__vprintf_ (progs_t *pr)
 	qwaq_wvprintf (pr, window_id, fmt, args);
 }
 
+static void
+bi_i_TextContext__vprintf_ (progs_t *pr)
+{
+	int         window_id = P_STRUCT (pr, qwaq_textcontext_t, 0).window;
+	int         ch = P_INT (pr, 1);
+
+	qwaq_waddch (pr, window_id, ch);
+}
+
 static void
 bi_i_TextContext__mvvprintf_ (progs_t *pr)
 {
@@ -1551,6 +1595,7 @@ static builtin_t builtins[] = {
 	{"wvprintf",		bi_wvprintf,		-1},
 	{"mvwvprintf",		bi_mvwvprintf,		-1},
 	{"mvwaddch",		bi_mvwaddch,		-1},
+	{"waddch",			bi_waddch,			-1},
 	{"wrefresh",		bi_wrefresh,		-1},
 	{"get_event",		bi_get_event,		-1},
 	{"max_colors",		bi_max_colors,		-1},
@@ -1574,6 +1619,7 @@ static builtin_t builtins[] = {
 	{"_i_TextContext__mvprintf_",		bi_i_TextContext__mvprintf_,	   -1},
 	{"_i_TextContext__printf_",			bi_i_TextContext__printf_,		   -1},
 	{"_i_TextContext__vprintf_",		bi_i_TextContext__vprintf_,		   -1},
+	{"_i_TextContext__addch_",			bi_i_TextContext__addch_,		   -1},
 	{"_i_TextContext__mvvprintf_",		bi_i_TextContext__mvvprintf_,	   -1},
 	{"_i_TextContext__refresh",			bi_i_TextContext__refresh,		   -1},
 	{"_i_TextContext__mvaddch_",		bi_i_TextContext__mvaddch_,		   -1},
diff --git a/ruamoko/qwaq/qwaq-curses.h b/ruamoko/qwaq/qwaq-curses.h
index aa9d2456d..16cd4fe4e 100644
--- a/ruamoko/qwaq/qwaq-curses.h
+++ b/ruamoko/qwaq/qwaq-curses.h
@@ -94,6 +94,7 @@ typedef struct panel_s *panel_t;
 						 string fmt, @va_list args);
 @extern void wrefresh (window_t win);
 @extern void mvwaddch (window_t win, int x, int y, int ch);
+@extern void waddch (window_t win, int ch);
 
 @extern panel_t create_panel (window_t window);
 @extern void destroy_panel (panel_t panel);
diff --git a/ruamoko/qwaq/qwaq-textcontext.h b/ruamoko/qwaq/qwaq-textcontext.h
index 952814f08..4a47b16ca 100644
--- a/ruamoko/qwaq/qwaq-textcontext.h
+++ b/ruamoko/qwaq/qwaq-textcontext.h
@@ -27,6 +27,7 @@
 
 - (void) printf: (string) fmt, ...;
 - (void) vprintf: (string) mft, @va_list args;
+- (void) addch: (int) ch;
 - (void) mvprintf: (Point) pos, string fmt, ...;
 - (void) mvvprintf: (Point) pos, string mft, @va_list args;
 - (void) mvaddch: (Point) pos, int ch;
diff --git a/ruamoko/qwaq/qwaq-textcontext.r b/ruamoko/qwaq/qwaq-textcontext.r
index f38947773..59b54fb6a 100644
--- a/ruamoko/qwaq/qwaq-textcontext.r
+++ b/ruamoko/qwaq/qwaq-textcontext.r
@@ -62,6 +62,7 @@ static TextContext *screen;
 - (void) mvprintf: (Point) pos, string fmt, ... = #0;
 - (void) printf: (string) fmt, ... = #0;
 - (void) vprintf: (string) mft, @va_list args = #0;
+- (void) addch: (int) ch = #0;
 - (void) mvvprintf: (Point) pos, string mft, @va_list args = #0;
 - (void) refresh = #0;
 - (void) mvaddch: (Point) pos, int ch = #0;
@@ -82,6 +83,7 @@ void wvprintf (window_t win, string fmt, @va_list args) = #0;
 void mvwvprintf (window_t win, int x, int y, string fmt, @va_list args) = #0;
 void wrefresh (window_t win) = #0;
 void mvwaddch (window_t win, int x, int y, int ch) = #0;
+void waddch (window_t win, int ch) = #0;
 int get_event (qwaq_event_t *event) = #0;
 int max_colors (void) = #0;
 int max_color_pairs (void) = #0;
diff --git a/ruamoko/qwaq/qwaq-view.h b/ruamoko/qwaq/qwaq-view.h
index 0f8727128..10e0c93ae 100644
--- a/ruamoko/qwaq/qwaq-view.h
+++ b/ruamoko/qwaq/qwaq-view.h
@@ -61,7 +61,7 @@ enum {
 - (void) refresh;
 - (void) printf: (string) fmt, ...;
 - (void) vprintf: (string) fmt, @va_list args;
-//- (void) addch: (int) ch;
+- (void) addch: (int) ch;
 - (void) mvprintf: (Point) pos, string fmt, ...;
 - (void) mvvprintf: (Point) pos, string fmt, @va_list args;
 - (void) mvaddch: (Point) pos, int ch;
diff --git a/ruamoko/qwaq/qwaq-view.r b/ruamoko/qwaq/qwaq-view.r
index f5297c1e7..541012a47 100644
--- a/ruamoko/qwaq/qwaq-view.r
+++ b/ruamoko/qwaq/qwaq-view.r
@@ -119,11 +119,11 @@ updateScreenCursor (View *view)
 {
 	[textContext refresh];
 }
-/*
+
 - (void) addch: (int) ch
 {
 	[textContext addch:ch];
-}*/
+}
 
 - (void) mvprintf: (Point) pos, string fmt, ...
 {

From 1250fe7446c5f2a676285ccf18f9b53844143083 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 6 Mar 2020 18:29:16 +0900
Subject: [PATCH 0652/1519] [qwaq] Use a log file instead of stderr

Now I don't have to worry about remembering to redirect the output, but
debugging is still easy.
---
 ruamoko/qwaq/qwaq-curses.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-curses.c b/ruamoko/qwaq/qwaq-curses.c
index 8b218dfad..15746b5e6 100644
--- a/ruamoko/qwaq/qwaq-curses.c
+++ b/ruamoko/qwaq/qwaq-curses.c
@@ -1630,11 +1630,13 @@ static builtin_t builtins[] = {
 	{0}
 };
 
+static FILE *logfile;
+
 static __attribute__((format(printf, 1, 0))) void
 qwaq_print (const char *fmt, va_list args)
 {
-	vfprintf (stderr, fmt, args);
-	fflush (stderr);
+	vfprintf (logfile, fmt, args);
+	fflush (logfile);
 }
 
 void
@@ -1650,5 +1652,6 @@ BI_Init (progs_t *pr)
 	PR_Resources_Register (pr, "qwaq", res, bi_qwaq_clear);
 	PR_RegisterBuiltins (pr, builtins);
 	Sys_RegisterShutdown (bi_shutdown);
+	logfile = fopen ("qwaq-curses.log", "wt");
 	Sys_SetStdPrintf (qwaq_print);
 }

From 07e6baf32f66fa372a90b88321f1b6386c1d38c1 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 6 Mar 2020 20:32:37 +0900
Subject: [PATCH 0653/1519] [qfcc] Support { } as nil in nested initializers

Did top-level earlier, but forgot to add support for deeper nestings.
---
 tools/qfcc/source/def.c      |  5 ++++-
 tools/qfcc/source/qc-parse.y | 21 +++++++++++++++++----
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/tools/qfcc/source/def.c b/tools/qfcc/source/def.c
index 93152b6db..cf36912bf 100644
--- a/tools/qfcc/source/def.c
+++ b/tools/qfcc/source/def.c
@@ -450,7 +450,10 @@ init_elements (struct def_s *def, expr_t *eles)
 			if (element->expr) {
 				c = constant_expr (element->expr);
 			} else {
-				c = convert_nil (new_nil_expr (), type);
+				c = new_nil_expr ();
+			}
+			if (c->type == ex_nil) {
+				c = convert_nil (c, type);
 			}
 			append_expr (local_expr, assign_expr (unary_expr ('.', ptr), c));
 		}
diff --git a/tools/qfcc/source/qc-parse.y b/tools/qfcc/source/qc-parse.y
index 93f4aeea9..ba266c512 100644
--- a/tools/qfcc/source/qc-parse.y
+++ b/tools/qfcc/source/qc-parse.y
@@ -1148,7 +1148,8 @@ opt_initializer
 
 var_initializer
 	: '=' expr									{ $$ = $2; }
-	| '=' '{' element_list optional_comma '}'	{ $$ = $3; }
+	| '=' '{'									{ $<spec>$ = $<spec>-1; }
+	  element_list optional_comma '}'			{ $$ = $4; }
 	| '=' '{' '}'
 		{
 			if (is_scalar ($<spec>-1.type)) {
@@ -1169,14 +1170,26 @@ element_list
 			$$ = new_block_expr ();
 			append_expr ($$, $1);
 		}
-	| element_list ',' element
+	| element_list ',' {$<spec>$ = $<spec>0; } element
 		{
-			append_expr ($$, $3);
+			append_expr ($$, $4);
 		}
 	;
 
 element
-	: '{' element_list optional_comma '}'		{ $$ = $2; }
+	: '{'										{ $<spec>$ = $<spec>0; }
+	  element_list optional_comma '}'			{ $$ = $3; }
+	| '{' '}'
+		{
+			// FIXME doesn't check the right type (does prove the inherited
+			// attributes have been passed down correctly though). The problem
+			// is that the type of the sub elements needs to be extracted if
+			// possible
+			if (is_scalar ($<spec>0.type)) {
+				error (0, "empty scalar initializer");
+			}
+			$$ = new_nil_expr ();
+		}
 	| expr										{ $$ = $1; }
 	;
 

From 9dbc81432a8212ca19b5106bd23c6657e7743e77 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 6 Mar 2020 20:33:47 +0900
Subject: [PATCH 0654/1519] [qfcc] Use full type for differentiating values

This fixes the problem of using nil for two different compound types
within the one expression. The problem is all compound types have the
same low-level type (ev_invalid) and this caused the two different nils
to have the same type when taken back up to expression level.
---
 tools/qfcc/source/value.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/qfcc/source/value.c b/tools/qfcc/source/value.c
index fc2024a57..97198268c 100644
--- a/tools/qfcc/source/value.c
+++ b/tools/qfcc/source/value.c
@@ -80,7 +80,7 @@ static uintptr_t
 value_get_hash (const void *_val, void *unused)
 {
 	const ex_value_t *val = (const ex_value_t *) _val;
-	return Hash_Buffer (&val->v, sizeof (val->v)) + val->lltype;
+	return Hash_Buffer (&val->v, sizeof (val->v)) ^ (uintptr_t) val->type;
 }
 
 static int
@@ -88,7 +88,7 @@ value_compare (const void *_val1, const void *_val2, void *unused)
 {
 	const ex_value_t *val1 = (const ex_value_t *) _val1;
 	const ex_value_t *val2 = (const ex_value_t *) _val2;
-	if (val1->lltype != val2->lltype)
+	if (val1->type != val2->type)
 		return 0;
 	return memcmp (&val1->v, &val2->v, sizeof (val1->v)) == 0;
 }

From de06efa6047a682e10ee9c45ef868b7b3f1e7715 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 6 Mar 2020 20:38:40 +0900
Subject: [PATCH 0655/1519] [qfcc] Fix handling of nil for static initializers

nil is most definitely constant.
---
 tools/qfcc/source/def.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tools/qfcc/source/def.c b/tools/qfcc/source/def.c
index cf36912bf..3f2f1c838 100644
--- a/tools/qfcc/source/def.c
+++ b/tools/qfcc/source/def.c
@@ -463,7 +463,10 @@ init_elements (struct def_s *def, expr_t *eles)
 			if (element->expr) {
 				c = constant_expr (element->expr);
 			} else {
-				c = convert_nil (new_nil_expr (), element->type);
+				c = new_nil_expr ();
+			}
+			if (c->type == ex_nil) {
+				c = convert_nil (c, element->type);
 			}
 			dummy.offset = def->offset + element->offset;
 			g = D_POINTER (pr_type_t, &dummy);

From f0ecf7b30a776d6ec6f50c3e168a304d776d4ace Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 6 Mar 2020 20:43:38 +0900
Subject: [PATCH 0656/1519] [qwaq] Clean out log file with make clean

---
 ruamoko/qwaq/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ruamoko/qwaq/Makefile.am b/ruamoko/qwaq/Makefile.am
index cf71f7590..bf8c2c9b8 100644
--- a/ruamoko/qwaq/Makefile.am
+++ b/ruamoko/qwaq/Makefile.am
@@ -80,4 +80,4 @@ am--depfiles: $(am__depfiles_remade) $(r_depfiles_remade)
 
 EXTRA_PROGRAMS=qwaq-curses qwaq-x11
 EXTRA_DIST=$(qwaq_dat_src) qwaq.h
-CLEANFILES= *.dat *.sym
+CLEANFILES= *.dat *.sym qwaq-curses.log

From f7757cf894a357681d008c5ee6af650f6df99356 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 6 Mar 2020 21:05:53 +0900
Subject: [PATCH 0657/1519] [qfcc] Add filename to dot output

It makes things so much easier when viewing the graphs
---
 tools/qfcc/source/dot_dag.c    | 1 +
 tools/qfcc/source/dot_expr.c   | 1 +
 tools/qfcc/source/dot_flow.c   | 1 +
 tools/qfcc/source/dot_sblock.c | 1 +
 4 files changed, 4 insertions(+)

diff --git a/tools/qfcc/source/dot_dag.c b/tools/qfcc/source/dot_dag.c
index bf0e26c63..e954f75d3 100644
--- a/tools/qfcc/source/dot_dag.c
+++ b/tools/qfcc/source/dot_dag.c
@@ -176,6 +176,7 @@ dot_dump_dag (void *_dag, const char *filename)
 	dstring_t  *dstr = dstring_newstr();
 
 	dasprintf (dstr, "digraph dag_%p {\n", dag);
+	dasprintf (dstr, "  graph [label=\"%s\"];\n", quote_string (filename));
 	dasprintf (dstr, "  layout=dot;\n");
 	dasprintf (dstr, "  clusterrank=local;\n");
 	dasprintf (dstr, "  rankdir=TB;\n");
diff --git a/tools/qfcc/source/dot_expr.c b/tools/qfcc/source/dot_expr.c
index 081dbecec..f8601c6ff 100644
--- a/tools/qfcc/source/dot_expr.c
+++ b/tools/qfcc/source/dot_expr.c
@@ -551,6 +551,7 @@ dump_dot_expr (void *_e, const char *filename)
 	expr_t     *e = (expr_t *) _e;
 
 	dasprintf (dstr, "digraph expr_%p {\n", e);
+	dasprintf (dstr, "  graph [label=\"%s\"];\n", quote_string (filename));
 	dasprintf (dstr, "  layout=dot; rankdir=TB; compound=true;\n");
 	_print_expr (dstr, e, 0, ++id, 0);
 	dasprintf (dstr, "}\n");
diff --git a/tools/qfcc/source/dot_flow.c b/tools/qfcc/source/dot_flow.c
index d702f7b9e..68f043d98 100644
--- a/tools/qfcc/source/dot_flow.c
+++ b/tools/qfcc/source/dot_flow.c
@@ -332,6 +332,7 @@ print_flowgraph (flow_dot_t *method, flowgraph_t *graph, const char *filename)
 	dstring_t  *dstr = dstring_newstr();
 
 	dasprintf (dstr, "digraph flowgraph_%s_%p {\n", method->type, graph);
+	dasprintf (dstr, "  graph [label=\"%s\"];\n", quote_string (filename));
 	dasprintf (dstr, "  layout=dot;\n");
 	dasprintf (dstr, "  clusterrank=local;\n");
 	dasprintf (dstr, "  rankdir=TB;\n");
diff --git a/tools/qfcc/source/dot_sblock.c b/tools/qfcc/source/dot_sblock.c
index 72b245efe..26e32681e 100644
--- a/tools/qfcc/source/dot_sblock.c
+++ b/tools/qfcc/source/dot_sblock.c
@@ -128,6 +128,7 @@ print_sblock (sblock_t *sblock, const char *filename)
 	dstring_t  *dstr = dstring_newstr();
 
 	dasprintf (dstr, "digraph sblock_%p {\n", sblock);
+	dasprintf (dstr, "  graph [label=\"%s\"];\n", quote_string (filename));
 	dasprintf (dstr, "  layout=dot; rankdir=TB;\n");
 	for (i = 0; sblock; sblock = sblock->next, i++)
 		flow_sblock (dstr, sblock, i);

From faa6eabfbe0fdf51fd983740f77e65aaae2702b7 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 6 Mar 2020 22:28:04 +0900
Subject: [PATCH 0658/1519] [qfcc] Add a failing test for struct init to param

This actually took a bit to reproduce.
---
 tools/qfcc/test/Makefile.am         | 10 ++++++++++
 tools/qfcc/test/struct-init-param.r | 30 +++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 tools/qfcc/test/struct-init-param.r

diff --git a/tools/qfcc/test/Makefile.am b/tools/qfcc/test/Makefile.am
index 7ea8e5c21..99c24142c 100644
--- a/tools/qfcc/test/Makefile.am
+++ b/tools/qfcc/test/Makefile.am
@@ -50,6 +50,7 @@ test_progs_dat=\
 	return-ivar.dat \
 	sendv.dat \
 	state.dat \
+	struct-init-param.dat \
 	struct-nil-init.dat \
 	structarray.dat \
 	structlive.dat \
@@ -322,6 +323,15 @@ state.run: Makefile build-run
 include ./$(DEPDIR)/state.Qo # am--include-marker
 r_depfiles_remade += ./$(DEPDIR)/state.Qo
 
+struct_init_param_dat_SOURCES=struct-init-param.r
+struct_init_param_obj=$(struct_init_param_dat_SOURCES:.r=.qfo)
+struct-init-param.dat$(EXEEXT): $(struct_init_param_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(struct_init_param_obj)
+struct-init-param.run: Makefile build-run
+	@$(srcdir)/build-run $@
+include ./$(DEPDIR)/struct-init-param.Qo # am--include-marker
+r_depfiles_remade += ./$(DEPDIR)/struct-init-param.Qo
+
 struct_nil_init_dat_SOURCES=struct-nil-init.r
 struct_nil_init_obj=$(struct_nil_init_dat_SOURCES:.r=.qfo)
 struct-nil-init.dat$(EXEEXT): $(struct_nil_init_obj) $(QFCC_DEP)
diff --git a/tools/qfcc/test/struct-init-param.r b/tools/qfcc/test/struct-init-param.r
new file mode 100644
index 000000000..8b166099e
--- /dev/null
+++ b/tools/qfcc/test/struct-init-param.r
@@ -0,0 +1,30 @@
+typedef struct {
+	int         x;
+	int         y;
+} Point;
+
+typedef struct {
+	int         width;
+	int         height;
+} Extent;
+
+typedef struct Rect_s {
+	Point       offset;
+	Extent      extent;
+} Rect;
+
+void *foo (void *obj, void *cmd, void *o, Point pos, Rect r)
+{
+	return obj;
+}
+
+void *bar (Rect *obj, void *cmd, void *o, Point pos)
+{
+	Rect rect = { {}, obj.extent };
+	return foo (obj, cmd, o, pos, rect);
+}
+
+int main (void)
+{
+	return 1;// don't want this to pass until I've checked the generated code
+}

From 48514ba2f3dd432371ed3325a46108ecd4f9bb19 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 7 Mar 2020 01:30:36 +0900
Subject: [PATCH 0659/1519] [qfcc] Create alias def for defs accessed via
 pointer

This the fixes the incorrect flow analysis caused by the def being seen
to have the wrong size (structure field of structure def seen through a
constant pointer). Fixes the ICE, but the pointer constant is broken
somewhere in dags, presumably.
---
 tools/qfcc/source/flow.c       | 4 +++-
 tools/qfcc/source/statements.c | 8 +++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/tools/qfcc/source/flow.c b/tools/qfcc/source/flow.c
index 995aa5b7d..aa05733e8 100644
--- a/tools/qfcc/source/flow.c
+++ b/tools/qfcc/source/flow.c
@@ -859,8 +859,10 @@ flow_analyze_statement (statement_t *s, set_t *use, set_t *def, set_t *kill,
 					&& s->opc->o.value->lltype == ev_pointer
 					&& s->opc->o.value->v.pointer.def) {
 					operand_t  *op;
+					def_t      *alias;
 					ex_pointer_t *ptr = &s->opc->o.value->v.pointer;
-					op = def_operand (ptr->def, ptr->type);
+					alias = alias_def (ptr->def, ptr->type, ptr->val);
+					op = def_operand (alias, ptr->type);
 					flow_add_op_var (def, op);
 					if (operands)
 						operands[0] = op;
diff --git a/tools/qfcc/source/statements.c b/tools/qfcc/source/statements.c
index 239c11f49..e29cedaa4 100644
--- a/tools/qfcc/source/statements.c
+++ b/tools/qfcc/source/statements.c
@@ -103,7 +103,13 @@ operand_string (operand_t *op)
 							   op->o.value->v.quaternion_val[2],
 							   op->o.value->v.quaternion_val[3]);
 				case ev_pointer:
-					return va ("ptr %d", op->o.value->v.pointer.val);
+					if (op->o.value->v.pointer.def) {
+						return va ("ptr %s+%d",
+								   op->o.value->v.pointer.def->name,
+								   op->o.value->v.pointer.val);
+					} else {
+						return va ("ptr %d", op->o.value->v.pointer.val);
+					}
 				case ev_field:
 					return va ("field %d", op->o.value->v.pointer.val);
 				case ev_entity:

From 6ada20f685fcf4d46dfd2e376d5dd91aa7ead93e Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 7 Mar 2020 02:06:33 +0900
Subject: [PATCH 0660/1519] [qfcc] Show offset for op_x_def_ofs relocs

---
 tools/qfcc/source/dump_globals.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/tools/qfcc/source/dump_globals.c b/tools/qfcc/source/dump_globals.c
index 657f016e8..157635f63 100644
--- a/tools/qfcc/source/dump_globals.c
+++ b/tools/qfcc/source/dump_globals.c
@@ -337,6 +337,8 @@ qfo_relocs (qfo_t *qfo)
 	qfo_reloc_t  *reloc;
 	qfo_def_t    *def;
 	qfo_func_t   *func;
+	int           opind;
+	dstatement_t *statement;
 	unsigned      i;
 
 	for (i = 0; i < qfo->num_relocs; i++) {
@@ -399,10 +401,13 @@ qfo_relocs (qfo_t *qfo)
 			case rel_op_b_def_ofs:
 			case rel_op_c_def_ofs:
 				def = qfo->defs + reloc->target;
-				printf (" op.%c@%x def#%d %s",
-						reloc->type - rel_op_a_def_ofs + 'a',
+				opind = reloc->type - rel_op_a_def_ofs;
+				statement = QFO_STATEMENT (qfo, reloc->offset);
+				printf (" op.%c@%x def#%d %s+%d",
+						opind + 'a',
 						reloc->offset, reloc->target,
-						QFO_GETSTR (qfo, def->name));
+						QFO_GETSTR (qfo, def->name),
+						((pr_ushort_t *)statement)[opind + 1]);
 				break;
 			case rel_def_def_ofs:
 				def = qfo->defs + reloc->target;

From 777ce56cf3090f7b32edec1dbdcbe3e47e8cf4ba Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 7 Mar 2020 17:48:19 +0900
Subject: [PATCH 0661/1519] [doc] Enable MathJax

Nice. Very nice.
---
 doc/quakeforge.dox.conf.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/quakeforge.dox.conf.in b/doc/quakeforge.dox.conf.in
index 3781f222a..a235a895d 100644
--- a/doc/quakeforge.dox.conf.in
+++ b/doc/quakeforge.dox.conf.in
@@ -1566,7 +1566,7 @@ FORMULA_TRANSPARENT    = YES
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-USE_MATHJAX            = NO
+USE_MATHJAX            = YES
 
 # When MathJax is enabled you can set the default output format to be used for
 # the MathJax output. See the MathJax site (see:

From e524db1fc116778859c4bb8cfa00e9b03956d523 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 8 Mar 2020 03:11:46 +0900
Subject: [PATCH 0662/1519] [qfcc] Set op type when aliasing a value

This fixes the ICE when attempting to compile address-cast without
optimization (just realized why, too: the assignment was optimized out
of existence).
---
 tools/qfcc/source/statements.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/qfcc/source/statements.c b/tools/qfcc/source/statements.c
index e29cedaa4..2f2d0a07d 100644
--- a/tools/qfcc/source/statements.c
+++ b/tools/qfcc/source/statements.c
@@ -890,6 +890,7 @@ expr_alias (sblock_t *sblock, expr_t *e, operand_t **op)
 	type = e->e.expr.type;
 	sblock = statement_subexpr (sblock, e->e.expr.e1, &aop);
 	if (type_compatible (aop->type, type)) {
+		//FIXME type_compatible??? shouldn't that be type_size ==?
 		if (offset) {
 			internal_error (e, "offset alias of same size type");
 		}
@@ -924,6 +925,7 @@ expr_alias (sblock_t *sblock, expr_t *e, operand_t **op)
 		*op = def_operand (alias_def (def, type, offset), 0);
 	} else if (aop->op_type == op_value) {
 		*op = value_operand (aop->o.value);
+		(*op)->type = type;
 	} else {
 		internal_error (e, "invalid alias target: %s: %s",
 						optype_str (aop->op_type), operand_string (aop));

From 2b15e61b28f5c56429115e570788e8b7b8c3ef9f Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 8 Mar 2020 03:33:01 +0900
Subject: [PATCH 0663/1519] [qfcc] Remove obsolete structure fields

init_vars hasn't been used for a long time.
---
 tools/qfcc/include/flow.h | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/tools/qfcc/include/flow.h b/tools/qfcc/include/flow.h
index b4cc48cf5..515c207d1 100644
--- a/tools/qfcc/include/flow.h
+++ b/tools/qfcc/include/flow.h
@@ -84,12 +84,6 @@ typedef struct flownode_s {
 		struct set_s *in;
 		struct set_s *out;
 	}           live_vars;
-	struct {
-		struct set_s *use;
-		struct set_s *def;
-		struct set_s *in;
-		struct set_s *out;
-	}           init_vars;
 	struct sblock_s *sblock;	///< original statement block
 	struct dag_s *dag;			///< dag for this node
 } flownode_t;

From f56de00c2103692fbdcb480415eec4b02181b934 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 8 Mar 2020 03:38:45 +0900
Subject: [PATCH 0664/1519] [qfcc] Rename a field

depth_first is much clearer than dfo. I had to check what dfo meant too
many times in one night.
---
 tools/qfcc/include/flow.h |  2 +-
 tools/qfcc/source/flow.c  | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/tools/qfcc/include/flow.h b/tools/qfcc/include/flow.h
index 515c207d1..f57fd3c37 100644
--- a/tools/qfcc/include/flow.h
+++ b/tools/qfcc/include/flow.h
@@ -96,7 +96,7 @@ typedef struct flowgraph_s {
 	flowedge_t *edges;			///< array of all edges in the graph
 	int         num_edges;
 	struct set_s *dfst;			///< edges in the depth-first search tree
-	int        *dfo;			///< depth-first order of nodes
+	int        *depth_first;	///< depth-first order of nodes
 	flowloop_t *loops;			///< linked list of natural loops
 } flowgraph_t;
 
diff --git a/tools/qfcc/source/flow.c b/tools/qfcc/source/flow.c
index aa05733e8..3f1f37151 100644
--- a/tools/qfcc/source/flow.c
+++ b/tools/qfcc/source/flow.c
@@ -148,8 +148,8 @@ delete_graph (flowgraph_t *graph)
 		free (graph->edges);
 	if (graph->dfst)
 		set_delete (graph->dfst);
-	if (graph->dfo)
-		free (graph->dfo);
+	if (graph->depth_first)
+		free (graph->depth_first);
 	FREE (graphs, graph);
 }
 
@@ -541,7 +541,7 @@ flow_reaching_defs (flowgraph_t *graph)
 		changed = 0;
 		// flow down the graph
 		for (i = 0; i < graph->num_nodes; i++) {
-			node = graph->nodes[graph->dfo[i]];
+			node = graph->nodes[graph->depth_first[i]];
 			in = node->reaching_defs.in;
 			out = node->reaching_defs.out;
 			gen = node->reaching_defs.gen;
@@ -626,7 +626,7 @@ flow_live_vars (flowgraph_t *graph)
 		// flow UP the graph because live variable analysis uses information
 		// from a node's successors rather than its predecessors.
 		for (j = graph->num_nodes - 1; j >= 0; j--) {
-			node = graph->nodes[graph->dfo[j]];
+			node = graph->nodes[graph->depth_first[j]];
 			set_empty (tmp);
 			for (succ = set_first (node->successors); succ;
 				 succ = set_next (succ))
@@ -718,7 +718,7 @@ flow_uninitialized (flowgraph_t *graph)
 	defs = set_new ();
 
 	for (i = 0; i < graph->num_nodes; i++) {
-		node = graph->nodes[graph->dfo[i]];
+		node = graph->nodes[graph->depth_first[i]];
 		set_empty (defs);
 		// collect definitions of all variables "used" in this node. use from
 		// the live vars analysis is perfect for the job
@@ -1177,7 +1177,7 @@ df_search (flowgraph_t *graph, set_t *visited, int *i, int n)
 		}
 	}
 	node->dfn = --*i;
-	graph->dfo[node->dfn] = n;
+	graph->depth_first[node->dfn] = n;
 }
 
 static void
@@ -1190,11 +1190,11 @@ flow_build_dfst (flowgraph_t *graph)
 	set_add (visited, graph->num_nodes);
 	set_add (visited, graph->num_nodes + 1);
 
-	if (graph->dfo)
-		free (graph->dfo);
+	if (graph->depth_first)
+		free (graph->depth_first);
 	if (graph->dfst)
 		set_delete (graph->dfst);
-	graph->dfo = calloc (graph->num_nodes, sizeof (int));
+	graph->depth_first = calloc (graph->num_nodes, sizeof (int));
 	graph->dfst = set_new ();
 	i = graph->num_nodes;
 	df_search (graph, visited, &i, 0);

From d44d956038698da9e02562e1452a430052199b00 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 8 Mar 2020 03:39:24 +0900
Subject: [PATCH 0665/1519] [qfcc] Remove a long dead function

---
 tools/qfcc/source/flow.c | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/tools/qfcc/source/flow.c b/tools/qfcc/source/flow.c
index 3f1f37151..f7e144663 100644
--- a/tools/qfcc/source/flow.c
+++ b/tools/qfcc/source/flow.c
@@ -210,18 +210,6 @@ flowvar_is_local (flowvar_t *var)
 {
 	return !(flowvar_is_global (var) || flowvar_is_param (var));
 }
-#if 0
-static int
-flowvar_is_initialized (flowvar_t *var)
-{
-	def_t      *def;
-
-	if (var->op->op_type != op_def)
-		return 0;
-	def = var->op->o.def;
-	return def->initialized;
-}
-#endif
 flowvar_t *
 flow_get_var (operand_t *op)
 {

From 7338689146f5e588460fa90196b0520b9d91699f Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 8 Mar 2020 03:42:18 +0900
Subject: [PATCH 0666/1519] [qfcc] Treat offset real tempops as an error

tempops always have an offset field, but only those that are aliases
should ever have a non-zero offset.
---
 tools/qfcc/source/flow.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/qfcc/source/flow.c b/tools/qfcc/source/flow.c
index f7e144663..526aadbcd 100644
--- a/tools/qfcc/source/flow.c
+++ b/tools/qfcc/source/flow.c
@@ -271,6 +271,9 @@ get_temp_address (function_t *func, operand_t *op)
 		top->o.tempop.flowaddr = func->tmpaddr;
 		func->tmpaddr += top->size;
 	}
+	if (top->o.tempop.offset) {
+		internal_error (0, "real tempop with a non-zero offset");
+	}
 	op->o.tempop.flowaddr = top->o.tempop.flowaddr + op->o.tempop.offset;
 	return op->o.tempop.flowaddr;
 }

From 809c103fd1f6b856b8a788adacdddbbedf10c677 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 8 Mar 2020 03:46:52 +0900
Subject: [PATCH 0667/1519] [qfcc] Shuffle some code around to be clearer

Doing the same thing at the end of two branches of an if/else seems off.

And doing an associative(?) set operation every time through a loop is
wasteful.
---
 tools/qfcc/source/flow.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/tools/qfcc/source/flow.c b/tools/qfcc/source/flow.c
index 526aadbcd..d5288616a 100644
--- a/tools/qfcc/source/flow.c
+++ b/tools/qfcc/source/flow.c
@@ -458,12 +458,11 @@ flow_kill_aliases (set_t *kill, flowvar_t *var, const set_t *uninit)
 	if (op->op_type == op_temp) {
 		tempop_visit_all (&op->o.tempop, 1, flow_tempop_kill_aliases_visit,
 						  tmp);
-		set_difference (tmp, uninit);
 	} else if (op->op_type == op_def) {
 		def_visit_all (op->o.def, 1, flow_def_kill_aliases_visit, tmp);
-		// don't allow aliases to kill definitions in the entry dummy block
-		set_difference (tmp, uninit);
 	}
+	// don't allow aliases to kill definitions in the entry dummy block
+	set_difference (tmp, uninit);
 	// merge the alias kills with the current def's kills
 	set_union (kill, tmp);
 }
@@ -492,8 +491,8 @@ flow_reaching_defs (flowgraph_t *graph)
 	for (i = 0; i < graph->func->num_vars; i++) {
 		var = graph->func->vars[i];
 		set_union (uninit, var->define);// do not want alias handling here
-		set_difference (uninit, kill);	// remove any gens from the function
 	}
+	set_difference (uninit, kill);	// remove any gens from the function
 	graph->nodes[graph->num_nodes]->reaching_defs.out = uninit;
 	graph->nodes[graph->num_nodes]->reaching_defs.in = set_new ();
 	graph->nodes[graph->num_nodes]->reaching_defs.gen = set_new ();

From e4c87091a36c7a891f861fb4a5e4bb10c86fc798 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 8 Mar 2020 03:53:53 +0900
Subject: [PATCH 0668/1519] [qfcc] Lots of flow analysis docs

And some function shuffling for grouping. I'm not satisfied with the
docs, but they're a lot more helpful than they were.
---
 tools/qfcc/source/flow.c | 343 ++++++++++++++++++++++++++++++++-------
 1 file changed, 283 insertions(+), 60 deletions(-)

diff --git a/tools/qfcc/source/flow.c b/tools/qfcc/source/flow.c
index d5288616a..0a29ff16d 100644
--- a/tools/qfcc/source/flow.c
+++ b/tools/qfcc/source/flow.c
@@ -57,11 +57,11 @@
 #include "symtab.h"
 #include "type.h"
 
-static flowvar_t *vars_freelist;
-static flowloop_t *loops_freelist;
-static flownode_t *nodes_freelist;
-static flowgraph_t *graphs_freelist;
+/// \addtogroup qfcc_flow
+///@{
 
+/**	Static operand definitions for the ever present return and parameter slots.
+ */
 static struct {
 	const char *name;
 	operand_t   op;
@@ -78,6 +78,17 @@ static struct {
 };
 static const int num_flow_params = sizeof(flow_params)/sizeof(flow_params[0]);
 
+/**	\name Flow analysis memory management */
+///@{
+static flowvar_t *vars_freelist;		///< flowvar pool
+static flowloop_t *loops_freelist;		///< flow loop pool
+static flownode_t *nodes_freelist;		///< flow node pool
+static flowgraph_t *graphs_freelist;	///< flow graph pool
+
+/**	Allocate a new flow var.
+ *
+ *	The var's use and define sets are initialized to empty.
+ */
 static flowvar_t *
 new_flowvar (void)
 {
@@ -88,6 +99,10 @@ new_flowvar (void)
 	return var;
 }
 
+/**	Allocate a new flow loop.
+ *
+ *	The loop's nodes set is initialized to the empty set.
+ */
 static flowloop_t *
 new_loop (void)
 {
@@ -97,6 +112,8 @@ new_loop (void)
 	return loop;
 }
 
+/** Free a flow loop and its nodes set.
+ */
 static void
 delete_loop (flowloop_t *loop)
 {
@@ -104,6 +121,10 @@ delete_loop (flowloop_t *loop)
 	FREE (loops, loop);
 }
 
+/**	Allocate a new flow node.
+ *
+ *	The node is completely empty.
+ */
 static flownode_t *
 new_node (void)
 {
@@ -112,6 +133,10 @@ new_node (void)
 	return node;
 }
 
+/**	Free a flow node and its resources.
+ *
+ *	\bug not global_vars or the vars and defs sets?
+ */
 static void
 delete_node (flownode_t *node)
 {
@@ -126,6 +151,10 @@ delete_node (flownode_t *node)
 	FREE (nodes, node);
 }
 
+/**	Allocate a new flow graph.
+ *
+ *	The graph is completely empty.
+ */
 static flowgraph_t *
 new_graph (void)
 {
@@ -134,6 +163,10 @@ new_graph (void)
 	return graph;
 }
 
+/**	Return a flow graph and its resources to the pools.
+ *
+ *	\bug except loops?
+ */
 static void __attribute__((unused))
 delete_graph (flowgraph_t *graph)
 {
@@ -152,7 +185,77 @@ delete_graph (flowgraph_t *graph)
 		free (graph->depth_first);
 	FREE (graphs, graph);
 }
+///@}
 
+/**	\name Flowvar classification */
+///@{
+/**	Check if the flowvar refers to a global variable.
+ *
+ *	For the flowvar to refer to a global variable, the flowvar's operand
+ *	must be a def operand (but the def itself may be an alias of the real def)
+ *	and the rel def must not have its def_t::local flag set. This means that
+ *	function-scope static variables are not considered local (ie, only
+ *	non-static function-scope variables and function parameters are considered
+ *	local (temp vars are local too, but are not represented by \a op_def)).
+ */
+static int
+flowvar_is_global (flowvar_t *var)
+{
+	def_t      *def;
+
+	if (var->op->op_type != op_def)
+		return 0;
+	def = var->op->o.def;
+	if (def->alias)
+		def = def->alias;
+	if (def->local)
+		return 0;
+	return 1;
+}
+
+/**	Check if the flowvar refers to a function parameter.
+ *
+ *	For the flowvar to refer to a function parameter, the flowvar's operand
+ *	must be a def operand (but the def itself may be an alias of the real def)
+ *	and the rel def must have both its def_t::local and def_t::param flags set.
+ *
+ *	Temp vars are are not represented by op_def, so no mistake can be made.
+ */
+static int
+flowvar_is_param (flowvar_t *var)
+{
+	def_t      *def;
+
+	if (var->op->op_type != op_def)
+		return 0;
+	def = var->op->o.def;
+	if (def->alias)
+		def = def->alias;
+	if (!def->local)
+		return 0;
+	if (!def->param)
+		return 0;
+	return 1;
+}
+
+/**	Check if the flowvar refers to a function parameter.
+ *
+ *	As this is simply "neither global nor pamam", all other flowvars are
+ *	considered local, in particular actual non-staic function scope variables
+ *	and temp vars.
+ */
+static int
+flowvar_is_local (flowvar_t *var)
+{
+	return !(flowvar_is_global (var) || flowvar_is_param (var));
+}
+///@}
+
+/**	Extract the def from a def or temp flowvar.
+ *
+ *	It is an error for the operand referenced by the flowvar to be anything
+ *	other than a real def or temp.
+ */
 static __attribute__((pure)) def_t *
 flowvar_get_def (flowvar_t *var)
 {
@@ -173,43 +276,13 @@ flowvar_get_def (flowvar_t *var)
 	return 0;
 }
 
-static int
-flowvar_is_global (flowvar_t *var)
-{
-	def_t      *def;
-
-	if (var->op->op_type != op_def)
-		return 0;
-	def = var->op->o.def;
-	if (def->alias)
-		def = def->alias;
-	if (def->local)
-		return 0;
-	return 1;
-}
-
-static int
-flowvar_is_param (flowvar_t *var)
-{
-	def_t      *def;
-
-	if (var->op->op_type != op_def)
-		return 0;
-	def = var->op->o.def;
-	if (def->alias)
-		def = def->alias;
-	if (!def->local)
-		return 0;
-	if (!def->param)
-		return 0;
-	return 1;
-}
-
-static int
-flowvar_is_local (flowvar_t *var)
-{
-	return !(flowvar_is_global (var) || flowvar_is_param (var));
-}
+/**	Get a def or temp var operand's flowvar.
+ *
+ *	Other operand types never have a flowvar.
+ *
+ *	If the operand does not yet have a flowvar, one is created and assigned
+ *	to the operand.
+ */
 flowvar_t *
 flow_get_var (operand_t *op)
 {
@@ -229,6 +302,12 @@ flow_get_var (operand_t *op)
 	return 0;
 }
 
+/**	Indicate whether the operand should be counted.
+ *
+ *	If the operand is a def or temp var operand, and it has not already been
+ *	counted, then it is counted, otherwise it is not.
+ *	\return		1 if the operand should be counted, 0 if not
+ */
 static int
 count_operand (operand_t *op)
 {
@@ -240,14 +319,15 @@ count_operand (operand_t *op)
 		return 0;
 
 	var = flow_get_var (op);
-	// flowvars are initialized with number == 0, and any global flowvar
-	// used by a function will always have a number >= 0 after flow analysis,
-	// and local flowvars will always be 0 before flow analysis, so use -1
-	// to indicate the variable has been counted.
-	//
-	// Also, since this is the beginning of flow analysis for this function,
-	// ensure the define/use sets for global vars are empty. However, as
-	// checking if a var is global is too much trouble, just clear them all.
+	/**	Flowvars are initialized with number == 0, and any global flowvar
+	 *	used by a function will always have a number >= 0 after flow analysis,
+	 *	and local flowvars will always be 0 before flow analysis, so use -1
+	 *	to indicate the variable has been counted.
+	 *
+	 *	Also, since this is the beginning of flow analysis for this function,
+	 *	ensure the define/use sets for global vars are empty. However, since
+	 *	checking if a var is global is too much trouble, just clear them all.
+	 */
 	if (var && var->number != -1) {
 		set_empty (var->use);
 		set_empty (var->define);
@@ -257,6 +337,22 @@ count_operand (operand_t *op)
 	return 0;
 }
 
+/**	Allocate flow analysis pseudo address space to a temporary variable.
+ *
+ *	If the operand already has an address allocated (flowvar_t::flowaddr is
+ *	not 0), then the already allocated address is returned.
+ *
+ *	If the operand refers to an alias, the alias chain is followed to the
+ *	actual temp var operand and the real temp var is allocated space if it
+ *	has not allready been alloced.
+ *
+ *	The operand is given the address of the real temp var operand plus whatever
+ *	offset the operand has.
+ *
+ *	Real temp var operands must have a zero offset.
+ *
+ *	The operand address is set in \a op and returned.
+ */
 static int
 get_temp_address (function_t *func, operand_t *op)
 {
@@ -278,6 +374,8 @@ get_temp_address (function_t *func, operand_t *op)
 	return op->o.tempop.flowaddr;
 }
 
+/**	Add an operand's flowvar to the function's list of variables.
+ */
 static void
 add_operand (function_t *func, operand_t *op)
 {
@@ -289,8 +387,15 @@ add_operand (function_t *func, operand_t *op)
 		return;
 
 	var = flow_get_var (op);
-	// If the flowvar number is still -1, then the flowvar has not yet been
-	// added to the list of variables referenced by the function.
+	/**	If the flowvar number is still -1, then the flowvar has not yet been
+	 *	added to the list of variables referenced by the function.
+	 *
+	 *	The flowvar's flowvar_t::number is set to its index in the function's
+	 *	list of flowvars.
+	 *
+	 *	Also, temp and local flowvars are assigned addresses from the flow
+	 *	analysys pseudo address space so partial accesses can be analyzed.
+	 */
 	if (var && var->number == -1) {
 		var->number = func->num_vars++;
 		var->op = op;
@@ -303,6 +408,8 @@ add_operand (function_t *func, operand_t *op)
 	}
 }
 
+/**	Create symbols and defs for params/return if not already available.
+ */
 static symbol_t *
 param_symbol (const char *name)
 {
@@ -313,6 +420,15 @@ param_symbol (const char *name)
 	return sym;
 }
 
+/**	Build an array of all the statements in a function.
+
+	The array exists so statements can be referenced by number and thus used
+	in sets.
+
+	The statement references in the array (function_t::statements) are in the
+	same order as they are within the statement blocks (function_t::sblock)
+	and with the blocks in the same order as the linked list of blocks.
+*/
 static void
 flow_build_statements (function_t *func)
 {
@@ -335,6 +451,48 @@ flow_build_statements (function_t *func)
 	}
 }
 
+/**	Build an array of all the variables used by a function
+ *
+ *	The array exists so variables can be referenced by number and thus used
+ *	in sets. However, because larger variables may be aliased by smaller types,
+ *	their representation is more complicated.
+ *
+ *	# Local variable representation
+ *	Defined local vars add their address in local space to the number of
+ *	statements in the function. Thus their flow analysis address in in the
+ *	range:
+ *
+ *		([num_statements ... num_statements+localsize])
+ *
+ *	with a set element in flowvar_t::define for each word used by the var.
+ *	That is, single word types (int, float, pointer, etc) have one element,
+ *	doubles have two adjacant elements, and vectors and quaternions have
+ *	three and four elements respectively (also adjacant). Structural types
+ *	(struct, union, array) have as many adjacant elements as their size
+ *	dictates.
+ *
+ *	Temporary vars are pseudo allocated and their addresses are added as
+ *	for normal local vars.
+ *
+ *	Note, however, that flowvar_t::define also includes real function
+ *	statements that assign to the variable.
+ *
+ *	# Pseudo Address Space
+ *	Temporary variables are _effectively_ local variables and thus will
+ *	be treated as such by the analizer in that their addresses and sizes
+ *	will be used to determine which and how many set elements to use.
+ *
+ *	However, at this stage, temporary variables do not have any address
+ *	space assigned to them because their lifetimes are generally limited
+ *	to a few statements and the memory used for the temp vars may be
+ *	recycled. Thus, give temp vars a pseudo address space just past the
+ *	address space used for source-defined local variables. As each temp
+ *	var is added to the analyzer, get_temp_address() assigns the temp var
+ *	an address using function_t::tmpaddr as a starting point.
+ *
+ *	add_operand() takes care of setting flowvar_t::flowaddr for both locals
+ *	and temps.
+ */
 static void
 flow_build_vars (function_t *func)
 {
@@ -371,6 +529,7 @@ flow_build_vars (function_t *func)
 	// set up pseudo address space for temp vars so accessing tmp vars
 	// though aliases analyses correctly
 	func->tmpaddr = func->num_statements + func->symtab->space->size;
+
 	func->num_vars = 0;	// incremented by add_operand
 	// first, add .return and .param_[0-7] as they are always needed
 	for (i = 0; i < num_flow_params; i++)
@@ -399,15 +558,8 @@ flow_build_vars (function_t *func)
 		if (flowvar_is_global (func->vars[i]))
 			set_add (func->global_vars, i);
 	}
-	// create dummy defs for local vars
-	// defined local vars add their address in local space to the number of
-	// statements in the function:
-	//     ([num_statements ... num_statements+localsize])
-	// with a set element for each def used in the local space
-	//
-	// temporary vars are pseudo allocated and their addresses are added as for
-	// locals
-	// add_operand takes care of setting flowaddr for both locals and temps
+	// Put the local varibals in their place (set var->defined to the addresses
+	// spanned by the var)
 	for (i = 0; i < func->num_vars; i++) {
 		int         j;
 
@@ -424,6 +576,8 @@ flow_build_vars (function_t *func)
 	set_delete (stdef);
 }
 
+/**	Add the tempop's spanned addresses to the kill set
+ */
 static int
 flow_tempop_kill_aliases_visit (tempop_t *tempop, void *_kill)
 {
@@ -435,6 +589,8 @@ flow_tempop_kill_aliases_visit (tempop_t *tempop, void *_kill)
 	return 0;
 }
 
+/**	Add the def's spanned addresses to the kill set
+ */
 static int
 flow_def_kill_aliases_visit (def_t *def, void *_kill)
 {
@@ -446,6 +602,13 @@ flow_def_kill_aliases_visit (def_t *def, void *_kill)
 	return 0;
 }
 
+/**	Add the flowvar's spanned addresses to the kill set
+ *
+ *	If the flowvar refers to an alias, then the real def/tempop and any
+ *	overlapping aliases are aslo killed.
+ *
+ *	However, other aliases cannot kill anything in the uninitialized set.
+ */
 static void
 flow_kill_aliases (set_t *kill, flowvar_t *var, const set_t *uninit)
 {
@@ -455,6 +618,7 @@ flow_kill_aliases (set_t *kill, flowvar_t *var, const set_t *uninit)
 	set_union (kill, var->define);
 	op = var->op;
 	tmp = set_new ();
+	// collect the kill sets from any aliases
 	if (op->op_type == op_temp) {
 		tempop_visit_all (&op->o.tempop, 1, flow_tempop_kill_aliases_visit,
 						  tmp);
@@ -467,6 +631,8 @@ flow_kill_aliases (set_t *kill, flowvar_t *var, const set_t *uninit)
 	set_union (kill, tmp);
 }
 
+/**	Compute reaching defs
+ */
 static void
 flow_reaching_defs (flowgraph_t *graph)
 {
@@ -484,15 +650,37 @@ flow_reaching_defs (flowgraph_t *graph)
 	flowvar_t  *var;
 
 	// First, create out for the entry dummy node using fake statement numbers.
+	//\f[ \bigcup\limits_{i=1}^{\infty} F_{i} \f]
+	//\f[ \bigcap\limits_{i=1}^{\infty} F_{i} \f]
+
+	/**	The dummy entry node reaching defs \a out set is initialized to:
+	 *	\f[ out_{reaching}=[\bigcup\limits_{v \in \{locals\}} define_{v}]
+	 *		\setminus \{statements\} \f]
+	 *	where {\a locals} is the set of local def and tempop flowvars (does
+	 *	not include parameters), \a define is the set of addresses spanned
+	 *	by the flowvar (see flow_build_vars()) (XXX along with statement
+	 *	gens), and {\a statements} is the set of all statements in the
+	 *	function (ensures the \a out set does not include any initializers in
+	 *	the code nodes).
+	 *
+	 *	All other entry node sets are initialized to empty.
+	 */
+	// kill represents the set of all statements in the function
 	kill = set_new ();
 	for (i = 0; i < graph->func->num_statements; i++)
 		set_add (kill, i);
+	// uninit
 	uninit = set_new ();
 	for (i = 0; i < graph->func->num_vars; i++) {
 		var = graph->func->vars[i];
 		set_union (uninit, var->define);// do not want alias handling here
 	}
+	/**	Any possible gens from the function code are removed from the
+	 *	\a uninit set (which becomes the \a out set of the entry node's
+	 *	reaching defs) in order to prevent them leaking into the real nodes.
+	 */
 	set_difference (uninit, kill);	// remove any gens from the function
+	// initialize the reaching defs sets in the entry node
 	graph->nodes[graph->num_nodes]->reaching_defs.out = uninit;
 	graph->nodes[graph->num_nodes]->reaching_defs.in = set_new ();
 	graph->nodes[graph->num_nodes]->reaching_defs.gen = set_new ();
@@ -555,6 +743,8 @@ flow_reaching_defs (flowgraph_t *graph)
 	set_delete (stkill);
 }
 
+/**	Update the node's \a use set from the statement's \a use set
+ */
 static void
 live_set_use (set_t *stuse, set_t *use, set_t *def)
 {
@@ -563,6 +753,8 @@ live_set_use (set_t *stuse, set_t *use, set_t *def)
 	set_union (use, stuse);
 }
 
+/**	Update the node's \a def set from the statement's \a def set
+ */
 static void
 live_set_def (set_t *stdef, set_t *use, set_t *def)
 {
@@ -1240,6 +1432,35 @@ flow_make_node (sblock_t *sblock, int id, function_t *func)
 	return node;
 }
 
+/**	Build the flow graph for the function.
+ *
+ *	In addition to the nodes create by the statement blocks, there are two
+ *	dummy blocks:
+ *
+ *	\dot
+ *	digraph flow_build_graph {
+ *		layout = dot; rankdir = TB; compound =true; nodesp = 1.0;
+ *		dummy_entry [shape=box,label="entry"];
+ *		sblock0 [label="code"]; sblock1 [label="code"];
+ *		sblock2 [label="code"]; sblock3 [label="code"];
+ *		dummy_exit [shape=box,label="exit"];
+ *		dummy_entry -> sblock0; sblock0 -> sblock1;
+ *		sblock1 -> sblock2; sblock2 -> sblock1;
+ *		sblock2 -> dummy_exit; sblock1 -> sblock3;
+ *		sblock3 -> dummy_exit;
+ *	}
+ *	\enddot
+ *
+ *	The entry block is used for detecting use of uninitialized local variables
+ *	and the exit block is used for ensuring global variables are treated as
+ *	live at function exit.
+ *
+ *	The exit block, which also is empty of statements, has its live vars
+ *	\a use set initilized to the set of global defs, which are simply numbered
+ *	by their index in the functions list of flowvars. All other exit node sets
+ *	are initialized to empty.
+ *	\f[ use_{live}=globals \f]
+ */
 static flowgraph_t *
 flow_build_graph (function_t *func)
 {
@@ -1303,3 +1524,5 @@ flow_data_flow (function_t *func)
 	flow_cleanup_dags (graph);
 	func->sblock = flow_generate (graph);
 }
+
+///@}

From c2ed6d41bd368f0ef6ee3a4d6a42c401a61200a0 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 8 Mar 2020 03:55:08 +0900
Subject: [PATCH 0669/1519] [qfcc] Finish struct-init-param test

When the bug is fixed, it will pass now (does without optimization).
---
 tools/qfcc/test/struct-init-param.r | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/tools/qfcc/test/struct-init-param.r b/tools/qfcc/test/struct-init-param.r
index 8b166099e..1b3bc9e7a 100644
--- a/tools/qfcc/test/struct-init-param.r
+++ b/tools/qfcc/test/struct-init-param.r
@@ -1,3 +1,4 @@
+void printf (string fmt, ...) = #0;
 typedef struct {
 	int         x;
 	int         y;
@@ -13,18 +14,31 @@ typedef struct Rect_s {
 	Extent      extent;
 } Rect;
 
-void *foo (void *obj, void *cmd, void *o, Point pos, Rect r)
-{
-	return obj;
-}
+void *foo (Rect *obj, void *cmd, Rect *o, Point pos, Rect r);
 
-void *bar (Rect *obj, void *cmd, void *o, Point pos)
+void *bar (Rect *obj, void *cmd, Rect *o, Point pos)
 {
 	Rect rect = { {}, obj.extent };
 	return foo (obj, cmd, o, pos, rect);
 }
 
+void *foo (Rect *obj, void *cmd, Rect *o, Point pos, Rect r)
+{
+	*o = r;
+	return obj;
+}
+
+Rect obj = { { 1, 2}, { 3, 4} };
+Rect o = { { 5, 6}, {7, 8} };
+
 int main (void)
 {
-	return 1;// don't want this to pass until I've checked the generated code
+	int         ret = 1;
+	bar(&obj, nil, &o, obj.offset);
+	printf ("%d %d %d %d\n", o.offset.x, o.offset.y,
+			o.extent.width, o.extent.height);
+	if (o.offset.x == 0 && o.offset.y == 0
+		&& o.extent.width == 3 && o.extent.height == 4)
+		ret = 0;
+	return ret;
 }

From b2faca16a7393d728ee0d2543ce84a249b381c2d Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 8 Mar 2020 12:08:56 +0900
Subject: [PATCH 0670/1519] [qfcc] Rename the kill alias functions

Having "visit" in the name felt redundant in the end.
---
 tools/qfcc/source/flow.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/tools/qfcc/source/flow.c b/tools/qfcc/source/flow.c
index 0a29ff16d..897e853e4 100644
--- a/tools/qfcc/source/flow.c
+++ b/tools/qfcc/source/flow.c
@@ -579,7 +579,7 @@ flow_build_vars (function_t *func)
 /**	Add the tempop's spanned addresses to the kill set
  */
 static int
-flow_tempop_kill_aliases_visit (tempop_t *tempop, void *_kill)
+flow_tempop_kill_aliases (tempop_t *tempop, void *_kill)
 {
 	set_t      *kill = (set_t *) _kill;
 	flowvar_t  *var;
@@ -592,7 +592,7 @@ flow_tempop_kill_aliases_visit (tempop_t *tempop, void *_kill)
 /**	Add the def's spanned addresses to the kill set
  */
 static int
-flow_def_kill_aliases_visit (def_t *def, void *_kill)
+flow_def_kill_aliases (def_t *def, void *_kill)
 {
 	set_t      *kill = (set_t *) _kill;
 	flowvar_t  *var;
@@ -620,10 +620,9 @@ flow_kill_aliases (set_t *kill, flowvar_t *var, const set_t *uninit)
 	tmp = set_new ();
 	// collect the kill sets from any aliases
 	if (op->op_type == op_temp) {
-		tempop_visit_all (&op->o.tempop, 1, flow_tempop_kill_aliases_visit,
-						  tmp);
+		tempop_visit_all (&op->o.tempop, 1, flow_tempop_kill_aliases, tmp);
 	} else if (op->op_type == op_def) {
-		def_visit_all (op->o.def, 1, flow_def_kill_aliases_visit, tmp);
+		def_visit_all (op->o.def, 1, flow_def_kill_aliases, tmp);
 	}
 	// don't allow aliases to kill definitions in the entry dummy block
 	set_difference (tmp, uninit);

From a2f203c840ea551ca3ed3c41d217a96df7278990 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 8 Mar 2020 12:10:12 +0900
Subject: [PATCH 0671/1519] [qfcc] Correct a comment

There's a world of difference between "any" and "only".
---
 tools/qfcc/include/def.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/qfcc/include/def.h b/tools/qfcc/include/def.h
index df0104178..d06b5961a 100644
--- a/tools/qfcc/include/def.h
+++ b/tools/qfcc/include/def.h
@@ -293,7 +293,7 @@ int def_size (def_t *def) __attribute__((pure));
 	function will return.
 
 	\param def		The def representing the alias cluster to visit.
-	\param overlap  If non-zero, then only defs that overlap \a def will
+	\param overlap  If non-zero, then any defs that overlap \a def will
 					be visited. If 2, then the given def must fully overlap
 					the visited def.
 	\param visit	The function to call when visiting a def. The first

From 8696e76a25c6bcfbff1f5e263d6d847e98a3382a Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 8 Mar 2020 12:11:53 +0900
Subject: [PATCH 0672/1519] [qfcc] Handle aliases when setting use and def

As expected, this does not fix the mangled pointer problem in
struct-init-param.r, but it does improve the ud-chains. There's still a
problem with .return, but it's handling in flow_analyze_statement is a
bit "special" :P.
---
 tools/qfcc/source/flow.c | 80 ++++++++++++++++++++++++++++------------
 1 file changed, 57 insertions(+), 23 deletions(-)

diff --git a/tools/qfcc/source/flow.c b/tools/qfcc/source/flow.c
index 897e853e4..5ff1c9662 100644
--- a/tools/qfcc/source/flow.c
+++ b/tools/qfcc/source/flow.c
@@ -541,7 +541,12 @@ flow_build_vars (function_t *func)
 		flow_analyze_statement (s, 0, 0, 0, operands);
 		for (j = 0; j < 4; j++)
 			add_operand (func, operands[j]);
-
+	}
+	// and set the use/def sets for the vars (has to be a separate pass
+	// because the allias handling reqruires the flow address to be valid
+	// (ie, not -1)
+	for (i = 0; i < func->num_statements; i++) {
+		s = func->statements[i];
 		flow_analyze_statement (s, stuse, stdef, 0, 0);
 		for (var_i = set_first (stdef); var_i; var_i = set_next (var_i)) {
 			var = func->vars[var_i->element];
@@ -977,16 +982,45 @@ flow_generate (flowgraph_t *graph)
 	return code;
 }
 
+static int
+flow_tempop_add_aliases (tempop_t *tempop, void *_set)
+{
+	set_t      *set = (set_t *) _set;
+	flowvar_t  *var;
+	var = tempop->flowvar;
+	if (var)
+		set_add (set, var->number);
+	return 0;
+}
+
+static int
+flow_def_add_aliases (def_t *def, void *_set)
+{
+	set_t      *set = (set_t *) _set;
+	flowvar_t  *var;
+	var = def->flowvar;
+	if (var)
+		set_add (set, var->number);
+	return 0;
+}
+
 static void
-flow_add_op_var (set_t *set, operand_t *op)
+flow_add_op_var (set_t *set, operand_t *op, int is_use)
 {
 	flowvar_t  *var;
+	int         ol = is_use ? 2 : 1;
 
 	if (!set)
 		return;
 	if (!(var = flow_get_var (op)))
 		return;
 	set_add (set, var->number);
+
+	if (op->op_type == op_temp) {
+		tempop_visit_all (&op->o.tempop, ol, flow_tempop_add_aliases, set);
+	} else {
+		def_visit_all (op->o.def, ol, flow_def_add_aliases, set);
+	}
 }
 
 void
@@ -1010,10 +1044,10 @@ flow_analyze_statement (statement_t *s, set_t *use, set_t *def, set_t *kill,
 		case st_none:
 			internal_error (s->expr, "not a statement");
 		case st_expr:
-			flow_add_op_var (def, s->opc);
-			flow_add_op_var (use, s->opa);
+			flow_add_op_var (def, s->opc, 0);
+			flow_add_op_var (use, s->opa, 1);
 			if (s->opb)
-				flow_add_op_var (use, s->opb);
+				flow_add_op_var (use, s->opb, 1);
 			if (operands) {
 				operands[0] = s->opc;
 				operands[1] = s->opa;
@@ -1021,8 +1055,8 @@ flow_analyze_statement (statement_t *s, set_t *use, set_t *def, set_t *kill,
 			}
 			break;
 		case st_assign:
-			flow_add_op_var (def, s->opb);
-			flow_add_op_var (use, s->opa);
+			flow_add_op_var (def, s->opb, 0);
+			flow_add_op_var (use, s->opa, 1);
 			if (operands) {
 				operands[0] = s->opb;
 				operands[1] = s->opa;
@@ -1030,12 +1064,12 @@ flow_analyze_statement (statement_t *s, set_t *use, set_t *def, set_t *kill,
 			break;
 		case st_ptrassign:
 		case st_move:
-			flow_add_op_var (use, s->opa);
-			flow_add_op_var (use, s->opb);
+			flow_add_op_var (use, s->opa, 1);
+			flow_add_op_var (use, s->opb, 1);
 			if (!strcmp (s->opcode, "<MOVE>")) {
-				flow_add_op_var (def, s->opc);
+				flow_add_op_var (def, s->opc, 0);
 			} else if (!strcmp (s->opcode, "<MOVEP>")) {
-				flow_add_op_var (use, s->opc);
+				flow_add_op_var (use, s->opc, 0);
 				if (s->opc->op_type == op_value
 					&& s->opc->o.value->lltype == ev_pointer
 					&& s->opc->o.value->v.pointer.def) {
@@ -1044,7 +1078,7 @@ flow_analyze_statement (statement_t *s, set_t *use, set_t *def, set_t *kill,
 					ex_pointer_t *ptr = &s->opc->o.value->v.pointer;
 					alias = alias_def (ptr->def, ptr->type, ptr->val);
 					op = def_operand (alias, ptr->type);
-					flow_add_op_var (def, op);
+					flow_add_op_var (def, op, 0);
 					if (operands)
 						operands[0] = op;
 					else
@@ -1055,7 +1089,7 @@ flow_analyze_statement (statement_t *s, set_t *use, set_t *def, set_t *kill,
 				}
 			} else {
 				if (s->opc)
-					flow_add_op_var (use, s->opc);
+					flow_add_op_var (use, s->opc, 1);
 			}
 			if (kill) {
 				set_everything (kill);
@@ -1070,10 +1104,10 @@ flow_analyze_statement (statement_t *s, set_t *use, set_t *def, set_t *kill,
 			}
 			break;
 		case st_state:
-			flow_add_op_var (use, s->opa);
-			flow_add_op_var (use, s->opb);
+			flow_add_op_var (use, s->opa, 1);
+			flow_add_op_var (use, s->opb, 1);
 			if (s->opc)
-				flow_add_op_var (use, s->opc);
+				flow_add_op_var (use, s->opc, 1);
 			//FIXME entity members
 			if (operands) {
 				operands[1] = s->opa;
@@ -1084,7 +1118,7 @@ flow_analyze_statement (statement_t *s, set_t *use, set_t *def, set_t *kill,
 		case st_func:
 			if (strcmp (s->opcode, "<RETURN>") == 0
 				|| strcmp (s->opcode, "<DONE>") == 0) {
-				flow_add_op_var (use, s->opa);
+				flow_add_op_var (use, s->opa, 1);
 			} else if (strcmp (s->opcode, "<RETURN_V>") == 0) {
 				if (use)
 					set_add (use, 0);		//FIXME assumes .return location
@@ -1092,14 +1126,14 @@ flow_analyze_statement (statement_t *s, set_t *use, set_t *def, set_t *kill,
 			if (strncmp (s->opcode, "<CALL", 5) == 0) {
 				start = 0;
 				calln = s->opcode[5] - '0';
-				flow_add_op_var (use, s->opa);
+				flow_add_op_var (use, s->opa, 1);
 			} else if (strncmp (s->opcode, "<RCALL", 6) == 0) {
 				start = 2;
 				calln = s->opcode[6] - '0';
-				flow_add_op_var (use, s->opa);
-				flow_add_op_var (use, s->opb);
+				flow_add_op_var (use, s->opa, 1);
+				flow_add_op_var (use, s->opb, 1);
 				if (s->opc)
-					flow_add_op_var (use, s->opc);
+					flow_add_op_var (use, s->opc, 1);
 			}
 			if (calln >= 0) {
 				if (use) {
@@ -1117,9 +1151,9 @@ flow_analyze_statement (statement_t *s, set_t *use, set_t *def, set_t *kill,
 			break;
 		case st_flow:
 			if (strcmp (s->opcode, "<GOTO>") != 0) {
-				flow_add_op_var (use, s->opa);
+				flow_add_op_var (use, s->opa, 1);
 				if (strcmp (s->opcode, "<JUMPB>") == 0)
-					flow_add_op_var (use, s->opb);
+					flow_add_op_var (use, s->opb, 1);
 			}
 			if (operands) {
 				operands[1] = s->opa;

From b81d58c795fcc95176b9a9f65a00fdf8ed0e7ee8 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 8 Mar 2020 14:58:57 +0900
Subject: [PATCH 0673/1519] Revert "[qfcc] Correct a comment"

This reverts commit a2f203c840ea551ca3ed3c41d217a96df7278990.

There is indeed a world of difference between "any" and "only", and it
helps if I read the rest of the docs AND the code :P.
---
 tools/qfcc/include/def.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/qfcc/include/def.h b/tools/qfcc/include/def.h
index d06b5961a..df0104178 100644
--- a/tools/qfcc/include/def.h
+++ b/tools/qfcc/include/def.h
@@ -293,7 +293,7 @@ int def_size (def_t *def) __attribute__((pure));
 	function will return.
 
 	\param def		The def representing the alias cluster to visit.
-	\param overlap  If non-zero, then any defs that overlap \a def will
+	\param overlap  If non-zero, then only defs that overlap \a def will
 					be visited. If 2, then the given def must fully overlap
 					the visited def.
 	\param visit	The function to call when visiting a def. The first

From d9d321f65b1281e302afab531d15e9c68cf4304a Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 8 Mar 2020 15:40:07 +0900
Subject: [PATCH 0674/1519] [qfcc] Check for previous errors in vector exprs

Fixes a segfault when one of the expressions used to construct the
vector was the result of an error.
---
 tools/qfcc/source/expr.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index c82585674..7b9721be4 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -659,15 +659,23 @@ new_vector_list (expr_t *e)
 		case 3:
 			// quaternion or vector. all expressions must be compatible with
 			// a float (ie, a scalar)
-			for (t = e; t; t = t->next)
-				if (!is_scalar (get_type (t)))
+			for (t = e; t; t = t->next) {
+				if (t->type == ex_error) {
+					return t;
+				}
+				if (!is_scalar (get_type (t))) {
 					return error (t, "invalid type for vector element");
+				}
+			}
 			vec = new_expr ();
 			vec->type = ex_vector;
 			vec->e.vector.type = type;
 			vec->e.vector.list = e;
 			break;
 		case 2:
+			if (e->type == ex_error || e->next->type == ex_error) {
+				return e;
+			}
 			if (is_scalar (get_type (e)) && is_scalar (get_type (e->next))) {
 				// scalar, scalar
 				// expand [x, y] to [x, y, 0]

From 695b3ba0d043633db22410dddeaf3a2bcc9d50c7 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 8 Mar 2020 16:50:39 +0900
Subject: [PATCH 0675/1519] [qfcc] Rearrange vecexpr.r for easier debugging

Putting the most likely function to have problems at the top reduces
break-point shenanigans.
---
 tools/qfcc/test/vecexpr.r | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/tools/qfcc/test/vecexpr.r b/tools/qfcc/test/vecexpr.r
index 8667b0c93..0365ed589 100644
--- a/tools/qfcc/test/vecexpr.r
+++ b/tools/qfcc/test/vecexpr.r
@@ -1,4 +1,14 @@
 #include "test-harness.h"
+
+vector t1();
+vector t2(float x);
+
+vector
+t3(float x)
+{
+	return [x, t2(9).z, x] * 2;
+}
+
 vector
 t1()
 {
@@ -11,12 +21,6 @@ t2(float x)
 	return [x, x, x];
 }
 
-vector
-t3(float x)
-{
-	return [x, t2(9).z, x] * 2;
-}
-
 int
 main ()
 {

From 035da472ecd39b19e1745e068ddab8bfef2abc08 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 8 Mar 2020 16:51:01 +0900
Subject: [PATCH 0676/1519] [qfcc] Offset alias tempop offsets

Alias tempop offsets are relative to the real tempop. This fixes alias
tempops never overlapping the real tempop.
---
 tools/qfcc/source/statements.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tools/qfcc/source/statements.c b/tools/qfcc/source/statements.c
index 2f2d0a07d..61ab35c5e 100644
--- a/tools/qfcc/source/statements.c
+++ b/tools/qfcc/source/statements.c
@@ -362,6 +362,12 @@ tempop_overlap (tempop_t *t1, tempop_t *t2)
 	int         size1 = type_size (t1->type);
 	int         size2 = type_size (t2->type);
 
+	if (t1->alias) {
+		offs1 += t1->alias->o.tempop.offset;
+	}
+	if (t2->alias) {
+		offs2 += t2->alias->o.tempop.offset;
+	}
 	if (offs1 <= offs2 && offs1 + size1 >= offs2 + size2)
 		return 2;	// t1 fully overlaps t2
 	if (offs1 < offs2 + size2 && offs2 < offs1 + size1)

From 3d9410c66dcca13a23b6cc5500aa2690a8090ce4 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 8 Mar 2020 16:53:28 +0900
Subject: [PATCH 0677/1519] [qfcc] Force overlap to 0 for non-alias def/temops

Make the code behave as intended: visiting all aliases when starting
with the real def/tempop regardless of the overlap setting.
---
 tools/qfcc/source/def.c        | 2 ++
 tools/qfcc/source/statements.c | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/tools/qfcc/source/def.c b/tools/qfcc/source/def.c
index 3f2f1c838..865ef4066 100644
--- a/tools/qfcc/source/def.c
+++ b/tools/qfcc/source/def.c
@@ -807,6 +807,8 @@ def_visit_all (def_t *def, int overlap,
 		def = def->alias;
 		if ((ret = visit (def, data)))
 			return ret;
+	} else {
+		overlap = 0;
 	}
 	for (def = def->alias_defs; def; def = def->next) {
 		if (def == start_def)
diff --git a/tools/qfcc/source/statements.c b/tools/qfcc/source/statements.c
index 61ab35c5e..0ba4d1e21 100644
--- a/tools/qfcc/source/statements.c
+++ b/tools/qfcc/source/statements.c
@@ -393,6 +393,8 @@ tempop_visit_all (tempop_t *tempop, int overlap,
 		tempop = &top->o.tempop;
 		if ((ret = visit (tempop, data)))
 			return ret;
+	} else {
+		overlap = 0;
 	}
 	for (top = tempop->alias_ops; top; top = top->next) {
 		if (top->op_type != op_temp) {

From 5020966be32693032ab7a864bc2f020b306975e4 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 8 Mar 2020 16:57:12 +0900
Subject: [PATCH 0678/1519] [qfcc] Fix ud-chain alias handling

That was a fair bit trickier than I thought, but now .return and .paramN
are handled correctly, too, especially taking call instructions into
account (they can "kill" all 9 defs).
---
 tools/qfcc/source/flow.c | 55 +++++++++++++++++++++++++++++++++-------
 1 file changed, 46 insertions(+), 9 deletions(-)

diff --git a/tools/qfcc/source/flow.c b/tools/qfcc/source/flow.c
index 5ff1c9662..4ee42e214 100644
--- a/tools/qfcc/source/flow.c
+++ b/tools/qfcc/source/flow.c
@@ -99,6 +99,16 @@ new_flowvar (void)
 	return var;
 }
 
+/**	Delete a flow var
+ */
+static void
+delete_flowvar (flowvar_t *var)
+{
+	set_delete (var->use);
+	set_delete (var->define);
+	FREE (vars, var);
+}
+
 /**	Allocate a new flow loop.
  *
  *	The loop's nodes set is initialized to the empty set.
@@ -507,7 +517,16 @@ flow_build_vars (function_t *func)
 
 	// first, count .return and .param_[0-7] as they are always needed
 	for (i = 0; i < num_flow_params; i++) {
-		flow_params[i].op.o.def = param_symbol (flow_params[i].name)->s.def;
+		def_t      *def = param_symbol (flow_params[i].name)->s.def;
+		def_t      *a;
+		for (a = def->alias_defs; a; a = a->next) {
+			if (a->flowvar) {
+				delete_flowvar (a->flowvar);
+				a->flowvar = 0;
+			}
+			//free_def (def->alias_defs);
+		}
+		flow_params[i].op.o.def = def;
 		num_vars += count_operand (&flow_params[i].op);
 	}
 	// then run through the statements in the function looking for accessed
@@ -630,7 +649,9 @@ flow_kill_aliases (set_t *kill, flowvar_t *var, const set_t *uninit)
 		def_visit_all (op->o.def, 1, flow_def_kill_aliases, tmp);
 	}
 	// don't allow aliases to kill definitions in the entry dummy block
-	set_difference (tmp, uninit);
+	if (uninit) {
+		set_difference (tmp, uninit);
+	}
 	// merge the alias kills with the current def's kills
 	set_union (kill, tmp);
 }
@@ -1008,7 +1029,7 @@ static void
 flow_add_op_var (set_t *set, operand_t *op, int is_use)
 {
 	flowvar_t  *var;
-	int         ol = is_use ? 2 : 1;
+	int         ol = is_use ? 1 : 2;
 
 	if (!set)
 		return;
@@ -1016,6 +1037,10 @@ flow_add_op_var (set_t *set, operand_t *op, int is_use)
 		return;
 	set_add (set, var->number);
 
+	// FIXME XXX I think the curent implementation will have problems
+	// for the def set when assinging to an alias as right now the real
+	// var is being treated as assigned as well. Want to handle partial
+	// defs properly, but I am as yet uncertain of how.
 	if (op->op_type == op_temp) {
 		tempop_visit_all (&op->o.tempop, ol, flow_tempop_add_aliases, set);
 	} else {
@@ -1120,8 +1145,9 @@ flow_analyze_statement (statement_t *s, set_t *use, set_t *def, set_t *kill,
 				|| strcmp (s->opcode, "<DONE>") == 0) {
 				flow_add_op_var (use, s->opa, 1);
 			} else if (strcmp (s->opcode, "<RETURN_V>") == 0) {
-				if (use)
-					set_add (use, 0);		//FIXME assumes .return location
+				if (use) {
+					flow_add_op_var (use, &flow_params[0].op, 1);
+				}
 			}
 			if (strncmp (s->opcode, "<CALL", 5) == 0) {
 				start = 0;
@@ -1137,11 +1163,22 @@ flow_analyze_statement (statement_t *s, set_t *use, set_t *def, set_t *kill,
 			}
 			if (calln >= 0) {
 				if (use) {
-					for (i = start; i < calln; i++)
-						set_add (use, i + 1);//FIXME assumes .param_N locations
+					for (i = start; i < calln; i++) {
+						flow_add_op_var (use, &flow_params[i + 1].op, 1);
+					}
+				}
+				if (def) {
+					for (i = 0; i < num_flow_params; i++) {
+						flow_add_op_var (def, &flow_params[i].op, 0);
+					}
+				}
+				if (kill) {
+					for (i = 0; i < num_flow_params; i++) {
+						flow_kill_aliases (kill,
+										   flow_get_var (&flow_params[i].op),
+										   0);
+					}
 				}
-				if (kill)
-					set_add (kill, 0);		//FIXME assumes .return location
 			}
 			if (operands) {
 				operands[1] = s->opa;

From bcf75b541a68f2546707cf22e9d2c6f926801f26 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 8 Mar 2020 17:40:38 +0900
Subject: [PATCH 0679/1519] [qfcc] Build movep dest pointer correctly

This fixes the mangled pointer in struct-init-param.r.
---
 tools/qfcc/source/dags.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/tools/qfcc/source/dags.c b/tools/qfcc/source/dags.c
index 8de4d0e54..86acc210a 100644
--- a/tools/qfcc/source/dags.c
+++ b/tools/qfcc/source/dags.c
@@ -867,6 +867,8 @@ generate_moveps (dag_t *dag, sblock_t *block, dagnode_t *dagnode)
 	statement_t *st;
 	operand_t   *dst = 0;
 	type_t      *type;
+	int          offset = 0;
+	def_t       *dstDef;
 
 	operands[0] = make_operand (dag, block, dagnode, 0);
 	operands[1] = make_operand (dag, block, dagnode, 1);
@@ -875,7 +877,12 @@ generate_moveps (dag_t *dag, sblock_t *block, dagnode_t *dagnode)
 		var = dag->labels[var_iter->element];
 		dst = var->op;
 		type = dst->o.def->type;
-		operands[2] = value_operand (new_pointer_val (0, type, dst->o.def));
+		dstDef = dst->o.def;
+		if (dstDef->alias) {
+			offset = dstDef->offset;
+			dstDef = dstDef->alias;
+		}
+		operands[2] = value_operand (new_pointer_val (offset, type, dstDef));
 		st = build_statement ("<MOVEP>", operands, var->expr);
 		sblock_add_statement (block, st);
 	}

From 89ec86f77fc4e7d0fd34862915550a48ed527f58 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 8 Mar 2020 19:13:57 +0900
Subject: [PATCH 0680/1519] [qfcc] Add option to promote of float through ...

The server code is not yet ready for doubles, especially in its varargs
builtins: they expect only floats. When float promotion is enabled
(default for advanced code, disabled for traditional or v6only),
"@float_promoted@" is written to the prog's strings.
---
 tools/qfcc/doc/man/qfcc.1   |  6 ++++++
 tools/qfcc/source/expr.c    | 17 ++++++++++++++---
 tools/qfcc/source/options.c |  7 +++++++
 tools/qfcc/source/qfcc.c    |  3 +++
 4 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/tools/qfcc/doc/man/qfcc.1 b/tools/qfcc/doc/man/qfcc.1
index b4fbd2685..3162f813d 100644
--- a/tools/qfcc/doc/man/qfcc.1
+++ b/tools/qfcc/doc/man/qfcc.1
@@ -295,6 +295,12 @@ This can be a problem because instructions can access addresses up to 32767 in
 older servers or 65535 in most modern servers.
 Defaults to off for traditional mode, and on for advanced mode.
 
+.TP
+.B promote\-float
+Promote float when passed to a function that takes a variable number of
+arguements. Defaults to enabled for advanced code, is forced off for
+traditional or v6only code (mostly because such code does not have doubles).
+
 .TP
 .B short\-circuit
 Generate short circuit code for logical operators (\fB&&\fP and \fB||\fP).
diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index 7b9721be4..c1c78ff86 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -1718,9 +1718,20 @@ build_function_call (expr_t *fexpr, const type_t *ftype, expr_t *params)
 			if (is_integer_val (e)
 				&& options.code.progsversion == PROG_ID_VERSION)
 				convert_int (e);
-			if (is_float (get_type (e))
-				&& options.code.progsversion != PROG_ID_VERSION) {
-				t = &type_double;
+			if (options.code.promote_float) {
+				if (is_float (get_type (e))) {
+					t = &type_double;
+				}
+			} else {
+				if (is_double (get_type (e))) {
+					if (!e->implicit) {
+						warning (e, "passing double into ... function");
+					}
+					if (is_constant (e)) {
+						// don't auto-demote non-constant doubles
+						t = &type_float;
+					}
+				}
 			}
 			if (is_integer_val (e) && options.warnings.vararg_integer)
 				warning (e, "passing integer constant into ... function");
diff --git a/tools/qfcc/source/options.c b/tools/qfcc/source/options.c
index f9807de7b..6f972fd82 100644
--- a/tools/qfcc/source/options.c
+++ b/tools/qfcc/source/options.c
@@ -203,6 +203,7 @@ code_usage (void)
 "    help                    Display this text.\n"
 "    [no-]local-merging      Merge the local variable blocks into one.\n"
 "    [no-]optimize           Perform various optimizations on the code.\n"
+"    [no-]promote-float      Promote float when passed through ...\n"
 "    [no-]short-circuit      Generate short circuit code for logical\n"
 "                            operators.\n"
 "    [no-]single-cpp         Convert progs.src to cpp input file.\n"
@@ -310,6 +311,7 @@ DecodeArgs (int argc, char **argv)
 	options.code.vector_components = -1;
 	options.code.crc = -1;
 	options.code.fast_float = true;
+	options.code.promote_float = true;
 	options.warnings.uninited_variable = true;
 	options.warnings.unused = true;
 	options.warnings.executable = true;
@@ -489,6 +491,8 @@ DecodeArgs (int argc, char **argv)
 							options.code.debug = flag;
 						} else if (!(strcasecmp (temp, "fast-float"))) {
 							options.code.fast_float = flag;
+						} else if (!(strcasecmp (temp, "promote-float"))) {
+							options.code.promote_float = flag;
 						} else if (!strcasecmp (temp, "help")) {
 							code_usage ();
 						} else if (!(strcasecmp (temp, "local-merging"))) {
@@ -716,8 +720,11 @@ DecodeArgs (int argc, char **argv)
 			options.code.local_merging = true;
 		if (options.code.vector_components == (qboolean) -1)
 			options.code.vector_components = false;
+	} else {
+		options.code.promote_float = 0;
 	}
 	if (options.code.progsversion == PROG_ID_VERSION) {
+		options.code.promote_float = 0;
 		add_cpp_def ("-D__VERSION6__=1");
 		if (options.code.crc == (qboolean) -1)
 			options.code.crc = true;
diff --git a/tools/qfcc/source/qfcc.c b/tools/qfcc/source/qfcc.c
index 8a363a9cd..6a7e1a039 100644
--- a/tools/qfcc/source/qfcc.c
+++ b/tools/qfcc/source/qfcc.c
@@ -148,6 +148,9 @@ InitData (void)
 	pr.code = codespace_new ();
 	memset (codespace_newstatement (pr.code), 0, sizeof (dstatement_t));
 	pr.strings = strpool_new ();
+	if (options.code.promote_float) {
+		ReuseString ("@float_promoted@");
+	}
 	pr.num_functions = 1;
 
 	pr.num_linenos = 0;

From c726d77e7dfe116cb07ed17c01ae06d2310faf50 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 8 Mar 2020 19:17:24 +0900
Subject: [PATCH 0681/1519] [gamecode] Respect the @float_promoted@ magic
 string

Rather than relying on progs code version, use the string to determine
whether PR_Sprintf should behave as if floats have been promoted through
... I imagine I'll get to the rest of the server code at some stage.

With these two changes, nq-x11 works again (teleporters were the
symptom).
---
 libs/gamecode/pr_load.c    | 2 --
 libs/gamecode/pr_strings.c | 7 +++++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/libs/gamecode/pr_load.c b/libs/gamecode/pr_load.c
index df72cbbc9..d385dff12 100644
--- a/libs/gamecode/pr_load.c
+++ b/libs/gamecode/pr_load.c
@@ -202,8 +202,6 @@ PR_LoadProgsFile (progs_t *pr, QFile *file, int size)
 	base -= sizeof (progs);	// offsets are from file start
 	heap = ((byte *) pr->progs + pr->progs_size + pr->pr_edictareasize);
 
-	pr->float_promoted = progs.version == PROG_VERSION;
-
 	if (pr->edicts) {
 		*pr->edicts = (edict_t *)((byte *) pr->progs + pr->progs_size);
 	}
diff --git a/libs/gamecode/pr_strings.c b/libs/gamecode/pr_strings.c
index 4d393776e..e280b4743 100644
--- a/libs/gamecode/pr_strings.c
+++ b/libs/gamecode/pr_strings.c
@@ -238,8 +238,15 @@ PR_LoadStrings (progs_t *pr)
 	char   *str = pr->pr_strings;
 	int		count = 0;
 
+	pr->float_promoted = 0;
+
 	while (str < end) {
 		count++;
+		if (*str == '@' && pr->progs->version == PROG_VERSION) {
+			if (!strcmp (str, "@float_promoted@")) {
+				pr->float_promoted = 1;
+			}
+		}
 		str += strlen (str) + 1;
 	}
 

From a013714bd01f0cb20c9a646947f9392940a7e385 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 8 Mar 2020 20:11:21 +0900
Subject: [PATCH 0682/1519] [qfcc] Add missing header file changes

Oops
---
 tools/qfcc/include/options.h | 1 +
 tools/qfcc/include/value.h   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/tools/qfcc/include/options.h b/tools/qfcc/include/options.h
index 01345cff4..a43c908b6 100644
--- a/tools/qfcc/include/options.h
+++ b/tools/qfcc/include/options.h
@@ -46,6 +46,7 @@ typedef struct {
 	qboolean    vector_components;	// add *_[xyz] symbols for vectors
 	qboolean    ifstring;			// expand if (str) to if (str != "")
 	qboolean    const_initializers;	// initialied globals are constant
+	qboolean    promote_float;		// promote float through ...
 } code_options_t;
 
 typedef struct {
diff --git a/tools/qfcc/include/value.h b/tools/qfcc/include/value.h
index aaac286b7..b4f22ee60 100644
--- a/tools/qfcc/include/value.h
+++ b/tools/qfcc/include/value.h
@@ -36,6 +36,7 @@
 */
 ///@{
 
+struct def_s;
 struct ex_value_s;
 struct type_s;
 

From 5f299cbac79bf567a6bec3d30ab85dbb575ab462 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 8 Mar 2020 21:29:31 +0900
Subject: [PATCH 0683/1519] [gamecode] Ensure static string refs are
 initialized

That was a fun one to track down :P
---
 libs/gamecode/pr_strings.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/libs/gamecode/pr_strings.c b/libs/gamecode/pr_strings.c
index e280b4743..6270a8d12 100644
--- a/libs/gamecode/pr_strings.c
+++ b/libs/gamecode/pr_strings.c
@@ -267,7 +267,7 @@ PR_LoadStrings (progs_t *pr)
 
 	if (res->static_strings)
 		free (res->static_strings);
-	res->static_strings = malloc (count * sizeof (strref_t));
+	res->static_strings = calloc (count, sizeof (strref_t));
 	count = 0;
 	str = pr->pr_strings;
 	while (str < end) {
@@ -344,7 +344,7 @@ get_string (progs_t *pr, string_t num)
 			case str_free:
 				break;
 		}
-		PR_Error (pr, "internal string error");
+		PR_Error (pr, "internal string error: %d", __LINE__);
 	} else {
 		if (num >= pr->pr_stringsize)
 			return 0;
@@ -436,7 +436,8 @@ PR_SetReturnString (progs_t *pr, const char *s)
 			requeue_strref (res, sr);
 		} else if ((sr->type == str_return && !sr->rs_slot)
 				   || (sr->type != str_return && sr->rs_slot)) {
-			PR_Error (pr, "internal string error");
+			PR_Error (pr, "internal string error: %d %d %p", __LINE__,
+					 sr->type, sr->rs_slot);
 		}
 		return string_index (res, sr);
 	}
@@ -445,7 +446,7 @@ PR_SetReturnString (progs_t *pr, const char *s)
 	// slot is empty
 	if ((sr = res->rs_slot->strref)) {
 		if (sr->type != str_return || sr->rs_slot != res->rs_slot) {
-			PR_Error (pr, "internal string error");
+			PR_Error (pr, "internal string error: %d", __LINE__);
 		}
 		pr_strfree (pr, sr->s.string);
 	} else {
@@ -576,7 +577,7 @@ PR_FreeString (progs_t *pr, string_t str)
 				break;
 			case str_return:
 			default:
-				PR_Error (pr, "internal string error");
+				PR_Error (pr, "internal string error: %d", __LINE__);
 		}
 		free_string_ref (res, sr);
 		return;
@@ -593,7 +594,7 @@ PR_FreeTempStrings (progs_t *pr)
 	for (sr = pr->pr_xtstr; sr; sr = t) {
 		t = sr->next;
 		if (sr->type != str_temp)
-			PR_Error (pr, "internal string error");
+			PR_Error (pr, "internal string error: %d", __LINE__);
 		if (R_STRING (pr) < 0 && string_index (res, sr) == R_STRING (pr)
 			&& pr->pr_depth) {
 			prstack_t  *frame = pr->pr_stack + pr->pr_depth - 1;

From 67ec9bfb4796062800e863580295a16974553db5 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 8 Mar 2020 21:30:08 +0900
Subject: [PATCH 0684/1519] [vid] Initialize x event before sending

Quietens valgrind nicely (though it gave a weird source of the memory).
---
 libs/video/targets/in_x11.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/video/targets/in_x11.c b/libs/video/targets/in_x11.c
index dc689a7d5..8ef111ec2 100644
--- a/libs/video/targets/in_x11.c
+++ b/libs/video/targets/in_x11.c
@@ -672,7 +672,7 @@ event_focusin (XEvent *event)
 static void
 center_pointer (void)
 {
-	XEvent      event;
+	XEvent      event = {};
 
 	event.type = MotionNotify;
 	event.xmotion.display = x_disp;

From bb0e65e9d4c2fd469bdeebfe1f2ccb4f3c728461 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 8 Mar 2020 21:45:51 +0900
Subject: [PATCH 0685/1519] [cl_menu] Silence some debug output

---
 ruamoko/cl_menu/client_menu.r | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ruamoko/cl_menu/client_menu.r b/ruamoko/cl_menu/client_menu.r
index 67f9e80f1..dc4cd487e 100644
--- a/ruamoko/cl_menu/client_menu.r
+++ b/ruamoko/cl_menu/client_menu.r
@@ -147,7 +147,7 @@ void (int quick) scan_saves =
 			filenames[i] = str_new ();
 		loadable[i] = 0;
 		string path = sprintf ("%s%i.sav", basename, i);
-		dprint(path + "\n");
+		//dprint(path + "\n");
 		f = QFS_OpenFile (path);
 		if (!f) {
 			str_copy (filenames[i], "--- UNUSED SLOT ---");

From 89cf9f95232ccaa87c7977665daf970c443f1c45 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 8 Mar 2020 22:19:37 +0900
Subject: [PATCH 0686/1519] [qwaq] Use Sys_Printf for load error messages

It gets them into the log file.
---
 ruamoko/qwaq/main.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ruamoko/qwaq/main.c b/ruamoko/qwaq/main.c
index 191714c74..ae82758ad 100644
--- a/ruamoko/qwaq/main.c
+++ b/ruamoko/qwaq/main.c
@@ -32,6 +32,8 @@
 #endif
 
 #include <stdlib.h>
+#include <stdio.h>
+#include <errno.h>
 
 #include "QF/cbuf.h"
 #include "QF/cmd.h"
@@ -60,7 +62,7 @@ open_file (const char *path, int *len)
 	QFile      *file = Qopen (path, "rbz");
 
 	if (!file) {
-		perror (path);
+		Sys_Printf ("%s\n", sys_errlist[errno]);
 		return 0;
 	}
 	*len = Qfilesize (file);

From 8fc007648c1afd7a42c79fb4b13ff94d03b06b6f Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 8 Mar 2020 22:20:46 +0900
Subject: [PATCH 0687/1519] [qwaq] Add missed command enum string

---
 ruamoko/qwaq/qwaq-curses.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ruamoko/qwaq/qwaq-curses.c b/ruamoko/qwaq/qwaq-curses.c
index 15746b5e6..8d252a0b2 100644
--- a/ruamoko/qwaq/qwaq-curses.c
+++ b/ruamoko/qwaq/qwaq-curses.c
@@ -99,6 +99,7 @@ const char *qwaq_command_names[]= {
 	"mvwaddstr",
 	"waddstr",
 	"mvwaddch",
+	"waddch",
 	"wrefresh",
 	"init_pair",
 	"wbkgd",

From 0780cca4963b2114a8c0666f255f6284df1aee5b Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 8 Mar 2020 22:21:15 +0900
Subject: [PATCH 0688/1519] [qwaq] Fixed swapped method implementations

That was fun
---
 ruamoko/qwaq/qwaq-curses.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-curses.c b/ruamoko/qwaq/qwaq-curses.c
index 8d252a0b2..1981a434c 100644
--- a/ruamoko/qwaq/qwaq-curses.c
+++ b/ruamoko/qwaq/qwaq-curses.c
@@ -1487,7 +1487,7 @@ bi_i_TextContext__printf_ (progs_t *pr)
 }
 
 static void
-bi_i_TextContext__addch_ (progs_t *pr)
+bi_i_TextContext__vprintf_ (progs_t *pr)
 {
 	int         window_id = P_STRUCT (pr, qwaq_textcontext_t, 0).window;
 	const char *fmt = P_GSTRING (pr, 2);
@@ -1497,7 +1497,7 @@ bi_i_TextContext__addch_ (progs_t *pr)
 }
 
 static void
-bi_i_TextContext__vprintf_ (progs_t *pr)
+bi_i_TextContext__addch_ (progs_t *pr)
 {
 	int         window_id = P_STRUCT (pr, qwaq_textcontext_t, 0).window;
 	int         ch = P_INT (pr, 1);

From 98756df9f75ffaf11a7dc3bffc108cb85289b3bf Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 9 Mar 2020 18:03:25 +0900
Subject: [PATCH 0689/1519] [gamecode] Set final resource map free list pointer

The sub-tables were being properly linked together, but the very final
table was not properly terminated.
---
 include/QF/progs.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/include/QF/progs.h b/include/QF/progs.h
index ea17f533e..1ef71aeb2 100644
--- a/include/QF/progs.h
+++ b/include/QF/progs.h
@@ -1491,6 +1491,8 @@ void *PR_Resources_Find (progs_t *pr, const char *name);
 	Any memory allocated to the resource must be freed before freeing the
 	resource.
 
+	A reset resource map is guaranteed to allocate elements sequentially.
+
 	\param type		The type of the resource. Must match the \c type parameter
 					used for PR_RESMAP.
 	\param map		The resource map.
@@ -1505,6 +1507,8 @@ void *PR_Resources_Find (progs_t *pr, const char *name);
 			*(type **) &map._free[j] = &map._free[j + 1];	\
 		if (i < map._size - 1)								\
 			*(type **) &map._free[j] = &map._map[i + 1][0];	\
+		else												\
+			*(type **) &map._free[j] = 0;					\
 	}														\
 	map._free = map._map[0];
 

From 1ccdd7678055d0dee27819c95de08e58f4d2836c Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 9 Mar 2020 18:09:03 +0900
Subject: [PATCH 0690/1519] [ruamoko] Clean up runtime init and cleanup

Move the semi-permanent resource initialisation into the module init and
the cleanup of those resources into cleanup. Makes actual runtime init
much easier to read.
---
 libs/ruamoko/rua_obj.c | 72 ++++++++++++++++++++----------------------
 1 file changed, 35 insertions(+), 37 deletions(-)

diff --git a/libs/ruamoko/rua_obj.c b/libs/ruamoko/rua_obj.c
index e088ff140..a8c2f9e7b 100644
--- a/libs/ruamoko/rua_obj.c
+++ b/libs/ruamoko/rua_obj.c
@@ -1908,43 +1908,6 @@ rua_obj_init_runtime (progs_t *pr)
 {
 	probj_t    *probj = pr->pr_objective_resources;
 	pr_def_t   *def;
-	unsigned    i;
-
-	if (!probj->selector_hash)
-		probj->selector_hash = Hash_NewTable (1021, selector_get_key, 0,
-											  probj);
-	else
-		Hash_FlushTable (probj->selector_hash);
-	probj->selector_index = 0;
-	for (i = 0; i < probj->selector_index_max; i++) {
-		obj_list_free (probj->selector_sels[i]);
-		probj->selector_sels[i] = 0;
-		probj->selector_names[i] = 0;
-	}
-
-	if (!probj->classes)
-		probj->classes = Hash_NewTable (1021, class_get_key, 0, probj);
-	else
-		Hash_FlushTable (probj->classes);
-
-	if (!probj->protocols)
-		probj->protocols = Hash_NewTable (1021, protocol_get_key, 0, probj);
-	else
-		Hash_FlushTable (probj->protocols);
-
-	if (!probj->load_methods) {
-		probj->load_methods = Hash_NewTable (1021, 0, 0, probj);
-		Hash_SetHashCompare (probj->load_methods, load_methods_get_hash,
-							 load_methods_compare);
-	} else {
-		Hash_FlushTable (probj->load_methods);
-	}
-
-	probj->unresolved_classes = 0;
-	probj->unclaimed_categories = 0;
-	probj->unclaimed_proto_list = 0;
-	probj->module_list = 0;
-	probj->class_tree_list = 0;
 
 	if ((def = PR_FindField (pr, ".this")))
 		pr->fields.this = def->ofs;
@@ -1956,15 +1919,50 @@ rua_obj_init_runtime (progs_t *pr)
 static void
 rua_obj_cleanup (progs_t *pr, void *data)
 {
+	unsigned    i;
+
 	__auto_type probj = (probj_t *) data;
 	pr->pr_objective_resources = probj;
+
+	Hash_FlushTable (probj->selector_hash);
+	probj->selector_index = 0;
+	for (i = 0; i < probj->selector_index_max; i++) {
+		obj_list_free (probj->selector_sels[i]);
+		probj->selector_sels[i] = 0;
+		probj->selector_names[i] = 0;
+	}
+
+	for (i = 0; i < probj->dtables._size; i++) {
+		dtable_t   *dtable = dtable_get (probj, i);
+		if (!dtable->imp) {
+			break;
+		}
+		free (dtable->imp);
+	}
+	dtable_reset (probj);
+
+	Hash_FlushTable (probj->classes);
+	Hash_FlushTable (probj->protocols);
+	Hash_FlushTable (probj->load_methods);
+	probj->unresolved_classes = 0;
+	probj->unclaimed_categories = 0;
+	probj->unclaimed_proto_list = 0;
+	probj->module_list = 0;
+	probj->class_tree_list = 0;
 }
 
 void
 RUA_Obj_Init (progs_t *pr, int secure)
 {
 	probj_t    *probj = calloc (1, sizeof (*probj));
+
 	probj->pr = pr;
+	probj->selector_hash = Hash_NewTable (1021, selector_get_key, 0, probj);
+	probj->classes = Hash_NewTable (1021, class_get_key, 0, probj);
+	probj->protocols = Hash_NewTable (1021, protocol_get_key, 0, probj);
+	probj->load_methods = Hash_NewTable (1021, 0, 0, probj);
+	Hash_SetHashCompare (probj->load_methods, load_methods_get_hash,
+						 load_methods_compare);
 
 	PR_Resources_Register (pr, "RUA_ObjectiveQuakeC", probj, rua_obj_cleanup);
 

From e2f4c189f998621c396eb2e9d5cd56f43d05c9ae Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 9 Mar 2020 18:11:36 +0900
Subject: [PATCH 0691/1519] [ruamoko] Install and use dispatch tables

This should speed up ruamoko code somewhat as hash table lookups have
been replaced with direct array indexing. As a bonus, support for
message forwarding has been added (though not tested).
---
 include/QF/pr_obj.h    |   2 +-
 libs/ruamoko/rua_obj.c | 125 ++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 124 insertions(+), 3 deletions(-)

diff --git a/include/QF/pr_obj.h b/include/QF/pr_obj.h
index fa3bbca84..52f05aa16 100644
--- a/include/QF/pr_obj.h
+++ b/include/QF/pr_obj.h
@@ -94,7 +94,7 @@ typedef struct pr_class_s {
 	pr_int_t    instance_size;
 	pointer_t   ivars;				// pr_ivar_list_t
 	pointer_t   methods;			// pr_method_list_t
-	pointer_t   dtable;
+	pointer_t   dtable;				// resource index
 	pointer_t   subclass_list;		// pr_class_t
 	pointer_t   sibling_class;		// pr_class_t
 	pointer_t   protocols;			// pr_protocol_list_t
diff --git a/libs/ruamoko/rua_obj.c b/libs/ruamoko/rua_obj.c
index a8c2f9e7b..50ba97de1 100644
--- a/libs/ruamoko/rua_obj.c
+++ b/libs/ruamoko/rua_obj.c
@@ -56,17 +56,26 @@
 #include "compat.h"
 #include "rua_internal.h"
 
+#define always_inline inline __attribute__((__always_inline__))
+
 typedef struct obj_list_s {
 	struct obj_list_s *next;
 	void       *data;
 } obj_list;
 
+typedef struct dtable_s {
+	size_t      size;
+	func_t     *imp;
+} dtable_t;
+
 typedef struct probj_resources_s {
 	progs_t    *pr;
 	unsigned    selector_index;
 	unsigned    selector_index_max;
 	obj_list  **selector_sels;
 	string_t   *selector_names;
+	PR_RESMAP (dtable_t) dtables;
+	func_t      obj_forward;
 	hashtab_t  *selector_hash;
 	hashtab_t  *classes;
 	hashtab_t  *protocols;
@@ -79,6 +88,41 @@ typedef struct probj_resources_s {
 	obj_list   *class_tree_list;
 } probj_t;
 
+static dtable_t *
+dtable_new (probj_t *probj)
+{
+	PR_RESNEW (dtable_t, probj->dtables);
+}
+
+static void
+dtable_reset (probj_t *probj)
+{
+	PR_RESRESET (dtable_t, probj->dtables);
+}
+
+static inline dtable_t *
+dtable_get (probj_t *probj, int index)
+{
+	PR_RESGET (probj->dtables, index);
+}
+
+static inline int
+dtable_index (probj_t *probj, dtable_t *dtable)
+{
+	PR_RESINDEX (probj->dtables, dtable);
+}
+
+static always_inline dtable_t * __attribute__((pure))
+get_dtable (probj_t *probj, const char *name, int index)
+{
+	dtable_t   *dtable = dtable_get (probj, index);
+
+	if (!dtable) {
+		PR_RunError (probj->pr, "invalid dtable index in %s", name);
+	}
+	return dtable;
+}
+
 static obj_list *obj_list_free_list;
 
 static obj_list *
@@ -832,12 +876,83 @@ obj_send_initialize (probj_t *probj, pr_class_t *class)
 	}
 }
 
+static void
+obj_install_methods_in_dtable (probj_t *probj, pr_class_t *class,
+							   pr_method_list_t *method_list)
+{
+	progs_t    *pr = probj->pr;
+	dtable_t   *dtable;
+
+	if (!method_list) {
+		return;
+	}
+	if (method_list->method_next) {
+		obj_install_methods_in_dtable (probj, class,
+									   &G_STRUCT (pr, pr_method_list_t,
+												  method_list->method_next));
+	}
+
+	dtable = get_dtable (probj, __FUNCTION__, class->dtable);
+	for (int i = 0; i < method_list->method_count; i++) {
+		pr_method_t *method = &method_list->method_list[i];
+		pr_sel_t   *sel = &G_STRUCT (pr, pr_sel_t, method->method_name);
+		if (sel->sel_id < dtable->size) {
+			dtable->imp[sel->sel_id] = method->method_imp;
+		}
+	}
+}
+
+static void
+obj_install_dispatch_table_for_class (probj_t *probj, pr_class_t *class)
+{
+	progs_t    *pr = probj->pr;
+	pr_class_t *super = &G_STRUCT (pr, pr_class_t, class->super_class);
+	dtable_t   *dtable;
+
+	Sys_MaskPrintf (SYS_RUA_OBJ, "    install dispatch for class %s %x %d\n",
+					PR_GetString (pr, class->name),
+					class->methods,
+					PR_CLS_ISMETA(class));
+
+	if (super && !super->dtable) {
+		obj_install_dispatch_table_for_class (probj, super);
+	}
+
+	dtable = dtable_new (probj);
+	class->dtable = dtable_index (probj, dtable);
+	dtable->size = probj->selector_index + 1;
+	dtable->imp = calloc (dtable->size, sizeof (func_t));
+	if (super) {
+		dtable_t   *super_dtable = get_dtable (probj, __FUNCTION__,
+											   super->dtable);
+		memcpy (dtable->imp, super_dtable->imp,
+				super_dtable->size * sizeof (*dtable->imp));
+	}
+	obj_install_methods_in_dtable (probj, class,
+								   &G_STRUCT (pr, pr_method_list_t,
+											  class->methods));
+}
+
 static func_t
 get_imp (probj_t *probj, pr_class_t *class, pr_sel_t *sel)
 {
-	pr_method_t *method = obj_find_message (probj, class, sel);
+	func_t     imp = 0;
 
-	return method ? method->method_imp : 0;
+	if (class->dtable) {
+		dtable_t   *dtable = get_dtable (probj, __FUNCTION__, class->dtable);
+		if (sel->sel_id < dtable->size) {
+			imp = dtable->imp[sel->sel_id];
+		}
+	}
+	if (!imp) {
+		if (!class->dtable) {
+			obj_install_dispatch_table_for_class (probj, class);
+			imp = get_imp (probj, class, sel);
+		} else {
+			imp = probj->obj_forward;
+		}
+	}
+	return imp;
 }
 
 static func_t
@@ -1908,10 +2023,16 @@ rua_obj_init_runtime (progs_t *pr)
 {
 	probj_t    *probj = pr->pr_objective_resources;
 	pr_def_t   *def;
+	dfunction_t *obj_forward;
 
 	if ((def = PR_FindField (pr, ".this")))
 		pr->fields.this = def->ofs;
 
+	probj->obj_forward = 0;
+	if ((obj_forward = PR_FindFunction (pr, "__obj_forward"))) {
+		probj->obj_forward = (intptr_t) (obj_forward - pr->pr_functions);
+	}
+
 	PR_AddLoadFinishFunc (pr, rua_init_finish);
 	return 1;
 }

From a4875951498b4c1be74363299290b9f591948087 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 9 Mar 2020 19:09:08 +0900
Subject: [PATCH 0692/1519] [ruamoko,libr] Begin implementation of
 __obj_forward

libr supplies an __obj_forward definition that links to a builtin, but
as it is the only def in its object file, it is readily replaceable by
an alternative Ruamoko implementation.

The builtin version currently simply errors out (rather facetiously),
but only as a stub to allow progs to load.
---
 libs/ruamoko/rua_obj.c    | 12 ++++++++++++
 ruamoko/include/runtime.h |  1 +
 ruamoko/lib/Makefile.am   |  1 +
 ruamoko/lib/Object.r      |  5 +++++
 ruamoko/lib/obj_forward.r |  3 +++
 5 files changed, 22 insertions(+)
 create mode 100644 ruamoko/lib/obj_forward.r

diff --git a/libs/ruamoko/rua_obj.c b/libs/ruamoko/rua_obj.c
index 50ba97de1..f5e48ef39 100644
--- a/libs/ruamoko/rua_obj.c
+++ b/libs/ruamoko/rua_obj.c
@@ -1209,6 +1209,17 @@ rua___obj_exec_class (progs_t *pr)
 					PR_GetString (pr, module->name));
 }
 
+static void
+rua___obj_forward (progs_t *pr)
+{
+	probj_t    *probj = pr->pr_objective_resources;
+	pr_id_t    *receiver = &P_STRUCT (pr, pr_id_t, 0);
+	pr_sel_t   *op = &P_STRUCT (pr, pr_sel_t, 1);
+	PR_RunError (pr, "seriously, dude, %s does not respond to %s",
+				 PR_GetString (pr, object_get_class_name (probj, receiver)),
+				 PR_GetString (pr, probj->selector_names[op->sel_id]));
+}
+
 static void
 rua_obj_error (progs_t *pr)
 {
@@ -1928,6 +1939,7 @@ rua_PR_FindGlobal (progs_t *pr)
 
 static builtin_t obj_methods [] = {
 	{"__obj_exec_class",			rua___obj_exec_class,			-1},
+	{"__obj_forward",				rua___obj_forward,				-1},
 
 	{"obj_error",					rua_obj_error,					-1},
 	{"obj_verror",					rua_obj_verror,					-1},
diff --git a/ruamoko/include/runtime.h b/ruamoko/include/runtime.h
index bbcd793ed..357416e26 100644
--- a/ruamoko/include/runtime.h
+++ b/ruamoko/include/runtime.h
@@ -38,6 +38,7 @@ typedef enum {
 	YES			///< a true value
 } BOOL;
 
+@extern void __obj_forward(id, SEL, ...);
 @extern void obj_error (id object, int code, string fmt, ...);
 @extern void obj_verror (id object, int code, string fmt, @va_list args);
 //obj_error_handler obj_set_error_handler (objc_error_handler func);
diff --git a/ruamoko/lib/Makefile.am b/ruamoko/lib/Makefile.am
index 8a66a3839..da1157a82 100644
--- a/ruamoko/lib/Makefile.am
+++ b/ruamoko/lib/Makefile.am
@@ -37,6 +37,7 @@ r_depfiles_remade=
 libr_a_SOURCES=\
 	cbuf.r cmd.r cvar.r hash.r msgbuf.r plist.r qfile.r qfs.r script.r \
 	sound.r string.r math.r types.r \
+	obj_forward.r \
 	Object.r Protocol.r \
 	AutoreleasePool.r Array.r Array+Private.r Entity.r PropertyList.r Set.r
 libr_a_obj=$(libr_a_SOURCES:.r=.o)
diff --git a/ruamoko/lib/Object.r b/ruamoko/lib/Object.r
index d85a78064..07de4b7eb 100644
--- a/ruamoko/lib/Object.r
+++ b/ruamoko/lib/Object.r
@@ -1,6 +1,11 @@
 #include <Object.h>
 #include <AutoreleasePool.h>
 
+static void link__obj_forward (void)
+{
+	__obj_forward (nil, nil);
+}
+
 void *PR_FindGlobal (string name) = #0;	//FIXME where?
 
 void __obj_exec_class (struct obj_module *msg) = #0;
diff --git a/ruamoko/lib/obj_forward.r b/ruamoko/lib/obj_forward.r
new file mode 100644
index 000000000..60ad819b5
--- /dev/null
+++ b/ruamoko/lib/obj_forward.r
@@ -0,0 +1,3 @@
+// __obj_foward is the only thing in this file so it can be readily replaced
+// at link time
+void __obj_forward(id object, SEL sel, ...) = #0;

From e3fe93c586bbad8908ce79cfde915f78ae6b2807 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 9 Mar 2020 20:41:17 +0900
Subject: [PATCH 0693/1519] [gamecode] Implement most of message forwarding

All that's left is the parameter setup of forward::.
---
 libs/ruamoko/rua_obj.c | 85 +++++++++++++++++++++++++++++++++++++++---
 1 file changed, 79 insertions(+), 6 deletions(-)

diff --git a/libs/ruamoko/rua_obj.c b/libs/ruamoko/rua_obj.c
index f5e48ef39..4dca5d218 100644
--- a/libs/ruamoko/rua_obj.c
+++ b/libs/ruamoko/rua_obj.c
@@ -76,6 +76,8 @@ typedef struct probj_resources_s {
 	string_t   *selector_names;
 	PR_RESMAP (dtable_t) dtables;
 	func_t      obj_forward;
+	pr_sel_t   *forward_selector;
+	dstring_t  *msg;
 	hashtab_t  *selector_hash;
 	hashtab_t  *classes;
 	hashtab_t  *protocols;
@@ -491,7 +493,6 @@ sel_register_typed_name (probj_t *probj, const char *name, const char *types,
 	int			is_new = 0;
 	obj_list   *l;
 
-	Sys_MaskPrintf (SYS_RUA_OBJ, "    Registering SEL %s %s\n", name, types);
 	index = (intptr_t) Hash_Find (probj->selector_hash, name);
 	if (index) {
 		for (l = probj->selector_sels[index]; l; l = l->next) {
@@ -513,6 +514,8 @@ sel_register_typed_name (probj_t *probj, const char *name, const char *types,
 			}
 		}
 	} else {
+		Sys_MaskPrintf (SYS_RUA_OBJ, "    Registering SEL %s %s\n",
+						name, types);
 		index = add_sel_name (probj, name);
 		is_new = 1;
 	}
@@ -933,6 +936,15 @@ obj_install_dispatch_table_for_class (probj_t *probj, pr_class_t *class)
 											  class->methods));
 }
 
+static inline dtable_t *
+obj_check_dtable_installed (probj_t *probj, pr_class_t *class)
+{
+	if (!class->dtable) {
+		obj_install_dispatch_table_for_class (probj, class);
+	}
+	return get_dtable (probj, __FUNCTION__, class->dtable);
+}
+
 static func_t
 get_imp (probj_t *probj, pr_class_t *class, pr_sel_t *sel)
 {
@@ -955,6 +967,23 @@ get_imp (probj_t *probj, pr_class_t *class, pr_sel_t *sel)
 	return imp;
 }
 
+static int
+obj_reponds_to (probj_t *probj, pr_id_t *obj, pr_sel_t *sel)
+{
+	progs_t    *pr = probj->pr;
+	pr_class_t *class;
+	dtable_t   *dtable;
+	func_t      imp = 0;
+
+	class = &G_STRUCT (pr, pr_class_t, obj->class_pointer);
+	dtable = obj_check_dtable_installed (probj, class);
+
+	if (sel->sel_id < dtable->size) {
+		imp = dtable->imp[sel->sel_id];
+	}
+	return imp != 0;
+}
+
 static func_t
 obj_msg_lookup (probj_t *probj, pr_id_t *receiver, pr_sel_t *op)
 {
@@ -1213,11 +1242,54 @@ static void
 rua___obj_forward (progs_t *pr)
 {
 	probj_t    *probj = pr->pr_objective_resources;
-	pr_id_t    *receiver = &P_STRUCT (pr, pr_id_t, 0);
-	pr_sel_t   *op = &P_STRUCT (pr, pr_sel_t, 1);
-	PR_RunError (pr, "seriously, dude, %s does not respond to %s",
-				 PR_GetString (pr, object_get_class_name (probj, receiver)),
-				 PR_GetString (pr, probj->selector_names[op->sel_id]));
+	pr_id_t    *obj = &P_STRUCT (pr, pr_id_t, 0);
+	pr_sel_t   *sel = &P_STRUCT (pr, pr_sel_t, 1);
+	pr_sel_t   *fwd_sel = probj->forward_selector;
+	pr_sel_t   *err_sel;
+	pr_class_t *class =&G_STRUCT (pr, pr_class_t, obj->class_pointer);
+	func_t      imp;
+
+	if (!fwd_sel) {
+		//FIXME sel_register_typed_name is really not the way to go about
+		//looking for a selector by name
+		fwd_sel = sel_register_typed_name (probj, "forward::", "", 0);
+		probj->forward_selector = fwd_sel;
+	}
+	if (obj_reponds_to (probj, obj, fwd_sel)) {
+		imp = get_imp (probj, class, fwd_sel);
+		PR_CallFunction (pr, imp);
+		return;
+	}
+	//FIXME ditto
+	err_sel = sel_register_typed_name (probj, "doesNotRecognize:", "", 0);
+	if (obj_reponds_to (probj, obj, err_sel)) {
+		imp = get_imp (probj, class, err_sel);
+		PR_RESET_PARAMS (pr);
+		P_POINTER (pr, 0) = PR_SetPointer (pr, obj);
+		P_POINTER (pr, 1) = PR_SetPointer (pr, err_sel);
+		P_POINTER (pr, 2) = PR_SetPointer (pr, sel);
+		PR_CallFunction (pr, imp);
+		return;
+	}
+
+	dsprintf (probj->msg, "(%s) %s does not recognize %s",
+			  PR_CLS_ISMETA (class) ? "class" : "instance",
+			  PR_GetString (pr, class->name),
+			  PR_GetString (pr, probj->selector_names[sel->sel_id]));
+
+	//FIXME ditto
+	err_sel = sel_register_typed_name (probj, "error:", "", 0);
+	if (obj_reponds_to (probj, obj, err_sel)) {
+		imp = get_imp (probj, class, err_sel);
+		PR_RESET_PARAMS (pr);
+		P_POINTER (pr, 0) = PR_SetPointer (pr, obj);
+		P_POINTER (pr, 1) = PR_SetPointer (pr, err_sel);
+		P_POINTER (pr, 2) = PR_SetTempString (pr, probj->msg->str);
+		PR_CallFunction (pr, imp);
+		return;
+	}
+
+	PR_RunError (pr, "%s", probj->msg->str);
 }
 
 static void
@@ -2094,6 +2166,7 @@ RUA_Obj_Init (progs_t *pr, int secure)
 	probj->classes = Hash_NewTable (1021, class_get_key, 0, probj);
 	probj->protocols = Hash_NewTable (1021, protocol_get_key, 0, probj);
 	probj->load_methods = Hash_NewTable (1021, 0, 0, probj);
+	probj->msg = dstring_newstr();
 	Hash_SetHashCompare (probj->load_methods, load_methods_get_hash,
 						 load_methods_compare);
 

From 7d43bd5c663e80234a04d5d0da94c10c89d1506d Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 9 Mar 2020 22:16:19 +0900
Subject: [PATCH 0694/1519] [gamecode] Add function PR_AllocTempBlock()

PR_AllocTempBlock() works the same way as PR_SetTempString(), except
that it takes a size parameter and always allocates (never tries to
merge). This is, in a way, abusing the string system, but I needed a way
to allocate a block of progs memory that would be automatically freed
when the current frame ended. The biggest abuse is the need to cast away
the const of PR_GetString()'s return value.
---
 include/QF/progs.h         | 12 ++++++++++++
 libs/gamecode/pr_strings.c | 15 ++++++++++++++-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/include/QF/progs.h b/include/QF/progs.h
index 1ef71aeb2..28a2890d2 100644
--- a/include/QF/progs.h
+++ b/include/QF/progs.h
@@ -1274,6 +1274,18 @@ string_t PR_SetReturnString(progs_t *pr, const char *s);
 */
 string_t PR_SetTempString(progs_t *pr, const char *s);
 
+/** Make a temporary memory block that will be freed when the current progs
+	stack frame is exited. The contents may be anything and a new block is
+	returned every time, and the block is in VM addressible space. To access
+	the contents of the block (for reading, writing, etc), use PR_GetString()
+	and cast the pointer as necessary.
+
+	\param pr		pointer to ::progs_t VM struct
+	\param size		size of block in bytes
+	\return			string index of the block
+*/
+string_t PR_AllocTempBlock (progs_t *pr, size_t size);
+
 /** Make a temporary progs string that is the concatenation of two C strings.
 	\param pr		pointer to ::progs_t VM struct
 	\param a		C string
diff --git a/libs/gamecode/pr_strings.c b/libs/gamecode/pr_strings.c
index 6270a8d12..d9eee8fa2 100644
--- a/libs/gamecode/pr_strings.c
+++ b/libs/gamecode/pr_strings.c
@@ -384,10 +384,16 @@ PR_GetMutableString (progs_t *pr, string_t num)
 	PR_RunError (pr, "Invalid string offset: %d", num);
 }
 
+static inline void *
+pr_strmalloc (progs_t *pr, size_t size)
+{
+	return PR_Zone_Malloc (pr, size);
+}
+
 static inline char *
 pr_stralloc (progs_t *pr, size_t len)
 {
-	return PR_Zone_Malloc (pr, len + 1);
+	return pr_strmalloc (pr, len + 1);
 }
 
 static inline void
@@ -507,6 +513,13 @@ PR_SetTempString (progs_t *pr, const char *s)
 	return pr_settempstring (pr, res, pr_strdup (pr, s));
 }
 
+VISIBLE string_t
+PR_AllocTempBlock (progs_t *pr, size_t size)
+{
+	prstr_resources_t *res = pr->pr_string_resources;
+	return pr_settempstring (pr, res, pr_strmalloc (pr, size));
+}
+
 VISIBLE string_t
 PR_SetDynamicString (progs_t *pr, const char *s)
 {

From fa0a74efdfc8d2cf6ee222ed91e6dd6cf8637402 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 9 Mar 2020 22:20:11 +0900
Subject: [PATCH 0695/1519] [ruamoko] Finish implementation of __obj_forward

With this, object's implementing forward:: seem to accept the message
well, including receiving all the original args (not quite sure how to
deal with them in ruamoko code just yet, though).
---
 libs/ruamoko/rua_obj.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/libs/ruamoko/rua_obj.c b/libs/ruamoko/rua_obj.c
index 4dca5d218..fb54585c1 100644
--- a/libs/ruamoko/rua_obj.c
+++ b/libs/ruamoko/rua_obj.c
@@ -1257,6 +1257,25 @@ rua___obj_forward (progs_t *pr)
 	}
 	if (obj_reponds_to (probj, obj, fwd_sel)) {
 		imp = get_imp (probj, class, fwd_sel);
+		// forward:(SEL) sel :(@va_list) args
+		// args is full param list
+		//FIXME oh for a stack
+		size_t      size = pr->pr_argc * sizeof (pr_type_t);
+		string_t    args_block = PR_AllocTempBlock (pr, size);
+
+		int         argc = pr->pr_argc;
+		__auto_type argv = (pr_type_t *) PR_GetString (pr, args_block);
+		// can't memcpy all params because 0 and 1 could be anywhere
+		memcpy (argv + 0, &P_INT (pr, 0), 4 * sizeof (pr_type_t));
+		memcpy (argv + 4, &P_INT (pr, 1), 4 * sizeof (pr_type_t));
+		memcpy (argv + 8, &P_INT (pr, 2), (argc - 2) * sizeof (pr_type_t));
+
+		PR_RESET_PARAMS (pr);
+		P_POINTER (pr, 0) = PR_SetPointer (pr, obj);
+		P_POINTER (pr, 1) = PR_SetPointer (pr, fwd_sel);
+		P_POINTER (pr, 2) = PR_SetPointer (pr, sel);
+		P_PACKED  (pr, pr_va_list_t, 3).count = argc;
+		P_PACKED  (pr, pr_va_list_t, 3).list = PR_SetPointer (pr, argv);
 		PR_CallFunction (pr, imp);
 		return;
 	}

From 9b0368039eef0cccebd8c8c302af2cd3c15d64fb Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 9 Mar 2020 22:54:22 +0900
Subject: [PATCH 0696/1519] [ruamoko] Include param size in size of args block

I forget it every time. It really doesn't help that params are 4 words
and words are 4 bytes, so seeing a size of 12 for 3 parameters *looks*
right.
---
 libs/ruamoko/rua_obj.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/ruamoko/rua_obj.c b/libs/ruamoko/rua_obj.c
index fb54585c1..a88edacc0 100644
--- a/libs/ruamoko/rua_obj.c
+++ b/libs/ruamoko/rua_obj.c
@@ -1260,7 +1260,7 @@ rua___obj_forward (progs_t *pr)
 		// forward:(SEL) sel :(@va_list) args
 		// args is full param list
 		//FIXME oh for a stack
-		size_t      size = pr->pr_argc * sizeof (pr_type_t);
+		size_t      size = pr->pr_argc * pr->pr_param_size * sizeof(pr_type_t);
 		string_t    args_block = PR_AllocTempBlock (pr, size);
 
 		int         argc = pr->pr_argc;

From f290b115a5724535e8d2de303cde55662a14e553 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 9 Mar 2020 23:36:09 +0900
Subject: [PATCH 0697/1519] [gamecode] Add function PR_PushTempString

This "pushes" a temp string onto the callee's stack frame after removing
it from the caller's stack frame. This is so builtins can pass
auto-freed memory to called progs code. No checking is done, but mayhem
is likely to ensue if a string is pushed that was allocated in an
earlier frame.
---
 include/QF/progs.h         | 12 ++++++++++++
 libs/gamecode/pr_exec.c    | 12 +++++++++++-
 libs/gamecode/pr_strings.c | 21 +++++++++++++++++++++
 3 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/include/QF/progs.h b/include/QF/progs.h
index 28a2890d2..2659ce303 100644
--- a/include/QF/progs.h
+++ b/include/QF/progs.h
@@ -1286,6 +1286,17 @@ string_t PR_SetTempString(progs_t *pr, const char *s);
 */
 string_t PR_AllocTempBlock (progs_t *pr, size_t size);
 
+/**	Push a temporary string to the callee stack frame
+
+	This is for when the temp string needs to be freed when the called function
+	returns rather than the calling function. It is an error to push a non-temp
+	string.
+
+	\param pr		pointer to ::progs_t VM struct
+	\param num		string index of the temp string
+*/
+void PR_PushTempString (progs_t *pr, string_t num);
+
 /** Make a temporary progs string that is the concatenation of two C strings.
 	\param pr		pointer to ::progs_t VM struct
 	\param a		C string
@@ -1733,6 +1744,7 @@ struct progs_s {
 	///@{
 	struct prstr_resources_s *pr_string_resources;
 	strref_t   *pr_xtstr;
+	strref_t   *pr_pushtstr;
 	int         float_promoted;	///< for PR_Sprintf
 	///@}
 
diff --git a/libs/gamecode/pr_exec.c b/libs/gamecode/pr_exec.c
index b933572e4..7f097dcf7 100644
--- a/libs/gamecode/pr_exec.c
+++ b/libs/gamecode/pr_exec.c
@@ -123,7 +123,8 @@ PR_PushFrame (progs_t *pr)
 	frame->f    = pr->pr_xfunction;
 	frame->tstr = pr->pr_xtstr;
 
-	pr->pr_xtstr = 0;
+	pr->pr_xtstr = pr->pr_pushtstr;
+	pr->pr_pushtstr = 0;
 	pr->pr_xfunction = 0;
 }
 
@@ -137,6 +138,15 @@ PR_PopFrame (progs_t *pr)
 
 	if (pr->pr_xtstr)
 		PR_FreeTempStrings (pr);
+	// normally, this won't happen, but if a builtin pushed a temp string
+	// when calling a function and the callee was another builtin that
+	// did not call a progs function, then the push strings will still be
+	// valid because PR_EnterFunction was never called
+	if (pr->pr_pushtstr) {
+		pr->pr_xtstr = pr->pr_pushtstr;
+		pr->pr_pushtstr = 0;
+		PR_FreeTempStrings (pr);
+	}
 
 	// up stack
 	frame = pr->pr_stack + --pr->pr_depth;
diff --git a/libs/gamecode/pr_strings.c b/libs/gamecode/pr_strings.c
index d9eee8fa2..00bb16e4f 100644
--- a/libs/gamecode/pr_strings.c
+++ b/libs/gamecode/pr_strings.c
@@ -520,6 +520,27 @@ PR_AllocTempBlock (progs_t *pr, size_t size)
 	return pr_settempstring (pr, res, pr_strmalloc (pr, size));
 }
 
+VISIBLE void
+PR_PushTempString (progs_t *pr, string_t num)
+{
+	prstr_resources_t *res = pr->pr_string_resources;
+	strref_t   *ref = get_strref (res, num);
+	strref_t  **temp_ref;
+
+	if (!ref || ref->type != str_temp) {
+		PR_Error (pr, "attempt to push a non-temp string");
+	}
+	for (temp_ref = &pr->pr_xtstr; *temp_ref; temp_ref = &(*temp_ref)->next) {
+		if (*temp_ref == ref) {
+			*temp_ref = ref->next;
+			ref->next = pr->pr_pushtstr;
+			pr->pr_pushtstr = ref;
+			return;
+		}
+	}
+	PR_Error (pr, "attempt to push stale temp string");
+}
+
 VISIBLE string_t
 PR_SetDynamicString (progs_t *pr, const char *s)
 {

From af37b660e8c3be492984ee213423f449eb5798c6 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 9 Mar 2020 23:38:27 +0900
Subject: [PATCH 0698/1519] [ruamoko] Push the forwarded args block

This causes the block to be freed when the forward: handler returns
(assuming it's not yet another builtin). This is necessary so calling a
lot of forwarded messages in a loop doesn't leak memory (though it will
get freed eventually).
---
 libs/ruamoko/rua_obj.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libs/ruamoko/rua_obj.c b/libs/ruamoko/rua_obj.c
index a88edacc0..35557b5ff 100644
--- a/libs/ruamoko/rua_obj.c
+++ b/libs/ruamoko/rua_obj.c
@@ -1276,6 +1276,7 @@ rua___obj_forward (progs_t *pr)
 		P_POINTER (pr, 2) = PR_SetPointer (pr, sel);
 		P_PACKED  (pr, pr_va_list_t, 3).count = argc;
 		P_PACKED  (pr, pr_va_list_t, 3).list = PR_SetPointer (pr, argv);
+		PR_PushTempString (pr, args_block);
 		PR_CallFunction (pr, imp);
 		return;
 	}

From 2a152e63563aaf1f016466c967819f13bc4d0ac0 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 10 Mar 2020 00:07:01 +0900
Subject: [PATCH 0699/1519] [ruamoko] Add builtin __obj_responds_to

Fast dtable-based messages response test. However, it does not handle
forwarding.
---
 libs/ruamoko/rua_obj.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/libs/ruamoko/rua_obj.c b/libs/ruamoko/rua_obj.c
index 35557b5ff..c249e2b6a 100644
--- a/libs/ruamoko/rua_obj.c
+++ b/libs/ruamoko/rua_obj.c
@@ -1312,6 +1312,16 @@ rua___obj_forward (progs_t *pr)
 	PR_RunError (pr, "%s", probj->msg->str);
 }
 
+static void
+rua___obj_responds_to (progs_t *pr)
+{
+	probj_t    *probj = pr->pr_objective_resources;
+	pr_id_t    *obj = &P_STRUCT (pr, pr_id_t, 0);
+	pr_sel_t   *sel = &P_STRUCT (pr, pr_sel_t, 1);
+
+	R_INT (pr) = obj_reponds_to (probj, obj, sel);
+}
+
 static void
 rua_obj_error (progs_t *pr)
 {
@@ -2032,6 +2042,7 @@ rua_PR_FindGlobal (progs_t *pr)
 static builtin_t obj_methods [] = {
 	{"__obj_exec_class",			rua___obj_exec_class,			-1},
 	{"__obj_forward",				rua___obj_forward,				-1},
+	{"__obj_responds_to",			rua___obj_responds_to,			-1},
 
 	{"obj_error",					rua_obj_error,					-1},
 	{"obj_verror",					rua_obj_verror,					-1},

From 4978713dee093902bdf5753daa3f2ca06cb13602 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 10 Mar 2020 00:09:46 +0900
Subject: [PATCH 0700/1519] [libr] Add __obj_responds_to proto and definition

---
 ruamoko/include/runtime.h | 3 ++-
 ruamoko/lib/Object.r      | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ruamoko/include/runtime.h b/ruamoko/include/runtime.h
index 357416e26..80e0aff7e 100644
--- a/ruamoko/include/runtime.h
+++ b/ruamoko/include/runtime.h
@@ -38,7 +38,8 @@ typedef enum {
 	YES			///< a true value
 } BOOL;
 
-@extern void __obj_forward(id, SEL, ...);
+@extern void __obj_forward(id obj, SEL sel, ...);
+@extern BOOL __obj_responds_to(id obj, SEL sel);
 @extern void obj_error (id object, int code, string fmt, ...);
 @extern void obj_verror (id object, int code, string fmt, @va_list args);
 //obj_error_handler obj_set_error_handler (objc_error_handler func);
diff --git a/ruamoko/lib/Object.r b/ruamoko/lib/Object.r
index 07de4b7eb..21e53326f 100644
--- a/ruamoko/lib/Object.r
+++ b/ruamoko/lib/Object.r
@@ -9,6 +9,7 @@ static void link__obj_forward (void)
 void *PR_FindGlobal (string name) = #0;	//FIXME where?
 
 void __obj_exec_class (struct obj_module *msg) = #0;
+BOOL __obj_responds_to(id obj, SEL sel) = #0;
 void (id object, int code, string fmt, ...) obj_error = #0;
 void (id object, int code, string fmt, @va_list args) obj_verror = #0;
 //obj_error_handler (objc_error_handler func) obj_set_error_handler = #0;

From e9eab683666b9829e9f6dd8c3bb7d1d7efab6589 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 10 Mar 2020 02:39:18 +0900
Subject: [PATCH 0701/1519] [qwaq] Begin work on local drawing buffers

---
 ruamoko/qwaq/Makefile.am |  2 +
 ruamoko/qwaq/qwaq-draw.h | 25 +++++++++---
 ruamoko/qwaq/qwaq-draw.r | 86 ++++++++++++++++++++++++++++++++++++++++
 ruamoko/qwaq/qwaq-rect.h |  1 +
 ruamoko/qwaq/qwaq-rect.r | 39 ++++++++++++++++++
 ruamoko/qwaq/qwaq-view.r | 16 --------
 6 files changed, 148 insertions(+), 21 deletions(-)
 create mode 100644 ruamoko/qwaq/qwaq-draw.r
 create mode 100644 ruamoko/qwaq/qwaq-rect.r

diff --git a/ruamoko/qwaq/Makefile.am b/ruamoko/qwaq/Makefile.am
index bf8c2c9b8..dc5fa56b9 100644
--- a/ruamoko/qwaq/Makefile.am
+++ b/ruamoko/qwaq/Makefile.am
@@ -25,7 +25,9 @@ SUFFIXES=.o .r
 
 qwaq_app_dat_src= \
 	qwaq-app.r \
+	qwaq-draw.r \
 	qwaq-group.r \
+	qwaq-rect.r \
 	qwaq-screen.r \
 	qwaq-textcontext.r \
 	qwaq-view.r \
diff --git a/ruamoko/qwaq/qwaq-draw.h b/ruamoko/qwaq/qwaq-draw.h
index 983dd8074..50475fa3d 100644
--- a/ruamoko/qwaq/qwaq-draw.h
+++ b/ruamoko/qwaq/qwaq-draw.h
@@ -1,11 +1,26 @@
 #ifndef __qwaq_draw_h
 #define __qwaq_draw_h
 
-@protocol Draw
--draw;
--redraw;
--setOwner: owner;
--(struct window_s*) getWindow;
+#include <Object.h>
+
+#include "qwaq-rect.h"
+
+@interface DrawBuffer : Object
+{
+	int        *buffer;
+	Extent      size;
+	Point       cursor;
+}
++ (DrawBuffer *) buffer: (Extent) size;
+- initWithSize: (Extent) size;
+- blitFromBuffer: (DrawBuffer *) srcBuffer to: (Point) pos from: (Rect) rect;
+
+- (void) printf: (string) fmt, ...;
+- (void) vprintf: (string) fmt, @va_list args;
+- (void) addch: (int) ch;
+- (void) mvprintf: (Point) pos, string fmt, ...;
+- (void) mvvprintf: (Point) pos, string fmt, @va_list args;
+- (void) mvaddch: (Point) pos, int ch;
 @end
 
 #endif
diff --git a/ruamoko/qwaq/qwaq-draw.r b/ruamoko/qwaq/qwaq-draw.r
new file mode 100644
index 000000000..8ee7ad029
--- /dev/null
+++ b/ruamoko/qwaq/qwaq-draw.r
@@ -0,0 +1,86 @@
+#include "qwaq-curses.h"
+#include "qwaq-draw.h"
+
+@implementation DrawBuffer
+
++ (DrawBuffer *) buffer: (Extent) size
+{
+	return [[self alloc] initWithSize: size];
+}
+
+- initWithSize: (Extent) size
+{
+	if (!(self = [super init])) {
+		return nil;
+	}
+	buffer = obj_malloc (size.width * size.height);
+	self.size = size;
+	return self;
+}
+
+- blitFromBuffer: (DrawBuffer *) srcBuffer to: (Point) pos from: (Rect) rect
+{
+	Extent srcSize = srcBuffer.size;
+	Rect r = { {}, srcBuffer.size };
+	Rect t = { pos, rect.extent };
+
+	t = clipRect (r, t);
+	if (t.extent.width < 0 || t.extent.height < 0) {
+		return self;
+	}
+
+	rect.offset.x += t.offset.x - pos.x;
+	rect.offset.y += t.offset.y - pos.y;
+	rect.extent = t.extent;
+	pos = t.offset;
+
+	r.offset = nil;
+	r.extent = size;
+
+	rect = clipRect (r, rect);
+	if (rect.extent.width < 0 || rect.extent.height < 0) {
+		return self;
+	}
+
+	int        *dst = buffer + pos.y * size.width + pos.x;
+	int        *src = srcBuffer.buffer
+					  + rect.offset.y * srcSize.width + rect.offset.x;
+	for (int y = 0; y < rect.extent.height; y++) {
+		int        *d = dst;
+		int        *s = src;
+		dst += size.width;
+		src += srcSize.width;
+		for (int x = 0; x < rect.extent.width; x++) {
+			// FIXME 1) need memcpy/memmove
+			// 2) the generated code could be better
+			 *d++ = *s++;
+		}
+	}
+	return self;
+}
+
+- (void) printf: (string) fmt, ...
+{
+}
+
+- (void) vprintf: (string) fmt, @va_list args
+{
+}
+
+- (void) addch: (int) ch
+{
+}
+
+- (void) mvprintf: (Point) pos, string fmt, ...
+{
+}
+
+- (void) mvvprintf: (Point) pos, string fmt, @va_list args
+{
+}
+
+- (void) mvaddch: (Point) pos, int ch
+{
+}
+
+@end
diff --git a/ruamoko/qwaq/qwaq-rect.h b/ruamoko/qwaq/qwaq-rect.h
index 92c241f40..9d4fc51e4 100644
--- a/ruamoko/qwaq/qwaq-rect.h
+++ b/ruamoko/qwaq/qwaq-rect.h
@@ -21,6 +21,7 @@ typedef struct Rect_s {
 //XXX will not work if point or rect point to a local variabl
 @extern int rectContainsPoint (Rect *rect, Point *point);
 @extern Rect getwrect (struct window_s *window);
+@extern Rect clipRect (Rect clipRect, Rect rect);
 #endif
 
 #endif//__qwaq_rect_h
diff --git a/ruamoko/qwaq/qwaq-rect.r b/ruamoko/qwaq/qwaq-rect.r
new file mode 100644
index 000000000..6ee5c7df5
--- /dev/null
+++ b/ruamoko/qwaq/qwaq-rect.r
@@ -0,0 +1,39 @@
+#include "qwaq-rect.h"
+
+Rect
+clipRect (Rect clipRect, Rect rect)
+{
+	if (rect.offset.x < clipRect.offset.x) {
+		int         dist = clipRect.offset.x - rect.offset.x;
+		rect.offset.x += dist;
+		rect.extent.width -= dist;
+	}
+	if (rect.offset.y < clipRect.offset.y) {
+		int         dist = clipRect.offset.y - rect.offset.y;
+		rect.offset.y += dist;
+		rect.extent.height -= dist;
+	}
+	if (rect.offset.x + rect.extent.width > clipRect.extent.width) {
+		rect.extent.width = clipRect.extent.width - rect.offset.x;
+	}
+	if (rect.offset.y + rect.extent.height > clipRect.extent.height) {
+		rect.extent.height = clipRect.extent.height - rect.offset.y;
+	}
+	return rect;
+}
+
+Rect
+makeRect (int xpos, int ypos, int xlen, int ylen)
+{
+	Rect rect = {{xpos, ypos}, {xlen, ylen}};
+	return rect;
+}
+
+int
+rectContainsPoint (Rect *rect, Point *point)
+{
+	return ((point.x >= rect.offset.x
+			 && point.x < rect.offset.x + rect.extent.width)
+			&& (point.y >= rect.offset.y
+				&& point.y < rect.offset.y + rect.extent.height));
+}
diff --git a/ruamoko/qwaq/qwaq-view.r b/ruamoko/qwaq/qwaq-view.r
index 541012a47..fc0ccf90f 100644
--- a/ruamoko/qwaq/qwaq-view.r
+++ b/ruamoko/qwaq/qwaq-view.r
@@ -2,22 +2,6 @@
 #include "qwaq-view.h"
 #include "qwaq-group.h"
 
-Rect
-makeRect (int xpos, int ypos, int xlen, int ylen)
-{
-	Rect rect = {{xpos, ypos}, {xlen, ylen}};
-	return rect;
-}
-
-int
-rectContainsPoint (Rect *rect, Point *point)
-{
-	return ((point.x >= rect.offset.x
-			 && point.x < rect.offset.x + rect.extent.width)
-			&& (point.y >= rect.offset.y
-				&& point.y < rect.offset.y + rect.extent.height));
-}
-
 @implementation View
 
 -init

From 4b7d5447bbe5f8b6b0c760660fcd2ae183544c40 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 10 Mar 2020 02:56:37 +0900
Subject: [PATCH 0702/1519] [ruamoko] Correct obj_msg_sendv for __obj_forward

Until I implemented forwarding, I didn't know how obj_msg_sendv was
meant to be used, so no surprise I got the implementation wrong.
---
 libs/ruamoko/rua_obj.c | 35 +++++++++++++++++++++++++++--------
 1 file changed, 27 insertions(+), 8 deletions(-)

diff --git a/libs/ruamoko/rua_obj.c b/libs/ruamoko/rua_obj.c
index c249e2b6a..f02bedcc3 100644
--- a/libs/ruamoko/rua_obj.c
+++ b/libs/ruamoko/rua_obj.c
@@ -1386,22 +1386,41 @@ static void
 rua_obj_msg_sendv (progs_t *pr)
 {
 	probj_t    *probj = pr->pr_objective_resources;
+	pointer_t   obj = P_POINTER (pr, 0);
 	pr_id_t    *receiver = &P_STRUCT (pr, pr_id_t, 0);
+	pointer_t   sel = P_POINTER (pr, 1);
 	pr_sel_t   *op = &P_STRUCT (pr, pr_sel_t, 1);
-	pr_va_list_t *args = (pr_va_list_t *) &P_POINTER (pr, 2);
-	pr_type_t  *params = G_GPOINTER (pr, args->list);
-	int         count = args->count;
 	func_t      imp = obj_msg_lookup (probj, receiver, op);
 
-	count = bound (0, count, 6);
-	if (count && pr_boundscheck->int_val)
+	__auto_type args = &P_PACKED (pr, pr_va_list_t, 2);
+	int         count = args->count;
+	pr_type_t  *params = G_GPOINTER (pr, args->list);
+
+	if (count < 2 || count > MAX_PARMS) {
+		PR_RunError (pr, "bad args count in obj_msg_sendv: %d", count);
+	}
+	if (pr_boundscheck->int_val) {
 		PR_BoundsCheckSize (pr, args->list, count * pr->pr_param_size);
-	if (!imp)
+	}
+
+	if (!imp) {
 		PR_RunError (pr, "%s does not respond to %s",
 					 PR_GetString (pr, object_get_class_name (probj, receiver)),
 					 PR_GetString (pr, probj->selector_names[op->sel_id]));
-	if (count)
-		memcpy (pr->pr_params[2], params, count * 4 * pr->pr_param_size);
+	}
+
+	pr->pr_argc = count;
+	// skip over the first two parameters because receiver and op will
+	// replace them
+	count -= 2;
+	params += 2 * pr->pr_param_size;
+	PR_RESET_PARAMS (pr);
+	P_POINTER (pr, 0) = obj;
+	P_POINTER (pr, 1) = sel;
+	if (count) {
+		memcpy (&P_INT (pr, 2), params,
+				count * sizeof (pr_type_t) * pr->pr_param_size);
+	}
 	PR_CallFunction (pr, imp);
 }
 

From f9d798c31439a6528df041944dd1a2496fccb676 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 10 Mar 2020 02:58:30 +0900
Subject: [PATCH 0703/1519] [qwaq] Use forwarding for some text methods

refresh won't be in the drawing buffer protocol, and the move commands
need to be offset by the view's position in its window, but it works as
intended.
---
 ruamoko/qwaq/qwaq-view.h | 10 +++++++---
 ruamoko/qwaq/qwaq-view.r | 20 ++++++++------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-view.h b/ruamoko/qwaq/qwaq-view.h
index 10e0c93ae..086b9d12d 100644
--- a/ruamoko/qwaq/qwaq-view.h
+++ b/ruamoko/qwaq/qwaq-view.h
@@ -59,12 +59,16 @@ enum {
 -redraw;
 
 - (void) refresh;
-- (void) printf: (string) fmt, ...;
-- (void) vprintf: (string) fmt, @va_list args;
-- (void) addch: (int) ch;
 - (void) mvprintf: (Point) pos, string fmt, ...;
 - (void) mvvprintf: (Point) pos, string fmt, @va_list args;
 - (void) mvaddch: (Point) pos, int ch;
 @end
 
+//These are forwarded (FIXME make a protocol)
+@interface View (TextContext)
+- (void) printf: (string) fmt, ...;
+- (void) vprintf: (string) fmt, @va_list args;
+- (void) addch: (int) ch;
+@end
+
 #endif//__qwaq_view_h
diff --git a/ruamoko/qwaq/qwaq-view.r b/ruamoko/qwaq/qwaq-view.r
index fc0ccf90f..98cdf4429 100644
--- a/ruamoko/qwaq/qwaq-view.r
+++ b/ruamoko/qwaq/qwaq-view.r
@@ -89,14 +89,15 @@ updateScreenCursor (View *view)
 	return &rect;
 }
 
-- (void) printf: (string) fmt, ...
+- (void) forward: (SEL) sel : (@va_list) args
 {
-	[textContext vprintf: fmt, @args];
-}
-
-- (void) vprintf: (string) fmt, @va_list args
-{
-	[textContext vprintf: fmt, args];
+	if (!textContext) {
+		return;
+	}
+	if (!__obj_responds_to (textContext, sel)) {
+		[self error: "no implementation for %s", sel_get_name (sel)];
+	}
+	obj_msg_sendv (textContext, sel, args);
 }
 
 - (void) refresh
@@ -104,11 +105,6 @@ updateScreenCursor (View *view)
 	[textContext refresh];
 }
 
-- (void) addch: (int) ch
-{
-	[textContext addch:ch];
-}
-
 - (void) mvprintf: (Point) pos, string fmt, ...
 {
 	pos.x += xpos;

From 21b64421c3aaf2339c000b5e5fc805181f554fd1 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 10 Mar 2020 03:09:21 +0900
Subject: [PATCH 0704/1519] [ruamoko] Copy ALL the params to the args block

*sigh*
---
 libs/ruamoko/rua_obj.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libs/ruamoko/rua_obj.c b/libs/ruamoko/rua_obj.c
index f02bedcc3..c30683d0e 100644
--- a/libs/ruamoko/rua_obj.c
+++ b/libs/ruamoko/rua_obj.c
@@ -1260,7 +1260,8 @@ rua___obj_forward (progs_t *pr)
 		// forward:(SEL) sel :(@va_list) args
 		// args is full param list
 		//FIXME oh for a stack
-		size_t      size = pr->pr_argc * pr->pr_param_size * sizeof(pr_type_t);
+		size_t      parm_size = pr->pr_param_size * sizeof(pr_type_t);
+		size_t      size = pr->pr_argc * parm_size;
 		string_t    args_block = PR_AllocTempBlock (pr, size);
 
 		int         argc = pr->pr_argc;
@@ -1268,7 +1269,7 @@ rua___obj_forward (progs_t *pr)
 		// can't memcpy all params because 0 and 1 could be anywhere
 		memcpy (argv + 0, &P_INT (pr, 0), 4 * sizeof (pr_type_t));
 		memcpy (argv + 4, &P_INT (pr, 1), 4 * sizeof (pr_type_t));
-		memcpy (argv + 8, &P_INT (pr, 2), (argc - 2) * sizeof (pr_type_t));
+		memcpy (argv + 8, &P_INT (pr, 2), (argc - 2) * parm_size);
 
 		PR_RESET_PARAMS (pr);
 		P_POINTER (pr, 0) = PR_SetPointer (pr, obj);

From fb92ee12d67b8a82f69515b1da23d0156216e211 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 10 Mar 2020 03:10:55 +0900
Subject: [PATCH 0705/1519] [qwaq] Set event type to none when no events

Fixes the endless looping on the last event.
---
 ruamoko/qwaq/qwaq-curses.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ruamoko/qwaq/qwaq-curses.c b/ruamoko/qwaq/qwaq-curses.c
index 1981a434c..de5ed8ef0 100644
--- a/ruamoko/qwaq/qwaq-curses.c
+++ b/ruamoko/qwaq/qwaq-curses.c
@@ -733,6 +733,7 @@ get_event (qwaq_resources_t *res, qwaq_event_t *event)
 		}
 		return 1;
 	}
+	event->what = qe_none;
 	return 0;
 }
 

From 6c56e93fc8f2edfc4796ee8f35aa3cca368b6f64 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 10 Mar 2020 03:24:31 +0900
Subject: [PATCH 0706/1519] [gamecode] Be more careful with temp strings

If a temp string is found in the return slot, PR_FreeTempStrings won't
delete the string. However, PR_PopFrame was blindly stomping on the
possibly surviving temp string with the push strings, which would cause
a leak.
---
 libs/gamecode/pr_exec.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libs/gamecode/pr_exec.c b/libs/gamecode/pr_exec.c
index 7f097dcf7..47b39bc58 100644
--- a/libs/gamecode/pr_exec.c
+++ b/libs/gamecode/pr_exec.c
@@ -142,7 +142,9 @@ PR_PopFrame (progs_t *pr)
 	// when calling a function and the callee was another builtin that
 	// did not call a progs function, then the push strings will still be
 	// valid because PR_EnterFunction was never called
-	if (pr->pr_pushtstr) {
+	// however, not if a temp string survived: better to hold on to the push
+	// strings a little longer than lose one erroneously
+	if (!pr->pr_xtstr && pr->pr_pushtstr) {
 		pr->pr_xtstr = pr->pr_pushtstr;
 		pr->pr_pushtstr = 0;
 		PR_FreeTempStrings (pr);

From b517b95e45201b9bdec5428b1a636ff9e1123a77 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 10 Mar 2020 14:29:43 +0900
Subject: [PATCH 0707/1519] [libr] Add -performv::

---
 ruamoko/include/Object.h | 4 ++++
 ruamoko/lib/Object.r     | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/ruamoko/include/Object.h b/ruamoko/include/Object.h
index eb10e55ef..981977651 100644
--- a/ruamoko/include/Object.h
+++ b/ruamoko/include/Object.h
@@ -24,6 +24,10 @@
 - (id) performSelector: (SEL)aSelector
 			withObject: (void *)anObject
 			withObject: (void *)anotherObject;
+// void return does not touch the actual return value (effectively retval)
+// so if the target returns a value, and the forwarding method simply returns
+// (and is void), the vallue will get out to the caller
+- (void) performv: (SEL) sel : (@va_list) args;
 - (BOOL) respondsToSelector: (SEL)aSelector;
 - (BOOL) conformsToProtocol: (Protocol *)aProtocol;
 
diff --git a/ruamoko/lib/Object.r b/ruamoko/lib/Object.r
index 21e53326f..6c7e0e6f4 100644
--- a/ruamoko/lib/Object.r
+++ b/ruamoko/lib/Object.r
@@ -280,6 +280,11 @@ BOOL (id object) object_is_meta_class = #0;
 	return msg (self, aSelector, anObject, anotherObject);
 }
 
+- (void) performv: (SEL) sel : (@va_list) args
+{
+	obj_msg_sendv (self, sel, args);
+}
+
 - (void) doesNotRecognizeSelector: (SEL)aSelector
 {
 	[self error: "%s does not recognize %s",

From 1b1249bdb0887c44a46b189153816eeed49806a4 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 10 Mar 2020 18:16:07 +0900
Subject: [PATCH 0708/1519] [ruamoko] Add vsprintf builtin

---
 libs/ruamoko/pr_cmds.c   | 20 ++++++++++++++++++++
 ruamoko/include/string.h |  1 +
 ruamoko/lib/string.r     |  1 +
 3 files changed, 22 insertions(+)

diff --git a/libs/ruamoko/pr_cmds.c b/libs/ruamoko/pr_cmds.c
index 8c6aa3d58..9a531fb14 100644
--- a/libs/ruamoko/pr_cmds.c
+++ b/libs/ruamoko/pr_cmds.c
@@ -583,6 +583,25 @@ PF_sprintf (progs_t *pr)
 	dstring_delete (dstr);
 }
 
+static void
+PF_vsprintf (progs_t *pr)
+{
+	const char *fmt = P_GSTRING (pr, 0);
+	__auto_type args = &P_PACKED (pr, pr_va_list_t, 1);
+	pr_type_t  *list_start = PR_GetPointer (pr, args->list);
+	pr_type_t **list = alloca (args->count * sizeof (*list));
+	dstring_t  *dstr;
+
+	for (int i = 0; i < args->count; i++) {
+		list[i] = list_start + i * pr->pr_param_size;
+	}
+
+	dstr = dstring_newstr ();
+	PR_Sprintf (pr, dstr, "PF_vsprintf", fmt, args->count, list);
+	RETURN_STRING (pr, dstr->str);
+	dstring_delete (dstr);
+}
+
 /*
 	string () gametype
 */
@@ -643,6 +662,7 @@ static builtin_t builtins[] = {
 	{"strlen",			PF_strlen,			QF 100},
 	{"charcount",		PF_charcount,		QF 101},
 	{"sprintf",			PF_sprintf,			QF 109},
+	{"vsprintf",		PF_vsprintf,		-1},
 	{"ftoi",			PF_ftoi,			QF 110},
 	{"itof",			PF_itof,			QF 111},
 	{"itos",			PF_itos,			QF 112},
diff --git a/ruamoko/include/string.h b/ruamoko/include/string.h
index c4136e2fc..d41e94ef8 100644
--- a/ruamoko/include/string.h
+++ b/ruamoko/include/string.h
@@ -7,6 +7,7 @@
 @extern float strlen (string s);
 @extern float charcount (string goal, string s);
 @extern string sprintf (string fmt, ...);
+@extern string vsprintf (string fmt, @va_list args);
 @extern string itos (int i);
 @extern int stoi (string s);
 @extern vector stov (string s);
diff --git a/ruamoko/lib/string.r b/ruamoko/lib/string.r
index 36247bf91..c6c239fa6 100644
--- a/ruamoko/lib/string.r
+++ b/ruamoko/lib/string.r
@@ -6,6 +6,7 @@ float (string s) stof = #81;
 float (string s) strlen = #0x000f0000 + 100;
 float (string goal, string s) charcount = #0x000f0000 + 101;
 string (string fmt, ...) sprintf = #0x000f0000 + 109;
+string vsprintf (string fmt, @va_list args) = #0;
 string (int i) itos = #0x000f0000 + 112;
 int (string s) stoi = #0x000f0000 + 113;
 vector (string s) stov = #0x000f0000 + 114;

From 694ad2e840c07c01ca7806adeaa4b39bc88ed4be Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 10 Mar 2020 18:16:55 +0900
Subject: [PATCH 0709/1519] [ruamoko] Add str_char builtin

This returns the character (as an int) at the index. Equivalent to
string[index], but qc code doesn't have char-level access and not having
it means that strings can internally change to wchar without too much
fuss (maybe).
---
 libs/ruamoko/rua_string.c | 13 +++++++++++++
 ruamoko/include/string.h  |  1 +
 ruamoko/lib/string.r      |  1 +
 3 files changed, 15 insertions(+)

diff --git a/libs/ruamoko/rua_string.c b/libs/ruamoko/rua_string.c
index fcd78c1cc..c96f44e57 100644
--- a/libs/ruamoko/rua_string.c
+++ b/libs/ruamoko/rua_string.c
@@ -134,6 +134,18 @@ bi_str_str (progs_t *pr)
 		R_STRING (pr) = res - pr->pr_strings;
 }
 
+static void
+bi_str_char (progs_t *pr)
+{
+	const char *str = P_GSTRING (pr, 0);
+	int         ind = P_INT (pr, 1);
+
+	if (ind < 0) {
+		PR_RunError (pr, "negative index to str_char");
+	}
+	R_INT (pr) = str[ind];
+}
+
 static builtin_t builtins[] = {
 	{"str_new",		bi_str_new,		-1},
 	{"str_free",	bi_str_free,	-1},
@@ -143,6 +155,7 @@ static builtin_t builtins[] = {
 	{"str_mid|*i",	bi_str_mid,		-1},
 	{"str_mid|*ii",	bi_str_mid,		-1},
 	{"str_str",		bi_str_str,		-1},
+	{"str_char",	bi_str_char,	-1},
 	{0}
 };
 
diff --git a/ruamoko/include/string.h b/ruamoko/include/string.h
index d41e94ef8..3951c94c5 100644
--- a/ruamoko/include/string.h
+++ b/ruamoko/include/string.h
@@ -20,5 +20,6 @@
 @extern @overload string str_mid (string str, int start);
 @extern @overload string str_mid (string str, int start, int len);
 @extern string str_str (string haystack, string needle);
+@extern int str_char (string str, int ind);
 
 #endif//__ruamoko_string_h
diff --git a/ruamoko/lib/string.r b/ruamoko/lib/string.r
index c6c239fa6..58f64911a 100644
--- a/ruamoko/lib/string.r
+++ b/ruamoko/lib/string.r
@@ -19,3 +19,4 @@ string (string str) str_clear = #0;
 string (string str, int start) str_mid = #0;
 string (string str, int start, int len) str_mid = #0;
 string (string haystack, string needle) str_str = #0;
+int str_char (string str, int ind) = #0;

From f91fb4f840d352b46f7cae83a4ce4126391bb65c Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 10 Mar 2020 18:21:06 +0900
Subject: [PATCH 0710/1519] [qwaq] Add an mvwblit_line builtin

I had to do my own thing with curses as the function I had planned to
use turned out to be quite different from what I wanted (misread the man
page).
---
 ruamoko/qwaq/qwaq-curses.c      | 54 +++++++++++++++++++++++++++++++++
 ruamoko/qwaq/qwaq-curses.h      |  1 +
 ruamoko/qwaq/qwaq-textcontext.r |  1 +
 3 files changed, 56 insertions(+)

diff --git a/ruamoko/qwaq/qwaq-curses.c b/ruamoko/qwaq/qwaq-curses.c
index de5ed8ef0..8ba194619 100644
--- a/ruamoko/qwaq/qwaq-curses.c
+++ b/ruamoko/qwaq/qwaq-curses.c
@@ -80,6 +80,7 @@ typedef enum qwaq_commands_e {
 	qwaq_cmd_move,
 	qwaq_cmd_curs_set,
 	qwaq_cmd_wborder,
+	qwaq_cmd_mvwblit_line,
 } qwaq_commands;
 
 const char *qwaq_command_names[]= {
@@ -107,6 +108,7 @@ const char *qwaq_command_names[]= {
 	"move",
 	"curs_set",
 	"wborder",
+	"mvwblit_line",
 };
 
 #define RING_BUFFER(type, size) 	\
@@ -617,6 +619,22 @@ cmd_wborder (qwaq_resources_t *res)
 	wborder (window->win, ls, rs, ts, bs, tl, tr, bl, br);
 }
 
+static void
+cmd_mvwblit_line (qwaq_resources_t *res)
+{
+	int         window_id = RB_PEEK_DATA (res->command_queue, 2);
+	int         x = RB_PEEK_DATA (res->command_queue, 3);
+	int         y = RB_PEEK_DATA (res->command_queue, 4);
+	int         chs_id = RB_PEEK_DATA (res->command_queue, 5);
+	int         len = RB_PEEK_DATA (res->command_queue, 6);
+	int        *chs = (int *) res->strings[chs_id].str;
+
+	window_t   *window = get_window (res, __FUNCTION__, window_id);
+	for (int i = 0; i < len; i++) {
+		mvwaddch (window->win, y, x, chs[i]);
+	}
+}
+
 static void
 process_commands (qwaq_resources_t *res)
 {
@@ -701,6 +719,9 @@ process_commands (qwaq_resources_t *res)
 			case qwaq_cmd_wborder:
 				cmd_wborder (res);
 				break;
+			case qwaq_cmd_mvwblit_line:
+				cmd_mvwblit_line (res);
+				break;
 		}
 		RB_DROP_DATA (res->command_queue, RB_PEEK_DATA (res->command_queue, 1));
 	}
@@ -1384,6 +1405,38 @@ bi_wborder (progs_t *pr)
 	qwaq_wborder (pr, window_id, sides, corns);
 }
 
+static void
+qwaq__mvwblit_line (progs_t *pr, int window_id, int x, int y,
+				    int *chs, int len)
+{
+	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
+
+	if (get_window (res, __FUNCTION__, window_id)) {
+		int         chs_id = acquire_string (res);
+		dstring_t  *chs_buf = res->strings + chs_id;
+		int         command[] = { qwaq_cmd_mvwblit_line, 0, window_id,
+								  x, y, chs_id, len,};
+
+		command[1] = CMD_SIZE(command);
+
+		chs_buf->size = len * sizeof (int);
+		dstring_adjust (chs_buf);
+		memcpy (chs_buf->str, chs, len * sizeof (int));
+
+		qwaq_submit_command (res, command);
+	}
+}
+static void
+bi_mvwblit_line (progs_t *pr)
+{
+	int         window_id = P_INT (pr, 0);
+	int         x = P_INT (pr, 1);
+	int         y = P_INT (pr, 2);
+	int        *chs = (int *) P_GPOINTER (pr, 3);
+	int         len = P_INT (pr, 4);
+	qwaq__mvwblit_line (pr, window_id, x, y, chs, len);
+}
+
 static void
 bi_initialize (progs_t *pr)
 {
@@ -1609,6 +1662,7 @@ static builtin_t builtins[] = {
 	{"move",			bi_move,			-1},
 	{"curs_set",		bi_curs_set,		-1},
 	{"wborder",			bi_wborder,			-1},
+	{"mvwblit_line",	bi_mvwblit_line,	-1},
 
 	{"_c_TextContext__is_initialized",	bi_c_TextContext__is_initialized,  -1},
 	{"_c_TextContext__max_colors",		bi_c_TextContext__max_colors,	   -1},
diff --git a/ruamoko/qwaq/qwaq-curses.h b/ruamoko/qwaq/qwaq-curses.h
index 16cd4fe4e..b592ac84b 100644
--- a/ruamoko/qwaq/qwaq-curses.h
+++ b/ruamoko/qwaq/qwaq-curses.h
@@ -120,6 +120,7 @@ typedef struct panel_s *panel_t;
 
 @extern void wborder (window_t window,
 					  box_sides_t sides, box_corners_t corners);
+@extern void mvwblit_line (window_t window, int x, int y, int *wch, int len);
 #endif
 
 #endif//__qwaq_curses_h
diff --git a/ruamoko/qwaq/qwaq-textcontext.r b/ruamoko/qwaq/qwaq-textcontext.r
index 59b54fb6a..1797bde48 100644
--- a/ruamoko/qwaq/qwaq-textcontext.r
+++ b/ruamoko/qwaq/qwaq-textcontext.r
@@ -106,3 +106,4 @@ void doupdate (void) = #0;
 int curs_set (int visibility) = #0;
 int move (int x, int y) = #0;
 void wborder (window_t window, box_sides_t sides, box_corners_t corners) = #0;
+void mvwblit_line (window_t window, int x, int y, int *wch, int len) = #0;

From b3850bbc6986729d12bec63a54b9933979719937 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 10 Mar 2020 19:23:51 +0900
Subject: [PATCH 0711/1519] [qwaq] Implement blitting from draw buffer to text

Sending the data out to curses.
---
 ruamoko/qwaq/qwaq-draw.h        |  4 ++++
 ruamoko/qwaq/qwaq-draw.r        | 10 ++++++++++
 ruamoko/qwaq/qwaq-textcontext.h | 17 +++++++++++++++++
 ruamoko/qwaq/qwaq-textcontext.r | 34 +++++++++++++++++++++++++++++++++
 4 files changed, 65 insertions(+)

diff --git a/ruamoko/qwaq/qwaq-draw.h b/ruamoko/qwaq/qwaq-draw.h
index 50475fa3d..931ea6d12 100644
--- a/ruamoko/qwaq/qwaq-draw.h
+++ b/ruamoko/qwaq/qwaq-draw.h
@@ -13,6 +13,10 @@
 }
 + (DrawBuffer *) buffer: (Extent) size;
 - initWithSize: (Extent) size;
+
+- (Extent) size;
+- (int *) buffer;
+
 - blitFromBuffer: (DrawBuffer *) srcBuffer to: (Point) pos from: (Rect) rect;
 
 - (void) printf: (string) fmt, ...;
diff --git a/ruamoko/qwaq/qwaq-draw.r b/ruamoko/qwaq/qwaq-draw.r
index 8ee7ad029..333d737e4 100644
--- a/ruamoko/qwaq/qwaq-draw.r
+++ b/ruamoko/qwaq/qwaq-draw.r
@@ -18,6 +18,16 @@
 	return self;
 }
 
+- (Extent) size
+{
+	return size;
+}
+
+- (int *) buffer
+{
+	return buffer;
+}
+
 - blitFromBuffer: (DrawBuffer *) srcBuffer to: (Point) pos from: (Rect) rect
 {
 	Extent srcSize = srcBuffer.size;
diff --git a/ruamoko/qwaq/qwaq-textcontext.h b/ruamoko/qwaq/qwaq-textcontext.h
index 4a47b16ca..765f90572 100644
--- a/ruamoko/qwaq/qwaq-textcontext.h
+++ b/ruamoko/qwaq/qwaq-textcontext.h
@@ -6,9 +6,24 @@
 #include "qwaq-curses.h"
 #include "qwaq-rect.h"
 
+@class DrawBuffer;
+
 @interface TextContext : Object
 {
 	window_t    window;
+	union {
+		Rect        rect;
+		struct {
+			Point       offset;
+			Extent      size;
+		};
+		struct {
+			int         xpos;
+			int         ypos;
+			int         xlen;
+			int         ylen;
+		};
+	};
 }
 + (int) max_colors;
 + (int) max_color_pairs;
@@ -25,6 +40,8 @@
 
 -(window_t) window;
 
+- blitFromBuffer: (DrawBuffer *) srcBuffer to: (Point) pos from: (Rect) rect;
+
 - (void) printf: (string) fmt, ...;
 - (void) vprintf: (string) mft, @va_list args;
 - (void) addch: (int) ch;
diff --git a/ruamoko/qwaq/qwaq-textcontext.r b/ruamoko/qwaq/qwaq-textcontext.r
index 1797bde48..726872ccf 100644
--- a/ruamoko/qwaq/qwaq-textcontext.r
+++ b/ruamoko/qwaq/qwaq-textcontext.r
@@ -1,3 +1,4 @@
+#include "qwaq-draw.h"
 #include "qwaq-textcontext.h"
 
 @implementation TextContext
@@ -59,6 +60,39 @@ static TextContext *screen;
 	return window;
 }
 
+- blitFromBuffer: (DrawBuffer *) srcBuffer to: (Point) pos from: (Rect) rect
+{
+	Extent srcSize = [srcBuffer size];
+	Rect r = { {}, srcSize };
+	Rect t = { pos, rect.extent };
+
+	t = clipRect (r, t);
+	if (t.extent.width < 0 || t.extent.height < 0) {
+		return self;
+	}
+
+	rect.offset.x += t.offset.x - pos.x;
+	rect.offset.y += t.offset.y - pos.y;
+	rect.extent = t.extent;
+	pos = t.offset;
+
+	r.offset = nil;
+	r.extent = size;
+
+	rect = clipRect (r, rect);
+	if (rect.extent.width < 0 || rect.extent.height < 0) {
+		return self;
+	}
+
+	int        *src = [srcBuffer buffer]
+					  + rect.offset.y * srcSize.width + rect.offset.x;
+	for (int y = 0; y < rect.extent.height; y++) {
+		mvwblit_line (window, pos.x, y + pos.y, src, rect.extent.width);
+		src += srcSize.width;
+	}
+	return self;
+}
+
 - (void) mvprintf: (Point) pos, string fmt, ... = #0;
 - (void) printf: (string) fmt, ... = #0;
 - (void) vprintf: (string) mft, @va_list args = #0;

From ce67d9b202d878001ba614a3f5849fa844c110fe Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 10 Mar 2020 19:27:26 +0900
Subject: [PATCH 0712/1519] [qwaq] Flesh out DrawBuffer's methods

---
 ruamoko/qwaq/qwaq-draw.h |  2 ++
 ruamoko/qwaq/qwaq-draw.r | 70 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 72 insertions(+)

diff --git a/ruamoko/qwaq/qwaq-draw.h b/ruamoko/qwaq/qwaq-draw.h
index 931ea6d12..a0ef18dc1 100644
--- a/ruamoko/qwaq/qwaq-draw.h
+++ b/ruamoko/qwaq/qwaq-draw.h
@@ -22,9 +22,11 @@
 - (void) printf: (string) fmt, ...;
 - (void) vprintf: (string) fmt, @va_list args;
 - (void) addch: (int) ch;
+- (void) addstr: (string) str;
 - (void) mvprintf: (Point) pos, string fmt, ...;
 - (void) mvvprintf: (Point) pos, string fmt, @va_list args;
 - (void) mvaddch: (Point) pos, int ch;
+- (void) mvaddstr: (Point) pos, string str;
 @end
 
 #endif
diff --git a/ruamoko/qwaq/qwaq-draw.r b/ruamoko/qwaq/qwaq-draw.r
index 333d737e4..66e266a50 100644
--- a/ruamoko/qwaq/qwaq-draw.r
+++ b/ruamoko/qwaq/qwaq-draw.r
@@ -1,3 +1,5 @@
+#include <string.h>
+
 #include "qwaq-curses.h"
 #include "qwaq-draw.h"
 
@@ -71,26 +73,94 @@
 
 - (void) printf: (string) fmt, ...
 {
+	string str = vsprintf (fmt, @args);
+	[self addstr: str];
 }
 
 - (void) vprintf: (string) fmt, @va_list args
 {
+	string str = vsprintf (fmt, args);
+	[self addstr: str];
 }
 
 - (void) addch: (int) ch
 {
+	if (cursor.x < 0) {
+		cursor.x = 0;
+	}
+	if (cursor.y < 0) {
+		cursor.y = 0;
+	}
+	if (cursor.x >= size.width && cursor.y < size.height) {
+		cursor.x = 0;
+		cursor.y++;
+	}
+	if (cursor.y >= size.height) {
+		return;
+	}
+	if (ch == '\n') {
+		cursor.x = 0;
+		cursor.y++;
+	} else if (ch == '\r') {
+		cursor.x = 0;
+	} else {
+		buffer[cursor.y * size.width + cursor.x++] = ch;
+	}
+}
+
+- (void) addstr: (string) str
+{
+	int         ind = 0;
+	int         ch;
+
+	if (cursor.y >= size.height) {
+		return;
+	}
+	while (cursor.x < size.width && (ch = str_char (str, ind++))) {
+		[self addch: ch];
+	}
 }
 
 - (void) mvprintf: (Point) pos, string fmt, ...
 {
+	if (pos.x < 0 || pos.x >= size.width
+		|| pos.y < 0 || pos.y >= size.height) {
+		return;
+	}
+	cursor = pos;
+	string str = vsprintf (fmt, @args);
+	[self addstr: str];
 }
 
 - (void) mvvprintf: (Point) pos, string fmt, @va_list args
 {
+	if (pos.x < 0 || pos.x >= size.width
+		|| pos.y < 0 || pos.y >= size.height) {
+		return;
+	}
+	cursor = pos;
+	string str = vsprintf (fmt, args);
+	[self addstr: str];
 }
 
 - (void) mvaddch: (Point) pos, int ch
 {
+	if (pos.x < 0 || pos.x >= size.width
+		|| pos.y < 0 || pos.y >= size.height) {
+		return;
+	}
+	cursor = pos;
+	[self addch: ch];
+}
+
+- (void) mvaddstr: (Point) pos, string str
+{
+	if (pos.x < 0 || pos.x >= size.width
+		|| pos.y < 0 || pos.y >= size.height) {
+		return;
+	}
+	cursor = pos;
+	[self addstr: str];
 }
 
 @end

From 9acfdea8b50f3e7cf1e4732177e76b93411fc1a5 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 11 Mar 2020 01:52:45 +0900
Subject: [PATCH 0713/1519] [qfcc] Improve line number binding for function
 calls

Multi-line calls (especially messages) got rather confusing to read as
the lines jumped back and forth. Now the binding is better but the dags
code is reordering the parameters sometimes.
---
 tools/qfcc/include/expr.h |  8 ++++++++
 tools/qfcc/source/expr.c  | 33 ++++++++++++++++++++++++---------
 2 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/tools/qfcc/include/expr.h b/tools/qfcc/include/expr.h
index ac2646dfe..f0f118e8d 100644
--- a/tools/qfcc/include/expr.h
+++ b/tools/qfcc/include/expr.h
@@ -264,6 +264,14 @@ expr_t *new_expr (void);
 */
 expr_t *copy_expr (expr_t *e);
 
+/**	Copy source expression's file and line to the destination expression
+
+	\param dst		The expression to receive the file and line
+	\param src		The expression from which the file and line will be taken
+	\return			\a dst
+*/
+expr_t *expr_file_line (expr_t *dst, const expr_t *src);
+
 /**	Create a new label name.
 
 	The label name is guaranteed to to the compilation. It is made up of the
diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index c1c78ff86..67206c663 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -432,6 +432,14 @@ copy_expr (expr_t *e)
 	internal_error (e, "invalid expression");
 }
 
+expr_t *
+expr_file_line (expr_t *dst, const expr_t *src)
+{
+	dst->file = src->file;
+	dst->line = src->line;
+	return dst;
+}
+
 const char *
 new_label_name (void)
 {
@@ -1654,6 +1662,7 @@ build_function_call (expr_t *fexpr, const type_t *ftype, expr_t *params)
 	type_t     *arg_types[MAX_PARMS];
 	expr_t     *arg_exprs[MAX_PARMS][2];
 	int         arg_expr_count = 0;
+	expr_t     *assign;
 	expr_t     *call;
 	expr_t     *err = 0;
 
@@ -1741,29 +1750,33 @@ build_function_call (expr_t *fexpr, const type_t *ftype, expr_t *params)
 	if (err)
 		return err;
 
-	call = new_block_expr ();
+	call = expr_file_line (new_block_expr (), fexpr);
 	call->e.block.is_call = 1;
 	for (e = params, i = 0; e; e = e->next, i++) {
 		if (has_function_call (e)) {
-			*a = new_temp_def_expr (arg_types[i]);
-			arg_exprs[arg_expr_count][0] = cast_expr (arg_types[i],
-													  convert_vector (e));
+			expr_t     *cast = cast_expr (arg_types[i], convert_vector (e));
+			expr_t     *tmp = new_temp_def_expr (arg_types[i]);
+			*a = expr_file_line (tmp, e);
+			arg_exprs[arg_expr_count][0] = expr_file_line (cast, e);
 			arg_exprs[arg_expr_count][1] = *a;
 			arg_expr_count++;
 		} else {
-			*a = cast_expr (arg_types[i], convert_vector (e));
+			*a = expr_file_line (cast_expr (arg_types[i], convert_vector (e)),
+								 e);
 		}
 		a = &(*a)->next;
 	}
 	for (i = 0; i < arg_expr_count - 1; i++) {
-		append_expr (call, assign_expr (arg_exprs[i][1], arg_exprs[i][0]));
+		assign = assign_expr (arg_exprs[i][1], arg_exprs[i][0]);
+		append_expr (call, expr_file_line (assign, arg_exprs[i][0]));
 	}
 	if (arg_expr_count) {
 		e = assign_expr (arg_exprs[arg_expr_count - 1][1],
 						 arg_exprs[arg_expr_count - 1][0]);
+		e = expr_file_line (e, arg_exprs[arg_expr_count - 1][0]);
 		append_expr (call, e);
 	}
-	e = new_binary_expr ('c', fexpr, args);
+	e = expr_file_line (new_binary_expr ('c', fexpr, args), fexpr);
 	e->e.expr.type = ftype->t.func.type;
 	append_expr (call, e);
 	if (ftype->t.func.type != &type_void) {
@@ -2637,14 +2650,16 @@ message_expr (expr_t *receiver, keywordarg_t *message)
 
 	for (m = message; m; m = m->next) {
 		*a = m->expr;
-		while ((*a))
+		while ((*a)) {
+			expr_file_line (selector, *a);
 			a = &(*a)->next;
+		}
 	}
 	*a = selector;
 	a = &(*a)->next;
 	*a = receiver;
 
-	send_msg = send_message (super);
+	send_msg = expr_file_line (send_message (super), receiver);
 	if (method) {
 		expr_t      *err;
 		if ((err = method_check_params (method, args)))

From 5535a6a5093fdb6fd1b4f944e7946552fb8f5fc2 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 11 Mar 2020 10:49:49 +0900
Subject: [PATCH 0714/1519] [qfcc] Fix missing words in a comment

---
 tools/qfcc/include/expr.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/qfcc/include/expr.h b/tools/qfcc/include/expr.h
index f0f118e8d..99fa466b9 100644
--- a/tools/qfcc/include/expr.h
+++ b/tools/qfcc/include/expr.h
@@ -274,9 +274,9 @@ expr_t *expr_file_line (expr_t *dst, const expr_t *src);
 
 /**	Create a new label name.
 
-	The label name is guaranteed to to the compilation. It is made up of the
-	name of the current function plus an incrementing number. The number is
-	not reset between functions.
+	The label name is guaranteed to be unique to the compilation. It is made
+	up of the name of the current function plus an incrementing number. The
+	number is not reset between functions.
 
 	\return			The string representing the label name.
 */

From 826f066e009fbc52763d336807e92f05c7e9303e Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 11 Mar 2020 10:50:15 +0900
Subject: [PATCH 0715/1519] [qfcc] Be more consistent with string saving

Not that it really makes any difference for labels since they're
guaranteed unique, but it does remove the question of "why nva instead
of save_string?". Looking at history, save_string came after I changed
it from strdup (va()) to nva(), and then either didn't think to look for
nva or thought it wasn't worth changing.
---
 tools/qfcc/source/expr.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index 67206c663..416442419 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -446,10 +446,9 @@ new_label_name (void)
 	static int  label = 0;
 	int         lnum = ++label;
 	const char *fname = current_func->sym->name;
-	char       *lname;
+	const char *lname;
 
-	lname = nva ("$%s_%d", fname, lnum);
-	SYS_CHECKMEM (lname);
+	lname = save_string (va ("$%s_%d", fname, lnum));
 	return lname;
 }
 

From 3061f7e30ec02b17f503f4969d78827171b11631 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 11 Mar 2020 11:04:49 +0900
Subject: [PATCH 0716/1519] [qfcc] Update sendv test for corrected
 implementation

---
 tools/qfcc/test/sendv.r | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/tools/qfcc/test/sendv.r b/tools/qfcc/test/sendv.r
index 979a72c43..aa2cb6665 100644
--- a/tools/qfcc/test/sendv.r
+++ b/tools/qfcc/test/sendv.r
@@ -8,12 +8,13 @@ int obj_increment_retaincount (id object) = #0;
 void
 send (id obj, string cmd, string str)
 {
-	@static @param params[1];
-	@va_list va_list = {1, params};
-	SEL sel;
+	@static @param params[3];
+	@va_list va_list = {3, params};
+	SEL sel = sel_get_uid (cmd);
 
-	params[0].string_val = str;
-	sel = sel_get_uid (cmd);
+	params[0].pointer_val = obj;
+	params[1].pointer_val = sel;
+	params[2].string_val = str;
 	obj_msg_sendv (obj, sel, va_list);
 }
 

From d5560434c022a8aa064c4bbeec6f49e3248bc378 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 11 Mar 2020 11:06:09 +0900
Subject: [PATCH 0717/1519] [qfcc] Rename label to bool_label for clarity

And also so I can use `label' for source labels.
---
 tools/qfcc/source/qc-parse.y | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/qfcc/source/qc-parse.y b/tools/qfcc/source/qc-parse.y
index ba266c512..9752a4c48 100644
--- a/tools/qfcc/source/qc-parse.y
+++ b/tools/qfcc/source/qc-parse.y
@@ -184,7 +184,7 @@ int yylex (void);
 %type	<expr>		opt_init opt_expr cexpr expr element_list element
 %type	<expr>		optional_state_expr texpr vector_expr
 %type	<expr>		statement statements compound_statement
-%type	<expr>		else label break_label continue_label
+%type	<expr>		else bool_label break_label continue_label
 %type	<expr>		unary_expr ident_expr cast_expr opt_arg_list arg_list
 %type	<expr>		init_var_decl_list init_var_decl
 %type	<switch_block> switch_block
@@ -1358,7 +1358,7 @@ else
 		}
 	;
 
-label
+bool_label
 	: /* empty */
 		{
 			$$ = new_label_expr ();
@@ -1489,8 +1489,8 @@ expr
 	| expr '=' expr				{ $$ = assign_expr ($1, $3); }
 	| expr ASX expr				{ $$ = asx_expr ($2, $1, $3); }
 	| expr '?' expr ':' expr 	{ $$ = conditional_expr ($1, $3, $5); }
-	| expr AND label expr		{ $$ = bool_expr (AND, $3, $1, $4); }
-	| expr OR label expr		{ $$ = bool_expr (OR,  $3, $1, $4); }
+	| expr AND bool_label expr	{ $$ = bool_expr (AND, $3, $1, $4); }
+	| expr OR bool_label expr	{ $$ = bool_expr (OR,  $3, $1, $4); }
 	| expr EQ expr				{ $$ = binary_expr (EQ,  $1, $3); }
 	| expr NE expr				{ $$ = binary_expr (NE,  $1, $3); }
 	| expr LE expr				{ $$ = binary_expr (LE,  $1, $3); }

From 1cd5ea57324e7f4e2640070393a86c2b7c22f275 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 11 Mar 2020 11:31:54 +0900
Subject: [PATCH 0718/1519] [qfcc] Add support for named labels in statements

Yeah, I've finally decided to implement goto. Limited to function scope
of course.
---
 tools/qfcc/include/expr.h     | 13 +++++++++++++
 tools/qfcc/include/function.h |  1 +
 tools/qfcc/source/expr.c      | 21 +++++++++++++++++++++
 tools/qfcc/source/function.c  |  1 +
 tools/qfcc/source/qc-parse.y  | 10 +++++++++-
 5 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/tools/qfcc/include/expr.h b/tools/qfcc/include/expr.h
index 99fa466b9..6556a8d06 100644
--- a/tools/qfcc/include/expr.h
+++ b/tools/qfcc/include/expr.h
@@ -290,6 +290,19 @@ const char *new_label_name (void);
 */
 expr_t *new_label_expr (void);
 
+/**	Create a named label expression node.
+
+	The label name is set using new_label_name(), but the symbol is used to add
+	the label to the function's label scope symbol table. If the label already
+	exists in the function's label scope, then the existing label is returned,
+	allowing for forward label declarations.
+
+	\param label	The name symbol to use for adding the label to the function
+					label scope.
+	\return			The new label expression (::ex_label_t) node.
+*/
+expr_t *named_label_expr (struct symbol_s *label);
+
 /**	Create a new label reference expression node.
 
 	Used for taking the address of a label (eg. jump tables).
diff --git a/tools/qfcc/include/function.h b/tools/qfcc/include/function.h
index 39cde918c..951b40597 100644
--- a/tools/qfcc/include/function.h
+++ b/tools/qfcc/include/function.h
@@ -79,6 +79,7 @@ typedef struct function_s {
 		scope symbol table's defspace.
 	*/
 	struct symtab_s    *symtab;
+	struct symtab_s    *label_scope;
 	struct reloc_s     *refs;		///< relocation targets for this function
 	struct expr_s      *var_init;
 	const char         *name;		///< nice name for __PRETTY_FUNCTION__
diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index 416442419..d080d2332 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -495,6 +495,27 @@ new_label_expr (void)
 	return l;
 }
 
+expr_t *
+named_label_expr (symbol_t *label)
+{
+	symbol_t   *sym;
+
+	if (!current_func) {
+		// XXX this might be only an error
+		internal_error (0, "label defined outside of function scope");
+	}
+
+	sym = symtab_lookup (current_func->label_scope, label->name);
+
+	if (sym) {
+		return sym->s.expr;
+	}
+	label->sy_type = sy_expr;
+	label->s.expr = new_label_expr ();
+	symtab_addsymbol (current_func->label_scope, label);
+	return label->s.expr;
+}
+
 expr_t *
 new_label_ref (ex_label_t *label)
 {
diff --git a/tools/qfcc/source/function.c b/tools/qfcc/source/function.c
index 7f53cd11d..c9e5474a5 100644
--- a/tools/qfcc/source/function.c
+++ b/tools/qfcc/source/function.c
@@ -493,6 +493,7 @@ build_scope (symbol_t *fsym, symtab_t *parent)
 
 	symtab = new_symtab (parent, stab_local);
 	fsym->s.func->symtab = symtab;
+	fsym->s.func->label_scope = new_symtab (0, stab_local);
 	symtab->space = defspace_new (ds_virtual);
 	current_symtab = symtab;
 
diff --git a/tools/qfcc/source/qc-parse.y b/tools/qfcc/source/qc-parse.y
index 9752a4c48..3e5079313 100644
--- a/tools/qfcc/source/qc-parse.y
+++ b/tools/qfcc/source/qc-parse.y
@@ -188,7 +188,7 @@ int yylex (void);
 %type	<expr>		unary_expr ident_expr cast_expr opt_arg_list arg_list
 %type	<expr>		init_var_decl_list init_var_decl
 %type	<switch_block> switch_block
-%type	<symbol>	identifier
+%type	<symbol>	identifier label
 
 %type	<symbol>	overloaded_identifier
 
@@ -1292,6 +1292,10 @@ statement
 			else
 				error (0, "continue outside of loop");
 		}
+	| label
+		{
+			$$ = named_label_expr ($1);
+		}
 	| CASE expr ':'
 		{
 			$$ = case_label_expr (switch_block, $2);
@@ -1358,6 +1362,10 @@ else
 		}
 	;
 
+label
+	: NAME ':'
+	;
+
 bool_label
 	: /* empty */
 		{

From 4a8854d9ed63006155076646397222ebec99daa0 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 11 Mar 2020 12:51:34 +0900
Subject: [PATCH 0719/1519] [qfcc] Add expression tracking to operands

Not much uses it yet, but it will make for better diagnostics.
---
 tools/qfcc/include/statements.h | 13 +++---
 tools/qfcc/source/dags.c        |  8 ++--
 tools/qfcc/source/flow.c        |  2 +-
 tools/qfcc/source/statements.c  | 75 +++++++++++++++++----------------
 4 files changed, 52 insertions(+), 46 deletions(-)

diff --git a/tools/qfcc/include/statements.h b/tools/qfcc/include/statements.h
index ce230d9ec..d1ccff441 100644
--- a/tools/qfcc/include/statements.h
+++ b/tools/qfcc/include/statements.h
@@ -57,6 +57,7 @@ typedef struct operand_s {
 	op_type_e   op_type;
 	struct type_s *type;		///< possibly override def's type
 	int         size;			///< for structures
+	struct expr_s *expr;		///< expression generating this operand
 	union {
 		struct def_s *def;
 		struct ex_value_s *value;
@@ -115,14 +116,16 @@ struct dstring_s;
 
 const char *optype_str (op_type_e type) __attribute__((const));
 
-operand_t *def_operand (struct def_s *def, struct type_s *type);
-operand_t *return_operand (struct type_s *type);
-operand_t *value_operand (struct ex_value_s *value);
+operand_t *def_operand (struct def_s *def, struct type_s *type,
+						struct expr_s *expr);
+operand_t *return_operand (struct type_s *type, struct expr_s *expr);
+operand_t *value_operand (struct ex_value_s *value, struct expr_s *expr);
 int tempop_overlap (tempop_t *t1, tempop_t *t2) __attribute__((pure));
-operand_t *temp_operand (struct type_s *type);
+operand_t *temp_operand (struct type_s *type, struct expr_s *expr);
 int tempop_visit_all (tempop_t *tempop, int overlap,
 					  int (*visit) (tempop_t *, void *), void *data);
-operand_t *alias_operand (struct type_s *type, operand_t *op);
+operand_t *alias_operand (struct type_s *type, operand_t *op,
+						  struct expr_s *expr);
 void free_operand (operand_t *op);
 
 sblock_t *new_sblock (void);
diff --git a/tools/qfcc/source/dags.c b/tools/qfcc/source/dags.c
index 86acc210a..a97b3e68c 100644
--- a/tools/qfcc/source/dags.c
+++ b/tools/qfcc/source/dags.c
@@ -821,7 +821,7 @@ static operand_t *
 fix_op_type (operand_t *op, type_t *type)
 {
 	if (op && op->op_type != op_label && op->type != type)
-		op = alias_operand (type, op);
+		op = alias_operand (type, op, op->expr);
 	return op;
 }
 
@@ -882,7 +882,8 @@ generate_moveps (dag_t *dag, sblock_t *block, dagnode_t *dagnode)
 			offset = dstDef->offset;
 			dstDef = dstDef->alias;
 		}
-		operands[2] = value_operand (new_pointer_val (offset, type, dstDef));
+		operands[2] = value_operand (new_pointer_val (offset, type, dstDef),
+									 operands[1]->expr);
 		st = build_statement ("<MOVEP>", operands, var->expr);
 		sblock_add_statement (block, st);
 	}
@@ -937,7 +938,8 @@ dag_gencode (dag_t *dag, sblock_t *block, dagnode_t *dagnode)
 				operands[1] = make_operand (dag, block, dagnode, 1);
 			type = get_type (dagnode->label->expr);
 			if (!(var_iter = set_first (dagnode->identifiers))) {
-				operands[2] = temp_operand (get_type (dagnode->label->expr));
+				operands[2] = temp_operand (get_type (dagnode->label->expr),
+											dagnode->label->expr);
 			} else {
 				daglabel_t *var = dag->labels[var_iter->element];
 
diff --git a/tools/qfcc/source/flow.c b/tools/qfcc/source/flow.c
index 4ee42e214..ff0d1de96 100644
--- a/tools/qfcc/source/flow.c
+++ b/tools/qfcc/source/flow.c
@@ -1102,7 +1102,7 @@ flow_analyze_statement (statement_t *s, set_t *use, set_t *def, set_t *kill,
 					def_t      *alias;
 					ex_pointer_t *ptr = &s->opc->o.value->v.pointer;
 					alias = alias_def (ptr->def, ptr->type, ptr->val);
-					op = def_operand (alias, ptr->type);
+					op = def_operand (alias, ptr->type, s->opc->expr);
 					flow_add_op_var (def, op, 0);
 					if (operands)
 						operands[0] = op;
diff --git a/tools/qfcc/source/statements.c b/tools/qfcc/source/statements.c
index 0ba4d1e21..e156efd1a 100644
--- a/tools/qfcc/source/statements.c
+++ b/tools/qfcc/source/statements.c
@@ -273,11 +273,12 @@ new_statement (st_type_t type, const char *opcode, expr_t *expr)
 }
 
 static operand_t *
-new_operand (op_type_e op)
+new_operand (op_type_e op, expr_t *expr)
 {
 	operand_t *operand;
 	ALLOC (256, operand_t, operands, operand);
 	operand->op_type = op;
+	operand->expr = expr;
 	return operand;
 }
 
@@ -311,13 +312,13 @@ free_sblock (sblock_t *sblock)
 }
 
 operand_t *
-def_operand (def_t *def, type_t *type)
+def_operand (def_t *def, type_t *type, expr_t *expr)
 {
 	operand_t  *op;
 
 	if (!type)
 		type = def->type;
-	op = new_operand (op_def);
+	op = new_operand (op_def, expr);
 	op->type = type;
 	op->size = type_size (type);
 	op->o.def = def;
@@ -325,28 +326,28 @@ def_operand (def_t *def, type_t *type)
 }
 
 operand_t *
-return_operand (type_t *type)
+return_operand (type_t *type, expr_t *expr)
 {
 	symbol_t   *return_symbol;
 	return_symbol = make_symbol (".return", &type_param, pr.symtab->space,
 								 sc_extern);
-	return def_operand (return_symbol->s.def, type);
+	return def_operand (return_symbol->s.def, type, expr);
 }
 
 operand_t *
-value_operand (ex_value_t *value)
+value_operand (ex_value_t *value, expr_t *expr)
 {
 	operand_t  *op;
-	op = new_operand (op_value);
+	op = new_operand (op_value, expr);
 	op->type = value->type;
 	op->o.value = value;
 	return op;
 }
 
 operand_t *
-temp_operand (type_t *type)
+temp_operand (type_t *type, expr_t *expr)
 {
-	operand_t  *op = new_operand (op_temp);
+	operand_t  *op = new_operand (op_temp, expr);
 
 	op->o.tempop.type = type;
 	op->type = type;
@@ -412,7 +413,7 @@ tempop_visit_all (tempop_t *tempop, int overlap,
 }
 
 operand_t *
-alias_operand (type_t *type, operand_t *op)
+alias_operand (type_t *type, operand_t *op, expr_t *expr)
 {
 	operand_t  *aop;
 
@@ -420,7 +421,7 @@ alias_operand (type_t *type, operand_t *op)
 		internal_error (0, "\naliasing operand with type of different size"
 						" (%d, %d)", type_size (type), type_size (op->type));
 	}
-	aop = new_operand (op_alias);
+	aop = new_operand (op_alias, expr);
 	aop->o.alias = op;
 	aop->type = type;
 	aop->size = type_size (type);
@@ -428,10 +429,10 @@ alias_operand (type_t *type, operand_t *op)
 }
 
 static operand_t *
-short_operand (short short_val)
+short_operand (short short_val, expr_t *expr)
 {
 	ex_value_t *val = new_short_val (short_val);
-	return value_operand (val);
+	return value_operand (val, expr);
 }
 
 static const char *
@@ -593,7 +594,7 @@ statement_branch (sblock_t *sblock, expr_t *e)
 
 	if (e->type == ex_uexpr && e->e.expr.op == 'g') {
 		s = new_statement (st_flow, "<GOTO>", e);
-		s->opa = new_operand (op_label);
+		s->opa = new_operand (op_label, e);
 		s->opa->o.label = &e->e.expr.e1->e.label;
 	} else {
 		if (e->e.expr.op == 'g') {
@@ -604,7 +605,7 @@ statement_branch (sblock_t *sblock, expr_t *e)
 			opcode = convert_op (e->e.expr.op);
 			s = new_statement (st_flow, opcode, e);
 			sblock = statement_subexpr (sblock, e->e.expr.e1, &s->opa);
-			s->opb = new_operand (op_label);
+			s->opb = new_operand (op_label, e);
 			s->opb->o.label = &e->e.expr.e2->e.label;
 		}
 	}
@@ -783,7 +784,7 @@ expr_address (sblock_t *sblock, expr_t *e, operand_t **op)
 	statement_t *s;
 	s = new_statement (st_expr, "&", e);
 	sblock = statement_subexpr (sblock, e->e.expr.e1, &s->opa);
-	s->opc = temp_operand (e->e.expr.type);
+	s->opc = temp_operand (e->e.expr.type, e);
 	sblock_add_statement (sblock, s);
 	*(op) = s->opc;
 	return sblock;
@@ -795,7 +796,7 @@ lea_statement (operand_t *pointer, operand_t *offset, expr_t *e)
 	statement_t *s = new_statement (st_expr, "&", e);
 	s->opa = pointer;
 	s->opb = offset;
-	s->opc = temp_operand (&type_pointer);
+	s->opc = temp_operand (&type_pointer, e);
 	return s;
 }
 
@@ -804,7 +805,7 @@ address_statement (operand_t *value, expr_t *e)
 {
 	statement_t *s = new_statement (st_expr, "&", e);
 	s->opa = value;
-	s->opc = temp_operand (&type_pointer);
+	s->opc = temp_operand (&type_pointer, e);
 	return s;
 }
 
@@ -819,7 +820,7 @@ expr_deref (sblock_t *sblock, expr_t *deref, operand_t **op)
 		&& e->e.expr.e1->type == ex_symbol) {
 		if (e->e.expr.e1->e.symbol->sy_type != sy_var)
 			internal_error (e, "address of non-var");
-		*op = def_operand (e->e.expr.e1->e.symbol->s.def, type);
+		*op = def_operand (e->e.expr.e1->e.symbol->s.def, type, e);
 	} else if (e->type == ex_expr && e->e.expr.op == '&') {
 		statement_t *s;
 		operand_t  *ptr = 0;
@@ -827,7 +828,7 @@ expr_deref (sblock_t *sblock, expr_t *deref, operand_t **op)
 		sblock = statement_subexpr (sblock, e->e.expr.e1, &ptr);
 		sblock = statement_subexpr (sblock, e->e.expr.e2, &offs);
 		if (!*op)
-			*op = temp_operand (type);
+			*op = temp_operand (type, e);
 		if (low_level_type (type) == ev_void) {
 			operand_t  *src_addr;
 			operand_t  *dst_addr;
@@ -843,7 +844,7 @@ expr_deref (sblock_t *sblock, expr_t *deref, operand_t **op)
 
 			s = new_statement (st_move, "<MOVEP>", deref);
 			s->opa = src_addr;
-			s->opb = short_operand (type_size (type));
+			s->opb = short_operand (type_size (type), e);
 			s->opc = dst_addr;
 			sblock_add_statement (sblock, s);
 		} else {
@@ -856,17 +857,17 @@ expr_deref (sblock_t *sblock, expr_t *deref, operand_t **op)
 	} else if (e->type == ex_value && e->e.value->lltype == ev_pointer) {
 		ex_pointer_t *ptr = &e->e.value->v.pointer;
 		*op = def_operand (alias_def (ptr->def, ptr->type, ptr->val),
-						   ptr->type);
+						   ptr->type, e);
 	} else {
 		statement_t *s;
 		operand_t  *ptr = 0;
 
 		sblock = statement_subexpr (sblock, e, &ptr);
 		if (!*op)
-			*op = temp_operand (type);
+			*op = temp_operand (type, e);
 		s = new_statement (st_expr, ".", deref);
 		s->opa = ptr;
-		s->opb = short_operand (0);
+		s->opb = short_operand (0, e);
 		s->opc = *op;
 		sblock_add_statement (sblock, s);
 	}
@@ -919,7 +920,7 @@ expr_alias (sblock_t *sblock, expr_t *e, operand_t **op)
 			}
 		}
 		if (!top) {
-			top = temp_operand (type);
+			top = temp_operand (type, e);
 			top->o.tempop.alias = aop;
 			top->o.tempop.offset = offset;
 			top->next = aop->o.tempop.alias_ops;
@@ -930,9 +931,9 @@ expr_alias (sblock_t *sblock, expr_t *e, operand_t **op)
 		def = aop->o.def;
 		while (def->alias)
 			def = def->alias;
-		*op = def_operand (alias_def (def, type, offset), 0);
+		*op = def_operand (alias_def (def, type, offset), 0, e);
 	} else if (aop->op_type == op_value) {
-		*op = value_operand (aop->o.value);
+		*op = value_operand (aop->o.value, e);
 		(*op)->type = type;
 	} else {
 		internal_error (e, "invalid alias target: %s: %s",
@@ -970,7 +971,7 @@ expr_expr (sblock_t *sblock, expr_t *e, operand_t **op)
 			sblock = statement_subexpr (sblock, e->e.expr.e1, &s->opa);
 			sblock = statement_subexpr (sblock, e->e.expr.e2, &s->opb);
 			if (!*op)
-				*op = temp_operand (e->e.expr.type);
+				*op = temp_operand (e->e.expr.type, e);
 			s->opc = *op;
 			sblock_add_statement (sblock, s);
 			break;
@@ -989,7 +990,7 @@ expr_cast (sblock_t *sblock, expr_t *e, operand_t **op)
 	if (is_scalar (src_type) && is_scalar (type)) {
 		operand_t  *src = 0;
 		sblock = statement_subexpr (sblock, e->e.expr.e1, &src);
-		*op = temp_operand (e->e.expr.type);
+		*op = temp_operand (e->e.expr.type, e);
 		s = new_statement (st_expr, "<CONV>", e);
 		s->opa = src;
 		s->opc = *op;
@@ -1046,7 +1047,7 @@ expr_uexpr (sblock_t *sblock, expr_t *e, operand_t **op)
 			s = new_statement (st_expr, opcode, e);
 			sblock = statement_subexpr (sblock, e->e.expr.e1, &s->opa);
 			if (!*op)
-				*op = temp_operand (e->e.expr.type);
+				*op = temp_operand (e->e.expr.type, e);
 			s->opc = *op;
 			sblock_add_statement (sblock, s);
 	}
@@ -1059,11 +1060,11 @@ expr_symbol (sblock_t *sblock, expr_t *e, operand_t **op)
 	symbol_t   *sym = e->e.symbol;
 
 	if (sym->sy_type == sy_var) {
-		*op = def_operand (sym->s.def, sym->type);
+		*op = def_operand (sym->s.def, sym->type, e);
 	} else if (sym->sy_type == sy_const) {
-		*op = value_operand (sym->s.value);
+		*op = value_operand (sym->s.value, e);
 	} else if (sym->sy_type == sy_func) {
-		*op = def_operand (sym->s.func->def, 0);
+		*op = def_operand (sym->s.func->def, 0, e);
 	} else {
 		internal_error (e, "unexpected symbol type: %s for %s",
 						symtype_str (sym->sy_type), sym->name);
@@ -1075,7 +1076,7 @@ static sblock_t *
 expr_temp (sblock_t *sblock, expr_t *e, operand_t **op)
 {
 	if (!e->e.temp.op)
-		e->e.temp.op = temp_operand (e->e.temp.type);
+		e->e.temp.op = temp_operand (e->e.temp.type, e);
 	*op = e->e.temp.op;
 	return sblock;
 }
@@ -1151,7 +1152,7 @@ expr_vector_e (sblock_t *sblock, expr_t *e, operand_t **op)
 static sblock_t *
 expr_value (sblock_t *sblock, expr_t *e, operand_t **op)
 {
-	*op = value_operand (e->e.value);
+	*op = value_operand (e->e.value, e);
 	return sblock;
 }
 
@@ -1414,7 +1415,7 @@ statement_uexpr (sblock_t *sblock, expr_t *e)
 			}
 			s = new_statement (st_func, opcode, e);
 			if (e->e.expr.e1) {
-				s->opa = return_operand (get_type (e->e.expr.e1));
+				s->opa = return_operand (get_type (e->e.expr.e1), e);
 				sblock = statement_subexpr (sblock, e->e.expr.e1, &s->opa);
 			}
 			sblock_add_statement (sblock, s);
@@ -1718,7 +1719,7 @@ check_final_block (sblock_t *sblock)
 	s = new_statement (st_func, "<RETURN_V>", 0);
 	if (options.traditional || options.code.progsversion == PROG_ID_VERSION) {
 		s->opcode = save_string ("<RETURN>");
-		s->opa = return_operand (&type_void);
+		s->opa = return_operand (&type_void, 0);
 	}
 	sblock_add_statement (sblock, s);
 }

From 813319efc241d94154df1032067c90828fa27f73 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 11 Mar 2020 12:53:40 +0900
Subject: [PATCH 0720/1519] [qfcc] Implement goto

It's just too useful when used correctly.
---
 tools/qfcc/source/qc-lex.l     |  1 +
 tools/qfcc/source/qc-parse.y   |  9 +++++++--
 tools/qfcc/source/statements.c | 16 +++++++++++-----
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/tools/qfcc/source/qc-lex.l b/tools/qfcc/source/qc-lex.l
index 353191593..9d5c5a1b9 100644
--- a/tools/qfcc/source/qc-lex.l
+++ b/tools/qfcc/source/qc-lex.l
@@ -353,6 +353,7 @@ static keyword_t obj_keywords[] = {
 // make the language features available to traditional code.
 static keyword_t at_keywords[] = {
 	{"for",			FOR		},
+	{"goto",		GOTO	},
 	{"break",		BREAK	},
 	{"continue",	CONTINUE},
 	{"switch",		SWITCH	},
diff --git a/tools/qfcc/source/qc-parse.y b/tools/qfcc/source/qc-parse.y
index 3e5079313..27423d4ef 100644
--- a/tools/qfcc/source/qc-parse.y
+++ b/tools/qfcc/source/qc-parse.y
@@ -145,8 +145,8 @@ int yylex (void);
 %token	<expr>		VALUE STRING
 
 %token				LOCAL RETURN WHILE DO IF ELSE FOR BREAK CONTINUE ELLIPSIS
-%token				NIL IFBE IFB IFAE IFA SWITCH CASE DEFAULT ENUM TYPEDEF
-%token				ARGS EXTERN STATIC SYSTEM NOSAVE OVERLOAD NOT
+%token				NIL IFBE IFB IFAE IFA GOTO SWITCH CASE DEFAULT ENUM
+%token				ARGS TYPEDEF EXTERN STATIC SYSTEM NOSAVE OVERLOAD NOT
 %token	<op>		STRUCT
 %token	<type>		TYPE
 %token	<symbol>	OBJECT TYPE_NAME
@@ -1310,6 +1310,11 @@ statement
 			switch_block = $5;
 			break_label = $2;
 		}
+	| GOTO NAME
+		{
+			expr_t     *label = named_label_expr ($2);
+			$$ = goto_expr (label);
+		}
 	| IF not '(' texpr ')' statement %prec IFX
 		{
 			$$ = build_if_statement ($2, $4, $6, 0, 0);
diff --git a/tools/qfcc/source/statements.c b/tools/qfcc/source/statements.c
index e156efd1a..42a5494e8 100644
--- a/tools/qfcc/source/statements.c
+++ b/tools/qfcc/source/statements.c
@@ -1551,7 +1551,7 @@ remove_label_from_dest (ex_label_t *label)
 	sblock_t   *sblock;
 	ex_label_t **l;
 
-	if (!label)
+	if (!label || !label->dest)
 		return;
 
 	debug (0, "dropping deceased label %s", label->name);
@@ -1588,14 +1588,20 @@ thread_jumps (sblock_t *blocks)
 		if (!sblock->statements)
 			continue;
 		s = (statement_t *) sblock->tail;
-		if (statement_is_goto (s))
+		if (statement_is_goto (s)) {
 			label = &s->opa->o.label;
-		else if (statement_is_cond (s))
+			if (!(*label)->dest && s->opa->expr) {
+				error (s->opa->expr, "undefined label `%s'", (*label)->name);
+				s->opa->expr = 0;
+			}
+		} else if (statement_is_cond (s)) {
 			label = &s->opb->o.label;
-		else
+		} else {
 			continue;
+		}
 		for (l = *label;
-			 l->dest->statements && statement_is_goto (l->dest->statements);
+			 l->dest && l->dest->statements
+			 && statement_is_goto (l->dest->statements);
 			 l = l->dest->statements->opa->o.label) {
 		}
 		if (l != *label) {

From 393e540ffa3af2613668b0de13af2375ae5fcc1e Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 11 Mar 2020 13:31:12 +0900
Subject: [PATCH 0721/1519] [qfcc] Print the source name of an undefined label

Undefined labels generated by the compiler indicate severe trouble.
---
 tools/qfcc/include/expr.h      | 1 +
 tools/qfcc/source/expr.c       | 6 +++++-
 tools/qfcc/source/statements.c | 7 ++++---
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/tools/qfcc/include/expr.h b/tools/qfcc/include/expr.h
index 6556a8d06..fa88dc80d 100644
--- a/tools/qfcc/include/expr.h
+++ b/tools/qfcc/include/expr.h
@@ -75,6 +75,7 @@ typedef struct ex_label_s {
 	struct reloc_s *refs;		///< relocations associated with this label
 	struct sblock_s *dest;		///< the location of this label if known
 	const char *name;			///< the name of this label
+	struct symbol_s *symbol;	///< symbol used to define this label (maybe 0)
 	int         used;			///< label is used as a target
 	struct daglabel_s *daglabel;
 } ex_label_t;
diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index d080d2332..e9967dbc7 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -499,6 +499,7 @@ expr_t *
 named_label_expr (symbol_t *label)
 {
 	symbol_t   *sym;
+	expr_t     *l;
 
 	if (!current_func) {
 		// XXX this might be only an error
@@ -510,8 +511,11 @@ named_label_expr (symbol_t *label)
 	if (sym) {
 		return sym->s.expr;
 	}
+	l = new_label_expr ();
+	l->e.label.name = save_string (va ("%s_%s", l->e.label.name, label->name));
+	l->e.label.symbol = label;
 	label->sy_type = sy_expr;
-	label->s.expr = new_label_expr ();
+	label->s.expr = l;
 	symtab_addsymbol (current_func->label_scope, label);
 	return label->s.expr;
 }
diff --git a/tools/qfcc/source/statements.c b/tools/qfcc/source/statements.c
index 42a5494e8..f82fa552e 100644
--- a/tools/qfcc/source/statements.c
+++ b/tools/qfcc/source/statements.c
@@ -1590,9 +1590,10 @@ thread_jumps (sblock_t *blocks)
 		s = (statement_t *) sblock->tail;
 		if (statement_is_goto (s)) {
 			label = &s->opa->o.label;
-			if (!(*label)->dest && s->opa->expr) {
-				error (s->opa->expr, "undefined label `%s'", (*label)->name);
-				s->opa->expr = 0;
+			if (!(*label)->dest && (*label)->symbol) {
+				error (s->opa->expr, "undefined label `%s'",
+					   (*label)->symbol->name);
+				(*label)->symbol = 0;
 			}
 		} else if (statement_is_cond (s)) {
 			label = &s->opb->o.label;

From f10f9e157df69587deabcf0e09f550bdd76c31a7 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 11 Mar 2020 13:33:06 +0900
Subject: [PATCH 0722/1519] [qfcc] Warn about unused labels

---
 tools/qfcc/source/statements.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tools/qfcc/source/statements.c b/tools/qfcc/source/statements.c
index f82fa552e..517fcc7b3 100644
--- a/tools/qfcc/source/statements.c
+++ b/tools/qfcc/source/statements.c
@@ -1344,7 +1344,11 @@ statement_label (sblock_t *sblock, expr_t *e)
 		e->e.label.next = sblock->labels;
 		sblock->labels = &e->e.label;
 	} else {
-		debug (e, "dropping unused label %s", e->e.label.name);
+		if (e->e.label.symbol) {
+			warning (e, "unused label %s", e->e.label.symbol->name);
+		} else {
+			debug (e, "dropping unused label %s", e->e.label.name);
+		}
 	}
 	return sblock;
 }

From d1e83b9d4887eba79236b5531dc8e0a42063d702 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 11 Mar 2020 15:46:57 +0900
Subject: [PATCH 0723/1519] [qfcc] Create a compound initializer expression
 type

This fixes the problem of using the return value of a function as an
element in a compound initializer. The cause of the problem is that
compound initializers were represented by block expressions, but
function calls are contained within block expressions, so def
initialization saw the block expression and thought it was a nested
compound initializer.

Technically, it was a bug in the nested element parsing code in that it
wasn't checking the result value of the block expression, but using a
whole new expression type makes things much cleaner and the work done
paves the way for labeled initializers and compound assignments.
---
 tools/qfcc/include/expr.h       | 17 ++++++++++
 tools/qfcc/source/def.c         | 36 +++++++++++----------
 tools/qfcc/source/expr.c        | 57 +++++++++++++++++++++++++++++++--
 tools/qfcc/source/expr_assign.c |  1 +
 tools/qfcc/source/qc-parse.y    | 42 +++++++++++-------------
 5 files changed, 109 insertions(+), 44 deletions(-)

diff --git a/tools/qfcc/include/expr.h b/tools/qfcc/include/expr.h
index fa88dc80d..230ecd241 100644
--- a/tools/qfcc/include/expr.h
+++ b/tools/qfcc/include/expr.h
@@ -55,6 +55,7 @@ typedef enum {
 
 	ex_nil,			///< umm, nil, null. nuff said (0 of any type)
 	ex_value,		///< constant value (::ex_value_t)
+	ex_compound,	///< compound initializer
 } expr_type;
 
 /**	Binary and unary expressions.
@@ -84,6 +85,17 @@ typedef struct {
 	ex_label_t *label;
 } ex_labelref_t;
 
+typedef struct ex_initele_s {
+	struct ex_initele_s *next;	///< next in chain
+	struct symbol_s *symbol;	///< for labeled initializers
+	struct expr_s *expr;		///< initializer expression
+} ex_initele_t;
+
+typedef struct ex_cmpinit_s {
+	ex_initele_t *head;
+	ex_initele_t **tail;
+} ex_cmpinit_t;
+
 typedef struct {
 	struct expr_s *head;	///< the first expression in the block
 	struct expr_s **tail;	///< last expression in the block, for appending
@@ -210,6 +222,7 @@ typedef struct expr_s {
 		ex_temp_t   temp;				///< temporary variable expression
 		ex_vector_t vector;				///< vector expression list
 		ex_value_t *value;				///< constant value
+		ex_cmpinit_t compound;			///< compound initializer
 	} e;
 } expr_t;
 
@@ -348,6 +361,10 @@ expr_t *new_block_expr (void);
 */
 expr_t *build_block_expr (expr_t *expr_list);
 
+ex_initele_t *new_initele (expr_t *expr, struct symbol_s *symbol);
+expr_t *new_compound_init (void);
+expr_t *append_element (expr_t *compound, ex_initele_t *element);
+
 /**	Create a new binary expression node node.
 
 	If either \a e1 or \a e2 are error expressions, then that expression will
diff --git a/tools/qfcc/source/def.c b/tools/qfcc/source/def.c
index 865ef4066..d600fb0ae 100644
--- a/tools/qfcc/source/def.c
+++ b/tools/qfcc/source/def.c
@@ -86,7 +86,7 @@ new_element (void)
 }
 
 static element_t *
-append_element (element_chain_t *element_chain, element_t *element)
+append_init_element (element_chain_t *element_chain, element_t *element)
 {
 	element->next = 0;
 	*element_chain->tail = element;
@@ -371,7 +371,7 @@ static void
 build_element_chain (element_chain_t *element_chain, type_t *type,
 					 expr_t *eles, int base_offset)
 {
-	expr_t     *e = eles->e.block.head;
+	ex_initele_t *ele = eles->e.compound.head;
 
 	if (is_array (type)) {
 		type_t     *array_type = type->t.array.type;
@@ -380,17 +380,18 @@ build_element_chain (element_chain_t *element_chain, type_t *type,
 
 		for (i = 0; i < array_size; i++) {
 			int         offset = base_offset + i * type_size (array_type);
-			if (e && e->type == ex_block) {
-				build_element_chain (element_chain, array_type, e, offset);
+			if (ele->expr && ele->expr->type == ex_compound) {
+				build_element_chain (element_chain, array_type,
+									 ele->expr, offset);
 			} else {
 				element_t  *element = new_element ();
 				element->type = array_type;
 				element->offset = offset;
-				element->expr = e;	// null will be treated as nil
-				append_element (element_chain, element);
+				element->expr = ele->expr;	// null will be treated as nil
+				append_init_element (element_chain, element);
 			}
-			if (e) {
-				e = e->next;
+			if (ele) {
+				ele = ele->next;
 			}
 		}
 	} else if (is_struct (type) || is_vector (type) || is_quaternion (type)) {
@@ -403,23 +404,24 @@ build_element_chain (element_chain_t *element_chain, type_t *type,
 				|| field->visibility == vis_anonymous) {
 				continue;
 			}
-			if (e && e->type == ex_block) {
-				build_element_chain (element_chain, field->type, e, offset);
+			if (ele->expr && ele->expr->type == ex_compound) {
+				build_element_chain (element_chain, field->type,
+									 ele->expr, offset);
 			} else {
 				element_t  *element = new_element ();
 				element->type = field->type;
 				element->offset = offset;
-				element->expr = e;	// null will be treated as nil
-				append_element (element_chain, element);
+				element->expr = ele->expr;	// null will be treated as nil
+				append_init_element (element_chain, element);
 			}
-			if (e) {
-				e = e->next;
+			if (ele) {
+				ele = ele->next;
 			}
 		}
 	} else {
 		error (eles, "invalid initializer");
 	}
-	if (e && e->next && options.warnings.initializer) {
+	if (ele && ele->next && options.warnings.initializer) {
 		warning (eles, "excessive elements in initializer");
 	}
 }
@@ -652,7 +654,7 @@ initialize_def (symbol_t *sym, expr_t *init, defspace_t *space,
 	}
 	if (!sym->s.def) {
 		if (is_array (sym->type) && !type_size (sym->type)
-			&& init->type == ex_block && !init->e.block.result) {
+			&& init->type == ex_compound) {
 			sym->type = array_type (sym->type->t.array.type,
 									num_elements (init));
 		}
@@ -676,7 +678,7 @@ initialize_def (symbol_t *sym, expr_t *init, defspace_t *space,
 		return;
 	if ((is_array (sym->type) || is_struct (sym->type)
 		 || sym->type == &type_vector || sym->type == &type_quaternion)
-		&& ((init->type == ex_block && !init->e.block.result)
+		&& ((init->type == ex_compound)
 			|| init->type == ex_nil)) {
 		init_elements (sym->s.def, init);
 		sym->s.def->initialized = 1;
diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index e9967dbc7..b4173f45d 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -217,6 +217,7 @@ get_type (expr_t *e)
 			return &type_void;
 		case ex_label:
 		case ex_error:
+		case ex_compound:
 			return 0;					// something went very wrong
 		case ex_bool:
 			if (options.code.progsversion == PROG_ID_VERSION)
@@ -420,14 +421,21 @@ copy_expr (expr_t *e)
 			n = new_expr ();
 			n->e.vector.type = e->e.vector.type;
 			n->e.vector.list = copy_expr (e->e.vector.list);
-			n = n->e.vector.list;
 			t = e->e.vector.list;
+			e = n->e.vector.list;
 			while (t->next) {
-				n->next = copy_expr (t->next);
-				n = n->next;
+				e->next = copy_expr (t->next);
+				e = e->next;
 				t = t->next;
 			}
 			return n;
+		case ex_compound:
+			n = new_expr ();
+			*n = *e;
+			for (ex_initele_t *i = e->e.compound.head; i; i = i->next) {
+				append_element (n, new_initele (i->expr, i->symbol));
+			}
+			return n;
 	}
 	internal_error (e, "invalid expression");
 }
@@ -543,6 +551,46 @@ new_block_expr (void)
 	return b;
 }
 
+ex_initele_t *
+new_initele (expr_t *expr, symbol_t *symbol)
+{
+	ex_initele_t *i = calloc (1, sizeof (*i));
+	i->expr = expr;
+	i->symbol = symbol;
+	return i;
+}
+
+expr_t *
+new_compound_init (void)
+{
+	expr_t     *c = new_expr ();
+	c->type = ex_compound;
+	c->e.compound.head = 0;
+	c->e.compound.tail = &c->e.compound.head;
+	return c;
+}
+
+expr_t *
+append_element (expr_t *compound, ex_initele_t *element)
+{
+	if (compound->type != ex_compound) {
+		internal_error (compound, "not a compound expression");
+	}
+
+	if (!element || (element->expr && element->expr->type == ex_error)) {
+		return compound;
+	}
+
+	if (element->next) {
+		internal_error (compound, "append_element: element loop detected");
+	}
+
+	*compound->e.compound.tail = element;
+	compound->e.compound.tail = &element->next;
+
+	return compound;
+}
+
 expr_t *
 new_binary_expr (int op, expr_t *e1, expr_t *e2)
 {
@@ -1499,6 +1547,7 @@ unary_expr (int op, expr_t *e)
 				case ex_label:
 				case ex_labelref:
 				case ex_state:
+				case ex_compound:
 					internal_error (e, 0);
 				case ex_uexpr:
 					if (e->e.expr.op == '-')
@@ -1565,6 +1614,7 @@ unary_expr (int op, expr_t *e)
 				case ex_label:
 				case ex_labelref:
 				case ex_state:
+				case ex_compound:
 					internal_error (e, 0);
 				case ex_bool:
 					return new_bool_expr (e->e.bool.false_list,
@@ -1630,6 +1680,7 @@ unary_expr (int op, expr_t *e)
 				case ex_label:
 				case ex_labelref:
 				case ex_state:
+				case ex_compound:
 					internal_error (e, 0);
 				case ex_uexpr:
 					if (e->e.expr.op == '~')
diff --git a/tools/qfcc/source/expr_assign.c b/tools/qfcc/source/expr_assign.c
index f0d7daf4b..466ffcf95 100644
--- a/tools/qfcc/source/expr_assign.c
+++ b/tools/qfcc/source/expr_assign.c
@@ -123,6 +123,7 @@ check_valid_lvalue (expr_t *expr)
 				return check_valid_lvalue (expr->e.expr.e1);
 			}
 			break;
+		case ex_compound:
 		case ex_state:
 		case ex_bool:
 		case ex_label:
diff --git a/tools/qfcc/source/qc-parse.y b/tools/qfcc/source/qc-parse.y
index 27423d4ef..83ac9ca8a 100644
--- a/tools/qfcc/source/qc-parse.y
+++ b/tools/qfcc/source/qc-parse.y
@@ -98,6 +98,7 @@ int yylex (void);
 	void       *pointer;			// for ensuring pointer values are null
 	struct type_s	*type;
 	struct expr_s	*expr;
+	struct ex_initele_s *element;
 	struct function_s *function;
 	struct switch_block_s *switch_block;
 	struct param_s	*param;
@@ -181,7 +182,9 @@ int yylex (void);
 %type	<symbol>	methoddef
 %type	<expr>		opt_initializer var_initializer local_def
 
-%type	<expr>		opt_init opt_expr cexpr expr element_list element
+%type	<expr>		opt_init opt_expr cexpr expr
+%type	<expr>		compound_init element_list
+%type	<element>	element
 %type	<expr>		optional_state_expr texpr vector_expr
 %type	<expr>		statement statements compound_statement
 %type	<expr>		else bool_label break_label continue_label
@@ -1148,17 +1151,20 @@ opt_initializer
 
 var_initializer
 	: '=' expr									{ $$ = $2; }
-	| '=' '{'									{ $<spec>$ = $<spec>-1; }
-	  element_list optional_comma '}'			{ $$ = $4; }
-	| '=' '{' '}'
+	| '=' compound_init
 		{
-			if (is_scalar ($<spec>-1.type)) {
+			if (!$2 && is_scalar ($<spec>-1.type)) {
 				error (0, "empty scalar initializer");
 			}
-			$$ = new_nil_expr ();
+			$$ = $2 ? $2 : new_nil_expr ();
 		}
 	;
 
+compound_init
+	: '{' element_list optional_comma '}'		{ $$ = $2; }
+	| '{' '}'									{ $$ = 0; }
+	;
+
 optional_state_expr
 	: /* emtpy */						{ $$ = 0; }
 	| vector_expr						{ $$ = build_state_expr ($1); }
@@ -1167,30 +1173,18 @@ optional_state_expr
 element_list
 	: element
 		{
-			$$ = new_block_expr ();
-			append_expr ($$, $1);
+			$$ = new_compound_init ();
+			append_element ($$, $1);
 		}
-	| element_list ',' {$<spec>$ = $<spec>0; } element
+	| element_list ','  element
 		{
-			append_expr ($$, $4);
+			append_element ($$, $3);
 		}
 	;
 
 element
-	: '{'										{ $<spec>$ = $<spec>0; }
-	  element_list optional_comma '}'			{ $$ = $3; }
-	| '{' '}'
-		{
-			// FIXME doesn't check the right type (does prove the inherited
-			// attributes have been passed down correctly though). The problem
-			// is that the type of the sub elements needs to be extracted if
-			// possible
-			if (is_scalar ($<spec>0.type)) {
-				error (0, "empty scalar initializer");
-			}
-			$$ = new_nil_expr ();
-		}
-	| expr										{ $$ = $1; }
+	: compound_init								{ $$ = new_initele ($1, 0); }
+	| expr										{ $$ = new_initele ($1, 0); }
 	;
 
 optional_comma

From afd31ed29243e5840f5889c6c746e1cf37a1b153 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 11 Mar 2020 16:07:58 +0900
Subject: [PATCH 0724/1519] [qfcc] Rename cexpr to comma_expr

It took me too long to figure out what cexpr was for.
---
 tools/qfcc/source/qc-parse.y | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/qfcc/source/qc-parse.y b/tools/qfcc/source/qc-parse.y
index 83ac9ca8a..5b3216d10 100644
--- a/tools/qfcc/source/qc-parse.y
+++ b/tools/qfcc/source/qc-parse.y
@@ -182,7 +182,7 @@ int yylex (void);
 %type	<symbol>	methoddef
 %type	<expr>		opt_initializer var_initializer local_def
 
-%type	<expr>		opt_init opt_expr cexpr expr
+%type	<expr>		opt_init opt_expr comma_expr expr
 %type	<expr>		compound_init element_list
 %type	<element>	element
 %type	<expr>		optional_state_expr texpr vector_expr
@@ -1342,7 +1342,7 @@ statement
 			break_label = $2;
 			continue_label = $3;
 		}
-	| cexpr ';'
+	| comma_expr ';'
 		{
 			$$ = $1;
 		}
@@ -1398,7 +1398,7 @@ switch_block
 	;
 
 opt_init
-	: cexpr
+	: comma_expr
 	| type set_spec_storage init_var_decl_list { $$ = $3; }
 	| /* empty */
 		{
@@ -1431,7 +1431,7 @@ init_var_decl
 	;
 
 opt_expr
-	: cexpr
+	: comma_expr
 	| /* empty */
 		{
 			$$ = 0;
@@ -1521,7 +1521,7 @@ texpr
 	: expr						{ $$ = convert_bool ($1, 1); }
 	;
 
-cexpr
+comma_expr
 	: arg_list
 		{
 			if ($1->next) {

From 023a920a511cb3e488608773d36b1a18b9172893 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 11 Mar 2020 19:38:50 +0900
Subject: [PATCH 0725/1519] [gamecode] Replace lost parameter auto-reset

rcallN messes with the progs parameter pointers and not resetting them
can cause incorrect data to be copied into the called function.
---
 libs/gamecode/pr_exec.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libs/gamecode/pr_exec.c b/libs/gamecode/pr_exec.c
index 47b39bc58..d673b7d1c 100644
--- a/libs/gamecode/pr_exec.c
+++ b/libs/gamecode/pr_exec.c
@@ -199,6 +199,7 @@ PR_EnterFunction (progs_t *pr, bfunction_t *f)
 			if (pr->pr_params[i] != pr->pr_real_params[i]) {
 				copy_param (pr->pr_real_params[i], pr->pr_params[i],
 							f->parm_size[i].size);
+				pr->pr_params[i] = pr->pr_real_params[i];
 			}
 		}
 	} else if (f->numparms < 0) {
@@ -210,6 +211,7 @@ PR_EnterFunction (progs_t *pr, bfunction_t *f)
 			if (pr->pr_params[i] != pr->pr_real_params[i]) {
 				copy_param (pr->pr_real_params[i], pr->pr_params[i],
 							f->parm_size[i].size);
+				pr->pr_params[i] = pr->pr_real_params[i];
 			}
 		}
 		dparmsize_t parmsize = { pr->pr_param_size, pr->pr_param_alignment };
@@ -221,6 +223,7 @@ PR_EnterFunction (progs_t *pr, bfunction_t *f)
 			if (pr->pr_params[i] != pr->pr_real_params[i]) {
 				copy_param (pr->pr_real_params[i], pr->pr_params[i],
 							parmsize.size);
+				pr->pr_params[i] = pr->pr_real_params[i];
 			}
 		}
 	}

From b6439e8dc1f2db26078a9b38c4760ac427ef5f44 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 11 Mar 2020 19:42:38 +0900
Subject: [PATCH 0726/1519] [qfcc] Support compound init in assignment and
 params

foo({...}) and bar = {...}
---
 tools/qfcc/include/expr.h           |  30 ++--
 tools/qfcc/source/Makefile.am       |   3 +-
 tools/qfcc/source/def.c             | 109 +--------------
 tools/qfcc/source/expr.c            |  63 +++------
 tools/qfcc/source/expr_assign.c     |   8 +-
 tools/qfcc/source/expr_compound.c   | 209 ++++++++++++++++++++++++++++
 tools/qfcc/source/qc-parse.y        |  32 +++--
 tools/qfcc/test/Makefile.am         |  10 ++
 tools/qfcc/test/compound.r          |  72 ++++++++++
 tools/qfcc/test/struct-init-param.r |  19 ++-
 10 files changed, 381 insertions(+), 174 deletions(-)
 create mode 100644 tools/qfcc/source/expr_compound.c
 create mode 100644 tools/qfcc/test/compound.r

diff --git a/tools/qfcc/include/expr.h b/tools/qfcc/include/expr.h
index 230ecd241..008313a5a 100644
--- a/tools/qfcc/include/expr.h
+++ b/tools/qfcc/include/expr.h
@@ -85,16 +85,18 @@ typedef struct {
 	ex_label_t *label;
 } ex_labelref_t;
 
-typedef struct ex_initele_s {
-	struct ex_initele_s *next;	///< next in chain
-	struct symbol_s *symbol;	///< for labeled initializers
+typedef struct element_s {
+	struct element_s *next;		///< next in chain
+	int         offset;
+	struct type_s *type;
 	struct expr_s *expr;		///< initializer expression
-} ex_initele_t;
+	struct symbol_s *symbol;	///< for labeled initializers
+} element_t;
 
-typedef struct ex_cmpinit_s {
-	ex_initele_t *head;
-	ex_initele_t **tail;
-} ex_cmpinit_t;
+typedef struct element_chain_s {
+	element_t  *head;
+	element_t **tail;
+} element_chain_t;
 
 typedef struct {
 	struct expr_s *head;	///< the first expression in the block
@@ -222,7 +224,7 @@ typedef struct expr_s {
 		ex_temp_t   temp;				///< temporary variable expression
 		ex_vector_t vector;				///< vector expression list
 		ex_value_t *value;				///< constant value
-		ex_cmpinit_t compound;			///< compound initializer
+		element_chain_t compound;		///< compound initializer
 	} e;
 } expr_t;
 
@@ -361,9 +363,15 @@ expr_t *new_block_expr (void);
 */
 expr_t *build_block_expr (expr_t *expr_list);
 
-ex_initele_t *new_initele (expr_t *expr, struct symbol_s *symbol);
+element_t *new_element (expr_t *expr, struct symbol_s *symbol);
 expr_t *new_compound_init (void);
-expr_t *append_element (expr_t *compound, ex_initele_t *element);
+expr_t *append_element (expr_t *compound, element_t *element);
+expr_t *initialized_temp_expr (struct type_s *type, expr_t *compound);
+void assign_elements (expr_t *local_expr, expr_t *ptr,
+					  element_chain_t *element_chain);
+void build_element_chain (element_chain_t *element_chain, struct type_s *type,
+						  expr_t *eles, int base_offset);
+void free_element_chain (element_chain_t *element_chain);
 
 /**	Create a new binary expression node node.
 
diff --git a/tools/qfcc/source/Makefile.am b/tools/qfcc/source/Makefile.am
index d9ceb5ba2..cfd31afbc 100644
--- a/tools/qfcc/source/Makefile.am
+++ b/tools/qfcc/source/Makefile.am
@@ -41,7 +41,8 @@ bin_SCRIPTS=	qfpreqcc
 common_src=\
 	class.c codespace.c constfold.c cpp.c dags.c debug.c def.c defspace.c \
 	diagnostic.c dot.c dot_dag.c dot_expr.c dot_flow.c dot_sblock.c emit.c \
-	expr.c expr_assign.c expr_binary.c expr_bool.c flow.c function.c grab.c \
+	expr.c expr_assign.c expr_binary.c expr_bool.c expr_compound.c \
+	flow.c function.c grab.c \
 	idstuff.c \
 	linker.c method.c \
 	obj_file.c \
diff --git a/tools/qfcc/source/def.c b/tools/qfcc/source/def.c
index d600fb0ae..f690f2c3b 100644
--- a/tools/qfcc/source/def.c
+++ b/tools/qfcc/source/def.c
@@ -62,37 +62,7 @@
 #include "type.h"
 #include "value.h"
 
-typedef struct element_s {
-	struct element_s *next;
-	int         offset;
-	type_t     *type;
-	expr_t     *expr;
-} element_t;
-
-typedef struct element_chain_s {
-	element_t  *head;
-	element_t **tail;
-} element_chain_t;
-
 static def_t *defs_freelist;
-static element_t *elements_freelist;
-
-static element_t *
-new_element (void)
-{
-	element_t  *element;
-	ALLOC (256, element_t, elements, element);
-	return element;
-}
-
-static element_t *
-append_init_element (element_chain_t *element_chain, element_t *element)
-{
-	element->next = 0;
-	*element_chain->tail = element;
-	element_chain->tail = &element->next;
-	return element;
-}
 
 static void
 set_storage_bits (def_t *def, storage_class_t storage)
@@ -367,65 +337,6 @@ init_elements_nil (def_t *def)
 	// it's a global, so already initialized to 0
 }
 
-static void
-build_element_chain (element_chain_t *element_chain, type_t *type,
-					 expr_t *eles, int base_offset)
-{
-	ex_initele_t *ele = eles->e.compound.head;
-
-	if (is_array (type)) {
-		type_t     *array_type = type->t.array.type;
-		int         array_size = type->t.array.size;
-		int         i;
-
-		for (i = 0; i < array_size; i++) {
-			int         offset = base_offset + i * type_size (array_type);
-			if (ele->expr && ele->expr->type == ex_compound) {
-				build_element_chain (element_chain, array_type,
-									 ele->expr, offset);
-			} else {
-				element_t  *element = new_element ();
-				element->type = array_type;
-				element->offset = offset;
-				element->expr = ele->expr;	// null will be treated as nil
-				append_init_element (element_chain, element);
-			}
-			if (ele) {
-				ele = ele->next;
-			}
-		}
-	} else if (is_struct (type) || is_vector (type) || is_quaternion (type)) {
-		symtab_t   *symtab = type->t.symtab;
-		symbol_t   *field;
-
-		for (field = symtab->symbols; field; field = field->next) {
-			int         offset = base_offset + field->s.offset;
-			if (field->sy_type != sy_var
-				|| field->visibility == vis_anonymous) {
-				continue;
-			}
-			if (ele->expr && ele->expr->type == ex_compound) {
-				build_element_chain (element_chain, field->type,
-									 ele->expr, offset);
-			} else {
-				element_t  *element = new_element ();
-				element->type = field->type;
-				element->offset = offset;
-				element->expr = ele->expr;	// null will be treated as nil
-				append_init_element (element_chain, element);
-			}
-			if (ele) {
-				ele = ele->next;
-			}
-		}
-	} else {
-		error (eles, "invalid initializer");
-	}
-	if (ele && ele->next && options.warnings.initializer) {
-		warning (eles, "excessive elements in initializer");
-	}
-}
-
 static void
 init_elements (struct def_s *def, expr_t *eles)
 {
@@ -444,21 +355,8 @@ init_elements (struct def_s *def, expr_t *eles)
 	build_element_chain (&element_chain, def->type, eles, 0);
 
 	if (def->local && local_expr) {
-		for (element = element_chain.head; element; element = element->next) {
-			int         offset = element->offset;
-			type_t     *type = element->type;
-			expr_t     *ptr = new_pointer_expr (offset, type, def);
-
-			if (element->expr) {
-				c = constant_expr (element->expr);
-			} else {
-				c = new_nil_expr ();
-			}
-			if (c->type == ex_nil) {
-				c = convert_nil (c, type);
-			}
-			append_expr (local_expr, assign_expr (unary_expr ('.', ptr), c));
-		}
+		expr_t     *ptr = new_pointer_expr (0, def->type, def);
+		assign_elements (local_expr, pointer_expr (ptr), &element_chain);
 	} else {
 		def_t       dummy = *def;
 		for (element = element_chain.head; element; element = element->next) {
@@ -502,8 +400,7 @@ init_elements (struct def_s *def, expr_t *eles)
 		}
 	}
 
-	*element_chain.tail = elements_freelist;
-	elements_freelist = element_chain.head;
+	free_element_chain (&element_chain);
 }
 
 static void
diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index b4173f45d..4b0317d53 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -432,8 +432,8 @@ copy_expr (expr_t *e)
 		case ex_compound:
 			n = new_expr ();
 			*n = *e;
-			for (ex_initele_t *i = e->e.compound.head; i; i = i->next) {
-				append_element (n, new_initele (i->expr, i->symbol));
+			for (element_t *i = e->e.compound.head; i; i = i->next) {
+				append_element (n, new_element (i->expr, i->symbol));
 			}
 			return n;
 	}
@@ -551,46 +551,6 @@ new_block_expr (void)
 	return b;
 }
 
-ex_initele_t *
-new_initele (expr_t *expr, symbol_t *symbol)
-{
-	ex_initele_t *i = calloc (1, sizeof (*i));
-	i->expr = expr;
-	i->symbol = symbol;
-	return i;
-}
-
-expr_t *
-new_compound_init (void)
-{
-	expr_t     *c = new_expr ();
-	c->type = ex_compound;
-	c->e.compound.head = 0;
-	c->e.compound.tail = &c->e.compound.head;
-	return c;
-}
-
-expr_t *
-append_element (expr_t *compound, ex_initele_t *element)
-{
-	if (compound->type != ex_compound) {
-		internal_error (compound, "not a compound expression");
-	}
-
-	if (!element || (element->expr && element->expr->type == ex_error)) {
-		return compound;
-	}
-
-	if (element->next) {
-		internal_error (compound, "append_element: element loop detected");
-	}
-
-	*compound->e.compound.tail = element;
-	compound->e.compound.tail = &element->next;
-
-	return compound;
-}
-
 expr_t *
 new_binary_expr (int op, expr_t *e1, expr_t *e2)
 {
@@ -1731,6 +1691,7 @@ expr_t *
 build_function_call (expr_t *fexpr, const type_t *ftype, expr_t *params)
 {
 	expr_t     *e;
+	expr_t     *p;
 	int         arg_count = 0, parm_count = 0;
 	int         i;
 	expr_t     *args = 0, **a = &args;
@@ -1770,8 +1731,18 @@ build_function_call (expr_t *fexpr, const type_t *ftype, expr_t *params)
 		parm_count = ftype->t.func.num_params;
 	}
 	for (i = arg_count - 1, e = params; i >= 0; i--, e = e->next) {
-		type_t     *t = get_type (e);
+		type_t     *t;
 
+		if (e->type == ex_compound) {
+			if (i < parm_count) {
+				t = ftype->t.func.param_types[i];
+			} else {
+				return error (e, "cannot pass compound initializer "
+							  "through ...");
+			}
+		} else {
+			t = get_type (e);
+		}
 		if (!t) {
 			return e;
 		}
@@ -1827,7 +1798,11 @@ build_function_call (expr_t *fexpr, const type_t *ftype, expr_t *params)
 
 	call = expr_file_line (new_block_expr (), fexpr);
 	call->e.block.is_call = 1;
-	for (e = params, i = 0; e; e = e->next, i++) {
+	for (p = params, i = 0; p; p = p->next, i++) {
+		expr_t     *e = p;
+		if (e->type == ex_compound) {
+			e = expr_file_line (initialized_temp_expr (arg_types[i], e), e);
+		}
 		if (has_function_call (e)) {
 			expr_t     *cast = cast_expr (arg_types[i], convert_vector (e));
 			expr_t     *tmp = new_temp_def_expr (arg_types[i]);
diff --git a/tools/qfcc/source/expr_assign.c b/tools/qfcc/source/expr_assign.c
index 466ffcf95..edad8eff7 100644
--- a/tools/qfcc/source/expr_assign.c
+++ b/tools/qfcc/source/expr_assign.c
@@ -313,10 +313,16 @@ assign_expr (expr_t *dst, expr_t *src)
 	}
 
 	dst_type = get_type (dst);
-	src_type = get_type (src);
 	if (!dst_type) {
 		internal_error (dst, "dst_type broke in assign_expr");
 	}
+	if (src->type == ex_compound) {
+		src = initialized_temp_expr (dst_type, src);
+		if (src->type == ex_error) {
+			return src;
+		}
+	}
+	src_type = get_type (src);
 	if (!src_type) {
 		internal_error (src, "src_type broke in assign_expr");
 	}
diff --git a/tools/qfcc/source/expr_compound.c b/tools/qfcc/source/expr_compound.c
new file mode 100644
index 000000000..5ead7de7a
--- /dev/null
+++ b/tools/qfcc/source/expr_compound.c
@@ -0,0 +1,209 @@
+/*
+	expr_compound.c
+
+	compound intializer expression construction and manipulations
+
+	Copyright (C) 2020 Bill Currie <bill@taniwha.org>
+
+	Author: Bill Currie <bill@taniwha.org>
+	Date: 2020/03/11
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#include <stdlib.h>
+
+#include "QF/alloc.h"
+#include "QF/dstring.h"
+#include "QF/mathlib.h"
+#include "QF/sys.h"
+#include "QF/va.h"
+
+#include "diagnostic.h"
+#include "expr.h"
+#include "options.h"
+#include "symtab.h"
+#include "type.h"
+
+static element_t *elements_freelist;
+
+element_t *
+new_element (expr_t *expr, symbol_t *symbol)
+{
+	element_t  *element;
+	ALLOC (256, element_t, elements, element);
+	element->expr = expr;
+	element->symbol = symbol;
+	return element;
+}
+
+static element_t *
+append_init_element (element_chain_t *element_chain, element_t *element)
+{
+	element->next = 0;
+	*element_chain->tail = element;
+	element_chain->tail = &element->next;
+	return element;
+}
+
+expr_t *
+new_compound_init (void)
+{
+	expr_t     *c = new_expr ();
+	c->type = ex_compound;
+	c->e.compound.head = 0;
+	c->e.compound.tail = &c->e.compound.head;
+	return c;
+}
+
+void
+build_element_chain (element_chain_t *element_chain, type_t *type,
+					 expr_t *eles, int base_offset)
+{
+	element_t  *ele = eles->e.compound.head;
+
+	if (is_array (type)) {
+		type_t     *array_type = type->t.array.type;
+		int         array_size = type->t.array.size;
+		int         i;
+
+		for (i = 0; i < array_size; i++) {
+			int         offset = base_offset + i * type_size (array_type);
+			if (ele && ele->expr && ele->expr->type == ex_compound) {
+				build_element_chain (element_chain, array_type,
+									 ele->expr, offset);
+			} else {
+				element_t  *element = new_element (0, 0);
+				element->type = array_type;
+				element->offset = offset;
+				element->expr = ele ? ele->expr : 0;	// null -> nil
+				append_init_element (element_chain, element);
+			}
+			if (ele) {
+				ele = ele->next;
+			}
+		}
+	} else if (is_struct (type) || is_vector (type) || is_quaternion (type)) {
+		symtab_t   *symtab = type->t.symtab;
+		symbol_t   *field;
+
+		for (field = symtab->symbols; field; field = field->next) {
+			int         offset = base_offset + field->s.offset;
+			if (field->sy_type != sy_var
+				|| field->visibility == vis_anonymous) {
+				continue;
+			}
+			if (ele && ele->expr && ele->expr->type == ex_compound) {
+				build_element_chain (element_chain, field->type,
+									 ele->expr, offset);
+			} else {
+				element_t  *element = new_element (0, 0);
+				element->type = field->type;
+				element->offset = offset;
+				element->expr = ele ? ele->expr : 0;	// null -> nil
+				append_init_element (element_chain, element);
+			}
+			if (ele) {
+				ele = ele->next;
+			}
+		}
+	} else {
+		error (eles, "invalid initializer");
+	}
+	if (ele && ele->next && options.warnings.initializer) {
+		warning (eles, "excessive elements in initializer");
+	}
+}
+
+void free_element_chain (element_chain_t *element_chain)
+{
+	*element_chain->tail = elements_freelist;
+	elements_freelist = element_chain->head;
+	element_chain->head = 0;
+	element_chain->tail = &element_chain->head;
+}
+
+expr_t *
+append_element (expr_t *compound, element_t *element)
+{
+	if (compound->type != ex_compound) {
+		internal_error (compound, "not a compound expression");
+	}
+
+	if (!element || (element->expr && element->expr->type == ex_error)) {
+		return compound;
+	}
+
+	if (element->next) {
+		internal_error (compound, "append_element: element loop detected");
+	}
+	append_init_element (&compound->e.compound, element);
+	return compound;
+}
+
+void
+assign_elements (expr_t *local_expr, expr_t *init,
+				 element_chain_t *element_chain)
+{
+	element_t  *element;
+
+	for (element = element_chain->head; element; element = element->next) {
+		int         offset = element->offset;
+		type_t     *type = element->type;
+		expr_t     *alias = new_offset_alias_expr (type, init, offset);
+
+		expr_t     *c;
+
+		if (element->expr) {
+			c = constant_expr (element->expr);
+		} else {
+			c = new_nil_expr ();
+		}
+		if (c->type == ex_nil) {
+			c = convert_nil (c, type);
+		}
+		append_expr (local_expr, assign_expr (alias, c));
+	}
+}
+
+expr_t *
+initialized_temp_expr (type_t *type, expr_t *compound)
+{
+	element_chain_t element_chain;
+	expr_t     *temp = new_temp_def_expr (type);
+	expr_t     *block = new_block_expr ();
+
+	element_chain.head = 0;
+	element_chain.tail = &element_chain.head;
+	build_element_chain (&element_chain, type, compound, 0);
+	assign_elements (block, temp, &element_chain);
+	block->e.block.result = temp;
+	free_element_chain (&element_chain);
+	return block;
+}
diff --git a/tools/qfcc/source/qc-parse.y b/tools/qfcc/source/qc-parse.y
index 5b3216d10..a4ce4c433 100644
--- a/tools/qfcc/source/qc-parse.y
+++ b/tools/qfcc/source/qc-parse.y
@@ -98,7 +98,7 @@ int yylex (void);
 	void       *pointer;			// for ensuring pointer values are null
 	struct type_s	*type;
 	struct expr_s	*expr;
-	struct ex_initele_s *element;
+	struct element_s *element;
 	struct function_s *function;
 	struct switch_block_s *switch_block;
 	struct param_s	*param;
@@ -188,7 +188,8 @@ int yylex (void);
 %type	<expr>		optional_state_expr texpr vector_expr
 %type	<expr>		statement statements compound_statement
 %type	<expr>		else bool_label break_label continue_label
-%type	<expr>		unary_expr ident_expr cast_expr opt_arg_list arg_list
+%type	<expr>		unary_expr ident_expr cast_expr expr_list
+%type	<expr>		opt_arg_list arg_list arg_expr
 %type	<expr>		init_var_decl_list init_var_decl
 %type	<switch_block> switch_block
 %type	<symbol>	identifier label
@@ -1183,8 +1184,8 @@ element_list
 	;
 
 element
-	: compound_init								{ $$ = new_initele ($1, 0); }
-	| expr										{ $$ = new_initele ($1, 0); }
+	: compound_init								{ $$ = new_element ($1, 0); }
+	| expr										{ $$ = new_element ($1, 0); }
 	;
 
 optional_comma
@@ -1473,7 +1474,7 @@ ident_expr
 	;
 
 vector_expr
-	: '[' expr ',' arg_list ']'
+	: '[' expr ',' expr_list ']'
 		{
 			expr_t     *t = $4;
 			while (t->next)
@@ -1494,6 +1495,7 @@ cast_expr
 expr
 	: cast_expr
 	| expr '=' expr				{ $$ = assign_expr ($1, $3); }
+	| expr '=' compound_init	{ $$ = assign_expr ($1, $3); }
 	| expr ASX expr				{ $$ = asx_expr ($2, $1, $3); }
 	| expr '?' expr ':' expr 	{ $$ = conditional_expr ($1, $3, $5); }
 	| expr AND bool_label expr	{ $$ = bool_expr (AND, $3, $1, $4); }
@@ -1522,7 +1524,7 @@ texpr
 	;
 
 comma_expr
-	: arg_list
+	: expr_list
 		{
 			if ($1->next) {
 				expr_t     *res = $1;
@@ -1533,20 +1535,34 @@ comma_expr
 		}
 	;
 
+expr_list
+	: expr
+	| expr_list ',' expr
+		{
+			$3->next = $1;
+			$$ = $3;
+		}
+	;
+
 opt_arg_list
 	: /* emtpy */				{ $$ = 0; }
 	| arg_list					{ $$ = $1; }
 	;
 
 arg_list
-	: expr
-	| arg_list ',' expr
+	: arg_expr
+	| arg_list ',' arg_expr
 		{
 			$3->next = $1;
 			$$ = $3;
 		}
 	;
 
+arg_expr
+	: expr
+	| compound_init
+	;
+
 const
 	: VALUE
 	| NIL						{ $$ = new_nil_expr (); }
diff --git a/tools/qfcc/test/Makefile.am b/tools/qfcc/test/Makefile.am
index 99c24142c..f4d31a2c9 100644
--- a/tools/qfcc/test/Makefile.am
+++ b/tools/qfcc/test/Makefile.am
@@ -35,6 +35,7 @@ test_progs_dat=\
 	chewed-alias.dat \
 	chewed-return.dat \
 	comma-expr.dat \
+	compound.dat \
 	deadbool.dat \
 	double.dat \
 	enum.dat \
@@ -158,6 +159,15 @@ comma-expr.run: Makefile build-run
 include ./$(DEPDIR)/comma-expr.Qo # am--include-marker
 r_depfiles_remade += ./$(DEPDIR)/comma-expr.Qo
 
+compound_dat_SOURCES=compound.r
+compound_obj=$(compound_dat_SOURCES:.r=.qfo)
+compound.dat$(EXEEXT): $(compound_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(compound_obj)
+compound.run: Makefile build-run
+	@$(srcdir)/build-run $@
+include ./$(DEPDIR)/compound.Qo # am--include-marker
+r_depfiles_remade += ./$(DEPDIR)/compound.Qo
+
 deadbool_dat_SOURCES=deadbool.r
 deadbool_obj=$(deadbool_dat_SOURCES:.r=.qfo)
 deadbool.dat$(EXEEXT): $(deadbool_obj) $(QFCC_DEP)
diff --git a/tools/qfcc/test/compound.r b/tools/qfcc/test/compound.r
new file mode 100644
index 000000000..19a72d3fe
--- /dev/null
+++ b/tools/qfcc/test/compound.r
@@ -0,0 +1,72 @@
+#include "test-harness.h"
+
+typedef struct Point {
+    int x;
+    int y;
+} Point;
+
+typedef struct Size {
+    int width;
+    int height;
+} Size;
+
+typedef struct Rect {
+    Point   origin;
+    Size    size;
+} Rect;
+
+int test_simple_param (Point p, int x, int y)
+{
+	int ret = !(p.x == x && p.y == y);
+	if (ret) {
+		printf ("simple param: {%d, %d} != {%d, %d}\n", p.x, p.y, x, y);
+	}
+	return ret;
+}
+
+int test_nested_param (Rect r, int x, int y, int w, int h)
+{
+	int ret = !(r.origin.x == x && r.origin.y == y
+				&& r.size.width == w && r.size.height == h);
+	if (ret) {
+		printf ("nested param: {{%d, %d}, {%d, %d}} != ",
+				r.origin.x, r.origin.y, r.size.width, r.size.height);
+		printf ("{{%d, %d}, {%d, %d}}\n", x, y, w, h);
+	}
+	return ret;
+}
+
+int test_simple_assign (int x, int y)
+{
+	Point p;
+	p = { x, y };
+	int ret = !(p.x == x && p.y == y);
+	if (ret) {
+		printf ("simple assign: {%d, %d} != {%d, %d}\n", p.x, p.y, x, y);
+	}
+	return ret;
+}
+
+int test_nested_assign (int x, int y, int w, int h)
+{
+	Rect r;
+	r = {{x, y}, {w, h}};
+	int ret = !(r.origin.x == x && r.origin.y == y
+				&& r.size.width == w && r.size.height == h);
+	if (ret) {
+		printf ("nested assign: {{%d, %d}, {%d, %d}} != ",
+				r.origin.x, r.origin.y, r.size.width, r.size.height);
+		printf ("{{%d, %d}, {%d, %d}}\n", x, y, w, h);
+	}
+	return ret;
+}
+
+int main (void)
+{
+	int ret = 0;
+	ret |= test_simple_param ({1, 2}, 1, 2);
+	ret |= test_nested_param ({{1, 2}, {3, 4}}, 1, 2, 3, 4);
+	ret |= test_simple_assign (1, 2);
+	ret |= test_nested_assign (1, 2, 3, 4);
+	return ret;
+}
diff --git a/tools/qfcc/test/struct-init-param.r b/tools/qfcc/test/struct-init-param.r
index 1b3bc9e7a..f043cfde3 100644
--- a/tools/qfcc/test/struct-init-param.r
+++ b/tools/qfcc/test/struct-init-param.r
@@ -16,6 +16,12 @@ typedef struct Rect_s {
 
 void *foo (Rect *obj, void *cmd, Rect *o, Point pos, Rect r);
 
+void *baz (Rect *obj, void *cmd, Rect *o, Point pos)
+{
+	Rect rect = { {1, 2}, {3, 4} };
+	return foo (obj, cmd, o, pos, rect);
+}
+
 void *bar (Rect *obj, void *cmd, Rect *o, Point pos)
 {
 	Rect rect = { {}, obj.extent };
@@ -33,12 +39,19 @@ Rect o = { { 5, 6}, {7, 8} };
 
 int main (void)
 {
-	int         ret = 1;
+	int         ret = 0;
 	bar(&obj, nil, &o, obj.offset);
 	printf ("%d %d %d %d\n", o.offset.x, o.offset.y,
 			o.extent.width, o.extent.height);
-	if (o.offset.x == 0 && o.offset.y == 0
+	if not (o.offset.x == 0 && o.offset.y == 0
 		&& o.extent.width == 3 && o.extent.height == 4)
-		ret = 0;
+		ret |= 1;
+
+	baz(&obj, nil, &o, obj.offset);
+	printf ("%d %d %d %d\n", o.offset.x, o.offset.y,
+			o.extent.width, o.extent.height);
+	if not (o.offset.x == 1 && o.offset.y == 2
+		&& o.extent.width == 3 && o.extent.height == 4)
+		ret |= 1;
 	return ret;
 }

From 48a256efaa62034196258c7254a8ffd115e97f15 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 11 Mar 2020 20:45:25 +0900
Subject: [PATCH 0727/1519] [qfcc] Fix segfault when assigning {}

I had intended to check, but forgot.
---
 tools/qfcc/source/expr_assign.c | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/tools/qfcc/source/expr_assign.c b/tools/qfcc/source/expr_assign.c
index edad8eff7..a6b3f81f0 100644
--- a/tools/qfcc/source/expr_assign.c
+++ b/tools/qfcc/source/expr_assign.c
@@ -293,29 +293,33 @@ assign_expr (expr_t *dst, expr_t *src)
 	type_t     *dst_type, *src_type;
 
 	convert_name (dst);
-	convert_name (src);
-
 	if (dst->type == ex_error) {
 		return dst;
 	}
-	if (src->type == ex_error) {
-		return src;
-	}
-
-	if (options.traditional
-		&& (expr = check_assign_logic_precedence (dst, src))) {
-		return expr;
-	}
-
-
 	if ((expr = check_valid_lvalue (dst))) {
 		return expr;
 	}
-
 	dst_type = get_type (dst);
 	if (!dst_type) {
 		internal_error (dst, "dst_type broke in assign_expr");
 	}
+
+	if (src) {
+		convert_name (src);
+		if (src->type == ex_error) {
+			return src;
+		}
+
+		if (options.traditional
+			&& (expr = check_assign_logic_precedence (dst, src))) {
+			return expr;
+		}
+	} else {
+		if (is_scalar (dst_type)) {
+			return error (dst, "empty scalar initializer");
+		}
+		src = new_nil_expr ();
+	}
 	if (src->type == ex_compound) {
 		src = initialized_temp_expr (dst_type, src);
 		if (src->type == ex_error) {

From d418be31e6d1362cdbaa4b980207817172f0fcf2 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 11 Mar 2020 20:55:21 +0900
Subject: [PATCH 0728/1519] [qfcc] Tweak ivar test to check old bug

It turns out that assigning nil to an ivar struct does not work (should,
of course).
---
 tools/qfcc/test/ivar-struct-return.r | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/qfcc/test/ivar-struct-return.r b/tools/qfcc/test/ivar-struct-return.r
index 5e212a5ba..a3883b81c 100644
--- a/tools/qfcc/test/ivar-struct-return.r
+++ b/tools/qfcc/test/ivar-struct-return.r
@@ -17,6 +17,7 @@ typedef struct Point Point;
 @implementation Object
 -(Point) origin
 {
+	origin = nil;
 	return origin;
 }
 @end

From 6ca85d770d471a9212cff42b8981d3222328c052 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 11 Mar 2020 22:48:55 +0900
Subject: [PATCH 0729/1519] [gamecode] Add memset instructions

---
 include/QF/pr_comp.h      |  3 +++
 libs/gamecode/pr_exec.c   | 23 ++++++++++++++++++++++-
 libs/gamecode/pr_opcode.c | 10 ++++++++++
 3 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/include/QF/pr_comp.h b/include/QF/pr_comp.h
index 6458d3913..80b9e963d 100644
--- a/include/QF/pr_comp.h
+++ b/include/QF/pr_comp.h
@@ -395,6 +395,9 @@ typedef enum {
 	OP_MOD_I,
 	OP_MOD_F,
 	OP_MOD_D,
+
+	OP_MEMSET,
+	OP_MEMSETI,
 } pr_opcode_e;
 #define OP_BREAK 0x8000
 
diff --git a/libs/gamecode/pr_exec.c b/libs/gamecode/pr_exec.c
index d673b7d1c..718e2b09a 100644
--- a/libs/gamecode/pr_exec.c
+++ b/libs/gamecode/pr_exec.c
@@ -404,6 +404,14 @@ check_stack_pointer (progs_t *pr, pointer_t stack, int size)
 	}
 }
 
+static inline void
+pr_memset (pr_type_t *dst, int val, int count)
+{
+	while (count-- > 0) {
+		(*dst++).integer_var = val;
+	}
+}
+
 /*
 	PR_ExecuteProgram
 
@@ -1608,7 +1616,20 @@ op_call:
 						 pr->pr_globals + OPA.integer_var,
 						 st->b * 4);
 				break;
-
+			case OP_MEMSET:
+				if (pr_boundscheck->int_val) {
+					PR_BoundsCheckSize (pr, OPC.pointer_var, OPB.uinteger_var);
+				}
+				pr_memset (pr->pr_globals + OPC.pointer_var, OPA.integer_var,
+						   OPB.integer_var);
+				break;
+			case OP_MEMSETI:
+				if (pr_boundscheck->int_val) {
+					PR_BoundsCheckSize (pr, OPC.pointer_var, st->b);
+				}
+				pr_memset (pr->pr_globals + OPC.pointer_var, OPA.integer_var,
+						   st->b);
+				break;
 			case OP_GE_D:
 				OPC.float_var = OPA_double_var >= OPB_double_var;
 				break;
diff --git a/libs/gamecode/pr_opcode.c b/libs/gamecode/pr_opcode.c
index 853176925..dc3a59fb9 100644
--- a/libs/gamecode/pr_opcode.c
+++ b/libs/gamecode/pr_opcode.c
@@ -1183,6 +1183,16 @@ VISIBLE const opcode_t pr_opcodes[] = {
 	 PROG_VERSION,
 	 "%Ga, %Gb, %Gc",
 	},
+	{"<MEMSET>", "memset", OP_MEMSET, true,
+	 ev_integer, ev_integer, ev_pointer,
+	 PROG_VERSION,
+	 "%Ga, %Gb, %Gc",
+	},
+	{"<MEMSET>", "memseti", OP_MEMSETI, true,
+	 ev_integer, ev_short, ev_pointer,
+	 PROG_VERSION,
+	 "%Ga, %Gb, %Gc",
+	},
 
 	{"<PUSH>", "push.s", OP_PUSH_S, false,
 	 ev_string, ev_invalid, ev_invalid,

From be5f11f33a34d9db9663d35da65c31a7badb00de Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 11 Mar 2020 22:57:20 +0900
Subject: [PATCH 0730/1519] [qfcc] Support the new memset instructions

---
 tools/qfcc/include/expr.h       | 11 +++++++++++
 tools/qfcc/source/expr.c        | 32 ++++++++++++++++++++++++++++++++
 tools/qfcc/source/expr_assign.c |  1 +
 tools/qfcc/source/statements.c  | 30 +++++++++++++++++++++++++++++-
 4 files changed, 73 insertions(+), 1 deletion(-)

diff --git a/tools/qfcc/include/expr.h b/tools/qfcc/include/expr.h
index 008313a5a..322298da4 100644
--- a/tools/qfcc/include/expr.h
+++ b/tools/qfcc/include/expr.h
@@ -56,6 +56,7 @@ typedef enum {
 	ex_nil,			///< umm, nil, null. nuff said (0 of any type)
 	ex_value,		///< constant value (::ex_value_t)
 	ex_compound,	///< compound initializer
+	ex_memset,		///< memset needs three params...
 } expr_type;
 
 /**	Binary and unary expressions.
@@ -142,6 +143,12 @@ typedef struct {
 	struct expr_s *e;
 } ex_bool_t;
 
+typedef struct ex_memset_s {
+	struct expr_s *dst;
+	struct expr_s *val;
+	struct expr_s *count;
+} ex_memset_t;
+
 /**	State expression used for think function state-machines.
 
 	State expressions are of the form <code>[framenum, nextthink]</code>
@@ -225,6 +232,7 @@ typedef struct expr_s {
 		ex_vector_t vector;				///< vector expression list
 		ex_value_t *value;				///< constant value
 		element_chain_t compound;		///< compound initializer
+		ex_memset_t memset;				///< memset expr params
 	} e;
 } expr_t;
 
@@ -640,6 +648,9 @@ expr_t *new_param_expr (struct type_s *type, int num);
 expr_t *new_move_expr (expr_t *e1, expr_t *e2, struct type_s *type,
 					   int indirect);
 
+expr_t *new_memset_expr (expr_t *dst, expr_t *val, expr_t *count);
+
+
 /**	Convert a name to an expression of the appropriate type.
 
 	Converts the expression in-place. If the exprssion is not a name
diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index 4b0317d53..47f398f46 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -214,6 +214,7 @@ get_type (expr_t *e)
 	convert_name (e);
 	switch (e->type) {
 		case ex_labelref:
+		case ex_memset:
 			return &type_void;
 		case ex_label:
 		case ex_error:
@@ -436,6 +437,13 @@ copy_expr (expr_t *e)
 				append_element (n, new_element (i->expr, i->symbol));
 			}
 			return n;
+		case ex_memset:
+			n = new_expr ();
+			*n = *e;
+			n->e.memset.dst = copy_expr (e->e.memset.dst);
+			n->e.memset.val = copy_expr (e->e.memset.val);
+			n->e.memset.count = copy_expr (e->e.memset.count);
+			return n;
 	}
 	internal_error (e, "invalid expression");
 }
@@ -1171,6 +1179,27 @@ new_move_expr (expr_t *e1, expr_t *e2, type_t *type, int indirect)
 	return e;
 }
 
+expr_t *
+new_memset_expr (expr_t *dst, expr_t *val, expr_t *count)
+{
+	expr_t     *e;
+	if (!is_pointer (get_type (dst))) {
+		return error (dst, "incorrect destination type for memset");
+	}
+	if (!is_scalar (get_type (val))) {
+		return error (val, "memset value must be a scalar");
+	}
+	if (!is_integral (get_type (count))) {
+		return error (val, "memset count must be integral");
+	}
+	e = new_expr ();
+	e->type = ex_memset;
+	e->e.memset.dst = dst;
+	e->e.memset.val = val;
+	e->e.memset.count = count;
+	return e;
+}
+
 expr_t *
 append_expr (expr_t *block, expr_t *e)
 {
@@ -1508,6 +1537,7 @@ unary_expr (int op, expr_t *e)
 				case ex_labelref:
 				case ex_state:
 				case ex_compound:
+				case ex_memset:
 					internal_error (e, 0);
 				case ex_uexpr:
 					if (e->e.expr.op == '-')
@@ -1575,6 +1605,7 @@ unary_expr (int op, expr_t *e)
 				case ex_labelref:
 				case ex_state:
 				case ex_compound:
+				case ex_memset:
 					internal_error (e, 0);
 				case ex_bool:
 					return new_bool_expr (e->e.bool.false_list,
@@ -1641,6 +1672,7 @@ unary_expr (int op, expr_t *e)
 				case ex_labelref:
 				case ex_state:
 				case ex_compound:
+				case ex_memset:
 					internal_error (e, 0);
 				case ex_uexpr:
 					if (e->e.expr.op == '~')
diff --git a/tools/qfcc/source/expr_assign.c b/tools/qfcc/source/expr_assign.c
index a6b3f81f0..0ada7160b 100644
--- a/tools/qfcc/source/expr_assign.c
+++ b/tools/qfcc/source/expr_assign.c
@@ -123,6 +123,7 @@ check_valid_lvalue (expr_t *expr)
 				return check_valid_lvalue (expr->e.expr.e1);
 			}
 			break;
+		case ex_memset:
 		case ex_compound:
 		case ex_state:
 		case ex_bool:
diff --git a/tools/qfcc/source/statements.c b/tools/qfcc/source/statements.c
index 517fcc7b3..1bb2bc2ba 100644
--- a/tools/qfcc/source/statements.c
+++ b/tools/qfcc/source/statements.c
@@ -1438,6 +1438,32 @@ statement_uexpr (sblock_t *sblock, expr_t *e)
 	return sblock;
 }
 
+static sblock_t *
+statement_memset (sblock_t *sblock, expr_t *e)
+{
+	expr_t     *dst = e->e.memset.dst;
+	expr_t     *val = e->e.memset.val;
+	expr_t     *count = e->e.memset.count;
+	const char *opcode = "<MEMSET>";
+	statement_t *s;
+
+	if (is_constant (count)) {
+		if (is_integer (get_type (count))
+			&& (unsigned) expr_integer (count) < 0x10000) {
+			count = new_short_expr (expr_integer (count));
+		}
+		if (is_uinteger (get_type (count)) && expr_integer (count) < 0x10000) {
+			count = new_short_expr (expr_uinteger (count));
+		}
+	}
+	s = new_statement (st_move, opcode, e);
+	sblock = statement_subexpr (sblock, dst, &s->opc);
+	sblock = statement_subexpr (sblock, count, &s->opb);
+	sblock = statement_subexpr (sblock, val, &s->opa);
+	sblock_add_statement (sblock, s);
+	return sblock;
+}
+
 static sblock_t *
 statement_nonexec (sblock_t *sblock, expr_t *e)
 {
@@ -1463,10 +1489,12 @@ statement_slist (sblock_t *sblock, expr_t *e)
 		statement_nonexec,	// ex_vector
 		statement_nonexec,	// ex_nil
 		statement_nonexec,	// ex_value
+		0,					// ex_compound
+		statement_memset,
 	};
 
 	for (/**/; e; e = e->next) {
-		if (e->type > ex_value)
+		if (e->type > ex_memset)
 			internal_error (e, "bad expression type");
 		sblock = sfuncs[e->type] (sblock, e);
 	}

From 5d349efe782f777181818e81de8f65f413f8c356 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 11 Mar 2020 22:57:48 +0900
Subject: [PATCH 0731/1519] [qfcc] Delay conversion of nil in assignments

It's not possible to take the address of constants (at this stage) and
trying to use a move instruction with .zero as source would result in
the VM complaining about null pointer access when bounds checking is on.
Thus, don't convert a nil source expression until it is known to be
safe, and use memset when it is not.
---
 tools/qfcc/include/expr.h       |  1 +
 tools/qfcc/source/expr.c        |  6 ++++++
 tools/qfcc/source/expr_assign.c | 37 +++++++++++++++++++++++----------
 3 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/tools/qfcc/include/expr.h b/tools/qfcc/include/expr.h
index 322298da4..9879ee810 100644
--- a/tools/qfcc/include/expr.h
+++ b/tools/qfcc/include/expr.h
@@ -595,6 +595,7 @@ int is_logic (int op) __attribute__((const));
 
 int has_function_call (expr_t *e) __attribute__((pure));
 
+int is_nil (expr_t *e) __attribute__((pure));
 int is_string_val (expr_t *e) __attribute__((pure));
 int is_float_val (expr_t *e) __attribute__((pure));
 int is_vector_val (expr_t *e) __attribute__((pure));
diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index 47f398f46..2d419c20f 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -882,6 +882,12 @@ constant_expr (expr_t *e)
 	return new;
 }
 
+int
+is_nil (expr_t *e)
+{
+	return e->type == ex_nil;
+}
+
 int
 is_string_val (expr_t *e)
 {
diff --git a/tools/qfcc/source/expr_assign.c b/tools/qfcc/source/expr_assign.c
index 0ada7160b..07a838b13 100644
--- a/tools/qfcc/source/expr_assign.c
+++ b/tools/qfcc/source/expr_assign.c
@@ -345,21 +345,22 @@ assign_expr (expr_t *dst, expr_t *src)
 		}
 		src_type = get_type (src);
 	}
-	if (!is_void (dst_type) && src->type == ex_nil) {
+	if (!is_struct (dst_type) && is_nil (src)) {
 		// nil is a type-agnostic 0
 		// FIXME: assignment to compound types? error or memset?
 		src_type = dst_type;
 		convert_nil (src, src_type);
 	}
 
-	if ((expr = check_types_compatible (dst, src))) {
-		// expr might be a valid expression, but if so, check_types_compatible
-		// will take care of everything
-		return expr;
-	}
-
-	if ((expr = assign_vector_expr (dst, src))) {
-		return expr;
+	if (!is_nil (src)) {
+		if ((expr = check_types_compatible (dst, src))) {
+			// expr might be a valid expression, but if so,
+			// check_types_compatible will take care of everything
+			return expr;
+		}
+		if ((expr = assign_vector_expr (dst, src))) {
+			return expr;
+		}
 	}
 
 	if (is_indirect (dst) && is_indirect (src)) {
@@ -381,8 +382,18 @@ assign_expr (expr_t *dst, expr_t *src)
 		debug (dst, "here");
 		if (is_struct (dst_type)) {
 			dst = address_expr (dst, 0, 0);
-			src = address_expr (src, 0, 0);
-			return new_move_expr (dst, src, dst_type, 1);
+			if (is_nil (src)) {
+				int         size = type_size (dst_type);
+				return new_memset_expr (dst, new_integer_expr (0),
+										new_integer_expr (size));
+			} else {
+				src = address_expr (src, 0, 0);
+				return new_move_expr (dst, src, dst_type, 1);
+			}
+		}
+		if (is_nil (src)) {
+			src_type = dst_type;
+			convert_nil (src, src_type);
 		}
 		if (dst->type == ex_expr) {
 			if (get_type (dst->e.expr.e1) == &type_entity) {
@@ -420,6 +431,10 @@ assign_expr (expr_t *dst, expr_t *src)
 		}
 	}
 
+	if (is_nil (src)) {
+		src_type = dst_type;
+		convert_nil (src, src_type);
+	}
 	if (is_struct (dst_type)) {
 		return new_move_expr (dst, src, dst_type, 0);
 	}

From e4caf50ee1aeb2a54fdaacf57cbdf6dc5e1db889 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 11 Mar 2020 23:52:12 +0900
Subject: [PATCH 0732/1519] [qfcc] Update switch tables for compound
 initializers

Forgot to do a full test build (Machine.r found it)
---
 tools/qfcc/source/def.c        | 2 ++
 tools/qfcc/source/statements.c | 6 +++---
 tools/qfcc/source/switch.c     | 6 ++++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/tools/qfcc/source/def.c b/tools/qfcc/source/def.c
index f690f2c3b..d642261ef 100644
--- a/tools/qfcc/source/def.c
+++ b/tools/qfcc/source/def.c
@@ -371,6 +371,8 @@ init_elements (struct def_s *def, expr_t *eles)
 			dummy.offset = def->offset + element->offset;
 			g = D_POINTER (pr_type_t, &dummy);
 			if (c->type == ex_labelref) {
+				// reloc_def_* use only the def's offset and space, so dummy
+				// is ok
 				reloc_def_op (c->e.labelref.label, &dummy);
 				continue;
 			} else if (c->type == ex_value) {
diff --git a/tools/qfcc/source/statements.c b/tools/qfcc/source/statements.c
index 1bb2bc2ba..0b27803a1 100644
--- a/tools/qfcc/source/statements.c
+++ b/tools/qfcc/source/statements.c
@@ -536,7 +536,7 @@ statement_get_targetlist (statement_t *s)
 	sblock_t  **target_list;
 	int         count = 0, i;
 	def_t      *table = 0;
-	expr_t     *e;
+	element_t  *e;
 
 	if (statement_is_cond (s)) {
 		count = 1;
@@ -555,9 +555,9 @@ statement_get_targetlist (statement_t *s)
 	} else if (statement_is_jumpb (s)) {
 		if (table->alias)
 			internal_error (0, "aliased jump table");
-		e = table->initializer->e.block.head;	//FIXME check!!!
+		e = table->initializer->e.compound.head;	//FIXME check!!!
 		for (i = 0; i < count; e = e->next, i++)
-			target_list[i] = e->e.labelref.label->dest;
+			target_list[i] = e->expr->e.labelref.label->dest;
 	}
 	return target_list;
 }
diff --git a/tools/qfcc/source/switch.c b/tools/qfcc/source/switch.c
index 7e76ef6f4..967a7b73f 100644
--- a/tools/qfcc/source/switch.c
+++ b/tools/qfcc/source/switch.c
@@ -337,11 +337,13 @@ build_switch (expr_t *sw, case_node_t *tree, int op, expr_t *sw_val,
 		const char *table_name = new_label_name ();
 		int         i;
 		expr_t     *range = binary_expr ('-', tree->high, tree->low);
+		expr_t     *label;
 
-		table_init = new_block_expr ();
+		table_init = new_compound_init ();
 		for (i = 0; i <= high - low; i++) {
 			tree->labels[i]->e.label.used++;
-			append_expr (table_init, address_expr (tree->labels[i], 0, 0));
+			label = address_expr (tree->labels[i], 0, 0);
+			append_element (table_init, new_element (label, 0));
 		}
 		table_sym = new_symbol_type (table_name,
 									 array_type (&type_integer,

From 0d4c7ba10fa8d7df5349e881128bfb78d47835d4 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 12 Mar 2020 00:52:42 +0900
Subject: [PATCH 0733/1519] [cl_menu] Update plist usage of obj_msg_sendv

Wonder if there's anywhere else...
---
 ruamoko/cl_menu/plistmenu.r | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/ruamoko/cl_menu/plistmenu.r b/ruamoko/cl_menu/plistmenu.r
index bdece6082..00d2a61e0 100644
--- a/ruamoko/cl_menu/plistmenu.r
+++ b/ruamoko/cl_menu/plistmenu.r
@@ -58,6 +58,7 @@ class_from_plist (PLDictionary *pldict)
 		return ret;
 	}
 	obj = [class alloc];
+	params[0].pointer_val = obj;
 
 	messages = (PLArray*) [pldict getObjectForKey:"Messages"];
 	message_count = [messages count];
@@ -65,9 +66,10 @@ class_from_plist (PLDictionary *pldict)
 		msg = (PLArray*) [messages getObjectAtIndex:i];
 		selname = [(PLString*) [msg getObjectAtIndex:0] string];
 		sel = sel_get_uid (selname);
-		va_list.count = [msg count] - 1;
-		for (j = 0; j < va_list.count; j++) {
-			paramstr = [(PLString*) [msg getObjectAtIndex:j + 1] string];
+		params[1].pointer_val = sel;
+		va_list.count = [msg count] + 1;
+		for (j = 2; j < va_list.count; j++) {
+			paramstr = [(PLString*) [msg getObjectAtIndex:j - 1] string];
 			switch (str_mid (paramstr, 0, 1)) {
 				case "\"":
 					va_list.list[j].string_val = str_mid (paramstr, 1, -1);

From 21a8559674ac3cb72b9a8a0c13dd3cadb254701e Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 12 Mar 2020 19:30:54 +0900
Subject: [PATCH 0734/1519] [qfcc] Improve handling of nil assignments

Especially when they result in using memset.
---
 tools/qfcc/include/expr.h       |  3 ++-
 tools/qfcc/source/expr.c        | 11 +++++------
 tools/qfcc/source/expr_assign.c | 15 +++++++++------
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/tools/qfcc/include/expr.h b/tools/qfcc/include/expr.h
index 9879ee810..a8a1a98f2 100644
--- a/tools/qfcc/include/expr.h
+++ b/tools/qfcc/include/expr.h
@@ -147,6 +147,7 @@ typedef struct ex_memset_s {
 	struct expr_s *dst;
 	struct expr_s *val;
 	struct expr_s *count;
+	struct type_s *type;
 } ex_memset_t;
 
 /**	State expression used for think function state-machines.
@@ -649,7 +650,7 @@ expr_t *new_param_expr (struct type_s *type, int num);
 expr_t *new_move_expr (expr_t *e1, expr_t *e2, struct type_s *type,
 					   int indirect);
 
-expr_t *new_memset_expr (expr_t *dst, expr_t *val, expr_t *count);
+expr_t *new_memset_expr (expr_t *dst, expr_t *val, struct type_s *type);
 
 
 /**	Convert a name to an expression of the appropriate type.
diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index 2d419c20f..922d47921 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -214,8 +214,9 @@ get_type (expr_t *e)
 	convert_name (e);
 	switch (e->type) {
 		case ex_labelref:
-		case ex_memset:
 			return &type_void;
+		case ex_memset:
+			return e->e.memset.type;
 		case ex_label:
 		case ex_error:
 		case ex_compound:
@@ -1186,7 +1187,7 @@ new_move_expr (expr_t *e1, expr_t *e2, type_t *type, int indirect)
 }
 
 expr_t *
-new_memset_expr (expr_t *dst, expr_t *val, expr_t *count)
+new_memset_expr (expr_t *dst, expr_t *val, type_t *type)
 {
 	expr_t     *e;
 	if (!is_pointer (get_type (dst))) {
@@ -1195,14 +1196,12 @@ new_memset_expr (expr_t *dst, expr_t *val, expr_t *count)
 	if (!is_scalar (get_type (val))) {
 		return error (val, "memset value must be a scalar");
 	}
-	if (!is_integral (get_type (count))) {
-		return error (val, "memset count must be integral");
-	}
 	e = new_expr ();
 	e->type = ex_memset;
 	e->e.memset.dst = dst;
 	e->e.memset.val = val;
-	e->e.memset.count = count;
+	e->e.memset.count = new_integer_expr (type_size (type));
+	e->e.memset.type = type;
 	return e;
 }
 
diff --git a/tools/qfcc/source/expr_assign.c b/tools/qfcc/source/expr_assign.c
index 07a838b13..f0dca6474 100644
--- a/tools/qfcc/source/expr_assign.c
+++ b/tools/qfcc/source/expr_assign.c
@@ -286,6 +286,12 @@ is_indirect (expr_t *e)
 	return is_const_ptr (e->e.expr.e1);
 }
 
+static __attribute__((pure)) int
+is_memset (expr_t *e)
+{
+	return e->type == ex_memset;
+}
+
 expr_t *
 assign_expr (expr_t *dst, expr_t *src)
 {
@@ -305,7 +311,7 @@ assign_expr (expr_t *dst, expr_t *src)
 		internal_error (dst, "dst_type broke in assign_expr");
 	}
 
-	if (src) {
+	if (src && !is_memset (src)) {
 		convert_name (src);
 		if (src->type == ex_error) {
 			return src;
@@ -316,7 +322,7 @@ assign_expr (expr_t *dst, expr_t *src)
 			return expr;
 		}
 	} else {
-		if (is_scalar (dst_type)) {
+		if (!is_memset (src) && is_scalar (dst_type)) {
 			return error (dst, "empty scalar initializer");
 		}
 		src = new_nil_expr ();
@@ -347,7 +353,6 @@ assign_expr (expr_t *dst, expr_t *src)
 	}
 	if (!is_struct (dst_type) && is_nil (src)) {
 		// nil is a type-agnostic 0
-		// FIXME: assignment to compound types? error or memset?
 		src_type = dst_type;
 		convert_nil (src, src_type);
 	}
@@ -383,9 +388,7 @@ assign_expr (expr_t *dst, expr_t *src)
 		if (is_struct (dst_type)) {
 			dst = address_expr (dst, 0, 0);
 			if (is_nil (src)) {
-				int         size = type_size (dst_type);
-				return new_memset_expr (dst, new_integer_expr (0),
-										new_integer_expr (size));
+				return new_memset_expr (dst, new_integer_expr (0), dst_type);
 			} else {
 				src = address_expr (src, 0, 0);
 				return new_move_expr (dst, src, dst_type, 1);

From 08b7064a3f647aa98d8a6bdd351b1be8be790327 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 12 Mar 2020 19:32:09 +0900
Subject: [PATCH 0735/1519] [ruamoko] Set pr_argc before calling error methods

Builtins calling ruamoko code need to be careful of the arg count in
case the ruamoko function uses varargs.
---
 libs/ruamoko/rua_obj.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libs/ruamoko/rua_obj.c b/libs/ruamoko/rua_obj.c
index c30683d0e..854341b56 100644
--- a/libs/ruamoko/rua_obj.c
+++ b/libs/ruamoko/rua_obj.c
@@ -1289,6 +1289,7 @@ rua___obj_forward (progs_t *pr)
 		P_POINTER (pr, 0) = PR_SetPointer (pr, obj);
 		P_POINTER (pr, 1) = PR_SetPointer (pr, err_sel);
 		P_POINTER (pr, 2) = PR_SetPointer (pr, sel);
+		pr->pr_argc = 3;
 		PR_CallFunction (pr, imp);
 		return;
 	}
@@ -1306,6 +1307,7 @@ rua___obj_forward (progs_t *pr)
 		P_POINTER (pr, 0) = PR_SetPointer (pr, obj);
 		P_POINTER (pr, 1) = PR_SetPointer (pr, err_sel);
 		P_POINTER (pr, 2) = PR_SetTempString (pr, probj->msg->str);
+		pr->pr_argc = 3;
 		PR_CallFunction (pr, imp);
 		return;
 	}

From bbfd498b74f1325530caa9228ca3f357884e18ab Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 12 Mar 2020 19:34:18 +0900
Subject: [PATCH 0736/1519] [qfcc] Handle compound and memset dot nodes

compound is currently not very informative, but it's better than "bad
expression type"
---
 tools/qfcc/source/dot_expr.c | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/tools/qfcc/source/dot_expr.c b/tools/qfcc/source/dot_expr.c
index f8601c6ff..6b1cb2428 100644
--- a/tools/qfcc/source/dot_expr.c
+++ b/tools/qfcc/source/dot_expr.c
@@ -506,6 +506,29 @@ print_value (dstring_t *dstr, expr_t *e, int level, int id, expr_t *next)
 			   e->line);
 }
 
+static void
+print_compound (dstring_t *dstr, expr_t *e, int level, int id, expr_t *next)
+{
+	int         indent = level * 2 + 2;
+	dasprintf (dstr, "%*se_%p [label=\"compound init\"];\n", indent, "", e);
+}
+
+static void
+print_memset (dstring_t *dstr, expr_t *e, int level, int id, expr_t *next)
+{
+	int         indent = level * 2 + 2;
+	expr_t     *dst = e->e.memset.dst;
+	expr_t     *val = e->e.memset.val;
+	expr_t     *count = e->e.memset.count;
+	_print_expr (dstr, dst, level, id, next);
+	_print_expr (dstr, val, level, id, next);
+	_print_expr (dstr, count, level, id, next);
+	dasprintf (dstr, "%*se_%p -> \"e_%p\";\n", indent, "", e, dst);
+	dasprintf (dstr, "%*se_%p -> \"e_%p\";\n", indent, "", e, val);
+	dasprintf (dstr, "%*se_%p -> \"e_%p\";\n", indent, "", e, count);
+	dasprintf (dstr, "%*se_%p [label=\"memset\"];\n", indent, "", e);
+}
+
 static void
 _print_expr (dstring_t *dstr, expr_t *e, int level, int id, expr_t *next)
 {
@@ -523,6 +546,8 @@ _print_expr (dstring_t *dstr, expr_t *e, int level, int id, expr_t *next)
 		print_vector,
 		print_nil,
 		print_value,
+		print_compound,
+		print_memset,
 	};
 	int         indent = level * 2 + 2;
 
@@ -534,7 +559,7 @@ _print_expr (dstring_t *dstr, expr_t *e, int level, int id, expr_t *next)
 		return;
 	e->printid = id;
 
-	if ((int) e->type < 0 || e->type > ex_value) {
+	if ((int) e->type < 0 || e->type > ex_memset) {
 		dasprintf (dstr, "%*se_%p [label=\"(bad expr type)\\n%d\"];\n",
 				   indent, "", e, e->line);
 		return;

From c7435830031df704cf3a9ca91e15b654e6727e9d Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 12 Mar 2020 19:35:32 +0900
Subject: [PATCH 0737/1519] [qfcc] Fix a comment

---
 tools/qfcc/source/class.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/qfcc/source/class.c b/tools/qfcc/source/class.c
index 50ab5dcd7..647a64716 100644
--- a/tools/qfcc/source/class.c
+++ b/tools/qfcc/source/class.c
@@ -722,7 +722,7 @@ emit_ivar_list_item (def_t *def, void *data, int index)
 	defspace_t *space;
 
 #if 0
-	//FIXME the type is dynamic, so need a way to pass it before it cn be
+	//FIXME the type is dynamic, so need a way to pass it before it can be
 	//checked
 	if (def->type != &XXX)
 		internal_error (0, "%s: expected XXX def",

From 65b48c734c2efc1194e2cdec4469fd7d35043cf8 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 12 Mar 2020 19:36:15 +0900
Subject: [PATCH 0738/1519] [qfcc} Mark some more functions as pure

I guess gcc doesn't consider recursive functions as pure, but marking
get_type as pure had a slight ripple effect.
---
 tools/qfcc/include/expr.h  | 4 ++--
 tools/qfcc/source/switch.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/qfcc/include/expr.h b/tools/qfcc/include/expr.h
index a8a1a98f2..d6b71d2b1 100644
--- a/tools/qfcc/include/expr.h
+++ b/tools/qfcc/include/expr.h
@@ -263,7 +263,7 @@ extern expr_t *local_expr;
 	\return         Pointer to the type description, or null if the expression
 					type (expr_t::type) is inappropriate.
 */
-struct type_s *get_type (expr_t *e);
+struct type_s *get_type (expr_t *e) __attribute__((pure));
 
 /**	Get the basic type code of the expression result.
 
@@ -271,7 +271,7 @@ struct type_s *get_type (expr_t *e);
 	\return         Pointer to the type description, or ev_type_count if
 					get_type() returns null.
 */
-etype_t extract_type (expr_t *e);
+etype_t extract_type (expr_t *e) __attribute__((pure));
 
 /**	Create a new expression node.
 
diff --git a/tools/qfcc/source/switch.c b/tools/qfcc/source/switch.c
index 967a7b73f..6c00279a0 100644
--- a/tools/qfcc/source/switch.c
+++ b/tools/qfcc/source/switch.c
@@ -85,7 +85,7 @@ get_hash (const void *_cl, void *unused)
 	return Hash_Buffer (&val->v, sizeof (val->v)) + val->lltype;
 }
 
-static int
+static int __attribute__((pure))
 compare (const void *_cla, const void *_clb, void *unused)
 {
 	case_label_t *cla = (case_label_t *) _cla;

From 4c2a6c9eb218ee219531d776e4da0e8f3807340f Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 12 Mar 2020 19:37:55 +0900
Subject: [PATCH 0739/1519] [qfcc] Allow implicit demotion in initializer
 elements

Notably, implicit double constants (no adorning d) being used to
initialize float struct members.
---
 tools/qfcc/source/def.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/qfcc/source/def.c b/tools/qfcc/source/def.c
index d642261ef..751bac7f5 100644
--- a/tools/qfcc/source/def.c
+++ b/tools/qfcc/source/def.c
@@ -380,6 +380,10 @@ init_elements (struct def_s *def, expr_t *eles)
 					&& is_float (element->type)) {
 					convert_int (c);
 				}
+				if (is_double (get_type (c)) && is_float (element->type)
+					&& c->implicit) {
+					convert_double (c);
+				}
 				if (get_type (c) != element->type) {
 					error (c, "type mismatch in initializer");
 					continue;

From f45484236181ad4c6a2a46f017852793c6c2d2c1 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 12 Mar 2020 19:47:09 +0900
Subject: [PATCH 0740/1519] [qfcc] Add breaking assignment chain test

This bug drove me nuts for several hours until I figured out what was
going on.
The assignment sub-tree is being generated, then lost. It works for
simple assignments because a = b = c -> (= a (= b c)), but for complex
assignments (those that require move or memset), a = b = c -> (b = c) (a
= c) but nothing points to (b = c). The cause is using binary
expressions to store assignments.
---
 tools/qfcc/test/Makefile.am   | 10 ++++
 tools/qfcc/test/assignchain.r | 89 +++++++++++++++++++++++++++++++++++
 2 files changed, 99 insertions(+)
 create mode 100644 tools/qfcc/test/assignchain.r

diff --git a/tools/qfcc/test/Makefile.am b/tools/qfcc/test/Makefile.am
index f4d31a2c9..ceb32813f 100644
--- a/tools/qfcc/test/Makefile.am
+++ b/tools/qfcc/test/Makefile.am
@@ -31,6 +31,7 @@ fail_bins=
 test_progs_dat=\
 	address-cast.dat \
 	alignment.dat \
+	assignchain.dat \
 	anonstruct.dat \
 	chewed-alias.dat \
 	chewed-return.dat \
@@ -132,6 +133,15 @@ anonstruct.run: Makefile build-run
 include ./$(DEPDIR)/anonstruct.Qo # am--include-marker
 r_depfiles_remade += ./$(DEPDIR)/anonstruct.Qo
 
+assignchain_dat_SOURCES=assignchain.r
+assignchain_obj=$(assignchain_dat_SOURCES:.r=.qfo)
+assignchain.dat$(EXEEXT): $(assignchain_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(assignchain_obj)
+assignchain.run: Makefile build-run
+	@$(srcdir)/build-run $@
+include ./$(DEPDIR)/assignchain.Qo # am--include-marker
+r_depfiles_remade += ./$(DEPDIR)/assignchain.Qo
+
 chewed_alias_dat_SOURCES=chewed-alias.r
 chewed_alias_obj=$(chewed_alias_dat_SOURCES:.r=.qfo)
 chewed-alias.dat$(EXEEXT): $(chewed_alias_obj) $(QFCC_DEP)
diff --git a/tools/qfcc/test/assignchain.r b/tools/qfcc/test/assignchain.r
new file mode 100644
index 000000000..1e9b8eb8d
--- /dev/null
+++ b/tools/qfcc/test/assignchain.r
@@ -0,0 +1,89 @@
+#include "test-harness.h"
+
+typedef struct foo {
+	int x;
+	float y;
+} foo;
+
+int x, y;
+int z = 42;
+foo bar, baz;
+foo foo_init = { 5, 6.25 };
+
+int test_simple_global (void)
+{
+	int         ret = 0;
+	x = y = z;
+	if (x != z || y != z) {
+		printf ("test_simple_global: x=%d y=%d z=%d\n", x, y, z);
+		ret |= 1;
+	}
+	return ret;
+}
+
+int test_struct_global (void)
+{
+	int         ret = 0;
+	bar = baz = foo_init;
+	if (bar.x != foo_init.x || bar.y != foo_init.y) {
+		printf ("test_struct: bar={%d %g} foo_init={%d %g}\n",
+				bar.x, bar.y, foo_init.x, foo_init.y);
+		ret |= 1;
+	}
+	if (baz.x != foo_init.x || baz.y != foo_init.y) {
+		printf ("test_struct: baz={%d %g} foo_init={%d %g}\n",
+				baz.x, baz.y, foo_init.x, foo_init.y);
+		ret |= 1;
+	}
+	bar = baz = nil;
+	if (bar.x || baz.x || bar.y || baz.y) {
+		printf ("test_struct: bar={%d %g} baz={%d %g}\n",
+				bar.x, bar.y, baz.x, baz.y);
+		ret |= 1;
+	}
+	return ret;
+}
+
+int test_simple_pointer (int *x, int *y)
+{
+	int         ret = 0;
+	*x = *y = z;
+	if (*x != z || *y != z) {
+		printf ("test_simple_global: *x=%d *y=%d z=%d\n", *x, *y, z);
+		ret |= 1;
+	}
+	return ret;
+}
+
+int test_struct_pointer (foo *bar, foo *baz)
+{
+	int         ret = 0;
+	*bar = *baz = foo_init;
+	if (bar.x != foo_init.x || bar.y != foo_init.y) {
+		printf ("test_struct: bar={%d %g} foo_init={%d %g}\n",
+				bar.x, bar.y, foo_init.x, foo_init.y);
+		ret |= 1;
+	}
+	if (baz.x != foo_init.x || baz.y != foo_init.y) {
+		printf ("test_struct: baz={%d %g} foo_init={%d %g}\n",
+				baz.x, baz.y, foo_init.x, foo_init.y);
+		ret |= 1;
+	}
+	*bar = *baz = nil;
+	if (bar.x || baz.x || bar.y || baz.y) {
+		printf ("test_struct: bar={%d %g} baz={%d %g}\n",
+				bar.x, bar.y, baz.x, baz.y);
+		ret |= 1;
+	}
+	return ret;
+}
+
+int main ()
+{
+	int ret = 0;
+	ret |= test_simple_global ();
+	ret |= test_struct_global ();
+	ret |= test_simple_pointer (&x, &y);
+	ret |= test_struct_pointer (&bar, &baz);
+	return ret;
+}

From 9c5fac2226e1ec22da8a7665451c5ce15e5c75d5 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 12 Mar 2020 19:53:15 +0900
Subject: [PATCH 0741/1519] [qfcc] Catch another assignment chain failure

---
 tools/qfcc/test/assignchain.r | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/qfcc/test/assignchain.r b/tools/qfcc/test/assignchain.r
index 1e9b8eb8d..454279f45 100644
--- a/tools/qfcc/test/assignchain.r
+++ b/tools/qfcc/test/assignchain.r
@@ -69,6 +69,8 @@ int test_struct_pointer (foo *bar, foo *baz)
 				baz.x, baz.y, foo_init.x, foo_init.y);
 		ret |= 1;
 	}
+	*bar = foo_init;
+	*baz = foo_init;
 	*bar = *baz = nil;
 	if (bar.x || baz.x || bar.y || baz.y) {
 		printf ("test_struct: bar={%d %g} baz={%d %g}\n",

From 9c06b227199db67c73e7f08573fc3f56878d8bdd Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 13 Mar 2020 01:59:35 +0900
Subject: [PATCH 0742/1519] [qfcc] Fix segfault when assigning {}

---
 tools/qfcc/source/expr_assign.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/qfcc/source/expr_assign.c b/tools/qfcc/source/expr_assign.c
index f0dca6474..aa759b88d 100644
--- a/tools/qfcc/source/expr_assign.c
+++ b/tools/qfcc/source/expr_assign.c
@@ -322,7 +322,7 @@ assign_expr (expr_t *dst, expr_t *src)
 			return expr;
 		}
 	} else {
-		if (!is_memset (src) && is_scalar (dst_type)) {
+		if (!src && is_scalar (dst_type)) {
 			return error (dst, "empty scalar initializer");
 		}
 		src = new_nil_expr ();

From 7f9a415cbcb84d56bb2950f4f21aec0692a2e22f Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 13 Mar 2020 02:09:55 +0900
Subject: [PATCH 0743/1519] [qwaq] Get DrawBuffer and TextContext working

Especially blitting whole regions. Partial regions not tested yet.
---
 ruamoko/qwaq/qwaq-curses.c      | 18 ++++++++++++++----
 ruamoko/qwaq/qwaq-draw.r        |  2 +-
 ruamoko/qwaq/qwaq-rect.h        |  2 ++
 ruamoko/qwaq/qwaq-rect.r        | 12 ++++++++++++
 ruamoko/qwaq/qwaq-textcontext.r | 27 ++++++++++++++++++++++++++-
 ruamoko/qwaq/qwaq-window.h      |  1 +
 ruamoko/qwaq/qwaq-window.r      |  5 +++++
 7 files changed, 61 insertions(+), 6 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-curses.c b/ruamoko/qwaq/qwaq-curses.c
index 8ba194619..3c1714e35 100644
--- a/ruamoko/qwaq/qwaq-curses.c
+++ b/ruamoko/qwaq/qwaq-curses.c
@@ -291,12 +291,18 @@ get_panel (qwaq_resources_t *res, const char *name, int handle)
 	return panel;
 }
 
+//XXX goes away with threads
+static void process_commands (qwaq_resources_t *);
+static void process_input (qwaq_resources_t *);
 static int
 acquire_string (qwaq_resources_t *res)
 {
 	int         string_id = -1;
 
 	// XXX add locking and loop for available
+	if (!RB_DATA_AVAILABLE (res->string_ids)) {
+		process_commands(res);
+	}
 	if (RB_DATA_AVAILABLE (res->string_ids)) {
 		RB_READ_DATA (res->string_ids, &string_id, 1);
 	}
@@ -338,9 +344,6 @@ qwaq_submit_result (qwaq_resources_t *res, const int *result, unsigned len)
 	}
 }
 
-//XXX goes away with threads
-static void process_commands (qwaq_resources_t *);
-static void process_input (qwaq_resources_t *);
 static void
 qwaq_wait_result (qwaq_resources_t *res, int *result, int cmd, unsigned len)
 {
@@ -628,11 +631,18 @@ cmd_mvwblit_line (qwaq_resources_t *res)
 	int         chs_id = RB_PEEK_DATA (res->command_queue, 5);
 	int         len = RB_PEEK_DATA (res->command_queue, 6);
 	int        *chs = (int *) res->strings[chs_id].str;
+	int         save_x;
+	int         save_y;
 
 	window_t   *window = get_window (res, __FUNCTION__, window_id);
+	getyx (window->win, save_y, save_x);
 	for (int i = 0; i < len; i++) {
-		mvwaddch (window->win, y, x, chs[i]);
+		Sys_Printf(" %d", chs[i]);
+		mvwaddch (window->win, y, x + i, chs[i]);
 	}
+	Sys_Printf("\n");
+	wmove (window->win, save_y, save_x);
+	release_string (res, chs_id);
 }
 
 static void
diff --git a/ruamoko/qwaq/qwaq-draw.r b/ruamoko/qwaq/qwaq-draw.r
index 66e266a50..d1cdc950d 100644
--- a/ruamoko/qwaq/qwaq-draw.r
+++ b/ruamoko/qwaq/qwaq-draw.r
@@ -33,7 +33,7 @@
 - blitFromBuffer: (DrawBuffer *) srcBuffer to: (Point) pos from: (Rect) rect
 {
 	Extent srcSize = srcBuffer.size;
-	Rect r = { {}, srcBuffer.size };
+	Rect r = { {}, size };
 	Rect t = { pos, rect.extent };
 
 	t = clipRect (r, t);
diff --git a/ruamoko/qwaq/qwaq-rect.h b/ruamoko/qwaq/qwaq-rect.h
index 9d4fc51e4..d1ba8719b 100644
--- a/ruamoko/qwaq/qwaq-rect.h
+++ b/ruamoko/qwaq/qwaq-rect.h
@@ -18,6 +18,8 @@ typedef struct Rect_s {
 
 #ifdef __QFCC__
 @extern Rect makeRect (int xpos, int ypos, int xlen, int ylen);
+@extern Point makePoint (int x, int y);
+@extern Extent makeExtent (int width, int height);
 //XXX will not work if point or rect point to a local variabl
 @extern int rectContainsPoint (Rect *rect, Point *point);
 @extern Rect getwrect (struct window_s *window);
diff --git a/ruamoko/qwaq/qwaq-rect.r b/ruamoko/qwaq/qwaq-rect.r
index 6ee5c7df5..8813c84ee 100644
--- a/ruamoko/qwaq/qwaq-rect.r
+++ b/ruamoko/qwaq/qwaq-rect.r
@@ -29,6 +29,18 @@ makeRect (int xpos, int ypos, int xlen, int ylen)
 	return rect;
 }
 
+Point makePoint (int x, int y)
+{
+	Point p = {x, y};
+	return p;
+}
+
+Extent makeExtent (int width, int height)
+{
+	Extent e = {width, height};
+	return e;
+}
+
 int
 rectContainsPoint (Rect *rect, Point *point)
 {
diff --git a/ruamoko/qwaq/qwaq-textcontext.r b/ruamoko/qwaq/qwaq-textcontext.r
index 726872ccf..9a63e0681 100644
--- a/ruamoko/qwaq/qwaq-textcontext.r
+++ b/ruamoko/qwaq/qwaq-textcontext.r
@@ -43,6 +43,8 @@ static TextContext *screen;
 	}
 	window = create_window (rect.offset.x, rect.offset.y,
 							rect.extent.width, rect.extent.height);
+	offset = {};
+	size = rect.extent;
 	return self;
 }
 
@@ -60,13 +62,30 @@ static TextContext *screen;
 	return window;
 }
 
+-(Extent) size
+{
+	return size;
+}
+
 - blitFromBuffer: (DrawBuffer *) srcBuffer to: (Point) pos from: (Rect) rect
 {
 	Extent srcSize = [srcBuffer size];
-	Rect r = { {}, srcSize };
+	Rect r = { {}, size };
 	Rect t = { pos, rect.extent };
 
+	wprintf (stdscr, "src: %p\n", srcBuffer);
+	wprintf (stdscr, "srcSize: %d %d\n", srcSize.width, srcSize.height);
+	wprintf (stdscr, "pos: %d %d\n", pos.x, pos.x);
+	wprintf (stdscr, "rect: %d %d %d %d\n",
+			 rect.offset.x, rect.offset.y,
+			 rect.extent.width, rect.extent.height);
+	wprintf (stdscr, "r: %d %d %d %d\n",
+			 r.offset.x, r.offset.y, r.extent.width, r.extent.height);
+	wprintf (stdscr, "t: %d %d %d %d\n",
+			 t.offset.x, t.offset.y, t.extent.width, t.extent.height);
 	t = clipRect (r, t);
+	wprintf (stdscr, "t: %d %d %d %d\n",
+			 t.offset.x, t.offset.y, t.extent.width, t.extent.height);
 	if (t.extent.width < 0 || t.extent.height < 0) {
 		return self;
 	}
@@ -80,6 +99,12 @@ static TextContext *screen;
 	r.extent = size;
 
 	rect = clipRect (r, rect);
+	wprintf (stdscr, "pos: %d %d\n", pos.x, pos.x);
+	wprintf (stdscr, "rect: %d %d %d %d\n",
+			 rect.offset.x, rect.offset.y,
+			 rect.extent.width, rect.extent.height);
+	wprintf (stdscr, "r: %d %d %d %d\n",
+			 r.offset.x, r.offset.y, r.extent.width, r.extent.height);
 	if (rect.extent.width < 0 || rect.extent.height < 0) {
 		return self;
 	}
diff --git a/ruamoko/qwaq/qwaq-window.h b/ruamoko/qwaq/qwaq-window.h
index c59a72f28..2e925c035 100644
--- a/ruamoko/qwaq/qwaq-window.h
+++ b/ruamoko/qwaq/qwaq-window.h
@@ -14,6 +14,7 @@
 {
 	Point       point;	// FIXME can't be local :(
 	struct panel_s *panel;
+	DrawBuffer *buf;
 }
 +windowWithRect: (Rect) rect;
 -setBackground: (int) ch;
diff --git a/ruamoko/qwaq/qwaq-window.r b/ruamoko/qwaq/qwaq-window.r
index 23d919648..5a0f328ff 100644
--- a/ruamoko/qwaq/qwaq-window.r
+++ b/ruamoko/qwaq/qwaq-window.r
@@ -21,6 +21,10 @@
 	buffer = [[TextContext alloc] initWithRect: rect];
 	textContext = buffer;
 	panel = create_panel ([buffer window]);
+	buf = [DrawBuffer buffer: makeExtent (3, 3)];
+	[buf mvaddstr: makePoint (0, 0), "XOX"];
+	[buf mvaddstr: makePoint (0, 1), "OXO"];
+	[buf mvaddstr: makePoint (0, 2), "XOX"];
 	return self;
 }
 
@@ -108,6 +112,7 @@
 			}
 		}
 	}
+	[textContext blitFromBuffer: buf to: makePoint (6, 3) from: [buf rect]];
 	[self refresh];
 	return self;
 }

From 3defe50be627b95a2c2740e65a4fe863c81c9307 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 13 Mar 2020 02:37:25 +0900
Subject: [PATCH 0744/1519] [qwaq] Add printf builtin to ease debugging

---
 ruamoko/qwaq/qwaq-curses.c      | 16 ++++++++++++++++
 ruamoko/qwaq/qwaq-curses.h      |  2 ++
 ruamoko/qwaq/qwaq-textcontext.r |  2 ++
 3 files changed, 20 insertions(+)

diff --git a/ruamoko/qwaq/qwaq-curses.c b/ruamoko/qwaq/qwaq-curses.c
index 3c1714e35..f7ef86f54 100644
--- a/ruamoko/qwaq/qwaq-curses.c
+++ b/ruamoko/qwaq/qwaq-curses.c
@@ -1468,6 +1468,20 @@ bi_initialize (progs_t *pr)
 	res->stdscr.win = stdscr;
 }
 
+static void
+bi_printf (progs_t *pr)
+{
+	const char *fmt = P_GSTRING (pr, 0);
+	int         count = pr->pr_argc - 1;
+	pr_type_t **args = pr->pr_params + 1;
+	dstring_t  *dstr = dstring_new ();
+
+	PR_Sprintf (pr, dstr, "bi_printf", fmt, count, args);
+	if (dstr->str)
+		Sys_Printf (dstr->str, stdout);
+	dstring_delete (dstr);
+}
+
 static void
 bi_c_TextContext__is_initialized (progs_t *pr)
 {
@@ -1674,6 +1688,8 @@ static builtin_t builtins[] = {
 	{"wborder",			bi_wborder,			-1},
 	{"mvwblit_line",	bi_mvwblit_line,	-1},
 
+	{"printf",			bi_printf,	-1},
+
 	{"_c_TextContext__is_initialized",	bi_c_TextContext__is_initialized,  -1},
 	{"_c_TextContext__max_colors",		bi_c_TextContext__max_colors,	   -1},
 	{"_c_TextContext__max_color_pairs",	bi_c_TextContext__max_color_pairs, -1},
diff --git a/ruamoko/qwaq/qwaq-curses.h b/ruamoko/qwaq/qwaq-curses.h
index b592ac84b..5e59c9f08 100644
--- a/ruamoko/qwaq/qwaq-curses.h
+++ b/ruamoko/qwaq/qwaq-curses.h
@@ -121,6 +121,8 @@ typedef struct panel_s *panel_t;
 @extern void wborder (window_t window,
 					  box_sides_t sides, box_corners_t corners);
 @extern void mvwblit_line (window_t window, int x, int y, int *wch, int len);
+
+@extern void printf(string fmt, ...);
 #endif
 
 #endif//__qwaq_curses_h
diff --git a/ruamoko/qwaq/qwaq-textcontext.r b/ruamoko/qwaq/qwaq-textcontext.r
index 9a63e0681..934fd597a 100644
--- a/ruamoko/qwaq/qwaq-textcontext.r
+++ b/ruamoko/qwaq/qwaq-textcontext.r
@@ -166,3 +166,5 @@ int curs_set (int visibility) = #0;
 int move (int x, int y) = #0;
 void wborder (window_t window, box_sides_t sides, box_corners_t corners) = #0;
 void mvwblit_line (window_t window, int x, int y, int *wch, int len) = #0;
+
+void printf(string fmt, ...) = #0;

From d0f21ec2b40ce1cbfc8c4267fcd177323ac820ba Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 13 Mar 2020 02:43:01 +0900
Subject: [PATCH 0745/1519] [qwaq] Add -refresh to TextContext

This does the right thing in the presence of panels and dealing with
stdscr.
---
 ruamoko/qwaq/qwaq-app.r         |  7 +++++++
 ruamoko/qwaq/qwaq-curses.c      | 28 +++++++++++++++++++++++++---
 ruamoko/qwaq/qwaq-screen.r      |  2 --
 ruamoko/qwaq/qwaq-textcontext.h |  1 +
 ruamoko/qwaq/qwaq-textcontext.r |  1 +
 5 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-app.r b/ruamoko/qwaq/qwaq-app.r
index 9d046a89f..fffe51c7b 100644
--- a/ruamoko/qwaq/qwaq-app.r
+++ b/ruamoko/qwaq/qwaq-app.r
@@ -68,6 +68,13 @@ arp_end (void)
 	return self;
 }
 
+-draw
+{
+	[super draw];
+	[TextContext refresh];
+	return self;
+}
+
 -handleEvent: (qwaq_event_t *) event
 {
 	[screen handleEvent: event];
diff --git a/ruamoko/qwaq/qwaq-curses.c b/ruamoko/qwaq/qwaq-curses.c
index f7ef86f54..eb9ee8024 100644
--- a/ruamoko/qwaq/qwaq-curses.c
+++ b/ruamoko/qwaq/qwaq-curses.c
@@ -1025,7 +1025,7 @@ bi_panel_window (progs_t *pr)
 }
 
 static void
-bi_update_panels (progs_t *pr)
+qwaq_update_panels (progs_t *pr)
 {
 	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
 
@@ -1033,9 +1033,14 @@ bi_update_panels (progs_t *pr)
 	command[1] = CMD_SIZE(command);
 	qwaq_submit_command (res, command);
 }
+static void
+bi_update_panels (progs_t *pr)
+{
+	qwaq_update_panels (pr);
+}
 
 static void
-bi_doupdate (progs_t *pr)
+qwaq_doupdate (progs_t *pr)
 {
 	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
 
@@ -1043,6 +1048,11 @@ bi_doupdate (progs_t *pr)
 	command[1] = CMD_SIZE(command);
 	qwaq_submit_command (res, command);
 }
+static void
+bi_doupdate (progs_t *pr)
+{
+	qwaq_doupdate (pr);
+}
 
 static void
 qwaq_mvwprintf (progs_t *pr, int window_id, int x, int y, const char *fmt,
@@ -1594,12 +1604,23 @@ bi_i_TextContext__mvvprintf_ (progs_t *pr)
 	qwaq_mvwvprintf (pr, pos->x, pos->y, window_id, fmt, args);
 }
 
+static void
+bi_c_TextContext__refresh (progs_t *pr)
+{
+	qwaq_update_panels (pr);
+	qwaq_doupdate (pr);
+}
+
 static void
 bi_i_TextContext__refresh (progs_t *pr)
 {
 	int         window_id = P_STRUCT (pr, qwaq_textcontext_t, 0).window;
 
-	qwaq_wrefresh (pr, window_id);
+	//qwaq_wrefresh (pr, window_id);
+	qwaq_update_panels (pr);
+	if (window_id == 1) {
+		qwaq_doupdate (pr);
+	}
 }
 
 static void
@@ -1703,6 +1724,7 @@ static builtin_t builtins[] = {
 	{"_i_TextContext__vprintf_",		bi_i_TextContext__vprintf_,		   -1},
 	{"_i_TextContext__addch_",			bi_i_TextContext__addch_,		   -1},
 	{"_i_TextContext__mvvprintf_",		bi_i_TextContext__mvvprintf_,	   -1},
+	{"_c_TextContext__refresh",			bi_c_TextContext__refresh,		   -1},
 	{"_i_TextContext__refresh",			bi_i_TextContext__refresh,		   -1},
 	{"_i_TextContext__mvaddch_",		bi_i_TextContext__mvaddch_,		   -1},
 	{"_i_TextContext__bkgd_",			bi_i_TextContext__bkgd_,		   -1},
diff --git a/ruamoko/qwaq/qwaq-screen.r b/ruamoko/qwaq/qwaq-screen.r
index e34ddb7c9..5b2db43ce 100644
--- a/ruamoko/qwaq/qwaq-screen.r
+++ b/ruamoko/qwaq/qwaq-screen.r
@@ -36,9 +36,7 @@
 
 -redraw
 {
-	update_panels ();
 	[textContext refresh];
-	[TextContext doupdate];
 	return self;
 }
 
diff --git a/ruamoko/qwaq/qwaq-textcontext.h b/ruamoko/qwaq/qwaq-textcontext.h
index 765f90572..c260b6f44 100644
--- a/ruamoko/qwaq/qwaq-textcontext.h
+++ b/ruamoko/qwaq/qwaq-textcontext.h
@@ -49,6 +49,7 @@
 - (void) mvvprintf: (Point) pos, string mft, @va_list args;
 - (void) mvaddch: (Point) pos, int ch;
 - (void) refresh;
++ (void) refresh;
 - (void) bkgd: (int) ch;
 - (void) scrollok: (int) flag;
 - (void) border: (box_sides_t) sides, box_corners_t corners;
diff --git a/ruamoko/qwaq/qwaq-textcontext.r b/ruamoko/qwaq/qwaq-textcontext.r
index 934fd597a..8a4660dfa 100644
--- a/ruamoko/qwaq/qwaq-textcontext.r
+++ b/ruamoko/qwaq/qwaq-textcontext.r
@@ -124,6 +124,7 @@ static TextContext *screen;
 - (void) addch: (int) ch = #0;
 - (void) mvvprintf: (Point) pos, string mft, @va_list args = #0;
 - (void) refresh = #0;
++ (void) refresh = #0;
 - (void) mvaddch: (Point) pos, int ch = #0;
 - (void) bkgd: (int) ch = #0;
 - (void) scrollok: (int) flag = #0;

From 1d3c8d8a6c906f86341b704c13a12cb33f4613e2 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 13 Mar 2020 02:46:25 +0900
Subject: [PATCH 0746/1519] [qwaq] Sort out mess around placement of getwrect

---
 ruamoko/qwaq/qwaq-curses.h      | 4 ++++
 ruamoko/qwaq/qwaq-rect.h        | 1 -
 ruamoko/qwaq/qwaq-textcontext.r | 1 +
 ruamoko/qwaq/qwaq-view.r        | 3 +--
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-curses.h b/ruamoko/qwaq/qwaq-curses.h
index 5e59c9f08..70af63f7c 100644
--- a/ruamoko/qwaq/qwaq-curses.h
+++ b/ruamoko/qwaq/qwaq-curses.h
@@ -18,6 +18,8 @@ typedef struct box_corners_s {
 } box_corners_t;
 
 #ifdef __QFCC__
+#include "qwaq-rect.h"
+
 // names, order and comments lifted from ncurses.h
 typedef enum {
 /* VT100 symbols begin here */
@@ -122,6 +124,8 @@ typedef struct panel_s *panel_t;
 					  box_sides_t sides, box_corners_t corners);
 @extern void mvwblit_line (window_t window, int x, int y, int *wch, int len);
 
+@extern Rect getwrect (struct window_s *window);
+
 @extern void printf(string fmt, ...);
 #endif
 
diff --git a/ruamoko/qwaq/qwaq-rect.h b/ruamoko/qwaq/qwaq-rect.h
index d1ba8719b..7cd72e886 100644
--- a/ruamoko/qwaq/qwaq-rect.h
+++ b/ruamoko/qwaq/qwaq-rect.h
@@ -22,7 +22,6 @@ typedef struct Rect_s {
 @extern Extent makeExtent (int width, int height);
 //XXX will not work if point or rect point to a local variabl
 @extern int rectContainsPoint (Rect *rect, Point *point);
-@extern Rect getwrect (struct window_s *window);
 @extern Rect clipRect (Rect clipRect, Rect rect);
 #endif
 
diff --git a/ruamoko/qwaq/qwaq-textcontext.r b/ruamoko/qwaq/qwaq-textcontext.r
index 8a4660dfa..848f3dfd5 100644
--- a/ruamoko/qwaq/qwaq-textcontext.r
+++ b/ruamoko/qwaq/qwaq-textcontext.r
@@ -167,5 +167,6 @@ int curs_set (int visibility) = #0;
 int move (int x, int y) = #0;
 void wborder (window_t window, box_sides_t sides, box_corners_t corners) = #0;
 void mvwblit_line (window_t window, int x, int y, int *wch, int len) = #0;
+Rect getwrect (window_t window) = #0;
 
 void printf(string fmt, ...) = #0;
diff --git a/ruamoko/qwaq/qwaq-view.r b/ruamoko/qwaq/qwaq-view.r
index 98cdf4429..19df51b9c 100644
--- a/ruamoko/qwaq/qwaq-view.r
+++ b/ruamoko/qwaq/qwaq-view.r
@@ -126,6 +126,5 @@ updateScreenCursor (View *view)
 	[textContext mvaddch: pos, ch];
 }
 
-@end
 
-Rect getwrect (window_t window) = #0;
+@end

From 45acbddb792490d25281f2504b955e4ef56a8d1e Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 13 Mar 2020 02:52:23 +0900
Subject: [PATCH 0747/1519] [qwaq] Make DrawBuffer and TextContext sizes
 available

---
 ruamoko/qwaq/qwaq-draw.h        | 1 +
 ruamoko/qwaq/qwaq-draw.r        | 5 +++++
 ruamoko/qwaq/qwaq-textcontext.h | 3 ++-
 ruamoko/qwaq/qwaq-textcontext.r | 1 +
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/ruamoko/qwaq/qwaq-draw.h b/ruamoko/qwaq/qwaq-draw.h
index a0ef18dc1..5f7c7bc18 100644
--- a/ruamoko/qwaq/qwaq-draw.h
+++ b/ruamoko/qwaq/qwaq-draw.h
@@ -16,6 +16,7 @@
 
 - (Extent) size;
 - (int *) buffer;
+- (Rect) rect;
 
 - blitFromBuffer: (DrawBuffer *) srcBuffer to: (Point) pos from: (Rect) rect;
 
diff --git a/ruamoko/qwaq/qwaq-draw.r b/ruamoko/qwaq/qwaq-draw.r
index d1cdc950d..1311deb3c 100644
--- a/ruamoko/qwaq/qwaq-draw.r
+++ b/ruamoko/qwaq/qwaq-draw.r
@@ -29,6 +29,11 @@
 {
 	return buffer;
 }
+- (Rect) rect
+{
+	Rect rect = { nil, size };
+	return rect;
+}
 
 - blitFromBuffer: (DrawBuffer *) srcBuffer to: (Point) pos from: (Rect) rect
 {
diff --git a/ruamoko/qwaq/qwaq-textcontext.h b/ruamoko/qwaq/qwaq-textcontext.h
index c260b6f44..1fbcb4fbd 100644
--- a/ruamoko/qwaq/qwaq-textcontext.h
+++ b/ruamoko/qwaq/qwaq-textcontext.h
@@ -38,7 +38,8 @@
 -initWithRect: (Rect) rect;
 -initWithWindow: (window_t) window;
 
--(window_t) window;
+- (window_t) window;
+- (Extent) size;
 
 - blitFromBuffer: (DrawBuffer *) srcBuffer to: (Point) pos from: (Rect) rect;
 
diff --git a/ruamoko/qwaq/qwaq-textcontext.r b/ruamoko/qwaq/qwaq-textcontext.r
index 848f3dfd5..dd94e34c1 100644
--- a/ruamoko/qwaq/qwaq-textcontext.r
+++ b/ruamoko/qwaq/qwaq-textcontext.r
@@ -33,6 +33,7 @@ static TextContext *screen;
 		return nil;
 	}
 	window = stdscr;
+	rect = getwrect (window);
 	return self;
 }
 

From 047131a737992936c8f92e577b5c827ba4c7ee68 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 13 Mar 2020 09:46:36 +0900
Subject: [PATCH 0748/1519] [qfcc] Check for compound init in message args

I had forgotten message sending did its own type checking and thus
needed to be updated for compound initializers in message parameters.
---
 tools/qfcc/source/method.c | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/tools/qfcc/source/method.c b/tools/qfcc/source/method.c
index 676726a5c..5b818afad 100644
--- a/tools/qfcc/source/method.c
+++ b/tools/qfcc/source/method.c
@@ -706,20 +706,27 @@ method_check_params (method_t *method, expr_t *args)
 		arg_list[i--] = a;
 	for (i = 2; i < count; i++) {
 		expr_t     *e = arg_list[i];
-		type_t     *t = get_type (e);
+		type_t     *arg_type = mtype->t.func.param_types[i];
+		type_t     *t;
 
-		if (!t)
+		if (e->type == ex_compound) {
+			e = expr_file_line (initialized_temp_expr (arg_type, e), e);
+		}
+		t = get_type (e);
+		if (!t) {
 			return e;
+		}
 
 		if (i < param_count) {
-			if (e->type != ex_nil)
-				if (!type_assignable (mtype->t.func.param_types[i], t)) {
-					err = param_mismatch (e, i - 1, method->name,
-										  mtype->t.func.param_types[i], t);
+			if (e->type != ex_nil) {
+				if (!type_assignable (arg_type, t)) {
+					err = param_mismatch (e, i - 1, method->name, arg_type, t);
 				}
+			}
 		} else {
-			if (is_integer_val (e) && options.warnings.vararg_integer)
+			if (is_integer_val (e) && options.warnings.vararg_integer) {
 				warning (e, "passing integer consant into ... function");
+			}
 		}
 	}
 	free (arg_list);

From 8d10b0f4aab448cba66ef135218bdb9d46d3f721 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 13 Mar 2020 09:58:52 +0900
Subject: [PATCH 0749/1519] [qfcc] Support compound initializers for return

---
 tools/qfcc/source/expr.c     | 27 +++++++++++++++++----------
 tools/qfcc/source/qc-parse.y |  6 ++----
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index 922d47921..44d62a803 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -1930,9 +1930,10 @@ expr_t *
 return_expr (function_t *f, expr_t *e)
 {
 	type_t     *t;
+	type_t     *ret_type = f->sym->type->t.func.type;
 
 	if (!e) {
-		if (f->sym->type->t.func.type != &type_void) {
+		if (ret_type != &type_void) {
 			if (options.traditional) {
 				if (options.warnings.traditional)
 					warning (e,
@@ -1950,25 +1951,31 @@ return_expr (function_t *f, expr_t *e)
 		}
 	}
 
+	if (e->type == ex_compound) {
+		e = expr_file_line (initialized_temp_expr (ret_type, e), e);
+	}
+
 	t = get_type (e);
 
-	if (e->type == ex_error)
+	if (e->type == ex_error) {
 		return e;
-	if (f->sym->type->t.func.type == &type_void) {
+	}
+	if (ret_type == &type_void) {
 		if (!options.traditional)
 			return error (e, "returning a value for a void function");
 		if (options.warnings.traditional)
 			warning (e, "returning a value for a void function");
 	}
-	if (e->type == ex_bool)
-		e = convert_from_bool (e, f->sym->type->t.func.type);
-	if (f->sym->type->t.func.type == &type_float && is_integer_val (e)) {
+	if (e->type == ex_bool) {
+		e = convert_from_bool (e, ret_type);
+	}
+	if (ret_type == &type_float && is_integer_val (e)) {
 		convert_int (e);
 		t = &type_float;
 	}
 	if (t == &type_void) {
 		if (e->type == ex_nil) {
-			t = f->sym->type->t.func.type;
+			t = ret_type;
 			convert_nil (e, t);
 			if (e->type == ex_nil)
 				return error (e, "invalid return type for NIL");
@@ -1980,7 +1987,7 @@ return_expr (function_t *f, expr_t *e)
 			//FIXME does anything need to be done here?
 		}
 	}
-	if (!type_assignable (f->sym->type->t.func.type, t)) {
+	if (!type_assignable (ret_type, t)) {
 		if (!options.traditional)
 			return error (e, "type mismatch for return value of %s",
 						  f->sym->name);
@@ -1988,8 +1995,8 @@ return_expr (function_t *f, expr_t *e)
 			warning (e, "type mismatch for return value of %s",
 					 f->sym->name);
 	} else {
-		if (f->sym->type->t.func.type != t) {
-			e = cast_expr (f->sym->type->t.func.type, e);
+		if (ret_type != t) {
+			e = cast_expr (ret_type, e);
 			t = f->sym->type->t.func.type;
 		}
 	}
diff --git a/tools/qfcc/source/qc-parse.y b/tools/qfcc/source/qc-parse.y
index a4ce4c433..9fe7fbbd2 100644
--- a/tools/qfcc/source/qc-parse.y
+++ b/tools/qfcc/source/qc-parse.y
@@ -1267,10 +1267,8 @@ statement
 	| error ';'					{ $$ = 0; yyerrok; }
 	| compound_statement		{ $$ = $1; }
 	| local_def					{ $$ = $1; }
-	| RETURN opt_expr ';'
-		{
-			$$ = return_expr (current_func, $2);
-		}
+	| RETURN opt_expr ';'		{ $$ = return_expr (current_func, $2); }
+	| RETURN compound_init ';'	{ $$ = return_expr (current_func, $2); }
 	| BREAK ';'
 		{
 			$$ = 0;

From 6001abbfdb03ce166b414e4b790844bbf5124bea Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 13 Mar 2020 10:00:05 +0900
Subject: [PATCH 0750/1519] [qwaq] Use the now working compound init more

---
 ruamoko/qwaq/qwaq-rect.r   | 6 ++----
 ruamoko/qwaq/qwaq-window.r | 8 ++++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-rect.r b/ruamoko/qwaq/qwaq-rect.r
index 8813c84ee..e0e3e5ee6 100644
--- a/ruamoko/qwaq/qwaq-rect.r
+++ b/ruamoko/qwaq/qwaq-rect.r
@@ -31,14 +31,12 @@ makeRect (int xpos, int ypos, int xlen, int ylen)
 
 Point makePoint (int x, int y)
 {
-	Point p = {x, y};
-	return p;
+	return {x, y};
 }
 
 Extent makeExtent (int width, int height)
 {
-	Extent e = {width, height};
-	return e;
+	return {width, height};
 }
 
 int
diff --git a/ruamoko/qwaq/qwaq-window.r b/ruamoko/qwaq/qwaq-window.r
index 5a0f328ff..a4a69ee83 100644
--- a/ruamoko/qwaq/qwaq-window.r
+++ b/ruamoko/qwaq/qwaq-window.r
@@ -21,10 +21,10 @@
 	buffer = [[TextContext alloc] initWithRect: rect];
 	textContext = buffer;
 	panel = create_panel ([buffer window]);
-	buf = [DrawBuffer buffer: makeExtent (3, 3)];
-	[buf mvaddstr: makePoint (0, 0), "XOX"];
-	[buf mvaddstr: makePoint (0, 1), "OXO"];
-	[buf mvaddstr: makePoint (0, 2), "XOX"];
+	buf = [DrawBuffer buffer: {3, 3}];
+	[buf mvaddstr: {0, 0}, "XOX"];
+	[buf mvaddstr: {0, 1}, "OXO"];
+	[buf mvaddstr: {0, 2}, "XOX"];
 	return self;
 }
 

From 6dfe37635d9a48ded032fb2a8692a975b30c999b Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 13 Mar 2020 14:56:56 +0900
Subject: [PATCH 0751/1519] [gamecode] Dump union contents

The output is messy, but better than <union>
---
 libs/gamecode/pr_debug.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/libs/gamecode/pr_debug.c b/libs/gamecode/pr_debug.c
index c102b46f8..89e5f6ba9 100644
--- a/libs/gamecode/pr_debug.c
+++ b/libs/gamecode/pr_debug.c
@@ -1139,8 +1139,22 @@ static void
 pr_debug_union_view (qfot_type_t *type, pr_type_t *value, void *_data)
 {
 	__auto_type data = (pr_debug_data_t *) _data;
+	progs_t    *pr = data->pr;
 	dstring_t  *dstr = data->dstr;
+	qfot_struct_t *strct = &type->t.strct;
 
+	dstring_appendstr (dstr, "{");
+	for (int i = 0; i < strct->num_fields; i++) {
+		qfot_var_t *field = strct->fields + i;
+		qfot_type_t *val_type = &G_STRUCT (pr, qfot_type_t, field->type);
+		pr_type_t  *val = value + field->offset;
+		dasprintf (dstr, "%s=", PR_GetString (pr, field->name));
+		value_string (data, val_type, val);
+		if (i < strct->num_fields) {
+			dstring_appendstr (dstr, ", ");
+		}
+	}
+	dstring_appendstr (dstr, "}");
 	dstring_appendstr (dstr, "<union>");
 }
 

From 087cee06be61498eee7b6b5aae4fa40005eae239 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 13 Mar 2020 14:57:33 +0900
Subject: [PATCH 0752/1519] [gamecode] Use full precision for floating point
 values

---
 libs/gamecode/pr_debug.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libs/gamecode/pr_debug.c b/libs/gamecode/pr_debug.c
index 89e5f6ba9..0b76cb997 100644
--- a/libs/gamecode/pr_debug.c
+++ b/libs/gamecode/pr_debug.c
@@ -998,7 +998,7 @@ pr_debug_float_view (qfot_type_t *type, pr_type_t *value, void *_data)
 		&& value->uinteger_var != 0x80000000) {
 		dasprintf (dstr, "<%08x>", value->integer_var);
 	} else {
-		dasprintf (dstr, "%g", value->float_var);
+		dasprintf (dstr, "%.9g", value->float_var);
 	}
 }
 
@@ -1008,7 +1008,7 @@ pr_debug_vector_view (qfot_type_t *type, pr_type_t *value, void *_data)
 	__auto_type data = (pr_debug_data_t *) _data;
 	dstring_t  *dstr = data->dstr;
 
-	dasprintf (dstr, "'%g %g %g'",
+	dasprintf (dstr, "'%.9g %.9g %.9g'",
 			  value->vector_var[0], value->vector_var[1],
 			  value->vector_var[2]);
 }
@@ -1085,7 +1085,7 @@ pr_debug_quat_view (qfot_type_t *type, pr_type_t *value, void *_data)
 	__auto_type data = (pr_debug_data_t *) _data;
 	dstring_t  *dstr = data->dstr;
 
-	dasprintf (dstr, "'%g %g %g %g'",
+	dasprintf (dstr, "'%.9g %.9g %.9g %.9g'",
 			   value->vector_var[0], value->vector_var[1],
 			   value->vector_var[2], value->vector_var[3]);
 }
@@ -1123,7 +1123,7 @@ pr_debug_double_view (qfot_type_t *type, pr_type_t *value, void *_data)
 	__auto_type data = (pr_debug_data_t *) _data;
 	dstring_t  *dstr = data->dstr;
 
-	dasprintf (dstr, "%g", *(double *)value);
+	dasprintf (dstr, "%.17g", *(double *)value);
 }
 
 static void

From a0d85e33c21e2578f9e484eba969fa9419b81925 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 13 Mar 2020 17:50:57 +0900
Subject: [PATCH 0753/1519] [gamecode] Rework implementation of memset*

The memset instructions now match the move* instructions other than the
first operand (always int). Probably breaks much, but fixed in next few
commits.
---
 include/QF/pr_comp.h      |  3 ++-
 libs/gamecode/pr_exec.c   |  9 ++++++---
 libs/gamecode/pr_opcode.c | 16 ++++++++++++----
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/include/QF/pr_comp.h b/include/QF/pr_comp.h
index 80b9e963d..3c6ccc8fe 100644
--- a/include/QF/pr_comp.h
+++ b/include/QF/pr_comp.h
@@ -396,8 +396,9 @@ typedef enum {
 	OP_MOD_F,
 	OP_MOD_D,
 
-	OP_MEMSET,
 	OP_MEMSETI,
+	OP_MEMSETP,
+	OP_MEMSETPI,
 } pr_opcode_e;
 #define OP_BREAK 0x8000
 
diff --git a/libs/gamecode/pr_exec.c b/libs/gamecode/pr_exec.c
index 718e2b09a..a73e5a474 100644
--- a/libs/gamecode/pr_exec.c
+++ b/libs/gamecode/pr_exec.c
@@ -1616,14 +1616,17 @@ op_call:
 						 pr->pr_globals + OPA.integer_var,
 						 st->b * 4);
 				break;
-			case OP_MEMSET:
+			case OP_MEMSETI:
+				pr_memset (&OPC, OPA.integer_var, st->b);
+				break;
+			case OP_MEMSETP:
 				if (pr_boundscheck->int_val) {
-					PR_BoundsCheckSize (pr, OPC.pointer_var, OPB.uinteger_var);
+					PR_BoundsCheckSize (pr, OPC.pointer_var, OPB.integer_var);
 				}
 				pr_memset (pr->pr_globals + OPC.pointer_var, OPA.integer_var,
 						   OPB.integer_var);
 				break;
-			case OP_MEMSETI:
+			case OP_MEMSETPI:
 				if (pr_boundscheck->int_val) {
 					PR_BoundsCheckSize (pr, OPC.pointer_var, st->b);
 				}
diff --git a/libs/gamecode/pr_opcode.c b/libs/gamecode/pr_opcode.c
index dc3a59fb9..3d3e8fe17 100644
--- a/libs/gamecode/pr_opcode.c
+++ b/libs/gamecode/pr_opcode.c
@@ -1181,17 +1181,22 @@ VISIBLE const opcode_t pr_opcodes[] = {
 	{"<MOVEP>", "movepi", OP_MOVEPI, true,
 	 ev_pointer, ev_short, ev_pointer,
 	 PROG_VERSION,
-	 "%Ga, %Gb, %Gc",
+	 "%Ga, %sb, %Gc",
 	},
-	{"<MEMSET>", "memset", OP_MEMSET, true,
+	{"<MEMSET>", "memseti", OP_MEMSETI, true,
+	 ev_integer, ev_short, ev_void,
+	 PROG_VERSION,
+	 "%Ga, %sb, %gc",
+	},
+	{"<MEMSETP>", "memsetp", OP_MEMSETP, true,
 	 ev_integer, ev_integer, ev_pointer,
 	 PROG_VERSION,
 	 "%Ga, %Gb, %Gc",
 	},
-	{"<MEMSET>", "memseti", OP_MEMSETI, true,
+	{"<MEMSETP>", "memsetpi", OP_MEMSETPI, true,
 	 ev_integer, ev_short, ev_pointer,
 	 PROG_VERSION,
-	 "%Ga, %Gb, %Gc",
+	 "%Ga, %sb, %Gc",
 	},
 
 	{"<PUSH>", "push.s", OP_PUSH_S, false,
@@ -1710,6 +1715,9 @@ PR_Check_Opcodes (progs_t *pr)
 					check_global_size (pr, st, op, st->b, st->a);
 					check_global_size (pr, st, op, st->b, st->c);
 					break;
+				case OP_MEMSETI:
+					check_global_size (pr, st, op, st->b, st->c);
+					break;
 				case OP_PUSHB_F:
 				case OP_PUSHB_S:
 				case OP_PUSHB_ENT:

From 2c9c15f4c85470ee37e1b684125325946b1c9844 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 13 Mar 2020 17:54:05 +0900
Subject: [PATCH 0754/1519] [qfcc] Add a type check helper for structural types

ie, struct/union/array. I finally though up a decent name (didn't want
to use record as that's a pascal type).
---
 tools/qfcc/include/type.h | 1 +
 tools/qfcc/source/type.c  | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/tools/qfcc/include/type.h b/tools/qfcc/include/type.h
index 21f4feb2c..791ea0fc9 100644
--- a/tools/qfcc/include/type.h
+++ b/tools/qfcc/include/type.h
@@ -164,6 +164,7 @@ int is_pointer (const type_t *type) __attribute__((pure));
 int is_field (const type_t *type) __attribute__((pure));
 int is_struct (const type_t *type) __attribute__((pure));
 int is_array (const type_t *type) __attribute__((pure));
+int is_structural (const type_t *type) __attribute__((pure));
 int is_func (const type_t *type) __attribute__((pure));
 int is_string (const type_t *type) __attribute__((pure));
 int type_compatible (const type_t *dst, const type_t *src) __attribute__((pure));
diff --git a/tools/qfcc/source/type.c b/tools/qfcc/source/type.c
index 4fd77a9fd..1c21e1d62 100644
--- a/tools/qfcc/source/type.c
+++ b/tools/qfcc/source/type.c
@@ -827,6 +827,12 @@ is_func (const type_t *type)
 	return 0;
 }
 
+int
+is_structural (const type_t *type)
+{
+	return is_struct (type) || is_array (type);
+}
+
 int
 is_string (const type_t *type)
 {

From 19002116c2fc566d11ef1c7a689f6ceb4ad467cd Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 13 Mar 2020 17:56:07 +0900
Subject: [PATCH 0755/1519] [qfcc] Fix missing expression types from dot_expr

---
 tools/qfcc/source/dot_expr.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/qfcc/source/dot_expr.c b/tools/qfcc/source/dot_expr.c
index 6b1cb2428..c81d982cc 100644
--- a/tools/qfcc/source/dot_expr.c
+++ b/tools/qfcc/source/dot_expr.c
@@ -67,6 +67,8 @@ const char *expr_names[] =
 	"vector",
 	"nil",
 	"value",
+	"compound",
+	"memset",
 };
 
 const char *

From c04f1c01560dcb0922b69449a7806edd926aa040 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 13 Mar 2020 17:57:58 +0900
Subject: [PATCH 0756/1519] [qfcc] Really delay the conversion of nil

Now convert_nil only assigns the nil expression a type, and nil makes
its way down to the statement emission code (where it belongs, really).
Breaks even more things :)
---
 tools/qfcc/include/expr.h      |  1 +
 tools/qfcc/source/def.c        |  9 +++++----
 tools/qfcc/source/expr.c       |  9 +++++----
 tools/qfcc/source/statements.c | 27 +++++++++++++++++++++++----
 4 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/tools/qfcc/include/expr.h b/tools/qfcc/include/expr.h
index d6b71d2b1..65c8ad290 100644
--- a/tools/qfcc/include/expr.h
+++ b/tools/qfcc/include/expr.h
@@ -234,6 +234,7 @@ typedef struct expr_s {
 		ex_value_t *value;				///< constant value
 		element_chain_t compound;		///< compound initializer
 		ex_memset_t memset;				///< memset expr params
+		struct type_s *nil;				///< type for nil if known
 	} e;
 } expr_t;
 
diff --git a/tools/qfcc/source/def.c b/tools/qfcc/source/def.c
index 751bac7f5..689b21dac 100644
--- a/tools/qfcc/source/def.c
+++ b/tools/qfcc/source/def.c
@@ -360,10 +360,11 @@ init_elements (struct def_s *def, expr_t *eles)
 	} else {
 		def_t       dummy = *def;
 		for (element = element_chain.head; element; element = element->next) {
-			if (element->expr) {
-				c = constant_expr (element->expr);
-			} else {
-				c = new_nil_expr ();
+			if (!element->expr
+				|| ((c = constant_expr (element->expr))->type == ex_nil)) {
+				// nil is type agnostic 0 and defspaces are initialized to
+				// 0 on creation
+				continue;
 			}
 			if (c->type == ex_nil) {
 				c = convert_nil (c, element->type);
diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index 44d62a803..c4408f6e2 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -226,6 +226,10 @@ get_type (expr_t *e)
 				return &type_float;
 			return &type_integer;
 		case ex_nil:
+			if (e->e.nil) {
+				return e->e.nil;
+			}
+			// fall through
 		case ex_state:
 			return &type_void;
 		case ex_block:
@@ -1414,8 +1418,7 @@ convert_double (expr_t *e)
 expr_t *
 convert_nil (expr_t *e, type_t *t)
 {
-	e->type = ex_value;
-	e->e.value = new_nil_val (t);
+	e->e.nil = t;
 	return e;
 }
 
@@ -1977,8 +1980,6 @@ return_expr (function_t *f, expr_t *e)
 		if (e->type == ex_nil) {
 			t = ret_type;
 			convert_nil (e, t);
-			if (e->type == ex_nil)
-				return error (e, "invalid return type for NIL");
 		} else {
 			if (!options.traditional)
 				return error (e, "void value not ignored as it ought to be");
diff --git a/tools/qfcc/source/statements.c b/tools/qfcc/source/statements.c
index 0b27803a1..e38248bed 100644
--- a/tools/qfcc/source/statements.c
+++ b/tools/qfcc/source/statements.c
@@ -1149,6 +1149,23 @@ expr_vector_e (sblock_t *sblock, expr_t *e, operand_t **op)
 	return sblock;
 }
 
+static sblock_t *
+expr_nil (sblock_t *sblock, expr_t *e, operand_t **op)
+{
+	type_t     *nil = e->e.nil;
+	expr_t     *ptr;
+	if (!is_struct (nil) && !is_array (nil)) {
+		*op = value_operand (new_nil_val (nil), e);
+		return sblock;
+	}
+	ptr = address_expr (new_temp_def_expr (nil), 0, 0);
+	expr_file_line (ptr, e);
+	sblock = statement_subexpr (sblock, ptr, op);
+	e = expr_file_line (new_memset_expr (ptr, new_integer_expr (0), nil), e);
+	sblock = statement_slist (sblock, e);
+	return sblock;
+}
+
 static sblock_t *
 expr_value (sblock_t *sblock, expr_t *e, operand_t **op)
 {
@@ -1171,18 +1188,20 @@ statement_subexpr (sblock_t *sblock, expr_t *e, operand_t **op)
 		expr_symbol,
 		expr_temp,
 		expr_vector_e,		// ex_vector
-		0,					// ex_nil
+		expr_nil,
 		expr_value,
+		0,					// ex_compound
+		0,					// ex_memset
 	};
 	if (!e) {
 		*op = 0;
 		return sblock;
 	}
 
-	if (e->type > ex_value)
-		internal_error (e, "bad expression type");
+	if (e->type > ex_memset)
+		internal_error (e, "bad sub-expression type");
 	if (!sfuncs[e->type])
-		internal_error (e, "unexpected expression type: %s",
+		internal_error (e, "unexpected sub-expression type: %s",
 						expr_names[e->type]);
 
 	sblock = sfuncs[e->type] (sblock, e, op);

From 3d88c3845fe0baede222e5aa2a8a336b30232f24 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 13 Mar 2020 18:20:38 +0900
Subject: [PATCH 0757/1519] [qfcc] Move struct copy/set into statement emission

Doing it in the expression trees was a big mistake for a several
reasons. For one, expression trees are meant to be target-agnostic, so
they're the wrong place for selecting instruction types. Also, the move
and memset expressions broke "a = b = c;" type expression chains.

This fixes most things (including the assignchain test) with -Werror
turned off (some issues in flow analysis uncovered by the nil
migration: memset target not extracted).
---
 tools/qfcc/source/expr_assign.c | 106 ++------------------------------
 tools/qfcc/source/statements.c  | 106 ++++++++++++++++++++++++++++++++
 2 files changed, 110 insertions(+), 102 deletions(-)

diff --git a/tools/qfcc/source/expr_assign.c b/tools/qfcc/source/expr_assign.c
index aa759b88d..465746983 100644
--- a/tools/qfcc/source/expr_assign.c
+++ b/tools/qfcc/source/expr_assign.c
@@ -263,29 +263,6 @@ assign_vector_expr (expr_t *dst, expr_t *src)
 	return 0;
 }
 
-static __attribute__((pure)) int
-is_const_ptr (expr_t *e)
-{
-	if ((e->type != ex_value || e->e.value->lltype != ev_pointer)
-		|| !(POINTER_VAL (e->e.value->v.pointer) >= 0
-			 && POINTER_VAL (e->e.value->v.pointer) < 65536)) {
-		return 1;
-	}
-	return 0;
-}
-
-static __attribute__((pure)) int
-is_indirect (expr_t *e)
-{
-	if (e->type == ex_block && e->e.block.result)
-		return is_indirect (e->e.block.result);
-	if (e->type == ex_expr && e->e.expr.op == '.')
-		return 1;
-	if (!(e->type == ex_uexpr && e->e.expr.op == '.'))
-		return 0;
-	return is_const_ptr (e->e.expr.e1);
-}
-
 static __attribute__((pure)) int
 is_memset (expr_t *e)
 {
@@ -345,17 +322,14 @@ assign_expr (expr_t *dst, expr_t *src)
 		src_type = get_type (src);
 	}
 	if (src->type == ex_bool) {
+		// boolean expressions are chains of tests, so extract the result
+		// of the tests
 		src = convert_from_bool (src, dst_type);
 		if (src->type == ex_error) {
 			return src;
 		}
 		src_type = get_type (src);
 	}
-	if (!is_struct (dst_type) && is_nil (src)) {
-		// nil is a type-agnostic 0
-		src_type = dst_type;
-		convert_nil (src, src_type);
-	}
 
 	if (!is_nil (src)) {
 		if ((expr = check_types_compatible (dst, src))) {
@@ -366,80 +340,8 @@ assign_expr (expr_t *dst, expr_t *src)
 		if ((expr = assign_vector_expr (dst, src))) {
 			return expr;
 		}
-	}
-
-	if (is_indirect (dst) && is_indirect (src)) {
-		debug (dst, "here");
-		if (is_struct (src_type)) {
-			dst = address_expr (dst, 0, 0);
-			src = address_expr (src, 0, 0);
-			expr = new_move_expr (dst, src, src_type, 1);
-		} else {
-			expr_t     *temp = new_temp_def_expr (dst_type);
-
-			expr = new_block_expr ();
-			append_expr (expr, assign_expr (temp, src));
-			append_expr (expr, assign_expr (dst, temp));
-			expr->e.block.result = temp;
-		}
-		return expr;
-	} else if (is_indirect (dst)) {
-		debug (dst, "here");
-		if (is_struct (dst_type)) {
-			dst = address_expr (dst, 0, 0);
-			if (is_nil (src)) {
-				return new_memset_expr (dst, new_integer_expr (0), dst_type);
-			} else {
-				src = address_expr (src, 0, 0);
-				return new_move_expr (dst, src, dst_type, 1);
-			}
-		}
-		if (is_nil (src)) {
-			src_type = dst_type;
-			convert_nil (src, src_type);
-		}
-		if (dst->type == ex_expr) {
-			if (get_type (dst->e.expr.e1) == &type_entity) {
-				dst_type = dst->e.expr.type;
-				dst->e.expr.type = pointer_type (dst_type);
-				dst->e.expr.op = '&';
-			}
-			op = PAS;
-		} else {
-			if (is_const_ptr (dst->e.expr.e1)) {
-				dst = dst->e.expr.e1;
-				op = PAS;
-			}
-		}
-	} else if (is_indirect (src)) {
-		debug (dst, "here");
-		if (is_struct (dst_type)) {
-			dst = address_expr (dst, 0, 0);
-			src = address_expr (src, 0, 0);
-			src->rvalue = 1;
-			return new_move_expr (dst, src, src_type, 1);
-		}
-		if (src->type == ex_uexpr) {
-			expr = src->e.expr.e1;
-			if (is_const_ptr (expr)) {
-				if (expr->type == ex_expr && expr->e.expr.op == '&'
-					&& expr->e.expr.type->type == ev_pointer
-					&& !is_constant (expr)) {
-					src = expr;
-					src->e.expr.op = '.';
-					src->e.expr.type = src_type;
-					src->rvalue = 1;
-				}
-			}
-		}
-	}
-
-	if (is_nil (src)) {
-		src_type = dst_type;
-		convert_nil (src, src_type);
-	}
-	if (is_struct (dst_type)) {
-		return new_move_expr (dst, src, dst_type, 0);
+	} else {
+		convert_nil (src, dst_type);
 	}
 
 	expr = new_binary_expr (op, dst, src);
diff --git a/tools/qfcc/source/statements.c b/tools/qfcc/source/statements.c
index e38248bed..4a3aff674 100644
--- a/tools/qfcc/source/statements.c
+++ b/tools/qfcc/source/statements.c
@@ -42,6 +42,7 @@
 #include "qfalloca.h"
 
 #include "QF/alloc.h"
+#include "QF/mathlib.h"
 #include "QF/va.h"
 
 #include "dags.h"
@@ -615,18 +616,123 @@ statement_branch (sblock_t *sblock, expr_t *e)
 	return sblock->next;
 }
 
+static __attribute__((pure)) int
+is_const_ptr (expr_t *e)
+{
+	if ((e->type != ex_value || e->e.value->lltype != ev_pointer)
+		|| !(POINTER_VAL (e->e.value->v.pointer) >= 0
+			 && POINTER_VAL (e->e.value->v.pointer) < 65536)) {
+		return 1;
+	}
+	return 0;
+}
+
+static __attribute__((pure)) int
+is_indirect (expr_t *e)
+{
+	if (e->type == ex_block && e->e.block.result)
+		return is_indirect (e->e.block.result);
+	if (e->type == ex_expr && e->e.expr.op == '.')
+		return 1;
+	if (!(e->type == ex_uexpr && e->e.expr.op == '.'))
+		return 0;
+	return is_const_ptr (e->e.expr.e1);
+}
+
+static sblock_t *
+expr_assign_copy (sblock_t *sblock, expr_t *e, operand_t **op)
+{
+	statement_t *s;
+	expr_t     *dst_expr = e->e.expr.e1;
+	expr_t     *src_expr = e->e.expr.e2;
+	type_t     *dst_type = get_type (dst_expr);
+	type_t     *src_type = get_type (src_expr);
+	unsigned    count;
+	expr_t     *count_expr;
+	operand_t  *dst = 0;
+	operand_t  *src = 0;
+	operand_t  *size = 0;
+	static const char *opcode_sets[][2] = {
+		{"<MOVE>", "<MOVEP>"},
+		{"<MEMSET>", "<MEMSETP>"},
+	};
+	const unsigned max_count = 1 << 16;
+	const char **opcode_set = opcode_sets[0];
+	const char *opcode;
+	int         need_ptr = 0;
+	operand_t  *dummy;
+
+	if (src_expr->type == ex_expr
+		&& (src_expr->e.expr.op == '=' || src_expr->e.expr.op == PAS)) {
+		sblock = statement_subexpr (sblock, src_expr, &dummy);
+	}
+	// follow the assignment chain to find the actual source expression
+	// (can't take the address of an assignment)
+	while (src_expr->type == ex_expr
+		   && (src_expr->e.expr.op == '=' || src_expr->e.expr.op == PAS)) {
+		src_expr = src_expr->e.expr.e2;
+	}
+	if (src_expr->type == ex_nil) {
+		// switch to memset because nil is type agnostic 0
+		src_expr = new_integer_expr (0);
+		opcode_set = opcode_sets[1];
+		if (is_indirect (dst_expr)) {
+			need_ptr = 1;
+			dst_expr = address_expr (dst_expr, 0, 0);
+		}
+	} else {
+		if (is_indirect (dst_expr) || is_indirect (src_expr)) {
+			need_ptr = 1;
+			dst_expr = address_expr (dst_expr, 0, 0);
+			src_expr = address_expr (src_expr, 0, 0);
+		}
+	}
+
+	if (type_size (dst_type) != type_size (src_type)) {
+		bug (e, "dst and src sizes differ in expr_assign_copy: %d %d",
+			 type_size (dst_type), type_size (src_type));
+	}
+	count = min (type_size (dst_type), type_size (src_type));
+	if (count < (1 << 16)) {
+		count_expr = expr_file_line (new_short_expr (count), e);
+	} else {
+		count_expr = expr_file_line (new_integer_expr (count), e);
+	}
+
+	if (count < max_count && !need_ptr) {
+		opcode = opcode_set[0];
+	} else {
+		opcode = opcode_set[1];
+	}
+
+	s = new_statement (st_move, opcode, e);
+	sblock = statement_subexpr (sblock, dst_expr, &dst);
+	sblock = statement_subexpr (sblock, src_expr, &src);
+	sblock = statement_subexpr (sblock, count_expr, &size);
+	s->opa = src;
+	s->opb = size;
+	s->opc = dst;
+	sblock_add_statement (sblock, s);
+	return sblock;
+}
+
 static sblock_t *
 expr_assign (sblock_t *sblock, expr_t *e, operand_t **op)
 {
 	statement_t *s;
 	expr_t     *src_expr = e->e.expr.e2;
 	expr_t     *dst_expr = e->e.expr.e1;
+	type_t     *dst_type = get_type (dst_expr);
 	operand_t  *src = 0;
 	operand_t  *dst = 0;
 	operand_t  *ofs = 0;
 	const char *opcode = convert_op (e->e.expr.op);
 	st_type_t   type;
 
+	if (is_structural (dst_type)) {
+		return expr_assign_copy (sblock, e, op);
+	}
+
 	if (e->e.expr.op == '=') {
 		sblock = statement_subexpr (sblock, dst_expr, &dst);
 		src = dst;

From e22579d70e134aa04038cdedd8fe24176cc063a3 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 13 Mar 2020 18:28:54 +0900
Subject: [PATCH 0758/1519] [qfcc] Analyze memset target pointer

This fixes the false uninitialized warnings cause by nil migration.
---
 tools/qfcc/source/flow.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tools/qfcc/source/flow.c b/tools/qfcc/source/flow.c
index ff0d1de96..a1043df52 100644
--- a/tools/qfcc/source/flow.c
+++ b/tools/qfcc/source/flow.c
@@ -1091,9 +1091,11 @@ flow_analyze_statement (statement_t *s, set_t *use, set_t *def, set_t *kill,
 		case st_move:
 			flow_add_op_var (use, s->opa, 1);
 			flow_add_op_var (use, s->opb, 1);
-			if (!strcmp (s->opcode, "<MOVE>")) {
+			if (!strcmp (s->opcode, "<MOVE>")
+				|| !strcmp (s->opcode, "<MEMSET>")) {
 				flow_add_op_var (def, s->opc, 0);
-			} else if (!strcmp (s->opcode, "<MOVEP>")) {
+			} else if (!strcmp (s->opcode, "<MOVEP>")
+					   || !strcmp (s->opcode, "<MEMSETP>")) {
 				flow_add_op_var (use, s->opc, 0);
 				if (s->opc->op_type == op_value
 					&& s->opc->o.value->lltype == ev_pointer

From f738639d68883698a23ae72770478d990e8489e9 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 13 Mar 2020 19:58:07 +0900
Subject: [PATCH 0759/1519] Revert "[qfcc} Mark some more functions as pure"

This reverts commit 65b48c734c2efc1194e2cdec4469fd7d35043cf8.

I forgot that get_type calls convert_name, which most definitely is not
pure. Fixes the segfault in scheme.
---
 tools/qfcc/include/expr.h  | 4 ++--
 tools/qfcc/source/switch.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/qfcc/include/expr.h b/tools/qfcc/include/expr.h
index 65c8ad290..b25481a8f 100644
--- a/tools/qfcc/include/expr.h
+++ b/tools/qfcc/include/expr.h
@@ -264,7 +264,7 @@ extern expr_t *local_expr;
 	\return         Pointer to the type description, or null if the expression
 					type (expr_t::type) is inappropriate.
 */
-struct type_s *get_type (expr_t *e) __attribute__((pure));
+struct type_s *get_type (expr_t *e);
 
 /**	Get the basic type code of the expression result.
 
@@ -272,7 +272,7 @@ struct type_s *get_type (expr_t *e) __attribute__((pure));
 	\return         Pointer to the type description, or ev_type_count if
 					get_type() returns null.
 */
-etype_t extract_type (expr_t *e) __attribute__((pure));
+etype_t extract_type (expr_t *e);
 
 /**	Create a new expression node.
 
diff --git a/tools/qfcc/source/switch.c b/tools/qfcc/source/switch.c
index 6c00279a0..967a7b73f 100644
--- a/tools/qfcc/source/switch.c
+++ b/tools/qfcc/source/switch.c
@@ -85,7 +85,7 @@ get_hash (const void *_cl, void *unused)
 	return Hash_Buffer (&val->v, sizeof (val->v)) + val->lltype;
 }
 
-static int __attribute__((pure))
+static int
 compare (const void *_cla, const void *_clb, void *unused)
 {
 	case_label_t *cla = (case_label_t *) _cla;

From a069fad41ea87366243f19c45cf3f7b761b3dfa2 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 13 Mar 2020 20:16:06 +0900
Subject: [PATCH 0760/1519] [gamecode] Print only entity address when no edicts

If the edicts pointer is null, it's not possible to convert the entity
address to an index.
---
 libs/gamecode/pr_debug.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/libs/gamecode/pr_debug.c b/libs/gamecode/pr_debug.c
index 0b76cb997..9464c326c 100644
--- a/libs/gamecode/pr_debug.c
+++ b/libs/gamecode/pr_debug.c
@@ -1019,9 +1019,13 @@ pr_debug_entity_view (qfot_type_t *type, pr_type_t *value, void *_data)
 	__auto_type data = (pr_debug_data_t *) _data;
 	progs_t    *pr = data->pr;
 	dstring_t  *dstr = data->dstr;
-	edict_t    *edict = PROG_TO_EDICT (pr, value->entity_var);
 
-	dasprintf (dstr, "entity %d", NUM_FOR_BAD_EDICT (pr, edict));
+	if (pr->edicts) {
+		edict_t    *edict = PROG_TO_EDICT (pr, value->entity_var);
+		dasprintf (dstr, "entity %d", NUM_FOR_BAD_EDICT (pr, edict));
+	} else {
+		dasprintf (dstr, "entity [%x]",value->entity_var);
+	}
 }
 
 static void

From de89f2f31fde7ee2066fcd46632057534b4088e7 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 13 Mar 2020 20:47:57 +0900
Subject: [PATCH 0761/1519] [qfcc] Fix a test that wasn't failing when it
 should

---
 tools/qfcc/test/assignchain.r | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/qfcc/test/assignchain.r b/tools/qfcc/test/assignchain.r
index 454279f45..4d6fd2e4b 100644
--- a/tools/qfcc/test/assignchain.r
+++ b/tools/qfcc/test/assignchain.r
@@ -85,6 +85,7 @@ int main ()
 	int ret = 0;
 	ret |= test_simple_global ();
 	ret |= test_struct_global ();
+	x = 0; y = 0;
 	ret |= test_simple_pointer (&x, &y);
 	ret |= test_struct_pointer (&bar, &baz);
 	return ret;

From d150210888f90c0a0ae290181b3d2a2b406c1c4c Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 13 Mar 2020 20:56:10 +0900
Subject: [PATCH 0762/1519] [qfcc] Nuke PAS from orbit

And there was much rejoicing. I hated having to create that opcode.
---
 tools/qfcc/source/constfold.c  | 21 ++++-----------------
 tools/qfcc/source/dot_expr.c   |  1 -
 tools/qfcc/source/expr_bool.c  |  2 +-
 tools/qfcc/source/qc-parse.y   |  2 +-
 tools/qfcc/source/statements.c | 25 ++-----------------------
 5 files changed, 8 insertions(+), 43 deletions(-)

diff --git a/tools/qfcc/source/constfold.c b/tools/qfcc/source/constfold.c
index e7c037deb..f46d1a452 100644
--- a/tools/qfcc/source/constfold.c
+++ b/tools/qfcc/source/constfold.c
@@ -226,7 +226,7 @@ do_op_float (int op, expr_t *e, expr_t *e1, expr_t *e2)
 	if (!valid_op (op, valid))
 		return error (e1, "invalid operator for float");
 
-	if (op == '=' || op == PAS) {
+	if (op == '=') {
 		if ((type = get_type (e1)) != &type_float) {
 			//FIXME optimize casting a constant
 			e->e.expr.e2 = e2 = cf_cast_expr (type, e2);
@@ -355,7 +355,7 @@ do_op_double (int op, expr_t *e, expr_t *e1, expr_t *e2)
 	if (!valid_op (op, valid))
 		return error (e1, "invalid operator for double");
 
-	if (op == '=' || op == PAS) {
+	if (op == '=') {
 		if ((type = get_type (e1)) != &type_double) {
 			//FIXME optimize casting a constant
 			e->e.expr.e2 = e2 = cf_cast_expr (type, e2);
@@ -616,7 +616,7 @@ static expr_t *
 do_op_pointer (int op, expr_t *e, expr_t *e1, expr_t *e2)
 {
 	type_t     *type;
-	static int  valid[] = {'=', PAS, '-', '&', 'M', '.', EQ, NE, 0};
+	static int  valid[] = {'=', '-', '&', 'M', '.', EQ, NE, 0};
 
 	if (is_integral (type = get_type (e2)) && (op == '-' || op == '+')) {
 		// pointer arithmetic
@@ -640,26 +640,13 @@ do_op_pointer (int op, expr_t *e, expr_t *e1, expr_t *e2)
 			e = binary_expr ('/', e, new_integer_expr (type_size (type)));
 		return e;
 	}
-	if (op == PAS && (type = get_type (e1)->t.fldptr.type) != get_type (e2)) {
-		// make sure auto-convertions happen
-		expr_t     *tmp = new_temp_def_expr (type);
-		expr_t     *ass = new_binary_expr ('=', tmp, e2);
-
-		tmp->file = e1->file;
-		ass->line = e2->line;
-		ass->file = e2->file;
-		ass = fold_constants (ass);
-		if (e->e.expr.e2 == tmp)
-			internal_error (e2, 0);
-		e->e.expr.e2 = ass->e.expr.e2;
-	}
 	if (op == EQ || op == NE) {
 		if (options.code.progsversion > PROG_ID_VERSION)
 			e->e.expr.type = &type_integer;
 		else
 			e->e.expr.type = &type_float;
 	}
-	if (op != PAS && op != '.' && op != '&' && op != 'M'
+	if (op != '.' && op != '&' && op != 'M'
 		&& extract_type (e1) != extract_type (e2))
 		return type_mismatch (e1, e2, op);
 	if ((op == '.' || op == '&') && get_type (e2) == &type_uinteger)
diff --git a/tools/qfcc/source/dot_expr.c b/tools/qfcc/source/dot_expr.c
index c81d982cc..76bd21089 100644
--- a/tools/qfcc/source/dot_expr.c
+++ b/tools/qfcc/source/dot_expr.c
@@ -75,7 +75,6 @@ const char *
 get_op_string (int op)
 {
 	switch (op) {
-		case PAS:	return ".=";
 		case OR:	return "||";
 		case AND:	return "&&";
 		case EQ:	return "==";
diff --git a/tools/qfcc/source/expr_bool.c b/tools/qfcc/source/expr_bool.c
index 7f7fdbfee..74f8d24de 100644
--- a/tools/qfcc/source/expr_bool.c
+++ b/tools/qfcc/source/expr_bool.c
@@ -245,7 +245,7 @@ convert_bool (expr_t *e, int block)
 {
 	expr_t     *b;
 
-	if (e->type == ex_expr && (e->e.expr.op == '=' || e->e.expr.op == PAS)) {
+	if (e->type == ex_expr && e->e.expr.op == '=') {
 		expr_t     *src;
 		if (!e->paren && options.warnings.precedence)
 			warning (e, "suggest parentheses around assignment "
diff --git a/tools/qfcc/source/qc-parse.y b/tools/qfcc/source/qc-parse.y
index 9fe7fbbd2..6ca42392c 100644
--- a/tools/qfcc/source/qc-parse.y
+++ b/tools/qfcc/source/qc-parse.y
@@ -124,7 +124,7 @@ int yylex (void);
 %nonassoc STORAGEX
 
 %left			COMMA
-%right	<op>	'=' ASX PAS /* pointer assign */
+%right	<op>	'=' ASX
 %right			'?' ':'
 %left			OR
 %left			AND
diff --git a/tools/qfcc/source/statements.c b/tools/qfcc/source/statements.c
index 4a3aff674..1ac0311a5 100644
--- a/tools/qfcc/source/statements.c
+++ b/tools/qfcc/source/statements.c
@@ -440,7 +440,6 @@ static const char *
 convert_op (int op)
 {
 	switch (op) {
-		case PAS:	return ".=";
 		case OR:	return "||";
 		case AND:	return "&&";
 		case EQ:	return "==";
@@ -662,14 +661,12 @@ expr_assign_copy (sblock_t *sblock, expr_t *e, operand_t **op)
 	int         need_ptr = 0;
 	operand_t  *dummy;
 
-	if (src_expr->type == ex_expr
-		&& (src_expr->e.expr.op == '=' || src_expr->e.expr.op == PAS)) {
+	if (src_expr->type == ex_expr && src_expr->e.expr.op == '=') {
 		sblock = statement_subexpr (sblock, src_expr, &dummy);
 	}
 	// follow the assignment chain to find the actual source expression
 	// (can't take the address of an assignment)
-	while (src_expr->type == ex_expr
-		   && (src_expr->e.expr.op == '=' || src_expr->e.expr.op == PAS)) {
+	while (src_expr->type == ex_expr && src_expr->e.expr.op == '=') {
 		src_expr = src_expr->e.expr.e2;
 	}
 	if (src_expr->type == ex_nil) {
@@ -743,22 +740,6 @@ expr_assign (sblock_t *sblock, expr_t *e, operand_t **op)
 		if (src == dst)
 			return sblock;
 		type = st_assign;
-	} else {
-		//FIXME this sucks. find a better way to handle both pointer
-		//dereferences and pointer assignements
-		sblock = statement_subexpr (sblock, src_expr, &src);
-		if (dst_expr->type == ex_expr
-			&& extract_type (dst_expr->e.expr.e1) == ev_pointer
-			&& !is_constant (dst_expr->e.expr.e1)) {
-			sblock = statement_subexpr (sblock, dst_expr->e.expr.e1, &dst);
-			sblock = statement_subexpr (sblock, dst_expr->e.expr.e2, &ofs);
-		} else {
-			sblock = statement_subexpr (sblock, dst_expr, &dst);
-			ofs = 0;
-		}
-		if (op)
-			*op = src;
-		type = st_ptrassign;
 	}
 	s = new_statement (type, opcode, e);
 	s->opa = src;
@@ -1059,7 +1040,6 @@ expr_expr (sblock_t *sblock, expr_t *e, operand_t **op)
 			sblock = expr_call (sblock, e, op);
 			break;
 		case '=':
-		case PAS:
 			sblock = expr_assign (sblock, e, op);
 			break;
 		case 'm':
@@ -1506,7 +1486,6 @@ statement_expr (sblock_t *sblock, expr_t *e)
 			sblock = statement_branch (sblock, e);
 			break;
 		case '=':
-		case PAS:
 			sblock = expr_assign (sblock, e, 0);
 			break;
 		case 'm':

From 57134e01cdad37fc4ea34765a1092e41f60cc9ad Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 13 Mar 2020 22:14:30 +0900
Subject: [PATCH 0763/1519] [qfcc] Handle l-value pointer dereferences again

While I still hate ".=", at least it's more hidden, and the new
implementation is a fair bit cleaner (hah, goto a label in an if (0) {}
block).

Most importantly, the expression tree code knows nothing about it. Now
just to figure out what broke func-epxr. A bit of whack-a-mole, but yay
for automated tests.
---
 tools/qfcc/source/statements.c | 75 ++++++++++++++++++++++++++--------
 1 file changed, 58 insertions(+), 17 deletions(-)

diff --git a/tools/qfcc/source/statements.c b/tools/qfcc/source/statements.c
index 1ac0311a5..37a94b81c 100644
--- a/tools/qfcc/source/statements.c
+++ b/tools/qfcc/source/statements.c
@@ -659,11 +659,11 @@ expr_assign_copy (sblock_t *sblock, expr_t *e, operand_t **op)
 	const char **opcode_set = opcode_sets[0];
 	const char *opcode;
 	int         need_ptr = 0;
-	operand_t  *dummy;
+	//operand_t  *dummy;
 
-	if (src_expr->type == ex_expr && src_expr->e.expr.op == '=') {
-		sblock = statement_subexpr (sblock, src_expr, &dummy);
-	}
+	//if (src_expr->type == ex_expr && src_expr->e.expr.op == '=') {
+	//	sblock = statement_subexpr (sblock, src_expr, &dummy);
+	//}
 	// follow the assignment chain to find the actual source expression
 	// (can't take the address of an assignment)
 	while (src_expr->type == ex_expr && src_expr->e.expr.op == '=') {
@@ -726,21 +726,62 @@ expr_assign (sblock_t *sblock, expr_t *e, operand_t **op)
 	const char *opcode = convert_op (e->e.expr.op);
 	st_type_t   type;
 
-	if (is_structural (dst_type)) {
-		return expr_assign_copy (sblock, e, op);
-	}
-
-	if (e->e.expr.op == '=') {
-		sblock = statement_subexpr (sblock, dst_expr, &dst);
-		src = dst;
+	if (src_expr->type == ex_expr && src_expr->e.expr.op == '=') {
 		sblock = statement_subexpr (sblock, src_expr, &src);
-		ofs = 0;
-		if (op)
-			*op = dst;
-		if (src == dst)
-			return sblock;
-		type = st_assign;
+		if (is_structural (dst_type)) {
+			return expr_assign_copy (sblock, e, op);
+		}
+		if (is_indirect (dst_expr)) {
+			goto dereference_dst;
+		} else {
+			sblock = statement_subexpr (sblock, dst_expr, &dst);
+		}
+	} else {
+		if (is_structural (dst_type)) {
+			return expr_assign_copy (sblock, e, op);
+		}
+
+		if (is_indirect (dst_expr)) {
+			// If both dst_expr and src_expr are indirect, then a staging temp
+			// is needed, but emitting src_expr first generates that temp
+			// because src is null. If src_expr is not indirect and is a simple
+			// variable reference, then just the ref will be generated and thus
+			// will be assigned to the dereferenced destination. If src_expr
+			// is not simple, then a temp will be generated, so all good.
+			sblock = statement_subexpr (sblock, src_expr, &src);
+			goto dereference_dst;
+		} else {
+			// dst_expr is direct and known to be an l-value, so emitting
+			// its expression will simply generate a reference to that l-value
+			// which will be used as the default location to store src_expr's
+			// result
+			sblock = statement_subexpr (sblock, dst_expr, &dst);
+			src = dst;
+			sblock = statement_subexpr (sblock, src_expr, &src);
+		}
 	}
+	if (0) {
+dereference_dst:
+		// dst_expr is a dereferenced pointer, so need to un-dereference it
+		// to get the pointer and switch to storep instructions.
+		dst_expr = address_expr (dst_expr, 0, 0);
+		opcode = ".=";	// FIXME find a nicer representation (lose strings?)
+		if (dst_expr->type == ex_expr && !is_const_ptr (dst_expr->e.expr.e1)) {
+			sblock = statement_subexpr (sblock, dst_expr->e.expr.e1, &dst);
+			sblock = statement_subexpr (sblock, dst_expr->e.expr.e2, &ofs);
+		} else {
+			sblock = statement_subexpr (sblock, dst_expr, &dst);
+			ofs = 0;
+		}
+	}
+	if (op) {
+		*op = src;
+	}
+	if (src == dst) {
+		return sblock;
+	}
+	type = st_assign;
+
 	s = new_statement (type, opcode, e);
 	s->opa = src;
 	s->opb = dst;

From b1459ac816cbbd99ecee1ee7a85290cd080b9202 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 14 Mar 2020 01:24:13 +0900
Subject: [PATCH 0764/1519] [qfcc] Move return save temp into call block

This fixes func-expr after the assignment rewrite. Now all tests pass
when not optimizing (something not quite right in assignchain when
optimizing).
---
 tools/qfcc/source/expr.c        | 3 +++
 tools/qfcc/source/expr_binary.c | 8 ++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index c4408f6e2..85c07511b 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -1843,6 +1843,9 @@ build_function_call (expr_t *fexpr, const type_t *ftype, expr_t *params)
 		if (e->type == ex_compound) {
 			e = expr_file_line (initialized_temp_expr (arg_types[i], e), e);
 		}
+		// FIXME this is target-specific info and should not be in the
+		// expression tree
+		// That, or always use a temp, since it should get optimized out
 		if (has_function_call (e)) {
 			expr_t     *cast = cast_expr (arg_types[i], convert_vector (e));
 			expr_t     *tmp = new_temp_def_expr (arg_types[i]);
diff --git a/tools/qfcc/source/expr_binary.c b/tools/qfcc/source/expr_binary.c
index 228112311..c2d446334 100644
--- a/tools/qfcc/source/expr_binary.c
+++ b/tools/qfcc/source/expr_binary.c
@@ -924,10 +924,14 @@ binary_expr (int op, expr_t *e1, expr_t *e2)
 
 	convert_name (e1);
 	e1 = convert_vector (e1);
+	// FIXME this is target-specific info and should not be in the
+	// expression tree
 	if (e1->type == ex_block && e1->e.block.is_call
 		&& has_function_call (e2) && e1->e.block.result) {
-		e = new_temp_def_expr (get_type (e1->e.block.result));
-		e1 = assign_expr (e, e1);
+		expr_t    *tmp = new_temp_def_expr (get_type (e1->e.block.result));
+		e = assign_expr (tmp, e1->e.block.result);
+		append_expr (e1, e);
+		e1->e.block.result = tmp;
 	}
 	if (e1->type == ex_error)
 		return e1;

From a98f0e04eba6541b20f4f10383fdf2cf20e71a5c Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 14 Mar 2020 01:28:00 +0900
Subject: [PATCH 0765/1519] [qfcc] Correct some misinformative prints

---
 tools/qfcc/test/assignchain.r | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tools/qfcc/test/assignchain.r b/tools/qfcc/test/assignchain.r
index 4d6fd2e4b..7f08c0494 100644
--- a/tools/qfcc/test/assignchain.r
+++ b/tools/qfcc/test/assignchain.r
@@ -26,18 +26,18 @@ int test_struct_global (void)
 	int         ret = 0;
 	bar = baz = foo_init;
 	if (bar.x != foo_init.x || bar.y != foo_init.y) {
-		printf ("test_struct: bar={%d %g} foo_init={%d %g}\n",
+		printf ("test_struct_global: bar={%d %g} foo_init={%d %g}\n",
 				bar.x, bar.y, foo_init.x, foo_init.y);
 		ret |= 1;
 	}
 	if (baz.x != foo_init.x || baz.y != foo_init.y) {
-		printf ("test_struct: baz={%d %g} foo_init={%d %g}\n",
+		printf ("test_struct_global: baz={%d %g} foo_init={%d %g}\n",
 				baz.x, baz.y, foo_init.x, foo_init.y);
 		ret |= 1;
 	}
 	bar = baz = nil;
 	if (bar.x || baz.x || bar.y || baz.y) {
-		printf ("test_struct: bar={%d %g} baz={%d %g}\n",
+		printf ("test_struct_global: bar={%d %g} baz={%d %g}\n",
 				bar.x, bar.y, baz.x, baz.y);
 		ret |= 1;
 	}
@@ -49,7 +49,7 @@ int test_simple_pointer (int *x, int *y)
 	int         ret = 0;
 	*x = *y = z;
 	if (*x != z || *y != z) {
-		printf ("test_simple_global: *x=%d *y=%d z=%d\n", *x, *y, z);
+		printf ("test_simple_pointer: *x=%d *y=%d z=%d\n", *x, *y, z);
 		ret |= 1;
 	}
 	return ret;
@@ -60,12 +60,12 @@ int test_struct_pointer (foo *bar, foo *baz)
 	int         ret = 0;
 	*bar = *baz = foo_init;
 	if (bar.x != foo_init.x || bar.y != foo_init.y) {
-		printf ("test_struct: bar={%d %g} foo_init={%d %g}\n",
+		printf ("test_struct_pointer: bar={%d %g} foo_init={%d %g}\n",
 				bar.x, bar.y, foo_init.x, foo_init.y);
 		ret |= 1;
 	}
 	if (baz.x != foo_init.x || baz.y != foo_init.y) {
-		printf ("test_struct: baz={%d %g} foo_init={%d %g}\n",
+		printf ("test_struct_pointer: baz={%d %g} foo_init={%d %g}\n",
 				baz.x, baz.y, foo_init.x, foo_init.y);
 		ret |= 1;
 	}

From d30c895c134024562b9ff615b44e9ec4e09ed32a Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 14 Mar 2020 11:36:42 +0900
Subject: [PATCH 0766/1519] [qfcc] Use correct assignment statement type

Just another minor detail lost in the assignment rewrite. With this, all
tests pass when optimizing.
---
 tools/qfcc/source/statements.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/qfcc/source/statements.c b/tools/qfcc/source/statements.c
index 37a94b81c..e58294b00 100644
--- a/tools/qfcc/source/statements.c
+++ b/tools/qfcc/source/statements.c
@@ -760,6 +760,8 @@ expr_assign (sblock_t *sblock, expr_t *e, operand_t **op)
 			sblock = statement_subexpr (sblock, src_expr, &src);
 		}
 	}
+	type = st_assign;
+
 	if (0) {
 dereference_dst:
 		// dst_expr is a dereferenced pointer, so need to un-dereference it
@@ -773,6 +775,7 @@ dereference_dst:
 			sblock = statement_subexpr (sblock, dst_expr, &dst);
 			ofs = 0;
 		}
+		type = st_ptrassign;
 	}
 	if (op) {
 		*op = src;
@@ -780,7 +783,6 @@ dereference_dst:
 	if (src == dst) {
 		return sblock;
 	}
-	type = st_assign;
 
 	s = new_statement (type, opcode, e);
 	s->opa = src;

From 7cc51c9ca35f08b311d71c9dae1a7b3f28ebe71e Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 14 Mar 2020 12:27:23 +0900
Subject: [PATCH 0767/1519] [qfcc] Save block expression creator's address

I've already found the bug that necessitated it (and the creator was
innocent), but it will help later.
---
 tools/qfcc/include/expr.h | 1 +
 tools/qfcc/source/expr.c  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/tools/qfcc/include/expr.h b/tools/qfcc/include/expr.h
index b25481a8f..0efc998ba 100644
--- a/tools/qfcc/include/expr.h
+++ b/tools/qfcc/include/expr.h
@@ -104,6 +104,7 @@ typedef struct {
 	struct expr_s **tail;	///< last expression in the block, for appending
 	struct expr_s *result;	///< the result of this block if non-void
 	int         is_call;	///< this block exprssion forms a function call
+	void       *return_addr;///< who allocated this
 } ex_block_t;
 
 typedef struct {
diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index 85c07511b..734886f9a 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -561,6 +561,7 @@ new_block_expr (void)
 	b->type = ex_block;
 	b->e.block.head = 0;
 	b->e.block.tail = &b->e.block.head;
+	b->e.block.return_addr = __builtin_return_address (0);
 	return b;
 }
 

From 277ff719f5929e2494360376fa5656ffe054bb95 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 14 Mar 2020 12:30:18 +0900
Subject: [PATCH 0768/1519] Revert "Do not lose the block expression when
 taking its address."

This reverts commit b49d90e769e6f936795379ed643aa91f55561610.

I suspect this was a workaround for the mess in assignment chains.
However, it caused compile errors with the new implementation, and is
just bogus anyway.
---
 tools/qfcc/source/expr.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index 734886f9a..70e4b2076 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -2229,8 +2229,7 @@ address_expr (expr_t *e1, expr_t *e2, type_t *t)
 		case ex_block:
 			if (!e1->e.block.result)
 				return error (e1, "invalid type for unary &");
-			e1->e.block.result = address_expr (e1->e.block.result, e2, t);
-			return e1;
+			return address_expr (e1->e.block.result, e2, t);
 		case ex_label:
 			return new_label_ref (&e1->e.label);
 		case ex_temp:

From 6608c8a1f66c4f007bfd48e14b8c058252665177 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 14 Mar 2020 13:14:25 +0900
Subject: [PATCH 0769/1519] Revert "Support taking the address of block
 expressions that have a result."

This reverts commit c78d15b331f830118a27726b522765d985f94624.

While a block expression's result may be an l-value, block expressions
are not (and their results may not be), thus taking the address of one
is not really correct. It seems the only place that tries to do so is
the assignment code when dealing with structures.
---
 tools/qfcc/source/expr.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index 70e4b2076..72624364c 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -2226,10 +2226,6 @@ address_expr (expr_t *e1, expr_t *e2, type_t *t)
 				return address_expr (e1->e.expr.e1, e2, t);
 			}
 			return error (e1, "invalid type for unary &");
-		case ex_block:
-			if (!e1->e.block.result)
-				return error (e1, "invalid type for unary &");
-			return address_expr (e1->e.block.result, e2, t);
 		case ex_label:
 			return new_label_ref (&e1->e.label);
 		case ex_temp:

From 51a30de9c560caf89403af1514cc2dcdecd1fe89 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 14 Mar 2020 16:51:54 +0900
Subject: [PATCH 0770/1519] [qfcc] Print accurate linenos for more ICEs

---
 tools/qfcc/source/dags.c       |  9 +++++----
 tools/qfcc/source/flow.c       |  6 +++---
 tools/qfcc/source/statements.c | 13 +++++++------
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/tools/qfcc/source/dags.c b/tools/qfcc/source/dags.c
index a97b3e68c..ce4bd98cf 100644
--- a/tools/qfcc/source/dags.c
+++ b/tools/qfcc/source/dags.c
@@ -80,7 +80,7 @@ flush_daglabels (void)
 			else if (op->op_type == op_label)
 				op->o.label->daglabel = 0;
 			else
-				internal_error (0, "unexpected operand type");
+				internal_error (op->expr, "unexpected operand type");
 		}
 		daglabel_chain = daglabel_chain->daglabel_chain;
 	}
@@ -186,7 +186,7 @@ operand_label (dag_t *dag, operand_t *op)
 		label->op = op;
 		op->o.label->daglabel = label;
 	} else {
-		internal_error (0, "unexpected operand type: %d", op->op_type);
+		internal_error (op->expr, "unexpected operand type: %d", op->op_type);
 	}
 	return label;
 }
@@ -498,7 +498,7 @@ dag_kill_aliases (daglabel_t *l)
 			def_visit_all (op->o.def, 1, dag_def_kill_aliases_visit, l);
 		}
 	} else {
-		internal_error (0, "rvalue assignment?");
+		internal_error (op->expr, "rvalue assignment?");
 	}
 }
 
@@ -555,7 +555,8 @@ dagnode_attach_label (dagnode_t *n, daglabel_t *l)
 		internal_error (0, "attempt to attach operator label to dagnode "
 						"identifiers");
 	if (!op_is_identifier (l->op))
-		internal_error (0, "attempt to attach non-identifer label to dagnode "
+		internal_error (l->op->expr,
+						"attempt to attach non-identifer label to dagnode "
 						"identifiers");
 	if (l->dagnode) {
 		// if the node is a leaf, then kill its value so no attempt is made
diff --git a/tools/qfcc/source/flow.c b/tools/qfcc/source/flow.c
index a1043df52..d3fa1d38f 100644
--- a/tools/qfcc/source/flow.c
+++ b/tools/qfcc/source/flow.c
@@ -280,9 +280,9 @@ flowvar_get_def (flowvar_t *var)
 		case op_temp:
 			return op->o.tempop.def;
 		case op_alias:
-			internal_error (0, "unexpected alias operand");
+			internal_error (op->expr, "unexpected alias operand");
 	}
-	internal_error (0, "oops, blue pill");
+	internal_error (op->expr, "oops, blue pill");
 	return 0;
 }
 
@@ -378,7 +378,7 @@ get_temp_address (function_t *func, operand_t *op)
 		func->tmpaddr += top->size;
 	}
 	if (top->o.tempop.offset) {
-		internal_error (0, "real tempop with a non-zero offset");
+		internal_error (top->expr, "real tempop with a non-zero offset");
 	}
 	op->o.tempop.flowaddr = top->o.tempop.flowaddr + op->o.tempop.offset;
 	return op->o.tempop.flowaddr;
diff --git a/tools/qfcc/source/statements.c b/tools/qfcc/source/statements.c
index e58294b00..d633d6434 100644
--- a/tools/qfcc/source/statements.c
+++ b/tools/qfcc/source/statements.c
@@ -207,7 +207,7 @@ print_operand (operand_t *op)
 				case ev_void:
 				case ev_invalid:
 				case ev_type_count:
-					internal_error (0, "weird value type");
+					internal_error (op->expr, "weird value type");
 			}
 			break;
 		case op_label:
@@ -390,7 +390,7 @@ tempop_visit_all (tempop_t *tempop, int overlap,
 	if (tempop->alias) {
 		top = tempop->alias;
 		if (top->op_type != op_temp) {
-			internal_error (0, "temp alias of non-temp operand");
+			internal_error (top->expr, "temp alias of non-temp operand");
 		}
 		tempop = &top->o.tempop;
 		if ((ret = visit (tempop, data)))
@@ -400,7 +400,7 @@ tempop_visit_all (tempop_t *tempop, int overlap,
 	}
 	for (top = tempop->alias_ops; top; top = top->next) {
 		if (top->op_type != op_temp) {
-			internal_error (0, "temp alias of non-temp operand");
+			internal_error (top->expr, "temp alias of non-temp operand");
 		}
 		tempop = &top->o.tempop;
 		if (tempop == start_tempop)
@@ -419,8 +419,9 @@ alias_operand (type_t *type, operand_t *op, expr_t *expr)
 	operand_t  *aop;
 
 	if (type_size (type) != type_size (op->type)) {
-		internal_error (0, "\naliasing operand with type of different size"
-						" (%d, %d)", type_size (type), type_size (op->type));
+		internal_error (op->expr,
+						"aliasing operand with type of different size: %d, %d",
+						type_size (type), type_size (op->type));
 	}
 	aop = new_operand (op_alias, expr);
 	aop->o.alias = op;
@@ -554,7 +555,7 @@ statement_get_targetlist (statement_t *s)
 		target_list[0] = statement_get_target (s);
 	} else if (statement_is_jumpb (s)) {
 		if (table->alias)
-			internal_error (0, "aliased jump table");
+			internal_error (s->opa->expr, "aliased jump table");
 		e = table->initializer->e.compound.head;	//FIXME check!!!
 		for (i = 0; i < count; e = e->next, i++)
 			target_list[i] = e->expr->e.labelref.label->dest;

From 7d5644e0553df6e453a28a1462cdcc10337dc711 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 14 Mar 2020 17:44:08 +0900
Subject: [PATCH 0771/1519] [qfcc] Save operand creator return address

---
 tools/qfcc/include/statements.h |  2 ++
 tools/qfcc/source/statements.c  | 30 +++++++++++++++++++++---------
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/tools/qfcc/include/statements.h b/tools/qfcc/include/statements.h
index d1ccff441..dcb882d2b 100644
--- a/tools/qfcc/include/statements.h
+++ b/tools/qfcc/include/statements.h
@@ -58,6 +58,7 @@ typedef struct operand_s {
 	struct type_s *type;		///< possibly override def's type
 	int         size;			///< for structures
 	struct expr_s *expr;		///< expression generating this operand
+	void       *return_addr;	///< who created this operand
 	union {
 		struct def_s *def;
 		struct ex_value_s *value;
@@ -126,6 +127,7 @@ int tempop_visit_all (tempop_t *tempop, int overlap,
 					  int (*visit) (tempop_t *, void *), void *data);
 operand_t *alias_operand (struct type_s *type, operand_t *op,
 						  struct expr_s *expr);
+operand_t *label_operand (struct expr_s *label);
 void free_operand (operand_t *op);
 
 sblock_t *new_sblock (void);
diff --git a/tools/qfcc/source/statements.c b/tools/qfcc/source/statements.c
index d633d6434..3b8c5b013 100644
--- a/tools/qfcc/source/statements.c
+++ b/tools/qfcc/source/statements.c
@@ -274,12 +274,13 @@ new_statement (st_type_t type, const char *opcode, expr_t *expr)
 }
 
 static operand_t *
-new_operand (op_type_e op, expr_t *expr)
+new_operand (op_type_e op, expr_t *expr, void *return_addr)
 {
 	operand_t *operand;
 	ALLOC (256, operand_t, operands, operand);
 	operand->op_type = op;
 	operand->expr = expr;
+	operand->return_addr = return_addr;
 	return operand;
 }
 
@@ -319,7 +320,7 @@ def_operand (def_t *def, type_t *type, expr_t *expr)
 
 	if (!type)
 		type = def->type;
-	op = new_operand (op_def, expr);
+	op = new_operand (op_def, expr, __builtin_return_address (0));
 	op->type = type;
 	op->size = type_size (type);
 	op->o.def = def;
@@ -339,7 +340,7 @@ operand_t *
 value_operand (ex_value_t *value, expr_t *expr)
 {
 	operand_t  *op;
-	op = new_operand (op_value, expr);
+	op = new_operand (op_value, expr, __builtin_return_address (0));
 	op->type = value->type;
 	op->o.value = value;
 	return op;
@@ -348,7 +349,7 @@ value_operand (ex_value_t *value, expr_t *expr)
 operand_t *
 temp_operand (type_t *type, expr_t *expr)
 {
-	operand_t  *op = new_operand (op_temp, expr);
+	operand_t  *op = new_operand (op_temp, expr, __builtin_return_address (0));
 
 	op->o.tempop.type = type;
 	op->type = type;
@@ -423,13 +424,26 @@ alias_operand (type_t *type, operand_t *op, expr_t *expr)
 						"aliasing operand with type of different size: %d, %d",
 						type_size (type), type_size (op->type));
 	}
-	aop = new_operand (op_alias, expr);
+	aop = new_operand (op_alias, expr, __builtin_return_address (0));
 	aop->o.alias = op;
 	aop->type = type;
 	aop->size = type_size (type);
 	return aop;
 }
 
+operand_t *
+label_operand (expr_t *label)
+{
+	operand_t  *lop;
+
+	if (label->type != ex_label) {
+		internal_error (label, "not a label expression");
+	}
+	lop = new_operand (op_label, label, __builtin_return_address (0));
+	lop->o.label = &label->e.label;
+	return lop;
+}
+
 static operand_t *
 short_operand (short short_val, expr_t *expr)
 {
@@ -595,8 +609,7 @@ statement_branch (sblock_t *sblock, expr_t *e)
 
 	if (e->type == ex_uexpr && e->e.expr.op == 'g') {
 		s = new_statement (st_flow, "<GOTO>", e);
-		s->opa = new_operand (op_label, e);
-		s->opa->o.label = &e->e.expr.e1->e.label;
+		s->opa = label_operand (e->e.expr.e1);
 	} else {
 		if (e->e.expr.op == 'g') {
 			s = new_statement (st_flow, "<JUMPB>", e);
@@ -606,8 +619,7 @@ statement_branch (sblock_t *sblock, expr_t *e)
 			opcode = convert_op (e->e.expr.op);
 			s = new_statement (st_flow, opcode, e);
 			sblock = statement_subexpr (sblock, e->e.expr.e1, &s->opa);
-			s->opb = new_operand (op_label, e);
-			s->opb->o.label = &e->e.expr.e2->e.label;
+			s->opb = label_operand (e->e.expr.e2);
 		}
 	}
 

From eca976e5ae79cdb1928f9f9cba64e0464abd4f36 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 14 Mar 2020 17:45:54 +0900
Subject: [PATCH 0772/1519] [qfcc] Expose l-value checking

Needed for assignment chains.
---
 tools/qfcc/include/expr.h       |  1 +
 tools/qfcc/source/expr_assign.c | 33 +++++++++++++++++++++------------
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/tools/qfcc/include/expr.h b/tools/qfcc/include/expr.h
index 0efc998ba..39e405622 100644
--- a/tools/qfcc/include/expr.h
+++ b/tools/qfcc/include/expr.h
@@ -710,6 +710,7 @@ expr_t *build_for_statement (expr_t *init, expr_t *test, expr_t *next,
 							 expr_t *break_label, expr_t *continue_label);
 expr_t *build_state_expr (expr_t *e);
 expr_t *think_expr (struct symbol_s *think_sym);
+int is_lvalue (const expr_t *expr) __attribute__((pure));
 expr_t *assign_expr (expr_t *dst, expr_t *src);
 expr_t *cast_expr (struct type_s *t, expr_t *e);
 
diff --git a/tools/qfcc/source/expr_assign.c b/tools/qfcc/source/expr_assign.c
index 465746983..88d45ad7b 100644
--- a/tools/qfcc/source/expr_assign.c
+++ b/tools/qfcc/source/expr_assign.c
@@ -81,8 +81,8 @@ check_assign_logic_precedence (expr_t *dst, expr_t *src)
 	return 0;
 }
 
-static expr_t *
-check_valid_lvalue (expr_t *expr)
+int
+is_lvalue (const expr_t *expr)
 {
 	switch (expr->type) {
 		case ex_symbol:
@@ -90,7 +90,7 @@ check_valid_lvalue (expr_t *expr)
 				case sy_name:
 					break;
 				case sy_var:
-					return 0;
+					return 1;
 				case sy_const:
 					break;
 				case sy_type:
@@ -106,21 +106,21 @@ check_valid_lvalue (expr_t *expr)
 			}
 			break;
 		case ex_temp:
-			return 0;
+			return 1;
 		case ex_expr:
 			if (expr->e.expr.op == '.') {
-				return 0;
+				return 1;
 			}
 			if (expr->e.expr.op == 'A') {
-				return check_valid_lvalue (expr->e.expr.e1);
+				return is_lvalue (expr->e.expr.e1);
 			}
 			break;
 		case ex_uexpr:
 			if (expr->e.expr.op == '.') {
-				return 0;
+				return 1;
 			}
 			if (expr->e.expr.op == 'A') {
-				return check_valid_lvalue (expr->e.expr.e1);
+				return is_lvalue (expr->e.expr.e1);
 			}
 			break;
 		case ex_memset:
@@ -136,11 +136,20 @@ check_valid_lvalue (expr_t *expr)
 		case ex_error:
 			break;
 	}
-	if (options.traditional) {
-		warning (expr, "invalid lvalue in assignment");
-		return 0;
+	return 0;
+}
+
+static expr_t *
+check_valid_lvalue (expr_t *expr)
+{
+	if (!is_lvalue (expr)) {
+		if (options.traditional) {
+			warning (expr, "invalid lvalue in assignment");
+			return 0;
+		}
+		return error (expr, "invalid lvalue in assignment");
 	}
-	return error (expr, "invalid lvalue in assignment");
+	return 0;
 }
 
 static expr_t *

From 97e0c235295dc6f932edc170a7d0ae6c7cc1b44a Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 14 Mar 2020 17:47:23 +0900
Subject: [PATCH 0773/1519] [qfcc] Create a nil operand

This is for struct assignments so they can pass the source operand back
up the assignment chain.
---
 tools/qfcc/include/statements.h |  4 +++-
 tools/qfcc/source/emit.c        |  2 ++
 tools/qfcc/source/flow.c        |  2 ++
 tools/qfcc/source/statements.c  | 18 ++++++++++++++++++
 4 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/tools/qfcc/include/statements.h b/tools/qfcc/include/statements.h
index dcb882d2b..7a0b241ed 100644
--- a/tools/qfcc/include/statements.h
+++ b/tools/qfcc/include/statements.h
@@ -38,6 +38,7 @@ typedef enum {
 	op_label,
 	op_temp,
 	op_alias,
+	op_nil,
 } op_type_e;
 
 typedef struct {
@@ -55,7 +56,7 @@ typedef struct {
 typedef struct operand_s {
 	struct operand_s *next;
 	op_type_e   op_type;
-	struct type_s *type;		///< possibly override def's type
+	struct type_s *type;		///< possibly override def's/nil's type
 	int         size;			///< for structures
 	struct expr_s *expr;		///< expression generating this operand
 	void       *return_addr;	///< who created this operand
@@ -117,6 +118,7 @@ struct dstring_s;
 
 const char *optype_str (op_type_e type) __attribute__((const));
 
+operand_t *nil_operand (struct type_s *type, struct expr_s *expr);
 operand_t *def_operand (struct def_s *def, struct type_s *type,
 						struct expr_s *expr);
 operand_t *return_operand (struct type_s *type, struct expr_s *expr);
diff --git a/tools/qfcc/source/emit.c b/tools/qfcc/source/emit.c
index 253502206..0073f3967 100644
--- a/tools/qfcc/source/emit.c
+++ b/tools/qfcc/source/emit.c
@@ -106,6 +106,8 @@ get_operand_def (expr_t *expr, operand_t *op)
 			return op->o.tempop.def;
 		case op_alias:
 			return get_operand_def (expr, op->o.alias);
+		case op_nil:
+			internal_error (expr, "unexpected nil operand");
 	}
 	return 0;
 }
diff --git a/tools/qfcc/source/flow.c b/tools/qfcc/source/flow.c
index d3fa1d38f..d3e82b7ce 100644
--- a/tools/qfcc/source/flow.c
+++ b/tools/qfcc/source/flow.c
@@ -281,6 +281,8 @@ flowvar_get_def (flowvar_t *var)
 			return op->o.tempop.def;
 		case op_alias:
 			internal_error (op->expr, "unexpected alias operand");
+		case op_nil:
+			internal_error (op->expr, "unexpected nil operand");
 	}
 	internal_error (op->expr, "oops, blue pill");
 	return 0;
diff --git a/tools/qfcc/source/statements.c b/tools/qfcc/source/statements.c
index 3b8c5b013..c64640c2f 100644
--- a/tools/qfcc/source/statements.c
+++ b/tools/qfcc/source/statements.c
@@ -65,6 +65,8 @@ static const char *op_type_names[] = {
 	"op_value",
 	"op_label",
 	"op_temp",
+	"op_alias",
+	"op_nil",
 };
 
 const char *
@@ -150,6 +152,8 @@ operand_string (operand_t *op)
 				strcpy (buf, alias);
 				return va ("alias(%s,%s)", pr_type_name[op->type->type], buf);
 			}
+		case op_nil:
+			return va ("nil");
 	}
 	return ("??");
 }
@@ -222,6 +226,10 @@ print_operand (operand_t *op)
 			printf ("alias(%s,", pr_type_name[op->type->type]);
 			print_operand (op->o.alias);
 			printf (")");
+			break;
+		case op_nil:
+			printf ("nil");
+			break;
 	}
 }
 
@@ -313,6 +321,16 @@ free_sblock (sblock_t *sblock)
 	FREE (sblocks, sblock);
 }
 
+operand_t *
+nil_operand (type_t *type, expr_t *expr)
+{
+	operand_t  *op;
+	op = new_operand (op_nil, expr, __builtin_return_address (0));
+	op->type = type;
+	op->size = type_size (type);
+	return op;
+}
+
 operand_t *
 def_operand (def_t *def, type_t *type, expr_t *expr)
 {

From 025dd634936853a3d6fd673f85a53ea36a52bf70 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 14 Mar 2020 17:48:53 +0900
Subject: [PATCH 0774/1519] [qfcc] Bubble right-hand assignee back up chain

This fixes assignchain when not optimizing. There are problems in dags,
though, with address expressions.
---
 tools/qfcc/source/statements.c | 114 ++++++++++++++++++++++-----------
 1 file changed, 76 insertions(+), 38 deletions(-)

diff --git a/tools/qfcc/source/statements.c b/tools/qfcc/source/statements.c
index c64640c2f..63ec29f15 100644
--- a/tools/qfcc/source/statements.c
+++ b/tools/qfcc/source/statements.c
@@ -646,6 +646,46 @@ statement_branch (sblock_t *sblock, expr_t *e)
 	return sblock->next;
 }
 
+static sblock_t *
+expr_address (sblock_t *sblock, expr_t *e, operand_t **op)
+{
+	statement_t *s;
+	s = new_statement (st_expr, "&", e);
+	sblock = statement_subexpr (sblock, e->e.expr.e1, &s->opa);
+	s->opc = temp_operand (e->e.expr.type, e);
+	sblock_add_statement (sblock, s);
+	*(op) = s->opc;
+	return sblock;
+}
+
+static sblock_t *
+operand_address (sblock_t *sblock, operand_t *reference, operand_t **op,
+				 expr_t *e)
+{
+	statement_t *s;
+
+	switch (reference->op_type) {
+		case op_def:
+		case op_temp:
+		case op_alias:
+			s = new_statement (st_expr, "&", e);
+			s->opa = reference;
+			s->opc = temp_operand (pointer_type (reference->type), e);
+			sblock_add_statement (sblock, s);
+			if (op) {
+				*(op) = s->opc;
+			}
+			return sblock;
+		case op_value:
+		case op_label:
+		case op_nil:
+			break;
+	}
+	internal_error ((*op)->expr,
+					"invalid operand type for operand address: %s",
+					op_type_names[reference->op_type]);
+}
+
 static __attribute__((pure)) int
 is_const_ptr (expr_t *e)
 {
@@ -660,8 +700,6 @@ is_const_ptr (expr_t *e)
 static __attribute__((pure)) int
 is_indirect (expr_t *e)
 {
-	if (e->type == ex_block && e->e.block.result)
-		return is_indirect (e->e.block.result);
 	if (e->type == ex_expr && e->e.expr.op == '.')
 		return 1;
 	if (!(e->type == ex_uexpr && e->e.expr.op == '.'))
@@ -670,7 +708,7 @@ is_indirect (expr_t *e)
 }
 
 static sblock_t *
-expr_assign_copy (sblock_t *sblock, expr_t *e, operand_t **op)
+expr_assign_copy (sblock_t *sblock, expr_t *e, operand_t **op, operand_t *src)
 {
 	statement_t *s;
 	expr_t     *dst_expr = e->e.expr.e1;
@@ -680,7 +718,6 @@ expr_assign_copy (sblock_t *sblock, expr_t *e, operand_t **op)
 	unsigned    count;
 	expr_t     *count_expr;
 	operand_t  *dst = 0;
-	operand_t  *src = 0;
 	operand_t  *size = 0;
 	static const char *opcode_sets[][2] = {
 		{"<MOVE>", "<MOVEP>"},
@@ -692,29 +729,44 @@ expr_assign_copy (sblock_t *sblock, expr_t *e, operand_t **op)
 	int         need_ptr = 0;
 	//operand_t  *dummy;
 
-	//if (src_expr->type == ex_expr && src_expr->e.expr.op == '=') {
-	//	sblock = statement_subexpr (sblock, src_expr, &dummy);
-	//}
-	// follow the assignment chain to find the actual source expression
-	// (can't take the address of an assignment)
-	while (src_expr->type == ex_expr && src_expr->e.expr.op == '=') {
-		src_expr = src_expr->e.expr.e2;
-	}
-	if (src_expr->type == ex_nil) {
-		// switch to memset because nil is type agnostic 0
+	if ((src && src->op_type == op_nil) || src_expr->type == ex_nil) {
+		// switch to memset because nil is type agnostic 0 and structures
+		// can be any size
 		src_expr = new_integer_expr (0);
+		sblock = statement_subexpr (sblock, src_expr, &src);
 		opcode_set = opcode_sets[1];
+		if (op) {
+			*op = nil_operand (dst_type, src_expr);
+		}
 		if (is_indirect (dst_expr)) {
-			need_ptr = 1;
-			dst_expr = address_expr (dst_expr, 0, 0);
+			goto dereference_dst;
 		}
 	} else {
+		if (!src) {
+			// This is the very right-hand node of a non-nil assignment chain
+			// (there may be more chains somwhere within src_expr, but they
+			// are not part of this chain as they are separated by another
+			// expression).
+			sblock = statement_subexpr (sblock, src_expr, &src);
+		}
+		// send the source operand back up through the assignment chain
+		// before modifying src if its address is needed
+		if (op) {
+			*op = src;
+		}
 		if (is_indirect (dst_expr) || is_indirect (src_expr)) {
-			need_ptr = 1;
-			dst_expr = address_expr (dst_expr, 0, 0);
-			src_expr = address_expr (src_expr, 0, 0);
+			sblock = operand_address (sblock, src, &src, src_expr);
+			goto dereference_dst;
 		}
 	}
+	if (0) {
+dereference_dst:
+		// dst_expr is a dereferenced pointer, so need to un-dereference it
+		// to get the pointer and switch to storep instructions.
+		dst_expr = expr_file_line (address_expr (dst_expr, 0, 0), e);
+		need_ptr = 1;
+	}
+	sblock = statement_subexpr (sblock, dst_expr, &dst);
 
 	if (type_size (dst_type) != type_size (src_type)) {
 		bug (e, "dst and src sizes differ in expr_assign_copy: %d %d",
@@ -726,6 +778,7 @@ expr_assign_copy (sblock_t *sblock, expr_t *e, operand_t **op)
 	} else {
 		count_expr = expr_file_line (new_integer_expr (count), e);
 	}
+	sblock = statement_subexpr (sblock, count_expr, &size);
 
 	if (count < max_count && !need_ptr) {
 		opcode = opcode_set[0];
@@ -734,9 +787,6 @@ expr_assign_copy (sblock_t *sblock, expr_t *e, operand_t **op)
 	}
 
 	s = new_statement (st_move, opcode, e);
-	sblock = statement_subexpr (sblock, dst_expr, &dst);
-	sblock = statement_subexpr (sblock, src_expr, &src);
-	sblock = statement_subexpr (sblock, count_expr, &size);
 	s->opa = src;
 	s->opb = size;
 	s->opc = dst;
@@ -760,7 +810,7 @@ expr_assign (sblock_t *sblock, expr_t *e, operand_t **op)
 	if (src_expr->type == ex_expr && src_expr->e.expr.op == '=') {
 		sblock = statement_subexpr (sblock, src_expr, &src);
 		if (is_structural (dst_type)) {
-			return expr_assign_copy (sblock, e, op);
+			return expr_assign_copy (sblock, e, op, src);
 		}
 		if (is_indirect (dst_expr)) {
 			goto dereference_dst;
@@ -769,7 +819,7 @@ expr_assign (sblock_t *sblock, expr_t *e, operand_t **op)
 		}
 	} else {
 		if (is_structural (dst_type)) {
-			return expr_assign_copy (sblock, e, op);
+			return expr_assign_copy (sblock, e, op, src);
 		}
 
 		if (is_indirect (dst_expr)) {
@@ -797,7 +847,7 @@ expr_assign (sblock_t *sblock, expr_t *e, operand_t **op)
 dereference_dst:
 		// dst_expr is a dereferenced pointer, so need to un-dereference it
 		// to get the pointer and switch to storep instructions.
-		dst_expr = address_expr (dst_expr, 0, 0);
+		dst_expr = expr_file_line (address_expr (dst_expr, 0, 0), e);
 		opcode = ".=";	// FIXME find a nicer representation (lose strings?)
 		if (dst_expr->type == ex_expr && !is_const_ptr (dst_expr->e.expr.e1)) {
 			sblock = statement_subexpr (sblock, dst_expr->e.expr.e1, &dst);
@@ -939,18 +989,6 @@ expr_call (sblock_t *sblock, expr_t *call, operand_t **op)
 	return sblock->next;
 }
 
-static sblock_t *
-expr_address (sblock_t *sblock, expr_t *e, operand_t **op)
-{
-	statement_t *s;
-	s = new_statement (st_expr, "&", e);
-	sblock = statement_subexpr (sblock, e->e.expr.e1, &s->opa);
-	s->opc = temp_operand (e->e.expr.type, e);
-	sblock_add_statement (sblock, s);
-	*(op) = s->opc;
-	return sblock;
-}
-
 static statement_t *
 lea_statement (operand_t *pointer, operand_t *offset, expr_t *e)
 {
@@ -1318,7 +1356,7 @@ expr_nil (sblock_t *sblock, expr_t *e, operand_t **op)
 		*op = value_operand (new_nil_val (nil), e);
 		return sblock;
 	}
-	ptr = address_expr (new_temp_def_expr (nil), 0, 0);
+	ptr = expr_file_line (address_expr (new_temp_def_expr (nil), 0, 0), e);
 	expr_file_line (ptr, e);
 	sblock = statement_subexpr (sblock, ptr, op);
 	e = expr_file_line (new_memset_expr (ptr, new_integer_expr (0), nil), e);

From 72f4b8ccb5402de8e3d5d821882b0be2aa6c55e1 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 14 Mar 2020 19:26:47 +0900
Subject: [PATCH 0775/1519] [qfcc] Give address operands a good expression

That is, those created by operand_address. The dag code needs the
expression that is attached to the statement to have the correct
expression type in order to do the right thing with the operands and
aliasing, especially when generating temps. This fixes assignchain when
optimizing (all tests pass again).
---
 tools/qfcc/include/expr.h      |  2 +-
 tools/qfcc/source/statements.c | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/tools/qfcc/include/expr.h b/tools/qfcc/include/expr.h
index 39e405622..170fc7a50 100644
--- a/tools/qfcc/include/expr.h
+++ b/tools/qfcc/include/expr.h
@@ -401,7 +401,7 @@ expr_t *new_binary_expr (int op, expr_t *e1, expr_t *e2);
 /**	Create a new unary expression node node.
 
 	If \a e1 is an error expression, then it will be returned instead of a
-	new binary expression.
+	new unary expression.
 
 	\param op		The op-code of the unary expression.
 	\param e1		The "right" side of the expression.
diff --git a/tools/qfcc/source/statements.c b/tools/qfcc/source/statements.c
index 63ec29f15..0b2337b0b 100644
--- a/tools/qfcc/source/statements.c
+++ b/tools/qfcc/source/statements.c
@@ -663,14 +663,22 @@ operand_address (sblock_t *sblock, operand_t *reference, operand_t **op,
 				 expr_t *e)
 {
 	statement_t *s;
+	type_t     *type;
 
 	switch (reference->op_type) {
 		case op_def:
 		case op_temp:
 		case op_alias:
+			// build an address expression so dags can extract the correct
+			// type. address_expr cannot be used because reference might not
+			// be something it likes
+			e = expr_file_line (new_unary_expr ('&', e), e);
+			type = pointer_type (reference->type);
+			e->e.expr.type = type;
+
 			s = new_statement (st_expr, "&", e);
 			s->opa = reference;
-			s->opc = temp_operand (pointer_type (reference->type), e);
+			s->opc = temp_operand (type, e);
 			sblock_add_statement (sblock, s);
 			if (op) {
 				*(op) = s->opc;

From 877ad35a82f0eaf50988527eac7c351d140234b9 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 14 Mar 2020 19:45:07 +0900
Subject: [PATCH 0776/1519] [qwaq] Rework the hierarchy again

It doesn't work right now because View unconditionally sends refresh to
its textContext, but textContext can be a draw buffer which does not
respond to refresh. Still, these changes (notably the assignment chain
in qwaq-group.r really pushed qfcc).
---
 ruamoko/qwaq/qwaq-app.h    | 11 +++++++----
 ruamoko/qwaq/qwaq-app.r    | 15 ++++++++-------
 ruamoko/qwaq/qwaq-group.h  |  3 ++-
 ruamoko/qwaq/qwaq-group.r  | 17 +++++++++--------
 ruamoko/qwaq/qwaq-screen.h |  1 -
 ruamoko/qwaq/qwaq-screen.r | 12 +++---------
 ruamoko/qwaq/qwaq-view.h   |  1 +
 ruamoko/qwaq/qwaq-view.r   |  4 ++++
 8 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-app.h b/ruamoko/qwaq/qwaq-app.h
index d8b899624..7062ad096 100644
--- a/ruamoko/qwaq/qwaq-app.h
+++ b/ruamoko/qwaq/qwaq-app.h
@@ -1,18 +1,21 @@
 #ifndef __qwaq_app_h
 #define __qwaq_app_h
 
+#include <Object.h>
+
 #include "event.h"
-#include "qwaq-group.h"
 
-@class Screen;
+@class Group;
 
-@interface QwaqApplication: Group
+@interface QwaqApplication: Object
 {
 	qwaq_event_t event;
 	qwaq_command endState;
-	Screen     *screen;
+
+	Group      *objects;
 }
 -run;
+-draw;
 -handleEvent: (qwaq_event_t *) event;
 @end
 
diff --git a/ruamoko/qwaq/qwaq-app.r b/ruamoko/qwaq/qwaq-app.r
index fffe51c7b..5b5889768 100644
--- a/ruamoko/qwaq/qwaq-app.r
+++ b/ruamoko/qwaq/qwaq-app.r
@@ -38,16 +38,17 @@ arp_end (void)
 	init_pair (1, COLOR_WHITE, COLOR_BLUE);
 	init_pair (2, COLOR_WHITE, COLOR_BLACK);
 
-	screen = [[Screen screen] retain];
-	[self insert:screen];
-	[screen setBackground: COLOR_PAIR (1)];
-	Rect r = *[screen getRect];
+	TextContext *screen = [TextContext screen];
+	objects = [[Group alloc] initWithContext: screen];
+
+	[screen bkgd: COLOR_PAIR (1)];
+	Rect r = { nil, [screen size] };
 	r.offset.x = r.extent.width / 4;
 	r.offset.y = r.extent.height / 4;
 	r.extent.width /= 2;
 	r.extent.height /= 2;
 	Window *w;
-	[self insert: w=[[Window windowWithRect: r] setBackground: COLOR_PAIR (2)]];
+	[objects insert: w=[[Window windowWithRect: r] setBackground: COLOR_PAIR (2)]];
 	//wprintf (w.window, "%d %d %d %d\n", r.offset.x, r.offset.y, r.extent.width, r.ylen);
 	return self;
 }
@@ -70,14 +71,14 @@ arp_end (void)
 
 -draw
 {
-	[super draw];
+	[objects draw];
 	[TextContext refresh];
 	return self;
 }
 
 -handleEvent: (qwaq_event_t *) event
 {
-	[screen handleEvent: event];
+	[objects handleEvent: event];
 	if (event.what == qe_key && event.key == '\x18') {
 		event.what = qe_command;
 		event.message.command = qc_exit;
diff --git a/ruamoko/qwaq/qwaq-group.h b/ruamoko/qwaq/qwaq-group.h
index b599a0c36..be251b243 100644
--- a/ruamoko/qwaq/qwaq-group.h
+++ b/ruamoko/qwaq/qwaq-group.h
@@ -31,8 +31,9 @@ typedef BOOL condition_func2 (id object, void *anObject, void *data);
 {
 	Array      *views;
 	int         focused;
-	TextContext *buffer;
+	id          buffer;	//FIXME id<TextContext> or sim
 }
+-initWithContext: (id) context;	//FIXME id<TextContext> or sim
 -insert: (View *) view;
 -remove: (View *) view;
 @end
diff --git a/ruamoko/qwaq/qwaq-group.r b/ruamoko/qwaq/qwaq-group.r
index 6b8296182..57a5eb8a6 100644
--- a/ruamoko/qwaq/qwaq-group.r
+++ b/ruamoko/qwaq/qwaq-group.r
@@ -66,11 +66,16 @@
 @end
 
 @implementation Group
--init
+
+-initWithContext: (id) context
 {
 	if (!(self = [super init])) {
 		return nil;
 	}
+	textContext = context;
+	absRect = rect = { nil, [textContext size] };
+	printf ("\n\nsize:%d %d\n\n", rect.extent.width, rect.extent.height);
+	buffer = [DrawBuffer buffer: rect.extent];
 	views = [[Array array] retain];
 	return self;
 }
@@ -92,6 +97,7 @@
 -insert: (View *) view
 {
 	[views addObject: view];
+	view.textContext = buffer;
 	return self;
 }
 
@@ -114,13 +120,8 @@ not_dont_draw (id aView, void *aGroup)
 {
 	View       *view = aView;
 	Group      *group = (Group *) aGroup;
-	if (!(view.options & ofDontDraw)) {
-		if (!view.textContext) {
-			view.textContext = group.buffer;
-		}
-		return YES;
-	}
-	return NO;
+
+	return !(view.options & ofDontDraw);
 }
 
 -draw
diff --git a/ruamoko/qwaq/qwaq-screen.h b/ruamoko/qwaq/qwaq-screen.h
index c51910d0e..9ec2ba8f3 100644
--- a/ruamoko/qwaq/qwaq-screen.h
+++ b/ruamoko/qwaq/qwaq-screen.h
@@ -10,7 +10,6 @@
 }
 +(Screen *) screen;
 -handleEvent: (qwaq_event_t *) event;
--setBackground: (int) ch;
 @end
 
 #endif//__qwaq_screen_h
diff --git a/ruamoko/qwaq/qwaq-screen.r b/ruamoko/qwaq/qwaq-screen.r
index 5b2db43ce..16d3f1be6 100644
--- a/ruamoko/qwaq/qwaq-screen.r
+++ b/ruamoko/qwaq/qwaq-screen.r
@@ -29,20 +29,14 @@
 
 -draw
 {
-	update_panels ();
-	[TextContext doupdate];
 	return self;
 }
 
 -redraw
 {
-	[textContext refresh];
-	return self;
-}
-
--setBackground: (int) ch
-{
-	[textContext bkgd:ch];
+	//update_panels ();
+	[TextContext refresh];
+	//[TextContext doupdate];
 	return self;
 }
 
diff --git a/ruamoko/qwaq/qwaq-view.h b/ruamoko/qwaq/qwaq-view.h
index 086b9d12d..e6b5bd47e 100644
--- a/ruamoko/qwaq/qwaq-view.h
+++ b/ruamoko/qwaq/qwaq-view.h
@@ -57,6 +57,7 @@ enum {
 -(struct Rect_s *)getRect;
 -draw;
 -redraw;
+-handleEvent: (qwaq_event_t *) event;
 
 - (void) refresh;
 - (void) mvprintf: (Point) pos, string fmt, ...;
diff --git a/ruamoko/qwaq/qwaq-view.r b/ruamoko/qwaq/qwaq-view.r
index 19df51b9c..b005dd4de 100644
--- a/ruamoko/qwaq/qwaq-view.r
+++ b/ruamoko/qwaq/qwaq-view.r
@@ -126,5 +126,9 @@ updateScreenCursor (View *view)
 	[textContext mvaddch: pos, ch];
 }
 
+-handleEvent: (qwaq_event_t *) event
+{
+	return self;
+}
 
 @end

From fea6381574f888cd625823a523c14070fe99bd49 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 14 Mar 2020 20:44:43 +0900
Subject: [PATCH 0777/1519] [gamecode] Rework debug type handling a little

Type encodings are used whenever they are available. For now, if they
are not, then everything is treated as void (which prints <void>, not
very useful). Most return statements and references to .return are now
very readable (excluding structs), and only params going through "..."
are a messy union.
---
 include/QF/pr_type.h     |  2 +-
 libs/gamecode/pr_debug.c | 93 ++++++++++++++++++++++++++--------------
 2 files changed, 61 insertions(+), 34 deletions(-)

diff --git a/include/QF/pr_type.h b/include/QF/pr_type.h
index c7fbc4b9c..c9e45185c 100644
--- a/include/QF/pr_type.h
+++ b/include/QF/pr_type.h
@@ -109,7 +109,7 @@ typedef struct qfot_type_s {
 
 typedef struct qfot_type_encodings_s {
 	pointer_t   types;
-	pr_int_t    size;
+	pr_uint_t   size;
 } qfot_type_encodings_t;
 
 ///@}
diff --git a/libs/gamecode/pr_debug.c b/libs/gamecode/pr_debug.c
index 9464c326c..979400244 100644
--- a/libs/gamecode/pr_debug.c
+++ b/libs/gamecode/pr_debug.c
@@ -83,6 +83,8 @@ typedef struct prdeb_resources_s {
 	struct pr_lineno_s *linenos;
 	pr_def_t   *local_defs;
 	pr_def_t   *type_encodings_def;
+	qfot_type_t void_type;
+	qfot_type_t *type_encodings[ev_type_count];
 } prdeb_resources_t;
 
 typedef struct {
@@ -352,6 +354,10 @@ pr_debug_clear (progs_t *pr, void *data)
 	pr->watch = 0;
 	pr->wp_conditional = 0;
 	pr->wp_val.integer_var = 0;
+
+	for (int i = 0; i < ev_type_count; i++ ) {
+		res->type_encodings[i] = &res->void_type;
+	}
 }
 
 static file_t *
@@ -420,7 +426,10 @@ PR_LoadDebug (progs_t *pr)
 	pr_uint_t   i;
 	pr_def_t   *def;
 	pr_type_t  *str = 0;
+	qfot_type_encodings_t *encodings = 0;
 	pointer_t   type_encodings = 0;
+	pointer_t   type_ptr;
+	qfot_type_t *type;
 
 	if (!pr_debug->int_val)
 		return 1;
@@ -508,8 +517,8 @@ PR_LoadDebug (progs_t *pr)
 	}
 	res->type_encodings_def = PR_FindGlobal (pr, ".type_encodings");
 	if (res->type_encodings_def) {
-		__auto_type encodings = &G_STRUCT (pr, qfot_type_encodings_t,
-										   res->type_encodings_def->ofs);
+		encodings = &G_STRUCT (pr, qfot_type_encodings_t,
+							   res->type_encodings_def->ofs);
 		type_encodings = encodings->types;
 	}
 	for (i = 0; i < res->debug->num_locals; i++) {
@@ -523,6 +532,16 @@ PR_LoadDebug (progs_t *pr)
 			res->local_defs[i].type_encoding += type_encodings;
 		}
 	}
+	if (encodings) {
+		for (type_ptr = 4; type_ptr < encodings->size;
+			 type_ptr += type->size) {
+			type = &G_STRUCT (pr, qfot_type_t, type_encodings + type_ptr);
+			if (type->meta == ty_basic
+				&& type->t.type >= 0 && type->t.type < ev_type_count) {
+				res->type_encodings[type->t.type] = type;
+			}
+		}
+	}
 	return 1;
 }
 
@@ -729,19 +748,15 @@ get_aux_function (progs_t *pr)
 	return res->auxfunction_map[func - pr->pr_functions];
 }
 
-static etype_t
-get_etype (progs_t *pr, int typeptr)
+static qfot_type_t *
+get_type (prdeb_resources_t *res, int typeptr)
 {
-	qfot_type_t *type;
+	progs_t    *pr = res->pr;
 
 	if (!typeptr) {
-		return ev_void;
+		return &res->void_type;
 	}
-	type = &G_STRUCT (pr, qfot_type_t, typeptr);
-	if (type->meta == ty_basic) {
-		return type->t.type;
-	}
-	return ev_void;
+	return &G_STRUCT (pr, qfot_type_t, typeptr);
 }
 
 pr_def_t *
@@ -881,19 +896,19 @@ pr_debug_find_def (progs_t *pr, pr_int_t ofs)
 }
 
 static const char *
-global_string (pr_debug_data_t *data, pointer_t ofs, etype_t etype,
+global_string (pr_debug_data_t *data, pointer_t ofs, qfot_type_t *type,
 			   int contents)
 {
 	progs_t    *pr = data->pr;
+	prdeb_resources_t *res = pr->pr_debug_resources;
 	dstring_t  *dstr = data->dstr;
 	pr_def_t   *def = NULL;
 	qfot_type_t dummy_type = { };
-	qfot_type_t *type;
 	const char *name = 0;
 
 	dstring_clearstr (dstr);
 
-	if (etype == ev_short) {
+	if (type && type->meta == ty_basic && type->t.type == ev_short) {
 		dsprintf (dstr, "%04x", (short) ofs);
 		return dstr->str;
 	}
@@ -919,16 +934,17 @@ global_string (pr_debug_data_t *data, pointer_t ofs, etype_t etype,
 		if (name) {
 			dstring_appendstr (dstr, "(");
 		}
-		if (def) {
-			if (!def->type_encoding) {
-				dummy_type.t.type = def->type;
-				type = &dummy_type;
+		if (!type) {
+			if (def) {
+				if (!def->type_encoding) {
+					dummy_type.t.type = def->type;
+					type = &dummy_type;
+				} else {
+					type = &G_STRUCT (pr, qfot_type_t, def->type_encoding);
+				}
 			} else {
-				type = &G_STRUCT (pr, qfot_type_t, def->type_encoding);
+				type = &res->void_type;
 			}
-		} else {
-			dummy_type.t.type = etype;
-			type = &dummy_type;
 		}
 		value_string (data, type, pr->pr_globals + ofs);
 		if (name) {
@@ -1118,7 +1134,7 @@ pr_debug_short_view (qfot_type_t *type, pr_type_t *value, void *_data)
 	__auto_type data = (pr_debug_data_t *) _data;
 	dstring_t  *dstr = data->dstr;
 
-	dasprintf (dstr, "%d", (short)value->integer_var);
+	dasprintf (dstr, "%04x", (short)value->integer_var);
 }
 
 static void
@@ -1232,8 +1248,9 @@ PR_Debug_Print (progs_t *pr, const char *expr)
 	}
 
 	print = parse_expression (pr, expr, 0);
-	if (print.type != ev_invalid) {
-		const char *s = global_string (&data, print.ofs, print.type, 1);
+	if (print.type_encoding) {
+		qfot_type_t *type = get_type (res, print.type_encoding);
+		const char *s = global_string (&data, print.ofs, type, 1);
 		Sys_Printf ("[%d] = %s\n", print.ofs, s);
 	}
 }
@@ -1300,7 +1317,7 @@ PR_PrintStatement (progs_t *pr, dstatement_t *s, int contents)
 				char        mode = fmt[1], opchar = fmt[2];
 				unsigned    parm_ind = 0;
 				pr_int_t    opval;
-				etype_t     optype = ev_void;
+				qfot_type_t *optype = ev_void;
 				func_t      func;
 
 				if (mode == 'P') {
@@ -1314,15 +1331,15 @@ PR_PrintStatement (progs_t *pr, dstatement_t *s, int contents)
 				switch (opchar) {
 					case 'a':
 						opval = s->a;
-						optype = op->type_a;
+						optype = res->type_encodings[op->type_a];
 						break;
 					case 'b':
 						opval = s->b;
-						optype = op->type_b;
+						optype = res->type_encodings[op->type_b];
 						break;
 					case 'c':
 						opval = s->c;
-						optype = op->type_c;
+						optype = res->type_encodings[op->type_c];
 						break;
 					case 'x':
 						if (mode == 'P') {
@@ -1337,8 +1354,9 @@ PR_PrintStatement (progs_t *pr, dstatement_t *s, int contents)
 					case 'R':
 						optype = ev_void;
 						aux_func = get_aux_function (pr);
-						if (aux_func)
-							optype = get_etype (pr, aux_func->return_type);
+						if (aux_func) {
+							optype = get_type (res, aux_func->return_type);
+						}
 						str = global_string (&data, opval, optype,
 											 contents & 1);
 						break;
@@ -1353,8 +1371,9 @@ PR_PrintStatement (progs_t *pr, dstatement_t *s, int contents)
 					case 'P':
 						parm_def = PR_Get_Param_Def (pr, call_func, parm_ind);
 						optype = ev_void;
-						if (parm_def)
-							optype = parm_def->type;
+						if (parm_def) {
+							optype = get_type (res, parm_def->type_encoding);
+						}
 						str = global_string (&data, opval, optype,
 											 contents & 1);
 						break;
@@ -1561,6 +1580,14 @@ PR_Debug_Init (progs_t *pr)
 	res->line = dstring_newstr ();
 	res->dstr = dstring_newstr ();
 
+	res->void_type.meta = ty_basic;
+	res->void_type.size = 4;
+	res->void_type.encoding = 0;
+	res->void_type.t.type = ev_void;
+	for (int i = 0; i < ev_type_count; i++ ) {
+		res->type_encodings[i] = &res->void_type;
+	}
+
 	PR_Resources_Register (pr, "PR_Debug", res, pr_debug_clear);
 	if (!file_hash) {
 		file_hash = Hash_NewTable (1024, file_get_key, file_free, 0);

From 9492f08536908e3ed01486d2dafe8e3312da9ddc Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 14 Mar 2020 21:03:01 +0900
Subject: [PATCH 0778/1519] [gamecode] Print structs as well as unions

Much better :)
---
 libs/gamecode/pr_debug.c | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/libs/gamecode/pr_debug.c b/libs/gamecode/pr_debug.c
index 979400244..c59a3968a 100644
--- a/libs/gamecode/pr_debug.c
+++ b/libs/gamecode/pr_debug.c
@@ -1147,16 +1147,8 @@ pr_debug_double_view (qfot_type_t *type, pr_type_t *value, void *_data)
 }
 
 static void
-pr_debug_struct_view (qfot_type_t *type, pr_type_t *value, void *_data)
-{
-	__auto_type data = (pr_debug_data_t *) _data;
-	dstring_t  *dstr = data->dstr;
-
-	dstring_appendstr (dstr, "<struct>");
-}
-
-static void
-pr_debug_union_view (qfot_type_t *type, pr_type_t *value, void *_data)
+pr_dump_struct (qfot_type_t *type, pr_type_t *value, void *_data,
+				const char *struct_type)
 {
 	__auto_type data = (pr_debug_data_t *) _data;
 	progs_t    *pr = data->pr;
@@ -1170,12 +1162,23 @@ pr_debug_union_view (qfot_type_t *type, pr_type_t *value, void *_data)
 		pr_type_t  *val = value + field->offset;
 		dasprintf (dstr, "%s=", PR_GetString (pr, field->name));
 		value_string (data, val_type, val);
-		if (i < strct->num_fields) {
+		if (i < strct->num_fields - 1) {
 			dstring_appendstr (dstr, ", ");
 		}
 	}
 	dstring_appendstr (dstr, "}");
-	dstring_appendstr (dstr, "<union>");
+	//dasprintf (dstr, "<%s>", struct_type);
+}
+static void
+pr_debug_struct_view (qfot_type_t *type, pr_type_t *value, void *_data)
+{
+	pr_dump_struct (type, value, _data, "struct");
+}
+
+static void
+pr_debug_union_view (qfot_type_t *type, pr_type_t *value, void *_data)
+{
+	pr_dump_struct (type, value, _data, "union");
 }
 
 static void

From 327d6929928741711673ecda854232825e24cbe7 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 14 Mar 2020 22:04:33 +0900
Subject: [PATCH 0779/1519] [qfcc] Correct order of @zero fields

This is part of what messed up float_val in the encoding for @params.
The other part is something in the linker type encoding merge code: it
may be too aggressive. It's also what messed up the size of @params.
---
 tools/qfcc/source/type.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/qfcc/source/type.c b/tools/qfcc/source/type.c
index 1c21e1d62..cdf7ca6df 100644
--- a/tools/qfcc/source/type.c
+++ b/tools/qfcc/source/type.c
@@ -937,7 +937,6 @@ init_types (void)
 {
 	static struct_def_t zero_struct[] = {
 		{"string_val",       &type_string},
-		{"double_val",       &type_double},
 		{"float_val",        &type_float},
 		{"entity_val",       &type_entity},
 		{"field_val",        &type_field},
@@ -949,6 +948,7 @@ init_types (void)
 		{"integer_val",      &type_integer},
 		{"uinteger_val",     &type_uinteger},
 		{"quaternion_val",   &type_quaternion},
+		{"double_val",       &type_double},
 		{0, 0}
 	};
 	static struct_def_t param_struct[] = {

From 20fd5eb80c6d580e2533f1ca9e95e18ab676dd0a Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 14 Mar 2020 22:07:36 +0900
Subject: [PATCH 0780/1519] [qfcc] Show def size when dumping defs

---
 tools/qfcc/source/dump_globals.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/qfcc/source/dump_globals.c b/tools/qfcc/source/dump_globals.c
index 157635f63..9b5900454 100644
--- a/tools/qfcc/source/dump_globals.c
+++ b/tools/qfcc/source/dump_globals.c
@@ -153,8 +153,9 @@ dump_def (progs_t *pr, pr_def_t *def, int indent)
 				break;
 		}
 	}
-	printf ("%*s %x %d %s %s:%x %s\n", indent * 12, "",
-			offset, saveglobal, name, type, def->type_encoding, comment);
+	printf ("%*s %x:%d %d %s %s:%x %s\n", indent * 12, "",
+			offset, def->size, saveglobal, name, type, def->type_encoding,
+			comment);
 }
 
 void

From 067bc264fafc175c314fb53d5d3d81cfa661a394 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 14 Mar 2020 22:08:27 +0900
Subject: [PATCH 0781/1519] [qfcc] Set local def size in debug sym file

It was getting random garbage. Not good for debuggers.
---
 tools/qfcc/source/obj_file.c | 1 +
 tools/qfcc/source/qfcc.c     | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/tools/qfcc/source/obj_file.c b/tools/qfcc/source/obj_file.c
index 6ceb1a74e..1a63eeea8 100644
--- a/tools/qfcc/source/obj_file.c
+++ b/tools/qfcc/source/obj_file.c
@@ -1172,6 +1172,7 @@ qfo_to_sym (qfo_t *qfo, int *size)
 			aux->local_defs = ld - locals;
 			for (j = 0; j < num_locals; j++, def++, ld++) {
 				ld->type = get_def_type (qfo, def->type);
+				ld->size = get_type_size (qfo, def->type);
 				ld->ofs = def->offset;
 				ld->name = def->name;
 				ld->type_encoding = def->type;
diff --git a/tools/qfcc/source/qfcc.c b/tools/qfcc/source/qfcc.c
index 6a7e1a039..7d0f8c800 100644
--- a/tools/qfcc/source/qfcc.c
+++ b/tools/qfcc/source/qfcc.c
@@ -448,7 +448,12 @@ finish_link (void)
 	} else {
 		int         size;
 		dprograms_t *progs;
+		pr_debug_header_t *sym = 0;
+		int         sym_size = 0;
 
+		if (options.code.debug) {
+			sym = qfo_to_sym (qfo, &sym_size);
+		}
 		progs = qfo_to_progs (qfo, &size);
 		//finish_compilation ();
 
@@ -462,9 +467,6 @@ finish_link (void)
 
 		WriteProgs (progs, size);
 		if (options.code.debug) {
-			pr_debug_header_t *sym;
-			int         sym_size = 0;
-			sym = qfo_to_sym (qfo, &sym_size);
 			sym->crc = CRC_Block ((byte *) progs, size);
 			WriteSym (sym, sym_size);
 		}

From 2f9f6d3aa9a8f2c671559fb5f9d108b348aafc54 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 14 Mar 2020 23:38:22 +0900
Subject: [PATCH 0782/1519] [gamecode] Relocate aux function return types

They are written with offsets relative to the type encodings base.
---
 libs/gamecode/pr_debug.c | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/libs/gamecode/pr_debug.c b/libs/gamecode/pr_debug.c
index c59a3968a..31589e1e1 100644
--- a/libs/gamecode/pr_debug.c
+++ b/libs/gamecode/pr_debug.c
@@ -496,6 +496,12 @@ PR_LoadDebug (progs_t *pr)
 	for (i = 0; i < pr->progs->numfunctions; i++)
 		res->auxfunction_map[i] = 0;
 
+	res->type_encodings_def = PR_FindGlobal (pr, ".type_encodings");
+	if (res->type_encodings_def) {
+		encodings = &G_STRUCT (pr, qfot_type_encodings_t,
+							   res->type_encodings_def->ofs);
+		type_encodings = encodings->types;
+	}
 	for (i = 0; i < res->debug->num_auxfunctions; i++) {
 		res->auxfunctions[i].function = LittleLong
 			(res->auxfunctions[i].function);
@@ -508,6 +514,9 @@ PR_LoadDebug (progs_t *pr)
 		res->auxfunctions[i].num_locals = LittleLong
 			(res->auxfunctions[i].num_locals);
 
+		if (type_encodings) {
+			res->auxfunctions[i].return_type += type_encodings;
+		}
 		res->auxfunction_map[res->auxfunctions[i].function] =
 			&res->auxfunctions[i];
 	}
@@ -515,12 +524,6 @@ PR_LoadDebug (progs_t *pr)
 		res->linenos[i].fa.func = LittleLong (res->linenos[i].fa.func);
 		res->linenos[i].line = LittleLong (res->linenos[i].line);
 	}
-	res->type_encodings_def = PR_FindGlobal (pr, ".type_encodings");
-	if (res->type_encodings_def) {
-		encodings = &G_STRUCT (pr, qfot_type_encodings_t,
-							   res->type_encodings_def->ofs);
-		type_encodings = encodings->types;
-	}
 	for (i = 0; i < res->debug->num_locals; i++) {
 		res->local_defs[i].type = LittleShort (res->local_defs[i].type);
 		res->local_defs[i].size = LittleShort (res->local_defs[i].size);
@@ -1320,7 +1323,7 @@ PR_PrintStatement (progs_t *pr, dstatement_t *s, int contents)
 				char        mode = fmt[1], opchar = fmt[2];
 				unsigned    parm_ind = 0;
 				pr_int_t    opval;
-				qfot_type_t *optype = ev_void;
+				qfot_type_t *optype = &res->void_type;
 				func_t      func;
 
 				if (mode == 'P') {
@@ -1355,7 +1358,7 @@ PR_PrintStatement (progs_t *pr, dstatement_t *s, int contents)
 				}
 				switch (mode) {
 					case 'R':
-						optype = ev_void;
+						optype = &res->void_type;
 						aux_func = get_aux_function (pr);
 						if (aux_func) {
 							optype = get_type (res, aux_func->return_type);
@@ -1373,7 +1376,7 @@ PR_PrintStatement (progs_t *pr, dstatement_t *s, int contents)
 						break;
 					case 'P':
 						parm_def = PR_Get_Param_Def (pr, call_func, parm_ind);
-						optype = ev_void;
+						optype = &res->void_type;
 						if (parm_def) {
 							optype = get_type (res, parm_def->type_encoding);
 						}

From 9a08a51ebdcc61e12377b40593364f653606920b Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 15 Mar 2020 01:32:38 +0900
Subject: [PATCH 0783/1519] [qfcc] Ensure progs defs are sorted by address

---
 tools/qfcc/source/obj_file.c | 50 +++++++++++++++++++++++++++++++++---
 1 file changed, 46 insertions(+), 4 deletions(-)

diff --git a/tools/qfcc/source/obj_file.c b/tools/qfcc/source/obj_file.c
index 1a63eeea8..45d01be47 100644
--- a/tools/qfcc/source/obj_file.c
+++ b/tools/qfcc/source/obj_file.c
@@ -31,6 +31,8 @@
 # include "config.h"
 #endif
 
+#define _GNU_SOURCE	// for qsort_r
+
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif
@@ -860,6 +862,17 @@ align_globals_size (unsigned size)
 	return RUP (size, 16 / sizeof (pr_type_t));
 }
 
+static int
+qfo_def_compare (const void *i1, const void *i2, void *d)
+{
+	__auto_type defs = (const qfo_def_t *) d;
+	unsigned    ind1 = *(unsigned *) i1;
+	unsigned    ind2 = *(unsigned *) i2;
+	const qfo_def_t *def1 = defs + ind1;
+	const qfo_def_t *def2 = defs + ind2;
+	return def1->offset - def2->offset;
+}
+
 dprograms_t *
 qfo_to_progs (qfo_t *qfo, int *size)
 {
@@ -887,6 +900,9 @@ qfo_to_progs (qfo_t *qfo, int *size)
 	int         big_func = 0;
 	pr_xdefs_t *xdefs = 0;
 	xdef_t     *xdef;
+	unsigned   *def_indices;
+	unsigned   *far_def_indices;
+	unsigned   *field_def_indices;
 
 	*size = RUP (sizeof (dprograms_t), 16);
 	progs = calloc (1, *size);
@@ -895,7 +911,7 @@ qfo_to_progs (qfo_t *qfo, int *size)
 	progs->numglobaldefs = qfo->spaces[qfo_near_data_space].num_defs;
 	//ddef offsets are 16 bits so the ddef ofs will likely be invalid
 	//thus it will be forced invalid and the true offset written to the
-	//symbols file if it is created (fa
+	//.xdefs array in the progs file
 	progs->numglobaldefs += qfo->spaces[qfo_far_data_space].num_defs;
 	progs->numfielddefs = qfo->spaces[qfo_entity_space].num_defs;
 	progs->numfunctions = qfo->num_funcs + 1;
@@ -936,6 +952,29 @@ qfo_to_progs (qfo_t *qfo, int *size)
 	memset (progs + 1, 0, *size - sizeof (dprograms_t));
 	data += RUP (sizeof (dprograms_t), 16);
 
+	def_indices = alloca ((progs->numglobaldefs + progs->numfielddefs)
+						  * sizeof (*def_indices));
+	far_def_indices = def_indices + qfo->spaces[qfo_near_data_space].num_defs;
+	field_def_indices = def_indices + progs->numglobaldefs;
+	for (unsigned i = 0; i < qfo->spaces[qfo_near_data_space].num_defs; i++) {
+		def_indices[i] = i;
+	}
+	for (unsigned i = 0; i < qfo->spaces[qfo_far_data_space].num_defs; i++) {
+		far_def_indices[i] = i;
+	}
+	for (unsigned i = 0; i < qfo->spaces[qfo_entity_space].num_defs; i++) {
+		field_def_indices[i] = i;
+	}
+	qsort_r (def_indices, qfo->spaces[qfo_near_data_space].num_defs,
+			 sizeof (unsigned), qfo_def_compare,
+			 qfo->spaces[qfo_near_data_space].defs);
+	qsort_r (far_def_indices, qfo->spaces[qfo_far_data_space].num_defs,
+			 sizeof (unsigned), qfo_def_compare,
+			 qfo->spaces[qfo_far_data_space].defs);
+	qsort_r (field_def_indices, qfo->spaces[qfo_entity_space].num_defs,
+			 sizeof (unsigned), qfo_def_compare,
+			 qfo->spaces[qfo_entity_space].defs);
+
 	progs->ofs_strings = data - (byte *) progs;
 	strings = (char *) data;
 	data += RUP (progs->numstrings * sizeof (char), 16);
@@ -992,7 +1031,8 @@ qfo_to_progs (qfo_t *qfo, int *size)
 	}
 
 	for (i = 0; i < qfo->spaces[qfo_near_data_space].num_defs; i++) {
-		qfo_def_t  *def = qfo->spaces[qfo_near_data_space].defs + i;
+		unsigned    ind = def_indices[i];
+		qfo_def_t  *def = qfo->spaces[qfo_near_data_space].defs + ind;
 		const char *defname = QFO_GETSTR (qfo, def->name);
 		if (!strcmp (defname, ".type_encodings"))
 			types_def = def;
@@ -1002,7 +1042,8 @@ qfo_to_progs (qfo_t *qfo, int *size)
 	}
 
 	for (i = 0; i < qfo->spaces[qfo_far_data_space].num_defs; i++) {
-		qfo_def_t  *def = qfo->spaces[qfo_far_data_space].defs + i;
+		unsigned    ind = far_def_indices[i];
+		qfo_def_t  *def = qfo->spaces[qfo_far_data_space].defs + ind;
 		def->offset += far_data - globals;
 		convert_def (qfo, def, globaldefs);
 		// the correct offset will be written to the far data space
@@ -1015,7 +1056,8 @@ qfo_to_progs (qfo_t *qfo, int *size)
 	}
 
 	for (i = 0; i < qfo->spaces[qfo_entity_space].num_defs; i++) {
-		convert_def (qfo, qfo->spaces[qfo_entity_space].defs + i,
+		unsigned    ind = field_def_indices[i];
+		convert_def (qfo, qfo->spaces[qfo_entity_space].defs + ind,
 					 fielddefs + i);
 	}
 

From 968de155a1c08fc2dd4e3f3e6836c42e26e33c20 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 15 Mar 2020 01:33:25 +0900
Subject: [PATCH 0784/1519] [qfcc] Make some counts unsigned

How do you have -1 def?
---
 tools/qfcc/include/obj_file.h | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/tools/qfcc/include/obj_file.h b/tools/qfcc/include/obj_file.h
index ae1986245..62d7b80f0 100644
--- a/tools/qfcc/include/obj_file.h
+++ b/tools/qfcc/include/obj_file.h
@@ -60,13 +60,13 @@
 */
 typedef struct qfo_header_s {
 	int8_t      qfo[4];			///< identifier string (includes nul) (#QFO)
-	pr_int_t    version;		///< QFO format version (#QFO_VERSION)
-	pr_int_t    num_spaces;
-	pr_int_t    num_relocs;		///< number of relocation records
-	pr_int_t    num_defs;		///< number of def records
-	pr_int_t    num_funcs;		///< number of function records
-	pr_int_t    num_lines;		///< number of line records
-	pr_int_t    num_loose_relocs;	///< number of loose relocation records
+	pr_uint_t   version;		///< QFO format version (#QFO_VERSION)
+	pr_uint_t   num_spaces;
+	pr_uint_t   num_relocs;		///< number of relocation records
+	pr_uint_t   num_defs;		///< number of def records
+	pr_uint_t   num_funcs;		///< number of function records
+	pr_uint_t   num_lines;		///< number of line records
+	pr_uint_t   num_loose_relocs;	///< number of loose relocation records
 								///< (included in num_relocs)
 } qfo_header_t;
 

From 3d62a7f25377c3b31efedc3a3211146d1d156a5e Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 15 Mar 2020 02:48:13 +0900
Subject: [PATCH 0785/1519] [gamecode] Use fuzzy bsearch to find defs by
 address

The idea is to find th def that contains the address. Had to write my
own bsearch (well... lifted from wikipedia) because libc's is exact. The
defs are assumed to be sorted (which qfcc now ensures when it writes
progs and sym files).
---
 include/QF/progs.h         |  2 ++
 libs/gamecode/pr_resolve.c | 42 ++++++++++++++++++++++----------------
 2 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/include/QF/progs.h b/include/QF/progs.h
index 2659ce303..7dc7e4af2 100644
--- a/include/QF/progs.h
+++ b/include/QF/progs.h
@@ -321,6 +321,8 @@ void ED_EntityParseFunction (progs_t *pr);
 */
 ///@{
 
+pr_def_t *PR_SearchDefs (pr_def_t *defs, unsigned num_defs, pointer_t offset)
+	__attribute__((pure));
 pr_def_t *PR_FieldAtOfs (progs_t *pr, pointer_t ofs) __attribute__((pure));
 pr_def_t *PR_GlobalAtOfs (progs_t *pr, pointer_t ofs) __attribute__((pure));
 
diff --git a/libs/gamecode/pr_resolve.c b/libs/gamecode/pr_resolve.c
index 5297f101a..03e6949a2 100644
--- a/libs/gamecode/pr_resolve.c
+++ b/libs/gamecode/pr_resolve.c
@@ -43,32 +43,38 @@
 
 static const char param_str[] = ".param_0";
 
+pr_def_t *
+PR_SearchDefs (pr_def_t *defs, unsigned num_defs, pointer_t offset)
+{
+	// fuzzy bsearh
+	unsigned    left = 0;
+	unsigned    right = num_defs - 1;
+	unsigned    mid;
+
+	while (left != right) {
+		mid = (left + right + 1) / 2;
+		if (defs[mid].ofs > offset) {
+			right = mid - 1;
+		} else {
+			left = mid;
+		}
+	}
+	if (defs[left].ofs <= offset) {
+		return defs + left;
+	}
+	return 0;
+}
+
 pr_def_t *
 PR_GlobalAtOfs (progs_t * pr, pointer_t ofs)
 {
-	pr_def_t   *def;
-	pr_uint_t   i;
-
-	for (i = 0; i < pr->progs->numglobaldefs; i++) {
-		def = &pr->pr_globaldefs[i];
-		if (def->ofs == ofs)
-			return def;
-	}
-	return NULL;
+	return PR_SearchDefs (pr->pr_globaldefs, pr->progs->numglobaldefs, ofs);
 }
 
 VISIBLE pr_def_t *
 PR_FieldAtOfs (progs_t * pr, pointer_t ofs)
 {
-	pr_def_t   *def;
-	pr_uint_t   i;
-
-	for (i = 0; i < pr->progs->numfielddefs; i++) {
-		def = &pr->pr_fielddefs[i];
-		if (def->ofs == ofs)
-			return def;
-	}
-	return NULL;
+	return PR_SearchDefs (pr->pr_fielddefs, pr->progs->numfielddefs, ofs);
 }
 
 VISIBLE pr_def_t *

From 99f89840f9290aeb465a4b2985ced2ce9f15add0 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 15 Mar 2020 02:51:29 +0900
Subject: [PATCH 0786/1519] [gamecode] Show containing def and relative offset

No more guessing when accessing structure field members. Next is ivars,
I guess.
---
 include/QF/progs.h       |  2 +-
 libs/gamecode/pr_debug.c | 70 ++++++++++++++++++++++++----------------
 2 files changed, 43 insertions(+), 29 deletions(-)

diff --git a/include/QF/progs.h b/include/QF/progs.h
index 7dc7e4af2..c615e6d14 100644
--- a/include/QF/progs.h
+++ b/include/QF/progs.h
@@ -1649,7 +1649,7 @@ pr_lineno_t *PR_Find_Lineno (progs_t *pr, pr_uint_t addr) __attribute__((pure));
 const char *PR_Get_Source_File (progs_t *pr, pr_lineno_t *lineno) __attribute__((pure));
 const char *PR_Get_Source_Line (progs_t *pr, pr_uint_t addr);
 pr_def_t *PR_Get_Param_Def (progs_t *pr, dfunction_t *func, unsigned parm) __attribute__((pure));
-pr_def_t *PR_Get_Local_Def (progs_t *pr, pointer_t offs) __attribute__((pure));
+pr_def_t *PR_Get_Local_Def (progs_t *pr, pointer_t *offs) __attribute__((pure));
 void PR_PrintStatement (progs_t *pr, dstatement_t *s, int contents);
 void PR_DumpState (progs_t *pr);
 void PR_StackTrace (progs_t *pr);
diff --git a/libs/gamecode/pr_debug.c b/libs/gamecode/pr_debug.c
index 31589e1e1..d2ed5e7f1 100644
--- a/libs/gamecode/pr_debug.c
+++ b/libs/gamecode/pr_debug.c
@@ -763,12 +763,13 @@ get_type (prdeb_resources_t *res, int typeptr)
 }
 
 pr_def_t *
-PR_Get_Local_Def (progs_t *pr, pointer_t offs)
+PR_Get_Local_Def (progs_t *pr, pointer_t *offset)
 {
 	prdeb_resources_t *res = pr->pr_debug_resources;
-	pr_uint_t   i;
 	dfunction_t *func;
 	pr_auxfunction_t *aux_func;
+	pointer_t   offs = *offset;
+	pr_def_t   *def;
 
 	if (!pr->pr_xfunction)
 		return 0;
@@ -781,10 +782,11 @@ PR_Get_Local_Def (progs_t *pr, pointer_t offs)
 	offs -= func->parm_start;
 	if (offs >= func->locals)
 		return 0;
-	for (i = 0; i < aux_func->num_locals; i++)
-		if (res->local_defs[aux_func->local_defs + i].ofs == offs)
-			return &res->local_defs[aux_func->local_defs + i];
-	return 0;
+	if ((def =  PR_SearchDefs (res->local_defs + aux_func->local_defs,
+							   aux_func->num_locals, offs))) {
+		*offset = offs - def->ofs;
+	}
+	return def;
 }
 
 VISIBLE void
@@ -886,20 +888,28 @@ value_string (pr_debug_data_t *data, qfot_type_t *type, pr_type_t *value)
 }
 
 static pr_def_t *
-pr_debug_find_def (progs_t *pr, pr_int_t ofs)
+pr_debug_find_def (progs_t *pr, pointer_t *ofs)
 {
 	prdeb_resources_t *res = pr->pr_debug_resources;
 	pr_def_t   *def = 0;
 
-	if (pr_debug->int_val && res->debug)
+	if (*ofs >= pr->progs->numglobals) {
+		return 0;
+	}
+	if (pr_debug->int_val && res->debug) {
 		def = PR_Get_Local_Def (pr, ofs);
-	if (!def)
-		def = PR_GlobalAtOfs (pr, ofs);
+	}
+	if (!def) {
+		def = PR_GlobalAtOfs (pr, *ofs);
+		if (def) {
+			*ofs -= def->ofs;
+		}
+	}
 	return def;
 }
 
 static const char *
-global_string (pr_debug_data_t *data, pointer_t ofs, qfot_type_t *type,
+global_string (pr_debug_data_t *data, pointer_t offset, qfot_type_t *type,
 			   int contents)
 {
 	progs_t    *pr = data->pr;
@@ -908,29 +918,34 @@ global_string (pr_debug_data_t *data, pointer_t ofs, qfot_type_t *type,
 	pr_def_t   *def = NULL;
 	qfot_type_t dummy_type = { };
 	const char *name = 0;
+	pointer_t   offs = offset;
 
 	dstring_clearstr (dstr);
 
 	if (type && type->meta == ty_basic && type->t.type == ev_short) {
-		dsprintf (dstr, "%04x", (short) ofs);
+		dsprintf (dstr, "%04x", (short) offset);
 		return dstr->str;
 	}
 
-	if (ofs > pr->globals_size) {
-		dsprintf (dstr, "%08x out of bounds", ofs);
+	if (offset > pr->globals_size) {
+		dsprintf (dstr, "%08x out of bounds", offset);
 		return dstr->str;
 	}
 
-	def = pr_debug_find_def (pr, ofs);
+	def = pr_debug_find_def (pr, &offs);
 	if (!def || !PR_StringValid (pr, def->name)
 		|| !*(name = PR_GetString (pr, def->name))) {
-		dsprintf (dstr, "[$%x]", ofs);
+		dsprintf (dstr, "[$%x]", offset);
 	}
 	if (name) {
 		if (strequal (name, "IMMEDIATE") || strequal (name, ".imm")) {
 			contents = 1;
 		} else {
-			dsprintf (dstr, "%s", name);
+			if (offs) {
+				dsprintf (dstr, "{%s + %u}", name, offs);
+			} else {
+				dsprintf (dstr, "%s", name);
+			}
 		}
 	}
 	if (contents) {
@@ -949,7 +964,7 @@ global_string (pr_debug_data_t *data, pointer_t ofs, qfot_type_t *type,
 				type = &res->void_type;
 			}
 		}
-		value_string (data, type, pr->pr_globals + ofs);
+		value_string (data, type, pr->pr_globals + offset);
 		if (name) {
 			dstring_appendstr (dstr, ")");
 		}
@@ -1084,21 +1099,20 @@ pr_debug_pointer_view (qfot_type_t *type, pr_type_t *value, void *_data)
 {
 	__auto_type data = (pr_debug_data_t *) _data;
 	progs_t    *pr = data->pr;
-	prdeb_resources_t *res = pr->pr_debug_resources; //FIXME
 	dstring_t  *dstr = data->dstr;
-	pointer_t   ofs = value->integer_var;
+	pointer_t   offset = value->integer_var;
+	pointer_t   offs = offset;
 	pr_def_t   *def = 0;
 
-	if (pr_debug->int_val && res->debug) {
-		def = PR_Get_Local_Def (pr, ofs);
-	}
-	if (!def) {
-		def = PR_GlobalAtOfs (pr, ofs);
-	}
+	def = pr_debug_find_def (pr, &offs);
 	if (def && def->name) {
-		dasprintf (dstr, "&%s", PR_GetString (pr, def->name));
+		if (offs) {
+			dasprintf (dstr, "&%s + %u", PR_GetString (pr, def->name), offs);
+		} else {
+			dasprintf (dstr, "&%s", PR_GetString (pr, def->name));
+		}
 	} else {
-		dasprintf (dstr, "[$%x]", ofs);
+		dasprintf (dstr, "[$%x]", offset);
 	}
 }
 

From e3a1413ad3b1a30eb4ee9d8be23044548fd31116 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 15 Mar 2020 10:06:37 +0900
Subject: [PATCH 0787/1519] [gamecode] Tweak output for lea

---
 libs/gamecode/pr_opcode.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libs/gamecode/pr_opcode.c b/libs/gamecode/pr_opcode.c
index 3d3e8fe17..30ad8b06e 100644
--- a/libs/gamecode/pr_opcode.c
+++ b/libs/gamecode/pr_opcode.c
@@ -544,12 +544,12 @@ VISIBLE const opcode_t pr_opcodes[] = {
 	{"&", "lea", OP_LEA, false,
 	 ev_pointer, ev_integer, ev_pointer,
 	 PROG_VERSION,
-	 "%Ga, %Gb, %gc",
+	 "(%Ga + %Gb), %gc",
 	},
 	{"&", "leai", OP_LEAI, false,
 	 ev_pointer, ev_short, ev_pointer,
 	 PROG_VERSION,
-	 "%Ga, %sb, %gc",
+	 "(%Ga + %sb), %gc",
 	},
 
 	{"<CONV>", "conv.if", OP_CONV_IF, false,

From e1140d476aa3f9c14cfa13ee1cc8e918fdc3fd24 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 15 Mar 2020 16:19:45 +0900
Subject: [PATCH 0788/1519] [qfcc] Handle syntax errors in method protos

---
 tools/qfcc/source/qc-parse.y | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/qfcc/source/qc-parse.y b/tools/qfcc/source/qc-parse.y
index 6ca42392c..7f257505b 100644
--- a/tools/qfcc/source/qc-parse.y
+++ b/tools/qfcc/source/qc-parse.y
@@ -2020,6 +2020,10 @@ methodproto
 			$2->instance = 0;
 			$$ = $2;
 		}
+	| '-' error ';'
+		{ $$ = new_method (&type_id, new_param ("", 0, 0), 0); }
+	| '+' error ';'
+		{ $$ = new_method (&type_id, new_param ("", 0, 0), 0); }
 	| '-' methoddecl ';'
 		{
 			$2->instance = 1;

From fb33a7f2a7df64dec778ba55eaedb987f894712b Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 15 Mar 2020 20:27:43 +0900
Subject: [PATCH 0789/1519] [qfcc] Remove "impossible" code

It is not possible to adorn Class with protocols, so no need to check
for them when checking if a type is a class.
---
 tools/qfcc/include/class.h | 2 +-
 tools/qfcc/source/class.c  | 9 ---------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/tools/qfcc/include/class.h b/tools/qfcc/include/class.h
index 7f7f0920d..a468e19b5 100644
--- a/tools/qfcc/include/class.h
+++ b/tools/qfcc/include/class.h
@@ -116,7 +116,7 @@ struct symbol_s;
 
 int obj_is_id (const struct type_s *type) __attribute__((pure));
 int obj_is_class (const struct type_s *type) __attribute__((pure));
-int obj_is_Class (const struct type_s *type) __attribute__((pure));
+int obj_is_Class (const struct type_s *type) __attribute__((const));
 int obj_is_classptr (const struct type_s *type) __attribute__((pure));
 int obj_types_assignable (const struct type_s *dst, const struct type_s *src);
 
diff --git a/tools/qfcc/source/class.c b/tools/qfcc/source/class.c
index 647a64716..d1322c174 100644
--- a/tools/qfcc/source/class.c
+++ b/tools/qfcc/source/class.c
@@ -345,15 +345,6 @@ obj_is_Class (const type_t *type)
 {
 	if (type == &type_Class)
 		return 1;
-	// type may be a qualified Class, in which case it will be a pointer to
-	// a qualified obj_class struct
-	if (type->type != ev_pointer)
-		return 0;
-	if (!is_struct (type->t.fldptr.type))
-		return 0;
-	// if the the symtabs match, then type is Class in disguise
-	if (type->t.fldptr.type->t.symtab == type_obj_class.t.symtab)
-		return 1;
 	return 0;
 }
 

From ea042cf87aba79500da216a23df2f33fb146b035 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 15 Mar 2020 20:50:04 +0900
Subject: [PATCH 0790/1519] [qfcc] Split out the obj-qc specific expr code

---
 tools/qfcc/source/Makefile.am |   2 +-
 tools/qfcc/source/expr.c      | 200 -------------------------
 tools/qfcc/source/expr_obj.c  | 266 ++++++++++++++++++++++++++++++++++
 3 files changed, 267 insertions(+), 201 deletions(-)
 create mode 100644 tools/qfcc/source/expr_obj.c

diff --git a/tools/qfcc/source/Makefile.am b/tools/qfcc/source/Makefile.am
index cfd31afbc..bbaf06ee6 100644
--- a/tools/qfcc/source/Makefile.am
+++ b/tools/qfcc/source/Makefile.am
@@ -41,7 +41,7 @@ bin_SCRIPTS=	qfpreqcc
 common_src=\
 	class.c codespace.c constfold.c cpp.c dags.c debug.c def.c defspace.c \
 	diagnostic.c dot.c dot_dag.c dot_expr.c dot_flow.c dot_sblock.c emit.c \
-	expr.c expr_assign.c expr_binary.c expr_bool.c expr_compound.c \
+	expr.c expr_assign.c expr_binary.c expr_bool.c expr_compound.c expr_obj.c \
 	flow.c function.c grab.c \
 	idstuff.c \
 	linker.c method.c \
diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index 72624364c..8a702714d 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -1099,28 +1099,6 @@ expr_short (expr_t *e)
 	internal_error (e, "not a short constant");
 }
 
-expr_t *
-new_self_expr (void)
-{
-	symbol_t   *sym;
-
-	sym = make_symbol (".self", &type_entity, pr.near_data, sc_extern);
-	if (!sym->table)
-		symtab_addsymbol (pr.symtab, sym);
-	return new_symbol_expr (sym);
-}
-
-expr_t *
-new_this_expr (void)
-{
-	symbol_t   *sym;
-
-	sym = make_symbol (".this", field_type (&type_id), pr.near_data, sc_extern);
-	if (!sym->table)
-		symtab_addsymbol (pr.symtab, sym);
-	return new_symbol_expr (sym);
-}
-
 expr_t *
 new_alias_expr (type_t *type, expr_t *expr)
 {
@@ -2579,51 +2557,6 @@ cast_expr (type_t *dstType, expr_t *e)
 	return c;
 }
 
-expr_t *
-selector_expr (keywordarg_t *selector)
-{
-	dstring_t  *sel_id = dstring_newstr ();
-	expr_t     *sel;
-	symbol_t   *sel_sym;
-	symbol_t   *sel_table;
-	int         index;
-
-	selector = copy_keywordargs (selector);
-	selector = (keywordarg_t *) reverse_params ((param_t *) selector);
-	selector_name (sel_id, selector);
-	index = selector_index (sel_id->str);
-	index *= type_size (type_SEL.t.fldptr.type);
-	sel_sym = make_symbol ("_OBJ_SELECTOR_TABLE_PTR", &type_SEL,
-						   pr.near_data, sc_static);
-	if (!sel_sym->table) {
-		symtab_addsymbol (pr.symtab, sel_sym);
-		sel_table = make_symbol ("_OBJ_SELECTOR_TABLE",
-								 array_type (type_SEL.t.fldptr.type, 0),
-								 pr.far_data, sc_extern);
-		if (!sel_table->table)
-			symtab_addsymbol (pr.symtab, sel_table);
-		reloc_def_def (sel_table->s.def, sel_sym->s.def);
-	}
-	sel = new_symbol_expr (sel_sym);
-	dstring_delete (sel_id);
-	sel = new_binary_expr ('&', sel, new_short_expr (index));
-	sel->e.expr.type = &type_SEL;
-	return sel;
-}
-
-expr_t *
-protocol_expr (const char *protocol_name)
-{
-	protocol_t *protocol = get_protocol (protocol_name, 0);
-
-	if (!protocol) {
-		return error (0, "cannot find protocol declaration for `%s'",
-					  protocol_name);
-	}
-	class_t    *proto_class = get_class (new_symbol ("Protocol"), 1);
-	return new_pointer_expr (0, proto_class->type, protocol_def (protocol));
-}
-
 expr_t *
 encode_expr (type_t *type)
 {
@@ -2636,139 +2569,6 @@ encode_expr (type_t *type)
 	return e;
 }
 
-expr_t *
-super_expr (class_type_t *class_type)
-{
-	symbol_t   *sym;
-	expr_t     *super;
-	expr_t     *e;
-	expr_t     *super_block;
-	class_t    *class;
-
-	if (!class_type)
-		return error (0, "`super' used outside of class implementation");
-
-	class = extract_class (class_type);
-
-	if (!class->super_class)
-		return error (0, "%s has no super class", class->name);
-
-	sym = symtab_lookup (current_symtab, ".super");
-	if (!sym || sym->table != current_symtab) {
-		sym = new_symbol_type (".super", &type_obj_super);
-		initialize_def (sym, 0, current_symtab->space, sc_local);
-	}
-	super = new_symbol_expr (sym);
-
-	super_block = new_block_expr ();
-
-	e = assign_expr (field_expr (super, new_name_expr ("self")),
-								 new_name_expr ("self"));
-	append_expr (super_block, e);
-
-	e = new_symbol_expr (class_pointer_symbol (class));
-	e = assign_expr (field_expr (super, new_name_expr ("class")),
-					 field_expr (e, new_name_expr ("super_class")));
-	append_expr (super_block, e);
-
-	e = address_expr (super, 0, 0);
-	super_block->e.block.result = e;
-	return super_block;
-}
-
-expr_t *
-message_expr (expr_t *receiver, keywordarg_t *message)
-{
-	expr_t     *args = 0, **a = &args;
-	expr_t     *selector = selector_expr (message);
-	expr_t     *call;
-	keywordarg_t *m;
-	int         self = 0, super = 0, class_msg = 0;
-	type_t     *rec_type;
-	type_t     *return_type;
-	type_t     *method_type = &type_IMP;
-	class_t    *class = 0;
-	method_t   *method;
-	expr_t     *send_msg;
-
-	if (receiver->type == ex_symbol
-		&& strcmp (receiver->e.symbol->name, "super") == 0) {
-		super = 1;
-
-		receiver = super_expr (current_class);
-
-		if (receiver->type == ex_error)
-			return receiver;
-		receiver = cast_expr (&type_id, receiver);	//FIXME better way?
-		class = extract_class (current_class);
-	} else {
-		if (receiver->type == ex_symbol) {
-			if (strcmp (receiver->e.symbol->name, "self") == 0)
-				self = 1;
-			if (receiver->e.symbol->sy_type == sy_class) {
-				class = receiver->e.symbol->type->t.class;
-				class_msg = 1;
-				receiver = new_symbol_expr (class_pointer_symbol (class));
-			}
-		} else if (receiver->type == ex_nil) {
-			convert_nil (receiver, &type_id);
-		}
-		rec_type = get_type (receiver);
-
-		if (receiver->type == ex_error)
-			return receiver;
-
-		if (rec_type == &type_id || rec_type == &type_Class) {
-		} else {
-			if (rec_type->type == ev_pointer)
-				rec_type = rec_type->t.fldptr.type;
-			if (!obj_is_class (rec_type))
-				return error (receiver, "not a class/object");
-
-			if (self) {
-				if (!class)
-					class = extract_class (current_class);
-				if (rec_type == &type_obj_class)
-					class_msg = 1;
-			} else {
-				if (!class)
-					class = rec_type->t.class;
-			}
-		}
-	}
-
-	return_type = &type_id;
-	method = class_message_response (class, class_msg, selector);
-	if (method)
-		return_type = method->type->t.func.type;
-
-	for (m = message; m; m = m->next) {
-		*a = m->expr;
-		while ((*a)) {
-			expr_file_line (selector, *a);
-			a = &(*a)->next;
-		}
-	}
-	*a = selector;
-	a = &(*a)->next;
-	*a = receiver;
-
-	send_msg = expr_file_line (send_message (super), receiver);
-	if (method) {
-		expr_t      *err;
-		if ((err = method_check_params (method, args)))
-			return err;
-		method_type = method->type;
-	}
-	call = build_function_call (send_msg, method_type, args);
-
-	if (call->type == ex_error)
-		return receiver;
-
-	call->e.block.result = new_ret_expr (return_type);
-	return call;
-}
-
 expr_t *
 sizeof_expr (expr_t *expr, struct type_s *type)
 {
diff --git a/tools/qfcc/source/expr_obj.c b/tools/qfcc/source/expr_obj.c
new file mode 100644
index 000000000..fe04e2c98
--- /dev/null
+++ b/tools/qfcc/source/expr_obj.c
@@ -0,0 +1,266 @@
+/*
+	expr_obj.c
+
+	Objective-QuakeC expression construction and manipulations
+
+	Copyright (C) 2001 Bill Currie <bill@taniwha.org>
+
+	Author: Bill Currie <bill@taniwha.org>
+	Date: 2001/06/15
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#include <stdlib.h>
+
+#include "QF/alloc.h"
+#include "QF/dstring.h"
+#include "QF/mathlib.h"
+#include "QF/sys.h"
+#include "QF/va.h"
+
+#include "qfcc.h"
+#include "class.h"
+#include "def.h"
+#include "defspace.h"
+#include "diagnostic.h"
+#include "emit.h"
+#include "expr.h"
+#include "function.h"
+#include "idstuff.h"
+#include "method.h"
+#include "options.h"
+#include "reloc.h"
+#include "shared.h"
+#include "strpool.h"
+#include "struct.h"
+#include "symtab.h"
+#include "type.h"
+#include "value.h"
+#include "qc-parse.h"
+
+expr_t *
+new_self_expr (void)
+{
+	symbol_t   *sym;
+
+	sym = make_symbol (".self", &type_entity, pr.near_data, sc_extern);
+	if (!sym->table)
+		symtab_addsymbol (pr.symtab, sym);
+	return new_symbol_expr (sym);
+}
+
+expr_t *
+new_this_expr (void)
+{
+	symbol_t   *sym;
+
+	sym = make_symbol (".this", field_type (&type_id), pr.near_data, sc_extern);
+	if (!sym->table)
+		symtab_addsymbol (pr.symtab, sym);
+	return new_symbol_expr (sym);
+}
+
+expr_t *
+selector_expr (keywordarg_t *selector)
+{
+	dstring_t  *sel_id = dstring_newstr ();
+	expr_t     *sel;
+	symbol_t   *sel_sym;
+	symbol_t   *sel_table;
+	int         index;
+
+	selector = copy_keywordargs (selector);
+	selector = (keywordarg_t *) reverse_params ((param_t *) selector);
+	selector_name (sel_id, selector);
+	index = selector_index (sel_id->str);
+	index *= type_size (type_SEL.t.fldptr.type);
+	sel_sym = make_symbol ("_OBJ_SELECTOR_TABLE_PTR", &type_SEL,
+						   pr.near_data, sc_static);
+	if (!sel_sym->table) {
+		symtab_addsymbol (pr.symtab, sel_sym);
+		sel_table = make_symbol ("_OBJ_SELECTOR_TABLE",
+								 array_type (type_SEL.t.fldptr.type, 0),
+								 pr.far_data, sc_extern);
+		if (!sel_table->table)
+			symtab_addsymbol (pr.symtab, sel_table);
+		reloc_def_def (sel_table->s.def, sel_sym->s.def);
+	}
+	sel = new_symbol_expr (sel_sym);
+	dstring_delete (sel_id);
+	sel = new_binary_expr ('&', sel, new_short_expr (index));
+	sel->e.expr.type = &type_SEL;
+	return sel;
+}
+
+expr_t *
+protocol_expr (const char *protocol_name)
+{
+	protocol_t *protocol = get_protocol (protocol_name, 0);
+
+	if (!protocol) {
+		return error (0, "cannot find protocol declaration for `%s'",
+					  protocol_name);
+	}
+	class_t    *proto_class = get_class (new_symbol ("Protocol"), 1);
+	return new_pointer_expr (0, proto_class->type, protocol_def (protocol));
+}
+
+expr_t *
+super_expr (class_type_t *class_type)
+{
+	symbol_t   *sym;
+	expr_t     *super;
+	expr_t     *e;
+	expr_t     *super_block;
+	class_t    *class;
+
+	if (!class_type)
+		return error (0, "`super' used outside of class implementation");
+
+	class = extract_class (class_type);
+
+	if (!class->super_class)
+		return error (0, "%s has no super class", class->name);
+
+	sym = symtab_lookup (current_symtab, ".super");
+	if (!sym || sym->table != current_symtab) {
+		sym = new_symbol_type (".super", &type_obj_super);
+		initialize_def (sym, 0, current_symtab->space, sc_local);
+	}
+	super = new_symbol_expr (sym);
+
+	super_block = new_block_expr ();
+
+	e = assign_expr (field_expr (super, new_name_expr ("self")),
+								 new_name_expr ("self"));
+	append_expr (super_block, e);
+
+	e = new_symbol_expr (class_pointer_symbol (class));
+	e = assign_expr (field_expr (super, new_name_expr ("class")),
+					 field_expr (e, new_name_expr ("super_class")));
+	append_expr (super_block, e);
+
+	e = address_expr (super, 0, 0);
+	super_block->e.block.result = e;
+	return super_block;
+}
+
+expr_t *
+message_expr (expr_t *receiver, keywordarg_t *message)
+{
+	expr_t     *args = 0, **a = &args;
+	expr_t     *selector = selector_expr (message);
+	expr_t     *call;
+	keywordarg_t *m;
+	int         self = 0, super = 0, class_msg = 0;
+	type_t     *rec_type;
+	type_t     *return_type;
+	type_t     *method_type = &type_IMP;
+	class_t    *class = 0;
+	method_t   *method;
+	expr_t     *send_msg;
+
+	if (receiver->type == ex_symbol
+		&& strcmp (receiver->e.symbol->name, "super") == 0) {
+		super = 1;
+
+		receiver = super_expr (current_class);
+
+		if (receiver->type == ex_error)
+			return receiver;
+		receiver = cast_expr (&type_id, receiver);	//FIXME better way?
+		class = extract_class (current_class);
+	} else {
+		if (receiver->type == ex_symbol) {
+			if (strcmp (receiver->e.symbol->name, "self") == 0)
+				self = 1;
+			if (receiver->e.symbol->sy_type == sy_class) {
+				class = receiver->e.symbol->type->t.class;
+				class_msg = 1;
+				receiver = new_symbol_expr (class_pointer_symbol (class));
+			}
+		} else if (receiver->type == ex_nil) {
+			convert_nil (receiver, &type_id);
+		}
+		rec_type = get_type (receiver);
+
+		if (receiver->type == ex_error)
+			return receiver;
+
+		if (rec_type == &type_id || rec_type == &type_Class) {
+		} else {
+			if (rec_type->type == ev_pointer)
+				rec_type = rec_type->t.fldptr.type;
+			if (!obj_is_class (rec_type))
+				return error (receiver, "not a class/object");
+
+			if (self) {
+				if (!class)
+					class = extract_class (current_class);
+				if (rec_type == &type_obj_class)
+					class_msg = 1;
+			} else {
+				if (!class)
+					class = rec_type->t.class;
+			}
+		}
+	}
+
+	return_type = &type_id;
+	method = class_message_response (class, class_msg, selector);
+	if (method)
+		return_type = method->type->t.func.type;
+
+	for (m = message; m; m = m->next) {
+		*a = m->expr;
+		while ((*a)) {
+			expr_file_line (selector, *a);
+			a = &(*a)->next;
+		}
+	}
+	*a = selector;
+	a = &(*a)->next;
+	*a = receiver;
+
+	send_msg = expr_file_line (send_message (super), receiver);
+	if (method) {
+		expr_t      *err;
+		if ((err = method_check_params (method, args)))
+			return err;
+		method_type = method->type;
+	}
+	call = build_function_call (send_msg, method_type, args);
+
+	if (call->type == ex_error)
+		return receiver;
+
+	call->e.block.result = new_ret_expr (return_type);
+	return call;
+}

From 0fe3fda44dd76e9648a3b1ec11b51296d38fc916 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 15 Mar 2020 23:30:57 +0900
Subject: [PATCH 0791/1519] [qfcc] Fix protocol adorned id as message receiver

This took a bit as type_id has no class data, only protocols attached to
the type_obj_object instance, and then protocol lists can get deep.
---
 tools/qfcc/include/class.h   |   8 ++-
 tools/qfcc/include/method.h  |   3 +
 tools/qfcc/source/class.c    | 107 ++++++++++++++++++++++++++++-------
 tools/qfcc/source/expr_obj.c |  73 +++++++++---------------
 tools/qfcc/source/method.c   |  14 +++++
 5 files changed, 138 insertions(+), 67 deletions(-)

diff --git a/tools/qfcc/include/class.h b/tools/qfcc/include/class.h
index a468e19b5..68cefcd12 100644
--- a/tools/qfcc/include/class.h
+++ b/tools/qfcc/include/class.h
@@ -113,6 +113,7 @@ struct dstring_s;
 struct expr_s;
 struct method_s;
 struct symbol_s;
+struct selector_s;
 
 int obj_is_id (const struct type_s *type) __attribute__((pure));
 int obj_is_class (const struct type_s *type) __attribute__((pure));
@@ -141,7 +142,7 @@ void class_finish_ivar_scope (class_type_t *class_type,
 							  struct symtab_s *param_scope);
 struct method_s *class_find_method (class_type_t *class_type,
 									struct method_s *method);
-struct method_s *class_message_response (class_t *class, int class_msg,
+struct method_s *class_message_response (struct type_s *clstype, int class_msg,
 										 struct expr_s *sel);
 struct symbol_s *class_pointer_symbol (class_t *class_type);
 category_t *get_category (struct symbol_s *class_name,
@@ -161,6 +162,11 @@ struct def_s *protocol_def (protocol_t *protocol);
 protocollist_t *new_protocol_list (void);
 protocollist_t *add_protocol (protocollist_t *protocollist, const char *name);
 int procollist_find_protocol (protocollist_t *protocollist, protocol_t *proto) __attribute__((pure));
+struct method_s *protocollist_find_method (protocollist_t *protocollist,
+										   struct selector_s *selector,
+										   int nstance)
+											__attribute__((pure));
+
 int compare_protocols (protocollist_t *protos1, protocollist_t *protos2) __attribute__((pure));
 void print_protocollist (struct dstring_s *dstr, protocollist_t *protocollist);
 struct def_s *emit_protocol (protocol_t *protocol);
diff --git a/tools/qfcc/include/method.h b/tools/qfcc/include/method.h
index c64f04ade..598e151ee 100644
--- a/tools/qfcc/include/method.h
+++ b/tools/qfcc/include/method.h
@@ -98,6 +98,9 @@ keywordarg_t *copy_keywordargs (const keywordarg_t *kwargs);
 struct expr_s *send_message (int super);
 
 method_t *find_method (const char *sel_name);
+method_t *methodlist_find_method (methodlist_t *methodlist,
+								  selector_t *selector, int instance)
+								  __attribute__((pure));
 
 void selector_name (struct dstring_s *sel_id, keywordarg_t *selector);
 void method_types (struct dstring_s *sel_types, method_t *method);
diff --git a/tools/qfcc/source/class.c b/tools/qfcc/source/class.c
index d1322c174..6f4473e1d 100644
--- a/tools/qfcc/source/class.c
+++ b/tools/qfcc/source/class.c
@@ -1104,42 +1104,79 @@ class_find_method (class_type_t *class_type, method_t *method)
 	return method;
 }
 
+static method_t *
+cls_find_method (methodlist_t *methodlist, selector_t *selector,
+				   int class_msg, int is_root)
+{
+	method_t   *m = 0;
+	m = methodlist_find_method (methodlist, selector, !class_msg);
+	if (!m && is_root && class_msg
+		&& (m = methodlist_find_method (methodlist, selector, 1))) {
+		return m;
+	}
+	return m;
+}
+
 method_t *
-class_message_response (class_t *class, int class_msg, expr_t *sel)
+class_message_response (type_t *clstype, int class_msg, expr_t *sel)
 {
 	selector_t *selector;
 	method_t   *m;
-	class_t    *c = class;
+	class_t    *c;
+	class_t    *class = 0;
 	category_t *cat;
+	dstring_t  *dstr;
 
 	selector = get_selector (sel);
 	if (!selector)
 		return 0;
-	if (class && class->type != &type_obj_object) {
-		if (!class->interface_declared) {
-			class->interface_declared = 1;
-			warning (0, "cannot find interface declaration for `%s'",
-					 class->name);
+
+	if (!obj_is_classptr (clstype) && !obj_is_class (clstype)) {
+		error (0, "neither class nor object");
+		return 0;
+	}
+	if (obj_is_id (clstype)) {
+		protocollist_t *protos = clstype->t.fldptr.type->protos;
+		if (protos) {
+			if ((m = protocollist_find_method (protos, selector, !class_msg))) {
+				return m;
+			}
+			dstr = dstring_new ();
+			print_protocollist (dstr, protos);
+			warning (sel, "id%s may not respond to %c%s", dstr->str,
+					 class_msg ? '+' : '-', selector->name);
+			dstring_delete (dstr);
 		}
-		while (c) {
-			for (cat = c->categories; cat; cat = cat->next) {
-				for (m = cat->methods->head; m; m = m->next) {
-					if (((!c->super_class && class_msg)
-						 || class_msg != m->instance)
-						&& strcmp (selector->name, m->name) == 0)
+	} else {
+		if (obj_is_class (clstype)) {
+			class = clstype->t.class;
+		} else if (obj_is_class (clstype->t.fldptr.type)) {
+			class = clstype->t.fldptr.type->t.class;
+		}
+		if (class && class->type != &type_obj_object) {
+			if (!class->interface_declared) {
+				class->interface_declared = 1;
+				warning (0, "cannot find interface declaration for `%s'",
+						 class->name);
+			}
+			c = class;
+			while (c) {
+				for (cat = c->categories; cat; cat = cat->next) {
+					if ((m = cls_find_method (cat->methods, selector,
+											  class_msg,
+											  !c->super_class))) {
 						return m;
+					}
 				}
-			}
-			for (m = c->methods->head; m; m = m->next) {
-				if (((!c->super_class && class_msg)
-					 || class_msg != m->instance)
-					&& strcmp (selector->name, m->name) == 0)
+				if ((m = cls_find_method (c->methods, selector, class_msg,
+										  !c->super_class))) {
 					return m;
+				}
+				c = c->super_class;
 			}
-			c = c->super_class;
+			warning (sel, "%s may not respond to %c%s", class->name,
+					 class_msg ? '+' : '-', selector->name);
 		}
-		warning (sel, "%s may not respond to %c%s", class->name,
-				 class_msg ? '+' : '-', selector->name);
 	}
 	m = find_method (selector->name);
 	if (!m && (!class || class->type == &type_obj_object)) {
@@ -1592,6 +1629,34 @@ procollist_find_protocol (protocollist_t *protocollist, protocol_t *proto)
 	return 0;
 }
 
+static method_t *
+protocol_find_method (protocol_t *protocol, selector_t *selector, int instance)
+{
+	method_t   *m = 0;
+	if (protocol->methods) {
+		m = methodlist_find_method (protocol->methods, selector, instance);
+	}
+	if (!m && protocol->protocols) {
+		return protocollist_find_method (protocol->protocols, selector,
+										 instance);
+	}
+	return m;
+}
+
+method_t *
+protocollist_find_method (protocollist_t *protocollist, selector_t *selector,
+						  int instance)
+{
+	method_t   *m;
+	for (int i = 0; i < protocollist->count; i++) {
+		if ((m = protocol_find_method (protocollist->list[i], selector,
+									   instance))) {
+			return m;
+		}
+	}
+	return 0;
+}
+
 int
 compare_protocols (protocollist_t *protos1, protocollist_t *protos2)
 {
diff --git a/tools/qfcc/source/expr_obj.c b/tools/qfcc/source/expr_obj.c
index fe04e2c98..6858adb54 100644
--- a/tools/qfcc/source/expr_obj.c
+++ b/tools/qfcc/source/expr_obj.c
@@ -179,62 +179,45 @@ message_expr (expr_t *receiver, keywordarg_t *message)
 	expr_t     *selector = selector_expr (message);
 	expr_t     *call;
 	keywordarg_t *m;
-	int         self = 0, super = 0, class_msg = 0;
-	type_t     *rec_type;
+	int         super = 0, class_msg = 0;
+	type_t     *rec_type = 0;
 	type_t     *return_type;
 	type_t     *method_type = &type_IMP;
-	class_t    *class = 0;
 	method_t   *method;
 	expr_t     *send_msg;
 
-	if (receiver->type == ex_symbol
-		&& strcmp (receiver->e.symbol->name, "super") == 0) {
-		super = 1;
+	if (receiver->type == ex_nil) {
+		rec_type = &type_id;
+		convert_nil (receiver, rec_type);
+	} else if (receiver->type == ex_symbol) {
+		if (strcmp (receiver->e.symbol->name, "self") == 0) {
+			rec_type = get_type (receiver);
+		} else if (strcmp (receiver->e.symbol->name, "super") == 0) {
+			super = 1;
 
-		receiver = super_expr (current_class);
+			receiver = super_expr (current_class);
 
-		if (receiver->type == ex_error)
-			return receiver;
-		receiver = cast_expr (&type_id, receiver);	//FIXME better way?
-		class = extract_class (current_class);
-	} else {
-		if (receiver->type == ex_symbol) {
-			if (strcmp (receiver->e.symbol->name, "self") == 0)
-				self = 1;
-			if (receiver->e.symbol->sy_type == sy_class) {
-				class = receiver->e.symbol->type->t.class;
-				class_msg = 1;
-				receiver = new_symbol_expr (class_pointer_symbol (class));
-			}
-		} else if (receiver->type == ex_nil) {
-			convert_nil (receiver, &type_id);
-		}
-		rec_type = get_type (receiver);
-
-		if (receiver->type == ex_error)
-			return receiver;
-
-		if (rec_type == &type_id || rec_type == &type_Class) {
-		} else {
-			if (rec_type->type == ev_pointer)
-				rec_type = rec_type->t.fldptr.type;
-			if (!obj_is_class (rec_type))
-				return error (receiver, "not a class/object");
-
-			if (self) {
-				if (!class)
-					class = extract_class (current_class);
-				if (rec_type == &type_obj_class)
-					class_msg = 1;
-			} else {
-				if (!class)
-					class = rec_type->t.class;
-			}
+			if (receiver->type == ex_error)
+				return receiver;
+			receiver = cast_expr (&type_id, receiver);	//FIXME better way?
+			rec_type = extract_class (current_class)->type;
+		} else if (receiver->e.symbol->sy_type == sy_class) {
+			class_t    *class;
+			rec_type = receiver->e.symbol->type;
+			class = rec_type->t.class;
+			class_msg = 1;
+			receiver = new_symbol_expr (class_pointer_symbol (class));
 		}
 	}
+	if (!rec_type) {
+		rec_type = get_type (receiver);
+	}
+
+	if (receiver->type == ex_error)
+		return receiver;
 
 	return_type = &type_id;
-	method = class_message_response (class, class_msg, selector);
+	method = class_message_response (rec_type, class_msg, selector);
 	if (method)
 		return_type = method->type->t.func.type;
 
diff --git a/tools/qfcc/source/method.c b/tools/qfcc/source/method.c
index 5b818afad..e8e342c7a 100644
--- a/tools/qfcc/source/method.c
+++ b/tools/qfcc/source/method.c
@@ -375,6 +375,20 @@ find_method (const char *sel_name)
 	return Hash_Find (known_methods, sel_name);
 }
 
+method_t *
+methodlist_find_method (methodlist_t *methodlist, selector_t *selector,
+						int instance)
+{
+	method_t   *m;
+
+	for (m = methodlist->head; m; m = m->next) {
+		if (m->instance == instance && strcmp (selector->name, m->name) == 0) {
+			return m;
+		}
+	}
+	return 0;
+}
+
 void
 selector_name (dstring_t *sel_id, keywordarg_t *selector)
 {

From 2f07d9a310f5f51bdceaa6e1ad725423e035fe6e Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 16 Mar 2020 09:24:34 +0900
Subject: [PATCH 0792/1519] [qfcc] Improve accuracy of some more diagnostics

---
 tools/qfcc/source/dags.c | 3 ++-
 tools/qfcc/source/flow.c | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/qfcc/source/dags.c b/tools/qfcc/source/dags.c
index ce4bd98cf..ffaee9be9 100644
--- a/tools/qfcc/source/dags.c
+++ b/tools/qfcc/source/dags.c
@@ -423,7 +423,8 @@ dagnode_set_edges (dag_t *dag, dagnode_t *n)
 				param_node = def_visit_all (param_def, 0, dag_find_node,
 											&daglabel);
 				if (!param_node) {
-					bug (0, ".param_%d not set for %s", i, n->label->opcode);
+					bug (n->label->expr, ".param_%d not set for %s", i,
+						 n->label->opcode);
 					continue;
 				}
 				daglabel->live = 1;
diff --git a/tools/qfcc/source/flow.c b/tools/qfcc/source/flow.c
index d3e82b7ce..d0b59ef12 100644
--- a/tools/qfcc/source/flow.c
+++ b/tools/qfcc/source/flow.c
@@ -1255,7 +1255,7 @@ flow_find_successors (flowgraph_t *graph)
 			if (sb->next) {
 				set_add (node->successors, sb->next->flownode->id);
 			} else {
-				bug (0, "code drops off the end of the function");
+				bug (st->expr, "code drops off the end of the function");
 				// this shouldn't happen
 				// however, make the exit dummy block the node's successor
 				set_add (node->successors, graph->num_nodes + 1);

From a0c28a5ac580909f90a9cecea4fd5c85dc0a6c73 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 16 Mar 2020 12:15:55 +0900
Subject: [PATCH 0793/1519] [qfcc] Support pointers to temp operands

This is necessary for correctly taking the address of operands.
---
 tools/qfcc/include/expr.h           |  1 +
 tools/qfcc/include/statements.h     |  2 +-
 tools/qfcc/include/value.h          |  4 ++-
 tools/qfcc/source/dags.c            |  2 +-
 tools/qfcc/source/emit.c            | 44 ++++++++++++++++++-----------
 tools/qfcc/source/expr.c            |  6 ++--
 tools/qfcc/source/value.c           |  4 ++-
 tools/qfcc/test/struct-init-param.r | 22 ++++++++-------
 tools/qfcc/test/test-harness.c      |  1 +
 9 files changed, 53 insertions(+), 33 deletions(-)

diff --git a/tools/qfcc/include/expr.h b/tools/qfcc/include/expr.h
index 170fc7a50..836ec864d 100644
--- a/tools/qfcc/include/expr.h
+++ b/tools/qfcc/include/expr.h
@@ -126,6 +126,7 @@ typedef struct ex_pointer_s {
 	int         val;
 	struct type_s *type;
 	struct def_s *def;
+	struct tempop_s *tempop;
 } ex_pointer_t;
 
 typedef struct ex_func_s {
diff --git a/tools/qfcc/include/statements.h b/tools/qfcc/include/statements.h
index 7a0b241ed..26904db3d 100644
--- a/tools/qfcc/include/statements.h
+++ b/tools/qfcc/include/statements.h
@@ -41,7 +41,7 @@ typedef enum {
 	op_nil,
 } op_type_e;
 
-typedef struct {
+typedef struct tempop_s {
 	struct def_s   *def;
 	int             offset;
 	struct type_s *type;
diff --git a/tools/qfcc/include/value.h b/tools/qfcc/include/value.h
index b4f22ee60..f2dc7195f 100644
--- a/tools/qfcc/include/value.h
+++ b/tools/qfcc/include/value.h
@@ -38,6 +38,7 @@
 
 struct def_s;
 struct ex_value_s;
+struct tempop_s;
 struct type_s;
 
 struct ex_value_s *new_string_val (const char *string_val);
@@ -49,7 +50,8 @@ struct ex_value_s *new_field_val (int field_val, struct type_s *type,
 								  struct def_s *def);
 struct ex_value_s *new_func_val (int func_val, struct type_s *type);
 struct ex_value_s *new_pointer_val (int val, struct type_s *type,
-									struct def_s *def);
+									struct def_s *def,
+									struct tempop_s *tempop);
 struct ex_value_s *new_quaternion_val (const float *quaternion_val);
 struct ex_value_s *new_integer_val (int integer_val);
 struct ex_value_s *new_uinteger_val (int uinteger_val);
diff --git a/tools/qfcc/source/dags.c b/tools/qfcc/source/dags.c
index ffaee9be9..6745a7a94 100644
--- a/tools/qfcc/source/dags.c
+++ b/tools/qfcc/source/dags.c
@@ -884,7 +884,7 @@ generate_moveps (dag_t *dag, sblock_t *block, dagnode_t *dagnode)
 			offset = dstDef->offset;
 			dstDef = dstDef->alias;
 		}
-		operands[2] = value_operand (new_pointer_val (offset, type, dstDef),
+		operands[2] = value_operand (new_pointer_val (offset, type, dstDef, 0),
 									 operands[1]->expr);
 		st = build_statement ("<MOVEP>", operands, var->expr);
 		sblock_add_statement (block, st);
diff --git a/tools/qfcc/source/emit.c b/tools/qfcc/source/emit.c
index 0073f3967..f859e4b9f 100644
--- a/tools/qfcc/source/emit.c
+++ b/tools/qfcc/source/emit.c
@@ -60,16 +60,40 @@
 
 static def_t zero_def;
 
+static def_t *get_operand_def (expr_t *expr, operand_t *op);
+
 static def_t *
-get_value_def (ex_value_t *value, type_t *type)
+get_tempop_def (expr_t *expr, tempop_t *tempop, type_t *type)
+{
+	if (tempop->def) {
+		return tempop->def;
+	}
+	if (tempop->alias) {
+		def_t      *tdef = get_operand_def (expr, tempop->alias);
+		int         offset = tempop->offset;
+		tempop->def = alias_def (tdef, type, offset);
+	}
+	if (!tempop->def) {
+		tempop->def = temp_def (type);
+	}
+	return tempop->def;
+}
+
+static def_t *
+get_value_def (expr_t *expr, ex_value_t *value, type_t *type)
 {
 	def_t      *def;
 
-	if (type == &type_short) {
+	if (is_short (type)) {
 		def = new_def (0, &type_short, 0, sc_extern);
 		def->offset = value->v.short_val;
 		return def;
 	}
+	if (is_pointer (type) && value->v.pointer.tempop
+		&& !value->v.pointer.def) {
+		value->v.pointer.def = get_tempop_def (expr, value->v.pointer.tempop,
+											   type->t.fldptr.type);
+	}
 	def = emit_value (value, 0);
 	if (type != def->type)
 		return alias_def (def, type, 0);
@@ -85,25 +109,13 @@ get_operand_def (expr_t *expr, operand_t *op)
 		case op_def:
 			return op->o.def;
 		case op_value:
-			return get_value_def (op->o.value, op->type);
+			return get_value_def (expr, op->o.value, op->type);
 		case op_label:
 			op->type = &type_short;
 			zero_def.type = &type_short;
 			return &zero_def;	//FIXME
 		case op_temp:
-			if (op->o.tempop.def) {
-				return op->o.tempop.def;
-			}
-			if (op->o.tempop.alias) {
-				def_t      *tdef = get_operand_def (expr, op->o.tempop.alias);
-				int         offset = op->o.tempop.offset;
-				type_t     *type = op->type;
-				op->o.tempop.def = alias_def (tdef, type, offset);
-			}
-			if (!op->o.tempop.def) {
-				op->o.tempop.def = temp_def (op->type);
-			}
-			return op->o.tempop.def;
+			return get_tempop_def (expr, &op->o.tempop, op->type);
 		case op_alias:
 			return get_operand_def (expr, op->o.alias);
 		case op_nil:
diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index 8a702714d..2cd64dc13 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -800,7 +800,7 @@ new_pointer_expr (int val, type_t *type, def_t *def)
 {
 	expr_t     *e = new_expr ();
 	e->type = ex_value;
-	e->e.value = new_pointer_val (val, type, def);
+	e->e.value = new_pointer_val (val, type, def, 0);
 	return e;
 }
 
@@ -2152,7 +2152,7 @@ address_expr (expr_t *e1, expr_t *e2, type_t *t)
 				if (is_array (type)) {
 					e = e1;
 					e->type = ex_value;
-					e->e.value = new_pointer_val (0, t, def);
+					e->e.value = new_pointer_val (0, t, def, 0);
 				} else {
 					e = new_pointer_expr (0, t, def);
 					e->line = e1->line;
@@ -2218,7 +2218,7 @@ address_expr (expr_t *e1, expr_t *e2, type_t *t)
 			return e2;
 		if (e->type == ex_value && e->e.value->lltype == ev_pointer
 			&& is_short_val (e2)) {
-			e->e.value = new_pointer_val (e->e.value->v.pointer.val + expr_short (e2), t, e->e.value->v.pointer.def);
+			e->e.value = new_pointer_val (e->e.value->v.pointer.val + expr_short (e2), t, e->e.value->v.pointer.def, 0);
 		} else {
 			if (!is_short_val (e2) || expr_short (e2)) {
 				if (e->type == ex_expr && e->e.expr.op == '&') {
diff --git a/tools/qfcc/source/value.c b/tools/qfcc/source/value.c
index 97198268c..424dadce5 100644
--- a/tools/qfcc/source/value.c
+++ b/tools/qfcc/source/value.c
@@ -197,7 +197,8 @@ new_func_val (int func_val, type_t *type)
 }
 
 ex_value_t *
-new_pointer_val (int pointer_val, type_t *type, def_t *def)
+new_pointer_val (int pointer_val, type_t *type, def_t *def,
+				 struct tempop_s *tempop)
 {
 	ex_value_t  val;
 	if (!type) {
@@ -208,6 +209,7 @@ new_pointer_val (int pointer_val, type_t *type, def_t *def)
 	val.v.pointer.val = pointer_val;
 	val.v.pointer.type = type;
 	val.v.pointer.def = def;
+	val.v.pointer.tempop = tempop;
 	return find_value (&val);
 }
 
diff --git a/tools/qfcc/test/struct-init-param.r b/tools/qfcc/test/struct-init-param.r
index f043cfde3..c3dd5927b 100644
--- a/tools/qfcc/test/struct-init-param.r
+++ b/tools/qfcc/test/struct-init-param.r
@@ -40,18 +40,20 @@ Rect o = { { 5, 6}, {7, 8} };
 int main (void)
 {
 	int         ret = 0;
+	int         ok;
+
 	bar(&obj, nil, &o, obj.offset);
-	printf ("%d %d %d %d\n", o.offset.x, o.offset.y,
-			o.extent.width, o.extent.height);
-	if not (o.offset.x == 0 && o.offset.y == 0
-		&& o.extent.width == 3 && o.extent.height == 4)
-		ret |= 1;
+	ok = (o.offset.x == 0 && o.offset.y == 0
+		  && o.extent.width == 3 && o.extent.height == 4);
+	ret |= !ok;
+	printf ("%d %d %d %d %d\n", o.offset.x, o.offset.y,
+			o.extent.width, o.extent.height, ok);
 
 	baz(&obj, nil, &o, obj.offset);
-	printf ("%d %d %d %d\n", o.offset.x, o.offset.y,
-			o.extent.width, o.extent.height);
-	if not (o.offset.x == 1 && o.offset.y == 2
-		&& o.extent.width == 3 && o.extent.height == 4)
-		ret |= 1;
+	ok = (o.offset.x == 1 && o.offset.y == 2
+		  && o.extent.width == 3 && o.extent.height == 4);
+	ret |= !ok;
+	printf ("%d %d %d %d %d\n", o.offset.x, o.offset.y,
+			o.extent.width, o.extent.height, ok);
 	return ret;
 }
diff --git a/tools/qfcc/test/test-harness.c b/tools/qfcc/test/test-harness.c
index 69e660941..934c02cb0 100644
--- a/tools/qfcc/test/test-harness.c
+++ b/tools/qfcc/test/test-harness.c
@@ -138,6 +138,7 @@ init_qf (void)
 
 	cvar_t *debug = Cvar_Get ("pr_debug", "2", 0, 0, 0);
 	Cvar_Get ("pr_boundscheck", "2", 0, 0, 0);
+	Cvar_Get ("pr_deadbeef_locals", "1", 0, 0, 0);
 
 	if (options.trace > 1) {
 		Cvar_SetValue (debug, 4);

From b58deb56804f9091f07ec0c2b939169772ec40ca Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 16 Mar 2020 12:21:38 +0900
Subject: [PATCH 0794/1519] [qfcc] Rewrite operand_address to be much simpler

It now creates a pointer value and returns that rather than generating
an address statement.
---
 tools/qfcc/source/statements.c | 49 ++++++++++++++++++----------------
 1 file changed, 26 insertions(+), 23 deletions(-)

diff --git a/tools/qfcc/source/statements.c b/tools/qfcc/source/statements.c
index 0b2337b0b..a68304838 100644
--- a/tools/qfcc/source/statements.c
+++ b/tools/qfcc/source/statements.c
@@ -658,39 +658,42 @@ expr_address (sblock_t *sblock, expr_t *e, operand_t **op)
 	return sblock;
 }
 
-static sblock_t *
-operand_address (sblock_t *sblock, operand_t *reference, operand_t **op,
-				 expr_t *e)
+static operand_t *
+operand_address (operand_t *reference, expr_t *e)
 {
-	statement_t *s;
+	def_t      *def;
 	type_t     *type;
+	int         offset = 0;
 
+	type = reference->type;
 	switch (reference->op_type) {
 		case op_def:
-		case op_temp:
-		case op_alias:
-			// build an address expression so dags can extract the correct
-			// type. address_expr cannot be used because reference might not
-			// be something it likes
-			e = expr_file_line (new_unary_expr ('&', e), e);
-			type = pointer_type (reference->type);
-			e->e.expr.type = type;
-
-			s = new_statement (st_expr, "&", e);
-			s->opa = reference;
-			s->opc = temp_operand (type, e);
-			sblock_add_statement (sblock, s);
-			if (op) {
-				*(op) = s->opc;
+			// assumes aliasing is only one level deep which should be the
+			// case
+			def = reference->o.def;
+			if (def->alias) {
+				offset = def->offset;
+				def = def->alias;
 			}
-			return sblock;
+			return value_operand (new_pointer_val (offset, type, def, 0), e);
+		case op_temp:
+			// assumes aliasing is only one level deep which should be the
+			// case
+			if (reference->o.tempop.alias) {
+				offset = reference->o.tempop.offset;
+				reference = reference->o.tempop.alias;
+			}
+			return value_operand (new_pointer_val (offset, type, 0,
+												   &reference->o.tempop), e);
+		case op_alias:
+			//op_alias comes only from alias_operand and that is called
+			// by dags, so not expected
 		case op_value:
 		case op_label:
 		case op_nil:
 			break;
 	}
-	internal_error ((*op)->expr,
-					"invalid operand type for operand address: %s",
+	internal_error (e, "invalid operand type for operand address: %s",
 					op_type_names[reference->op_type]);
 }
 
@@ -763,7 +766,7 @@ expr_assign_copy (sblock_t *sblock, expr_t *e, operand_t **op, operand_t *src)
 			*op = src;
 		}
 		if (is_indirect (dst_expr) || is_indirect (src_expr)) {
-			sblock = operand_address (sblock, src, &src, src_expr);
+			src = operand_address (src, src_expr);
 			goto dereference_dst;
 		}
 	}

From c8e45c6cfce6ad6c2b8f9f19aef677cca45913c2 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 16 Mar 2020 12:25:28 +0900
Subject: [PATCH 0795/1519] [qfcc] Use operand_address in expr_deref

This fixes the technically correct but horrible mess of temps and
addressing when dealing with ivars, and the resulting uninitialized
temps due to the non-constant pointers (do need statement level constant
folding, though).
---
 tools/qfcc/source/statements.c | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/tools/qfcc/source/statements.c b/tools/qfcc/source/statements.c
index a68304838..9c926978d 100644
--- a/tools/qfcc/source/statements.c
+++ b/tools/qfcc/source/statements.c
@@ -966,7 +966,6 @@ expr_call (sblock_t *sblock, expr_t *call, operand_t **op)
 			continue;
 		}
 		if (is_struct (get_type (param))) {
-			//FIXME this should be done in the expression tree
 			expr_t     *mov = assign_expr (param, a);
 			mov->line = a->line;
 			mov->file = a->file;
@@ -1010,15 +1009,6 @@ lea_statement (operand_t *pointer, operand_t *offset, expr_t *e)
 	return s;
 }
 
-static statement_t *
-address_statement (operand_t *value, expr_t *e)
-{
-	statement_t *s = new_statement (st_expr, "&", e);
-	s->opa = value;
-	s->opc = temp_operand (&type_pointer, e);
-	return s;
-}
-
 static sblock_t *
 expr_deref (sblock_t *sblock, expr_t *deref, operand_t **op)
 {
@@ -1047,13 +1037,11 @@ expr_deref (sblock_t *sblock, expr_t *deref, operand_t **op)
 			src_addr = s->opc;
 			sblock_add_statement (sblock, s);
 
-			//FIXME an address immediate would be nice.
-			s = address_statement (*op, e);
-			dst_addr = s->opc;
-			sblock_add_statement (sblock, s);
+			dst_addr = operand_address (*op, e);
 
 			s = new_statement (st_move, "<MOVEP>", deref);
 			s->opa = src_addr;
+			//FIXME large types
 			s->opb = short_operand (type_size (type), e);
 			s->opc = dst_addr;
 			sblock_add_statement (sblock, s);

From b544a052bf25d891c28521c0a3d3fa0cec3f130a Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 16 Mar 2020 13:46:46 +0900
Subject: [PATCH 0796/1519] [gamecode] Bail if PR_SearchDefs is given 0 defs

Fixes the hang when searching for a field in progs that don't have any.
---
 libs/gamecode/pr_resolve.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libs/gamecode/pr_resolve.c b/libs/gamecode/pr_resolve.c
index 03e6949a2..6270653d2 100644
--- a/libs/gamecode/pr_resolve.c
+++ b/libs/gamecode/pr_resolve.c
@@ -51,6 +51,9 @@ PR_SearchDefs (pr_def_t *defs, unsigned num_defs, pointer_t offset)
 	unsigned    right = num_defs - 1;
 	unsigned    mid;
 
+	if (!num_defs) {
+		return 0;
+	}
 	while (left != right) {
 		mid = (left + right + 1) / 2;
 		if (defs[mid].ofs > offset) {

From db06300dddaf4fc50be73312cc5d6fe0613f95e7 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 16 Mar 2020 20:20:07 +0900
Subject: [PATCH 0797/1519] [qfcc] Make print_operand usable from gdb

It not emitting a \n made life difficult, especially whenever gdb
decided to make access to printf or puts awkward.
---
 tools/qfcc/source/statements.c | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/tools/qfcc/source/statements.c b/tools/qfcc/source/statements.c
index 9c926978d..54f183096 100644
--- a/tools/qfcc/source/statements.c
+++ b/tools/qfcc/source/statements.c
@@ -158,8 +158,8 @@ operand_string (operand_t *op)
 	return ("??");
 }
 
-void
-print_operand (operand_t *op)
+static void
+_print_operand (operand_t *op)
 {
 	switch (op->op_type) {
 		case op_def:
@@ -224,7 +224,7 @@ print_operand (operand_t *op)
 			break;
 		case op_alias:
 			printf ("alias(%s,", pr_type_name[op->type->type]);
-			print_operand (op->o.alias);
+			_print_operand (op->o.alias);
 			printf (")");
 			break;
 		case op_nil:
@@ -233,18 +233,25 @@ print_operand (operand_t *op)
 	}
 }
 
+void
+print_operand (operand_t *op)
+{
+	_print_operand (op);
+	puts ("");
+}
+
 void
 print_statement (statement_t *s)
 {
 	printf ("(%s, ", s->opcode);
 	if (s->opa)
-		print_operand (s->opa);
+		_print_operand (s->opa);
 	printf (", ");
 	if (s->opb)
-		print_operand (s->opb);
+		_print_operand (s->opb);
 	printf (", ");
 	if (s->opc)
-		print_operand (s->opc);
+		_print_operand (s->opc);
 	printf (")\n");
 }
 

From 69924fe717c9ffc0ce06a54a4521f4a76f009f96 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 16 Mar 2020 20:21:07 +0900
Subject: [PATCH 0798/1519] [qfcc] Return correct value for is_const_ptr

It really helps if the logic is not inverted.
---
 tools/qfcc/source/statements.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/qfcc/source/statements.c b/tools/qfcc/source/statements.c
index 54f183096..f1a4b42e0 100644
--- a/tools/qfcc/source/statements.c
+++ b/tools/qfcc/source/statements.c
@@ -710,9 +710,9 @@ is_const_ptr (expr_t *e)
 	if ((e->type != ex_value || e->e.value->lltype != ev_pointer)
 		|| !(POINTER_VAL (e->e.value->v.pointer) >= 0
 			 && POINTER_VAL (e->e.value->v.pointer) < 65536)) {
-		return 1;
+		return 0;
 	}
-	return 0;
+	return 1;
 }
 
 static __attribute__((pure)) int

From 1d10136f2e09d4209fa62348b1556051b0a57bb4 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 16 Mar 2020 20:24:22 +0900
Subject: [PATCH 0799/1519] [qfcc] Treat all dereferences and indirect

Why I had a const pointer test on there is beyond me.
---
 tools/qfcc/source/statements.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/qfcc/source/statements.c b/tools/qfcc/source/statements.c
index f1a4b42e0..013fbd42b 100644
--- a/tools/qfcc/source/statements.c
+++ b/tools/qfcc/source/statements.c
@@ -722,7 +722,7 @@ is_indirect (expr_t *e)
 		return 1;
 	if (!(e->type == ex_uexpr && e->e.expr.op == '.'))
 		return 0;
-	return is_const_ptr (e->e.expr.e1);
+	return 1;
 }
 
 static sblock_t *

From ede7dd6d7e3b9dec51fe8755ad65dad069d6dc45 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 16 Mar 2020 20:31:21 +0900
Subject: [PATCH 0800/1519] [qfcc] Catch attempts to emit a bad operand type

---
 tools/qfcc/source/emit.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/qfcc/source/emit.c b/tools/qfcc/source/emit.c
index f859e4b9f..d9b4167f6 100644
--- a/tools/qfcc/source/emit.c
+++ b/tools/qfcc/source/emit.c
@@ -121,6 +121,7 @@ get_operand_def (expr_t *expr, operand_t *op)
 		case op_nil:
 			internal_error (expr, "unexpected nil operand");
 	}
+	internal_error (expr, "unexpected operand");
 	return 0;
 }
 

From 5c0c056e2caaf34d9fe57b1f181549bc3ed89e21 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 16 Mar 2020 21:07:31 +0900
Subject: [PATCH 0801/1519] [qfcc] Add is_entity type test helper

---
 tools/qfcc/include/type.h | 1 +
 tools/qfcc/source/type.c  | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/tools/qfcc/include/type.h b/tools/qfcc/include/type.h
index 791ea0fc9..ba3b82f1e 100644
--- a/tools/qfcc/include/type.h
+++ b/tools/qfcc/include/type.h
@@ -162,6 +162,7 @@ int is_quaternion (const type_t *type) __attribute__((pure));
 int is_math (const type_t *type) __attribute__((pure));
 int is_pointer (const type_t *type) __attribute__((pure));
 int is_field (const type_t *type) __attribute__((pure));
+int is_entity (const type_t *type) __attribute__((pure));
 int is_struct (const type_t *type) __attribute__((pure));
 int is_array (const type_t *type) __attribute__((pure));
 int is_structural (const type_t *type) __attribute__((pure));
diff --git a/tools/qfcc/source/type.c b/tools/qfcc/source/type.c
index cdf7ca6df..4404f2ed0 100644
--- a/tools/qfcc/source/type.c
+++ b/tools/qfcc/source/type.c
@@ -811,6 +811,14 @@ is_field (const type_t *type)
 	return 0;
 }
 
+int
+is_entity (const type_t *type)
+{
+	if (type->type == ev_entity)
+		return 1;
+	return 0;
+}
+
 int
 is_array (const type_t *type)
 {

From f9face0cefc0c1cb9613e1de7ef0f4d7c5465c3d Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 16 Mar 2020 23:26:39 +0900
Subject: [PATCH 0802/1519] [qfcc] Make is_indirect easier to read

---
 tools/qfcc/source/statements.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/qfcc/source/statements.c b/tools/qfcc/source/statements.c
index 013fbd42b..20e145b0c 100644
--- a/tools/qfcc/source/statements.c
+++ b/tools/qfcc/source/statements.c
@@ -718,11 +718,11 @@ is_const_ptr (expr_t *e)
 static __attribute__((pure)) int
 is_indirect (expr_t *e)
 {
-	if (e->type == ex_expr && e->e.expr.op == '.')
+	if ((e->type == ex_expr || e->type == ex_uexpr)
+		&& e->e.expr.op == '.') {
 		return 1;
-	if (!(e->type == ex_uexpr && e->e.expr.op == '.'))
-		return 0;
-	return 1;
+	}
+	return 0;
 }
 
 static sblock_t *

From 8e6baf1bde4aa76919b8dffac0d9d49498bbf989 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 17 Mar 2020 01:39:35 +0900
Subject: [PATCH 0803/1519] [qfcc] Fix assigning to entity fields

At least for basic types. Compound types need testing.
---
 tools/qfcc/source/statements.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tools/qfcc/source/statements.c b/tools/qfcc/source/statements.c
index 20e145b0c..1733700fd 100644
--- a/tools/qfcc/source/statements.c
+++ b/tools/qfcc/source/statements.c
@@ -883,6 +883,15 @@ dereference_dst:
 		return sblock;
 	}
 
+	if (is_entity (dst->type) && ofs && is_field (ofs->type)) {
+		s = new_statement (st_expr, "&", dst_expr);
+		s->opa = dst;
+		s->opb = ofs;
+		s->opc = temp_operand (&type_pointer, dst_expr);
+		sblock_add_statement (sblock, s);
+		dst = s->opc;
+		ofs = 0;
+	}
 	s = new_statement (type, opcode, e);
 	s->opa = src;
 	s->opb = dst;

From fd06cd2b006ad6445ce6f320d4e0034a87f96897 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 17 Mar 2020 01:40:35 +0900
Subject: [PATCH 0804/1519] [qfcc] Analyze assignment through const pointers

This fixes a false-positive uninitialized warning.
---
 tools/qfcc/source/flow.c | 56 ++++++++++++++++++++++++++--------------
 1 file changed, 36 insertions(+), 20 deletions(-)

diff --git a/tools/qfcc/source/flow.c b/tools/qfcc/source/flow.c
index d0b59ef12..ba8868f43 100644
--- a/tools/qfcc/source/flow.c
+++ b/tools/qfcc/source/flow.c
@@ -1040,7 +1040,7 @@ flow_add_op_var (set_t *set, operand_t *op, int is_use)
 	set_add (set, var->number);
 
 	// FIXME XXX I think the curent implementation will have problems
-	// for the def set when assinging to an alias as right now the real
+	// for the def set when assigning to an alias as right now the real
 	// var is being treated as assigned as well. Want to handle partial
 	// defs properly, but I am as yet uncertain of how.
 	if (op->op_type == op_temp) {
@@ -1050,6 +1050,28 @@ flow_add_op_var (set_t *set, operand_t *op, int is_use)
 	}
 }
 
+static int
+flow_analyize_pointer_operand (operand_t *ptrop, set_t *def,
+							   operand_t *operands[4])
+{
+	if (ptrop->op_type == op_value
+		&& ptrop->o.value->lltype == ev_pointer
+		&& ptrop->o.value->v.pointer.def) {
+		operand_t  *op;
+		def_t      *alias;
+		ex_pointer_t *ptr = &ptrop->o.value->v.pointer;
+		alias = alias_def (ptr->def, ptr->type, ptr->val);
+		op = def_operand (alias, ptr->type, ptrop->expr);
+		flow_add_op_var (def, op, 0);
+		if (operands)
+			operands[0] = op;
+		else
+			free_operand (op);
+		return 1;
+	}
+	return 0;
+}
+
 void
 flow_analyze_statement (statement_t *s, set_t *use, set_t *def, set_t *kill,
 						operand_t *operands[4])
@@ -1099,37 +1121,31 @@ flow_analyze_statement (statement_t *s, set_t *use, set_t *def, set_t *kill,
 			} else if (!strcmp (s->opcode, "<MOVEP>")
 					   || !strcmp (s->opcode, "<MEMSETP>")) {
 				flow_add_op_var (use, s->opc, 0);
-				if (s->opc->op_type == op_value
-					&& s->opc->o.value->lltype == ev_pointer
-					&& s->opc->o.value->v.pointer.def) {
-					operand_t  *op;
-					def_t      *alias;
-					ex_pointer_t *ptr = &s->opc->o.value->v.pointer;
-					alias = alias_def (ptr->def, ptr->type, ptr->val);
-					op = def_operand (alias, ptr->type, s->opc->expr);
-					flow_add_op_var (def, op, 0);
-					if (operands)
-						operands[0] = op;
-					else
-						free_operand (op);
-				} else {
-					if (operands)
+				if (!flow_analyize_pointer_operand (s->opc, def, operands)) {
+					if (operands) {
 						operands[3] = s->opc;
+					}
 				}
+			} else if (!strcmp (s->opcode, ".=")) {
+				flow_add_op_var (use, s->opc, 1);
+				flow_analyize_pointer_operand (s->opb, def, operands);
 			} else {
-				if (s->opc)
-					flow_add_op_var (use, s->opc, 1);
+				internal_error (s->expr, "unexpected opcode '%s' for %d",
+								s->opcode, s->type);
 			}
 			if (kill) {
 				set_everything (kill);
 			}
 			if (operands) {
-				if (!strcmp (s->opcode, "<MOVE>"))
+				if (!strcmp (s->opcode, "<MOVE>")
+					|| !strcmp (s->opcode, "<MEMSET>")) {
 					operands[0] = s->opc;
+				}
 				operands[1] = s->opa;
 				operands[2] = s->opb;
-				if (strncmp (s->opcode, "<MOVE", 5))
+				if (strncmp (s->opcode, "<MOVE", 5)) {
 					operands[3] = s->opc;
+				}
 			}
 			break;
 		case st_state:

From 888192a9eaf8772841c3ffc2bef2e40336b49445 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 17 Mar 2020 01:42:46 +0900
Subject: [PATCH 0805/1519] [qfcc] Resurrect ex_def expression type

It turns out to be useful still as using symbol expressions isn't always
appropriate and the workarounds were getting nasty.
---
 tools/qfcc/include/expr.h       |  8 ++++++++
 tools/qfcc/source/dot_expr.c    | 11 +++++++++++
 tools/qfcc/source/expr.c        | 21 +++++++++++++++++++++
 tools/qfcc/source/expr_assign.c |  2 ++
 tools/qfcc/source/statements.c  |  9 +++++++++
 5 files changed, 51 insertions(+)

diff --git a/tools/qfcc/include/expr.h b/tools/qfcc/include/expr.h
index 836ec864d..dc3a84f63 100644
--- a/tools/qfcc/include/expr.h
+++ b/tools/qfcc/include/expr.h
@@ -49,6 +49,7 @@ typedef enum {
 	ex_block,		///< statement block expression (::ex_block_t)
 	ex_expr,		///< binary expression (::ex_expr_t)
 	ex_uexpr,		///< unary expression (::ex_expr_t)
+	ex_def,			///< non-temporary variable (::def_t)
 	ex_symbol,		///< non-temporary variable (::symbol_t)
 	ex_temp,		///< temporary variable (::ex_temp_t)
 	ex_vector,		///< "vector" expression (::ex_vector_t)
@@ -230,6 +231,7 @@ typedef struct expr_s {
 		ex_bool_t   bool;				///< boolean logic expression
 		ex_block_t  block;				///< statement block expression
 		ex_expr_t   expr;				///< binary or unary expression
+		struct def_s *def;				///< def reference expression
 		struct symbol_s *symbol;		///< symbol reference expression
 		ex_temp_t   temp;				///< temporary variable expression
 		ex_vector_t vector;				///< vector expression list
@@ -411,6 +413,12 @@ expr_t *new_binary_expr (int op, expr_t *e1, expr_t *e2);
 */
 expr_t *new_unary_expr (int op, expr_t *e1);
 
+/**	Create a new def reference (non-temporary variable) expression node.
+
+	\return			The new def reference expression node (::def_t).
+*/
+expr_t *new_def_expr (struct def_s *def);
+
 /**	Create a new symbol reference (non-temporary variable) expression node.
 
 	\return 		The new symbol reference expression node (::symbol_t).
diff --git a/tools/qfcc/source/dot_expr.c b/tools/qfcc/source/dot_expr.c
index 76bd21089..27d535845 100644
--- a/tools/qfcc/source/dot_expr.c
+++ b/tools/qfcc/source/dot_expr.c
@@ -62,6 +62,7 @@ const char *expr_names[] =
 	"block",
 	"expr",
 	"uexpr",
+	"def",
 	"symbol",
 	"temp",
 	"vector",
@@ -354,6 +355,15 @@ print_uexpr (dstring_t *dstr, expr_t *e, int level, int id, expr_t *next)
 	dstring_delete (typestr);
 }
 
+static void
+print_def (dstring_t *dstr, expr_t *e, int level, int id, expr_t *next)
+{
+	int         indent = level * 2 + 2;
+
+	dasprintf (dstr, "%*se_%p [label=\"d %s\\n%d\"];\n", indent, "", e,
+			   e->e.def->name, e->line);
+}
+
 static void
 print_symbol (dstring_t *dstr, expr_t *e, int level, int id, expr_t *next)
 {
@@ -542,6 +552,7 @@ _print_expr (dstring_t *dstr, expr_t *e, int level, int id, expr_t *next)
 		print_block,
 		print_subexpr,
 		print_uexpr,
+		print_def,
 		print_symbol,
 		print_temp,
 		print_vector,
diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index 2cd64dc13..8eeea76c1 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -239,6 +239,8 @@ get_type (expr_t *e)
 		case ex_expr:
 		case ex_uexpr:
 			return e->e.expr.type;
+		case ex_def:
+			return e->e.def->type;
 		case ex_symbol:
 			return e->e.symbol->type;
 		case ex_temp:
@@ -342,6 +344,7 @@ copy_expr (expr_t *e)
 		return 0;
 	switch (e->type) {
 		case ex_error:
+		case ex_def:
 		case ex_symbol:
 		case ex_nil:
 		case ex_value:
@@ -610,6 +613,15 @@ new_unary_expr (int op, expr_t *e1)
 	return e;
 }
 
+expr_t *
+new_def_expr (def_t *def)
+{
+	expr_t     *e = new_expr ();
+	e->type = ex_def;
+	e->e.def = def;
+	return e;
+}
+
 expr_t *
 new_symbol_expr (symbol_t *symbol)
 {
@@ -1542,6 +1554,13 @@ unary_expr (int op, expr_t *e)
 						n->e.expr.type = e->e.expr.type;
 						return n;
 					}
+				case ex_def:
+					{
+						expr_t     *n = new_unary_expr (op, e);
+
+						n->e.expr.type = e->e.def->type;
+						return n;
+					}
 				case ex_symbol:
 					{
 						expr_t     *n = new_unary_expr (op, e);
@@ -1602,6 +1621,7 @@ unary_expr (int op, expr_t *e)
 						return error (e, "invalid type for unary !");
 				case ex_uexpr:
 				case ex_expr:
+				case ex_def:
 				case ex_symbol:
 				case ex_temp:
 				case ex_vector:
@@ -1671,6 +1691,7 @@ unary_expr (int op, expr_t *e)
 					goto bitnot_expr;
 				case ex_expr:
 				case ex_bool:
+				case ex_def:
 				case ex_symbol:
 				case ex_temp:
 				case ex_vector:
diff --git a/tools/qfcc/source/expr_assign.c b/tools/qfcc/source/expr_assign.c
index 88d45ad7b..7d1f1aab9 100644
--- a/tools/qfcc/source/expr_assign.c
+++ b/tools/qfcc/source/expr_assign.c
@@ -85,6 +85,8 @@ int
 is_lvalue (const expr_t *expr)
 {
 	switch (expr->type) {
+		case ex_def:
+			return !expr->e.def->constant;
 		case ex_symbol:
 			switch (expr->e.symbol->sy_type) {
 				case sy_name:
diff --git a/tools/qfcc/source/statements.c b/tools/qfcc/source/statements.c
index 1733700fd..a950842e5 100644
--- a/tools/qfcc/source/statements.c
+++ b/tools/qfcc/source/statements.c
@@ -1267,6 +1267,13 @@ expr_uexpr (sblock_t *sblock, expr_t *e, operand_t **op)
 	return sblock;
 }
 
+static sblock_t *
+expr_def (sblock_t *sblock, expr_t *e, operand_t **op)
+{
+	*op = def_operand (e->e.def, e->e.def->type, e);
+	return sblock;
+}
+
 static sblock_t *
 expr_symbol (sblock_t *sblock, expr_t *e, operand_t **op)
 {
@@ -1398,6 +1405,7 @@ statement_subexpr (sblock_t *sblock, expr_t *e, operand_t **op)
 		expr_block,			// ex_block
 		expr_expr,
 		expr_uexpr,
+		expr_def,
 		expr_symbol,
 		expr_temp,
 		expr_vector_e,		// ex_vector
@@ -1715,6 +1723,7 @@ statement_slist (sblock_t *sblock, expr_t *e)
 		statement_block,
 		statement_expr,
 		statement_uexpr,
+		statement_nonexec,	// ex_def
 		statement_nonexec,	// ex_symbol
 		statement_nonexec,	// ex_temp
 		statement_nonexec,	// ex_vector

From e4a403bbb38154b6fa1a28f8e17354fe7587a233 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 17 Mar 2020 10:55:27 +0900
Subject: [PATCH 0806/1519] [qfcc] Improve integral value extraction
 readability

---
 tools/qfcc/source/expr.c | 53 ++++++++++++++++++++++++++--------------
 1 file changed, 35 insertions(+), 18 deletions(-)

diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index 8eeea76c1..509f5fcfb 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -1039,13 +1039,16 @@ expr_quaternion (expr_t *e)
 int
 is_integer_val (expr_t *e)
 {
-	if (e->type == ex_nil)
+	if (e->type == ex_nil) {
 		return 1;
-	if (e->type == ex_value && e->e.value->lltype == ev_integer)
+	}
+	if (e->type == ex_value && e->e.value->lltype == ev_integer) {
 		return 1;
+	}
 	if (e->type == ex_symbol && e->e.symbol->sy_type == sy_const
-		&& (e->e.symbol->type->type == ev_integer
-			|| is_enum (e->e.symbol->type)))
+		&& is_integral (e->e.symbol->type)) {
+		return 1;
+	}
 		return 1;
 	return 0;
 }
@@ -1053,61 +1056,75 @@ is_integer_val (expr_t *e)
 int
 expr_integer (expr_t *e)
 {
-	if (e->type == ex_nil)
+	if (e->type == ex_nil) {
 		return 0;
-	if (e->type == ex_value && e->e.value->lltype == ev_integer)
+	}
+	if (e->type == ex_value && e->e.value->lltype == ev_integer) {
 		return e->e.value->v.integer_val;
+	}
 	if (e->type == ex_symbol && e->e.symbol->sy_type == sy_const
 		&& (e->e.symbol->type->type == ev_integer
-			|| is_enum (e->e.symbol->type)))
+			|| is_enum (e->e.symbol->type))) {
 		return e->e.symbol->s.value->v.integer_val;
+	}
 	if (e->type == ex_symbol && e->e.symbol->sy_type == sy_var
 		&& e->e.symbol->s.def->constant
-		&& is_integral (e->e.symbol->s.def->type))
+		&& is_integral (e->e.symbol->s.def->type)) {
 		return D_INT (e->e.symbol->s.def);
+	}
 	internal_error (e, "not an integer constant");
 }
 
 unsigned
 expr_uinteger (expr_t *e)
 {
-	if (e->type == ex_nil)
+	if (e->type == ex_nil) {
 		return 0;
-	if (e->type == ex_value && e->e.value->lltype == ev_uinteger)
+	}
+	if (e->type == ex_value && e->e.value->lltype == ev_uinteger) {
 		return e->e.value->v.uinteger_val;
+	}
 	if (e->type == ex_symbol && e->e.symbol->sy_type == sy_const
-		&& e->e.symbol->type->type == ev_uinteger)
+		&& e->e.symbol->type->type == ev_uinteger) {
 		return e->e.symbol->s.value->v.uinteger_val;
+	}
 	if (e->type == ex_symbol && e->e.symbol->sy_type == sy_var
 		&& e->e.symbol->s.def->constant
-		&& is_integral (e->e.symbol->s.def->type))
+		&& is_integral (e->e.symbol->s.def->type)) {
 		return D_INT (e->e.symbol->s.def);
+	}
 	internal_error (e, "not an unsigned constant");
 }
 
 int
 is_short_val (expr_t *e)
 {
-	if (e->type == ex_nil)
+	if (e->type == ex_nil) {
 		return 1;
-	if (e->type == ex_value && e->e.value->lltype == ev_short)
+	}
+	if (e->type == ex_value && e->e.value->lltype == ev_short) {
 		return 1;
+	}
 	if (e->type == ex_symbol && e->e.symbol->sy_type == sy_const
-		&& e->e.symbol->type->type == ev_short)
+		&& e->e.symbol->type->type == ev_short) {
 		return 1;
+	}
 	return 0;
 }
 
 short
 expr_short (expr_t *e)
 {
-	if (e->type == ex_nil)
+	if (e->type == ex_nil) {
 		return 0;
-	if (e->type == ex_value && e->e.value->lltype == ev_short)
+	}
+	if (e->type == ex_value && e->e.value->lltype == ev_short) {
 		return e->e.value->v.short_val;
+	}
 	if (e->type == ex_symbol && e->e.symbol->sy_type == sy_const
-		&& e->e.symbol->type->type == ev_short)
+		&& e->e.symbol->type->type == ev_short) {
 		return e->e.symbol->s.value->v.short_val;
+	}
 	internal_error (e, "not a short constant");
 }
 

From 80967e1471cd5448ea0aa296c5e0e433332f45a9 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 17 Mar 2020 10:56:45 +0900
Subject: [PATCH 0807/1519] [qfcc] Support def exprs in integral value
 extractors

---
 tools/qfcc/source/expr.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index 509f5fcfb..638af8e12 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -1049,7 +1049,10 @@ is_integer_val (expr_t *e)
 		&& is_integral (e->e.symbol->type)) {
 		return 1;
 	}
+	if (e->type == ex_def && e->e.def->constant
+		&& is_integral (e->e.def->type)) {
 		return 1;
+	}
 	return 0;
 }
 
@@ -1072,6 +1075,10 @@ expr_integer (expr_t *e)
 		&& is_integral (e->e.symbol->s.def->type)) {
 		return D_INT (e->e.symbol->s.def);
 	}
+	if (e->type == ex_def && e->e.def->constant
+		&& is_integral (e->e.def->type)) {
+		return D_INT (e->e.def);
+	}
 	internal_error (e, "not an integer constant");
 }
 
@@ -1093,6 +1100,10 @@ expr_uinteger (expr_t *e)
 		&& is_integral (e->e.symbol->s.def->type)) {
 		return D_INT (e->e.symbol->s.def);
 	}
+	if (e->type == ex_def && e->e.def->constant
+		&& is_integral (e->e.def->type)) {
+		return D_INT (e->e.def);
+	}
 	internal_error (e, "not an unsigned constant");
 }
 

From c3f04384d565653f05f65fe6fd72815a71df7a7e Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 17 Mar 2020 11:07:50 +0900
Subject: [PATCH 0808/1519] [qfcc] Make a general integral value extractor

All too often I just want the value.
---
 tools/qfcc/include/expr.h |  4 +++
 tools/qfcc/source/expr.c  | 54 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+)

diff --git a/tools/qfcc/include/expr.h b/tools/qfcc/include/expr.h
index dc3a84f63..a181f7205 100644
--- a/tools/qfcc/include/expr.h
+++ b/tools/qfcc/include/expr.h
@@ -567,6 +567,8 @@ unsigned expr_uinteger (expr_t *e) __attribute__((pure));
 expr_t *new_short_expr (short short_val);
 short expr_short (expr_t *e) __attribute__((pure));
 
+int expr_integral (expr_t *e) __attribute__((pure));
+
 /**	Check of the expression refers to a constant value.
 
 	\param e		The expression to check.
@@ -613,7 +615,9 @@ int is_float_val (expr_t *e) __attribute__((pure));
 int is_vector_val (expr_t *e) __attribute__((pure));
 int is_quaternion_val (expr_t *e) __attribute__((pure));
 int is_integer_val (expr_t *e) __attribute__((pure));
+int is_uinteger_val (expr_t *e) __attribute__((pure));
 int is_short_val (expr_t *e) __attribute__((pure));
+int is_integral_val (expr_t *e) __attribute__((pure));
 
 /**	Create a reference to the global <code>.self</code> entity variable.
 
diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index 638af8e12..c8c9207fc 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -1082,6 +1082,26 @@ expr_integer (expr_t *e)
 	internal_error (e, "not an integer constant");
 }
 
+int
+is_uinteger_val (expr_t *e)
+{
+	if (e->type == ex_nil) {
+		return 1;
+	}
+	if (e->type == ex_value && e->e.value->lltype == ev_uinteger) {
+		return 1;
+	}
+	if (e->type == ex_symbol && e->e.symbol->sy_type == sy_const
+		&& is_integral (e->e.symbol->type)) {
+		return 1;
+	}
+	if (e->type == ex_def && e->e.def->constant
+		&& is_integral (e->e.def->type)) {
+		return 1;
+	}
+	return 0;
+}
+
 unsigned
 expr_uinteger (expr_t *e)
 {
@@ -1139,6 +1159,40 @@ expr_short (expr_t *e)
 	internal_error (e, "not a short constant");
 }
 
+int
+is_integral_val (expr_t *e)
+{
+	if (is_constant (e)) {
+		if (is_integer_val (e)) {
+			return 1;
+		}
+		if (is_uinteger_val (e)) {
+			return 1;
+		}
+		if (is_short_val (e)) {
+			return 1;
+		}
+	}
+	return 0;
+}
+
+int
+expr_integral (expr_t *e)
+{
+	if (is_constant (e)) {
+		if (is_integer_val (e)) {
+			return expr_integer (e);
+		}
+		if (is_uinteger_val (e)) {
+			return expr_uinteger (e);
+		}
+		if (is_short_val (e)) {
+			return expr_short (e);
+		}
+	}
+	internal_error (e, "not an integral constant");
+}
+
 expr_t *
 new_alias_expr (type_t *type, expr_t *expr)
 {

From 9cb3ee01d601b92a1813e6e93ed7aaf4952088a6 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 17 Mar 2020 11:19:12 +0900
Subject: [PATCH 0809/1519] [qfcc] Add pointer value check

Extraction is a little more complicated, though, so undecided on that.
---
 tools/qfcc/include/expr.h | 1 +
 tools/qfcc/source/expr.c  | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/tools/qfcc/include/expr.h b/tools/qfcc/include/expr.h
index a181f7205..b2e01a491 100644
--- a/tools/qfcc/include/expr.h
+++ b/tools/qfcc/include/expr.h
@@ -618,6 +618,7 @@ int is_integer_val (expr_t *e) __attribute__((pure));
 int is_uinteger_val (expr_t *e) __attribute__((pure));
 int is_short_val (expr_t *e) __attribute__((pure));
 int is_integral_val (expr_t *e) __attribute__((pure));
+int is_pointer_val (expr_t *e) __attribute__((pure));
 
 /**	Create a reference to the global <code>.self</code> entity variable.
 
diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index c8c9207fc..29e249d70 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -1193,6 +1193,15 @@ expr_integral (expr_t *e)
 	internal_error (e, "not an integral constant");
 }
 
+int
+is_pointer_val (expr_t *e)
+{
+	if (e->type == ex_value && e->e.value->lltype == ev_pointer) {
+		return 1;
+	}
+	return 0;
+}
+
 expr_t *
 new_alias_expr (type_t *type, expr_t *expr)
 {

From 0d751dcdc5e78ec95229d0638e859f301d11b781 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 17 Mar 2020 12:12:06 +0900
Subject: [PATCH 0810/1519] [qfcc] Improve robustness of do_op_integer

---
 tools/qfcc/source/constfold.c | 86 +++++++++++++++++++----------------
 1 file changed, 48 insertions(+), 38 deletions(-)

diff --git a/tools/qfcc/source/constfold.c b/tools/qfcc/source/constfold.c
index f46d1a452..e1b380a5d 100644
--- a/tools/qfcc/source/constfold.c
+++ b/tools/qfcc/source/constfold.c
@@ -789,7 +789,8 @@ do_op_quaternion (int op, expr_t *e, expr_t *e1, expr_t *e2)
 static expr_t *
 do_op_integer (int op, expr_t *e, expr_t *e1, expr_t *e2)
 {
-	int         i1, i2;
+	int         isval1 = 0, isval2 = 0;
+	int         val1, val2;
 	static int  valid[] = {
 		'=', '+', '-', '*', '/', '&', '|', '^', '%',
 		SHL, SHR, AND, OR, LT, GT, LE, GE, EQ, NE, 0
@@ -798,11 +799,23 @@ do_op_integer (int op, expr_t *e, expr_t *e1, expr_t *e2)
 	if (!valid_op (op, valid))
 		return error (e1, "invalid operator for integer");
 
-	if (is_short_val (e1))
-		convert_short_int (e1);
+	if (is_short_val (e1)) {
+		isval1 = 1;
+		val1 = expr_short (e1);
+	}
+	if (is_integer_val (e1)) {
+		isval1 = 1;
+		val1 = expr_integer (e1);
+	}
 
-	if (is_short_val (e2))
-		convert_short_int (e2);
+	if (is_short_val (e2)) {
+		isval2 = 1;
+		val2 = expr_short (e2);
+	}
+	if (is_integer_val (e2)) {
+		isval2 = 1;
+		val2 = expr_integer (e2);
+	}
 
 	if (is_compare (op) || is_logic (op)) {
 		if (options.code.progsversion > PROG_ID_VERSION)
@@ -813,89 +826,86 @@ do_op_integer (int op, expr_t *e, expr_t *e1, expr_t *e2)
 		e->e.expr.type = &type_integer;
 	}
 
-	if (op == '*' && is_constant (e1) && expr_integer (e1) == 1)
+	if (op == '*' && isval1 && val1 == 1)
 		return e2;
-	if (op == '*' && is_constant (e2) && expr_integer (e2) == 1)
+	if (op == '*' && isval2 && val2 == 1)
 		return e1;
-	if (op == '*' && is_constant (e1) && expr_integer (e1) == 0)
+	if (op == '*' && isval1 && val1 == 0)
 		return e1;
-	if (op == '*' && is_constant (e2) && expr_integer (e2) == 0)
+	if (op == '*' && isval2 && val2 == 0)
 		return e2;
-	if (op == '/' && is_constant (e2) && expr_integer (e2) == 1)
+	if (op == '/' && isval2 && val2 == 1)
 		return e1;
-	if (op == '/' && is_constant (e2) && expr_integer (e2) == 0)
+	if (op == '/' && isval2 && val2 == 0)
 		return error (e, "division by zero");
-	if (op == '/' && is_constant (e1) && expr_integer (e1) == 0)
+	if (op == '/' && isval1 && val1 == 0)
 		return e1;
-	if (op == '+' && is_constant (e1) && expr_integer (e1) == 0)
+	if (op == '+' && isval1 && val1 == 0)
 		return e2;
-	if (op == '+' && is_constant (e2) && expr_integer (e2) == 0)
+	if (op == '+' && isval2 && val2 == 0)
 		return e1;
-	if (op == '-' && is_constant (e2) && expr_integer (e2) == 0)
+	if (op == '-' && isval2 && val2 == 0)
 		return e1;
 
-	if (op == '=' || !is_constant (e1) || !is_constant (e2))
+	if (op == '=' || !isval1 || !isval2)
 		return e;
 
-	i1 = expr_integer (e1);
-	i2 = expr_integer (e2);
-
 	switch (op) {
 		case '+':
-			e = new_integer_expr (i1 + i2);
+			e = new_integer_expr (val1 + val2);
 			break;
 		case '-':
-			e = new_integer_expr (i1 - i2);
+			e = new_integer_expr (val1 - val2);
 			break;
 		case '*':
-			e = new_integer_expr (i1 * i2);
+			e = new_integer_expr (val1 * val2);
 			break;
 		case '/':
 			if (options.warnings.integer_divide)
-				warning (e2, "%d / %d == %d", i1, i2, i1 / i2);
-			e = new_integer_expr (i1 / i2);
+				warning (e2, "%d / %d == %d", val1, val2, val1 / val2);
+			e = new_integer_expr (val1 / val2);
 			break;
 		case '&':
-			e = new_integer_expr (i1 & i2);
+			e = new_integer_expr (val1 & val2);
 			break;
 		case '|':
-			e = new_integer_expr (i1 | i2);
+			e = new_integer_expr (val1 | val2);
 			break;
 		case '^':
-			e = new_integer_expr (i1 ^ i2);
+			e = new_integer_expr (val1 ^ val2);
 			break;
 		case '%':
-			e = new_integer_expr (i1 % i2);
+			e = new_integer_expr (val1 % val2);
 			break;
 		case SHL:
-			e = new_integer_expr (i1 << i2);
+			e = new_integer_expr (val1 << val2);
 			break;
 		case SHR:
-			e = new_integer_expr (i1 >> i2);
+			e = new_integer_expr (val1 >> val2);
 			break;
 		case AND:
-			e = cmp_result_expr (i1 && i2);
+			e = cmp_result_expr (val1 && val2);
 			break;
 		case OR:
-			e = cmp_result_expr (i1 || i2);
+			e = cmp_result_expr (val1 || val2);
 			break;
 		case LT:
-			e = cmp_result_expr (i1 < i2);
+			e = cmp_result_expr (val1 < val2);
 			break;
 		case GT:
-			e = cmp_result_expr (i1 > i2);
+			e = cmp_result_expr (val1 > val2);
 			break;
 		case LE:
-			e = cmp_result_expr (i1 <= i2);
+			e = cmp_result_expr (val1 <= val2);
 			break;
 		case GE:
-			e = cmp_result_expr (i1 >= i2);
+			e = cmp_result_expr (val1 >= val2);
 			break;
 		case EQ:
-			e = cmp_result_expr (i1 == i2);
+			e = cmp_result_expr (val1 == val2);
 			break;
 		case NE:
-			e = cmp_result_expr (i1 != i2);
+			e = cmp_result_expr (val1 != val2);
 			break;
 		default:
 			internal_error (e1, 0);

From 0d784d9ef4157c2b383246feae25efdc597b3f1b Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 17 Mar 2020 12:13:09 +0900
Subject: [PATCH 0811/1519] [qfcc] Rework address expr calculation

This removes a bogus lea from the instruction stream (and there can be
many such).
---
 tools/qfcc/source/def.c  |  9 +++++----
 tools/qfcc/source/expr.c | 24 +++++++++++++++++++++---
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/tools/qfcc/source/def.c b/tools/qfcc/source/def.c
index 689b21dac..2fbf0bf08 100644
--- a/tools/qfcc/source/def.c
+++ b/tools/qfcc/source/def.c
@@ -296,8 +296,9 @@ zero_memory (expr_t *local_expr, def_t *def, type_t *zero_type,
 	expr_t     *dst;
 
 	for (; init_offset < init_size + 1 - zero_size; init_offset += zero_size) {
-		dst = new_pointer_expr (init_offset, zero_type, def);
-		append_expr (local_expr, assign_expr (unary_expr ('.', dst), zero));
+		dst = new_def_expr (def);
+		dst = new_offset_alias_expr (zero_type, dst, init_offset);
+		append_expr (local_expr, assign_expr (dst, zero));
 	}
 	return init_offset;
 }
@@ -355,8 +356,8 @@ init_elements (struct def_s *def, expr_t *eles)
 	build_element_chain (&element_chain, def->type, eles, 0);
 
 	if (def->local && local_expr) {
-		expr_t     *ptr = new_pointer_expr (0, def->type, def);
-		assign_elements (local_expr, pointer_expr (ptr), &element_chain);
+		expr_t     *dst = new_def_expr (def);
+		assign_elements (local_expr, dst, &element_chain);
 	} else {
 		def_t       dummy = *def;
 		for (element = element_chain.head; element; element = element->next) {
diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index 29e249d70..ac128e378 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -2256,6 +2256,22 @@ address_expr (expr_t *e1, expr_t *e2, type_t *t)
 		t = get_type (e1);
 
 	switch (e1->type) {
+		case ex_def:
+			{
+				def_t      *def = e1->e.def;
+				type_t     *type = def->type;
+
+				if (is_array (type)) {
+					e = e1;
+					e->type = ex_value;
+					e->e.value = new_pointer_val (0, t, def, 0);
+				} else {
+					e = new_pointer_expr (0, t, def);
+					e->line = e1->line;
+					e->file = e1->file;
+				}
+			}
+			break;
 		case ex_symbol:
 			if (e1->e.symbol->sy_type == sy_var) {
 				def_t      *def = e1->e.symbol->s.def;
@@ -2328,9 +2344,11 @@ address_expr (expr_t *e1, expr_t *e2, type_t *t)
 	if (e2) {
 		if (e2->type == ex_error)
 			return e2;
-		if (e->type == ex_value && e->e.value->lltype == ev_pointer
-			&& is_short_val (e2)) {
-			e->e.value = new_pointer_val (e->e.value->v.pointer.val + expr_short (e2), t, e->e.value->v.pointer.def, 0);
+		if (is_pointer_val (e) && is_integral_val (e2)) {
+			int         base = e->e.value->v.pointer.val;
+			int         offset = expr_integral (e2);
+			def_t      *def = e->e.value->v.pointer.def;
+			e->e.value = new_pointer_val (base + offset, t, def, 0);
 		} else {
 			if (!is_short_val (e2) || expr_short (e2)) {
 				if (e->type == ex_expr && e->e.expr.op == '&') {

From c5400c458175eec7c0f253a3defed1d66fecbcf3 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 17 Mar 2020 12:16:24 +0900
Subject: [PATCH 0812/1519] [qfcc] Make anonstruct test robust against pointer
 math

I noticed that pointer math is currently incorrect in qfcc, but it would
be nice for fixing it to not break anonstruct since it is testing
something else.
---
 tools/qfcc/test/anonstruct.r | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/qfcc/test/anonstruct.r b/tools/qfcc/test/anonstruct.r
index 684ae8c2b..3c025bb38 100644
--- a/tools/qfcc/test/anonstruct.r
+++ b/tools/qfcc/test/anonstruct.r
@@ -28,22 +28,22 @@ int main()
 {
 	anon_t anon;
 	int         ret = 0;
-	if (&anon.snafu != &anon.fizzle) {
+	if ((int)&anon.snafu != (int)&anon.fizzle) {
 		printf ("anon union broken: %p %p\n",
 				&anon.snafu, &anon.fizzle);
 		ret |= 1;
 	}
-	if (&anon.snafu - &anon.baz != 1) {
+	if ((int)&anon.snafu - (int)&anon.baz != 1) {
 		printf ("snafu and baz not adjacant: snafu:%p baz:%p\n",
 				&anon.snafu, &anon.baz);
 		ret |= 1;
 	}
-	if (&anon.baz - &anon.bar != 1) {
+	if ((int)&anon.baz - (int)&anon.bar != 1) {
 		printf ("baz and bar not adjacant: baz:%p bar:%p\n",
 				&anon.baz, &anon.bar);
 		ret |= 1;
 	}
-	if (&anon.bar - &anon.id != 1) {
+	if ((int)&anon.bar - (int)&anon.id != 1) {
 		printf ("bar not after id: bar:%p id:%p\n",
 				&anon.bar, &anon.id);
 		ret |= 1;

From 441e7b99bcb8cd42b8cc2c73ec1bab457bdf1c84 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 17 Mar 2020 12:45:55 +0900
Subject: [PATCH 0813/1519] [qfcc] Correctly implement pointer arithmetic

---
 tools/qfcc/source/expr_binary.c | 74 +++++++++++++++++++++++++--------
 1 file changed, 56 insertions(+), 18 deletions(-)

diff --git a/tools/qfcc/source/expr_binary.c b/tools/qfcc/source/expr_binary.c
index c2d446334..b7b526853 100644
--- a/tools/qfcc/source/expr_binary.c
+++ b/tools/qfcc/source/expr_binary.c
@@ -46,6 +46,7 @@ typedef struct {
 } expr_type_t;
 
 static expr_t *pointer_arithmetic (int op, expr_t *e1, expr_t *e2);
+static expr_t *pointer_compare (int op, expr_t *e1, expr_t *e2);
 static expr_t *inverse_multiply (int op, expr_t *e1, expr_t *e2);
 static expr_t *double_compare (int op, expr_t *e1, expr_t *e2);
 
@@ -176,13 +177,13 @@ static expr_type_t func_func[] = {
 };
 
 static expr_type_t pointer_pointer[] = {
-	{'-',	&type_integer, &type_integer, &type_integer},
-	{EQ,	&type_integer},
-	{NE,	&type_integer},
-	{LE,	&type_integer},
-	{GE,	&type_integer},
-	{LT,	&type_integer},
-	{GT,	&type_integer},
+	{'-',	0, 0, 0, pointer_arithmetic},
+	{EQ,	0, 0, 0, pointer_compare},
+	{NE,	0, 0, 0, pointer_compare},
+	{LE,	0, 0, 0, pointer_compare},
+	{GE,	0, 0, 0, pointer_compare},
+	{LT,	0, 0, 0, pointer_compare},
+	{GT,	0, 0, 0, pointer_compare},
 	{0, 0}
 };
 
@@ -255,7 +256,7 @@ static expr_type_t integer_vector[] = {
 };
 
 static expr_type_t integer_pointer[] = {
-	{'+',	&type_pointer, 0, &type_integer},
+	{'+',	0, 0, 0, pointer_arithmetic},
 	{0, 0}
 };
 
@@ -735,21 +736,58 @@ static expr_t *
 pointer_arithmetic (int op, expr_t *e1, expr_t *e2)
 {
 	expr_t     *e;
-	type_t     *ptype = get_type (e1);
+	type_t     *t1 = get_type (e1);
+	type_t     *t2 = get_type (e2);
+	expr_t     *ptr;
+	expr_t     *offset;
+	expr_t     *psize;
+	type_t     *ptype;
 
-	if (!is_pointer (ptype)) {
-		ptype = get_type (e2);
-	}
-	if (!is_pointer (ptype)) {
+	if (!is_pointer (t1) && !is_pointer (t2)) {
 		internal_error (e1, "pointer arithmetic on non-pointers");
 	}
-
-	e1 = cast_expr (&type_integer, e1);
-	e2 = cast_expr (&type_integer, e2);
-	e = binary_expr (op, e1, e2);
+	if (is_pointer (t1) && is_pointer (t2)) {
+		if (op != '-') {
+			return error (e2, "invalid pointer operation");
+		}
+		if (t1 != t2) {
+			return error (e2, "cannot use %c on pointers of different types",
+						  op);
+		}
+		e1 = cast_expr (&type_integer, e1);
+		e2 = cast_expr (&type_integer, e2);
+		psize = new_integer_expr (type_size (t1->t.fldptr.type));
+		return binary_expr ('/', binary_expr ('-', e1, e2), psize);
+	} else if (is_pointer (t1)) {
+		offset = cast_expr (&type_integer, e2);
+		ptr = cast_expr (&type_integer, e1);
+		ptype = t1;
+	} else if (is_pointer (t2)) {
+		offset = cast_expr (&type_integer, e1);
+		ptr = cast_expr (&type_integer, e2);
+		ptype = t2;
+	}
+	psize = new_integer_expr (type_size (ptype->t.fldptr.type));
+	e = binary_expr (op, ptr, binary_expr ('*', offset, psize));
 	return cast_expr (ptype, e);
 }
 
+static expr_t *
+pointer_compare (int op, expr_t *e1, expr_t *e2)
+{
+	type_t     *t1 = get_type (e1);
+	type_t     *t2 = get_type (e2);
+	expr_t     *e;
+
+	if (!type_assignable (t1, t2)) {
+		return error (e2, "cannot use %s on pointers of different types",
+					  get_op_string (op));
+	}
+	e = new_binary_expr (op, e1, e2);
+	e->e.expr.type = &type_integer;
+	return e;
+}
+
 static expr_t *
 inverse_multiply (int op, expr_t *e1, expr_t *e2)
 {
@@ -790,7 +828,7 @@ double_compare (int op, expr_t *e1, expr_t *e2)
 		e1 = cast_expr (&type_double, e1);
 	}
 	e = new_binary_expr (op, e1, e2);
-	e->e.expr.type = &type_double;
+	e->e.expr.type = &type_integer;
 	return e;
 }
 

From 28a8c1fda7523d2f5ac947127e8532844afb9558 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 17 Mar 2020 14:05:31 +0900
Subject: [PATCH 0814/1519] [qwaq] Implement more curses wrappers

---
 ruamoko/qwaq/qwaq-curses.c      | 83 ++++++++++++++++++++++++++++++++-
 ruamoko/qwaq/qwaq-curses.h      |  2 +
 ruamoko/qwaq/qwaq-textcontext.r | 11 ++++-
 3 files changed, 93 insertions(+), 3 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-curses.c b/ruamoko/qwaq/qwaq-curses.c
index eb9ee8024..3da81cfe3 100644
--- a/ruamoko/qwaq/qwaq-curses.c
+++ b/ruamoko/qwaq/qwaq-curses.c
@@ -1054,6 +1054,64 @@ bi_doupdate (progs_t *pr)
 	qwaq_doupdate (pr);
 }
 
+static void
+qwaq_waddstr (progs_t *pr, int window_id, const char *str)
+{
+	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
+
+	if (get_window (res, __FUNCTION__, window_id)) {
+		int         string_id = acquire_string (res);
+		dstring_t  *print_buffer = res->strings + string_id;
+		int         command[] = {
+						qwaq_cmd_waddstr, 0,
+						window_id, string_id
+					};
+
+		command[1] = CMD_SIZE(command);
+
+		dstring_copystr (print_buffer, str);
+		qwaq_submit_command (res, command);
+	}
+}
+static void
+bi_waddstr (progs_t *pr)
+{
+	int         window_id = P_INT (pr, 0);
+	const char *str = P_GSTRING (pr, 1);
+
+	qwaq_waddstr (pr, window_id, str);
+}
+
+static void
+qwaq_mvwaddstr (progs_t *pr, int window_id, int x, int y, const char *str)
+{
+	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
+
+	if (get_window (res, __FUNCTION__, window_id)) {
+		int         string_id = acquire_string (res);
+		dstring_t  *print_buffer = res->strings + string_id;
+		int         command[] = {
+						qwaq_cmd_mvwaddstr, 0,
+						window_id, x, y, string_id
+					};
+
+		command[1] = CMD_SIZE(command);
+
+		dstring_copystr (print_buffer, str);
+		qwaq_submit_command (res, command);
+	}
+}
+static void
+bi_mvwaddstr (progs_t *pr)
+{
+	int         window_id = P_INT (pr, 0);
+	int         x = P_INT (pr, 1);
+	int         y = P_INT (pr, 2);
+	const char *str = P_GSTRING (pr, 3);
+
+	qwaq_mvwaddstr (pr, window_id, x, y, str);
+}
+
 static void
 qwaq_mvwprintf (progs_t *pr, int window_id, int x, int y, const char *fmt,
 				int count, pr_type_t **args)
@@ -1588,11 +1646,20 @@ static void
 bi_i_TextContext__addch_ (progs_t *pr)
 {
 	int         window_id = P_STRUCT (pr, qwaq_textcontext_t, 0).window;
-	int         ch = P_INT (pr, 1);
+	int         ch = P_INT (pr, 2);
 
 	qwaq_waddch (pr, window_id, ch);
 }
 
+static void
+bi_i_TextContext__addstr_ (progs_t *pr)
+{
+	int         window_id = P_STRUCT (pr, qwaq_textcontext_t, 0).window;
+	const char *str = P_GSTRING (pr, 2);
+
+	qwaq_waddstr (pr, window_id, str);
+}
+
 static void
 bi_i_TextContext__mvvprintf_ (progs_t *pr)
 {
@@ -1633,6 +1700,16 @@ bi_i_TextContext__mvaddch_ (progs_t *pr)
 	qwaq_mvwaddch (pr, window_id, pos->x, pos->y, ch);
 }
 
+static void
+bi_i_TextContext__mvaddstr_ (progs_t *pr)
+{
+	int         window_id = P_STRUCT (pr, qwaq_textcontext_t, 0).window;
+	Point      *pos = &P_PACKED (pr, Point, 2);
+	const char *str = P_GSTRING (pr, 3);
+
+	qwaq_mvwaddstr (pr, window_id, pos->x, pos->y, str);
+}
+
 static void
 bi_i_TextContext__bkgd_ (progs_t *pr)
 {
@@ -1696,6 +1773,8 @@ static builtin_t builtins[] = {
 	{"mvwvprintf",		bi_mvwvprintf,		-1},
 	{"mvwaddch",		bi_mvwaddch,		-1},
 	{"waddch",			bi_waddch,			-1},
+	{"mvwaddstr",		bi_mvwaddstr,		-1},
+	{"waddstr",			bi_waddstr,			-1},
 	{"wrefresh",		bi_wrefresh,		-1},
 	{"get_event",		bi_get_event,		-1},
 	{"max_colors",		bi_max_colors,		-1},
@@ -1723,10 +1802,12 @@ static builtin_t builtins[] = {
 	{"_i_TextContext__printf_",			bi_i_TextContext__printf_,		   -1},
 	{"_i_TextContext__vprintf_",		bi_i_TextContext__vprintf_,		   -1},
 	{"_i_TextContext__addch_",			bi_i_TextContext__addch_,		   -1},
+	{"_i_TextContext__addstr_",			bi_i_TextContext__addstr_,		   -1},
 	{"_i_TextContext__mvvprintf_",		bi_i_TextContext__mvvprintf_,	   -1},
 	{"_c_TextContext__refresh",			bi_c_TextContext__refresh,		   -1},
 	{"_i_TextContext__refresh",			bi_i_TextContext__refresh,		   -1},
 	{"_i_TextContext__mvaddch_",		bi_i_TextContext__mvaddch_,		   -1},
+	{"_i_TextContext__mvaddstr_",		bi_i_TextContext__mvaddstr_,	   -1},
 	{"_i_TextContext__bkgd_",			bi_i_TextContext__bkgd_,		   -1},
 	{"_i_TextContext__scrollok_",		bi_i_TextContext__scrollok_,	   -1},
 	{"_i_TextContext__border_",			bi_i_TextContext__border_,		   -1},
diff --git a/ruamoko/qwaq/qwaq-curses.h b/ruamoko/qwaq/qwaq-curses.h
index 70af63f7c..fc5c5c4cc 100644
--- a/ruamoko/qwaq/qwaq-curses.h
+++ b/ruamoko/qwaq/qwaq-curses.h
@@ -97,6 +97,8 @@ typedef struct panel_s *panel_t;
 @extern void wrefresh (window_t win);
 @extern void mvwaddch (window_t win, int x, int y, int ch);
 @extern void waddch (window_t win, int ch);
+@extern void mvwaddstr (window_t win, int x, int y, string str);
+@extern void waddstr (window_t win, string str);
 
 @extern panel_t create_panel (window_t window);
 @extern void destroy_panel (panel_t panel);
diff --git a/ruamoko/qwaq/qwaq-textcontext.r b/ruamoko/qwaq/qwaq-textcontext.r
index dd94e34c1..d7ec2a4c4 100644
--- a/ruamoko/qwaq/qwaq-textcontext.r
+++ b/ruamoko/qwaq/qwaq-textcontext.r
@@ -119,14 +119,19 @@ static TextContext *screen;
 	return self;
 }
 
-- (void) mvprintf: (Point) pos, string fmt, ... = #0;
 - (void) printf: (string) fmt, ... = #0;
 - (void) vprintf: (string) mft, @va_list args = #0;
 - (void) addch: (int) ch = #0;
+- (void) addstr: (string) str = #0;
+
+- (void) mvprintf: (Point) pos, string fmt, ... = #0;
 - (void) mvvprintf: (Point) pos, string mft, @va_list args = #0;
+- (void) mvaddch: (Point) pos, int ch = #0;
+- (void) mvaddstr: (Point) pos, string str = #0;
+
 - (void) refresh = #0;
 + (void) refresh = #0;
-- (void) mvaddch: (Point) pos, int ch = #0;
+
 - (void) bkgd: (int) ch = #0;
 - (void) scrollok: (int) flag = #0;
 - (void) border: (box_sides_t) sides, box_corners_t corners = #0;
@@ -145,6 +150,8 @@ void mvwvprintf (window_t win, int x, int y, string fmt, @va_list args) = #0;
 void wrefresh (window_t win) = #0;
 void mvwaddch (window_t win, int x, int y, int ch) = #0;
 void waddch (window_t win, int ch) = #0;
+void mvwaddstr (window_t win, int x, int y, string str) = #0;
+void waddstr (window_t win, string str) = #0;
 int get_event (qwaq_event_t *event) = #0;
 int max_colors (void) = #0;
 int max_color_pairs (void) = #0;

From d02a01c28207b5a8c45bcd83c3c5d7e5e6360733 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 17 Mar 2020 14:46:20 +0900
Subject: [PATCH 0815/1519] [qfcc] Make tempop pointer strings more informative

Now that the address of a tempop can be taken, their op strings need to
be visible.
---
 tools/qfcc/source/statements.c | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/tools/qfcc/source/statements.c b/tools/qfcc/source/statements.c
index a950842e5..554473ea8 100644
--- a/tools/qfcc/source/statements.c
+++ b/tools/qfcc/source/statements.c
@@ -77,6 +77,21 @@ optype_str (op_type_e type)
 	return op_type_names[type];
 }
 
+static const char *
+tempop_string (tempop_t *tempop)
+{
+	if (tempop->alias) {
+		return va ("<tmp %s %p:%d:%p:%d:%d>",
+				   pr_type_name[tempop->type->type],
+				   tempop, tempop->users,
+				   &tempop->alias->o.tempop,
+				   tempop->offset,
+				   tempop->alias->o.tempop.users);
+	}
+	return va ("<tmp %s %p:%d>", pr_type_name[tempop->type->type],
+			   &tempop, tempop->users);
+}
+
 const char *
 operand_string (operand_t *op)
 {
@@ -110,6 +125,10 @@ operand_string (operand_t *op)
 						return va ("ptr %s+%d",
 								   op->o.value->v.pointer.def->name,
 								   op->o.value->v.pointer.val);
+					} else if(op->o.value->v.pointer.tempop) {
+						tempop_t   *tempop = op->o.value->v.pointer.tempop;
+						return va ("ptr %s+%d", tempop_string (tempop),
+								   op->o.value->v.pointer.val);
 					} else {
 						return va ("ptr %d", op->o.value->v.pointer.val);
 					}
@@ -136,15 +155,7 @@ operand_string (operand_t *op)
 		case op_label:
 			return op->o.label->name;
 		case op_temp:
-			if (op->o.tempop.alias)
-				return va ("<tmp %s %p:%d:%p:%d:%d>",
-						   pr_type_name[op->type->type],
-						   op, op->o.tempop.users,
-						   op->o.tempop.alias,
-						   op->o.tempop.offset,
-						   op->o.tempop.alias->o.tempop.users);
-			return va ("<tmp %s %p:%d>", pr_type_name[op->o.tempop.type->type],
-					   op, op->o.tempop.users);
+			return tempop_string (&op->o.tempop);
 		case op_alias:
 			{
 				const char *alias = operand_string (op->o.alias);

From c5cbe83f71a8f3cc149a2f4318caa6dceb3c2aa6 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 17 Mar 2020 14:47:34 +0900
Subject: [PATCH 0816/1519] [qfcc] Initialize statement numbers to -1

This is to indicate the statement has not yet been flow analyzed.
---
 tools/qfcc/source/statements.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/qfcc/source/statements.c b/tools/qfcc/source/statements.c
index 554473ea8..6058c62a8 100644
--- a/tools/qfcc/source/statements.c
+++ b/tools/qfcc/source/statements.c
@@ -296,6 +296,7 @@ new_statement (st_type_t type, const char *opcode, expr_t *expr)
 	statement->type = type;
 	statement->opcode = save_string (opcode);
 	statement->expr = expr;
+	statement->number = -1;	// indicates flow analysis not done yet
 	return statement;
 }
 

From 0cbe438ac199abae3a890c72fa25c4e24fbbfd66 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 17 Mar 2020 15:04:07 +0900
Subject: [PATCH 0817/1519] [util] Make va slight robust against chained use

va now cycles through a set of four dstrings rather than using just the
one. This allows for some simple chaining of va usage.
---
 libs/util/va.c | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/libs/util/va.c b/libs/util/va.c
index aa99f7955..dd24c05d1 100644
--- a/libs/util/va.c
+++ b/libs/util/va.c
@@ -51,16 +51,23 @@ VISIBLE char *
 va (const char *fmt, ...)
 {
 	va_list     args;
-	static dstring_t *string;
+	static dstring_t *string[4];
+#define NUM_STRINGS (sizeof (string) / sizeof (string[0]))
+	static int  str_index;
+	dstring_t  *dstr;
 
-	if (!string)
-		string = dstring_new ();
+	if (!string[0]) {
+		for (size_t i = 0; i < NUM_STRINGS; i++) {
+			string[i] = dstring_new ();
+		}
+	}
+	dstr = string[str_index++ % NUM_STRINGS];
 
 	va_start (args, fmt);
-	dvsprintf (string, fmt, args);
+	dvsprintf (dstr, fmt, args);
 	va_end (args);
 
-	return string->str;
+	return dstr->str;
 }
 
 VISIBLE char *

From 0de011d0bf9055d3c2333fbca81ce2f10d53b3c3 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 17 Mar 2020 15:23:24 +0900
Subject: [PATCH 0818/1519] [qfcc] Add some disabled additional statement info

It's a bit cluttered for normal debugging, but I haven't decided how to
make it optional just yet.
---
 tools/qfcc/source/dot_sblock.c | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/tools/qfcc/source/dot_sblock.c b/tools/qfcc/source/dot_sblock.c
index 26e32681e..fc892a1c7 100644
--- a/tools/qfcc/source/dot_sblock.c
+++ b/tools/qfcc/source/dot_sblock.c
@@ -41,6 +41,7 @@
 
 #include <QF/dstring.h>
 #include <QF/quakeio.h>
+#include <QF/set.h>
 #include <QF/va.h>
 
 #include "dags.h"
@@ -62,6 +63,30 @@ flow_statement (dstring_t *dstr, statement_t *s)
 	dasprintf (dstr, "<td>%s</td>", html_string(operand_string (s->opa)));
 	dasprintf (dstr, "<td>%s</td>", html_string(operand_string (s->opb)));
 	dasprintf (dstr, "<td>%s</td>", html_string(operand_string (s->opc)));
+#if 0
+	if (s->number >= 0) {
+		set_t      *use = set_new ();
+		set_t      *def = set_new ();
+		set_t      *kill = set_new ();
+		set_t      *ops = set_new ();
+		operand_t  *operands[4];
+
+		flow_analyze_statement (s, use, def, kill, operands);
+		for (int i = 0; i < 4; i++) {
+			if (operands[i]) {
+				set_add (ops, i);
+			}
+		}
+		dasprintf (dstr, "<td>%s</td>", html_string(set_as_string (use)));
+		dasprintf (dstr, "<td>%s</td>", html_string(set_as_string (def)));
+		dasprintf (dstr, "<td>%s</td>", html_string(set_as_string (kill)));
+		dasprintf (dstr, "<td>%s</td>", html_string(set_as_string (ops)));
+
+		set_delete (use);
+		set_delete (def);
+		set_delete (kill);
+	}
+#endif
 	dasprintf (dstr, "</tr>\n");
 }
 

From 6ec92fb83bf55f2a46ed07d04e239ffe5794efff Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 17 Mar 2020 15:28:15 +0900
Subject: [PATCH 0819/1519] [qfcc] Point pointer tempop to the operand

It turns out I need the operand itself, not just the tempop.
---
 tools/qfcc/include/expr.h      |  2 +-
 tools/qfcc/include/value.h     |  2 +-
 tools/qfcc/source/emit.c       |  5 +++--
 tools/qfcc/source/statements.c | 15 ++++++++-------
 tools/qfcc/source/value.c      |  2 +-
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/tools/qfcc/include/expr.h b/tools/qfcc/include/expr.h
index b2e01a491..be1640ffc 100644
--- a/tools/qfcc/include/expr.h
+++ b/tools/qfcc/include/expr.h
@@ -127,7 +127,7 @@ typedef struct ex_pointer_s {
 	int         val;
 	struct type_s *type;
 	struct def_s *def;
-	struct tempop_s *tempop;
+	struct operand_s *tempop;
 } ex_pointer_t;
 
 typedef struct ex_func_s {
diff --git a/tools/qfcc/include/value.h b/tools/qfcc/include/value.h
index f2dc7195f..a2f13dd67 100644
--- a/tools/qfcc/include/value.h
+++ b/tools/qfcc/include/value.h
@@ -51,7 +51,7 @@ struct ex_value_s *new_field_val (int field_val, struct type_s *type,
 struct ex_value_s *new_func_val (int func_val, struct type_s *type);
 struct ex_value_s *new_pointer_val (int val, struct type_s *type,
 									struct def_s *def,
-									struct tempop_s *tempop);
+									struct operand_s *tempop);
 struct ex_value_s *new_quaternion_val (const float *quaternion_val);
 struct ex_value_s *new_integer_val (int integer_val);
 struct ex_value_s *new_uinteger_val (int uinteger_val);
diff --git a/tools/qfcc/source/emit.c b/tools/qfcc/source/emit.c
index d9b4167f6..e7a4b2465 100644
--- a/tools/qfcc/source/emit.c
+++ b/tools/qfcc/source/emit.c
@@ -63,8 +63,9 @@ static def_t zero_def;
 static def_t *get_operand_def (expr_t *expr, operand_t *op);
 
 static def_t *
-get_tempop_def (expr_t *expr, tempop_t *tempop, type_t *type)
+get_tempop_def (expr_t *expr, operand_t *tmpop, type_t *type)
 {
+	tempop_t   *tempop = &tmpop->o.tempop;
 	if (tempop->def) {
 		return tempop->def;
 	}
@@ -115,7 +116,7 @@ get_operand_def (expr_t *expr, operand_t *op)
 			zero_def.type = &type_short;
 			return &zero_def;	//FIXME
 		case op_temp:
-			return get_tempop_def (expr, &op->o.tempop, op->type);
+			return get_tempop_def (expr, op, op->type);
 		case op_alias:
 			return get_operand_def (expr, op->o.alias);
 		case op_nil:
diff --git a/tools/qfcc/source/statements.c b/tools/qfcc/source/statements.c
index 6058c62a8..ac5d6d6f0 100644
--- a/tools/qfcc/source/statements.c
+++ b/tools/qfcc/source/statements.c
@@ -78,18 +78,19 @@ optype_str (op_type_e type)
 }
 
 static const char *
-tempop_string (tempop_t *tempop)
+tempop_string (operand_t *tmpop)
 {
+	tempop_t   *tempop = &tmpop->o.tempop;
 	if (tempop->alias) {
 		return va ("<tmp %s %p:%d:%p:%d:%d>",
 				   pr_type_name[tempop->type->type],
-				   tempop, tempop->users,
-				   &tempop->alias->o.tempop,
+				   tmpop, tempop->users,
+				   tempop->alias,
 				   tempop->offset,
 				   tempop->alias->o.tempop.users);
 	}
 	return va ("<tmp %s %p:%d>", pr_type_name[tempop->type->type],
-			   &tempop, tempop->users);
+			   tmpop, tempop->users);
 }
 
 const char *
@@ -126,7 +127,7 @@ operand_string (operand_t *op)
 								   op->o.value->v.pointer.def->name,
 								   op->o.value->v.pointer.val);
 					} else if(op->o.value->v.pointer.tempop) {
-						tempop_t   *tempop = op->o.value->v.pointer.tempop;
+						operand_t  *tempop = op->o.value->v.pointer.tempop;
 						return va ("ptr %s+%d", tempop_string (tempop),
 								   op->o.value->v.pointer.val);
 					} else {
@@ -155,7 +156,7 @@ operand_string (operand_t *op)
 		case op_label:
 			return op->o.label->name;
 		case op_temp:
-			return tempop_string (&op->o.tempop);
+			return tempop_string (op);
 		case op_alias:
 			{
 				const char *alias = operand_string (op->o.alias);
@@ -703,7 +704,7 @@ operand_address (operand_t *reference, expr_t *e)
 				reference = reference->o.tempop.alias;
 			}
 			return value_operand (new_pointer_val (offset, type, 0,
-												   &reference->o.tempop), e);
+												   reference), e);
 		case op_alias:
 			//op_alias comes only from alias_operand and that is called
 			// by dags, so not expected
diff --git a/tools/qfcc/source/value.c b/tools/qfcc/source/value.c
index 424dadce5..2ee44db06 100644
--- a/tools/qfcc/source/value.c
+++ b/tools/qfcc/source/value.c
@@ -198,7 +198,7 @@ new_func_val (int func_val, type_t *type)
 
 ex_value_t *
 new_pointer_val (int pointer_val, type_t *type, def_t *def,
-				 struct tempop_s *tempop)
+				 struct operand_s *tempop)
 {
 	ex_value_t  val;
 	if (!type) {

From fa2cbc72d84be5b63812c1a2d8a066466381c471 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 17 Mar 2020 15:48:06 +0900
Subject: [PATCH 0820/1519] [qfcc] Analyze tempop pointers in move/memset
 statements

---
 tools/qfcc/source/flow.c | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/tools/qfcc/source/flow.c b/tools/qfcc/source/flow.c
index ba8868f43..febd101b6 100644
--- a/tools/qfcc/source/flow.c
+++ b/tools/qfcc/source/flow.c
@@ -1054,20 +1054,28 @@ static int
 flow_analyize_pointer_operand (operand_t *ptrop, set_t *def,
 							   operand_t *operands[4])
 {
-	if (ptrop->op_type == op_value
-		&& ptrop->o.value->lltype == ev_pointer
-		&& ptrop->o.value->v.pointer.def) {
-		operand_t  *op;
-		def_t      *alias;
+	if (ptrop->op_type == op_value && ptrop->o.value->lltype == ev_pointer) {
 		ex_pointer_t *ptr = &ptrop->o.value->v.pointer;
-		alias = alias_def (ptr->def, ptr->type, ptr->val);
-		op = def_operand (alias, ptr->type, ptrop->expr);
-		flow_add_op_var (def, op, 0);
-		if (operands)
-			operands[0] = op;
-		else
-			free_operand (op);
-		return 1;
+		operand_t  *op = 0;
+		if (ptrop->o.value->v.pointer.def) {
+			def_t      *alias;
+			alias = alias_def (ptr->def, ptr->type, ptr->val);
+			op = def_operand (alias, ptr->type, ptrop->expr);
+		}
+		if (ptrop->o.value->v.pointer.tempop) {
+			op = ptrop->o.value->v.pointer.tempop;
+		}
+		if (op) {
+			flow_add_op_var (def, op, 0);
+			if (operands) {
+				operands[0] = op;
+			} else {
+				if (op->op_type != op_temp) {
+					free_operand (op);
+				}
+			}
+			return 1;
+		}
 	}
 	return 0;
 }

From dec2e6249ef147a802987d622dfe80c614eeb44d Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 17 Mar 2020 16:32:26 +0900
Subject: [PATCH 0821/1519] [qfcc] Increase flow operand count to 5

MOVEP instructions have up to 5 operands: 2 pointers, the count, and 0-2
referenced variables (when known).
---
 tools/qfcc/include/flow.h      |  3 ++-
 tools/qfcc/source/dags.c       | 14 +++++++++-----
 tools/qfcc/source/dot_sblock.c |  4 ++--
 tools/qfcc/source/flow.c       |  8 ++++----
 4 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/tools/qfcc/include/flow.h b/tools/qfcc/include/flow.h
index f57fd3c37..f68c5d5cf 100644
--- a/tools/qfcc/include/flow.h
+++ b/tools/qfcc/include/flow.h
@@ -102,9 +102,10 @@ typedef struct flowgraph_s {
 
 flowvar_t *flow_get_var (struct operand_s *op);
 
+#define FLOW_OPERANDS 5
 void flow_analyze_statement (struct statement_s *s, struct set_s *use,
 							 struct set_s *def, struct set_s *kill,
-							 struct operand_s *operands[4]);
+							 struct operand_s *operands[FLOW_OPERANDS]);
 
 void flow_data_flow (struct function_s *func);
 
diff --git a/tools/qfcc/source/dags.c b/tools/qfcc/source/dags.c
index 6745a7a94..f1e1edde7 100644
--- a/tools/qfcc/source/dags.c
+++ b/tools/qfcc/source/dags.c
@@ -700,6 +700,8 @@ dag_create (flownode_t *flownode)
 	dagnode_t **nodes;
 	daglabel_t **labels;
 	int         num_statements = 0;
+	int         num_nodes;
+	int         num_lables;
 	set_t      *live_vars = set_new ();
 
 	flush_daglabels ();
@@ -713,14 +715,16 @@ dag_create (flownode_t *flownode)
 
 	dag = new_dag ();
 	dag->flownode = flownode;
-	// at most 4 per statement
-	dag->nodes = alloca (num_statements * 4 * sizeof (dagnode_t));
-	// at most 4 per statement, + return + params
-	dag->labels = alloca (num_statements * (4 + 1 + 8) * sizeof (daglabel_t));
+	// at most FLOW_OPERANDS per statement
+	num_nodes = num_statements * FLOW_OPERANDS;
+	dag->nodes = alloca (num_nodes * sizeof (dagnode_t));
+	// at most FLOW_OPERANDS per statement, + return + params
+	num_lables = num_statements * (FLOW_OPERANDS + 1 + 8);
+	dag->labels = alloca (num_lables * sizeof (daglabel_t));
 	dag->roots = set_new ();
 
 	for (s = block->statements; s; s = s->next) {
-		operand_t  *operands[4];
+		operand_t  *operands[FLOW_OPERANDS];
 		dagnode_t  *n = 0, *children[3] = {0, 0, 0};
 		daglabel_t *op, *lx;
 		int         i;
diff --git a/tools/qfcc/source/dot_sblock.c b/tools/qfcc/source/dot_sblock.c
index fc892a1c7..b0e975ef7 100644
--- a/tools/qfcc/source/dot_sblock.c
+++ b/tools/qfcc/source/dot_sblock.c
@@ -69,10 +69,10 @@ flow_statement (dstring_t *dstr, statement_t *s)
 		set_t      *def = set_new ();
 		set_t      *kill = set_new ();
 		set_t      *ops = set_new ();
-		operand_t  *operands[4];
+		operand_t  *operands[FLOW_OPERANDS];
 
 		flow_analyze_statement (s, use, def, kill, operands);
-		for (int i = 0; i < 4; i++) {
+		for (int i = 0; i < FLOW_OPERANDS; i++) {
 			if (operands[i]) {
 				set_add (ops, i);
 			}
diff --git a/tools/qfcc/source/flow.c b/tools/qfcc/source/flow.c
index febd101b6..0ccf0d32a 100644
--- a/tools/qfcc/source/flow.c
+++ b/tools/qfcc/source/flow.c
@@ -509,7 +509,7 @@ static void
 flow_build_vars (function_t *func)
 {
 	statement_t *s;
-	operand_t   *operands[4];
+	operand_t   *operands[FLOW_OPERANDS];
 	int         num_vars = 0;
 	int         i, j;
 	set_t      *stuse;
@@ -1052,7 +1052,7 @@ flow_add_op_var (set_t *set, operand_t *op, int is_use)
 
 static int
 flow_analyize_pointer_operand (operand_t *ptrop, set_t *def,
-							   operand_t *operands[4])
+							   operand_t *operands[FLOW_OPERANDS])
 {
 	if (ptrop->op_type == op_value && ptrop->o.value->lltype == ev_pointer) {
 		ex_pointer_t *ptr = &ptrop->o.value->v.pointer;
@@ -1082,7 +1082,7 @@ flow_analyize_pointer_operand (operand_t *ptrop, set_t *def,
 
 void
 flow_analyze_statement (statement_t *s, set_t *use, set_t *def, set_t *kill,
-						operand_t *operands[4])
+						operand_t *operands[FLOW_OPERANDS])
 {
 	int         i, start, calln = -1;
 
@@ -1093,7 +1093,7 @@ flow_analyze_statement (statement_t *s, set_t *use, set_t *def, set_t *kill,
 	if (kill)
 		set_empty (kill);
 	if (operands) {
-		for (i = 0; i < 4; i++)
+		for (i = 0; i < FLOW_OPERANDS; i++)
 			operands[i] = 0;
 	}
 

From 3c2f6c8447325ae64fbbc74f93d470296b0ff6b2 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 17 Mar 2020 21:28:10 +0900
Subject: [PATCH 0822/1519] [qfcc] Simplify flow_analyize_pointer_operand

and its usage. The parts of flow_analyze_statement that use it know
where the returned operand needs to go. Unfortunately, this breaks dags
pretty hard, but that's because dags needs to learn about the fancy
assignment-type statements.
---
 tools/qfcc/source/flow.c | 49 +++++++++++++++++-----------------------
 1 file changed, 21 insertions(+), 28 deletions(-)

diff --git a/tools/qfcc/source/flow.c b/tools/qfcc/source/flow.c
index 0ccf0d32a..adf417989 100644
--- a/tools/qfcc/source/flow.c
+++ b/tools/qfcc/source/flow.c
@@ -1050,13 +1050,13 @@ flow_add_op_var (set_t *set, operand_t *op, int is_use)
 	}
 }
 
-static int
-flow_analyize_pointer_operand (operand_t *ptrop, set_t *def,
-							   operand_t *operands[FLOW_OPERANDS])
+static operand_t *
+flow_analyze_pointer_operand (operand_t *ptrop, set_t *def)
 {
+	operand_t  *op = 0;
+
 	if (ptrop->op_type == op_value && ptrop->o.value->lltype == ev_pointer) {
 		ex_pointer_t *ptr = &ptrop->o.value->v.pointer;
-		operand_t  *op = 0;
 		if (ptrop->o.value->v.pointer.def) {
 			def_t      *alias;
 			alias = alias_def (ptr->def, ptr->type, ptr->val);
@@ -1067,17 +1067,9 @@ flow_analyize_pointer_operand (operand_t *ptrop, set_t *def,
 		}
 		if (op) {
 			flow_add_op_var (def, op, 0);
-			if (operands) {
-				operands[0] = op;
-			} else {
-				if (op->op_type != op_temp) {
-					free_operand (op);
-				}
-			}
-			return 1;
 		}
 	}
-	return 0;
+	return op;
 }
 
 void
@@ -1085,6 +1077,9 @@ flow_analyze_statement (statement_t *s, set_t *use, set_t *def, set_t *kill,
 						operand_t *operands[FLOW_OPERANDS])
 {
 	int         i, start, calln = -1;
+	operand_t  *res_op = 0;
+	operand_t  *aux_op1 = 0;
+	operand_t  *aux_op2 = 0;
 
 	if (use)
 		set_empty (use);
@@ -1126,17 +1121,19 @@ flow_analyze_statement (statement_t *s, set_t *use, set_t *def, set_t *kill,
 			if (!strcmp (s->opcode, "<MOVE>")
 				|| !strcmp (s->opcode, "<MEMSET>")) {
 				flow_add_op_var (def, s->opc, 0);
-			} else if (!strcmp (s->opcode, "<MOVEP>")
-					   || !strcmp (s->opcode, "<MEMSETP>")) {
+				res_op = s->opc;
+			} else if (!strcmp (s->opcode, "<MOVEP>")) {
 				flow_add_op_var (use, s->opc, 0);
-				if (!flow_analyize_pointer_operand (s->opc, def, operands)) {
-					if (operands) {
-						operands[3] = s->opc;
-					}
-				}
+				aux_op2 = flow_analyze_pointer_operand (s->opa, use);
+				res_op = flow_analyze_pointer_operand (s->opc, def);
+				aux_op1 = s->opc;
+			} else if (!strcmp (s->opcode, "<MEMSETP>")) {
+				flow_add_op_var (use, s->opc, 0);
+				res_op = flow_analyze_pointer_operand (s->opc, def);
+				aux_op1 = s->opc;
 			} else if (!strcmp (s->opcode, ".=")) {
 				flow_add_op_var (use, s->opc, 1);
-				flow_analyize_pointer_operand (s->opb, def, operands);
+				res_op = flow_analyze_pointer_operand (s->opb, def);
 			} else {
 				internal_error (s->expr, "unexpected opcode '%s' for %d",
 								s->opcode, s->type);
@@ -1145,15 +1142,11 @@ flow_analyze_statement (statement_t *s, set_t *use, set_t *def, set_t *kill,
 				set_everything (kill);
 			}
 			if (operands) {
-				if (!strcmp (s->opcode, "<MOVE>")
-					|| !strcmp (s->opcode, "<MEMSET>")) {
-					operands[0] = s->opc;
-				}
+				operands[0] = res_op;
 				operands[1] = s->opa;
 				operands[2] = s->opb;
-				if (strncmp (s->opcode, "<MOVE", 5)) {
-					operands[3] = s->opc;
-				}
+				operands[3] = aux_op1;
+				operands[4] = aux_op2;
 			}
 			break;
 		case st_state:

From 16bda667857203a43d26d14d7dfd19eb4ede964f Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 17 Mar 2020 21:39:49 +0900
Subject: [PATCH 0823/1519] [qfcc] Add more statement types for move/memset

They ease the statement checks between assign/move/memset and the
pointer versions (don't need all those strcmps)
---
 tools/qfcc/include/statements.h | 13 ++++++++-----
 tools/qfcc/source/dags.c        | 26 ++++++++++++++++++++++----
 tools/qfcc/source/flow.c        |  3 +++
 tools/qfcc/source/statements.c  | 11 +++++++----
 4 files changed, 40 insertions(+), 13 deletions(-)

diff --git a/tools/qfcc/include/statements.h b/tools/qfcc/include/statements.h
index 26904db3d..8ee8a16f4 100644
--- a/tools/qfcc/include/statements.h
+++ b/tools/qfcc/include/statements.h
@@ -73,17 +73,20 @@ typedef struct operand_s {
 
 	Statement types are broken down into expressions (binary and unary,
 	includes address and pointer dereferencing (read)), assignment, pointer
-	assignment (write to dereference pointer), move (special case of pointer
-	assignment), state, function related (call, rcall, return and done), and
-	flow control (conditional branches, goto, jump (single pointer and jump
-	table)).
+	assignment (write to dereference pointer), move (special case of
+	assignment), pointer move (special case of pointer assignment), state,
+	function related (call, rcall, return and done), and flow control
+	(conditional branches, goto, jump (single pointer and jump table)).
 */
 typedef enum {
 	st_none,		///< not a (valid) statement. Used in dags.
 	st_expr,		///< c = a op b; or c = op a;
 	st_assign,		///< b = a
 	st_ptrassign,	///< *b = a; or *(b + c) = a;
-	st_move,		///< memcpy (c, a, b);
+	st_move,		///< memcpy (c, a, b); c and a are direct def references
+	st_ptrmove,		///< memcpy (c, a, b); c and a are pointers
+	st_memset,		///< memset (c, a, b); c is direct def reference
+	st_ptrmemset,	///< memset (c, a, b); c is pointer
 	st_state,		///< state (a, b); or state (a, b, c)
 	st_func,		///< call, rcall or return/done
 	st_flow,		///< if/ifa/ifae/ifb/ifbe/ifnot or goto or jump/jumpb
diff --git a/tools/qfcc/source/dags.c b/tools/qfcc/source/dags.c
index f1e1edde7..e594ca2ae 100644
--- a/tools/qfcc/source/dags.c
+++ b/tools/qfcc/source/dags.c
@@ -49,8 +49,10 @@
 
 #include "dags.h"
 #include "diagnostic.h"
+#include "dot.h"
 #include "flow.h"
 #include "function.h"
+#include "options.h"
 #include "qfcc.h"
 #include "statements.h"
 #include "strpool.h"
@@ -133,6 +135,11 @@ daglabel_string (daglabel_t *label)
 	// operand_string might use quote_string, which returns a pointer to
 	// a static variable.
 	dstring_copystr (str, operand_string (label->op));
+#if 0
+	if (label->op->type) {
+		dstring_appendstr (str, label->op->type->encoding);
+	}
+#endif
 	return quote_string (str->str);
 }
 
@@ -730,10 +737,13 @@ dag_create (flownode_t *flownode)
 		int         i;
 
 		dag_make_children (dag, s, operands, children);
-		if (s->type == st_flow || s->type == st_func)
-			for (i = 0; i < 3; i++)
-				if (children[i])
+		if (s->type == st_flow || s->type == st_func) {
+			for (i = 0; i < 3; i++) {
+				if (children[i]) {
 					dag_make_var_live (live_vars, operands[i + 1]);
+				}
+			}
+		}
 		op = opcode_label (dag, s->opcode, s->expr);
 		n = children[0];
 		if (s->type != st_assign
@@ -759,7 +769,12 @@ dag_create (flownode_t *flownode)
 	labels = malloc (dag->num_labels * sizeof (daglabel_t *));
 	memcpy (labels, dag->labels, dag->num_labels * sizeof (daglabel_t *));
 	dag->labels = labels;
-
+#if 0
+	if (options.block_dot.dags) {
+		flownode->dag = dag;
+		dump_dot ("raw-dags", flownode->graph, dump_dot_flow_dags);
+	}
+#endif
 	dag_remove_dead_vars (dag, live_vars);
 	dag_sort_nodes (dag);
 	set_delete (live_vars);
@@ -972,6 +987,9 @@ dag_gencode (dag_t *dag, sblock_t *block, dagnode_t *dagnode)
 			dst = operands[0];
 			break;
 		case st_move:
+		case st_ptrmove:
+		case st_memset:
+		case st_ptrmemset:
 			if (!strcmp (dagnode->label->opcode, "<MOVE>")) {
 				dst = generate_moves (dag, block, dagnode);
 				break;
diff --git a/tools/qfcc/source/flow.c b/tools/qfcc/source/flow.c
index adf417989..ac554d0a2 100644
--- a/tools/qfcc/source/flow.c
+++ b/tools/qfcc/source/flow.c
@@ -1116,6 +1116,9 @@ flow_analyze_statement (statement_t *s, set_t *use, set_t *def, set_t *kill,
 			break;
 		case st_ptrassign:
 		case st_move:
+		case st_ptrmove:
+		case st_memset:
+		case st_ptrmemset:
 			flow_add_op_var (use, s->opa, 1);
 			flow_add_op_var (use, s->opb, 1);
 			if (!strcmp (s->opcode, "<MOVE>")
diff --git a/tools/qfcc/source/statements.c b/tools/qfcc/source/statements.c
index ac5d6d6f0..78173ac0b 100644
--- a/tools/qfcc/source/statements.c
+++ b/tools/qfcc/source/statements.c
@@ -758,7 +758,7 @@ expr_assign_copy (sblock_t *sblock, expr_t *e, operand_t **op, operand_t *src)
 	const char **opcode_set = opcode_sets[0];
 	const char *opcode;
 	int         need_ptr = 0;
-	//operand_t  *dummy;
+	st_type_t   type = st_move;
 
 	if ((src && src->op_type == op_nil) || src_expr->type == ex_nil) {
 		// switch to memset because nil is type agnostic 0 and structures
@@ -769,6 +769,7 @@ expr_assign_copy (sblock_t *sblock, expr_t *e, operand_t **op, operand_t *src)
 		if (op) {
 			*op = nil_operand (dst_type, src_expr);
 		}
+		type = st_memset;
 		if (is_indirect (dst_expr)) {
 			goto dereference_dst;
 		}
@@ -815,9 +816,10 @@ dereference_dst:
 		opcode = opcode_set[0];
 	} else {
 		opcode = opcode_set[1];
+		type++;	// from st_move/st_memset to st_ptrmove/st_ptrmemset
 	}
 
-	s = new_statement (st_move, opcode, e);
+	s = new_statement (type, opcode, e);
 	s->opa = src;
 	s->opb = size;
 	s->opc = dst;
@@ -932,7 +934,8 @@ expr_move (sblock_t *sblock, expr_t *e, operand_t **op)
 	dst = *op;
 	sblock = statement_subexpr (sblock, src_expr, &src);
 	sblock = statement_subexpr (sblock, size_expr, &size);
-	s = new_statement (st_move, convert_op (e->e.expr.op), e);
+	s = new_statement (e->e.expr.op == 'm' ? st_move : st_ptrmove,
+					   convert_op (e->e.expr.op), e);
 	s->opa = src;
 	s->opb = size;
 	s->opc = dst;
@@ -1068,7 +1071,7 @@ expr_deref (sblock_t *sblock, expr_t *deref, operand_t **op)
 
 			dst_addr = operand_address (*op, e);
 
-			s = new_statement (st_move, "<MOVEP>", deref);
+			s = new_statement (st_ptrmove, "<MOVEP>", deref);
 			s->opa = src_addr;
 			//FIXME large types
 			s->opb = short_operand (type_size (type), e);

From 77806f4b1b5929be4aceeb1d138c3a15b6940685 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 17 Mar 2020 22:35:36 +0900
Subject: [PATCH 0824/1519] [qfcc] Get dag code generation mostly working

There's an ICE in return-ivar, but assignchain passes let alone builds.
---
 tools/qfcc/source/dags.c | 120 ++++++++++++++++++++++++++++++---------
 1 file changed, 93 insertions(+), 27 deletions(-)

diff --git a/tools/qfcc/source/dags.c b/tools/qfcc/source/dags.c
index e594ca2ae..718a6319b 100644
--- a/tools/qfcc/source/dags.c
+++ b/tools/qfcc/source/dags.c
@@ -746,13 +746,14 @@ dag_create (flownode_t *flownode)
 		}
 		op = opcode_label (dag, s->opcode, s->expr);
 		n = children[0];
-		if (s->type != st_assign
-			&& !(n = dagnode_search (dag, op, children))) {
-			n = new_node (dag);
-			n->type = s->type;
-			n->label = op;
-			dagnode_add_children (dag, n, operands, children);
-			dagnode_set_edges (dag, n);
+		if (s->type != st_assign) {
+			if (!(n = dagnode_search (dag, op, children))) {
+				n = new_node (dag);
+				n->type = s->type;
+				n->label = op;
+				dagnode_add_children (dag, n, operands, children);
+				dagnode_set_edges (dag, n);
+			}
 		}
 		lx = operand_label (dag, operands[0]);
 		if (lx && lx->dagnode != n) {
@@ -893,24 +894,91 @@ generate_moveps (dag_t *dag, sblock_t *block, dagnode_t *dagnode)
 
 	operands[0] = make_operand (dag, block, dagnode, 0);
 	operands[1] = make_operand (dag, block, dagnode, 1);
+	if (dagnode->children[2]) {
+		operands[2] = make_operand (dag, block, dagnode, 2);
+		st = build_statement ("<MOVEP>", operands, dagnode->label->expr);
+		sblock_add_statement (block, st);
+	} else {
+		for (var_iter = set_first (dagnode->identifiers); var_iter;
+			 var_iter = set_next (var_iter)) {
+			var = dag->labels[var_iter->element];
+			dst = var->op;
+			type = dst->o.def->type;
+			dstDef = dst->o.def;
+			if (dstDef->alias) {
+				offset = dstDef->offset;
+				dstDef = dstDef->alias;
+			}
+			operands[2] = value_operand (new_pointer_val (offset, type, dstDef, 0),
+										 operands[1]->expr);
+			st = build_statement ("<MOVEP>", operands, var->expr);
+			sblock_add_statement (block, st);
+		}
+	}
+	return dst;
+}
+
+static operand_t *
+generate_memsets (dag_t *dag, sblock_t *block, dagnode_t *dagnode)
+{
+	set_iter_t *var_iter;
+	daglabel_t  *var;
+	operand_t   *operands[3] = {0, 0, 0};
+	statement_t *st;
+	operand_t   *dst;
+
+	operands[0] = make_operand (dag, block, dagnode, 0);
+	operands[1] = make_operand (dag, block, dagnode, 1);
+	dst = operands[0];
 	for (var_iter = set_first (dagnode->identifiers); var_iter;
 		 var_iter = set_next (var_iter)) {
 		var = dag->labels[var_iter->element];
-		dst = var->op;
-		type = dst->o.def->type;
-		dstDef = dst->o.def;
-		if (dstDef->alias) {
-			offset = dstDef->offset;
-			dstDef = dstDef->alias;
-		}
-		operands[2] = value_operand (new_pointer_val (offset, type, dstDef, 0),
-									 operands[1]->expr);
-		st = build_statement ("<MOVEP>", operands, var->expr);
+		operands[2] = var->op;
+		dst = operands[2];
+		st = build_statement ("<MEMSET>", operands, var->expr);
 		sblock_add_statement (block, st);
 	}
 	return dst;
 }
 
+static operand_t *
+generate_memsetps (dag_t *dag, sblock_t *block, dagnode_t *dagnode)
+{
+	set_iter_t *var_iter;
+	daglabel_t  *var;
+	operand_t   *operands[3] = {0, 0, 0};
+	statement_t *st;
+	operand_t   *dst = 0;
+	type_t      *type;
+	int          offset = 0;
+	def_t       *dstDef;
+
+	operands[0] = make_operand (dag, block, dagnode, 0);
+	operands[1] = make_operand (dag, block, dagnode, 1);
+	if (dagnode->children[2]) {
+		operands[2] = make_operand (dag, block, dagnode, 2);
+		st = build_statement ("<MEMSETP>", operands, dagnode->label->expr);
+		sblock_add_statement (block, st);
+	} else {
+		for (var_iter = set_first (dagnode->identifiers); var_iter;
+			 var_iter = set_next (var_iter)) {
+			var = dag->labels[var_iter->element];
+			dst = var->op;
+			type = dst->o.def->type;
+			dstDef = dst->o.def;
+			if (dstDef->alias) {
+				offset = dstDef->offset;
+				dstDef = dstDef->alias;
+			}
+			operands[2] = value_operand (new_pointer_val (offset, type, dstDef, 0),
+										 operands[1]->expr);
+			st = build_statement ("<MEMSETP>", operands, var->expr);
+			sblock_add_statement (block, st);
+		}
+	}
+	return dst;
+}
+
 static operand_t *
 generate_assignments (dag_t *dag, sblock_t *block, operand_t *src,
 					  set_iter_t *var_iter, type_t *type)
@@ -987,19 +1055,17 @@ dag_gencode (dag_t *dag, sblock_t *block, dagnode_t *dagnode)
 			dst = operands[0];
 			break;
 		case st_move:
+			dst = generate_moves (dag, block, dagnode);
+			break;
 		case st_ptrmove:
+			dst = generate_moveps (dag, block, dagnode);
+			break;
 		case st_memset:
+			dst = generate_memsets (dag, block, dagnode);
+			break;
 		case st_ptrmemset:
-			if (!strcmp (dagnode->label->opcode, "<MOVE>")) {
-				dst = generate_moves (dag, block, dagnode);
-				break;
-			}
-			if (!strcmp (dagnode->label->opcode, "<MOVEP>")
-				&& !dagnode->children[2]) {
-				dst = generate_moveps (dag, block, dagnode);
-				break;
-			}
-			//fall through
+			dst = generate_memsetps (dag, block, dagnode);
+			break;
 		case st_state:
 		case st_func:
 			for (i = 0; i < 3; i++)

From 34c9ec51bb2cd67866882d0208dc166a59ce1d1a Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 17 Mar 2020 22:46:23 +0900
Subject: [PATCH 0825/1519] [qfcc] Make opcode and statement type names
 available

---
 tools/qfcc/include/statements.h |  3 +++
 tools/qfcc/source/statements.c  | 16 +++++++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/tools/qfcc/include/statements.h b/tools/qfcc/include/statements.h
index 8ee8a16f4..829723729 100644
--- a/tools/qfcc/include/statements.h
+++ b/tools/qfcc/include/statements.h
@@ -119,6 +119,9 @@ struct expr_s;
 struct type_s;
 struct dstring_s;
 
+extern const char *op_type_names[];
+extern const char *st_type_names[];
+
 const char *optype_str (op_type_e type) __attribute__((const));
 
 operand_t *nil_operand (struct type_s *type, struct expr_s *expr);
diff --git a/tools/qfcc/source/statements.c b/tools/qfcc/source/statements.c
index 78173ac0b..ba7af0765 100644
--- a/tools/qfcc/source/statements.c
+++ b/tools/qfcc/source/statements.c
@@ -60,7 +60,7 @@
 #include "value.h"
 #include "qc-parse.h"
 
-static const char *op_type_names[] = {
+const char *op_type_names[] = {
 	"op_def",
 	"op_value",
 	"op_label",
@@ -69,6 +69,20 @@ static const char *op_type_names[] = {
 	"op_nil",
 };
 
+const char *st_type_names[] = {
+	"st_none",
+	"st_expr",
+	"st_assign",
+	"st_ptrassign",
+	"st_move",
+	"st_ptrmove",
+	"st_memset",
+	"st_ptrmemset",
+	"st_state",
+	"st_func",
+	"st_flow",
+};
+
 const char *
 optype_str (op_type_e type)
 {

From 578bf9a16f893619b78acc98d888eb07b4aaf11f Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 17 Mar 2020 22:54:27 +0900
Subject: [PATCH 0826/1519] [qfcc] Set dag node value for movep

This fixes compilation of all tests. However, structptr still fails.
---
 tools/qfcc/source/dags.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tools/qfcc/source/dags.c b/tools/qfcc/source/dags.c
index 718a6319b..6b3e3ff44 100644
--- a/tools/qfcc/source/dags.c
+++ b/tools/qfcc/source/dags.c
@@ -898,6 +898,11 @@ generate_moveps (dag_t *dag, sblock_t *block, dagnode_t *dagnode)
 		operands[2] = make_operand (dag, block, dagnode, 2);
 		st = build_statement ("<MOVEP>", operands, dagnode->label->expr);
 		sblock_add_statement (block, st);
+		if ((var_iter = set_first (dagnode->identifiers))) {
+			var = dag->labels[var_iter->element];
+			dst = var->op;
+			set_del_iter (var_iter);
+		}
 	} else {
 		for (var_iter = set_first (dagnode->identifiers); var_iter;
 			 var_iter = set_next (var_iter)) {

From 22cd39c853d9c85dae8f976dba82868480758679 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 17 Mar 2020 23:05:57 +0900
Subject: [PATCH 0827/1519] [qfcc] Mark ptr assignment offset as an operand

This fixes structptr. All current tests pass.
---
 tools/qfcc/source/flow.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/qfcc/source/flow.c b/tools/qfcc/source/flow.c
index ac554d0a2..438ece827 100644
--- a/tools/qfcc/source/flow.c
+++ b/tools/qfcc/source/flow.c
@@ -1137,6 +1137,7 @@ flow_analyze_statement (statement_t *s, set_t *use, set_t *def, set_t *kill,
 			} else if (!strcmp (s->opcode, ".=")) {
 				flow_add_op_var (use, s->opc, 1);
 				res_op = flow_analyze_pointer_operand (s->opb, def);
+				aux_op1 = s->opc;
 			} else {
 				internal_error (s->expr, "unexpected opcode '%s' for %d",
 								s->opcode, s->type);

From 43ea34535e9959e997d6efaaddc790b13f2d5dce Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 17 Mar 2020 23:34:37 +0900
Subject: [PATCH 0828/1519] [qfcc] Make ivar-struct-return fail

It turns out that assignments to struct fields are not counted as live
when the whole struct is later used via a pointer move.
---
 tools/qfcc/test/ivar-struct-return.r | 11 ++++++-----
 tools/qfcc/test/test-harness.h       |  2 ++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/tools/qfcc/test/ivar-struct-return.r b/tools/qfcc/test/ivar-struct-return.r
index a3883b81c..8351293c8 100644
--- a/tools/qfcc/test/ivar-struct-return.r
+++ b/tools/qfcc/test/ivar-struct-return.r
@@ -1,4 +1,5 @@
 #pragma bug die
+#include "test-harness.h"
 
 struct Point {
 	int x;
@@ -11,18 +12,18 @@ typedef struct Point Point;
 	int   foo;
 	Point origin;
 }
--(Point) origin;
++(Point) origin;
 @end
 
 @implementation Object
--(Point) origin
++(Point) origin
 {
-	origin = nil;
+	origin = {1, 2};
 	return origin;
 }
 @end
-void __obj_exec_class (struct obj_module *msg) = #0;
 int main()
 {
-	return 0;	// to survive and prevail
+	Point p = [Object origin];
+	return !(p.x == 1 && p.y == 2);
 }
diff --git a/tools/qfcc/test/test-harness.h b/tools/qfcc/test/test-harness.h
index f350c7ec7..63f368416 100644
--- a/tools/qfcc/test/test-harness.h
+++ b/tools/qfcc/test/test-harness.h
@@ -5,3 +5,5 @@ string strerror (int err) = #0;
 void exit (int code) = #0;
 entity spawn (void) = #0;
 void remove (entity e) = #0;
+id obj_msgSend (id receiver, SEL op, ...) = #0;
+void __obj_exec_class (struct obj_module *msg) = #0;

From 0293d335d01b5367c80ac87435137a28287208dc Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 18 Mar 2020 00:02:36 +0900
Subject: [PATCH 0829/1519] [qfcc] Mark known source def live for movep

This fixes ivar-struct-return (and qwaq).
---
 tools/qfcc/source/dags.c       | 5 +++++
 tools/qfcc/source/dot_sblock.c | 3 +--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/tools/qfcc/source/dags.c b/tools/qfcc/source/dags.c
index 6b3e3ff44..8b352e1c1 100644
--- a/tools/qfcc/source/dags.c
+++ b/tools/qfcc/source/dags.c
@@ -744,6 +744,11 @@ dag_create (flownode_t *flownode)
 				}
 			}
 		}
+		if (operands[4]) {
+			// a movep instruction knew what it was reading, so mark that
+			// as live
+			dag_make_var_live (live_vars, operands[4]);
+		}
 		op = opcode_label (dag, s->opcode, s->expr);
 		n = children[0];
 		if (s->type != st_assign) {
diff --git a/tools/qfcc/source/dot_sblock.c b/tools/qfcc/source/dot_sblock.c
index b0e975ef7..8e003aa6b 100644
--- a/tools/qfcc/source/dot_sblock.c
+++ b/tools/qfcc/source/dot_sblock.c
@@ -102,11 +102,10 @@ dot_sblock (dstring_t *dstr, sblock_t *sblock, int blockno)
 	dasprintf (dstr, "      <tr>\n");
 	dasprintf (dstr, "        <td colspan=\"2\" >%p(%d)</td>\n", sblock,
 			   blockno);
-	dasprintf (dstr, "        <td height=\"0\" colspan=\"2\" port=\"s\">\n");
+	dasprintf (dstr, "        <td height=\"0\" colspan=\"3\" port=\"s\">\n");
 	for (l = sblock->labels; l; l = l->next)
 		dasprintf (dstr, "            %s(%d)\n", l->name, l->used);
 	dasprintf (dstr, "        </td>\n");
-	dasprintf (dstr, "        <td></td>\n");
 	dasprintf (dstr, "      </tr>\n");
 	for (s = sblock->statements; s; s = s->next)
 		flow_statement (dstr, s);

From e5bc6dd8b688eeecc9748b0370697db76eb194d2 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 18 Mar 2020 01:12:23 +0900
Subject: [PATCH 0830/1519] [qwaq] Split Array(Group) into its own file

---
 ruamoko/qwaq/Makefile.am   |  1 +
 ruamoko/qwaq/qwaq-garray.r | 66 ++++++++++++++++++++++++++++++++++++++
 ruamoko/qwaq/qwaq-group.r  | 63 ------------------------------------
 3 files changed, 67 insertions(+), 63 deletions(-)
 create mode 100644 ruamoko/qwaq/qwaq-garray.r

diff --git a/ruamoko/qwaq/Makefile.am b/ruamoko/qwaq/Makefile.am
index dc5fa56b9..76b4af136 100644
--- a/ruamoko/qwaq/Makefile.am
+++ b/ruamoko/qwaq/Makefile.am
@@ -26,6 +26,7 @@ SUFFIXES=.o .r
 qwaq_app_dat_src= \
 	qwaq-app.r \
 	qwaq-draw.r \
+	qwaq-garray.r \
 	qwaq-group.r \
 	qwaq-rect.r \
 	qwaq-screen.r \
diff --git a/ruamoko/qwaq/qwaq-garray.r b/ruamoko/qwaq/qwaq-garray.r
new file mode 100644
index 000000000..1b7fc46d3
--- /dev/null
+++ b/ruamoko/qwaq/qwaq-garray.r
@@ -0,0 +1,66 @@
+#include <Array.h>
+#include "event.h"
+#include "qwaq-group.h"
+
+@implementation Array (Group)
+- (void) makeObjectsPerformSelector: (SEL)selector
+								 if: (condition_func)condition
+							   with: (void *)data
+{
+	for (int i = 0; i < [self count]; i++) {
+		if (condition (_objs[i], data)) {
+			[_objs[i] performSelector: selector];
+		}
+	}
+}
+
+- (void) makeObjectsPerformSelector: (SEL)selector
+						 withObject: (void *)anObject
+								 if: (condition_func2)condition
+							   with: (void *)data
+{
+	for (int i = 0; i < [self count]; i++) {
+		if (condition (_objs[i], anObject, data)) {
+			[_objs[i] performSelector: selector withObject: anObject];
+		}
+	}
+}
+
+- (void) makeReversedObjectsPerformSelector: (SEL)selector
+{
+	for (int i = [self count]; i-->0; ) {
+		[_objs[i] performSelector: selector];
+	}
+}
+
+- (void) makeReversedObjectsPerformSelector: (SEL)selector
+								 withObject: (void *)anObject
+{
+	for (int i = [self count]; i-->0; ) {
+		[_objs[i] performSelector: selector withObject: anObject];
+	}
+}
+
+- (void) makeReversedObjectsPerformSelector: (SEL)selector
+										 if: (condition_func)condition
+									   with: (void *)data
+{
+	for (int i = [self count]; i-->0; ) {
+		if (condition (_objs[i], data)) {
+			[_objs[i] performSelector: selector];
+		}
+	}
+}
+
+- (void) makeReversedObjectsPerformSelector: (SEL)selector
+								 withObject: (void *)anObject
+										 if: (condition_func2)condition
+									   with: (void *)data
+{
+	for (int i = [self count]; i-->0; ) {
+		if (condition (_objs[i], anObject, data)) {
+			[_objs[i] performSelector: selector withObject: anObject];
+		}
+	}
+}
+@end
diff --git a/ruamoko/qwaq/qwaq-group.r b/ruamoko/qwaq/qwaq-group.r
index 57a5eb8a6..205f07dda 100644
--- a/ruamoko/qwaq/qwaq-group.r
+++ b/ruamoko/qwaq/qwaq-group.r
@@ -2,69 +2,6 @@
 #include "event.h"
 #include "qwaq-group.h"
 
-@implementation Array (Group)
-- (void) makeObjectsPerformSelector: (SEL)selector
-								 if: (condition_func)condition
-							   with: (void *)data
-{
-	for (int i = 0; i < [self count]; i++) {
-		if (condition (_objs[i], data)) {
-			[_objs[i] performSelector: selector];
-		}
-	}
-}
-
-- (void) makeObjectsPerformSelector: (SEL)selector
-						 withObject: (void *)anObject
-								 if: (condition_func2)condition
-							   with: (void *)data
-{
-	for (int i = 0; i < [self count]; i++) {
-		if (condition (_objs[i], anObject, data)) {
-			[_objs[i] performSelector: selector withObject: anObject];
-		}
-	}
-}
-
-- (void) makeReversedObjectsPerformSelector: (SEL)selector
-{
-	for (int i = [self count]; i-->0; ) {
-		[_objs[i] performSelector: selector];
-	}
-}
-
-- (void) makeReversedObjectsPerformSelector: (SEL)selector
-								 withObject: (void *)anObject
-{
-	for (int i = [self count]; i-->0; ) {
-		[_objs[i] performSelector: selector withObject: anObject];
-	}
-}
-
-- (void) makeReversedObjectsPerformSelector: (SEL)selector
-										 if: (condition_func)condition
-									   with: (void *)data
-{
-	for (int i = [self count]; i-->0; ) {
-		if (condition (_objs[i], data)) {
-			[_objs[i] performSelector: selector];
-		}
-	}
-}
-
-- (void) makeReversedObjectsPerformSelector: (SEL)selector
-								 withObject: (void *)anObject
-										 if: (condition_func2)condition
-									   with: (void *)data
-{
-	for (int i = [self count]; i-->0; ) {
-		if (condition (_objs[i], anObject, data)) {
-			[_objs[i] performSelector: selector withObject: anObject];
-		}
-	}
-}
-@end
-
 @implementation Group
 
 -initWithContext: (id) context

From affadc3d252c8a74eefad6892527405b082ccbe6 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 18 Mar 2020 01:39:12 +0900
Subject: [PATCH 0831/1519] [qwaq] Create protocols for DrawBuffer and
 TextContext

Plenty of flaws at the moment (casts to id :/), but the basic idea seems
to be ok.
---
 ruamoko/qwaq/qwaq-app.r         |  4 +---
 ruamoko/qwaq/qwaq-draw.h        | 27 +++++++++++++++++----------
 ruamoko/qwaq/qwaq-draw.r        |  3 +++
 ruamoko/qwaq/qwaq-group.h       |  4 ++--
 ruamoko/qwaq/qwaq-group.r       |  3 +--
 ruamoko/qwaq/qwaq-screen.r      |  2 +-
 ruamoko/qwaq/qwaq-textcontext.h |  9 ++-------
 ruamoko/qwaq/qwaq-view.h        |  8 ++------
 ruamoko/qwaq/qwaq-view.r        |  4 +++-
 ruamoko/qwaq/qwaq-window.r      |  8 ++++----
 10 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-app.r b/ruamoko/qwaq/qwaq-app.r
index 5b5889768..d8809f307 100644
--- a/ruamoko/qwaq/qwaq-app.r
+++ b/ruamoko/qwaq/qwaq-app.r
@@ -47,9 +47,7 @@ arp_end (void)
 	r.offset.y = r.extent.height / 4;
 	r.extent.width /= 2;
 	r.extent.height /= 2;
-	Window *w;
-	[objects insert: w=[[Window windowWithRect: r] setBackground: COLOR_PAIR (2)]];
-	//wprintf (w.window, "%d %d %d %d\n", r.offset.x, r.offset.y, r.extent.width, r.ylen);
+	[objects insert: [[Window windowWithRect: r] setBackground: COLOR_PAIR (2)]];
 	return self;
 }
 
diff --git a/ruamoko/qwaq/qwaq-draw.h b/ruamoko/qwaq/qwaq-draw.h
index 5f7c7bc18..1592559d0 100644
--- a/ruamoko/qwaq/qwaq-draw.h
+++ b/ruamoko/qwaq/qwaq-draw.h
@@ -5,20 +5,17 @@
 
 #include "qwaq-rect.h"
 
-@interface DrawBuffer : Object
-{
-	int        *buffer;
-	Extent      size;
-	Point       cursor;
-}
-+ (DrawBuffer *) buffer: (Extent) size;
-- initWithSize: (Extent) size;
+@class DrawBuffer;
 
+@protocol DrawBuffer
+- blitFromBuffer: (DrawBuffer *) srcBuffer to: (Point) pos from: (Rect) rect;
+- (Rect) rect;
 - (Extent) size;
 - (int *) buffer;
-- (Rect) rect;
+@end
 
-- blitFromBuffer: (DrawBuffer *) srcBuffer to: (Point) pos from: (Rect) rect;
+@protocol TextContext
+- (Extent) size;
 
 - (void) printf: (string) fmt, ...;
 - (void) vprintf: (string) fmt, @va_list args;
@@ -30,4 +27,14 @@
 - (void) mvaddstr: (Point) pos, string str;
 @end
 
+@interface DrawBuffer : Object <DrawBuffer, TextContext>
+{
+	int        *buffer;
+	Extent      size;
+	Point       cursor;
+}
++ (DrawBuffer *) buffer: (Extent) size;
+- initWithSize: (Extent) size;
+@end
+
 #endif
diff --git a/ruamoko/qwaq/qwaq-draw.r b/ruamoko/qwaq/qwaq-draw.r
index 1311deb3c..600537215 100644
--- a/ruamoko/qwaq/qwaq-draw.r
+++ b/ruamoko/qwaq/qwaq-draw.r
@@ -41,6 +41,9 @@
 	Rect r = { {}, size };
 	Rect t = { pos, rect.extent };
 
+	wprintf (stdscr, "src: %p\n", srcBuffer);
+	wprintf (stdscr, "srcSize: %d %d\n", srcSize.width, srcSize.height);
+
 	t = clipRect (r, t);
 	if (t.extent.width < 0 || t.extent.height < 0) {
 		return self;
diff --git a/ruamoko/qwaq/qwaq-group.h b/ruamoko/qwaq/qwaq-group.h
index be251b243..c534979ab 100644
--- a/ruamoko/qwaq/qwaq-group.h
+++ b/ruamoko/qwaq/qwaq-group.h
@@ -31,9 +31,9 @@ typedef BOOL condition_func2 (id object, void *anObject, void *data);
 {
 	Array      *views;
 	int         focused;
-	id          buffer;	//FIXME id<TextContext> or sim
+	id<TextContext> buffer;
 }
--initWithContext: (id) context;	//FIXME id<TextContext> or sim
+-initWithContext: (id<TextContext>) context;
 -insert: (View *) view;
 -remove: (View *) view;
 @end
diff --git a/ruamoko/qwaq/qwaq-group.r b/ruamoko/qwaq/qwaq-group.r
index 205f07dda..770834c71 100644
--- a/ruamoko/qwaq/qwaq-group.r
+++ b/ruamoko/qwaq/qwaq-group.r
@@ -4,14 +4,13 @@
 
 @implementation Group
 
--initWithContext: (id) context
+-initWithContext: (id<TextContext>) context
 {
 	if (!(self = [super init])) {
 		return nil;
 	}
 	textContext = context;
 	absRect = rect = { nil, [textContext size] };
-	printf ("\n\nsize:%d %d\n\n", rect.extent.width, rect.extent.height);
 	buffer = [DrawBuffer buffer: rect.extent];
 	views = [[Array array] retain];
 	return self;
diff --git a/ruamoko/qwaq/qwaq-screen.r b/ruamoko/qwaq/qwaq-screen.r
index 16d3f1be6..b6149db25 100644
--- a/ruamoko/qwaq/qwaq-screen.r
+++ b/ruamoko/qwaq/qwaq-screen.r
@@ -14,7 +14,7 @@
 		return nil;
 	}
 	textContext = [TextContext screen];
-	[textContext scrollok: 1];
+	[(id)textContext scrollok: 1];
 	return self;
 }
 
diff --git a/ruamoko/qwaq/qwaq-textcontext.h b/ruamoko/qwaq/qwaq-textcontext.h
index 1fbcb4fbd..ce0f5ef2c 100644
--- a/ruamoko/qwaq/qwaq-textcontext.h
+++ b/ruamoko/qwaq/qwaq-textcontext.h
@@ -4,11 +4,12 @@
 #ifdef __QFCC__
 #include <Object.h>
 #include "qwaq-curses.h"
+#include "qwaq-draw.h"
 #include "qwaq-rect.h"
 
 @class DrawBuffer;
 
-@interface TextContext : Object
+@interface TextContext : Object<TextContext>
 {
 	window_t    window;
 	union {
@@ -43,12 +44,6 @@
 
 - blitFromBuffer: (DrawBuffer *) srcBuffer to: (Point) pos from: (Rect) rect;
 
-- (void) printf: (string) fmt, ...;
-- (void) vprintf: (string) mft, @va_list args;
-- (void) addch: (int) ch;
-- (void) mvprintf: (Point) pos, string fmt, ...;
-- (void) mvvprintf: (Point) pos, string mft, @va_list args;
-- (void) mvaddch: (Point) pos, int ch;
 - (void) refresh;
 + (void) refresh;
 - (void) bkgd: (int) ch;
diff --git a/ruamoko/qwaq/qwaq-view.h b/ruamoko/qwaq/qwaq-view.h
index e6b5bd47e..54e52f03a 100644
--- a/ruamoko/qwaq/qwaq-view.h
+++ b/ruamoko/qwaq/qwaq-view.h
@@ -45,7 +45,7 @@ enum {
 	Rect        absRect;
 	Point       point;		// can't be local :(
 	Group      *owner;
-	TextContext *textContext;
+	id<TextContext> textContext;
 	int         state;
 	int         options;
 	int         cursorState;
@@ -65,11 +65,7 @@ enum {
 - (void) mvaddch: (Point) pos, int ch;
 @end
 
-//These are forwarded (FIXME make a protocol)
-@interface View (TextContext)
-- (void) printf: (string) fmt, ...;
-- (void) vprintf: (string) fmt, @va_list args;
-- (void) addch: (int) ch;
+@interface View (TextContext) <TextContext>
 @end
 
 #endif//__qwaq_view_h
diff --git a/ruamoko/qwaq/qwaq-view.r b/ruamoko/qwaq/qwaq-view.r
index b005dd4de..659e9ffbe 100644
--- a/ruamoko/qwaq/qwaq-view.r
+++ b/ruamoko/qwaq/qwaq-view.r
@@ -102,7 +102,9 @@ updateScreenCursor (View *view)
 
 - (void) refresh
 {
-	[textContext refresh];
+	if (__obj_responds_to (textContext, @selector(refresh))) {
+		[(id)textContext refresh];
+	}
 }
 
 - (void) mvprintf: (Point) pos, string fmt, ...
diff --git a/ruamoko/qwaq/qwaq-window.r b/ruamoko/qwaq/qwaq-window.r
index a4a69ee83..af0f576cb 100644
--- a/ruamoko/qwaq/qwaq-window.r
+++ b/ruamoko/qwaq/qwaq-window.r
@@ -20,7 +20,7 @@
 	self.rect = rect;
 	buffer = [[TextContext alloc] initWithRect: rect];
 	textContext = buffer;
-	panel = create_panel ([buffer window]);
+	panel = create_panel ([(id)buffer window]);
 	buf = [DrawBuffer buffer: {3, 3}];
 	[buf mvaddstr: {0, 0}, "XOX"];
 	[buf mvaddstr: {0, 1}, "OXO"];
@@ -74,7 +74,7 @@
 
 -setBackground: (int) ch
 {
-	[buffer bkgd: ch];
+	[(id)buffer bkgd: ch];
 	return self;
 }
 
@@ -95,7 +95,7 @@
 		}
 	}
 	[super draw];
-	[buffer border: box_sides, box_corners];
+	[(id)buffer border: box_sides, box_corners];
 	Point pos = { 1, 1 };
 	//for (int i = ACS_ULCORNER; i <= ACS_STERLING; i++) {
 	for (int i = 32; i <= 127; i++) {
@@ -112,7 +112,7 @@
 			}
 		}
 	}
-	[textContext blitFromBuffer: buf to: makePoint (6, 3) from: [buf rect]];
+	[(id)textContext blitFromBuffer: buf to: makePoint (6, 3) from: [buf rect]];
 	[self refresh];
 	return self;
 }

From f6f6b2cba38147ca4b5dc4ef1023473148b234bd Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 18 Mar 2020 01:40:58 +0900
Subject: [PATCH 0832/1519] [qwaq] Doc the issue number for blit slug

---
 ruamoko/qwaq/qwaq-draw.r | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ruamoko/qwaq/qwaq-draw.r b/ruamoko/qwaq/qwaq-draw.r
index 600537215..fd0d368aa 100644
--- a/ruamoko/qwaq/qwaq-draw.r
+++ b/ruamoko/qwaq/qwaq-draw.r
@@ -73,6 +73,7 @@
 		for (int x = 0; x < rect.extent.width; x++) {
 			// FIXME 1) need memcpy/memmove
 			// 2) the generated code could be better
+			// github issue #3
 			 *d++ = *s++;
 		}
 	}

From 4c6e1b7fc4a9f15d1c180e31d4884e1b54491d2e Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 18 Mar 2020 01:51:52 +0900
Subject: [PATCH 0833/1519] [qfcc] Fix some uninitialized variable warnings

I really wish gcc would catch more issues when not optimizing.
---
 tools/qfcc/source/constfold.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/qfcc/source/constfold.c b/tools/qfcc/source/constfold.c
index e1b380a5d..f367987a3 100644
--- a/tools/qfcc/source/constfold.c
+++ b/tools/qfcc/source/constfold.c
@@ -790,7 +790,7 @@ static expr_t *
 do_op_integer (int op, expr_t *e, expr_t *e1, expr_t *e2)
 {
 	int         isval1 = 0, isval2 = 0;
-	int         val1, val2;
+	int         val1 = 0, val2 = 0;
 	static int  valid[] = {
 		'=', '+', '-', '*', '/', '&', '|', '^', '%',
 		SHL, SHR, AND, OR, LT, GT, LE, GE, EQ, NE, 0

From 7447854d7c70aa01c72779ac0831d52d0cbf36c5 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 19 Mar 2020 11:01:26 +0900
Subject: [PATCH 0834/1519] [qfcc] Recover from syntax errors in abstract_decl

---
 tools/qfcc/source/qc-parse.y | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/qfcc/source/qc-parse.y b/tools/qfcc/source/qc-parse.y
index 7f257505b..4e49397bc 100644
--- a/tools/qfcc/source/qc-parse.y
+++ b/tools/qfcc/source/qc-parse.y
@@ -914,6 +914,7 @@ abstract_decl
 				$1.type = type_default;
 			$$->type = find_type (append_type ($$->type, $1.type));
 		}
+	| error		{ $$ = new_symbol (""); }
 	;
 
 qc_param_decl

From b16093a5336ba79dd93efdae1a458525e73662d4 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 19 Mar 2020 11:04:02 +0900
Subject: [PATCH 0835/1519] [qwaq] Split out Array(Group) interface

---
 ruamoko/qwaq/qwaq-garray.h | 29 +++++++++++++++++++++++++++++
 ruamoko/qwaq/qwaq-garray.r |  2 +-
 ruamoko/qwaq/qwaq-group.h  | 24 ------------------------
 ruamoko/qwaq/qwaq-group.r  |  1 +
 4 files changed, 31 insertions(+), 25 deletions(-)
 create mode 100644 ruamoko/qwaq/qwaq-garray.h

diff --git a/ruamoko/qwaq/qwaq-garray.h b/ruamoko/qwaq/qwaq-garray.h
new file mode 100644
index 000000000..1a2e53576
--- /dev/null
+++ b/ruamoko/qwaq/qwaq-garray.h
@@ -0,0 +1,29 @@
+#ifndef __qwaq_garray_h
+#define __qwaq_garray_h
+
+#include <Array.h>
+
+typedef BOOL condition_func (id object, void *data);
+typedef BOOL condition_func2 (id object, void *anObject, void *data);
+
+@interface Array (Group)
+- (void) makeObjectsPerformSelector: (SEL)selector
+								 if: (condition_func)condition
+							   with: (void *)data;
+- (void) makeObjectsPerformSelector: (SEL)selector
+						 withObject: (void *)anObject
+								 if: (condition_func2)condition
+							   with: (void *)data;
+- (void) makeReversedObjectsPerformSelector: (SEL)selector;
+- (void) makeReversedObjectsPerformSelector: (SEL)selector
+								 withObject: (void *)anObject;
+- (void) makeReversedObjectsPerformSelector: (SEL)selector
+										 if: (condition_func)condition
+									   with: (void *)data;
+- (void) makeReversedObjectsPerformSelector: (SEL)selector
+								 withObject: (void *)anObject
+										 if: (condition_func2)condition
+									   with: (void *)data;
+@end
+
+#endif//__qwaq_garray_h
diff --git a/ruamoko/qwaq/qwaq-garray.r b/ruamoko/qwaq/qwaq-garray.r
index 1b7fc46d3..b3298ffa4 100644
--- a/ruamoko/qwaq/qwaq-garray.r
+++ b/ruamoko/qwaq/qwaq-garray.r
@@ -1,6 +1,6 @@
 #include <Array.h>
 #include "event.h"
-#include "qwaq-group.h"
+#include "qwaq-garray.h"
 
 @implementation Array (Group)
 - (void) makeObjectsPerformSelector: (SEL)selector
diff --git a/ruamoko/qwaq/qwaq-group.h b/ruamoko/qwaq/qwaq-group.h
index c534979ab..483a07c05 100644
--- a/ruamoko/qwaq/qwaq-group.h
+++ b/ruamoko/qwaq/qwaq-group.h
@@ -1,32 +1,8 @@
 #ifndef __qwaq_group_h
 #define __qwaq_group_h
 
-#include <Array.h>
 #include "qwaq-view.h"
 
-typedef BOOL condition_func (id object, void *data);
-typedef BOOL condition_func2 (id object, void *anObject, void *data);
-
-@interface Array (Group)
-- (void) makeObjectsPerformSelector: (SEL)selector
-								 if: (condition_func)condition
-							   with: (void *)data;
-- (void) makeObjectsPerformSelector: (SEL)selector
-						 withObject: (void *)anObject
-								 if: (condition_func2)condition
-							   with: (void *)data;
-- (void) makeReversedObjectsPerformSelector: (SEL)selector;
-- (void) makeReversedObjectsPerformSelector: (SEL)selector
-								 withObject: (void *)anObject;
-- (void) makeReversedObjectsPerformSelector: (SEL)selector
-										 if: (condition_func)condition
-									   with: (void *)data;
-- (void) makeReversedObjectsPerformSelector: (SEL)selector
-								 withObject: (void *)anObject
-										 if: (condition_func2)condition
-									   with: (void *)data;
-@end
-
 @interface Group : View
 {
 	Array      *views;
diff --git a/ruamoko/qwaq/qwaq-group.r b/ruamoko/qwaq/qwaq-group.r
index 770834c71..e9982fd1c 100644
--- a/ruamoko/qwaq/qwaq-group.r
+++ b/ruamoko/qwaq/qwaq-group.r
@@ -1,5 +1,6 @@
 #include <Array.h>
 #include "event.h"
+#include "qwaq-garray.h"
 #include "qwaq-group.h"
 
 @implementation Group

From 2f3ca9d9e477ed96103a36cbb0d8edf6416dc90c Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 19 Mar 2020 11:32:44 +0900
Subject: [PATCH 0836/1519] [qwaq] Clean up the hierarchy

I think I've finally figured out what I want the core hierarchy to be.
Right now, it's just the two classes: View and Window (derived from
View). Window has a Group, and Group is just a collection of Views that
it manages. QwaqApplication is just an object but like a Window, it has
a Group of views.

    View
      Window has a Group
    Group contains Views
    QwaqApplication has a group

More work needs to be done on drawing and event handling, but things are
working again.
---
 ruamoko/qwaq/qwaq-app.r    |  1 +
 ruamoko/qwaq/qwaq-group.h  | 14 +++++++++++---
 ruamoko/qwaq/qwaq-group.r  | 25 ++++++++++---------------
 ruamoko/qwaq/qwaq-view.h   |  9 ++++++++-
 ruamoko/qwaq/qwaq-view.r   | 13 ++++++++++++-
 ruamoko/qwaq/qwaq-window.h |  8 ++++----
 ruamoko/qwaq/qwaq-window.r | 16 +++++++++++-----
 7 files changed, 57 insertions(+), 29 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-app.r b/ruamoko/qwaq/qwaq-app.r
index d8809f307..798c83308 100644
--- a/ruamoko/qwaq/qwaq-app.r
+++ b/ruamoko/qwaq/qwaq-app.r
@@ -4,6 +4,7 @@ int fence;
 #include "color.h"
 #include "qwaq-app.h"
 #include "qwaq-curses.h"
+#include "qwaq-group.h"
 #include "qwaq-window.h"
 #include "qwaq-screen.h"
 #include "qwaq-view.h"
diff --git a/ruamoko/qwaq/qwaq-group.h b/ruamoko/qwaq/qwaq-group.h
index 483a07c05..956e43d1a 100644
--- a/ruamoko/qwaq/qwaq-group.h
+++ b/ruamoko/qwaq/qwaq-group.h
@@ -1,17 +1,25 @@
 #ifndef __qwaq_group_h
 #define __qwaq_group_h
 
-#include "qwaq-view.h"
+#include <Array.h>
 
-@interface Group : View
+#include "event.h"
+#include "qwaq-draw.h"
+
+@class View;
+
+@interface Group : Object
 {
 	Array      *views;
 	int         focused;
-	id<TextContext> buffer;
+	id<TextContext> context;
 }
 -initWithContext: (id<TextContext>) context;
 -insert: (View *) view;
 -remove: (View *) view;
+-draw;
+-redraw;
+-handleEvent: (qwaq_event_t *) event;
 @end
 
 #endif//__qwaq_group_h
diff --git a/ruamoko/qwaq/qwaq-group.r b/ruamoko/qwaq/qwaq-group.r
index e9982fd1c..0480fbf05 100644
--- a/ruamoko/qwaq/qwaq-group.r
+++ b/ruamoko/qwaq/qwaq-group.r
@@ -1,7 +1,9 @@
 #include <Array.h>
 #include "event.h"
+#include "qwaq-draw.h"
 #include "qwaq-garray.h"
 #include "qwaq-group.h"
+#include "qwaq-view.h"
 
 @implementation Group
 
@@ -10,18 +12,7 @@
 	if (!(self = [super init])) {
 		return nil;
 	}
-	textContext = context;
-	absRect = rect = { nil, [textContext size] };
-	buffer = [DrawBuffer buffer: rect.extent];
-	views = [[Array array] retain];
-	return self;
-}
-
--initWithRect: (Rect) rect
-{
-	if (!(self = [super initWithRect: rect])) {
-		return nil;
-	}
+	self.context = context;
 	views = [[Array array] retain];
 	return self;
 }
@@ -34,7 +25,7 @@
 -insert: (View *) view
 {
 	[views addObject: view];
-	view.textContext = buffer;
+	[view setContext: context];
 	return self;
 }
 
@@ -58,7 +49,7 @@ not_dont_draw (id aView, void *aGroup)
 	View       *view = aView;
 	Group      *group = (Group *) aGroup;
 
-	return !(view.options & ofDontDraw);
+	return !([view options] & ofDontDraw);
 }
 
 -draw
@@ -69,9 +60,13 @@ not_dont_draw (id aView, void *aGroup)
 	return self;
 }
 
+-redraw
+{
+	return self;
+}
+
 -handleEvent: (qwaq_event_t *) event
 {
-	[super handleEvent: event];
 	if (event.what & qe_focused) {
 		if (focused >= 0) {
 			[[views objectAtIndex:focused] handleEvent: event];
diff --git a/ruamoko/qwaq/qwaq-view.h b/ruamoko/qwaq/qwaq-view.h
index 54e52f03a..ef6d79568 100644
--- a/ruamoko/qwaq/qwaq-view.h
+++ b/ruamoko/qwaq/qwaq-view.h
@@ -53,12 +53,19 @@ enum {
 }
 -initWithRect: (Rect) rect;
 - (void) dealloc;
+
 -setOwner: (Group *) owner;
--(struct Rect_s *)getRect;
+
+-(struct Rect_s *)rect;
+
+-(int) options;
+
+-setContext: (id<TextContext>) context;
 -draw;
 -redraw;
 -handleEvent: (qwaq_event_t *) event;
 
+
 - (void) refresh;
 - (void) mvprintf: (Point) pos, string fmt, ...;
 - (void) mvvprintf: (Point) pos, string fmt, @va_list args;
diff --git a/ruamoko/qwaq/qwaq-view.r b/ruamoko/qwaq/qwaq-view.r
index 659e9ffbe..5217504fd 100644
--- a/ruamoko/qwaq/qwaq-view.r
+++ b/ruamoko/qwaq/qwaq-view.r
@@ -27,6 +27,17 @@
 	[super dealloc];
 }
 
+- setContext: (id<TextContext>) context
+{
+	textContext = context;
+	return self;
+}
+
+- (int) options
+{
+	return options;
+}
+
 static void
 updateScreenCursor (View *view)
 {
@@ -84,7 +95,7 @@ updateScreenCursor (View *view)
 	return self;
 }
 
-- (Rect *) getRect
+- (Rect *) rect
 {
 	return &rect;
 }
diff --git a/ruamoko/qwaq/qwaq-window.h b/ruamoko/qwaq/qwaq-window.h
index 2e925c035..18c4f9fc6 100644
--- a/ruamoko/qwaq/qwaq-window.h
+++ b/ruamoko/qwaq/qwaq-window.h
@@ -3,17 +3,17 @@
 
 #include "Object.h"
 
-@class Array;
+@class Group;
 
 #include "qwaq-draw.h"
 #include "qwaq-rect.h"
 #include "qwaq-view.h"
-#include "qwaq-group.h"
 
-@interface Window: Group
+@interface Window: View
 {
-	Point       point;	// FIXME can't be local :(
 	struct panel_s *panel;
+	Group      *objects;
+	Point       point;	// FIXME can't be local :(
 	DrawBuffer *buf;
 }
 +windowWithRect: (Rect) rect;
diff --git a/ruamoko/qwaq/qwaq-window.r b/ruamoko/qwaq/qwaq-window.r
index af0f576cb..0f3c81037 100644
--- a/ruamoko/qwaq/qwaq-window.r
+++ b/ruamoko/qwaq/qwaq-window.r
@@ -2,6 +2,7 @@
 
 #include "event.h"
 #include "qwaq-curses.h"
+#include "qwaq-group.h"
 #include "qwaq-window.h"
 #include "qwaq-view.h"
 
@@ -18,9 +19,9 @@
 		return nil;
 	}
 	self.rect = rect;
-	buffer = [[TextContext alloc] initWithRect: rect];
-	textContext = buffer;
-	panel = create_panel ([(id)buffer window]);
+	textContext = [[TextContext alloc] initWithRect: rect];
+	panel = create_panel ([(id)textContext window]);
+
 	buf = [DrawBuffer buffer: {3, 3}];
 	[buf mvaddstr: {0, 0}, "XOX"];
 	[buf mvaddstr: {0, 1}, "OXO"];
@@ -28,6 +29,11 @@
 	return self;
 }
 
+-setContext: (id<TextContext>) context
+{
+	return self;
+}
+
 -handleEvent: (qwaq_event_t *) event
 {
 /*	switch (event.what) {
@@ -74,7 +80,7 @@
 
 -setBackground: (int) ch
 {
-	[(id)buffer bkgd: ch];
+	[(id)textContext bkgd: ch];
 	return self;
 }
 
@@ -95,7 +101,7 @@
 		}
 	}
 	[super draw];
-	[(id)buffer border: box_sides, box_corners];
+	[(id)textContext border: box_sides, box_corners];
 	Point pos = { 1, 1 };
 	//for (int i = ACS_ULCORNER; i <= ACS_STERLING; i++) {
 	for (int i = 32; i <= 127; i++) {

From 01835cbd94349f6b729e11929fc380d1b1a9ed89 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 19 Mar 2020 13:48:48 +0900
Subject: [PATCH 0837/1519] [qwaq] Add blitFromBuffer to TextContext protocol

---
 ruamoko/qwaq/qwaq-draw.h   | 1 +
 ruamoko/qwaq/qwaq-window.r | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ruamoko/qwaq/qwaq-draw.h b/ruamoko/qwaq/qwaq-draw.h
index 1592559d0..efda03b41 100644
--- a/ruamoko/qwaq/qwaq-draw.h
+++ b/ruamoko/qwaq/qwaq-draw.h
@@ -15,6 +15,7 @@
 @end
 
 @protocol TextContext
+- blitFromBuffer: (DrawBuffer *) srcBuffer to: (Point) pos from: (Rect) rect;
 - (Extent) size;
 
 - (void) printf: (string) fmt, ...;
diff --git a/ruamoko/qwaq/qwaq-window.r b/ruamoko/qwaq/qwaq-window.r
index 0f3c81037..d2b52e985 100644
--- a/ruamoko/qwaq/qwaq-window.r
+++ b/ruamoko/qwaq/qwaq-window.r
@@ -118,7 +118,7 @@
 			}
 		}
 	}
-	[(id)textContext blitFromBuffer: buf to: makePoint (6, 3) from: [buf rect]];
+	[textContext blitFromBuffer: buf to: makePoint (6, 3) from: [buf rect]];
 	[self refresh];
 	return self;
 }

From 8c3cf83f02b57c09040b4600b58822648c102405 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 19 Mar 2020 13:49:27 +0900
Subject: [PATCH 0838/1519] [qwaq] Add Listener and ListenerGroup delegates

Simple single parameter (caller) direct messages.
---
 ruamoko/qwaq/Makefile.am     |  1 +
 ruamoko/qwaq/qwaq-listener.h | 29 ++++++++++++++++
 ruamoko/qwaq/qwaq-listener.r | 66 ++++++++++++++++++++++++++++++++++++
 3 files changed, 96 insertions(+)
 create mode 100644 ruamoko/qwaq/qwaq-listener.h
 create mode 100644 ruamoko/qwaq/qwaq-listener.r

diff --git a/ruamoko/qwaq/Makefile.am b/ruamoko/qwaq/Makefile.am
index 76b4af136..f0dbe4167 100644
--- a/ruamoko/qwaq/Makefile.am
+++ b/ruamoko/qwaq/Makefile.am
@@ -28,6 +28,7 @@ qwaq_app_dat_src= \
 	qwaq-draw.r \
 	qwaq-garray.r \
 	qwaq-group.r \
+	qwaq-listener.r \
 	qwaq-rect.r \
 	qwaq-screen.r \
 	qwaq-textcontext.r \
diff --git a/ruamoko/qwaq/qwaq-listener.h b/ruamoko/qwaq/qwaq-listener.h
new file mode 100644
index 000000000..bb02d71f1
--- /dev/null
+++ b/ruamoko/qwaq/qwaq-listener.h
@@ -0,0 +1,29 @@
+#ifndef __qwaq_listener_h
+#define __qwaq_listener_h
+
+#include <Object.h>
+
+@class Array;
+
+@interface Listener : Object
+{
+	id          responder;
+	SEL         message;
+	IMP         imp;
+}
+-initWithResponder: (id) responder message: (SEL) message;
+-(void) respond: (id) caller;
+-(BOOL) matchResponder: (id) responder message: (SEL) message;
+@end
+
+@interface ListenerGroup : Object
+{
+	Array      *listeners;
+}
+-init;
+-addListener: (id) responder message: (SEL) message;
+-removeListener: (id) responder message: (SEL) message;
+-(void) respond: (id) caller;
+@end
+
+#endif//__qwaq_listener_h
diff --git a/ruamoko/qwaq/qwaq-listener.r b/ruamoko/qwaq/qwaq-listener.r
new file mode 100644
index 000000000..5184668fd
--- /dev/null
+++ b/ruamoko/qwaq/qwaq-listener.r
@@ -0,0 +1,66 @@
+#include <Array.h>
+
+#include "qwaq-listener.h"
+
+@class Array;
+
+@implementation Listener
+-initWithResponder: (id) responder message: (SEL) message
+{
+	if (!(self = [super init])) {
+		return nil;
+	}
+	self.responder = responder;
+	self.message = message;
+	imp = [responder instanceMethodForSelector: message];
+	return self;
+}
+
+-(void)respond: (id) caller
+{
+	imp (responder, message, caller);
+}
+
+-(BOOL) matchResponder: (id) responder message: (SEL) message
+{
+	return self.responder == responder && self.message == message;
+}
+@end
+
+@implementation ListenerGroup : Object
+-init
+{
+	if (!(self = [super init])) {
+		return nil;
+	}
+	listeners = [[Array alloc] retain];
+	return self;
+}
+
+-addListener: (id) responder message: (SEL) message
+{
+	Listener   *listener = [[Listener alloc] initWithResponder: responder
+													   message: message];
+	if (listener) {
+		[listeners addObject: listener];
+	}
+	return self;
+}
+
+-removeListener: (id) responder message: (SEL) message
+{
+	for (int i = [listeners count]; i-- > 0; ) {
+		Listener   *l = [listeners objectAtIndex: i];
+		if ([l matchResponder: responder message: message]) {
+			[listeners removeObjectAtIndex: i];
+		}
+	}
+	return self;
+}
+
+-(void)respond: (id) caller
+{
+	[listeners makeObjectsPerformSelector: @selector (respond:)
+							   withObject: caller];
+}
+@end

From 03f87d6f27cc4eed12c380b5397f3ec270ba2f20 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 19 Mar 2020 13:50:35 +0900
Subject: [PATCH 0839/1519] [qwaq] Add pos Point alias

---
 ruamoko/qwaq/qwaq-view.h | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-view.h b/ruamoko/qwaq/qwaq-view.h
index ef6d79568..920fa793e 100644
--- a/ruamoko/qwaq/qwaq-view.h
+++ b/ruamoko/qwaq/qwaq-view.h
@@ -36,10 +36,14 @@ enum {
 	union {
 		Rect        rect;
 		struct {
-			int    xpos;
-			int    ypos;
-			int    xlen;
-			int    ylen;
+			int     xpos;
+			int     ypos;
+			int     xlen;
+			int     ylen;
+		};
+		struct {
+			Point   pos;
+			Extent  size;
 		};
 	};
 	Rect        absRect;

From 6a18b1dd559c4324b16bae6815cf9cd9aa05506b Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 19 Mar 2020 13:51:14 +0900
Subject: [PATCH 0840/1519] [qwaq] Add function to merge extents

It's pretty much the union of two rectangles with the same origin.
---
 ruamoko/qwaq/qwaq-rect.h | 1 +
 ruamoko/qwaq/qwaq-rect.r | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/ruamoko/qwaq/qwaq-rect.h b/ruamoko/qwaq/qwaq-rect.h
index 7cd72e886..3278afd14 100644
--- a/ruamoko/qwaq/qwaq-rect.h
+++ b/ruamoko/qwaq/qwaq-rect.h
@@ -20,6 +20,7 @@ typedef struct Rect_s {
 @extern Rect makeRect (int xpos, int ypos, int xlen, int ylen);
 @extern Point makePoint (int x, int y);
 @extern Extent makeExtent (int width, int height);
+@extern Extent mergeExtents (Extent a, Extent b);
 //XXX will not work if point or rect point to a local variabl
 @extern int rectContainsPoint (Rect *rect, Point *point);
 @extern Rect clipRect (Rect clipRect, Rect rect);
diff --git a/ruamoko/qwaq/qwaq-rect.r b/ruamoko/qwaq/qwaq-rect.r
index e0e3e5ee6..64048ca0b 100644
--- a/ruamoko/qwaq/qwaq-rect.r
+++ b/ruamoko/qwaq/qwaq-rect.r
@@ -39,6 +39,12 @@ Extent makeExtent (int width, int height)
 	return {width, height};
 }
 
+Extent mergeExtents (Extent a, Extent b)
+{
+	return { a.width < b.width ? b.width : a.width,
+			 a.height < b.height ? b.height : a.height };
+}
+
 int
 rectContainsPoint (Rect *rect, Point *point)
 {

From bd3884f6fabf940affef7c289d251ff36c35b128 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 19 Mar 2020 13:52:14 +0900
Subject: [PATCH 0841/1519] [qwaq] Add a button class

It may or may not work just yet, but I think it's the right direction.
---
 ruamoko/qwaq/Makefile.am   |  1 +
 ruamoko/qwaq/qwaq-button.h | 28 ++++++++++++
 ruamoko/qwaq/qwaq-button.r | 91 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 120 insertions(+)
 create mode 100644 ruamoko/qwaq/qwaq-button.h
 create mode 100644 ruamoko/qwaq/qwaq-button.r

diff --git a/ruamoko/qwaq/Makefile.am b/ruamoko/qwaq/Makefile.am
index f0dbe4167..683a0923c 100644
--- a/ruamoko/qwaq/Makefile.am
+++ b/ruamoko/qwaq/Makefile.am
@@ -25,6 +25,7 @@ SUFFIXES=.o .r
 
 qwaq_app_dat_src= \
 	qwaq-app.r \
+	qwaq-button.r \
 	qwaq-draw.r \
 	qwaq-garray.r \
 	qwaq-group.r \
diff --git a/ruamoko/qwaq/qwaq-button.h b/ruamoko/qwaq/qwaq-button.h
new file mode 100644
index 000000000..2c19236d3
--- /dev/null
+++ b/ruamoko/qwaq/qwaq-button.h
@@ -0,0 +1,28 @@
+#ifndef __qwaq_button_h
+#define __qwaq_button_h
+
+#include "qwaq-draw.h"
+#include "qwaq-view.h"
+
+@class ListenerGroup;
+
+@interface Button : View
+{
+	DrawBuffer *icon[2];
+	int         pressed;
+	ListenerGroup *onPress;
+	ListenerGroup *onRelease;
+	ListenerGroup *onClick;
+	ListenerGroup *onDrag;
+	ListenerGroup *onAuto;
+}
+-initWithPos: (Point) pos releasedIcon: (DrawBuffer *) released
+						   pressedIcon: (DrawBuffer *) pressed;
+-(ListenerGroup *) onPress;
+-(ListenerGroup *) onRelease;
+-(ListenerGroup *) onClick;
+-(ListenerGroup *) onDrag;
+-(ListenerGroup *) onAuto;
+@end
+
+#endif//__qwaq_button_h
diff --git a/ruamoko/qwaq/qwaq-button.r b/ruamoko/qwaq/qwaq-button.r
new file mode 100644
index 000000000..d79092b0c
--- /dev/null
+++ b/ruamoko/qwaq/qwaq-button.r
@@ -0,0 +1,91 @@
+#include "qwaq-button.h"
+#include "qwaq-listener.h"
+
+@implementation Button
+-initWithPos: (Point) pos releasedIcon: (DrawBuffer *) released
+						   pressedIcon: (DrawBuffer *) pressed
+{
+	Extent      size = mergeExtents ([released size], [pressed size]);
+
+	if (!(self = [super initWithRect: {pos, size}])) {
+		return nil;
+	}
+	icon[0] = released;
+	icon[1] = pressed;
+	onPress = [[ListenerGroup alloc] init];
+	onRelease = [[ListenerGroup alloc] init];
+	onClick = [[ListenerGroup alloc] init];
+	onDrag = [[ListenerGroup alloc] init];
+	onAuto = [[ListenerGroup alloc] init];
+	return self;
+}
+
+-draw
+{
+	[textContext blitFromBuffer: icon[pressed]
+							 to: pos
+						   from: [icon[pressed] rect]];
+	return self;
+}
+
+-handleEvent: (qwaq_event_t *) event
+{
+	ListenerGroup *action = nil;
+
+	if (event.what & qe_mouse) {
+		switch ((qwaq_mouse_event) (event.what & qe_mouse)) {
+			case qe_mousedown:
+				pressed = 1;
+				[self redraw];
+				action = onPress;
+				break;
+			case qe_mouseup:
+				pressed = 0;
+				[self redraw];
+				action = onRelease;
+				break;
+			case qe_mouseclick:
+				action = onClick;
+				break;
+			case qe_mousemove:
+				if (pressed) {
+					action = onDrag;
+				}
+				break;
+			case qe_mouseauto:
+				action = onAuto;
+				break;
+		}
+		if (action) {
+			[action respond: self];
+		}
+	}
+	return self;
+}
+
+-(ListenerGroup *) onPress
+{
+	return onPress;
+}
+
+-(ListenerGroup *) onRelease
+{
+	return onRelease;
+}
+
+-(ListenerGroup *) onClick
+{
+	return onClick;
+}
+
+-(ListenerGroup *) onDrag
+{
+	return onDrag;
+}
+
+-(ListenerGroup *) onAuto
+{
+	return onAuto;
+}
+
+@end

From db39f7ed3e87851b6e7fec7a5f7042a894122056 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 19 Mar 2020 13:57:10 +0900
Subject: [PATCH 0842/1519] [qwaq] Add hover listener to button

Forgot about this (very useful for tooltips etc).
---
 ruamoko/qwaq/qwaq-button.h | 2 ++
 ruamoko/qwaq/qwaq-button.r | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/ruamoko/qwaq/qwaq-button.h b/ruamoko/qwaq/qwaq-button.h
index 2c19236d3..470a2ae08 100644
--- a/ruamoko/qwaq/qwaq-button.h
+++ b/ruamoko/qwaq/qwaq-button.h
@@ -15,6 +15,7 @@
 	ListenerGroup *onClick;
 	ListenerGroup *onDrag;
 	ListenerGroup *onAuto;
+	ListenerGroup *onHover;
 }
 -initWithPos: (Point) pos releasedIcon: (DrawBuffer *) released
 						   pressedIcon: (DrawBuffer *) pressed;
@@ -23,6 +24,7 @@
 -(ListenerGroup *) onClick;
 -(ListenerGroup *) onDrag;
 -(ListenerGroup *) onAuto;
+-(ListenerGroup *) onHover;
 @end
 
 #endif//__qwaq_button_h
diff --git a/ruamoko/qwaq/qwaq-button.r b/ruamoko/qwaq/qwaq-button.r
index d79092b0c..093865576 100644
--- a/ruamoko/qwaq/qwaq-button.r
+++ b/ruamoko/qwaq/qwaq-button.r
@@ -17,6 +17,7 @@
 	onClick = [[ListenerGroup alloc] init];
 	onDrag = [[ListenerGroup alloc] init];
 	onAuto = [[ListenerGroup alloc] init];
+	onHover = [[ListenerGroup alloc] init];
 	return self;
 }
 
@@ -88,4 +89,8 @@
 	return onAuto;
 }
 
+-(ListenerGroup *) onHover
+{
+	return onHover;
+}
 @end

From 3e9977c272debe36c27eeb9c8785a9123e9745fd Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 19 Mar 2020 15:53:20 +0900
Subject: [PATCH 0843/1519] [qwaq] Give up on pass-by-reference for now

It's too much hassle to ensure the passed variable isn't a local. It's
just not worth the grief right now.
---
 ruamoko/qwaq/qwaq-rect.h | 3 +--
 ruamoko/qwaq/qwaq-rect.r | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-rect.h b/ruamoko/qwaq/qwaq-rect.h
index 3278afd14..2ab79788e 100644
--- a/ruamoko/qwaq/qwaq-rect.h
+++ b/ruamoko/qwaq/qwaq-rect.h
@@ -21,8 +21,7 @@ typedef struct Rect_s {
 @extern Point makePoint (int x, int y);
 @extern Extent makeExtent (int width, int height);
 @extern Extent mergeExtents (Extent a, Extent b);
-//XXX will not work if point or rect point to a local variabl
-@extern int rectContainsPoint (Rect *rect, Point *point);
+@extern int rectContainsPoint (Rect rect, Point point);
 @extern Rect clipRect (Rect clipRect, Rect rect);
 #endif
 
diff --git a/ruamoko/qwaq/qwaq-rect.r b/ruamoko/qwaq/qwaq-rect.r
index 64048ca0b..c2677decc 100644
--- a/ruamoko/qwaq/qwaq-rect.r
+++ b/ruamoko/qwaq/qwaq-rect.r
@@ -46,7 +46,7 @@ Extent mergeExtents (Extent a, Extent b)
 }
 
 int
-rectContainsPoint (Rect *rect, Point *point)
+rectContainsPoint (Rect rect, Point point)
 {
 	return ((point.x >= rect.offset.x
 			 && point.x < rect.offset.x + rect.extent.width)

From 23e6b498454d27f53b2dc173e58a890e2f1294a3 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 19 Mar 2020 15:55:57 +0900
Subject: [PATCH 0844/1519] [qwaq] Implement mouse enter/leave events

---
 ruamoko/qwaq/qwaq-group.h |  2 ++
 ruamoko/qwaq/qwaq-group.r | 30 ++++++++++++++++++++++++++++++
 ruamoko/qwaq/qwaq-view.h  |  7 ++++++-
 ruamoko/qwaq/qwaq-view.r  | 18 ++++++++++++++++--
 4 files changed, 54 insertions(+), 3 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-group.h b/ruamoko/qwaq/qwaq-group.h
index 956e43d1a..c1edd01b3 100644
--- a/ruamoko/qwaq/qwaq-group.h
+++ b/ruamoko/qwaq/qwaq-group.h
@@ -11,6 +11,8 @@
 @interface Group : Object
 {
 	Array      *views;
+	View       *mouse_grabbed;
+	View       *mouse_within;
 	int         focused;
 	id<TextContext> context;
 }
diff --git a/ruamoko/qwaq/qwaq-group.r b/ruamoko/qwaq/qwaq-group.r
index 0480fbf05..75c5c2a90 100644
--- a/ruamoko/qwaq/qwaq-group.r
+++ b/ruamoko/qwaq/qwaq-group.r
@@ -65,6 +65,18 @@ not_dont_draw (id aView, void *aGroup)
 	return self;
 }
 
+static View *
+find_mouse_view(Group *group, Point pos)
+{
+	for (int i = [group.views count]; i--; ) {
+		View       *v = [group.views objectAtIndex: i];
+		if ([v containsPoint: pos]) {
+			return v;
+		}
+	}
+	return nil;
+}
+
 -handleEvent: (qwaq_event_t *) event
 {
 	if (event.what & qe_focused) {
@@ -72,6 +84,24 @@ not_dont_draw (id aView, void *aGroup)
 			[[views objectAtIndex:focused] handleEvent: event];
 		}
 	} else if (event.what & qe_positional) {
+		Point       pos = {event.mouse.x, event.mouse.y};
+		if (mouse_grabbed) {
+			[mouse_grabbed handleEvent: event];
+		} else {
+			if (mouse_within && ![mouse_within containsPoint: pos]) {
+				[mouse_within onMouseLeave: pos];
+				mouse_within = nil;
+			}
+			if (!mouse_within) {
+				mouse_within = find_mouse_view (self, pos);
+				if (mouse_within) {
+					[mouse_within onMouseEnter: pos];
+				}
+			}
+			if (mouse_within) {
+				[mouse_within handleEvent: event];
+			}
+		}
 	} else {
 		// broadcast
 		[views makeObjectsPerformSelector: @selector(draw) withObject: event];
diff --git a/ruamoko/qwaq/qwaq-view.h b/ruamoko/qwaq/qwaq-view.h
index 920fa793e..a7314f7e0 100644
--- a/ruamoko/qwaq/qwaq-view.h
+++ b/ruamoko/qwaq/qwaq-view.h
@@ -60,7 +60,9 @@ enum {
 
 -setOwner: (Group *) owner;
 
--(struct Rect_s *)rect;
+-(Rect)rect;
+
+-(int) containsPoint: (Point) point;
 
 -(int) options;
 
@@ -69,6 +71,9 @@ enum {
 -redraw;
 -handleEvent: (qwaq_event_t *) event;
 
+- (void) onMouseEnter: (Point) pos;
+- (void) onMouseLeave: (Point) pos;
+
 
 - (void) refresh;
 - (void) mvprintf: (Point) pos, string fmt, ...;
diff --git a/ruamoko/qwaq/qwaq-view.r b/ruamoko/qwaq/qwaq-view.r
index 5217504fd..b46004755 100644
--- a/ruamoko/qwaq/qwaq-view.r
+++ b/ruamoko/qwaq/qwaq-view.r
@@ -95,9 +95,14 @@ updateScreenCursor (View *view)
 	return self;
 }
 
-- (Rect *) rect
+- (Rect) rect
 {
-	return &rect;
+	return rect;
+}
+
+-(int) containsPoint: (Point) point
+{
+	return rectContainsPoint (rect, point);
 }
 
 - (void) forward: (SEL) sel : (@va_list) args
@@ -144,4 +149,13 @@ updateScreenCursor (View *view)
 	return self;
 }
 
+- (void) onMouseEnter: (Point) pos
+{
+}
+
+- (void) onMouseLeave: (Point) pos
+{
+}
+
+
 @end

From 19161ea80a60c4b568c738f228b14180a747adb2 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 19 Mar 2020 16:27:30 +0900
Subject: [PATCH 0845/1519] [qwaq] Clean things up in prep for button testing

---
 ruamoko/qwaq/qwaq-app.r    |  2 +-
 ruamoko/qwaq/qwaq-group.h  |  5 ++-
 ruamoko/qwaq/qwaq-group.r  | 17 +++++++++-
 ruamoko/qwaq/qwaq-view.h   |  2 ++
 ruamoko/qwaq/qwaq-view.r   | 10 ++++++
 ruamoko/qwaq/qwaq-window.r | 68 +++-----------------------------------
 6 files changed, 38 insertions(+), 66 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-app.r b/ruamoko/qwaq/qwaq-app.r
index 798c83308..e040fe84c 100644
--- a/ruamoko/qwaq/qwaq-app.r
+++ b/ruamoko/qwaq/qwaq-app.r
@@ -40,7 +40,7 @@ arp_end (void)
 	init_pair (2, COLOR_WHITE, COLOR_BLACK);
 
 	TextContext *screen = [TextContext screen];
-	objects = [[Group alloc] initWithContext: screen];
+	objects = [[Group alloc] initWithContext: screen owner: nil];
 
 	[screen bkgd: COLOR_PAIR (1)];
 	Rect r = { nil, [screen size] };
diff --git a/ruamoko/qwaq/qwaq-group.h b/ruamoko/qwaq/qwaq-group.h
index c1edd01b3..f9e4bc858 100644
--- a/ruamoko/qwaq/qwaq-group.h
+++ b/ruamoko/qwaq/qwaq-group.h
@@ -10,18 +10,21 @@
 
 @interface Group : Object
 {
+	View       *owner;
 	Array      *views;
 	View       *mouse_grabbed;
 	View       *mouse_within;
 	int         focused;
 	id<TextContext> context;
 }
--initWithContext: (id<TextContext>) context;
+-initWithContext: (id<TextContext>) context owner: (View *) owner;
 -insert: (View *) view;
 -remove: (View *) view;
 -draw;
 -redraw;
 -handleEvent: (qwaq_event_t *) event;
+-(void) grabMouse;
+-(void) releaseMouse;
 @end
 
 #endif//__qwaq_group_h
diff --git a/ruamoko/qwaq/qwaq-group.r b/ruamoko/qwaq/qwaq-group.r
index 75c5c2a90..284a8a6a3 100644
--- a/ruamoko/qwaq/qwaq-group.r
+++ b/ruamoko/qwaq/qwaq-group.r
@@ -7,12 +7,14 @@
 
 @implementation Group
 
--initWithContext: (id<TextContext>) context
+-initWithContext: (id<TextContext>) context owner: (View *) owner
 {
 	if (!(self = [super init])) {
 		return nil;
 	}
+	self.owner = owner;
 	self.context = context;
+	focused = -1;
 	views = [[Array array] retain];
 	return self;
 }
@@ -108,4 +110,17 @@ find_mouse_view(Group *group, Point pos)
 	}
 	return self;
 }
+
+-(void) grabMouse
+{
+	mouse_grabbed = mouse_within;
+	[owner grabMouse];
+}
+
+-(void) releaseMouse
+{
+	mouse_grabbed = mouse_within;
+	[owner grabMouse];
+}
+
 @end
diff --git a/ruamoko/qwaq/qwaq-view.h b/ruamoko/qwaq/qwaq-view.h
index a7314f7e0..e56a38ffa 100644
--- a/ruamoko/qwaq/qwaq-view.h
+++ b/ruamoko/qwaq/qwaq-view.h
@@ -63,6 +63,8 @@ enum {
 -(Rect)rect;
 
 -(int) containsPoint: (Point) point;
+-(void) grabMouse;
+-(void) releaseMouse;
 
 -(int) options;
 
diff --git a/ruamoko/qwaq/qwaq-view.r b/ruamoko/qwaq/qwaq-view.r
index b46004755..6302e7db1 100644
--- a/ruamoko/qwaq/qwaq-view.r
+++ b/ruamoko/qwaq/qwaq-view.r
@@ -105,6 +105,16 @@ updateScreenCursor (View *view)
 	return rectContainsPoint (rect, point);
 }
 
+-(void) grabMouse
+{
+	[owner grabMouse];
+}
+
+-(void) releaseMouse
+{
+	[owner releaseMouse];
+}
+
 - (void) forward: (SEL) sel : (@va_list) args
 {
 	if (!textContext) {
diff --git a/ruamoko/qwaq/qwaq-window.r b/ruamoko/qwaq/qwaq-window.r
index d2b52e985..d0ee95fa2 100644
--- a/ruamoko/qwaq/qwaq-window.r
+++ b/ruamoko/qwaq/qwaq-window.r
@@ -22,6 +22,8 @@
 	textContext = [[TextContext alloc] initWithRect: rect];
 	panel = create_panel ([(id)textContext window]);
 
+	objects = [[Group alloc] initWithContext: textContext owner: self];
+
 	buf = [DrawBuffer buffer: {3, 3}];
 	[buf mvaddstr: {0, 0}, "XOX"];
 	[buf mvaddstr: {0, 1}, "OXO"];
@@ -36,45 +38,13 @@
 
 -handleEvent: (qwaq_event_t *) event
 {
-/*	switch (event.what) {
-		case qe_mouse:
-			mvwprintf(window, 0, 3, "%2d %2d %08x",
-					  event.mouse.x, event.mouse.y, event.mouse.buttons);
-			[self redraw];
-			point.x = event.mouse.x;
-			point.y = event.mouse.y;
-			for (int i = [views count]; i--> 0; ) {
-				View       *v = [views objectAtIndex: i];
-				if (rectContainsPoint (&v.absRect, &point)) {
-					[v handleEvent: event];
-					break;
-				}
-			}
-			break;
-		case qe_key:
-		case qe_command:
-			if (focusedView) {
-				[focusedView handleEvent: event];
-				for (int i = [views count];
-					 event.what != qe_none && i--> 0; ) {
-					View       *v = [views objectAtIndex: i];
-					 [v handleEvent: event];
-				}
-			}
-			break;
-		case qe_none:
-			break;
-	}*/
+	[objects handleEvent: event];
 	return self;
 }
 
 -addView: (View *) view
 {
-/*	[views addObject: view];
-	view.absRect.xpos = view.rect.xpos + rect.xpos;
-	view.absRect.ypos = view.rect.ypos + rect.ypos;
-	view.window = window;
-	[view setOwner: self];*/
+	[objects insert: view];
 	return self;
 }
 
@@ -102,35 +72,7 @@
 	}
 	[super draw];
 	[(id)textContext border: box_sides, box_corners];
-	Point pos = { 1, 1 };
-	//for (int i = ACS_ULCORNER; i <= ACS_STERLING; i++) {
-	for (int i = 32; i <= 127; i++) {
-		int ch = acs_char (i);
-		if (ch) {
-			[self mvaddch: pos, ch];
-		} else {
-			[self mvaddch: pos, '.'];
-		}
-		if (++pos.x > 32) {
-			pos.x = 1;
-			if (++pos.y >= ylen) {
-				break;
-			}
-		}
-	}
-	[textContext blitFromBuffer: buf to: makePoint (6, 3) from: [buf rect]];
-	[self refresh];
-	return self;
-}
-
--(Rect *) getRect
-{
-	return &rect;
-}
-
--setOwner: owner
-{
-	self.owner = owner;
+	[objects draw];
 	return self;
 }
 

From 1306d9fcdd1a0094feb48e2a5205ef36c799971d Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 19 Mar 2020 17:33:47 +0900
Subject: [PATCH 0846/1519] [qwaq] Fix some issues in Listener*

---
 ruamoko/qwaq/qwaq-listener.r | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-listener.r b/ruamoko/qwaq/qwaq-listener.r
index 5184668fd..14a0816aa 100644
--- a/ruamoko/qwaq/qwaq-listener.r
+++ b/ruamoko/qwaq/qwaq-listener.r
@@ -12,7 +12,7 @@
 	}
 	self.responder = responder;
 	self.message = message;
-	imp = [responder instanceMethodForSelector: message];
+	imp = [responder methodForSelector: message];
 	return self;
 }
 
@@ -33,7 +33,7 @@
 	if (!(self = [super init])) {
 		return nil;
 	}
-	listeners = [[Array alloc] retain];
+	listeners = [[Array array] retain];
 	return self;
 }
 

From ec2409cebad037f02b28a02430d4db7d7b5c61d8 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 19 Mar 2020 17:34:29 +0900
Subject: [PATCH 0847/1519] [qwaq] Mention that Window knows addView

---
 ruamoko/qwaq/qwaq-window.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ruamoko/qwaq/qwaq-window.h b/ruamoko/qwaq/qwaq-window.h
index 18c4f9fc6..215fcc2db 100644
--- a/ruamoko/qwaq/qwaq-window.h
+++ b/ruamoko/qwaq/qwaq-window.h
@@ -18,6 +18,7 @@
 }
 +windowWithRect: (Rect) rect;
 -setBackground: (int) ch;
+-addView: (View *) view;
 @end
 
 #endif//__qwaq_window_h

From 490f1ad4b8e69230d74a26edf06b067f1e549938 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 19 Mar 2020 18:36:15 +0900
Subject: [PATCH 0848/1519] [qwaq] Add wrappers for werase

---
 ruamoko/qwaq/qwaq-curses.c      | 45 +++++++++++++++++++++++++++++++++
 ruamoko/qwaq/qwaq-curses.h      |  1 +
 ruamoko/qwaq/qwaq-textcontext.r |  2 ++
 3 files changed, 48 insertions(+)

diff --git a/ruamoko/qwaq/qwaq-curses.c b/ruamoko/qwaq/qwaq-curses.c
index 3da81cfe3..cfad0c6ff 100644
--- a/ruamoko/qwaq/qwaq-curses.c
+++ b/ruamoko/qwaq/qwaq-curses.c
@@ -76,6 +76,7 @@ typedef enum qwaq_commands_e {
 	qwaq_cmd_wrefresh,
 	qwaq_cmd_init_pair,
 	qwaq_cmd_wbkgd,
+	qwaq_cmd_werase,
 	qwaq_cmd_scrollok,
 	qwaq_cmd_move,
 	qwaq_cmd_curs_set,
@@ -104,6 +105,7 @@ const char *qwaq_command_names[]= {
 	"wrefresh",
 	"init_pair",
 	"wbkgd",
+	"werase",
 	"scrollok",
 	"move",
 	"curs_set",
@@ -578,6 +580,15 @@ cmd_wbkgd (qwaq_resources_t *res)
 	wbkgd (window->win, ch);
 }
 
+static void
+cmd_werase (qwaq_resources_t *res)
+{
+	int         window_id = RB_PEEK_DATA (res->command_queue, 2);
+
+	window_t   *window = get_window (res, __FUNCTION__, window_id);
+	werase (window->win);
+}
+
 static void
 cmd_scrollok (qwaq_resources_t *res)
 {
@@ -717,6 +728,9 @@ process_commands (qwaq_resources_t *res)
 			case qwaq_cmd_wbkgd:
 				cmd_wbkgd (res);
 				break;
+			case qwaq_cmd_werase:
+				cmd_werase (res);
+				break;
 			case qwaq_cmd_scrollok:
 				cmd_scrollok (res);
 				break;
@@ -1384,6 +1398,26 @@ bi_wbkgd (progs_t *pr)
 	qwaq_wbkgd (pr, window_id, ch);
 }
 
+static void
+qwaq_werase (progs_t *pr, int window_id, int ch)
+{
+	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
+
+	if (get_window (res, __FUNCTION__, window_id)) {
+		int         command[] = { qwaq_cmd_werase, 0, window_id, };
+		command[1] = CMD_SIZE(command);
+		qwaq_submit_command (res, command);
+	}
+}
+static void
+bi_werase (progs_t *pr)
+{
+	int         window_id = P_INT (pr, 0);
+	int         ch = P_INT (pr, 1);
+
+	qwaq_werase (pr, window_id, ch);
+}
+
 static void
 qwaq_scrollok (progs_t *pr, int window_id, int flag)
 {
@@ -1719,6 +1753,15 @@ bi_i_TextContext__bkgd_ (progs_t *pr)
 	qwaq_wbkgd (pr, window_id, ch);
 }
 
+static void
+bi_i_TextContext__clear (progs_t *pr)
+{
+	int         window_id = P_STRUCT (pr, qwaq_textcontext_t, 0).window;
+	int         ch = P_INT (pr, 2);
+
+	qwaq_werase (pr, window_id, ch);
+}
+
 static void
 bi_i_TextContext__scrollok_ (progs_t *pr)
 {
@@ -1781,6 +1824,7 @@ static builtin_t builtins[] = {
 	{"max_color_pairs",	bi_max_color_pairs,	-1},
 	{"init_pair",		bi_init_pair,		-1},
 	{"wbkgd",			bi_wbkgd,			-1},
+	{"werase",			bi_werase,			-1},
 	{"scrollok",		bi_scrollok,		-1},
 	{"acs_char",		bi_acs_char,		-1},
 	{"move",			bi_move,			-1},
@@ -1809,6 +1853,7 @@ static builtin_t builtins[] = {
 	{"_i_TextContext__mvaddch_",		bi_i_TextContext__mvaddch_,		   -1},
 	{"_i_TextContext__mvaddstr_",		bi_i_TextContext__mvaddstr_,	   -1},
 	{"_i_TextContext__bkgd_",			bi_i_TextContext__bkgd_,		   -1},
+	{"_i_TextContext__clear",			bi_i_TextContext__clear,		   -1},
 	{"_i_TextContext__scrollok_",		bi_i_TextContext__scrollok_,	   -1},
 	{"_i_TextContext__border_",			bi_i_TextContext__border_,		   -1},
 
diff --git a/ruamoko/qwaq/qwaq-curses.h b/ruamoko/qwaq/qwaq-curses.h
index fc5c5c4cc..6d0c43df2 100644
--- a/ruamoko/qwaq/qwaq-curses.h
+++ b/ruamoko/qwaq/qwaq-curses.h
@@ -116,6 +116,7 @@ typedef struct panel_s *panel_t;
 @extern int max_color_pairs (void);
 @extern int init_pair (int pair, int f, int b);
 @extern void wbkgd (window_t win, int ch);
+@extern void werase (window_t win);
 @extern void scrollok (window_t win, int flag);
 
 @extern int acs_char (int acs);
diff --git a/ruamoko/qwaq/qwaq-textcontext.r b/ruamoko/qwaq/qwaq-textcontext.r
index d7ec2a4c4..85507dfce 100644
--- a/ruamoko/qwaq/qwaq-textcontext.r
+++ b/ruamoko/qwaq/qwaq-textcontext.r
@@ -133,6 +133,7 @@ static TextContext *screen;
 + (void) refresh = #0;
 
 - (void) bkgd: (int) ch = #0;
+- (void) clear = #0;
 - (void) scrollok: (int) flag = #0;
 - (void) border: (box_sides_t) sides, box_corners_t corners = #0;
 
@@ -157,6 +158,7 @@ int max_colors (void) = #0;
 int max_color_pairs (void) = #0;
 int init_pair (int pair, int f, int b) = #0;
 void wbkgd (window_t win, int ch) = #0;
+void werase (window_t win) = #0;
 void scrollok (window_t win, int flag) = #0;
 int acs_char (int acs) = #0;
 

From e49ba896aad3e117263d900ffaa1a4982a56034b Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 19 Mar 2020 18:37:25 +0900
Subject: [PATCH 0849/1519] [qwaq] Support background and clearing in
 DrawBuffer

---
 ruamoko/qwaq/qwaq-draw.h |  3 +++
 ruamoko/qwaq/qwaq-draw.r | 26 ++++++++++++++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/ruamoko/qwaq/qwaq-draw.h b/ruamoko/qwaq/qwaq-draw.h
index efda03b41..65599347f 100644
--- a/ruamoko/qwaq/qwaq-draw.h
+++ b/ruamoko/qwaq/qwaq-draw.h
@@ -18,6 +18,8 @@
 - blitFromBuffer: (DrawBuffer *) srcBuffer to: (Point) pos from: (Rect) rect;
 - (Extent) size;
 
+- (void) bkgd: (int) ch;
+- (void) clear;
 - (void) printf: (string) fmt, ...;
 - (void) vprintf: (string) fmt, @va_list args;
 - (void) addch: (int) ch;
@@ -33,6 +35,7 @@
 	int        *buffer;
 	Extent      size;
 	Point       cursor;
+	int         background;
 }
 + (DrawBuffer *) buffer: (Extent) size;
 - initWithSize: (Extent) size;
diff --git a/ruamoko/qwaq/qwaq-draw.r b/ruamoko/qwaq/qwaq-draw.r
index fd0d368aa..947d349f7 100644
--- a/ruamoko/qwaq/qwaq-draw.r
+++ b/ruamoko/qwaq/qwaq-draw.r
@@ -80,6 +80,26 @@
 	return self;
 }
 
+- (void) bkgd: (int) ch
+{
+	if ((ch & 0xff) < 32) {
+		ch = (ch & ~0xff) | 32;
+	}
+	background = ch;
+}
+
+- (void) clear
+{
+	int         ch = background;
+	int        *dst = buffer;
+	int        *end = buffer + size.width * size.height;
+
+	while (dst < end) {
+		*dst++ = ch;
+	}
+	cursor = {0, 0};
+}
+
 - (void) printf: (string) fmt, ...
 {
 	string str = vsprintf (fmt, @args);
@@ -113,6 +133,12 @@
 	} else if (ch == '\r') {
 		cursor.x = 0;
 	} else {
+		if ((ch & 0xff) < 32) {
+			ch = (ch & ~0xff) | 32;
+		}
+		if (!(ch & ~0xff)) {
+			ch |= background & ~0xff;
+		}
 		buffer[cursor.y * size.width + cursor.x++] = ch;
 	}
 }

From 8bd702ab1a5dc0097b43dc12fbf3faadcfb1e82a Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 19 Mar 2020 18:38:24 +0900
Subject: [PATCH 0850/1519] [qwaq] Fetch View origin and size separately

---
 ruamoko/qwaq/qwaq-view.h |  2 ++
 ruamoko/qwaq/qwaq-view.r | 11 +++++++++++
 2 files changed, 13 insertions(+)

diff --git a/ruamoko/qwaq/qwaq-view.h b/ruamoko/qwaq/qwaq-view.h
index e56a38ffa..2bb646653 100644
--- a/ruamoko/qwaq/qwaq-view.h
+++ b/ruamoko/qwaq/qwaq-view.h
@@ -61,6 +61,8 @@ enum {
 -setOwner: (Group *) owner;
 
 -(Rect)rect;
+-(Point)origin;
+-(Extent)size;
 
 -(int) containsPoint: (Point) point;
 -(void) grabMouse;
diff --git a/ruamoko/qwaq/qwaq-view.r b/ruamoko/qwaq/qwaq-view.r
index 6302e7db1..936a83352 100644
--- a/ruamoko/qwaq/qwaq-view.r
+++ b/ruamoko/qwaq/qwaq-view.r
@@ -100,6 +100,17 @@ updateScreenCursor (View *view)
 	return rect;
 }
 
+-(Point)origin
+{
+	return pos;
+}
+
+-(Extent)size
+{
+	return size;
+}
+
+
 -(int) containsPoint: (Point) point
 {
 	return rectContainsPoint (rect, point);

From 28a9e041e64678777c2c6a0ab4bf3fbd3cf5bb34 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 19 Mar 2020 18:39:11 +0900
Subject: [PATCH 0851/1519] [qwaq] Implement Group redraw

---
 ruamoko/qwaq/qwaq-group.r | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/ruamoko/qwaq/qwaq-group.r b/ruamoko/qwaq/qwaq-group.r
index 284a8a6a3..a358a4f59 100644
--- a/ruamoko/qwaq/qwaq-group.r
+++ b/ruamoko/qwaq/qwaq-group.r
@@ -64,6 +64,14 @@ not_dont_draw (id aView, void *aGroup)
 
 -redraw
 {
+	if (owner) {
+		[owner redraw];
+	} else {
+		[self draw];
+		if (__obj_responds_to (context, @selector(refresh))) {
+			[(id)context refresh];
+		}
+	}
 	return self;
 }
 

From cce6837fe8119a0832c1721e0357d63c23143e66 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 19 Mar 2020 18:40:21 +0900
Subject: [PATCH 0852/1519] [qwaq] Offset event mouse coordinates

Each level of the object hierarchy has its own offset relative to the
level above, but mouse coordinates are absolute.
---
 ruamoko/qwaq/qwaq-button.r | 1 +
 ruamoko/qwaq/qwaq-group.r  | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/ruamoko/qwaq/qwaq-button.r b/ruamoko/qwaq/qwaq-button.r
index 093865576..cece78609 100644
--- a/ruamoko/qwaq/qwaq-button.r
+++ b/ruamoko/qwaq/qwaq-button.r
@@ -23,6 +23,7 @@
 
 -draw
 {
+	[super draw];
 	[textContext blitFromBuffer: icon[pressed]
 							 to: pos
 						   from: [icon[pressed] rect]];
diff --git a/ruamoko/qwaq/qwaq-group.r b/ruamoko/qwaq/qwaq-group.r
index a358a4f59..48eca7bd6 100644
--- a/ruamoko/qwaq/qwaq-group.r
+++ b/ruamoko/qwaq/qwaq-group.r
@@ -94,6 +94,12 @@ find_mouse_view(Group *group, Point pos)
 			[[views objectAtIndex:focused] handleEvent: event];
 		}
 	} else if (event.what & qe_positional) {
+		Point       origin = {};
+		if (owner) {
+			origin = [owner origin];
+		}
+		event.mouse.x -= origin.x;
+		event.mouse.y -= origin.y;
 		Point       pos = {event.mouse.x, event.mouse.y};
 		if (mouse_grabbed) {
 			[mouse_grabbed handleEvent: event];
@@ -112,6 +118,8 @@ find_mouse_view(Group *group, Point pos)
 				[mouse_within handleEvent: event];
 			}
 		}
+		event.mouse.x += origin.x;
+		event.mouse.y += origin.y;
 	} else {
 		// broadcast
 		[views makeObjectsPerformSelector: @selector(draw) withObject: event];

From 2c20a031e41592bd2d6833eb46c9a2d900e6d729 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 19 Mar 2020 18:41:53 +0900
Subject: [PATCH 0853/1519] [qwaq] Do up a little button test "scene"

Hmm... "scene"... too much Unity?
---
 ruamoko/qwaq/qwaq-app.h |  4 +++
 ruamoko/qwaq/qwaq-app.r | 57 +++++++++++++++++++++++++++++++++++++++--
 2 files changed, 59 insertions(+), 2 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-app.h b/ruamoko/qwaq/qwaq-app.h
index 7062ad096..db341c7a3 100644
--- a/ruamoko/qwaq/qwaq-app.h
+++ b/ruamoko/qwaq/qwaq-app.h
@@ -6,6 +6,7 @@
 #include "event.h"
 
 @class Group;
+@class TextContext;
 
 @interface QwaqApplication: Object
 {
@@ -13,6 +14,9 @@
 	qwaq_command endState;
 
 	Group      *objects;
+
+	TextContext *screen;
+	int         autocount;
 }
 -run;
 -draw;
diff --git a/ruamoko/qwaq/qwaq-app.r b/ruamoko/qwaq/qwaq-app.r
index e040fe84c..9df5bf3e1 100644
--- a/ruamoko/qwaq/qwaq-app.r
+++ b/ruamoko/qwaq/qwaq-app.r
@@ -3,8 +3,10 @@ int fence;
 
 #include "color.h"
 #include "qwaq-app.h"
+#include "qwaq-button.h"
 #include "qwaq-curses.h"
 #include "qwaq-group.h"
+#include "qwaq-listener.h"
 #include "qwaq-window.h"
 #include "qwaq-screen.h"
 #include "qwaq-view.h"
@@ -38,8 +40,10 @@ arp_end (void)
 	initialize ();
 	init_pair (1, COLOR_WHITE, COLOR_BLUE);
 	init_pair (2, COLOR_WHITE, COLOR_BLACK);
+	init_pair (3, COLOR_WHITE, COLOR_GREEN);
+	init_pair (4, COLOR_YELLOW, COLOR_RED);
 
-	TextContext *screen = [TextContext screen];
+	screen = [TextContext screen];
 	objects = [[Group alloc] initWithContext: screen owner: nil];
 
 	[screen bkgd: COLOR_PAIR (1)];
@@ -48,10 +52,59 @@ arp_end (void)
 	r.offset.y = r.extent.height / 4;
 	r.extent.width /= 2;
 	r.extent.height /= 2;
-	[objects insert: [[Window windowWithRect: r] setBackground: COLOR_PAIR (2)]];
+	Window *w;
+	[objects insert: w = [[Window windowWithRect: r] setBackground: COLOR_PAIR (2)]];
+	DrawBuffer *released = [DrawBuffer buffer: {12, 1}];
+	DrawBuffer *pressed = [DrawBuffer buffer: {12, 1}];
+	Button *b = [[Button alloc] initWithPos: {3, 4} releasedIcon: released
+													pressedIcon: pressed];
+	[w addView: b];
+	[released bkgd: COLOR_PAIR(3)];
+	[released clear];
+	[released mvaddstr: {2, 0}, "press me"];
+	[pressed bkgd: COLOR_PAIR(4)];
+	[pressed clear];
+	[pressed mvaddstr: {1, 0}, "release me"];
+	[[b onPress] addListener: self message: @selector (buttonPressed:)];
+	[[b onRelease] addListener: self message: @selector (buttonReleased:)];
+	[[b onClick] addListener: self message: @selector (buttonClick:)];
+	[[b onDrag] addListener: self message: @selector (buttonDrag:)];
+	[[b onAuto] addListener: self message: @selector (buttonAuto:)];
 	return self;
 }
 
+-(void) buttonPressed: (id) sender
+{
+	[screen mvaddstr: {2, 0}, " pressed"];
+	[screen refresh];
+}
+
+-(void) buttonReleased: (id) sender
+{
+	[screen mvaddstr: {2, 0}, "released"];
+	[screen refresh];
+}
+
+-(void) buttonClick: (id) sender
+{
+	[screen mvaddstr: {2, 0}, "clicked "];
+	[screen refresh];
+}
+
+-(void) buttonDrag: (id) sender
+{
+	[screen mvaddstr: {2, 0}, "dragged "];
+	Rect rect = [sender rect];
+	[screen mvprintf: {15, 0}, "%d %d", rect.offset.x, rect.offset.y];
+	[screen refresh];
+}
+
+-(void) buttonAuto: (id) sender
+{
+	[screen mvprintf: {2, 1}, "%d", autocount++];
+	[screen refresh];
+}
+
 -run
 {
 	[self draw];

From 95d20d67c77897d30cb79d9791c1f6f9fec986ea Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 19 Mar 2020 19:00:03 +0900
Subject: [PATCH 0854/1519] [qwaq] Implement mouse grabbing

Button will need it for dragging.
---
 ruamoko/qwaq/qwaq-app.r    | 2 +-
 ruamoko/qwaq/qwaq-button.r | 6 ++++--
 ruamoko/qwaq/qwaq-group.r  | 5 +++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-app.r b/ruamoko/qwaq/qwaq-app.r
index 9df5bf3e1..7d5ed4ba2 100644
--- a/ruamoko/qwaq/qwaq-app.r
+++ b/ruamoko/qwaq/qwaq-app.r
@@ -40,7 +40,7 @@ arp_end (void)
 	initialize ();
 	init_pair (1, COLOR_WHITE, COLOR_BLUE);
 	init_pair (2, COLOR_WHITE, COLOR_BLACK);
-	init_pair (3, COLOR_WHITE, COLOR_GREEN);
+	init_pair (3, COLOR_BLACK, COLOR_GREEN);
 	init_pair (4, COLOR_YELLOW, COLOR_RED);
 
 	screen = [TextContext screen];
diff --git a/ruamoko/qwaq/qwaq-button.r b/ruamoko/qwaq/qwaq-button.r
index cece78609..6287de9ce 100644
--- a/ruamoko/qwaq/qwaq-button.r
+++ b/ruamoko/qwaq/qwaq-button.r
@@ -38,13 +38,15 @@
 		switch ((qwaq_mouse_event) (event.what & qe_mouse)) {
 			case qe_mousedown:
 				pressed = 1;
-				[self redraw];
 				action = onPress;
+				[self grabMouse];
+				[self redraw];
 				break;
 			case qe_mouseup:
 				pressed = 0;
-				[self redraw];
 				action = onRelease;
+				[self releaseMouse];
+				[self redraw];
 				break;
 			case qe_mouseclick:
 				action = onClick;
diff --git a/ruamoko/qwaq/qwaq-group.r b/ruamoko/qwaq/qwaq-group.r
index 48eca7bd6..c8af9bf8a 100644
--- a/ruamoko/qwaq/qwaq-group.r
+++ b/ruamoko/qwaq/qwaq-group.r
@@ -27,6 +27,7 @@
 -insert: (View *) view
 {
 	[views addObject: view];
+	[view setOwner: self];
 	[view setContext: context];
 	return self;
 }
@@ -135,8 +136,8 @@ find_mouse_view(Group *group, Point pos)
 
 -(void) releaseMouse
 {
-	mouse_grabbed = mouse_within;
-	[owner grabMouse];
+	mouse_grabbed = nil;
+	[owner releaseMouse];
 }
 
 @end

From e8d947ed8a7314e58d48d8f5a0fb118b73b6c008 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 19 Mar 2020 19:25:57 +0900
Subject: [PATCH 0855/1519] [qwaq] Get click and drag reporting working

---
 ruamoko/qwaq/qwaq-app.r    | 12 ++++++------
 ruamoko/qwaq/qwaq-button.h |  6 ++++++
 ruamoko/qwaq/qwaq-button.r | 21 +++++++++++++++++++++
 3 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-app.r b/ruamoko/qwaq/qwaq-app.r
index 7d5ed4ba2..2aaf62880 100644
--- a/ruamoko/qwaq/qwaq-app.r
+++ b/ruamoko/qwaq/qwaq-app.r
@@ -75,33 +75,33 @@ arp_end (void)
 
 -(void) buttonPressed: (id) sender
 {
-	[screen mvaddstr: {2, 0}, " pressed"];
+	[screen mvaddstr: {2, 0}, " pressed "];
 	[screen refresh];
 }
 
 -(void) buttonReleased: (id) sender
 {
-	[screen mvaddstr: {2, 0}, "released"];
+	[screen mvaddstr: {2, 0}, "released "];
 	[screen refresh];
 }
 
 -(void) buttonClick: (id) sender
 {
-	[screen mvaddstr: {2, 0}, "clicked "];
+	[screen mvprintf: {2, 1}, "clicked %d", [sender click]];
 	[screen refresh];
 }
 
 -(void) buttonDrag: (id) sender
 {
 	[screen mvaddstr: {2, 0}, "dragged "];
-	Rect rect = [sender rect];
-	[screen mvprintf: {15, 0}, "%d %d", rect.offset.x, rect.offset.y];
+	Point delta = [sender delta];
+	[screen mvprintf: {15, 0}, "%3d %3d", delta.x, delta.y];
 	[screen refresh];
 }
 
 -(void) buttonAuto: (id) sender
 {
-	[screen mvprintf: {2, 1}, "%d", autocount++];
+	[screen mvprintf: {2, 2}, "%d", autocount++];
 	[screen refresh];
 }
 
diff --git a/ruamoko/qwaq/qwaq-button.h b/ruamoko/qwaq/qwaq-button.h
index 470a2ae08..bab624e35 100644
--- a/ruamoko/qwaq/qwaq-button.h
+++ b/ruamoko/qwaq/qwaq-button.h
@@ -10,6 +10,9 @@
 {
 	DrawBuffer *icon[2];
 	int         pressed;
+	int         click;
+	Point       dragBase;
+	Point       dragPos;
 	ListenerGroup *onPress;
 	ListenerGroup *onRelease;
 	ListenerGroup *onClick;
@@ -25,6 +28,9 @@
 -(ListenerGroup *) onDrag;
 -(ListenerGroup *) onAuto;
 -(ListenerGroup *) onHover;
+
+- (int) click;
+- (Point) delta;
 @end
 
 #endif//__qwaq_button_h
diff --git a/ruamoko/qwaq/qwaq-button.r b/ruamoko/qwaq/qwaq-button.r
index 6287de9ce..fe7aa5f2f 100644
--- a/ruamoko/qwaq/qwaq-button.r
+++ b/ruamoko/qwaq/qwaq-button.r
@@ -38,25 +38,35 @@
 		switch ((qwaq_mouse_event) (event.what & qe_mouse)) {
 			case qe_mousedown:
 				pressed = 1;
+				click = 0;
+				dragBase = {event.mouse.x, event.mouse.y};
 				action = onPress;
 				[self grabMouse];
 				[self redraw];
 				break;
 			case qe_mouseup:
 				pressed = 0;
+				click = 0;
 				action = onRelease;
 				[self releaseMouse];
+				if ([self containsPoint: {event.mouse.x, event.mouse.y}]) {
+					[onClick respond: self];
+				}
 				[self redraw];
 				break;
 			case qe_mouseclick:
 				action = onClick;
+				click = event.mouse.click;
 				break;
 			case qe_mousemove:
+				click = 0;
 				if (pressed) {
+					dragPos = {event.mouse.x, event.mouse.y};
 					action = onDrag;
 				}
 				break;
 			case qe_mouseauto:
+				click = 0;
 				action = onAuto;
 				break;
 		}
@@ -96,4 +106,15 @@
 {
 	return onHover;
 }
+
+- (int) click
+{
+	return click;
+}
+
+- (Point) delta
+{
+	return {dragPos.x - dragBase.x, dragPos.y - dragBase.y};
+}
+
 @end

From 14fbdc7df91c090fa87b78cc30319effb90fb21a Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 19 Mar 2020 19:35:19 +0900
Subject: [PATCH 0856/1519] [qwaq] Clean up debug in TextContext

---
 ruamoko/qwaq/qwaq-textcontext.r | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-textcontext.r b/ruamoko/qwaq/qwaq-textcontext.r
index 85507dfce..d2fd9144b 100644
--- a/ruamoko/qwaq/qwaq-textcontext.r
+++ b/ruamoko/qwaq/qwaq-textcontext.r
@@ -74,19 +74,7 @@ static TextContext *screen;
 	Rect r = { {}, size };
 	Rect t = { pos, rect.extent };
 
-	wprintf (stdscr, "src: %p\n", srcBuffer);
-	wprintf (stdscr, "srcSize: %d %d\n", srcSize.width, srcSize.height);
-	wprintf (stdscr, "pos: %d %d\n", pos.x, pos.x);
-	wprintf (stdscr, "rect: %d %d %d %d\n",
-			 rect.offset.x, rect.offset.y,
-			 rect.extent.width, rect.extent.height);
-	wprintf (stdscr, "r: %d %d %d %d\n",
-			 r.offset.x, r.offset.y, r.extent.width, r.extent.height);
-	wprintf (stdscr, "t: %d %d %d %d\n",
-			 t.offset.x, t.offset.y, t.extent.width, t.extent.height);
 	t = clipRect (r, t);
-	wprintf (stdscr, "t: %d %d %d %d\n",
-			 t.offset.x, t.offset.y, t.extent.width, t.extent.height);
 	if (t.extent.width < 0 || t.extent.height < 0) {
 		return self;
 	}
@@ -100,12 +88,6 @@ static TextContext *screen;
 	r.extent = size;
 
 	rect = clipRect (r, rect);
-	wprintf (stdscr, "pos: %d %d\n", pos.x, pos.x);
-	wprintf (stdscr, "rect: %d %d %d %d\n",
-			 rect.offset.x, rect.offset.y,
-			 rect.extent.width, rect.extent.height);
-	wprintf (stdscr, "r: %d %d %d %d\n",
-			 r.offset.x, r.offset.y, r.extent.width, r.extent.height);
 	if (rect.extent.width < 0 || rect.extent.height < 0) {
 		return self;
 	}

From f027a42e72679d561a237cac5cd4ed8120186981 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 19 Mar 2020 19:53:32 +0900
Subject: [PATCH 0857/1519] [qwaq] Treat 0 as transparent character

---
 ruamoko/qwaq/qwaq-curses.c | 4 +++-
 ruamoko/qwaq/qwaq-draw.r   | 5 +----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-curses.c b/ruamoko/qwaq/qwaq-curses.c
index cfad0c6ff..c3dcf1b4c 100644
--- a/ruamoko/qwaq/qwaq-curses.c
+++ b/ruamoko/qwaq/qwaq-curses.c
@@ -649,7 +649,9 @@ cmd_mvwblit_line (qwaq_resources_t *res)
 	getyx (window->win, save_y, save_x);
 	for (int i = 0; i < len; i++) {
 		Sys_Printf(" %d", chs[i]);
-		mvwaddch (window->win, y, x + i, chs[i]);
+		if (chs[i] & 0xff) {
+			mvwaddch (window->win, y, x + i, chs[i]);
+		}
 	}
 	Sys_Printf("\n");
 	wmove (window->win, save_y, save_x);
diff --git a/ruamoko/qwaq/qwaq-draw.r b/ruamoko/qwaq/qwaq-draw.r
index 947d349f7..31975ef19 100644
--- a/ruamoko/qwaq/qwaq-draw.r
+++ b/ruamoko/qwaq/qwaq-draw.r
@@ -82,9 +82,6 @@
 
 - (void) bkgd: (int) ch
 {
-	if ((ch & 0xff) < 32) {
-		ch = (ch & ~0xff) | 32;
-	}
 	background = ch;
 }
 
@@ -132,7 +129,7 @@
 		cursor.y++;
 	} else if (ch == '\r') {
 		cursor.x = 0;
-	} else {
+	} else if (ch & 0xff) {
 		if ((ch & 0xff) < 32) {
 			ch = (ch & ~0xff) | 32;
 		}

From fe4f8315120db57323b53c5642a8335785778554 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 19 Mar 2020 20:31:01 +0900
Subject: [PATCH 0858/1519] [qwaq] Remove a pile of stray panel_free calls

C&P programming FTW :P
---
 ruamoko/qwaq/qwaq-curses.c | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-curses.c b/ruamoko/qwaq/qwaq-curses.c
index c3dcf1b4c..afb2ca246 100644
--- a/ruamoko/qwaq/qwaq-curses.c
+++ b/ruamoko/qwaq/qwaq-curses.c
@@ -436,7 +436,6 @@ cmd_hide_panel (qwaq_resources_t *res)
 
 	panel_t   *panel = get_panel (res, __FUNCTION__, panel_id);
 	hide_panel (panel->panel);
-	panel_free (res, panel);
 }
 
 static void
@@ -446,7 +445,6 @@ cmd_show_panel (qwaq_resources_t *res)
 
 	panel_t   *panel = get_panel (res, __FUNCTION__, panel_id);
 	show_panel (panel->panel);
-	panel_free (res, panel);
 }
 
 static void
@@ -456,7 +454,6 @@ cmd_top_panel (qwaq_resources_t *res)
 
 	panel_t   *panel = get_panel (res, __FUNCTION__, panel_id);
 	top_panel (panel->panel);
-	panel_free (res, panel);
 }
 
 static void
@@ -466,7 +463,6 @@ cmd_bottom_panel (qwaq_resources_t *res)
 
 	panel_t   *panel = get_panel (res, __FUNCTION__, panel_id);
 	bottom_panel (panel->panel);
-	panel_free (res, panel);
 }
 
 static void
@@ -478,7 +474,6 @@ cmd_move_panel (qwaq_resources_t *res)
 
 	panel_t   *panel = get_panel (res, __FUNCTION__, panel_id);
 	move_panel (panel->panel, y, x);
-	panel_free (res, panel);
 }
 
 static void
@@ -648,12 +643,10 @@ cmd_mvwblit_line (qwaq_resources_t *res)
 	window_t   *window = get_window (res, __FUNCTION__, window_id);
 	getyx (window->win, save_y, save_x);
 	for (int i = 0; i < len; i++) {
-		Sys_Printf(" %d", chs[i]);
 		if (chs[i] & 0xff) {
 			mvwaddch (window->win, y, x + i, chs[i]);
 		}
 	}
-	Sys_Printf("\n");
 	wmove (window->win, save_y, save_x);
 	release_string (res, chs_id);
 }
@@ -663,12 +656,12 @@ process_commands (qwaq_resources_t *res)
 {
 	while (RB_DATA_AVAILABLE (res->command_queue) >= 2) {
 		qwaq_commands cmd = RB_PEEK_DATA (res->command_queue, 0);
-		int len = RB_PEEK_DATA (res->command_queue, 1);
-		Sys_Printf ("%s[%d]", qwaq_command_names[cmd], len);
-		for (int i = 2; i < len; i++) {
-			Sys_Printf (" %d", RB_PEEK_DATA (res->command_queue, i));
-		}
-		Sys_Printf ("\n");
+		//int len = RB_PEEK_DATA (res->command_queue, 1);
+		//Sys_Printf ("%s[%d]", qwaq_command_names[cmd], len);
+		//for (int i = 2; i < len; i++) {
+		//	Sys_Printf (" %d", RB_PEEK_DATA (res->command_queue, i));
+		//}
+		//Sys_Printf ("\n");
 		switch (cmd) {
 			case qwaq_cmd_newwin:
 				cmd_newwin (res);

From 3a28d84c3fc992647d5478c6ebc1bcedf9eca845 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 19 Mar 2020 20:31:59 +0900
Subject: [PATCH 0859/1519] [qwaq] Implement window dragging

Other than the stray panel_free, that was surprisingly easy. However, do
need to check that the window can be moved otherwise window pos and
panel pos will get out of sync.
---
 ruamoko/qwaq/qwaq-window.r | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/ruamoko/qwaq/qwaq-window.r b/ruamoko/qwaq/qwaq-window.r
index d0ee95fa2..35a0af8b4 100644
--- a/ruamoko/qwaq/qwaq-window.r
+++ b/ruamoko/qwaq/qwaq-window.r
@@ -1,8 +1,11 @@
 #include <Array.h>
+#include <string.h>
 
 #include "event.h"
+#include "qwaq-button.h"
 #include "qwaq-curses.h"
 #include "qwaq-group.h"
+#include "qwaq-listener.h"
 #include "qwaq-window.h"
 #include "qwaq-view.h"
 
@@ -24,6 +27,15 @@
 
 	objects = [[Group alloc] initWithContext: textContext owner: self];
 
+	string titlestr = "drag me";
+	DrawBuffer *title = [DrawBuffer buffer: {xlen, 1}];
+	[title mvaddstr: {(xlen - strlen(titlestr)) / 2, 0}, titlestr];
+
+	Button *b = [[Button alloc] initWithPos: {0, 0} releasedIcon: title
+													 pressedIcon: title];
+	[[b onDrag] addListener: self message: @selector(dragWindow:)];
+	[self addView: b];
+
 	buf = [DrawBuffer buffer: {3, 3}];
 	[buf mvaddstr: {0, 0}, "XOX"];
 	[buf mvaddstr: {0, 1}, "OXO"];
@@ -31,6 +43,15 @@
 	return self;
 }
 
+- (void) dragWindow: (Button *) sender
+{
+	Point       delta = [sender delta];
+	xpos += delta.x;
+	ypos += delta.y;
+	move_panel (panel, xpos, ypos);
+	[owner redraw];
+}
+
 -setContext: (id<TextContext>) context
 {
 	return self;

From f329ca83b67ec73ad54dc0c8e02d642eb24d1d35 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 19 Mar 2020 20:39:23 +0900
Subject: [PATCH 0860/1519] [qwaq] Ensure background color clearing works

Even with 0 for the character, colors should get into the buffer.
---
 ruamoko/qwaq/qwaq-draw.r | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-draw.r b/ruamoko/qwaq/qwaq-draw.r
index 31975ef19..757f00e90 100644
--- a/ruamoko/qwaq/qwaq-draw.r
+++ b/ruamoko/qwaq/qwaq-draw.r
@@ -91,6 +91,9 @@
 	int        *dst = buffer;
 	int        *end = buffer + size.width * size.height;
 
+	if (ch && !(ch & 0xff)) {
+		ch |= ' ';
+	}
 	while (dst < end) {
 		*dst++ = ch;
 	}
@@ -129,10 +132,7 @@
 		cursor.y++;
 	} else if (ch == '\r') {
 		cursor.x = 0;
-	} else if (ch & 0xff) {
-		if ((ch & 0xff) < 32) {
-			ch = (ch & ~0xff) | 32;
-		}
+	} else {
 		if (!(ch & ~0xff)) {
 			ch |= background & ~0xff;
 		}

From ac23156ecd9cf1d6d3309752033240b1be0278e6 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 19 Mar 2020 21:28:55 +0900
Subject: [PATCH 0861/1519] [qwaq] Clamp window motion to owner's bounds

---
 ruamoko/qwaq/qwaq-group.h  |  3 +++
 ruamoko/qwaq/qwaq-group.r  | 24 ++++++++++++++++++++++++
 ruamoko/qwaq/qwaq-window.r | 20 +++++++++++++++++---
 3 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-group.h b/ruamoko/qwaq/qwaq-group.h
index f9e4bc858..eaa7606eb 100644
--- a/ruamoko/qwaq/qwaq-group.h
+++ b/ruamoko/qwaq/qwaq-group.h
@@ -20,6 +20,9 @@
 -initWithContext: (id<TextContext>) context owner: (View *) owner;
 -insert: (View *) view;
 -remove: (View *) view;
+-(Rect) rect;
+-(Point) origin;
+-(Extent) size;
 -draw;
 -redraw;
 -handleEvent: (qwaq_event_t *) event;
diff --git a/ruamoko/qwaq/qwaq-group.r b/ruamoko/qwaq/qwaq-group.r
index c8af9bf8a..2df05bcba 100644
--- a/ruamoko/qwaq/qwaq-group.r
+++ b/ruamoko/qwaq/qwaq-group.r
@@ -46,6 +46,30 @@
 	return self;
 }
 
+-(Rect) rect
+{
+	if (owner) {
+		return [owner rect];
+	}
+	return {[self origin], [self size]};
+}
+
+-(Point) origin
+{
+	if (owner) {
+		return [owner origin];
+	}
+	return {0, 0};
+}
+
+-(Extent) size
+{
+	if (owner) {
+		return [owner size];
+	}
+	return [context size];
+}
+
 static BOOL
 not_dont_draw (id aView, void *aGroup)
 {
diff --git a/ruamoko/qwaq/qwaq-window.r b/ruamoko/qwaq/qwaq-window.r
index 35a0af8b4..2235a82c9 100644
--- a/ruamoko/qwaq/qwaq-window.r
+++ b/ruamoko/qwaq/qwaq-window.r
@@ -46,9 +46,23 @@
 - (void) dragWindow: (Button *) sender
 {
 	Point       delta = [sender delta];
-	xpos += delta.x;
-	ypos += delta.y;
-	move_panel (panel, xpos, ypos);
+	Point       p = {xpos + delta.x, ypos + delta.y};
+	Extent      bounds = [owner size];
+	if (p.x < 0) {
+		p.x = 0;
+	}
+	if (p.x + xlen > bounds.width) {
+		p.x = bounds.width - xlen;
+	}
+	if (p.y < 0) {
+		p.y = 0;
+	}
+	if (p.y + ylen > bounds.height) {
+		p.y = bounds.height - ylen;
+	}
+	xpos = p.x;
+	ypos = p.y;
+	move_panel (panel, p.x, p.y);
 	[owner redraw];
 }
 

From 65538104bf1f5eec12279ba8026cd9dea805ac91 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 19 Mar 2020 23:18:01 +0900
Subject: [PATCH 0862/1519] [qwaq] Tweak listener message names

I didn't like the message:message bit
---
 ruamoko/qwaq/qwaq-app.r      | 10 +++++-----
 ruamoko/qwaq/qwaq-listener.h |  8 ++++----
 ruamoko/qwaq/qwaq-listener.r | 12 ++++++------
 ruamoko/qwaq/qwaq-window.r   |  2 +-
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-app.r b/ruamoko/qwaq/qwaq-app.r
index 2aaf62880..beeb02788 100644
--- a/ruamoko/qwaq/qwaq-app.r
+++ b/ruamoko/qwaq/qwaq-app.r
@@ -65,11 +65,11 @@ arp_end (void)
 	[pressed bkgd: COLOR_PAIR(4)];
 	[pressed clear];
 	[pressed mvaddstr: {1, 0}, "release me"];
-	[[b onPress] addListener: self message: @selector (buttonPressed:)];
-	[[b onRelease] addListener: self message: @selector (buttonReleased:)];
-	[[b onClick] addListener: self message: @selector (buttonClick:)];
-	[[b onDrag] addListener: self message: @selector (buttonDrag:)];
-	[[b onAuto] addListener: self message: @selector (buttonAuto:)];
+	[[b onPress] addListener: self : @selector (buttonPressed:)];
+	[[b onRelease] addListener: self : @selector (buttonReleased:)];
+	[[b onClick] addListener: self : @selector (buttonClick:)];
+	[[b onDrag] addListener: self : @selector (buttonDrag:)];
+	[[b onAuto] addListener: self : @selector (buttonAuto:)];
 	return self;
 }
 
diff --git a/ruamoko/qwaq/qwaq-listener.h b/ruamoko/qwaq/qwaq-listener.h
index bb02d71f1..2f7ec02b3 100644
--- a/ruamoko/qwaq/qwaq-listener.h
+++ b/ruamoko/qwaq/qwaq-listener.h
@@ -11,9 +11,9 @@
 	SEL         message;
 	IMP         imp;
 }
--initWithResponder: (id) responder message: (SEL) message;
+-initWithResponder: (id) responder :(SEL)message;
 -(void) respond: (id) caller;
--(BOOL) matchResponder: (id) responder message: (SEL) message;
+-(BOOL) matchResponder: (id) responder :(SEL)message;
 @end
 
 @interface ListenerGroup : Object
@@ -21,8 +21,8 @@
 	Array      *listeners;
 }
 -init;
--addListener: (id) responder message: (SEL) message;
--removeListener: (id) responder message: (SEL) message;
+-addListener: (id) responder :(SEL)message;
+-removeListener: (id) responder :(SEL)message;
 -(void) respond: (id) caller;
 @end
 
diff --git a/ruamoko/qwaq/qwaq-listener.r b/ruamoko/qwaq/qwaq-listener.r
index 14a0816aa..26e6f28c5 100644
--- a/ruamoko/qwaq/qwaq-listener.r
+++ b/ruamoko/qwaq/qwaq-listener.r
@@ -5,7 +5,7 @@
 @class Array;
 
 @implementation Listener
--initWithResponder: (id) responder message: (SEL) message
+-initWithResponder: (id) responder :(SEL)message
 {
 	if (!(self = [super init])) {
 		return nil;
@@ -21,7 +21,7 @@
 	imp (responder, message, caller);
 }
 
--(BOOL) matchResponder: (id) responder message: (SEL) message
+-(BOOL) matchResponder: (id) responder :(SEL)message
 {
 	return self.responder == responder && self.message == message;
 }
@@ -37,21 +37,21 @@
 	return self;
 }
 
--addListener: (id) responder message: (SEL) message
+-addListener: (id) responder :(SEL)message
 {
 	Listener   *listener = [[Listener alloc] initWithResponder: responder
-													   message: message];
+															  : message];
 	if (listener) {
 		[listeners addObject: listener];
 	}
 	return self;
 }
 
--removeListener: (id) responder message: (SEL) message
+-removeListener: (id) responder :(SEL)message
 {
 	for (int i = [listeners count]; i-- > 0; ) {
 		Listener   *l = [listeners objectAtIndex: i];
-		if ([l matchResponder: responder message: message]) {
+		if ([l matchResponder: responder : message]) {
 			[listeners removeObjectAtIndex: i];
 		}
 	}
diff --git a/ruamoko/qwaq/qwaq-window.r b/ruamoko/qwaq/qwaq-window.r
index 2235a82c9..1c772867f 100644
--- a/ruamoko/qwaq/qwaq-window.r
+++ b/ruamoko/qwaq/qwaq-window.r
@@ -33,7 +33,7 @@
 
 	Button *b = [[Button alloc] initWithPos: {0, 0} releasedIcon: title
 													 pressedIcon: title];
-	[[b onDrag] addListener: self message: @selector(dragWindow:)];
+	[[b onDrag] addListener: self : @selector(dragWindow:)];
 	[self addView: b];
 
 	buf = [DrawBuffer buffer: {3, 3}];

From ec12941fcbbf72fe12c2990d4ebb40f7a77d50d1 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 19 Mar 2020 23:53:54 +0900
Subject: [PATCH 0863/1519] Move the ring buffer macros to their own header

They seem to have proven themselves to be robust.
---
 include/QF/Makefile.am     |   3 +-
 include/QF/ringbuffer.h    | 103 +++++++++++++++++++++++++++++++++++++
 ruamoko/qwaq/qwaq-curses.c |  73 +-------------------------
 3 files changed, 106 insertions(+), 73 deletions(-)
 create mode 100644 include/QF/ringbuffer.h

diff --git a/include/QF/Makefile.am b/include/QF/Makefile.am
index 724d192df..c0fda5cd1 100644
--- a/include/QF/Makefile.am
+++ b/include/QF/Makefile.am
@@ -11,7 +11,8 @@ include_qf= \
 	msg.h object.h pak.h pakfile.h pcx.h png.h plugin.h pr_comp.h pr_debug.h \
 	pr_obj.h pr_type.h progs.h qargs.h qdefs.h qendian.h qfplist.h qtypes.h \
 	quakefs.h \
-	quakeio.h render.h riff.h ruamoko.h screen.h script.h segtext.h set.h \
+	quakeio.h render.h riff.h ringbuffer.h ruamoko.h \
+	screen.h script.h segtext.h set.h \
 	sizebuf.h skin.h sound.h spritegn.h sys.h teamplay.h tga.h va.h \
 	ver_check.h vid.h vrect.h view.h wad.h wadfile.h winding.h zone.h \
 	\
diff --git a/include/QF/ringbuffer.h b/include/QF/ringbuffer.h
new file mode 100644
index 000000000..cc289640e
--- /dev/null
+++ b/include/QF/ringbuffer.h
@@ -0,0 +1,103 @@
+/*
+	ringbuffer.h
+
+	ring buffer
+
+	Copyright (C) 2020  Bill Currie <bill@taniwha.org>
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+
+#ifndef __QF_ringbuffer_h
+#define __QF_ringbuffer_h
+
+#define RING_BUFFER(type, size) 	\
+	struct {						\
+		type        buffer[size];	\
+		unsigned    head;			\
+		unsigned    tail;			\
+	}
+
+#define RB_buffer_size(ring_buffer)						\
+	({	__auto_type rb = (ring_buffer);					\
+		sizeof (rb->buffer) / sizeof (rb->buffer[0]);	\
+	})
+
+#define RB_SPACE_AVAILABLE(ring_buffer)										\
+	({	__auto_type rb = &(ring_buffer);									\
+		(rb->tail + RB_buffer_size(rb) - rb->head - 1) % RB_buffer_size(rb);\
+	})
+
+#define RB_DATA_AVAILABLE(ring_buffer)										\
+	({	__auto_type rb = &(ring_buffer);									\
+		(rb->head + RB_buffer_size (rb) - rb->tail) % RB_buffer_size (rb);	\
+	})
+
+#define RB_WRITE_DATA(ring_buffer, data, count)								\
+	({	__auto_type rb = &(ring_buffer);									\
+		const typeof (rb->buffer[0]) *d = (data);							\
+		unsigned    c = (count);											\
+		unsigned    h = rb->head;											\
+		rb->head = (h + c) % RB_buffer_size (rb);							\
+		if (c > RB_buffer_size (rb) - h) {									\
+			memcpy (rb->buffer + h, d,										\
+					(RB_buffer_size (rb) - h) * sizeof (rb->buffer[0]));	\
+			c -= RB_buffer_size (rb) - h;									\
+			d += RB_buffer_size (rb) - h;									\
+			h = 0;															\
+		}																	\
+		memcpy (rb->buffer + h, d, c * sizeof (rb->buffer[0]));				\
+	})
+
+#define RB_READ_DATA(ring_buffer, data, count)								\
+	({	__auto_type rb = &(ring_buffer);									\
+		typeof (&rb->buffer[0]) d = (data);									\
+		unsigned    c = (count);											\
+		unsigned    oc = c;													\
+		unsigned    t = rb->tail;											\
+		if (c > RB_buffer_size (rb) - t) {									\
+			memcpy (d, rb->buffer + t,										\
+					(RB_buffer_size (rb) - t) * sizeof (rb->buffer[0]));	\
+			c -= RB_buffer_size (rb) - t;									\
+			d += RB_buffer_size (rb) - t;									\
+			t = 0;															\
+		}																	\
+		memcpy (d, rb->buffer + t, c * sizeof (rb->buffer[0]));				\
+		rb->tail = (t + oc) % RB_buffer_size (rb);							\
+	})
+
+#define RB_DROP_DATA(ring_buffer, count)									\
+	({	__auto_type rb = &(ring_buffer);									\
+		unsigned    c = (count);											\
+		unsigned    t = rb->tail;											\
+		rb->tail = (t + c) % RB_buffer_size (rb);							\
+	})
+
+#define RB_PEEK_DATA(ring_buffer, ahead)						\
+	({	__auto_type rb = &(ring_buffer);						\
+		rb->buffer[(rb->tail + ahead) % RB_buffer_size (rb)];	\
+	})
+
+#define RB_POKE_DATA(ring_buffer, ahead, data)							\
+	({	__auto_type rb = &(ring_buffer);								\
+		rb->buffer[(rb->tail + ahead) % RB_buffer_size (rb)] = (data);	\
+	})
+
+#endif//__QF_ringbuffer_h
diff --git a/ruamoko/qwaq/qwaq-curses.c b/ruamoko/qwaq/qwaq-curses.c
index afb2ca246..3837d2f8c 100644
--- a/ruamoko/qwaq/qwaq-curses.c
+++ b/ruamoko/qwaq/qwaq-curses.c
@@ -39,6 +39,7 @@
 
 #include "QF/dstring.h"
 #include "QF/progs.h"
+#include "QF/ringbuffer.h"
 #include "QF/sys.h"
 
 #include "qwaq.h"
@@ -113,78 +114,6 @@ const char *qwaq_command_names[]= {
 	"mvwblit_line",
 };
 
-#define RING_BUFFER(type, size) 	\
-	struct {						\
-		type        buffer[size];	\
-		unsigned    head;			\
-		unsigned    tail;			\
-	}
-
-#define RB_buffer_size(ring_buffer)						\
-	({	__auto_type rb = (ring_buffer);					\
-		sizeof (rb->buffer) / sizeof (rb->buffer[0]);	\
-	})
-
-#define RB_SPACE_AVAILABLE(ring_buffer)										\
-	({	__auto_type rb = &(ring_buffer);									\
-		(rb->tail + RB_buffer_size(rb) - rb->head - 1) % RB_buffer_size(rb);\
-	})
-
-#define RB_DATA_AVAILABLE(ring_buffer)										\
-	({	__auto_type rb = &(ring_buffer);									\
-		(rb->head + RB_buffer_size (rb) - rb->tail) % RB_buffer_size (rb);	\
-	})
-
-#define RB_WRITE_DATA(ring_buffer, data, count)								\
-	({	__auto_type rb = &(ring_buffer);									\
-		const typeof (rb->buffer[0]) *d = (data);							\
-		unsigned    c = (count);											\
-		unsigned    h = rb->head;											\
-		rb->head = (h + c) % RB_buffer_size (rb);							\
-		if (c > RB_buffer_size (rb) - h) {									\
-			memcpy (rb->buffer + h, d,										\
-					(RB_buffer_size (rb) - h) * sizeof (rb->buffer[0]));	\
-			c -= RB_buffer_size (rb) - h;									\
-			d += RB_buffer_size (rb) - h;									\
-			h = 0;															\
-		}																	\
-		memcpy (rb->buffer + h, d, c * sizeof (rb->buffer[0]));				\
-	})
-
-#define RB_READ_DATA(ring_buffer, data, count)								\
-	({	__auto_type rb = &(ring_buffer);									\
-		typeof (&rb->buffer[0]) d = (data);									\
-		unsigned    c = (count);											\
-		unsigned    oc = c;													\
-		unsigned    t = rb->tail;											\
-		if (c > RB_buffer_size (rb) - t) {									\
-			memcpy (d, rb->buffer + t,										\
-					(RB_buffer_size (rb) - t) * sizeof (rb->buffer[0]));	\
-			c -= RB_buffer_size (rb) - t;									\
-			d += RB_buffer_size (rb) - t;									\
-			t = 0;															\
-		}																	\
-		memcpy (d, rb->buffer + t, c * sizeof (rb->buffer[0]));				\
-		rb->tail = (t + oc) % RB_buffer_size (rb);							\
-	})
-
-#define RB_DROP_DATA(ring_buffer, count)									\
-	({	__auto_type rb = &(ring_buffer);									\
-		unsigned    c = (count);											\
-		unsigned    t = rb->tail;											\
-		rb->tail = (t + c) % RB_buffer_size (rb);							\
-	})
-
-#define RB_PEEK_DATA(ring_buffer, ahead)						\
-	({	__auto_type rb = &(ring_buffer);						\
-		rb->buffer[(rb->tail + ahead) % RB_buffer_size (rb)];	\
-	})
-
-#define RB_POKE_DATA(ring_buffer, ahead, data)							\
-	({	__auto_type rb = &(ring_buffer);								\
-		rb->buffer[(rb->tail + ahead) % RB_buffer_size (rb)] = (data);	\
-	})
-
 typedef struct window_s {
 	WINDOW     *win;
 } window_t;

From 79719babda27b73daf2ff437d0933fab60711e38 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 20 Mar 2020 12:55:23 +0900
Subject: [PATCH 0864/1519] [util] Fix darray test for gcc purity

---
 libs/util/test/test-darray.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/util/test/test-darray.c b/libs/util/test/test-darray.c
index 59dbad0ab..59d3a2ddc 100644
--- a/libs/util/test/test-darray.c
+++ b/libs/util/test/test-darray.c
@@ -51,7 +51,7 @@ check_array (int a, int b)
 	return !!intarray.a;
 }
 
-static int
+static int __attribute__((pure))
 check_value (int index, int b)
 {
 	if ((size_t) index >= intarray.size) {

From f64038b8725b3838faf5701ddfa926ab3d8abc11 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 20 Mar 2020 11:46:16 +0900
Subject: [PATCH 0865/1519] [qfcc] Add gcd.pas to the tests

---
 tools/qfcc/test/Makefile.am       | 16 +++++++++++++++-
 tools/qfcc/test/{old => }/gcd.pas |  0
 2 files changed, 15 insertions(+), 1 deletion(-)
 rename tools/qfcc/test/{old => }/gcd.pas (100%)

diff --git a/tools/qfcc/test/Makefile.am b/tools/qfcc/test/Makefile.am
index ceb32813f..f6f0c6043 100644
--- a/tools/qfcc/test/Makefile.am
+++ b/tools/qfcc/test/Makefile.am
@@ -13,11 +13,15 @@ QCFLAGS=-qq -O -g -Werror
 QCPPFLAGS=--no-default-paths -I$(top_srcdir)/ruamoko/include
 QCOMPILE=$(QFCC) $(QCFLAGS) $(QCPPFLAGS)
 
-SUFFIXES=.qfo .r
+SUFFIXES=.qfo .r .pas
 .r.qfo:
 	$(QCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tqo -c -o $@ $<
 	sed -i -e '1s@:@: $(QFCC_DEP)@' $(DEPDIR)/$*.Tqo
 	$(am__mv) $(DEPDIR)/$*.Tqo $(DEPDIR)/$*.Qo
+.pas.qfo:
+	$(QCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tqo -c -o $@ $<
+	sed -i -e '1s@:@: $(QFCC_DEP)@' $(DEPDIR)/$*.Tqo
+	$(am__mv) $(DEPDIR)/$*.Tqo $(DEPDIR)/$*.Qo
 
 QFCC_TEST_LIBS=@QFCC_TEST_LIBS@
 QFCC_TEST_DEPS=@QFCC_TEST_DEPS@
@@ -43,6 +47,7 @@ test_progs_dat=\
 	fordecl.dat \
 	func-expr.dat \
 	func-static.dat \
+	gcd.dat \
 	infloop.dat \
 	ivar-struct-return.dat \
 	methodparams.dat \
@@ -262,6 +267,15 @@ func-static.run: Makefile build-run
 include ./$(DEPDIR)/func-static.Qo # am--include-marker
 r_depfiles_remade += ./$(DEPDIR)/func-static.Qo
 
+gcd_dat_SOURCES=gcd.pas
+gcd_obj=$(gcd_dat_SOURCES:.pas=.qfo)
+gcd.dat$(EXEEXT): $(gcd_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(gcd_obj)
+gcd.run: Makefile build-run
+	@$(srcdir)/build-run $@
+include ./$(DEPDIR)/gcd.Qo # am--include-marker
+r_depfiles_remade += ./$(DEPDIR)/gcd.Qo
+
 infloop_dat_SOURCES=infloop.r
 infloop_obj=$(infloop_dat_SOURCES:.r=.qfo)
 infloop.dat$(EXEEXT): $(infloop_obj) $(QFCC_DEP)
diff --git a/tools/qfcc/test/old/gcd.pas b/tools/qfcc/test/gcd.pas
similarity index 100%
rename from tools/qfcc/test/old/gcd.pas
rename to tools/qfcc/test/gcd.pas

From ed03eeb8d2fed9a08cfee67807de71510f7ef6b8 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 20 Mar 2020 11:47:01 +0900
Subject: [PATCH 0866/1519] [qfcc] Resync qc and qp common symbols

Forgot I needed to remove PAS from pascal as well.
---
 tools/qfcc/source/qp-parse.y | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/qfcc/source/qp-parse.y b/tools/qfcc/source/qp-parse.y
index 922068b02..08759a544 100644
--- a/tools/qfcc/source/qp-parse.y
+++ b/tools/qfcc/source/qp-parse.y
@@ -105,7 +105,7 @@ int yylex (void);
 %nonassoc STORAGEX
 
 %left	COMMA
-%right  <op> '=' ASX PAS /* pointer assign */
+%right  <op> '=' ASX
 %right  '?' ':'
 %left   OR
 %left   AND

From 298fcbbf708883c2fdff49fb33b059b61436dc6c Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 20 Mar 2020 11:48:01 +0900
Subject: [PATCH 0867/1519] [qfcc] Add ExitCode support to quake-pascal

gcd now passes :)
---
 tools/qfcc/source/qp-parse.y | 43 ++++++++++++++++++++++++++++--------
 tools/qfcc/test/gcd.pas      |  6 +++--
 2 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/tools/qfcc/source/qp-parse.y b/tools/qfcc/source/qp-parse.y
index 08759a544..730eab57a 100644
--- a/tools/qfcc/source/qp-parse.y
+++ b/tools/qfcc/source/qp-parse.y
@@ -139,6 +139,29 @@ int yylex (void);
 %type	<op>		sign
 
 %{
+
+static void
+build_dotmain (symbol_t *program)
+{
+	symbol_t   *dotmain = new_symbol (".main");
+	expr_t     *code;
+	expr_t     *exitcode;
+
+	dotmain->params = 0;
+	dotmain->type = parse_params (&type_integer, 0);
+	dotmain->type = find_type (dotmain->type);
+	dotmain = function_symbol (dotmain, 0, 1);
+
+	exitcode = new_symbol_expr (symtab_lookup (current_symtab, "ExitCode"));
+
+	current_func = begin_function (dotmain, 0, current_symtab, 0);
+	current_symtab = current_func->symtab;
+	code = new_block_expr ();
+	append_expr (code, function_expr (new_symbol_expr (program), 0));
+	append_expr (code, return_expr (current_func, exitcode));
+	build_code_function (dotmain, 0, code);
+}
+
 %}
 
 %%
@@ -159,15 +182,7 @@ program
 			build_code_function ($1, 0, $4);
 			current_symtab = st;
 
-			$4 = function_expr (new_symbol_expr ($1), 0);
-			$1 = new_symbol (".main");
-			$1->params = 0;
-			$1->type = parse_params (&type_void, 0);
-			$1->type = find_type ($1->type);
-			$1 = function_symbol ($1, 0, 1);
-			current_func = begin_function ($1, 0, current_symtab, 0);
-			current_symtab = current_func->symtab;
-			build_code_function ($1, 0, $4);
+			build_dotmain ($1);
 			current_symtab = st;
 		}
 	;
@@ -178,6 +193,15 @@ program_head
 		{
 			$$ = $3;
 
+			// FIXME need units and standard units
+			{
+				symbol_t   *sym = new_symbol ("ExitCode");
+				sym->type = &type_integer;
+				initialize_def (sym, 0, current_symtab->space, sc_global);
+				if (sym->s.def) {
+					sym->s.def->nosave = 1;
+				}
+			}
 			$$->type = parse_params (&type_void, 0);
 			$$->type = find_type ($$->type);
 			$$ = function_symbol ($$, 0, 1);
@@ -375,6 +399,7 @@ statement
 else
 	: ELSE
 		{
+			// this is only to get the the file and line number info
 			$$ = new_nil_expr ();
 		}
 	;
diff --git a/tools/qfcc/test/gcd.pas b/tools/qfcc/test/gcd.pas
index 04e193b26..3879a3d3d 100644
--- a/tools/qfcc/test/gcd.pas
+++ b/tools/qfcc/test/gcd.pas
@@ -1,5 +1,5 @@
 program example (input, output);
-var x, y: integer;
+var x, y, g: integer;
 procedure printf (format:string; ...) := #0;
 function gcd (a, b: integer): integer;
 var c: quaternion;
@@ -11,5 +11,7 @@ end;
 begin
 	x := 130;
 	y := 120;
-	printf ("%d\n", gcd (x, y))
+	g := gcd (x, y);
+	printf ("%d\n", g);
+	ExitCode := g <> 10;
 end.

From 966bd267c58839839394613cecc0a5b0a1208862 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 17 Feb 2020 16:17:21 +0900
Subject: [PATCH 0868/1519] Add a set of macros for dynamic arrays

Includes docs and test cases.
---
 include/QF/darray.h          | 301 +++++++++++++++++++++++++++++++++++
 libs/util/test/Makefile.am   |   9 +-
 libs/util/test/test-darray.c | 213 +++++++++++++++++++++++++
 3 files changed, 521 insertions(+), 2 deletions(-)
 create mode 100644 include/QF/darray.h
 create mode 100644 libs/util/test/test-darray.c

diff --git a/include/QF/darray.h b/include/QF/darray.h
new file mode 100644
index 000000000..88792715f
--- /dev/null
+++ b/include/QF/darray.h
@@ -0,0 +1,301 @@
+/*
+	darray.h
+
+	Dynamic arrays
+
+	Copyright (C) 2020 Bill Currie <bill@taniwha.org>
+
+	Author: Bill Currie <bill@taniwha.org>
+	Date: 2020/02/17
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+
+#ifndef __pr_type_h
+#define __pr_type_h
+
+/** \defgroup darray Dynamic Arrays
+	\ingroup utils
+
+	Dynamic array container object
+*/
+///@{
+
+/**	The structure defs for a dynamic array with elements of the given type.
+
+	This is just the defs of a struct delcaration: it is useless on its own.
+	The intended usage is something like:
+
+		typedef struct dynamic_array_s DARRAY_TYPE(int) dynamic_array_t;
+
+	This allows full flexibility in just how the actual type is used.
+
+	The \a size field is the number of elements currently in the array, and
+	the \a maxSize field is the number of elements the array can hold without
+	being resized.
+
+	The \a grow field specifies the number of elements by which \a maxSize is
+	to grow when the array needs to be resized. Setting this to 0 prevents
+	resizing and any attempt to do so is a fatal error.
+
+	\param ele_type	The type to use for the element array, which is accessed
+					by the \a a field.
+	\hideinitializer
+*/
+#define DARRAY_TYPE(ele_type)	\
+	{							\
+		size_t      size;		\
+		size_t      maxSize;	\
+		size_t      grow;		\
+		ele_type   *a;			\
+	}
+
+/**	Clear the array.
+
+	If the array can grow, its backing will be freed and maxSize and a reset,
+	otherwise maxSize and a are left untouched.
+
+	\param array	*Address* of the array to be modified (ie, pointer to the
+					array struct instance, not the instance itself: use & for
+					static instances of the array struct).
+	\hideinitializer
+*/
+#define DARRAY_CLEAR(array)												\
+	do {																\
+		__auto_type ar = (array);										\
+		free (ar->a);													\
+		ar->size = 0;													\
+		if (ar->grow) {													\
+			ar->maxSize = 0;											\
+			ar->a = 0;													\
+		}																\
+	} while (0)
+
+/**	Set the size of the array.
+
+	If the new size is greater than maxSize, and the array can grow (grow is
+	non-zero), then maxSize will be increased to the smallest multiple of grow
+	greater than or equal to size (ie, maxSize >= size, maxSize % grow == 0).
+
+	Attempting to increase maxSize on an array that cannot grow is an error:
+	it is assumed that the array struct does not own the backing memory.
+
+	\param array	*Address* of the array to be modified (ie, pointer to the
+					array struct instance, not the instance itself: use & for
+					static instances of the array struct).
+	\param newSize	The new size of the array: newly opened slots are
+					uninitialized, but old slots retain their values.
+	\hideinitializer
+*/
+#define DARRAY_RESIZE(array, newSize)									\
+	do {																\
+		__auto_type ar = (array);										\
+		size_t ns = (newSize);											\
+		if (__builtin_expect (ns > ar->maxSize, 0)) {					\
+			if (__builtin_expect (!ar->grow, 0)) {						\
+				Sys_Error ("Attempt to grow fixed-size darray: %s:%d",	\
+						   __FILE__, __LINE__);							\
+			}															\
+			ar->maxSize = ar->grow * ((ns + ar->grow - 1) / ar->grow);	\
+			ar->a = realloc (ar->a, ar->maxSize * sizeof (*ar->a));		\
+			if (__builtin_expect (!ar->a, 0)) {							\
+				Sys_Error ("failed to realloc darray: %s:%d",			\
+						   __FILE__, __LINE__);							\
+			}															\
+		}																\
+		ar->size = ns;													\
+	} while (0)
+
+/**	Append a value to the end of the array.
+
+	The array is grown by one and the value written to the newly opened slot.
+
+	If the new array size is greater than maxSize and the array can be grown,
+	the array backing will be resized to the next multiple of grow.
+
+	Attempting to grow an array that cannot grow is an error: it is assumed
+	that the array struct does not own the backing memory.
+
+	\param array	*Address* of the array to be modified (ie, pointer to the
+					array struct instance, not the instance itself: use & for
+					static instances of the array struct).
+	\param value	The value to be appended to the array. Must be of a type
+					compatible with that used for creating the array struct.
+	\return			The appended value: can be assigned to another compatible
+					value.
+	\hideinitializer
+*/
+#define DARRAY_APPEND(array, value)										\
+	({																	\
+		__auto_type ar = (array);										\
+		__auto_type ob = (value);										\
+		size_t      sz = ar->size;										\
+		DARRAY_RESIZE (ar, ar->size + 1);								\
+		ar->a[sz] = ob;											\
+	})
+
+/**	Open a hole in the array for bulk copying of data.
+
+	The array is grown by the requested size, opening a hole at the specified
+	index. Values beyond the index are copied to just after the newly opened
+	hole.
+
+	If the new array size is greater than maxSize and the array can be grown,
+	the array backing will be resized to the next multiple of grow.
+
+	Attempting to grow an array that cannot grow is an error: it is assumed
+	that the array struct does not own the backing memory.
+
+	\param array	*Address* of the array to be modified (ie, pointer to the
+					array struct instance, not the instance itself: use & for
+					static instances of the array struct).
+	\param index	The index at which the hole will begin.
+	\param space	The sized of the hole to be opened, in array elements.
+	\return			The *address* of the newly opened hole: can be passed to
+					memcpy and friends.
+
+						memcpy (DARRAY_OPEN_AT(array, index, size), data,
+								size * sizeof (*data));
+	\hideinitializer
+*/
+#define DARRAY_OPEN_AT(array, index, space)								\
+	({																	\
+		__auto_type ar = (array);										\
+		size_t po = (index);											\
+		size_t sp = (space);											\
+		if (__builtin_expect (po > ar->size, 0)) {						\
+			Sys_Error ("Attempt to insert elements outside darray: "	\
+					   "%s:%d", __FILE__, __LINE__);					\
+		}																\
+		DARRAY_RESIZE (ar, ar->size + sp);								\
+		memmove (&ar->a[po + sp], &ar->a[po],							\
+				 (ar->size - po) * sizeof (*ar->a));					\
+		&ar->a[po];														\
+	})
+
+/**	Insert a value into the array at the specified index.
+
+	The array is grown by one at the specified index and the value written
+	to the newly opened slot. Values beyond the index are copied to just
+	after the newly opened slot.
+
+	If the new array size is greater than maxSize and the array can be grown,
+	the array backing will be resized to the next multiple of grow.
+
+	Attempting to grow an array that cannot grow is an error: it is assumed
+	that the array struct does not own the backing memory.
+
+	Attempting to insert a value beyond one past the end of the array is an
+	error (inserting at index = size is valid).
+
+	\param array	*Address* of the array to be modified (ie, pointer to the
+					array struct instance, not the instance itself: use & for
+					static instances of the array struct).
+	\param value	The value to be inserted into the array. Must be of a type
+					compatible with that used for creating the array struct.
+	\param index	The index at which the value will be inserted
+	\return			The inserted value: can be assigned to another compatible
+					value.
+	\hideinitializer
+*/
+#define DARRAY_INSERT_AT(array, value, index)							\
+	({																	\
+		__auto_type ar = (array);										\
+		__auto_type ob = (value);										\
+		*DARRAY_OPEN_AT (ar, index, 1) = ob;							\
+	})
+
+/**	Close a segment of an array.
+
+	The values beyond the segment are copied to the beginning of the segment
+	and the array size reduced by the size of the segment. All but the first
+	one of the values previously in the segment are lost and gone forever.
+
+	Attempting to close a segment that extends outside the array is an error.
+
+	\param array	*Address* of the array to be modified (ie, pointer to the
+					array struct instance, not the instance itself: use & for
+					static instances of the array struct).
+	\param index	The index of the beginning of the segment.
+	\param count	The number of values in the segment.
+	\return			The single value at the beginning of the segment: can be
+					assigned to another compatible value.
+	\hideinitializer
+*/
+#define DARRAY_CLOSE_AT(array, index, count)							\
+	({																	\
+		__auto_type ar = (array);										\
+		size_t po = (index);											\
+		size_t co = (count);											\
+		if (__builtin_expect (po + co > ar->size						\
+							  || po >= ar->size, 0)) {					\
+			Sys_Error ("Attempt to remove elements outside darray: "	\
+					   "%s:%d", __FILE__, __LINE__);					\
+		}																\
+		__auto_type ob = ar->a[po];										\
+		memmove (&ar->a[po], &ar->a[po + co],							\
+				 (ar->size - po - co) * sizeof (ob));					\
+		ar->size -= co;													\
+		ob;																\
+	})
+
+/**	Remove a value from an array at the specified index.
+
+	The values beyond the index are moved down to fill the hole left by the
+	single value and the array size reduced by one.
+
+	Attempting to remove a value from beyond the array is an error.
+
+	\param array	*Address* of the array to be modified (ie, pointer to the
+					array struct instance, not the instance itself: use & for
+					static instances of the array struct).
+	\param index	The index of the value to be removed.
+	\return			The removed value: can be assigned to another compatible
+					value.
+	\hideinitializer
+*/
+#define DARRAY_REMOVE_AT(array, index)									\
+	({																	\
+		__auto_type ar = (array);										\
+		DARRAY_CLOSE_AT (ar, index, 1);									\
+	})
+
+/**	Remove (pop) a value from the end of an array.
+
+	The size of the array size reduced by one.
+
+	Attempting to remove a value from an empty array is an error.
+
+	\param array	*Address* of the array to be modified (ie, pointer to the
+					array struct instance, not the instance itself: use & for
+					static instances of the array struct).
+	\return			The removed value: can be assigned to another compatible
+					value.
+	\hideinitializer
+*/
+#define DARRAY_REMOVE(array)											\
+	({																	\
+		__auto_type ar = (array);										\
+		DARRAY_CLOSE_AT (ar, ar->size - 1, 1);							\
+	})
+
+///@}
+
+#endif//__pr_type_h
diff --git a/libs/util/test/Makefile.am b/libs/util/test/Makefile.am
index 283ac561e..74d9a2f4e 100644
--- a/libs/util/test/Makefile.am
+++ b/libs/util/test/Makefile.am
@@ -3,8 +3,9 @@ AUTOMAKE_OPTIONS= foreign
 AM_CPPFLAGS= -I$(top_srcdir)/include
 
 check_PROGRAMS= \
-	test-bary test-cs test-dq test-half test-mat3 test-mat4 test-plist \
-	test-qfs test-quat test-seb test-seg test-set test-txtbuffer test-vrect
+	test-bary test-cs test-darray test-dq test-half test-mat3 test-mat4 \
+	test-plist test-qfs test-quat test-seb test-seg test-set test-txtbuffer \
+	test-vrect
 
 test_bary_SOURCES=test-bary.c
 test_bary_LDADD=$(top_builddir)/libs/util/libQFutil.la
@@ -14,6 +15,10 @@ test_cs_SOURCES=test-cs.c
 test_cs_LDADD=$(top_builddir)/libs/util/libQFutil.la
 test_cs_DEPENDENCIES=$(top_builddir)/libs/util/libQFutil.la
 
+test_darray_SOURCES=test-darray.c
+test_darray_LDADD=$(top_builddir)/libs/util/libQFutil.la
+test_darray_DEPENDENCIES=$(top_builddir)/libs/util/libQFutil.la
+
 test_dq_SOURCES=test-dq.c
 test_dq_LDADD=$(top_builddir)/libs/util/libQFutil.la
 test_dq_DEPENDENCIES=$(top_builddir)/libs/util/libQFutil.la
diff --git a/libs/util/test/test-darray.c b/libs/util/test/test-darray.c
new file mode 100644
index 000000000..59dbad0ab
--- /dev/null
+++ b/libs/util/test/test-darray.c
@@ -0,0 +1,213 @@
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#define remove remove_renamed
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include "QF/darray.h"
+#include "QF/sys.h"
+#undef remove
+
+typedef int (*test_func) (int a, int b);
+typedef struct intarray_s DARRAY_TYPE(int) intarray_t;
+
+intarray_t  intarray = {0, 0, 16, 0};
+
+static int
+append (int val, int b)
+{
+	return DARRAY_APPEND (&intarray, val);
+}
+
+static int
+check_size (int a, int b)
+{
+	return intarray.size;
+}
+
+static int
+check_maxSize (int a, int b)
+{
+	return intarray.maxSize;
+}
+
+static  int
+check_grow (int a, int b)
+{
+	return intarray.grow;
+}
+
+static int
+check_maxSizeGrowth (int a, int b)
+{
+	return intarray.maxSize % intarray.grow;
+}
+
+static int
+check_array (int a, int b)
+{
+	return !!intarray.a;
+}
+
+static int
+check_value (int index, int b)
+{
+	if ((size_t) index >= intarray.size) {
+		Sys_Error ("indexing beyond array");
+	}
+	return intarray.a[index];
+}
+
+static int
+insert_at (int val, int pos)
+{
+	return DARRAY_INSERT_AT (&intarray, val, pos);
+}
+
+static int
+open_at (int pos, int size)
+{
+	return DARRAY_OPEN_AT (&intarray, pos, size) - intarray.a;
+}
+
+static const char text[] = "Aloy is an awesome huntress.";
+static int
+open_at2 (int pos, int size)
+{
+	memcpy(DARRAY_OPEN_AT (&intarray, pos, size), text, size * sizeof (int));
+	return strcmp((char*) (intarray.a + pos), text);
+}
+
+static int
+remove_at (int pos, int b)
+{
+	return DARRAY_REMOVE_AT (&intarray, pos);
+}
+
+static int
+remove (int pos, int b)
+{
+	return DARRAY_REMOVE (&intarray);
+}
+
+static int
+close_at (int pos, int size)
+{
+	return DARRAY_CLOSE_AT (&intarray, pos, size);
+}
+
+static int
+clear (int a, int b)
+{
+	DARRAY_CLEAR (&intarray);
+	return 0;
+}
+
+static int
+resize (int size, int b)
+{
+	DARRAY_RESIZE (&intarray, size);
+	return 0;
+}
+
+struct {
+	test_func   test;
+	int         param1, param2;
+	int         test_expect;
+} tests[] = {
+	{check_size,              0,  0,  0},	// confirm array empty but can grow
+	{check_maxSize,           0,  0,  0},
+	{check_grow,              0,  0, 16},
+	{check_array,             0,  0,  0},
+	{append,                  5,  0,  5},	// test first append to emtpty array
+	{check_size,              0,  0,  1},
+	{check_maxSizeGrowth,     0,  0,  0},
+	{check_maxSize,           0,  0, 16},
+	{check_array,             0,  0,  1},
+	{check_value,             0,  0,  5},
+	{append,                 42,  0, 42},	// test a second append
+	{check_size,              0,  0,  2},
+	{check_maxSize,           0,  0, 16},
+	{check_value,             0,  0,  5},
+	{check_value,             1,  0, 42},
+	{insert_at,              69,  1, 69},	// test insertions
+	{insert_at,              96,  0, 96},
+	{check_size,              0,  0,  4},
+	{check_maxSize,           0,  0, 16},
+	{check_value,             0,  0, 96},
+	{check_value,             1,  0,  5},
+	{check_value,             2,  0, 69},
+	{check_value,             3,  0, 42},
+	{open_at,                 2, 14,  2},	// test opening a large hole
+	{check_maxSizeGrowth,     0,  0,  0},
+	{check_maxSize,           0,  0, 32},
+	{check_size,              0,  0, 18},
+	{check_value,             0,  0, 96},
+	{check_value,             1,  0,  5},
+	{check_value,            16,  0, 69},
+	{check_value,            17,  0, 42},
+	{close_at,                1, 15,  5},	// test block removal
+	{check_maxSize,           0,  0, 32},
+	{check_size,              0,  0,  3},
+	{check_value,             0,  0, 96},
+	{check_value,             1,  0, 69},
+	{check_value,             2,  0, 42},
+	{remove,                  0,  0, 42},	// test "pop"
+	{check_maxSize,           0,  0, 32},
+	{check_size,              0,  0,  2},
+	{check_value,             0,  0, 96},
+	{check_value,             1,  0, 69},
+	{remove_at,               0,  0, 96},	// test remove at
+	{check_maxSize,           0,  0, 32},
+	{check_size,              0,  0,  1},
+	{check_value,             0,  0, 69},
+	{insert_at,              71,  1, 71},	// test insertion at end
+	{resize,                  48, 0,  0},	// test resize bigger
+	{check_maxSizeGrowth,     0,  0,  0},
+	{check_maxSize,           0,  0, 48},
+	{check_size,              0,  0, 48},
+	{check_value,             0,  0, 69},
+	{check_value,             1,  0, 71},
+	{resize,                  24, 0,  0},	// test resize smaller
+	{check_maxSizeGrowth,     0,  0,  0},
+	{check_maxSize,           0,  0, 48},
+	{check_size,              0,  0, 24},
+	{check_value,             0,  0, 69},
+	{check_value,             1,  0, 71},
+	{open_at2,                1,  (sizeof (text) + sizeof (int) - 1) / sizeof (int), 0},
+	{check_value,             0,  0, 69},
+	{check_value,             1,  0, 0x796f6c41},
+	{check_value,             9,  0, 71},
+	{clear,		              0,  0,  0},	// test clearing
+	{check_size,              0,  0,  0},
+	{check_maxSize,           0,  0,  0},
+	{check_array,             0,  0,  0},
+};
+#define num_tests (sizeof (tests) / sizeof (tests[0]))
+int test_start_line = __LINE__ - num_tests - 2;
+
+int
+main (int argc, const char **argv)
+{
+	int         res = 0;
+
+	size_t      i;
+
+	for (i = 0; i < num_tests; i++) {
+		if (tests[i].test) {
+			int         test_res;
+			test_res = tests[i].test (tests[i].param1, tests[i].param2);
+			if (test_res != tests[i].test_expect) {
+				res |= 1;
+				printf ("test %d (line %d) failed\n", (int) i,
+						(int) i + test_start_line);
+				printf ("expect: %d\n", tests[i].test_expect);
+				printf ("got   : %d\n", test_res);
+				continue;
+			}
+		}
+	}
+	return res;
+}

From 0764df127643b32d97a6d73f63039a40bb40ba10 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 17 Feb 2020 16:40:12 +0900
Subject: [PATCH 0869/1519] Fix incorrect include protection

---
 include/QF/Makefile.am | 2 +-
 include/QF/darray.h    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/QF/Makefile.am b/include/QF/Makefile.am
index c0fda5cd1..bb6b0d2da 100644
--- a/include/QF/Makefile.am
+++ b/include/QF/Makefile.am
@@ -5,7 +5,7 @@ pkgdatadir = $(datarootdir)/qfcc/include/QF
 
 include_qf= \
 	alloc.h bspfile.h cbuf.h cdaudio.h checksum.h clip_hull.h cmd.h \
-	console.h crc.h csqc.h cvar.h dstring.h draw.h gib.h hash.h \
+	console.h crc.h csqc.h cvar.h darray.h dstring.h draw.h gib.h hash.h \
 	idparse.h image.h in_event.h info.h input.h iqm.h joystick.h keys.h \
 	link.h llist.h locs.h mathlib.h mdfour.h mersenne.h model.h modelgen.h \
 	msg.h object.h pak.h pakfile.h pcx.h png.h plugin.h pr_comp.h pr_debug.h \
diff --git a/include/QF/darray.h b/include/QF/darray.h
index 88792715f..0287f958f 100644
--- a/include/QF/darray.h
+++ b/include/QF/darray.h
@@ -28,8 +28,8 @@
 
 */
 
-#ifndef __pr_type_h
-#define __pr_type_h
+#ifndef __darray_h
+#define __darray_h
 
 /** \defgroup darray Dynamic Arrays
 	\ingroup utils
@@ -298,4 +298,4 @@
 
 ///@}
 
-#endif//__pr_type_h
+#endif//__darray_h

From 2966b035bf0cf78544b8a7c2e73e42b3d7c76af6 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 17 Feb 2020 20:27:43 +0900
Subject: [PATCH 0870/1519] Add a fixed-array allocator

Turned out to be very convenient.
---
 include/QF/darray.h | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/include/QF/darray.h b/include/QF/darray.h
index 0287f958f..7a4484575 100644
--- a/include/QF/darray.h
+++ b/include/QF/darray.h
@@ -67,6 +67,27 @@
 		ele_type   *a;			\
 	}
 
+/**	Allocate a fixed-size array using the given allocator
+
+	The allocated array is initilized to be ungrowable, and with both size
+	and maxSize set to the given size.
+
+	\param array_type	Expression acceptable by typeof for determining the
+						type of the array.
+	\param array_size   The size of the array.
+	\param alloc		Allocator compatible with malloc (eg, alloca).
+*/
+#define DARRAY_ALLOCFIXED(array_type, array_size, alloc)				\
+	({																	\
+		__auto_type s = (array_size);									\
+		typeof (array_type) *ar = alloc (sizeof(*ar)					\
+										 + s * sizeof (*ar->a));		\
+		ar->size = ar->maxSize = s;										\
+		ar->grow = 0;													\
+		ar->a = (typeof (ar->a)) (ar + 1);								\
+		ar;																\
+	})
+
 /**	Clear the array.
 
 	If the array can grow, its backing will be freed and maxSize and a reset,

From 38fc7459e40b865b34350f7225aa45ee49618730 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 20 Mar 2020 12:52:56 +0900
Subject: [PATCH 0871/1519] Add DARRAY_INIT from the vulkan branch

Couldn't cherry-pick this one as it was a bigger commit.
---
 include/QF/darray.h | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/include/QF/darray.h b/include/QF/darray.h
index 7a4484575..9f8c9630b 100644
--- a/include/QF/darray.h
+++ b/include/QF/darray.h
@@ -88,6 +88,25 @@
 		ar;																\
 	})
 
+/**	Initialized the array.
+
+	The array will be initialized to be empty but with grow set to the
+	specifed value.
+
+	\param array	*Address* of the array to be modified (ie, pointer to the
+					array struct instance, not the instance itself: use & for
+					static instances of the array struct).
+	\param growSize Number of elements by which the array is to grow when
+					required.
+	\hideinitializer
+*/
+#define DARRAY_INIT(array, growSize)									\
+	do {																\
+		__auto_type ar = (array);										\
+		ar->size = ar->maxSize = 0;										\
+		ar->grow = (growSize);											\
+	} while (0)
+
 /**	Clear the array.
 
 	If the array can grow, its backing will be freed and maxSize and a reset,

From d2f03e8a640d96f3e8dc6de1b0173b969ae887b2 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 20 Mar 2020 12:55:23 +0900
Subject: [PATCH 0872/1519] [util] Fix darray test for gcc purity

---
 libs/util/test/test-darray.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/util/test/test-darray.c b/libs/util/test/test-darray.c
index 59dbad0ab..59d3a2ddc 100644
--- a/libs/util/test/test-darray.c
+++ b/libs/util/test/test-darray.c
@@ -51,7 +51,7 @@ check_array (int a, int b)
 	return !!intarray.a;
 }
 
-static int
+static int __attribute__((pure))
 check_value (int index, int b)
 {
 	if ((size_t) index >= intarray.size) {

From 74ed057a5fd8266d1d838f1327d0574ce613ebcd Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 20 Mar 2020 08:48:40 +0900
Subject: [PATCH 0873/1519] [qwaq] Begin move over to threading

Of course, it currently locks up, but there aren't any other threads as
of yet so the queues starve.
---
 ruamoko/qwaq/qwaq-curses.c | 198 +++++++++++++++++++++++++++----------
 1 file changed, 145 insertions(+), 53 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-curses.c b/ruamoko/qwaq/qwaq-curses.c
index 3837d2f8c..8f793bdac 100644
--- a/ruamoko/qwaq/qwaq-curses.c
+++ b/ruamoko/qwaq/qwaq-curses.c
@@ -31,8 +31,12 @@
 # include "config.h"
 #endif
 
+#include <sys/time.h>
+
 #include <curses.h>
+#include <errno.h>
 #include <panel.h>
+#include <pthread.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
@@ -85,7 +89,7 @@ typedef enum qwaq_commands_e {
 	qwaq_cmd_mvwblit_line,
 } qwaq_commands;
 
-const char *qwaq_command_names[]= {
+static const char *qwaq_command_names[]= {
 	"newwin",
 	"delwin",
 	"getwrect",
@@ -123,15 +127,24 @@ typedef struct panel_s {
 	int         window_id;
 } panel_t;
 
+typedef struct cond_s {
+	pthread_cond_t cond;
+	pthread_mutex_t mut;
+} cond_t;
+
 typedef struct qwaq_resources_s {
 	progs_t    *pr;
 	int         initialized;
 	window_t    stdscr;
 	PR_RESMAP (window_t) window_map;
 	PR_RESMAP (panel_t) panel_map;
+	cond_t      event_cond;
 	RING_BUFFER (qwaq_event_t, QUEUE_SIZE) event_queue;
+	cond_t      command_cond;
 	RING_BUFFER (int, COMMAND_QUEUE_SIZE) command_queue;
+	cond_t      results_cond;
 	RING_BUFFER (int, COMMAND_QUEUE_SIZE) results;
+	cond_t      string_id_cond;
 	RING_BUFFER (int, STRING_ID_QUEUE_SIZE) string_ids;
 	dstring_t   strings[STRING_ID_QUEUE_SIZE - 1];
 } qwaq_resources_t;
@@ -222,34 +235,33 @@ get_panel (qwaq_resources_t *res, const char *name, int handle)
 	return panel;
 }
 
-//XXX goes away with threads
-static void process_commands (qwaq_resources_t *);
-static void process_input (qwaq_resources_t *);
 static int
 acquire_string (qwaq_resources_t *res)
 {
 	int         string_id = -1;
 
-	// XXX add locking and loop for available
-	if (!RB_DATA_AVAILABLE (res->string_ids)) {
-		process_commands(res);
+	pthread_mutex_lock (&res->string_id_cond.mut);
+	while (!RB_DATA_AVAILABLE (res->string_ids)) {
+		pthread_cond_wait (&res->string_id_cond.cond,
+						   &res->string_id_cond.mut);
 	}
-	if (RB_DATA_AVAILABLE (res->string_ids)) {
-		RB_READ_DATA (res->string_ids, &string_id, 1);
-	}
-	// XXX unlock and end of loop
+	RB_READ_DATA (res->string_ids, &string_id, 1);
+	pthread_cond_broadcast (&res->string_id_cond.cond);
+	pthread_mutex_unlock (&res->string_id_cond.mut);
 	return string_id;
 }
 
 static void
 release_string (qwaq_resources_t *res, int string_id)
 {
-	// locking shouldn't be necessary as there should be only one writer
-	// but if it becomes such that there is more than one writer, locks as per
-	// acquire
-	if (RB_SPACE_AVAILABLE (res->string_ids)) {
-		RB_WRITE_DATA (res->string_ids, &string_id, 1);
+	pthread_mutex_lock (&res->string_id_cond.mut);
+	while (RB_SPACE_AVAILABLE (res->string_ids)) {
+		pthread_cond_wait (&res->string_id_cond.cond,
+						   &res->string_id_cond.mut);
 	}
+	RB_WRITE_DATA (res->string_ids, &string_id, 1);
+	pthread_cond_broadcast (&res->string_id_cond.cond);
+	pthread_mutex_unlock (&res->string_id_cond.mut);
 }
 
 static void
@@ -257,35 +269,41 @@ qwaq_submit_command (qwaq_resources_t *res, const int *cmd)
 {
 	unsigned    len = cmd[1];
 
-	if (RB_SPACE_AVAILABLE (res->command_queue) >= len) {
-		RB_WRITE_DATA (res->command_queue, cmd, len);
-	} else {
-		PR_RunError (res->pr, "command buffer full");
+	pthread_mutex_lock (&res->command_cond.mut);
+	while (RB_SPACE_AVAILABLE (res->command_queue) < len) {
+		pthread_cond_wait (&res->command_cond.cond,
+						   &res->command_cond.mut);
 	}
+	RB_WRITE_DATA (res->command_queue, cmd, len);
+	pthread_cond_broadcast (&res->command_cond.cond);
+	pthread_mutex_unlock (&res->command_cond.mut);
 }
 
 static void
 qwaq_submit_result (qwaq_resources_t *res, const int *result, unsigned len)
 {
-	// loop
-	if (RB_SPACE_AVAILABLE (res->results) >= len) {
-		RB_WRITE_DATA (res->results, result, len);
-	} else {
-		PR_RunError (res->pr, "result buffer full");
+	pthread_mutex_lock (&res->results_cond.mut);
+	while (RB_SPACE_AVAILABLE (res->results) < len) {
+		pthread_cond_wait (&res->results_cond.cond,
+						   &res->results_cond.mut);
 	}
+	RB_WRITE_DATA (res->results, result, len);
+	pthread_cond_broadcast (&res->results_cond.cond);
+	pthread_mutex_unlock (&res->results_cond.mut);
 }
 
 static void
 qwaq_wait_result (qwaq_resources_t *res, int *result, int cmd, unsigned len)
 {
-	// XXX should just wait on the mutex
-	process_commands (res);
-	process_input (res);
-	// locking and loop until id is correct
-	if (RB_DATA_AVAILABLE (res->results) >= len
-		&& RB_PEEK_DATA (res->results, 0) == cmd) {
-		RB_READ_DATA (res->results, result, len);
+	pthread_mutex_lock (&res->results_cond.mut);
+	while (RB_DATA_AVAILABLE (res->results) < len
+		&& RB_PEEK_DATA (res->results, 0) != cmd) {
+		pthread_cond_wait (&res->results_cond.cond,
+						   &res->results_cond.mut);
 	}
+	RB_READ_DATA (res->results, result, len);
+	pthread_cond_broadcast (&res->results_cond.cond);
+	pthread_mutex_unlock (&res->results_cond.mut);
 }
 
 static void
@@ -580,17 +598,53 @@ cmd_mvwblit_line (qwaq_resources_t *res)
 	release_string (res, chs_id);
 }
 
+static void
+dump_command (qwaq_resources_t *res, int len)
+{
+	if (0) {
+		qwaq_commands cmd = RB_PEEK_DATA (res->command_queue, 0);
+		Sys_Printf ("%s[%d]", qwaq_command_names[cmd], len);
+		for (int i = 2; i < len; i++) {
+			Sys_Printf (" %d", RB_PEEK_DATA (res->command_queue, i));
+		}
+		Sys_Printf ("\n");
+	}
+}
+
+static void
+init_timeout (struct timespec *timeout, long time)
+{
+	#define SEC 1000000000
+	struct timeval now;
+	gettimeofday(&now, 0);
+	timeout->tv_sec = now.tv_sec;
+	timeout->tv_nsec = now.tv_usec * 1000 + time;
+	if (timeout->tv_nsec > SEC) {
+		timeout->tv_sec += timeout->tv_nsec / SEC;
+		timeout->tv_nsec %= SEC;
+	}
+}
+
 static void
 process_commands (qwaq_resources_t *res)
 {
-	while (RB_DATA_AVAILABLE (res->command_queue) >= 2) {
+	struct timespec timeout;
+	int         avail;
+	int         len;
+	int         ret = 0;
+
+	pthread_mutex_lock (&res->command_cond.mut);
+	init_timeout (&timeout, 20 * 1000000);
+	while (RB_DATA_AVAILABLE (res->command_queue) < 2 && ret != ETIMEDOUT) {
+		ret = pthread_cond_timedwait (&res->command_cond.cond,
+									  &res->command_cond.mut, &timeout);
+	}
+	pthread_mutex_unlock (&res->command_cond.mut);
+
+	while ((avail = RB_DATA_AVAILABLE (res->command_queue)) >= 2
+		   && avail >= (len = RB_PEEK_DATA (res->command_queue, 1))) {
+		dump_command (res, len);
 		qwaq_commands cmd = RB_PEEK_DATA (res->command_queue, 0);
-		//int len = RB_PEEK_DATA (res->command_queue, 1);
-		//Sys_Printf ("%s[%d]", qwaq_command_names[cmd], len);
-		//for (int i = 2; i < len; i++) {
-		//	Sys_Printf (" %d", RB_PEEK_DATA (res->command_queue, i));
-		//}
-		//Sys_Printf ("\n");
 		switch (cmd) {
 			case qwaq_cmd_newwin:
 				cmd_newwin (res);
@@ -671,39 +725,66 @@ process_commands (qwaq_resources_t *res)
 				cmd_mvwblit_line (res);
 				break;
 		}
-		RB_DROP_DATA (res->command_queue, RB_PEEK_DATA (res->command_queue, 1));
+		pthread_mutex_lock (&res->command_cond.mut);
+		RB_DROP_DATA (res->command_queue, len);
+		pthread_cond_broadcast (&res->command_cond.cond);
+		pthread_mutex_unlock (&res->command_cond.mut);
 	}
 }
 
 static void
 add_event (qwaq_resources_t *res, qwaq_event_t *event)
 {
-	// lock
-	// {
+	struct timespec timeout;
+	int         merged = 0;
+	int         ret = 0;
+
 	// merge motion events
+	pthread_mutex_lock (&res->event_cond.mut);
 	unsigned    last = RB_DATA_AVAILABLE (res->event_queue);
 	if (event->what == qe_mousemove && last > 1
 		&& RB_PEEK_DATA(res->event_queue, last - 1).what == qe_mousemove) {
 		RB_POKE_DATA(res->event_queue, last - 1, *event);
-		return;	// unlock
+		merged = 1;
+		pthread_cond_broadcast (&res->event_cond.cond);
 	}
-	// }
-	if (RB_SPACE_AVAILABLE (res->event_queue) >= 1) {
-		RB_WRITE_DATA (res->event_queue, event, 1);
+	pthread_mutex_unlock (&res->event_cond.mut);
+	if (merged) {
+		return;
 	}
+
+	pthread_mutex_lock (&res->event_cond.mut);
+	init_timeout (&timeout, 5000 * 1000000L);
+	while (RB_SPACE_AVAILABLE (res->event_queue) < 1 && ret != ETIMEDOUT) {
+		ret = pthread_cond_timedwait (&res->event_cond.cond,
+									  &res->event_cond.mut, &timeout);
+	}
+	RB_WRITE_DATA (res->event_queue, event, 1);
+	pthread_cond_broadcast (&res->event_cond.cond);
 }
 
 static int
 get_event (qwaq_resources_t *res, qwaq_event_t *event)
 {
-	if (RB_DATA_AVAILABLE (res->event_queue) >= 1) {
-		if (event) {
-			RB_READ_DATA (res->event_queue, event, 1);
-		}
-		return 1;
+	struct timespec timeout;
+	int         ret = 0;
+
+	pthread_mutex_lock (&res->event_cond.mut);
+	init_timeout (&timeout, 20 * 1000000);
+	while (RB_DATA_AVAILABLE (res->event_queue) < 1 && ret != ETIMEDOUT) {
+		ret = pthread_cond_timedwait (&res->event_cond.cond,
+									  &res->event_cond.mut, &timeout);
 	}
-	event->what = qe_none;
-	return 0;
+	if (event) {
+		if (ret != ETIMEDOUT) {
+			RB_READ_DATA (res->event_queue, event, 1);
+		} else {
+			event->what = qe_none;
+		}
+	}
+	pthread_cond_broadcast (&res->event_cond.cond);
+	pthread_mutex_lock (&res->event_cond.mut);
+	return ret != ETIMEDOUT;
 }
 
 #define M_MOVE REPORT_MOUSE_POSITION
@@ -1793,6 +1874,13 @@ qwaq_print (const char *fmt, va_list args)
 	fflush (logfile);
 }
 
+static void
+qwaq_init_cond (cond_t *cond)
+{
+	pthread_cond_init (&cond->cond, 0);
+	pthread_mutex_init (&cond->mut, 0);
+}
+
 void
 BI_Init (progs_t *pr)
 {
@@ -1802,6 +1890,10 @@ BI_Init (progs_t *pr)
 		RB_WRITE_DATA (res->string_ids, &i, 1);
 		res->strings[i].mem = &dstring_default_mem;
 	}
+	qwaq_init_cond (&res->event_cond);
+	qwaq_init_cond (&res->command_cond);
+	qwaq_init_cond (&res->results_cond);
+	qwaq_init_cond (&res->string_id_cond);
 
 	PR_Resources_Register (pr, "qwaq", res, bi_qwaq_clear);
 	PR_RegisterBuiltins (pr, builtins);

From 52a46f5d5c5bcc5d6787d83f5905f3fcb5bc1097 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 20 Mar 2020 10:13:37 +0900
Subject: [PATCH 0874/1519] [qwaq] Use allocate progs instead of static

---
 ruamoko/qwaq/main.c | 80 +++++++++++++++++++++++++--------------------
 1 file changed, 45 insertions(+), 35 deletions(-)

diff --git a/ruamoko/qwaq/main.c b/ruamoko/qwaq/main.c
index ae82758ad..bfd0f6550 100644
--- a/ruamoko/qwaq/main.c
+++ b/ruamoko/qwaq/main.c
@@ -52,8 +52,6 @@
 
 #define MAX_EDICTS 1024
 
-static progs_t pr;
-
 cbuf_t *qwaq_cbuf;
 
 static QFile *
@@ -117,20 +115,29 @@ init_qf (void)
 	Cvar_Get ("pr_debug", "2", 0, 0, 0);
 	Cvar_Get ("pr_boundscheck", "0", 0, 0, 0);
 
-	pr.load_file = load_file;
-	pr.allocate_progs_mem = allocate_progs_mem;
-	pr.free_progs_mem = free_progs_mem;
-	pr.no_exec_limit = 1;
+}
+
+static progs_t *
+create_progs (void)
+{
+	progs_t    *pr = calloc (1, sizeof (*pr));
+
+	pr->load_file = load_file;
+	pr->allocate_progs_mem = allocate_progs_mem;
+	pr->free_progs_mem = free_progs_mem;
+	pr->no_exec_limit = 1;
 
 	PR_Init_Cvars ();
-	PR_Init (&pr);
-	RUA_Init (&pr, 0);
-	PR_Cmds_Init (&pr);
-	BI_Init (&pr);
+	PR_Init (pr);
+	RUA_Init (pr, 0);
+	PR_Cmds_Init (pr);
+	BI_Init (pr);
+
+	return pr;
 }
 
 static int
-load_progs (const char *name)
+load_progs (progs_t *pr, const char *name)
 {
 	QFile      *file;
 	int         size;
@@ -139,13 +146,13 @@ load_progs (const char *name)
 	if (!file) {
 		return 0;
 	}
-	pr.progs_name = name;
-	pr.max_edicts = 1;
-	pr.zone_size = 1024*1024;
-	PR_LoadProgsFile (&pr, file, size);
+	pr->progs_name = name;
+	pr->max_edicts = 1;
+	pr->zone_size = 1024*1024;
+	PR_LoadProgsFile (pr, file, size);
 	Qclose (file);
-	if (!PR_RunLoadFuncs (&pr))
-		PR_Error (&pr, "unable to load %s", pr.progs_name);
+	if (!PR_RunLoadFuncs (pr))
+		PR_Error (pr, "unable to load %s", pr->progs_name);
 	return 1;
 }
 
@@ -157,40 +164,43 @@ main (int argc, const char **argv)
 	const char *name = "qwaq-app.dat";
 	string_t   *pr_argv;
 	int         pr_argc = 1, i;
+	progs_t    *pr;
 
 	COM_InitArgv (argc, argv);
 	init_qf ();
 
+	pr = create_progs ();
+
 	if (argc > 1)
 		name = argv[1];
 
-	if (!load_progs (name)) {
+	if (!load_progs (pr, name)) {
 		Sys_Error ("couldn't load %s", name);
 	}
 
-	//pr.pr_trace = 1;
-	//pr.pr_trace_depth = -1;
+	pr->pr_trace = 1;
+	pr->pr_trace_depth = -1;
 
-	PR_PushFrame (&pr);
+	PR_PushFrame (pr);
 	if (argc > 2)
 		pr_argc = argc - 1;
-	pr_argv = PR_Zone_Malloc (&pr, (pr_argc + 1) * 4);
-	pr_argv[0] = PR_SetTempString (&pr, name);
+	pr_argv = PR_Zone_Malloc (pr, (pr_argc + 1) * 4);
+	pr_argv[0] = PR_SetTempString (pr, name);
 	for (i = 1; i < pr_argc; i++)
-		pr_argv[i] = PR_SetTempString (&pr, argv[1 + i]);
+		pr_argv[i] = PR_SetTempString (pr, argv[1 + i]);
 	pr_argv[i] = 0;
 
-	if ((dfunc = PR_FindFunction (&pr, ".main"))
-		|| (dfunc = PR_FindFunction (&pr, "main")))
-		main_func = dfunc - pr.pr_functions;
+	if ((dfunc = PR_FindFunction (pr, ".main"))
+		|| (dfunc = PR_FindFunction (pr, "main")))
+		main_func = dfunc - pr->pr_functions;
 	else
-		PR_Undefined (&pr, "function", "main");
-	PR_RESET_PARAMS (&pr);
-	P_INT (&pr, 0) = pr_argc;
-	P_POINTER (&pr, 1) = PR_SetPointer (&pr, pr_argv);
-	pr.pr_argc = 2;
-	PR_ExecuteProgram (&pr, main_func);
-	PR_PopFrame (&pr);
+		PR_Undefined (pr, "function", "main");
+	PR_RESET_PARAMS (pr);
+	P_INT (pr, 0) = pr_argc;
+	P_POINTER (pr, 1) = PR_SetPointer (pr, pr_argv);
+	pr->pr_argc = 2;
+	PR_ExecuteProgram (pr, main_func);
+	PR_PopFrame (pr);
 	Sys_Shutdown ();
-	return R_INT (&pr);
+	return R_INT (pr);
 }

From 9678eba59b06e8b422733b5034bb57e5f5f475a2 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 20 Mar 2020 14:43:52 +0900
Subject: [PATCH 0875/1519] Initialize array pointer in dynamic array

Oops. I guess I was using calloc in the vulkan branch.
---
 include/QF/darray.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/QF/darray.h b/include/QF/darray.h
index 9f8c9630b..05387b2fe 100644
--- a/include/QF/darray.h
+++ b/include/QF/darray.h
@@ -105,6 +105,7 @@
 		__auto_type ar = (array);										\
 		ar->size = ar->maxSize = 0;										\
 		ar->grow = (growSize);											\
+		ar->a = 0;														\
 	} while (0)
 
 /**	Clear the array.

From a5f57a8a4c4b1ae69cf9e120cc5b72f49600a921 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 20 Mar 2020 15:47:30 +0900
Subject: [PATCH 0876/1519] [qwaq] Parse arguments into sets

The sets are separated by --, and the first set is passed to
getopt_long which currently recognizes only --qargs and non-options. The
--qargs options parses out a set (to -- or end of args) that is passed
to the qargs sub-system for standard qf command line parsing. Set 0 is
for the main qwaq application. Any additional sets (excluding --qargs)
will be used to spawn additional threads when that's working.
---
 ruamoko/qwaq/main.c | 129 ++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 125 insertions(+), 4 deletions(-)

diff --git a/ruamoko/qwaq/main.c b/ruamoko/qwaq/main.c
index bfd0f6550..4c4e3165c 100644
--- a/ruamoko/qwaq/main.c
+++ b/ruamoko/qwaq/main.c
@@ -33,11 +33,14 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 #include <errno.h>
+#include <getopt.h>
 
 #include "QF/cbuf.h"
 #include "QF/cmd.h"
 #include "QF/cvar.h"
+#include "QF/darray.h"
 #include "QF/gib.h"
 #include "QF/idparse.h"
 #include "QF/progs.h"
@@ -54,6 +57,28 @@
 
 cbuf_t *qwaq_cbuf;
 
+const char *this_program;
+
+enum {
+	start_opts = 255,
+	OPT_QARGS,
+};
+
+static struct option const long_options[] = {
+	{"qargs", no_argument, 0, OPT_QARGS},
+	{NULL, 0, NULL, 0},
+};
+
+static const char *short_options =
+	"-"		// magic option parsing mode doohicky (must come first)
+	;
+
+typedef struct qwaq_thread_s {
+	struct DARRAY_TYPE (const char *) args;
+} qwaq_thread_t;
+
+struct DARRAY_TYPE(qwaq_thread_t) thread_args;
+
 static QFile *
 open_file (const char *path, int *len)
 {
@@ -156,23 +181,119 @@ load_progs (progs_t *pr, const char *name)
 	return 1;
 }
 
+static void
+usage (int status)
+{
+	printf ("%s - QuakeForge runtime\n", this_program);
+	printf ("sorry, no help yet\n");
+	exit (status);
+}
+
+static int
+parse_argset (int argc, char **argv)
+{
+	qwaq_thread_t thread;
+	DARRAY_INIT (&thread.args, 8);
+
+	DARRAY_APPEND (&thread.args, NULL);
+	while (optind < argc && strcmp (argv[optind], "--")) {
+		DARRAY_APPEND (&thread.args, argv[optind++]);
+	}
+	if (optind < argc) {
+		optind++;
+	}
+	DARRAY_APPEND (&thread_args, thread);
+	return thread_args.size - 1;
+}
+
+static int
+parse_args (int argc, char **argv)
+{
+	int         c;
+	qwaq_thread_t main_thread;
+	int         qargs_ind = -1;
+
+	DARRAY_INIT (&main_thread.args, 8);
+
+	while ((c = getopt_long (argc, argv,
+							 short_options, long_options, 0)) != -1) {
+		switch (c) {
+			case 1:
+				DARRAY_APPEND (&main_thread.args, argv[optind - 1]);
+				break;
+			case OPT_QARGS:
+				if (qargs_ind < 0) {
+					qargs_ind = parse_argset (argc, argv);
+					thread_args.a[qargs_ind].args.a[0] = "--qargs";
+					goto done;
+				} else {
+					printf ("more than one set of qargs given");
+					exit (1);
+				}
+				break;
+			default:
+				usage (1);
+		}
+	}
+done:
+
+	free (thread_args.a[0].args.a);
+	thread_args.a[0] = main_thread;
+
+	while (optind < argc) {
+		parse_argset (argc, argv);
+	}
+	return qargs_ind;
+}
+
 int
-main (int argc, const char **argv)
+main (int argc, char **argv)
 {
 	dfunction_t *dfunc;
 	func_t      main_func = 0;
 	const char *name = "qwaq-app.dat";
 	string_t   *pr_argv;
 	int         pr_argc = 1, i;
+	int         qargs_ind;
 	progs_t    *pr;
 
-	COM_InitArgv (argc, argv);
+	this_program = argv[0];
+
+	DARRAY_INIT (&thread_args, 4);
+	for (optind = 1; optind < argc; ) {
+		parse_argset (argc, argv);
+	}
+	if (thread_args.size) {
+		qwaq_thread_t *thread = &thread_args.a[0];
+		// the first arg is initialized to null, but this is for getopt, so
+		// set to main program name
+		thread->args.a[0] = this_program;
+		optind = 0;
+		qargs_ind = parse_args (thread->args.size, (char **) thread->args.a);
+	} else {
+		// create a blank main thread set
+		qwaq_thread_t thread = {};
+		DARRAY_APPEND (&thread_args, thread);
+	}
+
+	if (qargs_ind >= 0) {
+		qwaq_thread_t *args = &thread_args.a[qargs_ind];
+		// the first arg is initialized to --qargs, so
+		// set to main program name for now
+		args->args.a[0] = this_program;
+		COM_InitArgv (args->args.size, args->args.a);
+	}
+
 	init_qf ();
 
 	pr = create_progs ();
 
-	if (argc > 1)
-		name = argv[1];
+	{
+		qwaq_thread_t *thread = &thread_args.a[0];
+		if (thread->args.size) {
+			name = thread->args.a[0];
+		}
+	}
 
 	if (!load_progs (pr, name)) {
 		Sys_Error ("couldn't load %s", name);

From 4e739f6b368acec0aa3b3a168666c914a8e388b5 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 20 Mar 2020 16:51:12 +0900
Subject: [PATCH 0877/1519] Use dynamic array element type instead of
 __auto_type

This allows using 0 for pointer arrays.
---
 include/QF/darray.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/QF/darray.h b/include/QF/darray.h
index 05387b2fe..2b8689726 100644
--- a/include/QF/darray.h
+++ b/include/QF/darray.h
@@ -186,10 +186,10 @@
 #define DARRAY_APPEND(array, value)										\
 	({																	\
 		__auto_type ar = (array);										\
-		__auto_type ob = (value);										\
+		typeof(ar->a[0]) ob = (value);									\
 		size_t      sz = ar->size;										\
 		DARRAY_RESIZE (ar, ar->size + 1);								\
-		ar->a[sz] = ob;											\
+		ar->a[sz] = ob;													\
 	})
 
 /**	Open a hole in the array for bulk copying of data.
@@ -259,7 +259,7 @@
 #define DARRAY_INSERT_AT(array, value, index)							\
 	({																	\
 		__auto_type ar = (array);										\
-		__auto_type ob = (value);										\
+		typeof(ar->a[0]) ob = (value);									\
 		*DARRAY_OPEN_AT (ar, index, 1) = ob;							\
 	})
 

From 0cc28c864140caad15d157c0ba1c3ff703fd3ca2 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 20 Mar 2020 16:59:59 +0900
Subject: [PATCH 0878/1519] [qwaq] Run main thread

And only thread, still, so things lock up still, but they're coming
together.
---
 ruamoko/qwaq/main.c | 125 +++++++++++++++++++++++++++-----------------
 1 file changed, 77 insertions(+), 48 deletions(-)

diff --git a/ruamoko/qwaq/main.c b/ruamoko/qwaq/main.c
index 4c4e3165c..282b9f5bf 100644
--- a/ruamoko/qwaq/main.c
+++ b/ruamoko/qwaq/main.c
@@ -75,6 +75,9 @@ static const char *short_options =
 
 typedef struct qwaq_thread_s {
 	struct DARRAY_TYPE (const char *) args;
+	sys_printf_t sys_printf;
+	progs_t    *pr;
+	func_t      main_func;
 } qwaq_thread_t;
 
 struct DARRAY_TYPE(qwaq_thread_t) thread_args;
@@ -181,6 +184,58 @@ load_progs (progs_t *pr, const char *name)
 	return 1;
 }
 
+static void
+spawn_progs (qwaq_thread_t *thread)
+{
+	dfunction_t *dfunc;
+	const char *name = "qwaq-app.dat";
+	string_t   *pr_argv;
+	int         pr_argc = 1, i;
+	progs_t    *pr;
+
+	thread->main_func = 0;
+	pr = thread->pr = create_progs ();
+	if (thread->args.size) {
+		name = thread->args.a[0];
+	}
+
+	if (!load_progs (pr, name)) {
+		Sys_Error ("couldn't load %s", name);
+	}
+
+	//pr->pr_trace = 1;
+	//pr->pr_trace_depth = -1;
+
+	PR_PushFrame (pr);
+	if (thread->args.size > 2) {
+		pr_argc = thread->args.size - 1;
+	}
+	pr_argv = PR_Zone_Malloc (pr, (pr_argc + 1) * 4);
+	pr_argv[0] = PR_SetTempString (pr, name);
+	for (i = 1; i < pr_argc; i++)
+		pr_argv[i] = PR_SetTempString (pr, thread->args.a[1 + i]);
+	pr_argv[i] = 0;
+
+	if ((dfunc = PR_FindFunction (pr, ".main"))
+		|| (dfunc = PR_FindFunction (pr, "main"))) {
+		thread->main_func = dfunc - pr->pr_functions;
+	} else {
+		PR_Undefined (pr, "function", "main");
+	}
+	PR_RESET_PARAMS (pr);
+	P_INT (pr, 0) = pr_argc;
+	P_POINTER (pr, 1) = PR_SetPointer (pr, pr_argv);
+	pr->pr_argc = 2;
+}
+
+static int
+run_progs (qwaq_thread_t *thread)
+{
+	PR_ExecuteProgram (thread->pr, thread->main_func);
+	PR_PopFrame (thread->pr);
+	return R_INT (thread->pr);
+}
+
 static void
 usage (int status)
 {
@@ -192,10 +247,10 @@ usage (int status)
 static int
 parse_argset (int argc, char **argv)
 {
-	qwaq_thread_t thread;
+	qwaq_thread_t thread = {};
 	DARRAY_INIT (&thread.args, 8);
 
-	DARRAY_APPEND (&thread.args, NULL);
+	DARRAY_APPEND (&thread.args, 0);
 	while (optind < argc && strcmp (argv[optind], "--")) {
 		DARRAY_APPEND (&thread.args, argv[optind++]);
 	}
@@ -210,7 +265,7 @@ static int
 parse_args (int argc, char **argv)
 {
 	int         c;
-	qwaq_thread_t main_thread;
+	qwaq_thread_t main_thread = {};
 	int         qargs_ind = -1;
 
 	DARRAY_INIT (&main_thread.args, 8);
@@ -249,13 +304,8 @@ done:
 int
 main (int argc, char **argv)
 {
-	dfunction_t *dfunc;
-	func_t      main_func = 0;
-	const char *name = "qwaq-app.dat";
-	string_t   *pr_argv;
-	int         pr_argc = 1, i;
-	int         qargs_ind;
-	progs_t    *pr;
+	int         qargs_ind = -1;
+	int         ret;
 
 	this_program = argv[0];
 
@@ -277,51 +327,30 @@ main (int argc, char **argv)
 	}
 
 	if (qargs_ind >= 0) {
-		qwaq_thread_t *args = &thread_args.a[qargs_ind];
+		qwaq_thread_t *qargs = &thread_args.a[qargs_ind];
 		// the first arg is initialized to --qargs, so
 		// set to main program name for now
-		args->args.a[0] = this_program;
-		COM_InitArgv (args->args.size, args->args.a);
+		qargs->args.a[0] = this_program;
+		COM_InitArgv (qargs->args.size, qargs->args.a);
+	} else {
+		qwaq_thread_t qargs = {};
+		DARRAY_INIT (&qargs.args, 2);
+		DARRAY_APPEND (&qargs.args, this_program);
+		COM_InitArgv (qargs.args.size, qargs.args.a);
 	}
 
 	init_qf ();
 
-	pr = create_progs ();
-
-	{
-		qwaq_thread_t *thread = &thread_args.a[0];
-		if (thread->args.size) {
-			name = thread->args.a[0];
+	for (size_t i = 0; i < thread_args.size; i++) {
+		qwaq_thread_t *thread = &thread_args.a[i];
+		if (thread->args.size && thread->args.a[0]
+			&& strcmp (thread->args.a[0], "--qargs")) {
+			// skip the args set that's passed to qargs
+			continue;
 		}
+		spawn_progs (thread);
 	}
-
-	if (!load_progs (pr, name)) {
-		Sys_Error ("couldn't load %s", name);
-	}
-
-	pr->pr_trace = 1;
-	pr->pr_trace_depth = -1;
-
-	PR_PushFrame (pr);
-	if (argc > 2)
-		pr_argc = argc - 1;
-	pr_argv = PR_Zone_Malloc (pr, (pr_argc + 1) * 4);
-	pr_argv[0] = PR_SetTempString (pr, name);
-	for (i = 1; i < pr_argc; i++)
-		pr_argv[i] = PR_SetTempString (pr, argv[1 + i]);
-	pr_argv[i] = 0;
-
-	if ((dfunc = PR_FindFunction (pr, ".main"))
-		|| (dfunc = PR_FindFunction (pr, "main")))
-		main_func = dfunc - pr->pr_functions;
-	else
-		PR_Undefined (pr, "function", "main");
-	PR_RESET_PARAMS (pr);
-	P_INT (pr, 0) = pr_argc;
-	P_POINTER (pr, 1) = PR_SetPointer (pr, pr_argv);
-	pr->pr_argc = 2;
-	PR_ExecuteProgram (pr, main_func);
-	PR_PopFrame (pr);
+	ret = run_progs (&thread_args.a[0]);
 	Sys_Shutdown ();
-	return R_INT (pr);
+	return ret;
 }

From 93886d6cd798466d659aff557b5da2548b6f3ddf Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 20 Mar 2020 17:30:26 +0900
Subject: [PATCH 0879/1519] [qwaq] Use main args non-options as progs files

If none are specified, default to qwaq-app.dat (for now, anyway). For
each progs file, an optional args set can be specified in the same order
(separated by --). Missing sets default to empty, excess sets are
ignored.
---
 ruamoko/qwaq/main.c | 34 ++++++++++++++++++++++++++++++----
 1 file changed, 30 insertions(+), 4 deletions(-)

diff --git a/ruamoko/qwaq/main.c b/ruamoko/qwaq/main.c
index 282b9f5bf..ed8fbf203 100644
--- a/ruamoko/qwaq/main.c
+++ b/ruamoko/qwaq/main.c
@@ -188,7 +188,7 @@ static void
 spawn_progs (qwaq_thread_t *thread)
 {
 	dfunction_t *dfunc;
-	const char *name = "qwaq-app.dat";
+	const char *name = 0;
 	string_t   *pr_argv;
 	int         pr_argc = 1, i;
 	progs_t    *pr;
@@ -305,7 +305,9 @@ int
 main (int argc, char **argv)
 {
 	int         qargs_ind = -1;
-	int         ret;
+	int         main_ind = -1;
+	int         ret = 0;
+	size_t      num_sys = 1;
 
 	this_program = argv[0];
 
@@ -323,6 +325,7 @@ main (int argc, char **argv)
 	} else {
 		// create a blank main thread set
 		qwaq_thread_t thread = {};
+		DARRAY_INIT (&thread.args, 4);
 		DARRAY_APPEND (&thread_args, thread);
 	}
 
@@ -332,6 +335,7 @@ main (int argc, char **argv)
 		// set to main program name for now
 		qargs->args.a[0] = this_program;
 		COM_InitArgv (qargs->args.size, qargs->args.a);
+		num_sys++;
 	} else {
 		qwaq_thread_t qargs = {};
 		DARRAY_INIT (&qargs.args, 2);
@@ -341,16 +345,38 @@ main (int argc, char **argv)
 
 	init_qf ();
 
-	for (size_t i = 0; i < thread_args.size; i++) {
+	if (thread_args.a[0].args.size < 1) {
+		DARRAY_APPEND (&thread_args.a[0].args, "qwaq-app.dat");
+	}
+
+	while (thread_args.size < thread_args.a[0].args.size + num_sys) {
+		qwaq_thread_t thread = {};
+		DARRAY_INIT (&thread.args, 4);
+		DARRAY_APPEND (&thread.args, 0);
+		DARRAY_APPEND (&thread_args, thread);
+	}
+
+	for (size_t i = 1, thread_ind = 0; i < thread_args.size; i++) {
 		qwaq_thread_t *thread = &thread_args.a[i];
 		if (thread->args.size && thread->args.a[0]
 			&& strcmp (thread->args.a[0], "--qargs")) {
 			// skip the args set that's passed to qargs
 			continue;
 		}
+		if (thread_ind < thread_args.a[0].args.size) {
+			thread->args.a[0] = thread_args.a[0].args.a[thread_ind++];
+		} else {
+			printf ("ignoring extra arg sets\n");
+			break;
+		}
+		if (main_ind < 0) {
+			main_ind = i;
+		}
 		spawn_progs (thread);
 	}
-	ret = run_progs (&thread_args.a[0]);
+	if (main_ind >= 0) {
+		ret = run_progs (&thread_args.a[main_ind]);
+	}
 	Sys_Shutdown ();
 	return ret;
 }

From f14f2f518a5c442c47357d47902dfd198dfa1d8e Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 20 Mar 2020 21:16:56 +0900
Subject: [PATCH 0880/1519] [qwaq] Rename thread_args to thread_data

---
 ruamoko/qwaq/main.c | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/ruamoko/qwaq/main.c b/ruamoko/qwaq/main.c
index ed8fbf203..22dcf25ed 100644
--- a/ruamoko/qwaq/main.c
+++ b/ruamoko/qwaq/main.c
@@ -80,7 +80,7 @@ typedef struct qwaq_thread_s {
 	func_t      main_func;
 } qwaq_thread_t;
 
-struct DARRAY_TYPE(qwaq_thread_t) thread_args;
+struct DARRAY_TYPE(qwaq_thread_t) thread_data;
 
 static QFile *
 open_file (const char *path, int *len)
@@ -257,8 +257,8 @@ parse_argset (int argc, char **argv)
 	if (optind < argc) {
 		optind++;
 	}
-	DARRAY_APPEND (&thread_args, thread);
-	return thread_args.size - 1;
+	DARRAY_APPEND (&thread_data, thread);
+	return thread_data.size - 1;
 }
 
 static int
@@ -279,7 +279,7 @@ parse_args (int argc, char **argv)
 			case OPT_QARGS:
 				if (qargs_ind < 0) {
 					qargs_ind = parse_argset (argc, argv);
-					thread_args.a[qargs_ind].args.a[0] = "--qargs";
+					thread_data.a[qargs_ind].args.a[0] = "--qargs";
 					goto done;
 				} else {
 					printf ("more than one set of qargs given");
@@ -292,8 +292,8 @@ parse_args (int argc, char **argv)
 	}
 done:
 
-	free (thread_args.a[0].args.a);
-	thread_args.a[0] = main_thread;
+	free (thread_data.a[0].args.a);
+	thread_data.a[0] = main_thread;
 
 	while (optind < argc) {
 		parse_argset (argc, argv);
@@ -311,12 +311,12 @@ main (int argc, char **argv)
 
 	this_program = argv[0];
 
-	DARRAY_INIT (&thread_args, 4);
+	DARRAY_INIT (&thread_data, 4);
 	for (optind = 1; optind < argc; ) {
 		parse_argset (argc, argv);
 	}
-	if (thread_args.size) {
-		qwaq_thread_t *thread = &thread_args.a[0];
+	if (thread_data.size) {
+		qwaq_thread_t *thread = &thread_data.a[0];
 		// the first arg is initialized to null, but this is for getopt, so
 		// set to main program name
 		thread->args.a[0] = this_program;
@@ -326,11 +326,11 @@ main (int argc, char **argv)
 		// create a blank main thread set
 		qwaq_thread_t thread = {};
 		DARRAY_INIT (&thread.args, 4);
-		DARRAY_APPEND (&thread_args, thread);
+		DARRAY_APPEND (&thread_data, thread);
 	}
 
 	if (qargs_ind >= 0) {
-		qwaq_thread_t *qargs = &thread_args.a[qargs_ind];
+		qwaq_thread_t *qargs = &thread_data.a[qargs_ind];
 		// the first arg is initialized to --qargs, so
 		// set to main program name for now
 		qargs->args.a[0] = this_program;
@@ -345,26 +345,26 @@ main (int argc, char **argv)
 
 	init_qf ();
 
-	if (thread_args.a[0].args.size < 1) {
-		DARRAY_APPEND (&thread_args.a[0].args, "qwaq-app.dat");
+	if (thread_data.a[0].args.size < 1) {
+		DARRAY_APPEND (&thread_data.a[0].args, "qwaq-app.dat");
 	}
 
-	while (thread_args.size < thread_args.a[0].args.size + num_sys) {
+	while (thread_data.size < thread_data.a[0].args.size + num_sys) {
 		qwaq_thread_t thread = {};
 		DARRAY_INIT (&thread.args, 4);
 		DARRAY_APPEND (&thread.args, 0);
-		DARRAY_APPEND (&thread_args, thread);
+		DARRAY_APPEND (&thread_data, thread);
 	}
 
-	for (size_t i = 1, thread_ind = 0; i < thread_args.size; i++) {
-		qwaq_thread_t *thread = &thread_args.a[i];
+	for (size_t i = 1, thread_ind = 0; i < thread_data.size; i++) {
+		qwaq_thread_t *thread = &thread_data.a[i];
 		if (thread->args.size && thread->args.a[0]
 			&& strcmp (thread->args.a[0], "--qargs")) {
 			// skip the args set that's passed to qargs
 			continue;
 		}
-		if (thread_ind < thread_args.a[0].args.size) {
-			thread->args.a[0] = thread_args.a[0].args.a[thread_ind++];
+		if (thread_ind < thread_data.a[0].args.size) {
+			thread->args.a[0] = thread_data.a[0].args.a[thread_ind++];
 		} else {
 			printf ("ignoring extra arg sets\n");
 			break;
@@ -375,7 +375,7 @@ main (int argc, char **argv)
 		spawn_progs (thread);
 	}
 	if (main_ind >= 0) {
-		ret = run_progs (&thread_args.a[main_ind]);
+		ret = run_progs (&thread_data.a[main_ind]);
 	}
 	Sys_Shutdown ();
 	return ret;

From 6c1a026bf15f3602781b4a06c513bb7c547e2605 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 20 Mar 2020 23:17:06 +0900
Subject: [PATCH 0881/1519] [qwaq] Change thread data array to pointers

I realized that with dynamic thread creation the arrays resizing could
cause them to move around in memory which would be bad for anything
holding a pointer to the data, and even using indices wouldn't help that
much as the array would need to be mutex protected.
---
 ruamoko/qwaq/main.c | 49 +++++++++++++++++++++++----------------------
 1 file changed, 25 insertions(+), 24 deletions(-)

diff --git a/ruamoko/qwaq/main.c b/ruamoko/qwaq/main.c
index 22dcf25ed..8c20c3558 100644
--- a/ruamoko/qwaq/main.c
+++ b/ruamoko/qwaq/main.c
@@ -80,7 +80,7 @@ typedef struct qwaq_thread_s {
 	func_t      main_func;
 } qwaq_thread_t;
 
-struct DARRAY_TYPE(qwaq_thread_t) thread_data;
+struct DARRAY_TYPE(qwaq_thread_t *) thread_data;
 
 static QFile *
 open_file (const char *path, int *len)
@@ -247,12 +247,12 @@ usage (int status)
 static int
 parse_argset (int argc, char **argv)
 {
-	qwaq_thread_t thread = {};
-	DARRAY_INIT (&thread.args, 8);
+	qwaq_thread_t *thread = calloc (1, sizeof (*thread));
+	DARRAY_INIT (&thread->args, 8);
 
-	DARRAY_APPEND (&thread.args, 0);
+	DARRAY_APPEND (&thread->args, 0);
 	while (optind < argc && strcmp (argv[optind], "--")) {
-		DARRAY_APPEND (&thread.args, argv[optind++]);
+		DARRAY_APPEND (&thread->args, argv[optind++]);
 	}
 	if (optind < argc) {
 		optind++;
@@ -265,21 +265,21 @@ static int
 parse_args (int argc, char **argv)
 {
 	int         c;
-	qwaq_thread_t main_thread = {};
+	qwaq_thread_t *main_thread = calloc (1, sizeof (*main_thread));
 	int         qargs_ind = -1;
 
-	DARRAY_INIT (&main_thread.args, 8);
+	DARRAY_INIT (&main_thread->args, 8);
 
 	while ((c = getopt_long (argc, argv,
 							 short_options, long_options, 0)) != -1) {
 		switch (c) {
 			case 1:
-				DARRAY_APPEND (&main_thread.args, argv[optind - 1]);
+				DARRAY_APPEND (&main_thread->args, argv[optind - 1]);
 				break;
 			case OPT_QARGS:
 				if (qargs_ind < 0) {
 					qargs_ind = parse_argset (argc, argv);
-					thread_data.a[qargs_ind].args.a[0] = "--qargs";
+					thread_data.a[qargs_ind]->args.a[0] = "--qargs";
 					goto done;
 				} else {
 					printf ("more than one set of qargs given");
@@ -292,7 +292,8 @@ parse_args (int argc, char **argv)
 	}
 done:
 
-	free (thread_data.a[0].args.a);
+	free (thread_data.a[0]->args.a);
+	free (thread_data.a[0]);
 	thread_data.a[0] = main_thread;
 
 	while (optind < argc) {
@@ -316,7 +317,7 @@ main (int argc, char **argv)
 		parse_argset (argc, argv);
 	}
 	if (thread_data.size) {
-		qwaq_thread_t *thread = &thread_data.a[0];
+		qwaq_thread_t *thread = thread_data.a[0];
 		// the first arg is initialized to null, but this is for getopt, so
 		// set to main program name
 		thread->args.a[0] = this_program;
@@ -324,13 +325,13 @@ main (int argc, char **argv)
 		qargs_ind = parse_args (thread->args.size, (char **) thread->args.a);
 	} else {
 		// create a blank main thread set
-		qwaq_thread_t thread = {};
-		DARRAY_INIT (&thread.args, 4);
+		qwaq_thread_t *thread = calloc (1, sizeof (*thread));
+		DARRAY_INIT (&thread->args, 4);
 		DARRAY_APPEND (&thread_data, thread);
 	}
 
 	if (qargs_ind >= 0) {
-		qwaq_thread_t *qargs = &thread_data.a[qargs_ind];
+		qwaq_thread_t *qargs = thread_data.a[qargs_ind];
 		// the first arg is initialized to --qargs, so
 		// set to main program name for now
 		qargs->args.a[0] = this_program;
@@ -345,26 +346,26 @@ main (int argc, char **argv)
 
 	init_qf ();
 
-	if (thread_data.a[0].args.size < 1) {
-		DARRAY_APPEND (&thread_data.a[0].args, "qwaq-app.dat");
+	if (thread_data.a[0]->args.size < 1) {
+		DARRAY_APPEND (&thread_data.a[0]->args, "qwaq-app.dat");
 	}
 
-	while (thread_data.size < thread_data.a[0].args.size + num_sys) {
-		qwaq_thread_t thread = {};
-		DARRAY_INIT (&thread.args, 4);
-		DARRAY_APPEND (&thread.args, 0);
+	while (thread_data.size < thread_data.a[0]->args.size + num_sys) {
+		qwaq_thread_t *thread = calloc (1, sizeof (*thread));
+		DARRAY_INIT (&thread->args, 4);
+		DARRAY_APPEND (&thread->args, 0);
 		DARRAY_APPEND (&thread_data, thread);
 	}
 
 	for (size_t i = 1, thread_ind = 0; i < thread_data.size; i++) {
-		qwaq_thread_t *thread = &thread_data.a[i];
+		qwaq_thread_t *thread = thread_data.a[i];
 		if (thread->args.size && thread->args.a[0]
 			&& strcmp (thread->args.a[0], "--qargs")) {
 			// skip the args set that's passed to qargs
 			continue;
 		}
-		if (thread_ind < thread_data.a[0].args.size) {
-			thread->args.a[0] = thread_data.a[0].args.a[thread_ind++];
+		if (thread_ind < thread_data.a[0]->args.size) {
+			thread->args.a[0] = thread_data.a[0]->args.a[thread_ind++];
 		} else {
 			printf ("ignoring extra arg sets\n");
 			break;
@@ -375,7 +376,7 @@ main (int argc, char **argv)
 		spawn_progs (thread);
 	}
 	if (main_ind >= 0) {
-		ret = run_progs (&thread_data.a[main_ind]);
+		ret = run_progs (thread_data.a[main_ind]);
 	}
 	Sys_Shutdown ();
 	return ret;

From cf9455293b4c4d9b49057699251c14ea35b5e61f Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 21 Mar 2020 00:01:36 +0900
Subject: [PATCH 0882/1519] [qwaq] Start threads for progs and curses

No idea if anything works, probably come crashing down in a flaming pile
of debris.
---
 ruamoko/qwaq/main.c        | 52 ++++++++++++++++++++++++++------------
 ruamoko/qwaq/qwaq-curses.c | 19 ++++++++++++--
 ruamoko/qwaq/qwaq.h        | 17 +++++++++++++
 3 files changed, 70 insertions(+), 18 deletions(-)

diff --git a/ruamoko/qwaq/main.c b/ruamoko/qwaq/main.c
index 8c20c3558..2368c2fc9 100644
--- a/ruamoko/qwaq/main.c
+++ b/ruamoko/qwaq/main.c
@@ -1,12 +1,12 @@
 /*
 	#FILENAME#
 
-	#DESCRIPTION#
+	Qwaq
 
-	Copyright (C) 2001 #AUTHOR#
+	Copyright (C) 2001 Bill Currie
 
-	Author: #AUTHOR#
-	Date: #DATE#
+	Author: Bill Currie <bill@taniwha.org>
+	Date: 2001/06/01
 
 	This program is free software; you can redistribute it and/or
 	modify it under the terms of the GNU General Public License
@@ -34,13 +34,13 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <pthread.h>
 #include <errno.h>
 #include <getopt.h>
 
 #include "QF/cbuf.h"
 #include "QF/cmd.h"
 #include "QF/cvar.h"
-#include "QF/darray.h"
 #include "QF/gib.h"
 #include "QF/idparse.h"
 #include "QF/progs.h"
@@ -73,13 +73,6 @@ static const char *short_options =
 	"-"		// magic option parsing mode doohicky (must come first)
 	;
 
-typedef struct qwaq_thread_s {
-	struct DARRAY_TYPE (const char *) args;
-	sys_printf_t sys_printf;
-	progs_t    *pr;
-	func_t      main_func;
-} qwaq_thread_t;
-
 struct DARRAY_TYPE(qwaq_thread_t *) thread_data;
 
 static QFile *
@@ -228,12 +221,31 @@ spawn_progs (qwaq_thread_t *thread)
 	pr->pr_argc = 2;
 }
 
-static int
-run_progs (qwaq_thread_t *thread)
+static void *
+run_progs (void *data)
 {
+	__auto_type thread = (qwaq_thread_t *) data;
+
 	PR_ExecuteProgram (thread->pr, thread->main_func);
 	PR_PopFrame (thread->pr);
-	return R_INT (thread->pr);
+	thread->return_code = R_INT (thread->pr);
+	return thread;
+}
+
+static void
+start_progs_thread (qwaq_thread_t *thread)
+{
+	pthread_create (&thread->thread_id, 0, run_progs, thread);
+}
+
+qwaq_thread_t *
+create_thread (void *(*thread_func) (void *))
+{
+	qwaq_thread_t *thread = calloc (1, sizeof (*thread));
+
+	DARRAY_APPEND (&thread_data, thread);
+	pthread_create (&thread->thread_id, 0, thread_func, thread);
+	return thread;
 }
 
 static void
@@ -376,8 +388,16 @@ main (int argc, char **argv)
 		spawn_progs (thread);
 	}
 	if (main_ind >= 0) {
-		ret = run_progs (thread_data.a[main_ind]);
+		// threads might start new threads before the end is reached
+		size_t      count = thread_data.size;
+		for (size_t i = 0; i < count; i++) {
+			if (thread_data.a[i]->pr && thread_data.a[i]->main_func) {
+				start_progs_thread (thread_data.a[main_ind]);
+			}
+		}
+		pthread_join (thread_data.a[main_ind]->thread_id, 0);
 	}
+
 	Sys_Shutdown ();
 	return ret;
 }
diff --git a/ruamoko/qwaq/qwaq-curses.c b/ruamoko/qwaq/qwaq-curses.c
index 8f793bdac..65a08d53f 100644
--- a/ruamoko/qwaq/qwaq-curses.c
+++ b/ruamoko/qwaq/qwaq-curses.c
@@ -1347,8 +1347,6 @@ bi_get_event (progs_t *pr)
 	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
 	qwaq_event_t *event = &G_STRUCT (pr, qwaq_event_t, P_INT (pr, 0));
 
-	process_commands (res);
-	process_input (res);
 	R_INT (pr) = get_event (res, event);
 }
 
@@ -1554,6 +1552,21 @@ bi_mvwblit_line (progs_t *pr)
 	qwaq__mvwblit_line (pr, window_id, x, y, chs, len);
 }
 
+static void *
+qwaq_curse_thread (void *data)
+{
+	__auto_type thread = (qwaq_thread_t *) data;
+	progs_t    *pr = thread->pr;
+	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
+
+	while (1) {
+		process_commands (res);
+		process_input (res);
+	}
+	thread->return_code = 0;
+	return thread;
+}
+
 static void
 bi_initialize (progs_t *pr)
 {
@@ -1573,6 +1586,8 @@ bi_initialize (progs_t *pr)
 	refresh();
 
 	res->stdscr.win = stdscr;
+
+	create_thread (qwaq_curse_thread);
 }
 
 static void
diff --git a/ruamoko/qwaq/qwaq.h b/ruamoko/qwaq/qwaq.h
index 9dbb2c23a..f89f529e8 100644
--- a/ruamoko/qwaq/qwaq.h
+++ b/ruamoko/qwaq/qwaq.h
@@ -1,2 +1,19 @@
+#ifndef __qwaq_h
+#define __qwaq_h
+
+#include "QF/darray.h"
+
+typedef struct qwaq_thread_s {
+	pthread_t   thread_id;
+	int         return_code;
+	struct DARRAY_TYPE (const char *) args;
+	sys_printf_t sys_printf;
+	progs_t    *pr;
+	func_t      main_func;
+} qwaq_thread_t;
+
 void BI_Init (progs_t *pr);
 extern struct cbuf_s *qwaq_cbuf;
+qwaq_thread_t *create_thread (void *(*thread_func) (void *));
+
+#endif//__qwaq_h

From ac3fef6dd8d4e01dbd91e5217d622cdb7a97390c Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 21 Mar 2020 00:05:56 +0900
Subject: [PATCH 0883/1519] [qwaq] Fix a harmless typo

Amusing, though... it was cursed (segaulted).
---
 ruamoko/qwaq/qwaq-curses.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-curses.c b/ruamoko/qwaq/qwaq-curses.c
index 65a08d53f..1318445b3 100644
--- a/ruamoko/qwaq/qwaq-curses.c
+++ b/ruamoko/qwaq/qwaq-curses.c
@@ -1553,7 +1553,7 @@ bi_mvwblit_line (progs_t *pr)
 }
 
 static void *
-qwaq_curse_thread (void *data)
+qwaq_curses_thread (void *data)
 {
 	__auto_type thread = (qwaq_thread_t *) data;
 	progs_t    *pr = thread->pr;
@@ -1587,7 +1587,7 @@ bi_initialize (progs_t *pr)
 
 	res->stdscr.win = stdscr;
 
-	create_thread (qwaq_curse_thread);
+	create_thread (qwaq_curses_thread);
 }
 
 static void

From 7beaa567e6235b34bbb7a60e9f2ffe66aee04317 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 21 Mar 2020 00:14:33 +0900
Subject: [PATCH 0884/1519] [qwaq] Pass resource data into the thread

Things have come crashing down, but no fire (ie, no deadlocks so far).
---
 ruamoko/qwaq/main.c        | 6 ++++--
 ruamoko/qwaq/qwaq-curses.c | 8 +++-----
 ruamoko/qwaq/qwaq.h        | 3 ++-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/ruamoko/qwaq/main.c b/ruamoko/qwaq/main.c
index 2368c2fc9..45da8847e 100644
--- a/ruamoko/qwaq/main.c
+++ b/ruamoko/qwaq/main.c
@@ -239,12 +239,14 @@ start_progs_thread (qwaq_thread_t *thread)
 }
 
 qwaq_thread_t *
-create_thread (void *(*thread_func) (void *))
+create_thread (void *(*thread_func) (qwaq_thread_t *), void *data)
 {
 	qwaq_thread_t *thread = calloc (1, sizeof (*thread));
 
+	thread->data = data;
 	DARRAY_APPEND (&thread_data, thread);
-	pthread_create (&thread->thread_id, 0, thread_func, thread);
+	pthread_create (&thread->thread_id, 0,
+					(void*(*)(void*))thread_func, thread);
 	return thread;
 }
 
diff --git a/ruamoko/qwaq/qwaq-curses.c b/ruamoko/qwaq/qwaq-curses.c
index 1318445b3..4503645d2 100644
--- a/ruamoko/qwaq/qwaq-curses.c
+++ b/ruamoko/qwaq/qwaq-curses.c
@@ -1553,11 +1553,9 @@ bi_mvwblit_line (progs_t *pr)
 }
 
 static void *
-qwaq_curses_thread (void *data)
+qwaq_curses_thread (qwaq_thread_t *thread)
 {
-	__auto_type thread = (qwaq_thread_t *) data;
-	progs_t    *pr = thread->pr;
-	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
+	qwaq_resources_t *res = thread->data;
 
 	while (1) {
 		process_commands (res);
@@ -1587,7 +1585,7 @@ bi_initialize (progs_t *pr)
 
 	res->stdscr.win = stdscr;
 
-	create_thread (qwaq_curses_thread);
+	create_thread (qwaq_curses_thread, res);
 }
 
 static void
diff --git a/ruamoko/qwaq/qwaq.h b/ruamoko/qwaq/qwaq.h
index f89f529e8..f0974e61c 100644
--- a/ruamoko/qwaq/qwaq.h
+++ b/ruamoko/qwaq/qwaq.h
@@ -10,10 +10,11 @@ typedef struct qwaq_thread_s {
 	sys_printf_t sys_printf;
 	progs_t    *pr;
 	func_t      main_func;
+	void       *data;
 } qwaq_thread_t;
 
 void BI_Init (progs_t *pr);
 extern struct cbuf_s *qwaq_cbuf;
-qwaq_thread_t *create_thread (void *(*thread_func) (void *));
+qwaq_thread_t *create_thread (void *(*thread_func) (qwaq_thread_t *), void *);
 
 #endif//__qwaq_h

From 5f887c47739da2a6c1314fa31ed3d33c1757eea2 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 21 Mar 2020 11:36:24 +0900
Subject: [PATCH 0885/1519] [qwaq] Fix missed logic conversion

---
 ruamoko/qwaq/qwaq-curses.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ruamoko/qwaq/qwaq-curses.c b/ruamoko/qwaq/qwaq-curses.c
index 4503645d2..a1c9f78cb 100644
--- a/ruamoko/qwaq/qwaq-curses.c
+++ b/ruamoko/qwaq/qwaq-curses.c
@@ -297,7 +297,7 @@ qwaq_wait_result (qwaq_resources_t *res, int *result, int cmd, unsigned len)
 {
 	pthread_mutex_lock (&res->results_cond.mut);
 	while (RB_DATA_AVAILABLE (res->results) < len
-		&& RB_PEEK_DATA (res->results, 0) != cmd) {
+		   || RB_PEEK_DATA (res->results, 0) != cmd) {
 		pthread_cond_wait (&res->results_cond.cond,
 						   &res->results_cond.mut);
 	}

From af137937bd411e23a7208be2cf5723453bddd87c Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 21 Mar 2020 11:37:08 +0900
Subject: [PATCH 0886/1519] [qwaq] Add missing mutex unlock

---
 ruamoko/qwaq/qwaq-curses.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ruamoko/qwaq/qwaq-curses.c b/ruamoko/qwaq/qwaq-curses.c
index a1c9f78cb..c97418ea3 100644
--- a/ruamoko/qwaq/qwaq-curses.c
+++ b/ruamoko/qwaq/qwaq-curses.c
@@ -761,6 +761,7 @@ add_event (qwaq_resources_t *res, qwaq_event_t *event)
 	}
 	RB_WRITE_DATA (res->event_queue, event, 1);
 	pthread_cond_broadcast (&res->event_cond.cond);
+	pthread_mutex_unlock (&res->event_cond.mut);
 }
 
 static int

From abedb465af462ba3c52fafac7a009f1ea53f62e6 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 21 Mar 2020 11:39:55 +0900
Subject: [PATCH 0887/1519] [qwaq] Use separate conditions for queue read/write

While writing the code I suspected this would be necessary, but it's
nice to know. Now the window seems to be correctly fetched, but
get_event locks up.
---
 ruamoko/qwaq/qwaq-curses.c | 40 ++++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-curses.c b/ruamoko/qwaq/qwaq-curses.c
index c97418ea3..4fdc9e018 100644
--- a/ruamoko/qwaq/qwaq-curses.c
+++ b/ruamoko/qwaq/qwaq-curses.c
@@ -128,7 +128,8 @@ typedef struct panel_s {
 } panel_t;
 
 typedef struct cond_s {
-	pthread_cond_t cond;
+	pthread_cond_t rcond;
+	pthread_cond_t wcond;
 	pthread_mutex_t mut;
 } cond_t;
 
@@ -242,11 +243,11 @@ acquire_string (qwaq_resources_t *res)
 
 	pthread_mutex_lock (&res->string_id_cond.mut);
 	while (!RB_DATA_AVAILABLE (res->string_ids)) {
-		pthread_cond_wait (&res->string_id_cond.cond,
+		pthread_cond_wait (&res->string_id_cond.rcond,
 						   &res->string_id_cond.mut);
 	}
 	RB_READ_DATA (res->string_ids, &string_id, 1);
-	pthread_cond_broadcast (&res->string_id_cond.cond);
+	pthread_cond_broadcast (&res->string_id_cond.wcond);
 	pthread_mutex_unlock (&res->string_id_cond.mut);
 	return string_id;
 }
@@ -256,11 +257,11 @@ release_string (qwaq_resources_t *res, int string_id)
 {
 	pthread_mutex_lock (&res->string_id_cond.mut);
 	while (RB_SPACE_AVAILABLE (res->string_ids)) {
-		pthread_cond_wait (&res->string_id_cond.cond,
+		pthread_cond_wait (&res->string_id_cond.wcond,
 						   &res->string_id_cond.mut);
 	}
 	RB_WRITE_DATA (res->string_ids, &string_id, 1);
-	pthread_cond_broadcast (&res->string_id_cond.cond);
+	pthread_cond_broadcast (&res->string_id_cond.rcond);
 	pthread_mutex_unlock (&res->string_id_cond.mut);
 }
 
@@ -271,11 +272,11 @@ qwaq_submit_command (qwaq_resources_t *res, const int *cmd)
 
 	pthread_mutex_lock (&res->command_cond.mut);
 	while (RB_SPACE_AVAILABLE (res->command_queue) < len) {
-		pthread_cond_wait (&res->command_cond.cond,
+		pthread_cond_wait (&res->command_cond.wcond,
 						   &res->command_cond.mut);
 	}
 	RB_WRITE_DATA (res->command_queue, cmd, len);
-	pthread_cond_broadcast (&res->command_cond.cond);
+	pthread_cond_broadcast (&res->command_cond.rcond);
 	pthread_mutex_unlock (&res->command_cond.mut);
 }
 
@@ -284,11 +285,11 @@ qwaq_submit_result (qwaq_resources_t *res, const int *result, unsigned len)
 {
 	pthread_mutex_lock (&res->results_cond.mut);
 	while (RB_SPACE_AVAILABLE (res->results) < len) {
-		pthread_cond_wait (&res->results_cond.cond,
+		pthread_cond_wait (&res->results_cond.wcond,
 						   &res->results_cond.mut);
 	}
 	RB_WRITE_DATA (res->results, result, len);
-	pthread_cond_broadcast (&res->results_cond.cond);
+	pthread_cond_broadcast (&res->results_cond.rcond);
 	pthread_mutex_unlock (&res->results_cond.mut);
 }
 
@@ -298,11 +299,11 @@ qwaq_wait_result (qwaq_resources_t *res, int *result, int cmd, unsigned len)
 	pthread_mutex_lock (&res->results_cond.mut);
 	while (RB_DATA_AVAILABLE (res->results) < len
 		   || RB_PEEK_DATA (res->results, 0) != cmd) {
-		pthread_cond_wait (&res->results_cond.cond,
+		pthread_cond_wait (&res->results_cond.rcond,
 						   &res->results_cond.mut);
 	}
 	RB_READ_DATA (res->results, result, len);
-	pthread_cond_broadcast (&res->results_cond.cond);
+	pthread_cond_broadcast (&res->results_cond.wcond);
 	pthread_mutex_unlock (&res->results_cond.mut);
 }
 
@@ -636,7 +637,7 @@ process_commands (qwaq_resources_t *res)
 	pthread_mutex_lock (&res->command_cond.mut);
 	init_timeout (&timeout, 20 * 1000000);
 	while (RB_DATA_AVAILABLE (res->command_queue) < 2 && ret != ETIMEDOUT) {
-		ret = pthread_cond_timedwait (&res->command_cond.cond,
+		ret = pthread_cond_timedwait (&res->command_cond.rcond,
 									  &res->command_cond.mut, &timeout);
 	}
 	pthread_mutex_unlock (&res->command_cond.mut);
@@ -727,7 +728,7 @@ process_commands (qwaq_resources_t *res)
 		}
 		pthread_mutex_lock (&res->command_cond.mut);
 		RB_DROP_DATA (res->command_queue, len);
-		pthread_cond_broadcast (&res->command_cond.cond);
+		pthread_cond_broadcast (&res->command_cond.wcond);
 		pthread_mutex_unlock (&res->command_cond.mut);
 	}
 }
@@ -746,7 +747,7 @@ add_event (qwaq_resources_t *res, qwaq_event_t *event)
 		&& RB_PEEK_DATA(res->event_queue, last - 1).what == qe_mousemove) {
 		RB_POKE_DATA(res->event_queue, last - 1, *event);
 		merged = 1;
-		pthread_cond_broadcast (&res->event_cond.cond);
+		pthread_cond_broadcast (&res->event_cond.rcond);
 	}
 	pthread_mutex_unlock (&res->event_cond.mut);
 	if (merged) {
@@ -756,11 +757,11 @@ add_event (qwaq_resources_t *res, qwaq_event_t *event)
 	pthread_mutex_lock (&res->event_cond.mut);
 	init_timeout (&timeout, 5000 * 1000000L);
 	while (RB_SPACE_AVAILABLE (res->event_queue) < 1 && ret != ETIMEDOUT) {
-		ret = pthread_cond_timedwait (&res->event_cond.cond,
+		ret = pthread_cond_timedwait (&res->event_cond.wcond,
 									  &res->event_cond.mut, &timeout);
 	}
 	RB_WRITE_DATA (res->event_queue, event, 1);
-	pthread_cond_broadcast (&res->event_cond.cond);
+	pthread_cond_broadcast (&res->event_cond.rcond);
 	pthread_mutex_unlock (&res->event_cond.mut);
 }
 
@@ -773,7 +774,7 @@ get_event (qwaq_resources_t *res, qwaq_event_t *event)
 	pthread_mutex_lock (&res->event_cond.mut);
 	init_timeout (&timeout, 20 * 1000000);
 	while (RB_DATA_AVAILABLE (res->event_queue) < 1 && ret != ETIMEDOUT) {
-		ret = pthread_cond_timedwait (&res->event_cond.cond,
+		ret = pthread_cond_timedwait (&res->event_cond.rcond,
 									  &res->event_cond.mut, &timeout);
 	}
 	if (event) {
@@ -783,7 +784,7 @@ get_event (qwaq_resources_t *res, qwaq_event_t *event)
 			event->what = qe_none;
 		}
 	}
-	pthread_cond_broadcast (&res->event_cond.cond);
+	pthread_cond_broadcast (&res->event_cond.wcond);
 	pthread_mutex_lock (&res->event_cond.mut);
 	return ret != ETIMEDOUT;
 }
@@ -1891,7 +1892,8 @@ qwaq_print (const char *fmt, va_list args)
 static void
 qwaq_init_cond (cond_t *cond)
 {
-	pthread_cond_init (&cond->cond, 0);
+	pthread_cond_init (&cond->rcond, 0);
+	pthread_cond_init (&cond->wcond, 0);
 	pthread_mutex_init (&cond->mut, 0);
 }
 

From fb17f8093d82f30ada6b8f3db1c9456baa0c95c6 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 21 Mar 2020 12:02:35 +0900
Subject: [PATCH 0888/1519] [qwaq] Correct some queue test logic

This fixes the wedge during initial setup and drawing, but the program
deadlocks when processing input and there's an event.
---
 ruamoko/qwaq/qwaq-curses.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-curses.c b/ruamoko/qwaq/qwaq-curses.c
index 4fdc9e018..49d6c24e6 100644
--- a/ruamoko/qwaq/qwaq-curses.c
+++ b/ruamoko/qwaq/qwaq-curses.c
@@ -242,7 +242,7 @@ acquire_string (qwaq_resources_t *res)
 	int         string_id = -1;
 
 	pthread_mutex_lock (&res->string_id_cond.mut);
-	while (!RB_DATA_AVAILABLE (res->string_ids)) {
+	while (RB_DATA_AVAILABLE (res->string_ids) < 1) {
 		pthread_cond_wait (&res->string_id_cond.rcond,
 						   &res->string_id_cond.mut);
 	}
@@ -256,7 +256,7 @@ static void
 release_string (qwaq_resources_t *res, int string_id)
 {
 	pthread_mutex_lock (&res->string_id_cond.mut);
-	while (RB_SPACE_AVAILABLE (res->string_ids)) {
+	while (RB_SPACE_AVAILABLE (res->string_ids) < 1) {
 		pthread_cond_wait (&res->string_id_cond.wcond,
 						   &res->string_id_cond.mut);
 	}

From fb6883851d38d23d859e87d9f0a69f6671ccbf44 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 21 Mar 2020 12:46:22 +0900
Subject: [PATCH 0889/1519] [qwaq] Actually unlock the event queue mutex

And now everything works as well threaded as it did unthreaded.
---
 ruamoko/qwaq/qwaq-curses.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ruamoko/qwaq/qwaq-curses.c b/ruamoko/qwaq/qwaq-curses.c
index 49d6c24e6..9cc17ab6c 100644
--- a/ruamoko/qwaq/qwaq-curses.c
+++ b/ruamoko/qwaq/qwaq-curses.c
@@ -785,7 +785,7 @@ get_event (qwaq_resources_t *res, qwaq_event_t *event)
 		}
 	}
 	pthread_cond_broadcast (&res->event_cond.wcond);
-	pthread_mutex_lock (&res->event_cond.mut);
+	pthread_mutex_unlock (&res->event_cond.mut);
 	return ret != ETIMEDOUT;
 }
 

From ae70efcaf51c835e32e79e37f5ab0206b1ab2dba Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 21 Mar 2020 16:27:53 +0900
Subject: [PATCH 0890/1519] [qw] Clean up a comment

---
 qw/source/sv_sys_unix.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/qw/source/sv_sys_unix.c b/qw/source/sv_sys_unix.c
index 315fb02ff..b3781bf5b 100644
--- a/qw/source/sv_sys_unix.c
+++ b/qw/source/sv_sys_unix.c
@@ -138,8 +138,7 @@ main (int argc, const char **argv)
 
 		SV_Frame (time);
 
-		// extrasleep is just a way to generate a fucked up connection on
-		// purpose
+		// extrasleep is just a way to generate a bad connection on purpose
 		if (sys_extrasleep->int_val)
 			usleep (sys_extrasleep->int_val);
 	}

From 176cc7b9c1d07e3a3cb6c755cb8d213a5fa45009 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 21 Mar 2020 21:05:34 +0900
Subject: [PATCH 0891/1519] [qwaq] Make some improvements to mouse handling

This doesn't fix the problem of lost events: that seems to be inside
ncurses. I've done some investigations, and it seems xterm sends
separate events for motion and pre/release (which have current coords),
in both 1003 and 1006 modes. No idea what ncurses is doing (does it even
handle 1003 properly?), and it requires the use of xterm-1006 for it to
use 1006 mode (which is nice in that it disambiguates button releases
and allows for huge terminals (not that I would use such normally)).
Guess I've got some side-work cut out for me :P
---
 ruamoko/qwaq/event.h       | 10 +++++-
 ruamoko/qwaq/qwaq-curses.c | 65 ++++++++++++++++++++++++++++++--------
 2 files changed, 60 insertions(+), 15 deletions(-)

diff --git a/ruamoko/qwaq/event.h b/ruamoko/qwaq/event.h
index 03f479fdc..56327c42d 100644
--- a/ruamoko/qwaq/event.h
+++ b/ruamoko/qwaq/event.h
@@ -9,6 +9,14 @@ typedef enum {
 	qe_mouseauto = 0x0010,
 } qwaq_mouse_event;
 
+typedef enum {
+	qe_mouse1    = 0x0001,
+	qe_mouse2    = 0x0002,
+	qe_mouse3    = 0x0004,
+	qe_mouse4    = 0x0008,
+	qe_mouse5    = 0x0010,
+} qwaq_button;
+
 typedef enum {
 	qe_keydown   = 0x0020,
 } qwaq_key_event;
@@ -37,7 +45,7 @@ typedef enum {
 
 typedef struct qwaq_mevent_s {
 	int         x, y;
-	int         buttons;
+	qwaq_button buttons;	// current button state
 	int         click;
 } qwaq_mevent_t;
 
diff --git a/ruamoko/qwaq/qwaq-curses.c b/ruamoko/qwaq/qwaq-curses.c
index 9cc17ab6c..6ab3f6154 100644
--- a/ruamoko/qwaq/qwaq-curses.c
+++ b/ruamoko/qwaq/qwaq-curses.c
@@ -1,12 +1,12 @@
 /*
-	#FILENAME#
+	qwaq-curses.c
 
-	#DESCRIPTION#
+	Ruamoko ncurses wrapper using threading
 
-	Copyright (C) 2001 #AUTHOR#
+	Copyright (C) 2020 Bill Currie <bill@taniwha.org>
 
-	Author: #AUTHOR#
-	Date: #DATE#
+	Author: Bill Currie <bill@taniwha.org>
+	Date: 2020/03/01
 
 	This program is free software; you can redistribute it and/or
 	modify it under the terms of the GNU General Public License
@@ -54,8 +54,10 @@
 
 #define always_inline inline __attribute__((__always_inline__))
 #define QUEUE_SIZE 16
-#define MOUSE_MOVES_ON "\033[?1003h"// Make the terminal report mouse movements
-#define MOUSE_MOVES_OFF "\033[?1003l"// Make the terminal report mouse movements
+#define MOUSE_MOVES_ON "\033[?1003h"
+#define MOUSE_MOVES_OFF "\033[?1003l"
+#define SGR_ON "\033[?1006h"
+#define SGR_OFF "\033[?1006l"
 #define STRING_ID_QUEUE_SIZE 8		// must be > 1
 #define COMMAND_QUEUE_SIZE 1280
 #define CMD_SIZE(x) sizeof(x)/sizeof(x[0])
@@ -141,6 +143,7 @@ typedef struct qwaq_resources_s {
 	PR_RESMAP (panel_t) panel_map;
 	cond_t      event_cond;
 	RING_BUFFER (qwaq_event_t, QUEUE_SIZE) event_queue;
+	qwaq_button button_state;
 	cond_t      command_cond;
 	RING_BUFFER (int, COMMAND_QUEUE_SIZE) command_queue;
 	cond_t      results_cond;
@@ -820,36 +823,70 @@ static void
 mouse_event (qwaq_resources_t *res, const MEVENT *mevent)
 {
 	int         mask = mevent->bstate;
+	qwaq_button buttons = res->button_state;
 	qwaq_event_t event = {};
 
+	if (mevent->bstate & ~M_MOVE) {
+		mvprintw (1, 0, "%08x", mevent->bstate);
+		doupdate();
+	}
 	event.mouse.x = mevent->x;
 	event.mouse.y = mevent->y;
-	event.mouse.buttons = mevent->bstate;
 	if (mask & M_MOVE) {
 		event.what = qe_mousemove;
-		mask &= ~M_MOVE;
 	}
 	if (mask & M_PRESS) {
 		event.what = qe_mousedown;
-		mask &= ~M_PRESS;
+		if (mask & BUTTON1_PRESSED) {
+			buttons |= qe_mouse1;
+		}
+		if (mask & BUTTON2_PRESSED) {
+			buttons |= qe_mouse2;
+		}
+		if (mask & BUTTON3_PRESSED) {
+			buttons |= qe_mouse3;
+		}
+#if 0	// wheel events don't report release
+		if (mask & BUTTON4_PRESSED) {
+			buttons |= qe_mouse4;
+		}
+		if (mask & BUTTON5_PRESSED) {
+			buttons |= qe_mouse5;
+		}
+#endif
 	}
 	if (mask & M_RELEASE) {
 		event.what = qe_mouseup;
-		mask &= ~M_RELEASE;
+		if (mask & BUTTON1_RELEASED) {
+			buttons &= ~qe_mouse1;
+		}
+		if (mask & BUTTON2_RELEASED) {
+			buttons &= ~qe_mouse2;
+		}
+		if (mask & BUTTON3_RELEASED) {
+			buttons &= ~qe_mouse3;
+		}
+#if 0	// wheel events don't report release
+		if (mask & BUTTON4_RELEASED) {
+			buttons &= ~qe_mouse4;
+		}
+		if (mask & BUTTON5_RELEASED) {
+			buttons &= ~qe_mouse5;
+		}
+#endif
 	}
+	event.mouse.buttons = buttons;
+	res->button_state = buttons;
 	if (mask & M_CLICK) {
 		event.what = qe_mouseclick;
-		mask &= ~M_CLICK;
 		event.mouse.click = 1;
 	}
 	if (mask & M_DCLICK) {
 		event.what = qe_mouseclick;
-		mask &= ~M_DCLICK;
 		event.mouse.click = 2;
 	}
 	if (mask & M_TCLICK) {
 		event.what = qe_mouseclick;
-		mask &= ~M_TCLICK;
 		event.mouse.click = 3;
 	}
 	add_event (res, &event);

From 88b4046632feb42708c38d8b0c67c041d31e84e5 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 21 Mar 2020 22:24:11 +0900
Subject: [PATCH 0892/1519] [util] Pass a data pointer to shutdown functions

And clean up the mess.
---
 hw/source/master.c         | 4 ++--
 include/QF/sys.h           | 2 +-
 include/netchan.h          | 2 +-
 libs/util/sys.c            | 8 +++++---
 nq/include/host.h          | 2 +-
 nq/source/host.c           | 2 +-
 nq/source/sys_sdl.c        | 6 +++---
 nq/source/sys_unix.c       | 6 +++---
 nq/source/sys_unixd.c      | 6 +++---
 nq/source/sys_win.c        | 6 +++---
 nq/source/sys_wind.c       | 6 +++---
 qtv/source/qtv.c           | 4 ++--
 qtv/source/server.c        | 4 ++--
 qw/include/host.h          | 2 +-
 qw/include/server.h        | 2 +-
 qw/source/cl_main.c        | 2 +-
 qw/source/cl_sys_sdl.c     | 8 ++++----
 qw/source/cl_sys_unix.c    | 8 ++++----
 qw/source/cl_sys_win.c     | 8 ++++----
 qw/source/net_packetlog.c  | 4 ++--
 qw/source/sv_ccmds.c       | 2 +-
 qw/source/sv_main.c        | 4 ++--
 qw/source/sv_sys_unix.c    | 2 +-
 qw/source/sv_sys_win.c     | 2 +-
 ruamoko/qwaq/qwaq-bi.c     | 4 ++--
 ruamoko/qwaq/qwaq-curses.c | 4 ++--
 26 files changed, 56 insertions(+), 54 deletions(-)

diff --git a/hw/source/master.c b/hw/source/master.c
index 6e744c4ac..afa01cc2b 100644
--- a/hw/source/master.c
+++ b/hw/source/master.c
@@ -469,7 +469,7 @@ SV_WriteFilterList (void)
 }
 
 static void
-SV_Shutdown (void)
+SV_Shutdown (void *data)
 {
 	NET_Shutdown ();
 
@@ -525,7 +525,7 @@ main (int argc, const char **argv)
 
 	mst_cbuf = Cbuf_New (&id_interp);
 
-	Sys_RegisterShutdown (SV_Shutdown);
+	Sys_RegisterShutdown (SV_Shutdown, 0);
 
 	Sys_Init ();
 
diff --git a/include/QF/sys.h b/include/QF/sys.h
index 06e2590fa..a1a5402c7 100644
--- a/include/QF/sys.h
+++ b/include/QF/sys.h
@@ -77,7 +77,7 @@ void Sys_Error (const char *error, ...) __attribute__((format(printf,1,2), noret
 void Sys_FatalError (const char *error, ...) __attribute__((format(printf,1,2), noreturn));
 void Sys_Quit (void) __attribute__((noreturn));
 void Sys_Shutdown (void);
-void Sys_RegisterShutdown (void (*func) (void));
+void Sys_RegisterShutdown (void (*func) (void *), void *data);
 int64_t Sys_LongTime (void);
 double Sys_DoubleTime (void);
 void Sys_TimeOfDay(date_t *date);
diff --git a/include/netchan.h b/include/netchan.h
index d811ba913..cfdcf1066 100644
--- a/include/netchan.h
+++ b/include/netchan.h
@@ -70,7 +70,7 @@ void Log_Incoming_Packet (const byte *p, int len, int has_sequence,
 						  int is_server);
 void Log_Outgoing_Packet (const byte *p, int len, int has_sequence,
 						  int is_server);
-void Net_LogStop (void);
+void Net_LogStop (void *data);
 void Analyze_Client_Packet (const byte * data, int len, int has_sequence);
 void Analyze_Server_Packet (const byte * data, int len, int has_sequence);
 
diff --git a/libs/util/sys.c b/libs/util/sys.c
index 811cac886..de1cb35d8 100644
--- a/libs/util/sys.c
+++ b/libs/util/sys.c
@@ -105,7 +105,8 @@ static sys_printf_t sys_err_printf_function = Sys_ErrPrintf;
 
 typedef struct shutdown_list_s {
 	struct shutdown_list_s *next;
-	void (*func)(void);
+	void      (*func) (void *);
+	void       *data;
 } shutdown_list_t;
 
 typedef struct error_handler_s {
@@ -492,7 +493,7 @@ Sys_Shutdown (void)
 	shutdown_list_t *t;
 
 	while (shutdown_list) {
-		shutdown_list->func ();
+		shutdown_list->func (shutdown_list->data);
 		t = shutdown_list;
 		shutdown_list = shutdown_list->next;
 		free (t);
@@ -571,7 +572,7 @@ Sys_Error (const char *error, ...)
 }
 
 VISIBLE void
-Sys_RegisterShutdown (void (*func) (void))
+Sys_RegisterShutdown (void (*func) (void *), void *data)
 {
 	shutdown_list_t *p;
 	if (!func)
@@ -580,6 +581,7 @@ Sys_RegisterShutdown (void (*func) (void))
 	if (!p)
 		Sys_Error ("Sys_RegisterShutdown: insufficient memory");
 	p->func = func;
+	p->data = data;
 	p->next = shutdown_list;
 	shutdown_list = p;
 }
diff --git a/nq/include/host.h b/nq/include/host.h
index 8601ea4c2..9300abbfe 100644
--- a/nq/include/host.h
+++ b/nq/include/host.h
@@ -61,7 +61,7 @@ void Host_ClearMemory (void);
 void Host_ServerFrame (void);
 void Host_InitCommands (void);
 void Host_Init (void);
-void Host_Shutdown(void);
+void Host_Shutdown(void *data);
 void Host_Error (const char *error, ...) __attribute__((format(printf,1,2), noreturn));
 void Host_EndGame (const char *message, ...) __attribute__((format(printf,1,2), noreturn));
 void Host_Frame (float time);
diff --git a/nq/source/host.c b/nq/source/host.c
index 67b55507b..c08a4c093 100644
--- a/nq/source/host.c
+++ b/nq/source/host.c
@@ -957,7 +957,7 @@ Host_Init (void)
 	better to run quit through here before final handoff to the sys code.
 */
 void
-Host_Shutdown (void)
+Host_Shutdown (void *data)
 {
 	static qboolean isdown = false;
 
diff --git a/nq/source/sys_sdl.c b/nq/source/sys_sdl.c
index 3f4fa726e..37ff959aa 100644
--- a/nq/source/sys_sdl.c
+++ b/nq/source/sys_sdl.c
@@ -85,7 +85,7 @@ startup (void)
 }
 
 static void
-shutdown_f (void)
+shutdown_f (void *data)
 {
 #ifndef _WIN32
 	// change stdin to blocking
@@ -113,8 +113,8 @@ SDL_main (int argc, char *argv[])
 
 	isDedicated = (COM_CheckParm ("-dedicated") != 0);
 
-	Sys_RegisterShutdown (Host_Shutdown);
-	Sys_RegisterShutdown (shutdown_f);
+	Sys_RegisterShutdown (Host_Shutdown, 0);
+	Sys_RegisterShutdown (shutdown_f, 0);
 
 	Host_Init ();
 
diff --git a/nq/source/sys_unix.c b/nq/source/sys_unix.c
index ec21a1d7b..2803d31f6 100644
--- a/nq/source/sys_unix.c
+++ b/nq/source/sys_unix.c
@@ -55,7 +55,7 @@
 qboolean    isDedicated = false;
 
 static void
-shutdown_f (void)
+shutdown_f (void *data)
 {
 	// change stdin to blocking
 	fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~O_NONBLOCK);
@@ -75,8 +75,8 @@ main (int argc, const char **argv)
 
 	isDedicated = (COM_CheckParm ("-dedicated") != 0);
 
-	Sys_RegisterShutdown (Host_Shutdown);
-	Sys_RegisterShutdown (shutdown_f);
+	Sys_RegisterShutdown (Host_Shutdown, 0);
+	Sys_RegisterShutdown (shutdown_f, 0);
 
 	Host_Init ();
 
diff --git a/nq/source/sys_unixd.c b/nq/source/sys_unixd.c
index 55d956268..f9ff4ca74 100644
--- a/nq/source/sys_unixd.c
+++ b/nq/source/sys_unixd.c
@@ -53,7 +53,7 @@
 qboolean    isDedicated = true;
 
 static void
-shutdown_f (void)
+shutdown_f (void *data)
 {
 	// change stdin to blocking
 	fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~O_NONBLOCK);
@@ -86,8 +86,8 @@ main (int argc, const char **argv)
 	host_parms.argc = com_argc;
 	host_parms.argv = com_argv;
 
-	Sys_RegisterShutdown (Host_Shutdown);
-	Sys_RegisterShutdown (shutdown_f);
+	Sys_RegisterShutdown (Host_Shutdown, 0);
+	Sys_RegisterShutdown (shutdown_f, 0);
 
 	Host_Init ();
 
diff --git a/nq/source/sys_win.c b/nq/source/sys_win.c
index 421690748..e4593ffd0 100644
--- a/nq/source/sys_win.c
+++ b/nq/source/sys_win.c
@@ -104,7 +104,7 @@ startup (void)
 }
 
 static void
-shutdown_f (void)
+shutdown_f (void *data)
 {
 	if (tevent)
 		CloseHandle (tevent);
@@ -207,8 +207,8 @@ WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine,
 	if (!isDedicated)
 		init_handles (hInstance);
 
-	Sys_RegisterShutdown (Host_Shutdown);
-	Sys_RegisterShutdown (shutdown_f);
+	Sys_RegisterShutdown (Host_Shutdown, 0);
+	Sys_RegisterShutdown (shutdown_f, 0);
 
 	Host_Init ();
 
diff --git a/nq/source/sys_wind.c b/nq/source/sys_wind.c
index b38461448..b0555ec43 100644
--- a/nq/source/sys_wind.c
+++ b/nq/source/sys_wind.c
@@ -39,7 +39,7 @@
 qboolean    isDedicated = true;
 
 static void
-shutdown_f (void)
+shutdown_f (void *data)
 {
 }
 
@@ -69,8 +69,8 @@ main (int argc, const char **argv)
 	host_parms.argc = com_argc;
 	host_parms.argv = com_argv;
 
-	Sys_RegisterShutdown (Host_Shutdown);
-	Sys_RegisterShutdown (shutdown_f);
+	Sys_RegisterShutdown (Host_Shutdown, 0);
+	Sys_RegisterShutdown (shutdown_f, 0);
 
 	Host_Init ();
 
diff --git a/qtv/source/qtv.c b/qtv/source/qtv.c
index 4980dea9b..1274254d5 100644
--- a/qtv/source/qtv.c
+++ b/qtv/source/qtv.c
@@ -220,7 +220,7 @@ qtv_memory_init (void)
 }
 
 static void
-qtv_shutdown (void)
+qtv_shutdown (void *data)
 {
 	NET_Shutdown ();
 	Con_Shutdown ();
@@ -253,7 +253,7 @@ qtv_init (void)
 	qtv_cbuf = Cbuf_New (&id_interp);
 	qtv_args = Cbuf_ArgsNew ();
 
-	Sys_RegisterShutdown (qtv_shutdown);
+	Sys_RegisterShutdown (qtv_shutdown, 0);
 
 	Sys_Init ();
 	COM_ParseConfig ();
diff --git a/qtv/source/server.c b/qtv/source/server.c
index c664f36e4..c36465d31 100644
--- a/qtv/source/server.c
+++ b/qtv/source/server.c
@@ -508,7 +508,7 @@ sv_list_f (void)
 }
 
 static void
-server_shutdown (void)
+server_shutdown (void *data)
 {
 	Hash_FlushTable (server_hash);
 	Hash_DelTable (server_hash);
@@ -540,7 +540,7 @@ server_run (server_t *sv)
 void
 Server_Init (void)
 {
-	Sys_RegisterShutdown (server_shutdown);
+	Sys_RegisterShutdown (server_shutdown, 0);
 	server_hash = Hash_NewTable (61, server_get_key, server_free, 0);
 	Cmd_AddCommand ("sv_new", sv_new_f, "Add a new server");
 	Cmd_AddCommand ("sv_del", sv_del_f, "Remove an existing server");
diff --git a/qw/include/host.h b/qw/include/host.h
index 0c1492f47..27ad77325 100644
--- a/qw/include/host.h
+++ b/qw/include/host.h
@@ -50,7 +50,7 @@ extern int		host_framecount;	// incremented every frame, never reset
 void Host_ServerFrame (void);
 void Host_InitCommands (void);
 void Host_Init (void);
-void Host_Shutdown(void);
+void Host_Shutdown(void *data);
 void Host_Error (const char *error, ...) __attribute__((format(printf,1,2), noreturn));
 void Host_EndGame (const char *message, ...) __attribute__((format(printf,1,2), noreturn));
 void Host_Frame (float time);
diff --git a/qw/include/server.h b/qw/include/server.h
index abc5fdd9d..b32a46c63 100644
--- a/qw/include/server.h
+++ b/qw/include/server.h
@@ -488,7 +488,7 @@ client_t *SV_AllocClient (int spectator, int server);
 void SV_SavePenaltyFilter (client_t *cl, filtertype_t type, double pentime);
 double SV_RestorePenaltyFilter (client_t *cl, filtertype_t type);
 
-void SV_Shutdown (void);
+void SV_Shutdown (void *data);
 void SV_Frame (float time);
 void SV_FinalMessage (const char *message);
 void SV_DropClient (client_t *drop);
diff --git a/qw/source/cl_main.c b/qw/source/cl_main.c
index aa223736f..b78038ca9 100644
--- a/qw/source/cl_main.c
+++ b/qw/source/cl_main.c
@@ -1867,7 +1867,7 @@ Host_Init (void)
 }
 
 void
-Host_Shutdown (void)
+Host_Shutdown (void *data)
 {
 	static qboolean isdown = false;
 
diff --git a/qw/source/cl_sys_sdl.c b/qw/source/cl_sys_sdl.c
index 75f7c0024..79357134a 100644
--- a/qw/source/cl_sys_sdl.c
+++ b/qw/source/cl_sys_sdl.c
@@ -93,7 +93,7 @@ startup (void)
 }
 
 static void
-shutdown_f (void)
+shutdown_f (void *data)
 {
 #ifndef _WIN32
 	// change stdin to blocking
@@ -122,9 +122,9 @@ SDL_main (int argc, char *argv[])
 	if (!COM_CheckParm ("-noconinput"))
 		fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) | O_NONBLOCK);
 #endif
-	Sys_RegisterShutdown (Host_Shutdown);
-	Sys_RegisterShutdown (Net_LogStop);
-	Sys_RegisterShutdown (shutdown_f);
+	Sys_RegisterShutdown (Host_Shutdown, 0);
+	Sys_RegisterShutdown (Net_LogStop, 0);
+	Sys_RegisterShutdown (shutdown_f, 0);
 
 	Host_Init ();
 
diff --git a/qw/source/cl_sys_unix.c b/qw/source/cl_sys_unix.c
index 05aedf9ff..4c7071ba2 100644
--- a/qw/source/cl_sys_unix.c
+++ b/qw/source/cl_sys_unix.c
@@ -52,7 +52,7 @@
 #include "netchan.h"
 
 static void
-shutdown_f (void)
+shutdown_f (void *data)
 {
 	// change stdin to blocking
 	fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~O_NONBLOCK);
@@ -73,9 +73,9 @@ main (int argc, const char **argv)
 	if (!COM_CheckParm ("-noconinput"))
 		fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) | O_NONBLOCK);
 
-	Sys_RegisterShutdown (Host_Shutdown);
-	Sys_RegisterShutdown (Net_LogStop);
-	Sys_RegisterShutdown (shutdown_f);
+	Sys_RegisterShutdown (Host_Shutdown, 0);
+	Sys_RegisterShutdown (Net_LogStop, 0);
+	Sys_RegisterShutdown (shutdown_f, 0);
 
 	Host_Init ();
 
diff --git a/qw/source/cl_sys_win.c b/qw/source/cl_sys_win.c
index 44d7c8afb..388166e7a 100644
--- a/qw/source/cl_sys_win.c
+++ b/qw/source/cl_sys_win.c
@@ -93,7 +93,7 @@ startup (void)
 }
 
 static void
-shutdown_f (void)
+shutdown_f (void *data)
 {
 	if (tevent)
 		CloseHandle (tevent);
@@ -181,9 +181,9 @@ WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine,
 	if (!tevent)
 		Sys_Error ("Couldn't create event");
 
-	Sys_RegisterShutdown (Host_Shutdown);
-	Sys_RegisterShutdown (Net_LogStop);
-	Sys_RegisterShutdown (shutdown_f);
+	Sys_RegisterShutdown (Host_Shutdown, 0);
+	Sys_RegisterShutdown (Net_LogStop, 0);
+	Sys_RegisterShutdown (shutdown_f, 0);
 
 	Host_Init ();
 
diff --git a/qw/source/net_packetlog.c b/qw/source/net_packetlog.c
index 3ec8078e5..189c6fefe 100644
--- a/qw/source/net_packetlog.c
+++ b/qw/source/net_packetlog.c
@@ -177,7 +177,7 @@ Net_LogStart (const char *fname)
 }
 
 void
-Net_LogStop (void)
+Net_LogStop (void *data)
 {
 	if (Net_PacketLog)
 		Qclose (Net_PacketLog);
@@ -954,7 +954,7 @@ Net_PacketLog_f (cvar_t *var)
 	if (var->int_val) {
 		Net_LogStart ("qfpacket.log");
 	} else {
-		Net_LogStop ();
+		Net_LogStop (0);
 	}
 }
 
diff --git a/qw/source/sv_ccmds.c b/qw/source/sv_ccmds.c
index 318a2edaf..93c5247f6 100644
--- a/qw/source/sv_ccmds.c
+++ b/qw/source/sv_ccmds.c
@@ -223,7 +223,7 @@ SV_Restart_f (void)
 							  net_message->message->data);
 	}
 	Sys_Printf ("Shutting down: server restart, shell must relaunch server\n");
-	SV_Shutdown ();
+	SV_Shutdown (0);
 	// Error code 2 on exit, indication shell must restart the server
 	exit (2);
 }
diff --git a/qw/source/sv_main.c b/qw/source/sv_main.c
index d764c012f..56d135e16 100644
--- a/qw/source/sv_main.c
+++ b/qw/source/sv_main.c
@@ -237,7 +237,7 @@ Master_Shutdown (void)
 	Quake calls this before calling Sys_Quit or Sys_Error
 */
 void
-SV_Shutdown (void)
+SV_Shutdown (void *data)
 {
 	Master_Shutdown ();
 	if (sv_fraglogfile) {
@@ -2486,7 +2486,7 @@ SV_Init (void)
 	sv_cbuf = Cbuf_New (&id_interp);
 	sv_args = Cbuf_ArgsNew ();
 
-	Sys_RegisterShutdown (SV_Shutdown);
+	Sys_RegisterShutdown (SV_Shutdown, 0);
 
 	Sys_Init ();
 	GIB_Init (true);
diff --git a/qw/source/sv_sys_unix.c b/qw/source/sv_sys_unix.c
index b3781bf5b..24b3adb4b 100644
--- a/qw/source/sv_sys_unix.c
+++ b/qw/source/sv_sys_unix.c
@@ -122,7 +122,7 @@ main (int argc, const char **argv)
 
 	SV_Init ();
 
-	Sys_RegisterShutdown (Net_LogStop);
+	Sys_RegisterShutdown (Net_LogStop, 0);
 
 	// run one frame immediately for first heartbeat
 	SV_Frame (0.1);
diff --git a/qw/source/sv_sys_win.c b/qw/source/sv_sys_win.c
index 4397f5d92..52f3b230a 100644
--- a/qw/source/sv_sys_win.c
+++ b/qw/source/sv_sys_win.c
@@ -93,7 +93,7 @@ main (int argc, const char **argv)
 	if (WinNT)
 		Cvar_Set (sys_sleep, "0");
 
-	Sys_RegisterShutdown (Net_LogStop);
+	Sys_RegisterShutdown (Net_LogStop, 0);
 
 	// run one frame immediately for first heartbeat
 	SV_Frame (0.1);
diff --git a/ruamoko/qwaq/qwaq-bi.c b/ruamoko/qwaq/qwaq-bi.c
index 7e21a9259..82bce4996 100644
--- a/ruamoko/qwaq/qwaq-bi.c
+++ b/ruamoko/qwaq/qwaq-bi.c
@@ -159,7 +159,7 @@ static builtin_t builtins[] = {
 };
 
 static void
-bi_shutdown (void)
+bi_shutdown (void *data)
 {
 	S_Shutdown ();
 	IN_Shutdown ();
@@ -177,7 +177,7 @@ BI_Init (progs_t *pr)
 	PI_Init ();
 	PI_RegisterPlugins (client_plugin_list);
 
-	Sys_RegisterShutdown (bi_shutdown);
+	Sys_RegisterShutdown (bi_shutdown, 0);
 
 	VID_Init_Cvars ();
 	IN_Init_Cvars ();
diff --git a/ruamoko/qwaq/qwaq-curses.c b/ruamoko/qwaq/qwaq-curses.c
index 6ab3f6154..27306fc28 100644
--- a/ruamoko/qwaq/qwaq-curses.c
+++ b/ruamoko/qwaq/qwaq-curses.c
@@ -921,7 +921,7 @@ process_input (qwaq_resources_t *res)
 
 static int need_endwin;
 static void
-bi_shutdown (void)
+bi_shutdown (void *_pr)
 {
 	if (need_endwin) {
 		write(1, MOUSE_MOVES_OFF, sizeof (MOUSE_MOVES_OFF) - 1);
@@ -1950,7 +1950,7 @@ BI_Init (progs_t *pr)
 
 	PR_Resources_Register (pr, "qwaq", res, bi_qwaq_clear);
 	PR_RegisterBuiltins (pr, builtins);
-	Sys_RegisterShutdown (bi_shutdown);
+	Sys_RegisterShutdown (bi_shutdown, pr);
 	logfile = fopen ("qwaq-curses.log", "wt");
 	Sys_SetStdPrintf (qwaq_print);
 }

From d3527496668029ad7f194d0ce25ee16ef4f0d8f7 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 22 Mar 2020 01:00:05 +0900
Subject: [PATCH 0893/1519] [qwaq] Bypass ncurses for input handling

For now, only 1003 mouse mode is supported, and function keys are not
yet supported, but the mouse is much more reliable: no lost events.
---
 ruamoko/qwaq/Makefile.am   |   2 +-
 ruamoko/qwaq/event.h       |  11 +-
 ruamoko/qwaq/qwaq-curses.c | 228 +++----------------------------------
 ruamoko/qwaq/qwaq-curses.h |  65 +++++++++++
 ruamoko/qwaq/qwaq-input.c  | 226 ++++++++++++++++++++++++++++++++++++
 ruamoko/qwaq/qwaq.h        |   1 +
 6 files changed, 313 insertions(+), 220 deletions(-)
 create mode 100644 ruamoko/qwaq/qwaq-input.c

diff --git a/ruamoko/qwaq/Makefile.am b/ruamoko/qwaq/Makefile.am
index 683a0923c..df02f64ab 100644
--- a/ruamoko/qwaq/Makefile.am
+++ b/ruamoko/qwaq/Makefile.am
@@ -37,7 +37,7 @@ qwaq_app_dat_src= \
 	qwaq-window.r
 
 qwaq_curses_libs=
-qwaq_curses_SOURCES=main.c qwaq-curses.c
+qwaq_curses_SOURCES=main.c qwaq-curses.c qwaq-input.c
 qwaq_curses_LDADD= $(qwaq_curses_libs) $(QWAQ_LIBS) \
 				$(PANEL_LIBS) $(CURSES_LIBS) $(PTHREAD_LDFLAGS) $(DL_LIBS)
 qwaq_curses_LDFLAGS=
diff --git a/ruamoko/qwaq/event.h b/ruamoko/qwaq/event.h
index 56327c42d..f1d9e6fbb 100644
--- a/ruamoko/qwaq/event.h
+++ b/ruamoko/qwaq/event.h
@@ -9,14 +9,6 @@ typedef enum {
 	qe_mouseauto = 0x0010,
 } qwaq_mouse_event;
 
-typedef enum {
-	qe_mouse1    = 0x0001,
-	qe_mouse2    = 0x0002,
-	qe_mouse3    = 0x0004,
-	qe_mouse4    = 0x0008,
-	qe_mouse5    = 0x0010,
-} qwaq_button;
-
 typedef enum {
 	qe_keydown   = 0x0020,
 } qwaq_key_event;
@@ -45,7 +37,7 @@ typedef enum {
 
 typedef struct qwaq_mevent_s {
 	int         x, y;
-	qwaq_button buttons;	// current button state
+	int         buttons;	// current button state
 	int         click;
 } qwaq_mevent_t;
 
@@ -55,6 +47,7 @@ typedef struct qwaq_message_s {
 
 typedef struct qwaq_event_s {
 	int         what;
+	double      when;		// NOTE: 1<<32 based
 	union {
 		int         key;
 		qwaq_mevent_t mouse;
diff --git a/ruamoko/qwaq/qwaq-curses.c b/ruamoko/qwaq/qwaq-curses.c
index 27306fc28..23f216353 100644
--- a/ruamoko/qwaq/qwaq-curses.c
+++ b/ruamoko/qwaq/qwaq-curses.c
@@ -47,19 +47,11 @@
 #include "QF/sys.h"
 
 #include "qwaq.h"
-#include "event.h"
 #include "qwaq-curses.h"
 #include "qwaq-rect.h"
 #include "qwaq-textcontext.h"
 
 #define always_inline inline __attribute__((__always_inline__))
-#define QUEUE_SIZE 16
-#define MOUSE_MOVES_ON "\033[?1003h"
-#define MOUSE_MOVES_OFF "\033[?1003l"
-#define SGR_ON "\033[?1006h"
-#define SGR_OFF "\033[?1006l"
-#define STRING_ID_QUEUE_SIZE 8		// must be > 1
-#define COMMAND_QUEUE_SIZE 1280
 #define CMD_SIZE(x) sizeof(x)/sizeof(x[0])
 
 typedef enum qwaq_commands_e {
@@ -120,39 +112,6 @@ static const char *qwaq_command_names[]= {
 	"mvwblit_line",
 };
 
-typedef struct window_s {
-	WINDOW     *win;
-} window_t;
-
-typedef struct panel_s {
-	PANEL      *panel;
-	int         window_id;
-} panel_t;
-
-typedef struct cond_s {
-	pthread_cond_t rcond;
-	pthread_cond_t wcond;
-	pthread_mutex_t mut;
-} cond_t;
-
-typedef struct qwaq_resources_s {
-	progs_t    *pr;
-	int         initialized;
-	window_t    stdscr;
-	PR_RESMAP (window_t) window_map;
-	PR_RESMAP (panel_t) panel_map;
-	cond_t      event_cond;
-	RING_BUFFER (qwaq_event_t, QUEUE_SIZE) event_queue;
-	qwaq_button button_state;
-	cond_t      command_cond;
-	RING_BUFFER (int, COMMAND_QUEUE_SIZE) command_queue;
-	cond_t      results_cond;
-	RING_BUFFER (int, COMMAND_QUEUE_SIZE) results;
-	cond_t      string_id_cond;
-	RING_BUFFER (int, STRING_ID_QUEUE_SIZE) string_ids;
-	dstring_t   strings[STRING_ID_QUEUE_SIZE - 1];
-} qwaq_resources_t;
-
 static window_t *
 window_new (qwaq_resources_t *res)
 {
@@ -320,7 +279,7 @@ cmd_newwin (qwaq_resources_t *res)
 
 	window_t   *window = window_new (res);
 	window->win = newwin (ylen, xlen, ypos, xpos);
-	keypad (window->win, TRUE);
+	keypad (window->win, FALSE);	// do it ourselves
 
 	int         window_id = window_index (res, window);
 	int         cmd_result[] = { qwaq_cmd_newwin, window_id };
@@ -615,8 +574,8 @@ dump_command (qwaq_resources_t *res, int len)
 	}
 }
 
-static void
-init_timeout (struct timespec *timeout, long time)
+void
+qwaq_init_timeout (struct timespec *timeout, long time)
 {
 	#define SEC 1000000000
 	struct timeval now;
@@ -638,7 +597,7 @@ process_commands (qwaq_resources_t *res)
 	int         ret = 0;
 
 	pthread_mutex_lock (&res->command_cond.mut);
-	init_timeout (&timeout, 20 * 1000000);
+	qwaq_init_timeout (&timeout, 20 * 1000000);
 	while (RB_DATA_AVAILABLE (res->command_queue) < 2 && ret != ETIMEDOUT) {
 		ret = pthread_cond_timedwait (&res->command_cond.rcond,
 									  &res->command_cond.mut, &timeout);
@@ -736,38 +695,6 @@ process_commands (qwaq_resources_t *res)
 	}
 }
 
-static void
-add_event (qwaq_resources_t *res, qwaq_event_t *event)
-{
-	struct timespec timeout;
-	int         merged = 0;
-	int         ret = 0;
-
-	// merge motion events
-	pthread_mutex_lock (&res->event_cond.mut);
-	unsigned    last = RB_DATA_AVAILABLE (res->event_queue);
-	if (event->what == qe_mousemove && last > 1
-		&& RB_PEEK_DATA(res->event_queue, last - 1).what == qe_mousemove) {
-		RB_POKE_DATA(res->event_queue, last - 1, *event);
-		merged = 1;
-		pthread_cond_broadcast (&res->event_cond.rcond);
-	}
-	pthread_mutex_unlock (&res->event_cond.mut);
-	if (merged) {
-		return;
-	}
-
-	pthread_mutex_lock (&res->event_cond.mut);
-	init_timeout (&timeout, 5000 * 1000000L);
-	while (RB_SPACE_AVAILABLE (res->event_queue) < 1 && ret != ETIMEDOUT) {
-		ret = pthread_cond_timedwait (&res->event_cond.wcond,
-									  &res->event_cond.mut, &timeout);
-	}
-	RB_WRITE_DATA (res->event_queue, event, 1);
-	pthread_cond_broadcast (&res->event_cond.rcond);
-	pthread_mutex_unlock (&res->event_cond.mut);
-}
-
 static int
 get_event (qwaq_resources_t *res, qwaq_event_t *event)
 {
@@ -775,7 +702,7 @@ get_event (qwaq_resources_t *res, qwaq_event_t *event)
 	int         ret = 0;
 
 	pthread_mutex_lock (&res->event_cond.mut);
-	init_timeout (&timeout, 20 * 1000000);
+	qwaq_init_timeout (&timeout, 20 * 1000000);
 	while (RB_DATA_AVAILABLE (res->event_queue) < 1 && ret != ETIMEDOUT) {
 		ret = pthread_cond_timedwait (&res->event_cond.rcond,
 									  &res->event_cond.mut, &timeout);
@@ -792,139 +719,15 @@ get_event (qwaq_resources_t *res, qwaq_event_t *event)
 	return ret != ETIMEDOUT;
 }
 
-#define M_MOVE REPORT_MOUSE_POSITION
-#define M_PRESS (  BUTTON1_PRESSED \
-				 | BUTTON2_PRESSED \
-				 | BUTTON3_PRESSED \
-				 | BUTTON4_PRESSED \
-				 | BUTTON5_PRESSED)
-#define M_RELEASE (  BUTTON1_RELEASED \
-				   | BUTTON2_RELEASED \
-				   | BUTTON3_RELEASED \
-				   | BUTTON4_RELEASED \
-				   | BUTTON5_RELEASED)
-#define M_CLICK (  BUTTON1_CLICKED \
-				 | BUTTON2_CLICKED \
-				 | BUTTON3_CLICKED \
-				 | BUTTON4_CLICKED \
-				 | BUTTON5_CLICKED)
-#define M_DCLICK (  BUTTON1_DOUBLE_CLICKED \
-				  | BUTTON2_DOUBLE_CLICKED \
-				  | BUTTON3_DOUBLE_CLICKED \
-				  | BUTTON4_DOUBLE_CLICKED \
-				  | BUTTON5_DOUBLE_CLICKED)
-#define M_TCLICK (  BUTTON1_TRIPLE_CLICKED \
-				  | BUTTON2_TRIPLE_CLICKED \
-				  | BUTTON3_TRIPLE_CLICKED \
-				  | BUTTON4_TRIPLE_CLICKED \
-				  | BUTTON5_TRIPLE_CLICKED)
-
-static void
-mouse_event (qwaq_resources_t *res, const MEVENT *mevent)
-{
-	int         mask = mevent->bstate;
-	qwaq_button buttons = res->button_state;
-	qwaq_event_t event = {};
-
-	if (mevent->bstate & ~M_MOVE) {
-		mvprintw (1, 0, "%08x", mevent->bstate);
-		doupdate();
-	}
-	event.mouse.x = mevent->x;
-	event.mouse.y = mevent->y;
-	if (mask & M_MOVE) {
-		event.what = qe_mousemove;
-	}
-	if (mask & M_PRESS) {
-		event.what = qe_mousedown;
-		if (mask & BUTTON1_PRESSED) {
-			buttons |= qe_mouse1;
-		}
-		if (mask & BUTTON2_PRESSED) {
-			buttons |= qe_mouse2;
-		}
-		if (mask & BUTTON3_PRESSED) {
-			buttons |= qe_mouse3;
-		}
-#if 0	// wheel events don't report release
-		if (mask & BUTTON4_PRESSED) {
-			buttons |= qe_mouse4;
-		}
-		if (mask & BUTTON5_PRESSED) {
-			buttons |= qe_mouse5;
-		}
-#endif
-	}
-	if (mask & M_RELEASE) {
-		event.what = qe_mouseup;
-		if (mask & BUTTON1_RELEASED) {
-			buttons &= ~qe_mouse1;
-		}
-		if (mask & BUTTON2_RELEASED) {
-			buttons &= ~qe_mouse2;
-		}
-		if (mask & BUTTON3_RELEASED) {
-			buttons &= ~qe_mouse3;
-		}
-#if 0	// wheel events don't report release
-		if (mask & BUTTON4_RELEASED) {
-			buttons &= ~qe_mouse4;
-		}
-		if (mask & BUTTON5_RELEASED) {
-			buttons &= ~qe_mouse5;
-		}
-#endif
-	}
-	event.mouse.buttons = buttons;
-	res->button_state = buttons;
-	if (mask & M_CLICK) {
-		event.what = qe_mouseclick;
-		event.mouse.click = 1;
-	}
-	if (mask & M_DCLICK) {
-		event.what = qe_mouseclick;
-		event.mouse.click = 2;
-	}
-	if (mask & M_TCLICK) {
-		event.what = qe_mouseclick;
-		event.mouse.click = 3;
-	}
-	add_event (res, &event);
-}
-
-static void
-key_event (qwaq_resources_t *res, int key)
-{
-	qwaq_event_t event = {};
-	event.what = qe_keydown;
-	event.key = key;
-	add_event (res, &event);
-}
-
-static void
-process_input (qwaq_resources_t *res)
-{
-	if (Sys_CheckInput (1, -1)) {
-		int         ch;
-		while ((ch = getch ()) != ERR && ch) {
-			fflush (stderr);
-			if (ch == KEY_MOUSE) {
-				MEVENT    mevent;
-				getmouse (&mevent);
-				mouse_event (res, &mevent);
-			} else {
-				key_event (res, ch);
-			}
-		}
-	}
-}
-
 static int need_endwin;
 static void
 bi_shutdown (void *_pr)
 {
+	__auto_type pr = (progs_t *) _pr;
+	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
+
 	if (need_endwin) {
-		write(1, MOUSE_MOVES_OFF, sizeof (MOUSE_MOVES_OFF) - 1);
+		qwaq_input_shutdown (res);
 		endwin ();
 	}
 }
@@ -1598,7 +1401,7 @@ qwaq_curses_thread (qwaq_thread_t *thread)
 
 	while (1) {
 		process_commands (res);
-		process_input (res);
+		qwaq_process_input (res);
 	}
 	thread->return_code = 0;
 	return thread;
@@ -1614,12 +1417,12 @@ bi_initialize (progs_t *pr)
 	res->initialized = 1;
 	start_color ();
 	raw ();
-	keypad (stdscr, TRUE);
+	keypad (stdscr, FALSE);	// do it ourselves
 	noecho ();
 	nonl ();
 	nodelay (stdscr, TRUE);
 	mousemask(ALL_MOUSE_EVENTS | REPORT_MOUSE_POSITION, NULL);
-	write(1, MOUSE_MOVES_ON, sizeof (MOUSE_MOVES_ON) - 1);
+	qwaq_input_init (res);
 	refresh();
 
 	res->stdscr.win = stdscr;
@@ -1844,7 +1647,7 @@ bi_qwaq_clear (progs_t *pr, void *data)
 	__auto_type res = (qwaq_resources_t *) data;
 
 	if (res->initialized) {
-		write(1, MOUSE_MOVES_OFF, sizeof (MOUSE_MOVES_OFF) - 1);
+		qwaq_input_shutdown (res);
 		endwin ();
 	}
 	need_endwin = 0;
@@ -1939,10 +1742,15 @@ BI_Init (progs_t *pr)
 {
 	qwaq_resources_t *res = calloc (sizeof (*res), 1);
 	res->pr = pr;
+
 	for (int i = 0; i < STRING_ID_QUEUE_SIZE - 1; i++) {
 		RB_WRITE_DATA (res->string_ids, &i, 1);
 		res->strings[i].mem = &dstring_default_mem;
 	}
+	res->escbuff.mem = &dstring_default_mem;
+	// ensure the backing buffer exists
+	dstring_clearstr (&res->escbuff);
+
 	qwaq_init_cond (&res->event_cond);
 	qwaq_init_cond (&res->command_cond);
 	qwaq_init_cond (&res->results_cond);
diff --git a/ruamoko/qwaq/qwaq-curses.h b/ruamoko/qwaq/qwaq-curses.h
index 6d0c43df2..9bc5c1d2d 100644
--- a/ruamoko/qwaq/qwaq-curses.h
+++ b/ruamoko/qwaq/qwaq-curses.h
@@ -130,6 +130,71 @@ typedef struct panel_s *panel_t;
 @extern Rect getwrect (struct window_s *window);
 
 @extern void printf(string fmt, ...);
+// qfcc stuff
+#else
+// gcc stuff
+
+#include <curses.h>
+#include <panel.h>
+
+#include "QF/dstring.h"
+#include "QF/progs.h"
+#include "QF/ringbuffer.h"
+
+#define QUEUE_SIZE 16
+#define STRING_ID_QUEUE_SIZE 8		// must be > 1
+#define COMMAND_QUEUE_SIZE 1280
+
+typedef struct window_s {
+	WINDOW     *win;
+} window_t;
+
+typedef struct panel_s {
+	PANEL      *panel;
+	int         window_id;
+} panel_t;
+
+typedef struct cond_s {
+	pthread_cond_t rcond;
+	pthread_cond_t wcond;
+	pthread_mutex_t mut;
+} cond_t;
+
+typedef enum {
+	esc_ground,
+	esc_escape,
+	esc_csi,
+	esc_mouse,
+	esc_sgr,
+} esc_state_t;
+
+typedef struct qwaq_resources_s {
+	progs_t    *pr;
+	int         initialized;
+	window_t    stdscr;
+	PR_RESMAP (window_t) window_map;
+	PR_RESMAP (panel_t) panel_map;
+	cond_t      event_cond;
+	RING_BUFFER (qwaq_event_t, QUEUE_SIZE) event_queue;
+	cond_t      command_cond;
+	RING_BUFFER (int, COMMAND_QUEUE_SIZE) command_queue;
+	cond_t      results_cond;
+	RING_BUFFER (int, COMMAND_QUEUE_SIZE) results;
+	cond_t      string_id_cond;
+	RING_BUFFER (int, STRING_ID_QUEUE_SIZE) string_ids;
+	dstring_t   strings[STRING_ID_QUEUE_SIZE - 1];
+
+	dstring_t   escbuff;
+	esc_state_t escstate;
+	unsigned    button_state;
+	qwaq_event_t lastClick;
+} qwaq_resources_t;
+// gcc stuff
+
+void qwaq_input_init (qwaq_resources_t *res);
+void qwaq_input_shutdown (qwaq_resources_t *res);
+void qwaq_process_input (qwaq_resources_t *res);
+void qwaq_init_timeout (struct timespec *timeout, long time);
 #endif
 
 #endif//__qwaq_curses_h
diff --git a/ruamoko/qwaq/qwaq-input.c b/ruamoko/qwaq/qwaq-input.c
new file mode 100644
index 000000000..2875e44f6
--- /dev/null
+++ b/ruamoko/qwaq/qwaq-input.c
@@ -0,0 +1,226 @@
+/*
+	qwaq-input.c
+
+	Input handling
+
+	Copyright (C) 2020 Bill Currie <bill@taniwha.org>
+
+	Author: Bill Currie <bill@taniwha.org>
+	Date: 2020/03/21
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <errno.h>
+#include <pthread.h>
+#include <stdio.h>
+#include <string.h>
+#include <termios.h>
+#include <unistd.h>
+
+#include "QF/dstring.h"
+#include "QF/sys.h"
+
+#include "qwaq.h"
+#include "event.h"
+#include "qwaq-curses.h"
+
+#define always_inline inline __attribute__((__always_inline__))
+
+#define MOUSE_MOVES_ON "\033[?1003h"
+#define MOUSE_MOVES_OFF "\033[?1003l"
+#define SGR_ON "\033[?1006h"
+#define SGR_OFF "\033[?1006l"
+#define WHEEL_BUTTONS 0x7c	// scroll up/down/left/right - always click
+
+static void
+add_event (qwaq_resources_t *res, qwaq_event_t *event)
+{
+	struct timespec timeout;
+	int         merged = 0;
+	int         ret = 0;
+
+	// merge motion events
+	pthread_mutex_lock (&res->event_cond.mut);
+	unsigned    last = RB_DATA_AVAILABLE (res->event_queue);
+	if (event->what == qe_mousemove && last > 1
+		&& RB_PEEK_DATA(res->event_queue, last - 1).what == qe_mousemove) {
+		RB_POKE_DATA(res->event_queue, last - 1, *event);
+		merged = 1;
+		pthread_cond_broadcast (&res->event_cond.rcond);
+	}
+	pthread_mutex_unlock (&res->event_cond.mut);
+	if (merged) {
+		return;
+	}
+
+	pthread_mutex_lock (&res->event_cond.mut);
+	qwaq_init_timeout (&timeout, 5000 * 1000000L);
+	while (RB_SPACE_AVAILABLE (res->event_queue) < 1 && ret != ETIMEDOUT) {
+		ret = pthread_cond_timedwait (&res->event_cond.wcond,
+									  &res->event_cond.mut, &timeout);
+	}
+	RB_WRITE_DATA (res->event_queue, event, 1);
+	pthread_cond_broadcast (&res->event_cond.rcond);
+	pthread_mutex_unlock (&res->event_cond.mut);
+}
+
+static void
+key_event (qwaq_resources_t *res, int key)
+{
+	qwaq_event_t event = {};
+	event.what = qe_keydown;
+	event.when = Sys_DoubleTime ();
+	event.key = key;
+	add_event (res, &event);
+}
+
+static void
+mouse_event (qwaq_resources_t *res, int what, int x, int y)
+{
+	qwaq_event_t event = {};
+
+	event.what = what;
+	event.when = Sys_DoubleTime ();
+	event.mouse.x = x;
+	event.mouse.y = y;
+	event.mouse.buttons = res->button_state;
+
+	if (event.what == qe_mousedown) {
+		if (event.when - res->lastClick.when <= 0.4
+			&& res->lastClick.mouse.buttons == event.mouse.buttons
+			&& res->lastClick.mouse.click < 3) {
+			event.mouse.click = res->lastClick.mouse.click + 1;
+			event.what = qe_mouseclick;
+		}
+		res->lastClick = event;
+	} else if (event.what == qe_mouseclick) {
+		// scroll button event, so always single click
+		event.mouse.click = 1;
+	}
+	add_event (res, &event);
+}
+
+static void
+parse_mouse (qwaq_resources_t *res)
+{
+	int         x = (byte) res->escbuff.str[1] - '!';	// want 0-based
+	int         y = (byte) res->escbuff.str[2] - '!';	// want 0-based
+	unsigned    ctrl = (byte) res->escbuff.str[0] - ' ';
+	int         button = ctrl & 3;
+	int         ext = (ctrl >> 6);
+	int         what = qe_none;
+
+	if (ctrl & 0x20) {
+		// motion-only event
+		button = -1;
+		what = qe_mousemove;
+	} else {
+		// xterm doesn't send release events for buttons 4-7
+		res->button_state &= ~(0x7c);
+		if (!ext && button == 3) {
+			res->button_state = 0;	// unknown which button was released
+			button = -1;
+			what = qe_mouseup;
+		} else {
+			if (ext) {
+				button += 4 * ext - 1;
+			}
+			res->button_state |= 1 << button;
+			if (res->button_state & WHEEL_BUTTONS) {
+				what = qe_mouseclick;
+			} else {
+				what = qe_mousedown;
+			}
+		}
+	}
+	Sys_Printf ("%3d %3d %02x %03x %02x %2d\n", x, y, ctrl, res->button_state,
+				ext, button + 1);
+
+	mouse_event (res, what, x, y);
+}
+
+static void process_char (qwaq_resources_t *res, char ch)
+{
+	if (ch == 0x1b) {
+		// always reset if escape is seen, may be a desync
+		res->escstate = esc_escape;
+	} else {
+		switch (res->escstate) {
+			case esc_ground:
+				key_event (res, (byte) ch);
+				break;
+			case esc_escape:
+				if (ch == '[') {
+					res->escstate = esc_csi;
+				}
+				break;
+			case esc_csi:
+				if (ch == 'M') {
+					res->escstate = esc_mouse;
+					dstring_clear (&res->escbuff);
+				}
+				break;
+			case esc_mouse:
+				dstring_append (&res->escbuff, &ch, 1);
+				if (res->escbuff.size == 3) {
+					parse_mouse (res);
+					res->escstate = esc_ground;
+				}
+				break;
+			case esc_sgr:
+				break;
+		}
+		//printf("res->escstate %d\n", res->escstate);
+	}
+}
+
+void qwaq_input_init (qwaq_resources_t *res)
+{
+	// ncurses takes care of input mode for us, so need only tell xterm
+	// what we need
+	write(1, MOUSE_MOVES_ON, sizeof (MOUSE_MOVES_ON) - 1);
+//	write(1, SGR_ON, sizeof (SGR_ON) - 1);
+}
+
+void qwaq_input_shutdown (qwaq_resources_t *res)
+{
+	// ncurses takes care of input mode for us, so need only tell xterm
+	// what we need
+//	write(1, SGR_OFF, sizeof (SGR_OFF) - 1);
+	write(1, MOUSE_MOVES_OFF, sizeof (MOUSE_MOVES_OFF) - 1);
+}
+
+void qwaq_process_input (qwaq_resources_t *res)
+{
+	char        buf[256];
+	int         len;
+
+	while (Sys_CheckInput (1, -1)) {
+		len = read(0, buf, sizeof (buf));
+		//Sys_Printf ("%.*s\n", len-1, buf+1);
+		for (int i = 0; i < len; i++) {
+			process_char (res, buf[i]);
+		}
+	}
+}
diff --git a/ruamoko/qwaq/qwaq.h b/ruamoko/qwaq/qwaq.h
index f0974e61c..3172cd7f7 100644
--- a/ruamoko/qwaq/qwaq.h
+++ b/ruamoko/qwaq/qwaq.h
@@ -2,6 +2,7 @@
 #define __qwaq_h
 
 #include "QF/darray.h"
+#include "QF/progs.h"
 
 typedef struct qwaq_thread_s {
 	pthread_t   thread_id;

From 9ce64a5cfb20cf69824cf59e1429989bd2c5706f Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 22 Mar 2020 01:14:57 +0900
Subject: [PATCH 0894/1519] [build] Fix curses.h header check

---
 config.d/curses.m4 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/config.d/curses.m4 b/config.d/curses.m4
index 073e98217..02d9ce7f4 100644
--- a/config.d/curses.m4
+++ b/config.d/curses.m4
@@ -2,7 +2,9 @@ AC_ARG_ENABLE(curses,
 [  --disable-curses        disable curses support]
 )
 if test "x$enable_curses" != "xno"; then
-	AC_CHECK_HEADER(curses.h)
+	AC_CHECK_HEADER([curses.h],
+					[AC_DEFINE([HAVE_CURSES_H], [1],
+						[Define to 1 if you have <curses.h>.])])
 	AC_CHECK_LIB(ncurses, initscr,
 		CURSES_LIBS=-lncurses,
 		AC_CHECK_LIB(pdcurses, initscr,

From 243840daa7d8f1ed0da9edb0ea6afa6bd17780a3 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 22 Mar 2020 02:44:33 +0900
Subject: [PATCH 0895/1519] [qwaq] Support sgr mouse reports

Now buttons 12+ work (in theory, I have only 12 so can't test higher),
and button release is no longer ambiguous.
---
 ruamoko/qwaq/qwaq-input.c | 67 +++++++++++++++++++++++++++++----------
 1 file changed, 50 insertions(+), 17 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-input.c b/ruamoko/qwaq/qwaq-input.c
index 2875e44f6..f101036f5 100644
--- a/ruamoko/qwaq/qwaq-input.c
+++ b/ruamoko/qwaq/qwaq-input.c
@@ -31,6 +31,7 @@
 # include "config.h"
 #endif
 
+#include <ctype.h>
 #include <errno.h>
 #include <pthread.h>
 #include <stdio.h>
@@ -122,11 +123,8 @@ mouse_event (qwaq_resources_t *res, int what, int x, int y)
 }
 
 static void
-parse_mouse (qwaq_resources_t *res)
+parse_mouse (qwaq_resources_t *res, unsigned ctrl, int x, int y, int cmd)
 {
-	int         x = (byte) res->escbuff.str[1] - '!';	// want 0-based
-	int         y = (byte) res->escbuff.str[2] - '!';	// want 0-based
-	unsigned    ctrl = (byte) res->escbuff.str[0] - ' ';
 	int         button = ctrl & 3;
 	int         ext = (ctrl >> 6);
 	int         what = qe_none;
@@ -137,8 +135,8 @@ parse_mouse (qwaq_resources_t *res)
 		what = qe_mousemove;
 	} else {
 		// xterm doesn't send release events for buttons 4-7
-		res->button_state &= ~(0x7c);
-		if (!ext && button == 3) {
+		res->button_state &= ~(0x78);
+		if (!ext && button == 3 && !cmd) {
 			res->button_state = 0;	// unknown which button was released
 			button = -1;
 			what = qe_mouseup;
@@ -146,20 +144,42 @@ parse_mouse (qwaq_resources_t *res)
 			if (ext) {
 				button += 4 * ext - 1;
 			}
-			res->button_state |= 1 << button;
-			if (res->button_state & WHEEL_BUTTONS) {
-				what = qe_mouseclick;
+			if (cmd == 'm') {
+				res->button_state &= ~(1 << button);
+				what = qe_mouseup;
 			} else {
-				what = qe_mousedown;
+				res->button_state |= 1 << button;
+				if (res->button_state & WHEEL_BUTTONS) {
+					what = qe_mouseclick;
+				} else {
+					what = qe_mousedown;
+				}
 			}
 		}
 	}
-	Sys_Printf ("%3d %3d %02x %03x %02x %2d\n", x, y, ctrl, res->button_state,
-				ext, button + 1);
-
 	mouse_event (res, what, x, y);
 }
 
+static void
+parse_x10 (qwaq_resources_t *res)
+{
+	int         x = (byte) res->escbuff.str[1] - '!';	// want 0-based
+	int         y = (byte) res->escbuff.str[2] - '!';	// want 0-based
+	unsigned    ctrl = (byte) res->escbuff.str[0] - ' ';
+
+	parse_mouse (res, ctrl, x, y, 0);
+}
+
+static void
+parse_sgr (qwaq_resources_t *res, char cmd)
+{
+	unsigned    ctrl, x, y;
+
+	sscanf (res->escbuff.str, "%u;%u;%u", &ctrl, &x, &y);
+	// mouse coords are 1-based, but want 0-based
+	parse_mouse (res, ctrl, x - 1, y - 1, cmd);
+}
+
 static void process_char (qwaq_resources_t *res, char ch)
 {
 	if (ch == 0x1b) {
@@ -179,16 +199,30 @@ static void process_char (qwaq_resources_t *res, char ch)
 				if (ch == 'M') {
 					res->escstate = esc_mouse;
 					dstring_clear (&res->escbuff);
+				} else if (ch == '<') {
+					res->escstate = esc_sgr;
+					dstring_clear (&res->escbuff);
+				} else {
+					res->escstate = esc_ground;
 				}
 				break;
 			case esc_mouse:
 				dstring_append (&res->escbuff, &ch, 1);
 				if (res->escbuff.size == 3) {
-					parse_mouse (res);
+					parse_x10 (res);
 					res->escstate = esc_ground;
 				}
 				break;
 			case esc_sgr:
+				if (isdigit (ch) || ch ==';') {
+					dstring_append (&res->escbuff, &ch, 1);
+				} else {
+					if (ch == 'm' || ch == 'M') {
+						dstring_append (&res->escbuff, "", 1);
+						parse_sgr (res, ch);
+					}
+					res->escstate = esc_ground;
+				}
 				break;
 		}
 		//printf("res->escstate %d\n", res->escstate);
@@ -200,14 +234,14 @@ void qwaq_input_init (qwaq_resources_t *res)
 	// ncurses takes care of input mode for us, so need only tell xterm
 	// what we need
 	write(1, MOUSE_MOVES_ON, sizeof (MOUSE_MOVES_ON) - 1);
-//	write(1, SGR_ON, sizeof (SGR_ON) - 1);
+	write(1, SGR_ON, sizeof (SGR_ON) - 1);
 }
 
 void qwaq_input_shutdown (qwaq_resources_t *res)
 {
 	// ncurses takes care of input mode for us, so need only tell xterm
 	// what we need
-//	write(1, SGR_OFF, sizeof (SGR_OFF) - 1);
+	write(1, SGR_OFF, sizeof (SGR_OFF) - 1);
 	write(1, MOUSE_MOVES_OFF, sizeof (MOUSE_MOVES_OFF) - 1);
 }
 
@@ -218,7 +252,6 @@ void qwaq_process_input (qwaq_resources_t *res)
 
 	while (Sys_CheckInput (1, -1)) {
 		len = read(0, buf, sizeof (buf));
-		//Sys_Printf ("%.*s\n", len-1, buf+1);
 		for (int i = 0; i < len; i++) {
 			process_char (res, buf[i]);
 		}

From 486728a4bd0114c5f8bcb073b7f70e7ce01a3a07 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 22 Mar 2020 08:35:37 +0900
Subject: [PATCH 0896/1519] [qwaq] Be a little paranoid about cond wait
 timeouts

I'd left qwaq-curses running overnight and found it locked up: both
threads were looping because pthread_cond_timedwait was returning
EINVAL. Thus bail if anything other than 0 is returned, and try to
ensure tv_nsec is in the range 0..999999999
---
 ruamoko/qwaq/qwaq-curses.c | 14 ++++++++------
 ruamoko/qwaq/qwaq-input.c  |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-curses.c b/ruamoko/qwaq/qwaq-curses.c
index 23f216353..a59e19ced 100644
--- a/ruamoko/qwaq/qwaq-curses.c
+++ b/ruamoko/qwaq/qwaq-curses.c
@@ -577,11 +577,11 @@ dump_command (qwaq_resources_t *res, int len)
 void
 qwaq_init_timeout (struct timespec *timeout, long time)
 {
-	#define SEC 1000000000
+	#define SEC 1000000000L
 	struct timeval now;
 	gettimeofday(&now, 0);
 	timeout->tv_sec = now.tv_sec;
-	timeout->tv_nsec = now.tv_usec * 1000 + time;
+	timeout->tv_nsec = now.tv_usec * 1000L + time;
 	if (timeout->tv_nsec > SEC) {
 		timeout->tv_sec += timeout->tv_nsec / SEC;
 		timeout->tv_nsec %= SEC;
@@ -598,7 +598,7 @@ process_commands (qwaq_resources_t *res)
 
 	pthread_mutex_lock (&res->command_cond.mut);
 	qwaq_init_timeout (&timeout, 20 * 1000000);
-	while (RB_DATA_AVAILABLE (res->command_queue) < 2 && ret != ETIMEDOUT) {
+	while (RB_DATA_AVAILABLE (res->command_queue) < 2 && ret == 0) {
 		ret = pthread_cond_timedwait (&res->command_cond.rcond,
 									  &res->command_cond.mut, &timeout);
 	}
@@ -700,23 +700,25 @@ get_event (qwaq_resources_t *res, qwaq_event_t *event)
 {
 	struct timespec timeout;
 	int         ret = 0;
+	int         was_event = 0;
 
 	pthread_mutex_lock (&res->event_cond.mut);
 	qwaq_init_timeout (&timeout, 20 * 1000000);
-	while (RB_DATA_AVAILABLE (res->event_queue) < 1 && ret != ETIMEDOUT) {
+	while (RB_DATA_AVAILABLE (res->event_queue) < 1 && ret == 0) {
 		ret = pthread_cond_timedwait (&res->event_cond.rcond,
 									  &res->event_cond.mut, &timeout);
 	}
 	if (event) {
-		if (ret != ETIMEDOUT) {
+		if (ret == 0) {
 			RB_READ_DATA (res->event_queue, event, 1);
+			was_event = 1;
 		} else {
 			event->what = qe_none;
 		}
 	}
 	pthread_cond_broadcast (&res->event_cond.wcond);
 	pthread_mutex_unlock (&res->event_cond.mut);
-	return ret != ETIMEDOUT;
+	return was_event;
 }
 
 static int need_endwin;
diff --git a/ruamoko/qwaq/qwaq-input.c b/ruamoko/qwaq/qwaq-input.c
index f101036f5..016f57aa0 100644
--- a/ruamoko/qwaq/qwaq-input.c
+++ b/ruamoko/qwaq/qwaq-input.c
@@ -77,7 +77,7 @@ add_event (qwaq_resources_t *res, qwaq_event_t *event)
 
 	pthread_mutex_lock (&res->event_cond.mut);
 	qwaq_init_timeout (&timeout, 5000 * 1000000L);
-	while (RB_SPACE_AVAILABLE (res->event_queue) < 1 && ret != ETIMEDOUT) {
+	while (RB_SPACE_AVAILABLE (res->event_queue) < 1 && ret == 0) {
 		ret = pthread_cond_timedwait (&res->event_cond.wcond,
 									  &res->event_cond.mut, &timeout);
 	}

From 275ed22362e946ef08306e3c9240e1262f7f851b Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 22 Mar 2020 08:40:51 +0900
Subject: [PATCH 0897/1519] [qwaq] Actually ensure tv_nsec is valid

While typing the previous message I thought to check my "carry" logic.
Sure enough, it was wrong... out by 1. I guess I won the threading
lottery :P
---
 ruamoko/qwaq/qwaq-curses.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ruamoko/qwaq/qwaq-curses.c b/ruamoko/qwaq/qwaq-curses.c
index a59e19ced..eb4be924b 100644
--- a/ruamoko/qwaq/qwaq-curses.c
+++ b/ruamoko/qwaq/qwaq-curses.c
@@ -582,7 +582,7 @@ qwaq_init_timeout (struct timespec *timeout, long time)
 	gettimeofday(&now, 0);
 	timeout->tv_sec = now.tv_sec;
 	timeout->tv_nsec = now.tv_usec * 1000L + time;
-	if (timeout->tv_nsec > SEC) {
+	if (timeout->tv_nsec >= SEC) {
 		timeout->tv_sec += timeout->tv_nsec / SEC;
 		timeout->tv_nsec %= SEC;
 	}

From 84cff64f992d5099a0c40fe5ad948f77fd772cf2 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 22 Mar 2020 11:18:44 +0900
Subject: [PATCH 0898/1519] Remove many key number hard-codings

I left the ones below 256 alone (some were necessary anyway), but above
256 they were almost entirely sequential, which rather defeats the
purpose of using an enum, especially since it makes it difficult to
expand sections.
---
 include/QF/keys.h | 126 +++++++++++++++++++++++-----------------------
 1 file changed, 63 insertions(+), 63 deletions(-)

diff --git a/include/QF/keys.h b/include/QF/keys.h
index 7c9c959fd..bdf32f6f0 100644
--- a/include/QF/keys.h
+++ b/include/QF/keys.h
@@ -227,77 +227,77 @@ typedef enum {
 
 	/* Numeric keypad */
 	QFK_KP0			= 256,
-	QFK_KP1			= 257,
-	QFK_KP2			= 258,
-	QFK_KP3			= 259,
-	QFK_KP4			= 260,
-	QFK_KP5			= 261,
-	QFK_KP6			= 262,
-	QFK_KP7			= 263,
-	QFK_KP8			= 264,
-	QFK_KP9			= 265,
-	QFK_KP_PERIOD		= 266,
-	QFK_KP_DIVIDE		= 267,
-	QFK_KP_MULTIPLY	= 268,
-	QFK_KP_MINUS		= 269,
-	QFK_KP_PLUS		= 270,
-	QFK_KP_ENTER		= 271,
-	QFK_KP_EQUALS		= 272,
+	QFK_KP1,
+	QFK_KP2,
+	QFK_KP3,
+	QFK_KP4,
+	QFK_KP5,
+	QFK_KP6,
+	QFK_KP7,
+	QFK_KP8,
+	QFK_KP9,
+	QFK_KP_PERIOD,
+	QFK_KP_DIVIDE,
+	QFK_KP_MULTIPLY,
+	QFK_KP_MINUS,
+	QFK_KP_PLUS,
+	QFK_KP_ENTER,
+	QFK_KP_EQUALS,
 
 	/* Arrows + Home/End pad */
-	QFK_UP			= 273,
-	QFK_DOWN			= 274,
-	QFK_RIGHT			= 275,
-	QFK_LEFT			= 276,
-	QFK_INSERT		= 277,
-	QFK_HOME			= 278,
-	QFK_END			= 279,
-	QFK_PAGEUP		= 280,
-	QFK_PAGEDOWN		= 281,
+	QFK_UP,
+	QFK_DOWN,
+	QFK_RIGHT,
+	QFK_LEFT,
+	QFK_INSERT,
+	QFK_HOME,
+	QFK_END,
+	QFK_PAGEUP,
+	QFK_PAGEDOWN,
 
 	/* Function keys */
-	QFK_F1			= 282,
-	QFK_F2			= 283,
-	QFK_F3			= 284,
-	QFK_F4			= 285,
-	QFK_F5			= 286,
-	QFK_F6			= 287,
-	QFK_F7			= 288,
-	QFK_F8			= 289,
-	QFK_F9			= 290,
-	QFK_F10			= 291,
-	QFK_F11			= 292,
-	QFK_F12			= 293,
-	QFK_F13			= 294,
-	QFK_F14			= 295,
-	QFK_F15			= 296,
+	QFK_F1,
+	QFK_F2,
+	QFK_F3,
+	QFK_F4,
+	QFK_F5,
+	QFK_F6,
+	QFK_F7,
+	QFK_F8,
+	QFK_F9,
+	QFK_F10,
+	QFK_F11,
+	QFK_F12,
+	QFK_F13,
+	QFK_F14,
+	QFK_F15,
 
 	/* Key state modifier keys */
-	QFK_NUMLOCK		= 300,
-	QFK_CAPSLOCK		= 301,
-	QFK_SCROLLOCK		= 302,
-	QFK_RSHIFT		= 303,
-	QFK_LSHIFT		= 304,
-	QFK_RCTRL			= 305,
-	QFK_LCTRL			= 306,
-	QFK_RALT			= 307,
-	QFK_LALT			= 308,
-	QFK_RMETA			= 309,
-	QFK_LMETA			= 310,
-	QFK_LSUPER		= 311,		/* Left "Windows" key */
-	QFK_RSUPER		= 312,		/* Right "Windows" key */
-	QFK_MODE			= 313,		/* "Alt Gr" key */
-	QFK_COMPOSE		= 314,		/* Multi-key compose key */
+	QFK_NUMLOCK,
+	QFK_CAPSLOCK,
+	QFK_SCROLLOCK,
+	QFK_RSHIFT,
+	QFK_LSHIFT,
+	QFK_RCTRL,
+	QFK_LCTRL,
+	QFK_RALT,
+	QFK_LALT,
+	QFK_RMETA,
+	QFK_LMETA,
+	QFK_LSUPER,		/* Left "Windows" key */
+	QFK_RSUPER,		/* Right "Windows" key */
+	QFK_MODE,		/* "Alt Gr" key */
+	QFK_COMPOSE,		/* Multi-key compose key */
 
 	/* Miscellaneous function keys */
-	QFK_HELP			= 315,
-	QFK_PRINT			= 316,
-	QFK_SYSREQ		= 317,
-	QFK_BREAK			= 318,
-	QFK_MENU			= 319,
-	QFK_POWER			= 320,		/* Power Macintosh power key */
-	QFK_EURO			= 321,		/* Some european keyboards */
-	QFK_UNDO			= 322,
+	QFK_HELP,
+	QFK_PRINT,
+	QFK_SYSREQ,
+	QFK_BREAK,
+	QFK_MENU,
+	QFK_POWER,		/* Power Macintosh power key */
+	QFK_EURO,		/* Some european keyboards */
+	QFK_UNDO,
 
 	/* Japanese keys */
 	QFK_KANJI,						/* Kanji, Kanji convert */

From 28f50d27191cd245715a19dde3067acc835077c6 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 22 Mar 2020 11:24:40 +0900
Subject: [PATCH 0899/1519] Add function key defs up to F48

This allows for the four combinations of shift and control. Not
bothering with alt because alt-f4 closes my xterm (bbkeys from the looks
of it: it grabs a bunch of Mod1-* keys).
---
 include/QF/keys.h         | 33 +++++++++++++++++++++++++++++++++
 libs/video/targets/keys.c | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 66 insertions(+)

diff --git a/include/QF/keys.h b/include/QF/keys.h
index bdf32f6f0..c8fe1cbe2 100644
--- a/include/QF/keys.h
+++ b/include/QF/keys.h
@@ -271,6 +271,39 @@ typedef enum {
 	QFK_F13,
 	QFK_F14,
 	QFK_F15,
+	QFK_F16,
+	QFK_F17,
+	QFK_F18,
+	QFK_F19,
+	QFK_F20,
+	QFK_F21,
+	QFK_F22,
+	QFK_F23,
+	QFK_F24,
+	QFK_F25,
+	QFK_F26,
+	QFK_F27,
+	QFK_F28,
+	QFK_F29,
+	QFK_F30,
+	QFK_F31,
+	QFK_F32,
+	QFK_F33,
+	QFK_F34,
+	QFK_F35,
+	QFK_F36,
+	QFK_F37,
+	QFK_F38,
+	QFK_F39,
+	QFK_F40,
+	QFK_F41,
+	QFK_F42,
+	QFK_F43,
+	QFK_F44,
+	QFK_F45,
+	QFK_F46,
+	QFK_F47,
+	QFK_F48,
 
 	/* Key state modifier keys */
 	QFK_NUMLOCK,
diff --git a/libs/video/targets/keys.c b/libs/video/targets/keys.c
index daa9eeda8..5d42aadd0 100644
--- a/libs/video/targets/keys.c
+++ b/libs/video/targets/keys.c
@@ -312,6 +312,39 @@ keyname_t   keynames[] = {
 	{ "K_F13",			QFK_F13 },
 	{ "K_F14",			QFK_F14 },
 	{ "K_F15",			QFK_F15 },
+	{ "K_F16",			QFK_F16 },
+	{ "K_F17",			QFK_F17 },
+	{ "K_F18",			QFK_F18 },
+	{ "K_F19",			QFK_F19 },
+	{ "K_F20",			QFK_F20 },
+	{ "K_F21",			QFK_F21 },
+	{ "K_F22",			QFK_F22 },
+	{ "K_F23",			QFK_F23 },
+	{ "K_F24",			QFK_F24 },
+	{ "K_F25",			QFK_F25 },
+	{ "K_F26",			QFK_F26 },
+	{ "K_F27",			QFK_F27 },
+	{ "K_F28",			QFK_F28 },
+	{ "K_F29",			QFK_F29 },
+	{ "K_F30",			QFK_F30 },
+	{ "K_F31",			QFK_F31 },
+	{ "K_F32",			QFK_F32 },
+	{ "K_F33",			QFK_F33 },
+	{ "K_F34",			QFK_F34 },
+	{ "K_F35",			QFK_F35 },
+	{ "K_F36",			QFK_F36 },
+	{ "K_F37",			QFK_F37 },
+	{ "K_F38",			QFK_F38 },
+	{ "K_F39",			QFK_F39 },
+	{ "K_F40",			QFK_F40 },
+	{ "K_F41",			QFK_F41 },
+	{ "K_F42",			QFK_F42 },
+	{ "K_F43",			QFK_F43 },
+	{ "K_F44",			QFK_F44 },
+	{ "K_F45",			QFK_F45 },
+	{ "K_F46",			QFK_F46 },
+	{ "K_F47",			QFK_F47 },
+	{ "K_F48",			QFK_F48 },
 	{ "K_NUMLOCK",		QFK_NUMLOCK },
 	{ "K_CAPSLOCK",		QFK_CAPSLOCK },
 	{ "K_SCROLLOCK",	QFK_SCROLLOCK },

From fc445827266fce1078e1ea074a9f90a61ac39f88 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 22 Mar 2020 13:47:44 +0900
Subject: [PATCH 0900/1519] [qwaq] Parse function keys

While the key escape sequences are xterm-specific, they are only the
default and preliminary provision has been made for overriding them.
However, no override mechanism has been implemented beyond using dynamic
table lookup.
---
 ruamoko/qwaq/Makefile.am   |  10 ++-
 ruamoko/qwaq/event.h       |   7 +-
 ruamoko/qwaq/main.c        |   2 +
 ruamoko/qwaq/qwaq-curses.h |   2 +
 ruamoko/qwaq/qwaq-input.c  | 174 ++++++++++++++++++++++++++++++++++++-
 5 files changed, 187 insertions(+), 8 deletions(-)

diff --git a/ruamoko/qwaq/Makefile.am b/ruamoko/qwaq/Makefile.am
index df02f64ab..f8e402e10 100644
--- a/ruamoko/qwaq/Makefile.am
+++ b/ruamoko/qwaq/Makefile.am
@@ -12,7 +12,7 @@ QFCC_DEP=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT)
 QFCC=$(top_builddir)/tools/qfcc/source/qfcc
 
 QCFLAGS=-qq -O -g -Werror
-QCPPFLAGS=--no-default-paths -I$(top_srcdir)/ruamoko/include
+QCPPFLAGS=--no-default-paths -I$(top_srcdir)/ruamoko/include -I$(top_srcdir)/include
 QCLINKFLAGS=--no-default-paths -L$(top_builddir)/ruamoko/lib
 QCOMPILE=$(QFCC) $(QCFLAGS) $(QCPPFLAGS)
 QLINK=$(QFCC) $(QCFLAGS) $(QCLINKFLAGS)
@@ -36,7 +36,11 @@ qwaq_app_dat_src= \
 	qwaq-view.r \
 	qwaq-window.r
 
-qwaq_curses_libs=
+#FIXME this coupling is horrible
+qwaq_curses_libs= \
+	$(top_builddir)/libs/video/targets/libvid_common.la \
+	$(top_builddir)/libs/console/libQFconsole.la \
+	$(top_builddir)/libs/gib/libQFgib.la
 qwaq_curses_SOURCES=main.c qwaq-curses.c qwaq-input.c
 qwaq_curses_LDADD= $(qwaq_curses_libs) $(QWAQ_LIBS) \
 				$(PANEL_LIBS) $(CURSES_LIBS) $(PTHREAD_LDFLAGS) $(DL_LIBS)
@@ -73,7 +77,7 @@ qwaq_app_dat_SOURCES=$(qwaq_app_dat_src)
 qwaq_app_obj=$(qwaq_app_dat_SOURCES:.r=.o)
 qwaq_app_dep=$(addprefix ./$(DEPDIR)/,$(qwaq_app_obj:.o=.Qo))
 qwaq-app.dat$(EXEEXT): $(qwaq_app_obj) $(QFCC_DEP)
-	$(QLINK) -o $@ $(qwaq_app_obj) -lr
+	$(QLINK) -o $@ $(qwaq_app_obj) -lcsqc -lr
 include $(qwaq_app_dep) # am--include-marker
 r_depfiles_remade += $(qwaq_app_dep)
 
diff --git a/ruamoko/qwaq/event.h b/ruamoko/qwaq/event.h
index f1d9e6fbb..89534f32a 100644
--- a/ruamoko/qwaq/event.h
+++ b/ruamoko/qwaq/event.h
@@ -41,6 +41,11 @@ typedef struct qwaq_mevent_s {
 	int         click;
 } qwaq_mevent_t;
 
+typedef struct qwaq_kevent_s {
+	int         code;
+	int         shift;
+} qwaq_kevent_t;
+
 typedef struct qwaq_message_s {
 	qwaq_command command;
 } qwaq_message_t;
@@ -49,7 +54,7 @@ typedef struct qwaq_event_s {
 	int         what;
 	double      when;		// NOTE: 1<<32 based
 	union {
-		int         key;
+		qwaq_kevent_t key;
 		qwaq_mevent_t mouse;
 		qwaq_message_t message;
 	};
diff --git a/ruamoko/qwaq/main.c b/ruamoko/qwaq/main.c
index 45da8847e..b9f0dd0e4 100644
--- a/ruamoko/qwaq/main.c
+++ b/ruamoko/qwaq/main.c
@@ -43,6 +43,7 @@
 #include "QF/cvar.h"
 #include "QF/gib.h"
 #include "QF/idparse.h"
+#include "QF/keys.h"
 #include "QF/progs.h"
 #include "QF/qargs.h"
 #include "QF/quakefs.h"
@@ -151,6 +152,7 @@ create_progs (void)
 	PR_Init_Cvars ();
 	PR_Init (pr);
 	RUA_Init (pr, 0);
+	Key_Progs_Init (pr);
 	PR_Cmds_Init (pr);
 	BI_Init (pr);
 
diff --git a/ruamoko/qwaq/qwaq-curses.h b/ruamoko/qwaq/qwaq-curses.h
index 9bc5c1d2d..55f121990 100644
--- a/ruamoko/qwaq/qwaq-curses.h
+++ b/ruamoko/qwaq/qwaq-curses.h
@@ -166,6 +166,7 @@ typedef enum {
 	esc_csi,
 	esc_mouse,
 	esc_sgr,
+	esc_key,
 } esc_state_t;
 
 typedef struct qwaq_resources_s {
@@ -188,6 +189,7 @@ typedef struct qwaq_resources_s {
 	esc_state_t escstate;
 	unsigned    button_state;
 	qwaq_event_t lastClick;
+	struct hashtab_s *key_sequences;
 } qwaq_resources_t;
 // gcc stuff
 
diff --git a/ruamoko/qwaq/qwaq-input.c b/ruamoko/qwaq/qwaq-input.c
index 016f57aa0..505ea4f8f 100644
--- a/ruamoko/qwaq/qwaq-input.c
+++ b/ruamoko/qwaq/qwaq-input.c
@@ -40,6 +40,8 @@
 #include <unistd.h>
 
 #include "QF/dstring.h"
+#include "QF/hash.h"
+#include "QF/keys.h"
 #include "QF/sys.h"
 
 #include "qwaq.h"
@@ -54,6 +56,112 @@
 #define SGR_OFF "\033[?1006l"
 #define WHEEL_BUTTONS 0x7c	// scroll up/down/left/right - always click
 
+typedef struct qwaq_key_s {
+	const char *sequence;
+	knum_t      key;
+	unsigned    shift;
+} qwaq_key_t;
+
+static qwaq_key_t default_keys[] = {
+	{ "\033OP",		QFK_F1  },
+	{ "\033OQ",		QFK_F2  },
+	{ "\033OR",		QFK_F3  },
+	{ "\033OS",		QFK_F4  },
+	{ "\033[15~",	QFK_F5  },
+	{ "\033[17~",	QFK_F6  },
+	{ "\033[18~",	QFK_F7  },
+	{ "\033[19~",	QFK_F8  },
+	{ "\033[20~",	QFK_F9  },
+	{ "\033[21~",	QFK_F10 },
+	{ "\033[23~",	QFK_F11 },
+	{ "\033[24~",	QFK_F12 },
+	// shift F1-F12
+	{ "\033[1;2P",	QFK_F13 },
+	{ "\033[1;2Q",	QFK_F14 },
+	{ "\033[1;2R",	QFK_F15 },
+	{ "\033[1;2S",	QFK_F16 },
+	{ "\033[15;2~",	QFK_F17 },
+	{ "\033[17;2~",	QFK_F18 },
+	{ "\033[18;2~",	QFK_F19 },
+	{ "\033[19;2~",	QFK_F20 },
+	{ "\033[20;2~",	QFK_F21 },
+	{ "\033[21;2~",	QFK_F22 },
+	{ "\033[23;2~",	QFK_F23 },
+	{ "\033[24;2~",	QFK_F24 },
+	// control F1-F12
+	{ "\033[1;5P",	QFK_F25 },
+	{ "\033[1;5Q",	QFK_F26 },
+	{ "\033[1;5R",	QFK_F27 },
+	{ "\033[1;5S",	QFK_F28 },
+	{ "\033[15;5~",	QFK_F29 },
+	{ "\033[17;5~",	QFK_F30 },
+	{ "\033[18;5~",	QFK_F31 },
+	{ "\033[19;5~",	QFK_F32 },
+	{ "\033[20;5~",	QFK_F33 },
+	{ "\033[21;5~",	QFK_F34 },
+	{ "\033[23;5~",	QFK_F35 },
+	{ "\033[24;5~",	QFK_F36 },
+	// shift control F1-F12
+	{ "\033[1;6P",	QFK_F37 },
+	{ "\033[1;6Q",	QFK_F38 },
+	{ "\033[1;6R",	QFK_F39 },
+	{ "\033[1;6S",	QFK_F40 },
+	{ "\033[15;6~",	QFK_F41 },
+	{ "\033[17;6~",	QFK_F42 },
+	{ "\033[18;6~",	QFK_F43 },
+	{ "\033[19;6~",	QFK_F44 },
+	{ "\033[20;6~",	QFK_F45 },
+	{ "\033[21;6~",	QFK_F46 },
+	{ "\033[23;6~",	QFK_F47 },
+	{ "\033[24;6~",	QFK_F48 },
+
+	{ "\033[2~",	QFK_INSERT,		0 },
+	{ "\033[3~",	QFK_DELETE,		0 },
+	{ "\033[H",		QFK_HOME,		0 },
+	{ "\033[F",		QFK_END,		0 },
+	{ "\033[5~",	QFK_PAGEUP,		0 },
+	{ "\033[6~",	QFK_PAGEDOWN,	0 },
+	{ "\033[A",		QFK_UP,			0 },
+	{ "\033[B",		QFK_DOWN,		0 },
+	{ "\033[C",		QFK_RIGHT,		0 },
+	{ "\033[D",		QFK_LEFT,		0 },
+	// shift
+	// there may be a setting to tell xterm to NOT act on shift ins/pgup/pgdn
+	{ "\033[2;2~",	QFK_INSERT,		1 },	// xterm gobbles (and pastes)
+	{ "\033[3;2~",	QFK_DELETE,		1 },
+	{ "\033[1;2H",	QFK_HOME,		1 },
+	{ "\033[1;2F",	QFK_END,		1 },
+	{ "\033[5;2~",	QFK_PAGEUP,		1 },	// xterm gobbles (scrolls term)
+	{ "\033[6;2~",	QFK_PAGEDOWN,	1 },	// xterm gobbles (scrolls term)
+	{ "\033[1;2A",	QFK_UP,			1 },
+	{ "\033[1;2B",	QFK_DOWN,		1 },
+	{ "\033[1;2C",	QFK_RIGHT,		1 },
+	{ "\033[1;2D",	QFK_LEFT,		1 },
+	{ "\033[Z",		QFK_TAB,		1 },
+	// control
+	{ "\033[2;5~",	QFK_INSERT,		4 },
+	{ "\033[3;5~",	QFK_DELETE,		4 },
+	{ "\033[1;5H",	QFK_HOME,		4 },
+	{ "\033[1;5F",	QFK_END,		4 },
+	{ "\033[5;5~",	QFK_PAGEUP,		4 },
+	{ "\033[6;5~",	QFK_PAGEDOWN,	4 },
+	{ "\033[1;5A",	QFK_UP,			4 },
+	{ "\033[1;5B",	QFK_DOWN,		4 },
+	{ "\033[1;5C",	QFK_RIGHT,		4 },
+	{ "\033[1;5D",	QFK_LEFT,		4 },
+	// shift control
+	{ "\033[2;6~",	QFK_INSERT,		5 },
+	{ "\033[3;6~",	QFK_DELETE,		5 },
+	{ "\033[1;6H",	QFK_HOME,		5 },
+	{ "\033[1;6F",	QFK_END,		5 },
+	{ "\033[5;6~",	QFK_PAGEUP,		5 },
+	{ "\033[6;6~",	QFK_PAGEDOWN,	5 },
+	{ "\033[1;6A",	QFK_UP,			5 },
+	{ "\033[1;6B",	QFK_DOWN,		5 },
+	{ "\033[1;6C",	QFK_RIGHT,		5 },
+	{ "\033[1;6D",	QFK_LEFT,		5 },
+};
+
 static void
 add_event (qwaq_resources_t *res, qwaq_event_t *event)
 {
@@ -87,12 +195,13 @@ add_event (qwaq_resources_t *res, qwaq_event_t *event)
 }
 
 static void
-key_event (qwaq_resources_t *res, int key)
+key_event (qwaq_resources_t *res, int key, unsigned shift)
 {
 	qwaq_event_t event = {};
 	event.what = qe_keydown;
 	event.when = Sys_DoubleTime ();
-	event.key = key;
+	event.key.code = key;
+	event.key.shift = shift;
 	add_event (res, &event);
 }
 
@@ -180,6 +289,19 @@ parse_sgr (qwaq_resources_t *res, char cmd)
 	parse_mouse (res, ctrl, x - 1, y - 1, cmd);
 }
 
+static void
+parse_key (qwaq_resources_t *res)
+{
+	qwaq_key_t *key = Hash_Find (res->key_sequences, res->escbuff.str);
+
+	Sys_Printf ("parse_key %s %p\n", res->escbuff.str + 1, key);
+	if (key) {
+		Sys_Printf ("    %d %03x %s\n", key->key, key->shift,
+					Key_KeynumToString (key->key));
+		key_event (res, key->key, key->shift);
+	}
+}
+
 static void process_char (qwaq_resources_t *res, char ch)
 {
 	if (ch == 0x1b) {
@@ -188,11 +310,19 @@ static void process_char (qwaq_resources_t *res, char ch)
 	} else {
 		switch (res->escstate) {
 			case esc_ground:
-				key_event (res, (byte) ch);
+				key_event (res, (byte) ch, 0);	// shift state unknown
 				break;
 			case esc_escape:
 				if (ch == '[') {
 					res->escstate = esc_csi;
+				} else if (ch == 'O') {
+					// will wind up accepting P;P... but meh
+					res->escstate = esc_key;
+					dstring_clear (&res->escbuff);
+					// start the buffer with what got us hear: eases key lookup
+					dstring_append (&res->escbuff, "\033O", 2);
+				} else {
+					res->escstate = esc_ground;
 				}
 				break;
 			case esc_csi:
@@ -202,6 +332,14 @@ static void process_char (qwaq_resources_t *res, char ch)
 				} else if (ch == '<') {
 					res->escstate = esc_sgr;
 					dstring_clear (&res->escbuff);
+				} else if (ch >= '0' && ch < 127) {
+					res->escstate = esc_key;
+					dstring_clear (&res->escbuff);
+					// start the buffer with what got us hear: eases key lookup
+					dstring_append (&res->escbuff, "\033[", 2);
+					// the csi code might be short (eg, \e[H for home) so
+					// need to check for end of string right away
+					goto esc_key_jump;
 				} else {
 					res->escstate = esc_ground;
 				}
@@ -214,23 +352,51 @@ static void process_char (qwaq_resources_t *res, char ch)
 				}
 				break;
 			case esc_sgr:
-				if (isdigit (ch) || ch ==';') {
+				if (isdigit (ch) || ch == ';') {
 					dstring_append (&res->escbuff, &ch, 1);
 				} else {
 					if (ch == 'm' || ch == 'M') {
+						// terminate the string
 						dstring_append (&res->escbuff, "", 1);
 						parse_sgr (res, ch);
 					}
 					res->escstate = esc_ground;
 				}
 				break;
+			case esc_key:
+esc_key_jump:
+				dstring_append (&res->escbuff, &ch, 1);
+				if (!isdigit (ch) && ch != ';') {
+					// terminate the string
+					dstring_append (&res->escbuff, "", 1);
+					// parse_key will sort out whether it was a valid sequence
+					parse_key (res);
+					res->escstate = esc_ground;
+				}
+				break;
 		}
 		//printf("res->escstate %d\n", res->escstate);
 	}
 }
 
+static const char *
+key_sequence_getkey (const void *_seq, void *unused)
+{
+	__auto_type seq = (const qwaq_key_t *) _seq;
+	return seq->sequence;
+}
+
 void qwaq_input_init (qwaq_resources_t *res)
 {
+	if (res->key_sequences) {
+		Hash_FlushTable (res->key_sequences);
+	} else {
+		res->key_sequences = Hash_NewTable (127, key_sequence_getkey, 0, 0);
+	}
+	for (size_t i = 0; i < sizeof (default_keys) / sizeof (default_keys[0]);
+		 i++) {
+		Hash_Add (res->key_sequences, &default_keys[i]);
+	}
 	// ncurses takes care of input mode for us, so need only tell xterm
 	// what we need
 	write(1, MOUSE_MOVES_ON, sizeof (MOUSE_MOVES_ON) - 1);

From 75f38f456bbdacf01d5b77b75108c78c25a53b52 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 22 Mar 2020 13:49:42 +0900
Subject: [PATCH 0901/1519] [qwaq] Fix a linker warning that had been hiding

---
 ruamoko/qwaq/main.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ruamoko/qwaq/main.c b/ruamoko/qwaq/main.c
index b9f0dd0e4..484618571 100644
--- a/ruamoko/qwaq/main.c
+++ b/ruamoko/qwaq/main.c
@@ -80,9 +80,11 @@ static QFile *
 open_file (const char *path, int *len)
 {
 	QFile      *file = Qopen (path, "rbz");
+	char        errbuff[1024];
 
 	if (!file) {
-		Sys_Printf ("%s\n", sys_errlist[errno]);
+		strerror_r(errno, errbuff, sizeof (errbuff));
+		Sys_Printf ("%s\n", errbuff);
 		return 0;
 	}
 	*len = Qfilesize (file);

From 50290baf048dd8bf2d6a274de4f94fa611188073 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 22 Mar 2020 13:54:54 +0900
Subject: [PATCH 0902/1519] [qwaq] Add missing part of commit

---
 ruamoko/qwaq/qwaq-app.r | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ruamoko/qwaq/qwaq-app.r b/ruamoko/qwaq/qwaq-app.r
index beeb02788..f2834b77e 100644
--- a/ruamoko/qwaq/qwaq-app.r
+++ b/ruamoko/qwaq/qwaq-app.r
@@ -131,7 +131,7 @@ arp_end (void)
 -handleEvent: (qwaq_event_t *) event
 {
 	[objects handleEvent: event];
-	if (event.what == qe_key && event.key == '\x18') {
+	if (event.what == qe_key && event.key.code == '\x18') {
 		event.what = qe_command;
 		event.message.command = qc_exit;
 	}

From 5cdd1931b7d9b5c3e2c63c73bd51f1ad2a2472a2 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 22 Mar 2020 13:56:31 +0900
Subject: [PATCH 0903/1519] [qwaq] Remove some debug

---
 ruamoko/qwaq/qwaq-input.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-input.c b/ruamoko/qwaq/qwaq-input.c
index 505ea4f8f..558744d81 100644
--- a/ruamoko/qwaq/qwaq-input.c
+++ b/ruamoko/qwaq/qwaq-input.c
@@ -294,10 +294,7 @@ parse_key (qwaq_resources_t *res)
 {
 	qwaq_key_t *key = Hash_Find (res->key_sequences, res->escbuff.str);
 
-	Sys_Printf ("parse_key %s %p\n", res->escbuff.str + 1, key);
 	if (key) {
-		Sys_Printf ("    %d %03x %s\n", key->key, key->shift,
-					Key_KeynumToString (key->key));
 		key_event (res, key->key, key->shift);
 	}
 }

From f3c68eaadacc13c7447f41d85369276af26e81d9 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 22 Mar 2020 14:06:27 +0900
Subject: [PATCH 0904/1519] Implement mouse auto events

These are for when a button is held down: good for scroll bar arrows
etc.
---
 ruamoko/qwaq/qwaq-button.r | 7 +++++--
 ruamoko/qwaq/qwaq-curses.c | 5 +++++
 ruamoko/qwaq/qwaq-curses.h | 2 ++
 ruamoko/qwaq/qwaq-input.c  | 2 ++
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-button.r b/ruamoko/qwaq/qwaq-button.r
index fe7aa5f2f..ab8477a8a 100644
--- a/ruamoko/qwaq/qwaq-button.r
+++ b/ruamoko/qwaq/qwaq-button.r
@@ -66,8 +66,11 @@
 				}
 				break;
 			case qe_mouseauto:
-				click = 0;
-				action = onAuto;
+				if (pressed
+					&& [self containsPoint: {event.mouse.x, event.mouse.y}]) {
+					click = 0;
+					action = onAuto;
+				}
 				break;
 		}
 		if (action) {
diff --git a/ruamoko/qwaq/qwaq-curses.c b/ruamoko/qwaq/qwaq-curses.c
index eb4be924b..3306af584 100644
--- a/ruamoko/qwaq/qwaq-curses.c
+++ b/ruamoko/qwaq/qwaq-curses.c
@@ -712,6 +712,11 @@ get_event (qwaq_resources_t *res, qwaq_event_t *event)
 		if (ret == 0) {
 			RB_READ_DATA (res->event_queue, event, 1);
 			was_event = 1;
+		} else if (res->button_state) {
+			event->what = qe_mouseauto;
+			event->mouse.buttons = res->button_state;
+			event->mouse.x = res->mouse_x;
+			event->mouse.y = res->mouse_y;
 		} else {
 			event->what = qe_none;
 		}
diff --git a/ruamoko/qwaq/qwaq-curses.h b/ruamoko/qwaq/qwaq-curses.h
index 55f121990..be87e6423 100644
--- a/ruamoko/qwaq/qwaq-curses.h
+++ b/ruamoko/qwaq/qwaq-curses.h
@@ -188,6 +188,8 @@ typedef struct qwaq_resources_s {
 	dstring_t   escbuff;
 	esc_state_t escstate;
 	unsigned    button_state;
+	int         mouse_x;
+	int         mouse_y;
 	qwaq_event_t lastClick;
 	struct hashtab_s *key_sequences;
 } qwaq_resources_t;
diff --git a/ruamoko/qwaq/qwaq-input.c b/ruamoko/qwaq/qwaq-input.c
index 558744d81..cab020328 100644
--- a/ruamoko/qwaq/qwaq-input.c
+++ b/ruamoko/qwaq/qwaq-input.c
@@ -266,6 +266,8 @@ parse_mouse (qwaq_resources_t *res, unsigned ctrl, int x, int y, int cmd)
 			}
 		}
 	}
+	res->mouse_x = x;
+	res->mouse_y = y;
 	mouse_event (res, what, x, y);
 }
 

From 63a2204fa594b09863fe8bab3dd440feb0d34552 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 22 Mar 2020 14:24:12 +0900
Subject: [PATCH 0905/1519] [qwaq] Fix incorrect mouse wheel bits

I thought I fixed that already (mistreating mouse 3 as part of the wheel
group).
---
 ruamoko/qwaq/qwaq-input.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ruamoko/qwaq/qwaq-input.c b/ruamoko/qwaq/qwaq-input.c
index cab020328..61d3b1208 100644
--- a/ruamoko/qwaq/qwaq-input.c
+++ b/ruamoko/qwaq/qwaq-input.c
@@ -54,7 +54,7 @@
 #define MOUSE_MOVES_OFF "\033[?1003l"
 #define SGR_ON "\033[?1006h"
 #define SGR_OFF "\033[?1006l"
-#define WHEEL_BUTTONS 0x7c	// scroll up/down/left/right - always click
+#define WHEEL_BUTTONS 0x78	// scroll up/down/left/right - always click
 
 typedef struct qwaq_key_s {
 	const char *sequence;

From 4dbf280012521e6bf6bc7d546cb35ce797ef1de1 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 22 Mar 2020 20:19:25 +0900
Subject: [PATCH 0906/1519] [util] Add a means to open a gap in a text buffer

for loading files into the buffer.
---
 include/QF/txtbuffer.h | 14 ++++++++++++++
 libs/util/txtbuffer.c  | 15 +++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/include/QF/txtbuffer.h b/include/QF/txtbuffer.h
index e73c7257a..8e4723fb9 100644
--- a/include/QF/txtbuffer.h
+++ b/include/QF/txtbuffer.h
@@ -59,6 +59,20 @@ txtbuffer_t *TextBuffer_Create (void);
 */
 void TextBuffer_Destroy (txtbuffer_t *buffer);
 
+/**	Open a gap for writing at the specified offset.
+
+	Text after the offset is moved to be after the opened gap.
+	The buffer is resized as necessary.
+
+	\param buffer	The buffer to be updated
+	\param offset	The offset in the buffer at which to insert the text block
+	\param text_len	The size of the gap to be opened
+	\return			Pointr to beginning of gap if successful, 0 if failure
+					(offset not valid or out of memory)
+*/
+char *TextBuffer_OpenGap (txtbuffer_t *buffer, size_t offset,
+						   size_t text_len);
+
 /**	Insert a block of text at the specified offset.
 
 	Text after the offset is moved to be after the inserted block of text.
diff --git a/libs/util/txtbuffer.c b/libs/util/txtbuffer.c
index 59ee0da16..0edc785b5 100644
--- a/libs/util/txtbuffer.c
+++ b/libs/util/txtbuffer.c
@@ -159,6 +159,21 @@ TextBuffer_Destroy (txtbuffer_t *buffer)
 	FREE (txtbuffers, buffer);
 }
 
+VISIBLE char *
+TextBuffer_OpenGap (txtbuffer_t *buffer, size_t offset, size_t text_len)
+{
+	char       *dst;
+
+	if (offset > buffer->textSize) {
+		return 0;
+	}
+	dst = txtbuffer_open_gap (buffer, offset, text_len);
+	if (!dst) {
+		return 0;
+	}
+	return dst;
+}
+
 VISIBLE int
 TextBuffer_InsertAt (txtbuffer_t *buffer, size_t offset,
 					 const char *text, size_t text_len)

From ee9d3a36ab942217d31c4f1db45fd75c3482a48f Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 22 Mar 2020 20:51:55 +0900
Subject: [PATCH 0907/1519] [qwaq] Add an editor buffer

It's a fairly high-level wrapper for TextBuffer in that it implements
file ops (load/save), searching, navigation, and formatting (simple
line-oriented with tab stops (currently at 4 spaces)).
---
 ruamoko/qwaq/Makefile.am          |   7 +-
 ruamoko/qwaq/main.c               |   7 +-
 ruamoko/qwaq/qwaq-editbuffer-bi.c | 908 ++++++++++++++++++++++++++++++
 ruamoko/qwaq/qwaq-editbuffer.h    |  79 +++
 ruamoko/qwaq/qwaq-editbuffer.r    |  47 ++
 ruamoko/qwaq/qwaq.h               |   2 +
 6 files changed, 1046 insertions(+), 4 deletions(-)
 create mode 100644 ruamoko/qwaq/qwaq-editbuffer-bi.c
 create mode 100644 ruamoko/qwaq/qwaq-editbuffer.h
 create mode 100644 ruamoko/qwaq/qwaq-editbuffer.r

diff --git a/ruamoko/qwaq/Makefile.am b/ruamoko/qwaq/Makefile.am
index f8e402e10..4f8b552e2 100644
--- a/ruamoko/qwaq/Makefile.am
+++ b/ruamoko/qwaq/Makefile.am
@@ -27,6 +27,7 @@ qwaq_app_dat_src= \
 	qwaq-app.r \
 	qwaq-button.r \
 	qwaq-draw.r \
+	qwaq-editbuffer.r \
 	qwaq-garray.r \
 	qwaq-group.r \
 	qwaq-listener.r \
@@ -41,7 +42,11 @@ qwaq_curses_libs= \
 	$(top_builddir)/libs/video/targets/libvid_common.la \
 	$(top_builddir)/libs/console/libQFconsole.la \
 	$(top_builddir)/libs/gib/libQFgib.la
-qwaq_curses_SOURCES=main.c qwaq-curses.c qwaq-input.c
+qwaq_curses_SOURCES= \
+	main.c \
+	qwaq-curses.c \
+	qwaq-editbuffer-bi.c \
+	qwaq-input.c
 qwaq_curses_LDADD= $(qwaq_curses_libs) $(QWAQ_LIBS) \
 				$(PANEL_LIBS) $(CURSES_LIBS) $(PTHREAD_LDFLAGS) $(DL_LIBS)
 qwaq_curses_LDFLAGS=
diff --git a/ruamoko/qwaq/main.c b/ruamoko/qwaq/main.c
index 484618571..1e7bfa28f 100644
--- a/ruamoko/qwaq/main.c
+++ b/ruamoko/qwaq/main.c
@@ -154,9 +154,10 @@ create_progs (void)
 	PR_Init_Cvars ();
 	PR_Init (pr);
 	RUA_Init (pr, 0);
-	Key_Progs_Init (pr);
-	PR_Cmds_Init (pr);
-	BI_Init (pr);
+	Key_Progs_Init (pr);		// FIXME not all threads
+	PR_Cmds_Init (pr);			// FIXME not all threads
+	BI_Init (pr);				// FIXME not all threads
+	QWAQ_EditBuffer_Init (pr);	// FIXME not all threads
 
 	return pr;
 }
diff --git a/ruamoko/qwaq/qwaq-editbuffer-bi.c b/ruamoko/qwaq/qwaq-editbuffer-bi.c
new file mode 100644
index 000000000..d8ec63969
--- /dev/null
+++ b/ruamoko/qwaq/qwaq-editbuffer-bi.c
@@ -0,0 +1,908 @@
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <ctype.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "QF/progs.h"
+#include "QF/quakeio.h"
+#include "QF/txtbuffer.h"
+
+#include "qwaq.h"
+#include "qwaq-editbuffer.h"
+
+#define always_inline inline __attribute__((__always_inline__))
+
+typedef struct editbuffer_s {
+	void       *freenext;	// for PR_RESMAP
+	txtbuffer_t *txtbuffer;
+	int         modified;
+	int         tabSize;
+} editbuffer_t;
+
+typedef struct qwaq_ebresources_s {
+	progs_t    *pr;
+	PR_RESMAP (editbuffer_t) buffers;
+} qwaq_ebresources_t;
+
+static editbuffer_t *
+editbuffer_new (qwaq_ebresources_t *res)
+{
+	PR_RESNEW (editbuffer_t, res->buffers);
+}
+
+static void
+editbuffer_free (qwaq_ebresources_t *res, editbuffer_t *buffer)
+{
+	PR_RESFREE (editbuffer_t, res->buffers, buffer);
+}
+
+static void
+editbuffer_reset (qwaq_ebresources_t *res)
+{
+	PR_RESRESET (editbuffer_t, res->buffers);
+}
+
+static inline editbuffer_t *
+editbuffer_get (qwaq_ebresources_t *res, unsigned index)
+{
+	PR_RESGET (res->buffers, index);
+}
+
+static inline int
+editbuffer_index (qwaq_ebresources_t *res, editbuffer_t *buffer)
+{
+	PR_RESINDEX (res->buffers, buffer);
+}
+
+static always_inline editbuffer_t * __attribute__((pure))
+get_editbuffer (qwaq_ebresources_t *res, const char *name, int handle)
+{
+	editbuffer_t *buffer = editbuffer_get (res, handle);
+
+	if (!buffer || !buffer->txtbuffer) {
+		PR_RunError (res->pr, "invalid edit buffer passed to %s", name + 3);
+	}
+	return buffer;
+}
+
+static always_inline int
+isword (unsigned char c)
+{
+	return c >= 128 || c == '_' || isalnum(c);
+}
+
+static always_inline unsigned
+spanGap (txtbuffer_t *buffer, unsigned ptr)
+{
+	return ptr < buffer->gapOffset ? ptr : ptr + buffer->gapSize;
+}
+
+static always_inline char
+getChar (txtbuffer_t *buffer, unsigned ptr)
+{
+	return buffer->text[spanGap (buffer, ptr)];
+}
+
+static always_inline unsigned
+nextChar (txtbuffer_t *buffer, unsigned ptr)
+{
+	if (ptr < buffer->textSize && getChar (buffer, ptr) != '\n') {
+		return ptr + 1;
+	}
+	return ptr;
+}
+
+static always_inline unsigned
+prevChar (txtbuffer_t *buffer, unsigned ptr)
+{
+	if (ptr > 0 && getChar (buffer, ptr - 1) != '\n') {
+		return ptr - 1;
+	}
+	return ptr;
+}
+
+static always_inline unsigned __attribute__((pure))
+nextNonSpace (txtbuffer_t *buffer, unsigned ptr)
+{
+	while (ptr < buffer->textSize) {
+		char    c = getChar (buffer, ptr);
+		if (!isspace (c) || c == '\n') {
+			break;
+		}
+		ptr++;
+	}
+	return ptr;
+}
+
+static always_inline unsigned
+prevNonSpace (txtbuffer_t *buffer, unsigned ptr)
+{
+	while (ptr > 0) {
+		char    c = getChar (buffer, ptr - 1);
+		if (!isspace (c) || c == '\n') {
+			break;
+		}
+		ptr--;
+	}
+	return ptr;
+}
+
+static always_inline unsigned __attribute__((pure))
+nextWord (txtbuffer_t *buffer, unsigned ptr)
+{
+	if (buffer->textSize && ptr < buffer->textSize - 1) {
+		while (ptr < buffer->textSize) {
+			char        c = getChar (buffer, ptr);
+			if (!isword (c)) {
+				break;
+			}
+			ptr++;
+		}
+		while (ptr < buffer->textSize) {
+			char        c = getChar (buffer, ptr);
+			if (c == '\n') {
+				return ptr;
+			}
+			if (isword (c)) {
+				break;
+			}
+			ptr++;
+		}
+	}
+	return ptr;
+}
+
+static always_inline unsigned
+prevWord (txtbuffer_t *buffer, unsigned ptr)
+{
+	if (ptr > 0) {
+		while (ptr > 0) {
+			char        c = getChar (buffer, ptr - 1);
+			if (!isword (c)) {
+				break;
+			}
+			ptr--;
+		}
+		while (ptr > 0) {
+			char        c = getChar (buffer, ptr - 1);
+			if (c == '\n') {
+				return ptr;
+			}
+			if (isword (c)) {
+				break;
+			}
+			ptr--;
+		}
+	}
+	return ptr;
+}
+
+static always_inline unsigned __attribute__((pure))
+nextLine (txtbuffer_t *buffer, unsigned ptr)
+{
+	unsigned    oldptr = ptr;
+	while (ptr < buffer->textSize && getChar (buffer, ptr++) != '\n') {
+	}
+	if (ptr == buffer->textSize && ptr > 0
+		&& getChar (buffer, ptr - 1) != '\n') {
+		return oldptr;
+	}
+	return ptr;
+}
+
+static always_inline unsigned
+prevLine (txtbuffer_t *buffer, unsigned ptr)
+{
+	if (ptr) {
+		ptr--;
+		while (ptr > 0 && getChar (buffer, ptr - 1) != '\n') {
+			ptr--;
+		}
+	}
+	return ptr;
+}
+
+static always_inline unsigned
+charPos (txtbuffer_t *buffer, unsigned ptr, unsigned target, int tabSize)
+{
+	unsigned    pos = 0;
+
+	while (ptr < target) {
+		if (getChar (buffer, ptr) == '\t') {
+			pos += tabSize - (pos % tabSize) - 1;	// -1 for ++
+		}
+		pos++;
+		ptr++;
+	}
+	return pos;
+}
+
+static always_inline unsigned __attribute__((pure))
+charPtr (txtbuffer_t *buffer, unsigned ptr, unsigned target, int tabSize)
+{
+	unsigned    pos = 0;
+	while (pos < target && ptr < buffer->textSize
+		   && getChar (buffer, ptr) != '\n') {
+		if (getChar (buffer, ptr) == '\t') {
+			pos += tabSize - (pos % tabSize) - 1;	// -1 for ++
+		}
+		pos++;
+		ptr++;
+	}
+	if (pos > target) {
+		ptr--;
+	}
+	return ptr;
+}
+
+static always_inline unsigned __attribute__((pure))
+getEOW (txtbuffer_t *buffer, unsigned ptr)
+{
+	while (ptr < buffer->textSize) {
+		char        c = getChar (buffer, ptr);
+		if (!isword (c)) {
+			break;
+		}
+		ptr++;
+	}
+	return ptr;
+}
+
+static always_inline unsigned
+getBOW (txtbuffer_t *buffer, unsigned ptr)
+{
+	while (ptr > 0) {
+		char        c = getChar (buffer, ptr - 1);
+		if (!isword (c)) {
+			break;
+		}
+		ptr--;
+	}
+	return ptr;
+}
+
+static always_inline unsigned __attribute__((pure))
+getEOL (txtbuffer_t *buffer, unsigned ptr)
+{
+	while (ptr < buffer->textSize) {
+		char        c = getChar (buffer, ptr);
+		if (c == '\n') {
+			break;
+		}
+		ptr++;
+	}
+	return ptr;
+}
+
+static always_inline unsigned
+getBOL (txtbuffer_t *buffer, unsigned ptr)
+{
+	while (ptr > 0) {
+		char        c = getChar (buffer, ptr - 1);
+		if (c == '\n') {
+			break;
+		}
+		ptr--;
+	}
+	return ptr;
+}
+
+static always_inline unsigned
+_countLines (txtbuffer_t *buffer, unsigned start, unsigned len)
+{
+	unsigned    count = 0;
+	char       *ptr = buffer->text + start;
+
+	while (len-- > 0) {
+		count += *ptr++ == '\n';
+	}
+	return count;
+}
+
+static always_inline unsigned
+countLines (txtbuffer_t *buffer, unsigned start, unsigned len)
+{
+	if (start < buffer->gapOffset) {
+		if (start + len <= buffer->gapOffset) {
+			return _countLines (buffer, start, len);
+		} else {
+			return _countLines (buffer, start, buffer->gapOffset - start)
+				 + _countLines (buffer, buffer->gapOffset + buffer->gapSize,
+								len - (buffer->gapOffset - start));
+		}
+	} else {
+		return _countLines (buffer, start + buffer->gapOffset, len);
+	}
+}
+
+static const char *
+_search (txtbuffer_t *buffer, const char *ptr, unsigned len,
+		 const char *str, unsigned slen, int dir,
+		 int (*cmp)(const char *, const char *, size_t))
+{
+	while (len-- > 0) {
+		if (*ptr == *str) {
+			unsigned    offset = ptr - buffer->text;
+			if (offset > buffer->gapOffset
+				|| offset + slen < buffer->gapOffset) {
+				// search does not span gap
+				if (cmp (ptr, str, slen) == 0) {
+					return ptr;
+				}
+			} else {
+				// search spans gap
+				unsigned    l = buffer->gapOffset - offset;
+				if (cmp (ptr, str, l) == 0
+					&& cmp (ptr + l + buffer->gapSize,
+							str + l, slen - l) == 0) {
+					return ptr;
+				}
+			}
+		} else {
+			ptr += dir;
+		}
+	}
+	return 0;
+}
+
+static int
+search (txtbuffer_t *buffer, const eb_sel_t *sel, const char *str, int dir,
+		eb_sel_t *find, int (*cmp)(const char *, const char *, size_t))
+{
+	unsigned    start = sel->start;
+	unsigned    slen = strlen (str);
+	unsigned    end = start + sel->length - slen;
+	const char *found = 0;
+
+	find->start = 0;
+	find->length = 0;
+
+	if (sel->length >= slen) {
+		if (dir < 0) {
+			const char *s = buffer->text + spanGap (buffer, end);
+			if ((start < buffer->gapOffset && end <= buffer->gapOffset)
+				|| start > buffer->gapOffset) {
+				found = _search (buffer, s, end - start, str, slen, -1, cmp);
+			} else {
+				unsigned    l = end - (buffer->gapOffset + buffer->gapSize);
+				found = _search (buffer, s, l, str, slen, 1, cmp);
+				if (!found) {
+					s -= l + buffer->gapSize;
+					l = buffer->gapOffset - start;
+					found = _search (buffer, s, l, str, slen, 1, cmp);
+				}
+			}
+		} else {
+			const char *s = buffer->text + spanGap (buffer, start);
+			if ((start < buffer->gapOffset && end <= buffer->gapOffset)
+				|| start > buffer->gapOffset) {
+				found = _search (buffer, s, end - start, str, slen, 1, cmp);
+			} else {
+				unsigned    l = buffer->gapOffset - start;
+				found = _search (buffer, s, l, str, slen, 1, cmp);
+				if (!found) {
+					s += l + buffer->gapSize;
+					l = end - start - l;
+					found = _search (buffer, s, l, str, slen, 1, cmp);
+				}
+			}
+		}
+	}
+	if (found) {
+		unsigned    offset = found - buffer->text;
+		if (offset > buffer->gapOffset) {
+			offset -= buffer->gapSize;
+		}
+		find->start = offset;
+		find->length = slen;
+		return 1;
+	}
+	return 0;
+}
+
+static int
+saveFile (txtbuffer_t *buffer, const char *filename)
+{
+	QFile       *file = Qopen (filename, "wt");
+
+	if (file) {
+		unsigned offset = buffer->gapOffset + buffer->gapSize;
+		Qwrite (file, buffer->text, buffer->gapOffset);
+		Qwrite (file, buffer->text + offset, buffer->textSize - offset);
+		Qclose (file);
+		return 1;
+	}
+	return 0;
+}
+
+static int
+loadFile (txtbuffer_t *buffer, const char *filename)
+{
+	QFile      *file = Qopen (filename, "rtz");
+	char       *dst;
+	unsigned    len;
+
+	if (file) {
+		len = Qfilesize (file);
+		// ensure buffer is empty
+		TextBuffer_DeleteAt (buffer, 0, buffer->textSize);
+		dst = TextBuffer_OpenGap (buffer, 0, len);
+		Qread (file, dst, len);
+
+		buffer->textSize += len;
+		buffer->gapOffset += len;
+		buffer->gapSize -= len;
+
+		Qclose (file);
+		return 1;
+	}
+	return 0;
+}
+
+static unsigned
+formatLine (txtbuffer_t *buffer, unsigned linePtr, unsigned xpos,
+			int *dst, unsigned length, eb_sel_t *selection, eb_color_t *colors,
+			int tabSize)
+{
+	unsigned    pos = 0;
+	unsigned    ptr = linePtr;
+	unsigned    sels = selection->start;
+	unsigned    sele = selection->start + selection->length;
+	int         coln = (colors->normal & ~0xff);
+	int         cols = (colors->selected & ~0xff);
+	int         col;
+	byte        c;
+	int         count;
+
+	while (pos < xpos && ptr < buffer->textSize) {
+		c = getChar (buffer, ptr);
+		if (c == '\n') {
+			break;
+		}
+		if (c == '\t') {
+			pos += tabSize - (pos % tabSize) - 1;	// -1 for ++
+		}
+		pos++;
+		ptr++;
+	}
+	col = ptr >= sels && ptr < sele ? cols : coln;
+	while (xpos < pos && length-- > 0) {
+		*dst++ = col | ' ';
+	}
+	while (length > 0) {
+		col = ptr >= sels && ptr < sele ? cols : coln;
+		c = getChar (buffer, ptr++);
+		if (c == '\n') {
+			break;
+		}
+		count = 1;
+		if (c == '\t') {
+			c = ' ';
+			count = tabSize - (pos % tabSize);
+		}
+		while (length-- > 0 && count-- > 0) {
+			*dst++ = col | c;
+			pos++;
+		}
+	}
+	col = ptr >= sels && ptr < sele ? cols : coln;
+	while (length-- > 0) {
+		*dst++ = col | ' ';
+	}
+	return ptr;
+}
+
+//===
+
+static void
+bi_i_EditBuffer__init (progs_t *pr)
+{
+	qwaq_ebresources_t *res = PR_Resources_Find (pr, "qwaq-editbuffer");
+	txtbuffer_t *txtbuffer = TextBuffer_Create ();
+	editbuffer_t *buffer = editbuffer_new (res);
+
+	buffer->txtbuffer = txtbuffer;
+	buffer->tabSize = 4; // FIXME
+
+	R_INT (pr) = editbuffer_index (res, buffer);
+}
+
+static void
+bi_i_EditBuffer__initWithFile_ (progs_t *pr)
+{
+	qwaq_ebresources_t *res = PR_Resources_Find (pr, "qwaq-editbuffer");
+	const char *filename = P_GSTRING (pr, 0);
+	txtbuffer_t *txtbuffer = TextBuffer_Create ();
+	editbuffer_t *buffer = editbuffer_new (res);
+
+	buffer->txtbuffer = txtbuffer;
+	buffer->tabSize = 4; // FIXME
+
+	loadFile (buffer->txtbuffer, filename);
+	R_INT (pr) = editbuffer_index (res, buffer);
+}
+
+static void
+bi_i_EditBuffer__dealloc (progs_t *pr)
+{
+	qwaq_ebresources_t *res = PR_Resources_Find (pr, "qwaq-editbuffer");
+	int         buffer_id = P_STRUCT (pr, qwaq_editbuffer_t, 0).buffer;
+	editbuffer_t *buffer = get_editbuffer (res, __FUNCTION__, buffer_id);
+
+	TextBuffer_Destroy (buffer->txtbuffer);
+	editbuffer_free (res, buffer);
+}
+
+static void
+bi_i_EditBuffer__nextChar_ (progs_t *pr)
+{
+	qwaq_ebresources_t *res = PR_Resources_Find (pr, "qwaq-editbuffer");
+	int         buffer_id = P_STRUCT (pr, qwaq_editbuffer_t, 0).buffer;
+	editbuffer_t *buffer = get_editbuffer (res, __FUNCTION__, buffer_id);
+	unsigned    ptr = P_UINT (pr, 2);
+
+	R_INT (pr) = nextChar (buffer->txtbuffer, ptr);
+}
+
+static void
+bi_i_EditBuffer__prevChar_ (progs_t *pr)
+{
+	qwaq_ebresources_t *res = PR_Resources_Find (pr, "qwaq-editbuffer");
+	int         buffer_id = P_STRUCT (pr, qwaq_editbuffer_t, 0).buffer;
+	editbuffer_t *buffer = get_editbuffer (res, __FUNCTION__, buffer_id);
+	unsigned    ptr = P_UINT (pr, 2);
+
+	R_INT (pr) = prevChar (buffer->txtbuffer, ptr);
+}
+
+static void
+bi_i_EditBuffer__nextNonSpace_ (progs_t *pr)
+{
+	qwaq_ebresources_t *res = PR_Resources_Find (pr, "qwaq-editbuffer");
+	int         buffer_id = P_STRUCT (pr, qwaq_editbuffer_t, 0).buffer;
+	editbuffer_t *buffer = get_editbuffer (res, __FUNCTION__, buffer_id);
+	unsigned    ptr = P_UINT (pr, 2);
+
+	R_INT (pr) = nextNonSpace (buffer->txtbuffer, ptr);
+}
+
+static void
+bi_i_EditBuffer__prevNonSpace_ (progs_t *pr)
+{
+	qwaq_ebresources_t *res = PR_Resources_Find (pr, "qwaq-editbuffer");
+	int         buffer_id = P_STRUCT (pr, qwaq_editbuffer_t, 0).buffer;
+	editbuffer_t *buffer = get_editbuffer (res, __FUNCTION__, buffer_id);
+	unsigned    ptr = P_UINT (pr, 2);
+
+	R_INT (pr) = prevNonSpace (buffer->txtbuffer, ptr);
+}
+
+static void
+bi_i_EditBuffer__nextWord_ (progs_t *pr)
+{
+	qwaq_ebresources_t *res = PR_Resources_Find (pr, "qwaq-editbuffer");
+	int         buffer_id = P_STRUCT (pr, qwaq_editbuffer_t, 0).buffer;
+	editbuffer_t *buffer = get_editbuffer (res, __FUNCTION__, buffer_id);
+	unsigned    ptr = P_UINT (pr, 2);
+
+	R_INT (pr) = nextWord (buffer->txtbuffer, ptr);
+}
+
+static void
+bi_i_EditBuffer__prevWord_ (progs_t *pr)
+{
+	qwaq_ebresources_t *res = PR_Resources_Find (pr, "qwaq-editbuffer");
+	int         buffer_id = P_STRUCT (pr, qwaq_editbuffer_t, 0).buffer;
+	editbuffer_t *buffer = get_editbuffer (res, __FUNCTION__, buffer_id);
+	unsigned    ptr = P_UINT (pr, 2);
+
+	R_INT (pr) = prevWord (buffer->txtbuffer, ptr);
+}
+
+static void
+bi_i_EditBuffer__nextLine_ (progs_t *pr)
+{
+	qwaq_ebresources_t *res = PR_Resources_Find (pr, "qwaq-editbuffer");
+	int         buffer_id = P_STRUCT (pr, qwaq_editbuffer_t, 0).buffer;
+	editbuffer_t *buffer = get_editbuffer (res, __FUNCTION__, buffer_id);
+	unsigned    ptr = P_UINT (pr, 2);
+
+	R_INT (pr) = nextLine (buffer->txtbuffer, ptr);
+}
+
+static void
+bi_i_EditBuffer__prevLine_ (progs_t *pr)
+{
+	qwaq_ebresources_t *res = PR_Resources_Find (pr, "qwaq-editbuffer");
+	int         buffer_id = P_STRUCT (pr, qwaq_editbuffer_t, 0).buffer;
+	editbuffer_t *buffer = get_editbuffer (res, __FUNCTION__, buffer_id);
+	unsigned    ptr = P_UINT (pr, 2);
+
+	R_INT (pr) = prevLine (buffer->txtbuffer, ptr);
+}
+
+static void
+bi_i_EditBuffer__nextLine__ (progs_t *pr)
+{
+	qwaq_ebresources_t *res = PR_Resources_Find (pr, "qwaq-editbuffer");
+	int         buffer_id = P_STRUCT (pr, qwaq_editbuffer_t, 0).buffer;
+	editbuffer_t *buffer = get_editbuffer (res, __FUNCTION__, buffer_id);
+	unsigned    ptr = P_UINT (pr, 2);
+	unsigned    count = P_UINT (pr, 3);
+
+	while (count-- > 0) {
+		unsigned    oldptr = ptr;
+		ptr = nextLine (buffer->txtbuffer, ptr);
+		if (ptr == buffer->txtbuffer->textSize && ptr > 0
+			&& getChar (buffer->txtbuffer, ptr - 1) != '\n') {
+			ptr = oldptr;
+			break;
+		}
+	}
+	R_INT (pr) = ptr;
+}
+
+static void
+bi_i_EditBuffer__prevLine__ (progs_t *pr)
+{
+	qwaq_ebresources_t *res = PR_Resources_Find (pr, "qwaq-editbuffer");
+	int         buffer_id = P_STRUCT (pr, qwaq_editbuffer_t, 0).buffer;
+	editbuffer_t *buffer = get_editbuffer (res, __FUNCTION__, buffer_id);
+	unsigned    ptr = P_UINT (pr, 2);
+	unsigned    count = P_UINT (pr, 3);
+
+	while (ptr && count-- > 0) {
+		ptr = prevLine (buffer->txtbuffer, ptr);
+	}
+	R_INT (pr) = ptr;
+}
+
+static void
+bi_i_EditBuffer__charPos_at_ (progs_t *pr)
+{
+	qwaq_ebresources_t *res = PR_Resources_Find (pr, "qwaq-editbuffer");
+	int         buffer_id = P_STRUCT (pr, qwaq_editbuffer_t, 0).buffer;
+	editbuffer_t *buffer = get_editbuffer (res, __FUNCTION__, buffer_id);
+	unsigned    ptr = P_UINT (pr, 2);
+	unsigned    target = P_UINT (pr, 3);
+	int         tabSize = buffer->tabSize;
+
+	R_INT (pr) = charPos (buffer->txtbuffer, ptr, target, tabSize);
+}
+
+static void
+bi_i_EditBuffer__charPtr_at_ (progs_t *pr)
+{
+	qwaq_ebresources_t *res = PR_Resources_Find (pr, "qwaq-editbuffer");
+	int         buffer_id = P_STRUCT (pr, qwaq_editbuffer_t, 0).buffer;
+	editbuffer_t *buffer = get_editbuffer (res, __FUNCTION__, buffer_id);
+	unsigned    ptr = P_UINT (pr, 2);
+	unsigned    target = P_UINT (pr, 3);
+	int         tabSize = buffer->tabSize;
+
+	R_INT (pr) = charPtr (buffer->txtbuffer, ptr, target, tabSize);
+}
+
+static void
+bi_i_EditBuffer__getWord_ (progs_t *pr)
+{
+	qwaq_ebresources_t *res = PR_Resources_Find (pr, "qwaq-editbuffer");
+	int         buffer_id = P_STRUCT (pr, qwaq_editbuffer_t, 0).buffer;
+	editbuffer_t *buffer = get_editbuffer (res, __FUNCTION__, buffer_id);
+	unsigned    ptr = P_UINT (pr, 2);
+	unsigned    s = getBOW (buffer->txtbuffer, ptr);
+	unsigned    e = getEOW (buffer->txtbuffer, ptr);
+
+	R_PACKED (pr, eb_sel_t).start = s;
+	R_PACKED (pr, eb_sel_t).length = e - s;
+}
+
+static void
+bi_i_EditBuffer__getLine_ (progs_t *pr)
+{
+	qwaq_ebresources_t *res = PR_Resources_Find (pr, "qwaq-editbuffer");
+	int         buffer_id = P_STRUCT (pr, qwaq_editbuffer_t, 0).buffer;
+	editbuffer_t *buffer = get_editbuffer (res, __FUNCTION__, buffer_id);
+	unsigned    ptr = P_UINT (pr, 2);
+	unsigned    s = getBOL (buffer->txtbuffer, ptr);
+	unsigned    e = getEOL (buffer->txtbuffer, ptr);
+
+	R_PACKED (pr, eb_sel_t).start = s;
+	R_PACKED (pr, eb_sel_t).length = e - s;
+}
+
+static void
+bi_i_EditBuffer__getBOL_ (progs_t *pr)
+{
+	qwaq_ebresources_t *res = PR_Resources_Find (pr, "qwaq-editbuffer");
+	int         buffer_id = P_STRUCT (pr, qwaq_editbuffer_t, 0).buffer;
+	editbuffer_t *buffer = get_editbuffer (res, __FUNCTION__, buffer_id);
+	unsigned    ptr = P_UINT (pr, 2);
+
+	R_INT (pr) = getBOL (buffer->txtbuffer, ptr);
+}
+
+static void
+bi_i_EditBuffer__getEOL_ (progs_t *pr)
+{
+	qwaq_ebresources_t *res = PR_Resources_Find (pr, "qwaq-editbuffer");
+	int         buffer_id = P_STRUCT (pr, qwaq_editbuffer_t, 0).buffer;
+	editbuffer_t *buffer = get_editbuffer (res, __FUNCTION__, buffer_id);
+	unsigned    ptr = P_UINT (pr, 2);
+
+	R_INT (pr) = getEOL (buffer->txtbuffer, ptr);
+}
+
+static void
+bi_i_EditBuffer__getBOT (progs_t *pr)
+{
+	//qwaq_ebresources_t *res = PR_Resources_Find (pr, "qwaq-editbuffer");
+	//int         buffer_id = P_STRUCT (pr, qwaq_editbuffer_t, 0).buffer;
+	//editbuffer_t *buffer = get_editbuffer (res, __FUNCTION__, buffer_id);
+
+	R_INT (pr) = 0;
+}
+
+static void
+bi_i_EditBuffer__getEOT (progs_t *pr)
+{
+	qwaq_ebresources_t *res = PR_Resources_Find (pr, "qwaq-editbuffer");
+	int         buffer_id = P_STRUCT (pr, qwaq_editbuffer_t, 0).buffer;
+	editbuffer_t *buffer = get_editbuffer (res, __FUNCTION__, buffer_id);
+
+	R_INT (pr) = buffer->txtbuffer->textSize;
+}
+
+static void
+bi_i_EditBuffer__countLines_ (progs_t *pr)
+{
+	qwaq_ebresources_t *res = PR_Resources_Find (pr, "qwaq-editbuffer");
+	int         buffer_id = P_STRUCT (pr, qwaq_editbuffer_t, 0).buffer;
+	editbuffer_t *buffer = get_editbuffer (res, __FUNCTION__, buffer_id);
+	__auto_type selection = &P_PACKED (pr, eb_sel_t, 2);
+
+	R_INT (pr) = countLines (buffer->txtbuffer,
+							 selection->start, selection->length);
+}
+
+static void
+bi_i_EditBuffer__search_for_direction_ (progs_t *pr)
+{
+	qwaq_ebresources_t *res = PR_Resources_Find (pr, "qwaq-editbuffer");
+	int         buffer_id = P_STRUCT (pr, qwaq_editbuffer_t, 0).buffer;
+	editbuffer_t *buffer = get_editbuffer (res, __FUNCTION__, buffer_id);
+	__auto_type selection = &P_PACKED (pr, eb_sel_t, 2);
+	const char *str = P_GSTRING (pr, 3);
+	int         dir = P_INT (pr, 4);
+
+	search (buffer->txtbuffer, selection, str, dir, &R_PACKED (pr, eb_sel_t),
+			strncmp);
+}
+
+static void
+bi_i_EditBuffer__isearch_for_direction_ (progs_t *pr)
+{
+	qwaq_ebresources_t *res = PR_Resources_Find (pr, "qwaq-editbuffer");
+	int         buffer_id = P_STRUCT (pr, qwaq_editbuffer_t, 0).buffer;
+	editbuffer_t *buffer = get_editbuffer (res, __FUNCTION__, buffer_id);
+	__auto_type selection = &P_PACKED (pr, eb_sel_t, 2);
+	const char *str = P_GSTRING (pr, 3);
+	int         dir = P_INT (pr, 4);
+
+	search (buffer->txtbuffer, selection, str, dir, &R_PACKED (pr, eb_sel_t),
+			strncasecmp);
+}
+
+static void
+bi_i_EditBuffer__formatLine_from_into_width_highlight_colors_ (progs_t *pr)
+{
+	qwaq_ebresources_t *res = PR_Resources_Find (pr, "qwaq-editbuffer");
+	int         buffer_id = P_STRUCT (pr, qwaq_editbuffer_t, 0).buffer;
+	editbuffer_t *buffer = get_editbuffer (res, __FUNCTION__, buffer_id);
+	unsigned    linePtr = P_UINT (pr, 2);
+	unsigned    xpos = P_UINT (pr, 3);
+	int        *dst = (int *) P_GPOINTER (pr, 4);
+	unsigned    length = P_UINT (pr, 5);
+	__auto_type selection = &P_PACKED (pr, eb_sel_t, 6);
+	__auto_type colors = &P_PACKED (pr, eb_color_t, 7);
+	int         tabSize = buffer->tabSize;
+	unsigned    ptr;
+
+	ptr = formatLine (buffer->txtbuffer, linePtr, xpos, dst, length, selection,
+					  colors, tabSize);
+	R_INT (pr) = ptr;
+}
+
+static void
+bi_i_EditBuffer__modified (progs_t *pr)
+{
+	qwaq_ebresources_t *res = PR_Resources_Find (pr, "qwaq-editbuffer");
+	int         buffer_id = P_STRUCT (pr, qwaq_editbuffer_t, 0).buffer;
+	editbuffer_t *buffer = get_editbuffer (res, __FUNCTION__, buffer_id);
+	R_INT (pr) = buffer->modified;
+}
+
+static void
+bi_i_EditBuffer__textSize (progs_t *pr)
+{
+	qwaq_ebresources_t *res = PR_Resources_Find (pr, "qwaq-editbuffer");
+	int         buffer_id = P_STRUCT (pr, qwaq_editbuffer_t, 0).buffer;
+	editbuffer_t *buffer = get_editbuffer (res, __FUNCTION__, buffer_id);
+	R_INT (pr) = buffer->txtbuffer->textSize;
+}
+
+static void
+bi_i_EditBuffer__saveFile_ (progs_t *pr)
+{
+	qwaq_ebresources_t *res = PR_Resources_Find (pr, "qwaq-editbuffer");
+	int         buffer_id = P_STRUCT (pr, qwaq_editbuffer_t, 0).buffer;
+	editbuffer_t *buffer = get_editbuffer (res, __FUNCTION__, buffer_id);
+	const char *filename = P_GSTRING (pr, 2);
+
+	if (saveFile (buffer->txtbuffer, filename)) {
+		buffer->modified = 0;
+	}
+}
+
+static void
+qwaq_ebresources_clear (progs_t *pr, void *data)
+{
+	__auto_type res = (qwaq_ebresources_t *) data;
+
+	for (size_t i = 0; i < res->buffers._size; i++) {
+		editbuffer_t *buffer = editbuffer_get (res, ~i);
+		if (buffer->txtbuffer) {
+			TextBuffer_Destroy (buffer->txtbuffer);
+			buffer->txtbuffer = 0;
+		}
+	}
+	editbuffer_reset (res);
+}
+
+static builtin_t builtins[] = {
+	{"_i_EditBuffer__init",				bi_i_EditBuffer__init,			-1},
+	{"_i_EditBuffer__initWithFile_",	bi_i_EditBuffer__initWithFile_,	-1},
+	{"_i_EditBuffer__dealloc",			bi_i_EditBuffer__dealloc,		-1},
+	{"_i_EditBuffer__nextChar_",		bi_i_EditBuffer__nextChar_,		-1},
+	{"_i_EditBuffer__prevChar_",		bi_i_EditBuffer__prevChar_,		-1},
+	{"_i_EditBuffer__nextNonSpace_",	bi_i_EditBuffer__nextNonSpace_,	-1},
+	{"_i_EditBuffer__prevNonSpace_",	bi_i_EditBuffer__prevNonSpace_,	-1},
+	{"_i_EditBuffer__nextWord_",		bi_i_EditBuffer__nextWord_,		-1},
+	{"_i_EditBuffer__prevWord_",		bi_i_EditBuffer__prevWord_,		-1},
+	{"_i_EditBuffer__nextLine_",		bi_i_EditBuffer__nextLine_,		-1},
+	{"_i_EditBuffer__prevLine_",		bi_i_EditBuffer__prevLine_,		-1},
+	{"_i_EditBuffer__nextLine__",		bi_i_EditBuffer__nextLine__,	-1},
+	{"_i_EditBuffer__prevLine__",		bi_i_EditBuffer__prevLine__,	-1},
+	{"_i_EditBuffer__charPos_at_",		bi_i_EditBuffer__charPos_at_,	-1},
+	{"_i_EditBuffer__charPtr_at_",		bi_i_EditBuffer__charPtr_at_,	-1},
+	{"_i_EditBuffer__getWord_",			bi_i_EditBuffer__getWord_,		-1},
+	{"_i_EditBuffer__getLine_",			bi_i_EditBuffer__getLine_,		-1},
+	{"_i_EditBuffer__getBOL_",			bi_i_EditBuffer__getBOL_,		-1},
+	{"_i_EditBuffer__getEOL_",			bi_i_EditBuffer__getEOL_,		-1},
+	{"_i_EditBuffer__getBOT",			bi_i_EditBuffer__getBOT,		-1},
+	{"_i_EditBuffer__getEOT",			bi_i_EditBuffer__getEOT,		-1},
+	{"_i_EditBuffer__countLines_",		bi_i_EditBuffer__countLines_,	-1},
+	{"_i_EditBuffer__search_for_direction_",
+								bi_i_EditBuffer__search_for_direction_,	-1},
+	{"_i_EditBuffer__isearch_for_direction_",
+								bi_i_EditBuffer__isearch_for_direction_,-1},
+	{"_i_EditBuffer__formatLine_from_into_width_highlight_colors_",
+	bi_i_EditBuffer__formatLine_from_into_width_highlight_colors_,	-1},
+	{"_i_EditBuffer__modified",			bi_i_EditBuffer__modified,		-1},
+	{"_i_EditBuffer__textSize",			bi_i_EditBuffer__textSize,		-1},
+	{"_i_EditBuffer__saveFile_",		bi_i_EditBuffer__saveFile_,		-1},
+	{}
+};
+
+void
+QWAQ_EditBuffer_Init (progs_t *pr)
+{
+	qwaq_ebresources_t *res = calloc (sizeof (*res), 1);
+	res->pr = pr;
+
+	PR_Resources_Register (pr, "qwaq-editbuffer", res, qwaq_ebresources_clear);
+	PR_RegisterBuiltins (pr, builtins);
+}
diff --git a/ruamoko/qwaq/qwaq-editbuffer.h b/ruamoko/qwaq/qwaq-editbuffer.h
new file mode 100644
index 000000000..215937a55
--- /dev/null
+++ b/ruamoko/qwaq/qwaq-editbuffer.h
@@ -0,0 +1,79 @@
+#ifndef __qwaq_editbuffer_h
+#define __qwaq_editbuffer_h
+
+#ifdef __QFCC__
+#include <Object.h>
+
+//FIXME add unsigned to qfcc
+#define unsigned int
+#define umax 0x7fffffff
+#endif//__QFCC__
+
+typedef struct eb_sel_s {
+	unsigned    start;
+	unsigned    length;
+} eb_sel_t;
+
+typedef struct eb_color_s {
+	int         normal;
+	int         selected;
+} eb_color_t;
+
+#ifdef __QFCC__
+@interface EditBuffer : Object
+{
+	struct edit_buffer_s *buffer;
+}
+-init;
+-initWithFile: (string) filename;
+- (unsigned) nextChar: (unsigned) charPtr;
+- (unsigned) prevChar: (unsigned) charPtr;
+- (unsigned) nextNonSpace: (unsigned) charPtr;
+- (unsigned) prevNonSpace: (unsigned) charPtr;
+- (unsigned) nextWord: (unsigned) wordPtr;
+- (unsigned) prevWord: (unsigned) wordPtr;
+- (unsigned) nextLine: (unsigned) linePtr;
+- (unsigned) prevLine: (unsigned) linePtr;
+- (unsigned) nextLine: (unsigned) linePtr : (unsigned) count;
+- (unsigned) prevLine: (unsigned) linePtr : (unsigned) count;
+
+- (unsigned) charPos: (unsigned) linePtr at: (unsigned) target;
+- (unsigned) charPtr: (unsigned) linePtr at: (unsigned) target;
+
+- (eb_sel_t) getWord: (unsigned) wordPtr;
+- (eb_sel_t) getLine: (unsigned) linePtr;
+- (unsigned) getBOL: (unsigned) linePtr;
+- (unsigned) getEOL: (unsigned) linePtr;
+- (unsigned) getBOT;
+- (unsigned) getEOT;
+
+- (unsigned) countLines: (eb_sel_t) selection;
+- (eb_sel_t) search: (eb_sel_t) selection
+				for: (string) str
+		  direction: (int) dir;
+- (eb_sel_t) isearch: (eb_sel_t) selection
+				 for: (string) str
+		   direction: (int) dir;
+- (unsigned) formatLine: (unsigned) linePtr
+				   from: (unsigned) xpos
+				   into: (int *) buf
+				  width: (unsigned) length
+			  highlight: (eb_sel_t) selection
+				 colors: (eb_color_t) colors;
+
+- (BOOL) modified;
+- (unsigned) textSize;
+- (int) saveFile: (string) fileName;
+@end
+#else//__QFCC__
+
+#include "QF/pr_obj.h"
+
+typedef struct qwaq_editbuffer_s {
+	pr_id_t     isa;
+	pointer_t   buffer;
+} qwaq_editbuffer_t;
+
+#endif//!__QFCC__
+
+#endif//__qwaq_editbuffer_h
diff --git a/ruamoko/qwaq/qwaq-editbuffer.r b/ruamoko/qwaq/qwaq-editbuffer.r
new file mode 100644
index 000000000..ce12a6edf
--- /dev/null
+++ b/ruamoko/qwaq/qwaq-editbuffer.r
@@ -0,0 +1,47 @@
+#include "qwaq-editbuffer.h"
+
+@implementation EditBuffer
+- init = #0;
+- initWithFile: (string) filename = #0;
+- (void) dealloc = #0;
+- (unsigned) nextChar: (unsigned) charPtr = #0;
+- (unsigned) prevChar: (unsigned) charPtr = #0;
+- (unsigned) nextNonSpace: (unsigned) charPtr = #0;
+- (unsigned) prevNonSpace: (unsigned) charPtr = #0;
+- (unsigned) nextWord: (unsigned) wordPtr = #0;
+- (unsigned) prevWord: (unsigned) wordPtr = #0;
+- (unsigned) nextLine: (unsigned) linePtr = #0;
+- (unsigned) prevLine: (unsigned) linePtr = #0;
+- (unsigned) nextLine: (unsigned) linePtr : (unsigned) count = #0;
+- (unsigned) prevLine: (unsigned) linePtr : (unsigned) count = #0;
+
+- (unsigned) charPos: (unsigned) linePtr
+				  at: (unsigned) target = #0;
+- (unsigned) charPtr: (unsigned) linePtr
+				  at: (unsigned) target = #0;
+
+- (eb_sel_t) getWord: (unsigned) wordPtr = #0;
+- (eb_sel_t) getLine: (unsigned) linePtr = #0;
+- (unsigned) getBOL: (unsigned) linePtr = #0;
+- (unsigned) getEOL: (unsigned) linePtr = #0;
+- (unsigned) getBOT = #0;
+- (unsigned) getEOT = #0;
+
+- (unsigned) countLines: (eb_sel_t) selection = #0;
+- (eb_sel_t) search: (eb_sel_t) selection
+				for: (string) str
+		  direction: (int) dir = #0;
+- (eb_sel_t) isearch: (eb_sel_t) selection
+				 for: (string) str
+		   direction: (int) dir = #0;
+- (unsigned) formatLine: (unsigned) linePtr
+				   from: (unsigned) xpos
+				   into: (int *) buf
+				  width: (unsigned) length
+			  highlight: (eb_sel_t) selection
+				 colors: (eb_color_t) colors = #0;
+
+- (BOOL) modified = #0;
+- (unsigned) textSize = #0;
+- (int) saveFile: (string) fileName = #0;
+@end
diff --git a/ruamoko/qwaq/qwaq.h b/ruamoko/qwaq/qwaq.h
index 3172cd7f7..da9ec6e98 100644
--- a/ruamoko/qwaq/qwaq.h
+++ b/ruamoko/qwaq/qwaq.h
@@ -3,6 +3,7 @@
 
 #include "QF/darray.h"
 #include "QF/progs.h"
+#include "QF/sys.h"
 
 typedef struct qwaq_thread_s {
 	pthread_t   thread_id;
@@ -15,6 +16,7 @@ typedef struct qwaq_thread_s {
 } qwaq_thread_t;
 
 void BI_Init (progs_t *pr);
+void QWAQ_EditBuffer_Init (progs_t *pr);
 extern struct cbuf_s *qwaq_cbuf;
 qwaq_thread_t *create_thread (void *(*thread_func) (qwaq_thread_t *), void *);
 

From 10adb116efd70df7d6d557daa97005c3587eb2dd Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 22 Mar 2020 22:03:34 +0900
Subject: [PATCH 0908/1519] [qwaq] Start working on the source view/editor

Line formatting is a bit messed up, but other than non-virtual text
being double-counted, things seem to be ok (view only).
---
 ruamoko/qwaq/Makefile.am          |  1 +
 ruamoko/qwaq/qwaq-app.r           | 54 ++++---------------------------
 ruamoko/qwaq/qwaq-editbuffer-bi.c | 14 +++++---
 ruamoko/qwaq/qwaq-editor.h        | 24 ++++++++++++++
 ruamoko/qwaq/qwaq-editor.r        | 30 +++++++++++++++++
 5 files changed, 71 insertions(+), 52 deletions(-)
 create mode 100644 ruamoko/qwaq/qwaq-editor.h
 create mode 100644 ruamoko/qwaq/qwaq-editor.r

diff --git a/ruamoko/qwaq/Makefile.am b/ruamoko/qwaq/Makefile.am
index 4f8b552e2..3e803509b 100644
--- a/ruamoko/qwaq/Makefile.am
+++ b/ruamoko/qwaq/Makefile.am
@@ -28,6 +28,7 @@ qwaq_app_dat_src= \
 	qwaq-button.r \
 	qwaq-draw.r \
 	qwaq-editbuffer.r \
+	qwaq-editor.r \
 	qwaq-garray.r \
 	qwaq-group.r \
 	qwaq-listener.r \
diff --git a/ruamoko/qwaq/qwaq-app.r b/ruamoko/qwaq/qwaq-app.r
index f2834b77e..4ea23f2ae 100644
--- a/ruamoko/qwaq/qwaq-app.r
+++ b/ruamoko/qwaq/qwaq-app.r
@@ -1,10 +1,13 @@
 int fence;
+
 #include <AutoreleasePool.h>
+#include <key.h>
 
 #include "color.h"
 #include "qwaq-app.h"
 #include "qwaq-button.h"
 #include "qwaq-curses.h"
+#include "qwaq-editor.h"
 #include "qwaq-group.h"
 #include "qwaq-listener.h"
 #include "qwaq-window.h"
@@ -47,6 +50,7 @@ arp_end (void)
 	objects = [[Group alloc] initWithContext: screen owner: nil];
 
 	[screen bkgd: COLOR_PAIR (1)];
+	[screen scrollok: 1];
 	Rect r = { nil, [screen size] };
 	r.offset.x = r.extent.width / 4;
 	r.offset.y = r.extent.height / 4;
@@ -54,57 +58,11 @@ arp_end (void)
 	r.extent.height /= 2;
 	Window *w;
 	[objects insert: w = [[Window windowWithRect: r] setBackground: COLOR_PAIR (2)]];
-	DrawBuffer *released = [DrawBuffer buffer: {12, 1}];
-	DrawBuffer *pressed = [DrawBuffer buffer: {12, 1}];
-	Button *b = [[Button alloc] initWithPos: {3, 4} releasedIcon: released
-													pressedIcon: pressed];
-	[w addView: b];
-	[released bkgd: COLOR_PAIR(3)];
-	[released clear];
-	[released mvaddstr: {2, 0}, "press me"];
-	[pressed bkgd: COLOR_PAIR(4)];
-	[pressed clear];
-	[pressed mvaddstr: {1, 0}, "release me"];
-	[[b onPress] addListener: self : @selector (buttonPressed:)];
-	[[b onRelease] addListener: self : @selector (buttonReleased:)];
-	[[b onClick] addListener: self : @selector (buttonClick:)];
-	[[b onDrag] addListener: self : @selector (buttonDrag:)];
-	[[b onAuto] addListener: self : @selector (buttonAuto:)];
+	r = {{1, 1}, {r.extent.width - 2, r.extent.height - 2}};
+	[w addView: [[Editor alloc] initWithRect: r file: "Makefile"]];
 	return self;
 }
 
--(void) buttonPressed: (id) sender
-{
-	[screen mvaddstr: {2, 0}, " pressed "];
-	[screen refresh];
-}
-
--(void) buttonReleased: (id) sender
-{
-	[screen mvaddstr: {2, 0}, "released "];
-	[screen refresh];
-}
-
--(void) buttonClick: (id) sender
-{
-	[screen mvprintf: {2, 1}, "clicked %d", [sender click]];
-	[screen refresh];
-}
-
--(void) buttonDrag: (id) sender
-{
-	[screen mvaddstr: {2, 0}, "dragged "];
-	Point delta = [sender delta];
-	[screen mvprintf: {15, 0}, "%3d %3d", delta.x, delta.y];
-	[screen refresh];
-}
-
--(void) buttonAuto: (id) sender
-{
-	[screen mvprintf: {2, 2}, "%d", autocount++];
-	[screen refresh];
-}
-
 -run
 {
 	[self draw];
diff --git a/ruamoko/qwaq/qwaq-editbuffer-bi.c b/ruamoko/qwaq/qwaq-editbuffer-bi.c
index d8ec63969..a7cf25cc5 100644
--- a/ruamoko/qwaq/qwaq-editbuffer-bi.c
+++ b/ruamoko/qwaq/qwaq-editbuffer-bi.c
@@ -501,20 +501,23 @@ static void
 bi_i_EditBuffer__init (progs_t *pr)
 {
 	qwaq_ebresources_t *res = PR_Resources_Find (pr, "qwaq-editbuffer");
+	__auto_type self = &P_STRUCT (pr, qwaq_editbuffer_t, 0);
 	txtbuffer_t *txtbuffer = TextBuffer_Create ();
 	editbuffer_t *buffer = editbuffer_new (res);
 
 	buffer->txtbuffer = txtbuffer;
 	buffer->tabSize = 4; // FIXME
 
-	R_INT (pr) = editbuffer_index (res, buffer);
+	self->buffer = editbuffer_index (res, buffer);
+	R_INT (pr) = PR_SetPointer (pr, self);
 }
 
 static void
 bi_i_EditBuffer__initWithFile_ (progs_t *pr)
 {
 	qwaq_ebresources_t *res = PR_Resources_Find (pr, "qwaq-editbuffer");
-	const char *filename = P_GSTRING (pr, 0);
+	__auto_type self = &P_STRUCT (pr, qwaq_editbuffer_t, 0);
+	const char *filename = P_GSTRING (pr, 2);
 	txtbuffer_t *txtbuffer = TextBuffer_Create ();
 	editbuffer_t *buffer = editbuffer_new (res);
 
@@ -522,14 +525,17 @@ bi_i_EditBuffer__initWithFile_ (progs_t *pr)
 	buffer->tabSize = 4; // FIXME
 
 	loadFile (buffer->txtbuffer, filename);
-	R_INT (pr) = editbuffer_index (res, buffer);
+
+	self->buffer = editbuffer_index (res, buffer);
+	R_INT (pr) = PR_SetPointer (pr, self);
 }
 
 static void
 bi_i_EditBuffer__dealloc (progs_t *pr)
 {
 	qwaq_ebresources_t *res = PR_Resources_Find (pr, "qwaq-editbuffer");
-	int         buffer_id = P_STRUCT (pr, qwaq_editbuffer_t, 0).buffer;
+	__auto_type self = &P_STRUCT (pr, qwaq_editbuffer_t, 0);
+	int         buffer_id = self->buffer;
 	editbuffer_t *buffer = get_editbuffer (res, __FUNCTION__, buffer_id);
 
 	TextBuffer_Destroy (buffer->txtbuffer);
diff --git a/ruamoko/qwaq/qwaq-editor.h b/ruamoko/qwaq/qwaq-editor.h
new file mode 100644
index 000000000..8a9fd6e06
--- /dev/null
+++ b/ruamoko/qwaq/qwaq-editor.h
@@ -0,0 +1,24 @@
+#ifndef __qwaq_editor_h
+#define __qwaq_editor_h
+
+#include "qwaq-editbuffer.h"
+#include "qwaq-view.h"
+
+@class EditBuffer;
+
+@interface Editor : View
+{
+	EditBuffer *buffer;
+	DrawBuffer *linebuffer;
+	eb_sel_t    selection;
+	unsigned    base_index;		// top left corner
+	unsigned    line_index;		// current line
+	unsigned    char_index;		// current character
+	unsigned    old_cind;		// previous character
+	Point       cursor;
+	unsigned    line_count;
+}
+-initWithRect:(Rect) rect file:(string) filename;
+@end
+
+#endif//__qwaq_editor_h
diff --git a/ruamoko/qwaq/qwaq-editor.r b/ruamoko/qwaq/qwaq-editor.r
new file mode 100644
index 000000000..2192ec320
--- /dev/null
+++ b/ruamoko/qwaq/qwaq-editor.r
@@ -0,0 +1,30 @@
+#include "color.h"
+#include "qwaq-editor.h"
+
+@implementation Editor
+
+-initWithRect:(Rect) rect file:(string) filename
+{
+	if (!(self = [super initWithRect: rect])) {
+		return nil;
+	}
+	buffer = [[EditBuffer alloc] initWithFile: filename];
+	line_count = [buffer countLines: {0, [buffer textSize]}];
+	linebuffer = [DrawBuffer buffer: { xlen, 1 }];
+	return self;
+}
+
+-draw
+{
+	unsigned lind = base_index;
+	int *lbuf = [linebuffer buffer];
+	for (int y = 0; y < ylen; y++) {
+		lind = [buffer formatLine:lind from:0 into:lbuf width:xlen
+				highlight:selection colors: {COLOR_PAIR (1), COLOR_PAIR(2)}];
+		[textContext blitFromBuffer: linebuffer to: {xpos, ypos + y}
+							from: [linebuffer rect]];
+	}
+	return self;
+}
+
+@end

From 869479894300512b32d33f0149b30e5116a2152d Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 22 Mar 2020 22:13:35 +0900
Subject: [PATCH 0909/1519] [qwaq] Fix line formatting for the simple case

That is, known to be working for the simple case (no tabs, no horizontal
scroll).
---
 ruamoko/qwaq/qwaq-editbuffer-bi.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ruamoko/qwaq/qwaq-editbuffer-bi.c b/ruamoko/qwaq/qwaq-editbuffer-bi.c
index a7cf25cc5..70bb64fa5 100644
--- a/ruamoko/qwaq/qwaq-editbuffer-bi.c
+++ b/ruamoko/qwaq/qwaq-editbuffer-bi.c
@@ -483,11 +483,15 @@ formatLine (txtbuffer_t *buffer, unsigned linePtr, unsigned xpos,
 			c = ' ';
 			count = tabSize - (pos % tabSize);
 		}
-		while (length-- > 0 && count-- > 0) {
+		while (length > 0 && count-- > 0) {
 			*dst++ = col | c;
 			pos++;
+			length--;
 		}
 	}
+	while (c != '\n') {
+		c = getChar (buffer, ptr++);
+	}
 	col = ptr >= sels && ptr < sele ? cols : coln;
 	while (length-- > 0) {
 		*dst++ = col | ' ';

From 16c60655e7bafa97869660ee97d724bc86a9e5a3 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 22 Mar 2020 22:42:56 +0900
Subject: [PATCH 0910/1519] [qwaq] Implement scrolling via mouse wheel

Line formatting segs when scrolling horizontally through a tab, but...
things ware working nicely.
---
 ruamoko/qwaq/qwaq-editor.h |  5 +++
 ruamoko/qwaq/qwaq-editor.r | 68 +++++++++++++++++++++++++++++++++++++-
 2 files changed, 72 insertions(+), 1 deletion(-)

diff --git a/ruamoko/qwaq/qwaq-editor.h b/ruamoko/qwaq/qwaq-editor.h
index 8a9fd6e06..2a480103e 100644
--- a/ruamoko/qwaq/qwaq-editor.h
+++ b/ruamoko/qwaq/qwaq-editor.h
@@ -13,12 +13,17 @@
 	eb_sel_t    selection;
 	unsigned    base_index;		// top left corner
 	unsigned    line_index;		// current line
+	unsigned    x_index;		// horizontal scrolling
 	unsigned    char_index;		// current character
 	unsigned    old_cind;		// previous character
 	Point       cursor;
 	unsigned    line_count;
 }
 -initWithRect:(Rect) rect file:(string) filename;
+-scrollUp:(unsigned) count;
+-scrollDown:(unsigned) count;
+-scrollLeft:(unsigned) count;
+-scrollRight:(unsigned) count;
 @end
 
 #endif//__qwaq_editor_h
diff --git a/ruamoko/qwaq/qwaq-editor.r b/ruamoko/qwaq/qwaq-editor.r
index 2192ec320..629090727 100644
--- a/ruamoko/qwaq/qwaq-editor.r
+++ b/ruamoko/qwaq/qwaq-editor.r
@@ -16,10 +16,11 @@
 
 -draw
 {
+	[super draw];
 	unsigned lind = base_index;
 	int *lbuf = [linebuffer buffer];
 	for (int y = 0; y < ylen; y++) {
-		lind = [buffer formatLine:lind from:0 into:lbuf width:xlen
+		lind = [buffer formatLine:lind from:x_index into:lbuf width:xlen
 				highlight:selection colors: {COLOR_PAIR (1), COLOR_PAIR(2)}];
 		[textContext blitFromBuffer: linebuffer to: {xpos, ypos + y}
 							from: [linebuffer rect]];
@@ -27,4 +28,69 @@
 	return self;
 }
 
+-handleEvent:(qwaq_event_t *) event
+{
+	if (event.what & qe_mouse) {
+		if (event.what == qe_mouseclick) {
+			if (event.mouse.buttons & (1 << 3)) {
+				[self scrollUp: 1];
+			}
+			if (event.mouse.buttons & (1 << 4)) {
+				[self scrollDown: 1];
+			}
+			if (event.mouse.buttons & (1 << 5)) {
+				[self scrollLeft: 1];
+			}
+			if (event.mouse.buttons & (1 << 6)) {
+				[self scrollRight: 1];
+			}
+		}
+	}
+	return self;
+}
+
+-scrollUp:(unsigned) count
+{
+	if (count == 1) {
+		base_index = [buffer prevLine: base_index];
+	} else {
+		base_index = [buffer prevLine: base_index :count];
+	}
+	[self redraw];
+	return self;
+}
+
+-scrollDown:(unsigned) count
+{
+	if (count == 1) {
+		base_index = [buffer nextLine: base_index];
+	} else {
+		base_index = [buffer nextLine: base_index :count];
+	}
+	[self redraw];
+	return self;
+}
+
+-scrollLeft:(unsigned) count
+{
+	if (x_index > count) {
+		x_index -= count;
+	} else {
+		x_index = 0;
+	}
+	[self redraw];
+	return self;
+}
+
+-scrollRight:(unsigned) count
+{
+	if (1024 - x_index > count) {
+		x_index += count;
+	} else {
+		x_index = 1024;
+	}
+	[self redraw];
+	return self;
+}
+
 @end

From bde31245331faa732bfedd7a1ae77764ea27ecd5 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 22 Mar 2020 23:50:27 +0900
Subject: [PATCH 0911/1519] [qwaq] Fix some more formatLine cases

I think this is all of them. Scrolling around in a file, including
having the end of file visible in the window, seems to work well.
---
 ruamoko/qwaq/qwaq-curses.c        | 2 +-
 ruamoko/qwaq/qwaq-editbuffer-bi.c | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-curses.c b/ruamoko/qwaq/qwaq-curses.c
index 3306af584..02368edc8 100644
--- a/ruamoko/qwaq/qwaq-curses.c
+++ b/ruamoko/qwaq/qwaq-curses.c
@@ -152,7 +152,7 @@ get_window (qwaq_resources_t *res, const char *name, int handle)
 	window_t   *window = window_get (res, handle);
 
 	if (!window || !window->win) {
-		PR_RunError (res->pr, "invalid window passed to %s", name + 3);
+		PR_RunError (res->pr, "invalid window passed to %s", name + 5);
 	}
 	return window;
 }
diff --git a/ruamoko/qwaq/qwaq-editbuffer-bi.c b/ruamoko/qwaq/qwaq-editbuffer-bi.c
index 70bb64fa5..2f3f560e9 100644
--- a/ruamoko/qwaq/qwaq-editbuffer-bi.c
+++ b/ruamoko/qwaq/qwaq-editbuffer-bi.c
@@ -469,10 +469,12 @@ formatLine (txtbuffer_t *buffer, unsigned linePtr, unsigned xpos,
 		ptr++;
 	}
 	col = ptr >= sels && ptr < sele ? cols : coln;
-	while (xpos < pos && length-- > 0) {
+	while (xpos < pos && length > 0) {
 		*dst++ = col | ' ';
+		length--;
+		xpos++;
 	}
-	while (length > 0) {
+	while (length > 0 && ptr < buffer->textSize) {
 		col = ptr >= sels && ptr < sele ? cols : coln;
 		c = getChar (buffer, ptr++);
 		if (c == '\n') {
@@ -489,7 +491,7 @@ formatLine (txtbuffer_t *buffer, unsigned linePtr, unsigned xpos,
 			length--;
 		}
 	}
-	while (c != '\n') {
+	while (c != '\n' && ptr < buffer->textSize) {
 		c = getChar (buffer, ptr++);
 	}
 	col = ptr >= sels && ptr < sele ? cols : coln;

From 1dd05a8ac966ab4318edf2101de8d7bcb2e534e7 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 22 Mar 2020 23:58:58 +0900
Subject: [PATCH 0912/1519] [qwaq] Fix an uninitialized var warning

---
 ruamoko/qwaq/qwaq-editbuffer-bi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ruamoko/qwaq/qwaq-editbuffer-bi.c b/ruamoko/qwaq/qwaq-editbuffer-bi.c
index 2f3f560e9..ef870e4a0 100644
--- a/ruamoko/qwaq/qwaq-editbuffer-bi.c
+++ b/ruamoko/qwaq/qwaq-editbuffer-bi.c
@@ -454,7 +454,7 @@ formatLine (txtbuffer_t *buffer, unsigned linePtr, unsigned xpos,
 	int         coln = (colors->normal & ~0xff);
 	int         cols = (colors->selected & ~0xff);
 	int         col;
-	byte        c;
+	byte        c = 0;
 	int         count;
 
 	while (pos < xpos && ptr < buffer->textSize) {

From 4a61ff0d35e0a51b3ec267619421374b28e83e8e Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 23 Mar 2020 15:15:39 +0900
Subject: [PATCH 0913/1519] [util] Switch to using sigaction for signal
 handling

This allows for much more consistent semantics when dealing with
signals.
---
 libs/util/sys.c | 67 ++++++++++++++++++++++++++++---------------------
 1 file changed, 38 insertions(+), 29 deletions(-)

diff --git a/libs/util/sys.c b/libs/util/sys.c
index de1cb35d8..4f7076d92 100644
--- a/libs/util/sys.c
+++ b/libs/util/sys.c
@@ -103,6 +103,19 @@ int         sys_checksum;
 static sys_printf_t sys_std_printf_function = Sys_StdPrintf;
 static sys_printf_t sys_err_printf_function = Sys_ErrPrintf;
 
+#ifndef _WIN32
+static struct sigaction save_hup;
+static struct sigaction save_quit;
+static struct sigaction save_trap;
+static struct sigaction save_iot;
+static struct sigaction save_bus;
+#endif
+static struct sigaction save_int;
+static struct sigaction save_ill;
+static struct sigaction save_segv;
+static struct sigaction save_term;
+static struct sigaction save_fpe;
+
 typedef struct shutdown_list_s {
 	struct shutdown_list_s *next;
 	void      (*func) (void *);
@@ -812,7 +825,7 @@ aiee (int sig)
 }
 
 static void
-signal_handler (int sig)
+signal_handler (int sig, siginfo_t *info, void *ucontext)
 {
 	int volatile recover = 0;	// volatile for longjump
 
@@ -845,26 +858,19 @@ signal_handler (int sig)
 				Sys_Shutdown ();
 			}
 
-			if (recover) {
+			if (!recover) {
 #ifndef _WIN32
-				signal (SIGQUIT, signal_handler);
-				signal (SIGTRAP, signal_handler);
-				signal (SIGIOT, signal_handler);
-				signal (SIGBUS, signal_handler);
+				sigaction (SIGHUP,  &save_hup,  0);
+				sigaction (SIGQUIT, &save_quit, 0);
+				sigaction (SIGTRAP, &save_trap, 0);
+				sigaction (SIGIOT,  &save_iot,  0);
+				sigaction (SIGBUS,  &save_bus,  0);
 #endif
-				signal (SIGILL, signal_handler);
-				signal (SIGSEGV, signal_handler);
-				signal (SIGFPE, signal_handler);
-			} else {
-#ifndef _WIN32
-				signal (SIGQUIT, SIG_DFL);
-				signal (SIGTRAP, SIG_DFL);
-				signal (SIGIOT, SIG_DFL);
-				signal (SIGBUS, SIG_DFL);
-#endif
-				signal (SIGILL, SIG_DFL);
-				signal (SIGSEGV, SIG_DFL);
-				signal (SIGFPE, SIG_DFL);
+				sigaction (SIGINT,  &save_int,  0);
+				sigaction (SIGILL,  &save_ill,  0);
+				sigaction (SIGSEGV, &save_segv, 0);
+				sigaction (SIGTERM, &save_term, 0);
+				sigaction (SIGFPE,  &save_fpe,  0);
 			}
 	}
 }
@@ -873,18 +879,21 @@ VISIBLE void
 Sys_Init (void)
 {
 	// catch signals
+	struct sigaction action = {};
+	action.sa_flags = SA_SIGINFO;
+	action.sa_sigaction = signal_handler;
 #ifndef _WIN32
-	signal (SIGHUP, signal_handler);
-	signal (SIGQUIT, signal_handler);
-	signal (SIGTRAP, signal_handler);
-	signal (SIGIOT, signal_handler);
-	signal (SIGBUS, signal_handler);
+	sigaction (SIGHUP,  &action, &save_hup);
+	sigaction (SIGQUIT, &action, &save_quit);
+	sigaction (SIGTRAP, &action, &save_trap);
+	sigaction (SIGIOT,  &action, &save_iot);
+	sigaction (SIGBUS,  &action, &save_bus);
 #endif
-	signal (SIGINT, signal_handler);
-	signal (SIGILL, signal_handler);
-	signal (SIGSEGV, signal_handler);
-	signal (SIGTERM, signal_handler);
-	signal (SIGFPE, signal_handler);
+	sigaction (SIGINT,  &action, &save_int);
+	sigaction (SIGILL,  &action, &save_ill);
+	sigaction (SIGSEGV, &action, &save_segv);
+	sigaction (SIGTERM, &action, &save_term);
+	sigaction (SIGFPE,  &action, &save_fpe);
 
 	Cvar_Init_Hash ();
 	Cmd_Init_Hash ();

From a9c6974fc73f135c3061e0ada7aadc9ba9f92cb4 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 23 Mar 2020 15:19:05 +0900
Subject: [PATCH 0914/1519] [audio] Quieten jack about xruns

They messages are annoying at the moment, but I will want them when I
get around to chasing down the root cause, so hidden behind a developer
mask.
---
 libs/audio/renderer/snd_jack.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libs/audio/renderer/snd_jack.c b/libs/audio/renderer/snd_jack.c
index 36c5d0e6a..f37ef3dc8 100644
--- a/libs/audio/renderer/snd_jack.c
+++ b/libs/audio/renderer/snd_jack.c
@@ -306,7 +306,9 @@ snd_jack_error (const char *desc)
 static int
 snd_jack_xrun (void *arg)
 {
-	fprintf (stderr, "snd_jack: xrun\n");
+	if (developer->int_val & SYS_SND) {
+		fprintf (stderr, "snd_jack: xrun\n");
+	}
 	return 0;
 }
 

From eb386826d3e27cf2d537c01acf9d626133d77bfd Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 23 Mar 2020 15:27:42 +0900
Subject: [PATCH 0915/1519] [util] Fix some missed signal calls

*sigh*
---
 libs/util/sys.c | 29 ++++++++++-------------------
 1 file changed, 10 insertions(+), 19 deletions(-)

diff --git a/libs/util/sys.c b/libs/util/sys.c
index 4f7076d92..7e09b4f91 100644
--- a/libs/util/sys.c
+++ b/libs/util/sys.c
@@ -817,18 +817,22 @@ Sys_PopSignalHook (void)
 	}
 }
 
-static void
+static void __attribute__((noreturn))
 aiee (int sig)
 {
 	printf ("AIEE, signal %d in shutdown code, giving up\n", sig);
-	longjmp (aiee_abort, 1);
+	siglongjmp (aiee_abort, 1);
 }
 
 static void
 signal_handler (int sig, siginfo_t *info, void *ucontext)
 {
 	int volatile recover = 0;	// volatile for longjump
+	static volatile int in_signal_handler = 0;
 
+	if (in_signal_handler) {
+		aiee (sig);
+	}
 	printf ("Received signal %d, exiting...\n", sig);
 
 	switch (sig) {
@@ -836,23 +840,13 @@ signal_handler (int sig, siginfo_t *info, void *ucontext)
 		case SIGTERM:
 #ifndef _WIN32
 		case SIGHUP:
-			signal (SIGHUP, SIG_DFL);
+			sigaction (SIGHUP,  &save_hup,  0);
 #endif
-			signal (SIGINT, SIG_DFL);
-			signal (SIGTERM, SIG_DFL);
+			sigaction (SIGINT,  &save_int,  0);
+			sigaction (SIGTERM, &save_term, 0);
 			Sys_Quit ();
 		default:
-#ifndef _WIN32
-			signal (SIGQUIT, aiee);
-			signal (SIGTRAP, aiee);
-			signal (SIGIOT, aiee);
-			signal (SIGBUS, aiee);
-#endif
-			signal (SIGILL, aiee);
-			signal (SIGSEGV, aiee);
-			signal (SIGFPE, aiee);
-
-			if (!setjmp (aiee_abort)) {
+			if (!sigsetjmp (aiee_abort, 1)) {
 				if (signal_hook)
 					recover = signal_hook (sig, signal_hook_data);
 				Sys_Shutdown ();
@@ -860,16 +854,13 @@ signal_handler (int sig, siginfo_t *info, void *ucontext)
 
 			if (!recover) {
 #ifndef _WIN32
-				sigaction (SIGHUP,  &save_hup,  0);
 				sigaction (SIGQUIT, &save_quit, 0);
 				sigaction (SIGTRAP, &save_trap, 0);
 				sigaction (SIGIOT,  &save_iot,  0);
 				sigaction (SIGBUS,  &save_bus,  0);
 #endif
-				sigaction (SIGINT,  &save_int,  0);
 				sigaction (SIGILL,  &save_ill,  0);
 				sigaction (SIGSEGV, &save_segv, 0);
-				sigaction (SIGTERM, &save_term, 0);
 				sigaction (SIGFPE,  &save_fpe,  0);
 			}
 	}

From 178c8dec85414ee2744273e9b73ca96b29d2574f Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 23 Mar 2020 16:01:07 +0900
Subject: [PATCH 0916/1519] [console] Fix server console resize

I goofed when doing the win32 fixes
---
 libs/console/server.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/libs/console/server.c b/libs/console/server.c
index 83cce7f3d..82be1cf1c 100644
--- a/libs/console/server.c
+++ b/libs/console/server.c
@@ -342,13 +342,12 @@ static void
 sigwinch (int sig)
 {
 	interrupted = 1;
-	signal (SIGWINCH, sigwinch);
 }
 #endif
 static void
 get_size (int *xlen, int *ylen)
 {
-#if 0
+#ifdef SIGWINCH
 	struct winsize size;
 
 	*xlen = *ylen = 0;
@@ -356,8 +355,9 @@ get_size (int *xlen, int *ylen)
 		return;
 	*xlen = size.ws_col;
 	*ylen = size.ws_row;
-#endif
+#else
 	getmaxyx (stdscr, *ylen, *xlen);
+#endif
 }
 
 static void
@@ -366,10 +366,11 @@ process_input (void)
 	int         ch;
 	int         escape = 0;
 
-	if (interrupted) {
-#ifdef SIGWINCH
+	if (__builtin_expect (interrupted, 0)) {
 		interrupted = 0;
+#ifdef SIGWINCH
 		get_size (&screen_x, &screen_y);
+		Sys_MaskPrintf (SYS_DEV, "resizing to %d x %d\n", screen_x, screen_y);
 		resizeterm (screen_y, screen_x);
 		con_linewidth = screen_x;
 		view_resize (sv_con_data.view, screen_x, screen_y);
@@ -570,7 +571,9 @@ static void
 init (void)
 {
 #ifdef SIGWINCH
-	signal (SIGWINCH, sigwinch);
+	struct sigaction action = {};
+	action.sa_handler = sigwinch;
+	sigaction (SIGWINCH, &action, 0);
 #endif
 
 	initscr ();

From 9986b57a777c83ab017a3f88141d5e6d7279628a Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 23 Mar 2020 16:16:50 +0900
Subject: [PATCH 0917/1519] [console] Use sig_atomic_t for SIGWINCH

If it's not defined on other platforms, something can be done in
config.h
---
 libs/console/server.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/console/server.c b/libs/console/server.c
index 82be1cf1c..3b8cd2dd6 100644
--- a/libs/console/server.c
+++ b/libs/console/server.c
@@ -99,7 +99,7 @@ static view_t *output;
 static view_t *status;
 static view_t *input;
 static int screen_x, screen_y;
-static int interrupted;
+static volatile sig_atomic_t interrupted;
 static int batch_print;
 
 #define     MAXCMDLINE  256

From d0c8d75e9261ef68210320c0819994610c9d31f0 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 23 Mar 2020 16:18:08 +0900
Subject: [PATCH 0918/1519] Clean up unnecessary includes of signal.h

---
 libs/audio/cd_xmms.c   | 3 ---
 qw/source/cl_sys_sdl.c | 4 ----
 2 files changed, 7 deletions(-)

diff --git a/libs/audio/cd_xmms.c b/libs/audio/cd_xmms.c
index 6ed35d2cf..47c8a187f 100644
--- a/libs/audio/cd_xmms.c
+++ b/libs/audio/cd_xmms.c
@@ -43,9 +43,6 @@
 #ifdef HAVE_SYS_IOCTL_H
 # include <sys/ioctl.h>
 #endif
-#ifdef HAVE_SIGNAL_H
-# include <signal.h>
-#endif
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/qw/source/cl_sys_sdl.c b/qw/source/cl_sys_sdl.c
index 79357134a..3a5f1385b 100644
--- a/qw/source/cl_sys_sdl.c
+++ b/qw/source/cl_sys_sdl.c
@@ -50,10 +50,6 @@
 # include <sys/fcntl.h>
 #endif
 
-#ifndef _WIN32
-# include <signal.h>
-#endif
-
 #include <SDL.h>
 #include <SDL_main.h>
 

From 9bc91cd7d1ea1797aebfeb5f77dbf0fa50f36d52 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 23 Mar 2020 20:14:32 +0900
Subject: [PATCH 0919/1519] [qwaq] Implement resizing

Terminal resize is detected and the views adjust appropriately (well,
those for which I've set grow flags: the window title bar doesn't adjust
yet).
---
 ruamoko/qwaq/event.h            |   7 ++
 ruamoko/qwaq/qwaq-app.h         |   2 +
 ruamoko/qwaq/qwaq-app.r         |  21 +++++-
 ruamoko/qwaq/qwaq-curses.c      | 130 +++++++++++++++++++++++++++++++-
 ruamoko/qwaq/qwaq-curses.h      |   3 +
 ruamoko/qwaq/qwaq-draw.h        |   1 +
 ruamoko/qwaq/qwaq-draw.r        |   6 ++
 ruamoko/qwaq/qwaq-editor.r      |   8 ++
 ruamoko/qwaq/qwaq-group.h       |   1 +
 ruamoko/qwaq/qwaq-group.r       |   8 ++
 ruamoko/qwaq/qwaq-input.c       |  44 +++++++++++
 ruamoko/qwaq/qwaq-rect.h        |   4 +-
 ruamoko/qwaq/qwaq-textcontext.h |  14 ++++
 ruamoko/qwaq/qwaq-textcontext.r |   4 +
 ruamoko/qwaq/qwaq-view.h        |  16 ++++
 ruamoko/qwaq/qwaq-view.r        |  63 ++++++++++++++++
 ruamoko/qwaq/qwaq-window.r      |  13 ++++
 17 files changed, 339 insertions(+), 6 deletions(-)

diff --git a/ruamoko/qwaq/event.h b/ruamoko/qwaq/event.h
index 89534f32a..0679d42dd 100644
--- a/ruamoko/qwaq/event.h
+++ b/ruamoko/qwaq/event.h
@@ -16,6 +16,7 @@ typedef enum {
 typedef enum {
 	qe_command   = 0x0200,		// application level command
 	qe_broadcast = 0x0400,
+	qe_resize    = 0x0800,		// screen resized
 } qwaq_message_event;
 
 typedef enum {
@@ -46,6 +47,11 @@ typedef struct qwaq_kevent_s {
 	int         shift;
 } qwaq_kevent_t;
 
+typedef struct qwaq_resize_s {
+	int         width;
+	int         height;
+} qwaq_resize_t;
+
 typedef struct qwaq_message_s {
 	qwaq_command command;
 } qwaq_message_t;
@@ -57,6 +63,7 @@ typedef struct qwaq_event_s {
 		qwaq_kevent_t key;
 		qwaq_mevent_t mouse;
 		qwaq_message_t message;
+		qwaq_resize_t resize;
 	};
 } qwaq_event_t;
 
diff --git a/ruamoko/qwaq/qwaq-app.h b/ruamoko/qwaq/qwaq-app.h
index db341c7a3..acf63f679 100644
--- a/ruamoko/qwaq/qwaq-app.h
+++ b/ruamoko/qwaq/qwaq-app.h
@@ -4,6 +4,7 @@
 #include <Object.h>
 
 #include "event.h"
+#include "qwaq-rect.h"
 
 @class Group;
 @class TextContext;
@@ -16,6 +17,7 @@
 	Group      *objects;
 
 	TextContext *screen;
+	Extent      screenSize;
 	int         autocount;
 }
 -run;
diff --git a/ruamoko/qwaq/qwaq-app.r b/ruamoko/qwaq/qwaq-app.r
index 4ea23f2ae..6d92e9729 100644
--- a/ruamoko/qwaq/qwaq-app.r
+++ b/ruamoko/qwaq/qwaq-app.r
@@ -47,11 +47,13 @@ arp_end (void)
 	init_pair (4, COLOR_YELLOW, COLOR_RED);
 
 	screen = [TextContext screen];
+	screenSize = [screen size];
+	printf ("screenSize = %d x %d", screenSize.width, screenSize.height);
 	objects = [[Group alloc] initWithContext: screen owner: nil];
 
 	[screen bkgd: COLOR_PAIR (1)];
 	[screen scrollok: 1];
-	Rect r = { nil, [screen size] };
+	Rect r = {nil, screenSize};
 	r.offset.x = r.extent.width / 4;
 	r.offset.y = r.extent.height / 4;
 	r.extent.width /= 2;
@@ -88,8 +90,23 @@ arp_end (void)
 
 -handleEvent: (qwaq_event_t *) event
 {
+	if (event.what == qe_resize) {
+		Extent delta;
+		delta.width = event.resize.width - screenSize.width;
+		delta.height = event.resize.height - screenSize.height;
+
+		resizeterm (event.resize.width, event.resize.height);
+		[screen resizeTo: {event.resize.width, event.resize.height}];
+		screenSize = [screen size];
+		[screen printf:"resized to %d x %d, delta: %d x %d\n", event.resize.width, event.resize.height, delta.width, delta.height];
+		[objects resize: delta];
+		[screen refresh];
+		event.what = qe_none;
+		return self;
+	}
 	[objects handleEvent: event];
-	if (event.what == qe_key && event.key.code == '\x18') {
+	if (event.what == qe_key
+		&& (event.key.code == '\x18' || event.key.code == '\x11')) {
 		event.what = qe_command;
 		event.message.command = qc_exit;
 	}
diff --git a/ruamoko/qwaq/qwaq-curses.c b/ruamoko/qwaq/qwaq-curses.c
index 02368edc8..847c3be52 100644
--- a/ruamoko/qwaq/qwaq-curses.c
+++ b/ruamoko/qwaq/qwaq-curses.c
@@ -66,6 +66,7 @@ typedef enum qwaq_commands_e {
 	qwaq_cmd_bottom_panel,
 	qwaq_cmd_move_panel,
 	qwaq_cmd_panel_window,
+	qwaq_cmd_replace_panel,
 	qwaq_cmd_update_panels,
 	qwaq_cmd_doupdate,
 	qwaq_cmd_mvwaddstr,
@@ -81,6 +82,8 @@ typedef enum qwaq_commands_e {
 	qwaq_cmd_curs_set,
 	qwaq_cmd_wborder,
 	qwaq_cmd_mvwblit_line,
+	qwaq_cmd_wresize,
+	qwaq_cmd_resizeterm,
 } qwaq_commands;
 
 static const char *qwaq_command_names[]= {
@@ -95,6 +98,7 @@ static const char *qwaq_command_names[]= {
 	"bottom_panel",
 	"move_panel",
 	"panel_window",
+	"replace_panel",
 	"update_panels",
 	"doupdate",
 	"mvwaddstr",
@@ -110,6 +114,8 @@ static const char *qwaq_command_names[]= {
 	"curs_set",
 	"wborder",
 	"mvwblit_line",
+	"wresize",
+	"resizeterm",
 };
 
 static window_t *
@@ -398,6 +404,18 @@ cmd_panel_window (qwaq_resources_t *res)
 	qwaq_submit_result (res, cmd_result, CMD_SIZE (cmd_result));
 }
 
+static void
+cmd_replace_panel (qwaq_resources_t *res)
+{
+	int         panel_id = RB_PEEK_DATA (res->command_queue, 2);
+	int         window_id = RB_PEEK_DATA (res->command_queue, 3);
+
+	panel_t   *panel = get_panel (res, __FUNCTION__, panel_id);
+	window_t  *window = get_window (res, __FUNCTION__, window_id);
+
+	replace_panel (panel->panel, window->win);
+}
+
 static void
 cmd_update_panels (qwaq_resources_t *res)
 {
@@ -561,10 +579,30 @@ cmd_mvwblit_line (qwaq_resources_t *res)
 	release_string (res, chs_id);
 }
 
+static void
+cmd_wresize (qwaq_resources_t *res)
+{
+	int         window_id = RB_PEEK_DATA (res->command_queue, 2);
+	int         width = RB_PEEK_DATA (res->command_queue, 3);
+	int         height = RB_PEEK_DATA (res->command_queue, 4);
+
+	window_t   *window = get_window (res, __FUNCTION__, window_id);
+	wresize (window->win, height, width);
+}
+
+static void
+cmd_resizeterm (qwaq_resources_t *res)
+{
+	int         width = RB_PEEK_DATA (res->command_queue, 2);
+	int         height = RB_PEEK_DATA (res->command_queue, 3);
+
+	resizeterm (height, width);
+}
+
 static void
 dump_command (qwaq_resources_t *res, int len)
 {
-	if (0) {
+	if (1) {
 		qwaq_commands cmd = RB_PEEK_DATA (res->command_queue, 0);
 		Sys_Printf ("%s[%d]", qwaq_command_names[cmd], len);
 		for (int i = 2; i < len; i++) {
@@ -642,6 +680,9 @@ process_commands (qwaq_resources_t *res)
 			case qwaq_cmd_panel_window:
 				cmd_panel_window (res);
 				break;
+			case qwaq_cmd_replace_panel:
+				cmd_replace_panel (res);
+				break;
 			case qwaq_cmd_update_panels:
 				cmd_update_panels (res);
 				break;
@@ -687,6 +728,12 @@ process_commands (qwaq_resources_t *res)
 			case qwaq_cmd_mvwblit_line:
 				cmd_mvwblit_line (res);
 				break;
+			case qwaq_cmd_wresize:
+				cmd_wresize (res);
+				break;
+			case qwaq_cmd_resizeterm:
+				cmd_resizeterm (res);
+				break;
 		}
 		pthread_mutex_lock (&res->command_cond.mut);
 		RB_DROP_DATA (res->command_queue, len);
@@ -892,6 +939,22 @@ bi_panel_window (progs_t *pr)
 	}
 }
 
+static void
+bi_replace_panel (progs_t *pr)
+{
+	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
+	int         panel_id = P_INT (pr, 0);
+	int         window_id = P_INT (pr, 1);
+
+	if (get_panel (res, __FUNCTION__, panel_id)
+		&& get_window (res, __FUNCTION__, window_id)) {
+		int         command[] = { qwaq_cmd_replace_panel, 0,
+								  panel_id, window_id};
+		command[1] = CMD_SIZE(command);
+		qwaq_submit_command (res, command);
+	}
+}
+
 static void
 qwaq_update_panels (progs_t *pr)
 {
@@ -950,6 +1013,50 @@ bi_waddstr (progs_t *pr)
 	qwaq_waddstr (pr, window_id, str);
 }
 
+static void
+qwaq_wresize (progs_t *pr, int window_id, int width, int height)
+{
+	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
+
+	if (get_window (res, __FUNCTION__, window_id)) {
+		int         command[] = {
+						qwaq_cmd_wresize, 0,
+						window_id, width, height
+					};
+
+		command[1] = CMD_SIZE(command);
+		qwaq_submit_command (res, command);
+	}
+}
+static void
+bi_wresize (progs_t *pr)
+{
+	int         window_id = P_STRUCT (pr, qwaq_textcontext_t, 0).window;
+	int         width = P_INT (pr, 1);
+	int         height = P_INT (pr, 2);
+
+	qwaq_wresize (pr, window_id, width, height);
+}
+
+static void
+qwaq_resizeterm (progs_t *pr, int width, int height)
+{
+	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
+
+	int         command[] = { qwaq_cmd_resizeterm, 0, width, height };
+
+	command[1] = CMD_SIZE(command);
+	qwaq_submit_command (res, command);
+}
+static void
+bi_resizeterm (progs_t *pr)
+{
+	int         width = P_INT (pr, 0);
+	int         height = P_INT (pr, 1);
+
+	qwaq_resizeterm (pr, width, height);
+}
+
 static void
 qwaq_mvwaddstr (progs_t *pr, int window_id, int x, int y, const char *str)
 {
@@ -1572,6 +1679,19 @@ bi_i_TextContext__mvvprintf_ (progs_t *pr)
 	qwaq_mvwvprintf (pr, pos->x, pos->y, window_id, fmt, args);
 }
 
+static void
+bi_i_TextContext__resizeTo_ (progs_t *pr)
+{
+	__auto_type self = &P_STRUCT (pr, qwaq_textcontext_t, 0);
+	int         window_id = self->window;
+
+	self->size = P_PACKED (pr, Extent, 2);
+	qwaq_wresize (pr, window_id, self->size.width, self->size.height);
+	if (window_id == 1) {
+		qwaq_wbkgd (pr, window_id, self->background);
+	}
+}
+
 static void
 bi_c_TextContext__refresh (progs_t *pr)
 {
@@ -1614,9 +1734,11 @@ bi_i_TextContext__mvaddstr_ (progs_t *pr)
 static void
 bi_i_TextContext__bkgd_ (progs_t *pr)
 {
-	int         window_id = P_STRUCT (pr, qwaq_textcontext_t, 0).window;
+	__auto_type self = &P_STRUCT (pr, qwaq_textcontext_t, 0);
+	int         window_id = self->window;
 	int         ch = P_INT (pr, 2);
 
+	self->background = ch;
 	qwaq_wbkgd (pr, window_id, ch);
 }
 
@@ -1675,6 +1797,7 @@ static builtin_t builtins[] = {
 	{"bottom_panel",	bi_bottom_panel,	-1},
 	{"move_panel",		bi_move_panel,		-1},
 	{"panel_window",	bi_panel_window,	-1},
+	{"replace_panel",	bi_replace_panel,	-1},
 	{"update_panels",	bi_update_panels,	-1},
 	{"doupdate",		bi_doupdate,		-1},
 	{"mvwprintf",		bi_mvwprintf,		-1},
@@ -1698,6 +1821,8 @@ static builtin_t builtins[] = {
 	{"curs_set",		bi_curs_set,		-1},
 	{"wborder",			bi_wborder,			-1},
 	{"mvwblit_line",	bi_mvwblit_line,	-1},
+	{"wresize",			bi_wresize,			-1},
+	{"resizeterm",		bi_resizeterm,		-1},
 
 	{"printf",			bi_printf,	-1},
 
@@ -1715,6 +1840,7 @@ static builtin_t builtins[] = {
 	{"_i_TextContext__addch_",			bi_i_TextContext__addch_,		   -1},
 	{"_i_TextContext__addstr_",			bi_i_TextContext__addstr_,		   -1},
 	{"_i_TextContext__mvvprintf_",		bi_i_TextContext__mvvprintf_,	   -1},
+	{"_i_TextContext__resizeTo_",		bi_i_TextContext__resizeTo_,	   -1},
 	{"_c_TextContext__refresh",			bi_c_TextContext__refresh,		   -1},
 	{"_i_TextContext__refresh",			bi_i_TextContext__refresh,		   -1},
 	{"_i_TextContext__mvaddch_",		bi_i_TextContext__mvaddch_,		   -1},
diff --git a/ruamoko/qwaq/qwaq-curses.h b/ruamoko/qwaq/qwaq-curses.h
index be87e6423..f04c0dd1a 100644
--- a/ruamoko/qwaq/qwaq-curses.h
+++ b/ruamoko/qwaq/qwaq-curses.h
@@ -109,6 +109,7 @@ typedef struct panel_s *panel_t;
 @extern void move_panel (panel_t panel, int x, int y);
 @extern window_t panel_window (panel_t panel);
 @extern void update_panels (void);
+@extern void replace_panel (panel_t panel, window_t window);
 @extern void doupdate (void);
 
 @extern int get_event (qwaq_event_t *event);
@@ -126,6 +127,8 @@ typedef struct panel_s *panel_t;
 @extern void wborder (window_t window,
 					  box_sides_t sides, box_corners_t corners);
 @extern void mvwblit_line (window_t window, int x, int y, int *wch, int len);
+@extern void wresize (window_t window, int width, int height);
+@extern void resizeterm (int width, int height);
 
 @extern Rect getwrect (struct window_s *window);
 
diff --git a/ruamoko/qwaq/qwaq-draw.h b/ruamoko/qwaq/qwaq-draw.h
index 65599347f..3092cc77f 100644
--- a/ruamoko/qwaq/qwaq-draw.h
+++ b/ruamoko/qwaq/qwaq-draw.h
@@ -17,6 +17,7 @@
 @protocol TextContext
 - blitFromBuffer: (DrawBuffer *) srcBuffer to: (Point) pos from: (Rect) rect;
 - (Extent) size;
+- (void) resizeTo: (Extent) newSize;	// absolute size
 
 - (void) bkgd: (int) ch;
 - (void) clear;
diff --git a/ruamoko/qwaq/qwaq-draw.r b/ruamoko/qwaq/qwaq-draw.r
index 757f00e90..ed1f8837a 100644
--- a/ruamoko/qwaq/qwaq-draw.r
+++ b/ruamoko/qwaq/qwaq-draw.r
@@ -25,6 +25,12 @@
 	return size;
 }
 
+- (void) resizeTo: (Extent) newSize
+{
+	size = newSize;
+	buffer = obj_realloc (buffer, size.width * size.height);
+}
+
 - (int *) buffer
 {
 	return buffer;
diff --git a/ruamoko/qwaq/qwaq-editor.r b/ruamoko/qwaq/qwaq-editor.r
index 629090727..72db77115 100644
--- a/ruamoko/qwaq/qwaq-editor.r
+++ b/ruamoko/qwaq/qwaq-editor.r
@@ -11,6 +11,7 @@
 	buffer = [[EditBuffer alloc] initWithFile: filename];
 	line_count = [buffer countLines: {0, [buffer textSize]}];
 	linebuffer = [DrawBuffer buffer: { xlen, 1 }];
+	growMode = gfGrowHi;
 	return self;
 }
 
@@ -28,6 +29,13 @@
 	return self;
 }
 
+-resize: (Extent) delta
+{
+	[super resize: delta];
+	[linebuffer resizeTo: {xlen, 1}];
+	return self;
+}
+
 -handleEvent:(qwaq_event_t *) event
 {
 	if (event.what & qe_mouse) {
diff --git a/ruamoko/qwaq/qwaq-group.h b/ruamoko/qwaq/qwaq-group.h
index eaa7606eb..776aa1b16 100644
--- a/ruamoko/qwaq/qwaq-group.h
+++ b/ruamoko/qwaq/qwaq-group.h
@@ -25,6 +25,7 @@
 -(Extent) size;
 -draw;
 -redraw;
+-resize: (Extent) delta;
 -handleEvent: (qwaq_event_t *) event;
 -(void) grabMouse;
 -(void) releaseMouse;
diff --git a/ruamoko/qwaq/qwaq-group.r b/ruamoko/qwaq/qwaq-group.r
index 2df05bcba..bcfa7e375 100644
--- a/ruamoko/qwaq/qwaq-group.r
+++ b/ruamoko/qwaq/qwaq-group.r
@@ -100,6 +100,14 @@ not_dont_draw (id aView, void *aGroup)
 	return self;
 }
 
+-resize: (Extent) delta
+{
+	for (int i = [views count]; i-- > 0; ) {
+		[[views objectAtIndex: i] grow: delta];
+	}
+	return self;
+}
+
 static View *
 find_mouse_view(Group *group, Point pos)
 {
diff --git a/ruamoko/qwaq/qwaq-input.c b/ruamoko/qwaq/qwaq-input.c
index 61d3b1208..b0d0da742 100644
--- a/ruamoko/qwaq/qwaq-input.c
+++ b/ruamoko/qwaq/qwaq-input.c
@@ -31,9 +31,11 @@
 # include "config.h"
 #endif
 
+#include <sys/ioctl.h>
 #include <ctype.h>
 #include <errno.h>
 #include <pthread.h>
+#include <signal.h>
 #include <stdio.h>
 #include <string.h>
 #include <termios.h>
@@ -162,6 +164,16 @@ static qwaq_key_t default_keys[] = {
 	{ "\033[1;6D",	QFK_LEFT,		5 },
 };
 
+static struct sigaction save_winch;
+static sigset_t winch_mask;
+static volatile sig_atomic_t winch_arrived;
+
+static void
+handle_winch (int sig)
+{
+	winch_arrived = 1;
+}
+
 static void
 add_event (qwaq_resources_t *res, qwaq_event_t *event)
 {
@@ -194,6 +206,20 @@ add_event (qwaq_resources_t *res, qwaq_event_t *event)
 	pthread_mutex_unlock (&res->event_cond.mut);
 }
 
+static void
+resize_event (qwaq_resources_t *res)
+{
+	qwaq_event_t event = {};
+	struct winsize size;
+	if (ioctl (fileno (stdout), TIOCGWINSZ, &size) != 0) {
+		return;
+	}
+	event.what = qe_resize;
+	event.resize.width = size.ws_col;
+	event.resize.height = size.ws_row;
+	add_event (res, &event);
+}
+
 static void
 key_event (qwaq_resources_t *res, int key, unsigned shift)
 {
@@ -396,6 +422,13 @@ void qwaq_input_init (qwaq_resources_t *res)
 		 i++) {
 		Hash_Add (res->key_sequences, &default_keys[i]);
 	}
+
+	sigemptyset (&winch_mask);
+	sigaddset (&winch_mask, SIGWINCH);
+	struct sigaction action = {};
+	action.sa_handler = handle_winch;
+	sigaction (SIGWINCH, &action, &save_winch);
+
 	// ncurses takes care of input mode for us, so need only tell xterm
 	// what we need
 	write(1, MOUSE_MOVES_ON, sizeof (MOUSE_MOVES_ON) - 1);
@@ -408,13 +441,24 @@ void qwaq_input_shutdown (qwaq_resources_t *res)
 	// what we need
 	write(1, SGR_OFF, sizeof (SGR_OFF) - 1);
 	write(1, MOUSE_MOVES_OFF, sizeof (MOUSE_MOVES_OFF) - 1);
+
+	sigaction (SIGWINCH, &save_winch, 0);
 }
 
 void qwaq_process_input (qwaq_resources_t *res)
 {
 	char        buf[256];
 	int         len;
+	sigset_t    save_set;
+	int         saw_winch;
 
+	pthread_sigmask (SIG_BLOCK, &winch_mask, &save_set);
+	saw_winch = winch_arrived;
+	winch_arrived = 0;
+	pthread_sigmask (SIG_SETMASK, &save_set, 0);
+	if (saw_winch) {
+		resize_event (res);
+	}
 	while (Sys_CheckInput (1, -1)) {
 		len = read(0, buf, sizeof (buf));
 		for (int i = 0; i < len; i++) {
diff --git a/ruamoko/qwaq/qwaq-rect.h b/ruamoko/qwaq/qwaq-rect.h
index 2ab79788e..ba1e47c10 100644
--- a/ruamoko/qwaq/qwaq-rect.h
+++ b/ruamoko/qwaq/qwaq-rect.h
@@ -1,12 +1,12 @@
 #ifndef __qwaq_rect_h
 #define __qwaq_rect_h
 
-typedef struct {
+typedef struct Point_s {
 	int         x;
 	int         y;
 } Point;
 
-typedef struct {
+typedef struct Extent_s {
 	int         width;
 	int         height;
 } Extent;
diff --git a/ruamoko/qwaq/qwaq-textcontext.h b/ruamoko/qwaq/qwaq-textcontext.h
index ce0f5ef2c..e2db46da4 100644
--- a/ruamoko/qwaq/qwaq-textcontext.h
+++ b/ruamoko/qwaq/qwaq-textcontext.h
@@ -58,6 +58,20 @@
 typedef struct qwaq_textcontext_s {
 	pr_id_t     isa;
 	pointer_t   window;
+	union {
+		Rect        rect;
+		struct {
+			Point       offset;
+			Extent      size;
+		};
+		struct {
+			int         xpos;
+			int         ypos;
+			int         xlen;
+			int         ylen;
+		};
+	};
+	int         background;
 } qwaq_textcontext_t;
 
 #endif
diff --git a/ruamoko/qwaq/qwaq-textcontext.r b/ruamoko/qwaq/qwaq-textcontext.r
index d2fd9144b..972bd8a99 100644
--- a/ruamoko/qwaq/qwaq-textcontext.r
+++ b/ruamoko/qwaq/qwaq-textcontext.r
@@ -111,6 +111,7 @@ static TextContext *screen;
 - (void) mvaddch: (Point) pos, int ch = #0;
 - (void) mvaddstr: (Point) pos, string str = #0;
 
+- (void) resizeTo: (Extent) newSize = #0;	// absolute size
 - (void) refresh = #0;
 + (void) refresh = #0;
 
@@ -152,6 +153,7 @@ void top_panel (panel_t panel) = #0;
 void bottom_panel (panel_t panel) = #0;
 void move_panel (panel_t panel, int x, int y) = #0;
 window_t panel_window (panel_t panel) = #0;
+void replace_panel (panel_t panel, window_t window) = #0;
 void update_panels (void) = #0;
 
 void doupdate (void) = #0;
@@ -159,6 +161,8 @@ int curs_set (int visibility) = #0;
 int move (int x, int y) = #0;
 void wborder (window_t window, box_sides_t sides, box_corners_t corners) = #0;
 void mvwblit_line (window_t window, int x, int y, int *wch, int len) = #0;
+void wresize (window_t window, int width, int height) = #0;
+void resizeterm (int width, int height) = #0;
 Rect getwrect (window_t window) = #0;
 
 void printf(string fmt, ...) = #0;
diff --git a/ruamoko/qwaq/qwaq-view.h b/ruamoko/qwaq/qwaq-view.h
index 2bb646653..d0b484eec 100644
--- a/ruamoko/qwaq/qwaq-view.h
+++ b/ruamoko/qwaq/qwaq-view.h
@@ -31,6 +31,18 @@ enum {
 	sfLocked        =0x0010,
 };
 
+enum {
+	gfGrowLoX       = 0x0001,
+	gfGrowLoY       = 0x0002,
+	gfGrowHiX       = 0x0004,
+	gfGrowHiY       = 0x0008,
+	gfGrowRel       = 0x0010,
+	gfGrowLo        = gfGrowLoX | gfGrowLoY,
+	gfGrowHi        = gfGrowHiX | gfGrowHiY,
+	gfGrowX         = gfGrowLoX | gfGrowHiX,
+	gfGrowY         = gfGrowLoY | gfGrowHiY,
+	gfGrowAll       = gfGrowX | gfGrowY,
+};
 @interface View: Object
 {
 	union {
@@ -52,6 +64,7 @@ enum {
 	id<TextContext> textContext;
 	int         state;
 	int         options;
+	int         growMode;
 	int         cursorState;
 	Point       cursor;
 }
@@ -73,6 +86,9 @@ enum {
 -setContext: (id<TextContext>) context;
 -draw;
 -redraw;
+-move: (Point) delta;
+-resize: (Extent) delta;
+-grow: (Extent) delta;
 -handleEvent: (qwaq_event_t *) event;
 
 - (void) onMouseEnter: (Point) pos;
diff --git a/ruamoko/qwaq/qwaq-view.r b/ruamoko/qwaq/qwaq-view.r
index 936a83352..c9177b221 100644
--- a/ruamoko/qwaq/qwaq-view.r
+++ b/ruamoko/qwaq/qwaq-view.r
@@ -165,6 +165,69 @@ updateScreenCursor (View *view)
 	[textContext mvaddch: pos, ch];
 }
 
+-move: (Point) delta
+{
+	xpos += delta.x;
+	ypos += delta.y;
+	if (xpos + xlen < 1) {
+		xpos = 1 - xlen;
+	}
+	if (ypos < 0) {
+		ypos = 0;
+	}
+	if (owner) {
+		Extent      s = [owner size];
+		if (xpos > s.width - 1) {
+			xpos = s.width - 1;
+		}
+		if (ypos > s.height - 1) {
+			ypos = s.height - 1;
+		}
+	}
+	return self;
+}
+
+-resize: (Extent) delta
+{
+	xlen += delta.width;
+	ylen += delta.height;
+	if (xlen < 1) {
+		xlen = 1;
+	}
+	if (ylen < 1) {
+		ylen = 1;
+	}
+	return self;
+}
+
+-grow: (Extent) delta
+{
+	Point       dpos = {};
+	Extent      dsize = {};
+
+	if (growMode & gfGrowLoX) {
+		dpos.x += delta.width;
+		dsize.width -= delta.width;
+	}
+	if (growMode & gfGrowHiX) {
+		dsize.width += delta.width;
+	}
+	if (growMode & gfGrowLoY) {
+		dpos.y += delta.height;
+		dsize.height -= delta.height;
+	}
+	if (growMode & gfGrowHiY) {
+		dsize.height += delta.height;
+	}
+	int save_state = state;
+	state &= ~sfDrawn;
+	[self move: dpos];
+	[self resize: dsize];
+	state = save_state;
+	[self redraw];
+	return self;
+}
+
 -handleEvent: (qwaq_event_t *) event
 {
 	return self;
diff --git a/ruamoko/qwaq/qwaq-window.r b/ruamoko/qwaq/qwaq-window.r
index 1c772867f..d3dfd3947 100644
--- a/ruamoko/qwaq/qwaq-window.r
+++ b/ruamoko/qwaq/qwaq-window.r
@@ -40,6 +40,8 @@
 	[buf mvaddstr: {0, 0}, "XOX"];
 	[buf mvaddstr: {0, 1}, "OXO"];
 	[buf mvaddstr: {0, 2}, "XOX"];
+
+	growMode = gfGrowHi;
 	return self;
 }
 
@@ -71,6 +73,17 @@
 	return self;
 }
 
+-resize: (Extent) delta
+{
+	Extent size = self.size;
+	[super resize:delta];
+	delta = {self.size.width - size.width, self.size.height - size.height};
+	[(id)textContext resizeTo: self.size];
+	replace_panel (panel, [(id)textContext window]);
+	[objects resize:delta];
+	return self;
+}
+
 -handleEvent: (qwaq_event_t *) event
 {
 	[objects handleEvent: event];

From afda21448740963eebcbdb6ca9ce6935c3c1ec91 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 23 Mar 2020 20:18:12 +0900
Subject: [PATCH 0920/1519] Adjust some whitespace

---
 ruamoko/qwaq/qwaq-view.h | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-view.h b/ruamoko/qwaq/qwaq-view.h
index d0b484eec..87952f039 100644
--- a/ruamoko/qwaq/qwaq-view.h
+++ b/ruamoko/qwaq/qwaq-view.h
@@ -11,24 +11,24 @@
 @class Group;
 
 enum {
-	ofCanFocus      =0x0001,
-	ofFirstClick    =0x0002,
-	ofDontDraw      =0x0004,
-	ofPreProcess    =0x0008,
-	ofPostProcess   =0x0010,
-	ofMakeFirst     =0x0020,
-	ofTileable      =0x0040,
-	ofCentered      =0x0080,
+	ofCanFocus      = 0x0001,
+	ofFirstClick    = 0x0002,
+	ofDontDraw      = 0x0004,
+	ofPreProcess    = 0x0008,
+	ofPostProcess   = 0x0010,
+	ofMakeFirst     = 0x0020,
+	ofTileable      = 0x0040,
+	ofCentered      = 0x0080,
 
-	ofCallHasObject =0x8000,
+	ofCallHasObject = 0x8000,
 };
 
 enum {
-	sfDrawn         =0x0001,
-	sfDisabled      =0x0002,
-	sfInFocus       =0x0004,
-	sfModal         =0x0008,
-	sfLocked        =0x0010,
+	sfDrawn         = 0x0001,
+	sfDisabled      = 0x0002,
+	sfInFocus       = 0x0004,
+	sfModal         = 0x0008,
+	sfLocked        = 0x0010,
 };
 
 enum {

From 19a4efed167d96f1c68a17279d1c7867fd0058c9 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 23 Mar 2020 22:00:05 +0900
Subject: [PATCH 0921/1519] [qwaq] Add support for invisible buttons

Useful for window controls.
---
 ruamoko/qwaq/qwaq-button.h |  1 +
 ruamoko/qwaq/qwaq-button.r | 24 +++++++++++++++++++++---
 ruamoko/qwaq/qwaq-curses.c |  2 +-
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-button.h b/ruamoko/qwaq/qwaq-button.h
index bab624e35..c855505a9 100644
--- a/ruamoko/qwaq/qwaq-button.h
+++ b/ruamoko/qwaq/qwaq-button.h
@@ -22,6 +22,7 @@
 }
 -initWithPos: (Point) pos releasedIcon: (DrawBuffer *) released
 						   pressedIcon: (DrawBuffer *) pressed;
+-initWithRect: (Rect) rect;	// invisible button
 -(ListenerGroup *) onPress;
 -(ListenerGroup *) onRelease;
 -(ListenerGroup *) onClick;
diff --git a/ruamoko/qwaq/qwaq-button.r b/ruamoko/qwaq/qwaq-button.r
index ab8477a8a..1c89d2ec4 100644
--- a/ruamoko/qwaq/qwaq-button.r
+++ b/ruamoko/qwaq/qwaq-button.r
@@ -21,12 +21,30 @@
 	return self;
 }
 
+-initWithRect: (Rect) rect
+{
+	if (!(self = [super initWithRect: rect])) {
+		return nil;
+	}
+	icon[0] = nil;
+	icon[1] = nil;
+	onPress = [[ListenerGroup alloc] init];
+	onRelease = [[ListenerGroup alloc] init];
+	onClick = [[ListenerGroup alloc] init];
+	onDrag = [[ListenerGroup alloc] init];
+	onAuto = [[ListenerGroup alloc] init];
+	onHover = [[ListenerGroup alloc] init];
+	return self;
+}
+
 -draw
 {
 	[super draw];
-	[textContext blitFromBuffer: icon[pressed]
-							 to: pos
-						   from: [icon[pressed] rect]];
+	if (icon[pressed]) {
+		[textContext blitFromBuffer: icon[pressed]
+								 to: pos
+							   from: [icon[pressed] rect]];
+	}
 	return self;
 }
 
diff --git a/ruamoko/qwaq/qwaq-curses.c b/ruamoko/qwaq/qwaq-curses.c
index 847c3be52..453ff72bf 100644
--- a/ruamoko/qwaq/qwaq-curses.c
+++ b/ruamoko/qwaq/qwaq-curses.c
@@ -602,7 +602,7 @@ cmd_resizeterm (qwaq_resources_t *res)
 static void
 dump_command (qwaq_resources_t *res, int len)
 {
-	if (1) {
+	if (0) {
 		qwaq_commands cmd = RB_PEEK_DATA (res->command_queue, 0);
 		Sys_Printf ("%s[%d]", qwaq_command_names[cmd], len);
 		for (int i = 2; i < len; i++) {

From 731a123b79b513877a94a6700cf068767ed319b5 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 23 Mar 2020 22:01:13 +0900
Subject: [PATCH 0922/1519] [qwaq] Add a title bar

The title bar is special in that it is always centered at the top of its
owner, thus it takes no rect.
---
 ruamoko/qwaq/Makefile.am     |  1 +
 ruamoko/qwaq/qwaq-titlebar.h | 16 ++++++++++++++
 ruamoko/qwaq/qwaq-titlebar.r | 41 ++++++++++++++++++++++++++++++++++++
 3 files changed, 58 insertions(+)
 create mode 100644 ruamoko/qwaq/qwaq-titlebar.h
 create mode 100644 ruamoko/qwaq/qwaq-titlebar.r

diff --git a/ruamoko/qwaq/Makefile.am b/ruamoko/qwaq/Makefile.am
index 3e803509b..194c31933 100644
--- a/ruamoko/qwaq/Makefile.am
+++ b/ruamoko/qwaq/Makefile.am
@@ -35,6 +35,7 @@ qwaq_app_dat_src= \
 	qwaq-rect.r \
 	qwaq-screen.r \
 	qwaq-textcontext.r \
+	qwaq-titlebar.r \
 	qwaq-view.r \
 	qwaq-window.r
 
diff --git a/ruamoko/qwaq/qwaq-titlebar.h b/ruamoko/qwaq/qwaq-titlebar.h
new file mode 100644
index 000000000..addfdde4e
--- /dev/null
+++ b/ruamoko/qwaq/qwaq-titlebar.h
@@ -0,0 +1,16 @@
+#ifndef __qwaq_titlebar_h
+#define __qwaq_titlebar_h
+
+#include "qwaq-view.h"
+
+@interface TitleBar : View
+{
+	string      title;
+	int         length;
+}
+// title always centered at top of owner
+-initWithTitle:(string) title;
+-setTitle:(string) newTitle;
+@end
+
+#endif//__qwaq_titlebar_h
diff --git a/ruamoko/qwaq/qwaq-titlebar.r b/ruamoko/qwaq/qwaq-titlebar.r
new file mode 100644
index 000000000..3a5bcfcda
--- /dev/null
+++ b/ruamoko/qwaq/qwaq-titlebar.r
@@ -0,0 +1,41 @@
+#include <string.h>
+
+#include "qwaq-group.h"
+#include "qwaq-titlebar.h"
+
+@implementation TitleBar
+
+-initWithTitle:(string) title
+{
+	if (!(self = [super init])) {
+		return nil;
+	}
+	self.title = title;
+	length = strlen (title);
+	growMode = gfGrowHiX;
+	return self;
+}
+
+-setTitle:(string) newTitle
+{
+	title = newTitle;
+	length = strlen (title);
+	[self redraw];
+	return self;
+}
+
+-setOwner: (Group *) owner
+{
+	[super setOwner: owner];
+	size = [owner size];
+	return self;
+}
+
+-draw
+{
+	[super draw];
+	[self mvaddstr: { (xlen - length) / 2, 0}, title];
+	return self;
+}
+
+@end

From 467115429e7a7dd68264a1833b2d59b12baece40 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 23 Mar 2020 22:08:30 +0900
Subject: [PATCH 0923/1519] [qwaq] Add gfGrowNone and a grow mode setter

gfGrowNone is just to allow not growing with the owner to be explicitly
stated.
---
 ruamoko/qwaq/qwaq-view.h | 2 ++
 ruamoko/qwaq/qwaq-view.r | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/ruamoko/qwaq/qwaq-view.h b/ruamoko/qwaq/qwaq-view.h
index 87952f039..7c3bf9f80 100644
--- a/ruamoko/qwaq/qwaq-view.h
+++ b/ruamoko/qwaq/qwaq-view.h
@@ -32,6 +32,7 @@ enum {
 };
 
 enum {
+	gfGrowNone      = 0x0000,
 	gfGrowLoX       = 0x0001,
 	gfGrowLoY       = 0x0002,
 	gfGrowHiX       = 0x0004,
@@ -72,6 +73,7 @@ enum {
 - (void) dealloc;
 
 -setOwner: (Group *) owner;
+-setGrowMode: (int) mode;
 
 -(Rect)rect;
 -(Point)origin;
diff --git a/ruamoko/qwaq/qwaq-view.r b/ruamoko/qwaq/qwaq-view.r
index c9177b221..6413cbd13 100644
--- a/ruamoko/qwaq/qwaq-view.r
+++ b/ruamoko/qwaq/qwaq-view.r
@@ -95,6 +95,12 @@ updateScreenCursor (View *view)
 	return self;
 }
 
+-setGrowMode: (int) mode
+{
+	growMode = mode;
+	return self;
+}
+
 - (Rect) rect
 {
 	return rect;

From 147988095497ff3725ff68d783ce15a17039c98c Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 23 Mar 2020 22:10:03 +0900
Subject: [PATCH 0924/1519] [qwaq] Add window control buttons

With this, windows can be resized using any of the corners or the three
sides other than top (top side is move-only, otherwise moving a window
without resizing would be impossible).
---
 ruamoko/qwaq/qwaq-button.r |   9 +++
 ruamoko/qwaq/qwaq-window.h |  10 ++++
 ruamoko/qwaq/qwaq-window.r | 119 +++++++++++++++++++++++++++++--------
 3 files changed, 114 insertions(+), 24 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-button.r b/ruamoko/qwaq/qwaq-button.r
index 1c89d2ec4..3f72d2ca8 100644
--- a/ruamoko/qwaq/qwaq-button.r
+++ b/ruamoko/qwaq/qwaq-button.r
@@ -138,4 +138,13 @@
 	return {dragPos.x - dragBase.x, dragPos.y - dragBase.y};
 }
 
+-move:(Point) delta
+{
+	Point       pos = self.pos;
+	[super move:delta];
+	dragBase.x += self.pos.x - pos.x;
+	dragBase.y += self.pos.y - pos.y;
+	return self;
+}
+
 @end
diff --git a/ruamoko/qwaq/qwaq-window.h b/ruamoko/qwaq/qwaq-window.h
index 215fcc2db..716c0ccfd 100644
--- a/ruamoko/qwaq/qwaq-window.h
+++ b/ruamoko/qwaq/qwaq-window.h
@@ -4,6 +4,7 @@
 #include "Object.h"
 
 @class Group;
+@class Button;
 
 #include "qwaq-draw.h"
 #include "qwaq-rect.h"
@@ -15,6 +16,15 @@
 	Group      *objects;
 	Point       point;	// FIXME can't be local :(
 	DrawBuffer *buf;
+
+	Button     *topDrag;		// move-only
+	Button     *topLeftDrag;
+	Button     *topRightDrag;
+	Button     *leftDrag;
+	Button     *rightDrag;
+	Button     *bottomLeftDrag;
+	Button     *bottomRightDrag;
+	Button     *bottomDrag;
 }
 +windowWithRect: (Rect) rect;
 -setBackground: (int) ch;
diff --git a/ruamoko/qwaq/qwaq-window.r b/ruamoko/qwaq/qwaq-window.r
index d3dfd3947..41d353ba3 100644
--- a/ruamoko/qwaq/qwaq-window.r
+++ b/ruamoko/qwaq/qwaq-window.r
@@ -6,6 +6,7 @@
 #include "qwaq-curses.h"
 #include "qwaq-group.h"
 #include "qwaq-listener.h"
+#include "qwaq-titlebar.h"
 #include "qwaq-window.h"
 #include "qwaq-view.h"
 
@@ -27,14 +28,41 @@
 
 	objects = [[Group alloc] initWithContext: textContext owner: self];
 
-	string titlestr = "drag me";
-	DrawBuffer *title = [DrawBuffer buffer: {xlen, 1}];
-	[title mvaddstr: {(xlen - strlen(titlestr)) / 2, 0}, titlestr];
+	[self addView: [[TitleBar alloc] initWithTitle:"drag me"]];
 
-	Button *b = [[Button alloc] initWithPos: {0, 0} releasedIcon: title
-													 pressedIcon: title];
-	[[b onDrag] addListener: self : @selector(dragWindow:)];
-	[self addView: b];
+	topDrag         = [[Button alloc] initWithRect: {{1, 0},
+													 {xlen - 2, 1}}];
+	topLeftDrag     = [[Button alloc] initWithRect: {{0, 0},
+													 {1, 1}}];
+	topRightDrag    = [[Button alloc] initWithRect: {{xlen - 1, 0},
+													 {1, 1}}];
+	leftDrag        = [[Button alloc] initWithRect: {{0, 1},
+													 {1, ylen - 2}}];
+	rightDrag       = [[Button alloc] initWithRect: {{xlen - 1, 1},
+													 {1, ylen - 2}}];
+	bottomLeftDrag  = [[Button alloc] initWithRect: {{0, ylen - 1},
+													 {1, 1}}];
+	bottomRightDrag = [[Button alloc] initWithRect: {{xlen - 1, ylen - 1},
+													 {1, 1}}];
+	bottomDrag      = [[Button alloc] initWithRect: {{1, ylen - 1},
+													 {xlen - 2, 1}}];
+	[self addView: [topDrag         setGrowMode: gfGrowHiX]];
+	[self addView: [topLeftDrag     setGrowMode: gfGrowNone]];
+	[self addView: [topRightDrag    setGrowMode: gfGrowX]];
+	[self addView: [leftDrag        setGrowMode: gfGrowHiY]];
+	[self addView: [rightDrag       setGrowMode: gfGrowX | gfGrowHiY]];
+	[self addView: [bottomLeftDrag  setGrowMode: gfGrowY]];
+	[self addView: [bottomRightDrag setGrowMode: gfGrowAll]];
+	[self addView: [bottomDrag      setGrowMode: gfGrowHiX | gfGrowY]];
+
+	[[topDrag         onDrag] addListener: self : @selector(dragWindow:)];
+	[[topLeftDrag     onDrag] addListener: self : @selector(dragWindow:)];
+	[[topRightDrag    onDrag] addListener: self : @selector(dragWindow:)];
+	[[leftDrag        onDrag] addListener: self : @selector(dragWindow:)];
+	[[rightDrag       onDrag] addListener: self : @selector(dragWindow:)];
+	[[bottomLeftDrag  onDrag] addListener: self : @selector(dragWindow:)];
+	[[bottomRightDrag onDrag] addListener: self : @selector(dragWindow:)];
+	[[bottomDrag      onDrag] addListener: self : @selector(dragWindow:)];
 
 	buf = [DrawBuffer buffer: {3, 3}];
 	[buf mvaddstr: {0, 0}, "XOX"];
@@ -45,27 +73,56 @@
 	return self;
 }
 
+#ifndef max
+# define max(a,b) ((a) > (b) ? (a) : (b))
+#endif
+#ifndef min
+# define min(a,b) ((a) < (b) ? (a) : (b))
+#endif
+#ifndef bound
+# define bound(a,b,c) (max(a, min(b, c)))
+#endif
+
 - (void) dragWindow: (Button *) sender
 {
 	Point       delta = [sender delta];
-	Point       p = {xpos + delta.x, ypos + delta.y};
+	Point       dp = nil;
+	Point       ds = nil;
 	Extent      bounds = [owner size];
-	if (p.x < 0) {
-		p.x = 0;
+
+	if (sender == topDrag) {
+		dp.x = bound (0, xpos + delta.x, bounds.width - xlen) - xpos;
+		dp.y = bound (0, ypos + delta.y, bounds.height - ylen) - ypos;
+	} else if (sender == topLeftDrag) {
+		dp.x = bound (0, xpos + delta.x, xpos + xlen - 1) - xpos;
+		dp.y = bound (0, ypos + delta.y, ypos + ylen - 1) - ypos;
+		ds.x = bound (1, xlen - delta.x, bounds.width - xpos) - xlen;
+		ds.y = bound (1, ylen - delta.y, bounds.width - ypos) - ylen;
+	} else if (sender == topRightDrag) {
+		dp.y = bound (0, ypos + delta.y, ypos + ylen - 1) - ypos;
+		ds.x = bound (1, xlen + delta.x, bounds.width - xpos) - xlen;
+		ds.y = bound (1, ylen - delta.y, bounds.width - ypos) - ylen;
+	} else if (sender == leftDrag) {
+		dp.x = bound (0, xpos + delta.x, xpos + xlen - 1) - xpos;
+		ds.x = bound (1, xlen - delta.x, bounds.width - xpos) - xlen;
+	} else if (sender == rightDrag) {
+		ds.x = bound (1, xlen + delta.x, bounds.width - xpos) - xlen;
+	} else if (sender == bottomLeftDrag) {
+		dp.x = bound (0, xpos + delta.x, xpos + xlen - 1) - xpos;
+		ds.x = bound (1, xlen - delta.x, bounds.width - xpos) - xlen;
+		ds.y = bound (1, ylen + delta.y, bounds.width - ypos) - ylen;
+	} else if (sender == bottomRightDrag) {
+		ds.x = bound (1, xlen + delta.x, bounds.width - xpos) - xlen;
+		ds.y = bound (1, ylen + delta.y, bounds.width - ypos) - ylen;
+	} else if (sender == bottomDrag) {
+		ds.y = bound (1, ylen + delta.y, bounds.width - ypos) - ylen;
 	}
-	if (p.x + xlen > bounds.width) {
-		p.x = bounds.width - xlen;
-	}
-	if (p.y < 0) {
-		p.y = 0;
-	}
-	if (p.y + ylen > bounds.height) {
-		p.y = bounds.height - ylen;
-	}
-	xpos = p.x;
-	ypos = p.y;
-	move_panel (panel, p.x, p.y);
-	[owner redraw];
+	int save_state = state;
+	state &= ~sfDrawn;
+	[self move: dp];
+	[self resize: {ds.x, ds.y}];
+	state = save_state;
+	[self redraw];
 }
 
 -setContext: (id<TextContext>) context
@@ -73,6 +130,17 @@
 	return self;
 }
 
+-move: (Point) delta
+{
+	int save_state = state;
+	state &= ~sfDrawn;
+	[super move: delta];
+	move_panel (panel, xpos, ypos);
+	state = save_state;
+	[self redraw];
+	return self;
+}
+
 -resize: (Extent) delta
 {
 	Extent size = self.size;
@@ -126,7 +194,10 @@
 
 -redraw
 {
-	return [owner redraw];
+	if (state & sfDrawn) {
+		[owner redraw];
+	}
+	return self;
 }
 
 - (void) mvprintf: (Point) pos, string fmt, ...

From ba3efca8e565026b8324e1378db2e77eb64c676c Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 23 Mar 2020 22:27:08 +0900
Subject: [PATCH 0925/1519] [qwaq] Make the corner window controls 2x2

This makes them a little easier to grab but exposes a bug in Group
handleEvent when views partially overlap.
---
 ruamoko/qwaq/qwaq-window.r | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-window.r b/ruamoko/qwaq/qwaq-window.r
index 41d353ba3..b81ddcd0b 100644
--- a/ruamoko/qwaq/qwaq-window.r
+++ b/ruamoko/qwaq/qwaq-window.r
@@ -33,17 +33,17 @@
 	topDrag         = [[Button alloc] initWithRect: {{1, 0},
 													 {xlen - 2, 1}}];
 	topLeftDrag     = [[Button alloc] initWithRect: {{0, 0},
-													 {1, 1}}];
-	topRightDrag    = [[Button alloc] initWithRect: {{xlen - 1, 0},
-													 {1, 1}}];
+													 {2, 2}}];
+	topRightDrag    = [[Button alloc] initWithRect: {{xlen - 2, 0},
+													 {2, 2}}];
 	leftDrag        = [[Button alloc] initWithRect: {{0, 1},
 													 {1, ylen - 2}}];
 	rightDrag       = [[Button alloc] initWithRect: {{xlen - 1, 1},
 													 {1, ylen - 2}}];
-	bottomLeftDrag  = [[Button alloc] initWithRect: {{0, ylen - 1},
-													 {1, 1}}];
-	bottomRightDrag = [[Button alloc] initWithRect: {{xlen - 1, ylen - 1},
-													 {1, 1}}];
+	bottomLeftDrag  = [[Button alloc] initWithRect: {{0, ylen - 2},
+													 {2, 2}}];
+	bottomRightDrag = [[Button alloc] initWithRect: {{xlen - 2, ylen - 2},
+													 {2, 2}}];
 	bottomDrag      = [[Button alloc] initWithRect: {{1, ylen - 1},
 													 {xlen - 2, 1}}];
 	[self addView: [topDrag         setGrowMode: gfGrowHiX]];

From 8b193c6b6c5083edf4e96b195edcb127dfa74215 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 23 Mar 2020 22:28:18 +0900
Subject: [PATCH 0926/1519] [qwaq] Remove some debug prints

---
 ruamoko/qwaq/qwaq-app.r | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-app.r b/ruamoko/qwaq/qwaq-app.r
index 6d92e9729..d6ad038a9 100644
--- a/ruamoko/qwaq/qwaq-app.r
+++ b/ruamoko/qwaq/qwaq-app.r
@@ -48,7 +48,6 @@ arp_end (void)
 
 	screen = [TextContext screen];
 	screenSize = [screen size];
-	printf ("screenSize = %d x %d", screenSize.width, screenSize.height);
 	objects = [[Group alloc] initWithContext: screen owner: nil];
 
 	[screen bkgd: COLOR_PAIR (1)];
@@ -98,7 +97,6 @@ arp_end (void)
 		resizeterm (event.resize.width, event.resize.height);
 		[screen resizeTo: {event.resize.width, event.resize.height}];
 		screenSize = [screen size];
-		[screen printf:"resized to %d x %d, delta: %d x %d\n", event.resize.width, event.resize.height, delta.width, delta.height];
 		[objects resize: delta];
 		[screen refresh];
 		event.what = qe_none;

From 622b5f4c451845fb092a2126deed2dd990b27af4 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 23 Mar 2020 22:35:30 +0900
Subject: [PATCH 0927/1519] [qwaq] Fix the handling of overlapping views

This even simplifies the logic for mouse enter/leave handling, a nice
bonus.
---
 ruamoko/qwaq/qwaq-group.r | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-group.r b/ruamoko/qwaq/qwaq-group.r
index bcfa7e375..34d7a34a7 100644
--- a/ruamoko/qwaq/qwaq-group.r
+++ b/ruamoko/qwaq/qwaq-group.r
@@ -137,15 +137,11 @@ find_mouse_view(Group *group, Point pos)
 		if (mouse_grabbed) {
 			[mouse_grabbed handleEvent: event];
 		} else {
-			if (mouse_within && ![mouse_within containsPoint: pos]) {
+			View        *mouse_view = find_mouse_view (self, pos);
+			if (mouse_within != mouse_view) {
 				[mouse_within onMouseLeave: pos];
-				mouse_within = nil;
-			}
-			if (!mouse_within) {
-				mouse_within = find_mouse_view (self, pos);
-				if (mouse_within) {
-					[mouse_within onMouseEnter: pos];
-				}
+				[mouse_view onMouseEnter: pos];
+				mouse_within = mouse_view;
 			}
 			if (mouse_within) {
 				[mouse_within handleEvent: event];

From 52722b73c1e7abfe171db06dbadddf188e55810c Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 23 Mar 2020 23:03:35 +0900
Subject: [PATCH 0928/1519] [qwaq] Adjust edge window control lengths

I'd forgotten them when adjusting the corner control sizes
---
 ruamoko/qwaq/qwaq-window.r | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-window.r b/ruamoko/qwaq/qwaq-window.r
index b81ddcd0b..e0f4e01a5 100644
--- a/ruamoko/qwaq/qwaq-window.r
+++ b/ruamoko/qwaq/qwaq-window.r
@@ -30,22 +30,22 @@
 
 	[self addView: [[TitleBar alloc] initWithTitle:"drag me"]];
 
-	topDrag         = [[Button alloc] initWithRect: {{1, 0},
-													 {xlen - 2, 1}}];
+	topDrag         = [[Button alloc] initWithRect: {{2, 0},
+													 {xlen - 4, 1}}];
 	topLeftDrag     = [[Button alloc] initWithRect: {{0, 0},
 													 {2, 2}}];
 	topRightDrag    = [[Button alloc] initWithRect: {{xlen - 2, 0},
 													 {2, 2}}];
-	leftDrag        = [[Button alloc] initWithRect: {{0, 1},
-													 {1, ylen - 2}}];
-	rightDrag       = [[Button alloc] initWithRect: {{xlen - 1, 1},
-													 {1, ylen - 2}}];
+	leftDrag        = [[Button alloc] initWithRect: {{0, 2},
+													 {1, ylen - 4}}];
+	rightDrag       = [[Button alloc] initWithRect: {{xlen - 1, 2},
+													 {1, ylen - 4}}];
 	bottomLeftDrag  = [[Button alloc] initWithRect: {{0, ylen - 2},
 													 {2, 2}}];
 	bottomRightDrag = [[Button alloc] initWithRect: {{xlen - 2, ylen - 2},
 													 {2, 2}}];
-	bottomDrag      = [[Button alloc] initWithRect: {{1, ylen - 1},
-													 {xlen - 2, 1}}];
+	bottomDrag      = [[Button alloc] initWithRect: {{2, ylen - 1},
+													 {xlen - 4, 1}}];
 	[self addView: [topDrag         setGrowMode: gfGrowHiX]];
 	[self addView: [topLeftDrag     setGrowMode: gfGrowNone]];
 	[self addView: [topRightDrag    setGrowMode: gfGrowX]];

From 8707ac0d5771cd6a84e0cee54dd00373ab4b00da Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 23 Mar 2020 23:18:02 +0900
Subject: [PATCH 0929/1519] [qwaq] Add a guard to formatLine

I got really weird error (invalid panel passed to top_panel) when there
was no such call, so I guess there was some memory corruption.
formatLine is the only suspect, but when I put in the guard, the error
wasn't reproduced (just scrolling through qwaq's makefile in a big
window).
---
 ruamoko/qwaq/qwaq-editbuffer-bi.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ruamoko/qwaq/qwaq-editbuffer-bi.c b/ruamoko/qwaq/qwaq-editbuffer-bi.c
index ef870e4a0..1beb6eabd 100644
--- a/ruamoko/qwaq/qwaq-editbuffer-bi.c
+++ b/ruamoko/qwaq/qwaq-editbuffer-bi.c
@@ -456,6 +456,8 @@ formatLine (txtbuffer_t *buffer, unsigned linePtr, unsigned xpos,
 	int         col;
 	byte        c = 0;
 	int         count;
+	int        *startdst = dst;
+	int         startlen = length;
 
 	while (pos < xpos && ptr < buffer->textSize) {
 		c = getChar (buffer, ptr);
@@ -498,6 +500,10 @@ formatLine (txtbuffer_t *buffer, unsigned linePtr, unsigned xpos,
 	while (length-- > 0) {
 		*dst++ = col | ' ';
 	}
+	if (dst - startdst > startlen) {
+		Sys_Error ("formatLine wrote too much: %zd %u %d",
+				   dst - startdst, startlen, length);
+	}
 	return ptr;
 }
 

From 30519e93fb50fb19ba9ba3d01ebfda1264444b97 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 23 Mar 2020 23:59:54 +0900
Subject: [PATCH 0930/1519] [qwaq] Move mouse event offsetting to Window

This way, Group doesn't need to query its owner's position.
---
 ruamoko/qwaq/qwaq-group.r  | 12 ++----------
 ruamoko/qwaq/qwaq-window.r |  4 ++++
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-group.r b/ruamoko/qwaq/qwaq-group.r
index 34d7a34a7..fa298120e 100644
--- a/ruamoko/qwaq/qwaq-group.r
+++ b/ruamoko/qwaq/qwaq-group.r
@@ -127,17 +127,11 @@ find_mouse_view(Group *group, Point pos)
 			[[views objectAtIndex:focused] handleEvent: event];
 		}
 	} else if (event.what & qe_positional) {
-		Point       origin = {};
-		if (owner) {
-			origin = [owner origin];
-		}
-		event.mouse.x -= origin.x;
-		event.mouse.y -= origin.y;
-		Point       pos = {event.mouse.x, event.mouse.y};
 		if (mouse_grabbed) {
 			[mouse_grabbed handleEvent: event];
 		} else {
-			View        *mouse_view = find_mouse_view (self, pos);
+			Point       pos = {event.mouse.x, event.mouse.y};
+			View       *mouse_view = find_mouse_view (self, pos);
 			if (mouse_within != mouse_view) {
 				[mouse_within onMouseLeave: pos];
 				[mouse_view onMouseEnter: pos];
@@ -147,8 +141,6 @@ find_mouse_view(Group *group, Point pos)
 				[mouse_within handleEvent: event];
 			}
 		}
-		event.mouse.x += origin.x;
-		event.mouse.y += origin.y;
 	} else {
 		// broadcast
 		[views makeObjectsPerformSelector: @selector(draw) withObject: event];
diff --git a/ruamoko/qwaq/qwaq-window.r b/ruamoko/qwaq/qwaq-window.r
index e0f4e01a5..4af56498a 100644
--- a/ruamoko/qwaq/qwaq-window.r
+++ b/ruamoko/qwaq/qwaq-window.r
@@ -154,7 +154,11 @@
 
 -handleEvent: (qwaq_event_t *) event
 {
+	event.mouse.x -= xpos;
+	event.mouse.y -= ypos;
 	[objects handleEvent: event];
+	event.mouse.x += xpos;
+	event.mouse.y += ypos;
 	return self;
 }
 

From 753d183d822c651ab8c9bae5e98abef60712530b Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 24 Mar 2020 13:24:55 +0900
Subject: [PATCH 0931/1519] [gamecode] Be more informative with function calls

PR_EnterFunction and PR_LeaveFunction now print the
entered/left/returned function when tracing. Makes debugging obj code
much easier.
---
 libs/gamecode/pr_exec.c | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/libs/gamecode/pr_exec.c b/libs/gamecode/pr_exec.c
index a73e5a474..d69d4e8a0 100644
--- a/libs/gamecode/pr_exec.c
+++ b/libs/gamecode/pr_exec.c
@@ -188,6 +188,11 @@ PR_EnterFunction (progs_t *pr, bfunction_t *f)
 	pr_type_t  *dstParams[MAX_PARMS];
 	pointer_t   paramofs = 0;
 
+	if (pr->pr_trace) {
+		Sys_Printf ("Entering function %s\n",
+					PR_GetString (pr, f->descriptor->s_name));
+	}
+
 	PR_PushFrame (pr);
 
 	if (f->numparms > 0) {
@@ -268,12 +273,24 @@ PR_EnterFunction (progs_t *pr, bfunction_t *f)
 }
 
 static void
-PR_LeaveFunction (progs_t *pr)
+PR_LeaveFunction (progs_t *pr, int to_engine)
 {
 	bfunction_t *f = pr->pr_xfunction;
 
 	PR_PopFrame (pr);
 
+	if (pr->pr_trace) {
+		Sys_Printf ("Leaving function %s\n",
+					PR_GetString (pr, f->descriptor->s_name));
+		if (to_engine) {
+			Sys_Printf ("Returning to engine\n");
+		} else {
+			bfunction_t *rf = pr->pr_xfunction;
+			Sys_Printf ("Returning to function %s\n",
+						PR_GetString (pr, rf->descriptor->s_name));
+		}
+	}
+
 	// restore locals from the stack
 	pr->localstack_used -= f->locals;
 	if (pr->localstack_used < 0)
@@ -1443,7 +1460,7 @@ op_call:
 			case OP_RETURN_V:
 				pr->pr_xfunction->profile += profile - startprofile;
 				startprofile = profile;
-				PR_LeaveFunction (pr);
+				PR_LeaveFunction (pr, pr->pr_depth == exitdepth);
 				st = pr->pr_statements + pr->pr_xstatement;
 				if (pr->pr_depth == exitdepth) {
 					if (pr->pr_trace && pr->pr_depth <= pr->pr_trace_depth)

From 1d6843d7f05e503579800d575963a4f6752ff679 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 24 Mar 2020 13:26:35 +0900
Subject: [PATCH 0932/1519] [gamecode] Improve watchpoint handling a little

Mostly just update the old value if the condition didn't trigger.
---
 libs/gamecode/pr_exec.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/libs/gamecode/pr_exec.c b/libs/gamecode/pr_exec.c
index d69d4e8a0..397eb7bde 100644
--- a/libs/gamecode/pr_exec.c
+++ b/libs/gamecode/pr_exec.c
@@ -1698,11 +1698,14 @@ op_call:
 			default:
 				PR_RunError (pr, "Bad opcode %i", st->op);
 		}
-		if (watch && watch->integer_var != old_val.integer_var
-			&& (!pr->wp_conditional
-				|| watch->integer_var == pr->wp_val.integer_var))
-			PR_RunError (pr, "watchpoint hit: %d -> %d", old_val.integer_var,
-						 watch->integer_var);
+		if (watch && watch->integer_var != old_val.integer_var) {
+			if (!pr->wp_conditional
+				|| watch->integer_var == pr->wp_val.integer_var) {
+				PR_RunError (pr, "watchpoint hit: %d -> %d",
+							 old_val.integer_var, watch->integer_var);
+			}
+			old_val.integer_var = watch->integer_var;
+		}
 	}
 exit_program:
 	pr->pr_argc = 0;

From 47b8f8dd6a94445a35232a37897ae4c5e2646a64 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 24 Mar 2020 13:27:35 +0900
Subject: [PATCH 0933/1519] [qwaq] Remove useless protocols

The HandleEvent protocols wound up being unnecessary.
---
 ruamoko/qwaq/event.h | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/ruamoko/qwaq/event.h b/ruamoko/qwaq/event.h
index 0679d42dd..1f122fc44 100644
--- a/ruamoko/qwaq/event.h
+++ b/ruamoko/qwaq/event.h
@@ -67,20 +67,4 @@ typedef struct qwaq_event_s {
 	};
 } qwaq_event_t;
 
-#ifdef __QFCC__	// don't want C gcc to see this :)
-@protocol HandleEvent
--handleEvent: (struct qwaq_event_s *) event;
-@end
-
-@protocol HandleFocusedEvent <HandleEvent>
--takeFocus;
--loseFocus;
-@end
-
-@protocol HandleMouseEvent <HandleEvent>
--(struct Rect_s *)getRect;
-@end
-
-#endif
-
 #endif//__qwaq_event_h

From 77651dbcbad853a7fc4e4f57c3d64d48dc2f2a7b Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 24 Mar 2020 13:33:28 +0900
Subject: [PATCH 0934/1519] [qwaq] Implement focus handling

Sort of works (when not segfaulting due to problem fixed in next
commit).
---
 ruamoko/qwaq/qwaq-app.r    |   5 +-
 ruamoko/qwaq/qwaq-editor.r |   1 +
 ruamoko/qwaq/qwaq-group.h  |   7 +++
 ruamoko/qwaq/qwaq-group.r  | 115 ++++++++++++++++++++++++++++++++++++-
 ruamoko/qwaq/qwaq-view.h   |   9 ++-
 ruamoko/qwaq/qwaq-view.r   |  44 +++++++++++++-
 ruamoko/qwaq/qwaq-window.h |   4 +-
 ruamoko/qwaq/qwaq-window.r |  47 +++++++++++----
 8 files changed, 216 insertions(+), 16 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-app.r b/ruamoko/qwaq/qwaq-app.r
index d6ad038a9..5ea0db4c5 100644
--- a/ruamoko/qwaq/qwaq-app.r
+++ b/ruamoko/qwaq/qwaq-app.r
@@ -58,14 +58,15 @@ arp_end (void)
 	r.extent.width /= 2;
 	r.extent.height /= 2;
 	Window *w;
-	[objects insert: w = [[Window windowWithRect: r] setBackground: COLOR_PAIR (2)]];
+	[objects insertSelected: w = [[Window windowWithRect: r] setBackground: COLOR_PAIR (2)]];
 	r = {{1, 1}, {r.extent.width - 2, r.extent.height - 2}};
-	[w addView: [[Editor alloc] initWithRect: r file: "Makefile"]];
+	[w insertSelected: [[Editor alloc] initWithRect: r file: "Makefile"]];
 	return self;
 }
 
 -run
 {
+	[objects takeFocus];
 	[self draw];
 	do {
 		arp_start ();
diff --git a/ruamoko/qwaq/qwaq-editor.r b/ruamoko/qwaq/qwaq-editor.r
index 72db77115..32e468021 100644
--- a/ruamoko/qwaq/qwaq-editor.r
+++ b/ruamoko/qwaq/qwaq-editor.r
@@ -12,6 +12,7 @@
 	line_count = [buffer countLines: {0, [buffer textSize]}];
 	linebuffer = [DrawBuffer buffer: { xlen, 1 }];
 	growMode = gfGrowHi;
+	options = ofCanFocus;
 	return self;
 }
 
diff --git a/ruamoko/qwaq/qwaq-group.h b/ruamoko/qwaq/qwaq-group.h
index 776aa1b16..3d9c53e65 100644
--- a/ruamoko/qwaq/qwaq-group.h
+++ b/ruamoko/qwaq/qwaq-group.h
@@ -19,6 +19,8 @@
 }
 -initWithContext: (id<TextContext>) context owner: (View *) owner;
 -insert: (View *) view;
+-insertDrawn: (View *) view;
+-insertSelected: (View *) view;
 -remove: (View *) view;
 -(Rect) rect;
 -(Point) origin;
@@ -27,6 +29,11 @@
 -redraw;
 -resize: (Extent) delta;
 -handleEvent: (qwaq_event_t *) event;
+-takeFocus;
+-loseFocus;
+-selectNext;
+-selectPrev;
+-selectView: (View *) view;
 -(void) grabMouse;
 -(void) releaseMouse;
 @end
diff --git a/ruamoko/qwaq/qwaq-group.r b/ruamoko/qwaq/qwaq-group.r
index fa298120e..8743e995d 100644
--- a/ruamoko/qwaq/qwaq-group.r
+++ b/ruamoko/qwaq/qwaq-group.r
@@ -32,16 +32,129 @@
 	return self;
 }
 
+-insertDrawn: (View *) view
+{
+	[self insert: view];
+	[view draw];
+	return self;
+}
+
+-insertSelected: (View *) view
+{
+	[self insertDrawn: view];
+	[self selectView: view];
+	return self;
+}
+
 -remove: (View *) view
 {
 	int         index = [views indexOfObject: view];
 	if (index != NotFound) {
 		if (focused == index) {
-			focused = -1;
+			[self selectPrev];
+			if (focused == index) {
+				focused = -1;
+			}
 		} else if (focused > index) {
 			focused--;
 		}
 		[views removeObjectAtIndex: index];
+		if (mouse_within == view) {
+			mouse_within = nil;
+		}
+		if (mouse_grabbed == view) {
+			[self releaseMouse];
+		}
+	}
+	return self;
+}
+
+static int
+makeFirst (Group *self, int viewIndex)
+{
+	View       *view = [self.views objectAtIndex: viewIndex];
+
+	[self.views addObject: view];
+	[self.views removeObjectAtIndex: viewIndex];
+	return [self.views count] - 1;
+}
+
+static int
+trySetFocus (Group *self, int viewIndex)
+{
+	View       *view = [self.views objectAtIndex:viewIndex];
+	if (([view state] & (sfDrawn | sfDisabled)) == sfDrawn
+		&& [view options] & ofCanFocus) {
+		if (!self.owner || [self.owner state] & sfInFocus) {
+			if (self.focused >= 0) {
+				[[self.views objectAtIndex: self.focused] loseFocus];
+			}
+			self.focused = viewIndex;
+			if ([view options] & ofMakeFirst) {
+				self.focused = makeFirst (self, viewIndex);
+			}
+			[view takeFocus];
+		}
+		return 1;
+	}
+	return 0;
+}
+
+-takeFocus
+{
+	if (focused >= 0) {
+		[[views objectAtIndex:focused] takeFocus];
+	}
+	return self;
+}
+
+-loseFocus
+{
+	if (focused >= 0) {
+		[[views objectAtIndex:focused] loseFocus];
+	}
+	return self;
+}
+
+-selectNext
+{
+	for (int i = focused + 1; i < [views count]; i++) {
+		if (trySetFocus (self, i)) {
+			return self;
+		}
+	}
+	// hit end, start again at the beginning
+	for (int i = 0; i < focused; i++) {
+		if (trySetFocus (self, i)) {
+			return self;
+		}
+	}
+	// did not find another view that can be focused
+	return self;
+}
+
+-selectPrev
+{
+	for (int i = focused - 1; i >= 0; i--) {
+		if (trySetFocus (self, i)) {
+			return self;
+		}
+	}
+	// hit end, start again at the beginning
+	for (int i = [views count] - 1; i > focused; i++) {
+		if (trySetFocus (self, i)) {
+			return self;
+		}
+	}
+	// did not find another view that can be focused
+	return self;
+}
+
+-selectView:(View *)view
+{
+	int         index = [views indexOfObject: view];
+	if (index != NotFound) {
+		trySetFocus (self, index);
 	}
 	return self;
 }
diff --git a/ruamoko/qwaq/qwaq-view.h b/ruamoko/qwaq/qwaq-view.h
index 7c3bf9f80..4dae4e20f 100644
--- a/ruamoko/qwaq/qwaq-view.h
+++ b/ruamoko/qwaq/qwaq-view.h
@@ -9,6 +9,7 @@
 #include "qwaq-textcontext.h"
 
 @class Group;
+@class ListenerGroup;
 
 enum {
 	ofCanFocus      = 0x0001,
@@ -68,6 +69,8 @@ enum {
 	int         growMode;
 	int         cursorState;
 	Point       cursor;
+	ListenerGroup *onReceiveFocus;
+	ListenerGroup *onReleaseFocus;
 }
 -initWithRect: (Rect) rect;
 - (void) dealloc;
@@ -84,6 +87,7 @@ enum {
 -(void) releaseMouse;
 
 -(int) options;
+-(int) state;
 
 -setContext: (id<TextContext>) context;
 -draw;
@@ -92,11 +96,14 @@ enum {
 -resize: (Extent) delta;
 -grow: (Extent) delta;
 -handleEvent: (qwaq_event_t *) event;
+-takeFocus;
+-loseFocus;
+-(ListenerGroup *) onReceiveFocus;
+-(ListenerGroup *) onReleaseFocus;
 
 - (void) onMouseEnter: (Point) pos;
 - (void) onMouseLeave: (Point) pos;
 
-
 - (void) refresh;
 - (void) mvprintf: (Point) pos, string fmt, ...;
 - (void) mvvprintf: (Point) pos, string fmt, @va_list args;
diff --git a/ruamoko/qwaq/qwaq-view.r b/ruamoko/qwaq/qwaq-view.r
index 6413cbd13..574678284 100644
--- a/ruamoko/qwaq/qwaq-view.r
+++ b/ruamoko/qwaq/qwaq-view.r
@@ -1,4 +1,5 @@
 #include "qwaq-curses.h"
+#include "qwaq-listener.h"
 #include "qwaq-view.h"
 #include "qwaq-group.h"
 
@@ -6,7 +7,12 @@
 
 -init
 {
-	return [super init];
+	if (!(self = [super init])) {
+		return nil;
+	}
+	onReceiveFocus = [[ListenerGroup alloc] init];
+	onReleaseFocus = [[ListenerGroup alloc] init];
+	return self;
 }
 
 -initWithRect: (Rect) rect
@@ -16,6 +22,8 @@
 	}
 	self.rect = rect;
 	self.absRect = rect;
+	onReceiveFocus = [[ListenerGroup alloc] init];
+	onReleaseFocus = [[ListenerGroup alloc] init];
 	return self;
 }
 
@@ -38,6 +46,11 @@
 	return options;
 }
 
+- (int) state
+{
+	return state;
+}
+
 static void
 updateScreenCursor (View *view)
 {
@@ -236,9 +249,38 @@ updateScreenCursor (View *view)
 
 -handleEvent: (qwaq_event_t *) event
 {
+	if (event.what & (qe_mousedown | qe_mouseclick)
+		&& options & ofCanFocus && !(state & (sfDisabled | sfInFocus))) {
+		[owner selectView: self];
+		if (!(options & ofFirstClick)) {
+			event.what = qe_none;
+		}
+	}
 	return self;
 }
 
+-takeFocus
+{
+	state |= sfInFocus;
+	return self;
+}
+
+-loseFocus
+{
+	state &= ~sfInFocus;
+	return self;
+}
+
+-(ListenerGroup *) onReceiveFocus
+{
+	return onReceiveFocus;
+}
+
+-(ListenerGroup *) onReleaseFocus
+{
+	return onReleaseFocus;
+}
+
 - (void) onMouseEnter: (Point) pos
 {
 }
diff --git a/ruamoko/qwaq/qwaq-window.h b/ruamoko/qwaq/qwaq-window.h
index 716c0ccfd..1e5598856 100644
--- a/ruamoko/qwaq/qwaq-window.h
+++ b/ruamoko/qwaq/qwaq-window.h
@@ -28,7 +28,9 @@
 }
 +windowWithRect: (Rect) rect;
 -setBackground: (int) ch;
--addView: (View *) view;
+-insert: (View *) view;
+-insertDrawn: (View *) view;
+-insertSelected: (View *) view;
 @end
 
 #endif//__qwaq_window_h
diff --git a/ruamoko/qwaq/qwaq-window.r b/ruamoko/qwaq/qwaq-window.r
index 4af56498a..f69729ac7 100644
--- a/ruamoko/qwaq/qwaq-window.r
+++ b/ruamoko/qwaq/qwaq-window.r
@@ -28,7 +28,7 @@
 
 	objects = [[Group alloc] initWithContext: textContext owner: self];
 
-	[self addView: [[TitleBar alloc] initWithTitle:"drag me"]];
+	[self insert: [[TitleBar alloc] initWithTitle:"drag me"]];
 
 	topDrag         = [[Button alloc] initWithRect: {{2, 0},
 													 {xlen - 4, 1}}];
@@ -46,14 +46,14 @@
 													 {2, 2}}];
 	bottomDrag      = [[Button alloc] initWithRect: {{2, ylen - 1},
 													 {xlen - 4, 1}}];
-	[self addView: [topDrag         setGrowMode: gfGrowHiX]];
-	[self addView: [topLeftDrag     setGrowMode: gfGrowNone]];
-	[self addView: [topRightDrag    setGrowMode: gfGrowX]];
-	[self addView: [leftDrag        setGrowMode: gfGrowHiY]];
-	[self addView: [rightDrag       setGrowMode: gfGrowX | gfGrowHiY]];
-	[self addView: [bottomLeftDrag  setGrowMode: gfGrowY]];
-	[self addView: [bottomRightDrag setGrowMode: gfGrowAll]];
-	[self addView: [bottomDrag      setGrowMode: gfGrowHiX | gfGrowY]];
+	[self insert: [topDrag         setGrowMode: gfGrowHiX]];
+	[self insert: [topLeftDrag     setGrowMode: gfGrowNone]];
+	[self insert: [topRightDrag    setGrowMode: gfGrowX]];
+	[self insert: [leftDrag        setGrowMode: gfGrowHiY]];
+	[self insert: [rightDrag       setGrowMode: gfGrowX | gfGrowHiY]];
+	[self insert: [bottomLeftDrag  setGrowMode: gfGrowY]];
+	[self insert: [bottomRightDrag setGrowMode: gfGrowAll]];
+	[self insert: [bottomDrag      setGrowMode: gfGrowHiX | gfGrowY]];
 
 	[[topDrag         onDrag] addListener: self : @selector(dragWindow:)];
 	[[topLeftDrag     onDrag] addListener: self : @selector(dragWindow:)];
@@ -70,6 +70,7 @@
 	[buf mvaddstr: {0, 2}, "XOX"];
 
 	growMode = gfGrowHi;
+	options = ofCanFocus | ofMakeFirst;
 	return self;
 }
 
@@ -162,12 +163,38 @@
 	return self;
 }
 
--addView: (View *) view
+-takeFocus
+{
+	[super takeFocus];
+	[objects takeFocus];
+	return self;
+}
+
+-loseFocus
+{
+	[super loseFocus];
+	[objects loseFocus];
+	return self;
+}
+
+-insert: (View *) view
 {
 	[objects insert: view];
 	return self;
 }
 
+-insertDrawn: (View *) view
+{
+	[objects insertDrawn: view];
+	return self;
+}
+
+-insertSelected: (View *) view
+{
+	[objects insertSelected: view];
+	return self;
+}
+
 -setBackground: (int) ch
 {
 	[(id)textContext bkgd: ch];

From d022c6c4bd611528371209c610331ba6dc98151f Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 24 Mar 2020 13:34:45 +0900
Subject: [PATCH 0935/1519] [qwaq] Disable updateScreenCursor

It's wrong for the current hierarchy and corrupts the view's owning
group. Thought is needed for how to proceed with cursor handling.
---
 ruamoko/qwaq/qwaq-view.r | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-view.r b/ruamoko/qwaq/qwaq-view.r
index 574678284..76a6fd532 100644
--- a/ruamoko/qwaq/qwaq-view.r
+++ b/ruamoko/qwaq/qwaq-view.r
@@ -54,7 +54,8 @@
 static void
 updateScreenCursor (View *view)
 {
-	while ((view.state & sfInFocus) && view.owner) {
+	// XXX this does not work
+/*	while ((view.state & sfInFocus) && view.owner) {
 		View       *owner = (View *) view.owner;
 		if (view.cursor.x >= 0 && view.cursor.x < view.xlen
 			&& view.cursor.y >= 0 && view.cursor.y < view.ylen) {
@@ -74,7 +75,7 @@ updateScreenCursor (View *view)
 		} else {
 			curs_set (0);
 		}
-	}
+	}*/
 }
 
 -draw

From a75eeb6955acf16eb7a48471c26bc370f0144c02 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 24 Mar 2020 13:36:54 +0900
Subject: [PATCH 0936/1519] [qwaq] Remove unnecessary options flag

I don't think it will be necessary.
---
 ruamoko/qwaq/qwaq-view.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-view.h b/ruamoko/qwaq/qwaq-view.h
index 4dae4e20f..4d4456451 100644
--- a/ruamoko/qwaq/qwaq-view.h
+++ b/ruamoko/qwaq/qwaq-view.h
@@ -20,8 +20,6 @@ enum {
 	ofMakeFirst     = 0x0020,
 	ofTileable      = 0x0040,
 	ofCentered      = 0x0080,
-
-	ofCallHasObject = 0x8000,
 };
 
 enum {

From 995074269baa4bd2e996780a49d3634f85232028 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 24 Mar 2020 13:38:20 +0900
Subject: [PATCH 0937/1519] [qwaq] Handle some keys in the editor

Doesn't work yet, though.
---
 ruamoko/qwaq/qwaq-app.r    |  2 +-
 ruamoko/qwaq/qwaq-editor.r | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/ruamoko/qwaq/qwaq-app.r b/ruamoko/qwaq/qwaq-app.r
index 5ea0db4c5..04c9a95ed 100644
--- a/ruamoko/qwaq/qwaq-app.r
+++ b/ruamoko/qwaq/qwaq-app.r
@@ -103,7 +103,6 @@ arp_end (void)
 		event.what = qe_none;
 		return self;
 	}
-	[objects handleEvent: event];
 	if (event.what == qe_key
 		&& (event.key.code == '\x18' || event.key.code == '\x11')) {
 		event.what = qe_command;
@@ -114,6 +113,7 @@ arp_end (void)
 			|| event.message.command == qc_error)) {
 		endState = event.message.command;
 	}
+	[objects handleEvent: event];
 	return self;
 }
 @end
diff --git a/ruamoko/qwaq/qwaq-editor.r b/ruamoko/qwaq/qwaq-editor.r
index 32e468021..9d36e27ac 100644
--- a/ruamoko/qwaq/qwaq-editor.r
+++ b/ruamoko/qwaq/qwaq-editor.r
@@ -1,3 +1,4 @@
+#include <QF/keys.h>
 #include "color.h"
 #include "qwaq-editor.h"
 
@@ -54,7 +55,17 @@
 				[self scrollRight: 1];
 			}
 		}
+	} else if (event.what == qe_keydown) {
+		switch (event.key.code) {
+			case QFK_PAGEUP:
+				[self scrollUp: ylen];
+				break;
+			case QFK_PAGEDOWN:
+				[self scrollDown: ylen];
+				break;
+		}
 	}
+	event.what = qe_none;
 	return self;
 }
 

From 148a351e9483fe4df131b48cc266343917e9cb48 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 24 Mar 2020 13:46:26 +0900
Subject: [PATCH 0938/1519] [qwaq] Offset event coords only when positional

This fixes pgup/pgdn not working in the editor.
---
 ruamoko/qwaq/qwaq-window.r | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-window.r b/ruamoko/qwaq/qwaq-window.r
index f69729ac7..6071130eb 100644
--- a/ruamoko/qwaq/qwaq-window.r
+++ b/ruamoko/qwaq/qwaq-window.r
@@ -155,11 +155,17 @@
 
 -handleEvent: (qwaq_event_t *) event
 {
-	event.mouse.x -= xpos;
-	event.mouse.y -= ypos;
+	int         offset = event.what & qe_positional;
+
+	if (offset) {
+		event.mouse.x -= xpos;
+		event.mouse.y -= ypos;
+	}
 	[objects handleEvent: event];
-	event.mouse.x += xpos;
-	event.mouse.y += ypos;
+	if (offset) {
+		event.mouse.x += xpos;
+		event.mouse.y += ypos;
+	}
 	return self;
 }
 

From 713150b41a02f7d5aa859d32be48866b78f31202 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 24 Mar 2020 15:35:42 +0900
Subject: [PATCH 0939/1519] [gamecode] Add debug hooks to the VM engine

While there was a breakpoint hook, it was for only breakpoints and more
was needed. Now there's a generic hook that is called for tracing,
breakpoints, watch points, runtime errors and VM errors, with the
"event" type passed as the first parameter and a data pointer in the
second.
---
 include/QF/progs.h      | 13 ++++++++++++-
 libs/gamecode/pr_exec.c | 27 +++++++++++++++++++++------
 libs/gamecode/pr_load.c |  6 ++++++
 3 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/include/QF/progs.h b/include/QF/progs.h
index c615e6d14..e2c077e02 100644
--- a/include/QF/progs.h
+++ b/include/QF/progs.h
@@ -1690,6 +1690,15 @@ typedef struct {
 	strref_t   *tstr;				///< Linked list of temporary strings.
 } prstack_t;
 
+typedef enum {
+	prd_none,
+	prd_trace,
+	prd_breakpoint,
+	prd_watchpoint,
+	prd_runerror,
+	prd_error,			// lower level error thann prd_runerror
+} prdebug_t;
+
 struct progs_s {
 	int       (*parse_field) (progs_t *pr, const char *key, const char *value);
 
@@ -1831,7 +1840,9 @@ struct progs_s {
 	/// \name debugging
 	///@{
 	struct prdeb_resources_s *pr_debug_resources;
-	void      (*breakpoint_handler) (progs_t *pr);
+	void      (*debug_handler) (prdebug_t event, void *data);
+	void       *debug_data;
+	const char *error_string;
 	pr_type_t  *watch;
 	int         wp_conditional;
 	pr_type_t   wp_val;
diff --git a/libs/gamecode/pr_exec.c b/libs/gamecode/pr_exec.c
index 397eb7bde..94018943b 100644
--- a/libs/gamecode/pr_exec.c
+++ b/libs/gamecode/pr_exec.c
@@ -62,6 +62,12 @@ PR_RunError (progs_t * pr, const char *error, ...)
 	dvsprintf (string, error, argptr);
 	va_end (argptr);
 
+	if (pr->debug_handler) {
+		pr->error_string = string->str;
+		pr->debug_handler (prd_runerror, pr->debug_data);
+		// not expected to return, but if so, behave as if there was no handler
+	}
+
 	Sys_Printf ("%s\n", string->str);
 
 	PR_DumpState (pr);
@@ -477,12 +483,17 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 		op_b = pr->pr_globals + st->b;
 		op_c = pr->pr_globals + st->c;
 
-		if (pr->pr_trace)
-			PR_PrintStatement (pr, st, 1);
+		if (pr->pr_trace) {
+			if (pr->debug_handler) {
+				pr->debug_handler (prd_trace, pr->debug_data);
+			} else {
+				PR_PrintStatement (pr, st, 1);
+			}
+		}
 
 		if (st->op & OP_BREAK) {
-			if (pr->breakpoint_handler) {
-				pr->breakpoint_handler (pr);
+			if (pr->debug_handler) {
+				pr->debug_handler (prd_breakpoint, pr->debug_data);
 			} else {
 				PR_RunError (pr, "breakpoint hit");
 			}
@@ -1701,8 +1712,12 @@ op_call:
 		if (watch && watch->integer_var != old_val.integer_var) {
 			if (!pr->wp_conditional
 				|| watch->integer_var == pr->wp_val.integer_var) {
-				PR_RunError (pr, "watchpoint hit: %d -> %d",
-							 old_val.integer_var, watch->integer_var);
+				if (pr->debug_handler) {
+					pr->debug_handler (prd_watchpoint, pr->debug_data);
+				} else {
+					PR_RunError (pr, "watchpoint hit: %d -> %d",
+								 old_val.integer_var, watch->integer_var);
+				}
 			}
 			old_val.integer_var = watch->integer_var;
 		}
diff --git a/libs/gamecode/pr_load.c b/libs/gamecode/pr_load.c
index d385dff12..2bae32dfe 100644
--- a/libs/gamecode/pr_load.c
+++ b/libs/gamecode/pr_load.c
@@ -323,6 +323,7 @@ PR_LoadProgsFile (progs_t *pr, QFile *file, int size)
 			def->type_encoding = xdef->type;
 		}
 	}
+	pr->error_string = 0;
 	pr->pr_trace = 0;
 	pr->pr_trace_depth = 0;
 	pr->pr_xfunction = 0;
@@ -485,5 +486,10 @@ PR_Error (progs_t *pr, const char *error, ...)
 	dvsprintf (string, error, argptr);
 	va_end (argptr);
 
+	if (pr->debug_handler) {
+		pr->error_string = string->str;
+		pr->debug_handler (prd_error, pr->debug_data);
+		// not expected to return, but if so, behave as if there was no handler
+	}
 	Sys_Error ("%s: %s", pr->progs_name, string->str);
 }

From d867a1a9f10c697ef619082ef74bc7ac70383723 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 24 Mar 2020 19:45:39 +0900
Subject: [PATCH 0940/1519] [gamecode] Allow watch-point to be updated

With the watch-point address cached in a local var, it was not possible
to update the watch-point while the progs were executing.
---
 libs/gamecode/pr_exec.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/libs/gamecode/pr_exec.c b/libs/gamecode/pr_exec.c
index 94018943b..0441e9b83 100644
--- a/libs/gamecode/pr_exec.c
+++ b/libs/gamecode/pr_exec.c
@@ -448,7 +448,7 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 	dstatement_t *st;
 	edict_t    *ed;
 	pr_type_t  *ptr;
-	pr_type_t   old_val = {0}, *watch = 0;
+	pr_type_t   old_val = {0};
 
 	// make a stack frame
 	exitdepth = pr->pr_depth;
@@ -464,8 +464,7 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 	st = pr->pr_statements + pr->pr_xstatement;
 
 	if (pr->watch) {
-		watch = pr->watch;
-		old_val = *watch;
+		old_val = pr->watch;
 	}
 
 	while (1) {
@@ -1709,9 +1708,9 @@ op_call:
 			default:
 				PR_RunError (pr, "Bad opcode %i", st->op);
 		}
-		if (watch && watch->integer_var != old_val.integer_var) {
+		if (pr->watch && pr->watch->integer_var != old_val.integer_var) {
 			if (!pr->wp_conditional
-				|| watch->integer_var == pr->wp_val.integer_var) {
+				|| pr->watch->integer_var == pr->wp_val.integer_var) {
 				if (pr->debug_handler) {
 					pr->debug_handler (prd_watchpoint, pr->debug_data);
 				} else {

From baff8913458db08c8f3c95160281fa08b3f6b935 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 24 Mar 2020 19:48:20 +0900
Subject: [PATCH 0941/1519] [qwaq] Rename cond_t to rwcond_t

---
 ruamoko/qwaq/qwaq-curses.c |  2 +-
 ruamoko/qwaq/qwaq-curses.h | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-curses.c b/ruamoko/qwaq/qwaq-curses.c
index 453ff72bf..9473a1e20 100644
--- a/ruamoko/qwaq/qwaq-curses.c
+++ b/ruamoko/qwaq/qwaq-curses.c
@@ -1863,7 +1863,7 @@ qwaq_print (const char *fmt, va_list args)
 }
 
 static void
-qwaq_init_cond (cond_t *cond)
+qwaq_init_cond (rwcond_t *cond)
 {
 	pthread_cond_init (&cond->rcond, 0);
 	pthread_cond_init (&cond->wcond, 0);
diff --git a/ruamoko/qwaq/qwaq-curses.h b/ruamoko/qwaq/qwaq-curses.h
index f04c0dd1a..50f8ce762 100644
--- a/ruamoko/qwaq/qwaq-curses.h
+++ b/ruamoko/qwaq/qwaq-curses.h
@@ -157,11 +157,11 @@ typedef struct panel_s {
 	int         window_id;
 } panel_t;
 
-typedef struct cond_s {
+typedef struct rwcond_s {
 	pthread_cond_t rcond;
 	pthread_cond_t wcond;
 	pthread_mutex_t mut;
-} cond_t;
+} rwcond_t;
 
 typedef enum {
 	esc_ground,
@@ -178,13 +178,13 @@ typedef struct qwaq_resources_s {
 	window_t    stdscr;
 	PR_RESMAP (window_t) window_map;
 	PR_RESMAP (panel_t) panel_map;
-	cond_t      event_cond;
+	rwcond_t    event_cond;
 	RING_BUFFER (qwaq_event_t, QUEUE_SIZE) event_queue;
-	cond_t      command_cond;
+	rwcond_t    command_cond;
 	RING_BUFFER (int, COMMAND_QUEUE_SIZE) command_queue;
-	cond_t      results_cond;
+	rwcond_t    results_cond;
 	RING_BUFFER (int, COMMAND_QUEUE_SIZE) results;
-	cond_t      string_id_cond;
+	rwcond_t    string_id_cond;
 	RING_BUFFER (int, STRING_ID_QUEUE_SIZE) string_ids;
 	dstring_t   strings[STRING_ID_QUEUE_SIZE - 1];
 

From 60f9f4815ad293f15fdbbc642e15802d5d28f72f Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 24 Mar 2020 19:48:57 +0900
Subject: [PATCH 0942/1519] [qwaq] Make qwaq_cond_init public

---
 ruamoko/qwaq/qwaq-curses.c | 2 +-
 ruamoko/qwaq/qwaq-curses.h | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ruamoko/qwaq/qwaq-curses.c b/ruamoko/qwaq/qwaq-curses.c
index 9473a1e20..360c68bec 100644
--- a/ruamoko/qwaq/qwaq-curses.c
+++ b/ruamoko/qwaq/qwaq-curses.c
@@ -1862,7 +1862,7 @@ qwaq_print (const char *fmt, va_list args)
 	fflush (logfile);
 }
 
-static void
+void
 qwaq_init_cond (rwcond_t *cond)
 {
 	pthread_cond_init (&cond->rcond, 0);
diff --git a/ruamoko/qwaq/qwaq-curses.h b/ruamoko/qwaq/qwaq-curses.h
index 50f8ce762..738f6befe 100644
--- a/ruamoko/qwaq/qwaq-curses.h
+++ b/ruamoko/qwaq/qwaq-curses.h
@@ -202,6 +202,7 @@ void qwaq_input_init (qwaq_resources_t *res);
 void qwaq_input_shutdown (qwaq_resources_t *res);
 void qwaq_process_input (qwaq_resources_t *res);
 void qwaq_init_timeout (struct timespec *timeout, long time);
+void qwaq_init_cond (rwcond_t *cond);
 #endif
 
 #endif//__qwaq_curses_h

From 0bbef18786fcc84ba700055fbbbdac0340765f0a Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 24 Mar 2020 19:50:05 +0900
Subject: [PATCH 0943/1519] [qwaq] Make qwaq_add_event public

---
 ruamoko/qwaq/qwaq-curses.h |  1 +
 ruamoko/qwaq/qwaq-input.c  | 13 +++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-curses.h b/ruamoko/qwaq/qwaq-curses.h
index 738f6befe..111ada434 100644
--- a/ruamoko/qwaq/qwaq-curses.h
+++ b/ruamoko/qwaq/qwaq-curses.h
@@ -202,6 +202,7 @@ void qwaq_input_init (qwaq_resources_t *res);
 void qwaq_input_shutdown (qwaq_resources_t *res);
 void qwaq_process_input (qwaq_resources_t *res);
 void qwaq_init_timeout (struct timespec *timeout, long time);
+int qwaq_add_event (qwaq_resources_t *res, qwaq_event_t *event);
 void qwaq_init_cond (rwcond_t *cond);
 #endif
 
diff --git a/ruamoko/qwaq/qwaq-input.c b/ruamoko/qwaq/qwaq-input.c
index b0d0da742..ba7dca6e9 100644
--- a/ruamoko/qwaq/qwaq-input.c
+++ b/ruamoko/qwaq/qwaq-input.c
@@ -174,8 +174,8 @@ handle_winch (int sig)
 	winch_arrived = 1;
 }
 
-static void
-add_event (qwaq_resources_t *res, qwaq_event_t *event)
+int
+qwaq_add_event (qwaq_resources_t *res, qwaq_event_t *event)
 {
 	struct timespec timeout;
 	int         merged = 0;
@@ -192,7 +192,7 @@ add_event (qwaq_resources_t *res, qwaq_event_t *event)
 	}
 	pthread_mutex_unlock (&res->event_cond.mut);
 	if (merged) {
-		return;
+		return 0;
 	}
 
 	pthread_mutex_lock (&res->event_cond.mut);
@@ -204,6 +204,7 @@ add_event (qwaq_resources_t *res, qwaq_event_t *event)
 	RB_WRITE_DATA (res->event_queue, event, 1);
 	pthread_cond_broadcast (&res->event_cond.rcond);
 	pthread_mutex_unlock (&res->event_cond.mut);
+	return ret;
 }
 
 static void
@@ -217,7 +218,7 @@ resize_event (qwaq_resources_t *res)
 	event.what = qe_resize;
 	event.resize.width = size.ws_col;
 	event.resize.height = size.ws_row;
-	add_event (res, &event);
+	qwaq_add_event (res, &event);
 }
 
 static void
@@ -228,7 +229,7 @@ key_event (qwaq_resources_t *res, int key, unsigned shift)
 	event.when = Sys_DoubleTime ();
 	event.key.code = key;
 	event.key.shift = shift;
-	add_event (res, &event);
+	qwaq_add_event (res, &event);
 }
 
 static void
@@ -254,7 +255,7 @@ mouse_event (qwaq_resources_t *res, int what, int x, int y)
 		// scroll button event, so always single click
 		event.mouse.click = 1;
 	}
-	add_event (res, &event);
+	qwaq_add_event (res, &event);
 }
 
 static void

From e56d00f27fbd76b14a71869c2a5d83e19fdeaa58 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 24 Mar 2020 19:51:01 +0900
Subject: [PATCH 0944/1519] [qwaq] Make qwaq_message_t more useful

Couldn't use @param because of its use in gcc as well as qfcc.
---
 ruamoko/qwaq/event.h    | 16 +++++++++++++---
 ruamoko/qwaq/qwaq-app.r |  8 ++++----
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/ruamoko/qwaq/event.h b/ruamoko/qwaq/event.h
index 1f122fc44..d11fd195e 100644
--- a/ruamoko/qwaq/event.h
+++ b/ruamoko/qwaq/event.h
@@ -23,7 +23,7 @@ typedef enum {
 	qe_none    = 0x0000,
 	qe_mouse   = 0x001f,
 	qe_key     = 0x0020,
-	qe_system  = 0x01c0,
+	qe_system  = 0x01c0,	//FIXME this isn't very manageable
 	qe_message = 0xfe00,
 
 	qe_focused = qe_key | qe_command,
@@ -52,8 +52,18 @@ typedef struct qwaq_resize_s {
 	int         height;
 } qwaq_resize_t;
 
-typedef struct qwaq_message_s {
-	qwaq_command command;
+typedef union qwaq_message_s {
+	int         int_val;
+	float       float_val;
+	float       vector_val[4];	// vector and quaternion
+	double      double_val;
+#ifdef __QFCC__
+	void       *pointer_val;
+	string      string_val;
+#else
+	pointer_t   pointer_val;
+	string_t    string_val;
+#endif
 } qwaq_message_t;
 
 typedef struct qwaq_event_s {
diff --git a/ruamoko/qwaq/qwaq-app.r b/ruamoko/qwaq/qwaq-app.r
index 04c9a95ed..4d46e53e6 100644
--- a/ruamoko/qwaq/qwaq-app.r
+++ b/ruamoko/qwaq/qwaq-app.r
@@ -106,12 +106,12 @@ arp_end (void)
 	if (event.what == qe_key
 		&& (event.key.code == '\x18' || event.key.code == '\x11')) {
 		event.what = qe_command;
-		event.message.command = qc_exit;
+		event.message.int_val = qc_exit;
 	}
 	if (event.what == qe_command
-		&& (event.message.command == qc_exit
-			|| event.message.command == qc_error)) {
-		endState = event.message.command;
+		&& (event.message.int_val == qc_exit
+			|| event.message.int_val == qc_error)) {
+		endState = event.message.int_val;;
 	}
 	[objects handleEvent: event];
 	return self;

From 12f7b52fff8dab33fd0d2316f659ac38d2e01942 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 24 Mar 2020 19:52:35 +0900
Subject: [PATCH 0945/1519] [qwaq] Add initial qwaq debugger system

It's not hooked up yet, and only very basic functionality is
implemented, but I think this approach will work.
---
 ruamoko/qwaq/Makefile.am       |   1 +
 ruamoko/qwaq/qwaq-debug.c      | 321 +++++++++++++++++++++++++++++++++
 ruamoko/qwaq/qwaq-debug.h      |  31 ++++
 ruamoko/qwaq/qwaq-editbuffer.h |   3 +
 4 files changed, 356 insertions(+)
 create mode 100644 ruamoko/qwaq/qwaq-debug.c
 create mode 100644 ruamoko/qwaq/qwaq-debug.h

diff --git a/ruamoko/qwaq/Makefile.am b/ruamoko/qwaq/Makefile.am
index 194c31933..182ed2565 100644
--- a/ruamoko/qwaq/Makefile.am
+++ b/ruamoko/qwaq/Makefile.am
@@ -47,6 +47,7 @@ qwaq_curses_libs= \
 qwaq_curses_SOURCES= \
 	main.c \
 	qwaq-curses.c \
+	qwaq-debug.c \
 	qwaq-editbuffer-bi.c \
 	qwaq-input.c
 qwaq_curses_LDADD= $(qwaq_curses_libs) $(QWAQ_LIBS) \
diff --git a/ruamoko/qwaq/qwaq-debug.c b/ruamoko/qwaq/qwaq-debug.c
new file mode 100644
index 000000000..8edcf992d
--- /dev/null
+++ b/ruamoko/qwaq/qwaq-debug.c
@@ -0,0 +1,321 @@
+/*
+	qwaq-debug.c
+
+	Debugging support
+
+	Copyright (C) 2020 Bill Currie <bill@taniwha.org>
+
+	Author: Bill Currie <bill@taniwha.org>
+	Date: 2020/03/24
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <sys/ioctl.h>
+#include <ctype.h>
+#include <errno.h>
+#include <pthread.h>
+#include <signal.h>
+#include <stdio.h>
+#include <string.h>
+#include <termios.h>
+#include <unistd.h>
+
+#include "QF/dstring.h"
+#include "QF/hash.h"
+#include "QF/keys.h"
+#include "QF/sys.h"
+
+#include "qwaq.h"
+#include "event.h"
+#include "qwaq-curses.h"
+#include "qwaq-debug.h"
+
+typedef struct qwaq_target_s {
+	progs_t    *pr;
+	struct qwaq_debug_s *debugger;
+	int         handle;
+	prdebug_t   event;
+	rwcond_t    run_cond;
+} qwaq_target_t;
+
+typedef struct qwaq_debug_s {
+	progs_t    *pr;
+	qwaq_resources_t *qwaq;	// to communicate with the debugger thread
+	PR_RESMAP (qwaq_target_t) targets;
+} qwaq_debug_t;
+
+#define always_inline inline __attribute__((__always_inline__))
+
+static qwaq_target_t *
+target_new (qwaq_debug_t *debug)
+{
+	PR_RESNEW (qwaq_target_t, debug->targets);
+}
+
+static void
+target_free (qwaq_debug_t *debug, qwaq_target_t *target)
+{
+	PR_RESFREE (qwaq_target_t, debug->targets, target);
+}
+
+static void
+target_reset (qwaq_debug_t *debug)
+{
+	PR_RESRESET (qwaq_target_t, debug->targets);
+}
+
+static inline qwaq_target_t *
+target_get (qwaq_debug_t *debug, unsigned index)
+{
+	PR_RESGET (debug->targets, index);
+}
+
+static inline int
+target_index (qwaq_debug_t *debug, qwaq_target_t *target)
+{
+	PR_RESINDEX (debug->targets, target);
+}
+
+static always_inline qwaq_target_t * __attribute__((pure))
+get_target (qwaq_debug_t *debug, const char *name, int handle)
+{
+	qwaq_target_t *target = target_get (debug, handle);
+
+	if (!target || !target->debugger) {
+		PR_RunError (debug->pr, "invalid target passed to %s", name + 4);
+	}
+	return target;
+}
+
+static void
+qwaq_debug_handler (prdebug_t debug_event, void *data)
+{
+	__auto_type target = (qwaq_target_t *) data;
+	qwaq_debug_t *debug = target->debugger;
+	qwaq_event_t event = {};
+	int         ret;
+
+	target->event = debug_event;
+	event.what = qe_debug_event;
+	event.message.pointer_val = target->handle;
+
+	while ((ret = qwaq_add_event (debug->qwaq, &event)) == ETIMEDOUT) {
+		// spin
+	}
+	if (ret == EINVAL) {
+		Sys_Error ("event queue broke");
+	}
+	pthread_mutex_lock (&target->run_cond.mut);
+	pthread_cond_wait (&target->run_cond.rcond, &target->run_cond.mut);
+	pthread_mutex_unlock (&target->run_cond.mut);
+	if (debug_event == prd_runerror || debug_event == prd_error) {
+		pthread_exit ((void *) target->pr->error_string);
+	}
+}
+
+static void
+qwaq_debug_clear (progs_t *pr, void *data)
+{
+	__auto_type debug = (qwaq_debug_t *) data;
+	target_reset (debug);
+}
+
+static void
+qwaq_target_clear (progs_t *pr, void *data)
+{
+	qwaq_target_t *target = pr->debug_data;
+	target_free (target->debugger, target);
+}
+
+//FIXME need a better way to get this from one thread to the others
+static qwaq_debug_t *qwaq_debug_data;
+
+static int
+qwaq_target_load (progs_t *pr)
+{
+	qwaq_target_t *target = target_new (qwaq_debug_data);
+	target->pr = pr;
+	target->debugger = qwaq_debug_data;
+	target->handle = target_index (qwaq_debug_data, target);
+	qwaq_init_cond (&target->run_cond);
+
+	pr->debug_handler = qwaq_debug_handler;
+	pr->debug_data = target;
+
+	// start tracing immediately so the debugger has a chance to start up
+	// before the target progs begin running
+	pr->pr_trace = 1;
+	pr->pr_trace_depth = -1;
+
+	return 1;
+}
+
+static void
+qdb_set_trace (progs_t *pr)
+{
+	__auto_type debug = PR_Resources_Find (pr, "qwaq-debug");
+	pointer_t   handle = P_INT (pr, 0);
+	int         state = P_INT (pr, 1);
+	qwaq_target_t *target = get_target (debug, __FUNCTION__, handle);
+	progs_t    *tpr = target->pr;
+
+	tpr->pr_trace = state;
+}
+
+static void
+qdb_set_breakpoint (progs_t *pr)
+{
+	__auto_type debug = PR_Resources_Find (pr, "qwaq-debug");
+	pointer_t   handle = P_INT (pr, 0);
+	unsigned    staddr = P_INT (pr, 1);
+	qwaq_target_t *target = get_target (debug, __FUNCTION__, handle);
+	progs_t    *tpr = target->pr;
+
+	if (staddr >= tpr->progs->numstatements) {
+		R_INT (pr) = -1;
+		return;
+	}
+	tpr->pr_statements[staddr].op |= OP_BREAK;
+	R_INT (pr) = 0;
+}
+
+static void
+qdb_clear_breakpoint (progs_t *pr)
+{
+	__auto_type debug = PR_Resources_Find (pr, "qwaq-debug");
+	pointer_t   handle = P_INT (pr, 0);
+	unsigned    staddr = P_UINT (pr, 1);
+	qwaq_target_t *target = get_target (debug, __FUNCTION__, handle);
+	progs_t    *tpr = target->pr;
+
+	if (staddr >= tpr->progs->numstatements) {
+		R_INT (pr) = -1;
+		return;
+	}
+	tpr->pr_statements[staddr].op &= ~OP_BREAK;
+	R_INT (pr) = 0;
+}
+
+static void
+qdb_set_watchpoint (progs_t *pr)
+{
+	__auto_type debug = PR_Resources_Find (pr, "qwaq-debug");
+	pointer_t   handle = P_INT (pr, 0);
+	pointer_t   offset = P_UINT (pr, 1);
+	qwaq_target_t *target = get_target (debug, __FUNCTION__, handle);
+	progs_t    *tpr = target->pr;
+
+	if (offset >= tpr->globals_size) {
+		R_INT (pr) = -1;
+		return;
+	}
+	tpr->watch = &tpr->pr_globals[offset];
+	R_INT (pr) = 0;
+}
+
+static void
+qdb_clear_watchpoint (progs_t *pr)
+{
+	__auto_type debug = PR_Resources_Find (pr, "qwaq-debug");
+	pointer_t   handle = P_INT (pr, 0);
+	qwaq_target_t *target = get_target (debug, __FUNCTION__, handle);
+	progs_t    *tpr = target->pr;
+
+	tpr->watch = 0;
+	R_INT (pr) = 0;
+}
+
+static void
+qdb_continue (progs_t *pr)
+{
+	__auto_type debug = PR_Resources_Find (pr, "qwaq-debug");
+	pointer_t   handle = P_INT (pr, 0);
+	qwaq_target_t *target = get_target (debug, __FUNCTION__, handle);
+
+	pthread_mutex_lock (&target->run_cond.mut);
+	pthread_cond_signal (&target->run_cond.rcond);
+	pthread_mutex_unlock (&target->run_cond.mut);
+}
+
+static void
+qdb_get_state (progs_t *pr)
+{
+	__auto_type debug = PR_Resources_Find (pr, "qwaq-debug");
+	pointer_t   handle = P_INT (pr, 0);
+	qwaq_target_t *target = get_target (debug, __FUNCTION__, handle);
+	progs_t    *tpr = target->pr;
+	pr_lineno_t *lineno;
+	pr_auxfunction_t *f;
+	string_t    file = 0;
+	unsigned    line = 0;
+	unsigned    staddr = tpr->pr_xstatement;
+	func_t      func = tpr->pr_xfunction - tpr->function_table;
+
+	lineno = PR_Find_Lineno (tpr, staddr);
+	if (lineno) {
+		f = PR_Get_Lineno_Func (pr, lineno);
+		file = pr->pr_functions[f->function].s_file;
+		func = f->function;
+		line = PR_Get_Lineno_Line (pr, lineno);
+		line += f->source_line;
+	}
+
+	qdb_state_t state = {};
+	state.staddr = staddr;
+	state.func = func;
+	state.file = file;
+	state.line = line;
+
+	R_PACKED (pr, qdb_state_t) = state;
+}
+
+static builtin_t builtins[] = {
+	{"qdb_set_trace",			qdb_set_trace,			-1},
+	{"qdb_set_breakpoint",		qdb_set_breakpoint,		-1},
+	{"qdb_clear_breakpoint",	qdb_clear_breakpoint,	-1},
+	{"qdb_set_watchpoint",		qdb_set_watchpoint,		-1},
+	{"qdb_clear_watchpoint",	qdb_clear_watchpoint,	-1},
+	{"qdb_continue",			qdb_continue,			-1},
+	{"qdb_get_state",			qdb_get_state,			-1},
+	{}
+};
+
+void
+QWAQ_Debug_Init (progs_t *pr)
+{
+	qwaq_debug_t *debug = calloc (sizeof (*debug), 1);
+	qwaq_debug_data = debug;	// FIXME ? see decl
+	debug->pr = pr;
+	debug->qwaq = PR_Resources_Find (pr, "qwaq");
+
+	PR_Resources_Register (pr, "qwaq-debug", debug, qwaq_debug_clear);
+	PR_RegisterBuiltins (pr, builtins);
+}
+
+void
+QWAQ_DebugTarget_Init (progs_t *pr)
+{
+	PR_AddLoadFunc (pr, qwaq_target_load);
+	PR_Resources_Register (pr, "qwaq-target", 0, qwaq_target_clear);
+}
diff --git a/ruamoko/qwaq/qwaq-debug.h b/ruamoko/qwaq/qwaq-debug.h
new file mode 100644
index 000000000..c95788951
--- /dev/null
+++ b/ruamoko/qwaq/qwaq-debug.h
@@ -0,0 +1,31 @@
+#ifndef __qwaq_debug_h
+#define __qwaq_debug_h
+
+#include "event.h"
+
+enum {
+	qe_debug_event = 0x0100,
+} qwaq_debug_messages;
+
+#ifdef __QFCC__
+
+//FIXME add unsigned to qfcc
+#ifndef unsigned
+#define unsigned int
+#define umax 0x7fffffff
+#endif
+
+#else//GCC
+#endif
+
+typedef struct qdb_state_s {
+	unsigned    staddr;
+	unsigned    func;
+	unsigned    file;
+	unsigned    line;
+} qdb_state_t;
+
+void QWAQ_Debug_Init (progs_t *pr);
+void QWAQ_DebugTarget_Init (progs_t *pr);
+
+#endif//__qwaq_debug_h
diff --git a/ruamoko/qwaq/qwaq-editbuffer.h b/ruamoko/qwaq/qwaq-editbuffer.h
index 215937a55..4e5062ab2 100644
--- a/ruamoko/qwaq/qwaq-editbuffer.h
+++ b/ruamoko/qwaq/qwaq-editbuffer.h
@@ -5,8 +5,11 @@
 #include <Object.h>
 
 //FIXME add unsigned to qfcc
+#ifndef unsigned
 #define unsigned int
 #define umax 0x7fffffff
+#endif
+
 #endif//__QFCC__
 
 typedef struct eb_sel_s {

From 32d77eabac451b03c60e7fbbf869785fbe1c92f7 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 24 Mar 2020 20:15:35 +0900
Subject: [PATCH 0946/1519] [qwaq] Hook up the debugger modules

Now to write all the high level stuff. Wheeeee
---
 ruamoko/qwaq/main.c       | 35 +++++++++++++++++++++++++++--------
 ruamoko/qwaq/qwaq-debug.h |  2 +-
 2 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/ruamoko/qwaq/main.c b/ruamoko/qwaq/main.c
index 1e7bfa28f..3972acbc3 100644
--- a/ruamoko/qwaq/main.c
+++ b/ruamoko/qwaq/main.c
@@ -53,6 +53,7 @@
 #include "QF/zone.h"
 
 #include "qwaq.h"
+#include "qwaq-debug.h"
 
 #define MAX_EDICTS 1024
 
@@ -141,8 +142,10 @@ init_qf (void)
 
 }
 
+typedef void (*progsinit_f) (progs_t *pr);
+
 static progs_t *
-create_progs (void)
+create_progs (progsinit_f *funcs)
 {
 	progs_t    *pr = calloc (1, sizeof (*pr));
 
@@ -154,10 +157,9 @@ create_progs (void)
 	PR_Init_Cvars ();
 	PR_Init (pr);
 	RUA_Init (pr, 0);
-	Key_Progs_Init (pr);		// FIXME not all threads
-	PR_Cmds_Init (pr);			// FIXME not all threads
-	BI_Init (pr);				// FIXME not all threads
-	QWAQ_EditBuffer_Init (pr);	// FIXME not all threads
+	while (*funcs) {
+		(*funcs++) (pr);
+	}
 
 	return pr;
 }
@@ -183,7 +185,7 @@ load_progs (progs_t *pr, const char *name)
 }
 
 static void
-spawn_progs (qwaq_thread_t *thread)
+spawn_progs (qwaq_thread_t *thread, progsinit_f *funcs)
 {
 	dfunction_t *dfunc;
 	const char *name = 0;
@@ -192,7 +194,7 @@ spawn_progs (qwaq_thread_t *thread)
 	progs_t    *pr;
 
 	thread->main_func = 0;
-	pr = thread->pr = create_progs ();
+	pr = thread->pr = create_progs (funcs);
 	if (thread->args.size) {
 		name = thread->args.a[0];
 	}
@@ -321,6 +323,20 @@ done:
 	return qargs_ind;
 }
 
+static progsinit_f main_app[] = {
+	Key_Progs_Init,
+	PR_Cmds_Init,
+	BI_Init,
+	QWAQ_EditBuffer_Init,
+	QWAQ_Debug_Init,
+	0
+};
+
+static progsinit_f target_app[] = {
+	QWAQ_DebugTarget_Init,
+	0
+};
+
 int
 main (int argc, char **argv)
 {
@@ -378,6 +394,8 @@ main (int argc, char **argv)
 
 	for (size_t i = 1, thread_ind = 0; i < thread_data.size; i++) {
 		qwaq_thread_t *thread = thread_data.a[i];
+		progsinit_f *app_funcs = target_app;
+
 		if (thread->args.size && thread->args.a[0]
 			&& strcmp (thread->args.a[0], "--qargs")) {
 			// skip the args set that's passed to qargs
@@ -391,8 +409,9 @@ main (int argc, char **argv)
 		}
 		if (main_ind < 0) {
 			main_ind = i;
+			app_funcs = main_app;
 		}
-		spawn_progs (thread);
+		spawn_progs (thread, app_funcs);
 	}
 	if (main_ind >= 0) {
 		// threads might start new threads before the end is reached
diff --git a/ruamoko/qwaq/qwaq-debug.h b/ruamoko/qwaq/qwaq-debug.h
index c95788951..f54d25636 100644
--- a/ruamoko/qwaq/qwaq-debug.h
+++ b/ruamoko/qwaq/qwaq-debug.h
@@ -3,7 +3,7 @@
 
 #include "event.h"
 
-enum {
+typedef enum {
 	qe_debug_event = 0x0100,
 } qwaq_debug_messages;
 

From d73f380ba4c2c271e1aac4200294991dab69e74a Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 24 Mar 2020 21:01:48 +0900
Subject: [PATCH 0947/1519] [qwaq] Add -hide to View's interface

Missed it somehow.
---
 ruamoko/qwaq/qwaq-view.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ruamoko/qwaq/qwaq-view.h b/ruamoko/qwaq/qwaq-view.h
index 4d4456451..50ca22462 100644
--- a/ruamoko/qwaq/qwaq-view.h
+++ b/ruamoko/qwaq/qwaq-view.h
@@ -89,6 +89,7 @@ enum {
 
 -setContext: (id<TextContext>) context;
 -draw;
+-hide;
 -redraw;
 -move: (Point) delta;
 -resize: (Extent) delta;

From 05e377c3acaa96ebeb25596d52f6b82966a87c26 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 24 Mar 2020 21:02:26 +0900
Subject: [PATCH 0948/1519] [qwaq] Make a View protocol

---
 ruamoko/qwaq/qwaq-view.h | 60 +++++++++++++++++++++-------------------
 1 file changed, 31 insertions(+), 29 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-view.h b/ruamoko/qwaq/qwaq-view.h
index 50ca22462..b8d61d1f0 100644
--- a/ruamoko/qwaq/qwaq-view.h
+++ b/ruamoko/qwaq/qwaq-view.h
@@ -43,36 +43,8 @@ enum {
 	gfGrowY         = gfGrowLoY | gfGrowHiY,
 	gfGrowAll       = gfGrowX | gfGrowY,
 };
-@interface View: Object
-{
-	union {
-		Rect        rect;
-		struct {
-			int     xpos;
-			int     ypos;
-			int     xlen;
-			int     ylen;
-		};
-		struct {
-			Point   pos;
-			Extent  size;
-		};
-	};
-	Rect        absRect;
-	Point       point;		// can't be local :(
-	Group      *owner;
-	id<TextContext> textContext;
-	int         state;
-	int         options;
-	int         growMode;
-	int         cursorState;
-	Point       cursor;
-	ListenerGroup *onReceiveFocus;
-	ListenerGroup *onReleaseFocus;
-}
--initWithRect: (Rect) rect;
-- (void) dealloc;
 
+@protocol View
 -setOwner: (Group *) owner;
 -setGrowMode: (int) mode;
 
@@ -109,6 +81,36 @@ enum {
 - (void) mvaddch: (Point) pos, int ch;
 @end
 
+@interface View: Object <View>
+{
+	union {
+		Rect        rect;
+		struct {
+			int     xpos;
+			int     ypos;
+			int     xlen;
+			int     ylen;
+		};
+		struct {
+			Point   pos;
+			Extent  size;
+		};
+	};
+	Rect        absRect;
+	Point       point;		// can't be local :(
+	Group      *owner;
+	id<TextContext> textContext;
+	int         state;
+	int         options;
+	int         growMode;
+	int         cursorState;
+	Point       cursor;
+	ListenerGroup *onReceiveFocus;
+	ListenerGroup *onReleaseFocus;
+}
+-initWithRect: (Rect) rect;
+@end
+
 @interface View (TextContext) <TextContext>
 @end
 

From fd0700f9ae1654c40b0434b82f45ea25776ab222 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 24 Mar 2020 21:02:54 +0900
Subject: [PATCH 0949/1519] [qwaq] Add a proxy view class

The idea is that the view can be switched out readily: the proxy simply
passes all messages to its view object.
---
 ruamoko/qwaq/Makefile.am      |  1 +
 ruamoko/qwaq/qwaq-proxyview.h | 17 ++++++++++++++++
 ruamoko/qwaq/qwaq-proxyview.r | 38 +++++++++++++++++++++++++++++++++++
 3 files changed, 56 insertions(+)
 create mode 100644 ruamoko/qwaq/qwaq-proxyview.h
 create mode 100644 ruamoko/qwaq/qwaq-proxyview.r

diff --git a/ruamoko/qwaq/Makefile.am b/ruamoko/qwaq/Makefile.am
index 182ed2565..c61fbafb7 100644
--- a/ruamoko/qwaq/Makefile.am
+++ b/ruamoko/qwaq/Makefile.am
@@ -32,6 +32,7 @@ qwaq_app_dat_src= \
 	qwaq-garray.r \
 	qwaq-group.r \
 	qwaq-listener.r \
+	qwaq-proxyview.r \
 	qwaq-rect.r \
 	qwaq-screen.r \
 	qwaq-textcontext.r \
diff --git a/ruamoko/qwaq/qwaq-proxyview.h b/ruamoko/qwaq/qwaq-proxyview.h
new file mode 100644
index 000000000..7789678fc
--- /dev/null
+++ b/ruamoko/qwaq/qwaq-proxyview.h
@@ -0,0 +1,17 @@
+#ifndef __qwaq_proxyview_h
+#define __qwaq_proxyview_h
+
+#include "qwaq-view.h"
+
+@interface ProxyView : Object
+{
+	View       *view;
+}
+-initWithView:(View *) view;
+-setView: (View *) view;
+@end
+
+@interface ProxyView (View) <View, TextContext>
+@end
+
+#endif//__qwaq_proxyview_h
diff --git a/ruamoko/qwaq/qwaq-proxyview.r b/ruamoko/qwaq/qwaq-proxyview.r
new file mode 100644
index 000000000..a29b1dedd
--- /dev/null
+++ b/ruamoko/qwaq/qwaq-proxyview.r
@@ -0,0 +1,38 @@
+#include "qwaq-proxyview.h"
+
+@implementation ProxyView
+- (void) forward: (SEL) sel : (@va_list) args
+{
+	if (!view) {
+		return;
+	}
+	obj_msg_sendv (view, sel, args);
+}
+
+-initWithView:(View *) view
+{
+	if (!(self = [super init])) {
+		return nil;
+	}
+	self.view = view;
+	return self;
+}
+
+-setView:(View *) view
+{
+	int         state = [self.view state];
+	if (state & sfInFocus) {
+		[self.view loseFocus];
+		[self.view hide];
+	}
+
+	self.view = view;
+	if (state & sfDrawn) {
+		[view draw];
+	}
+	if (state & sfInFocus) {
+		[view takeFocus];
+	}
+	return self;
+}
+@end

From 9bfd14b687c6782f35bda14ceec115bbb51878d9 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 24 Mar 2020 23:02:19 +0900
Subject: [PATCH 0950/1519] [qwaq] Bring in qc gcd to use for debugger testing

It was even recent enough to compile first try.
---
 ruamoko/qwaq/Makefile.am                    | 10 +++++++++-
 {tools/qfcc/test/old => ruamoko/qwaq}/gcd.r |  0
 2 files changed, 9 insertions(+), 1 deletion(-)
 rename {tools/qfcc/test/old => ruamoko/qwaq}/gcd.r (100%)

diff --git a/ruamoko/qwaq/Makefile.am b/ruamoko/qwaq/Makefile.am
index c61fbafb7..3a65cfbbf 100644
--- a/ruamoko/qwaq/Makefile.am
+++ b/ruamoko/qwaq/Makefile.am
@@ -6,7 +6,7 @@ QWAQ_INCS=@QWAQ_INCS@
 
 AM_CPPFLAGS=	-I$(top_srcdir)/include $(QWAQ_INCS) $(PTHREAD_CFLAGS)
 
-noinst_PROGRAMS=@QWAQ_TARGETS@ qwaq-app.dat$(EXEEXT)
+noinst_PROGRAMS=@QWAQ_TARGETS@ qwaq-app.dat$(EXEEXT) gcd.dat$(EXEEXT)
 
 QFCC_DEP=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT)
 QFCC=$(top_builddir)/tools/qfcc/source/qfcc
@@ -90,6 +90,14 @@ qwaq-app.dat$(EXEEXT): $(qwaq_app_obj) $(QFCC_DEP)
 include $(qwaq_app_dep) # am--include-marker
 r_depfiles_remade += $(qwaq_app_dep)
 
+gcd_dat_SOURCES=gcd.r
+gcd_obj=$(gcd_dat_SOURCES:.r=.o)
+gcd_dep=$(addprefix ./$(DEPDIR)/,$(gcd_obj:.o=.Qo))
+gcd.dat$(EXEEXT): $(gcd_obj) $(QFCC_DEP)
+	$(QLINK) -o $@ $(gcd_obj) -lcsqc -lr
+include $(gcd_dep) # am--include-marker
+r_depfiles_remade += $(gcd_dep)
+
 $(r_depfiles_remade):
 	@$(MKDIR_P) $(@D)
 	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
diff --git a/tools/qfcc/test/old/gcd.r b/ruamoko/qwaq/gcd.r
similarity index 100%
rename from tools/qfcc/test/old/gcd.r
rename to ruamoko/qwaq/gcd.r

From c945c42989bfc91a3d02fe15062a60ce24e98dd6 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 24 Mar 2020 23:16:25 +0900
Subject: [PATCH 0951/1519] [gamecode] Fix some silly errors

I forgot to compile-test :(
---
 libs/gamecode/pr_exec.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/libs/gamecode/pr_exec.c b/libs/gamecode/pr_exec.c
index 0441e9b83..43681da79 100644
--- a/libs/gamecode/pr_exec.c
+++ b/libs/gamecode/pr_exec.c
@@ -292,8 +292,10 @@ PR_LeaveFunction (progs_t *pr, int to_engine)
 			Sys_Printf ("Returning to engine\n");
 		} else {
 			bfunction_t *rf = pr->pr_xfunction;
-			Sys_Printf ("Returning to function %s\n",
-						PR_GetString (pr, rf->descriptor->s_name));
+			if (rf) {
+				Sys_Printf ("Returning to function %s\n",
+							PR_GetString (pr, rf->descriptor->s_name));
+			}
 		}
 	}
 
@@ -464,7 +466,7 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 	st = pr->pr_statements + pr->pr_xstatement;
 
 	if (pr->watch) {
-		old_val = pr->watch;
+		old_val = *pr->watch;
 	}
 
 	while (1) {
@@ -1715,10 +1717,10 @@ op_call:
 					pr->debug_handler (prd_watchpoint, pr->debug_data);
 				} else {
 					PR_RunError (pr, "watchpoint hit: %d -> %d",
-								 old_val.integer_var, watch->integer_var);
+								 old_val.integer_var, pr->watch->integer_var);
 				}
 			}
-			old_val.integer_var = watch->integer_var;
+			old_val.integer_var = pr->watch->integer_var;
 		}
 	}
 exit_program:

From 0ad9f559ead67bdb88bf6147ebdc8d77584d174a Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 25 Mar 2020 00:04:20 +0900
Subject: [PATCH 0952/1519] [ruamoko] Move some string functions

sprintf, vsprintf and strlen now in rua_strings, and strlen now returns
int like it should.
---
 libs/ruamoko/pr_cmds.c          | 52 ---------------------------------
 libs/ruamoko/rua_string.c       | 45 ++++++++++++++++++++++++++++
 ruamoko/cl_menu/CvarRangeView.r |  1 +
 ruamoko/cl_menu/controls_o.r    |  1 +
 ruamoko/cl_menu/plistmenu.r     |  1 +
 ruamoko/include/Makefile.am     |  1 +
 ruamoko/include/legacy_string.h | 12 ++++++++
 ruamoko/include/string.h        | 10 +------
 ruamoko/lib/Makefile.am         |  2 +-
 ruamoko/lib/legacy_string.r     |  9 ++++++
 ruamoko/lib/string.r            | 12 ++------
 ruamoko/scheme/Lexer.r          |  1 +
 ruamoko/scheme/Number.r         |  1 +
 13 files changed, 76 insertions(+), 72 deletions(-)
 create mode 100644 ruamoko/include/legacy_string.h
 create mode 100644 ruamoko/lib/legacy_string.r

diff --git a/libs/ruamoko/pr_cmds.c b/libs/ruamoko/pr_cmds.c
index 9a531fb14..db99849e3 100644
--- a/libs/ruamoko/pr_cmds.c
+++ b/libs/ruamoko/pr_cmds.c
@@ -521,18 +521,6 @@ PF_vtos (progs_t *pr)
 	RETURN_STRING (pr, string);
 }
 
-/*
-	float (string s) strlen
-*/
-static void
-PF_strlen (progs_t *pr)
-{
-	const char	*s;
-
-	s = P_GSTRING (pr, 0);
-	R_FLOAT (pr) = strlen(s);
-}
-
 /*
 	float (string char, string s) charcount
 */
@@ -565,43 +553,6 @@ PF_charcount (progs_t *pr)
 # define INT_WIDTH 20
 #endif
 
-#define MAX_ARG 7
-/*
-	string (...) sprintf
-*/
-static void
-PF_sprintf (progs_t *pr)
-{
-	const char *fmt = P_GSTRING (pr, 0);
-	int         count = pr->pr_argc - 1;
-	pr_type_t **args = pr->pr_params + 1;
-	dstring_t  *dstr;
-
-	dstr = dstring_newstr ();
-	PR_Sprintf (pr, dstr, "PF_sprintf", fmt, count, args);
-	RETURN_STRING (pr, dstr->str);
-	dstring_delete (dstr);
-}
-
-static void
-PF_vsprintf (progs_t *pr)
-{
-	const char *fmt = P_GSTRING (pr, 0);
-	__auto_type args = &P_PACKED (pr, pr_va_list_t, 1);
-	pr_type_t  *list_start = PR_GetPointer (pr, args->list);
-	pr_type_t **list = alloca (args->count * sizeof (*list));
-	dstring_t  *dstr;
-
-	for (int i = 0; i < args->count; i++) {
-		list[i] = list_start + i * pr->pr_param_size;
-	}
-
-	dstr = dstring_newstr ();
-	PR_Sprintf (pr, dstr, "PF_vsprintf", fmt, args->count, list);
-	RETURN_STRING (pr, dstr->str);
-	dstring_delete (dstr);
-}
-
 /*
 	string () gametype
 */
@@ -659,10 +610,7 @@ static builtin_t builtins[] = {
 	{"stof",			PF_stof,			81},
 
 
-	{"strlen",			PF_strlen,			QF 100},
 	{"charcount",		PF_charcount,		QF 101},
-	{"sprintf",			PF_sprintf,			QF 109},
-	{"vsprintf",		PF_vsprintf,		-1},
 	{"ftoi",			PF_ftoi,			QF 110},
 	{"itof",			PF_itof,			QF 111},
 	{"itos",			PF_itos,			QF 112},
diff --git a/libs/ruamoko/rua_string.c b/libs/ruamoko/rua_string.c
index c96f44e57..4ec5eb2a9 100644
--- a/libs/ruamoko/rua_string.c
+++ b/libs/ruamoko/rua_string.c
@@ -50,6 +50,48 @@
 
 #include "rua_internal.h"
 
+static void
+bi_strlen (progs_t *pr)
+{
+	const char	*s;
+
+	s = P_GSTRING (pr, 0);
+	R_INT (pr) = strlen(s);
+}
+
+static void
+bi_sprintf (progs_t *pr)
+{
+	const char *fmt = P_GSTRING (pr, 0);
+	int         count = pr->pr_argc - 1;
+	pr_type_t **args = pr->pr_params + 1;
+	dstring_t  *dstr;
+
+	dstr = dstring_newstr ();
+	PR_Sprintf (pr, dstr, "bi_sprintf", fmt, count, args);
+	RETURN_STRING (pr, dstr->str);
+	dstring_delete (dstr);
+}
+
+static void
+bi_vsprintf (progs_t *pr)
+{
+	const char *fmt = P_GSTRING (pr, 0);
+	__auto_type args = &P_PACKED (pr, pr_va_list_t, 1);
+	pr_type_t  *list_start = PR_GetPointer (pr, args->list);
+	pr_type_t **list = alloca (args->count * sizeof (*list));
+	dstring_t  *dstr;
+
+	for (int i = 0; i < args->count; i++) {
+		list[i] = list_start + i * pr->pr_param_size;
+	}
+
+	dstr = dstring_newstr ();
+	PR_Sprintf (pr, dstr, "bi_vsprintf", fmt, args->count, list);
+	RETURN_STRING (pr, dstr->str);
+	dstring_delete (dstr);
+}
+
 static void
 bi_str_new (progs_t *pr)
 {
@@ -147,6 +189,9 @@ bi_str_char (progs_t *pr)
 }
 
 static builtin_t builtins[] = {
+	{"strlen",		bi_strlen,		-1},
+	{"sprintf",		bi_sprintf,		-1},
+	{"vsprintf",	bi_vsprintf,	-1},
 	{"str_new",		bi_str_new,		-1},
 	{"str_free",	bi_str_free,	-1},
 	{"str_copy",	bi_str_copy,	-1},
diff --git a/ruamoko/cl_menu/CvarRangeView.r b/ruamoko/cl_menu/CvarRangeView.r
index f32d37b6d..b9980ca0a 100644
--- a/ruamoko/cl_menu/CvarRangeView.r
+++ b/ruamoko/cl_menu/CvarRangeView.r
@@ -1,5 +1,6 @@
 #include "key.h"
 #include "sound.h"
+#include "legacy_string.h"
 #include "string.h"
 
 #include "gui/Text.h"
diff --git a/ruamoko/cl_menu/controls_o.r b/ruamoko/cl_menu/controls_o.r
index 5c389d88e..3ae1b60c2 100644
--- a/ruamoko/cl_menu/controls_o.r
+++ b/ruamoko/cl_menu/controls_o.r
@@ -30,6 +30,7 @@
 #include "draw.h"
 #include "system.h"
 #include "debug.h"
+#include "legacy_string.h"
 #include "string.h"
 #include "key.h"
 #include "options_util.h"
diff --git a/ruamoko/cl_menu/plistmenu.r b/ruamoko/cl_menu/plistmenu.r
index 00d2a61e0..a4daadbbf 100644
--- a/ruamoko/cl_menu/plistmenu.r
+++ b/ruamoko/cl_menu/plistmenu.r
@@ -25,6 +25,7 @@
 */
 
 #include "debug.h"
+#include "legacy_string.h"
 #include "string.h"
 #include "qfs.h"
 
diff --git a/ruamoko/include/Makefile.am b/ruamoko/include/Makefile.am
index 17167cbec..0964419bf 100644
--- a/ruamoko/include/Makefile.am
+++ b/ruamoko/include/Makefile.am
@@ -4,6 +4,7 @@ nobase_pkginclude_HEADERS= \
 	crudefile.h debug.h entities.h infokey.h math.h message.h nq_message.h \
 	physics.h msgbuf.h qfile.h qfs.h qw_message.h qw_physics.h qw_sys.h \
 	server.h sound.h script.h string.h sv_sound.h system.h types.h \
+	legacy_string.h \
 	\
 	draw.h key.h \
 	\
diff --git a/ruamoko/include/legacy_string.h b/ruamoko/include/legacy_string.h
new file mode 100644
index 000000000..34e47817a
--- /dev/null
+++ b/ruamoko/include/legacy_string.h
@@ -0,0 +1,12 @@
+#ifndef __ruamoko_legacy_string_h
+#define __ruamoko_legacy_string_h
+
+@extern string ftos (float f);
+@extern string vtos (vector v);
+@extern float stof (string s);
+@extern float charcount (string goal, string s);
+@extern string itos (int i);
+@extern int stoi (string s);
+@extern vector stov (string s);
+
+#endif//__ruamoko_legacy_string_h
diff --git a/ruamoko/include/string.h b/ruamoko/include/string.h
index 3951c94c5..7f63f573e 100644
--- a/ruamoko/include/string.h
+++ b/ruamoko/include/string.h
@@ -1,17 +1,9 @@
 #ifndef __ruamoko_string_h
 #define __ruamoko_string_h
 
-@extern string ftos (float f);
-@extern string vtos (vector v);
-@extern float stof (string s);
-@extern float strlen (string s);
-@extern float charcount (string goal, string s);
+@extern int strlen (string s);
 @extern string sprintf (string fmt, ...);
 @extern string vsprintf (string fmt, @va_list args);
-@extern string itos (int i);
-@extern int stoi (string s);
-@extern vector stov (string s);
-
 @extern string str_new (void);
 @extern string str_free (string str);
 @extern string str_copy (string dst, string src);
diff --git a/ruamoko/lib/Makefile.am b/ruamoko/lib/Makefile.am
index da1157a82..49107b28f 100644
--- a/ruamoko/lib/Makefile.am
+++ b/ruamoko/lib/Makefile.am
@@ -46,7 +46,7 @@ libr_a_AR=$(PAK) -cf
 include $(libr_a_dep) # am--include-marker
 r_depfiles_remade += $(libr_a_dep)
 
-common_src=debug.r system.r
+common_src=debug.r system.r legacy_string.r
 server_src= \
 	crudefile.r entities.r infokey.r message.r \
 	physics.r server.r sv_sound.r
diff --git a/ruamoko/lib/legacy_string.r b/ruamoko/lib/legacy_string.r
new file mode 100644
index 000000000..258a33ade
--- /dev/null
+++ b/ruamoko/lib/legacy_string.r
@@ -0,0 +1,9 @@
+#include <string.h>
+
+string (float f) ftos = #26;
+string (vector v) vtos = #27;
+float (string s) stof = #81;
+float (string goal, string s) charcount = #0x000f0000 + 101;
+string (int i) itos = #0x000f0000 + 112;
+int (string s) stoi = #0x000f0000 + 113;
+vector (string s) stov = #0x000f0000 + 114;
diff --git a/ruamoko/lib/string.r b/ruamoko/lib/string.r
index 58f64911a..a23a6aa98 100644
--- a/ruamoko/lib/string.r
+++ b/ruamoko/lib/string.r
@@ -1,16 +1,8 @@
 #include <string.h>
 
-string (float f) ftos = #26;
-string (vector v) vtos = #27;
-float (string s) stof = #81;
-float (string s) strlen = #0x000f0000 + 100;
-float (string goal, string s) charcount = #0x000f0000 + 101;
-string (string fmt, ...) sprintf = #0x000f0000 + 109;
+int (string s) strlen = #0;
+string (string fmt, ...) sprintf = #0;
 string vsprintf (string fmt, @va_list args) = #0;
-string (int i) itos = #0x000f0000 + 112;
-int (string s) stoi = #0x000f0000 + 113;
-vector (string s) stov = #0x000f0000 + 114;
-
 string (void) str_new = #0;
 string (string str) str_free = #0;
 string (string dst, string src) str_copy = #0;
diff --git a/ruamoko/scheme/Lexer.r b/ruamoko/scheme/Lexer.r
index 20b026599..32d2958a5 100644
--- a/ruamoko/scheme/Lexer.r
+++ b/ruamoko/scheme/Lexer.r
@@ -1,5 +1,6 @@
 #include "Lexer.h"
 #include "Number.h"
+#include "legacy_string.h"
 #include "string.h"
 #include "Boolean.h"
 #include "Error.h"
diff --git a/ruamoko/scheme/Number.r b/ruamoko/scheme/Number.r
index 53e7f6975..530bcd46a 100644
--- a/ruamoko/scheme/Number.r
+++ b/ruamoko/scheme/Number.r
@@ -1,4 +1,5 @@
 #include "Number.h"
+#include "legacy_string.h"
 #include "string.h"
 
 @implementation Number

From 48c65b3363a421724f35de75679744e8575c2ec3 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 25 Mar 2020 00:41:14 +0900
Subject: [PATCH 0953/1519] [qwaq] Move builtin printf to main.c

and add traceon/traceoff defs (that don't need PF_Cmds). This lets
gcd.dat load in the second progs thread.
---
 ruamoko/qwaq/main.c        | 46 ++++++++++++++++++++++++++++++++++----
 ruamoko/qwaq/qwaq-curses.c | 16 -------------
 2 files changed, 42 insertions(+), 20 deletions(-)

diff --git a/ruamoko/qwaq/main.c b/ruamoko/qwaq/main.c
index 3972acbc3..79a4e6f96 100644
--- a/ruamoko/qwaq/main.c
+++ b/ruamoko/qwaq/main.c
@@ -203,9 +203,6 @@ spawn_progs (qwaq_thread_t *thread, progsinit_f *funcs)
 		Sys_Error ("couldn't load %s", name);
 	}
 
-	//pr->pr_trace = 1;
-	//pr->pr_trace_depth = -1;
-
 	PR_PushFrame (pr);
 	if (thread->args.size > 2) {
 		pr_argc = thread->args.size - 1;
@@ -323,16 +320,57 @@ done:
 	return qargs_ind;
 }
 
+static void
+bi_printf (progs_t *pr)
+{
+	const char *fmt = P_GSTRING (pr, 0);
+	int         count = pr->pr_argc - 1;
+	pr_type_t **args = pr->pr_params + 1;
+	dstring_t  *dstr = dstring_new ();
+
+	PR_Sprintf (pr, dstr, "bi_printf", fmt, count, args);
+	if (dstr->str)
+		Sys_Printf (dstr->str, stdout);
+	dstring_delete (dstr);
+}
+
+static void
+bi_traceon (progs_t *pr)
+{
+	pr->pr_trace = true;
+	pr->pr_trace_depth = pr->pr_depth;
+}
+
+static void
+bi_traceoff (progs_t *pr)
+{
+	pr->pr_trace = false;
+}
+
+static builtin_t common_builtins[] = {
+	{"printf",			bi_printf,		-1},
+	{"traceon",			bi_traceon,		-1},
+	{"traceoff",		bi_traceoff,	-1},
+	{},
+};
+
+static void
+common_builtins_init (progs_t *pr)
+{
+	PR_RegisterBuiltins (pr, common_builtins);
+}
+
 static progsinit_f main_app[] = {
 	Key_Progs_Init,
-	PR_Cmds_Init,
 	BI_Init,
+	common_builtins_init,
 	QWAQ_EditBuffer_Init,
 	QWAQ_Debug_Init,
 	0
 };
 
 static progsinit_f target_app[] = {
+	common_builtins_init,
 	QWAQ_DebugTarget_Init,
 	0
 };
diff --git a/ruamoko/qwaq/qwaq-curses.c b/ruamoko/qwaq/qwaq-curses.c
index 360c68bec..b8f8670b5 100644
--- a/ruamoko/qwaq/qwaq-curses.c
+++ b/ruamoko/qwaq/qwaq-curses.c
@@ -1544,20 +1544,6 @@ bi_initialize (progs_t *pr)
 	create_thread (qwaq_curses_thread, res);
 }
 
-static void
-bi_printf (progs_t *pr)
-{
-	const char *fmt = P_GSTRING (pr, 0);
-	int         count = pr->pr_argc - 1;
-	pr_type_t **args = pr->pr_params + 1;
-	dstring_t  *dstr = dstring_new ();
-
-	PR_Sprintf (pr, dstr, "bi_printf", fmt, count, args);
-	if (dstr->str)
-		Sys_Printf (dstr->str, stdout);
-	dstring_delete (dstr);
-}
-
 static void
 bi_c_TextContext__is_initialized (progs_t *pr)
 {
@@ -1824,8 +1810,6 @@ static builtin_t builtins[] = {
 	{"wresize",			bi_wresize,			-1},
 	{"resizeterm",		bi_resizeterm,		-1},
 
-	{"printf",			bi_printf,	-1},
-
 	{"_c_TextContext__is_initialized",	bi_c_TextContext__is_initialized,  -1},
 	{"_c_TextContext__max_colors",		bi_c_TextContext__max_colors,	   -1},
 	{"_c_TextContext__max_color_pairs",	bi_c_TextContext__max_color_pairs, -1},

From 1e56a8efbc8d0cfdf229a1dcc4e348d15bd7c8fe Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 25 Mar 2020 00:44:04 +0900
Subject: [PATCH 0954/1519] [qwaq] Fix a silly that caused qwaq-app to spawn
 twice

progs_t is very much most definitely NOT thread-safe (ie, two threads
using the same progs_t). It was actually rather funny when I figured out
what was going on to cause qwaq's universe to explode.
---
 ruamoko/qwaq/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ruamoko/qwaq/main.c b/ruamoko/qwaq/main.c
index 79a4e6f96..87df0a035 100644
--- a/ruamoko/qwaq/main.c
+++ b/ruamoko/qwaq/main.c
@@ -456,7 +456,7 @@ main (int argc, char **argv)
 		size_t      count = thread_data.size;
 		for (size_t i = 0; i < count; i++) {
 			if (thread_data.a[i]->pr && thread_data.a[i]->main_func) {
-				start_progs_thread (thread_data.a[main_ind]);
+				start_progs_thread (thread_data.a[i]);
 			}
 		}
 		pthread_join (thread_data.a[main_ind]->thread_id, 0);

From e69c430abce76518f1b13a14196621585596caff Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 25 Mar 2020 01:06:20 +0900
Subject: [PATCH 0955/1519] [qwaq] Clean up QwaqApplication

It doesn't need to be fun little tests any more.
---
 ruamoko/qwaq/qwaq-app.h    |  6 ++--
 ruamoko/qwaq/qwaq-app.r    | 60 +++++++++++++++++++-------------------
 ruamoko/qwaq/qwaq-curses.c |  5 ++--
 3 files changed, 37 insertions(+), 34 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-app.h b/ruamoko/qwaq/qwaq-app.h
index acf63f679..40681d940 100644
--- a/ruamoko/qwaq/qwaq-app.h
+++ b/ruamoko/qwaq/qwaq-app.h
@@ -20,9 +20,11 @@
 	Extent      screenSize;
 	int         autocount;
 }
+-(Extent)size;
+-(TextContext *)screen;
 -run;
--draw;
--handleEvent: (qwaq_event_t *) event;
 @end
 
+@extern QwaqApplication *application;
+
 #endif//__qwaq_app_h
diff --git a/ruamoko/qwaq/qwaq-app.r b/ruamoko/qwaq/qwaq-app.r
index 4d46e53e6..aba239607 100644
--- a/ruamoko/qwaq/qwaq-app.r
+++ b/ruamoko/qwaq/qwaq-app.r
@@ -5,13 +5,8 @@ int fence;
 
 #include "color.h"
 #include "qwaq-app.h"
-#include "qwaq-button.h"
 #include "qwaq-curses.h"
-#include "qwaq-editor.h"
 #include "qwaq-group.h"
-#include "qwaq-listener.h"
-#include "qwaq-window.h"
-#include "qwaq-screen.h"
 #include "qwaq-view.h"
 
 static AutoreleasePool *autorelease_pool;
@@ -52,33 +47,19 @@ arp_end (void)
 
 	[screen bkgd: COLOR_PAIR (1)];
 	[screen scrollok: 1];
-	Rect r = {nil, screenSize};
-	r.offset.x = r.extent.width / 4;
-	r.offset.y = r.extent.height / 4;
-	r.extent.width /= 2;
-	r.extent.height /= 2;
-	Window *w;
-	[objects insertSelected: w = [[Window windowWithRect: r] setBackground: COLOR_PAIR (2)]];
-	r = {{1, 1}, {r.extent.width - 2, r.extent.height - 2}};
-	[w insertSelected: [[Editor alloc] initWithRect: r file: "Makefile"]];
+	[screen clear];
+	wrefresh (stdscr);//FIXME
 	return self;
 }
 
--run
+-(Extent)size
 {
-	[objects takeFocus];
-	[self draw];
-	do {
-		arp_start ();
+	return screenSize;
+}
 
-		get_event (&event);
-		if (event.what != qe_none) {
-			[self handleEvent: &event];
-		}
-
-		arp_end ();
-	} while (!endState);
-	return self;
+-(TextContext *)screen
+{
+	return screen;
 }
 
 -draw
@@ -116,17 +97,36 @@ arp_end (void)
 	[objects handleEvent: event];
 	return self;
 }
+
+-run
+{
+	[objects takeFocus];
+	[self draw];
+	do {
+		arp_start ();
+
+		get_event (&event);
+		if (event.what != qe_none) {
+			[self handleEvent: &event];
+		}
+
+		arp_end ();
+	} while (!endState);
+	return self;
+}
 @end
 
+QwaqApplication *application;
+
 int main (int argc, string *argv)
 {
 	fence = 0;
 	//while (!fence) {}
 
-	id app = [[QwaqApplication app] retain];
+	application = [[QwaqApplication app] retain];
 
-	[app run];
-	[app release];
+	[application run];
+	[application release];
 	qwaq_event_t event;
 	get_event (&event);	// XXX need a "wait for queue idle"
 	return 0;
diff --git a/ruamoko/qwaq/qwaq-curses.c b/ruamoko/qwaq/qwaq-curses.c
index b8f8670b5..8c1d30c7d 100644
--- a/ruamoko/qwaq/qwaq-curses.c
+++ b/ruamoko/qwaq/qwaq-curses.c
@@ -1731,8 +1731,9 @@ bi_i_TextContext__bkgd_ (progs_t *pr)
 static void
 bi_i_TextContext__clear (progs_t *pr)
 {
-	int         window_id = P_STRUCT (pr, qwaq_textcontext_t, 0).window;
-	int         ch = P_INT (pr, 2);
+	__auto_type self = &P_STRUCT (pr, qwaq_textcontext_t, 0);
+	int         window_id = self->window;
+	int         ch = self->background;
 
 	qwaq_werase (pr, window_id, ch);
 }

From c7597b94d2aca9a601440708f744fc3a49857e41 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 25 Mar 2020 01:07:58 +0900
Subject: [PATCH 0956/1519] [qwaq] Create a debugger class

Each debugger manages a single target.
---
 ruamoko/qwaq/Makefile.am     |  1 +
 ruamoko/qwaq/qwaq-debug.c    | 12 ++++---
 ruamoko/qwaq/qwaq-debug.h    | 21 +++++++++--
 ruamoko/qwaq/qwaq-debugger.h | 25 +++++++++++++
 ruamoko/qwaq/qwaq-debugger.r | 68 ++++++++++++++++++++++++++++++++++++
 ruamoko/qwaq/qwaq-editor.h   |  2 ++
 ruamoko/qwaq/qwaq-editor.r   |  6 ++++
 7 files changed, 129 insertions(+), 6 deletions(-)
 create mode 100644 ruamoko/qwaq/qwaq-debugger.h
 create mode 100644 ruamoko/qwaq/qwaq-debugger.r

diff --git a/ruamoko/qwaq/Makefile.am b/ruamoko/qwaq/Makefile.am
index 3a65cfbbf..4f81c8424 100644
--- a/ruamoko/qwaq/Makefile.am
+++ b/ruamoko/qwaq/Makefile.am
@@ -26,6 +26,7 @@ SUFFIXES=.o .r
 qwaq_app_dat_src= \
 	qwaq-app.r \
 	qwaq-button.r \
+	qwaq-debugger.r \
 	qwaq-draw.r \
 	qwaq-editbuffer.r \
 	qwaq-editor.r \
diff --git a/ruamoko/qwaq/qwaq-debug.c b/ruamoko/qwaq/qwaq-debug.c
index 8edcf992d..ea40ab2e4 100644
--- a/ruamoko/qwaq/qwaq-debug.c
+++ b/ruamoko/qwaq/qwaq-debug.c
@@ -145,7 +145,9 @@ static void
 qwaq_target_clear (progs_t *pr, void *data)
 {
 	qwaq_target_t *target = pr->debug_data;
-	target_free (target->debugger, target);
+	if (target) {
+		target_free (target->debugger, target);
+	}
 }
 
 //FIXME need a better way to get this from one thread to the others
@@ -274,10 +276,12 @@ qdb_get_state (progs_t *pr)
 
 	lineno = PR_Find_Lineno (tpr, staddr);
 	if (lineno) {
-		f = PR_Get_Lineno_Func (pr, lineno);
-		file = pr->pr_functions[f->function].s_file;
+		f = PR_Get_Lineno_Func (tpr, lineno);
+		//FIXME file is a permanent string. dynamic would be better
+		//but they're not merged (and would need refcounting)
+		file = PR_SetString (pr, PR_Get_Source_File (tpr, lineno));
 		func = f->function;
-		line = PR_Get_Lineno_Line (pr, lineno);
+		line = PR_Get_Lineno_Line (tpr, lineno);
 		line += f->source_line;
 	}
 
diff --git a/ruamoko/qwaq/qwaq-debug.h b/ruamoko/qwaq/qwaq-debug.h
index f54d25636..0eb13d4a5 100644
--- a/ruamoko/qwaq/qwaq-debug.h
+++ b/ruamoko/qwaq/qwaq-debug.h
@@ -15,17 +15,34 @@ typedef enum {
 #define umax 0x7fffffff
 #endif
 
-#else//GCC
+typedef string string_t;
+
 #endif
 
 typedef struct qdb_state_s {
 	unsigned    staddr;
 	unsigned    func;
-	unsigned    file;
+	string_t    file;
 	unsigned    line;
 } qdb_state_t;
 
+#ifdef __QFCC__
+
+typedef struct qdb_target_s { int handle; } qdb_target_t;
+
+@extern void qdb_set_trace (qdb_target_t target, int state);
+@extern int qdb_set_breakpoint (qdb_target_t target, unsigned staddr);
+@extern int qdb_clear_breakpoint (qdb_target_t target, unsigned staddr);
+@extern int qdb_set_watchpoint (qdb_target_t target, unsigned offset);
+@extern int qdb_clear_watchpoint (qdb_target_t target);
+@extern int qdb_continue (qdb_target_t target);
+@extern qdb_state_t qdb_get_state (qdb_target_t target);
+
+#else//GCC
+
 void QWAQ_Debug_Init (progs_t *pr);
 void QWAQ_DebugTarget_Init (progs_t *pr);
 
+#endif
+
 #endif//__qwaq_debug_h
diff --git a/ruamoko/qwaq/qwaq-debugger.h b/ruamoko/qwaq/qwaq-debugger.h
new file mode 100644
index 000000000..34809def2
--- /dev/null
+++ b/ruamoko/qwaq/qwaq-debugger.h
@@ -0,0 +1,25 @@
+#ifndef __qwaq_debugger_h
+#define __qwaq_debugger_h
+
+#include <Object.h>
+
+#include "qwaq-debug.h"
+
+@class ProxyView;
+@class Editor;
+@class Window;
+@class Array;
+
+@interface Debugger : Object
+{
+	Window     *source_window;
+	ProxyView  *file_proxy;
+	Array      *files;
+	Editor     *current_file;
+	qdb_target_t debug_target;
+}
+-initWithTarget:(qdb_target_t) target;
+-handleDebugEvent;
+@end
+
+#endif//__qwaq_debugger_h
diff --git a/ruamoko/qwaq/qwaq-debugger.r b/ruamoko/qwaq/qwaq-debugger.r
new file mode 100644
index 000000000..bd771c679
--- /dev/null
+++ b/ruamoko/qwaq/qwaq-debugger.r
@@ -0,0 +1,68 @@
+#include <Array.h>
+
+#include "qwaq-curses.h"
+#include "qwaq-debugger.h"
+#include "qwaq-editor.h"
+#include "qwaq-proxyview.h"
+#include "qwaq-window.h"
+
+@implementation Debugger
+
+-initWithTarget:(qdb_target_t) target
+{
+	if (!(self = [super init])) {
+		return nil;
+	}
+	debug_target = target;
+
+	files = [[Array array] retain];
+	//FIXME need a window manager
+	source_window = [[Window alloc] initWithRect: getwrect (stdscr)];
+
+	return self;
+}
+
+-(Editor *) find_file:(string) filename
+{
+	Editor     *file;
+	for (int i = [files count]; i-- > 0; ) {
+		file = [files objectAtIndex: i];
+		if ([file filename] == filename) {
+			return file;
+		}
+	}
+	Rect rect = {{1, 1}, [source_window size]};
+	rect.extent.width -= 2;
+	rect.extent.height -= 2;
+	file = [[Editor alloc] initWithRect: rect file: filename];
+	[files addObject: file];
+	return file;
+}
+
+-(void) setup
+{
+	qdb_state_t state = qdb_get_state (debug_target);
+
+	current_file = [self find_file: state.file];
+	file_proxy = [[ProxyView alloc] initWithView: current_file];
+	//FIXME id<View>?
+	[source_window insertSelected: (View *) file_proxy];
+}
+
+-handleDebugEvent
+{
+	if (!file_proxy) {
+		[self setup];
+	}
+	return self;
+}
+
+@end
+
+void qdb_set_trace (qdb_target_t target, int state) = #0;
+int qdb_set_breakpoint (qdb_target_t target, unsigned staddr) = #0;
+int qdb_clear_breakpoint (qdb_target_t target, unsigned staddr) = #0;
+int qdb_set_watchpoint (qdb_target_t target, unsigned offset) = #0;
+int qdb_clear_watchpoint (qdb_target_t target) = #0;
+int qdb_continue (qdb_target_t target) = #0;
+qdb_state_t qdb_get_state (qdb_target_t target) = #0;
diff --git a/ruamoko/qwaq/qwaq-editor.h b/ruamoko/qwaq/qwaq-editor.h
index 2a480103e..0680cc9dc 100644
--- a/ruamoko/qwaq/qwaq-editor.h
+++ b/ruamoko/qwaq/qwaq-editor.h
@@ -18,8 +18,10 @@
 	unsigned    old_cind;		// previous character
 	Point       cursor;
 	unsigned    line_count;
+	string      filename;
 }
 -initWithRect:(Rect) rect file:(string) filename;
+-(string)filename;
 -scrollUp:(unsigned) count;
 -scrollDown:(unsigned) count;
 -scrollLeft:(unsigned) count;
diff --git a/ruamoko/qwaq/qwaq-editor.r b/ruamoko/qwaq/qwaq-editor.r
index 9d36e27ac..0c0767c6d 100644
--- a/ruamoko/qwaq/qwaq-editor.r
+++ b/ruamoko/qwaq/qwaq-editor.r
@@ -9,6 +9,7 @@
 	if (!(self = [super initWithRect: rect])) {
 		return nil;
 	}
+	self.filename = filename;
 	buffer = [[EditBuffer alloc] initWithFile: filename];
 	line_count = [buffer countLines: {0, [buffer textSize]}];
 	linebuffer = [DrawBuffer buffer: { xlen, 1 }];
@@ -17,6 +18,11 @@
 	return self;
 }
 
+-(string)filename
+{
+	return filename;
+}
+
 -draw
 {
 	[super draw];

From 0d8815f27410b4d1c3a4196183c5e6f18715e00c Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 25 Mar 2020 01:32:52 +0900
Subject: [PATCH 0957/1519] [qwaq] Handle debug events at the app level

The debugger displays the source file but doesn't highlight the current
line yet.
---
 ruamoko/qwaq/qwaq-app.h      |  5 +++
 ruamoko/qwaq/qwaq-app.r      | 70 +++++++++++++++++++++++++-----------
 ruamoko/qwaq/qwaq-debugger.h |  1 +
 ruamoko/qwaq/qwaq-debugger.r | 10 ++++--
 4 files changed, 63 insertions(+), 23 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-app.h b/ruamoko/qwaq/qwaq-app.h
index 40681d940..3facb0bc6 100644
--- a/ruamoko/qwaq/qwaq-app.h
+++ b/ruamoko/qwaq/qwaq-app.h
@@ -6,8 +6,10 @@
 #include "event.h"
 #include "qwaq-rect.h"
 
+@class Array;
 @class Group;
 @class TextContext;
+@class View;
 
 @interface QwaqApplication: Object
 {
@@ -19,9 +21,12 @@
 	TextContext *screen;
 	Extent      screenSize;
 	int         autocount;
+
+	Array      *debuggers;
 }
 -(Extent)size;
 -(TextContext *)screen;
+-addView:(View *)view;
 -run;
 @end
 
diff --git a/ruamoko/qwaq/qwaq-app.r b/ruamoko/qwaq/qwaq-app.r
index aba239607..7a9e6ed97 100644
--- a/ruamoko/qwaq/qwaq-app.r
+++ b/ruamoko/qwaq/qwaq-app.r
@@ -6,6 +6,7 @@ int fence;
 #include "color.h"
 #include "qwaq-app.h"
 #include "qwaq-curses.h"
+#include "qwaq-debugger.h"
 #include "qwaq-group.h"
 #include "qwaq-view.h"
 
@@ -49,6 +50,8 @@ arp_end (void)
 	[screen scrollok: 1];
 	[screen clear];
 	wrefresh (stdscr);//FIXME
+
+	debuggers = [[Array array] retain];
 	return self;
 }
 
@@ -69,32 +72,50 @@ arp_end (void)
 	return self;
 }
 
+-(Debugger *)find_debugger:(qdb_target_t) target
+{
+	Debugger   *debugger;
+
+	for (int i = [debuggers count]; i-- > 0; ) {
+		debugger = [debuggers objectAtIndex: i];
+		if ([debugger debug_target].handle == target.handle) {
+			return debugger;
+		}
+	}
+	debugger = [[Debugger alloc] initWithTarget: target];
+	[debuggers addObject: debugger];
+	return debugger;
+}
+
 -handleEvent: (qwaq_event_t *) event
 {
-	if (event.what == qe_resize) {
-		Extent delta;
-		delta.width = event.resize.width - screenSize.width;
-		delta.height = event.resize.height - screenSize.height;
+	switch (event.what) {
+		case qe_resize:
+			Extent delta;
+			delta.width = event.resize.width - screenSize.width;
+			delta.height = event.resize.height - screenSize.height;
 
-		resizeterm (event.resize.width, event.resize.height);
-		[screen resizeTo: {event.resize.width, event.resize.height}];
-		screenSize = [screen size];
-		[objects resize: delta];
-		[screen refresh];
-		event.what = qe_none;
-		return self;
+			resizeterm (event.resize.width, event.resize.height);
+			[screen resizeTo: {event.resize.width, event.resize.height}];
+			screenSize = [screen size];
+			[objects resize: delta];
+			[screen refresh];
+			event.what = qe_none;
+			break;
+		case qe_key:
+			if (event.key.code == '\x18' || event.key.code == '\x11') {
+				endState = event.message.int_val;
+				event.what = qe_none;
+			}
+			break;
+		case qe_debug_event:
+			[[self find_debugger:{event.message.int_val}] handleDebugEvent];
+			event.what = qe_none;
+			break;
 	}
-	if (event.what == qe_key
-		&& (event.key.code == '\x18' || event.key.code == '\x11')) {
-		event.what = qe_command;
-		event.message.int_val = qc_exit;
+	if (event.what != qe_none) {
+		[objects handleEvent: event];
 	}
-	if (event.what == qe_command
-		&& (event.message.int_val == qc_exit
-			|| event.message.int_val == qc_error)) {
-		endState = event.message.int_val;;
-	}
-	[objects handleEvent: event];
 	return self;
 }
 
@@ -114,6 +135,13 @@ arp_end (void)
 	} while (!endState);
 	return self;
 }
+
+-addView:(View *)view
+{
+	[objects insertSelected: view];
+	[screen refresh];
+	return self;
+}
 @end
 
 QwaqApplication *application;
diff --git a/ruamoko/qwaq/qwaq-debugger.h b/ruamoko/qwaq/qwaq-debugger.h
index 34809def2..2a1e3a2b3 100644
--- a/ruamoko/qwaq/qwaq-debugger.h
+++ b/ruamoko/qwaq/qwaq-debugger.h
@@ -18,6 +18,7 @@
 	Editor     *current_file;
 	qdb_target_t debug_target;
 }
+-(qdb_target_t)debug_target;
 -initWithTarget:(qdb_target_t) target;
 -handleDebugEvent;
 @end
diff --git a/ruamoko/qwaq/qwaq-debugger.r b/ruamoko/qwaq/qwaq-debugger.r
index bd771c679..aea913dc8 100644
--- a/ruamoko/qwaq/qwaq-debugger.r
+++ b/ruamoko/qwaq/qwaq-debugger.r
@@ -1,5 +1,6 @@
 #include <Array.h>
 
+#include "qwaq-app.h"
 #include "qwaq-curses.h"
 #include "qwaq-debugger.h"
 #include "qwaq-editor.h"
@@ -7,6 +8,10 @@
 #include "qwaq-window.h"
 
 @implementation Debugger
+-(qdb_target_t)debug_target
+{
+	return debug_target;
+}
 
 -initWithTarget:(qdb_target_t) target
 {
@@ -16,8 +21,8 @@
 	debug_target = target;
 
 	files = [[Array array] retain];
-	//FIXME need a window manager
-	source_window = [[Window alloc] initWithRect: getwrect (stdscr)];
+	source_window = [[Window alloc] initWithRect: {nil, [application size]}];
+	[application addView:source_window];
 
 	return self;
 }
@@ -47,6 +52,7 @@
 	file_proxy = [[ProxyView alloc] initWithView: current_file];
 	//FIXME id<View>?
 	[source_window insertSelected: (View *) file_proxy];
+	[source_window redraw];
 }
 
 -handleDebugEvent

From 1c3e503ad2cdaebcea72f17b10281986a5897dca Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 25 Mar 2020 01:39:56 +0900
Subject: [PATCH 0958/1519] [qwaq] Set the window title to the file name

---
 ruamoko/qwaq/qwaq-debugger.r | 1 +
 ruamoko/qwaq/qwaq-window.h   | 3 +++
 ruamoko/qwaq/qwaq-window.r   | 8 +++++++-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/ruamoko/qwaq/qwaq-debugger.r b/ruamoko/qwaq/qwaq-debugger.r
index aea913dc8..27c76510e 100644
--- a/ruamoko/qwaq/qwaq-debugger.r
+++ b/ruamoko/qwaq/qwaq-debugger.r
@@ -52,6 +52,7 @@
 	file_proxy = [[ProxyView alloc] initWithView: current_file];
 	//FIXME id<View>?
 	[source_window insertSelected: (View *) file_proxy];
+	[source_window setTitle: [current_file filename]];
 	[source_window redraw];
 }
 
diff --git a/ruamoko/qwaq/qwaq-window.h b/ruamoko/qwaq/qwaq-window.h
index 1e5598856..a559ed862 100644
--- a/ruamoko/qwaq/qwaq-window.h
+++ b/ruamoko/qwaq/qwaq-window.h
@@ -5,6 +5,7 @@
 
 @class Group;
 @class Button;
+@class TitleBar;
 
 #include "qwaq-draw.h"
 #include "qwaq-rect.h"
@@ -25,8 +26,10 @@
 	Button     *bottomLeftDrag;
 	Button     *bottomRightDrag;
 	Button     *bottomDrag;
+	TitleBar   *titleBar;
 }
 +windowWithRect: (Rect) rect;
+-setTitle:(string) title;
 -setBackground: (int) ch;
 -insert: (View *) view;
 -insertDrawn: (View *) view;
diff --git a/ruamoko/qwaq/qwaq-window.r b/ruamoko/qwaq/qwaq-window.r
index 6071130eb..6b687044b 100644
--- a/ruamoko/qwaq/qwaq-window.r
+++ b/ruamoko/qwaq/qwaq-window.r
@@ -28,7 +28,7 @@
 
 	objects = [[Group alloc] initWithContext: textContext owner: self];
 
-	[self insert: [[TitleBar alloc] initWithTitle:"drag me"]];
+	[self insert: titleBar = [[TitleBar alloc] initWithTitle:""]];
 
 	topDrag         = [[Button alloc] initWithRect: {{2, 0},
 													 {xlen - 4, 1}}];
@@ -74,6 +74,12 @@
 	return self;
 }
 
+-setTitle:(string) title
+{
+	[titleBar setTitle:title];
+	return self;
+}
+
 #ifndef max
 # define max(a,b) ((a) > (b) ? (a) : (b))
 #endif

From 9a2ea54e78875946dccdcc702456ef7557114220 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 25 Mar 2020 08:28:12 +0900
Subject: [PATCH 0959/1519] [qwaq] Highlight the current line

---
 ruamoko/qwaq/qwaq-debugger.r      |  1 +
 ruamoko/qwaq/qwaq-editbuffer-bi.c |  1 -
 ruamoko/qwaq/qwaq-editor.h        |  6 +++-
 ruamoko/qwaq/qwaq-editor.r        | 58 +++++++++++++++++++++++++++----
 4 files changed, 57 insertions(+), 9 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-debugger.r b/ruamoko/qwaq/qwaq-debugger.r
index 27c76510e..0c2753df2 100644
--- a/ruamoko/qwaq/qwaq-debugger.r
+++ b/ruamoko/qwaq/qwaq-debugger.r
@@ -50,6 +50,7 @@
 
 	current_file = [self find_file: state.file];
 	file_proxy = [[ProxyView alloc] initWithView: current_file];
+	[[current_file gotoLine:state.line - 1] highlightLine];
 	//FIXME id<View>?
 	[source_window insertSelected: (View *) file_proxy];
 	[source_window setTitle: [current_file filename]];
diff --git a/ruamoko/qwaq/qwaq-editbuffer-bi.c b/ruamoko/qwaq/qwaq-editbuffer-bi.c
index 1beb6eabd..02ae29370 100644
--- a/ruamoko/qwaq/qwaq-editbuffer-bi.c
+++ b/ruamoko/qwaq/qwaq-editbuffer-bi.c
@@ -496,7 +496,6 @@ formatLine (txtbuffer_t *buffer, unsigned linePtr, unsigned xpos,
 	while (c != '\n' && ptr < buffer->textSize) {
 		c = getChar (buffer, ptr++);
 	}
-	col = ptr >= sels && ptr < sele ? cols : coln;
 	while (length-- > 0) {
 		*dst++ = col | ' ';
 	}
diff --git a/ruamoko/qwaq/qwaq-editor.h b/ruamoko/qwaq/qwaq-editor.h
index 0680cc9dc..52afdd143 100644
--- a/ruamoko/qwaq/qwaq-editor.h
+++ b/ruamoko/qwaq/qwaq-editor.h
@@ -13,9 +13,9 @@
 	eb_sel_t    selection;
 	unsigned    base_index;		// top left corner
 	unsigned    line_index;		// current line
-	unsigned    x_index;		// horizontal scrolling
 	unsigned    char_index;		// current character
 	unsigned    old_cind;		// previous character
+	Point       scroll;
 	Point       cursor;
 	unsigned    line_count;
 	string      filename;
@@ -26,6 +26,10 @@
 -scrollDown:(unsigned) count;
 -scrollLeft:(unsigned) count;
 -scrollRight:(unsigned) count;
+
+-recenter:(int) force;
+-gotoLine:(unsigned) line;
+-highlightLine;
 @end
 
 #endif//__qwaq_editor_h
diff --git a/ruamoko/qwaq/qwaq-editor.r b/ruamoko/qwaq/qwaq-editor.r
index 0c0767c6d..843b09720 100644
--- a/ruamoko/qwaq/qwaq-editor.r
+++ b/ruamoko/qwaq/qwaq-editor.r
@@ -29,7 +29,7 @@
 	unsigned lind = base_index;
 	int *lbuf = [linebuffer buffer];
 	for (int y = 0; y < ylen; y++) {
-		lind = [buffer formatLine:lind from:x_index into:lbuf width:xlen
+		lind = [buffer formatLine:lind from:scroll.x into:lbuf width:xlen
 				highlight:selection colors: {COLOR_PAIR (1), COLOR_PAIR(2)}];
 		[textContext blitFromBuffer: linebuffer to: {xpos, ypos + y}
 							from: [linebuffer rect]];
@@ -99,10 +99,10 @@
 
 -scrollLeft:(unsigned) count
 {
-	if (x_index > count) {
-		x_index -= count;
+	if (scroll.x > count) {
+		scroll.x -= count;
 	} else {
-		x_index = 0;
+		scroll.x = 0;
 	}
 	[self redraw];
 	return self;
@@ -110,13 +110,57 @@
 
 -scrollRight:(unsigned) count
 {
-	if (1024 - x_index > count) {
-		x_index += count;
+	if (1024 - scroll.x > count) {
+		scroll.x += count;
 	} else {
-		x_index = 1024;
+		scroll.x = 1024;
 	}
 	[self redraw];
 	return self;
 }
 
+-recenter:(int) force
+{
+	if (!force) {
+		if (cursor.y >= scroll.y && cursor.y - scroll.y < ylen) {
+			return self;
+		}
+	}
+	unsigned target;
+	if (cursor.y < ylen / 2) {
+		target = 0;
+	} else {
+		target = cursor.y - ylen / 2;
+	}
+	if (target > scroll.y) {
+		base_index = [buffer nextLine:base_index :target - scroll.y];
+	} else if (target < scroll.y) {
+		base_index = [buffer prevLine:base_index :scroll.y - target];
+	}
+	scroll.y = target;
+	return self;
+}
+
+-gotoLine:(unsigned) line
+{
+	if (line > cursor.y) {
+		line_index = [buffer nextLine:line_index :line - cursor.y];
+	} else if (line < cursor.y) {
+		line_index = [buffer prevLine:line_index :cursor.y - line];
+	}
+	cursor.y = line;
+	[self recenter: 0];
+	return self;
+}
+
+-highlightLine
+{
+	selection.start = line_index;
+	selection.length = [buffer nextLine: line_index] - line_index;
+	if (!selection.length) {
+		selection.length = [buffer getEOL: line_index] - line_index;
+	}
+	return self;
+}
+
 @end

From d96059c70e8405bac798a645444af94513f8d186 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 25 Mar 2020 09:20:40 +0900
Subject: [PATCH 0960/1519] [qwaq] Change listener respond param to void *

Avoids writing another method for Array, so probably only for now.
---
 ruamoko/qwaq/qwaq-listener.h | 4 ++--
 ruamoko/qwaq/qwaq-listener.r | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-listener.h b/ruamoko/qwaq/qwaq-listener.h
index 2f7ec02b3..59c96ff1d 100644
--- a/ruamoko/qwaq/qwaq-listener.h
+++ b/ruamoko/qwaq/qwaq-listener.h
@@ -12,7 +12,7 @@
 	IMP         imp;
 }
 -initWithResponder: (id) responder :(SEL)message;
--(void) respond: (id) caller;
+-(void) respond: (void *) caller_data;
 -(BOOL) matchResponder: (id) responder :(SEL)message;
 @end
 
@@ -23,7 +23,7 @@
 -init;
 -addListener: (id) responder :(SEL)message;
 -removeListener: (id) responder :(SEL)message;
--(void) respond: (id) caller;
+-(void) respond: (void *) caller_data;
 @end
 
 #endif//__qwaq_listener_h
diff --git a/ruamoko/qwaq/qwaq-listener.r b/ruamoko/qwaq/qwaq-listener.r
index 26e6f28c5..12d786de3 100644
--- a/ruamoko/qwaq/qwaq-listener.r
+++ b/ruamoko/qwaq/qwaq-listener.r
@@ -16,9 +16,9 @@
 	return self;
 }
 
--(void)respond: (id) caller
+-(void)respond: (void *) caller_data
 {
-	imp (responder, message, caller);
+	imp (responder, message, caller_data);
 }
 
 -(BOOL) matchResponder: (id) responder :(SEL)message
@@ -58,9 +58,9 @@
 	return self;
 }
 
--(void)respond: (id) caller
+-(void)respond: (void *) caller_data
 {
 	[listeners makeObjectsPerformSelector: @selector (respond:)
-							   withObject: caller];
+							   withObject: caller_data];
 }
 @end

From 16bd047022809fc2ed0511a457be3048876c4eea Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 25 Mar 2020 09:22:54 +0900
Subject: [PATCH 0961/1519] [qwaq] Add a key event listener to Editor

This will allow for easy expansion of editor functionality without
messing with the editor itself. In particularly, an editor normally
doesn't need to know anything about debugger hot keys.
---
 ruamoko/qwaq/qwaq-editor.h | 11 +++++++++++
 ruamoko/qwaq/qwaq-editor.r | 11 +++++++++++
 2 files changed, 22 insertions(+)

diff --git a/ruamoko/qwaq/qwaq-editor.h b/ruamoko/qwaq/qwaq-editor.h
index 52afdd143..29bf1c8b7 100644
--- a/ruamoko/qwaq/qwaq-editor.h
+++ b/ruamoko/qwaq/qwaq-editor.h
@@ -4,7 +4,15 @@
 #include "qwaq-editbuffer.h"
 #include "qwaq-view.h"
 
+@class Editor;
 @class EditBuffer;
+@class ListenerGroup;
+
+// Data sent to onKeyEvent listeners
+typedef struct ed_event_s {
+	Editor     *editor;
+	struct qwaq_event_s *event;
+} ed_event_t;
 
 @interface Editor : View
 {
@@ -19,8 +27,11 @@
 	Point       cursor;
 	unsigned    line_count;
 	string      filename;
+	ListenerGroup *onEvent;
+	ed_event_t  _event;
 }
 -initWithRect:(Rect) rect file:(string) filename;
+-(ListenerGroup *)onEvent;
 -(string)filename;
 -scrollUp:(unsigned) count;
 -scrollDown:(unsigned) count;
diff --git a/ruamoko/qwaq/qwaq-editor.r b/ruamoko/qwaq/qwaq-editor.r
index 843b09720..dfd863569 100644
--- a/ruamoko/qwaq/qwaq-editor.r
+++ b/ruamoko/qwaq/qwaq-editor.r
@@ -1,6 +1,7 @@
 #include <QF/keys.h>
 #include "color.h"
 #include "qwaq-editor.h"
+#include "qwaq-listener.h"
 
 @implementation Editor
 
@@ -15,9 +16,15 @@
 	linebuffer = [DrawBuffer buffer: { xlen, 1 }];
 	growMode = gfGrowHi;
 	options = ofCanFocus;
+	onEvent = [[ListenerGroup alloc] init];
 	return self;
 }
 
+-(ListenerGroup *)onEvent
+{
+	return onEvent;
+}
+
 -(string)filename
 {
 	return filename;
@@ -46,6 +53,10 @@
 
 -handleEvent:(qwaq_event_t *) event
 {
+	// give any listeners a chance to override or extend event handling
+	_event.editor = self;
+	_event.event = event;
+	[onEvent respond: &_event];
 	if (event.what & qe_mouse) {
 		if (event.what == qe_mouseclick) {
 			if (event.mouse.buttons & (1 << 3)) {

From 257b6580597ae0bb9b18a3cbedcd25ddc4cbaa5c Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 25 Mar 2020 10:00:18 +0900
Subject: [PATCH 0962/1519] [qfcc] Implement single-stepping

That... worked nicely. Program exit needs some work because exiting
terminates the thread and the debugger has no clue about it, but I was
able to single-step through gcd.r quite nicely.
---
 ruamoko/qwaq/qwaq-debugger.r | 37 ++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/ruamoko/qwaq/qwaq-debugger.r b/ruamoko/qwaq/qwaq-debugger.r
index 0c2753df2..7000836c0 100644
--- a/ruamoko/qwaq/qwaq-debugger.r
+++ b/ruamoko/qwaq/qwaq-debugger.r
@@ -1,9 +1,11 @@
 #include <Array.h>
+#include <QF/keys.h>
 
 #include "qwaq-app.h"
 #include "qwaq-curses.h"
 #include "qwaq-debugger.h"
 #include "qwaq-editor.h"
+#include "qwaq-listener.h"
 #include "qwaq-proxyview.h"
 #include "qwaq-window.h"
 
@@ -51,17 +53,52 @@
 	current_file = [self find_file: state.file];
 	file_proxy = [[ProxyView alloc] initWithView: current_file];
 	[[current_file gotoLine:state.line - 1] highlightLine];
+	[[current_file onEvent] addListener: self :@selector(key_event:)];
 	//FIXME id<View>?
 	[source_window insertSelected: (View *) file_proxy];
 	[source_window setTitle: [current_file filename]];
 	[source_window redraw];
 }
 
+-(void) show_line
+{
+	qdb_state_t state = qdb_get_state (debug_target);
+	Editor     *file = [self find_file: state.file];
+
+	printf ("%s:%d\n", state.file, state.line);
+	if (current_file != file) {
+		[[current_file onEvent] removeListener:self :@selector(key_event:)];
+		[file_proxy setView:file];
+		[[file onEvent] addListener:self :@selector(key_event:)];
+		[source_window setTitle: [file filename]];
+		current_file = file;
+	}
+	[[current_file gotoLine:state.line - 1] highlightLine];
+	[source_window redraw];
+}
+
+-(void)key_event: (ed_event_t *)_event
+{
+	qwaq_event_t *event = _event.event;
+	if (event.what == qe_keydown) {
+		switch (event.key.code) {
+			case QFK_F7:
+				qdb_set_trace (debug_target, 1);
+				qdb_continue (debug_target);
+				break;
+			default:
+				return;
+		}
+	}
+	event.what = qe_none;
+}
+
 -handleDebugEvent
 {
 	if (!file_proxy) {
 		[self setup];
 	}
+	[self show_line];
 	return self;
 }
 

From 42f20f200ddd367e082ccbe25e7c7f331c46b0d4 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 25 Mar 2020 11:18:07 +0900
Subject: [PATCH 0963/1519] [qwaq] Fix window resize bounds logic

Have a lot of HoM going on, though :(
---
 ruamoko/qwaq/qwaq-window.r | 40 +++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-window.r b/ruamoko/qwaq/qwaq-window.r
index 6b687044b..561e306f6 100644
--- a/ruamoko/qwaq/qwaq-window.r
+++ b/ruamoko/qwaq/qwaq-window.r
@@ -95,39 +95,39 @@
 	Point       delta = [sender delta];
 	Point       dp = nil;
 	Point       ds = nil;
-	Extent      bounds = [owner size];
+	Extent      b = [owner size];
 
 	if (sender == topDrag) {
-		dp.x = bound (0, xpos + delta.x, bounds.width - xlen) - xpos;
-		dp.y = bound (0, ypos + delta.y, bounds.height - ylen) - ypos;
+		dp.x = bound (0, xpos + delta.x, b.width  - xlen) - xpos;
+		dp.y = bound (0, ypos + delta.y, b.height - ylen) - ypos;
 	} else if (sender == topLeftDrag) {
-		dp.x = bound (0, xpos + delta.x, xpos + xlen - 1) - xpos;
-		dp.y = bound (0, ypos + delta.y, ypos + ylen - 1) - ypos;
-		ds.x = bound (1, xlen - delta.x, bounds.width - xpos) - xlen;
-		ds.y = bound (1, ylen - delta.y, bounds.width - ypos) - ylen;
+		dp.x = bound (0, xpos + delta.x, xpos     + xlen - delta.x - 1) - xpos;
+		dp.y = bound (0, ypos + delta.y, ypos     + ylen - delta.y - 1) - ypos;
+		ds.x = bound (1, xlen - delta.x, b.width  - xpos - delta.x) - xlen;
+		ds.y = bound (1, ylen - delta.y, b.height - ypos - delta.y) - ylen;
 	} else if (sender == topRightDrag) {
-		dp.y = bound (0, ypos + delta.y, ypos + ylen - 1) - ypos;
-		ds.x = bound (1, xlen + delta.x, bounds.width - xpos) - xlen;
-		ds.y = bound (1, ylen - delta.y, bounds.width - ypos) - ylen;
+		dp.y = bound (0, ypos + delta.y, ypos     + ylen - delta.y - 1) - ypos;
+		ds.x = bound (1, xlen + delta.x, b.width  - xpos) - xlen;
+		ds.y = bound (1, ylen - delta.y, b.height - ypos - delta.y) - ylen;
 	} else if (sender == leftDrag) {
-		dp.x = bound (0, xpos + delta.x, xpos + xlen - 1) - xpos;
-		ds.x = bound (1, xlen - delta.x, bounds.width - xpos) - xlen;
+		dp.x = bound (0, xpos + delta.x, xpos     + xlen - delta.x - 1) - xpos;
+		ds.x = bound (1, xlen - delta.x, b.width  - xpos - delta.x) - xlen;
 	} else if (sender == rightDrag) {
-		ds.x = bound (1, xlen + delta.x, bounds.width - xpos) - xlen;
+		ds.x = bound (1, xlen + delta.x, b.width  - xpos) - xlen;
 	} else if (sender == bottomLeftDrag) {
-		dp.x = bound (0, xpos + delta.x, xpos + xlen - 1) - xpos;
-		ds.x = bound (1, xlen - delta.x, bounds.width - xpos) - xlen;
-		ds.y = bound (1, ylen + delta.y, bounds.width - ypos) - ylen;
+		dp.x = bound (0, xpos + delta.x, xpos     + xlen - delta.x - 1) - xpos;
+		ds.x = bound (1, xlen - delta.x, b.width  - xpos) - xlen;
+		ds.y = bound (1, ylen + delta.y, b.height - ypos) - ylen;
 	} else if (sender == bottomRightDrag) {
-		ds.x = bound (1, xlen + delta.x, bounds.width - xpos) - xlen;
-		ds.y = bound (1, ylen + delta.y, bounds.width - ypos) - ylen;
+		ds.x = bound (1, xlen + delta.x, b.width  - xpos) - xlen;
+		ds.y = bound (1, ylen + delta.y, b.height - ypos) - ylen;
 	} else if (sender == bottomDrag) {
-		ds.y = bound (1, ylen + delta.y, bounds.width - ypos) - ylen;
+		ds.y = bound (1, ylen + delta.y, b.height - ypos) - ylen;
 	}
 	int save_state = state;
 	state &= ~sfDrawn;
-	[self move: dp];
 	[self resize: {ds.x, ds.y}];
+	[self move: dp];
 	state = save_state;
 	[self redraw];
 }

From e554202c24faac654e8f74d41b69ad49b4dbfb60 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 25 Mar 2020 14:39:37 +0900
Subject: [PATCH 0964/1519] [qwaq] Add combined move and resize method

This fixes the hall of mirrors bug (needed to move, resize, then move
the window).
---
 ruamoko/qwaq/qwaq-view.h   |  1 +
 ruamoko/qwaq/qwaq-view.r   | 10 ++++++++--
 ruamoko/qwaq/qwaq-window.r | 27 +++++++++++++++++++++++++--
 3 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-view.h b/ruamoko/qwaq/qwaq-view.h
index b8d61d1f0..db4862929 100644
--- a/ruamoko/qwaq/qwaq-view.h
+++ b/ruamoko/qwaq/qwaq-view.h
@@ -65,6 +65,7 @@ enum {
 -redraw;
 -move: (Point) delta;
 -resize: (Extent) delta;
+-move:(Point)dpos andResize:(Extent)dsize;
 -grow: (Extent) delta;
 -handleEvent: (qwaq_event_t *) event;
 -takeFocus;
diff --git a/ruamoko/qwaq/qwaq-view.r b/ruamoko/qwaq/qwaq-view.r
index 76a6fd532..3300a0d05 100644
--- a/ruamoko/qwaq/qwaq-view.r
+++ b/ruamoko/qwaq/qwaq-view.r
@@ -220,6 +220,13 @@ updateScreenCursor (View *view)
 	return self;
 }
 
+-move:(Point)dpos andResize:(Extent)dsize
+{
+	[self move: dpos];
+	[self resize: dsize];
+	return self;
+}
+
 -grow: (Extent) delta
 {
 	Point       dpos = {};
@@ -241,8 +248,7 @@ updateScreenCursor (View *view)
 	}
 	int save_state = state;
 	state &= ~sfDrawn;
-	[self move: dpos];
-	[self resize: dsize];
+	[self move: dpos andResize: dsize];
 	state = save_state;
 	[self redraw];
 	return self;
diff --git a/ruamoko/qwaq/qwaq-window.r b/ruamoko/qwaq/qwaq-window.r
index 561e306f6..37eb76918 100644
--- a/ruamoko/qwaq/qwaq-window.r
+++ b/ruamoko/qwaq/qwaq-window.r
@@ -126,8 +126,7 @@
 	}
 	int save_state = state;
 	state &= ~sfDrawn;
-	[self resize: {ds.x, ds.y}];
-	[self move: dp];
+	[self move:dp andResize:{ds.x, ds.y}];
 	state = save_state;
 	[self redraw];
 }
@@ -137,6 +136,30 @@
 	return self;
 }
 
+-move:(Point)dpos andResize:(Extent)dsize
+{
+	int save_state = state;
+	state &= ~sfDrawn;
+
+	Point pos = self.pos;
+	Extent size = self.size;
+	[super resize: dsize];
+	[super move: dpos];
+	// need to move the panel both before and after the resize to avoid
+	// HoM effects or window/panel possition errors
+	move_panel (panel, xpos, ypos);
+	[(id)textContext resizeTo: self.size];
+	replace_panel (panel, [(id)textContext window]);
+	move_panel (panel, xpos, ypos);
+
+	dsize = {self.size.width - size.width, self.size.height - size.height};
+	[objects resize:dsize];
+
+	state = save_state;
+	[self redraw];
+	return self;
+}
+
 -move: (Point) delta
 {
 	int save_state = state;

From ee6b078f18f904db058bc1b1949fcf40f63753b3 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 25 Mar 2020 14:45:55 +0900
Subject: [PATCH 0965/1519] [qwaq] Fix last window drag-resize corner case

I think I got distracted by the HoM bug while testing corners. Anyway,
with this, window resize by dragging seems to work well.
---
 ruamoko/qwaq/qwaq-window.r | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ruamoko/qwaq/qwaq-window.r b/ruamoko/qwaq/qwaq-window.r
index 37eb76918..8fde82d79 100644
--- a/ruamoko/qwaq/qwaq-window.r
+++ b/ruamoko/qwaq/qwaq-window.r
@@ -116,7 +116,7 @@
 		ds.x = bound (1, xlen + delta.x, b.width  - xpos) - xlen;
 	} else if (sender == bottomLeftDrag) {
 		dp.x = bound (0, xpos + delta.x, xpos     + xlen - delta.x - 1) - xpos;
-		ds.x = bound (1, xlen - delta.x, b.width  - xpos) - xlen;
+		ds.x = bound (1, xlen - delta.x, b.width  - xpos - delta.x) - xlen;
 		ds.y = bound (1, ylen + delta.y, b.height - ypos) - ylen;
 	} else if (sender == bottomRightDrag) {
 		ds.x = bound (1, xlen + delta.x, b.width  - xpos) - xlen;

From 4cef9792f4b87027d6473f8759cebdbe74de5ef8 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 25 Mar 2020 15:43:16 +0900
Subject: [PATCH 0966/1519] [util] Make hash-tables semi-thread-safe

They take a pointer to a free-list used for hashlinks so the hashlink
pools can be per-thread. However, hash tables that are not updated are
always thread-safe, so this affects only updates. progs_t has been set
up such that it is easy for multiple progs within one thread can share
hashlinks.
---
 include/QF/hash.h                      | 11 ++++++-
 include/QF/progs.h                     |  1 +
 libs/audio/renderer/snd_sfx.c          |  2 +-
 libs/console/menu.c                    |  2 +-
 libs/gamecode/pr_builtins.c            |  6 ++--
 libs/gamecode/pr_debug.c               |  3 +-
 libs/gamecode/pr_load.c                |  9 ++++--
 libs/gamecode/pr_opcode.c              |  2 +-
 libs/gamecode/pr_resource.c            |  3 +-
 libs/gamecode/pr_strings.c             |  2 +-
 libs/gib/bi_gib.c                      |  3 +-
 libs/gib/gib_builtin.c                 |  2 +-
 libs/gib/gib_classes.c                 |  3 +-
 libs/gib/gib_function.c                |  4 +--
 libs/gib/gib_object.c                  |  8 +++--
 libs/gib/gib_regex.c                   |  2 +-
 libs/gib/gib_thread.c                  |  2 +-
 libs/gib/gib_vars.c                    | 15 +++++----
 libs/models/iqm/model_iqm.c            |  2 +-
 libs/models/skin.c                     |  2 +-
 libs/ruamoko/rua_cmd.c                 |  3 +-
 libs/ruamoko/rua_hash.c                |  2 +-
 libs/ruamoko/rua_obj.c                 | 12 ++++---
 libs/ruamoko/rua_plist.c               |  2 +-
 libs/util/cmd.c                        |  8 +++--
 libs/util/cvar.c                       |  4 +--
 libs/util/hash.c                       | 44 +++++++++++++++-----------
 libs/util/info.c                       |  2 +-
 libs/util/pakfile.c                    |  2 +-
 libs/util/plugin.c                     |  4 +--
 libs/util/qfplist.c                    |  3 +-
 libs/util/quakefs.c                    |  4 +--
 libs/util/segtext.c                    |  2 +-
 libs/util/wadfile.c                    |  2 +-
 libs/video/renderer/glsl/glsl_draw.c   |  2 +-
 libs/video/renderer/glsl/glsl_shader.c |  2 +-
 libs/video/renderer/r_progs.c          |  3 +-
 libs/video/targets/old_keys.c          |  2 +-
 qtv/source/client.c                    |  2 +-
 qtv/source/connection.c                |  2 +-
 qtv/source/server.c                    |  2 +-
 qw/source/sv_user.c                    |  2 +-
 ruamoko/qwaq/qwaq-input.c              |  6 +++-
 tools/qfbsp/source/map.c               |  2 +-
 tools/qfcc/source/class.c              | 11 ++++---
 tools/qfcc/source/function.c           |  4 +--
 tools/qfcc/source/grab.c               |  4 +--
 tools/qfcc/source/linker.c             | 12 +++----
 tools/qfcc/source/method.c             |  9 +++---
 tools/qfcc/source/opcodes.c            |  4 +--
 tools/qfcc/source/qc-lex.l             |  8 ++---
 tools/qfcc/source/qfprogs.c            |  2 +-
 tools/qfcc/source/qp-lex.l             |  2 +-
 tools/qfcc/source/strpool.c            |  6 ++--
 tools/qfcc/source/switch.c             |  2 +-
 tools/qfcc/source/symtab.c             |  2 +-
 tools/qfcc/source/value.c              | 36 ++++++++++++---------
 57 files changed, 177 insertions(+), 128 deletions(-)

diff --git a/include/QF/hash.h b/include/QF/hash.h
index 7a31a06db..fde2eed97 100644
--- a/include/QF/hash.h
+++ b/include/QF/hash.h
@@ -37,6 +37,7 @@
 ///@{
 
 typedef struct hashtab_s hashtab_t;
+typedef struct hashlink_s hashlink_t;
 
 /** create a new hash table.
 	\param tsize	table size. larger values will give better distribution, but
@@ -50,6 +51,13 @@ typedef struct hashtab_s hashtab_t;
 				element to be freed and the second is the user data pointer.
 	\param ud	user data pointer. set to whatever you want, it will be passed
 				to the get key and free functions as the second parameter.
+	\param hlfl Address of opaque pointer used for per-thread allocation of
+				internal memory. If null, a local static pointer will be used,
+				but the hash table will not be thread-safe unless all tables
+				created with a null \a hlfl (hashlink freelist) are used in
+				only the one thread. However, this applys only to updating a
+				hash table; hash tables that are not updated can be safely
+				shared between threads.
 	\return		pointer to the hash table (to be passed to the other functions)
 				or 0 on error.
 
@@ -59,7 +67,8 @@ typedef struct hashtab_s hashtab_t;
 	previous ones until the later one is removed (Hash_Del).
 */
 hashtab_t *Hash_NewTable (int tsize, const char *(*gk)(const void*,void*),
-						  void (*f)(void*,void*), void *ud);
+						  void (*f)(void*,void*), void *ud,
+						  hashlink_t **hlfl);
 
 /** change the hash and compare functions used by the Hash_*Element functions.
 	the default hash function just returns the address of the element, and the
diff --git a/include/QF/progs.h b/include/QF/progs.h
index e2c077e02..841b586d3 100644
--- a/include/QF/progs.h
+++ b/include/QF/progs.h
@@ -1705,6 +1705,7 @@ struct progs_s {
 	int         null_bad;
 	int         no_exec_limit;
 
+	struct hashlink_s **hashlink_freelist;
 	void      (*file_error) (progs_t *pr, const char *path);
 	void     *(*load_file) (progs_t *pr, const char *path, off_t *size);
 	void     *(*allocate_progs_mem) (progs_t *pr, int size);
diff --git a/libs/audio/renderer/snd_sfx.c b/libs/audio/renderer/snd_sfx.c
index 25d023de8..4dc57ee90 100644
--- a/libs/audio/renderer/snd_sfx.c
+++ b/libs/audio/renderer/snd_sfx.c
@@ -245,7 +245,7 @@ s_soundlist_f (void)
 void
 SND_SFX_Init (void)
 {
-	snd_sfx_hash = Hash_NewTable (511, snd_sfx_getkey, snd_sfx_free, 0);
+	snd_sfx_hash = Hash_NewTable (511, snd_sfx_getkey, snd_sfx_free, 0, 0);
 	precache = Cvar_Get ("precache", "1", CVAR_NONE, NULL,
 						 "Toggle the use of a precache");
 
diff --git a/libs/console/menu.c b/libs/console/menu.c
index ec9fc3355..90eaeca75 100644
--- a/libs/console/menu.c
+++ b/libs/console/menu.c
@@ -586,7 +586,7 @@ Menu_Init (void)
 
 	PR_Init (&menu_pr_state);
 
-	menu_hash = Hash_NewTable (61, menu_get_key, menu_free, 0);
+	menu_hash = Hash_NewTable (61, menu_get_key, menu_free, 0, 0);
 
 	PR_RegisterBuiltins (&menu_pr_state, builtins);
 
diff --git a/libs/gamecode/pr_builtins.c b/libs/gamecode/pr_builtins.c
index 7e4bb4431..6d738e6bc 100644
--- a/libs/gamecode/pr_builtins.c
+++ b/libs/gamecode/pr_builtins.c
@@ -92,8 +92,10 @@ PR_RegisterBuiltins (progs_t *pr, builtin_t *builtins)
 	int         count;
 
 	if (!pr->builtin_hash) {
-		pr->builtin_hash = Hash_NewTable (1021, builtin_get_key, 0, pr);
-		pr->builtin_num_hash = Hash_NewTable (1021, 0, 0, pr);
+		pr->builtin_hash = Hash_NewTable (1021, builtin_get_key, 0, pr,
+										  pr->hashlink_freelist);
+		pr->builtin_num_hash = Hash_NewTable (1021, 0, 0, pr,
+											  pr->hashlink_freelist);
 		Hash_SetHashCompare (pr->builtin_num_hash, builtin_get_hash,
 							 builtin_compare);
 	}
diff --git a/libs/gamecode/pr_debug.c b/libs/gamecode/pr_debug.c
index d2ed5e7f1..63f4444b4 100644
--- a/libs/gamecode/pr_debug.c
+++ b/libs/gamecode/pr_debug.c
@@ -1610,7 +1610,8 @@ PR_Debug_Init (progs_t *pr)
 
 	PR_Resources_Register (pr, "PR_Debug", res, pr_debug_clear);
 	if (!file_hash) {
-		file_hash = Hash_NewTable (1024, file_get_key, file_free, 0);
+		file_hash = Hash_NewTable (1024, file_get_key, file_free, 0,
+								   pr->hashlink_freelist);
 	}
 	PR_AddLoadFunc (pr, PR_LoadDebug);
 }
diff --git a/libs/gamecode/pr_load.c b/libs/gamecode/pr_load.c
index 2bae32dfe..9ea30a037 100644
--- a/libs/gamecode/pr_load.c
+++ b/libs/gamecode/pr_load.c
@@ -234,17 +234,20 @@ PR_LoadProgsFile (progs_t *pr, QFile *file, int size)
 	if (pr->function_hash) {
 		Hash_FlushTable (pr->function_hash);
 	} else {
-		pr->function_hash = Hash_NewTable (1021, function_get_key, 0, pr);
+		pr->function_hash = Hash_NewTable (1021, function_get_key, 0, pr,
+										   pr->hashlink_freelist);
 	}
 	if (pr->global_hash) {
 		Hash_FlushTable (pr->global_hash);
 	} else {
-		pr->global_hash = Hash_NewTable (1021, var_get_key, 0, pr);
+		pr->global_hash = Hash_NewTable (1021, var_get_key, 0, pr,
+										 pr->hashlink_freelist);
 	}
 	if (pr->field_hash) {
 		Hash_FlushTable (pr->field_hash);
 	} else {
-		pr->field_hash = Hash_NewTable (1021, var_get_key, 0, pr);
+		pr->field_hash = Hash_NewTable (1021, var_get_key, 0, pr,
+										pr->hashlink_freelist);
 	}
 
 // byte swap the lumps
diff --git a/libs/gamecode/pr_opcode.c b/libs/gamecode/pr_opcode.c
index 30ad8b06e..15cdb93ad 100644
--- a/libs/gamecode/pr_opcode.c
+++ b/libs/gamecode/pr_opcode.c
@@ -1513,7 +1513,7 @@ PR_Opcode_Init (void)
 		// already initialized
 		return;
 	}
-	opcode_table = Hash_NewTable (1021, 0, 0, 0);
+	opcode_table = Hash_NewTable (1021, 0, 0, 0, 0);
 	Hash_SetHashCompare (opcode_table, opcode_get_hash, opcode_compare);
 
 	for (op = pr_opcodes; op->name; op++) {
diff --git a/libs/gamecode/pr_resource.c b/libs/gamecode/pr_resource.c
index 14cd4a38b..9a86d2302 100644
--- a/libs/gamecode/pr_resource.c
+++ b/libs/gamecode/pr_resource.c
@@ -53,7 +53,8 @@ resource_get_key (const void *r, void *unused)
 VISIBLE void
 PR_Resources_Init (progs_t *pr)
 {
-	pr->resource_hash = Hash_NewTable (1021, resource_get_key, 0, 0);
+	pr->resource_hash = Hash_NewTable (1021, resource_get_key, 0, 0,
+									   pr->hashlink_freelist);
 	pr->resources = 0;
 }
 
diff --git a/libs/gamecode/pr_strings.c b/libs/gamecode/pr_strings.c
index 00bb16e4f..6bbca3481 100644
--- a/libs/gamecode/pr_strings.c
+++ b/libs/gamecode/pr_strings.c
@@ -259,7 +259,7 @@ PR_LoadStrings (progs_t *pr)
 		Hash_FlushTable (res->strref_hash);
 	} else {
 		res->strref_hash = Hash_NewTable (1021, strref_get_key, strref_free,
-										  res);
+										  res, pr->hashlink_freelist);
 		res->string_map = 0;
 		res->free_string_refs = 0;
 		res->dyn_str_size = 0;
diff --git a/libs/gib/bi_gib.c b/libs/gib/bi_gib.c
index 3c462712c..2b1c6c5b4 100644
--- a/libs/gib/bi_gib.c
+++ b/libs/gib/bi_gib.c
@@ -193,7 +193,8 @@ GIB_Progs_Init (progs_t *pr)
 	PR_Resources_Register (pr, "GIB", res, bi_gib_builtin_clear);
 
 	bi_gib_builtins = Hash_NewTable (1021, bi_gib_builtin_get_key,
-									 bi_gib_builtin_free, 0);
+									 bi_gib_builtin_free, 0,
+									 pr->hashlink_freelist);
 
 	PR_RegisterBuiltins (pr, builtins);
 }
diff --git a/libs/gib/gib_builtin.c b/libs/gib/gib_builtin.c
index 6f6e857bd..b7f571458 100644
--- a/libs/gib/gib_builtin.c
+++ b/libs/gib/gib_builtin.c
@@ -99,7 +99,7 @@ GIB_Builtin_Add (const char *name, void (*func) (void))
 
 	if (!gib_builtins)
 		gib_builtins =
-			Hash_NewTable (1024, GIB_Builtin_Get_Key, GIB_Builtin_Free, 0);
+			Hash_NewTable (1024, GIB_Builtin_Get_Key, GIB_Builtin_Free, 0, 0);
 
 	new = calloc (1, sizeof (gib_builtin_t));
 	new->func = func;
diff --git a/libs/gib/gib_classes.c b/libs/gib/gib_classes.c
index 8258e7882..88922af50 100644
--- a/libs/gib/gib_classes.c
+++ b/libs/gib/gib_classes.c
@@ -388,8 +388,7 @@ ObjectHash_Construct (gib_object_t *obj)
 {
 	ObjectHash_t *data = malloc (sizeof (ObjectHash_t));
 
-	data->objects = Hash_NewTable (1024, ObjRef_Get_Key, ObjRef_Free,
-			NULL);
+	data->objects = Hash_NewTable (1024, ObjRef_Get_Key, ObjRef_Free, NULL, 0);
 
 	return data;
 }
diff --git a/libs/gib/gib_function.c b/libs/gib/gib_function.c
index 5c5403277..c960a7d49 100644
--- a/libs/gib/gib_function.c
+++ b/libs/gib/gib_function.c
@@ -117,8 +117,8 @@ GIB_Function_Define (const char *name, const char *text, gib_tree_t * program,
 	if (script)
 		script->refs++;
 	if (!gib_functions)
-		gib_functions =
-			Hash_NewTable (1024, GIB_Function_Get_Key, GIB_Function_Free, 0);
+		gib_functions = Hash_NewTable (1024, GIB_Function_Get_Key,
+									   GIB_Function_Free, 0, 0);
 
 	func = Hash_Find (gib_functions, name);
 	if (func) {
diff --git a/libs/gib/gib_object.c b/libs/gib/gib_object.c
index a4954762b..3d69b887e 100644
--- a/libs/gib/gib_object.c
+++ b/libs/gib/gib_object.c
@@ -125,7 +125,8 @@ GIB_Method_Build_Hash (gib_class_t *class, hashtab_t *inherited,
 {
 	gib_methodtab_t *m;
 	gib_method_t *method;
-	hashtab_t *new = Hash_NewTable (1024, GIB_Method_Get_Key, GIB_Method_Free, 0);
+	hashtab_t *new = Hash_NewTable (1024, GIB_Method_Get_Key,
+									GIB_Method_Free, 0, 0);
 
 	for (m = methods; m->name; m++) {
 		method = malloc (sizeof (gib_method_t));
@@ -207,7 +208,7 @@ GIB_Object_Create (const char *classname, qboolean classobj)
 	obj->handstr = strdup (va ("%lu", obj->handle));
 	obj->refs = 1;
 	obj->signals = Hash_NewTable (128, GIB_Signal_Get_Key,
-			GIB_Signal_Free, NULL);
+								  GIB_Signal_Free, NULL, 0);
 	obj->slots = llist_new (GIB_Slot_Free, NULL, NULL);
 
 	if (classobj) {
@@ -392,7 +393,8 @@ GIB_Object_Signal_Emit (gib_object_t *sender, int argc, const char **argv)
 void
 GIB_Object_Init (void)
 {
-	gib_classes = Hash_NewTable (1024, GIB_Class_Get_Key, GIB_Class_Free, 0);
+	gib_classes = Hash_NewTable (1024, GIB_Class_Get_Key,
+								 GIB_Class_Free, 0, 0);
 
 	GIB_Classes_Init ();
 }
diff --git a/libs/gib/gib_regex.c b/libs/gib/gib_regex.c
index e808532d6..dbe43cf04 100644
--- a/libs/gib/gib_regex.c
+++ b/libs/gib/gib_regex.c
@@ -63,7 +63,7 @@ GIB_Regex_Free (void *ele, void *ptr)
 void
 GIB_Regex_Init (void)
 {
-	gib_regexs = Hash_NewTable (512, GIB_Regex_Get_Key, GIB_Regex_Free, 0);
+	gib_regexs = Hash_NewTable (512, GIB_Regex_Get_Key, GIB_Regex_Free, 0, 0);
 }
 
 regex_t *
diff --git a/libs/gib/gib_thread.c b/libs/gib/gib_thread.c
index 9c317d9fe..01d1fd98f 100644
--- a/libs/gib/gib_thread.c
+++ b/libs/gib/gib_thread.c
@@ -171,5 +171,5 @@ GIB_Event_Callback (gib_event_t * event, unsigned int argc, ...)
 void
 GIB_Event_Init (void)
 {
-	gib_events = Hash_NewTable (1024, GIB_Event_Get_Key, GIB_Event_Free, 0);
+	gib_events = Hash_NewTable (1024, GIB_Event_Get_Key, GIB_Event_Free, 0, 0);
 }
diff --git a/libs/gib/gib_vars.c b/libs/gib/gib_vars.c
index e8b7f8a3a..31d7b3c6a 100644
--- a/libs/gib/gib_vars.c
+++ b/libs/gib/gib_vars.c
@@ -117,7 +117,8 @@ GIB_Var_Get_Complex (hashtab_t ** first, hashtab_t ** second, char *key,
 			if (!(var = GIB_Var_Get (*first, *second, key+start)) && create) {
 				var = GIB_Var_New (key+start);
 				if (!*first)
-					*first = Hash_NewTable (256, GIB_Var_Get_Key, GIB_Var_Free, 0);
+					*first = Hash_NewTable (256, GIB_Var_Get_Key,
+											GIB_Var_Free, 0, 0);
 				Hash_Add (*first, var);
 			}
 
@@ -181,7 +182,8 @@ GIB_Var_Get_Very_Complex (hashtab_t ** first, hashtab_t ** second, dstring_t *ke
 				if (create) {
 					var = GIB_Var_New (key->str+start);
 					if (!*first)
-						*first = Hash_NewTable (256, GIB_Var_Get_Key, GIB_Var_Free, 0);
+						*first = Hash_NewTable (256, GIB_Var_Get_Key,
+												GIB_Var_Free, 0, 0);
 					Hash_Add (*first, var);
 				} else
 					return 0;
@@ -293,7 +295,7 @@ GIB_Domain_Get (const char *name)
 	if (!d) {
 		d = calloc (1, sizeof (gib_domain_t));
 		d->name = strdup (name);
-		d->vars = Hash_NewTable (1024, GIB_Var_Get_Key, GIB_Var_Free, 0);
+		d->vars = Hash_NewTable (1024, GIB_Var_Get_Key, GIB_Var_Free, 0, 0);
 		Hash_Add (gib_domains, d);
 	}
 	return d->vars;
@@ -302,12 +304,13 @@ GIB_Domain_Get (const char *name)
 hashtab_t *
 GIB_Var_Hash_New (void)
 {
-	return Hash_NewTable (1024, GIB_Var_Get_Key, GIB_Var_Free, 0);
+	return Hash_NewTable (1024, GIB_Var_Get_Key, GIB_Var_Free, 0, 0);
 }
 
 void
 GIB_Var_Init (void)
 {
-	gib_globals = Hash_NewTable (1024, GIB_Var_Get_Key, GIB_Var_Free, 0);
-	gib_domains = Hash_NewTable (1024, GIB_Domain_Get_Key, GIB_Domain_Free, 0);
+	gib_globals = Hash_NewTable (1024, GIB_Var_Get_Key, GIB_Var_Free, 0, 0);
+	gib_domains = Hash_NewTable (1024, GIB_Domain_Get_Key,
+								 GIB_Domain_Free, 0, 0);
 }
diff --git a/libs/models/iqm/model_iqm.c b/libs/models/iqm/model_iqm.c
index 6d6e8de0b..4940da557 100644
--- a/libs/models/iqm/model_iqm.c
+++ b/libs/models/iqm/model_iqm.c
@@ -600,7 +600,7 @@ Mod_IQMBuildBlendPalette (iqm_t *iqm, int *size)
 	}
 	num_blends = iqm->num_joints;
 
-	blend_hash = Hash_NewTable (1023, 0, 0, 0);
+	blend_hash = Hash_NewTable (1023, 0, 0, 0, 0);
 	Hash_SetHashCompare (blend_hash, blend_get_hash, blend_compare);
 
 	for (i = 0; i < iqm->num_verts; i++) {
diff --git a/libs/models/skin.c b/libs/models/skin.c
index 14c21cd81..9583383cc 100644
--- a/libs/models/skin.c
+++ b/libs/models/skin.c
@@ -242,6 +242,6 @@ skin_free (void *_sb, void *unused)
 void
 Skin_Init (void)
 {
-	skin_cache = Hash_NewTable (127, skin_getkey, skin_free, 0);
+	skin_cache = Hash_NewTable (127, skin_getkey, skin_free, 0, 0);
 	m_funcs->Skin_InitTranslations ();
 }
diff --git a/libs/ruamoko/rua_cmd.c b/libs/ruamoko/rua_cmd.c
index a18e2805e..8efcfb2a5 100644
--- a/libs/ruamoko/rua_cmd.c
+++ b/libs/ruamoko/rua_cmd.c
@@ -162,7 +162,8 @@ RUA_Cmd_Init (progs_t *pr, int secure)
 	PR_Resources_Register (pr, "Cmd", res, bi_cmd_clear);
 
 	if (!bi_cmds)
-		bi_cmds = Hash_NewTable (1021, bi_cmd_get_key, bi_cmd_free, 0);
+		bi_cmds = Hash_NewTable (1021, bi_cmd_get_key, bi_cmd_free, 0,
+								 pr->hashlink_freelist);
 
 	PR_RegisterBuiltins (pr, builtins);
 }
diff --git a/libs/ruamoko/rua_hash.c b/libs/ruamoko/rua_hash.c
index fedb8c288..cff92eb4e 100644
--- a/libs/ruamoko/rua_hash.c
+++ b/libs/ruamoko/rua_hash.c
@@ -162,7 +162,7 @@ bi_Hash_NewTable (progs_t *pr)
 
 	gk = ht->gk ? bi_get_key : 0;
 	f = ht->f ? bi_free : 0;
-	ht->tab = Hash_NewTable (tsize, gk, f, ht);
+	ht->tab = Hash_NewTable (tsize, gk, f, ht, pr->hashlink_freelist);
 	R_INT (pr) = table_index (res, ht);
 }
 
diff --git a/libs/ruamoko/rua_obj.c b/libs/ruamoko/rua_obj.c
index 854341b56..3d69eba11 100644
--- a/libs/ruamoko/rua_obj.c
+++ b/libs/ruamoko/rua_obj.c
@@ -2215,10 +2215,14 @@ RUA_Obj_Init (progs_t *pr, int secure)
 	probj_t    *probj = calloc (1, sizeof (*probj));
 
 	probj->pr = pr;
-	probj->selector_hash = Hash_NewTable (1021, selector_get_key, 0, probj);
-	probj->classes = Hash_NewTable (1021, class_get_key, 0, probj);
-	probj->protocols = Hash_NewTable (1021, protocol_get_key, 0, probj);
-	probj->load_methods = Hash_NewTable (1021, 0, 0, probj);
+	probj->selector_hash = Hash_NewTable (1021, selector_get_key, 0, probj,
+										  pr->hashlink_freelist);
+	probj->classes = Hash_NewTable (1021, class_get_key, 0, probj,
+									pr->hashlink_freelist);
+	probj->protocols = Hash_NewTable (1021, protocol_get_key, 0, probj,
+									  pr->hashlink_freelist);
+	probj->load_methods = Hash_NewTable (1021, 0, 0, probj,
+										 pr->hashlink_freelist);
 	probj->msg = dstring_newstr();
 	Hash_SetHashCompare (probj->load_methods, load_methods_get_hash,
 						 load_methods_compare);
diff --git a/libs/ruamoko/rua_plist.c b/libs/ruamoko/rua_plist.c
index 0fdb1ff8d..9732b75c3 100644
--- a/libs/ruamoko/rua_plist.c
+++ b/libs/ruamoko/rua_plist.c
@@ -455,7 +455,7 @@ void
 RUA_Plist_Init (progs_t *pr, int secure)
 {
 	plist_resources_t *res = calloc (1, sizeof (plist_resources_t));
-	res->plist_tab = Hash_NewTable (1021, 0, 0, 0);
+	res->plist_tab = Hash_NewTable (1021, 0, 0, 0, pr->hashlink_freelist);
 	Hash_SetHashCompare (res->plist_tab, plist_get_hash, plist_compare);
 
 	PR_Resources_Register (pr, "plist", res, bi_plist_clear);
diff --git a/libs/util/cmd.c b/libs/util/cmd.c
index dcdbe6855..aede64982 100644
--- a/libs/util/cmd.c
+++ b/libs/util/cmd.c
@@ -583,9 +583,11 @@ Cmd_StuffCmds_f (void)
 VISIBLE void
 Cmd_Init_Hash (void)
 {
-	cmd_hash = Hash_NewTable (1021, cmd_get_key, 0, 0);
-	cmd_alias_hash = Hash_NewTable (1021, cmd_alias_get_key, cmd_alias_free, 0);
-	cmd_provider_hash = Hash_NewTable(1021, cmd_provider_get_key, cmd_provider_free, 0);
+	cmd_hash = Hash_NewTable (1021, cmd_get_key, 0, 0, 0);
+	cmd_alias_hash = Hash_NewTable (1021, cmd_alias_get_key,
+									cmd_alias_free, 0, 0);
+	cmd_provider_hash = Hash_NewTable(1021, cmd_provider_get_key,
+									  cmd_provider_free, 0, 0);
 }
 
 VISIBLE void
diff --git a/libs/util/cvar.c b/libs/util/cvar.c
index 64ef200ab..99f016d85 100644
--- a/libs/util/cvar.c
+++ b/libs/util/cvar.c
@@ -580,8 +580,8 @@ calias_get_key (const void *c, void *unused)
 VISIBLE void
 Cvar_Init_Hash (void)
 {
-	cvar_hash = Hash_NewTable (1021, cvar_get_key, cvar_free, 0);
-	calias_hash = Hash_NewTable (1021, calias_get_key, calias_free, 0);
+	cvar_hash = Hash_NewTable (1021, cvar_get_key, cvar_free, 0, 0);
+	calias_hash = Hash_NewTable (1021, calias_get_key, calias_free, 0, 0);
 }
 
 VISIBLE void
diff --git a/libs/util/hash.c b/libs/util/hash.c
index 587e4a24d..13c090132 100644
--- a/libs/util/hash.c
+++ b/libs/util/hash.c
@@ -45,11 +45,11 @@
 
 #include "compat.h"
 
-typedef struct hashlink_s {
+struct hashlink_s {
 	struct hashlink_s *next;
 	struct hashlink_s **prev;
 	void *data;
-} hashlink_t;
+};
 
 struct hashtab_s {
 	size_t tab_size;
@@ -60,38 +60,39 @@ struct hashtab_s {
 	uintptr_t (*get_hash)(const void*,void*);
 	const char *(*get_key)(const void*,void*);
 	void (*free_ele)(void*,void*);
+	hashlink_t **hashlink_freelist;
 	hashlink_t *tab[1];             // variable size
 };
 
-static hashlink_t *free_hashlinks;
-
 static hashlink_t *
-new_hashlink (void)
+new_hashlink (hashlink_t **free_hashlinks)
 {
 	hashlink_t *link;
 
-	if (!free_hashlinks) {
+	if (!*free_hashlinks) {
 		int		i;
 
-		if (!(free_hashlinks = calloc (1024, sizeof (hashlink_t))))
+		if (!(*free_hashlinks = calloc (1024, sizeof (hashlink_t))))
 			return 0;
-		for (i = 0, link = free_hashlinks; i < 1023; i++, link++)
+		for (i = 0, link = *free_hashlinks; i < 1023; i++, link++)
 			link->next = link + 1;
 		link->next = 0;
 	}
-	link = free_hashlinks;
-	free_hashlinks = link->next;
+	link = *free_hashlinks;
+	*free_hashlinks = link->next;
 	link->next = 0;
 	return link;
 }
 
 static void
-free_hashlink (hashlink_t *link)
+free_hashlink (hashlink_t *link, hashlink_t **free_hashlinks)
 {
-	link->next = free_hashlinks;
-	free_hashlinks = link;
+	link->next = *free_hashlinks;
+	*free_hashlinks = link;
 }
 
+static hashlink_t *default_hashlink_freelist;
+
 VISIBLE unsigned long
 Hash_String (const char *str)
 {
@@ -183,7 +184,8 @@ get_index (uintptr_t hash, size_t size, size_t bits)
 
 VISIBLE hashtab_t *
 Hash_NewTable (int tsize, const char *(*gk)(const void*,void*),
-			   void (*f)(void*,void*), void *ud)
+			   void (*f)(void*,void*), void *ud,
+			   hashlink_t **hashlink_freelist)
 {
 	hashtab_t *tab = calloc (1, field_offset (hashtab_t, tab[tsize]));
 	if (!tab)
@@ -192,6 +194,10 @@ Hash_NewTable (int tsize, const char *(*gk)(const void*,void*),
 	tab->user_data = ud;
 	tab->get_key = gk;
 	tab->free_ele = f;
+	if (!hashlink_freelist) {
+		hashlink_freelist = &default_hashlink_freelist;
+	}
+	tab->hashlink_freelist = hashlink_freelist;
 
 	while (tsize) {
 		tab->size_bits++;
@@ -228,7 +234,7 @@ Hash_FlushTable (hashtab_t *tab)
 			hashlink_t *t = tab->tab[i]->next;
 			void *data = tab->tab[i]->data;
 
-			free_hashlink (tab->tab[i]);
+			free_hashlink (tab->tab[i], tab->hashlink_freelist);
 			tab->tab[i] = t;
 			if (tab->free_ele)
 				tab->free_ele (data, tab->user_data);
@@ -242,7 +248,7 @@ Hash_Add (hashtab_t *tab, void *ele)
 {
 	unsigned long h = Hash_String (tab->get_key(ele, tab->user_data));
 	size_t ind = get_index (h, tab->tab_size, tab->size_bits);
-	hashlink_t *lnk = new_hashlink ();
+	hashlink_t *lnk = new_hashlink (tab->hashlink_freelist);
 
 	if (!lnk)
 		return -1;
@@ -261,7 +267,7 @@ Hash_AddElement (hashtab_t *tab, void *ele)
 {
 	unsigned long h = tab->get_hash (ele, tab->user_data);
 	size_t ind = get_index (h, tab->tab_size, tab->size_bits);
-	hashlink_t *lnk = new_hashlink ();
+	hashlink_t *lnk = new_hashlink (tab->hashlink_freelist);
 
 	if (!lnk)
 		return -1;
@@ -375,7 +381,7 @@ Hash_Del (hashtab_t *tab, const char *key)
 			if (lnk->next)
 				lnk->next->prev = lnk->prev;
 			*lnk->prev = lnk->next;
-			free_hashlink (lnk);
+			free_hashlink (lnk, tab->hashlink_freelist);
 			tab->num_ele--;
 			return data;
 		}
@@ -398,7 +404,7 @@ Hash_DelElement (hashtab_t *tab, void *ele)
 			if (lnk->next)
 				lnk->next->prev = lnk->prev;
 			*lnk->prev = lnk->next;
-			free_hashlink (lnk);
+			free_hashlink (lnk, tab->hashlink_freelist);
 			tab->num_ele--;
 			return data;
 		}
diff --git a/libs/util/info.c b/libs/util/info.c
index e9e8e9727..9758942a4 100644
--- a/libs/util/info.c
+++ b/libs/util/info.c
@@ -228,7 +228,7 @@ Info_ParseString (const char *s, int maxsize, int flags)
 	char       *key, *value, *end;
 
 	info = malloc (sizeof (info_t));
-	info->tab = Hash_NewTable (61, info_get_key, free_key, 0);
+	info->tab = Hash_NewTable (61, info_get_key, free_key, 0, 0);
 	info->maxsize = maxsize;
 	info->cursize = 0;
 
diff --git a/libs/util/pakfile.c b/libs/util/pakfile.c
index 9cfcb9924..f3f0352ed 100644
--- a/libs/util/pakfile.c
+++ b/libs/util/pakfile.c
@@ -66,7 +66,7 @@ pack_new (const char *name)
 		free (pack);
 		return 0;
 	}
-	pack->file_hash = Hash_NewTable (1021, pack_get_key, 0, 0);
+	pack->file_hash = Hash_NewTable (1021, pack_get_key, 0, 0, 0);
 	if (!pack->file_hash) {
 		free (pack->filename);
 		free (pack);
diff --git a/libs/util/plugin.c b/libs/util/plugin.c
index 7baa8df72..f625ddd15 100644
--- a/libs/util/plugin.c
+++ b/libs/util/plugin.c
@@ -241,9 +241,9 @@ VISIBLE void
 PI_Init (void)
 {
 	PI_InitCvars ();
-	registered_plugins = Hash_NewTable (253, plugin_get_key, 0, 0);
+	registered_plugins = Hash_NewTable (253, plugin_get_key, 0, 0, 0);
 	loaded_plugins = Hash_NewTable(253, loaded_plugin_get_key,
-								   loaded_plugin_delete, 0);
+								   loaded_plugin_delete, 0, 0);
 	Cmd_AddCommand("plugin_load", PI_Plugin_Load_f,
 				   "load the plugin of the given type name and name");
 	Cmd_AddCommand("plugin_unload", PI_Plugin_Unload_f,
diff --git a/libs/util/qfplist.c b/libs/util/qfplist.c
index 03a85b5b2..0bda96e59 100644
--- a/libs/util/qfplist.c
+++ b/libs/util/qfplist.c
@@ -149,7 +149,8 @@ VISIBLE plitem_t *
 PL_NewDictionary (void)
 {
 	plitem_t   *item = PL_NewItem (QFDictionary);
-	hashtab_t  *dict = Hash_NewTable (1021, dict_get_key, dict_free, NULL);
+	//FIXME need a per-thread hashlink freelist for plist to be thread-safe
+	hashtab_t  *dict = Hash_NewTable (1021, dict_get_key, dict_free, NULL, 0);
 	item->data = dict;
 	return item;
 }
diff --git a/libs/util/quakefs.c b/libs/util/quakefs.c
index edbb39c6c..039548130 100644
--- a/libs/util/quakefs.c
+++ b/libs/util/quakefs.c
@@ -307,7 +307,7 @@ qfs_var_free (void *_v, void *unused)
 static hashtab_t *
 qfs_new_vars (void)
 {
-	return Hash_NewTable (61, qfs_var_get_key, qfs_var_free, 0);
+	return Hash_NewTable (61, qfs_var_get_key, qfs_var_free, 0, 0);
 }
 
 static void
@@ -549,7 +549,7 @@ qfs_build_gamedir (const char **list)
 	gamedir_t  *gamedir;
 	plitem_t   *gdpl;
 	dstring_t  *path;
-	hashtab_t  *dirs = Hash_NewTable (31, qfs_dir_get_key, qfs_dir_free, 0);
+	hashtab_t  *dirs = Hash_NewTable (31, qfs_dir_get_key, qfs_dir_free, 0, 0);
 	hashtab_t  *vars = qfs_new_vars ();
 	const char *dir = 0;
 
diff --git a/libs/util/segtext.c b/libs/util/segtext.c
index 742983be1..ffee78d77 100644
--- a/libs/util/segtext.c
+++ b/libs/util/segtext.c
@@ -140,7 +140,7 @@ Segtext_new (const char *source_string)
 	if (!source_string)
 		return 0;
 	text = new_text ();
-	text->tab = Hash_NewTable (61, segtext_getkey, 0, 0);
+	text->tab = Hash_NewTable (61, segtext_getkey, 0, 0, 0);
 
 	src = strdup (source_string);
 	// The first chunk is special in that it holds the pointer to the copied
diff --git a/libs/util/wadfile.c b/libs/util/wadfile.c
index 3175f22c7..3d8a709ca 100644
--- a/libs/util/wadfile.c
+++ b/libs/util/wadfile.c
@@ -86,7 +86,7 @@ wad_new (const char *name)
 		free (wad);
 		return 0;
 	}
-	wad->lump_hash = Hash_NewTable (1021, 0, 0, 0);
+	wad->lump_hash = Hash_NewTable (1021, 0, 0, 0, 0);
 	if (!wad->lump_hash) {
 		free (wad->filename);
 		free (wad);
diff --git a/libs/video/renderer/glsl/glsl_draw.c b/libs/video/renderer/glsl/glsl_draw.c
index 6a8ef0268..6d1f14f0b 100644
--- a/libs/video/renderer/glsl/glsl_draw.c
+++ b/libs/video/renderer/glsl/glsl_draw.c
@@ -375,7 +375,7 @@ glsl_Draw_Init (void)
 	qpic_t     *pic;
 	//FIXME glpic_t    *gl;
 
-	pic_cache = Hash_NewTable (127, cachepic_getkey, cachepic_free, 0);
+	pic_cache = Hash_NewTable (127, cachepic_getkey, cachepic_free, 0, 0);
 	QFS_GamedirCallback (Draw_ClearCache);
 	//FIXME temporary work around for the timing of cvar creation and palette
 	//loading
diff --git a/libs/video/renderer/glsl/glsl_shader.c b/libs/video/renderer/glsl/glsl_shader.c
index d38bb2c29..c45494dc0 100644
--- a/libs/video/renderer/glsl/glsl_shader.c
+++ b/libs/video/renderer/glsl/glsl_shader.c
@@ -72,7 +72,7 @@ GLSL_RegisterEffect (const char *name, const char *src)
 	segtext_t  *text;
 
 	if (!effect_tab)
-		effect_tab = Hash_NewTable (61, effect_get_key, 0, 0);
+		effect_tab = Hash_NewTable (61, effect_get_key, 0, 0, 0);
 
 	if (Hash_Find (effect_tab, name)) {
 		Sys_Printf ("WARNING: ignoring duplicate '%s' effect\n", name);
diff --git a/libs/video/renderer/r_progs.c b/libs/video/renderer/r_progs.c
index 66ae9072f..aba1de6ea 100644
--- a/libs/video/renderer/r_progs.c
+++ b/libs/video/renderer/r_progs.c
@@ -345,7 +345,8 @@ void
 R_Progs_Init (progs_t *pr)
 {
 	draw_resources_t *res = calloc (1, sizeof (draw_resources_t));
-	res->pic_hash = Hash_NewTable (61, bi_draw_get_key, 0, 0);
+	res->pic_hash = Hash_NewTable (61, bi_draw_get_key, 0, 0,
+								   pr->hashlink_freelist);
 
 	PR_Resources_Register (pr, "Draw", res, bi_draw_clear);
 	PR_RegisterBuiltins (pr, builtins);
diff --git a/libs/video/targets/old_keys.c b/libs/video/targets/old_keys.c
index 99b87f4c4..e96cc02ff 100644
--- a/libs/video/targets/old_keys.c
+++ b/libs/video/targets/old_keys.c
@@ -233,7 +233,7 @@ OK_Init (void)
 {
 	old_keyname_t *ok;
 
-	old_key_table = Hash_NewTable (1021, ok_get_key, 0, 0);
+	old_key_table = Hash_NewTable (1021, ok_get_key, 0, 0, 0);
 	for (ok = old_keynames; ok->old_name; ok++)
 		Hash_Add (old_key_table, ok);
 }
diff --git a/qtv/source/client.c b/qtv/source/client.c
index d53849f7f..24b0e23b2 100644
--- a/qtv/source/client.c
+++ b/qtv/source/client.c
@@ -1204,7 +1204,7 @@ Client_Init (void)
 {
 	size_t      i;
 
-	ucmd_table = Hash_NewTable (251, ucmds_getkey, 0, 0);
+	ucmd_table = Hash_NewTable (251, ucmds_getkey, 0, 0, 0);
 	for (i = 0; i < sizeof (ucmds) / sizeof (ucmds[0]); i++)
 		Hash_Add (ucmd_table, &ucmds[i]);
 }
diff --git a/qtv/source/connection.c b/qtv/source/connection.c
index 0ff5d4464..52f159060 100644
--- a/qtv/source/connection.c
+++ b/qtv/source/connection.c
@@ -79,7 +79,7 @@ connection_compare (const void *_c1, const void *_c2, void *unused)
 void
 Connection_Init (void)
 {
-	connections = Hash_NewTable (1023, 0, connection_free, 0);
+	connections = Hash_NewTable (1023, 0, connection_free, 0, 0);
 	Hash_SetHashCompare (connections, connection_get_hash, connection_compare);
 }
 
diff --git a/qtv/source/server.c b/qtv/source/server.c
index c36465d31..855bc492c 100644
--- a/qtv/source/server.c
+++ b/qtv/source/server.c
@@ -541,7 +541,7 @@ void
 Server_Init (void)
 {
 	Sys_RegisterShutdown (server_shutdown, 0);
-	server_hash = Hash_NewTable (61, server_get_key, server_free, 0);
+	server_hash = Hash_NewTable (61, server_get_key, server_free, 0, 0);
 	Cmd_AddCommand ("sv_new", sv_new_f, "Add a new server");
 	Cmd_AddCommand ("sv_del", sv_del_f, "Remove an existing server");
 	Cmd_AddCommand ("sv_list", sv_list_f, "List available servers");
diff --git a/qw/source/sv_user.c b/qw/source/sv_user.c
index a6b56c219..b8aa5e8d4 100644
--- a/qw/source/sv_user.c
+++ b/qw/source/sv_user.c
@@ -2009,7 +2009,7 @@ static builtin_t builtins[] = {
 void
 SV_UserInit (void)
 {
-	ucmd_table = Hash_NewTable (251, ucmds_getkey, ucmds_free, 0);
+	ucmd_table = Hash_NewTable (251, ucmds_getkey, ucmds_free, 0, 0);
 	Hash_SetHashCompare (ucmd_table, ucmd_get_hash, ucmd_compare);
 	PR_RegisterBuiltins (&sv_pr_state, builtins);
 	cl_rollspeed = Cvar_Get ("cl_rollspeed", "200", CVAR_NONE, NULL,
diff --git a/ruamoko/qwaq/qwaq-input.c b/ruamoko/qwaq/qwaq-input.c
index ba7dca6e9..543971d44 100644
--- a/ruamoko/qwaq/qwaq-input.c
+++ b/ruamoko/qwaq/qwaq-input.c
@@ -323,7 +323,10 @@ parse_key (qwaq_resources_t *res)
 {
 	qwaq_key_t *key = Hash_Find (res->key_sequences, res->escbuff.str);
 
+	//Sys_Printf ("parse_key: %s\n", res->escbuff.str + 1);
 	if (key) {
+		//Sys_Printf ("    %d %03x %s\n", key->key, key->shift,
+		//			Key_KeynumToString (key->key));
 		key_event (res, key->key, key->shift);
 	}
 }
@@ -417,7 +420,8 @@ void qwaq_input_init (qwaq_resources_t *res)
 	if (res->key_sequences) {
 		Hash_FlushTable (res->key_sequences);
 	} else {
-		res->key_sequences = Hash_NewTable (127, key_sequence_getkey, 0, 0);
+		res->key_sequences = Hash_NewTable (127, key_sequence_getkey, 0, 0,
+											res->pr->hashlink_freelist);
 	}
 	for (size_t i = 0; i < sizeof (default_keys) / sizeof (default_keys[0]);
 		 i++) {
diff --git a/tools/qfbsp/source/map.c b/tools/qfbsp/source/map.c
index f2038e44d..c258b73df 100644
--- a/tools/qfbsp/source/map.c
+++ b/tools/qfbsp/source/map.c
@@ -97,7 +97,7 @@ FindMiptex (const char *name)
 	if (strcmp (name, "skip") == 0)
 		return TEX_SKIP;
 	if (!miptex_hash)
-		miptex_hash = Hash_NewTable (1023, miptex_getkey, 0, 0);
+		miptex_hash = Hash_NewTable (1023, miptex_getkey, 0, 0, 0);
 	if (miptexnames) {
 		index = (intptr_t) Hash_Find (miptex_hash, mpname);
 		if (index)
diff --git a/tools/qfcc/source/class.c b/tools/qfcc/source/class.c
index 6f4473e1d..8b2081e82 100644
--- a/tools/qfcc/source/class.c
+++ b/tools/qfcc/source/class.c
@@ -192,9 +192,10 @@ add_static_instance (const char *class, def_t *instance_def)
 	static_instance_t *instance = malloc (sizeof (*instance));
 
 	if (!static_instances) {
-		static_instances = Hash_NewTable (1021, static_instance_get_key, 0, 0);
+		static_instances = Hash_NewTable (1021, static_instance_get_key,
+										  0, 0, 0);
 		static_instance_classes = Hash_NewTable (1021, static_instance_get_key,
-												 0, 0);
+												 0, 0, 0);
 	}
 
 	instance->class = save_string (class);
@@ -561,7 +562,7 @@ _get_class (symbol_t *sym, int create)
 	class_t    *c;
 
 	if (!class_hash)
-		class_hash = Hash_NewTable (1021, class_get_key, 0, 0);
+		class_hash = Hash_NewTable (1021, class_get_key, 0, 0, 0);
 	if (sym) {
 		c = Hash_Find (class_hash, sym->name);
 		if (c || !create)
@@ -1272,7 +1273,7 @@ get_category (symbol_t *class_name, const char *category_name, int create)
 	class_t    *class;
 
 	if (!category_hash) {
-		category_hash = Hash_NewTable (1021, 0, 0, 0);
+		category_hash = Hash_NewTable (1021, 0, 0, 0, 0);
 		Hash_SetHashCompare (category_hash,
 				category_get_hash, category_compare);
 	}
@@ -1549,7 +1550,7 @@ get_protocol (const char *name, int create)
 	protocol_t    *p;
 
 	if (!protocol_hash)
-		protocol_hash = Hash_NewTable (1021, protocol_get_key, 0, 0);
+		protocol_hash = Hash_NewTable (1021, protocol_get_key, 0, 0, 0);
 
 	if (name) {
 		p = Hash_Find (protocol_hash, name);
diff --git a/tools/qfcc/source/function.c b/tools/qfcc/source/function.c
index c9e5474a5..234d622d9 100644
--- a/tools/qfcc/source/function.c
+++ b/tools/qfcc/source/function.c
@@ -241,8 +241,8 @@ get_function (const char *name, type_t *type, int overload, int create)
 	overloaded_function_t *func;
 
 	if (!overloaded_functions) {
-		overloaded_functions = Hash_NewTable (1021, ol_func_get_key, 0, 0);
-		function_map = Hash_NewTable (1021, func_map_get_key, 0, 0);
+		overloaded_functions = Hash_NewTable (1021, ol_func_get_key, 0, 0, 0);
+		function_map = Hash_NewTable (1021, func_map_get_key, 0, 0, 0);
 	}
 
 	name = save_string (name);
diff --git a/tools/qfcc/source/grab.c b/tools/qfcc/source/grab.c
index 520c40492..27f726519 100644
--- a/tools/qfcc/source/grab.c
+++ b/tools/qfcc/source/grab.c
@@ -105,8 +105,8 @@ do_grab (const char *token)
 		size_t      i;
 
 		initialized = 1;
-		frame_tab = Hash_NewTable (1021, frame_get_key, frame_free, 0);
-		grab_tab = Hash_NewTable (1021, frame_get_key, 0, 0);
+		frame_tab = Hash_NewTable (1021, frame_get_key, frame_free, 0, 0);
+		grab_tab = Hash_NewTable (1021, frame_get_key, 0, 0, 0);
 		for (i = 0; i < sizeof (grab_list) / sizeof (grab_list[0]); i++)
 			Hash_Add (grab_tab, &grab_list[i]);
 	}
diff --git a/tools/qfcc/source/linker.c b/tools/qfcc/source/linker.c
index de107d1b4..017461de0 100644
--- a/tools/qfcc/source/linker.c
+++ b/tools/qfcc/source/linker.c
@@ -642,14 +642,14 @@ linker_begin (void)
 
 	linker_current_file = dstring_newstr ();
 
-	extern_data_defs = Hash_NewTable (16381, defs_get_key, 0, 0);
-	defined_data_defs = Hash_NewTable (16381, defs_get_key, 0, 0);
+	extern_data_defs = Hash_NewTable (16381, defs_get_key, 0, 0, 0);
+	defined_data_defs = Hash_NewTable (16381, defs_get_key, 0, 0, 0);
 
-	extern_field_defs = Hash_NewTable (16381, defs_get_key, 0, 0);
-	defined_field_defs = Hash_NewTable (16381, defs_get_key, 0, 0);
+	extern_field_defs = Hash_NewTable (16381, defs_get_key, 0, 0, 0);
+	defined_field_defs = Hash_NewTable (16381, defs_get_key, 0, 0, 0);
 
-	extern_type_defs = Hash_NewTable (16381, defs_get_key, 0, 0);
-	defined_type_defs = Hash_NewTable (16381, defs_get_key, 0, 0);
+	extern_type_defs = Hash_NewTable (16381, defs_get_key, 0, 0, 0);
+	defined_type_defs = Hash_NewTable (16381, defs_get_key, 0, 0, 0);
 
 	work_strings = strpool_new ();
 	work_code = codespace_new ();
diff --git a/tools/qfcc/source/method.c b/tools/qfcc/source/method.c
index e8e342c7a..458fb00b2 100644
--- a/tools/qfcc/source/method.c
+++ b/tools/qfcc/source/method.c
@@ -113,7 +113,8 @@ new_method (type_t *ret_type, param_t *selector, param_t *opt_params)
 	meth->def = 0;
 
 	if (!known_methods)
-		known_methods = Hash_NewTable (1021, method_get_key, method_free, 0);
+		known_methods = Hash_NewTable (1021, method_get_key,
+									   method_free, 0, 0);
 	Hash_Add (known_methods, meth);
 
 	return meth;
@@ -230,7 +231,7 @@ methodset_t *
 new_methodset (void)
 {
 	methodset_t *s = malloc (sizeof (*s));
-	s->tab = Hash_NewTable (31, 0, 0, 0);
+	s->tab = Hash_NewTable (31, 0, 0, 0, 0);
 	Hash_SetHashCompare (s->tab, methodset_get_hash, methodset_compare);
 	return s;
 }
@@ -455,9 +456,9 @@ selector_index (const char *sel_id)
 	selector_t *sel = &_sel;
 
 	if (!sel_hash) {
-		sel_hash = Hash_NewTable (1021, 0, 0, 0);
+		sel_hash = Hash_NewTable (1021, 0, 0, 0, 0);
 		Hash_SetHashCompare (sel_hash, sel_get_hash, sel_compare);
-		sel_index_hash = Hash_NewTable (1021, 0, 0, 0);
+		sel_index_hash = Hash_NewTable (1021, 0, 0, 0, 0);
 		Hash_SetHashCompare (sel_index_hash, sel_index_get_hash,
 							 sel_index_compare);
 	}
diff --git a/tools/qfcc/source/opcodes.c b/tools/qfcc/source/opcodes.c
index bbf10250a..045d14404 100644
--- a/tools/qfcc/source/opcodes.c
+++ b/tools/qfcc/source/opcodes.c
@@ -139,9 +139,9 @@ opcode_init (void)
 		Hash_FlushTable (opcode_type_table);
 	} else {
 		PR_Opcode_Init ();
-		opcode_type_table = Hash_NewTable (1021, 0, opcode_free, 0);
+		opcode_type_table = Hash_NewTable (1021, 0, opcode_free, 0, 0);
 		Hash_SetHashCompare (opcode_type_table, get_hash, compare);
-		opcode_void_table = Hash_NewTable (1021, get_key, 0, 0);
+		opcode_void_table = Hash_NewTable (1021, get_key, 0, 0, 0);
 	}
 	for (op = pr_opcodes; op->name; op++) {
 		if (op->min_version > options.code.progsversion)
diff --git a/tools/qfcc/source/qc-lex.l b/tools/qfcc/source/qc-lex.l
index 9d5c5a1b9..3406380ef 100644
--- a/tools/qfcc/source/qc-lex.l
+++ b/tools/qfcc/source/qc-lex.l
@@ -439,10 +439,10 @@ keyword_or_id (char *token)
 	if (!keyword_tab) {
 		size_t      i;
 
-		keyword_tab = Hash_NewTable (253, keyword_get_key, 0, 0);
-		qf_keyword_tab = Hash_NewTable (253, keyword_get_key, 0, 0);
-		at_keyword_tab = Hash_NewTable (253, keyword_get_key, 0, 0);
-		obj_keyword_tab = Hash_NewTable (253, keyword_get_key, 0, 0);
+		keyword_tab = Hash_NewTable (253, keyword_get_key, 0, 0, 0);
+		qf_keyword_tab = Hash_NewTable (253, keyword_get_key, 0, 0, 0);
+		at_keyword_tab = Hash_NewTable (253, keyword_get_key, 0, 0, 0);
+		obj_keyword_tab = Hash_NewTable (253, keyword_get_key, 0, 0, 0);
 
 		#define NUMKEYS(_k) (sizeof (_k) / sizeof (_k[0]))
 
diff --git a/tools/qfcc/source/qfprogs.c b/tools/qfcc/source/qfprogs.c
index 02f05bce9..8a8f2ffc0 100644
--- a/tools/qfcc/source/qfprogs.c
+++ b/tools/qfcc/source/qfprogs.c
@@ -247,7 +247,7 @@ init_qf (void)
 
 	PR_Init (&pr);
 
-	func_tab = Hash_NewTable (1021, 0, 0, 0);
+	func_tab = Hash_NewTable (1021, 0, 0, 0, 0);
 	Hash_SetHashCompare (func_tab, func_hash, func_compare);
 }
 
diff --git a/tools/qfcc/source/qp-lex.l b/tools/qfcc/source/qp-lex.l
index 423aaf4e0..5947f5846 100644
--- a/tools/qfcc/source/qp-lex.l
+++ b/tools/qfcc/source/qp-lex.l
@@ -248,7 +248,7 @@ keyword_or_id (const char *token)
 
 	if (!keyword_tab) {
 		size_t      i;
-		keyword_tab = Hash_NewTable (1021, keyword_get_key, 0, 0);
+		keyword_tab = Hash_NewTable (1021, keyword_get_key, 0, 0, 0);
 		for (i = 0; i < sizeof (keywords) / sizeof (keywords[0]); i++)
 			Hash_Add (keyword_tab, &keywords[i]);
 	}
diff --git a/tools/qfcc/source/strpool.c b/tools/qfcc/source/strpool.c
index 0b59d5b9d..8fb7642e6 100644
--- a/tools/qfcc/source/strpool.c
+++ b/tools/qfcc/source/strpool.c
@@ -63,7 +63,7 @@ strpool_new (void)
 {
 	strpool_t  *strpool = calloc (1, sizeof (strpool_t));
 
-	strpool->str_tab = Hash_NewTable (16381, strpool_get_key, 0, strpool);
+	strpool->str_tab = Hash_NewTable (16381, strpool_get_key, 0, strpool, 0);
 	strpool->size = 1;
 	strpool->max_size = 16384;
 	strpool->strings = malloc (strpool->max_size);
@@ -77,7 +77,7 @@ strpool_build (const char *strings, int size)
 	intptr_t    s;
 
 	strpool_t  *strpool = malloc (sizeof (strpool_t));
-	strpool->str_tab = Hash_NewTable (16381, strpool_get_key, 0, strpool);
+	strpool->str_tab = Hash_NewTable (16381, strpool_get_key, 0, strpool, 0);
 	strpool->size = size + (*strings != 0);
 	strpool->max_size = (strpool->size + 16383) & ~16383;
 	strpool->strings = malloc (strpool->max_size);
@@ -131,7 +131,7 @@ save_string (const char *str)
 {
 	char       *s;
 	if (!saved_strings)
-		saved_strings = Hash_NewTable (16381, ss_get_key, 0, 0);
+		saved_strings = Hash_NewTable (16381, ss_get_key, 0, 0, 0);
 	s = Hash_Find (saved_strings, str);
 	if (s)
 		return s;
diff --git a/tools/qfcc/source/switch.c b/tools/qfcc/source/switch.c
index 967a7b73f..88ba6a60e 100644
--- a/tools/qfcc/source/switch.c
+++ b/tools/qfcc/source/switch.c
@@ -166,7 +166,7 @@ new_switch_block (void)
 	switch_block_t *switch_block = malloc (sizeof (switch_block_t));
 
 	SYS_CHECKMEM (switch_block);
-	switch_block->labels = Hash_NewTable (127, 0, 0, 0);
+	switch_block->labels = Hash_NewTable (127, 0, 0, 0, 0);
 	Hash_SetHashCompare (switch_block->labels, get_hash, compare);
 	switch_block->test = 0;
 	return switch_block;
diff --git a/tools/qfcc/source/symtab.c b/tools/qfcc/source/symtab.c
index 353e29142..961c00b1a 100644
--- a/tools/qfcc/source/symtab.c
+++ b/tools/qfcc/source/symtab.c
@@ -106,7 +106,7 @@ new_symtab (symtab_t *parent, stab_type_e type)
 	symtab->type = type;
 	if (symtab->type == stab_global)
 		tabsize = 1023;
-	symtab->tab = Hash_NewTable (tabsize, sym_getkey, 0, 0);
+	symtab->tab = Hash_NewTable (tabsize, sym_getkey, 0, 0, 0);
 	symtab->symtail = &symtab->symbols;
 	return symtab;
 }
diff --git a/tools/qfcc/source/value.c b/tools/qfcc/source/value.c
index 2ee44db06..3233385bf 100644
--- a/tools/qfcc/source/value.c
+++ b/tools/qfcc/source/value.c
@@ -640,41 +640,47 @@ clear_immediates (void)
 		Hash_FlushTable (integer_imm_defs);
 		Hash_FlushTable (double_imm_defs);
 	} else {
-		value_table = Hash_NewTable (16381, 0, 0, 0);
+		value_table = Hash_NewTable (16381, 0, 0, 0, 0);
 		Hash_SetHashCompare (value_table, value_get_hash, value_compare);
 
-		string_imm_defs = Hash_NewTable (16381, 0, imm_free, &string_imm_defs);
+		string_imm_defs = Hash_NewTable (16381, 0, imm_free,
+										 &string_imm_defs, 0);
 		Hash_SetHashCompare (string_imm_defs, imm_get_hash, imm_compare);
 
-		float_imm_defs = Hash_NewTable (16381, 0, imm_free, &float_imm_defs);
+		float_imm_defs = Hash_NewTable (16381, 0, imm_free,
+										&float_imm_defs, 0);
 		Hash_SetHashCompare (float_imm_defs, imm_get_hash, imm_compare);
 
-		vector_imm_defs = Hash_NewTable (16381, 0, imm_free, &vector_imm_defs);
+		vector_imm_defs = Hash_NewTable (16381, 0, imm_free,
+										 &vector_imm_defs, 0);
 		Hash_SetHashCompare (vector_imm_defs, imm_get_hash, imm_compare);
 
-		entity_imm_defs = Hash_NewTable (16381, 0, imm_free, &entity_imm_defs);
+		entity_imm_defs = Hash_NewTable (16381, 0, imm_free,
+										 &entity_imm_defs, 0);
 		Hash_SetHashCompare (entity_imm_defs, imm_get_hash, imm_compare);
 
-		field_imm_defs = Hash_NewTable (16381, 0, imm_free, &field_imm_defs);
+		field_imm_defs = Hash_NewTable (16381, 0, imm_free,
+										&field_imm_defs, 0);
 		Hash_SetHashCompare (field_imm_defs, imm_get_hash, imm_compare);
 
-		func_imm_defs = Hash_NewTable (16381, 0, imm_free, &func_imm_defs);
+		func_imm_defs = Hash_NewTable (16381, 0, imm_free,
+									   &func_imm_defs, 0);
 		Hash_SetHashCompare (func_imm_defs, imm_get_hash, imm_compare);
 
-		pointer_imm_defs =
-			Hash_NewTable (16381, 0, imm_free, &pointer_imm_defs);
+		pointer_imm_defs = Hash_NewTable (16381, 0, imm_free,
+										  &pointer_imm_defs, 0);
 		Hash_SetHashCompare (pointer_imm_defs, imm_get_hash, imm_compare);
 
-		quaternion_imm_defs =
-			Hash_NewTable (16381, 0, imm_free, &quaternion_imm_defs);
+		quaternion_imm_defs = Hash_NewTable (16381, 0, imm_free,
+											 &quaternion_imm_defs, 0);
 		Hash_SetHashCompare (quaternion_imm_defs, imm_get_hash, imm_compare);
 
-		integer_imm_defs =
-			Hash_NewTable (16381, 0, imm_free, &integer_imm_defs);
+		integer_imm_defs = Hash_NewTable (16381, 0, imm_free,
+										  &integer_imm_defs, 0);
 		Hash_SetHashCompare (integer_imm_defs, imm_get_hash, imm_compare);
 
-		double_imm_defs =
-			Hash_NewTable (16381, 0, imm_free, &double_imm_defs);
+		double_imm_defs = Hash_NewTable (16381, 0, imm_free,
+										 &double_imm_defs, 0);
 		Hash_SetHashCompare (double_imm_defs, imm_get_hash, imm_compare);
 	}
 

From 585b33c111cf18f3a1ad896dbc657d5382fbe0e5 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 25 Mar 2020 16:18:14 +0900
Subject: [PATCH 0967/1519] [qwaq] Close up race-condition hole

After a lot of thought, I have come to the conclusion that the weird
crash the other day was caused by a race while the command ring buffer
had just been emptied: the command submission code opened up space for
writing, threads switched, and command processing saw the available data
and pounced on it before the submit code could write valid data. Thus
include the while header in the lock, and move the loop-end release
outside the lock. It may be a little confusing, but it seems to work.
---
 ruamoko/qwaq/qwaq-curses.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-curses.c b/ruamoko/qwaq/qwaq-curses.c
index 8c1d30c7d..d83f59c15 100644
--- a/ruamoko/qwaq/qwaq-curses.c
+++ b/ruamoko/qwaq/qwaq-curses.c
@@ -640,10 +640,14 @@ process_commands (qwaq_resources_t *res)
 		ret = pthread_cond_timedwait (&res->command_cond.rcond,
 									  &res->command_cond.mut, &timeout);
 	}
-	pthread_mutex_unlock (&res->command_cond.mut);
-
+	// The mutex is unlocked at the top of the loop and locked again
+	// (for broadcast) at the bottom, then finally unlocked after the loop.
+	// It should be only the data availability check that's not threadsafe
+	// as the mutex is not released until after the data has been written to
+	// the buffer.
 	while ((avail = RB_DATA_AVAILABLE (res->command_queue)) >= 2
 		   && avail >= (len = RB_PEEK_DATA (res->command_queue, 1))) {
+		pthread_mutex_unlock (&res->command_cond.mut);
 		dump_command (res, len);
 		qwaq_commands cmd = RB_PEEK_DATA (res->command_queue, 0);
 		switch (cmd) {
@@ -738,8 +742,10 @@ process_commands (qwaq_resources_t *res)
 		pthread_mutex_lock (&res->command_cond.mut);
 		RB_DROP_DATA (res->command_queue, len);
 		pthread_cond_broadcast (&res->command_cond.wcond);
-		pthread_mutex_unlock (&res->command_cond.mut);
+		// unlocked at top of top if there's more data, otherwise just after
+		// the loop
 	}
+	pthread_mutex_unlock (&res->command_cond.mut);
 }
 
 static int

From 7b9177ec568fd139c84829b78572fc650e6dc11c Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 25 Mar 2020 17:29:08 +0900
Subject: [PATCH 0968/1519] [qwaq] Extract the double-clicked word

The plan is to use it for variable lookups etc.
---
 ruamoko/qwaq/qwaq-debugger.r      |  6 +++-
 ruamoko/qwaq/qwaq-editbuffer-bi.c | 35 +++++++++++++++++++++
 ruamoko/qwaq/qwaq-editbuffer.h    |  1 +
 ruamoko/qwaq/qwaq-editbuffer.r    |  1 +
 ruamoko/qwaq/qwaq-editor.h        |  1 +
 ruamoko/qwaq/qwaq-editor.r        | 51 +++++++++++++++++++++++++------
 6 files changed, 84 insertions(+), 11 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-debugger.r b/ruamoko/qwaq/qwaq-debugger.r
index 7000836c0..db5e78eb0 100644
--- a/ruamoko/qwaq/qwaq-debugger.r
+++ b/ruamoko/qwaq/qwaq-debugger.r
@@ -79,8 +79,12 @@
 
 -(void)key_event: (ed_event_t *)_event
 {
+	Editor     *file = _event.editor;
 	qwaq_event_t *event = _event.event;
-	if (event.what == qe_keydown) {
+	if (event.what == qe_mouseclick) {
+		printf ("%s\n", [file getWordAt: {event.mouse.x, event.mouse.y}]);
+		[source_window redraw];
+	} else if (event.what == qe_keydown) {
 		switch (event.key.code) {
 			case QFK_F7:
 				qdb_set_trace (debug_target, 1);
diff --git a/ruamoko/qwaq/qwaq-editbuffer-bi.c b/ruamoko/qwaq/qwaq-editbuffer-bi.c
index 02ae29370..9f457bf10 100644
--- a/ruamoko/qwaq/qwaq-editbuffer-bi.c
+++ b/ruamoko/qwaq/qwaq-editbuffer-bi.c
@@ -277,6 +277,25 @@ getEOL (txtbuffer_t *buffer, unsigned ptr)
 	return ptr;
 }
 
+static always_inline void
+readString (txtbuffer_t *buffer, eb_sel_t *sel, char *str)
+{
+	unsigned    start = sel->start;
+	unsigned    length = sel->length;
+	unsigned    end = sel->start + sel->length;
+	const char *ptr = buffer->text + spanGap (buffer, start);
+	if ((start < buffer->gapOffset && end <= buffer->gapOffset)
+		|| start > buffer->gapOffset) {
+		memcpy (str, ptr, length);
+	} else {
+		length = buffer->gapOffset - start;
+		memcpy (str, ptr, length);
+		str += length;
+		ptr += length + buffer->gapOffset;
+		memcpy (str, ptr, sel->length - length);
+	}
+}
+
 static always_inline unsigned
 getBOL (txtbuffer_t *buffer, unsigned ptr)
 {
@@ -773,6 +792,21 @@ bi_i_EditBuffer__getEOT (progs_t *pr)
 	R_INT (pr) = buffer->txtbuffer->textSize;
 }
 
+static void
+bi_i_EditBuffer__readString_ (progs_t *pr)
+{
+	qwaq_ebresources_t *res = PR_Resources_Find (pr, "qwaq-editbuffer");
+	int         buffer_id = P_STRUCT (pr, qwaq_editbuffer_t, 0).buffer;
+	editbuffer_t *buffer = get_editbuffer (res, __FUNCTION__, buffer_id);
+	__auto_type selection = &P_PACKED (pr, eb_sel_t, 2);
+
+	char       *str = alloca (selection->length + 1);
+	str[selection->length] = 0;
+	readString (buffer->txtbuffer, selection, str);
+
+	RETURN_STRING (pr, str);
+}
+
 static void
 bi_i_EditBuffer__countLines_ (progs_t *pr)
 {
@@ -901,6 +935,7 @@ static builtin_t builtins[] = {
 	{"_i_EditBuffer__getEOL_",			bi_i_EditBuffer__getEOL_,		-1},
 	{"_i_EditBuffer__getBOT",			bi_i_EditBuffer__getBOT,		-1},
 	{"_i_EditBuffer__getEOT",			bi_i_EditBuffer__getEOT,		-1},
+	{"_i_EditBuffer__readString_",		bi_i_EditBuffer__readString_,	-1},
 	{"_i_EditBuffer__countLines_",		bi_i_EditBuffer__countLines_,	-1},
 	{"_i_EditBuffer__search_for_direction_",
 								bi_i_EditBuffer__search_for_direction_,	-1},
diff --git a/ruamoko/qwaq/qwaq-editbuffer.h b/ruamoko/qwaq/qwaq-editbuffer.h
index 4e5062ab2..ad2e6084e 100644
--- a/ruamoko/qwaq/qwaq-editbuffer.h
+++ b/ruamoko/qwaq/qwaq-editbuffer.h
@@ -49,6 +49,7 @@ typedef struct eb_color_s {
 - (unsigned) getEOL: (unsigned) linePtr;
 - (unsigned) getBOT;
 - (unsigned) getEOT;
+- (string) readString: (eb_sel_t) selection;
 
 - (unsigned) countLines: (eb_sel_t) selection;
 - (eb_sel_t) search: (eb_sel_t) selection
diff --git a/ruamoko/qwaq/qwaq-editbuffer.r b/ruamoko/qwaq/qwaq-editbuffer.r
index ce12a6edf..d0900a108 100644
--- a/ruamoko/qwaq/qwaq-editbuffer.r
+++ b/ruamoko/qwaq/qwaq-editbuffer.r
@@ -26,6 +26,7 @@
 - (unsigned) getEOL: (unsigned) linePtr = #0;
 - (unsigned) getBOT = #0;
 - (unsigned) getEOT = #0;
+- (string) readString: (eb_sel_t) selection = #0;
 
 - (unsigned) countLines: (eb_sel_t) selection = #0;
 - (eb_sel_t) search: (eb_sel_t) selection
diff --git a/ruamoko/qwaq/qwaq-editor.h b/ruamoko/qwaq/qwaq-editor.h
index 29bf1c8b7..b861e15ad 100644
--- a/ruamoko/qwaq/qwaq-editor.h
+++ b/ruamoko/qwaq/qwaq-editor.h
@@ -41,6 +41,7 @@ typedef struct ed_event_s {
 -recenter:(int) force;
 -gotoLine:(unsigned) line;
 -highlightLine;
+-(string)getWordAt:(Point) pos;	// view relative coordinates
 @end
 
 #endif//__qwaq_editor_h
diff --git a/ruamoko/qwaq/qwaq-editor.r b/ruamoko/qwaq/qwaq-editor.r
index dfd863569..6bf9e3389 100644
--- a/ruamoko/qwaq/qwaq-editor.r
+++ b/ruamoko/qwaq/qwaq-editor.r
@@ -51,38 +51,57 @@
 	return self;
 }
 
--handleEvent:(qwaq_event_t *) event
+static int handleEvent (Editor *self, qwaq_event_t *event)
 {
-	// give any listeners a chance to override or extend event handling
-	_event.editor = self;
-	_event.event = event;
-	[onEvent respond: &_event];
 	if (event.what & qe_mouse) {
 		if (event.what == qe_mouseclick) {
 			if (event.mouse.buttons & (1 << 3)) {
 				[self scrollUp: 1];
+				return 1;
 			}
 			if (event.mouse.buttons & (1 << 4)) {
 				[self scrollDown: 1];
+				return 1;
 			}
 			if (event.mouse.buttons & (1 << 5)) {
 				[self scrollLeft: 1];
+				return 1;
 			}
 			if (event.mouse.buttons & (1 << 6)) {
 				[self scrollRight: 1];
+				return 1;
 			}
 		}
 	} else if (event.what == qe_keydown) {
 		switch (event.key.code) {
 			case QFK_PAGEUP:
-				[self scrollUp: ylen];
-				break;
+				[self scrollUp: self.ylen];
+				return 1;
 			case QFK_PAGEDOWN:
-				[self scrollDown: ylen];
-				break;
+				[self scrollDown: self.ylen];
+				return 1;
 		}
 	}
-	event.what = qe_none;
+	return 0;
+}
+
+-handleEvent:(qwaq_event_t *) event
+{
+	// give any listeners a chance to override or extend event handling
+	_event.editor = self;
+	_event.event = event;
+	if (event.what & qe_positional) {
+		event.mouse.x -= xpos;
+		event.mouse.y -= ypos;
+	}
+	[onEvent respond: &_event];
+	if (handleEvent (self, event)) {
+		event.what = qe_none;
+	}
+	if (event.what & qe_positional) {
+		event.mouse.x += xpos;
+		event.mouse.y += ypos;
+	}
 	return self;
 }
 
@@ -174,4 +193,16 @@
 	return self;
 }
 
+-(string)getWordAt:(Point) pos
+{
+	if (pos.x < 0 || pos.y < 0 || pos.x >= xlen || pos.y >= ylen) {
+		return nil;
+	}
+	pos.x += scroll.x;
+	unsigned lind = [buffer nextLine:base_index :pos.y];
+	unsigned cind = [buffer charPtr:lind at:pos.x];
+	eb_sel_t word = [buffer getWord: cind];
+	return [buffer readString:word];
+}
+
 @end

From 6f7ddf52acf67a60e296d4ac5e847da95e2304a8 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 25 Mar 2020 18:28:28 +0900
Subject: [PATCH 0969/1519] [gamecode] Add an exit debug event type

The VM never sends it because it cannot know if its exit is program exit
or just sub-program exit, but it's available for host systems to send.
---
 include/QF/progs.h  | 1 +
 ruamoko/qwaq/main.c | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/include/QF/progs.h b/include/QF/progs.h
index 841b586d3..a42ae8f1f 100644
--- a/include/QF/progs.h
+++ b/include/QF/progs.h
@@ -1695,6 +1695,7 @@ typedef enum {
 	prd_trace,
 	prd_breakpoint,
 	prd_watchpoint,
+	prd_exit,			// not sent by VM
 	prd_runerror,
 	prd_error,			// lower level error thann prd_runerror
 } prdebug_t;
diff --git a/ruamoko/qwaq/main.c b/ruamoko/qwaq/main.c
index 87df0a035..46e1d8e4b 100644
--- a/ruamoko/qwaq/main.c
+++ b/ruamoko/qwaq/main.c
@@ -232,6 +232,9 @@ run_progs (void *data)
 
 	PR_ExecuteProgram (thread->pr, thread->main_func);
 	PR_PopFrame (thread->pr);
+	if (thread->pr->debug_handler) {
+		thread->pr->debug_handler (prd_exit, thread->pr->debug_data);
+	}
 	thread->return_code = R_INT (thread->pr);
 	return thread;
 }

From 1f8cc7186c61c9212c799dbac6299b9e522b3714 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 25 Mar 2020 21:04:22 +0900
Subject: [PATCH 0970/1519] [qfcc] Hide "function" type behind an @

I'm not sure it's all that useful and thus it clutters the namespace.
---
 ruamoko/lib/Entity.r       | 4 ++--
 tools/qfcc/source/qc-lex.l | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ruamoko/lib/Entity.r b/ruamoko/lib/Entity.r
index 474bc3db1..e2ea25000 100644
--- a/ruamoko/lib/Entity.r
+++ b/ruamoko/lib/Entity.r
@@ -9,7 +9,7 @@
 typedef void () void_function;
 
 int PR_SetField (entity ent, string field, string value) = #0;
-function PR_FindFunction (string func) = #0;
+@function PR_FindFunction (string func) = #0;
 
 @static void ParseEntities (string ent_data);
 
@@ -66,7 +66,7 @@ function PR_FindFunction (string func) = #0;
 	local int count;
 	local string field, value;
 	local plitem_t keys;
-	local function func;
+	local @function func;
 	local Entity *e;
 
 	classname = PL_String (PL_ObjectForKey (dict, "classname"));
diff --git a/tools/qfcc/source/qc-lex.l b/tools/qfcc/source/qc-lex.l
index 3406380ef..cccc43afd 100644
--- a/tools/qfcc/source/qc-lex.l
+++ b/tools/qfcc/source/qc-lex.l
@@ -378,8 +378,8 @@ static keyword_t qf_keywords[] = {
 	{"double",		TYPE,	&type_double},
 	{"int",			TYPE,	&type_integer	},
 	{"unsigned",	TYPE,	&type_integer	},//FIXME
-	{"function",	TYPE,	&type_function	},
 
+	{"@function",	TYPE,	&type_function	},
 	{"@args",		ARGS,	0				},
 	{"@va_list",	TYPE,	&type_va_list	},
 	{"@param",		TYPE,	&type_param		},

From 48f737ecb6e49b47c0db09c9f98d05e4f566104f Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 25 Mar 2020 21:05:25 +0900
Subject: [PATCH 0971/1519] [gamecode] Tweak types in dfunction_t

Mostly minor corrections to make more sense when reading them.
---
 include/QF/pr_comp.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/QF/pr_comp.h b/include/QF/pr_comp.h
index 3c6ccc8fe..a84e56953 100644
--- a/include/QF/pr_comp.h
+++ b/include/QF/pr_comp.h
@@ -457,13 +457,13 @@ typedef struct dparmsize_s {
 
 typedef struct dfunction_s {
 	pr_int_t    first_statement;	// negative numbers are builtins
-	pr_int_t    parm_start;
+	pr_uint_t   parm_start;
 	pr_uint_t   locals;				// total ints of parms + locals
 
 	pr_uint_t   profile;			// runtime
 
 	string_t    s_name;
-	pr_int_t    s_file;				// source file defined in
+	string_t    s_file;				// source file defined in
 
 	pr_int_t    numparms;
 	dparmsize_t parm_size[MAX_PARMS];

From 52dcb0a6e21ca21993a17d2b8df0c44494306885 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 25 Mar 2020 22:36:04 +0900
Subject: [PATCH 0972/1519] [gamecode] Add G_PACKED macro

Not sure when I'll use it, but as it avoids the null pointer check, it
should make for faster access to structs when reading or writing
multiple fields.
---
 include/QF/progs.h | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/include/QF/progs.h b/include/QF/progs.h
index a42ae8f1f..3cd6a5c6c 100644
--- a/include/QF/progs.h
+++ b/include/QF/progs.h
@@ -362,6 +362,21 @@ void PR_Undefined (progs_t *pr, const char *type, const char *name) __attribute_
 */
 #define G_var(p,o,t)	((p)->pr_globals[o].t##_var)
 
+/** Access a global as an arbitray type.
+
+	More direct than G_STRUCT
+	\par QC type:
+		\c struct etc small enough to fit in a single parameter
+	\param p		pointer to ::progs_t VM struct
+	\param t		C type of the structure
+	\param o		offset into global data space
+	\return			structure lvalue. use & to make a pointer of the
+					appropriate type.
+
+	\hideinitializer
+*/
+#define G_PACKED(p,t,o)	(*(t *) &(p)->pr_globals[o])
+
 /** Access a float global. Can be assigned to.
 
 	\par QC type:

From 513bb868fc784ece78e72b66f13cdf6e42363a26 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 25 Mar 2020 22:37:38 +0900
Subject: [PATCH 0973/1519] [qfcc] Remove unsigned define

I had forgotten that qfcc supports the keyword, just not the type yet.
---
 ruamoko/qwaq/qwaq-debug.h      | 5 ++---
 ruamoko/qwaq/qwaq-editbuffer.h | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-debug.h b/ruamoko/qwaq/qwaq-debug.h
index 0eb13d4a5..11d6d6555 100644
--- a/ruamoko/qwaq/qwaq-debug.h
+++ b/ruamoko/qwaq/qwaq-debug.h
@@ -9,9 +9,8 @@ typedef enum {
 
 #ifdef __QFCC__
 
-//FIXME add unsigned to qfcc
-#ifndef unsigned
-#define unsigned int
+//FIXME finish unsigned in qfcc
+#ifndef umax
 #define umax 0x7fffffff
 #endif
 
diff --git a/ruamoko/qwaq/qwaq-editbuffer.h b/ruamoko/qwaq/qwaq-editbuffer.h
index ad2e6084e..67976d244 100644
--- a/ruamoko/qwaq/qwaq-editbuffer.h
+++ b/ruamoko/qwaq/qwaq-editbuffer.h
@@ -4,9 +4,8 @@
 #ifdef __QFCC__
 #include <Object.h>
 
-//FIXME add unsigned to qfcc
-#ifndef unsigned
-#define unsigned int
+//FIXME finish unsigned in qfcc
+#ifndef umax
 #define umax 0x7fffffff
 #endif
 

From 3ea16c2764ce2c4af1f1152e298559f2b69519d5 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 25 Mar 2020 22:39:17 +0900
Subject: [PATCH 0974/1519] [qwaq] Add support for getting data, defs and
 functions

This will allow for really probing the target progs.
---
 ruamoko/qwaq/qwaq-debug.c    | 150 +++++++++++++++++++++++++++++++++++
 ruamoko/qwaq/qwaq-debug.h    |  34 ++++++++
 ruamoko/qwaq/qwaq-debugger.r |   8 ++
 3 files changed, 192 insertions(+)

diff --git a/ruamoko/qwaq/qwaq-debug.c b/ruamoko/qwaq/qwaq-debug.c
index ea40ab2e4..fd63fc8aa 100644
--- a/ruamoko/qwaq/qwaq-debug.c
+++ b/ruamoko/qwaq/qwaq-debug.c
@@ -294,6 +294,150 @@ qdb_get_state (progs_t *pr)
 	R_PACKED (pr, qdb_state_t) = state;
 }
 
+static void
+qdb_get_data (progs_t *pr)
+{
+	__auto_type debug = PR_Resources_Find (pr, "qwaq-debug");
+	pointer_t   handle = P_INT (pr, 0);
+	qwaq_target_t *target = get_target (debug, __FUNCTION__, handle);
+	progs_t    *tpr = target->pr;
+	pointer_t   srcoff = P_POINTER (pr, 1);
+	unsigned    length = P_UINT (pr, 2);
+	pointer_t   dstoff = P_POINTER(pr, 3);
+
+	pr_type_t  *src = PR_GetPointer(tpr, srcoff);
+	pr_type_t  *dst = PR_GetPointer(pr, dstoff);
+
+	if (srcoff >= tpr->globals_size || srcoff + length >= tpr->globals_size) {
+		R_INT (pr) = -1;
+		return;
+	}
+	if (dstoff >= pr->globals_size || dstoff + length >= pr->globals_size) {
+		R_INT (pr) = -1;
+		return;
+	}
+	memcpy (dst, src, length * sizeof (pr_type_t));
+	R_INT (pr) = 0;
+}
+
+static void
+qdb_find_global (progs_t *pr)
+{
+	__auto_type debug = PR_Resources_Find (pr, "qwaq-debug");
+	pointer_t   handle = P_INT (pr, 0);
+	qwaq_target_t *target = get_target (debug, __FUNCTION__, handle);
+	progs_t    *tpr = target->pr;
+	const char *name = P_GSTRING (pr, 1);
+	pr_def_t   *def = PR_FindGlobal (tpr, name);
+
+	if (def) {
+		R_PACKED (pr, qdb_def_t).type_size = (def->size << 16) | def->type;
+		R_PACKED (pr, qdb_def_t).offset = def->ofs;
+		R_PACKED (pr, qdb_def_t).name = def->name;
+		R_PACKED (pr, qdb_def_t).type_encoding = def->type_encoding;
+	} else {
+		memset (&R_PACKED (pr, qdb_def_t), 0, sizeof (qdb_def_t));
+	}
+}
+
+static void
+qdb_find_field (progs_t *pr)
+{
+	__auto_type debug = PR_Resources_Find (pr, "qwaq-debug");
+	pointer_t   handle = P_INT (pr, 0);
+	qwaq_target_t *target = get_target (debug, __FUNCTION__, handle);
+	progs_t    *tpr = target->pr;
+	const char *name = P_GSTRING (pr, 1);
+	pr_def_t   *def = PR_FindField (tpr, name);
+
+	if (def) {
+		R_PACKED (pr, qdb_def_t).type_size = (def->size << 16) | def->type;
+		R_PACKED (pr, qdb_def_t).offset = def->ofs;
+		R_PACKED (pr, qdb_def_t).name = def->name;
+		R_PACKED (pr, qdb_def_t).type_encoding = def->type_encoding;
+	} else {
+		memset (&R_PACKED (pr, qdb_def_t), 0, sizeof (qdb_def_t));
+	}
+}
+
+static void
+qdb_find_function (progs_t *pr)
+{
+	__auto_type debug = PR_Resources_Find (pr, "qwaq-debug");
+	pointer_t   handle = P_INT (pr, 0);
+	qwaq_target_t *target = get_target (debug, __FUNCTION__, handle);
+	progs_t    *tpr = target->pr;
+	const char *name = P_GSTRING (pr, 1);
+	dfunction_t *func = PR_FindFunction (tpr, name);
+
+	R_INT (pr) = 0;
+	if (func) {
+		__auto_type f
+			= (qdb_function_t *) PR_Zone_Malloc (pr, sizeof (qdb_function_t));
+		f->staddr = func->first_statement;
+		f->local_data = func->parm_start;
+		f->local_size = func->locals;
+		f->profile = func->profile;
+		f->name = func->s_name;
+		f->file = func->s_file;
+		f->num_params = func->numparms;
+		R_INT (pr) = PR_SetPointer (pr, f);
+	}
+}
+
+static void
+qdb_find_auxfunction (progs_t *pr)
+{
+	__auto_type debug = PR_Resources_Find (pr, "qwaq-debug");
+	pointer_t   handle = P_INT (pr, 0);
+	qwaq_target_t *target = get_target (debug, __FUNCTION__, handle);
+	progs_t    *tpr = target->pr;
+	const char *name = P_GSTRING (pr, 1);
+	dfunction_t *func = PR_FindFunction (tpr, name);
+	size_t      fnum = func - tpr->pr_functions;
+	pr_auxfunction_t *aux_func = PR_Debug_MappedAuxFunction (tpr, fnum);
+
+	R_INT (pr) = 0;
+	if (aux_func) {
+		__auto_type f
+			= (qdb_auxfunction_t *) PR_Zone_Malloc (pr,
+												sizeof (qdb_auxfunction_t));
+		f->function = aux_func->function;
+		f->source_line = aux_func->source_line;
+		f->line_info = aux_func->line_info;
+		f->local_defs = aux_func->local_defs;
+		f->num_locals = aux_func->num_locals;
+		f->return_type = aux_func->return_type;
+		R_INT (pr) = PR_SetPointer (pr, f);
+	}
+}
+
+static void
+qdb_get_local_defs (progs_t *pr)
+{
+	__auto_type debug = PR_Resources_Find (pr, "qwaq-debug");
+	pointer_t   handle = P_INT (pr, 0);
+	qwaq_target_t *target = get_target (debug, __FUNCTION__, handle);
+	progs_t    *tpr = target->pr;
+	size_t      fnum = P_UINT (pr, 1);
+	pr_auxfunction_t *auxfunc = PR_Debug_MappedAuxFunction (tpr, fnum);
+
+	R_INT (pr) = 0;
+	if (auxfunc) {
+		pr_def_t   *defs = PR_Debug_LocalDefs (tpr, auxfunc);
+		__auto_type qdefs
+			= (qdb_def_t *) PR_Zone_Malloc (pr,
+								auxfunc->num_locals * sizeof (qdb_def_t));
+		for (unsigned i = 0; i < auxfunc->num_locals; i++) {
+			qdefs[i].type_size = (defs[i].size << 16) | defs[i].type;
+			qdefs[i].offset = defs[i].ofs;
+			qdefs[i].name = defs[i].name;
+			qdefs[i].type_encoding = defs[i].type_encoding;
+		}
+		R_INT (pr) = PR_SetPointer (pr, qdefs);
+	}
+}
+
 static builtin_t builtins[] = {
 	{"qdb_set_trace",			qdb_set_trace,			-1},
 	{"qdb_set_breakpoint",		qdb_set_breakpoint,		-1},
@@ -302,6 +446,12 @@ static builtin_t builtins[] = {
 	{"qdb_clear_watchpoint",	qdb_clear_watchpoint,	-1},
 	{"qdb_continue",			qdb_continue,			-1},
 	{"qdb_get_state",			qdb_get_state,			-1},
+	{"qdb_get_data",			qdb_get_data,			-1},
+	{"qdb_find_global",			qdb_find_global,		-1},
+	{"qdb_find_field",			qdb_find_field,			-1},
+	{"qdb_find_function",		qdb_find_function,		-1},
+	{"qdb_find_auxfunction",	qdb_find_auxfunction,	-1},
+	{"qdb_get_local_defs",		qdb_get_local_defs,		-1},
 	{}
 };
 
diff --git a/ruamoko/qwaq/qwaq-debug.h b/ruamoko/qwaq/qwaq-debug.h
index 11d6d6555..60d2952d8 100644
--- a/ruamoko/qwaq/qwaq-debug.h
+++ b/ruamoko/qwaq/qwaq-debug.h
@@ -25,6 +25,32 @@ typedef struct qdb_state_s {
 	unsigned    line;
 } qdb_state_t;
 
+typedef struct qdb_def_s {
+	unsigned    type_size;	// type in lower 16, size in upper 16
+	unsigned    offset;
+	string_t    name;
+	unsigned    type_encoding;
+} qdb_def_t;
+
+typedef struct qdb_function_s {
+	int         staddr;
+	unsigned    local_data;
+	unsigned    local_size;
+	unsigned	profile;
+	string_t    name;
+	string_t    file;
+	unsigned    num_params;
+} qdb_function_t;
+
+typedef struct qdb_auxfunction_s {
+	unsigned    function;
+	unsigned    source_line;
+	unsigned    line_info;
+	unsigned    local_defs;
+	unsigned    num_locals;
+	unsigned    return_type;
+} qdb_auxfunction_t;
+
 #ifdef __QFCC__
 
 typedef struct qdb_target_s { int handle; } qdb_target_t;
@@ -36,6 +62,14 @@ typedef struct qdb_target_s { int handle; } qdb_target_t;
 @extern int qdb_clear_watchpoint (qdb_target_t target);
 @extern int qdb_continue (qdb_target_t target);
 @extern qdb_state_t qdb_get_state (qdb_target_t target);
+@extern int qdb_get_data (qdb_target_t target, unsigned src, unsigned len,
+						  void *dst);
+@extern qdb_def_t qdb_find_global (qdb_target_t target, string name);
+@extern qdb_def_t qdb_find_field (qdb_target_t target, string name);
+@extern qdb_function_t *qdb_find_function (qdb_target_t target, string name);
+@extern qdb_auxfunction_t *qdb_find_auxfunction (qdb_target_t target,
+												 string name);
+@extern qdb_def_t *qdb_get_local_defs (qdb_target_t target, unsigned fnum);
 
 #else//GCC
 
diff --git a/ruamoko/qwaq/qwaq-debugger.r b/ruamoko/qwaq/qwaq-debugger.r
index db5e78eb0..3a927e873 100644
--- a/ruamoko/qwaq/qwaq-debugger.r
+++ b/ruamoko/qwaq/qwaq-debugger.r
@@ -115,3 +115,11 @@ int qdb_set_watchpoint (qdb_target_t target, unsigned offset) = #0;
 int qdb_clear_watchpoint (qdb_target_t target) = #0;
 int qdb_continue (qdb_target_t target) = #0;
 qdb_state_t qdb_get_state (qdb_target_t target) = #0;
+int qdb_get_data (qdb_target_t target, unsigned src, unsigned len,
+				  void *dst) = #0;
+qdb_def_t qdb_find_global (qdb_target_t target, string name) = #0;
+qdb_def_t qdb_find_field (qdb_target_t target, string name) = #0;
+qdb_function_t *qdb_find_function (qdb_target_t target, string name) = #0;
+qdb_auxfunction_t *qdb_find_auxfunction (qdb_target_t target,
+										 string name) = #0;
+qdb_def_t *qdb_get_local_defs (qdb_target_t target, unsigned fnum) = #0;

From 115541877a8a1ab83a5de079b9d9087e2fefee51 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 26 Mar 2020 09:01:39 +0900
Subject: [PATCH 0975/1519] [qwaq] Set up an application color palette

Nothing special, just all the combinations of the 8 colors
---
 ruamoko/qwaq/qwaq-app.h    |  2 ++
 ruamoko/qwaq/qwaq-app.r    | 12 +++++++-----
 ruamoko/qwaq/qwaq-editor.r |  5 +++--
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-app.h b/ruamoko/qwaq/qwaq-app.h
index 3facb0bc6..36cb41cef 100644
--- a/ruamoko/qwaq/qwaq-app.h
+++ b/ruamoko/qwaq/qwaq-app.h
@@ -11,6 +11,8 @@
 @class TextContext;
 @class View;
 
+extern int color_palette[64];
+
 @interface QwaqApplication: Object
 {
 	qwaq_event_t event;
diff --git a/ruamoko/qwaq/qwaq-app.r b/ruamoko/qwaq/qwaq-app.r
index 7a9e6ed97..19c9740c1 100644
--- a/ruamoko/qwaq/qwaq-app.r
+++ b/ruamoko/qwaq/qwaq-app.r
@@ -10,6 +10,8 @@ int fence;
 #include "qwaq-group.h"
 #include "qwaq-view.h"
 
+int color_palette[64];
+
 static AutoreleasePool *autorelease_pool;
 static void
 arp_start (void)
@@ -37,16 +39,16 @@ arp_end (void)
 	}
 
 	initialize ();
-	init_pair (1, COLOR_WHITE, COLOR_BLUE);
-	init_pair (2, COLOR_WHITE, COLOR_BLACK);
-	init_pair (3, COLOR_BLACK, COLOR_GREEN);
-	init_pair (4, COLOR_YELLOW, COLOR_RED);
+	for (int i = 1; i < 64; i++) {
+		init_pair (i, i & 0x7, i >> 3);
+		color_palette[i] = COLOR_PAIR (i);
+	}
 
 	screen = [TextContext screen];
 	screenSize = [screen size];
 	objects = [[Group alloc] initWithContext: screen owner: nil];
 
-	[screen bkgd: COLOR_PAIR (1)];
+	[screen bkgd: color_palette[047]];
 	[screen scrollok: 1];
 	[screen clear];
 	wrefresh (stdscr);//FIXME
diff --git a/ruamoko/qwaq/qwaq-editor.r b/ruamoko/qwaq/qwaq-editor.r
index 6bf9e3389..770b4158d 100644
--- a/ruamoko/qwaq/qwaq-editor.r
+++ b/ruamoko/qwaq/qwaq-editor.r
@@ -1,5 +1,5 @@
 #include <QF/keys.h>
-#include "color.h"
+#include "qwaq-app.h"
 #include "qwaq-editor.h"
 #include "qwaq-listener.h"
 
@@ -37,7 +37,8 @@
 	int *lbuf = [linebuffer buffer];
 	for (int y = 0; y < ylen; y++) {
 		lind = [buffer formatLine:lind from:scroll.x into:lbuf width:xlen
-				highlight:selection colors: {COLOR_PAIR (1), COLOR_PAIR(2)}];
+				highlight:selection colors: {color_palette[047],
+											 color_palette[007]}];
 		[textContext blitFromBuffer: linebuffer to: {xpos, ypos + y}
 							from: [linebuffer rect]];
 	}

From e579ffcb00b834f654f6db2a3e2722b9b9b87cae Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 26 Mar 2020 09:03:44 +0900
Subject: [PATCH 0976/1519] [qwaq] Add functions to get functions by number

---
 ruamoko/qwaq/qwaq-debug.c    | 92 +++++++++++++++++++++++++++---------
 ruamoko/qwaq/qwaq-debug.h    |  3 ++
 ruamoko/qwaq/qwaq-debugger.r |  3 ++
 3 files changed, 75 insertions(+), 23 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-debug.c b/ruamoko/qwaq/qwaq-debug.c
index fd63fc8aa..40effa817 100644
--- a/ruamoko/qwaq/qwaq-debug.c
+++ b/ruamoko/qwaq/qwaq-debug.c
@@ -361,15 +361,8 @@ qdb_find_field (progs_t *pr)
 }
 
 static void
-qdb_find_function (progs_t *pr)
+return_function (progs_t *pr, dfunction_t *func)
 {
-	__auto_type debug = PR_Resources_Find (pr, "qwaq-debug");
-	pointer_t   handle = P_INT (pr, 0);
-	qwaq_target_t *target = get_target (debug, __FUNCTION__, handle);
-	progs_t    *tpr = target->pr;
-	const char *name = P_GSTRING (pr, 1);
-	dfunction_t *func = PR_FindFunction (tpr, name);
-
 	R_INT (pr) = 0;
 	if (func) {
 		__auto_type f
@@ -385,6 +378,53 @@ qdb_find_function (progs_t *pr)
 	}
 }
 
+static void
+qdb_find_function (progs_t *pr)
+{
+	__auto_type debug = PR_Resources_Find (pr, "qwaq-debug");
+	pointer_t   handle = P_INT (pr, 0);
+	qwaq_target_t *target = get_target (debug, __FUNCTION__, handle);
+	progs_t    *tpr = target->pr;
+	const char *name = P_GSTRING (pr, 1);
+	dfunction_t *func = PR_FindFunction (tpr, name);
+
+	return_function (pr, func);
+}
+
+static void
+qdb_get_function (progs_t *pr)
+{
+	__auto_type debug = PR_Resources_Find (pr, "qwaq-debug");
+	pointer_t   handle = P_INT (pr, 0);
+	qwaq_target_t *target = get_target (debug, __FUNCTION__, handle);
+	progs_t    *tpr = target->pr;
+	pr_uint_t   fnum = P_INT (pr, 1);
+	dfunction_t *func = tpr->pr_functions + fnum;
+
+	if (fnum >= tpr->progs->numfunctions) {
+		func = 0;
+	}
+	return_function (pr, func);
+}
+
+static void
+return_auxfunction (progs_t *pr, pr_auxfunction_t *auxfunc)
+{
+	R_INT (pr) = 0;
+	if (auxfunc) {
+		__auto_type f
+			= (qdb_auxfunction_t *) PR_Zone_Malloc (pr,
+												sizeof (qdb_auxfunction_t));
+		f->function = auxfunc->function;
+		f->source_line = auxfunc->source_line;
+		f->line_info = auxfunc->line_info;
+		f->local_defs = auxfunc->local_defs;
+		f->num_locals = auxfunc->num_locals;
+		f->return_type = auxfunc->return_type;
+		R_INT (pr) = PR_SetPointer (pr, f);
+	}
+}
+
 static void
 qdb_find_auxfunction (progs_t *pr)
 {
@@ -394,22 +434,26 @@ qdb_find_auxfunction (progs_t *pr)
 	progs_t    *tpr = target->pr;
 	const char *name = P_GSTRING (pr, 1);
 	dfunction_t *func = PR_FindFunction (tpr, name);
-	size_t      fnum = func - tpr->pr_functions;
-	pr_auxfunction_t *aux_func = PR_Debug_MappedAuxFunction (tpr, fnum);
+	pr_uint_t   fnum = func - tpr->pr_functions;
+	pr_auxfunction_t *auxfunc = PR_Debug_MappedAuxFunction (tpr, fnum);
 
-	R_INT (pr) = 0;
-	if (aux_func) {
-		__auto_type f
-			= (qdb_auxfunction_t *) PR_Zone_Malloc (pr,
-												sizeof (qdb_auxfunction_t));
-		f->function = aux_func->function;
-		f->source_line = aux_func->source_line;
-		f->line_info = aux_func->line_info;
-		f->local_defs = aux_func->local_defs;
-		f->num_locals = aux_func->num_locals;
-		f->return_type = aux_func->return_type;
-		R_INT (pr) = PR_SetPointer (pr, f);
+	if (fnum >= tpr->progs->numfunctions) {
+		func = 0;
 	}
+	return_auxfunction (pr, auxfunc);
+}
+
+static void
+qdb_get_auxfunction (progs_t *pr)
+{
+	__auto_type debug = PR_Resources_Find (pr, "qwaq-debug");
+	pointer_t   handle = P_INT (pr, 0);
+	qwaq_target_t *target = get_target (debug, __FUNCTION__, handle);
+	progs_t    *tpr = target->pr;
+	pr_uint_t   fnum = P_UINT (pr, 1);
+	pr_auxfunction_t *auxfunc = PR_Debug_MappedAuxFunction (tpr, fnum);
+
+	return_auxfunction (pr, auxfunc);
 }
 
 static void
@@ -419,7 +463,7 @@ qdb_get_local_defs (progs_t *pr)
 	pointer_t   handle = P_INT (pr, 0);
 	qwaq_target_t *target = get_target (debug, __FUNCTION__, handle);
 	progs_t    *tpr = target->pr;
-	size_t      fnum = P_UINT (pr, 1);
+	pr_uint_t   fnum = P_UINT (pr, 1);
 	pr_auxfunction_t *auxfunc = PR_Debug_MappedAuxFunction (tpr, fnum);
 
 	R_INT (pr) = 0;
@@ -450,7 +494,9 @@ static builtin_t builtins[] = {
 	{"qdb_find_global",			qdb_find_global,		-1},
 	{"qdb_find_field",			qdb_find_field,			-1},
 	{"qdb_find_function",		qdb_find_function,		-1},
+	{"qdb_get_function",		qdb_get_function,		-1},
 	{"qdb_find_auxfunction",	qdb_find_auxfunction,	-1},
+	{"qdb_get_auxfunction",		qdb_get_auxfunction,	-1},
 	{"qdb_get_local_defs",		qdb_get_local_defs,		-1},
 	{}
 };
diff --git a/ruamoko/qwaq/qwaq-debug.h b/ruamoko/qwaq/qwaq-debug.h
index 60d2952d8..302f9cd6e 100644
--- a/ruamoko/qwaq/qwaq-debug.h
+++ b/ruamoko/qwaq/qwaq-debug.h
@@ -67,8 +67,11 @@ typedef struct qdb_target_s { int handle; } qdb_target_t;
 @extern qdb_def_t qdb_find_global (qdb_target_t target, string name);
 @extern qdb_def_t qdb_find_field (qdb_target_t target, string name);
 @extern qdb_function_t *qdb_find_function (qdb_target_t target, string name);
+@extern qdb_function_t *qdb_get_function (qdb_target_t target, unsigned fnum);
 @extern qdb_auxfunction_t *qdb_find_auxfunction (qdb_target_t target,
 												 string name);
+@extern qdb_auxfunction_t *qdb_get_auxfunction (qdb_target_t target,
+												unsigned fnum);
 @extern qdb_def_t *qdb_get_local_defs (qdb_target_t target, unsigned fnum);
 
 #else//GCC
diff --git a/ruamoko/qwaq/qwaq-debugger.r b/ruamoko/qwaq/qwaq-debugger.r
index 3a927e873..e1c014dff 100644
--- a/ruamoko/qwaq/qwaq-debugger.r
+++ b/ruamoko/qwaq/qwaq-debugger.r
@@ -120,6 +120,9 @@ int qdb_get_data (qdb_target_t target, unsigned src, unsigned len,
 qdb_def_t qdb_find_global (qdb_target_t target, string name) = #0;
 qdb_def_t qdb_find_field (qdb_target_t target, string name) = #0;
 qdb_function_t *qdb_find_function (qdb_target_t target, string name) = #0;
+qdb_function_t *qdb_get_function (qdb_target_t target, unsigned fnum) = #0;
 qdb_auxfunction_t *qdb_find_auxfunction (qdb_target_t target,
 										 string name) = #0;
+qdb_auxfunction_t *qdb_get_auxfunction (qdb_target_t target,
+										unsigned fnum) = #0;
 qdb_def_t *qdb_get_local_defs (qdb_target_t target, unsigned fnum) = #0;

From 22d173068b4be7301452261291ba25ecf0406708 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 26 Mar 2020 09:04:31 +0900
Subject: [PATCH 0977/1519] [qwaq] Make a start on a locals viewer

It's just a data dump for now. Also, found a bug...
---
 ruamoko/qwaq/qwaq-debugger.h | 12 +++++++-
 ruamoko/qwaq/qwaq-debugger.r | 59 ++++++++++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+), 1 deletion(-)

diff --git a/ruamoko/qwaq/qwaq-debugger.h b/ruamoko/qwaq/qwaq-debugger.h
index 2a1e3a2b3..513ae211b 100644
--- a/ruamoko/qwaq/qwaq-debugger.h
+++ b/ruamoko/qwaq/qwaq-debugger.h
@@ -12,11 +12,21 @@
 
 @interface Debugger : Object
 {
+	qdb_target_t debug_target;
+
 	Window     *source_window;
 	ProxyView  *file_proxy;
 	Array      *files;
 	Editor     *current_file;
-	qdb_target_t debug_target;
+
+	Window     *locals_window;
+	View       *locals_view;
+
+	unsigned    current_fnum;
+	qdb_function_t *func;
+	qdb_auxfunction_t *aux_func;
+	qdb_def_t  *local_defs;
+	void       *local_data;
 }
 -(qdb_target_t)debug_target;
 -initWithTarget:(qdb_target_t) target;
diff --git a/ruamoko/qwaq/qwaq-debugger.r b/ruamoko/qwaq/qwaq-debugger.r
index e1c014dff..a90eb1216 100644
--- a/ruamoko/qwaq/qwaq-debugger.r
+++ b/ruamoko/qwaq/qwaq-debugger.r
@@ -58,6 +58,13 @@
 	[source_window insertSelected: (View *) file_proxy];
 	[source_window setTitle: [current_file filename]];
 	[source_window redraw];
+
+	locals_window = [[Window alloc] initWithRect: {{0, 0}, {40, 10}}];
+	[locals_window setBackground: color_palette[064]];
+	[locals_window setTitle: "Locals"];
+	locals_view = [[View alloc] initWithRect: {{1, 1}, {38, 8}}];
+	[locals_window insertSelected: locals_view];
+	[application addView: locals_window];
 }
 
 -(void) show_line
@@ -77,6 +84,57 @@
 	[source_window redraw];
 }
 
+static void
+update_current_func (Debugger *self, unsigned fnum)
+{
+	self.current_fnum = fnum;
+	if (self.aux_func) {
+		obj_free (self.aux_func);
+		self.aux_func = nil;
+	}
+	if (self.local_defs) {
+		obj_free (self.local_defs);
+	}
+	if (self.local_data) {
+		obj_free (self.local_data);
+	}
+	self.func = qdb_get_function (self.debug_target, fnum);
+	self.aux_func = qdb_get_auxfunction (self.debug_target, fnum);
+	if (self.aux_func) {
+		self.local_defs = qdb_get_local_defs (self.debug_target, fnum);
+	}
+	if (self.func) {
+		self.local_data = obj_malloc (self.func.local_size);
+	}
+}
+
+void traceon() = #0;
+
+-(void)update_watchvars
+{
+	qdb_state_t state = qdb_get_state (debug_target);
+	if (state.func != current_fnum) {
+		update_current_func (self, state.func);
+	}
+	if (!local_data) {
+		return;
+	}
+	qdb_get_data (debug_target, func.local_data, func.local_size, local_data);
+	[locals_view mvprintf:{0,0}, "%d", func.local_size];
+	for (int y = 1; y < [locals_view size].height; y++) {
+		unsigned    ind = (y - 1) * 4;
+		if (ind < func.local_size) {
+			[locals_view mvprintf:{0, y}, "%02x", ind];
+			for (int x = 0; x < 4 && ind < func.local_size; x++, ind++) {
+				[locals_view mvprintf:{x * 9 + 3, y}, "%08x", local_data[ind]];
+			}
+		} else {
+			break;
+		}
+	}
+	[TextContext refresh];
+}
+
 -(void)key_event: (ed_event_t *)_event
 {
 	Editor     *file = _event.editor;
@@ -103,6 +161,7 @@
 		[self setup];
 	}
 	[self show_line];
+	[self update_watchvars];
 	return self;
 }
 

From fd73daea4b5e5ff167855b28b5d558aab7d6295c Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 26 Mar 2020 09:07:19 +0900
Subject: [PATCH 0978/1519] [qwaq] Correct mangled params to qwaq_mvwvprintf

---
 ruamoko/qwaq/qwaq-curses.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-curses.c b/ruamoko/qwaq/qwaq-curses.c
index d83f59c15..d25604135 100644
--- a/ruamoko/qwaq/qwaq-curses.c
+++ b/ruamoko/qwaq/qwaq-curses.c
@@ -158,7 +158,8 @@ get_window (qwaq_resources_t *res, const char *name, int handle)
 	window_t   *window = window_get (res, handle);
 
 	if (!window || !window->win) {
-		PR_RunError (res->pr, "invalid window passed to %s", name + 5);
+		PR_RunError (res->pr, "invalid window %d passed to %s",
+					 handle, name + 5);
 	}
 	return window;
 }
@@ -1256,7 +1257,7 @@ bi_mvwvprintf (progs_t *pr)
 	const char *fmt = P_GSTRING (pr, 2);
 	__auto_type args = (pr_va_list_t *) &P_POINTER (pr, 3);
 
-	qwaq_mvwvprintf (pr, x, y, window_id, fmt, args);
+	qwaq_mvwvprintf (pr, window_id, x, y, fmt, args);
 }
 
 static void
@@ -1666,9 +1667,9 @@ bi_i_TextContext__mvvprintf_ (progs_t *pr)
 	int         window_id = P_STRUCT (pr, qwaq_textcontext_t, 0).window;
 	Point      *pos = &P_PACKED (pr, Point, 2);
 	const char *fmt = P_GSTRING (pr, 3);
-	__auto_type args = (pr_va_list_t *) &P_POINTER (pr, 4);
+	__auto_type args = &P_PACKED (pr, pr_va_list_t, 4);
 
-	qwaq_mvwvprintf (pr, pos->x, pos->y, window_id, fmt, args);
+	qwaq_mvwvprintf (pr, window_id, pos->x, pos->y, fmt, args);
 }
 
 static void

From 1f8301774c59e539e5fa3e841f53c262554904dd Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 26 Mar 2020 09:19:22 +0900
Subject: [PATCH 0979/1519] [qwaq] Fix over-consumption of editor events

This lets the window scroll again.
---
 ruamoko/qwaq/qwaq-debugger.r | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-debugger.r b/ruamoko/qwaq/qwaq-debugger.r
index a90eb1216..d944abcd5 100644
--- a/ruamoko/qwaq/qwaq-debugger.r
+++ b/ruamoko/qwaq/qwaq-debugger.r
@@ -135,24 +135,28 @@ void traceon() = #0;
 	[TextContext refresh];
 }
 
--(void)key_event: (ed_event_t *)_event
+static int
+key_event (Debugger *self, Editor *file, qwaq_event_t *event)
 {
-	Editor     *file = _event.editor;
-	qwaq_event_t *event = _event.event;
-	if (event.what == qe_mouseclick) {
+	if (event.what == qe_mouseclick && !(event.mouse.buttons & 0x78)) {
 		printf ("%s\n", [file getWordAt: {event.mouse.x, event.mouse.y}]);
-		[source_window redraw];
+		[self.source_window redraw];
 	} else if (event.what == qe_keydown) {
 		switch (event.key.code) {
 			case QFK_F7:
-				qdb_set_trace (debug_target, 1);
-				qdb_continue (debug_target);
-				break;
-			default:
-				return;
+				qdb_set_trace (self.debug_target, 1);
+				qdb_continue (self.debug_target);
+				return 1;
 		}
 	}
-	event.what = qe_none;
+	return 0;
+}
+
+-(void)key_event: (ed_event_t *)event
+{
+	if (key_event (self, event.editor, event.event)) {
+		event.event.what = qe_none;
+	}
 }
 
 -handleDebugEvent

From af0333a172d77a8ad02ba571eeb396362fa20380 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 26 Mar 2020 11:04:57 +0900
Subject: [PATCH 0980/1519] [qwaq] Ensure super's handleEvent is called

This fixes the inability to single-step (debug window couldn't regain
focus).
---
 ruamoko/qwaq/qwaq-button.r | 2 ++
 ruamoko/qwaq/qwaq-editor.r | 2 ++
 ruamoko/qwaq/qwaq-window.r | 3 ++-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ruamoko/qwaq/qwaq-button.r b/ruamoko/qwaq/qwaq-button.r
index 3f72d2ca8..a02a738c0 100644
--- a/ruamoko/qwaq/qwaq-button.r
+++ b/ruamoko/qwaq/qwaq-button.r
@@ -52,6 +52,8 @@
 {
 	ListenerGroup *action = nil;
 
+	[super handleEvent: event];
+
 	if (event.what & qe_mouse) {
 		switch ((qwaq_mouse_event) (event.what & qe_mouse)) {
 			case qe_mousedown:
diff --git a/ruamoko/qwaq/qwaq-editor.r b/ruamoko/qwaq/qwaq-editor.r
index 770b4158d..80b40bf1c 100644
--- a/ruamoko/qwaq/qwaq-editor.r
+++ b/ruamoko/qwaq/qwaq-editor.r
@@ -88,6 +88,8 @@ static int handleEvent (Editor *self, qwaq_event_t *event)
 
 -handleEvent:(qwaq_event_t *) event
 {
+	[super handleEvent: event];
+
 	// give any listeners a chance to override or extend event handling
 	_event.editor = self;
 	_event.event = event;
diff --git a/ruamoko/qwaq/qwaq-window.r b/ruamoko/qwaq/qwaq-window.r
index 8fde82d79..60c88bdd8 100644
--- a/ruamoko/qwaq/qwaq-window.r
+++ b/ruamoko/qwaq/qwaq-window.r
@@ -184,8 +184,9 @@
 
 -handleEvent: (qwaq_event_t *) event
 {
-	int         offset = event.what & qe_positional;
+	[super handleEvent: event];
 
+	int         offset = event.what & qe_positional;
 	if (offset) {
 		event.mouse.x -= xpos;
 		event.mouse.y -= ypos;

From 35bb3a38540fe09c56e18c20640163da07938cc0 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 26 Mar 2020 11:18:00 +0900
Subject: [PATCH 0981/1519] [qwaq] Raise windows when clicked

---
 ruamoko/qwaq/qwaq-group.r  | 1 +
 ruamoko/qwaq/qwaq-view.h   | 1 +
 ruamoko/qwaq/qwaq-view.r   | 5 +++++
 ruamoko/qwaq/qwaq-window.r | 7 +++++++
 4 files changed, 14 insertions(+)

diff --git a/ruamoko/qwaq/qwaq-group.r b/ruamoko/qwaq/qwaq-group.r
index 8743e995d..a78837c5a 100644
--- a/ruamoko/qwaq/qwaq-group.r
+++ b/ruamoko/qwaq/qwaq-group.r
@@ -76,6 +76,7 @@ makeFirst (Group *self, int viewIndex)
 
 	[self.views addObject: view];
 	[self.views removeObjectAtIndex: viewIndex];
+	[view raise];
 	return [self.views count] - 1;
 }
 
diff --git a/ruamoko/qwaq/qwaq-view.h b/ruamoko/qwaq/qwaq-view.h
index db4862929..76b3607d5 100644
--- a/ruamoko/qwaq/qwaq-view.h
+++ b/ruamoko/qwaq/qwaq-view.h
@@ -72,6 +72,7 @@ enum {
 -loseFocus;
 -(ListenerGroup *) onReceiveFocus;
 -(ListenerGroup *) onReleaseFocus;
+-raise;
 
 - (void) onMouseEnter: (Point) pos;
 - (void) onMouseLeave: (Point) pos;
diff --git a/ruamoko/qwaq/qwaq-view.r b/ruamoko/qwaq/qwaq-view.r
index 3300a0d05..7a5cd01f0 100644
--- a/ruamoko/qwaq/qwaq-view.r
+++ b/ruamoko/qwaq/qwaq-view.r
@@ -288,6 +288,11 @@ updateScreenCursor (View *view)
 	return onReleaseFocus;
 }
 
+-raise
+{
+	return self;
+}
+
 - (void) onMouseEnter: (Point) pos
 {
 }
diff --git a/ruamoko/qwaq/qwaq-window.r b/ruamoko/qwaq/qwaq-window.r
index 60c88bdd8..2d9c1b549 100644
--- a/ruamoko/qwaq/qwaq-window.r
+++ b/ruamoko/qwaq/qwaq-window.r
@@ -213,6 +213,13 @@
 	return self;
 }
 
+-raise
+{
+	top_panel (panel);
+	[self redraw];
+	return self;
+}
+
 -insert: (View *) view
 {
 	[objects insert: view];

From 1bd8e2ee8560a67fe5f055178edc13f910b71a88 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 26 Mar 2020 11:44:02 +0900
Subject: [PATCH 0982/1519] [gamecode] Add a param pointer to debug_handler

I decided I want events for VM enter/exit but enter needs to somehow
pass the function which will be executed (even if a builtin). A generic
void * param seemed the best idea, which meant the error string could be
passed via the param instead of a "global" string in the progs struct.
---
 include/QF/progs.h        |  3 +--
 libs/gamecode/pr_exec.c   | 11 +++++------
 libs/gamecode/pr_load.c   |  6 ++----
 ruamoko/qwaq/main.c       |  2 +-
 ruamoko/qwaq/qwaq-debug.c |  4 ++--
 5 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/include/QF/progs.h b/include/QF/progs.h
index 3cd6a5c6c..c393be5a5 100644
--- a/include/QF/progs.h
+++ b/include/QF/progs.h
@@ -1857,9 +1857,8 @@ struct progs_s {
 	/// \name debugging
 	///@{
 	struct prdeb_resources_s *pr_debug_resources;
-	void      (*debug_handler) (prdebug_t event, void *data);
+	void      (*debug_handler) (prdebug_t event, void *param, void *data);
 	void       *debug_data;
-	const char *error_string;
 	pr_type_t  *watch;
 	int         wp_conditional;
 	pr_type_t   wp_val;
diff --git a/libs/gamecode/pr_exec.c b/libs/gamecode/pr_exec.c
index 43681da79..425ec5f64 100644
--- a/libs/gamecode/pr_exec.c
+++ b/libs/gamecode/pr_exec.c
@@ -55,7 +55,7 @@
 VISIBLE void
 PR_RunError (progs_t * pr, const char *error, ...)
 {
-	dstring_t  *string = dstring_new ();
+	dstring_t  *string = dstring_new ();//FIXME leaks when debugging
 	va_list     argptr;
 
 	va_start (argptr, error);
@@ -63,8 +63,7 @@ PR_RunError (progs_t * pr, const char *error, ...)
 	va_end (argptr);
 
 	if (pr->debug_handler) {
-		pr->error_string = string->str;
-		pr->debug_handler (prd_runerror, pr->debug_data);
+		pr->debug_handler (prd_runerror, string->str, pr->debug_data);
 		// not expected to return, but if so, behave as if there was no handler
 	}
 
@@ -486,7 +485,7 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 
 		if (pr->pr_trace) {
 			if (pr->debug_handler) {
-				pr->debug_handler (prd_trace, pr->debug_data);
+				pr->debug_handler (prd_trace, 0, pr->debug_data);
 			} else {
 				PR_PrintStatement (pr, st, 1);
 			}
@@ -494,7 +493,7 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 
 		if (st->op & OP_BREAK) {
 			if (pr->debug_handler) {
-				pr->debug_handler (prd_breakpoint, pr->debug_data);
+				pr->debug_handler (prd_breakpoint, 0, pr->debug_data);
 			} else {
 				PR_RunError (pr, "breakpoint hit");
 			}
@@ -1714,7 +1713,7 @@ op_call:
 			if (!pr->wp_conditional
 				|| pr->watch->integer_var == pr->wp_val.integer_var) {
 				if (pr->debug_handler) {
-					pr->debug_handler (prd_watchpoint, pr->debug_data);
+					pr->debug_handler (prd_watchpoint, 0, pr->debug_data);
 				} else {
 					PR_RunError (pr, "watchpoint hit: %d -> %d",
 								 old_val.integer_var, pr->watch->integer_var);
diff --git a/libs/gamecode/pr_load.c b/libs/gamecode/pr_load.c
index 9ea30a037..dd405769a 100644
--- a/libs/gamecode/pr_load.c
+++ b/libs/gamecode/pr_load.c
@@ -326,7 +326,6 @@ PR_LoadProgsFile (progs_t *pr, QFile *file, int size)
 			def->type_encoding = xdef->type;
 		}
 	}
-	pr->error_string = 0;
 	pr->pr_trace = 0;
 	pr->pr_trace_depth = 0;
 	pr->pr_xfunction = 0;
@@ -483,15 +482,14 @@ VISIBLE void
 PR_Error (progs_t *pr, const char *error, ...)
 {
 	va_list     argptr;
-	dstring_t  *string = dstring_new ();
+	dstring_t  *string = dstring_new ();//FIXME leaks when debugging
 
 	va_start (argptr, error);
 	dvsprintf (string, error, argptr);
 	va_end (argptr);
 
 	if (pr->debug_handler) {
-		pr->error_string = string->str;
-		pr->debug_handler (prd_error, pr->debug_data);
+		pr->debug_handler (prd_error, string->str, pr->debug_data);
 		// not expected to return, but if so, behave as if there was no handler
 	}
 	Sys_Error ("%s: %s", pr->progs_name, string->str);
diff --git a/ruamoko/qwaq/main.c b/ruamoko/qwaq/main.c
index 46e1d8e4b..8c9650786 100644
--- a/ruamoko/qwaq/main.c
+++ b/ruamoko/qwaq/main.c
@@ -233,7 +233,7 @@ run_progs (void *data)
 	PR_ExecuteProgram (thread->pr, thread->main_func);
 	PR_PopFrame (thread->pr);
 	if (thread->pr->debug_handler) {
-		thread->pr->debug_handler (prd_exit, thread->pr->debug_data);
+		thread->pr->debug_handler (prd_exit, 0, thread->pr->debug_data);
 	}
 	thread->return_code = R_INT (thread->pr);
 	return thread;
diff --git a/ruamoko/qwaq/qwaq-debug.c b/ruamoko/qwaq/qwaq-debug.c
index 40effa817..b7fcab168 100644
--- a/ruamoko/qwaq/qwaq-debug.c
+++ b/ruamoko/qwaq/qwaq-debug.c
@@ -109,7 +109,7 @@ get_target (qwaq_debug_t *debug, const char *name, int handle)
 }
 
 static void
-qwaq_debug_handler (prdebug_t debug_event, void *data)
+qwaq_debug_handler (prdebug_t debug_event, void *param, void *data)
 {
 	__auto_type target = (qwaq_target_t *) data;
 	qwaq_debug_t *debug = target->debugger;
@@ -130,7 +130,7 @@ qwaq_debug_handler (prdebug_t debug_event, void *data)
 	pthread_cond_wait (&target->run_cond.rcond, &target->run_cond.mut);
 	pthread_mutex_unlock (&target->run_cond.mut);
 	if (debug_event == prd_runerror || debug_event == prd_error) {
-		pthread_exit ((void *) target->pr->error_string);
+		pthread_exit (param);
 	}
 }
 

From 2d5df34234d02ba6bd0e9bac5d7c0ab5d659c2d3 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 26 Mar 2020 12:30:32 +0900
Subject: [PATCH 0983/1519] [gamecode] Add VM enter/exit events

And rename prd_exit to prd_terminate (the idea is the host will
terminate the VM). This makes it possible for the debugger to pause the
VM before any code, even a builtin function, is executed. Breaks the
debugger source window, but only because it's not updating on file
change (I think).
---
 include/QF/progs.h      | 4 +++-
 libs/gamecode/pr_exec.c | 7 +++++++
 ruamoko/qwaq/main.c     | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/include/QF/progs.h b/include/QF/progs.h
index c393be5a5..c08bf12d5 100644
--- a/include/QF/progs.h
+++ b/include/QF/progs.h
@@ -1710,7 +1710,9 @@ typedef enum {
 	prd_trace,
 	prd_breakpoint,
 	prd_watchpoint,
-	prd_exit,			// not sent by VM
+	prd_subenter,
+	prd_subexit,		// current invocation of PR_ExecuteProgram finished
+	prd_terminate,		// not sent by VM
 	prd_runerror,
 	prd_error,			// lower level error thann prd_runerror
 } prdebug_t;
diff --git a/libs/gamecode/pr_exec.c b/libs/gamecode/pr_exec.c
index 425ec5f64..b0a7cb820 100644
--- a/libs/gamecode/pr_exec.c
+++ b/libs/gamecode/pr_exec.c
@@ -458,6 +458,10 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 	Sys_PushSignalHook (signal_hook, pr);
 	Sys_PushErrorHandler (error_handler, pr);
 
+	if (pr->debug_handler) {
+		pr->debug_handler (prd_subenter, &fnum, pr->debug_data);
+	}
+
 	if (!PR_CallFunction (pr, fnum)) {
 		// called a builtin instead of progs code
 		goto exit_program;
@@ -1723,6 +1727,9 @@ op_call:
 		}
 	}
 exit_program:
+	if (pr->debug_handler) {
+		pr->debug_handler (prd_subexit, 0, pr->debug_data);
+	}
 	pr->pr_argc = 0;
 	Sys_PopErrorHandler ();
 	Sys_PopSignalHook ();
diff --git a/ruamoko/qwaq/main.c b/ruamoko/qwaq/main.c
index 8c9650786..bbd66bac1 100644
--- a/ruamoko/qwaq/main.c
+++ b/ruamoko/qwaq/main.c
@@ -233,7 +233,7 @@ run_progs (void *data)
 	PR_ExecuteProgram (thread->pr, thread->main_func);
 	PR_PopFrame (thread->pr);
 	if (thread->pr->debug_handler) {
-		thread->pr->debug_handler (prd_exit, 0, thread->pr->debug_data);
+		thread->pr->debug_handler (prd_terminate, 0, thread->pr->debug_data);
 	}
 	thread->return_code = R_INT (thread->pr);
 	return thread;

From dbb3802740a214f7578e6d2e9c6b309086c2e346 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 26 Mar 2020 13:20:10 +0900
Subject: [PATCH 0984/1519] [qwaq] Transfer context to new view in proxy

This fixes the broken source window on file change.
---
 ruamoko/qwaq/qwaq-proxyview.r | 6 +++++-
 ruamoko/qwaq/qwaq-view.h      | 1 +
 ruamoko/qwaq/qwaq-view.r      | 7 ++++++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-proxyview.r b/ruamoko/qwaq/qwaq-proxyview.r
index a29b1dedd..e0f2bb469 100644
--- a/ruamoko/qwaq/qwaq-proxyview.r
+++ b/ruamoko/qwaq/qwaq-proxyview.r
@@ -21,12 +21,16 @@
 -setView:(View *) view
 {
 	int         state = [self.view state];
+	id<TextContext> context = [self.view context];
+
 	if (state & sfInFocus) {
 		[self.view loseFocus];
-		[self.view hide];
 	}
+	[self.view hide];
+	[self.view setContext:nil];
 
 	self.view = view;
+	[view setContext:context];
 	if (state & sfDrawn) {
 		[view draw];
 	}
diff --git a/ruamoko/qwaq/qwaq-view.h b/ruamoko/qwaq/qwaq-view.h
index 76b3607d5..b2c98c88b 100644
--- a/ruamoko/qwaq/qwaq-view.h
+++ b/ruamoko/qwaq/qwaq-view.h
@@ -59,6 +59,7 @@ enum {
 -(int) options;
 -(int) state;
 
+-(id<TextContext>)context;
 -setContext: (id<TextContext>) context;
 -draw;
 -hide;
diff --git a/ruamoko/qwaq/qwaq-view.r b/ruamoko/qwaq/qwaq-view.r
index 7a5cd01f0..707fd056e 100644
--- a/ruamoko/qwaq/qwaq-view.r
+++ b/ruamoko/qwaq/qwaq-view.r
@@ -35,7 +35,12 @@
 	[super dealloc];
 }
 
-- setContext: (id<TextContext>) context
+-(id<TextContext>)context
+{
+	return textContext;
+}
+
+-setContext: (id<TextContext>) context
 {
 	textContext = context;
 	return self;

From 30b97af65a00e7033d1d63758c3a1b5da20ec876 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 26 Mar 2020 13:21:05 +0900
Subject: [PATCH 0985/1519] [qwaq] Actually send on receive/release focus
 messages

Noticed while tracking down the proxy view switch issue.
---
 ruamoko/qwaq/qwaq-view.r | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ruamoko/qwaq/qwaq-view.r b/ruamoko/qwaq/qwaq-view.r
index 707fd056e..caeab8286 100644
--- a/ruamoko/qwaq/qwaq-view.r
+++ b/ruamoko/qwaq/qwaq-view.r
@@ -274,12 +274,14 @@ updateScreenCursor (View *view)
 -takeFocus
 {
 	state |= sfInFocus;
+	[onReceiveFocus respond:self];
 	return self;
 }
 
 -loseFocus
 {
 	state &= ~sfInFocus;
+	[onReleaseFocus respond:self];
 	return self;
 }
 

From a28e7417e6eed68013b8cabfe6dc28b86b429f99 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 26 Mar 2020 13:27:53 +0900
Subject: [PATCH 0986/1519] [qwaq] Make traceon and traceoff always available

Tired of adding and removing them all the time.
---
 ruamoko/qwaq/qwaq-debug.h    | 3 +++
 ruamoko/qwaq/qwaq-debugger.r | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-debug.h b/ruamoko/qwaq/qwaq-debug.h
index 302f9cd6e..e4de7c12c 100644
--- a/ruamoko/qwaq/qwaq-debug.h
+++ b/ruamoko/qwaq/qwaq-debug.h
@@ -74,6 +74,9 @@ typedef struct qdb_target_s { int handle; } qdb_target_t;
 												unsigned fnum);
 @extern qdb_def_t *qdb_get_local_defs (qdb_target_t target, unsigned fnum);
 
+@extern void traceon();
+@extern void traceoff();
+
 #else//GCC
 
 void QWAQ_Debug_Init (progs_t *pr);
diff --git a/ruamoko/qwaq/qwaq-debugger.r b/ruamoko/qwaq/qwaq-debugger.r
index d944abcd5..8beec60ec 100644
--- a/ruamoko/qwaq/qwaq-debugger.r
+++ b/ruamoko/qwaq/qwaq-debugger.r
@@ -108,8 +108,6 @@ update_current_func (Debugger *self, unsigned fnum)
 	}
 }
 
-void traceon() = #0;
-
 -(void)update_watchvars
 {
 	qdb_state_t state = qdb_get_state (debug_target);
@@ -171,6 +169,9 @@ key_event (Debugger *self, Editor *file, qwaq_event_t *event)
 
 @end
 
+void traceon() = #0;
+void traceoff() = #0;
+
 void qdb_set_trace (qdb_target_t target, int state) = #0;
 int qdb_set_breakpoint (qdb_target_t target, unsigned staddr) = #0;
 int qdb_clear_breakpoint (qdb_target_t target, unsigned staddr) = #0;

From 6e74f2a03fef8b496d1fb56bc53892de163769b6 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 26 Mar 2020 13:30:33 +0900
Subject: [PATCH 0987/1519] [qwaq] remove @ from externs

I had forgotten that extern worked and that @extern was for headers that
might be compiled in traditional or extended modes.
---
 ruamoko/qwaq/qwaq-app.h    |  2 +-
 ruamoko/qwaq/qwaq-curses.h | 82 +++++++++++++++++++-------------------
 ruamoko/qwaq/qwaq-debug.h  | 40 +++++++++----------
 ruamoko/qwaq/qwaq-rect.h   | 12 +++---
 4 files changed, 68 insertions(+), 68 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-app.h b/ruamoko/qwaq/qwaq-app.h
index 36cb41cef..c88d79cec 100644
--- a/ruamoko/qwaq/qwaq-app.h
+++ b/ruamoko/qwaq/qwaq-app.h
@@ -32,6 +32,6 @@ extern int color_palette[64];
 -run;
 @end
 
-@extern QwaqApplication *application;
+extern QwaqApplication *application;
 
 #endif//__qwaq_app_h
diff --git a/ruamoko/qwaq/qwaq-curses.h b/ruamoko/qwaq/qwaq-curses.h
index 111ada434..c43f08d13 100644
--- a/ruamoko/qwaq/qwaq-curses.h
+++ b/ruamoko/qwaq/qwaq-curses.h
@@ -84,55 +84,55 @@ typedef enum {
 typedef struct window_s *window_t;
 typedef struct panel_s *panel_t;
 
-@extern window_t stdscr;
+extern window_t stdscr;
 
-@extern void initialize (void);
-@extern window_t create_window (int xpos, int ypos, int xlen, int ylen);
-@extern void destroy_window (window_t win);
-@extern void mvwprintf (window_t win, int x, int y, string fmt, ...);
-@extern void wprintf (window_t win, string fmt, ...);
-@extern void wvprintf (window_t win, string fmt, @va_list args);
-@extern void mvwvprintf (window_t win, int x, int y,
+extern void initialize (void);
+extern window_t create_window (int xpos, int ypos, int xlen, int ylen);
+extern void destroy_window (window_t win);
+extern void mvwprintf (window_t win, int x, int y, string fmt, ...);
+extern void wprintf (window_t win, string fmt, ...);
+extern void wvprintf (window_t win, string fmt, @va_list args);
+extern void mvwvprintf (window_t win, int x, int y,
 						 string fmt, @va_list args);
-@extern void wrefresh (window_t win);
-@extern void mvwaddch (window_t win, int x, int y, int ch);
-@extern void waddch (window_t win, int ch);
-@extern void mvwaddstr (window_t win, int x, int y, string str);
-@extern void waddstr (window_t win, string str);
+extern void wrefresh (window_t win);
+extern void mvwaddch (window_t win, int x, int y, int ch);
+extern void waddch (window_t win, int ch);
+extern void mvwaddstr (window_t win, int x, int y, string str);
+extern void waddstr (window_t win, string str);
 
-@extern panel_t create_panel (window_t window);
-@extern void destroy_panel (panel_t panel);
-@extern void hide_panel (panel_t panel);
-@extern void show_panel (panel_t panel);
-@extern void top_panel (panel_t panel);
-@extern void bottom_panel (panel_t panel);
-@extern void move_panel (panel_t panel, int x, int y);
-@extern window_t panel_window (panel_t panel);
-@extern void update_panels (void);
-@extern void replace_panel (panel_t panel, window_t window);
-@extern void doupdate (void);
+extern panel_t create_panel (window_t window);
+extern void destroy_panel (panel_t panel);
+extern void hide_panel (panel_t panel);
+extern void show_panel (panel_t panel);
+extern void top_panel (panel_t panel);
+extern void bottom_panel (panel_t panel);
+extern void move_panel (panel_t panel, int x, int y);
+extern window_t panel_window (panel_t panel);
+extern void update_panels (void);
+extern void replace_panel (panel_t panel, window_t window);
+extern void doupdate (void);
 
-@extern int get_event (qwaq_event_t *event);
-@extern int max_colors (void);
-@extern int max_color_pairs (void);
-@extern int init_pair (int pair, int f, int b);
-@extern void wbkgd (window_t win, int ch);
-@extern void werase (window_t win);
-@extern void scrollok (window_t win, int flag);
+extern int get_event (qwaq_event_t *event);
+extern int max_colors (void);
+extern int max_color_pairs (void);
+extern int init_pair (int pair, int f, int b);
+extern void wbkgd (window_t win, int ch);
+extern void werase (window_t win);
+extern void scrollok (window_t win, int flag);
 
-@extern int acs_char (int acs);
-@extern int curs_set (int visibility);
-@extern int move (int x, int y);
+extern int acs_char (int acs);
+extern int curs_set (int visibility);
+extern int move (int x, int y);
 
-@extern void wborder (window_t window,
-					  box_sides_t sides, box_corners_t corners);
-@extern void mvwblit_line (window_t window, int x, int y, int *wch, int len);
-@extern void wresize (window_t window, int width, int height);
-@extern void resizeterm (int width, int height);
+extern void wborder (window_t window,
+					 box_sides_t sides, box_corners_t corners);
+extern void mvwblit_line (window_t window, int x, int y, int *wch, int len);
+extern void wresize (window_t window, int width, int height);
+extern void resizeterm (int width, int height);
 
-@extern Rect getwrect (struct window_s *window);
+extern Rect getwrect (struct window_s *window);
 
-@extern void printf(string fmt, ...);
+extern void printf(string fmt, ...);
 // qfcc stuff
 #else
 // gcc stuff
diff --git a/ruamoko/qwaq/qwaq-debug.h b/ruamoko/qwaq/qwaq-debug.h
index e4de7c12c..630c9097a 100644
--- a/ruamoko/qwaq/qwaq-debug.h
+++ b/ruamoko/qwaq/qwaq-debug.h
@@ -55,27 +55,27 @@ typedef struct qdb_auxfunction_s {
 
 typedef struct qdb_target_s { int handle; } qdb_target_t;
 
-@extern void qdb_set_trace (qdb_target_t target, int state);
-@extern int qdb_set_breakpoint (qdb_target_t target, unsigned staddr);
-@extern int qdb_clear_breakpoint (qdb_target_t target, unsigned staddr);
-@extern int qdb_set_watchpoint (qdb_target_t target, unsigned offset);
-@extern int qdb_clear_watchpoint (qdb_target_t target);
-@extern int qdb_continue (qdb_target_t target);
-@extern qdb_state_t qdb_get_state (qdb_target_t target);
-@extern int qdb_get_data (qdb_target_t target, unsigned src, unsigned len,
-						  void *dst);
-@extern qdb_def_t qdb_find_global (qdb_target_t target, string name);
-@extern qdb_def_t qdb_find_field (qdb_target_t target, string name);
-@extern qdb_function_t *qdb_find_function (qdb_target_t target, string name);
-@extern qdb_function_t *qdb_get_function (qdb_target_t target, unsigned fnum);
-@extern qdb_auxfunction_t *qdb_find_auxfunction (qdb_target_t target,
-												 string name);
-@extern qdb_auxfunction_t *qdb_get_auxfunction (qdb_target_t target,
-												unsigned fnum);
-@extern qdb_def_t *qdb_get_local_defs (qdb_target_t target, unsigned fnum);
+extern void qdb_set_trace (qdb_target_t target, int state);
+extern int qdb_set_breakpoint (qdb_target_t target, unsigned staddr);
+extern int qdb_clear_breakpoint (qdb_target_t target, unsigned staddr);
+extern int qdb_set_watchpoint (qdb_target_t target, unsigned offset);
+extern int qdb_clear_watchpoint (qdb_target_t target);
+extern int qdb_continue (qdb_target_t target);
+extern qdb_state_t qdb_get_state (qdb_target_t target);
+extern int qdb_get_data (qdb_target_t target, unsigned src, unsigned len,
+						 void *dst);
+extern qdb_def_t qdb_find_global (qdb_target_t target, string name);
+extern qdb_def_t qdb_find_field (qdb_target_t target, string name);
+extern qdb_function_t *qdb_find_function (qdb_target_t target, string name);
+extern qdb_function_t *qdb_get_function (qdb_target_t target, unsigned fnum);
+extern qdb_auxfunction_t *qdb_find_auxfunction (qdb_target_t target,
+												string name);
+extern qdb_auxfunction_t *qdb_get_auxfunction (qdb_target_t target,
+											   unsigned fnum);
+extern qdb_def_t *qdb_get_local_defs (qdb_target_t target, unsigned fnum);
 
-@extern void traceon();
-@extern void traceoff();
+extern void traceon();
+extern void traceoff();
 
 #else//GCC
 
diff --git a/ruamoko/qwaq/qwaq-rect.h b/ruamoko/qwaq/qwaq-rect.h
index ba1e47c10..2f7915ff1 100644
--- a/ruamoko/qwaq/qwaq-rect.h
+++ b/ruamoko/qwaq/qwaq-rect.h
@@ -17,12 +17,12 @@ typedef struct Rect_s {
 } Rect;
 
 #ifdef __QFCC__
-@extern Rect makeRect (int xpos, int ypos, int xlen, int ylen);
-@extern Point makePoint (int x, int y);
-@extern Extent makeExtent (int width, int height);
-@extern Extent mergeExtents (Extent a, Extent b);
-@extern int rectContainsPoint (Rect rect, Point point);
-@extern Rect clipRect (Rect clipRect, Rect rect);
+extern Rect makeRect (int xpos, int ypos, int xlen, int ylen);
+extern Point makePoint (int x, int y);
+extern Extent makeExtent (int width, int height);
+extern Extent mergeExtents (Extent a, Extent b);
+extern int rectContainsPoint (Rect rect, Point point);
+extern Rect clipRect (Rect clipRect, Rect rect);
 #endif
 
 #endif//__qwaq_rect_h

From 6e473dc8f26049c4a2fa251a5dd41bb16467ca7e Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 26 Mar 2020 14:13:05 +0900
Subject: [PATCH 0988/1519] [ruamoko] Return nil IMP for nil method

Fixes a segfault.
---
 libs/ruamoko/rua_obj.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/ruamoko/rua_obj.c b/libs/ruamoko/rua_obj.c
index 3d69eba11..1cdf8ed86 100644
--- a/libs/ruamoko/rua_obj.c
+++ b/libs/ruamoko/rua_obj.c
@@ -1800,7 +1800,7 @@ rua_method_get_imp (progs_t *pr)
 {
 	pr_method_t *method = &P_STRUCT (pr, pr_method_t, 0);
 
-	R_INT (pr) = method->method_imp;
+	R_INT (pr) = method ? method->method_imp : 0;
 }
 
 static void

From 983a7422db44bb65409928a42b53a3cee4b3c191 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 26 Mar 2020 14:14:04 +0900
Subject: [PATCH 0989/1519] [libr] Add a two-object Array perform method

I decided it was worth doing after all. This cleans up event forwarding
in qwaq.
---
 ruamoko/include/Array.h |  9 +++++++++
 ruamoko/lib/Array.r     | 13 +++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/ruamoko/include/Array.h b/ruamoko/include/Array.h
index 060f50956..cfc95f595 100644
--- a/ruamoko/include/Array.h
+++ b/ruamoko/include/Array.h
@@ -274,6 +274,15 @@
                          withObject: (void *)arg;
 //\}
 
+/**
+	Iteratively sends #performSelector:withObject:withObject: to each
+	contained object.
+*/
+- (void) makeObjectsPerformSelector: (SEL)selector
+                         withObject: (void *)arg
+                         withObject: (void *)arg2;
+//\}
+
 @end
 
 #endif//__ruamoko_Array_h
diff --git a/ruamoko/lib/Array.r b/ruamoko/lib/Array.r
index 2946141cc..5fbaa9e56 100644
--- a/ruamoko/lib/Array.r
+++ b/ruamoko/lib/Array.r
@@ -410,6 +410,19 @@
 	}
 }
 
+- (void) makeObjectsPerformSelector: (SEL)selector
+                         withObject: (void *)anObject
+                         withObject: (void *)anotherObject
+{
+	local int	i;
+
+	for (i = 0; i < [self count]; i++) {
+		[[self objectAtIndex: i] performSelector: selector
+									  withObject: anObject
+									  withObject: anotherObject];
+	}
+}
+
 - (void) dealloc
 {
 	local unsigned	i;

From aac732fc6350c5a62acd008c1e29067cd8985fc1 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 26 Mar 2020 14:16:07 +0900
Subject: [PATCH 0990/1519] [qwaq] Support an actual parameter for listeners

---
 ruamoko/qwaq/qwaq-listener.h |  2 ++
 ruamoko/qwaq/qwaq-listener.r | 12 ++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/ruamoko/qwaq/qwaq-listener.h b/ruamoko/qwaq/qwaq-listener.h
index 59c96ff1d..0dd388c2e 100644
--- a/ruamoko/qwaq/qwaq-listener.h
+++ b/ruamoko/qwaq/qwaq-listener.h
@@ -13,6 +13,7 @@
 }
 -initWithResponder: (id) responder :(SEL)message;
 -(void) respond: (void *) caller_data;
+-(void) respond: (void *) caller_data withObject:(void *)anObject;
 -(BOOL) matchResponder: (id) responder :(SEL)message;
 @end
 
@@ -24,6 +25,7 @@
 -addListener: (id) responder :(SEL)message;
 -removeListener: (id) responder :(SEL)message;
 -(void) respond: (void *) caller_data;
+-(void) respond: (void *) caller_data withObject:(void *)anObject;
 @end
 
 #endif//__qwaq_listener_h
diff --git a/ruamoko/qwaq/qwaq-listener.r b/ruamoko/qwaq/qwaq-listener.r
index 12d786de3..95c27f04c 100644
--- a/ruamoko/qwaq/qwaq-listener.r
+++ b/ruamoko/qwaq/qwaq-listener.r
@@ -21,6 +21,11 @@
 	imp (responder, message, caller_data);
 }
 
+-(void)respond: (void *) caller_data withObject:(void *)anObject
+{
+	imp (responder, message, caller_data, anObject);
+}
+
 -(BOOL) matchResponder: (id) responder :(SEL)message
 {
 	return self.responder == responder && self.message == message;
@@ -63,4 +68,11 @@
 	[listeners makeObjectsPerformSelector: @selector (respond:)
 							   withObject: caller_data];
 }
+
+-(void)respond: (void *) caller_data withObject:(void *)anObject
+{
+	[listeners makeObjectsPerformSelector: @selector (respond:)
+							   withObject: caller_data
+							   withObject: anObject];
+}
 @end

From e018f5cf71f08d3dbe4cf629b1a8c79ede804a04 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 26 Mar 2020 14:16:58 +0900
Subject: [PATCH 0991/1519] [qwaq] Clean up Editor's event forwarding

Much less clunky with that container object. With this, I think it will
be useful moving the forwarding into View. Still unsure on that, though.
---
 ruamoko/qwaq/qwaq-debugger.r | 12 ++++++------
 ruamoko/qwaq/qwaq-editor.h   |  7 -------
 ruamoko/qwaq/qwaq-editor.r   |  4 +---
 3 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-debugger.r b/ruamoko/qwaq/qwaq-debugger.r
index 8beec60ec..a7c2b7a24 100644
--- a/ruamoko/qwaq/qwaq-debugger.r
+++ b/ruamoko/qwaq/qwaq-debugger.r
@@ -53,7 +53,7 @@
 	current_file = [self find_file: state.file];
 	file_proxy = [[ProxyView alloc] initWithView: current_file];
 	[[current_file gotoLine:state.line - 1] highlightLine];
-	[[current_file onEvent] addListener: self :@selector(key_event:)];
+	[[current_file onEvent] addListener: self :@selector(key_event::)];
 	//FIXME id<View>?
 	[source_window insertSelected: (View *) file_proxy];
 	[source_window setTitle: [current_file filename]];
@@ -74,9 +74,9 @@
 
 	printf ("%s:%d\n", state.file, state.line);
 	if (current_file != file) {
-		[[current_file onEvent] removeListener:self :@selector(key_event:)];
+		[[current_file onEvent] removeListener:self :@selector(key_event::)];
 		[file_proxy setView:file];
-		[[file onEvent] addListener:self :@selector(key_event:)];
+		[[file onEvent] addListener:self :@selector(key_event::)];
 		[source_window setTitle: [file filename]];
 		current_file = file;
 	}
@@ -150,10 +150,10 @@ key_event (Debugger *self, Editor *file, qwaq_event_t *event)
 	return 0;
 }
 
--(void)key_event: (ed_event_t *)event
+-(void)key_event:(Editor *)editor :(qwaq_event_t *)event
 {
-	if (key_event (self, event.editor, event.event)) {
-		event.event.what = qe_none;
+	if (key_event (self, editor, event)) {
+		event.what = qe_none;
 	}
 }
 
diff --git a/ruamoko/qwaq/qwaq-editor.h b/ruamoko/qwaq/qwaq-editor.h
index b861e15ad..1d6a261d5 100644
--- a/ruamoko/qwaq/qwaq-editor.h
+++ b/ruamoko/qwaq/qwaq-editor.h
@@ -8,12 +8,6 @@
 @class EditBuffer;
 @class ListenerGroup;
 
-// Data sent to onKeyEvent listeners
-typedef struct ed_event_s {
-	Editor     *editor;
-	struct qwaq_event_s *event;
-} ed_event_t;
-
 @interface Editor : View
 {
 	EditBuffer *buffer;
@@ -28,7 +22,6 @@ typedef struct ed_event_s {
 	unsigned    line_count;
 	string      filename;
 	ListenerGroup *onEvent;
-	ed_event_t  _event;
 }
 -initWithRect:(Rect) rect file:(string) filename;
 -(ListenerGroup *)onEvent;
diff --git a/ruamoko/qwaq/qwaq-editor.r b/ruamoko/qwaq/qwaq-editor.r
index 80b40bf1c..2428bd45f 100644
--- a/ruamoko/qwaq/qwaq-editor.r
+++ b/ruamoko/qwaq/qwaq-editor.r
@@ -91,13 +91,11 @@ static int handleEvent (Editor *self, qwaq_event_t *event)
 	[super handleEvent: event];
 
 	// give any listeners a chance to override or extend event handling
-	_event.editor = self;
-	_event.event = event;
 	if (event.what & qe_positional) {
 		event.mouse.x -= xpos;
 		event.mouse.y -= ypos;
 	}
-	[onEvent respond: &_event];
+	[onEvent respond:self withObject:event];
 	if (handleEvent (self, event)) {
 		event.what = qe_none;
 	}

From e893421dba5e8fd952a0e39d9a3e4b9e650b5b6f Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 26 Mar 2020 14:46:48 +0900
Subject: [PATCH 0992/1519] [qwaq] Get context from owner instead of prev view

The previous view might be nil, which would result in the new view not
getting a context.
---
 ruamoko/qwaq/qwaq-group.h     |  2 ++
 ruamoko/qwaq/qwaq-group.r     | 11 +++++++++++
 ruamoko/qwaq/qwaq-proxyview.h |  3 +++
 ruamoko/qwaq/qwaq-proxyview.r | 10 ++++++++--
 4 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-group.h b/ruamoko/qwaq/qwaq-group.h
index 3d9c53e65..70e2663a0 100644
--- a/ruamoko/qwaq/qwaq-group.h
+++ b/ruamoko/qwaq/qwaq-group.h
@@ -18,6 +18,8 @@
 	id<TextContext> context;
 }
 -initWithContext: (id<TextContext>) context owner: (View *) owner;
+-(id<TextContext>)context;
+-setContext: (id<TextContext>) context;
 -insert: (View *) view;
 -insertDrawn: (View *) view;
 -insertSelected: (View *) view;
diff --git a/ruamoko/qwaq/qwaq-group.r b/ruamoko/qwaq/qwaq-group.r
index a78837c5a..5ae197a2a 100644
--- a/ruamoko/qwaq/qwaq-group.r
+++ b/ruamoko/qwaq/qwaq-group.r
@@ -24,6 +24,17 @@
 	[views release];
 }
 
+-(id<TextContext>)context
+{
+	return context;
+}
+
+-setContext: (id<TextContext>) context
+{
+	self.context = context;
+	return self;
+}
+
 -insert: (View *) view
 {
 	[views addObject: view];
diff --git a/ruamoko/qwaq/qwaq-proxyview.h b/ruamoko/qwaq/qwaq-proxyview.h
index 7789678fc..449ac5fd6 100644
--- a/ruamoko/qwaq/qwaq-proxyview.h
+++ b/ruamoko/qwaq/qwaq-proxyview.h
@@ -3,9 +3,12 @@
 
 #include "qwaq-view.h"
 
+@class Group;
+
 @interface ProxyView : Object
 {
 	View       *view;
+	Group      *owner;
 }
 -initWithView:(View *) view;
 -setView: (View *) view;
diff --git a/ruamoko/qwaq/qwaq-proxyview.r b/ruamoko/qwaq/qwaq-proxyview.r
index e0f2bb469..b5946eba5 100644
--- a/ruamoko/qwaq/qwaq-proxyview.r
+++ b/ruamoko/qwaq/qwaq-proxyview.r
@@ -1,3 +1,4 @@
+#include "qwaq-group.h"
 #include "qwaq-proxyview.h"
 
 @implementation ProxyView
@@ -18,10 +19,15 @@
 	return self;
 }
 
+-setOwner:(Group *)owner
+{
+	self.owner = owner;
+	return [view setOwner:owner];
+}
+
 -setView:(View *) view
 {
 	int         state = [self.view state];
-	id<TextContext> context = [self.view context];
 
 	if (state & sfInFocus) {
 		[self.view loseFocus];
@@ -30,7 +36,7 @@
 	[self.view setContext:nil];
 
 	self.view = view;
-	[view setContext:context];
+	[view setContext:[owner context]];
 	if (state & sfDrawn) {
 		[view draw];
 	}

From 22e2695f80b91cad6586da827cfe4f09cb2c35dd Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 26 Mar 2020 15:36:46 +0900
Subject: [PATCH 0993/1519] [gamecode] Add VISIBLE to some missed functions

---
 libs/gamecode/pr_strings.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libs/gamecode/pr_strings.c b/libs/gamecode/pr_strings.c
index 6bbca3481..831b90a56 100644
--- a/libs/gamecode/pr_strings.c
+++ b/libs/gamecode/pr_strings.c
@@ -560,7 +560,7 @@ PR_SetDynamicString (progs_t *pr, const char *s)
 	return string_index (res, sr);
 }
 
-void
+VISIBLE void
 PR_MakeTempString (progs_t *pr, string_t str)
 {
 	prstr_resources_t *res = pr->pr_string_resources;
@@ -619,7 +619,7 @@ PR_FreeString (progs_t *pr, string_t str)
 	PR_RunError (pr, "attempt to free invalid string %d", str);
 }
 
-void
+VISIBLE void
 PR_FreeTempStrings (progs_t *pr)
 {
 	prstr_resources_t *res = pr->pr_string_resources;

From b4874f7d9beeb1fe3e6cb7c39436caa0b2d957d9 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 26 Mar 2020 15:37:20 +0900
Subject: [PATCH 0994/1519] [gamecode] Make PR_FreeString a little more
 forgiving

It treats only strings that are actually invalid as invalid. That is,
now it is safe to "free" a static string: it's just a no-op.
---
 libs/gamecode/pr_strings.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libs/gamecode/pr_strings.c b/libs/gamecode/pr_strings.c
index 831b90a56..754ab7e38 100644
--- a/libs/gamecode/pr_strings.c
+++ b/libs/gamecode/pr_strings.c
@@ -602,6 +602,7 @@ PR_FreeString (progs_t *pr, string_t str)
 		switch (sr->type) {
 			case str_static:
 			case str_temp:
+			case str_return:
 				return;
 			case str_mutable:
 				dstring_delete (sr->s.dstring);
@@ -609,14 +610,15 @@ PR_FreeString (progs_t *pr, string_t str)
 			case str_dynamic:
 				pr_strfree (pr, sr->s.string);
 				break;
-			case str_return:
 			default:
 				PR_Error (pr, "internal string error: %d", __LINE__);
 		}
 		free_string_ref (res, sr);
 		return;
 	}
-	PR_RunError (pr, "attempt to free invalid string %d", str);
+	if (!PR_StringValid (pr, str)) {
+		PR_RunError (pr, "attempt to free invalid string %d", str);
+	}
 }
 
 VISIBLE void

From ec82d6b027bd7e3633732a93ab0b782dcc2e445b Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 26 Mar 2020 16:36:29 +0900
Subject: [PATCH 0995/1519] [gamecode] Add support for holding ephemeral
 strings

PR_HoldString converts ephemeral (temp and return) strings to dynamic
strings. This makes dealing with strings in progs a little easier.
---
 include/QF/progs.h         | 12 ++++++++++++
 libs/gamecode/pr_strings.c | 36 ++++++++++++++++++++++++++++++++++--
 2 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/include/QF/progs.h b/include/QF/progs.h
index c08bf12d5..760819941 100644
--- a/include/QF/progs.h
+++ b/include/QF/progs.h
@@ -1344,6 +1344,18 @@ string_t PR_NewMutableString (progs_t *pr);
 */
 string_t PR_SetDynamicString (progs_t *pr, const char *s);
 
+/** Convert an ephemeral string to a dynamic string.
+
+	Valid strings that are not ephemeral (static, dynamic, mutable) will not
+	be affected, but temp and return strings will be marked dynamic, requiring
+	a call to PR_FreeString to return their memory.
+
+	\param pr		pointer to ::progs_t VM struct
+	\param str		The string to be "held" (made non-ephemeral). Safe to call
+					on any valid string, but affects only ephemeral strings.
+*/
+void PR_HoldString (progs_t *pr, string_t str);
+
 /** Destroy a mutable, dynamic or temporary string.
 	\param pr		pointer to ::progs_t VM struct
 	\param str		string index of the string to be destroyed
diff --git a/libs/gamecode/pr_strings.c b/libs/gamecode/pr_strings.c
index 754ab7e38..f2db346f0 100644
--- a/libs/gamecode/pr_strings.c
+++ b/libs/gamecode/pr_strings.c
@@ -449,8 +449,8 @@ PR_SetReturnString (progs_t *pr, const char *s)
 	}
 
 	// grab the string ref from the oldest slot, or make a new one if the
-	// slot is empty
-	if ((sr = res->rs_slot->strref)) {
+	// slot is empty or the string has been held
+	if ((sr = res->rs_slot->strref) && sr->type != str_dynamic) {
 		if (sr->type != str_return || sr->rs_slot != res->rs_slot) {
 			PR_Error (pr, "internal string error: %d", __LINE__);
 		}
@@ -592,6 +592,33 @@ PR_NewMutableString (progs_t *pr)
 	return string_index (res, sr);
 }
 
+VISIBLE void
+PR_HoldString (progs_t *pr, string_t str)
+{
+	prstr_resources_t *res = pr->pr_string_resources;
+	strref_t   *sr = get_strref (res, str);
+
+	if (sr) {
+		switch (sr->type) {
+			case str_temp:
+			case str_return:
+				break;
+			case str_static:
+			case str_mutable:
+			case str_dynamic:
+				// non-ephemeral string, no-op
+				return;
+			default:
+				PR_Error (pr, "internal string error: %d", __LINE__);
+		}
+		sr->type = str_dynamic;
+		return;
+	}
+	if (!PR_StringValid (pr, str)) {
+		PR_RunError (pr, "attempt to hold invalid string %d", str);
+	}
+}
+
 VISIBLE void
 PR_FreeString (progs_t *pr, string_t str)
 {
@@ -629,6 +656,11 @@ PR_FreeTempStrings (progs_t *pr)
 
 	for (sr = pr->pr_xtstr; sr; sr = t) {
 		t = sr->next;
+		if (sr->type == str_dynamic) {
+			// the string has been held, so simply remove the ref from the
+			// queue
+			continue;
+		}
 		if (sr->type != str_temp)
 			PR_Error (pr, "internal string error: %d", __LINE__);
 		if (R_STRING (pr) < 0 && string_index (res, sr) == R_STRING (pr)

From 1586df4dfc8ad1eafd6793d3010c4abe13e7c50a Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 26 Mar 2020 16:38:09 +0900
Subject: [PATCH 0996/1519] [gamecode] Make it possible to check string
 mutability

---
 include/QF/progs.h         |  7 +++++++
 libs/gamecode/pr_strings.c | 11 +++++++++++
 2 files changed, 18 insertions(+)

diff --git a/include/QF/progs.h b/include/QF/progs.h
index 760819941..7567ddc09 100644
--- a/include/QF/progs.h
+++ b/include/QF/progs.h
@@ -1251,6 +1251,13 @@ void PR_Strings_Init (progs_t *pr);
 */
 qboolean PR_StringValid (progs_t *pr, string_t num) __attribute__((pure));
 
+/** Check if a string is valid and mutable.
+	\param pr		pointer to ::progs_t VM struct
+	\param num		string index to be checked
+	\return			true if the string is valid and mutable, false otherwise
+*/
+qboolean PR_StringMutable (progs_t *pr, string_t num) __attribute__((pure));
+
 /** Convert a string index to a C string.
 	\param pr		pointer to ::progs_t VM struct
 	\param num		string index to be converted
diff --git a/libs/gamecode/pr_strings.c b/libs/gamecode/pr_strings.c
index f2db346f0..194dbc05c 100644
--- a/libs/gamecode/pr_strings.c
+++ b/libs/gamecode/pr_strings.c
@@ -361,6 +361,17 @@ PR_StringValid (progs_t *pr, string_t num)
 	return get_strref (pr->pr_string_resources, num) != 0;
 }
 
+VISIBLE qboolean
+PR_StringMutable (progs_t *pr, string_t num)
+{
+	strref_t   *sr;
+	if (num >= 0) {
+		return 0;
+	}
+	sr = get_strref (pr->pr_string_resources, num);
+	return  sr && sr->type == str_mutable;
+}
+
 VISIBLE const char *
 PR_GetString (progs_t *pr, string_t num)
 {

From 58ebbb147db92fae2d2a41120234b4e35b8caea9 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 26 Mar 2020 16:39:21 +0900
Subject: [PATCH 0997/1519] [ruamoko] Add some new string builtins

Wrappers for hold, valid and mutable. I have no idea why I didn't think
of wrapping string validation years ago.
---
 libs/ruamoko/rua_string.c | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/libs/ruamoko/rua_string.c b/libs/ruamoko/rua_string.c
index 4ec5eb2a9..a8240a85c 100644
--- a/libs/ruamoko/rua_string.c
+++ b/libs/ruamoko/rua_string.c
@@ -104,6 +104,26 @@ bi_str_free (progs_t *pr)
 	PR_FreeString (pr, P_STRING (pr, 0));
 }
 
+static void
+bi_str_hold (progs_t *pr)
+{
+	string_t    str = P_STRING (pr, 0);
+	PR_HoldString (pr, str);
+	R_STRING (pr) = str;
+}
+
+static void
+bi_str_valid (progs_t *pr)
+{
+	R_INT (pr) = PR_StringValid (pr, P_STRING (pr, 0));
+}
+
+static void
+bi_str_mutable (progs_t *pr)
+{
+	R_INT (pr) = PR_StringMutable (pr, P_STRING (pr, 0));
+}
+
 static void
 bi_str_copy (progs_t *pr)
 {
@@ -194,6 +214,9 @@ static builtin_t builtins[] = {
 	{"vsprintf",	bi_vsprintf,	-1},
 	{"str_new",		bi_str_new,		-1},
 	{"str_free",	bi_str_free,	-1},
+	{"str_hold",	bi_str_hold,	-1},
+	{"str_valid",	bi_str_valid,	-1},
+	{"str_mutable",	bi_str_mutable,	-1},
 	{"str_copy",	bi_str_copy,	-1},
 	{"str_cat",		bi_str_cat,		-1},
 	{"str_clear",	bi_str_clear,	-1},

From 45d23ce521198959d566121ece8cdd1824dfbf80 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 26 Mar 2020 16:49:09 +0900
Subject: [PATCH 0998/1519] [libr] Add bindings for new string functions

And correct str_free's return type.
---
 ruamoko/include/string.h | 5 ++++-
 ruamoko/lib/string.r     | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ruamoko/include/string.h b/ruamoko/include/string.h
index 7f63f573e..b374b8335 100644
--- a/ruamoko/include/string.h
+++ b/ruamoko/include/string.h
@@ -5,7 +5,10 @@
 @extern string sprintf (string fmt, ...);
 @extern string vsprintf (string fmt, @va_list args);
 @extern string str_new (void);
-@extern string str_free (string str);
+@extern void str_free (string str);
+@extern string str_hold (string str);
+@extern int str_valid (string str);
+@extern int str_mutable (string str);
 @extern string str_copy (string dst, string src);
 @extern string str_cat (string dst, string src);
 @extern string str_clear (string str);
diff --git a/ruamoko/lib/string.r b/ruamoko/lib/string.r
index a23a6aa98..89ecc6aef 100644
--- a/ruamoko/lib/string.r
+++ b/ruamoko/lib/string.r
@@ -4,7 +4,10 @@ int (string s) strlen = #0;
 string (string fmt, ...) sprintf = #0;
 string vsprintf (string fmt, @va_list args) = #0;
 string (void) str_new = #0;
-string (string str) str_free = #0;
+void (string str) str_free = #0;
+string str_hold (string str) = #0;
+int str_valid (string str) = #0;
+int str_mutable (string str) = #0;
 string (string dst, string src) str_copy = #0;
 string (string dst, string src) str_cat = #0;
 string (string str) str_clear = #0;

From 91c5283af5209d2873e62e4ad2a9eae41b873966 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 26 Mar 2020 16:53:53 +0900
Subject: [PATCH 0999/1519] [build] Fix ruamoko/gui's auto dependencies

Changing str_free's return type highlighted that I'd missed an edit when
I did the big ruamoko build cleanup.

Also silence the sed/mv noise now that things are working nicely.
---
 ruamoko/cl_menu/Makefile.am | 4 ++--
 ruamoko/game/Makefile.am    | 4 ++--
 ruamoko/gui/Makefile.am     | 4 +++-
 ruamoko/lib/Makefile.am     | 4 ++--
 ruamoko/qwaq/Makefile.am    | 4 ++--
 ruamoko/scheme/Makefile.am  | 4 ++--
 6 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/ruamoko/cl_menu/Makefile.am b/ruamoko/cl_menu/Makefile.am
index ceaef7fe5..2d2b0c4d0 100644
--- a/ruamoko/cl_menu/Makefile.am
+++ b/ruamoko/cl_menu/Makefile.am
@@ -32,8 +32,8 @@ STRIP=`echo -n $(srcdir)/ | sed -e 's/[^/]//g' | wc -c`
 SUFFIXES=.o .r
 .r.o:
 	$(QCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tqo -p $(STRIP) -c -o $@ $<
-	sed -i -e '1s@:@: $(QFCC_DEP)@' $(DEPDIR)/$*.Tqo
-	$(am__mv) $(DEPDIR)/$*.Tqo $(DEPDIR)/$*.Qo
+	@sed -i -e '1s@:@: $(QFCC_DEP)@' $(DEPDIR)/$*.Tqo
+	@$(am__mv) $(DEPDIR)/$*.Tqo $(DEPDIR)/$*.Qo
 
 menu_src= \
 	client_menu.r controls_o.r options.r options_util.r servlist.r \
diff --git a/ruamoko/game/Makefile.am b/ruamoko/game/Makefile.am
index 95093647f..e7cee8113 100644
--- a/ruamoko/game/Makefile.am
+++ b/ruamoko/game/Makefile.am
@@ -30,8 +30,8 @@ STRIP=`echo -n $(srcdir)/ | sed -e 's/[^/]//g' | wc -c`
 SUFFIXES=.o .r
 .r.o:
 	$(QCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tqo -p $(STRIP) -c -o $@ $<
-	sed -i -e '1s@:@: $(QFCC_DEP)@' $(DEPDIR)/$*.Tqo
-	$(am__mv) $(DEPDIR)/$*.Tqo $(DEPDIR)/$*.Qo
+	@sed -i -e '1s@:@: $(QFCC_DEP)@' $(DEPDIR)/$*.Tqo
+	@$(am__mv) $(DEPDIR)/$*.Tqo $(DEPDIR)/$*.Qo
 
 game_src= Axe.r GameEntity.r World.r tempent.r
 
diff --git a/ruamoko/gui/Makefile.am b/ruamoko/gui/Makefile.am
index 35d2624df..7edb5f173 100644
--- a/ruamoko/gui/Makefile.am
+++ b/ruamoko/gui/Makefile.am
@@ -26,7 +26,9 @@ RANLIB=touch
 
 SUFFIXES= .o .r
 .r.o:
-	$(QFCC) $(QCFLAGS) $(QCPPFLAGS) -c -o $@ $<
+	$(QCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tqo -p $(STRIP) -c -o $@ $<
+	@sed -i -e '1s@:@: $(QFCC_DEP)@' $(DEPDIR)/$*.Tqo
+	@$(am__mv) $(DEPDIR)/$*.Tqo $(DEPDIR)/$*.Qo
 
 r_depfiles_remade=
 
diff --git a/ruamoko/lib/Makefile.am b/ruamoko/lib/Makefile.am
index 49107b28f..2f67f04fd 100644
--- a/ruamoko/lib/Makefile.am
+++ b/ruamoko/lib/Makefile.am
@@ -29,8 +29,8 @@ RANLIB=touch
 SUFFIXES= .o .r
 .r.o:
 	$(QCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tqo -p $(STRIP) -c -o $@ $<
-	sed -i -e '1s@:@: $(QFCC_DEP)@' $(DEPDIR)/$*.Tqo
-	$(am__mv) $(DEPDIR)/$*.Tqo $(DEPDIR)/$*.Qo
+	@sed -i -e '1s@:@: $(QFCC_DEP)@' $(DEPDIR)/$*.Tqo
+	@$(am__mv) $(DEPDIR)/$*.Tqo $(DEPDIR)/$*.Qo
 
 r_depfiles_remade=
 
diff --git a/ruamoko/qwaq/Makefile.am b/ruamoko/qwaq/Makefile.am
index 4f81c8424..b615f11ba 100644
--- a/ruamoko/qwaq/Makefile.am
+++ b/ruamoko/qwaq/Makefile.am
@@ -20,8 +20,8 @@ QLINK=$(QFCC) $(QCFLAGS) $(QCLINKFLAGS)
 SUFFIXES=.o .r
 .r.o:
 	$(QCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tqo -c -o $@ $<
-	sed -i -e '1s@:@: $(QFCC_DEP)@' $(DEPDIR)/$*.Tqo
-	$(am__mv) $(DEPDIR)/$*.Tqo $(DEPDIR)/$*.Qo
+	@sed -i -e '1s@:@: $(QFCC_DEP)@' $(DEPDIR)/$*.Tqo
+	@$(am__mv) $(DEPDIR)/$*.Tqo $(DEPDIR)/$*.Qo
 
 qwaq_app_dat_src= \
 	qwaq-app.r \
diff --git a/ruamoko/scheme/Makefile.am b/ruamoko/scheme/Makefile.am
index f62c36191..3d4319863 100644
--- a/ruamoko/scheme/Makefile.am
+++ b/ruamoko/scheme/Makefile.am
@@ -36,8 +36,8 @@ RANLIB=touch
 SUFFIXES=.o .r
 .r.o:
 	$(QCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tqo -p $(STRIP) -c -o $@ $<
-	sed -i -e '1s@:@: $(QFCC_DEP)@' $(DEPDIR)/$*.Tqo
-	$(am__mv) $(DEPDIR)/$*.Tqo $(DEPDIR)/$*.Qo
+	@sed -i -e '1s@:@: $(QFCC_DEP)@' $(DEPDIR)/$*.Tqo
+	@$(am__mv) $(DEPDIR)/$*.Tqo $(DEPDIR)/$*.Qo
 
 r_depfiles_remade=
 

From 90d89e887420a701b8a88e7fdeb069b9a7f304e3 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 26 Mar 2020 17:28:38 +0900
Subject: [PATCH 1000/1519] [qwaq] Move onEvent into View

In the end, it did make sense since it seems to facilitate MVC nicely.
---
 ruamoko/qwaq/qwaq-editor.h |  2 --
 ruamoko/qwaq/qwaq-editor.r | 17 +----------------
 ruamoko/qwaq/qwaq-group.r  | 23 +++++++++++++++++++++--
 ruamoko/qwaq/qwaq-view.h   | 15 ++++++++-------
 ruamoko/qwaq/qwaq-view.r   |  7 +++++++
 5 files changed, 37 insertions(+), 27 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-editor.h b/ruamoko/qwaq/qwaq-editor.h
index 1d6a261d5..01ef35f30 100644
--- a/ruamoko/qwaq/qwaq-editor.h
+++ b/ruamoko/qwaq/qwaq-editor.h
@@ -21,10 +21,8 @@
 	Point       cursor;
 	unsigned    line_count;
 	string      filename;
-	ListenerGroup *onEvent;
 }
 -initWithRect:(Rect) rect file:(string) filename;
--(ListenerGroup *)onEvent;
 -(string)filename;
 -scrollUp:(unsigned) count;
 -scrollDown:(unsigned) count;
diff --git a/ruamoko/qwaq/qwaq-editor.r b/ruamoko/qwaq/qwaq-editor.r
index 2428bd45f..a7163c9b6 100644
--- a/ruamoko/qwaq/qwaq-editor.r
+++ b/ruamoko/qwaq/qwaq-editor.r
@@ -15,16 +15,11 @@
 	line_count = [buffer countLines: {0, [buffer textSize]}];
 	linebuffer = [DrawBuffer buffer: { xlen, 1 }];
 	growMode = gfGrowHi;
-	options = ofCanFocus;
+	options = ofCanFocus | ofRelativeEvents;
 	onEvent = [[ListenerGroup alloc] init];
 	return self;
 }
 
--(ListenerGroup *)onEvent
-{
-	return onEvent;
-}
-
 -(string)filename
 {
 	return filename;
@@ -90,19 +85,9 @@ static int handleEvent (Editor *self, qwaq_event_t *event)
 {
 	[super handleEvent: event];
 
-	// give any listeners a chance to override or extend event handling
-	if (event.what & qe_positional) {
-		event.mouse.x -= xpos;
-		event.mouse.y -= ypos;
-	}
-	[onEvent respond:self withObject:event];
 	if (handleEvent (self, event)) {
 		event.what = qe_none;
 	}
-	if (event.what & qe_positional) {
-		event.mouse.x += xpos;
-		event.mouse.y += ypos;
-	}
 	return self;
 }
 
diff --git a/ruamoko/qwaq/qwaq-group.r b/ruamoko/qwaq/qwaq-group.r
index 5ae197a2a..11f724422 100644
--- a/ruamoko/qwaq/qwaq-group.r
+++ b/ruamoko/qwaq/qwaq-group.r
@@ -245,6 +245,25 @@ find_mouse_view(Group *group, Point pos)
 	return nil;
 }
 
+static void
+handlePositionalEvent (qwaq_event_t *event, View *view)
+{
+	Point       pos = [view origin];
+	int         options = [view options];
+
+	if (options & ofRelativeEvents) {
+		event.mouse.x -= pos.x;
+		event.mouse.y -= pos.y;
+	}
+
+	[view handleEvent: event];
+
+	if (options & ofRelativeEvents) {
+		event.mouse.x += pos.x;
+		event.mouse.y += pos.y;
+	}
+}
+
 -handleEvent: (qwaq_event_t *) event
 {
 	if (event.what & qe_focused) {
@@ -253,7 +272,7 @@ find_mouse_view(Group *group, Point pos)
 		}
 	} else if (event.what & qe_positional) {
 		if (mouse_grabbed) {
-			[mouse_grabbed handleEvent: event];
+			handlePositionalEvent (event, mouse_grabbed);
 		} else {
 			Point       pos = {event.mouse.x, event.mouse.y};
 			View       *mouse_view = find_mouse_view (self, pos);
@@ -263,7 +282,7 @@ find_mouse_view(Group *group, Point pos)
 				mouse_within = mouse_view;
 			}
 			if (mouse_within) {
-				[mouse_within handleEvent: event];
+				handlePositionalEvent (event, mouse_within);
 			}
 		}
 	} else {
diff --git a/ruamoko/qwaq/qwaq-view.h b/ruamoko/qwaq/qwaq-view.h
index b2c98c88b..5eaccc5b6 100644
--- a/ruamoko/qwaq/qwaq-view.h
+++ b/ruamoko/qwaq/qwaq-view.h
@@ -14,12 +14,12 @@
 enum {
 	ofCanFocus      = 0x0001,
 	ofFirstClick    = 0x0002,
-	ofDontDraw      = 0x0004,
-	ofPreProcess    = 0x0008,
-	ofPostProcess   = 0x0010,
-	ofMakeFirst     = 0x0020,
-	ofTileable      = 0x0040,
-	ofCentered      = 0x0080,
+	ofMakeFirst     = 0x0004,
+	ofDontDraw      = 0x0008,
+	ofRelativeEvents= 0x0010,
+
+	ofTileable      = 0x0020,
+	ofCentered      = 0x0040,
 };
 
 enum {
@@ -68,6 +68,7 @@ enum {
 -resize: (Extent) delta;
 -move:(Point)dpos andResize:(Extent)dsize;
 -grow: (Extent) delta;
+-(ListenerGroup *)onEvent;
 -handleEvent: (qwaq_event_t *) event;
 -takeFocus;
 -loseFocus;
@@ -100,7 +101,6 @@ enum {
 		};
 	};
 	Rect        absRect;
-	Point       point;		// can't be local :(
 	Group      *owner;
 	id<TextContext> textContext;
 	int         state;
@@ -110,6 +110,7 @@ enum {
 	Point       cursor;
 	ListenerGroup *onReceiveFocus;
 	ListenerGroup *onReleaseFocus;
+	ListenerGroup *onEvent;
 }
 -initWithRect: (Rect) rect;
 @end
diff --git a/ruamoko/qwaq/qwaq-view.r b/ruamoko/qwaq/qwaq-view.r
index caeab8286..1d5fb2e29 100644
--- a/ruamoko/qwaq/qwaq-view.r
+++ b/ruamoko/qwaq/qwaq-view.r
@@ -259,8 +259,15 @@ updateScreenCursor (View *view)
 	return self;
 }
 
+-(ListenerGroup *)onEvent
+{
+	return onEvent;
+}
+
 -handleEvent: (qwaq_event_t *) event
 {
+	// give any listeners a chance to override or extend event handling
+	[onEvent respond:self withObject:event];
 	if (event.what & (qe_mousedown | qe_mouseclick)
 		&& options & ofCanFocus && !(state & (sfDisabled | sfInFocus))) {
 		[owner selectView: self];

From 48f41142f599104468099b84d9a912848f7278be Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 26 Mar 2020 18:14:20 +0900
Subject: [PATCH 1001/1519] [qwaq] Add function to get a string from the target

---
 ruamoko/qwaq/qwaq-debug.c    | 16 ++++++++++++++++
 ruamoko/qwaq/qwaq-debug.h    |  7 ++++---
 ruamoko/qwaq/qwaq-debugger.r |  1 +
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-debug.c b/ruamoko/qwaq/qwaq-debug.c
index b7fcab168..4938d8211 100644
--- a/ruamoko/qwaq/qwaq-debug.c
+++ b/ruamoko/qwaq/qwaq-debug.c
@@ -320,6 +320,21 @@ qdb_get_data (progs_t *pr)
 	R_INT (pr) = 0;
 }
 
+static void
+qdb_get_string (progs_t *pr)
+{
+	__auto_type debug = PR_Resources_Find (pr, "qwaq-debug");
+	pointer_t   handle = P_INT (pr, 0);
+	qwaq_target_t *target = get_target (debug, __FUNCTION__, handle);
+	progs_t    *tpr = target->pr;
+	string_t    string = P_STRING (pr, 1);
+
+	R_STRING (pr) = 0;
+	if (PR_StringValid (tpr, string)) {
+		RETURN_STRING (pr, PR_GetString (tpr, string));
+	}
+}
+
 static void
 qdb_find_global (progs_t *pr)
 {
@@ -491,6 +506,7 @@ static builtin_t builtins[] = {
 	{"qdb_continue",			qdb_continue,			-1},
 	{"qdb_get_state",			qdb_get_state,			-1},
 	{"qdb_get_data",			qdb_get_data,			-1},
+	{"qdb_get_string",			qdb_get_string,			-1},
 	{"qdb_find_global",			qdb_find_global,		-1},
 	{"qdb_find_field",			qdb_find_field,			-1},
 	{"qdb_find_function",		qdb_find_function,		-1},
diff --git a/ruamoko/qwaq/qwaq-debug.h b/ruamoko/qwaq/qwaq-debug.h
index 630c9097a..287e1282c 100644
--- a/ruamoko/qwaq/qwaq-debug.h
+++ b/ruamoko/qwaq/qwaq-debug.h
@@ -28,7 +28,7 @@ typedef struct qdb_state_s {
 typedef struct qdb_def_s {
 	unsigned    type_size;	// type in lower 16, size in upper 16
 	unsigned    offset;
-	string_t    name;
+	unsigned    name;	// string
 	unsigned    type_encoding;
 } qdb_def_t;
 
@@ -37,8 +37,8 @@ typedef struct qdb_function_s {
 	unsigned    local_data;
 	unsigned    local_size;
 	unsigned	profile;
-	string_t    name;
-	string_t    file;
+	unsigned    name;	// string
+	unsigned    file;	// string
 	unsigned    num_params;
 } qdb_function_t;
 
@@ -64,6 +64,7 @@ extern int qdb_continue (qdb_target_t target);
 extern qdb_state_t qdb_get_state (qdb_target_t target);
 extern int qdb_get_data (qdb_target_t target, unsigned src, unsigned len,
 						 void *dst);
+extern string qdb_get_string (qdb_target_t target, unsigned str);
 extern qdb_def_t qdb_find_global (qdb_target_t target, string name);
 extern qdb_def_t qdb_find_field (qdb_target_t target, string name);
 extern qdb_function_t *qdb_find_function (qdb_target_t target, string name);
diff --git a/ruamoko/qwaq/qwaq-debugger.r b/ruamoko/qwaq/qwaq-debugger.r
index a7c2b7a24..632a16ca0 100644
--- a/ruamoko/qwaq/qwaq-debugger.r
+++ b/ruamoko/qwaq/qwaq-debugger.r
@@ -181,6 +181,7 @@ int qdb_continue (qdb_target_t target) = #0;
 qdb_state_t qdb_get_state (qdb_target_t target) = #0;
 int qdb_get_data (qdb_target_t target, unsigned src, unsigned len,
 				  void *dst) = #0;
+string qdb_get_string (qdb_target_t target, unsigned str) = #0;
 qdb_def_t qdb_find_global (qdb_target_t target, string name) = #0;
 qdb_def_t qdb_find_field (qdb_target_t target, string name) = #0;
 qdb_function_t *qdb_find_function (qdb_target_t target, string name) = #0;

From 6ec7b96693f506db9267dd3730dd46e1675a068e Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 26 Mar 2020 18:16:57 +0900
Subject: [PATCH 1002/1519] [qwaq] Initialize onEvent

sigh
---
 ruamoko/qwaq/qwaq-editor.r | 1 -
 ruamoko/qwaq/qwaq-view.r   | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ruamoko/qwaq/qwaq-editor.r b/ruamoko/qwaq/qwaq-editor.r
index a7163c9b6..f45de395f 100644
--- a/ruamoko/qwaq/qwaq-editor.r
+++ b/ruamoko/qwaq/qwaq-editor.r
@@ -16,7 +16,6 @@
 	linebuffer = [DrawBuffer buffer: { xlen, 1 }];
 	growMode = gfGrowHi;
 	options = ofCanFocus | ofRelativeEvents;
-	onEvent = [[ListenerGroup alloc] init];
 	return self;
 }
 
diff --git a/ruamoko/qwaq/qwaq-view.r b/ruamoko/qwaq/qwaq-view.r
index 1d5fb2e29..d7cbdb4a1 100644
--- a/ruamoko/qwaq/qwaq-view.r
+++ b/ruamoko/qwaq/qwaq-view.r
@@ -12,6 +12,7 @@
 	}
 	onReceiveFocus = [[ListenerGroup alloc] init];
 	onReleaseFocus = [[ListenerGroup alloc] init];
+	onEvent = [[ListenerGroup alloc] init];
 	return self;
 }
 
@@ -24,6 +25,7 @@
 	self.absRect = rect;
 	onReceiveFocus = [[ListenerGroup alloc] init];
 	onReleaseFocus = [[ListenerGroup alloc] init];
+	onEvent = [[ListenerGroup alloc] init];
 	return self;
 }
 

From bd8d09479f2c9fc10776e2fc4088263e469ae8ef Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 26 Mar 2020 18:19:25 +0900
Subject: [PATCH 1003/1519] [qwaq] Start work on displaying local defs

The names show for the first function, but there are problems after
that.
---
 ruamoko/qwaq/qwaq-debugger.r | 58 +++++++++++++++++++++++++++++-------
 1 file changed, 48 insertions(+), 10 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-debugger.r b/ruamoko/qwaq/qwaq-debugger.r
index 632a16ca0..084ac534d 100644
--- a/ruamoko/qwaq/qwaq-debugger.r
+++ b/ruamoko/qwaq/qwaq-debugger.r
@@ -1,5 +1,7 @@
-#include <Array.h>
 #include <QF/keys.h>
+#include <Array.h>
+#include <string.h>
+#include <types.h>
 
 #include "qwaq-app.h"
 #include "qwaq-curses.h"
@@ -118,16 +120,52 @@ update_current_func (Debugger *self, unsigned fnum)
 		return;
 	}
 	qdb_get_data (debug_target, func.local_data, func.local_size, local_data);
-	[locals_view mvprintf:{0,0}, "%d", func.local_size];
-	for (int y = 1; y < [locals_view size].height; y++) {
-		unsigned    ind = (y - 1) * 4;
-		if (ind < func.local_size) {
-			[locals_view mvprintf:{0, y}, "%02x", ind];
-			for (int x = 0; x < 4 && ind < func.local_size; x++, ind++) {
-				[locals_view mvprintf:{x * 9 + 3, y}, "%08x", local_data[ind]];
+	if (!local_defs) {
+		[locals_view mvprintf:{0,0}, "%d", func.local_size];
+		for (int y = 1; y < [locals_view size].height; y++) {
+			unsigned    ind = (y - 1) * 4;
+			if (ind < func.local_size) {
+				[locals_view mvprintf:{0, y}, "%02x", ind];
+				for (int x = 0; x < 4 && ind < func.local_size; x++, ind++) {
+					[locals_view mvprintf:{x * 9 + 3, y}, "%08x",
+										  local_data[ind]];
+				}
+			} else {
+				break;
 			}
-		} else {
-			break;
+		}
+	} else {
+		for (int y = 0; y < [locals_view size].height; y++) {
+			if (y >= aux_func.num_locals) {
+				break;
+			}
+			qdb_def_t *def = local_defs + y;
+			[locals_view mvprintf:{0, y}, "%s",
+								  qdb_get_string (debug_target, def.name)];
+			string      valstr = "--";
+			printf ("def type_size %d\n", def.type_size);
+			switch (def.type_size & 0xffff) {
+				case ev_void:
+				case ev_invalid:
+				case ev_type_count:
+					break;
+				case ev_string:
+				case ev_float:
+				case ev_vector:
+				case ev_entity:
+				case ev_field:
+				case ev_func:
+				case ev_pointer:
+				case ev_quat:
+				case ev_integer:
+				case ev_uinteger:
+				case ev_short:
+				case ev_double:
+					valstr = sprintf ("%d", def.type_size >> 16);
+					break;
+			}
+			int         x = [locals_view size].width - strlen (valstr) - 1;
+			[locals_view mvaddstr:{x, y}, valstr];
 		}
 	}
 	[TextContext refresh];

From b2814700b9af16ce25410b99162247c6a0efa535 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 26 Mar 2020 18:22:40 +0900
Subject: [PATCH 1004/1519] [qwaq] Hook up locals view for events

The same debugger method is used because the idea is that all the
window in a group respond to the same commands in general.
---
 ruamoko/qwaq/qwaq-debugger.r | 24 +++++++++++++++---------
 ruamoko/qwaq/qwaq-view.h     |  1 +
 ruamoko/qwaq/qwaq-view.r     | 14 ++++++++++++++
 ruamoko/qwaq/qwaq-window.r   |  7 ++++++-
 4 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-debugger.r b/ruamoko/qwaq/qwaq-debugger.r
index 084ac534d..564e376b1 100644
--- a/ruamoko/qwaq/qwaq-debugger.r
+++ b/ruamoko/qwaq/qwaq-debugger.r
@@ -55,7 +55,7 @@
 	current_file = [self find_file: state.file];
 	file_proxy = [[ProxyView alloc] initWithView: current_file];
 	[[current_file gotoLine:state.line - 1] highlightLine];
-	[[current_file onEvent] addListener: self :@selector(key_event::)];
+	[[current_file onEvent] addListener: self :@selector(proxy_event::)];
 	//FIXME id<View>?
 	[source_window insertSelected: (View *) file_proxy];
 	[source_window setTitle: [current_file filename]];
@@ -64,9 +64,12 @@
 	locals_window = [[Window alloc] initWithRect: {{0, 0}, {40, 10}}];
 	[locals_window setBackground: color_palette[064]];
 	[locals_window setTitle: "Locals"];
-	locals_view = [[View alloc] initWithRect: {{1, 1}, {38, 8}}];
+	locals_view = [[View alloc] initWithRect: {{1, 1}, {38, 8}}
+									 options: ofCanFocus];
 	[locals_window insertSelected: locals_view];
 	[application addView: locals_window];
+
+	[[locals_view onEvent] addListener:self :@selector(proxy_event::)];
 }
 
 -(void) show_line
@@ -76,9 +79,9 @@
 
 	printf ("%s:%d\n", state.file, state.line);
 	if (current_file != file) {
-		[[current_file onEvent] removeListener:self :@selector(key_event::)];
+		[[current_file onEvent] removeListener:self :@selector(proxy_event::)];
 		[file_proxy setView:file];
-		[[file onEvent] addListener:self :@selector(key_event::)];
+		[[file onEvent] addListener:self :@selector(proxy_event::)];
 		[source_window setTitle: [file filename]];
 		current_file = file;
 	}
@@ -172,11 +175,14 @@ update_current_func (Debugger *self, unsigned fnum)
 }
 
 static int
-key_event (Debugger *self, Editor *file, qwaq_event_t *event)
+proxy_event (Debugger *self, id proxy, qwaq_event_t *event)
 {
 	if (event.what == qe_mouseclick && !(event.mouse.buttons & 0x78)) {
-		printf ("%s\n", [file getWordAt: {event.mouse.x, event.mouse.y}]);
-		[self.source_window redraw];
+		if (proxy == self.current_file) {
+			printf ("%s\n", [proxy getWordAt: {event.mouse.x, event.mouse.y}]);
+			[self.source_window redraw];
+			return 1;
+		}
 	} else if (event.what == qe_keydown) {
 		switch (event.key.code) {
 			case QFK_F7:
@@ -188,9 +194,9 @@ key_event (Debugger *self, Editor *file, qwaq_event_t *event)
 	return 0;
 }
 
--(void)key_event:(Editor *)editor :(qwaq_event_t *)event
+-(void)proxy_event:(id)proxy :(qwaq_event_t *)event
 {
-	if (key_event (self, editor, event)) {
+	if (proxy_event (self, proxy, event)) {
 		event.what = qe_none;
 	}
 }
diff --git a/ruamoko/qwaq/qwaq-view.h b/ruamoko/qwaq/qwaq-view.h
index 5eaccc5b6..27b0ddd43 100644
--- a/ruamoko/qwaq/qwaq-view.h
+++ b/ruamoko/qwaq/qwaq-view.h
@@ -113,6 +113,7 @@ enum {
 	ListenerGroup *onEvent;
 }
 -initWithRect: (Rect) rect;
+-initWithRect: (Rect) rect options:(int)options;
 @end
 
 @interface View (TextContext) <TextContext>
diff --git a/ruamoko/qwaq/qwaq-view.r b/ruamoko/qwaq/qwaq-view.r
index d7cbdb4a1..24b6b77ba 100644
--- a/ruamoko/qwaq/qwaq-view.r
+++ b/ruamoko/qwaq/qwaq-view.r
@@ -29,6 +29,20 @@
 	return self;
 }
 
+-initWithRect: (Rect) rect options:(int)options
+{
+	if (!(self = [super init])) {
+		return nil;
+	}
+	self.rect = rect;
+	self.absRect = rect;
+	self.options = options;
+	onReceiveFocus = [[ListenerGroup alloc] init];
+	onReleaseFocus = [[ListenerGroup alloc] init];
+	onEvent = [[ListenerGroup alloc] init];
+	return self;
+}
+
 - (void) dealloc
 {
 	if (owner) {
diff --git a/ruamoko/qwaq/qwaq-window.r b/ruamoko/qwaq/qwaq-window.r
index 2d9c1b549..3741d9acc 100644
--- a/ruamoko/qwaq/qwaq-window.r
+++ b/ruamoko/qwaq/qwaq-window.r
@@ -18,6 +18,11 @@
 }
 
 -initWithRect: (Rect) rect
+{
+	return [self initWithRect: rect options:ofCanFocus | ofMakeFirst];
+}
+
+-initWithRect: (Rect) rect options:(int)options
 {
 	if (!(self = [super init])) {
 		return nil;
@@ -70,7 +75,7 @@
 	[buf mvaddstr: {0, 2}, "XOX"];
 
 	growMode = gfGrowHi;
-	options = ofCanFocus | ofMakeFirst;
+	self.options = options;
 	return self;
 }
 

From adb7b018d96a14061712e4b6ac57174b19b1057e Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 26 Mar 2020 18:27:02 +0900
Subject: [PATCH 1005/1519] [qwaq] Improve focus setting

The view is recorded as having focus but is not given focus until the
parent view is actually in focus. This fixes the locals view not having
focus at startup and thus blocking F7.
---
 ruamoko/qwaq/qwaq-group.r | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ruamoko/qwaq/qwaq-group.r b/ruamoko/qwaq/qwaq-group.r
index 11f724422..d94d0585f 100644
--- a/ruamoko/qwaq/qwaq-group.r
+++ b/ruamoko/qwaq/qwaq-group.r
@@ -97,7 +97,7 @@ trySetFocus (Group *self, int viewIndex)
 	View       *view = [self.views objectAtIndex:viewIndex];
 	if (([view state] & (sfDrawn | sfDisabled)) == sfDrawn
 		&& [view options] & ofCanFocus) {
-		if (!self.owner || [self.owner state] & sfInFocus) {
+		if (!self.owner || ([self.owner state] & sfInFocus)) {
 			if (self.focused >= 0) {
 				[[self.views objectAtIndex: self.focused] loseFocus];
 			}
@@ -106,6 +106,8 @@ trySetFocus (Group *self, int viewIndex)
 				self.focused = makeFirst (self, viewIndex);
 			}
 			[view takeFocus];
+		} else {
+			self.focused = viewIndex;
 		}
 		return 1;
 	}

From 5fd63b95db77174779c894dca4c95240e04f5ecc Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 26 Mar 2020 19:22:41 +0900
Subject: [PATCH 1006/1519] [qfcc] Add a new failing test

The struct alias is somehow blocking the detection of the call so the
return value gets corrupted.
---
 tools/qfcc/test/func-expr2.r | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 tools/qfcc/test/func-expr2.r

diff --git a/tools/qfcc/test/func-expr2.r b/tools/qfcc/test/func-expr2.r
new file mode 100644
index 000000000..32dad106d
--- /dev/null
+++ b/tools/qfcc/test/func-expr2.r
@@ -0,0 +1,23 @@
+typedef struct Extent_s {
+	int width;
+	int height;
+} Extent;
+
+extern Extent get_size (void);
+extern int getlen(void);
+
+int main (void)
+{
+	int x = get_size().width - getlen() - 1;
+	return x != 29;
+}
+
+Extent get_size (void)
+{
+	return {38, 8};
+}
+
+int getlen (void)
+{
+	return 8;
+}

From 15d4186fff5b4d8f7be9249d891ba18fc1ff4d46 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 26 Mar 2020 20:15:50 +0900
Subject: [PATCH 1007/1519] [qfcc] Show line numbers in block sub expressions

Seems more useful than expression index.
---
 tools/qfcc/source/dot_expr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/qfcc/source/dot_expr.c b/tools/qfcc/source/dot_expr.c
index 27d535845..f66298b40 100644
--- a/tools/qfcc/source/dot_expr.c
+++ b/tools/qfcc/source/dot_expr.c
@@ -249,7 +249,7 @@ print_block (dstring_t *dstr, expr_t *e, int level, int id, expr_t *next)
 				   "</tr>\n", indent + 4, "");
 	for (se = e->e.block.head, i = 0; se; se = se->next, i++)
 		dasprintf (dstr, "%*s<tr><td>%d</td><td port=\"b%d\">%s</td></tr>\n",
-				   indent + 4, "", i, i, expr_names[se->type]);
+				   indent + 4, "", se->line, i, expr_names[se->type]);
 	dasprintf (dstr, "%*s</table>\n", indent + 2, "");
 	dasprintf (dstr, "%*s>];\n", indent, "");
 

From 98eac2afbc202edcf12d06f9f56104b0444e78db Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 26 Mar 2020 20:16:32 +0900
Subject: [PATCH 1008/1519] [qfcc] Hide dependency generation commands

---
 tools/qfcc/test/Makefile.am | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/tools/qfcc/test/Makefile.am b/tools/qfcc/test/Makefile.am
index f6f0c6043..8560e693f 100644
--- a/tools/qfcc/test/Makefile.am
+++ b/tools/qfcc/test/Makefile.am
@@ -16,12 +16,12 @@ QCOMPILE=$(QFCC) $(QCFLAGS) $(QCPPFLAGS)
 SUFFIXES=.qfo .r .pas
 .r.qfo:
 	$(QCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tqo -c -o $@ $<
-	sed -i -e '1s@:@: $(QFCC_DEP)@' $(DEPDIR)/$*.Tqo
-	$(am__mv) $(DEPDIR)/$*.Tqo $(DEPDIR)/$*.Qo
+	@sed -i -e '1s@:@: $(QFCC_DEP)@' $(DEPDIR)/$*.Tqo
+	@$(am__mv) $(DEPDIR)/$*.Tqo $(DEPDIR)/$*.Qo
 .pas.qfo:
 	$(QCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tqo -c -o $@ $<
-	sed -i -e '1s@:@: $(QFCC_DEP)@' $(DEPDIR)/$*.Tqo
-	$(am__mv) $(DEPDIR)/$*.Tqo $(DEPDIR)/$*.Qo
+	@sed -i -e '1s@:@: $(QFCC_DEP)@' $(DEPDIR)/$*.Tqo
+	@$(am__mv) $(DEPDIR)/$*.Tqo $(DEPDIR)/$*.Qo
 
 QFCC_TEST_LIBS=@QFCC_TEST_LIBS@
 QFCC_TEST_DEPS=@QFCC_TEST_DEPS@
@@ -46,6 +46,7 @@ test_progs_dat=\
 	enum.dat \
 	fordecl.dat \
 	func-expr.dat \
+	func-expr2.dat \
 	func-static.dat \
 	gcd.dat \
 	infloop.dat \
@@ -258,6 +259,15 @@ func-expr.run: Makefile build-run
 include ./$(DEPDIR)/func-expr.Qo # am--include-marker
 r_depfiles_remade += ./$(DEPDIR)/func-expr.Qo
 
+func_expr2_dat_SOURCES=func-expr2.r
+func_expr2_obj=$(func_expr2_dat_SOURCES:.r=.qfo)
+func-expr2.dat$(EXEEXT): $(func_expr2_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(func_expr2_obj)
+func-expr2.run: Makefile build-run
+	@$(srcdir)/build-run $@
+include ./$(DEPDIR)/func-expr2.Qo # am--include-marker
+r_depfiles_remade += ./$(DEPDIR)/func-expr2.Qo
+
 func_static_dat_SOURCES=func-static.r
 func_static_obj=$(func_static_dat_SOURCES:.r=.qfo)
 func-static.dat$(EXEEXT): $(func_static_obj) $(QFCC_DEP)

From 4de2c6b30ef923862ba453e940171203e7b6a02f Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 26 Mar 2020 20:16:52 +0900
Subject: [PATCH 1009/1519] [qfcc] Move alias expr inside call block expression

This fixes the trampled return value when the first expression aliases
the return result.
---
 tools/qfcc/source/expr_binary.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/tools/qfcc/source/expr_binary.c b/tools/qfcc/source/expr_binary.c
index b7b526853..cc75bcbcf 100644
--- a/tools/qfcc/source/expr_binary.c
+++ b/tools/qfcc/source/expr_binary.c
@@ -952,6 +952,11 @@ check_precedence (int op, expr_t *e1, expr_t *e2)
 	return 0;
 }
 
+static int is_call (expr_t *e)
+{
+	return e->type == ex_block && e->e.block.is_call;
+}
+
 expr_t *
 binary_expr (int op, expr_t *e1, expr_t *e2)
 {
@@ -964,8 +969,19 @@ binary_expr (int op, expr_t *e1, expr_t *e2)
 	e1 = convert_vector (e1);
 	// FIXME this is target-specific info and should not be in the
 	// expression tree
+	if ((e1->type == ex_expr || e1->type == ex_uexpr) && e1->e.expr.op == 'A'
+		&& is_call (e1->e.expr.e1)) {
+		// move the alias expression inside the block so the following check
+		// can detect the call and move the temp assignment into the block
+		expr_t     *block = e1->e.expr.e1;
+		e1->e.expr.e1 = block->e.block.result;
+		block->e.block.result = e1;
+		e1 = block;
+	}
 	if (e1->type == ex_block && e1->e.block.is_call
 		&& has_function_call (e2) && e1->e.block.result) {
+		// the temp assignment needs to be insided the block so assignment
+		// code generation doesn't see it when applying right-associativity
 		expr_t    *tmp = new_temp_def_expr (get_type (e1->e.block.result));
 		e = assign_expr (tmp, e1->e.block.result);
 		append_expr (e1, e);

From 8dcb3fefb3b6793e2065bdf5334eeff978830e44 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 26 Mar 2020 20:31:14 +0900
Subject: [PATCH 1010/1519] [qwaq] Offset position when forwardning mvaddstr

---
 ruamoko/qwaq/qwaq-view.r | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/ruamoko/qwaq/qwaq-view.r b/ruamoko/qwaq/qwaq-view.r
index 24b6b77ba..9e28c7a68 100644
--- a/ruamoko/qwaq/qwaq-view.r
+++ b/ruamoko/qwaq/qwaq-view.r
@@ -206,6 +206,13 @@ updateScreenCursor (View *view)
 	[textContext mvaddch: pos, ch];
 }
 
+- (void) mvaddstr: (Point) pos, string str
+{
+	pos.x += xpos;
+	pos.y += ypos;
+	[textContext mvaddstr: pos, str];
+}
+
 -move: (Point) delta
 {
 	xpos += delta.x;

From b2de2a9f3be4965774696155f79956bfb4d7df9e Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 26 Mar 2020 21:01:39 +0900
Subject: [PATCH 1011/1519] [qwaq] Display values for simple defs

Mostly works, but need to sort out clearing the view without clearing
the window (silly curses and its full-line clears)
---
 ruamoko/qwaq/qwaq-debugger.r | 34 +++++++++++++++++++++++++++++++---
 1 file changed, 31 insertions(+), 3 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-debugger.r b/ruamoko/qwaq/qwaq-debugger.r
index 564e376b1..a33ec59b1 100644
--- a/ruamoko/qwaq/qwaq-debugger.r
+++ b/ruamoko/qwaq/qwaq-debugger.r
@@ -145,29 +145,57 @@ update_current_func (Debugger *self, unsigned fnum)
 			qdb_def_t *def = local_defs + y;
 			[locals_view mvprintf:{0, y}, "%s",
 								  qdb_get_string (debug_target, def.name)];
+			@param      value = nil;
 			string      valstr = "--";
-			printf ("def type_size %d\n", def.type_size);
+			unsigned    offset = func.local_data + def.offset;
+			printf ("%d %d %s %d\n", def.type_size, offset,
+					qdb_get_string (debug_target, def.name),
+					def.type_encoding);
+			qdb_get_data (debug_target, offset, def.type_size >> 16,
+						  &value);
 			switch (def.type_size & 0xffff) {
 				case ev_void:
 				case ev_invalid:
 				case ev_type_count:
 					break;
 				case ev_string:
+					valstr = qdb_get_string (debug_target, value.integer_val);
+					break;
 				case ev_float:
+					valstr = sprintf ("%.9g", value.float_val);
+					break;
 				case ev_vector:
+					valstr = sprintf ("%.9v", value.vector_val);
+					break;
 				case ev_entity:
+					valstr = sprintf ("%e", value.entity_val);
+					break;
 				case ev_field:
+					valstr = sprintf ("[%x]", value.field_val);
+					break;
 				case ev_func:
+					valstr = sprintf ("[%x]", value.func_val);
+					break;
 				case ev_pointer:
+					valstr = sprintf ("[%x]", value.pointer_val);
+					break;
 				case ev_quat:
+					valstr = sprintf ("[%q]", value.quaternion_val);
+					break;
 				case ev_integer:
+					valstr = sprintf ("%d", value.integer_val);
+					break;
 				case ev_uinteger:
+					valstr = sprintf ("%d", value.integer_val);
+					break;
 				case ev_short:
+					valstr = sprintf ("%d", value.integer_val);
+					break;
 				case ev_double:
-					valstr = sprintf ("%d", def.type_size >> 16);
+					valstr = sprintf ("%.17g", value.double_val);
 					break;
 			}
-			int         x = [locals_view size].width - strlen (valstr) - 1;
+			int         x = [locals_view size].width - strlen (valstr);
 			[locals_view mvaddstr:{x, y}, valstr];
 		}
 	}

From 75394cc4f83d7cf734e0838f58f695ba5a6c4f83 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 27 Mar 2020 12:24:14 +0900
Subject: [PATCH 1012/1519] [gamecode,qfcc] Use enums for type encoding types

The enums are forced to 32 bits via bitfield spec, so can't use sizeof
on them, but this makes switch enum checks work in gcc.
---
 include/QF/pr_type.h         | 4 ++--
 tools/qfcc/source/obj_type.c | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/include/QF/pr_type.h b/include/QF/pr_type.h
index c9e45185c..a0a0f0ad0 100644
--- a/include/QF/pr_type.h
+++ b/include/QF/pr_type.h
@@ -94,11 +94,11 @@ typedef struct qfot_array_s {
 	arrays.
 */
 typedef struct qfot_type_s {
-	pr_int_t    meta;				///< meta type: ty_meta_e
+	ty_meta_e   meta:32;			///< meta type
 	pr_int_t    size;				///< total word size of this encoding
 	string_t    encoding;			///< Objective-QC encoding
 	union {
-		pr_int_t    type;			///< ty_basic: etype_t
+		etype_t     type:32;		///< ty_basic: etype_t
 		qfot_fldptr_t fldptr;		///< ty_basic, ev_pointer/ev_field
 		qfot_func_t func;			///< ty_basic, ev_func
 		qfot_struct_t strct;		///< ty_struct/ty_union/ty_enum
diff --git a/tools/qfcc/source/obj_type.c b/tools/qfcc/source/obj_type.c
index c21e7e576..d12c196dc 100644
--- a/tools/qfcc/source/obj_type.c
+++ b/tools/qfcc/source/obj_type.c
@@ -151,7 +151,8 @@ qfo_encode_none (type_t *type)
 	else if (type->type == ev_pointer || type->type == ev_field)
 		return qfo_encode_fldptr (type);
 
-	def = qfo_new_encoding (type, sizeof (enc->t.type));
+	// can't use sizeof on enc->t.type, but pr_uint_t is the backing type
+	def = qfo_new_encoding (type, sizeof (pr_uint_t));
 	enc = D_POINTER (qfot_type_t, def);
 	enc->t.type = type->type;
 	return def;

From 53fd55143ef94a91d34727941181d576f522f2a9 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 27 Mar 2020 12:26:44 +0900
Subject: [PATCH 1013/1519] [qfcc] Fix missed none->basic rename

---
 tools/qfcc/source/obj_type.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/qfcc/source/obj_type.c b/tools/qfcc/source/obj_type.c
index d12c196dc..38a28a9e8 100644
--- a/tools/qfcc/source/obj_type.c
+++ b/tools/qfcc/source/obj_type.c
@@ -141,7 +141,7 @@ qfo_encode_fldptr (type_t *type)
 }
 
 static def_t *
-qfo_encode_none (type_t *type)
+qfo_encode_basic (type_t *type)
 {
 	qfot_type_t *enc;
 	def_t      *def;
@@ -260,7 +260,7 @@ qfo_encode_type (type_t *type)
 	reloc_t    *relocs = 0;
 
 	static encode_f funcs[] = {
-		qfo_encode_none,	// ty_none
+		qfo_encode_basic,	// ty_basic
 		qfo_encode_struct,	// ty_struct
 		qfo_encode_struct,	// ty_union
 		qfo_encode_struct,	// ty_enum

From 8b1e4eea58d03806a32d8d60f1fb59b3b39927cc Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 27 Mar 2020 12:27:46 +0900
Subject: [PATCH 1014/1519] [qfcc] Bring back the core of type aliasing

No aliasing is done yet, but most of the infrastructure is there again.
---
 include/QF/pr_type.h             |  7 +++++++
 libs/gamecode/pr_debug.c         |  6 ++++++
 tools/qfcc/include/type.h        |  5 +++++
 tools/qfcc/source/dump_globals.c |  4 ++++
 tools/qfcc/source/obj_file.c     |  5 +++++
 tools/qfcc/source/type.c         | 17 +++++++++++++++++
 6 files changed, 44 insertions(+)

diff --git a/include/QF/pr_type.h b/include/QF/pr_type.h
index a0a0f0ad0..db3376684 100644
--- a/include/QF/pr_type.h
+++ b/include/QF/pr_type.h
@@ -47,8 +47,14 @@ typedef enum {
 	ty_enum,
 	ty_array,
 	ty_class,
+	ty_alias,
 } ty_meta_e;
 
+typedef struct qfot_alias_s {
+	pr_int_t    type;				///< type at end of alias chain
+	pointer_t   aux_type;			///< referenced type
+	string_t    name;				///< alias name
+} qfot_alias_t;
 
 typedef struct qfot_fldptr_s {
 	pr_int_t    type;				///< ev_field or ev_pointer
@@ -104,6 +110,7 @@ typedef struct qfot_type_s {
 		qfot_struct_t strct;		///< ty_struct/ty_union/ty_enum
 		qfot_array_t array;			///< ty_array
 		string_t    class;			///< ty_class
+		qfot_alias_t alias;			///< ty_alias
 	}           t;
 } qfot_type_t;
 
diff --git a/libs/gamecode/pr_debug.c b/libs/gamecode/pr_debug.c
index 63f4444b4..dabaf227f 100644
--- a/libs/gamecode/pr_debug.c
+++ b/libs/gamecode/pr_debug.c
@@ -234,6 +234,9 @@ pr_debug_type_size (const progs_t *pr, const qfot_type_t *type)
 			return type->t.array.size * size;
 		case ty_class:
 			return 1;	//FIXME or should it return sizeof class struct?
+		case ty_alias:
+			aux_type = &G_STRUCT (pr, qfot_type_t, type->t.alias.aux_type);
+			return pr_debug_type_size (pr, aux_type);
 	}
 	return 0;
 }
@@ -883,6 +886,9 @@ value_string (pr_debug_data_t *data, qfot_type_t *type, pr_type_t *value)
 		case ty_class:
 			raw_type_view.class_view (type, value, data);
 			break;
+		case ty_alias://XXX
+			type = &G_STRUCT (data->pr, qfot_type_t, type->t.alias.aux_type);
+			return value_string (data, type, value);
 	}
 	return data->dstr->str;
 }
diff --git a/tools/qfcc/include/type.h b/tools/qfcc/include/type.h
index ba3b82f1e..bb6133bb1 100644
--- a/tools/qfcc/include/type.h
+++ b/tools/qfcc/include/type.h
@@ -51,6 +51,10 @@ typedef struct ty_array_s {
 	int         size;
 } ty_array_t;
 
+typedef struct ty_alias_s {
+	struct type_s *type;
+} ty_alias_t;
+
 typedef struct type_s {
 	etype_t     type;		///< ev_invalid means structure/array etc
 	const char *name;
@@ -64,6 +68,7 @@ typedef struct type_s {
 		ty_array_t  array;
 		struct symtab_s *symtab;
 		struct class_s *class;
+		ty_alias_t  alias;
 	} t;
 	struct type_s *next;
 	int         freeable;
diff --git a/tools/qfcc/source/dump_globals.c b/tools/qfcc/source/dump_globals.c
index 9b5900454..198a952cb 100644
--- a/tools/qfcc/source/dump_globals.c
+++ b/tools/qfcc/source/dump_globals.c
@@ -556,6 +556,10 @@ dump_qfo_types (qfo_t *qfo, int base_address)
 			case ty_class:
 				printf (" %-5x\n", type->t.class);
 				break;
+			case ty_alias:
+				printf (" %s %d %-5x\n", QFO_GETSTR (qfo, type->t.alias.name),
+						type->t.alias.type, type->t.alias.aux_type);
+				break;
 		}
 	}
 }
diff --git a/tools/qfcc/source/obj_file.c b/tools/qfcc/source/obj_file.c
index 45d01be47..0c08810f0 100644
--- a/tools/qfcc/source/obj_file.c
+++ b/tools/qfcc/source/obj_file.c
@@ -649,6 +649,7 @@ get_def_type (qfo_t *qfo, pointer_t type)
 		return ev_void;
 	type_def = QFO_POINTER (qfo, qfo_type_space, qfot_type_t, type);
 	switch ((ty_meta_e)type_def->meta) {
+		case ty_alias:	//XXX
 		case ty_basic:
 			// field, pointer and function types store their basic type in
 			// the same location.
@@ -676,6 +677,8 @@ get_type_size (qfo_t *qfo, pointer_t type)
 		return 1;
 	type_def = QFO_POINTER (qfo, qfo_type_space, qfot_type_t, type);
 	switch ((ty_meta_e)type_def->meta) {
+		case ty_alias:
+			return get_type_size (qfo, type_def->t.alias.aux_type);
 		case ty_basic:
 			// field, pointer and function types store their basic type in
 			// the same location.
@@ -724,6 +727,8 @@ get_type_alignment_log (qfo_t *qfo, pointer_t type)
 		return 0;
 	type_def = QFO_POINTER (qfo, qfo_type_space, qfot_type_t, type);
 	switch ((ty_meta_e)type_def->meta) {
+		case ty_alias:
+			return get_type_alignment_log (qfo, type_def->t.alias.aux_type);
 		case ty_basic:
 			// field, pointer and function types store their basic type in
 			// the same location.
diff --git a/tools/qfcc/source/type.c b/tools/qfcc/source/type.c
index 4404f2ed0..dc09104c3 100644
--- a/tools/qfcc/source/type.c
+++ b/tools/qfcc/source/type.c
@@ -297,6 +297,8 @@ types_same (type_t *a, type_t *b)
 			if (a->t.class != b->t.class)
 				return 0;
 			return compare_protocols (a->protos, b->protos);
+		case ty_alias:
+			return !strcmp (a->name, b->name);
 	}
 	internal_error (0, "we be broke");
 }
@@ -346,6 +348,9 @@ find_type (type_t *type)
 				break;
 			case ty_class:
 				break;
+			case ty_alias:
+				type->t.alias.type = find_type (type->t.alias.type);
+				break;
 		}
 	}
 
@@ -453,6 +458,11 @@ print_type_str (dstring_t *str, const type_t *type)
 		return;
 	}
 	switch (type->meta) {
+		case ty_alias:
+			dasprintf (str, "({%s=", type->name);
+			print_type_str (str, type->t.alias.type);
+			dstring_appendstr (str, "})");
+			return;
 		case ty_class:
 			dasprintf (str, " %s", type->t.class->name);
 			if (type->protos)
@@ -610,6 +620,11 @@ encode_type (dstring_t *encoding, const type_t *type)
 	if (!type)
 		return;
 	switch (type->meta) {
+		case ty_alias: // XXX do I want this, or just the unaliased type?
+			dasprintf (encoding, "{%s>", type->name);
+			encode_type (encoding, type->t.alias.type);
+			dasprintf (encoding, "}");
+			return;
 		case ty_class:
 			encode_class (encoding, type);
 			return;
@@ -936,6 +951,8 @@ type_size (const type_t *type)
 					size += type_size (class->super_class->type);
 				return size;
 			}
+		case ty_alias:
+			return type_size (type->t.alias.type);
 	}
 	return 0;
 }

From ab3d91f0c35acc76b624f4e6a71dc5c789fe2d2b Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 27 Mar 2020 15:16:41 +0900
Subject: [PATCH 1015/1519] [qfcc] Clean up simple type checking

All simple type checks are now done using is_* helper functions. This
will help hide the implementation details of the type system from the
rest of the compiler (especially the changes needed for type aliasing).
---
 tools/qfcc/include/class.h      | 12 +++--
 tools/qfcc/source/class.c       | 90 +++++++++++++++++++++------------
 tools/qfcc/source/constfold.c   | 36 ++++++-------
 tools/qfcc/source/def.c         |  8 +--
 tools/qfcc/source/dot_expr.c    |  4 +-
 tools/qfcc/source/expr.c        | 26 +++++-----
 tools/qfcc/source/expr_assign.c |  4 +-
 tools/qfcc/source/expr_bool.c   |  6 +--
 tools/qfcc/source/function.c    |  6 +--
 tools/qfcc/source/method.c      | 12 ++---
 tools/qfcc/source/qc-parse.y    |  6 +--
 tools/qfcc/source/statements.c  |  4 +-
 tools/qfcc/source/struct.c      |  2 +-
 tools/qfcc/source/stub.c        |  4 +-
 tools/qfcc/source/switch.c      |  5 +-
 tools/qfcc/source/type.c        | 10 ++--
 tools/qfcc/source/value.c       |  2 +-
 17 files changed, 133 insertions(+), 104 deletions(-)

diff --git a/tools/qfcc/include/class.h b/tools/qfcc/include/class.h
index 68cefcd12..e9bcb9c71 100644
--- a/tools/qfcc/include/class.h
+++ b/tools/qfcc/include/class.h
@@ -115,10 +115,14 @@ struct method_s;
 struct symbol_s;
 struct selector_s;
 
-int obj_is_id (const struct type_s *type) __attribute__((pure));
-int obj_is_class (const struct type_s *type) __attribute__((pure));
-int obj_is_Class (const struct type_s *type) __attribute__((const));
-int obj_is_classptr (const struct type_s *type) __attribute__((pure));
+int is_id (const struct type_s *type) __attribute__((pure));
+int is_class (const struct type_s *type) __attribute__((pure));
+int is_Class (const struct type_s *type) __attribute__((const));
+int is_classptr (const struct type_s *type) __attribute__((pure));
+int is_SEL (const struct type_s *type) __attribute__((pure));
+int is_object (const struct type_s *type) __attribute__((pure));
+int is_method (const struct type_s *type) __attribute__((pure));
+int is_method_description (const struct type_s *type) __attribute__((pure));
 int obj_types_assignable (const struct type_s *dst, const struct type_s *src);
 
 class_t *extract_class (class_type_t *class_type) __attribute__((pure));
diff --git a/tools/qfcc/source/class.c b/tools/qfcc/source/class.c
index 8b2081e82..9c962d50e 100644
--- a/tools/qfcc/source/class.c
+++ b/tools/qfcc/source/class.c
@@ -218,7 +218,7 @@ emit_instance_classname (def_t *def, void *data, int index)
 {
 	obj_static_instances_data_t *da = (obj_static_instances_data_t *)data;
 
-	if (def->type != &type_string)
+	if (!is_string(def->type))
 		internal_error (0, "%s: expected string def", __FUNCTION__);
 	EMIT_STRING (def->space, D_STRING (def), da->class_name);
 }
@@ -317,7 +317,7 @@ emit_static_instances_list (void)
 }
 
 int
-obj_is_id (const type_t *type)
+is_id (const type_t *type)
 {
 	if (type == &type_id)
 		return 1;
@@ -334,7 +334,7 @@ obj_is_id (const type_t *type)
 }
 
 int
-obj_is_class (const type_t *type)
+is_class (const type_t *type)
 {
 	if (type->type == ev_invalid && type->meta == ty_class)
 		return 1;
@@ -342,7 +342,7 @@ obj_is_class (const type_t *type)
 }
 
 int
-obj_is_Class (const type_t *type)
+is_Class (const type_t *type)
 {
 	if (type == &type_Class)
 		return 1;
@@ -350,25 +350,49 @@ obj_is_Class (const type_t *type)
 }
 
 int
-obj_is_classptr (const type_t *type)
+is_classptr (const type_t *type)
 {
 	// easy cases first :)
-	if (obj_is_id (type) || obj_is_Class (type))
+	if (is_id (type) || is_Class (type))
 		return 1;
 	if (type->type != ev_pointer)
 		return 0;
 	type = type->t.fldptr.type;
-	if (obj_is_class (type))
+	if (is_class (type))
 		return 1;
 	return 0;
 }
 
+int
+is_SEL (const type_t *type)
+{
+	return type == &type_SEL;
+}
+
+int
+is_object (const type_t *type)
+{
+	return type == &type_obj_object;
+}
+
+int
+is_method (const type_t *type)
+{
+	return type == &type_obj_method;
+}
+
+int
+is_method_description (const type_t *type)
+{
+	return type == &type_obj_method_description;
+}
+
 static protocollist_t *
 obj_get_class_protos (const type_t *type)
 {
 	if (is_pointer (type))
 		type = type->t.fldptr.type;
-	if (obj_is_class (type))
+	if (is_class (type))
 		return type->t.class->protocols;
 	return 0;
 }
@@ -386,7 +410,7 @@ obj_get_categories (const type_t *type)
 {
 	if (is_pointer (type))
 		type = type->t.fldptr.type;
-	if (obj_is_class (type))
+	if (is_class (type))
 		return type->t.class->categories;
 	return 0;
 }
@@ -400,14 +424,14 @@ obj_classname (const type_t *type)
 	if (!str)
 		str = dstring_new ();
 	dstring_clearstr (str);
-	if (obj_is_id (type)) {
+	if (is_id (type)) {
 		dstring_copystr (str, "id");
-	} else if (obj_is_Class (type)) {
+	} else if (is_Class (type)) {
 		dstring_copystr (str, "Class");
 	} else {
 		if (is_pointer (type))
 			type = type->t.fldptr.type;
-		if (obj_is_class (type))
+		if (is_class (type))
 			dstring_copystr (str, type->t.class->name);
 	}
 	if ((protos = obj_get_protos (type)))
@@ -437,17 +461,17 @@ obj_types_assignable (const type_t *dst, const type_t *src)
 	int         i;
 
 	//puts ("%$$\"$#%");
-	if (!obj_is_classptr (src)) {
+	if (!is_classptr (src)) {
 		// if dst is a class pointer, then the types are not compatible,
 		// otherwise unknown
-		return obj_is_classptr (dst) - 1;
+		return is_classptr (dst) - 1;
 	}
-	if (!obj_is_classptr (dst)) {
+	if (!is_classptr (dst)) {
 		return -1;
 	}
 
-	dst_is_proto = obj_is_id (dst) && (dst_protos = obj_get_protos (dst));
-	src_is_proto = obj_is_id (src) && (src_protos = obj_get_protos (src));
+	dst_is_proto = is_id (dst) && (dst_protos = obj_get_protos (dst));
+	src_is_proto = is_id (src) && (src_protos = obj_get_protos (src));
 
 	if (dst_is_proto) {
 		if (src_is_proto) {
@@ -460,7 +484,7 @@ obj_types_assignable (const type_t *dst, const type_t *src)
 					return 1;
 				}
 			}
-		} else if (!obj_is_id (src)) {
+		} else if (!is_id (src)) {
 			src_protos = obj_get_class_protos (src);
 			for (i = 0; i < dst_protos->count; i++) {
 				if (procollist_find_protocol (src_protos, dst_protos->list[i]))
@@ -477,7 +501,7 @@ obj_types_assignable (const type_t *dst, const type_t *src)
 	} else if (src_is_proto) {
 	} else {
 	}
-	if (obj_is_id (dst) || obj_is_id (src))
+	if (is_id (dst) || is_id (src))
 		return 1;
 
 	// check dst is a base class of src
@@ -700,7 +724,7 @@ emit_ivar_count (def_t *def, void *data, int index)
 {
 	ivar_data_t *ivar_data = (ivar_data_t *) data;
 
-	if (def->type != &type_integer)
+	if (!is_integer(def->type))
 		internal_error (0, "%s: expected integer def", __FUNCTION__);
 	D_INT (def) = ivar_data->count;
 }
@@ -1132,11 +1156,11 @@ class_message_response (type_t *clstype, int class_msg, expr_t *sel)
 	if (!selector)
 		return 0;
 
-	if (!obj_is_classptr (clstype) && !obj_is_class (clstype)) {
+	if (!is_classptr (clstype) && !is_class (clstype)) {
 		error (0, "neither class nor object");
 		return 0;
 	}
-	if (obj_is_id (clstype)) {
+	if (is_id (clstype)) {
 		protocollist_t *protos = clstype->t.fldptr.type->protos;
 		if (protos) {
 			if ((m = protocollist_find_method (protos, selector, !class_msg))) {
@@ -1149,12 +1173,12 @@ class_message_response (type_t *clstype, int class_msg, expr_t *sel)
 			dstring_delete (dstr);
 		}
 	} else {
-		if (obj_is_class (clstype)) {
+		if (is_class (clstype)) {
 			class = clstype->t.class;
-		} else if (obj_is_class (clstype->t.fldptr.type)) {
+		} else if (is_class (clstype->t.fldptr.type)) {
 			class = clstype->t.fldptr.type->t.class;
 		}
-		if (class && class->type != &type_obj_object) {
+		if (class && !is_object(class->type)) {
 			if (!class->interface_declared) {
 				class->interface_declared = 1;
 				warning (0, "cannot find interface declaration for `%s'",
@@ -1180,7 +1204,7 @@ class_message_response (type_t *clstype, int class_msg, expr_t *sel)
 		}
 	}
 	m = find_method (selector->name);
-	if (!m && (!class || class->type == &type_obj_object)) {
+	if (!m && (!class || is_object(class->type))) {
 		warning (sel, "could not find method for %c%s",
 				 class_msg ? '+' : '-', selector->name);
 	}
@@ -1383,7 +1407,7 @@ emit_symtab_ref_cnt (def_t *def, void *data, int index)
 {
 	obj_symtab_data_t *da = (obj_symtab_data_t *)data;
 
-	if (def->type != &type_integer)
+	if (!is_integer(def->type))
 		internal_error (0, "%s: expected integer def", __FUNCTION__);
 	D_INT (def) = 0;
 	if (da->refs)
@@ -1395,7 +1419,7 @@ emit_symtab_refs (def_t *def, void *data, int index)
 {
 	obj_symtab_data_t *da = (obj_symtab_data_t *)data;
 
-	if (def->type != &type_SEL)
+	if (!is_SEL(def->type))
 		internal_error (0, "%s: expected SEL def", __FUNCTION__);
 	D_INT (def) = 0;
 	if (da->refs)
@@ -1407,7 +1431,7 @@ emit_symtab_cls_def_cnt (def_t *def, void *data, int index)
 {
 	obj_symtab_data_t *da = (obj_symtab_data_t *)data;
 
-	if (def->type != &type_integer)
+	if (!is_integer(def->type))
 		internal_error (0, "%s: expected integer def", __FUNCTION__);
 	D_INT (def) = da->cls_def_cnt;
 }
@@ -1417,7 +1441,7 @@ emit_symtab_cat_def_cnt (def_t *def, void *data, int index)
 {
 	obj_symtab_data_t *da = (obj_symtab_data_t *)data;
 
-	if (def->type != &type_integer)
+	if (!is_integer(def->type))
 		internal_error (0, "%s: expected integer def", __FUNCTION__);
 	D_INT (def) = da->cat_def_cnt;
 }
@@ -1716,7 +1740,7 @@ emit_protocol (protocol_t *protocol)
 static void
 emit_protocol_next (def_t *def, void *data, int index)
 {
-	if (def->type != &type_pointer) {
+	if (!is_pointer(def->type)) {
 		internal_error (0, "%s: expected pointer def", __FUNCTION__);
 	}
 	D_INT (def) = 0;
@@ -1727,7 +1751,7 @@ emit_protocol_count (def_t *def, void *data, int index)
 {
 	protocollist_t *protocols = (protocollist_t *) data;
 
-	if (def->type != &type_integer) {
+	if (!is_integer(def->type)) {
 		internal_error (0, "%s: expected integer def", __FUNCTION__);
 	}
 	D_INT (def) = protocols->count;
@@ -1739,7 +1763,7 @@ emit_protocol_list_item (def_t *def, void *data, int index)
 	protocollist_t *protocols = (protocollist_t *) data;
 	protocol_t *protocol = protocols->list[index];
 
-	if (!is_array (def->type) || def->type->t.array.type != &type_pointer) {
+	if (!is_array (def->type) || !is_pointer(def->type->t.array.type)) {
 		internal_error (0, "%s: expected array of pointer def", __FUNCTION__);
 	}
 	if (index < 0 || index >= protocols->count) {
diff --git a/tools/qfcc/source/constfold.c b/tools/qfcc/source/constfold.c
index f367987a3..439f4760f 100644
--- a/tools/qfcc/source/constfold.c
+++ b/tools/qfcc/source/constfold.c
@@ -146,7 +146,7 @@ do_op_string (int op, expr_t *e, expr_t *e1, expr_t *e2)
 static expr_t *
 convert_to_float (expr_t *e)
 {
-	if (get_type (e) == &type_float)
+	if (is_float(get_type (e)))
 		return e;
 
 	switch (e->type) {
@@ -181,7 +181,7 @@ convert_to_float (expr_t *e)
 static expr_t *
 convert_to_double (expr_t *e)
 {
-	if (get_type (e) == &type_double)
+	if (is_double(get_type (e)))
 		return e;
 
 	switch (e->type) {
@@ -227,7 +227,7 @@ do_op_float (int op, expr_t *e, expr_t *e1, expr_t *e2)
 		return error (e1, "invalid operator for float");
 
 	if (op == '=') {
-		if ((type = get_type (e1)) != &type_float) {
+		if (!is_float(type = get_type (e1))) {
 			//FIXME optimize casting a constant
 			e->e.expr.e2 = e2 = cf_cast_expr (type, e2);
 		} else if ((conv = convert_to_float (e2)) != e2) {
@@ -356,7 +356,7 @@ do_op_double (int op, expr_t *e, expr_t *e1, expr_t *e2)
 		return error (e1, "invalid operator for double");
 
 	if (op == '=') {
-		if ((type = get_type (e1)) != &type_double) {
+		if (!is_double(type = get_type (e1))) {
 			//FIXME optimize casting a constant
 			e->e.expr.e2 = e2 = cf_cast_expr (type, e2);
 		} else if ((conv = convert_to_double (e2)) != e2) {
@@ -454,7 +454,7 @@ do_op_vector (int op, expr_t *e, expr_t *e1, expr_t *e2)
 	static int  valid[] = {'=', '+', '-', '*', EQ, NE, 0};
 	expr_t     *t;
 
-	if (get_type (e1) != &type_vector) {
+	if (!is_vector(get_type (e1))) {
 
 		if (op != '*')
 			return error (e1, "invalid operator for vector");
@@ -463,7 +463,7 @@ do_op_vector (int op, expr_t *e, expr_t *e1, expr_t *e2)
 		e->e.expr.e1 = e1 = e2;
 		e2 = t;
 	}
-	if (get_type (e2) != &type_vector) {
+	if (!is_vector(get_type (e2))) {
 		e->e.expr.e2 = e2 = convert_to_float (e2);
 		if (op != '*' && op != '/')
 			return error (e1, "invalid operator for vector");
@@ -476,7 +476,7 @@ do_op_vector (int op, expr_t *e, expr_t *e1, expr_t *e2)
 			e->e.expr.type = &type_integer;
 		else
 			e->e.expr.type = &type_float;
-	} else if (op == '*' && get_type (e2) == &type_vector) {
+	} else if (op == '*' && is_vector(get_type (e2))) {
 		e->e.expr.type = &type_float;
 	} else if (op == '/' && !is_constant (e1)) {
 		e2 = fold_constants (binary_expr ('/', new_float_expr (1), e2));
@@ -541,7 +541,7 @@ do_op_vector (int op, expr_t *e, expr_t *e1, expr_t *e2)
 			e = new_vector_expr (v);
 			break;
 		case '*':
-			if (get_type (e2) == &type_vector) {
+			if (is_vector(get_type (e2))) {
 				e = new_float_expr (DotProduct (v1, v2));
 			} else {
 				VectorScale (v1, v2[0], v);
@@ -577,7 +577,7 @@ do_op_entity (int op, expr_t *e, expr_t *e1, expr_t *e2)
 			e->e.expr.type = &type_float;
 		return e;
 	}
-	if (op != '=' || type != &type_entity)
+	if (op != '=' || !is_entity(type))
 		return error (e1, "invalid operator for entity");
 	e->e.expr.type = &type_entity;
 	return e;
@@ -649,7 +649,7 @@ do_op_pointer (int op, expr_t *e, expr_t *e1, expr_t *e2)
 	if (op != '.' && op != '&' && op != 'M'
 		&& extract_type (e1) != extract_type (e2))
 		return type_mismatch (e1, e2, op);
-	if ((op == '.' || op == '&') && get_type (e2) == &type_uinteger)
+	if ((op == '.' || op == '&') && is_uinteger(get_type (e2)))
 		e->e.expr.e2 = cf_cast_expr (&type_integer, e2);
 	return e;
 }
@@ -684,7 +684,7 @@ do_op_quaternion (int op, expr_t *e, expr_t *e1, expr_t *e2)
 	static int  valid[] = {'=', '+', '-', '*', EQ, NE, 0};
 	expr_t     *t;
 
-	if (get_type (e1) != &type_quaternion) {
+	if (!is_quaternion(get_type (e1))) {
 
 		if (op != '*' && op != '/')
 			return error (e1, "invalid operator for quaternion");
@@ -695,7 +695,7 @@ do_op_quaternion (int op, expr_t *e, expr_t *e1, expr_t *e2)
 			e2 = t;
 		}
 	}
-	if (get_type (e2) != &type_quaternion) {
+	if (!is_quaternion(get_type (e2))) {
 		e->e.expr.e2 = e2 = convert_to_float (e2);
 		if (op != '*' && op != '/')
 			return error (e1, "invalid operator for quaternion");
@@ -765,7 +765,7 @@ do_op_quaternion (int op, expr_t *e, expr_t *e1, expr_t *e2)
 			e = new_quaternion_expr (q);
 			break;
 		case '*':
-			if (get_type (e2) == &type_quaternion) {
+			if (is_quaternion(get_type (e2))) {
 				QuatMult (q1, q2, q);
 			} else {
 				QuatScale (q1, q2[3], q);
@@ -1397,7 +1397,7 @@ uop_float (int op, expr_t *e, expr_t *e1)
 	if (op == '+')
 		return e1;
 	type = get_type (e);
-	if (op == 'C' && type != &type_integer && type != &type_double)
+	if (op == 'C' && !is_integer(type) && !is_double(type))
 		return error (e1, "invalid cast of float");
 	if (!is_constant (e1))
 		return e;
@@ -1410,7 +1410,7 @@ uop_float (int op, expr_t *e, expr_t *e1)
 		case '~':
 			return new_float_expr (~(int) expr_float (e1));
 		case 'C':
-			if (type == &type_integer) {
+			if (is_integer(type)) {
 				return new_integer_expr (expr_float (e1));
 			} else {
 				return new_double_expr (expr_float (e1));
@@ -1549,7 +1549,7 @@ uop_integer (int op, expr_t *e, expr_t *e1)
 					  get_op_string (op));
 	if (op == '+')
 		return e1;
-	if (op == 'C' && get_type (e) != &type_float)
+	if (op == 'C' && !is_float(get_type (e)))
 		return error (e1, "invalid cast of int");
 	if (!is_constant (e1))
 		return e;
@@ -1624,7 +1624,7 @@ uop_double (int op, expr_t *e, expr_t *e1)
 	if (op == '+')
 		return e1;
 	type = get_type (e);
-	if (op == 'C' && type != &type_integer && type != &type_float)
+	if (op == 'C' && !is_integer(type) && !is_float(type))
 		return error (e1, "invalid cast of double");
 	if (!is_constant (e1))
 		return e;
@@ -1635,7 +1635,7 @@ uop_double (int op, expr_t *e, expr_t *e1)
 			print_type (get_type (e));
 			return cmp_result_expr (!expr_double (e1));
 		case 'C':
-			if (type == &type_integer) {
+			if (is_integer(type)) {
 				return new_integer_expr (expr_double (e1));
 			} else {
 				return new_float_expr (expr_double (e1));
diff --git a/tools/qfcc/source/def.c b/tools/qfcc/source/def.c
index 2fbf0bf08..7c671fb3d 100644
--- a/tools/qfcc/source/def.c
+++ b/tools/qfcc/source/def.c
@@ -140,7 +140,7 @@ new_def (const char *name, type_t *type, defspace_t *space,
 	if (!space && storage != sc_extern)
 		internal_error (0, "non-external def with no storage space");
 
-	if (obj_is_class (type)) {
+	if (is_class (type)) {
 		error (0, "statically allocated instance of class %s",
 			   type->t.class->name);
 		return def;
@@ -498,7 +498,7 @@ init_field_def (def_t *def, expr_t *init, storage_class_t storage)
 			def->nosave = 1;
 		}
 		// no support for initialized field vector componets (yet?)
-		if (type == &type_vector && options.code.vector_components)
+		if (is_vector(type) && options.code.vector_components)
 			init_vector_components (field_sym, 1);
 	} else if (init->type == ex_symbol) {
 		symbol_t   *sym = init->e.symbol;
@@ -566,7 +566,7 @@ initialize_def (symbol_t *sym, expr_t *init, defspace_t *space,
 		sym->s.def = new_def (sym->name, sym->type, space, storage);
 		reloc_attach_relocs (relocs, &sym->s.def->relocs);
 	}
-	if (sym->type == &type_vector && options.code.vector_components)
+	if (is_vector(sym->type) && options.code.vector_components)
 		init_vector_components (sym, 0);
 	if (sym->type->type == ev_field && storage != sc_local
 		&& storage != sc_param)
@@ -582,7 +582,7 @@ initialize_def (symbol_t *sym, expr_t *init, defspace_t *space,
 	if (init->type == ex_error)
 		return;
 	if ((is_array (sym->type) || is_struct (sym->type)
-		 || sym->type == &type_vector || sym->type == &type_quaternion)
+		 || is_vector(sym->type) || is_quaternion(sym->type))
 		&& ((init->type == ex_compound)
 			|| init->type == ex_nil)) {
 		init_elements (sym->s.def, init);
diff --git a/tools/qfcc/source/dot_expr.c b/tools/qfcc/source/dot_expr.c
index f66298b40..82c29c8d6 100644
--- a/tools/qfcc/source/dot_expr.c
+++ b/tools/qfcc/source/dot_expr.c
@@ -387,7 +387,7 @@ print_vector (dstring_t *dstr, expr_t *e, int level, int id, expr_t *next)
 {
 	int         indent = level * 2 + 2;
 
-	if (e->e.vector.type == &type_vector) {
+	if (is_vector(e->e.vector.type)) {
 		expr_t     *x = e->e.vector.list;
 		expr_t     *y = x->next;
 		expr_t     *z = y->next;
@@ -398,7 +398,7 @@ print_vector (dstring_t *dstr, expr_t *e, int level, int id, expr_t *next)
 		dasprintf (dstr, "%*se_%p -> \"e_%p\";\n", indent, "", e, y);
 		dasprintf (dstr, "%*se_%p -> \"e_%p\";\n", indent, "", e, z);
 	}
-	if (e->e.vector.type == &type_quaternion) {
+	if (is_quaternion(e->e.vector.type)) {
 		if (e->e.vector.list->next->next) {
 			expr_t     *x = e->e.vector.list;
 			expr_t     *y = x->next;
diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index ac128e378..f4291bb33 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -133,7 +133,7 @@ convert_vector (expr_t *e)
 
 	if (e->type != ex_vector)
 		return e;
-	if (e->e.vector.type == &type_vector) {
+	if (is_vector(e->e.vector.type)) {
 		// guaranteed to have three elements
 		expr_t     *x = e->e.vector.list;
 		expr_t     *y = x->next;
@@ -155,7 +155,7 @@ convert_vector (expr_t *e)
 		e->e.vector.list = x;
 		return e;
 	}
-	if (e->e.vector.type == &type_quaternion) {
+	if (is_quaternion(e->e.vector.type)) {
 		// guaranteed to have two or four elements
 		if (e->e.vector.list->next->next) {
 			// four vals: x, y, z, w
@@ -1321,7 +1321,7 @@ get_struct_field (const type_t *t1, expr_t *e1, expr_t *e2)
 		return 0;
 	}
 	field = symtab_lookup (strct, sym->name);
-	if (!field && t1 != &type_entity) {
+	if (!field && !is_entity(t1)) {
 		error (e2, "'%s' has no member named '%s'", t1->name + 4, sym->name);
 		e1->type = ex_error;
 	}
@@ -1370,7 +1370,7 @@ field_expr (expr_t *e1, expr_t *e2)
 			e = new_binary_expr ('&', e1, e2);
 			e->e.expr.type = pointer_type (field->type);
 			return unary_expr ('.', e);
-		} else if (obj_is_class (t1->t.fldptr.type)) {
+		} else if (is_class (t1->t.fldptr.type)) {
 			class_t    *class = t1->t.fldptr.type->t.class;
 			symbol_t   *sym = e2->e.symbol;//FIXME need to check
 			symbol_t   *ivar;
@@ -1394,7 +1394,7 @@ field_expr (expr_t *e1, expr_t *e2)
 			return e1;
 
 		if (e1->type == ex_expr && e1->e.expr.op == '.'
-			&& get_type (e1->e.expr.e1) == &type_entity) {
+			&& is_entity(get_type (e1->e.expr.e1))) {
 			// undo the . expression
 			e2 = e1->e.expr.e2;
 			e1 = e1->e.expr.e1;
@@ -1426,7 +1426,7 @@ field_expr (expr_t *e1, expr_t *e2)
 				return new_offset_alias_expr (field->type, e1, field->s.offset);
 			}
 		}
-	} else if (obj_is_class (t1)) {
+	} else if (is_class (t1)) {
 		//Class instance variables aren't allowed and thus declaring one
 		//is treated as an error, so this is a follow-on error.
 		return error (e1, "class instance access");
@@ -1794,8 +1794,8 @@ bitnot_expr:
 						expr_t     *n = new_unary_expr (op, e);
 						type_t     *t = get_type (e);
 
-						if (t != &type_integer && t != &type_float
-							&& t != &type_quaternion)
+						if (!is_integer(t) && !is_float(t)
+							&& !is_quaternion(t))
 							return error (e, "invalid type for unary ~");
 						n->e.expr.type = t;
 						return n;
@@ -1963,7 +1963,7 @@ build_function_call (expr_t *fexpr, const type_t *ftype, expr_t *params)
 	e = expr_file_line (new_binary_expr ('c', fexpr, args), fexpr);
 	e->e.expr.type = ftype->t.func.type;
 	append_expr (call, e);
-	if (ftype->t.func.type != &type_void) {
+	if (!is_void(ftype->t.func.type)) {
 		call->e.block.result = new_ret_expr (ftype->t.func.type);
 	} else if (options.traditional) {
 		call->e.block.result = new_ret_expr (&type_float);
@@ -2030,7 +2030,7 @@ return_expr (function_t *f, expr_t *e)
 	type_t     *ret_type = f->sym->type->t.func.type;
 
 	if (!e) {
-		if (ret_type != &type_void) {
+		if (!is_void(ret_type)) {
 			if (options.traditional) {
 				if (options.warnings.traditional)
 					warning (e,
@@ -2057,7 +2057,7 @@ return_expr (function_t *f, expr_t *e)
 	if (e->type == ex_error) {
 		return e;
 	}
-	if (ret_type == &type_void) {
+	if (is_void(ret_type)) {
 		if (!options.traditional)
 			return error (e, "returning a value for a void function");
 		if (options.warnings.traditional)
@@ -2066,11 +2066,11 @@ return_expr (function_t *f, expr_t *e)
 	if (e->type == ex_bool) {
 		e = convert_from_bool (e, ret_type);
 	}
-	if (ret_type == &type_float && is_integer_val (e)) {
+	if (is_float(ret_type) && is_integer_val (e)) {
 		convert_int (e);
 		t = &type_float;
 	}
-	if (t == &type_void) {
+	if (is_void(t)) {
 		if (e->type == ex_nil) {
 			t = ret_type;
 			convert_nil (e, t);
diff --git a/tools/qfcc/source/expr_assign.c b/tools/qfcc/source/expr_assign.c
index 7d1f1aab9..937da6d5c 100644
--- a/tools/qfcc/source/expr_assign.c
+++ b/tools/qfcc/source/expr_assign.c
@@ -222,7 +222,7 @@ assign_vector_expr (expr_t *dst, expr_t *src)
 		}
 	}
 	if (src->type == ex_vector && dst->type != ex_vector) {
-		if (src->e.vector.type == &type_vector) {
+		if (is_vector(src->e.vector.type)) {
 			// guaranteed to have three elements
 			sx = src->e.vector.list;
 			sy = sx->next;
@@ -237,7 +237,7 @@ assign_vector_expr (expr_t *dst, expr_t *src)
 			block->e.block.result = dst;
 			return block;
 		}
-		if (src->e.vector.type == &type_quaternion) {
+		if (is_quaternion(src->e.vector.type)) {
 			// guaranteed to have two or four elements
 			if (src->e.vector.list->next->next) {
 				// four vals: x, y, z, w
diff --git a/tools/qfcc/source/expr_bool.c b/tools/qfcc/source/expr_bool.c
index 74f8d24de..0fcb8b394 100644
--- a/tools/qfcc/source/expr_bool.c
+++ b/tools/qfcc/source/expr_bool.c
@@ -96,7 +96,7 @@ test_expr (expr_t *e)
 		case ev_uinteger:
 		case ev_integer:
 		case ev_short:
-			if (type_default != &type_integer) {
+			if (!is_integer(type_default)) {
 				if (is_constant (e)) {
 					return cast_expr (type_default, e);
 				}
@@ -106,7 +106,7 @@ test_expr (expr_t *e)
 		case ev_float:
 			if (options.code.fast_float
 				|| options.code.progsversion == PROG_ID_VERSION) {
-				if (type_default != &type_float) {
+				if (!is_float(type_default)) {
 					if (is_constant (e)) {
 						return cast_expr (type_default, e);
 					}
@@ -270,7 +270,7 @@ convert_bool (expr_t *e, int block)
 	}
 
 	if (e->type == ex_uexpr && e->e.expr.op == '!'
-		&& get_type (e->e.expr.e1) != &type_string) {
+		&& !is_string(get_type (e->e.expr.e1))) {
 		e = convert_bool (e->e.expr.e1, 0);
 		if (e->type == ex_error)
 			return e;
diff --git a/tools/qfcc/source/function.c b/tools/qfcc/source/function.c
index 234d622d9..e9cb0c823 100644
--- a/tools/qfcc/source/function.c
+++ b/tools/qfcc/source/function.c
@@ -172,7 +172,7 @@ parse_params (type_t *type, param_t *parms)
 	type_t     *new;
 	int         count = 0;
 
-	if (type && obj_is_class (type)) {
+	if (type && is_class (type)) {
 		error (0, "cannot return an object (forgot *?)");
 		type = &type_id;
 	}
@@ -197,7 +197,7 @@ parse_params (type_t *type, param_t *parms)
 				internal_error (0, 0);
 			new->t.func.num_params = -(new->t.func.num_params + 1);
 		} else if (p->type) {
-			if (obj_is_class (p->type)) {
+			if (is_class (p->type)) {
 				error (0, "cannot use an object as a parameter (forgot *?)");
 				p->type = &type_id;
 			}
@@ -216,7 +216,7 @@ check_params (param_t *params)
 	if (!params)
 		return 0;
 	while (p) {
-		if (p->type == &type_void) {
+		if (p->type && is_void(p->type)) {
 			if (p->name) {
 				error (0, "parameter %d ('%s') has incomplete type", num,
 					   p->name);
diff --git a/tools/qfcc/source/method.c b/tools/qfcc/source/method.c
index 458fb00b2..74971ef1c 100644
--- a/tools/qfcc/source/method.c
+++ b/tools/qfcc/source/method.c
@@ -480,7 +480,7 @@ get_selector (expr_t *sel)
 	selector_t  _sel = {0, 0, 0};
 
 	if (sel->type != ex_expr && sel->e.expr.op != '&'
-		&& sel->e.expr.type != &type_SEL) {
+		&& !is_SEL(sel->e.expr.type)) {
 		error (sel, "not a selector");
 		return 0;
 	}
@@ -525,7 +525,7 @@ emit_selectors (void)
 static void
 emit_methods_next (def_t *def, void *data, int index)
 {
-	if (def->type != &type_pointer)
+	if (!is_pointer(def->type))
 		internal_error (0, "%s: expected pointer def", __FUNCTION__);
 	D_INT (def) = 0;
 }
@@ -535,7 +535,7 @@ emit_methods_count (def_t *def, void *data, int index)
 {
 	methodlist_t *methods = (methodlist_t *) data;
 
-	if (def->type != &type_integer)
+	if (!is_integer(def->type))
 		internal_error (0, "%s: expected integer def", __FUNCTION__);
 	D_INT (def) = methods->count;
 }
@@ -547,7 +547,7 @@ emit_methods_list_item (def_t *def, void *data, int index)
 	method_t   *m;
 	pr_method_t *meth;
 
-	if (!is_array (def->type) || def->type->t.array.type != &type_obj_method)
+	if (!is_array (def->type) || !is_method(def->type->t.array.type))
 		internal_error (0, "%s: expected array of method def",
 						__FUNCTION__);
 	if (index < 0 || index >= methods->count)
@@ -614,7 +614,7 @@ emit_method_list_count (def_t *def, void *data, int index)
 {
 	methodlist_t *methods = (methodlist_t *) data;
 
-	if (def->type != &type_integer)
+	if (!is_integer(def->type))
 		internal_error (0, "%s: expected integer def", __FUNCTION__);
 	D_INT (def) = methods->count;
 }
@@ -627,7 +627,7 @@ emit_method_list_item (def_t *def, void *data, int index)
 	pr_method_description_t *desc;
 
 	if (!is_array (def->type)
-		|| def->type->t.array.type != &type_obj_method_description) {
+		|| !is_method_description(def->type->t.array.type)) {
 		internal_error (0, "%s: expected array of method_description def",
 						__FUNCTION__);
 	}
diff --git a/tools/qfcc/source/qc-parse.y b/tools/qfcc/source/qc-parse.y
index 4e49397bc..70ca90fc3 100644
--- a/tools/qfcc/source/qc-parse.y
+++ b/tools/qfcc/source/qc-parse.y
@@ -704,7 +704,7 @@ struct_defs
 	| DEFS '(' identifier ')'
 		{
 			$3 = check_undefined ($3);
-			if (!$3->type || !obj_is_class ($3->type)) {
+			if (!$3->type || !is_class ($3->type)) {
 				error (0, "`%s' is not a class", $3->name);
 			} else {
 				// replace the struct symbol table with one built from
@@ -860,7 +860,7 @@ qc_func_params
 	| '(' ps qc_var_list ')'				{ $$ = check_params ($3); }
 	| '(' ps TYPE ')'
 		{
-			if ($3 != &type_void)
+			if (!is_void ($3))
 				PARSE_ERROR;
 			$$ = 0;
 		}
@@ -1629,7 +1629,7 @@ class_name
 				if (!$1->table) {
 					symtab_addsymbol (current_symtab, $1);
 				}
-			} else if (!obj_is_class ($1->type)) {
+			} else if (!is_class ($1->type)) {
 				error (0, "`%s' is not a class", $1->name);
 				$$ = get_class (0, 1);
 			} else {
diff --git a/tools/qfcc/source/statements.c b/tools/qfcc/source/statements.c
index ba7af0765..bd2508e54 100644
--- a/tools/qfcc/source/statements.c
+++ b/tools/qfcc/source/statements.c
@@ -1347,7 +1347,7 @@ expr_vector_e (sblock_t *sblock, expr_t *e, operand_t **op)
 	pr.source_line = e->line;
 
 	tmp = new_temp_def_expr (vec_type);
-	if (vec_type == &type_vector) {
+	if (is_vector(vec_type)) {
 		// guaranteed to have three elements
 		x = e->e.vector.list;
 		y = x->next;
@@ -2017,7 +2017,7 @@ check_final_block (sblock_t *sblock)
 		if (statement_is_return (s))
 			return;
 	}
-	if (current_func->sym->type->t.func.type != &type_void)
+	if (!is_void(current_func->sym->type->t.func.type))
 		warning (0, "control reaches end of non-void function");
 	if (s && s->type >= st_func) {
 		// func and flow end blocks, so we need to add a new block to take the
diff --git a/tools/qfcc/source/struct.c b/tools/qfcc/source/struct.c
index 85c8a85ba..2e828de1b 100644
--- a/tools/qfcc/source/struct.c
+++ b/tools/qfcc/source/struct.c
@@ -125,7 +125,7 @@ build_struct (int su, symbol_t *tag, symtab_t *symtab, type_t *type)
 	for (s = symtab->symbols; s; s = s->next) {
 		if (s->sy_type != sy_var)
 			continue;
-		if (obj_is_class (s->type)) {
+		if (is_class (s->type)) {
 			error (0, "statically allocated instance of class %s",
 				   s->type->t.class->name);
 		}
diff --git a/tools/qfcc/source/stub.c b/tools/qfcc/source/stub.c
index 4ff08975c..405104126 100644
--- a/tools/qfcc/source/stub.c
+++ b/tools/qfcc/source/stub.c
@@ -45,5 +45,7 @@ __attribute__((const)) symbol_t *new_symbol_type (const char *name, type_t *type
 __attribute__((const)) def_t *qfo_encode_type (type_t *type) {return 0;}
 __attribute__((const)) int obj_types_assignable (const type_t *dst, const type_t *src) {return 0;}
 void print_protocollist (struct dstring_s *dstr, protocollist_t *protocollist) {}
-int obj_is_id (const type_t *type){return type->type;}
+int is_id (const type_t *type){return type->type;}
+int is_SEL (const type_t *type){return type->type;}
+int is_Class (const type_t *type){return type->type;}
 int compare_protocols (protocollist_t *protos1, protocollist_t *protos2){return protos1->count - protos2->count;}
diff --git a/tools/qfcc/source/switch.c b/tools/qfcc/source/switch.c
index 88ba6a60e..77e79f3a4 100644
--- a/tools/qfcc/source/switch.c
+++ b/tools/qfcc/source/switch.c
@@ -429,8 +429,7 @@ switch_expr (switch_block_t *switch_block, expr_t *break_label,
 	for (l = labels; *l; l++)
 		num_labels++;
 	if (options.code.progsversion == PROG_ID_VERSION
-		|| (type != &type_string
-			&& type != &type_float && !is_integral (type))
+		|| (!is_string(type) && !is_float(type) && !is_integral (type))
 		|| num_labels < 8) {
 		for (l = labels; *l; l++) {
 			expr_t     *cmp = binary_expr (EQ, sw_val, (*l)->value);
@@ -446,7 +445,7 @@ switch_expr (switch_block_t *switch_block, expr_t *break_label,
 		int         op;
 		case_node_t *case_tree;
 
-		if (type == &type_string)
+		if (is_string(type))
 			temp = new_temp_def_expr (&type_integer);
 		else
 			temp = new_temp_def_expr (type);
diff --git a/tools/qfcc/source/type.c b/tools/qfcc/source/type.c
index dc09104c3..0b54267b6 100644
--- a/tools/qfcc/source/type.c
+++ b/tools/qfcc/source/type.c
@@ -513,13 +513,13 @@ print_type_str (dstring_t *str, const type_t *type)
 					}
 					return;
 				case ev_pointer:
-					if (obj_is_id (type)) {
+					if (is_id (type)) {
 						dasprintf (str, "id");
 						if (type->t.fldptr.type->protos)
 							print_protocollist (str, type->t.fldptr.type->protos);
 						return;
 					}
-					if (type == &type_SEL) {
+					if (is_SEL(type)) {
 						dasprintf (str, "SEL");
 						return;
 					}
@@ -674,15 +674,15 @@ encode_type (dstring_t *encoding, const type_t *type)
 					dasprintf (encoding, "%s)", encode_params (type));
 					return;
 				case ev_pointer:
-					if (type == &type_id) {
+					if (is_id(type)) {
 						dasprintf (encoding, "@");
 						return;
 					}
-					if (type == &type_SEL) {
+					if (is_SEL(type)) {
 						dasprintf (encoding, ":");
 						return;
 					}
-					if (type == &type_Class) {
+					if (is_Class(type)) {
 						dasprintf (encoding, "#");
 						return;
 					}
diff --git a/tools/qfcc/source/value.c b/tools/qfcc/source/value.c
index 3233385bf..b2182497e 100644
--- a/tools/qfcc/source/value.c
+++ b/tools/qfcc/source/value.c
@@ -513,7 +513,7 @@ emit_value (ex_value_t *value, def_t *def)
 			break;
 		case ev_integer:
 		case ev_uinteger:
-			if (!def || def->type != &type_float) {
+			if (!def || !is_float(def->type)) {
 				tab = integer_imm_defs;
 				type = &type_integer;
 				break;

From 498dfdbfef1677ce50fb2717394487d8b54f72ba Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 27 Mar 2020 15:33:53 +0900
Subject: [PATCH 1016/1519] [qfcc] Clean up Obj-QC type struct names

I decided that the obj_ tag was unnecessary.
---
 tools/qfcc/include/class.h   |  16 +++---
 tools/qfcc/source/class.c    | 108 +++++++++++++++++------------------
 tools/qfcc/source/expr_obj.c |   2 +-
 tools/qfcc/source/method.c   |   5 +-
 tools/qfcc/source/qc-lex.l   |   4 +-
 5 files changed, 66 insertions(+), 69 deletions(-)

diff --git a/tools/qfcc/include/class.h b/tools/qfcc/include/class.h
index e9bcb9c71..048ae8227 100644
--- a/tools/qfcc/include/class.h
+++ b/tools/qfcc/include/class.h
@@ -90,18 +90,18 @@ typedef struct static_instance_s {
 } static_instance_t;
 
 extern struct type_s type_id;
-extern struct type_s type_obj_object;
-extern struct type_s type_obj_class;
+extern struct type_s type_object;
+extern struct type_s type_class;
 extern struct type_s type_Class;
-extern struct type_s type_obj_protocol;
+extern struct type_s type_protocol;
 extern struct type_s type_SEL;
 extern struct type_s type_IMP;
 extern struct type_s type_supermsg;
-extern struct type_s type_obj_exec_class;
-extern struct type_s type_obj_method;
-extern struct type_s type_obj_super;
-extern struct type_s type_obj_method_description;
-extern struct type_s type_obj_category;
+extern struct type_s type_exec_class;
+extern struct type_s type_method;
+extern struct type_s type_super;
+extern struct type_s type_method_description;
+extern struct type_s type_category;
 extern struct type_s type_ivar;
 extern struct type_s type_module;
 
diff --git a/tools/qfcc/source/class.c b/tools/qfcc/source/class.c
index 9c962d50e..c9dceb358 100644
--- a/tools/qfcc/source/class.c
+++ b/tools/qfcc/source/class.c
@@ -70,33 +70,31 @@ static hashtab_t *static_instances;
 static hashtab_t *static_instance_classes;
 
 // these will be built up further
-type_t      type_obj_selector = { ev_invalid, 0, 0, ty_struct};
-type_t      type_SEL = { ev_pointer, "SEL", 1, ty_basic,
-						{{&type_obj_selector}}};
+type_t      type_selector = { ev_invalid, 0, 0, ty_struct};
+type_t      type_SEL = { ev_pointer, "SEL", 1, ty_basic, {{&type_selector}}};
 type_t     *IMP_params[] = {&type_id, &type_SEL};
 type_t      type_IMP = { ev_func, "IMP", 1, ty_basic,
 						 {{&type_id, -3, IMP_params}}};
-type_t      type_obj_super = { ev_invalid, 0, 0 };
-type_t      type_SuperPtr = { ev_pointer, 0, 1, ty_basic, {{&type_obj_super}}};
+type_t      type_super = { ev_invalid, 0, 0 };
+type_t      type_SuperPtr = { ev_pointer, 0, 1, ty_basic, {{&type_super}}};
 type_t     *supermsg_params[] = {&type_SuperPtr, &type_SEL};
 type_t      type_supermsg = { ev_func, ".supermsg", 1, ty_basic,
 							  {{&type_id, -3, supermsg_params}}};
-type_t      type_obj_method = { ev_invalid, 0, 0, ty_struct };
-type_t      type_obj_method_description = { ev_invalid, 0, 0, ty_struct };
-type_t      type_obj_category = { ev_invalid, 0, 0, ty_struct};
-type_t      type_obj_ivar = { ev_invalid, 0, 0, ty_struct};
-type_t      type_obj_module = { ev_invalid, 0, 0, ty_struct};
-type_t      type_moduleptr = { ev_pointer, 0, 1, ty_basic,
-									{{&type_obj_module}}};
+type_t      type_method = { ev_invalid, 0, 0, ty_struct };
+type_t      type_method_description = { ev_invalid, 0, 0, ty_struct };
+type_t      type_category = { ev_invalid, 0, 0, ty_struct};
+type_t      type_ivar = { ev_invalid, 0, 0, ty_struct};
+type_t      type_module = { ev_invalid, 0, 0, ty_struct};
+type_t      type_moduleptr = { ev_pointer, 0, 1, ty_basic, {{&type_module}}};
 type_t     *obj_exec_class_params[] = { &type_moduleptr };
-type_t      type_obj_exec_class = { ev_func, 0, 1, ty_basic,
-									{{&type_void, 1, obj_exec_class_params}}};
+type_t      type_exec_class = { ev_func, 0, 1, ty_basic,
+								{{&type_void, 1, obj_exec_class_params}}};
 
-type_t      type_obj_object = {ev_invalid, 0, 0, ty_struct};
-type_t      type_id = { ev_pointer, "id", 1, ty_basic, {{&type_obj_object}}};
-type_t      type_obj_class = { ev_invalid, 0, 0, ty_struct};
-type_t      type_Class = { ev_pointer, 0, 1, ty_basic, {{&type_obj_class}}};
-type_t      type_obj_protocol = { ev_invalid, 0, 0, ty_struct};
+type_t      type_object = {ev_invalid, 0, 0, ty_struct};
+type_t      type_id = { ev_pointer, "id", 1, ty_basic, {{&type_object}}};
+type_t      type_class = { ev_invalid, 0, 0, ty_struct};
+type_t      type_Class = { ev_pointer, 0, 1, ty_basic, {{&type_class}}};
+type_t      type_protocol = { ev_invalid, 0, 0, ty_struct};
 
 int         obj_initialized = 0;
 
@@ -328,7 +326,7 @@ is_id (const type_t *type)
 	if (!is_struct (type->t.fldptr.type))
 		return 0;
 	// if the the symtabs match, then type is id in disguise
-	if (type->t.fldptr.type->t.symtab == type_obj_object.t.symtab)
+	if (type->t.fldptr.type->t.symtab == type_object.t.symtab)
 		return 1;
 	return 0;
 }
@@ -372,19 +370,19 @@ is_SEL (const type_t *type)
 int
 is_object (const type_t *type)
 {
-	return type == &type_obj_object;
+	return type == &type_object;
 }
 
 int
 is_method (const type_t *type)
 {
-	return type == &type_obj_method;
+	return type == &type_method;
 }
 
 int
 is_method_description (const type_t *type)
 {
-	return type == &type_obj_method_description;
+	return type == &type_method_description;
 }
 
 static protocollist_t *
@@ -564,11 +562,11 @@ class_symbol (class_type_t *class_type, int external)
 			name = va ("_OBJ_CATEGORY_%s_%s",
 					   class_type->c.category->class->name,
 					   class_type->c.category->name);
-			type = &type_obj_category;
+			type = &type_category;
 			break;
 		case ct_class:
 			name = va ("_OBJ_CLASS_%s", class_type->c.class->name);
-			type = &type_obj_class;
+			type = &type_class;
 			break;
 		case ct_protocol:
 			return 0;		// probably in error recovery
@@ -784,7 +782,7 @@ emit_ivars (symtab_t *ivars, const char *name)
 			if (s->sy_type == sy_var)
 				ivar_data.count++;
 	}
-	ivar_list_struct[1].type = array_type (&type_obj_ivar, ivar_data.count);
+	ivar_list_struct[1].type = array_type (&type_ivar, ivar_data.count);
 
 	def = emit_structure (va ("_OBJ_INSTANCE_VARIABLES_%s", name), 's',
 						  ivar_list_struct, 0, &ivar_data, sc_static);
@@ -804,7 +802,7 @@ begin_class (class_t *class)
 	defspace_t *space;
 
 	sym = make_symbol (va ("_OBJ_METACLASS_%s", class->name),
-					   &type_obj_class, pr.far_data, sc_static);
+					   &type_class, pr.far_data, sc_static);
 	meta_def = sym->s.def;
 	meta_def->initialized = meta_def->constant = meta_def->nosave = 1;
 	space = meta_def->space;
@@ -814,13 +812,13 @@ begin_class (class_t *class)
 		EMIT_STRING (space, meta->super_class, class->super_class->name);
 	EMIT_STRING (space, meta->name, class->name);
 	meta->info = _PR_CLS_META;
-	meta->instance_size = type_size (&type_obj_class);
+	meta->instance_size = type_size (&type_class);
 	if (!class->super_class) {
 		// The ivars list for the meta class struct get emitted only for the
 		// root class of the hierachy.
-		// NOTE: type_obj_class is not actually a class
+		// NOTE: type_class is not actually a class
 		EMIT_DEF (space, meta->ivars,
-				  emit_ivars (type_obj_class.t.symtab, "Class"));
+				  emit_ivars (type_class.t.symtab, "Class"));
 	} else {
 		meta->ivars = 0;
 	}
@@ -1532,11 +1530,11 @@ class_finish_module (void)
 	free (data.classes);
 	free (data.categories);
 
-	module_sym = make_symbol ("_OBJ_MODULE", &type_obj_module, pr.far_data,
+	module_sym = make_symbol ("_OBJ_MODULE", &type_module, pr.far_data,
 							  sc_static);
 	symtab_addsymbol (current_symtab, module_sym);
 	module = &D_STRUCT (pr_module_t, module_sym->s.def);
-	module->size = type_size (&type_obj_module);
+	module->size = type_size (&type_module);
 	EMIT_STRING (module_sym->s.def->space, module->name,
 				 GETSTR (pr.source_file));
 	EMIT_DEF (module_sym->s.def->space, module->symtab, symtab_def);
@@ -1544,7 +1542,7 @@ class_finish_module (void)
 	exec_class_sym = symtab_lookup (pr.symtab, "__obj_exec_class");
 	if (!exec_class_sym) {
 		exec_class_sym = new_symbol_type ("__obj_exec_class",
-										  &type_obj_exec_class);
+										  &type_exec_class);
 		exec_class_sym = function_symbol (exec_class_sym, 0, 1);
 		make_function (exec_class_sym, 0, exec_class_sym->table->space,
 					   sc_extern);
@@ -1717,7 +1715,7 @@ emit_protocol (protocol_t *protocol)
 	defspace_t *space;
 
 	proto_def = make_symbol (va ("_OBJ_PROTOCOL_%s", protocol->name),
-							 &type_obj_protocol, pr.far_data, sc_static)->s.def;
+							 &type_protocol, pr.far_data, sc_static)->s.def;
 	if (proto_def->initialized)
 		return proto_def;
 	proto_def->initialized = proto_def->constant = 1;
@@ -1884,26 +1882,26 @@ class_finish_ivar_scope (class_type_t *class_type, symtab_t *ivar_scope,
 static void
 init_objective_structs (void)
 {
-	make_structure ("obj_selector", 's', sel_struct, &type_obj_selector);
-	chain_type (&type_obj_selector);
+	make_structure ("obj_selector", 's', sel_struct, &type_selector);
+	chain_type (&type_selector);
 	chain_type (&type_SEL);
 	chain_type (&type_IMP);
 
-	make_structure ("obj_method", 's', method_struct, &type_obj_method);
-	chain_type (&type_obj_method);
+	make_structure ("obj_method", 's', method_struct, &type_method);
+	chain_type (&type_method);
 
 	make_structure ("obj_method_description", 's', method_desc_struct,
-					&type_obj_method_description);
-	chain_type (&type_obj_method_description);
+					&type_method_description);
+	chain_type (&type_method_description);
 
-	make_structure ("obj_category", 's', category_struct, &type_obj_category);
-	chain_type (&type_obj_category);
+	make_structure ("obj_category", 's', category_struct, &type_category);
+	chain_type (&type_category);
 
-	make_structure ("obj_ivar", 's', ivar_struct, &type_obj_ivar);
-	chain_type (&type_obj_ivar);
+	make_structure ("obj_ivar", 's', ivar_struct, &type_ivar);
+	chain_type (&type_ivar);
 
-	make_structure ("obj_super", 's', super_struct, &type_obj_super);
-	chain_type (&type_obj_super);
+	make_structure ("obj_super", 's', super_struct, &type_super);
+	chain_type (&type_super);
 	chain_type (&type_SuperPtr);
 	chain_type (&type_supermsg);
 
@@ -1913,24 +1911,24 @@ init_objective_structs (void)
 static void
 init_classes (void)
 {
-	make_structure ("obj_class", 's', class_struct, &type_obj_class);
-	chain_type (&type_obj_class);
+	make_structure ("obj_class", 's', class_struct, &type_class);
+	chain_type (&type_class);
 	chain_type (&type_Class);
-	make_structure ("obj_object", 's', object_struct, &type_obj_object);
-	chain_type (&type_obj_object);
+	make_structure ("obj_object", 's', object_struct, &type_object);
+	chain_type (&type_object);
 	chain_type (&type_id);
-	make_structure ("obj_protocol", 's', protocol_struct, &type_obj_protocol);
-	chain_type (&type_obj_protocol);
+	make_structure ("obj_protocol", 's', protocol_struct, &type_protocol);
+	chain_type (&type_protocol);
 }
 
 static void
 class_init_obj_module (void)
 {
-	make_structure ("obj_module", 's', module_struct, &type_obj_module);
+	make_structure ("obj_module", 's', module_struct, &type_module);
 
-	chain_type (&type_obj_module);
+	chain_type (&type_module);
 	chain_type (&type_moduleptr);
-	chain_type (&type_obj_exec_class);
+	chain_type (&type_exec_class);
 }
 
 void
diff --git a/tools/qfcc/source/expr_obj.c b/tools/qfcc/source/expr_obj.c
index 6858adb54..db0b2fe4a 100644
--- a/tools/qfcc/source/expr_obj.c
+++ b/tools/qfcc/source/expr_obj.c
@@ -151,7 +151,7 @@ super_expr (class_type_t *class_type)
 
 	sym = symtab_lookup (current_symtab, ".super");
 	if (!sym || sym->table != current_symtab) {
-		sym = new_symbol_type (".super", &type_obj_super);
+		sym = new_symbol_type (".super", &type_super);
 		initialize_def (sym, 0, current_symtab->space, sc_local);
 	}
 	super = new_symbol_expr (sym);
diff --git a/tools/qfcc/source/method.c b/tools/qfcc/source/method.c
index 74971ef1c..833a03f1f 100644
--- a/tools/qfcc/source/method.c
+++ b/tools/qfcc/source/method.c
@@ -604,7 +604,7 @@ emit_methods (methodlist_t *methods, const char *name, int instance)
 	methods->count = count;
 	methods->instance = instance;
 
-	methods_struct[2].type = array_type (&type_obj_method, count);
+	methods_struct[2].type = array_type (&type_method, count);
 	return emit_structure (va ("_OBJ_%s_METHODS_%s", type, name), 's',
 						   methods_struct, 0, methods, sc_static);
 }
@@ -672,8 +672,7 @@ emit_method_descriptions (methodlist_t *methods, const char *name,
 	methods->count = count;
 	methods->instance = instance;
 
-	method_list_struct[1].type = array_type (&type_obj_method_description,
-											 count);
+	method_list_struct[1].type = array_type (&type_method_description, count);
 	return emit_structure (va ("_OBJ_%s_METHODS_%s", type, name), 's',
 						   method_list_struct, 0, methods, sc_static);
 }
diff --git a/tools/qfcc/source/qc-lex.l b/tools/qfcc/source/qc-lex.l
index cccc43afd..a2a8295bd 100644
--- a/tools/qfcc/source/qc-lex.l
+++ b/tools/qfcc/source/qc-lex.l
@@ -319,8 +319,8 @@ typedef struct {
 static keyword_t obj_keywords[] = {
 	{"id",				OBJECT,	&type_id		},
 	{"Class",			TYPE,	&type_Class		},
-	{"Method",			TYPE,	&type_obj_method},
-	{"Super",			TYPE,	&type_obj_super	},
+	{"Method",			TYPE,	&type_method	},
+	{"Super",			TYPE,	&type_super		},
 	{"SEL",				TYPE,	&type_SEL		},
 	{"IMP",				TYPE,	&type_IMP		},
 

From 643711ef4020291c1436d6487971b312988a49e7 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 27 Mar 2020 17:29:42 +0900
Subject: [PATCH 1017/1519] [qfcc] Pre-initialize type_object's strct pointer

This ensures that pointers to incomplete struct types are not
misidentified as id before the class system has been initialized.
---
 tools/qfcc/source/class.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tools/qfcc/source/class.c b/tools/qfcc/source/class.c
index c9dceb358..f7d52e29c 100644
--- a/tools/qfcc/source/class.c
+++ b/tools/qfcc/source/class.c
@@ -89,8 +89,10 @@ type_t      type_moduleptr = { ev_pointer, 0, 1, ty_basic, {{&type_module}}};
 type_t     *obj_exec_class_params[] = { &type_moduleptr };
 type_t      type_exec_class = { ev_func, 0, 1, ty_basic,
 								{{&type_void, 1, obj_exec_class_params}}};
-
-type_t      type_object = {ev_invalid, 0, 0, ty_struct};
+// the cast of 1 in the init is to ensure pointers to incomplete types
+// are never misidentified as id. It will be set to the correct value
+// when the obj system is initialized.
+type_t      type_object = {ev_invalid, 0, 0, ty_struct, {{(type_t *)1}}};
 type_t      type_id = { ev_pointer, "id", 1, ty_basic, {{&type_object}}};
 type_t      type_class = { ev_invalid, 0, 0, ty_struct};
 type_t      type_Class = { ev_pointer, 0, 1, ty_basic, {{&type_class}}};

From 01cf28e436ea22256280f1681af53ea957bf4e3b Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 27 Mar 2020 18:08:26 +0900
Subject: [PATCH 1018/1519] [qfcc] Treat C-style function decls as prototypes

This removes the need for extern from the declaration.
---
 tools/qfcc/source/qc-parse.y   | 3 ---
 tools/qfcc/source/statements.c | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/qfcc/source/qc-parse.y b/tools/qfcc/source/qc-parse.y
index 70ca90fc3..516c0b491 100644
--- a/tools/qfcc/source/qc-parse.y
+++ b/tools/qfcc/source/qc-parse.y
@@ -487,9 +487,6 @@ external_decl
 				symtab_addsymbol (current_symtab, $1);
 			} else {
 				$1 = function_symbol ($1, spec.is_overload, 1);
-				// things might be a confused mess from earlier errors
-				if ($1->sy_type == sy_func)
-					make_function ($1, 0, $1->table->space, spec.storage);
 			}
 		}
 	;
diff --git a/tools/qfcc/source/statements.c b/tools/qfcc/source/statements.c
index bd2508e54..6dbbbd99c 100644
--- a/tools/qfcc/source/statements.c
+++ b/tools/qfcc/source/statements.c
@@ -1314,6 +1314,9 @@ expr_symbol (sblock_t *sblock, expr_t *e, operand_t **op)
 	} else if (sym->sy_type == sy_const) {
 		*op = value_operand (sym->s.value, e);
 	} else if (sym->sy_type == sy_func) {
+		if (!sym->s.func) {
+			make_function (sym, 0, pr.symtab->space, sc_extern);
+		}
 		*op = def_operand (sym->s.func->def, 0, e);
 	} else {
 		internal_error (e, "unexpected symbol type: %s for %s",

From 09d3e1b59fc57c0ca47eff5f5add8c28bd2cb3ad Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 27 Mar 2020 18:17:24 +0900
Subject: [PATCH 1019/1519] [qwaq] Remove extern from function prototypes

Yay.
---
 ruamoko/qwaq/qwaq-curses.h | 80 +++++++++++++++++++-------------------
 ruamoko/qwaq/qwaq-debug.h  | 39 +++++++++----------
 ruamoko/qwaq/qwaq-rect.h   | 12 +++---
 3 files changed, 63 insertions(+), 68 deletions(-)

diff --git a/ruamoko/qwaq/qwaq-curses.h b/ruamoko/qwaq/qwaq-curses.h
index c43f08d13..5a6546955 100644
--- a/ruamoko/qwaq/qwaq-curses.h
+++ b/ruamoko/qwaq/qwaq-curses.h
@@ -86,53 +86,51 @@ typedef struct panel_s *panel_t;
 
 extern window_t stdscr;
 
-extern void initialize (void);
-extern window_t create_window (int xpos, int ypos, int xlen, int ylen);
-extern void destroy_window (window_t win);
-extern void mvwprintf (window_t win, int x, int y, string fmt, ...);
-extern void wprintf (window_t win, string fmt, ...);
-extern void wvprintf (window_t win, string fmt, @va_list args);
-extern void mvwvprintf (window_t win, int x, int y,
-						 string fmt, @va_list args);
-extern void wrefresh (window_t win);
-extern void mvwaddch (window_t win, int x, int y, int ch);
-extern void waddch (window_t win, int ch);
-extern void mvwaddstr (window_t win, int x, int y, string str);
-extern void waddstr (window_t win, string str);
+void initialize (void);
+window_t create_window (int xpos, int ypos, int xlen, int ylen);
+void destroy_window (window_t win);
+void mvwprintf (window_t win, int x, int y, string fmt, ...);
+void wprintf (window_t win, string fmt, ...);
+void wvprintf (window_t win, string fmt, @va_list args);
+void mvwvprintf (window_t win, int x, int y, string fmt, @va_list args);
+void wrefresh (window_t win);
+void mvwaddch (window_t win, int x, int y, int ch);
+void waddch (window_t win, int ch);
+void mvwaddstr (window_t win, int x, int y, string str);
+void waddstr (window_t win, string str);
 
-extern panel_t create_panel (window_t window);
-extern void destroy_panel (panel_t panel);
-extern void hide_panel (panel_t panel);
-extern void show_panel (panel_t panel);
-extern void top_panel (panel_t panel);
-extern void bottom_panel (panel_t panel);
-extern void move_panel (panel_t panel, int x, int y);
-extern window_t panel_window (panel_t panel);
-extern void update_panels (void);
-extern void replace_panel (panel_t panel, window_t window);
-extern void doupdate (void);
+panel_t create_panel (window_t window);
+void destroy_panel (panel_t panel);
+void hide_panel (panel_t panel);
+void show_panel (panel_t panel);
+void top_panel (panel_t panel);
+void bottom_panel (panel_t panel);
+void move_panel (panel_t panel, int x, int y);
+window_t panel_window (panel_t panel);
+void update_panels (void);
+void replace_panel (panel_t panel, window_t window);
+void doupdate (void);
 
-extern int get_event (qwaq_event_t *event);
-extern int max_colors (void);
-extern int max_color_pairs (void);
-extern int init_pair (int pair, int f, int b);
-extern void wbkgd (window_t win, int ch);
-extern void werase (window_t win);
-extern void scrollok (window_t win, int flag);
+int get_event (qwaq_event_t *event);
+int max_colors (void);
+int max_color_pairs (void);
+int init_pair (int pair, int f, int b);
+void wbkgd (window_t win, int ch);
+void werase (window_t win);
+void scrollok (window_t win, int flag);
 
-extern int acs_char (int acs);
-extern int curs_set (int visibility);
-extern int move (int x, int y);
+int acs_char (int acs);
+int curs_set (int visibility);
+int move (int x, int y);
 
-extern void wborder (window_t window,
-					 box_sides_t sides, box_corners_t corners);
-extern void mvwblit_line (window_t window, int x, int y, int *wch, int len);
-extern void wresize (window_t window, int width, int height);
-extern void resizeterm (int width, int height);
+void wborder (window_t window, box_sides_t sides, box_corners_t corners);
+void mvwblit_line (window_t window, int x, int y, int *wch, int len);
+void wresize (window_t window, int width, int height);
+void resizeterm (int width, int height);
 
-extern Rect getwrect (struct window_s *window);
+Rect getwrect (struct window_s *window);
 
-extern void printf(string fmt, ...);
+void printf(string fmt, ...);
 // qfcc stuff
 #else
 // gcc stuff
diff --git a/ruamoko/qwaq/qwaq-debug.h b/ruamoko/qwaq/qwaq-debug.h
index 287e1282c..b233f2b07 100644
--- a/ruamoko/qwaq/qwaq-debug.h
+++ b/ruamoko/qwaq/qwaq-debug.h
@@ -55,28 +55,25 @@ typedef struct qdb_auxfunction_s {
 
 typedef struct qdb_target_s { int handle; } qdb_target_t;
 
-extern void qdb_set_trace (qdb_target_t target, int state);
-extern int qdb_set_breakpoint (qdb_target_t target, unsigned staddr);
-extern int qdb_clear_breakpoint (qdb_target_t target, unsigned staddr);
-extern int qdb_set_watchpoint (qdb_target_t target, unsigned offset);
-extern int qdb_clear_watchpoint (qdb_target_t target);
-extern int qdb_continue (qdb_target_t target);
-extern qdb_state_t qdb_get_state (qdb_target_t target);
-extern int qdb_get_data (qdb_target_t target, unsigned src, unsigned len,
-						 void *dst);
-extern string qdb_get_string (qdb_target_t target, unsigned str);
-extern qdb_def_t qdb_find_global (qdb_target_t target, string name);
-extern qdb_def_t qdb_find_field (qdb_target_t target, string name);
-extern qdb_function_t *qdb_find_function (qdb_target_t target, string name);
-extern qdb_function_t *qdb_get_function (qdb_target_t target, unsigned fnum);
-extern qdb_auxfunction_t *qdb_find_auxfunction (qdb_target_t target,
-												string name);
-extern qdb_auxfunction_t *qdb_get_auxfunction (qdb_target_t target,
-											   unsigned fnum);
-extern qdb_def_t *qdb_get_local_defs (qdb_target_t target, unsigned fnum);
+void qdb_set_trace (qdb_target_t target, int state);
+int qdb_set_breakpoint (qdb_target_t target, unsigned staddr);
+int qdb_clear_breakpoint (qdb_target_t target, unsigned staddr);
+int qdb_set_watchpoint (qdb_target_t target, unsigned offset);
+int qdb_clear_watchpoint (qdb_target_t target);
+int qdb_continue (qdb_target_t target);
+qdb_state_t qdb_get_state (qdb_target_t target);
+int qdb_get_data (qdb_target_t target, unsigned src, unsigned len, void *dst);
+string qdb_get_string (qdb_target_t target, unsigned str);
+qdb_def_t qdb_find_global (qdb_target_t target, string name);
+qdb_def_t qdb_find_field (qdb_target_t target, string name);
+qdb_function_t *qdb_find_function (qdb_target_t target, string name);
+qdb_function_t *qdb_get_function (qdb_target_t target, unsigned fnum);
+qdb_auxfunction_t *qdb_find_auxfunction (qdb_target_t target, string name);
+qdb_auxfunction_t *qdb_get_auxfunction (qdb_target_t target, unsigned fnum);
+qdb_def_t *qdb_get_local_defs (qdb_target_t target, unsigned fnum);
 
-extern void traceon();
-extern void traceoff();
+void traceon();
+void traceoff();
 
 #else//GCC
 
diff --git a/ruamoko/qwaq/qwaq-rect.h b/ruamoko/qwaq/qwaq-rect.h
index 2f7915ff1..a26f74565 100644
--- a/ruamoko/qwaq/qwaq-rect.h
+++ b/ruamoko/qwaq/qwaq-rect.h
@@ -17,12 +17,12 @@ typedef struct Rect_s {
 } Rect;
 
 #ifdef __QFCC__
-extern Rect makeRect (int xpos, int ypos, int xlen, int ylen);
-extern Point makePoint (int x, int y);
-extern Extent makeExtent (int width, int height);
-extern Extent mergeExtents (Extent a, Extent b);
-extern int rectContainsPoint (Rect rect, Point point);
-extern Rect clipRect (Rect clipRect, Rect rect);
+Rect makeRect (int xpos, int ypos, int xlen, int ylen);
+Point makePoint (int x, int y);
+Extent makeExtent (int width, int height);
+Extent mergeExtents (Extent a, Extent b);
+int rectContainsPoint (Rect rect, Point point);
+Rect clipRect (Rect clipRect, Rect rect);
 #endif
 
 #endif//__qwaq_rect_h

From 9e529d1508ec2c681208a59bce23945dccb5097a Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 27 Mar 2020 19:00:14 +0900
Subject: [PATCH 1020/1519] [qfcc] Fix some incorrect test runs

Checking for float return when should be checking for int return.
Fortunately, the tests still passed.
---
 tools/qfcc/test/Makefile.am | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/qfcc/test/Makefile.am b/tools/qfcc/test/Makefile.am
index 8560e693f..dae61f2ab 100644
--- a/tools/qfcc/test/Makefile.am
+++ b/tools/qfcc/test/Makefile.am
@@ -309,7 +309,7 @@ methodparams_obj=$(methodparams_dat_SOURCES:.r=.qfo)
 methodparams.dat$(EXEEXT): $(methodparams_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(methodparams_obj)
 methodparams.run: Makefile build-run
-	@TEST_HARNESS_OPTS=--float $(srcdir)/build-run $@
+	@$(srcdir)/build-run $@
 include ./$(DEPDIR)/methodparams.Qo # am--include-marker
 r_depfiles_remade += ./$(DEPDIR)/methodparams.Qo
 
@@ -327,7 +327,7 @@ paramret_obj=$(paramret_dat_SOURCES:.r=.qfo)
 paramret.dat$(EXEEXT): $(paramret_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(paramret_obj)
 paramret.run: Makefile build-run
-	@TEST_HARNESS_OPTS=--float $(srcdir)/build-run $@
+	@$(srcdir)/build-run $@
 include ./$(DEPDIR)/paramret.Qo # am--include-marker
 r_depfiles_remade += ./$(DEPDIR)/paramret.Qo
 

From 9c556c07bb0b4365776b7f27e0e7838104a2acf3 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 27 Mar 2020 19:01:26 +0900
Subject: [PATCH 1021/1519] [qfcc] Add failing nil return through @param bug

I suspect it's general for struts, but nil really is a troubling
character sometimes.
---
 tools/qfcc/test/Makefile.am   | 10 ++++++++++
 tools/qfcc/test/nilparamret.r | 26 ++++++++++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 tools/qfcc/test/nilparamret.r

diff --git a/tools/qfcc/test/Makefile.am b/tools/qfcc/test/Makefile.am
index dae61f2ab..4e213e66e 100644
--- a/tools/qfcc/test/Makefile.am
+++ b/tools/qfcc/test/Makefile.am
@@ -53,6 +53,7 @@ test_progs_dat=\
 	ivar-struct-return.dat \
 	methodparams.dat \
 	modulo.dat \
+	nilparamret.dat \
 	paramret.dat \
 	quaternion.dat \
 	return-ivar.dat \
@@ -322,6 +323,15 @@ modulo.run: Makefile build-run
 include ./$(DEPDIR)/modulo.Qo # am--include-marker
 r_depfiles_remade += ./$(DEPDIR)/modulo.Qo
 
+nilparamret_dat_SOURCES=nilparamret.r
+nilparamret_obj=$(nilparamret_dat_SOURCES:.r=.qfo)
+nilparamret.dat$(EXEEXT): $(nilparamret_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(nilparamret_obj)
+nilparamret.run: Makefile build-run
+	@$(srcdir)/build-run $@
+include ./$(DEPDIR)/nilparamret.Qo # am--include-marker
+r_depfiles_remade += ./$(DEPDIR)/nilparamret.Qo
+
 paramret_dat_SOURCES=paramret.r
 paramret_obj=$(paramret_dat_SOURCES:.r=.qfo)
 paramret.dat$(EXEEXT): $(paramret_obj) $(QFCC_DEP)
diff --git a/tools/qfcc/test/nilparamret.r b/tools/qfcc/test/nilparamret.r
new file mode 100644
index 000000000..fbe0b7dc5
--- /dev/null
+++ b/tools/qfcc/test/nilparamret.r
@@ -0,0 +1,26 @@
+typedef struct bar {
+	float x, y, z, w;
+} bar;
+
+bar set_return();
+
+@param foo()
+{
+	set_return();
+	return nil;
+}
+
+bar set_return()
+{
+	return {1, 2, 3, 4};
+}
+void printf (string fmt, ...) = #0;
+int main()
+{
+	@param r = foo();
+	printf("%q\n", r);
+	return !(r.quaternion_val.x == 0
+			 && r.quaternion_val.y == 0
+			 && r.quaternion_val.z == 0
+			 && r.quaternion_val.w == 0);
+}

From fdf6fac0770dec9c108a581d6326c770272e9447 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 27 Mar 2020 20:31:11 +0900
Subject: [PATCH 1022/1519] [qfcc] Rewrite expr_nil to use memset if necessary

This fixes the problem with returning nil through @param (and probably
structs in general).
---
 tools/qfcc/source/statements.c | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/tools/qfcc/source/statements.c b/tools/qfcc/source/statements.c
index 6dbbbd99c..bda98b287 100644
--- a/tools/qfcc/source/statements.c
+++ b/tools/qfcc/source/statements.c
@@ -1406,16 +1406,34 @@ static sblock_t *
 expr_nil (sblock_t *sblock, expr_t *e, operand_t **op)
 {
 	type_t     *nil = e->e.nil;
-	expr_t     *ptr;
+	expr_t     *size_expr;
+	size_t      nil_size;
+	operand_t  *zero;
+	operand_t  *size;
+	statement_t *s;
+
 	if (!is_struct (nil) && !is_array (nil)) {
 		*op = value_operand (new_nil_val (nil), e);
 		return sblock;
 	}
-	ptr = expr_file_line (address_expr (new_temp_def_expr (nil), 0, 0), e);
-	expr_file_line (ptr, e);
-	sblock = statement_subexpr (sblock, ptr, op);
-	e = expr_file_line (new_memset_expr (ptr, new_integer_expr (0), nil), e);
-	sblock = statement_slist (sblock, e);
+	if (!*op) {
+		*op = temp_operand (nil, e);
+	}
+	nil_size = type_size (nil);
+	if (nil_size < 0x10000) {
+		size_expr = new_short_expr (nil_size);
+	} else {
+		size_expr = new_integer_expr (nil_size);
+	}
+	sblock = statement_subexpr (sblock, new_integer_expr(0), &zero);
+	sblock = statement_subexpr (sblock, size_expr, &size);
+
+	s = new_statement (st_move, "<MEMSET>", e);
+	s->opa = zero;
+	s->opb = size;
+	s->opc = *op;
+	sblock_add_statement (sblock, s);
+
 	return sblock;
 }
 

From 4d616fab4a5456b3873fa6006e78cf49ce04227d Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 27 Mar 2020 20:47:42 +0900
Subject: [PATCH 1023/1519] [qfcc] Use the correct statement type for memset

---
 tools/qfcc/source/statements.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/qfcc/source/statements.c b/tools/qfcc/source/statements.c
index bda98b287..ba0e07331 100644
--- a/tools/qfcc/source/statements.c
+++ b/tools/qfcc/source/statements.c
@@ -1428,7 +1428,7 @@ expr_nil (sblock_t *sblock, expr_t *e, operand_t **op)
 	sblock = statement_subexpr (sblock, new_integer_expr(0), &zero);
 	sblock = statement_subexpr (sblock, size_expr, &size);
 
-	s = new_statement (st_move, "<MEMSET>", e);
+	s = new_statement (st_memset, "<MEMSET>", e);
 	s->opa = zero;
 	s->opb = size;
 	s->opc = *op;

From c6483b617c772a4ea281c64229479e3084a05fe3 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 27 Mar 2020 20:52:37 +0900
Subject: [PATCH 1024/1519] [qfcc] Remove obsolete notes

nil seems to have sorted himself out with the recent reworking of how
qfcc handles nil.
---
 tools/qfcc/source/problem_with_nil.txt | 12 ------------
 1 file changed, 12 deletions(-)
 delete mode 100644 tools/qfcc/source/problem_with_nil.txt

diff --git a/tools/qfcc/source/problem_with_nil.txt b/tools/qfcc/source/problem_with_nil.txt
deleted file mode 100644
index 4172aea0e..000000000
--- a/tools/qfcc/source/problem_with_nil.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-The problem with nil is more a problem with @param and values.
-
-@param values used type_nil's low-level type, which is either quaternion
-or vector (v6 progs). Thus returning (or passing?) nil through @param
-creates a value that has type_param built low-level type quaternion.
-Then assigning nil to a quaternion finds the param nil (because the
-value and low-level type is checked) which has the wrong type for type
-checks.
-
-one solution is to create an ev_param type (convert to quaternion or
-vector for v6 progs) that the VM either ignores or can copy around
-ev_param data.

From 653eabfdbfb745464d21f0df67a7b5a6cbec867d Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 27 Mar 2020 22:11:18 +0900
Subject: [PATCH 1025/1519] [qfcc] Clean up inconsistent type building idioms

---
 tools/qfcc/source/qc-parse.y | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/tools/qfcc/source/qc-parse.y b/tools/qfcc/source/qc-parse.y
index 516c0b491..bdac72d30 100644
--- a/tools/qfcc/source/qc-parse.y
+++ b/tools/qfcc/source/qc-parse.y
@@ -762,8 +762,7 @@ struct_decl
 		{
 			if (!$<spec>0.type)
 				$<spec>0.type = type_default;
-			$1->type = append_type ($1->type, $<spec>0.type);
-			$1->type = find_type ($1->type);
+			$1->type = find_type (append_type ($1->type, $<spec>0.type));
 			$1->sy_type = sy_var;
 			$1->visibility = current_visibility;
 			symtab_addsymbol (current_symtab, $1);
@@ -775,8 +774,7 @@ struct_decl
 		{
 			if (!$<spec>0.type)
 				$<spec>0.type = type_default;
-			$1->type = append_type ($1->type, $<spec>0.type);
-			$1->type = find_type ($1->type);
+			$1->type = find_type (append_type ($1->type, $<spec>0.type));
 			$1->sy_type = sy_var;
 			$1->visibility = current_visibility;
 			symtab_addsymbol (current_symtab, $1);
@@ -1419,8 +1417,7 @@ init_var_decl
 	: var_decl opt_initializer
 		{
 			specifier_t spec = $<spec>0;
-			$1->type = append_type ($1->type, spec.type);
-			$1->type = find_type ($1->type);
+			$1->type = find_type (append_type ($1->type, spec.type));
 			$1->sy_type = sy_var;
 			initialize_def ($1, 0, current_symtab->space, spec.storage);
 			$$ = assign_expr (new_symbol_expr ($1), $2);

From 1efbb2ab496a689a40b15aea5e60a37682890fff Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 27 Mar 2020 22:12:45 +0900
Subject: [PATCH 1026/1519] [cl_menu] Remove a stale FIXME

---
 ruamoko/cl_menu/plistmenu.r | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ruamoko/cl_menu/plistmenu.r b/ruamoko/cl_menu/plistmenu.r
index a4daadbbf..351e974e1 100644
--- a/ruamoko/cl_menu/plistmenu.r
+++ b/ruamoko/cl_menu/plistmenu.r
@@ -145,7 +145,7 @@ string_from_plist (PLString *plstring)
 	local @param ret;
 	local string str = [plstring string];
 
-	ret = nil;	//FIXME should be ret = nil;
+	ret = nil;
 	if (str_mid (str, 0, 1) == "[")
 		return rect_from_plist (plstring);
 

From 1da6eb5f512703668f7cd75a8b3bdea3679075c2 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 27 Mar 2020 22:17:36 +0900
Subject: [PATCH 1027/1519] [qfcc] Fix a typo in a comment

---
 tools/qfcc/include/def.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/qfcc/include/def.h b/tools/qfcc/include/def.h
index df0104178..691c5d602 100644
--- a/tools/qfcc/include/def.h
+++ b/tools/qfcc/include/def.h
@@ -110,7 +110,7 @@ typedef struct def_s {
 /** Specify the storage class of a def.
 */
 typedef enum storage_class_e {
-	sc_global,					///< def is globally visibil across units
+	sc_global,					///< def is globally visible across units
 	sc_system,					///< def may be redefined once
 	sc_extern,					///< def is externally allocated
 	sc_static,					///< def is private to the current unit

From c6746fa3917b561f924ae34fa51945de51867aa2 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 27 Mar 2020 22:48:38 +0900
Subject: [PATCH 1028/1519] [qfcc] Fix out-by-one in type meta check

---
 tools/qfcc/source/obj_type.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/qfcc/source/obj_type.c b/tools/qfcc/source/obj_type.c
index 38a28a9e8..d56cd98b9 100644
--- a/tools/qfcc/source/obj_type.c
+++ b/tools/qfcc/source/obj_type.c
@@ -275,7 +275,7 @@ qfo_encode_type (type_t *type)
 	}
 	if (type->type_def)
 		return type->type_def;
-	if (type->meta > sizeof (funcs) / (sizeof (funcs[0])))
+	if (type->meta >= sizeof (funcs) / (sizeof (funcs[0])))
 		internal_error (0, "bad type meta type");
 	if (!type->encoding)
 		type->encoding = type_get_encoding (type);

From 8997c81bd1f721f2bc62bea4bbfd4fb74fee1afa Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 28 Mar 2020 09:41:54 +0900
Subject: [PATCH 1029/1519] [qwaq] Implement rectangular region clearing

You'd think ncurses would have this, but I guess it's too
window-oriented.
---
 ruamoko/qwaq/qwaq-curses.c      | 61 ++++++++++++++++++++++++++++++++-
 ruamoko/qwaq/qwaq-curses.h      |  1 +
 ruamoko/qwaq/qwaq-debugger.r    |  1 +
 ruamoko/qwaq/qwaq-draw.h        |  1 +
 ruamoko/qwaq/qwaq-draw.r        | 41 ++++++++++++++++++++++
 ruamoko/qwaq/qwaq-textcontext.h |  3 ++
 ruamoko/qwaq/qwaq-textcontext.r | 39 +++++++++++++++++++++
 ruamoko/qwaq/qwaq-view.h        |  1 +
 ruamoko/qwaq/qwaq-view.r        |  6 ++++
 9 files changed, 153 insertions(+), 1 deletion(-)

diff --git a/ruamoko/qwaq/qwaq-curses.c b/ruamoko/qwaq/qwaq-curses.c
index d25604135..26a17b37b 100644
--- a/ruamoko/qwaq/qwaq-curses.c
+++ b/ruamoko/qwaq/qwaq-curses.c
@@ -84,6 +84,7 @@ typedef enum qwaq_commands_e {
 	qwaq_cmd_mvwblit_line,
 	qwaq_cmd_wresize,
 	qwaq_cmd_resizeterm,
+	qwaq_cmd_mvwhline,
 } qwaq_commands;
 
 static const char *qwaq_command_names[]= {
@@ -116,6 +117,7 @@ static const char *qwaq_command_names[]= {
 	"mvwblit_line",
 	"wresize",
 	"resizeterm",
+	"mvwhline"
 };
 
 static window_t *
@@ -600,10 +602,23 @@ cmd_resizeterm (qwaq_resources_t *res)
 	resizeterm (height, width);
 }
 
+static void
+cmd_mvwhline (qwaq_resources_t *res)
+{
+	int         window_id = RB_PEEK_DATA (res->command_queue, 2);
+	int         x = RB_PEEK_DATA (res->command_queue, 3);
+	int         y = RB_PEEK_DATA (res->command_queue, 4);
+	int         ch = RB_PEEK_DATA (res->command_queue, 5);
+	int         n = RB_PEEK_DATA (res->command_queue, 6);
+
+	window_t   *window = get_window (res, __FUNCTION__, window_id);
+	mvwhline (window->win, y, x, ch, n);
+}
+
 static void
 dump_command (qwaq_resources_t *res, int len)
 {
-	if (0) {
+	if (1) {
 		qwaq_commands cmd = RB_PEEK_DATA (res->command_queue, 0);
 		Sys_Printf ("%s[%d]", qwaq_command_names[cmd], len);
 		for (int i = 2; i < len; i++) {
@@ -739,6 +754,9 @@ process_commands (qwaq_resources_t *res)
 			case qwaq_cmd_resizeterm:
 				cmd_resizeterm (res);
 				break;
+			case qwaq_cmd_mvwhline:
+				cmd_mvwhline (res);
+				break;
 		}
 		pthread_mutex_lock (&res->command_cond.mut);
 		RB_DROP_DATA (res->command_queue, len);
@@ -1064,6 +1082,33 @@ bi_resizeterm (progs_t *pr)
 	qwaq_resizeterm (pr, width, height);
 }
 
+static void
+qwaq_mvwhline (progs_t *pr, int window_id, int x, int y, int ch, int n)
+{
+	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
+
+	if (get_window (res, __FUNCTION__, window_id)) {
+		int         command[] = {
+						qwaq_cmd_mvwhline, 0,
+						window_id, x, y, ch, n
+					};
+
+		command[1] = CMD_SIZE(command);
+		qwaq_submit_command (res, command);
+	}
+}
+static void
+bi_mvwhline (progs_t *pr)
+{
+	int         window_id = P_STRUCT (pr, qwaq_textcontext_t, 0).window;
+	int         x = P_INT (pr, 1);
+	int         y = P_INT (pr, 2);
+	int         ch = P_INT (pr, 3);
+	int         n = P_INT (pr, 4);
+
+	qwaq_mvwhline (pr, window_id, x, y, ch, n);
+}
+
 static void
 qwaq_mvwaddstr (progs_t *pr, int window_id, int x, int y, const char *str)
 {
@@ -1764,6 +1809,18 @@ bi_i_TextContext__border_ (progs_t *pr)
 	qwaq_wborder (pr, window_id, sides, corns);
 }
 
+static void
+bi_i_TextContext__mvhline_ (progs_t *pr)
+{
+	__auto_type self = &P_STRUCT (pr, qwaq_textcontext_t, 0);
+	int         window_id = self->window;
+	__auto_type pos = &P_PACKED (pr, Point, 2);
+	int         ch = P_INT (pr, 3);
+	int         n = P_INT (pr, 4);
+
+	qwaq_mvwhline (pr, window_id, pos->x, pos->y, ch, n);
+}
+
 static void
 bi_qwaq_clear (progs_t *pr, void *data)
 {
@@ -1817,6 +1874,7 @@ static builtin_t builtins[] = {
 	{"mvwblit_line",	bi_mvwblit_line,	-1},
 	{"wresize",			bi_wresize,			-1},
 	{"resizeterm",		bi_resizeterm,		-1},
+	{"mvwhline",		bi_mvwhline,		-1},
 
 	{"_c_TextContext__is_initialized",	bi_c_TextContext__is_initialized,  -1},
 	{"_c_TextContext__max_colors",		bi_c_TextContext__max_colors,	   -1},
@@ -1841,6 +1899,7 @@ static builtin_t builtins[] = {
 	{"_i_TextContext__clear",			bi_i_TextContext__clear,		   -1},
 	{"_i_TextContext__scrollok_",		bi_i_TextContext__scrollok_,	   -1},
 	{"_i_TextContext__border_",			bi_i_TextContext__border_,		   -1},
+	{"_i_TextContext__mvhline_",		bi_i_TextContext__mvhline_,		   -1},
 
 	{0}
 };
diff --git a/ruamoko/qwaq/qwaq-curses.h b/ruamoko/qwaq/qwaq-curses.h
index 5a6546955..37c9c0712 100644
--- a/ruamoko/qwaq/qwaq-curses.h
+++ b/ruamoko/qwaq/qwaq-curses.h
@@ -98,6 +98,7 @@ void mvwaddch (window_t win, int x, int y, int ch);
 void waddch (window_t win, int ch);
 void mvwaddstr (window_t win, int x, int y, string str);
 void waddstr (window_t win, string str);
+void mvwhline (window_t win, int x, int y, int ch, int n);
 
 panel_t create_panel (window_t window);
 void destroy_panel (panel_t panel);
diff --git a/ruamoko/qwaq/qwaq-debugger.r b/ruamoko/qwaq/qwaq-debugger.r
index a33ec59b1..a15b6c7de 100644
--- a/ruamoko/qwaq/qwaq-debugger.r
+++ b/ruamoko/qwaq/qwaq-debugger.r
@@ -123,6 +123,7 @@ update_current_func (Debugger *self, unsigned fnum)
 		return;
 	}
 	qdb_get_data (debug_target, func.local_data, func.local_size, local_data);
+	[locals_view clear];
 	if (!local_defs) {
 		[locals_view mvprintf:{0,0}, "%d", func.local_size];
 		for (int y = 1; y < [locals_view size].height; y++) {
diff --git a/ruamoko/qwaq/qwaq-draw.h b/ruamoko/qwaq/qwaq-draw.h
index 3092cc77f..e7eff51ab 100644
--- a/ruamoko/qwaq/qwaq-draw.h
+++ b/ruamoko/qwaq/qwaq-draw.h
@@ -16,6 +16,7 @@
 
 @protocol TextContext
 - blitFromBuffer: (DrawBuffer *) srcBuffer to: (Point) pos from: (Rect) rect;
+- clearReact: (Rect) rect;
 - (Extent) size;
 - (void) resizeTo: (Extent) newSize;	// absolute size
 
diff --git a/ruamoko/qwaq/qwaq-draw.r b/ruamoko/qwaq/qwaq-draw.r
index ed1f8837a..7d1fbcd58 100644
--- a/ruamoko/qwaq/qwaq-draw.r
+++ b/ruamoko/qwaq/qwaq-draw.r
@@ -86,6 +86,47 @@
 	return self;
 }
 
+- clearReact: (Rect) rect
+{
+	Point       pos = rect.offset;
+	int         len = rect.extent.width;
+	int         count = rect.extent.height;
+
+	if (pos.x + len > size.width) {
+		len = size.width - pos.x;
+	}
+	if (pos.x < 0) {
+		len += pos.x;
+		pos.x = 0;
+	}
+	if (len < 1) {
+		return self;
+	}
+	if (pos.y + count > size.height) {
+		count = size.height - pos.y;
+	}
+	if (pos.y < 0) {
+		count += pos.y;
+		pos.y = 0;
+	}
+	if (count < 1) {
+		return self;
+	}
+	int         width = size.width;
+	int         ch = background;
+	if (!(ch & 0xff)) {
+		ch |= ' ';
+	}
+	while (count-- > 0) {
+		int        *p = buffer + pos.y * width + pos.x;
+		for (int i = 0; i < len; i++) {
+			*p++ = ch;
+		}
+		pos.y++;
+	}
+	return self;
+}
+
 - (void) bkgd: (int) ch
 {
 	background = ch;
diff --git a/ruamoko/qwaq/qwaq-textcontext.h b/ruamoko/qwaq/qwaq-textcontext.h
index e2db46da4..2b979c415 100644
--- a/ruamoko/qwaq/qwaq-textcontext.h
+++ b/ruamoko/qwaq/qwaq-textcontext.h
@@ -25,6 +25,7 @@
 			int         ylen;
 		};
 	};
+	int         background;
 }
 + (int) max_colors;
 + (int) max_color_pairs;
@@ -49,6 +50,8 @@
 - (void) bkgd: (int) ch;
 - (void) scrollok: (int) flag;
 - (void) border: (box_sides_t) sides, box_corners_t corners;
+- (void) mvhline: (Point) pos, int ch, int n;
+-clearReact: (Rect) rect;
 @end
 
 #else
diff --git a/ruamoko/qwaq/qwaq-textcontext.r b/ruamoko/qwaq/qwaq-textcontext.r
index 972bd8a99..421cdf8eb 100644
--- a/ruamoko/qwaq/qwaq-textcontext.r
+++ b/ruamoko/qwaq/qwaq-textcontext.r
@@ -101,6 +101,43 @@ static TextContext *screen;
 	return self;
 }
 
+-clearReact: (Rect) rect
+{
+	Point       pos = rect.offset;
+	int         len = rect.extent.width;
+	int         count = rect.extent.height;
+
+	if (pos.x + len > xlen) {
+		len = xlen - pos.x;
+	}
+	if (pos.x < 0) {
+		len += pos.x;
+		pos.x = 0;
+	}
+	if (len < 1) {
+		return self;
+	}
+	if (pos.y + count > ylen) {
+		count = ylen - pos.y;
+	}
+	if (pos.y < 0) {
+		count += pos.y;
+		pos.y = 0;
+	}
+	if (count < 1) {
+		return self;
+	}
+	int         ch = background;
+	if (!(ch & 0xff)) {
+		ch |= ' ';
+	}
+	while (count-- > 0) {
+		[self mvhline:pos, ch, len];
+		pos.y++;
+	}
+	return self;
+}
+
 - (void) printf: (string) fmt, ... = #0;
 - (void) vprintf: (string) mft, @va_list args = #0;
 - (void) addch: (int) ch = #0;
@@ -110,6 +147,7 @@ static TextContext *screen;
 - (void) mvvprintf: (Point) pos, string mft, @va_list args = #0;
 - (void) mvaddch: (Point) pos, int ch = #0;
 - (void) mvaddstr: (Point) pos, string str = #0;
+- (void) mvhline: (Point) pos, int ch, int n = #0;
 
 - (void) resizeTo: (Extent) newSize = #0;	// absolute size
 - (void) refresh = #0;
@@ -164,5 +202,6 @@ void mvwblit_line (window_t window, int x, int y, int *wch, int len) = #0;
 void wresize (window_t window, int width, int height) = #0;
 void resizeterm (int width, int height) = #0;
 Rect getwrect (window_t window) = #0;
+void mvwhline (window_t win, int x, int y, int ch, int n) = #0;
 
 void printf(string fmt, ...) = #0;
diff --git a/ruamoko/qwaq/qwaq-view.h b/ruamoko/qwaq/qwaq-view.h
index 27b0ddd43..052bb2ada 100644
--- a/ruamoko/qwaq/qwaq-view.h
+++ b/ruamoko/qwaq/qwaq-view.h
@@ -83,6 +83,7 @@ enum {
 - (void) mvprintf: (Point) pos, string fmt, ...;
 - (void) mvvprintf: (Point) pos, string fmt, @va_list args;
 - (void) mvaddch: (Point) pos, int ch;
+-clear;
 @end
 
 @interface View: Object <View>
diff --git a/ruamoko/qwaq/qwaq-view.r b/ruamoko/qwaq/qwaq-view.r
index 9e28c7a68..8b4077938 100644
--- a/ruamoko/qwaq/qwaq-view.r
+++ b/ruamoko/qwaq/qwaq-view.r
@@ -213,6 +213,12 @@ updateScreenCursor (View *view)
 	[textContext mvaddstr: pos, str];
 }
 
+-clear
+{
+	[textContext clearReact:rect];
+	return self;
+}
+
 -move: (Point) delta
 {
 	xpos += delta.x;

From e31f03fd36045a54098570bdd1f524177092fdac Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 28 Mar 2020 09:59:01 +0900
Subject: [PATCH 1030/1519] [qfcc] Add type aliasing test again

---
 tools/qfcc/test/Makefile.am | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/tools/qfcc/test/Makefile.am b/tools/qfcc/test/Makefile.am
index 4e213e66e..fe78065d7 100644
--- a/tools/qfcc/test/Makefile.am
+++ b/tools/qfcc/test/Makefile.am
@@ -67,6 +67,7 @@ test_progs_dat=\
 	structstruct.dat \
 	swap.dat \
 	triangle.dat \
+	typedef.dat \
 	vecaddr.dat \
 	vecexpr.dat \
 	vecinit.dat \
@@ -449,14 +450,14 @@ triangle.run: Makefile build-run
 include ./$(DEPDIR)/triangle.Qo # am--include-marker
 r_depfiles_remade += ./$(DEPDIR)/triangle.Qo
 
-#typedef_dat_SOURCES=typedef.r
-#typedef_obj=$(typedef_dat_SOURCES:.r=.qfo)
-#typedef.dat$(EXEEXT): $(typedef_obj) $(QFCC_DEP)
-#	$(QFCC) $(QCFLAGS) -o $@ $(typedef_obj)
-#typedef.run: Makefile build-run
-#	@$(srcdir)/build-run $@
-#include ./$(DEPDIR)/typedef.Qo # am--include-marker
-#r_depfiles_remade += ./$(DEPDIR)/typedef.Qo
+typedef_dat_SOURCES=typedef.r
+typedef_obj=$(typedef_dat_SOURCES:.r=.qfo)
+typedef.dat$(EXEEXT): $(typedef_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(typedef_obj)
+typedef.run: Makefile build-run
+	@$(srcdir)/build-run $@
+include ./$(DEPDIR)/typedef.Qo # am--include-marker
+r_depfiles_remade += ./$(DEPDIR)/typedef.Qo
 
 vecaddr_dat_SOURCES=vecaddr.r
 vecaddr_obj=$(vecaddr_dat_SOURCES:.r=.qfo)

From 734f10d43e49849ef0ac4364a03732b9baa6f94f Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 28 Mar 2020 12:06:34 +0900
Subject: [PATCH 1031/1519] [qfcc] Dump local defs for qfo functions

---
 tools/qfcc/source/dump_globals.c | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/tools/qfcc/source/dump_globals.c b/tools/qfcc/source/dump_globals.c
index 198a952cb..e02d35753 100644
--- a/tools/qfcc/source/dump_globals.c
+++ b/tools/qfcc/source/dump_globals.c
@@ -446,8 +446,9 @@ qfo_functions (qfo_t *qfo)
 {
 	qfo_def_t  *def;
 	qfo_func_t *func;
-	unsigned    i, d;
+	unsigned    i, j, d;
 	unsigned    space;
+	qfo_mspace_t *locals;
 
 	for (i = 0; i < qfo->num_funcs; i++) {
 		func = &qfo->funcs[i];
@@ -471,7 +472,29 @@ qfo_functions (qfo_t *qfo)
 			printf (" @ %x", func->code);
 		else
 			printf (" = #%d", -func->code);
-		puts ("");
+		printf (" loc: %d\n", func->locals_space);
+		if (func->locals_space) {
+			locals = &qfo->spaces[func->locals_space];
+			printf ("%*s%d %p %d %p %d %d\n", 16, "", locals->type,
+					locals->defs, locals->num_defs,
+					locals->d.data, locals->data_size, locals->id);
+			for (j = 0; j < locals->num_defs; j++) {
+				qfo_def_t  *def = locals->defs + j;
+				int         offset;
+				const char *typestr;
+				const char *name;
+				qfot_type_t *type;
+
+				name = QFO_GETSTR (qfo, def->name);
+				//FIXME check type
+				type = QFO_POINTER (qfo, qfo_type_space, qfot_type_t,
+									def->type);
+				typestr = QFO_GETSTR (qfo, type->encoding);
+				offset = def->offset;
+
+				printf ("%*s%d %s %s\n", 20, "", offset, name, typestr);
+			}
+		}
 	}
 }
 

From 1eef2a8b5e97e16166c0e51b4d345378ab2a725e Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 28 Mar 2020 12:10:23 +0900
Subject: [PATCH 1032/1519] [qfcc] Implement type aliasing again

When a type is aliased, the alias has two type chains: the simple type
chain with all other aliases stripped, and the full type chain. There
are still plenty of bugs in it, but having the clean type chain takes
care of the major issue that was in the previous attempt as only the
head of the type-chain needs to be skipped for type comparison.

Most of the bugs are in finding the locations where the head needs to be
skipped.
---
 include/QF/pr_type.h              |   7 +-
 ruamoko/include/types.h           |   1 +
 tools/qfcc/include/expr.h         |   7 +-
 tools/qfcc/include/type.h         |   5 +-
 tools/qfcc/source/dump_globals.c  |   6 +-
 tools/qfcc/source/expr.c          |  31 ++++---
 tools/qfcc/source/expr_compound.c |   7 +-
 tools/qfcc/source/function.c      |  11 +--
 tools/qfcc/source/obj_file.c      |  10 ++-
 tools/qfcc/source/obj_type.c      |  23 ++++++
 tools/qfcc/source/qc-parse.y      |   3 +
 tools/qfcc/source/type.c          | 133 ++++++++++++++++++++++--------
 12 files changed, 180 insertions(+), 64 deletions(-)

diff --git a/include/QF/pr_type.h b/include/QF/pr_type.h
index db3376684..c74ad3c26 100644
--- a/include/QF/pr_type.h
+++ b/include/QF/pr_type.h
@@ -52,8 +52,9 @@ typedef enum {
 
 typedef struct qfot_alias_s {
 	pr_int_t    type;				///< type at end of alias chain
-	pointer_t   aux_type;			///< referenced type
-	string_t    name;				///< alias name
+	pointer_t   aux_type;			///< referenced type: stripped of aliases
+	pointer_t   full_type;			///< includes full alias info
+	string_t    name;				///< alias name, may be null
 } qfot_alias_t;
 
 typedef struct qfot_fldptr_s {
@@ -101,7 +102,7 @@ typedef struct qfot_array_s {
 */
 typedef struct qfot_type_s {
 	ty_meta_e   meta:32;			///< meta type
-	pr_int_t    size;				///< total word size of this encoding
+	pr_uint_t   size;				///< total word size of this encoding
 	string_t    encoding;			///< Objective-QC encoding
 	union {
 		etype_t     type:32;		///< ty_basic: etype_t
diff --git a/ruamoko/include/types.h b/ruamoko/include/types.h
index b435a6bab..c57603ada 100644
--- a/ruamoko/include/types.h
+++ b/ruamoko/include/types.h
@@ -33,6 +33,7 @@ typedef enum {
 typedef struct qfot_alias_s {
 	etype_t     type;
 	struct qfot_type_s *aux_type;
+	struct qfot_type_s *full_type;
 	string      name;
 } qfot_alias_t;
 
diff --git a/tools/qfcc/include/expr.h b/tools/qfcc/include/expr.h
index be1640ffc..79fd77f99 100644
--- a/tools/qfcc/include/expr.h
+++ b/tools/qfcc/include/expr.h
@@ -380,10 +380,11 @@ expr_t *build_block_expr (expr_t *expr_list);
 element_t *new_element (expr_t *expr, struct symbol_s *symbol);
 expr_t *new_compound_init (void);
 expr_t *append_element (expr_t *compound, element_t *element);
-expr_t *initialized_temp_expr (struct type_s *type, expr_t *compound);
+expr_t *initialized_temp_expr (const struct type_s *type, expr_t *compound);
 void assign_elements (expr_t *local_expr, expr_t *ptr,
 					  element_chain_t *element_chain);
-void build_element_chain (element_chain_t *element_chain, struct type_s *type,
+void build_element_chain (element_chain_t *element_chain,
+						  const struct type_s *type,
 						  expr_t *eles, int base_offset);
 void free_element_chain (element_chain_t *element_chain);
 
@@ -433,7 +434,7 @@ expr_t *new_symbol_expr (struct symbol_s *symbol);
 	\param type		The type of the temporary variable.
 	\return			The new temporary variable expression node (ex_temp_t).
 */
-expr_t *new_temp_def_expr (struct type_s *type);
+expr_t *new_temp_def_expr (const struct type_s *type);
 
 /**	Create a new nil expression node.
 
diff --git a/tools/qfcc/include/type.h b/tools/qfcc/include/type.h
index bb6133bb1..70c650c52 100644
--- a/tools/qfcc/include/type.h
+++ b/tools/qfcc/include/type.h
@@ -52,7 +52,8 @@ typedef struct ty_array_s {
 } ty_array_t;
 
 typedef struct ty_alias_s {
-	struct type_s *type;
+	struct type_s *aux_type;	///< other aliases stripped
+	struct type_s *full_type;	///< full alias chain
 } ty_alias_t;
 
 typedef struct type_s {
@@ -148,6 +149,8 @@ type_t *field_type (type_t *aux);
 type_t *pointer_type (type_t *aux);
 type_t *array_type (type_t *aux, int size);
 type_t *based_array_type (type_t *aux, int base, int top);
+type_t *alias_type (type_t *type, type_t *alias_chain, const char *name);
+const type_t *unalias_type (const type_t *type) __attribute__((pure));
 void print_type_str (struct dstring_s *str, const type_t *type);
 void print_type (const type_t *type);
 const char *encode_params (const type_t *type);
diff --git a/tools/qfcc/source/dump_globals.c b/tools/qfcc/source/dump_globals.c
index e02d35753..1695769e0 100644
--- a/tools/qfcc/source/dump_globals.c
+++ b/tools/qfcc/source/dump_globals.c
@@ -580,8 +580,10 @@ dump_qfo_types (qfo_t *qfo, int base_address)
 				printf (" %-5x\n", type->t.class);
 				break;
 			case ty_alias:
-				printf (" %s %d %-5x\n", QFO_GETSTR (qfo, type->t.alias.name),
-						type->t.alias.type, type->t.alias.aux_type);
+				printf (" %s %d %5x %5x\n",
+						QFO_GETSTR (qfo, type->t.alias.name),
+						type->t.alias.type, type->t.alias.aux_type,
+						type->t.alias.full_type);
 				break;
 		}
 	}
diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index f4291bb33..73151b902 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -211,6 +211,7 @@ convert_vector (expr_t *e)
 type_t *
 get_type (expr_t *e)
 {
+	const type_t *type = 0;
 	convert_name (e);
 	switch (e->type) {
 		case ex_labelref:
@@ -238,19 +239,23 @@ get_type (expr_t *e)
 			return &type_void;
 		case ex_expr:
 		case ex_uexpr:
-			return e->e.expr.type;
+			type = e->e.expr.type;
+			break;
 		case ex_def:
-			return e->e.def->type;
+			type = e->e.def->type;
+			break;
 		case ex_symbol:
-			return e->e.symbol->type;
+			type = e->e.symbol->type;
+			break;
 		case ex_temp:
 			return e->e.temp.type;
 		case ex_value:
-			return e->e.value->type;
+			type = e->e.value->type;
+			break;
 		case ex_vector:
 			return e->e.vector.type;
 	}
-	return 0;
+	return (type_t *) unalias_type (type);//FIXME cast
 }
 
 etype_t
@@ -632,12 +637,12 @@ new_symbol_expr (symbol_t *symbol)
 }
 
 expr_t *
-new_temp_def_expr (type_t *type)
+new_temp_def_expr (const type_t *type)
 {
 	expr_t     *e = new_expr ();
 
 	e->type = ex_temp;
-	e->e.temp.type = type;
+	e->e.temp.type = (type_t *) unalias_type (type);	// FIXME cast
 	return e;
 }
 
@@ -2026,8 +2031,9 @@ goto_expr (expr_t *label)
 expr_t *
 return_expr (function_t *f, expr_t *e)
 {
-	type_t     *t;
-	type_t     *ret_type = f->sym->type->t.func.type;
+	const type_t *t;
+	const type_t *func_type = unalias_type (f->sym->type);
+	const type_t *ret_type = unalias_type (func_type->t.func.type);
 
 	if (!e) {
 		if (!is_void(ret_type)) {
@@ -2064,7 +2070,7 @@ return_expr (function_t *f, expr_t *e)
 			warning (e, "returning a value for a void function");
 	}
 	if (e->type == ex_bool) {
-		e = convert_from_bool (e, ret_type);
+		e = convert_from_bool (e, (type_t *) ret_type); //FIXME cast
 	}
 	if (is_float(ret_type) && is_integer_val (e)) {
 		convert_int (e);
@@ -2073,7 +2079,7 @@ return_expr (function_t *f, expr_t *e)
 	if (is_void(t)) {
 		if (e->type == ex_nil) {
 			t = ret_type;
-			convert_nil (e, t);
+			convert_nil (e, (type_t *) t);//FIXME cast
 		} else {
 			if (!options.traditional)
 				return error (e, "void value not ignored as it ought to be");
@@ -2091,7 +2097,7 @@ return_expr (function_t *f, expr_t *e)
 					 f->sym->name);
 	} else {
 		if (ret_type != t) {
-			e = cast_expr (ret_type, e);
+			e = cast_expr ((type_t *) ret_type, e);//FIXME cast
 			t = f->sym->type->t.func.type;
 		}
 	}
@@ -2621,6 +2627,7 @@ cast_expr (type_t *dstType, expr_t *e)
 	if (e->type == ex_error)
 		return e;
 
+	dstType = (type_t *) unalias_type (dstType); //FIXME cast
 	srcType = get_type (e);
 
 	if (dstType == srcType)
diff --git a/tools/qfcc/source/expr_compound.c b/tools/qfcc/source/expr_compound.c
index 5ead7de7a..40b4e01c5 100644
--- a/tools/qfcc/source/expr_compound.c
+++ b/tools/qfcc/source/expr_compound.c
@@ -83,11 +83,13 @@ new_compound_init (void)
 }
 
 void
-build_element_chain (element_chain_t *element_chain, type_t *type,
+build_element_chain (element_chain_t *element_chain, const type_t *type,
 					 expr_t *eles, int base_offset)
 {
 	element_t  *ele = eles->e.compound.head;
 
+	type = unalias_type (type);
+
 	if (is_array (type)) {
 		type_t     *array_type = type->t.array.type;
 		int         array_size = type->t.array.size;
@@ -193,8 +195,9 @@ assign_elements (expr_t *local_expr, expr_t *init,
 }
 
 expr_t *
-initialized_temp_expr (type_t *type, expr_t *compound)
+initialized_temp_expr (const type_t *type, expr_t *compound)
 {
+	type = unalias_type (type);
 	element_chain_t element_chain;
 	expr_t     *temp = new_temp_def_expr (type);
 	expr_t     *block = new_block_expr ();
diff --git a/tools/qfcc/source/function.c b/tools/qfcc/source/function.c
index e9cb0c823..5758eabd5 100644
--- a/tools/qfcc/source/function.c
+++ b/tools/qfcc/source/function.c
@@ -235,7 +235,7 @@ check_params (param_t *params)
 }
 
 static overloaded_function_t *
-get_function (const char *name, type_t *type, int overload, int create)
+get_function (const char *name, const type_t *type, int overload, int create)
 {
 	const char *full_name;
 	overloaded_function_t *func;
@@ -251,7 +251,7 @@ get_function (const char *name, type_t *type, int overload, int create)
 
 	func = Hash_Find (overloaded_functions, full_name);
 	if (func) {
-		if (func->type != type) {
+		if (unalias_type (func->type) != type) {
 			error (0, "can't overload on return types");
 			return func;
 		}
@@ -277,7 +277,7 @@ get_function (const char *name, type_t *type, int overload, int create)
 	func = calloc (1, sizeof (overloaded_function_t));
 	func->name = name;
 	func->full_name = full_name;
-	func->type = type;
+	func->type = (type_t *) type;	//FIXME cast
 	func->overloaded = overload;
 	func->file = pr.source_file;
 	func->line = pr.source_line;
@@ -294,7 +294,7 @@ function_symbol (symbol_t *sym, int overload, int create)
 	overloaded_function_t *func;
 	symbol_t   *s;
 
-	func = get_function (name, sym->type, overload, create);
+	func = get_function (name, unalias_type (sym->type), overload, create);
 
 	if (func && func->overloaded)
 		name = func->full_name;
@@ -615,7 +615,8 @@ begin_function (symbol_t *sym, const char *nicename, symtab_t *parent,
 static void
 build_function (symbol_t *fsym)
 {
-	if (fsym->type->t.func.num_params > MAX_PARMS) {
+	const type_t *func_type = unalias_type (fsym->type);
+	if (func_type->t.func.num_params > MAX_PARMS) {
 		error (0, "too many params");
 	}
 	//	FIXME
diff --git a/tools/qfcc/source/obj_file.c b/tools/qfcc/source/obj_file.c
index 0c08810f0..be76f06c4 100644
--- a/tools/qfcc/source/obj_file.c
+++ b/tools/qfcc/source/obj_file.c
@@ -774,7 +774,11 @@ function_params (qfo_t *qfo, qfo_func_t *func, dfunction_t *df)
 	if (func->type >= qfo->spaces[qfo_type_space].data_size)
 		return;
 	type = QFO_POINTER (qfo, qfo_type_space, qfot_type_t, func->type);
-	if (type->meta != ty_basic && type->t.type != ev_func)
+	if (type->meta == ty_alias) {
+		type = QFO_POINTER (qfo, qfo_type_space, qfot_type_t,
+							type->t.alias.aux_type);
+	}
+	if (type->meta != ty_basic || type->t.type != ev_func)
 		return;
 	df->numparms = num_params = type->t.func.num_params;
 	if (num_params < 0)
@@ -1228,6 +1232,10 @@ qfo_to_sym (qfo_t *qfo, int *size)
 		aux->num_locals = num_locals;
 		//FIXME check type
 		type = QFO_POINTER (qfo, qfo_type_space, qfot_type_t, func->type);
+		if (type->meta == ty_alias) {
+			type = QFO_POINTER (qfo, qfo_type_space, qfot_type_t,
+								type->t.alias.aux_type);
+		}
 		aux->return_type = type->t.func.return_type;
 		aux++;
 	}
diff --git a/tools/qfcc/source/obj_type.c b/tools/qfcc/source/obj_type.c
index d56cd98b9..8850ebac6 100644
--- a/tools/qfcc/source/obj_type.c
+++ b/tools/qfcc/source/obj_type.c
@@ -254,6 +254,28 @@ qfo_encode_class (type_t *type)
 	return def;
 }
 
+static def_t *
+qfo_encode_alias (type_t *type)
+{
+	qfot_type_t *enc;
+	def_t      *def;
+	def_t      *type_def;
+	def_t      *full_def;
+
+	type_def = qfo_encode_type (type->t.alias.aux_type);
+	full_def = qfo_encode_type (type->t.alias.full_type);
+
+	def = qfo_new_encoding (type, sizeof (enc->t.alias));
+	enc = D_POINTER (qfot_type_t, def);
+	enc->t.alias.type = type->type;
+	ENC_DEF (enc->t.alias.aux_type, type_def);
+	ENC_DEF (enc->t.alias.full_type, full_def);
+	if (type->name) {
+		ENC_STR (enc->t.alias.name, type->name);
+	}
+	return def;
+}
+
 def_t *
 qfo_encode_type (type_t *type)
 {
@@ -266,6 +288,7 @@ qfo_encode_type (type_t *type)
 		qfo_encode_struct,	// ty_enum
 		qfo_encode_array,	// ty_array
 		qfo_encode_class,	// ty_class
+		qfo_encode_alias,	// ty_alias
 	};
 
 	if (type->type_def && type->type_def->external) {
diff --git a/tools/qfcc/source/qc-parse.y b/tools/qfcc/source/qc-parse.y
index bdac72d30..3529c1a1f 100644
--- a/tools/qfcc/source/qc-parse.y
+++ b/tools/qfcc/source/qc-parse.y
@@ -456,6 +456,7 @@ external_decl
 			$1->type = find_type (append_type ($1->type, spec.type));
 			if (spec.is_typedef) {
 				$1->sy_type = sy_type;
+				$1->type=find_type (alias_type ($1->type, $1->type, $1->name));
 				symtab_addsymbol (current_symtab, $1);
 			} else {
 				initialize_def ($1, 0, current_symtab->space, spec.storage);
@@ -471,6 +472,7 @@ external_decl
 			if (spec.is_typedef) {
 				error (0, "typedef %s is initialized", $1->name);
 				$1->sy_type = sy_type;
+				$1->type=find_type (alias_type ($1->type, $1->type, $1->name));
 				symtab_addsymbol (current_symtab, $1);
 			} else {
 				initialize_def ($1, $2, current_symtab->space, spec.storage);
@@ -484,6 +486,7 @@ external_decl
 			$1->type = find_type (append_type ($1->type, spec.type));
 			if (spec.is_typedef) {
 				$1->sy_type = sy_type;
+				$1->type=find_type (alias_type ($1->type, $1->type, $1->name));
 				symtab_addsymbol (current_symtab, $1);
 			} else {
 				$1 = function_symbol ($1, spec.is_overload, 1);
diff --git a/tools/qfcc/source/type.c b/tools/qfcc/source/type.c
index 0b54267b6..475a4e1aa 100644
--- a/tools/qfcc/source/type.c
+++ b/tools/qfcc/source/type.c
@@ -213,39 +213,53 @@ append_type (type_t *type, type_t *new)
 	type_t    **t = &type;
 
 	while (*t) {
-		switch ((*t)->type) {
-			case ev_void:
-			case ev_string:
-			case ev_float:
-			case ev_vector:
-			case ev_entity:
-			case ev_type_count:
-			case ev_quat:
-			case ev_integer:
-			case ev_uinteger:
-			case ev_short:
-			case ev_double:
-				internal_error (0, "append to basic type");
-			case ev_field:
-			case ev_pointer:
-				t = &(*t)->t.fldptr.type;
-				type->alignment = 1;
-				break;
-			case ev_func:
-				t = &(*t)->t.func.type;
-				type->alignment = 1;
-				break;
-			case ev_invalid:
-				if ((*t)->meta == ty_array) {
-					t = &(*t)->t.array.type;
-					type->alignment = new->alignment;
-				} else {
-					internal_error (0, "append to object type");
+		switch ((*t)->meta) {
+			case ty_basic:
+				switch ((*t)->type) {
+					case ev_void:
+					case ev_string:
+					case ev_float:
+					case ev_vector:
+					case ev_entity:
+					case ev_type_count:
+					case ev_quat:
+					case ev_integer:
+					case ev_uinteger:
+					case ev_short:
+					case ev_double:
+						internal_error (0, "append to basic type");
+					case ev_field:
+					case ev_pointer:
+						t = &(*t)->t.fldptr.type;
+						type->alignment = 1;
+						break;
+					case ev_func:
+						t = &(*t)->t.func.type;
+						type->alignment = 1;
+						break;
+					case ev_invalid:
+						internal_error (0, "invalid basic type");
+						break;
 				}
 				break;
+			case ty_array:
+				t = &(*t)->t.array.type;
+				type->alignment = new->alignment;
+				break;
+			case ty_struct:
+			case ty_union:
+			case ty_enum:
+			case ty_class:
+			case ty_alias:	//XXX is this correct?
+				internal_error (0, "append to object type");
 		}
 	}
-	*t = new;
+	if (new->meta == ty_alias) {
+		*t = new->t.alias.aux_type;
+		type = alias_type (type, new, 0);
+	} else {
+		*t = new;
+	}
 	return type;
 }
 
@@ -298,7 +312,10 @@ types_same (type_t *a, type_t *b)
 				return 0;
 			return compare_protocols (a->protos, b->protos);
 		case ty_alias:
-			return !strcmp (a->name, b->name);
+			// names have gone through save_string
+			return (a->name == b->name
+					&& a->t.alias.aux_type == b->t.alias.aux_type
+					&& a->t.alias.full_type == b->t.alias.full_type);
 	}
 	internal_error (0, "we be broke");
 }
@@ -349,7 +366,7 @@ find_type (type_t *type)
 			case ty_class:
 				break;
 			case ty_alias:
-				type->t.alias.type = find_type (type->t.alias.type);
+				type->t.alias.aux_type = find_type (type->t.alias.aux_type);
 				break;
 		}
 	}
@@ -450,6 +467,30 @@ based_array_type (type_t *aux, int base, int top)
 	return new;
 }
 
+type_t *
+alias_type (type_t *type, type_t *alias_chain, const char *name)
+{
+	type_t     *alias = new_type ();
+	alias->meta = ty_alias;
+	alias->type = type->type;
+	alias->alignment = type->alignment;
+	alias->t.alias.aux_type = type;
+	alias->t.alias.full_type = alias_chain;
+	if (name) {
+		alias->name = save_string (name);
+	}
+	return alias;
+}
+
+const type_t *
+unalias_type (const type_t *type)
+{
+	if (type->meta == ty_alias) {
+		return type->t.alias.aux_type;
+	}
+	return type;
+}
+
 void
 print_type_str (dstring_t *str, const type_t *type)
 {
@@ -460,7 +501,7 @@ print_type_str (dstring_t *str, const type_t *type)
 	switch (type->meta) {
 		case ty_alias:
 			dasprintf (str, "({%s=", type->name);
-			print_type_str (str, type->t.alias.type);
+			print_type_str (str, type->t.alias.aux_type);
 			dstring_appendstr (str, "})");
 			return;
 		case ty_class:
@@ -569,7 +610,7 @@ encode_params (const type_t *type)
 	else
 		count = type->t.func.num_params;
 	for (i = 0; i < count; i++)
-		encode_type (encoding, type->t.func.param_types[i]);
+		encode_type (encoding, unalias_type (type->t.func.param_types[i]));
 	if (type->t.func.num_params < 0)
 		dasprintf (encoding, ".");
 
@@ -622,7 +663,7 @@ encode_type (dstring_t *encoding, const type_t *type)
 	switch (type->meta) {
 		case ty_alias: // XXX do I want this, or just the unaliased type?
 			dasprintf (encoding, "{%s>", type->name);
-			encode_type (encoding, type->t.alias.type);
+			encode_type (encoding, type->t.alias.aux_type);
 			dasprintf (encoding, "}");
 			return;
 		case ty_class:
@@ -714,12 +755,14 @@ encode_type (dstring_t *encoding, const type_t *type)
 int
 is_void (const type_t *type)
 {
+	type = unalias_type (type);
 	return type->type == ev_void;
 }
 
 int
 is_enum (const type_t *type)
 {
+	type = unalias_type (type);
 	if (type->type == ev_invalid && type->meta == ty_enum)
 		return 1;
 	return 0;
@@ -728,6 +771,7 @@ is_enum (const type_t *type)
 int
 is_integer (const type_t *type)
 {
+	type = unalias_type (type);
 	etype_t     t = type->type;
 
 	if (t == ev_integer)
@@ -738,6 +782,7 @@ is_integer (const type_t *type)
 int
 is_uinteger (const type_t *type)
 {
+	type = unalias_type (type);
 	etype_t     t = type->type;
 
 	if (t == ev_uinteger)
@@ -748,6 +793,7 @@ is_uinteger (const type_t *type)
 int
 is_short (const type_t *type)
 {
+	type = unalias_type (type);
 	etype_t     t = type->type;
 
 	if (t == ev_short)
@@ -758,6 +804,7 @@ is_short (const type_t *type)
 int
 is_integral (const type_t *type)
 {
+	type = unalias_type (type);
 	if (is_integer (type) || is_uinteger (type) || is_short (type))
 		return 1;
 	return is_enum (type);
@@ -766,36 +813,42 @@ is_integral (const type_t *type)
 int
 is_double (const type_t *type)
 {
+	type = unalias_type (type);
 	return type->type == ev_double;
 }
 
 int
 is_float (const type_t *type)
 {
+	type = unalias_type (type);
 	return type->type == ev_float;
 }
 
 int
 is_scalar (const type_t *type)
 {
+	type = unalias_type (type);
 	return is_float (type) || is_integral (type) || is_double (type);
 }
 
 int
 is_vector (const type_t *type)
 {
+	type = unalias_type (type);
 	return type->type == ev_vector;
 }
 
 int
 is_quaternion (const type_t *type)
 {
+	type = unalias_type (type);
 	return type->type == ev_quat;
 }
 
 int
 is_math (const type_t *type)
 {
+	type = unalias_type (type);
 	etype_t     t = type->type;
 
 	return t == ev_vector || t == ev_quat || is_scalar (type);
@@ -804,6 +857,7 @@ is_math (const type_t *type)
 int
 is_struct (const type_t *type)
 {
+	type = unalias_type (type);
 	if (type->type == ev_invalid
 		&& (type->meta == ty_struct || type->meta == ty_union))
 		return 1;
@@ -813,6 +867,7 @@ is_struct (const type_t *type)
 int
 is_pointer (const type_t *type)
 {
+	type = unalias_type (type);
 	if (type->type == ev_pointer)
 		return 1;
 	return 0;
@@ -821,6 +876,7 @@ is_pointer (const type_t *type)
 int
 is_field (const type_t *type)
 {
+	type = unalias_type (type);
 	if (type->type == ev_field)
 		return 1;
 	return 0;
@@ -829,6 +885,7 @@ is_field (const type_t *type)
 int
 is_entity (const type_t *type)
 {
+	type = unalias_type (type);
 	if (type->type == ev_entity)
 		return 1;
 	return 0;
@@ -837,6 +894,7 @@ is_entity (const type_t *type)
 int
 is_array (const type_t *type)
 {
+	type = unalias_type (type);
 	if (type->type == ev_invalid && type->meta == ty_array)
 		return 1;
 	return 0;
@@ -845,6 +903,7 @@ is_array (const type_t *type)
 int
 is_func (const type_t *type)
 {
+	type = unalias_type (type);
 	if (type->type == ev_func)
 		return 1;
 	return 0;
@@ -853,12 +912,14 @@ is_func (const type_t *type)
 int
 is_structural (const type_t *type)
 {
+	type = unalias_type (type);
 	return is_struct (type) || is_array (type);
 }
 
 int
 is_string (const type_t *type)
 {
+	type = unalias_type (type);
 	if (type->type == ev_string)
 		return 1;
 	return 0;
@@ -888,6 +949,8 @@ type_assignable (const type_t *dst, const type_t *src)
 {
 	int         ret;
 
+	dst = unalias_type (dst);
+	src = unalias_type (src);
 	// same type
 	if (dst == src)
 		return 1;
@@ -952,7 +1015,7 @@ type_size (const type_t *type)
 				return size;
 			}
 		case ty_alias:
-			return type_size (type->t.alias.type);
+			return type_size (type->t.alias.aux_type);
 	}
 	return 0;
 }

From 8479cad8a8df41272392e41abfce81c9ec3e307d Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 28 Mar 2020 13:38:26 +0900
Subject: [PATCH 1033/1519] [qfcc] Record alias-free type in function_t

This eases type unaliasing on functions a little.

Still more to to go, but this fixes a really hair-pulling bug: linux's
heap randomiser was making the typedef test fail randomly whenever
typedef.qfo was compiled.
---
 tools/qfcc/include/function.h |  3 ++-
 tools/qfcc/source/expr.c      |  3 +--
 tools/qfcc/source/function.c  | 21 ++++++++++++++-------
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/tools/qfcc/include/function.h b/tools/qfcc/include/function.h
index 951b40597..3ae7c845f 100644
--- a/tools/qfcc/include/function.h
+++ b/tools/qfcc/include/function.h
@@ -51,7 +51,7 @@ typedef struct overloaded_function_s {
 	const char *name;				///< source level name of function
 	const char *full_name;			///< progs name of function, with type
 									///< encoding
-	struct type_s *type;			///< type of this function
+	const struct type_s *type;		///< type of this function
 	int         overloaded;			///< is this function overloaded
 	string_t    file;				///< source file of the function
 	int         line;				///< source line of this function
@@ -68,6 +68,7 @@ typedef struct function_s {
 	int                 local_defs;
 	string_t            s_file;		///< source file with definition
 	string_t            s_name;		///< name of function in output
+	const struct type_s *type;		///< function's type without aliases
 	int                 temp_num;	///< number for next temp var
 	struct def_s       *temp_defs[4];	///< freed temp vars (by size)
 	struct def_s       *def;		///< output def holding function number
diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index 73151b902..6bbc7b742 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -2032,8 +2032,7 @@ expr_t *
 return_expr (function_t *f, expr_t *e)
 {
 	const type_t *t;
-	const type_t *func_type = unalias_type (f->sym->type);
-	const type_t *ret_type = unalias_type (func_type->t.func.type);
+	const type_t *ret_type = unalias_type (f->type->t.func.type);
 
 	if (!e) {
 		if (!is_void(ret_type)) {
diff --git a/tools/qfcc/source/function.c b/tools/qfcc/source/function.c
index 5758eabd5..81a36607a 100644
--- a/tools/qfcc/source/function.c
+++ b/tools/qfcc/source/function.c
@@ -251,7 +251,7 @@ get_function (const char *name, const type_t *type, int overload, int create)
 
 	func = Hash_Find (overloaded_functions, full_name);
 	if (func) {
-		if (unalias_type (func->type) != type) {
+		if (func->type != type) {
 			error (0, "can't overload on return types");
 			return func;
 		}
@@ -277,7 +277,7 @@ get_function (const char *name, const type_t *type, int overload, int create)
 	func = calloc (1, sizeof (overloaded_function_t));
 	func->name = name;
 	func->full_name = full_name;
-	func->type = (type_t *) type;	//FIXME cast
+	func->type = type;
 	func->overloaded = overload;
 	func->file = pr.source_file;
 	func->line = pr.source_line;
@@ -302,7 +302,7 @@ function_symbol (symbol_t *sym, int overload, int create)
 	if ((!s || s->table != current_symtab) && create) {
 		s = new_symbol (name);
 		s->sy_type = sy_func;
-		s->type = sym->type;
+		s->type = (type_t *) unalias_type (sym->type); // FIXME cast
 		s->params = sym->params;
 		s->s.func = 0;				// function not yet defined
 		symtab_addsymbol (current_symtab, s);
@@ -316,8 +316,8 @@ func_compare (const void *a, const void *b)
 {
 	overloaded_function_t *fa = *(overloaded_function_t **) a;
 	overloaded_function_t *fb = *(overloaded_function_t **) b;
-	type_t     *ta = fa->type;
-	type_t     *tb = fb->type;
+	const type_t *ta = fa->type;
+	const type_t *tb = fb->type;
 	int         na = ta->t.func.num_params;
 	int         nb = tb->t.func.num_params;
 	int         ret, i;
@@ -497,7 +497,13 @@ build_scope (symbol_t *fsym, symtab_t *parent)
 	symtab->space = defspace_new (ds_virtual);
 	current_symtab = symtab;
 
-	if (fsym->type->t.func.num_params < 0) {
+	if (!fsym->s.func) {
+		internal_error (0, "function %s not defined", fsym->name);
+	}
+	if (!is_func (fsym->s.func->type)) {
+		internal_error (0, "function type %s not a funciton", fsym->name);
+	}
+	if (fsym->s.func->type->t.func.num_params < 0) {
 		args = new_symbol_type (".args", &type_va_list);
 		initialize_def (args, 0, symtab->space, sc_param);
 	}
@@ -551,6 +557,7 @@ make_function (symbol_t *sym, const char *nice_name, defspace_t *space,
 	if (!sym->s.func) {
 		sym->s.func = new_function (sym->name, nice_name);
 		sym->s.func->sym = sym;
+		sym->s.func->type = unalias_type (sym->type);
 	}
 	if (sym->s.func->def && sym->s.func->def->external
 		&& storage != sc_extern) {
@@ -615,7 +622,7 @@ begin_function (symbol_t *sym, const char *nicename, symtab_t *parent,
 static void
 build_function (symbol_t *fsym)
 {
-	const type_t *func_type = unalias_type (fsym->type);
+	const type_t *func_type = fsym->s.func->type;
 	if (func_type->t.func.num_params > MAX_PARMS) {
 		error (0, "too many params");
 	}

From ec3c2426ff94ed7a95c9ecd0715d084c74d43c15 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 28 Mar 2020 15:34:34 +0900
Subject: [PATCH 1034/1519] [qfcc] Add type dot dumping

It's not connected up yet because I'm unsure of just where to put things
(it gets messy fast), but just being able to see the structure of
complex types is nice.
---
 tools/qfcc/include/type.h     |   2 +
 tools/qfcc/source/Makefile.am |   4 +-
 tools/qfcc/source/dot.c       |   8 +-
 tools/qfcc/source/dot_type.c  | 283 ++++++++++++++++++++++++++++++++++
 tools/qfcc/source/stub.c      |   4 +
 tools/qfcc/source/type.c      |   1 +
 6 files changed, 299 insertions(+), 3 deletions(-)
 create mode 100644 tools/qfcc/source/dot_type.c

diff --git a/tools/qfcc/include/type.h b/tools/qfcc/include/type.h
index 70c650c52..686e864e1 100644
--- a/tools/qfcc/include/type.h
+++ b/tools/qfcc/include/type.h
@@ -74,6 +74,7 @@ typedef struct type_s {
 	struct type_s *next;
 	int         freeable;
 	int         allocated;
+	int         printid;	///< for dot output
 	struct protocollist_s *protos;
 	const char *encoding;	///< Objective-QC encoding
 	struct def_s *type_def;	///< offset of qfo encodoing
@@ -153,6 +154,7 @@ type_t *alias_type (type_t *type, type_t *alias_chain, const char *name);
 const type_t *unalias_type (const type_t *type) __attribute__((pure));
 void print_type_str (struct dstring_s *str, const type_t *type);
 void print_type (const type_t *type);
+void dump_dot_type (void *t, const char *filename);
 const char *encode_params (const type_t *type);
 void encode_type (struct dstring_s *encoding, const type_t *type);
 const char *type_get_encoding (const type_t *type);
diff --git a/tools/qfcc/source/Makefile.am b/tools/qfcc/source/Makefile.am
index bbaf06ee6..b69dd6323 100644
--- a/tools/qfcc/source/Makefile.am
+++ b/tools/qfcc/source/Makefile.am
@@ -40,7 +40,9 @@ bin_SCRIPTS=	qfpreqcc
 
 common_src=\
 	class.c codespace.c constfold.c cpp.c dags.c debug.c def.c defspace.c \
-	diagnostic.c dot.c dot_dag.c dot_expr.c dot_flow.c dot_sblock.c emit.c \
+	diagnostic.c \
+	dot.c dot_dag.c dot_expr.c dot_flow.c dot_sblock.c dot_type.c \
+	emit.c \
 	expr.c expr_assign.c expr_binary.c expr_bool.c expr_compound.c expr_obj.c \
 	flow.c function.c grab.c \
 	idstuff.c \
diff --git a/tools/qfcc/source/dot.c b/tools/qfcc/source/dot.c
index 5d72b5150..51d82993a 100644
--- a/tools/qfcc/source/dot.c
+++ b/tools/qfcc/source/dot.c
@@ -55,8 +55,12 @@ dump_dot (const char *stage, void *data,
 	} else {
 		dot_index++;
 	}
-	fname = nva ("%s.%s.%03d.%s.dot", options.output_file, current_func->name,
-				 dot_index, stage);
+	if (current_func) {
+		fname = nva ("%s.%s.%03d.%s.dot", options.output_file,
+					 current_func->name, dot_index, stage);
+	} else {
+		fname = nva ("%s.%03d.%s.dot", options.output_file, dot_index, stage);
+	}
 	dump_func (data, fname);
 	free (fname);
 }
diff --git a/tools/qfcc/source/dot_type.c b/tools/qfcc/source/dot_type.c
new file mode 100644
index 000000000..bffa4aa70
--- /dev/null
+++ b/tools/qfcc/source/dot_type.c
@@ -0,0 +1,283 @@
+/*
+	dot_type.c
+
+	"emit" types to dot (graphvis).
+
+	Copyright (C) 2020 Bill Currie <bill@taniwha.org>
+
+	Author: Bill Currie <bill@taniwha.org>
+	Date: 2020/03/28
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#include <stdlib.h>
+
+#include <QF/dstring.h>
+#include <QF/mathlib.h>
+#include <QF/quakeio.h>
+#include <QF/va.h>
+
+#include "class.h"
+#include "symtab.h"
+#include "type.h"
+#include "qc-parse.h"
+#include "strpool.h"
+
+typedef void (*print_f) (dstring_t *dstr, type_t *, int, int);
+static void dot_print_type (dstring_t *dstr, type_t *t, int level, int id);
+
+static void
+print_pointer (dstring_t *dstr, type_t *t, int level, int id)
+{
+	int         indent = level * 2 + 2;
+	type_t     *aux = t->t.fldptr.type;
+
+	dot_print_type (dstr, aux, level, id);
+	dasprintf (dstr, "%*st_%p -> \"t_%p\";\n", indent, "", t, aux);
+	dasprintf (dstr, "%*st_%p [label=\"%c\"];\n", indent, "", t,
+			   t->type == ev_pointer ? '*' : '.');
+}
+
+static void
+print_ellipsis (dstring_t *dstr, int level, int id)
+{
+	static int  ellipsis_id;
+	int         indent = level * 2 + 2;
+
+	if (ellipsis_id == id) {
+		return;
+	}
+	ellipsis_id = id;
+	dasprintf (dstr, "%*st_ellipsis [label=\"...\"];\n", indent, "");
+}
+
+static void
+print_function (dstring_t *dstr, type_t *t, int level, int id)
+{
+	int         indent = level * 2 + 2;
+	const ty_func_t *func = &t->t.func;
+	type_t     *ret = func->type;
+	type_t     *param;
+
+	dot_print_type (dstr, ret, level + 1, id);
+	if (func->num_params < 0) {
+		for (int i = 0; i < ~func->num_params; i++) {
+			param = func->param_types[i];
+			dot_print_type (dstr, param, level + 1, id);
+		}
+		print_ellipsis (dstr, level, id);
+	} else {
+		for (int i = 0; i < func->num_params; i++) {
+			param = func->param_types[i];
+			dot_print_type (dstr, param, level + 1, id);
+		}
+	}
+	dasprintf (dstr, "%*st_%p -> \"t_%p\" [label=\"r\"];\n", indent, "",
+			   t, ret);
+	if (func->num_params < 0) {
+		for (int i = 0; i < ~func->num_params; i++) {
+			param = func->param_types[i];
+			dasprintf (dstr, "%*st_%p -> \"t_%p\";\n", indent, "", t, param);
+		}
+		dasprintf (dstr, "%*st_%p -> \"t_ellipsis\";\n", indent, "", t);
+	} else {
+		for (int i = 0; i < func->num_params; i++) {
+			param = func->param_types[i];
+			dasprintf (dstr, "%*st_%p -> \"t_%p\";\n", indent, "", t, param);
+		}
+	}
+	dasprintf (dstr, "%*st_%p [label=\"( )\"];\n", indent, "", t);
+}
+
+static void
+print_basic (dstring_t *dstr, type_t *t, int level, int id)
+{
+	if (t->type == ev_pointer || t->type == ev_field) {
+		print_pointer (dstr, t, level, id);
+	} else if (t->type == ev_func) {
+		print_function (dstr, t, level, id);
+	} else {
+		int         indent = level * 2 + 2;
+		dasprintf (dstr, "%*st_%p [label=\"%s\"];\n", indent, "", t, t->name);
+	}
+}
+
+static void
+print_struct (dstring_t *dstr, type_t *t, int level, int id)
+{
+	int         indent = level * 2 + 2;
+	const symtab_t *symtab = t->t.symtab;
+	const symbol_t *sym;
+	int         pnum;
+	static const char *struct_type_names[3] = {"struct", "union", "enum"};
+	const char *struct_type = struct_type_names[t->meta - ty_struct];
+
+	if (!symtab) {
+		dasprintf (dstr, "%*st_%p [label=\"%s %s\"];\n", indent, "", t,
+				   struct_type, quote_string (t->name));
+		return;
+	}
+	if (t->meta != ty_enum) {
+		for (sym = symtab->symbols; sym; sym = sym->next) {
+			if (sym->sy_type != sy_var) {
+				continue;
+			}
+			dot_print_type (dstr, sym->type, level, id);
+		}
+		for (pnum = 0, sym = symtab->symbols; sym; sym = sym->next) {
+			if (sym->sy_type != sy_var) {
+				continue;
+			}
+			dasprintf (dstr, "%*st_%p:f%d -> \"t_%p\";\n", indent, "",
+					   t, pnum++, sym->type);
+		}
+	}
+	dasprintf (dstr, "%*st_%p [shape=none,label=<\n", indent, "", t);
+	dasprintf (dstr, "%*s<table border=\"0\" cellborder=\"1\" "
+			   "cellspacing=\"0\">\n",
+			   indent + 2, "");
+	dasprintf (dstr, "%*s<tr><td colspan=\"2\">%s %s</td></tr>\n",
+			   indent + 4, "",
+			   struct_type, quote_string (t->name));
+	for (pnum = 0, sym = symtab->symbols; sym; sym = sym->next) {
+		int         val;
+		const char *port = "";
+		if (sym->sy_type == sy_const) {
+			val = sym->s.value->v.integer_val;
+		} else {
+			if (sym->sy_type != sy_var) {
+				continue;
+			}
+			val = sym->s.offset;
+			port = va (" port=\"f%d\"", pnum++);
+		}
+		dasprintf (dstr, "%*s<tr><td>%s</td><td%s>%d</td></tr>\n",
+				   indent + 4, "",
+				   quote_string (sym->name), port, val);
+	}
+	dasprintf (dstr, "%*s</table>\n", indent + 2, "");
+	dasprintf (dstr, "%*s>];\n", indent, "");
+}
+
+static void
+print_array (dstring_t *dstr, type_t *t, int level, int id)
+{
+	int         indent = level * 2 + 2;
+	type_t     *type = t->t.array.type;
+
+	dot_print_type (dstr, type, level, id);
+	dasprintf (dstr, "%*st_%p -> \"t_%p\";\n", indent, "", t, type);
+	if (t->t.array.base) {
+		dasprintf (dstr, "%*st_%p [label=\"[%d..%d]\"];\n", indent, "", t,
+				   t->t.array.base,
+				   t->t.array.base + t->t.array.size - 1);
+	} else {
+		dasprintf (dstr, "%*st_%p [label=\"[%d]\"];\n", indent, "", t,
+				   t->t.array.size);
+	}
+}
+
+static void
+print_class (dstring_t *dstr, type_t *t, int level, int id)
+{
+	int         indent = level * 2 + 2;
+	dasprintf (dstr, "%*st_%p [label=\"class '%s'\"];\n", indent, "", t,
+			   t->t.class->name);
+}
+
+static void
+print_alias (dstring_t *dstr, type_t *t, int level, int id)
+{
+	int         indent = level * 2 + 2;
+	type_t     *aux = t->t.alias.aux_type;
+	type_t     *full = t->t.alias.full_type;
+
+	dot_print_type (dstr, aux, level, id);
+	dot_print_type (dstr, full, level, id);
+	dasprintf (dstr, "%*st_%p -> \"t_%p\";\n", indent, "", t, aux);
+	dasprintf (dstr, "%*st_%p -> \"t_%p\";\n", indent, "", t, full);
+	dasprintf (dstr, "%*st_%p [label=\"alias '%s'\"];\n", indent, "", t,
+			   t->name);
+}
+
+static void
+dot_print_type (dstring_t *dstr, type_t *t, int level, int id)
+{
+	static print_f print_funcs[] = {
+		print_basic,
+		print_struct,
+		print_struct,
+		print_struct,
+		print_array,
+		print_class,
+		print_alias,
+	};
+	int         indent = level * 2 + 2;
+
+	if (!t) {
+		dasprintf (dstr, "%*s\"e_%p\" [label=\"(null)\"];\n", indent, "", t);
+		return;
+	}
+	if (t->printid == id)		// already printed this type
+		return;
+	t->printid = id;
+
+	if ((unsigned) t->meta >= sizeof (print_funcs) / sizeof (print_funcs[0])) {
+		dasprintf (dstr, "%*se_%p [label=\"(bad type meta)\\n%d\"];\n",
+				   indent, "", t, t->meta);
+		return;
+	}
+	print_funcs [t->meta] (dstr, t, level, id);
+}
+
+void
+dump_dot_type (void *_t, const char *filename)
+{
+	static int  id = 0;
+	dstring_t  *dstr = dstring_newstr ();
+	type_t     *t = (type_t *) _t;
+
+	dasprintf (dstr, "digraph type_%p {\n", t);
+	dasprintf (dstr, "  graph [label=\"%s\"];\n", quote_string (filename));
+	dasprintf (dstr, "  layout=dot; rankdir=TB; compound=true;\n");
+	dot_print_type (dstr, t, 0, ++id);
+	dasprintf (dstr, "}\n");
+
+	if (filename) {
+		QFile      *file;
+
+		file = Qopen (filename, "wt");
+		Qwrite (file, dstr->str, dstr->size - 1);
+		Qclose (file);
+	} else {
+		fputs (dstr->str, stdout);
+	}
+	dstring_delete (dstr);
+}
diff --git a/tools/qfcc/source/stub.c b/tools/qfcc/source/stub.c
index 405104126..f3601d04b 100644
--- a/tools/qfcc/source/stub.c
+++ b/tools/qfcc/source/stub.c
@@ -7,6 +7,7 @@
 #include "class.h"
 #include "codespace.h"
 #include "diagnostic.h"
+#include "dot.h"
 #include "debug.h"
 #include "def.h"
 #include "defspace.h"
@@ -49,3 +50,6 @@ int is_id (const type_t *type){return type->type;}
 int is_SEL (const type_t *type){return type->type;}
 int is_Class (const type_t *type){return type->type;}
 int compare_protocols (protocollist_t *protos1, protocollist_t *protos2){return protos1->count - protos2->count;}
+void dump_dot (const char *stage, void *data,
+		          void (*dump_func) (void *data, const char *fname)){}
+void dump_dot_type (void *_t, const char *filename){}
diff --git a/tools/qfcc/source/type.c b/tools/qfcc/source/type.c
index 475a4e1aa..5bb93b787 100644
--- a/tools/qfcc/source/type.c
+++ b/tools/qfcc/source/type.c
@@ -50,6 +50,7 @@
 #include "class.h"
 #include "def.h"
 #include "diagnostic.h"
+#include "dot.h"
 #include "expr.h"
 #include "function.h"
 #include "obj_type.h"

From da39e675b8d09e45f66eb4f89753fa34631ef554 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 28 Mar 2020 17:13:47 +0900
Subject: [PATCH 1035/1519] [qfcc] Copy type chain for type aliases

The full_type branch of an alias splitter (alias with null name) needs
to mirror the clean side up to the type alias. It is causing problems
with functions, but that's expected because parameters complicate
things.
---
 tools/qfcc/source/type.c | 60 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 57 insertions(+), 3 deletions(-)

diff --git a/tools/qfcc/source/type.c b/tools/qfcc/source/type.c
index 5bb93b787..e6d3e4b9f 100644
--- a/tools/qfcc/source/type.c
+++ b/tools/qfcc/source/type.c
@@ -50,7 +50,6 @@
 #include "class.h"
 #include "def.h"
 #include "diagnostic.h"
-#include "dot.h"
 #include "expr.h"
 #include "function.h"
 #include "obj_type.h"
@@ -208,6 +207,60 @@ free_type (type_t *type)
 	FREE (types, type);
 }
 
+static type_t *
+copy_chain (type_t *type, type_t *append)
+{
+	type_t     *new = 0;
+	type_t    **n = &new;
+
+	while (type) {
+		*n = new_type ();
+		**n = *type;
+		switch (type->meta) {
+			case ty_basic:
+				switch (type->type) {
+					case ev_void:
+					case ev_string:
+					case ev_float:
+					case ev_vector:
+					case ev_entity:
+					case ev_type_count:
+					case ev_quat:
+					case ev_integer:
+					case ev_uinteger:
+					case ev_short:
+					case ev_double:
+						internal_error (0, "copy basic type");
+					case ev_field:
+					case ev_pointer:
+						n = &(*n)->t.fldptr.type;
+						type = type->t.fldptr.type;
+						break;
+					case ev_func:
+						n = &(*n)->t.func.type;
+						type = type->t.func.type;
+						break;
+					case ev_invalid:
+						internal_error (0, "invalid basic type");
+						break;
+				}
+				break;
+			case ty_array:
+				n = &(*n)->t.array.type;
+				type = type->t.array.type;
+				break;
+			case ty_struct:
+			case ty_union:
+			case ty_enum:
+			case ty_class:
+			case ty_alias:	//XXX is this correct?
+				internal_error (0, "copy object type %d", type->meta);
+		}
+	}
+	*n = append;
+	return new;
+}
+
 type_t *
 append_type (type_t *type, type_t *new)
 {
@@ -255,9 +308,10 @@ append_type (type_t *type, type_t *new)
 				internal_error (0, "append to object type");
 		}
 	}
-	if (new->meta == ty_alias) {
+	if (type && new->meta == ty_alias) {
+		type_t     *chain = find_type (copy_chain (type, new));
 		*t = new->t.alias.aux_type;
-		type = alias_type (type, new, 0);
+		type = alias_type (type, chain, 0);
 	} else {
 		*t = new;
 	}

From 69037fe5eb82b9211c621c6945dc7d8bc808e85d Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 28 Mar 2020 18:51:38 +0900
Subject: [PATCH 1036/1519] [qfcc] Strip alias info off function params

For now. This fixes many problems but does lose type aliasing info from
function parameters.
---
 tools/qfcc/source/function.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/qfcc/source/function.c b/tools/qfcc/source/function.c
index 81a36607a..b199bf51d 100644
--- a/tools/qfcc/source/function.c
+++ b/tools/qfcc/source/function.c
@@ -170,6 +170,7 @@ parse_params (type_t *type, param_t *parms)
 {
 	param_t    *p;
 	type_t     *new;
+	type_t     *ptype;
 	int         count = 0;
 
 	if (type && is_class (type)) {
@@ -201,7 +202,8 @@ parse_params (type_t *type, param_t *parms)
 				error (0, "cannot use an object as a parameter (forgot *?)");
 				p->type = &type_id;
 			}
-			new->t.func.param_types[new->t.func.num_params] = p->type;
+			ptype = (type_t *) unalias_type (p->type); //FIXME cast
+			new->t.func.param_types[new->t.func.num_params] = ptype;
 			new->t.func.num_params++;
 		}
 	}

From eacdd0d3dea8f5c682462a33ec2eff15244442e5 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 28 Mar 2020 18:52:57 +0900
Subject: [PATCH 1037/1519] [qfcc] Make file_basename accessible and more
 usable

---
 tools/qfcc/include/qfcc.h |  1 +
 tools/qfcc/source/qfcc.c  | 13 +++++++------
 tools/qfcc/source/stub.c  |  2 ++
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/tools/qfcc/include/qfcc.h b/tools/qfcc/include/qfcc.h
index e428831cb..dc8dddac2 100644
--- a/tools/qfcc/include/qfcc.h
+++ b/tools/qfcc/include/qfcc.h
@@ -109,6 +109,7 @@ extern	pr_info_t	pr;
 #define POINTER_OFS(s,p)	((pr_type_t *) (p) - (s)->data)
 
 const char *strip_path (const char *filename) __attribute__((pure));
+const char *file_basename (const char *filename, int keepdot) __attribute__((pure));
 
 extern FILE *qc_yyin;
 extern FILE *qp_yyin;
diff --git a/tools/qfcc/source/qfcc.c b/tools/qfcc/source/qfcc.c
index 7d0f8c800..15f3d31d7 100644
--- a/tools/qfcc/source/qfcc.c
+++ b/tools/qfcc/source/qfcc.c
@@ -313,8 +313,8 @@ strip_path (const char *filename)
 	return filename;
 }
 
-static const char *
-file_basename (const char *filename)
+const char *
+file_basename (const char *filename, int keepdot)
 {
 	const char *p;
 	const char *dot;
@@ -325,7 +325,7 @@ file_basename (const char *filename)
 	for (dot = p = filename + strlen (filename); p > filename; p--) {
 		if (p[-1] == '/' || p[-1] == '\\')
 			break;
-		if (p[0] == '.')
+		if (!keepdot && p[0] == '.')
 			dot = p;
 	}
 	dstring_copysubstr (base, p, dot - p);
@@ -395,7 +395,7 @@ compile_to_obj (const char *file, const char *obj, lang_t lang)
 		}
 	}
 	if (options.frames_files) {
-		write_frame_macros (va ("%s.frame", file_basename (file)));
+		write_frame_macros (va ("%s.frame", file_basename (file, 0)));
 	}
 	if (!err) {
 		qfo_t      *qfo;
@@ -753,13 +753,14 @@ progs_src_compile (void)
 				fprintf (single, "#include \"%s\"\n", qc_filename->str);
 				if (options.frames_files)
 					fprintf (single, "$frame_write \"%s.frame\"\n",
-							 file_basename (qc_filename->str));
+							 file_basename (qc_filename->str, 0));
 			} else {
 				if (compile_file (qc_filename->str))
 					return 1;
 				if (options.frames_files) {
 					write_frame_macros (va ("%s.frame",
-											file_basename (qc_filename->str)));
+											file_basename (qc_filename->str,
+														   0)));
 				}
 			}
 			if (!Script_TokenAvailable (script, 0))
diff --git a/tools/qfcc/source/stub.c b/tools/qfcc/source/stub.c
index f3601d04b..7180f9e88 100644
--- a/tools/qfcc/source/stub.c
+++ b/tools/qfcc/source/stub.c
@@ -53,3 +53,5 @@ int compare_protocols (protocollist_t *protos1, protocollist_t *protos2){return
 void dump_dot (const char *stage, void *data,
 		          void (*dump_func) (void *data, const char *fname)){}
 void dump_dot_type (void *_t, const char *filename){}
+const char *strip_path(const char *p) { return p;}
+const char *file_basename(const char *p, int keepdot) { return p;}

From b6ea47dca690e345e75ca4917db35df471237220 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 28 Mar 2020 18:58:08 +0900
Subject: [PATCH 1038/1519] [qfcc] Add failing function overload test

This is a bit of a weird one because it's a combination of the aliasing
code and mixing C prototypes with QuakeC function definitions, and the
function type rebuilding in qc-parse.y not being very "consistent" in
its abuse of the type system.
---
 tools/qfcc/test/Makefile.am    | 12 +++++++++++-
 tools/qfcc/test/old/overload.r | 30 ------------------------------
 tools/qfcc/test/overload.r     | 23 +++++++++++++++++++++++
 3 files changed, 34 insertions(+), 31 deletions(-)
 delete mode 100644 tools/qfcc/test/old/overload.r
 create mode 100644 tools/qfcc/test/overload.r

diff --git a/tools/qfcc/test/Makefile.am b/tools/qfcc/test/Makefile.am
index fe78065d7..73528545d 100644
--- a/tools/qfcc/test/Makefile.am
+++ b/tools/qfcc/test/Makefile.am
@@ -54,6 +54,7 @@ test_progs_dat=\
 	methodparams.dat \
 	modulo.dat \
 	nilparamret.dat \
+	overload.dat \
 	paramret.dat \
 	quaternion.dat \
 	return-ivar.dat \
@@ -333,6 +334,15 @@ nilparamret.run: Makefile build-run
 include ./$(DEPDIR)/nilparamret.Qo # am--include-marker
 r_depfiles_remade += ./$(DEPDIR)/nilparamret.Qo
 
+overload_dat_SOURCES=overload.r
+overload_obj=$(overload_dat_SOURCES:.r=.qfo)
+overload.dat$(EXEEXT): $(overload_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(overload_obj)
+overload.run: Makefile build-run
+	@$(srcdir)/build-run $@
+include ./$(DEPDIR)/overload.Qo # am--include-marker
+r_depfiles_remade += ./$(DEPDIR)/overload.Qo
+
 paramret_dat_SOURCES=paramret.r
 paramret_obj=$(paramret_dat_SOURCES:.r=.qfo)
 paramret.dat$(EXEEXT): $(paramret_obj) $(QFCC_DEP)
@@ -512,4 +522,4 @@ $(r_depfiles_remade):
 am--depfiles: $(am__depfiles_remade) $(r_depfiles_remade)
 
 EXTRA_DIST= test-bi.h build-run test-defspace.h
-CLEANFILES= *.dat *.sym *.qfo *.run *.frame
+CLEANFILES= *.dat *.sym *.qfo *.run *.frame *.log *.trs
diff --git a/tools/qfcc/test/old/overload.r b/tools/qfcc/test/old/overload.r
deleted file mode 100644
index 60bd5cf46..000000000
--- a/tools/qfcc/test/old/overload.r
+++ /dev/null
@@ -1,30 +0,0 @@
-//integer foo;
-//typedef integer foo;
-//integer (void) foo = #0;
-//integer (bag);
-//.integer (sack);
-//.integer (float sack)x;
-//integer *bar, baz;
-//integer snafu(void)
-//{
-//}
-//integer [8]blah;
-
-@overload void func (integer a, integer b, integer c);
-@overload void func (integer a, integer b);
-@overload void func (integer a, ...);
-//@overload void func (integer a, integer b, ...);
-@overload void func (string y);
-//@overload void func (...);
-void func (integer x)
-{
-//	func ("");
-}
-void func (string y)
-{
-//	func (0.0);
-//	func (0, 0.0);
-//	func (0, 0, 0.0);
-	func (0.0, "");
-//	func (0, 0, 0, 0, 0.0);
-}
diff --git a/tools/qfcc/test/overload.r b/tools/qfcc/test/overload.r
new file mode 100644
index 000000000..97c77bbdf
--- /dev/null
+++ b/tools/qfcc/test/overload.r
@@ -0,0 +1,23 @@
+typedef enum {
+	NO = 0,
+	YES
+} BOOL;
+
+@extern BOOL sel_is_mapped (SEL aSel);
+BOOL (SEL aSel) sel_is_mapped = #0;
+
+@overload int foo(int x)
+{
+	return 1;
+}
+
+@overload int foo(float x)
+{
+	return 2;
+}
+
+int main()
+{
+	//FIXME fails on implicit cast of double to float
+	return !(foo(5) == 1 && foo (5.0f) == 2);
+}

From f224eadbb8eefaa22dee6a4cebcf4230e9d0b454 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 28 Mar 2020 19:01:49 +0900
Subject: [PATCH 1039/1519] [qfcc] Rework QuakeC function type manging

It is now "consistent" with the rest of the type building in that it
uses find_type(append_type(return, params)) like the C version, thus
allowing append_type to do its thing with type aliases. This fixes the
overload test.
---
 tools/qfcc/source/qc-parse.y | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/tools/qfcc/source/qc-parse.y b/tools/qfcc/source/qc-parse.y
index 3529c1a1f..f759a4964 100644
--- a/tools/qfcc/source/qc-parse.y
+++ b/tools/qfcc/source/qc-parse.y
@@ -366,14 +366,17 @@ external_def
 	| optional_specifiers qc_func_params
 		{
 			type_t    **type;
+			type_t     *ret_type;
 			$<spec>$ = $1;		// copy spec bits and storage
 			// .float () foo; is a field holding a function variable rather
 			// than a function that returns a float field.
-			for (type = &$<spec>$.type; *type && (*type)->type == ev_field;
-				 type = &(*type)->t.fldptr.type)
-				 ;
-			*type = parse_params (*type, $2);
-			$<spec>$.type = find_type ($<spec>$.type);
+			for (type = &$1.type; *type && (*type)->type == ev_field;
+				 type = &(*type)->t.fldptr.type) {
+			}
+			ret_type = *type;
+			*type = 0;
+			*type = parse_params (0, $2);
+			$<spec>$.type = find_type (append_type ($1.type, ret_type));
 			if ($<spec>$.type->type != ev_field)
 				$<spec>$.params = $2;
 		}

From 262c6a61f5e116cf90b48e6065bc42f059c32e07 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 28 Mar 2020 21:11:42 +0900
Subject: [PATCH 1040/1519] [qfcc] Add failing test for linker zero/param issue

This tests issue #6
---
 tools/qfcc/test/Makefile.am  | 13 ++++++++++-
 tools/qfcc/test/zerolinker.r | 45 ++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 tools/qfcc/test/zerolinker.r

diff --git a/tools/qfcc/test/Makefile.am b/tools/qfcc/test/Makefile.am
index 73528545d..d43706b9b 100644
--- a/tools/qfcc/test/Makefile.am
+++ b/tools/qfcc/test/Makefile.am
@@ -73,7 +73,9 @@ test_progs_dat=\
 	vecexpr.dat \
 	vecinit.dat \
 	voidfor.dat \
-	while.dat
+	while.dat \
+	zerolinker.dat \
+	$e
 
 fail_progs_dat=
 
@@ -514,6 +516,15 @@ while.run: Makefile build-run
 include ./$(DEPDIR)/while.Qo # am--include-marker
 r_depfiles_remade += ./$(DEPDIR)/while.Qo
 
+zerolinker_dat_SOURCES=zerolinker.r
+zerolinker_obj=$(zerolinker_dat_SOURCES:.r=.qfo)
+zerolinker.dat$(EXEEXT): $(zerolinker_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(zerolinker_obj)
+zerolinker.run: Makefile build-run
+	@$(srcdir)/build-run $@
+include ./$(DEPDIR)/zerolinker.Qo # am--include-marker
+r_depfiles_remade += ./$(DEPDIR)/zerolinker.Qo
+
 $(r_depfiles_remade):
 	@$(MKDIR_P) $(@D)
 	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
diff --git a/tools/qfcc/test/zerolinker.r b/tools/qfcc/test/zerolinker.r
new file mode 100644
index 000000000..2babf2b1c
--- /dev/null
+++ b/tools/qfcc/test/zerolinker.r
@@ -0,0 +1,45 @@
+#include <types.h>
+
+// can't link against libr.a (may not be built)
+void *PR_FindGlobal (string name) = #0;
+void printf (string fmt, ...) = #0;
+
+qfot_type_encodings_t *encodings;
+
+qfot_type_t *
+next_type (qfot_type_t *type)
+{
+	int         size = type.size;
+	if (!size)
+		size = 4;
+	return (qfot_type_t *) ((int *) type + size);
+}
+
+int
+main (void)
+{
+	int         found_param = 0;
+	int         found_zero = 0;
+	qfot_type_t *type;
+
+	encodings = PR_FindGlobal (".type_encodings");
+
+	for (type = encodings.types;
+		 ((int *)type - (int *) encodings.types) < encodings.size;
+		type = next_type (type)) {
+		if (type.meta == ty_struct) {
+			if (type.t.strct.tag == "tag @param") {
+				found_param = 1;
+			}
+			if (type.t.strct.tag == "tag @zero") {
+				found_zero = 1;
+			}
+		}
+	}
+	if (!(found_param && found_zero)) {
+		printf ("missing struct: param: %d zero:%d\n",
+				found_param, found_zero);
+		return 1;
+	}
+	return 0;
+}

From 7218af6be45827a63f9076cf3fe287bb14e86dc1 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 28 Mar 2020 21:19:20 +0900
Subject: [PATCH 1041/1519] [qfcc] Print qfo def type address

---
 tools/qfcc/source/dump_globals.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/qfcc/source/dump_globals.c b/tools/qfcc/source/dump_globals.c
index 1695769e0..ab15b0c4d 100644
--- a/tools/qfcc/source/dump_globals.c
+++ b/tools/qfcc/source/dump_globals.c
@@ -320,9 +320,10 @@ qfo_globals (qfo_t *qfo)
 	for (space = 0; space < qfo->num_spaces; space++) {
 		for (i = 0; i < qfo->spaces[space].num_defs; i++, count++) {
 			def = &qfo->spaces[space].defs[i];
-			printf ("%-5d %2d:%-5x %s %s %s", count, space, def->offset,
+			printf ("%-5d %2d:%-5x %s %s %x %s", count, space, def->offset,
 					flags_string (def->flags),
 					QFO_GETSTR (qfo, def->name),
+					def->type,
 					QFO_TYPESTR (qfo, def->type));
 			if (!(def->flags & QFOD_EXTERNAL) && qfo->spaces[space].d.data)
 				printf (" %d",

From 869efa723999b70ace2f25e5042b81e806f44906 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 28 Mar 2020 21:19:55 +0900
Subject: [PATCH 1042/1519] [gamecode] Use etype_t in more places

But forget about bitfields. If enum isn't int and int isn't 32-bits,
we've probably got other problems (and there may be a better way).
---
 include/QF/pr_type.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/QF/pr_type.h b/include/QF/pr_type.h
index c74ad3c26..d8c706fae 100644
--- a/include/QF/pr_type.h
+++ b/include/QF/pr_type.h
@@ -51,19 +51,19 @@ typedef enum {
 } ty_meta_e;
 
 typedef struct qfot_alias_s {
-	pr_int_t    type;				///< type at end of alias chain
+	etype_t     type;				///< type at end of alias chain
 	pointer_t   aux_type;			///< referenced type: stripped of aliases
 	pointer_t   full_type;			///< includes full alias info
 	string_t    name;				///< alias name, may be null
 } qfot_alias_t;
 
 typedef struct qfot_fldptr_s {
-	pr_int_t    type;				///< ev_field or ev_pointer
+	etype_t     type;				///< ev_field or ev_pointer
 	pointer_t   aux_type;			///< referenced type
 } qfot_fldptr_t;
 
 typedef struct qfot_func_s {
-	pr_int_t    type;				///< always ev_func
+	etype_t     type;				///< always ev_func
 	pointer_t   return_type;		///< return type of the function
 	pr_int_t    num_params;			///< ones compliment count of the
 									///< parameters. -ve values indicate the
@@ -101,11 +101,11 @@ typedef struct qfot_array_s {
 	arrays.
 */
 typedef struct qfot_type_s {
-	ty_meta_e   meta:32;			///< meta type
+	ty_meta_e   meta;				///< meta type
 	pr_uint_t   size;				///< total word size of this encoding
 	string_t    encoding;			///< Objective-QC encoding
 	union {
-		etype_t     type:32;		///< ty_basic: etype_t
+		etype_t     type;			///< ty_basic: etype_t
 		qfot_fldptr_t fldptr;		///< ty_basic, ev_pointer/ev_field
 		qfot_func_t func;			///< ty_basic, ev_func
 		qfot_struct_t strct;		///< ty_struct/ty_union/ty_enum

From 1cd7bd2bf09d1c0419d339b5289a5204f3ee208e Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 28 Mar 2020 21:31:04 +0900
Subject: [PATCH 1043/1519] [qfcc] Use correct meta for zerolinker test

Still fails, of course :)
---
 tools/qfcc/test/zerolinker.r | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/qfcc/test/zerolinker.r b/tools/qfcc/test/zerolinker.r
index 2babf2b1c..a5c6f7039 100644
--- a/tools/qfcc/test/zerolinker.r
+++ b/tools/qfcc/test/zerolinker.r
@@ -27,7 +27,7 @@ main (void)
 	for (type = encodings.types;
 		 ((int *)type - (int *) encodings.types) < encodings.size;
 		type = next_type (type)) {
-		if (type.meta == ty_struct) {
+		if (type.meta == ty_union) {
 			if (type.t.strct.tag == "tag @param") {
 				found_param = 1;
 			}

From ac9f3404ef9658dcd0682cacd56fd39b566d2560 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 28 Mar 2020 21:46:46 +0900
Subject: [PATCH 1044/1519] [qfcc] Improve string quoting when dumping strings

Not knowing if a blank line is an empty string or spaces...
---
 tools/qfcc/source/dump_strings.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/tools/qfcc/source/dump_strings.c b/tools/qfcc/source/dump_strings.c
index 77f3c0ae4..5f119e7cc 100644
--- a/tools/qfcc/source/dump_strings.c
+++ b/tools/qfcc/source/dump_strings.c
@@ -44,14 +44,14 @@ dump_string_block (const char *strblock, unsigned size)
 {
 	const char *s = strblock;
 
-	printf ("%x ", 0);
+	printf ("%x \"", 0);
 	while (s - strblock < size) {
 		char        c = *s++;
 		switch (c) {
 			case 0:
-				fputs ("\n", stdout);
+				fputs ("\"\n", stdout);
 				if (s - strblock < size)
-					printf ("%lx ", s - strblock);
+					printf ("%lx \"", s - strblock);
 				break;
 			case 9:
 				fputs ("\\t", stdout);
@@ -62,6 +62,12 @@ dump_string_block (const char *strblock, unsigned size)
 			case 13:
 				fputs ("\\r", stdout);
 				break;
+			case '\"':
+				fputs ("\\\"", stdout);
+				break;
+			case '\\':
+				fputs ("\\\\", stdout);
+				break;
 			default:
 				fputc (sys_char_map[(unsigned char)c], stdout);
 				break;

From 54a9305dbfbf4d04b860f02920abdb17eec8fec0 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 28 Mar 2020 22:02:42 +0900
Subject: [PATCH 1045/1519] [qfcc] Use right object for sizeof

Since the bitfield has been abandoned, can use sizeof on the field
again.
---
 tools/qfcc/source/obj_type.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tools/qfcc/source/obj_type.c b/tools/qfcc/source/obj_type.c
index 8850ebac6..b823f0355 100644
--- a/tools/qfcc/source/obj_type.c
+++ b/tools/qfcc/source/obj_type.c
@@ -151,8 +151,7 @@ qfo_encode_basic (type_t *type)
 	else if (type->type == ev_pointer || type->type == ev_field)
 		return qfo_encode_fldptr (type);
 
-	// can't use sizeof on enc->t.type, but pr_uint_t is the backing type
-	def = qfo_new_encoding (type, sizeof (pr_uint_t));
+	def = qfo_new_encoding (type, sizeof (enc->t.type));
 	enc = D_POINTER (qfot_type_t, def);
 	enc->t.type = type->type;
 	return def;

From 31ea3814bb633bb3720a8591baadaea0bae8b914 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 28 Mar 2020 22:15:06 +0900
Subject: [PATCH 1046/1519] [qfcc] Decouple type encoding from the pr struct

This will allow encoding types correctly in the linker.
---
 tools/qfcc/include/obj_type.h |  3 +-
 tools/qfcc/source/obj_type.c  | 57 ++++++++++++++++++-----------------
 tools/qfcc/source/struct.c    |  2 +-
 tools/qfcc/source/stub.c      |  2 +-
 tools/qfcc/source/type.c      |  2 +-
 5 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/tools/qfcc/include/obj_type.h b/tools/qfcc/include/obj_type.h
index 13ce701e4..a8c546703 100644
--- a/tools/qfcc/include/obj_type.h
+++ b/tools/qfcc/include/obj_type.h
@@ -35,7 +35,8 @@
 
 #include "type.h"
 
+struct defspace_s;
 struct type_s;
-struct def_s *qfo_encode_type (struct type_s *type);
+struct def_s *qfo_encode_type (struct type_s *type, struct defspace_s *space);
 
 #endif//__obj_type_h
diff --git a/tools/qfcc/source/obj_type.c b/tools/qfcc/source/obj_type.c
index b823f0355..78d7fc868 100644
--- a/tools/qfcc/source/obj_type.c
+++ b/tools/qfcc/source/obj_type.c
@@ -63,7 +63,7 @@
 		reloc_def_string (&loc);							\
 	} while (0)
 
-typedef def_t *(*encode_f) (type_t *type);
+typedef def_t *(*encode_f) (type_t *type, defspace_t *space);
 
 static string_t
 encoding_string (const char *string)
@@ -75,7 +75,7 @@ encoding_string (const char *string)
 }
 
 static def_t *
-qfo_new_encoding (type_t *type, int size)
+qfo_new_encoding (type_t *type, int size, defspace_t *space)
 {
 	qfot_type_t *enc;
 	def_t      *def;
@@ -83,7 +83,7 @@ qfo_new_encoding (type_t *type, int size)
 	size += sizeof (qfot_type_t) - sizeof (enc->t);
 	size /= sizeof (pr_type_t);
 
-	def = new_def (type->encoding, 0, pr.type_data, sc_static);
+	def = new_def (type->encoding, 0, space, sc_static);
 	def->offset = defspace_alloc_loc (pr.type_data, size);
 
 	enc = D_POINTER (qfot_type_t, def);
@@ -94,7 +94,7 @@ qfo_new_encoding (type_t *type, int size)
 }
 
 static def_t *
-qfo_encode_func (type_t *type)
+qfo_encode_func (type_t *type, defspace_t *space)
 {
 	int         param_count;
 	int         size;
@@ -109,12 +109,13 @@ qfo_encode_func (type_t *type)
 	if (param_count < 0)
 		param_count = ~param_count;
 	param_type_defs = alloca (param_count * sizeof (def_t *));
-	return_type_def = qfo_encode_type (type->t.func.type);
+	return_type_def = qfo_encode_type (type->t.func.type, space);
 	for (i = 0; i < param_count; i++)
-		param_type_defs[i] = qfo_encode_type (type->t.func.param_types[i]);
+		param_type_defs[i] = qfo_encode_type (type->t.func.param_types[i],
+											  space);
 	size = field_offset (qfot_func_t, param_types[param_count]);
 
-	def = qfo_new_encoding (type, size);
+	def = qfo_new_encoding (type, size, space);
 	enc = D_POINTER (qfot_type_t, def);
 	func = &enc->t.func;
 	func->type = ev_func;
@@ -126,14 +127,14 @@ qfo_encode_func (type_t *type)
 }
 
 static def_t *
-qfo_encode_fldptr (type_t *type)
+qfo_encode_fldptr (type_t *type, defspace_t *space)
 {
 	qfot_type_t *enc;
 	def_t      *def;
 	def_t      *type_def;
 
-	type_def = qfo_encode_type (type->t.fldptr.type);
-	def = qfo_new_encoding (type, sizeof (enc->t.fldptr));
+	type_def = qfo_encode_type (type->t.fldptr.type, space);
+	def = qfo_new_encoding (type, sizeof (enc->t.fldptr), space);
 	enc = D_POINTER (qfot_type_t, def);
 	enc->t.fldptr.type = type->type;
 	ENC_DEF (enc->t.fldptr.aux_type, type_def);
@@ -141,24 +142,24 @@ qfo_encode_fldptr (type_t *type)
 }
 
 static def_t *
-qfo_encode_basic (type_t *type)
+qfo_encode_basic (type_t *type, defspace_t *space)
 {
 	qfot_type_t *enc;
 	def_t      *def;
 
 	if (type->type == ev_func)
-		return qfo_encode_func (type);
+		return qfo_encode_func (type, space);
 	else if (type->type == ev_pointer || type->type == ev_field)
-		return qfo_encode_fldptr (type);
+		return qfo_encode_fldptr (type, space);
 
-	def = qfo_new_encoding (type, sizeof (enc->t.type));
+	def = qfo_new_encoding (type, sizeof (enc->t.type), space);
 	enc = D_POINTER (qfot_type_t, def);
 	enc->t.type = type->type;
 	return def;
 }
 
 static def_t *
-qfo_encode_struct (type_t *type)
+qfo_encode_struct (type_t *type, defspace_t *space)
 {
 	sy_type_e   sy;
 	int         num_fields;
@@ -185,7 +186,7 @@ qfo_encode_struct (type_t *type)
 	}
 
 	size = field_offset (qfot_struct_t, fields[num_fields]);
-	def = qfo_new_encoding (type, size);
+	def = qfo_new_encoding (type, size, space);
 	enc = D_POINTER (qfot_type_t, def);
 	strct = &enc->t.strct;
 	ENC_STR (strct->tag, type->name);
@@ -200,7 +201,7 @@ qfo_encode_struct (type_t *type)
 		if (i == num_fields)
 			internal_error (0, "whoa, what happened?");
 		if (type->meta != ty_enum) {
-			field_types[i] = qfo_encode_type (sym->type);
+			field_types[i] = qfo_encode_type (sym->type, space);
 		} else {
 			field_types[i] = type_default->type_def;
 		}
@@ -225,15 +226,15 @@ qfo_encode_struct (type_t *type)
 }
 
 static def_t *
-qfo_encode_array (type_t *type)
+qfo_encode_array (type_t *type, defspace_t *space)
 {
 	qfot_type_t *enc;
 	def_t      *def;
 	def_t      *array_type_def;
 
-	array_type_def = qfo_encode_type (type->t.array.type);
+	array_type_def = qfo_encode_type (type->t.array.type, space);
 
-	def = qfo_new_encoding (type, sizeof (enc->t.array));
+	def = qfo_new_encoding (type, sizeof (enc->t.array), space);
 	enc = D_POINTER (qfot_type_t, def);
 	ENC_DEF (enc->t.array.type, array_type_def);
 	enc->t.array.base = type->t.array.base;
@@ -242,29 +243,29 @@ qfo_encode_array (type_t *type)
 }
 
 static def_t *
-qfo_encode_class (type_t *type)
+qfo_encode_class (type_t *type, defspace_t *space)
 {
 	qfot_type_t *enc;
 	def_t      *def;
 
-	def = qfo_new_encoding (type, sizeof (enc->t.class));
+	def = qfo_new_encoding (type, sizeof (enc->t.class), space);
 	enc = D_POINTER (qfot_type_t, def);
 	ENC_STR (enc->t.class, type->t.class->name);
 	return def;
 }
 
 static def_t *
-qfo_encode_alias (type_t *type)
+qfo_encode_alias (type_t *type, defspace_t *space)
 {
 	qfot_type_t *enc;
 	def_t      *def;
 	def_t      *type_def;
 	def_t      *full_def;
 
-	type_def = qfo_encode_type (type->t.alias.aux_type);
-	full_def = qfo_encode_type (type->t.alias.full_type);
+	type_def = qfo_encode_type (type->t.alias.aux_type, space);
+	full_def = qfo_encode_type (type->t.alias.full_type, space);
 
-	def = qfo_new_encoding (type, sizeof (enc->t.alias));
+	def = qfo_new_encoding (type, sizeof (enc->t.alias), space);
 	enc = D_POINTER (qfot_type_t, def);
 	enc->t.alias.type = type->type;
 	ENC_DEF (enc->t.alias.aux_type, type_def);
@@ -276,7 +277,7 @@ qfo_encode_alias (type_t *type)
 }
 
 def_t *
-qfo_encode_type (type_t *type)
+qfo_encode_type (type_t *type, defspace_t *space)
 {
 	reloc_t    *relocs = 0;
 
@@ -301,7 +302,7 @@ qfo_encode_type (type_t *type)
 		internal_error (0, "bad type meta type");
 	if (!type->encoding)
 		type->encoding = type_get_encoding (type);
-	type->type_def = funcs[type->meta] (type);
+	type->type_def = funcs[type->meta] (type, space);
 	reloc_attach_relocs (relocs, &type->type_def->relocs);
 	return type->type_def;
 }
diff --git a/tools/qfcc/source/struct.c b/tools/qfcc/source/struct.c
index 2e828de1b..59ac6fe7a 100644
--- a/tools/qfcc/source/struct.c
+++ b/tools/qfcc/source/struct.c
@@ -173,7 +173,7 @@ build_struct (int su, symbol_t *tag, symtab_t *symtab, type_t *type)
 	sym->type->t.symtab = symtab;
 	sym->type->alignment = alignment;
 	if (!type && sym->type->type_def->external)	//FIXME should not be necessary
-		sym->type->type_def = qfo_encode_type (sym->type);
+		sym->type->type_def = qfo_encode_type (sym->type, pr.type_data);
 	return sym;
 }
 
diff --git a/tools/qfcc/source/stub.c b/tools/qfcc/source/stub.c
index 7180f9e88..b7d73cd68 100644
--- a/tools/qfcc/source/stub.c
+++ b/tools/qfcc/source/stub.c
@@ -43,7 +43,7 @@ __attribute__((const)) expr_t *_error (expr_t *e, const char *file, int line, co
 __attribute__((const)) symbol_t *make_structure (const char *name, int su, struct_def_t *defs, type_t *type) {return 0;}
 __attribute__((const)) symbol_t *symtab_addsymbol (symtab_t *symtab, symbol_t *symbol) {return 0;}
 __attribute__((const)) symbol_t *new_symbol_type (const char *name, type_t *type) {return 0;}
-__attribute__((const)) def_t *qfo_encode_type (type_t *type) {return 0;}
+__attribute__((const)) def_t *qfo_encode_type (type_t *type, defspace_t *space) {return 0;}
 __attribute__((const)) int obj_types_assignable (const type_t *dst, const type_t *src) {return 0;}
 void print_protocollist (struct dstring_s *dstr, protocollist_t *protocollist) {}
 int is_id (const type_t *type){return type->type;}
diff --git a/tools/qfcc/source/type.c b/tools/qfcc/source/type.c
index e6d3e4b9f..8bb0b5673 100644
--- a/tools/qfcc/source/type.c
+++ b/tools/qfcc/source/type.c
@@ -156,7 +156,7 @@ chain_type (type_t *type)
 	if (!type->encoding)
 		type->encoding = type_get_encoding (type);
 	if (!type->type_def)
-		type->type_def = qfo_encode_type (type);
+		type->type_def = qfo_encode_type (type, pr.type_data);
 }
 
 type_t *

From c13162e41e90904f5dd3cf3a6a96450424e765bd Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 28 Mar 2020 22:53:35 +0900
Subject: [PATCH 1047/1519] [qfcc] Rearrange type initialization

Fixes #6
It turned out that the problem with @zero was caused by initial type
chaining occurring before the structures had been initialized and thus
the linker's @zero type encoding string was incorrect: {?=} instead of
{tag @zero-}, thus when the actual type encoding supplied by an object
file came along (with the correct encoding string), it wasn't found.
---
 tools/qfcc/source/qfcc.c |  5 ++-
 tools/qfcc/source/type.c | 93 ++++++++++++++++++++++------------------
 2 files changed, 56 insertions(+), 42 deletions(-)

diff --git a/tools/qfcc/source/qfcc.c b/tools/qfcc/source/qfcc.c
index 15f3d31d7..1167611ad 100644
--- a/tools/qfcc/source/qfcc.c
+++ b/tools/qfcc/source/qfcc.c
@@ -181,7 +181,6 @@ InitData (void)
 	clear_classes ();
 	clear_immediates ();
 	clear_selectors ();
-	chain_initial_types ();
 }
 
 static int
@@ -384,6 +383,7 @@ compile_to_obj (const char *file, const char *obj, lang_t lang)
 		return !options.preprocess_only;
 
 	InitData ();
+	chain_initial_types ();
 	begin_compilation ();
 	pr.source_file = ReuseString (strip_path (file));
 	err = yyparse () || pr.error_count;
@@ -549,6 +549,7 @@ separate_compile (void)
 	dstring_delete (extension);
 	if (!err && !options.compile) {
 		InitData ();
+		chain_initial_types ();
 		linker_begin ();
 		for (file = source_files; *file; file++) {
 			if (strncmp (*file, "-l", 2)) {
@@ -726,6 +727,7 @@ progs_src_compile (void)
 	setup_sym_file (options.output_file);
 
 	InitData ();
+	chain_initial_types ();
 
 	begin_compilation ();
 
@@ -830,6 +832,7 @@ main (int argc, char **argv)
 	parse_cpp_name ();
 
 	opcode_init ();
+
 	InitData ();
 	init_types ();
 	clear_immediates ();
diff --git a/tools/qfcc/source/type.c b/tools/qfcc/source/type.c
index 8bb0b5673..08a02855b 100644
--- a/tools/qfcc/source/type.c
+++ b/tools/qfcc/source/type.c
@@ -1075,6 +1075,47 @@ type_size (const type_t *type)
 	return 0;
 }
 
+static void
+chain_basic_types (void)
+{
+	chain_type (&type_void);
+	chain_type (&type_string);
+	chain_type (&type_float);
+	chain_type (&type_vector);
+	type_entity.t.symtab = pr.entity_fields;
+	chain_type (&type_entity);
+	chain_type (&type_field);
+	chain_type (&type_function);
+	chain_type (&type_pointer);
+	chain_type (&type_floatfield);
+	if (!options.traditional) {
+		chain_type (&type_quaternion);
+		chain_type (&type_integer);
+		chain_type (&type_uinteger);
+		chain_type (&type_short);
+		chain_type (&type_double);
+	}
+}
+
+static void
+chain_structural_types (void)
+{
+	chain_type (&type_param);
+	chain_type (&type_zero);
+	chain_type (&type_type_encodings);
+	chain_type (&type_xdef);
+	chain_type (&type_xdef_pointer);
+	chain_type (&type_xdefs);
+	chain_type (&type_va_list);
+}
+
+void
+chain_initial_types (void)
+{
+	chain_basic_types ();
+	chain_structural_types ();
+}
+
 void
 init_types (void)
 {
@@ -1136,6 +1177,13 @@ init_types (void)
 		{"num_xdefs", &type_pointer},
 		{0, 0}
 	};
+	static struct_def_t va_list_struct[] = {
+		{"count", &type_integer},
+		{"list",  0},				// type will be filled in at runtime
+		{0, 0}
+	};
+
+	chain_basic_types ();
 
 	type_nil = &type_quaternion;
 	type_default = &type_integer;
@@ -1160,8 +1208,8 @@ init_types (void)
 	make_structure ("@xdef", 's', xdef_struct, &type_xdef);
 	make_structure ("@xdefs", 's', xdefs_struct, &type_xdefs);
 
-	if (options.traditional)
-		return;
+	va_list_struct[1].type = pointer_type (&type_param);
+	make_structure ("@va_list", 's', va_list_struct, &type_va_list);
 
 	make_structure ("@quaternion", 's', quaternion_struct, &type_quaternion);
 	type_quaternion.type = ev_quat;
@@ -1181,43 +1229,6 @@ init_types (void)
 		sym->s.offset = 3;
 		symtab_addsymbol (type_quaternion.t.symtab, sym);
 	}
-}
-
-void
-chain_initial_types (void)
-{
-	static struct_def_t va_list_struct[] = {
-		{"count", &type_integer},
-		{"list",  0},				// type will be filled in at runtime
-		{0, 0}
-	};
-
-	chain_type (&type_void);
-	chain_type (&type_string);
-	chain_type (&type_float);
-	chain_type (&type_vector);
-	type_entity.t.symtab = pr.entity_fields;
-	chain_type (&type_entity);
-	chain_type (&type_field);
-	chain_type (&type_function);
-	chain_type (&type_pointer);
-	chain_type (&type_floatfield);
-	if (!options.traditional) {
-		chain_type (&type_quaternion);
-		chain_type (&type_integer);
-		chain_type (&type_uinteger);
-		chain_type (&type_short);
-		chain_type (&type_double);
-	}
-
-	chain_type (&type_param);
-	chain_type (&type_zero);
-	chain_type (&type_type_encodings);
-	chain_type (&type_xdef);
-	chain_type (&type_xdef_pointer);
-	chain_type (&type_xdefs);
-
-	va_list_struct[1].type = pointer_type (&type_param);
-	make_structure ("@va_list", 's', va_list_struct, &type_va_list);
-	chain_type (&type_va_list);
+
+	chain_structural_types ();
 }

From 8ba3ab89d5316872c0bb4f7b88e7afaf2d9807e7 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 28 Mar 2020 23:30:05 +0900
Subject: [PATCH 1048/1519] [qfcc] Add failing aliased type linking test

---
 tools/qfcc/test/Makefile.am    | 10 ++++++++++
 tools/qfcc/test/typelinker.h   |  3 +++
 tools/qfcc/test/typelinker_a.r |  7 +++++++
 tools/qfcc/test/typelinker_b.r |  3 +++
 4 files changed, 23 insertions(+)
 create mode 100644 tools/qfcc/test/typelinker.h
 create mode 100644 tools/qfcc/test/typelinker_a.r
 create mode 100644 tools/qfcc/test/typelinker_b.r

diff --git a/tools/qfcc/test/Makefile.am b/tools/qfcc/test/Makefile.am
index d43706b9b..fe61451b9 100644
--- a/tools/qfcc/test/Makefile.am
+++ b/tools/qfcc/test/Makefile.am
@@ -69,6 +69,7 @@ test_progs_dat=\
 	swap.dat \
 	triangle.dat \
 	typedef.dat \
+	typelinker.dat \
 	vecaddr.dat \
 	vecexpr.dat \
 	vecinit.dat \
@@ -471,6 +472,15 @@ typedef.run: Makefile build-run
 include ./$(DEPDIR)/typedef.Qo # am--include-marker
 r_depfiles_remade += ./$(DEPDIR)/typedef.Qo
 
+typelinker_dat_SOURCES=typelinker_a.r typelinker_b.r
+typelinker_obj=$(typelinker_dat_SOURCES:.r=.qfo)
+typelinker.dat$(EXEEXT): $(typelinker_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(typelinker_obj)
+typelinker.run: Makefile build-run
+	@$(srcdir)/build-run $@
+include ./$(DEPDIR)/typelinker.Qo # am--include-marker
+r_depfiles_remade += ./$(DEPDIR)/typelinker.Qo
+
 vecaddr_dat_SOURCES=vecaddr.r
 vecaddr_obj=$(vecaddr_dat_SOURCES:.r=.qfo)
 vecaddr.dat$(EXEEXT): $(vecaddr_obj) $(QFCC_DEP)
diff --git a/tools/qfcc/test/typelinker.h b/tools/qfcc/test/typelinker.h
new file mode 100644
index 000000000..1968a52cc
--- /dev/null
+++ b/tools/qfcc/test/typelinker.h
@@ -0,0 +1,3 @@
+typedef struct plitem_s *plitem_t;
+
+@extern plitem_t PL_GetPropertyList (string str);
diff --git a/tools/qfcc/test/typelinker_a.r b/tools/qfcc/test/typelinker_a.r
new file mode 100644
index 000000000..57c98ca76
--- /dev/null
+++ b/tools/qfcc/test/typelinker_a.r
@@ -0,0 +1,7 @@
+#include "typelinker.h"
+
+int main ()
+{
+	PL_GetPropertyList ("{}");
+	return 0;
+}
diff --git a/tools/qfcc/test/typelinker_b.r b/tools/qfcc/test/typelinker_b.r
new file mode 100644
index 000000000..54336eae3
--- /dev/null
+++ b/tools/qfcc/test/typelinker_b.r
@@ -0,0 +1,3 @@
+#include "typelinker.h"
+
+plitem_t PL_GetPropertyList (string str) = #0;

From 6f871a8af9a641f58b4fe407771e1f71a8117ac5 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 29 Mar 2020 00:58:02 +0900
Subject: [PATCH 1049/1519] [qfcc] Unalias def types before checking

This fixes the typelinker test, but not the linking error in
ruamoko/game that it was supposed to represent. I guess there's
something more going on (maybe type encoding relocation issues).
---
 tools/qfcc/source/linker.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/tools/qfcc/source/linker.c b/tools/qfcc/source/linker.c
index 017461de0..ce708375e 100644
--- a/tools/qfcc/source/linker.c
+++ b/tools/qfcc/source/linker.c
@@ -282,6 +282,8 @@ alloc_data (int space, int size)
 static void
 resolve_external_def (defref_t *ext, defref_t *def)
 {
+	qfot_type_t *ext_type;
+	qfot_type_t *def_type;
 	if (!(REF (ext)->flags & QFOD_EXTERNAL)) {
 		def_error (REF (ext), "%s %x", WORKSTR (REF (ext)->name),
 				   REF (ext)->flags);
@@ -292,7 +294,15 @@ resolve_external_def (defref_t *ext, defref_t *def)
 				   REF (def)->flags);
 		linker_internal_error ("def is an external or local def");
 	}
-	if (REF (ext)->type != REF (def)->type) {
+	ext_type = WORKTYPE (REF(ext)->type);
+	if (ext_type->meta == ty_alias) {
+		ext_type = WORKTYPE (ext_type->t.alias.aux_type);
+	}
+	def_type = WORKTYPE (REF (def)->type);
+	if (def_type->meta == ty_alias) {
+		def_type = WORKTYPE (def_type->t.alias.aux_type);
+	}
+	if (ext_type != def_type) {
 		linker_type_mismatch (REF (ext), REF (def));
 		return;
 	}

From 78962cb205cf5d36b7f58e795b736ae4ecd9005b Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 29 Mar 2020 10:27:16 +0900
Subject: [PATCH 1050/1519] [qwaq] Use append_type in field/pointer/array_type

This fixes the missing alias chain splitter, allowing scheme to compile
again.
---
 tools/qfcc/source/type.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tools/qfcc/source/type.c b/tools/qfcc/source/type.c
index 08a02855b..dab0b844e 100644
--- a/tools/qfcc/source/type.c
+++ b/tools/qfcc/source/type.c
@@ -453,9 +453,9 @@ field_type (type_t *aux)
 		new = new_type ();
 	new->type = ev_field;
 	new->alignment = 1;
-	new->t.fldptr.type = aux;
-	if (aux)
-		new = find_type (new);
+	if (aux) {
+		new = find_type (append_type (new, aux));
+	}
 	return new;
 }
 
@@ -471,9 +471,9 @@ pointer_type (type_t *aux)
 		new = new_type ();
 	new->type = ev_pointer;
 	new->alignment = 1;
-	new->t.fldptr.type = aux;
-	if (aux)
-		new = find_type (new);
+	if (aux) {
+		new = find_type (append_type (new, aux));
+	}
 	return new;
 }
 
@@ -487,15 +487,15 @@ array_type (type_t *aux, int size)
 		memset (&_new, 0, sizeof (_new));
 	else
 		new = new_type ();
+	new->meta = ty_array;
 	new->type = ev_invalid;
 	if (aux) {
 		new->alignment = aux->alignment;
 	}
-	new->meta = ty_array;
-	new->t.array.type = aux;
 	new->t.array.size = size;
-	if (aux)
-		new = find_type (new);
+	if (aux) {
+		new = find_type (append_type (new, aux));
+	}
 	return new;
 }
 

From 218cca71b8929142a5ee49f026f59b3ddf779e6e Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 29 Mar 2020 11:29:15 +0900
Subject: [PATCH 1051/1519] [qfcc] Take special care when aliasing aliased
 types

When aliasing a type that already has aliases, the top node needs to be
replaced if it is unnamed, or the alias-free branch of the new node
needs to reach around to the alias-free branch of the existing node.
This fixes the bogus param counts in qwaq.
---
 tools/qfcc/source/expr.c |  3 ++-
 tools/qfcc/source/type.c | 10 ++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index 6bbc7b742..058292b1d 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -248,7 +248,8 @@ get_type (expr_t *e)
 			type = e->e.symbol->type;
 			break;
 		case ex_temp:
-			return e->e.temp.type;
+			type = e->e.temp.type;
+			break;
 		case ex_value:
 			type = e->e.value->type;
 			break;
diff --git a/tools/qfcc/source/type.c b/tools/qfcc/source/type.c
index dab0b844e..8e34a910e 100644
--- a/tools/qfcc/source/type.c
+++ b/tools/qfcc/source/type.c
@@ -529,6 +529,16 @@ alias_type (type_t *type, type_t *alias_chain, const char *name)
 	alias->meta = ty_alias;
 	alias->type = type->type;
 	alias->alignment = type->alignment;
+	if (type == alias_chain && type->meta == ty_alias) {
+		// typedef of a type that contains a typedef somewhere
+		// grab the alias-free branch for type
+		type = alias_chain->t.alias.aux_type;
+		if (!alias_chain->name) {
+			// the other typedef is further inside, so replace the unnamed
+			// alias node with the typedef
+			alias_chain = alias_chain->t.alias.full_type;
+		}
+	}
 	alias->t.alias.aux_type = type;
 	alias->t.alias.full_type = alias_chain;
 	if (name) {

From 361b3ff422bfa880f27d7152d21aa9552ba54390 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 29 Mar 2020 11:49:07 +0900
Subject: [PATCH 1052/1519] [qfcc] Treat alias nodes in alias-free branch as
 ICE

---
 tools/qfcc/source/type.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tools/qfcc/source/type.c b/tools/qfcc/source/type.c
index 8e34a910e..753ccae10 100644
--- a/tools/qfcc/source/type.c
+++ b/tools/qfcc/source/type.c
@@ -551,7 +551,10 @@ const type_t *
 unalias_type (const type_t *type)
 {
 	if (type->meta == ty_alias) {
-		return type->t.alias.aux_type;
+		type = type->t.alias.aux_type;
+		if (type->meta == ty_alias) {
+			internal_error (0, "alias type node in alias-free chain");
+		}
 	}
 	return type;
 }

From 62b6e95746773d620b9bdf9119bfa036f9a88299 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 29 Mar 2020 14:40:15 +0900
Subject: [PATCH 1053/1519] [qfcc] Show a marker at first unbound reloc

---
 tools/qfcc/source/dump_globals.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/qfcc/source/dump_globals.c b/tools/qfcc/source/dump_globals.c
index ab15b0c4d..86a9c1525 100644
--- a/tools/qfcc/source/dump_globals.c
+++ b/tools/qfcc/source/dump_globals.c
@@ -344,6 +344,9 @@ qfo_relocs (qfo_t *qfo)
 	unsigned      i;
 
 	for (i = 0; i < qfo->num_relocs; i++) {
+		if (i == qfo->num_relocs - qfo->num_loose_relocs) {
+			printf ("---- unbound relocs ----\n");
+		}
 		reloc = qfo->relocs + i;
 		if ((unsigned) reloc->type > rel_def_field_ofs) {
 			printf ("%d unknown reloc: %d\n", i, reloc->type);

From c6d5ceab0e431493f773f23134dfa2ca746c5c79 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 29 Mar 2020 16:26:36 +0900
Subject: [PATCH 1054/1519] [qfcc] Make things clearer about relocated types

I was very uncertain about the validity of messing with the old type
encoding that way, but adding the check to ensure the type has been
processed never fired, so it seems ok. And the comments help me a lot :)
---
 tools/qfcc/source/linker.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/tools/qfcc/source/linker.c b/tools/qfcc/source/linker.c
index ce708375e..951a0b8df 100644
--- a/tools/qfcc/source/linker.c
+++ b/tools/qfcc/source/linker.c
@@ -495,8 +495,20 @@ add_defs (qfo_t *qfo, qfo_mspace_t *space, qfo_mspace_t *dest_space,
 		odef->file = linker_add_string (QFOSTR (qfo, idef->file));
 		idef->file = -1;					// mark def as copied
 		idef->line = num_work_defrefs;		// so def can be found
+		// In the first passs, process_type_def sets the type meta to -1 and
+		// class to the offset of the copied type, but the null type encodiing
+		// is not modified. Other defs are processed in the second pass.
 		type = QFOTYPE(idef->type);
+		if (idef->type && (int) type->meta != -1) {
+			linker_internal_error ("reference to type that has not been "
+								   "relocated");
+		}
+		// Type encodings have no type (type = 0) so setting the type
+		// to the idef type class has no effect.
 		odef->type = type->t.class;			// pointer to type in work
+		// don't add unused (no attached relocs) external defs to the work
+		// defref list so they will not cause unused object files to be
+		// pulled in from libraries
 		if (odef->flags & QFOD_EXTERNAL && !odef->num_relocs)
 			continue;
 		ref = get_defref (odef, dest_space);

From 188a1ea105bd713c859bdfa8bbd3eca9e0a2c030 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 29 Mar 2020 18:18:27 +0900
Subject: [PATCH 1055/1519] [qfcc] Add more comments to the linker

It's a horribly hairy beast to understand, especially anything to do
with relocs and type encodings.
---
 tools/qfcc/source/linker.c | 39 +++++++++++++++++++++++++-------------
 1 file changed, 26 insertions(+), 13 deletions(-)

diff --git a/tools/qfcc/source/linker.c b/tools/qfcc/source/linker.c
index 951a0b8df..e5c019e32 100644
--- a/tools/qfcc/source/linker.c
+++ b/tools/qfcc/source/linker.c
@@ -418,10 +418,13 @@ process_type_def (defref_t *ref, qfo_mspace_t *space, qfo_def_t *old)
 			memcpy (new_type, old_type, old_type->size * sizeof (pr_type_t));
 			define_def (ref, extern_type_defs, defined_type_defs);
 		}
-		// save the new address in the old def's type field so relocation
-		// records can be updated.
+		// Save the new address in the old def's type field so relocation
+		// records can be updated. Type encoding defs start with no type
+		// (type = 0). The old def's offset is not modified because it is used
+		// for finding the def when adjusting relocation records that point
+		// to fields inside the type encoding.
 		old->type = REF (ref)->offset;
-		// mark the old type encoding as having been transfered, and save the
+		// Mark the old type encoding as having been transfered, and save the
 		// new address in the encoding's class field so def and function types
 		// can be updated easily.
 		old_type->meta = -1;
@@ -456,6 +459,8 @@ add_relocs (qfo_t *qfo, int start, int count, int target)
 	oreloc = work->relocs + work->num_relocs;
 	for  ( ; work->num_relocs < size; ireloc++, oreloc++) {
 		*oreloc = *ireloc;
+		// Mark the reloc as having been copied and record the new reloc record
+		// number in the old reloc's offset
 		ireloc->type = -1;
 		ireloc->offset = work->num_relocs++;
 		if (oreloc->space >= qfo->num_spaces) {
@@ -814,15 +819,22 @@ update_type_space_reloc (qfo_mspace_t *space, qfo_reloc_t *reloc)
 	qfo_def_t    dummy;
 	qfo_def_t   *def;
 
-	if (reloc->type == -1)
+	if (reloc->type == -1) {
+		// The reloc has been copied, and the record number of the new reloc
+		// is in the old reloc's offset.
 		reloc = work->relocs + reloc->offset;
+	}
 	dummy.offset = reloc->offset;
 	def = (qfo_def_t *) bsearch (&dummy, space->defs, space->num_defs,
 								 sizeof (qfo_def_t), type_def_compare);
-	if (!def)
+	if (!def) {
 		linker_internal_error ("relocation record with invalid address. "
 							   "corrupt object file?");
-	reloc->offset += def->type - def->offset;
+	}
+	// The new offset of the type encoding is stored in the def's type field.
+	// The old offset is in the def's offset field. The reloc's offset points
+	// to somewhere within the type encoding.
+	reloc->offset = def->type + (reloc->offset - def->offset);
 }
 
 static int
@@ -838,14 +850,15 @@ process_type_space (qfo_t *qfo, qfo_mspace_t *space, int pass)
 	}
 	qfo_type_defs = space;
 	add_defs (qfo, space, work->spaces + qfo_type_space, process_type_def);
-	// the defs in qfo are no longer needed by the rest of the linker, so
-	// we're free to mess around with them
+	// The defs in qfo are no longer needed by the rest of the linker, so
+	// we're free to mess around with them.
 
-	// sort the defs by addres. Unfortunately, they will usually be in order,
-	// so qsort will likely be pessimistic, but oh well.
+	// Sort the defs by addres so they can found using bsearch when adjusting
+	// the targets of type encoding relocs. Unfortunately, they will usually
+	// be in order, so qsort will likely be pessimistic, but oh well.
 	qsort (space->defs, space->num_defs, sizeof (qfo_def_t), type_def_compare);
 
-	// update the offsets of all relocation records that point into the type
+	// Update the offsets of all relocation records that point into the type
 	// encoding space.
 	for (i = 0; i < qfo->num_relocs; i++) {
 		qfo_reloc_t *reloc = qfo->relocs + i;
@@ -853,8 +866,8 @@ process_type_space (qfo_t *qfo, qfo_mspace_t *space, int pass)
 		if (reloc->space != space->id)
 			continue;
 		update_type_space_reloc (space, reloc);
-		// while we're at it, update the strings so the type space strings
-		// are always correct.
+		// while we're at it, relocate all references in the type encoding
+		// space so the type encodings are always correct.
 		if (reloc->type == rel_def_string) {
 			string_t     str;
 			str = linker_add_string (QFOSTR (qfo, reloc->target));

From d4de1d741881cd6487d03d3655e667a5dabdcc8a Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 29 Mar 2020 18:19:36 +0900
Subject: [PATCH 1056/1519] [qfcc] Do full type encoding relocation early

Because type aliases need to be unaliased, the type pointers in the type
encodings need to be correct when it comes to linking defs and
functions. This fixes the linking errors in ruamoko/game.
---
 tools/qfcc/source/linker.c | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/tools/qfcc/source/linker.c b/tools/qfcc/source/linker.c
index e5c019e32..14d963b73 100644
--- a/tools/qfcc/source/linker.c
+++ b/tools/qfcc/source/linker.c
@@ -872,6 +872,20 @@ process_type_space (qfo_t *qfo, qfo_mspace_t *space, int pass)
 			string_t     str;
 			str = linker_add_string (QFOSTR (qfo, reloc->target));
 			QFO_STRING (work, reloc->space, reloc->offset) = str;
+		} else if (reloc->type == rel_def_def || reloc->type == -1) {
+			qfo_def_t  *def;
+			if (reloc->type == -1) {
+				// The reloc has been copied, and the record number of the new
+				// reloc is in the old reloc's offset.
+				reloc = work->relocs + reloc->offset;
+			}
+			if (reloc->target >= work->spaces[reloc->space].num_defs) {
+				linker_error ("Invalid reloc target def %d / %d.\n",
+							  reloc->target, qfo->num_defs);
+				continue;
+			}
+			def = work->spaces[reloc->space].defs + reloc->target;
+			QFO_INT (work, reloc->space, reloc->offset) = def->offset;
 		}
 	}
 	for (i = 0; i < num_builtins; i++) {
@@ -1316,22 +1330,6 @@ build_qfo (void)
 			reloc++;
 		}
 	}
-	for (i = 0; i < qfo->num_relocs; i++) {
-		qfo_def_t  *def;
-
-		reloc = qfo->relocs + i;
-		if (reloc->space != qfo_type_space)
-			continue;
-		if (reloc->type != rel_def_def)
-			continue;
-		if (reloc->target >= qfo->num_defs) {
-			linker_error ("Invalid reloc target def %d / %d.\n",
-						  reloc->target, qfo->num_defs);
-			continue;
-		}
-		def = qfo->defs + reloc->target;
-		QFO_INT (qfo, reloc->space, reloc->offset) = def->offset;
-	}
 	return qfo;
 }
 

From 4c5ab07347c3bd72558386a02218451f4c8116cd Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 30 Mar 2020 00:58:25 +0900
Subject: [PATCH 1057/1519] [qwaq] Remove obsolete screen class

---
 ruamoko/qwaq/qwaq-screen.h | 15 -------------
 ruamoko/qwaq/qwaq-screen.r | 43 --------------------------------------
 2 files changed, 58 deletions(-)
 delete mode 100644 ruamoko/qwaq/qwaq-screen.h
 delete mode 100644 ruamoko/qwaq/qwaq-screen.r

diff --git a/ruamoko/qwaq/qwaq-screen.h b/ruamoko/qwaq/qwaq-screen.h
deleted file mode 100644
index 9ec2ba8f3..000000000
--- a/ruamoko/qwaq/qwaq-screen.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef __qwaq_screen_h
-#define __qwaq_screen_h
-
-#include "qwaq-draw.h"
-#include "qwaq-rect.h"
-#include "qwaq-view.h"
-
-@interface Screen: View
-{
-}
-+(Screen *) screen;
--handleEvent: (qwaq_event_t *) event;
-@end
-
-#endif//__qwaq_screen_h
diff --git a/ruamoko/qwaq/qwaq-screen.r b/ruamoko/qwaq/qwaq-screen.r
deleted file mode 100644
index b6149db25..000000000
--- a/ruamoko/qwaq/qwaq-screen.r
+++ /dev/null
@@ -1,43 +0,0 @@
-#include <Array.h>
-#include "qwaq-curses.h"
-#include "qwaq-screen.h"
-
-@implementation Screen
-+(Screen *) screen
-{
-	return [[[self alloc] init] autorelease];
-}
-
--init
-{
-	if (!(self = [super initWithRect:getwrect (stdscr)])) {
-		return nil;
-	}
-	textContext = [TextContext screen];
-	[(id)textContext scrollok: 1];
-	return self;
-}
-
--handleEvent: (qwaq_event_t *) event
-{
-	if (event.what & qe_mouse) {
-		[self printf:"%04x %2d %2d %d %08x        \r", event.what, event.mouse.x, event.mouse.y, event.mouse.click, event.mouse.buttons];
-		[self redraw];
-	}
-	return self;
-}
-
--draw
-{
-	return self;
-}
-
--redraw
-{
-	//update_panels ();
-	[TextContext refresh];
-	//[TextContext doupdate];
-	return self;
-}
-
-@end

From 6ff5b5c101467b16c042caab6f2ad08fd7b2d269 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 30 Mar 2020 02:34:08 +0900
Subject: [PATCH 1058/1519] [qwaq] Clean up the qwaq directory

Things were getting rather cluttered with everything being qwaq-* and
all in one directory. Now most have lost the qwaq- prefix and have been
moved into subdirectories (non-recursive make).
---
 ruamoko/qwaq/Makefile.am                      | 55 ++++++++++---------
 ruamoko/qwaq/{ => builtins}/builtins.c        |  0
 .../qwaq/{qwaq-curses.c => builtins/curses.c} |  8 +--
 .../qwaq/{qwaq-debug.c => builtins/debug.c}   |  8 +--
 .../editbuffer.c}                             |  2 +-
 .../qwaq/{qwaq-input.c => builtins/input.c}   |  6 +-
 ruamoko/qwaq/{ => builtins}/main.c            |  2 +-
 ruamoko/qwaq/{ => builtins}/qwaq-bi.c         |  0
 ruamoko/qwaq/{ => builtins}/qwaq.c            |  0
 .../qwaq/{qwaq-debug.h => debugger/debug.h}   |  8 +--
 .../{qwaq-debugger.h => debugger/debugger.h}  |  8 +--
 .../{qwaq-debugger.r => debugger/debugger.r}  | 13 +++--
 .../editbuffer.h}                             |  6 +-
 .../editbuffer.r}                             |  2 +-
 .../qwaq/{qwaq-editor.h => editor/editor.h}   | 10 ++--
 .../qwaq/{qwaq-editor.r => editor/editor.r}   |  4 +-
 ruamoko/qwaq/progs.src.in                     | 16 ------
 ruamoko/qwaq/qwaq-app.h                       |  4 +-
 ruamoko/qwaq/qwaq-app.r                       | 10 ++--
 ruamoko/qwaq/{qwaq-button.h => ui/button.h}   | 10 ++--
 ruamoko/qwaq/{qwaq-button.r => ui/button.r}   |  4 +-
 ruamoko/qwaq/{ => ui}/color.h                 |  6 +-
 ruamoko/qwaq/{qwaq-curses.h => ui/curses.h}   | 10 ++--
 ruamoko/qwaq/{qwaq-draw.h => ui/draw.h}       |  8 +--
 ruamoko/qwaq/{qwaq-draw.r => ui/draw.r}       |  4 +-
 ruamoko/qwaq/{ => ui}/event.h                 |  6 +-
 ruamoko/qwaq/{qwaq-garray.h => ui/garray.h}   |  6 +-
 ruamoko/qwaq/{qwaq-garray.r => ui/garray.r}   |  4 +-
 ruamoko/qwaq/{qwaq-group.h => ui/group.h}     | 10 ++--
 ruamoko/qwaq/{qwaq-group.r => ui/group.r}     | 10 ++--
 .../qwaq/{qwaq-listener.h => ui/listener.h}   |  6 +-
 .../qwaq/{qwaq-listener.r => ui/listener.r}   |  2 +-
 .../qwaq/{qwaq-proxyview.h => ui/proxyview.h} |  8 +--
 .../qwaq/{qwaq-proxyview.r => ui/proxyview.r} |  4 +-
 ruamoko/qwaq/{qwaq-rect.h => ui/rect.h}       |  6 +-
 ruamoko/qwaq/{qwaq-rect.r => ui/rect.r}       |  2 +-
 .../{qwaq-textcontext.h => ui/textcontext.h}  | 12 ++--
 .../{qwaq-textcontext.r => ui/textcontext.r}  |  4 +-
 .../qwaq/{qwaq-titlebar.h => ui/titlebar.h}   |  8 +--
 .../qwaq/{qwaq-titlebar.r => ui/titlebar.r}   |  4 +-
 ruamoko/qwaq/{qwaq-view.h => ui/view.h}       | 12 ++--
 ruamoko/qwaq/{qwaq-view.r => ui/view.r}       |  8 +--
 ruamoko/qwaq/{qwaq-window.h => ui/window.h}   | 12 ++--
 ruamoko/qwaq/{qwaq-window.r => ui/window.r}   | 16 +++---
 44 files changed, 167 insertions(+), 177 deletions(-)
 rename ruamoko/qwaq/{ => builtins}/builtins.c (100%)
 rename ruamoko/qwaq/{qwaq-curses.c => builtins/curses.c} (99%)
 rename ruamoko/qwaq/{qwaq-debug.c => builtins/debug.c} (99%)
 rename ruamoko/qwaq/{qwaq-editbuffer-bi.c => builtins/editbuffer.c} (99%)
 rename ruamoko/qwaq/{qwaq-input.c => builtins/input.c} (99%)
 rename ruamoko/qwaq/{ => builtins}/main.c (99%)
 rename ruamoko/qwaq/{ => builtins}/qwaq-bi.c (100%)
 rename ruamoko/qwaq/{ => builtins}/qwaq.c (100%)
 rename ruamoko/qwaq/{qwaq-debug.h => debugger/debug.h} (94%)
 rename ruamoko/qwaq/{qwaq-debugger.h => debugger/debugger.h} (79%)
 rename ruamoko/qwaq/{qwaq-debugger.r => debugger/debugger.r} (97%)
 rename ruamoko/qwaq/{qwaq-editbuffer.h => editor/editbuffer.h} (94%)
 rename ruamoko/qwaq/{qwaq-editbuffer.r => editor/editbuffer.r} (98%)
 rename ruamoko/qwaq/{qwaq-editor.h => editor/editor.h} (83%)
 rename ruamoko/qwaq/{qwaq-editor.r => editor/editor.r} (98%)
 delete mode 100644 ruamoko/qwaq/progs.src.in
 rename ruamoko/qwaq/{qwaq-button.h => ui/button.h} (84%)
 rename ruamoko/qwaq/{qwaq-button.r => ui/button.r} (98%)
 rename ruamoko/qwaq/{ => ui}/color.h (81%)
 rename ruamoko/qwaq/{qwaq-curses.h => ui/curses.h} (97%)
 rename ruamoko/qwaq/{qwaq-draw.h => ui/draw.h} (91%)
 rename ruamoko/qwaq/{qwaq-draw.r => ui/draw.r} (98%)
 rename ruamoko/qwaq/{ => ui}/event.h (95%)
 rename ruamoko/qwaq/{qwaq-garray.h => ui/garray.h} (91%)
 rename ruamoko/qwaq/{qwaq-garray.r => ui/garray.r} (97%)
 rename ruamoko/qwaq/{qwaq-group.h => ui/group.h} (85%)
 rename ruamoko/qwaq/{qwaq-group.r => ui/group.r} (97%)
 rename ruamoko/qwaq/{qwaq-listener.h => ui/listener.h} (87%)
 rename ruamoko/qwaq/{qwaq-listener.r => ui/listener.r} (98%)
 rename ruamoko/qwaq/{qwaq-proxyview.h => ui/proxyview.h} (64%)
 rename ruamoko/qwaq/{qwaq-proxyview.r => ui/proxyview.r} (92%)
 rename ruamoko/qwaq/{qwaq-rect.h => ui/rect.h} (87%)
 rename ruamoko/qwaq/{qwaq-rect.r => ui/rect.r} (98%)
 rename ruamoko/qwaq/{qwaq-textcontext.h => ui/textcontext.h} (89%)
 rename ruamoko/qwaq/{qwaq-textcontext.r => ui/textcontext.r} (98%)
 rename ruamoko/qwaq/{qwaq-titlebar.h => ui/titlebar.h} (62%)
 rename ruamoko/qwaq/{qwaq-titlebar.r => ui/titlebar.r} (90%)
 rename ruamoko/qwaq/{qwaq-view.h => ui/view.h} (93%)
 rename ruamoko/qwaq/{qwaq-view.r => ui/view.r} (98%)
 rename ruamoko/qwaq/{qwaq-window.h => ui/window.h} (81%)
 rename ruamoko/qwaq/{qwaq-window.r => ui/window.r} (97%)

diff --git a/ruamoko/qwaq/Makefile.am b/ruamoko/qwaq/Makefile.am
index b615f11ba..5bb8f0761 100644
--- a/ruamoko/qwaq/Makefile.am
+++ b/ruamoko/qwaq/Makefile.am
@@ -1,18 +1,20 @@
-AUTOMAKE_OPTIONS= foreign
+AUTOMAKE_OPTIONS= foreign subdir-objects
 
 QWAQ_LIBS=@QWAQ_LIBS@
 QWAQ_DEPS=@QWAQ_DEPS@
 QWAQ_INCS=@QWAQ_INCS@
 
-AM_CPPFLAGS=	-I$(top_srcdir)/include $(QWAQ_INCS) $(PTHREAD_CFLAGS)
+AM_CPPFLAGS= -I$(srcdir) -I$(top_srcdir)/include $(QWAQ_INCS) $(PTHREAD_CFLAGS)
 
 noinst_PROGRAMS=@QWAQ_TARGETS@ qwaq-app.dat$(EXEEXT) gcd.dat$(EXEEXT)
 
 QFCC_DEP=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT)
 QFCC=$(top_builddir)/tools/qfcc/source/qfcc
 
+QCSYSTEM=--no-default-paths -I$(top_srcdir)/ruamoko/include -I$(top_srcdir)/include
+QWAQ_INC=-I$(srcdir) -I$(srcdir)/builtins -I$(srcdir)/debugger -I$(srcdir)/editor -I$(srcdir)/ui
 QCFLAGS=-qq -O -g -Werror
-QCPPFLAGS=--no-default-paths -I$(top_srcdir)/ruamoko/include -I$(top_srcdir)/include
+QCPPFLAGS=$(QCSYSTEM) -I$(srcdir)
 QCLINKFLAGS=--no-default-paths -L$(top_builddir)/ruamoko/lib
 QCOMPILE=$(QFCC) $(QCFLAGS) $(QCPPFLAGS)
 QLINK=$(QFCC) $(QCFLAGS) $(QCLINKFLAGS)
@@ -24,34 +26,37 @@ SUFFIXES=.o .r
 	@$(am__mv) $(DEPDIR)/$*.Tqo $(DEPDIR)/$*.Qo
 
 qwaq_app_dat_src= \
-	qwaq-app.r \
-	qwaq-button.r \
-	qwaq-debugger.r \
-	qwaq-draw.r \
-	qwaq-editbuffer.r \
-	qwaq-editor.r \
-	qwaq-garray.r \
-	qwaq-group.r \
-	qwaq-listener.r \
-	qwaq-proxyview.r \
-	qwaq-rect.r \
-	qwaq-screen.r \
-	qwaq-textcontext.r \
-	qwaq-titlebar.r \
-	qwaq-view.r \
-	qwaq-window.r
+	qwaq-app.r	\
+	debugger/debugger.r	\
+	editor/editbuffer.r	\
+	editor/editor.r	\
+	ui/button.r	\
+	ui/draw.r	\
+	ui/garray.r	\
+	ui/group.r	\
+	ui/listener.r	\
+	ui/proxyview.r	\
+	ui/rect.r	\
+	ui/textcontext.r	\
+	ui/titlebar.r	\
+	ui/view.r	\
+	ui/window.r	\
+	$e
 
 #FIXME this coupling is horrible
 qwaq_curses_libs= \
 	$(top_builddir)/libs/video/targets/libvid_common.la \
 	$(top_builddir)/libs/console/libQFconsole.la \
 	$(top_builddir)/libs/gib/libQFgib.la
+
 qwaq_curses_SOURCES= \
-	main.c \
-	qwaq-curses.c \
-	qwaq-debug.c \
-	qwaq-editbuffer-bi.c \
-	qwaq-input.c
+	builtins/main.c \
+	builtins/curses.c \
+	builtins/debug.c \
+	builtins/editbuffer.c \
+	builtins/input.c \
+	$e
+
 qwaq_curses_LDADD= $(qwaq_curses_libs) $(QWAQ_LIBS) \
 				$(PANEL_LIBS) $(CURSES_LIBS) $(PTHREAD_LDFLAGS) $(DL_LIBS)
 qwaq_curses_LDFLAGS=
@@ -74,7 +79,7 @@ qwaq_x11_libs= \
 	$(top_builddir)/libs/video/targets/libQFx11.la \
 	$(client_libs) \
 	$(top_builddir)/libs/gib/libQFgib.la
-qwaq_x11_SOURCES=qwaq.c qwaq-bi.c
+qwaq_x11_SOURCES=builtins/qwaq.c builtins/qwaq-bi.c
 qwaq_x11_LDADD= $(qwaq_x11_libs) $(QWAQ_LIBS) \
 				$(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 \
 				$(X_EXTRA_LIBS) $(X_SHM_LIB) $(DL_LIBS)
diff --git a/ruamoko/qwaq/builtins.c b/ruamoko/qwaq/builtins/builtins.c
similarity index 100%
rename from ruamoko/qwaq/builtins.c
rename to ruamoko/qwaq/builtins/builtins.c
diff --git a/ruamoko/qwaq/qwaq-curses.c b/ruamoko/qwaq/builtins/curses.c
similarity index 99%
rename from ruamoko/qwaq/qwaq-curses.c
rename to ruamoko/qwaq/builtins/curses.c
index 26a17b37b..f4db018a0 100644
--- a/ruamoko/qwaq/qwaq-curses.c
+++ b/ruamoko/qwaq/builtins/curses.c
@@ -1,5 +1,5 @@
 /*
-	qwaq-curses.c
+	curses.c
 
 	Ruamoko ncurses wrapper using threading
 
@@ -47,9 +47,9 @@
 #include "QF/sys.h"
 
 #include "qwaq.h"
-#include "qwaq-curses.h"
-#include "qwaq-rect.h"
-#include "qwaq-textcontext.h"
+#include "ui/curses.h"
+#include "ui/rect.h"
+#include "ui/textcontext.h"
 
 #define always_inline inline __attribute__((__always_inline__))
 #define CMD_SIZE(x) sizeof(x)/sizeof(x[0])
diff --git a/ruamoko/qwaq/qwaq-debug.c b/ruamoko/qwaq/builtins/debug.c
similarity index 99%
rename from ruamoko/qwaq/qwaq-debug.c
rename to ruamoko/qwaq/builtins/debug.c
index 4938d8211..c1835f99d 100644
--- a/ruamoko/qwaq/qwaq-debug.c
+++ b/ruamoko/qwaq/builtins/debug.c
@@ -1,5 +1,5 @@
 /*
-	qwaq-debug.c
+	debug.c
 
 	Debugging support
 
@@ -47,9 +47,9 @@
 #include "QF/sys.h"
 
 #include "qwaq.h"
-#include "event.h"
-#include "qwaq-curses.h"
-#include "qwaq-debug.h"
+#include "ui/event.h"
+#include "ui/curses.h"
+#include "debugger/debug.h"
 
 typedef struct qwaq_target_s {
 	progs_t    *pr;
diff --git a/ruamoko/qwaq/qwaq-editbuffer-bi.c b/ruamoko/qwaq/builtins/editbuffer.c
similarity index 99%
rename from ruamoko/qwaq/qwaq-editbuffer-bi.c
rename to ruamoko/qwaq/builtins/editbuffer.c
index 9f457bf10..f834f258c 100644
--- a/ruamoko/qwaq/qwaq-editbuffer-bi.c
+++ b/ruamoko/qwaq/builtins/editbuffer.c
@@ -11,7 +11,7 @@
 #include "QF/txtbuffer.h"
 
 #include "qwaq.h"
-#include "qwaq-editbuffer.h"
+#include "editor/editbuffer.h"
 
 #define always_inline inline __attribute__((__always_inline__))
 
diff --git a/ruamoko/qwaq/qwaq-input.c b/ruamoko/qwaq/builtins/input.c
similarity index 99%
rename from ruamoko/qwaq/qwaq-input.c
rename to ruamoko/qwaq/builtins/input.c
index 543971d44..29d5a6088 100644
--- a/ruamoko/qwaq/qwaq-input.c
+++ b/ruamoko/qwaq/builtins/input.c
@@ -1,5 +1,5 @@
 /*
-	qwaq-input.c
+	input.c
 
 	Input handling
 
@@ -47,8 +47,8 @@
 #include "QF/sys.h"
 
 #include "qwaq.h"
-#include "event.h"
-#include "qwaq-curses.h"
+#include "ui/event.h"
+#include "ui/curses.h"
 
 #define always_inline inline __attribute__((__always_inline__))
 
diff --git a/ruamoko/qwaq/main.c b/ruamoko/qwaq/builtins/main.c
similarity index 99%
rename from ruamoko/qwaq/main.c
rename to ruamoko/qwaq/builtins/main.c
index bbd66bac1..c78a9f9e5 100644
--- a/ruamoko/qwaq/main.c
+++ b/ruamoko/qwaq/builtins/main.c
@@ -53,7 +53,7 @@
 #include "QF/zone.h"
 
 #include "qwaq.h"
-#include "qwaq-debug.h"
+#include "debugger/debug.h"
 
 #define MAX_EDICTS 1024
 
diff --git a/ruamoko/qwaq/qwaq-bi.c b/ruamoko/qwaq/builtins/qwaq-bi.c
similarity index 100%
rename from ruamoko/qwaq/qwaq-bi.c
rename to ruamoko/qwaq/builtins/qwaq-bi.c
diff --git a/ruamoko/qwaq/qwaq.c b/ruamoko/qwaq/builtins/qwaq.c
similarity index 100%
rename from ruamoko/qwaq/qwaq.c
rename to ruamoko/qwaq/builtins/qwaq.c
diff --git a/ruamoko/qwaq/qwaq-debug.h b/ruamoko/qwaq/debugger/debug.h
similarity index 94%
rename from ruamoko/qwaq/qwaq-debug.h
rename to ruamoko/qwaq/debugger/debug.h
index b233f2b07..74ebf1c39 100644
--- a/ruamoko/qwaq/qwaq-debug.h
+++ b/ruamoko/qwaq/debugger/debug.h
@@ -1,7 +1,7 @@
-#ifndef __qwaq_debug_h
-#define __qwaq_debug_h
+#ifndef __qwaq_debugger_debug_h
+#define __qwaq_debugger_debug_h
 
-#include "event.h"
+#include "ui/event.h"
 
 typedef enum {
 	qe_debug_event = 0x0100,
@@ -82,4 +82,4 @@ void QWAQ_DebugTarget_Init (progs_t *pr);
 
 #endif
 
-#endif//__qwaq_debug_h
+#endif//__qwaq_debugger_debug_h
diff --git a/ruamoko/qwaq/qwaq-debugger.h b/ruamoko/qwaq/debugger/debugger.h
similarity index 79%
rename from ruamoko/qwaq/qwaq-debugger.h
rename to ruamoko/qwaq/debugger/debugger.h
index 513ae211b..2fc402291 100644
--- a/ruamoko/qwaq/qwaq-debugger.h
+++ b/ruamoko/qwaq/debugger/debugger.h
@@ -1,9 +1,9 @@
-#ifndef __qwaq_debugger_h
-#define __qwaq_debugger_h
+#ifndef __qwaq_debugger_debugger_h
+#define __qwaq_debugger_debugger_h
 
 #include <Object.h>
 
-#include "qwaq-debug.h"
+#include "debugger/debug.h"
 
 @class ProxyView;
 @class Editor;
@@ -33,4 +33,4 @@
 -handleDebugEvent;
 @end
 
-#endif//__qwaq_debugger_h
+#endif//__qwaq_debugger_debugger_h
diff --git a/ruamoko/qwaq/qwaq-debugger.r b/ruamoko/qwaq/debugger/debugger.r
similarity index 97%
rename from ruamoko/qwaq/qwaq-debugger.r
rename to ruamoko/qwaq/debugger/debugger.r
index a15b6c7de..dde372e36 100644
--- a/ruamoko/qwaq/qwaq-debugger.r
+++ b/ruamoko/qwaq/debugger/debugger.r
@@ -3,13 +3,13 @@
 #include <string.h>
 #include <types.h>
 
+#include "ui/curses.h"
+#include "ui/listener.h"
+#include "ui/proxyview.h"
+#include "ui/window.h"
+#include "debugger/debugger.h"
+#include "editor/editor.h"
 #include "qwaq-app.h"
-#include "qwaq-curses.h"
-#include "qwaq-debugger.h"
-#include "qwaq-editor.h"
-#include "qwaq-listener.h"
-#include "qwaq-proxyview.h"
-#include "qwaq-window.h"
 
 @implementation Debugger
 -(qdb_target_t)debug_target
@@ -66,6 +66,7 @@
 	[locals_window setTitle: "Locals"];
 	locals_view = [[View alloc] initWithRect: {{1, 1}, {38, 8}}
 									 options: ofCanFocus];
+	[locals_view setGrowMode:gfGrowHi];
 	[locals_window insertSelected: locals_view];
 	[application addView: locals_window];
 
diff --git a/ruamoko/qwaq/qwaq-editbuffer.h b/ruamoko/qwaq/editor/editbuffer.h
similarity index 94%
rename from ruamoko/qwaq/qwaq-editbuffer.h
rename to ruamoko/qwaq/editor/editbuffer.h
index 67976d244..72ee9db65 100644
--- a/ruamoko/qwaq/qwaq-editbuffer.h
+++ b/ruamoko/qwaq/editor/editbuffer.h
@@ -1,5 +1,5 @@
-#ifndef __qwaq_editbuffer_h
-#define __qwaq_editbuffer_h
+#ifndef __qwaq_editor_editbuffer_h
+#define __qwaq_editor_editbuffer_h
 
 #ifdef __QFCC__
 #include <Object.h>
@@ -79,4 +79,4 @@ typedef struct qwaq_editbuffer_s {
 
 #endif//!__QFCC__
 
-#endif//__qwaq_editbuffer_h
+#endif//__qwaq_editor_editbuffer_h
diff --git a/ruamoko/qwaq/qwaq-editbuffer.r b/ruamoko/qwaq/editor/editbuffer.r
similarity index 98%
rename from ruamoko/qwaq/qwaq-editbuffer.r
rename to ruamoko/qwaq/editor/editbuffer.r
index d0900a108..2d58e0361 100644
--- a/ruamoko/qwaq/qwaq-editbuffer.r
+++ b/ruamoko/qwaq/editor/editbuffer.r
@@ -1,4 +1,4 @@
-#include "qwaq-editbuffer.h"
+#include "editor/editbuffer.h"
 
 @implementation EditBuffer
 - init = #0;
diff --git a/ruamoko/qwaq/qwaq-editor.h b/ruamoko/qwaq/editor/editor.h
similarity index 83%
rename from ruamoko/qwaq/qwaq-editor.h
rename to ruamoko/qwaq/editor/editor.h
index 01ef35f30..099ae78a3 100644
--- a/ruamoko/qwaq/qwaq-editor.h
+++ b/ruamoko/qwaq/editor/editor.h
@@ -1,8 +1,8 @@
-#ifndef __qwaq_editor_h
-#define __qwaq_editor_h
+#ifndef __qwaq_editor_editor_h
+#define __qwaq_editor_editor_h
 
-#include "qwaq-editbuffer.h"
-#include "qwaq-view.h"
+#include "editor/editbuffer.h"
+#include "ui/view.h"
 
 @class Editor;
 @class EditBuffer;
@@ -35,4 +35,4 @@
 -(string)getWordAt:(Point) pos;	// view relative coordinates
 @end
 
-#endif//__qwaq_editor_h
+#endif//__qwaq_editor_editor_h
diff --git a/ruamoko/qwaq/qwaq-editor.r b/ruamoko/qwaq/editor/editor.r
similarity index 98%
rename from ruamoko/qwaq/qwaq-editor.r
rename to ruamoko/qwaq/editor/editor.r
index f45de395f..f6f78d575 100644
--- a/ruamoko/qwaq/qwaq-editor.r
+++ b/ruamoko/qwaq/editor/editor.r
@@ -1,7 +1,7 @@
 #include <QF/keys.h>
 #include "qwaq-app.h"
-#include "qwaq-editor.h"
-#include "qwaq-listener.h"
+#include "editor/editor.h"
+#include "ui/listener.h"
 
 @implementation Editor
 
diff --git a/ruamoko/qwaq/progs.src.in b/ruamoko/qwaq/progs.src.in
deleted file mode 100644
index c6d4f7070..000000000
--- a/ruamoko/qwaq/progs.src.in
+++ /dev/null
@@ -1,16 +0,0 @@
-qwaq.dat
-
-@srcdir@/defs.qc
-
-@top_srcdir@/ruamoko/lib/plist.r
-@top_srcdir@/ruamoko/lib/qfile.r
-@top_srcdir@/ruamoko/lib/script.r
-@top_srcdir@/ruamoko/lib/string.r
-@top_srcdir@/ruamoko/lib/Object.r
-@top_srcdir@/ruamoko/lib/Protocol.r
-@top_srcdir@/ruamoko/lib/Array.r
-@top_srcdir@/ruamoko/lib/Array+Private.r
-@top_srcdir@/ruamoko/lib/AutoreleasePool.r
-@srcdir@/test.r
-@srcdir@/types.r
-@srcdir@/main.qc
diff --git a/ruamoko/qwaq/qwaq-app.h b/ruamoko/qwaq/qwaq-app.h
index c88d79cec..bf6255740 100644
--- a/ruamoko/qwaq/qwaq-app.h
+++ b/ruamoko/qwaq/qwaq-app.h
@@ -3,8 +3,8 @@
 
 #include <Object.h>
 
-#include "event.h"
-#include "qwaq-rect.h"
+#include "ui/event.h"
+#include "ui/rect.h"
 
 @class Array;
 @class Group;
diff --git a/ruamoko/qwaq/qwaq-app.r b/ruamoko/qwaq/qwaq-app.r
index 19c9740c1..19daf643a 100644
--- a/ruamoko/qwaq/qwaq-app.r
+++ b/ruamoko/qwaq/qwaq-app.r
@@ -3,12 +3,12 @@ int fence;
 #include <AutoreleasePool.h>
 #include <key.h>
 
-#include "color.h"
+#include "ui/color.h"
+#include "ui/curses.h"
+#include "ui/group.h"
+#include "ui/view.h"
+#include "debugger/debugger.h"
 #include "qwaq-app.h"
-#include "qwaq-curses.h"
-#include "qwaq-debugger.h"
-#include "qwaq-group.h"
-#include "qwaq-view.h"
 
 int color_palette[64];
 
diff --git a/ruamoko/qwaq/qwaq-button.h b/ruamoko/qwaq/ui/button.h
similarity index 84%
rename from ruamoko/qwaq/qwaq-button.h
rename to ruamoko/qwaq/ui/button.h
index c855505a9..d407fbbff 100644
--- a/ruamoko/qwaq/qwaq-button.h
+++ b/ruamoko/qwaq/ui/button.h
@@ -1,8 +1,8 @@
-#ifndef __qwaq_button_h
-#define __qwaq_button_h
+#ifndef __qwaq_ui_button_h
+#define __qwaq_ui_button_h
 
-#include "qwaq-draw.h"
-#include "qwaq-view.h"
+#include "ui/draw.h"
+#include "ui/view.h"
 
 @class ListenerGroup;
 
@@ -34,4 +34,4 @@
 - (Point) delta;
 @end
 
-#endif//__qwaq_button_h
+#endif//__qwaq_ui_button_h
diff --git a/ruamoko/qwaq/qwaq-button.r b/ruamoko/qwaq/ui/button.r
similarity index 98%
rename from ruamoko/qwaq/qwaq-button.r
rename to ruamoko/qwaq/ui/button.r
index a02a738c0..38d0690c4 100644
--- a/ruamoko/qwaq/qwaq-button.r
+++ b/ruamoko/qwaq/ui/button.r
@@ -1,5 +1,5 @@
-#include "qwaq-button.h"
-#include "qwaq-listener.h"
+#include "ui/button.h"
+#include "ui/listener.h"
 
 @implementation Button
 -initWithPos: (Point) pos releasedIcon: (DrawBuffer *) released
diff --git a/ruamoko/qwaq/color.h b/ruamoko/qwaq/ui/color.h
similarity index 81%
rename from ruamoko/qwaq/color.h
rename to ruamoko/qwaq/ui/color.h
index 95067b5de..3b5ce2b2a 100644
--- a/ruamoko/qwaq/color.h
+++ b/ruamoko/qwaq/ui/color.h
@@ -1,5 +1,5 @@
-#ifndef __qwaq_color_h
-#define __qwaq_color_h
+#ifndef __qwaq_ui_color_h
+#define __qwaq_ui_color_h
 
 #ifndef COLOR_PAIR
 // double protection in case this header is included in a C file
@@ -18,4 +18,4 @@
 
 #endif
 
-#endif//__qwaq_color_h
+#endif//__qwaq_ui_color_h
diff --git a/ruamoko/qwaq/qwaq-curses.h b/ruamoko/qwaq/ui/curses.h
similarity index 97%
rename from ruamoko/qwaq/qwaq-curses.h
rename to ruamoko/qwaq/ui/curses.h
index 37c9c0712..65143159f 100644
--- a/ruamoko/qwaq/qwaq-curses.h
+++ b/ruamoko/qwaq/ui/curses.h
@@ -1,7 +1,7 @@
-#ifndef __qwaq_curses_h
-#define __qwaq_curses_h
+#ifndef __qwaq_ui_curses_h
+#define __qwaq_ui_curses_h
 
-#include "event.h"
+#include "ui/event.h"
 
 typedef struct box_sides_s {
 	int         ls;
@@ -18,7 +18,7 @@ typedef struct box_corners_s {
 } box_corners_t;
 
 #ifdef __QFCC__
-#include "qwaq-rect.h"
+#include "ui/rect.h"
 
 // names, order and comments lifted from ncurses.h
 typedef enum {
@@ -205,4 +205,4 @@ int qwaq_add_event (qwaq_resources_t *res, qwaq_event_t *event);
 void qwaq_init_cond (rwcond_t *cond);
 #endif
 
-#endif//__qwaq_curses_h
+#endif//__qwaq_ui_curses_h
diff --git a/ruamoko/qwaq/qwaq-draw.h b/ruamoko/qwaq/ui/draw.h
similarity index 91%
rename from ruamoko/qwaq/qwaq-draw.h
rename to ruamoko/qwaq/ui/draw.h
index e7eff51ab..72be7fbf0 100644
--- a/ruamoko/qwaq/qwaq-draw.h
+++ b/ruamoko/qwaq/ui/draw.h
@@ -1,9 +1,9 @@
-#ifndef __qwaq_draw_h
-#define __qwaq_draw_h
+#ifndef __qwaq_ui_draw_h
+#define __qwaq_ui_draw_h
 
 #include <Object.h>
 
-#include "qwaq-rect.h"
+#include "ui/rect.h"
 
 @class DrawBuffer;
 
@@ -43,4 +43,4 @@
 - initWithSize: (Extent) size;
 @end
 
-#endif
+#endif//__qwaq_ui_draw_h
diff --git a/ruamoko/qwaq/qwaq-draw.r b/ruamoko/qwaq/ui/draw.r
similarity index 98%
rename from ruamoko/qwaq/qwaq-draw.r
rename to ruamoko/qwaq/ui/draw.r
index 7d1fbcd58..b9864af6d 100644
--- a/ruamoko/qwaq/qwaq-draw.r
+++ b/ruamoko/qwaq/ui/draw.r
@@ -1,7 +1,7 @@
 #include <string.h>
 
-#include "qwaq-curses.h"
-#include "qwaq-draw.h"
+#include "ui/curses.h"
+#include "ui/draw.h"
 
 @implementation DrawBuffer
 
diff --git a/ruamoko/qwaq/event.h b/ruamoko/qwaq/ui/event.h
similarity index 95%
rename from ruamoko/qwaq/event.h
rename to ruamoko/qwaq/ui/event.h
index d11fd195e..d8fe09c6c 100644
--- a/ruamoko/qwaq/event.h
+++ b/ruamoko/qwaq/ui/event.h
@@ -1,5 +1,5 @@
-#ifndef __qwaq_event_h
-#define __qwaq_event_h
+#ifndef __qwaq_ui_event_h
+#define __qwaq_ui_event_h
 
 typedef enum {
 	qe_mousedown = 0x0001,
@@ -77,4 +77,4 @@ typedef struct qwaq_event_s {
 	};
 } qwaq_event_t;
 
-#endif//__qwaq_event_h
+#endif//__qwaq_ui_event_h
diff --git a/ruamoko/qwaq/qwaq-garray.h b/ruamoko/qwaq/ui/garray.h
similarity index 91%
rename from ruamoko/qwaq/qwaq-garray.h
rename to ruamoko/qwaq/ui/garray.h
index 1a2e53576..3ba1a0ef2 100644
--- a/ruamoko/qwaq/qwaq-garray.h
+++ b/ruamoko/qwaq/ui/garray.h
@@ -1,5 +1,5 @@
-#ifndef __qwaq_garray_h
-#define __qwaq_garray_h
+#ifndef __qwaq_ui_garray_h
+#define __qwaq_ui_garray_h
 
 #include <Array.h>
 
@@ -26,4 +26,4 @@ typedef BOOL condition_func2 (id object, void *anObject, void *data);
 									   with: (void *)data;
 @end
 
-#endif//__qwaq_garray_h
+#endif//__qwaq_ui_garray_h
diff --git a/ruamoko/qwaq/qwaq-garray.r b/ruamoko/qwaq/ui/garray.r
similarity index 97%
rename from ruamoko/qwaq/qwaq-garray.r
rename to ruamoko/qwaq/ui/garray.r
index b3298ffa4..ee6bd0191 100644
--- a/ruamoko/qwaq/qwaq-garray.r
+++ b/ruamoko/qwaq/ui/garray.r
@@ -1,6 +1,6 @@
 #include <Array.h>
-#include "event.h"
-#include "qwaq-garray.h"
+#include "ui/event.h"
+#include "ui/garray.h"
 
 @implementation Array (Group)
 - (void) makeObjectsPerformSelector: (SEL)selector
diff --git a/ruamoko/qwaq/qwaq-group.h b/ruamoko/qwaq/ui/group.h
similarity index 85%
rename from ruamoko/qwaq/qwaq-group.h
rename to ruamoko/qwaq/ui/group.h
index 70e2663a0..b243166b2 100644
--- a/ruamoko/qwaq/qwaq-group.h
+++ b/ruamoko/qwaq/ui/group.h
@@ -1,10 +1,10 @@
-#ifndef __qwaq_group_h
-#define __qwaq_group_h
+#ifndef __qwaq_ui_group_h
+#define __qwaq_ui_group_h
 
 #include <Array.h>
 
-#include "event.h"
-#include "qwaq-draw.h"
+#include "ui/event.h"
+#include "ui/draw.h"
 
 @class View;
 
@@ -40,4 +40,4 @@
 -(void) releaseMouse;
 @end
 
-#endif//__qwaq_group_h
+#endif//__qwaq_ui_group_h
diff --git a/ruamoko/qwaq/qwaq-group.r b/ruamoko/qwaq/ui/group.r
similarity index 97%
rename from ruamoko/qwaq/qwaq-group.r
rename to ruamoko/qwaq/ui/group.r
index d94d0585f..aa4fb117e 100644
--- a/ruamoko/qwaq/qwaq-group.r
+++ b/ruamoko/qwaq/ui/group.r
@@ -1,9 +1,9 @@
 #include <Array.h>
-#include "event.h"
-#include "qwaq-draw.h"
-#include "qwaq-garray.h"
-#include "qwaq-group.h"
-#include "qwaq-view.h"
+#include "ui/event.h"
+#include "ui/draw.h"
+#include "ui/garray.h"
+#include "ui/group.h"
+#include "ui/view.h"
 
 @implementation Group
 
diff --git a/ruamoko/qwaq/qwaq-listener.h b/ruamoko/qwaq/ui/listener.h
similarity index 87%
rename from ruamoko/qwaq/qwaq-listener.h
rename to ruamoko/qwaq/ui/listener.h
index 0dd388c2e..e07356ad5 100644
--- a/ruamoko/qwaq/qwaq-listener.h
+++ b/ruamoko/qwaq/ui/listener.h
@@ -1,5 +1,5 @@
-#ifndef __qwaq_listener_h
-#define __qwaq_listener_h
+#ifndef __qwaq_ui_listener_h
+#define __qwaq_ui_listener_h
 
 #include <Object.h>
 
@@ -28,4 +28,4 @@
 -(void) respond: (void *) caller_data withObject:(void *)anObject;
 @end
 
-#endif//__qwaq_listener_h
+#endif//__qwaq_ui_listener_h
diff --git a/ruamoko/qwaq/qwaq-listener.r b/ruamoko/qwaq/ui/listener.r
similarity index 98%
rename from ruamoko/qwaq/qwaq-listener.r
rename to ruamoko/qwaq/ui/listener.r
index 95c27f04c..bdb36ac51 100644
--- a/ruamoko/qwaq/qwaq-listener.r
+++ b/ruamoko/qwaq/ui/listener.r
@@ -1,6 +1,6 @@
 #include <Array.h>
 
-#include "qwaq-listener.h"
+#include "ui/listener.h"
 
 @class Array;
 
diff --git a/ruamoko/qwaq/qwaq-proxyview.h b/ruamoko/qwaq/ui/proxyview.h
similarity index 64%
rename from ruamoko/qwaq/qwaq-proxyview.h
rename to ruamoko/qwaq/ui/proxyview.h
index 449ac5fd6..9a2c23c2e 100644
--- a/ruamoko/qwaq/qwaq-proxyview.h
+++ b/ruamoko/qwaq/ui/proxyview.h
@@ -1,7 +1,7 @@
-#ifndef __qwaq_proxyview_h
-#define __qwaq_proxyview_h
+#ifndef __qwaq_ui_proxyview_h
+#define __qwaq_ui_proxyview_h
 
-#include "qwaq-view.h"
+#include "ui/view.h"
 
 @class Group;
 
@@ -17,4 +17,4 @@
 @interface ProxyView (View) <View, TextContext>
 @end
 
-#endif//__qwaq_proxyview_h
+#endif//__qwaq_ui_proxyview_h
diff --git a/ruamoko/qwaq/qwaq-proxyview.r b/ruamoko/qwaq/ui/proxyview.r
similarity index 92%
rename from ruamoko/qwaq/qwaq-proxyview.r
rename to ruamoko/qwaq/ui/proxyview.r
index b5946eba5..a94c738dc 100644
--- a/ruamoko/qwaq/qwaq-proxyview.r
+++ b/ruamoko/qwaq/ui/proxyview.r
@@ -1,5 +1,5 @@
-#include "qwaq-group.h"
-#include "qwaq-proxyview.h"
+#include "ui/group.h"
+#include "ui/proxyview.h"
 
 @implementation ProxyView
 - (void) forward: (SEL) sel : (@va_list) args
diff --git a/ruamoko/qwaq/qwaq-rect.h b/ruamoko/qwaq/ui/rect.h
similarity index 87%
rename from ruamoko/qwaq/qwaq-rect.h
rename to ruamoko/qwaq/ui/rect.h
index a26f74565..007dcb9e6 100644
--- a/ruamoko/qwaq/qwaq-rect.h
+++ b/ruamoko/qwaq/ui/rect.h
@@ -1,5 +1,5 @@
-#ifndef __qwaq_rect_h
-#define __qwaq_rect_h
+#ifndef __qwaq_ui_rect_h
+#define __qwaq_ui_rect_h
 
 typedef struct Point_s {
 	int         x;
@@ -25,4 +25,4 @@ int rectContainsPoint (Rect rect, Point point);
 Rect clipRect (Rect clipRect, Rect rect);
 #endif
 
-#endif//__qwaq_rect_h
+#endif//__qwaq_ui_rect_h
diff --git a/ruamoko/qwaq/qwaq-rect.r b/ruamoko/qwaq/ui/rect.r
similarity index 98%
rename from ruamoko/qwaq/qwaq-rect.r
rename to ruamoko/qwaq/ui/rect.r
index c2677decc..f2a51cf8d 100644
--- a/ruamoko/qwaq/qwaq-rect.r
+++ b/ruamoko/qwaq/ui/rect.r
@@ -1,4 +1,4 @@
-#include "qwaq-rect.h"
+#include "ui/rect.h"
 
 Rect
 clipRect (Rect clipRect, Rect rect)
diff --git a/ruamoko/qwaq/qwaq-textcontext.h b/ruamoko/qwaq/ui/textcontext.h
similarity index 89%
rename from ruamoko/qwaq/qwaq-textcontext.h
rename to ruamoko/qwaq/ui/textcontext.h
index 2b979c415..898a62c60 100644
--- a/ruamoko/qwaq/qwaq-textcontext.h
+++ b/ruamoko/qwaq/ui/textcontext.h
@@ -1,11 +1,11 @@
-#ifndef __qwaq_textcontect_h
-#define __qwaq_textcontect_h
+#ifndef __qwaq_ui_textcontect_h
+#define __qwaq_ui_textcontect_h
 
 #ifdef __QFCC__
 #include <Object.h>
-#include "qwaq-curses.h"
-#include "qwaq-draw.h"
-#include "qwaq-rect.h"
+#include "ui/curses.h"
+#include "ui/draw.h"
+#include "ui/rect.h"
 
 @class DrawBuffer;
 
@@ -79,4 +79,4 @@ typedef struct qwaq_textcontext_s {
 
 #endif
 
-#endif//__qwaq_textcontect_h
+#endif//__qwaq_ui_textcontect_h
diff --git a/ruamoko/qwaq/qwaq-textcontext.r b/ruamoko/qwaq/ui/textcontext.r
similarity index 98%
rename from ruamoko/qwaq/qwaq-textcontext.r
rename to ruamoko/qwaq/ui/textcontext.r
index 421cdf8eb..6dffaa3e4 100644
--- a/ruamoko/qwaq/qwaq-textcontext.r
+++ b/ruamoko/qwaq/ui/textcontext.r
@@ -1,5 +1,5 @@
-#include "qwaq-draw.h"
-#include "qwaq-textcontext.h"
+#include "ui/draw.h"
+#include "ui/textcontext.h"
 
 @implementation TextContext
 + (int) is_initialized = #0;
diff --git a/ruamoko/qwaq/qwaq-titlebar.h b/ruamoko/qwaq/ui/titlebar.h
similarity index 62%
rename from ruamoko/qwaq/qwaq-titlebar.h
rename to ruamoko/qwaq/ui/titlebar.h
index addfdde4e..b623c52dc 100644
--- a/ruamoko/qwaq/qwaq-titlebar.h
+++ b/ruamoko/qwaq/ui/titlebar.h
@@ -1,7 +1,7 @@
-#ifndef __qwaq_titlebar_h
-#define __qwaq_titlebar_h
+#ifndef __qwaq_ui_titlebar_h
+#define __qwaq_ui_titlebar_h
 
-#include "qwaq-view.h"
+#include "ui/view.h"
 
 @interface TitleBar : View
 {
@@ -13,4 +13,4 @@
 -setTitle:(string) newTitle;
 @end
 
-#endif//__qwaq_titlebar_h
+#endif//__qwaq_ui_titlebar_h
diff --git a/ruamoko/qwaq/qwaq-titlebar.r b/ruamoko/qwaq/ui/titlebar.r
similarity index 90%
rename from ruamoko/qwaq/qwaq-titlebar.r
rename to ruamoko/qwaq/ui/titlebar.r
index 3a5bcfcda..96432280d 100644
--- a/ruamoko/qwaq/qwaq-titlebar.r
+++ b/ruamoko/qwaq/ui/titlebar.r
@@ -1,7 +1,7 @@
 #include <string.h>
 
-#include "qwaq-group.h"
-#include "qwaq-titlebar.h"
+#include "ui/group.h"
+#include "ui/titlebar.h"
 
 @implementation TitleBar
 
diff --git a/ruamoko/qwaq/qwaq-view.h b/ruamoko/qwaq/ui/view.h
similarity index 93%
rename from ruamoko/qwaq/qwaq-view.h
rename to ruamoko/qwaq/ui/view.h
index 052bb2ada..eaa96063b 100644
--- a/ruamoko/qwaq/qwaq-view.h
+++ b/ruamoko/qwaq/ui/view.h
@@ -1,12 +1,12 @@
-#ifndef __qwaq_view_h
-#define __qwaq_view_h
+#ifndef __qwaq_ui_view_h
+#define __qwaq_ui_view_h
 
 #include <Array.h>
 #include <Object.h>
 
-#include "qwaq-draw.h"
-#include "qwaq-rect.h"
-#include "qwaq-textcontext.h"
+#include "ui/draw.h"
+#include "ui/rect.h"
+#include "ui/textcontext.h"
 
 @class Group;
 @class ListenerGroup;
@@ -120,4 +120,4 @@ enum {
 @interface View (TextContext) <TextContext>
 @end
 
-#endif//__qwaq_view_h
+#endif//__qwaq_ui_view_h
diff --git a/ruamoko/qwaq/qwaq-view.r b/ruamoko/qwaq/ui/view.r
similarity index 98%
rename from ruamoko/qwaq/qwaq-view.r
rename to ruamoko/qwaq/ui/view.r
index 8b4077938..e352c8ce3 100644
--- a/ruamoko/qwaq/qwaq-view.r
+++ b/ruamoko/qwaq/ui/view.r
@@ -1,7 +1,7 @@
-#include "qwaq-curses.h"
-#include "qwaq-listener.h"
-#include "qwaq-view.h"
-#include "qwaq-group.h"
+#include "ui/curses.h"
+#include "ui/listener.h"
+#include "ui/view.h"
+#include "ui/group.h"
 
 @implementation View
 
diff --git a/ruamoko/qwaq/qwaq-window.h b/ruamoko/qwaq/ui/window.h
similarity index 81%
rename from ruamoko/qwaq/qwaq-window.h
rename to ruamoko/qwaq/ui/window.h
index a559ed862..bfb25c65a 100644
--- a/ruamoko/qwaq/qwaq-window.h
+++ b/ruamoko/qwaq/ui/window.h
@@ -1,5 +1,5 @@
-#ifndef __qwaq_window_h
-#define __qwaq_window_h
+#ifndef __qwaq_ui_window_h
+#define __qwaq_ui_window_h
 
 #include "Object.h"
 
@@ -7,9 +7,9 @@
 @class Button;
 @class TitleBar;
 
-#include "qwaq-draw.h"
-#include "qwaq-rect.h"
-#include "qwaq-view.h"
+#include "ui/draw.h"
+#include "ui/rect.h"
+#include "ui/view.h"
 
 @interface Window: View
 {
@@ -36,4 +36,4 @@
 -insertSelected: (View *) view;
 @end
 
-#endif//__qwaq_window_h
+#endif//__qwaq_ui_window_h
diff --git a/ruamoko/qwaq/qwaq-window.r b/ruamoko/qwaq/ui/window.r
similarity index 97%
rename from ruamoko/qwaq/qwaq-window.r
rename to ruamoko/qwaq/ui/window.r
index 3741d9acc..e3809bf77 100644
--- a/ruamoko/qwaq/qwaq-window.r
+++ b/ruamoko/qwaq/ui/window.r
@@ -1,14 +1,14 @@
 #include <Array.h>
 #include <string.h>
 
-#include "event.h"
-#include "qwaq-button.h"
-#include "qwaq-curses.h"
-#include "qwaq-group.h"
-#include "qwaq-listener.h"
-#include "qwaq-titlebar.h"
-#include "qwaq-window.h"
-#include "qwaq-view.h"
+#include "ui/event.h"
+#include "ui/button.h"
+#include "ui/curses.h"
+#include "ui/group.h"
+#include "ui/listener.h"
+#include "ui/titlebar.h"
+#include "ui/window.h"
+#include "ui/view.h"
 
 @implementation Window
 

From eccf1cb962bcedea466505030aa728bc88d875ab Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 30 Mar 2020 09:38:22 +0900
Subject: [PATCH 1059/1519] [qwaq] Move the debug builtin bindings

---
 ruamoko/qwaq/Makefile.am         |  1 +
 ruamoko/qwaq/debugger/debug.r    | 24 ++++++++++++++++++++++++
 ruamoko/qwaq/debugger/debugger.r | 23 -----------------------
 3 files changed, 25 insertions(+), 23 deletions(-)
 create mode 100644 ruamoko/qwaq/debugger/debug.r

diff --git a/ruamoko/qwaq/Makefile.am b/ruamoko/qwaq/Makefile.am
index 5bb8f0761..99f59b474 100644
--- a/ruamoko/qwaq/Makefile.am
+++ b/ruamoko/qwaq/Makefile.am
@@ -27,6 +27,7 @@ SUFFIXES=.o .r
 
 qwaq_app_dat_src= \
 	qwaq-app.r	\
+	debugger/debug.r	\
 	debugger/debugger.r	\
 	editor/editbuffer.r	\
 	editor/editor.r	\
diff --git a/ruamoko/qwaq/debugger/debug.r b/ruamoko/qwaq/debugger/debug.r
new file mode 100644
index 000000000..b4175fbbb
--- /dev/null
+++ b/ruamoko/qwaq/debugger/debug.r
@@ -0,0 +1,24 @@
+#include "debugger/debug.h"
+
+void traceon() = #0;
+void traceoff() = #0;
+
+void qdb_set_trace (qdb_target_t target, int state) = #0;
+int qdb_set_breakpoint (qdb_target_t target, unsigned staddr) = #0;
+int qdb_clear_breakpoint (qdb_target_t target, unsigned staddr) = #0;
+int qdb_set_watchpoint (qdb_target_t target, unsigned offset) = #0;
+int qdb_clear_watchpoint (qdb_target_t target) = #0;
+int qdb_continue (qdb_target_t target) = #0;
+qdb_state_t qdb_get_state (qdb_target_t target) = #0;
+int qdb_get_data (qdb_target_t target, unsigned src, unsigned len,
+				  void *dst) = #0;
+string qdb_get_string (qdb_target_t target, unsigned str) = #0;
+qdb_def_t qdb_find_global (qdb_target_t target, string name) = #0;
+qdb_def_t qdb_find_field (qdb_target_t target, string name) = #0;
+qdb_function_t *qdb_find_function (qdb_target_t target, string name) = #0;
+qdb_function_t *qdb_get_function (qdb_target_t target, unsigned fnum) = #0;
+qdb_auxfunction_t *qdb_find_auxfunction (qdb_target_t target,
+										 string name) = #0;
+qdb_auxfunction_t *qdb_get_auxfunction (qdb_target_t target,
+										unsigned fnum) = #0;
+qdb_def_t *qdb_get_local_defs (qdb_target_t target, unsigned fnum) = #0;
diff --git a/ruamoko/qwaq/debugger/debugger.r b/ruamoko/qwaq/debugger/debugger.r
index dde372e36..3948c0b0e 100644
--- a/ruamoko/qwaq/debugger/debugger.r
+++ b/ruamoko/qwaq/debugger/debugger.r
@@ -242,26 +242,3 @@ proxy_event (Debugger *self, id proxy, qwaq_event_t *event)
 }
 
 @end
-
-void traceon() = #0;
-void traceoff() = #0;
-
-void qdb_set_trace (qdb_target_t target, int state) = #0;
-int qdb_set_breakpoint (qdb_target_t target, unsigned staddr) = #0;
-int qdb_clear_breakpoint (qdb_target_t target, unsigned staddr) = #0;
-int qdb_set_watchpoint (qdb_target_t target, unsigned offset) = #0;
-int qdb_clear_watchpoint (qdb_target_t target) = #0;
-int qdb_continue (qdb_target_t target) = #0;
-qdb_state_t qdb_get_state (qdb_target_t target) = #0;
-int qdb_get_data (qdb_target_t target, unsigned src, unsigned len,
-				  void *dst) = #0;
-string qdb_get_string (qdb_target_t target, unsigned str) = #0;
-qdb_def_t qdb_find_global (qdb_target_t target, string name) = #0;
-qdb_def_t qdb_find_field (qdb_target_t target, string name) = #0;
-qdb_function_t *qdb_find_function (qdb_target_t target, string name) = #0;
-qdb_function_t *qdb_get_function (qdb_target_t target, unsigned fnum) = #0;
-qdb_auxfunction_t *qdb_find_auxfunction (qdb_target_t target,
-										 string name) = #0;
-qdb_auxfunction_t *qdb_get_auxfunction (qdb_target_t target,
-										unsigned fnum) = #0;
-qdb_def_t *qdb_get_local_defs (qdb_target_t target, unsigned fnum) = #0;

From ddec80edc1d1b20dbf2063322ffd902da59c9d20 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 30 Mar 2020 11:10:05 +0900
Subject: [PATCH 1060/1519] [qfcc] Make type encoding union anonymous

I'd do more, but things get messy with direct access to unions that I
want to be anonymous.
---
 include/QF/pr_type.h             |  2 +-
 libs/gamecode/pr_debug.c         | 30 +++++++++++------------
 ruamoko/include/types.h          |  2 +-
 tools/qfcc/source/dump_globals.c | 42 ++++++++++++++++----------------
 tools/qfcc/source/dump_lines.c   |  2 +-
 tools/qfcc/source/linker.c       | 10 ++++----
 tools/qfcc/source/obj_file.c     | 40 +++++++++++++++---------------
 tools/qfcc/source/obj_type.c     | 38 ++++++++++++++---------------
 8 files changed, 83 insertions(+), 83 deletions(-)

diff --git a/include/QF/pr_type.h b/include/QF/pr_type.h
index d8c706fae..56915724b 100644
--- a/include/QF/pr_type.h
+++ b/include/QF/pr_type.h
@@ -112,7 +112,7 @@ typedef struct qfot_type_s {
 		qfot_array_t array;			///< ty_array
 		string_t    class;			///< ty_class
 		qfot_alias_t alias;			///< ty_alias
-	}           t;
+	};
 } qfot_type_t;
 
 typedef struct qfot_type_encodings_s {
diff --git a/libs/gamecode/pr_debug.c b/libs/gamecode/pr_debug.c
index dabaf227f..b1b7d217c 100644
--- a/libs/gamecode/pr_debug.c
+++ b/libs/gamecode/pr_debug.c
@@ -215,12 +215,12 @@ pr_debug_type_size (const progs_t *pr, const qfot_type_t *type)
 	qfot_type_t *aux_type;
 	switch (type->meta) {
 		case ty_basic:
-			return pr_type_size[type->t.type];
+			return pr_type_size[type->type];
 		case ty_struct:
 		case ty_union:
 			size = 0;
-			for (pr_int_t i = 0; i < type->t.strct.num_fields; i++) {
-				const qfot_var_t *field = &type->t.strct.fields[i];
+			for (pr_int_t i = 0; i < type->strct.num_fields; i++) {
+				const qfot_var_t *field = &type->strct.fields[i];
 				aux_type = &G_STRUCT (pr, qfot_type_t, field->type);
 				size = max (size,
 							field->offset + pr_debug_type_size (pr, aux_type));
@@ -229,13 +229,13 @@ pr_debug_type_size (const progs_t *pr, const qfot_type_t *type)
 		case ty_enum:
 			return pr_type_size[ev_integer];
 		case ty_array:
-			aux_type = &G_STRUCT (pr, qfot_type_t, type->t.array.type);
+			aux_type = &G_STRUCT (pr, qfot_type_t, type->array.type);
 			size = pr_debug_type_size (pr, aux_type);
-			return type->t.array.size * size;
+			return type->array.size * size;
 		case ty_class:
 			return 1;	//FIXME or should it return sizeof class struct?
 		case ty_alias:
-			aux_type = &G_STRUCT (pr, qfot_type_t, type->t.alias.aux_type);
+			aux_type = &G_STRUCT (pr, qfot_type_t, type->alias.aux_type);
 			return pr_debug_type_size (pr, aux_type);
 	}
 	return 0;
@@ -248,7 +248,7 @@ get_def_type (progs_t *pr, pr_def_t *def, qfot_type_t *type)
 		// no type encoding, so use basic type data to fill in and return
 		// the dummy encoding
 		memset (type, 0, sizeof (*type));
-		type->t.type = def->type;
+		type->type = def->type;
 	} else {
 		type = &G_STRUCT (pr, qfot_type_t, def->type_encoding);
 		if (!def->size) {
@@ -543,8 +543,8 @@ PR_LoadDebug (progs_t *pr)
 			 type_ptr += type->size) {
 			type = &G_STRUCT (pr, qfot_type_t, type_encodings + type_ptr);
 			if (type->meta == ty_basic
-				&& type->t.type >= 0 && type->t.type < ev_type_count) {
-				res->type_encodings[type->t.type] = type;
+				&& type->type >= 0 && type->type < ev_type_count) {
+				res->type_encodings[type->type] = type;
 			}
 		}
 	}
@@ -826,7 +826,7 @@ value_string (pr_debug_data_t *data, qfot_type_t *type, pr_type_t *value)
 {
 	switch (type->meta) {
 		case ty_basic:
-			switch (type->t.type) {
+			switch (type->type) {
 				case ev_void:
 					raw_type_view.void_view (type, value, data);
 					break;
@@ -887,7 +887,7 @@ value_string (pr_debug_data_t *data, qfot_type_t *type, pr_type_t *value)
 			raw_type_view.class_view (type, value, data);
 			break;
 		case ty_alias://XXX
-			type = &G_STRUCT (data->pr, qfot_type_t, type->t.alias.aux_type);
+			type = &G_STRUCT (data->pr, qfot_type_t, type->alias.aux_type);
 			return value_string (data, type, value);
 	}
 	return data->dstr->str;
@@ -928,7 +928,7 @@ global_string (pr_debug_data_t *data, pointer_t offset, qfot_type_t *type,
 
 	dstring_clearstr (dstr);
 
-	if (type && type->meta == ty_basic && type->t.type == ev_short) {
+	if (type && type->meta == ty_basic && type->type == ev_short) {
 		dsprintf (dstr, "%04x", (short) offset);
 		return dstr->str;
 	}
@@ -961,7 +961,7 @@ global_string (pr_debug_data_t *data, pointer_t offset, qfot_type_t *type,
 		if (!type) {
 			if (def) {
 				if (!def->type_encoding) {
-					dummy_type.t.type = def->type;
+					dummy_type.type = def->type;
 					type = &dummy_type;
 				} else {
 					type = &G_STRUCT (pr, qfot_type_t, def->type_encoding);
@@ -1176,7 +1176,7 @@ pr_dump_struct (qfot_type_t *type, pr_type_t *value, void *_data,
 	__auto_type data = (pr_debug_data_t *) _data;
 	progs_t    *pr = data->pr;
 	dstring_t  *dstr = data->dstr;
-	qfot_struct_t *strct = &type->t.strct;
+	qfot_struct_t *strct = &type->strct;
 
 	dstring_appendstr (dstr, "{");
 	for (int i = 0; i < strct->num_fields; i++) {
@@ -1609,7 +1609,7 @@ PR_Debug_Init (progs_t *pr)
 	res->void_type.meta = ty_basic;
 	res->void_type.size = 4;
 	res->void_type.encoding = 0;
-	res->void_type.t.type = ev_void;
+	res->void_type.type = ev_void;
 	for (int i = 0; i < ev_type_count; i++ ) {
 		res->type_encodings[i] = &res->void_type;
 	}
diff --git a/ruamoko/include/types.h b/ruamoko/include/types.h
index c57603ada..530bfad1f 100644
--- a/ruamoko/include/types.h
+++ b/ruamoko/include/types.h
@@ -79,7 +79,7 @@ typedef struct qfot_type_s {
 		qfot_array_t array;
 		string      class;
 		qfot_alias_t alias;
-	}           t;
+	};
 } qfot_type_t;
 
 typedef struct qfot_type_encodings_s {
diff --git a/tools/qfcc/source/dump_globals.c b/tools/qfcc/source/dump_globals.c
index 86a9c1525..49c78fa5d 100644
--- a/tools/qfcc/source/dump_globals.c
+++ b/tools/qfcc/source/dump_globals.c
@@ -548,46 +548,46 @@ dump_qfo_types (qfo_t *qfo, int base_address)
 		}
 		switch ((ty_meta_e) type->meta) {
 			case ty_basic:
-				printf (" %-10s", (type->t.type < 0
-								   || type->t.type >= ev_type_count)
+				printf (" %-10s", (type->type < 0
+								   || type->type >= ev_type_count)
 								  ? "invalid type"
-								  : pr_type_name[type->t.type]);
-				if (type->t.type == ev_func) {
-					printf (" %4x %d", type->t.func.return_type,
-							count = type->t.func.num_params);
+								  : pr_type_name[type->type]);
+				if (type->type == ev_func) {
+					printf (" %4x %d", type->func.return_type,
+							count = type->func.num_params);
 					if (count < 0)
 						count = ~count;	//ones complement
 					for (i = 0; i < count; i++)
-						printf (" %x", type->t.func.param_types[i]);
-				} else if (type->t.type == ev_pointer
-						   || type->t.type == ev_field) {
-					printf (" %4x", type->t.fldptr.aux_type);
+						printf (" %x", type->func.param_types[i]);
+				} else if (type->type == ev_pointer
+						   || type->type == ev_field) {
+					printf (" %4x", type->fldptr.aux_type);
 				}
 				printf ("\n");
 				break;
 			case ty_struct:
 			case ty_union:
 			case ty_enum:
-				printf (" %s\n", QFO_GETSTR (qfo, type->t.strct.tag));
-				for (i = 0; i < type->t.strct.num_fields; i++) {
+				printf (" %s\n", QFO_GETSTR (qfo, type->strct.tag));
+				for (i = 0; i < type->strct.num_fields; i++) {
 					printf ("        %-5x %4x %s\n",
-							type->t.strct.fields[i].type,
-							type->t.strct.fields[i].offset,
-							QFO_GETSTR (qfo, type->t.strct.fields[i].name));
+							type->strct.fields[i].type,
+							type->strct.fields[i].offset,
+							QFO_GETSTR (qfo, type->strct.fields[i].name));
 				}
 				break;
 			case ty_array:
-				printf (" %-5x %d %d\n", type->t.array.type,
-						type->t.array.base, type->t.array.size);
+				printf (" %-5x %d %d\n", type->array.type,
+						type->array.base, type->array.size);
 				break;
 			case ty_class:
-				printf (" %-5x\n", type->t.class);
+				printf (" %-5x\n", type->class);
 				break;
 			case ty_alias:
 				printf (" %s %d %5x %5x\n",
-						QFO_GETSTR (qfo, type->t.alias.name),
-						type->t.alias.type, type->t.alias.aux_type,
-						type->t.alias.full_type);
+						QFO_GETSTR (qfo, type->alias.name),
+						type->alias.type, type->alias.aux_type,
+						type->alias.full_type);
 				break;
 		}
 	}
diff --git a/tools/qfcc/source/dump_lines.c b/tools/qfcc/source/dump_lines.c
index 966203a72..c98bfa0aa 100644
--- a/tools/qfcc/source/dump_lines.c
+++ b/tools/qfcc/source/dump_lines.c
@@ -147,7 +147,7 @@ qfo_set_func_data (qfo_t *qfo, qfo_func_t *func, func_data_t *func_data)
 	func_data->source_line = func->line;
 	//FIXME check type
 	type = QFO_POINTER (qfo, qfo_type_space, qfot_type_t, func->type);
-	func_data->return_type = type->t.func.return_type;
+	func_data->return_type = type->func.return_type;
 	func_data->num_locals = -1;
 	if (func->locals_space < qfo->num_spaces) {
 		func_data->num_locals = qfo->spaces[func->locals_space].num_defs;
diff --git a/tools/qfcc/source/linker.c b/tools/qfcc/source/linker.c
index 14d963b73..51f03f948 100644
--- a/tools/qfcc/source/linker.c
+++ b/tools/qfcc/source/linker.c
@@ -296,11 +296,11 @@ resolve_external_def (defref_t *ext, defref_t *def)
 	}
 	ext_type = WORKTYPE (REF(ext)->type);
 	if (ext_type->meta == ty_alias) {
-		ext_type = WORKTYPE (ext_type->t.alias.aux_type);
+		ext_type = WORKTYPE (ext_type->alias.aux_type);
 	}
 	def_type = WORKTYPE (REF (def)->type);
 	if (def_type->meta == ty_alias) {
-		def_type = WORKTYPE (def_type->t.alias.aux_type);
+		def_type = WORKTYPE (def_type->alias.aux_type);
 	}
 	if (ext_type != def_type) {
 		linker_type_mismatch (REF (ext), REF (def));
@@ -428,7 +428,7 @@ process_type_def (defref_t *ref, qfo_mspace_t *space, qfo_def_t *old)
 		// new address in the encoding's class field so def and function types
 		// can be updated easily.
 		old_type->meta = -1;
-		old_type->t.class = REF (ref)->offset;
+		old_type->class = REF (ref)->offset;
 	}
 }
 
@@ -510,7 +510,7 @@ add_defs (qfo_t *qfo, qfo_mspace_t *space, qfo_mspace_t *dest_space,
 		}
 		// Type encodings have no type (type = 0) so setting the type
 		// to the idef type class has no effect.
-		odef->type = type->t.class;			// pointer to type in work
+		odef->type = type->class;			// pointer to type in work
 		// don't add unused (no attached relocs) external defs to the work
 		// defref list so they will not cause unused object files to be
 		// pulled in from libraries
@@ -920,7 +920,7 @@ process_funcs (qfo_t *qfo)
 	while (work->num_funcs < size) {
 		func = work->funcs + work->num_funcs++;
 		type = QFOTYPE(func->type);
-		func->type = type->t.class;
+		func->type = type->class;
 		func->name = linker_add_string (QFOSTR (qfo, func->name));
 		func->file = linker_add_string (QFOSTR (qfo, func->file));
 		if (func->code > 0)
diff --git a/tools/qfcc/source/obj_file.c b/tools/qfcc/source/obj_file.c
index be76f06c4..b6e3e6f82 100644
--- a/tools/qfcc/source/obj_file.c
+++ b/tools/qfcc/source/obj_file.c
@@ -653,7 +653,7 @@ get_def_type (qfo_t *qfo, pointer_t type)
 		case ty_basic:
 			// field, pointer and function types store their basic type in
 			// the same location.
-			return type_def->t.type;
+			return type_def->type;
 		case ty_struct:
 		case ty_union:
 			return ev_invalid;
@@ -678,19 +678,19 @@ get_type_size (qfo_t *qfo, pointer_t type)
 	type_def = QFO_POINTER (qfo, qfo_type_space, qfot_type_t, type);
 	switch ((ty_meta_e)type_def->meta) {
 		case ty_alias:
-			return get_type_size (qfo, type_def->t.alias.aux_type);
+			return get_type_size (qfo, type_def->alias.aux_type);
 		case ty_basic:
 			// field, pointer and function types store their basic type in
 			// the same location.
-			return pr_type_size[type_def->t.type];
+			return pr_type_size[type_def->type];
 		case ty_struct:
-			for (i = size = 0; i < type_def->t.strct.num_fields; i++)
-				size += get_type_size (qfo, type_def->t.strct.fields[i].type);
+			for (i = size = 0; i < type_def->strct.num_fields; i++)
+				size += get_type_size (qfo, type_def->strct.fields[i].type);
 			return size;
 		case ty_union:
-			for (i = size = 0; i < type_def->t.strct.num_fields; i++) {
+			for (i = size = 0; i < type_def->strct.num_fields; i++) {
 				int         s;
-				s = get_type_size (qfo, type_def->t.strct.fields[i].type);
+				s = get_type_size (qfo, type_def->strct.fields[i].type);
 				if (s > size)
 					size = s;
 			}
@@ -698,8 +698,8 @@ get_type_size (qfo_t *qfo, pointer_t type)
 		case ty_enum:
 			return pr_type_size[ev_integer];
 		case ty_array:
-			return type_def->t.array.size
-					* get_type_size (qfo, type_def->t.array.type);
+			return type_def->array.size
+					* get_type_size (qfo, type_def->array.type);
 		case ty_class:
 			return 0;	// FIXME
 	}
@@ -728,15 +728,15 @@ get_type_alignment_log (qfo_t *qfo, pointer_t type)
 	type_def = QFO_POINTER (qfo, qfo_type_space, qfot_type_t, type);
 	switch ((ty_meta_e)type_def->meta) {
 		case ty_alias:
-			return get_type_alignment_log (qfo, type_def->t.alias.aux_type);
+			return get_type_alignment_log (qfo, type_def->alias.aux_type);
 		case ty_basic:
 			// field, pointer and function types store their basic type in
 			// the same location.
-			return qfo_log2 (ev_types[type_def->t.type]->alignment);
+			return qfo_log2 (ev_types[type_def->type]->alignment);
 		case ty_struct:
 		case ty_union:
-			for (i = alignment = 0; i < type_def->t.strct.num_fields; i++) {
-				qfot_var_t *field = type_def->t.strct.fields + i;
+			for (i = alignment = 0; i < type_def->strct.num_fields; i++) {
+				qfot_var_t *field = type_def->strct.fields + i;
 				int         a;
 				a = get_type_alignment_log (qfo, field->type);
 				if (a > alignment) {
@@ -747,7 +747,7 @@ get_type_alignment_log (qfo_t *qfo, pointer_t type)
 		case ty_enum:
 			return qfo_log2 (ev_types[ev_integer]->alignment);
 		case ty_array:
-			return get_type_alignment_log (qfo, type_def->t.array.type);
+			return get_type_alignment_log (qfo, type_def->array.type);
 		case ty_class:
 			return 0;	// FIXME
 	}
@@ -776,15 +776,15 @@ function_params (qfo_t *qfo, qfo_func_t *func, dfunction_t *df)
 	type = QFO_POINTER (qfo, qfo_type_space, qfot_type_t, func->type);
 	if (type->meta == ty_alias) {
 		type = QFO_POINTER (qfo, qfo_type_space, qfot_type_t,
-							type->t.alias.aux_type);
+							type->alias.aux_type);
 	}
-	if (type->meta != ty_basic || type->t.type != ev_func)
+	if (type->meta != ty_basic || type->type != ev_func)
 		return;
-	df->numparms = num_params = type->t.func.num_params;
+	df->numparms = num_params = type->func.num_params;
 	if (num_params < 0)
 		num_params = ~num_params;
 	for (i = 0; i < num_params; i++) {
-		df->parm_size[i] = get_parmsize (qfo, type->t.func.param_types[i]);
+		df->parm_size[i] = get_parmsize (qfo, type->func.param_types[i]);
 	}
 }
 
@@ -1234,9 +1234,9 @@ qfo_to_sym (qfo_t *qfo, int *size)
 		type = QFO_POINTER (qfo, qfo_type_space, qfot_type_t, func->type);
 		if (type->meta == ty_alias) {
 			type = QFO_POINTER (qfo, qfo_type_space, qfot_type_t,
-								type->t.alias.aux_type);
+								type->alias.aux_type);
 		}
-		aux->return_type = type->t.func.return_type;
+		aux->return_type = type->func.return_type;
 		aux++;
 	}
 	memcpy (linenos, qfo->lines, qfo->num_lines * sizeof (pr_lineno_t));
diff --git a/tools/qfcc/source/obj_type.c b/tools/qfcc/source/obj_type.c
index 78d7fc868..6838c0824 100644
--- a/tools/qfcc/source/obj_type.c
+++ b/tools/qfcc/source/obj_type.c
@@ -80,7 +80,7 @@ qfo_new_encoding (type_t *type, int size, defspace_t *space)
 	qfot_type_t *enc;
 	def_t      *def;
 
-	size += sizeof (qfot_type_t) - sizeof (enc->t);
+	size += field_offset (qfot_type_t, type);
 	size /= sizeof (pr_type_t);
 
 	def = new_def (type->encoding, 0, space, sc_static);
@@ -117,7 +117,7 @@ qfo_encode_func (type_t *type, defspace_t *space)
 
 	def = qfo_new_encoding (type, size, space);
 	enc = D_POINTER (qfot_type_t, def);
-	func = &enc->t.func;
+	func = &enc->func;
 	func->type = ev_func;
 	ENC_DEF (func->return_type, return_type_def);
 	func->num_params = type->t.func.num_params;
@@ -134,10 +134,10 @@ qfo_encode_fldptr (type_t *type, defspace_t *space)
 	def_t      *type_def;
 
 	type_def = qfo_encode_type (type->t.fldptr.type, space);
-	def = qfo_new_encoding (type, sizeof (enc->t.fldptr), space);
+	def = qfo_new_encoding (type, sizeof (enc->fldptr), space);
 	enc = D_POINTER (qfot_type_t, def);
-	enc->t.fldptr.type = type->type;
-	ENC_DEF (enc->t.fldptr.aux_type, type_def);
+	enc->fldptr.type = type->type;
+	ENC_DEF (enc->fldptr.aux_type, type_def);
 	return def;
 }
 
@@ -152,9 +152,9 @@ qfo_encode_basic (type_t *type, defspace_t *space)
 	else if (type->type == ev_pointer || type->type == ev_field)
 		return qfo_encode_fldptr (type, space);
 
-	def = qfo_new_encoding (type, sizeof (enc->t.type), space);
+	def = qfo_new_encoding (type, sizeof (enc->type), space);
 	enc = D_POINTER (qfot_type_t, def);
-	enc->t.type = type->type;
+	enc->type = type->type;
 	return def;
 }
 
@@ -188,7 +188,7 @@ qfo_encode_struct (type_t *type, defspace_t *space)
 	size = field_offset (qfot_struct_t, fields[num_fields]);
 	def = qfo_new_encoding (type, size, space);
 	enc = D_POINTER (qfot_type_t, def);
-	strct = &enc->t.strct;
+	strct = &enc->strct;
 	ENC_STR (strct->tag, type->name);
 	strct->num_fields = num_fields;
 
@@ -234,11 +234,11 @@ qfo_encode_array (type_t *type, defspace_t *space)
 
 	array_type_def = qfo_encode_type (type->t.array.type, space);
 
-	def = qfo_new_encoding (type, sizeof (enc->t.array), space);
+	def = qfo_new_encoding (type, sizeof (enc->array), space);
 	enc = D_POINTER (qfot_type_t, def);
-	ENC_DEF (enc->t.array.type, array_type_def);
-	enc->t.array.base = type->t.array.base;
-	enc->t.array.size = type->t.array.size;
+	ENC_DEF (enc->array.type, array_type_def);
+	enc->array.base = type->t.array.base;
+	enc->array.size = type->t.array.size;
 	return def;
 }
 
@@ -248,9 +248,9 @@ qfo_encode_class (type_t *type, defspace_t *space)
 	qfot_type_t *enc;
 	def_t      *def;
 
-	def = qfo_new_encoding (type, sizeof (enc->t.class), space);
+	def = qfo_new_encoding (type, sizeof (enc->class), space);
 	enc = D_POINTER (qfot_type_t, def);
-	ENC_STR (enc->t.class, type->t.class->name);
+	ENC_STR (enc->class, type->t.class->name);
 	return def;
 }
 
@@ -265,13 +265,13 @@ qfo_encode_alias (type_t *type, defspace_t *space)
 	type_def = qfo_encode_type (type->t.alias.aux_type, space);
 	full_def = qfo_encode_type (type->t.alias.full_type, space);
 
-	def = qfo_new_encoding (type, sizeof (enc->t.alias), space);
+	def = qfo_new_encoding (type, sizeof (enc->alias), space);
 	enc = D_POINTER (qfot_type_t, def);
-	enc->t.alias.type = type->type;
-	ENC_DEF (enc->t.alias.aux_type, type_def);
-	ENC_DEF (enc->t.alias.full_type, full_def);
+	enc->alias.type = type->type;
+	ENC_DEF (enc->alias.aux_type, type_def);
+	ENC_DEF (enc->alias.full_type, full_def);
 	if (type->name) {
-		ENC_STR (enc->t.alias.name, type->name);
+		ENC_STR (enc->alias.name, type->name);
 	}
 	return def;
 }

From 1c13339bbec605ff1a490460e7b1dc7154a323e3 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 30 Mar 2020 12:43:02 +0900
Subject: [PATCH 1061/1519] [qwaq] Create a type encoding class

For now it just manages type encodings via their encoding string,
ensuring types are fetched from the target only once, if at all (may
already have the type due to it being common).
---
 ruamoko/include/types.h               |   3 +
 ruamoko/qwaq/Makefile.am              |   1 +
 ruamoko/qwaq/builtins/curses.c        |   2 +-
 ruamoko/qwaq/builtins/debug.c         |   3 +-
 ruamoko/qwaq/debugger/debug.h         |   5 +-
 ruamoko/qwaq/debugger/debug.r         |   1 +
 ruamoko/qwaq/debugger/debugger.h      |   6 +-
 ruamoko/qwaq/debugger/debugger.r      |  40 ++++---
 ruamoko/qwaq/debugger/typeencodings.h |  13 +++
 ruamoko/qwaq/debugger/typeencodings.r | 146 ++++++++++++++++++++++++++
 ruamoko/qwaq/qwaq-app.r               |   2 +-
 11 files changed, 199 insertions(+), 23 deletions(-)
 create mode 100644 ruamoko/qwaq/debugger/typeencodings.h
 create mode 100644 ruamoko/qwaq/debugger/typeencodings.r

diff --git a/ruamoko/include/types.h b/ruamoko/include/types.h
index 530bfad1f..a1527d890 100644
--- a/ruamoko/include/types.h
+++ b/ruamoko/include/types.h
@@ -82,6 +82,9 @@ typedef struct qfot_type_s {
 	};
 } qfot_type_t;
 
+// the minimum size of a type encoding
+#define TYPESIZE 4
+
 typedef struct qfot_type_encodings_s {
 	qfot_type_t *types;
 	int         size;
diff --git a/ruamoko/qwaq/Makefile.am b/ruamoko/qwaq/Makefile.am
index 99f59b474..ab3b5459b 100644
--- a/ruamoko/qwaq/Makefile.am
+++ b/ruamoko/qwaq/Makefile.am
@@ -29,6 +29,7 @@ qwaq_app_dat_src= \
 	qwaq-app.r	\
 	debugger/debug.r	\
 	debugger/debugger.r	\
+	debugger/typeencodings.r	\
 	editor/editbuffer.r	\
 	editor/editor.r	\
 	ui/button.r	\
diff --git a/ruamoko/qwaq/builtins/curses.c b/ruamoko/qwaq/builtins/curses.c
index f4db018a0..3f757b124 100644
--- a/ruamoko/qwaq/builtins/curses.c
+++ b/ruamoko/qwaq/builtins/curses.c
@@ -618,7 +618,7 @@ cmd_mvwhline (qwaq_resources_t *res)
 static void
 dump_command (qwaq_resources_t *res, int len)
 {
-	if (1) {
+	if (0) {
 		qwaq_commands cmd = RB_PEEK_DATA (res->command_queue, 0);
 		Sys_Printf ("%s[%d]", qwaq_command_names[cmd], len);
 		for (int i = 2; i < len; i++) {
diff --git a/ruamoko/qwaq/builtins/debug.c b/ruamoko/qwaq/builtins/debug.c
index c1835f99d..218a953cb 100644
--- a/ruamoko/qwaq/builtins/debug.c
+++ b/ruamoko/qwaq/builtins/debug.c
@@ -506,7 +506,8 @@ static builtin_t builtins[] = {
 	{"qdb_continue",			qdb_continue,			-1},
 	{"qdb_get_state",			qdb_get_state,			-1},
 	{"qdb_get_data",			qdb_get_data,			-1},
-	{"qdb_get_string",			qdb_get_string,			-1},
+	{"qdb_get_string|{tag qdb_target_s=}i",	qdb_get_string,	-1},
+	{"qdb_get_string|{tag qdb_target_s=}*",	qdb_get_string,	-1},
 	{"qdb_find_global",			qdb_find_global,		-1},
 	{"qdb_find_field",			qdb_find_field,			-1},
 	{"qdb_find_function",		qdb_find_function,		-1},
diff --git a/ruamoko/qwaq/debugger/debug.h b/ruamoko/qwaq/debugger/debug.h
index 74ebf1c39..161014b84 100644
--- a/ruamoko/qwaq/debugger/debug.h
+++ b/ruamoko/qwaq/debugger/debug.h
@@ -63,7 +63,10 @@ int qdb_clear_watchpoint (qdb_target_t target);
 int qdb_continue (qdb_target_t target);
 qdb_state_t qdb_get_state (qdb_target_t target);
 int qdb_get_data (qdb_target_t target, unsigned src, unsigned len, void *dst);
-string qdb_get_string (qdb_target_t target, unsigned str);
+@overload string qdb_get_string (qdb_target_t target, unsigned str);
+// note: str is likely not valid in the host progs, it's just a convinience to
+// avoid cast shenanigans when getting type encoding strings
+@overload string qdb_get_string (qdb_target_t target, string str);
 qdb_def_t qdb_find_global (qdb_target_t target, string name);
 qdb_def_t qdb_find_field (qdb_target_t target, string name);
 qdb_function_t *qdb_find_function (qdb_target_t target, string name);
diff --git a/ruamoko/qwaq/debugger/debug.r b/ruamoko/qwaq/debugger/debug.r
index b4175fbbb..7ad286cf7 100644
--- a/ruamoko/qwaq/debugger/debug.r
+++ b/ruamoko/qwaq/debugger/debug.r
@@ -13,6 +13,7 @@ qdb_state_t qdb_get_state (qdb_target_t target) = #0;
 int qdb_get_data (qdb_target_t target, unsigned src, unsigned len,
 				  void *dst) = #0;
 string qdb_get_string (qdb_target_t target, unsigned str) = #0;
+string qdb_get_string (qdb_target_t target, string str) = #0;
 qdb_def_t qdb_find_global (qdb_target_t target, string name) = #0;
 qdb_def_t qdb_find_field (qdb_target_t target, string name) = #0;
 qdb_function_t *qdb_find_function (qdb_target_t target, string name) = #0;
diff --git a/ruamoko/qwaq/debugger/debugger.h b/ruamoko/qwaq/debugger/debugger.h
index 2fc402291..04a6a3354 100644
--- a/ruamoko/qwaq/debugger/debugger.h
+++ b/ruamoko/qwaq/debugger/debugger.h
@@ -1,6 +1,7 @@
 #ifndef __qwaq_debugger_debugger_h
 #define __qwaq_debugger_debugger_h
 
+#include <types.h>
 #include <Object.h>
 
 #include "debugger/debug.h"
@@ -12,7 +13,8 @@
 
 @interface Debugger : Object
 {
-	qdb_target_t debug_target;
+	qdb_target_t target;
+	qfot_type_encodings_t target_encodings;
 
 	Window     *source_window;
 	ProxyView  *file_proxy;
@@ -28,7 +30,7 @@
 	qdb_def_t  *local_defs;
 	void       *local_data;
 }
--(qdb_target_t)debug_target;
+-(qdb_target_t)target;
 -initWithTarget:(qdb_target_t) target;
 -handleDebugEvent;
 @end
diff --git a/ruamoko/qwaq/debugger/debugger.r b/ruamoko/qwaq/debugger/debugger.r
index 3948c0b0e..44075babf 100644
--- a/ruamoko/qwaq/debugger/debugger.r
+++ b/ruamoko/qwaq/debugger/debugger.r
@@ -8,13 +8,14 @@
 #include "ui/proxyview.h"
 #include "ui/window.h"
 #include "debugger/debugger.h"
+#include "debugger/typeencodings.h"
 #include "editor/editor.h"
 #include "qwaq-app.h"
 
 @implementation Debugger
--(qdb_target_t)debug_target
+-(qdb_target_t)target
 {
-	return debug_target;
+	return target;
 }
 
 -initWithTarget:(qdb_target_t) target
@@ -22,12 +23,15 @@
 	if (!(self = [super init])) {
 		return nil;
 	}
-	debug_target = target;
+	self.target = target;
 
 	files = [[Array array] retain];
 	source_window = [[Window alloc] initWithRect: {nil, [application size]}];
 	[application addView:source_window];
 
+	qdb_def_t   encodings_def = qdb_find_global (target, ".type_encodings");
+	qdb_get_data (target, encodings_def.offset, sizeof(target_encodings),
+				  &target_encodings);
 	return self;
 }
 
@@ -50,7 +54,7 @@
 
 -(void) setup
 {
-	qdb_state_t state = qdb_get_state (debug_target);
+	qdb_state_t state = qdb_get_state (target);
 
 	current_file = [self find_file: state.file];
 	file_proxy = [[ProxyView alloc] initWithView: current_file];
@@ -75,7 +79,7 @@
 
 -(void) show_line
 {
-	qdb_state_t state = qdb_get_state (debug_target);
+	qdb_state_t state = qdb_get_state (target);
 	Editor     *file = [self find_file: state.file];
 
 	printf ("%s:%d\n", state.file, state.line);
@@ -104,10 +108,10 @@ update_current_func (Debugger *self, unsigned fnum)
 	if (self.local_data) {
 		obj_free (self.local_data);
 	}
-	self.func = qdb_get_function (self.debug_target, fnum);
-	self.aux_func = qdb_get_auxfunction (self.debug_target, fnum);
+	self.func = qdb_get_function (self.target, fnum);
+	self.aux_func = qdb_get_auxfunction (self.target, fnum);
 	if (self.aux_func) {
-		self.local_defs = qdb_get_local_defs (self.debug_target, fnum);
+		self.local_defs = qdb_get_local_defs (self.target, fnum);
 	}
 	if (self.func) {
 		self.local_data = obj_malloc (self.func.local_size);
@@ -116,14 +120,14 @@ update_current_func (Debugger *self, unsigned fnum)
 
 -(void)update_watchvars
 {
-	qdb_state_t state = qdb_get_state (debug_target);
+	qdb_state_t state = qdb_get_state (target);
 	if (state.func != current_fnum) {
 		update_current_func (self, state.func);
 	}
 	if (!local_data) {
 		return;
 	}
-	qdb_get_data (debug_target, func.local_data, func.local_size, local_data);
+	qdb_get_data (target, func.local_data, func.local_size, local_data);
 	[locals_view clear];
 	if (!local_defs) {
 		[locals_view mvprintf:{0,0}, "%d", func.local_size];
@@ -145,23 +149,25 @@ update_current_func (Debugger *self, unsigned fnum)
 				break;
 			}
 			qdb_def_t *def = local_defs + y;
+			unsigned    te = def.type_encoding + (int) target_encodings.types;
+			qfot_type_t *type;
+			type = [TypeEncodings getType:te fromTarget:target];
 			[locals_view mvprintf:{0, y}, "%s",
-								  qdb_get_string (debug_target, def.name)];
+								  qdb_get_string (target, def.name)];
 			@param      value = nil;
 			string      valstr = "--";
 			unsigned    offset = func.local_data + def.offset;
 			printf ("%d %d %s %d\n", def.type_size, offset,
-					qdb_get_string (debug_target, def.name),
+					qdb_get_string (target, def.name),
 					def.type_encoding);
-			qdb_get_data (debug_target, offset, def.type_size >> 16,
-						  &value);
+			qdb_get_data (target, offset, def.type_size >> 16, &value);
 			switch (def.type_size & 0xffff) {
 				case ev_void:
 				case ev_invalid:
 				case ev_type_count:
 					break;
 				case ev_string:
-					valstr = qdb_get_string (debug_target, value.integer_val);
+					valstr = qdb_get_string (target, value.integer_val);
 					break;
 				case ev_float:
 					valstr = sprintf ("%.9g", value.float_val);
@@ -216,8 +222,8 @@ proxy_event (Debugger *self, id proxy, qwaq_event_t *event)
 	} else if (event.what == qe_keydown) {
 		switch (event.key.code) {
 			case QFK_F7:
-				qdb_set_trace (self.debug_target, 1);
-				qdb_continue (self.debug_target);
+				qdb_set_trace (self.target, 1);
+				qdb_continue (self.target);
 				return 1;
 		}
 	}
diff --git a/ruamoko/qwaq/debugger/typeencodings.h b/ruamoko/qwaq/debugger/typeencodings.h
new file mode 100644
index 000000000..213dad8a7
--- /dev/null
+++ b/ruamoko/qwaq/debugger/typeencodings.h
@@ -0,0 +1,13 @@
+#ifndef __qwaq_debugger_typeencodings_h
+#define __qwaq_debugger_typeencodings_h
+
+#include <types.h>
+#include <Object.h>
+
+#include "debugger/debug.h"
+
+@interface TypeEncodings : Object
++(qfot_type_t *)getType:(unsigned)typeAddr fromTarget:(qdb_target_t)target;
+@end
+
+#endif//__qwaq_debugger_typeencodings_h
diff --git a/ruamoko/qwaq/debugger/typeencodings.r b/ruamoko/qwaq/debugger/typeencodings.r
new file mode 100644
index 000000000..30ff48181
--- /dev/null
+++ b/ruamoko/qwaq/debugger/typeencodings.r
@@ -0,0 +1,146 @@
+#include <runtime.h>
+#include <hash.h>
+#include <string.h>
+#include <ui/curses.h>	// printf FIXME
+
+#include "debugger/typeencodings.h"
+
+@implementation TypeEncodings
+
+// these are encodings that we already have so don't need to copy them from
+// the target
+static hashtab_t *static_encodings;
+// these are condings that had to be copied from the target
+static hashtab_t *dynamic_encodings;
+
+static qfot_type_t *
+next_type (qfot_type_t *type)
+{
+    int         size = type.size;
+
+	if (!size) {	// null type
+		size = TYPESIZE;
+	}
+	return (qfot_type_t *) ((int *) type + size);
+}
+
+static string
+type_get_key (void *t, void *unusded)
+{
+	qfot_type_t *type = (qfot_type_t *) t;
+	return type.encoding;
+}
+
+static void type_free (void *t, void *unused)
+{
+	qfot_type_t *type = (qfot_type_t *) t;
+	str_free (type.encoding);
+	switch (type.meta) {
+		case ty_basic:
+		case ty_array:
+			break;
+		case ty_struct:
+		case ty_union:
+		case ty_enum:
+			str_free (type.strct.tag);
+			for (int i = 0; i < type.strct.num_fields; i++) {
+				str_free (type.strct.fields[i].name);
+			}
+			break;
+		case ty_class:
+			str_free (type.class);
+			break;
+		case ty_alias:
+			str_free (type.alias.name);
+			break;
+	}
+	obj_free (t);
+}
+
++initialize
+{
+	qfot_type_encodings_t *encodings;
+	qfot_type_t *type;
+
+	static_encodings = Hash_NewTable (1023, type_get_key, nil, nil);
+	dynamic_encodings = Hash_NewTable (1023, type_get_key, type_free, nil);
+
+	encodings = PR_FindGlobal (".type_encodings");
+	for (type = encodings.types;
+		 ((int *)type - (int *) encodings.types) < encodings.size;
+		 type = next_type (type)) {
+		printf ("%s\n", type.encoding);
+		Hash_Add (static_encodings, type);
+	}
+	return self;
+}
+
++(qfot_type_t *) getType:(unsigned)typeAddr fromTarget:(qdb_target_t)target
+{
+	qfot_type_t  buffer = {};
+	string       encoding;
+	qfot_type_t *type;
+
+	if (!qdb_get_data (target, typeAddr, TYPESIZE, &buffer)) {
+		return nil;
+	}
+	if (!buffer.encoding) {
+		return nil;
+	}
+	encoding = qdb_get_string (target, buffer.encoding);
+	if (!encoding) {
+		return nil;
+	}
+	if ((type = Hash_Find (static_encodings, encoding))) {
+		return type;
+	}
+	if ((type = Hash_Find (dynamic_encodings, encoding))) {
+		return type;
+	}
+	type = obj_calloc (1, buffer.size);
+	if (!qdb_get_data (target, typeAddr, TYPESIZE, &buffer)) {
+		goto error;
+	}
+	if (!(type.encoding = qdb_get_string (target, type.encoding))) {
+		goto error;
+	}
+	switch (type.meta) {
+		case ty_basic:
+		case ty_array:
+			goto hash_type;
+		case ty_struct:
+		case ty_union:
+		case ty_enum:
+			if (!(type.strct.tag = qdb_get_string (target, type.strct.tag))) {
+				goto error;
+			}
+			for (int i = 0; i < type.strct.num_fields; i++) {
+				qfot_var_t *var = &type.strct.fields[i];
+				if (!(var.name = qdb_get_string (target, var.name))) {
+					goto error;
+				}
+			}
+			goto hash_type;
+		case ty_class:
+			if (!(type.class = qdb_get_string (target, type.class))) {
+				goto error;
+			}
+			goto hash_type;
+		case ty_alias:
+			if (!(type.alias.name = qdb_get_string (target, type.alias.name))) {
+				goto error;
+			}
+			goto hash_type;
+	}
+	goto error;
+hash_type:
+	printf ("fetched type %s\n", type.encoding);
+	Hash_Add (dynamic_encodings, type);
+	return type;
+	// not a valid type
+error:
+	type_free (type, nil);
+	return nil;
+}
+
+@end
diff --git a/ruamoko/qwaq/qwaq-app.r b/ruamoko/qwaq/qwaq-app.r
index 19daf643a..a17312ead 100644
--- a/ruamoko/qwaq/qwaq-app.r
+++ b/ruamoko/qwaq/qwaq-app.r
@@ -80,7 +80,7 @@ arp_end (void)
 
 	for (int i = [debuggers count]; i-- > 0; ) {
 		debugger = [debuggers objectAtIndex: i];
-		if ([debugger debug_target].handle == target.handle) {
+		if ([debugger target].handle == target.handle) {
 			return debugger;
 		}
 	}

From 6d3fadfe6ebbe785269e202a415cac62b177a21b Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 30 Mar 2020 13:42:31 +0900
Subject: [PATCH 1062/1519] [qwaq] Move local defs viewer to its own class

While trying to build a view without deriving from it was a neat idea,
it doesn't work so well because a view really needs to know how to draw
itself. This even fixes the segfault when stepping past the end of the
program.
---
 ruamoko/qwaq/Makefile.am           |   1 +
 ruamoko/qwaq/debugger/debugger.h   |  10 +-
 ruamoko/qwaq/debugger/debugger.r   | 121 +-----------------------
 ruamoko/qwaq/debugger/localsview.h |  22 +++++
 ruamoko/qwaq/debugger/localsview.r | 142 +++++++++++++++++++++++++++++
 5 files changed, 171 insertions(+), 125 deletions(-)
 create mode 100644 ruamoko/qwaq/debugger/localsview.h
 create mode 100644 ruamoko/qwaq/debugger/localsview.r

diff --git a/ruamoko/qwaq/Makefile.am b/ruamoko/qwaq/Makefile.am
index ab3b5459b..d124b732a 100644
--- a/ruamoko/qwaq/Makefile.am
+++ b/ruamoko/qwaq/Makefile.am
@@ -29,6 +29,7 @@ qwaq_app_dat_src= \
 	qwaq-app.r	\
 	debugger/debug.r	\
 	debugger/debugger.r	\
+	debugger/localsview.r	\
 	debugger/typeencodings.r	\
 	editor/editbuffer.r	\
 	editor/editor.r	\
diff --git a/ruamoko/qwaq/debugger/debugger.h b/ruamoko/qwaq/debugger/debugger.h
index 04a6a3354..d43ad990c 100644
--- a/ruamoko/qwaq/debugger/debugger.h
+++ b/ruamoko/qwaq/debugger/debugger.h
@@ -5,6 +5,7 @@
 #include <Object.h>
 
 #include "debugger/debug.h"
+#include "debugger/localsview.h"
 
 @class ProxyView;
 @class Editor;
@@ -14,7 +15,6 @@
 @interface Debugger : Object
 {
 	qdb_target_t target;
-	qfot_type_encodings_t target_encodings;
 
 	Window     *source_window;
 	ProxyView  *file_proxy;
@@ -22,13 +22,7 @@
 	Editor     *current_file;
 
 	Window     *locals_window;
-	View       *locals_view;
-
-	unsigned    current_fnum;
-	qdb_function_t *func;
-	qdb_auxfunction_t *aux_func;
-	qdb_def_t  *local_defs;
-	void       *local_data;
+	LocalsView *locals_view;
 }
 -(qdb_target_t)target;
 -initWithTarget:(qdb_target_t) target;
diff --git a/ruamoko/qwaq/debugger/debugger.r b/ruamoko/qwaq/debugger/debugger.r
index 44075babf..4d1249702 100644
--- a/ruamoko/qwaq/debugger/debugger.r
+++ b/ruamoko/qwaq/debugger/debugger.r
@@ -29,9 +29,6 @@
 	source_window = [[Window alloc] initWithRect: {nil, [application size]}];
 	[application addView:source_window];
 
-	qdb_def_t   encodings_def = qdb_find_global (target, ".type_encodings");
-	qdb_get_data (target, encodings_def.offset, sizeof(target_encodings),
-				  &target_encodings);
 	return self;
 }
 
@@ -68,9 +65,8 @@
 	locals_window = [[Window alloc] initWithRect: {{0, 0}, {40, 10}}];
 	[locals_window setBackground: color_palette[064]];
 	[locals_window setTitle: "Locals"];
-	locals_view = [[View alloc] initWithRect: {{1, 1}, {38, 8}}
-									 options: ofCanFocus];
-	[locals_view setGrowMode:gfGrowHi];
+	locals_view = [[LocalsView alloc] initWithRect: {{1, 1}, {38, 8}}
+											target: target];
 	[locals_window insertSelected: locals_view];
 	[application addView: locals_window];
 
@@ -94,120 +90,11 @@
 	[source_window redraw];
 }
 
-static void
-update_current_func (Debugger *self, unsigned fnum)
-{
-	self.current_fnum = fnum;
-	if (self.aux_func) {
-		obj_free (self.aux_func);
-		self.aux_func = nil;
-	}
-	if (self.local_defs) {
-		obj_free (self.local_defs);
-	}
-	if (self.local_data) {
-		obj_free (self.local_data);
-	}
-	self.func = qdb_get_function (self.target, fnum);
-	self.aux_func = qdb_get_auxfunction (self.target, fnum);
-	if (self.aux_func) {
-		self.local_defs = qdb_get_local_defs (self.target, fnum);
-	}
-	if (self.func) {
-		self.local_data = obj_malloc (self.func.local_size);
-	}
-}
-
 -(void)update_watchvars
 {
 	qdb_state_t state = qdb_get_state (target);
-	if (state.func != current_fnum) {
-		update_current_func (self, state.func);
-	}
-	if (!local_data) {
-		return;
-	}
-	qdb_get_data (target, func.local_data, func.local_size, local_data);
-	[locals_view clear];
-	if (!local_defs) {
-		[locals_view mvprintf:{0,0}, "%d", func.local_size];
-		for (int y = 1; y < [locals_view size].height; y++) {
-			unsigned    ind = (y - 1) * 4;
-			if (ind < func.local_size) {
-				[locals_view mvprintf:{0, y}, "%02x", ind];
-				for (int x = 0; x < 4 && ind < func.local_size; x++, ind++) {
-					[locals_view mvprintf:{x * 9 + 3, y}, "%08x",
-										  local_data[ind]];
-				}
-			} else {
-				break;
-			}
-		}
-	} else {
-		for (int y = 0; y < [locals_view size].height; y++) {
-			if (y >= aux_func.num_locals) {
-				break;
-			}
-			qdb_def_t *def = local_defs + y;
-			unsigned    te = def.type_encoding + (int) target_encodings.types;
-			qfot_type_t *type;
-			type = [TypeEncodings getType:te fromTarget:target];
-			[locals_view mvprintf:{0, y}, "%s",
-								  qdb_get_string (target, def.name)];
-			@param      value = nil;
-			string      valstr = "--";
-			unsigned    offset = func.local_data + def.offset;
-			printf ("%d %d %s %d\n", def.type_size, offset,
-					qdb_get_string (target, def.name),
-					def.type_encoding);
-			qdb_get_data (target, offset, def.type_size >> 16, &value);
-			switch (def.type_size & 0xffff) {
-				case ev_void:
-				case ev_invalid:
-				case ev_type_count:
-					break;
-				case ev_string:
-					valstr = qdb_get_string (target, value.integer_val);
-					break;
-				case ev_float:
-					valstr = sprintf ("%.9g", value.float_val);
-					break;
-				case ev_vector:
-					valstr = sprintf ("%.9v", value.vector_val);
-					break;
-				case ev_entity:
-					valstr = sprintf ("%e", value.entity_val);
-					break;
-				case ev_field:
-					valstr = sprintf ("[%x]", value.field_val);
-					break;
-				case ev_func:
-					valstr = sprintf ("[%x]", value.func_val);
-					break;
-				case ev_pointer:
-					valstr = sprintf ("[%x]", value.pointer_val);
-					break;
-				case ev_quat:
-					valstr = sprintf ("[%q]", value.quaternion_val);
-					break;
-				case ev_integer:
-					valstr = sprintf ("%d", value.integer_val);
-					break;
-				case ev_uinteger:
-					valstr = sprintf ("%d", value.integer_val);
-					break;
-				case ev_short:
-					valstr = sprintf ("%d", value.integer_val);
-					break;
-				case ev_double:
-					valstr = sprintf ("%.17g", value.double_val);
-					break;
-			}
-			int         x = [locals_view size].width - strlen (valstr);
-			[locals_view mvaddstr:{x, y}, valstr];
-		}
-	}
-	[TextContext refresh];
+	[locals_view setFunction:state.func];
+	[locals_view redraw];
 }
 
 static int
diff --git a/ruamoko/qwaq/debugger/localsview.h b/ruamoko/qwaq/debugger/localsview.h
new file mode 100644
index 000000000..c10101e07
--- /dev/null
+++ b/ruamoko/qwaq/debugger/localsview.h
@@ -0,0 +1,22 @@
+#ifndef __qwaq_debugger_localsview_h
+#define __qwaq_debugger_localsview_h
+
+#include <types.h>
+#include "ui/view.h"
+#include "debugger/debug.h"
+
+@interface LocalsView : View
+{
+	qdb_target_t target;
+	qfot_type_encodings_t target_encodings;
+	unsigned    current_fnum;
+	qdb_function_t *func;
+	qdb_auxfunction_t *aux_func;
+	qdb_def_t  *defs;
+	void       *data;
+}
+-initWithRect:(Rect)rect target:(qdb_target_t) target;
+-setFunction:(unsigned) fnum;
+@end
+
+#endif
diff --git a/ruamoko/qwaq/debugger/localsview.r b/ruamoko/qwaq/debugger/localsview.r
new file mode 100644
index 000000000..af48edcc9
--- /dev/null
+++ b/ruamoko/qwaq/debugger/localsview.r
@@ -0,0 +1,142 @@
+#include <string.h>
+#include <types.h>
+#include "debugger/localsview.h"
+#include "debugger/typeencodings.h"
+
+@implementation LocalsView
+
+-initWithRect:(Rect)rect target:(qdb_target_t) target
+{
+	if (!(self = [super initWithRect:rect])) {
+		return nil;
+	}
+	options = ofCanFocus;
+	growMode = gfGrowHi;
+
+	self.target = target;
+
+	qdb_def_t   encodings_def = qdb_find_global (target, ".type_encodings");
+	qdb_get_data (target, encodings_def.offset, sizeof(target_encodings),
+				  &target_encodings);
+
+	return self;
+}
+
+-setFunction:(unsigned) fnum
+{
+	if (current_fnum == fnum) {
+		return self;
+	}
+	current_fnum =fnum;
+
+	if (defs) {
+		obj_free (defs);
+		defs = nil;
+	}
+	if (data) {
+		obj_free (data);
+		data = nil;
+	}
+	func = qdb_get_function (target, fnum);
+	aux_func = qdb_get_auxfunction (target, fnum);
+	if (aux_func) {
+		defs = qdb_get_local_defs (target, fnum);
+	}
+	if (func) {
+		data = obj_malloc (func.local_size);
+	}
+	return self;
+}
+
+-draw
+{
+	[super draw];
+
+	if (!data) {
+		return self;
+	}
+	qdb_get_data (target, func.local_data, func.local_size, data);
+	[self clear];
+	if (!defs) {
+		[self mvprintf:{0,0}, "%d", func.local_size];
+		for (int y = 1; y < ylen; y++) {
+			unsigned    ind = (y - 1) * 4;
+			if (ind < func.local_size) {
+				[self mvprintf:{0, y}, "%02x", ind];
+				for (int x = 0; x < 4 && ind < func.local_size; x++, ind++) {
+					[self mvprintf:{x * 9 + 3, y}, "%08x",
+										  data[ind]];
+				}
+			} else {
+				break;
+			}
+		}
+	} else {
+		for (int y = 0; y < ylen; y++) {
+			if (y >= aux_func.num_locals) {
+				break;
+			}
+			qdb_def_t *def = defs + y;
+			unsigned    te = def.type_encoding + (int) target_encodings.types;
+			qfot_type_t *type;
+			type = [TypeEncodings getType:te fromTarget:target];
+			[self mvprintf:{0, y}, "%s",
+								  qdb_get_string (target, def.name)];
+			@param      value = nil;
+			string      valstr = "--";
+			unsigned    offset = func.local_data + def.offset;
+			printf ("%d %d %s %d\n", def.type_size, offset,
+					qdb_get_string (target, def.name),
+					def.type_encoding);
+			qdb_get_data (target, offset, def.type_size >> 16, &value);
+			switch (def.type_size & 0xffff) {
+				case ev_void:
+				case ev_invalid:
+				case ev_type_count:
+					break;
+				case ev_string:
+					valstr = qdb_get_string (target, value.integer_val);
+					break;
+				case ev_float:
+					valstr = sprintf ("%.9g", value.float_val);
+					break;
+				case ev_vector:
+					valstr = sprintf ("%.9v", value.vector_val);
+					break;
+				case ev_entity:
+					valstr = sprintf ("%e", value.entity_val);
+					break;
+				case ev_field:
+					valstr = sprintf ("[%x]", value.field_val);
+					break;
+				case ev_func:
+					valstr = sprintf ("[%x]", value.func_val);
+					break;
+				case ev_pointer:
+					valstr = sprintf ("[%x]", value.pointer_val);
+					break;
+				case ev_quat:
+					valstr = sprintf ("[%q]", value.quaternion_val);
+					break;
+				case ev_integer:
+					valstr = sprintf ("%d", value.integer_val);
+					break;
+				case ev_uinteger:
+					valstr = sprintf ("%d", value.integer_val);
+					break;
+				case ev_short:
+					valstr = sprintf ("%d", value.integer_val);
+					break;
+				case ev_double:
+					valstr = sprintf ("%.17g", value.double_val);
+					break;
+			}
+			int         x = xlen - strlen (valstr);
+			[self mvaddstr:{x, y}, valstr];
+		}
+	}
+
+	return self;
+}
+
+@end

From 0a63d0a0de755a1be8f9de87acc9d178d175fd87 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 30 Mar 2020 16:25:54 +0900
Subject: [PATCH 1063/1519] [libr] Fix loop counter in removeObjectNoRelease

It would do 4G iterations if count was 0.
---
 ruamoko/lib/Array+Private.r | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ruamoko/lib/Array+Private.r b/ruamoko/lib/Array+Private.r
index 167404e5c..2cdea39cf 100644
--- a/ruamoko/lib/Array+Private.r
+++ b/ruamoko/lib/Array+Private.r
@@ -20,14 +20,14 @@
 	local unsigned	i = count;
 	local unsigned	tmp;
 
-	do {
-		if (_objs[--i] == anObject) {
+	while (i-- > 0) {
+		if (_objs[i] == anObject) {
 			for (tmp = i; tmp < count - 1; tmp++) {
 				_objs[tmp] = _objs[tmp + 1];
 			}
 			count--;
 		}
-	} while (i);
+	}
 }
 
 @end

From d7df2fa63db9771da1752e5789fd1b902f3eda3d Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 30 Mar 2020 16:27:47 +0900
Subject: [PATCH 1064/1519] [qwaq] Fix library dependencies

Forgot to add them.
---
 ruamoko/qwaq/Makefile.am | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruamoko/qwaq/Makefile.am b/ruamoko/qwaq/Makefile.am
index d124b732a..9b8abcd18 100644
--- a/ruamoko/qwaq/Makefile.am
+++ b/ruamoko/qwaq/Makefile.am
@@ -94,7 +94,7 @@ r_depfiles_remade=
 qwaq_app_dat_SOURCES=$(qwaq_app_dat_src)
 qwaq_app_obj=$(qwaq_app_dat_SOURCES:.r=.o)
 qwaq_app_dep=$(addprefix ./$(DEPDIR)/,$(qwaq_app_obj:.o=.Qo))
-qwaq-app.dat$(EXEEXT): $(qwaq_app_obj) $(QFCC_DEP)
+qwaq-app.dat$(EXEEXT): $(qwaq_app_obj) $(QFCC_DEP) ../lib/libcsqc.a ../lib/libr.a
 	$(QLINK) -o $@ $(qwaq_app_obj) -lcsqc -lr
 include $(qwaq_app_dep) # am--include-marker
 r_depfiles_remade += $(qwaq_app_dep)
@@ -102,7 +102,7 @@ r_depfiles_remade += $(qwaq_app_dep)
 gcd_dat_SOURCES=gcd.r
 gcd_obj=$(gcd_dat_SOURCES:.r=.o)
 gcd_dep=$(addprefix ./$(DEPDIR)/,$(gcd_obj:.o=.Qo))
-gcd.dat$(EXEEXT): $(gcd_obj) $(QFCC_DEP)
+gcd.dat$(EXEEXT): $(gcd_obj) $(QFCC_DEP) ../lib/libcsqc.a ../lib/libr.a
 	$(QLINK) -o $@ $(gcd_obj) -lcsqc -lr
 include $(gcd_dep) # am--include-marker
 r_depfiles_remade += $(gcd_dep)

From 8a7fbdfc9f6a8696ac8bdf2350128dd06df25bfe Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 30 Mar 2020 16:30:58 +0900
Subject: [PATCH 1065/1519] [qwaq] Rework allocation to use retain/release

It currently dies when single stepping or exiting due to EditBuffer's
retain count not getting incremented when initialized. This is because
EditBuffer is initialized in C and thus does not call Object's -init.
---
 ruamoko/qwaq/debugger/debugger.h   |  3 +-
 ruamoko/qwaq/debugger/debugger.r   | 22 ++++++++++----
 ruamoko/qwaq/debugger/localsview.h |  5 +--
 ruamoko/qwaq/debugger/localsview.r | 17 +++++++++++
 ruamoko/qwaq/editor/editbuffer.h   |  2 ++
 ruamoko/qwaq/editor/editbuffer.r   | 10 ++++++
 ruamoko/qwaq/editor/editor.h       |  1 +
 ruamoko/qwaq/editor/editor.r       | 16 ++++++++--
 ruamoko/qwaq/qwaq-app.r            |  7 +++--
 ruamoko/qwaq/ui/button.h           |  3 ++
 ruamoko/qwaq/ui/button.r           | 49 +++++++++++++++++++++---------
 ruamoko/qwaq/ui/draw.h             |  4 +--
 ruamoko/qwaq/ui/draw.r             | 10 ++++--
 ruamoko/qwaq/ui/group.h            |  3 +-
 ruamoko/qwaq/ui/group.r            |  7 +++++
 ruamoko/qwaq/ui/listener.h         |  2 ++
 ruamoko/qwaq/ui/listener.r         | 15 +++++++--
 ruamoko/qwaq/ui/proxyview.h        |  5 +--
 ruamoko/qwaq/ui/proxyview.r        | 10 +++++-
 ruamoko/qwaq/ui/textcontext.h      |  4 +++
 ruamoko/qwaq/ui/textcontext.r      | 17 ++++++++++-
 ruamoko/qwaq/ui/titlebar.h         |  5 +--
 ruamoko/qwaq/ui/titlebar.r         |  5 +++
 ruamoko/qwaq/ui/view.h             |  7 +++--
 ruamoko/qwaq/ui/view.r             | 34 +++++++++++++++------
 ruamoko/qwaq/ui/window.h           |  2 +-
 ruamoko/qwaq/ui/window.r           | 32 ++++++++-----------
 27 files changed, 224 insertions(+), 73 deletions(-)

diff --git a/ruamoko/qwaq/debugger/debugger.h b/ruamoko/qwaq/debugger/debugger.h
index d43ad990c..95379099d 100644
--- a/ruamoko/qwaq/debugger/debugger.h
+++ b/ruamoko/qwaq/debugger/debugger.h
@@ -24,8 +24,9 @@
 	Window     *locals_window;
 	LocalsView *locals_view;
 }
--(qdb_target_t)target;
++(Debugger *)withTarget:(qdb_target_t)target;
 -initWithTarget:(qdb_target_t) target;
+-(qdb_target_t)target;
 -handleDebugEvent;
 @end
 
diff --git a/ruamoko/qwaq/debugger/debugger.r b/ruamoko/qwaq/debugger/debugger.r
index 4d1249702..d54489788 100644
--- a/ruamoko/qwaq/debugger/debugger.r
+++ b/ruamoko/qwaq/debugger/debugger.r
@@ -13,6 +13,11 @@
 #include "qwaq-app.h"
 
 @implementation Debugger
++(Debugger *)withTarget:(qdb_target_t)target
+{
+	return [[[self alloc] initWithTarget:target] autorelease];
+}
+
 -(qdb_target_t)target
 {
 	return target;
@@ -26,12 +31,18 @@
 	self.target = target;
 
 	files = [[Array array] retain];
-	source_window = [[Window alloc] initWithRect: {nil, [application size]}];
+	source_window = [Window withRect: {nil, [application size]}];
 	[application addView:source_window];
 
 	return self;
 }
 
+-(void)dealloc
+{
+	[files release];
+	[super dealloc];
+}
+
 -(Editor *) find_file:(string) filename
 {
 	Editor     *file;
@@ -44,7 +55,7 @@
 	Rect rect = {{1, 1}, [source_window size]};
 	rect.extent.width -= 2;
 	rect.extent.height -= 2;
-	file = [[Editor alloc] initWithRect: rect file: filename];
+	file = [Editor withRect:rect file:filename];
 	[files addObject: file];
 	return file;
 }
@@ -54,7 +65,7 @@
 	qdb_state_t state = qdb_get_state (target);
 
 	current_file = [self find_file: state.file];
-	file_proxy = [[ProxyView alloc] initWithView: current_file];
+	file_proxy = [ProxyView withView: current_file];
 	[[current_file gotoLine:state.line - 1] highlightLine];
 	[[current_file onEvent] addListener: self :@selector(proxy_event::)];
 	//FIXME id<View>?
@@ -62,11 +73,10 @@
 	[source_window setTitle: [current_file filename]];
 	[source_window redraw];
 
-	locals_window = [[Window alloc] initWithRect: {{0, 0}, {40, 10}}];
+	locals_window = [Window withRect:{{0, 0}, {40, 10}}];
 	[locals_window setBackground: color_palette[064]];
 	[locals_window setTitle: "Locals"];
-	locals_view = [[LocalsView alloc] initWithRect: {{1, 1}, {38, 8}}
-											target: target];
+	locals_view = [LocalsView withRect:{{1, 1}, {38, 8}} target:target];
 	[locals_window insertSelected: locals_view];
 	[application addView: locals_window];
 
diff --git a/ruamoko/qwaq/debugger/localsview.h b/ruamoko/qwaq/debugger/localsview.h
index c10101e07..71886daaf 100644
--- a/ruamoko/qwaq/debugger/localsview.h
+++ b/ruamoko/qwaq/debugger/localsview.h
@@ -15,8 +15,9 @@
 	qdb_def_t  *defs;
 	void       *data;
 }
--initWithRect:(Rect)rect target:(qdb_target_t) target;
--setFunction:(unsigned) fnum;
++(LocalsView *)withRect:(Rect)rect target:(qdb_target_t)target;
+-initWithRect:(Rect)rect target:(qdb_target_t)target;
+-setFunction:(unsigned)fnum;
 @end
 
 #endif
diff --git a/ruamoko/qwaq/debugger/localsview.r b/ruamoko/qwaq/debugger/localsview.r
index af48edcc9..f90d429fb 100644
--- a/ruamoko/qwaq/debugger/localsview.r
+++ b/ruamoko/qwaq/debugger/localsview.r
@@ -5,6 +5,11 @@
 
 @implementation LocalsView
 
++(LocalsView *)withRect:(Rect)rect target:(qdb_target_t)target
+{
+	return [[[self alloc] initWithRect:rect target:target] autorelease];
+}
+
 -initWithRect:(Rect)rect target:(qdb_target_t) target
 {
 	if (!(self = [super initWithRect:rect])) {
@@ -22,6 +27,18 @@
 	return self;
 }
 
+-(void)dealloc
+{
+	if (defs) {
+		obj_free (defs);
+		defs = nil;
+	}
+	if (data) {
+		obj_free (data);
+		data = nil;
+	}
+}
+
 -setFunction:(unsigned) fnum
 {
 	if (current_fnum == fnum) {
diff --git a/ruamoko/qwaq/editor/editbuffer.h b/ruamoko/qwaq/editor/editbuffer.h
index 72ee9db65..a1bfae616 100644
--- a/ruamoko/qwaq/editor/editbuffer.h
+++ b/ruamoko/qwaq/editor/editbuffer.h
@@ -26,6 +26,8 @@ typedef struct eb_color_s {
 {
 	struct edit_buffer_s *buffer;
 }
++(EditBuffer *)buffer;
++(EditBuffer *)withFile:(string)filename;
 -init;
 -initWithFile: (string) filename;
 - (unsigned) nextChar: (unsigned) charPtr;
diff --git a/ruamoko/qwaq/editor/editbuffer.r b/ruamoko/qwaq/editor/editbuffer.r
index 2d58e0361..9a6da8396 100644
--- a/ruamoko/qwaq/editor/editbuffer.r
+++ b/ruamoko/qwaq/editor/editbuffer.r
@@ -1,6 +1,16 @@
 #include "editor/editbuffer.h"
 
 @implementation EditBuffer
++(EditBuffer *)buffer
+{
+	return [[[self alloc] init] autorelease];
+}
+
++(EditBuffer *)withFile:(string)filename
+{
+	return [[[self alloc] initWithFile:filename] autorelease];
+}
+
 - init = #0;
 - initWithFile: (string) filename = #0;
 - (void) dealloc = #0;
diff --git a/ruamoko/qwaq/editor/editor.h b/ruamoko/qwaq/editor/editor.h
index 099ae78a3..fb5aaa7d3 100644
--- a/ruamoko/qwaq/editor/editor.h
+++ b/ruamoko/qwaq/editor/editor.h
@@ -22,6 +22,7 @@
 	unsigned    line_count;
 	string      filename;
 }
++(Editor *)withRect:(Rect)rect file:(string)filename;
 -initWithRect:(Rect) rect file:(string) filename;
 -(string)filename;
 -scrollUp:(unsigned) count;
diff --git a/ruamoko/qwaq/editor/editor.r b/ruamoko/qwaq/editor/editor.r
index f6f78d575..25e87c7db 100644
--- a/ruamoko/qwaq/editor/editor.r
+++ b/ruamoko/qwaq/editor/editor.r
@@ -5,20 +5,32 @@
 
 @implementation Editor
 
++(Editor *)withRect:(Rect)rect file:(string)filename
+{
+	return [[[self alloc] initWithRect:rect file:filename] autorelease];
+}
+
 -initWithRect:(Rect) rect file:(string) filename
 {
 	if (!(self = [super initWithRect: rect])) {
 		return nil;
 	}
 	self.filename = filename;
-	buffer = [[EditBuffer alloc] initWithFile: filename];
+	buffer = [[EditBuffer withFile:filename] retain];
 	line_count = [buffer countLines: {0, [buffer textSize]}];
-	linebuffer = [DrawBuffer buffer: { xlen, 1 }];
+	linebuffer = [[DrawBuffer buffer: { xlen, 1 }] retain];
 	growMode = gfGrowHi;
 	options = ofCanFocus | ofRelativeEvents;
 	return self;
 }
 
+-(void)dealloc
+{
+	[buffer release];
+	[linebuffer release];
+	[super dealloc];
+}
+
 -(string)filename
 {
 	return filename;
diff --git a/ruamoko/qwaq/qwaq-app.r b/ruamoko/qwaq/qwaq-app.r
index a17312ead..e98f4d03f 100644
--- a/ruamoko/qwaq/qwaq-app.r
+++ b/ruamoko/qwaq/qwaq-app.r
@@ -46,7 +46,7 @@ arp_end (void)
 
 	screen = [TextContext screen];
 	screenSize = [screen size];
-	objects = [[Group alloc] initWithContext: screen owner: nil];
+	objects = [[Group withContext: screen owner: nil] retain];
 
 	[screen bkgd: color_palette[047]];
 	[screen scrollok: 1];
@@ -84,7 +84,7 @@ arp_end (void)
 			return debugger;
 		}
 	}
-	debugger = [[Debugger alloc] initWithTarget: target];
+	debugger = [Debugger withTarget: target];
 	[debuggers addObject: debugger];
 	return debugger;
 }
@@ -153,11 +153,14 @@ int main (int argc, string *argv)
 	fence = 0;
 	//while (!fence) {}
 
+	arp_start ();
 	application = [[QwaqApplication app] retain];
+	arp_end ();
 
 	[application run];
 	[application release];
 	qwaq_event_t event;
 	get_event (&event);	// XXX need a "wait for queue idle"
+
 	return 0;
 }
diff --git a/ruamoko/qwaq/ui/button.h b/ruamoko/qwaq/ui/button.h
index d407fbbff..8db47b4f8 100644
--- a/ruamoko/qwaq/ui/button.h
+++ b/ruamoko/qwaq/ui/button.h
@@ -20,6 +20,9 @@
 	ListenerGroup *onAuto;
 	ListenerGroup *onHover;
 }
++(Button *)withPos: (Point) pos releasedIcon: (DrawBuffer *) released
+								 pressedIcon: (DrawBuffer *) pressed;
++(Button *)withRect: (Rect) rect;	// invisible button
 -initWithPos: (Point) pos releasedIcon: (DrawBuffer *) released
 						   pressedIcon: (DrawBuffer *) pressed;
 -initWithRect: (Rect) rect;	// invisible button
diff --git a/ruamoko/qwaq/ui/button.r b/ruamoko/qwaq/ui/button.r
index 38d0690c4..1d6228571 100644
--- a/ruamoko/qwaq/ui/button.r
+++ b/ruamoko/qwaq/ui/button.r
@@ -2,6 +2,20 @@
 #include "ui/listener.h"
 
 @implementation Button
+
++(Button *)withPos:(Point)pos releasedIcon:(DrawBuffer *)released
+							   pressedIcon:(DrawBuffer *)pressed
+{
+	return [[[self alloc] initWithPos:pos
+						 releasedIcon:released
+						  pressedIcon:pressed] autorelease];
+}
+
++(Button *)withRect:(Rect)rect
+{
+	return [[[self alloc] initWithRect:rect] autorelease];
+}
+
 -initWithPos: (Point) pos releasedIcon: (DrawBuffer *) released
 						   pressedIcon: (DrawBuffer *) pressed
 {
@@ -10,14 +24,14 @@
 	if (!(self = [super initWithRect: {pos, size}])) {
 		return nil;
 	}
-	icon[0] = released;
-	icon[1] = pressed;
-	onPress = [[ListenerGroup alloc] init];
-	onRelease = [[ListenerGroup alloc] init];
-	onClick = [[ListenerGroup alloc] init];
-	onDrag = [[ListenerGroup alloc] init];
-	onAuto = [[ListenerGroup alloc] init];
-	onHover = [[ListenerGroup alloc] init];
+	icon[0] = [released retain];
+	icon[1] = [pressed retain];
+	onPress = [ListenerGroup listener];
+	onRelease = [ListenerGroup listener];
+	onClick = [ListenerGroup listener];
+	onDrag = [ListenerGroup listener];
+	onAuto = [ListenerGroup listener];
+	onHover = [ListenerGroup listener];
 	return self;
 }
 
@@ -28,15 +42,22 @@
 	}
 	icon[0] = nil;
 	icon[1] = nil;
-	onPress = [[ListenerGroup alloc] init];
-	onRelease = [[ListenerGroup alloc] init];
-	onClick = [[ListenerGroup alloc] init];
-	onDrag = [[ListenerGroup alloc] init];
-	onAuto = [[ListenerGroup alloc] init];
-	onHover = [[ListenerGroup alloc] init];
+	onPress = [ListenerGroup listener];
+	onRelease = [ListenerGroup listener];
+	onClick = [ListenerGroup listener];
+	onDrag = [ListenerGroup listener];
+	onAuto = [ListenerGroup listener];
+	onHover = [ListenerGroup listener];
 	return self;
 }
 
+-(void)dealloc
+{
+	[icon[0] release];
+	[icon[1] release];
+	[super dealloc];
+}
+
 -draw
 {
 	[super draw];
diff --git a/ruamoko/qwaq/ui/draw.h b/ruamoko/qwaq/ui/draw.h
index 72be7fbf0..708bad192 100644
--- a/ruamoko/qwaq/ui/draw.h
+++ b/ruamoko/qwaq/ui/draw.h
@@ -39,8 +39,8 @@
 	Point       cursor;
 	int         background;
 }
-+ (DrawBuffer *) buffer: (Extent) size;
-- initWithSize: (Extent) size;
++(DrawBuffer *)buffer:(Extent)size;
+-initWithSize:(Extent)size;
 @end
 
 #endif//__qwaq_ui_draw_h
diff --git a/ruamoko/qwaq/ui/draw.r b/ruamoko/qwaq/ui/draw.r
index b9864af6d..b9f181a8e 100644
--- a/ruamoko/qwaq/ui/draw.r
+++ b/ruamoko/qwaq/ui/draw.r
@@ -5,9 +5,9 @@
 
 @implementation DrawBuffer
 
-+ (DrawBuffer *) buffer: (Extent) size
++(DrawBuffer *)buffer:(Extent)size
 {
-	return [[self alloc] initWithSize: size];
+	return [[[self alloc] initWithSize: size] autorelease];
 }
 
 - initWithSize: (Extent) size
@@ -20,6 +20,12 @@
 	return self;
 }
 
+-(void)dealloc
+{
+	obj_free (buffer);
+	[super dealloc];
+}
+
 - (Extent) size
 {
 	return size;
diff --git a/ruamoko/qwaq/ui/group.h b/ruamoko/qwaq/ui/group.h
index b243166b2..071ee53f0 100644
--- a/ruamoko/qwaq/ui/group.h
+++ b/ruamoko/qwaq/ui/group.h
@@ -17,7 +17,8 @@
 	int         focused;
 	id<TextContext> context;
 }
--initWithContext: (id<TextContext>) context owner: (View *) owner;
++(Group *)withContext:(id<TextContext>)context owner:(View *)owner;
+-initWithContext:(id<TextContext>)context owner:(View *)owner;
 -(id<TextContext>)context;
 -setContext: (id<TextContext>) context;
 -insert: (View *) view;
diff --git a/ruamoko/qwaq/ui/group.r b/ruamoko/qwaq/ui/group.r
index aa4fb117e..adaa21958 100644
--- a/ruamoko/qwaq/ui/group.r
+++ b/ruamoko/qwaq/ui/group.r
@@ -7,6 +7,11 @@
 
 @implementation Group
 
++(Group *)withContext:(id<TextContext>)context owner:(View *)owner
+{
+	return [[[self alloc] initWithContext:context owner:owner] autorelease];
+}
+
 -initWithContext: (id<TextContext>) context owner: (View *) owner
 {
 	if (!(self = [super init])) {
@@ -22,6 +27,7 @@
 -(void)dealloc
 {
 	[views release];
+	[super dealloc];
 }
 
 -(id<TextContext>)context
@@ -85,6 +91,7 @@ makeFirst (Group *self, int viewIndex)
 {
 	View       *view = [self.views objectAtIndex: viewIndex];
 
+	// add before remove to avoid freeing view
 	[self.views addObject: view];
 	[self.views removeObjectAtIndex: viewIndex];
 	[view raise];
diff --git a/ruamoko/qwaq/ui/listener.h b/ruamoko/qwaq/ui/listener.h
index e07356ad5..8df0c949c 100644
--- a/ruamoko/qwaq/ui/listener.h
+++ b/ruamoko/qwaq/ui/listener.h
@@ -11,6 +11,7 @@
 	SEL         message;
 	IMP         imp;
 }
++(Listener *)listenerWithResponder:(id)responder :(SEL)message;
 -initWithResponder: (id) responder :(SEL)message;
 -(void) respond: (void *) caller_data;
 -(void) respond: (void *) caller_data withObject:(void *)anObject;
@@ -21,6 +22,7 @@
 {
 	Array      *listeners;
 }
++(ListenerGroup *)listener;
 -init;
 -addListener: (id) responder :(SEL)message;
 -removeListener: (id) responder :(SEL)message;
diff --git a/ruamoko/qwaq/ui/listener.r b/ruamoko/qwaq/ui/listener.r
index bdb36ac51..5035a4324 100644
--- a/ruamoko/qwaq/ui/listener.r
+++ b/ruamoko/qwaq/ui/listener.r
@@ -5,6 +5,11 @@
 @class Array;
 
 @implementation Listener
++(Listener *)listenerWithResponder:(id)responder :(SEL)message
+{
+	return [[[self alloc] initWithResponder:responder :message] autorelease];
+}
+
 -initWithResponder: (id) responder :(SEL)message
 {
 	if (!(self = [super init])) {
@@ -33,6 +38,11 @@
 @end
 
 @implementation ListenerGroup : Object
++(ListenerGroup *)listener
+{
+	return [[[self alloc] init] autorelease];
+}
+
 -init
 {
 	if (!(self = [super init])) {
@@ -44,10 +54,9 @@
 
 -addListener: (id) responder :(SEL)message
 {
-	Listener   *listener = [[Listener alloc] initWithResponder: responder
-															  : message];
+	Listener   *listener = [Listener listenerWithResponder:responder :message];
 	if (listener) {
-		[listeners addObject: listener];
+		[listeners addObject:listener];
 	}
 	return self;
 }
diff --git a/ruamoko/qwaq/ui/proxyview.h b/ruamoko/qwaq/ui/proxyview.h
index 9a2c23c2e..d19a47ef0 100644
--- a/ruamoko/qwaq/ui/proxyview.h
+++ b/ruamoko/qwaq/ui/proxyview.h
@@ -10,8 +10,9 @@
 	View       *view;
 	Group      *owner;
 }
--initWithView:(View *) view;
--setView: (View *) view;
++(ProxyView *)withView:(View *)view;
+-initWithView:(View *)view;
+-setView:(View *)view;
 @end
 
 @interface ProxyView (View) <View, TextContext>
diff --git a/ruamoko/qwaq/ui/proxyview.r b/ruamoko/qwaq/ui/proxyview.r
index a94c738dc..e4a10598e 100644
--- a/ruamoko/qwaq/ui/proxyview.r
+++ b/ruamoko/qwaq/ui/proxyview.r
@@ -2,6 +2,11 @@
 #include "ui/proxyview.h"
 
 @implementation ProxyView
++(ProxyView *)withView:(View *)view
+{
+	return [[[self alloc] initWithView:view] autorelease];
+}
+
 - (void) forward: (SEL) sel : (@va_list) args
 {
 	if (!view) {
@@ -15,7 +20,7 @@
 	if (!(self = [super init])) {
 		return nil;
 	}
-	self.view = view;
+	self.view = [view retain];
 	return self;
 }
 
@@ -35,7 +40,10 @@
 	[self.view hide];
 	[self.view setContext:nil];
 
+	[view retain];
+	[self.view release];
 	self.view = view;
+
 	[view setContext:[owner context]];
 	if (state & sfDrawn) {
 		[view draw];
diff --git a/ruamoko/qwaq/ui/textcontext.h b/ruamoko/qwaq/ui/textcontext.h
index 898a62c60..f68ae1aa1 100644
--- a/ruamoko/qwaq/ui/textcontext.h
+++ b/ruamoko/qwaq/ui/textcontext.h
@@ -36,6 +36,10 @@
 + (void) doupdate;
 + (TextContext *) screen;
 
++(TextContext *)textContext;
++(TextContext *)withRect:(Rect)rect;
++(TextContext *)withWindow:(window_t)window;
+
 -init;
 -initWithRect: (Rect) rect;
 -initWithWindow: (window_t) window;
diff --git a/ruamoko/qwaq/ui/textcontext.r b/ruamoko/qwaq/ui/textcontext.r
index 6dffaa3e4..8867f1472 100644
--- a/ruamoko/qwaq/ui/textcontext.r
+++ b/ruamoko/qwaq/ui/textcontext.r
@@ -22,11 +22,26 @@ static TextContext *screen;
 + (TextContext *) screen
 {
 	if (!screen) {
-		screen = [[TextContext alloc] init];
+		screen = [[TextContext textContext] retain];
 	}
 	return screen;
 }
 
++(TextContext *)textContext
+{
+	return [[[self alloc] init] autorelease];
+}
+
++(TextContext *)withRect:(Rect)rect
+{
+	return [[[self alloc] initWithRect:rect] autorelease];
+}
+
++(TextContext *)withWindow:(window_t)window
+{
+	return [[[self alloc] initWithWindow:window] autorelease];
+}
+
 - init
 {
 	if (!(self = [super init])) {
diff --git a/ruamoko/qwaq/ui/titlebar.h b/ruamoko/qwaq/ui/titlebar.h
index b623c52dc..e71a41a25 100644
--- a/ruamoko/qwaq/ui/titlebar.h
+++ b/ruamoko/qwaq/ui/titlebar.h
@@ -9,8 +9,9 @@
 	int         length;
 }
 // title always centered at top of owner
--initWithTitle:(string) title;
--setTitle:(string) newTitle;
++(TitleBar *)withTitle:(string)title;
+-initWithTitle:(string)title;
+-setTitle:(string)newTitle;
 @end
 
 #endif//__qwaq_ui_titlebar_h
diff --git a/ruamoko/qwaq/ui/titlebar.r b/ruamoko/qwaq/ui/titlebar.r
index 96432280d..db1f717de 100644
--- a/ruamoko/qwaq/ui/titlebar.r
+++ b/ruamoko/qwaq/ui/titlebar.r
@@ -5,6 +5,11 @@
 
 @implementation TitleBar
 
++(TitleBar *)withTitle:(string)title
+{
+	return [[[self alloc] initWithTitle:title] autorelease];
+}
+
 -initWithTitle:(string) title
 {
 	if (!(self = [super init])) {
diff --git a/ruamoko/qwaq/ui/view.h b/ruamoko/qwaq/ui/view.h
index eaa96063b..09a8ab8ba 100644
--- a/ruamoko/qwaq/ui/view.h
+++ b/ruamoko/qwaq/ui/view.h
@@ -113,8 +113,11 @@ enum {
 	ListenerGroup *onReleaseFocus;
 	ListenerGroup *onEvent;
 }
--initWithRect: (Rect) rect;
--initWithRect: (Rect) rect options:(int)options;
++(View *)viewWithRect:(Rect)rect;
++(View *)viewWithRect:(Rect)rect options:(int)options;
+
+-initWithRect:(Rect)rect;
+-initWithRect:(Rect)rect options:(int)options;
 @end
 
 @interface View (TextContext) <TextContext>
diff --git a/ruamoko/qwaq/ui/view.r b/ruamoko/qwaq/ui/view.r
index e352c8ce3..f47d85f63 100644
--- a/ruamoko/qwaq/ui/view.r
+++ b/ruamoko/qwaq/ui/view.r
@@ -5,14 +5,29 @@
 
 @implementation View
 
++(View *)viewWithRect:(Rect)rect
+{
+	return [[[self alloc] initWithRect:rect] autorelease];
+}
+
++(View *)viewWithRect:(Rect)rect options:(int)options
+{
+	return [[[self alloc] initWithRect:rect options:options] autorelease];
+}
+
+static void view_init(View *self)
+{
+	self.onReceiveFocus = [ListenerGroup listener];
+	self.onReleaseFocus = [ListenerGroup listener];
+	self.onEvent = [ListenerGroup listener];
+}
+
 -init
 {
 	if (!(self = [super init])) {
 		return nil;
 	}
-	onReceiveFocus = [[ListenerGroup alloc] init];
-	onReleaseFocus = [[ListenerGroup alloc] init];
-	onEvent = [[ListenerGroup alloc] init];
+	view_init (self);
 	return self;
 }
 
@@ -21,11 +36,10 @@
 	if (!(self = [super init])) {
 		return nil;
 	}
+	view_init (self);
+
 	self.rect = rect;
 	self.absRect = rect;
-	onReceiveFocus = [[ListenerGroup alloc] init];
-	onReleaseFocus = [[ListenerGroup alloc] init];
-	onEvent = [[ListenerGroup alloc] init];
 	return self;
 }
 
@@ -34,12 +48,11 @@
 	if (!(self = [super init])) {
 		return nil;
 	}
+	view_init (self);
+
 	self.rect = rect;
 	self.absRect = rect;
 	self.options = options;
-	onReceiveFocus = [[ListenerGroup alloc] init];
-	onReleaseFocus = [[ListenerGroup alloc] init];
-	onEvent = [[ListenerGroup alloc] init];
 	return self;
 }
 
@@ -48,6 +61,9 @@
 	if (owner) {
 		[owner remove:self];
 	}
+	[onReceiveFocus release];
+	[onReleaseFocus release];
+	[onEvent release];
 	[super dealloc];
 }
 
diff --git a/ruamoko/qwaq/ui/window.h b/ruamoko/qwaq/ui/window.h
index bfb25c65a..67a0608e2 100644
--- a/ruamoko/qwaq/ui/window.h
+++ b/ruamoko/qwaq/ui/window.h
@@ -28,7 +28,7 @@
 	Button     *bottomDrag;
 	TitleBar   *titleBar;
 }
-+windowWithRect: (Rect) rect;
++(Window *)withRect: (Rect) rect;
 -setTitle:(string) title;
 -setBackground: (int) ch;
 -insert: (View *) view;
diff --git a/ruamoko/qwaq/ui/window.r b/ruamoko/qwaq/ui/window.r
index e3809bf77..ea966d473 100644
--- a/ruamoko/qwaq/ui/window.r
+++ b/ruamoko/qwaq/ui/window.r
@@ -12,7 +12,7 @@
 
 @implementation Window
 
-+windowWithRect: (Rect) rect
++(Window *)withRect: (Rect) rect
 {
 	return [[[self alloc] initWithRect: rect] autorelease];
 }
@@ -28,29 +28,21 @@
 		return nil;
 	}
 	self.rect = rect;
-	textContext = [[TextContext alloc] initWithRect: rect];
+	textContext = [[TextContext withRect: rect] retain];
 	panel = create_panel ([(id)textContext window]);
 
-	objects = [[Group alloc] initWithContext: textContext owner: self];
+	objects = [[Group withContext:textContext owner:self] retain];
 
-	[self insert: titleBar = [[TitleBar alloc] initWithTitle:""]];
+	[self insert:titleBar = [TitleBar withTitle:""]];
 
-	topDrag         = [[Button alloc] initWithRect: {{2, 0},
-													 {xlen - 4, 1}}];
-	topLeftDrag     = [[Button alloc] initWithRect: {{0, 0},
-													 {2, 2}}];
-	topRightDrag    = [[Button alloc] initWithRect: {{xlen - 2, 0},
-													 {2, 2}}];
-	leftDrag        = [[Button alloc] initWithRect: {{0, 2},
-													 {1, ylen - 4}}];
-	rightDrag       = [[Button alloc] initWithRect: {{xlen - 1, 2},
-													 {1, ylen - 4}}];
-	bottomLeftDrag  = [[Button alloc] initWithRect: {{0, ylen - 2},
-													 {2, 2}}];
-	bottomRightDrag = [[Button alloc] initWithRect: {{xlen - 2, ylen - 2},
-													 {2, 2}}];
-	bottomDrag      = [[Button alloc] initWithRect: {{2, ylen - 1},
-													 {xlen - 4, 1}}];
+	topDrag         = [Button withRect:{{2, 0},        {xlen - 4, 1}}];
+	topLeftDrag     = [Button withRect:{{0, 0},               {2, 2}}];
+	topRightDrag    = [Button withRect:{{xlen - 2, 0},        {2, 2}}];
+	leftDrag        = [Button withRect:{{0, 2},        {1, ylen - 4}}];
+	rightDrag       = [Button withRect:{{xlen - 1, 2}, {1, ylen - 4}}];
+	bottomLeftDrag  = [Button withRect:{{0, ylen - 2}       , {2, 2}}];
+	bottomRightDrag = [Button withRect:{{xlen - 2, ylen - 2}, {2, 2}}];
+	bottomDrag      = [Button withRect:{{2, ylen - 1}, {xlen - 4, 1}}];
 	[self insert: [topDrag         setGrowMode: gfGrowHiX]];
 	[self insert: [topLeftDrag     setGrowMode: gfGrowNone]];
 	[self insert: [topRightDrag    setGrowMode: gfGrowX]];

From c23c68cf7f3789f20fd598d3d7ff1871a9a8d159 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 30 Mar 2020 16:49:57 +0900
Subject: [PATCH 1066/1519] [ruamoko] Allow builtins to inc/dec retain count

Needed for classes that are implemented entirely in C.
---
 include/QF/ruamoko.h   |  7 ++++++-
 libs/ruamoko/rua_obj.c | 14 ++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/include/QF/ruamoko.h b/include/QF/ruamoko.h
index a2dcd6366..956465268 100644
--- a/include/QF/ruamoko.h
+++ b/include/QF/ruamoko.h
@@ -31,7 +31,7 @@
 #ifndef __QF_ruamoko_h
 #define __QF_ruamoko_h
 
-#include "QF/pr_comp.h"
+#include "QF/pr_obj.h"
 
 struct progs_s;
 struct cbuf_s;
@@ -40,4 +40,9 @@ void RUA_Init (struct progs_s *pr, int secure);
 void RUA_Cbuf_SetCbuf (struct progs_s *pr, struct cbuf_s *cbuf);
 func_t RUA_Obj_msg_lookup (struct progs_s *pr, pointer_t _self, pointer_t __cmd);
 
+// self is expected in param 0
+int RUA_obj_increment_retaincount (struct progs_s *pr);
+// self is expected in param 0
+int RUA_obj_decrement_retaincount (struct progs_s *pr);
+
 #endif//__QF_ruamoko_h
diff --git a/libs/ruamoko/rua_obj.c b/libs/ruamoko/rua_obj.c
index 1cdf8ed86..5bd5e3871 100644
--- a/libs/ruamoko/rua_obj.c
+++ b/libs/ruamoko/rua_obj.c
@@ -2254,3 +2254,17 @@ RUA_Obj_msg_lookup (progs_t *pr, pointer_t _self, pointer_t __cmd)
 
 	return imp;
 }
+
+int
+RUA_obj_increment_retaincount (progs_t *pr)
+{
+	rua_obj_increment_retaincount (pr);
+	return R_INT (pr);
+}
+
+int
+RUA_obj_decrement_retaincount (progs_t *pr)
+{
+	rua_obj_decrement_retaincount (pr);
+	return R_INT (pr);
+}

From 101574e697d46de02a04ed926e6f9f2c333a6539 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 30 Mar 2020 16:51:09 +0900
Subject: [PATCH 1067/1519] [qwaq] Pretend to call super init in edit buffer

This fixes the early deallocation of the edit buffer.
---
 ruamoko/qwaq/builtins/editbuffer.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ruamoko/qwaq/builtins/editbuffer.c b/ruamoko/qwaq/builtins/editbuffer.c
index f834f258c..ab1c161c3 100644
--- a/ruamoko/qwaq/builtins/editbuffer.c
+++ b/ruamoko/qwaq/builtins/editbuffer.c
@@ -7,6 +7,7 @@
 #include <string.h>
 
 #include "QF/progs.h"
+#include "QF/ruamoko.h"
 #include "QF/quakeio.h"
 #include "QF/txtbuffer.h"
 
@@ -532,6 +533,7 @@ bi_i_EditBuffer__init (progs_t *pr)
 {
 	qwaq_ebresources_t *res = PR_Resources_Find (pr, "qwaq-editbuffer");
 	__auto_type self = &P_STRUCT (pr, qwaq_editbuffer_t, 0);
+	RUA_obj_increment_retaincount (pr);// [super init];
 	txtbuffer_t *txtbuffer = TextBuffer_Create ();
 	editbuffer_t *buffer = editbuffer_new (res);
 
@@ -547,6 +549,7 @@ bi_i_EditBuffer__initWithFile_ (progs_t *pr)
 {
 	qwaq_ebresources_t *res = PR_Resources_Find (pr, "qwaq-editbuffer");
 	__auto_type self = &P_STRUCT (pr, qwaq_editbuffer_t, 0);
+	RUA_obj_increment_retaincount (pr);// [super init];
 	const char *filename = P_GSTRING (pr, 2);
 	txtbuffer_t *txtbuffer = TextBuffer_Create ();
 	editbuffer_t *buffer = editbuffer_new (res);

From 0de9b027268c4ec01aeabb80c5f7db86f1b75957 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 30 Mar 2020 18:55:04 +0900
Subject: [PATCH 1068/1519] [qfcc] Catch declarations of arrays of class

They're still static instances.
---
 tools/qfcc/source/def.c                |  4 ++--
 tools/qfcc/test/Makefile.am            |  4 ++++
 tools/qfcc/test/build-compile-fail-run |  2 +-
 tools/qfcc/test/classarray.r           | 10 ++++++++++
 4 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 tools/qfcc/test/classarray.r

diff --git a/tools/qfcc/source/def.c b/tools/qfcc/source/def.c
index 7c671fb3d..1450f0f45 100644
--- a/tools/qfcc/source/def.c
+++ b/tools/qfcc/source/def.c
@@ -140,7 +140,7 @@ new_def (const char *name, type_t *type, defspace_t *space,
 	if (!space && storage != sc_extern)
 		internal_error (0, "non-external def with no storage space");
 
-	if (is_class (type)) {
+	if (is_class (type) || (is_array (type) && is_class(type->t.array.type))) {
 		error (0, "statically allocated instance of class %s",
 			   type->t.class->name);
 		return def;
@@ -157,7 +157,7 @@ new_def (const char *name, type_t *type, defspace_t *space,
 		}
 		if (alignment < 1) {
 			print_type (type);
-			internal_error (0, "temp type has no alignment");
+			internal_error (0, "type has no alignment");
 		}
 		def->offset = defspace_alloc_aligned_loc (space, size, alignment);
 	}
diff --git a/tools/qfcc/test/Makefile.am b/tools/qfcc/test/Makefile.am
index fe61451b9..a7b10901f 100644
--- a/tools/qfcc/test/Makefile.am
+++ b/tools/qfcc/test/Makefile.am
@@ -81,6 +81,7 @@ test_progs_dat=\
 fail_progs_dat=
 
 test_build_errors=\
+	classarray.r \
 	double-demote-float.r \
 	double-demote-float-ainit.r \
 	double-demote-float-ginit.r \
@@ -208,6 +209,9 @@ double.run: Makefile build-run
 include ./$(DEPDIR)/double.Qo # am--include-marker
 r_depfiles_remade += ./$(DEPDIR)/double.Qo
 
+classarray.run$(EXEEXT): classarray.r Makefile build-compile-fail-run
+	@$(srcdir)/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $<
+
 double-demote-int.run$(EXEEXT): double-demote-int.r Makefile build-compile-fail-run
 	@$(srcdir)/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $<
 
diff --git a/tools/qfcc/test/build-compile-fail-run b/tools/qfcc/test/build-compile-fail-run
index 294727d96..415e894e7 100755
--- a/tools/qfcc/test/build-compile-fail-run
+++ b/tools/qfcc/test/build-compile-fail-run
@@ -5,7 +5,7 @@ shift
 
 cat > $script <<EOF
 #! /bin/sh
-# compile must fail
+# compile must fail with a normal error
 $@
 if test \$? != 1; then
 	exit 1
diff --git a/tools/qfcc/test/classarray.r b/tools/qfcc/test/classarray.r
new file mode 100644
index 000000000..fa33d8264
--- /dev/null
+++ b/tools/qfcc/test/classarray.r
@@ -0,0 +1,10 @@
+@interface foo
+{
+	id isa;
+}
+@end
+
+void bar ()
+{
+	foo foos[1];
+}

From dff0fd983c1d4c22b1bf548f69d525e7cd8d79a7 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 30 Mar 2020 19:02:54 +0900
Subject: [PATCH 1069/1519] [qfcc] Fix missed t enum cleanup

---
 tools/qfcc/test/typedef.r    | 18 +++++++++---------
 tools/qfcc/test/zerolinker.r |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/tools/qfcc/test/typedef.r b/tools/qfcc/test/typedef.r
index e6e80a92b..9dbd7f40b 100644
--- a/tools/qfcc/test/typedef.r
+++ b/tools/qfcc/test/typedef.r
@@ -24,9 +24,9 @@ next_type (qfot_type_t *type)
 int
 check_alias (string name, qfot_type_t *alias)
 {
-	if (alias.meta != ty_basic || alias.t.type != ev_pointer
-		|| alias.t.fldptr.aux_type.meta != ty_basic
-		|| alias.t.fldptr.aux_type.t.type != ev_integer) {
+	if (alias.meta != ty_basic || alias.type != ev_pointer
+		|| alias.fldptr.aux_type.meta != ty_basic
+		|| alias.fldptr.aux_type.type != ev_integer) {
 		printf ("%s is not a *int alias\n", name);
 		return 0;
 	}
@@ -48,13 +48,13 @@ main (void)
 		 ((int *)type - (int *) encodings.types) < encodings.size;
 		type = next_type (type)) {
 		if (type.meta == ty_alias) {
-			if (type.t.alias.name == "foo") {
-				found_foo = check_alias (type.t.alias.name,
-										 type.t.alias.aux_type);
+			if (type.alias.name == "foo") {
+				found_foo = check_alias (type.alias.name,
+										 type.alias.aux_type);
 			}
-			if (type.t.alias.name == "bar") {
-				found_bar = check_alias (type.t.alias.name,
-										 type.t.alias.aux_type);
+			if (type.alias.name == "bar") {
+				found_bar = check_alias (type.alias.name,
+										 type.alias.aux_type);
 			}
 		}
 	}
diff --git a/tools/qfcc/test/zerolinker.r b/tools/qfcc/test/zerolinker.r
index a5c6f7039..7b14f4a6e 100644
--- a/tools/qfcc/test/zerolinker.r
+++ b/tools/qfcc/test/zerolinker.r
@@ -28,10 +28,10 @@ main (void)
 		 ((int *)type - (int *) encodings.types) < encodings.size;
 		type = next_type (type)) {
 		if (type.meta == ty_union) {
-			if (type.t.strct.tag == "tag @param") {
+			if (type.strct.tag == "tag @param") {
 				found_param = 1;
 			}
-			if (type.t.strct.tag == "tag @zero") {
+			if (type.strct.tag == "tag @zero") {
 				found_zero = 1;
 			}
 		}

From 5bc57518b78909d32160704489c9ffc29788af44 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 30 Mar 2020 20:29:48 +0900
Subject: [PATCH 1070/1519] [qwaq] Add a scrollbar view

---
 ruamoko/qwaq/Makefile.am       |   1 +
 ruamoko/qwaq/builtins/curses.c |  59 +++++++++
 ruamoko/qwaq/ui/draw.h         |   2 +
 ruamoko/qwaq/ui/draw.r         |  16 +++
 ruamoko/qwaq/ui/scrollbar.h    |  35 ++++++
 ruamoko/qwaq/ui/scrollbar.r    | 216 +++++++++++++++++++++++++++++++++
 ruamoko/qwaq/ui/textcontext.h  |   1 +
 ruamoko/qwaq/ui/textcontext.r  |   2 +
 8 files changed, 332 insertions(+)
 create mode 100644 ruamoko/qwaq/ui/scrollbar.h
 create mode 100644 ruamoko/qwaq/ui/scrollbar.r

diff --git a/ruamoko/qwaq/Makefile.am b/ruamoko/qwaq/Makefile.am
index 9b8abcd18..94d8c3f95 100644
--- a/ruamoko/qwaq/Makefile.am
+++ b/ruamoko/qwaq/Makefile.am
@@ -40,6 +40,7 @@ qwaq_app_dat_src= \
 	ui/listener.r	\
 	ui/proxyview.r	\
 	ui/rect.r	\
+	ui/scrollbar.r	\
 	ui/textcontext.r	\
 	ui/titlebar.r	\
 	ui/view.r	\
diff --git a/ruamoko/qwaq/builtins/curses.c b/ruamoko/qwaq/builtins/curses.c
index 3f757b124..b03533db4 100644
--- a/ruamoko/qwaq/builtins/curses.c
+++ b/ruamoko/qwaq/builtins/curses.c
@@ -85,6 +85,7 @@ typedef enum qwaq_commands_e {
 	qwaq_cmd_wresize,
 	qwaq_cmd_resizeterm,
 	qwaq_cmd_mvwhline,
+	qwaq_cmd_mvwvline,
 } qwaq_commands;
 
 static const char *qwaq_command_names[]= {
@@ -118,6 +119,7 @@ static const char *qwaq_command_names[]= {
 	"wresize",
 	"resizeterm",
 	"mvwhline"
+	"mvwvline"
 };
 
 static window_t *
@@ -615,6 +617,19 @@ cmd_mvwhline (qwaq_resources_t *res)
 	mvwhline (window->win, y, x, ch, n);
 }
 
+static void
+cmd_mvwvline (qwaq_resources_t *res)
+{
+	int         window_id = RB_PEEK_DATA (res->command_queue, 2);
+	int         x = RB_PEEK_DATA (res->command_queue, 3);
+	int         y = RB_PEEK_DATA (res->command_queue, 4);
+	int         ch = RB_PEEK_DATA (res->command_queue, 5);
+	int         n = RB_PEEK_DATA (res->command_queue, 6);
+
+	window_t   *window = get_window (res, __FUNCTION__, window_id);
+	mvwvline (window->win, y, x, ch, n);
+}
+
 static void
 dump_command (qwaq_resources_t *res, int len)
 {
@@ -757,6 +772,9 @@ process_commands (qwaq_resources_t *res)
 			case qwaq_cmd_mvwhline:
 				cmd_mvwhline (res);
 				break;
+			case qwaq_cmd_mvwvline:
+				cmd_mvwvline (res);
+				break;
 		}
 		pthread_mutex_lock (&res->command_cond.mut);
 		RB_DROP_DATA (res->command_queue, len);
@@ -1109,6 +1127,33 @@ bi_mvwhline (progs_t *pr)
 	qwaq_mvwhline (pr, window_id, x, y, ch, n);
 }
 
+static void
+qwaq_mvwvline (progs_t *pr, int window_id, int x, int y, int ch, int n)
+{
+	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
+
+	if (get_window (res, __FUNCTION__, window_id)) {
+		int         command[] = {
+						qwaq_cmd_mvwvline, 0,
+						window_id, x, y, ch, n
+					};
+
+		command[1] = CMD_SIZE(command);
+		qwaq_submit_command (res, command);
+	}
+}
+static void
+bi_mvwvline (progs_t *pr)
+{
+	int         window_id = P_STRUCT (pr, qwaq_textcontext_t, 0).window;
+	int         x = P_INT (pr, 1);
+	int         y = P_INT (pr, 2);
+	int         ch = P_INT (pr, 3);
+	int         n = P_INT (pr, 4);
+
+	qwaq_mvwvline (pr, window_id, x, y, ch, n);
+}
+
 static void
 qwaq_mvwaddstr (progs_t *pr, int window_id, int x, int y, const char *str)
 {
@@ -1821,6 +1866,18 @@ bi_i_TextContext__mvhline_ (progs_t *pr)
 	qwaq_mvwhline (pr, window_id, pos->x, pos->y, ch, n);
 }
 
+static void
+bi_i_TextContext__mvvline_ (progs_t *pr)
+{
+	__auto_type self = &P_STRUCT (pr, qwaq_textcontext_t, 0);
+	int         window_id = self->window;
+	__auto_type pos = &P_PACKED (pr, Point, 2);
+	int         ch = P_INT (pr, 3);
+	int         n = P_INT (pr, 4);
+
+	qwaq_mvwvline (pr, window_id, pos->x, pos->y, ch, n);
+}
+
 static void
 bi_qwaq_clear (progs_t *pr, void *data)
 {
@@ -1875,6 +1932,7 @@ static builtin_t builtins[] = {
 	{"wresize",			bi_wresize,			-1},
 	{"resizeterm",		bi_resizeterm,		-1},
 	{"mvwhline",		bi_mvwhline,		-1},
+	{"mvwvline",		bi_mvwvline,		-1},
 
 	{"_c_TextContext__is_initialized",	bi_c_TextContext__is_initialized,  -1},
 	{"_c_TextContext__max_colors",		bi_c_TextContext__max_colors,	   -1},
@@ -1900,6 +1958,7 @@ static builtin_t builtins[] = {
 	{"_i_TextContext__scrollok_",		bi_i_TextContext__scrollok_,	   -1},
 	{"_i_TextContext__border_",			bi_i_TextContext__border_,		   -1},
 	{"_i_TextContext__mvhline_",		bi_i_TextContext__mvhline_,		   -1},
+	{"_i_TextContext__mvvline_",		bi_i_TextContext__mvvline_,		   -1},
 
 	{0}
 };
diff --git a/ruamoko/qwaq/ui/draw.h b/ruamoko/qwaq/ui/draw.h
index 708bad192..eb7379fe4 100644
--- a/ruamoko/qwaq/ui/draw.h
+++ b/ruamoko/qwaq/ui/draw.h
@@ -30,6 +30,8 @@
 - (void) mvvprintf: (Point) pos, string fmt, @va_list args;
 - (void) mvaddch: (Point) pos, int ch;
 - (void) mvaddstr: (Point) pos, string str;
+- (void) mvhline:(Point)pos, int ch, int len;
+- (void) mvvline:(Point)pos, int ch, int len;
 @end
 
 @interface DrawBuffer : Object <DrawBuffer, TextContext>
diff --git a/ruamoko/qwaq/ui/draw.r b/ruamoko/qwaq/ui/draw.r
index b9f181a8e..37be4e6c0 100644
--- a/ruamoko/qwaq/ui/draw.r
+++ b/ruamoko/qwaq/ui/draw.r
@@ -248,4 +248,20 @@
 	[self addstr: str];
 }
 
+- (void) mvhline:(Point)pos, int ch, int len
+{
+	while (len-- > 0) {
+		[self mvaddch:pos, ch];
+		pos.x++;
+	}
+}
+
+- (void) mvvline:(Point)pos, int ch, int len
+{
+	while (len-- > 0) {
+		[self mvaddch:pos, ch];
+		pos.y++;
+	}
+}
+
 @end
diff --git a/ruamoko/qwaq/ui/scrollbar.h b/ruamoko/qwaq/ui/scrollbar.h
new file mode 100644
index 000000000..7f710a25b
--- /dev/null
+++ b/ruamoko/qwaq/ui/scrollbar.h
@@ -0,0 +1,35 @@
+#ifndef __qwaq_ui_scrollbar_h
+#define __qwaq_ui_scrollbar_h
+
+#include "ui/view.h"
+
+@class Button;
+@class Group;
+@class ListenerGroup;
+
+@interface ScrollBar : View
+{
+	int         vertical;
+	int         bgchar;
+	Point       mouseStart;
+	Button     *backButton;
+	Button     *forwardButton;
+	Button     *thumbTab;
+	Group      *objects;
+	ListenerGroup *onScroll;
+
+	unsigned    pageStep;
+	unsigned    singleStep;
+	unsigned    range;
+	unsigned    index;
+}
++(ScrollBar *)horizontal:(unsigned)len at:(Point)pos;
++(ScrollBar *)vertical:(unsigned)len at:(Point)pos;
+-(ListenerGroup *)onScroll;
+-setRange:(unsigned)range;
+-setPageStep:(unsigned)pageStep;
+-setSingleStep:(unsigned)singleStep;
+-setIndex:(unsigned)index;
+@end
+
+#endif//__qwaq_ui_scrollbar_h
diff --git a/ruamoko/qwaq/ui/scrollbar.r b/ruamoko/qwaq/ui/scrollbar.r
new file mode 100644
index 000000000..78b8ab631
--- /dev/null
+++ b/ruamoko/qwaq/ui/scrollbar.r
@@ -0,0 +1,216 @@
+#include "ui/button.h"
+#include "ui/group.h"
+#include "ui/listener.h"
+#include "ui/scrollbar.h"
+
+@implementation ScrollBar
+
+-initWithRect:(Rect)rect
+{
+	if (!(self = [super initWithRect:rect])) {
+		return nil;
+	}
+	objects = [[Group withContext:textContext owner:self] retain];
+	onScroll = [[ListenerGroup listener] retain];
+	vertical = xlen == 1;
+	DrawBuffer *icons[3] = {
+		[DrawBuffer buffer:{1, 1}],
+		[DrawBuffer buffer:{1, 1}],
+		[DrawBuffer buffer:{1, 1}],
+	};
+	[icons[2] addch:acs_char (ACS_DIAMOND)];
+	Point thumbPos;
+	SEL thumbSel;
+	growMode = gfGrowAll;
+	if (vertical) {
+		[icons[0]addch:acs_char (ACS_UARROW)];
+		[icons[1]addch:acs_char (ACS_DARROW)];
+		thumbPos = {0, 1};
+		thumbSel = @selector(verticalSlide);
+		growMode &= ~gfGrowLoY;
+	} else {
+		[icons[0]addch:acs_char (ACS_LARROW)];
+		[icons[1]addch:acs_char (ACS_RARROW)];
+		thumbPos = {1, 0};
+		thumbSel = @selector(horizontalSlide);
+		growMode &= ~gfGrowLoX;
+	}
+	bgchar = acs_char (ACS_CKBOARD);
+	backButton = [Button withPos:{0, 0}
+					releasedIcon:icons[0] pressedIcon:icons[0]];
+	forwardButton = [Button withPos:{xlen - 1, ylen - 1}
+					   releasedIcon:icons[1] pressedIcon:icons[1]];
+	thumbTab = [Button withPos:thumbPos
+				  releasedIcon:icons[2] pressedIcon:icons[2]];
+
+	[[backButton onPress] addListener:self :@selector(scrollBack:)];
+	[[forwardButton onPress] addListener:self :@selector(scrollForward:)];
+	[[thumbTab onPress] addListener:self :thumbSel];
+
+	singleStep = 1;
+
+	[objects insert:backButton];
+	[objects insert:forwardButton];
+	[objects insert:thumbTab];
+	return self;
+}
+
++(ScrollBar *)horizontal:(unsigned)len at:(Point)pos
+{
+	if (len == 1) {
+		[self error:"can't make scrollbar of length 1"];
+	}
+	return [[[self alloc] initWithRect:{pos, {len, 1}}] autorelease];
+}
+
++(ScrollBar *)vertical:(unsigned)len at:(Point)pos
+{
+	if (len == 1) {
+		[self error:"can't make scrollbar of length 1"];
+	}
+	return [[[self alloc] initWithRect:{pos, {1, len}}] autorelease];
+}
+
+-(ListenerGroup *)onScroll
+{
+	return onScroll;
+}
+
+-draw
+{
+	if (vertical) {
+		[self mvvline:pos, bgchar, ylen];
+	} else {
+		[self mvhline:pos, bgchar, xlen];
+	}
+	[super draw];
+	[objects draw];
+	return self;
+}
+
+static void
+position_tab (ScrollBar *self)
+{
+	Point       p = {0, 0};
+	Point       o = [self.thumbTab origin];
+	if (self.range > 0) {
+		if (self.vertical) {
+			p.y = 1 + self.index * (self.ylen - 2) / (self.range - 1);
+		} else {
+			p.x = 1 + self.index * (self.xlen - 2) / (self.range - 1);
+		}
+	}
+	[self.thumbTab move:{p.x - o.x, p.y - o.y}];
+}
+
+-resize:(Extent)delta
+{
+	Extent size = self.size;
+	[super resize:delta];
+	delta = {self.size.width - size.width, self.size.height - size.height};
+	[objects resize:delta];
+	position_tab (self);
+	return self;
+}
+
+-page:(unsigned)step dir:(unsigned) dir
+{
+	unsigned    oind = index;
+
+	if (dir) {
+		if (range - 1 - index < step) {
+			step = range - 1 - index;
+		}
+		index += step;
+	} else {
+		if (index < step) {
+			step = index;
+		}
+		index -= step;
+	}
+
+	if (index != oind) {
+		position_tab (self);
+		[onScroll respond:self];
+	}
+	return self;
+}
+
+static void
+page (ScrollBar *self, Point pos)
+{
+	unsigned    pageDir = 0;
+	if (self.vertical) {
+		if (pos.y < [self.thumbTab origin].y) {
+			pageDir = 0;
+		} else {
+			pageDir = 1;
+		}
+	} else {
+		if (pos.x < [self.thumbTab origin].x) {
+			pageDir = 0;
+		} else {
+			pageDir = 1;
+		}
+	}
+	[self page:self.pageStep dir:pageDir];
+}
+
+-(void)scrollBack:(id)sender
+{
+	[self page:singleStep dir:0];
+}
+
+-(void)scrollForward:(id)sender
+{
+	[self page:singleStep dir:1];
+}
+
+-handleEvent:(qwaq_event_t *)event
+{
+	[super handleEvent: event];
+	[objects handleEvent: event];
+	if (event.what == qe_mousedown) {
+		[self grabMouse];
+		mouseStart = {event.mouse.x, event.mouse.y};
+		page(self, mouseStart);
+		event.what = qe_none;
+	} else if (event.what==qe_mouseauto) {
+		page(self, mouseStart);
+		event.what = qe_none;
+	} else if (event.what == qe_mouseup) {
+		[self releaseMouse];
+		event.what = qe_none;
+	}
+	return self;
+}
+
+-setRange:(unsigned)range
+{
+	self.range = range;
+	return self;
+}
+
+-setPageStep:(unsigned)pageStep
+{
+	self.pageStep = pageStep;
+	return self;
+}
+
+-setSingleStep:(unsigned)singleStep
+{
+	self.singleStep = singleStep;
+	return self;
+}
+
+-setIndex:(unsigned)index
+{
+	if (index > self.index) {
+		[self page:index - self.index dir:1];
+	} else {
+		[self page:self.index - index dir:0];
+	}
+	return self;
+}
+
+@end
diff --git a/ruamoko/qwaq/ui/textcontext.h b/ruamoko/qwaq/ui/textcontext.h
index f68ae1aa1..2369dfeee 100644
--- a/ruamoko/qwaq/ui/textcontext.h
+++ b/ruamoko/qwaq/ui/textcontext.h
@@ -55,6 +55,7 @@
 - (void) scrollok: (int) flag;
 - (void) border: (box_sides_t) sides, box_corners_t corners;
 - (void) mvhline: (Point) pos, int ch, int n;
+- (void) mvvline: (Point) pos, int ch, int n;
 -clearReact: (Rect) rect;
 @end
 
diff --git a/ruamoko/qwaq/ui/textcontext.r b/ruamoko/qwaq/ui/textcontext.r
index 8867f1472..1f2ddd066 100644
--- a/ruamoko/qwaq/ui/textcontext.r
+++ b/ruamoko/qwaq/ui/textcontext.r
@@ -163,6 +163,7 @@ static TextContext *screen;
 - (void) mvaddch: (Point) pos, int ch = #0;
 - (void) mvaddstr: (Point) pos, string str = #0;
 - (void) mvhline: (Point) pos, int ch, int n = #0;
+- (void) mvvline: (Point) pos, int ch, int n = #0;
 
 - (void) resizeTo: (Extent) newSize = #0;	// absolute size
 - (void) refresh = #0;
@@ -218,5 +219,6 @@ void wresize (window_t window, int width, int height) = #0;
 void resizeterm (int width, int height) = #0;
 Rect getwrect (window_t window) = #0;
 void mvwhline (window_t win, int x, int y, int ch, int n) = #0;
+void mvwvline (window_t win, int x, int y, int ch, int n) = #0;
 
 void printf(string fmt, ...) = #0;

From dbbdb31cb1d9f3fd77ffff2ad56e8dba8db2ad9a Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 30 Mar 2020 21:58:06 +0900
Subject: [PATCH 1071/1519] [qwaq] Add a synchronous printf command

This puts a print command (to Sys_Printf) into the queue making it
easier to check command sequences since regular printf is asynchronous
with the stream.
---
 ruamoko/qwaq/builtins/curses.c | 48 ++++++++++++++++++++++++++++++----
 ruamoko/qwaq/ui/curses.h       |  1 +
 ruamoko/qwaq/ui/textcontext.r  |  1 +
 3 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/ruamoko/qwaq/builtins/curses.c b/ruamoko/qwaq/builtins/curses.c
index b03533db4..04ef11516 100644
--- a/ruamoko/qwaq/builtins/curses.c
+++ b/ruamoko/qwaq/builtins/curses.c
@@ -55,6 +55,7 @@
 #define CMD_SIZE(x) sizeof(x)/sizeof(x[0])
 
 typedef enum qwaq_commands_e {
+	qwaq_cmd_syncprint,
 	qwaq_cmd_newwin,
 	qwaq_cmd_delwin,
 	qwaq_cmd_getwrect,
@@ -89,6 +90,7 @@ typedef enum qwaq_commands_e {
 } qwaq_commands;
 
 static const char *qwaq_command_names[]= {
+	"syncprint",
 	"newwin",
 	"delwin",
 	"getwrect",
@@ -118,8 +120,8 @@ static const char *qwaq_command_names[]= {
 	"mvwblit_line",
 	"wresize",
 	"resizeterm",
-	"mvwhline"
-	"mvwvline"
+	"mvwhline",
+	"mvwvline",
 };
 
 static window_t *
@@ -280,6 +282,15 @@ qwaq_wait_result (qwaq_resources_t *res, int *result, int cmd, unsigned len)
 	pthread_mutex_unlock (&res->results_cond.mut);
 }
 
+static void
+cmd_syncprint (qwaq_resources_t *res)
+{
+	int         string_id = RB_PEEK_DATA (res->command_queue, 2);
+
+	Sys_Printf ("%s\n", res->strings[string_id].str);
+	release_string (res, string_id);
+}
+
 static void
 cmd_newwin (qwaq_resources_t *res)
 {
@@ -636,10 +647,14 @@ dump_command (qwaq_resources_t *res, int len)
 	if (0) {
 		qwaq_commands cmd = RB_PEEK_DATA (res->command_queue, 0);
 		Sys_Printf ("%s[%d]", qwaq_command_names[cmd], len);
-		for (int i = 2; i < len; i++) {
-			Sys_Printf (" %d", RB_PEEK_DATA (res->command_queue, i));
+		if (cmd == qwaq_cmd_syncprint) {
+			Sys_Printf (" ");
+		} else {
+			for (int i = 2; i < len; i++) {
+				Sys_Printf (" %d", RB_PEEK_DATA (res->command_queue, i));
+			}
+			Sys_Printf ("\n");
 		}
-		Sys_Printf ("\n");
 	}
 }
 
@@ -682,6 +697,9 @@ process_commands (qwaq_resources_t *res)
 		dump_command (res, len);
 		qwaq_commands cmd = RB_PEEK_DATA (res->command_queue, 0);
 		switch (cmd) {
+			case qwaq_cmd_syncprint:
+				cmd_syncprint (res);
+				break;
 			case qwaq_cmd_newwin:
 				cmd_newwin (res);
 				break;
@@ -829,6 +847,25 @@ bi_shutdown (void *_pr)
 	}
 }
 
+static void
+bi_syncprintf (progs_t *pr)
+{
+	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
+	const char *fmt = P_GSTRING (pr, 0);
+	int         count = pr->pr_argc - 1;
+	pr_type_t **args = pr->pr_params + 1;
+	int         string_id = acquire_string (res);
+	dstring_t  *print_buffer = res->strings + string_id;
+	int         command[] = { qwaq_cmd_syncprint, 0, string_id };
+
+	command[1] = CMD_SIZE(command);
+
+	dstring_clearstr (print_buffer);
+	PR_Sprintf (pr, print_buffer, "mvwaddstr", fmt, count, args);
+
+	qwaq_submit_command (res, command);
+}
+
 static void
 bi_newwin (progs_t *pr)
 {
@@ -1894,6 +1931,7 @@ bi_qwaq_clear (progs_t *pr, void *data)
 
 static builtin_t builtins[] = {
 	{"initialize",		bi_initialize,		-1},
+	{"syncprintf",		bi_syncprintf,		-1},
 	{"create_window",	bi_newwin,			-1},
 	{"destroy_window",	bi_delwin,			-1},
 	{"getwrect",		bi_getwrect,		-1},
diff --git a/ruamoko/qwaq/ui/curses.h b/ruamoko/qwaq/ui/curses.h
index 65143159f..1849a6440 100644
--- a/ruamoko/qwaq/ui/curses.h
+++ b/ruamoko/qwaq/ui/curses.h
@@ -87,6 +87,7 @@ typedef struct panel_s *panel_t;
 extern window_t stdscr;
 
 void initialize (void);
+void syncprintf (string fnt, ...);
 window_t create_window (int xpos, int ypos, int xlen, int ylen);
 void destroy_window (window_t win);
 void mvwprintf (window_t win, int x, int y, string fmt, ...);
diff --git a/ruamoko/qwaq/ui/textcontext.r b/ruamoko/qwaq/ui/textcontext.r
index 1f2ddd066..bbe7a9476 100644
--- a/ruamoko/qwaq/ui/textcontext.r
+++ b/ruamoko/qwaq/ui/textcontext.r
@@ -179,6 +179,7 @@ static TextContext *screen;
 window_t stdscr = (window_t) 1;
 
 void initialize (void) = #0;
+void syncprintf (string fnt, ...) = #0;
 window_t create_window (int xpos, int ypos, int xlen, int ylen) = #0;
 void destroy_window (window_t win) = #0;
 void mvwprintf (window_t win, int x, int y, string fmt, ...) = #0;

From 02f8cc976027272ef721406d4790d156f0766eb6 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 30 Mar 2020 22:01:17 +0900
Subject: [PATCH 1072/1519] [qwaq] Fix a bunch of issues with the scrollbar

Leaking memory. And worse, it wasn't drawing its buttons (group wasn't
setting view contexts) and then the buttons were in the wrong place, so
had to add a backing buffer for the buttons.
---
 ruamoko/qwaq/ui/group.r     |  2 ++
 ruamoko/qwaq/ui/scrollbar.h |  2 ++
 ruamoko/qwaq/ui/scrollbar.r | 21 ++++++++++++++++-----
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/ruamoko/qwaq/ui/group.r b/ruamoko/qwaq/ui/group.r
index adaa21958..8bbca6d9b 100644
--- a/ruamoko/qwaq/ui/group.r
+++ b/ruamoko/qwaq/ui/group.r
@@ -38,6 +38,8 @@
 -setContext: (id<TextContext>) context
 {
 	self.context = context;
+	[views makeObjectsPerformSelector:@selector(setContext:)
+						   withObject:context];
 	return self;
 }
 
diff --git a/ruamoko/qwaq/ui/scrollbar.h b/ruamoko/qwaq/ui/scrollbar.h
index 7f710a25b..08d8ea6d6 100644
--- a/ruamoko/qwaq/ui/scrollbar.h
+++ b/ruamoko/qwaq/ui/scrollbar.h
@@ -4,6 +4,7 @@
 #include "ui/view.h"
 
 @class Button;
+@class DrawBuffer;
 @class Group;
 @class ListenerGroup;
 
@@ -12,6 +13,7 @@
 	int         vertical;
 	int         bgchar;
 	Point       mouseStart;
+	DrawBuffer *buffer;
 	Button     *backButton;
 	Button     *forwardButton;
 	Button     *thumbTab;
diff --git a/ruamoko/qwaq/ui/scrollbar.r b/ruamoko/qwaq/ui/scrollbar.r
index 78b8ab631..86b2a6071 100644
--- a/ruamoko/qwaq/ui/scrollbar.r
+++ b/ruamoko/qwaq/ui/scrollbar.r
@@ -10,7 +10,8 @@
 	if (!(self = [super initWithRect:rect])) {
 		return nil;
 	}
-	objects = [[Group withContext:textContext owner:self] retain];
+	buffer = [[DrawBuffer buffer:size] retain];
+	objects = [[Group withContext:buffer owner:self] retain];
 	onScroll = [[ListenerGroup listener] retain];
 	vertical = xlen == 1;
 	DrawBuffer *icons[3] = {
@@ -23,14 +24,14 @@
 	SEL thumbSel;
 	growMode = gfGrowAll;
 	if (vertical) {
-		[icons[0]addch:acs_char (ACS_UARROW)];
-		[icons[1]addch:acs_char (ACS_DARROW)];
+		[icons[0] addch:acs_char (ACS_UARROW)];
+		[icons[1] addch:acs_char (ACS_DARROW)];
 		thumbPos = {0, 1};
 		thumbSel = @selector(verticalSlide);
 		growMode &= ~gfGrowLoY;
 	} else {
-		[icons[0]addch:acs_char (ACS_LARROW)];
-		[icons[1]addch:acs_char (ACS_RARROW)];
+		[icons[0] addch:acs_char (ACS_LARROW)];
+		[icons[1] addch:acs_char (ACS_RARROW)];
 		thumbPos = {1, 0};
 		thumbSel = @selector(horizontalSlide);
 		growMode &= ~gfGrowLoX;
@@ -55,6 +56,13 @@
 	return self;
 }
 
+-(void)dealloc
+{
+	[objects release];
+	[buffer release];
+	[onScroll release];
+}
+
 +(ScrollBar *)horizontal:(unsigned)len at:(Point)pos
 {
 	if (len == 1) {
@@ -78,6 +86,7 @@
 
 -draw
 {
+	syncprintf("scrollbar start");
 	if (vertical) {
 		[self mvvline:pos, bgchar, ylen];
 	} else {
@@ -85,6 +94,8 @@
 	}
 	[super draw];
 	[objects draw];
+	[textContext blitFromBuffer:buffer to:pos from:[buffer rect]];
+	syncprintf("scrollbar end");
 	return self;
 }
 

From b8005a99c9f21a3b9f91d91c93f2534693ae04f0 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 30 Mar 2020 22:02:58 +0900
Subject: [PATCH 1073/1519] [qwaq] Add a scroll bar to the debug source window

It's not quite hooked up properly yet (Editor ignores the message), but
it did help get ScrollBar displaying properly.
---
 ruamoko/qwaq/debugger/debugger.h |  2 ++
 ruamoko/qwaq/debugger/debugger.r |  7 ++++++-
 ruamoko/qwaq/editor/editor.h     |  4 +++-
 ruamoko/qwaq/editor/editor.r     | 28 +++++++++++++++++++++++-----
 4 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/ruamoko/qwaq/debugger/debugger.h b/ruamoko/qwaq/debugger/debugger.h
index 95379099d..0b3b75f50 100644
--- a/ruamoko/qwaq/debugger/debugger.h
+++ b/ruamoko/qwaq/debugger/debugger.h
@@ -9,6 +9,7 @@
 
 @class ProxyView;
 @class Editor;
+@class ScrollBar;
 @class Window;
 @class Array;
 
@@ -22,6 +23,7 @@
 	Editor     *current_file;
 
 	Window     *locals_window;
+	ScrollBar  *scrollbar;
 	LocalsView *locals_view;
 }
 +(Debugger *)withTarget:(qdb_target_t)target;
diff --git a/ruamoko/qwaq/debugger/debugger.r b/ruamoko/qwaq/debugger/debugger.r
index d54489788..3e64424d2 100644
--- a/ruamoko/qwaq/debugger/debugger.r
+++ b/ruamoko/qwaq/debugger/debugger.r
@@ -6,6 +6,7 @@
 #include "ui/curses.h"
 #include "ui/listener.h"
 #include "ui/proxyview.h"
+#include "ui/scrollbar.h"
 #include "ui/window.h"
 #include "debugger/debugger.h"
 #include "debugger/typeencodings.h"
@@ -30,10 +31,14 @@
 	}
 	self.target = target;
 
+	Extent s = [application size];
 	files = [[Array array] retain];
-	source_window = [Window withRect: {nil, [application size]}];
+	source_window = [Window withRect: {nil, s}];
 	[application addView:source_window];
 
+	scrollbar = [ScrollBar vertical:s.height - 2 at:{s.width - 1, 1}];
+	[source_window insert:scrollbar];
+
 	return self;
 }
 
diff --git a/ruamoko/qwaq/editor/editor.h b/ruamoko/qwaq/editor/editor.h
index fb5aaa7d3..3a2cd48c5 100644
--- a/ruamoko/qwaq/editor/editor.h
+++ b/ruamoko/qwaq/editor/editor.h
@@ -7,11 +7,13 @@
 @class Editor;
 @class EditBuffer;
 @class ListenerGroup;
+@class ScrollBar;
 
 @interface Editor : View
 {
 	EditBuffer *buffer;
 	DrawBuffer *linebuffer;
+	ScrollBar  *vScrollBar;
 	eb_sel_t    selection;
 	unsigned    base_index;		// top left corner
 	unsigned    line_index;		// current line
@@ -23,7 +25,7 @@
 	string      filename;
 }
 +(Editor *)withRect:(Rect)rect file:(string)filename;
--initWithRect:(Rect) rect file:(string) filename;
+-setVerticalScrollBar:(ScrollBar *)scrollbar;
 -(string)filename;
 -scrollUp:(unsigned) count;
 -scrollDown:(unsigned) count;
diff --git a/ruamoko/qwaq/editor/editor.r b/ruamoko/qwaq/editor/editor.r
index 25e87c7db..3248ce59d 100644
--- a/ruamoko/qwaq/editor/editor.r
+++ b/ruamoko/qwaq/editor/editor.r
@@ -2,14 +2,10 @@
 #include "qwaq-app.h"
 #include "editor/editor.h"
 #include "ui/listener.h"
+#include "ui/scrollbar.h"
 
 @implementation Editor
 
-+(Editor *)withRect:(Rect)rect file:(string)filename
-{
-	return [[[self alloc] initWithRect:rect file:filename] autorelease];
-}
-
 -initWithRect:(Rect) rect file:(string) filename
 {
 	if (!(self = [super initWithRect: rect])) {
@@ -24,8 +20,30 @@
 	return self;
 }
 
++(Editor *)withRect:(Rect)rect file:(string)filename
+{
+	return [[[self alloc] initWithRect:rect file:filename] autorelease];
+}
+
+-(void)onScroll:(id)sender
+{
+}
+
+-setVerticalScrollBar:(ScrollBar *)scrollbar
+{
+	[scrollbar retain];
+	[[vScrollBar onScroll] removeListener:self :@selector(onScroll)];
+	[vScrollBar release];
+
+	vScrollBar = scrollbar;
+	[vScrollBar setRange:line_count];
+	[[vScrollBar onScroll] addListener:self :@selector(onScroll)];
+	return self;
+}
+
 -(void)dealloc
 {
+	[vScrollBar release];
 	[buffer release];
 	[linebuffer release];
 	[super dealloc];

From 1a34f3663aa20b94f886cb7af6ca3d4a8096ca51 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 30 Mar 2020 22:50:29 +0900
Subject: [PATCH 1074/1519] [qwaq] Hook up the scroll bar

It's mostly working now, just some issues with clicking on the bar and
the thumb tab doesn't work.
---
 ruamoko/qwaq/debugger/debugger.r |  3 +++
 ruamoko/qwaq/editor/editor.r     | 31 +++++++++++++++++-----------
 ruamoko/qwaq/ui/scrollbar.h      |  1 +
 ruamoko/qwaq/ui/scrollbar.r      | 35 ++++++++++++++++++++++----------
 4 files changed, 47 insertions(+), 23 deletions(-)

diff --git a/ruamoko/qwaq/debugger/debugger.r b/ruamoko/qwaq/debugger/debugger.r
index 3e64424d2..6c16655e8 100644
--- a/ruamoko/qwaq/debugger/debugger.r
+++ b/ruamoko/qwaq/debugger/debugger.r
@@ -73,6 +73,7 @@
 	file_proxy = [ProxyView withView: current_file];
 	[[current_file gotoLine:state.line - 1] highlightLine];
 	[[current_file onEvent] addListener: self :@selector(proxy_event::)];
+	[current_file setVerticalScrollBar:scrollbar];
 	//FIXME id<View>?
 	[source_window insertSelected: (View *) file_proxy];
 	[source_window setTitle: [current_file filename]];
@@ -95,9 +96,11 @@
 
 	printf ("%s:%d\n", state.file, state.line);
 	if (current_file != file) {
+		[current_file setVerticalScrollBar:nil];
 		[[current_file onEvent] removeListener:self :@selector(proxy_event::)];
 		[file_proxy setView:file];
 		[[file onEvent] addListener:self :@selector(proxy_event::)];
+		[file setVerticalScrollBar:scrollbar];
 		[source_window setTitle: [file filename]];
 		current_file = file;
 	}
diff --git a/ruamoko/qwaq/editor/editor.r b/ruamoko/qwaq/editor/editor.r
index 3248ce59d..64daf5773 100644
--- a/ruamoko/qwaq/editor/editor.r
+++ b/ruamoko/qwaq/editor/editor.r
@@ -25,19 +25,15 @@
 	return [[[self alloc] initWithRect:rect file:filename] autorelease];
 }
 
--(void)onScroll:(id)sender
-{
-}
-
 -setVerticalScrollBar:(ScrollBar *)scrollbar
 {
 	[scrollbar retain];
-	[[vScrollBar onScroll] removeListener:self :@selector(onScroll)];
+	[[vScrollBar onScroll] removeListener:self :@selector(onScroll:)];
 	[vScrollBar release];
 
 	vScrollBar = scrollbar;
 	[vScrollBar setRange:line_count];
-	[[vScrollBar onScroll] addListener:self :@selector(onScroll)];
+	[[vScrollBar onScroll] addListener:self :@selector(onScroll:)];
 	return self;
 }
 
@@ -164,6 +160,22 @@ static int handleEvent (Editor *self, qwaq_event_t *event)
 	return self;
 }
 
+-scrollTo:(unsigned)target
+{
+	if (target > scroll.y) {
+		base_index = [buffer nextLine:base_index :target - scroll.y];
+	} else if (target < scroll.y) {
+		base_index = [buffer prevLine:base_index :scroll.y - target];
+	}
+	scroll.y = target;
+	return self;
+}
+
+-(void)onScroll:(id)sender
+{
+	[self scrollTo:[sender index]];
+}
+
 -recenter:(int) force
 {
 	if (!force) {
@@ -177,12 +189,7 @@ static int handleEvent (Editor *self, qwaq_event_t *event)
 	} else {
 		target = cursor.y - ylen / 2;
 	}
-	if (target > scroll.y) {
-		base_index = [buffer nextLine:base_index :target - scroll.y];
-	} else if (target < scroll.y) {
-		base_index = [buffer prevLine:base_index :scroll.y - target];
-	}
-	scroll.y = target;
+	[self scrollTo:target];
 	return self;
 }
 
diff --git a/ruamoko/qwaq/ui/scrollbar.h b/ruamoko/qwaq/ui/scrollbar.h
index 08d8ea6d6..190b5a59b 100644
--- a/ruamoko/qwaq/ui/scrollbar.h
+++ b/ruamoko/qwaq/ui/scrollbar.h
@@ -32,6 +32,7 @@
 -setPageStep:(unsigned)pageStep;
 -setSingleStep:(unsigned)singleStep;
 -setIndex:(unsigned)index;
+-(unsigned)index;
 @end
 
 #endif//__qwaq_ui_scrollbar_h
diff --git a/ruamoko/qwaq/ui/scrollbar.r b/ruamoko/qwaq/ui/scrollbar.r
index 86b2a6071..e90ad70e7 100644
--- a/ruamoko/qwaq/ui/scrollbar.r
+++ b/ruamoko/qwaq/ui/scrollbar.r
@@ -10,6 +10,7 @@
 	if (!(self = [super initWithRect:rect])) {
 		return nil;
 	}
+	options = ofRelativeEvents;
 	buffer = [[DrawBuffer buffer:size] retain];
 	objects = [[Group withContext:buffer owner:self] retain];
 	onScroll = [[ListenerGroup listener] retain];
@@ -27,13 +28,13 @@
 		[icons[0] addch:acs_char (ACS_UARROW)];
 		[icons[1] addch:acs_char (ACS_DARROW)];
 		thumbPos = {0, 1};
-		thumbSel = @selector(verticalSlide);
+		thumbSel = @selector(verticalSlide:);
 		growMode &= ~gfGrowLoY;
 	} else {
 		[icons[0] addch:acs_char (ACS_LARROW)];
 		[icons[1] addch:acs_char (ACS_RARROW)];
 		thumbPos = {1, 0};
-		thumbSel = @selector(horizontalSlide);
+		thumbSel = @selector(horizontalSlide:);
 		growMode &= ~gfGrowLoX;
 	}
 	bgchar = acs_char (ACS_CKBOARD);
@@ -44,8 +45,8 @@
 	thumbTab = [Button withPos:thumbPos
 				  releasedIcon:icons[2] pressedIcon:icons[2]];
 
-	[[backButton onPress] addListener:self :@selector(scrollBack:)];
-	[[forwardButton onPress] addListener:self :@selector(scrollForward:)];
+	[[backButton onClick] addListener:self :@selector(scrollBack:)];
+	[[forwardButton onClick] addListener:self :@selector(scrollForward:)];
 	[[thumbTab onPress] addListener:self :thumbSel];
 
 	singleStep = 1;
@@ -86,16 +87,14 @@
 
 -draw
 {
-	syncprintf("scrollbar start");
-	if (vertical) {
-		[self mvvline:pos, bgchar, ylen];
-	} else {
-		[self mvhline:pos, bgchar, xlen];
-	}
 	[super draw];
+	if (vertical) {
+		[buffer mvvline:{0,0}, bgchar, ylen];
+	} else {
+		[buffer mvhline:{0,0}, bgchar, xlen];
+	}
 	[objects draw];
 	[textContext blitFromBuffer:buffer to:pos from:[buffer rect]];
-	syncprintf("scrollbar end");
 	return self;
 }
 
@@ -112,6 +111,7 @@ position_tab (ScrollBar *self)
 		}
 	}
 	[self.thumbTab move:{p.x - o.x, p.y - o.y}];
+	[self redraw];
 }
 
 -resize:(Extent)delta
@@ -177,6 +177,14 @@ page (ScrollBar *self, Point pos)
 	[self page:singleStep dir:1];
 }
 
+-(void)horizontalSlide:(id)sender
+{
+}
+
+-(void)verticalSlide:(id)sender
+{
+}
+
 -handleEvent:(qwaq_event_t *)event
 {
 	[super handleEvent: event];
@@ -224,4 +232,9 @@ page (ScrollBar *self, Point pos)
 	return self;
 }
 
+-(unsigned)index
+{
+	return index;
+}
+
 @end

From 2e1bddb94c0e1df4955fee02d4aa6289bfb75409 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 30 Mar 2020 22:51:18 +0900
Subject: [PATCH 1075/1519] [qwaq] Catch adding bad messages to listeners

Better an informative error than a "null function" error.
---
 ruamoko/qwaq/ui/listener.r | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ruamoko/qwaq/ui/listener.r b/ruamoko/qwaq/ui/listener.r
index 5035a4324..3664040d2 100644
--- a/ruamoko/qwaq/ui/listener.r
+++ b/ruamoko/qwaq/ui/listener.r
@@ -18,6 +18,9 @@
 	self.responder = responder;
 	self.message = message;
 	imp = [responder methodForSelector: message];
+	if (!imp) {
+		[self error:"method not found: %s", sel_get_name (message)];
+	}
 	return self;
 }
 

From 655ec3e02b9591aa9f142b78f9ea7eb7bd4ced05 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 30 Mar 2020 23:41:20 +0900
Subject: [PATCH 1076/1519] [qwaq] Set event.when for mouseauto events

---
 ruamoko/qwaq/builtins/curses.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ruamoko/qwaq/builtins/curses.c b/ruamoko/qwaq/builtins/curses.c
index 04ef11516..3075f9412 100644
--- a/ruamoko/qwaq/builtins/curses.c
+++ b/ruamoko/qwaq/builtins/curses.c
@@ -822,6 +822,7 @@ get_event (qwaq_resources_t *res, qwaq_event_t *event)
 			was_event = 1;
 		} else if (res->button_state) {
 			event->what = qe_mouseauto;
+			event->when = Sys_DoubleTime ();
 			event->mouse.buttons = res->button_state;
 			event->mouse.x = res->mouse_x;
 			event->mouse.y = res->mouse_y;

From af64e36653dc17cf45774ced5e3d16c3bf84e676 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 30 Mar 2020 23:42:06 +0900
Subject: [PATCH 1077/1519] [qwaq] Get the scrollbar working nicely

---
 ruamoko/qwaq/editor/editor.r |  1 +
 ruamoko/qwaq/ui/button.r     |  1 +
 ruamoko/qwaq/ui/scrollbar.h  |  2 ++
 ruamoko/qwaq/ui/scrollbar.r  | 17 +++++++++++------
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/ruamoko/qwaq/editor/editor.r b/ruamoko/qwaq/editor/editor.r
index 64daf5773..0f6e3283c 100644
--- a/ruamoko/qwaq/editor/editor.r
+++ b/ruamoko/qwaq/editor/editor.r
@@ -33,6 +33,7 @@
 
 	vScrollBar = scrollbar;
 	[vScrollBar setRange:line_count];
+	[vScrollBar setPageStep: ylen];
 	[[vScrollBar onScroll] addListener:self :@selector(onScroll:)];
 	return self;
 }
diff --git a/ruamoko/qwaq/ui/button.r b/ruamoko/qwaq/ui/button.r
index 1d6228571..51e9d36b3 100644
--- a/ruamoko/qwaq/ui/button.r
+++ b/ruamoko/qwaq/ui/button.r
@@ -117,6 +117,7 @@
 		if (action) {
 			[action respond: self];
 		}
+		event.what = qe_none;
 	}
 	return self;
 }
diff --git a/ruamoko/qwaq/ui/scrollbar.h b/ruamoko/qwaq/ui/scrollbar.h
index 190b5a59b..bb0f5c25c 100644
--- a/ruamoko/qwaq/ui/scrollbar.h
+++ b/ruamoko/qwaq/ui/scrollbar.h
@@ -12,7 +12,9 @@
 {
 	int         vertical;
 	int         bgchar;
+	double      mouseTime;
 	Point       mouseStart;
+	Point       tabStart;
 	DrawBuffer *buffer;
 	Button     *backButton;
 	Button     *forwardButton;
diff --git a/ruamoko/qwaq/ui/scrollbar.r b/ruamoko/qwaq/ui/scrollbar.r
index e90ad70e7..3364192e9 100644
--- a/ruamoko/qwaq/ui/scrollbar.r
+++ b/ruamoko/qwaq/ui/scrollbar.r
@@ -141,24 +141,24 @@ position_tab (ScrollBar *self)
 	}
 
 	if (index != oind) {
-		position_tab (self);
 		[onScroll respond:self];
+		position_tab (self);
 	}
 	return self;
 }
 
 static void
-page (ScrollBar *self, Point pos)
+page (ScrollBar *self, Point pos, Point thumb)
 {
 	unsigned    pageDir = 0;
 	if (self.vertical) {
-		if (pos.y < [self.thumbTab origin].y) {
+		if (pos.y < thumb.y) {
 			pageDir = 0;
 		} else {
 			pageDir = 1;
 		}
 	} else {
-		if (pos.x < [self.thumbTab origin].x) {
+		if (pos.x < thumb.x) {
 			pageDir = 0;
 		} else {
 			pageDir = 1;
@@ -191,11 +191,16 @@ page (ScrollBar *self, Point pos)
 	[objects handleEvent: event];
 	if (event.what == qe_mousedown) {
 		[self grabMouse];
+		mouseTime = event.when;
 		mouseStart = {event.mouse.x, event.mouse.y};
-		page(self, mouseStart);
+		tabStart = [thumbTab origin];
+		page(self, mouseStart, tabStart);
 		event.what = qe_none;
 	} else if (event.what==qe_mouseauto) {
-		page(self, mouseStart);
+		if (event.when - mouseTime > 0.1) {
+			mouseTime = event.when;
+			page(self, mouseStart, tabStart);
+		}
 		event.what = qe_none;
 	} else if (event.what == qe_mouseup) {
 		[self releaseMouse];

From 5bb71c208949c3e3708527960e98b5e7d83b562c Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 31 Mar 2020 01:18:16 +0900
Subject: [PATCH 1078/1519] [qwaq] Clean up some debug prints

---
 ruamoko/qwaq/debugger/debugger.r   | 1 -
 ruamoko/qwaq/debugger/localsview.r | 3 ---
 2 files changed, 4 deletions(-)

diff --git a/ruamoko/qwaq/debugger/debugger.r b/ruamoko/qwaq/debugger/debugger.r
index 6c16655e8..22a450e10 100644
--- a/ruamoko/qwaq/debugger/debugger.r
+++ b/ruamoko/qwaq/debugger/debugger.r
@@ -94,7 +94,6 @@
 	qdb_state_t state = qdb_get_state (target);
 	Editor     *file = [self find_file: state.file];
 
-	printf ("%s:%d\n", state.file, state.line);
 	if (current_file != file) {
 		[current_file setVerticalScrollBar:nil];
 		[[current_file onEvent] removeListener:self :@selector(proxy_event::)];
diff --git a/ruamoko/qwaq/debugger/localsview.r b/ruamoko/qwaq/debugger/localsview.r
index f90d429fb..77d2f150f 100644
--- a/ruamoko/qwaq/debugger/localsview.r
+++ b/ruamoko/qwaq/debugger/localsview.r
@@ -102,9 +102,6 @@
 			@param      value = nil;
 			string      valstr = "--";
 			unsigned    offset = func.local_data + def.offset;
-			printf ("%d %d %s %d\n", def.type_size, offset,
-					qdb_get_string (target, def.name),
-					def.type_encoding);
 			qdb_get_data (target, offset, def.type_size >> 16, &value);
 			switch (def.type_size & 0xffff) {
 				case ev_void:

From 17da19b979bd256dcc275054a73d2de6aeefd8f2 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 31 Mar 2020 01:22:54 +0900
Subject: [PATCH 1079/1519] [qwaq] Set view owner when setting proxy view

This fixes the debug editor's redraw issues.
---
 ruamoko/qwaq/ui/proxyview.r | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ruamoko/qwaq/ui/proxyview.r b/ruamoko/qwaq/ui/proxyview.r
index e4a10598e..71a85e36d 100644
--- a/ruamoko/qwaq/ui/proxyview.r
+++ b/ruamoko/qwaq/ui/proxyview.r
@@ -39,11 +39,13 @@
 	}
 	[self.view hide];
 	[self.view setContext:nil];
+	[self.view setOwner:nil];
 
 	[view retain];
 	[self.view release];
 	self.view = view;
 
+	[view setOwner:owner];
 	[view setContext:[owner context]];
 	if (state & sfDrawn) {
 		[view draw];

From 34706906f5a3aa667e2dca1e4779ba587ca8e7e4 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 31 Mar 2020 10:54:15 +0900
Subject: [PATCH 1080/1519] [qwaq] Allow views to be moved/resized without
 redraw

The move is to a specified point and resize to a specified size rather
than a delta.
---
 ruamoko/qwaq/ui/view.h |  2 ++
 ruamoko/qwaq/ui/view.r | 12 ++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/ruamoko/qwaq/ui/view.h b/ruamoko/qwaq/ui/view.h
index 09a8ab8ba..4752c4349 100644
--- a/ruamoko/qwaq/ui/view.h
+++ b/ruamoko/qwaq/ui/view.h
@@ -67,6 +67,8 @@ enum {
 -move: (Point) delta;
 -resize: (Extent) delta;
 -move:(Point)dpos andResize:(Extent)dsize;
+-moveTo:(Point)pos;	// does not redraw
+-resizeTo:(Extent)size;	// does not redraw
 -grow: (Extent) delta;
 -(ListenerGroup *)onEvent;
 -handleEvent: (qwaq_event_t *) event;
diff --git a/ruamoko/qwaq/ui/view.r b/ruamoko/qwaq/ui/view.r
index f47d85f63..a6817b81d 100644
--- a/ruamoko/qwaq/ui/view.r
+++ b/ruamoko/qwaq/ui/view.r
@@ -277,6 +277,18 @@ updateScreenCursor (View *view)
 	return self;
 }
 
+-moveTo:(Point)pos
+{
+	self.pos = pos;
+	return self;
+}
+
+-resizeTo:(Extent)size
+{
+	self.size = size;
+	return self;
+}
+
 -grow: (Extent) delta
 {
 	Point       dpos = {};

From 4bc6aab7ec6af26d698d6fea9c93a3a6d863ee86 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 31 Mar 2020 10:55:18 +0900
Subject: [PATCH 1081/1519] [qwaq] Resize the scrollbar's draw buffer

---
 ruamoko/qwaq/ui/scrollbar.r | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ruamoko/qwaq/ui/scrollbar.r b/ruamoko/qwaq/ui/scrollbar.r
index 3364192e9..4c080009d 100644
--- a/ruamoko/qwaq/ui/scrollbar.r
+++ b/ruamoko/qwaq/ui/scrollbar.r
@@ -120,6 +120,7 @@ position_tab (ScrollBar *self)
 	[super resize:delta];
 	delta = {self.size.width - size.width, self.size.height - size.height};
 	[objects resize:delta];
+	[buffer resizeTo:self.size];
 	position_tab (self);
 	return self;
 }

From e15f2097df6301408dde36001333ba866d490adb Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 31 Mar 2020 11:21:47 +0900
Subject: [PATCH 1082/1519] [qwaq] Move scroll bar management into View

Putting it in Editor worked as a proof of concept, but it seems those
always turn out to need tweaking like this because the concept proves
itself to be generally worthwhile :P
---
 ruamoko/qwaq/editor/editor.h |  5 +---
 ruamoko/qwaq/editor/editor.r | 53 +++++++++++++++++-------------------
 ruamoko/qwaq/ui/scrollbar.h  |  4 +--
 ruamoko/qwaq/ui/scrollbar.r  | 10 +++----
 ruamoko/qwaq/ui/view.h       |  9 ++++++
 ruamoko/qwaq/ui/view.r       | 44 +++++++++++++++++++++++++++++-
 6 files changed, 85 insertions(+), 40 deletions(-)

diff --git a/ruamoko/qwaq/editor/editor.h b/ruamoko/qwaq/editor/editor.h
index 3a2cd48c5..b5bd4b7d5 100644
--- a/ruamoko/qwaq/editor/editor.h
+++ b/ruamoko/qwaq/editor/editor.h
@@ -7,25 +7,22 @@
 @class Editor;
 @class EditBuffer;
 @class ListenerGroup;
-@class ScrollBar;
 
 @interface Editor : View
 {
 	EditBuffer *buffer;
 	DrawBuffer *linebuffer;
-	ScrollBar  *vScrollBar;
 	eb_sel_t    selection;
 	unsigned    base_index;		// top left corner
 	unsigned    line_index;		// current line
 	unsigned    char_index;		// current character
 	unsigned    old_cind;		// previous character
-	Point       scroll;
+	Point       base;
 	Point       cursor;
 	unsigned    line_count;
 	string      filename;
 }
 +(Editor *)withRect:(Rect)rect file:(string)filename;
--setVerticalScrollBar:(ScrollBar *)scrollbar;
 -(string)filename;
 -scrollUp:(unsigned) count;
 -scrollDown:(unsigned) count;
diff --git a/ruamoko/qwaq/editor/editor.r b/ruamoko/qwaq/editor/editor.r
index 0f6e3283c..d66407564 100644
--- a/ruamoko/qwaq/editor/editor.r
+++ b/ruamoko/qwaq/editor/editor.r
@@ -17,6 +17,7 @@
 	linebuffer = [[DrawBuffer buffer: { xlen, 1 }] retain];
 	growMode = gfGrowHi;
 	options = ofCanFocus | ofRelativeEvents;
+	[onViewScrolled addListener:self :@selector(onScroll:)];
 	return self;
 }
 
@@ -25,19 +26,6 @@
 	return [[[self alloc] initWithRect:rect file:filename] autorelease];
 }
 
--setVerticalScrollBar:(ScrollBar *)scrollbar
-{
-	[scrollbar retain];
-	[[vScrollBar onScroll] removeListener:self :@selector(onScroll:)];
-	[vScrollBar release];
-
-	vScrollBar = scrollbar;
-	[vScrollBar setRange:line_count];
-	[vScrollBar setPageStep: ylen];
-	[[vScrollBar onScroll] addListener:self :@selector(onScroll:)];
-	return self;
-}
-
 -(void)dealloc
 {
 	[vScrollBar release];
@@ -57,7 +45,7 @@
 	unsigned lind = base_index;
 	int *lbuf = [linebuffer buffer];
 	for (int y = 0; y < ylen; y++) {
-		lind = [buffer formatLine:lind from:scroll.x into:lbuf width:xlen
+		lind = [buffer formatLine:lind from:base.x into:lbuf width:xlen
 				highlight:selection colors: {color_palette[047],
 											 color_palette[007]}];
 		[textContext blitFromBuffer: linebuffer to: {xpos, ypos + y}
@@ -141,10 +129,10 @@ static int handleEvent (Editor *self, qwaq_event_t *event)
 
 -scrollLeft:(unsigned) count
 {
-	if (scroll.x > count) {
-		scroll.x -= count;
+	if (base.x > count) {
+		base.x -= count;
 	} else {
-		scroll.x = 0;
+		base.x = 0;
 	}
 	[self redraw];
 	return self;
@@ -152,10 +140,10 @@ static int handleEvent (Editor *self, qwaq_event_t *event)
 
 -scrollRight:(unsigned) count
 {
-	if (1024 - scroll.x > count) {
-		scroll.x += count;
+	if (1024 - base.x > count) {
+		base.x += count;
 	} else {
-		scroll.x = 1024;
+		base.x = 1024;
 	}
 	[self redraw];
 	return self;
@@ -163,24 +151,33 @@ static int handleEvent (Editor *self, qwaq_event_t *event)
 
 -scrollTo:(unsigned)target
 {
-	if (target > scroll.y) {
-		base_index = [buffer nextLine:base_index :target - scroll.y];
-	} else if (target < scroll.y) {
-		base_index = [buffer prevLine:base_index :scroll.y - target];
+	if (target > base.y) {
+		base_index = [buffer nextLine:base_index :target - base.y];
+	} else if (target < base.y) {
+		base_index = [buffer prevLine:base_index :base.y - target];
 	}
-	scroll.y = target;
+	base.y = target;
 	return self;
 }
 
 -(void)onScroll:(id)sender
 {
-	[self scrollTo:[sender index]];
+	base.x = scroll.x;
+	[self scrollTo:scroll.y];
+}
+
+-setVerticalScrollBar:(ScrollBar *)scrollbar
+{
+	[super setVerticalScrollBar:scrollbar];
+	[vScrollBar setRange:line_count];
+	[vScrollBar setPageStep: ylen];
+	return self;
 }
 
 -recenter:(int) force
 {
 	if (!force) {
-		if (cursor.y >= scroll.y && cursor.y - scroll.y < ylen) {
+		if (cursor.y >= base.y && cursor.y - base.y < ylen) {
 			return self;
 		}
 	}
@@ -221,7 +218,7 @@ static int handleEvent (Editor *self, qwaq_event_t *event)
 	if (pos.x < 0 || pos.y < 0 || pos.x >= xlen || pos.y >= ylen) {
 		return nil;
 	}
-	pos.x += scroll.x;
+	pos.x += base.x;
 	unsigned lind = [buffer nextLine:base_index :pos.y];
 	unsigned cind = [buffer charPtr:lind at:pos.x];
 	eb_sel_t word = [buffer getWord: cind];
diff --git a/ruamoko/qwaq/ui/scrollbar.h b/ruamoko/qwaq/ui/scrollbar.h
index bb0f5c25c..986646878 100644
--- a/ruamoko/qwaq/ui/scrollbar.h
+++ b/ruamoko/qwaq/ui/scrollbar.h
@@ -20,7 +20,7 @@
 	Button     *forwardButton;
 	Button     *thumbTab;
 	Group      *objects;
-	ListenerGroup *onScroll;
+	ListenerGroup *onScrollBarModified;
 
 	unsigned    pageStep;
 	unsigned    singleStep;
@@ -29,7 +29,7 @@
 }
 +(ScrollBar *)horizontal:(unsigned)len at:(Point)pos;
 +(ScrollBar *)vertical:(unsigned)len at:(Point)pos;
--(ListenerGroup *)onScroll;
+-(ListenerGroup *)onScrollBarModified;
 -setRange:(unsigned)range;
 -setPageStep:(unsigned)pageStep;
 -setSingleStep:(unsigned)singleStep;
diff --git a/ruamoko/qwaq/ui/scrollbar.r b/ruamoko/qwaq/ui/scrollbar.r
index 4c080009d..411e7d344 100644
--- a/ruamoko/qwaq/ui/scrollbar.r
+++ b/ruamoko/qwaq/ui/scrollbar.r
@@ -13,7 +13,7 @@
 	options = ofRelativeEvents;
 	buffer = [[DrawBuffer buffer:size] retain];
 	objects = [[Group withContext:buffer owner:self] retain];
-	onScroll = [[ListenerGroup listener] retain];
+	onScrollBarModified = [[ListenerGroup listener] retain];
 	vertical = xlen == 1;
 	DrawBuffer *icons[3] = {
 		[DrawBuffer buffer:{1, 1}],
@@ -61,7 +61,7 @@
 {
 	[objects release];
 	[buffer release];
-	[onScroll release];
+	[onScrollBarModified release];
 }
 
 +(ScrollBar *)horizontal:(unsigned)len at:(Point)pos
@@ -80,9 +80,9 @@
 	return [[[self alloc] initWithRect:{pos, {1, len}}] autorelease];
 }
 
--(ListenerGroup *)onScroll
+-(ListenerGroup *)onScrollBarModified
 {
-	return onScroll;
+	return onScrollBarModified;
 }
 
 -draw
@@ -142,7 +142,7 @@ position_tab (ScrollBar *self)
 	}
 
 	if (index != oind) {
-		[onScroll respond:self];
+		[onScrollBarModified respond:self];
 		position_tab (self);
 	}
 	return self;
diff --git a/ruamoko/qwaq/ui/view.h b/ruamoko/qwaq/ui/view.h
index 4752c4349..e0da51a28 100644
--- a/ruamoko/qwaq/ui/view.h
+++ b/ruamoko/qwaq/ui/view.h
@@ -10,6 +10,7 @@
 
 @class Group;
 @class ListenerGroup;
+@class ScrollBar;
 
 enum {
 	ofCanFocus      = 0x0001,
@@ -59,6 +60,10 @@ enum {
 -(int) options;
 -(int) state;
 
+-setVerticalScrollBar:(ScrollBar *)scrollbar;
+-setHorizontalScrollBar:(ScrollBar *)scrollbar;
+-(ListenerGroup *) onViewScrolled;
+
 -(id<TextContext>)context;
 -setContext: (id<TextContext>) context;
 -draw;
@@ -114,6 +119,10 @@ enum {
 	ListenerGroup *onReceiveFocus;
 	ListenerGroup *onReleaseFocus;
 	ListenerGroup *onEvent;
+	ListenerGroup *onViewScrolled;
+	ScrollBar  *hScrollBar;
+	ScrollBar  *vScrollBar;
+	Point       scroll;
 }
 +(View *)viewWithRect:(Rect)rect;
 +(View *)viewWithRect:(Rect)rect options:(int)options;
diff --git a/ruamoko/qwaq/ui/view.r b/ruamoko/qwaq/ui/view.r
index a6817b81d..ba2f170ad 100644
--- a/ruamoko/qwaq/ui/view.r
+++ b/ruamoko/qwaq/ui/view.r
@@ -1,7 +1,8 @@
 #include "ui/curses.h"
 #include "ui/listener.h"
-#include "ui/view.h"
 #include "ui/group.h"
+#include "ui/scrollbar.h"
+#include "ui/view.h"
 
 @implementation View
 
@@ -20,6 +21,7 @@ static void view_init(View *self)
 	self.onReceiveFocus = [ListenerGroup listener];
 	self.onReleaseFocus = [ListenerGroup listener];
 	self.onEvent = [ListenerGroup listener];
+	self.onViewScrolled = [ListenerGroup listener];
 }
 
 -init
@@ -64,6 +66,7 @@ static void view_init(View *self)
 	[onReceiveFocus release];
 	[onReleaseFocus release];
 	[onEvent release];
+	[onViewScrolled release];
 	[super dealloc];
 }
 
@@ -88,6 +91,40 @@ static void view_init(View *self)
 	return state;
 }
 
+-(void)onScrollBarModified:(id)sender
+{
+	if (sender == vScrollBar) {
+		scroll.y = [sender index];
+	} else if (sender == hScrollBar) {
+		scroll.x = [sender index];
+	}
+	[onViewScrolled respond:self];
+}
+
+static void
+setScrollBar (View *self, ScrollBar **sb, ScrollBar *scrollbar)
+{
+	SEL         sel = @selector(onScrollBarModified:);
+	[scrollbar retain];
+	[[*sb onScrollBarModified] removeListener:self :sel];
+	[*sb release];
+
+	*sb = scrollbar;
+	[[*sb onScrollBarModified] addListener:self :sel];
+}
+
+-setVerticalScrollBar:(ScrollBar *)scrollbar
+{
+	setScrollBar (self, &vScrollBar, scrollbar);
+	return self;
+}
+
+-setHorizontalScrollBar:(ScrollBar *)scrollbar
+{
+	setScrollBar (self, &hScrollBar, scrollbar);
+	return self;
+}
+
 static void
 updateScreenCursor (View *view)
 {
@@ -321,6 +358,11 @@ updateScreenCursor (View *view)
 	return onEvent;
 }
 
+-(ListenerGroup *) onViewScrolled
+{
+	return onViewScrolled;
+}
+
 -handleEvent: (qwaq_event_t *) event
 {
 	// give any listeners a chance to override or extend event handling

From a1f67b5d6fffdd46a6f28d2e6866ce5fb208263d Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 31 Mar 2020 10:55:39 +0900
Subject: [PATCH 1083/1519] [qwaq] Implement a very simple table view class

It's nowhere near as sophisticated as NSTableView, but this is text, not
graphics.
---
 ruamoko/qwaq/Makefile.am    |   1 +
 ruamoko/qwaq/ui/tableview.h |  44 +++++++++++++
 ruamoko/qwaq/ui/tableview.r | 121 ++++++++++++++++++++++++++++++++++++
 3 files changed, 166 insertions(+)
 create mode 100644 ruamoko/qwaq/ui/tableview.h
 create mode 100644 ruamoko/qwaq/ui/tableview.r

diff --git a/ruamoko/qwaq/Makefile.am b/ruamoko/qwaq/Makefile.am
index 94d8c3f95..4f1c84296 100644
--- a/ruamoko/qwaq/Makefile.am
+++ b/ruamoko/qwaq/Makefile.am
@@ -41,6 +41,7 @@ qwaq_app_dat_src= \
 	ui/proxyview.r	\
 	ui/rect.r	\
 	ui/scrollbar.r	\
+	ui/tableview.r	\
 	ui/textcontext.r	\
 	ui/titlebar.r	\
 	ui/view.r	\
diff --git a/ruamoko/qwaq/ui/tableview.h b/ruamoko/qwaq/ui/tableview.h
new file mode 100644
index 000000000..b21279b0a
--- /dev/null
+++ b/ruamoko/qwaq/ui/tableview.h
@@ -0,0 +1,44 @@
+#ifndef __qwaq_ui_tableview_h
+#define __qwaq_ui_tableview_h
+
+#include "ui/view.h"
+
+@class DrawBuffer;
+@class TableView;
+@class TableViewColumn;
+@class Array;
+
+@protocol TableViewDataSource
+-(int)numberOfRows:(TableView *)tableview;
+-(View *)tableView:(TableView *)tableView
+		 forColumn:(TableViewColumn *)column
+		       row:(int)row;
+-retain;
+-release;
+@end
+
+@interface TableViewColumn : Object
+{
+	string      name;
+	int         width;
+}
++(TableViewColumn *)named:(string)name;
++(TableViewColumn *)named:(string)name width:(int)width;
+-(string)name;
+-(int)width;
+@end
+
+@interface TableView : View
+{
+	Array      *columns;
+	DrawBuffer *buffer;
+	int         columns_dirty;
+	id<TableViewDataSource> dataSource;
+	Point       base;
+}
++(TableView *)withRect:(Rect)rect;
+-addColumn:(TableViewColumn *)column;
+-setDataSource:(id<TableViewDataSource>)dataSource;
+@end
+
+#endif//__qwaq_ui_tableview_h
diff --git a/ruamoko/qwaq/ui/tableview.r b/ruamoko/qwaq/ui/tableview.r
new file mode 100644
index 000000000..fa2772eae
--- /dev/null
+++ b/ruamoko/qwaq/ui/tableview.r
@@ -0,0 +1,121 @@
+#include <Array.h>
+#include "ui/listener.h"
+#include "ui/tableview.h"
+
+@implementation TableViewColumn
+-initWithName:(string)name width:(int)width
+{
+	if (!(self = [super init])) {
+		return nil;
+	}
+	self.name = name;
+	self.width = width;
+	return self;
+}
+
++(TableViewColumn *)named:(string)name
+{
+	return [[[self alloc] initWithName:name width:-1] autorelease];
+}
+
++(TableViewColumn *)named:(string)name width:(int)width
+{
+	return [[[self alloc] initWithName:name width:width] autorelease];
+}
+
+-(string)name
+{
+	return name;
+}
+
+-(int)width
+{
+	return width;
+}
+
+-setWidth:(int)width
+{
+	self.width = width;
+	return self;
+}
+@end
+
+@implementation TableView
+-initWithRect:(Rect)rect
+{
+	if (!(self = [super initWithRect:rect])) {
+		return nil;
+	}
+	options = ofCanFocus | ofRelativeEvents;
+	columns = [[Array array] retain];
+	buffer = [[DrawBuffer buffer:size] retain];
+	[onViewScrolled addListener:self :@selector(onScroll:)];
+	return self;
+}
+
+-(void)dealloc
+{
+	[columns release];
+	[buffer release];
+	[dataSource release];
+}
+
++(TableView *)withRect:(Rect)rect
+{
+	return [[[self alloc] initWithRect:rect] autorelease];
+}
+
+-addColumn:(TableViewColumn *)column
+{
+	[columns addObject:column];
+	columns_dirty = 1;
+	return self;
+}
+
+-setDataSource:(id<TableViewDataSource>)dataSource
+{
+	self.dataSource = [dataSource retain];
+	return self;
+}
+
+-resize:(Extent)delta
+{
+	Extent size = self.size;
+	[super resize:delta];
+	[buffer resizeTo:self.size];
+	return self;
+}
+
+-draw
+{
+	View       *cell;
+	TableViewColumn *col;
+	[super draw];
+	int         numCols = [columns count];
+	int         numRows = [dataSource numberOfRows:self];
+	[buffer clear];
+	for (int y = 0; y < ylen; y++) {
+		for (int i = 0, x = 0; i < numCols; i++) {
+			int         row = base.y + y;
+			if (row >= numRows) {
+				break;
+			}
+			col = [columns objectAtIndex:i];
+			cell = [dataSource tableView:self forColumn:col row:row];
+			[[[cell setContext:buffer] moveTo:{x, y}] draw];
+			x += [col width];
+		}
+	}
+	[textContext blitFromBuffer:buffer to:pos from:[buffer rect]];
+	return self;
+}
+
+-(void)onScroll:(id)sender
+{
+	if (base.y != scroll.y) {
+		base.y = scroll.y;
+		[self redraw];
+	}
+}
+
+@end

From 59481bdf613f705d96a742dbbe0326ea547e2229 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 31 Mar 2020 13:56:40 +0900
Subject: [PATCH 1084/1519] [ruamoko] Report class name in obj_verror

---
 libs/ruamoko/rua_obj.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libs/ruamoko/rua_obj.c b/libs/ruamoko/rua_obj.c
index 5bd5e3871..53b4d3e80 100644
--- a/libs/ruamoko/rua_obj.c
+++ b/libs/ruamoko/rua_obj.c
@@ -1021,10 +1021,11 @@ obj_verror (probj_t *probj, pr_id_t *object, int code, const char *fmt, int coun
 			pr_type_t **args)
 {
 	progs_t    *pr = probj->pr;
+	__auto_type class = &G_STRUCT (pr, pr_class_t, object->class_pointer);
 	dstring_t  *dstr = dstring_newstr ();
 
 	PR_Sprintf (pr, dstr, "obj_verror", fmt, count, args);
-	PR_RunError (pr, "%s", dstr->str);
+	PR_RunError (pr, "%s: %s", PR_GetString (pr, class->name), dstr->str);
 }
 
 static void

From 7ca3dc9db1422126e0968c61c631da25b3b72687 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 31 Mar 2020 13:57:22 +0900
Subject: [PATCH 1085/1519] [qwaq] Fix some missed retain/release messages

---
 ruamoko/qwaq/ui/button.r | 30 ++++++++++++++++++------------
 ruamoko/qwaq/ui/view.r   |  8 ++++----
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/ruamoko/qwaq/ui/button.r b/ruamoko/qwaq/ui/button.r
index 51e9d36b3..f2951d2f2 100644
--- a/ruamoko/qwaq/ui/button.r
+++ b/ruamoko/qwaq/ui/button.r
@@ -26,12 +26,12 @@
 	}
 	icon[0] = [released retain];
 	icon[1] = [pressed retain];
-	onPress = [ListenerGroup listener];
-	onRelease = [ListenerGroup listener];
-	onClick = [ListenerGroup listener];
-	onDrag = [ListenerGroup listener];
-	onAuto = [ListenerGroup listener];
-	onHover = [ListenerGroup listener];
+	onPress = [[ListenerGroup listener] retain];
+	onRelease = [[ListenerGroup listener] retain];
+	onClick = [[ListenerGroup listener] retain];
+	onDrag = [[ListenerGroup listener] retain];
+	onAuto = [[ListenerGroup listener] retain];
+	onHover = [[ListenerGroup listener] retain];
 	return self;
 }
 
@@ -42,12 +42,12 @@
 	}
 	icon[0] = nil;
 	icon[1] = nil;
-	onPress = [ListenerGroup listener];
-	onRelease = [ListenerGroup listener];
-	onClick = [ListenerGroup listener];
-	onDrag = [ListenerGroup listener];
-	onAuto = [ListenerGroup listener];
-	onHover = [ListenerGroup listener];
+	onPress = [[ListenerGroup listener] retain];
+	onRelease = [[ListenerGroup listener] retain];
+	onClick = [[ListenerGroup listener] retain];
+	onDrag = [[ListenerGroup listener] retain];
+	onAuto = [[ListenerGroup listener] retain];
+	onHover = [[ListenerGroup listener] retain];
 	return self;
 }
 
@@ -55,6 +55,12 @@
 {
 	[icon[0] release];
 	[icon[1] release];
+	[onPress release];
+	[onRelease release];
+	[onClick release];
+	[onDrag release];
+	[onAuto release];
+	[onHover release];
 	[super dealloc];
 }
 
diff --git a/ruamoko/qwaq/ui/view.r b/ruamoko/qwaq/ui/view.r
index ba2f170ad..5dc0da9e6 100644
--- a/ruamoko/qwaq/ui/view.r
+++ b/ruamoko/qwaq/ui/view.r
@@ -18,10 +18,10 @@
 
 static void view_init(View *self)
 {
-	self.onReceiveFocus = [ListenerGroup listener];
-	self.onReleaseFocus = [ListenerGroup listener];
-	self.onEvent = [ListenerGroup listener];
-	self.onViewScrolled = [ListenerGroup listener];
+	self.onReceiveFocus = [[ListenerGroup listener] retain];
+	self.onReleaseFocus = [[ListenerGroup listener] retain];
+	self.onEvent = [[ListenerGroup listener] retain];
+	self.onViewScrolled = [[ListenerGroup listener] retain];
 }
 
 -init

From e2d1a0f7d255a101543094d81d6552ab599c8e45 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 31 Mar 2020 16:03:54 +0900
Subject: [PATCH 1086/1519] [ruamoko] Tag object memory with the class name

This makes it a lot easier to see what's leaking.
---
 include/QF/progs.h      | 1 +
 libs/gamecode/pr_zone.c | 9 +++++++++
 libs/ruamoko/rua_obj.c  | 4 ++--
 libs/util/zone.c        | 2 +-
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/include/QF/progs.h b/include/QF/progs.h
index 7567ddc09..95d5db44c 100644
--- a/include/QF/progs.h
+++ b/include/QF/progs.h
@@ -1614,6 +1614,7 @@ void PR_Zone_Init (progs_t *pr);
 void PR_Zone_Free (progs_t *pr, void *ptr);
 void *PR_Zone_Malloc (progs_t *pr, pr_int_t size);
 void *PR_Zone_Realloc (progs_t *pr, void *ptr, pr_int_t size);
+void *PR_Zone_TagMalloc (progs_t *pr, int size, int tag);
 
 ///@}
 
diff --git a/libs/gamecode/pr_zone.c b/libs/gamecode/pr_zone.c
index e7239bc0c..5b85a7ffd 100644
--- a/libs/gamecode/pr_zone.c
+++ b/libs/gamecode/pr_zone.c
@@ -49,6 +49,7 @@ static void
 pr_zone_error (void *_pr, const char *msg)
 {
 	progs_t    *pr = (progs_t *) _pr;
+	Z_Print (pr->zone);
 	PR_RunError (pr, "%s", msg);
 }
 
@@ -74,6 +75,14 @@ PR_Zone_Malloc (progs_t *pr, pr_int_t size)
 	return Z_Malloc (pr->zone, size);
 }
 
+VISIBLE void *
+PR_Zone_TagMalloc (progs_t *pr, int size, int tag)
+{
+	if (size <= 0)
+		PR_RunError (pr, "attempt to allocate less than 1 byte");
+	return Z_TagMalloc (pr->zone, size, tag);
+}
+
 VISIBLE void *
 PR_Zone_Realloc (progs_t *pr, void *ptr, pr_int_t size)
 {
diff --git a/libs/ruamoko/rua_obj.c b/libs/ruamoko/rua_obj.c
index 53b4d3e80..91b9e5692 100644
--- a/libs/ruamoko/rua_obj.c
+++ b/libs/ruamoko/rua_obj.c
@@ -1702,8 +1702,8 @@ class_create_instance (progs_t *pr, pr_class_t *class)
 	pr_type_t  *mem;
 	pr_id_t    *id;
 
-	mem = PR_Zone_Malloc (pr, size);
-	// redundant memset (id, 0, size);
+	mem = PR_Zone_TagMalloc (pr, size, class->name);
+	memset (mem, 0, size);
 	id = (pr_id_t *) (mem + 1);
 	id->class_pointer = PR_SetPointer (pr, class);
 	return id;
diff --git a/libs/util/zone.c b/libs/util/zone.c
index f5c90a379..40af412ba 100644
--- a/libs/util/zone.c
+++ b/libs/util/zone.c
@@ -337,7 +337,7 @@ Z_Print (memzone_t *zone)
 				zone->size, zone, zone->used);
 
 	for (block = zone->blocklist.next ; ; block = block->next) {
-		Sys_Printf ("block:%p    size:%7i    tag:%3i ofs:%x\n",
+		Sys_Printf ("block:%p    size:%7i    tag:%5x ofs:%x\n",
 					block, z_block_size (block),
 					block->tag, z_offset (zone, block));
 

From 58acc483fdf69f9f8b2c86b7c8b8fde24fa0ed44 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 31 Mar 2020 20:38:41 +0900
Subject: [PATCH 1087/1519] [gamecode] Save new string ref in return slot

This plugs the memory leak that caused qwaq to crash after resizing the
locals window a "few" times (several seconds of playing with the size).
---
 libs/gamecode/pr_strings.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libs/gamecode/pr_strings.c b/libs/gamecode/pr_strings.c
index 194dbc05c..7781865a7 100644
--- a/libs/gamecode/pr_strings.c
+++ b/libs/gamecode/pr_strings.c
@@ -468,6 +468,7 @@ PR_SetReturnString (progs_t *pr, const char *s)
 		pr_strfree (pr, sr->s.string);
 	} else {
 		sr = new_string_ref (res);
+		res->rs_slot->strref = sr;
 	}
 	sr->type = str_return;
 	sr->rs_slot = res->rs_slot;

From 0da92e33f6fb78e3f6ba2e6800763fad7f7b9186 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 31 Mar 2020 20:48:38 +0900
Subject: [PATCH 1088/1519] [qwaq] Use TableView to show locals

This is much nicer (even though things aren't quite right yet)
---
 ruamoko/qwaq/Makefile.am                      |  17 +-
 ruamoko/qwaq/debugger/basicview.h             |  11 ++
 ruamoko/qwaq/debugger/basicview.r             |  48 ++++++
 ruamoko/qwaq/debugger/debugger.h              |   8 +-
 ruamoko/qwaq/debugger/debugger.r              |  21 ++-
 ruamoko/qwaq/debugger/defview.h               |  15 ++
 ruamoko/qwaq/debugger/defview.r               |  52 ++++++
 ruamoko/qwaq/debugger/doubleview.h            |  13 ++
 ruamoko/qwaq/debugger/doubleview.r            |  28 ++++
 ruamoko/qwaq/debugger/entityview.h            |  13 ++
 ruamoko/qwaq/debugger/entityview.r            |  28 ++++
 ruamoko/qwaq/debugger/fieldview.h             |  13 ++
 ruamoko/qwaq/debugger/fieldview.r             |  28 ++++
 ruamoko/qwaq/debugger/floatview.h             |  13 ++
 ruamoko/qwaq/debugger/floatview.r             |  28 ++++
 ruamoko/qwaq/debugger/funcview.h              |  13 ++
 ruamoko/qwaq/debugger/funcview.r              |  28 ++++
 ruamoko/qwaq/debugger/intview.h               |  13 ++
 ruamoko/qwaq/debugger/intview.r               |  28 ++++
 .../debugger/{localsview.h => localsdata.h}   |   7 +-
 ruamoko/qwaq/debugger/localsdata.r            | 100 +++++++++++
 ruamoko/qwaq/debugger/localsview.r            | 156 ------------------
 ruamoko/qwaq/debugger/nameview.h              |  13 ++
 ruamoko/qwaq/debugger/nameview.r              |  33 ++++
 ruamoko/qwaq/debugger/pointerview.h           |  13 ++
 ruamoko/qwaq/debugger/pointerview.r           |  28 ++++
 ruamoko/qwaq/debugger/quatview.h              |  13 ++
 ruamoko/qwaq/debugger/quatview.r              |  28 ++++
 ruamoko/qwaq/debugger/stringview.h            |  13 ++
 ruamoko/qwaq/debugger/stringview.r            |  28 ++++
 ruamoko/qwaq/debugger/typeencodings.r         |   1 -
 ruamoko/qwaq/debugger/uintview.h              |  13 ++
 ruamoko/qwaq/debugger/uintview.r              |  28 ++++
 ruamoko/qwaq/debugger/vectorview.h            |  13 ++
 ruamoko/qwaq/debugger/vectorview.r            |  28 ++++
 ruamoko/qwaq/debugger/voidview.h              |  13 ++
 ruamoko/qwaq/debugger/voidview.r              |  29 ++++
 ruamoko/qwaq/ui/listener.r                    |   7 +
 ruamoko/qwaq/ui/scrollbar.r                   |   1 +
 ruamoko/qwaq/ui/tableview.r                   |   2 +
 ruamoko/qwaq/ui/view.r                        |  23 ++-
 41 files changed, 824 insertions(+), 184 deletions(-)
 create mode 100644 ruamoko/qwaq/debugger/basicview.h
 create mode 100644 ruamoko/qwaq/debugger/basicview.r
 create mode 100644 ruamoko/qwaq/debugger/defview.h
 create mode 100644 ruamoko/qwaq/debugger/defview.r
 create mode 100644 ruamoko/qwaq/debugger/doubleview.h
 create mode 100644 ruamoko/qwaq/debugger/doubleview.r
 create mode 100644 ruamoko/qwaq/debugger/entityview.h
 create mode 100644 ruamoko/qwaq/debugger/entityview.r
 create mode 100644 ruamoko/qwaq/debugger/fieldview.h
 create mode 100644 ruamoko/qwaq/debugger/fieldview.r
 create mode 100644 ruamoko/qwaq/debugger/floatview.h
 create mode 100644 ruamoko/qwaq/debugger/floatview.r
 create mode 100644 ruamoko/qwaq/debugger/funcview.h
 create mode 100644 ruamoko/qwaq/debugger/funcview.r
 create mode 100644 ruamoko/qwaq/debugger/intview.h
 create mode 100644 ruamoko/qwaq/debugger/intview.r
 rename ruamoko/qwaq/debugger/{localsview.h => localsdata.h} (67%)
 create mode 100644 ruamoko/qwaq/debugger/localsdata.r
 delete mode 100644 ruamoko/qwaq/debugger/localsview.r
 create mode 100644 ruamoko/qwaq/debugger/nameview.h
 create mode 100644 ruamoko/qwaq/debugger/nameview.r
 create mode 100644 ruamoko/qwaq/debugger/pointerview.h
 create mode 100644 ruamoko/qwaq/debugger/pointerview.r
 create mode 100644 ruamoko/qwaq/debugger/quatview.h
 create mode 100644 ruamoko/qwaq/debugger/quatview.r
 create mode 100644 ruamoko/qwaq/debugger/stringview.h
 create mode 100644 ruamoko/qwaq/debugger/stringview.r
 create mode 100644 ruamoko/qwaq/debugger/uintview.h
 create mode 100644 ruamoko/qwaq/debugger/uintview.r
 create mode 100644 ruamoko/qwaq/debugger/vectorview.h
 create mode 100644 ruamoko/qwaq/debugger/vectorview.r
 create mode 100644 ruamoko/qwaq/debugger/voidview.h
 create mode 100644 ruamoko/qwaq/debugger/voidview.r

diff --git a/ruamoko/qwaq/Makefile.am b/ruamoko/qwaq/Makefile.am
index 4f1c84296..b4e513314 100644
--- a/ruamoko/qwaq/Makefile.am
+++ b/ruamoko/qwaq/Makefile.am
@@ -27,9 +27,24 @@ SUFFIXES=.o .r
 
 qwaq_app_dat_src= \
 	qwaq-app.r	\
+	debugger/defview.r	\
+	debugger/nameview.r	\
+	debugger/basicview.r	\
+	debugger/doubleview.r	\
+	debugger/entityview.r	\
+	debugger/fieldview.r	\
+	debugger/floatview.r	\
+	debugger/funcview.r	\
+	debugger/intview.r	\
+	debugger/pointerview.r	\
+	debugger/quatview.r	\
+	debugger/stringview.r	\
+	debugger/uintview.r	\
+	debugger/vectorview.r	\
+	debugger/voidview.r	\
 	debugger/debug.r	\
 	debugger/debugger.r	\
-	debugger/localsview.r	\
+	debugger/localsdata.r	\
 	debugger/typeencodings.r	\
 	editor/editbuffer.r	\
 	editor/editor.r	\
diff --git a/ruamoko/qwaq/debugger/basicview.h b/ruamoko/qwaq/debugger/basicview.h
new file mode 100644
index 000000000..773ab6794
--- /dev/null
+++ b/ruamoko/qwaq/debugger/basicview.h
@@ -0,0 +1,11 @@
+#ifndef __qwaq_debugger_basicview_h
+#define __qwaq_debugger_basicview_h
+
+#include "debugger/defview.h"
+
+@interface BasicView : DefView
+// might return a NameView (which is also a DefView)
++(DefView *)withType:(qfot_type_t *)type at:(unsigned)offset in:(void *)data;
+@end
+
+#endif//__qwaq_debugger_basicview_h
diff --git a/ruamoko/qwaq/debugger/basicview.r b/ruamoko/qwaq/debugger/basicview.r
new file mode 100644
index 000000000..4404f43e6
--- /dev/null
+++ b/ruamoko/qwaq/debugger/basicview.r
@@ -0,0 +1,48 @@
+#include <string.h>
+#include "debugger/basicview.h"
+#include "debugger/nameview.h"
+
+static string type_views[] = {
+	"VoidView",
+	"StringView",
+	"FloatView",
+	"VectorView",
+	"EntityView",
+	"FieldView",
+	"FuncView",
+	"PointerView",
+	"QuatView",
+	"IntView",
+	"UIntView",	// uinteger
+	"IntView",	// short
+	"DoubleView",
+};
+
+@implementation BasicView
+
+-init
+{
+	if (!(self = [super init])) {
+		return nil;
+	}
+	return self;
+}
+
++(DefView *)withType:(qfot_type_t *)type at:(unsigned)offset in:(void *)data
+{
+	string typename = nil;
+	if (type.type == ty_alias) {
+		type = type.alias.aux_type;
+	}
+	if (type.type >= 0
+		&& type.type < sizeof(type_views) / sizeof (type_views[0])) {
+		typename = type_views[type.type];
+	}
+	id class = obj_lookup_class (typename);
+	if (class) {
+		return [class withType:type at:offset in:data];
+	}
+	return [NameView withName:"Invalid Meta"];
+}
+
+@end
diff --git a/ruamoko/qwaq/debugger/debugger.h b/ruamoko/qwaq/debugger/debugger.h
index 0b3b75f50..9e827c73d 100644
--- a/ruamoko/qwaq/debugger/debugger.h
+++ b/ruamoko/qwaq/debugger/debugger.h
@@ -5,26 +5,28 @@
 #include <Object.h>
 
 #include "debugger/debug.h"
-#include "debugger/localsview.h"
+#include "debugger/localsdata.h"
 
 @class ProxyView;
 @class Editor;
 @class ScrollBar;
 @class Window;
 @class Array;
+@class TableView;
 
 @interface Debugger : Object
 {
 	qdb_target_t target;
 
 	Window     *source_window;
+	ScrollBar  *source_scrollbar;
 	ProxyView  *file_proxy;
 	Array      *files;
 	Editor     *current_file;
 
 	Window     *locals_window;
-	ScrollBar  *scrollbar;
-	LocalsView *locals_view;
+	LocalsData *locals_data;
+	TableView  *locals_view;
 }
 +(Debugger *)withTarget:(qdb_target_t)target;
 -initWithTarget:(qdb_target_t) target;
diff --git a/ruamoko/qwaq/debugger/debugger.r b/ruamoko/qwaq/debugger/debugger.r
index 22a450e10..85ae89efd 100644
--- a/ruamoko/qwaq/debugger/debugger.r
+++ b/ruamoko/qwaq/debugger/debugger.r
@@ -7,6 +7,7 @@
 #include "ui/listener.h"
 #include "ui/proxyview.h"
 #include "ui/scrollbar.h"
+#include "ui/tableview.h"
 #include "ui/window.h"
 #include "debugger/debugger.h"
 #include "debugger/typeencodings.h"
@@ -36,8 +37,8 @@
 	source_window = [Window withRect: {nil, s}];
 	[application addView:source_window];
 
-	scrollbar = [ScrollBar vertical:s.height - 2 at:{s.width - 1, 1}];
-	[source_window insert:scrollbar];
+	source_scrollbar = [ScrollBar vertical:s.height - 2 at:{s.width - 1, 1}];
+	[source_window insert:source_scrollbar];
 
 	return self;
 }
@@ -45,6 +46,7 @@
 -(void)dealloc
 {
 	[files release];
+	[locals_data release];
 	[super dealloc];
 }
 
@@ -73,7 +75,7 @@
 	file_proxy = [ProxyView withView: current_file];
 	[[current_file gotoLine:state.line - 1] highlightLine];
 	[[current_file onEvent] addListener: self :@selector(proxy_event::)];
-	[current_file setVerticalScrollBar:scrollbar];
+	[current_file setVerticalScrollBar:source_scrollbar];
 	//FIXME id<View>?
 	[source_window insertSelected: (View *) file_proxy];
 	[source_window setTitle: [current_file filename]];
@@ -82,8 +84,15 @@
 	locals_window = [Window withRect:{{0, 0}, {40, 10}}];
 	[locals_window setBackground: color_palette[064]];
 	[locals_window setTitle: "Locals"];
-	locals_view = [LocalsView withRect:{{1, 1}, {38, 8}} target:target];
+	locals_data = [[LocalsData withTarget:target] retain];
+	locals_view = [TableView withRect:{{1, 1}, {38, 8}}];
+	[locals_view addColumn:[TableViewColumn named:"name" width:12]];
+	[locals_view addColumn:[TableViewColumn named:"value" width:26]];
+	ScrollBar *sb = [ScrollBar vertical:8 at:{39, 1}];
+	[locals_view setVerticalScrollBar:sb];
+	[locals_view setDataSource:locals_data];
 	[locals_window insertSelected: locals_view];
+	[locals_window insert: sb];
 	[application addView: locals_window];
 
 	[[locals_view onEvent] addListener:self :@selector(proxy_event::)];
@@ -99,7 +108,7 @@
 		[[current_file onEvent] removeListener:self :@selector(proxy_event::)];
 		[file_proxy setView:file];
 		[[file onEvent] addListener:self :@selector(proxy_event::)];
-		[file setVerticalScrollBar:scrollbar];
+		[file setVerticalScrollBar:source_scrollbar];
 		[source_window setTitle: [file filename]];
 		current_file = file;
 	}
@@ -110,7 +119,7 @@
 -(void)update_watchvars
 {
 	qdb_state_t state = qdb_get_state (target);
-	[locals_view setFunction:state.func];
+	[locals_data setFunction:state.func];
 	[locals_view redraw];
 }
 
diff --git a/ruamoko/qwaq/debugger/defview.h b/ruamoko/qwaq/debugger/defview.h
new file mode 100644
index 000000000..69553620b
--- /dev/null
+++ b/ruamoko/qwaq/debugger/defview.h
@@ -0,0 +1,15 @@
+#ifndef __qwaq_debugger_defview_h
+#define __qwaq_debugger_defview_h
+
+#include <types.h>
+#include "ui/view.h"
+
+@interface DefView : View
+{
+	qfot_type_t *type;
+}
++(DefView *)withType:(qfot_type_t *)type at:(unsigned)offset in:(void *)data;
+-initWithType:(qfot_type_t *)type;
+@end
+
+#endif//__qwaq_debugger_defview_h
diff --git a/ruamoko/qwaq/debugger/defview.r b/ruamoko/qwaq/debugger/defview.r
new file mode 100644
index 000000000..5768a14f5
--- /dev/null
+++ b/ruamoko/qwaq/debugger/defview.r
@@ -0,0 +1,52 @@
+#include <string.h>
+#include "debugger/defview.h"
+#include "debugger/nameview.h"
+
+static string meta_views[] = {
+	"BasicView",
+	"StructView",
+	"UnionView",
+	"EnumView",
+	"ArrayView",
+	"ClassView",
+	"AliasView",	// shouldn't happen, but...
+};
+
+@implementation DefView
+
+-init
+{
+	if (!(self = [super init])) {
+		return nil;
+	}
+	return self;
+}
+
+-initWithType:(qfot_type_t *)type
+{
+	if (!(self = [super init])) {
+		return nil;
+	}
+	self.type = type;
+	return self;
+}
+
++(DefView *)withType:(qfot_type_t *)type at:(unsigned)offset in:(void *)data
+{
+	string metaname = nil;
+	//printf("%d %d %d %d\n", type.meta, type.size, type.encoding, type.type);
+	if (type.meta == ty_alias) {
+		type = type.alias.aux_type;
+	}
+	if (type.meta >= 0
+		&& type.meta < sizeof(meta_views) / sizeof (meta_views[0])) {
+		metaname = meta_views[type.meta];
+	}
+	id class = obj_lookup_class (metaname);
+	if (class) {
+		return [class withType:type at:offset in:data];
+	}
+	return [NameView withName:"Invalid Meta"];
+}
+
+@end
diff --git a/ruamoko/qwaq/debugger/doubleview.h b/ruamoko/qwaq/debugger/doubleview.h
new file mode 100644
index 000000000..0ddea40c1
--- /dev/null
+++ b/ruamoko/qwaq/debugger/doubleview.h
@@ -0,0 +1,13 @@
+#ifndef __qwaq_debugger_doubleview_h
+#define __qwaq_debugger_doubleview_h
+
+#include "debugger/defview.h"
+
+@interface DoubleView : DefView
+{
+	double     *data;
+}
++(DoubleView *)withType:(qfot_type_t *)type at:(unsigned)offset in:(void *)data;
+@end
+
+#endif//__qwaq_debugger_doubleview_h
diff --git a/ruamoko/qwaq/debugger/doubleview.r b/ruamoko/qwaq/debugger/doubleview.r
new file mode 100644
index 000000000..2a76033b5
--- /dev/null
+++ b/ruamoko/qwaq/debugger/doubleview.r
@@ -0,0 +1,28 @@
+#include <string.h>
+#include "debugger/doubleview.h"
+
+@implementation DoubleView
+
+-initWithType:(qfot_type_t *)type at:(unsigned)offset in:(void *)data
+{
+	if (!(self = [super initWithType:type])) {
+		return nil;
+	}
+	self.data = (double *)(data + offset);
+	return self;
+}
+
++(DoubleView *)withType:(qfot_type_t *)type at:(unsigned)offset in:(void *)data
+{
+	return [[[self alloc] initWithType:type at:offset in:data] autorelease];
+}
+
+-draw
+{
+	[super draw];
+	string val = sprintf ("%.17g", data[0]);
+	[self mvaddstr:{0, 0}, str_mid (val, 0, xlen)];
+	return self;
+}
+
+@end
diff --git a/ruamoko/qwaq/debugger/entityview.h b/ruamoko/qwaq/debugger/entityview.h
new file mode 100644
index 000000000..81ba29e9c
--- /dev/null
+++ b/ruamoko/qwaq/debugger/entityview.h
@@ -0,0 +1,13 @@
+#ifndef __qwaq_debugger_entityview_h
+#define __qwaq_debugger_entityview_h
+
+#include "debugger/defview.h"
+
+@interface EntityView : DefView
+{
+	entity     *data;
+}
++(EntityView *)withType:(qfot_type_t *)type at:(unsigned)offset in:(void *)data;
+@end
+
+#endif//__qwaq_debugger_entityview_h
diff --git a/ruamoko/qwaq/debugger/entityview.r b/ruamoko/qwaq/debugger/entityview.r
new file mode 100644
index 000000000..6990886e6
--- /dev/null
+++ b/ruamoko/qwaq/debugger/entityview.r
@@ -0,0 +1,28 @@
+#include <string.h>
+#include "debugger/entityview.h"
+
+@implementation EntityView
+
+-initWithType:(qfot_type_t *)type at:(unsigned)offset in:(void *)data
+{
+	if (!(self = [super initWithType:type])) {
+		return nil;
+	}
+	self.data = (entity *)(data + offset);
+	return self;
+}
+
++(EntityView *)withType:(qfot_type_t *)type at:(unsigned)offset in:(void *)data
+{
+	return [[[self alloc] initWithType:type at:offset in:data] autorelease];
+}
+
+-draw
+{
+	[super draw];
+	string val = sprintf ("FIXME [%x]", data[0]);
+	[self mvaddstr:{0, 0}, str_mid (val, 0, xlen)];
+	return self;
+}
+
+@end
diff --git a/ruamoko/qwaq/debugger/fieldview.h b/ruamoko/qwaq/debugger/fieldview.h
new file mode 100644
index 000000000..bf793ec00
--- /dev/null
+++ b/ruamoko/qwaq/debugger/fieldview.h
@@ -0,0 +1,13 @@
+#ifndef __qwaq_debugger_fieldview_h
+#define __qwaq_debugger_fieldview_h
+
+#include "debugger/defview.h"
+
+@interface FieldView : DefView
+{
+	unsigned   *data;
+}
++(FieldView *)withType:(qfot_type_t *)type at:(unsigned)offset in:(void *)data;
+@end
+
+#endif//__qwaq_debugger_fieldview_h
diff --git a/ruamoko/qwaq/debugger/fieldview.r b/ruamoko/qwaq/debugger/fieldview.r
new file mode 100644
index 000000000..ea00ff14f
--- /dev/null
+++ b/ruamoko/qwaq/debugger/fieldview.r
@@ -0,0 +1,28 @@
+#include <string.h>
+#include "debugger/fieldview.h"
+
+@implementation FieldView
+
+-initWithType:(qfot_type_t *)type at:(unsigned)offset in:(void *)data
+{
+	if (!(self = [super initWithType:type])) {
+		return nil;
+	}
+	self.data = (unsigned *)(data + offset);
+	return self;
+}
+
++(FieldView *)withType:(qfot_type_t *)type at:(unsigned)offset in:(void *)data
+{
+	return [[[self alloc] initWithType:type at:offset in:data] autorelease];
+}
+
+-draw
+{
+	[super draw];
+	string val = sprintf ("FIXME [%x]", data[0]);
+	[self mvaddstr:{0, 0}, str_mid (val, 0, xlen)];
+	return self;
+}
+
+@end
diff --git a/ruamoko/qwaq/debugger/floatview.h b/ruamoko/qwaq/debugger/floatview.h
new file mode 100644
index 000000000..4fa32be05
--- /dev/null
+++ b/ruamoko/qwaq/debugger/floatview.h
@@ -0,0 +1,13 @@
+#ifndef __qwaq_debugger_floatview_h
+#define __qwaq_debugger_floatview_h
+
+#include "debugger/defview.h"
+
+@interface FloatView : DefView
+{
+	float      *data;
+}
++(FloatView *)withType:(qfot_type_t *)type at:(unsigned)offset in:(void *)data;
+@end
+
+#endif//__qwaq_debugger_floatview_h
diff --git a/ruamoko/qwaq/debugger/floatview.r b/ruamoko/qwaq/debugger/floatview.r
new file mode 100644
index 000000000..1e90f8320
--- /dev/null
+++ b/ruamoko/qwaq/debugger/floatview.r
@@ -0,0 +1,28 @@
+#include <string.h>
+#include "debugger/floatview.h"
+
+@implementation FloatView
+
+-initWithType:(qfot_type_t *)type at:(unsigned)offset in:(void *)data
+{
+	if (!(self = [super initWithType:type])) {
+		return nil;
+	}
+	self.data = (float *)(data + offset);
+	return self;
+}
+
++(FloatView *)withType:(qfot_type_t *)type at:(unsigned)offset in:(void *)data
+{
+	return [[[self alloc] initWithType:type at:offset in:data] autorelease];
+}
+
+-draw
+{
+	[super draw];
+	string val = sprintf ("%.9", data[0]);
+	[self mvaddstr:{0, 0}, str_mid (val, 0, xlen)];
+	return self;
+}
+
+@end
diff --git a/ruamoko/qwaq/debugger/funcview.h b/ruamoko/qwaq/debugger/funcview.h
new file mode 100644
index 000000000..43cce6512
--- /dev/null
+++ b/ruamoko/qwaq/debugger/funcview.h
@@ -0,0 +1,13 @@
+#ifndef __qwaq_debugger_funcview_h
+#define __qwaq_debugger_funcview_h
+
+#include "debugger/defview.h"
+
+@interface FuncView : DefView
+{
+	unsigned   *data;
+}
++(FuncView *)withType:(qfot_type_t *)type at:(unsigned)offset in:(void *)data;
+@end
+
+#endif//__qwaq_debugger_funcview_h
diff --git a/ruamoko/qwaq/debugger/funcview.r b/ruamoko/qwaq/debugger/funcview.r
new file mode 100644
index 000000000..b9f540807
--- /dev/null
+++ b/ruamoko/qwaq/debugger/funcview.r
@@ -0,0 +1,28 @@
+#include <string.h>
+#include "debugger/funcview.h"
+
+@implementation FuncView
+
+-initWithType:(qfot_type_t *)type at:(unsigned)offset in:(void *)data
+{
+	if (!(self = [super initWithType:type])) {
+		return nil;
+	}
+	self.data = (unsigned *)(data + offset);
+	return self;
+}
+
++(FuncView *)withType:(qfot_type_t *)type at:(unsigned)offset in:(void *)data
+{
+	return [[[self alloc] initWithType:type at:offset in:data] autorelease];
+}
+
+-draw
+{
+	[super draw];
+	string val = sprintf ("FIXME [%x]", data[0]);
+	[self mvaddstr:{0, 0}, str_mid (val, 0, xlen)];
+	return self;
+}
+
+@end
diff --git a/ruamoko/qwaq/debugger/intview.h b/ruamoko/qwaq/debugger/intview.h
new file mode 100644
index 000000000..531da879d
--- /dev/null
+++ b/ruamoko/qwaq/debugger/intview.h
@@ -0,0 +1,13 @@
+#ifndef __qwaq_debugger_intview_h
+#define __qwaq_debugger_intview_h
+
+#include "debugger/defview.h"
+
+@interface IntView : DefView
+{
+	int        *data;
+}
++(IntView *)withType:(qfot_type_t *)type at:(unsigned)offset in:(void *)data;
+@end
+
+#endif//__qwaq_debugger_intview_h
diff --git a/ruamoko/qwaq/debugger/intview.r b/ruamoko/qwaq/debugger/intview.r
new file mode 100644
index 000000000..aeedd0640
--- /dev/null
+++ b/ruamoko/qwaq/debugger/intview.r
@@ -0,0 +1,28 @@
+#include <string.h>
+#include "debugger/intview.h"
+
+@implementation IntView
+
+-initWithType:(qfot_type_t *)type at:(unsigned)offset in:(void *)data
+{
+	if (!(self = [super initWithType:type])) {
+		return nil;
+	}
+	self.data = (int *)(data + offset);
+	return self;
+}
+
++(IntView *)withType:(qfot_type_t *)type at:(unsigned)offset in:(void *)data
+{
+	return [[[self alloc] initWithType:type at:offset in:data] autorelease];
+}
+
+-draw
+{
+	[super draw];
+	string val = sprintf ("%d", data[0]);
+	[self mvaddstr:{0, 0}, str_mid (val, 0, xlen)];
+	return self;
+}
+
+@end
diff --git a/ruamoko/qwaq/debugger/localsview.h b/ruamoko/qwaq/debugger/localsdata.h
similarity index 67%
rename from ruamoko/qwaq/debugger/localsview.h
rename to ruamoko/qwaq/debugger/localsdata.h
index 71886daaf..976b2ecf1 100644
--- a/ruamoko/qwaq/debugger/localsview.h
+++ b/ruamoko/qwaq/debugger/localsdata.h
@@ -2,10 +2,10 @@
 #define __qwaq_debugger_localsview_h
 
 #include <types.h>
-#include "ui/view.h"
+#include "ui/tableview.h"
 #include "debugger/debug.h"
 
-@interface LocalsView : View
+@interface LocalsData : Object <TableViewDataSource>
 {
 	qdb_target_t target;
 	qfot_type_encodings_t target_encodings;
@@ -15,8 +15,7 @@
 	qdb_def_t  *defs;
 	void       *data;
 }
-+(LocalsView *)withRect:(Rect)rect target:(qdb_target_t)target;
--initWithRect:(Rect)rect target:(qdb_target_t)target;
++(LocalsData *)withTarget:(qdb_target_t)target;
 -setFunction:(unsigned)fnum;
 @end
 
diff --git a/ruamoko/qwaq/debugger/localsdata.r b/ruamoko/qwaq/debugger/localsdata.r
new file mode 100644
index 000000000..48019aaed
--- /dev/null
+++ b/ruamoko/qwaq/debugger/localsdata.r
@@ -0,0 +1,100 @@
+#include <string.h>
+#include <types.h>
+#include "debugger/defview.h"
+#include "debugger/nameview.h"
+#include "debugger/localsdata.h"
+#include "debugger/typeencodings.h"
+
+@implementation LocalsData
+
+-initWithTarget:(qdb_target_t) target
+{
+	if (!(self = [super init])) {
+		return nil;
+	}
+	self.target = target;
+
+	qdb_def_t   encodings_def = qdb_find_global (target, ".type_encodings");
+	qdb_get_data (target, encodings_def.offset, sizeof(target_encodings),
+				  &target_encodings);
+
+	return self;
+}
+
++(LocalsData *)withTarget:(qdb_target_t)target
+{
+	return [[[self alloc] initWithTarget:target] autorelease];
+}
+
+-(void)dealloc
+{
+	if (defs) {
+		obj_free (defs);
+		defs = nil;
+	}
+	if (data) {
+		obj_free (data);
+		data = nil;
+	}
+}
+
+-setFunction:(unsigned) fnum
+{
+	if (current_fnum == fnum) {
+		return self;
+	}
+	current_fnum =fnum;
+
+	if (defs) {
+		obj_free (defs);
+		defs = nil;
+	}
+	if (data) {
+		obj_free (data);
+		data = nil;
+	}
+	func = qdb_get_function (target, fnum);
+	aux_func = qdb_get_auxfunction (target, fnum);
+	if (aux_func) {
+		defs = qdb_get_local_defs (target, fnum);
+	}
+	if (func) {
+		data = obj_malloc (func.local_size);
+	}
+	return self;
+}
+
+-(int)numberOfRows:(TableView *)tableview
+{
+	if (aux_func) {
+		return aux_func.num_locals;
+	} else if (func) {
+		return (func.local_size + 3) / 4;
+	}
+	return 0;
+}
+
+-(qfot_type_t *)type:(qdb_def_t *)def
+{
+	unsigned encoding = def.type_encoding + (unsigned) target_encodings.types;
+	return [TypeEncodings getType:encoding fromTarget:target];
+}
+
+-(View *)tableView:(TableView *)tableview
+		 forColumn:(TableViewColumn *)column
+			   row:(int)row
+{
+	View      *view;
+
+	if ([column name] == "name") {
+		view = [NameView withName:qdb_get_string (target, defs[row].name)];
+	} else {
+		qfot_type_t *type = [self type:&defs[row]];
+		unsigned    offset = defs[row].offset;
+		view = [DefView withType:type at:offset in:data];
+	}
+	[view resizeTo:{[column width], 1}];
+	return view;
+}
+
+@end
diff --git a/ruamoko/qwaq/debugger/localsview.r b/ruamoko/qwaq/debugger/localsview.r
deleted file mode 100644
index 77d2f150f..000000000
--- a/ruamoko/qwaq/debugger/localsview.r
+++ /dev/null
@@ -1,156 +0,0 @@
-#include <string.h>
-#include <types.h>
-#include "debugger/localsview.h"
-#include "debugger/typeencodings.h"
-
-@implementation LocalsView
-
-+(LocalsView *)withRect:(Rect)rect target:(qdb_target_t)target
-{
-	return [[[self alloc] initWithRect:rect target:target] autorelease];
-}
-
--initWithRect:(Rect)rect target:(qdb_target_t) target
-{
-	if (!(self = [super initWithRect:rect])) {
-		return nil;
-	}
-	options = ofCanFocus;
-	growMode = gfGrowHi;
-
-	self.target = target;
-
-	qdb_def_t   encodings_def = qdb_find_global (target, ".type_encodings");
-	qdb_get_data (target, encodings_def.offset, sizeof(target_encodings),
-				  &target_encodings);
-
-	return self;
-}
-
--(void)dealloc
-{
-	if (defs) {
-		obj_free (defs);
-		defs = nil;
-	}
-	if (data) {
-		obj_free (data);
-		data = nil;
-	}
-}
-
--setFunction:(unsigned) fnum
-{
-	if (current_fnum == fnum) {
-		return self;
-	}
-	current_fnum =fnum;
-
-	if (defs) {
-		obj_free (defs);
-		defs = nil;
-	}
-	if (data) {
-		obj_free (data);
-		data = nil;
-	}
-	func = qdb_get_function (target, fnum);
-	aux_func = qdb_get_auxfunction (target, fnum);
-	if (aux_func) {
-		defs = qdb_get_local_defs (target, fnum);
-	}
-	if (func) {
-		data = obj_malloc (func.local_size);
-	}
-	return self;
-}
-
--draw
-{
-	[super draw];
-
-	if (!data) {
-		return self;
-	}
-	qdb_get_data (target, func.local_data, func.local_size, data);
-	[self clear];
-	if (!defs) {
-		[self mvprintf:{0,0}, "%d", func.local_size];
-		for (int y = 1; y < ylen; y++) {
-			unsigned    ind = (y - 1) * 4;
-			if (ind < func.local_size) {
-				[self mvprintf:{0, y}, "%02x", ind];
-				for (int x = 0; x < 4 && ind < func.local_size; x++, ind++) {
-					[self mvprintf:{x * 9 + 3, y}, "%08x",
-										  data[ind]];
-				}
-			} else {
-				break;
-			}
-		}
-	} else {
-		for (int y = 0; y < ylen; y++) {
-			if (y >= aux_func.num_locals) {
-				break;
-			}
-			qdb_def_t *def = defs + y;
-			unsigned    te = def.type_encoding + (int) target_encodings.types;
-			qfot_type_t *type;
-			type = [TypeEncodings getType:te fromTarget:target];
-			[self mvprintf:{0, y}, "%s",
-								  qdb_get_string (target, def.name)];
-			@param      value = nil;
-			string      valstr = "--";
-			unsigned    offset = func.local_data + def.offset;
-			qdb_get_data (target, offset, def.type_size >> 16, &value);
-			switch (def.type_size & 0xffff) {
-				case ev_void:
-				case ev_invalid:
-				case ev_type_count:
-					break;
-				case ev_string:
-					valstr = qdb_get_string (target, value.integer_val);
-					break;
-				case ev_float:
-					valstr = sprintf ("%.9g", value.float_val);
-					break;
-				case ev_vector:
-					valstr = sprintf ("%.9v", value.vector_val);
-					break;
-				case ev_entity:
-					valstr = sprintf ("%e", value.entity_val);
-					break;
-				case ev_field:
-					valstr = sprintf ("[%x]", value.field_val);
-					break;
-				case ev_func:
-					valstr = sprintf ("[%x]", value.func_val);
-					break;
-				case ev_pointer:
-					valstr = sprintf ("[%x]", value.pointer_val);
-					break;
-				case ev_quat:
-					valstr = sprintf ("[%q]", value.quaternion_val);
-					break;
-				case ev_integer:
-					valstr = sprintf ("%d", value.integer_val);
-					break;
-				case ev_uinteger:
-					valstr = sprintf ("%d", value.integer_val);
-					break;
-				case ev_short:
-					valstr = sprintf ("%d", value.integer_val);
-					break;
-				case ev_double:
-					valstr = sprintf ("%.17g", value.double_val);
-					break;
-			}
-			int         x = xlen - strlen (valstr);
-			[self mvaddstr:{x, y}, valstr];
-		}
-	}
-
-	return self;
-}
-
-@end
diff --git a/ruamoko/qwaq/debugger/nameview.h b/ruamoko/qwaq/debugger/nameview.h
new file mode 100644
index 000000000..1822df98e
--- /dev/null
+++ b/ruamoko/qwaq/debugger/nameview.h
@@ -0,0 +1,13 @@
+#ifndef __qwaq_debugger_nameview_h
+#define __qwaq_debugger_nameview_h
+
+#include "debugger/defview.h"
+
+@interface NameView : DefView
+{
+	string     name;
+}
++(NameView *)withName:(string)name;
+@end
+
+#endif//__qwaq_debugger_nameview_h
diff --git a/ruamoko/qwaq/debugger/nameview.r b/ruamoko/qwaq/debugger/nameview.r
new file mode 100644
index 000000000..52710170a
--- /dev/null
+++ b/ruamoko/qwaq/debugger/nameview.r
@@ -0,0 +1,33 @@
+#include <string.h>
+#include "debugger/nameview.h"
+
+@implementation NameView
+
+-initWithName:(string)name
+{
+	if (!(self = [super initWithType:type])) {
+		return nil;
+	}
+	self.name = name;
+	return self;
+}
+
+-(void)dealloc
+{
+	str_free (name);
+	[super dealloc];
+}
+
++(NameView *)withName:(string)name
+{
+	return [[[self alloc] initWithName:name] autorelease];
+}
+
+-draw
+{
+	[super draw];
+	[self mvaddstr:{0, 0}, str_mid (name, 0, xlen)];
+	return self;
+}
+
+@end
diff --git a/ruamoko/qwaq/debugger/pointerview.h b/ruamoko/qwaq/debugger/pointerview.h
new file mode 100644
index 000000000..6891d5f50
--- /dev/null
+++ b/ruamoko/qwaq/debugger/pointerview.h
@@ -0,0 +1,13 @@
+#ifndef __qwaq_debugger_pointerview_h
+#define __qwaq_debugger_pointerview_h
+
+#include "debugger/defview.h"
+
+@interface PointerView : DefView
+{
+	unsigned   *data;
+}
++(PointerView *)withType:(qfot_type_t *)type at:(unsigned)offset in:(void *)data;
+@end
+
+#endif//__qwaq_debugger_pointerview_h
diff --git a/ruamoko/qwaq/debugger/pointerview.r b/ruamoko/qwaq/debugger/pointerview.r
new file mode 100644
index 000000000..680b8accc
--- /dev/null
+++ b/ruamoko/qwaq/debugger/pointerview.r
@@ -0,0 +1,28 @@
+#include <string.h>
+#include "debugger/pointerview.h"
+
+@implementation PointerView
+
+-initWithType:(qfot_type_t *)type at:(unsigned)offset in:(void *)data
+{
+	if (!(self = [super initWithType:type])) {
+		return nil;
+	}
+	self.data = (unsigned *)(data + offset);
+	return self;
+}
+
++(PointerView *)withType:(qfot_type_t *)type at:(unsigned)offset in:(void *)data
+{
+	return [[[self alloc] initWithType:type at:offset in:data] autorelease];
+}
+
+-draw
+{
+	[super draw];
+	string val = sprintf ("FIXME [%x]", data[0]);
+	[self mvaddstr:{0, 0}, str_mid (val, 0, xlen)];
+	return self;
+}
+
+@end
diff --git a/ruamoko/qwaq/debugger/quatview.h b/ruamoko/qwaq/debugger/quatview.h
new file mode 100644
index 000000000..2ea1934cd
--- /dev/null
+++ b/ruamoko/qwaq/debugger/quatview.h
@@ -0,0 +1,13 @@
+#ifndef __qwaq_debugger_quatview_h
+#define __qwaq_debugger_quatview_h
+
+#include "debugger/defview.h"
+
+@interface QuatView : DefView
+{
+	quaternion *data;
+}
++(QuatView *)withType:(qfot_type_t *)type at:(unsigned)offset in:(void *)data;
+@end
+
+#endif//__qwaq_debugger_quatview_h
diff --git a/ruamoko/qwaq/debugger/quatview.r b/ruamoko/qwaq/debugger/quatview.r
new file mode 100644
index 000000000..944a02e58
--- /dev/null
+++ b/ruamoko/qwaq/debugger/quatview.r
@@ -0,0 +1,28 @@
+#include <string.h>
+#include "debugger/quatview.h"
+
+@implementation QuatView
+
+-initWithType:(qfot_type_t *)type at:(unsigned)offset in:(void *)data
+{
+	if (!(self = [super initWithType:type])) {
+		return nil;
+	}
+	self.data = (quaternion *)(data + offset);
+	return self;
+}
+
++(QuatView *)withType:(qfot_type_t *)type at:(unsigned)offset in:(void *)data
+{
+	return [[[self alloc] initWithType:type at:offset in:data] autorelease];
+}
+
+-draw
+{
+	[super draw];
+	string val = sprintf ("%.9q", data[0]);
+	[self mvaddstr:{0, 0}, str_mid (val, 0, xlen)];
+	return self;
+}
+
+@end
diff --git a/ruamoko/qwaq/debugger/stringview.h b/ruamoko/qwaq/debugger/stringview.h
new file mode 100644
index 000000000..708ef72ca
--- /dev/null
+++ b/ruamoko/qwaq/debugger/stringview.h
@@ -0,0 +1,13 @@
+#ifndef __qwaq_debugger_stringview_h
+#define __qwaq_debugger_stringview_h
+
+#include "debugger/defview.h"
+
+@interface StringView : DefView
+{
+	string     *data;
+}
++(StringView *)withType:(qfot_type_t *)type at:(unsigned)offset in:(void *)data;
+@end
+
+#endif//__qwaq_debugger_stringview_h
diff --git a/ruamoko/qwaq/debugger/stringview.r b/ruamoko/qwaq/debugger/stringview.r
new file mode 100644
index 000000000..81dc7cb78
--- /dev/null
+++ b/ruamoko/qwaq/debugger/stringview.r
@@ -0,0 +1,28 @@
+#include <string.h>
+#include "debugger/stringview.h"
+
+@implementation StringView
+
+-initWithType:(qfot_type_t *)type at:(unsigned)offset in:(void *)data
+{
+	if (!(self = [super initWithType:type])) {
+		return nil;
+	}
+	self.data = (string *)(data + offset);
+	return self;
+}
+
++(StringView *)withType:(qfot_type_t *)type at:(unsigned)offset in:(void *)data
+{
+	return [[[self alloc] initWithType:type at:offset in:data] autorelease];
+}
+
+-draw
+{
+	[super draw];
+	string val = sprintf ("FIXME %s", data[0]);// quote string
+	[self mvaddstr:{0, 0}, str_mid (val, 0, xlen)];
+	return self;
+}
+
+@end
diff --git a/ruamoko/qwaq/debugger/typeencodings.r b/ruamoko/qwaq/debugger/typeencodings.r
index 30ff48181..f5184c0eb 100644
--- a/ruamoko/qwaq/debugger/typeencodings.r
+++ b/ruamoko/qwaq/debugger/typeencodings.r
@@ -69,7 +69,6 @@ static void type_free (void *t, void *unused)
 	for (type = encodings.types;
 		 ((int *)type - (int *) encodings.types) < encodings.size;
 		 type = next_type (type)) {
-		printf ("%s\n", type.encoding);
 		Hash_Add (static_encodings, type);
 	}
 	return self;
diff --git a/ruamoko/qwaq/debugger/uintview.h b/ruamoko/qwaq/debugger/uintview.h
new file mode 100644
index 000000000..752db5a20
--- /dev/null
+++ b/ruamoko/qwaq/debugger/uintview.h
@@ -0,0 +1,13 @@
+#ifndef __qwaq_debugger_uintview_h
+#define __qwaq_debugger_uintview_h
+
+#include "debugger/defview.h"
+
+@interface UIntView : DefView
+{
+	unsigned   *data;
+}
++(UIntView *)withType:(qfot_type_t *)type at:(unsigned)offset in:(void *)data;
+@end
+
+#endif//__qwaq_debugger_uintview_h
diff --git a/ruamoko/qwaq/debugger/uintview.r b/ruamoko/qwaq/debugger/uintview.r
new file mode 100644
index 000000000..d1efc4a17
--- /dev/null
+++ b/ruamoko/qwaq/debugger/uintview.r
@@ -0,0 +1,28 @@
+#include <string.h>
+#include "debugger/uintview.h"
+
+@implementation UIntView
+
+-initWithType:(qfot_type_t *)type at:(unsigned)offset in:(void *)data
+{
+	if (!(self = [super initWithType:type])) {
+		return nil;
+	}
+	self.data = (unsigned *)(data + offset);
+	return self;
+}
+
++(UIntView *)withType:(qfot_type_t *)type at:(unsigned)offset in:(void *)data
+{
+	return [[[self alloc] initWithType:type at:offset in:data] autorelease];
+}
+
+-draw
+{
+	[super draw];
+	string val = sprintf ("%u", data[0]);
+	[self mvaddstr:{0, 0}, str_mid (val, 0, xlen)];
+	return self;
+}
+
+@end
diff --git a/ruamoko/qwaq/debugger/vectorview.h b/ruamoko/qwaq/debugger/vectorview.h
new file mode 100644
index 000000000..51d2ffc34
--- /dev/null
+++ b/ruamoko/qwaq/debugger/vectorview.h
@@ -0,0 +1,13 @@
+#ifndef __qwaq_debugger_vectorview_h
+#define __qwaq_debugger_vectorview_h
+
+#include "debugger/defview.h"
+
+@interface VectorView : DefView
+{
+	vector     *data;
+}
++(VectorView *)withType:(qfot_type_t *)type at:(unsigned)offset in:(void *)data;
+@end
+
+#endif//__qwaq_debugger_vectorview_h
diff --git a/ruamoko/qwaq/debugger/vectorview.r b/ruamoko/qwaq/debugger/vectorview.r
new file mode 100644
index 000000000..0d29865d3
--- /dev/null
+++ b/ruamoko/qwaq/debugger/vectorview.r
@@ -0,0 +1,28 @@
+#include <string.h>
+#include "debugger/vectorview.h"
+
+@implementation VectorView
+
+-initWithType:(qfot_type_t *)type at:(unsigned)offset in:(void *)data
+{
+	if (!(self = [super initWithType:type])) {
+		return nil;
+	}
+	self.data = (vector *)(data + offset);
+	return self;
+}
+
++(VectorView *)withType:(qfot_type_t *)type at:(unsigned)offset in:(void *)data
+{
+	return [[[self alloc] initWithType:type at:offset in:data] autorelease];
+}
+
+-draw
+{
+	[super draw];
+	string val = sprintf ("%.9v", data[0]);
+	[self mvaddstr:{0, 0}, str_mid (val, 0, xlen)];
+	return self;
+}
+
+@end
diff --git a/ruamoko/qwaq/debugger/voidview.h b/ruamoko/qwaq/debugger/voidview.h
new file mode 100644
index 000000000..e0e19c675
--- /dev/null
+++ b/ruamoko/qwaq/debugger/voidview.h
@@ -0,0 +1,13 @@
+#ifndef __qwaq_debugger_voidview_h
+#define __qwaq_debugger_voidview_h
+
+#include "debugger/defview.h"
+
+@interface VoidView : DefView
+{
+	unsigned   *data;
+}
++(VoidView *)withType:(qfot_type_t *)type at:(unsigned)offset in:(void *)data;
+@end
+
+#endif//__qwaq_debugger_voidview_h
diff --git a/ruamoko/qwaq/debugger/voidview.r b/ruamoko/qwaq/debugger/voidview.r
new file mode 100644
index 000000000..3683a08f3
--- /dev/null
+++ b/ruamoko/qwaq/debugger/voidview.r
@@ -0,0 +1,29 @@
+#include <string.h>
+#include "debugger/voidview.h"
+
+@implementation VoidView
+
+-initWithType:(qfot_type_t *)type at:(unsigned)offset in:(void *)data
+{
+	if (!(self = [super initWithType:type])) {
+		return nil;
+	}
+	self.data = (unsigned *) (data + offset);
+	return self;
+}
+
++(VoidView *)withType:(qfot_type_t *)type at:(unsigned)offset in:(void *)data
+{
+	return [[[self alloc] initWithType:type at:offset in:data] autorelease];
+}
+
+-draw
+{
+	[super draw];
+	string val = sprintf ("%08x %08x %08x %08x",
+						  data[0], data[1], data[2], data[3]);
+	[self mvaddstr:{0, 0}, str_mid (val, 0, xlen)];
+	return self;
+}
+
+@end
diff --git a/ruamoko/qwaq/ui/listener.r b/ruamoko/qwaq/ui/listener.r
index 3664040d2..31dd001fa 100644
--- a/ruamoko/qwaq/ui/listener.r
+++ b/ruamoko/qwaq/ui/listener.r
@@ -1,6 +1,7 @@
 #include <Array.h>
 
 #include "ui/listener.h"
+#include "ui/curses.h"
 
 @class Array;
 
@@ -55,6 +56,12 @@
 	return self;
 }
 
+-(void)dealloc
+{
+	[listeners release];
+	[super dealloc];
+}
+
 -addListener: (id) responder :(SEL)message
 {
 	Listener   *listener = [Listener listenerWithResponder:responder :message];
diff --git a/ruamoko/qwaq/ui/scrollbar.r b/ruamoko/qwaq/ui/scrollbar.r
index 411e7d344..b8b005aa8 100644
--- a/ruamoko/qwaq/ui/scrollbar.r
+++ b/ruamoko/qwaq/ui/scrollbar.r
@@ -62,6 +62,7 @@
 	[objects release];
 	[buffer release];
 	[onScrollBarModified release];
+	[super dealloc];
 }
 
 +(ScrollBar *)horizontal:(unsigned)len at:(Point)pos
diff --git a/ruamoko/qwaq/ui/tableview.r b/ruamoko/qwaq/ui/tableview.r
index fa2772eae..625849a4d 100644
--- a/ruamoko/qwaq/ui/tableview.r
+++ b/ruamoko/qwaq/ui/tableview.r
@@ -49,6 +49,7 @@
 	options = ofCanFocus | ofRelativeEvents;
 	columns = [[Array array] retain];
 	buffer = [[DrawBuffer buffer:size] retain];
+	[buffer bkgd:' '];
 	[onViewScrolled addListener:self :@selector(onScroll:)];
 	return self;
 }
@@ -58,6 +59,7 @@
 	[columns release];
 	[buffer release];
 	[dataSource release];
+	[super dealloc];
 }
 
 +(TableView *)withRect:(Rect)rect
diff --git a/ruamoko/qwaq/ui/view.r b/ruamoko/qwaq/ui/view.r
index 5dc0da9e6..31005878f 100644
--- a/ruamoko/qwaq/ui/view.r
+++ b/ruamoko/qwaq/ui/view.r
@@ -60,9 +60,6 @@ static void view_init(View *self)
 
 - (void) dealloc
 {
-	if (owner) {
-		[owner remove:self];
-	}
 	[onReceiveFocus release];
 	[onReleaseFocus release];
 	[onEvent release];
@@ -353,6 +350,16 @@ updateScreenCursor (View *view)
 	return self;
 }
 
+-(ListenerGroup *) onReceiveFocus
+{
+	return onReceiveFocus;
+}
+
+-(ListenerGroup *) onReleaseFocus
+{
+	return onReleaseFocus;
+}
+
 -(ListenerGroup *)onEvent
 {
 	return onEvent;
@@ -391,16 +398,6 @@ updateScreenCursor (View *view)
 	return self;
 }
 
--(ListenerGroup *) onReceiveFocus
-{
-	return onReceiveFocus;
-}
-
--(ListenerGroup *) onReleaseFocus
-{
-	return onReleaseFocus;
-}
-
 -raise
 {
 	return self;

From beecdcadbf023f9ff06997c64595766f069dfce5 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 31 Mar 2020 22:03:56 +0900
Subject: [PATCH 1089/1519] [qwaq] Support resizing the table view

---
 ruamoko/qwaq/debugger/debugger.r |  3 ++-
 ruamoko/qwaq/ui/tableview.h      |  5 +++++
 ruamoko/qwaq/ui/tableview.r      | 23 +++++++++++++++++++++++
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/ruamoko/qwaq/debugger/debugger.r b/ruamoko/qwaq/debugger/debugger.r
index 85ae89efd..afb922a38 100644
--- a/ruamoko/qwaq/debugger/debugger.r
+++ b/ruamoko/qwaq/debugger/debugger.r
@@ -87,7 +87,8 @@
 	locals_data = [[LocalsData withTarget:target] retain];
 	locals_view = [TableView withRect:{{1, 1}, {38, 8}}];
 	[locals_view addColumn:[TableViewColumn named:"name" width:12]];
-	[locals_view addColumn:[TableViewColumn named:"value" width:26]];
+	[locals_view addColumn:[[TableViewColumn named:"value" width:26]
+							setGrowMode:gfGrowHiX]];
 	ScrollBar *sb = [ScrollBar vertical:8 at:{39, 1}];
 	[locals_view setVerticalScrollBar:sb];
 	[locals_view setDataSource:locals_data];
diff --git a/ruamoko/qwaq/ui/tableview.h b/ruamoko/qwaq/ui/tableview.h
index b21279b0a..9a6233333 100644
--- a/ruamoko/qwaq/ui/tableview.h
+++ b/ruamoko/qwaq/ui/tableview.h
@@ -21,9 +21,14 @@
 {
 	string      name;
 	int         width;
+	int         growMode;	// Y flags ignored
 }
 +(TableViewColumn *)named:(string)name;
 +(TableViewColumn *)named:(string)name width:(int)width;
+
+-setGrowMode: (int) mode;
+-(int)growMode;
+
 -(string)name;
 -(int)width;
 @end
diff --git a/ruamoko/qwaq/ui/tableview.r b/ruamoko/qwaq/ui/tableview.r
index 625849a4d..cb1a3f94c 100644
--- a/ruamoko/qwaq/ui/tableview.r
+++ b/ruamoko/qwaq/ui/tableview.r
@@ -23,6 +23,17 @@
 	return [[[self alloc] initWithName:name width:width] autorelease];
 }
 
+-setGrowMode: (int) mode
+{
+	growMode = mode;
+	return self;
+}
+
+-(int)growMode
+{
+	return growMode;
+}
+
 -(string)name
 {
 	return name;
@@ -38,6 +49,14 @@
 	self.width = width;
 	return self;
 }
+
+-grow:(Extent)delta
+{
+	if (growMode & gfGrowHiX) {
+		width += delta.width;
+	}
+	return self;
+}
 @end
 
 @implementation TableView
@@ -51,6 +70,7 @@
 	buffer = [[DrawBuffer buffer:size] retain];
 	[buffer bkgd:' '];
 	[onViewScrolled addListener:self :@selector(onScroll:)];
+	growMode = gfGrowHi;
 	return self;
 }
 
@@ -85,6 +105,9 @@
 	Extent size = self.size;
 	[super resize:delta];
 	[buffer resizeTo:self.size];
+	for (int i = [columns count]; i-- > 0; ) {
+		[[columns objectAtIndex: i] grow: delta];
+	}
 	return self;
 }
 

From c515d63d9712419892137df03b0dcf9f6992a7a8 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 31 Mar 2020 23:23:18 +0900
Subject: [PATCH 1090/1519] [qwaq] Get the locals view working

All because I forgot I went the unixy way for qdb_get_data.
---
 ruamoko/qwaq/debugger/debugger.r      |  1 +
 ruamoko/qwaq/debugger/localsdata.h    |  1 +
 ruamoko/qwaq/debugger/localsdata.r    | 15 ++++++++-------
 ruamoko/qwaq/debugger/typeencodings.r |  2 +-
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/ruamoko/qwaq/debugger/debugger.r b/ruamoko/qwaq/debugger/debugger.r
index afb922a38..1cdad5e8d 100644
--- a/ruamoko/qwaq/debugger/debugger.r
+++ b/ruamoko/qwaq/debugger/debugger.r
@@ -121,6 +121,7 @@
 {
 	qdb_state_t state = qdb_get_state (target);
 	[locals_data setFunction:state.func];
+	[locals_data fetchData];
 	[locals_view redraw];
 }
 
diff --git a/ruamoko/qwaq/debugger/localsdata.h b/ruamoko/qwaq/debugger/localsdata.h
index 976b2ecf1..9562921c1 100644
--- a/ruamoko/qwaq/debugger/localsdata.h
+++ b/ruamoko/qwaq/debugger/localsdata.h
@@ -17,6 +17,7 @@
 }
 +(LocalsData *)withTarget:(qdb_target_t)target;
 -setFunction:(unsigned)fnum;
+-fetchData;
 @end
 
 #endif
diff --git a/ruamoko/qwaq/debugger/localsdata.r b/ruamoko/qwaq/debugger/localsdata.r
index 48019aaed..bdaa3dd79 100644
--- a/ruamoko/qwaq/debugger/localsdata.r
+++ b/ruamoko/qwaq/debugger/localsdata.r
@@ -64,6 +64,12 @@
 	return self;
 }
 
+-fetchData
+{
+	qdb_get_data (target, func.local_data, func.local_size, data);
+	return self;
+}
+
 -(int)numberOfRows:(TableView *)tableview
 {
 	if (aux_func) {
@@ -74,12 +80,6 @@
 	return 0;
 }
 
--(qfot_type_t *)type:(qdb_def_t *)def
-{
-	unsigned encoding = def.type_encoding + (unsigned) target_encodings.types;
-	return [TypeEncodings getType:encoding fromTarget:target];
-}
-
 -(View *)tableView:(TableView *)tableview
 		 forColumn:(TableViewColumn *)column
 			   row:(int)row
@@ -89,7 +89,8 @@
 	if ([column name] == "name") {
 		view = [NameView withName:qdb_get_string (target, defs[row].name)];
 	} else {
-		qfot_type_t *type = [self type:&defs[row]];
+		qfot_type_t *type = [TypeEncodings getType:defs[row].type_encoding
+										fromTarget:target];
 		unsigned    offset = defs[row].offset;
 		view = [DefView withType:type at:offset in:data];
 	}
diff --git a/ruamoko/qwaq/debugger/typeencodings.r b/ruamoko/qwaq/debugger/typeencodings.r
index f5184c0eb..0e2f4fc44 100644
--- a/ruamoko/qwaq/debugger/typeencodings.r
+++ b/ruamoko/qwaq/debugger/typeencodings.r
@@ -80,7 +80,7 @@ static void type_free (void *t, void *unused)
 	string       encoding;
 	qfot_type_t *type;
 
-	if (!qdb_get_data (target, typeAddr, TYPESIZE, &buffer)) {
+	if (qdb_get_data (target, typeAddr, TYPESIZE, &buffer) < 0) {
 		return nil;
 	}
 	if (!buffer.encoding) {

From bd7212a411489d5e3be165a34d1ce692078d7690 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 1 Apr 2020 00:03:53 +0900
Subject: [PATCH 1091/1519] [qwaq] Pass debug target into the def views

Needed for any views that have to fetch additional data (strings,
fields, etc).
---
 ruamoko/qwaq/debugger/defview.h    |  7 ++++++-
 ruamoko/qwaq/debugger/defview.r    | 17 +++++++++++++++--
 ruamoko/qwaq/debugger/localsdata.r |  2 +-
 ruamoko/qwaq/debugger/stringview.h |  2 +-
 ruamoko/qwaq/debugger/stringview.r |  4 ++--
 5 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/ruamoko/qwaq/debugger/defview.h b/ruamoko/qwaq/debugger/defview.h
index 69553620b..4760abcad 100644
--- a/ruamoko/qwaq/debugger/defview.h
+++ b/ruamoko/qwaq/debugger/defview.h
@@ -3,12 +3,17 @@
 
 #include <types.h>
 #include "ui/view.h"
+#include "debugger/debug.h"
 
 @interface DefView : View
 {
 	qfot_type_t *type;
+	qdb_target_t target;
 }
-+(DefView *)withType:(qfot_type_t *)type at:(unsigned)offset in:(void *)data;
++(DefView *)withType:(qfot_type_t *)type
+				  at:(unsigned)offset
+				  in:(void *)data
+			  target:(qdb_target_t)target;
 -initWithType:(qfot_type_t *)type;
 @end
 
diff --git a/ruamoko/qwaq/debugger/defview.r b/ruamoko/qwaq/debugger/defview.r
index 5768a14f5..f115c8e61 100644
--- a/ruamoko/qwaq/debugger/defview.r
+++ b/ruamoko/qwaq/debugger/defview.r
@@ -31,10 +31,23 @@ static string meta_views[] = {
 	return self;
 }
 
+-setTarget:(qdb_target_t)target
+{
+	self.target = target;
+	return self;
+}
+
 +(DefView *)withType:(qfot_type_t *)type at:(unsigned)offset in:(void *)data
+{
+	return [self withType:type at:offset in:data target:nil];
+}
+
++(DefView *)withType:(qfot_type_t *)type
+				  at:(unsigned)offset
+				  in:(void *)data
+			  target:(qdb_target_t)target
 {
 	string metaname = nil;
-	//printf("%d %d %d %d\n", type.meta, type.size, type.encoding, type.type);
 	if (type.meta == ty_alias) {
 		type = type.alias.aux_type;
 	}
@@ -44,7 +57,7 @@ static string meta_views[] = {
 	}
 	id class = obj_lookup_class (metaname);
 	if (class) {
-		return [class withType:type at:offset in:data];
+		return [[class withType:type at:offset in:data] setTarget:target];
 	}
 	return [NameView withName:"Invalid Meta"];
 }
diff --git a/ruamoko/qwaq/debugger/localsdata.r b/ruamoko/qwaq/debugger/localsdata.r
index bdaa3dd79..7e6472191 100644
--- a/ruamoko/qwaq/debugger/localsdata.r
+++ b/ruamoko/qwaq/debugger/localsdata.r
@@ -92,7 +92,7 @@
 		qfot_type_t *type = [TypeEncodings getType:defs[row].type_encoding
 										fromTarget:target];
 		unsigned    offset = defs[row].offset;
-		view = [DefView withType:type at:offset in:data];
+		view = [DefView withType:type at:offset in:data target:target];
 	}
 	[view resizeTo:{[column width], 1}];
 	return view;
diff --git a/ruamoko/qwaq/debugger/stringview.h b/ruamoko/qwaq/debugger/stringview.h
index 708ef72ca..62b009e5d 100644
--- a/ruamoko/qwaq/debugger/stringview.h
+++ b/ruamoko/qwaq/debugger/stringview.h
@@ -5,7 +5,7 @@
 
 @interface StringView : DefView
 {
-	string     *data;
+	int        *data;
 }
 +(StringView *)withType:(qfot_type_t *)type at:(unsigned)offset in:(void *)data;
 @end
diff --git a/ruamoko/qwaq/debugger/stringview.r b/ruamoko/qwaq/debugger/stringview.r
index 81dc7cb78..445ccfdbf 100644
--- a/ruamoko/qwaq/debugger/stringview.r
+++ b/ruamoko/qwaq/debugger/stringview.r
@@ -8,7 +8,7 @@
 	if (!(self = [super initWithType:type])) {
 		return nil;
 	}
-	self.data = (string *)(data + offset);
+	self.data = (int *)(data + offset);
 	return self;
 }
 
@@ -20,7 +20,7 @@
 -draw
 {
 	[super draw];
-	string val = sprintf ("FIXME %s", data[0]);// quote string
+	string val = sprintf ("FIXME %s", qdb_get_string (target, data[0]));// quote string
 	[self mvaddstr:{0, 0}, str_mid (val, 0, xlen)];
 	return self;
 }

From e9733416f4903150959eaa255213524ad24acd26 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 1 Apr 2020 00:09:34 +0900
Subject: [PATCH 1092/1519] [gamecode] Hide trace messages when debugger is
 attached

---
 libs/gamecode/pr_exec.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libs/gamecode/pr_exec.c b/libs/gamecode/pr_exec.c
index b0a7cb820..9a287b4f9 100644
--- a/libs/gamecode/pr_exec.c
+++ b/libs/gamecode/pr_exec.c
@@ -193,7 +193,7 @@ PR_EnterFunction (progs_t *pr, bfunction_t *f)
 	pr_type_t  *dstParams[MAX_PARMS];
 	pointer_t   paramofs = 0;
 
-	if (pr->pr_trace) {
+	if (pr->pr_trace && !pr->debug_handler) {
 		Sys_Printf ("Entering function %s\n",
 					PR_GetString (pr, f->descriptor->s_name));
 	}
@@ -284,7 +284,7 @@ PR_LeaveFunction (progs_t *pr, int to_engine)
 
 	PR_PopFrame (pr);
 
-	if (pr->pr_trace) {
+	if (pr->pr_trace && !pr->debug_handler) {
 		Sys_Printf ("Leaving function %s\n",
 					PR_GetString (pr, f->descriptor->s_name));
 		if (to_engine) {
@@ -405,7 +405,7 @@ PR_CallFunction (progs_t *pr, func_t fnum)
 	f = pr->function_table + fnum;
 	if (f->first_statement < 0) {
 		// negative statements are built in functions
-		if (pr->pr_trace) {
+		if (pr->pr_trace && !pr->debug_handler) {
 			Sys_Printf ("Calling builtin %s @ %p\n",
 						PR_GetString (pr, f->descriptor->s_name), f->func);
 		}

From a7956c73115aa287751d37dc40f8e29fc8b16d6c Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 1 Apr 2020 11:19:56 +0900
Subject: [PATCH 1093/1519] [gamecode] Move format state into a state struct

This is the first step in reworking PR_Sprintf to use a state machine.
The goal is to make it more robust against errors and easier to extend
(eg, * width and precision).
---
 libs/gamecode/pr_strings.c | 241 +++++++++++++++++++------------------
 1 file changed, 124 insertions(+), 117 deletions(-)

diff --git a/libs/gamecode/pr_strings.c b/libs/gamecode/pr_strings.c
index 7781865a7..78cdc8120 100644
--- a/libs/gamecode/pr_strings.c
+++ b/libs/gamecode/pr_strings.c
@@ -808,6 +808,14 @@ free_fmt_item (prstr_resources_t *res, fmt_item_t *fi)
 	res->free_fmt_items = fi;
 }
 
+typedef struct fmtstate_s {
+	const char *c;
+	const char *l;
+	fmt_item_t *fmt_items;
+	fmt_item_t **fi;
+	int         fmt_count;
+} fmt_state_t;
+
 #undef P_var
 #define P_var(p,n,t) (args[n]->t##_var)
 #undef P_DOUBLE
@@ -817,229 +825,228 @@ PR_Sprintf (progs_t *pr, dstring_t *result, const char *name,
 			const char *format, int count, pr_type_t **args)
 {
 	prstr_resources_t *res = pr->pr_string_resources;
-	const char *c, *l;
 	const char *msg = "";
-	fmt_item_t *fmt_items = 0;
-	fmt_item_t **fi = &fmt_items;
-	int         fmt_count = 0;
+	fmt_state_t state = { };
+
+	state.fi = &state.fmt_items;
 
 	if (!name)
 		name = "PR_Sprintf";
 
-	*fi = new_fmt_item (res);
-	c = l = format;
-	while (*c) {
-		if (*c++ == '%') {
-			if (c != l + 1) {
+	*state.fi = new_fmt_item (res);
+	state.c = state.l = format;
+	while (*state.c) {
+		if (*state.c++ == '%') {
+			if (state.c != state.l + 1) {
 				// have some unformatted text to print
-				(*fi)->precision = c - l - 1;
-				(*fi)->type = 's';
-				(*fi)->data.string_var = l;
+				(*state.fi)->precision = state.c - state.l - 1;
+				(*state.fi)->type = 's';
+				(*state.fi)->data.string_var = state.l;
 
-				(*fi)->next = new_fmt_item (res);
-				fi = &(*fi)->next;
+				(*state.fi)->next = new_fmt_item (res);
+				state.fi = &(*state.fi)->next;
 			}
-			if (*c == '%') {
-				(*fi)->type = 's';
-				(*fi)->data.string_var = "%";
+			if (*state.c == '%') {
+				(*state.fi)->type = 's';
+				(*state.fi)->data.string_var = "%";
 
-				(*fi)->next = new_fmt_item (res);
-				fi = &(*fi)->next;
+				(*state.fi)->next = new_fmt_item (res);
+				state.fi = &(*state.fi)->next;
 			} else {
 				do {
-					switch (*c) {
+					switch (*state.c) {
 						// format options
 						case '\0':
 							msg = "Unexpected end of format string";
 							goto error;
 						case '0':
-							(*fi)->flags |= FMT_ZEROPAD;
-							c++;
+							(*state.fi)->flags |= FMT_ZEROPAD;
+							state.c++;
 							continue;
 						case '#':
-							(*fi)->flags |= FMT_ALTFORM;
-							c++;
+							(*state.fi)->flags |= FMT_ALTFORM;
+							state.c++;
 							continue;
 						case ' ':
-							(*fi)->flags |= FMT_ADDBLANK;
-							c++;
+							(*state.fi)->flags |= FMT_ADDBLANK;
+							state.c++;
 							continue;
 						case '-':
-							(*fi)->flags |= FMT_LJUSTIFY;
-							c++;
+							(*state.fi)->flags |= FMT_LJUSTIFY;
+							state.c++;
 							continue;
 						case '+':
-							(*fi)->flags |= FMT_ADDSIGN;
-							c++;
+							(*state.fi)->flags |= FMT_ADDSIGN;
+							state.c++;
 							continue;
 						case '.':
-							(*fi)->precision = 0;
-							c++;
-							while (isdigit ((byte )*c)) {
-								(*fi)->precision *= 10;
-								(*fi)->precision += *c++ - '0';
+							(*state.fi)->precision = 0;
+							state.c++;
+							while (isdigit ((byte )*state.c)) {
+								(*state.fi)->precision *= 10;
+								(*state.fi)->precision += *state.c++ - '0';
 							}
 							continue;
 						case '1': case '2': case '3': case '4': case '5':
 						case '6': case '7': case '8': case '9':
-							while (isdigit ((byte )*c)) {
-								(*fi)->minFieldWidth *= 10;
-								(*fi)->minFieldWidth += *c++ - '0';
+							while (isdigit ((byte )*state.c)) {
+								(*state.fi)->minFieldWidth *= 10;
+								(*state.fi)->minFieldWidth += *state.c++ - '0';
 							}
 							continue;
 						// format types
 						case '@':
 							// object
-							fmt_count++;
-							(*fi)->next = new_fmt_item (res);
-							fi = &(*fi)->next;
+							state.fmt_count++;
+							(*state.fi)->next = new_fmt_item (res);
+							state.fi = &(*state.fi)->next;
 							break;
 						case 'e':
 							// entity
-							(*fi)->type = 'i';
-							(*fi)->data.integer_var =
-								P_EDICTNUM (pr, fmt_count);
+							(*state.fi)->type = 'i';
+							(*state.fi)->data.integer_var =
+								P_EDICTNUM (pr, state.fmt_count);
 
-							fmt_count++;
-							(*fi)->next = new_fmt_item (res);
-							fi = &(*fi)->next;
+							state.fmt_count++;
+							(*state.fi)->next = new_fmt_item (res);
+							state.fi = &(*state.fi)->next;
 							break;
 						case 'i':
 						case 'd':
 						case 'c':
 							// integer
-							(*fi)->type = *c;
-							(*fi)->data.integer_var = P_INT (pr, fmt_count);
+							(*state.fi)->type = *state.c;
+							(*state.fi)->data.integer_var = P_INT (pr, state.fmt_count);
 
-							fmt_count++;
-							(*fi)->next = new_fmt_item (res);
-							fi = &(*fi)->next;
+							state.fmt_count++;
+							(*state.fi)->next = new_fmt_item (res);
+							state.fi = &(*state.fi)->next;
 							break;
 						case 'f':
 							// float or double
 						case 'g':
 							// float or double, no trailing zeroes, trim "."
 							// if nothing after
-							(*fi)->type = *c;
+							(*state.fi)->type = *state.c;
 							if (pr->float_promoted) {
-								(*fi)->flags |= FMT_LONG;
-								(*fi)->data.double_var
-									= P_DOUBLE (pr, fmt_count);
+								(*state.fi)->flags |= FMT_LONG;
+								(*state.fi)->data.double_var
+									= P_DOUBLE (pr, state.fmt_count);
 							} else {
-								(*fi)->data.float_var
-									= P_FLOAT (pr, fmt_count);
+								(*state.fi)->data.float_var
+									= P_FLOAT (pr, state.fmt_count);
 							}
 
-							fmt_count++;
-							(*fi)->next = new_fmt_item (res);
-							fi = &(*fi)->next;
+							state.fmt_count++;
+							(*state.fi)->next = new_fmt_item (res);
+							state.fi = &(*state.fi)->next;
 							break;
 						case 'p':
 							// pointer
-							(*fi)->flags |= FMT_ALTFORM;
-							(*fi)->type = 'x';
-							(*fi)->data.uinteger_var = P_UINT (pr, fmt_count);
+							(*state.fi)->flags |= FMT_ALTFORM;
+							(*state.fi)->type = 'x';
+							(*state.fi)->data.uinteger_var = P_UINT (pr, state.fmt_count);
 
-							fmt_count++;
-							(*fi)->next = new_fmt_item (res);
-							fi = &(*fi)->next;
+							state.fmt_count++;
+							(*state.fi)->next = new_fmt_item (res);
+							state.fi = &(*state.fi)->next;
 							break;
 						case 's':
 							// string
-							(*fi)->type = *c;
-							(*fi)->data.string_var = P_GSTRING (pr, fmt_count);
+							(*state.fi)->type = *state.c;
+							(*state.fi)->data.string_var = P_GSTRING (pr, state.fmt_count);
 
-							fmt_count++;
-							(*fi)->next = new_fmt_item (res);
-							fi = &(*fi)->next;
+							state.fmt_count++;
+							(*state.fi)->next = new_fmt_item (res);
+							state.fi = &(*state.fi)->next;
 							break;
 						case 'v':
 						case 'q':
 							// vector
 							{
 								int         i, count = 3;
-								int         flags = (*fi)->flags;
-								int         precision = (*fi)->precision;
-								unsigned    minWidth = (*fi)->minFieldWidth;
+								int         flags = (*state.fi)->flags;
+								int         precision = (*state.fi)->precision;
+								unsigned    minWidth = (*state.fi)->minFieldWidth;
 
-								(*fi)->flags = 0;
-								(*fi)->precision = -1;
-								(*fi)->minFieldWidth = 0;
+								(*state.fi)->flags = 0;
+								(*state.fi)->precision = -1;
+								(*state.fi)->minFieldWidth = 0;
 
-								if (*c == 'q')
+								if (*state.c == 'q')
 									count = 4;
 
 								for (i = 0; i < count; i++) {
 									if (i == 0) {
-										(*fi)->type = 's';
-										(*fi)->data.string_var = "'";
+										(*state.fi)->type = 's';
+										(*state.fi)->data.string_var = "'";
 									} else {
-										(*fi)->type = 's';
-										(*fi)->data.string_var = " ";
+										(*state.fi)->type = 's';
+										(*state.fi)->data.string_var = " ";
 									}
-									(*fi)->next = new_fmt_item (res);
-									fi = &(*fi)->next;
+									(*state.fi)->next = new_fmt_item (res);
+									state.fi = &(*state.fi)->next;
 
-									(*fi)->flags = flags;
-									(*fi)->precision = precision;
-									(*fi)->minFieldWidth = minWidth;
-									(*fi)->type = 'g';
-									(*fi)->data.float_var =
-										P_VECTOR (pr, fmt_count)[i];
+									(*state.fi)->flags = flags;
+									(*state.fi)->precision = precision;
+									(*state.fi)->minFieldWidth = minWidth;
+									(*state.fi)->type = 'g';
+									(*state.fi)->data.float_var =
+										P_VECTOR (pr, state.fmt_count)[i];
 
-									(*fi)->next = new_fmt_item (res);
-									fi = &(*fi)->next;
+									(*state.fi)->next = new_fmt_item (res);
+									state.fi = &(*state.fi)->next;
 								}
 							}
 
-							(*fi)->type = 's';
-							(*fi)->data.string_var = "'";
+							(*state.fi)->type = 's';
+							(*state.fi)->data.string_var = "'";
 
-							fmt_count++;
-							(*fi)->next = new_fmt_item (res);
-							fi = &(*fi)->next;
+							state.fmt_count++;
+							(*state.fi)->next = new_fmt_item (res);
+							state.fi = &(*state.fi)->next;
 							break;
 						case 'x':
 							// integer, hex notation
-							(*fi)->type = *c;
-							(*fi)->data.uinteger_var = P_UINT (pr, fmt_count);
+							(*state.fi)->type = *state.c;
+							(*state.fi)->data.uinteger_var = P_UINT (pr, state.fmt_count);
 
-							fmt_count++;
-							(*fi)->next = new_fmt_item (res);
-							fi = &(*fi)->next;
+							state.fmt_count++;
+							(*state.fi)->next = new_fmt_item (res);
+							state.fi = &(*state.fi)->next;
 							break;
 					}
 					break;
 				} while (1);
 			}
-			l = ++c;
+			state.l = ++state.c;
 		}
 	}
-	if (c != l) {
+	if (state.c != state.l) {
 		// have some unformatted text to print
-		(*fi)->precision = c - l;
-		(*fi)->type = 's';
-		(*fi)->data.string_var = l;
+		(*state.fi)->precision = state.c - state.l;
+		(*state.fi)->type = 's';
+		(*state.fi)->data.string_var = state.l;
 
-		(*fi)->next = new_fmt_item (res);
+		(*state.fi)->next = new_fmt_item (res);
 	}
 
-	if (fmt_count != count) {
-		if (fmt_count > count)
+	if (state.fmt_count != count) {
+		if (state.fmt_count > count)
 			msg = "Not enough arguments for format string.";
 		else
 			msg = "Too many arguments for format string.";
-		dsprintf (res->print_str, "%s: %d %d", msg, fmt_count, count);
+		dsprintf (res->print_str, "%s: %d %d", msg, state.fmt_count, count);
 		msg = res->print_str->str;
 		goto error;
 	}
 
 	dstring_clear (res->print_str);
-	I_DoPrint (res->print_str, result, fmt_items);
-	while (fmt_items) {
-		fmt_item_t *t = fmt_items->next;
-		free_fmt_item (res, fmt_items);
-		fmt_items = t;
+	I_DoPrint (res->print_str, result, state.fmt_items);
+	while (state.fmt_items) {
+		fmt_item_t *t = state.fmt_items->next;
+		free_fmt_item (res, state.fmt_items);
+		state.fmt_items = t;
 	}
 	return;
 error:

From 7f86fb55296d725abbb2162ee0c4ac825d248e0f Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 1 Apr 2020 13:32:07 +0900
Subject: [PATCH 1094/1519] [gamecode] Rework PR_Sprintf to use a state machine

This makes it much easier to extend. There are even stubs for variable
field width and precision (not set yet).
---
 libs/gamecode/pr_strings.c | 509 ++++++++++++++++++++++---------------
 1 file changed, 302 insertions(+), 207 deletions(-)

diff --git a/libs/gamecode/pr_strings.c b/libs/gamecode/pr_strings.c
index 78cdc8120..31c387575 100644
--- a/libs/gamecode/pr_strings.c
+++ b/libs/gamecode/pr_strings.c
@@ -808,236 +808,331 @@ free_fmt_item (prstr_resources_t *res, fmt_item_t *fi)
 	res->free_fmt_items = fi;
 }
 
-typedef struct fmtstate_s {
+struct fmt_state_s;
+typedef void (*fmt_state_f) (struct fmt_state_s *);
+
+typedef struct fmt_state_s {
+	fmt_state_f state;
+	prstr_resources_t *res;
+	progs_t    *pr;
+	pr_type_t **args;
 	const char *c;
-	const char *l;
+	const char *msg;
 	fmt_item_t *fmt_items;
 	fmt_item_t **fi;
 	int         fmt_count;
 } fmt_state_t;
 
+static inline void
+fmt_append_item (fmt_state_t *state)
+{
+	(*state->fi)->next = new_fmt_item (state->res);
+	state->fi = &(*state->fi)->next;
+}
+
 #undef P_var
-#define P_var(p,n,t) (args[n]->t##_var)
+#define P_var(p,n,t) (state->args[n]->t##_var)
 #undef P_DOUBLE
-#define P_DOUBLE(p,n) (*(double *) (args[n]))
+#define P_DOUBLE(p,n) (*(double *) (state->args[n]))
+
+static void fmt_state_format (fmt_state_t *state);
+static void fmt_state_flags (fmt_state_t *state);
+static void fmt_state_var_field_width (fmt_state_t *state);
+static void fmt_state_field_width (fmt_state_t *state);
+static void fmt_state_precision (fmt_state_t *state);
+static void fmt_state_var_precision (fmt_state_t *state);
+static void fmt_state_fixed_precision (fmt_state_t *state);
+static void fmt_state_modifiers (fmt_state_t *state);
+static void fmt_state_conversion (fmt_state_t *state);
+
+static void
+fmt_state_flags (fmt_state_t *state)
+{
+	state->c++;	// skip over %
+	while (1) {
+		switch (*state->c) {
+			case '0':
+				(*state->fi)->flags |= FMT_ZEROPAD;
+				break;
+			case '#':
+				(*state->fi)->flags |= FMT_ALTFORM;
+				break;
+			case ' ':
+				(*state->fi)->flags |= FMT_ADDBLANK;
+				break;
+			case '-':
+				(*state->fi)->flags |= FMT_LJUSTIFY;
+				break;
+			case '+':
+				(*state->fi)->flags |= FMT_ADDSIGN;
+				break;
+			case '*':
+				state->state = fmt_state_var_field_width;
+				return;
+			case '.':
+				state->state = fmt_state_precision;
+				return;
+			case '1': case '2': case '3': case '4': case '5':
+			case '6': case '7': case '8': case '9':
+				state->state = fmt_state_field_width;
+				return;
+			default:
+				state->state = fmt_state_modifiers;
+				return;
+		}
+		state->c++;
+	}
+}
+
+static void
+fmt_state_var_field_width (fmt_state_t *state)
+{
+	// XXX record width
+	if (*++state->c == '.') {
+		state->state = fmt_state_precision;
+	} else {
+		state->state = fmt_state_modifiers;
+	}
+}
+
+static void
+fmt_state_field_width (fmt_state_t *state)
+{
+	while (isdigit ((byte )*state->c)) {
+		(*state->fi)->minFieldWidth *= 10;
+		(*state->fi)->minFieldWidth += *state->c++ - '0';
+	}
+	if (*state->c == '.') {
+		state->state = fmt_state_precision;
+	} else {
+		state->state = fmt_state_modifiers;
+	}
+}
+
+static void
+fmt_state_precision (fmt_state_t *state)
+{
+	state->c++;	// skip over .
+	(*state->fi)->precision = 0;
+	if (isdigit ((byte )*state->c)) {
+		state->state = fmt_state_fixed_precision;
+	} else if (*state->c == '*') {
+		state->state = fmt_state_var_precision;
+	} else {
+		state->state = fmt_state_modifiers;
+	}
+}
+
+static void
+fmt_state_var_precision (fmt_state_t *state)
+{
+	// XXX record precision
+	state->state = fmt_state_modifiers;
+}
+
+static void
+fmt_state_fixed_precision (fmt_state_t *state)
+{
+	while (isdigit ((byte )*state->c)) {
+		(*state->fi)->precision *= 10;
+		(*state->fi)->precision += *state->c++ - '0';
+	}
+	state->state = fmt_state_modifiers;
+}
+
+static void
+fmt_state_modifiers (fmt_state_t *state)
+{
+	// no modifiers supported
+	state->state = fmt_state_conversion;
+}
+
+static void
+fmt_state_conversion (fmt_state_t *state)
+{
+	progs_t    *pr = state->pr;
+	char        conv;
+	switch ((conv = *state->c++)) {
+		case '@':
+			// object
+			state->fmt_count++;
+			fmt_append_item (state);
+			break;
+		case 'e':
+			// entity
+			(*state->fi)->type = 'i';
+			(*state->fi)->data.integer_var =
+				P_EDICTNUM (pr, state->fmt_count);
+
+			state->fmt_count++;
+			fmt_append_item (state);
+			break;
+		case 'i':
+		case 'd':
+		case 'c':
+			// integer
+			(*state->fi)->type = conv;
+			(*state->fi)->data.integer_var = P_INT (pr, state->fmt_count);
+
+			state->fmt_count++;
+			fmt_append_item (state);
+			break;
+		case 'f':
+			// float or double
+		case 'g':
+			// float or double, no trailing zeroes, trim "."
+			// if nothing after
+			(*state->fi)->type = conv;
+			if (pr->float_promoted) {
+				(*state->fi)->flags |= FMT_LONG;
+				(*state->fi)->data.double_var
+					= P_DOUBLE (pr, state->fmt_count);
+			} else {
+				(*state->fi)->data.float_var
+					= P_FLOAT (pr, state->fmt_count);
+			}
+
+			state->fmt_count++;
+			fmt_append_item (state);
+			break;
+		case 'p':
+			// pointer
+			(*state->fi)->flags |= FMT_ALTFORM;
+			(*state->fi)->type = 'x';
+			(*state->fi)->data.uinteger_var = P_UINT (pr, state->fmt_count);
+
+			state->fmt_count++;
+			fmt_append_item (state);
+			break;
+		case 's':
+			// string
+			(*state->fi)->type = conv;
+			(*state->fi)->data.string_var = P_GSTRING (pr, state->fmt_count);
+
+			state->fmt_count++;
+			fmt_append_item (state);
+			break;
+		case 'v':
+		case 'q':
+			// vector
+			{
+				int         i, count = 3;
+				int         flags = (*state->fi)->flags;
+				int         precision = (*state->fi)->precision;
+				unsigned    minWidth = (*state->fi)->minFieldWidth;
+
+				(*state->fi)->flags = 0;
+				(*state->fi)->precision = -1;
+				(*state->fi)->minFieldWidth = 0;
+
+				if (conv == 'q')
+					count = 4;
+
+				for (i = 0; i < count; i++) {
+					if (i == 0) {
+						(*state->fi)->type = 's';
+						(*state->fi)->data.string_var = "'";
+					} else {
+						(*state->fi)->type = 's';
+						(*state->fi)->data.string_var = " ";
+					}
+					fmt_append_item (state);
+
+					(*state->fi)->flags = flags;
+					(*state->fi)->precision = precision;
+					(*state->fi)->minFieldWidth = minWidth;
+					(*state->fi)->type = 'g';
+					(*state->fi)->data.float_var =
+						P_VECTOR (pr, state->fmt_count)[i];
+
+					fmt_append_item (state);
+				}
+			}
+
+			(*state->fi)->type = 's';
+			(*state->fi)->data.string_var = "'";
+
+			state->fmt_count++;
+			fmt_append_item (state);
+			break;
+		case '%':
+			(*state->fi)->flags = 0;
+			(*state->fi)->precision = 0;
+			(*state->fi)->minFieldWidth = 0;
+			(*state->fi)->type = 's';
+			(*state->fi)->data.string_var = "%";
+
+			fmt_append_item (state);
+			break;
+		case 'x':
+			// integer, hex notation
+			(*state->fi)->type = conv;
+			(*state->fi)->data.uinteger_var = P_UINT (pr, state->fmt_count);
+
+			state->fmt_count++;
+			fmt_append_item (state);
+			break;
+	}
+	state->state = fmt_state_format;
+}
+
+static void
+fmt_state_format (fmt_state_t *state)
+{
+	const char *l = state->c;
+	while (*state->c && *state->c != '%') {
+		state->c++;
+	}
+	if (state->c != l) {
+		// have some unformatted text to print
+		(*state->fi)->precision = state->c - l;
+		(*state->fi)->type = 's';
+		(*state->fi)->data.string_var = l;
+		if (*state->c) {
+			fmt_append_item (state);
+		}
+	}
+	if (*state->c) {
+		state->state = fmt_state_flags;
+	} else {
+		state->state = 0;	// finished
+	}
+}
+
 VISIBLE void
 PR_Sprintf (progs_t *pr, dstring_t *result, const char *name,
 			const char *format, int count, pr_type_t **args)
 {
 	prstr_resources_t *res = pr->pr_string_resources;
-	const char *msg = "";
 	fmt_state_t state = { };
 
+	state.pr = pr;
+	state.res = res;
+	state.args = args;
 	state.fi = &state.fmt_items;
+	*state.fi = new_fmt_item (res);
+	state.c = format;
+	state.state = fmt_state_format;
 
 	if (!name)
 		name = "PR_Sprintf";
 
-	*state.fi = new_fmt_item (res);
-	state.c = state.l = format;
-	while (*state.c) {
-		if (*state.c++ == '%') {
-			if (state.c != state.l + 1) {
-				// have some unformatted text to print
-				(*state.fi)->precision = state.c - state.l - 1;
-				(*state.fi)->type = 's';
-				(*state.fi)->data.string_var = state.l;
-
-				(*state.fi)->next = new_fmt_item (res);
-				state.fi = &(*state.fi)->next;
-			}
-			if (*state.c == '%') {
-				(*state.fi)->type = 's';
-				(*state.fi)->data.string_var = "%";
-
-				(*state.fi)->next = new_fmt_item (res);
-				state.fi = &(*state.fi)->next;
-			} else {
-				do {
-					switch (*state.c) {
-						// format options
-						case '\0':
-							msg = "Unexpected end of format string";
-							goto error;
-						case '0':
-							(*state.fi)->flags |= FMT_ZEROPAD;
-							state.c++;
-							continue;
-						case '#':
-							(*state.fi)->flags |= FMT_ALTFORM;
-							state.c++;
-							continue;
-						case ' ':
-							(*state.fi)->flags |= FMT_ADDBLANK;
-							state.c++;
-							continue;
-						case '-':
-							(*state.fi)->flags |= FMT_LJUSTIFY;
-							state.c++;
-							continue;
-						case '+':
-							(*state.fi)->flags |= FMT_ADDSIGN;
-							state.c++;
-							continue;
-						case '.':
-							(*state.fi)->precision = 0;
-							state.c++;
-							while (isdigit ((byte )*state.c)) {
-								(*state.fi)->precision *= 10;
-								(*state.fi)->precision += *state.c++ - '0';
-							}
-							continue;
-						case '1': case '2': case '3': case '4': case '5':
-						case '6': case '7': case '8': case '9':
-							while (isdigit ((byte )*state.c)) {
-								(*state.fi)->minFieldWidth *= 10;
-								(*state.fi)->minFieldWidth += *state.c++ - '0';
-							}
-							continue;
-						// format types
-						case '@':
-							// object
-							state.fmt_count++;
-							(*state.fi)->next = new_fmt_item (res);
-							state.fi = &(*state.fi)->next;
-							break;
-						case 'e':
-							// entity
-							(*state.fi)->type = 'i';
-							(*state.fi)->data.integer_var =
-								P_EDICTNUM (pr, state.fmt_count);
-
-							state.fmt_count++;
-							(*state.fi)->next = new_fmt_item (res);
-							state.fi = &(*state.fi)->next;
-							break;
-						case 'i':
-						case 'd':
-						case 'c':
-							// integer
-							(*state.fi)->type = *state.c;
-							(*state.fi)->data.integer_var = P_INT (pr, state.fmt_count);
-
-							state.fmt_count++;
-							(*state.fi)->next = new_fmt_item (res);
-							state.fi = &(*state.fi)->next;
-							break;
-						case 'f':
-							// float or double
-						case 'g':
-							// float or double, no trailing zeroes, trim "."
-							// if nothing after
-							(*state.fi)->type = *state.c;
-							if (pr->float_promoted) {
-								(*state.fi)->flags |= FMT_LONG;
-								(*state.fi)->data.double_var
-									= P_DOUBLE (pr, state.fmt_count);
-							} else {
-								(*state.fi)->data.float_var
-									= P_FLOAT (pr, state.fmt_count);
-							}
-
-							state.fmt_count++;
-							(*state.fi)->next = new_fmt_item (res);
-							state.fi = &(*state.fi)->next;
-							break;
-						case 'p':
-							// pointer
-							(*state.fi)->flags |= FMT_ALTFORM;
-							(*state.fi)->type = 'x';
-							(*state.fi)->data.uinteger_var = P_UINT (pr, state.fmt_count);
-
-							state.fmt_count++;
-							(*state.fi)->next = new_fmt_item (res);
-							state.fi = &(*state.fi)->next;
-							break;
-						case 's':
-							// string
-							(*state.fi)->type = *state.c;
-							(*state.fi)->data.string_var = P_GSTRING (pr, state.fmt_count);
-
-							state.fmt_count++;
-							(*state.fi)->next = new_fmt_item (res);
-							state.fi = &(*state.fi)->next;
-							break;
-						case 'v':
-						case 'q':
-							// vector
-							{
-								int         i, count = 3;
-								int         flags = (*state.fi)->flags;
-								int         precision = (*state.fi)->precision;
-								unsigned    minWidth = (*state.fi)->minFieldWidth;
-
-								(*state.fi)->flags = 0;
-								(*state.fi)->precision = -1;
-								(*state.fi)->minFieldWidth = 0;
-
-								if (*state.c == 'q')
-									count = 4;
-
-								for (i = 0; i < count; i++) {
-									if (i == 0) {
-										(*state.fi)->type = 's';
-										(*state.fi)->data.string_var = "'";
-									} else {
-										(*state.fi)->type = 's';
-										(*state.fi)->data.string_var = " ";
-									}
-									(*state.fi)->next = new_fmt_item (res);
-									state.fi = &(*state.fi)->next;
-
-									(*state.fi)->flags = flags;
-									(*state.fi)->precision = precision;
-									(*state.fi)->minFieldWidth = minWidth;
-									(*state.fi)->type = 'g';
-									(*state.fi)->data.float_var =
-										P_VECTOR (pr, state.fmt_count)[i];
-
-									(*state.fi)->next = new_fmt_item (res);
-									state.fi = &(*state.fi)->next;
-								}
-							}
-
-							(*state.fi)->type = 's';
-							(*state.fi)->data.string_var = "'";
-
-							state.fmt_count++;
-							(*state.fi)->next = new_fmt_item (res);
-							state.fi = &(*state.fi)->next;
-							break;
-						case 'x':
-							// integer, hex notation
-							(*state.fi)->type = *state.c;
-							(*state.fi)->data.uinteger_var = P_UINT (pr, state.fmt_count);
-
-							state.fmt_count++;
-							(*state.fi)->next = new_fmt_item (res);
-							state.fi = &(*state.fi)->next;
-							break;
-					}
-					break;
-				} while (1);
-			}
-			state.l = ++state.c;
-		}
-	}
-	if (state.c != state.l) {
-		// have some unformatted text to print
-		(*state.fi)->precision = state.c - state.l;
-		(*state.fi)->type = 's';
-		(*state.fi)->data.string_var = state.l;
-
-		(*state.fi)->next = new_fmt_item (res);
+	while (*state.c && state.state) {
+		state.state (&state);
 	}
 
-	if (state.fmt_count != count) {
+	if (state.state) {
+		state.msg = "Unexpected end of format string";
+	} else if (state.fmt_count != count) {
 		if (state.fmt_count > count)
-			msg = "Not enough arguments for format string.";
+			state.msg = "Not enough arguments for format string.";
 		else
-			msg = "Too many arguments for format string.";
-		dsprintf (res->print_str, "%s: %d %d", msg, state.fmt_count, count);
-		msg = res->print_str->str;
+			state.msg = "Too many arguments for format string.";
+	}
+	if (state.msg) {
+		dsprintf (res->print_str, "%s: %d %d", state.msg, state.fmt_count,
+				  count);
+		state.msg = res->print_str->str;
 		goto error;
 	}
 
@@ -1050,7 +1145,7 @@ PR_Sprintf (progs_t *pr, dstring_t *result, const char *name,
 	}
 	return;
 error:
-	PR_RunError (pr, "%s: %s", name, msg);
+	PR_RunError (pr, "%s: %s", name, state.msg);
 }
 
 void

From 842125faf89af8425906ff329d4e16a9cae76f0d Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 1 Apr 2020 13:45:22 +0900
Subject: [PATCH 1095/1519] [qfcc] Add a failing test for aliased live vars

I'm not sure if it's due more to doubles or unions, but the bug was
found via double. It seems the dags code generator doesn't see that the
assignment to the union's double field kills the two int fields.

The test passes when NOT optimizing.
---
 tools/qfcc/test/Makefile.am    | 10 +++++++++
 tools/qfcc/test/double-alias.r | 41 ++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+)
 create mode 100644 tools/qfcc/test/double-alias.r

diff --git a/tools/qfcc/test/Makefile.am b/tools/qfcc/test/Makefile.am
index a7b10901f..2b454b7a5 100644
--- a/tools/qfcc/test/Makefile.am
+++ b/tools/qfcc/test/Makefile.am
@@ -43,6 +43,7 @@ test_progs_dat=\
 	compound.dat \
 	deadbool.dat \
 	double.dat \
+	double-alias.dat \
 	enum.dat \
 	fordecl.dat \
 	func-expr.dat \
@@ -209,6 +210,15 @@ double.run: Makefile build-run
 include ./$(DEPDIR)/double.Qo # am--include-marker
 r_depfiles_remade += ./$(DEPDIR)/double.Qo
 
+double_alias_dat_SOURCES=double-alias.r
+double_alias_obj=$(double_alias_dat_SOURCES:.r=.qfo)
+double-alias.dat$(EXEEXT): $(double_alias_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(double_alias_obj)
+double-alias.run: Makefile build-run
+	@$(srcdir)/build-run $@
+include ./$(DEPDIR)/double-alias.Qo # am--include-marker
+r_depfiles_remade += ./$(DEPDIR)/double-alias.Qo
+
 classarray.run$(EXEEXT): classarray.r Makefile build-compile-fail-run
 	@$(srcdir)/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $<
 
diff --git a/tools/qfcc/test/double-alias.r b/tools/qfcc/test/double-alias.r
new file mode 100644
index 000000000..6050d2f6d
--- /dev/null
+++ b/tools/qfcc/test/double-alias.r
@@ -0,0 +1,41 @@
+void printf (string fmt, ...) = #0;
+# define M_PI 3.14159265358979323846
+
+union {
+	double d;
+	int    i[2];
+} type_pun;
+
+int alias_printf (string fmt, ...);
+
+int
+test_alias ()
+{
+	int         fail = 0;
+	type_pun.d = M_PI;
+	fail = alias_printf ("%g %08x%08x\n", type_pun.d,
+						 type_pun.i[1], type_pun.i[0]);
+	return fail;
+}
+
+int
+alias_printf (string fmt, ...)
+{
+	int         fail = 0;
+	// this will fail on big-endian systems
+	fail = (@args.list[2].integer_val != 0x54442d18
+			|| @args.list[1].integer_val != 0x400921fb);
+	printf ("%g %08x%08x\n",
+			@args.list[0].integer_val,
+			@args.list[2].integer_val,
+			@args.list[1].integer_val);
+	return fail;
+}
+
+int
+main ()
+{
+	int         fail = 0;
+	fail |= test_alias ();
+	return fail;
+}

From 4c79c9ffaf46b8c2c35c8ce8205ed2a403b6ab1a Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 1 Apr 2020 16:03:12 +0900
Subject: [PATCH 1096/1519] [qfcc] Do a dags pre-pass to give operands leafs

The reason double-alias fails is when the double assignment occurs, the
int operands don't yet have leaf nodes and thus the nodes cannot be
killed. This doesn't fix the bug.
---
 tools/qfcc/source/dags.c | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/tools/qfcc/source/dags.c b/tools/qfcc/source/dags.c
index 8b352e1c1..83c30b8b7 100644
--- a/tools/qfcc/source/dags.c
+++ b/tools/qfcc/source/dags.c
@@ -245,7 +245,21 @@ dag_node (operand_t *op)
 }
 
 static void
-dag_make_children (dag_t *dag, statement_t *s, operand_t *operands[4],
+dag_make_leafs (dag_t *dag, statement_t *s, operand_t *operands[FLOW_OPERANDS])
+{
+	int         i;
+
+	flow_analyze_statement (s, 0, 0, 0, operands);
+	for (i = 1; i < FLOW_OPERANDS; i++) {
+		if (!dag_node (operands[i])) {
+			leaf_node (dag, operands[i], s->expr);
+		}
+	}
+}
+
+static void
+dag_make_children (dag_t *dag, statement_t *s,
+				   operand_t *operands[FLOW_OPERANDS],
 				   dagnode_t *children[3])
 {
 	int         i;
@@ -730,6 +744,13 @@ dag_create (flownode_t *flownode)
 	dag->labels = alloca (num_lables * sizeof (daglabel_t));
 	dag->roots = set_new ();
 
+	// do a first pass to ensure all operands have an "x_0" leaf node
+	// prior do actual dag creation
+	for (s = block->statements; s; s = s->next) {
+		operand_t  *operands[FLOW_OPERANDS];
+		dag_make_leafs (dag, s, operands);
+	}
+	// actual dag creation
 	for (s = block->statements; s; s = s->next) {
 		operand_t  *operands[FLOW_OPERANDS];
 		dagnode_t  *n = 0, *children[3] = {0, 0, 0};

From 199b3e82d9044394029f33ed6937b8677dc4b5be Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 1 Apr 2020 16:05:26 +0900
Subject: [PATCH 1097/1519] [qfcc] Add killer node to replacement node's edges

When an operand refers to a killed node, it needs to be evaluated AFTER
the killing node is evaluated. This fixes the double-alias bug.
---
 tools/qfcc/include/dags.h |  2 +-
 tools/qfcc/source/dags.c  | 27 ++++++++++++++++++---------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/tools/qfcc/include/dags.h b/tools/qfcc/include/dags.h
index c83c029f6..534e58511 100644
--- a/tools/qfcc/include/dags.h
+++ b/tools/qfcc/include/dags.h
@@ -59,7 +59,7 @@ typedef struct dagnode_s {
 	int         topo;			///< topological sort order
 	struct set_s *parents;		///< empty if root node
 	int         cost;			///< cost of this node in temp vars
-	unsigned    killed:1;		///< node is unavailable for cse
+	struct dagnode_s *killed;	///< node is unavailable for cse (by node)
 	st_type_t   type;			///< type of node (st_none = leaf)
 	daglabel_t *label;			///< ident/const if leaf node, or operator
 	struct type_s *tl;
diff --git a/tools/qfcc/source/dags.c b/tools/qfcc/source/dags.c
index 83c30b8b7..a2d29c371 100644
--- a/tools/qfcc/source/dags.c
+++ b/tools/qfcc/source/dags.c
@@ -239,8 +239,6 @@ dag_node (operand_t *op)
 		if (op->o.label->daglabel)
 			node = op->o.label->daglabel->dagnode;
 	}
-	if (node && node->killed)
-		node = 0;
 	return node;
 }
 
@@ -266,8 +264,19 @@ dag_make_children (dag_t *dag, statement_t *s,
 
 	flow_analyze_statement (s, 0, 0, 0, operands);
 	for (i = 0; i < 3; i++) {
-		if (!(children[i] = dag_node (operands[i + 1])))
-			children[i] = leaf_node (dag, operands[i + 1], s->expr);
+		dagnode_t  *node = dag_node (operands[i + 1]);
+		dagnode_t  *killer = 0;
+		if (node && node->killed) {
+			killer = node->killed;
+			node = 0;
+		}
+		if (!node) {
+			node = leaf_node (dag, operands[i + 1], s->expr);
+		}
+		if (killer) {
+			set_add (node->edges, killer->number);
+		}
+		children[i] = node;
 	}
 }
 
@@ -473,7 +482,7 @@ static int
 dag_tempop_kill_aliases_visit (tempop_t *tempop, void *_l)
 {
 	daglabel_t *l = (daglabel_t *) _l;
-	dagnode_t  *node = l->dagnode;;
+	dagnode_t  *node = l->dagnode;
 	daglabel_t *label;
 
 	if (tempop == &l->op->o.tempop)
@@ -482,7 +491,7 @@ dag_tempop_kill_aliases_visit (tempop_t *tempop, void *_l)
 	if (label && label->dagnode) {
 		set_add (node->edges, label->dagnode->number);
 		set_remove (node->edges, node->number);
-		label->dagnode->killed = 1;
+		label->dagnode->killed = node;
 	}
 	return 0;
 }
@@ -500,7 +509,7 @@ dag_def_kill_aliases_visit (def_t *def, void *_l)
 	if (label && label->dagnode) {
 		set_add (node->edges, label->dagnode->number);
 		set_remove (node->edges, node->number);
-		label->dagnode->killed = 1;
+		label->dagnode->killed = node;
 	}
 	return 0;
 }
@@ -584,7 +593,7 @@ dagnode_attach_label (dagnode_t *n, daglabel_t *l)
 		// if the node is a leaf, then kill its value so no attempt is made
 		// to reuse it.
 		if (l->dagnode->type == st_none) {
-			l->dagnode->killed = 1;
+			l->dagnode->killed = n;
 		}
 		dagnode_t  *node = l->dagnode;
 		set_union (n->edges, node->parents);
@@ -707,7 +716,7 @@ dag_kill_nodes (dag_t *dag, dagnode_t *n)
 			// operations.
 			continue;
 		}
-		node->killed = 1;
+		node->killed = n;
 	}
 	n->killed = 0;
 }

From 17bb408b57259f439f5d922ed1d99cab998c968c Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 1 Apr 2020 16:06:45 +0900
Subject: [PATCH 1098/1519] [qfcc] Clean up stray dags edges

Killed nodes can leave stray (dangling) edges that cause some confusion
in the dot graphs and may cause problems later on down the track, so
ensure there are no dangling edges.
---
 tools/qfcc/source/dags.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/tools/qfcc/source/dags.c b/tools/qfcc/source/dags.c
index a2d29c371..680abca84 100644
--- a/tools/qfcc/source/dags.c
+++ b/tools/qfcc/source/dags.c
@@ -1163,6 +1163,19 @@ dag_remove_dead_nodes (dag_t *dag)
 			}
 		}
 	} while (added_root);
+
+	// clean up any stray edges that point to removed nodes
+	for (int i = 0; i < dag->num_nodes; i++) {
+		node = dag->nodes[i];
+		for (child_i = set_first (node->edges); child_i;
+			 child_i = set_next (child_i)) {
+			child = dag->nodes[child_i->element];
+			if (!set_is_member (dag->roots, child->number)
+				&& set_is_empty (child->parents)) {
+				set_remove (node->edges, child->number);
+			}
+		}
+	}
 	dag_sort_nodes (dag);
 }
 

From 7f4d2215e2b13d1f6bcbae4327cadd25fd014829 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 1 Apr 2020 18:32:30 +0900
Subject: [PATCH 1099/1519] [gamecode] Accept EOS at end of conversion
 specifier

---
 libs/gamecode/pr_strings.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/libs/gamecode/pr_strings.c b/libs/gamecode/pr_strings.c
index 31c387575..195dd5980 100644
--- a/libs/gamecode/pr_strings.c
+++ b/libs/gamecode/pr_strings.c
@@ -1073,7 +1073,11 @@ fmt_state_conversion (fmt_state_t *state)
 			fmt_append_item (state);
 			break;
 	}
-	state->state = fmt_state_format;
+	if (*state->c) {
+		state->state = fmt_state_format;
+	} else {
+		state->state = 0;	// finished
+	}
 }
 
 static void

From a36f72f7b43c7b9074566ce303a2a3175aa9f1ca Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 1 Apr 2020 19:45:33 +0900
Subject: [PATCH 1100/1519] [gamecode] Support variable field width and
 precision

---
 libs/gamecode/pr_strings.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/libs/gamecode/pr_strings.c b/libs/gamecode/pr_strings.c
index 195dd5980..d9d3f69df 100644
--- a/libs/gamecode/pr_strings.c
+++ b/libs/gamecode/pr_strings.c
@@ -887,7 +887,8 @@ fmt_state_flags (fmt_state_t *state)
 static void
 fmt_state_var_field_width (fmt_state_t *state)
 {
-	// XXX record width
+	(*state->fi)->minFieldWidth = P_INT (pr, state->fmt_count);
+	state->fmt_count++;
 	if (*++state->c == '.') {
 		state->state = fmt_state_precision;
 	} else {
@@ -926,7 +927,9 @@ fmt_state_precision (fmt_state_t *state)
 static void
 fmt_state_var_precision (fmt_state_t *state)
 {
-	// XXX record precision
+	state->c++;	// skip over *
+	(*state->fi)->precision = P_INT (pr, state->fmt_count);
+	state->fmt_count++;
 	state->state = fmt_state_modifiers;
 }
 

From 535a2363bb464b92cc41c232380a5e91feeb4096 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 1 Apr 2020 19:48:05 +0900
Subject: [PATCH 1101/1519] [ruamoko] Create a va_copy for progs

In testing variable fw/precision in PR_Sprintf, I got a nasty reminder
of the limitations of the current progs ABI: passing @args to another QC
function does not work because the args list gets trampled but the
called function's locals. Thus, the need for a va_copy. It's not quite
the same as C's as it returns the destination args instead of copying
like memcpy, but it does copy the list from the source args to a
temporary buffer that is freed when the calling function returns.
---
 include/rua_internal.h     |  2 +
 libs/ruamoko/Makefile.am   |  2 +-
 libs/ruamoko/rua_init.c    |  1 +
 libs/ruamoko/rua_runtime.c | 76 ++++++++++++++++++++++++++++++++++++++
 ruamoko/include/runtime.h  |  4 ++
 ruamoko/lib/Makefile.am    |  2 +-
 ruamoko/lib/va_list.r      |  3 ++
 ruamoko/qwaq/ui/view.r     |  2 +-
 8 files changed, 89 insertions(+), 3 deletions(-)
 create mode 100644 libs/ruamoko/rua_runtime.c
 create mode 100644 ruamoko/lib/va_list.r

diff --git a/include/rua_internal.h b/include/rua_internal.h
index 158d6e477..7bde98a77 100644
--- a/include/rua_internal.h
+++ b/include/rua_internal.h
@@ -49,6 +49,8 @@ void RUA_Obj_Init (struct progs_s *pr, int secure);
 
 void RUA_Plist_Init (struct progs_s *pr, int secure);
 
+void RUA_Runtime_Init (struct progs_s *pr, int secure);
+
 void RUA_Script_Init (progs_t *pr, int secure);
 
 void RUA_Set_Init (progs_t *pr, int secure);
diff --git a/libs/ruamoko/Makefile.am b/libs/ruamoko/Makefile.am
index 15d4c4360..2d4777c14 100644
--- a/libs/ruamoko/Makefile.am
+++ b/libs/ruamoko/Makefile.am
@@ -18,4 +18,4 @@ libQFruamoko_la_SOURCES= \
 		pr_cmds.c \
 		rua_cbuf.c rua_cmd.c rua_cvar.c rua_hash.c rua_init.c \
 		rua_math.c rua_msgbuf.c rua_obj.c rua_plist.c rua_qfile.c rua_qfs.c \
-		rua_script.c rua_set.c rua_string.c
+		rua_runtime.c rua_script.c rua_set.c rua_string.c
diff --git a/libs/ruamoko/rua_init.c b/libs/ruamoko/rua_init.c
index 7741405a5..6e4333998 100644
--- a/libs/ruamoko/rua_init.c
+++ b/libs/ruamoko/rua_init.c
@@ -45,6 +45,7 @@ static void (*init_funcs[])(progs_t *, int) = {
 	RUA_Plist_Init,
 	RUA_QFile_Init,
 	RUA_QFS_Init,
+	RUA_Runtime_Init,
 	RUA_Script_Init,
 	RUA_Set_Init,
 	RUA_String_Init,
diff --git a/libs/ruamoko/rua_runtime.c b/libs/ruamoko/rua_runtime.c
new file mode 100644
index 000000000..697fc720b
--- /dev/null
+++ b/libs/ruamoko/rua_runtime.c
@@ -0,0 +1,76 @@
+/*
+	bi_runtime.c
+
+	QuakeC runtime api
+
+	Copyright (C) 2020 Bill Currie
+
+	Author: Bill Currie <bill@taniwha.org>
+	Date: 2020/4/1
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#include <stdlib.h>
+
+#include "qfalloca.h"
+
+#if defined(_WIN32) && defined(HAVE_MALLOC_H)
+#include <malloc.h>
+#endif
+
+#include "QF/progs.h"
+
+#include "rua_internal.h"
+
+static void
+bi_va_copy (progs_t *pr)
+{
+	__auto_type src_args = (pr_va_list_t *) &P_POINTER (pr, 0);
+	__auto_type src_list = &G_STRUCT (pr, pr_type_t, src_args->list);
+	size_t      parm_size = pr->pr_param_size * sizeof(pr_type_t);
+	size_t      size = src_args->count * parm_size;
+	string_t    dst_list_block = PR_AllocTempBlock (pr, size);
+	__auto_type dst_list = (pr_type_t *) PR_GetString (pr, dst_list_block);
+
+	memcpy (dst_list, src_list, size);
+	R_PACKED (pr, pr_va_list_t).count = src_args->count;
+	R_PACKED (pr, pr_va_list_t).list = PR_SetPointer (pr, dst_list);
+}
+
+static builtin_t builtins[] = {
+	{"va_copy",		bi_va_copy,		-1},
+	{0}
+};
+
+void
+RUA_Runtime_Init (progs_t *pr, int secure)
+{
+	PR_RegisterBuiltins (pr, builtins);
+}
diff --git a/ruamoko/include/runtime.h b/ruamoko/include/runtime.h
index 80e0aff7e..276d270fb 100644
--- a/ruamoko/include/runtime.h
+++ b/ruamoko/include/runtime.h
@@ -100,6 +100,10 @@ typedef enum {
 
 @extern void *PR_FindGlobal (string name);	//FIXME where?
 
+// copies the list in src to a temporary buffer that will be freed when the
+// calling function returns, and places the pointer to the buffer into the
+// returned va_list. The count is copies as-is.
+@extern @va_list va_copy(@va_list src);
 #endif	//__ruamoko_runtime_h_
 /**
 	\}
diff --git a/ruamoko/lib/Makefile.am b/ruamoko/lib/Makefile.am
index 2f67f04fd..cf0e50154 100644
--- a/ruamoko/lib/Makefile.am
+++ b/ruamoko/lib/Makefile.am
@@ -36,7 +36,7 @@ r_depfiles_remade=
 
 libr_a_SOURCES=\
 	cbuf.r cmd.r cvar.r hash.r msgbuf.r plist.r qfile.r qfs.r script.r \
-	sound.r string.r math.r types.r \
+	sound.r string.r math.r types.r va_list.r \
 	obj_forward.r \
 	Object.r Protocol.r \
 	AutoreleasePool.r Array.r Array+Private.r Entity.r PropertyList.r Set.r
diff --git a/ruamoko/lib/va_list.r b/ruamoko/lib/va_list.r
new file mode 100644
index 000000000..399e05933
--- /dev/null
+++ b/ruamoko/lib/va_list.r
@@ -0,0 +1,3 @@
+#include <runtime.h>
+
+@va_list va_copy(@va_list src) = #0;
diff --git a/ruamoko/qwaq/ui/view.r b/ruamoko/qwaq/ui/view.r
index 31005878f..579f804c1 100644
--- a/ruamoko/qwaq/ui/view.r
+++ b/ruamoko/qwaq/ui/view.r
@@ -239,7 +239,7 @@ updateScreenCursor (View *view)
 {
 	pos.x += xpos;
 	pos.y += ypos;
-	[textContext mvvprintf: pos, fmt, @args];
+	[textContext mvvprintf: pos, fmt, va_copy (@args)];
 }
 
 - (void) mvvprintf: (Point) pos, string fmt, @va_list args

From 0e7c7640f4ebeaa9deae8841ecc327df1f0b4dfa Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 1 Apr 2020 19:57:24 +0900
Subject: [PATCH 1102/1519] [qwaq] Right-justify def value display

Now that *printf("%*.*s") works :)
---
 ruamoko/qwaq/debugger/basicview.r   | 2 +-
 ruamoko/qwaq/debugger/doubleview.r  | 2 +-
 ruamoko/qwaq/debugger/entityview.r  | 2 +-
 ruamoko/qwaq/debugger/fieldview.r   | 2 +-
 ruamoko/qwaq/debugger/floatview.r   | 2 +-
 ruamoko/qwaq/debugger/funcview.r    | 2 +-
 ruamoko/qwaq/debugger/intview.r     | 2 +-
 ruamoko/qwaq/debugger/pointerview.r | 2 +-
 ruamoko/qwaq/debugger/quatview.r    | 2 +-
 ruamoko/qwaq/debugger/stringview.r  | 2 +-
 ruamoko/qwaq/debugger/uintview.r    | 2 +-
 ruamoko/qwaq/debugger/vectorview.r  | 2 +-
 ruamoko/qwaq/debugger/voidview.r    | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/ruamoko/qwaq/debugger/basicview.r b/ruamoko/qwaq/debugger/basicview.r
index 4404f43e6..5701a27d3 100644
--- a/ruamoko/qwaq/debugger/basicview.r
+++ b/ruamoko/qwaq/debugger/basicview.r
@@ -42,7 +42,7 @@ static string type_views[] = {
 	if (class) {
 		return [class withType:type at:offset in:data];
 	}
-	return [NameView withName:"Invalid Meta"];
+	return [NameView withName:"Invalid Type"];
 }
 
 @end
diff --git a/ruamoko/qwaq/debugger/doubleview.r b/ruamoko/qwaq/debugger/doubleview.r
index 2a76033b5..977adbe28 100644
--- a/ruamoko/qwaq/debugger/doubleview.r
+++ b/ruamoko/qwaq/debugger/doubleview.r
@@ -21,7 +21,7 @@
 {
 	[super draw];
 	string val = sprintf ("%.17g", data[0]);
-	[self mvaddstr:{0, 0}, str_mid (val, 0, xlen)];
+	[self mvprintf:{0, 0}, "%*.*s", xlen, xlen, val];
 	return self;
 }
 
diff --git a/ruamoko/qwaq/debugger/entityview.r b/ruamoko/qwaq/debugger/entityview.r
index 6990886e6..52d152dae 100644
--- a/ruamoko/qwaq/debugger/entityview.r
+++ b/ruamoko/qwaq/debugger/entityview.r
@@ -21,7 +21,7 @@
 {
 	[super draw];
 	string val = sprintf ("FIXME [%x]", data[0]);
-	[self mvaddstr:{0, 0}, str_mid (val, 0, xlen)];
+	[self mvprintf:{0, 0}, "%*.*s", xlen, xlen, val];
 	return self;
 }
 
diff --git a/ruamoko/qwaq/debugger/fieldview.r b/ruamoko/qwaq/debugger/fieldview.r
index ea00ff14f..657e75cc9 100644
--- a/ruamoko/qwaq/debugger/fieldview.r
+++ b/ruamoko/qwaq/debugger/fieldview.r
@@ -21,7 +21,7 @@
 {
 	[super draw];
 	string val = sprintf ("FIXME [%x]", data[0]);
-	[self mvaddstr:{0, 0}, str_mid (val, 0, xlen)];
+	[self mvprintf:{0, 0}, "%*.*s", xlen, xlen, val];
 	return self;
 }
 
diff --git a/ruamoko/qwaq/debugger/floatview.r b/ruamoko/qwaq/debugger/floatview.r
index 1e90f8320..8abc6a1b4 100644
--- a/ruamoko/qwaq/debugger/floatview.r
+++ b/ruamoko/qwaq/debugger/floatview.r
@@ -21,7 +21,7 @@
 {
 	[super draw];
 	string val = sprintf ("%.9", data[0]);
-	[self mvaddstr:{0, 0}, str_mid (val, 0, xlen)];
+	[self mvprintf:{0, 0}, "%*.*s", xlen, xlen, val];
 	return self;
 }
 
diff --git a/ruamoko/qwaq/debugger/funcview.r b/ruamoko/qwaq/debugger/funcview.r
index b9f540807..540e75013 100644
--- a/ruamoko/qwaq/debugger/funcview.r
+++ b/ruamoko/qwaq/debugger/funcview.r
@@ -21,7 +21,7 @@
 {
 	[super draw];
 	string val = sprintf ("FIXME [%x]", data[0]);
-	[self mvaddstr:{0, 0}, str_mid (val, 0, xlen)];
+	[self mvprintf:{0, 0}, "%*.*s", xlen, xlen, val];
 	return self;
 }
 
diff --git a/ruamoko/qwaq/debugger/intview.r b/ruamoko/qwaq/debugger/intview.r
index aeedd0640..613f4e787 100644
--- a/ruamoko/qwaq/debugger/intview.r
+++ b/ruamoko/qwaq/debugger/intview.r
@@ -21,7 +21,7 @@
 {
 	[super draw];
 	string val = sprintf ("%d", data[0]);
-	[self mvaddstr:{0, 0}, str_mid (val, 0, xlen)];
+	[self mvprintf:{0, 0}, "%*.*s", xlen, xlen, val];
 	return self;
 }
 
diff --git a/ruamoko/qwaq/debugger/pointerview.r b/ruamoko/qwaq/debugger/pointerview.r
index 680b8accc..1159bf6ab 100644
--- a/ruamoko/qwaq/debugger/pointerview.r
+++ b/ruamoko/qwaq/debugger/pointerview.r
@@ -21,7 +21,7 @@
 {
 	[super draw];
 	string val = sprintf ("FIXME [%x]", data[0]);
-	[self mvaddstr:{0, 0}, str_mid (val, 0, xlen)];
+	[self mvprintf:{0, 0}, "%*.*s", xlen, xlen, val];
 	return self;
 }
 
diff --git a/ruamoko/qwaq/debugger/quatview.r b/ruamoko/qwaq/debugger/quatview.r
index 944a02e58..bd79e9ae9 100644
--- a/ruamoko/qwaq/debugger/quatview.r
+++ b/ruamoko/qwaq/debugger/quatview.r
@@ -21,7 +21,7 @@
 {
 	[super draw];
 	string val = sprintf ("%.9q", data[0]);
-	[self mvaddstr:{0, 0}, str_mid (val, 0, xlen)];
+	[self mvprintf:{0, 0}, "%*.*s", xlen, xlen, val];
 	return self;
 }
 
diff --git a/ruamoko/qwaq/debugger/stringview.r b/ruamoko/qwaq/debugger/stringview.r
index 445ccfdbf..00e0e583c 100644
--- a/ruamoko/qwaq/debugger/stringview.r
+++ b/ruamoko/qwaq/debugger/stringview.r
@@ -21,7 +21,7 @@
 {
 	[super draw];
 	string val = sprintf ("FIXME %s", qdb_get_string (target, data[0]));// quote string
-	[self mvaddstr:{0, 0}, str_mid (val, 0, xlen)];
+	[self mvprintf:{0, 0}, "%*.*s", xlen, xlen, val];
 	return self;
 }
 
diff --git a/ruamoko/qwaq/debugger/uintview.r b/ruamoko/qwaq/debugger/uintview.r
index d1efc4a17..0969567d3 100644
--- a/ruamoko/qwaq/debugger/uintview.r
+++ b/ruamoko/qwaq/debugger/uintview.r
@@ -21,7 +21,7 @@
 {
 	[super draw];
 	string val = sprintf ("%u", data[0]);
-	[self mvaddstr:{0, 0}, str_mid (val, 0, xlen)];
+	[self mvprintf:{0, 0}, "%*.*s", xlen, xlen, val];
 	return self;
 }
 
diff --git a/ruamoko/qwaq/debugger/vectorview.r b/ruamoko/qwaq/debugger/vectorview.r
index 0d29865d3..028dc889f 100644
--- a/ruamoko/qwaq/debugger/vectorview.r
+++ b/ruamoko/qwaq/debugger/vectorview.r
@@ -21,7 +21,7 @@
 {
 	[super draw];
 	string val = sprintf ("%.9v", data[0]);
-	[self mvaddstr:{0, 0}, str_mid (val, 0, xlen)];
+	[self mvprintf:{0, 0}, "%*.*s", xlen, xlen, val];
 	return self;
 }
 
diff --git a/ruamoko/qwaq/debugger/voidview.r b/ruamoko/qwaq/debugger/voidview.r
index 3683a08f3..e50f66873 100644
--- a/ruamoko/qwaq/debugger/voidview.r
+++ b/ruamoko/qwaq/debugger/voidview.r
@@ -22,7 +22,7 @@
 	[super draw];
 	string val = sprintf ("%08x %08x %08x %08x",
 						  data[0], data[1], data[2], data[3]);
-	[self mvaddstr:{0, 0}, str_mid (val, 0, xlen)];
+	[self mvprintf:{0, 0}, "%*.*s", xlen, xlen, val];
 	return self;
 }
 

From 41184bd97d884210f4c9ebee04eaa1b5e94bfac0 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 1 Apr 2020 20:50:42 +0900
Subject: [PATCH 1103/1519] [gamecode] Document the format state machine

---
 libs/gamecode/pr_strings.c | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/libs/gamecode/pr_strings.c b/libs/gamecode/pr_strings.c
index d9d3f69df..1b5051859 100644
--- a/libs/gamecode/pr_strings.c
+++ b/libs/gamecode/pr_strings.c
@@ -835,6 +835,37 @@ fmt_append_item (fmt_state_t *state)
 #undef P_DOUBLE
 #define P_DOUBLE(p,n) (*(double *) (state->args[n]))
 
+/**	State machine for PR_Sprintf
+ *
+ *	Parsing of the format string is implemented via the following state
+ *	machine. Note that in all states, end-of-string terminates the machine.
+ *	If the machine terminates in any state other than format or conversion,
+ *	an error is generated.
+ *	\dot
+ *	digraph PR_Sprintf_fmt_state_machine {
+ *		format          -> flags            [label="{%}"];
+ *		flags           -> flags            [label="{#+0 -}"];
+ *		flags           -> var_field_width  [label="{*}"];
+ *		flags           -> precision        [label="{.}"];
+ *		flags           -> field_width      [label="{[1-9]}"];
+ *		flags           -> modifiers        [label="other"];
+ *		var_field_width -> precision        [label="{.}"];
+ *		var_field_width -> modifiers        [label="other"];
+ *		field_width     -> field_width      [label="{[0-9]}"];
+ *		field_width     -> precision        [label="{.}"];
+ *		field_width     -> modifiers        [label="other"];
+ *		precision       -> var_precision    [label="{*}"];
+ *		precision       -> fixed_precision  [label="{[0-9]}"];
+ *		precision       -> modifiers        [label="other"];
+ *		var_precision   -> modifiers        [label="instant"];
+ *		fixed_precision -> fixed_precision  [label="{[0-9]}"];
+ *		fixed_precision -> modifiers        [label="other"];
+ *		modifiers       -> conversion       [label="instant/other"];
+ *		conversion      -> format           [label="other"];
+ *	}
+ *	\enddot
+ */
+///@{
 static void fmt_state_format (fmt_state_t *state);
 static void fmt_state_flags (fmt_state_t *state);
 static void fmt_state_var_field_width (fmt_state_t *state);
@@ -1105,6 +1136,7 @@ fmt_state_format (fmt_state_t *state)
 		state->state = 0;	// finished
 	}
 }
+///@}
 
 VISIBLE void
 PR_Sprintf (progs_t *pr, dstring_t *result, const char *name,

From a09eabeb4d772d9b8afd7f7134c1be37ca8ea150 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 1 Apr 2020 21:17:13 +0900
Subject: [PATCH 1104/1519] [qfcc] Fix some const attribute warnings

Try to anticipate gcc's warnings and it one-ups you :P
---
 tools/qfcc/include/class.h | 8 ++++----
 tools/qfcc/source/stub.c   | 5 +++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/tools/qfcc/include/class.h b/tools/qfcc/include/class.h
index 048ae8227..ec160e1d9 100644
--- a/tools/qfcc/include/class.h
+++ b/tools/qfcc/include/class.h
@@ -119,10 +119,10 @@ int is_id (const struct type_s *type) __attribute__((pure));
 int is_class (const struct type_s *type) __attribute__((pure));
 int is_Class (const struct type_s *type) __attribute__((const));
 int is_classptr (const struct type_s *type) __attribute__((pure));
-int is_SEL (const struct type_s *type) __attribute__((pure));
-int is_object (const struct type_s *type) __attribute__((pure));
-int is_method (const struct type_s *type) __attribute__((pure));
-int is_method_description (const struct type_s *type) __attribute__((pure));
+int is_SEL (const struct type_s *type) __attribute__((const));
+int is_object (const struct type_s *type) __attribute__((const));
+int is_method (const struct type_s *type) __attribute__((const));
+int is_method_description (const struct type_s *type) __attribute__((const));
 int obj_types_assignable (const struct type_s *dst, const struct type_s *src);
 
 class_t *extract_class (class_type_t *class_type) __attribute__((pure));
diff --git a/tools/qfcc/source/stub.c b/tools/qfcc/source/stub.c
index b7d73cd68..449e62436 100644
--- a/tools/qfcc/source/stub.c
+++ b/tools/qfcc/source/stub.c
@@ -53,5 +53,6 @@ int compare_protocols (protocollist_t *protos1, protocollist_t *protos2){return
 void dump_dot (const char *stage, void *data,
 		          void (*dump_func) (void *data, const char *fname)){}
 void dump_dot_type (void *_t, const char *filename){}
-const char *strip_path(const char *p) { return p;}
-const char *file_basename(const char *p, int keepdot) { return p;}
+char *fubar;
+const char *strip_path(const char *p) { return fubar;}
+const char *file_basename(const char *p, int keepdot) { return fubar;}

From 6b9d4a747d844d3522b2511f61da754b3a06f0d6 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 1 Apr 2020 21:28:25 +0900
Subject: [PATCH 1105/1519] [ruamoko] Add a builtin to quote strings

All unprintable chars are converted to either standard escape sequences
or \xHH.
---
 libs/ruamoko/rua_string.c | 40 +++++++++++++++++++++++++++++++++++++++
 ruamoko/include/string.h  |  1 +
 ruamoko/lib/string.r      |  1 +
 3 files changed, 42 insertions(+)

diff --git a/libs/ruamoko/rua_string.c b/libs/ruamoko/rua_string.c
index a8240a85c..6de9c5c01 100644
--- a/libs/ruamoko/rua_string.c
+++ b/libs/ruamoko/rua_string.c
@@ -208,6 +208,45 @@ bi_str_char (progs_t *pr)
 	R_INT (pr) = str[ind];
 }
 
+static void
+bi_str_quote (progs_t *pr)
+{
+	const char *str = P_GSTRING (pr, 0);
+	// can have up to 4 chars per char (a -> \x61)
+	char       *quote = alloca (strlen (str) * 4 + 1);
+	char       *q = quote;
+	char        c;
+	int         h;
+
+	while ((c = *str++)) {
+		if (c >= ' ' && c < 127 && c != '\"') {
+			*q++ = c;
+		} else {
+			*q++ = '\\';
+			switch (c) {
+				case '\a': c = 'a'; break;
+				case '\b': c = 'b'; break;
+				case '\f': c = 'f'; break;
+				case '\n': c = 'n'; break;
+				case '\r': c = 'r'; break;
+				case '\t': c = 't'; break;
+				case '\"': c = '\"'; break;
+				default:
+					*q++ = 'x';
+					h = (c & 0xf0) >> 4;
+					*q++ = h > 9 ? h + 'a' - 10 : h + '0';
+					h = (c & 0x0f);
+					c = h > 9 ? h + 'a' - 10 : h + '0';
+					break;
+			}
+			*q++ = c;
+		}
+	}
+	*q++ = 0;
+
+	RETURN_STRING (pr, quote);
+}
+
 static builtin_t builtins[] = {
 	{"strlen",		bi_strlen,		-1},
 	{"sprintf",		bi_sprintf,		-1},
@@ -224,6 +263,7 @@ static builtin_t builtins[] = {
 	{"str_mid|*ii",	bi_str_mid,		-1},
 	{"str_str",		bi_str_str,		-1},
 	{"str_char",	bi_str_char,	-1},
+	{"str_quote",	bi_str_quote,	-1},
 	{0}
 };
 
diff --git a/ruamoko/include/string.h b/ruamoko/include/string.h
index b374b8335..008e7d883 100644
--- a/ruamoko/include/string.h
+++ b/ruamoko/include/string.h
@@ -16,5 +16,6 @@
 @extern @overload string str_mid (string str, int start, int len);
 @extern string str_str (string haystack, string needle);
 @extern int str_char (string str, int ind);
+string str_quote (string str);
 
 #endif//__ruamoko_string_h
diff --git a/ruamoko/lib/string.r b/ruamoko/lib/string.r
index 89ecc6aef..48a9a7bf7 100644
--- a/ruamoko/lib/string.r
+++ b/ruamoko/lib/string.r
@@ -15,3 +15,4 @@ string (string str, int start) str_mid = #0;
 string (string str, int start, int len) str_mid = #0;
 string (string haystack, string needle) str_str = #0;
 int str_char (string str, int ind) = #0;
+string str_quote (string str) = #0;

From 154da7653dbaab1abb151a5445060d613845d5d8 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 1 Apr 2020 21:29:42 +0900
Subject: [PATCH 1106/1519] [qwaq] Quote the string value before display

---
 ruamoko/qwaq/debugger/stringview.r | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ruamoko/qwaq/debugger/stringview.r b/ruamoko/qwaq/debugger/stringview.r
index 00e0e583c..0cf53752d 100644
--- a/ruamoko/qwaq/debugger/stringview.r
+++ b/ruamoko/qwaq/debugger/stringview.r
@@ -20,7 +20,8 @@
 -draw
 {
 	[super draw];
-	string val = sprintf ("FIXME %s", qdb_get_string (target, data[0]));// quote string
+	string val = sprintf ("\"%s\"",
+						  str_quote (qdb_get_string (target, data[0])));
 	[self mvprintf:{0, 0}, "%*.*s", xlen, xlen, val];
 	return self;
 }

From d9668a1185159abdc15fc5fd58ef910b8fe6f9e5 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 2 Apr 2020 00:11:34 +0900
Subject: [PATCH 1107/1519] [qwaq] Silence some more debug

I was wondering where those sprintfs were going
---
 ruamoko/qwaq/ui/draw.r | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruamoko/qwaq/ui/draw.r b/ruamoko/qwaq/ui/draw.r
index 37be4e6c0..ebb75fcbd 100644
--- a/ruamoko/qwaq/ui/draw.r
+++ b/ruamoko/qwaq/ui/draw.r
@@ -53,8 +53,8 @@
 	Rect r = { {}, size };
 	Rect t = { pos, rect.extent };
 
-	wprintf (stdscr, "src: %p\n", srcBuffer);
-	wprintf (stdscr, "srcSize: %d %d\n", srcSize.width, srcSize.height);
+	//wprintf (stdscr, "src: %p\n", srcBuffer);
+	//wprintf (stdscr, "srcSize: %d %d\n", srcSize.width, srcSize.height);
 
 	t = clipRect (r, t);
 	if (t.extent.width < 0 || t.extent.height < 0) {

From 1d5058d2677f74a331c1ef8808932a4494929ea3 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 2 Apr 2020 00:11:47 +0900
Subject: [PATCH 1108/1519] [qwaq] Move progs create and load into the threads

While this does answer the question of how I'll go about restarting the
target progs (when I get to that point), it was required just to start
full-on ruamoko progs because .ctor was getting run in the main thread
and blocking due to trace.
---
 ruamoko/qwaq/builtins/main.c | 20 +++++++++++++-------
 ruamoko/qwaq/qwaq.h          |  4 ++++
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/ruamoko/qwaq/builtins/main.c b/ruamoko/qwaq/builtins/main.c
index c78a9f9e5..9077054b2 100644
--- a/ruamoko/qwaq/builtins/main.c
+++ b/ruamoko/qwaq/builtins/main.c
@@ -140,19 +140,22 @@ init_qf (void)
 	Cvar_Get ("pr_debug", "2", 0, 0, 0);
 	Cvar_Get ("pr_boundscheck", "0", 0, 0, 0);
 
+	// Normally, this is done by PR_Init, but PR_Init is not called in the main
+	// thread. However, PR_Opcode_Init() is idempotent.
+	PR_Opcode_Init ();
 }
 
-typedef void (*progsinit_f) (progs_t *pr);
-
 static progs_t *
-create_progs (progsinit_f *funcs)
+create_progs (qwaq_thread_t *thread)
 {
 	progs_t    *pr = calloc (1, sizeof (*pr));
+	progsinit_f *funcs = thread->progsinit;
 
 	pr->load_file = load_file;
 	pr->allocate_progs_mem = allocate_progs_mem;
 	pr->free_progs_mem = free_progs_mem;
 	pr->no_exec_limit = 1;
+	pr->hashlink_freelist = &thread->hashlink_freelist;
 
 	PR_Init_Cvars ();
 	PR_Init (pr);
@@ -185,7 +188,7 @@ load_progs (progs_t *pr, const char *name)
 }
 
 static void
-spawn_progs (qwaq_thread_t *thread, progsinit_f *funcs)
+spawn_progs (qwaq_thread_t *thread)
 {
 	dfunction_t *dfunc;
 	const char *name = 0;
@@ -194,7 +197,7 @@ spawn_progs (qwaq_thread_t *thread, progsinit_f *funcs)
 	progs_t    *pr;
 
 	thread->main_func = 0;
-	pr = thread->pr = create_progs (funcs);
+	pr = thread->pr = create_progs (thread);
 	if (thread->args.size) {
 		name = thread->args.a[0];
 	}
@@ -230,6 +233,9 @@ run_progs (void *data)
 {
 	__auto_type thread = (qwaq_thread_t *) data;
 
+	spawn_progs (thread);
+	Sys_Printf ("starthing thread for %s\n", thread->args.a[0]);
+
 	PR_ExecuteProgram (thread->pr, thread->main_func);
 	PR_PopFrame (thread->pr);
 	if (thread->pr->debug_handler) {
@@ -452,13 +458,13 @@ main (int argc, char **argv)
 			main_ind = i;
 			app_funcs = main_app;
 		}
-		spawn_progs (thread, app_funcs);
+		thread->progsinit = app_funcs;
 	}
 	if (main_ind >= 0) {
 		// threads might start new threads before the end is reached
 		size_t      count = thread_data.size;
 		for (size_t i = 0; i < count; i++) {
-			if (thread_data.a[i]->pr && thread_data.a[i]->main_func) {
+			if (thread_data.a[i]->progsinit) {
 				start_progs_thread (thread_data.a[i]);
 			}
 		}
diff --git a/ruamoko/qwaq/qwaq.h b/ruamoko/qwaq/qwaq.h
index da9ec6e98..43efc4700 100644
--- a/ruamoko/qwaq/qwaq.h
+++ b/ruamoko/qwaq/qwaq.h
@@ -5,12 +5,16 @@
 #include "QF/progs.h"
 #include "QF/sys.h"
 
+typedef void (*progsinit_f) (progs_t *pr);
+
 typedef struct qwaq_thread_s {
 	pthread_t   thread_id;
 	int         return_code;
 	struct DARRAY_TYPE (const char *) args;
 	sys_printf_t sys_printf;
+	progsinit_f*progsinit;
 	progs_t    *pr;
+	struct hashlink_s *hashlink_freelist;
 	func_t      main_func;
 	void       *data;
 } qwaq_thread_t;

From 118fba8df5445007c2d7a2d55588d4901ff36ee6 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 2 Apr 2020 00:51:22 +0900
Subject: [PATCH 1109/1519] [qwaq] Cope with functions that don't have locals

In this case, .ctor functions.
---
 ruamoko/qwaq/builtins/debug.c      | 2 +-
 ruamoko/qwaq/debugger/localsdata.r | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruamoko/qwaq/builtins/debug.c b/ruamoko/qwaq/builtins/debug.c
index 218a953cb..2b2bd2415 100644
--- a/ruamoko/qwaq/builtins/debug.c
+++ b/ruamoko/qwaq/builtins/debug.c
@@ -482,7 +482,7 @@ qdb_get_local_defs (progs_t *pr)
 	pr_auxfunction_t *auxfunc = PR_Debug_MappedAuxFunction (tpr, fnum);
 
 	R_INT (pr) = 0;
-	if (auxfunc) {
+	if (auxfunc && auxfunc->num_locals) {
 		pr_def_t   *defs = PR_Debug_LocalDefs (tpr, auxfunc);
 		__auto_type qdefs
 			= (qdb_def_t *) PR_Zone_Malloc (pr,
diff --git a/ruamoko/qwaq/debugger/localsdata.r b/ruamoko/qwaq/debugger/localsdata.r
index 7e6472191..45d15fc8e 100644
--- a/ruamoko/qwaq/debugger/localsdata.r
+++ b/ruamoko/qwaq/debugger/localsdata.r
@@ -58,7 +58,7 @@
 	if (aux_func) {
 		defs = qdb_get_local_defs (target, fnum);
 	}
-	if (func) {
+	if (func && func.local_size) {
 		data = obj_malloc (func.local_size);
 	}
 	return self;

From c920c746f3f97097ea3bb3f7c11b029431114aff Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 2 Apr 2020 10:39:12 +0900
Subject: [PATCH 1110/1519] [gamecode] Move debug even enum to pr_debug.h

---
 include/QF/pr_debug.h | 14 ++++++++++++++
 include/QF/progs.h    | 12 ------------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/include/QF/pr_debug.h b/include/QF/pr_debug.h
index be398f056..9811afe67 100644
--- a/include/QF/pr_debug.h
+++ b/include/QF/pr_debug.h
@@ -31,6 +31,7 @@
 #ifndef __QF_pr_debug_h
 #define __QF_pr_debug_h
 
+#ifndef __QFCC__
 #include "QF/pr_comp.h"
 
 typedef struct pr_auxfunction_s {
@@ -63,5 +64,18 @@ typedef struct pr_debug_header_s {
 	pr_uint_t   locals;
 	pr_uint_t   num_locals;
 } pr_debug_header_t;
+#endif
+
+typedef enum prdebug_e {
+	prd_none,
+	prd_trace,
+	prd_breakpoint,
+	prd_watchpoint,
+	prd_subenter,
+	prd_subexit,		// current invocation of PR_ExecuteProgram finished
+	prd_terminate,		// not sent by VM
+	prd_runerror,
+	prd_error,			// lower level error thann prd_runerror
+} prdebug_t;
 
 #endif//__QF_pr_debug_h
diff --git a/include/QF/progs.h b/include/QF/progs.h
index 95d5db44c..d9f738846 100644
--- a/include/QF/progs.h
+++ b/include/QF/progs.h
@@ -1725,18 +1725,6 @@ typedef struct {
 	strref_t   *tstr;				///< Linked list of temporary strings.
 } prstack_t;
 
-typedef enum {
-	prd_none,
-	prd_trace,
-	prd_breakpoint,
-	prd_watchpoint,
-	prd_subenter,
-	prd_subexit,		// current invocation of PR_ExecuteProgram finished
-	prd_terminate,		// not sent by VM
-	prd_runerror,
-	prd_error,			// lower level error thann prd_runerror
-} prdebug_t;
-
 struct progs_s {
 	int       (*parse_field) (progs_t *pr, const char *key, const char *value);
 

From 6d8bc395f428e98080cda1bc7a4ed255699b4248 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 2 Apr 2020 10:44:16 +0900
Subject: [PATCH 1111/1519] [qwaq] Make debug event data available

---
 ruamoko/qwaq/builtins/debug.c | 34 ++++++++++++++++++++++++++++++++++
 ruamoko/qwaq/builtins/main.c  |  7 ++++---
 ruamoko/qwaq/debugger/debug.h | 12 ++++++++++++
 ruamoko/qwaq/debugger/debug.r |  1 +
 4 files changed, 51 insertions(+), 3 deletions(-)

diff --git a/ruamoko/qwaq/builtins/debug.c b/ruamoko/qwaq/builtins/debug.c
index 2b2bd2415..287b5bcbe 100644
--- a/ruamoko/qwaq/builtins/debug.c
+++ b/ruamoko/qwaq/builtins/debug.c
@@ -56,6 +56,7 @@ typedef struct qwaq_target_s {
 	struct qwaq_debug_s *debugger;
 	int         handle;
 	prdebug_t   event;
+	void       *param;
 	rwcond_t    run_cond;
 } qwaq_target_t;
 
@@ -117,6 +118,7 @@ qwaq_debug_handler (prdebug_t debug_event, void *param, void *data)
 	int         ret;
 
 	target->event = debug_event;
+	target->param = param;
 	event.what = qe_debug_event;
 	event.message.pointer_val = target->handle;
 
@@ -294,6 +296,37 @@ qdb_get_state (progs_t *pr)
 	R_PACKED (pr, qdb_state_t) = state;
 }
 
+static void
+qdb_get_event (progs_t *pr)
+{
+	__auto_type debug = PR_Resources_Find (pr, "qwaq-debug");
+	pointer_t   handle = P_INT (pr, 0);
+	qwaq_target_t *target = get_target (debug, __FUNCTION__, handle);
+	__auto_type event = &G_STRUCT (pr, qdb_event_t, P_INT (pr, 1));
+
+	memset (event, 0, sizeof (*event));
+	event->what = target->event;
+	switch (event->what) {
+		case prd_subenter:
+			event->func = *(func_t *) target->param;
+			break;
+		case prd_runerror:
+		case prd_error:
+			event->message = PR_SetReturnString (pr, *(char **) target->param);
+			break;
+		case prd_terminate:
+			event->exit_code = *(int *) target->param;
+			break;
+		case prd_trace:
+		case prd_breakpoint:
+		case prd_watchpoint:
+		case prd_subexit:
+		case prd_none:
+			break;
+	}
+	R_INT (pr) = target->event != prd_none;
+}
+
 static void
 qdb_get_data (progs_t *pr)
 {
@@ -505,6 +538,7 @@ static builtin_t builtins[] = {
 	{"qdb_clear_watchpoint",	qdb_clear_watchpoint,	-1},
 	{"qdb_continue",			qdb_continue,			-1},
 	{"qdb_get_state",			qdb_get_state,			-1},
+	{"qdb_get_event",			qdb_get_event,			-1},
 	{"qdb_get_data",			qdb_get_data,			-1},
 	{"qdb_get_string|{tag qdb_target_s=}i",	qdb_get_string,	-1},
 	{"qdb_get_string|{tag qdb_target_s=}*",	qdb_get_string,	-1},
diff --git a/ruamoko/qwaq/builtins/main.c b/ruamoko/qwaq/builtins/main.c
index 9077054b2..077b4674f 100644
--- a/ruamoko/qwaq/builtins/main.c
+++ b/ruamoko/qwaq/builtins/main.c
@@ -238,10 +238,11 @@ run_progs (void *data)
 
 	PR_ExecuteProgram (thread->pr, thread->main_func);
 	PR_PopFrame (thread->pr);
-	if (thread->pr->debug_handler) {
-		thread->pr->debug_handler (prd_terminate, 0, thread->pr->debug_data);
-	}
 	thread->return_code = R_INT (thread->pr);
+	if (thread->pr->debug_handler) {
+		thread->pr->debug_handler (prd_terminate, &thread->return_code,
+								   thread->pr->debug_data);
+	}
 	return thread;
 }
 
diff --git a/ruamoko/qwaq/debugger/debug.h b/ruamoko/qwaq/debugger/debug.h
index 161014b84..b7ead7c92 100644
--- a/ruamoko/qwaq/debugger/debug.h
+++ b/ruamoko/qwaq/debugger/debug.h
@@ -9,6 +9,8 @@ typedef enum {
 
 #ifdef __QFCC__
 
+#include <QF/pr_debug.h>
+
 //FIXME finish unsigned in qfcc
 #ifndef umax
 #define umax 0x7fffffff
@@ -18,6 +20,15 @@ typedef string string_t;
 
 #endif
 
+typedef struct qdb_event_s {
+	prdebug_t   what;
+	union {
+		string_t    message;
+		unsigned    func;
+		int         exit_code;
+	};
+} qdb_event_t;
+
 typedef struct qdb_state_s {
 	unsigned    staddr;
 	unsigned    func;
@@ -62,6 +73,7 @@ int qdb_set_watchpoint (qdb_target_t target, unsigned offset);
 int qdb_clear_watchpoint (qdb_target_t target);
 int qdb_continue (qdb_target_t target);
 qdb_state_t qdb_get_state (qdb_target_t target);
+int qdb_get_event (qdb_target_t target, qdb_event_t *event);
 int qdb_get_data (qdb_target_t target, unsigned src, unsigned len, void *dst);
 @overload string qdb_get_string (qdb_target_t target, unsigned str);
 // note: str is likely not valid in the host progs, it's just a convinience to
diff --git a/ruamoko/qwaq/debugger/debug.r b/ruamoko/qwaq/debugger/debug.r
index 7ad286cf7..7aa1b457c 100644
--- a/ruamoko/qwaq/debugger/debug.r
+++ b/ruamoko/qwaq/debugger/debug.r
@@ -10,6 +10,7 @@ int qdb_set_watchpoint (qdb_target_t target, unsigned offset) = #0;
 int qdb_clear_watchpoint (qdb_target_t target) = #0;
 int qdb_continue (qdb_target_t target) = #0;
 qdb_state_t qdb_get_state (qdb_target_t target) = #0;
+int qdb_get_event (qdb_target_t target, qdb_event_t *event) = #0;
 int qdb_get_data (qdb_target_t target, unsigned src, unsigned len,
 				  void *dst) = #0;
 string qdb_get_string (qdb_target_t target, unsigned str) = #0;

From 7e51f26b108f38858d02e5e41fff1aff53947a84 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 2 Apr 2020 13:06:31 +0900
Subject: [PATCH 1112/1519] [qwaq] Move all the def views into a subdirectory

More declutter.
---
 ruamoko/qwaq/Makefile.am                      | 30 +++++++++----------
 ruamoko/qwaq/debugger/localsdata.r            |  4 +--
 ruamoko/qwaq/debugger/{ => views}/basicview.h |  2 +-
 ruamoko/qwaq/debugger/{ => views}/basicview.r |  4 +--
 ruamoko/qwaq/debugger/{ => views}/defview.h   |  0
 ruamoko/qwaq/debugger/{ => views}/defview.r   |  4 +--
 .../qwaq/debugger/{ => views}/doubleview.h    |  2 +-
 .../qwaq/debugger/{ => views}/doubleview.r    |  2 +-
 .../qwaq/debugger/{ => views}/entityview.h    |  2 +-
 .../qwaq/debugger/{ => views}/entityview.r    |  2 +-
 ruamoko/qwaq/debugger/{ => views}/fieldview.h |  2 +-
 ruamoko/qwaq/debugger/{ => views}/fieldview.r |  2 +-
 ruamoko/qwaq/debugger/{ => views}/floatview.h |  2 +-
 ruamoko/qwaq/debugger/{ => views}/floatview.r |  2 +-
 ruamoko/qwaq/debugger/{ => views}/funcview.h  |  2 +-
 ruamoko/qwaq/debugger/{ => views}/funcview.r  |  2 +-
 ruamoko/qwaq/debugger/{ => views}/intview.h   |  2 +-
 ruamoko/qwaq/debugger/{ => views}/intview.r   |  2 +-
 ruamoko/qwaq/debugger/{ => views}/nameview.h  |  2 +-
 ruamoko/qwaq/debugger/{ => views}/nameview.r  |  2 +-
 .../qwaq/debugger/{ => views}/pointerview.h   |  2 +-
 .../qwaq/debugger/{ => views}/pointerview.r   |  2 +-
 ruamoko/qwaq/debugger/{ => views}/quatview.h  |  2 +-
 ruamoko/qwaq/debugger/{ => views}/quatview.r  |  2 +-
 .../qwaq/debugger/{ => views}/stringview.h    |  2 +-
 .../qwaq/debugger/{ => views}/stringview.r    |  2 +-
 ruamoko/qwaq/debugger/{ => views}/uintview.h  |  2 +-
 ruamoko/qwaq/debugger/{ => views}/uintview.r  |  2 +-
 .../qwaq/debugger/{ => views}/vectorview.h    |  2 +-
 .../qwaq/debugger/{ => views}/vectorview.r    |  2 +-
 ruamoko/qwaq/debugger/{ => views}/voidview.h  |  2 +-
 ruamoko/qwaq/debugger/{ => views}/voidview.r  |  2 +-
 32 files changed, 48 insertions(+), 48 deletions(-)
 rename ruamoko/qwaq/debugger/{ => views}/basicview.h (88%)
 rename ruamoko/qwaq/debugger/{ => views}/basicview.r (91%)
 rename ruamoko/qwaq/debugger/{ => views}/defview.h (100%)
 rename ruamoko/qwaq/debugger/{ => views}/defview.r (93%)
 rename ruamoko/qwaq/debugger/{ => views}/doubleview.h (87%)
 rename ruamoko/qwaq/debugger/{ => views}/doubleview.r (93%)
 rename ruamoko/qwaq/debugger/{ => views}/entityview.h (87%)
 rename ruamoko/qwaq/debugger/{ => views}/entityview.r (93%)
 rename ruamoko/qwaq/debugger/{ => views}/fieldview.h (87%)
 rename ruamoko/qwaq/debugger/{ => views}/fieldview.r (93%)
 rename ruamoko/qwaq/debugger/{ => views}/floatview.h (87%)
 rename ruamoko/qwaq/debugger/{ => views}/floatview.r (93%)
 rename ruamoko/qwaq/debugger/{ => views}/funcview.h (87%)
 rename ruamoko/qwaq/debugger/{ => views}/funcview.r (93%)
 rename ruamoko/qwaq/debugger/{ => views}/intview.h (86%)
 rename ruamoko/qwaq/debugger/{ => views}/intview.r (93%)
 rename ruamoko/qwaq/debugger/{ => views}/nameview.h (84%)
 rename ruamoko/qwaq/debugger/{ => views}/nameview.r (91%)
 rename ruamoko/qwaq/debugger/{ => views}/pointerview.h (87%)
 rename ruamoko/qwaq/debugger/{ => views}/pointerview.r (93%)
 rename ruamoko/qwaq/debugger/{ => views}/quatview.h (87%)
 rename ruamoko/qwaq/debugger/{ => views}/quatview.r (93%)
 rename ruamoko/qwaq/debugger/{ => views}/stringview.h (87%)
 rename ruamoko/qwaq/debugger/{ => views}/stringview.r (93%)
 rename ruamoko/qwaq/debugger/{ => views}/uintview.h (87%)
 rename ruamoko/qwaq/debugger/{ => views}/uintview.r (93%)
 rename ruamoko/qwaq/debugger/{ => views}/vectorview.h (87%)
 rename ruamoko/qwaq/debugger/{ => views}/vectorview.r (93%)
 rename ruamoko/qwaq/debugger/{ => views}/voidview.h (87%)
 rename ruamoko/qwaq/debugger/{ => views}/voidview.r (94%)

diff --git a/ruamoko/qwaq/Makefile.am b/ruamoko/qwaq/Makefile.am
index b4e513314..2208777f5 100644
--- a/ruamoko/qwaq/Makefile.am
+++ b/ruamoko/qwaq/Makefile.am
@@ -27,21 +27,21 @@ SUFFIXES=.o .r
 
 qwaq_app_dat_src= \
 	qwaq-app.r	\
-	debugger/defview.r	\
-	debugger/nameview.r	\
-	debugger/basicview.r	\
-	debugger/doubleview.r	\
-	debugger/entityview.r	\
-	debugger/fieldview.r	\
-	debugger/floatview.r	\
-	debugger/funcview.r	\
-	debugger/intview.r	\
-	debugger/pointerview.r	\
-	debugger/quatview.r	\
-	debugger/stringview.r	\
-	debugger/uintview.r	\
-	debugger/vectorview.r	\
-	debugger/voidview.r	\
+	debugger/views/basicview.r	\
+	debugger/views/defview.r	\
+	debugger/views/doubleview.r	\
+	debugger/views/entityview.r	\
+	debugger/views/fieldview.r	\
+	debugger/views/floatview.r	\
+	debugger/views/funcview.r	\
+	debugger/views/intview.r	\
+	debugger/views/nameview.r	\
+	debugger/views/pointerview.r\
+	debugger/views/quatview.r	\
+	debugger/views/stringview.r	\
+	debugger/views/uintview.r	\
+	debugger/views/vectorview.r	\
+	debugger/views/voidview.r	\
 	debugger/debug.r	\
 	debugger/debugger.r	\
 	debugger/localsdata.r	\
diff --git a/ruamoko/qwaq/debugger/localsdata.r b/ruamoko/qwaq/debugger/localsdata.r
index 45d15fc8e..d380f9fe5 100644
--- a/ruamoko/qwaq/debugger/localsdata.r
+++ b/ruamoko/qwaq/debugger/localsdata.r
@@ -1,7 +1,7 @@
 #include <string.h>
 #include <types.h>
-#include "debugger/defview.h"
-#include "debugger/nameview.h"
+#include "debugger/views/defview.h"
+#include "debugger/views/nameview.h"
 #include "debugger/localsdata.h"
 #include "debugger/typeencodings.h"
 
diff --git a/ruamoko/qwaq/debugger/basicview.h b/ruamoko/qwaq/debugger/views/basicview.h
similarity index 88%
rename from ruamoko/qwaq/debugger/basicview.h
rename to ruamoko/qwaq/debugger/views/basicview.h
index 773ab6794..d9289889f 100644
--- a/ruamoko/qwaq/debugger/basicview.h
+++ b/ruamoko/qwaq/debugger/views/basicview.h
@@ -1,7 +1,7 @@
 #ifndef __qwaq_debugger_basicview_h
 #define __qwaq_debugger_basicview_h
 
-#include "debugger/defview.h"
+#include "debugger/views/defview.h"
 
 @interface BasicView : DefView
 // might return a NameView (which is also a DefView)
diff --git a/ruamoko/qwaq/debugger/basicview.r b/ruamoko/qwaq/debugger/views/basicview.r
similarity index 91%
rename from ruamoko/qwaq/debugger/basicview.r
rename to ruamoko/qwaq/debugger/views/basicview.r
index 5701a27d3..8a2067285 100644
--- a/ruamoko/qwaq/debugger/basicview.r
+++ b/ruamoko/qwaq/debugger/views/basicview.r
@@ -1,6 +1,6 @@
 #include <string.h>
-#include "debugger/basicview.h"
-#include "debugger/nameview.h"
+#include "debugger/views/basicview.h"
+#include "debugger/views/nameview.h"
 
 static string type_views[] = {
 	"VoidView",
diff --git a/ruamoko/qwaq/debugger/defview.h b/ruamoko/qwaq/debugger/views/defview.h
similarity index 100%
rename from ruamoko/qwaq/debugger/defview.h
rename to ruamoko/qwaq/debugger/views/defview.h
diff --git a/ruamoko/qwaq/debugger/defview.r b/ruamoko/qwaq/debugger/views/defview.r
similarity index 93%
rename from ruamoko/qwaq/debugger/defview.r
rename to ruamoko/qwaq/debugger/views/defview.r
index f115c8e61..ee681e23e 100644
--- a/ruamoko/qwaq/debugger/defview.r
+++ b/ruamoko/qwaq/debugger/views/defview.r
@@ -1,6 +1,6 @@
 #include <string.h>
-#include "debugger/defview.h"
-#include "debugger/nameview.h"
+#include "debugger/views/defview.h"
+#include "debugger/views/nameview.h"
 
 static string meta_views[] = {
 	"BasicView",
diff --git a/ruamoko/qwaq/debugger/doubleview.h b/ruamoko/qwaq/debugger/views/doubleview.h
similarity index 87%
rename from ruamoko/qwaq/debugger/doubleview.h
rename to ruamoko/qwaq/debugger/views/doubleview.h
index 0ddea40c1..8fda5ac24 100644
--- a/ruamoko/qwaq/debugger/doubleview.h
+++ b/ruamoko/qwaq/debugger/views/doubleview.h
@@ -1,7 +1,7 @@
 #ifndef __qwaq_debugger_doubleview_h
 #define __qwaq_debugger_doubleview_h
 
-#include "debugger/defview.h"
+#include "debugger/views/defview.h"
 
 @interface DoubleView : DefView
 {
diff --git a/ruamoko/qwaq/debugger/doubleview.r b/ruamoko/qwaq/debugger/views/doubleview.r
similarity index 93%
rename from ruamoko/qwaq/debugger/doubleview.r
rename to ruamoko/qwaq/debugger/views/doubleview.r
index 977adbe28..36fbfd59d 100644
--- a/ruamoko/qwaq/debugger/doubleview.r
+++ b/ruamoko/qwaq/debugger/views/doubleview.r
@@ -1,5 +1,5 @@
 #include <string.h>
-#include "debugger/doubleview.h"
+#include "debugger/views/doubleview.h"
 
 @implementation DoubleView
 
diff --git a/ruamoko/qwaq/debugger/entityview.h b/ruamoko/qwaq/debugger/views/entityview.h
similarity index 87%
rename from ruamoko/qwaq/debugger/entityview.h
rename to ruamoko/qwaq/debugger/views/entityview.h
index 81ba29e9c..df8de2c3d 100644
--- a/ruamoko/qwaq/debugger/entityview.h
+++ b/ruamoko/qwaq/debugger/views/entityview.h
@@ -1,7 +1,7 @@
 #ifndef __qwaq_debugger_entityview_h
 #define __qwaq_debugger_entityview_h
 
-#include "debugger/defview.h"
+#include "debugger/views/defview.h"
 
 @interface EntityView : DefView
 {
diff --git a/ruamoko/qwaq/debugger/entityview.r b/ruamoko/qwaq/debugger/views/entityview.r
similarity index 93%
rename from ruamoko/qwaq/debugger/entityview.r
rename to ruamoko/qwaq/debugger/views/entityview.r
index 52d152dae..49180e914 100644
--- a/ruamoko/qwaq/debugger/entityview.r
+++ b/ruamoko/qwaq/debugger/views/entityview.r
@@ -1,5 +1,5 @@
 #include <string.h>
-#include "debugger/entityview.h"
+#include "debugger/views/entityview.h"
 
 @implementation EntityView
 
diff --git a/ruamoko/qwaq/debugger/fieldview.h b/ruamoko/qwaq/debugger/views/fieldview.h
similarity index 87%
rename from ruamoko/qwaq/debugger/fieldview.h
rename to ruamoko/qwaq/debugger/views/fieldview.h
index bf793ec00..5d90bf77f 100644
--- a/ruamoko/qwaq/debugger/fieldview.h
+++ b/ruamoko/qwaq/debugger/views/fieldview.h
@@ -1,7 +1,7 @@
 #ifndef __qwaq_debugger_fieldview_h
 #define __qwaq_debugger_fieldview_h
 
-#include "debugger/defview.h"
+#include "debugger/views/defview.h"
 
 @interface FieldView : DefView
 {
diff --git a/ruamoko/qwaq/debugger/fieldview.r b/ruamoko/qwaq/debugger/views/fieldview.r
similarity index 93%
rename from ruamoko/qwaq/debugger/fieldview.r
rename to ruamoko/qwaq/debugger/views/fieldview.r
index 657e75cc9..49bf7282b 100644
--- a/ruamoko/qwaq/debugger/fieldview.r
+++ b/ruamoko/qwaq/debugger/views/fieldview.r
@@ -1,5 +1,5 @@
 #include <string.h>
-#include "debugger/fieldview.h"
+#include "debugger/views/fieldview.h"
 
 @implementation FieldView
 
diff --git a/ruamoko/qwaq/debugger/floatview.h b/ruamoko/qwaq/debugger/views/floatview.h
similarity index 87%
rename from ruamoko/qwaq/debugger/floatview.h
rename to ruamoko/qwaq/debugger/views/floatview.h
index 4fa32be05..a51469709 100644
--- a/ruamoko/qwaq/debugger/floatview.h
+++ b/ruamoko/qwaq/debugger/views/floatview.h
@@ -1,7 +1,7 @@
 #ifndef __qwaq_debugger_floatview_h
 #define __qwaq_debugger_floatview_h
 
-#include "debugger/defview.h"
+#include "debugger/views/defview.h"
 
 @interface FloatView : DefView
 {
diff --git a/ruamoko/qwaq/debugger/floatview.r b/ruamoko/qwaq/debugger/views/floatview.r
similarity index 93%
rename from ruamoko/qwaq/debugger/floatview.r
rename to ruamoko/qwaq/debugger/views/floatview.r
index 8abc6a1b4..e98e9e8a8 100644
--- a/ruamoko/qwaq/debugger/floatview.r
+++ b/ruamoko/qwaq/debugger/views/floatview.r
@@ -1,5 +1,5 @@
 #include <string.h>
-#include "debugger/floatview.h"
+#include "debugger/views/floatview.h"
 
 @implementation FloatView
 
diff --git a/ruamoko/qwaq/debugger/funcview.h b/ruamoko/qwaq/debugger/views/funcview.h
similarity index 87%
rename from ruamoko/qwaq/debugger/funcview.h
rename to ruamoko/qwaq/debugger/views/funcview.h
index 43cce6512..5a004800c 100644
--- a/ruamoko/qwaq/debugger/funcview.h
+++ b/ruamoko/qwaq/debugger/views/funcview.h
@@ -1,7 +1,7 @@
 #ifndef __qwaq_debugger_funcview_h
 #define __qwaq_debugger_funcview_h
 
-#include "debugger/defview.h"
+#include "debugger/views/defview.h"
 
 @interface FuncView : DefView
 {
diff --git a/ruamoko/qwaq/debugger/funcview.r b/ruamoko/qwaq/debugger/views/funcview.r
similarity index 93%
rename from ruamoko/qwaq/debugger/funcview.r
rename to ruamoko/qwaq/debugger/views/funcview.r
index 540e75013..c102bfce1 100644
--- a/ruamoko/qwaq/debugger/funcview.r
+++ b/ruamoko/qwaq/debugger/views/funcview.r
@@ -1,5 +1,5 @@
 #include <string.h>
-#include "debugger/funcview.h"
+#include "debugger/views/funcview.h"
 
 @implementation FuncView
 
diff --git a/ruamoko/qwaq/debugger/intview.h b/ruamoko/qwaq/debugger/views/intview.h
similarity index 86%
rename from ruamoko/qwaq/debugger/intview.h
rename to ruamoko/qwaq/debugger/views/intview.h
index 531da879d..fddb2f2d5 100644
--- a/ruamoko/qwaq/debugger/intview.h
+++ b/ruamoko/qwaq/debugger/views/intview.h
@@ -1,7 +1,7 @@
 #ifndef __qwaq_debugger_intview_h
 #define __qwaq_debugger_intview_h
 
-#include "debugger/defview.h"
+#include "debugger/views/defview.h"
 
 @interface IntView : DefView
 {
diff --git a/ruamoko/qwaq/debugger/intview.r b/ruamoko/qwaq/debugger/views/intview.r
similarity index 93%
rename from ruamoko/qwaq/debugger/intview.r
rename to ruamoko/qwaq/debugger/views/intview.r
index 613f4e787..6caad42ac 100644
--- a/ruamoko/qwaq/debugger/intview.r
+++ b/ruamoko/qwaq/debugger/views/intview.r
@@ -1,5 +1,5 @@
 #include <string.h>
-#include "debugger/intview.h"
+#include "debugger/views/intview.h"
 
 @implementation IntView
 
diff --git a/ruamoko/qwaq/debugger/nameview.h b/ruamoko/qwaq/debugger/views/nameview.h
similarity index 84%
rename from ruamoko/qwaq/debugger/nameview.h
rename to ruamoko/qwaq/debugger/views/nameview.h
index 1822df98e..7d5838bce 100644
--- a/ruamoko/qwaq/debugger/nameview.h
+++ b/ruamoko/qwaq/debugger/views/nameview.h
@@ -1,7 +1,7 @@
 #ifndef __qwaq_debugger_nameview_h
 #define __qwaq_debugger_nameview_h
 
-#include "debugger/defview.h"
+#include "debugger/views/defview.h"
 
 @interface NameView : DefView
 {
diff --git a/ruamoko/qwaq/debugger/nameview.r b/ruamoko/qwaq/debugger/views/nameview.r
similarity index 91%
rename from ruamoko/qwaq/debugger/nameview.r
rename to ruamoko/qwaq/debugger/views/nameview.r
index 52710170a..9764fedaf 100644
--- a/ruamoko/qwaq/debugger/nameview.r
+++ b/ruamoko/qwaq/debugger/views/nameview.r
@@ -1,5 +1,5 @@
 #include <string.h>
-#include "debugger/nameview.h"
+#include "debugger/views/nameview.h"
 
 @implementation NameView
 
diff --git a/ruamoko/qwaq/debugger/pointerview.h b/ruamoko/qwaq/debugger/views/pointerview.h
similarity index 87%
rename from ruamoko/qwaq/debugger/pointerview.h
rename to ruamoko/qwaq/debugger/views/pointerview.h
index 6891d5f50..4853958e9 100644
--- a/ruamoko/qwaq/debugger/pointerview.h
+++ b/ruamoko/qwaq/debugger/views/pointerview.h
@@ -1,7 +1,7 @@
 #ifndef __qwaq_debugger_pointerview_h
 #define __qwaq_debugger_pointerview_h
 
-#include "debugger/defview.h"
+#include "debugger/views/defview.h"
 
 @interface PointerView : DefView
 {
diff --git a/ruamoko/qwaq/debugger/pointerview.r b/ruamoko/qwaq/debugger/views/pointerview.r
similarity index 93%
rename from ruamoko/qwaq/debugger/pointerview.r
rename to ruamoko/qwaq/debugger/views/pointerview.r
index 1159bf6ab..20743ea19 100644
--- a/ruamoko/qwaq/debugger/pointerview.r
+++ b/ruamoko/qwaq/debugger/views/pointerview.r
@@ -1,5 +1,5 @@
 #include <string.h>
-#include "debugger/pointerview.h"
+#include "debugger/views/pointerview.h"
 
 @implementation PointerView
 
diff --git a/ruamoko/qwaq/debugger/quatview.h b/ruamoko/qwaq/debugger/views/quatview.h
similarity index 87%
rename from ruamoko/qwaq/debugger/quatview.h
rename to ruamoko/qwaq/debugger/views/quatview.h
index 2ea1934cd..189a600f8 100644
--- a/ruamoko/qwaq/debugger/quatview.h
+++ b/ruamoko/qwaq/debugger/views/quatview.h
@@ -1,7 +1,7 @@
 #ifndef __qwaq_debugger_quatview_h
 #define __qwaq_debugger_quatview_h
 
-#include "debugger/defview.h"
+#include "debugger/views/defview.h"
 
 @interface QuatView : DefView
 {
diff --git a/ruamoko/qwaq/debugger/quatview.r b/ruamoko/qwaq/debugger/views/quatview.r
similarity index 93%
rename from ruamoko/qwaq/debugger/quatview.r
rename to ruamoko/qwaq/debugger/views/quatview.r
index bd79e9ae9..ba98e9d2b 100644
--- a/ruamoko/qwaq/debugger/quatview.r
+++ b/ruamoko/qwaq/debugger/views/quatview.r
@@ -1,5 +1,5 @@
 #include <string.h>
-#include "debugger/quatview.h"
+#include "debugger/views/quatview.h"
 
 @implementation QuatView
 
diff --git a/ruamoko/qwaq/debugger/stringview.h b/ruamoko/qwaq/debugger/views/stringview.h
similarity index 87%
rename from ruamoko/qwaq/debugger/stringview.h
rename to ruamoko/qwaq/debugger/views/stringview.h
index 62b009e5d..5cabaf674 100644
--- a/ruamoko/qwaq/debugger/stringview.h
+++ b/ruamoko/qwaq/debugger/views/stringview.h
@@ -1,7 +1,7 @@
 #ifndef __qwaq_debugger_stringview_h
 #define __qwaq_debugger_stringview_h
 
-#include "debugger/defview.h"
+#include "debugger/views/defview.h"
 
 @interface StringView : DefView
 {
diff --git a/ruamoko/qwaq/debugger/stringview.r b/ruamoko/qwaq/debugger/views/stringview.r
similarity index 93%
rename from ruamoko/qwaq/debugger/stringview.r
rename to ruamoko/qwaq/debugger/views/stringview.r
index 0cf53752d..79ef75212 100644
--- a/ruamoko/qwaq/debugger/stringview.r
+++ b/ruamoko/qwaq/debugger/views/stringview.r
@@ -1,5 +1,5 @@
 #include <string.h>
-#include "debugger/stringview.h"
+#include "debugger/views/stringview.h"
 
 @implementation StringView
 
diff --git a/ruamoko/qwaq/debugger/uintview.h b/ruamoko/qwaq/debugger/views/uintview.h
similarity index 87%
rename from ruamoko/qwaq/debugger/uintview.h
rename to ruamoko/qwaq/debugger/views/uintview.h
index 752db5a20..9597c5519 100644
--- a/ruamoko/qwaq/debugger/uintview.h
+++ b/ruamoko/qwaq/debugger/views/uintview.h
@@ -1,7 +1,7 @@
 #ifndef __qwaq_debugger_uintview_h
 #define __qwaq_debugger_uintview_h
 
-#include "debugger/defview.h"
+#include "debugger/views/defview.h"
 
 @interface UIntView : DefView
 {
diff --git a/ruamoko/qwaq/debugger/uintview.r b/ruamoko/qwaq/debugger/views/uintview.r
similarity index 93%
rename from ruamoko/qwaq/debugger/uintview.r
rename to ruamoko/qwaq/debugger/views/uintview.r
index 0969567d3..e06ac32fa 100644
--- a/ruamoko/qwaq/debugger/uintview.r
+++ b/ruamoko/qwaq/debugger/views/uintview.r
@@ -1,5 +1,5 @@
 #include <string.h>
-#include "debugger/uintview.h"
+#include "debugger/views/uintview.h"
 
 @implementation UIntView
 
diff --git a/ruamoko/qwaq/debugger/vectorview.h b/ruamoko/qwaq/debugger/views/vectorview.h
similarity index 87%
rename from ruamoko/qwaq/debugger/vectorview.h
rename to ruamoko/qwaq/debugger/views/vectorview.h
index 51d2ffc34..b6b95fa34 100644
--- a/ruamoko/qwaq/debugger/vectorview.h
+++ b/ruamoko/qwaq/debugger/views/vectorview.h
@@ -1,7 +1,7 @@
 #ifndef __qwaq_debugger_vectorview_h
 #define __qwaq_debugger_vectorview_h
 
-#include "debugger/defview.h"
+#include "debugger/views/defview.h"
 
 @interface VectorView : DefView
 {
diff --git a/ruamoko/qwaq/debugger/vectorview.r b/ruamoko/qwaq/debugger/views/vectorview.r
similarity index 93%
rename from ruamoko/qwaq/debugger/vectorview.r
rename to ruamoko/qwaq/debugger/views/vectorview.r
index 028dc889f..2fa8b41ed 100644
--- a/ruamoko/qwaq/debugger/vectorview.r
+++ b/ruamoko/qwaq/debugger/views/vectorview.r
@@ -1,5 +1,5 @@
 #include <string.h>
-#include "debugger/vectorview.h"
+#include "debugger/views/vectorview.h"
 
 @implementation VectorView
 
diff --git a/ruamoko/qwaq/debugger/voidview.h b/ruamoko/qwaq/debugger/views/voidview.h
similarity index 87%
rename from ruamoko/qwaq/debugger/voidview.h
rename to ruamoko/qwaq/debugger/views/voidview.h
index e0e19c675..6232968e0 100644
--- a/ruamoko/qwaq/debugger/voidview.h
+++ b/ruamoko/qwaq/debugger/views/voidview.h
@@ -1,7 +1,7 @@
 #ifndef __qwaq_debugger_voidview_h
 #define __qwaq_debugger_voidview_h
 
-#include "debugger/defview.h"
+#include "debugger/views/defview.h"
 
 @interface VoidView : DefView
 {
diff --git a/ruamoko/qwaq/debugger/voidview.r b/ruamoko/qwaq/debugger/views/voidview.r
similarity index 94%
rename from ruamoko/qwaq/debugger/voidview.r
rename to ruamoko/qwaq/debugger/views/voidview.r
index e50f66873..440edece2 100644
--- a/ruamoko/qwaq/debugger/voidview.r
+++ b/ruamoko/qwaq/debugger/views/voidview.r
@@ -1,5 +1,5 @@
 #include <string.h>
-#include "debugger/voidview.h"
+#include "debugger/views/voidview.h"
 
 @implementation VoidView
 

From ea1e85905cdf1046406d5f2a98cd542b1e5556db Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 2 Apr 2020 13:07:50 +0900
Subject: [PATCH 1113/1519] [qwaq] Implement source-level stepping

Now the debugger stops only when the source line has changed or the
statement address is stuck.
---
 ruamoko/qwaq/debugger/debugger.h |  2 ++
 ruamoko/qwaq/debugger/debugger.r | 54 +++++++++++++++++++++++++++++++-
 2 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/ruamoko/qwaq/debugger/debugger.h b/ruamoko/qwaq/debugger/debugger.h
index 9e827c73d..627558f1f 100644
--- a/ruamoko/qwaq/debugger/debugger.h
+++ b/ruamoko/qwaq/debugger/debugger.h
@@ -17,6 +17,8 @@
 @interface Debugger : Object
 {
 	qdb_target_t target;
+	qdb_event_t event;
+	qdb_state_t last_state;
 
 	Window     *source_window;
 	ScrollBar  *source_scrollbar;
diff --git a/ruamoko/qwaq/debugger/debugger.r b/ruamoko/qwaq/debugger/debugger.r
index 1cdad5e8d..0f78f2e7a 100644
--- a/ruamoko/qwaq/debugger/debugger.r
+++ b/ruamoko/qwaq/debugger/debugger.r
@@ -138,6 +138,7 @@ proxy_event (Debugger *self, id proxy, qwaq_event_t *event)
 		switch (event.key.code) {
 			case QFK_F7:
 				qdb_set_trace (self.target, 1);
+				self.last_state = qdb_get_state (self.target);
 				qdb_continue (self.target);
 				return 1;
 		}
@@ -152,7 +153,7 @@ proxy_event (Debugger *self, id proxy, qwaq_event_t *event)
 	}
 }
 
--handleDebugEvent
+-stop:(prdebug_t)reason
 {
 	if (!file_proxy) {
 		[self setup];
@@ -162,4 +163,55 @@ proxy_event (Debugger *self, id proxy, qwaq_event_t *event)
 	return self;
 }
 
+-trace
+{
+	qdb_state_t state = qdb_get_state (target);
+
+	// stop only if the progs have not advanced (may be a broken jump)
+	// or the progs have advanced to a different source line
+	if (last_state.staddr != state.staddr
+		&& last_state.func == state.func
+		&& last_state.file == state.file
+		&& last_state.line == state.line) {
+		last_state = state;
+		qdb_continue (self.target);
+		return self;
+	}
+	[self stop:prd_trace];
+	return self;
+}
+
+-handleDebugEvent
+{
+	if (qdb_get_event (target, &event)) {
+		switch (event.what) {
+			case prd_none:
+				break;	// shouldn't happen
+			case prd_trace:
+				[self trace];
+				break;
+			case prd_breakpoint:
+			case prd_watchpoint:
+				[self stop:event.what];
+				break;
+			case prd_subenter:
+				[self stop:event.what];
+				break;
+			case prd_subexit:
+				[self stop:event.what];
+				break;
+			case prd_terminate:
+				wprintf(stdscr, "Program ended: %d\n", event.exit_code);
+				[self stop:event.what];
+				break;
+			case prd_runerror:
+			case prd_error:
+				wprintf(stdscr, "%s\n", event.message);
+				[self stop:event.what];
+				break;
+		}
+	}
+	return self;
+}
+
 @end

From f90613bc3a1423b7b380f38d55c27df9eb107a4e Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 2 Apr 2020 15:00:01 +0900
Subject: [PATCH 1114/1519] [gamecode] Rename fields in pr_stack_t

s and f are a little too succinct.
---
 include/QF/progs.h       |  4 ++--
 libs/gamecode/pr_debug.c | 18 +++++++++---------
 libs/gamecode/pr_exec.c  | 10 +++++-----
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/include/QF/progs.h b/include/QF/progs.h
index d9f738846..db969f6af 100644
--- a/include/QF/progs.h
+++ b/include/QF/progs.h
@@ -1720,8 +1720,8 @@ extern const char *pr_gametype;
 typedef struct strref_s strref_t;
 
 typedef struct {
-	pr_int_t    s;					///< Return statement.
-	bfunction_t *f;					///< Calling function.
+	pr_int_t    staddr;				///< Return statement.
+	bfunction_t *func;				///< Calling function.
 	strref_t   *tstr;				///< Linked list of temporary strings.
 } prstack_t;
 
diff --git a/libs/gamecode/pr_debug.c b/libs/gamecode/pr_debug.c
index b1b7d217c..61e45ce8b 100644
--- a/libs/gamecode/pr_debug.c
+++ b/libs/gamecode/pr_debug.c
@@ -1464,35 +1464,35 @@ static void
 dump_frame (progs_t *pr, prstack_t *frame)
 {
 	prdeb_resources_t *res = pr->pr_debug_resources;
-	dfunction_t	   *f = frame->f ? frame->f->descriptor : 0;
+	dfunction_t	   *f = frame->func ? frame->func->descriptor : 0;
 
 	if (!f) {
 		Sys_Printf ("<NO FUNCTION>\n");
 		return;
 	}
 	if (pr_debug->int_val && res->debug) {
-		pr_lineno_t *lineno = PR_Find_Lineno (pr, frame->s);
+		pr_lineno_t *lineno = PR_Find_Lineno (pr, frame->staddr);
 		pr_auxfunction_t *func = PR_Get_Lineno_Func (pr, lineno);
 		pr_uint_t   line = PR_Get_Lineno_Line (pr, lineno);
 		pr_int_t    addr = PR_Get_Lineno_Addr (pr, lineno);
 
 		line += func->source_line;
-		if (addr == frame->s) {
+		if (addr == frame->staddr) {
 			Sys_Printf ("%12s:%u : %s: %x\n",
 						PR_GetString (pr, f->s_file),
 						line,
 						PR_GetString (pr, f->s_name),
-						frame->s);
+						frame->staddr);
 		} else {
 			Sys_Printf ("%12s:%u+%d : %s: %x\n",
 						PR_GetString (pr, f->s_file),
-						line, frame->s - addr,
+						line, frame->staddr - addr,
 						PR_GetString (pr, f->s_name),
-						frame->s);
+						frame->staddr);
 		}
 	} else {
 		Sys_Printf ("%12s : %s: %x\n", PR_GetString (pr, f->s_file),
-					PR_GetString (pr, f->s_name), frame->s);
+					PR_GetString (pr, f->s_name), frame->staddr);
 	}
 }
 
@@ -1507,8 +1507,8 @@ PR_StackTrace (progs_t *pr)
 		return;
 	}
 
-	top.s = pr->pr_xstatement;
-	top.f = pr->pr_xfunction;
+	top.staddr = pr->pr_xstatement;
+	top.func = pr->pr_xfunction;
 	dump_frame (pr, &top);
 	for (i = pr->pr_depth - 1; i >= 0; i--)
 		dump_frame (pr, pr->pr_stack + i);
diff --git a/libs/gamecode/pr_exec.c b/libs/gamecode/pr_exec.c
index 9a287b4f9..4a79f8173 100644
--- a/libs/gamecode/pr_exec.c
+++ b/libs/gamecode/pr_exec.c
@@ -124,9 +124,9 @@ PR_PushFrame (progs_t *pr)
 
 	frame = pr->pr_stack + pr->pr_depth++;
 
-	frame->s    = pr->pr_xstatement;
-	frame->f    = pr->pr_xfunction;
-	frame->tstr = pr->pr_xtstr;
+	frame->staddr = pr->pr_xstatement;
+	frame->func   = pr->pr_xfunction;
+	frame->tstr   = pr->pr_xtstr;
 
 	pr->pr_xtstr = pr->pr_pushtstr;
 	pr->pr_pushtstr = 0;
@@ -158,8 +158,8 @@ PR_PopFrame (progs_t *pr)
 	// up stack
 	frame = pr->pr_stack + --pr->pr_depth;
 
-	pr->pr_xfunction  = frame->f;
-	pr->pr_xstatement = frame->s;
+	pr->pr_xfunction  = frame->func;
+	pr->pr_xstatement = frame->staddr;
 	pr->pr_xtstr      = frame->tstr;
 }
 

From c09f57c39ed3fed8c812199904c66af7ad3d4ac4 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 2 Apr 2020 17:28:37 +0900
Subject: [PATCH 1115/1519] [gamecode] Delay .ctor calls if debugging

This allows a debugger to do any symbol lookups and other preparations
between loading progs and the first code execution. .ctors are called as
per normal if debug_handler is not set.
---
 include/QF/progs.h           | 20 +++++++++++++++-----
 libs/gamecode/pr_load.c      | 12 +++++++++++-
 ruamoko/qwaq/builtins/main.c | 17 +++++++++++------
 3 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/include/QF/progs.h b/include/QF/progs.h
index db969f6af..fd9d653f7 100644
--- a/include/QF/progs.h
+++ b/include/QF/progs.h
@@ -236,14 +236,24 @@ void PR_AddLoadFinishFunc (progs_t *pr, pr_load_func_t *func);
 	\return			true for success, false for failure
 
 	Calls the first set of internal load functions followed by the supplied
-	symbol resolution function, if any (progs_t::resolve), the second set of
-	internal load functions. After that, any primary load functions are called
-	in order of registration followed by any \c .ctor functions in the progs,
-	then any secondary load functions the primary load functions registered
-	in \e reverse order of registration.
+	symbol resolution function, if any (progs_t::resolve), then the second set
+	of internal load functions. After that, any primary load functions are
+	called in order of registration, and if there is no debug handler,
+	PR_RunPostLoadFuncs() is called.
 */
 int PR_RunLoadFuncs (progs_t *pr);
 
+/** Run any progs-dependent load functions.
+	\param pr		pointer to ::progs_t VM struct
+	\return			true for success, false for failure
+	This means any \c .ctor functions in the progs, followed by any secondary
+	load functions registered by either the primary load functions or the
+	\.c ctor functions in \e reverse order of registration. This is called
+	automatically by PR_RunLoadFuncs() if there is no debug handler, otherwise
+	it is up to the host to call this function.
+*/
+int PR_RunPostLoadFuncs (progs_t *pr);
+
 /** Validate the opcodes and statement addresses in the progs. This is an
 	internal load function.
 	\param pr		pointer to ::progs_t VM struct
diff --git a/libs/gamecode/pr_load.c b/libs/gamecode/pr_load.c
index dd405769a..6ef18cc15 100644
--- a/libs/gamecode/pr_load.c
+++ b/libs/gamecode/pr_load.c
@@ -422,6 +422,12 @@ PR_RunLoadFuncs (progs_t *pr)
 		if (!pr->load_funcs[i] (pr))
 			return 0;
 
+	return 1;
+}
+
+VISIBLE int
+PR_RunPostLoadFuncs (progs_t *pr)
+{
 	if (!pr_run_ctors (pr))
 		return 0;
 
@@ -449,8 +455,12 @@ PR_LoadProgs (progs_t *pr, const char *progsname)
 	if (!pr->progs)
 		return;
 
-	if (!PR_RunLoadFuncs (pr))
+	if (!PR_RunLoadFuncs (pr)) {
 		PR_Error (pr, "unable to load %s", progsname);
+	}
+	if (!pr->debug_handler && !PR_RunPostLoadFuncs (pr)) {
+		PR_Error (pr, "unable to load %s", progsname);
+	}
 }
 
 VISIBLE void
diff --git a/ruamoko/qwaq/builtins/main.c b/ruamoko/qwaq/builtins/main.c
index 077b4674f..491a35277 100644
--- a/ruamoko/qwaq/builtins/main.c
+++ b/ruamoko/qwaq/builtins/main.c
@@ -206,6 +206,17 @@ spawn_progs (qwaq_thread_t *thread)
 		Sys_Error ("couldn't load %s", name);
 	}
 
+	if ((dfunc = PR_FindFunction (pr, ".main"))
+		|| (dfunc = PR_FindFunction (pr, "main"))) {
+		thread->main_func = dfunc - pr->pr_functions;
+	} else {
+		PR_Undefined (pr, "function", "main");
+	}
+
+	if (!PR_RunPostLoadFuncs (pr)) {
+		PR_Error (pr, "unable to load %s", pr->progs_name);
+	}
+
 	PR_PushFrame (pr);
 	if (thread->args.size > 2) {
 		pr_argc = thread->args.size - 1;
@@ -216,12 +227,6 @@ spawn_progs (qwaq_thread_t *thread)
 		pr_argv[i] = PR_SetTempString (pr, thread->args.a[1 + i]);
 	pr_argv[i] = 0;
 
-	if ((dfunc = PR_FindFunction (pr, ".main"))
-		|| (dfunc = PR_FindFunction (pr, "main"))) {
-		thread->main_func = dfunc - pr->pr_functions;
-	} else {
-		PR_Undefined (pr, "function", "main");
-	}
 	PR_RESET_PARAMS (pr);
 	P_INT (pr, 0) = pr_argc;
 	P_POINTER (pr, 1) = PR_SetPointer (pr, pr_argv);

From 63caa5794d93cba8a74f7e6548e2f59ad9dc90a5 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 2 Apr 2020 17:44:53 +0900
Subject: [PATCH 1116/1519] [qwaq] Implement step-over tracing

I decided that stopping in between function calls that are on the same
line is a good thing as it gives a chance to skip over the first but
step into the second.
---
 include/QF/pr_debug.h            |  1 +
 ruamoko/qwaq/builtins/debug.c    | 54 +++++++++++++++++++---
 ruamoko/qwaq/builtins/main.c     |  5 ++
 ruamoko/qwaq/debugger/debug.h    | 10 +++-
 ruamoko/qwaq/debugger/debug.r    |  2 +
 ruamoko/qwaq/debugger/debugger.h | 11 ++++-
 ruamoko/qwaq/debugger/debugger.r | 79 ++++++++++++++++++++++++++------
 7 files changed, 140 insertions(+), 22 deletions(-)

diff --git a/include/QF/pr_debug.h b/include/QF/pr_debug.h
index 9811afe67..4b87ee897 100644
--- a/include/QF/pr_debug.h
+++ b/include/QF/pr_debug.h
@@ -73,6 +73,7 @@ typedef enum prdebug_e {
 	prd_watchpoint,
 	prd_subenter,
 	prd_subexit,		// current invocation of PR_ExecuteProgram finished
+	prd_begin,			// not sent by VM
 	prd_terminate,		// not sent by VM
 	prd_runerror,
 	prd_error,			// lower level error thann prd_runerror
diff --git a/ruamoko/qwaq/builtins/debug.c b/ruamoko/qwaq/builtins/debug.c
index 287b5bcbe..4fec2a1ac 100644
--- a/ruamoko/qwaq/builtins/debug.c
+++ b/ruamoko/qwaq/builtins/debug.c
@@ -296,6 +296,41 @@ qdb_get_state (progs_t *pr)
 	R_PACKED (pr, qdb_state_t) = state;
 }
 
+static void
+qdb_get_stack_depth (progs_t *pr)
+{
+	__auto_type debug = PR_Resources_Find (pr, "qwaq-debug");
+	pointer_t   handle = P_INT (pr, 0);
+	qwaq_target_t *target = get_target (debug, __FUNCTION__, handle);
+	progs_t    *tpr = target->pr;
+
+	R_INT (pr) = tpr->pr_depth;
+}
+
+static void
+qdb_get_stack (progs_t *pr)
+{
+	__auto_type debug = PR_Resources_Find (pr, "qwaq-debug");
+	pointer_t   handle = P_INT (pr, 0);
+	qwaq_target_t *target = get_target (debug, __FUNCTION__, handle);
+	progs_t    *tpr = target->pr;
+	int         count = tpr->pr_depth;
+
+	R_POINTER (pr) = 0;
+	if (count > 0) {
+		size_t      size = count * sizeof (qdb_stack_t);
+		string_t    stack_block = PR_AllocTempBlock (pr, size);
+		__auto_type stack = (qdb_stack_t *) PR_GetString (pr, stack_block);
+
+		for (int i = 0; i < count; i++) {
+			stack[i].staddr = tpr->pr_stack[i].staddr;
+			stack[i].func = tpr->pr_stack[i].func - tpr->pr_xfunction;
+			//XXX temp strings (need access somehow)
+		}
+		R_POINTER (pr) = PR_SetPointer (pr, stack);
+	}
+}
+
 static void
 qdb_get_event (progs_t *pr)
 {
@@ -308,12 +343,15 @@ qdb_get_event (progs_t *pr)
 	event->what = target->event;
 	switch (event->what) {
 		case prd_subenter:
-			event->func = *(func_t *) target->param;
+			event->function = *(func_t *) target->param;
 			break;
 		case prd_runerror:
 		case prd_error:
 			event->message = PR_SetReturnString (pr, *(char **) target->param);
 			break;
+		case prd_begin:
+			event->function = *(func_t *) target->param;
+			break;
 		case prd_terminate:
 			event->exit_code = *(int *) target->param;
 			break;
@@ -411,7 +449,7 @@ qdb_find_field (progs_t *pr)
 static void
 return_function (progs_t *pr, dfunction_t *func)
 {
-	R_INT (pr) = 0;
+	R_POINTER (pr) = 0;
 	if (func) {
 		__auto_type f
 			= (qdb_function_t *) PR_Zone_Malloc (pr, sizeof (qdb_function_t));
@@ -422,7 +460,7 @@ return_function (progs_t *pr, dfunction_t *func)
 		f->name = func->s_name;
 		f->file = func->s_file;
 		f->num_params = func->numparms;
-		R_INT (pr) = PR_SetPointer (pr, f);
+		R_POINTER (pr) = PR_SetPointer (pr, f);
 	}
 }
 
@@ -458,7 +496,7 @@ qdb_get_function (progs_t *pr)
 static void
 return_auxfunction (progs_t *pr, pr_auxfunction_t *auxfunc)
 {
-	R_INT (pr) = 0;
+	R_POINTER (pr) = 0;
 	if (auxfunc) {
 		__auto_type f
 			= (qdb_auxfunction_t *) PR_Zone_Malloc (pr,
@@ -469,7 +507,7 @@ return_auxfunction (progs_t *pr, pr_auxfunction_t *auxfunc)
 		f->local_defs = auxfunc->local_defs;
 		f->num_locals = auxfunc->num_locals;
 		f->return_type = auxfunc->return_type;
-		R_INT (pr) = PR_SetPointer (pr, f);
+		R_POINTER (pr) = PR_SetPointer (pr, f);
 	}
 }
 
@@ -514,7 +552,7 @@ qdb_get_local_defs (progs_t *pr)
 	pr_uint_t   fnum = P_UINT (pr, 1);
 	pr_auxfunction_t *auxfunc = PR_Debug_MappedAuxFunction (tpr, fnum);
 
-	R_INT (pr) = 0;
+	R_POINTER (pr) = 0;
 	if (auxfunc && auxfunc->num_locals) {
 		pr_def_t   *defs = PR_Debug_LocalDefs (tpr, auxfunc);
 		__auto_type qdefs
@@ -526,7 +564,7 @@ qdb_get_local_defs (progs_t *pr)
 			qdefs[i].name = defs[i].name;
 			qdefs[i].type_encoding = defs[i].type_encoding;
 		}
-		R_INT (pr) = PR_SetPointer (pr, qdefs);
+		R_POINTER (pr) = PR_SetPointer (pr, qdefs);
 	}
 }
 
@@ -538,6 +576,8 @@ static builtin_t builtins[] = {
 	{"qdb_clear_watchpoint",	qdb_clear_watchpoint,	-1},
 	{"qdb_continue",			qdb_continue,			-1},
 	{"qdb_get_state",			qdb_get_state,			-1},
+	{"qdb_get_stack_depth",		qdb_get_stack_depth,	-1},
+	{"qdb_get_stack",			qdb_get_stack,			-1},
 	{"qdb_get_event",			qdb_get_event,			-1},
 	{"qdb_get_data",			qdb_get_data,			-1},
 	{"qdb_get_string|{tag qdb_target_s=}i",	qdb_get_string,	-1},
diff --git a/ruamoko/qwaq/builtins/main.c b/ruamoko/qwaq/builtins/main.c
index 491a35277..db4f8da59 100644
--- a/ruamoko/qwaq/builtins/main.c
+++ b/ruamoko/qwaq/builtins/main.c
@@ -213,6 +213,11 @@ spawn_progs (qwaq_thread_t *thread)
 		PR_Undefined (pr, "function", "main");
 	}
 
+	if (thread->pr->debug_handler) {
+		thread->pr->debug_handler (prd_begin, &thread->main_func,
+								   thread->pr->debug_data);
+	}
+
 	if (!PR_RunPostLoadFuncs (pr)) {
 		PR_Error (pr, "unable to load %s", pr->progs_name);
 	}
diff --git a/ruamoko/qwaq/debugger/debug.h b/ruamoko/qwaq/debugger/debug.h
index b7ead7c92..6dc86ab1c 100644
--- a/ruamoko/qwaq/debugger/debug.h
+++ b/ruamoko/qwaq/debugger/debug.h
@@ -24,7 +24,7 @@ typedef struct qdb_event_s {
 	prdebug_t   what;
 	union {
 		string_t    message;
-		unsigned    func;
+		unsigned    function;
 		int         exit_code;
 	};
 } qdb_event_t;
@@ -36,6 +36,12 @@ typedef struct qdb_state_s {
 	unsigned    line;
 } qdb_state_t;
 
+typedef struct qdb_stack_s {
+	unsigned    staddr;		// return address
+	unsigned    func;		// calling function
+	// FIXME temp strings
+} qdb_stack_t;
+
 typedef struct qdb_def_s {
 	unsigned    type_size;	// type in lower 16, size in upper 16
 	unsigned    offset;
@@ -73,6 +79,8 @@ int qdb_set_watchpoint (qdb_target_t target, unsigned offset);
 int qdb_clear_watchpoint (qdb_target_t target);
 int qdb_continue (qdb_target_t target);
 qdb_state_t qdb_get_state (qdb_target_t target);
+int qdb_get_stack_depth (qdb_target_t target);
+qdb_stack_t *qdb_get_stack (qdb_target_t target);
 int qdb_get_event (qdb_target_t target, qdb_event_t *event);
 int qdb_get_data (qdb_target_t target, unsigned src, unsigned len, void *dst);
 @overload string qdb_get_string (qdb_target_t target, unsigned str);
diff --git a/ruamoko/qwaq/debugger/debug.r b/ruamoko/qwaq/debugger/debug.r
index 7aa1b457c..792b20d61 100644
--- a/ruamoko/qwaq/debugger/debug.r
+++ b/ruamoko/qwaq/debugger/debug.r
@@ -10,6 +10,8 @@ int qdb_set_watchpoint (qdb_target_t target, unsigned offset) = #0;
 int qdb_clear_watchpoint (qdb_target_t target) = #0;
 int qdb_continue (qdb_target_t target) = #0;
 qdb_state_t qdb_get_state (qdb_target_t target) = #0;
+int qdb_get_stack_depth (qdb_target_t target) = #0;
+qdb_stack_t *qdb_get_stack (qdb_target_t target) = #0;
 int qdb_get_event (qdb_target_t target, qdb_event_t *event) = #0;
 int qdb_get_data (qdb_target_t target, unsigned src, unsigned len,
 				  void *dst) = #0;
diff --git a/ruamoko/qwaq/debugger/debugger.h b/ruamoko/qwaq/debugger/debugger.h
index 627558f1f..13adcf752 100644
--- a/ruamoko/qwaq/debugger/debugger.h
+++ b/ruamoko/qwaq/debugger/debugger.h
@@ -18,7 +18,16 @@
 {
 	qdb_target_t target;
 	qdb_event_t event;
-	qdb_state_t last_state;
+	struct {
+		qdb_state_t state;
+		int         depth;
+		int			until_function;
+	}           trace_cond;
+	struct {
+		int         onEnter;
+		int         onExit;
+	}           sub_cond;
+	SEL         traceHandler;
 
 	Window     *source_window;
 	ScrollBar  *source_scrollbar;
diff --git a/ruamoko/qwaq/debugger/debugger.r b/ruamoko/qwaq/debugger/debugger.r
index 0f78f2e7a..4fbba26a4 100644
--- a/ruamoko/qwaq/debugger/debugger.r
+++ b/ruamoko/qwaq/debugger/debugger.r
@@ -137,8 +137,18 @@ proxy_event (Debugger *self, id proxy, qwaq_event_t *event)
 	} else if (event.what == qe_keydown) {
 		switch (event.key.code) {
 			case QFK_F7:
+			case 's':
+				self.traceHandler = @selector(traceStep);
 				qdb_set_trace (self.target, 1);
-				self.last_state = qdb_get_state (self.target);
+				self.trace_cond.state = qdb_get_state (self.target);
+				qdb_continue (self.target);
+				return 1;
+			case QFK_F8:
+			case 'n':
+				self.traceHandler = @selector(traceNext);
+				qdb_set_trace (self.target, 1);
+				self.trace_cond.state = qdb_get_state (self.target);
+				self.trace_cond.depth = qdb_get_stack_depth (self.target);
 				qdb_continue (self.target);
 				return 1;
 		}
@@ -163,21 +173,50 @@ proxy_event (Debugger *self, id proxy, qwaq_event_t *event)
 	return self;
 }
 
--trace
+// stop only if the progs have not advanced (may be a broken jump)
+// or the progs have advanced to a different source line
+static int
+is_new_line (qdb_state_t last_state, qdb_state_t state)
+{
+	return !(last_state.staddr != state.staddr
+			 && last_state.func == state.func
+			 && last_state.file == state.file
+			 && last_state.line == state.line);
+}
+
+-traceStep
 {
 	qdb_state_t state = qdb_get_state (target);
 
-	// stop only if the progs have not advanced (may be a broken jump)
-	// or the progs have advanced to a different source line
-	if (last_state.staddr != state.staddr
-		&& last_state.func == state.func
-		&& last_state.file == state.file
-		&& last_state.line == state.line) {
-		last_state = state;
-		qdb_continue (self.target);
+	if (trace_cond.until_function && trace_cond.until_function == state.func) {
+		trace_cond.until_function = 0;
+		[self stop:prd_trace];
 		return self;
 	}
-	[self stop:prd_trace];
+	if (is_new_line(trace_cond.state, state)) {
+		[self stop:prd_trace];
+		return self;
+	}
+	trace_cond.state = state;
+	qdb_continue (self.target);
+	return self;
+}
+
+-traceNext
+{
+	qdb_state_t state = qdb_get_state (target);
+	if (trace_cond.until_function && trace_cond.until_function == state.func) {
+		trace_cond.until_function = 0;
+		[self stop:prd_trace];
+		return self;
+	}
+	if (is_new_line(trace_cond.state, state)
+		&& qdb_get_stack_depth (target) <= trace_cond.depth) {
+		[self stop:prd_trace];
+		return self;
+	}
+	trace_cond.state = state;
+	qdb_continue (self.target);
 	return self;
 }
 
@@ -188,16 +227,30 @@ proxy_event (Debugger *self, id proxy, qwaq_event_t *event)
 			case prd_none:
 				break;	// shouldn't happen
 			case prd_trace:
-				[self trace];
+				[self performSelector:traceHandler];
 				break;
 			case prd_breakpoint:
 			case prd_watchpoint:
 				[self stop:event.what];
 				break;
 			case prd_subenter:
-				[self stop:event.what];
+				printf("subenter\n");
+				if (sub_cond.onEnter) {
+					[self stop:event.what];
+				} else {
+					qdb_continue (self.target);
+				}
 				break;
 			case prd_subexit:
+				printf("subexit\n");
+				if (sub_cond.onExit) {
+					[self stop:event.what];
+				} else {
+					qdb_continue (self.target);
+				}
+				break;
+			case prd_begin:
+				trace_cond.until_function = event.function;
 				[self stop:event.what];
 				break;
 			case prd_terminate:

From 17871b979d504f89e6c4be8a6d9525768267348c Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 2 Apr 2020 19:29:54 +0900
Subject: [PATCH 1117/1519] [ruamoko] Implement obj_calloc correctly

Forgetting to multiply by the second term leads to not good things.
---
 libs/ruamoko/rua_obj.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/ruamoko/rua_obj.c b/libs/ruamoko/rua_obj.c
index 91b9e5692..7ecc8ef28 100644
--- a/libs/ruamoko/rua_obj.c
+++ b/libs/ruamoko/rua_obj.c
@@ -1489,7 +1489,7 @@ rua_obj_realloc (progs_t *pr)
 static void
 rua_obj_calloc (progs_t *pr)
 {
-	int         size = P_INT (pr, 0) * sizeof (pr_type_t);
+	int         size = P_INT (pr, 0) * P_INT (pr, 1) * sizeof (pr_type_t);
 	void       *mem = PR_Zone_Malloc (pr, size);
 
 	memset (mem, 0, size);

From 9b1ce44fda207abd64b712295fdca65553dad745 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 2 Apr 2020 19:31:11 +0900
Subject: [PATCH 1118/1519] [qwaq] Fix some issues with fetching type encodings

Now struct defs show FIXME instead of void data.
---
 ruamoko/qwaq/debugger/debugger.r      | 2 --
 ruamoko/qwaq/debugger/localsdata.r    | 4 +++-
 ruamoko/qwaq/debugger/typeencodings.r | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ruamoko/qwaq/debugger/debugger.r b/ruamoko/qwaq/debugger/debugger.r
index 4fbba26a4..425a4f4d7 100644
--- a/ruamoko/qwaq/debugger/debugger.r
+++ b/ruamoko/qwaq/debugger/debugger.r
@@ -234,7 +234,6 @@ is_new_line (qdb_state_t last_state, qdb_state_t state)
 				[self stop:event.what];
 				break;
 			case prd_subenter:
-				printf("subenter\n");
 				if (sub_cond.onEnter) {
 					[self stop:event.what];
 				} else {
@@ -242,7 +241,6 @@ is_new_line (qdb_state_t last_state, qdb_state_t state)
 				}
 				break;
 			case prd_subexit:
-				printf("subexit\n");
 				if (sub_cond.onExit) {
 					[self stop:event.what];
 				} else {
diff --git a/ruamoko/qwaq/debugger/localsdata.r b/ruamoko/qwaq/debugger/localsdata.r
index d380f9fe5..d65869491 100644
--- a/ruamoko/qwaq/debugger/localsdata.r
+++ b/ruamoko/qwaq/debugger/localsdata.r
@@ -66,7 +66,9 @@
 
 -fetchData
 {
-	qdb_get_data (target, func.local_data, func.local_size, data);
+	if (data && func.local_size && func.local_data) {
+		qdb_get_data (target, func.local_data, func.local_size, data);
+	}
 	return self;
 }
 
diff --git a/ruamoko/qwaq/debugger/typeencodings.r b/ruamoko/qwaq/debugger/typeencodings.r
index 0e2f4fc44..ad04dbbcd 100644
--- a/ruamoko/qwaq/debugger/typeencodings.r
+++ b/ruamoko/qwaq/debugger/typeencodings.r
@@ -83,7 +83,7 @@ static void type_free (void *t, void *unused)
 	if (qdb_get_data (target, typeAddr, TYPESIZE, &buffer) < 0) {
 		return nil;
 	}
-	if (!buffer.encoding) {
+	if (!buffer.size) {
 		return nil;
 	}
 	encoding = qdb_get_string (target, buffer.encoding);
@@ -97,7 +97,7 @@ static void type_free (void *t, void *unused)
 		return type;
 	}
 	type = obj_calloc (1, buffer.size);
-	if (!qdb_get_data (target, typeAddr, TYPESIZE, &buffer)) {
+	if (qdb_get_data (target, typeAddr, buffer.size, type) < 0) {
 		goto error;
 	}
 	if (!(type.encoding = qdb_get_string (target, type.encoding))) {

From 5d065968147b75d47dfcb5f263f184d8d3aa1752 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 3 Apr 2020 00:20:39 +0900
Subject: [PATCH 1119/1519] [qfcc] Fix test harness after .ctor change

---
 tools/qfcc/test/test-harness.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/qfcc/test/test-harness.c b/tools/qfcc/test/test-harness.c
index 934c02cb0..ba9759c19 100644
--- a/tools/qfcc/test/test-harness.c
+++ b/tools/qfcc/test/test-harness.c
@@ -177,6 +177,8 @@ load_progs (const char *name)
 	Qclose (file);
 	if (!PR_RunLoadFuncs (&pr))
 		PR_Error (&pr, "unable to load %s", pr.progs_name);
+	if (!PR_RunPostLoadFuncs (&pr))
+		PR_Error (&pr, "unable to load %s", pr.progs_name);
 	pr.pr_trace_depth = -1;
 	pr.pr_trace = options.trace;
 	return 1;

From d69db50cf971cc79b2c64707cfc423cbe106d362 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 3 Apr 2020 00:45:54 +0900
Subject: [PATCH 1120/1519] [qfcc] Remove path stripping

It never really helped sort out the path issues when using build
directories. It worked well enough for single directory projects, but
things got messy very quickly, especially when mixing ruamoko libs with
external progs. A better method based on dwarf is coming.
---
 ruamoko/cl_menu/Makefile.am  |  5 ++---
 ruamoko/game/Makefile.am     |  5 ++---
 ruamoko/gui/Makefile.am      |  2 +-
 ruamoko/lib/Makefile.am      |  2 +-
 ruamoko/scheme/Makefile.am   |  5 ++---
 tools/qfcc/doc/man/qfcc.1    |  9 ---------
 tools/qfcc/include/options.h |  2 --
 tools/qfcc/include/qfcc.h    |  1 -
 tools/qfcc/source/debug.c    |  2 +-
 tools/qfcc/source/options.c  |  8 --------
 tools/qfcc/source/qfcc.c     | 20 ++------------------
 tools/qfcc/source/stub.c     |  1 -
 12 files changed, 11 insertions(+), 51 deletions(-)

diff --git a/ruamoko/cl_menu/Makefile.am b/ruamoko/cl_menu/Makefile.am
index 2d2b0c4d0..8c759d410 100644
--- a/ruamoko/cl_menu/Makefile.am
+++ b/ruamoko/cl_menu/Makefile.am
@@ -27,11 +27,10 @@ am__mv = mv -f
 GZIP=if echo $@ | grep -q .gz; then gzip -f `basename $@ .gz`; if test -f `basename $@ .dat.gz`.sym; then gzip -f `basename $@ .dat.gz`.sym; fi; fi
 # BSD make can't handle $(shell foo) directives, and GNU make can't handle |=
 # so we have to bite the bullet and pass this to the shell every time.
-STRIP=`echo -n $(srcdir)/ | sed -e 's/[^/]//g' | wc -c`
 
 SUFFIXES=.o .r
 .r.o:
-	$(QCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tqo -p $(STRIP) -c -o $@ $<
+	$(QCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tqo -c -o $@ $<
 	@sed -i -e '1s@:@: $(QFCC_DEP)@' $(DEPDIR)/$*.Tqo
 	@$(am__mv) $(DEPDIR)/$*.Tqo $(DEPDIR)/$*.Qo
 
@@ -50,7 +49,7 @@ menu_dat_SOURCES=$(menu_src)
 menu_obj=$(menu_src:.r=.o)
 menu_dep=$(addprefix ./$(DEPDIR)/,$(menu_obj:.o=.Qo))
 menu.dat: $(menu_obj) $(QFCC_DEP) ../lib/libcsqc.a ../lib/libr.a ../gui/libgui.a
-	$(QLINK) -p $(STRIP) -o menu.dat $(menu_obj) ../gui/libgui.a ../lib/libcsqc.a ../lib/libr.a
+	$(QLINK) -o menu.dat $(menu_obj) ../gui/libgui.a ../lib/libcsqc.a ../lib/libr.a
 include $(menu_dep) # am--include-marker
 r_depfiles_remade += $(menu_dep)
 
diff --git a/ruamoko/game/Makefile.am b/ruamoko/game/Makefile.am
index e7cee8113..fe9a38f5f 100644
--- a/ruamoko/game/Makefile.am
+++ b/ruamoko/game/Makefile.am
@@ -25,11 +25,10 @@ am__mv = mv -f
 GZIP=if echo $@ | grep -q .gz; then gzip -f `basename $@ .gz`; if test -f `basename $@ .dat.gz`.sym; then gzip -f `basename $@ .dat.gz`.sym; fi; fi
 # BSD make can't handle $(shell foo) directives, and GNU make can't handle |=
 # so we have to bite the bullet and pass this to the shell every time.
-STRIP=`echo -n $(srcdir)/ | sed -e 's/[^/]//g' | wc -c`
 
 SUFFIXES=.o .r
 .r.o:
-	$(QCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tqo -p $(STRIP) -c -o $@ $<
+	$(QCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tqo -c -o $@ $<
 	@sed -i -e '1s@:@: $(QFCC_DEP)@' $(DEPDIR)/$*.Tqo
 	@$(am__mv) $(DEPDIR)/$*.Tqo $(DEPDIR)/$*.Qo
 
@@ -41,7 +40,7 @@ game_dat_SOURCES=$(game_src)
 game_obj=$(game_src:.r=.o)
 game_dep=$(addprefix ./$(DEPDIR)/,$(game_obj:.o=.Qo))
 game.dat: $(game_obj) $(QFCC_DEP) ../lib/libr.a ../lib/libqw.a
-	$(QLINK) -p $(STRIP) -o game.dat $(game_obj) ../lib/libr.a ../lib/libqw.a ../lib/libr.a
+	$(QLINK) -o game.dat $(game_obj) ../lib/libr.a ../lib/libqw.a ../lib/libr.a
 include $(game_dep) # am--include-marker
 r_depfiles_remade += $(game_dep)
 
diff --git a/ruamoko/gui/Makefile.am b/ruamoko/gui/Makefile.am
index 7edb5f173..0edd447d4 100644
--- a/ruamoko/gui/Makefile.am
+++ b/ruamoko/gui/Makefile.am
@@ -26,7 +26,7 @@ RANLIB=touch
 
 SUFFIXES= .o .r
 .r.o:
-	$(QCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tqo -p $(STRIP) -c -o $@ $<
+	$(QCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tqo -c -o $@ $<
 	@sed -i -e '1s@:@: $(QFCC_DEP)@' $(DEPDIR)/$*.Tqo
 	@$(am__mv) $(DEPDIR)/$*.Tqo $(DEPDIR)/$*.Qo
 
diff --git a/ruamoko/lib/Makefile.am b/ruamoko/lib/Makefile.am
index cf0e50154..b05db7299 100644
--- a/ruamoko/lib/Makefile.am
+++ b/ruamoko/lib/Makefile.am
@@ -28,7 +28,7 @@ RANLIB=touch
 
 SUFFIXES= .o .r
 .r.o:
-	$(QCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tqo -p $(STRIP) -c -o $@ $<
+	$(QCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tqo -c -o $@ $<
 	@sed -i -e '1s@:@: $(QFCC_DEP)@' $(DEPDIR)/$*.Tqo
 	@$(am__mv) $(DEPDIR)/$*.Tqo $(DEPDIR)/$*.Qo
 
diff --git a/ruamoko/scheme/Makefile.am b/ruamoko/scheme/Makefile.am
index 3d4319863..9a5fb71a8 100644
--- a/ruamoko/scheme/Makefile.am
+++ b/ruamoko/scheme/Makefile.am
@@ -30,12 +30,11 @@ PAK=$(top_builddir)/tools/pak/pak$(EXEEXT)
 GZIP=if echo $@ | grep -q .gz; then gzip -f `basename $@ .gz`; if test -f `basename $@ .dat.gz`.sym; then gzip -f `basename $@ .dat.gz`.sym; fi; fi
 # BSD make can't handle $(shell foo) directives, and GNU make can't handle |=
 # so we have to bite the bullet and pass this to the shell every time.
-STRIP=`echo -n $(srcdir)/ | sed -e 's/[^/]//g' | wc -c`
 RANLIB=touch
 
 SUFFIXES=.o .r
 .r.o:
-	$(QCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tqo -p $(STRIP) -c -o $@ $<
+	$(QCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tqo -c -o $@ $<
 	@sed -i -e '1s@:@: $(QFCC_DEP)@' $(DEPDIR)/$*.Tqo
 	@$(am__mv) $(DEPDIR)/$*.Tqo $(DEPDIR)/$*.Qo
 
@@ -59,7 +58,7 @@ main_dat_SOURCES=$(scheme_src)
 main_obj=$(scheme_src:.r=.o)
 main_dep=$(addprefix ./$(DEPDIR)/,$(main_obj:.o=.Qo))
 main.dat: $(main_obj) $(QFCC_DEP) libscheme.a ../lib/libcsqc.a ../lib/libr.a
-	$(QLINK) -p $(STRIP) -o main.dat $(main_obj) libscheme.a ../lib/libcsqc.a ../lib/libr.a
+	$(QLINK) -o main.dat $(main_obj) libscheme.a ../lib/libcsqc.a ../lib/libr.a
 include $(main_dep) # am--include-marker
 r_depfiles_remade += $(main_dep)
 
diff --git a/tools/qfcc/doc/man/qfcc.1 b/tools/qfcc/doc/man/qfcc.1
index 3162f813d..4105eaa1d 100644
--- a/tools/qfcc/doc/man/qfcc.1
+++ b/tools/qfcc/doc/man/qfcc.1
@@ -168,15 +168,6 @@ No effect in separate compilation mode.
 Use QCCX escape sequences instead of standard C/QuakeForge sequences in
 strings. See \fBESCAPE SEQUENCES\fP for details.
 
-.TP
-.B \-p, \-\-strip\-path NUM
-Strip NUM leading path elements from file names.
-eg. -p 3 will strip the
-.I ../../../
-from
-.I ../../../src/foo.r
-when embedding the source file name in the output code.
-
 .TP
 .B \-q, \-\-quiet
 Inhibit some of \*[qfcc]'s normal output.
diff --git a/tools/qfcc/include/options.h b/tools/qfcc/include/options.h
index a43c908b6..580f97370 100644
--- a/tools/qfcc/include/options.h
+++ b/tools/qfcc/include/options.h
@@ -114,8 +114,6 @@ typedef struct {
 	qboolean		partial_link;	// partial linking
 	qboolean		preprocess_only;// run only cpp, don't compile
 	qboolean		gzip;			// compress qfo files when writing
-	int				strip_path;		// number of leading path elements to strip
-									// from source file names
 	const char     *output_file;
 	const char     *debug_file;
 } options_t;
diff --git a/tools/qfcc/include/qfcc.h b/tools/qfcc/include/qfcc.h
index dc8dddac2..eedafdadd 100644
--- a/tools/qfcc/include/qfcc.h
+++ b/tools/qfcc/include/qfcc.h
@@ -108,7 +108,6 @@ extern	pr_info_t	pr;
 
 #define POINTER_OFS(s,p)	((pr_type_t *) (p) - (s)->data)
 
-const char *strip_path (const char *filename) __attribute__((pure));
 const char *file_basename (const char *filename, int keepdot) __attribute__((pure));
 
 extern FILE *qc_yyin;
diff --git a/tools/qfcc/source/debug.c b/tools/qfcc/source/debug.c
index 5d6f1f5f5..f56e177fb 100644
--- a/tools/qfcc/source/debug.c
+++ b/tools/qfcc/source/debug.c
@@ -111,7 +111,7 @@ line_info (char *text)
 	while (*p && *p != '\n')	// ignore rest
 		p++;
 	pr.source_line = line - 1;
-	pr.source_file = ReuseString (strip_path (str));
+	pr.source_file = ReuseString (str);
 }
 
 pr_lineno_t *
diff --git a/tools/qfcc/source/options.c b/tools/qfcc/source/options.c
index 6f972fd82..e3f9e504e 100644
--- a/tools/qfcc/source/options.c
+++ b/tools/qfcc/source/options.c
@@ -94,7 +94,6 @@ static struct option const long_options[] = {
 	{"relocatable", no_argument, 0, 'r'},
 	{"save-temps", no_argument, 0, 'S'},
 	{"source", required_argument, 0, 's'},
-	{"strip-path", required_argument, 0, 'p'},
 	{"traditional", no_argument, 0, OPT_TRADITIONAL},
 	{"undefine", required_argument, 0, 'U'},
 	{"verbose", no_argument, 0, 'v'},
@@ -120,7 +119,6 @@ static const char *short_options =
 	"o:"	// output file
 	"O"		// optimize
 	"P:"	// progs.src name
-	"p:"	// strip path
 	"q"		// quiet
 	"r"		// partial linking
 	"S"		// save temps
@@ -166,8 +164,6 @@ usage (int status)
 "    -o, --output-file FILE    Specify output file name\n"
 "        --progdefs            Genderate progdefs.h\n"
 "    -P, --progs-src FILE      File to use instead of progs.src\n"
-"    -p, --strip-path NUM      Strip NUM leading path elements from file\n"
-"                              names\n"
 "        --qccx-escapes        Use QCCX escape sequences instead of standard\n"
 "                              C/QuakeForge sequences.\n"
 "    -q, --quiet               Inhibit usual output\n"
@@ -325,7 +321,6 @@ DecodeArgs (int argc, char **argv)
 	options.single_cpp = true;
 	options.save_temps = false;
 	options.verbosity = 0;
-	options.strip_path = 0;
 
 	sourcedir = "";
 	progs_src = "progs.src";
@@ -364,9 +359,6 @@ DecodeArgs (int argc, char **argv)
 			case 'P':					// progs-src
 				progs_src = save_string (NORMALIZE (optarg));
 				break;
-			case 'p':
-				options.strip_path = atoi (optarg);
-				break;
 			case 'F':
 				options.files_dat = true;
 				break;
diff --git a/tools/qfcc/source/qfcc.c b/tools/qfcc/source/qfcc.c
index 1167611ad..007c7f795 100644
--- a/tools/qfcc/source/qfcc.c
+++ b/tools/qfcc/source/qfcc.c
@@ -296,22 +296,6 @@ begin_compilation (void)
 	pr.error_count = 0;
 }
 
-const char *
-strip_path (const char *filename)
-{
-	const char *p = filename;
-	int         i = options.strip_path;
-
-	while (i-- > 0) {
-		while (*p && *p != '/')
-			p++;
-		if (!*p)
-			break;
-		filename = ++p;
-	}
-	return filename;
-}
-
 const char *
 file_basename (const char *filename, int keepdot)
 {
@@ -385,7 +369,7 @@ compile_to_obj (const char *file, const char *obj, lang_t lang)
 	InitData ();
 	chain_initial_types ();
 	begin_compilation ();
-	pr.source_file = ReuseString (strip_path (file));
+	pr.source_file = ReuseString (file);
 	err = yyparse () || pr.error_count;
 	fclose (*yyin);
 	if (cpp_name && !options.save_temps) {
@@ -641,7 +625,7 @@ compile_file (const char *filename)
 	if (!*yyin)
 		return !options.preprocess_only;
 
-	pr.source_file = ReuseString (strip_path (filename));
+	pr.source_file = ReuseString (filename);
 	pr.source_line = 1;
 	clear_frame_macros ();
 	err = yyparse () || pr.error_count;
diff --git a/tools/qfcc/source/stub.c b/tools/qfcc/source/stub.c
index 449e62436..411a8d3a6 100644
--- a/tools/qfcc/source/stub.c
+++ b/tools/qfcc/source/stub.c
@@ -54,5 +54,4 @@ void dump_dot (const char *stage, void *data,
 		          void (*dump_func) (void *data, const char *fname)){}
 void dump_dot_type (void *_t, const char *filename){}
 char *fubar;
-const char *strip_path(const char *p) { return fubar;}
 const char *file_basename(const char *p, int keepdot) { return fubar;}

From f8d9b720dee213b373855027ef6ac4ce9c833a14 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 3 Apr 2020 14:14:34 +0900
Subject: [PATCH 1121/1519] [qfcc] Free data spaces between compiliations

---
 tools/qfcc/include/defspace.h   |  2 ++
 tools/qfcc/source/defspace.c    | 22 ++++++++++++++++++++++
 tools/qfcc/source/qfcc.c        |  7 ++++++-
 tools/qfcc/test/test-defspace.c |  6 ++++++
 4 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/tools/qfcc/include/defspace.h b/tools/qfcc/include/defspace.h
index ef6036286..e0414f1c9 100644
--- a/tools/qfcc/include/defspace.h
+++ b/tools/qfcc/include/defspace.h
@@ -90,6 +90,8 @@ typedef struct defspace_s {
 */
 defspace_t *defspace_new (ds_type_t type);
 
+void defspace_delete (defspace_t *defspace);
+
 /** Allocate space from the defspace's backing memory.
 
 	If the memory is fragmented, then the first available location at least
diff --git a/tools/qfcc/source/defspace.c b/tools/qfcc/source/defspace.c
index f2c9f7011..4c3b80ab9 100644
--- a/tools/qfcc/source/defspace.c
+++ b/tools/qfcc/source/defspace.c
@@ -139,6 +139,28 @@ defspace_new (ds_type_t type)
 	return space;
 }
 
+void
+defspace_delete (defspace_t *space)
+{
+	locref_t  **lr;
+
+	for (lr = &space->free_locs; *lr; lr = &(*lr)->next) {
+	}
+	*lr = locrefs_freelist;
+	locrefs_freelist = space->free_locs;
+
+	if (space->data) {
+		free (space->data);
+	}
+
+	while (space->defs) {
+		def_t      *def = space->defs;
+		space->defs = def->next;
+		def->space = 0;
+		free_def (def);
+	}
+}
+
 int
 defspace_alloc_loc (defspace_t *space, int size)
 {
diff --git a/tools/qfcc/source/qfcc.c b/tools/qfcc/source/qfcc.c
index 007c7f795..c606fb414 100644
--- a/tools/qfcc/source/qfcc.c
+++ b/tools/qfcc/source/qfcc.c
@@ -137,10 +137,15 @@ InitData (void)
 	if (pr.code) {
 		codespace_delete (pr.code);
 		strpool_delete (pr.strings);
+		defspace_delete (pr.near_data);
+		defspace_delete (pr.far_data);
+		defspace_delete (pr.entity_data);
+		defspace_delete (pr.type_data);
 	}
 
-	if (pr.linenos)
+	if (pr.linenos) {
 		free (pr.linenos);
+	}
 
 	memset (&pr, 0, sizeof (pr));
 	pr.source_line = 1;
diff --git a/tools/qfcc/test/test-defspace.c b/tools/qfcc/test/test-defspace.c
index 5d14c5013..f0f40a692 100644
--- a/tools/qfcc/test/test-defspace.c
+++ b/tools/qfcc/test/test-defspace.c
@@ -18,6 +18,12 @@ pr_info_t   pr;
 function_t *current_func;
 class_type_t *current_class;
 
+void
+free_def (def_t *def)
+{
+	if (0) free (def);
+}
+
 __attribute__((const))const char *
 get_class_name (class_type_t *class_type, int prett)
 {

From 4b34bf3d95d9733c537409dd98ff514c5452811d Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 3 Apr 2020 14:16:16 +0900
Subject: [PATCH 1122/1519] [qfcc] Take optional space param for emit_structure

If the space param is null, the far data space is used.
---
 tools/qfcc/include/struct.h | 1 +
 tools/qfcc/source/class.c   | 8 ++++----
 tools/qfcc/source/method.c  | 4 ++--
 tools/qfcc/source/struct.c  | 7 +++++--
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/tools/qfcc/include/struct.h b/tools/qfcc/include/struct.h
index 8f50845cf..4438ec600 100644
--- a/tools/qfcc/include/struct.h
+++ b/tools/qfcc/include/struct.h
@@ -59,6 +59,7 @@ struct symbol_s *make_structure (const char *name, int su, struct_def_t *defs,
 								 struct type_s *type);
 struct def_s * emit_structure (const char *name, int su, struct_def_t *defs,
 							   struct type_s *type, void *data,
+							   struct defspace_s *space,
 							   enum storage_class_e storage);
 
 #endif//__struct_h
diff --git a/tools/qfcc/source/class.c b/tools/qfcc/source/class.c
index f7d52e29c..38ffd54a8 100644
--- a/tools/qfcc/source/class.c
+++ b/tools/qfcc/source/class.c
@@ -260,7 +260,7 @@ emit_static_instances (const char *classname)
 										   data.num_instances + 1);
 	instances_def = emit_structure (va ("_OBJ_STATIC_INSTANCES_%s", classname),
 									's', instances_struct, 0, &data,
-									sc_static);
+									0, sc_static);
 	free (data.instances);
 	return instances_def;
 }
@@ -787,7 +787,7 @@ emit_ivars (symtab_t *ivars, const char *name)
 	ivar_list_struct[1].type = array_type (&type_ivar, ivar_data.count);
 
 	def = emit_structure (va ("_OBJ_INSTANCE_VARIABLES_%s", name), 's',
-						  ivar_list_struct, 0, &ivar_data, sc_static);
+						  ivar_list_struct, 0, &ivar_data, 0, sc_static);
 
 	dstring_delete (ivar_data.encoding);
 	return def;
@@ -1528,7 +1528,7 @@ class_finish_module (void)
 										+ data.cat_def_cnt
 										+ 1);
 	symtab_def = emit_structure ("_OBJ_SYMTAB", 's', symtab_struct, 0, &data,
-								 sc_static);
+								 0, sc_static);
 	free (data.classes);
 	free (data.categories);
 
@@ -1787,7 +1787,7 @@ emit_protocol_list (protocollist_t *protocols, const char *name)
 		return 0;
 	proto_list_struct[2].type = array_type (&type_pointer, protocols->count);
 	return emit_structure (va ("_OBJ_PROTOCOLS_%s", name), 's',
-						   proto_list_struct, 0, protocols, sc_static);
+						   proto_list_struct, 0, protocols, 0, sc_static);
 }
 
 void
diff --git a/tools/qfcc/source/method.c b/tools/qfcc/source/method.c
index 833a03f1f..ae3d031e1 100644
--- a/tools/qfcc/source/method.c
+++ b/tools/qfcc/source/method.c
@@ -606,7 +606,7 @@ emit_methods (methodlist_t *methods, const char *name, int instance)
 
 	methods_struct[2].type = array_type (&type_method, count);
 	return emit_structure (va ("_OBJ_%s_METHODS_%s", type, name), 's',
-						   methods_struct, 0, methods, sc_static);
+						   methods_struct, 0, methods, 0, sc_static);
 }
 
 static void
@@ -674,7 +674,7 @@ emit_method_descriptions (methodlist_t *methods, const char *name,
 
 	method_list_struct[1].type = array_type (&type_method_description, count);
 	return emit_structure (va ("_OBJ_%s_METHODS_%s", type, name), 's',
-						   method_list_struct, 0, methods, sc_static);
+						   method_list_struct, 0, methods, 0, sc_static);
 }
 
 void
diff --git a/tools/qfcc/source/struct.c b/tools/qfcc/source/struct.c
index 59ac6fe7a..64553a8df 100644
--- a/tools/qfcc/source/struct.c
+++ b/tools/qfcc/source/struct.c
@@ -306,7 +306,7 @@ make_structure (const char *name, int su, struct_def_t *defs, type_t *type)
 
 def_t *
 emit_structure (const char *name, int su, struct_def_t *defs, type_t *type,
-				void *data, storage_class_t storage)
+				void *data, defspace_t *space, storage_class_t storage)
 {
 	int         i, j;
 	int         saw_null = 0;
@@ -341,7 +341,10 @@ emit_structure (const char *name, int su, struct_def_t *defs, type_t *type,
 	if (storage != sc_global && storage != sc_static)
 		internal_error (0, "structure %s must be global or static", name);
 
-	struct_sym = make_symbol (name, type, pr.far_data, storage);
+	if (!space) {
+		space = pr.far_data;
+	}
+	struct_sym = make_symbol (name, type, space, storage);
 
 	struct_def = struct_sym->s.def;
 	if (struct_def->initialized)

From 9089744290a277fbec5e8220932d4d9e9de42740 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 3 Apr 2020 14:20:40 +0900
Subject: [PATCH 1123/1519] [qfcc] Add a function to safely get cwd

getcwd is assumed to use malloc if its buff param is null. This may need
fixing in the future, but it's in one spot. The result in "saved" in the
non-progs pool.
---
 tools/qfcc/include/strpool.h |  2 ++
 tools/qfcc/source/strpool.c  | 10 ++++++++++
 2 files changed, 12 insertions(+)

diff --git a/tools/qfcc/include/strpool.h b/tools/qfcc/include/strpool.h
index e6e065cb8..6cdc8eb83 100644
--- a/tools/qfcc/include/strpool.h
+++ b/tools/qfcc/include/strpool.h
@@ -53,6 +53,8 @@ int strpool_addstr (strpool_t *strpool, const char *str);
 */
 const char *save_string (const char *str);
 
+const char *save_cwd (void);
+
 const char *make_string (char *token, char **end);
 
 const char *html_string (const char *str);
diff --git a/tools/qfcc/source/strpool.c b/tools/qfcc/source/strpool.c
index 8fb7642e6..0f10f81ee 100644
--- a/tools/qfcc/source/strpool.c
+++ b/tools/qfcc/source/strpool.c
@@ -39,6 +39,7 @@
 #endif
 #include <stdlib.h>
 #include <ctype.h>
+#include <unistd.h>
 
 #include "QF/dstring.h"
 #include "QF/hash.h"
@@ -140,6 +141,15 @@ save_string (const char *str)
 	return s;
 }
 
+const char *
+save_cwd (void)
+{
+	char       *cwd = getcwd (0, 0);
+	const char *str = save_string (cwd);
+	free (cwd);
+	return str;
+}
+
 const char *
 make_string (char *token, char **end)
 {

From 65e7df44d3d98cade6ab1ab4d0c3fa1ecb07c9d5 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 3 Apr 2020 14:22:44 +0900
Subject: [PATCH 1124/1519] [qfcc] Add function to see if a string is in a pool

Makes for a nice string set.
---
 tools/qfcc/include/strpool.h | 1 +
 tools/qfcc/source/strpool.c  | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/tools/qfcc/include/strpool.h b/tools/qfcc/include/strpool.h
index 6cdc8eb83..fbb4bc049 100644
--- a/tools/qfcc/include/strpool.h
+++ b/tools/qfcc/include/strpool.h
@@ -42,6 +42,7 @@ strpool_t *strpool_new (void);
 strpool_t *strpool_build (const char *strings, int size);
 void strpool_delete (strpool_t *strpool);
 int strpool_addstr (strpool_t *strpool, const char *str);
+int strpool_findstr (strpool_t *strpool, const char *str);
 
 /**	Smart strdup.
 
diff --git a/tools/qfcc/source/strpool.c b/tools/qfcc/source/strpool.c
index 0f10f81ee..d3ab07a1c 100644
--- a/tools/qfcc/source/strpool.c
+++ b/tools/qfcc/source/strpool.c
@@ -121,6 +121,14 @@ strpool_addstr (strpool_t *strpool, const char *str)
 	return s;
 }
 
+int
+strpool_findstr (strpool_t *strpool, const char *str)
+{
+	if (!str)
+		return 0;
+	return (intptr_t) Hash_Find (strpool->str_tab, str);
+}
+
 static const char *
 ss_get_key (const void *s, void *unused)
 {

From 049b8f392c78b4b4c192137a1bf97e5b12c407fc Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 3 Apr 2020 14:27:22 +0900
Subject: [PATCH 1125/1519] [qfcc] create a compilation unit for debug data

The compilation unit stores the directory from which qfcc was run and
any source files mentioned. This is similar to dwarf's compilation unit.
Right now, this is the only data in the new debug space, but more might
come in the future so it seems best to treat the debug space separately
in the object files.
---
 include/QF/pr_debug.h         |  7 +++
 tools/qfcc/include/debug.h    |  2 +
 tools/qfcc/include/obj_file.h |  2 +
 tools/qfcc/include/qfcc.h     |  6 +++
 tools/qfcc/source/debug.c     | 83 ++++++++++++++++++++++++++++++++++-
 tools/qfcc/source/linker.c    | 23 +++++++++-
 tools/qfcc/source/obj_file.c  | 25 +++++++++++
 tools/qfcc/source/qfcc.c      | 17 ++++++-
 8 files changed, 161 insertions(+), 4 deletions(-)

diff --git a/include/QF/pr_debug.h b/include/QF/pr_debug.h
index 4b87ee897..ab10b62a2 100644
--- a/include/QF/pr_debug.h
+++ b/include/QF/pr_debug.h
@@ -34,6 +34,13 @@
 #ifndef __QFCC__
 #include "QF/pr_comp.h"
 
+typedef struct pr_compunit_s {
+	pr_uint_t   unit_name;
+	pr_uint_t   basedir;
+	pr_uint_t   num_files;
+	pr_uint_t   files[1];
+} pr_compunit_t;
+
 typedef struct pr_auxfunction_s {
 	pr_uint_t   function;		// function def this aux info is for
 	pr_uint_t   source_line;	// first source line for this function
diff --git a/tools/qfcc/include/debug.h b/tools/qfcc/include/debug.h
index a5d5b5a1f..af5f322b7 100644
--- a/tools/qfcc/include/debug.h
+++ b/tools/qfcc/include/debug.h
@@ -35,6 +35,8 @@
 
 void line_info (char *text);
 pr_lineno_t *new_lineno (void);
+void add_source_file (const char *file);
+void debug_finish_module (const char *modname);
 
 extern int lineno_base;
 
diff --git a/tools/qfcc/include/obj_file.h b/tools/qfcc/include/obj_file.h
index 62d7b80f0..55a93542b 100644
--- a/tools/qfcc/include/obj_file.h
+++ b/tools/qfcc/include/obj_file.h
@@ -77,6 +77,7 @@ typedef enum qfos_type_e {
 	qfos_string,				///< strings. char data
 	qfos_entity,				///< entity field defs. no data
 	qfos_type,					///< type encodings
+	qfos_debug,					///< debug data
 } qfos_type_t;
 
 /**	Representation of a space in the object file.
@@ -283,6 +284,7 @@ enum {
 	qfo_far_data_space,
 	qfo_entity_space,
 	qfo_type_space,
+	qfo_debug_space,
 
 	qfo_num_spaces
 };
diff --git a/tools/qfcc/include/qfcc.h b/tools/qfcc/include/qfcc.h
index eedafdadd..6fac011ce 100644
--- a/tools/qfcc/include/qfcc.h
+++ b/tools/qfcc/include/qfcc.h
@@ -34,6 +34,7 @@
 */
 
 #include <stdio.h>
+#include "QF/darray.h"
 #include "QF/pr_comp.h"
 
 /** \defgroup qfcc_general General functions
@@ -68,6 +69,11 @@ typedef struct pr_info_s {
 	struct defspace_s *entity_data;		///< entity field address space. no
 										///< data is stored in the progs file
 	struct defspace_s *type_data;		///< encoded type information.
+	struct defspace_s *debug_data;		///< additional debug data.
+	struct strpool_s *comp_file_set;
+	struct DARRAY_TYPE (const char *) comp_files;
+	const char *comp_dir;
+	const char *unit_name;
 
 	struct symtab_s *symtab;
 	struct symtab_s *entity_fields;
diff --git a/tools/qfcc/source/debug.c b/tools/qfcc/source/debug.c
index f56e177fb..d433304e2 100644
--- a/tools/qfcc/source/debug.c
+++ b/tools/qfcc/source/debug.c
@@ -44,10 +44,16 @@
 #include "QF/pr_comp.h"
 
 #include "debug.h"
+#include "def.h"
+#include "defspace.h"
 #include "diagnostic.h"
+#include "emit.h"
 #include "expr.h"
 #include "qfcc.h"
+#include "reloc.h"
 #include "strpool.h"
+#include "struct.h"
+#include "type.h"
 #include "value.h"
 
 int         lineno_base;
@@ -79,6 +85,17 @@ pop_source_file (void)
 	FREE (srclines, tmp);
 }
 
+#define Sys_Error(fmt...) internal_error(0, fmt)
+void
+add_source_file (const char *file)
+{
+	pr.source_file = ReuseString (file);
+	if (!strpool_findstr (pr.comp_file_set, file)) {
+		strpool_addstr (pr.comp_file_set, file);
+		DARRAY_APPEND (&pr.comp_files, save_string (file));
+	}
+}
+
 void
 line_info (char *text)
 {
@@ -111,7 +128,7 @@ line_info (char *text)
 	while (*p && *p != '\n')	// ignore rest
 		p++;
 	pr.source_line = line - 1;
-	pr.source_file = ReuseString (str);
+	add_source_file (str);
 }
 
 pr_lineno_t *
@@ -125,3 +142,67 @@ new_lineno (void)
 	memset (&pr.linenos[pr.num_linenos], 0, sizeof (pr_lineno_t));
 	return &pr.linenos[pr.num_linenos++];
 }
+
+static void
+emit_unit_name (def_t *def, void *data, int index)
+{
+	if (!is_string (def->type)) {
+		internal_error (0, "%s: expected string def", __FUNCTION__);
+	}
+	EMIT_STRING (def->space, D_STRING (def), pr.unit_name);
+}
+
+static void
+emit_basedir (def_t *def, void *data, int index)
+{
+	if (!is_string (def->type)) {
+		internal_error (0, "%s: expected string def", __FUNCTION__);
+	}
+	EMIT_STRING (def->space, D_STRING (def), pr.comp_dir);
+}
+
+static void
+emit_num_files (def_t *def, void *data, int index)
+{
+	if (!is_integer (def->type)) {
+		internal_error (0, "%s: expected int def", __FUNCTION__);
+	}
+	D_INT (def) = pr.comp_files.size;
+}
+
+static void
+emit_files_item (def_t *def, void *data, int index)
+{
+	if (!is_array (def->type) || !is_string (def->type->t.array.type)) {
+		internal_error (0, "%s: expected array of string def", __FUNCTION__);
+	}
+	if ((unsigned) index >= pr.comp_files.size) {
+		internal_error (0, "%s: out of bounds index: %d %zd",
+						__FUNCTION__, index, pr.comp_files.size);
+	}
+	EMIT_STRING (def->space, D_STRING (def), pr.comp_files.a[index]);
+}
+
+static def_t *
+emit_compunit (const char *modname)
+{
+	static struct_def_t compunit_struct[] = {
+		{"unit_name",	&type_string,	emit_unit_name},
+		{"basedir",		&type_string,	emit_basedir},
+		{"num_files",	&type_integer,	emit_num_files},
+		{"files",		0,				emit_files_item},
+		{0, 0}
+	};
+	int         count = pr.comp_files.size;
+
+	pr.unit_name = modname;
+	compunit_struct[3].type = array_type (&type_string, count);
+	return emit_structure ("compile_unit", 's', compunit_struct, 0, &pr,
+						   pr.debug_data, sc_static);
+}
+
+void
+debug_finish_module (const char *modname)
+{
+	emit_compunit (modname);
+}
diff --git a/tools/qfcc/source/linker.c b/tools/qfcc/source/linker.c
index 51f03f948..06fd67cb1 100644
--- a/tools/qfcc/source/linker.c
+++ b/tools/qfcc/source/linker.c
@@ -154,6 +154,7 @@ static defspace_t *work_near_data;
 static defspace_t *work_far_data;
 static defspace_t *work_entity_data;
 static defspace_t *work_type_data;
+static defspace_t *work_debug_data;
 static qfo_reloc_t *work_loose_relocs;
 static int work_num_loose_relocs;
 
@@ -163,6 +164,7 @@ static defspace_t **work_spaces[qfo_num_spaces] = {
 	&work_far_data,
 	&work_entity_data,
 	&work_type_data,
+	&work_debug_data,
 };
 
 static dstring_t *linker_current_file;
@@ -684,6 +686,7 @@ linker_begin (void)
 	work_far_data = defspace_new (ds_backed);
 	work_entity_data = defspace_new (ds_virtual);
 	work_type_data = defspace_new (ds_backed);
+	work_debug_data = defspace_new (ds_backed);
 
 	pr.strings = work_strings;
 
@@ -709,6 +712,9 @@ linker_begin (void)
 	work->spaces[qfo_type_space].type = qfos_type;
 	work->spaces[qfo_type_space].d.data = work_type_data->data;
 	work->spaces[qfo_type_space].data_size = work_type_data->size;
+	work->spaces[qfo_debug_space].type = qfos_debug;
+	work->spaces[qfo_debug_space].d.data = work_type_data->data;
+	work->spaces[qfo_debug_space].data_size = work_type_data->size;
 	for (i = 0; i < qfo_num_spaces; i++)
 		work->spaces[i].id = i;
 
@@ -906,6 +912,20 @@ process_type_space (qfo_t *qfo, qfo_mspace_t *space, int pass)
 	return 0;
 }
 
+static int
+process_debug_space (qfo_t *qfo, qfo_mspace_t *space, int pass)
+{
+	if (pass != 1)
+		return 0;
+	if (space->type != qfos_debug) {
+		linker_internal_error ("bad space type for add_data_space (): %d",
+							   space->type);
+	}
+	add_defs (qfo, space, work->spaces + qfo_debug_space, process_data_def);
+	add_data (qfo_debug_space, space);
+	return 0;
+}
+
 static void
 process_funcs (qfo_t *qfo)
 {
@@ -1002,6 +1022,7 @@ linker_add_qfo (qfo_t *qfo)
 		process_strings_space,
 		process_entity_space,
 		process_type_space,
+		process_debug_space,
 	};
 	unsigned    i;
 	int         pass;
@@ -1014,7 +1035,7 @@ linker_add_qfo (qfo_t *qfo)
 	work_func_base = work->num_funcs;
 	for (pass = 0; pass < 2; pass++) {
 		for (i = 0, space = qfo->spaces; i < qfo->num_spaces; i++, space++) {
-			if ((int) space->type < 0 || space->type > qfos_type) {
+			if ((int) space->type < 0 || space->type > qfos_debug) {
 				linker_error ("bad space type");
 				return 1;
 			}
diff --git a/tools/qfcc/source/obj_file.c b/tools/qfcc/source/obj_file.c
index b6e3e6f82..a7e419c62 100644
--- a/tools/qfcc/source/obj_file.c
+++ b/tools/qfcc/source/obj_file.c
@@ -183,6 +183,7 @@ qfo_count_stuff (qfo_t *qfo, pr_info_t *pr)
 	qfo_count_space_stuff (qfo, pr->far_data);
 	qfo_count_space_stuff (qfo, pr->entity_data);
 	qfo_count_space_stuff (qfo, pr->type_data);
+	qfo_count_space_stuff (qfo, pr->debug_data);
 	qfo_count_function_stuff (qfo, pr->func_head);
 	qfo->num_relocs += count_relocs (pr->relocs);
 }
@@ -269,6 +270,24 @@ qfo_init_type_space (qfo_t *qfo, qfo_def_t **defs, qfo_reloc_t **relocs,
 	space->id = qfo_type_space;
 }
 
+static void
+qfo_init_debug_space (qfo_t *qfo, qfo_def_t **defs, qfo_reloc_t **relocs,
+					  qfo_mspace_t *space, defspace_t *data)
+{
+	size_t      size = data->size * sizeof (*data->data);
+	data->qfo_space = space - qfo->spaces;
+	space->type = qfos_debug;
+	space->defs = *defs;
+	space->num_defs = qfo_encode_defs (qfo, data->defs, defs, relocs);
+	space->d.data = 0;
+	if (data->data) {
+		space->d.data = malloc (size);
+		memcpy (space->d.data, data->data, size);
+	}
+	space->data_size = data->size;
+	space->id = qfo_debug_space;
+}
+
 static void
 qfo_encode_functions (qfo_t *qfo, qfo_def_t **defs, qfo_reloc_t **relocs,
 					  qfo_mspace_t *space, function_t *functions)
@@ -333,6 +352,8 @@ qfo_from_progs (pr_info_t *pr)
 						   pr->entity_data);
 	qfo_init_type_space (qfo, &def, &reloc, &qfo->spaces[qfo_type_space],
 						 pr->type_data);
+	qfo_init_debug_space (qfo, &def, &reloc, &qfo->spaces[qfo_debug_space],
+						  pr->debug_data);
 
 	qfo_encode_functions (qfo, &def, &reloc, qfo->spaces + qfo_num_spaces,
 						  pr->func_head);
@@ -382,6 +403,8 @@ qfo_space_size (qfo_mspace_t *space)
 			return 0;
 		case qfos_type:
 			return space->data_size * sizeof (*space->d.data);
+		case qfos_debug:
+			return space->data_size * sizeof (*space->d.data);
 	}
 	return 0;
 }
@@ -407,6 +430,7 @@ qfo_byteswap_space (void *space, int size, qfos_type_t type)
 		case qfos_data:
 		case qfos_entity:
 		case qfos_type:
+		case qfos_debug:
 			for (val = (pr_type_t *) space, c = 0; c < size; c++, val++)
 				val->integer_var = LittleLong (val->integer_var);
 			break;
@@ -949,6 +973,7 @@ qfo_to_progs (qfo_t *qfo, int *size)
 	progs->numglobals += progs->numglobaldefs * type_size (&type_xdef);
 	progs->numglobals += progs->numfielddefs * type_size (&type_xdef);
 	progs->entityfields = qfo->spaces[qfo_entity_space].data_size;
+	// qfo_debug_space does not go in the progs file
 	*size += progs->numstatements * sizeof (dstatement_t);
 	*size += progs->numglobaldefs * sizeof (ddef_t);
 	*size += progs->numfielddefs * sizeof (ddef_t);
diff --git a/tools/qfcc/source/qfcc.c b/tools/qfcc/source/qfcc.c
index c606fb414..603c86377 100644
--- a/tools/qfcc/source/qfcc.c
+++ b/tools/qfcc/source/qfcc.c
@@ -141,6 +141,12 @@ InitData (void)
 		defspace_delete (pr.far_data);
 		defspace_delete (pr.entity_data);
 		defspace_delete (pr.type_data);
+		defspace_delete (pr.debug_data);
+		strpool_delete (pr.comp_file_set);
+	}
+
+	if (pr.comp_files.a) {
+		DARRAY_CLEAR (&pr.comp_files);
 	}
 
 	if (pr.linenos) {
@@ -173,6 +179,10 @@ InitData (void)
 	pr.type_data = defspace_new (ds_backed);
 	defspace_alloc_loc (pr.type_data, 4);// reserve space for a null descriptor
 
+	pr.debug_data = defspace_new (ds_backed);
+	pr.comp_file_set = strpool_new ();
+	DARRAY_INIT (&pr.comp_files, 16);
+
 	pr.symtab = new_symtab (0, stab_global);
 	pr.symtab->space = pr.near_data;
 	current_symtab = pr.symtab;
@@ -374,7 +384,8 @@ compile_to_obj (const char *file, const char *obj, lang_t lang)
 	InitData ();
 	chain_initial_types ();
 	begin_compilation ();
-	pr.source_file = ReuseString (file);
+	pr.comp_dir = save_cwd ();
+	add_source_file (file);
 	err = yyparse () || pr.error_count;
 	fclose (*yyin);
 	if (cpp_name && !options.save_temps) {
@@ -392,6 +403,7 @@ compile_to_obj (const char *file, const char *obj, lang_t lang)
 		class_finish_module ();
 		err = pr.error_count;
 		if (!err) {
+			debug_finish_module (obj);
 			qfo = qfo_from_progs (&pr);
 			err = qfo_write (qfo, obj);
 			qfo_delete (qfo);
@@ -630,7 +642,7 @@ compile_file (const char *filename)
 	if (!*yyin)
 		return !options.preprocess_only;
 
-	pr.source_file = ReuseString (filename);
+	add_source_file (filename);
 	pr.source_line = 1;
 	clear_frame_macros ();
 	err = yyparse () || pr.error_count;
@@ -774,6 +786,7 @@ progs_src_compile (void)
 	}
 
 	class_finish_module ();
+	debug_finish_module (options.output_file);
 	qfo = qfo_from_progs (&pr);
 	if (options.compile) {
 		qfo_write (qfo, options.output_file);

From 718f243f696e6af91c838dfc06635872f975e993 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 3 Apr 2020 15:58:22 +0900
Subject: [PATCH 1126/1519] [qfcc] Relocate loose string relocs when linking

This helps make partially linked object files make more sense when
looking at strings in data spaces.
---
 tools/qfcc/source/linker.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/qfcc/source/linker.c b/tools/qfcc/source/linker.c
index 06fd67cb1..dd0e48722 100644
--- a/tools/qfcc/source/linker.c
+++ b/tools/qfcc/source/linker.c
@@ -1009,6 +1009,9 @@ process_loose_relocs (qfo_t *qfo)
 		if (reloc->type == rel_def_op)
 			reloc->target += work_base[qfo_code_space];
 		adjust_reloc_offset (reloc);
+		if (reloc->type == rel_def_string) {
+			QFO_STRING (work, reloc->space, reloc->offset) = reloc->target;
+		}
 	}
 }
 

From 453c646d859009f6fba3144269a5454f29a1ad11 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 3 Apr 2020 19:54:25 +0900
Subject: [PATCH 1127/1519] [qfcc] Improve dependency checks for tests

They worked well if there was only one source file in the test, but
failed if there were two or more. While only typelinker needed the
enhanced macros, I got them all because I generally copy the nearest
block when adding a new test thus it's best if they're all "correct".
---
 tools/qfcc/test/Makefile.am | 220 +++++++++++++++++++++---------------
 1 file changed, 132 insertions(+), 88 deletions(-)

diff --git a/tools/qfcc/test/Makefile.am b/tools/qfcc/test/Makefile.am
index 2b454b7a5..9c5e0799c 100644
--- a/tools/qfcc/test/Makefile.am
+++ b/tools/qfcc/test/Makefile.am
@@ -122,102 +122,113 @@ r_depfiles_remade=
 
 address_cast_dat_SOURCES=address-cast.r
 address_cast_obj=$(address_cast_dat_SOURCES:.r=.qfo)
+address_cast_dep=$(addprefix ./$(DEPDIR)/,$(address_cast_obj:.qfo=.Qo))
 address-cast.dat$(EXEEXT): $(address_cast_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(address_cast_obj)
 address-cast.run: Makefile build-run
 	@$(srcdir)/build-run $@
-include ./$(DEPDIR)/address-cast.Qo # am--include-marker
-r_depfiles_remade += ./$(DEPDIR)/address-cast.Qo
+include $(address_cast_dep) # am--include-marker
+r_depfiles_remade += $(address_cast_dep)
 
 alignment_dat_SOURCES=alignment.r
 alignment_obj=$(alignment_dat_SOURCES:.r=.qfo)
+alignment_dep=$(addprefix ./$(DEPDIR)/,$(alignment_obj:.qfo=.Qo))
 alignment.dat$(EXEEXT): $(alignment_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(alignment_obj)
 alignment.run: Makefile build-run
 	@$(srcdir)/build-run $@
-include ./$(DEPDIR)/alignment.Qo # am--include-marker
-r_depfiles_remade += ./$(DEPDIR)/alignment.Qo
+include $(alignment_dep) # am--include-marker
+r_depfiles_remade += $(alignment_dep)
 
 anonstruct_dat_SOURCES=anonstruct.r
 anonstruct_obj=$(anonstruct_dat_SOURCES:.r=.qfo)
+anonstruct_dep=$(addprefix ./$(DEPDIR)/,$(anonstruct_obj:.qfo=.Qo))
 anonstruct.dat$(EXEEXT): $(anonstruct_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(anonstruct_obj)
 anonstruct.run: Makefile build-run
 	@$(srcdir)/build-run $@
-include ./$(DEPDIR)/anonstruct.Qo # am--include-marker
-r_depfiles_remade += ./$(DEPDIR)/anonstruct.Qo
+include $(anonstruct_dep) # am--include-marker
+r_depfiles_remade += $(anonstruct_dep)
 
 assignchain_dat_SOURCES=assignchain.r
 assignchain_obj=$(assignchain_dat_SOURCES:.r=.qfo)
+assignchain_dep=$(addprefix ./$(DEPDIR)/,$(assignchain_obj:.qfo=.Qo))
 assignchain.dat$(EXEEXT): $(assignchain_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(assignchain_obj)
 assignchain.run: Makefile build-run
 	@$(srcdir)/build-run $@
-include ./$(DEPDIR)/assignchain.Qo # am--include-marker
-r_depfiles_remade += ./$(DEPDIR)/assignchain.Qo
+include $(assignchain_dep) # am--include-marker
+r_depfiles_remade += $(assignchain_dep)
 
 chewed_alias_dat_SOURCES=chewed-alias.r
 chewed_alias_obj=$(chewed_alias_dat_SOURCES:.r=.qfo)
+chewed_alias_dep=$(addprefix ./$(DEPDIR)/,$(chewed_alias_obj:.qfo=.Qo))
 chewed-alias.dat$(EXEEXT): $(chewed_alias_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(chewed_alias_obj)
 chewed-alias.run: Makefile build-run
 	@$(srcdir)/build-run $@
-include ./$(DEPDIR)/chewed-alias.Qo # am--include-marker
-r_depfiles_remade += ./$(DEPDIR)/chewed-alias.Qo
+include $(chewed_alias_dep) # am--include-marker
+r_depfiles_remade += $(chewed_alias_dep)
 
 chewed_return_dat_SOURCES=chewed-return.r
 chewed_return_obj=$(chewed_return_dat_SOURCES:.r=.qfo)
+chewed_return_dep=$(addprefix ./$(DEPDIR)/,$(chewed_return_obj:.qfo=.Qo))
 chewed-return.dat$(EXEEXT): $(chewed_return_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(chewed_return_obj)
 chewed-return.run: Makefile build-run
 	@TEST_HARNESS_OPTS=--float $(srcdir)/build-run $@
-include ./$(DEPDIR)/chewed-return.Qo # am--include-marker
-r_depfiles_remade += ./$(DEPDIR)/chewed-return.Qo
+include $(chewed_return_dep) # am--include-marker
+r_depfiles_remade += $(chewed_return_dep)
 
 comma_expr_dat_SOURCES=comma-expr.r
 comma_expr_obj=$(comma_expr_dat_SOURCES:.r=.qfo)
+comma_expr_dep=$(addprefix ./$(DEPDIR)/,$(comma_expr_obj:.qfo=.Qo))
 comma-expr.dat$(EXEEXT): $(comma_expr_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(comma_expr_obj)
 comma-expr.run: Makefile build-run
 	@$(srcdir)/build-run $@
-include ./$(DEPDIR)/comma-expr.Qo # am--include-marker
-r_depfiles_remade += ./$(DEPDIR)/comma-expr.Qo
+include $(comma_expr_dep) # am--include-marker
+r_depfiles_remade += $(comma_expr_dep)
 
 compound_dat_SOURCES=compound.r
 compound_obj=$(compound_dat_SOURCES:.r=.qfo)
+compound_dep=$(addprefix ./$(DEPDIR)/,$(compound_obj:.qfo=.Qo))
 compound.dat$(EXEEXT): $(compound_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(compound_obj)
 compound.run: Makefile build-run
 	@$(srcdir)/build-run $@
-include ./$(DEPDIR)/compound.Qo # am--include-marker
-r_depfiles_remade += ./$(DEPDIR)/compound.Qo
+include $(compound_dep) # am--include-marker
+r_depfiles_remade += $(compound_dep)
 
 deadbool_dat_SOURCES=deadbool.r
 deadbool_obj=$(deadbool_dat_SOURCES:.r=.qfo)
+deadbool_dep=$(addprefix ./$(DEPDIR)/,$(deadbool_obj:.qfo=.Qo))
 deadbool.dat$(EXEEXT): $(deadbool_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(deadbool_obj)
 deadbool.run: Makefile build-run
 	@$(srcdir)/build-run $@
-include ./$(DEPDIR)/deadbool.Qo # am--include-marker
-r_depfiles_remade += ./$(DEPDIR)/deadbool.Qo
+include $(deadbool_dep) # am--include-marker
+r_depfiles_remade += $(deadbool_dep)
 
 double_dat_SOURCES=double.r
 double_obj=$(double_dat_SOURCES:.r=.qfo)
+double_dep=$(addprefix ./$(DEPDIR)/,$(double_obj:.qfo=.Qo))
 double.dat$(EXEEXT): $(double_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(double_obj)
 double.run: Makefile build-run
 	@$(srcdir)/build-run $@
-include ./$(DEPDIR)/double.Qo # am--include-marker
-r_depfiles_remade += ./$(DEPDIR)/double.Qo
+include $(double_dep) # am--include-marker
+r_depfiles_remade += $(double_dep)
 
 double_alias_dat_SOURCES=double-alias.r
 double_alias_obj=$(double_alias_dat_SOURCES:.r=.qfo)
+double_alias_dep=$(addprefix ./$(DEPDIR)/,$(double_alias_obj:.qfo=.Qo))
 double-alias.dat$(EXEEXT): $(double_alias_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(double_alias_obj)
 double-alias.run: Makefile build-run
 	@$(srcdir)/build-run $@
-include ./$(DEPDIR)/double-alias.Qo # am--include-marker
-r_depfiles_remade += ./$(DEPDIR)/double-alias.Qo
+include $(double_alias_dep) # am--include-marker
+r_depfiles_remade += $(double_alias_dep)
 
 classarray.run$(EXEEXT): classarray.r Makefile build-compile-fail-run
 	@$(srcdir)/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $<
@@ -254,300 +265,333 @@ double-float-compare.run$(EXEEXT): double-float-compare.r Makefile build-compile
 
 enum_dat_SOURCES=enum.r
 enum_obj=$(enum_dat_SOURCES:.r=.qfo)
+enum_dep=$(addprefix ./$(DEPDIR)/,$(enum_obj:.qfo=.Qo))
 enum.dat$(EXEEXT): $(enum_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(enum_obj)
 enum.run: Makefile build-run
 	@$(srcdir)/build-run $@
-include ./$(DEPDIR)/enum.Qo # am--include-marker
-r_depfiles_remade += ./$(DEPDIR)/enum.Qo
+include $(enum_dep) # am--include-marker
+r_depfiles_remade += $(enum_dep)
 
 fordecl_dat_SOURCES=fordecl.r
 fordecl_obj=$(fordecl_dat_SOURCES:.r=.qfo)
+fordecl_dep=$(addprefix ./$(DEPDIR)/,$(fordecl_obj:.qfo=.Qo))
 fordecl.dat$(EXEEXT): $(fordecl_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(fordecl_obj)
 fordecl.run: Makefile build-run
 	@$(srcdir)/build-run $@
-include ./$(DEPDIR)/fordecl.Qo # am--include-marker
-r_depfiles_remade += ./$(DEPDIR)/fordecl.Qo
+include $(fordecl_dep) # am--include-marker
+r_depfiles_remade += $(fordecl_dep)
 
 func_expr_dat_SOURCES=func-expr.r
 func_expr_obj=$(func_expr_dat_SOURCES:.r=.qfo)
+func_expr_dep=$(addprefix ./$(DEPDIR)/,$(func_expr_obj:.qfo=.Qo))
 func-expr.dat$(EXEEXT): $(func_expr_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(func_expr_obj)
 func-expr.run: Makefile build-run
 	@$(srcdir)/build-run $@
-include ./$(DEPDIR)/func-expr.Qo # am--include-marker
-r_depfiles_remade += ./$(DEPDIR)/func-expr.Qo
+include $(func_expr_dep) # am--include-marker
+r_depfiles_remade += $(func_expr_dep)
 
 func_expr2_dat_SOURCES=func-expr2.r
 func_expr2_obj=$(func_expr2_dat_SOURCES:.r=.qfo)
+func_expr2_dep=$(addprefix ./$(DEPDIR)/,$(func_expr2_obj:.qfo=.Qo))
 func-expr2.dat$(EXEEXT): $(func_expr2_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(func_expr2_obj)
 func-expr2.run: Makefile build-run
 	@$(srcdir)/build-run $@
-include ./$(DEPDIR)/func-expr2.Qo # am--include-marker
-r_depfiles_remade += ./$(DEPDIR)/func-expr2.Qo
+include $(func_expr2_dep) # am--include-marker
+r_depfiles_remade += $(func_expr2_dep)
 
 func_static_dat_SOURCES=func-static.r
 func_static_obj=$(func_static_dat_SOURCES:.r=.qfo)
+func_static_dep=$(addprefix ./$(DEPDIR)/,$(func_static_obj:.qfo=.Qo))
 func-static.dat$(EXEEXT): $(func_static_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(func_static_obj)
 func-static.run: Makefile build-run
 	@$(srcdir)/build-run $@
-include ./$(DEPDIR)/func-static.Qo # am--include-marker
-r_depfiles_remade += ./$(DEPDIR)/func-static.Qo
+include $(func_static_dep) # am--include-marker
+r_depfiles_remade += $(func_static_dep)
 
 gcd_dat_SOURCES=gcd.pas
 gcd_obj=$(gcd_dat_SOURCES:.pas=.qfo)
+gcd_dep=$(addprefix ./$(DEPDIR)/,$(gcd_obj:.qfo=.Qo))
 gcd.dat$(EXEEXT): $(gcd_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(gcd_obj)
 gcd.run: Makefile build-run
 	@$(srcdir)/build-run $@
-include ./$(DEPDIR)/gcd.Qo # am--include-marker
-r_depfiles_remade += ./$(DEPDIR)/gcd.Qo
+include $(gcd_dep) # am--include-marker
+r_depfiles_remade += $(gcd_dep)
 
 infloop_dat_SOURCES=infloop.r
 infloop_obj=$(infloop_dat_SOURCES:.r=.qfo)
+infloop_dep=$(addprefix ./$(DEPDIR)/,$(infloop_obj:.qfo=.Qo))
 infloop.dat$(EXEEXT): $(infloop_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(infloop_obj)
 infloop.run: Makefile build-run
 	@$(srcdir)/build-run $@
-include ./$(DEPDIR)/infloop.Qo # am--include-marker
-r_depfiles_remade += ./$(DEPDIR)/infloop.Qo
+include $(infloop_dep) # am--include-marker
+r_depfiles_remade += $(infloop_dep)
 
 ivar_struct_return_dat_SOURCES=ivar-struct-return.r
 ivar_struct_return_obj=$(ivar_struct_return_dat_SOURCES:.r=.qfo)
+ivar_struct_return_dep=$(addprefix ./$(DEPDIR)/,$(ivar_struct_return_obj:.qfo=.Qo))
 ivar-struct-return.dat$(EXEEXT): $(ivar_struct_return_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(ivar_struct_return_obj)
 ivar-struct-return.run: Makefile build-run
 	@$(srcdir)/build-run $@
-include ./$(DEPDIR)/ivar-struct-return.Qo # am--include-marker
-r_depfiles_remade += ./$(DEPDIR)/ivar-struct-return.Qo
+include $(ivar_struct_return_dep) # am--include-marker
+r_depfiles_remade += $(ivar_struct_return_dep)
 
 methodparams_dat_SOURCES=methodparams.r
 methodparams_obj=$(methodparams_dat_SOURCES:.r=.qfo)
+methodparams_dep=$(addprefix ./$(DEPDIR)/,$(methodparams_obj:.qfo=.Qo))
 methodparams.dat$(EXEEXT): $(methodparams_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(methodparams_obj)
 methodparams.run: Makefile build-run
 	@$(srcdir)/build-run $@
-include ./$(DEPDIR)/methodparams.Qo # am--include-marker
-r_depfiles_remade += ./$(DEPDIR)/methodparams.Qo
+include $(methodparams_dep) # am--include-marker
+r_depfiles_remade += $(methodparams_dep)
 
 modulo_dat_SOURCES=modulo.r
 modulo_obj=$(modulo_dat_SOURCES:.r=.qfo)
+modulo_dep=$(addprefix ./$(DEPDIR)/,$(modulo_obj:.qfo=.Qo))
 modulo.dat$(EXEEXT): $(modulo_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(modulo_obj)
 modulo.run: Makefile build-run
 	@TEST_HARNESS_OPTS=--float $(srcdir)/build-run $@
-include ./$(DEPDIR)/modulo.Qo # am--include-marker
-r_depfiles_remade += ./$(DEPDIR)/modulo.Qo
+include $(modulo_dep) # am--include-marker
+r_depfiles_remade += $(modulo_dep)
 
 nilparamret_dat_SOURCES=nilparamret.r
 nilparamret_obj=$(nilparamret_dat_SOURCES:.r=.qfo)
+nilparamret_dep=$(addprefix ./$(DEPDIR)/,$(nilparamret_obj:.qfo=.Qo))
 nilparamret.dat$(EXEEXT): $(nilparamret_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(nilparamret_obj)
 nilparamret.run: Makefile build-run
 	@$(srcdir)/build-run $@
-include ./$(DEPDIR)/nilparamret.Qo # am--include-marker
-r_depfiles_remade += ./$(DEPDIR)/nilparamret.Qo
+include $(nilparamret_dep) # am--include-marker
+r_depfiles_remade += $(nilparamret_dep)
 
 overload_dat_SOURCES=overload.r
 overload_obj=$(overload_dat_SOURCES:.r=.qfo)
+overload_dep=$(addprefix ./$(DEPDIR)/,$(overload_obj:.qfo=.Qo))
 overload.dat$(EXEEXT): $(overload_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(overload_obj)
 overload.run: Makefile build-run
 	@$(srcdir)/build-run $@
-include ./$(DEPDIR)/overload.Qo # am--include-marker
-r_depfiles_remade += ./$(DEPDIR)/overload.Qo
+include $(overload_dep) # am--include-marker
+r_depfiles_remade += $(overload_dep)
 
 paramret_dat_SOURCES=paramret.r
 paramret_obj=$(paramret_dat_SOURCES:.r=.qfo)
+paramret_dep=$(addprefix ./$(DEPDIR)/,$(paramret_obj:.qfo=.Qo))
 paramret.dat$(EXEEXT): $(paramret_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(paramret_obj)
 paramret.run: Makefile build-run
 	@$(srcdir)/build-run $@
-include ./$(DEPDIR)/paramret.Qo # am--include-marker
-r_depfiles_remade += ./$(DEPDIR)/paramret.Qo
+include $(paramret_dep) # am--include-marker
+r_depfiles_remade += $(paramret_dep)
 
 quaternion_dat_SOURCES=quaternion.r
 quaternion_obj=$(quaternion_dat_SOURCES:.r=.qfo)
+quaternion_dep=$(addprefix ./$(DEPDIR)/,$(quaternion_obj:.qfo=.Qo))
 quaternion.dat$(EXEEXT): $(quaternion_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(quaternion_obj)
 quaternion.run: Makefile build-run
 	@$(srcdir)/build-run $@
-include ./$(DEPDIR)/quaternion.Qo # am--include-marker
-r_depfiles_remade += ./$(DEPDIR)/quaternion.Qo
+include $(quaternion_dep) # am--include-marker
+r_depfiles_remade += $(quaternion_dep)
 
 return_ivar_dat_SOURCES=return-ivar.r
 return_ivar_obj=$(return_ivar_dat_SOURCES:.r=.qfo)
+return_ivar_dep=$(addprefix ./$(DEPDIR)/,$(return_ivar_obj:.qfo=.Qo))
 return-ivar.dat$(EXEEXT): $(return_ivar_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(return_ivar_obj)
 return-ivar.run: Makefile build-run
 	@$(srcdir)/build-run $@
-include ./$(DEPDIR)/return-ivar.Qo # am--include-marker
-r_depfiles_remade += ./$(DEPDIR)/return-ivar.Qo
+include $(return_ivar_dep) # am--include-marker
+r_depfiles_remade += $(return_ivar_dep)
 
 sendv_dat_SOURCES=sendv.r
 sendv_obj=$(sendv_dat_SOURCES:.r=.qfo)
+sendv_dep=$(addprefix ./$(DEPDIR)/,$(sendv_obj:.qfo=.Qo))
 sendv.dat$(EXEEXT): $(sendv_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(sendv_obj)
 sendv.run: Makefile build-run
 	@$(srcdir)/build-run $@
-include ./$(DEPDIR)/sendv.Qo # am--include-marker
-r_depfiles_remade += ./$(DEPDIR)/sendv.Qo
+include $(sendv_dep) # am--include-marker
+r_depfiles_remade += $(sendv_dep)
 
 state_dat_SOURCES=state.r
 state_obj=$(state_dat_SOURCES:.r=.qfo)
+state_dep=$(addprefix ./$(DEPDIR)/,$(state_obj:.qfo=.Qo))
 state.dat$(EXEEXT): $(state_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(state_obj)
 state.run: Makefile build-run
 	@$(srcdir)/build-run $@
-include ./$(DEPDIR)/state.Qo # am--include-marker
-r_depfiles_remade += ./$(DEPDIR)/state.Qo
+include $(state_dep) # am--include-marker
+r_depfiles_remade += $(state_dep)
 
 struct_init_param_dat_SOURCES=struct-init-param.r
 struct_init_param_obj=$(struct_init_param_dat_SOURCES:.r=.qfo)
+struct_init_param_dep=$(addprefix ./$(DEPDIR)/,$(struct_init_param_obj:.qfo=.Qo))
 struct-init-param.dat$(EXEEXT): $(struct_init_param_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(struct_init_param_obj)
 struct-init-param.run: Makefile build-run
 	@$(srcdir)/build-run $@
-include ./$(DEPDIR)/struct-init-param.Qo # am--include-marker
-r_depfiles_remade += ./$(DEPDIR)/struct-init-param.Qo
+include $(struct_init_param_dep) # am--include-marker
+r_depfiles_remade += $(struct_init_param_dep)
 
 struct_nil_init_dat_SOURCES=struct-nil-init.r
 struct_nil_init_obj=$(struct_nil_init_dat_SOURCES:.r=.qfo)
+struct_nil_init_dep=$(addprefix ./$(DEPDIR)/,$(struct_nil_init_obj:.qfo=.Qo))
 struct-nil-init.dat$(EXEEXT): $(struct_nil_init_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(struct_nil_init_obj)
 struct-nil-init.run: Makefile build-run
 	@$(srcdir)/build-run $@
-include ./$(DEPDIR)/struct-nil-init.Qo # am--include-marker
-r_depfiles_remade += ./$(DEPDIR)/struct-nil-init.Qo
+include $(struct_nil_init_dep) # am--include-marker
+r_depfiles_remade += $(struct_nil_init_dep)
 
 structarray_dat_SOURCES=structarray.r
 structarray_obj=$(structarray_dat_SOURCES:.r=.qfo)
+structarray_dep=$(addprefix ./$(DEPDIR)/,$(structarray_obj:.qfo=.Qo))
 structarray.dat$(EXEEXT): $(structarray_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(structarray_obj)
 structarray.run: Makefile build-run
 	@$(srcdir)/build-run $@
-include ./$(DEPDIR)/structarray.Qo # am--include-marker
-r_depfiles_remade += ./$(DEPDIR)/structarray.Qo
+include $(structarray_dep) # am--include-marker
+r_depfiles_remade += $(structarray_dep)
 
 structlive_dat_SOURCES=structlive.r
 structlive_obj=$(structlive_dat_SOURCES:.r=.qfo)
+structlive_dep=$(addprefix ./$(DEPDIR)/,$(structlive_obj:.qfo=.Qo))
 structlive.dat$(EXEEXT): $(structlive_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(structlive_obj)
 structlive.run: Makefile build-run
 	@$(srcdir)/build-run $@
-include ./$(DEPDIR)/structlive.Qo # am--include-marker
-r_depfiles_remade += ./$(DEPDIR)/structlive.Qo
+include $(structlive_dep) # am--include-marker
+r_depfiles_remade += $(structlive_dep)
 
 structptr_dat_SOURCES=structptr.r
 structptr_obj=$(structptr_dat_SOURCES:.r=.qfo)
+structptr_dep=$(addprefix ./$(DEPDIR)/,$(structptr_obj:.qfo=.Qo))
 structptr.dat$(EXEEXT): $(structptr_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(structptr_obj)
 structptr.run: Makefile build-run
 	@$(srcdir)/build-run $@
-include ./$(DEPDIR)/structptr.Qo # am--include-marker
-r_depfiles_remade += ./$(DEPDIR)/structptr.Qo
+include $(structptr_dep) # am--include-marker
+r_depfiles_remade += $(structptr_dep)
 
 structstruct_dat_SOURCES=structstruct.r
 structstruct_obj=$(structstruct_dat_SOURCES:.r=.qfo)
+structstruct_dep=$(addprefix ./$(DEPDIR)/,$(structstruct_obj:.qfo=.Qo))
 structstruct.dat$(EXEEXT): $(structstruct_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(structstruct_obj)
 structstruct.run: Makefile build-run
 	@$(srcdir)/build-run $@
-include ./$(DEPDIR)/structstruct.Qo # am--include-marker
-r_depfiles_remade += ./$(DEPDIR)/structstruct.Qo
+include $(structstruct_dep) # am--include-marker
+r_depfiles_remade += $(structstruct_dep)
 
 swap_dat_SOURCES=swap.r
 swap_obj=$(swap_dat_SOURCES:.r=.qfo)
+swap_dep=$(addprefix ./$(DEPDIR)/,$(swap_obj:.qfo=.Qo))
 swap.dat$(EXEEXT): $(swap_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(swap_obj)
 swap.run: Makefile build-run
 	@$(srcdir)/build-run $@
-include ./$(DEPDIR)/swap.Qo # am--include-marker
-r_depfiles_remade += ./$(DEPDIR)/swap.Qo
+include $(swap_dep) # am--include-marker
+r_depfiles_remade += $(swap_dep)
 
 triangle_dat_SOURCES=triangle.r
 triangle_obj=$(triangle_dat_SOURCES:.r=.qfo)
+triangle_dep=$(addprefix ./$(DEPDIR)/,$(triangle_obj:.qfo=.Qo))
 triangle.dat$(EXEEXT): $(triangle_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(triangle_obj)
 triangle.run: Makefile build-run
 	@$(srcdir)/build-run $@ 100000 100000 1.00005 50002.4961
-include ./$(DEPDIR)/triangle.Qo # am--include-marker
-r_depfiles_remade += ./$(DEPDIR)/triangle.Qo
+include $(triangle_dep) # am--include-marker
+r_depfiles_remade += $(triangle_dep)
 
 typedef_dat_SOURCES=typedef.r
 typedef_obj=$(typedef_dat_SOURCES:.r=.qfo)
+typedef_dep=$(addprefix ./$(DEPDIR)/,$(typedef_obj:.qfo=.Qo))
 typedef.dat$(EXEEXT): $(typedef_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(typedef_obj)
 typedef.run: Makefile build-run
 	@$(srcdir)/build-run $@
-include ./$(DEPDIR)/typedef.Qo # am--include-marker
-r_depfiles_remade += ./$(DEPDIR)/typedef.Qo
+include $(typedef_dep) # am--include-marker
+r_depfiles_remade += $(typedef_dep)
 
 typelinker_dat_SOURCES=typelinker_a.r typelinker_b.r
 typelinker_obj=$(typelinker_dat_SOURCES:.r=.qfo)
+typelinker_dep=$(addprefix ./$(DEPDIR)/,$(typelinker_obj:.qfo=.Qo))
 typelinker.dat$(EXEEXT): $(typelinker_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(typelinker_obj)
 typelinker.run: Makefile build-run
 	@$(srcdir)/build-run $@
-include ./$(DEPDIR)/typelinker.Qo # am--include-marker
-r_depfiles_remade += ./$(DEPDIR)/typelinker.Qo
+include $(typelinker_dep) # am--include-marker
+r_depfiles_remade += $(typelinker_dep)
 
 vecaddr_dat_SOURCES=vecaddr.r
 vecaddr_obj=$(vecaddr_dat_SOURCES:.r=.qfo)
+vecaddr_dep=$(addprefix ./$(DEPDIR)/,$(vecaddr_obj:.qfo=.Qo))
 vecaddr.dat$(EXEEXT): $(vecaddr_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(vecaddr_obj)
 vecaddr.run: Makefile build-run
 	@$(srcdir)/build-run $@
-include ./$(DEPDIR)/vecaddr.Qo # am--include-marker
-r_depfiles_remade += ./$(DEPDIR)/vecaddr.Qo
+include $(vecaddr_dep) # am--include-marker
+r_depfiles_remade += $(vecaddr_dep)
 
 vecexpr_dat_SOURCES=vecexpr.r
 vecexpr_obj=$(vecexpr_dat_SOURCES:.r=.qfo)
+vecexpr_dep=$(addprefix ./$(DEPDIR)/,$(vecexpr_obj:.qfo=.Qo))
 vecexpr.dat$(EXEEXT): $(vecexpr_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(vecexpr_obj)
 vecexpr.run: Makefile build-run
 	@$(srcdir)/build-run $@
-include ./$(DEPDIR)/vecexpr.Qo # am--include-marker
-r_depfiles_remade += ./$(DEPDIR)/vecexpr.Qo
+include $(vecexpr_dep) # am--include-marker
+r_depfiles_remade += $(vecexpr_dep)
 
 vecinit_dat_SOURCES=vecinit.r
 vecinit_obj=$(vecinit_dat_SOURCES:.r=.qfo)
+vecinit_dep=$(addprefix ./$(DEPDIR)/,$(vecinit_obj:.qfo=.Qo))
 vecinit.dat$(EXEEXT): $(vecinit_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(vecinit_obj)
 vecinit.run: Makefile build-run
 	@$(srcdir)/build-run $@
-include ./$(DEPDIR)/vecinit.Qo # am--include-marker
-r_depfiles_remade += ./$(DEPDIR)/vecinit.Qo
+include $(vecinit_dep) # am--include-marker
+r_depfiles_remade += $(vecinit_dep)
 
 voidfor_dat_SOURCES=voidfor.r
 voidfor_obj=$(voidfor_dat_SOURCES:.r=.qfo)
+voidfor_dep=$(addprefix ./$(DEPDIR)/,$(voidfor_obj:.qfo=.Qo))
 voidfor.dat$(EXEEXT): $(voidfor_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(voidfor_obj)
 voidfor.run: Makefile build-run
 	@$(srcdir)/build-run $@
-include ./$(DEPDIR)/voidfor.Qo # am--include-marker
-r_depfiles_remade += ./$(DEPDIR)/voidfor.Qo
+include $(voidfor_dep) # am--include-marker
+r_depfiles_remade += $(voidfor_dep)
 
 while_dat_SOURCES=while.r
 while_obj=$(while_dat_SOURCES:.r=.qfo)
+while_dep=$(addprefix ./$(DEPDIR)/,$(while_obj:.qfo=.Qo))
 while.dat$(EXEEXT): $(while_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(while_obj)
 while.run: Makefile build-run
 	@$(srcdir)/build-run $@
-include ./$(DEPDIR)/while.Qo # am--include-marker
-r_depfiles_remade += ./$(DEPDIR)/while.Qo
+include $(while_dep) # am--include-marker
+r_depfiles_remade += $(while_dep)
 
 zerolinker_dat_SOURCES=zerolinker.r
 zerolinker_obj=$(zerolinker_dat_SOURCES:.r=.qfo)
+zerolinker_dep=$(addprefix ./$(DEPDIR)/,$(zerolinker_obj:.qfo=.Qo))
 zerolinker.dat$(EXEEXT): $(zerolinker_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(zerolinker_obj)
 zerolinker.run: Makefile build-run
 	@$(srcdir)/build-run $@
-include ./$(DEPDIR)/zerolinker.Qo # am--include-marker
-r_depfiles_remade += ./$(DEPDIR)/zerolinker.Qo
+include $(zerolinker_dep) # am--include-marker
+r_depfiles_remade += $(zerolinker_dep)
 
 $(r_depfiles_remade):
 	@$(MKDIR_P) $(@D)

From 9400b9b1158e5a09d02fbfd48e900a1fab48fa3b Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 3 Apr 2020 19:56:07 +0900
Subject: [PATCH 1128/1519] [qfcc] Add a leading . to the compile_unit def

---
 tools/qfcc/source/debug.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/qfcc/source/debug.c b/tools/qfcc/source/debug.c
index d433304e2..7086f44dc 100644
--- a/tools/qfcc/source/debug.c
+++ b/tools/qfcc/source/debug.c
@@ -197,7 +197,7 @@ emit_compunit (const char *modname)
 
 	pr.unit_name = modname;
 	compunit_struct[3].type = array_type (&type_string, count);
-	return emit_structure ("compile_unit", 's', compunit_struct, 0, &pr,
+	return emit_structure (".compile_unit", 's', compunit_struct, 0, &pr,
 						   pr.debug_data, sc_static);
 }
 

From 7c5c4625875547003ee7c11c196008d4e625ff03 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 3 Apr 2020 21:25:47 +0900
Subject: [PATCH 1129/1519] [qfcc] Write debug data space to sym file

This should keep things nicely extensible, since additional data can be
done in the data space and found using defs. This gets the compilation
units into the sym file.
---
 include/QF/pr_debug.h        |  6 +++++-
 tools/qfcc/source/obj_file.c | 42 +++++++++++++++++++++++++++---------
 tools/qfcc/source/qfcc.c     | 24 +++++++++++++++++----
 3 files changed, 57 insertions(+), 15 deletions(-)

diff --git a/include/QF/pr_debug.h b/include/QF/pr_debug.h
index ab10b62a2..4015f6f65 100644
--- a/include/QF/pr_debug.h
+++ b/include/QF/pr_debug.h
@@ -58,7 +58,7 @@ typedef struct pr_lineno_s {
 	pr_uint_t   line;
 } pr_lineno_t;
 
-#define PROG_DEBUG_VERSION 0x00001003	// MMmmmRRR 0.001.002 (hex)
+#define PROG_DEBUG_VERSION 0x00001004	// MMmmmRRR 0.001.004 (hex)
 
 typedef struct pr_debug_header_s {
 	pr_int_t    version;
@@ -70,6 +70,10 @@ typedef struct pr_debug_header_s {
 	pr_uint_t   num_linenos;
 	pr_uint_t   locals;
 	pr_uint_t   num_locals;
+	pr_uint_t   debug_defs;
+	pr_uint_t   num_debug_defs;
+	pr_uint_t   debug_data;
+	pr_uint_t   debug_data_size;
 } pr_debug_header_t;
 #endif
 
diff --git a/tools/qfcc/source/obj_file.c b/tools/qfcc/source/obj_file.c
index a7e419c62..dcc1543d4 100644
--- a/tools/qfcc/source/obj_file.c
+++ b/tools/qfcc/source/obj_file.c
@@ -813,7 +813,7 @@ function_params (qfo_t *qfo, qfo_func_t *func, dfunction_t *df)
 }
 
 static void
-convert_def (qfo_t *qfo, const qfo_def_t *def, ddef_t *ddef)
+qfo_def_to_ddef (qfo_t *qfo, const qfo_def_t *def, ddef_t *ddef)
 {
 	ddef->type = get_def_type (qfo, def->type);
 	ddef->ofs = def->offset;
@@ -826,6 +826,16 @@ convert_def (qfo_t *qfo, const qfo_def_t *def, ddef_t *ddef)
 		ddef->type |= DEF_SAVEGLOBAL;
 }
 
+static void
+qfo_def_to_prdef (qfo_t *qfo, const qfo_def_t *def, pr_def_t *prdef)
+{
+	prdef->type = get_def_type (qfo, def->type);
+	prdef->size = get_type_size (qfo, def->type);
+	prdef->ofs = def->offset;
+	prdef->name = def->name;
+	prdef->type_encoding = def->type;
+}
+
 static void
 qfo_relocate_refs (qfo_t *qfo)
 {
@@ -1072,14 +1082,14 @@ qfo_to_progs (qfo_t *qfo, int *size)
 			types_def = def;
 		if (!strcmp (defname, ".xdefs"))
 			xdefs_def = def;
-		convert_def (qfo, def, globaldefs++);
+		qfo_def_to_ddef (qfo, def, globaldefs++);
 	}
 
 	for (i = 0; i < qfo->spaces[qfo_far_data_space].num_defs; i++) {
 		unsigned    ind = far_def_indices[i];
 		qfo_def_t  *def = qfo->spaces[qfo_far_data_space].defs + ind;
 		def->offset += far_data - globals;
-		convert_def (qfo, def, globaldefs);
+		qfo_def_to_ddef (qfo, def, globaldefs);
 		// the correct offset will be written to the far data space
 		globaldefs->ofs = -1;
 		globaldefs++;
@@ -1091,7 +1101,7 @@ qfo_to_progs (qfo_t *qfo, int *size)
 
 	for (i = 0; i < qfo->spaces[qfo_entity_space].num_defs; i++) {
 		unsigned    ind = field_def_indices[i];
-		convert_def (qfo, qfo->spaces[qfo_entity_space].defs + ind,
+		qfo_def_to_ddef (qfo, qfo->spaces[qfo_entity_space].defs + ind,
 					 fielddefs + i);
 	}
 
@@ -1192,7 +1202,8 @@ qfo_to_sym (qfo_t *qfo, int *size)
 	pr_auxfunction_t *auxfuncs;
 	pr_auxfunction_t *aux;
 	pr_lineno_t *linenos;
-	pr_def_t   *locals, *ld;
+	pr_def_t   *locals, *ld, *debug_defs;
+	pr_type_t  *debug_data;
 
 	*size = sizeof (pr_debug_header_t);
 	sym = calloc (1, *size);
@@ -1210,19 +1221,27 @@ qfo_to_sym (qfo_t *qfo, int *size)
 		sym->num_locals += num_locals;
 	}
 	sym->num_linenos = qfo->num_lines;
+	sym->num_debug_defs = qfo->spaces[qfo_debug_space].num_defs;
+	sym->debug_data_size = qfo->spaces[qfo_debug_space].data_size;
 
 	*size += sym->num_auxfunctions * sizeof (pr_auxfunction_t);
 	*size += sym->num_linenos * sizeof (pr_lineno_t);
 	*size += sym->num_locals * sizeof (pr_def_t);
+	*size += sym->num_debug_defs * sizeof (pr_def_t);
+	*size += sym->debug_data_size * sizeof (pr_type_t);
 	sym = realloc (sym, *size);
 
 	auxfuncs = (pr_auxfunction_t *)(sym + 1);
 	linenos = (pr_lineno_t *)(auxfuncs + sym->num_auxfunctions);
 	locals = (pr_def_t *)(linenos + sym->num_linenos);
+	debug_defs = locals + sym->num_locals;
+	debug_data = (pr_type_t *)(debug_defs + sym->num_debug_defs);
 
 	sym->auxfunctions = (char *) auxfuncs - (char *) sym;
 	sym->linenos = (char *) linenos - (char *) sym;
 	sym->locals = (char *) locals - (char *) sym;
+	sym->debug_defs = (char *) debug_defs - (char *) sym;
+	sym->debug_data = (char *) debug_data - (char *) sym;
 
 	ld = locals;
 
@@ -1247,11 +1266,7 @@ qfo_to_sym (qfo_t *qfo, int *size)
 		if (num_locals) {
 			aux->local_defs = ld - locals;
 			for (j = 0; j < num_locals; j++, def++, ld++) {
-				ld->type = get_def_type (qfo, def->type);
-				ld->size = get_type_size (qfo, def->type);
-				ld->ofs = def->offset;
-				ld->name = def->name;
-				ld->type_encoding = def->type;
+				qfo_def_to_prdef (qfo, def, ld);
 			}
 		}
 		aux->num_locals = num_locals;
@@ -1265,5 +1280,12 @@ qfo_to_sym (qfo_t *qfo, int *size)
 		aux++;
 	}
 	memcpy (linenos, qfo->lines, qfo->num_lines * sizeof (pr_lineno_t));
+	for (i = 0; i < sym->num_debug_defs; i++) {
+		qfo_def_t  *def = &qfo->spaces[qfo_debug_space].defs[i];
+		pr_def_t   *prdef = &debug_defs[i];
+		qfo_def_to_prdef (qfo, def, prdef);
+	}
+	memcpy (debug_data, qfo->spaces[qfo_debug_space].d.data,
+			sym->debug_data_size * sizeof (*debug_data));
 	return sym;
 }
diff --git a/tools/qfcc/source/qfcc.c b/tools/qfcc/source/qfcc.c
index 603c86377..c0739e9f0 100644
--- a/tools/qfcc/source/qfcc.c
+++ b/tools/qfcc/source/qfcc.c
@@ -266,12 +266,16 @@ WriteSym (pr_debug_header_t *sym, int size)
 
 	pr_auxfunction_t *auxfunctions;
 	pr_lineno_t *linenos;
-	ddef_t     *locals;
+	pr_def_t   *locals;
+	pr_def_t   *debug_defs;
+	pr_type_t  *debug_data;
 
 #define P(t,o) ((t *)((char *)sym + sym->o))
 	auxfunctions = P (pr_auxfunction_t, auxfunctions);
 	linenos = P (pr_lineno_t, linenos);
-	locals = P (ddef_t, locals);
+	locals = P (pr_def_t, locals);
+	debug_defs = P (pr_def_t, debug_defs);
+	debug_data = P (pr_type_t, debug_data);
 #undef P
 
 	for (i = 0; i < sym->num_auxfunctions; i++) {
@@ -290,8 +294,20 @@ WriteSym (pr_debug_header_t *sym, int size)
 	}
 	for (i = 0; i < sym->num_locals; i++) {
 		locals[i].type = LittleShort (locals[i].type);
-		locals[i].ofs = LittleShort (locals[i].ofs);
-		locals[i].s_name = LittleLong (locals[i].s_name);
+		locals[i].size = LittleShort (locals[i].size);
+		locals[i].ofs = LittleLong (locals[i].ofs);
+		locals[i].name = LittleLong (locals[i].name);
+		locals[i].type_encoding = LittleLong (locals[i].type_encoding);
+	}
+	for (i = 0; i < sym->num_debug_defs; i++) {
+		debug_defs[i].type = LittleShort (debug_defs[i].type);
+		debug_defs[i].size = LittleShort (debug_defs[i].size);
+		debug_defs[i].ofs = LittleLong (debug_defs[i].ofs);
+		debug_defs[i].name = LittleLong (debug_defs[i].name);
+		debug_defs[i].type_encoding = LittleLong (debug_defs[i].type_encoding);
+	}
+	for (i = 0; i < sym->debug_data_size; i++) {
+		debug_data[i].integer_var = LittleLong (debug_data[i].integer_var);
 	}
 
 	if (!(h = Qopen (options.debug_file, "wb")))

From fbbe144399f76a9f9b56ea2ad8cc702ad2a4cca9 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 3 Apr 2020 22:35:55 +0900
Subject: [PATCH 1130/1519] [gamecode] Clean up some stray "struct"

Left over from moving debug data from progs.h to pr_debug.c
---
 libs/gamecode/pr_debug.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libs/gamecode/pr_debug.c b/libs/gamecode/pr_debug.c
index 61e45ce8b..90f936013 100644
--- a/libs/gamecode/pr_debug.c
+++ b/libs/gamecode/pr_debug.c
@@ -77,10 +77,10 @@ typedef struct prdeb_resources_s {
 	dstring_t  *line;
 	dstring_t  *dstr;
 	const char *debugfile;
-	struct pr_debug_header_s *debug;
-	struct pr_auxfunction_s *auxfunctions;
-	struct pr_auxfunction_s **auxfunction_map;
-	struct pr_lineno_s *linenos;
+	pr_debug_header_t *debug;
+	pr_auxfunction_t *auxfunctions;
+	pr_auxfunction_t **auxfunction_map;
+	pr_lineno_t *linenos;
 	pr_def_t   *local_defs;
 	pr_def_t   *type_encodings_def;
 	qfot_type_t void_type;

From 7bcfd2f2beaffb29556585c68ea6fedf69834355 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 3 Apr 2020 22:39:27 +0900
Subject: [PATCH 1131/1519] [gamecode] Move file_hash into debug resources

I don't remember why I didn't do this earlier when I thread-safed progs.
---
 libs/gamecode/pr_debug.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/libs/gamecode/pr_debug.c b/libs/gamecode/pr_debug.c
index 90f936013..f5f1650af 100644
--- a/libs/gamecode/pr_debug.c
+++ b/libs/gamecode/pr_debug.c
@@ -85,6 +85,7 @@ typedef struct prdeb_resources_s {
 	pr_def_t   *type_encodings_def;
 	qfot_type_t void_type;
 	qfot_type_t *type_encodings[ev_type_count];
+	hashtab_t  *file_hash;
 } prdeb_resources_t;
 
 typedef struct {
@@ -94,9 +95,8 @@ typedef struct {
 
 cvar_t         *pr_debug;
 cvar_t         *pr_source_path;
-static hashtab_t   *file_hash;
-static char        *source_path_string;
-static char       **source_paths;
+static char    *source_path_string;
+static char   **source_paths;
 
 static void pr_debug_void_view (qfot_type_t *type, pr_type_t *value,
 								void *_data);
@@ -345,6 +345,9 @@ pr_debug_clear (progs_t *pr, void *data)
 
 	if (res->debug)
 		pr->free_progs_mem (pr, res->debug);
+	if (res->file_hash) {
+		Hash_FlushTable (res->file_hash);
+	}
 	res->debug = 0;
 	res->auxfunctions = 0;
 	if (res->auxfunction_map)
@@ -368,7 +371,7 @@ PR_Load_Source_File (progs_t *pr, const char *fname)
 {
 	prdeb_resources_t *res = pr->pr_debug_resources;
 	char       *l, *p, **dir;
-	file_t     *f = Hash_Find (file_hash, fname);
+	file_t     *f = Hash_Find (res->file_hash, fname);
 
 	if (f)
 		return f;
@@ -415,7 +418,7 @@ PR_Load_Source_File (progs_t *pr, const char *fname)
 		f->num_lines++;
 	}
 	f->pr = pr;
-	Hash_Add (file_hash, f);
+	Hash_Add (res->file_hash, f);
 	return f;
 }
 
@@ -441,7 +444,6 @@ PR_LoadDebug (progs_t *pr)
 	if (def)
 		str = &pr->pr_globals[def->ofs];
 
-	Hash_FlushTable (file_hash);
 	if (!str)
 		return 1;
 	res->debugfile = PR_GetString (pr, str->string_var);
@@ -1613,12 +1615,10 @@ PR_Debug_Init (progs_t *pr)
 	for (int i = 0; i < ev_type_count; i++ ) {
 		res->type_encodings[i] = &res->void_type;
 	}
+	res->file_hash = Hash_NewTable (1024, file_get_key, file_free, 0,
+									pr->hashlink_freelist);
 
 	PR_Resources_Register (pr, "PR_Debug", res, pr_debug_clear);
-	if (!file_hash) {
-		file_hash = Hash_NewTable (1024, file_get_key, file_free, 0,
-								   pr->hashlink_freelist);
-	}
 	PR_AddLoadFunc (pr, PR_LoadDebug);
 }
 

From 686fc4c43e53a1b86d37242d5b0241e4e0ce88be Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 4 Apr 2020 10:58:53 +0900
Subject: [PATCH 1132/1519] [qwaq] Guard qwaq_debug_data with a pthread cond

I should have realized this would be prone to races.
---
 ruamoko/qwaq/builtins/debug.c | 30 ++++++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/ruamoko/qwaq/builtins/debug.c b/ruamoko/qwaq/builtins/debug.c
index 4fec2a1ac..2eb61e7b1 100644
--- a/ruamoko/qwaq/builtins/debug.c
+++ b/ruamoko/qwaq/builtins/debug.c
@@ -136,6 +136,24 @@ qwaq_debug_handler (prdebug_t debug_event, void *param, void *data)
 	}
 }
 
+//FIXME need a better way to get this from one thread to the others
+pthread_cond_t debug_data_cond = PTHREAD_COND_INITIALIZER;
+pthread_mutex_t debug_data_mutex = PTHREAD_MUTEX_INITIALIZER;
+static qwaq_debug_t *qwaq_debug_data;
+
+static int
+qwaq_debug_load (progs_t *pr)
+{
+	__auto_type debug = PR_Resources_Find (pr, "qwaq-debug");
+
+	pthread_mutex_lock (&debug_data_mutex);
+	qwaq_debug_data = debug;	// FIXME ? see decl
+	pthread_cond_broadcast (&debug_data_cond);
+	pthread_mutex_unlock (&debug_data_mutex);
+
+	return 1;
+}
+
 static void
 qwaq_debug_clear (progs_t *pr, void *data)
 {
@@ -152,12 +170,15 @@ qwaq_target_clear (progs_t *pr, void *data)
 	}
 }
 
-//FIXME need a better way to get this from one thread to the others
-static qwaq_debug_t *qwaq_debug_data;
-
 static int
 qwaq_target_load (progs_t *pr)
 {
+	pthread_mutex_lock (&debug_data_mutex);
+	while (!qwaq_debug_data) {
+		pthread_cond_wait (&debug_data_cond, &debug_data_mutex);
+	}
+	pthread_mutex_unlock (&debug_data_mutex);
+
 	qwaq_target_t *target = target_new (qwaq_debug_data);
 	target->pr = pr;
 	target->debugger = qwaq_debug_data;
@@ -596,10 +617,11 @@ void
 QWAQ_Debug_Init (progs_t *pr)
 {
 	qwaq_debug_t *debug = calloc (sizeof (*debug), 1);
-	qwaq_debug_data = debug;	// FIXME ? see decl
+
 	debug->pr = pr;
 	debug->qwaq = PR_Resources_Find (pr, "qwaq");
 
+	PR_AddLoadFunc (pr, qwaq_debug_load);
 	PR_Resources_Register (pr, "qwaq-debug", debug, qwaq_debug_clear);
 	PR_RegisterBuiltins (pr, builtins);
 }

From 59f48e5e32c6688b0c654515c14fb0abf327b1b2 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 4 Apr 2020 12:32:12 +0900
Subject: [PATCH 1133/1519] [gamecode] Add function to test if string exists

As it returns the string id, it is useful for getting an string id
without risking creating a new one.
---
 include/QF/progs.h         |  9 +++++++++
 libs/gamecode/pr_strings.c | 16 ++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/include/QF/progs.h b/include/QF/progs.h
index fd9d653f7..1445081fd 100644
--- a/include/QF/progs.h
+++ b/include/QF/progs.h
@@ -1290,6 +1290,15 @@ struct dstring_s *PR_GetMutableString(progs_t *pr, string_t num) __attribute__((
 */
 string_t PR_SetString(progs_t *pr, const char *s);
 
+/**	Get the progs string if it exists.
+	Only static strings are searched.
+	\param pr		pointer to ::progs_t VM struct
+	\param s		C string to be found
+	\return			string index of the progs string if it exists, otherwise
+					0 (ambiguous with "").
+*/
+string_t PR_FindString(progs_t *pr, const char *s);
+
 /** Make a temporary progs string that will survive across function returns.
 	Will not duplicate a permanent string. If a new progs string is created,
 	it will be freed after ::PR_RS_SLOTS calls to this function. ie, up to
diff --git a/libs/gamecode/pr_strings.c b/libs/gamecode/pr_strings.c
index 1b5051859..00a7d67df 100644
--- a/libs/gamecode/pr_strings.c
+++ b/libs/gamecode/pr_strings.c
@@ -440,6 +440,22 @@ PR_SetString (progs_t *pr, const char *s)
 	return string_index (res, sr);
 }
 
+VISIBLE string_t
+PR_FindString (progs_t *pr, const char *s)
+{
+	prstr_resources_t *res = pr->pr_string_resources;
+	strref_t   *sr;
+
+	if (!s)
+		s = "";
+	sr = Hash_Find (res->strref_hash, s);
+
+	if (sr) {
+		return string_index (res, sr);
+	}
+	return 0;
+}
+
 VISIBLE string_t
 PR_SetReturnString (progs_t *pr, const char *s)
 {

From cf7c4780eb2ec6f1e650487ca78427bbb3f1d0cc Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 4 Apr 2020 12:50:25 +0900
Subject: [PATCH 1134/1519] [gamecode] Load extended debug data

And add function to get a source file's base directory if available.
---
 include/QF/progs.h       |   1 +
 libs/gamecode/pr_debug.c | 107 +++++++++++++++++++++++++++++++++++----
 2 files changed, 98 insertions(+), 10 deletions(-)

diff --git a/include/QF/progs.h b/include/QF/progs.h
index 1445081fd..abc92f7f5 100644
--- a/include/QF/progs.h
+++ b/include/QF/progs.h
@@ -1689,6 +1689,7 @@ typedef struct type_view_s {
 void PR_Debug_Init (progs_t *pr);
 void PR_Debug_Init_Cvars (void);
 int PR_LoadDebug (progs_t *pr);
+const char *PR_Debug_GetBaseDirectory (progs_t *pr, const char *file);
 void PR_Debug_Watch (progs_t *pr, const char *expr);
 void PR_Debug_Print (progs_t *pr, const char *expr);
 pr_auxfunction_t *PR_Debug_AuxFunction (progs_t *pr, pr_uint_t func) __attribute__((pure));
diff --git a/libs/gamecode/pr_debug.c b/libs/gamecode/pr_debug.c
index f5f1650af..3d99da30a 100644
--- a/libs/gamecode/pr_debug.c
+++ b/libs/gamecode/pr_debug.c
@@ -70,6 +70,11 @@ typedef struct {
 	progs_t *pr;
 } file_t;
 
+typedef struct compunit_s {
+	const char *file;
+	pr_compunit_t *unit;
+} compunit_t;
+
 typedef struct prdeb_resources_s {
 	progs_t    *pr;
 	dstring_t  *string;
@@ -85,6 +90,11 @@ typedef struct prdeb_resources_s {
 	pr_def_t   *type_encodings_def;
 	qfot_type_t void_type;
 	qfot_type_t *type_encodings[ev_type_count];
+	pr_def_t   *debug_defs;
+	pr_type_t  *debug_data;
+	hashtab_t  *debug_syms;
+	hashtab_t  *compunits;	// by source file
+	PR_RESMAP (compunit_t) compmap;	// handy allocation/freeing
 	hashtab_t  *file_hash;
 } prdeb_resources_t;
 
@@ -174,6 +184,21 @@ file_free (void *_f, void *unused)
 	free (f);
 }
 
+static const char *
+def_get_key (const void *d, void *p)
+{
+	__auto_type def = (pr_def_t *) d;
+	__auto_type pr = (progs_t *) p;
+	return PR_GetString (pr, def->name);
+}
+
+static const char *
+compunit_get_key (const void *cu, void *p)
+{
+	__auto_type compunit = (compunit_t *) cu;
+	return compunit->file;
+}
+
 static void
 source_path_f (cvar_t *var)
 {
@@ -345,9 +370,10 @@ pr_debug_clear (progs_t *pr, void *data)
 
 	if (res->debug)
 		pr->free_progs_mem (pr, res->debug);
-	if (res->file_hash) {
-		Hash_FlushTable (res->file_hash);
-	}
+	Hash_FlushTable (res->file_hash);
+	Hash_FlushTable (res->debug_syms);
+	Hash_FlushTable (res->compunits);
+	PR_RESRESET (compunit_t, res->compmap);
 	res->debug = 0;
 	res->auxfunctions = 0;
 	if (res->auxfunction_map)
@@ -422,6 +448,36 @@ PR_Load_Source_File (progs_t *pr, const char *fname)
 	return f;
 }
 
+static void
+byteswap_def (pr_def_t *def)
+{
+	def->type = LittleShort (def->type);
+	def->size = LittleShort (def->size);
+	def->ofs = LittleLong (def->ofs);
+	def->name = LittleLong (def->name);
+	def->type_encoding = LittleLong (def->type_encoding);
+}
+
+static compunit_t *
+new_compunit (prdeb_resources_t *res)
+{
+	PR_RESNEW (compunit_t, res->compmap);
+}
+
+static void
+process_compunit (prdeb_resources_t *res, pr_def_t *def)
+{
+	progs_t    *pr = res->pr;
+	__auto_type compunit = (pr_compunit_t *) (res->debug_data + def->ofs);
+
+	for (unsigned i = 0; i < compunit->num_files; i++) {
+		compunit_t *cu = new_compunit (res);
+		cu->unit = compunit;
+		cu->file = PR_GetString (pr, compunit->files[i]);
+		Hash_Add (res->compunits, cu);
+	}
+}
+
 VISIBLE int
 PR_LoadDebug (progs_t *pr)
 {
@@ -436,7 +492,9 @@ PR_LoadDebug (progs_t *pr)
 	pointer_t   type_encodings = 0;
 	pointer_t   type_ptr;
 	qfot_type_t *type;
+	string_t    compunit_str;
 
+	pr->pr_debug_resources = res;
 	if (!pr_debug->int_val)
 		return 1;
 
@@ -490,11 +548,17 @@ PR_LoadDebug (progs_t *pr)
 	res->debug->num_linenos = LittleLong (res->debug->num_linenos);
 	res->debug->locals = LittleLong (res->debug->locals);
 	res->debug->num_locals = LittleLong (res->debug->num_locals);
+	res->debug->debug_defs = LittleLong (res->debug->debug_defs);
+	res->debug->num_debug_defs = LittleLong (res->debug->num_debug_defs);
+	res->debug->debug_data = LittleLong (res->debug->debug_data);
+	res->debug->debug_data_size = LittleLong (res->debug->debug_data_size);
 
 	res->auxfunctions = (pr_auxfunction_t*)((char*)res->debug +
 										   res->debug->auxfunctions);
 	res->linenos = (pr_lineno_t*)((char*)res->debug + res->debug->linenos);
 	res->local_defs = (pr_def_t*)((char*)res->debug + res->debug->locals);
+	res->debug_defs = (pr_def_t*)((char*)res->debug + res->debug->debug_defs);
+	res->debug_data = (pr_type_t*)((char*)res->debug + res->debug->debug_data);
 
 	i = pr->progs->numfunctions * sizeof (pr_auxfunction_t *);
 	res->auxfunction_map = pr->allocate_progs_mem (pr, i);
@@ -530,16 +594,23 @@ PR_LoadDebug (progs_t *pr)
 		res->linenos[i].line = LittleLong (res->linenos[i].line);
 	}
 	for (i = 0; i < res->debug->num_locals; i++) {
-		res->local_defs[i].type = LittleShort (res->local_defs[i].type);
-		res->local_defs[i].size = LittleShort (res->local_defs[i].size);
-		res->local_defs[i].ofs = LittleLong (res->local_defs[i].ofs);
-		res->local_defs[i].name = LittleLong (res->local_defs[i].name);
-		res->local_defs[i].type_encoding
-			= LittleLong (res->local_defs[i].type_encoding);
+		byteswap_def (&res->local_defs[i]);
 		if (type_encodings) {
 			res->local_defs[i].type_encoding += type_encodings;
 		}
 	}
+	compunit_str = PR_FindString (pr, ".compile_unit");
+	for (i = 0; i < res->debug->num_debug_defs; i++) {
+		pr_def_t   *def = &res->debug_defs[i];
+		byteswap_def (def);
+		if (type_encodings) {
+			def->type_encoding += type_encodings;
+		}
+		Hash_Add (res->debug_syms, def);
+		if (def->name == compunit_str) {
+			process_compunit (res, def);
+		}
+	}
 	if (encodings) {
 		for (type_ptr = 4; type_ptr < encodings->size;
 			 type_ptr += type->size) {
@@ -553,6 +624,18 @@ PR_LoadDebug (progs_t *pr)
 	return 1;
 }
 
+VISIBLE const char *
+PR_Debug_GetBaseDirectory (progs_t *pr, const char *file)
+{
+	prdeb_resources_t *res = pr->pr_debug_resources;
+	__auto_type cu = (compunit_t *) Hash_Find (res->compunits, file);
+
+	if (cu) {
+		return PR_GetString (pr, cu->unit->basedir);
+	}
+	return 0;
+}
+
 VISIBLE pr_auxfunction_t *
 PR_Debug_AuxFunction (progs_t *pr, pr_uint_t func)
 {
@@ -1615,7 +1698,11 @@ PR_Debug_Init (progs_t *pr)
 	for (int i = 0; i < ev_type_count; i++ ) {
 		res->type_encodings[i] = &res->void_type;
 	}
-	res->file_hash = Hash_NewTable (1024, file_get_key, file_free, 0,
+	res->file_hash = Hash_NewTable (509, file_get_key, file_free, 0,
+									pr->hashlink_freelist);
+	res->debug_syms = Hash_NewTable (509, def_get_key, 0, pr,
+									 pr->hashlink_freelist);
+	res->compunits = Hash_NewTable (509, compunit_get_key, 0, pr,
 									pr->hashlink_freelist);
 
 	PR_Resources_Register (pr, "PR_Debug", res, pr_debug_clear);

From 63714c7c55828accd63eeaf7e6a9a0dcf03b5c61 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 4 Apr 2020 12:51:42 +0900
Subject: [PATCH 1135/1519] [qwaq] Add builtin to get a file's full path

If the file's base directory cannot be found, the file name is returned
as-is.
---
 ruamoko/qwaq/builtins/debug.c | 27 +++++++++++++++++++++++++++
 ruamoko/qwaq/debugger/debug.h |  1 +
 ruamoko/qwaq/debugger/debug.r |  1 +
 3 files changed, 29 insertions(+)

diff --git a/ruamoko/qwaq/builtins/debug.c b/ruamoko/qwaq/builtins/debug.c
index 2eb61e7b1..be143ec87 100644
--- a/ruamoko/qwaq/builtins/debug.c
+++ b/ruamoko/qwaq/builtins/debug.c
@@ -44,6 +44,7 @@
 #include "QF/dstring.h"
 #include "QF/hash.h"
 #include "QF/keys.h"
+#include "QF/quakefs.h"
 #include "QF/sys.h"
 
 #include "qwaq.h"
@@ -427,6 +428,31 @@ qdb_get_string (progs_t *pr)
 	}
 }
 
+static void
+qdb_get_file_path (progs_t *pr)
+{
+	__auto_type debug = PR_Resources_Find (pr, "qwaq-debug");
+	pointer_t   handle = P_INT (pr, 0);
+	qwaq_target_t *target = get_target (debug, __FUNCTION__, handle);
+	progs_t    *tpr = target->pr;
+	const char *file = P_GSTRING (pr, 1);
+	const char *basedir = PR_Debug_GetBaseDirectory (tpr, file);
+
+	if (basedir) {
+		size_t      baselen = strlen (basedir);
+		size_t      filelen = strlen (file);
+		char       *path = alloca (baselen + filelen + 2);
+		strcpy (path, basedir);
+		path[baselen] = '/';
+		strcpy (path + baselen + 1, file);
+		path = QFS_CompressPath (path);
+		RETURN_STRING (pr, path);
+		free (path);
+	} else {
+		R_STRING (pr) = P_STRING (pr, 1);
+	}
+}
+
 static void
 qdb_find_global (progs_t *pr)
 {
@@ -603,6 +629,7 @@ static builtin_t builtins[] = {
 	{"qdb_get_data",			qdb_get_data,			-1},
 	{"qdb_get_string|{tag qdb_target_s=}i",	qdb_get_string,	-1},
 	{"qdb_get_string|{tag qdb_target_s=}*",	qdb_get_string,	-1},
+	{"qdb_get_file_path",		qdb_get_file_path,		-1},
 	{"qdb_find_global",			qdb_find_global,		-1},
 	{"qdb_find_field",			qdb_find_field,			-1},
 	{"qdb_find_function",		qdb_find_function,		-1},
diff --git a/ruamoko/qwaq/debugger/debug.h b/ruamoko/qwaq/debugger/debug.h
index 6dc86ab1c..6efeb5fb2 100644
--- a/ruamoko/qwaq/debugger/debug.h
+++ b/ruamoko/qwaq/debugger/debug.h
@@ -87,6 +87,7 @@ int qdb_get_data (qdb_target_t target, unsigned src, unsigned len, void *dst);
 // note: str is likely not valid in the host progs, it's just a convinience to
 // avoid cast shenanigans when getting type encoding strings
 @overload string qdb_get_string (qdb_target_t target, string str);
+string qdb_get_file_path (qdb_target_t target, string file);
 qdb_def_t qdb_find_global (qdb_target_t target, string name);
 qdb_def_t qdb_find_field (qdb_target_t target, string name);
 qdb_function_t *qdb_find_function (qdb_target_t target, string name);
diff --git a/ruamoko/qwaq/debugger/debug.r b/ruamoko/qwaq/debugger/debug.r
index 792b20d61..20ccc57b3 100644
--- a/ruamoko/qwaq/debugger/debug.r
+++ b/ruamoko/qwaq/debugger/debug.r
@@ -17,6 +17,7 @@ int qdb_get_data (qdb_target_t target, unsigned src, unsigned len,
 				  void *dst) = #0;
 string qdb_get_string (qdb_target_t target, unsigned str) = #0;
 string qdb_get_string (qdb_target_t target, string str) = #0;
+string qdb_get_file_path (qdb_target_t target, string file) = #0;
 qdb_def_t qdb_find_global (qdb_target_t target, string name) = #0;
 qdb_def_t qdb_find_field (qdb_target_t target, string name) = #0;
 qdb_function_t *qdb_find_function (qdb_target_t target, string name) = #0;

From 2bec2527b4a875c7f34bca7c208781281fba7b39 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 4 Apr 2020 14:30:50 +0900
Subject: [PATCH 1136/1519] [gamecode] Re-expose PR_LoadStrings

It's required for qfprogs now that PR_LoadDebug reads strings early.
---
 include/QF/progs.h          | 7 +++++++
 libs/gamecode/pr_strings.c  | 2 +-
 tools/qfcc/source/qfprogs.c | 1 +
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/include/QF/progs.h b/include/QF/progs.h
index abc92f7f5..8a78926bf 100644
--- a/include/QF/progs.h
+++ b/include/QF/progs.h
@@ -1254,6 +1254,13 @@ int PR_RelocateBuiltins (progs_t *pr);
 */
 void PR_Strings_Init (progs_t *pr);
 
+/**	Initialize the string tables using the strings supplied by the progs.
+	Called automatically during progs load.
+	\param pr		pointer to ::progs_t VM struct
+	\return			true for success, false for failure
+*/
+int PR_LoadStrings (progs_t *pr);
+
 /** Check the validity of a string index.
 	\param pr		pointer to ::progs_t VM struct
 	\param num		string index to be validated
diff --git a/libs/gamecode/pr_strings.c b/libs/gamecode/pr_strings.c
index 00a7d67df..89d5ee60f 100644
--- a/libs/gamecode/pr_strings.c
+++ b/libs/gamecode/pr_strings.c
@@ -229,7 +229,7 @@ pr_strings_clear (progs_t *pr, void *data)
 	pr->pr_xtstr = 0;
 }
 
-static int
+VISIBLE int
 PR_LoadStrings (progs_t *pr)
 {
 	prstr_resources_t *res = PR_Resources_Find (pr, "Strings");
diff --git a/tools/qfcc/source/qfprogs.c b/tools/qfcc/source/qfprogs.c
index 8a8f2ffc0..787c9068a 100644
--- a/tools/qfcc/source/qfprogs.c
+++ b/tools/qfcc/source/qfprogs.c
@@ -289,6 +289,7 @@ load_progs (const char *name)
 			return 0;
 
 		PR_ResolveGlobals (&pr);
+		PR_LoadStrings (&pr);
 		PR_LoadDebug (&pr);
 	}
 	for (i = 0; i < pr.progs->numfunctions; i++) {

From 6291a3c503d5b7decfc549796e5f48462cc694f0 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 4 Apr 2020 14:32:54 +0900
Subject: [PATCH 1137/1519] [qwaq] Hold the editor filename

It may be an ephemeral string.
---
 ruamoko/qwaq/editor/editor.r | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ruamoko/qwaq/editor/editor.r b/ruamoko/qwaq/editor/editor.r
index d66407564..8dd64c21d 100644
--- a/ruamoko/qwaq/editor/editor.r
+++ b/ruamoko/qwaq/editor/editor.r
@@ -1,4 +1,5 @@
 #include <QF/keys.h>
+#include <string.h>
 #include "qwaq-app.h"
 #include "editor/editor.h"
 #include "ui/listener.h"
@@ -11,7 +12,7 @@
 	if (!(self = [super initWithRect: rect])) {
 		return nil;
 	}
-	self.filename = filename;
+	self.filename = str_hold (filename);
 	buffer = [[EditBuffer withFile:filename] retain];
 	line_count = [buffer countLines: {0, [buffer textSize]}];
 	linebuffer = [[DrawBuffer buffer: { xlen, 1 }] retain];
@@ -28,6 +29,7 @@
 
 -(void)dealloc
 {
+	str_free (filename);
 	[vScrollBar release];
 	[buffer release];
 	[linebuffer release];

From e80344c58e320709c059748367e3bea98242267a Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 4 Apr 2020 14:34:18 +0900
Subject: [PATCH 1138/1519] [qwaq] Use full file path for loading source files

---
 ruamoko/qwaq/debugger/debugger.r | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ruamoko/qwaq/debugger/debugger.r b/ruamoko/qwaq/debugger/debugger.r
index 425a4f4d7..d46c78ab7 100644
--- a/ruamoko/qwaq/debugger/debugger.r
+++ b/ruamoko/qwaq/debugger/debugger.r
@@ -62,7 +62,8 @@
 	Rect rect = {{1, 1}, [source_window size]};
 	rect.extent.width -= 2;
 	rect.extent.height -= 2;
-	file = [Editor withRect:rect file:filename];
+	string filepath = qdb_get_file_path (target, filename);
+	file = [Editor withRect:rect file:filepath];
 	[files addObject: file];
 	return file;
 }
@@ -78,7 +79,7 @@
 	[current_file setVerticalScrollBar:source_scrollbar];
 	//FIXME id<View>?
 	[source_window insertSelected: (View *) file_proxy];
-	[source_window setTitle: [current_file filename]];
+	[source_window setTitle:[current_file filename]];
 	[source_window redraw];
 
 	locals_window = [Window withRect:{{0, 0}, {40, 10}}];
@@ -110,7 +111,7 @@
 		[file_proxy setView:file];
 		[[file onEvent] addListener:self :@selector(proxy_event::)];
 		[file setVerticalScrollBar:source_scrollbar];
-		[source_window setTitle: [file filename]];
+		[source_window setTitle:[file filename]];
 		current_file = file;
 	}
 	[[current_file gotoLine:state.line - 1] highlightLine];

From d88c1e2f405532a529460c935d221b28a26641e8 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 4 Apr 2020 15:46:37 +0900
Subject: [PATCH 1139/1519] [libr] Fix missing alias meta name

---
 ruamoko/include/types.h | 2 +-
 ruamoko/lib/types.r     | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ruamoko/include/types.h b/ruamoko/include/types.h
index a1527d890..c2f157e76 100644
--- a/ruamoko/include/types.h
+++ b/ruamoko/include/types.h
@@ -90,7 +90,7 @@ typedef struct qfot_type_encodings_s {
 	int         size;
 } qfot_type_encodings_t;
 
-@extern string ty_meta_name[6];
+@extern string ty_meta_name[7];
 @extern string pr_type_name[ev_type_count];
 
 #endif
diff --git a/ruamoko/lib/types.r b/ruamoko/lib/types.r
index 66140b83f..aa1f65a02 100644
--- a/ruamoko/lib/types.r
+++ b/ruamoko/lib/types.r
@@ -1,13 +1,14 @@
 #include <runtime.h>
 #include <types.h>
 
-string ty_meta_name[6] = {
+string ty_meta_name[7] = {
 	"basic",
 	"struct",
 	"union",
 	"enum",
 	"array",
 	"class",
+	"alias",
 };
 
 string pr_type_name[ev_type_count] = {

From d5604aef73e77839a25fd7cf68c5e895e24fb796 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 8 Apr 2020 21:12:56 +0900
Subject: [PATCH 1140/1519] [qfcc] Add failing test for unary minus

Producing a void type... very odd.
---
 tools/qfcc/test/Makefile.am  | 11 +++++++++++
 tools/qfcc/test/unaryminus.r | 13 +++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 tools/qfcc/test/unaryminus.r

diff --git a/tools/qfcc/test/Makefile.am b/tools/qfcc/test/Makefile.am
index 9c5e0799c..49ce3f51b 100644
--- a/tools/qfcc/test/Makefile.am
+++ b/tools/qfcc/test/Makefile.am
@@ -71,6 +71,7 @@ test_progs_dat=\
 	triangle.dat \
 	typedef.dat \
 	typelinker.dat \
+	unaryminus.dat \
 	vecaddr.dat \
 	vecexpr.dat \
 	vecinit.dat \
@@ -533,6 +534,16 @@ typelinker.run: Makefile build-run
 include $(typelinker_dep) # am--include-marker
 r_depfiles_remade += $(typelinker_dep)
 
+unaryminus_dat_SOURCES=unaryminus.r
+unaryminus_obj=$(unaryminus_dat_SOURCES:.r=.qfo)
+unaryminus_dep=$(addprefix ./$(DEPDIR)/,$(unaryminus_obj:.qfo=.Qo))
+unaryminus.dat$(EXEEXT): $(unaryminus_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(unaryminus_obj)
+unaryminus.run: Makefile build-run
+	@$(srcdir)/build-run $@
+include $(unaryminus_dep) # am--include-marker
+r_depfiles_remade += $(unaryminus_dep)
+
 vecaddr_dat_SOURCES=vecaddr.r
 vecaddr_obj=$(vecaddr_dat_SOURCES:.r=.qfo)
 vecaddr_dep=$(addprefix ./$(DEPDIR)/,$(vecaddr_obj:.qfo=.Qo))
diff --git a/tools/qfcc/test/unaryminus.r b/tools/qfcc/test/unaryminus.r
new file mode 100644
index 000000000..5149a224a
--- /dev/null
+++ b/tools/qfcc/test/unaryminus.r
@@ -0,0 +1,13 @@
+int strlen (string s) = #0;
+
+int foo (string bar)
+{
+	int len;
+	len = -strlen (bar);
+	return len;
+}
+
+int main (void)
+{
+	return 0;
+}

From 31abf6f95509c1a53285565028feed99aecd204a Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 8 Apr 2020 21:23:57 +0900
Subject: [PATCH 1141/1519] [qfcc] Fix some wrong fall-through cases

This fixes the unary minus issue for now. unary_expr needs a rewrite,
though: it's just horrible.
---
 tools/qfcc/source/expr.c | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index 058292b1d..7faa52caf 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -1636,11 +1636,25 @@ unary_expr (int op, expr_t *e)
 				case ex_memset:
 					internal_error (e, 0);
 				case ex_uexpr:
-					if (e->e.expr.op == '-')
+					if (e->e.expr.op == '-') {
 						return e->e.expr.e1;
+					}
+					{
+						expr_t     *n = new_unary_expr (op, e);
+
+						n->e.expr.type = get_type (e);
+						return n;
+					}
 				case ex_block:
-					if (!e->e.block.result)
+					if (!e->e.block.result) {
 						return error (e, "invalid type for unary -");
+					}
+					{
+						expr_t     *n = new_unary_expr (op, e);
+
+						n->e.expr.type = get_type (e);
+						return n;
+					}
 				case ex_expr:
 				case ex_bool:
 				case ex_temp:
@@ -1648,7 +1662,7 @@ unary_expr (int op, expr_t *e)
 					{
 						expr_t     *n = new_unary_expr (op, e);
 
-						n->e.expr.type = e->e.expr.type;
+						n->e.expr.type = get_type (e);
 						return n;
 					}
 				case ex_def:

From b7b8df08010d7626b2844d951499cabfbfd53fef Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 8 Apr 2020 21:53:53 +0900
Subject: [PATCH 1142/1519] [ruamoko] Add str_lower builtin

This returns a string with all chars lower-cased.
---
 libs/ruamoko/rua_string.c | 18 ++++++++++++++++++
 ruamoko/include/string.h  |  1 +
 ruamoko/lib/string.r      |  1 +
 3 files changed, 20 insertions(+)

diff --git a/libs/ruamoko/rua_string.c b/libs/ruamoko/rua_string.c
index 6de9c5c01..873d87717 100644
--- a/libs/ruamoko/rua_string.c
+++ b/libs/ruamoko/rua_string.c
@@ -38,6 +38,7 @@
 # include <strings.h>
 #endif
 #include <stdlib.h>
+#include <ctype.h>
 
 #include "qfalloca.h"
 
@@ -247,6 +248,22 @@ bi_str_quote (progs_t *pr)
 	RETURN_STRING (pr, quote);
 }
 
+static void
+bi_str_lower (progs_t *pr)
+{
+	const char *str = P_GSTRING (pr, 0);
+	char       *lower = alloca (strlen (str) + 1);
+	char       *l = lower;
+	byte        c;
+
+	while ((c = *str++)) {
+		*l++ = tolower (c);
+	}
+	*l++ = 0;
+
+	RETURN_STRING (pr, lower);
+}
+
 static builtin_t builtins[] = {
 	{"strlen",		bi_strlen,		-1},
 	{"sprintf",		bi_sprintf,		-1},
@@ -264,6 +281,7 @@ static builtin_t builtins[] = {
 	{"str_str",		bi_str_str,		-1},
 	{"str_char",	bi_str_char,	-1},
 	{"str_quote",	bi_str_quote,	-1},
+	{"str_lower",	bi_str_lower,	-1},
 	{0}
 };
 
diff --git a/ruamoko/include/string.h b/ruamoko/include/string.h
index 008e7d883..82abb2734 100644
--- a/ruamoko/include/string.h
+++ b/ruamoko/include/string.h
@@ -17,5 +17,6 @@
 @extern string str_str (string haystack, string needle);
 @extern int str_char (string str, int ind);
 string str_quote (string str);
+string str_lower (string str);
 
 #endif//__ruamoko_string_h
diff --git a/ruamoko/lib/string.r b/ruamoko/lib/string.r
index 48a9a7bf7..df6c6ad78 100644
--- a/ruamoko/lib/string.r
+++ b/ruamoko/lib/string.r
@@ -16,3 +16,4 @@ string (string str, int start, int len) str_mid = #0;
 string (string haystack, string needle) str_str = #0;
 int str_char (string str, int ind) = #0;
 string str_quote (string str) = #0;
+string str_lower (string str) = #0;

From 54f2e417dc38d4ad2226fe0e46358465ff8b7c06 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 8 Apr 2020 21:54:41 +0900
Subject: [PATCH 1143/1519] [ruamoko] Fix daft str_str abi

Returning a string was a bad idea as it makes str_str difficult to use
with str_mid. (actually, iirc, it was the only reason I moved all
strings into progs memory... hmm).
---
 libs/ruamoko/rua_string.c   | 7 ++++---
 ruamoko/cl_menu/plistmenu.r | 2 +-
 ruamoko/include/string.h    | 2 +-
 ruamoko/lib/string.r        | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/libs/ruamoko/rua_string.c b/libs/ruamoko/rua_string.c
index 873d87717..31b717273 100644
--- a/libs/ruamoko/rua_string.c
+++ b/libs/ruamoko/rua_string.c
@@ -192,9 +192,10 @@ bi_str_str (progs_t *pr)
 	const char *needle = P_GSTRING (pr, 1);
 	char       *res = strstr (haystack, needle);
 
-	R_STRING (pr) = 0;
-	if (res)
-		R_STRING (pr) = res - pr->pr_strings;
+	R_INT (pr) = -1;
+	if (res) {
+		R_INT (pr) = res - haystack;
+	}
 }
 
 static void
diff --git a/ruamoko/cl_menu/plistmenu.r b/ruamoko/cl_menu/plistmenu.r
index 351e974e1..f94e6bdfc 100644
--- a/ruamoko/cl_menu/plistmenu.r
+++ b/ruamoko/cl_menu/plistmenu.r
@@ -81,7 +81,7 @@ class_from_plist (PLDictionary *pldict)
 					break;
 				case "0": case "1": case "2": case "3": case "4":
 				case "5": case "6": case "7": case "8": case "9":
-					if (str_str (paramstr, "."))
+					if (str_str (paramstr, ".") >= 0)
 						va_list.list[j].float_val = stof (paramstr);
 					else
 						va_list.list[j].integer_val = stoi (paramstr);
diff --git a/ruamoko/include/string.h b/ruamoko/include/string.h
index 82abb2734..8087ef67e 100644
--- a/ruamoko/include/string.h
+++ b/ruamoko/include/string.h
@@ -14,7 +14,7 @@
 @extern string str_clear (string str);
 @extern @overload string str_mid (string str, int start);
 @extern @overload string str_mid (string str, int start, int len);
-@extern string str_str (string haystack, string needle);
+int str_str (string haystack, string needle);
 @extern int str_char (string str, int ind);
 string str_quote (string str);
 string str_lower (string str);
diff --git a/ruamoko/lib/string.r b/ruamoko/lib/string.r
index df6c6ad78..3858ef7d6 100644
--- a/ruamoko/lib/string.r
+++ b/ruamoko/lib/string.r
@@ -13,7 +13,7 @@ string (string dst, string src) str_cat = #0;
 string (string str) str_clear = #0;
 string (string str, int start) str_mid = #0;
 string (string str, int start, int len) str_mid = #0;
-string (string haystack, string needle) str_str = #0;
+int str_str (string haystack, string needle) = #0;
 int str_char (string str, int ind) = #0;
 string str_quote (string str) = #0;
 string str_lower (string str) = #0;

From 7c922d2320cd5cd930282e4912889cbd65b3376b Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 15 Apr 2020 00:24:20 +0900
Subject: [PATCH 1144/1519] Update the blender map editor for 2.80+

---
 tools/io_qfmap/__init__.py    | 339 +++++++---------------------------
 tools/io_qfmap/entity.py      |  89 +++++----
 tools/io_qfmap/entityclass.py |   2 +
 tools/io_qfmap/import_map.py  |  87 +++++----
 tools/io_qfmap/init.py        | 294 +++++++++++++++++++++++++++++
 tools/io_qfmap/map.py         |   4 +-
 6 files changed, 468 insertions(+), 347 deletions(-)
 create mode 100644 tools/io_qfmap/init.py

diff --git a/tools/io_qfmap/__init__.py b/tools/io_qfmap/__init__.py
index 953750b63..2cabf517f 100644
--- a/tools/io_qfmap/__init__.py
+++ b/tools/io_qfmap/__init__.py
@@ -24,7 +24,7 @@
 bl_info = {
     "name": "Quake map format",
     "author": "Bill Currie",
-    "blender": (2, 6, 3),
+    "blender": (2, 80, 0),
     "api": 35622,
     "location": "File > Import-Export",
     "description": "Import-Export Quake maps",
@@ -34,286 +34,83 @@ bl_info = {
 #    "support": 'OFFICIAL',
     "category": "Import-Export"}
 
-# To support reload properly, try to access a package var, if it's there,
-# reload everything
-if "bpy" in locals():
-    import imp
-    if "import_map" in locals():
-        imp.reload(import_map)
-    if "export_map" in locals():
-        imp.reload(export_map)
-
-from pprint import pprint
+submodule_names = (
+    "entity",
+    "entityclass",
+    "export_map",
+    "import_map",
+    "init",
+    "map",
+    "qfplist",
+    "quakechr",
+    "quakepal",
+    "wad",
+)
 
 import bpy
-from bpy.props import BoolProperty, FloatProperty, StringProperty, EnumProperty
-from bpy.props import FloatVectorProperty, PointerProperty
-from bpy_extras.io_utils import ExportHelper, ImportHelper, path_reference_mode, axis_conversion
-from bpy.app.handlers import persistent
+from bpy.props import PointerProperty
+from bpy.utils import register_class, unregister_class
 
-from .entityclass import EntityClassDict, EntityClassError
-from . import entity
-from . import import_map
-from . import export_map
+import importlib
+import sys
 
-def ecm_draw(self, context):
-    layout = self.layout
-    for item in self.menu_items:
-        if type(item[1]) is str:
-            ec = context.scene.qfmap.entity_classes[item[1]]
-            if ec.size:
-                icon = 'OBJECT_DATA'
-            else:
-                icon = 'MESH_DATA'
-            op = layout.operator("object.add_entity", text=item[0], icon=icon)
-            op.entclass=item[1]
-            if ec.comment:
-                pass
-        else:
-            layout.menu(item[1].bl_idname)
+registered_submodules = []
 
-class EntityClassMenu:
-    @classmethod
-    def clear(cls):
-        while cls.menu_items:
-            if type(cls.menu_item[0][1]) is not str:
-                bpy.utils.unregister_class(cls.menu_items[0][1])
-                cls.menu_items[0][1].clear()
-            del cls.menu_items[0]
-    @classmethod
-    def build(cls, menudict, name="INFO_MT_entity_add", label="entity"):
-        items = list(menudict.items())
-        items.sort()
-        menu_items = []
-        for i in items:
-            i = list(i)
-            if type(i[1]) is dict:
-                if i[0]:
-                    nm = "_".join((name, i[0]))
-                else:
-                    nm = name
-                i[1] = cls.build(i[1], nm, i[0])
-            menu_items.append(i)
-        attrs = {}
-        attrs["menu_items"] = menu_items
-        attrs["draw"] = ecm_draw
-        attrs["bl_idname"] = name
-        attrs["bl_label"] = label
-        attrs["clear"] = cls.clear
-        menu = type(name, (bpy.types.Menu,), attrs)
-        bpy.utils.register_class(menu)
-        return menu
+# When the addon is reloaded, this module gets reloaded, however none
+# of the other modules from this addon get reloaded. As a result, they
+# don't call register_submodules (only run when the module is loaded) and
+# thus they don't end up registering everything.
+#
+# This is set before any loading starts (in register), to a set of all the
+# names of the modules loaded as of when loading starts. While doing the
+# module loading, check if a module is present in this list. If so, reload
+# it and remove it from the set (to prevent it from getting reloaded twice).
+preloaded_modules = None
 
-@persistent
-def scene_load_handler(dummy):
-    for scene in bpy.data.scenes:
-        if hasattr(scene, "qfmap"):
-            scene.qfmap.script_update(bpy.context)
-
-class MapeditMessage(bpy.types.Operator):
-    bl_idname = "qfmapedit.message"
-    bl_label = "Message"
-    type = StringProperty()
-    message = StringProperty()
-
-    def execute(self, context):
-        self.report({'INFO'}, message)
-        return {'FINISHED'}
-    def invoke(self, context, event):
-        wm = context.window_manager
-        return wm.invoke_popup(self, width=400, height=200)
-    def draw(self, context):
-        self.layout.label(self.type, icon='ERROR')
-        self.layout.label(self.message)
-
-def scan_entity_classes(context):
-    qfmap = context.scene.qfmap
-    if not qfmap.dirpath:
-        return
-    qfmap.entity_classes.from_source_tree(qfmap.dirpath)
-    name = context.scene.name + '-EntityClasses'
-    if name in bpy.data.texts:
-        txt = bpy.data.texts[name]
-    else:
-        txt = bpy.data.texts.new(name)
-    txt.from_string(qfmap.entity_classes.to_plist())
-    qfmap.script = name
-
-def parse_entity_classes(context):
-    context.scene.qfmap.script_update(context)
-
-def ec_dir_update(self, context):
-    try:
-        scan_entity_classes(context)
-    except EntityClassError as err:
-        self.dirpath = ""
-        bpy.ops.qfmapedit.message('INVOKE_DEFAULT', type="Error",
-                                  message="Entity Class Error: %s" % err)
-
-def ec_script_update(self, context):
-    self.script_update(context)
-
-class AddEntity(bpy.types.Operator):
-    '''Add an entity'''
-    bl_idname = "object.add_entity"
-    bl_label = "Entity"
-    entclass = StringProperty(name = "entclass")
-
-    def execute(self, context):
-        keywords = self.as_keywords()
-        return entity.add_entity(self, context, **keywords)
-
-class QFEntityClassScan(bpy.types.Operator):
-    '''Rescan the specified QuakeC source tree'''
-    bl_idname = "scene.scan_entity_classes"
-    bl_label = "RELOAD"
-
-    def execute(self, context):
-        scan_entity_classes(context)
-        return {'FINISHED'}
-
-class QFEntityClassParse(bpy.types.Operator):
-    '''Reparse the specified entity class script'''
-    bl_idname = "scene.parse_entity_classes"
-    bl_label = "RELOAD"
-
-    def execute(self, context):
-        parse_entity_classes(context)
-        return {'FINISHED'}
-
-class QFEntityClasses(bpy.types.PropertyGroup):
-    wadpath = StringProperty(
-        name="wadpath",
-        description="Path to search for wad files",
-        subtype='DIR_PATH')
-    dirpath = StringProperty(
-        name="dirpath",
-        description="Path to qc source tree",
-        subtype='DIR_PATH',
-        update=ec_dir_update)
-    script = StringProperty(
-        name="script",
-        description="entity class storage",
-        update=ec_script_update)
-    entity_classes = EntityClassDict()
-    ecm = EntityClassMenu.build({})
-    entity_targets = {}
-    target_entities = []
-
-    def script_update(self, context):
-        if self.script in bpy.data.texts:
-            script = bpy.data.texts[self.script].as_string()
-            self.entity_classes.from_plist(script)
-            menudict = {}
-            entclasses = self.entity_classes.keys()
-            for ec in entclasses:
-                ecsub = ec.split("_")
-                d = menudict
-                for sub in ecsub[:-1]:
-                    if sub not in d:
-                        d[sub] = {}
-                    elif type(d[sub]) is str:
-                        d[sub] = {"":d[sub]}
-                    d = d[sub]
-                sub = ecsub[-1]
-                if sub in d:
-                    d[sub][""] = ec
-                else:
-                    d[sub] = ec
-            self.__class__.ecm = EntityClassMenu.build(menudict)
-
-class OBJECT_PT_QFECPanel(bpy.types.Panel):
-    bl_space_type = 'PROPERTIES'
-    bl_region_type = 'WINDOW'
-    bl_context = 'scene'
-    bl_label = 'QF Entity Classes'
-
-    @classmethod
-    def poll(cls, context):
-        return True
-
-    def draw(self, context):
-        layout = self.layout
-        scene = context.scene
-        row = layout.row()
-        layout.prop(scene.qfmap, "wadpath")
-        row = layout.row()
-        row.prop(scene.qfmap, "dirpath")
-        row.operator("scene.scan_entity_classes", text="", icon="FILE_REFRESH")
-        row = layout.row()
-        row.prop(scene.qfmap, "script")
-        row.operator("scene.parse_entity_classes", text="", icon="FILE_REFRESH")
-
-class ImportPoints(bpy.types.Operator, ImportHelper):
-    '''Load a Quake points File'''
-    bl_idname = "import_mesh.quake_points"
-    bl_label = "Import points"
-
-    filename_ext = ".pts"
-    filter_glob = StringProperty(default="*.pts", options={'HIDDEN'})
-
-    def execute(self, context):
-        keywords = self.as_keywords (ignore=("filter_glob",))
-        return import_map.import_pts(self, context, **keywords)
-
-class ImportMap(bpy.types.Operator, ImportHelper):
-    '''Load a Quake map File'''
-    bl_idname = "import_mesh.quake_map"
-    bl_label = "Import map"
-
-    filename_ext = ".map"
-    filter_glob = StringProperty(default="*.map", options={'HIDDEN'})
-
-    def execute(self, context):
-        keywords = self.as_keywords (ignore=("filter_glob",))
-        return import_map.import_map(self, context, **keywords)
-
-class ExportMap(bpy.types.Operator, ExportHelper):
-    '''Save a Quake map File'''
-
-    bl_idname = "export_mesh.quake_map"
-    bl_label = "Export map"
-
-    filename_ext = ".map"
-    filter_glob = StringProperty(default="*.map", options={'HIDDEN'})
-
-    @classmethod
-    def poll(cls, context):
-        return True
-
-    def execute(self, context):
-        keywords = self.as_keywords (ignore=("check_existing", "filter_glob"))
-        return export_map.export_map(self, context, **keywords)
-
-def menu_func_import(self, context):
-    self.layout.operator(ImportMap.bl_idname, text="Quake map (.map)")
-    self.layout.operator(ImportPoints.bl_idname, text="Quake points (.pts)")
-
-def menu_func_export(self, context):
-    self.layout.operator(ExportMap.bl_idname, text="Quake map (.map)")
-
-def menu_func_add(self, context):
-    self.layout.menu(context.scene.qfmap.ecm.bl_idname, icon='PLUGIN')
+def register_submodules(name, submodule_names):
+    global preloaded_modules
+    module = __import__(name=name, fromlist=submodule_names)
+    submodules = [getattr(module, name) for name in submodule_names]
+    for mod in submodules:
+        # Look through the modules present when register was called. If this
+        # module was already loaded, then reload it.
+        if mod.__name__ in preloaded_modules:
+            mod = importlib.reload(mod)
+            # Prevent the module from getting reloaded more than once
+            preloaded_modules.remove(mod.__name__)
+        m = [(),(),()]
+        if hasattr(mod, "classes_to_register"):
+            m[0] = mod.classes_to_register
+            for cls in mod.classes_to_register:
+                register_class(cls)
+            if hasattr(mod, "menus_to_register"):
+                m[1] = mod.menus_to_register
+                for menu in mod.menus_to_register:
+                    menu[0].append(menu[1])
+            if hasattr(mod, "custom_properties_to_register"):
+                for prop in mod.custom_properties_to_register:
+                    setattr(prop[0], prop[1], PointerProperty(type=prop[2]))
+            if hasattr(mod, "handlers_to_register"):
+                m[2] = mod.handlers_to_register
+                for handler in mod.handlers_to_register:
+                    getattr(bpy.app.handlers, handler[0]).append(handler[1])
+            if m[0] or m[1] or m[2]:
+                registered_submodules.append(m)
 
 def register():
-    bpy.utils.register_module(__name__)
-
-    bpy.types.Scene.qfmap = PointerProperty(type=QFEntityClasses)
-
-    bpy.types.INFO_MT_file_import.append(menu_func_import)
-    bpy.types.INFO_MT_file_export.append(menu_func_export)
-    bpy.types.INFO_MT_add.append(menu_func_add)
-
-    bpy.app.handlers.load_post.append(scene_load_handler)
-    entity.register()
-
+    global preloaded_modules
+    preloaded_modules = set(sys.modules.keys())
+    register_submodules(__name__, submodule_names)
+    preloaded_modules = None
 
 def unregister():
-    bpy.utils.unregister_module(__name__)
-
-    bpy.types.INFO_MT_file_import.remove(menu_func_import)
-    bpy.types.INFO_MT_file_export.remove(menu_func_export)
-    bpy.types.INFO_MT_add.remove(menu_func_add)
+    for mod in reversed(registered_submodules):
+        for handler in reversed(mod[2]):
+            getattr(bpy.app.handlers, handler[0]).remove(handler[1])
+        for menu in reversed(mod[1]):
+            menu[0].remove(menu[1])
+        for cls in reversed(mod[0]):
+            unregister_class(cls)
 
 if __name__ == "__main__":
     register()
diff --git a/tools/io_qfmap/entity.py b/tools/io_qfmap/entity.py
index 23f151f7e..86a316234 100644
--- a/tools/io_qfmap/entity.py
+++ b/tools/io_qfmap/entity.py
@@ -19,7 +19,8 @@
 
 # <pep8 compliant>
 
-import bpy, bgl
+import bpy, bgl, gpu
+from gpu_extras.batch import batch_for_shader
 from bpy.props import BoolProperty, FloatProperty, StringProperty, EnumProperty
 from bpy.props import BoolVectorProperty, CollectionProperty, PointerProperty
 from bpy.props import FloatVectorProperty, IntProperty
@@ -27,7 +28,8 @@ from mathutils import Vector
 
 from .entityclass import EntityClass
 
-def draw_callback(self, context):
+
+def build_batch(qfmap):
     def obj_location(obj):
         ec = None
         if obj.qfentity.classname in entity_classes:
@@ -38,13 +40,13 @@ def draw_callback(self, context):
         for i in range(8):
             loc += Vector(obj.bound_box[i])
         return obj.location + loc/8.0
-    qfmap = context.scene.qfmap
     entity_classes = qfmap.entity_classes
     entity_targets = qfmap.entity_targets
     target_entities = qfmap.target_entities
-    bgl.glLineWidth(3)
     ents = 0
     targs = 0
+    verts = []
+    colors = []
     for obj in target_entities:
         #obj = bpy.data.objects[objname]
         qfentity = obj.qfentity
@@ -54,27 +56,37 @@ def draw_callback(self, context):
         ec = entity_classes[qfentity.classname]
         target = None
         killtarget = None
-        for field in qfentity.fields:
-            if field.name == "target" and field.value:
-                target = field.value
-            if field.name == "killtarget" and field.value:
-                killtarget = field.value
+        if "target" in qfentity.fields:
+            target = qfentity.fields["target"].value
+        if "killtarget" in qfentity.fields:
+            killtarget = qfentity.fields["killtarget"].value
         targetlist = [target, killtarget]
         if target == killtarget:
             del targetlist[1]
         for tname in targetlist:
             if tname and tname in entity_targets:
                 targets = entity_targets[tname]
-                bgl.glColor4f(ec.color[0], ec.color[1], ec.color[2], 1)
+                color = (ec.color[0], ec.color[1], ec.color[2], 1)
                 for ton in targets:
                     targs += 1
                     to = bpy.data.objects[ton]
-                    bgl.glBegin(bgl.GL_LINE_STRIP)
-                    loc = obj_location(obj)
-                    bgl.glVertex3f(loc.x, loc.y, loc.z)
-                    loc = obj_location(to)
-                    bgl.glVertex3f(loc.x, loc.y, loc.z)
-                    bgl.glEnd()
+                    start = obj_location(obj)
+                    end = obj_location(to)
+
+                    verts.append(start)
+                    colors.append(color)
+                    verts.append(end)
+                    colors.append(color)
+    return {"pos": verts, "color": colors}
+
+def draw_callback(self, context):
+    #FIXME horribly inefficient
+    qfmap = context.scene.qfmap
+    content = build_batch(qfmap)
+    shader = gpu.shader.from_builtin('3D_SMOOTH_COLOR')
+    batch = batch_for_shader(shader, 'LINES', content)
+    bgl.glLineWidth(3)
+    batch.draw(shader)
     bgl.glLineWidth(1)
 
 class VIEW3D_PT_QFEntityRelations(bpy.types.Panel):
@@ -103,27 +115,27 @@ class VIEW3D_PT_QFEntityRelations(bpy.types.Panel):
 class OBJECT_UL_EntityField_list(bpy.types.UIList):
     def draw_item(self, context, layout, data, item, icon, active_data,
                   active_propname, index):
-        layout.label(item.name)
-        layout.label(item.value)
+        layout.label(text=item.name)
+        layout.label(text=item.value)
 
 def qfentity_items(self, context):
     qfmap = context.scene.qfmap
     entclasses = qfmap.entity_classes
     eclist = list(entclasses.keys())
     eclist.sort()
-    enum = (('', "--", ""),)
+    enum = (('.', "--", ""),)
     enum += tuple(map(lambda ec: (ec, ec, ""), eclist))
     return enum
 
 class QFEntityProp(bpy.types.PropertyGroup):
-    value = StringProperty(name="")
-    template_list_controls = StringProperty(default="value", options={'HIDDEN'})
+    value: StringProperty(name="")
+    template_list_controls: StringProperty(default="value", options={'HIDDEN'})
 
 class QFEntity(bpy.types.PropertyGroup):
-    classname = EnumProperty(items = qfentity_items, name = "Entity Class")
-    flags = BoolVectorProperty(size=12)
-    fields = CollectionProperty(type=QFEntityProp, name="Fields")
-    field_idx = IntProperty()
+    classname: EnumProperty(items = qfentity_items, name = "Entity Class")
+    flags: BoolVectorProperty(size=12)
+    fields: CollectionProperty(type=QFEntityProp, name="Fields")
+    field_idx: IntProperty()
 
 class QFEntpropAdd(bpy.types.Operator):
     '''Add an entity field/value pair'''
@@ -188,7 +200,7 @@ class OBJECT_PT_EntityPanel(bpy.types.Panel):
         box=layout.box()
         lines = reflow_text(ec.comment, 40)
         for l in lines:
-            box.label(l)
+            box.label(text=l)
         row = layout.row()
         for c in range(3):
             col = row.column()
@@ -201,8 +213,8 @@ class OBJECT_PT_EntityPanel(bpy.types.Panel):
         col.template_list("OBJECT_UL_EntityField_list", "", qfentity, "fields",
                           qfentity, "field_idx", rows=3)
         col = row.column(align=True)
-        col.operator("object.entprop_add", icon='ZOOMIN', text="")
-        col.operator("object.entprop_remove", icon='ZOOMOUT', text="")
+        col.operator("object.entprop_add", icon='ADD', text="")
+        col.operator("object.entprop_remove", icon='REMOVE', text="")
         if len(qfentity.fields) > qfentity.field_idx >= 0:
             row = layout.row()
             field = qfentity.fields[qfentity.field_idx]
@@ -246,8 +258,7 @@ def entity_box(entityclass):
     mesh = bpy.data.meshes.new(name)
     mesh.from_pydata(verts, [], faces)
     mat = bpy.data.materials.new(name)
-    mat.diffuse_color = color
-    mat.use_raytrace = False
+    mat.diffuse_color = color + (1,)
     mesh.materials.append(mat)
     return mesh
 
@@ -258,7 +269,7 @@ def set_entity_props(obj, ent):
             qfe.classname = ent.d["classname"]
         except TypeError:
             #FIXME hmm, maybe an enum wasn't the most brilliant idea?
-            qfe.classname
+            qfe.classname = ''
     if "spawnflags" in ent.d:
         flags = int(float(ent.d["spawnflags"]))
         for i in range(12):
@@ -296,5 +307,17 @@ def add_entity(self, context, entclass):
     context.user_preferences.edit.use_global_undo = True
     return {'FINISHED'}
 
-def register():
-    bpy.types.Object.qfentity = PointerProperty(type=QFEntity)
+classes_to_register = (
+    VIEW3D_PT_QFEntityRelations,
+    OBJECT_UL_EntityField_list,
+    QFEntityProp,
+    QFEntity,
+    QFEntpropAdd,
+    QFEntpropRemove,
+    OBJECT_PT_EntityPanel,
+)
+menus_to_register = (
+)
+custom_properties_to_register = (
+    (bpy.types.Object, "qfentity", QFEntity),
+)
diff --git a/tools/io_qfmap/entityclass.py b/tools/io_qfmap/entityclass.py
index f659c5d53..c7b9cbd0e 100644
--- a/tools/io_qfmap/entityclass.py
+++ b/tools/io_qfmap/entityclass.py
@@ -140,6 +140,8 @@ class EntityClassDict:
     def __len__(self):
         return self.entity_classes.__len__()
     def __getitem__(self, key):
+        if key == '.':
+            return EntityClass.null()
         return self.entity_classes.__getitem__(key)
     def __iter__(self):
         return self.entity_classes.__iter__()
diff --git a/tools/io_qfmap/import_map.py b/tools/io_qfmap/import_map.py
index 7d22912a0..c247d4920 100644
--- a/tools/io_qfmap/import_map.py
+++ b/tools/io_qfmap/import_map.py
@@ -61,9 +61,8 @@ def load_material(tx):
     if tx.name in bpy.data.materials:
         return bpy.data.materials[tx.name]
     mat = bpy.data.materials.new(tx.name)
-    mat.diffuse_color = (1, 1, 1)
+    mat.diffuse_color = (1, 1, 1, 1)
     mat.specular_intensity = 0
-    mat.use_raytrace = False
     if tx.image:
         tex = bpy.data.textures.new(tx.name, 'IMAGE')
         tex.extension = 'REPEAT'
@@ -77,19 +76,23 @@ def load_material(tx):
     return mat
 
 def load_textures(texdefs, wads):
+    class MT:
+        def __init__(self, x, y):
+            self.width = x
+            self.height = y
     for tx in texdefs:
         if hasattr(tx, "miptex"):
             continue
-        try:
-            tx.miptex = wads[0].getData(tx.name)
-            tx.image = load_image(tx)
-        except KeyError:
-            class MT:
-                def __init__(self, x, y):
-                    self.width = x
-                    self.height = y
+        if not wads or not wads[0]:
             tx.miptex = MT(64,64)
             tx.image = None
+        else:
+            try:
+                tx.miptex = wads[0].getData(tx.name)
+                tx.image = load_image(tx)
+            except KeyError:
+                tx.miptex = MT(64,64)
+                tx.image = None
         tx.material = load_material(tx)
 
 def build_uvs(verts, faces, texdefs):
@@ -110,7 +113,7 @@ def process_entity(ent, wads):
     classname = ent.d["classname"]
     name = classname
     if "classname" in ent.d and ent.d["classname"][:5] == "light":
-        light = bpy.data.lamps.new("light", 'POINT')
+        light = bpy.data.lights.new("light", 'POINT')
         if "light" in ent.d:
             light.distance = float(ent.d["light"])
         elif "_light" in ent.d:
@@ -150,7 +153,7 @@ def process_entity(ent, wads):
             tx.matindex = len(mesh.materials)
             mesh.materials.append(tx.material)
         mesh.from_pydata(verts, [], faces)
-        uvlay = mesh.uv_textures.new(name)
+        """uvlay = mesh.uv_textures.new(name)
         uvloop = mesh.uv_layers[0]
         for i, texpoly in enumerate(uvlay.data):
             poly = mesh.polygons[i]
@@ -159,7 +162,7 @@ def process_entity(ent, wads):
             texpoly.image = tx.image
             poly.material_index = tx.matindex
             for j, k in enumerate(poly.loop_indices):
-                uvloop.data[k].uv = uv[j]
+                uvloop.data[k].uv = uv[j]"""#FIXME
         mesh.update()
         obj = bpy.data.objects.new(name, mesh)
     else:
@@ -189,50 +192,52 @@ def process_entity(ent, wads):
             del ent.d["angles"]
     obj.rotation_mode = 'XZY'
     obj.rotation_euler = angles * pi / 180
-    bpy.context.scene.objects.link(obj)
-    bpy.context.scene.objects.active=obj
-    obj.select = True
+    bpy.context.layer_collection.collection.objects.link(obj)
+    bpy.context.view_layer.objects.active = obj
+    obj.select_set(True)
     set_entity_props(obj, ent)
 
 def import_map(operator, context, filepath):
-    bpy.context.user_preferences.edit.use_global_undo = False
-
-    for obj in bpy.context.scene.objects:
-        obj.select = False
+    undo = bpy.context.preferences.edit.use_global_undo
+    bpy.context.preferences.edit.use_global_undo = False
 
     try:
+        for obj in bpy.context.scene.objects:
+            obj.select_set(False)
         entities = parse_map (filepath)
     except MapError as err:
         operator.report({'ERROR'}, repr(err))
         return {'CANCELLED'}
-    wads=[]
-    if entities:
-        if "_wad" in entities[0].d:
-            wads = entities[0].d["_wad"].split(";")
-        elif "wad" in entities[0].d:
-            wads = entities[0].d["wad"].split(";")
-        wadpath = bpy.context.scene.qfmap.wadpath
-        for i in range(len(wads)):
-            try:
-                wads[i] = WadFile.load(os.path.join(wadpath, wads[i]))
-            except IOError:
+    else:
+        wads=[]
+        if entities:
+            if "_wad" in entities[0].d:
+                wads = entities[0].d["_wad"].split(";")
+            elif "wad" in entities[0].d:
+                wads = entities[0].d["wad"].split(";")
+            wadpath = bpy.context.scene.qfmap.wadpath
+            for i in range(len(wads)):
                 try:
-                    wads[i] = WadFile.load(os.path.join(wadpath,
-                                           os.path.basename(wads[i])))
+                    wads[i] = WadFile.load(os.path.join(wadpath, wads[i]))
                 except IOError:
-                    #give up
-                    operator.report({'INFO'}, "Cant't find %s" % wads[i])
-                    wads[i] = None
-    for ent in entities:
-        process_entity(ent, wads)
-    bpy.context.user_preferences.edit.use_global_undo = True
+                    try:
+                        wads[i] = WadFile.load(os.path.join(wadpath,
+                                               os.path.basename(wads[i])))
+                    except IOError:
+                        #give up
+                        operator.report({'INFO'}, "Cant't find %s" % wads[i])
+                        wads[i] = None
+        for ent in entities:
+            process_entity(ent, wads)
+    finally:
+        bpy.context.preferences.edit.use_global_undo = undo
     return {'FINISHED'}
 
 def import_pts(operator, context, filepath):
     bpy.context.user_preferences.edit.use_global_undo = False
 
     for obj in bpy.context.scene.objects:
-        obj.select = False
+        obj.select_set(False)
 
     lines = open(filepath, "rt").readlines()
     verts = [None] * len(lines)
@@ -248,6 +253,6 @@ def import_pts(operator, context, filepath):
     obj = bpy.data.objects.new("leak points", mesh)
     bpy.context.scene.objects.link(obj)
     bpy.context.scene.objects.active=obj
-    obj.select = True
+    obj.select_set(True)
     bpy.context.user_preferences.edit.use_global_undo = True
     return {'FINISHED'}
diff --git a/tools/io_qfmap/init.py b/tools/io_qfmap/init.py
new file mode 100644
index 000000000..199bb71fa
--- /dev/null
+++ b/tools/io_qfmap/init.py
@@ -0,0 +1,294 @@
+# vim:ts=4:et
+# ##### BEGIN GPL LICENSE BLOCK #####
+#
+#  This program is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License
+#  as published by the Free Software Foundation; either version 2
+#  of the License, or (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software Foundation,
+#  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# ##### END GPL LICENSE BLOCK #####
+
+# <pep8 compliant>
+
+import bpy
+from bpy.props import BoolProperty, FloatProperty, StringProperty, EnumProperty
+from bpy.props import FloatVectorProperty, PointerProperty
+from bpy_extras.io_utils import ExportHelper, ImportHelper, path_reference_mode, axis_conversion
+from bpy.app.handlers import persistent
+
+from .entityclass import EntityClassDict, EntityClassError
+from . import entity
+from . import import_map
+from . import export_map
+
+def ecm_draw(self, context):
+    layout = self.layout
+    for item in self.menu_items:
+        if type(item[1]) is str:
+            ec = context.scene.qfmap.entity_classes[item[1]]
+            if ec.size:
+                icon = 'OBJECT_DATA'
+            else:
+                icon = 'MESH_DATA'
+            op = layout.operator("object.add_entity", text=item[0], icon=icon)
+            op.entclass=item[1]
+            if ec.comment:
+                pass
+        else:
+            layout.menu(item[1].bl_idname)
+
+class EntityClassMenu:
+    @classmethod
+    def clear(cls):
+        while cls.menu_items:
+            if type(cls.menu_item[0][1]) is not str:
+                bpy.utils.unregister_class(cls.menu_items[0][1])
+                cls.menu_items[0][1].clear()
+            del cls.menu_items[0]
+    @classmethod
+    def build(cls, menudict, name="INFO_MT_entity_add", label="entity"):
+        items = list(menudict.items())
+        items.sort()
+        menu_items = []
+        for i in items:
+            i = list(i)
+            if type(i[1]) is dict:
+                if i[0]:
+                    nm = "_".join((name, i[0]))
+                else:
+                    nm = name
+                i[1] = cls.build(i[1], nm, i[0])
+            menu_items.append(i)
+        attrs = {}
+        attrs["menu_items"] = menu_items
+        attrs["draw"] = ecm_draw
+        attrs["bl_idname"] = name
+        attrs["bl_label"] = label
+        attrs["clear"] = cls.clear
+        menu = type(name, (bpy.types.Menu,), attrs)
+        bpy.utils.register_class(menu)
+        return menu
+
+@persistent
+def scene_load_handler(dummy):
+    for scene in bpy.data.scenes:
+        if hasattr(scene, "qfmap"):
+            scene.qfmap.script_update(bpy.context)
+
+class MapeditMessage(bpy.types.Operator):
+    bl_idname = "qfmapedit.message"
+    bl_label = "Message"
+    type: StringProperty()
+    message: StringProperty()
+
+    def execute(self, context):
+        self.report({'INFO'}, message)
+        return {'FINISHED'}
+    def invoke(self, context, event):
+        wm = context.window_manager
+        return wm.invoke_popup(self, width=400, height=200)
+    def draw(self, context):
+        self.layout.label(self.type, icon='ERROR')
+        self.layout.label(self.message)
+
+def scan_entity_classes(context):
+    qfmap = context.scene.qfmap
+    if not qfmap.dirpath:
+        return
+    qfmap.entity_classes.from_source_tree(qfmap.dirpath)
+    name = context.scene.name + '-EntityClasses'
+    if name in bpy.data.texts:
+        txt = bpy.data.texts[name]
+    else:
+        txt = bpy.data.texts.new(name)
+    txt.from_string(qfmap.entity_classes.to_plist())
+    qfmap.script = name
+
+def parse_entity_classes(context):
+    context.scene.qfmap.script_update(context)
+
+def ec_dir_update(self, context):
+    try:
+        scan_entity_classes(context)
+    except EntityClassError as err:
+        self.dirpath = ""
+        bpy.ops.qfmapedit.message('INVOKE_DEFAULT', type="Error",
+                                  message="Entity Class Error: %s" % err)
+
+def ec_script_update(self, context):
+    self.script_update(context)
+
+class AddEntity(bpy.types.Operator):
+    '''Add an entity'''
+    bl_idname = "object.add_entity"
+    bl_label = "Entity"
+    entclass: StringProperty(name = "entclass")
+
+    def execute(self, context):
+        keywords = self.as_keywords()
+        return entity.add_entity(self, context, **keywords)
+
+class QFEntityClassScan(bpy.types.Operator):
+    '''Rescan the specified QuakeC source tree'''
+    bl_idname = "scene.scan_entity_classes"
+    bl_label = "RELOAD"
+
+    def execute(self, context):
+        scan_entity_classes(context)
+        return {'FINISHED'}
+
+class QFEntityClassParse(bpy.types.Operator):
+    '''Reparse the specified entity class script'''
+    bl_idname = "scene.parse_entity_classes"
+    bl_label = "RELOAD"
+
+    def execute(self, context):
+        parse_entity_classes(context)
+        return {'FINISHED'}
+
+class QFEntityClasses(bpy.types.PropertyGroup):
+    wadpath: StringProperty(
+        name="wadpath",
+        description="Path to search for wad files",
+        subtype='DIR_PATH')
+    dirpath: StringProperty(
+        name="dirpath",
+        description="Path to qc source tree",
+        subtype='DIR_PATH',
+        update=ec_dir_update)
+    script: StringProperty(
+        name="script",
+        description="entity class storage",
+        update=ec_script_update)
+    entity_classes = EntityClassDict()
+    ecm = EntityClassMenu.build({})
+    entity_targets = {}
+    target_entities = []
+
+    def script_update(self, context):
+        if self.script in bpy.data.texts:
+            script = bpy.data.texts[self.script].as_string()
+            self.entity_classes.from_plist(script)
+            menudict = {}
+            entclasses = self.entity_classes.keys()
+            for ec in entclasses:
+                ecsub = ec.split("_")
+                d = menudict
+                for sub in ecsub[:-1]:
+                    if sub not in d:
+                        d[sub] = {}
+                    elif type(d[sub]) is str:
+                        d[sub] = {"":d[sub]}
+                    d = d[sub]
+                sub = ecsub[-1]
+                if sub in d:
+                    d[sub][""] = ec
+                else:
+                    d[sub] = ec
+            self.__class__.ecm = EntityClassMenu.build(menudict)
+
+class OBJECT_PT_QFECPanel(bpy.types.Panel):
+    bl_space_type = 'VIEW_3D'
+    bl_region_type = 'UI'
+    #bl_context = 'scene'
+    bl_category = "View"
+    bl_label = 'QF Entity Classes'
+
+    @classmethod
+    def poll(cls, context):
+        return True
+
+    def draw(self, context):
+        layout = self.layout
+        scene = context.scene
+        row = layout.row()
+        layout.prop(scene.qfmap, "wadpath")
+        row = layout.row()
+        row.prop(scene.qfmap, "dirpath")
+        row.operator("scene.scan_entity_classes", text="", icon="FILE_REFRESH")
+        row = layout.row()
+        row.prop(scene.qfmap, "script")
+        row.operator("scene.parse_entity_classes", text="", icon="FILE_REFRESH")
+
+class ImportPoints(bpy.types.Operator, ImportHelper):
+    '''Load a Quake points File'''
+    bl_idname = "import_mesh.quake_points"
+    bl_label = "Import points"
+
+    filename_ext = ".pts"
+    filter_glob: StringProperty(default="*.pts", options={'HIDDEN'})
+
+    def execute(self, context):
+        keywords = self.as_keywords (ignore=("filter_glob",))
+        return import_map.import_pts(self, context, **keywords)
+
+class ImportMap(bpy.types.Operator, ImportHelper):
+    '''Load a Quake map File'''
+    bl_idname = "import_mesh.quake_map"
+    bl_label = "Import map"
+
+    filename_ext = ".map"
+    filter_glob: StringProperty(default="*.map", options={'HIDDEN'})
+
+    def execute(self, context):
+        keywords = self.as_keywords (ignore=("filter_glob",))
+        return import_map.import_map(self, context, **keywords)
+
+class ExportMap(bpy.types.Operator, ExportHelper):
+    '''Save a Quake map File'''
+
+    bl_idname = "export_mesh.quake_map"
+    bl_label = "Export map"
+
+    filename_ext = ".map"
+    filter_glob: StringProperty(default="*.map", options={'HIDDEN'})
+
+    @classmethod
+    def poll(cls, context):
+        return True
+
+    def execute(self, context):
+        keywords = self.as_keywords (ignore=("check_existing", "filter_glob"))
+        return export_map.export_map(self, context, **keywords)
+
+def menu_func_import(self, context):
+    self.layout.operator(ImportMap.bl_idname, text="Quake map (.map)")
+    self.layout.operator(ImportPoints.bl_idname, text="Quake points (.pts)")
+
+def menu_func_export(self, context):
+    self.layout.operator(ExportMap.bl_idname, text="Quake map (.map)")
+
+def menu_func_add(self, context):
+    self.layout.menu(context.scene.qfmap.ecm.bl_idname, icon='PLUGIN')
+
+classes_to_register = (
+    MapeditMessage,
+    AddEntity,
+    QFEntityClassScan,
+    QFEntityClassParse,
+    QFEntityClasses,
+    OBJECT_PT_QFECPanel,
+    ImportPoints,
+    ImportMap,
+    ExportMap,
+)
+menus_to_register = (
+    (bpy.types.TOPBAR_MT_file_import, menu_func_import),
+    (bpy.types.TOPBAR_MT_file_export, menu_func_export),
+    (bpy.types.VIEW3D_MT_add, menu_func_add),
+)
+custom_properties_to_register = (
+    (bpy.types.Scene, "qfmap", QFEntityClasses),
+)
+handlers_to_register = (
+    ("load_post", scene_load_handler),
+)
diff --git a/tools/io_qfmap/map.py b/tools/io_qfmap/map.py
index b0820de69..e47b7563a 100644
--- a/tools/io_qfmap/map.py
+++ b/tools/io_qfmap/map.py
@@ -38,8 +38,8 @@ class Texinfo:
         norm = s_vec.cross(t_vec)
         q = Quaternion(norm, rotate * pi / 180)
         self.vecs = [None] * 2
-        self.vecs[0] = (q * s_vec / scale[0], s_offs)
-        self.vecs[1] = (q * t_vec / scale[1], t_offs)
+        self.vecs[0] = (q @ s_vec / scale[0], s_offs)
+        self.vecs[1] = (q @ t_vec / scale[1], t_offs)
     def __cmp__(self, other):
         return self.name == other.name and self.vecs == other.vecs
     @classmethod

From 7ae047654bb70af4e2c3f8b7f2e661eaf5c5adf8 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 21 Jun 2020 17:07:54 +0900
Subject: [PATCH 1145/1519] [util] Rework SEB affine/convex testing

When I ported SEB to python, I discovered that I apparently didn't
really understand the paper's description of the end condition and the
usage of the affine and convex sets for center testing. This cleans up
the test and makes SEB more correct for the cases that have less than 4
supporting points (especially when there are less than 4 points total).
---
 libs/util/mathlib.c       | 117 +++++++++++++++++++++++++++-----------
 libs/util/test/test-seb.c |   2 +-
 2 files changed, 84 insertions(+), 35 deletions(-)

diff --git a/libs/util/mathlib.c b/libs/util/mathlib.c
index db68455f3..0ca7ae1b7 100644
--- a/libs/util/mathlib.c
+++ b/libs/util/mathlib.c
@@ -1259,7 +1259,6 @@ circum_circle (const vec_t **points, int num_points, sphere_t *sphere)
 			VectorMultAdd (sphere->center, bb, ca, sphere->center);
 			VectorMultAdd (sphere->center, cc, ab, sphere->center);
 			VectorAdd (sphere->center, points[0], sphere->center);
-			sphere->radius = VectorDistance (sphere->center, points[0]);
 			return 1;
 	}
 	return 0;
@@ -1286,8 +1285,8 @@ CircumSphere (const vec3_t points[], int num_points, sphere_t *sphere)
 }
 
 static void
-closest_point (const vec_t **points, int num_points, const vec3_t x,
-			   vec3_t closest)
+closest_affine_point (const vec_t **points, int num_points, const vec3_t x,
+					  vec3_t closest)
 {
 	vec3_t      a, b, n, d;
 	vec_t       l;
@@ -1314,6 +1313,74 @@ closest_point (const vec_t **points, int num_points, const vec3_t x,
 	}
 }
 
+static int
+test_support_points(const vec_t **points, int *num_points, const vec3_t center)
+{
+	int         in_affine = 0;
+	int         in_convex = 0;
+	vec3_t      v, d, n, a, b;
+	vec_t       nn, dd, vv, dn;
+
+	switch (*num_points) {
+		case 1:
+			in_affine = VectorCompare (points[0], center);
+			// the convex hull and affine hull for a single point are the same
+			in_convex = in_affine;
+			break;
+		case 2:
+			VectorSubtract (points[1], points[0], v);
+			VectorSubtract (center, points[0], d);
+			CrossProduct (v, d, n);
+			nn = DotProduct (n, n);
+			dd = DotProduct (d, d);
+			vv = DotProduct (v, v);
+			in_affine = nn < 1e-8 * vv * dd;
+			break;
+		case 3:
+			VectorSubtract (points[1], points[0], a);
+			VectorSubtract (points[2], points[0], b);
+			VectorSubtract (center, points[0], d);
+			CrossProduct (a, b, n);
+			dn = DotProduct (d, n);
+			dd = DotProduct (d, d);
+			nn = DotProduct (n, n);
+			in_affine = dn * dn < 1e-8 * dd * nn;
+			break;
+		case 4:
+			in_affine = 1;
+			break;
+		default:
+			Sys_Error ("Invalid number of points (%d) in test_support_points",
+					   *num_points);
+	}
+
+	// if in_convex is not true while in_affine is, then need to test as
+	// there is more than one dimension for the affine hull (a single support
+	// point is never dropped as it cannot be redundant)
+	if (in_affine && !in_convex) {
+		vec_t       lambda[4];
+		int         dropped = 0;
+		int         count = *num_points;
+
+		BarycentricCoords (points, count, center, lambda);
+
+		for (int i = 0; i < count; i++) {
+			points[i - dropped] = points[i];
+			if (lambda[i] < -1e-4) {
+				dropped++;
+				(*num_points)--;
+			}
+		}
+		in_convex = !dropped;
+		if (dropped) {
+			for (int i = count - dropped; i < count; i++) {
+				points[i] = 0;
+			}
+		}
+	}
+	return in_convex;
+}
+
 sphere_t
 SmallestEnclosingBall (const vec3_t points[], int num_points)
 {
@@ -1323,10 +1390,11 @@ SmallestEnclosingBall (const vec3_t points[], int num_points)
 	int         num_support;
 	vec_t       dist, best_dist;
 	int         i;
-	int         itters = 0;
+	int         iters = 0;
 
-	if (num_points < 3) {
-		CircumSphere (points, num_points, &sphere);
+	if (num_points < 1) {
+		VectorZero (sphere.center);
+		sphere.radius = 0;
 		return sphere;
 	}
 
@@ -1335,7 +1403,7 @@ SmallestEnclosingBall (const vec3_t points[], int num_points)
 
 	VectorCopy (points[0], sphere.center);
 	best_dist = dist = 0;
-	best = 0;
+	best = points[0];
 	for (i = 1; i < num_points; i++) {
 		dist = VectorDistance_fast (points[i], sphere.center);
 		if (dist > best_dist) {
@@ -1347,41 +1415,22 @@ SmallestEnclosingBall (const vec3_t points[], int num_points)
 	support[0] = best;
 	sphere.radius = best_dist;	// note: radius squared until the end
 
-	while (1) {
+	while (!test_support_points (support, &num_support, sphere.center)) {
 		vec3_t      affine;
 		vec3_t      center_to_affine, center_to_point;
 		vec_t       affine_dist, point_proj, point_dist, bound;
 		vec_t       scale = 1;
 		int         i;
 
-		if (itters++ > 10)
+		if (iters++ > 10)
 			Sys_Error ("stuck SEB");
 		best = 0;
 
-		if (num_support == 4) {
-			vec_t       lambda[4];
-			int         dropped = 0;
-
-			BarycentricCoords (support, 4, sphere.center, lambda);
-			for (i = 0; i < 4; i++) {
-				support[i - dropped] = support[i];
-				if (lambda[i] < 0) {
-					dropped++;
-					num_support--;
-				}
-			}
-			if (!dropped)
-				break;
-			for (i = 4 - dropped; i < 4; i++)
-				support[i] = 0;
-		}
-		closest_point (support, num_support, sphere.center, affine);
+		closest_affine_point (support, num_support, sphere.center, affine);
 		VectorSubtract (affine, sphere.center, center_to_affine);
 		affine_dist = DotProduct (center_to_affine, center_to_affine);
-		if (affine_dist < 1e-2 * sphere.radius)
-			break;
 		for (i = 0; i < num_points; i++) {
-			if (points[i] == support [0] || points[i] == support[1]
+			if (points[i] == support[0] || points[i] == support[1]
 				|| points[i] == support[2])
 				continue;
 			VectorSubtract (points[i], sphere.center, center_to_point);
@@ -1399,10 +1448,10 @@ SmallestEnclosingBall (const vec3_t points[], int num_points)
 			}
 		}
 		VectorMultAdd (sphere.center, scale, center_to_affine, sphere.center);
-		if (!best)
-			break;
-		sphere.radius = VectorDistance_fast (sphere.center, best);
-		support[num_support++] = best;
+		sphere.radius = VectorDistance_fast (sphere.center, support[0]);
+		if (best) {
+			support[num_support++] = best;
+		}
 	}
 	best_dist = 0;
 	for (i = 0; i < num_points; i++) {
diff --git a/libs/util/test/test-seb.c b/libs/util/test/test-seb.c
index 801e1ff88..d5e900972 100644
--- a/libs/util/test/test-seb.c
+++ b/libs/util/test/test-seb.c
@@ -96,7 +96,7 @@ main (int argc, const char **argv)
 		}
 	}
 	end = Sys_DoubleTime ();
-	printf ("%d itterations in %gs: %g itters/second\n", (int) i, end - start,
+	printf ("%d iterations in %gs: %g iters/second\n", (int) i, end - start,
 			i / (end - start));
 	return res;
 }

From df89e37afc1e38679edb73747ef8a771be385d1b Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 24 Jun 2020 22:47:12 +0900
Subject: [PATCH 1146/1519] [console] Call PR_RunPostLoadFuncs

This fixes the segfault when loading the menu progs. I had forgotten
that the menu code doesn't use PR_LoadProgs (I don't remember why.
Obsolete reason?).
---
 libs/console/menu.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libs/console/menu.c b/libs/console/menu.c
index 90eaeca75..d1a5e9c76 100644
--- a/libs/console/menu.c
+++ b/libs/console/menu.c
@@ -628,7 +628,8 @@ Menu_Load (void)
 		PR_LoadProgsFile (&menu_pr_state, file, size);
 		Qclose (file);
 
-		if (!PR_RunLoadFuncs (&menu_pr_state)) {
+		if (!PR_RunLoadFuncs (&menu_pr_state)
+			|| !PR_RunPostLoadFuncs (&menu_pr_state)) {
 			free (menu_pr_state.progs);
 			menu_pr_state.progs = 0;
 		}

From 6d5ffa9f8e8daf04b560036d833f24acb332d123 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 21 Jun 2020 23:15:17 +0900
Subject: [PATCH 1147/1519] [build] Move to non-recursive make

There's still some cleanup to do, but everything seems to be working
nicely: `make -j` works, `make distcheck` passes. There is probably
plenty of bitrot in the package directories (RPM, debian), though.

The vc project files have been removed since those versions are way out
of date and quakeforge is pretty much dependent on gcc now anyway.

Most of the old Makefile.am files  are now Makemodule.am.  This should
allow for new Makefile.am files that allow local building (to be added
on an as-needed bases).  The current remaining Makefile.am files are for
standalone sub-projects.a

The installable bins are currently built in the top-level build
directory. This may change if the clutter gets to be too much.

While this does make a noticeable difference in build times, the main
reason for the switch was to take care of the growing dependency issues:
now it's possible to build tools for code generation (eg, using qfcc and
ruamoko programs for code-gen).
---
 Makefile.am                                   | 113 +-
 RPM/Makefile.am                               |   9 -
 RPM/Makemodule.am                             |   6 +
 bootstrap                                     |   2 +-
 config.d/ac_config_files.m4                   |  98 --
 config.d/build_control.m4                     |  90 +-
 config.d/rpm.m4                               |   2 +-
 configure.ac                                  |   2 +-
 debian/Makefile.am                            |  23 -
 debian/Makemodule.am                          |  28 +
 desktop/Makefile.am                           |  49 -
 desktop/Makemodule.am                         |  10 +
 desktop/quakeforge-nq-glx.desktop             |  18 -
 desktop/quakeforge-nq-sdl32.desktop           |  18 -
 desktop/quakeforge-nq-sgl.desktop             |  18 -
 desktop/quakeforge-qw-glx.desktop             |  18 -
 desktop/quakeforge-qw-sdl32.desktop           |  18 -
 desktop/quakeforge-qw-sgl.desktop             |  18 -
 doc/Makefile.am                               |  55 -
 doc/Makemodule.am                             |  80 ++
 doc/man/Makefile.am                           |   4 -
 hw/Makefile.am                                |   4 -
 hw/Makemodule.am                              |   1 +
 hw/include/Makefile.am                        |   4 -
 hw/source/{Makefile.am => Makemodule.am}      |  22 +-
 include/Makefile.am                           |  26 -
 include/Makemodule.am                         |  88 ++
 include/QF/Makefile.am                        |  38 -
 include/QF/Makemodule.am                      | 151 +++
 libs/Makefile.am                              |  12 -
 libs/Makemodule.am                            |  13 +
 libs/audio/Makefile.am                        |  77 --
 libs/audio/Makemodule.am                      |  67 ++
 libs/audio/renderer/Makefile.am               |  55 -
 libs/audio/renderer/Makemodule.am             |  46 +
 libs/audio/targets/Makefile.am                |  62 --
 libs/audio/targets/Makemodule.am              |  54 +
 libs/audio/test/Makefile.am                   |   6 +-
 libs/client/Makefile.am                       |  11 -
 libs/client/Makemodule.am                     |   6 +
 libs/console/Makefile.am                      |  43 -
 libs/console/Makemodule.am                    |  33 +
 libs/gamecode/Makefile.am                     |  16 -
 libs/gamecode/Makemodule.am                   |  19 +
 libs/gib/Makefile.am                          |  22 -
 libs/gib/Makemodule.am                        |  29 +
 libs/image/Makefile.am                        |  18 -
 libs/image/Makemodule.am                      |   9 +
 libs/models/Makefile.am                       |  58 --
 libs/models/Makemodule.am                     |  55 +
 libs/models/alias/Makefile.am                 |  20 -
 libs/models/alias/Makemodule.am               |  15 +
 libs/models/brush/Makefile.am                 |  22 -
 libs/models/brush/Makemodule.am               |  17 +
 libs/models/iqm/Makefile.am                   |  20 -
 libs/models/iqm/Makemodule.am                 |  15 +
 libs/models/sprite/Makefile.am                |  20 -
 libs/models/sprite/Makemodule.am              |  15 +
 libs/models/test/Makefile.am                  |  24 -
 libs/models/test/Makemodule.am                |  36 +
 libs/net/Makefile.am                          |  19 -
 libs/net/Makemodule.am                        |  14 +
 libs/net/nc/Makefile.am                       |  17 -
 libs/net/nc/Makemodule.am                     |   8 +
 libs/net/nm/Makefile.am                       |  18 -
 libs/net/nm/Makemodule.am                     |   8 +
 libs/qw/Makefile.am                           |   8 -
 libs/qw/Makemodule.am                         |   4 +
 libs/ruamoko/Makefile.am                      |  21 -
 libs/ruamoko/Makemodule.am                    |  26 +
 libs/util/Makefile.am                         |  60 --
 libs/util/Makemodule.am                       |  84 ++
 libs/util/test/Makefile.am                    |  70 --
 libs/util/test/Makemodule.am                  |  79 ++
 libs/video/Makefile.am                        |   6 -
 libs/video/Makemodule.am                      |   2 +
 libs/video/renderer/Makefile.am               |  65 --
 libs/video/renderer/Makemodule.am             | 185 ++++
 libs/video/renderer/gl/Makefile.am            |  16 -
 libs/video/renderer/glsl/Makefile.am          |  28 -
 libs/video/renderer/glsl/vid_common_glsl.c    |   2 +-
 libs/video/renderer/sw/Makefile.am            |  33 -
 libs/video/renderer/sw32/Makefile.am          |  18 -
 libs/video/targets/Makefile.am                | 117 ---
 libs/video/targets/Makemodule.am              | 115 +++
 m4/quakeforge.m4                              |  16 +-
 nq/Makefile.am                                |   4 -
 nq/Makemodule.am                              |   3 +
 nq/include/Makefile.am                        |   5 -
 nq/include/Makemodule.am                      |  11 +
 nq/source/Makefile.am                         | 176 ----
 nq/source/Makemodule.am                       | 164 +++
 nq/source/cl_chase.c                          |   5 +-
 nq/source/cl_cmd.c                            |   2 +-
 nq/source/cl_demo.c                           |   5 +-
 nq/source/cl_ents.c                           |  11 +-
 nq/source/cl_input.c                          |   7 +-
 nq/source/cl_main.c                           |  15 +-
 nq/source/cl_parse.c                          |   9 +-
 nq/source/cl_screen.c                         |   3 +-
 nq/source/cl_tent.c                           |   3 +-
 nq/source/cl_view.c                           |   7 +-
 nq/source/game.c                              |   4 +-
 nq/source/host.c                              |   9 +-
 nq/source/host_cmd.c                          |   9 +-
 nq/source/sbar.c                              |   7 +-
 nq/source/sv_cl_phys.c                        |   7 +-
 nq/source/sv_cvar.c                           |   2 +-
 nq/source/sv_ded.c                            |   4 +-
 nq/source/sv_main.c                           |   7 +-
 nq/source/sv_move.c                           |   5 +-
 nq/source/sv_phys.c                           |   5 +-
 nq/source/sv_pr_cmds.c                        |   7 +-
 nq/source/sv_progs.c                          |   7 +-
 nq/source/sv_user.c                           |   7 +-
 nq/source/sys_sdl.c                           |   6 +-
 nq/source/sys_unix.c                          |   4 +-
 nq/source/sys_unixd.c                         |   2 +-
 nq/source/sys_win.c                           |   4 +-
 nq/source/sys_wind.c                          |   2 +-
 nq/source/world.c                             |   5 +-
 pkg-config/Makefile.am                        |   5 -
 pkg-config/Makemodule.am                      |   5 +
 qtv/Makefile.am                               |   4 -
 qtv/Makemodule.am                             |   2 +
 qtv/include/Makefile.am                       |   4 -
 qtv/include/Makemodule.am                     |   5 +
 qtv/source/{Makefile.am => Makemodule.am}     |  29 +-
 qtv/source/client.c                           |   8 +-
 qtv/source/connection.c                       |   2 +-
 qtv/source/qtv.c                              |  13 +-
 qtv/source/sbar.c                             |   7 +-
 qtv/source/server.c                           |   8 +-
 qtv/source/sv_parse.c                         |   8 +-
 qw/Makefile.am                                |   4 -
 qw/Makemodule.am                              |   2 +
 qw/include/Makefile.am                        |   9 -
 qw/include/Makemodule.am                      |  28 +
 qw/source/Makefile.am                         | 191 ----
 qw/source/Makemodule.am                       | 175 ++++
 qw/source/cl_cam.c                            |  11 +-
 qw/source/cl_chase.c                          |   6 +-
 qw/source/cl_chat.c                           |   4 +-
 qw/source/cl_cmd.c                            |   2 +-
 qw/source/cl_cvar.c                           |   3 +-
 qw/source/cl_demo.c                           |  13 +-
 qw/source/cl_entparse.c                       |  24 +-
 qw/source/cl_ents.c                           |  25 +-
 qw/source/cl_http.c                           |   8 +-
 qw/source/cl_input.c                          |  19 +-
 qw/source/cl_main.c                           |  42 +-
 qw/source/cl_ngraph.c                         |   5 +-
 qw/source/cl_parse.c                          |  32 +-
 qw/source/cl_pred.c                           |   9 +-
 qw/source/cl_rss.c                            |   4 +-
 qw/source/cl_screen.c                         |   3 +-
 qw/source/cl_skin.c                           |   9 +-
 qw/source/cl_slist.c                          |   6 +-
 qw/source/cl_sys_sdl.c                        |   3 +-
 qw/source/cl_sys_unix.c                       |   3 +-
 qw/source/cl_sys_win.c                        |   4 +-
 qw/source/cl_tent.c                           |  11 +-
 qw/source/cl_view.c                           |  16 +-
 qw/source/crudefile.c                         |   3 +-
 qw/source/game.c                              |   4 +-
 qw/source/locs.c                              |   3 +-
 qw/source/map_cfg.c                           |   2 +-
 qw/source/net_packetlog.c                     |   3 +-
 qw/source/pmove.c                             |   3 +-
 qw/source/pmovetst.c                          |   1 +
 qw/source/sbar.c                              |   9 +-
 qw/source/sv_ccmds.c                          |  13 +-
 qw/source/sv_demo.c                           |   9 +-
 qw/source/sv_ents.c                           |   7 +-
 qw/source/sv_gib.c                            |   4 +-
 qw/source/sv_init.c                           |  11 +-
 qw/source/sv_main.c                           |  19 +-
 qw/source/sv_move.c                           |   4 +-
 qw/source/sv_phys.c                           |   4 +-
 qw/source/sv_pr_cmds.c                        |  11 +-
 qw/source/sv_pr_cpqw.c                        |   6 +-
 qw/source/sv_pr_qwe.c                         |   8 +-
 qw/source/sv_progs.c                          |   9 +-
 qw/source/sv_qtv.c                            |   7 +-
 qw/source/sv_recorder.c                       |   8 +-
 qw/source/sv_sbar.c                           |   5 +-
 qw/source/sv_send.c                           |   9 +-
 qw/source/sv_sys_unix.c                       |   2 +-
 qw/source/sv_sys_win.c                        |   2 +-
 qw/source/sv_user.c                           |  11 +-
 qw/source/teamplay.c                          |   7 +-
 qw/source/world.c                             |   5 +-
 ruamoko/Makefile.am                           |   8 -
 ruamoko/Makemodule.am                         |  10 +
 ruamoko/cl_menu/Makefile.am                   |  71 --
 ruamoko/cl_menu/Makemodule.am                 |  77 ++
 ruamoko/game/Makefile.am                      |  56 -
 ruamoko/game/Makemodule.am                    |  27 +
 ruamoko/gui/Makefile.am                       |  50 -
 ruamoko/gui/Makemodule.am                     |  25 +
 ruamoko/include/Makefile.am                   |  16 -
 ruamoko/include/Makemodule.am                 |  56 +
 ruamoko/lib/Makefile.am                       |  96 --
 ruamoko/lib/Makemodule.am                     |  87 ++
 ruamoko/qwaq/Makefile.am                      | 135 ---
 ruamoko/qwaq/Makemodule.am                    | 149 +++
 ruamoko/qwaq/builtins/builtins.c              |   2 +-
 ruamoko/qwaq/builtins/curses.c                |   8 +-
 ruamoko/qwaq/builtins/debug.c                 |   8 +-
 ruamoko/qwaq/builtins/editbuffer.c            |   4 +-
 ruamoko/qwaq/builtins/input.c                 |   6 +-
 ruamoko/qwaq/builtins/main.c                  |   4 +-
 ruamoko/qwaq/builtins/qwaq-bi.c               |   2 +-
 ruamoko/qwaq/builtins/qwaq.c                  |   2 +-
 ruamoko/qwaq/debugger/debug.h                 |   2 +-
 ruamoko/qwaq/debugger/debug.r                 |   2 +-
 ruamoko/qwaq/debugger/debugger.h              |   4 +-
 ruamoko/qwaq/debugger/debugger.r              |  20 +-
 ruamoko/qwaq/debugger/localsdata.h            |   4 +-
 ruamoko/qwaq/debugger/localsdata.r            |   8 +-
 ruamoko/qwaq/debugger/typeencodings.h         |   2 +-
 ruamoko/qwaq/debugger/typeencodings.r         |   4 +-
 ruamoko/qwaq/debugger/views/basicview.h       |   2 +-
 ruamoko/qwaq/debugger/views/basicview.r       |   4 +-
 ruamoko/qwaq/debugger/views/defview.h         |   4 +-
 ruamoko/qwaq/debugger/views/defview.r         |   4 +-
 ruamoko/qwaq/debugger/views/doubleview.h      |   2 +-
 ruamoko/qwaq/debugger/views/doubleview.r      |   2 +-
 ruamoko/qwaq/debugger/views/entityview.h      |   2 +-
 ruamoko/qwaq/debugger/views/entityview.r      |   2 +-
 ruamoko/qwaq/debugger/views/fieldview.h       |   2 +-
 ruamoko/qwaq/debugger/views/fieldview.r       |   2 +-
 ruamoko/qwaq/debugger/views/floatview.h       |   2 +-
 ruamoko/qwaq/debugger/views/floatview.r       |   2 +-
 ruamoko/qwaq/debugger/views/funcview.h        |   2 +-
 ruamoko/qwaq/debugger/views/funcview.r        |   2 +-
 ruamoko/qwaq/debugger/views/intview.h         |   2 +-
 ruamoko/qwaq/debugger/views/intview.r         |   2 +-
 ruamoko/qwaq/debugger/views/nameview.h        |   2 +-
 ruamoko/qwaq/debugger/views/nameview.r        |   2 +-
 ruamoko/qwaq/debugger/views/pointerview.h     |   2 +-
 ruamoko/qwaq/debugger/views/pointerview.r     |   2 +-
 ruamoko/qwaq/debugger/views/quatview.h        |   2 +-
 ruamoko/qwaq/debugger/views/quatview.r        |   2 +-
 ruamoko/qwaq/debugger/views/stringview.h      |   2 +-
 ruamoko/qwaq/debugger/views/stringview.r      |   2 +-
 ruamoko/qwaq/debugger/views/uintview.h        |   2 +-
 ruamoko/qwaq/debugger/views/uintview.r        |   2 +-
 ruamoko/qwaq/debugger/views/vectorview.h      |   2 +-
 ruamoko/qwaq/debugger/views/vectorview.r      |   2 +-
 ruamoko/qwaq/debugger/views/voidview.h        |   2 +-
 ruamoko/qwaq/debugger/views/voidview.r        |   2 +-
 ruamoko/qwaq/editor/editbuffer.r              |   2 +-
 ruamoko/qwaq/editor/editor.h                  |   4 +-
 ruamoko/qwaq/editor/editor.r                  |   8 +-
 ruamoko/qwaq/qwaq-app.h                       |   4 +-
 ruamoko/qwaq/qwaq-app.r                       |  12 +-
 ruamoko/qwaq/ui/button.h                      |   4 +-
 ruamoko/qwaq/ui/button.r                      |   4 +-
 ruamoko/qwaq/ui/curses.h                      |   4 +-
 ruamoko/qwaq/ui/draw.h                        |   2 +-
 ruamoko/qwaq/ui/draw.r                        |   4 +-
 ruamoko/qwaq/ui/garray.r                      |   4 +-
 ruamoko/qwaq/ui/group.h                       |   4 +-
 ruamoko/qwaq/ui/group.r                       |  10 +-
 ruamoko/qwaq/ui/listener.r                    |   4 +-
 ruamoko/qwaq/ui/proxyview.h                   |   2 +-
 ruamoko/qwaq/ui/proxyview.r                   |   4 +-
 ruamoko/qwaq/ui/rect.r                        |   2 +-
 ruamoko/qwaq/ui/scrollbar.h                   |   2 +-
 ruamoko/qwaq/ui/scrollbar.r                   |   8 +-
 ruamoko/qwaq/ui/tableview.h                   |   2 +-
 ruamoko/qwaq/ui/tableview.r                   |   4 +-
 ruamoko/qwaq/ui/textcontext.h                 |   6 +-
 ruamoko/qwaq/ui/textcontext.r                 |   4 +-
 ruamoko/qwaq/ui/titlebar.h                    |   2 +-
 ruamoko/qwaq/ui/titlebar.r                    |   4 +-
 ruamoko/qwaq/ui/view.h                        |   6 +-
 ruamoko/qwaq/ui/view.r                        |  10 +-
 ruamoko/qwaq/ui/window.h                      |   6 +-
 ruamoko/qwaq/ui/window.r                      |  16 +-
 ruamoko/scheme/Makefile.am                    |  81 --
 ruamoko/scheme/Makemodule.am                  |  88 ++
 tools/Makefile.am                             |   6 -
 tools/Makemodule.am                           |  20 +
 tools/bsp2img/{Makefile.am => Makemodule.am}  |   6 +-
 tools/carne/Makefile.am                       |  13 -
 tools/carne/Makemodule.am                     |   8 +
 tools/pak/Makefile.am                         |  19 -
 tools/pak/Makemodule.am                       |  14 +
 tools/qfbsp/Makefile.am                       |   3 -
 tools/qfbsp/Makemodule.am                     |   2 +
 tools/qfbsp/include/Makefile.am               |   5 -
 tools/qfbsp/include/Makemodule.am             |  16 +
 tools/qfbsp/source/Makefile.am                |  16 -
 tools/qfbsp/source/Makemodule.am              |  25 +
 tools/qfbsp/source/brush.c                    |  10 +-
 tools/qfbsp/source/csg4.c                     |  14 +-
 tools/qfbsp/source/map.c                      |   2 +-
 tools/qfbsp/source/merge.c                    |  12 +-
 tools/qfbsp/source/nodraw.c                   |   2 +-
 tools/qfbsp/source/options.c                  |   2 +-
 tools/qfbsp/source/outside.c                  |  12 +-
 tools/qfbsp/source/portals.c                  |  10 +-
 tools/qfbsp/source/qfbsp.c                    |  24 +-
 tools/qfbsp/source/readbsp.c                  |  10 +-
 tools/qfbsp/source/region.c                   |   6 +-
 tools/qfbsp/source/solidbsp.c                 |  12 +-
 tools/qfbsp/source/surfaces.c                 |  10 +-
 tools/qfbsp/source/tjunc.c                    |   8 +-
 tools/qfbsp/source/writebsp.c                 |   8 +-
 tools/qfcc/Makefile.am                        |  48 -
 tools/qfcc/Makemodule.am                      |   4 +
 tools/qfcc/bootstrap                          |   3 -
 tools/qfcc/configure.in                       | 144 ---
 tools/qfcc/doc/Makefile.am                    |   6 -
 tools/qfcc/doc/Makemodule.am                  |   5 +
 tools/qfcc/doc/man/Makefile.am                |   4 -
 tools/qfcc/include/Makefile.am                |   7 -
 tools/qfcc/include/Makemodule.am              |  34 +
 tools/qfcc/source/Makefile.am                 |  76 --
 tools/qfcc/source/Makemodule.am               |  92 ++
 tools/qfcc/source/class.c                     |  34 +-
 tools/qfcc/source/codespace.c                 |   2 +-
 tools/qfcc/source/constfold.c                 |  17 +-
 tools/qfcc/source/cpp.c                       |   6 +-
 tools/qfcc/source/dags.c                      |  24 +-
 tools/qfcc/source/debug.c                     |  24 +-
 tools/qfcc/source/def.c                       |  32 +-
 tools/qfcc/source/defspace.c                  |  18 +-
 tools/qfcc/source/diagnostic.c                |  14 +-
 tools/qfcc/source/disassemble.c               |   2 +-
 tools/qfcc/source/dot.c                       |   8 +-
 tools/qfcc/source/dot_dag.c                   |  10 +-
 tools/qfcc/source/dot_expr.c                  |  11 +-
 tools/qfcc/source/dot_flow.c                  |  12 +-
 tools/qfcc/source/dot_sblock.c                |  18 +-
 tools/qfcc/source/dot_type.c                  |   9 +-
 tools/qfcc/source/dump_globals.c              |  10 +-
 tools/qfcc/source/dump_lines.c                |   4 +-
 tools/qfcc/source/dump_modules.c              |   2 +-
 tools/qfcc/source/dump_strings.c              |   4 +-
 tools/qfcc/source/emit.c                      |  30 +-
 tools/qfcc/source/expr.c                      |  39 +-
 tools/qfcc/source/expr_assign.c               |  37 +-
 tools/qfcc/source/expr_binary.c               |  11 +-
 tools/qfcc/source/expr_bool.c                 |  39 +-
 tools/qfcc/source/expr_compound.c             |  10 +-
 tools/qfcc/source/expr_obj.c                  |  37 +-
 tools/qfcc/source/flow.c                      |  24 +-
 tools/qfcc/source/function.c                  |  40 +-
 tools/qfcc/source/grab.c                      |  12 +-
 tools/qfcc/source/idstuff.c                   |  20 +-
 tools/qfcc/source/linker.c                    |  30 +-
 tools/qfcc/source/method.c                    |  32 +-
 tools/qfcc/source/obj_file.c                  |  34 +-
 tools/qfcc/source/obj_type.c                  |  20 +-
 tools/qfcc/source/opcodes.c                   |  10 +-
 tools/qfcc/source/options.c                   |  10 +-
 tools/qfcc/source/pragma.c                    |  12 +-
 tools/qfcc/source/qc-lex.l                    |  30 +-
 tools/qfcc/source/qc-parse.y                  |  36 +-
 tools/qfcc/source/qfcc.c                      |  50 +-
 tools/qfcc/source/qfprogs.c                   |   8 +-
 tools/qfcc/source/qp-lex.l                    |  20 +-
 tools/qfcc/source/qp-parse.y                  |  18 +-
 tools/qfcc/source/reloc.c                     |  18 +-
 tools/qfcc/source/shared.c                    |  16 +-
 tools/qfcc/source/statements.c                |  29 +-
 tools/qfcc/source/strpool.c                   |   6 +-
 tools/qfcc/source/struct.c                    |  30 +-
 tools/qfcc/source/stub.c                      |  38 +-
 tools/qfcc/source/switch.c                    |  22 +-
 tools/qfcc/source/symtab.c                    |  20 +-
 tools/qfcc/source/type.c                      |  24 +-
 tools/qfcc/source/value.c                     |  22 +-
 tools/qfcc/test/Makefile.am                   | 615 -----------
 tools/qfcc/test/Makemodule.am                 | 599 +++++++++++
 tools/qfcc/test/build-run                     |   4 +-
 tools/qfcc/test/test-defspace.c               |  14 +-
 tools/qfcc/test/test-defspace.h               |   4 +-
 tools/qflight/Makefile.am                     |   7 -
 tools/qflight/Makemodule.am                   |   4 +
 tools/qflight/include/Makefile.am             |   3 -
 tools/qflight/include/Makemodule.am           |   7 +
 tools/qflight/source/Makefile.am              |  20 -
 tools/qflight/source/Makemodule.am            |  20 +
 tools/qflight/source/entities.c               |  10 +-
 tools/qflight/source/ltface.c                 |  10 +-
 tools/qflight/source/noise.c                  |   2 +-
 tools/qflight/source/options.c                |   6 +-
 tools/qflight/source/properties.c             |   8 +-
 tools/qflight/source/qflight.c                |  10 +-
 tools/qflight/source/threads.c                |   6 +-
 tools/qflight/source/trace.c                  |   4 +-
 tools/qflight/source/vis.c                    |   8 +-
 tools/qflmp/Makefile.am                       |  18 -
 tools/qflmp/Makemodule.am                     |  14 +
 tools/qfmodelgen/Makefile.am                  |   7 -
 tools/qfmodelgen/Makemodule.am                |   2 +
 tools/qfmodelgen/include/Makefile.am          |   3 -
 tools/qfmodelgen/include/Makemodule.am        |   3 +
 .../source/{Makefile.am => Makemodule.am}     |  11 +-
 tools/qfmodelgen/source/lbmlib.c              |   2 +-
 tools/qfmodelgen/source/modelgen.c            |   5 +-
 tools/qfmodelgen/source/trilib.c              |   2 +-
 .../{Makefile.am => Makemodule.am}            |   8 +-
 tools/qfvis/Makefile.am                       |   7 -
 tools/qfvis/Makemodule.am                     |   4 +
 tools/qfvis/include/Makefile.am               |   3 -
 tools/qfvis/include/Makemodule.am             |   3 +
 tools/qfvis/source/Makefile.am                |  17 -
 tools/qfvis/source/Makemodule.am              |  16 +
 tools/qfvis/source/base-vis.c                 |   4 +-
 tools/qfvis/source/flow.c                     |   4 +-
 tools/qfvis/source/options.c                  |   4 +-
 tools/qfvis/source/qfvis.c                    |   4 +-
 tools/qfvis/source/soundphs.c                 |   2 +-
 tools/wad/Makefile.am                         |  19 -
 tools/wad/Makemodule.am                       |  13 +
 tools/wav/Makefile.am                         |  18 -
 tools/wav/Makemodule.am                       |  11 +
 vc2005/Makefile.am                            |  24 -
 vc2005/QuakeForge-VS8-Express.sln             | 935 -----------------
 vc2005/QuakeForge-VS8.sln                     | 966 -----------------
 vc2005/bsp2img/bsp2img.vcproj                 | 567 ----------
 vc2005/builtins/builtins.vcproj               | 473 ---------
 vc2005/clean.ps1                              |   3 -
 vc2005/common/common.vcproj                   | 489 ---------
 vc2005/console/console.vcproj                 | 493 ---------
 vc2005/console_client/console_client.vcproj   | 481 ---------
 vc2005/console_server/console_server.vcproj   | 469 ---------
 vc2005/engine/engine.vcproj                   | 509 ---------
 vc2005/gib/gib.vcproj                         | 537 ----------
 vc2005/hw-master/hw-master.vcproj             | 567 ----------
 vc2005/image/image.vcproj                     | 481 ---------
 vc2005/include/config.h                       | 740 -------------
 vc2005/models-sw/models-sw.vcproj             | 511 ---------
 vc2005/models/models.vcproj                   | 489 ---------
 vc2005/modelsgl/modelsgl.vcproj               | 521 ----------
 vc2005/net-main/net-main.vcproj               | 487 ---------
 vc2005/net/net.vcproj                         | 473 ---------
 vc2005/nq-common/nq-common.vcproj             | 515 ----------
 vc2005/nq-sdl/nq-sdl.vcproj                   | 561 ----------
 vc2005/nq-sdl32/nq-sdl32.vcproj               | 567 ----------
 vc2005/nq-server/nq-server.vcproj             | 571 -----------
 vc2005/nq-sgl/nq-sgl.vcproj                   | 567 ----------
 vc2005/nq-wgl/nq-wgl.vcproj                   | 567 ----------
 vc2005/nq/nq.vcproj                           | 543 ----------
 vc2005/pak/pak.vcproj                         | 571 -----------
 vc2005/qfbsp/qfbsp.vcproj                     | 637 ------------
 vc2005/qfcc/FlexBison.rules                   | 246 -----
 vc2005/qfcc/qfcc.vcproj                       | 970 ------------------
 vc2005/qfclient/qfclient.vcproj               | 625 -----------
 vc2005/qflight/qflight.vcproj                 | 625 -----------
 vc2005/qfmodelgen/qfmodelgen.vcproj           | 583 -----------
 vc2005/qfprogs/qfprogs.vcproj                 | 595 -----------
 vc2005/qfserver/qfserver.vcproj               | 677 ------------
 vc2005/qfvis/qfvis.vcproj                     | 593 -----------
 vc2005/qfwavinfo/qfwavinfo.vcproj             | 567 ----------
 vc2005/qtv/qtv.vcproj                         | 599 -----------
 vc2005/qw-client-sdl/qw-client-sdl.vcproj     | 563 ----------
 vc2005/qw-client-sdl32/qw-client-sdl32.vcproj | 567 ----------
 vc2005/qw-client-sgl/qw-client-sgl.vcproj     | 567 ----------
 vc2005/qw-client-wgl/qw-client-wgl.vcproj     | 563 ----------
 vc2005/qw-master/qw-master.vcproj             | 567 ----------
 vc2005/qw/qw.vcproj                           | 473 ---------
 vc2005/readme.txt                             |  27 -
 vc2005/ruamoko/ruamoko.vcproj                 | 517 ----------
 vc2005/sound/sound.vcproj                     | 513 ---------
 vc2005/util/util.vcproj                       | 617 -----------
 vc2005/video-sdl/video-sdl.vcproj             | 471 ---------
 vc2005/video-sgl/video-sgl.vcproj             | 467 ---------
 vc2005/video-sw/video-sw.vcproj               | 595 -----------
 vc2005/video-sw32/video-sw32.vcproj           | 571 -----------
 vc2005/video-wgl/video-wgl.vcproj             | 471 ---------
 vc2005/video/video.vcproj                     | 537 ----------
 vc2005/videogl/videogl.vcproj                 | 555 ----------
 vc2005/wad/wad.vcproj                         | 579 -----------
 vc2008/Makefile.am                            |  24 -
 vc2008/QuakeForge.sln                         | 966 -----------------
 vc2008/bsp2img/bsp2img.vcproj                 | 562 ----------
 vc2008/builtins/builtins.vcproj               | 474 ---------
 vc2008/clean.ps1                              |   3 -
 vc2008/common/common.vcproj                   | 490 ---------
 vc2008/console/console.vcproj                 | 494 ---------
 vc2008/console_client/console_client.vcproj   | 482 ---------
 vc2008/console_server/console_server.vcproj   | 470 ---------
 vc2008/engine/engine.vcproj                   | 510 ---------
 vc2008/gib/gib.vcproj                         | 538 ----------
 vc2008/hw-master/hw-master.vcproj             | 562 ----------
 vc2008/image/image.vcproj                     | 482 ---------
 vc2008/include/config.h                       | 740 -------------
 vc2008/models-sw/models-sw.vcproj             | 512 ---------
 vc2008/models/models.vcproj                   | 490 ---------
 vc2008/modelsgl/modelsgl.vcproj               | 522 ----------
 vc2008/net-main/net-main.vcproj               | 488 ---------
 vc2008/net/net.vcproj                         | 474 ---------
 vc2008/nq-common/nq-common.vcproj             | 516 ----------
 vc2008/nq-sdl/nq-sdl.vcproj                   | 556 ----------
 vc2008/nq-sdl32/nq-sdl32.vcproj               | 562 ----------
 vc2008/nq-server/nq-server.vcproj             | 566 ----------
 vc2008/nq-sgl/nq-sgl.vcproj                   | 562 ----------
 vc2008/nq-wgl/nq-wgl.vcproj                   | 562 ----------
 vc2008/nq/nq.vcproj                           | 544 ----------
 vc2008/pak/pak.vcproj                         | 566 ----------
 vc2008/qfbsp/qfbsp.vcproj                     | 632 ------------
 vc2008/qfcc/FlexBison.rules                   | 246 -----
 vc2008/qfcc/qfcc.vcproj                       | 965 -----------------
 vc2008/qfclient/qfclient.vcproj               | 626 -----------
 vc2008/qflight/qflight.vcproj                 | 620 -----------
 vc2008/qfmodelgen/qfmodelgen.vcproj           | 578 -----------
 vc2008/qfprogs/qfprogs.vcproj                 | 590 -----------
 vc2008/qfserver/qfserver.vcproj               | 672 ------------
 vc2008/qfvis/qfvis.vcproj                     | 588 -----------
 vc2008/qfwavinfo/qfwavinfo.vcproj             | 562 ----------
 vc2008/qtv/qtv.vcproj                         | 594 -----------
 vc2008/qw-client-sdl/qw-client-sdl.vcproj     | 558 ----------
 vc2008/qw-client-sdl32/qw-client-sdl32.vcproj | 562 ----------
 vc2008/qw-client-sgl/qw-client-sgl.vcproj     | 562 ----------
 vc2008/qw-client-wgl/qw-client-wgl.vcproj     | 558 ----------
 vc2008/qw-master/qw-master.vcproj             | 562 ----------
 vc2008/qw/qw.vcproj                           | 474 ---------
 vc2008/readme.txt                             |  25 -
 vc2008/ruamoko/ruamoko.vcproj                 | 518 ----------
 vc2008/sound/sound.vcproj                     | 514 ----------
 vc2008/util/util.vcproj                       | 618 -----------
 vc2008/video-sdl/video-sdl.vcproj             | 472 ---------
 vc2008/video-sgl/video-sgl.vcproj             | 468 ---------
 vc2008/video-sw/video-sw.vcproj               | 596 -----------
 vc2008/video-sw32/video-sw32.vcproj           | 572 -----------
 vc2008/video-wgl/video-wgl.vcproj             | 472 ---------
 vc2008/video/video.vcproj                     | 538 ----------
 vc2008/videogl/videogl.vcproj                 | 556 ----------
 vc2008/wad/wad.vcproj                         | 574 -----------
 535 files changed, 4528 insertions(+), 64841 deletions(-)
 delete mode 100644 RPM/Makefile.am
 create mode 100644 RPM/Makemodule.am
 delete mode 100644 debian/Makefile.am
 create mode 100644 debian/Makemodule.am
 delete mode 100644 desktop/Makefile.am
 create mode 100644 desktop/Makemodule.am
 delete mode 100644 desktop/quakeforge-nq-glx.desktop
 delete mode 100644 desktop/quakeforge-nq-sdl32.desktop
 delete mode 100644 desktop/quakeforge-nq-sgl.desktop
 delete mode 100644 desktop/quakeforge-qw-glx.desktop
 delete mode 100644 desktop/quakeforge-qw-sdl32.desktop
 delete mode 100644 desktop/quakeforge-qw-sgl.desktop
 delete mode 100644 doc/Makefile.am
 create mode 100644 doc/Makemodule.am
 delete mode 100644 doc/man/Makefile.am
 delete mode 100644 hw/Makefile.am
 create mode 100644 hw/Makemodule.am
 delete mode 100644 hw/include/Makefile.am
 rename hw/source/{Makefile.am => Makemodule.am} (69%)
 delete mode 100644 include/Makefile.am
 create mode 100644 include/Makemodule.am
 delete mode 100644 include/QF/Makefile.am
 create mode 100644 include/QF/Makemodule.am
 delete mode 100644 libs/Makefile.am
 create mode 100644 libs/Makemodule.am
 delete mode 100644 libs/audio/Makefile.am
 create mode 100644 libs/audio/Makemodule.am
 delete mode 100644 libs/audio/renderer/Makefile.am
 create mode 100644 libs/audio/renderer/Makemodule.am
 delete mode 100644 libs/audio/targets/Makefile.am
 create mode 100644 libs/audio/targets/Makemodule.am
 delete mode 100644 libs/client/Makefile.am
 create mode 100644 libs/client/Makemodule.am
 delete mode 100644 libs/console/Makefile.am
 create mode 100644 libs/console/Makemodule.am
 delete mode 100644 libs/gamecode/Makefile.am
 create mode 100644 libs/gamecode/Makemodule.am
 delete mode 100644 libs/gib/Makefile.am
 create mode 100644 libs/gib/Makemodule.am
 delete mode 100644 libs/image/Makefile.am
 create mode 100644 libs/image/Makemodule.am
 delete mode 100644 libs/models/Makefile.am
 create mode 100644 libs/models/Makemodule.am
 delete mode 100644 libs/models/alias/Makefile.am
 create mode 100644 libs/models/alias/Makemodule.am
 delete mode 100644 libs/models/brush/Makefile.am
 create mode 100644 libs/models/brush/Makemodule.am
 delete mode 100644 libs/models/iqm/Makefile.am
 create mode 100644 libs/models/iqm/Makemodule.am
 delete mode 100644 libs/models/sprite/Makefile.am
 create mode 100644 libs/models/sprite/Makemodule.am
 delete mode 100644 libs/models/test/Makefile.am
 create mode 100644 libs/models/test/Makemodule.am
 delete mode 100644 libs/net/Makefile.am
 create mode 100644 libs/net/Makemodule.am
 delete mode 100644 libs/net/nc/Makefile.am
 create mode 100644 libs/net/nc/Makemodule.am
 delete mode 100644 libs/net/nm/Makefile.am
 create mode 100644 libs/net/nm/Makemodule.am
 delete mode 100644 libs/qw/Makefile.am
 create mode 100644 libs/qw/Makemodule.am
 delete mode 100644 libs/ruamoko/Makefile.am
 create mode 100644 libs/ruamoko/Makemodule.am
 delete mode 100644 libs/util/Makefile.am
 create mode 100644 libs/util/Makemodule.am
 delete mode 100644 libs/util/test/Makefile.am
 create mode 100644 libs/util/test/Makemodule.am
 delete mode 100644 libs/video/Makefile.am
 create mode 100644 libs/video/Makemodule.am
 delete mode 100644 libs/video/renderer/Makefile.am
 create mode 100644 libs/video/renderer/Makemodule.am
 delete mode 100644 libs/video/renderer/gl/Makefile.am
 delete mode 100644 libs/video/renderer/glsl/Makefile.am
 delete mode 100644 libs/video/renderer/sw/Makefile.am
 delete mode 100644 libs/video/renderer/sw32/Makefile.am
 delete mode 100644 libs/video/targets/Makefile.am
 create mode 100644 libs/video/targets/Makemodule.am
 delete mode 100644 nq/Makefile.am
 create mode 100644 nq/Makemodule.am
 delete mode 100644 nq/include/Makefile.am
 create mode 100644 nq/include/Makemodule.am
 delete mode 100644 nq/source/Makefile.am
 create mode 100644 nq/source/Makemodule.am
 delete mode 100644 pkg-config/Makefile.am
 create mode 100644 pkg-config/Makemodule.am
 delete mode 100644 qtv/Makefile.am
 create mode 100644 qtv/Makemodule.am
 delete mode 100644 qtv/include/Makefile.am
 create mode 100644 qtv/include/Makemodule.am
 rename qtv/source/{Makefile.am => Makemodule.am} (61%)
 delete mode 100644 qw/Makefile.am
 create mode 100644 qw/Makemodule.am
 delete mode 100644 qw/include/Makefile.am
 create mode 100644 qw/include/Makemodule.am
 delete mode 100644 qw/source/Makefile.am
 create mode 100644 qw/source/Makemodule.am
 delete mode 100644 ruamoko/Makefile.am
 create mode 100644 ruamoko/Makemodule.am
 delete mode 100644 ruamoko/cl_menu/Makefile.am
 create mode 100644 ruamoko/cl_menu/Makemodule.am
 delete mode 100644 ruamoko/game/Makefile.am
 create mode 100644 ruamoko/game/Makemodule.am
 delete mode 100644 ruamoko/gui/Makefile.am
 create mode 100644 ruamoko/gui/Makemodule.am
 delete mode 100644 ruamoko/include/Makefile.am
 create mode 100644 ruamoko/include/Makemodule.am
 delete mode 100644 ruamoko/lib/Makefile.am
 create mode 100644 ruamoko/lib/Makemodule.am
 delete mode 100644 ruamoko/qwaq/Makefile.am
 create mode 100644 ruamoko/qwaq/Makemodule.am
 delete mode 100644 ruamoko/scheme/Makefile.am
 create mode 100644 ruamoko/scheme/Makemodule.am
 delete mode 100644 tools/Makefile.am
 create mode 100644 tools/Makemodule.am
 rename tools/bsp2img/{Makefile.am => Makemodule.am} (60%)
 delete mode 100644 tools/carne/Makefile.am
 create mode 100644 tools/carne/Makemodule.am
 delete mode 100644 tools/pak/Makefile.am
 create mode 100644 tools/pak/Makemodule.am
 delete mode 100644 tools/qfbsp/Makefile.am
 create mode 100644 tools/qfbsp/Makemodule.am
 delete mode 100644 tools/qfbsp/include/Makefile.am
 create mode 100644 tools/qfbsp/include/Makemodule.am
 delete mode 100644 tools/qfbsp/source/Makefile.am
 create mode 100644 tools/qfbsp/source/Makemodule.am
 delete mode 100644 tools/qfcc/Makefile.am
 create mode 100644 tools/qfcc/Makemodule.am
 delete mode 100755 tools/qfcc/bootstrap
 delete mode 100644 tools/qfcc/configure.in
 delete mode 100644 tools/qfcc/doc/Makefile.am
 create mode 100644 tools/qfcc/doc/Makemodule.am
 delete mode 100644 tools/qfcc/doc/man/Makefile.am
 delete mode 100644 tools/qfcc/include/Makefile.am
 create mode 100644 tools/qfcc/include/Makemodule.am
 delete mode 100644 tools/qfcc/source/Makefile.am
 create mode 100644 tools/qfcc/source/Makemodule.am
 delete mode 100644 tools/qfcc/test/Makefile.am
 create mode 100644 tools/qfcc/test/Makemodule.am
 delete mode 100644 tools/qflight/Makefile.am
 create mode 100644 tools/qflight/Makemodule.am
 delete mode 100644 tools/qflight/include/Makefile.am
 create mode 100644 tools/qflight/include/Makemodule.am
 delete mode 100644 tools/qflight/source/Makefile.am
 create mode 100644 tools/qflight/source/Makemodule.am
 delete mode 100644 tools/qflmp/Makefile.am
 create mode 100644 tools/qflmp/Makemodule.am
 delete mode 100644 tools/qfmodelgen/Makefile.am
 create mode 100644 tools/qfmodelgen/Makemodule.am
 delete mode 100644 tools/qfmodelgen/include/Makefile.am
 create mode 100644 tools/qfmodelgen/include/Makemodule.am
 rename tools/qfmodelgen/source/{Makefile.am => Makemodule.am} (54%)
 rename tools/qfspritegen/{Makefile.am => Makemodule.am} (57%)
 delete mode 100644 tools/qfvis/Makefile.am
 create mode 100644 tools/qfvis/Makemodule.am
 delete mode 100644 tools/qfvis/include/Makefile.am
 create mode 100644 tools/qfvis/include/Makemodule.am
 delete mode 100644 tools/qfvis/source/Makefile.am
 create mode 100644 tools/qfvis/source/Makemodule.am
 delete mode 100644 tools/wad/Makefile.am
 create mode 100644 tools/wad/Makemodule.am
 delete mode 100644 tools/wav/Makefile.am
 create mode 100644 tools/wav/Makemodule.am
 delete mode 100644 vc2005/Makefile.am
 delete mode 100644 vc2005/QuakeForge-VS8-Express.sln
 delete mode 100644 vc2005/QuakeForge-VS8.sln
 delete mode 100644 vc2005/bsp2img/bsp2img.vcproj
 delete mode 100644 vc2005/builtins/builtins.vcproj
 delete mode 100644 vc2005/clean.ps1
 delete mode 100644 vc2005/common/common.vcproj
 delete mode 100644 vc2005/console/console.vcproj
 delete mode 100644 vc2005/console_client/console_client.vcproj
 delete mode 100644 vc2005/console_server/console_server.vcproj
 delete mode 100644 vc2005/engine/engine.vcproj
 delete mode 100644 vc2005/gib/gib.vcproj
 delete mode 100644 vc2005/hw-master/hw-master.vcproj
 delete mode 100644 vc2005/image/image.vcproj
 delete mode 100644 vc2005/include/config.h
 delete mode 100644 vc2005/models-sw/models-sw.vcproj
 delete mode 100644 vc2005/models/models.vcproj
 delete mode 100644 vc2005/modelsgl/modelsgl.vcproj
 delete mode 100644 vc2005/net-main/net-main.vcproj
 delete mode 100644 vc2005/net/net.vcproj
 delete mode 100644 vc2005/nq-common/nq-common.vcproj
 delete mode 100644 vc2005/nq-sdl/nq-sdl.vcproj
 delete mode 100644 vc2005/nq-sdl32/nq-sdl32.vcproj
 delete mode 100644 vc2005/nq-server/nq-server.vcproj
 delete mode 100644 vc2005/nq-sgl/nq-sgl.vcproj
 delete mode 100644 vc2005/nq-wgl/nq-wgl.vcproj
 delete mode 100644 vc2005/nq/nq.vcproj
 delete mode 100644 vc2005/pak/pak.vcproj
 delete mode 100644 vc2005/qfbsp/qfbsp.vcproj
 delete mode 100644 vc2005/qfcc/FlexBison.rules
 delete mode 100644 vc2005/qfcc/qfcc.vcproj
 delete mode 100644 vc2005/qfclient/qfclient.vcproj
 delete mode 100644 vc2005/qflight/qflight.vcproj
 delete mode 100644 vc2005/qfmodelgen/qfmodelgen.vcproj
 delete mode 100644 vc2005/qfprogs/qfprogs.vcproj
 delete mode 100644 vc2005/qfserver/qfserver.vcproj
 delete mode 100644 vc2005/qfvis/qfvis.vcproj
 delete mode 100644 vc2005/qfwavinfo/qfwavinfo.vcproj
 delete mode 100644 vc2005/qtv/qtv.vcproj
 delete mode 100644 vc2005/qw-client-sdl/qw-client-sdl.vcproj
 delete mode 100644 vc2005/qw-client-sdl32/qw-client-sdl32.vcproj
 delete mode 100644 vc2005/qw-client-sgl/qw-client-sgl.vcproj
 delete mode 100644 vc2005/qw-client-wgl/qw-client-wgl.vcproj
 delete mode 100644 vc2005/qw-master/qw-master.vcproj
 delete mode 100644 vc2005/qw/qw.vcproj
 delete mode 100644 vc2005/readme.txt
 delete mode 100644 vc2005/ruamoko/ruamoko.vcproj
 delete mode 100644 vc2005/sound/sound.vcproj
 delete mode 100644 vc2005/util/util.vcproj
 delete mode 100644 vc2005/video-sdl/video-sdl.vcproj
 delete mode 100644 vc2005/video-sgl/video-sgl.vcproj
 delete mode 100644 vc2005/video-sw/video-sw.vcproj
 delete mode 100644 vc2005/video-sw32/video-sw32.vcproj
 delete mode 100644 vc2005/video-wgl/video-wgl.vcproj
 delete mode 100644 vc2005/video/video.vcproj
 delete mode 100644 vc2005/videogl/videogl.vcproj
 delete mode 100644 vc2005/wad/wad.vcproj
 delete mode 100644 vc2008/Makefile.am
 delete mode 100644 vc2008/QuakeForge.sln
 delete mode 100644 vc2008/bsp2img/bsp2img.vcproj
 delete mode 100644 vc2008/builtins/builtins.vcproj
 delete mode 100644 vc2008/clean.ps1
 delete mode 100644 vc2008/common/common.vcproj
 delete mode 100644 vc2008/console/console.vcproj
 delete mode 100644 vc2008/console_client/console_client.vcproj
 delete mode 100644 vc2008/console_server/console_server.vcproj
 delete mode 100644 vc2008/engine/engine.vcproj
 delete mode 100644 vc2008/gib/gib.vcproj
 delete mode 100644 vc2008/hw-master/hw-master.vcproj
 delete mode 100644 vc2008/image/image.vcproj
 delete mode 100644 vc2008/include/config.h
 delete mode 100644 vc2008/models-sw/models-sw.vcproj
 delete mode 100644 vc2008/models/models.vcproj
 delete mode 100644 vc2008/modelsgl/modelsgl.vcproj
 delete mode 100644 vc2008/net-main/net-main.vcproj
 delete mode 100644 vc2008/net/net.vcproj
 delete mode 100644 vc2008/nq-common/nq-common.vcproj
 delete mode 100644 vc2008/nq-sdl/nq-sdl.vcproj
 delete mode 100644 vc2008/nq-sdl32/nq-sdl32.vcproj
 delete mode 100644 vc2008/nq-server/nq-server.vcproj
 delete mode 100644 vc2008/nq-sgl/nq-sgl.vcproj
 delete mode 100644 vc2008/nq-wgl/nq-wgl.vcproj
 delete mode 100644 vc2008/nq/nq.vcproj
 delete mode 100644 vc2008/pak/pak.vcproj
 delete mode 100644 vc2008/qfbsp/qfbsp.vcproj
 delete mode 100644 vc2008/qfcc/FlexBison.rules
 delete mode 100644 vc2008/qfcc/qfcc.vcproj
 delete mode 100644 vc2008/qfclient/qfclient.vcproj
 delete mode 100644 vc2008/qflight/qflight.vcproj
 delete mode 100644 vc2008/qfmodelgen/qfmodelgen.vcproj
 delete mode 100644 vc2008/qfprogs/qfprogs.vcproj
 delete mode 100644 vc2008/qfserver/qfserver.vcproj
 delete mode 100644 vc2008/qfvis/qfvis.vcproj
 delete mode 100644 vc2008/qfwavinfo/qfwavinfo.vcproj
 delete mode 100644 vc2008/qtv/qtv.vcproj
 delete mode 100644 vc2008/qw-client-sdl/qw-client-sdl.vcproj
 delete mode 100644 vc2008/qw-client-sdl32/qw-client-sdl32.vcproj
 delete mode 100644 vc2008/qw-client-sgl/qw-client-sgl.vcproj
 delete mode 100644 vc2008/qw-client-wgl/qw-client-wgl.vcproj
 delete mode 100644 vc2008/qw-master/qw-master.vcproj
 delete mode 100644 vc2008/qw/qw.vcproj
 delete mode 100644 vc2008/readme.txt
 delete mode 100644 vc2008/ruamoko/ruamoko.vcproj
 delete mode 100644 vc2008/sound/sound.vcproj
 delete mode 100644 vc2008/util/util.vcproj
 delete mode 100644 vc2008/video-sdl/video-sdl.vcproj
 delete mode 100644 vc2008/video-sgl/video-sgl.vcproj
 delete mode 100644 vc2008/video-sw/video-sw.vcproj
 delete mode 100644 vc2008/video-sw32/video-sw32.vcproj
 delete mode 100644 vc2008/video-wgl/video-wgl.vcproj
 delete mode 100644 vc2008/video/video.vcproj
 delete mode 100644 vc2008/videogl/videogl.vcproj
 delete mode 100644 vc2008/wad/wad.vcproj

diff --git a/Makefile.am b/Makefile.am
index 1b33ee233..9e68af2a5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,15 +1,9 @@
 ## Process this file with automake to produce Makefile.in
-AUTOMAKE_OPTIONS= foreign
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS=desktop pkg-config include @top_dirs@
-DIST_SUBDIRS=desktop pkg-config include \
-			 libs hw nq qtv qw tools ruamoko\
-			 RPM debian doc vc2005 vc2008
-
-## configure.ac needs to be listed here for older autoconfs
-EXTRA_DIST=	ChangeLog configure.ac bootstrap \
+EXTRA_DIST = \
+		ChangeLog configure.ac bootstrap \
 		$(top_srcdir)/.version \
 		config.d/git-version-gen \
 		tools/cross/droid/cross-configure.sh \
@@ -26,9 +20,109 @@ EXTRA_DIST=	ChangeLog configure.ac bootstrap \
 		tools/gas2masm/gas2masm.dsp tools/gas2masm/gas2masm.dsw \
 		tools/gas2masm/gas2masm.mak tools/gas2masm/gas2masm.mdp
 
-NOCONV_DIST=	$(distdir)/include/win32/resources/icon1Vista.ico \
+NOCONV_DIST= \
+	$(distdir)/include/win32/resources/icon1Vista.ico \
 	$(distdir)/include/win32/resources/icon1XP.ico
 
+BUILT_SOURCES = $(top_srcdir)/.version
+#AM_CFLAGS= @PREFER_NON_PIC@
+AM_CPPFLAGS= -I$(top_srcdir)/include $(PTHREAD_CFLAGS)
+
+common_ldflags= -export-dynamic @PTHREAD_LDFLAGS@
+
+TESTS =
+XFAIL_TESTS =
+bin_PROGRAMS =
+bin_SCRIPTS =
+check_PROGRAMS =
+lib_LTLIBRARIES =
+man_MANS =
+noinst_LTLIBRARIES =
+noinst_LIBRARIES =
+noinst_PROGRAMS =
+noinst_HEADERS =
+plugin_LTLIBRARIES =
+
+RANLIB=touch
+
+EXTRA_HEADERS =
+EXTRA_LTLIBRARIES =
+EXTRA_PROGRAMS =
+EXTRA_LIBRARIES =
+
+CLEANFILES =
+DISTCLEANFILES =
+
+YFLAGS = -v -d -Wno-yacc -Werror
+PTHREAD_LDFLAGS=@PTHREAD_LDFLAGS@
+PTHREAD_CFLAGS=@PTHREAD_CFLAGS@
+
+lib_ldflags=-version-info $(QUAKE_LIBRARY_VERSION_INFO) \
+			-rpath $(libdir) -no-undefined
+plugin_ldflags= @plugin_ldflags@ -avoid-version -module -rpath $(plugindir)
+plugin_libadd= @plugin_libadd@
+
+SDL_LIBS= @SDL_LIBS@
+XMMS_LIBS= @XMMS_LIBS@
+
+PAK=$(top_builddir)/pak$(EXEEXT)
+QFCC_DEP=qfcc$(EXEEXT)
+QFCC=$(top_builddir)/$(QFCC_DEP)
+GZ=@progs_gz@
+
+QCSYSTEM=--no-default-paths -I$(top_srcdir) -I$(top_srcdir)/ruamoko/include -I$(top_srcdir)/include
+QCFLAGS=-qq -O -g -Werror -Wall -Wno-integer-divide
+QCPPFLAGS=$(QCSYSTEM)
+QCLINKFLAGS=--no-default-paths -Lruamoko/lib
+QCOMPILE=$(QFCC) $(QCFLAGS) $(QCPPFLAGS)
+QLINK=$(QFCC) $(QCFLAGS) $(QCLINKFLAGS)
+MKDIR_P = @MKDIR_P@
+
+am__mv = mv -f
+
+SUFFIXES=.o .r .pas
+.r.o:
+	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+	$(QCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tqo -c -o $@ $< &&\
+	sed -i -e '1s@:@: $(QFCC_DEP)@' $$depbase.Tqo &&\
+	$(am__mv) $$depbase.Tqo $$depbase.Qo
+.pas.o:
+	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+	$(QCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tqo -c -o $@ $< &&\
+	sed -i -e '1s@:@: $(QFCC_DEP)@' $$depbase.Tqo &&\
+	$(am__mv) $$depbase.Tqo $$depbase.Qo
+
+qcautodep = $(join $(addsuffix $(DEPDIR)/,$(dir $(basename $(1)))),$(addsuffix .Qo,$(notdir $(basename $(basename $(1))))))
+r_depfiles_remade=
+pas_depfiles_remade=
+
+include doc/Makemodule.am
+include RPM/Makemodule.am
+include debian/Makemodule.am
+include desktop/Makemodule.am
+include pkg-config/Makemodule.am
+include include/Makemodule.am
+include libs/Makemodule.am
+include hw/Makemodule.am
+include nq/Makemodule.am
+include qtv/Makemodule.am
+include qw/Makemodule.am
+include tools/Makemodule.am
+include ruamoko/Makemodule.am
+
+DISTCLEANFILES += $(r_depfiles_remade) $(pas_depfiles_remade)
+
+$(r_depfiles_remade):
+	$(MKDIR_P) $(@D)
+	echo '$@' | sed -e 's@\$(DEPDIR)/@@' -e 's@\(.*\)\.Qo$$@\1.o: $(top_srcdir)/\1.r qfcc@' >$@-t && $(am__mv) $@-t $@
+
+$(pas_depfiles_remade):
+	$(MKDIR_P) $(@D)
+	echo '$@' | sed -e 's@\$(DEPDIR)/@@' -e 's@\(.*\)\.Qo$$@\1.o: $(top_srcdir)/\1.pas qfcc@' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade) $(r_depfiles_remade) $(pas_depfiles_remade)
+	echo findme $(ruamoko_gui_libgui_a_dep)
+
 changelog: ChangeLog
 ChangeLog: FORCE
 	@if test -d "$(top_srcdir)/.git"; then \
@@ -63,7 +157,6 @@ dist-all-local: distdir
 	ZIP="-r9ql" zip $(distdir).zip $(distdir)
 	-rm -rf $(distdir)
 
-BUILT_SOURCES = $(top_srcdir)/.version
 $(top_srcdir)/.version:
 	echo $(VERSION) > $@-t && mv $@-t $@
 dist-hook:
diff --git a/RPM/Makefile.am b/RPM/Makefile.am
deleted file mode 100644
index 13616e183..000000000
--- a/RPM/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-## Process this file with automake to produce Makefile.in
-AUTOMAKE_OPTIONS=	foreign
-
-EXTRA_DIST=	build_rpm.in quakeforge.conf.in quakeforge.spec.in
-
-rpm: build_rpm quakeforge.conf quakeforge.spec
-	./build_rpm
-
-CLEANFILES = *.rpm
diff --git a/RPM/Makemodule.am b/RPM/Makemodule.am
new file mode 100644
index 000000000..583cc8506
--- /dev/null
+++ b/RPM/Makemodule.am
@@ -0,0 +1,6 @@
+EXTRA_DIST += RPM/build_rpm.in RPM/quakeforge.conf.in RPM/quakeforge.spec.in
+
+rpm: RPM/build_rpm RPM/quakeforge.conf RPM/quakeforge.spec
+	cd RPM && ./build_rpm
+
+CLEANFILES += rpm/*.rpm
diff --git a/bootstrap b/bootstrap
index 4986a6ca4..abd34252f 100755
--- a/bootstrap
+++ b/bootstrap
@@ -18,7 +18,7 @@ if test "$1" = "clean"; then
 	find . -name '*.orig' -type f -print0 | xargs $ARGS rm -f
 	rm -f aclocal.m4 build-stamp changelog-stamp config.cache config.log \
 		  config.status configure configure-stamp install-sh libtool missing \
-		  mkinstalldirs quakeforge-config quakeforge.lsm
+		  mkinstalldirs quakeforge-config quakeforge.lsm test-driver
 	rm -f compile config.guess config.sub depcomp ltmain.sh ylwrap
 	rm -rf autom4te.cache
 	rm -f m4/libtool.m4 m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4 \
diff --git a/config.d/ac_config_files.m4 b/config.d/ac_config_files.m4
index 6f49d4bb5..d84505483 100644
--- a/config.d/ac_config_files.m4
+++ b/config.d/ac_config_files.m4
@@ -1,102 +1,4 @@
 	Makefile
-
-	include/Makefile
-	include/QF/Makefile
-
-	libs/Makefile
-	libs/audio/Makefile
-	libs/audio/targets/Makefile
-	libs/audio/renderer/Makefile
-	libs/audio/test/Makefile
-	libs/console/Makefile
-	libs/client/Makefile
-	libs/gamecode/Makefile
-	libs/gib/Makefile
-	libs/image/Makefile
-	libs/models/Makefile
-	libs/models/alias/Makefile
-	libs/models/brush/Makefile
-	libs/models/iqm/Makefile
-	libs/models/sprite/Makefile
-	libs/models/test/Makefile
-	libs/net/Makefile
-	libs/net/nc/Makefile
-	libs/net/nm/Makefile
-	libs/qw/Makefile
-	libs/ruamoko/Makefile
-	libs/util/Makefile
-	libs/util/test/Makefile
-	libs/video/Makefile
-	libs/video/renderer/Makefile
-	libs/video/renderer/gl/Makefile
-	libs/video/renderer/glsl/Makefile
-	libs/video/renderer/sw/Makefile
-	libs/video/renderer/sw32/Makefile
-	libs/video/targets/Makefile
-
-	hw/Makefile
-	hw/include/Makefile
-	hw/source/Makefile
-
-	nq/Makefile
-	nq/include/Makefile
-	nq/source/Makefile
-
-	qtv/Makefile
-	qtv/include/Makefile
-	qtv/source/Makefile
-
-	qw/Makefile
-	qw/include/Makefile
-	qw/source/Makefile
-
-	tools/Makefile
-	tools/bsp2img/Makefile
-	tools/carne/Makefile
-	tools/pak/Makefile
-	tools/qfbsp/Makefile
-	tools/qfbsp/include/Makefile
-	tools/qfbsp/source/Makefile
-	tools/qfcc/Makefile
-	tools/qfcc/doc/Makefile
-	tools/qfcc/doc/man/Makefile
-	tools/qfcc/include/Makefile
-	tools/qfcc/source/Makefile
-	tools/qfcc/test/Makefile
-	tools/qflight/Makefile
-	tools/qflight/include/Makefile
-	tools/qflight/source/Makefile
-	tools/qflmp/Makefile
-	tools/qfmodelgen/Makefile
-	tools/qfmodelgen/include/Makefile
-	tools/qfmodelgen/source/Makefile
-	tools/qfspritegen/Makefile
-	tools/qfvis/Makefile
-	tools/qfvis/include/Makefile
-	tools/qfvis/source/Makefile
-	tools/wad/Makefile
-	tools/wav/Makefile
-
-	ruamoko/Makefile
-	ruamoko/Doxyfile
-	ruamoko/include/Makefile
-	ruamoko/lib/Makefile
-	ruamoko/game/Makefile
-	ruamoko/gui/Makefile
-	ruamoko/cl_menu/Makefile
-	ruamoko/scheme/Makefile
-	ruamoko/qwaq/Makefile
-
-	pkg-config/Makefile
 	pkg-config/qfcc.pc
 	pkg-config/quakeforge.pc
-
-	doc/Makefile
 	doc/quakeforge.dox.conf
-	doc/man/Makefile
-
-	debian/Makefile
-	desktop/Makefile
-
-	vc2005/Makefile
-	vc2008/Makefile
diff --git a/config.d/build_control.m4 b/config.d/build_control.m4
index 88b58e610..34227595f 100644
--- a/config.d/build_control.m4
+++ b/config.d/build_control.m4
@@ -39,7 +39,7 @@ if test "x$HAVE_FBDEV" = xyes; then
 		QW_TARGETS="$QW_TARGETS qw-client-fbdev\$(EXEEXT)"
 		NQ_TARGETS="$NQ_TARGETS nq-fbdev\$(EXEEXT)"
 		CL_TARGETS="$CL_TARGETS FBDEV"
-		VID_TARGETS="$VID_TARGETS libQFfbdev.la"
+		VID_TARGETS="$VID_TARGETS libs/video/targets/libQFfbdev.la"
 		QF_NEED(vid_render, [sw])
 		QF_NEED(models, [sw])
 		QF_NEED(alias, [sw])
@@ -66,11 +66,11 @@ if test "x$HAVE_X" = xyes; then
 	if test "x$ENABLE_clients_x11" = xyes; then
 		QW_TARGETS="$QW_TARGETS qw-client-x11\$(EXEEXT)"
 		NQ_TARGETS="$NQ_TARGETS nq-x11\$(EXEEXT)"
-		QWAQ_TARGETS="$QWAQ_TARGETS qwaq-x11\$(EXEEXT)"
-		QW_DESKTOP_DATA="$QW_DESKTOP_DATA quakeforge-qw-x11.desktop"
-		NQ_DESKTOP_DATA="$NQ_DESKTOP_DATA quakeforge-nq-x11.desktop"
+		QWAQ_TARGETS="$QWAQ_TARGETS ruamoko/qwaq/qwaq-x11\$(EXEEXT)"
+		QW_DESKTOP_DATA="$QW_DESKTOP_DATA desktop/quakeforge-qw-x11.desktop"
+		NQ_DESKTOP_DATA="$NQ_DESKTOP_DATA desktop/quakeforge-nq-x11.desktop"
 		CL_TARGETS="$CL_TARGETS X11"
-		VID_TARGETS="$VID_TARGETS libQFx11.la"
+		VID_TARGETS="$VID_TARGETS libs/video/targets/libQFx11.la"
 		QF_NEED(vid_render, [sw sw32 gl glsl])
 		QF_NEED(models, [sw gl glsl])
 		QF_NEED(alias, [sw gl glsl])
@@ -91,10 +91,10 @@ if test "x$HAVE_SDL" = xyes; then
 	if test "x$ENABLE_clients_sdl" = xyes; then
 		QW_TARGETS="$QW_TARGETS qw-client-sdl\$(EXEEXT)"
 		NQ_TARGETS="$NQ_TARGETS nq-sdl\$(EXEEXT)"
-		QW_DESKTOP_DATA="$QW_DESKTOP_DATA quakeforge-qw-sdl.desktop"
-		NQ_DESKTOP_DATA="$NQ_DESKTOP_DATA quakeforge-nq-sdl.desktop"
+		QW_DESKTOP_DATA="$QW_DESKTOP_DATA desktop/quakeforge-qw-sdl.desktop"
+		NQ_DESKTOP_DATA="$NQ_DESKTOP_DATA desktop/quakeforge-nq-sdl.desktop"
 		CL_TARGETS="$CL_TARGETS SDL"
-		VID_TARGETS="$VID_TARGETS libQFsdl.la"
+		VID_TARGETS="$VID_TARGETS libs/video/targets/libQFsdl.la"
 		QF_NEED(vid_render, [sw sw32 gl glsl])
 		QF_NEED(models, [sw gl glsl])
 		QF_NEED(alias, [sw gl glsl])
@@ -116,7 +116,7 @@ if test "x$HAVE_SVGA" = xyes; then
 		QW_TARGETS="$QW_TARGETS qw-client-svga\$(EXEEXT)"
 		NQ_TARGETS="$NQ_TARGETS nq-svga\$(EXEEXT)"
 		CL_TARGETS="$CL_TARGETS SVGAlib"
-		VID_TARGETS="$VID_TARGETS libQFsvga.la"
+		VID_TARGETS="$VID_TARGETS libs/video/targets/libQFsvga.la"
 		QF_NEED(vid_render, [sw])
 		QF_NEED(models, [sw])
 		QF_NEED(alias, [sw])
@@ -138,7 +138,7 @@ fi
 #		QW_TARGETS="$QW_TARGETS qw-client-wgl\$(EXEEXT)"
 #		NQ_TARGETS="$NQ_TARGETS nq-wgl\$(EXEEXT)"
 #		CL_TARGETS="$CL_TARGETS WGL"
-#		VID_TARGETS="$VID_TARGETS libQFwgl.la"
+#		VID_TARGETS="$VID_TARGETS libs/video/targets/libQFwgl.la"
 #		QF_NEED(vid_render, [gl])
 #		QF_NEED(models, [gl])
 #		QF_NEED(alias, [gl])
@@ -163,8 +163,8 @@ if test "x$ENABLE_servers_nq" = xyes; then
 	QF_NEED(libs,[util gamecode ruamoko gib image models console net])
 fi
 if test "x$ENABLE_servers_qtv" = xyes; then
-	QTV_TARGETS="qtv\$(EXEEXT) $QTV_TARGETS"
-	SV_TARGETS="$SV_TARGETS qtv"
+	QTV_TARGETS="qtv-server\$(EXEEXT) $QTV_TARGETS"
+	SV_TARGETS="$SV_TARGETS qtv-server"
 #	QF_NEED(qtv, [common server])
 	QF_NEED(console, [server])
 	QF_NEED(top, [qtv])
@@ -228,7 +228,7 @@ if test "x$ENABLE_tools_qfvis" = xyes; then
 fi
 if test "x$ENABLE_tools_qwaq" = xyes; then
 	if test "x$HAVE_PANEL" = xyes -a "x$HAVE_PTHREAD" = xyes; then
-		QWAQ_TARGETS="$QWAQ_TARGETS qwaq-curses\$(EXEEXT)"
+		QWAQ_TARGETS="$QWAQ_TARGETS ruamoko/qwaq/qwaq-curses\$(EXEEXT)"
 	fi
 	QF_NEED(tools,[qfcc])
 	QF_NEED(ruamoko,[qwaq])
@@ -254,14 +254,22 @@ QF_PROCESS_NEED_DIRS(ruamoko,[qwaq])
 
 if test "$ENABLE_tools_qfcc" = "yes" -a "$ENABLE_tools_pak" = "yes"; then
 	QF_NEED(top, [ruamoko])
-	qfcc_include_qf="\$(qfcc_include_qf)"
+	qfac_qfcc_include_qf="\$(qfcc_include_qf)"
 fi
-QF_SUBST(qfcc_include_qf)
+QF_SUBST(qfac_qfcc_include_qf)
 
 if test x"${top_need_libs}" = xyes; then
-	include_qf="\$(include_qf)"
+	qfac_include_qf="\$(include_qf)"
+	qfac_include_qf_gl="\$(include_qf_gl)"
+	qfac_include_qf_glsl="\$(include_qf_glsl)"
+	qfac_include_qf_math="\$(include_qf_math)"
+	qfac_include_qf_plugin="\$(include_qf_plugin)"
 fi
-QF_SUBST(include_qf)
+QF_SUBST(qfac_include_qf)
+QF_SUBST(qfac_include_qf_gl)
+QF_SUBST(qfac_include_qf_glsl)
+QF_SUBST(qfac_include_qf_math)
+QF_SUBST(qfac_include_qf_plugin)
 
 progs_gz=
 if test "$HAVE_ZLIB" = "yes"; then
@@ -273,21 +281,21 @@ QF_PROCESS_NEED_DIRS(top, [libs hw nq qtv qw tools ruamoko])
 
 QF_PROCESS_NEED_LIBS(swrend, [asm])
 QF_PROCESS_NEED_DIRS(vid_render, [gl glsl sw sw32])
-QF_PROCESS_NEED_LIBS(models, [gl glsl sw])
-QF_PROCESS_NEED_LIBS(alias, [gl glsl sw])
-QF_PROCESS_NEED_LIBS(brush, [gl glsl sw])
-QF_PROCESS_NEED_LIBS(iqm, [gl glsl sw])
-QF_PROCESS_NEED_LIBS(sprite, [gl glsl sw])
+QF_PROCESS_NEED_LIBS(models, [gl glsl sw], [libs/models])
+QF_PROCESS_NEED_LIBS(alias, [gl glsl sw], [libs/models/alias])
+QF_PROCESS_NEED_LIBS(brush, [gl glsl sw], [libs/models/brush])
+QF_PROCESS_NEED_LIBS(iqm, [gl glsl sw], [libs/models/iqm])
+QF_PROCESS_NEED_LIBS(sprite, [gl glsl sw], [libs/models/sprite])
 
-QF_PROCESS_NEED_LIBS(vid, [common sdl svga x11])
-QF_PROCESS_NEED_LIBS(qw, [client common sdl server], a)
-QF_PROCESS_NEED_LIBS(nq, [client common sdl server], a)
+QF_PROCESS_NEED_LIBS(vid, [common sdl svga x11], [libs/video/targets])
+QF_PROCESS_NEED_LIBS(qw, [client common sdl server], [qw/source], a)
+QF_PROCESS_NEED_LIBS(nq, [client common sdl server], [nq/source], a)
 
 if test -n "$CL_TARGETS"; then
-	CD_TARGETS="libQFcd.la"
-	SND_TARGETS="libQFsound.la"
+	CD_TARGETS="libs/audio/libQFcd.la"
+	SND_TARGETS="libs/audio/libQFsound.la"
 	AUDIO_TARGETS="testsound\$(EXEEXT)"
-	JOY_TARGETS="libQFjs.la"
+	JOY_TARGETS="libs/video/targets/libQFjs.la"
 else
 	unset CDTYPE
 	unset SOUND_TYPES
@@ -322,13 +330,13 @@ if test "x$static_plugins" = xauto; then
 	fi
 fi
 if test "x$static_plugins" = xyes; then
-	QF_PROCESS_NEED_STATIC_PLUGINS(vid_render, [sw sw32 glsl gl])
-	QF_PROCESS_NEED_STATIC_PLUGINS(console, [server], [\$(top_builddir)/libs/console], [server])
-	QF_PROCESS_NEED_STATIC_PLUGINS(console, [client], [\$(top_builddir)/libs/console], [client])
+	QF_PROCESS_NEED_STATIC_PLUGINS(vid_render, [sw sw32 glsl gl], [libs/video/renderer])
+	QF_PROCESS_NEED_STATIC_PLUGINS(console, [server], [libs/console], [server])
+	QF_PROCESS_NEED_STATIC_PLUGINS(console, [client], [libs/console], [client])
 
-	QF_PROCESS_NEED_STATIC_PLUGINS(snd_output, [sdl mme sgi sun win dx oss alsa], [targets])
-	QF_PROCESS_NEED_STATIC_PLUGINS(snd_render, [jack default], [renderer])
-	QF_PROCESS_NEED_STATIC_PLUGINS(cd, [xmms sdl sgi win linux file])
+	QF_PROCESS_NEED_STATIC_PLUGINS(snd_output, [sdl mme sgi sun win dx oss alsa], [libs/audio/targets])
+	QF_PROCESS_NEED_STATIC_PLUGINS(snd_render, [jack default], [libs/audio/renderer])
+	QF_PROCESS_NEED_STATIC_PLUGINS(cd, [xmms sdl sgi win linux file], [libs/audio])
 	AC_DEFINE(STATIC_PLUGINS, 1, [Define this if you are building static plugins])
 	if test -n "$SOUND_TYPES"; then
 		SOUND_TYPES="$SOUND_TYPES (static)"
@@ -337,12 +345,12 @@ if test "x$static_plugins" = xyes; then
 		CDTYPE="$CDTYPE (static)"
 	fi
 else
-	QF_PROCESS_NEED_PLUGINS(vid_render, [sw sw32 glsl gl])
-	QF_PROCESS_NEED_PLUGINS(console, [server], [server])
-	QF_PROCESS_NEED_PLUGINS(console, [client], [client])
-	QF_PROCESS_NEED_PLUGINS(snd_output, [sdl mme sgi sun win dx oss alsa])
-	QF_PROCESS_NEED_PLUGINS(snd_render, [jack default])
-	QF_PROCESS_NEED_PLUGINS(cd, [xmms sdl sgi win linux file])
+	QF_PROCESS_NEED_PLUGINS(vid_render, [sw sw32 glsl gl], [libs/video/renderer])
+	QF_PROCESS_NEED_PLUGINS(console, [server], [libs/console], [server])
+	QF_PROCESS_NEED_PLUGINS(console, [client], [libs/console], [client])
+	QF_PROCESS_NEED_PLUGINS(snd_output, [sdl mme sgi sun win dx oss alsa], [libs/audio/targets])
+	QF_PROCESS_NEED_PLUGINS(snd_render, [jack default], [libs/audio/renderer])
+	QF_PROCESS_NEED_PLUGINS(cd, [xmms sdl sgi win linux file], [libs/audio])
 fi
 
 dnl Do not use -module here, it belongs in makefile.am due to automake
@@ -419,7 +427,7 @@ QF_DEPS(QFVIS,
 	[$(WIN32_LIBS)],
 )
 QF_DEPS(QWAQ,
-	[],
+	[-I$(top_srcdir)/ruamoko/qwaq],
 	[$(top_builddir)/libs/ruamoko/libQFruamoko.la
 	 $(top_builddir)/libs/gamecode/libQFgamecode.la
 	 $(top_builddir)/libs/util/libQFutil.la],
diff --git a/config.d/rpm.m4 b/config.d/rpm.m4
index 95ac34cf7..d4406cf2a 100644
--- a/config.d/rpm.m4
+++ b/config.d/rpm.m4
@@ -1,2 +1,2 @@
-AC_CONFIG_FILES(RPM/Makefile RPM/quakeforge.conf RPM/quakeforge.spec)
+AC_CONFIG_FILES(RPM/quakeforge.conf RPM/quakeforge.spec)
 AC_CONFIG_FILES(RPM/build_rpm, [chmod +x RPM/build_rpm])
diff --git a/configure.ac b/configure.ac
index ea203472c..591470b23 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ AC_PREREQ(2.61)
 
 dnl This is the only place where the package name and version appear
 AC_INIT([QuakeForge], m4_esyscmd([config.d/git-version-gen --prefix '' .tarball-version]))
-AM_INIT_AUTOMAKE([foreign])
+AM_INIT_AUTOMAKE([foreign subdir-objects])
 
 dnl LT_INIT messes with CFLAGS (evil bastard)
 if test "x${CFLAGS-unset}" = xunset; then
diff --git a/debian/Makefile.am b/debian/Makefile.am
deleted file mode 100644
index ec13849c4..000000000
--- a/debian/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-## Process this file with automake to produce Makefile.in
-AUTOMAKE_OPTIONS=	foreign
-
-# find -type f | sed -e 's:^\./::g' | grep -v Makefile | sort >> Makefile.am
-
-EXTRA_DIST= \
-	changelog control copyright quakeforge.conf rules source/format \
-	qfcc.install \
-	quakeforge-alsa.install quakeforge-alsa.postinst quakeforge-alsa.prerm \
-	quakeforge-common.install quakeforge-common.postinst \
-	quakeforge-dev.install \
-	quakeforge-gl.install \
-	quakeforge-glsl.install \
-	quakeforge-jack.install \
-	quakeforge-maptools.install \
-	quakeforge-oss.install quakeforge-oss.postinst quakeforge-oss.prerm \
-	quakeforge-sdl.install \
-	quakeforge-servers.install \
-	quakeforge-stub.postinst \
-	quakeforge-sw32.install \
-	quakeforge-sw.install \
-	quakeforge-utils.install \
-	quakeforge-x11.install
diff --git a/debian/Makemodule.am b/debian/Makemodule.am
new file mode 100644
index 000000000..9ef80d06a
--- /dev/null
+++ b/debian/Makemodule.am
@@ -0,0 +1,28 @@
+EXTRA_DIST += \
+	debian/changelog \
+	debian/control \
+	debian/copyright \
+	debian/quakeforge.conf \
+	debian/rules \
+	debian/source/format \
+	debian/qfcc.install \
+	debian/quakeforge-alsa.install \
+	debian/quakeforge-alsa.postinst \
+	debian/quakeforge-alsa.prerm \
+	debian/quakeforge-common.install \
+	debian/quakeforge-common.postinst \
+	debian/quakeforge-dev.install \
+	debian/quakeforge-gl.install \
+	debian/quakeforge-glsl.install \
+	debian/quakeforge-jack.install \
+	debian/quakeforge-maptools.install \
+	debian/quakeforge-oss.install \
+	debian/quakeforge-oss.postinst \
+	debian/quakeforge-oss.prerm \
+	debian/quakeforge-sdl.install \
+	debian/quakeforge-servers.install \
+	debian/quakeforge-stub.postinst \
+	debian/quakeforge-sw32.install \
+	debian/quakeforge-sw.install \
+	debian/quakeforge-utils.install \
+	debian/quakeforge-x11.install
diff --git a/desktop/Makefile.am b/desktop/Makefile.am
deleted file mode 100644
index 5aa61578b..000000000
--- a/desktop/Makefile.am
+++ /dev/null
@@ -1,49 +0,0 @@
-## Process this file with automake to produce Makefile.in
-#
-#	Makefile.am
-#
-#	Automake-using build system for QuakeForge
-#
-#	Copyright (C) 2000 Jeff Teunissen <deek@quakeforge.net>
-#
-#	This Makefile is free software; you can redistribute it and/or
-#	modify it under the terms of the GNU General Public License
-#	as published by the Free Software Foundation; either version 2
-#	of the License, or (at your option) any later version.
-#
-#	This program is distributed in the hope that it will be useful,
-#	but WITHOUT ANY WARRANTY; without even the implied warranty of
-#	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-#
-#	See the GNU General Public License for more details.
-#
-#	You should have received a copy of the GNU General Public License
-#	along with this program; if not, write to:
-#
-#		Free Software Foundation, Inc.
-#		59 Temple Place - Suite 330
-#		Boston, MA  02111-1307, USA
-#
-#	$Id$
-#
-
-AUTOMAKE_OPTIONS=	foreign
-
-# Stuff that is common to both client and server
-# Desktop files
-if HAVE_XDG
-desktopdir=$(datarootdir)/applications
-desktop_DATA= @NQ_DESKTOP_DATA@ @QW_DESKTOP_DATA@
-endif
-
-# Stuff that doesn't get linked into an executable NEEDS to be mentioned here,
-# or it won't be distributed with 'make dist'
-
-EXTRA_DIST= quakeforge-nq-glx.desktop quakeforge-nq-sdl.desktop \
-	quakeforge-nq-sdl32.desktop quakeforge-nq-sgl.desktop \
-	quakeforge-nq-x11.desktop quakeforge-qw-glx.desktop \
-	quakeforge-qw-sdl.desktop quakeforge-qw-sdl32.desktop \
-	quakeforge-qw-sgl.desktop quakeforge-qw-x11.desktop
-
-# Kill the temp files, hopefully.
-CLEANFILES	= *.i *.s $(YACCLEX_CLEANFILES)
diff --git a/desktop/Makemodule.am b/desktop/Makemodule.am
new file mode 100644
index 000000000..bb0acd969
--- /dev/null
+++ b/desktop/Makemodule.am
@@ -0,0 +1,10 @@
+if HAVE_XDG
+desktopdir=$(datarootdir)/applications
+desktop_DATA = @NQ_DESKTOP_DATA@ @QW_DESKTOP_DATA@
+endif
+
+EXTRA_DIST += \
+	desktop/quakeforge-nq-sdl.desktop \
+	desktop/quakeforge-nq-x11.desktop \
+	desktop/quakeforge-qw-sdl.desktop \
+	desktop/quakeforge-qw-x11.desktop
diff --git a/desktop/quakeforge-nq-glx.desktop b/desktop/quakeforge-nq-glx.desktop
deleted file mode 100644
index 67c4ca509..000000000
--- a/desktop/quakeforge-nq-glx.desktop
+++ /dev/null
@@ -1,18 +0,0 @@
-[Desktop Entry]
-Version=1.0
-
-Type=Application
-
-Name=QuakeForge (GLX)
-GenericName=Quake (GLX)
-Comment=A first person shooter game
-Comment[fr]=Un jeu de tir subjectif
-Comment[it]=Sparatutto in prima persona
-Icon=quake
-
-Categories=Game;ActionGame;
-
-Exec=nq-glx
-TryExec=nq-glx
-Terminal=false
-StartupNotify=false
diff --git a/desktop/quakeforge-nq-sdl32.desktop b/desktop/quakeforge-nq-sdl32.desktop
deleted file mode 100644
index f39050155..000000000
--- a/desktop/quakeforge-nq-sdl32.desktop
+++ /dev/null
@@ -1,18 +0,0 @@
-[Desktop Entry]
-Version=1.0
-
-Type=Application
-
-Name=QuakeForge (SDL32)
-GenericName=Quake (SDL32)
-Comment=A first person shooter game
-Comment[fr]=Un jeu de tir subjectif
-Comment[it]=Sparatutto in prima persona
-Icon=quake
-
-Categories=SDL;Game;ActionGame;
-
-Exec=nq-sdl32
-TryExec=nq-sdl32
-Terminal=false
-StartupNotify=false
diff --git a/desktop/quakeforge-nq-sgl.desktop b/desktop/quakeforge-nq-sgl.desktop
deleted file mode 100644
index 82645eeb6..000000000
--- a/desktop/quakeforge-nq-sgl.desktop
+++ /dev/null
@@ -1,18 +0,0 @@
-[Desktop Entry]
-Version=1.0
-
-Type=Application
-
-Name=QuakeForge (SDL GL)
-GenericName=Quake (SDL GL)
-Comment=A first person shooter game
-Comment[fr]=Un jeu de tir subjectif
-Comment[it]=Sparatutto in prima persona
-Icon=quake
-
-Categories=SDL;Game;ActionGame;
-
-Exec=nq-sgl
-TryExec=nq-sgl
-Terminal=false
-StartupNotify=false
diff --git a/desktop/quakeforge-qw-glx.desktop b/desktop/quakeforge-qw-glx.desktop
deleted file mode 100644
index fab7cab4e..000000000
--- a/desktop/quakeforge-qw-glx.desktop
+++ /dev/null
@@ -1,18 +0,0 @@
-[Desktop Entry]
-Version=1.0
-
-Type=Application
-
-Name=QuakeForge QuakeWorld (GLX)
-GenericName=QuakeWorld (GLX)
-Comment=A first person shooter game
-Comment[fr]=Un jeu de tir subjectif
-Comment[it]=Sparatutto in prima persona
-Icon=quake
-
-Categories=Game;ActionGame;
-
-Exec=qw-client-glx
-TryExec=qw-client-glx
-Terminal=false
-StartupNotify=false
diff --git a/desktop/quakeforge-qw-sdl32.desktop b/desktop/quakeforge-qw-sdl32.desktop
deleted file mode 100644
index d2862ecb6..000000000
--- a/desktop/quakeforge-qw-sdl32.desktop
+++ /dev/null
@@ -1,18 +0,0 @@
-[Desktop Entry]
-Version=1.0
-
-Type=Application
-
-Name=QuakeForge QuakeWorld (SDL32)
-GenericName=QuakeWorld (SDL32)
-Comment=A first person shooter game
-Comment[fr]=Un jeu de tir subjectif
-Comment[it]=Sparatutto in prima persona
-Icon=quake
-
-Categories=SDL;Game;ActionGame;
-
-Exec=qw-client-sdl32
-TryExec=qw-client-sdl32
-Terminal=false
-StartupNotify=false
diff --git a/desktop/quakeforge-qw-sgl.desktop b/desktop/quakeforge-qw-sgl.desktop
deleted file mode 100644
index 36ae08f24..000000000
--- a/desktop/quakeforge-qw-sgl.desktop
+++ /dev/null
@@ -1,18 +0,0 @@
-[Desktop Entry]
-Version=1.0
-
-Type=Application
-
-Name=QuakeForge QuakeWorld (SDL GL)
-GenericName=QuakeWorld (SDL GL)
-Comment=A first person shooter game
-Comment[fr]=Un jeu de tir subjectif
-Comment[it]=Sparatutto in prima persona
-Icon=quake
-
-Categories=SDL;Game;ActionGame;
-
-Exec=qw-client-sgl
-TryExec=qw-client-sgl
-Terminal=false
-StartupNotify=false
diff --git a/doc/Makefile.am b/doc/Makefile.am
deleted file mode 100644
index 8511d72f3..000000000
--- a/doc/Makefile.am
+++ /dev/null
@@ -1,55 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-SUBDIRS= man
-
-DOX= \
-	bind.dox config.dox connect.dox cshifts.dox dirconf.dox faq.dox \
-	filesystem.dox mapformat.dox property-list.dox qtv.dox quakeforge.dox \
-	qw-cap-spec.dox qw-download-spec.dox sound.dox specifications.dox \
-	surround-sound.dox timestamps.dox
-
-GIB= \
-	gib/GIB.lyx gib/break.gib gib/continue.gib gib/curly.gib gib/examples.sh \
-	gib/for.gib gib/gib_head.eps gib/if-chain.gib gib/if-else.gib \
-	gib/if-simple.gib gib/while.gib
-
-PROGS= \
-	progs/vm-exec.c progs/vm-mem.fig
-
-EXTRA_DIST= qf.ico \
-	\
-	skybox.fig template.c template.h \
-	quakeforge.dox.conf.in \
-	\
-	${DOX} ${GIB} ${PROGS} \
-	\
-	config/glspeed-v1.cfg config/glspeed-v3.cfg config/swspeed.cfg \
-	\
-	config/gib/adjustvolume.gib config/gib/infobot.gib config/gib/ln.gib \
-	config/gib/qfadmin.gib config/gib/sshot.gib config/gib/zoom.gib \
-	\
-	qtv/qwtv.fig
-
-SUFFIXES=.eps .fig .png
-.fig.png:
-	@mkdir -p `dirname $@`
-	fig2dev -L png $< $@
-
-.fig.eps:
-	@mkdir -p `dirname $@`
-	fig2dev -L ps $< $@
-
-.fig.svg:
-	@mkdir -p `dirname $@`
-	fig2dev -L svg $< $@
-
-clean-local:
-	-rm -fr doxygen
-
-progs/vm-mem.svg: progs/vm-mem.fig
-progs/vm-mem.eps: progs/vm-mem.fig
-qtv/qwtv.svg: qtv/qwtv.fig
-qtv/qwtv.eps: qtv/qwtv.fig
-
-doc: quakeforge.dox.conf progs/vm-mem.svg progs/vm-mem.eps qtv/qwtv.svg qtv/qwtv.eps ${DOX}
-	doxygen quakeforge.dox.conf
diff --git a/doc/Makemodule.am b/doc/Makemodule.am
new file mode 100644
index 000000000..b26d57841
--- /dev/null
+++ b/doc/Makemodule.am
@@ -0,0 +1,80 @@
+man_MANS += doc/man/quakeforge.1
+
+DOX= \
+	doc/bind.dox \
+	doc/config.dox \
+	doc/connect.dox \
+	doc/cshifts.dox \
+	doc/dirconf.dox \
+	doc/faq.dox \
+	doc/filesystem.dox \
+	doc/mapformat.dox \
+	doc/property-list.dox \
+	doc/qtv.dox \
+	doc/quakeforge.dox \
+	doc/qw-cap-spec.dox \
+	doc/qw-download-spec.dox \
+	doc/sound.dox \
+	doc/specifications.dox \
+	doc/surround-sound.dox \
+	doc/timestamps.dox
+
+GIB= \
+	doc/gib/GIB.lyx \
+	doc/gib/break.gib \
+	doc/gib/continue.gib \
+	doc/gib/curly.gib \
+	doc/gib/examples.sh \
+	doc/gib/for.gib \
+	doc/gib/gib_head.eps \
+	doc/gib/if-chain.gib \
+	doc/gib/if-else.gib \
+	doc/gib/if-simple.gib \
+	doc/gib/while.gib
+
+PROGS= \
+	doc/progs/vm-exec.c \
+	doc/progs/vm-mem.fig
+
+EXTRA_DIST += \
+	${DOX} ${GIB} ${PROGS} \
+	doc/qf.ico \
+	doc/skybox.fig \
+	doc/template.c \
+	doc/template.h \
+	doc/quakeforge.dox.conf.in \
+	doc/config/glspeed-v1.cfg \
+	doc/config/glspeed-v3.cfg \
+	doc/config/swspeed.cfg \
+	doc/config/gib/adjustvolume.gib \
+	doc/config/gib/infobot.gib \
+	doc/config/gib/ln.gib \
+	doc/config/gib/qfadmin.gib \
+	doc/config/gib/sshot.gib \
+	doc/config/gib/zoom.gib \
+	doc/man/quakeforge.1 \
+	doc/qtv/qwtv.fig
+
+SUFFIXES += .eps .fig .png
+.fig.png:
+	@mkdir -p `dirname $@`
+	fig2dev -L png $< $@
+
+.fig.eps:
+	@mkdir -p `dirname $@`
+	fig2dev -L ps $< $@
+
+.fig.svg:
+	@mkdir -p `dirname $@`
+	fig2dev -L svg $< $@
+
+clean-local:
+	-rm -fr doxygen
+
+doc/progs/vm-mem.svg: doc/progs/vm-mem.fig
+doc/progs/vm-mem.eps: doc/progs/vm-mem.fig
+doc/qtv/qwtv.svg: doc/qtv/qwtv.fig
+doc/qtv/qwtv.eps: doc/qtv/qwtv.fig
+
+doc: doc/quakeforge.dox.conf doc/progs/vm-mem.svg doc/progs/vm-mem.eps doc/qtv/qwtv.svg qtv/qwtv.eps ${DOX}
+	doxygen doc/quakeforge.dox.conf
diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
deleted file mode 100644
index 5249e3a26..000000000
--- a/doc/man/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-## Process this file with automake to produce Makefile.in
-AUTOMAKE_OPTIONS= foreign
-
-EXTRA_DIST= quakeforge.1
diff --git a/hw/Makefile.am b/hw/Makefile.am
deleted file mode 100644
index 77e3cbf5b..000000000
--- a/hw/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-## Process this file with automake to produce Makefile.in
-AUTOMAKE_OPTIONS= foreign
-
-SUBDIRS=	include source
diff --git a/hw/Makemodule.am b/hw/Makemodule.am
new file mode 100644
index 000000000..cfd2f1e31
--- /dev/null
+++ b/hw/Makemodule.am
@@ -0,0 +1 @@
+include hw/source/Makemodule.am
diff --git a/hw/include/Makefile.am b/hw/include/Makefile.am
deleted file mode 100644
index b36df17ad..000000000
--- a/hw/include/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-## Process this file with automake to produce Makefile.in
-AUTOMAKE_OPTIONS=	foreign
-
-EXTRA_DIST =
diff --git a/hw/source/Makefile.am b/hw/source/Makemodule.am
similarity index 69%
rename from hw/source/Makefile.am
rename to hw/source/Makemodule.am
index d5ad0658e..9f86d3283 100644
--- a/hw/source/Makefile.am
+++ b/hw/source/Makemodule.am
@@ -27,27 +27,17 @@
 #	$Id$
 #
 
-AUTOMAKE_OPTIONS=	foreign
+bin_PROGRAMS +=	@HW_TARGETS@
 
-# Stuff that is common to both client and server
-AM_CPPFLAGS=	-I$(top_srcdir)/include -I$(top_srcdir)/hw/include
-SDL_LIBS = @SDL_LIBS@
+EXTRA_PROGRAMS += hw-master
 
-bin_PROGRAMS=	@HW_TARGETS@
-
-EXTRA_PROGRAMS= hw-master
-
-common_ldflags= -export-dynamic
 hw_master_libs= \
-	$(top_builddir)/libs/net/libnet_chan.la \
+	libs/net/libnet_chan.la \
 	@server_static_plugin_libs@ \
-	$(top_builddir)/libs/console/libQFconsole.la \
-	$(top_builddir)/libs/util/libQFutil.la
+	libs/console/libQFconsole.la \
+	libs/util/libQFutil.la
 
 hw_master_LDFLAGS=		$(common_ldflags)
 hw_master_LDADD=		$(hw_master_libs) $(NET_LIBS)
 hw_master_DEPENDENCIES=	$(hw_master_libs)
-hw_master_SOURCES=		master.c
-
-# Kill the temp files, hopefully.
-CLEANFILES	= *.i *.s
+hw_master_SOURCES=		hw/source/master.c
diff --git a/include/Makefile.am b/include/Makefile.am
deleted file mode 100644
index 56b084ae1..000000000
--- a/include/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-## Process this file with automake to produce Makefile.in
-AUTOMAKE_OPTIONS=	foreign
-SUBDIRS = QF
-EXTRA_DIST = \
-	adivtab.h alsa_funcs_list.h anorm_dots.h anorms.h asm_draw.h asm_i386.h \
-	block16.h block8.h buildnum.h clview.h compat.h context_sdl.h \
-	context_x11.h d_iface.h d_ifacea.h d_local.h dga_check.h exp.h fbset.h \
-	garbage.h getopt.h gib_buffer.h gib_builtin.h gib_classes.h \
-	gib_execute.h gib_function.h gib_handle.h gib_object.h gib_parse.h \
-	gib_process.h gib_regex.h gib_semantics.h gib_thread.h gib_tree.h \
-	gib_vars.h gl_warp_sin.h in_win.h logos.h mod_internal.h net_dgrm.h \
-	net_loop.h net_udp.h net_vcr.h net_wins.h netchan.h netmain.h \
-	noisetextures.h old_keys.h ops.h pstdint.h qfalloca.h qstring.h \
-	quakeasm.h r_cvar.h r_dynamic.h r_internal.h r_local.h r_screen.h \
-	r_shared.h regex.h rua_internal.h sbar.h skin_stencil.h snd_internal.h \
-	sv_console.h varrays.h vgamodes.h vid_internal.h vregset.h winquake.h \
-	world.h \
-	\
-	client/entities.h \
-	\
-	qw/bothdefs.h qw/msg_backbuf.h qw/msg_ucmd.h qw/pmove.h qw/protocol.h \
-	\
-	win32/dirent.h win32/fnmatch.h win32/stdint.h \
-	\
-	win32/resources/icon1Vista.ico win32/resources/icon1XP.ico \
-	win32/resources/quakeforge.rc win32/resources/resource.h
diff --git a/include/Makemodule.am b/include/Makemodule.am
new file mode 100644
index 000000000..ac6108f67
--- /dev/null
+++ b/include/Makemodule.am
@@ -0,0 +1,88 @@
+## Process this file with automake to produce Makefile.in
+include include/QF/Makemodule.am
+
+EXTRA_DIST += \
+	include/adivtab.h \
+	include/alsa_funcs_list.h \
+	include/anorm_dots.h \
+	include/anorms.h \
+	include/asm_draw.h \
+	include/asm_i386.h \
+	include/block16.h \
+	include/block8.h \
+	include/buildnum.h \
+	include/clview.h \
+	include/compat.h \
+	include/context_sdl.h \
+	include/context_x11.h \
+	include/d_iface.h \
+	include/d_ifacea.h \
+	include/d_local.h \
+	include/dga_check.h \
+	include/exp.h \
+	include/fbset.h \
+	include/garbage.h \
+	include/getopt.h \
+	include/gib_buffer.h \
+	include/gib_builtin.h \
+	include/gib_classes.h \
+	include/gib_execute.h \
+	include/gib_function.h \
+	include/gib_handle.h \
+	include/gib_object.h \
+	include/gib_parse.h \
+	include/gib_process.h \
+	include/gib_regex.h \
+	include/gib_semantics.h \
+	include/gib_thread.h \
+	include/gib_tree.h \
+	include/gib_vars.h \
+	include/gl_warp_sin.h \
+	include/in_win.h \
+	include/logos.h \
+	include/mod_internal.h \
+	include/net_dgrm.h \
+	include/net_loop.h \
+	include/net_udp.h \
+	include/net_vcr.h \
+	include/net_wins.h \
+	include/netchan.h \
+	include/netmain.h \
+	include/noisetextures.h \
+	include/old_keys.h \
+	include/ops.h \
+	include/pstdint.h \
+	include/qfalloca.h \
+	include/qstring.h \
+	include/quakeasm.h \
+	include/r_cvar.h \
+	include/r_dynamic.h \
+	include/r_internal.h \
+	include/r_local.h \
+	include/r_screen.h \
+	include/r_shared.h \
+	include/regex.h \
+	include/rua_internal.h \
+	include/sbar.h \
+	include/skin_stencil.h \
+	include/snd_internal.h \
+	include/sv_console.h \
+	include/varrays.h \
+	include/vgamodes.h \
+	include/vid_internal.h \
+	include/vregset.h \
+	include/winquake.h \
+	include/world.h \
+	include/client/entities.h \
+	include/qw/bothdefs.h \
+	include/qw/msg_backbuf.h \
+	include/qw/msg_ucmd.h \
+	include/qw/pmove.h \
+	include/qw/protocol.h \
+	include/win32/dirent.h \
+	include/win32/fnmatch.h \
+	include/win32/stdint.h \
+	include/win32/resources/icon1Vista.ico \
+	include/win32/resources/icon1XP.ico \
+	include/win32/resources/quakeforge.rc \
+	include/win32/resources/resource.h
diff --git a/include/QF/Makefile.am b/include/QF/Makefile.am
deleted file mode 100644
index bb6b0d2da..000000000
--- a/include/QF/Makefile.am
+++ /dev/null
@@ -1,38 +0,0 @@
-AUTOMAKE_OPTIONS = foreign
-pkgincludedir = $(includedir)/QF
-#for header files that qfcc (ruamoko) will use
-pkgdatadir = $(datarootdir)/qfcc/include/QF
-
-include_qf= \
-	alloc.h bspfile.h cbuf.h cdaudio.h checksum.h clip_hull.h cmd.h \
-	console.h crc.h csqc.h cvar.h darray.h dstring.h draw.h gib.h hash.h \
-	idparse.h image.h in_event.h info.h input.h iqm.h joystick.h keys.h \
-	link.h llist.h locs.h mathlib.h mdfour.h mersenne.h model.h modelgen.h \
-	msg.h object.h pak.h pakfile.h pcx.h png.h plugin.h pr_comp.h pr_debug.h \
-	pr_obj.h pr_type.h progs.h qargs.h qdefs.h qendian.h qfplist.h qtypes.h \
-	quakefs.h \
-	quakeio.h render.h riff.h ringbuffer.h ruamoko.h \
-	screen.h script.h segtext.h set.h \
-	sizebuf.h skin.h sound.h spritegn.h sys.h teamplay.h tga.h va.h \
-	ver_check.h vid.h vrect.h view.h wad.h wadfile.h winding.h zone.h \
-	\
-	GL/ati.h GL/defines.h GL/extensions.h GL/funcs.h GL/qf_draw.h \
-	GL/qf_explosions.h GL/qf_funcs_list.h GL/qf_iqm.h GL/qf_lightmap.h \
-	GL/qf_rlight.h GL/qf_rmain.h GL/qf_rsurf.h GL/qf_sky.h GL/qf_textures.h \
-	GL/qf_vid.h GL/types.h \
-	\
-	GLSL/defines.h GLSL/funcs.h GLSL/qf_alias.h GLSL/qf_bsp.h GLSL/qf_draw.h \
-	GLSL/qf_funcs_list.h GLSL/qf_iqm.h GLSL/qf_lightmap.h GLSL/qf_particles.h \
-	GLSL/qf_textures.h GLSL/qf_vid.h GLSL/types.h \
-	\
-	math/dual.h math/half.h math/matrix3.h math/matrix4.h math/quaternion.h \
-	math/vector.h \
-	\
-	plugin/cd.h plugin/console.h plugin/general.h plugin/input.h \
-	plugin/snd_output.h plugin/snd_render.h plugin/vid_render.h
-
-qfcc_include_qf=keys.h
-nobase_pkginclude_HEADERS = @include_qf@
-pkgdata_DATA=@qfcc_include_qf@
-
-EXTRA_HEADERS = $(include_qf) $(qfcc_include_qf)
diff --git a/include/QF/Makemodule.am b/include/QF/Makemodule.am
new file mode 100644
index 000000000..5ef2c4423
--- /dev/null
+++ b/include/QF/Makemodule.am
@@ -0,0 +1,151 @@
+include_qf = \
+	include/QF/alloc.h \
+	include/QF/bspfile.h \
+	include/QF/cbuf.h \
+	include/QF/cdaudio.h \
+	include/QF/checksum.h \
+	include/QF/clip_hull.h \
+	include/QF/cmd.h \
+	include/QF/console.h \
+	include/QF/crc.h \
+	include/QF/csqc.h \
+	include/QF/cvar.h \
+	include/QF/darray.h \
+	include/QF/dstring.h \
+	include/QF/draw.h \
+	include/QF/gib.h \
+	include/QF/hash.h \
+	include/QF/idparse.h \
+	include/QF/image.h \
+	include/QF/in_event.h \
+	include/QF/info.h \
+	include/QF/input.h \
+	include/QF/iqm.h \
+	include/QF/joystick.h \
+	include/QF/keys.h \
+	include/QF/link.h \
+	include/QF/llist.h \
+	include/QF/locs.h \
+	include/QF/mathlib.h \
+	include/QF/mdfour.h \
+	include/QF/mersenne.h \
+	include/QF/model.h \
+	include/QF/modelgen.h \
+	include/QF/msg.h \
+	include/QF/object.h \
+	include/QF/pak.h \
+	include/QF/pakfile.h \
+	include/QF/pcx.h \
+	include/QF/png.h \
+	include/QF/plugin.h \
+	include/QF/pr_comp.h \
+	include/QF/pr_debug.h \
+	include/QF/pr_obj.h \
+	include/QF/pr_type.h \
+	include/QF/progs.h \
+	include/QF/qargs.h \
+	include/QF/qdefs.h \
+	include/QF/qendian.h \
+	include/QF/qfplist.h \
+	include/QF/qtypes.h \
+	include/QF/quakefs.h \
+	include/QF/quakeio.h \
+	include/QF/render.h \
+	include/QF/riff.h \
+	include/QF/ringbuffer.h \
+	include/QF/ruamoko.h \
+	include/QF/screen.h \
+	include/QF/script.h \
+	include/QF/segtext.h \
+	include/QF/set.h \
+	include/QF/sizebuf.h \
+	include/QF/skin.h \
+	include/QF/sound.h \
+	include/QF/spritegn.h \
+	include/QF/sys.h \
+	include/QF/teamplay.h \
+	include/QF/tga.h \
+	include/QF/txtbuffer.h \
+	include/QF/va.h \
+	include/QF/ver_check.h \
+	include/QF/vid.h \
+	include/QF/vrect.h \
+	include/QF/view.h \
+	include/QF/wad.h \
+	include/QF/wadfile.h \
+	include/QF/winding.h \
+	include/QF/zone.h
+
+include_qf_gl = \
+	include/QF/GL/ati.h \
+	include/QF/GL/defines.h \
+	include/QF/GL/extensions.h \
+	include/QF/GL/funcs.h \
+	include/QF/GL/qf_draw.h \
+	include/QF/GL/qf_explosions.h \
+	include/QF/GL/qf_funcs_list.h \
+	include/QF/GL/qf_iqm.h \
+	include/QF/GL/qf_lightmap.h \
+	include/QF/GL/qf_rlight.h \
+	include/QF/GL/qf_rmain.h \
+	include/QF/GL/qf_rsurf.h \
+	include/QF/GL/qf_sky.h \
+	include/QF/GL/qf_textures.h \
+	include/QF/GL/qf_vid.h \
+	include/QF/GL/types.h
+
+include_qf_glsl = \
+	include/QF/GLSL/defines.h \
+	include/QF/GLSL/funcs.h \
+	include/QF/GLSL/qf_alias.h \
+	include/QF/GLSL/qf_bsp.h \
+	include/QF/GLSL/qf_draw.h \
+	include/QF/GLSL/qf_funcs_list.h \
+	include/QF/GLSL/qf_iqm.h \
+	include/QF/GLSL/qf_lightmap.h \
+	include/QF/GLSL/qf_particles.h \
+	include/QF/GLSL/qf_textures.h \
+	include/QF/GLSL/qf_vid.h \
+	include/QF/GLSL/types.h
+
+include_qf_math = \
+	include/QF/math/dual.h \
+	include/QF/math/half.h \
+	include/QF/math/matrix3.h \
+	include/QF/math/matrix4.h \
+	include/QF/math/quaternion.h \
+	include/QF/math/vector.h
+
+include_qf_plugin = \
+	include/QF/plugin/cd.h \
+	include/QF/plugin/console.h \
+	include/QF/plugin/general.h \
+	include/QF/plugin/input.h \
+	include/QF/plugin/snd_output.h \
+	include/QF/plugin/snd_render.h \
+	include/QF/plugin/vid_render.h
+
+# headers shared with ruamoko
+qfcc_include_qf = include/QF/keys.h
+
+qf_includedir = $(includedir)/QF
+qf_gl_includedir = $(includedir)/QF/GL
+qf_glsl_includedir = $(includedir)/QF/GLSL
+qf_math_includedir = $(includedir)/QF/math
+qf_plugin_includedir = $(includedir)/QF/plugin
+qf_include_HEADERS = @qfac_include_qf@
+qf_gl_include_HEADERS = @qfac_include_qf_gl@
+qf_glsl_include_HEADERS = @qfac_include_qf_glsl@
+qf_math_include_HEADERS = @qfac_include_qf_math@
+qf_plugin_include_HEADERS = @qfac_include_qf_plugin@
+
+ruamoko_qf_includedir = $(ruamoko_includedir)/QF
+ruamoko_qf_include_HEADERS = @qfac_qfcc_include_qf@
+
+EXTRA_HEADERS += \
+	$(include_qf) \
+	$(include_qf_gl) \
+	$(include_qf_glsl) \
+	$(include_qf_math) \
+	$(include_qf_plugin) \
+	$(qfcc_include_qf)
diff --git a/libs/Makefile.am b/libs/Makefile.am
deleted file mode 100644
index 5c14c7d00..000000000
--- a/libs/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-# everything depends on util
-# ruamoko depends on gamecode
-# gib depends on ruamoko
-# audio depends on gamecode
-# models depends on image
-# video depends on models(?), image(?) and ruamoko
-# console depends on video, ruamoko and audio
-SUBDIRS=@libs_dirs@
-DIST_SUBDIRS=util gamecode ruamoko gib audio image models video console \
-			 net qw client
diff --git a/libs/Makemodule.am b/libs/Makemodule.am
new file mode 100644
index 000000000..5a68c67ba
--- /dev/null
+++ b/libs/Makemodule.am
@@ -0,0 +1,13 @@
+include libs/util/Makemodule.am
+include libs/gamecode/Makemodule.am
+include libs/ruamoko/Makemodule.am
+include libs/gib/Makemodule.am
+include libs/audio/Makemodule.am
+include libs/image/Makemodule.am
+include libs/models/Makemodule.am
+include libs/video/Makemodule.am
+include libs/console/Makemodule.am
+
+include libs/net/Makemodule.am
+include libs/client/Makemodule.am
+include libs/qw/Makemodule.am
diff --git a/libs/audio/Makefile.am b/libs/audio/Makefile.am
deleted file mode 100644
index 5521b3e2f..000000000
--- a/libs/audio/Makefile.am
+++ /dev/null
@@ -1,77 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-SUBDIRS= targets renderer . test
-AM_CFLAGS= @PREFER_PIC@
-AM_CPPFLAGS= -I$(top_srcdir)/include
-SDL_LIBS= @SDL_LIBS@
-XMMS_LIBS= @XMMS_LIBS@
-plugin_ldflags= @plugin_ldflags@ -avoid-version -module -rpath $(plugindir)
-plugin_libadd= @plugin_libadd@
-lib_ldflags=-version-info $(QUAKE_LIBRARY_VERSION_INFO) \
-			-rpath $(libdir) -no-undefined
-EXEEXT=
-
-plugin_LTLIBRARIES=	@cd_plugins@
-noinst_LTLIBRARIES=	@cd_static_plugins@
-lib_LTLIBRARIES=	@CD_TARGETS@ @SND_TARGETS@
-EXTRA_LTLIBRARIES=	libQFsound.la libQFcd.la \
-					cd_file.la cd_linux.la cd_sdl.la cd_sgi.la cd_win.la \
-					cd_xmms.la
-
-cd_plug_libs=$(top_builddir)/libs/util/libQFutil.la
-
-cd_file_libs= \
-	libQFsound.la \
-	$(cd_plug_libs)
-
-cd_file_la_LDFLAGS=			$(plugin_ldflags)
-cd_file_la_LIBADD=			$(cd_file_libs)
-cd_file_la_DEPENDENCIES=	$(cd_file_libs)
-cd_file_la_SOURCES=			cd_file.c
-
-cd_linux_la_LDFLAGS=		$(plugin_ldflags)
-cd_linux_la_LIBADD=			$(cd_plug_libs)
-cd_linux_la_DEPENDENCIES=	$(cd_plug_libs)
-cd_linux_la_SOURCES=		cd_linux.c
-
-cd_sdl_la_LDFLAGS=			$(plugin_ldflags)
-cd_sdl_la_LIBADD=			$(cd_plug_libs) $(SDL_LIBS) $(plugin_libadd)
-cd_sdl_la_DEPENDENCIES=		$(cd_plug_libs)
-cd_sdl_la_CFLAGS=			$(SDL_CFLAGS)
-cd_sdl_la_SOURCES=			cd_sdl.c
-
-cd_sgi_la_LDFLAGS=			$(plugin_ldflags)
-cd_sgi_la_LIBADD=			$(cd_plug_libs) $(SGI_CD_LIBS)
-cd_sgi_la_DEPENDENCIES=		$(cd_plug_libs)
-cd_sgi_la_SOURCES=			cd_sgi.c
-
-cd_win_la_LDFLAGS=			$(plugin_ldflags)
-cd_win_la_LIBADD=			$(cd_plug_libs) $(plugin_libadd)
-cd_win_la_DEPENDENCIES=		$(cd_plug_libs)
-cd_win_la_SOURCES=			cd_win.c
-
-cd_xmms_la_LDFLAGS=			$(plugin_ldflags)
-cd_xmms_la_LIBADD=			$(cd_plug_libs) $(XMMS_LIBS)
-cd_xmms_la_DEPENDENCIES=	$(cd_plug_libs)
-cd_xmms_la_CFLAGS=			$(XMMS_CFLAGS)
-cd_xmms_la_SOURCES=			cd_xmms.c
-
-sound_libs= \
-	@snd_output_static_plugin_libs@ \
-	@snd_render_static_plugin_libs@ \
-	$(top_builddir)/libs/ruamoko/libQFruamoko.la \
-	$(top_builddir)/libs/util/libQFutil.la
-
-cd_libs= \
-	@cd_static_plugin_libs@ \
-	$(top_builddir)/libs/util/libQFutil.la
-
-libQFsound_la_LDFLAGS=		$(lib_ldflags)
-libQFsound_la_LIBADD=		$(sound_libs)
-libQFsound_la_DEPENDENCIES=	$(sound_libs)
-libQFsound_la_SOURCES=		snd.c snd_progs.c
-
-libQFcd_la_LDFLAGS=			$(lib_ldflags)
-libQFcd_la_LIBADD=			$(cd_libs)
-libQFcd_la_DEPENDENCIES=	$(cd_libs)
-libQFcd_la_SOURCES=			cd.c
diff --git a/libs/audio/Makemodule.am b/libs/audio/Makemodule.am
new file mode 100644
index 000000000..c649c7351
--- /dev/null
+++ b/libs/audio/Makemodule.am
@@ -0,0 +1,67 @@
+include libs/audio/targets/Makemodule.am
+include libs/audio/renderer/Makemodule.am
+
+plugin_LTLIBRARIES +=	@cd_plugins@
+noinst_LTLIBRARIES +=	@cd_static_plugins@
+lib_LTLIBRARIES +=	@CD_TARGETS@ @SND_TARGETS@
+EXTRA_LTLIBRARIES += \
+	libs/audio/libQFsound.la \
+	libs/audio/libQFcd.la \
+	libs/audio/cd_file.la \
+	libs/audio/cd_linux.la \
+	libs/audio/cd_sdl.la \
+	libs/audio/cd_sgi.la \
+	libs/audio/cd_win.la \
+	libs/audio/cd_xmms.la
+
+cd_plug_libs=libs/util/libQFutil.la
+
+cd_file_libs= \
+	libs/audio/libQFsound.la \
+	$(cd_plug_libs)
+
+libs_audio_cd_file_la_LDFLAGS=			$(plugin_ldflags)
+libs_audio_cd_file_la_LIBADD=			$(cd_file_libs)
+libs_audio_cd_file_la_SOURCES=			libs/audio/cd_file.c
+
+libs_audio_cd_linux_la_LDFLAGS=		$(plugin_ldflags)
+libs_audio_cd_linux_la_LIBADD=			$(cd_plug_libs)
+libs_audio_cd_linux_la_SOURCES=		libs/audio/cd_linux.c
+
+libs_audio_cd_sdl_la_LDFLAGS=			$(plugin_ldflags)
+libs_audio_cd_sdl_la_LIBADD=			$(cd_plug_libs) $(SDL_LIBS) $(plugin_libadd)
+libs_audio_cd_sdl_la_CFLAGS=			$(SDL_CFLAGS)
+libs_audio_cd_sdl_la_SOURCES=			libs/audio/cd_sdl.c
+
+libs_audio_cd_sgi_la_LDFLAGS=			$(plugin_ldflags)
+libs_audio_cd_sgi_la_LIBADD=			$(cd_plug_libs) $(SGI_CD_LIBS)
+libs_audio_cd_sgi_la_SOURCES=			libs/audio/cd_sgi.c
+
+libs_audio_cd_win_la_LDFLAGS=			$(plugin_ldflags)
+libs_audio_cd_win_la_LIBADD=			$(cd_plug_libs) $(plugin_libadd)
+libs_audio_cd_win_la_SOURCES=			libs/audio/cd_win.c
+
+libs_audio_cd_xmms_la_LDFLAGS=			$(plugin_ldflags)
+libs_audio_cd_xmms_la_LIBADD=			$(cd_plug_libs) $(XMMS_LIBS)
+libs_audio_cd_xmms_la_CFLAGS=			$(XMMS_CFLAGS)
+libs_audio_cd_xmms_la_SOURCES=			libs/audio/cd_xmms.c
+
+sound_libs= \
+	@snd_output_static_plugin_libs@ \
+	@snd_render_static_plugin_libs@ \
+	libs/ruamoko/libQFruamoko.la \
+	libs/util/libQFutil.la
+
+cd_libs= \
+	@cd_static_plugin_libs@ \
+	libs/util/libQFutil.la
+
+libs_audio_libQFsound_la_LDFLAGS=		$(lib_ldflags)
+libs_audio_libQFsound_la_DEPENDENCIES=	$(sound_libs)
+libs_audio_libQFsound_la_LIBADD=		$(sound_libs)
+libs_audio_libQFsound_la_SOURCES=		libs/audio/snd.c libs/audio/snd_progs.c
+
+libs_audio_libQFcd_la_LDFLAGS=			$(lib_ldflags)
+libs_audio_libQFcd_la_DEPENDENCIES=		$(cd_libs)
+libs_audio_libQFcd_la_LIBADD=			$(cd_libs)
+libs_audio_libQFcd_la_SOURCES=			libs/audio/cd.c
diff --git a/libs/audio/renderer/Makefile.am b/libs/audio/renderer/Makefile.am
deleted file mode 100644
index 0c3bcd719..000000000
--- a/libs/audio/renderer/Makefile.am
+++ /dev/null
@@ -1,55 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-AM_CFLAGS= @PREFER_PIC@ \
-	$(VORBIS_CFLAGS) $(OGG_CFLAGS) $(SAMPLERATE_CFLAGS) $(JACK_CFLAGS)
-AM_CPPFLAGS= -I$(top_srcdir)/include
-plugin_ldflags= @plugin_ldflags@ -avoid-version -module -rpath $(plugindir)
-plugin_libadd= @plugin_libadd@
-EXEEXT=
-
-plugin_LTLIBRARIES=	@snd_render_plugins@
-noinst_LTLIBRARIES=	@snd_render_static_plugins@
-EXTRA_LTLIBRARIES=	snd_render_default.la snd_render_jack.la
-
-flac_src=flac.c
-midi_src=midi.c
-vorbis_src=vorbis.c
-wav_src=wav.c
-
-if HAVE_FLAC
-have_flac_src=$(flac_src)
-else
-have_flac_src=
-endif
-if HAVE_MIDI
-have_midi_src=$(midi_src)
-else
-have_midi_src=
-endif
-if HAVE_VORBIS
-have_vorbis_src=$(vorbis_src)
-else
-have_vorbis_src=
-endif
-have_wav_src=$(wav_src)
-
-format_src=$(have_flac_src) $(have_midi_src) $(have_vorbis_src) $(have_wav_src)
-format_libs= \
-	$(SAMPLERATE_LIBS) $(VORBISFILE_LIBS) $(VORBIS_LIBS) $(FLAC_LIBS) \
-	$(OGG_LIBS) $(WM_LIBS)
-extra_format_src=flac.c midi.c vorbis.c wav.c
-snd_common=snd_channels.c snd_mem.c snd_mix.c snd_resample.c snd_sfx.c
-snd_libs= \
-	$(top_builddir)/libs/util/libQFutil.la
-
-snd_render_default_la_LDFLAGS=		$(plugin_ldflags)
-snd_render_default_la_SOURCES=		snd_dma.c $(snd_common) $(format_src)
-snd_render_default_la_LIBADD=		$(snd_libs) $(format_libs)
-snd_render_default_la_DEPENDENCIES=	$(snd_libs)
-EXTRA_snd_render_default_la_SOURCES=$(extra_format_src)
-
-snd_render_jack_la_LDFLAGS=			$(plugin_ldflags)
-snd_render_jack_la_SOURCES=			snd_jack.c $(snd_common) $(format_src)
-snd_render_jack_la_LIBADD=			$(snd_libs) $(format_libs) $(JACK_LIBS)
-snd_render_jack_la_DEPENDENCIES=	$(snd_libs)
-EXTRA_snd_render_jack_la_SOURCES=	$(extra_format_src)
diff --git a/libs/audio/renderer/Makemodule.am b/libs/audio/renderer/Makemodule.am
new file mode 100644
index 000000000..0ef8bda4f
--- /dev/null
+++ b/libs/audio/renderer/Makemodule.am
@@ -0,0 +1,46 @@
+plugin_LTLIBRARIES +=	@snd_render_plugins@
+noinst_LTLIBRARIES +=	@snd_render_static_plugins@
+EXTRA_LTLIBRARIES +=	libs/audio/renderer/snd_render_default.la libs/audio/renderer/snd_render_jack.la
+
+flac_src=libs/audio/renderer/flac.c
+midi_src=libs/audio/renderer/midi.c
+vorbis_src=libs/audio/renderer/vorbis.c
+wav_src=libs/audio/renderer/wav.c
+
+if HAVE_FLAC
+have_flac_src=$(flac_src)
+else
+have_flac_src=
+endif
+if HAVE_MIDI
+have_midi_src=$(midi_src)
+else
+have_midi_src=
+endif
+if HAVE_VORBIS
+have_vorbis_src=$(vorbis_src)
+else
+have_vorbis_src=
+endif
+have_wav_src=$(wav_src)
+
+format_src=$(have_flac_src) $(have_midi_src) $(have_vorbis_src) $(have_wav_src)
+format_libs= \
+	$(SAMPLERATE_LIBS) $(VORBISFILE_LIBS) $(VORBIS_LIBS) $(FLAC_LIBS) \
+	$(OGG_LIBS) $(WM_LIBS)
+extra_format_src=libs/audio/renderer/flac.c libs/audio/renderer/midi.c libs/audio/renderer/vorbis.c libs/audio/renderer/wav.c
+snd_common=libs/audio/renderer/snd_channels.c libs/audio/renderer/snd_mem.c libs/audio/renderer/snd_mix.c libs/audio/renderer/snd_resample.c libs/audio/renderer/snd_sfx.c
+snd_libs= \
+	libs/util/libQFutil.la
+
+libs_audio_renderer_snd_render_default_la_LDFLAGS=		$(plugin_ldflags)
+libs_audio_renderer_snd_render_default_la_SOURCES=		libs/audio/renderer/snd_dma.c $(snd_common) $(format_src)
+libs_audio_renderer_snd_render_default_la_LIBADD=		$(snd_libs) $(format_libs)
+libs_audio_renderer_snd_render_default_la_DEPENDENCIES=	$(snd_libs)
+EXTRA_libs_audio_renderer_snd_render_default_la_SOURCES=$(extra_format_src)
+
+libs_audio_renderer_snd_render_jack_la_LDFLAGS=			$(plugin_ldflags)
+libs_audio_renderer_snd_render_jack_la_SOURCES=			libs/audio/renderer/snd_jack.c $(snd_common) $(format_src)
+libs_audio_renderer_snd_render_jack_la_LIBADD=			$(snd_libs) $(format_libs) $(JACK_LIBS)
+libs_audio_renderer_snd_render_jack_la_DEPENDENCIES=	$(snd_libs)
+EXTRA_libs_audio_renderer_snd_render_jack_la_SOURCES=	$(extra_format_src)
diff --git a/libs/audio/targets/Makefile.am b/libs/audio/targets/Makefile.am
deleted file mode 100644
index ff0411354..000000000
--- a/libs/audio/targets/Makefile.am
+++ /dev/null
@@ -1,62 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-AM_CFLAGS= @PREFER_PIC@
-AM_CPPFLAGS= -I$(top_srcdir)/include
-SDL_LIBS = @SDL_LIBS@
-plugin_ldflags= @plugin_ldflags@ -avoid-version -module -rpath $(plugindir)
-plugin_libadd= @plugin_libadd@
-EXEEXT=
-snd_deps=$(top_builddir)/libs/util/libQFutil.la
-
-plugin_LTLIBRARIES=	@snd_output_plugins@
-noinst_LTLIBRARIES=	@snd_output_static_plugins@
-EXTRA_LTLIBRARIES= \
-	snd_output_sdl.la snd_output_alsa.la snd_output_oss.la snd_output_sgi.la \
-	snd_output_sun.la snd_output_win.la snd_output_dx.la snd_output_disk.la
-
-snd_output_sdl_la_LDFLAGS=		$(plugin_ldflags)
-snd_output_sdl_la_LIBADD=		$(snd_deps) $(SDL_LIBS) $(plugin_libadd)
-snd_output_sdl_la_DEPENDENCIES=	$(snd_deps)
-snd_output_sdl_la_CFLAGS=		$(SDL_CFLAGS)
-snd_output_sdl_la_SOURCES=		snd_sdl.c
-
-snd_output_alsa_la_LDFLAGS=		$(plugin_ldflags)
-snd_output_alsa_la_LIBADD=		$(snd_deps)
-snd_output_alsa_la_DEPENDENCIES=$(snd_deps)
-snd_output_alsa_la_CFLAGS=		$(ALSA_CFLAGS)
-snd_output_alsa_la_SOURCES=		snd_alsa.c
-
-snd_output_oss_la_LDFLAGS=		$(plugin_ldflags)
-snd_output_oss_la_LIBADD=		$(snd_deps) $(OSS_LIBS)
-snd_output_oss_la_DEPENDENCIES=	$(snd_deps)
-snd_output_oss_la_CFLAGS=		$(OSS_CFLAGS)
-snd_output_oss_la_SOURCES=		snd_oss.c
-
-snd_output_sgi_la_LDFLAGS=		$(plugin_ldflags)
-snd_output_sgi_la_LIBADD=		$(snd_deps) $(SGISND_LIBS)
-snd_output_sgi_la_DEPENDENCIES=	$(snd_deps)
-snd_output_sgi_la_CFLAGS=		$(SGISND_CFLAGS)
-snd_output_sgi_la_SOURCES=		snd_sgi.c
-
-snd_output_sun_la_LDFLAGS=		$(plugin_ldflags)
-snd_output_sun_la_DEPENDENCIES=	$(snd_deps)
-snd_output_sun_la_CFLAGS=		$(SUNSND_CFLAGS)
-snd_output_sun_la_SOURCES=		snd_sun.c
-
-snd_output_win_la_LDFLAGS=		$(plugin_ldflags)
-snd_output_win_la_LIBADD=		$(snd_deps) $(WINSND_LIBS) $(plugin_libadd)
-snd_output_win_la_DEPENDENCIES=	$(snd_deps)
-snd_output_win_la_CFLAGS=		$(WIN32SND_CFLAGS)
-snd_output_win_la_SOURCES=		snd_win.c
-
-snd_output_dx_la_LDFLAGS=		$(plugin_ldflags)
-snd_output_dx_la_LIBADD=		$(snd_deps) $(WINSND_LIBS) $(plugin_libadd)
-snd_output_dx_la_DEPENDENCIES=	$(snd_deps)
-snd_output_dx_la_CFLAGS=		$(WIN32SND_CFLAGS)
-snd_output_dx_la_SOURCES=		snd_dx.c
-
-snd_output_disk_la_LDFLAGS=		$(plugin_ldflags)
-snd_output_disk_la_LIBADD=		$(snd_deps) $(plugin_libadd)
-snd_output_disk_la_DEPENDENCIES=$(snd_deps)
-snd_output_disk_la_CFLAGS=
-snd_output_disk_la_SOURCES=		snd_disk.c
diff --git a/libs/audio/targets/Makemodule.am b/libs/audio/targets/Makemodule.am
new file mode 100644
index 000000000..dfc566f2a
--- /dev/null
+++ b/libs/audio/targets/Makemodule.am
@@ -0,0 +1,54 @@
+plugin_LTLIBRARIES += @snd_output_plugins@
+noinst_LTLIBRARIES += @snd_output_static_plugins@
+EXTRA_LTLIBRARIES += \
+	libs/audio/targets/snd_output_sdl.la libs/audio/targets/snd_output_alsa.la libs/audio/targets/snd_output_oss.la libs/audio/targets/snd_output_sgi.la \
+	libs/audio/targets/snd_output_sun.la libs/audio/targets/snd_output_win.la libs/audio/targets/snd_output_dx.la libs/audio/targets/snd_output_disk.la
+
+snd_deps=libs/util/libQFutil.la
+
+libs_audio_targets_snd_output_sdl_la_LDFLAGS=		$(plugin_ldflags)
+libs_audio_targets_snd_output_sdl_la_LIBADD=		$(snd_deps) $(SDL_LIBS) $(plugin_libadd)
+libs_audio_targets_snd_output_sdl_la_DEPENDENCIES=	$(snd_deps)
+libs_audio_targets_snd_output_sdl_la_CFLAGS=		$(SDL_CFLAGS)
+libs_audio_targets_snd_output_sdl_la_SOURCES=		libs/audio/targets/snd_sdl.c
+
+libs_audio_targets_snd_output_alsa_la_LDFLAGS=		$(plugin_ldflags)
+libs_audio_targets_snd_output_alsa_la_LIBADD=		$(snd_deps)
+libs_audio_targets_snd_output_alsa_la_DEPENDENCIES=$(snd_deps)
+libs_audio_targets_snd_output_alsa_la_CFLAGS=		$(ALSA_CFLAGS)
+libs_audio_targets_snd_output_alsa_la_SOURCES=		libs/audio/targets/snd_alsa.c
+
+libs_audio_targets_snd_output_oss_la_LDFLAGS=		$(plugin_ldflags)
+libs_audio_targets_snd_output_oss_la_LIBADD=		$(snd_deps) $(OSS_LIBS)
+libs_audio_targets_snd_output_oss_la_DEPENDENCIES=	$(snd_deps)
+libs_audio_targets_snd_output_oss_la_CFLAGS=		$(OSS_CFLAGS)
+libs_audio_targets_snd_output_oss_la_SOURCES=		libs/audio/targets/snd_oss.c
+
+libs_audio_targets_snd_output_sgi_la_LDFLAGS=		$(plugin_ldflags)
+libs_audio_targets_snd_output_sgi_la_LIBADD=		$(snd_deps) $(SGISND_LIBS)
+libs_audio_targets_snd_output_sgi_la_DEPENDENCIES=	$(snd_deps)
+libs_audio_targets_snd_output_sgi_la_CFLAGS=		$(SGISND_CFLAGS)
+libs_audio_targets_snd_output_sgi_la_SOURCES=		libs/audio/targets/snd_sgi.c
+
+libs_audio_targets_snd_output_sun_la_LDFLAGS=		$(plugin_ldflags)
+libs_audio_targets_snd_output_sun_la_DEPENDENCIES=	$(snd_deps)
+libs_audio_targets_snd_output_sun_la_CFLAGS=		$(SUNSND_CFLAGS)
+libs_audio_targets_snd_output_sun_la_SOURCES=		libs/audio/targets/snd_sun.c
+
+libs_audio_targets_snd_output_win_la_LDFLAGS=		$(plugin_ldflags)
+libs_audio_targets_snd_output_win_la_LIBADD=		$(snd_deps) $(WINSND_LIBS) $(plugin_libadd)
+libs_audio_targets_snd_output_win_la_DEPENDENCIES=	$(snd_deps)
+libs_audio_targets_snd_output_win_la_CFLAGS=		$(WIN32SND_CFLAGS)
+libs_audio_targets_snd_output_win_la_SOURCES=		libs/audio/targets/snd_win.c
+
+libs_audio_targets_snd_output_dx_la_LDFLAGS=		$(plugin_ldflags)
+libs_audio_targets_snd_output_dx_la_LIBADD=		$(snd_deps) $(WINSND_LIBS) $(plugin_libadd)
+libs_audio_targets_snd_output_dx_la_DEPENDENCIES=	$(snd_deps)
+libs_audio_targets_snd_output_dx_la_CFLAGS=		$(WIN32SND_CFLAGS)
+libs_audio_targets_snd_output_dx_la_SOURCES=		libs/audio/targets/snd_dx.c
+
+libs_audio_targets_snd_output_disk_la_LDFLAGS=		$(plugin_ldflags)
+libs_audio_targets_snd_output_disk_la_LIBADD=		$(snd_deps) $(plugin_libadd)
+libs_audio_targets_snd_output_disk_la_DEPENDENCIES=$(snd_deps)
+libs_audio_targets_snd_output_disk_la_CFLAGS=
+libs_audio_targets_snd_output_disk_la_SOURCES=		libs/audio/targets/snd_disk.c
diff --git a/libs/audio/test/Makefile.am b/libs/audio/test/Makefile.am
index 410be4f4e..ff6d259a4 100644
--- a/libs/audio/test/Makefile.am
+++ b/libs/audio/test/Makefile.am
@@ -7,9 +7,9 @@ noinst_PROGRAMS= @AUDIO_TARGETS@
 EXTRA_PROGRAMS= testsound
 
 test_libs= \
-	$(top_builddir)/libs/audio/libQFsound.la \
-	$(top_builddir)/libs/ruamoko/libQFruamoko.la \
-	$(top_builddir)/libs/util/libQFutil.la
+	libs/audio/libQFsound.la \
+	libs/ruamoko/libQFruamoko.la \
+	libs/util/libQFutil.la
 
 testsound_SOURCES=		testsound.c
 testsound_LDADD=		$(test_libs)
diff --git a/libs/client/Makefile.am b/libs/client/Makefile.am
deleted file mode 100644
index d9fc98a77..000000000
--- a/libs/client/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-AM_CFLAGS= @PREFER_PIC@
-AM_CPPFLAGS= -I$(top_srcdir)/include
-
-noinst_LTLIBRARIES= libQFclient.la
-
-libQFclient_la_LDFLAGS=	@STATIC@
-libQFclient_la_LIBADD=	$(top_builddir)/libs/gamecode/libQFgamecode.la $(top_builddir)/libs/util/libQFutil.la
-libQFclient_la_SOURCES= \
-		cl_entities.c
diff --git a/libs/client/Makemodule.am b/libs/client/Makemodule.am
new file mode 100644
index 000000000..962430a4b
--- /dev/null
+++ b/libs/client/Makemodule.am
@@ -0,0 +1,6 @@
+noinst_LTLIBRARIES += libs/client/libQFclient.la
+
+libs_client_libQFclient_la_LDFLAGS=	@STATIC@
+libs_client_libQFclient_la_LIBADD=	libs/gamecode/libQFgamecode.la libs/util/libQFutil.la
+libs_client_libQFclient_la_SOURCES= \
+		libs/client/cl_entities.c
diff --git a/libs/console/Makefile.am b/libs/console/Makefile.am
deleted file mode 100644
index d7cce92e7..000000000
--- a/libs/console/Makefile.am
+++ /dev/null
@@ -1,43 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-AM_CFLAGS= @PREFER_PIC@
-AM_CPPFLAGS= -I$(top_srcdir)/include $(FNM_FLAGS)
-plugin_ldflags= @plugin_ldflags@ -avoid-version -module -rpath $(plugindir)
-plugin_libadd= @plugin_libadd@
-lib_ldflags=-version-info $(QUAKE_LIBRARY_VERSION_INFO) \
-			-rpath $(libdir) -no-undefined
-EXEEXT=
-
-lib_LTLIBRARIES=	libQFconsole.la
-plugin_LTLIBRARIES= @console_plugins@
-noinst_LTLIBRARIES= @client_static_plugins@ @server_static_plugins@
-EXTRA_LTLIBRARIES=  console_server.la console_client.la
-
-common_sources= \
-	buffer.c complete.c console.c inputline.c list.c filelist.c view.c
-client_sources= bi_inputline.c client.c menu.c
-server_sources= server.c
-
-console_deps=$(top_builddir)/libs/util/libQFutil.la
-client_deps= libQFconsole.la \
-	$(top_builddir)/libs/audio/libQFsound.la \
-	$(top_builddir)/libs/ruamoko/libQFruamoko.la \
-	$(top_builddir)/libs/gib/libQFgib.la \
-	$(top_builddir)/libs/ruamoko/libQFruamoko.la \
-	$(console_deps)
-server_deps= libQFconsole.la $(console_deps)
-
-libQFconsole_la_LDFLAGS=		$(lib_ldflags)
-libQFconsole_la_LIBADD=			$(console_deps) $(plugin_libadd)
-libQFconsole_la_DEPENDENCIES=	$(console_deps)
-libQFconsole_la_SOURCES=		$(common_sources)
-
-console_client_la_LDFLAGS=		$(plugin_ldflags)
-console_client_la_LIBADD=		$(client_deps) $(plugin_libadd)
-console_client_la_DEPENDENCIES=	$(client_deps)
-console_client_la_SOURCES=		$(client_sources)
-
-console_server_la_LDFLAGS=		$(plugin_ldflags)
-console_server_la_LIBADD=		$(server_deps) $(CURSES_LIBS) $(plugin_libadd)
-console_server_la_DEPENDENCIES=	$(server_deps)
-console_server_la_SOURCES=		$(server_sources)
diff --git a/libs/console/Makemodule.am b/libs/console/Makemodule.am
new file mode 100644
index 000000000..bd745a2e2
--- /dev/null
+++ b/libs/console/Makemodule.am
@@ -0,0 +1,33 @@
+lib_LTLIBRARIES += libs/console/libQFconsole.la
+plugin_LTLIBRARIES += @console_plugins@
+noinst_LTLIBRARIES += @client_static_plugins@ @server_static_plugins@
+EXTRA_LTLIBRARIES +=  libs/console/console_server.la libs/console/console_client.la
+
+console_common_sources= \
+	libs/console/buffer.c libs/console/complete.c libs/console/console.c libs/console/inputline.c libs/console/list.c libs/console/filelist.c libs/console/view.c
+client_sources= libs/console/bi_inputline.c libs/console/client.c libs/console/menu.c
+server_sources= libs/console/server.c
+
+console_deps=libs/util/libQFutil.la
+client_deps= libs/console/libQFconsole.la \
+	libs/audio/libQFsound.la \
+	libs/ruamoko/libQFruamoko.la \
+	libs/gib/libQFgib.la \
+	libs/ruamoko/libQFruamoko.la \
+	$(console_deps)
+server_deps= libs/console/libQFconsole.la $(console_deps)
+
+libs_console_libQFconsole_la_LDFLAGS=		$(lib_ldflags)
+libs_console_libQFconsole_la_LIBADD=			$(console_deps) $(plugin_libadd)
+libs_console_libQFconsole_la_DEPENDENCIES=	$(console_deps)
+libs_console_libQFconsole_la_SOURCES=		$(console_common_sources)
+
+libs_console_console_client_la_LDFLAGS=		$(plugin_ldflags)
+libs_console_console_client_la_LIBADD=		$(client_deps) $(plugin_libadd)
+libs_console_console_client_la_DEPENDENCIES=	$(client_deps)
+libs_console_console_client_la_SOURCES=		$(client_sources)
+
+libs_console_console_server_la_LDFLAGS=		$(plugin_ldflags)
+libs_console_console_server_la_LIBADD=		$(server_deps) $(CURSES_LIBS) $(plugin_libadd)
+libs_console_console_server_la_DEPENDENCIES=	$(server_deps)
+libs_console_console_server_la_SOURCES=		$(server_sources)
diff --git a/libs/gamecode/Makefile.am b/libs/gamecode/Makefile.am
deleted file mode 100644
index 6d31504a8..000000000
--- a/libs/gamecode/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-AM_CFLAGS= @PREFER_PIC@
-AM_CPPFLAGS= -I$(top_srcdir)/include
-lib_ldflags=
-
-gc_deps=$(top_builddir)/libs/util/libQFutil.la
-
-noinst_LTLIBRARIES=	libQFgamecode.la
-
-libQFgamecode_la_LDFLAGS=		$(lib_ldflags)
-libQFgamecode_la_LIBADD=		$(gc_deps)
-libQFgamecode_la_DEPENDENCIES=	$(gc_deps)
-libQFgamecode_la_SOURCES= \
-		pr_builtins.c pr_edict.c pr_debug.c pr_exec.c pr_load.c pr_parse.c \
-		pr_opcode.c pr_resolve.c pr_resource.c pr_strings.c pr_zone.c
diff --git a/libs/gamecode/Makemodule.am b/libs/gamecode/Makemodule.am
new file mode 100644
index 000000000..dfae7c388
--- /dev/null
+++ b/libs/gamecode/Makemodule.am
@@ -0,0 +1,19 @@
+gc_deps=libs/util/libQFutil.la
+
+noinst_LTLIBRARIES += libs/gamecode/libQFgamecode.la
+
+libs_gamecode_libQFgamecode_la_LDFLAGS=
+libs_gamecode_libQFgamecode_la_LIBADD=		$(gc_deps)
+libs_gamecode_libQFgamecode_la_DEPENDENCIES=$(gc_deps)
+libs_gamecode_libQFgamecode_la_SOURCES= \
+	libs/gamecode/pr_builtins.c \
+	libs/gamecode/pr_edict.c \
+	libs/gamecode/pr_debug.c \
+	libs/gamecode/pr_exec.c \
+	libs/gamecode/pr_load.c \
+	libs/gamecode/pr_parse.c \
+	libs/gamecode/pr_opcode.c \
+	libs/gamecode/pr_resolve.c \
+	libs/gamecode/pr_resource.c \
+	libs/gamecode/pr_strings.c \
+	libs/gamecode/pr_zone.c
diff --git a/libs/gib/Makefile.am b/libs/gib/Makefile.am
deleted file mode 100644
index 80ea92067..000000000
--- a/libs/gib/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-AM_CFLAGS= @PREFER_PIC@
-AM_CPPFLAGS= -I$(top_srcdir)/include $(FNM_FLAGS)
-
-lib_ldflags=-version-info $(QUAKE_LIBRARY_VERSION_INFO) \
-			-rpath $(libdir) -no-undefined
-
-gib_deps= \
-	$(top_builddir)/libs/ruamoko/libQFruamoko.la \
-	$(top_builddir)/libs/util/libQFutil.la
-
-lib_LTLIBRARIES= libQFgib.la
-
-libQFgib_la_LDFLAGS=		$(lib_ldflags)
-libQFgib_la_LIBADD=			$(gib_deps)
-libQFgib_la_DEPENDENCIES=	$(gib_deps)
-libQFgib_la_SOURCES= \
-	bi_gib.c \
-	gib_buffer.c gib_builtin.c gib_classes.c gib_execute.c gib_function.c \
-	gib_parse.c gib_handle.c  gib_object.c gib_process.c gib_regex.c \
-	gib_thread.c gib_vars.c gib_init.c gib_tree.c \
-	gib_semantics.c ops.c exp.c regex.c
diff --git a/libs/gib/Makemodule.am b/libs/gib/Makemodule.am
new file mode 100644
index 000000000..e0fbe14c2
--- /dev/null
+++ b/libs/gib/Makemodule.am
@@ -0,0 +1,29 @@
+gib_deps= \
+	libs/ruamoko/libQFruamoko.la \
+	libs/util/libQFutil.la
+
+lib_LTLIBRARIES += libs/gib/libQFgib.la
+
+libs_gib_libQFgib_la_LDFLAGS=		$(lib_ldflags)
+libs_gib_libQFgib_la_LIBADD=		$(gib_deps)
+libs_gib_libQFgib_la_DEPENDENCIES=	$(gib_deps)
+libs_gib_libQFgib_la_SOURCES= \
+	libs/gib/bi_gib.c \
+	libs/gib/gib_buffer.c \
+	libs/gib/gib_builtin.c \
+	libs/gib/gib_classes.c \
+	libs/gib/gib_execute.c \
+	libs/gib/gib_function.c \
+	libs/gib/gib_parse.c \
+	libs/gib/gib_handle.c \
+	libs/gib/gib_object.c \
+	libs/gib/gib_process.c \
+	libs/gib/gib_regex.c \
+	libs/gib/gib_thread.c \
+	libs/gib/gib_vars.c \
+	libs/gib/gib_init.c \
+	libs/gib/gib_tree.c \
+	libs/gib/gib_semantics.c \
+	libs/gib/ops.c \
+	libs/gib/exp.c \
+	libs/gib/regex.c
diff --git a/libs/image/Makefile.am b/libs/image/Makefile.am
deleted file mode 100644
index 344bd7dd7..000000000
--- a/libs/image/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-AM_CFLAGS= @PREFER_PIC@ $(Z_CFLAGS) $(PNG_CFLAGS)
-AM_CPPFLAGS= -I$(top_srcdir)/include
-
-lib_ldflags=-version-info $(QUAKE_LIBRARY_VERSION_INFO) \
-			-rpath $(libdir) -no-undefined
-
-image_deps=$(top_builddir)/libs/util/libQFutil.la
-
-lib_LTLIBRARIES= libQFimage.la
-
-libQFimage_la_LDFLAGS=		$(lib_ldflags)
-libQFimage_la_LIBADD=		$(image_deps) $(PNG_LIBS)
-libQFimage_la_DEPENDENCIES=	$(pmage_deps)
-libQFimage_la_SOURCES= \
-	image.c pcx.c png.c tga.c
-
-EXTRA_DIST=
diff --git a/libs/image/Makemodule.am b/libs/image/Makemodule.am
new file mode 100644
index 000000000..786545ad2
--- /dev/null
+++ b/libs/image/Makemodule.am
@@ -0,0 +1,9 @@
+image_deps=libs/util/libQFutil.la
+
+lib_LTLIBRARIES += libs/image/libQFimage.la
+
+libs_image_libQFimage_la_LDFLAGS=		$(lib_ldflags)
+libs_image_libQFimage_la_LIBADD=		$(image_deps) $(PNG_LIBS)
+libs_image_libQFimage_la_DEPENDENCIES=	$(image_deps)
+libs_image_libQFimage_la_SOURCES= \
+	libs/image/image.c libs/image/pcx.c libs/image/png.c libs/image/tga.c
diff --git a/libs/models/Makefile.am b/libs/models/Makefile.am
deleted file mode 100644
index 2fa145649..000000000
--- a/libs/models/Makefile.am
+++ /dev/null
@@ -1,58 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-SUBDIRS= alias brush iqm sprite . test
-AM_CFLAGS= @PREFER_PIC@
-AM_CPPFLAGS= -I$(top_srcdir)/include
-
-lib_LTLIBRARIES=	libQFmodels.la
-noinst_LTLIBRARIES= @models_libs@
-EXTRA_LTLIBRARIES=	libmodels_gl.la libmodels_glsl.la libmodels_sw.la
-
-lib_ldflags=-version-info $(QUAKE_LIBRARY_VERSION_INFO) \
-			-rpath $(libdir) -no-undefined
-
-models_sources = clip_hull.c model.c portal.c trace.c winding.c
-
-common_libs = \
-	$(top_builddir)/libs/util/libQFutil.la
-
-models_libs=brush/libbrush.la $(common_libs)
-
-libQFmodels_la_LDFLAGS= 			$(lib_ldflags)
-libQFmodels_la_LIBADD=				$(models_libs)
-libQFmodels_la_DEPENDENCIES=		$(models_libs)
-libQFmodels_la_SOURCES= 			$(models_sources)
-
-gl_sources=gl_model_fullbright.c gl_skin.c skin.c
-gl_libs= \
-	alias/libalias_gl.la \
-	brush/libbrush_gl.la \
-	iqm/libiqm_gl.la \
-	sprite/libsprite_gl.la \
-	$(top_builddir)/libs/image/libQFimage.la
-libmodels_gl_la_LDFLAGS=		
-libmodels_gl_la_LIBADD=			$(gl_libs)
-libmodels_gl_la_DEPENDENCIES=	$(gl_libs)
-libmodels_gl_la_SOURCES=		$(gl_sources)
-
-glsl_libs= \
-	alias/libalias_glsl.la \
-	brush/libbrush_glsl.la \
-	iqm/libiqm_glsl.la \
-	sprite/libsprite_glsl.la \
-	$(top_builddir)/libs/image/libQFimage.la
-libmodels_glsl_la_LDFLAGS=		
-libmodels_glsl_la_LIBADD=		$(glsl_libs)
-libmodels_glsl_la_DEPENDENCIES=	$(glsl_libs)
-libmodels_glsl_la_SOURCES=		glsl_skin.c skin.c
-
-sw_libs= \
-	alias/libalias_sw.la \
-	brush/libbrush_sw.la \
-	iqm/libiqm_sw.la \
-	sprite/libsprite_sw.la \
-	$(top_builddir)/libs/image/libQFimage.la
-libmodels_sw_la_LDFLAGS=		
-libmodels_sw_la_LIBADD=			$(sw_libs)
-libmodels_sw_la_DEPENDENCIES=	$(sw_libs)
-libmodels_sw_la_SOURCES=		sw_skin.c skin.c
diff --git a/libs/models/Makemodule.am b/libs/models/Makemodule.am
new file mode 100644
index 000000000..2fbc7380d
--- /dev/null
+++ b/libs/models/Makemodule.am
@@ -0,0 +1,55 @@
+include libs/models/alias/Makemodule.am
+include libs/models/brush/Makemodule.am
+include libs/models/iqm/Makemodule.am
+include libs/models/sprite/Makemodule.am
+include libs/models/test/Makemodule.am
+
+lib_LTLIBRARIES +=	libs/models/libQFmodels.la
+noinst_LTLIBRARIES += @models_libs@
+EXTRA_LTLIBRARIES += libs/models/libmodels_gl.la libs/models/libmodels_glsl.la libs/models/libmodels_sw.la
+
+models_sources = libs/models/clip_hull.c libs/models/model.c libs/models/portal.c libs/models/trace.c libs/models/winding.c
+
+common_libs = \
+	libs/util/libQFutil.la
+
+models_libs=libs/models/brush/libbrush.la $(common_libs)
+
+libs_models_libQFmodels_la_LDFLAGS= 			$(lib_ldflags)
+libs_models_libQFmodels_la_LIBADD=				$(models_libs)
+libs_models_libQFmodels_la_DEPENDENCIES=		$(models_libs)
+libs_models_libQFmodels_la_SOURCES= 			$(models_sources)
+
+gl_sources=libs/models/gl_model_fullbright.c libs/models/gl_skin.c libs/models/skin.c
+gl_libs= \
+	libs/models/alias/libalias_gl.la \
+	libs/models/brush/libbrush_gl.la \
+	libs/models/iqm/libiqm_gl.la \
+	libs/models/sprite/libsprite_gl.la \
+	libs/image/libQFimage.la
+libs_models_libmodels_gl_la_LDFLAGS=
+libs_models_libmodels_gl_la_LIBADD=			$(gl_libs)
+libs_models_libmodels_gl_la_DEPENDENCIES=	$(gl_libs)
+libs_models_libmodels_gl_la_SOURCES=		$(gl_sources)
+
+glsl_libs= \
+	libs/models/alias/libalias_glsl.la \
+	libs/models/brush/libbrush_glsl.la \
+	libs/models/iqm/libiqm_glsl.la \
+	libs/models/sprite/libsprite_glsl.la \
+	libs/image/libQFimage.la
+libs_models_libmodels_glsl_la_LDFLAGS=
+libs_models_libmodels_glsl_la_LIBADD=		$(glsl_libs)
+libs_models_libmodels_glsl_la_DEPENDENCIES=	$(glsl_libs)
+libs_models_libmodels_glsl_la_SOURCES=		libs/models/glsl_skin.c libs/models/skin.c
+
+sw_libs= \
+	libs/models/alias/libalias_sw.la \
+	libs/models/brush/libbrush_sw.la \
+	libs/models/iqm/libiqm_sw.la \
+	libs/models/sprite/libsprite_sw.la \
+	libs/image/libQFimage.la
+libs_models_libmodels_sw_la_LDFLAGS=
+libs_models_libmodels_sw_la_LIBADD=			$(sw_libs)
+libs_models_libmodels_sw_la_DEPENDENCIES=	$(sw_libs)
+libs_models_libmodels_sw_la_SOURCES=		libs/models/sw_skin.c libs/models/skin.c
diff --git a/libs/models/alias/Makefile.am b/libs/models/alias/Makefile.am
deleted file mode 100644
index e74edfeda..000000000
--- a/libs/models/alias/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-AM_CFLAGS= @PREFER_PIC@
-AM_CPPFLAGS= -I$(top_srcdir)/include
-
-noinst_LTLIBRARIES=	@alias_libs@
-EXTRA_LTLIBRARIES=libalias_gl.la libalias_glsl.la libalias_sw.la
-
-alias_src= model_alias.c
-gl_src= gl_mesh.c gl_model_alias.c floodfill.c
-glsl_src= glsl_model_alias.c floodfill.c
-sw_src= sw_model_alias.c
-
-libalias_gl_la_SOURCES= $(gl_src) $(alias_src)
-
-libalias_glsl_la_SOURCES= $(glsl_src) $(alias_src)
-
-libalias_sw_la_SOURCES= $(sw_src) $(alias_src)
-
-EXTRA_DIST= $(gl_src) $(glsl_src) $(sw_src) $(alias_src)
diff --git a/libs/models/alias/Makemodule.am b/libs/models/alias/Makemodule.am
new file mode 100644
index 000000000..42f2c5a73
--- /dev/null
+++ b/libs/models/alias/Makemodule.am
@@ -0,0 +1,15 @@
+noinst_LTLIBRARIES +=	@alias_libs@
+EXTRA_LTLIBRARIES += libs/models/alias/libalias_gl.la libs/models/alias/libalias_glsl.la libs/models/alias/libalias_sw.la
+
+alias_src= libs/models/alias/model_alias.c
+alias_gl_src= libs/models/alias/gl_mesh.c libs/models/alias/gl_model_alias.c libs/models/alias/floodfill.c
+alias_glsl_src= libs/models/alias/glsl_model_alias.c libs/models/alias/floodfill.c
+alias_sw_src= libs/models/alias/sw_model_alias.c
+
+libs_models_alias_libalias_gl_la_SOURCES= $(alias_gl_src) $(alias_src)
+
+libs_models_alias_libalias_glsl_la_SOURCES= $(alias_glsl_src) $(alias_src)
+
+libs_models_alias_libalias_sw_la_SOURCES= $(alias_sw_src) $(alias_src)
+
+EXTRA_DIST += $(alias_gl_src) $(alias_glsl_src) $(alias_sw_src) $(alias_src)
diff --git a/libs/models/brush/Makefile.am b/libs/models/brush/Makefile.am
deleted file mode 100644
index cd728baed..000000000
--- a/libs/models/brush/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-AM_CFLAGS= @PREFER_PIC@
-AM_CPPFLAGS= -I$(top_srcdir)/include
-
-noinst_LTLIBRARIES=	libbrush.la @brush_libs@
-EXTRA_LTLIBRARIES=libbrush_gl.la libbrush_glsl.la libbrush_sw.la
-
-brush_src= model_brush.c
-gl_src= gl_model_brush.c
-glsl_src= glsl_model_brush.c
-sw_src= sw_model_brush.c
-
-libbrush_la_SOURCES= $(brush_src)
-
-libbrush_gl_la_SOURCES= $(gl_src) $(brush_src)
-
-libbrush_glsl_la_SOURCES= $(glsl_src) $(brush_src)
-
-libbrush_sw_la_SOURCES= $(sw_src) $(brush_src)
-
-EXTRA_DIST= $(gl_src) $(glsl_src) $(sw_src) $(brush_src)
diff --git a/libs/models/brush/Makemodule.am b/libs/models/brush/Makemodule.am
new file mode 100644
index 000000000..a07ce0726
--- /dev/null
+++ b/libs/models/brush/Makemodule.am
@@ -0,0 +1,17 @@
+noinst_LTLIBRARIES += libs/models/brush/libbrush.la @brush_libs@
+EXTRA_LTLIBRARIES += libs/models/brush/libbrush_gl.la libs/models/brush/libbrush_glsl.la libs/models/brush/libbrush_sw.la
+
+brush_src= libs/models/brush/model_brush.c
+brush_gl_src= libs/models/brush/gl_model_brush.c
+brush_glsl_src= libs/models/brush/glsl_model_brush.c
+brush_sw_src= libs/models/brush/sw_model_brush.c
+
+libs_models_brush_libbrush_la_SOURCES= $(brush_src)
+
+libs_models_brush_libbrush_gl_la_SOURCES= $(brush_gl_src) $(brush_src)
+
+libs_models_brush_libbrush_glsl_la_SOURCES= $(brush_glsl_src) $(brush_src)
+
+libs_models_brush_libbrush_sw_la_SOURCES= $(brush_sw_src) $(brush_src)
+
+EXTRA_DIST += $(brush_gl_src) $(brush_glsl_src) $(brush_sw_src) $(brush_src)
diff --git a/libs/models/iqm/Makefile.am b/libs/models/iqm/Makefile.am
deleted file mode 100644
index 71f54f576..000000000
--- a/libs/models/iqm/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-AM_CFLAGS= @PREFER_PIC@
-AM_CPPFLAGS= -I$(top_srcdir)/include
-
-noinst_LTLIBRARIES=	@iqm_libs@
-EXTRA_LTLIBRARIES=libiqm_gl.la libiqm_glsl.la libiqm_sw.la
-
-iqm_src= model_iqm.c
-gl_src= gl_model_iqm.c
-glsl_src= glsl_model_iqm.c
-sw_src= sw_model_iqm.c
-
-libiqm_gl_la_SOURCES= $(gl_src) $(iqm_src)
-
-libiqm_glsl_la_SOURCES= $(glsl_src) $(iqm_src)
-
-libiqm_sw_la_SOURCES= $(sw_src) $(iqm_src)
-
-EXTRA_DIST= $(gl_src) $(glsl_src) $(sw_src) $(iqm_src)
diff --git a/libs/models/iqm/Makemodule.am b/libs/models/iqm/Makemodule.am
new file mode 100644
index 000000000..20c29548b
--- /dev/null
+++ b/libs/models/iqm/Makemodule.am
@@ -0,0 +1,15 @@
+noinst_LTLIBRARIES += @iqm_libs@
+EXTRA_LTLIBRARIES += libs/models/iqm/libiqm_gl.la libs/models/iqm/libiqm_glsl.la libs/models/iqm/libiqm_sw.la
+
+iqm_src= libs/models/iqm/model_iqm.c
+iqm_gl_src= libs/models/iqm/gl_model_iqm.c
+iqm_glsl_src= libs/models/iqm/glsl_model_iqm.c
+iqm_sw_src= libs/models/iqm/sw_model_iqm.c
+
+libs_models_iqm_libiqm_gl_la_SOURCES= $(iqm_gl_src) $(iqm_src)
+
+libs_models_iqm_libiqm_glsl_la_SOURCES= $(iqm_glsl_src) $(iqm_src)
+
+libs_models_iqm_libiqm_sw_la_SOURCES= $(iqm_sw_src) $(iqm_src)
+
+EXTRA_DIST += $(iqm_gl_src) $(iqm_glsl_src) $(iqm_sw_src) $(iqm_src)
diff --git a/libs/models/sprite/Makefile.am b/libs/models/sprite/Makefile.am
deleted file mode 100644
index 3c6c023d1..000000000
--- a/libs/models/sprite/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-AM_CFLAGS= @PREFER_PIC@
-AM_CPPFLAGS= -I$(top_srcdir)/include
-
-noinst_LTLIBRARIES=	@sprite_libs@
-EXTRA_LTLIBRARIES=libsprite_gl.la libsprite_glsl.la libsprite_sw.la
-
-sprite_src= model_sprite.c
-gl_src= gl_model_sprite.c
-glsl_src= glsl_model_sprite.c
-sw_src= sw_model_sprite.c
-
-libsprite_gl_la_SOURCES=	$(gl_src) $(sprite_src)
-
-libsprite_glsl_la_SOURCES=	$(glsl_src) $(sprite_src)
-
-libsprite_sw_la_SOURCES=	$(sw_src) $(sprite_src)
-
-EXTRA_DIST= $(gl_src) $(glsl_src) $(sw_src) $(sprite_src)
diff --git a/libs/models/sprite/Makemodule.am b/libs/models/sprite/Makemodule.am
new file mode 100644
index 000000000..76b9fa714
--- /dev/null
+++ b/libs/models/sprite/Makemodule.am
@@ -0,0 +1,15 @@
+noinst_LTLIBRARIES += @sprite_libs@
+EXTRA_LTLIBRARIES += libs/models/sprite/libsprite_gl.la libs/models/sprite/libsprite_glsl.la libs/models/sprite/libsprite_sw.la
+
+sprite_src= libs/models/sprite/model_sprite.c
+sprite_gl_src= libs/models/sprite/gl_model_sprite.c
+sprite_glsl_src= libs/models/sprite/glsl_model_sprite.c
+sprite_sw_src= libs/models/sprite/sw_model_sprite.c
+
+libs_models_sprite_libsprite_gl_la_SOURCES=	$(sprite_gl_src) $(sprite_src)
+
+libs_models_sprite_libsprite_glsl_la_SOURCES=	$(sprite_glsl_src) $(sprite_src)
+
+libs_models_sprite_libsprite_sw_la_SOURCES=	$(sprite_sw_src) $(sprite_src)
+
+EXTRA_DIST += $(sprite_gl_src) $(sprite_glsl_src) $(sprite_sw_src) $(sprite_src)
diff --git a/libs/models/test/Makefile.am b/libs/models/test/Makefile.am
deleted file mode 100644
index 2718f5ddd..000000000
--- a/libs/models/test/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-AM_CPPFLAGS= -I$(srcdir) -I$(top_srcdir)/include
-
-check_PROGRAMS=testclip testcontents testportals
-EXTRA_DIST=	trace-id.c trace-qf-bad.c hulls.h main.c
-
-test_libs= \
-	$(top_builddir)/libs/models/libQFmodels.la \
-	$(top_builddir)/libs/util/libQFutil.la
-
-testclip_SOURCES=			testclip.c hulls.c
-testclip_LDADD=				$(test_libs)
-testclip_DEPENDENCIES=		$(test_libs)
-
-testcontents_SOURCES=		testcontents.c hulls.c
-testcontents_LDADD=			$(test_libs)
-testcontents_DEPENDENCIES=	$(test_libs)
-
-testportals_SOURCES=		testportals.c hulls.c
-testportals_LDADD=			$(test_libs)
-testportals_DEPENDENCIES=	$(test_libs)
-
-TESTS=$(check_PROGRAMS)
diff --git a/libs/models/test/Makemodule.am b/libs/models/test/Makemodule.am
new file mode 100644
index 000000000..15cbe5e35
--- /dev/null
+++ b/libs/models/test/Makemodule.am
@@ -0,0 +1,36 @@
+libs_model_tests = \
+	libs/models/test/testclip \
+	libs/models/test/testcontents \
+	libs/models/test/testportals
+
+TESTS += $(libs_model_tests)
+
+check_PROGRAMS += $(libs_model_tests)
+
+EXTRA_DIST += \
+	libs/models/test/trace-id.c \
+	libs/models/test/trace-qf-bad.c \
+	libs/models/test/hulls.h \
+	libs/models/test/main.c
+
+test_libs= \
+	libs/models/libQFmodels.la \
+	libs/util/libQFutil.la
+
+libs_models_test_testclip_SOURCES= \
+	libs/models/test/testclip.c \
+	libs/models/test/hulls.c
+libs_models_test_testclip_LDADD=			$(test_libs)
+libs_models_test_testclip_DEPENDENCIES=		$(test_libs)
+
+libs_models_test_testcontents_SOURCES= \
+	libs/models/test/testcontents.c \
+	libs/models/test/hulls.c
+libs_models_test_testcontents_LDADD=		$(test_libs)
+libs_models_test_testcontents_DEPENDENCIES=	$(test_libs)
+
+libs_models_test_testportals_SOURCES= \
+	libs/models/test/testportals.c \
+	libs/models/test/hulls.c
+libs_models_test_testportals_LDADD=			$(test_libs)
+libs_models_test_testportals_DEPENDENCIES=	$(test_libs)
diff --git a/libs/net/Makefile.am b/libs/net/Makefile.am
deleted file mode 100644
index 69f2fbb6c..000000000
--- a/libs/net/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-SUBDIRS= nc nm
-AM_CFLAGS= @PREFER_NON_PIC@
-AM_CPPFLAGS= -I$(top_srcdir)/include
-
-noinst_LTLIBRARIES=	libnet_chan.la libnet_main.la
-
-nc_libs=nc/libnc.la
-libnet_chan_la_LDFLAGS=		@STATIC@
-libnet_chan_la_LIBADD=		$(nc_libs)
-libnet_chan_la_DEPENDENCIES=$(nc_libs)
-libnet_chan_la_SOURCES= 	net_chan.c
-
-nm_libs=nm/libnm.la
-libnet_main_la_LDFLAGS=		@STATIC@
-libnet_main_la_LIBADD=		$(nm_libs)
-libnet_main_la_DEPENDENCIES=$(nm_libs)
-libnet_main_la_SOURCES=		net_main.c
diff --git a/libs/net/Makemodule.am b/libs/net/Makemodule.am
new file mode 100644
index 000000000..05d0d0136
--- /dev/null
+++ b/libs/net/Makemodule.am
@@ -0,0 +1,14 @@
+
+noinst_LTLIBRARIES +=	libs/net/libnet_chan.la libs/net/libnet_main.la
+
+include libs/net/nc/Makemodule.am
+include libs/net/nm/Makemodule.am
+
+libs_net_libnet_chan_la_LDFLAGS=		@STATIC@
+libs_net_libnet_chan_la_SOURCES= 	libs/net/net_chan.c ${nc_src}
+EXTRA_libs_net_libnet_chan_la_SOURCES = $(ipv4_src) $(ipv6_src)
+
+nm_libs=nm/libnm.la
+libs_net_libnet_main_la_LDFLAGS=		@STATIC@
+libs_net_libnet_main_la_SOURCES=		libs/net/net_main.c ${nm_src}
+EXTRA_libs_net_libnet_main_la_SOURCES = $(nm_extra)
diff --git a/libs/net/nc/Makefile.am b/libs/net/nc/Makefile.am
deleted file mode 100644
index 08b0cb810..000000000
--- a/libs/net/nc/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-AM_CFLAGS= @PREFER_NON_PIC@
-AM_CPPFLAGS= -I$(top_srcdir)/include
-
-noinst_LTLIBRARIES=	libnc.la
-
-ipv6_src= net_udp6.c
-ipv4_src= net_udp.c
-if NETTYPE_IPV6
-ipvX_src= $(ipv6_src)
-else
-ipvX_src= $(ipv4_src)
-endif
-libnc_la_SOURCES= $(ipvX_src)
-libnc_la_LDFLAGS= @STATIC@
-EXTRA_libnc_la_SOURCES= $(ipv4_src) $(ipv6_src)
diff --git a/libs/net/nc/Makemodule.am b/libs/net/nc/Makemodule.am
new file mode 100644
index 000000000..ae51d29e2
--- /dev/null
+++ b/libs/net/nc/Makemodule.am
@@ -0,0 +1,8 @@
+ipv6_src= libs/net/nc/net_udp6.c
+ipv4_src= libs/net/nc/net_udp.c
+if NETTYPE_IPV6
+ipvX_src= $(ipv6_src)
+else
+ipvX_src= $(ipv4_src)
+endif
+nc_src= $(ipvX_src)
diff --git a/libs/net/nm/Makefile.am b/libs/net/nm/Makefile.am
deleted file mode 100644
index cfdaae275..000000000
--- a/libs/net/nm/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-AM_CFLAGS= @PREFER_NON_PIC@
-AM_CPPFLAGS= -I$(top_srcdir)/include
-
-noinst_LTLIBRARIES=	libnm.la
-
-if SYSTYPE_WIN32
-net_sources= net_win.c net_wins.c
-else
-net_sources= net_bsd.c net_udp.c
-endif
-libnm_la_SOURCES= net_dgrm.c net_loop.c net_vcr.c $(net_sources)
-libnm_la_LDFLAGS= @STATIC@
-
-
-EXTRA_libnm_la_SOURCES= \
-		net_bsd.c net_win.c net_wins.c net_udp.c
diff --git a/libs/net/nm/Makemodule.am b/libs/net/nm/Makemodule.am
new file mode 100644
index 000000000..002b24b02
--- /dev/null
+++ b/libs/net/nm/Makemodule.am
@@ -0,0 +1,8 @@
+if SYSTYPE_WIN32
+net_sources= libs/net/nm/net_win.c libs/net/nm/net_wins.c
+else
+net_sources= libs/net/nm/net_bsd.c libs/net/nm/net_udp.c
+endif
+nm_src= libs/net/nm/net_dgrm.c libs/net/nm/net_loop.c libs/net/nm/net_vcr.c $(net_sources)
+
+nm_extra = libs/net/nm/net_bsd.c libs/net/nm/net_win.c libs/net/nm/net_wins.c libs/net/nm/net_udp.c
diff --git a/libs/qw/Makefile.am b/libs/qw/Makefile.am
deleted file mode 100644
index 48a58fa72..000000000
--- a/libs/qw/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-AM_CPPFLAGS= -I$(top_srcdir)/include
-
-noinst_LIBRARIES= libqw.a
-
-libqw_a_SOURCES= \
-		msg_backbuf.c msg_ucmd.c
diff --git a/libs/qw/Makemodule.am b/libs/qw/Makemodule.am
new file mode 100644
index 000000000..42834b43a
--- /dev/null
+++ b/libs/qw/Makemodule.am
@@ -0,0 +1,4 @@
+noinst_LIBRARIES += libs/qw/libqw.a
+
+libs_qw_libqw_a_SOURCES= \
+		libs/qw/msg_backbuf.c libs/qw/msg_ucmd.c
diff --git a/libs/ruamoko/Makefile.am b/libs/ruamoko/Makefile.am
deleted file mode 100644
index 2d4777c14..000000000
--- a/libs/ruamoko/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-AM_CFLAGS= @PREFER_PIC@
-AM_CPPFLAGS= -I$(top_srcdir)/include $(FNM_FLAGS)
-
-lib_ldflags=-version-info $(QUAKE_LIBRARY_VERSION_INFO) \
-			-rpath $(libdir) -no-undefined
-rua_libs= \
-	$(top_builddir)/libs/gamecode/libQFgamecode.la \
-	$(top_builddir)/libs/util/libQFutil.la
-
-lib_LTLIBRARIES= libQFruamoko.la
-
-libQFruamoko_la_LDFLAGS=		$(lib_ldflags)
-libQFruamoko_la_LIBADD=			$(rua_libs)
-libQFruamoko_la_DEPENDENCIES=	$(rua_libs)
-libQFruamoko_la_SOURCES= \
-		pr_cmds.c \
-		rua_cbuf.c rua_cmd.c rua_cvar.c rua_hash.c rua_init.c \
-		rua_math.c rua_msgbuf.c rua_obj.c rua_plist.c rua_qfile.c rua_qfs.c \
-		rua_runtime.c rua_script.c rua_set.c rua_string.c
diff --git a/libs/ruamoko/Makemodule.am b/libs/ruamoko/Makemodule.am
new file mode 100644
index 000000000..c3ed37383
--- /dev/null
+++ b/libs/ruamoko/Makemodule.am
@@ -0,0 +1,26 @@
+ruamoko_rua_libs= \
+	libs/gamecode/libQFgamecode.la \
+	libs/util/libQFutil.la
+
+lib_LTLIBRARIES += libs/ruamoko/libQFruamoko.la
+
+libs_ruamoko_libQFruamoko_la_LDFLAGS=		$(lib_ldflags)
+libs_ruamoko_libQFruamoko_la_LIBADD=		$(ruamoko_rua_libs)
+libs_ruamoko_libQFruamoko_la_DEPENDENCIES=	$(ruamoko_rua_libs)
+libs_ruamoko_libQFruamoko_la_SOURCES= \
+	libs/ruamoko/pr_cmds.c \
+	libs/ruamoko/rua_cbuf.c \
+	libs/ruamoko/rua_cmd.c \
+	libs/ruamoko/rua_cvar.c \
+	libs/ruamoko/rua_hash.c \
+	libs/ruamoko/rua_init.c \
+	libs/ruamoko/rua_math.c \
+	libs/ruamoko/rua_msgbuf.c \
+	libs/ruamoko/rua_obj.c \
+	libs/ruamoko/rua_plist.c \
+	libs/ruamoko/rua_qfile.c \
+	libs/ruamoko/rua_qfs.c \
+	libs/ruamoko/rua_runtime.c \
+	libs/ruamoko/rua_script.c \
+	libs/ruamoko/rua_set.c \
+	libs/ruamoko/rua_string.c
diff --git a/libs/util/Makefile.am b/libs/util/Makefile.am
deleted file mode 100644
index c35e4e305..000000000
--- a/libs/util/Makefile.am
+++ /dev/null
@@ -1,60 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-SUBDIRS= . test
-
-AM_CFLAGS= @PREFER_PIC@
-CCASFLAGS+= @PREFER_PIC@
-AM_CPPFLAGS= -I$(top_srcdir)/include $(Z_CFLAGS) $(FNM_FLAGS)
-
-lib_LTLIBRARIES= libQFutil.la
-
-lib_ldflags=-version-info $(QUAKE_LIBRARY_VERSION_INFO) \
-			-rpath $(libdir) -no-undefined
-
-if ASM_ARCH
-asm= libasm.la
-else
-asm=
-endif
-
-noinst_LTLIBRARIES=	$(asm)
-#EXTRA_LTLIBRARIES= libasm.la
-
-libasm_la_SOURCES=	math.S sys_ia32.S
-
-
-dirent_src=		dirent.c
-fnmatch_src=	fnmatch.c
-getopt_src=		getopt.c getopt1.c
-
-if BUILD_DIRENT
-dirent= $(dirent_src)
-else
-dirent=
-endif
-
-if BUILD_FNMATCH
-fnmatch= $(fnmatch_src)
-else
-fnmatch=
-endif
-
-if BUILD_GETOPT
-getopt= $(getopt_src)
-else
-getopt=
-endif
-
-libQFutil_la_LDFLAGS=		$(lib_ldflags)
-libQFutil_la_LIBADD=		$(asm) $(Z_LIBS) $(DL_LIBS) $(WIN32_LIBS)
-libQFutil_la_DEPENDENCIES=	$(asm)
-libQFutil_la_SOURCES= \
-	bspfile.c buildnum.c cbuf.c checksum.c cmd.c crc.c cvar.c dstring.c \
-	fendian.c hash.c idparse.c info.c link.c llist.c \
-	mathlib.c mdfour.c mersenne.c msg.c pakfile.c plugin.c qargs.c qendian.c \
-	qfplist.c quakefs.c quakeio.c riff.c script.c segtext.c set.c sizebuf.c \
-	string.c sys.c txtbuffer.c va.c ver_check.c vrect.c wad.c wadfile.c \
-	zone.c \
-	$(dirent) $(fnmatch) $(getopt)
-
-EXTRA_DIST= $(fnmatch_src) $(getopt_src)
diff --git a/libs/util/Makemodule.am b/libs/util/Makemodule.am
new file mode 100644
index 000000000..272459d4d
--- /dev/null
+++ b/libs/util/Makemodule.am
@@ -0,0 +1,84 @@
+include libs/util/test/Makemodule.am
+
+lib_LTLIBRARIES += libs/util/libQFutil.la
+
+if ASM_ARCH
+util_asm= libs/util/libasm.la
+else
+util_asm=
+endif
+
+noinst_LTLIBRARIES +=	$(util_asm)
+#EXTRA_LTLIBRARIES += libasm.la
+
+libs_util_libasm_la_SOURCES =	libs/util/math.S libs/util/sys_ia32.S
+
+
+dirent_src=		libs/util/dirent.c
+fnmatch_src=	libs/util/fnmatch.c
+getopt_src=		libs/util/getopt.c libs/util/getopt1.c
+
+if BUILD_DIRENT
+dirent= $(dirent_src)
+else
+dirent=
+endif
+
+if BUILD_FNMATCH
+fnmatch= $(fnmatch_src)
+else
+fnmatch=
+endif
+
+if BUILD_GETOPT
+getopt= $(getopt_src)
+else
+getopt=
+endif
+
+libs_util_libQFutil_la_LDFLAGS=		$(lib_ldflags)
+libs_util_libQFutil_la_LIBADD=		$(util_asm) $(Z_LIBS) $(DL_LIBS) $(WIN32_LIBS)
+libs_util_libQFutil_la_DEPENDENCIES=	$(util_asm)
+libs_util_libQFutil_la_SOURCES= \
+	libs/util/bspfile.c \
+	libs/util/buildnum.c \
+	libs/util/cbuf.c \
+	libs/util/checksum.c \
+	libs/util/cmd.c \
+	libs/util/crc.c \
+	libs/util/cvar.c \
+	libs/util/dstring.c \
+	libs/util/fendian.c \
+	libs/util/hash.c \
+	libs/util/idparse.c \
+	libs/util/info.c \
+	libs/util/link.c \
+	libs/util/llist.c \
+	libs/util/mathlib.c \
+	libs/util/mdfour.c \
+	libs/util/mersenne.c \
+	libs/util/msg.c \
+	libs/util/pakfile.c \
+	libs/util/plugin.c \
+	libs/util/qargs.c \
+	libs/util/qendian.c \
+	libs/util/qfplist.c \
+	libs/util/quakefs.c \
+	libs/util/quakeio.c \
+	libs/util/riff.c \
+	libs/util/script.c \
+	libs/util/segtext.c \
+	libs/util/set.c \
+	libs/util/sizebuf.c \
+	libs/util/string.c \
+	libs/util/sys.c \
+	libs/util/txtbuffer.c \
+	libs/util/va.c \
+	libs/util/ver_check.c \
+	libs/util/vrect.c \
+	libs/util/wad.c \
+	libs/util/wadfile.c \
+	libs/util/zone.c \
+	$(dirent) $(fnmatch) $(getopt)
+
+EXTRA_DIST += $(fnmatch_src) $(getopt_src)
diff --git a/libs/util/test/Makefile.am b/libs/util/test/Makefile.am
deleted file mode 100644
index 74d9a2f4e..000000000
--- a/libs/util/test/Makefile.am
+++ /dev/null
@@ -1,70 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-AM_CPPFLAGS= -I$(top_srcdir)/include
-
-check_PROGRAMS= \
-	test-bary test-cs test-darray test-dq test-half test-mat3 test-mat4 \
-	test-plist test-qfs test-quat test-seb test-seg test-set test-txtbuffer \
-	test-vrect
-
-test_bary_SOURCES=test-bary.c
-test_bary_LDADD=$(top_builddir)/libs/util/libQFutil.la
-test_bary_DEPENDENCIES=$(top_builddir)/libs/util/libQFutil.la
-
-test_cs_SOURCES=test-cs.c
-test_cs_LDADD=$(top_builddir)/libs/util/libQFutil.la
-test_cs_DEPENDENCIES=$(top_builddir)/libs/util/libQFutil.la
-
-test_darray_SOURCES=test-darray.c
-test_darray_LDADD=$(top_builddir)/libs/util/libQFutil.la
-test_darray_DEPENDENCIES=$(top_builddir)/libs/util/libQFutil.la
-
-test_dq_SOURCES=test-dq.c
-test_dq_LDADD=$(top_builddir)/libs/util/libQFutil.la
-test_dq_DEPENDENCIES=$(top_builddir)/libs/util/libQFutil.la
-
-test_half_SOURCES=test-half.c
-test_half_LDADD=$(top_builddir)/libs/util/libQFutil.la
-test_half_DEPENDENCIES=$(top_builddir)/libs/util/libQFutil.la
-
-test_mat3_SOURCES=test-mat3.c
-test_mat3_LDADD=$(top_builddir)/libs/util/libQFutil.la
-test_mat3_DEPENDENCIES=$(top_builddir)/libs/util/libQFutil.la
-
-test_mat4_SOURCES=test-mat4.c
-test_mat4_LDADD=$(top_builddir)/libs/util/libQFutil.la
-test_mat4_DEPENDENCIES=$(top_builddir)/libs/util/libQFutil.la
-
-test_plist_SOURCES=test-plist.c
-test_plist_LDADD=$(top_builddir)/libs/util/libQFutil.la
-test_plist_DEPENDENCIES=$(top_builddir)/libs/util/libQFutil.la
-
-test_qfs_SOURCES=test-qfs.c
-test_qfs_LDADD=$(top_builddir)/libs/util/libQFutil.la
-test_qfs_DEPENDENCIES=$(top_builddir)/libs/util/libQFutil.la
-
-test_quat_SOURCES=test-quat.c
-test_quat_LDADD=$(top_builddir)/libs/util/libQFutil.la
-test_quat_DEPENDENCIES=$(top_builddir)/libs/util/libQFutil.la
-
-test_seb_SOURCES=test-seb.c
-test_seb_LDADD=$(top_builddir)/libs/util/libQFutil.la
-test_seb_DEPENDENCIES=$(top_builddir)/libs/util/libQFutil.la
-
-test_seg_SOURCES=test-seg.c
-test_seg_LDADD=$(top_builddir)/libs/util/libQFutil.la
-test_seg_DEPENDENCIES=$(top_builddir)/libs/util/libQFutil.la
-
-test_set_SOURCES=test-set.c
-test_set_LDADD=$(top_builddir)/libs/util/libQFutil.la
-test_set_DEPENDENCIES=$(top_builddir)/libs/util/libQFutil.la
-
-test_txtbuffer_SOURCES=test-txtbuffer.c
-test_txtbuffer_LDADD=$(top_builddir)/libs/util/libQFutil.la
-test_txtbuffer_DEPENDENCIES=$(top_builddir)/libs/util/libQFutil.la
-
-test_vrect_SOURCES=test-vrect.c
-test_vrect_LDADD=$(top_builddir)/libs/util/libQFutil.la
-test_vrect_DEPENDENCIES=$(top_builddir)/libs/util/libQFutil.la
-
-TESTS=$(check_PROGRAMS)
diff --git a/libs/util/test/Makemodule.am b/libs/util/test/Makemodule.am
new file mode 100644
index 000000000..cf35f885c
--- /dev/null
+++ b/libs/util/test/Makemodule.am
@@ -0,0 +1,79 @@
+libs_util_tests = \
+	libs/util/test/test-bary \
+	libs/util/test/test-cs \
+	libs/util/test/test-darray \
+	libs/util/test/test-dq \
+	libs/util/test/test-half \
+	libs/util/test/test-mat3 \
+	libs/util/test/test-mat4 \
+	libs/util/test/test-plist \
+	libs/util/test/test-qfs \
+	libs/util/test/test-quat \
+	libs/util/test/test-seb \
+	libs/util/test/test-seg \
+	libs/util/test/test-set \
+	libs/util/test/test-txtbuffer \
+	libs/util/test/test-vrect
+check_PROGRAMS += $(libs_util_tests)
+
+TESTS += $(libs_model_tests)
+
+libs_util_test_test_bary_SOURCES=libs/util/test/test-bary.c
+libs_util_test_test_bary_LDADD=libs/util/libQFutil.la
+libs_util_test_test_bary_DEPENDENCIES=libs/util/libQFutil.la
+
+libs_util_test_test_cs_SOURCES=libs/util/test/test-cs.c
+libs_util_test_test_cs_LDADD=libs/util/libQFutil.la
+libs_util_test_test_cs_DEPENDENCIES=libs/util/libQFutil.la
+
+libs_util_test_test_darray_SOURCES=libs/util/test/test-darray.c
+libs_util_test_test_darray_LDADD=libs/util/libQFutil.la
+libs_util_test_test_darray_DEPENDENCIES=libs/util/libQFutil.la
+
+libs_util_test_test_dq_SOURCES=libs/util/test/test-dq.c
+libs_util_test_test_dq_LDADD=libs/util/libQFutil.la
+libs_util_test_test_dq_DEPENDENCIES=libs/util/libQFutil.la
+
+libs_util_test_test_half_SOURCES=libs/util/test/test-half.c
+libs_util_test_test_half_LDADD=libs/util/libQFutil.la
+libs_util_test_test_half_DEPENDENCIES=libs/util/libQFutil.la
+
+libs_util_test_test_mat3_SOURCES=libs/util/test/test-mat3.c
+libs_util_test_test_mat3_LDADD=libs/util/libQFutil.la
+libs_util_test_test_mat3_DEPENDENCIES=libs/util/libQFutil.la
+
+libs_util_test_test_mat4_SOURCES=libs/util/test/test-mat4.c
+libs_util_test_test_mat4_LDADD=libs/util/libQFutil.la
+libs_util_test_test_mat4_DEPENDENCIES=libs/util/libQFutil.la
+
+libs_util_test_test_plist_SOURCES=libs/util/test/test-plist.c
+libs_util_test_test_plist_LDADD=libs/util/libQFutil.la
+libs_util_test_test_plist_DEPENDENCIES=libs/util/libQFutil.la
+
+libs_util_test_test_qfs_SOURCES=libs/util/test/test-qfs.c
+libs_util_test_test_qfs_LDADD=libs/util/libQFutil.la
+libs_util_test_test_qfs_DEPENDENCIES=libs/util/libQFutil.la
+
+libs_util_test_test_quat_SOURCES=libs/util/test/test-quat.c
+libs_util_test_test_quat_LDADD=libs/util/libQFutil.la
+libs_util_test_test_quat_DEPENDENCIES=libs/util/libQFutil.la
+
+libs_util_test_test_seb_SOURCES=libs/util/test/test-seb.c
+libs_util_test_test_seb_LDADD=libs/util/libQFutil.la
+libs_util_test_test_seb_DEPENDENCIES=libs/util/libQFutil.la
+
+libs_util_test_test_seg_SOURCES=libs/util/test/test-seg.c
+libs_util_test_test_seg_LDADD=libs/util/libQFutil.la
+libs_util_test_test_seg_DEPENDENCIES=libs/util/libQFutil.la
+
+libs_util_test_test_set_SOURCES=libs/util/test/test-set.c
+libs_util_test_test_set_LDADD=libs/util/libQFutil.la
+libs_util_test_test_set_DEPENDENCIES=libs/util/libQFutil.la
+
+libs_util_test_test_txtbuffer_SOURCES=libs/util/test/test-txtbuffer.c
+libs_util_test_test_txtbuffer_LDADD=libs/util/libQFutil.la
+libs_util_test_test_txtbuffer_DEPENDENCIES=libs/util/libQFutil.la
+
+libs_util_test_test_vrect_SOURCES=libs/util/test/test-vrect.c
+libs_util_test_test_vrect_LDADD=libs/util/libQFutil.la
+libs_util_test_test_vrect_DEPENDENCIES=libs/util/libQFutil.la
diff --git a/libs/video/Makefile.am b/libs/video/Makefile.am
deleted file mode 100644
index 25b787b7c..000000000
--- a/libs/video/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-SUBDIRS= targets renderer
-
-clean-local:
-	rm -f *.a
diff --git a/libs/video/Makemodule.am b/libs/video/Makemodule.am
new file mode 100644
index 000000000..ae3d3ca44
--- /dev/null
+++ b/libs/video/Makemodule.am
@@ -0,0 +1,2 @@
+include libs/video/renderer/Makemodule.am
+include libs/video/targets/Makemodule.am
diff --git a/libs/video/renderer/Makefile.am b/libs/video/renderer/Makefile.am
deleted file mode 100644
index 2c234fe33..000000000
--- a/libs/video/renderer/Makefile.am
+++ /dev/null
@@ -1,65 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-SUBDIRS= @vid_render_dirs@
-DIST_SUBDIRS= gl glsl sw sw32
-AM_CPPFLAGS= -I$(top_srcdir)/include
-
-lib_ldflags=-version-info $(QUAKE_LIBRARY_VERSION_INFO) \
-			-rpath $(libdir) -no-undefined
-plugin_ldflags= @plugin_ldflags@ -avoid-version -module -rpath $(plugindir)
-plugin_libadd= @plugin_libadd@
-EXEEXT=
-
-#lib_LTLIBRARIES= @VID_REND_TARGETS@
-plugin_LTLIBRARIES= @vid_render_plugins@
-noinst_LTLIBRARIES= libQFrenderer.la @vid_render_static_plugins@
-
-EXTRA_LTLIBRARIES=	\
-					vid_render_sw.la vid_render_sw32.la \
-					vid_render_gl.la vid_render_glsl.la
-
-common_sources= \
-	crosshair.c noisetextures.c r_alias.c r_bsp.c r_cvar.c r_dyn_textures.c \
-	r_efrag.c r_ent.c r_graph.c r_iqm.c r_light.c r_main.c r_part.c \
-	r_screen.c vid_common.c
-
-renderer_libs= \
-	@vid_render_static_plugin_libs@ \
-	$(top_builddir)/libs/util/libQFutil.la
-
-libQFrenderer_la_LDFLAGS=		@STATIC@
-libQFrenderer_la_LIBADD=		$(renderer_libs)
-libQFrenderer_la_DEPENDENCIES=	$(renderer_libs)
-libQFrenderer_la_SOURCES=		r_init.c r_progs.c
-
-gl_libs= \
-	gl/libgl.la \
-	$(top_builddir)/libs/models/libmodels_gl.la
-vid_render_gl_la_LDFLAGS=		$(plugin_ldflags)
-vid_render_gl_la_LIBADD=		$(gl_libs)
-vid_render_gl_la_DEPENDENCIES=	$(gl_libs)
-vid_render_gl_la_SOURCES=		$(common_sources) vid_render_gl.c
-
-glsl_libs= \
-	glsl/libglsl.la \
-	$(top_builddir)/libs/models/libmodels_glsl.la
-vid_render_glsl_la_LDFLAGS=		$(plugin_ldflags)
-vid_render_glsl_la_LIBADD=		$(glsl_libs)
-vid_render_glsl_la_DEPENDENCIES=$(glsl_libs)
-vid_render_glsl_la_SOURCES=		$(common_sources) vid_render_glsl.c
-
-sw_libs= \
-	sw/libsw.la \
-	$(top_builddir)/libs/models/libmodels_sw.la
-vid_render_sw_la_LDFLAGS=		$(plugin_ldflags)
-vid_render_sw_la_LIBADD=		$(sw_libs)
-vid_render_sw_la_DEPENDENCIES=	$(sw_libs)
-vid_render_sw_la_SOURCES=		$(common_sources) vid_render_sw.c
-
-sw32_libs= \
-	sw32/libsw32.la \
-	$(top_builddir)/libs/models/libmodels_sw.la
-vid_render_sw32_la_LDFLAGS=		$(plugin_ldflags)
-vid_render_sw32_la_LIBADD=		$(sw32_libs)
-vid_render_sw32_la_DEPENDENCIES=$(sw32_libs)
-vid_render_sw32_la_SOURCES=		$(common_sources) vid_render_sw32.c
diff --git a/libs/video/renderer/Makemodule.am b/libs/video/renderer/Makemodule.am
new file mode 100644
index 000000000..2e56a95ae
--- /dev/null
+++ b/libs/video/renderer/Makemodule.am
@@ -0,0 +1,185 @@
+#lib_LTLIBRARIES += @VID_REND_TARGETS@
+plugin_LTLIBRARIES += @vid_render_plugins@
+noinst_LTLIBRARIES += libs/video/renderer/libQFrenderer.la @vid_render_static_plugins@
+
+EXTRA_LTLIBRARIES +=	\
+					libs/video/renderer/vid_render_sw.la libs/video/renderer/vid_render_sw32.la \
+					libs/video/renderer/vid_render_gl.la libs/video/renderer/vid_render_glsl.la
+
+video_renderer_common_sources= \
+	libs/video/renderer/crosshair.c libs/video/renderer/noisetextures.c libs/video/renderer/r_alias.c libs/video/renderer/r_bsp.c libs/video/renderer/r_cvar.c libs/video/renderer/r_dyn_textures.c \
+	libs/video/renderer/r_efrag.c libs/video/renderer/r_ent.c libs/video/renderer/r_graph.c libs/video/renderer/r_iqm.c libs/video/renderer/r_light.c libs/video/renderer/r_main.c libs/video/renderer/r_part.c \
+	libs/video/renderer/r_screen.c libs/video/renderer/vid_common.c
+
+renderer_libs= \
+	@vid_render_static_plugin_libs@ \
+	libs/util/libQFutil.la
+
+libs_video_renderer_libQFrenderer_la_LDFLAGS=		@STATIC@
+libs_video_renderer_libQFrenderer_la_LIBADD=		$(renderer_libs)
+libs_video_renderer_libQFrenderer_la_DEPENDENCIES=	$(renderer_libs)
+libs_video_renderer_libQFrenderer_la_SOURCES=\
+	libs/video/renderer/r_init.c \
+	libs/video/renderer/r_progs.c
+
+video_renderer_gl_libs= \
+	libs/models/libmodels_gl.la
+libs_video_renderer_vid_render_gl_la_LDFLAGS=		$(plugin_ldflags)
+libs_video_renderer_vid_render_gl_la_LIBADD=		$(video_renderer_gl_libs)
+libs_video_renderer_vid_render_gl_la_DEPENDENCIES=	$(video_renderer_gl_libs)
+libs_video_renderer_vid_render_gl_la_SOURCES=\
+	$(video_renderer_common_sources) \
+	libs/video/renderer/vid_render_gl.c \
+	libs/video/renderer/gl/gl_draw.c \
+	libs/video/renderer/gl/gl_dyn_lights.c \
+	libs/video/renderer/gl/gl_dyn_part.c \
+	libs/video/renderer/gl/gl_dyn_textures.c \
+	libs/video/renderer/gl/gl_fog.c \
+	libs/video/renderer/gl/gl_graph.c \
+	libs/video/renderer/gl/gl_lightmap.c \
+	libs/video/renderer/gl/gl_mod_alias.c \
+	libs/video/renderer/gl/gl_mod_iqm.c \
+	libs/video/renderer/gl/gl_mod_sprite.c \
+	libs/video/renderer/gl/gl_rmain.c \
+	libs/video/renderer/gl/gl_rmisc.c \
+	libs/video/renderer/gl/gl_rsurf.c \
+	libs/video/renderer/gl/gl_screen.c \
+	libs/video/renderer/gl/gl_sky.c \
+	libs/video/renderer/gl/gl_sky_clip.c \
+	libs/video/renderer/gl/gl_textures.c \
+	libs/video/renderer/gl/gl_warp.c \
+	libs/video/renderer/gl/namehack.h \
+	libs/video/renderer/gl/qfgl_ext.c \
+	libs/video/renderer/gl/vid_common_gl.c \
+	libs/video/renderer/gl/vtxarray.c
+
+shader_src= libs/video/renderer/glsl/quakeforge.glsl
+shader_gen= libs/video/renderer/glsl/quakeforge.slc
+
+BUILT_SOURCES += $(shader_gen)
+
+SUFFICES=.frag .vert .fc .vc .slc .glsl
+.glsl.slc:
+	sed -e 's/^/"/' -e 's/$$/\\n"/' $< > $@
+
+video_renderer_glsl_libs= \
+	libs/models/libmodels_glsl.la
+libs_video_renderer_vid_render_glsl_la_LDFLAGS=		$(plugin_ldflags)
+libs_video_renderer_vid_render_glsl_la_LIBADD=		$(video_renderer_glsl_libs)
+libs_video_renderer_vid_render_glsl_la_DEPENDENCIES=$(video_renderer_glsl_libs)
+libs_video_renderer_vid_render_glsl_la_SOURCES=\
+	$(video_renderer_common_sources) \
+	libs/video/renderer/vid_render_glsl.c \
+	libs/video/renderer/glsl/glsl_alias.c \
+	libs/video/renderer/glsl/glsl_bsp.c \
+	libs/video/renderer/glsl/glsl_draw.c \
+	libs/video/renderer/glsl/glsl_fog.c \
+	libs/video/renderer/glsl/glsl_iqm.c \
+	libs/video/renderer/glsl/glsl_lightmap.c \
+	libs/video/renderer/glsl/glsl_main.c \
+	libs/video/renderer/glsl/glsl_particles.c \
+	libs/video/renderer/glsl/glsl_screen.c \
+	libs/video/renderer/glsl/glsl_shader.c \
+	libs/video/renderer/glsl/glsl_sprite.c \
+	libs/video/renderer/glsl/glsl_textures.c \
+	libs/video/renderer/glsl/namehack.h \
+	libs/video/renderer/glsl/qfglsl.c \
+	libs/video/renderer/glsl/quakeforge.glsl \
+	libs/video/renderer/glsl/vid_common_glsl.c
+
+video_renderer_sw_libs= \
+	libs/models/libmodels_sw.la
+libs_video_renderer_vid_render_sw_la_LDFLAGS=		$(plugin_ldflags)
+libs_video_renderer_vid_render_sw_la_LIBADD=		$(video_renderer_sw_libs)
+libs_video_renderer_vid_render_sw_la_DEPENDENCIES=	$(video_renderer_sw_libs)
+libs_video_renderer_vid_render_sw_la_SOURCES=\
+	$(video_renderer_common_sources) \
+	libs/video/renderer/vid_render_sw.c \
+	libs/video/renderer/sw/d_copy.S \
+	libs/video/renderer/sw/d_draw.S \
+	libs/video/renderer/sw/d_edge.c \
+	libs/video/renderer/sw/d_fill.c \
+	libs/video/renderer/sw/d_init.c \
+	libs/video/renderer/sw/d_modech.c \
+	libs/video/renderer/sw/d_part.c \
+	libs/video/renderer/sw/d_parta.S \
+	libs/video/renderer/sw/d_polysa.S \
+	libs/video/renderer/sw/d_polyse.c \
+	libs/video/renderer/sw/d_scan.c \
+	libs/video/renderer/sw/d_scana.S \
+	libs/video/renderer/sw/d_sky.c \
+	libs/video/renderer/sw/d_spr8.S \
+	libs/video/renderer/sw/d_sprite.c \
+	libs/video/renderer/sw/d_surf.c \
+	libs/video/renderer/sw/d_vars.c \
+	libs/video/renderer/sw/d_varsa.S \
+	libs/video/renderer/sw/d_zpoint.c \
+	libs/video/renderer/sw/draw.c \
+	libs/video/renderer/sw/fpu.c \
+	libs/video/renderer/sw/fpua.S \
+	libs/video/renderer/sw/nonintel.c \
+	libs/video/renderer/sw/screen.c \
+	libs/video/renderer/sw/surf8.S \
+	libs/video/renderer/sw/sw_graph.c \
+	libs/video/renderer/sw/sw_raclip.c \
+	libs/video/renderer/sw/sw_raclipa.S \
+	libs/video/renderer/sw/sw_ralias.c \
+	libs/video/renderer/sw/sw_raliasa.S \
+	libs/video/renderer/sw/sw_rbsp.c \
+	libs/video/renderer/sw/sw_rdraw.c \
+	libs/video/renderer/sw/sw_rdrawa.S \
+	libs/video/renderer/sw/sw_redge.c \
+	libs/video/renderer/sw/sw_redgea.S \
+	libs/video/renderer/sw/sw_riqm.c \
+	libs/video/renderer/sw/sw_rmain.c \
+	libs/video/renderer/sw/sw_rmisc.c \
+	libs/video/renderer/sw/sw_rpart.c \
+	libs/video/renderer/sw/sw_rsky.c \
+	libs/video/renderer/sw/sw_rsprite.c \
+	libs/video/renderer/sw/sw_rsurf.c \
+	libs/video/renderer/sw/sw_rvarsa.S \
+	libs/video/renderer/sw/transform.S \
+	libs/video/renderer/sw/vid_common_sw.c
+
+video_renderer_sw32_libs= \
+	libs/models/libmodels_sw.la
+libs_video_renderer_vid_render_sw32_la_LDFLAGS=		$(plugin_ldflags)
+libs_video_renderer_vid_render_sw32_la_LIBADD=		$(video_renderer_sw32_libs)
+libs_video_renderer_vid_render_sw32_la_DEPENDENCIES=$(video_renderer_sw32_libs)
+libs_video_renderer_vid_render_sw32_la_SOURCES=\
+	$(video_renderer_common_sources) \
+	libs/video/renderer/vid_render_sw32.c \
+	libs/video/renderer/sw32/d_edge.c \
+	libs/video/renderer/sw32/d_fill.c \
+	libs/video/renderer/sw32/d_init.c \
+	libs/video/renderer/sw32/d_modech.c \
+	libs/video/renderer/sw32/d_part.c \
+	libs/video/renderer/sw32/d_polyse.c \
+	libs/video/renderer/sw32/d_scan.c \
+	libs/video/renderer/sw32/d_sky.c \
+	libs/video/renderer/sw32/d_sprite.c \
+	libs/video/renderer/sw32/d_surf.c \
+	libs/video/renderer/sw32/d_vars.c \
+	libs/video/renderer/sw32/d_zpoint.c \
+	libs/video/renderer/sw32/draw.c \
+	libs/video/renderer/sw32/namehack.h \
+	libs/video/renderer/sw32/screen.c \
+	libs/video/renderer/sw32/sw32_graph.c \
+	libs/video/renderer/sw32/sw32_raclip.c \
+	libs/video/renderer/sw32/sw32_ralias.c \
+	libs/video/renderer/sw32/sw32_rbsp.c \
+	libs/video/renderer/sw32/sw32_rdraw.c \
+	libs/video/renderer/sw32/sw32_redge.c \
+	libs/video/renderer/sw32/sw32_riqm.c \
+	libs/video/renderer/sw32/sw32_rmain.c \
+	libs/video/renderer/sw32/sw32_rmisc.c \
+	libs/video/renderer/sw32/sw32_rpart.c \
+	libs/video/renderer/sw32/sw32_rsky.c \
+	libs/video/renderer/sw32/sw32_rsprite.c \
+	libs/video/renderer/sw32/sw32_rsurf.c \
+	libs/video/renderer/sw32/vid_common_sw32.c
+
+CLEANFILES += \
+	libs/video/renderer/glsl/*.vc \
+	libs/video/renderer/glsl/*.fc \
+	libs/video/renderer/glsl/*.slc
diff --git a/libs/video/renderer/gl/Makefile.am b/libs/video/renderer/gl/Makefile.am
deleted file mode 100644
index 041db8546..000000000
--- a/libs/video/renderer/gl/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-AM_CFLAGS= @PREFER_PIC@
-AM_CPPFLAGS= -I$(top_srcdir)/include $(GLX_CFLAGS)
-
-noinst_LTLIBRARIES=	libgl.la
-
-gl_src = \
-	gl_draw.c gl_dyn_lights.c gl_dyn_part.c gl_dyn_textures.c \
-	gl_fog.c gl_graph.c gl_lightmap.c gl_mod_alias.c gl_mod_iqm.c \
-	gl_mod_sprite.c gl_rmain.c gl_rmisc.c gl_rsurf.c gl_screen.c gl_sky.c \
-	gl_sky_clip.c gl_textures.c gl_warp.c qfgl_ext.c vid_common_gl.c vtxarray.c
-
-libgl_la_SOURCES= $(gl_src)
-
-EXTRA_DIST = $(gl_src) namehack.h
diff --git a/libs/video/renderer/glsl/Makefile.am b/libs/video/renderer/glsl/Makefile.am
deleted file mode 100644
index ca8f4314a..000000000
--- a/libs/video/renderer/glsl/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-AM_CFLAGS= @PREFER_PIC@
-AM_CPPFLAGS= -I$(top_srcdir)/include $(GLX_CFLAGS)
-
-shader_src= quakeforge.glsl
-shader_gen= quakeforge.slc
-
-glsl_src = \
-	glsl_alias.c glsl_bsp.c glsl_draw.c glsl_fog.c glsl_iqm.c glsl_lightmap.c \
-	glsl_main.c glsl_particles.c glsl_screen.c glsl_shader.c glsl_sprite.c \
-	glsl_textures.c qfglsl.c vid_common_glsl.c
-
-noinst_LTLIBRARIES=	libglsl.la
-BUILT_SOURCES= $(shader_gen)
-
-SUFFICES=.frag .vert .fc .vc .slc .glsl
-.glsl.slc:
-	sed -e 's/^/"/' -e 's/$$/\\n"/' $< > $@
-.frag.fc:
-	sed -e 's/^/"/' -e 's/$$/\\n"/' $< > $@
-.vert.vc:
-	sed -e 's/^/"/' -e 's/$$/\\n"/' $< > $@
-
-libglsl_la_SOURCES= $(glsl_src)
-
-EXTRA_DIST = $(glsl_src) $(shader_src) namehack.h
-CLEANFILES= *.vc *.fc *.slc
diff --git a/libs/video/renderer/glsl/vid_common_glsl.c b/libs/video/renderer/glsl/vid_common_glsl.c
index d684fd4ff..a437fd96e 100644
--- a/libs/video/renderer/glsl/vid_common_glsl.c
+++ b/libs/video/renderer/glsl/vid_common_glsl.c
@@ -57,7 +57,7 @@
 #include "r_internal.h"
 
 static const char quakeforge_effect[] =
-#include "quakeforge.slc"
+#include "libs/video/renderer/glsl/quakeforge.slc"
 ;
 
 int					glsl_palette;
diff --git a/libs/video/renderer/sw/Makefile.am b/libs/video/renderer/sw/Makefile.am
deleted file mode 100644
index 62f64e689..000000000
--- a/libs/video/renderer/sw/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-AM_CFLAGS= @PREFER_PIC@
-CCASFLAGS+= @PREFER_PIC@
-AM_CPPFLAGS= -I$(top_srcdir)/include
-
-asm = @swrend_libs@
-
-noinst_LTLIBRARIES=	libsw.la $(asm)
-EXTRA_LTLIBRARIES=libswrend_asm.la
-
-asm_src= \
-	d_copy.S d_draw.S d_parta.S d_polysa.S d_scana.S d_spr8.S d_varsa.S \
-	fpua.S surf8.S sw_raclipa.S sw_raliasa.S sw_rdrawa.S sw_redgea.S \
-	sw_rvarsa.S transform.S
-
-sw_src= \
-	d_edge.c d_fill.c d_init.c d_modech.c d_part.c d_polyse.c d_scan.c \
-	d_sky.c d_sprite.c d_surf.c d_vars.c d_zpoint.c draw.c fpu.c nonintel.c \
-	screen.c sw_graph.c sw_raclip.c sw_ralias.c sw_rbsp.c sw_rdraw.c \
-	sw_redge.c sw_riqm.c sw_rmain.c sw_rmisc.c sw_rpart.c sw_rsky.c \
-	sw_rsprite.c sw_rsurf.c \
-	vid_common_sw.c
-
-libswrend_asm_la_LDFLAGS= @STATIC@
-libswrend_asm_la_SOURCES= $(asm_src)
-
-libsw_la_LDFLAGS= @STATIC@
-libsw_la_SOURCES= $(sw_src)
-libsw_la_LIBADD= $(asm)
-libsw_la_DEPENDENCIES= $(asm)
-
-EXTRA_DIST= $(sw_src) $(asm_src)
diff --git a/libs/video/renderer/sw32/Makefile.am b/libs/video/renderer/sw32/Makefile.am
deleted file mode 100644
index 5d078e90c..000000000
--- a/libs/video/renderer/sw32/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-AM_CFLAGS= @PREFER_PIC@
-AM_CPPFLAGS= -I$(top_srcdir)/include
-
-noinst_LTLIBRARIES=	libsw32.la
-
-sw32_src= \
-	d_edge.c d_fill.c d_init.c d_modech.c d_part.c d_polyse.c d_scan.c \
-	d_sky.c d_sprite.c d_surf.c d_vars.c d_zpoint.c draw.c screen.c \
-	sw32_graph.c sw32_raclip.c sw32_ralias.c sw32_rbsp.c sw32_rdraw.c \
-	sw32_redge.c sw32_riqm.c sw32_rmain.c sw32_rmisc.c sw32_rpart.c \
-	sw32_rsky.c sw32_rsprite.c sw32_rsurf.c \
-	vid_common_sw32.c
-
-libsw32_la_SOURCES= $(sw32_src)
-
-EXTRA_DIST= $(sw32_src) namehack.h
diff --git a/libs/video/targets/Makefile.am b/libs/video/targets/Makefile.am
deleted file mode 100644
index b883b676b..000000000
--- a/libs/video/targets/Makefile.am
+++ /dev/null
@@ -1,117 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-AM_CPPFLAGS= -I$(top_srcdir)/include
-
-lib_ldflags=-version-info $(QUAKE_LIBRARY_VERSION_INFO) \
-			-rpath $(libdir) -no-undefined
-
-lib_LTLIBRARIES= @JOY_TARGETS@
-
-noinst_LTLIBRARIES= @VID_TARGETS@ @vid_libs@
-
-EXTRA_LTLIBRARIES= \
-	libQFjs.la libQFfbdev.la libQFsvga.la libQFx11.la libQFsdl.la libQFwgl.la \
-	libvid_common.la libvid_sdl.la \
-	libvid_svga.la libvid_x11.la
-
-joy_linux_src= joy_linux.c
-joy_win_src= joy_win.c
-joy_null_src= joy_null.c
-if JOYTYPE_LINUX
-joy_src=      $(joy_linux_src)
-else
-if JOYTYPE_WIN32
-joy_src=      $(joy_win_src)
-else
-joy_src=      $(joy_null_src)
-endif
-endif
-
-js_libs=$(top_builddir)/libs/util/libQFutil.la
-
-libQFjs_la_LDFLAGS=		$(lib_ldflags)
-libQFjs_la_LIBADD=		$(js_libs)
-libQFjs_la_DEPENDENCIES=$(js_libs)
-libQFjs_la_CFLAGS=		@PREFER_PIC@ $(JOY_CFLAGS)
-libQFjs_la_SOURCES=		joy.c $(joy_src)
-EXTRA_libQFjs_la_SOURCES= $(joy_linux_src) $(joy_win_src) $(joy_null_src)
-
-libvid_common_la_SOURCES=	\
-		in_common.c in_event.c keys.c old_keys.c pr_keys.c vid.c
-libvid_common_la_CFLAGS=	@PREFER_NON_PIC@
-libvid_common_la_LDFLAGS=	@STATIC@
-
-libvid_x11_la_SOURCES=		in_x11.c context_x11.c dga_check.c
-libvid_x11_la_CFLAGS=		@PREFER_NON_PIC@ $(X_CFLAGS)
-libvid_x11_la_LDFLAGS=		@STATIC@
-
-libvid_svga_la_SOURCES=		in_svgalib.c
-libvid_svga_la_CFLAGS=		@PREFER_NON_PIC@ $(SVGA_CFLAGS)
-libvid_svga_la_LDFLAGS=		@STATIC@
-
-libvid_sdl_la_SOURCES=		in_sdl.c context_sdl.c
-libvid_sdl_la_CFLAGS=		@PREFER_NON_PIC@ $(SDL_CFLAGS)
-libvid_sdl_la_LDFLAGS=		@STATIC@
-
-#
-# Linux FBdev
-#
-fbdev_c= fbset_modes_y.c fbset_modes_l.c
-fbdev_h= fbset_modes_y.h
-YFLAGS = -d
-YACCLEX_CLEANFILES=	$(fbdev_c) $(fbdev_h)
-BUILT_SOURCES= $(fbdev_c) $(fbdev_h)
-
-fbdev_libs=libvid_common.la
-libQFfbdev_la_CFLAGS=		@PREFER_NON_PIC@
-libQFfbdev_la_SOURCES=		fbset.c fbset_modes_y.y fbset_modes_l.l \
-							in_fbdev.c vid_fbdev.c
-libQFfbdev_la_LDFLAGS=		@STATIC@
-libQFfbdev_la_LIBADD=		$(fbdev_libs)
-libQFfbdev_la_DEPENDENCIES=	$(fbdev_libs)
-
-
-#
-# Simple DirectMedia Library
-#
-sdl_libs=libvid_common.la libvid_sdl.la
-libQFsdl_la_CFLAGS=			@PREFER_NON_PIC@ $(SDL_CFLAGS)
-libQFsdl_la_SOURCES=		vid_sdl.c
-libQFsdl_la_LDFLAGS=		@STATIC@
-libQFsdl_la_LIBADD=			$(sdl_libs)
-libQFsdl_la_DEPENDENCIES=	$(sdl_libs)
-
-#
-# SVGAlib
-#
-svga_libs=libvid_common.la libvid_svga.la
-libQFsvga_la_CFLAGS=		@PREFER_NON_PIC@ $(SVGA_CFLAGS)
-libQFsvga_la_SOURCES=		vid_svgalib.c
-libQFsvga_la_LDFLAGS=		@STATIC@
-libQFsvga_la_LIBADD=		$(svga_libs)
-libQFsvga_la_DEPENDENCIES=	$(svga_libs)
-
-#
-# OpenGL in Win32
-#
-wgl_libs=libvid_common.la libvid_gl.la
-libQFwgl_la_CFLAGS=			@PREFER_NON_PIC@ $(WGL_CFLAGS)
-libQFwgl_la_SOURCES=		in_win.c vid_wgl.c
-libQFwgl_la_LDFLAGS=		@STATIC@
-libQFwgl_la_LIBADD=			$(wgl_libs)
-libQFwgl_la_DEPENDENCIES=	$(wgl_libs)
-
-#
-# X11 software rendering
-#
-x11_libs=libvid_common.la libvid_x11.la
-libQFx11_la_CFLAGS=			@PREFER_NON_PIC@ $(X_CFLAGS)
-libQFx11_la_SOURCES=		vid_x11.c
-libQFx11_la_LDFLAGS=		@STATIC@
-libQFx11_la_LIBADD=			$(x11_libs)
-libQFx11_la_DEPENDENCIES=	$(x11_libs)
-
-# Kill the temp files, hopefully.
-CLEANFILES  = *.i *.s $(YACCLEX_CLEANFILES)
-
-EXTRA_DIST= $(fbdev_c) $(fbdev_h)
diff --git a/libs/video/targets/Makemodule.am b/libs/video/targets/Makemodule.am
new file mode 100644
index 000000000..2a279c7a8
--- /dev/null
+++ b/libs/video/targets/Makemodule.am
@@ -0,0 +1,115 @@
+lib_LTLIBRARIES += @JOY_TARGETS@
+
+noinst_LTLIBRARIES += @VID_TARGETS@ @vid_libs@
+
+EXTRA_LTLIBRARIES += \
+	libs/video/targets/libQFjs.la \
+	libs/video/targets/libQFfbdev.la \
+	libs/video/targets/libQFsvga.la \
+	libs/video/targets/libQFx11.la \
+	libs/video/targets/libQFsdl.la \
+	libs/video/targets/libQFwgl.la \
+	libs/video/targets/libvid_common.la \
+	libs/video/targets/libvid_sdl.la \
+	libs/video/targets/libvid_svga.la \
+	libs/video/targets/libvid_x11.la
+
+joy_linux_src= libs/video/targets/joy_linux.c
+joy_win_src= libs/video/targets/joy_win.c
+joy_null_src= libs/video/targets/joy_null.c
+if JOYTYPE_LINUX
+joy_src=      $(joy_linux_src)
+else
+if JOYTYPE_WIN32
+joy_src=      $(joy_win_src)
+else
+joy_src=      $(joy_null_src)
+endif
+endif
+
+js_libs=libs/util/libQFutil.la
+
+libs_video_targets_libQFjs_la_LDFLAGS=		$(lib_ldflags)
+libs_video_targets_libQFjs_la_LIBADD=		$(js_libs)
+libs_video_targets_libQFjs_la_DEPENDENCIES=$(js_libs)
+libs_video_targets_libQFjs_la_CFLAGS=		@PREFER_PIC@ $(JOY_CFLAGS)
+libs_video_targets_libQFjs_la_SOURCES=		libs/video/targets/joy.c $(joy_src)
+EXTRA_libs_video_targets_libQFjs_la_SOURCES= $(joy_linux_src) $(joy_win_src) $(joy_null_src)
+
+libs_video_targets_libvid_common_la_SOURCES=	\
+		libs/video/targets/in_common.c libs/video/targets/in_event.c libs/video/targets/keys.c libs/video/targets/old_keys.c libs/video/targets/pr_keys.c libs/video/targets/vid.c
+libs_video_targets_libvid_common_la_CFLAGS=	@PREFER_NON_PIC@
+libs_video_targets_libvid_common_la_LDFLAGS=	@STATIC@
+
+libs_video_targets_libvid_x11_la_SOURCES=		libs/video/targets/in_x11.c libs/video/targets/context_x11.c libs/video/targets/dga_check.c
+libs_video_targets_libvid_x11_la_CFLAGS=		@PREFER_NON_PIC@ $(X_CFLAGS)
+libs_video_targets_libvid_x11_la_LDFLAGS=		@STATIC@
+
+libs_video_targets_libvid_svga_la_SOURCES=		libs/video/targets/in_svgalib.c
+libs_video_targets_libvid_svga_la_CFLAGS=		@PREFER_NON_PIC@ $(SVGA_CFLAGS)
+libs_video_targets_libvid_svga_la_LDFLAGS=		@STATIC@
+
+libs_video_targets_libvid_sdl_la_SOURCES=		libs/video/targets/in_sdl.c libs/video/targets/context_sdl.c
+libs_video_targets_libvid_sdl_la_CFLAGS=		@PREFER_NON_PIC@ $(SDL_CFLAGS)
+libs_video_targets_libvid_sdl_la_LDFLAGS=		@STATIC@
+
+#
+# Linux FBdev
+#
+fbdev_c= libs/video/targets/fbset_modes_y.c libs/video/targets/fbset_modes_l.c
+fbdev_h= libs/video/targets/fbset_modes_y.h
+YACCLEX_CLEANFILES = $(fbdev_c) $(fbdev_h)
+BUILT_SOURCES += $(fbdev_c) $(fbdev_h)
+
+fbdev_libs=libs/video/targets/libvid_common.la
+libs_video_targets_libQFfbdev_la_CFLAGS=		@PREFER_NON_PIC@
+libs_video_targets_libQFfbdev_la_SOURCES=		libs/video/targets/fbset.c libs/video/targets/fbset_modes_y.y libs/video/targets/fbset_modes_l.l \
+							libs/video/targets/in_fbdev.c libs/video/targets/vid_fbdev.c
+libs_video_targets_libQFfbdev_la_LDFLAGS=		@STATIC@
+libs_video_targets_libQFfbdev_la_LIBADD=		$(fbdev_libs)
+libs_video_targets_libQFfbdev_la_DEPENDENCIES=	$(fbdev_libs)
+
+
+#
+# Simple DirectMedia Library
+#
+sdl_libs=libs/video/targets/libvid_common.la libs/video/targets/libvid_sdl.la
+libs_video_targets_libQFsdl_la_CFLAGS=			@PREFER_NON_PIC@ $(SDL_CFLAGS)
+libs_video_targets_libQFsdl_la_SOURCES=		libs/video/targets/vid_sdl.c
+libs_video_targets_libQFsdl_la_LDFLAGS=		@STATIC@
+libs_video_targets_libQFsdl_la_LIBADD=			$(sdl_libs)
+libs_video_targets_libQFsdl_la_DEPENDENCIES=	$(sdl_libs)
+
+#
+# SVGAlib
+#
+svga_libs=libs/video/targets/libvid_common.la libs/video/targets/libvid_svga.la
+libs_video_targets_libQFsvga_la_CFLAGS=		@PREFER_NON_PIC@ $(SVGA_CFLAGS)
+libs_video_targets_libQFsvga_la_SOURCES=		libs/video/targets/vid_svgalib.c
+libs_video_targets_libQFsvga_la_LDFLAGS=		@STATIC@
+libs_video_targets_libQFsvga_la_LIBADD=		$(svga_libs)
+libs_video_targets_libQFsvga_la_DEPENDENCIES=	$(svga_libs)
+
+#
+# OpenGL in Win32
+#
+wgl_libs=libs/video/targets/libvid_common.la libs/video/targets/libvid_gl.la
+libs_video_targets_libQFwgl_la_CFLAGS=			@PREFER_NON_PIC@ $(WGL_CFLAGS)
+libs_video_targets_libQFwgl_la_SOURCES=		libs/video/targets/in_win.c libs/video/targets/vid_wgl.c
+libs_video_targets_libQFwgl_la_LDFLAGS=		@STATIC@
+libs_video_targets_libQFwgl_la_LIBADD=			$(wgl_libs)
+libs_video_targets_libQFwgl_la_DEPENDENCIES=	$(wgl_libs)
+
+#
+# X11 software rendering
+#
+x11_libs=libs/video/targets/libvid_common.la libs/video/targets/libvid_x11.la
+libs_video_targets_libQFx11_la_CFLAGS=			@PREFER_NON_PIC@ $(X_CFLAGS)
+libs_video_targets_libQFx11_la_SOURCES=		libs/video/targets/vid_x11.c
+libs_video_targets_libQFx11_la_LDFLAGS=		@STATIC@
+libs_video_targets_libQFx11_la_LIBADD=			$(x11_libs)
+libs_video_targets_libQFx11_la_DEPENDENCIES=	$(x11_libs)
+
+CLEANFILES += *.i *.s $(YACCLEX_CLEANFILES)
+
+EXTRA_DIST += $(fbdev_c) $(fbdev_h)
diff --git a/m4/quakeforge.m4 b/m4/quakeforge.m4
index 2c3139733..984cd71f7 100644
--- a/m4/quakeforge.m4
+++ b/m4/quakeforge.m4
@@ -93,7 +93,7 @@ AC_DEFUN([QF_NEED], [m4_map_args_w([$2], [$1_need_], [=yes], [;])])
 AC_DEFUN([QF_PROCESS_NEED_subroutine],
 [m4_foreach_w([qfn_need], [$5],
 [if test x"${$2[_need_]qfn_need}" = xyes; then
-	$4="${$4} $1[]qfn_need[]$3"
+	$4="${$4} m4_join([/],[$6],[$1])[]qfn_need[]$3"
 fi
 ])])
 
@@ -105,8 +105,8 @@ fi
 ])])
 
 AC_DEFUN([QF_PROCESS_NEED_LIBS],
-[m4_define([qfn_ext], m4_default($3,[la]))
-QF_PROCESS_NEED_subroutine([lib$1_],[$1],[.]qfn_ext,[$1_libs],[$2])
+[m4_define([qfn_ext], m4_default($4,[la]))
+QF_PROCESS_NEED_subroutine([lib$1_],[$1],[.]qfn_ext,[$1_libs],[$2],[$3])
 QF_SUBST([$1_libs])])
 
 AC_DEFUN([QF_PROCESS_NEED_DIRS],
@@ -122,11 +122,11 @@ AC_DEFINE_UNQUOTED(m4_toupper(qfn_default), ["${qfn_default}"], [Define to defau
 ])
 
 AC_DEFUN([QF_PROCESS_NEED_PLUGINS],
-[QF_PROCESS_NEED_subroutine([$1_],[$1],[.la],[$1_plugins],[$2])
+[QF_PROCESS_NEED_subroutine([$1_],[$1],[.la],[$1_plugins],[$2],[$3])
 QF_SUBST([$1_plugins])
-QF_DEFAULT_PLUGIN([$1],[$2],[$3])
-AC_DEFINE_UNQUOTED(m4_toupper(m4_default($3,$1)[_plugin_protos]), [], [list of $1 plugin prototypes])
-AC_DEFINE_UNQUOTED(m4_toupper(m4_default($3,$1)[_plugin_list]), [{0, 0}], [list of $1 plugins])
+QF_DEFAULT_PLUGIN([$1],[$2],[$4])
+AC_DEFINE_UNQUOTED(m4_toupper(m4_default($4,$1)[_plugin_protos]), [], [list of $1 plugin prototypes])
+AC_DEFINE_UNQUOTED(m4_toupper(m4_default($4,$1)[_plugin_list]), [{0, 0}], [list of $1 plugins])
 ])
 
 AC_DEFUN([QF_STATIC_PLUGIN_LIBS],
@@ -147,7 +147,7 @@ fi
 AC_DEFINE_UNQUOTED(m4_toupper([$1_plugin_list]), [${$1_plugin_list}], [list of $1 plugins])])
 
 AC_DEFUN([QF_PROCESS_NEED_STATIC_PLUGINS],
-[QF_PROCESS_NEED_subroutine([$1_],[$1],[.la],m4_default($4,$1)[_static_plugins],[$2])
+[QF_PROCESS_NEED_subroutine([$1_],[$1],[.la],m4_default($4,$1)[_static_plugins],[$2],[$3])
 QF_SUBST(m4_default($4,$1)[_static_plugins])
 QF_DEFAULT_PLUGIN([$1],[$2],[$4])
 QF_STATIC_PLUGIN_LIBS(m4_default($4,$1),[$1],[$2],[$3])
diff --git a/nq/Makefile.am b/nq/Makefile.am
deleted file mode 100644
index 77e3cbf5b..000000000
--- a/nq/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-## Process this file with automake to produce Makefile.in
-AUTOMAKE_OPTIONS= foreign
-
-SUBDIRS=	include source
diff --git a/nq/Makemodule.am b/nq/Makemodule.am
new file mode 100644
index 000000000..7e28f6401
--- /dev/null
+++ b/nq/Makemodule.am
@@ -0,0 +1,3 @@
+## Process this file with automake to produce Makefile.in
+include nq/include/Makemodule.am
+include nq/source/Makemodule.am
diff --git a/nq/include/Makefile.am b/nq/include/Makefile.am
deleted file mode 100644
index 60374efe3..000000000
--- a/nq/include/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-## Process this file with automake to produce Makefile.in
-EXTRA_DIST=	chase.h cl_skin.h client.h game.h host.h protocol.h server.h \
-		sv_pr_cmds.h sv_progs.h
diff --git a/nq/include/Makemodule.am b/nq/include/Makemodule.am
new file mode 100644
index 000000000..ba1076749
--- /dev/null
+++ b/nq/include/Makemodule.am
@@ -0,0 +1,11 @@
+## Process this file with automake to produce Makefile.in
+EXTRA_DIST += \
+	nq/include/chase.h \
+	nq/include/cl_skin.h \
+	nq/include/client.h \
+	nq/include/game.h \
+	nq/include/host.h \
+	nq/include/protocol.h \
+	nq/include/server.h \
+	nq/include/sv_pr_cmds.h \
+	nq/include/sv_progs.h
diff --git a/nq/source/Makefile.am b/nq/source/Makefile.am
deleted file mode 100644
index 71cb290e8..000000000
--- a/nq/source/Makefile.am
+++ /dev/null
@@ -1,176 +0,0 @@
-## Process this file with automake to produce Makefile.in
-#
-#	Makefile.am
-#
-#	Automake-using build system for QuakeForge
-#
-#	Copyright (C) 2000 Jeff Teunissen <deek@quakeforge.net>
-#
-#	This Makefile is free software; you can redistribute it and/or
-#	modify it under the terms of the GNU General Public License
-#	as published by the Free Software Foundation; either version 2
-#	of the License, or (at your option) any later version.
-#
-#	This program is distributed in the hope that it will be useful,
-#	but WITHOUT ANY WARRANTY; without even the implied warranty of
-#	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-#
-#	See the GNU General Public License for more details.
-#
-#	You should have received a copy of the GNU General Public License
-#	along with this program; if not, write to:
-#
-#		Free Software Foundation, Inc.
-#		59 Temple Place - Suite 330
-#		Boston, MA  02111-1307, USA
-#
-#	$Id$
-#
-AUTOMAKE_OPTIONS= foreign
-
-# Stuff that is common to both client and server
-#
-AM_CPPFLAGS=	-I$(top_srcdir)/include -I$(top_srcdir)/nq/include
-SDL_LIBS = @SDL_LIBS@
-AM_CFLAGS= @PTHREAD_CFLAGS@
-
-bin_PROGRAMS=	@NQ_TARGETS@
-
-EXTRA_PROGRAMS= nq-fbdev nq-sdl nq-svga nq-wgl nq-x11 nq-server
-
-noinst_LIBRARIES= @nq_libs@
-EXTRA_LIBRARIES=libnq_client.a libnq_common.a libnq_sdl.a libnq_server.a
-
-libnq_common_a_SOURCES=game.c world.c
-libnq_sdl_a_SOURCES=	sys_sdl.c
-libnq_sdl_a_CFLAGS=	$(SDL_CFLAGS)
-
-common_ldflags= -export-dynamic @PTHREAD_LDFLAGS@
-
-cl_plugin_LIBS= \
-		@server_static_plugin_libs@ \
-		@client_static_plugin_libs@
-
-client_LIBFILES= \
-		$(top_builddir)/libs/video/targets/libQFjs.la \
-		$(top_builddir)/libs/audio/libQFcd.la \
-		$(top_builddir)/libs/audio/libQFsound.la
-
-server_LIBFILES= \
-		@server_static_plugin_libs@ \
-		$(top_builddir)/libs/models/libQFmodels.la
-
-common_LIBFILES= \
-		$(top_builddir)/libs/net/libnet_main.la \
-		$(top_builddir)/libs/console/libQFconsole.la \
-		$(top_builddir)/libs/image/libQFimage.la \
-		$(top_builddir)/libs/gib/libQFgib.la \
-		$(top_builddir)/libs/ruamoko/libQFruamoko.la \
-		$(top_builddir)/libs/util/libQFutil.la
-
-client_LIBS=	$(client_LIBFILES) $(common_LIBFILES)
-
-server_LIBS=	$(server_LIBFILES) $(common_LIBFILES) $(NET_LIBS)
-server_LIB_DEPS=$(server_LIBFILES) $(common_LIBFILES)
-
-libnq_client_a_SOURCES= \
-		cl_chase.c cl_cmd.c cl_demo.c cl_ents.c cl_input.c cl_main.c \
-		cl_screen.c cl_parse.c cl_tent.c cl_view.c sbar.c
-
-libnq_server_a_SOURCES= \
-		host.c host_cmd.c sv_cl_phys.c sv_cvar.c sv_main.c \
-		sv_move.c sv_phys.c sv_pr_cmds.c sv_progs.c sv_user.c
-
-client_libs= libnq_server.a libnq_client.a libnq_common.a \
-			$(top_builddir)/libs/client/libQFclient.la
-server_libs = libnq_server.a libnq_common.a
-
-# Software-rendering targets
-
-# ... Linux FBDev
-nq_fbdev_libs=  \
-			$(client_libs) \
-			$(cl_plugin_LIBS) \
-			$(top_builddir)/libs/video/renderer/libQFrenderer.la \
-			$(top_builddir)/libs/models/libQFmodels.la \
-			$(top_builddir)/libs/video/targets/libQFfbdev.la \
-			$(client_LIBS)
-nq_fbdev_SOURCES=	sys_unix.c
-nq_fbdev_LDADD= $(nq_fbdev_libs) $(NET_LIBS)
-nq_fbdev_LDFLAGS=	$(common_ldflags)
-nq_fbdev_DEPENDENCIES=	$(nq_fbdev_libs)
-
-# ... SDL, version 1.2 and higher
-nq_sdl_libs=  \
-			libnq_sdl.a \
-			$(client_libs) \
-			$(cl_plugin_LIBS) \
-			$(top_builddir)/libs/video/renderer/libQFrenderer.la \
-			$(top_builddir)/libs/models/libQFmodels.la \
-			$(top_builddir)/libs/video/targets/libQFsdl.la \
-			$(client_LIBS)
-nq_sdl_SOURCES=sdl_link.c
-nq_sdl_LDADD=		$(nq_sdl_libs) $(SDL_LIBS) $(NET_LIBS)
-nq_sdl_LDFLAGS= 	$(common_ldflags)
-nq_sdl_DEPENDENCIES=	$(nq_sdl_libs)
-
-# ... Linux SVGAlib
-nq_svga_libs=  \
-			$(client_libs) \
-			$(cl_plugin_LIBS) \
-			$(top_builddir)/libs/video/renderer/libQFrenderer.la \
-			$(top_builddir)/libs/models/libQFmodels.la \
-			$(top_builddir)/libs/video/targets/libQFsvga.la \
-			$(client_LIBS)
-nq_svga_SOURCES=	sys_unix.c
-nq_svga_LDADD=		$(nq_svga_libs) $(SVGA_LIBS) $(NET_LIBS)
-nq_svga_LDFLAGS=	$(common_ldflags)
-nq_svga_DEPENDENCIES=	$(nq_svga_libs)
-
-# ... X11
-nq_x11_libs=  \
-			$(client_libs) \
-			$(cl_plugin_LIBS) \
-			$(top_builddir)/libs/video/renderer/libQFrenderer.la \
-			$(top_builddir)/libs/models/libQFmodels.la \
-			$(top_builddir)/libs/video/targets/libQFx11.la \
-			$(client_LIBS)
-nq_x11_SOURCES= 	sys_unix.c
-nq_x11_LDADD=		$(nq_x11_libs) \
-			$(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 \
-			$(X_EXTRA_LIBS) $(X_SHM_LIB) $(NET_LIBS) $(DL_LIBS)
-nq_x11_LDFLAGS= 	$(common_ldflags)
-nq_x11_DEPENDENCIES=	$(nq_x11_libs)
-
-# OpenGL-using targets
-							
-# ... SGI/Microsoft WGL (Windows OpenGL)
-nq_wgl_libs=  \
-			$(client_libs) \
-			$(cl_plugin_LIBS) \
-			$(opengl_QFLIBS) \
-			$(top_builddir)/libs/video/targets/libQFwgl.la \
-			$(client_LIBS)
-nq_wgl_SOURCES= 	sys_win.c
-nq_wgl_LDADD=		$(nq_wgl_libs) -lgdi32 -lcomctl32 -lwinmm $(NET_LIBS)
-nq_wgl_LDFLAGS= 	$(common_ldflags)
-nq_wgl_DEPENDENCIES=	$(nq_wgl_libs)
-
-# Dedicated Server
-if SYSTYPE_WIN32
-ded_sources=	sys_wind.c sv_ded.c
-else
-ded_sources=	sys_unixd.c sv_ded.c
-endif
-EXTRA_DIST=sys_wind.c sys_unixd.c sv_ded.c
-
-nq_server_LDFLAGS=	$(common_ldflags)
-nq_server_SOURCES=	$(ded_sources)
-nq_server_LDADD=	$(server_libs) $(server_LIBS)
-nq_server_DEPENDENCIES=	$(server_libs) $(server_LIB_DEPS)
-
-# Stuff that doesn't get linked into an executable NEEDS to be mentioned here,
-# or it won't be distributed with 'make dist'
-
-# Kill the temp files, hopefully.
-CLEANFILES  = *.i *.s $(YACCLEX_CLEANFILES)
diff --git a/nq/source/Makemodule.am b/nq/source/Makemodule.am
new file mode 100644
index 000000000..2157cd42b
--- /dev/null
+++ b/nq/source/Makemodule.am
@@ -0,0 +1,164 @@
+## Process this file with automake to produce Makefile.in
+#
+#	Makefile.am
+#
+#	Automake-using build system for QuakeForge
+#
+#	Copyright (C) 2000 Jeff Teunissen <deek@quakeforge.net>
+#
+#	This Makefile is free software; you can redistribute it and/or
+#	modify it under the terms of the GNU General Public License
+#	as published by the Free Software Foundation; either version 2
+#	of the License, or (at your option) any later version.
+#
+#	This program is distributed in the hope that it will be useful,
+#	but WITHOUT ANY WARRANTY; without even the implied warranty of
+#	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+#	See the GNU General Public License for more details.
+#
+#	You should have received a copy of the GNU General Public License
+#	along with this program; if not, write to:
+#
+#		Free Software Foundation, Inc.
+#		59 Temple Place - Suite 330
+#		Boston, MA  02111-1307, USA
+#
+#	$Id$
+#
+
+# Stuff that is common to both client and server
+#
+bin_PROGRAMS +=	@NQ_TARGETS@
+
+EXTRA_PROGRAMS += nq-fbdev nq-sdl nq-svga nq-wgl nq-x11 nq-server
+
+noinst_LIBRARIES += @nq_libs@
+EXTRA_LIBRARIES += nq/source/libnq_client.a nq/source/libnq_common.a nq/source/libnq_sdl.a nq/source/libnq_server.a
+
+nq_source_libnq_common_a_SOURCES= nq/source/game.c nq/source/world.c
+nq_source_libnq_sdl_a_SOURCES=	nq/source/sys_sdl.c
+nq_source_libnq_sdl_a_CFLAGS=	$(SDL_CFLAGS)
+
+nq_cl_plugin_LIBS= \
+		@server_static_plugin_libs@ \
+		@client_static_plugin_libs@
+
+nq_client_LIBFILES= \
+		libs/video/targets/libQFjs.la \
+		libs/audio/libQFcd.la \
+		libs/audio/libQFsound.la
+
+nq_server_LIBFILES= \
+		@server_static_plugin_libs@ \
+		libs/models/libQFmodels.la
+
+nq_common_LIBFILES= \
+		libs/net/libnet_main.la \
+		libs/console/libQFconsole.la \
+		libs/image/libQFimage.la \
+		libs/gib/libQFgib.la \
+		libs/ruamoko/libQFruamoko.la \
+		libs/gamecode/libQFgamecode.la \
+		libs/util/libQFutil.la
+
+nq_client_LIBS=	$(nq_client_LIBFILES) $(nq_common_LIBFILES)
+
+nq_server_LIBS=	$(nq_server_LIBFILES) $(nq_common_LIBFILES) $(NET_LIBS)
+nq_server_LIB_DEPS=$(nq_server_LIBFILES) $(nq_common_LIBFILES)
+
+nq_source_libnq_client_a_SOURCES= \
+		nq/source/cl_chase.c nq/source/cl_cmd.c nq/source/cl_demo.c nq/source/cl_ents.c nq/source/cl_input.c nq/source/cl_main.c \
+		nq/source/cl_screen.c nq/source/cl_parse.c nq/source/cl_tent.c nq/source/cl_view.c nq/source/sbar.c
+
+nq_source_libnq_server_a_SOURCES= \
+		nq/source/host.c nq/source/host_cmd.c nq/source/sv_cl_phys.c nq/source/sv_cvar.c nq/source/sv_main.c \
+		nq/source/sv_move.c nq/source/sv_phys.c nq/source/sv_pr_cmds.c nq/source/sv_progs.c nq/source/sv_user.c
+
+nq_client_libs= nq/source/libnq_server.a nq/source/libnq_client.a nq/source/libnq_common.a \
+			libs/client/libQFclient.la
+server_libs = nq/source/libnq_server.a nq/source/libnq_common.a
+
+# Software-rendering targets
+
+# ... Linux FBDev
+nq_fbdev_libs=  \
+			$(nq_client_libs) \
+			$(nq_cl_plugin_LIBS) \
+			libs/video/renderer/libQFrenderer.la \
+			libs/models/libQFmodels.la \
+			libs/video/targets/libQFfbdev.la \
+			$(nq_client_LIBS)
+nq_fbdev_SOURCES=	nq/source/sys_unix.c
+nq_fbdev_LDADD= $(nq_fbdev_libs) $(NET_LIBS)
+nq_fbdev_LDFLAGS=	$(common_ldflags)
+nq_fbdev_DEPENDENCIES=	$(nq_fbdev_libs)
+
+# ... SDL, version 1.2 and higher
+nq_sdl_libs=  \
+			nq/source/libnq_sdl.a \
+			$(nq_client_libs) \
+			$(nq_cl_plugin_LIBS) \
+			libs/video/renderer/libQFrenderer.la \
+			libs/models/libQFmodels.la \
+			libs/video/targets/libQFsdl.la \
+			$(nq_client_LIBS)
+nq_sdl_SOURCES=nq/source/sdl_link.c
+nq_sdl_LDADD=		$(nq_sdl_libs) $(SDL_LIBS) $(NET_LIBS)
+nq_sdl_LDFLAGS= 	$(common_ldflags)
+nq_sdl_DEPENDENCIES=	$(nq_sdl_libs)
+
+# ... Linux SVGAlib
+nq_svga_libs=  \
+			$(nq_client_libs) \
+			$(nq_cl_plugin_LIBS) \
+			libs/video/renderer/libQFrenderer.la \
+			libs/models/libQFmodels.la \
+			libs/video/targets/libQFsvga.la \
+			$(nq_client_LIBS)
+nq_svga_SOURCES=	nq/source/sys_unix.c
+nq_svga_LDADD=		$(nq_svga_libs) $(SVGA_LIBS) $(NET_LIBS)
+nq_svga_LDFLAGS=	$(common_ldflags)
+nq_svga_DEPENDENCIES=	$(nq_svga_libs)
+
+# ... X11
+nq_x11_libs=  \
+			$(nq_client_libs) \
+			$(nq_cl_plugin_LIBS) \
+			libs/video/renderer/libQFrenderer.la \
+			libs/models/libQFmodels.la \
+			libs/video/targets/libQFx11.la \
+			$(nq_client_LIBS)
+nq_x11_SOURCES= 	nq/source/sys_unix.c
+nq_x11_LDADD=		$(nq_x11_libs) \
+			$(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 \
+			$(X_EXTRA_LIBS) $(X_SHM_LIB) $(NET_LIBS) $(DL_LIBS)
+nq_x11_LDFLAGS= 	$(common_ldflags)
+nq_x11_DEPENDENCIES=	$(nq_x11_libs)
+
+# OpenGL-using targets
+
+# ... SGI/Microsoft WGL (Windows OpenGL)
+nq_wgl_libs=  \
+			$(nq_client_libs) \
+			$(nq_cl_plugin_LIBS) \
+			$(opengl_QFLIBS) \
+			libs/video/targets/libQFwgl.la \
+			$(nq_client_LIBS)
+nq_wgl_SOURCES= 	nq/source/sys_win.c
+nq_wgl_LDADD=		$(nq_wgl_libs) -lgdi32 -lcomctl32 -lwinmm $(NET_LIBS)
+nq_wgl_LDFLAGS= 	$(common_ldflags)
+nq_wgl_DEPENDENCIES=	$(nq_wgl_libs)
+
+# Dedicated Server
+if SYSTYPE_WIN32
+ded_sources=	nq/source/sys_wind.c nq/source/sv_ded.c
+else
+ded_sources=	nq/source/sys_unixd.c nq/source/sv_ded.c
+endif
+EXTRA_DIST += nq/source/sys_wind.c nq/source/sys_unixd.c nq/source/sv_ded.c
+
+nq_server_LDFLAGS=	$(common_ldflags)
+nq_server_SOURCES=	$(ded_sources)
+nq_server_LDADD=	$(server_libs) $(nq_server_LIBS)
+nq_server_DEPENDENCIES=	$(server_libs) $(nq_server_LIB_DEPS)
diff --git a/nq/source/cl_chase.c b/nq/source/cl_chase.c
index c492ff609..92903bbfc 100644
--- a/nq/source/cl_chase.c
+++ b/nq/source/cl_chase.c
@@ -42,10 +42,11 @@
 
 #include "QF/plugin/vid_render.h"
 
-#include "chase.h"
-#include "client.h"
 #include "world.h"
 
+#include "nq/include/chase.h"
+#include "nq/include/client.h"
+
 vec3_t camera_origin = {0,0,0};
 vec3_t camera_angles = {0,0,0};
 vec3_t player_origin = {0,0,0};
diff --git a/nq/source/cl_cmd.c b/nq/source/cl_cmd.c
index fabc6e226..33689dc5e 100644
--- a/nq/source/cl_cmd.c
+++ b/nq/source/cl_cmd.c
@@ -40,7 +40,7 @@
 #include "QF/sizebuf.h"
 #include "QF/sys.h"
 
-#include "client.h"
+#include "nq/include/client.h"
 
 
 /*
diff --git a/nq/source/cl_demo.c b/nq/source/cl_demo.c
index 7d47eb627..55a10af26 100644
--- a/nq/source/cl_demo.c
+++ b/nq/source/cl_demo.c
@@ -46,9 +46,10 @@
 #include "QF/sys.h"
 #include "QF/va.h"
 
-#include "client.h"
 #include "compat.h"
-#include "host.h"
+
+#include "nq/include/client.h"
+#include "nq/include/host.h"
 
 typedef struct {
 	int         frames;
diff --git a/nq/source/cl_ents.c b/nq/source/cl_ents.c
index b6bac93cd..6f6e90e29 100644
--- a/nq/source/cl_ents.c
+++ b/nq/source/cl_ents.c
@@ -44,12 +44,13 @@
 
 #include "QF/plugin/vid_render.h"
 
-#include "chase.h"
-#include "client.h"
 #include "compat.h"
-#include "host.h"
-#include "host.h"
-#include "server.h"
+
+#include "nq/include/chase.h"
+#include "nq/include/client.h"
+#include "nq/include/host.h"
+#include "nq/include/host.h"
+#include "nq/include/server.h"
 
 entity_t        cl_entities[MAX_EDICTS];
 double          cl_msgtime[MAX_EDICTS];
diff --git a/nq/source/cl_input.c b/nq/source/cl_input.c
index f4d175723..dd980e814 100644
--- a/nq/source/cl_input.c
+++ b/nq/source/cl_input.c
@@ -44,10 +44,11 @@
 
 #include "QF/plugin/vid_render.h"
 
-#include "chase.h"
-#include "client.h"
 #include "compat.h"
-#include "host.h"
+
+#include "nq/include/chase.h"
+#include "nq/include/client.h"
+#include "nq/include/host.h"
 
 /*
 	KEY BUTTONS
diff --git a/nq/source/cl_main.c b/nq/source/cl_main.c
index 7f6dd9e82..e7b90a9fb 100644
--- a/nq/source/cl_main.c
+++ b/nq/source/cl_main.c
@@ -48,16 +48,17 @@
 #include "QF/plugin/console.h"
 #include "QF/plugin/vid_render.h"
 
-#include "chase.h"
-#include "cl_skin.h"
-#include "client.h"
-#include "clview.h"
 #include "compat.h"
-#include "host.h"
-#include "host.h"
-#include "server.h"
+#include "clview.h"
 #include "sbar.h"
 
+#include "nq/include/chase.h"
+#include "nq/include/cl_skin.h"
+#include "nq/include/client.h"
+#include "nq/include/host.h"
+#include "nq/include/host.h"
+#include "nq/include/server.h"
+
 CLIENT_PLUGIN_PROTOS
 static plugin_list_t client_plugin_list[] = {
 		CLIENT_PLUGIN_LIST
diff --git a/nq/source/cl_parse.c b/nq/source/cl_parse.c
index ea12152ff..bf9ce6418 100644
--- a/nq/source/cl_parse.c
+++ b/nq/source/cl_parse.c
@@ -53,12 +53,13 @@
 
 #include "QF/plugin/vid_render.h"
 
-#include "client.h"
 #include "compat.h"
-#include "host.h"
 #include "sbar.h"
-#include "server.h"
-#include "game.h"
+
+#include "nq/include/client.h"
+#include "nq/include/host.h"
+#include "nq/include/server.h"
+#include "nq/include/game.h"
 
 const char *svc_strings[] = {
 	"svc_bad",
diff --git a/nq/source/cl_screen.c b/nq/source/cl_screen.c
index 1a0f8e7be..c7940e305 100644
--- a/nq/source/cl_screen.c
+++ b/nq/source/cl_screen.c
@@ -46,9 +46,10 @@
 
 #include "QF/plugin/vid_render.h"
 
-#include "client.h"
 #include "sbar.h"
 
+#include "nq/include/client.h"
+
 static qpic_t  *scr_net;
 
 static void
diff --git a/nq/source/cl_tent.c b/nq/source/cl_tent.c
index 8aa7dd2e7..89f05ee74 100644
--- a/nq/source/cl_tent.c
+++ b/nq/source/cl_tent.c
@@ -45,9 +45,10 @@
 
 #include "QF/plugin/vid_render.h"
 
-#include "client.h"
 #include "compat.h"
 
+#include "nq/include/client.h"
+
 typedef struct tent_s {
 	struct tent_s *next;
 	entity_t    ent;
diff --git a/nq/source/cl_view.c b/nq/source/cl_view.c
index 6def74958..71383ff08 100644
--- a/nq/source/cl_view.c
+++ b/nq/source/cl_view.c
@@ -35,12 +35,13 @@
 
 #include "QF/plugin/vid_render.h"
 
-#include "chase.h"
-#include "client.h"
 #include "compat.h"
-#include "host.h"
 #include "clview.h"
 
+#include "nq/include/chase.h"
+#include "nq/include/client.h"
+#include "nq/include/host.h"
+
 /*
 	The view is allowed to move slightly from it's true position for bobbing,
 	but if it exceeds 8 pixels linear distance (spherical, not box), the list
diff --git a/nq/source/game.c b/nq/source/game.c
index f67104472..356cbb05b 100644
--- a/nq/source/game.c
+++ b/nq/source/game.c
@@ -35,8 +35,8 @@
 #include "QF/quakefs.h"
 #include "QF/sys.h"
 
-#include "game.h"
-#include "server.h"
+#include "nq/include/game.h"
+#include "nq/include/server.h"
 
 qboolean standard_quake = false;
 
diff --git a/nq/source/host.c b/nq/source/host.c
index c08a4c093..8ee5a2859 100644
--- a/nq/source/host.c
+++ b/nq/source/host.c
@@ -56,11 +56,12 @@
 #include "QF/plugin/vid_render.h"
 
 #include "buildnum.h"
-#include "chase.h"
 #include "compat.h"
-#include "host.h"
-#include "server.h"
-#include "sv_progs.h"
+
+#include "nq/include/chase.h"
+#include "nq/include/host.h"
+#include "nq/include/server.h"
+#include "nq/include/sv_progs.h"
 
 
 /*
diff --git a/nq/source/host_cmd.c b/nq/source/host_cmd.c
index 31bf539b5..ce79f1212 100644
--- a/nq/source/host_cmd.c
+++ b/nq/source/host_cmd.c
@@ -50,13 +50,14 @@
 #include "QF/sys.h"
 #include "QF/va.h"
 
-#include "client.h"
 #include "compat.h"
-#include "host.h"
-#include "server.h"
-#include "sv_progs.h"
 #include "world.h"
 
+#include "nq/include/client.h"
+#include "nq/include/host.h"
+#include "nq/include/server.h"
+#include "nq/include/sv_progs.h"
+
 int         current_skill;
 
 void
diff --git a/nq/source/sbar.c b/nq/source/sbar.c
index 44d911118..dd8c9adef 100644
--- a/nq/source/sbar.c
+++ b/nq/source/sbar.c
@@ -53,11 +53,12 @@
 #include "QF/plugin/console.h"
 #include "QF/plugin/vid_render.h"
 
-#include "client.h"
 #include "compat.h"
-#include "game.h"
 #include "sbar.h"
-#include "server.h"
+
+#include "nq/include/client.h"
+#include "nq/include/game.h"
+#include "nq/include/server.h"
 
 int         sb_updates;				// if >= vid.numpages, no update needed
 
diff --git a/nq/source/sv_cl_phys.c b/nq/source/sv_cl_phys.c
index accf26af9..1b9517ccc 100644
--- a/nq/source/sv_cl_phys.c
+++ b/nq/source/sv_cl_phys.c
@@ -31,11 +31,12 @@
 #include "QF/cvar.h"
 #include "QF/sys.h"
 
-#include "host.h"
-#include "server.h"
-#include "sv_progs.h"
 #include "world.h"
 
+#include "nq/include/host.h"
+#include "nq/include/server.h"
+#include "nq/include/sv_progs.h"
+
 #define sv_frametime host_frametime
 
 cvar_t     *sv_nostep;
diff --git a/nq/source/sv_cvar.c b/nq/source/sv_cvar.c
index 4d9082c96..0e8e35383 100644
--- a/nq/source/sv_cvar.c
+++ b/nq/source/sv_cvar.c
@@ -32,7 +32,7 @@
 
 #include "QF/cvar.h"
 
-#include "server.h"
+#include "nq/include/server.h"
 
 void
 Cvar_Info (cvar_t *var)
diff --git a/nq/source/sv_ded.c b/nq/source/sv_ded.c
index c22f9cc3a..0b0cc7d0f 100644
--- a/nq/source/sv_ded.c
+++ b/nq/source/sv_ded.c
@@ -36,8 +36,8 @@
 
 #include "QF/plugin/vid_render.h"
 
-#include "host.h"
-#include "server.h"
+#include "nq/include/host.h"
+#include "nq/include/server.h"
 
 client_state_t cl;
 client_static_t cls;
diff --git a/nq/source/sv_main.c b/nq/source/sv_main.c
index b666516f6..70b3d91f4 100644
--- a/nq/source/sv_main.c
+++ b/nq/source/sv_main.c
@@ -36,11 +36,12 @@
 #include "QF/va.h"
 
 #include "compat.h"
-#include "host.h"
-#include "server.h"
-#include "sv_progs.h"
 #include "world.h"
 
+#include "nq/include/host.h"
+#include "nq/include/server.h"
+#include "nq/include/sv_progs.h"
+
 server_t    sv;
 server_static_t svs;
 double      sv_frametime;
diff --git a/nq/source/sv_move.c b/nq/source/sv_move.c
index 013e4d48e..494fc7083 100644
--- a/nq/source/sv_move.c
+++ b/nq/source/sv_move.c
@@ -28,10 +28,11 @@
 # include "config.h"
 #endif
 
-#include "server.h"
-#include "sv_progs.h"
 #include "world.h"
 
+#include "nq/include/server.h"
+#include "nq/include/sv_progs.h"
+
 #define	STEPSIZE	18
 
 int         c_yes, c_no;
diff --git a/nq/source/sv_phys.c b/nq/source/sv_phys.c
index 795fc0f6d..f36dcfde9 100644
--- a/nq/source/sv_phys.c
+++ b/nq/source/sv_phys.c
@@ -31,10 +31,11 @@
 #include "QF/cvar.h"
 #include "QF/sys.h"
 
-#include "server.h"
-#include "sv_progs.h"
 #include "world.h"
 
+#include "nq/include/server.h"
+#include "nq/include/sv_progs.h"
+
 /*
 	pushmove objects do not obey gravity, and do not interact with each
 	other or trigger fields, but block normal movement and push normal
diff --git a/nq/source/sv_pr_cmds.c b/nq/source/sv_pr_cmds.c
index d6982bc3a..d5dcc4bb4 100644
--- a/nq/source/sv_pr_cmds.c
+++ b/nq/source/sv_pr_cmds.c
@@ -46,11 +46,12 @@
 #include "QF/va.h"
 
 #include "compat.h"
-#include "host.h"
-#include "server.h"
-#include "sv_progs.h"
 #include "world.h"
 
+#include "nq/include/host.h"
+#include "nq/include/server.h"
+#include "nq/include/sv_progs.h"
+
 /* BUILT-IN FUNCTIONS */
 
 
diff --git a/nq/source/sv_progs.c b/nq/source/sv_progs.c
index 8626ade59..baf8ad0a3 100644
--- a/nq/source/sv_progs.c
+++ b/nq/source/sv_progs.c
@@ -41,11 +41,12 @@
 #include "QF/sys.h"
 
 #include "compat.h"
-#include "host.h"
-#include "server.h"
-#include "sv_progs.h"
 #include "world.h"
 
+#include "nq/include/host.h"
+#include "nq/include/server.h"
+#include "nq/include/sv_progs.h"
+
 progs_t     sv_pr_state;
 sv_globals_t sv_globals;
 sv_funcs_t sv_funcs;
diff --git a/nq/source/sv_user.c b/nq/source/sv_user.c
index c1db350a8..95bd01ac9 100644
--- a/nq/source/sv_user.c
+++ b/nq/source/sv_user.c
@@ -42,11 +42,12 @@
 #include "QF/msg.h"
 #include "QF/sys.h"
 
-#include "host.h"
-#include "server.h"
-#include "sv_progs.h"
 #include "world.h"
 
+#include "nq/include/host.h"
+#include "nq/include/server.h"
+#include "nq/include/sv_progs.h"
+
 cvar_t *sv_rollangle;
 cvar_t *sv_rollspeed;
 
diff --git a/nq/source/sys_sdl.c b/nq/source/sys_sdl.c
index 37ff959aa..ddc4a8df7 100644
--- a/nq/source/sys_sdl.c
+++ b/nq/source/sys_sdl.c
@@ -51,11 +51,11 @@
 #include "QF/qargs.h"
 #include "QF/sys.h"
 
-#include "client.h"
-#include "host.h"
+#include "nq/include/client.h"
+#include "nq/include/host.h"
 
 #ifdef _WIN32
-# include "winquake.h"
+# include "nq/include/winquake.h"
 #endif
 
 int qf_sdl_link;
diff --git a/nq/source/sys_unix.c b/nq/source/sys_unix.c
index 2803d31f6..20cce79a5 100644
--- a/nq/source/sys_unix.c
+++ b/nq/source/sys_unix.c
@@ -49,8 +49,8 @@
 #include "QF/qargs.h"
 #include "QF/sys.h"
 
-#include "client.h"
-#include "host.h"
+#include "nq/include/client.h"
+#include "nq/include/host.h"
 
 qboolean    isDedicated = false;
 
diff --git a/nq/source/sys_unixd.c b/nq/source/sys_unixd.c
index f9ff4ca74..18e45a8ad 100644
--- a/nq/source/sys_unixd.c
+++ b/nq/source/sys_unixd.c
@@ -48,7 +48,7 @@
 #include "QF/qargs.h"
 #include "QF/sys.h"
 
-#include "host.h"
+#include "nq/include/host.h"
 
 qboolean    isDedicated = true;
 
diff --git a/nq/source/sys_win.c b/nq/source/sys_win.c
index e4593ffd0..ee040f956 100644
--- a/nq/source/sys_win.c
+++ b/nq/source/sys_win.c
@@ -36,8 +36,8 @@
 #include "QF/screen.h"
 #include "QF/sys.h"
 
-#include "client.h"
-#include "host.h"
+#include "nq/include/client.h"
+#include "nq/include/host.h"
 
 qboolean    isDedicated = false;
 
diff --git a/nq/source/sys_wind.c b/nq/source/sys_wind.c
index b0555ec43..69393dfd6 100644
--- a/nq/source/sys_wind.c
+++ b/nq/source/sys_wind.c
@@ -34,7 +34,7 @@
 #include "QF/qargs.h"
 #include "QF/sys.h"
 
-#include "host.h"
+#include "nq/include/host.h"
 
 qboolean    isDedicated = true;
 
diff --git a/nq/source/world.c b/nq/source/world.c
index 6d404f39c..f7d379a2d 100644
--- a/nq/source/world.c
+++ b/nq/source/world.c
@@ -43,10 +43,11 @@
 #include "QF/sys.h"
 
 #include "compat.h"
-#include "server.h"
-#include "sv_progs.h"
 #include "world.h"
 
+#include "nq/include/server.h"
+#include "nq/include/sv_progs.h"
+
 #define always_inline inline __attribute__((__always_inline__))
 
 #define EDICT_LEAFS 32
diff --git a/pkg-config/Makefile.am b/pkg-config/Makefile.am
deleted file mode 100644
index 48f4005f1..000000000
--- a/pkg-config/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-pkgdatadir=@libdir@/pkgconfig
-
-pkgdata_DATA=quakeforge.pc qfcc.pc
-
-EXTRA_DIST=quakeforge.pc.in qfcc.pc.in
diff --git a/pkg-config/Makemodule.am b/pkg-config/Makemodule.am
new file mode 100644
index 000000000..dca513fae
--- /dev/null
+++ b/pkg-config/Makemodule.am
@@ -0,0 +1,5 @@
+pkgconfigdir = @libdir@/pkgconfig
+
+pkgconfig_DATA = pkg-config/quakeforge.pc pkg-config/qfcc.pc
+
+EXTRA_DIST += pkg-config/quakeforge.pc.in pkg-config/qfcc.pc.in
diff --git a/qtv/Makefile.am b/qtv/Makefile.am
deleted file mode 100644
index 77e3cbf5b..000000000
--- a/qtv/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-## Process this file with automake to produce Makefile.in
-AUTOMAKE_OPTIONS= foreign
-
-SUBDIRS=	include source
diff --git a/qtv/Makemodule.am b/qtv/Makemodule.am
new file mode 100644
index 000000000..562039b04
--- /dev/null
+++ b/qtv/Makemodule.am
@@ -0,0 +1,2 @@
+include qtv/include/Makemodule.am
+include qtv/source/Makemodule.am
diff --git a/qtv/include/Makefile.am b/qtv/include/Makefile.am
deleted file mode 100644
index 19df055f3..000000000
--- a/qtv/include/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-## Process this file with automake to produce Makefile.in
-AUTOMAKE_OPTIONS=	foreign
-
-EXTRA_DIST = client.h connection.h qtv.h server.h
diff --git a/qtv/include/Makemodule.am b/qtv/include/Makemodule.am
new file mode 100644
index 000000000..346c1716d
--- /dev/null
+++ b/qtv/include/Makemodule.am
@@ -0,0 +1,5 @@
+EXTRA_DIST += \
+	qtv/include/client.h \
+	qtv/include/connection.h \
+	qtv/include/qtv.h \
+	qtv/include/server.h
diff --git a/qtv/source/Makefile.am b/qtv/source/Makemodule.am
similarity index 61%
rename from qtv/source/Makefile.am
rename to qtv/source/Makemodule.am
index fa73f8de8..3560edecf 100644
--- a/qtv/source/Makefile.am
+++ b/qtv/source/Makemodule.am
@@ -27,27 +27,18 @@
 #	$Id$
 #
 
-AUTOMAKE_OPTIONS=	foreign
+bin_PROGRAMS += @QTV_TARGETS@
 
-AM_CPPFLAGS=	-I$(top_srcdir)/include -I$(top_srcdir)/qtv/include
-
-bin_PROGRAMS=	@QTV_TARGETS@
-
-EXTRA_PROGRAMS= qtv
-
-common_ldflags= -export-dynamic
+EXTRA_PROGRAMS += qtv-server
 
 qtv_LIBS= \
 		@server_static_plugin_libs@ \
-		$(top_builddir)/libs/qw/libqw.a \
-		$(top_builddir)/libs/net/libnet_chan.la \
-		$(top_builddir)/libs/console/libQFconsole.la \
-		$(top_builddir)/libs/util/libQFutil.la
+		libs/qw/libqw.a \
+		libs/net/libnet_chan.la \
+		libs/console/libQFconsole.la \
+		libs/util/libQFutil.la
 
-qtv_SOURCES=	client.c connection.c qtv.c sbar.c server.c sv_parse.c
-qtv_LDADD=	$(qtv_LIBS) $(NET_LIBS) $(DL_LIBS) $(CURSES_LIBS)
-qtv_LDFLAGS=	$(common_ldflags)
-qtv_DEPENDENCIES=	$(qtv_LIBS)
-
-# Kill the temp files, hopefully.
-CLEANFILES	= *.i *.s
+qtv_server_SOURCES=	qtv/source/client.c qtv/source/connection.c qtv/source/qtv.c qtv/source/sbar.c qtv/source/server.c qtv/source/sv_parse.c
+qtv_server_LDADD=	$(qtv_LIBS) $(NET_LIBS) $(DL_LIBS) $(CURSES_LIBS)
+qtv_server_LDFLAGS=	$(common_ldflags)
+qtv_server_DEPENDENCIES=	$(qtv_LIBS)
diff --git a/qtv/source/client.c b/qtv/source/client.c
index 24b0e23b2..06955b12f 100644
--- a/qtv/source/client.c
+++ b/qtv/source/client.c
@@ -55,10 +55,10 @@
 #include "qw/msg_ucmd.h"
 #include "qw/protocol.h"
 
-#include "client.h"
-#include "connection.h"
-#include "qtv.h"
-#include "server.h"
+#include "qtv/include/client.h"
+#include "qtv/include/connection.h"
+#include "qtv/include/qtv.h"
+#include "qtv/include/server.h"
 
 int client_count;
 static client_t *clients;
diff --git a/qtv/source/connection.c b/qtv/source/connection.c
index 52f159060..e670880f3 100644
--- a/qtv/source/connection.c
+++ b/qtv/source/connection.c
@@ -46,7 +46,7 @@
 #include "QF/hash.h"
 #include "QF/sys.h"
 
-#include "connection.h"
+#include "qtv/include/connection.h"
 
 static hashtab_t *connections;
 
diff --git a/qtv/source/qtv.c b/qtv/source/qtv.c
index 1274254d5..a44fdf45d 100644
--- a/qtv/source/qtv.c
+++ b/qtv/source/qtv.c
@@ -56,14 +56,15 @@
 
 #include "QF/plugin/console.h"
 
+#include "compat.h"
+#include "netchan.h"
+
 #include "qw/protocol.h"
 
-#include "client.h"
-#include "compat.h"
-#include "connection.h"
-#include "netchan.h"
-#include "qtv.h"
-#include "server.h"
+#include "qtv/include/client.h"
+#include "qtv/include/connection.h"
+#include "qtv/include/qtv.h"
+#include "qtv/include/server.h"
 
 #undef qtv_print
 
diff --git a/qtv/source/sbar.c b/qtv/source/sbar.c
index 73015d00a..092c85ea1 100644
--- a/qtv/source/sbar.c
+++ b/qtv/source/sbar.c
@@ -37,10 +37,11 @@
 
 #include "QF/plugin/console.h"
 
-#include "client.h"
-#include "server.h"
 #include "sv_console.h"
-#include "qtv.h"
+
+#include "qtv/include/client.h"
+#include "qtv/include/server.h"
+#include "qtv/include/qtv.h"
 
 static void
 draw_clients (view_t *view)
diff --git a/qtv/source/server.c b/qtv/source/server.c
index 855bc492c..c376905d2 100644
--- a/qtv/source/server.c
+++ b/qtv/source/server.c
@@ -54,10 +54,10 @@
 
 #include "qw/protocol.h"
 
-#include "client.h"
-#include "connection.h"
-#include "qtv.h"
-#include "server.h"
+#include "qtv/include/client.h"
+#include "qtv/include/connection.h"
+#include "qtv/include/qtv.h"
+#include "qtv/include/server.h"
 
 int server_count;
 static hashtab_t *server_hash;
diff --git a/qtv/source/sv_parse.c b/qtv/source/sv_parse.c
index 48198e809..c179d125e 100644
--- a/qtv/source/sv_parse.c
+++ b/qtv/source/sv_parse.c
@@ -56,10 +56,10 @@
 #include "qw/msg_ucmd.h"
 #include "qw/protocol.h"
 
-#include "client.h"
-#include "connection.h"
-#include "qtv.h"
-#include "server.h"
+#include "qtv/include/client.h"
+#include "qtv/include/connection.h"
+#include "qtv/include/qtv.h"
+#include "qtv/include/server.h"
 
 static void
 sv_serverdata (server_t *sv, qmsg_t *msg)
diff --git a/qw/Makefile.am b/qw/Makefile.am
deleted file mode 100644
index 77e3cbf5b..000000000
--- a/qw/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-## Process this file with automake to produce Makefile.in
-AUTOMAKE_OPTIONS= foreign
-
-SUBDIRS=	include source
diff --git a/qw/Makemodule.am b/qw/Makemodule.am
new file mode 100644
index 000000000..9fca70d9b
--- /dev/null
+++ b/qw/Makemodule.am
@@ -0,0 +1,2 @@
+include qw/include/Makemodule.am
+include qw/source/Makemodule.am
diff --git a/qw/include/Makefile.am b/qw/include/Makefile.am
deleted file mode 100644
index 67535b195..000000000
--- a/qw/include/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-## Process this file with automake to produce Makefile.in
-AUTOMAKE_OPTIONS=	foreign
-
-EXTRA_DIST = \
-		chase.h cl_cam.h cl_chat.h cl_demo.h cl_ents.h cl_http.h cl_input.h \
-		cl_main.h cl_parse.h cl_pred.h cl_skin.h cl_slist.h cl_tent.h \
-		client.h crudefile.h game.h host.h map_cfg.h server.h sv_gib.h \
-		sv_demo.h sv_pr_cmds.h sv_pr_cpqw.h sv_pr_qwe.h sv_progs.h sv_qtv.h \
-		sv_recorder.h
diff --git a/qw/include/Makemodule.am b/qw/include/Makemodule.am
new file mode 100644
index 000000000..2f5076b12
--- /dev/null
+++ b/qw/include/Makemodule.am
@@ -0,0 +1,28 @@
+EXTRA_DIST += \
+	qw/include/chase.h \
+	qw/include/cl_cam.h \
+	qw/include/cl_chat.h \
+	qw/include/cl_demo.h \
+	qw/include/cl_ents.h \
+	qw/include/cl_http.h \
+	qw/include/cl_input.h \
+	qw/include/cl_main.h \
+	qw/include/cl_parse.h \
+	qw/include/cl_pred.h \
+	qw/include/cl_skin.h \
+	qw/include/cl_slist.h \
+	qw/include/cl_tent.h \
+	qw/include/client.h \
+	qw/include/crudefile.h \
+	qw/include/game.h \
+	qw/include/host.h \
+	qw/include/map_cfg.h \
+	qw/include/server.h \
+	qw/include/sv_gib.h \
+	qw/include/sv_demo.h \
+	qw/include/sv_pr_cmds.h \
+	qw/include/sv_pr_cpqw.h \
+	qw/include/sv_pr_qwe.h \
+	qw/include/sv_progs.h \
+	qw/include/sv_qtv.h \
+	qw/include/sv_recorder.h
diff --git a/qw/source/Makefile.am b/qw/source/Makefile.am
deleted file mode 100644
index 9afe77ae1..000000000
--- a/qw/source/Makefile.am
+++ /dev/null
@@ -1,191 +0,0 @@
-## Process this file with automake to produce Makefile.in
-#
-#	Makefile.am
-#
-#	Automake-using build system for QuakeForge
-#
-#	Copyright (C) 2000 Jeff Teunissen <deek@quakeforge.net>
-#
-#	This Makefile is free software; you can redistribute it and/or
-#	modify it under the terms of the GNU General Public License
-#	as published by the Free Software Foundation; either version 2
-#	of the License, or (at your option) any later version.
-#
-#	This program is distributed in the hope that it will be useful,
-#	but WITHOUT ANY WARRANTY; without even the implied warranty of
-#	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-#
-#	See the GNU General Public License for more details.
-#
-#	You should have received a copy of the GNU General Public License
-#	along with this program; if not, write to:
-#
-#		Free Software Foundation, Inc.
-#		59 Temple Place - Suite 330
-#		Boston, MA  02111-1307, USA
-#
-#	$Id$
-#
-
-AUTOMAKE_OPTIONS=	foreign
-
-# Stuff that is common to both client and server
-AM_CPPFLAGS=	-I$(top_srcdir)/include -I$(top_srcdir)/qw/include @LIBCURL_CFLAGS@
-SDL_LIBS = @SDL_LIBS@
-AM_CFLAGS= @PTHREAD_CFLAGS@
-
-bin_PROGRAMS=	@QW_TARGETS@
-
-EXTRA_PROGRAMS= \
-	qw-client-fbdev qw-client-sdl qw-client-svga qw-client-wgl qw-client-x11 \
-	qw-server qw-master
-
-noinst_LIBRARIES= @qw_libs@
-EXTRA_LIBRARIES=libqw_client.a libqw_common.a libqw_sdl.a libqw_server.a
-
-
-libqw_common_a_SOURCES=\
-	game.c map_cfg.c pmove.c pmovetst.c net_packetlog.c
-libqw_sdl_a_SOURCES=cl_sys_sdl.c
-libqw_sdl_a_CFLAGS=$(SDL_CFLAGS)
-
-common_ldflags= -export-dynamic @PTHREAD_LDFLAGS@
-
-# Server builds
-#
-# ... System type
-if SYSTYPE_WIN32
-syssv_SRC=	sv_sys_win.c
-else
-syssv_SRC=	sv_sys_unix.c
-endif
-
-EXTRA_DIST=sv_sys_win.c sv_sys_unix.c
-
-libqw_server_a_SOURCES= \
-	crudefile.c sv_ccmds.c sv_demo.c sv_ents.c sv_gib.c sv_init.c sv_main.c \
-	sv_move.c sv_phys.c sv_pr_cmds.c sv_pr_cpqw.c sv_pr_qwe.c sv_progs.c \
-	sv_qtv.c sv_recorder.c sv_sbar.c sv_send.c sv_user.c world.c
-
-qw_server_LIBS= \
-		@server_static_plugin_libs@ \
-		$(top_builddir)/libs/qw/libqw.a \
-		$(top_builddir)/libs/net/libnet_chan.la \
-		$(top_builddir)/libs/models/libQFmodels.la \
-		$(top_builddir)/libs/gib/libQFgib.la \
-		$(top_builddir)/libs/ruamoko/libQFruamoko.la \
-		$(top_builddir)/libs/console/libQFconsole.la \
-		$(top_builddir)/libs/util/libQFutil.la
-
-qw_server_deps=libqw_server.a libqw_common.a $(qw_server_LIBS)
-qw_server_SOURCES=		$(syssv_SRC)
-qw_server_LDADD=		$(qw_server_deps) $(NET_LIBS) $(DL_LIBS) $(CURSES_LIBS)
-qw_server_LDFLAGS=		$(common_ldflags)
-qw_server_DEPENDENCIES=	$(qw_server_deps)
-
-qw_master_deps=$(top_builddir)/libs/util/libQFutil.la
-qw_master_SOURCES=		master.c
-qw_master_LDADD=		$(qw_master_deps) $(NET_LIBS)
-qw_master_DEPENDENCIES=	$(qw_master_deps)
-qw_master_LDFLAGS=		$(common_ldflags)
-
-cl_plugin_LIBS= \
-		@client_static_plugin_libs@
-
-qw_client_LIBS= \
-		$(top_builddir)/libs/qw/libqw.a \
-		$(top_builddir)/libs/net/libnet_chan.la \
-		$(top_builddir)/libs/console/libQFconsole.la \
-		$(top_builddir)/libs/video/targets/libQFjs.la \
-		$(top_builddir)/libs/audio/libQFcd.la \
-		$(top_builddir)/libs/audio/libQFsound.la \
-		$(top_builddir)/libs/image/libQFimage.la \
-		$(top_builddir)/libs/gib/libQFgib.la \
-		$(top_builddir)/libs/ruamoko/libQFruamoko.la \
-		$(top_builddir)/libs/util/libQFutil.la
-
-client_LIBS= $(qw_client_LIBS)
-client_libs= libqw_client.a libqw_common.a \
-			$(top_builddir)/libs/client/libQFclient.la
-
-libqw_client_a_SOURCES= \
-		cl_cam.c cl_chase.c cl_chat.c cl_cmd.c cl_cvar.c cl_demo.c \
-		cl_entparse.c cl_ents.c cl_http.c cl_input.c cl_main.c cl_ngraph.c \
-		cl_parse.c cl_pred.c cl_rss.c cl_screen.c cl_skin.c cl_slist.c \
-		cl_tent.c cl_view.c \
-		locs.c sbar.c teamplay.c
-
-# Software-rendering clients
-
-# ... Linux FBDev
-qw_client_fbdev_libs= \
-			$(client_libs) \
-			$(cl_plugin_LIBS) \
-			$(top_builddir)/libs/video/renderer/libQFrenderer.la \
-			$(top_builddir)/libs/models/libQFmodels.la \
-			$(top_builddir)/libs/video/targets/libQFfbdev.la \
-			$(client_LIBS)
-qw_client_fbdev_SOURCES= cl_sys_unix.c
-qw_client_fbdev_LDADD= $(qw_client_fbdev_libs) $(NET_LIBS) $(LIBCURL_LIBS)
-qw_client_fbdev_LDFLAGS= $(common_ldflags)
-qw_client_fbdev_DEPENDENCIES= $(qw_client_fbdev_libs)
-
-# ... Simple DirectMedia Layer, version 1.2 and higher
-qw_client_sdl_libs= \
-			libqw_sdl.a \
-			$(client_libs) \
-			$(cl_plugin_LIBS) \
-			$(top_builddir)/libs/video/renderer/libQFrenderer.la \
-			$(top_builddir)/libs/models/libQFmodels.la \
-			$(top_builddir)/libs/video/targets/libQFsdl.la \
-			$(client_LIBS)
-qw_client_sdl_SOURCES=sdl_link.c
-qw_client_sdl_LDADD= libqw_sdl.a $(qw_client_sdl_libs) $(SDL_LIBS) $(NET_LIBS) $(LIBCURL_LIBS)
-qw_client_sdl_LDFLAGS=  $(common_ldflags)
-qw_client_sdl_DEPENDENCIES= libqw_sdl.a $(qw_client_sdl_libs)
-
-# ... Linux SVGAlib
-qw_client_svga_libs= \
-			$(client_libs) \
-			$(cl_plugin_LIBS) \
-			$(top_builddir)/libs/video/renderer/libQFrenderer.la \
-			$(top_builddir)/libs/models/libQFmodels.la \
-			$(top_builddir)/libs/video/targets/libQFsvga.la \
-			$(client_LIBS)
-qw_client_svga_SOURCES= cl_sys_unix.c
-qw_client_svga_LDADD= $(qw_client_svga_libs) $(SVGA_LIBS) $(NET_LIBS) $(LIBCURL_LIBS)
-qw_client_svga_LDFLAGS=  $(common_ldflags)
-qw_client_svga_DEPENDENCIES= $(qw_client_svga_libs)
-
-# ... X11
-qw_client_x11_libs= \
-			$(client_libs) \
-			$(cl_plugin_LIBS) \
-			$(top_builddir)/libs/video/renderer/libQFrenderer.la \
-			$(top_builddir)/libs/models/libQFmodels.la \
-			$(top_builddir)/libs/video/targets/libQFx11.la \
-			$(client_LIBS)
-qw_client_x11_SOURCES=	cl_sys_unix.c
-qw_client_x11_LDADD= $(qw_client_x11_libs) \
-			$(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 \
-			$(X_EXTRA_LIBS) $(X_SHM_LIB) $(NET_LIBS) $(LIBCURL_LIBS) $(DL_LIBS)
-qw_client_x11_LDFLAGS=	$(common_ldflags)
-qw_client_x11_DEPENDENCIES= $(qw_client_x11_libs)
-
-# ... SGI/Microsoft WGL (Windows OpenGL)
-qw_client_wgl_libs= \
-			$(client_libs) \
-			$(cl_plugin_LIBS) \
-			$(opengl_LIBS) \
-			$(top_builddir)/libs/video/targets/libQFwgl.la \
-			$(client_LIBS)
-qw_client_wgl_SOURCES=	cl_sys_win.c
-qw_client_wgl_LDADD= $(qw_client_wgl_libs) -lgdi32 -lwinmm $(NET_LIBS) $(LIBCURL_LIBS)
-qw_client_wgl_LDFLAGS=  $(common_ldflags)
-qw_client_wgl_DEPENDENCIES= $(qw_client_wgl_libs)
-
-# Stuff that doesn't get linked into an executable NEEDS to be mentioned here,
-# or it won't be distributed with 'make dist'
-
-# Kill the temp files, hopefully.
-CLEANFILES	= *.i *.s $(YACCLEX_CLEANFILES)
diff --git a/qw/source/Makemodule.am b/qw/source/Makemodule.am
new file mode 100644
index 000000000..553a32f65
--- /dev/null
+++ b/qw/source/Makemodule.am
@@ -0,0 +1,175 @@
+## Process this file with automake to produce Makefile.in
+#
+#	Makefile.am
+#
+#	Automake-using build system for QuakeForge
+#
+#	Copyright (C) 2000 Jeff Teunissen <deek@quakeforge.net>
+#
+#	This Makefile is free software; you can redistribute it and/or
+#	modify it under the terms of the GNU General Public License
+#	as published by the Free Software Foundation; either version 2
+#	of the License, or (at your option) any later version.
+#
+#	This program is distributed in the hope that it will be useful,
+#	but WITHOUT ANY WARRANTY; without even the implied warranty of
+#	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+#	See the GNU General Public License for more details.
+#
+#	You should have received a copy of the GNU General Public License
+#	along with this program; if not, write to:
+#
+#		Free Software Foundation, Inc.
+#		59 Temple Place - Suite 330
+#		Boston, MA  02111-1307, USA
+#
+#	$Id$
+#
+
+bin_PROGRAMS += @QW_TARGETS@
+
+EXTRA_PROGRAMS += \
+	qw-client-fbdev qw-client-sdl qw-client-svga qw-client-wgl qw-client-x11 \
+	qw-server qw-master
+
+noinst_LIBRARIES += @qw_libs@
+EXTRA_LIBRARIES += qw/source/libqw_client.a qw/source/libqw_common.a qw/source/libqw_sdl.a qw/source/libqw_server.a
+
+
+qw_source_libqw_common_a_SOURCES=\
+	qw/source/game.c qw/source/map_cfg.c qw/source/pmove.c qw/source/pmovetst.c qw/source/net_packetlog.c
+qw_source_libqw_sdl_a_SOURCES=qw/source/cl_sys_sdl.c
+qw_source_libqw_sdl_a_CFLAGS=$(SDL_CFLAGS)
+
+# Server builds
+#
+# ... System type
+if SYSTYPE_WIN32
+syssv_SRC=	qw/source/sv_sys_win.c
+else
+syssv_SRC=	qw/source/sv_sys_unix.c
+endif
+
+EXTRA_DIST+=qw/source/sv_sys_win.c qw/source/sv_sys_unix.c
+
+qw_source_libqw_server_a_SOURCES= \
+	qw/source/crudefile.c qw/source/sv_ccmds.c qw/source/sv_demo.c qw/source/sv_ents.c qw/source/sv_gib.c qw/source/sv_init.c qw/source/sv_main.c \
+	qw/source/sv_move.c qw/source/sv_phys.c qw/source/sv_pr_cmds.c qw/source/sv_pr_cpqw.c qw/source/sv_pr_qwe.c qw/source/sv_progs.c \
+	qw/source/sv_qtv.c qw/source/sv_recorder.c qw/source/sv_sbar.c qw/source/sv_send.c qw/source/sv_user.c qw/source/world.c
+
+qw_server_LIBS= \
+		@server_static_plugin_libs@ \
+		libs/qw/libqw.a \
+		libs/net/libnet_chan.la \
+		libs/models/libQFmodels.la \
+		libs/gib/libQFgib.la \
+		libs/ruamoko/libQFruamoko.la \
+		libs/gamecode/libQFgamecode.la \
+		libs/console/libQFconsole.la \
+		libs/util/libQFutil.la
+
+qw_server_deps=qw/source/libqw_server.a qw/source/libqw_common.a $(qw_server_LIBS)
+qw_server_SOURCES=		$(syssv_SRC)
+qw_server_LDADD=		$(qw_server_deps) $(NET_LIBS) $(DL_LIBS) $(CURSES_LIBS)
+qw_server_LDFLAGS=		$(common_ldflags)
+qw_server_DEPENDENCIES=	$(qw_server_deps)
+
+qw_master_deps=libs/util/libQFutil.la
+qw_master_SOURCES=		qw/source/master.c
+qw_master_LDADD=		$(qw_master_deps) $(NET_LIBS)
+qw_master_DEPENDENCIES=	$(qw_master_deps)
+qw_master_LDFLAGS=		$(common_ldflags)
+
+qw_cl_plugin_LIBS= \
+		@client_static_plugin_libs@
+
+qw_client_LIBS= \
+		libs/qw/libqw.a \
+		libs/net/libnet_chan.la \
+		libs/console/libQFconsole.la \
+		libs/video/targets/libQFjs.la \
+		libs/audio/libQFcd.la \
+		libs/audio/libQFsound.la \
+		libs/image/libQFimage.la \
+		libs/gib/libQFgib.la \
+		libs/ruamoko/libQFruamoko.la \
+		libs/util/libQFutil.la
+qw_client_libs= qw/source/libqw_client.a qw/source/libqw_common.a \
+			libs/client/libQFclient.la
+
+qw_source_libqw_client_a_SOURCES= \
+		qw/source/cl_cam.c qw/source/cl_chase.c qw/source/cl_chat.c qw/source/cl_cmd.c qw/source/cl_cvar.c qw/source/cl_demo.c \
+		qw/source/cl_entparse.c qw/source/cl_ents.c qw/source/cl_http.c qw/source/cl_input.c qw/source/cl_main.c qw/source/cl_ngraph.c \
+		qw/source/cl_parse.c qw/source/cl_pred.c qw/source/cl_rss.c qw/source/cl_screen.c qw/source/cl_skin.c qw/source/cl_slist.c \
+		qw/source/cl_tent.c qw/source/cl_view.c \
+		qw/source/locs.c qw/source/sbar.c qw/source/teamplay.c
+
+# Software-rendering clients
+
+# ... Linux FBDev
+qw_client_fbdev_libs= \
+			$(qw_client_libs) \
+			$(qw_cl_plugin_LIBS) \
+			libs/video/renderer/libQFrenderer.la \
+			libs/models/libQFmodels.la \
+			libs/video/targets/libQFfbdev.la \
+			$(qw_client_LIBS)
+qw_client_fbdev_SOURCES= qw/source/cl_sys_unix.c
+qw_client_fbdev_LDADD= $(qw_client_fbdev_libs) $(NET_LIBS) $(LIBCURL_LIBS)
+qw_client_fbdev_LDFLAGS= $(common_ldflags)
+qw_client_fbdev_DEPENDENCIES= $(qw_client_fbdev_libs)
+
+# ... Simple DirectMedia Layer, version 1.2 and higher
+qw_client_sdl_libs= \
+			qw/source/libqw_sdl.a \
+			$(qw_client_libs) \
+			$(qw_cl_plugin_LIBS) \
+			libs/video/renderer/libQFrenderer.la \
+			libs/models/libQFmodels.la \
+			libs/video/targets/libQFsdl.la \
+			$(qw_client_LIBS)
+qw_client_sdl_SOURCES=qw/source/sdl_link.c
+qw_client_sdl_LDADD= qw/source/libqw_sdl.a $(qw_client_sdl_libs) $(SDL_LIBS) $(NET_LIBS) $(LIBCURL_LIBS)
+qw_client_sdl_LDFLAGS=  $(common_ldflags)
+qw_client_sdl_DEPENDENCIES= qw/source/libqw_sdl.a $(qw_client_sdl_libs)
+
+# ... Linux SVGAlib
+qw_client_svga_libs= \
+			$(qw_client_libs) \
+			$(qw_cl_plugin_LIBS) \
+			libs/video/renderer/libQFrenderer.la \
+			libs/models/libQFmodels.la \
+			libs/video/targets/libQFsvga.la \
+			$(qw_client_LIBS)
+qw_client_svga_SOURCES= qw/source/cl_sys_unix.c
+qw_client_svga_LDADD= $(qw_client_svga_libs) $(SVGA_LIBS) $(NET_LIBS) $(LIBCURL_LIBS)
+qw_client_svga_LDFLAGS=  $(common_ldflags)
+qw_client_svga_DEPENDENCIES= $(qw_client_svga_libs)
+
+# ... X11
+qw_client_x11_libs= \
+			$(qw_client_libs) \
+			$(qw_cl_plugin_LIBS) \
+			libs/video/renderer/libQFrenderer.la \
+			libs/models/libQFmodels.la \
+			libs/video/targets/libQFx11.la \
+			$(qw_client_LIBS)
+qw_client_x11_SOURCES=	qw/source/cl_sys_unix.c
+qw_client_x11_LDADD= $(qw_client_x11_libs) \
+			$(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 \
+			$(X_EXTRA_LIBS) $(X_SHM_LIB) $(NET_LIBS) $(LIBCURL_LIBS) $(DL_LIBS)
+qw_client_x11_LDFLAGS=	$(common_ldflags)
+qw_client_x11_DEPENDENCIES= $(qw_client_x11_libs)
+
+# ... SGI/Microsoft WGL (Windows OpenGL)
+qw_client_wgl_libs= \
+			$(qw_client_libs) \
+			$(qw_cl_plugin_LIBS) \
+			$(opengl_LIBS) \
+			libs/video/targets/libQFwgl.la \
+			$(qw_client_LIBS)
+qw_client_wgl_SOURCES=	qw/source/cl_sys_win.c
+qw_client_wgl_LDADD= $(qw_client_wgl_libs) -lgdi32 -lwinmm $(NET_LIBS) $(LIBCURL_LIBS)
+qw_client_wgl_LDFLAGS=  $(common_ldflags)
+qw_client_wgl_DEPENDENCIES= $(qw_client_wgl_libs)
diff --git a/qw/source/cl_cam.c b/qw/source/cl_cam.c
index f7e9adf44..5a7f0d486 100644
--- a/qw/source/cl_cam.c
+++ b/qw/source/cl_cam.c
@@ -45,14 +45,15 @@
 #include "QF/cvar.h"
 #include "QF/msg.h"
 
-#include "chase.h"
-#include "cl_cam.h"
-#include "cl_input.h"
-#include "client.h"
 #include "compat.h"
-#include "qw/pmove.h"
 #include "sbar.h"
 
+#include "qw/include/chase.h"
+#include "qw/include/cl_cam.h"
+#include "qw/include/cl_input.h"
+#include "qw/include/client.h"
+#include "qw/pmove.h"
+
 #define	PM_SPECTATORMAXSPEED 500
 #define	PM_STOPSPEED 100
 #define	PM_MAXSPEED 320
diff --git a/qw/source/cl_chase.c b/qw/source/cl_chase.c
index 26f5b02b4..2e5583429 100644
--- a/qw/source/cl_chase.c
+++ b/qw/source/cl_chase.c
@@ -42,9 +42,9 @@
 
 #include "QF/plugin/vid_render.h"
 
-#include "chase.h"
-#include "cl_input.h"
-#include "client.h"
+#include "qw/include/chase.h"
+#include "qw/include/cl_input.h"
+#include "qw/include/client.h"
 #include "world.h"
 
 vec3_t camera_origin = {0,0,0};
diff --git a/qw/source/cl_chat.c b/qw/source/cl_chat.c
index 2b40e64dd..7a3dcb186 100644
--- a/qw/source/cl_chat.c
+++ b/qw/source/cl_chat.c
@@ -44,8 +44,8 @@
 #include "QF/sys.h"
 #include "QF/va.h"
 
-#include "client.h"
-#include "cl_chat.h"
+#include "qw/include/client.h"
+#include "qw/include/cl_chat.h"
 
 llist_t *ignore_list, *dead_ignore_list;
 
diff --git a/qw/source/cl_cmd.c b/qw/source/cl_cmd.c
index a38dbc875..3b0f7b072 100644
--- a/qw/source/cl_cmd.c
+++ b/qw/source/cl_cmd.c
@@ -42,7 +42,7 @@
 #include "QF/sys.h"
 #include "QF/teamplay.h"
 
-#include "client.h"
+#include "qw/include/client.h"
 
 static void
 send_say (const char *str)
diff --git a/qw/source/cl_cvar.c b/qw/source/cl_cvar.c
index c92322c7c..ebd569ba8 100644
--- a/qw/source/cl_cvar.c
+++ b/qw/source/cl_cvar.c
@@ -39,9 +39,10 @@
 #include "QF/msg.h"
 #include "QF/va.h"
 
-#include "client.h"
 #include "compat.h"
 
+#include "qw/include/client.h"
+
 void
 Cvar_Info (cvar_t *var)
 {
diff --git a/qw/source/cl_demo.c b/qw/source/cl_demo.c
index 04ccbdf55..51c709adc 100644
--- a/qw/source/cl_demo.c
+++ b/qw/source/cl_demo.c
@@ -54,13 +54,14 @@
 #include "QF/sys.h"
 #include "QF/va.h"
 
-#include "cl_cam.h"
-#include "cl_demo.h"
-#include "cl_ents.h"
-#include "cl_main.h"
-#include "client.h"
 #include "compat.h"
-#include "host.h"
+
+#include "qw/include/cl_cam.h"
+#include "qw/include/cl_demo.h"
+#include "qw/include/cl_ents.h"
+#include "qw/include/cl_main.h"
+#include "qw/include/client.h"
+#include "qw/include/host.h"
 #include "qw/pmove.h"
 
 typedef struct {
diff --git a/qw/source/cl_entparse.c b/qw/source/cl_entparse.c
index ffad98174..3fdeda901 100644
--- a/qw/source/cl_entparse.c
+++ b/qw/source/cl_entparse.c
@@ -42,21 +42,21 @@
 #include "QF/skin.h"
 #include "QF/sys.h"
 
-#include "qw/msg_ucmd.h"
-
-#include "qw/bothdefs.h"
-#include "cl_cam.h"
-#include "cl_ents.h"
-#include "cl_main.h"
-#include "cl_parse.h"
-#include "cl_pred.h"
-#include "cl_tent.h"
 #include "compat.h"
-#include "d_iface.h"
-#include "host.h"
-#include "qw/pmove.h"
 #include "clview.h"
 
+#include "qw/msg_ucmd.h"
+#include "qw/pmove.h"
+#include "qw/bothdefs.h"
+
+#include "qw/include/cl_cam.h"
+#include "qw/include/cl_ents.h"
+#include "qw/include/cl_main.h"
+#include "qw/include/cl_parse.h"
+#include "qw/include/cl_pred.h"
+#include "qw/include/cl_tent.h"
+#include "qw/include/host.h"
+
 static struct predicted_player {
 	int         flags;
 	qboolean    active;
diff --git a/qw/source/cl_ents.c b/qw/source/cl_ents.c
index edd048090..24f14933b 100644
--- a/qw/source/cl_ents.c
+++ b/qw/source/cl_ents.c
@@ -42,21 +42,22 @@
 #include "QF/skin.h"
 #include "QF/sys.h"
 
-#include "qw/msg_ucmd.h"
+#include "compat.h"
+#include "clview.h"
+#include "d_iface.h"
 
 #include "qw/bothdefs.h"
-#include "chase.h"
-#include "cl_cam.h"
-#include "cl_ents.h"
-#include "cl_main.h"
-#include "cl_parse.h"
-#include "cl_pred.h"
-#include "cl_tent.h"
-#include "compat.h"
-#include "d_iface.h"
-#include "host.h"
+#include "qw/msg_ucmd.h"
 #include "qw/pmove.h"
-#include "clview.h"
+
+#include "qw/include/chase.h"
+#include "qw/include/cl_cam.h"
+#include "qw/include/cl_ents.h"
+#include "qw/include/cl_main.h"
+#include "qw/include/cl_parse.h"
+#include "qw/include/cl_pred.h"
+#include "qw/include/cl_tent.h"
+#include "qw/include/host.h"
 
 entity_t    cl_player_ents[MAX_CLIENTS];
 entity_t    cl_flag_ents[MAX_CLIENTS];
diff --git a/qw/source/cl_http.c b/qw/source/cl_http.c
index 38bd9f204..b13986cf2 100644
--- a/qw/source/cl_http.c
+++ b/qw/source/cl_http.c
@@ -38,9 +38,9 @@
 #include "QF/dstring.h"
 #include "QF/sys.h"
 
-#include "cl_http.h"
-#include "cl_parse.h"
-#include "client.h"
+#include "qw/include/cl_http.h"
+#include "qw/include/cl_parse.h"
+#include "qw/include/client.h"
 
 static int curl_borked;
 static CURL *easy_handle;
@@ -129,7 +129,7 @@ CL_HTTP_Reset (void)
 
 #else
 
-#include "cl_http.h"
+#include "qw/include/cl_http.h"
 
 void CL_HTTP_Init (void) {}
 void CL_HTTP_Shutdown (void) {}
diff --git a/qw/source/cl_input.c b/qw/source/cl_input.c
index e80ea4714..55ef38f5d 100644
--- a/qw/source/cl_input.c
+++ b/qw/source/cl_input.c
@@ -45,17 +45,18 @@
 #include "QF/teamplay.h"
 #include "QF/va.h"
 
+#include "compat.h"
+#include "clview.h"
+
 #include "qw/msg_ucmd.h"
 
-#include "chase.h"
-#include "cl_cam.h"
-#include "cl_demo.h"
-#include "cl_input.h"
-#include "cl_parse.h"
-#include "client.h"
-#include "compat.h"
-#include "host.h"
-#include "clview.h"
+#include "qw/include/chase.h"
+#include "qw/include/cl_cam.h"
+#include "qw/include/cl_demo.h"
+#include "qw/include/cl_input.h"
+#include "qw/include/cl_parse.h"
+#include "qw/include/client.h"
+#include "qw/include/host.h"
 
 cvar_t     *cl_nodelta;
 cvar_t     *cl_maxnetfps;
diff --git a/qw/source/cl_main.c b/qw/source/cl_main.c
index b78038ca9..08754ffc2 100644
--- a/qw/source/cl_main.c
+++ b/qw/source/cl_main.c
@@ -91,28 +91,30 @@
 
 #include "QF/plugin/console.h"
 
-#include "qw/bothdefs.h"
 #include "buildnum.h"
-#include "cl_cam.h"
-#include "cl_chat.h"
-#include "cl_demo.h"
-#include "cl_ents.h"
-#include "cl_http.h"
-#include "cl_input.h"
-#include "cl_main.h"
-#include "cl_parse.h"
-#include "cl_pred.h"
-#include "cl_skin.h"
-#include "cl_slist.h"
-#include "cl_tent.h"
-#include "client.h"
-#include "compat.h"
-#include "game.h"
-#include "host.h"
-#include "netchan.h"
-#include "qw/pmove.h"
-#include "sbar.h"
 #include "clview.h"
+#include "compat.h"
+#include "sbar.h"
+
+#include "qw/bothdefs.h"
+#include "qw/pmove.h"
+
+#include "qw/include/cl_cam.h"
+#include "qw/include/cl_chat.h"
+#include "qw/include/cl_demo.h"
+#include "qw/include/cl_ents.h"
+#include "qw/include/cl_http.h"
+#include "qw/include/cl_input.h"
+#include "qw/include/cl_main.h"
+#include "qw/include/cl_parse.h"
+#include "qw/include/cl_pred.h"
+#include "qw/include/cl_skin.h"
+#include "qw/include/cl_slist.h"
+#include "qw/include/cl_tent.h"
+#include "qw/include/client.h"
+#include "qw/include/game.h"
+#include "qw/include/host.h"
+#include "netchan.h"
 
 CLIENT_PLUGIN_PROTOS
 static plugin_list_t client_plugin_list[] = {
diff --git a/qw/source/cl_ngraph.c b/qw/source/cl_ngraph.c
index 2503c8ee4..21891f471 100644
--- a/qw/source/cl_ngraph.c
+++ b/qw/source/cl_ngraph.c
@@ -41,8 +41,9 @@
 #include "QF/screen.h"
 
 #include "compat.h"
-#include "cl_parse.h"
-#include "client.h"
+
+#include "qw/include/cl_parse.h"
+#include "qw/include/client.h"
 #include "sbar.h"
 
 cvar_t     *r_netgraph;
diff --git a/qw/source/cl_parse.c b/qw/source/cl_parse.c
index a271c1197..2446413d6 100644
--- a/qw/source/cl_parse.c
+++ b/qw/source/cl_parse.c
@@ -61,24 +61,26 @@
 #include "QF/teamplay.h"
 #include "QF/va.h"
 
-#include "qw/bothdefs.h"
-#include "cl_cam.h"
-#include "cl_chat.h"
-#include "cl_ents.h"
-#include "cl_http.h"
-#include "cl_input.h"
-#include "cl_main.h"
-#include "cl_parse.h"
-#include "cl_skin.h"
-#include "cl_tent.h"
-#include "client.h"
 #include "compat.h"
-#include "host.h"
-#include "map_cfg.h"
+#include "clview.h"
+#include "sbar.h"
+
+#include "qw/bothdefs.h"
 #include "qw/pmove.h"
 #include "qw/protocol.h"
-#include "sbar.h"
-#include "clview.h"
+
+#include "qw/include/cl_cam.h"
+#include "qw/include/cl_chat.h"
+#include "qw/include/cl_ents.h"
+#include "qw/include/cl_http.h"
+#include "qw/include/cl_input.h"
+#include "qw/include/cl_main.h"
+#include "qw/include/cl_parse.h"
+#include "qw/include/cl_skin.h"
+#include "qw/include/cl_tent.h"
+#include "qw/include/client.h"
+#include "qw/include/host.h"
+#include "qw/include/map_cfg.h"
 
 const char *svc_strings[] = {
 	"svc_bad",
diff --git a/qw/source/cl_pred.c b/qw/source/cl_pred.c
index 6b110e46c..1ac6e5ca1 100644
--- a/qw/source/cl_pred.c
+++ b/qw/source/cl_pred.c
@@ -34,11 +34,12 @@
 #include "QF/cvar.h"
 #include "QF/keys.h"
 
-#include "qw/bothdefs.h"
 #include "compat.h"
-#include "cl_ents.h"
-#include "cl_pred.h"
-#include "client.h"
+
+#include "qw/bothdefs.h"
+#include "qw/include/cl_ents.h"
+#include "qw/include/cl_pred.h"
+#include "qw/include/client.h"
 #include "qw/pmove.h"
 
 cvar_t     *cl_predict;
diff --git a/qw/source/cl_rss.c b/qw/source/cl_rss.c
index 447e25dcc..bb4cbd993 100644
--- a/qw/source/cl_rss.c
+++ b/qw/source/cl_rss.c
@@ -42,8 +42,8 @@
 #include "QF/pcx.h"
 #include "QF/sys.h"
 
-#include "cl_parse.h"
-#include "client.h"
+#include "qw/include/cl_parse.h"
+#include "qw/include/client.h"
 
 void
 CL_RSShot_f (void)
diff --git a/qw/source/cl_screen.c b/qw/source/cl_screen.c
index adf20f7e4..5b81f65a7 100644
--- a/qw/source/cl_screen.c
+++ b/qw/source/cl_screen.c
@@ -44,10 +44,11 @@
 #include "QF/pcx.h"
 #include "QF/screen.h"
 
-#include "client.h"
 #include "clview.h"
 #include "sbar.h"
 
+#include "qw/include/client.h"
+
 static qpic_t  *scr_net;
 
 static void
diff --git a/qw/source/cl_skin.c b/qw/source/cl_skin.c
index d533a58d3..21a9afea7 100644
--- a/qw/source/cl_skin.c
+++ b/qw/source/cl_skin.c
@@ -43,11 +43,12 @@
 #include "QF/sys.h"
 #include "QF/va.h"
 
-#include "cl_parse.h"
-#include "cl_skin.h"
-#include "client.h"
 #include "compat.h"
-#include "host.h"
+
+#include "qw/include/cl_parse.h"
+#include "qw/include/cl_skin.h"
+#include "qw/include/client.h"
+#include "qw/include/host.h"
 
 cvar_t     *noskins; //XXX FIXME
 cvar_t     *skin;
diff --git a/qw/source/cl_slist.c b/qw/source/cl_slist.c
index 21497f142..4b5ea16b8 100644
--- a/qw/source/cl_slist.c
+++ b/qw/source/cl_slist.c
@@ -68,9 +68,9 @@
 #include "QF/va.h"
 
 #include "qw/bothdefs.h"
-#include "cl_main.h"
-#include "cl_slist.h"
-#include "client.h"
+#include "qw/include/cl_main.h"
+#include "qw/include/cl_slist.h"
+#include "qw/include/client.h"
 
 typedef struct server_entry_s {
 	char *server;
diff --git a/qw/source/cl_sys_sdl.c b/qw/source/cl_sys_sdl.c
index 3a5f1385b..c3b620ca8 100644
--- a/qw/source/cl_sys_sdl.c
+++ b/qw/source/cl_sys_sdl.c
@@ -56,9 +56,10 @@
 #include "QF/qargs.h"
 #include "QF/sys.h"
 
-#include "host.h"
 #include "netchan.h"
 
+#include "qw/include/host.h"
+
 #ifdef _WIN32
 # include "winquake.h"
 #endif
diff --git a/qw/source/cl_sys_unix.c b/qw/source/cl_sys_unix.c
index 4c7071ba2..d0ef58225 100644
--- a/qw/source/cl_sys_unix.c
+++ b/qw/source/cl_sys_unix.c
@@ -48,9 +48,10 @@
 #include "QF/qargs.h"
 #include "QF/sys.h"
 
-#include "host.h"
 #include "netchan.h"
 
+#include "qw/include/host.h"
+
 static void
 shutdown_f (void *data)
 {
diff --git a/qw/source/cl_sys_win.c b/qw/source/cl_sys_win.c
index 388166e7a..6fe2fbe06 100644
--- a/qw/source/cl_sys_win.c
+++ b/qw/source/cl_sys_win.c
@@ -34,8 +34,8 @@
 #include "QF/screen.h"
 #include "QF/sys.h"
 
-#include "client.h"
-#include "host.h"
+#include "qw/include/client.h"
+#include "qw/include/host.h"
 
 #define MAXIMUM_WIN_MEMORY	0x1000000
 #define MINIMUM_WIN_MEMORY	0x0c00000
diff --git a/qw/source/cl_tent.c b/qw/source/cl_tent.c
index 43e5930d0..950734bea 100644
--- a/qw/source/cl_tent.c
+++ b/qw/source/cl_tent.c
@@ -44,13 +44,14 @@
 #include "QF/sound.h"
 #include "QF/sys.h"
 
-#include "cl_ents.h"
-#include "cl_main.h"
-#include "cl_parse.h"
-#include "cl_tent.h"
-#include "client.h"
 #include "compat.h"
 
+#include "qw/include/cl_ents.h"
+#include "qw/include/cl_main.h"
+#include "qw/include/cl_parse.h"
+#include "qw/include/cl_tent.h"
+#include "qw/include/client.h"
+
 typedef struct tent_s {
 	struct tent_s *next;
 	entity_t    ent;
diff --git a/qw/source/cl_view.c b/qw/source/cl_view.c
index 09633388b..4ad5da14f 100644
--- a/qw/source/cl_view.c
+++ b/qw/source/cl_view.c
@@ -33,16 +33,18 @@
 #include "QF/msg.h"
 #include "QF/screen.h"
 
-#include "qw/bothdefs.h"
-#include "chase.h"
-#include "cl_cam.h"
-#include "cl_ents.h"
-#include "cl_main.h"
-#include "client.h"
 #include "compat.h"
-#include "host.h"
 #include "clview.h"
 
+#include "qw/bothdefs.h"
+
+#include "qw/include/chase.h"
+#include "qw/include/cl_cam.h"
+#include "qw/include/cl_ents.h"
+#include "qw/include/cl_main.h"
+#include "qw/include/client.h"
+#include "qw/include/host.h"
+
 /*
 	The view is allowed to move slightly from it's true position for bobbing,
 	but if it exceeds 8 pixels linear distance (spherical, not box), the list
diff --git a/qw/source/crudefile.c b/qw/source/crudefile.c
index 58426ad4d..3050a6efc 100644
--- a/qw/source/crudefile.c
+++ b/qw/source/crudefile.c
@@ -50,7 +50,8 @@
 #include "QF/zone.h"
 
 #include "compat.h"
-#include "crudefile.h"
+
+#include "qw/include/crudefile.h"
 
 int cf_maxsize; // max combined file size (eg quota)
 int cf_cursize; // current combined file size
diff --git a/qw/source/game.c b/qw/source/game.c
index ac69d83ea..df180b306 100644
--- a/qw/source/game.c
+++ b/qw/source/game.c
@@ -43,8 +43,8 @@
 #include "QF/quakefs.h"
 #include "QF/sys.h"
 
-#include "game.h"
-#include "server.h"
+#include "qw/include/game.h"
+#include "qw/include/server.h"
 
 cvar_t     *registered;
 int         static_registered = 1;		// only for startup check, then set
diff --git a/qw/source/locs.c b/qw/source/locs.c
index 2f94da0f8..c30080dd7 100644
--- a/qw/source/locs.c
+++ b/qw/source/locs.c
@@ -47,9 +47,10 @@
 #include "QF/sys.h"
 #include "QF/va.h"
 
-#include "client.h"
 #include "compat.h"
 
+#include "qw/include/client.h"
+
 #define LOCATION_BLOCK	128				// 128 locations per block.
 
 location_t **locations = NULL;
diff --git a/qw/source/map_cfg.c b/qw/source/map_cfg.c
index 10b4a5cd5..296bad56b 100644
--- a/qw/source/map_cfg.c
+++ b/qw/source/map_cfg.c
@@ -44,7 +44,7 @@
 #include "QF/idparse.h"
 #include "QF/quakefs.h"
 
-#include "map_cfg.h"
+#include "qw/include/map_cfg.h"
 
 void
 map_cfg (const char *mapname, int all)
diff --git a/qw/source/net_packetlog.c b/qw/source/net_packetlog.c
index 189c6fefe..3d2c58dc8 100644
--- a/qw/source/net_packetlog.c
+++ b/qw/source/net_packetlog.c
@@ -54,9 +54,10 @@
 #include "QF/va.h"
 
 #include "compat.h"
+
 #include "netchan.h"
 #include "qw/protocol.h"
-#include "server.h"
+#include "qw/include/server.h"
 
 cvar_t     *net_packetlog;
 cvar_t     *net_loglevel;
diff --git a/qw/source/pmove.c b/qw/source/pmove.c
index 31702c2f3..637528afa 100644
--- a/qw/source/pmove.c
+++ b/qw/source/pmove.c
@@ -34,8 +34,9 @@
 #include "QF/qtypes.h"
 #include "QF/sys.h"
 
-#include "client.h"
 #include "compat.h"
+
+#include "qw/include/client.h"
 #include "qw/pmove.h"
 
 cvar_t     *no_pogo_stick;
diff --git a/qw/source/pmovetst.c b/qw/source/pmovetst.c
index da23aef9d..6b3857feb 100644
--- a/qw/source/pmovetst.c
+++ b/qw/source/pmovetst.c
@@ -41,6 +41,7 @@
 #include "QF/sys.h"
 
 #include "compat.h"
+
 #include "qw/pmove.h"
 #include "world.h"
 
diff --git a/qw/source/sbar.c b/qw/source/sbar.c
index 34490e43e..3a6e97778 100644
--- a/qw/source/sbar.c
+++ b/qw/source/sbar.c
@@ -54,11 +54,12 @@
 
 #include "QF/plugin/console.h"
 
-#include "qw/bothdefs.h"
-#include "cl_cam.h"
-#include "cl_parse.h"
-#include "client.h"
 #include "compat.h"
+
+#include "qw/bothdefs.h"
+#include "qw/include/cl_cam.h"
+#include "qw/include/cl_parse.h"
+#include "qw/include/client.h"
 #include "sbar.h"
 
 int         sb_updates;				// if >= vid.numpages, no update needed
diff --git a/qw/source/sv_ccmds.c b/qw/source/sv_ccmds.c
index 93c5247f6..aef14bea6 100644
--- a/qw/source/sv_ccmds.c
+++ b/qw/source/sv_ccmds.c
@@ -49,13 +49,14 @@
 #include "QF/sys.h"
 #include "QF/va.h"
 
-#include "qw/bothdefs.h"
 #include "compat.h"
-#include "server.h"
-#include "sv_demo.h"
-#include "sv_progs.h"
-#include "sv_qtv.h"
-#include "sv_recorder.h"
+
+#include "qw/bothdefs.h"
+#include "qw/include/server.h"
+#include "qw/include/sv_demo.h"
+#include "qw/include/sv_progs.h"
+#include "qw/include/sv_qtv.h"
+#include "qw/include/sv_recorder.h"
 
 qboolean    sv_allow_cheats;
 
diff --git a/qw/source/sv_demo.c b/qw/source/sv_demo.c
index 65b6d397c..cc53372a8 100644
--- a/qw/source/sv_demo.c
+++ b/qw/source/sv_demo.c
@@ -47,11 +47,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "QF/va.h"
 
 #include "compat.h"
+
 #include "qw/pmove.h"
-#include "server.h"
-#include "sv_demo.h"
-#include "sv_progs.h"
-#include "sv_recorder.h"
+#include "qw/include/server.h"
+#include "qw/include/sv_demo.h"
+#include "qw/include/sv_progs.h"
+#include "qw/include/sv_recorder.h"
 
 static QFile   *demo_file;
 static byte    *demo_mfile;
diff --git a/qw/source/sv_ents.c b/qw/source/sv_ents.c
index f6682337c..09e19ba83 100644
--- a/qw/source/sv_ents.c
+++ b/qw/source/sv_ents.c
@@ -39,11 +39,12 @@
 #include "QF/msg.h"
 #include "QF/sys.h"
 
+#include "compat.h"
+
 #include "qw/msg_ucmd.h"
 
-#include "compat.h"
-#include "server.h"
-#include "sv_progs.h"
+#include "qw/include/server.h"
+#include "qw/include/sv_progs.h"
 
 
 /*
diff --git a/qw/source/sv_gib.c b/qw/source/sv_gib.c
index 7600805d2..3e4d5421c 100644
--- a/qw/source/sv_gib.c
+++ b/qw/source/sv_gib.c
@@ -39,8 +39,8 @@
 #include "QF/info.h"
 #include "QF/gib.h"
 
-#include "server.h"
-#include "client.h"
+#include "qw/include/server.h"
+#include "qw/include/client.h"
 
 gib_event_t *sv_chat_e;
 gib_event_t *sv_client_connect_e;
diff --git a/qw/source/sv_init.c b/qw/source/sv_init.c
index 7d8c894d1..d5b6d0d2c 100644
--- a/qw/source/sv_init.c
+++ b/qw/source/sv_init.c
@@ -44,12 +44,13 @@
 #include "QF/va.h"
 
 #include "compat.h"
-#include "crudefile.h"
-#include "map_cfg.h"
+
+#include "qw/include/crudefile.h"
+#include "qw/include/map_cfg.h"
 #include "qw/pmove.h"
-#include "server.h"
-#include "sv_progs.h"
-#include "sv_gib.h"
+#include "qw/include/server.h"
+#include "qw/include/sv_progs.h"
+#include "qw/include/sv_gib.h"
 #include "world.h"
 
 info_t     *localinfo;	// local game info
diff --git a/qw/source/sv_main.c b/qw/source/sv_main.c
index 56d135e16..81d605e37 100644
--- a/qw/source/sv_main.c
+++ b/qw/source/sv_main.c
@@ -77,19 +77,20 @@
 
 #include "QF/plugin/console.h"
 
-#include "qw/bothdefs.h"
 #include "buildnum.h"
 #include "compat.h"
-#include "crudefile.h"
-#include "game.h"
 #include "netchan.h"
+
+#include "qw/bothdefs.h"
+#include "qw/include/crudefile.h"
+#include "qw/include/game.h"
 #include "qw/pmove.h"
-#include "server.h"
-#include "sv_demo.h"
-#include "sv_progs.h"
-#include "sv_gib.h"
-#include "sv_qtv.h"
-#include "sv_recorder.h"
+#include "qw/include/server.h"
+#include "qw/include/sv_demo.h"
+#include "qw/include/sv_progs.h"
+#include "qw/include/sv_gib.h"
+#include "qw/include/sv_qtv.h"
+#include "qw/include/sv_recorder.h"
 
 SERVER_PLUGIN_PROTOS
 static plugin_list_t server_plugin_list[] = {
diff --git a/qw/source/sv_move.c b/qw/source/sv_move.c
index 013e4d48e..75b4f8e01 100644
--- a/qw/source/sv_move.c
+++ b/qw/source/sv_move.c
@@ -28,8 +28,8 @@
 # include "config.h"
 #endif
 
-#include "server.h"
-#include "sv_progs.h"
+#include "qw/include/server.h"
+#include "qw/include/sv_progs.h"
 #include "world.h"
 
 #define	STEPSIZE	18
diff --git a/qw/source/sv_phys.c b/qw/source/sv_phys.c
index e2d08e814..9c627f9e9 100644
--- a/qw/source/sv_phys.c
+++ b/qw/source/sv_phys.c
@@ -31,8 +31,8 @@
 #include "QF/cvar.h"
 #include "QF/sys.h"
 
-#include "server.h"
-#include "sv_progs.h"
+#include "qw/include/server.h"
+#include "qw/include/sv_progs.h"
 #include "world.h"
 
 /*
diff --git a/qw/source/sv_pr_cmds.c b/qw/source/sv_pr_cmds.c
index 46a9cc4e3..49f0cc332 100644
--- a/qw/source/sv_pr_cmds.c
+++ b/qw/source/sv_pr_cmds.c
@@ -46,11 +46,12 @@
 #include "QF/va.h"
 
 #include "compat.h"
-#include "crudefile.h"
-#include "server.h"
-#include "sv_gib.h"
-#include "sv_progs.h"
-#include "sv_recorder.h"
+
+#include "qw/include/crudefile.h"
+#include "qw/include/server.h"
+#include "qw/include/sv_gib.h"
+#include "qw/include/sv_progs.h"
+#include "qw/include/sv_recorder.h"
 #include "world.h"
 
 /* BUILT-IN FUNCTIONS */
diff --git a/qw/source/sv_pr_cpqw.c b/qw/source/sv_pr_cpqw.c
index 4263cc097..e2ac3ffd2 100644
--- a/qw/source/sv_pr_cpqw.c
+++ b/qw/source/sv_pr_cpqw.c
@@ -39,9 +39,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "QF/quakefs.h"
 #include "QF/sys.h"
 
-#include "server.h"
-#include "sv_pr_cpqw.h"
-#include "sv_progs.h"
+#include "qw/include/server.h"
+#include "qw/include/sv_pr_cpqw.h"
+#include "qw/include/sv_progs.h"
 #include "world.h"
 
 static struct {
diff --git a/qw/source/sv_pr_qwe.c b/qw/source/sv_pr_qwe.c
index 9a84892cf..010c8a5a6 100644
--- a/qw/source/sv_pr_qwe.c
+++ b/qw/source/sv_pr_qwe.c
@@ -50,10 +50,10 @@
 #include "QF/sys.h"
 #include "QF/va.h"
 
-#include "server.h"
-#include "sv_pr_qwe.h"
-#include "sv_progs.h"
-#include "sv_recorder.h"
+#include "qw/include/server.h"
+#include "qw/include/sv_pr_qwe.h"
+#include "qw/include/sv_progs.h"
+#include "qw/include/sv_recorder.h"
 
 typedef struct {
 	func_t      timeofday;
diff --git a/qw/source/sv_progs.c b/qw/source/sv_progs.c
index 2c4ff5c3f..276ee2875 100644
--- a/qw/source/sv_progs.c
+++ b/qw/source/sv_progs.c
@@ -42,10 +42,11 @@
 #include "QF/sys.h"
 
 #include "compat.h"
-#include "server.h"
-#include "sv_progs.h"
-#include "sv_pr_cpqw.h"
-#include "sv_pr_qwe.h"
+
+#include "qw/include/server.h"
+#include "qw/include/sv_progs.h"
+#include "qw/include/sv_pr_cpqw.h"
+#include "qw/include/sv_pr_qwe.h"
 #include "world.h"
 
 progs_t     sv_pr_state;
diff --git a/qw/source/sv_qtv.c b/qw/source/sv_qtv.c
index a36b1c3cc..6804a51e3 100644
--- a/qw/source/sv_qtv.c
+++ b/qw/source/sv_qtv.c
@@ -48,9 +48,10 @@
 #include "QF/va.h"
 
 #include "compat.h"
-#include "server.h"
-#include "sv_qtv.h"
-#include "sv_recorder.h"
+
+#include "qw/include/server.h"
+#include "qw/include/sv_qtv.h"
+#include "qw/include/sv_recorder.h"
 
 typedef struct {
 	netchan_t   netchan;
diff --git a/qw/source/sv_recorder.c b/qw/source/sv_recorder.c
index 562fd94d3..d2555862e 100644
--- a/qw/source/sv_recorder.c
+++ b/qw/source/sv_recorder.c
@@ -49,10 +49,10 @@
 #include "QF/sys.h"
 
 #include "qw/bothdefs.h"
-#include "server.h"
-#include "sv_demo.h"
-#include "sv_progs.h"
-#include "sv_recorder.h"
+#include "qw/include/server.h"
+#include "qw/include/sv_demo.h"
+#include "qw/include/sv_progs.h"
+#include "qw/include/sv_recorder.h"
 
 typedef struct dbuffer_s {
 	byte       *data;
diff --git a/qw/source/sv_sbar.c b/qw/source/sv_sbar.c
index a76729789..012a38835 100644
--- a/qw/source/sv_sbar.c
+++ b/qw/source/sv_sbar.c
@@ -37,9 +37,10 @@
 
 #include "QF/plugin/console.h"
 
-#include "server.h"
 #include "sv_console.h"
-#include "sv_recorder.h"
+
+#include "qw/include/server.h"
+#include "qw/include/sv_recorder.h"
 
 static void
 draw_cpu (view_t *view)
diff --git a/qw/source/sv_send.c b/qw/source/sv_send.c
index 54e53d347..400b9484e 100644
--- a/qw/source/sv_send.c
+++ b/qw/source/sv_send.c
@@ -46,11 +46,12 @@
 #include "QF/sound.h" // FIXME: DEFAULT_SOUND_PACKET_*
 #include "QF/sys.h"
 
-#include "qw/bothdefs.h"
 #include "compat.h"
-#include "server.h"
-#include "sv_progs.h"
-#include "sv_recorder.h"
+
+#include "qw/bothdefs.h"
+#include "qw/include/server.h"
+#include "qw/include/sv_progs.h"
+#include "qw/include/sv_recorder.h"
 
 #define CHAN_AUTO   0
 #define CHAN_WEAPON 1
diff --git a/qw/source/sv_sys_unix.c b/qw/source/sv_sys_unix.c
index 24b3adb4b..cb7aabbdd 100644
--- a/qw/source/sv_sys_unix.c
+++ b/qw/source/sv_sys_unix.c
@@ -43,7 +43,7 @@
 #include "QF/qargs.h"
 #include "QF/sys.h"
 
-#include "server.h"
+#include "qw/include/server.h"
 
 #ifdef NeXT
 # include <libc.h>
diff --git a/qw/source/sv_sys_win.c b/qw/source/sv_sys_win.c
index 52f3b230a..20fbdfb4e 100644
--- a/qw/source/sv_sys_win.c
+++ b/qw/source/sv_sys_win.c
@@ -36,7 +36,7 @@
 #include "QF/qargs.h"
 #include "QF/sys.h"
 
-#include "server.h"
+#include "qw/include/server.h"
 
 qboolean    WinNT;
 server_static_t svs;
diff --git a/qw/source/sv_user.c b/qw/source/sv_user.c
index b8aa5e8d4..f9c44f48f 100644
--- a/qw/source/sv_user.c
+++ b/qw/source/sv_user.c
@@ -53,16 +53,17 @@
 #include "QF/sys.h"
 #include "QF/va.h"
 
+#include "compat.h"
+
 #include "qw/msg_ucmd.h"
 #include "qw/msg_ucmd.h"
 
 #include "qw/bothdefs.h"
-#include "compat.h"
 #include "qw/pmove.h"
-#include "server.h"
-#include "sv_gib.h"
-#include "sv_progs.h"
-#include "sv_recorder.h"
+#include "qw/include/server.h"
+#include "qw/include/sv_gib.h"
+#include "qw/include/sv_progs.h"
+#include "qw/include/sv_recorder.h"
 #include "world.h"
 
 typedef struct ucmd_s {
diff --git a/qw/source/teamplay.c b/qw/source/teamplay.c
index 5da9dace2..c5df33cd3 100644
--- a/qw/source/teamplay.c
+++ b/qw/source/teamplay.c
@@ -50,11 +50,12 @@
 #include "QF/sys.h"
 #include "QF/teamplay.h"
 
-#include "qw/bothdefs.h"
-#include "cl_input.h"
-#include "client.h"
 #include "compat.h"
 
+#include "qw/bothdefs.h"
+#include "qw/include/cl_input.h"
+#include "qw/include/client.h"
+
 static qboolean died = false, recorded_location = false;
 static vec3_t   death_location, last_recorded_location;
 
diff --git a/qw/source/world.c b/qw/source/world.c
index 0664c197e..bbf4d930e 100644
--- a/qw/source/world.c
+++ b/qw/source/world.c
@@ -43,8 +43,9 @@
 #include "QF/sys.h"
 
 #include "compat.h"
-#include "server.h"
-#include "sv_progs.h"
+
+#include "qw/include/server.h"
+#include "qw/include/sv_progs.h"
 #include "world.h"
 
 #define always_inline inline __attribute__((__always_inline__))
diff --git a/ruamoko/Makefile.am b/ruamoko/Makefile.am
deleted file mode 100644
index b899690f8..000000000
--- a/ruamoko/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-SUBDIRS= include lib game gui cl_menu scheme @ruamoko_dirs@
-DIST_SUBDIRS=qwaq
-
-doc: Doxyfile
-	doxygen
-
-clean-local:
-	-rm -fr doxygen
diff --git a/ruamoko/Makemodule.am b/ruamoko/Makemodule.am
new file mode 100644
index 000000000..202fbffb6
--- /dev/null
+++ b/ruamoko/Makemodule.am
@@ -0,0 +1,10 @@
+ruamoko_libdir = $(datarootdir)/qfcc/lib
+ruamoko_lib_LIBRARIES =
+
+include ruamoko/include/Makemodule.am
+include ruamoko/lib/Makemodule.am
+include ruamoko/game/Makemodule.am
+include ruamoko/gui/Makemodule.am
+include ruamoko/cl_menu/Makemodule.am
+include ruamoko/scheme/Makemodule.am
+include ruamoko/qwaq/Makemodule.am
diff --git a/ruamoko/cl_menu/Makefile.am b/ruamoko/cl_menu/Makefile.am
deleted file mode 100644
index 8c759d410..000000000
--- a/ruamoko/cl_menu/Makefile.am
+++ /dev/null
@@ -1,71 +0,0 @@
-## Process this file with automake to produce Makefile.in
-AUTOMAKE_OPTIONS= foreign no-exeext
-
-QFCC_DEP=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT)
-QFCC=$(QFCC_DEP)
-
-GZ=@progs_gz@
-menu_libexec=menu.dat
-menu_data=menu.plist menu.sym
-
-pkglibexecdir=@sharepath@/QF
-pkgdatadir=@sharepath@/QF
-
-pkgdata_DATA= $(menu_data)
-pkglibexec_PROGRAMS= $(menu_libexec)
-EXTRA_PROGRAMS= $(menu_libexec)
-
-QCFLAGS=-qq -O -g -Wall -Werror -Wno-integer-divide
-QCPPFLAGS=--no-default-paths -I$(top_srcdir)/ruamoko/include -I$(top_srcdir)/include
-QCLINKFLAGS=--no-default-paths -L$(top_builddir)/ruamoko/lib
-QCOMPILE=$(QFCC) $(QCFLAGS) $(QCPPFLAGS)
-QLINK=$(QFCC) $(QCFLAGS) $(QCLINKFLAGS)
-
-MKDIR_P = @MKDIR_P@
-am__mv = mv -f
-
-GZIP=if echo $@ | grep -q .gz; then gzip -f `basename $@ .gz`; if test -f `basename $@ .dat.gz`.sym; then gzip -f `basename $@ .dat.gz`.sym; fi; fi
-# BSD make can't handle $(shell foo) directives, and GNU make can't handle |=
-# so we have to bite the bullet and pass this to the shell every time.
-
-SUFFIXES=.o .r
-.r.o:
-	$(QCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tqo -c -o $@ $<
-	@sed -i -e '1s@:@: $(QFCC_DEP)@' $(DEPDIR)/$*.Tqo
-	@$(am__mv) $(DEPDIR)/$*.Tqo $(DEPDIR)/$*.Qo
-
-menu_src= \
-	client_menu.r controls_o.r options.r options_util.r servlist.r \
-	Frame.r HUD.r menu.r plistmenu.r \
-	\
-	CrosshairCvar.r CrosshairView.r CvarColor.r CvarColorView.r \
-	CvarObject.r CvarRange.r CvarRangeView.r CvarString.r CvarStringView.r \
-	CvarToggle.r CvarToggleView.r \
-	MenuGroup.r MouseToggle.r ProxyView.r RunToggle.r SubMenu.r
-
-r_depfiles_remade=
-
-menu_dat_SOURCES=$(menu_src)
-menu_obj=$(menu_src:.r=.o)
-menu_dep=$(addprefix ./$(DEPDIR)/,$(menu_obj:.o=.Qo))
-menu.dat: $(menu_obj) $(QFCC_DEP) ../lib/libcsqc.a ../lib/libr.a ../gui/libgui.a
-	$(QLINK) -o menu.dat $(menu_obj) ../gui/libgui.a ../lib/libcsqc.a ../lib/libr.a
-include $(menu_dep) # am--include-marker
-r_depfiles_remade += $(menu_dep)
-
-menu.sym: menu.dat
-
-$(r_depfiles_remade):
-	$(MKDIR_P) $(@D)
-	echo '# dummy' >$@-t && $(am__mv) $@-t $@
-
-am--depfiles: $(am__depfiles_remade) $(r_depfiles_remade)
-
-EXTRA_DIST= $(menu_src) \
-	CrosshairCvar.h CrosshairView.h CvarColor.h CvarColorView.h CvarObject.h \
-	CvarRange.h CvarRangeView.h CvarString.h CvarStringView.h \
-	CvarToggle.h CvarToggleView.h Frame.h HUD.h \
-	MenuGroup.h MouseToggle.h ProxyView.h RunToggle.h SubMenu.h client_menu.h \
-	controls_o.h menu.h options.h options_util.h plistmenu.h servlist.h \
-	menu.plist
-CLEANFILES= *.dat *.sym *.gz *.qfo *.o
diff --git a/ruamoko/cl_menu/Makemodule.am b/ruamoko/cl_menu/Makemodule.am
new file mode 100644
index 000000000..dfa7635ba
--- /dev/null
+++ b/ruamoko/cl_menu/Makemodule.am
@@ -0,0 +1,77 @@
+ruamoko_cl_menu_libexec=ruamoko/cl_menu/menu.dat$(EXEEXT)
+ruamoko_cl_menu_data=ruamoko/cl_menu/menu.plist ruamoko/cl_menu/menu.sym
+
+ruamoko_cl_menudir = @sharepath@/QF
+ruamoko_cl_menu_DATA = $(ruamoko_cl_menu_data)
+ruamoko_cl_menu_PROGRAMS = $(ruamoko_cl_menu_libexec)
+EXTRA_PROGRAMS += $(ruamoko_cl_menu_libexec)
+
+ruamoko_menu_src= \
+	ruamoko/cl_menu/client_menu.r \
+	ruamoko/cl_menu/controls_o.r \
+	ruamoko/cl_menu/options.r \
+	ruamoko/cl_menu/options_util.r \
+	ruamoko/cl_menu/servlist.r \
+	ruamoko/cl_menu/Frame.r \
+	ruamoko/cl_menu/HUD.r \
+	ruamoko/cl_menu/menu.r \
+	ruamoko/cl_menu/plistmenu.r \
+	ruamoko/cl_menu/CrosshairCvar.r \
+	ruamoko/cl_menu/CrosshairView.r \
+	ruamoko/cl_menu/CvarColor.r \
+	ruamoko/cl_menu/CvarColorView.r \
+	ruamoko/cl_menu/CvarObject.r \
+	ruamoko/cl_menu/CvarRange.r \
+	ruamoko/cl_menu/CvarRangeView.r \
+	ruamoko/cl_menu/CvarString.r \
+	ruamoko/cl_menu/CvarStringView.r \
+	ruamoko/cl_menu/CvarToggle.r \
+	ruamoko/cl_menu/CvarToggleView.r \
+	ruamoko/cl_menu/MenuGroup.r \
+	ruamoko/cl_menu/MouseToggle.r \
+	ruamoko/cl_menu/ProxyView.r \
+	ruamoko/cl_menu/RunToggle.r \
+	ruamoko/cl_menu/SubMenu.r
+
+ruamoko_cl_menu_menu_dat_SOURCES=$(ruamoko_menu_src)
+ruamoko_menu_obj=$(ruamoko_cl_menu_menu_dat_SOURCES:.r=.o)
+ruamoko_menu_dep=$(call qcautodep,$(ruamoko_cl_menu_menu_dat_SOURCES))
+ruamoko/cl_menu/menu.dat$(EXEEXT): $(ruamoko_menu_obj) $(QFCC_DEP) ruamoko/lib/libcsqc.a ruamoko/lib/libr.a ruamoko/gui/libgui.a
+	$(QLINK) -o $@ $(ruamoko_menu_obj) -Lruamoko/gui -lgui -lcsqc -lr
+include $(ruamoko_menu_dep) # am--include-marker
+r_depfiles_remade += $(ruamoko_menu_dep)
+
+ruamoko/cl_menu/menu.sym: ruamoko/cl_menu/menu.dat
+
+EXTRA_DIST += \
+	ruamoko/cl_menu/CrosshairCvar.h \
+	ruamoko/cl_menu/CrosshairView.h \
+	ruamoko/cl_menu/CvarColor.h \
+	ruamoko/cl_menu/CvarColorView.h \
+	ruamoko/cl_menu/CvarObject.h \
+	ruamoko/cl_menu/CvarRange.h \
+	ruamoko/cl_menu/CvarRangeView.h \
+	ruamoko/cl_menu/CvarString.h \
+	ruamoko/cl_menu/CvarStringView.h \
+	ruamoko/cl_menu/CvarToggle.h \
+	ruamoko/cl_menu/CvarToggleView.h \
+	ruamoko/cl_menu/Frame.h \
+	ruamoko/cl_menu/HUD.h \
+	ruamoko/cl_menu/MenuGroup.h \
+	ruamoko/cl_menu/MouseToggle.h \
+	ruamoko/cl_menu/ProxyView.h \
+	ruamoko/cl_menu/RunToggle.h \
+	ruamoko/cl_menu/SubMenu.h \
+	ruamoko/cl_menu/client_menu.h \
+	ruamoko/cl_menu/controls_o.h \
+	ruamoko/cl_menu/menu.h \
+	ruamoko/cl_menu/options.h \
+	ruamoko/cl_menu/options_util.h \
+	ruamoko/cl_menu/plistmenu.h \
+	ruamoko/cl_menu/servlist.h \
+	ruamoko/cl_menu/menu.plist
+
+CLEANFILES += \
+	ruamoko/cl_menu/*.dat \
+	ruamoko/cl_menu/*.sym
+DISTCLEANFILES += $(ruamoko_menu_dep)
diff --git a/ruamoko/game/Makefile.am b/ruamoko/game/Makefile.am
deleted file mode 100644
index fe9a38f5f..000000000
--- a/ruamoko/game/Makefile.am
+++ /dev/null
@@ -1,56 +0,0 @@
-## Process this file with automake to produce Makefile.in
-AUTOMAKE_OPTIONS= foreign no-exeext
-
-QFCC_DEP=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT)
-QFCC=$(QFCC_DEP)
-
-GZ=@progs_gz@
-game_libexec=game.dat
-
-pkglibexecdir=@sharepath@/QF
-
-# this will eventually go into pkglibexecdir, but for now...
-noinst_PROGRAMS= $(game_libexec)
-EXTRA_PROGRAMS= $(game_libexec)
-
-QCFLAGS=-qq -O -g -Werror -Wall -Wno-integer-divide
-QCPPFLAGS=--no-default-paths -I$(top_srcdir)/ruamoko/include
-QCLINKFLAGS=--no-default-paths -L$(top_builddir)/ruamoko/lib
-QCOMPILE=$(QFCC) $(QCFLAGS) $(QCPPFLAGS)
-QLINK=$(QFCC) $(QCFLAGS) $(QCLINKFLAGS)
-
-MKDIR_P = @MKDIR_P@
-am__mv = mv -f
-
-GZIP=if echo $@ | grep -q .gz; then gzip -f `basename $@ .gz`; if test -f `basename $@ .dat.gz`.sym; then gzip -f `basename $@ .dat.gz`.sym; fi; fi
-# BSD make can't handle $(shell foo) directives, and GNU make can't handle |=
-# so we have to bite the bullet and pass this to the shell every time.
-
-SUFFIXES=.o .r
-.r.o:
-	$(QCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tqo -c -o $@ $<
-	@sed -i -e '1s@:@: $(QFCC_DEP)@' $(DEPDIR)/$*.Tqo
-	@$(am__mv) $(DEPDIR)/$*.Tqo $(DEPDIR)/$*.Qo
-
-game_src= Axe.r GameEntity.r World.r tempent.r
-
-r_depfiles_remade=
-
-game_dat_SOURCES=$(game_src)
-game_obj=$(game_src:.r=.o)
-game_dep=$(addprefix ./$(DEPDIR)/,$(game_obj:.o=.Qo))
-game.dat: $(game_obj) $(QFCC_DEP) ../lib/libr.a ../lib/libqw.a
-	$(QLINK) -o game.dat $(game_obj) ../lib/libr.a ../lib/libqw.a ../lib/libr.a
-include $(game_dep) # am--include-marker
-r_depfiles_remade += $(game_dep)
-
-game.sym: game.dat
-
-$(r_depfiles_remade):
-	$(MKDIR_P) $(@D)
-	echo '# dummy' >$@-t && $(am__mv) $@-t $@
-
-am--depfiles: $(am__depfiles_remade) $(r_depfiles_remade)
-
-EXTRA_DIST= $(game_src) Axe.h GameEntity.h tempent.h Weapon.h World.h
-CLEANFILES= *.dat *.sym *.gz *.o *.qfo
diff --git a/ruamoko/game/Makemodule.am b/ruamoko/game/Makemodule.am
new file mode 100644
index 000000000..4063e9a62
--- /dev/null
+++ b/ruamoko/game/Makemodule.am
@@ -0,0 +1,27 @@
+ruamoko_game_libexec=ruamoko/game/game.dat$(EXEEXT)
+
+noinst_PROGRAMS += $(ruamoko_game_libexec)
+EXTRA_PROGRAMS += $(ruamoko_game_libexec)
+
+ruamoko_game_src= ruamoko/game/Axe.r ruamoko/game/GameEntity.r ruamoko/game/World.r ruamoko/game/tempent.r
+
+ruamoko_game_game_dat_SOURCES=$(ruamoko_game_src)
+ruamoko_game_obj=$(ruamoko_game_game_dat_SOURCES:.r=.o)
+ruamoko_game_dep=$(call qcautodep,$(ruamoko_game_game_dat_SOURCES))
+ruamoko/game/game.dat$(EXEEXT): $(ruamoko_game_obj) $(QFCC_DEP) ruamoko/lib/libr.a ruamoko/lib/libqw.a
+	$(QLINK) -o $@ $(ruamoko_game_obj) -lqw -lr
+include $(ruamoko_game_dep) # am--include-marker
+r_depfiles_remade += $(ruamoko_game_dep)
+
+ruamoko/game/game.sym: ruamoko/game/game.dat
+
+EXTRA_DIST += $(ruamoko_game_src) \
+	ruamoko/game/Axe.h \
+	ruamoko/game/GameEntity.h \
+	ruamoko/game/tempent.h \
+	ruamoko/game/Weapon.h \
+	ruamoko/game/World.h
+CLEANFILES += \
+	ruamoko/game/*.dat \
+	ruamoko/game/*.sym
+DISTCLEANFILES += $(ruamoko_game_dep)
diff --git a/ruamoko/gui/Makefile.am b/ruamoko/gui/Makefile.am
deleted file mode 100644
index 0edd447d4..000000000
--- a/ruamoko/gui/Makefile.am
+++ /dev/null
@@ -1,50 +0,0 @@
-AUTOMAKE_OPTIONS=	foreign
-
-QFCC_DEP=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT)
-QFCC=$(QFCC_DEP)
-
-gui_libs=libgui.a
-libs=$(gui_libs)
-
-pkglibdir=$(datarootdir)/qfcc/lib
-
-pkglib_LIBRARIES= $(libs)
-EXTRA_LIBRARIES= $(gui_libs)
-
-QFCC=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT)
-QCFLAGS=-qq -O -g -Werror -Wall -Wno-integer-divide --no-default-paths
-QCPPFLAGS=--no-default-paths -I$(top_srcdir)/ruamoko/include
-QCLINKFLAGS=--no-default-paths -L$(top_builddir)/ruamoko/lib
-QCOMPILE=$(QFCC) $(QCFLAGS) $(QCPPFLAGS)
-QLINK=$(QFCC) $(QCFLAGS) $(QCLINKFLAGS)
-
-MKDIR_P = @MKDIR_P@
-am__mv = mv -f
-
-PAK=$(top_builddir)/tools/pak/pak$(EXEEXT)
-RANLIB=touch
-
-SUFFIXES= .o .r
-.r.o:
-	$(QCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tqo -c -o $@ $<
-	@sed -i -e '1s@:@: $(QFCC_DEP)@' $(DEPDIR)/$*.Tqo
-	@$(am__mv) $(DEPDIR)/$*.Tqo $(DEPDIR)/$*.Qo
-
-r_depfiles_remade=
-
-libgui_a_SOURCES= \
-	Group.r InputLine.r Pic.r Point.r Rect.r Size.r Slider.r Text.r View.r
-libgui_a_obj=$(libgui_a_SOURCES:.r=.o)
-libgui_a_dep=$(addprefix ./$(DEPDIR)/,$(libgui_a_obj:.o=.Qo))
-libgui_a_AR=	$(PAK) -cf
-include $(libgui_a_dep) # am--include-marker
-r_depfiles_remade += $(libgui_a_dep)
-
-$(r_depfiles_remade):
-	$(MKDIR_P) $(@D)
-	echo '# dummy' >$@-t && $(am__mv) $@-t $@
-
-am--depfiles: $(am__depfiles_remade) $(r_depfiles_remade)
-
-
-CLEANFILES=	*.qfo *.o
diff --git a/ruamoko/gui/Makemodule.am b/ruamoko/gui/Makemodule.am
new file mode 100644
index 000000000..ee25d5111
--- /dev/null
+++ b/ruamoko/gui/Makemodule.am
@@ -0,0 +1,25 @@
+ruamoko_gui_gui_libs=ruamoko/gui/libgui.a
+
+ruamoko_lib_LIBRARIES += $(ruamoko_gui_gui_libs)
+EXTRA_LIBRARIES += $(ruamoko_gui_gui_libs)
+
+ruamoko_gui_libgui_a_SOURCES= \
+	ruamoko/gui/Group.r \
+	ruamoko/gui/InputLine.r \
+	ruamoko/gui/Pic.r \
+	ruamoko/gui/Point.r \
+	ruamoko/gui/Rect.r \
+	ruamoko/gui/Size.r \
+	ruamoko/gui/Slider.r \
+	ruamoko/gui/Text.r \
+	ruamoko/gui/View.r
+ruamoko_gui_libgui_a_dep=$(call qcautodep,$(ruamoko_gui_libgui_a_SOURCES))
+ruamoko_gui_libgui_a_AR=	$(PAK) -cf
+EXTRA_ruamoko_gui_libgui_a_DEPENDENCIES=pak
+include $(ruamoko_gui_libgui_a_dep) # am--include-marker
+r_depfiles_remade += $(ruamoko_gui_libgui_a_dep)
+
+CLEANFILES += \
+	ruamoko/gui/*.dat \
+	ruamoko/gui/*.sym
+DISTCLEANFILES += $(ruamoko_gui_libgui_a_dep)
diff --git a/ruamoko/include/Makefile.am b/ruamoko/include/Makefile.am
deleted file mode 100644
index 0964419bf..000000000
--- a/ruamoko/include/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-AUTOMAKE_OPTIONS=	foreign
-pkgincludedir=	$(datarootdir)/qfcc/include
-nobase_pkginclude_HEADERS= \
-	crudefile.h debug.h entities.h infokey.h math.h message.h nq_message.h \
-	physics.h msgbuf.h qfile.h qfs.h qw_message.h qw_physics.h qw_sys.h \
-	server.h sound.h script.h string.h sv_sound.h system.h types.h \
-	legacy_string.h \
-	\
-	draw.h key.h \
-	\
-	cbuf.h cmd.h cvar.h gib.h hash.h plist.h runtime.h \
-	Object.h Protocol.h \
-	AutoreleasePool.h Array.h Entity.h PropertyList.h Set.h \
-	\
-	gui/Group.h gui/InputLine.h gui/Pic.h gui/Point.h gui/Rect.h gui/Size.h \
-	gui/Slider.h gui/Text.h gui/View.h
diff --git a/ruamoko/include/Makemodule.am b/ruamoko/include/Makemodule.am
new file mode 100644
index 000000000..d53289e72
--- /dev/null
+++ b/ruamoko/include/Makemodule.am
@@ -0,0 +1,56 @@
+ruamoko_include = \
+	ruamoko/include/crudefile.h \
+	ruamoko/include/debug.h \
+	ruamoko/include/entities.h \
+	ruamoko/include/infokey.h \
+	ruamoko/include/math.h \
+	ruamoko/include/message.h \
+	ruamoko/include/nq_message.h \
+	ruamoko/include/physics.h \
+	ruamoko/include/msgbuf.h \
+	ruamoko/include/qfile.h \
+	ruamoko/include/qfs.h \
+	ruamoko/include/qw_message.h \
+	ruamoko/include/qw_physics.h \
+	ruamoko/include/qw_sys.h \
+	ruamoko/include/server.h \
+	ruamoko/include/sound.h \
+	ruamoko/include/script.h \
+	ruamoko/include/string.h \
+	ruamoko/include/sv_sound.h \
+	ruamoko/include/system.h \
+	ruamoko/include/types.h \
+	ruamoko/include/legacy_string.h \
+	ruamoko/include/draw.h \
+	ruamoko/include/key.h \
+	ruamoko/include/cbuf.h \
+	ruamoko/include/cmd.h \
+	ruamoko/include/cvar.h \
+	ruamoko/include/gib.h \
+	ruamoko/include/hash.h \
+	ruamoko/include/plist.h \
+	ruamoko/include/runtime.h \
+	ruamoko/include/Object.h \
+	ruamoko/include/Protocol.h \
+	ruamoko/include/AutoreleasePool.h \
+	ruamoko/include/Array.h \
+	ruamoko/include/Entity.h \
+	ruamoko/include/PropertyList.h \
+	ruamoko/include/Set.h
+
+ruamoko_gui_include = \
+	ruamoko/include/gui/Group.h \
+	ruamoko/include/gui/InputLine.h \
+	ruamoko/include/gui/Pic.h \
+	ruamoko/include/gui/Point.h \
+	ruamoko/include/gui/Rect.h \
+	ruamoko/include/gui/Size.h \
+	ruamoko/include/gui/Slider.h \
+	ruamoko/include/gui/Text.h \
+	ruamoko/include/gui/View.h
+
+ruamoko_includedir = $(datarootdir)/qfcc/include
+ruamoko_gui_includedir = $(datarootdir)/qfcc/include/gui
+
+ruamoko_include_HEADERS = $(ruamoko_include)
+ruamoko_gui_include_HEADERS = $(ruamoko_gui_include)
diff --git a/ruamoko/lib/Makefile.am b/ruamoko/lib/Makefile.am
deleted file mode 100644
index b05db7299..000000000
--- a/ruamoko/lib/Makefile.am
+++ /dev/null
@@ -1,96 +0,0 @@
-AUTOMAKE_OPTIONS=	foreign
-
-QFCC_DEP=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT)
-QFCC=$(QFCC_DEP)
-
-ruamoko_libs=libr.a libqw.a libnq.a libcsqc.a
-libs=$(ruamoko_libs)
-
-pkglibdir=$(datarootdir)/qfcc/lib
-
-pkglib_LIBRARIES= $(libs)
-EXTRA_LIBRARIES= $(ruamoko_libs)
-
-noinst_HEADERS= \
-	Array+Private.h
-
-QCFLAGS=-qq -O -g -Wall -Wno-integer-divide -Werror
-QCPPFLAGS=--no-default-paths -I$(top_srcdir)/ruamoko/include -I$(top_srcdir)/include
-QCLINKFLAGS=--no-default-paths -L$(top_builddir)/ruamoko/lib
-QCOMPILE=$(QFCC) $(QCFLAGS) $(QCPPFLAGS)
-QLINK=$(QFCC) $(QCFLAGS) $(QCLINKFLAGS)
-
-MKDIR_P = @MKDIR_P@
-am__mv = mv -f
-
-PAK=$(top_builddir)/tools/pak/pak$(EXEEXT)
-RANLIB=touch
-
-SUFFIXES= .o .r
-.r.o:
-	$(QCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tqo -c -o $@ $<
-	@sed -i -e '1s@:@: $(QFCC_DEP)@' $(DEPDIR)/$*.Tqo
-	@$(am__mv) $(DEPDIR)/$*.Tqo $(DEPDIR)/$*.Qo
-
-r_depfiles_remade=
-
-libr_a_SOURCES=\
-	cbuf.r cmd.r cvar.r hash.r msgbuf.r plist.r qfile.r qfs.r script.r \
-	sound.r string.r math.r types.r va_list.r \
-	obj_forward.r \
-	Object.r Protocol.r \
-	AutoreleasePool.r Array.r Array+Private.r Entity.r PropertyList.r Set.r
-libr_a_obj=$(libr_a_SOURCES:.r=.o)
-libr_a_dep=$(addprefix ./$(DEPDIR)/,$(libr_a_obj:.o=.Qo))
-libr_a_AR=$(PAK) -cf
-include $(libr_a_dep) # am--include-marker
-r_depfiles_remade += $(libr_a_dep)
-
-common_src=debug.r system.r legacy_string.r
-server_src= \
-	crudefile.r entities.r infokey.r message.r \
-	physics.r server.r sv_sound.r
-libqw_a_src= \
-	qw_message.r qw_physics.r qw_sys.r
-libnq_a_src= \
-	nq_message.r
-libcsqc_a_src= draw.r gib.r key.r
-
-common_obj=$(common_src:.r=.o)
-common_dep=$(addprefix ./$(DEPDIR)/,$(common_obj:.o=.Qo))
-include $(common_dep) # am--include-marker
-r_depfiles_remade += $(common_dep)
-
-server_obj=$(server_src:.r=.o)
-server_dep=$(addprefix ./$(DEPDIR)/,$(server_obj:.o=.Qo))
-include $(server_dep) # am--include-marker
-r_depfiles_remade += $(server_dep)
-
-libqw_a_SOURCES=$(libqw_a_src) $(common_src) $(server_src) math.r
-libqw_a_obj=$(libqw_a_src:.r=.o)
-libqw_a_dep=$(addprefix ./$(DEPDIR)/,$(libqw_a_obj:.o=.Qo))
-libqw_a_AR=$(PAK) -cf
-include $(libqw_a_dep) # am--include-marker
-r_depfiles_remade += $(libqw_a_dep)
-
-libnq_a_SOURCES=$(libnq_a_src) $(common_src) $(server_src) math.r
-libnq_a_obj=$(libnq_a_src:.r=.o)
-libnq_a_dep=$(addprefix ./$(DEPDIR)/,$(libnq_a_obj:.o=.Qo))
-libnq_a_AR=$(PAK) -cf
-include $(libnq_a_dep) # am--include-marker
-r_depfiles_remade += $(libnq_a_dep)
-
-libcsqc_a_SOURCES=$(libcsqc_a_src) $(common_src)
-libcsqc_a_obj=$(libcsqc_a_src:.r=.o)
-libcsqc_a_dep=$(addprefix ./$(DEPDIR)/,$(libcsqc_a_obj:.o=.Qo))
-libcsqc_a_AR=	$(PAK) -cf
-include $(libcsqc_a_dep) # am--include-marker
-r_depfiles_remade += $(libcsqc_a_dep)
-
-$(r_depfiles_remade):
-	$(MKDIR_P) $(@D)
-	echo '# dummy' >$@-t && $(am__mv) $@-t $@
-
-am--depfiles: $(am__depfiles_remade) $(r_depfiles_remade)
-
-CLEANFILES=	*.qfo *.o
diff --git a/ruamoko/lib/Makemodule.am b/ruamoko/lib/Makemodule.am
new file mode 100644
index 000000000..0d189f6b7
--- /dev/null
+++ b/ruamoko/lib/Makemodule.am
@@ -0,0 +1,87 @@
+ruamoko_libs=ruamoko/lib/libr.a ruamoko/lib/libqw.a ruamoko/lib/libnq.a ruamoko/lib/libcsqc.a
+
+ruamoko_lib_LIBRARIES += $(ruamoko_libs)
+EXTRA_LIBRARIES += $(ruamoko_libs)
+
+noinst_HEADERS += \
+	ruamoko/lib/Array+Private.h
+
+ruamoko_lib_libr_a_SOURCES=\
+	ruamoko/lib/cbuf.r \
+	ruamoko/lib/cmd.r \
+	ruamoko/lib/cvar.r \
+	ruamoko/lib/hash.r \
+	ruamoko/lib/msgbuf.r \
+	ruamoko/lib/plist.r \
+	ruamoko/lib/qfile.r \
+	ruamoko/lib/qfs.r \
+	ruamoko/lib/script.r \
+	ruamoko/lib/sound.r \
+	ruamoko/lib/string.r \
+	ruamoko/lib/math.r \
+	ruamoko/lib/types.r \
+	ruamoko/lib/va_list.r \
+	ruamoko/lib/obj_forward.r \
+	ruamoko/lib/Object.r \
+	ruamoko/lib/Protocol.r \
+	ruamoko/lib/AutoreleasePool.r \
+	ruamoko/lib/Array.r \
+	ruamoko/lib/Array+Private.r \
+	ruamoko/lib/Entity.r \
+	ruamoko/lib/PropertyList.r \
+	ruamoko/lib/Set.r
+ruamoko_lib_libr_a_dep=$(call qcautodep,$(ruamoko_lib_libr_a_SOURCES))
+ruamoko_lib_libr_a_AR=$(PAK) -cf
+EXTRA_ruamoko_lib_libr_a_DEPENDENCIES=pak
+include $(ruamoko_lib_libr_a_dep) # am--include-marker
+r_depfiles_remade += $(ruamoko_lib_libr_a_dep)
+
+ruamoko_lib_common_src=ruamoko/lib/debug.r ruamoko/lib/system.r ruamoko/lib/legacy_string.r
+ruamoko_lib_server_src= \
+	ruamoko/lib/crudefile.r ruamoko/lib/entities.r ruamoko/lib/infokey.r ruamoko/lib/message.r \
+	ruamoko/lib/physics.r ruamoko/lib/server.r ruamoko/lib/sv_sound.r
+ruamoko_lib_libqw_a_src= \
+	ruamoko/lib/qw_message.r ruamoko/lib/qw_physics.r ruamoko/lib/qw_sys.r
+ruamoko_lib_libnq_a_src= \
+	ruamoko/lib/nq_message.r
+ruamoko_lib_libcsqc_a_src= ruamoko/lib/draw.r ruamoko/lib/gib.r ruamoko/lib/key.r
+
+ruamoko_lib_common_dep=$(call qcautodep,$(ruamoko_lib_common_src))
+include $(ruamoko_lib_common_dep) # am--include-marker
+r_depfiles_remade += $(ruamoko_lib_common_dep)
+
+ruamoko_lib_server_dep=$(call qcautodep,$(ruamoko_lib_server_src))
+include $(ruamoko_lib_server_dep) # am--include-marker
+r_depfiles_remade += $(ruamoko_lib_server_dep)
+
+ruamoko_lib_libqw_a_SOURCES=$(ruamoko_lib_libqw_a_src) $(ruamoko_lib_common_src) $(ruamoko_lib_server_src) ruamoko/lib/math.r
+ruamoko_lib_libqw_a_dep=$(call qcautodep,$(ruamoko_lib_libqw_a_src))
+ruamoko_lib_libqw_a_AR=$(PAK) -cf
+EXTRA_ruamoko_lib_libqw_a_DEPENDENCIES=pak
+include $(ruamoko_lib_libqw_a_dep) # am--include-marker
+r_depfiles_remade += $(ruamoko_lib_libqw_a_dep)
+
+ruamoko_lib_libnq_a_SOURCES=$(ruamoko_lib_libnq_a_src) $(ruamoko_lib_common_src) $(ruamoko_lib_server_src) ruamoko/lib/math.r
+ruamoko_lib_libnq_a_dep=$(call qcautodep,$(ruamoko_lib_libnq_a_src))
+ruamoko_lib_libnq_a_AR=$(PAK) -cf
+EXTRA_ruamoko_lib_libnq_a_DEPENDENCIES=pak
+include $(ruamoko_lib_libnq_a_dep) # am--include-marker
+r_depfiles_remade += $(ruamoko_lib_libnq_a_dep)
+
+ruamoko_lib_libcsqc_a_SOURCES=$(ruamoko_lib_libcsqc_a_src) $(ruamoko_lib_common_src)
+ruamoko_lib_libcsqc_a_dep=$(call qcautodep,$(ruamoko_lib_libcsqc_a_src))
+ruamoko_lib_libcsqc_a_AR=	$(PAK) -cf
+EXTRA_ruamoko_lib_libcsqc_a_DEPENDENCIES=pak
+include $(ruamoko_lib_libcsqc_a_dep) # am--include-marker
+r_depfiles_remade += $(ruamoko_lib_libcsqc_a_dep)
+
+CLEANFILES += \
+	ruamoko/lib/*.dat \
+	ruamoko/lib/*.sym
+DISTCLEANFILES += \
+	$(ruamoko_lib_libr_a_dep) \
+	$(ruamoko_lib_common_dep) \
+	$(ruamoko_lib_server_dep) \
+	$(ruamoko_lib_libqw_a_dep) \
+	$(ruamoko_lib_libnq_a_dep) \
+	$(ruamoko_lib_libcsqc_a_dep)
diff --git a/ruamoko/qwaq/Makefile.am b/ruamoko/qwaq/Makefile.am
deleted file mode 100644
index 2208777f5..000000000
--- a/ruamoko/qwaq/Makefile.am
+++ /dev/null
@@ -1,135 +0,0 @@
-AUTOMAKE_OPTIONS= foreign subdir-objects
-
-QWAQ_LIBS=@QWAQ_LIBS@
-QWAQ_DEPS=@QWAQ_DEPS@
-QWAQ_INCS=@QWAQ_INCS@
-
-AM_CPPFLAGS= -I$(srcdir) -I$(top_srcdir)/include $(QWAQ_INCS) $(PTHREAD_CFLAGS)
-
-noinst_PROGRAMS=@QWAQ_TARGETS@ qwaq-app.dat$(EXEEXT) gcd.dat$(EXEEXT)
-
-QFCC_DEP=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT)
-QFCC=$(top_builddir)/tools/qfcc/source/qfcc
-
-QCSYSTEM=--no-default-paths -I$(top_srcdir)/ruamoko/include -I$(top_srcdir)/include
-QWAQ_INC=-I$(srcdir) -I$(srcdir)/builtins -I$(srcdir)/debugger -I$(srcdir)/editor -I$(srcdir)/ui
-QCFLAGS=-qq -O -g -Werror
-QCPPFLAGS=$(QCSYSTEM) -I$(srcdir)
-QCLINKFLAGS=--no-default-paths -L$(top_builddir)/ruamoko/lib
-QCOMPILE=$(QFCC) $(QCFLAGS) $(QCPPFLAGS)
-QLINK=$(QFCC) $(QCFLAGS) $(QCLINKFLAGS)
-
-SUFFIXES=.o .r
-.r.o:
-	$(QCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tqo -c -o $@ $<
-	@sed -i -e '1s@:@: $(QFCC_DEP)@' $(DEPDIR)/$*.Tqo
-	@$(am__mv) $(DEPDIR)/$*.Tqo $(DEPDIR)/$*.Qo
-
-qwaq_app_dat_src= \
-	qwaq-app.r	\
-	debugger/views/basicview.r	\
-	debugger/views/defview.r	\
-	debugger/views/doubleview.r	\
-	debugger/views/entityview.r	\
-	debugger/views/fieldview.r	\
-	debugger/views/floatview.r	\
-	debugger/views/funcview.r	\
-	debugger/views/intview.r	\
-	debugger/views/nameview.r	\
-	debugger/views/pointerview.r\
-	debugger/views/quatview.r	\
-	debugger/views/stringview.r	\
-	debugger/views/uintview.r	\
-	debugger/views/vectorview.r	\
-	debugger/views/voidview.r	\
-	debugger/debug.r	\
-	debugger/debugger.r	\
-	debugger/localsdata.r	\
-	debugger/typeencodings.r	\
-	editor/editbuffer.r	\
-	editor/editor.r	\
-	ui/button.r	\
-	ui/draw.r	\
-	ui/garray.r	\
-	ui/group.r	\
-	ui/listener.r	\
-	ui/proxyview.r	\
-	ui/rect.r	\
-	ui/scrollbar.r	\
-	ui/tableview.r	\
-	ui/textcontext.r	\
-	ui/titlebar.r	\
-	ui/view.r	\
-	ui/window.r	\
-	$e
-
-#FIXME this coupling is horrible
-qwaq_curses_libs= \
-	$(top_builddir)/libs/video/targets/libvid_common.la \
-	$(top_builddir)/libs/console/libQFconsole.la \
-	$(top_builddir)/libs/gib/libQFgib.la
-
-qwaq_curses_SOURCES= \
-	builtins/main.c \
-	builtins/curses.c \
-	builtins/debug.c \
-	builtins/editbuffer.c \
-	builtins/input.c \
-	$e
-
-qwaq_curses_LDADD= $(qwaq_curses_libs) $(QWAQ_LIBS) \
-				$(PANEL_LIBS) $(CURSES_LIBS) $(PTHREAD_LDFLAGS) $(DL_LIBS)
-qwaq_curses_LDFLAGS=
-qwaq_curses_DEPENDENCIES= $(qwaq_curses_libs) $(QWAQ_DEPS)
-
-cl_plugin_libs= \
-	@client_static_plugin_libs@
-
-client_libs= \
-	$(top_builddir)/libs/console/libQFconsole.la \
-	$(top_builddir)/libs/video/targets/libQFjs.la \
-	$(top_builddir)/libs/audio/libQFcd.la \
-	$(top_builddir)/libs/audio/libQFsound.la \
-	$(top_builddir)/libs/image/libQFimage.la
-
-qwaq_x11_libs= \
-	$(cl_plugin_libs) \
-	$(top_builddir)/libs/video/renderer/libQFrenderer.la \
-	$(top_builddir)/libs/models/libQFmodels.la \
-	$(top_builddir)/libs/video/targets/libQFx11.la \
-	$(client_libs) \
-	$(top_builddir)/libs/gib/libQFgib.la
-qwaq_x11_SOURCES=builtins/qwaq.c builtins/qwaq-bi.c
-qwaq_x11_LDADD= $(qwaq_x11_libs) $(QWAQ_LIBS) \
-				$(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 \
-				$(X_EXTRA_LIBS) $(X_SHM_LIB) $(DL_LIBS)
-qwaq_x11_LDFLAGS=
-qwaq_x11_DEPENDENCIES= $(qwaq_x11_libs) $(QWAQ_DEPS)
-
-r_depfiles_remade=
-
-qwaq_app_dat_SOURCES=$(qwaq_app_dat_src)
-qwaq_app_obj=$(qwaq_app_dat_SOURCES:.r=.o)
-qwaq_app_dep=$(addprefix ./$(DEPDIR)/,$(qwaq_app_obj:.o=.Qo))
-qwaq-app.dat$(EXEEXT): $(qwaq_app_obj) $(QFCC_DEP) ../lib/libcsqc.a ../lib/libr.a
-	$(QLINK) -o $@ $(qwaq_app_obj) -lcsqc -lr
-include $(qwaq_app_dep) # am--include-marker
-r_depfiles_remade += $(qwaq_app_dep)
-
-gcd_dat_SOURCES=gcd.r
-gcd_obj=$(gcd_dat_SOURCES:.r=.o)
-gcd_dep=$(addprefix ./$(DEPDIR)/,$(gcd_obj:.o=.Qo))
-gcd.dat$(EXEEXT): $(gcd_obj) $(QFCC_DEP) ../lib/libcsqc.a ../lib/libr.a
-	$(QLINK) -o $@ $(gcd_obj) -lcsqc -lr
-include $(gcd_dep) # am--include-marker
-r_depfiles_remade += $(gcd_dep)
-
-$(r_depfiles_remade):
-	@$(MKDIR_P) $(@D)
-	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
-
-am--depfiles: $(am__depfiles_remade) $(r_depfiles_remade)
-
-EXTRA_PROGRAMS=qwaq-curses qwaq-x11
-EXTRA_DIST=$(qwaq_dat_src) qwaq.h
-CLEANFILES= *.dat *.sym qwaq-curses.log
diff --git a/ruamoko/qwaq/Makemodule.am b/ruamoko/qwaq/Makemodule.am
new file mode 100644
index 000000000..149213268
--- /dev/null
+++ b/ruamoko/qwaq/Makemodule.am
@@ -0,0 +1,149 @@
+QWAQ_LIBS=@QWAQ_LIBS@
+QWAQ_DEPS=@QWAQ_DEPS@
+QWAQ_INCS=@QWAQ_INCS@
+
+noinst_PROGRAMS += @QWAQ_TARGETS@ ruamoko/qwaq/qwaq-app.dat$(EXEEXT) ruamoko/qwaq/gcd.dat$(EXEEXT)
+
+qwaq_app_dat_src= \
+	ruamoko/qwaq/qwaq-app.r	\
+	ruamoko/qwaq/debugger/views/basicview.r	\
+	ruamoko/qwaq/debugger/views/defview.r	\
+	ruamoko/qwaq/debugger/views/doubleview.r	\
+	ruamoko/qwaq/debugger/views/entityview.r	\
+	ruamoko/qwaq/debugger/views/fieldview.r	\
+	ruamoko/qwaq/debugger/views/floatview.r	\
+	ruamoko/qwaq/debugger/views/funcview.r	\
+	ruamoko/qwaq/debugger/views/intview.r	\
+	ruamoko/qwaq/debugger/views/nameview.r	\
+	ruamoko/qwaq/debugger/views/pointerview.r\
+	ruamoko/qwaq/debugger/views/quatview.r	\
+	ruamoko/qwaq/debugger/views/stringview.r	\
+	ruamoko/qwaq/debugger/views/uintview.r	\
+	ruamoko/qwaq/debugger/views/vectorview.r	\
+	ruamoko/qwaq/debugger/views/voidview.r	\
+	ruamoko/qwaq/debugger/debug.r	\
+	ruamoko/qwaq/debugger/debugger.r	\
+	ruamoko/qwaq/debugger/localsdata.r	\
+	ruamoko/qwaq/debugger/typeencodings.r	\
+	ruamoko/qwaq/editor/editbuffer.r	\
+	ruamoko/qwaq/editor/editor.r	\
+	ruamoko/qwaq/ui/button.r	\
+	ruamoko/qwaq/ui/draw.r	\
+	ruamoko/qwaq/ui/garray.r	\
+	ruamoko/qwaq/ui/group.r	\
+	ruamoko/qwaq/ui/listener.r	\
+	ruamoko/qwaq/ui/proxyview.r	\
+	ruamoko/qwaq/ui/rect.r	\
+	ruamoko/qwaq/ui/scrollbar.r	\
+	ruamoko/qwaq/ui/tableview.r	\
+	ruamoko/qwaq/ui/textcontext.r	\
+	ruamoko/qwaq/ui/titlebar.r	\
+	ruamoko/qwaq/ui/view.r	\
+	ruamoko/qwaq/ui/window.r	\
+	$e
+
+#FIXME this coupling is horrible
+qwaq_curses_libs= \
+	libs/video/targets/libvid_common.la \
+	libs/console/libQFconsole.la \
+	libs/gib/libQFgib.la
+
+ruamoko_qwaq_qwaq_curses_SOURCES= \
+	ruamoko/qwaq/builtins/main.c \
+	ruamoko/qwaq/builtins/curses.c \
+	ruamoko/qwaq/builtins/debug.c \
+	ruamoko/qwaq/builtins/editbuffer.c \
+	ruamoko/qwaq/builtins/input.c \
+	$e
+
+ruamoko_qwaq_qwaq_curses_LDADD= $(qwaq_curses_libs) $(QWAQ_LIBS) \
+				$(PANEL_LIBS) $(CURSES_LIBS) $(PTHREAD_LDFLAGS) $(DL_LIBS)
+ruamoko_qwaq_qwaq_curses_LDFLAGS=
+ruamoko_qwaq_qwaq_curses_DEPENDENCIES= $(qwaq_curses_libs) $(QWAQ_DEPS)
+
+qwaq_cl_plugin_libs= \
+	@client_static_plugin_libs@
+
+qwaq_client_libs= \
+	$(top_builddir)/libs/console/libQFconsole.la \
+	$(top_builddir)/libs/video/targets/libQFjs.la \
+	$(top_builddir)/libs/audio/libQFcd.la \
+	$(top_builddir)/libs/audio/libQFsound.la \
+	$(top_builddir)/libs/image/libQFimage.la
+
+qwaq_x11_libs= \
+	$(qwaq_cl_plugin_libs) \
+	$(top_builddir)/libs/video/renderer/libQFrenderer.la \
+	$(top_builddir)/libs/models/libQFmodels.la \
+	$(top_builddir)/libs/video/targets/libQFx11.la \
+	$(qwaq_client_libs) \
+	$(top_builddir)/libs/gib/libQFgib.la
+ruamoko_qwaq_qwaq_x11_SOURCES=ruamoko/qwaq/builtins/qwaq.c ruamoko/qwaq/builtins/qwaq-bi.c
+ruamoko_qwaq_qwaq_x11_LDADD= $(qwaq_x11_libs) $(QWAQ_LIBS) \
+				$(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 \
+				$(X_EXTRA_LIBS) $(X_SHM_LIB) $(DL_LIBS)
+ruamoko_qwaq_qwaq_x11_LDFLAGS=
+ruamoko_qwaq_qwaq_x11_DEPENDENCIES= $(qwaq_x11_libs) $(QWAQ_DEPS)
+
+ruamoko_qwaq_qwaq_app_dat_SOURCES=$(qwaq_app_dat_src)
+ruamoko_qwaq_qwaq_app_obj=$(ruamoko_qwaq_qwaq_app_dat_SOURCES:.r=.o)
+ruamoko_qwaq_qwaq_app_dep=$(call qcautodep,$(ruamoko_qwaq_qwaq_app_dat_SOURCES:.o=.Qo))
+ruamoko/qwaq/qwaq-app.dat$(EXEEXT): $(ruamoko_qwaq_qwaq_app_obj) $(QFCC_DEP) ruamoko/lib/libcsqc.a ruamoko/lib/libr.a
+	$(QLINK) -o $@ $(ruamoko_qwaq_qwaq_app_obj) -lcsqc -lr
+include $(ruamoko_qwaq_qwaq_app_dep) # am--include-marker
+r_depfiles_remade += $(ruamoko_qwaq_qwaq_app_dep)
+
+ruamoko_qwaq_gcd_dat_SOURCES=ruamoko/qwaq/gcd.r
+ruamoko_qwaq_gcd_obj=$(ruamoko_qwaq_gcd_dat_SOURCES:.r=.o)
+ruamoko_qwaq_gcd_dep=$(call qcautodep,$(ruamoko_qwaq_gcd_dat_SOURCES:.o=.Qo))
+ruamoko/qwaq/gcd.dat$(EXEEXT): $(ruamoko_qwaq_gcd_obj) $(QFCC_DEP) ruamoko/lib/libcsqc.a ruamoko/lib/libr.a
+	$(QLINK) -o $@ $(ruamoko_qwaq_gcd_obj) -lcsqc -lr
+include $(ruamoko_qwaq_gcd_dep) # am--include-marker
+r_depfiles_remade += $(ruamoko_qwaq_gcd_dep)
+
+EXTRA_PROGRAMS += ruamoko/qwaq/qwaq-curses ruamoko/qwaq/qwaq-x11
+EXTRA_DIST += \
+	$(qwaq_dat_src) \
+	ruamoko/qwaq/debugger/debug.h \
+	ruamoko/qwaq/debugger/debugger.h \
+	ruamoko/qwaq/debugger/localsdata.h \
+	ruamoko/qwaq/debugger/typeencodings.h \
+	ruamoko/qwaq/debugger/views/basicview.h \
+	ruamoko/qwaq/debugger/views/defview.h \
+	ruamoko/qwaq/debugger/views/doubleview.h \
+	ruamoko/qwaq/debugger/views/entityview.h \
+	ruamoko/qwaq/debugger/views/fieldview.h \
+	ruamoko/qwaq/debugger/views/floatview.h \
+	ruamoko/qwaq/debugger/views/funcview.h \
+	ruamoko/qwaq/debugger/views/intview.h \
+	ruamoko/qwaq/debugger/views/nameview.h \
+	ruamoko/qwaq/debugger/views/pointerview.h \
+	ruamoko/qwaq/debugger/views/quatview.h \
+	ruamoko/qwaq/debugger/views/stringview.h \
+	ruamoko/qwaq/debugger/views/uintview.h \
+	ruamoko/qwaq/debugger/views/vectorview.h \
+	ruamoko/qwaq/debugger/views/voidview.h \
+	ruamoko/qwaq/editor/editbuffer.h \
+	ruamoko/qwaq/editor/editor.h \
+	ruamoko/qwaq/qwaq-app.h \
+	ruamoko/qwaq/qwaq.h \
+	ruamoko/qwaq/ui/button.h \
+	ruamoko/qwaq/ui/color.h \
+	ruamoko/qwaq/ui/curses.h \
+	ruamoko/qwaq/ui/draw.h \
+	ruamoko/qwaq/ui/event.h \
+	ruamoko/qwaq/ui/garray.h \
+	ruamoko/qwaq/ui/group.h \
+	ruamoko/qwaq/ui/listener.h \
+	ruamoko/qwaq/ui/proxyview.h \
+	ruamoko/qwaq/ui/rect.h \
+	ruamoko/qwaq/ui/scrollbar.h \
+	ruamoko/qwaq/ui/tableview.h \
+	ruamoko/qwaq/ui/textcontext.h \
+	ruamoko/qwaq/ui/titlebar.h \
+	ruamoko/qwaq/ui/view.h \
+	ruamoko/qwaq/ui/window.h
+CLEANFILES += \
+	ruamoko/qwaq/qwaq-curses.log \
+	ruamoko/qwaq/*.dat \
+	ruamoko/qwaq/*.sym
diff --git a/ruamoko/qwaq/builtins/builtins.c b/ruamoko/qwaq/builtins/builtins.c
index 3976dc330..9f575617c 100644
--- a/ruamoko/qwaq/builtins/builtins.c
+++ b/ruamoko/qwaq/builtins/builtins.c
@@ -42,7 +42,7 @@
 #include <QF/progs.h>
 #include <QF/zone.h>
 
-#include "qwaq.h"
+#include "ruamoko/qwaq/qwaq.h"
 
 static void
 bi_print (progs_t *pr)
diff --git a/ruamoko/qwaq/builtins/curses.c b/ruamoko/qwaq/builtins/curses.c
index 3075f9412..8f543f493 100644
--- a/ruamoko/qwaq/builtins/curses.c
+++ b/ruamoko/qwaq/builtins/curses.c
@@ -46,10 +46,10 @@
 #include "QF/ringbuffer.h"
 #include "QF/sys.h"
 
-#include "qwaq.h"
-#include "ui/curses.h"
-#include "ui/rect.h"
-#include "ui/textcontext.h"
+#include "ruamoko/qwaq/qwaq.h"
+#include "ruamoko/qwaq/ui/curses.h"
+#include "ruamoko/qwaq/ui/rect.h"
+#include "ruamoko/qwaq/ui/textcontext.h"
 
 #define always_inline inline __attribute__((__always_inline__))
 #define CMD_SIZE(x) sizeof(x)/sizeof(x[0])
diff --git a/ruamoko/qwaq/builtins/debug.c b/ruamoko/qwaq/builtins/debug.c
index be143ec87..bb22d35e2 100644
--- a/ruamoko/qwaq/builtins/debug.c
+++ b/ruamoko/qwaq/builtins/debug.c
@@ -47,10 +47,10 @@
 #include "QF/quakefs.h"
 #include "QF/sys.h"
 
-#include "qwaq.h"
-#include "ui/event.h"
-#include "ui/curses.h"
-#include "debugger/debug.h"
+#include "ruamoko/qwaq/qwaq.h"
+#include "ruamoko/qwaq/ui/event.h"
+#include "ruamoko/qwaq/ui/curses.h"
+#include "ruamoko/qwaq/debugger/debug.h"
 
 typedef struct qwaq_target_s {
 	progs_t    *pr;
diff --git a/ruamoko/qwaq/builtins/editbuffer.c b/ruamoko/qwaq/builtins/editbuffer.c
index ab1c161c3..12cde52ab 100644
--- a/ruamoko/qwaq/builtins/editbuffer.c
+++ b/ruamoko/qwaq/builtins/editbuffer.c
@@ -11,8 +11,8 @@
 #include "QF/quakeio.h"
 #include "QF/txtbuffer.h"
 
-#include "qwaq.h"
-#include "editor/editbuffer.h"
+#include "ruamoko/qwaq/qwaq.h"
+#include "ruamoko/qwaq/editor/editbuffer.h"
 
 #define always_inline inline __attribute__((__always_inline__))
 
diff --git a/ruamoko/qwaq/builtins/input.c b/ruamoko/qwaq/builtins/input.c
index 29d5a6088..ce2caec46 100644
--- a/ruamoko/qwaq/builtins/input.c
+++ b/ruamoko/qwaq/builtins/input.c
@@ -46,9 +46,9 @@
 #include "QF/keys.h"
 #include "QF/sys.h"
 
-#include "qwaq.h"
-#include "ui/event.h"
-#include "ui/curses.h"
+#include "ruamoko/qwaq/qwaq.h"
+#include "ruamoko/qwaq/ui/event.h"
+#include "ruamoko/qwaq/ui/curses.h"
 
 #define always_inline inline __attribute__((__always_inline__))
 
diff --git a/ruamoko/qwaq/builtins/main.c b/ruamoko/qwaq/builtins/main.c
index db4f8da59..da3607c01 100644
--- a/ruamoko/qwaq/builtins/main.c
+++ b/ruamoko/qwaq/builtins/main.c
@@ -52,8 +52,8 @@
 #include "QF/va.h"
 #include "QF/zone.h"
 
-#include "qwaq.h"
-#include "debugger/debug.h"
+#include "ruamoko/qwaq/qwaq.h"
+#include "ruamoko/qwaq/debugger/debug.h"
 
 #define MAX_EDICTS 1024
 
diff --git a/ruamoko/qwaq/builtins/qwaq-bi.c b/ruamoko/qwaq/builtins/qwaq-bi.c
index 82bce4996..602709bdf 100644
--- a/ruamoko/qwaq/builtins/qwaq-bi.c
+++ b/ruamoko/qwaq/builtins/qwaq-bi.c
@@ -60,7 +60,7 @@ static __attribute__ ((used)) const char rcsid[] = "$Id$";
 #include "QF/plugin/console.h"
 #include "QF/plugin/vid_render.h"
 
-#include "qwaq.h"
+#include "ruamoko/qwaq/qwaq.h"
 
 CLIENT_PLUGIN_PROTOS
 static plugin_list_t client_plugin_list[] = {
diff --git a/ruamoko/qwaq/builtins/qwaq.c b/ruamoko/qwaq/builtins/qwaq.c
index 05d515f4e..111af8764 100644
--- a/ruamoko/qwaq/builtins/qwaq.c
+++ b/ruamoko/qwaq/builtins/qwaq.c
@@ -46,7 +46,7 @@
 #include "QF/va.h"
 #include "QF/zone.h"
 
-#include "qwaq.h"
+#include "ruamoko/qwaq/qwaq.h"
 
 #define MAX_EDICTS 1024
 
diff --git a/ruamoko/qwaq/debugger/debug.h b/ruamoko/qwaq/debugger/debug.h
index 6efeb5fb2..f6f58f5ed 100644
--- a/ruamoko/qwaq/debugger/debug.h
+++ b/ruamoko/qwaq/debugger/debug.h
@@ -1,7 +1,7 @@
 #ifndef __qwaq_debugger_debug_h
 #define __qwaq_debugger_debug_h
 
-#include "ui/event.h"
+#include "ruamoko/qwaq/ui/event.h"
 
 typedef enum {
 	qe_debug_event = 0x0100,
diff --git a/ruamoko/qwaq/debugger/debug.r b/ruamoko/qwaq/debugger/debug.r
index 20ccc57b3..feb8adbdd 100644
--- a/ruamoko/qwaq/debugger/debug.r
+++ b/ruamoko/qwaq/debugger/debug.r
@@ -1,4 +1,4 @@
-#include "debugger/debug.h"
+#include "ruamoko/qwaq/debugger/debug.h"
 
 void traceon() = #0;
 void traceoff() = #0;
diff --git a/ruamoko/qwaq/debugger/debugger.h b/ruamoko/qwaq/debugger/debugger.h
index 13adcf752..9e6c750d2 100644
--- a/ruamoko/qwaq/debugger/debugger.h
+++ b/ruamoko/qwaq/debugger/debugger.h
@@ -4,8 +4,8 @@
 #include <types.h>
 #include <Object.h>
 
-#include "debugger/debug.h"
-#include "debugger/localsdata.h"
+#include "ruamoko/qwaq/debugger/debug.h"
+#include "ruamoko/qwaq/debugger/localsdata.h"
 
 @class ProxyView;
 @class Editor;
diff --git a/ruamoko/qwaq/debugger/debugger.r b/ruamoko/qwaq/debugger/debugger.r
index d46c78ab7..2d51e3c60 100644
--- a/ruamoko/qwaq/debugger/debugger.r
+++ b/ruamoko/qwaq/debugger/debugger.r
@@ -3,16 +3,16 @@
 #include <string.h>
 #include <types.h>
 
-#include "ui/curses.h"
-#include "ui/listener.h"
-#include "ui/proxyview.h"
-#include "ui/scrollbar.h"
-#include "ui/tableview.h"
-#include "ui/window.h"
-#include "debugger/debugger.h"
-#include "debugger/typeencodings.h"
-#include "editor/editor.h"
-#include "qwaq-app.h"
+#include "ruamoko/qwaq/ui/curses.h"
+#include "ruamoko/qwaq/ui/listener.h"
+#include "ruamoko/qwaq/ui/proxyview.h"
+#include "ruamoko/qwaq/ui/scrollbar.h"
+#include "ruamoko/qwaq/ui/tableview.h"
+#include "ruamoko/qwaq/ui/window.h"
+#include "ruamoko/qwaq/debugger/debugger.h"
+#include "ruamoko/qwaq/debugger/typeencodings.h"
+#include "ruamoko/qwaq/editor/editor.h"
+#include "ruamoko/qwaq/qwaq-app.h"
 
 @implementation Debugger
 +(Debugger *)withTarget:(qdb_target_t)target
diff --git a/ruamoko/qwaq/debugger/localsdata.h b/ruamoko/qwaq/debugger/localsdata.h
index 9562921c1..3428219cb 100644
--- a/ruamoko/qwaq/debugger/localsdata.h
+++ b/ruamoko/qwaq/debugger/localsdata.h
@@ -2,8 +2,8 @@
 #define __qwaq_debugger_localsview_h
 
 #include <types.h>
-#include "ui/tableview.h"
-#include "debugger/debug.h"
+#include "ruamoko/qwaq/ui/tableview.h"
+#include "ruamoko/qwaq/debugger/debug.h"
 
 @interface LocalsData : Object <TableViewDataSource>
 {
diff --git a/ruamoko/qwaq/debugger/localsdata.r b/ruamoko/qwaq/debugger/localsdata.r
index d65869491..c974cdd98 100644
--- a/ruamoko/qwaq/debugger/localsdata.r
+++ b/ruamoko/qwaq/debugger/localsdata.r
@@ -1,9 +1,9 @@
 #include <string.h>
 #include <types.h>
-#include "debugger/views/defview.h"
-#include "debugger/views/nameview.h"
-#include "debugger/localsdata.h"
-#include "debugger/typeencodings.h"
+#include "ruamoko/qwaq/debugger/views/defview.h"
+#include "ruamoko/qwaq/debugger/views/nameview.h"
+#include "ruamoko/qwaq/debugger/localsdata.h"
+#include "ruamoko/qwaq/debugger/typeencodings.h"
 
 @implementation LocalsData
 
diff --git a/ruamoko/qwaq/debugger/typeencodings.h b/ruamoko/qwaq/debugger/typeencodings.h
index 213dad8a7..11b78d0da 100644
--- a/ruamoko/qwaq/debugger/typeencodings.h
+++ b/ruamoko/qwaq/debugger/typeencodings.h
@@ -4,7 +4,7 @@
 #include <types.h>
 #include <Object.h>
 
-#include "debugger/debug.h"
+#include "ruamoko/qwaq/debugger/debug.h"
 
 @interface TypeEncodings : Object
 +(qfot_type_t *)getType:(unsigned)typeAddr fromTarget:(qdb_target_t)target;
diff --git a/ruamoko/qwaq/debugger/typeencodings.r b/ruamoko/qwaq/debugger/typeencodings.r
index ad04dbbcd..7a5fd26d7 100644
--- a/ruamoko/qwaq/debugger/typeencodings.r
+++ b/ruamoko/qwaq/debugger/typeencodings.r
@@ -1,9 +1,9 @@
 #include <runtime.h>
 #include <hash.h>
 #include <string.h>
-#include <ui/curses.h>	// printf FIXME
 
-#include "debugger/typeencodings.h"
+#include "ruamoko/qwaq/ui/curses.h"	// printf FIXME
+#include "ruamoko/qwaq/debugger/typeencodings.h"
 
 @implementation TypeEncodings
 
diff --git a/ruamoko/qwaq/debugger/views/basicview.h b/ruamoko/qwaq/debugger/views/basicview.h
index d9289889f..d5424c487 100644
--- a/ruamoko/qwaq/debugger/views/basicview.h
+++ b/ruamoko/qwaq/debugger/views/basicview.h
@@ -1,7 +1,7 @@
 #ifndef __qwaq_debugger_basicview_h
 #define __qwaq_debugger_basicview_h
 
-#include "debugger/views/defview.h"
+#include "ruamoko/qwaq/debugger/views/defview.h"
 
 @interface BasicView : DefView
 // might return a NameView (which is also a DefView)
diff --git a/ruamoko/qwaq/debugger/views/basicview.r b/ruamoko/qwaq/debugger/views/basicview.r
index 8a2067285..96abfc302 100644
--- a/ruamoko/qwaq/debugger/views/basicview.r
+++ b/ruamoko/qwaq/debugger/views/basicview.r
@@ -1,6 +1,6 @@
 #include <string.h>
-#include "debugger/views/basicview.h"
-#include "debugger/views/nameview.h"
+#include "ruamoko/qwaq/debugger/views/basicview.h"
+#include "ruamoko/qwaq/debugger/views/nameview.h"
 
 static string type_views[] = {
 	"VoidView",
diff --git a/ruamoko/qwaq/debugger/views/defview.h b/ruamoko/qwaq/debugger/views/defview.h
index 4760abcad..7e2562104 100644
--- a/ruamoko/qwaq/debugger/views/defview.h
+++ b/ruamoko/qwaq/debugger/views/defview.h
@@ -2,8 +2,8 @@
 #define __qwaq_debugger_defview_h
 
 #include <types.h>
-#include "ui/view.h"
-#include "debugger/debug.h"
+#include "ruamoko/qwaq/ui/view.h"
+#include "ruamoko/qwaq/debugger/debug.h"
 
 @interface DefView : View
 {
diff --git a/ruamoko/qwaq/debugger/views/defview.r b/ruamoko/qwaq/debugger/views/defview.r
index ee681e23e..a972b972f 100644
--- a/ruamoko/qwaq/debugger/views/defview.r
+++ b/ruamoko/qwaq/debugger/views/defview.r
@@ -1,6 +1,6 @@
 #include <string.h>
-#include "debugger/views/defview.h"
-#include "debugger/views/nameview.h"
+#include "ruamoko/qwaq/debugger/views/defview.h"
+#include "ruamoko/qwaq/debugger/views/nameview.h"
 
 static string meta_views[] = {
 	"BasicView",
diff --git a/ruamoko/qwaq/debugger/views/doubleview.h b/ruamoko/qwaq/debugger/views/doubleview.h
index 8fda5ac24..90637ecf3 100644
--- a/ruamoko/qwaq/debugger/views/doubleview.h
+++ b/ruamoko/qwaq/debugger/views/doubleview.h
@@ -1,7 +1,7 @@
 #ifndef __qwaq_debugger_doubleview_h
 #define __qwaq_debugger_doubleview_h
 
-#include "debugger/views/defview.h"
+#include "ruamoko/qwaq/debugger/views/defview.h"
 
 @interface DoubleView : DefView
 {
diff --git a/ruamoko/qwaq/debugger/views/doubleview.r b/ruamoko/qwaq/debugger/views/doubleview.r
index 36fbfd59d..d94f4e231 100644
--- a/ruamoko/qwaq/debugger/views/doubleview.r
+++ b/ruamoko/qwaq/debugger/views/doubleview.r
@@ -1,5 +1,5 @@
 #include <string.h>
-#include "debugger/views/doubleview.h"
+#include "ruamoko/qwaq/debugger/views/doubleview.h"
 
 @implementation DoubleView
 
diff --git a/ruamoko/qwaq/debugger/views/entityview.h b/ruamoko/qwaq/debugger/views/entityview.h
index df8de2c3d..5ad8bd908 100644
--- a/ruamoko/qwaq/debugger/views/entityview.h
+++ b/ruamoko/qwaq/debugger/views/entityview.h
@@ -1,7 +1,7 @@
 #ifndef __qwaq_debugger_entityview_h
 #define __qwaq_debugger_entityview_h
 
-#include "debugger/views/defview.h"
+#include "ruamoko/qwaq/debugger/views/defview.h"
 
 @interface EntityView : DefView
 {
diff --git a/ruamoko/qwaq/debugger/views/entityview.r b/ruamoko/qwaq/debugger/views/entityview.r
index 49180e914..1170a3f7d 100644
--- a/ruamoko/qwaq/debugger/views/entityview.r
+++ b/ruamoko/qwaq/debugger/views/entityview.r
@@ -1,5 +1,5 @@
 #include <string.h>
-#include "debugger/views/entityview.h"
+#include "ruamoko/qwaq/debugger/views/entityview.h"
 
 @implementation EntityView
 
diff --git a/ruamoko/qwaq/debugger/views/fieldview.h b/ruamoko/qwaq/debugger/views/fieldview.h
index 5d90bf77f..0cd314b6b 100644
--- a/ruamoko/qwaq/debugger/views/fieldview.h
+++ b/ruamoko/qwaq/debugger/views/fieldview.h
@@ -1,7 +1,7 @@
 #ifndef __qwaq_debugger_fieldview_h
 #define __qwaq_debugger_fieldview_h
 
-#include "debugger/views/defview.h"
+#include "ruamoko/qwaq/debugger/views/defview.h"
 
 @interface FieldView : DefView
 {
diff --git a/ruamoko/qwaq/debugger/views/fieldview.r b/ruamoko/qwaq/debugger/views/fieldview.r
index 49bf7282b..f8d1547e3 100644
--- a/ruamoko/qwaq/debugger/views/fieldview.r
+++ b/ruamoko/qwaq/debugger/views/fieldview.r
@@ -1,5 +1,5 @@
 #include <string.h>
-#include "debugger/views/fieldview.h"
+#include "ruamoko/qwaq/debugger/views/fieldview.h"
 
 @implementation FieldView
 
diff --git a/ruamoko/qwaq/debugger/views/floatview.h b/ruamoko/qwaq/debugger/views/floatview.h
index a51469709..5c33da88b 100644
--- a/ruamoko/qwaq/debugger/views/floatview.h
+++ b/ruamoko/qwaq/debugger/views/floatview.h
@@ -1,7 +1,7 @@
 #ifndef __qwaq_debugger_floatview_h
 #define __qwaq_debugger_floatview_h
 
-#include "debugger/views/defview.h"
+#include "ruamoko/qwaq/debugger/views/defview.h"
 
 @interface FloatView : DefView
 {
diff --git a/ruamoko/qwaq/debugger/views/floatview.r b/ruamoko/qwaq/debugger/views/floatview.r
index e98e9e8a8..5b4d534eb 100644
--- a/ruamoko/qwaq/debugger/views/floatview.r
+++ b/ruamoko/qwaq/debugger/views/floatview.r
@@ -1,5 +1,5 @@
 #include <string.h>
-#include "debugger/views/floatview.h"
+#include "ruamoko/qwaq/debugger/views/floatview.h"
 
 @implementation FloatView
 
diff --git a/ruamoko/qwaq/debugger/views/funcview.h b/ruamoko/qwaq/debugger/views/funcview.h
index 5a004800c..132812dd3 100644
--- a/ruamoko/qwaq/debugger/views/funcview.h
+++ b/ruamoko/qwaq/debugger/views/funcview.h
@@ -1,7 +1,7 @@
 #ifndef __qwaq_debugger_funcview_h
 #define __qwaq_debugger_funcview_h
 
-#include "debugger/views/defview.h"
+#include "ruamoko/qwaq/debugger/views/defview.h"
 
 @interface FuncView : DefView
 {
diff --git a/ruamoko/qwaq/debugger/views/funcview.r b/ruamoko/qwaq/debugger/views/funcview.r
index c102bfce1..2fa2218f0 100644
--- a/ruamoko/qwaq/debugger/views/funcview.r
+++ b/ruamoko/qwaq/debugger/views/funcview.r
@@ -1,5 +1,5 @@
 #include <string.h>
-#include "debugger/views/funcview.h"
+#include "ruamoko/qwaq/debugger/views/funcview.h"
 
 @implementation FuncView
 
diff --git a/ruamoko/qwaq/debugger/views/intview.h b/ruamoko/qwaq/debugger/views/intview.h
index fddb2f2d5..d2f271b21 100644
--- a/ruamoko/qwaq/debugger/views/intview.h
+++ b/ruamoko/qwaq/debugger/views/intview.h
@@ -1,7 +1,7 @@
 #ifndef __qwaq_debugger_intview_h
 #define __qwaq_debugger_intview_h
 
-#include "debugger/views/defview.h"
+#include "ruamoko/qwaq/debugger/views/defview.h"
 
 @interface IntView : DefView
 {
diff --git a/ruamoko/qwaq/debugger/views/intview.r b/ruamoko/qwaq/debugger/views/intview.r
index 6caad42ac..a7df120ed 100644
--- a/ruamoko/qwaq/debugger/views/intview.r
+++ b/ruamoko/qwaq/debugger/views/intview.r
@@ -1,5 +1,5 @@
 #include <string.h>
-#include "debugger/views/intview.h"
+#include "ruamoko/qwaq/debugger/views/intview.h"
 
 @implementation IntView
 
diff --git a/ruamoko/qwaq/debugger/views/nameview.h b/ruamoko/qwaq/debugger/views/nameview.h
index 7d5838bce..ee5622062 100644
--- a/ruamoko/qwaq/debugger/views/nameview.h
+++ b/ruamoko/qwaq/debugger/views/nameview.h
@@ -1,7 +1,7 @@
 #ifndef __qwaq_debugger_nameview_h
 #define __qwaq_debugger_nameview_h
 
-#include "debugger/views/defview.h"
+#include "ruamoko/qwaq/debugger/views/defview.h"
 
 @interface NameView : DefView
 {
diff --git a/ruamoko/qwaq/debugger/views/nameview.r b/ruamoko/qwaq/debugger/views/nameview.r
index 9764fedaf..0b66d838e 100644
--- a/ruamoko/qwaq/debugger/views/nameview.r
+++ b/ruamoko/qwaq/debugger/views/nameview.r
@@ -1,5 +1,5 @@
 #include <string.h>
-#include "debugger/views/nameview.h"
+#include "ruamoko/qwaq/debugger/views/nameview.h"
 
 @implementation NameView
 
diff --git a/ruamoko/qwaq/debugger/views/pointerview.h b/ruamoko/qwaq/debugger/views/pointerview.h
index 4853958e9..fb45f1ae3 100644
--- a/ruamoko/qwaq/debugger/views/pointerview.h
+++ b/ruamoko/qwaq/debugger/views/pointerview.h
@@ -1,7 +1,7 @@
 #ifndef __qwaq_debugger_pointerview_h
 #define __qwaq_debugger_pointerview_h
 
-#include "debugger/views/defview.h"
+#include "ruamoko/qwaq/debugger/views/defview.h"
 
 @interface PointerView : DefView
 {
diff --git a/ruamoko/qwaq/debugger/views/pointerview.r b/ruamoko/qwaq/debugger/views/pointerview.r
index 20743ea19..3a000ecf5 100644
--- a/ruamoko/qwaq/debugger/views/pointerview.r
+++ b/ruamoko/qwaq/debugger/views/pointerview.r
@@ -1,5 +1,5 @@
 #include <string.h>
-#include "debugger/views/pointerview.h"
+#include "ruamoko/qwaq/debugger/views/pointerview.h"
 
 @implementation PointerView
 
diff --git a/ruamoko/qwaq/debugger/views/quatview.h b/ruamoko/qwaq/debugger/views/quatview.h
index 189a600f8..b88f75811 100644
--- a/ruamoko/qwaq/debugger/views/quatview.h
+++ b/ruamoko/qwaq/debugger/views/quatview.h
@@ -1,7 +1,7 @@
 #ifndef __qwaq_debugger_quatview_h
 #define __qwaq_debugger_quatview_h
 
-#include "debugger/views/defview.h"
+#include "ruamoko/qwaq/debugger/views/defview.h"
 
 @interface QuatView : DefView
 {
diff --git a/ruamoko/qwaq/debugger/views/quatview.r b/ruamoko/qwaq/debugger/views/quatview.r
index ba98e9d2b..fe8ca0ea1 100644
--- a/ruamoko/qwaq/debugger/views/quatview.r
+++ b/ruamoko/qwaq/debugger/views/quatview.r
@@ -1,5 +1,5 @@
 #include <string.h>
-#include "debugger/views/quatview.h"
+#include "ruamoko/qwaq/debugger/views/quatview.h"
 
 @implementation QuatView
 
diff --git a/ruamoko/qwaq/debugger/views/stringview.h b/ruamoko/qwaq/debugger/views/stringview.h
index 5cabaf674..c8a49d131 100644
--- a/ruamoko/qwaq/debugger/views/stringview.h
+++ b/ruamoko/qwaq/debugger/views/stringview.h
@@ -1,7 +1,7 @@
 #ifndef __qwaq_debugger_stringview_h
 #define __qwaq_debugger_stringview_h
 
-#include "debugger/views/defview.h"
+#include "ruamoko/qwaq/debugger/views/defview.h"
 
 @interface StringView : DefView
 {
diff --git a/ruamoko/qwaq/debugger/views/stringview.r b/ruamoko/qwaq/debugger/views/stringview.r
index 79ef75212..d686fd636 100644
--- a/ruamoko/qwaq/debugger/views/stringview.r
+++ b/ruamoko/qwaq/debugger/views/stringview.r
@@ -1,5 +1,5 @@
 #include <string.h>
-#include "debugger/views/stringview.h"
+#include "ruamoko/qwaq/debugger/views/stringview.h"
 
 @implementation StringView
 
diff --git a/ruamoko/qwaq/debugger/views/uintview.h b/ruamoko/qwaq/debugger/views/uintview.h
index 9597c5519..5211b2ff7 100644
--- a/ruamoko/qwaq/debugger/views/uintview.h
+++ b/ruamoko/qwaq/debugger/views/uintview.h
@@ -1,7 +1,7 @@
 #ifndef __qwaq_debugger_uintview_h
 #define __qwaq_debugger_uintview_h
 
-#include "debugger/views/defview.h"
+#include "ruamoko/qwaq/debugger/views/defview.h"
 
 @interface UIntView : DefView
 {
diff --git a/ruamoko/qwaq/debugger/views/uintview.r b/ruamoko/qwaq/debugger/views/uintview.r
index e06ac32fa..c80b9b517 100644
--- a/ruamoko/qwaq/debugger/views/uintview.r
+++ b/ruamoko/qwaq/debugger/views/uintview.r
@@ -1,5 +1,5 @@
 #include <string.h>
-#include "debugger/views/uintview.h"
+#include "ruamoko/qwaq/debugger/views/uintview.h"
 
 @implementation UIntView
 
diff --git a/ruamoko/qwaq/debugger/views/vectorview.h b/ruamoko/qwaq/debugger/views/vectorview.h
index b6b95fa34..2a00c4e39 100644
--- a/ruamoko/qwaq/debugger/views/vectorview.h
+++ b/ruamoko/qwaq/debugger/views/vectorview.h
@@ -1,7 +1,7 @@
 #ifndef __qwaq_debugger_vectorview_h
 #define __qwaq_debugger_vectorview_h
 
-#include "debugger/views/defview.h"
+#include "ruamoko/qwaq/debugger/views/defview.h"
 
 @interface VectorView : DefView
 {
diff --git a/ruamoko/qwaq/debugger/views/vectorview.r b/ruamoko/qwaq/debugger/views/vectorview.r
index 2fa8b41ed..61a50c6af 100644
--- a/ruamoko/qwaq/debugger/views/vectorview.r
+++ b/ruamoko/qwaq/debugger/views/vectorview.r
@@ -1,5 +1,5 @@
 #include <string.h>
-#include "debugger/views/vectorview.h"
+#include "ruamoko/qwaq/debugger/views/vectorview.h"
 
 @implementation VectorView
 
diff --git a/ruamoko/qwaq/debugger/views/voidview.h b/ruamoko/qwaq/debugger/views/voidview.h
index 6232968e0..1c6655bb1 100644
--- a/ruamoko/qwaq/debugger/views/voidview.h
+++ b/ruamoko/qwaq/debugger/views/voidview.h
@@ -1,7 +1,7 @@
 #ifndef __qwaq_debugger_voidview_h
 #define __qwaq_debugger_voidview_h
 
-#include "debugger/views/defview.h"
+#include "ruamoko/qwaq/debugger/views/defview.h"
 
 @interface VoidView : DefView
 {
diff --git a/ruamoko/qwaq/debugger/views/voidview.r b/ruamoko/qwaq/debugger/views/voidview.r
index 440edece2..81e58b62c 100644
--- a/ruamoko/qwaq/debugger/views/voidview.r
+++ b/ruamoko/qwaq/debugger/views/voidview.r
@@ -1,5 +1,5 @@
 #include <string.h>
-#include "debugger/views/voidview.h"
+#include "ruamoko/qwaq/debugger/views/voidview.h"
 
 @implementation VoidView
 
diff --git a/ruamoko/qwaq/editor/editbuffer.r b/ruamoko/qwaq/editor/editbuffer.r
index 9a6da8396..cd7644f7d 100644
--- a/ruamoko/qwaq/editor/editbuffer.r
+++ b/ruamoko/qwaq/editor/editbuffer.r
@@ -1,4 +1,4 @@
-#include "editor/editbuffer.h"
+#include "ruamoko/qwaq/editor/editbuffer.h"
 
 @implementation EditBuffer
 +(EditBuffer *)buffer
diff --git a/ruamoko/qwaq/editor/editor.h b/ruamoko/qwaq/editor/editor.h
index b5bd4b7d5..cd04f8a8e 100644
--- a/ruamoko/qwaq/editor/editor.h
+++ b/ruamoko/qwaq/editor/editor.h
@@ -1,8 +1,8 @@
 #ifndef __qwaq_editor_editor_h
 #define __qwaq_editor_editor_h
 
-#include "editor/editbuffer.h"
-#include "ui/view.h"
+#include "ruamoko/qwaq/editor/editbuffer.h"
+#include "ruamoko/qwaq/ui/view.h"
 
 @class Editor;
 @class EditBuffer;
diff --git a/ruamoko/qwaq/editor/editor.r b/ruamoko/qwaq/editor/editor.r
index 8dd64c21d..62158dfe9 100644
--- a/ruamoko/qwaq/editor/editor.r
+++ b/ruamoko/qwaq/editor/editor.r
@@ -1,9 +1,9 @@
 #include <QF/keys.h>
 #include <string.h>
-#include "qwaq-app.h"
-#include "editor/editor.h"
-#include "ui/listener.h"
-#include "ui/scrollbar.h"
+#include "ruamoko/qwaq/qwaq-app.h"
+#include "ruamoko/qwaq/editor/editor.h"
+#include "ruamoko/qwaq/ui/listener.h"
+#include "ruamoko/qwaq/ui/scrollbar.h"
 
 @implementation Editor
 
diff --git a/ruamoko/qwaq/qwaq-app.h b/ruamoko/qwaq/qwaq-app.h
index bf6255740..a35cee787 100644
--- a/ruamoko/qwaq/qwaq-app.h
+++ b/ruamoko/qwaq/qwaq-app.h
@@ -3,8 +3,8 @@
 
 #include <Object.h>
 
-#include "ui/event.h"
-#include "ui/rect.h"
+#include "ruamoko/qwaq/ui/event.h"
+#include "ruamoko/qwaq/ui/rect.h"
 
 @class Array;
 @class Group;
diff --git a/ruamoko/qwaq/qwaq-app.r b/ruamoko/qwaq/qwaq-app.r
index e98f4d03f..9520cf67e 100644
--- a/ruamoko/qwaq/qwaq-app.r
+++ b/ruamoko/qwaq/qwaq-app.r
@@ -3,12 +3,12 @@ int fence;
 #include <AutoreleasePool.h>
 #include <key.h>
 
-#include "ui/color.h"
-#include "ui/curses.h"
-#include "ui/group.h"
-#include "ui/view.h"
-#include "debugger/debugger.h"
-#include "qwaq-app.h"
+#include "ruamoko/qwaq/ui/color.h"
+#include "ruamoko/qwaq/ui/curses.h"
+#include "ruamoko/qwaq/ui/group.h"
+#include "ruamoko/qwaq/ui/view.h"
+#include "ruamoko/qwaq/debugger/debugger.h"
+#include "ruamoko/qwaq/qwaq-app.h"
 
 int color_palette[64];
 
diff --git a/ruamoko/qwaq/ui/button.h b/ruamoko/qwaq/ui/button.h
index 8db47b4f8..7fc2e9716 100644
--- a/ruamoko/qwaq/ui/button.h
+++ b/ruamoko/qwaq/ui/button.h
@@ -1,8 +1,8 @@
 #ifndef __qwaq_ui_button_h
 #define __qwaq_ui_button_h
 
-#include "ui/draw.h"
-#include "ui/view.h"
+#include "ruamoko/qwaq/ui/draw.h"
+#include "ruamoko/qwaq/ui/view.h"
 
 @class ListenerGroup;
 
diff --git a/ruamoko/qwaq/ui/button.r b/ruamoko/qwaq/ui/button.r
index f2951d2f2..7f42fb3e4 100644
--- a/ruamoko/qwaq/ui/button.r
+++ b/ruamoko/qwaq/ui/button.r
@@ -1,5 +1,5 @@
-#include "ui/button.h"
-#include "ui/listener.h"
+#include "ruamoko/qwaq/ui/button.h"
+#include "ruamoko/qwaq/ui/listener.h"
 
 @implementation Button
 
diff --git a/ruamoko/qwaq/ui/curses.h b/ruamoko/qwaq/ui/curses.h
index 1849a6440..f3038365e 100644
--- a/ruamoko/qwaq/ui/curses.h
+++ b/ruamoko/qwaq/ui/curses.h
@@ -1,7 +1,7 @@
 #ifndef __qwaq_ui_curses_h
 #define __qwaq_ui_curses_h
 
-#include "ui/event.h"
+#include "ruamoko/qwaq/ui/event.h"
 
 typedef struct box_sides_s {
 	int         ls;
@@ -18,7 +18,7 @@ typedef struct box_corners_s {
 } box_corners_t;
 
 #ifdef __QFCC__
-#include "ui/rect.h"
+#include "ruamoko/qwaq/ui/rect.h"
 
 // names, order and comments lifted from ncurses.h
 typedef enum {
diff --git a/ruamoko/qwaq/ui/draw.h b/ruamoko/qwaq/ui/draw.h
index eb7379fe4..e9a9e44b5 100644
--- a/ruamoko/qwaq/ui/draw.h
+++ b/ruamoko/qwaq/ui/draw.h
@@ -3,7 +3,7 @@
 
 #include <Object.h>
 
-#include "ui/rect.h"
+#include "ruamoko/qwaq/ui/rect.h"
 
 @class DrawBuffer;
 
diff --git a/ruamoko/qwaq/ui/draw.r b/ruamoko/qwaq/ui/draw.r
index ebb75fcbd..aeaa00475 100644
--- a/ruamoko/qwaq/ui/draw.r
+++ b/ruamoko/qwaq/ui/draw.r
@@ -1,7 +1,7 @@
 #include <string.h>
 
-#include "ui/curses.h"
-#include "ui/draw.h"
+#include "ruamoko/qwaq/ui/curses.h"
+#include "ruamoko/qwaq/ui/draw.h"
 
 @implementation DrawBuffer
 
diff --git a/ruamoko/qwaq/ui/garray.r b/ruamoko/qwaq/ui/garray.r
index ee6bd0191..55aa35e88 100644
--- a/ruamoko/qwaq/ui/garray.r
+++ b/ruamoko/qwaq/ui/garray.r
@@ -1,6 +1,6 @@
 #include <Array.h>
-#include "ui/event.h"
-#include "ui/garray.h"
+#include "ruamoko/qwaq/ui/event.h"
+#include "ruamoko/qwaq/ui/garray.h"
 
 @implementation Array (Group)
 - (void) makeObjectsPerformSelector: (SEL)selector
diff --git a/ruamoko/qwaq/ui/group.h b/ruamoko/qwaq/ui/group.h
index 071ee53f0..c1b96b80d 100644
--- a/ruamoko/qwaq/ui/group.h
+++ b/ruamoko/qwaq/ui/group.h
@@ -3,8 +3,8 @@
 
 #include <Array.h>
 
-#include "ui/event.h"
-#include "ui/draw.h"
+#include "ruamoko/qwaq/ui/event.h"
+#include "ruamoko/qwaq/ui/draw.h"
 
 @class View;
 
diff --git a/ruamoko/qwaq/ui/group.r b/ruamoko/qwaq/ui/group.r
index 8bbca6d9b..e2e8e1890 100644
--- a/ruamoko/qwaq/ui/group.r
+++ b/ruamoko/qwaq/ui/group.r
@@ -1,9 +1,9 @@
 #include <Array.h>
-#include "ui/event.h"
-#include "ui/draw.h"
-#include "ui/garray.h"
-#include "ui/group.h"
-#include "ui/view.h"
+#include "ruamoko/qwaq/ui/event.h"
+#include "ruamoko/qwaq/ui/draw.h"
+#include "ruamoko/qwaq/ui/garray.h"
+#include "ruamoko/qwaq/ui/group.h"
+#include "ruamoko/qwaq/ui/view.h"
 
 @implementation Group
 
diff --git a/ruamoko/qwaq/ui/listener.r b/ruamoko/qwaq/ui/listener.r
index 31dd001fa..8fa43b01f 100644
--- a/ruamoko/qwaq/ui/listener.r
+++ b/ruamoko/qwaq/ui/listener.r
@@ -1,7 +1,7 @@
 #include <Array.h>
 
-#include "ui/listener.h"
-#include "ui/curses.h"
+#include "ruamoko/qwaq/ui/listener.h"
+#include "ruamoko/qwaq/ui/curses.h"
 
 @class Array;
 
diff --git a/ruamoko/qwaq/ui/proxyview.h b/ruamoko/qwaq/ui/proxyview.h
index d19a47ef0..c7d062cdc 100644
--- a/ruamoko/qwaq/ui/proxyview.h
+++ b/ruamoko/qwaq/ui/proxyview.h
@@ -1,7 +1,7 @@
 #ifndef __qwaq_ui_proxyview_h
 #define __qwaq_ui_proxyview_h
 
-#include "ui/view.h"
+#include "ruamoko/qwaq/ui/view.h"
 
 @class Group;
 
diff --git a/ruamoko/qwaq/ui/proxyview.r b/ruamoko/qwaq/ui/proxyview.r
index 71a85e36d..714b3fd9d 100644
--- a/ruamoko/qwaq/ui/proxyview.r
+++ b/ruamoko/qwaq/ui/proxyview.r
@@ -1,5 +1,5 @@
-#include "ui/group.h"
-#include "ui/proxyview.h"
+#include "ruamoko/qwaq/ui/group.h"
+#include "ruamoko/qwaq/ui/proxyview.h"
 
 @implementation ProxyView
 +(ProxyView *)withView:(View *)view
diff --git a/ruamoko/qwaq/ui/rect.r b/ruamoko/qwaq/ui/rect.r
index f2a51cf8d..905ee0385 100644
--- a/ruamoko/qwaq/ui/rect.r
+++ b/ruamoko/qwaq/ui/rect.r
@@ -1,4 +1,4 @@
-#include "ui/rect.h"
+#include "ruamoko/qwaq/ui/rect.h"
 
 Rect
 clipRect (Rect clipRect, Rect rect)
diff --git a/ruamoko/qwaq/ui/scrollbar.h b/ruamoko/qwaq/ui/scrollbar.h
index 986646878..404dbfaf7 100644
--- a/ruamoko/qwaq/ui/scrollbar.h
+++ b/ruamoko/qwaq/ui/scrollbar.h
@@ -1,7 +1,7 @@
 #ifndef __qwaq_ui_scrollbar_h
 #define __qwaq_ui_scrollbar_h
 
-#include "ui/view.h"
+#include "ruamoko/qwaq/ui/view.h"
 
 @class Button;
 @class DrawBuffer;
diff --git a/ruamoko/qwaq/ui/scrollbar.r b/ruamoko/qwaq/ui/scrollbar.r
index b8b005aa8..3d0eee6ce 100644
--- a/ruamoko/qwaq/ui/scrollbar.r
+++ b/ruamoko/qwaq/ui/scrollbar.r
@@ -1,7 +1,7 @@
-#include "ui/button.h"
-#include "ui/group.h"
-#include "ui/listener.h"
-#include "ui/scrollbar.h"
+#include "ruamoko/qwaq/ui/button.h"
+#include "ruamoko/qwaq/ui/group.h"
+#include "ruamoko/qwaq/ui/listener.h"
+#include "ruamoko/qwaq/ui/scrollbar.h"
 
 @implementation ScrollBar
 
diff --git a/ruamoko/qwaq/ui/tableview.h b/ruamoko/qwaq/ui/tableview.h
index 9a6233333..52bca6880 100644
--- a/ruamoko/qwaq/ui/tableview.h
+++ b/ruamoko/qwaq/ui/tableview.h
@@ -1,7 +1,7 @@
 #ifndef __qwaq_ui_tableview_h
 #define __qwaq_ui_tableview_h
 
-#include "ui/view.h"
+#include "ruamoko/qwaq/ui/view.h"
 
 @class DrawBuffer;
 @class TableView;
diff --git a/ruamoko/qwaq/ui/tableview.r b/ruamoko/qwaq/ui/tableview.r
index cb1a3f94c..940bf1793 100644
--- a/ruamoko/qwaq/ui/tableview.r
+++ b/ruamoko/qwaq/ui/tableview.r
@@ -1,6 +1,6 @@
 #include <Array.h>
-#include "ui/listener.h"
-#include "ui/tableview.h"
+#include "ruamoko/qwaq/ui/listener.h"
+#include "ruamoko/qwaq/ui/tableview.h"
 
 @implementation TableViewColumn
 -initWithName:(string)name width:(int)width
diff --git a/ruamoko/qwaq/ui/textcontext.h b/ruamoko/qwaq/ui/textcontext.h
index 2369dfeee..21f21b5ae 100644
--- a/ruamoko/qwaq/ui/textcontext.h
+++ b/ruamoko/qwaq/ui/textcontext.h
@@ -3,9 +3,9 @@
 
 #ifdef __QFCC__
 #include <Object.h>
-#include "ui/curses.h"
-#include "ui/draw.h"
-#include "ui/rect.h"
+#include "ruamoko/qwaq/ui/curses.h"
+#include "ruamoko/qwaq/ui/draw.h"
+#include "ruamoko/qwaq/ui/rect.h"
 
 @class DrawBuffer;
 
diff --git a/ruamoko/qwaq/ui/textcontext.r b/ruamoko/qwaq/ui/textcontext.r
index bbe7a9476..9d05765d7 100644
--- a/ruamoko/qwaq/ui/textcontext.r
+++ b/ruamoko/qwaq/ui/textcontext.r
@@ -1,5 +1,5 @@
-#include "ui/draw.h"
-#include "ui/textcontext.h"
+#include "ruamoko/qwaq/ui/draw.h"
+#include "ruamoko/qwaq/ui/textcontext.h"
 
 @implementation TextContext
 + (int) is_initialized = #0;
diff --git a/ruamoko/qwaq/ui/titlebar.h b/ruamoko/qwaq/ui/titlebar.h
index e71a41a25..a3290a20d 100644
--- a/ruamoko/qwaq/ui/titlebar.h
+++ b/ruamoko/qwaq/ui/titlebar.h
@@ -1,7 +1,7 @@
 #ifndef __qwaq_ui_titlebar_h
 #define __qwaq_ui_titlebar_h
 
-#include "ui/view.h"
+#include "ruamoko/qwaq/ui/view.h"
 
 @interface TitleBar : View
 {
diff --git a/ruamoko/qwaq/ui/titlebar.r b/ruamoko/qwaq/ui/titlebar.r
index db1f717de..d6634c2ad 100644
--- a/ruamoko/qwaq/ui/titlebar.r
+++ b/ruamoko/qwaq/ui/titlebar.r
@@ -1,7 +1,7 @@
 #include <string.h>
 
-#include "ui/group.h"
-#include "ui/titlebar.h"
+#include "ruamoko/qwaq/ui/group.h"
+#include "ruamoko/qwaq/ui/titlebar.h"
 
 @implementation TitleBar
 
diff --git a/ruamoko/qwaq/ui/view.h b/ruamoko/qwaq/ui/view.h
index e0da51a28..15e8d22d3 100644
--- a/ruamoko/qwaq/ui/view.h
+++ b/ruamoko/qwaq/ui/view.h
@@ -4,9 +4,9 @@
 #include <Array.h>
 #include <Object.h>
 
-#include "ui/draw.h"
-#include "ui/rect.h"
-#include "ui/textcontext.h"
+#include "ruamoko/qwaq/ui/draw.h"
+#include "ruamoko/qwaq/ui/rect.h"
+#include "ruamoko/qwaq/ui/textcontext.h"
 
 @class Group;
 @class ListenerGroup;
diff --git a/ruamoko/qwaq/ui/view.r b/ruamoko/qwaq/ui/view.r
index 579f804c1..014560ffd 100644
--- a/ruamoko/qwaq/ui/view.r
+++ b/ruamoko/qwaq/ui/view.r
@@ -1,8 +1,8 @@
-#include "ui/curses.h"
-#include "ui/listener.h"
-#include "ui/group.h"
-#include "ui/scrollbar.h"
-#include "ui/view.h"
+#include "ruamoko/qwaq/ui/curses.h"
+#include "ruamoko/qwaq/ui/listener.h"
+#include "ruamoko/qwaq/ui/group.h"
+#include "ruamoko/qwaq/ui/scrollbar.h"
+#include "ruamoko/qwaq/ui/view.h"
 
 @implementation View
 
diff --git a/ruamoko/qwaq/ui/window.h b/ruamoko/qwaq/ui/window.h
index 67a0608e2..8464a68ee 100644
--- a/ruamoko/qwaq/ui/window.h
+++ b/ruamoko/qwaq/ui/window.h
@@ -7,9 +7,9 @@
 @class Button;
 @class TitleBar;
 
-#include "ui/draw.h"
-#include "ui/rect.h"
-#include "ui/view.h"
+#include "ruamoko/qwaq/ui/draw.h"
+#include "ruamoko/qwaq/ui/rect.h"
+#include "ruamoko/qwaq/ui/view.h"
 
 @interface Window: View
 {
diff --git a/ruamoko/qwaq/ui/window.r b/ruamoko/qwaq/ui/window.r
index ea966d473..54dc574d6 100644
--- a/ruamoko/qwaq/ui/window.r
+++ b/ruamoko/qwaq/ui/window.r
@@ -1,14 +1,14 @@
 #include <Array.h>
 #include <string.h>
 
-#include "ui/event.h"
-#include "ui/button.h"
-#include "ui/curses.h"
-#include "ui/group.h"
-#include "ui/listener.h"
-#include "ui/titlebar.h"
-#include "ui/window.h"
-#include "ui/view.h"
+#include "ruamoko/qwaq/ui/event.h"
+#include "ruamoko/qwaq/ui/button.h"
+#include "ruamoko/qwaq/ui/curses.h"
+#include "ruamoko/qwaq/ui/group.h"
+#include "ruamoko/qwaq/ui/listener.h"
+#include "ruamoko/qwaq/ui/titlebar.h"
+#include "ruamoko/qwaq/ui/window.h"
+#include "ruamoko/qwaq/ui/view.h"
 
 @implementation Window
 
diff --git a/ruamoko/scheme/Makefile.am b/ruamoko/scheme/Makefile.am
deleted file mode 100644
index 9a5fb71a8..000000000
--- a/ruamoko/scheme/Makefile.am
+++ /dev/null
@@ -1,81 +0,0 @@
-AUTOMAKE_OPTIONS= foreign no-exeext
-
-QFCC_DEP=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT)
-QFCC=$(QFCC_DEP)
-
-GZ=@progs_gz@
-scheme_libs=libscheme.a
-scheme_libexec=main.dat
-
-pkglibdir=$(datarootdir)/qfcc/lib
-#FIXME where to put pkglibexec?
-#pkglibexecdir=$(datarootdir)/qfcc/bin
-
-pkglib_LIBRARIES= $(scheme_libs)
-EXTRA_LIBRARIES= $(scheme_libs)
-
-noinst_PROGRAMS= $(scheme_libexec)
-EXTRA_PROGRAMS = $(scheme_libexec)
-
-QCFLAGS=-qq -O -g -Werror -Wall -Wno-integer-divide
-QCPPFLAGS=--no-default-paths -I$(top_srcdir)/ruamoko/include
-QCLINKFLAGS=--no-default-paths -L$(top_builddir)/ruamoko/lib
-QCOMPILE=$(QFCC) $(QCFLAGS) $(QCPPFLAGS)
-QLINK=$(QFCC) $(QCFLAGS) $(QCLINKFLAGS)
-
-MKDIR_P = @MKDIR_P@
-am__mv = mv -f
-
-PAK=$(top_builddir)/tools/pak/pak$(EXEEXT)
-GZIP=if echo $@ | grep -q .gz; then gzip -f `basename $@ .gz`; if test -f `basename $@ .dat.gz`.sym; then gzip -f `basename $@ .dat.gz`.sym; fi; fi
-# BSD make can't handle $(shell foo) directives, and GNU make can't handle |=
-# so we have to bite the bullet and pass this to the shell every time.
-RANLIB=touch
-
-SUFFIXES=.o .r
-.r.o:
-	$(QCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tqo -c -o $@ $<
-	@sed -i -e '1s@:@: $(QFCC_DEP)@' $(DEPDIR)/$*.Tqo
-	@$(am__mv) $(DEPDIR)/$*.Tqo $(DEPDIR)/$*.Qo
-
-r_depfiles_remade=
-
-libscheme_a_SOURCES=\
-	SchemeObject.r Cons.r Number.r SchemeString.r Symbol.r Lexer.r Parser.r \
-	Nil.r Procedure.r Primitive.r Lambda.r Scope.r Instruction.r builtins.r \
-	Frame.r CompiledCode.r Compiler.r Continuation.r Machine.r Void.r \
-	Error.r Boolean.r BaseContinuation.r
-libscheme_a_obj=$(libscheme_a_SOURCES:.r=.o)
-libscheme_a_dep=$(addprefix ./$(DEPDIR)/,$(libscheme_a_obj:.o=.Qo))
-libscheme_a_AR=$(PAK) -cf
-include $(libscheme_a_dep) # am--include-marker
-r_depfiles_remade += $(libscheme_a_dep)
-
-scheme_src=\
-	main.r defs.r
-
-main_dat_SOURCES=$(scheme_src)
-main_obj=$(scheme_src:.r=.o)
-main_dep=$(addprefix ./$(DEPDIR)/,$(main_obj:.o=.Qo))
-main.dat: $(main_obj) $(QFCC_DEP) libscheme.a ../lib/libcsqc.a ../lib/libr.a
-	$(QLINK) -o main.dat $(main_obj) libscheme.a ../lib/libcsqc.a ../lib/libr.a
-include $(main_dep) # am--include-marker
-r_depfiles_remade += $(main_dep)
-
-main.sym: main.dat
-
-$(r_depfiles_remade):
-	$(MKDIR_P) $(@D)
-	echo '# dummy' >$@-t && $(am__mv) $@-t $@
-
-am--depfiles: $(am__depfiles_remade) $(r_depfiles_remade)
-
-EXTRA_DIST = \
-		BaseContinuation.h Boolean.h CompiledCode.h Compiler.h Cons.h \
-		Continuation.h Error.h Frame.h Instruction.h Lambda.h Lexer.h \
-		Machine.h Nil.h Number.h Parser.h Primitive.h Procedure.h \
-		SchemeObject.h SchemeString.h Scope.h Symbol.h Void.h builtins.h \
-		debug.h defs.h state.h \
-		\
-		main.r defs.r
-CLEANFILES= *.dat *.sym *.gz *.qfo *.o
diff --git a/ruamoko/scheme/Makemodule.am b/ruamoko/scheme/Makemodule.am
new file mode 100644
index 000000000..b3fcfb5d9
--- /dev/null
+++ b/ruamoko/scheme/Makemodule.am
@@ -0,0 +1,88 @@
+ruamoko_scheme_libs=ruamoko/scheme/libscheme.a
+ruamoko_scheme_libexec=ruamoko/scheme/main.dat$(EXEEXT)
+
+ruamoko_lib_LIBRARIES += $(ruamoko_scheme_libs)
+EXTRA_LIBRARIES += $(ruamoko_scheme_libs)
+
+noinst_PROGRAMS += $(ruamoko_scheme_libexec)
+EXTRA_PROGRAMS  += $(ruamoko_scheme_libexec)
+
+ruamoko_scheme_libscheme_a_SOURCES=\
+	ruamoko/scheme/SchemeObject.r \
+	ruamoko/scheme/Cons.r \
+	ruamoko/scheme/Number.r \
+	ruamoko/scheme/SchemeString.r \
+	ruamoko/scheme/Symbol.r \
+	ruamoko/scheme/Lexer.r \
+	ruamoko/scheme/Parser.r \
+	ruamoko/scheme/Nil.r \
+	ruamoko/scheme/Procedure.r \
+	ruamoko/scheme/Primitive.r \
+	ruamoko/scheme/Lambda.r \
+	ruamoko/scheme/Scope.r \
+	ruamoko/scheme/Instruction.r \
+	ruamoko/scheme/builtins.r \
+	ruamoko/scheme/Frame.r \
+	ruamoko/scheme/CompiledCode.r \
+	ruamoko/scheme/Compiler.r \
+	ruamoko/scheme/Continuation.r \
+	ruamoko/scheme/Machine.r \
+	ruamoko/scheme/Void.r \
+	ruamoko/scheme/Error.r \
+	ruamoko/scheme/Boolean.r \
+	ruamoko/scheme/BaseContinuation.r
+ruamoko_scheme_libscheme_a_dep=$(call qcautodep,$(ruamoko_scheme_libscheme_a_SOURCES))
+ruamoko_scheme_libscheme_a_AR=$(PAK) -cf
+EXTRA_ruamoko_scheme_libscheme_a_DEPENDENCIES=pak
+include $(ruamoko_scheme_libscheme_a_dep) # am--include-marker
+r_depfiles_remade += $(ruamoko_scheme_libscheme_a_dep)
+
+ruamoko_scheme_src=\
+	ruamoko/scheme/main.r \
+	ruamoko/scheme/defs.r
+
+ruamoko_scheme_main_dat_SOURCES=$(ruamoko_scheme_src)
+ruamoko_scheme_main_obj=$(ruamoko_scheme_main_dat_SOURCES:.r=.o)
+ruamoko_scheme_main_dep=$(call qcautodep,$(ruamoko_scheme_main_dat_SOURCES))
+ruamoko/scheme/main.dat$(EXEEXT): $(ruamoko_scheme_main_obj) $(QFCC_DEP) ruamoko/scheme/libscheme.a ruamoko/lib/libcsqc.a ruamoko/lib/libr.a
+	$(QLINK) -o $@ $(ruamoko_scheme_main_obj) -Lruamoko/scheme -lscheme -lcsqc -lr
+include $(ruamoko_scheme_main_dep) # am--include-marker
+r_depfiles_remade += $(ruamoko_scheme_main_dep)
+
+ruamoko/scheme/main.sym: ruamoko/scheme/main.dat$(EXEEXT)
+
+EXTRA_DIST += \
+	ruamoko/scheme/BaseContinuation.h \
+	ruamoko/scheme/Boolean.h \
+	ruamoko/scheme/CompiledCode.h \
+	ruamoko/scheme/Compiler.h \
+	ruamoko/scheme/Cons.h \
+	ruamoko/scheme/Continuation.h \
+	ruamoko/scheme/Error.h \
+	ruamoko/scheme/Frame.h \
+	ruamoko/scheme/Instruction.h \
+	ruamoko/scheme/Lambda.h \
+	ruamoko/scheme/Lexer.h \
+	ruamoko/scheme/Machine.h \
+	ruamoko/scheme/Nil.h \
+	ruamoko/scheme/Number.h \
+	ruamoko/scheme/Parser.h \
+	ruamoko/scheme/Primitive.h \
+	ruamoko/scheme/Procedure.h \
+	ruamoko/scheme/SchemeObject.h \
+	ruamoko/scheme/SchemeString.h \
+	ruamoko/scheme/Scope.h \
+	ruamoko/scheme/Symbol.h \
+	ruamoko/scheme/Void.h \
+	ruamoko/scheme/builtins.h \
+	ruamoko/scheme/debug.h \
+	ruamoko/scheme/defs.h \
+	ruamoko/scheme/state.h \
+	ruamoko/scheme/main.r \
+	ruamoko/scheme/defs.r
+CLEANFILES += \
+	ruamoko/scheme/*.dat \
+	ruamoko/scheme/*.sym
+DISTCLEANFILES += \
+	$(ruamoko_scheme_libscheme_a_dep) \
+	$(ruamoko_scheme_main_dep)
diff --git a/tools/Makefile.am b/tools/Makefile.am
deleted file mode 100644
index 768efdccb..000000000
--- a/tools/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-SUBDIRS=@tools_dirs@
-DIST_SUBDIRS=bsp2img carne pak qfbsp qfcc qflight qflmp qfmodelgen qfspritegen qfvis wad wav
-EXTRA_DIST= \
-	io_mesh_qfmdl/export_mdl.py io_mesh_qfmdl/import_mdl.py \
-	io_mesh_qfmdl/__init__.py io_mesh_qfmdl/mdl.py io_mesh_qfmdl/qfplist.py \
-	io_mesh_qfmdl/quakepal.py
diff --git a/tools/Makemodule.am b/tools/Makemodule.am
new file mode 100644
index 000000000..7a3805526
--- /dev/null
+++ b/tools/Makemodule.am
@@ -0,0 +1,20 @@
+include tools/bsp2img/Makemodule.am
+include tools/carne/Makemodule.am
+include tools/pak/Makemodule.am
+include tools/qfbsp/Makemodule.am
+include tools/qfcc/Makemodule.am
+include tools/qflight/Makemodule.am
+include tools/qflmp/Makemodule.am
+include tools/qfmodelgen/Makemodule.am
+include tools/qfspritegen/Makemodule.am
+include tools/qfvis/Makemodule.am
+include tools/wad/Makemodule.am
+include tools/wav/Makemodule.am
+
+EXTRA_DIST += \
+	tools/io_mesh_qfmdl/export_mdl.py \
+	tools/io_mesh_qfmdl/import_mdl.py \
+	tools/io_mesh_qfmdl/__init__.py \
+	tools/io_mesh_qfmdl/mdl.py \
+	tools/io_mesh_qfmdl/qfplist.py \
+	tools/io_mesh_qfmdl/quakepal.py
diff --git a/tools/bsp2img/Makefile.am b/tools/bsp2img/Makemodule.am
similarity index 60%
rename from tools/bsp2img/Makefile.am
rename to tools/bsp2img/Makemodule.am
index ceaeca266..bf58c14aa 100644
--- a/tools/bsp2img/Makefile.am
+++ b/tools/bsp2img/Makemodule.am
@@ -2,10 +2,8 @@ BSP2IMG_LIBS=@BSP2IMG_LIBS@
 BSP2IMG_DEPS=@BSP2IMG_DEPS@
 BSP2IMG_INCS=@BSP2IMG_INCS@
 
-AM_CPPFLAGS=	-I$(top_srcdir)/include $(BSP2IMG_INCS)
+bin_PROGRAMS += bsp2img
 
-bin_PROGRAMS=bsp2img
-
-bsp2img_SOURCES= bsp2img.c
+bsp2img_SOURCES= tools/bsp2img/bsp2img.c
 bsp2img_LDADD= $(BSP2IMG_LIBS)
 bsp2img_DEPENDENCIES= $(BSP2IMG_DEPS)
diff --git a/tools/carne/Makefile.am b/tools/carne/Makefile.am
deleted file mode 100644
index bec57857d..000000000
--- a/tools/carne/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-CARNE_LIBS=@CARNE_LIBS@
-CARNE_DEPS=@CARNE_DEPS@
-PAK_INCS=@CARNE_INCS@
-
-AM_CPPFLAGS= -I$(top_srcdir)/include $(CARNE_INCS)
-
-noinst_PROGRAMS= carne
-
-carne_SOURCES=	main.c
-carne_LDADD=	$(CARNE_LIBS)
-carne_DEPENDENCIES= $(CARNE_DEPS)
diff --git a/tools/carne/Makemodule.am b/tools/carne/Makemodule.am
new file mode 100644
index 000000000..24f5f056b
--- /dev/null
+++ b/tools/carne/Makemodule.am
@@ -0,0 +1,8 @@
+CARNE_LIBS=@CARNE_LIBS@
+CARNE_DEPS=@CARNE_DEPS@
+
+noinst_PROGRAMS += carne
+
+carne_SOURCES=	tools/carne/main.c
+carne_LDADD=	$(CARNE_LIBS)
+carne_DEPENDENCIES= $(CARNE_DEPS)
diff --git a/tools/pak/Makefile.am b/tools/pak/Makefile.am
deleted file mode 100644
index 5461c399e..000000000
--- a/tools/pak/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-PAK_LIBS=@PAK_LIBS@
-PAK_DEPS=@PAK_DEPS@
-PAK_INCS=@PAK_INCS@
-
-AM_CPPFLAGS= -I$(top_srcdir)/include $(PAK_INCS)
-
-bin_PROGRAMS=		pak
-bin_SCRIPTS=		zpak
-
-mans=				pak.1 zpak.1
-man_MANS=			$(mans)
-
-pak_SOURCES=		pak.c
-pak_LDADD=			$(PAK_LIBS)
-pak_DEPENDENCIES=	$(PAK_DEPS)
-
-EXTRA_DIST=pak.h zpak $(mans)
diff --git a/tools/pak/Makemodule.am b/tools/pak/Makemodule.am
new file mode 100644
index 000000000..d7a247e88
--- /dev/null
+++ b/tools/pak/Makemodule.am
@@ -0,0 +1,14 @@
+PAK_LIBS=@PAK_LIBS@
+PAK_DEPS=@PAK_DEPS@
+PAK_INCS=@PAK_INCS@
+
+bin_PROGRAMS +=		pak
+bin_SCRIPTS +=		tools/pak/zpak
+
+man_MANS +=			tools/pak/pak.1 tools/pak/zpak.1
+
+pak_SOURCES=		tools/pak/pak.c
+pak_LDADD=			$(PAK_LIBS)
+pak_DEPENDENCIES=	$(PAK_DEPS)
+
+EXTRA_DIST += tools/pak/pak.h tools/pak/zpak $(man_MANS)
diff --git a/tools/qfbsp/Makefile.am b/tools/qfbsp/Makefile.am
deleted file mode 100644
index f2bd807e0..000000000
--- a/tools/qfbsp/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-SUBDIRS=	include source
diff --git a/tools/qfbsp/Makemodule.am b/tools/qfbsp/Makemodule.am
new file mode 100644
index 000000000..c73468397
--- /dev/null
+++ b/tools/qfbsp/Makemodule.am
@@ -0,0 +1,2 @@
+include tools/qfbsp/include/Makemodule.am
+include tools/qfbsp/source/Makemodule.am
diff --git a/tools/qfbsp/include/Makefile.am b/tools/qfbsp/include/Makefile.am
deleted file mode 100644
index d4ab30d4e..000000000
--- a/tools/qfbsp/include/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-EXTRA_DIST= brush.h bsp5.h csg4.h draw.h map.h merge.h options.h outside.h \
-			portals.h readbsp.h region.h solidbsp.h surfaces.h tjunc.h \
-			writebsp.h
diff --git a/tools/qfbsp/include/Makemodule.am b/tools/qfbsp/include/Makemodule.am
new file mode 100644
index 000000000..0cf8e31dd
--- /dev/null
+++ b/tools/qfbsp/include/Makemodule.am
@@ -0,0 +1,16 @@
+EXTRA_DIST += \
+	tools/qfbsp/include/brush.h \
+	tools/qfbsp/include/bsp5.h \
+	tools/qfbsp/include/csg4.h \
+	tools/qfbsp/include/draw.h \
+	tools/qfbsp/include/map.h \
+	tools/qfbsp/include/merge.h \
+	tools/qfbsp/include/options.h \
+	tools/qfbsp/include/outside.h \
+	tools/qfbsp/include/portals.h \
+	tools/qfbsp/include/readbsp.h \
+	tools/qfbsp/include/region.h \
+	tools/qfbsp/include/solidbsp.h \
+	tools/qfbsp/include/surfaces.h \
+	tools/qfbsp/include/tjunc.h \
+	tools/qfbsp/include/writebsp.h
diff --git a/tools/qfbsp/source/Makefile.am b/tools/qfbsp/source/Makefile.am
deleted file mode 100644
index 8fd7f660b..000000000
--- a/tools/qfbsp/source/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-QFBSP_LIBS=@QFBSP_LIBS@
-QFBSP_DEPS=@QFBSP_DEPS@
-QFBSP_INCS=@QFBSP_INCS@
-
-AM_CPPFLAGS=	-I$(top_srcdir)/include $(QFBSP_INCS)
-
-bin_PROGRAMS=	qfbsp
-
-qfbsp_SOURCES= \
-		brush.c csg4.c map.c merge.c nodraw.c options.c outside.c portals.c \
-		qfbsp.c readbsp.c region.c solidbsp.c surfaces.c tjunc.c writebsp.c
-
-qfbsp_LDADD=		$(QFBSP_LIBS)
-qfbsp_DEPENDENCIES=	$(QFBSP_DEPS)
diff --git a/tools/qfbsp/source/Makemodule.am b/tools/qfbsp/source/Makemodule.am
new file mode 100644
index 000000000..2e3e9a524
--- /dev/null
+++ b/tools/qfbsp/source/Makemodule.am
@@ -0,0 +1,25 @@
+QFBSP_LIBS=@QFBSP_LIBS@
+QFBSP_DEPS=@QFBSP_DEPS@
+QFBSP_INCS=@QFBSP_INCS@
+
+bin_PROGRAMS += qfbsp
+
+qfbsp_SOURCES= \
+	tools/qfbsp/source/brush.c \
+	tools/qfbsp/source/csg4.c \
+	tools/qfbsp/source/map.c \
+	tools/qfbsp/source/merge.c \
+	tools/qfbsp/source/nodraw.c \
+	tools/qfbsp/source/options.c \
+	tools/qfbsp/source/outside.c \
+	tools/qfbsp/source/portals.c \
+	tools/qfbsp/source/qfbsp.c \
+	tools/qfbsp/source/readbsp.c \
+	tools/qfbsp/source/region.c \
+	tools/qfbsp/source/solidbsp.c \
+	tools/qfbsp/source/surfaces.c \
+	tools/qfbsp/source/tjunc.c \
+	tools/qfbsp/source/writebsp.c
+
+qfbsp_LDADD=		$(QFBSP_LIBS)
+qfbsp_DEPENDENCIES=	$(QFBSP_DEPS)
diff --git a/tools/qfbsp/source/brush.c b/tools/qfbsp/source/brush.c
index 940fddfb4..97ddbfd4d 100644
--- a/tools/qfbsp/source/brush.c
+++ b/tools/qfbsp/source/brush.c
@@ -32,11 +32,11 @@
 
 #include "compat.h"
 
-#include "brush.h"
-#include "bsp5.h"
-#include "draw.h"
-#include "options.h"
-#include "surfaces.h"
+#include "tools/qfbsp/include/brush.h"
+#include "tools/qfbsp/include/bsp5.h"
+#include "tools/qfbsp/include/draw.h"
+#include "tools/qfbsp/include/options.h"
+#include "tools/qfbsp/include/surfaces.h"
 
 /**	\addtogroup qfbsp_brush
 */
diff --git a/tools/qfbsp/source/csg4.c b/tools/qfbsp/source/csg4.c
index 444627334..76d11e2d1 100644
--- a/tools/qfbsp/source/csg4.c
+++ b/tools/qfbsp/source/csg4.c
@@ -27,13 +27,13 @@
 
 #include "QF/sys.h"
 
-#include "brush.h"
-#include "bsp5.h"
-#include "csg4.h"
-#include "draw.h"
-#include "merge.h"
-#include "solidbsp.h"
-#include "surfaces.h"
+#include "tools/qfbsp/include/brush.h"
+#include "tools/qfbsp/include/bsp5.h"
+#include "tools/qfbsp/include/csg4.h"
+#include "tools/qfbsp/include/draw.h"
+#include "tools/qfbsp/include/merge.h"
+#include "tools/qfbsp/include/solidbsp.h"
+#include "tools/qfbsp/include/surfaces.h"
 
 /**	\addtogroup qfbsp_csg4
 */
diff --git a/tools/qfbsp/source/map.c b/tools/qfbsp/source/map.c
index c258b73df..d8bb6c893 100644
--- a/tools/qfbsp/source/map.c
+++ b/tools/qfbsp/source/map.c
@@ -40,7 +40,7 @@
 
 #include "compat.h"
 
-#include "map.h"
+#include "tools/qfbsp/include/map.h"
 
 /**	\addtogroup qfbsp_map
 */
diff --git a/tools/qfbsp/source/merge.c b/tools/qfbsp/source/merge.c
index 5692a6d83..480af3896 100644
--- a/tools/qfbsp/source/merge.c
+++ b/tools/qfbsp/source/merge.c
@@ -23,12 +23,12 @@
 
 #include "QF/sys.h"
 
-#include "brush.h"
-#include "bsp5.h"
-#include "csg4.h"
-#include "draw.h"
-#include "merge.h"
-#include "surfaces.h"
+#include "tools/qfbsp/include/brush.h"
+#include "tools/qfbsp/include/bsp5.h"
+#include "tools/qfbsp/include/csg4.h"
+#include "tools/qfbsp/include/draw.h"
+#include "tools/qfbsp/include/merge.h"
+#include "tools/qfbsp/include/surfaces.h"
 
 /**	\addtogroup qfbsp_merge
 */
diff --git a/tools/qfbsp/source/nodraw.c b/tools/qfbsp/source/nodraw.c
index c333313c5..b7db6dc94 100644
--- a/tools/qfbsp/source/nodraw.c
+++ b/tools/qfbsp/source/nodraw.c
@@ -21,7 +21,7 @@
 # include "config.h"
 #endif
 
-#include "draw.h"
+#include "tools/qfbsp/include/draw.h"
 
 /**	\addtogroup qfbsp_draw
 */
diff --git a/tools/qfbsp/source/options.c b/tools/qfbsp/source/options.c
index 214065f9b..70b022b5d 100644
--- a/tools/qfbsp/source/options.c
+++ b/tools/qfbsp/source/options.c
@@ -40,7 +40,7 @@
 
 #include "QF/quakefs.h"
 
-#include "options.h"
+#include "tools/qfbsp/include/options.h"
 
 /**	\addtogroup qfbsp_options
 */
diff --git a/tools/qfbsp/source/outside.c b/tools/qfbsp/source/outside.c
index 3002f468b..15da18dba 100644
--- a/tools/qfbsp/source/outside.c
+++ b/tools/qfbsp/source/outside.c
@@ -22,12 +22,12 @@
 
 #include "QF/sys.h"
 
-#include "brush.h"
-#include "bsp5.h"
-#include "draw.h"
-#include "options.h"
-#include "portals.h"
-#include "outside.h"
+#include "tools/qfbsp/include/brush.h"
+#include "tools/qfbsp/include/bsp5.h"
+#include "tools/qfbsp/include/draw.h"
+#include "tools/qfbsp/include/options.h"
+#include "tools/qfbsp/include/portals.h"
+#include "tools/qfbsp/include/outside.h"
 
 /**	\addtogroup qfbsp_outside
 */
diff --git a/tools/qfbsp/source/portals.c b/tools/qfbsp/source/portals.c
index 4871aefbe..cbc128f1e 100644
--- a/tools/qfbsp/source/portals.c
+++ b/tools/qfbsp/source/portals.c
@@ -28,11 +28,11 @@
 
 #include "QF/sys.h"
 
-#include "brush.h"
-#include "bsp5.h"
-#include "draw.h"
-#include "options.h"
-#include "portals.h"
+#include "tools/qfbsp/include/brush.h"
+#include "tools/qfbsp/include/bsp5.h"
+#include "tools/qfbsp/include/draw.h"
+#include "tools/qfbsp/include/options.h"
+#include "tools/qfbsp/include/portals.h"
 
 /**	\addtogroup qfbsp_portals
 */
diff --git a/tools/qfbsp/source/qfbsp.c b/tools/qfbsp/source/qfbsp.c
index e3948acb8..abbc81029 100644
--- a/tools/qfbsp/source/qfbsp.c
+++ b/tools/qfbsp/source/qfbsp.c
@@ -43,18 +43,18 @@
 #include "QF/quakefs.h"
 #include "QF/sys.h"
 
-#include "csg4.h"
-#include "brush.h"
-#include "bsp5.h"
-#include "merge.h"
-#include "options.h"
-#include "outside.h"
-#include "portals.h"
-#include "readbsp.h"
-#include "solidbsp.h"
-#include "surfaces.h"
-#include "writebsp.h"
-#include "tjunc.h"
+#include "tools/qfbsp/include/csg4.h"
+#include "tools/qfbsp/include/brush.h"
+#include "tools/qfbsp/include/bsp5.h"
+#include "tools/qfbsp/include/merge.h"
+#include "tools/qfbsp/include/options.h"
+#include "tools/qfbsp/include/outside.h"
+#include "tools/qfbsp/include/portals.h"
+#include "tools/qfbsp/include/readbsp.h"
+#include "tools/qfbsp/include/solidbsp.h"
+#include "tools/qfbsp/include/surfaces.h"
+#include "tools/qfbsp/include/writebsp.h"
+#include "tools/qfbsp/include/tjunc.h"
 
 /**	\addtogroup qfbsp
 */
diff --git a/tools/qfbsp/source/readbsp.c b/tools/qfbsp/source/readbsp.c
index 4168a2ae5..caf69255b 100644
--- a/tools/qfbsp/source/readbsp.c
+++ b/tools/qfbsp/source/readbsp.c
@@ -48,11 +48,11 @@
 #include "QF/va.h"
 #include "QF/wad.h"
 
-#include "brush.h"
-#include "bsp5.h"
-#include "options.h"
-#include "portals.h"
-#include "readbsp.h"
+#include "tools/qfbsp/include/brush.h"
+#include "tools/qfbsp/include/bsp5.h"
+#include "tools/qfbsp/include/options.h"
+#include "tools/qfbsp/include/portals.h"
+#include "tools/qfbsp/include/readbsp.h"
 
 /**	\addtogroup qfbsp_readbsp
 */
diff --git a/tools/qfbsp/source/region.c b/tools/qfbsp/source/region.c
index b7c875a22..03dfd2efd 100644
--- a/tools/qfbsp/source/region.c
+++ b/tools/qfbsp/source/region.c
@@ -29,9 +29,9 @@
 
 #include "compat.h"
 
-#include "bsp5.h"
-#include "region.h"
-#include "surfaces.h"
+#include "tools/qfbsp/include/bsp5.h"
+#include "tools/qfbsp/include/region.h"
+#include "tools/qfbsp/include/surfaces.h"
 
 /**	\addtogroup qfbsp_region
 */
diff --git a/tools/qfbsp/source/solidbsp.c b/tools/qfbsp/source/solidbsp.c
index d4c9e0f7d..c49422c20 100644
--- a/tools/qfbsp/source/solidbsp.c
+++ b/tools/qfbsp/source/solidbsp.c
@@ -28,12 +28,12 @@
 
 #include "QF/sys.h"
 
-#include "brush.h"
-#include "csg4.h"
-#include "bsp5.h"
-#include "draw.h"
-#include "solidbsp.h"
-#include "surfaces.h"
+#include "tools/qfbsp/include/brush.h"
+#include "tools/qfbsp/include/csg4.h"
+#include "tools/qfbsp/include/bsp5.h"
+#include "tools/qfbsp/include/draw.h"
+#include "tools/qfbsp/include/solidbsp.h"
+#include "tools/qfbsp/include/surfaces.h"
 
 /**	\addtogroup qfbsp_solidbsp
 */
diff --git a/tools/qfbsp/source/surfaces.c b/tools/qfbsp/source/surfaces.c
index 9c467c0e1..2c9c08897 100644
--- a/tools/qfbsp/source/surfaces.c
+++ b/tools/qfbsp/source/surfaces.c
@@ -28,11 +28,11 @@
 
 #include "QF/sys.h"
 
-#include "bsp5.h"
-#include "csg4.h"
-#include "options.h"
-#include "region.h"
-#include "surfaces.h"
+#include "tools/qfbsp/include/bsp5.h"
+#include "tools/qfbsp/include/csg4.h"
+#include "tools/qfbsp/include/options.h"
+#include "tools/qfbsp/include/region.h"
+#include "tools/qfbsp/include/surfaces.h"
 
 /**	\addtogroup qfbsp_surface
 */
diff --git a/tools/qfbsp/source/tjunc.c b/tools/qfbsp/source/tjunc.c
index 50882df87..64588837d 100644
--- a/tools/qfbsp/source/tjunc.c
+++ b/tools/qfbsp/source/tjunc.c
@@ -29,10 +29,10 @@
 
 #include "compat.h"
 
-#include "brush.h"
-#include "bsp5.h"
-#include "options.h"
-#include "tjunc.h"
+#include "tools/qfbsp/include/brush.h"
+#include "tools/qfbsp/include/bsp5.h"
+#include "tools/qfbsp/include/options.h"
+#include "tools/qfbsp/include/tjunc.h"
 
 /**	\addtogroup qfbsp_tjunc
 */
diff --git a/tools/qfbsp/source/writebsp.c b/tools/qfbsp/source/writebsp.c
index fa95b4d57..94f679313 100644
--- a/tools/qfbsp/source/writebsp.c
+++ b/tools/qfbsp/source/writebsp.c
@@ -37,10 +37,10 @@
 #include "QF/va.h"
 #include "QF/wad.h"
 
-#include "brush.h"
-#include "bsp5.h"
-#include "options.h"
-#include "writebsp.h"
+#include "tools/qfbsp/include/brush.h"
+#include "tools/qfbsp/include/bsp5.h"
+#include "tools/qfbsp/include/options.h"
+#include "tools/qfbsp/include/writebsp.h"
 
 /**	\addtogroup qfbsp_writebsp
 */
diff --git a/tools/qfcc/Makefile.am b/tools/qfcc/Makefile.am
deleted file mode 100644
index b9050ce13..000000000
--- a/tools/qfcc/Makefile.am
+++ /dev/null
@@ -1,48 +0,0 @@
-#	Makefile.am
-#
-#	Automake-using build system for QuakeForge
-#
-#	Copyright (C) 2000 Jeff Teunissen <deek@quakeforge.net>
-#
-#	This Makefile is free software; you can redistribute it and/or
-#	modify it under the terms of the GNU General Public License
-#	as published by the Free Software Foundation; either version 2
-#	of the License, or (at your option) any later version.
-#
-#	This program is distributed in the hope that it will be useful,
-#	but WITHOUT ANY WARRANTY; without even the implied warranty of
-#	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-#
-#	See the GNU General Public License for more details.
-#
-#	You should have received a copy of the GNU General Public License
-#	along with this program; if not, write to:
-#
-#		Free Software Foundation, Inc.
-#		59 Temple Place - Suite 330
-#		Boston, MA  02111-1307, USA
-#
-#	$Id$
-#
-AUTOMAKE_OPTIONS= foreign
-
-SUBDIRS=	include source doc test
-
-dist-zip: distdir
-	-chmod -R a+r $(distdir)
-	ZIP="-r9q" zip $(distdir).zip $(NOCONV_DIST)
-	ZIP="-r9ql" zip $(distdir).zip $(distdir) -x $(NOCONV_DIST)
-	-rm -rf $(distdir)
-
-dist-bz2: distdir
-	-chmod -R a+r $(distdir)
-	BZIP2="-9" $(TAR) Ichof $(distdir).tar.bz2 $(distdir)
-	-rm -rf $(distdir)
-
-dist-all-local: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	BZIP2="-9" $(TAR) Ichof $(distdir).tar.bz2 $(distdir)
-	ZIP="-r9q" zip $(distdir).zip $(NOCONV_DIST)
-	ZIP="-r9ql" zip $(distdir).zip $(distdir) -x $(NOCONV_DIST)
-	-rm -rf $(distdir)
diff --git a/tools/qfcc/Makemodule.am b/tools/qfcc/Makemodule.am
new file mode 100644
index 000000000..e4159fbf3
--- /dev/null
+++ b/tools/qfcc/Makemodule.am
@@ -0,0 +1,4 @@
+include tools/qfcc/include/Makemodule.am
+include tools/qfcc/source/Makemodule.am
+include tools/qfcc/doc/Makemodule.am
+include tools/qfcc/test/Makemodule.am
diff --git a/tools/qfcc/bootstrap b/tools/qfcc/bootstrap
deleted file mode 100755
index 071d87a77..000000000
--- a/tools/qfcc/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-cd `dirname $0`
-aclocal && autoheader && automake --add-missing && autoconf
diff --git a/tools/qfcc/configure.in b/tools/qfcc/configure.in
deleted file mode 100644
index 3c6383d5a..000000000
--- a/tools/qfcc/configure.in
+++ /dev/null
@@ -1,144 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-
-AC_PREREQ(2.13)
-AC_INIT(source/qfcc.c)
-AC_REVISION($Revision$) dnl
-AM_CONFIG_HEADER(include/config.h)
-AC_CANONICAL_SYSTEM
-
-dnl Every other copy of the package version number gets its value from here
-AM_INIT_AUTOMAKE(qfcc, 0.1.0)
-
-AC_SUBST(VERSION)
-
-ISODATE=`date +%Y-%m-%d`
-AC_SUBST(ISODATE)
-
-AC_LANG_C
-
-dnl Checks for programs.
-AC_PROG_INSTALL
-AC_PROG_CC
-AC_PROG_CPP
-AC_PROG_YACC
-AM_PROG_LEX
-
-AC_ARG_WITH(cpp,
-[  --with-cpp=CPP          how qfcc should invoke cpp],
-	cpp_name="$withval", cpp_name=auto
-)
-if test "x$cpp_name" != xauto; then
-	CPP_NAME="$cpp_name"
-else
-	CPP_NAME="cpp %u %d %s -o %o %i"
-	case "$target_os" in
-		*bsd*)
-			touch conftest.c
-			CPP_NAME="`(f=\`$CC -v -E -Dfoo conftest.c -o conftest.i 2>&1 | grep -e -Dfoo\`; set $f; echo "$1")` %d %i %o"
-			rm -f conftest.[ci]
-			;;
-	esac
-fi
-AC_DEFINE_UNQUOTED(CPP_NAME, "$CPP_NAME", [Define this to the command line for the C preprocessor])
-
-dnl We want warnings, lots of warnings...
-if test "x$GCC" = xyes; then
-	CFLAGS="$CFLAGS -Wall -Werror"
-	#   CFLAGS="$CFLAGS -Wall -pedantic"
-fi
-
-dnl Checks for libraries.
-AC_CHECK_LIB(z, gztell,,
-)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(process.h string.h strings.h fcntl.h sys/stat.h sys/types.h sys/wait.h unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_ARG_ENABLE(profile,
-	[  --enable-profile        compile with profiling (for development)],
-	profile=$enable_profile
-)
-if test "x$profile" = xyes; then
-	BUILD_TYPE="$BUILD_TYPE Profile"
-	if test "x$GCC" = xyes; then
-		CFLAGS="`echo $CFLAGS | sed -e 's/-fomit-frame-pointer//g'` -pg"
-		LDFLAGS="$LDFLAGS -pg"
-	else
-		CFLAGS="$CFLAGS -p"
-	fi
-fi
-
-AC_DEFINE_UNQUOTED(PATH_SEPARATOR, '/',
-			[Define this to your operating system's path separator character])
-
-dnl Checks for library functions.
-
-AC_CHECK_FUNCS(snprintf _snprintf vsnprintf _vsnprintf)
-
-AC_MSG_CHECKING(for timeGetTime in -lwinmm)
-save_LIBS="$LIBS"
-LIBS="$LIBS -lwinmm"
-AC_TRY_COMPILE(
-	[#include <windows.h>],
-	[timeGetTime ();],
-	AC_MSG_RESULT(yes),
-	LIBS="$save_LIBS"
-	AC_MSG_RESULT(no)
-)
-
-AC_ARG_WITH(qf,
-[  --with-qf=DIR           location of QF libs and headers (prefix)],
-	if test "x$withval" != xyes ; then
-		LDFLAGS="$LDFLAGS -L${withval}/lib"
-		CFLAGS="$CFLAGS -I${withval}/include"
-	fi
-	,
-	HAVE_QF=auto
-)
-AC_MSG_CHECKING(for QF/qtypes.h)
-AC_TRY_COMPILE(
-	[#include "QF/qtypes.h"],
-	[qboolean foo = false;
-	 foo = true;],
-	AC_MSG_RESULT(yes),
-	AC_MSG_RESULT(no)
-	HAVE_QF=no
-)
-if test "x$HAVE_QF" != xno; then
-	AC_CHECK_LIB(QFutil, Hash_NewTable,
-	:, HAVE_QF=no,
-		[]
-	)
-fi
-if test "x$HAVE_QF" != xno; then
-	AC_CHECK_LIB(QFgamecode, PR_Opcode,
-	:, HAVE_QF=no,
-		[-lQFutil]
-	)
-fi
-
-QFCC_LIBS="-lQFgamecode -lQFutil"
-QFCC_DEPS=""
-QFCC_INCS=""
-
-if test "x$HAVE_QF" = xno; then
-	echo '***'
-	echo '*** You seem to not have the QuakeForge libs & headers installed'
-	echo '***'
-	exit 1
-fi
-
-AC_SUBST(QFCC_LIBS)
-AC_SUBST(QFCC_DEPS)
-AC_SUBST(QFCC_INCS)
-
-AC_OUTPUT(
-	doc/Makefile
-	doc/man/Makefile
-	include/Makefile
-	source/Makefile
-	Makefile
-	qfcc.lsm
-)
diff --git a/tools/qfcc/doc/Makefile.am b/tools/qfcc/doc/Makefile.am
deleted file mode 100644
index 8d0026abb..000000000
--- a/tools/qfcc/doc/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-SUBDIRS=	man
-
-EXTRA_DIST=	expressions.txt \
-	dot/vector-alias.dot
diff --git a/tools/qfcc/doc/Makemodule.am b/tools/qfcc/doc/Makemodule.am
new file mode 100644
index 000000000..121e06e82
--- /dev/null
+++ b/tools/qfcc/doc/Makemodule.am
@@ -0,0 +1,5 @@
+man_MANS += tools/qfcc/doc/man/qfcc.1
+
+EXTRA_DIST += \
+	tools/qfcc/doc/expressions.txt \
+	tools/qfcc/doc/dot/vector-alias.dot
diff --git a/tools/qfcc/doc/man/Makefile.am b/tools/qfcc/doc/man/Makefile.am
deleted file mode 100644
index cca3e62a5..000000000
--- a/tools/qfcc/doc/man/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-man_MANS=qfcc.1
-EXTRA_DIST=qfcc.1
diff --git a/tools/qfcc/include/Makefile.am b/tools/qfcc/include/Makefile.am
deleted file mode 100644
index 140cae90a..000000000
--- a/tools/qfcc/include/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-EXTRA_DIST= class.h codespace.h cpp.h dags.h debug.h def.h defspace.h \
-		diagnostic.h dot.h emit.h expr.h flow.h function.h grab.h idstuff.h \
-		linker.h method.h obj_file.h obj_type.h opcodes.h options.h pragma.h \
-		qfcc.h qfprogs.h reloc.h shared.h statements.h strpool.h struct.h \
-		switch.h symtab.h type.h value.h
diff --git a/tools/qfcc/include/Makemodule.am b/tools/qfcc/include/Makemodule.am
new file mode 100644
index 000000000..689ebad68
--- /dev/null
+++ b/tools/qfcc/include/Makemodule.am
@@ -0,0 +1,34 @@
+EXTRA_DIST += \
+	tools/qfcc/include/class.h \
+	tools/qfcc/include/codespace.h \
+	tools/qfcc/include/cpp.h \
+	tools/qfcc/include/dags.h \
+	tools/qfcc/include/debug.h \
+	tools/qfcc/include/def.h \
+	tools/qfcc/include/defspace.h \
+	tools/qfcc/include/diagnostic.h \
+	tools/qfcc/include/dot.h \
+	tools/qfcc/include/emit.h \
+	tools/qfcc/include/expr.h \
+	tools/qfcc/include/flow.h \
+	tools/qfcc/include/function.h \
+	tools/qfcc/include/grab.h \
+	tools/qfcc/include/idstuff.h \
+	tools/qfcc/include/linker.h \
+	tools/qfcc/include/method.h \
+	tools/qfcc/include/obj_file.h \
+	tools/qfcc/include/obj_type.h \
+	tools/qfcc/include/opcodes.h \
+	tools/qfcc/include/options.h \
+	tools/qfcc/include/pragma.h \
+	tools/qfcc/include/qfcc.h \
+	tools/qfcc/include/qfprogs.h \
+	tools/qfcc/include/reloc.h \
+	tools/qfcc/include/shared.h \
+	tools/qfcc/include/statements.h \
+	tools/qfcc/include/strpool.h \
+	tools/qfcc/include/struct.h \
+	tools/qfcc/include/switch.h \
+	tools/qfcc/include/symtab.h \
+	tools/qfcc/include/type.h \
+	tools/qfcc/include/value.h
diff --git a/tools/qfcc/source/Makefile.am b/tools/qfcc/source/Makefile.am
deleted file mode 100644
index b69dd6323..000000000
--- a/tools/qfcc/source/Makefile.am
+++ /dev/null
@@ -1,76 +0,0 @@
-## Process this file with automake to produce Makefile.in
-#
-#	Makefile.am
-#
-#	Automake-using build system for QuakeForge
-#
-#	Copyright (C) 2000 Jeff Teunissen <deek@quakeforge.net>
-#
-#	This Makefile is free software; you can redistribute it and/or
-#	modify it under the terms of the GNU General Public License
-#	as published by the Free Software Foundation; either version 2
-#	of the License, or (at your option) any later version.
-#
-#	This program is distributed in the hope that it will be useful,
-#	but WITHOUT ANY WARRANTY; without even the implied warranty of
-#	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-#
-#	See the GNU General Public License for more details.
-#
-#	You should have received a copy of the GNU General Public License
-#	along with this program; if not, write to:
-#
-#		Free Software Foundation, Inc.
-#		59 Temple Place - Suite 330
-#		Boston, MA  02111-1307, USA
-#
-#	$Id$
-#
-AUTOMAKE_OPTIONS= foreign
-
-QFCC_LIBS=@QFCC_LIBS@
-QFCC_DEPS=@QFCC_DEPS@
-QFCC_INCS=@QFCC_INCS@
-
-AM_CPPFLAGS=	-I$(top_srcdir)/include $(QFCC_INCS)
-YFLAGS = -v -d -Wno-yacc -Werror
-
-bin_PROGRAMS=	qfcc qfprogs
-bin_SCRIPTS=	qfpreqcc
-
-common_src=\
-	class.c codespace.c constfold.c cpp.c dags.c debug.c def.c defspace.c \
-	diagnostic.c \
-	dot.c dot_dag.c dot_expr.c dot_flow.c dot_sblock.c dot_type.c \
-	emit.c \
-	expr.c expr_assign.c expr_binary.c expr_bool.c expr_compound.c expr_obj.c \
-	flow.c function.c grab.c \
-	idstuff.c \
-	linker.c method.c \
-	obj_file.c \
-	obj_type.c opcodes.c options.c pragma.c qfcc.c reloc.c shared.c \
-	statements.c strpool.c struct.c switch.c symtab.c type.c value.c
-
-qfcc_SOURCES= qc-lex.l qc-parse.y qp-lex.l qp-parse.y $(common_src)
-qfcc_LDADD=			$(QFCC_LIBS)
-qfcc_DEPENDENCIES=	$(QFCC_DEPS)
-
-qfprogs_SOURCES= \
-	disassemble.c dump_globals.c dump_lines.c dump_modules.c dump_strings.c \
-	obj_file.c qfprogs.c strpool.c stub.c type.c
-qfprogs_LDADD=	$(QFCC_LIBS)
-qfprogs_DEPENDENCIES= $(QFCC_DEPS)
-
-BUILT_SOURCES=qc-parse.c qc-parse.h qc-lex.c qp-parse.c qp-parse.h qp-lex.c
-
-qc-parse.c: qc-parse.y
-	$(YACC) $(YFLAGS) -Dapi.prefix={qc_yy} $< -o $@
-qc-lex.c: qc-lex.l qc-parse.h
-	$(LEX) $(LFLAGS) $(AM_LFLAGS) -Pqc_yy -o$@ $<
-qp-parse.c: qp-parse.y
-	$(YACC) $(YFLAGS) -Dapi.prefix={qp_yy} $< -o $@
-qp-lex.c: qp-lex.l qp-parse.h
-	$(LEX) $(LFLAGS) $(AM_LFLAGS) -Pqp_yy -o$@ $<
-
-EXTRA_DIST=qc-lex.c qc-parse.c qc-parse.h qfpreqcc \
-			qp-parse.c qp-parse.h qp-lex.c
diff --git a/tools/qfcc/source/Makemodule.am b/tools/qfcc/source/Makemodule.am
new file mode 100644
index 000000000..d8db07b5c
--- /dev/null
+++ b/tools/qfcc/source/Makemodule.am
@@ -0,0 +1,92 @@
+QFCC_LIBS=@QFCC_LIBS@
+QFCC_DEPS=@QFCC_DEPS@
+QFCC_INCS=@QFCC_INCS@
+
+bin_PROGRAMS +=	qfcc qfprogs
+bin_SCRIPTS += tools/qfcc/source/qfpreqcc
+
+qfcc_SOURCES = \
+	tools/qfcc/source/class.c \
+	tools/qfcc/source/codespace.c \
+	tools/qfcc/source/constfold.c \
+	tools/qfcc/source/cpp.c \
+	tools/qfcc/source/dags.c \
+	tools/qfcc/source/debug.c \
+	tools/qfcc/source/def.c \
+	tools/qfcc/source/defspace.c \
+	tools/qfcc/source/diagnostic.c \
+	tools/qfcc/source/dot.c \
+	tools/qfcc/source/dot_dag.c \
+	tools/qfcc/source/dot_expr.c \
+	tools/qfcc/source/dot_flow.c \
+	tools/qfcc/source/dot_sblock.c \
+	tools/qfcc/source/dot_type.c \
+	tools/qfcc/source/emit.c \
+	tools/qfcc/source/expr.c \
+	tools/qfcc/source/expr_assign.c \
+	tools/qfcc/source/expr_binary.c \
+	tools/qfcc/source/expr_bool.c \
+	tools/qfcc/source/expr_compound.c \
+	tools/qfcc/source/expr_obj.c \
+	tools/qfcc/source/flow.c \
+	tools/qfcc/source/function.c \
+	tools/qfcc/source/grab.c \
+	tools/qfcc/source/idstuff.c \
+	tools/qfcc/source/linker.c \
+	tools/qfcc/source/method.c \
+	tools/qfcc/source/obj_file.c \
+	tools/qfcc/source/obj_type.c \
+	tools/qfcc/source/opcodes.c \
+	tools/qfcc/source/options.c \
+	tools/qfcc/source/pragma.c \
+	tools/qfcc/source/qc-lex.l \
+	tools/qfcc/source/qc-parse.y \
+	tools/qfcc/source/qfcc.c \
+	tools/qfcc/source/qp-lex.l \
+	tools/qfcc/source/qp-parse.y  \
+	tools/qfcc/source/reloc.c \
+	tools/qfcc/source/shared.c \
+	tools/qfcc/source/statements.c \
+	tools/qfcc/source/strpool.c \
+	tools/qfcc/source/struct.c \
+	tools/qfcc/source/switch.c \
+	tools/qfcc/source/symtab.c \
+	tools/qfcc/source/type.c \
+	tools/qfcc/source/value.c
+
+qfcc_LDADD=			$(QFCC_LIBS)
+qfcc_DEPENDENCIES=	$(QFCC_DEPS)
+
+qfprogs_SOURCES= \
+	tools/qfcc/source/disassemble.c \
+	tools/qfcc/source/dump_globals.c \
+	tools/qfcc/source/dump_lines.c \
+	tools/qfcc/source/dump_modules.c \
+	tools/qfcc/source/dump_strings.c \
+	tools/qfcc/source/obj_file.c \
+	tools/qfcc/source/qfprogs.c \
+	tools/qfcc/source/strpool.c \
+	tools/qfcc/source/stub.c \
+	tools/qfcc/source/type.c
+qfprogs_LDADD=	$(QFCC_LIBS)
+qfprogs_DEPENDENCIES= $(QFCC_DEPS)
+
+BUILT_SOURCES += \
+	tools/qfcc/source/qc-parse.c \
+	tools/qfcc/source/qc-parse.h \
+	tools/qfcc/source/qc-lex.c \
+	tools/qfcc/source/qp-parse.c \
+	tools/qfcc/source/qp-parse.h \
+	tools/qfcc/source/qp-lex.c
+
+tools/qfcc/source/qc-parse.c: tools/qfcc/source/qc-parse.y
+	$(YACC) $(YFLAGS) -Dapi.prefix={qc_yy} $< -o $@
+tools/qfcc/source/qc-lex.c: tools/qfcc/source/qc-lex.l tools/qfcc/source/qc-parse.h
+	$(LEX) $(LFLAGS) $(AM_LFLAGS) -Pqc_yy -o$@ $<
+tools/qfcc/source/qp-parse.c: tools/qfcc/source/qp-parse.y
+	$(YACC) $(YFLAGS) -Dapi.prefix={qp_yy} $< -o $@
+tools/qfcc/source/qp-lex.c: tools/qfcc/source/qp-lex.l tools/qfcc/source/qp-parse.h
+	$(LEX) $(LFLAGS) $(AM_LFLAGS) -Pqp_yy -o$@ $<
+
+EXTRA_DIST += \
+	tools/qfcc/source/qfpreqcc
diff --git a/tools/qfcc/source/class.c b/tools/qfcc/source/class.c
index 38ffd54a8..52a3e194a 100644
--- a/tools/qfcc/source/class.c
+++ b/tools/qfcc/source/class.c
@@ -44,24 +44,24 @@
 #include "QF/pr_obj.h"
 #include "QF/va.h"
 
-#include "qfcc.h"
+#include "tools/qfcc/include/qfcc.h"
 
-#include "codespace.h"
-#include "class.h"
-#include "def.h"
-#include "defspace.h"
-#include "diagnostic.h"
-#include "emit.h"
-#include "expr.h"
-#include "method.h"
-#include "options.h"
-#include "reloc.h"
-#include "shared.h"
-#include "strpool.h"
-#include "struct.h"
-#include "symtab.h"
-#include "type.h"
-#include "value.h"
+#include "tools/qfcc/include/codespace.h"
+#include "tools/qfcc/include/class.h"
+#include "tools/qfcc/include/def.h"
+#include "tools/qfcc/include/defspace.h"
+#include "tools/qfcc/include/diagnostic.h"
+#include "tools/qfcc/include/emit.h"
+#include "tools/qfcc/include/expr.h"
+#include "tools/qfcc/include/method.h"
+#include "tools/qfcc/include/options.h"
+#include "tools/qfcc/include/reloc.h"
+#include "tools/qfcc/include/shared.h"
+#include "tools/qfcc/include/strpool.h"
+#include "tools/qfcc/include/struct.h"
+#include "tools/qfcc/include/symtab.h"
+#include "tools/qfcc/include/type.h"
+#include "tools/qfcc/include/value.h"
 
 static hashtab_t *class_hash;
 static hashtab_t *category_hash;
diff --git a/tools/qfcc/source/codespace.c b/tools/qfcc/source/codespace.c
index 797bc5707..b7cd56bcc 100644
--- a/tools/qfcc/source/codespace.c
+++ b/tools/qfcc/source/codespace.c
@@ -41,7 +41,7 @@
 
 #include "QF/pr_comp.h"
 
-#include "codespace.h"
+#include "tools/qfcc/include/codespace.h"
 
 codespace_t *
 codespace_new (void)
diff --git a/tools/qfcc/source/constfold.c b/tools/qfcc/source/constfold.c
index 439f4760f..2d2c1400d 100644
--- a/tools/qfcc/source/constfold.c
+++ b/tools/qfcc/source/constfold.c
@@ -42,14 +42,15 @@
 #include <QF/dstring.h>
 #include <QF/mathlib.h>
 
-#include "diagnostic.h"
-#include "expr.h"
-#include "options.h"
-#include "qfcc.h"
-#include "strpool.h"
-#include "type.h"
-#include "value.h"
-#include "qc-parse.h"
+#include "tools/qfcc/include/diagnostic.h"
+#include "tools/qfcc/include/expr.h"
+#include "tools/qfcc/include/options.h"
+#include "tools/qfcc/include/qfcc.h"
+#include "tools/qfcc/include/strpool.h"
+#include "tools/qfcc/include/type.h"
+#include "tools/qfcc/include/value.h"
+
+#include "tools/qfcc/source/qc-parse.h"
 
 typedef expr_t *(*operation_t) (int op, expr_t *e, expr_t *e1, expr_t *e2);
 typedef expr_t *(*unaryop_t) (int op, expr_t *e, expr_t *e1);
diff --git a/tools/qfcc/source/cpp.c b/tools/qfcc/source/cpp.c
index 71b42c6d1..1adb1301b 100644
--- a/tools/qfcc/source/cpp.c
+++ b/tools/qfcc/source/cpp.c
@@ -54,9 +54,9 @@
 
 #include "QF/dstring.h"
 
-#include "cpp.h"
-#include "diagnostic.h"
-#include "options.h"
+#include "tools/qfcc/include/cpp.h"
+#include "tools/qfcc/include/diagnostic.h"
+#include "tools/qfcc/include/options.h"
 
 typedef struct cpp_arg_s {
 	struct cpp_arg_s *next;
diff --git a/tools/qfcc/source/dags.c b/tools/qfcc/source/dags.c
index 680abca84..8dec15fa2 100644
--- a/tools/qfcc/source/dags.c
+++ b/tools/qfcc/source/dags.c
@@ -47,18 +47,18 @@
 #include "QF/mathlib.h"
 #include "QF/set.h"
 
-#include "dags.h"
-#include "diagnostic.h"
-#include "dot.h"
-#include "flow.h"
-#include "function.h"
-#include "options.h"
-#include "qfcc.h"
-#include "statements.h"
-#include "strpool.h"
-#include "symtab.h"
-#include "type.h"
-#include "value.h"
+#include "tools/qfcc/include/dags.h"
+#include "tools/qfcc/include/diagnostic.h"
+#include "tools/qfcc/include/dot.h"
+#include "tools/qfcc/include/flow.h"
+#include "tools/qfcc/include/function.h"
+#include "tools/qfcc/include/options.h"
+#include "tools/qfcc/include/qfcc.h"
+#include "tools/qfcc/include/statements.h"
+#include "tools/qfcc/include/strpool.h"
+#include "tools/qfcc/include/symtab.h"
+#include "tools/qfcc/include/type.h"
+#include "tools/qfcc/include/value.h"
 
 static daglabel_t *labels_freelist;
 static dagnode_t *nodes_freelist;
diff --git a/tools/qfcc/source/debug.c b/tools/qfcc/source/debug.c
index 7086f44dc..ec0367fa0 100644
--- a/tools/qfcc/source/debug.c
+++ b/tools/qfcc/source/debug.c
@@ -43,18 +43,18 @@
 #include "QF/alloc.h"
 #include "QF/pr_comp.h"
 
-#include "debug.h"
-#include "def.h"
-#include "defspace.h"
-#include "diagnostic.h"
-#include "emit.h"
-#include "expr.h"
-#include "qfcc.h"
-#include "reloc.h"
-#include "strpool.h"
-#include "struct.h"
-#include "type.h"
-#include "value.h"
+#include "tools/qfcc/include/debug.h"
+#include "tools/qfcc/include/def.h"
+#include "tools/qfcc/include/defspace.h"
+#include "tools/qfcc/include/diagnostic.h"
+#include "tools/qfcc/include/emit.h"
+#include "tools/qfcc/include/expr.h"
+#include "tools/qfcc/include/qfcc.h"
+#include "tools/qfcc/include/reloc.h"
+#include "tools/qfcc/include/strpool.h"
+#include "tools/qfcc/include/struct.h"
+#include "tools/qfcc/include/type.h"
+#include "tools/qfcc/include/value.h"
 
 int         lineno_base;
 
diff --git a/tools/qfcc/source/def.c b/tools/qfcc/source/def.c
index 1450f0f45..1fb204a67 100644
--- a/tools/qfcc/source/def.c
+++ b/tools/qfcc/source/def.c
@@ -45,22 +45,22 @@
 #include "QF/sys.h"
 #include "QF/va.h"
 
-#include "qfcc.h"
-#include "class.h"
-#include "def.h"
-#include "defspace.h"
-#include "diagnostic.h"
-#include "emit.h"
-#include "expr.h"
-#include "function.h"
-#include "options.h"
-#include "reloc.h"
-#include "shared.h"
-#include "strpool.h"
-#include "struct.h"
-#include "symtab.h"
-#include "type.h"
-#include "value.h"
+#include "tools/qfcc/include/qfcc.h"
+#include "tools/qfcc/include/class.h"
+#include "tools/qfcc/include/def.h"
+#include "tools/qfcc/include/defspace.h"
+#include "tools/qfcc/include/diagnostic.h"
+#include "tools/qfcc/include/emit.h"
+#include "tools/qfcc/include/expr.h"
+#include "tools/qfcc/include/function.h"
+#include "tools/qfcc/include/options.h"
+#include "tools/qfcc/include/reloc.h"
+#include "tools/qfcc/include/shared.h"
+#include "tools/qfcc/include/strpool.h"
+#include "tools/qfcc/include/struct.h"
+#include "tools/qfcc/include/symtab.h"
+#include "tools/qfcc/include/type.h"
+#include "tools/qfcc/include/value.h"
 
 static def_t *defs_freelist;
 
diff --git a/tools/qfcc/source/defspace.c b/tools/qfcc/source/defspace.c
index 4c3b80ab9..72537f2d0 100644
--- a/tools/qfcc/source/defspace.c
+++ b/tools/qfcc/source/defspace.c
@@ -44,15 +44,15 @@
 #include "QF/sys.h"
 #include "QF/va.h"
 
-#include "qfcc.h"
-#include "defspace.h"
-#include "diagnostic.h"
-#include "expr.h"
-#include "options.h"
-#include "reloc.h"
-#include "strpool.h"
-#include "struct.h"
-#include "type.h"
+#include "tools/qfcc/include/qfcc.h"
+#include "tools/qfcc/include/defspace.h"
+#include "tools/qfcc/include/diagnostic.h"
+#include "tools/qfcc/include/expr.h"
+#include "tools/qfcc/include/options.h"
+#include "tools/qfcc/include/reloc.h"
+#include "tools/qfcc/include/strpool.h"
+#include "tools/qfcc/include/struct.h"
+#include "tools/qfcc/include/type.h"
 
 typedef struct locref_s {
 	struct locref_s *next;
diff --git a/tools/qfcc/source/diagnostic.c b/tools/qfcc/source/diagnostic.c
index ab830280a..d7f9fa1fb 100644
--- a/tools/qfcc/source/diagnostic.c
+++ b/tools/qfcc/source/diagnostic.c
@@ -33,13 +33,13 @@
 
 #include <QF/dstring.h>
 
-#include "qfcc.h"
-#include "class.h"
-#include "diagnostic.h"
-#include "expr.h"
-#include "function.h"
-#include "options.h"
-#include "strpool.h"
+#include "tools/qfcc/include/qfcc.h"
+#include "tools/qfcc/include/class.h"
+#include "tools/qfcc/include/diagnostic.h"
+#include "tools/qfcc/include/expr.h"
+#include "tools/qfcc/include/function.h"
+#include "tools/qfcc/include/options.h"
+#include "tools/qfcc/include/strpool.h"
 
 diagnostic_hook bug_hook;
 diagnostic_hook error_hook;
diff --git a/tools/qfcc/source/disassemble.c b/tools/qfcc/source/disassemble.c
index 06624013c..7002510bc 100644
--- a/tools/qfcc/source/disassemble.c
+++ b/tools/qfcc/source/disassemble.c
@@ -56,7 +56,7 @@
 #include "QF/progs.h"
 #include "QF/sys.h"
 
-#include "qfprogs.h"
+#include "tools/qfcc/include/qfprogs.h"
 
 void
 disassemble_progs (progs_t *pr)
diff --git a/tools/qfcc/source/dot.c b/tools/qfcc/source/dot.c
index 51d82993a..333104dad 100644
--- a/tools/qfcc/source/dot.c
+++ b/tools/qfcc/source/dot.c
@@ -35,10 +35,10 @@
 
 #include "QF/va.h"
 
-#include "dot.h"
-#include "function.h"
-#include "options.h"
-#include "strpool.h"
+#include "tools/qfcc/include/dot.h"
+#include "tools/qfcc/include/function.h"
+#include "tools/qfcc/include/options.h"
+#include "tools/qfcc/include/strpool.h"
 
 static function_t *last_func;
 static int dot_index;
diff --git a/tools/qfcc/source/dot_dag.c b/tools/qfcc/source/dot_dag.c
index e954f75d3..541993735 100644
--- a/tools/qfcc/source/dot_dag.c
+++ b/tools/qfcc/source/dot_dag.c
@@ -44,11 +44,11 @@
 #include "QF/set.h"
 #include "QF/va.h"
 
-#include "dags.h"
-#include "statements.h"
-#include "strpool.h"
-#include "symtab.h"
-#include "type.h"
+#include "tools/qfcc/include/dags.h"
+#include "tools/qfcc/include/statements.h"
+#include "tools/qfcc/include/strpool.h"
+#include "tools/qfcc/include/symtab.h"
+#include "tools/qfcc/include/type.h"
 
 static void
 print_node_def (dstring_t *dstr, dag_t *dag, dagnode_t *node)
diff --git a/tools/qfcc/source/dot_expr.c b/tools/qfcc/source/dot_expr.c
index 82c29c8d6..4db09bc39 100644
--- a/tools/qfcc/source/dot_expr.c
+++ b/tools/qfcc/source/dot_expr.c
@@ -46,11 +46,12 @@
 
 #include "qfalloca.h"
 
-#include "expr.h"
-#include "symtab.h"
-#include "type.h"
-#include "qc-parse.h"
-#include "strpool.h"
+#include "tools/qfcc/include/expr.h"
+#include "tools/qfcc/include/symtab.h"
+#include "tools/qfcc/include/type.h"
+#include "tools/qfcc/include/strpool.h"
+
+#include "tools/qfcc/source/qc-parse.h"
 
 const char *expr_names[] =
 {
diff --git a/tools/qfcc/source/dot_flow.c b/tools/qfcc/source/dot_flow.c
index 68f043d98..0320ebb2d 100644
--- a/tools/qfcc/source/dot_flow.c
+++ b/tools/qfcc/source/dot_flow.c
@@ -44,12 +44,12 @@
 #include "QF/set.h"
 #include "QF/va.h"
 
-#include "dags.h"
-#include "flow.h"
-#include "function.h"
-#include "expr.h"
-#include "statements.h"
-#include "strpool.h"
+#include "tools/qfcc/include/dags.h"
+#include "tools/qfcc/include/flow.h"
+#include "tools/qfcc/include/function.h"
+#include "tools/qfcc/include/expr.h"
+#include "tools/qfcc/include/statements.h"
+#include "tools/qfcc/include/strpool.h"
 
 typedef struct {
 	void (*node) (dstring_t *, flowgraph_t *, flownode_t *, int);
diff --git a/tools/qfcc/source/dot_sblock.c b/tools/qfcc/source/dot_sblock.c
index 8e003aa6b..18089681c 100644
--- a/tools/qfcc/source/dot_sblock.c
+++ b/tools/qfcc/source/dot_sblock.c
@@ -44,15 +44,15 @@
 #include <QF/set.h>
 #include <QF/va.h>
 
-#include "dags.h"
-#include "flow.h"
-#include "expr.h"
-#include "qfcc.h"
-#include "function.h"
-#include "statements.h"
-#include "strpool.h"
-#include "symtab.h"
-#include "type.h"
+#include "tools/qfcc/include/dags.h"
+#include "tools/qfcc/include/flow.h"
+#include "tools/qfcc/include/expr.h"
+#include "tools/qfcc/include/qfcc.h"
+#include "tools/qfcc/include/function.h"
+#include "tools/qfcc/include/statements.h"
+#include "tools/qfcc/include/strpool.h"
+#include "tools/qfcc/include/symtab.h"
+#include "tools/qfcc/include/type.h"
 
 static void
 flow_statement (dstring_t *dstr, statement_t *s)
diff --git a/tools/qfcc/source/dot_type.c b/tools/qfcc/source/dot_type.c
index bffa4aa70..ae58552b4 100644
--- a/tools/qfcc/source/dot_type.c
+++ b/tools/qfcc/source/dot_type.c
@@ -44,11 +44,10 @@
 #include <QF/quakeio.h>
 #include <QF/va.h>
 
-#include "class.h"
-#include "symtab.h"
-#include "type.h"
-#include "qc-parse.h"
-#include "strpool.h"
+#include "tools/qfcc/include/class.h"
+#include "tools/qfcc/include/symtab.h"
+#include "tools/qfcc/include/type.h"
+#include "tools/qfcc/include/strpool.h"
 
 typedef void (*print_f) (dstring_t *dstr, type_t *, int, int);
 static void dot_print_type (dstring_t *dstr, type_t *t, int level, int id);
diff --git a/tools/qfcc/source/dump_globals.c b/tools/qfcc/source/dump_globals.c
index 49c78fa5d..fe166885c 100644
--- a/tools/qfcc/source/dump_globals.c
+++ b/tools/qfcc/source/dump_globals.c
@@ -43,11 +43,11 @@
 #include "QF/progs.h"
 #include "QF/va.h"
 
-#include "obj_file.h"
-#include "obj_type.h"
-#include "qfprogs.h"
-#include "reloc.h"
-#include "strpool.h"
+#include "tools/qfcc/include/obj_file.h"
+#include "tools/qfcc/include/obj_type.h"
+#include "tools/qfcc/include/qfprogs.h"
+#include "tools/qfcc/include/reloc.h"
+#include "tools/qfcc/include/strpool.h"
 
 static int
 cmp (const void *_a, const void *_b)
diff --git a/tools/qfcc/source/dump_lines.c b/tools/qfcc/source/dump_lines.c
index c98bfa0aa..46382cf11 100644
--- a/tools/qfcc/source/dump_lines.c
+++ b/tools/qfcc/source/dump_lines.c
@@ -43,8 +43,8 @@
 #include "QF/progs.h"
 #include "QF/pr_type.h"
 
-#include "obj_file.h"
-#include "qfprogs.h"
+#include "tools/qfcc/include/obj_file.h"
+#include "tools/qfcc/include/qfprogs.h"
 
 typedef struct {
 	const char *source_name;
diff --git a/tools/qfcc/source/dump_modules.c b/tools/qfcc/source/dump_modules.c
index 68cee44eb..7516f323b 100644
--- a/tools/qfcc/source/dump_modules.c
+++ b/tools/qfcc/source/dump_modules.c
@@ -44,7 +44,7 @@
 #include "QF/progs.h"
 #include "QF/va.h"
 
-#include "qfprogs.h"
+#include "tools/qfcc/include/qfprogs.h"
 
 static void
 dump_methods (progs_t *pr, pr_method_list_t *methods, int class)
diff --git a/tools/qfcc/source/dump_strings.c b/tools/qfcc/source/dump_strings.c
index 5f119e7cc..ce9627f32 100644
--- a/tools/qfcc/source/dump_strings.c
+++ b/tools/qfcc/source/dump_strings.c
@@ -36,8 +36,8 @@
 #include "QF/progs.h"
 #include "QF/sys.h"
 
-#include "obj_file.h"
-#include "qfprogs.h"
+#include "tools/qfcc/include/obj_file.h"
+#include "tools/qfcc/include/qfprogs.h"
 
 static void
 dump_string_block (const char *strblock, unsigned size)
diff --git a/tools/qfcc/source/emit.c b/tools/qfcc/source/emit.c
index e7a4b2465..f61151da3 100644
--- a/tools/qfcc/source/emit.c
+++ b/tools/qfcc/source/emit.c
@@ -42,21 +42,21 @@
 #include <QF/mathlib.h>
 #include <QF/va.h>
 
-#include "codespace.h"
-#include "def.h"
-#include "defspace.h"
-#include "debug.h"
-#include "diagnostic.h"
-#include "emit.h"
-#include "function.h"
-#include "opcodes.h"
-#include "options.h"
-#include "qfcc.h"
-#include "reloc.h"
-#include "statements.h"
-#include "symtab.h"
-#include "type.h"
-#include "value.h"
+#include "tools/qfcc/include/codespace.h"
+#include "tools/qfcc/include/def.h"
+#include "tools/qfcc/include/defspace.h"
+#include "tools/qfcc/include/debug.h"
+#include "tools/qfcc/include/diagnostic.h"
+#include "tools/qfcc/include/emit.h"
+#include "tools/qfcc/include/function.h"
+#include "tools/qfcc/include/opcodes.h"
+#include "tools/qfcc/include/options.h"
+#include "tools/qfcc/include/qfcc.h"
+#include "tools/qfcc/include/reloc.h"
+#include "tools/qfcc/include/statements.h"
+#include "tools/qfcc/include/symtab.h"
+#include "tools/qfcc/include/type.h"
+#include "tools/qfcc/include/value.h"
 
 static def_t zero_def;
 
diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index 7faa52caf..9ecf0ad15 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -45,25 +45,26 @@
 #include "QF/sys.h"
 #include "QF/va.h"
 
-#include "qfcc.h"
-#include "class.h"
-#include "def.h"
-#include "defspace.h"
-#include "diagnostic.h"
-#include "emit.h"
-#include "expr.h"
-#include "function.h"
-#include "idstuff.h"
-#include "method.h"
-#include "options.h"
-#include "reloc.h"
-#include "shared.h"
-#include "strpool.h"
-#include "struct.h"
-#include "symtab.h"
-#include "type.h"
-#include "value.h"
-#include "qc-parse.h"
+#include "tools/qfcc/include/qfcc.h"
+#include "tools/qfcc/include/class.h"
+#include "tools/qfcc/include/def.h"
+#include "tools/qfcc/include/defspace.h"
+#include "tools/qfcc/include/diagnostic.h"
+#include "tools/qfcc/include/emit.h"
+#include "tools/qfcc/include/expr.h"
+#include "tools/qfcc/include/function.h"
+#include "tools/qfcc/include/idstuff.h"
+#include "tools/qfcc/include/method.h"
+#include "tools/qfcc/include/options.h"
+#include "tools/qfcc/include/reloc.h"
+#include "tools/qfcc/include/shared.h"
+#include "tools/qfcc/include/strpool.h"
+#include "tools/qfcc/include/struct.h"
+#include "tools/qfcc/include/symtab.h"
+#include "tools/qfcc/include/type.h"
+#include "tools/qfcc/include/value.h"
+
+#include "tools/qfcc/source/qc-parse.h"
 
 static expr_t *exprs_freelist;
 
diff --git a/tools/qfcc/source/expr_assign.c b/tools/qfcc/source/expr_assign.c
index 937da6d5c..472c1f1a5 100644
--- a/tools/qfcc/source/expr_assign.c
+++ b/tools/qfcc/source/expr_assign.c
@@ -45,25 +45,24 @@
 #include "QF/sys.h"
 #include "QF/va.h"
 
-#include "qfcc.h"
-#include "class.h"
-#include "def.h"
-#include "defspace.h"
-#include "diagnostic.h"
-#include "emit.h"
-#include "expr.h"
-#include "function.h"
-#include "idstuff.h"
-#include "method.h"
-#include "options.h"
-#include "reloc.h"
-#include "shared.h"
-#include "strpool.h"
-#include "struct.h"
-#include "symtab.h"
-#include "type.h"
-#include "value.h"
-#include "qc-parse.h"
+#include "tools/qfcc/include/qfcc.h"
+#include "tools/qfcc/include/class.h"
+#include "tools/qfcc/include/def.h"
+#include "tools/qfcc/include/defspace.h"
+#include "tools/qfcc/include/diagnostic.h"
+#include "tools/qfcc/include/emit.h"
+#include "tools/qfcc/include/expr.h"
+#include "tools/qfcc/include/function.h"
+#include "tools/qfcc/include/idstuff.h"
+#include "tools/qfcc/include/method.h"
+#include "tools/qfcc/include/options.h"
+#include "tools/qfcc/include/reloc.h"
+#include "tools/qfcc/include/shared.h"
+#include "tools/qfcc/include/strpool.h"
+#include "tools/qfcc/include/struct.h"
+#include "tools/qfcc/include/symtab.h"
+#include "tools/qfcc/include/type.h"
+#include "tools/qfcc/include/value.h"
 
 static expr_t *
 check_assign_logic_precedence (expr_t *dst, expr_t *src)
diff --git a/tools/qfcc/source/expr_binary.c b/tools/qfcc/source/expr_binary.c
index cc75bcbcf..616dc7ac4 100644
--- a/tools/qfcc/source/expr_binary.c
+++ b/tools/qfcc/source/expr_binary.c
@@ -31,11 +31,12 @@
 # include "config.h"
 #endif
 
-#include "diagnostic.h"
-#include "expr.h"
-#include "options.h"
-#include "type.h"
-#include "qc-parse.h"
+#include "tools/qfcc/include/diagnostic.h"
+#include "tools/qfcc/include/expr.h"
+#include "tools/qfcc/include/options.h"
+#include "tools/qfcc/include/type.h"
+
+#include "tools/qfcc/source/qc-parse.h"
 
 typedef struct {
 	int         op;
diff --git a/tools/qfcc/source/expr_bool.c b/tools/qfcc/source/expr_bool.c
index 0fcb8b394..fd21de053 100644
--- a/tools/qfcc/source/expr_bool.c
+++ b/tools/qfcc/source/expr_bool.c
@@ -45,25 +45,26 @@
 #include "QF/sys.h"
 #include "QF/va.h"
 
-#include "qfcc.h"
-#include "class.h"
-#include "def.h"
-#include "defspace.h"
-#include "diagnostic.h"
-#include "emit.h"
-#include "expr.h"
-#include "function.h"
-#include "idstuff.h"
-#include "method.h"
-#include "options.h"
-#include "reloc.h"
-#include "shared.h"
-#include "strpool.h"
-#include "struct.h"
-#include "symtab.h"
-#include "type.h"
-#include "value.h"
-#include "qc-parse.h"
+#include "tools/qfcc/include/qfcc.h"
+#include "tools/qfcc/include/class.h"
+#include "tools/qfcc/include/def.h"
+#include "tools/qfcc/include/defspace.h"
+#include "tools/qfcc/include/diagnostic.h"
+#include "tools/qfcc/include/emit.h"
+#include "tools/qfcc/include/expr.h"
+#include "tools/qfcc/include/function.h"
+#include "tools/qfcc/include/idstuff.h"
+#include "tools/qfcc/include/method.h"
+#include "tools/qfcc/include/options.h"
+#include "tools/qfcc/include/reloc.h"
+#include "tools/qfcc/include/shared.h"
+#include "tools/qfcc/include/strpool.h"
+#include "tools/qfcc/include/struct.h"
+#include "tools/qfcc/include/symtab.h"
+#include "tools/qfcc/include/type.h"
+#include "tools/qfcc/include/value.h"
+
+#include "tools/qfcc/source/qc-parse.h"
 
 expr_t *
 test_expr (expr_t *e)
diff --git a/tools/qfcc/source/expr_compound.c b/tools/qfcc/source/expr_compound.c
index 40b4e01c5..e75bb5b70 100644
--- a/tools/qfcc/source/expr_compound.c
+++ b/tools/qfcc/source/expr_compound.c
@@ -45,11 +45,11 @@
 #include "QF/sys.h"
 #include "QF/va.h"
 
-#include "diagnostic.h"
-#include "expr.h"
-#include "options.h"
-#include "symtab.h"
-#include "type.h"
+#include "tools/qfcc/include/diagnostic.h"
+#include "tools/qfcc/include/expr.h"
+#include "tools/qfcc/include/options.h"
+#include "tools/qfcc/include/symtab.h"
+#include "tools/qfcc/include/type.h"
 
 static element_t *elements_freelist;
 
diff --git a/tools/qfcc/source/expr_obj.c b/tools/qfcc/source/expr_obj.c
index db0b2fe4a..17d53dfdb 100644
--- a/tools/qfcc/source/expr_obj.c
+++ b/tools/qfcc/source/expr_obj.c
@@ -45,25 +45,24 @@
 #include "QF/sys.h"
 #include "QF/va.h"
 
-#include "qfcc.h"
-#include "class.h"
-#include "def.h"
-#include "defspace.h"
-#include "diagnostic.h"
-#include "emit.h"
-#include "expr.h"
-#include "function.h"
-#include "idstuff.h"
-#include "method.h"
-#include "options.h"
-#include "reloc.h"
-#include "shared.h"
-#include "strpool.h"
-#include "struct.h"
-#include "symtab.h"
-#include "type.h"
-#include "value.h"
-#include "qc-parse.h"
+#include "tools/qfcc/include/qfcc.h"
+#include "tools/qfcc/include/class.h"
+#include "tools/qfcc/include/def.h"
+#include "tools/qfcc/include/defspace.h"
+#include "tools/qfcc/include/diagnostic.h"
+#include "tools/qfcc/include/emit.h"
+#include "tools/qfcc/include/expr.h"
+#include "tools/qfcc/include/function.h"
+#include "tools/qfcc/include/idstuff.h"
+#include "tools/qfcc/include/method.h"
+#include "tools/qfcc/include/options.h"
+#include "tools/qfcc/include/reloc.h"
+#include "tools/qfcc/include/shared.h"
+#include "tools/qfcc/include/strpool.h"
+#include "tools/qfcc/include/struct.h"
+#include "tools/qfcc/include/symtab.h"
+#include "tools/qfcc/include/type.h"
+#include "tools/qfcc/include/value.h"
 
 expr_t *
 new_self_expr (void)
diff --git a/tools/qfcc/source/flow.c b/tools/qfcc/source/flow.c
index 438ece827..e26bcef1b 100644
--- a/tools/qfcc/source/flow.c
+++ b/tools/qfcc/source/flow.c
@@ -44,18 +44,18 @@
 #include "QF/set.h"
 #include "QF/va.h"
 
-#include "dags.h"
-#include "def.h"
-#include "defspace.h"
-#include "diagnostic.h"
-#include "dot.h"
-#include "flow.h"
-#include "function.h"
-#include "options.h"
-#include "qfcc.h"
-#include "statements.h"
-#include "symtab.h"
-#include "type.h"
+#include "tools/qfcc/include/dags.h"
+#include "tools/qfcc/include/def.h"
+#include "tools/qfcc/include/defspace.h"
+#include "tools/qfcc/include/diagnostic.h"
+#include "tools/qfcc/include/dot.h"
+#include "tools/qfcc/include/flow.h"
+#include "tools/qfcc/include/function.h"
+#include "tools/qfcc/include/options.h"
+#include "tools/qfcc/include/qfcc.h"
+#include "tools/qfcc/include/statements.h"
+#include "tools/qfcc/include/symtab.h"
+#include "tools/qfcc/include/type.h"
 
 /// \addtogroup qfcc_flow
 ///@{
diff --git a/tools/qfcc/source/function.c b/tools/qfcc/source/function.c
index b199bf51d..940abf11e 100644
--- a/tools/qfcc/source/function.c
+++ b/tools/qfcc/source/function.c
@@ -44,27 +44,27 @@
 #include "QF/hash.h"
 #include "QF/va.h"
 
-#include "qfcc.h"
+#include "tools/qfcc/include/qfcc.h"
 
-#include "class.h"
-#include "codespace.h"
-#include "debug.h"
-#include "def.h"
-#include "defspace.h"
-#include "diagnostic.h"
-#include "emit.h"
-#include "expr.h"
-#include "flow.h"
-#include "function.h"
-#include "opcodes.h"
-#include "options.h"
-#include "reloc.h"
-#include "shared.h"
-#include "statements.h"
-#include "strpool.h"
-#include "symtab.h"
-#include "type.h"
-#include "value.h"
+#include "tools/qfcc/include/class.h"
+#include "tools/qfcc/include/codespace.h"
+#include "tools/qfcc/include/debug.h"
+#include "tools/qfcc/include/def.h"
+#include "tools/qfcc/include/defspace.h"
+#include "tools/qfcc/include/diagnostic.h"
+#include "tools/qfcc/include/emit.h"
+#include "tools/qfcc/include/expr.h"
+#include "tools/qfcc/include/flow.h"
+#include "tools/qfcc/include/function.h"
+#include "tools/qfcc/include/opcodes.h"
+#include "tools/qfcc/include/options.h"
+#include "tools/qfcc/include/reloc.h"
+#include "tools/qfcc/include/shared.h"
+#include "tools/qfcc/include/statements.h"
+#include "tools/qfcc/include/strpool.h"
+#include "tools/qfcc/include/symtab.h"
+#include "tools/qfcc/include/type.h"
+#include "tools/qfcc/include/value.h"
 
 static param_t *params_freelist;
 static function_t *functions_freelist;
diff --git a/tools/qfcc/source/grab.c b/tools/qfcc/source/grab.c
index 27f726519..0d59c1217 100644
--- a/tools/qfcc/source/grab.c
+++ b/tools/qfcc/source/grab.c
@@ -44,12 +44,12 @@
 #include "QF/hash.h"
 #include "QF/quakeio.h"
 
-#include "diagnostic.h"
-#include "expr.h"
-#include "grab.h"
-#include "options.h"
-#include "qfcc.h"
-#include "strpool.h"
+#include "tools/qfcc/include/diagnostic.h"
+#include "tools/qfcc/include/expr.h"
+#include "tools/qfcc/include/grab.h"
+#include "tools/qfcc/include/options.h"
+#include "tools/qfcc/include/qfcc.h"
+#include "tools/qfcc/include/strpool.h"
 
 int grab_frame;
 int grab_other;
diff --git a/tools/qfcc/source/idstuff.c b/tools/qfcc/source/idstuff.c
index 2f195b7e2..1bc222f49 100644
--- a/tools/qfcc/source/idstuff.c
+++ b/tools/qfcc/source/idstuff.c
@@ -43,16 +43,16 @@
 #include <QF/dstring.h>
 #include <QF/quakeio.h>
 
-#include "def.h"
-#include "defspace.h"
-#include "diagnostic.h"
-#include "qfcc.h"
-#include "expr.h"
-#include "idstuff.h"
-#include "options.h"
-#include "strpool.h"
-#include "symtab.h"
-#include "type.h"
+#include "tools/qfcc/include/def.h"
+#include "tools/qfcc/include/defspace.h"
+#include "tools/qfcc/include/diagnostic.h"
+#include "tools/qfcc/include/qfcc.h"
+#include "tools/qfcc/include/expr.h"
+#include "tools/qfcc/include/idstuff.h"
+#include "tools/qfcc/include/options.h"
+#include "tools/qfcc/include/strpool.h"
+#include "tools/qfcc/include/symtab.h"
+#include "tools/qfcc/include/type.h"
 
 #define	MAX_SOUNDS		1024
 #define	MAX_MODELS		1024
diff --git a/tools/qfcc/source/linker.c b/tools/qfcc/source/linker.c
index dd0e48722..2f6e4a565 100644
--- a/tools/qfcc/source/linker.c
+++ b/tools/qfcc/source/linker.c
@@ -58,21 +58,21 @@
 #include "QF/pakfile.h"
 #include "QF/va.h"
 
-#include "class.h"
-#include "codespace.h"
-#include "def.h"
-#include "defspace.h"
-#include "diagnostic.h"
-#include "emit.h"
-#include "expr.h"
-#include "linker.h"
-#include "obj_file.h"
-#include "obj_type.h"
-#include "options.h"
-#include "qfcc.h"
-#include "reloc.h"
-#include "strpool.h"
-#include "type.h"
+#include "tools/qfcc/include/class.h"
+#include "tools/qfcc/include/codespace.h"
+#include "tools/qfcc/include/def.h"
+#include "tools/qfcc/include/defspace.h"
+#include "tools/qfcc/include/diagnostic.h"
+#include "tools/qfcc/include/emit.h"
+#include "tools/qfcc/include/expr.h"
+#include "tools/qfcc/include/linker.h"
+#include "tools/qfcc/include/obj_file.h"
+#include "tools/qfcc/include/obj_type.h"
+#include "tools/qfcc/include/options.h"
+#include "tools/qfcc/include/qfcc.h"
+#include "tools/qfcc/include/reloc.h"
+#include "tools/qfcc/include/strpool.h"
+#include "tools/qfcc/include/type.h"
 
 static void linker_internal_error (const char *fmt, ...)
 	__attribute__ ((format (printf, 1, 2), noreturn));
diff --git a/tools/qfcc/source/method.c b/tools/qfcc/source/method.c
index ae3d031e1..244ae1513 100644
--- a/tools/qfcc/source/method.c
+++ b/tools/qfcc/source/method.c
@@ -44,23 +44,23 @@
 #include "QF/pr_obj.h"
 #include "QF/va.h"
 
-#include "qfcc.h"
+#include "tools/qfcc/include/qfcc.h"
 
-#include "expr.h"
-#include "class.h"
-#include "def.h"
-#include "defspace.h"
-#include "diagnostic.h"
-#include "emit.h"
-#include "method.h"
-#include "options.h"
-#include "reloc.h"
-#include "shared.h"
-#include "strpool.h"
-#include "struct.h"
-#include "symtab.h"
-#include "type.h"
-#include "value.h"
+#include "tools/qfcc/include/expr.h"
+#include "tools/qfcc/include/class.h"
+#include "tools/qfcc/include/def.h"
+#include "tools/qfcc/include/defspace.h"
+#include "tools/qfcc/include/diagnostic.h"
+#include "tools/qfcc/include/emit.h"
+#include "tools/qfcc/include/method.h"
+#include "tools/qfcc/include/options.h"
+#include "tools/qfcc/include/reloc.h"
+#include "tools/qfcc/include/shared.h"
+#include "tools/qfcc/include/strpool.h"
+#include "tools/qfcc/include/struct.h"
+#include "tools/qfcc/include/symtab.h"
+#include "tools/qfcc/include/type.h"
+#include "tools/qfcc/include/value.h"
 
 static hashtab_t *known_methods;
 
diff --git a/tools/qfcc/source/obj_file.c b/tools/qfcc/source/obj_file.c
index dcc1543d4..76a5219d4 100644
--- a/tools/qfcc/source/obj_file.c
+++ b/tools/qfcc/source/obj_file.c
@@ -46,23 +46,23 @@
 #include "QF/quakeio.h"
 #include "QF/va.h"
 
-#include "codespace.h"
-#include "debug.h"
-#include "def.h"
-#include "defspace.h"
-#include "emit.h"
-#include "expr.h"
-#include "function.h"
-#include "obj_file.h"
-#include "obj_type.h"
-#include "options.h"
-#include "qfcc.h"
-#include "reloc.h"
-#include "statements.h"
-#include "strpool.h"
-#include "symtab.h"
-#include "type.h"
-#include "value.h"
+#include "tools/qfcc/include/codespace.h"
+#include "tools/qfcc/include/debug.h"
+#include "tools/qfcc/include/def.h"
+#include "tools/qfcc/include/defspace.h"
+#include "tools/qfcc/include/emit.h"
+#include "tools/qfcc/include/expr.h"
+#include "tools/qfcc/include/function.h"
+#include "tools/qfcc/include/obj_file.h"
+#include "tools/qfcc/include/obj_type.h"
+#include "tools/qfcc/include/options.h"
+#include "tools/qfcc/include/qfcc.h"
+#include "tools/qfcc/include/reloc.h"
+#include "tools/qfcc/include/statements.h"
+#include "tools/qfcc/include/strpool.h"
+#include "tools/qfcc/include/symtab.h"
+#include "tools/qfcc/include/type.h"
+#include "tools/qfcc/include/value.h"
 
 static int
 count_relocs (reloc_t *r)
diff --git a/tools/qfcc/source/obj_type.c b/tools/qfcc/source/obj_type.c
index 6838c0824..7f87e43df 100644
--- a/tools/qfcc/source/obj_type.c
+++ b/tools/qfcc/source/obj_type.c
@@ -42,16 +42,16 @@
 
 #include "compat.h"
 
-#include "class.h"
-#include "def.h"
-#include "defspace.h"
-#include "diagnostic.h"
-#include "emit.h"
-#include "obj_type.h"
-#include "qfcc.h"
-#include "reloc.h"
-#include "symtab.h"
-#include "value.h"
+#include "tools/qfcc/include/class.h"
+#include "tools/qfcc/include/def.h"
+#include "tools/qfcc/include/defspace.h"
+#include "tools/qfcc/include/diagnostic.h"
+#include "tools/qfcc/include/emit.h"
+#include "tools/qfcc/include/obj_type.h"
+#include "tools/qfcc/include/qfcc.h"
+#include "tools/qfcc/include/reloc.h"
+#include "tools/qfcc/include/symtab.h"
+#include "tools/qfcc/include/value.h"
 
 #define ENC_DEF(dest,def) EMIT_DEF (pr.type_data, dest, def)
 #define ENC_STR(dest,str)									\
diff --git a/tools/qfcc/source/opcodes.c b/tools/qfcc/source/opcodes.c
index 045d14404..a9bda7a3c 100644
--- a/tools/qfcc/source/opcodes.c
+++ b/tools/qfcc/source/opcodes.c
@@ -41,11 +41,11 @@
 
 #include <QF/hash.h>
 
-#include "opcodes.h"
-#include "options.h"
-#include "qfcc.h"
-#include "statements.h"
-#include "type.h"
+#include "tools/qfcc/include/opcodes.h"
+#include "tools/qfcc/include/options.h"
+#include "tools/qfcc/include/qfcc.h"
+#include "tools/qfcc/include/statements.h"
+#include "tools/qfcc/include/type.h"
 
 hashtab_t  *opcode_type_table;
 hashtab_t  *opcode_void_table;
diff --git a/tools/qfcc/source/options.c b/tools/qfcc/source/options.c
index e3f9e504e..758e388a3 100644
--- a/tools/qfcc/source/options.c
+++ b/tools/qfcc/source/options.c
@@ -45,11 +45,11 @@
 #include "QF/pr_comp.h"
 #include "QF/va.h"
 
-#include "cpp.h"
-#include "linker.h"
-#include "options.h"
-#include "qfcc.h"
-#include "strpool.h"
+#include "tools/qfcc/include/cpp.h"
+#include "tools/qfcc/include/linker.h"
+#include "tools/qfcc/include/options.h"
+#include "tools/qfcc/include/qfcc.h"
+#include "tools/qfcc/include/strpool.h"
 
 const char *this_program;
 const char **source_files;
diff --git a/tools/qfcc/source/pragma.c b/tools/qfcc/source/pragma.c
index e1a465b53..d82f2aef4 100644
--- a/tools/qfcc/source/pragma.c
+++ b/tools/qfcc/source/pragma.c
@@ -42,12 +42,12 @@
 #include "QF/alloc.h"
 #include "QF/pr_comp.h"
 
-#include "diagnostic.h"
-#include "opcodes.h"
-#include "options.h"
-#include "pragma.h"
-#include "strpool.h"
-#include "type.h"
+#include "tools/qfcc/include/diagnostic.h"
+#include "tools/qfcc/include/opcodes.h"
+#include "tools/qfcc/include/options.h"
+#include "tools/qfcc/include/pragma.h"
+#include "tools/qfcc/include/strpool.h"
+#include "tools/qfcc/include/type.h"
 
 typedef struct pragma_arg_s {
 	struct pragma_arg_s *next;
diff --git a/tools/qfcc/source/qc-lex.l b/tools/qfcc/source/qc-lex.l
index a2a8295bd..50e54817d 100644
--- a/tools/qfcc/source/qc-lex.l
+++ b/tools/qfcc/source/qc-lex.l
@@ -45,22 +45,22 @@
 #include <QF/hash.h>
 #include <QF/sys.h>
 
-#include "class.h"
-#include "debug.h"
-#include "diagnostic.h"
-#include "expr.h"
-#include "grab.h"
-#include "options.h"
-#include "pragma.h"
-#include "qfcc.h"
-#include "shared.h"
-#include "strpool.h"
-#include "struct.h"
-#include "symtab.h"
-#include "type.h"
-#include "value.h"
+#include "tools/qfcc/include/class.h"
+#include "tools/qfcc/include/debug.h"
+#include "tools/qfcc/include/diagnostic.h"
+#include "tools/qfcc/include/expr.h"
+#include "tools/qfcc/include/grab.h"
+#include "tools/qfcc/include/options.h"
+#include "tools/qfcc/include/pragma.h"
+#include "tools/qfcc/include/qfcc.h"
+#include "tools/qfcc/include/shared.h"
+#include "tools/qfcc/include/strpool.h"
+#include "tools/qfcc/include/struct.h"
+#include "tools/qfcc/include/symtab.h"
+#include "tools/qfcc/include/type.h"
+#include "tools/qfcc/include/value.h"
 
-#include "qc-parse.h"
+#include "tools/qfcc/source/qc-parse.h"
 
 #ifndef YY_PROTO
 # define YY_PROTO(x) x
diff --git a/tools/qfcc/source/qc-parse.y b/tools/qfcc/source/qc-parse.y
index f759a4964..b08884b92 100644
--- a/tools/qfcc/source/qc-parse.y
+++ b/tools/qfcc/source/qc-parse.y
@@ -44,24 +44,24 @@
 #include <QF/sys.h>
 #include <QF/va.h>
 
-#include "class.h"
-#include "debug.h"
-#include "def.h"
-#include "diagnostic.h"
-#include "emit.h"
-#include "expr.h"
-#include "function.h"
-#include "method.h"
-#include "options.h"
-#include "qfcc.h"
-#include "reloc.h"
-#include "shared.h"
-#include "strpool.h"
-#include "struct.h"
-#include "switch.h"
-#include "symtab.h"
-#include "type.h"
-#include "value.h"
+#include "tools/qfcc/include/class.h"
+#include "tools/qfcc/include/debug.h"
+#include "tools/qfcc/include/def.h"
+#include "tools/qfcc/include/diagnostic.h"
+#include "tools/qfcc/include/emit.h"
+#include "tools/qfcc/include/expr.h"
+#include "tools/qfcc/include/function.h"
+#include "tools/qfcc/include/method.h"
+#include "tools/qfcc/include/options.h"
+#include "tools/qfcc/include/qfcc.h"
+#include "tools/qfcc/include/reloc.h"
+#include "tools/qfcc/include/shared.h"
+#include "tools/qfcc/include/strpool.h"
+#include "tools/qfcc/include/struct.h"
+#include "tools/qfcc/include/switch.h"
+#include "tools/qfcc/include/symtab.h"
+#include "tools/qfcc/include/type.h"
+#include "tools/qfcc/include/value.h"
 
 #define YYDEBUG 1
 #define YYERROR_VERBOSE 1
diff --git a/tools/qfcc/source/qfcc.c b/tools/qfcc/source/qfcc.c
index c0739e9f0..96c26e4b0 100644
--- a/tools/qfcc/source/qfcc.c
+++ b/tools/qfcc/source/qfcc.c
@@ -65,31 +65,31 @@
 #include <QF/sys.h>
 #include <QF/va.h>
 
-#include "qfcc.h"
-#include "class.h"
-#include "codespace.h"
-#include "cpp.h"
-#include "debug.h"
-#include "def.h"
-#include "defspace.h"
-#include "diagnostic.h"
-#include "emit.h"
-#include "expr.h"
-#include "function.h"
-#include "grab.h"
-#include "idstuff.h"
-#include "linker.h"
-#include "method.h"
-#include "obj_file.h"
-#include "opcodes.h"
-#include "options.h"
-#include "reloc.h"
-#include "shared.h"
-#include "strpool.h"
-#include "struct.h"
-#include "symtab.h"
-#include "type.h"
-#include "value.h"
+#include "tools/qfcc/include/qfcc.h"
+#include "tools/qfcc/include/class.h"
+#include "tools/qfcc/include/codespace.h"
+#include "tools/qfcc/include/cpp.h"
+#include "tools/qfcc/include/debug.h"
+#include "tools/qfcc/include/def.h"
+#include "tools/qfcc/include/defspace.h"
+#include "tools/qfcc/include/diagnostic.h"
+#include "tools/qfcc/include/emit.h"
+#include "tools/qfcc/include/expr.h"
+#include "tools/qfcc/include/function.h"
+#include "tools/qfcc/include/grab.h"
+#include "tools/qfcc/include/idstuff.h"
+#include "tools/qfcc/include/linker.h"
+#include "tools/qfcc/include/method.h"
+#include "tools/qfcc/include/obj_file.h"
+#include "tools/qfcc/include/opcodes.h"
+#include "tools/qfcc/include/options.h"
+#include "tools/qfcc/include/reloc.h"
+#include "tools/qfcc/include/shared.h"
+#include "tools/qfcc/include/strpool.h"
+#include "tools/qfcc/include/struct.h"
+#include "tools/qfcc/include/symtab.h"
+#include "tools/qfcc/include/type.h"
+#include "tools/qfcc/include/value.h"
 
 options_t   options;
 
diff --git a/tools/qfcc/source/qfprogs.c b/tools/qfcc/source/qfprogs.c
index 787c9068a..03d09123d 100644
--- a/tools/qfcc/source/qfprogs.c
+++ b/tools/qfcc/source/qfprogs.c
@@ -63,10 +63,10 @@
 #include "QF/va.h"
 #include "QF/zone.h"
 
-#include "obj_file.h"
-#include "obj_type.h"
-#include "qfprogs.h"
-#include "reloc.h"
+#include "tools/qfcc/include/obj_file.h"
+#include "tools/qfcc/include/obj_type.h"
+#include "tools/qfcc/include/qfprogs.h"
+#include "tools/qfcc/include/reloc.h"
 
 const char *reloc_names[] = {
 	"none",
diff --git a/tools/qfcc/source/qp-lex.l b/tools/qfcc/source/qp-lex.l
index 5947f5846..a57185209 100644
--- a/tools/qfcc/source/qp-lex.l
+++ b/tools/qfcc/source/qp-lex.l
@@ -35,17 +35,17 @@
 
 #include "QF/hash.h"
 
-#include "debug.h"
-#include "diagnostic.h"
-#include "expr.h"
-#include "grab.h"
-#include "qfcc.h"
-#include "shared.h"
-#include "strpool.h"
-#include "symtab.h"
-#include "type.h"
+#include "tools/qfcc/include/debug.h"
+#include "tools/qfcc/include/diagnostic.h"
+#include "tools/qfcc/include/expr.h"
+#include "tools/qfcc/include/grab.h"
+#include "tools/qfcc/include/qfcc.h"
+#include "tools/qfcc/include/shared.h"
+#include "tools/qfcc/include/strpool.h"
+#include "tools/qfcc/include/symtab.h"
+#include "tools/qfcc/include/type.h"
 
-#include "qp-parse.h"
+#include "tools/qfcc/source/qp-parse.h"
 
 #ifndef YY_PROTO
 # define YY_PROTO(x) x
diff --git a/tools/qfcc/source/qp-parse.y b/tools/qfcc/source/qp-parse.y
index 730eab57a..15159deb0 100644
--- a/tools/qfcc/source/qp-parse.y
+++ b/tools/qfcc/source/qp-parse.y
@@ -41,15 +41,15 @@
 
 #include "QF/dstring.h"
 
-#include "codespace.h"
-#include "diagnostic.h"
-#include "expr.h"
-#include "function.h"
-#include "qfcc.h"
-#include "reloc.h"
-#include "shared.h"
-#include "symtab.h"
-#include "type.h"
+#include "tools/qfcc/include/codespace.h"
+#include "tools/qfcc/include/diagnostic.h"
+#include "tools/qfcc/include/expr.h"
+#include "tools/qfcc/include/function.h"
+#include "tools/qfcc/include/qfcc.h"
+#include "tools/qfcc/include/reloc.h"
+#include "tools/qfcc/include/shared.h"
+#include "tools/qfcc/include/symtab.h"
+#include "tools/qfcc/include/type.h"
 
 #define YYDEBUG 1
 #define YYERROR_VERBOSE 1
diff --git a/tools/qfcc/source/reloc.c b/tools/qfcc/source/reloc.c
index 7c4ed3ce3..c1d471d0a 100644
--- a/tools/qfcc/source/reloc.c
+++ b/tools/qfcc/source/reloc.c
@@ -41,15 +41,15 @@
 
 #include "QF/alloc.h"
 
-#include "codespace.h"
-#include "def.h"
-#include "defspace.h"
-#include "diagnostic.h"
-#include "emit.h"
-#include "expr.h"
-#include "function.h"
-#include "qfcc.h"
-#include "reloc.h"
+#include "tools/qfcc/include/codespace.h"
+#include "tools/qfcc/include/def.h"
+#include "tools/qfcc/include/defspace.h"
+#include "tools/qfcc/include/diagnostic.h"
+#include "tools/qfcc/include/emit.h"
+#include "tools/qfcc/include/expr.h"
+#include "tools/qfcc/include/function.h"
+#include "tools/qfcc/include/qfcc.h"
+#include "tools/qfcc/include/reloc.h"
 
 static reloc_t *refs_freelist;
 
diff --git a/tools/qfcc/source/shared.c b/tools/qfcc/source/shared.c
index 25e0ac979..cee0d06c1 100644
--- a/tools/qfcc/source/shared.c
+++ b/tools/qfcc/source/shared.c
@@ -31,14 +31,14 @@
 # include "config.h"
 #endif
 
-#include "class.h"
-#include "diagnostic.h"
-#include "expr.h"
-#include "function.h"
-#include "options.h"
-#include "shared.h"
-#include "symtab.h"
-#include "type.h"
+#include "tools/qfcc/include/class.h"
+#include "tools/qfcc/include/diagnostic.h"
+#include "tools/qfcc/include/expr.h"
+#include "tools/qfcc/include/function.h"
+#include "tools/qfcc/include/options.h"
+#include "tools/qfcc/include/shared.h"
+#include "tools/qfcc/include/symtab.h"
+#include "tools/qfcc/include/type.h"
 
 function_t *current_func;
 class_type_t *current_class;
diff --git a/tools/qfcc/source/statements.c b/tools/qfcc/source/statements.c
index ba0e07331..2383dcc84 100644
--- a/tools/qfcc/source/statements.c
+++ b/tools/qfcc/source/statements.c
@@ -45,20 +45,21 @@
 #include "QF/mathlib.h"
 #include "QF/va.h"
 
-#include "dags.h"
-#include "diagnostic.h"
-#include "dot.h"
-#include "expr.h"
-#include "function.h"
-#include "options.h"
-#include "qfcc.h"
-#include "reloc.h"
-#include "statements.h"
-#include "strpool.h"
-#include "symtab.h"
-#include "type.h"
-#include "value.h"
-#include "qc-parse.h"
+#include "tools/qfcc/include/dags.h"
+#include "tools/qfcc/include/diagnostic.h"
+#include "tools/qfcc/include/dot.h"
+#include "tools/qfcc/include/expr.h"
+#include "tools/qfcc/include/function.h"
+#include "tools/qfcc/include/options.h"
+#include "tools/qfcc/include/qfcc.h"
+#include "tools/qfcc/include/reloc.h"
+#include "tools/qfcc/include/statements.h"
+#include "tools/qfcc/include/strpool.h"
+#include "tools/qfcc/include/symtab.h"
+#include "tools/qfcc/include/type.h"
+#include "tools/qfcc/include/value.h"
+
+#include "tools/qfcc/source/qc-parse.h"
 
 const char *op_type_names[] = {
 	"op_def",
diff --git a/tools/qfcc/source/strpool.c b/tools/qfcc/source/strpool.c
index d3ab07a1c..fa30c74d5 100644
--- a/tools/qfcc/source/strpool.c
+++ b/tools/qfcc/source/strpool.c
@@ -44,9 +44,9 @@
 #include "QF/dstring.h"
 #include "QF/hash.h"
 
-#include "diagnostic.h"
-#include "options.h"
-#include "strpool.h"
+#include "tools/qfcc/include/diagnostic.h"
+#include "tools/qfcc/include/options.h"
+#include "tools/qfcc/include/strpool.h"
 
 static hashtab_t *saved_strings;
 
diff --git a/tools/qfcc/source/struct.c b/tools/qfcc/source/struct.c
index 64553a8df..c42935dd2 100644
--- a/tools/qfcc/source/struct.c
+++ b/tools/qfcc/source/struct.c
@@ -47,21 +47,21 @@
 #include <QF/sys.h>
 #include <QF/va.h>
 
-#include "class.h"
-#include "def.h"
-#include "defspace.h"
-#include "diagnostic.h"
-#include "emit.h"
-#include "expr.h"
-#include "obj_type.h"
-#include "qfcc.h"
-#include "reloc.h"
-#include "shared.h"
-#include "strpool.h"
-#include "struct.h"
-#include "symtab.h"
-#include "type.h"
-#include "value.h"
+#include "tools/qfcc/include/class.h"
+#include "tools/qfcc/include/def.h"
+#include "tools/qfcc/include/defspace.h"
+#include "tools/qfcc/include/diagnostic.h"
+#include "tools/qfcc/include/emit.h"
+#include "tools/qfcc/include/expr.h"
+#include "tools/qfcc/include/obj_type.h"
+#include "tools/qfcc/include/qfcc.h"
+#include "tools/qfcc/include/reloc.h"
+#include "tools/qfcc/include/shared.h"
+#include "tools/qfcc/include/strpool.h"
+#include "tools/qfcc/include/struct.h"
+#include "tools/qfcc/include/symtab.h"
+#include "tools/qfcc/include/type.h"
+#include "tools/qfcc/include/value.h"
 
 static symbol_t *
 find_tag (ty_meta_e meta, symbol_t *tag, type_t *type)
diff --git a/tools/qfcc/source/stub.c b/tools/qfcc/source/stub.c
index 411a8d3a6..af31e546f 100644
--- a/tools/qfcc/source/stub.c
+++ b/tools/qfcc/source/stub.c
@@ -4,25 +4,25 @@
 
 #include <stdlib.h>
 
-#include "class.h"
-#include "codespace.h"
-#include "diagnostic.h"
-#include "dot.h"
-#include "debug.h"
-#include "def.h"
-#include "defspace.h"
-#include "emit.h"
-#include "expr.h"
-#include "function.h"
-#include "obj_file.h"
-#include "obj_type.h"
-#include "options.h"
-#include "qfcc.h"
-#include "strpool.h"
-#include "struct.h"
-#include "symtab.h"
-#include "type.h"
-#include "value.h"
+#include "tools/qfcc/include/class.h"
+#include "tools/qfcc/include/codespace.h"
+#include "tools/qfcc/include/diagnostic.h"
+#include "tools/qfcc/include/dot.h"
+#include "tools/qfcc/include/debug.h"
+#include "tools/qfcc/include/def.h"
+#include "tools/qfcc/include/defspace.h"
+#include "tools/qfcc/include/emit.h"
+#include "tools/qfcc/include/expr.h"
+#include "tools/qfcc/include/function.h"
+#include "tools/qfcc/include/obj_file.h"
+#include "tools/qfcc/include/obj_type.h"
+#include "tools/qfcc/include/options.h"
+#include "tools/qfcc/include/qfcc.h"
+#include "tools/qfcc/include/strpool.h"
+#include "tools/qfcc/include/struct.h"
+#include "tools/qfcc/include/symtab.h"
+#include "tools/qfcc/include/type.h"
+#include "tools/qfcc/include/value.h"
 
 struct dstring_s;
 options_t options;
diff --git a/tools/qfcc/source/switch.c b/tools/qfcc/source/switch.c
index 77e79f3a4..77f490c76 100644
--- a/tools/qfcc/source/switch.c
+++ b/tools/qfcc/source/switch.c
@@ -42,18 +42,18 @@
 #include <QF/hash.h>
 #include <QF/sys.h>
 
-#include "def.h"
-#include "diagnostic.h"
-#include "expr.h"
-#include "opcodes.h"
-#include "options.h"
-#include "qfcc.h"
-#include "reloc.h"
-#include "switch.h"
-#include "symtab.h"
-#include "type.h"
+#include "tools/qfcc/include/def.h"
+#include "tools/qfcc/include/diagnostic.h"
+#include "tools/qfcc/include/expr.h"
+#include "tools/qfcc/include/opcodes.h"
+#include "tools/qfcc/include/options.h"
+#include "tools/qfcc/include/qfcc.h"
+#include "tools/qfcc/include/reloc.h"
+#include "tools/qfcc/include/switch.h"
+#include "tools/qfcc/include/symtab.h"
+#include "tools/qfcc/include/type.h"
 
-#include "qc-parse.h"
+#include "tools/qfcc/source/qc-parse.h"
 
 typedef struct case_node_s {
 	expr_t     *low;
diff --git a/tools/qfcc/source/symtab.c b/tools/qfcc/source/symtab.c
index 961c00b1a..ca08069bf 100644
--- a/tools/qfcc/source/symtab.c
+++ b/tools/qfcc/source/symtab.c
@@ -37,16 +37,16 @@
 #include "QF/alloc.h"
 #include "QF/hash.h"
 
-#include "class.h"
-#include "def.h"
-#include "defspace.h"
-#include "diagnostic.h"
-#include "function.h"
-#include "qfcc.h"
-#include "reloc.h"
-#include "strpool.h"
-#include "symtab.h"
-#include "type.h"
+#include "tools/qfcc/include/class.h"
+#include "tools/qfcc/include/def.h"
+#include "tools/qfcc/include/defspace.h"
+#include "tools/qfcc/include/diagnostic.h"
+#include "tools/qfcc/include/function.h"
+#include "tools/qfcc/include/qfcc.h"
+#include "tools/qfcc/include/reloc.h"
+#include "tools/qfcc/include/strpool.h"
+#include "tools/qfcc/include/symtab.h"
+#include "tools/qfcc/include/type.h"
 
 static symtab_t *symtabs_freelist;
 static symbol_t *symbols_freelist;
diff --git a/tools/qfcc/source/type.c b/tools/qfcc/source/type.c
index 753ccae10..c6b92b94e 100644
--- a/tools/qfcc/source/type.c
+++ b/tools/qfcc/source/type.c
@@ -47,18 +47,18 @@
 #include "QF/sys.h"
 #include "QF/va.h"
 
-#include "class.h"
-#include "def.h"
-#include "diagnostic.h"
-#include "expr.h"
-#include "function.h"
-#include "obj_type.h"
-#include "options.h"
-#include "qfcc.h"
-#include "strpool.h"
-#include "struct.h"
-#include "symtab.h"
-#include "type.h"
+#include "tools/qfcc/include/class.h"
+#include "tools/qfcc/include/def.h"
+#include "tools/qfcc/include/diagnostic.h"
+#include "tools/qfcc/include/expr.h"
+#include "tools/qfcc/include/function.h"
+#include "tools/qfcc/include/obj_type.h"
+#include "tools/qfcc/include/options.h"
+#include "tools/qfcc/include/qfcc.h"
+#include "tools/qfcc/include/strpool.h"
+#include "tools/qfcc/include/struct.h"
+#include "tools/qfcc/include/symtab.h"
+#include "tools/qfcc/include/type.h"
 
 // simple types.  function types are dynamically allocated
 type_t      type_invalid = { ev_invalid, "invalid" };
diff --git a/tools/qfcc/source/value.c b/tools/qfcc/source/value.c
index b2182497e..db98cd60a 100644
--- a/tools/qfcc/source/value.c
+++ b/tools/qfcc/source/value.c
@@ -45,17 +45,17 @@
 #include "QF/mathlib.h"
 #include "QF/va.h"
 
-#include "qfcc.h"
-#include "def.h"
-#include "defspace.h"
-#include "diagnostic.h"
-#include "emit.h"
-#include "expr.h"
-#include "reloc.h"
-#include "strpool.h"
-#include "symtab.h"
-#include "type.h"
-#include "value.h"
+#include "tools/qfcc/include/qfcc.h"
+#include "tools/qfcc/include/def.h"
+#include "tools/qfcc/include/defspace.h"
+#include "tools/qfcc/include/diagnostic.h"
+#include "tools/qfcc/include/emit.h"
+#include "tools/qfcc/include/expr.h"
+#include "tools/qfcc/include/reloc.h"
+#include "tools/qfcc/include/strpool.h"
+#include "tools/qfcc/include/symtab.h"
+#include "tools/qfcc/include/type.h"
+#include "tools/qfcc/include/value.h"
 
 typedef struct {
 	def_t      *def;
diff --git a/tools/qfcc/test/Makefile.am b/tools/qfcc/test/Makefile.am
deleted file mode 100644
index 49ce3f51b..000000000
--- a/tools/qfcc/test/Makefile.am
+++ /dev/null
@@ -1,615 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-QFCC_LIBS=@QFCC_LIBS@
-QFCC_DEPS=@QFCC_DEPS@
-QFCC_INCS=@QFCC_INCS@
-
-AM_CPPFLAGS= -I$(top_srcdir)/include $(QFCC_INCS)
-
-QFCC_DEP=$(builddir)/../source/qfcc$(EXEEXT)
-QFCC=$(QFCC_DEP)
-
-QCFLAGS=-qq -O -g -Werror
-QCPPFLAGS=--no-default-paths -I$(top_srcdir)/ruamoko/include
-QCOMPILE=$(QFCC) $(QCFLAGS) $(QCPPFLAGS)
-
-SUFFIXES=.qfo .r .pas
-.r.qfo:
-	$(QCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tqo -c -o $@ $<
-	@sed -i -e '1s@:@: $(QFCC_DEP)@' $(DEPDIR)/$*.Tqo
-	@$(am__mv) $(DEPDIR)/$*.Tqo $(DEPDIR)/$*.Qo
-.pas.qfo:
-	$(QCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tqo -c -o $@ $<
-	@sed -i -e '1s@:@: $(QFCC_DEP)@' $(DEPDIR)/$*.Tqo
-	@$(am__mv) $(DEPDIR)/$*.Tqo $(DEPDIR)/$*.Qo
-
-QFCC_TEST_LIBS=@QFCC_TEST_LIBS@
-QFCC_TEST_DEPS=@QFCC_TEST_DEPS@
-QFCC_TEST_INCS=@QFCC_TEST_INCS@
-
-test_bins=\
-	test-defspace
-
-fail_bins=
-
-test_progs_dat=\
-	address-cast.dat \
-	alignment.dat \
-	assignchain.dat \
-	anonstruct.dat \
-	chewed-alias.dat \
-	chewed-return.dat \
-	comma-expr.dat \
-	compound.dat \
-	deadbool.dat \
-	double.dat \
-	double-alias.dat \
-	enum.dat \
-	fordecl.dat \
-	func-expr.dat \
-	func-expr2.dat \
-	func-static.dat \
-	gcd.dat \
-	infloop.dat \
-	ivar-struct-return.dat \
-	methodparams.dat \
-	modulo.dat \
-	nilparamret.dat \
-	overload.dat \
-	paramret.dat \
-	quaternion.dat \
-	return-ivar.dat \
-	sendv.dat \
-	state.dat \
-	struct-init-param.dat \
-	struct-nil-init.dat \
-	structarray.dat \
-	structlive.dat \
-	structptr.dat \
-	structstruct.dat \
-	swap.dat \
-	triangle.dat \
-	typedef.dat \
-	typelinker.dat \
-	unaryminus.dat \
-	vecaddr.dat \
-	vecexpr.dat \
-	vecinit.dat \
-	voidfor.dat \
-	while.dat \
-	zerolinker.dat \
-	$e
-
-fail_progs_dat=
-
-test_build_errors=\
-	classarray.r \
-	double-demote-float.r \
-	double-demote-float-ainit.r \
-	double-demote-float-ginit.r \
-	double-demote-float-linit.r \
-	double-demote-int.r \
-	double-demote-int-ainit.r \
-	double-demote-int-ginit.r \
-	double-demote-int-linit.r \
-	double-int-compare.r \
-	double-float-compare.r
-
-fail_build_errors=
-
-test_defspace_src=\
-	tw-defspace.c tw-diagnostic.c tw-strpool.c
-
-TESTS=\
-	$(test_bins) \
-	$(test_progs_dat:.dat=.run) \
-	$(test_build_errors:.r=.run)
-XFAIL_TESTS=\
-	$(fail_bins) \
-	$(fail_progs_dat:.dat=.run) \
-	$(fail_build_errors:.r=.run)
-
-check_PROGRAMS=test-harness $(test_progs_dat) $(test_bins)
-
-test_defspace_SOURCES=		test-defspace.c $(test_defspace_src)
-test_defspace_LDADD=		$(QFCC_LIBS)
-test_defspace_DEPENDENCIES=	$(QFCC_DEPS)
-
-test_harness_SOURCES=		test-bi.c test-harness.c
-test_harness_LDADD=			$(QFCC_TEST_LIBS)
-test_harness_DEPENDENCIES=	$(QFCC_TEST_DEPS)
-
-r_depfiles_remade=
-
-address_cast_dat_SOURCES=address-cast.r
-address_cast_obj=$(address_cast_dat_SOURCES:.r=.qfo)
-address_cast_dep=$(addprefix ./$(DEPDIR)/,$(address_cast_obj:.qfo=.Qo))
-address-cast.dat$(EXEEXT): $(address_cast_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(address_cast_obj)
-address-cast.run: Makefile build-run
-	@$(srcdir)/build-run $@
-include $(address_cast_dep) # am--include-marker
-r_depfiles_remade += $(address_cast_dep)
-
-alignment_dat_SOURCES=alignment.r
-alignment_obj=$(alignment_dat_SOURCES:.r=.qfo)
-alignment_dep=$(addprefix ./$(DEPDIR)/,$(alignment_obj:.qfo=.Qo))
-alignment.dat$(EXEEXT): $(alignment_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(alignment_obj)
-alignment.run: Makefile build-run
-	@$(srcdir)/build-run $@
-include $(alignment_dep) # am--include-marker
-r_depfiles_remade += $(alignment_dep)
-
-anonstruct_dat_SOURCES=anonstruct.r
-anonstruct_obj=$(anonstruct_dat_SOURCES:.r=.qfo)
-anonstruct_dep=$(addprefix ./$(DEPDIR)/,$(anonstruct_obj:.qfo=.Qo))
-anonstruct.dat$(EXEEXT): $(anonstruct_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(anonstruct_obj)
-anonstruct.run: Makefile build-run
-	@$(srcdir)/build-run $@
-include $(anonstruct_dep) # am--include-marker
-r_depfiles_remade += $(anonstruct_dep)
-
-assignchain_dat_SOURCES=assignchain.r
-assignchain_obj=$(assignchain_dat_SOURCES:.r=.qfo)
-assignchain_dep=$(addprefix ./$(DEPDIR)/,$(assignchain_obj:.qfo=.Qo))
-assignchain.dat$(EXEEXT): $(assignchain_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(assignchain_obj)
-assignchain.run: Makefile build-run
-	@$(srcdir)/build-run $@
-include $(assignchain_dep) # am--include-marker
-r_depfiles_remade += $(assignchain_dep)
-
-chewed_alias_dat_SOURCES=chewed-alias.r
-chewed_alias_obj=$(chewed_alias_dat_SOURCES:.r=.qfo)
-chewed_alias_dep=$(addprefix ./$(DEPDIR)/,$(chewed_alias_obj:.qfo=.Qo))
-chewed-alias.dat$(EXEEXT): $(chewed_alias_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(chewed_alias_obj)
-chewed-alias.run: Makefile build-run
-	@$(srcdir)/build-run $@
-include $(chewed_alias_dep) # am--include-marker
-r_depfiles_remade += $(chewed_alias_dep)
-
-chewed_return_dat_SOURCES=chewed-return.r
-chewed_return_obj=$(chewed_return_dat_SOURCES:.r=.qfo)
-chewed_return_dep=$(addprefix ./$(DEPDIR)/,$(chewed_return_obj:.qfo=.Qo))
-chewed-return.dat$(EXEEXT): $(chewed_return_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(chewed_return_obj)
-chewed-return.run: Makefile build-run
-	@TEST_HARNESS_OPTS=--float $(srcdir)/build-run $@
-include $(chewed_return_dep) # am--include-marker
-r_depfiles_remade += $(chewed_return_dep)
-
-comma_expr_dat_SOURCES=comma-expr.r
-comma_expr_obj=$(comma_expr_dat_SOURCES:.r=.qfo)
-comma_expr_dep=$(addprefix ./$(DEPDIR)/,$(comma_expr_obj:.qfo=.Qo))
-comma-expr.dat$(EXEEXT): $(comma_expr_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(comma_expr_obj)
-comma-expr.run: Makefile build-run
-	@$(srcdir)/build-run $@
-include $(comma_expr_dep) # am--include-marker
-r_depfiles_remade += $(comma_expr_dep)
-
-compound_dat_SOURCES=compound.r
-compound_obj=$(compound_dat_SOURCES:.r=.qfo)
-compound_dep=$(addprefix ./$(DEPDIR)/,$(compound_obj:.qfo=.Qo))
-compound.dat$(EXEEXT): $(compound_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(compound_obj)
-compound.run: Makefile build-run
-	@$(srcdir)/build-run $@
-include $(compound_dep) # am--include-marker
-r_depfiles_remade += $(compound_dep)
-
-deadbool_dat_SOURCES=deadbool.r
-deadbool_obj=$(deadbool_dat_SOURCES:.r=.qfo)
-deadbool_dep=$(addprefix ./$(DEPDIR)/,$(deadbool_obj:.qfo=.Qo))
-deadbool.dat$(EXEEXT): $(deadbool_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(deadbool_obj)
-deadbool.run: Makefile build-run
-	@$(srcdir)/build-run $@
-include $(deadbool_dep) # am--include-marker
-r_depfiles_remade += $(deadbool_dep)
-
-double_dat_SOURCES=double.r
-double_obj=$(double_dat_SOURCES:.r=.qfo)
-double_dep=$(addprefix ./$(DEPDIR)/,$(double_obj:.qfo=.Qo))
-double.dat$(EXEEXT): $(double_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(double_obj)
-double.run: Makefile build-run
-	@$(srcdir)/build-run $@
-include $(double_dep) # am--include-marker
-r_depfiles_remade += $(double_dep)
-
-double_alias_dat_SOURCES=double-alias.r
-double_alias_obj=$(double_alias_dat_SOURCES:.r=.qfo)
-double_alias_dep=$(addprefix ./$(DEPDIR)/,$(double_alias_obj:.qfo=.Qo))
-double-alias.dat$(EXEEXT): $(double_alias_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(double_alias_obj)
-double-alias.run: Makefile build-run
-	@$(srcdir)/build-run $@
-include $(double_alias_dep) # am--include-marker
-r_depfiles_remade += $(double_alias_dep)
-
-classarray.run$(EXEEXT): classarray.r Makefile build-compile-fail-run
-	@$(srcdir)/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $<
-
-double-demote-int.run$(EXEEXT): double-demote-int.r Makefile build-compile-fail-run
-	@$(srcdir)/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $<
-
-double-demote-float.run$(EXEEXT): double-demote-float.r Makefile build-compile-fail-run
-	@$(srcdir)/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $<
-
-double-demote-int-ainit.run$(EXEEXT): double-demote-int-ainit.r Makefile build-compile-fail-run
-	@$(srcdir)/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $<
-
-double-demote-float-ainit.run$(EXEEXT): double-demote-float-ainit.r Makefile build-compile-fail-run
-	@$(srcdir)/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $<
-
-double-demote-int-ginit.run$(EXEEXT): double-demote-int-ginit.r Makefile build-compile-fail-run
-	@$(srcdir)/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $<
-
-double-demote-float-ginit.run$(EXEEXT): double-demote-float-ginit.r Makefile build-compile-fail-run
-	@$(srcdir)/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $<
-
-double-demote-int-linit.run$(EXEEXT): double-demote-int-linit.r Makefile build-compile-fail-run
-	@$(srcdir)/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $<
-
-double-demote-float-linit.run$(EXEEXT): double-demote-float-linit.r Makefile build-compile-fail-run
-	@$(srcdir)/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $<
-
-double-int-compare.run$(EXEEXT): double-int-compare.r Makefile build-compile-fail-run
-	@$(srcdir)/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $<
-
-double-float-compare.run$(EXEEXT): double-float-compare.r Makefile build-compile-fail-run
-	@$(srcdir)/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $<
-
-enum_dat_SOURCES=enum.r
-enum_obj=$(enum_dat_SOURCES:.r=.qfo)
-enum_dep=$(addprefix ./$(DEPDIR)/,$(enum_obj:.qfo=.Qo))
-enum.dat$(EXEEXT): $(enum_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(enum_obj)
-enum.run: Makefile build-run
-	@$(srcdir)/build-run $@
-include $(enum_dep) # am--include-marker
-r_depfiles_remade += $(enum_dep)
-
-fordecl_dat_SOURCES=fordecl.r
-fordecl_obj=$(fordecl_dat_SOURCES:.r=.qfo)
-fordecl_dep=$(addprefix ./$(DEPDIR)/,$(fordecl_obj:.qfo=.Qo))
-fordecl.dat$(EXEEXT): $(fordecl_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(fordecl_obj)
-fordecl.run: Makefile build-run
-	@$(srcdir)/build-run $@
-include $(fordecl_dep) # am--include-marker
-r_depfiles_remade += $(fordecl_dep)
-
-func_expr_dat_SOURCES=func-expr.r
-func_expr_obj=$(func_expr_dat_SOURCES:.r=.qfo)
-func_expr_dep=$(addprefix ./$(DEPDIR)/,$(func_expr_obj:.qfo=.Qo))
-func-expr.dat$(EXEEXT): $(func_expr_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(func_expr_obj)
-func-expr.run: Makefile build-run
-	@$(srcdir)/build-run $@
-include $(func_expr_dep) # am--include-marker
-r_depfiles_remade += $(func_expr_dep)
-
-func_expr2_dat_SOURCES=func-expr2.r
-func_expr2_obj=$(func_expr2_dat_SOURCES:.r=.qfo)
-func_expr2_dep=$(addprefix ./$(DEPDIR)/,$(func_expr2_obj:.qfo=.Qo))
-func-expr2.dat$(EXEEXT): $(func_expr2_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(func_expr2_obj)
-func-expr2.run: Makefile build-run
-	@$(srcdir)/build-run $@
-include $(func_expr2_dep) # am--include-marker
-r_depfiles_remade += $(func_expr2_dep)
-
-func_static_dat_SOURCES=func-static.r
-func_static_obj=$(func_static_dat_SOURCES:.r=.qfo)
-func_static_dep=$(addprefix ./$(DEPDIR)/,$(func_static_obj:.qfo=.Qo))
-func-static.dat$(EXEEXT): $(func_static_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(func_static_obj)
-func-static.run: Makefile build-run
-	@$(srcdir)/build-run $@
-include $(func_static_dep) # am--include-marker
-r_depfiles_remade += $(func_static_dep)
-
-gcd_dat_SOURCES=gcd.pas
-gcd_obj=$(gcd_dat_SOURCES:.pas=.qfo)
-gcd_dep=$(addprefix ./$(DEPDIR)/,$(gcd_obj:.qfo=.Qo))
-gcd.dat$(EXEEXT): $(gcd_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(gcd_obj)
-gcd.run: Makefile build-run
-	@$(srcdir)/build-run $@
-include $(gcd_dep) # am--include-marker
-r_depfiles_remade += $(gcd_dep)
-
-infloop_dat_SOURCES=infloop.r
-infloop_obj=$(infloop_dat_SOURCES:.r=.qfo)
-infloop_dep=$(addprefix ./$(DEPDIR)/,$(infloop_obj:.qfo=.Qo))
-infloop.dat$(EXEEXT): $(infloop_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(infloop_obj)
-infloop.run: Makefile build-run
-	@$(srcdir)/build-run $@
-include $(infloop_dep) # am--include-marker
-r_depfiles_remade += $(infloop_dep)
-
-ivar_struct_return_dat_SOURCES=ivar-struct-return.r
-ivar_struct_return_obj=$(ivar_struct_return_dat_SOURCES:.r=.qfo)
-ivar_struct_return_dep=$(addprefix ./$(DEPDIR)/,$(ivar_struct_return_obj:.qfo=.Qo))
-ivar-struct-return.dat$(EXEEXT): $(ivar_struct_return_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(ivar_struct_return_obj)
-ivar-struct-return.run: Makefile build-run
-	@$(srcdir)/build-run $@
-include $(ivar_struct_return_dep) # am--include-marker
-r_depfiles_remade += $(ivar_struct_return_dep)
-
-methodparams_dat_SOURCES=methodparams.r
-methodparams_obj=$(methodparams_dat_SOURCES:.r=.qfo)
-methodparams_dep=$(addprefix ./$(DEPDIR)/,$(methodparams_obj:.qfo=.Qo))
-methodparams.dat$(EXEEXT): $(methodparams_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(methodparams_obj)
-methodparams.run: Makefile build-run
-	@$(srcdir)/build-run $@
-include $(methodparams_dep) # am--include-marker
-r_depfiles_remade += $(methodparams_dep)
-
-modulo_dat_SOURCES=modulo.r
-modulo_obj=$(modulo_dat_SOURCES:.r=.qfo)
-modulo_dep=$(addprefix ./$(DEPDIR)/,$(modulo_obj:.qfo=.Qo))
-modulo.dat$(EXEEXT): $(modulo_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(modulo_obj)
-modulo.run: Makefile build-run
-	@TEST_HARNESS_OPTS=--float $(srcdir)/build-run $@
-include $(modulo_dep) # am--include-marker
-r_depfiles_remade += $(modulo_dep)
-
-nilparamret_dat_SOURCES=nilparamret.r
-nilparamret_obj=$(nilparamret_dat_SOURCES:.r=.qfo)
-nilparamret_dep=$(addprefix ./$(DEPDIR)/,$(nilparamret_obj:.qfo=.Qo))
-nilparamret.dat$(EXEEXT): $(nilparamret_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(nilparamret_obj)
-nilparamret.run: Makefile build-run
-	@$(srcdir)/build-run $@
-include $(nilparamret_dep) # am--include-marker
-r_depfiles_remade += $(nilparamret_dep)
-
-overload_dat_SOURCES=overload.r
-overload_obj=$(overload_dat_SOURCES:.r=.qfo)
-overload_dep=$(addprefix ./$(DEPDIR)/,$(overload_obj:.qfo=.Qo))
-overload.dat$(EXEEXT): $(overload_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(overload_obj)
-overload.run: Makefile build-run
-	@$(srcdir)/build-run $@
-include $(overload_dep) # am--include-marker
-r_depfiles_remade += $(overload_dep)
-
-paramret_dat_SOURCES=paramret.r
-paramret_obj=$(paramret_dat_SOURCES:.r=.qfo)
-paramret_dep=$(addprefix ./$(DEPDIR)/,$(paramret_obj:.qfo=.Qo))
-paramret.dat$(EXEEXT): $(paramret_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(paramret_obj)
-paramret.run: Makefile build-run
-	@$(srcdir)/build-run $@
-include $(paramret_dep) # am--include-marker
-r_depfiles_remade += $(paramret_dep)
-
-quaternion_dat_SOURCES=quaternion.r
-quaternion_obj=$(quaternion_dat_SOURCES:.r=.qfo)
-quaternion_dep=$(addprefix ./$(DEPDIR)/,$(quaternion_obj:.qfo=.Qo))
-quaternion.dat$(EXEEXT): $(quaternion_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(quaternion_obj)
-quaternion.run: Makefile build-run
-	@$(srcdir)/build-run $@
-include $(quaternion_dep) # am--include-marker
-r_depfiles_remade += $(quaternion_dep)
-
-return_ivar_dat_SOURCES=return-ivar.r
-return_ivar_obj=$(return_ivar_dat_SOURCES:.r=.qfo)
-return_ivar_dep=$(addprefix ./$(DEPDIR)/,$(return_ivar_obj:.qfo=.Qo))
-return-ivar.dat$(EXEEXT): $(return_ivar_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(return_ivar_obj)
-return-ivar.run: Makefile build-run
-	@$(srcdir)/build-run $@
-include $(return_ivar_dep) # am--include-marker
-r_depfiles_remade += $(return_ivar_dep)
-
-sendv_dat_SOURCES=sendv.r
-sendv_obj=$(sendv_dat_SOURCES:.r=.qfo)
-sendv_dep=$(addprefix ./$(DEPDIR)/,$(sendv_obj:.qfo=.Qo))
-sendv.dat$(EXEEXT): $(sendv_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(sendv_obj)
-sendv.run: Makefile build-run
-	@$(srcdir)/build-run $@
-include $(sendv_dep) # am--include-marker
-r_depfiles_remade += $(sendv_dep)
-
-state_dat_SOURCES=state.r
-state_obj=$(state_dat_SOURCES:.r=.qfo)
-state_dep=$(addprefix ./$(DEPDIR)/,$(state_obj:.qfo=.Qo))
-state.dat$(EXEEXT): $(state_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(state_obj)
-state.run: Makefile build-run
-	@$(srcdir)/build-run $@
-include $(state_dep) # am--include-marker
-r_depfiles_remade += $(state_dep)
-
-struct_init_param_dat_SOURCES=struct-init-param.r
-struct_init_param_obj=$(struct_init_param_dat_SOURCES:.r=.qfo)
-struct_init_param_dep=$(addprefix ./$(DEPDIR)/,$(struct_init_param_obj:.qfo=.Qo))
-struct-init-param.dat$(EXEEXT): $(struct_init_param_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(struct_init_param_obj)
-struct-init-param.run: Makefile build-run
-	@$(srcdir)/build-run $@
-include $(struct_init_param_dep) # am--include-marker
-r_depfiles_remade += $(struct_init_param_dep)
-
-struct_nil_init_dat_SOURCES=struct-nil-init.r
-struct_nil_init_obj=$(struct_nil_init_dat_SOURCES:.r=.qfo)
-struct_nil_init_dep=$(addprefix ./$(DEPDIR)/,$(struct_nil_init_obj:.qfo=.Qo))
-struct-nil-init.dat$(EXEEXT): $(struct_nil_init_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(struct_nil_init_obj)
-struct-nil-init.run: Makefile build-run
-	@$(srcdir)/build-run $@
-include $(struct_nil_init_dep) # am--include-marker
-r_depfiles_remade += $(struct_nil_init_dep)
-
-structarray_dat_SOURCES=structarray.r
-structarray_obj=$(structarray_dat_SOURCES:.r=.qfo)
-structarray_dep=$(addprefix ./$(DEPDIR)/,$(structarray_obj:.qfo=.Qo))
-structarray.dat$(EXEEXT): $(structarray_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(structarray_obj)
-structarray.run: Makefile build-run
-	@$(srcdir)/build-run $@
-include $(structarray_dep) # am--include-marker
-r_depfiles_remade += $(structarray_dep)
-
-structlive_dat_SOURCES=structlive.r
-structlive_obj=$(structlive_dat_SOURCES:.r=.qfo)
-structlive_dep=$(addprefix ./$(DEPDIR)/,$(structlive_obj:.qfo=.Qo))
-structlive.dat$(EXEEXT): $(structlive_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(structlive_obj)
-structlive.run: Makefile build-run
-	@$(srcdir)/build-run $@
-include $(structlive_dep) # am--include-marker
-r_depfiles_remade += $(structlive_dep)
-
-structptr_dat_SOURCES=structptr.r
-structptr_obj=$(structptr_dat_SOURCES:.r=.qfo)
-structptr_dep=$(addprefix ./$(DEPDIR)/,$(structptr_obj:.qfo=.Qo))
-structptr.dat$(EXEEXT): $(structptr_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(structptr_obj)
-structptr.run: Makefile build-run
-	@$(srcdir)/build-run $@
-include $(structptr_dep) # am--include-marker
-r_depfiles_remade += $(structptr_dep)
-
-structstruct_dat_SOURCES=structstruct.r
-structstruct_obj=$(structstruct_dat_SOURCES:.r=.qfo)
-structstruct_dep=$(addprefix ./$(DEPDIR)/,$(structstruct_obj:.qfo=.Qo))
-structstruct.dat$(EXEEXT): $(structstruct_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(structstruct_obj)
-structstruct.run: Makefile build-run
-	@$(srcdir)/build-run $@
-include $(structstruct_dep) # am--include-marker
-r_depfiles_remade += $(structstruct_dep)
-
-swap_dat_SOURCES=swap.r
-swap_obj=$(swap_dat_SOURCES:.r=.qfo)
-swap_dep=$(addprefix ./$(DEPDIR)/,$(swap_obj:.qfo=.Qo))
-swap.dat$(EXEEXT): $(swap_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(swap_obj)
-swap.run: Makefile build-run
-	@$(srcdir)/build-run $@
-include $(swap_dep) # am--include-marker
-r_depfiles_remade += $(swap_dep)
-
-triangle_dat_SOURCES=triangle.r
-triangle_obj=$(triangle_dat_SOURCES:.r=.qfo)
-triangle_dep=$(addprefix ./$(DEPDIR)/,$(triangle_obj:.qfo=.Qo))
-triangle.dat$(EXEEXT): $(triangle_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(triangle_obj)
-triangle.run: Makefile build-run
-	@$(srcdir)/build-run $@ 100000 100000 1.00005 50002.4961
-include $(triangle_dep) # am--include-marker
-r_depfiles_remade += $(triangle_dep)
-
-typedef_dat_SOURCES=typedef.r
-typedef_obj=$(typedef_dat_SOURCES:.r=.qfo)
-typedef_dep=$(addprefix ./$(DEPDIR)/,$(typedef_obj:.qfo=.Qo))
-typedef.dat$(EXEEXT): $(typedef_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(typedef_obj)
-typedef.run: Makefile build-run
-	@$(srcdir)/build-run $@
-include $(typedef_dep) # am--include-marker
-r_depfiles_remade += $(typedef_dep)
-
-typelinker_dat_SOURCES=typelinker_a.r typelinker_b.r
-typelinker_obj=$(typelinker_dat_SOURCES:.r=.qfo)
-typelinker_dep=$(addprefix ./$(DEPDIR)/,$(typelinker_obj:.qfo=.Qo))
-typelinker.dat$(EXEEXT): $(typelinker_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(typelinker_obj)
-typelinker.run: Makefile build-run
-	@$(srcdir)/build-run $@
-include $(typelinker_dep) # am--include-marker
-r_depfiles_remade += $(typelinker_dep)
-
-unaryminus_dat_SOURCES=unaryminus.r
-unaryminus_obj=$(unaryminus_dat_SOURCES:.r=.qfo)
-unaryminus_dep=$(addprefix ./$(DEPDIR)/,$(unaryminus_obj:.qfo=.Qo))
-unaryminus.dat$(EXEEXT): $(unaryminus_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(unaryminus_obj)
-unaryminus.run: Makefile build-run
-	@$(srcdir)/build-run $@
-include $(unaryminus_dep) # am--include-marker
-r_depfiles_remade += $(unaryminus_dep)
-
-vecaddr_dat_SOURCES=vecaddr.r
-vecaddr_obj=$(vecaddr_dat_SOURCES:.r=.qfo)
-vecaddr_dep=$(addprefix ./$(DEPDIR)/,$(vecaddr_obj:.qfo=.Qo))
-vecaddr.dat$(EXEEXT): $(vecaddr_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(vecaddr_obj)
-vecaddr.run: Makefile build-run
-	@$(srcdir)/build-run $@
-include $(vecaddr_dep) # am--include-marker
-r_depfiles_remade += $(vecaddr_dep)
-
-vecexpr_dat_SOURCES=vecexpr.r
-vecexpr_obj=$(vecexpr_dat_SOURCES:.r=.qfo)
-vecexpr_dep=$(addprefix ./$(DEPDIR)/,$(vecexpr_obj:.qfo=.Qo))
-vecexpr.dat$(EXEEXT): $(vecexpr_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(vecexpr_obj)
-vecexpr.run: Makefile build-run
-	@$(srcdir)/build-run $@
-include $(vecexpr_dep) # am--include-marker
-r_depfiles_remade += $(vecexpr_dep)
-
-vecinit_dat_SOURCES=vecinit.r
-vecinit_obj=$(vecinit_dat_SOURCES:.r=.qfo)
-vecinit_dep=$(addprefix ./$(DEPDIR)/,$(vecinit_obj:.qfo=.Qo))
-vecinit.dat$(EXEEXT): $(vecinit_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(vecinit_obj)
-vecinit.run: Makefile build-run
-	@$(srcdir)/build-run $@
-include $(vecinit_dep) # am--include-marker
-r_depfiles_remade += $(vecinit_dep)
-
-voidfor_dat_SOURCES=voidfor.r
-voidfor_obj=$(voidfor_dat_SOURCES:.r=.qfo)
-voidfor_dep=$(addprefix ./$(DEPDIR)/,$(voidfor_obj:.qfo=.Qo))
-voidfor.dat$(EXEEXT): $(voidfor_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(voidfor_obj)
-voidfor.run: Makefile build-run
-	@$(srcdir)/build-run $@
-include $(voidfor_dep) # am--include-marker
-r_depfiles_remade += $(voidfor_dep)
-
-while_dat_SOURCES=while.r
-while_obj=$(while_dat_SOURCES:.r=.qfo)
-while_dep=$(addprefix ./$(DEPDIR)/,$(while_obj:.qfo=.Qo))
-while.dat$(EXEEXT): $(while_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(while_obj)
-while.run: Makefile build-run
-	@$(srcdir)/build-run $@
-include $(while_dep) # am--include-marker
-r_depfiles_remade += $(while_dep)
-
-zerolinker_dat_SOURCES=zerolinker.r
-zerolinker_obj=$(zerolinker_dat_SOURCES:.r=.qfo)
-zerolinker_dep=$(addprefix ./$(DEPDIR)/,$(zerolinker_obj:.qfo=.Qo))
-zerolinker.dat$(EXEEXT): $(zerolinker_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(zerolinker_obj)
-zerolinker.run: Makefile build-run
-	@$(srcdir)/build-run $@
-include $(zerolinker_dep) # am--include-marker
-r_depfiles_remade += $(zerolinker_dep)
-
-$(r_depfiles_remade):
-	@$(MKDIR_P) $(@D)
-	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
-
-
-am--depfiles: $(am__depfiles_remade) $(r_depfiles_remade)
-
-EXTRA_DIST= test-bi.h build-run test-defspace.h
-CLEANFILES= *.dat *.sym *.qfo *.run *.frame *.log *.trs
diff --git a/tools/qfcc/test/Makemodule.am b/tools/qfcc/test/Makemodule.am
new file mode 100644
index 000000000..85f94b800
--- /dev/null
+++ b/tools/qfcc/test/Makemodule.am
@@ -0,0 +1,599 @@
+QFCC_TEST_LIBS=@QFCC_TEST_LIBS@
+QFCC_TEST_DEPS=@QFCC_TEST_DEPS@
+QFCC_TEST_INCS=@QFCC_TEST_INCS@
+
+test_bins=\
+	tools/qfcc/test/test-defspace
+
+fail_bins=
+
+test_progs_dat=\
+	tools/qfcc/test/address-cast.dat \
+	tools/qfcc/test/alignment.dat \
+	tools/qfcc/test/assignchain.dat \
+	tools/qfcc/test/anonstruct.dat \
+	tools/qfcc/test/chewed-alias.dat \
+	tools/qfcc/test/chewed-return.dat \
+	tools/qfcc/test/comma-expr.dat \
+	tools/qfcc/test/compound.dat \
+	tools/qfcc/test/deadbool.dat \
+	tools/qfcc/test/double.dat \
+	tools/qfcc/test/double-alias.dat \
+	tools/qfcc/test/enum.dat \
+	tools/qfcc/test/fordecl.dat \
+	tools/qfcc/test/func-expr.dat \
+	tools/qfcc/test/func-expr2.dat \
+	tools/qfcc/test/func-static.dat \
+	tools/qfcc/test/gcd.dat \
+	tools/qfcc/test/infloop.dat \
+	tools/qfcc/test/ivar-struct-return.dat \
+	tools/qfcc/test/methodparams.dat \
+	tools/qfcc/test/modulo.dat \
+	tools/qfcc/test/nilparamret.dat \
+	tools/qfcc/test/overload.dat \
+	tools/qfcc/test/paramret.dat \
+	tools/qfcc/test/quaternion.dat \
+	tools/qfcc/test/return-ivar.dat \
+	tools/qfcc/test/sendv.dat \
+	tools/qfcc/test/state.dat \
+	tools/qfcc/test/struct-init-param.dat \
+	tools/qfcc/test/struct-nil-init.dat \
+	tools/qfcc/test/structarray.dat \
+	tools/qfcc/test/structlive.dat \
+	tools/qfcc/test/structptr.dat \
+	tools/qfcc/test/structstruct.dat \
+	tools/qfcc/test/swap.dat \
+	tools/qfcc/test/triangle.dat \
+	tools/qfcc/test/typedef.dat \
+	tools/qfcc/test/typelinker.dat \
+	tools/qfcc/test/unaryminus.dat \
+	tools/qfcc/test/vecaddr.dat \
+	tools/qfcc/test/vecexpr.dat \
+	tools/qfcc/test/vecinit.dat \
+	tools/qfcc/test/voidfor.dat \
+	tools/qfcc/test/while.dat \
+	tools/qfcc/test/zerolinker.dat
+
+fail_progs_dat=
+
+test_build_errors=\
+	tools/qfcc/test/classarray.r \
+	tools/qfcc/test/double-demote-float.r \
+	tools/qfcc/test/double-demote-float-ainit.r \
+	tools/qfcc/test/double-demote-float-ginit.r \
+	tools/qfcc/test/double-demote-float-linit.r \
+	tools/qfcc/test/double-demote-int.r \
+	tools/qfcc/test/double-demote-int-ainit.r \
+	tools/qfcc/test/double-demote-int-ginit.r \
+	tools/qfcc/test/double-demote-int-linit.r \
+	tools/qfcc/test/double-int-compare.r \
+	tools/qfcc/test/double-float-compare.r
+
+fail_build_errors=
+
+test_defspace_src=\
+	tools/qfcc/test/tw-defspace.c tools/qfcc/test/tw-diagnostic.c tools/qfcc/test/tw-strpool.c
+
+TESTS += \
+	$(test_bins) \
+	$(test_progs_dat:.dat=.run) \
+	$(test_build_errors:.r=.run)
+XFAIL_TESTS += \
+	$(fail_bins) \
+	$(fail_progs_dat:.dat=.run) \
+	$(fail_build_errors:.r=.run)
+
+check_PROGRAMS += \
+	tools/qfcc/test/test-harness \
+	$(test_progs_dat) \
+	$(test_bins)
+
+tools_qfcc_test_test_defspace_SOURCES=		tools/qfcc/test/test-defspace.c $(test_defspace_src)
+tools_qfcc_test_test_defspace_LDADD=		$(QFCC_LIBS)
+tools_qfcc_test_test_defspace_DEPENDENCIES=	$(QFCC_DEPS)
+
+tools_qfcc_test_test_harness_SOURCES=		tools/qfcc/test/test-bi.c tools/qfcc/test/test-harness.c
+tools_qfcc_test_test_harness_LDADD=			$(QFCC_TEST_LIBS)
+tools_qfcc_test_test_harness_DEPENDENCIES=	$(QFCC_TEST_DEPS)
+
+qfcc_test_run_deps = Makefile tools/qfcc/test/build-run
+qfcc_fail_run_deps = Makefile tools/qfcc/test/build-compile-fail-run
+tools_qfcc_test_address_cast_dat_SOURCES=tools/qfcc/test/address-cast.r
+address_cast_obj=$(tools_qfcc_test_address_cast_dat_SOURCES:.r=.o)
+address_cast_dep=$(call qcautodep,$(tools_qfcc_test_address_cast_dat_SOURCES))
+tools/qfcc/test/address-cast.dat$(EXEEXT): $(address_cast_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(address_cast_obj)
+tools/qfcc/test/address-cast.run: $(qfcc_test_run_deps)
+	@$(top_srcdir)/tools/qfcc/test/build-run $@
+include $(address_cast_dep) # am--include-marker
+r_depfiles_remade += $(address_cast_dep)
+
+tools_qfcc_test_alignment_dat_SOURCES=tools/qfcc/test/alignment.r
+alignment_obj=$(tools_qfcc_test_alignment_dat_SOURCES:.r=.o)
+alignment_dep=$(call qcautodep,$(tools_qfcc_test_alignment_dat_SOURCES))
+tools/qfcc/test/alignment.dat$(EXEEXT): $(alignment_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(alignment_obj)
+tools/qfcc/test/alignment.run: $(qfcc_test_run_deps)
+	@$(top_srcdir)/tools/qfcc/test/build-run $@
+include $(alignment_dep) # am--include-marker
+r_depfiles_remade += $(alignment_dep)
+
+tools_qfcc_test_anonstruct_dat_SOURCES=tools/qfcc/test/anonstruct.r
+anonstruct_obj=$(tools_qfcc_test_anonstruct_dat_SOURCES:.r=.o)
+anonstruct_dep=$(call qcautodep,$(tools_qfcc_test_anonstruct_dat_SOURCES))
+tools/qfcc/test/anonstruct.dat$(EXEEXT): $(anonstruct_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(anonstruct_obj)
+tools/qfcc/test/anonstruct.run: $(qfcc_test_run_deps)
+	@$(top_srcdir)/tools/qfcc/test/build-run $@
+include $(anonstruct_dep) # am--include-marker
+r_depfiles_remade += $(anonstruct_dep)
+
+tools_qfcc_test_assignchain_dat_SOURCES=tools/qfcc/test/assignchain.r
+assignchain_obj=$(tools_qfcc_test_assignchain_dat_SOURCES:.r=.o)
+assignchain_dep=$(call qcautodep,$(tools_qfcc_test_assignchain_dat_SOURCES))
+tools/qfcc/test/assignchain.dat$(EXEEXT): $(assignchain_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(assignchain_obj)
+tools/qfcc/test/assignchain.run: $(qfcc_test_run_deps)
+	@$(top_srcdir)/tools/qfcc/test/build-run $@
+include $(assignchain_dep) # am--include-marker
+r_depfiles_remade += $(assignchain_dep)
+
+tools_qfcc_test_chewed_alias_dat_SOURCES=tools/qfcc/test/chewed-alias.r
+chewed_alias_obj=$(tools_qfcc_test_chewed_alias_dat_SOURCES:.r=.o)
+chewed_alias_dep=$(call qcautodep,$(tools_qfcc_test_chewed_alias_dat_SOURCES))
+tools/qfcc/test/chewed-alias.dat$(EXEEXT): $(chewed_alias_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(chewed_alias_obj)
+tools/qfcc/test/chewed-alias.run: $(qfcc_test_run_deps)
+	@$(top_srcdir)/tools/qfcc/test/build-run $@
+include $(chewed_alias_dep) # am--include-marker
+r_depfiles_remade += $(chewed_alias_dep)
+
+tools_qfcc_test_chewed_return_dat_SOURCES=tools/qfcc/test/chewed-return.r
+chewed_return_obj=$(tools_qfcc_test_chewed_return_dat_SOURCES:.r=.o)
+chewed_return_dep=$(call qcautodep,$(tools_qfcc_test_chewed_return_dat_SOURCES))
+tools/qfcc/test/chewed-return.dat$(EXEEXT): $(chewed_return_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(chewed_return_obj)
+tools/qfcc/test/chewed-return.run: $(qfcc_test_run_deps)
+	@TEST_HARNESS_OPTS=--float $(top_srcdir)/tools/qfcc/test/build-run $@
+include $(chewed_return_dep) # am--include-marker
+r_depfiles_remade += $(chewed_return_dep)
+
+tools_qfcc_test_comma_expr_dat_SOURCES=tools/qfcc/test/comma-expr.r
+comma_expr_obj=$(tools_qfcc_test_comma_expr_dat_SOURCES:.r=.o)
+comma_expr_dep=$(call qcautodep,$(tools_qfcc_test_comma_expr_dat_SOURCES))
+tools/qfcc/test/comma-expr.dat$(EXEEXT): $(comma_expr_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(comma_expr_obj)
+tools/qfcc/test/comma-expr.run: $(qfcc_test_run_deps)
+	@$(top_srcdir)/tools/qfcc/test/build-run $@
+include $(comma_expr_dep) # am--include-marker
+r_depfiles_remade += $(comma_expr_dep)
+
+tools_qfcc_test_compound_dat_SOURCES=tools/qfcc/test/compound.r
+compound_obj=$(tools_qfcc_test_compound_dat_SOURCES:.r=.o)
+compound_dep=$(call qcautodep,$(tools_qfcc_test_compound_dat_SOURCES))
+tools/qfcc/test/compound.dat$(EXEEXT): $(compound_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(compound_obj)
+tools/qfcc/test/compound.run: $(qfcc_test_run_deps)
+	@$(top_srcdir)/tools/qfcc/test/build-run $@
+include $(compound_dep) # am--include-marker
+r_depfiles_remade += $(compound_dep)
+
+tools_qfcc_test_deadbool_dat_SOURCES=tools/qfcc/test/deadbool.r
+deadbool_obj=$(tools_qfcc_test_deadbool_dat_SOURCES:.r=.o)
+deadbool_dep=$(call qcautodep,$(tools_qfcc_test_deadbool_dat_SOURCES))
+tools/qfcc/test/deadbool.dat$(EXEEXT): $(deadbool_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(deadbool_obj)
+tools/qfcc/test/deadbool.run: $(qfcc_test_run_deps)
+	@$(top_srcdir)/tools/qfcc/test/build-run $@
+include $(deadbool_dep) # am--include-marker
+r_depfiles_remade += $(deadbool_dep)
+
+tools_qfcc_test_double_dat_SOURCES=tools/qfcc/test/double.r
+double_obj=$(tools_qfcc_test_double_dat_SOURCES:.r=.o)
+double_dep=$(call qcautodep,$(tools_qfcc_test_double_dat_SOURCES))
+tools/qfcc/test/double.dat$(EXEEXT): $(double_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(double_obj)
+tools/qfcc/test/double.run: $(qfcc_test_run_deps)
+	@$(top_srcdir)/tools/qfcc/test/build-run $@
+include $(double_dep) # am--include-marker
+r_depfiles_remade += $(double_dep)
+
+tools_qfcc_test_double_alias_dat_SOURCES=tools/qfcc/test/double-alias.r
+double_alias_obj=$(tools_qfcc_test_double_alias_dat_SOURCES:.r=.o)
+double_alias_dep=$(call qcautodep,$(tools_qfcc_test_double_alias_dat_SOURCES))
+tools/qfcc/test/double-alias.dat$(EXEEXT): $(double_alias_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(double_alias_obj)
+tools/qfcc/test/double-alias.run: $(qfcc_test_run_deps)
+	@$(top_srcdir)/tools/qfcc/test/build-run $@
+include $(double_alias_dep) # am--include-marker
+r_depfiles_remade += $(double_alias_dep)
+
+tools/qfcc/test/classarray.run$(EXEEXT): tools/qfcc/test/classarray.r $(qfcc_fail_run_deps)
+	@$(top_srcdir)/tools/qfcc/test/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $<
+
+tools/qfcc/test/double-demote-int.run$(EXEEXT): tools/qfcc/test/double-demote-int.r $(qfcc_fail_run_deps)
+	@$(top_srcdir)/tools/qfcc/test/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $<
+
+tools/qfcc/test/double-demote-float.run$(EXEEXT): tools/qfcc/test/double-demote-float.r $(qfcc_fail_run_deps)
+	@$(top_srcdir)/tools/qfcc/test/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $<
+
+tools/qfcc/test/double-demote-int-ainit.run$(EXEEXT): tools/qfcc/test/double-demote-int-ainit.r $(qfcc_fail_run_deps)
+	@$(top_srcdir)/tools/qfcc/test/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $<
+
+tools/qfcc/test/double-demote-float-ainit.run$(EXEEXT): tools/qfcc/test/double-demote-float-ainit.r $(qfcc_fail_run_deps)
+	@$(top_srcdir)/tools/qfcc/test/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $<
+
+tools/qfcc/test/double-demote-int-ginit.run$(EXEEXT): tools/qfcc/test/double-demote-int-ginit.r $(qfcc_fail_run_deps)
+	@$(top_srcdir)/tools/qfcc/test/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $<
+
+tools/qfcc/test/double-demote-float-ginit.run$(EXEEXT): tools/qfcc/test/double-demote-float-ginit.r $(qfcc_fail_run_deps)
+	@$(top_srcdir)/tools/qfcc/test/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $<
+
+tools/qfcc/test/double-demote-int-linit.run$(EXEEXT): tools/qfcc/test/double-demote-int-linit.r $(qfcc_fail_run_deps)
+	@$(top_srcdir)/tools/qfcc/test/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $<
+
+tools/qfcc/test/double-demote-float-linit.run$(EXEEXT): tools/qfcc/test/double-demote-float-linit.r $(qfcc_fail_run_deps)
+	@$(top_srcdir)/tools/qfcc/test/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $<
+
+tools/qfcc/test/double-int-compare.run$(EXEEXT): tools/qfcc/test/double-int-compare.r $(qfcc_fail_run_deps)
+	@$(top_srcdir)/tools/qfcc/test/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $<
+
+tools/qfcc/test/double-float-compare.run$(EXEEXT): tools/qfcc/test/double-float-compare.r $(qfcc_fail_run_deps)
+	@$(top_srcdir)/tools/qfcc/test/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $<
+
+tools_qfcc_test_enum_dat_SOURCES=tools/qfcc/test/enum.r
+enum_obj=$(tools_qfcc_test_enum_dat_SOURCES:.r=.o)
+enum_dep=$(call qcautodep,$(tools_qfcc_test_enum_dat_SOURCES))
+tools/qfcc/test/enum.dat$(EXEEXT): $(enum_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(enum_obj)
+tools/qfcc/test/enum.run: $(qfcc_test_run_deps)
+	@$(top_srcdir)/tools/qfcc/test/build-run $@
+include $(enum_dep) # am--include-marker
+r_depfiles_remade += $(enum_dep)
+
+tools_qfcc_test_fordecl_dat_SOURCES=tools/qfcc/test/fordecl.r
+fordecl_obj=$(tools_qfcc_test_fordecl_dat_SOURCES:.r=.o)
+fordecl_dep=$(call qcautodep,$(tools_qfcc_test_fordecl_dat_SOURCES))
+tools/qfcc/test/fordecl.dat$(EXEEXT): $(fordecl_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(fordecl_obj)
+tools/qfcc/test/fordecl.run: $(qfcc_test_run_deps)
+	@$(top_srcdir)/tools/qfcc/test/build-run $@
+include $(fordecl_dep) # am--include-marker
+r_depfiles_remade += $(fordecl_dep)
+
+tools_qfcc_test_func_expr_dat_SOURCES=tools/qfcc/test/func-expr.r
+func_expr_obj=$(tools_qfcc_test_func_expr_dat_SOURCES:.r=.o)
+func_expr_dep=$(call qcautodep,$(tools_qfcc_test_func_expr_dat_SOURCES))
+tools/qfcc/test/func-expr.dat$(EXEEXT): $(func_expr_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(func_expr_obj)
+tools/qfcc/test/func-expr.run: $(qfcc_test_run_deps)
+	@$(top_srcdir)/tools/qfcc/test/build-run $@
+include $(func_expr_dep) # am--include-marker
+r_depfiles_remade += $(func_expr_dep)
+
+tools_qfcc_test_func_expr2_dat_SOURCES=tools/qfcc/test/func-expr2.r
+func_expr2_obj=$(tools_qfcc_test_func_expr2_dat_SOURCES:.r=.o)
+func_expr2_dep=$(call qcautodep,$(tools_qfcc_test_func_expr2_dat_SOURCES))
+tools/qfcc/test/func-expr2.dat$(EXEEXT): $(func_expr2_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(func_expr2_obj)
+tools/qfcc/test/func-expr2.run: $(qfcc_test_run_deps)
+	@$(top_srcdir)/tools/qfcc/test/build-run $@
+include $(func_expr2_dep) # am--include-marker
+r_depfiles_remade += $(func_expr2_dep)
+
+tools_qfcc_test_func_static_dat_SOURCES=tools/qfcc/test/func-static.r
+func_static_obj=$(tools_qfcc_test_func_static_dat_SOURCES:.r=.o)
+func_static_dep=$(call qcautodep,$(tools_qfcc_test_func_static_dat_SOURCES))
+tools/qfcc/test/func-static.dat$(EXEEXT): $(func_static_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(func_static_obj)
+tools/qfcc/test/func-static.run: $(qfcc_test_run_deps)
+	@$(top_srcdir)/tools/qfcc/test/build-run $@
+include $(func_static_dep) # am--include-marker
+r_depfiles_remade += $(func_static_dep)
+
+tools_qfcc_test_gcd_dat_SOURCES=tools/qfcc/test/gcd.pas
+gcd_obj=$(tools_qfcc_test_gcd_dat_SOURCES:.pas=.o)
+gcd_dep=$(call qcautodep,$(tools_qfcc_test_gcd_dat_SOURCES))
+tools/qfcc/test/gcd.dat$(EXEEXT): $(gcd_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(gcd_obj)
+tools/qfcc/test/gcd.run: $(qfcc_test_run_deps)
+	@$(top_srcdir)/tools/qfcc/test/build-run $@
+include $(gcd_dep) # am--include-marker
+pas_depfiles_remade += $(gcd_dep)
+
+tools_qfcc_test_infloop_dat_SOURCES=tools/qfcc/test/infloop.r
+infloop_obj=$(tools_qfcc_test_infloop_dat_SOURCES:.r=.o)
+infloop_dep=$(call qcautodep,$(tools_qfcc_test_infloop_dat_SOURCES))
+tools/qfcc/test/infloop.dat$(EXEEXT): $(infloop_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(infloop_obj)
+tools/qfcc/test/infloop.run: $(qfcc_test_run_deps)
+	@$(top_srcdir)/tools/qfcc/test/build-run $@
+include $(infloop_dep) # am--include-marker
+r_depfiles_remade += $(infloop_dep)
+
+tools_qfcc_test_ivar_struct_return_dat_SOURCES=tools/qfcc/test/ivar-struct-return.r
+ivar_struct_return_obj=$(tools_qfcc_test_ivar_struct_return_dat_SOURCES:.r=.o)
+ivar_struct_return_dep=$(call qcautodep,$(tools_qfcc_test_ivar_struct_return_dat_SOURCES))
+tools/qfcc/test/ivar-struct-return.dat$(EXEEXT): $(ivar_struct_return_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(ivar_struct_return_obj)
+tools/qfcc/test/ivar-struct-return.run: $(qfcc_test_run_deps)
+	@$(top_srcdir)/tools/qfcc/test/build-run $@
+include $(ivar_struct_return_dep) # am--include-marker
+r_depfiles_remade += $(ivar_struct_return_dep)
+
+tools_qfcc_test_methodparams_dat_SOURCES=tools/qfcc/test/methodparams.r
+methodparams_obj=$(tools_qfcc_test_methodparams_dat_SOURCES:.r=.o)
+methodparams_dep=$(call qcautodep,$(tools_qfcc_test_methodparams_dat_SOURCES))
+tools/qfcc/test/methodparams.dat$(EXEEXT): $(methodparams_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(methodparams_obj)
+tools/qfcc/test/methodparams.run: $(qfcc_test_run_deps)
+	@$(top_srcdir)/tools/qfcc/test/build-run $@
+include $(methodparams_dep) # am--include-marker
+r_depfiles_remade += $(methodparams_dep)
+
+tools_qfcc_test_modulo_dat_SOURCES=tools/qfcc/test/modulo.r
+modulo_obj=$(tools_qfcc_test_modulo_dat_SOURCES:.r=.o)
+modulo_dep=$(call qcautodep,$(tools_qfcc_test_modulo_dat_SOURCES))
+tools/qfcc/test/modulo.dat$(EXEEXT): $(modulo_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(modulo_obj)
+tools/qfcc/test/modulo.run: $(qfcc_test_run_deps)
+	@TEST_HARNESS_OPTS=--float $(top_srcdir)/tools/qfcc/test/build-run $@
+include $(modulo_dep) # am--include-marker
+r_depfiles_remade += $(modulo_dep)
+
+tools_qfcc_test_nilparamret_dat_SOURCES=tools/qfcc/test/nilparamret.r
+nilparamret_obj=$(tools_qfcc_test_nilparamret_dat_SOURCES:.r=.o)
+nilparamret_dep=$(call qcautodep,$(tools_qfcc_test_nilparamret_dat_SOURCES))
+tools/qfcc/test/nilparamret.dat$(EXEEXT): $(nilparamret_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(nilparamret_obj)
+tools/qfcc/test/nilparamret.run: $(qfcc_test_run_deps)
+	@$(top_srcdir)/tools/qfcc/test/build-run $@
+include $(nilparamret_dep) # am--include-marker
+r_depfiles_remade += $(nilparamret_dep)
+
+tools_qfcc_test_overload_dat_SOURCES=tools/qfcc/test/overload.r
+overload_obj=$(tools_qfcc_test_overload_dat_SOURCES:.r=.o)
+overload_dep=$(call qcautodep,$(tools_qfcc_test_overload_dat_SOURCES))
+tools/qfcc/test/overload.dat$(EXEEXT): $(overload_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(overload_obj)
+tools/qfcc/test/overload.run: $(qfcc_test_run_deps)
+	@$(top_srcdir)/tools/qfcc/test/build-run $@
+include $(overload_dep) # am--include-marker
+r_depfiles_remade += $(overload_dep)
+
+tools_qfcc_test_paramret_dat_SOURCES=tools/qfcc/test/paramret.r
+paramret_obj=$(tools_qfcc_test_paramret_dat_SOURCES:.r=.o)
+paramret_dep=$(call qcautodep,$(tools_qfcc_test_paramret_dat_SOURCES))
+tools/qfcc/test/paramret.dat$(EXEEXT): $(paramret_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(paramret_obj)
+tools/qfcc/test/paramret.run: $(qfcc_test_run_deps)
+	@$(top_srcdir)/tools/qfcc/test/build-run $@
+include $(paramret_dep) # am--include-marker
+r_depfiles_remade += $(paramret_dep)
+
+tools_qfcc_test_quaternion_dat_SOURCES=tools/qfcc/test/quaternion.r
+quaternion_obj=$(tools_qfcc_test_quaternion_dat_SOURCES:.r=.o)
+quaternion_dep=$(call qcautodep,$(tools_qfcc_test_quaternion_dat_SOURCES))
+tools/qfcc/test/quaternion.dat$(EXEEXT): $(quaternion_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(quaternion_obj)
+tools/qfcc/test/quaternion.run: $(qfcc_test_run_deps)
+	@$(top_srcdir)/tools/qfcc/test/build-run $@
+include $(quaternion_dep) # am--include-marker
+r_depfiles_remade += $(quaternion_dep)
+
+tools_qfcc_test_return_ivar_dat_SOURCES=tools/qfcc/test/return-ivar.r
+return_ivar_obj=$(tools_qfcc_test_return_ivar_dat_SOURCES:.r=.o)
+return_ivar_dep=$(call qcautodep,$(tools_qfcc_test_return_ivar_dat_SOURCES))
+tools/qfcc/test/return-ivar.dat$(EXEEXT): $(return_ivar_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(return_ivar_obj)
+tools/qfcc/test/return-ivar.run: $(qfcc_test_run_deps)
+	@$(top_srcdir)/tools/qfcc/test/build-run $@
+include $(return_ivar_dep) # am--include-marker
+r_depfiles_remade += $(return_ivar_dep)
+
+tools_qfcc_test_sendv_dat_SOURCES=tools/qfcc/test/sendv.r
+sendv_obj=$(tools_qfcc_test_sendv_dat_SOURCES:.r=.o)
+sendv_dep=$(call qcautodep,$(tools_qfcc_test_sendv_dat_SOURCES))
+tools/qfcc/test/sendv.dat$(EXEEXT): $(sendv_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(sendv_obj)
+tools/qfcc/test/sendv.run: $(qfcc_test_run_deps)
+	@$(top_srcdir)/tools/qfcc/test/build-run $@
+include $(sendv_dep) # am--include-marker
+r_depfiles_remade += $(sendv_dep)
+
+tools_qfcc_test_state_dat_SOURCES=tools/qfcc/test/state.r
+state_obj=$(tools_qfcc_test_state_dat_SOURCES:.r=.o)
+state_dep=$(call qcautodep,$(tools_qfcc_test_state_dat_SOURCES))
+tools/qfcc/test/state.dat$(EXEEXT): $(state_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(state_obj)
+tools/qfcc/test/state.run: $(qfcc_test_run_deps)
+	@$(top_srcdir)/tools/qfcc/test/build-run $@
+include $(state_dep) # am--include-marker
+r_depfiles_remade += $(state_dep)
+
+tools_qfcc_test_struct_init_param_dat_SOURCES=tools/qfcc/test/struct-init-param.r
+struct_init_param_obj=$(tools_qfcc_test_struct_init_param_dat_SOURCES:.r=.o)
+struct_init_param_dep=$(call qcautodep,$(tools_qfcc_test_struct_init_param_dat_SOURCES))
+tools/qfcc/test/struct-init-param.dat$(EXEEXT): $(struct_init_param_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(struct_init_param_obj)
+tools/qfcc/test/struct-init-param.run: $(qfcc_test_run_deps)
+	@$(top_srcdir)/tools/qfcc/test/build-run $@
+include $(struct_init_param_dep) # am--include-marker
+r_depfiles_remade += $(struct_init_param_dep)
+
+tools_qfcc_test_struct_nil_init_dat_SOURCES=tools/qfcc/test/struct-nil-init.r
+struct_nil_init_obj=$(tools_qfcc_test_struct_nil_init_dat_SOURCES:.r=.o)
+struct_nil_init_dep=$(call qcautodep,$(tools_qfcc_test_struct_nil_init_dat_SOURCES))
+tools/qfcc/test/struct-nil-init.dat$(EXEEXT): $(struct_nil_init_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(struct_nil_init_obj)
+tools/qfcc/test/struct-nil-init.run: $(qfcc_test_run_deps)
+	@$(top_srcdir)/tools/qfcc/test/build-run $@
+include $(struct_nil_init_dep) # am--include-marker
+r_depfiles_remade += $(struct_nil_init_dep)
+
+tools_qfcc_test_structarray_dat_SOURCES=tools/qfcc/test/structarray.r
+structarray_obj=$(tools_qfcc_test_structarray_dat_SOURCES:.r=.o)
+structarray_dep=$(call qcautodep,$(tools_qfcc_test_structarray_dat_SOURCES))
+tools/qfcc/test/structarray.dat$(EXEEXT): $(structarray_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(structarray_obj)
+tools/qfcc/test/structarray.run: $(qfcc_test_run_deps)
+	@$(top_srcdir)/tools/qfcc/test/build-run $@
+include $(structarray_dep) # am--include-marker
+r_depfiles_remade += $(structarray_dep)
+
+tools_qfcc_test_structlive_dat_SOURCES=tools/qfcc/test/structlive.r
+structlive_obj=$(tools_qfcc_test_structlive_dat_SOURCES:.r=.o)
+structlive_dep=$(call qcautodep,$(tools_qfcc_test_structlive_dat_SOURCES))
+tools/qfcc/test/structlive.dat$(EXEEXT): $(structlive_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(structlive_obj)
+tools/qfcc/test/structlive.run: $(qfcc_test_run_deps)
+	@$(top_srcdir)/tools/qfcc/test/build-run $@
+include $(structlive_dep) # am--include-marker
+r_depfiles_remade += $(structlive_dep)
+
+tools_qfcc_test_structptr_dat_SOURCES=tools/qfcc/test/structptr.r
+structptr_obj=$(tools_qfcc_test_structptr_dat_SOURCES:.r=.o)
+structptr_dep=$(call qcautodep,$(tools_qfcc_test_structptr_dat_SOURCES))
+tools/qfcc/test/structptr.dat$(EXEEXT): $(structptr_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(structptr_obj)
+tools/qfcc/test/structptr.run: $(qfcc_test_run_deps)
+	@$(top_srcdir)/tools/qfcc/test/build-run $@
+include $(structptr_dep) # am--include-marker
+r_depfiles_remade += $(structptr_dep)
+
+tools_qfcc_test_structstruct_dat_SOURCES=tools/qfcc/test/structstruct.r
+structstruct_obj=$(tools_qfcc_test_structstruct_dat_SOURCES:.r=.o)
+structstruct_dep=$(call qcautodep,$(tools_qfcc_test_structstruct_dat_SOURCES))
+tools/qfcc/test/structstruct.dat$(EXEEXT): $(structstruct_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(structstruct_obj)
+tools/qfcc/test/structstruct.run: $(qfcc_test_run_deps)
+	@$(top_srcdir)/tools/qfcc/test/build-run $@
+include $(structstruct_dep) # am--include-marker
+r_depfiles_remade += $(structstruct_dep)
+
+tools_qfcc_test_swap_dat_SOURCES=tools/qfcc/test/swap.r
+swap_obj=$(tools_qfcc_test_swap_dat_SOURCES:.r=.o)
+swap_dep=$(call qcautodep,$(tools_qfcc_test_swap_dat_SOURCES))
+tools/qfcc/test/swap.dat$(EXEEXT): $(swap_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(swap_obj)
+tools/qfcc/test/swap.run: $(qfcc_test_run_deps)
+	@$(top_srcdir)/tools/qfcc/test/build-run $@
+include $(swap_dep) # am--include-marker
+r_depfiles_remade += $(swap_dep)
+
+tools_qfcc_test_triangle_dat_SOURCES=tools/qfcc/test/triangle.r
+triangle_obj=$(tools_qfcc_test_triangle_dat_SOURCES:.r=.o)
+triangle_dep=$(call qcautodep,$(tools_qfcc_test_triangle_dat_SOURCES))
+tools/qfcc/test/triangle.dat$(EXEEXT): $(triangle_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(triangle_obj)
+tools/qfcc/test/triangle.run: $(qfcc_test_run_deps)
+	@$(top_srcdir)/tools/qfcc/test/build-run $@ 100000 100000 1.00005 50002.4961
+include $(triangle_dep) # am--include-marker
+r_depfiles_remade += $(triangle_dep)
+
+tools_qfcc_test_typedef_dat_SOURCES=tools/qfcc/test/typedef.r
+typedef_obj=$(tools_qfcc_test_typedef_dat_SOURCES:.r=.o)
+typedef_dep=$(call qcautodep,$(tools_qfcc_test_typedef_dat_SOURCES))
+tools/qfcc/test/typedef.dat$(EXEEXT): $(typedef_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(typedef_obj)
+tools/qfcc/test/typedef.run: $(qfcc_test_run_deps)
+	@$(top_srcdir)/tools/qfcc/test/build-run $@
+include $(typedef_dep) # am--include-marker
+r_depfiles_remade += $(typedef_dep)
+
+tools_qfcc_test_typelinker_dat_SOURCES=tools/qfcc/test/typelinker_a.r tools/qfcc/test/typelinker_b.r
+typelinker_obj=$(tools_qfcc_test_typelinker_dat_SOURCES:.r=.o)
+typelinker_dep=$(call qcautodep,$(tools_qfcc_test_typelinker_dat_SOURCES))
+tools/qfcc/test/typelinker.dat$(EXEEXT): $(typelinker_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(typelinker_obj)
+tools/qfcc/test/typelinker.run: $(qfcc_test_run_deps)
+	@$(top_srcdir)/tools/qfcc/test/build-run $@
+include $(typelinker_dep) # am--include-marker
+r_depfiles_remade += $(typelinker_dep)
+
+tools_qfcc_test_unaryminus_dat_SOURCES=tools/qfcc/test/unaryminus.r
+unaryminus_obj=$(tools_qfcc_test_unaryminus_dat_SOURCES:.r=.o)
+unaryminus_dep=$(call qcautodep,$(tools_qfcc_test_unaryminus_dat_SOURCES))
+tools/qfcc/test/unaryminus.dat$(EXEEXT): $(unaryminus_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(unaryminus_obj)
+tools/qfcc/test/unaryminus.run: $(qfcc_test_run_deps)
+	@$(top_srcdir)/tools/qfcc/test/build-run $@
+include $(unaryminus_dep) # am--include-marker
+r_depfiles_remade += $(unaryminus_dep)
+
+tools_qfcc_test_vecaddr_dat_SOURCES=tools/qfcc/test/vecaddr.r
+vecaddr_obj=$(tools_qfcc_test_vecaddr_dat_SOURCES:.r=.o)
+vecaddr_dep=$(call qcautodep,$(tools_qfcc_test_vecaddr_dat_SOURCES))
+tools/qfcc/test/vecaddr.dat$(EXEEXT): $(vecaddr_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(vecaddr_obj)
+tools/qfcc/test/vecaddr.run: $(qfcc_test_run_deps)
+	@$(top_srcdir)/tools/qfcc/test/build-run $@
+include $(vecaddr_dep) # am--include-marker
+r_depfiles_remade += $(vecaddr_dep)
+
+tools_qfcc_test_vecexpr_dat_SOURCES=tools/qfcc/test/vecexpr.r
+vecexpr_obj=$(tools_qfcc_test_vecexpr_dat_SOURCES:.r=.o)
+vecexpr_dep=$(call qcautodep,$(tools_qfcc_test_vecexpr_dat_SOURCES))
+tools/qfcc/test/vecexpr.dat$(EXEEXT): $(vecexpr_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(vecexpr_obj)
+tools/qfcc/test/vecexpr.run: $(qfcc_test_run_deps)
+	@$(top_srcdir)/tools/qfcc/test/build-run $@
+include $(vecexpr_dep) # am--include-marker
+r_depfiles_remade += $(vecexpr_dep)
+
+tools_qfcc_test_vecinit_dat_SOURCES=tools/qfcc/test/vecinit.r
+vecinit_obj=$(tools_qfcc_test_vecinit_dat_SOURCES:.r=.o)
+vecinit_dep=$(call qcautodep,$(tools_qfcc_test_vecinit_dat_SOURCES))
+tools/qfcc/test/vecinit.dat$(EXEEXT): $(vecinit_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(vecinit_obj)
+tools/qfcc/test/vecinit.run: $(qfcc_test_run_deps)
+	@$(top_srcdir)/tools/qfcc/test/build-run $@
+include $(vecinit_dep) # am--include-marker
+r_depfiles_remade += $(vecinit_dep)
+
+tools_qfcc_test_voidfor_dat_SOURCES=tools/qfcc/test/voidfor.r
+voidfor_obj=$(tools_qfcc_test_voidfor_dat_SOURCES:.r=.o)
+voidfor_dep=$(call qcautodep,$(tools_qfcc_test_voidfor_dat_SOURCES))
+tools/qfcc/test/voidfor.dat$(EXEEXT): $(voidfor_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(voidfor_obj)
+tools/qfcc/test/voidfor.run: $(qfcc_test_run_deps)
+	@$(top_srcdir)/tools/qfcc/test/build-run $@
+include $(voidfor_dep) # am--include-marker
+r_depfiles_remade += $(voidfor_dep)
+
+tools_qfcc_test_while_dat_SOURCES=tools/qfcc/test/while.r
+while_obj=$(tools_qfcc_test_while_dat_SOURCES:.r=.o)
+while_dep=$(call qcautodep,$(tools_qfcc_test_while_dat_SOURCES))
+tools/qfcc/test/while.dat$(EXEEXT): $(while_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(while_obj)
+tools/qfcc/test/while.run: $(qfcc_test_run_deps)
+	@$(top_srcdir)/tools/qfcc/test/build-run $@
+include $(while_dep) # am--include-marker
+r_depfiles_remade += $(while_dep)
+
+tools_qfcc_test_zerolinker_dat_SOURCES=tools/qfcc/test/zerolinker.r
+zerolinker_obj=$(tools_qfcc_test_zerolinker_dat_SOURCES:.r=.o)
+zerolinker_dep=$(call qcautodep,$(tools_qfcc_test_zerolinker_dat_SOURCES))
+tools/qfcc/test/zerolinker.dat$(EXEEXT): $(zerolinker_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(zerolinker_obj)
+tools/qfcc/test/zerolinker.run: $(qfcc_test_run_deps)
+	@$(top_srcdir)/tools/qfcc/test/build-run $@
+include $(zerolinker_dep) # am--include-marker
+r_depfiles_remade += $(zerolinker_dep)
+
+EXTRA_DIST += \
+	$(test_build_errors) \
+	tools/qfcc/test/build-compile-fail-run \
+	tools/qfcc/test/test-bi.h \
+	tools/qfcc/test/build-run \
+	tools/qfcc/test/test-defspace.h \
+	tools/qfcc/test/test-harness.h \
+	tools/qfcc/test/typelinker.h
+
+CLEANFILES += \
+	tools/qfcc/test/*.dat \
+	tools/qfcc/test/*.sym \
+	tools/qfcc/test/*.run \
+	tools/qfcc/test/*.frame \
+	tools/qfcc/test/*.log \
+	tools/qfcc/test/*.trs
diff --git a/tools/qfcc/test/build-run b/tools/qfcc/test/build-run
index 577355a80..b93854bf9 100755
--- a/tools/qfcc/test/build-run
+++ b/tools/qfcc/test/build-run
@@ -1,11 +1,11 @@
 #! /bin/sh
 
 script=$1
-progs=`basename $script .run`.dat
+progs=tools/qfcc/test/`basename $script .run`.dat
 shift
 
 cat > $script <<EOF
 #! /bin/sh
-./test-harness $TEST_HARNESS_OPTS $progs $@
+tools/qfcc/test/test-harness $TEST_HARNESS_OPTS $progs $@
 EOF
 chmod +x $script
diff --git a/tools/qfcc/test/test-defspace.c b/tools/qfcc/test/test-defspace.c
index f0f40a692..17d9ed12e 100644
--- a/tools/qfcc/test/test-defspace.c
+++ b/tools/qfcc/test/test-defspace.c
@@ -4,14 +4,14 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "class.h"
-#include "expr.h"
-#include "function.h"
-#include "options.h"
-#include "strpool.h"
-#include "qfcc.h"
+#include "tools/qfcc/include/class.h"
+#include "tools/qfcc/include/expr.h"
+#include "tools/qfcc/include/function.h"
+#include "tools/qfcc/include/options.h"
+#include "tools/qfcc/include/strpool.h"
+#include "tools/qfcc/include/qfcc.h"
 
-#include "test-defspace.h"
+#include "tools/qfcc/test/test-defspace.h"
 
 options_t   options;
 pr_info_t   pr;
diff --git a/tools/qfcc/test/test-defspace.h b/tools/qfcc/test/test-defspace.h
index 1735003bf..ab6fcd1e8 100644
--- a/tools/qfcc/test/test-defspace.h
+++ b/tools/qfcc/test/test-defspace.h
@@ -1,5 +1,5 @@
-#include "def.h"
-#include "defspace.h"
+#include "tools/qfcc/include/def.h"
+#include "tools/qfcc/include/defspace.h"
 
 int def_list_is_empty (const defspace_t *space);
 int def_list_is_valid (const defspace_t *space);
diff --git a/tools/qflight/Makefile.am b/tools/qflight/Makefile.am
deleted file mode 100644
index e4102a7e9..000000000
--- a/tools/qflight/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-SUBDIRS=	include source
-
-man_MANS=	qflight.1
-
-EXTRA_DIST=	qflight.1
diff --git a/tools/qflight/Makemodule.am b/tools/qflight/Makemodule.am
new file mode 100644
index 000000000..cd4d971c6
--- /dev/null
+++ b/tools/qflight/Makemodule.am
@@ -0,0 +1,4 @@
+include tools/qflight/include/Makemodule.am
+include tools/qflight/source/Makemodule.am
+
+man_MANS +=	tools/qflight/qflight.1
diff --git a/tools/qflight/include/Makefile.am b/tools/qflight/include/Makefile.am
deleted file mode 100644
index 3d7e10861..000000000
--- a/tools/qflight/include/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-EXTRA_DIST=	entities.h light.h noise.h options.h properties.h threads.h
diff --git a/tools/qflight/include/Makemodule.am b/tools/qflight/include/Makemodule.am
new file mode 100644
index 000000000..747bdca73
--- /dev/null
+++ b/tools/qflight/include/Makemodule.am
@@ -0,0 +1,7 @@
+EXTRA_DIST += \
+	tools/qflight/include/entities.h \
+	tools/qflight/include/light.h \
+	tools/qflight/include/noise.h \
+	tools/qflight/include/options.h \
+	tools/qflight/include/properties.h \
+	tools/qflight/include/threads.h
diff --git a/tools/qflight/source/Makefile.am b/tools/qflight/source/Makefile.am
deleted file mode 100644
index cdf5005fb..000000000
--- a/tools/qflight/source/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-QFLIGHT_LIBS=@QFLIGHT_LIBS@
-QFLIGHT_DEPS=@QFLIGHT_DEPS@
-QFLIGHT_INCS=@QFLIGHT_INCS@
-PTHREAD_LDFLAGS=@PTHREAD_LDFLAGS@
-PTHREAD_CFLAGS=@PTHREAD_CFLAGS@
-
-AM_CPPFLAGS=	-I$(top_srcdir)/include $(QFLIGHT_INCS) $(PTHREAD_CFLAGS)
-
-bin_PROGRAMS=	qflight
-
-qflight_SOURCES=\
-	entities.c ltface.c noise.c options.c properties.c qflight.c \
-	threads.c trace.c vis.c
-
-
-qflight_LDFLAGS=	$(PTHREAD_LDFLAGS)
-qflight_LDADD=		$(QFLIGHT_LIBS)
-qflight_DEPENDENCIES=	$(QFLIGHT_DEPS)
diff --git a/tools/qflight/source/Makemodule.am b/tools/qflight/source/Makemodule.am
new file mode 100644
index 000000000..0913e37a8
--- /dev/null
+++ b/tools/qflight/source/Makemodule.am
@@ -0,0 +1,20 @@
+QFLIGHT_LIBS=@QFLIGHT_LIBS@
+QFLIGHT_DEPS=@QFLIGHT_DEPS@
+QFLIGHT_INCS=@QFLIGHT_INCS@
+
+bin_PROGRAMS += qflight
+
+qflight_SOURCES=\
+	tools/qflight/source/entities.c \
+	tools/qflight/source/ltface.c \
+	tools/qflight/source/noise.c \
+	tools/qflight/source/options.c \
+	tools/qflight/source/properties.c \
+	tools/qflight/source/qflight.c \
+	tools/qflight/source/threads.c \
+	tools/qflight/source/trace.c \
+	tools/qflight/source/vis.c
+
+qflight_LDFLAGS=	$(PTHREAD_LDFLAGS)
+qflight_LDADD=		$(QFLIGHT_LIBS)
+qflight_DEPENDENCIES=	$(QFLIGHT_DEPS)
diff --git a/tools/qflight/source/entities.c b/tools/qflight/source/entities.c
index 01c36077c..c9d262356 100644
--- a/tools/qflight/source/entities.c
+++ b/tools/qflight/source/entities.c
@@ -55,11 +55,11 @@
 #include "QF/sys.h"
 #include "QF/va.h"
 
-#include "light.h"
-#include "threads.h"
-#include "entities.h"
-#include "options.h"
-#include "properties.h"
+#include "tools/qflight/include/light.h"
+#include "tools/qflight/include/threads.h"
+#include "tools/qflight/include/entities.h"
+#include "tools/qflight/include/options.h"
+#include "tools/qflight/include/properties.h"
 
 entity_t *entities;
 int num_entities;
diff --git a/tools/qflight/source/ltface.c b/tools/qflight/source/ltface.c
index 1864b7746..2b8eb1953 100644
--- a/tools/qflight/source/ltface.c
+++ b/tools/qflight/source/ltface.c
@@ -52,11 +52,11 @@
 
 #include "compat.h"
 
-#include "light.h"
-#include "entities.h"
-#include "noise.h"
-#include "options.h"
-#include "threads.h"
+#include "tools/qflight/include/light.h"
+#include "tools/qflight/include/entities.h"
+#include "tools/qflight/include/noise.h"
+#include "tools/qflight/include/options.h"
+#include "tools/qflight/include/threads.h"
 
 int c_bad;
 int c_culldistplane, c_proper;
diff --git a/tools/qflight/source/noise.c b/tools/qflight/source/noise.c
index 8d8a87758..b34e31ee1 100644
--- a/tools/qflight/source/noise.c
+++ b/tools/qflight/source/noise.c
@@ -35,7 +35,7 @@
 
 #include "QF/qtypes.h"
 
-#include "noise.h"
+#include "tools/qflight/include/noise.h"
 
 // returns the 3D noise value for a point in space
 float
diff --git a/tools/qflight/source/options.c b/tools/qflight/source/options.c
index 88a3584b9..b50753169 100644
--- a/tools/qflight/source/options.c
+++ b/tools/qflight/source/options.c
@@ -44,9 +44,9 @@
 
 #include "compat.h"
 
-#include "entities.h"
-#include "options.h"
-#include "properties.h"
+#include "tools/qflight/include/entities.h"
+#include "tools/qflight/include/options.h"
+#include "tools/qflight/include/properties.h"
 
 const char *this_program;
 
diff --git a/tools/qflight/source/properties.c b/tools/qflight/source/properties.c
index 5cf957b7f..e7774f6d4 100644
--- a/tools/qflight/source/properties.c
+++ b/tools/qflight/source/properties.c
@@ -46,10 +46,10 @@
 
 #include "compat.h"
 
-#include "entities.h"
-#include "light.h"
-#include "options.h"
-#include "properties.h"
+#include "tools/qflight/include/entities.h"
+#include "tools/qflight/include/light.h"
+#include "tools/qflight/include/options.h"
+#include "tools/qflight/include/properties.h"
 
 static plitem_t *properties;
 
diff --git a/tools/qflight/source/qflight.c b/tools/qflight/source/qflight.c
index 62eda9af1..4d2acfb73 100644
--- a/tools/qflight/source/qflight.c
+++ b/tools/qflight/source/qflight.c
@@ -53,11 +53,11 @@
 #include "QF/sys.h"
 #include "QF/va.h"
 
-#include "light.h"
-#include "threads.h"
-#include "entities.h"
-#include "options.h"
-#include "properties.h"
+#include "tools/qflight/include/light.h"
+#include "tools/qflight/include/threads.h"
+#include "tools/qflight/include/entities.h"
+#include "tools/qflight/include/options.h"
+#include "tools/qflight/include/properties.h"
 
 options_t	options;
 bsp_t *bsp;
diff --git a/tools/qflight/source/threads.c b/tools/qflight/source/threads.c
index 50e2709a0..8438f7b8e 100644
--- a/tools/qflight/source/threads.c
+++ b/tools/qflight/source/threads.c
@@ -46,9 +46,9 @@
 #include "QF/qtypes.h"
 #include "QF/qendian.h"
 
-#include "light.h"
-#include "options.h"
-#include "threads.h"
+#include "tools/qflight/include/light.h"
+#include "tools/qflight/include/options.h"
+#include "tools/qflight/include/threads.h"
 
 #if defined (HAVE_PTHREAD_H) && defined (HAVE_PTHREAD)
 pthread_mutex_t *my_mutex;
diff --git a/tools/qflight/source/trace.c b/tools/qflight/source/trace.c
index 0f9df661e..aa5b4ce19 100644
--- a/tools/qflight/source/trace.c
+++ b/tools/qflight/source/trace.c
@@ -50,8 +50,8 @@
 #include "QF/quakefs.h"
 #include "QF/sys.h"
 
-#include "light.h"
-#include "options.h"
+#include "tools/qflight/include/light.h"
+#include "tools/qflight/include/options.h"
 
 typedef struct {
 	int         type;
diff --git a/tools/qflight/source/vis.c b/tools/qflight/source/vis.c
index e8267146c..a4f0e1114 100644
--- a/tools/qflight/source/vis.c
+++ b/tools/qflight/source/vis.c
@@ -47,10 +47,10 @@
 #include "QF/bspfile.h"
 #include "QF/mathlib.h"
 
-#include "entities.h"
-#include "light.h"
-#include "options.h"
-#include "threads.h"
+#include "tools/qflight/include/entities.h"
+#include "tools/qflight/include/light.h"
+#include "tools/qflight/include/options.h"
+#include "tools/qflight/include/threads.h"
 
 static struct {
 	int         empty;
diff --git a/tools/qflmp/Makefile.am b/tools/qflmp/Makefile.am
deleted file mode 100644
index b9436172c..000000000
--- a/tools/qflmp/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-QFLMP_LIBS=@QFLMP_LIBS@
-QFLMP_DEPS=@QFLMP_DEPS@
-QFLMP_INCS=@QFLMP_INCS@
-
-AM_CPPFLAGS= -I$(top_srcdir)/include $(QFLMP_INCS)
-
-bin_PROGRAMS=	qflmp
-
-#mans=qflmp.1
-man_MANS=	$(mans)
-
-qflmp_SOURCES=	lmp.c
-qflmp_LDADD=	$(QFLMP_LIBS)
-qflmp_DEPENDENCIES= $(QFLMP_DEPS)
-
-EXTRA_DIST=		lmp.h #lmp.1
diff --git a/tools/qflmp/Makemodule.am b/tools/qflmp/Makemodule.am
new file mode 100644
index 000000000..78dd3a233
--- /dev/null
+++ b/tools/qflmp/Makemodule.am
@@ -0,0 +1,14 @@
+QFLMP_LIBS=@QFLMP_LIBS@
+QFLMP_DEPS=@QFLMP_DEPS@
+QFLMP_INCS=@QFLMP_INCS@
+
+bin_PROGRAMS +=	qflmp
+
+#mans=qflmp.1
+man_MANS +=	$(mans)
+
+qflmp_SOURCES=	tools/qflmp/lmp.c
+qflmp_LDADD=	$(QFLMP_LIBS)
+qflmp_DEPENDENCIES= $(QFLMP_DEPS)
+
+EXTRA_DIST += tools/qflmp/lmp.h #lmp.1
diff --git a/tools/qfmodelgen/Makefile.am b/tools/qfmodelgen/Makefile.am
deleted file mode 100644
index e5b93df89..000000000
--- a/tools/qfmodelgen/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-SUBDIRS=	include source
-
-#man_MANS=	qfmodelgen.1
-
-#EXTRA_DIST=	$(man_MANS)
diff --git a/tools/qfmodelgen/Makemodule.am b/tools/qfmodelgen/Makemodule.am
new file mode 100644
index 000000000..d397b4f91
--- /dev/null
+++ b/tools/qfmodelgen/Makemodule.am
@@ -0,0 +1,2 @@
+include tools/qfmodelgen/include/Makemodule.am
+include tools/qfmodelgen/source/Makemodule.am
diff --git a/tools/qfmodelgen/include/Makefile.am b/tools/qfmodelgen/include/Makefile.am
deleted file mode 100644
index c4cc81268..000000000
--- a/tools/qfmodelgen/include/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-EXTRA_DIST= lbmlib.h trilib.h
diff --git a/tools/qfmodelgen/include/Makemodule.am b/tools/qfmodelgen/include/Makemodule.am
new file mode 100644
index 000000000..0a5f0306d
--- /dev/null
+++ b/tools/qfmodelgen/include/Makemodule.am
@@ -0,0 +1,3 @@
+EXTRA_DIST += \
+	tools/qfmodelgen/include/lbmlib.h \
+	tools/qfmodelgen/include/trilib.h
diff --git a/tools/qfmodelgen/source/Makefile.am b/tools/qfmodelgen/source/Makemodule.am
similarity index 54%
rename from tools/qfmodelgen/source/Makefile.am
rename to tools/qfmodelgen/source/Makemodule.am
index 4bc3a0bda..9ca6ae7ef 100644
--- a/tools/qfmodelgen/source/Makefile.am
+++ b/tools/qfmodelgen/source/Makemodule.am
@@ -1,14 +1,13 @@
-AUTOMAKE_OPTIONS= foreign
-
 QFMODELGEN_LIBS=@QFMODELGEN_LIBS@
 QFMODELGEN_DEPS=@QFMODELGEN_DEPS@
 QFMODELGEN_INCS=@QFMODELGEN_INCS@
 
-AM_CPPFLAGS=	-I$(top_srcdir)/include $(QFMODELGEN_INCS)
+bin_PROGRAMS += qfmodelgen
 
-bin_PROGRAMS=	qfmodelgen
-
-qfmodelgen_SOURCES= lbmlib.c modelgen.c trilib.c
+qfmodelgen_SOURCES = \
+	tools/qfmodelgen/source/lbmlib.c \
+	tools/qfmodelgen/source/modelgen.c \
+	tools/qfmodelgen/source/trilib.c
 
 qfmodelgen_LDADD=		$(QFMODELGEN_LIBS)
 qfmodelgen_DEPENDENCIES=	$(QFMODELGEN_DEPS)
diff --git a/tools/qfmodelgen/source/lbmlib.c b/tools/qfmodelgen/source/lbmlib.c
index 77af86e92..1650bda86 100644
--- a/tools/qfmodelgen/source/lbmlib.c
+++ b/tools/qfmodelgen/source/lbmlib.c
@@ -30,7 +30,7 @@
 #include "QF/quakeio.h"
 #include "QF/sys.h"
 
-#include "lbmlib.h"
+#include "tools/qfmodelgen/include/lbmlib.h"
 
 static int
 LoadFile (const char *fname, byte **buf)
diff --git a/tools/qfmodelgen/source/modelgen.c b/tools/qfmodelgen/source/modelgen.c
index 4905ad041..5d3eee4d0 100644
--- a/tools/qfmodelgen/source/modelgen.c
+++ b/tools/qfmodelgen/source/modelgen.c
@@ -45,10 +45,11 @@
 #include "QF/script.h"
 #include "QF/sys.h"
 
-#include "lbmlib.h"
-#include "trilib.h"
 #include "compat.h"
 
+#include "tools/qfmodelgen/include/lbmlib.h"
+#include "tools/qfmodelgen/include/trilib.h"
+
 #define MAXVERTS		2048
 #define MAXFRAMES		256
 #define MAXSKINS		100
diff --git a/tools/qfmodelgen/source/trilib.c b/tools/qfmodelgen/source/trilib.c
index 41f6ffd42..a22721192 100644
--- a/tools/qfmodelgen/source/trilib.c
+++ b/tools/qfmodelgen/source/trilib.c
@@ -31,7 +31,7 @@
 #include "QF/quakeio.h"
 #include "QF/sys.h"
 
-#include "trilib.h"
+#include "tools/qfmodelgen/include/trilib.h"
 
 // on disk representation of a face
 
diff --git a/tools/qfspritegen/Makefile.am b/tools/qfspritegen/Makemodule.am
similarity index 57%
rename from tools/qfspritegen/Makefile.am
rename to tools/qfspritegen/Makemodule.am
index 05f321022..a12777453 100644
--- a/tools/qfspritegen/Makefile.am
+++ b/tools/qfspritegen/Makemodule.am
@@ -1,14 +1,10 @@
-AUTOMAKE_OPTIONS= foreign
-
 QFSPRITEGEN_LIBS=@QFSPRITEGEN_LIBS@
 QFSPRITEGEN_DEPS=@QFSPRITEGEN_DEPS@
 QFSPRITEGEN_INCS=@QFSPRITEGEN_INCS@
 
-AM_CPPFLAGS=	-I$(top_srcdir)/include $(QFSPRITEGEN_INCS)
+bin_PROGRAMS += qfspritegen
 
-bin_PROGRAMS=	qfspritegen
-
-qfspritegen_SOURCES= spritegen.c
+qfspritegen_SOURCES= tools/qfspritegen/spritegen.c
 
 qfspritegen_LDADD=		$(QFSPRITEGEN_LIBS)
 qfspritegen_DEPENDENCIES=	$(QFSPRITEGEN_DEPS)
diff --git a/tools/qfvis/Makefile.am b/tools/qfvis/Makefile.am
deleted file mode 100644
index 52a798c6e..000000000
--- a/tools/qfvis/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-SUBDIRS=	include source
-
-mans=qfvis.1
-man_MANS=	$(mans)
-EXTRA_DIST=	$(mans)
diff --git a/tools/qfvis/Makemodule.am b/tools/qfvis/Makemodule.am
new file mode 100644
index 000000000..5840ea1f6
--- /dev/null
+++ b/tools/qfvis/Makemodule.am
@@ -0,0 +1,4 @@
+include tools/qfvis/include/Makemodule.am
+include tools/qfvis/source/Makemodule.am
+
+man_MANS +=	tools/qfvis/qfvis.1
diff --git a/tools/qfvis/include/Makefile.am b/tools/qfvis/include/Makefile.am
deleted file mode 100644
index 0bbb6480b..000000000
--- a/tools/qfvis/include/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-EXTRA_DIST=	options.h vis.h
diff --git a/tools/qfvis/include/Makemodule.am b/tools/qfvis/include/Makemodule.am
new file mode 100644
index 000000000..eec0af5b0
--- /dev/null
+++ b/tools/qfvis/include/Makemodule.am
@@ -0,0 +1,3 @@
+EXTRA_DIST += \
+	tools/qfvis/include/options.h \
+	tools/qfvis/include/vis.h
diff --git a/tools/qfvis/source/Makefile.am b/tools/qfvis/source/Makefile.am
deleted file mode 100644
index e0a725ca0..000000000
--- a/tools/qfvis/source/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-QFVIS_LIBS=@QFVIS_LIBS@
-QFVIS_DEPS=@QFVIS_DEPS@
-QFVIS_INCS=@QFVIS_INCS@
-PTHREAD_LDFLAGS=@PTHREAD_LDFLAGS@
-PTHREAD_CFLAGS=@PTHREAD_CFLAGS@
-
-AM_CPPFLAGS=	-I$(top_srcdir)/include $(QFVIS_INCS) $(PTHREAD_CFLAGS)
-
-bin_PROGRAMS=	qfvis
-
-qfvis_SOURCES=	base-vis.c flow.c options.c qfvis.c soundphs.c
-
-qfvis_LDFLAGS=		$(PTHREAD_LDFLAGS)
-qfvis_LDADD=		$(QFVIS_LIBS)
-qfvis_DEPENDENCIES=	$(QFVIS_DEPS)
diff --git a/tools/qfvis/source/Makemodule.am b/tools/qfvis/source/Makemodule.am
new file mode 100644
index 000000000..73ccf547e
--- /dev/null
+++ b/tools/qfvis/source/Makemodule.am
@@ -0,0 +1,16 @@
+QFVIS_LIBS=@QFVIS_LIBS@
+QFVIS_DEPS=@QFVIS_DEPS@
+QFVIS_INCS=@QFVIS_INCS@
+
+bin_PROGRAMS += qfvis
+
+qfvis_SOURCES = \
+	tools/qfvis/source/base-vis.c \
+	tools/qfvis/source/flow.c \
+	tools/qfvis/source/options.c \
+	tools/qfvis/source/qfvis.c \
+	tools/qfvis/source/soundphs.c
+
+qfvis_LDFLAGS=		$(PTHREAD_LDFLAGS)
+qfvis_LDADD=		$(QFVIS_LIBS)
+qfvis_DEPENDENCIES=	$(QFVIS_DEPS)
diff --git a/tools/qfvis/source/base-vis.c b/tools/qfvis/source/base-vis.c
index ca4d912e0..99d5934df 100644
--- a/tools/qfvis/source/base-vis.c
+++ b/tools/qfvis/source/base-vis.c
@@ -54,8 +54,8 @@
 #include "QF/quakefs.h"
 #include "QF/sys.h"
 
-#include "vis.h"
-#include "options.h"
+#include "tools/qfvis/include/vis.h"
+#include "tools/qfvis/include/options.h"
 
 /*
 	This is a rough first-order aproximation that is used to trivially reject
diff --git a/tools/qfvis/source/flow.c b/tools/qfvis/source/flow.c
index 15af6524f..030ca7a43 100644
--- a/tools/qfvis/source/flow.c
+++ b/tools/qfvis/source/flow.c
@@ -55,8 +55,8 @@
 #include "QF/quakefs.h"
 #include "QF/sys.h"
 
-#include "vis.h"
-#include "options.h"
+#include "tools/qfvis/include/vis.h"
+#include "tools/qfvis/include/options.h"
 
 static int
 CheckStack (cluster_t *cluster, threaddata_t *thread)
diff --git a/tools/qfvis/source/options.c b/tools/qfvis/source/options.c
index 048f604b0..d9a5e3691 100644
--- a/tools/qfvis/source/options.c
+++ b/tools/qfvis/source/options.c
@@ -41,8 +41,8 @@
 
 #include "QF/dstring.h"
 
-#include "options.h"
-#include "vis.h"
+#include "tools/qfvis/include/options.h"
+#include "tools/qfvis/include/vis.h"
 
 const char *this_program;
 
diff --git a/tools/qfvis/source/qfvis.c b/tools/qfvis/source/qfvis.c
index 8c2cc6ed3..9ffb09e35 100644
--- a/tools/qfvis/source/qfvis.c
+++ b/tools/qfvis/source/qfvis.c
@@ -57,8 +57,8 @@
 #include "QF/quakefs.h"
 #include "QF/sys.h"
 
-#include "vis.h"
-#include "options.h"
+#include "tools/qfvis/include/vis.h"
+#include "tools/qfvis/include/options.h"
 
 #ifdef USE_PTHREADS
 pthread_attr_t threads_attrib;
diff --git a/tools/qfvis/source/soundphs.c b/tools/qfvis/source/soundphs.c
index 086e453cc..f21a9390d 100644
--- a/tools/qfvis/source/soundphs.c
+++ b/tools/qfvis/source/soundphs.c
@@ -54,7 +54,7 @@
 #include "QF/quakefs.h"
 #include "QF/sys.h"
 
-#include "vis.h"
+#include "tools/qfvis/include/vis.h"
 
 /*
 	Some textures (sky, water, slime, lava) are considered ambient sound
diff --git a/tools/wad/Makefile.am b/tools/wad/Makefile.am
deleted file mode 100644
index 7db82d273..000000000
--- a/tools/wad/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-WAD_LIBS=@WAD_LIBS@
-WAD_DEPS=@WAD_DEPS@
-WAD_INCS=@WAD_INCS@
-
-AM_CPPFLAGS= -I$(top_srcdir)/include $(WAD_INCS)
-
-
-bin_PROGRAMS=	wad
-
-mans=wad.1
-man_MANS=	$(mans)
-
-wad_SOURCES=	grab.c script.c wad.c
-wad_LDADD=	$(WAD_LIBS)
-wad_DEPENDENCIES= $(WAD_DEPS)
-
-EXTRA_DIST=		wad.h $(mans)
diff --git a/tools/wad/Makemodule.am b/tools/wad/Makemodule.am
new file mode 100644
index 000000000..dd68d6842
--- /dev/null
+++ b/tools/wad/Makemodule.am
@@ -0,0 +1,13 @@
+WAD_LIBS=@WAD_LIBS@
+WAD_DEPS=@WAD_DEPS@
+WAD_INCS=@WAD_INCS@
+
+bin_PROGRAMS +=	wad
+
+man_MANS += tools/wad/wad.1
+
+wad_SOURCES=	tools/wad/grab.c tools/wad/script.c tools/wad/wad.c
+wad_LDADD=	$(WAD_LIBS)
+wad_DEPENDENCIES= $(WAD_DEPS)
+
+EXTRA_DIST += tools/wad/wad.h
diff --git a/tools/wav/Makefile.am b/tools/wav/Makefile.am
deleted file mode 100644
index 7e17fe376..000000000
--- a/tools/wav/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-WAV_LIBS=@WAV_LIBS@
-WAV_DEPS=@WAV_DEPS@
-WAV_INCS=@WAV_INCS@
-
-AM_CPPFLAGS= -I$(top_srcdir)/include $(WAV_INCS)
-
-bin_PROGRAMS=	qfwavinfo
-
-mans=qfwavinfo.1
-man_MANS=	#$(mans)
-
-qfwavinfo_SOURCES=	qfwavinfo.c
-qfwavinfo_LDADD=	$(WAV_LIBS)
-qfwavinfo_DEPENDENCIES= $(WAV_DEPS)
-
-EXTRA_DIST=#$(mans)
diff --git a/tools/wav/Makemodule.am b/tools/wav/Makemodule.am
new file mode 100644
index 000000000..4a4726809
--- /dev/null
+++ b/tools/wav/Makemodule.am
@@ -0,0 +1,11 @@
+WAV_LIBS=@WAV_LIBS@
+WAV_DEPS=@WAV_DEPS@
+WAV_INCS=@WAV_INCS@
+
+bin_PROGRAMS += qfwavinfo
+
+#man_MANS +=	tools/wav/qfwavinfo.1
+
+qfwavinfo_SOURCES=	tools/wav/qfwavinfo.c
+qfwavinfo_LDADD=	$(WAV_LIBS)
+qfwavinfo_DEPENDENCIES= $(WAV_DEPS)
diff --git a/vc2005/Makefile.am b/vc2005/Makefile.am
deleted file mode 100644
index 7f616ef19..000000000
--- a/vc2005/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-## Process this file with automake to produce Makefile.in
-AUTOMAKE_OPTIONS=	foreign
-EXTRA_DIST = \
-	Makefile.am QuakeForge-VS8-Express.sln QuakeForge-VS8.sln \
-	bsp2img/bsp2img.vcproj builtins/builtins.vcproj clean.ps1 \
-	common/common.vcproj console/console.vcproj \
-	console_client/console_client.vcproj console_server/console_server.vcproj \
-	engine/engine.vcproj gib/gib.vcproj hw-master/hw-master.vcproj \
-	image/image.vcproj include/config.h models-sw/models-sw.vcproj \
-	models/models.vcproj modelsgl/modelsgl.vcproj net-main/net-main.vcproj \
-	net/net.vcproj nq-common/nq-common.vcproj nq-sdl/nq-sdl.vcproj \
-	nq-sdl32/nq-sdl32.vcproj nq-server/nq-server.vcproj nq-sgl/nq-sgl.vcproj \
-	nq-wgl/nq-wgl.vcproj nq/nq.vcproj pak/pak.vcproj qfbsp/qfbsp.vcproj \
-	qfcc/FlexBison.rules qfcc/qfcc.vcproj qfclient/qfclient.vcproj \
-	qflight/qflight.vcproj qfmodelgen/qfmodelgen.vcproj \
-	qfprogs/qfprogs.vcproj qfserver/qfserver.vcproj qfvis/qfvis.vcproj \
-	qfwavinfo/qfwavinfo.vcproj qtv/qtv.vcproj \
-	qw-client-sdl/qw-client-sdl.vcproj qw-client-sdl32/qw-client-sdl32.vcproj \
-	qw-client-sgl/qw-client-sgl.vcproj qw-client-wgl/qw-client-wgl.vcproj \
-	qw-master/qw-master.vcproj qw/qw.vcproj readme.txt ruamoko/ruamoko.vcproj \
-	sound/sound.vcproj util/util.vcproj video-sdl/video-sdl.vcproj \
-	video-sgl/video-sgl.vcproj video-sw/video-sw.vcproj \
-	video-sw32/video-sw32.vcproj video-wgl/video-wgl.vcproj \
-	video/video.vcproj videogl/videogl.vcproj wad/wad.vcproj
diff --git a/vc2005/QuakeForge-VS8-Express.sln b/vc2005/QuakeForge-VS8-Express.sln
deleted file mode 100644
index 404f35ff4..000000000
--- a/vc2005/QuakeForge-VS8-Express.sln
+++ /dev/null
@@ -1,935 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qw-client", "qfclient\qfclient.vcproj", "{9A942925-61E6-4975-935A-5D62E8248E64}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qw", "qw\qw.vcproj", "{6ADA4322-693A-46BB-897B-17BB5BE9F08C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "net-chan", "net\net.vcproj", "{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ruamoko", "ruamoko\ruamoko.vcproj", "{51028ACF-53D4-4478-8500-55E6B8A81375}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "models-gl", "modelsgl\modelsgl.vcproj", "{1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "console", "console\console.vcproj", "{ED4AFBF5-C247-4352-966D-048B8998C6A1}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gib", "gib\gib.vcproj", "{01C3B138-9D45-4ED6-A763-893C067262C2}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "util", "util\util.vcproj", "{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "engine", "engine\engine.vcproj", "{2626C0E1-6F5C-47D3-B80D-93942D766DD7}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "builtins", "builtins\builtins.vcproj", "{04FA9D77-E45F-4917-B972-B353BA6A6FA8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sound", "sound\sound.vcproj", "{BF149D97-7520-4788-9CD1-3D99C5C8150F}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "image", "image\image.vcproj", "{5203F034-0047-4EC0-B7E9-D037FAF5D536}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "video", "video\video.vcproj", "{E7B3D07D-2FE8-481B-8DAB-6255A412A42F}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qw-common", "common\common.vcproj", "{BC1F021A-1EEC-4A7A-B746-5AA6048E478C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qw-server", "qfserver\qfserver.vcproj", "{544D097C-9C24-4C57-A171-8C8029421185}"
-	ProjectSection(ProjectDependencies) = postProject
-		{6ADA4322-693A-46BB-897B-17BB5BE9F08C} = {6ADA4322-693A-46BB-897B-17BB5BE9F08C}
-		{B37FE734-01F4-4799-86B2-D084820715BE} = {B37FE734-01F4-4799-86B2-D084820715BE}
-		{BC1F021A-1EEC-4A7A-B746-5AA6048E478C} = {BC1F021A-1EEC-4A7A-B746-5AA6048E478C}
-		{DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A} = {DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}
-		{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} = {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1}
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7}
-		{51028ACF-53D4-4478-8500-55E6B8A81375} = {51028ACF-53D4-4478-8500-55E6B8A81375}
-		{04FA9D77-E45F-4917-B972-B353BA6A6FA8} = {04FA9D77-E45F-4917-B972-B353BA6A6FA8}
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}
-		{01C3B138-9D45-4ED6-A763-893C067262C2} = {01C3B138-9D45-4ED6-A763-893C067262C2}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "models", "models\models.vcproj", "{DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "console-client", "console_client\console_client.vcproj", "{226D42CE-5833-444E-94FA-84C1D51892A8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "console-server", "console_server\console_server.vcproj", "{B37FE734-01F4-4799-86B2-D084820715BE}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qfbsp", "qfbsp\qfbsp.vcproj", "{B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}"
-	ProjectSection(ProjectDependencies) = postProject
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qflight", "qflight\qflight.vcproj", "{5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}"
-	ProjectSection(ProjectDependencies) = postProject
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qfvis", "qfvis\qfvis.vcproj", "{E5D842C5-669F-4FC7-A5E0-44B562F86435}"
-	ProjectSection(ProjectDependencies) = postProject
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qw-master", "qw-master\qw-master.vcproj", "{445A2500-3BBC-449A-A929-C419C2A16051}"
-	ProjectSection(ProjectDependencies) = postProject
-		{B37FE734-01F4-4799-86B2-D084820715BE} = {B37FE734-01F4-4799-86B2-D084820715BE}
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1}
-		{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} = {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qfmodelgen", "qfmodelgen\qfmodelgen.vcproj", "{052C34FE-C9E2-43ED-95DA-FB3F27B44E37}"
-	ProjectSection(ProjectDependencies) = postProject
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qfprogs", "qfprogs\qfprogs.vcproj", "{5FA27C8E-51B1-445A-A375-FBE74F0984B1}"
-	ProjectSection(ProjectDependencies) = postProject
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qfwavinfo", "qfwavinfo\qfwavinfo.vcproj", "{56BD559B-1590-4FC4-B441-AB1973BAC2BD}"
-	ProjectSection(ProjectDependencies) = postProject
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wad", "wad\wad.vcproj", "{88422448-C5FB-46F3-A0B3-0811F90E537C}"
-	ProjectSection(ProjectDependencies) = postProject
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}
-		{5203F034-0047-4EC0-B7E9-D037FAF5D536} = {5203F034-0047-4EC0-B7E9-D037FAF5D536}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pak", "pak\pak.vcproj", "{9EE8BD4B-47D3-4AD5-A8B9-831329792A05}"
-	ProjectSection(ProjectDependencies) = postProject
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bsp2img", "bsp2img\bsp2img.vcproj", "{4605418D-2292-470A-AB18-C2119B016F71}"
-	ProjectSection(ProjectDependencies) = postProject
-		{5203F034-0047-4EC0-B7E9-D037FAF5D536} = {5203F034-0047-4EC0-B7E9-D037FAF5D536}
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qtv", "qtv\qtv.vcproj", "{05E68E3B-5901-43A9-981D-CF392C0F5C6C}"
-	ProjectSection(ProjectDependencies) = postProject
-		{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} = {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}
-		{B37FE734-01F4-4799-86B2-D084820715BE} = {B37FE734-01F4-4799-86B2-D084820715BE}
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1}
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}
-		{6ADA4322-693A-46BB-897B-17BB5BE9F08C} = {6ADA4322-693A-46BB-897B-17BB5BE9F08C}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nq-common", "nq-common\nq-common.vcproj", "{6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nq-wgl", "nq-wgl\nq-wgl.vcproj", "{1CD1A18B-95D5-4EA4-917C-34B10066BFCC}"
-	ProjectSection(ProjectDependencies) = postProject
-		{B37FE734-01F4-4799-86B2-D084820715BE} = {B37FE734-01F4-4799-86B2-D084820715BE}
-		{178D81A7-F2FB-41D7-B300-9D1A4DE5E137} = {178D81A7-F2FB-41D7-B300-9D1A4DE5E137}
-		{155112B9-A8A9-4E06-90F5-4AAAB32B2F70} = {155112B9-A8A9-4E06-90F5-4AAAB32B2F70}
-		{C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F} = {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7}
-		{5203F034-0047-4EC0-B7E9-D037FAF5D536} = {5203F034-0047-4EC0-B7E9-D037FAF5D536}
-		{01C3B138-9D45-4ED6-A763-893C067262C2} = {01C3B138-9D45-4ED6-A763-893C067262C2}
-		{6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80} = {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}
-		{04FA9D77-E45F-4917-B972-B353BA6A6FA8} = {04FA9D77-E45F-4917-B972-B353BA6A6FA8}
-		{E7B3D07D-2FE8-481B-8DAB-6255A412A42F} = {E7B3D07D-2FE8-481B-8DAB-6255A412A42F}
-		{BF149D97-7520-4788-9CD1-3D99C5C8150F} = {BF149D97-7520-4788-9CD1-3D99C5C8150F}
-		{226D42CE-5833-444E-94FA-84C1D51892A8} = {226D42CE-5833-444E-94FA-84C1D51892A8}
-		{51028ACF-53D4-4478-8500-55E6B8A81375} = {51028ACF-53D4-4478-8500-55E6B8A81375}
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1}
-		{053E1EE2-75B4-4D9A-B8AE-89600BCB60A5} = {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}
-		{1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7} = {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "net-main", "net-main\net-main.vcproj", "{053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nq-server", "nq-server\nq-server.vcproj", "{231C032C-DE16-459A-8E7D-6509C2EC3998}"
-	ProjectSection(ProjectDependencies) = postProject
-		{B37FE734-01F4-4799-86B2-D084820715BE} = {B37FE734-01F4-4799-86B2-D084820715BE}
-		{01C3B138-9D45-4ED6-A763-893C067262C2} = {01C3B138-9D45-4ED6-A763-893C067262C2}
-		{6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80} = {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}
-		{04FA9D77-E45F-4917-B972-B353BA6A6FA8} = {04FA9D77-E45F-4917-B972-B353BA6A6FA8}
-		{51028ACF-53D4-4478-8500-55E6B8A81375} = {51028ACF-53D4-4478-8500-55E6B8A81375}
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7}
-		{053E1EE2-75B4-4D9A-B8AE-89600BCB60A5} = {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1}
-		{DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A} = {DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hw-master", "hw-master\hw-master.vcproj", "{419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}"
-	ProjectSection(ProjectDependencies) = postProject
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1}
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}
-		{B37FE734-01F4-4799-86B2-D084820715BE} = {B37FE734-01F4-4799-86B2-D084820715BE}
-		{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} = {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qfcc", "qfcc\qfcc.vcproj", "{40639893-4D75-48CD-811F-4B363CC71FFA}"
-	ProjectSection(ProjectDependencies) = postProject
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7}
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qw-client-wgl", "qw-client-wgl\qw-client-wgl.vcproj", "{5FD733BF-B3C6-4A96-BED7-35E2484448E1}"
-	ProjectSection(ProjectDependencies) = postProject
-		{04FA9D77-E45F-4917-B972-B353BA6A6FA8} = {04FA9D77-E45F-4917-B972-B353BA6A6FA8}
-		{226D42CE-5833-444E-94FA-84C1D51892A8} = {226D42CE-5833-444E-94FA-84C1D51892A8}
-		{1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7} = {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7}
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1}
-		{51028ACF-53D4-4478-8500-55E6B8A81375} = {51028ACF-53D4-4478-8500-55E6B8A81375}
-		{BF149D97-7520-4788-9CD1-3D99C5C8150F} = {BF149D97-7520-4788-9CD1-3D99C5C8150F}
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}
-		{E7B3D07D-2FE8-481B-8DAB-6255A412A42F} = {E7B3D07D-2FE8-481B-8DAB-6255A412A42F}
-		{9A942925-61E6-4975-935A-5D62E8248E64} = {9A942925-61E6-4975-935A-5D62E8248E64}
-		{6ADA4322-693A-46BB-897B-17BB5BE9F08C} = {6ADA4322-693A-46BB-897B-17BB5BE9F08C}
-		{BC1F021A-1EEC-4A7A-B746-5AA6048E478C} = {BC1F021A-1EEC-4A7A-B746-5AA6048E478C}
-		{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} = {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}
-		{C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F} = {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}
-		{5203F034-0047-4EC0-B7E9-D037FAF5D536} = {5203F034-0047-4EC0-B7E9-D037FAF5D536}
-		{178D81A7-F2FB-41D7-B300-9D1A4DE5E137} = {178D81A7-F2FB-41D7-B300-9D1A4DE5E137}
-		{01C3B138-9D45-4ED6-A763-893C067262C2} = {01C3B138-9D45-4ED6-A763-893C067262C2}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qw-client-sgl", "qw-client-sgl\qw-client-sgl.vcproj", "{649C4168-1C65-4E41-818F-85A1C52C1B8F}"
-	ProjectSection(ProjectDependencies) = postProject
-		{5203F034-0047-4EC0-B7E9-D037FAF5D536} = {5203F034-0047-4EC0-B7E9-D037FAF5D536}
-		{01C3B138-9D45-4ED6-A763-893C067262C2} = {01C3B138-9D45-4ED6-A763-893C067262C2}
-		{04FA9D77-E45F-4917-B972-B353BA6A6FA8} = {04FA9D77-E45F-4917-B972-B353BA6A6FA8}
-		{E7B3D07D-2FE8-481B-8DAB-6255A412A42F} = {E7B3D07D-2FE8-481B-8DAB-6255A412A42F}
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}
-		{BF149D97-7520-4788-9CD1-3D99C5C8150F} = {BF149D97-7520-4788-9CD1-3D99C5C8150F}
-		{226D42CE-5833-444E-94FA-84C1D51892A8} = {226D42CE-5833-444E-94FA-84C1D51892A8}
-		{51028ACF-53D4-4478-8500-55E6B8A81375} = {51028ACF-53D4-4478-8500-55E6B8A81375}
-		{BC1F021A-1EEC-4A7A-B746-5AA6048E478C} = {BC1F021A-1EEC-4A7A-B746-5AA6048E478C}
-		{9A942925-61E6-4975-935A-5D62E8248E64} = {9A942925-61E6-4975-935A-5D62E8248E64}
-		{6ADA4322-693A-46BB-897B-17BB5BE9F08C} = {6ADA4322-693A-46BB-897B-17BB5BE9F08C}
-		{1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7} = {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7}
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1}
-		{C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F} = {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}
-		{44A18410-3AA8-4A64-935B-D20223AD6885} = {44A18410-3AA8-4A64-935B-D20223AD6885}
-		{7E30C3B1-AEE7-483D-B231-C672365CD2D7} = {7E30C3B1-AEE7-483D-B231-C672365CD2D7}
-		{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} = {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "video-gl", "videogl\videogl.vcproj", "{C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "video-sdl", "video-sdl\video-sdl.vcproj", "{44A18410-3AA8-4A64-935B-D20223AD6885}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qw-client-sdl", "qw-client-sdl\qw-client-sdl.vcproj", "{B44CB3E0-F2FD-4260-A632-C01FB881613E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{66D3A191-E4D5-45F3-86BD-EFBB249CD554} = {66D3A191-E4D5-45F3-86BD-EFBB249CD554}
-		{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} = {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}
-		{44A18410-3AA8-4A64-935B-D20223AD6885} = {44A18410-3AA8-4A64-935B-D20223AD6885}
-		{BC1F021A-1EEC-4A7A-B746-5AA6048E478C} = {BC1F021A-1EEC-4A7A-B746-5AA6048E478C}
-		{6ADA4322-693A-46BB-897B-17BB5BE9F08C} = {6ADA4322-693A-46BB-897B-17BB5BE9F08C}
-		{9A942925-61E6-4975-935A-5D62E8248E64} = {9A942925-61E6-4975-935A-5D62E8248E64}
-		{5203F034-0047-4EC0-B7E9-D037FAF5D536} = {5203F034-0047-4EC0-B7E9-D037FAF5D536}
-		{01C3B138-9D45-4ED6-A763-893C067262C2} = {01C3B138-9D45-4ED6-A763-893C067262C2}
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}
-		{04FA9D77-E45F-4917-B972-B353BA6A6FA8} = {04FA9D77-E45F-4917-B972-B353BA6A6FA8}
-		{E7B3D07D-2FE8-481B-8DAB-6255A412A42F} = {E7B3D07D-2FE8-481B-8DAB-6255A412A42F}
-		{BF149D97-7520-4788-9CD1-3D99C5C8150F} = {BF149D97-7520-4788-9CD1-3D99C5C8150F}
-		{226D42CE-5833-444E-94FA-84C1D51892A8} = {226D42CE-5833-444E-94FA-84C1D51892A8}
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7}
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1}
-		{51028ACF-53D4-4478-8500-55E6B8A81375} = {51028ACF-53D4-4478-8500-55E6B8A81375}
-		{F4A9881E-0EB0-44A1-9664-B6CBDE992861} = {F4A9881E-0EB0-44A1-9664-B6CBDE992861}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "models-sw", "models-sw\models-sw.vcproj", "{F4A9881E-0EB0-44A1-9664-B6CBDE992861}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "video-sw", "video-sw\video-sw.vcproj", "{66D3A191-E4D5-45F3-86BD-EFBB249CD554}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qw-client-sdl32", "qw-client-sdl32\qw-client-sdl32.vcproj", "{CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}"
-	ProjectSection(ProjectDependencies) = postProject
-		{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} = {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}
-		{44A18410-3AA8-4A64-935B-D20223AD6885} = {44A18410-3AA8-4A64-935B-D20223AD6885}
-		{BC1F021A-1EEC-4A7A-B746-5AA6048E478C} = {BC1F021A-1EEC-4A7A-B746-5AA6048E478C}
-		{F4A9881E-0EB0-44A1-9664-B6CBDE992861} = {F4A9881E-0EB0-44A1-9664-B6CBDE992861}
-		{6ADA4322-693A-46BB-897B-17BB5BE9F08C} = {6ADA4322-693A-46BB-897B-17BB5BE9F08C}
-		{9A942925-61E6-4975-935A-5D62E8248E64} = {9A942925-61E6-4975-935A-5D62E8248E64}
-		{5203F034-0047-4EC0-B7E9-D037FAF5D536} = {5203F034-0047-4EC0-B7E9-D037FAF5D536}
-		{01C3B138-9D45-4ED6-A763-893C067262C2} = {01C3B138-9D45-4ED6-A763-893C067262C2}
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}
-		{04FA9D77-E45F-4917-B972-B353BA6A6FA8} = {04FA9D77-E45F-4917-B972-B353BA6A6FA8}
-		{E7B3D07D-2FE8-481B-8DAB-6255A412A42F} = {E7B3D07D-2FE8-481B-8DAB-6255A412A42F}
-		{D5B9558F-EF25-4167-ACE4-723C7413B390} = {D5B9558F-EF25-4167-ACE4-723C7413B390}
-		{BF149D97-7520-4788-9CD1-3D99C5C8150F} = {BF149D97-7520-4788-9CD1-3D99C5C8150F}
-		{226D42CE-5833-444E-94FA-84C1D51892A8} = {226D42CE-5833-444E-94FA-84C1D51892A8}
-		{51028ACF-53D4-4478-8500-55E6B8A81375} = {51028ACF-53D4-4478-8500-55E6B8A81375}
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7}
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "video-sw32", "video-sw32\video-sw32.vcproj", "{D5B9558F-EF25-4167-ACE4-723C7413B390}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nq", "nq\nq.vcproj", "{155112B9-A8A9-4E06-90F5-4AAAB32B2F70}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "video-wgl", "video-wgl\video-wgl.vcproj", "{178D81A7-F2FB-41D7-B300-9D1A4DE5E137}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "video-sgl", "video-sgl\video-sgl.vcproj", "{7E30C3B1-AEE7-483D-B231-C672365CD2D7}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nq-sgl", "nq-sgl\nq-sgl.vcproj", "{2E26DB8B-9E37-4072-B397-8A7086E0ACD0}"
-	ProjectSection(ProjectDependencies) = postProject
-		{B37FE734-01F4-4799-86B2-D084820715BE} = {B37FE734-01F4-4799-86B2-D084820715BE}
-		{5203F034-0047-4EC0-B7E9-D037FAF5D536} = {5203F034-0047-4EC0-B7E9-D037FAF5D536}
-		{01C3B138-9D45-4ED6-A763-893C067262C2} = {01C3B138-9D45-4ED6-A763-893C067262C2}
-		{6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80} = {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}
-		{04FA9D77-E45F-4917-B972-B353BA6A6FA8} = {04FA9D77-E45F-4917-B972-B353BA6A6FA8}
-		{7E30C3B1-AEE7-483D-B231-C672365CD2D7} = {7E30C3B1-AEE7-483D-B231-C672365CD2D7}
-		{44A18410-3AA8-4A64-935B-D20223AD6885} = {44A18410-3AA8-4A64-935B-D20223AD6885}
-		{155112B9-A8A9-4E06-90F5-4AAAB32B2F70} = {155112B9-A8A9-4E06-90F5-4AAAB32B2F70}
-		{C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F} = {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}
-		{E7B3D07D-2FE8-481B-8DAB-6255A412A42F} = {E7B3D07D-2FE8-481B-8DAB-6255A412A42F}
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}
-		{BF149D97-7520-4788-9CD1-3D99C5C8150F} = {BF149D97-7520-4788-9CD1-3D99C5C8150F}
-		{51028ACF-53D4-4478-8500-55E6B8A81375} = {51028ACF-53D4-4478-8500-55E6B8A81375}
-		{226D42CE-5833-444E-94FA-84C1D51892A8} = {226D42CE-5833-444E-94FA-84C1D51892A8}
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7}
-		{053E1EE2-75B4-4D9A-B8AE-89600BCB60A5} = {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1}
-		{1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7} = {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nq-sdl", "nq-sdl\nq-sdl.vcproj", "{2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1}
-		{053E1EE2-75B4-4D9A-B8AE-89600BCB60A5} = {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7}
-		{51028ACF-53D4-4478-8500-55E6B8A81375} = {51028ACF-53D4-4478-8500-55E6B8A81375}
-		{226D42CE-5833-444E-94FA-84C1D51892A8} = {226D42CE-5833-444E-94FA-84C1D51892A8}
-		{155112B9-A8A9-4E06-90F5-4AAAB32B2F70} = {155112B9-A8A9-4E06-90F5-4AAAB32B2F70}
-		{BF149D97-7520-4788-9CD1-3D99C5C8150F} = {BF149D97-7520-4788-9CD1-3D99C5C8150F}
-		{66D3A191-E4D5-45F3-86BD-EFBB249CD554} = {66D3A191-E4D5-45F3-86BD-EFBB249CD554}
-		{E7B3D07D-2FE8-481B-8DAB-6255A412A42F} = {E7B3D07D-2FE8-481B-8DAB-6255A412A42F}
-		{04FA9D77-E45F-4917-B972-B353BA6A6FA8} = {04FA9D77-E45F-4917-B972-B353BA6A6FA8}
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}
-		{6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80} = {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}
-		{01C3B138-9D45-4ED6-A763-893C067262C2} = {01C3B138-9D45-4ED6-A763-893C067262C2}
-		{5203F034-0047-4EC0-B7E9-D037FAF5D536} = {5203F034-0047-4EC0-B7E9-D037FAF5D536}
-		{B37FE734-01F4-4799-86B2-D084820715BE} = {B37FE734-01F4-4799-86B2-D084820715BE}
-		{F4A9881E-0EB0-44A1-9664-B6CBDE992861} = {F4A9881E-0EB0-44A1-9664-B6CBDE992861}
-		{44A18410-3AA8-4A64-935B-D20223AD6885} = {44A18410-3AA8-4A64-935B-D20223AD6885}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nq-sdl32", "nq-sdl32\nq-sdl32.vcproj", "{2CEB1965-A89C-4422-A9AC-B30FCE7913C3}"
-	ProjectSection(ProjectDependencies) = postProject
-		{44A18410-3AA8-4A64-935B-D20223AD6885} = {44A18410-3AA8-4A64-935B-D20223AD6885}
-		{F4A9881E-0EB0-44A1-9664-B6CBDE992861} = {F4A9881E-0EB0-44A1-9664-B6CBDE992861}
-		{B37FE734-01F4-4799-86B2-D084820715BE} = {B37FE734-01F4-4799-86B2-D084820715BE}
-		{5203F034-0047-4EC0-B7E9-D037FAF5D536} = {5203F034-0047-4EC0-B7E9-D037FAF5D536}
-		{01C3B138-9D45-4ED6-A763-893C067262C2} = {01C3B138-9D45-4ED6-A763-893C067262C2}
-		{6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80} = {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}
-		{04FA9D77-E45F-4917-B972-B353BA6A6FA8} = {04FA9D77-E45F-4917-B972-B353BA6A6FA8}
-		{E7B3D07D-2FE8-481B-8DAB-6255A412A42F} = {E7B3D07D-2FE8-481B-8DAB-6255A412A42F}
-		{D5B9558F-EF25-4167-ACE4-723C7413B390} = {D5B9558F-EF25-4167-ACE4-723C7413B390}
-		{BF149D97-7520-4788-9CD1-3D99C5C8150F} = {BF149D97-7520-4788-9CD1-3D99C5C8150F}
-		{155112B9-A8A9-4E06-90F5-4AAAB32B2F70} = {155112B9-A8A9-4E06-90F5-4AAAB32B2F70}
-		{226D42CE-5833-444E-94FA-84C1D51892A8} = {226D42CE-5833-444E-94FA-84C1D51892A8}
-		{51028ACF-53D4-4478-8500-55E6B8A81375} = {51028ACF-53D4-4478-8500-55E6B8A81375}
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7}
-		{053E1EE2-75B4-4D9A-B8AE-89600BCB60A5} = {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1}
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release (static)|Win32 = Release (static)|Win32
-		Release (static)|x64 = Release (static)|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{9A942925-61E6-4975-935A-5D62E8248E64}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9A942925-61E6-4975-935A-5D62E8248E64}.Debug|Win32.Build.0 = Debug|Win32
-		{9A942925-61E6-4975-935A-5D62E8248E64}.Debug|x64.ActiveCfg = Debug|x64
-		{9A942925-61E6-4975-935A-5D62E8248E64}.Debug|x64.Build.0 = Debug|x64
-		{9A942925-61E6-4975-935A-5D62E8248E64}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{9A942925-61E6-4975-935A-5D62E8248E64}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{9A942925-61E6-4975-935A-5D62E8248E64}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{9A942925-61E6-4975-935A-5D62E8248E64}.Release (static)|x64.Build.0 = Release (static)|x64
-		{9A942925-61E6-4975-935A-5D62E8248E64}.Release|Win32.ActiveCfg = Release|Win32
-		{9A942925-61E6-4975-935A-5D62E8248E64}.Release|Win32.Build.0 = Release|Win32
-		{9A942925-61E6-4975-935A-5D62E8248E64}.Release|x64.ActiveCfg = Release|x64
-		{9A942925-61E6-4975-935A-5D62E8248E64}.Release|x64.Build.0 = Release|x64
-		{6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Debug|Win32.Build.0 = Debug|Win32
-		{6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Debug|x64.ActiveCfg = Debug|x64
-		{6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Debug|x64.Build.0 = Debug|x64
-		{6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Release (static)|x64.Build.0 = Release (static)|x64
-		{6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Release|Win32.ActiveCfg = Release|Win32
-		{6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Release|Win32.Build.0 = Release|Win32
-		{6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Release|x64.ActiveCfg = Release|x64
-		{6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Release|x64.Build.0 = Release|x64
-		{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Debug|Win32.Build.0 = Debug|Win32
-		{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Debug|x64.ActiveCfg = Debug|x64
-		{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Debug|x64.Build.0 = Debug|x64
-		{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Release (static)|x64.Build.0 = Release (static)|x64
-		{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Release|Win32.ActiveCfg = Release|Win32
-		{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Release|Win32.Build.0 = Release|Win32
-		{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Release|x64.ActiveCfg = Release|x64
-		{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Release|x64.Build.0 = Release|x64
-		{51028ACF-53D4-4478-8500-55E6B8A81375}.Debug|Win32.ActiveCfg = Debug|Win32
-		{51028ACF-53D4-4478-8500-55E6B8A81375}.Debug|Win32.Build.0 = Debug|Win32
-		{51028ACF-53D4-4478-8500-55E6B8A81375}.Debug|x64.ActiveCfg = Debug|x64
-		{51028ACF-53D4-4478-8500-55E6B8A81375}.Debug|x64.Build.0 = Debug|x64
-		{51028ACF-53D4-4478-8500-55E6B8A81375}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{51028ACF-53D4-4478-8500-55E6B8A81375}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{51028ACF-53D4-4478-8500-55E6B8A81375}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{51028ACF-53D4-4478-8500-55E6B8A81375}.Release (static)|x64.Build.0 = Release (static)|x64
-		{51028ACF-53D4-4478-8500-55E6B8A81375}.Release|Win32.ActiveCfg = Release|Win32
-		{51028ACF-53D4-4478-8500-55E6B8A81375}.Release|Win32.Build.0 = Release|Win32
-		{51028ACF-53D4-4478-8500-55E6B8A81375}.Release|x64.ActiveCfg = Release|x64
-		{51028ACF-53D4-4478-8500-55E6B8A81375}.Release|x64.Build.0 = Release|x64
-		{1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Debug|Win32.Build.0 = Debug|Win32
-		{1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Debug|x64.ActiveCfg = Debug|x64
-		{1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Debug|x64.Build.0 = Debug|x64
-		{1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Release (static)|x64.Build.0 = Release (static)|x64
-		{1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Release|Win32.ActiveCfg = Release|Win32
-		{1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Release|Win32.Build.0 = Release|Win32
-		{1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Release|x64.ActiveCfg = Release|x64
-		{1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Release|x64.Build.0 = Release|x64
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1}.Debug|Win32.ActiveCfg = Debug|Win32
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1}.Debug|Win32.Build.0 = Debug|Win32
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1}.Debug|x64.ActiveCfg = Debug|x64
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1}.Debug|x64.Build.0 = Debug|x64
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1}.Release (static)|x64.Build.0 = Release (static)|x64
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1}.Release|Win32.ActiveCfg = Release|Win32
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1}.Release|Win32.Build.0 = Release|Win32
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1}.Release|x64.ActiveCfg = Release|x64
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1}.Release|x64.Build.0 = Release|x64
-		{01C3B138-9D45-4ED6-A763-893C067262C2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{01C3B138-9D45-4ED6-A763-893C067262C2}.Debug|Win32.Build.0 = Debug|Win32
-		{01C3B138-9D45-4ED6-A763-893C067262C2}.Debug|x64.ActiveCfg = Debug|x64
-		{01C3B138-9D45-4ED6-A763-893C067262C2}.Debug|x64.Build.0 = Debug|x64
-		{01C3B138-9D45-4ED6-A763-893C067262C2}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{01C3B138-9D45-4ED6-A763-893C067262C2}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{01C3B138-9D45-4ED6-A763-893C067262C2}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{01C3B138-9D45-4ED6-A763-893C067262C2}.Release (static)|x64.Build.0 = Release (static)|x64
-		{01C3B138-9D45-4ED6-A763-893C067262C2}.Release|Win32.ActiveCfg = Release|Win32
-		{01C3B138-9D45-4ED6-A763-893C067262C2}.Release|Win32.Build.0 = Release|Win32
-		{01C3B138-9D45-4ED6-A763-893C067262C2}.Release|x64.ActiveCfg = Release|x64
-		{01C3B138-9D45-4ED6-A763-893C067262C2}.Release|x64.Build.0 = Release|x64
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Debug|Win32.ActiveCfg = Debug|Win32
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Debug|Win32.Build.0 = Debug|Win32
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Debug|x64.ActiveCfg = Debug|x64
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Debug|x64.Build.0 = Debug|x64
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Release (static)|x64.Build.0 = Release (static)|x64
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Release|Win32.ActiveCfg = Release|Win32
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Release|Win32.Build.0 = Release|Win32
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Release|x64.ActiveCfg = Release|x64
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Release|x64.Build.0 = Release|x64
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Debug|Win32.Build.0 = Debug|Win32
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Debug|x64.ActiveCfg = Debug|x64
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Debug|x64.Build.0 = Debug|x64
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Release (static)|x64.Build.0 = Release (static)|x64
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Release|Win32.ActiveCfg = Release|Win32
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Release|Win32.Build.0 = Release|Win32
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Release|x64.ActiveCfg = Release|x64
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Release|x64.Build.0 = Release|x64
-		{04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Debug|Win32.Build.0 = Debug|Win32
-		{04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Debug|x64.ActiveCfg = Debug|x64
-		{04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Debug|x64.Build.0 = Debug|x64
-		{04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Release (static)|x64.Build.0 = Release (static)|x64
-		{04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Release|Win32.ActiveCfg = Release|Win32
-		{04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Release|Win32.Build.0 = Release|Win32
-		{04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Release|x64.ActiveCfg = Release|x64
-		{04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Release|x64.Build.0 = Release|x64
-		{BF149D97-7520-4788-9CD1-3D99C5C8150F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{BF149D97-7520-4788-9CD1-3D99C5C8150F}.Debug|Win32.Build.0 = Debug|Win32
-		{BF149D97-7520-4788-9CD1-3D99C5C8150F}.Debug|x64.ActiveCfg = Debug|x64
-		{BF149D97-7520-4788-9CD1-3D99C5C8150F}.Debug|x64.Build.0 = Debug|x64
-		{BF149D97-7520-4788-9CD1-3D99C5C8150F}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{BF149D97-7520-4788-9CD1-3D99C5C8150F}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{BF149D97-7520-4788-9CD1-3D99C5C8150F}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{BF149D97-7520-4788-9CD1-3D99C5C8150F}.Release (static)|x64.Build.0 = Release (static)|x64
-		{BF149D97-7520-4788-9CD1-3D99C5C8150F}.Release|Win32.ActiveCfg = Release|Win32
-		{BF149D97-7520-4788-9CD1-3D99C5C8150F}.Release|Win32.Build.0 = Release|Win32
-		{BF149D97-7520-4788-9CD1-3D99C5C8150F}.Release|x64.ActiveCfg = Release|x64
-		{BF149D97-7520-4788-9CD1-3D99C5C8150F}.Release|x64.Build.0 = Release|x64
-		{5203F034-0047-4EC0-B7E9-D037FAF5D536}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5203F034-0047-4EC0-B7E9-D037FAF5D536}.Debug|Win32.Build.0 = Debug|Win32
-		{5203F034-0047-4EC0-B7E9-D037FAF5D536}.Debug|x64.ActiveCfg = Debug|x64
-		{5203F034-0047-4EC0-B7E9-D037FAF5D536}.Debug|x64.Build.0 = Debug|x64
-		{5203F034-0047-4EC0-B7E9-D037FAF5D536}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{5203F034-0047-4EC0-B7E9-D037FAF5D536}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{5203F034-0047-4EC0-B7E9-D037FAF5D536}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{5203F034-0047-4EC0-B7E9-D037FAF5D536}.Release (static)|x64.Build.0 = Release (static)|x64
-		{5203F034-0047-4EC0-B7E9-D037FAF5D536}.Release|Win32.ActiveCfg = Release|Win32
-		{5203F034-0047-4EC0-B7E9-D037FAF5D536}.Release|Win32.Build.0 = Release|Win32
-		{5203F034-0047-4EC0-B7E9-D037FAF5D536}.Release|x64.ActiveCfg = Release|x64
-		{5203F034-0047-4EC0-B7E9-D037FAF5D536}.Release|x64.Build.0 = Release|x64
-		{E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Debug|Win32.Build.0 = Debug|Win32
-		{E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Debug|x64.ActiveCfg = Debug|x64
-		{E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Debug|x64.Build.0 = Debug|x64
-		{E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Release (static)|x64.Build.0 = Release (static)|x64
-		{E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Release|Win32.ActiveCfg = Release|Win32
-		{E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Release|Win32.Build.0 = Release|Win32
-		{E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Release|x64.ActiveCfg = Release|x64
-		{E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Release|x64.Build.0 = Release|x64
-		{BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Debug|Win32.Build.0 = Debug|Win32
-		{BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Debug|x64.ActiveCfg = Debug|x64
-		{BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Debug|x64.Build.0 = Debug|x64
-		{BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Release (static)|x64.Build.0 = Release (static)|x64
-		{BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Release|Win32.ActiveCfg = Release|Win32
-		{BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Release|Win32.Build.0 = Release|Win32
-		{BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Release|x64.ActiveCfg = Release|x64
-		{BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Release|x64.Build.0 = Release|x64
-		{544D097C-9C24-4C57-A171-8C8029421185}.Debug|Win32.ActiveCfg = Debug|Win32
-		{544D097C-9C24-4C57-A171-8C8029421185}.Debug|Win32.Build.0 = Debug|Win32
-		{544D097C-9C24-4C57-A171-8C8029421185}.Debug|x64.ActiveCfg = Debug|x64
-		{544D097C-9C24-4C57-A171-8C8029421185}.Debug|x64.Build.0 = Debug|x64
-		{544D097C-9C24-4C57-A171-8C8029421185}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{544D097C-9C24-4C57-A171-8C8029421185}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{544D097C-9C24-4C57-A171-8C8029421185}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{544D097C-9C24-4C57-A171-8C8029421185}.Release (static)|x64.Build.0 = Release (static)|x64
-		{544D097C-9C24-4C57-A171-8C8029421185}.Release|Win32.ActiveCfg = Release|Win32
-		{544D097C-9C24-4C57-A171-8C8029421185}.Release|Win32.Build.0 = Release|Win32
-		{544D097C-9C24-4C57-A171-8C8029421185}.Release|x64.ActiveCfg = Release|x64
-		{544D097C-9C24-4C57-A171-8C8029421185}.Release|x64.Build.0 = Release|x64
-		{DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Debug|Win32.Build.0 = Debug|Win32
-		{DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Debug|x64.ActiveCfg = Debug|x64
-		{DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Debug|x64.Build.0 = Debug|x64
-		{DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Release (static)|x64.Build.0 = Release (static)|x64
-		{DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Release|Win32.ActiveCfg = Release|Win32
-		{DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Release|Win32.Build.0 = Release|Win32
-		{DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Release|x64.ActiveCfg = Release|x64
-		{DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Release|x64.Build.0 = Release|x64
-		{226D42CE-5833-444E-94FA-84C1D51892A8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{226D42CE-5833-444E-94FA-84C1D51892A8}.Debug|Win32.Build.0 = Debug|Win32
-		{226D42CE-5833-444E-94FA-84C1D51892A8}.Debug|x64.ActiveCfg = Debug|x64
-		{226D42CE-5833-444E-94FA-84C1D51892A8}.Debug|x64.Build.0 = Debug|x64
-		{226D42CE-5833-444E-94FA-84C1D51892A8}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{226D42CE-5833-444E-94FA-84C1D51892A8}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{226D42CE-5833-444E-94FA-84C1D51892A8}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{226D42CE-5833-444E-94FA-84C1D51892A8}.Release (static)|x64.Build.0 = Release (static)|x64
-		{226D42CE-5833-444E-94FA-84C1D51892A8}.Release|Win32.ActiveCfg = Release|Win32
-		{226D42CE-5833-444E-94FA-84C1D51892A8}.Release|Win32.Build.0 = Release|Win32
-		{226D42CE-5833-444E-94FA-84C1D51892A8}.Release|x64.ActiveCfg = Release|x64
-		{226D42CE-5833-444E-94FA-84C1D51892A8}.Release|x64.Build.0 = Release|x64
-		{B37FE734-01F4-4799-86B2-D084820715BE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B37FE734-01F4-4799-86B2-D084820715BE}.Debug|Win32.Build.0 = Debug|Win32
-		{B37FE734-01F4-4799-86B2-D084820715BE}.Debug|x64.ActiveCfg = Debug|x64
-		{B37FE734-01F4-4799-86B2-D084820715BE}.Debug|x64.Build.0 = Debug|x64
-		{B37FE734-01F4-4799-86B2-D084820715BE}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{B37FE734-01F4-4799-86B2-D084820715BE}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{B37FE734-01F4-4799-86B2-D084820715BE}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{B37FE734-01F4-4799-86B2-D084820715BE}.Release (static)|x64.Build.0 = Release (static)|x64
-		{B37FE734-01F4-4799-86B2-D084820715BE}.Release|Win32.ActiveCfg = Release|Win32
-		{B37FE734-01F4-4799-86B2-D084820715BE}.Release|Win32.Build.0 = Release|Win32
-		{B37FE734-01F4-4799-86B2-D084820715BE}.Release|x64.ActiveCfg = Release|x64
-		{B37FE734-01F4-4799-86B2-D084820715BE}.Release|x64.Build.0 = Release|x64
-		{B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Debug|Win32.Build.0 = Debug|Win32
-		{B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Debug|x64.ActiveCfg = Debug|x64
-		{B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Debug|x64.Build.0 = Debug|x64
-		{B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Release (static)|x64.Build.0 = Release (static)|x64
-		{B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Release|Win32.ActiveCfg = Release|Win32
-		{B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Release|Win32.Build.0 = Release|Win32
-		{B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Release|x64.ActiveCfg = Release|x64
-		{B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Release|x64.Build.0 = Release|x64
-		{5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Debug|Win32.Build.0 = Debug|Win32
-		{5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Debug|x64.ActiveCfg = Debug|x64
-		{5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Debug|x64.Build.0 = Debug|x64
-		{5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Release (static)|x64.Build.0 = Release (static)|x64
-		{5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Release|Win32.ActiveCfg = Release|Win32
-		{5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Release|Win32.Build.0 = Release|Win32
-		{5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Release|x64.ActiveCfg = Release|x64
-		{5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Release|x64.Build.0 = Release|x64
-		{E5D842C5-669F-4FC7-A5E0-44B562F86435}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E5D842C5-669F-4FC7-A5E0-44B562F86435}.Debug|Win32.Build.0 = Debug|Win32
-		{E5D842C5-669F-4FC7-A5E0-44B562F86435}.Debug|x64.ActiveCfg = Debug|x64
-		{E5D842C5-669F-4FC7-A5E0-44B562F86435}.Debug|x64.Build.0 = Debug|x64
-		{E5D842C5-669F-4FC7-A5E0-44B562F86435}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{E5D842C5-669F-4FC7-A5E0-44B562F86435}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{E5D842C5-669F-4FC7-A5E0-44B562F86435}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{E5D842C5-669F-4FC7-A5E0-44B562F86435}.Release (static)|x64.Build.0 = Release (static)|x64
-		{E5D842C5-669F-4FC7-A5E0-44B562F86435}.Release|Win32.ActiveCfg = Release|Win32
-		{E5D842C5-669F-4FC7-A5E0-44B562F86435}.Release|Win32.Build.0 = Release|Win32
-		{E5D842C5-669F-4FC7-A5E0-44B562F86435}.Release|x64.ActiveCfg = Release|x64
-		{E5D842C5-669F-4FC7-A5E0-44B562F86435}.Release|x64.Build.0 = Release|x64
-		{445A2500-3BBC-449A-A929-C419C2A16051}.Debug|Win32.ActiveCfg = Debug|Win32
-		{445A2500-3BBC-449A-A929-C419C2A16051}.Debug|Win32.Build.0 = Debug|Win32
-		{445A2500-3BBC-449A-A929-C419C2A16051}.Debug|x64.ActiveCfg = Debug|x64
-		{445A2500-3BBC-449A-A929-C419C2A16051}.Debug|x64.Build.0 = Debug|x64
-		{445A2500-3BBC-449A-A929-C419C2A16051}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{445A2500-3BBC-449A-A929-C419C2A16051}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{445A2500-3BBC-449A-A929-C419C2A16051}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{445A2500-3BBC-449A-A929-C419C2A16051}.Release (static)|x64.Build.0 = Release (static)|x64
-		{445A2500-3BBC-449A-A929-C419C2A16051}.Release|Win32.ActiveCfg = Release|Win32
-		{445A2500-3BBC-449A-A929-C419C2A16051}.Release|Win32.Build.0 = Release|Win32
-		{445A2500-3BBC-449A-A929-C419C2A16051}.Release|x64.ActiveCfg = Release|x64
-		{445A2500-3BBC-449A-A929-C419C2A16051}.Release|x64.Build.0 = Release|x64
-		{052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Debug|Win32.ActiveCfg = Debug|Win32
-		{052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Debug|Win32.Build.0 = Debug|Win32
-		{052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Debug|x64.ActiveCfg = Debug|x64
-		{052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Debug|x64.Build.0 = Debug|x64
-		{052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Release (static)|x64.Build.0 = Release (static)|x64
-		{052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Release|Win32.ActiveCfg = Release|Win32
-		{052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Release|Win32.Build.0 = Release|Win32
-		{052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Release|x64.ActiveCfg = Release|x64
-		{052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Release|x64.Build.0 = Release|x64
-		{5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Debug|Win32.Build.0 = Debug|Win32
-		{5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Debug|x64.ActiveCfg = Debug|x64
-		{5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Debug|x64.Build.0 = Debug|x64
-		{5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Release (static)|x64.Build.0 = Release (static)|x64
-		{5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Release|Win32.ActiveCfg = Release|Win32
-		{5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Release|Win32.Build.0 = Release|Win32
-		{5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Release|x64.ActiveCfg = Release|x64
-		{5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Release|x64.Build.0 = Release|x64
-		{56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Debug|Win32.ActiveCfg = Debug|Win32
-		{56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Debug|Win32.Build.0 = Debug|Win32
-		{56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Debug|x64.ActiveCfg = Debug|x64
-		{56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Debug|x64.Build.0 = Debug|x64
-		{56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Release (static)|x64.Build.0 = Release (static)|x64
-		{56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Release|Win32.ActiveCfg = Release|Win32
-		{56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Release|Win32.Build.0 = Release|Win32
-		{56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Release|x64.ActiveCfg = Release|x64
-		{56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Release|x64.Build.0 = Release|x64
-		{88422448-C5FB-46F3-A0B3-0811F90E537C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{88422448-C5FB-46F3-A0B3-0811F90E537C}.Debug|Win32.Build.0 = Debug|Win32
-		{88422448-C5FB-46F3-A0B3-0811F90E537C}.Debug|x64.ActiveCfg = Debug|x64
-		{88422448-C5FB-46F3-A0B3-0811F90E537C}.Debug|x64.Build.0 = Debug|x64
-		{88422448-C5FB-46F3-A0B3-0811F90E537C}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{88422448-C5FB-46F3-A0B3-0811F90E537C}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{88422448-C5FB-46F3-A0B3-0811F90E537C}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{88422448-C5FB-46F3-A0B3-0811F90E537C}.Release (static)|x64.Build.0 = Release (static)|x64
-		{88422448-C5FB-46F3-A0B3-0811F90E537C}.Release|Win32.ActiveCfg = Release|Win32
-		{88422448-C5FB-46F3-A0B3-0811F90E537C}.Release|Win32.Build.0 = Release|Win32
-		{88422448-C5FB-46F3-A0B3-0811F90E537C}.Release|x64.ActiveCfg = Release|x64
-		{88422448-C5FB-46F3-A0B3-0811F90E537C}.Release|x64.Build.0 = Release|x64
-		{9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Debug|Win32.Build.0 = Debug|Win32
-		{9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Debug|x64.ActiveCfg = Debug|x64
-		{9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Debug|x64.Build.0 = Debug|x64
-		{9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Release (static)|x64.Build.0 = Release (static)|x64
-		{9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Release|Win32.ActiveCfg = Release|Win32
-		{9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Release|Win32.Build.0 = Release|Win32
-		{9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Release|x64.ActiveCfg = Release|x64
-		{9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Release|x64.Build.0 = Release|x64
-		{4605418D-2292-470A-AB18-C2119B016F71}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4605418D-2292-470A-AB18-C2119B016F71}.Debug|Win32.Build.0 = Debug|Win32
-		{4605418D-2292-470A-AB18-C2119B016F71}.Debug|x64.ActiveCfg = Debug|x64
-		{4605418D-2292-470A-AB18-C2119B016F71}.Debug|x64.Build.0 = Debug|x64
-		{4605418D-2292-470A-AB18-C2119B016F71}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{4605418D-2292-470A-AB18-C2119B016F71}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{4605418D-2292-470A-AB18-C2119B016F71}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{4605418D-2292-470A-AB18-C2119B016F71}.Release (static)|x64.Build.0 = Release (static)|x64
-		{4605418D-2292-470A-AB18-C2119B016F71}.Release|Win32.ActiveCfg = Release|Win32
-		{4605418D-2292-470A-AB18-C2119B016F71}.Release|Win32.Build.0 = Release|Win32
-		{4605418D-2292-470A-AB18-C2119B016F71}.Release|x64.ActiveCfg = Release|x64
-		{4605418D-2292-470A-AB18-C2119B016F71}.Release|x64.Build.0 = Release|x64
-		{05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Debug|Win32.Build.0 = Debug|Win32
-		{05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Debug|x64.ActiveCfg = Debug|x64
-		{05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Debug|x64.Build.0 = Debug|x64
-		{05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Release (static)|x64.Build.0 = Release (static)|x64
-		{05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Release|Win32.ActiveCfg = Release|Win32
-		{05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Release|Win32.Build.0 = Release|Win32
-		{05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Release|x64.ActiveCfg = Release|x64
-		{05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Release|x64.Build.0 = Release|x64
-		{6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Debug|Win32.Build.0 = Debug|Win32
-		{6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Debug|x64.ActiveCfg = Debug|x64
-		{6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Debug|x64.Build.0 = Debug|x64
-		{6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Release (static)|x64.Build.0 = Release (static)|x64
-		{6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Release|Win32.ActiveCfg = Release|Win32
-		{6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Release|Win32.Build.0 = Release|Win32
-		{6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Release|x64.ActiveCfg = Release|x64
-		{6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Release|x64.Build.0 = Release|x64
-		{1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Debug|Win32.Build.0 = Debug|Win32
-		{1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Debug|x64.ActiveCfg = Debug|x64
-		{1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Debug|x64.Build.0 = Debug|x64
-		{1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Release (static)|x64.Build.0 = Release (static)|x64
-		{1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Release|Win32.ActiveCfg = Release|Win32
-		{1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Release|Win32.Build.0 = Release|Win32
-		{1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Release|x64.ActiveCfg = Release|x64
-		{1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Release|x64.Build.0 = Release|x64
-		{053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Debug|Win32.ActiveCfg = Debug|Win32
-		{053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Debug|Win32.Build.0 = Debug|Win32
-		{053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Debug|x64.ActiveCfg = Debug|x64
-		{053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Debug|x64.Build.0 = Debug|x64
-		{053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Release (static)|x64.Build.0 = Release (static)|x64
-		{053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Release|Win32.ActiveCfg = Release|Win32
-		{053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Release|Win32.Build.0 = Release|Win32
-		{053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Release|x64.ActiveCfg = Release|x64
-		{053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Release|x64.Build.0 = Release|x64
-		{231C032C-DE16-459A-8E7D-6509C2EC3998}.Debug|Win32.ActiveCfg = Debug|Win32
-		{231C032C-DE16-459A-8E7D-6509C2EC3998}.Debug|Win32.Build.0 = Debug|Win32
-		{231C032C-DE16-459A-8E7D-6509C2EC3998}.Debug|x64.ActiveCfg = Debug|x64
-		{231C032C-DE16-459A-8E7D-6509C2EC3998}.Debug|x64.Build.0 = Debug|x64
-		{231C032C-DE16-459A-8E7D-6509C2EC3998}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{231C032C-DE16-459A-8E7D-6509C2EC3998}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{231C032C-DE16-459A-8E7D-6509C2EC3998}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{231C032C-DE16-459A-8E7D-6509C2EC3998}.Release (static)|x64.Build.0 = Release (static)|x64
-		{231C032C-DE16-459A-8E7D-6509C2EC3998}.Release|Win32.ActiveCfg = Release|Win32
-		{231C032C-DE16-459A-8E7D-6509C2EC3998}.Release|Win32.Build.0 = Release|Win32
-		{231C032C-DE16-459A-8E7D-6509C2EC3998}.Release|x64.ActiveCfg = Release|x64
-		{231C032C-DE16-459A-8E7D-6509C2EC3998}.Release|x64.Build.0 = Release|x64
-		{419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Debug|Win32.Build.0 = Debug|Win32
-		{419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Debug|x64.ActiveCfg = Debug|x64
-		{419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Debug|x64.Build.0 = Debug|x64
-		{419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Release (static)|x64.Build.0 = Release (static)|x64
-		{419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Release|Win32.ActiveCfg = Release|Win32
-		{419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Release|Win32.Build.0 = Release|Win32
-		{419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Release|x64.ActiveCfg = Release|x64
-		{419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Release|x64.Build.0 = Release|x64
-		{40639893-4D75-48CD-811F-4B363CC71FFA}.Debug|Win32.ActiveCfg = Debug|Win32
-		{40639893-4D75-48CD-811F-4B363CC71FFA}.Debug|Win32.Build.0 = Debug|Win32
-		{40639893-4D75-48CD-811F-4B363CC71FFA}.Debug|x64.ActiveCfg = Debug|x64
-		{40639893-4D75-48CD-811F-4B363CC71FFA}.Debug|x64.Build.0 = Debug|x64
-		{40639893-4D75-48CD-811F-4B363CC71FFA}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{40639893-4D75-48CD-811F-4B363CC71FFA}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{40639893-4D75-48CD-811F-4B363CC71FFA}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{40639893-4D75-48CD-811F-4B363CC71FFA}.Release (static)|x64.Build.0 = Release (static)|x64
-		{40639893-4D75-48CD-811F-4B363CC71FFA}.Release|Win32.ActiveCfg = Release|Win32
-		{40639893-4D75-48CD-811F-4B363CC71FFA}.Release|Win32.Build.0 = Release|Win32
-		{40639893-4D75-48CD-811F-4B363CC71FFA}.Release|x64.ActiveCfg = Release|x64
-		{40639893-4D75-48CD-811F-4B363CC71FFA}.Release|x64.Build.0 = Release|x64
-		{5FD733BF-B3C6-4A96-BED7-35E2484448E1}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5FD733BF-B3C6-4A96-BED7-35E2484448E1}.Debug|Win32.Build.0 = Debug|Win32
-		{5FD733BF-B3C6-4A96-BED7-35E2484448E1}.Debug|x64.ActiveCfg = Debug|Win32
-		{5FD733BF-B3C6-4A96-BED7-35E2484448E1}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{5FD733BF-B3C6-4A96-BED7-35E2484448E1}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{5FD733BF-B3C6-4A96-BED7-35E2484448E1}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{5FD733BF-B3C6-4A96-BED7-35E2484448E1}.Release (static)|x64.Build.0 = Release (static)|x64
-		{5FD733BF-B3C6-4A96-BED7-35E2484448E1}.Release|Win32.ActiveCfg = Release|Win32
-		{5FD733BF-B3C6-4A96-BED7-35E2484448E1}.Release|Win32.Build.0 = Release|Win32
-		{5FD733BF-B3C6-4A96-BED7-35E2484448E1}.Release|x64.ActiveCfg = Release|x64
-		{5FD733BF-B3C6-4A96-BED7-35E2484448E1}.Release|x64.Build.0 = Release|x64
-		{649C4168-1C65-4E41-818F-85A1C52C1B8F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{649C4168-1C65-4E41-818F-85A1C52C1B8F}.Debug|Win32.Build.0 = Debug|Win32
-		{649C4168-1C65-4E41-818F-85A1C52C1B8F}.Debug|x64.ActiveCfg = Debug|Win32
-		{649C4168-1C65-4E41-818F-85A1C52C1B8F}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{649C4168-1C65-4E41-818F-85A1C52C1B8F}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{649C4168-1C65-4E41-818F-85A1C52C1B8F}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{649C4168-1C65-4E41-818F-85A1C52C1B8F}.Release (static)|x64.Build.0 = Release (static)|x64
-		{649C4168-1C65-4E41-818F-85A1C52C1B8F}.Release|Win32.ActiveCfg = Release|Win32
-		{649C4168-1C65-4E41-818F-85A1C52C1B8F}.Release|Win32.Build.0 = Release|Win32
-		{649C4168-1C65-4E41-818F-85A1C52C1B8F}.Release|x64.ActiveCfg = Release|x64
-		{649C4168-1C65-4E41-818F-85A1C52C1B8F}.Release|x64.Build.0 = Release|x64
-		{C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}.Debug|Win32.Build.0 = Debug|Win32
-		{C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}.Debug|x64.ActiveCfg = Debug|Win32
-		{C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}.Release (static)|x64.Build.0 = Release (static)|x64
-		{C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}.Release|Win32.ActiveCfg = Release|Win32
-		{C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}.Release|Win32.Build.0 = Release|Win32
-		{C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}.Release|x64.ActiveCfg = Release|x64
-		{C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}.Release|x64.Build.0 = Release|x64
-		{44A18410-3AA8-4A64-935B-D20223AD6885}.Debug|Win32.ActiveCfg = Debug|Win32
-		{44A18410-3AA8-4A64-935B-D20223AD6885}.Debug|Win32.Build.0 = Debug|Win32
-		{44A18410-3AA8-4A64-935B-D20223AD6885}.Debug|x64.ActiveCfg = Debug|Win32
-		{44A18410-3AA8-4A64-935B-D20223AD6885}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{44A18410-3AA8-4A64-935B-D20223AD6885}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{44A18410-3AA8-4A64-935B-D20223AD6885}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{44A18410-3AA8-4A64-935B-D20223AD6885}.Release (static)|x64.Build.0 = Release (static)|x64
-		{44A18410-3AA8-4A64-935B-D20223AD6885}.Release|Win32.ActiveCfg = Release|Win32
-		{44A18410-3AA8-4A64-935B-D20223AD6885}.Release|Win32.Build.0 = Release|Win32
-		{44A18410-3AA8-4A64-935B-D20223AD6885}.Release|x64.ActiveCfg = Release|x64
-		{44A18410-3AA8-4A64-935B-D20223AD6885}.Release|x64.Build.0 = Release|x64
-		{B44CB3E0-F2FD-4260-A632-C01FB881613E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B44CB3E0-F2FD-4260-A632-C01FB881613E}.Debug|Win32.Build.0 = Debug|Win32
-		{B44CB3E0-F2FD-4260-A632-C01FB881613E}.Debug|x64.ActiveCfg = Debug|Win32
-		{B44CB3E0-F2FD-4260-A632-C01FB881613E}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{B44CB3E0-F2FD-4260-A632-C01FB881613E}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{B44CB3E0-F2FD-4260-A632-C01FB881613E}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{B44CB3E0-F2FD-4260-A632-C01FB881613E}.Release (static)|x64.Build.0 = Release (static)|x64
-		{B44CB3E0-F2FD-4260-A632-C01FB881613E}.Release|Win32.ActiveCfg = Release|Win32
-		{B44CB3E0-F2FD-4260-A632-C01FB881613E}.Release|Win32.Build.0 = Release|Win32
-		{B44CB3E0-F2FD-4260-A632-C01FB881613E}.Release|x64.ActiveCfg = Release|x64
-		{B44CB3E0-F2FD-4260-A632-C01FB881613E}.Release|x64.Build.0 = Release|x64
-		{F4A9881E-0EB0-44A1-9664-B6CBDE992861}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F4A9881E-0EB0-44A1-9664-B6CBDE992861}.Debug|Win32.Build.0 = Debug|Win32
-		{F4A9881E-0EB0-44A1-9664-B6CBDE992861}.Debug|x64.ActiveCfg = Debug|Win32
-		{F4A9881E-0EB0-44A1-9664-B6CBDE992861}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{F4A9881E-0EB0-44A1-9664-B6CBDE992861}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{F4A9881E-0EB0-44A1-9664-B6CBDE992861}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{F4A9881E-0EB0-44A1-9664-B6CBDE992861}.Release (static)|x64.Build.0 = Release (static)|x64
-		{F4A9881E-0EB0-44A1-9664-B6CBDE992861}.Release|Win32.ActiveCfg = Release|Win32
-		{F4A9881E-0EB0-44A1-9664-B6CBDE992861}.Release|Win32.Build.0 = Release|Win32
-		{F4A9881E-0EB0-44A1-9664-B6CBDE992861}.Release|x64.ActiveCfg = Release|x64
-		{F4A9881E-0EB0-44A1-9664-B6CBDE992861}.Release|x64.Build.0 = Release|x64
-		{66D3A191-E4D5-45F3-86BD-EFBB249CD554}.Debug|Win32.ActiveCfg = Debug|Win32
-		{66D3A191-E4D5-45F3-86BD-EFBB249CD554}.Debug|Win32.Build.0 = Debug|Win32
-		{66D3A191-E4D5-45F3-86BD-EFBB249CD554}.Debug|x64.ActiveCfg = Debug|Win32
-		{66D3A191-E4D5-45F3-86BD-EFBB249CD554}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{66D3A191-E4D5-45F3-86BD-EFBB249CD554}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{66D3A191-E4D5-45F3-86BD-EFBB249CD554}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{66D3A191-E4D5-45F3-86BD-EFBB249CD554}.Release (static)|x64.Build.0 = Release (static)|x64
-		{66D3A191-E4D5-45F3-86BD-EFBB249CD554}.Release|Win32.ActiveCfg = Release|Win32
-		{66D3A191-E4D5-45F3-86BD-EFBB249CD554}.Release|Win32.Build.0 = Release|Win32
-		{66D3A191-E4D5-45F3-86BD-EFBB249CD554}.Release|x64.ActiveCfg = Release|x64
-		{66D3A191-E4D5-45F3-86BD-EFBB249CD554}.Release|x64.Build.0 = Release|x64
-		{CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}.Debug|Win32.ActiveCfg = Debug|Win32
-		{CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}.Debug|Win32.Build.0 = Debug|Win32
-		{CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}.Debug|x64.ActiveCfg = Debug|Win32
-		{CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}.Release (static)|x64.Build.0 = Release (static)|x64
-		{CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}.Release|Win32.ActiveCfg = Release|Win32
-		{CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}.Release|Win32.Build.0 = Release|Win32
-		{CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}.Release|x64.ActiveCfg = Release|x64
-		{CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}.Release|x64.Build.0 = Release|x64
-		{D5B9558F-EF25-4167-ACE4-723C7413B390}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D5B9558F-EF25-4167-ACE4-723C7413B390}.Debug|Win32.Build.0 = Debug|Win32
-		{D5B9558F-EF25-4167-ACE4-723C7413B390}.Debug|x64.ActiveCfg = Debug|Win32
-		{D5B9558F-EF25-4167-ACE4-723C7413B390}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{D5B9558F-EF25-4167-ACE4-723C7413B390}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{D5B9558F-EF25-4167-ACE4-723C7413B390}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{D5B9558F-EF25-4167-ACE4-723C7413B390}.Release (static)|x64.Build.0 = Release (static)|x64
-		{D5B9558F-EF25-4167-ACE4-723C7413B390}.Release|Win32.ActiveCfg = Release|Win32
-		{D5B9558F-EF25-4167-ACE4-723C7413B390}.Release|Win32.Build.0 = Release|Win32
-		{D5B9558F-EF25-4167-ACE4-723C7413B390}.Release|x64.ActiveCfg = Release|x64
-		{D5B9558F-EF25-4167-ACE4-723C7413B390}.Release|x64.Build.0 = Release|x64
-		{155112B9-A8A9-4E06-90F5-4AAAB32B2F70}.Debug|Win32.ActiveCfg = Debug|Win32
-		{155112B9-A8A9-4E06-90F5-4AAAB32B2F70}.Debug|Win32.Build.0 = Debug|Win32
-		{155112B9-A8A9-4E06-90F5-4AAAB32B2F70}.Debug|x64.ActiveCfg = Debug|Win32
-		{155112B9-A8A9-4E06-90F5-4AAAB32B2F70}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{155112B9-A8A9-4E06-90F5-4AAAB32B2F70}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{155112B9-A8A9-4E06-90F5-4AAAB32B2F70}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{155112B9-A8A9-4E06-90F5-4AAAB32B2F70}.Release (static)|x64.Build.0 = Release (static)|x64
-		{155112B9-A8A9-4E06-90F5-4AAAB32B2F70}.Release|Win32.ActiveCfg = Release|Win32
-		{155112B9-A8A9-4E06-90F5-4AAAB32B2F70}.Release|Win32.Build.0 = Release|Win32
-		{155112B9-A8A9-4E06-90F5-4AAAB32B2F70}.Release|x64.ActiveCfg = Release|x64
-		{155112B9-A8A9-4E06-90F5-4AAAB32B2F70}.Release|x64.Build.0 = Release|x64
-		{178D81A7-F2FB-41D7-B300-9D1A4DE5E137}.Debug|Win32.ActiveCfg = Debug|Win32
-		{178D81A7-F2FB-41D7-B300-9D1A4DE5E137}.Debug|Win32.Build.0 = Debug|Win32
-		{178D81A7-F2FB-41D7-B300-9D1A4DE5E137}.Debug|x64.ActiveCfg = Debug|Win32
-		{178D81A7-F2FB-41D7-B300-9D1A4DE5E137}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{178D81A7-F2FB-41D7-B300-9D1A4DE5E137}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{178D81A7-F2FB-41D7-B300-9D1A4DE5E137}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{178D81A7-F2FB-41D7-B300-9D1A4DE5E137}.Release (static)|x64.Build.0 = Release (static)|x64
-		{178D81A7-F2FB-41D7-B300-9D1A4DE5E137}.Release|Win32.ActiveCfg = Release|Win32
-		{178D81A7-F2FB-41D7-B300-9D1A4DE5E137}.Release|Win32.Build.0 = Release|Win32
-		{178D81A7-F2FB-41D7-B300-9D1A4DE5E137}.Release|x64.ActiveCfg = Release|x64
-		{178D81A7-F2FB-41D7-B300-9D1A4DE5E137}.Release|x64.Build.0 = Release|x64
-		{7E30C3B1-AEE7-483D-B231-C672365CD2D7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7E30C3B1-AEE7-483D-B231-C672365CD2D7}.Debug|Win32.Build.0 = Debug|Win32
-		{7E30C3B1-AEE7-483D-B231-C672365CD2D7}.Debug|x64.ActiveCfg = Debug|Win32
-		{7E30C3B1-AEE7-483D-B231-C672365CD2D7}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{7E30C3B1-AEE7-483D-B231-C672365CD2D7}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{7E30C3B1-AEE7-483D-B231-C672365CD2D7}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{7E30C3B1-AEE7-483D-B231-C672365CD2D7}.Release (static)|x64.Build.0 = Release (static)|x64
-		{7E30C3B1-AEE7-483D-B231-C672365CD2D7}.Release|Win32.ActiveCfg = Release|Win32
-		{7E30C3B1-AEE7-483D-B231-C672365CD2D7}.Release|Win32.Build.0 = Release|Win32
-		{7E30C3B1-AEE7-483D-B231-C672365CD2D7}.Release|x64.ActiveCfg = Release|x64
-		{7E30C3B1-AEE7-483D-B231-C672365CD2D7}.Release|x64.Build.0 = Release|x64
-		{2E26DB8B-9E37-4072-B397-8A7086E0ACD0}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2E26DB8B-9E37-4072-B397-8A7086E0ACD0}.Debug|Win32.Build.0 = Debug|Win32
-		{2E26DB8B-9E37-4072-B397-8A7086E0ACD0}.Debug|x64.ActiveCfg = Debug|Win32
-		{2E26DB8B-9E37-4072-B397-8A7086E0ACD0}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{2E26DB8B-9E37-4072-B397-8A7086E0ACD0}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{2E26DB8B-9E37-4072-B397-8A7086E0ACD0}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{2E26DB8B-9E37-4072-B397-8A7086E0ACD0}.Release (static)|x64.Build.0 = Release (static)|x64
-		{2E26DB8B-9E37-4072-B397-8A7086E0ACD0}.Release|Win32.ActiveCfg = Release|Win32
-		{2E26DB8B-9E37-4072-B397-8A7086E0ACD0}.Release|Win32.Build.0 = Release|Win32
-		{2E26DB8B-9E37-4072-B397-8A7086E0ACD0}.Release|x64.ActiveCfg = Release|x64
-		{2E26DB8B-9E37-4072-B397-8A7086E0ACD0}.Release|x64.Build.0 = Release|x64
-		{2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}.Debug|Win32.Build.0 = Debug|Win32
-		{2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}.Debug|x64.ActiveCfg = Debug|Win32
-		{2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}.Release (static)|x64.Build.0 = Release (static)|x64
-		{2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}.Release|Win32.ActiveCfg = Release|Win32
-		{2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}.Release|Win32.Build.0 = Release|Win32
-		{2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}.Release|x64.ActiveCfg = Release|x64
-		{2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}.Release|x64.Build.0 = Release|x64
-		{2CEB1965-A89C-4422-A9AC-B30FCE7913C3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2CEB1965-A89C-4422-A9AC-B30FCE7913C3}.Debug|Win32.Build.0 = Debug|Win32
-		{2CEB1965-A89C-4422-A9AC-B30FCE7913C3}.Debug|x64.ActiveCfg = Debug|Win32
-		{2CEB1965-A89C-4422-A9AC-B30FCE7913C3}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{2CEB1965-A89C-4422-A9AC-B30FCE7913C3}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{2CEB1965-A89C-4422-A9AC-B30FCE7913C3}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{2CEB1965-A89C-4422-A9AC-B30FCE7913C3}.Release (static)|x64.Build.0 = Release (static)|x64
-		{2CEB1965-A89C-4422-A9AC-B30FCE7913C3}.Release|Win32.ActiveCfg = Release|Win32
-		{2CEB1965-A89C-4422-A9AC-B30FCE7913C3}.Release|Win32.Build.0 = Release|Win32
-		{2CEB1965-A89C-4422-A9AC-B30FCE7913C3}.Release|x64.ActiveCfg = Release|x64
-		{2CEB1965-A89C-4422-A9AC-B30FCE7913C3}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/vc2005/QuakeForge-VS8.sln b/vc2005/QuakeForge-VS8.sln
deleted file mode 100644
index de80d166d..000000000
--- a/vc2005/QuakeForge-VS8.sln
+++ /dev/null
@@ -1,966 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qw-client", "qfclient\qfclient.vcproj", "{9A942925-61E6-4975-935A-5D62E8248E64}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qw", "qw\qw.vcproj", "{6ADA4322-693A-46BB-897B-17BB5BE9F08C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "net-chan", "net\net.vcproj", "{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ruamoko", "ruamoko\ruamoko.vcproj", "{51028ACF-53D4-4478-8500-55E6B8A81375}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "models-gl", "modelsgl\modelsgl.vcproj", "{1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "console", "console\console.vcproj", "{ED4AFBF5-C247-4352-966D-048B8998C6A1}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gib", "gib\gib.vcproj", "{01C3B138-9D45-4ED6-A763-893C067262C2}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "util", "util\util.vcproj", "{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "engine", "engine\engine.vcproj", "{2626C0E1-6F5C-47D3-B80D-93942D766DD7}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "builtins", "builtins\builtins.vcproj", "{04FA9D77-E45F-4917-B972-B353BA6A6FA8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sound", "sound\sound.vcproj", "{BF149D97-7520-4788-9CD1-3D99C5C8150F}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "image", "image\image.vcproj", "{5203F034-0047-4EC0-B7E9-D037FAF5D536}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "video", "video\video.vcproj", "{E7B3D07D-2FE8-481B-8DAB-6255A412A42F}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qw-common", "common\common.vcproj", "{BC1F021A-1EEC-4A7A-B746-5AA6048E478C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qw-server", "qfserver\qfserver.vcproj", "{544D097C-9C24-4C57-A171-8C8029421185}"
-	ProjectSection(ProjectDependencies) = postProject
-		{6ADA4322-693A-46BB-897B-17BB5BE9F08C} = {6ADA4322-693A-46BB-897B-17BB5BE9F08C}
-		{B37FE734-01F4-4799-86B2-D084820715BE} = {B37FE734-01F4-4799-86B2-D084820715BE}
-		{BC1F021A-1EEC-4A7A-B746-5AA6048E478C} = {BC1F021A-1EEC-4A7A-B746-5AA6048E478C}
-		{DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A} = {DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}
-		{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} = {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1}
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7}
-		{51028ACF-53D4-4478-8500-55E6B8A81375} = {51028ACF-53D4-4478-8500-55E6B8A81375}
-		{04FA9D77-E45F-4917-B972-B353BA6A6FA8} = {04FA9D77-E45F-4917-B972-B353BA6A6FA8}
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}
-		{01C3B138-9D45-4ED6-A763-893C067262C2} = {01C3B138-9D45-4ED6-A763-893C067262C2}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "models", "models\models.vcproj", "{DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "console-client", "console_client\console_client.vcproj", "{226D42CE-5833-444E-94FA-84C1D51892A8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "console-server", "console_server\console_server.vcproj", "{B37FE734-01F4-4799-86B2-D084820715BE}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qfbsp", "qfbsp\qfbsp.vcproj", "{B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}"
-	ProjectSection(ProjectDependencies) = postProject
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qflight", "qflight\qflight.vcproj", "{5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}"
-	ProjectSection(ProjectDependencies) = postProject
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qfvis", "qfvis\qfvis.vcproj", "{E5D842C5-669F-4FC7-A5E0-44B562F86435}"
-	ProjectSection(ProjectDependencies) = postProject
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qw-master", "qw-master\qw-master.vcproj", "{445A2500-3BBC-449A-A929-C419C2A16051}"
-	ProjectSection(ProjectDependencies) = postProject
-		{B37FE734-01F4-4799-86B2-D084820715BE} = {B37FE734-01F4-4799-86B2-D084820715BE}
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1}
-		{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} = {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qfmodelgen", "qfmodelgen\qfmodelgen.vcproj", "{052C34FE-C9E2-43ED-95DA-FB3F27B44E37}"
-	ProjectSection(ProjectDependencies) = postProject
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qfprogs", "qfprogs\qfprogs.vcproj", "{5FA27C8E-51B1-445A-A375-FBE74F0984B1}"
-	ProjectSection(ProjectDependencies) = postProject
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qfwavinfo", "qfwavinfo\qfwavinfo.vcproj", "{56BD559B-1590-4FC4-B441-AB1973BAC2BD}"
-	ProjectSection(ProjectDependencies) = postProject
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wad", "wad\wad.vcproj", "{88422448-C5FB-46F3-A0B3-0811F90E537C}"
-	ProjectSection(ProjectDependencies) = postProject
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}
-		{5203F034-0047-4EC0-B7E9-D037FAF5D536} = {5203F034-0047-4EC0-B7E9-D037FAF5D536}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pak", "pak\pak.vcproj", "{9EE8BD4B-47D3-4AD5-A8B9-831329792A05}"
-	ProjectSection(ProjectDependencies) = postProject
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bsp2img", "bsp2img\bsp2img.vcproj", "{4605418D-2292-470A-AB18-C2119B016F71}"
-	ProjectSection(ProjectDependencies) = postProject
-		{5203F034-0047-4EC0-B7E9-D037FAF5D536} = {5203F034-0047-4EC0-B7E9-D037FAF5D536}
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qtv", "qtv\qtv.vcproj", "{05E68E3B-5901-43A9-981D-CF392C0F5C6C}"
-	ProjectSection(ProjectDependencies) = postProject
-		{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} = {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}
-		{B37FE734-01F4-4799-86B2-D084820715BE} = {B37FE734-01F4-4799-86B2-D084820715BE}
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1}
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}
-		{6ADA4322-693A-46BB-897B-17BB5BE9F08C} = {6ADA4322-693A-46BB-897B-17BB5BE9F08C}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nq-common", "nq-common\nq-common.vcproj", "{6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nq-wgl", "nq-wgl\nq-wgl.vcproj", "{1CD1A18B-95D5-4EA4-917C-34B10066BFCC}"
-	ProjectSection(ProjectDependencies) = postProject
-		{B37FE734-01F4-4799-86B2-D084820715BE} = {B37FE734-01F4-4799-86B2-D084820715BE}
-		{178D81A7-F2FB-41D7-B300-9D1A4DE5E137} = {178D81A7-F2FB-41D7-B300-9D1A4DE5E137}
-		{155112B9-A8A9-4E06-90F5-4AAAB32B2F70} = {155112B9-A8A9-4E06-90F5-4AAAB32B2F70}
-		{C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F} = {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7}
-		{5203F034-0047-4EC0-B7E9-D037FAF5D536} = {5203F034-0047-4EC0-B7E9-D037FAF5D536}
-		{01C3B138-9D45-4ED6-A763-893C067262C2} = {01C3B138-9D45-4ED6-A763-893C067262C2}
-		{6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80} = {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}
-		{04FA9D77-E45F-4917-B972-B353BA6A6FA8} = {04FA9D77-E45F-4917-B972-B353BA6A6FA8}
-		{E7B3D07D-2FE8-481B-8DAB-6255A412A42F} = {E7B3D07D-2FE8-481B-8DAB-6255A412A42F}
-		{BF149D97-7520-4788-9CD1-3D99C5C8150F} = {BF149D97-7520-4788-9CD1-3D99C5C8150F}
-		{226D42CE-5833-444E-94FA-84C1D51892A8} = {226D42CE-5833-444E-94FA-84C1D51892A8}
-		{51028ACF-53D4-4478-8500-55E6B8A81375} = {51028ACF-53D4-4478-8500-55E6B8A81375}
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1}
-		{053E1EE2-75B4-4D9A-B8AE-89600BCB60A5} = {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}
-		{1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7} = {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "net-main", "net-main\net-main.vcproj", "{053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nq-server", "nq-server\nq-server.vcproj", "{231C032C-DE16-459A-8E7D-6509C2EC3998}"
-	ProjectSection(ProjectDependencies) = postProject
-		{B37FE734-01F4-4799-86B2-D084820715BE} = {B37FE734-01F4-4799-86B2-D084820715BE}
-		{01C3B138-9D45-4ED6-A763-893C067262C2} = {01C3B138-9D45-4ED6-A763-893C067262C2}
-		{6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80} = {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}
-		{04FA9D77-E45F-4917-B972-B353BA6A6FA8} = {04FA9D77-E45F-4917-B972-B353BA6A6FA8}
-		{51028ACF-53D4-4478-8500-55E6B8A81375} = {51028ACF-53D4-4478-8500-55E6B8A81375}
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7}
-		{053E1EE2-75B4-4D9A-B8AE-89600BCB60A5} = {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1}
-		{DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A} = {DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hw-master", "hw-master\hw-master.vcproj", "{419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}"
-	ProjectSection(ProjectDependencies) = postProject
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1}
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}
-		{B37FE734-01F4-4799-86B2-D084820715BE} = {B37FE734-01F4-4799-86B2-D084820715BE}
-		{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} = {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{3CDA2798-7565-47C5-B972-F9E63DBEFFFA}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qfcc", "qfcc\qfcc.vcproj", "{40639893-4D75-48CD-811F-4B363CC71FFA}"
-	ProjectSection(ProjectDependencies) = postProject
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7}
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qw-client-wgl", "qw-client-wgl\qw-client-wgl.vcproj", "{5FD733BF-B3C6-4A96-BED7-35E2484448E1}"
-	ProjectSection(ProjectDependencies) = postProject
-		{04FA9D77-E45F-4917-B972-B353BA6A6FA8} = {04FA9D77-E45F-4917-B972-B353BA6A6FA8}
-		{226D42CE-5833-444E-94FA-84C1D51892A8} = {226D42CE-5833-444E-94FA-84C1D51892A8}
-		{1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7} = {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7}
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1}
-		{51028ACF-53D4-4478-8500-55E6B8A81375} = {51028ACF-53D4-4478-8500-55E6B8A81375}
-		{BF149D97-7520-4788-9CD1-3D99C5C8150F} = {BF149D97-7520-4788-9CD1-3D99C5C8150F}
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}
-		{E7B3D07D-2FE8-481B-8DAB-6255A412A42F} = {E7B3D07D-2FE8-481B-8DAB-6255A412A42F}
-		{9A942925-61E6-4975-935A-5D62E8248E64} = {9A942925-61E6-4975-935A-5D62E8248E64}
-		{6ADA4322-693A-46BB-897B-17BB5BE9F08C} = {6ADA4322-693A-46BB-897B-17BB5BE9F08C}
-		{BC1F021A-1EEC-4A7A-B746-5AA6048E478C} = {BC1F021A-1EEC-4A7A-B746-5AA6048E478C}
-		{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} = {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}
-		{C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F} = {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}
-		{5203F034-0047-4EC0-B7E9-D037FAF5D536} = {5203F034-0047-4EC0-B7E9-D037FAF5D536}
-		{178D81A7-F2FB-41D7-B300-9D1A4DE5E137} = {178D81A7-F2FB-41D7-B300-9D1A4DE5E137}
-		{01C3B138-9D45-4ED6-A763-893C067262C2} = {01C3B138-9D45-4ED6-A763-893C067262C2}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qw-client-sgl", "qw-client-sgl\qw-client-sgl.vcproj", "{649C4168-1C65-4E41-818F-85A1C52C1B8F}"
-	ProjectSection(ProjectDependencies) = postProject
-		{5203F034-0047-4EC0-B7E9-D037FAF5D536} = {5203F034-0047-4EC0-B7E9-D037FAF5D536}
-		{01C3B138-9D45-4ED6-A763-893C067262C2} = {01C3B138-9D45-4ED6-A763-893C067262C2}
-		{04FA9D77-E45F-4917-B972-B353BA6A6FA8} = {04FA9D77-E45F-4917-B972-B353BA6A6FA8}
-		{E7B3D07D-2FE8-481B-8DAB-6255A412A42F} = {E7B3D07D-2FE8-481B-8DAB-6255A412A42F}
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}
-		{BF149D97-7520-4788-9CD1-3D99C5C8150F} = {BF149D97-7520-4788-9CD1-3D99C5C8150F}
-		{226D42CE-5833-444E-94FA-84C1D51892A8} = {226D42CE-5833-444E-94FA-84C1D51892A8}
-		{51028ACF-53D4-4478-8500-55E6B8A81375} = {51028ACF-53D4-4478-8500-55E6B8A81375}
-		{BC1F021A-1EEC-4A7A-B746-5AA6048E478C} = {BC1F021A-1EEC-4A7A-B746-5AA6048E478C}
-		{9A942925-61E6-4975-935A-5D62E8248E64} = {9A942925-61E6-4975-935A-5D62E8248E64}
-		{6ADA4322-693A-46BB-897B-17BB5BE9F08C} = {6ADA4322-693A-46BB-897B-17BB5BE9F08C}
-		{1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7} = {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7}
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1}
-		{C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F} = {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}
-		{44A18410-3AA8-4A64-935B-D20223AD6885} = {44A18410-3AA8-4A64-935B-D20223AD6885}
-		{7E30C3B1-AEE7-483D-B231-C672365CD2D7} = {7E30C3B1-AEE7-483D-B231-C672365CD2D7}
-		{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} = {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "video-gl", "videogl\videogl.vcproj", "{C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "video-sdl", "video-sdl\video-sdl.vcproj", "{44A18410-3AA8-4A64-935B-D20223AD6885}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qw-client-sdl", "qw-client-sdl\qw-client-sdl.vcproj", "{B44CB3E0-F2FD-4260-A632-C01FB881613E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{66D3A191-E4D5-45F3-86BD-EFBB249CD554} = {66D3A191-E4D5-45F3-86BD-EFBB249CD554}
-		{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} = {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}
-		{44A18410-3AA8-4A64-935B-D20223AD6885} = {44A18410-3AA8-4A64-935B-D20223AD6885}
-		{BC1F021A-1EEC-4A7A-B746-5AA6048E478C} = {BC1F021A-1EEC-4A7A-B746-5AA6048E478C}
-		{6ADA4322-693A-46BB-897B-17BB5BE9F08C} = {6ADA4322-693A-46BB-897B-17BB5BE9F08C}
-		{9A942925-61E6-4975-935A-5D62E8248E64} = {9A942925-61E6-4975-935A-5D62E8248E64}
-		{5203F034-0047-4EC0-B7E9-D037FAF5D536} = {5203F034-0047-4EC0-B7E9-D037FAF5D536}
-		{01C3B138-9D45-4ED6-A763-893C067262C2} = {01C3B138-9D45-4ED6-A763-893C067262C2}
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}
-		{04FA9D77-E45F-4917-B972-B353BA6A6FA8} = {04FA9D77-E45F-4917-B972-B353BA6A6FA8}
-		{E7B3D07D-2FE8-481B-8DAB-6255A412A42F} = {E7B3D07D-2FE8-481B-8DAB-6255A412A42F}
-		{BF149D97-7520-4788-9CD1-3D99C5C8150F} = {BF149D97-7520-4788-9CD1-3D99C5C8150F}
-		{226D42CE-5833-444E-94FA-84C1D51892A8} = {226D42CE-5833-444E-94FA-84C1D51892A8}
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7}
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1}
-		{51028ACF-53D4-4478-8500-55E6B8A81375} = {51028ACF-53D4-4478-8500-55E6B8A81375}
-		{F4A9881E-0EB0-44A1-9664-B6CBDE992861} = {F4A9881E-0EB0-44A1-9664-B6CBDE992861}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "models-sw", "models-sw\models-sw.vcproj", "{F4A9881E-0EB0-44A1-9664-B6CBDE992861}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "video-sw", "video-sw\video-sw.vcproj", "{66D3A191-E4D5-45F3-86BD-EFBB249CD554}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qw-client-sdl32", "qw-client-sdl32\qw-client-sdl32.vcproj", "{CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}"
-	ProjectSection(ProjectDependencies) = postProject
-		{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} = {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}
-		{44A18410-3AA8-4A64-935B-D20223AD6885} = {44A18410-3AA8-4A64-935B-D20223AD6885}
-		{BC1F021A-1EEC-4A7A-B746-5AA6048E478C} = {BC1F021A-1EEC-4A7A-B746-5AA6048E478C}
-		{F4A9881E-0EB0-44A1-9664-B6CBDE992861} = {F4A9881E-0EB0-44A1-9664-B6CBDE992861}
-		{6ADA4322-693A-46BB-897B-17BB5BE9F08C} = {6ADA4322-693A-46BB-897B-17BB5BE9F08C}
-		{9A942925-61E6-4975-935A-5D62E8248E64} = {9A942925-61E6-4975-935A-5D62E8248E64}
-		{5203F034-0047-4EC0-B7E9-D037FAF5D536} = {5203F034-0047-4EC0-B7E9-D037FAF5D536}
-		{01C3B138-9D45-4ED6-A763-893C067262C2} = {01C3B138-9D45-4ED6-A763-893C067262C2}
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}
-		{04FA9D77-E45F-4917-B972-B353BA6A6FA8} = {04FA9D77-E45F-4917-B972-B353BA6A6FA8}
-		{E7B3D07D-2FE8-481B-8DAB-6255A412A42F} = {E7B3D07D-2FE8-481B-8DAB-6255A412A42F}
-		{D5B9558F-EF25-4167-ACE4-723C7413B390} = {D5B9558F-EF25-4167-ACE4-723C7413B390}
-		{BF149D97-7520-4788-9CD1-3D99C5C8150F} = {BF149D97-7520-4788-9CD1-3D99C5C8150F}
-		{226D42CE-5833-444E-94FA-84C1D51892A8} = {226D42CE-5833-444E-94FA-84C1D51892A8}
-		{51028ACF-53D4-4478-8500-55E6B8A81375} = {51028ACF-53D4-4478-8500-55E6B8A81375}
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7}
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "video-sw32", "video-sw32\video-sw32.vcproj", "{D5B9558F-EF25-4167-ACE4-723C7413B390}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nq", "nq\nq.vcproj", "{155112B9-A8A9-4E06-90F5-4AAAB32B2F70}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "video-wgl", "video-wgl\video-wgl.vcproj", "{178D81A7-F2FB-41D7-B300-9D1A4DE5E137}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "video-sgl", "video-sgl\video-sgl.vcproj", "{7E30C3B1-AEE7-483D-B231-C672365CD2D7}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nq-sgl", "nq-sgl\nq-sgl.vcproj", "{2E26DB8B-9E37-4072-B397-8A7086E0ACD0}"
-	ProjectSection(ProjectDependencies) = postProject
-		{B37FE734-01F4-4799-86B2-D084820715BE} = {B37FE734-01F4-4799-86B2-D084820715BE}
-		{5203F034-0047-4EC0-B7E9-D037FAF5D536} = {5203F034-0047-4EC0-B7E9-D037FAF5D536}
-		{01C3B138-9D45-4ED6-A763-893C067262C2} = {01C3B138-9D45-4ED6-A763-893C067262C2}
-		{6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80} = {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}
-		{04FA9D77-E45F-4917-B972-B353BA6A6FA8} = {04FA9D77-E45F-4917-B972-B353BA6A6FA8}
-		{7E30C3B1-AEE7-483D-B231-C672365CD2D7} = {7E30C3B1-AEE7-483D-B231-C672365CD2D7}
-		{44A18410-3AA8-4A64-935B-D20223AD6885} = {44A18410-3AA8-4A64-935B-D20223AD6885}
-		{155112B9-A8A9-4E06-90F5-4AAAB32B2F70} = {155112B9-A8A9-4E06-90F5-4AAAB32B2F70}
-		{C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F} = {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}
-		{E7B3D07D-2FE8-481B-8DAB-6255A412A42F} = {E7B3D07D-2FE8-481B-8DAB-6255A412A42F}
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}
-		{BF149D97-7520-4788-9CD1-3D99C5C8150F} = {BF149D97-7520-4788-9CD1-3D99C5C8150F}
-		{51028ACF-53D4-4478-8500-55E6B8A81375} = {51028ACF-53D4-4478-8500-55E6B8A81375}
-		{226D42CE-5833-444E-94FA-84C1D51892A8} = {226D42CE-5833-444E-94FA-84C1D51892A8}
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7}
-		{053E1EE2-75B4-4D9A-B8AE-89600BCB60A5} = {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1}
-		{1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7} = {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nq-sdl", "nq-sdl\nq-sdl.vcproj", "{2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1}
-		{053E1EE2-75B4-4D9A-B8AE-89600BCB60A5} = {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7}
-		{51028ACF-53D4-4478-8500-55E6B8A81375} = {51028ACF-53D4-4478-8500-55E6B8A81375}
-		{226D42CE-5833-444E-94FA-84C1D51892A8} = {226D42CE-5833-444E-94FA-84C1D51892A8}
-		{155112B9-A8A9-4E06-90F5-4AAAB32B2F70} = {155112B9-A8A9-4E06-90F5-4AAAB32B2F70}
-		{BF149D97-7520-4788-9CD1-3D99C5C8150F} = {BF149D97-7520-4788-9CD1-3D99C5C8150F}
-		{66D3A191-E4D5-45F3-86BD-EFBB249CD554} = {66D3A191-E4D5-45F3-86BD-EFBB249CD554}
-		{E7B3D07D-2FE8-481B-8DAB-6255A412A42F} = {E7B3D07D-2FE8-481B-8DAB-6255A412A42F}
-		{04FA9D77-E45F-4917-B972-B353BA6A6FA8} = {04FA9D77-E45F-4917-B972-B353BA6A6FA8}
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}
-		{6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80} = {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}
-		{01C3B138-9D45-4ED6-A763-893C067262C2} = {01C3B138-9D45-4ED6-A763-893C067262C2}
-		{5203F034-0047-4EC0-B7E9-D037FAF5D536} = {5203F034-0047-4EC0-B7E9-D037FAF5D536}
-		{B37FE734-01F4-4799-86B2-D084820715BE} = {B37FE734-01F4-4799-86B2-D084820715BE}
-		{F4A9881E-0EB0-44A1-9664-B6CBDE992861} = {F4A9881E-0EB0-44A1-9664-B6CBDE992861}
-		{44A18410-3AA8-4A64-935B-D20223AD6885} = {44A18410-3AA8-4A64-935B-D20223AD6885}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nq-sdl32", "nq-sdl32\nq-sdl32.vcproj", "{2CEB1965-A89C-4422-A9AC-B30FCE7913C3}"
-	ProjectSection(ProjectDependencies) = postProject
-		{44A18410-3AA8-4A64-935B-D20223AD6885} = {44A18410-3AA8-4A64-935B-D20223AD6885}
-		{F4A9881E-0EB0-44A1-9664-B6CBDE992861} = {F4A9881E-0EB0-44A1-9664-B6CBDE992861}
-		{B37FE734-01F4-4799-86B2-D084820715BE} = {B37FE734-01F4-4799-86B2-D084820715BE}
-		{5203F034-0047-4EC0-B7E9-D037FAF5D536} = {5203F034-0047-4EC0-B7E9-D037FAF5D536}
-		{01C3B138-9D45-4ED6-A763-893C067262C2} = {01C3B138-9D45-4ED6-A763-893C067262C2}
-		{6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80} = {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}
-		{04FA9D77-E45F-4917-B972-B353BA6A6FA8} = {04FA9D77-E45F-4917-B972-B353BA6A6FA8}
-		{E7B3D07D-2FE8-481B-8DAB-6255A412A42F} = {E7B3D07D-2FE8-481B-8DAB-6255A412A42F}
-		{D5B9558F-EF25-4167-ACE4-723C7413B390} = {D5B9558F-EF25-4167-ACE4-723C7413B390}
-		{BF149D97-7520-4788-9CD1-3D99C5C8150F} = {BF149D97-7520-4788-9CD1-3D99C5C8150F}
-		{155112B9-A8A9-4E06-90F5-4AAAB32B2F70} = {155112B9-A8A9-4E06-90F5-4AAAB32B2F70}
-		{226D42CE-5833-444E-94FA-84C1D51892A8} = {226D42CE-5833-444E-94FA-84C1D51892A8}
-		{51028ACF-53D4-4478-8500-55E6B8A81375} = {51028ACF-53D4-4478-8500-55E6B8A81375}
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7}
-		{053E1EE2-75B4-4D9A-B8AE-89600BCB60A5} = {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1}
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release (static)|Win32 = Release (static)|Win32
-		Release (static)|x64 = Release (static)|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{9A942925-61E6-4975-935A-5D62E8248E64}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9A942925-61E6-4975-935A-5D62E8248E64}.Debug|Win32.Build.0 = Debug|Win32
-		{9A942925-61E6-4975-935A-5D62E8248E64}.Debug|x64.ActiveCfg = Debug|x64
-		{9A942925-61E6-4975-935A-5D62E8248E64}.Debug|x64.Build.0 = Debug|x64
-		{9A942925-61E6-4975-935A-5D62E8248E64}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{9A942925-61E6-4975-935A-5D62E8248E64}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{9A942925-61E6-4975-935A-5D62E8248E64}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{9A942925-61E6-4975-935A-5D62E8248E64}.Release (static)|x64.Build.0 = Release (static)|x64
-		{9A942925-61E6-4975-935A-5D62E8248E64}.Release|Win32.ActiveCfg = Release|Win32
-		{9A942925-61E6-4975-935A-5D62E8248E64}.Release|Win32.Build.0 = Release|Win32
-		{9A942925-61E6-4975-935A-5D62E8248E64}.Release|x64.ActiveCfg = Release|x64
-		{9A942925-61E6-4975-935A-5D62E8248E64}.Release|x64.Build.0 = Release|x64
-		{6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Debug|Win32.Build.0 = Debug|Win32
-		{6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Debug|x64.ActiveCfg = Debug|x64
-		{6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Debug|x64.Build.0 = Debug|x64
-		{6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Release (static)|x64.Build.0 = Release (static)|x64
-		{6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Release|Win32.ActiveCfg = Release|Win32
-		{6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Release|Win32.Build.0 = Release|Win32
-		{6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Release|x64.ActiveCfg = Release|x64
-		{6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Release|x64.Build.0 = Release|x64
-		{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Debug|Win32.Build.0 = Debug|Win32
-		{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Debug|x64.ActiveCfg = Debug|x64
-		{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Debug|x64.Build.0 = Debug|x64
-		{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Release (static)|x64.Build.0 = Release (static)|x64
-		{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Release|Win32.ActiveCfg = Release|Win32
-		{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Release|Win32.Build.0 = Release|Win32
-		{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Release|x64.ActiveCfg = Release|x64
-		{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Release|x64.Build.0 = Release|x64
-		{51028ACF-53D4-4478-8500-55E6B8A81375}.Debug|Win32.ActiveCfg = Debug|Win32
-		{51028ACF-53D4-4478-8500-55E6B8A81375}.Debug|Win32.Build.0 = Debug|Win32
-		{51028ACF-53D4-4478-8500-55E6B8A81375}.Debug|x64.ActiveCfg = Debug|x64
-		{51028ACF-53D4-4478-8500-55E6B8A81375}.Debug|x64.Build.0 = Debug|x64
-		{51028ACF-53D4-4478-8500-55E6B8A81375}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{51028ACF-53D4-4478-8500-55E6B8A81375}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{51028ACF-53D4-4478-8500-55E6B8A81375}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{51028ACF-53D4-4478-8500-55E6B8A81375}.Release (static)|x64.Build.0 = Release (static)|x64
-		{51028ACF-53D4-4478-8500-55E6B8A81375}.Release|Win32.ActiveCfg = Release|Win32
-		{51028ACF-53D4-4478-8500-55E6B8A81375}.Release|Win32.Build.0 = Release|Win32
-		{51028ACF-53D4-4478-8500-55E6B8A81375}.Release|x64.ActiveCfg = Release|x64
-		{51028ACF-53D4-4478-8500-55E6B8A81375}.Release|x64.Build.0 = Release|x64
-		{1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Debug|Win32.Build.0 = Debug|Win32
-		{1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Debug|x64.ActiveCfg = Debug|x64
-		{1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Debug|x64.Build.0 = Debug|x64
-		{1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Release (static)|x64.Build.0 = Release (static)|x64
-		{1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Release|Win32.ActiveCfg = Release|Win32
-		{1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Release|Win32.Build.0 = Release|Win32
-		{1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Release|x64.ActiveCfg = Release|x64
-		{1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Release|x64.Build.0 = Release|x64
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1}.Debug|Win32.ActiveCfg = Debug|Win32
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1}.Debug|Win32.Build.0 = Debug|Win32
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1}.Debug|x64.ActiveCfg = Debug|x64
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1}.Debug|x64.Build.0 = Debug|x64
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1}.Release (static)|x64.Build.0 = Release (static)|x64
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1}.Release|Win32.ActiveCfg = Release|Win32
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1}.Release|Win32.Build.0 = Release|Win32
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1}.Release|x64.ActiveCfg = Release|x64
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1}.Release|x64.Build.0 = Release|x64
-		{01C3B138-9D45-4ED6-A763-893C067262C2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{01C3B138-9D45-4ED6-A763-893C067262C2}.Debug|Win32.Build.0 = Debug|Win32
-		{01C3B138-9D45-4ED6-A763-893C067262C2}.Debug|x64.ActiveCfg = Debug|x64
-		{01C3B138-9D45-4ED6-A763-893C067262C2}.Debug|x64.Build.0 = Debug|x64
-		{01C3B138-9D45-4ED6-A763-893C067262C2}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{01C3B138-9D45-4ED6-A763-893C067262C2}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{01C3B138-9D45-4ED6-A763-893C067262C2}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{01C3B138-9D45-4ED6-A763-893C067262C2}.Release (static)|x64.Build.0 = Release (static)|x64
-		{01C3B138-9D45-4ED6-A763-893C067262C2}.Release|Win32.ActiveCfg = Release|Win32
-		{01C3B138-9D45-4ED6-A763-893C067262C2}.Release|Win32.Build.0 = Release|Win32
-		{01C3B138-9D45-4ED6-A763-893C067262C2}.Release|x64.ActiveCfg = Release|x64
-		{01C3B138-9D45-4ED6-A763-893C067262C2}.Release|x64.Build.0 = Release|x64
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Debug|Win32.ActiveCfg = Debug|Win32
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Debug|Win32.Build.0 = Debug|Win32
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Debug|x64.ActiveCfg = Debug|x64
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Debug|x64.Build.0 = Debug|x64
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Release (static)|x64.Build.0 = Release (static)|x64
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Release|Win32.ActiveCfg = Release|Win32
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Release|Win32.Build.0 = Release|Win32
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Release|x64.ActiveCfg = Release|x64
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Release|x64.Build.0 = Release|x64
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Debug|Win32.Build.0 = Debug|Win32
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Debug|x64.ActiveCfg = Debug|x64
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Debug|x64.Build.0 = Debug|x64
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Release (static)|x64.Build.0 = Release (static)|x64
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Release|Win32.ActiveCfg = Release|Win32
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Release|Win32.Build.0 = Release|Win32
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Release|x64.ActiveCfg = Release|x64
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Release|x64.Build.0 = Release|x64
-		{04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Debug|Win32.Build.0 = Debug|Win32
-		{04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Debug|x64.ActiveCfg = Debug|x64
-		{04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Debug|x64.Build.0 = Debug|x64
-		{04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Release (static)|x64.Build.0 = Release (static)|x64
-		{04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Release|Win32.ActiveCfg = Release|Win32
-		{04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Release|Win32.Build.0 = Release|Win32
-		{04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Release|x64.ActiveCfg = Release|x64
-		{04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Release|x64.Build.0 = Release|x64
-		{BF149D97-7520-4788-9CD1-3D99C5C8150F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{BF149D97-7520-4788-9CD1-3D99C5C8150F}.Debug|Win32.Build.0 = Debug|Win32
-		{BF149D97-7520-4788-9CD1-3D99C5C8150F}.Debug|x64.ActiveCfg = Debug|x64
-		{BF149D97-7520-4788-9CD1-3D99C5C8150F}.Debug|x64.Build.0 = Debug|x64
-		{BF149D97-7520-4788-9CD1-3D99C5C8150F}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{BF149D97-7520-4788-9CD1-3D99C5C8150F}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{BF149D97-7520-4788-9CD1-3D99C5C8150F}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{BF149D97-7520-4788-9CD1-3D99C5C8150F}.Release (static)|x64.Build.0 = Release (static)|x64
-		{BF149D97-7520-4788-9CD1-3D99C5C8150F}.Release|Win32.ActiveCfg = Release|Win32
-		{BF149D97-7520-4788-9CD1-3D99C5C8150F}.Release|Win32.Build.0 = Release|Win32
-		{BF149D97-7520-4788-9CD1-3D99C5C8150F}.Release|x64.ActiveCfg = Release|x64
-		{BF149D97-7520-4788-9CD1-3D99C5C8150F}.Release|x64.Build.0 = Release|x64
-		{5203F034-0047-4EC0-B7E9-D037FAF5D536}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5203F034-0047-4EC0-B7E9-D037FAF5D536}.Debug|Win32.Build.0 = Debug|Win32
-		{5203F034-0047-4EC0-B7E9-D037FAF5D536}.Debug|x64.ActiveCfg = Debug|x64
-		{5203F034-0047-4EC0-B7E9-D037FAF5D536}.Debug|x64.Build.0 = Debug|x64
-		{5203F034-0047-4EC0-B7E9-D037FAF5D536}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{5203F034-0047-4EC0-B7E9-D037FAF5D536}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{5203F034-0047-4EC0-B7E9-D037FAF5D536}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{5203F034-0047-4EC0-B7E9-D037FAF5D536}.Release (static)|x64.Build.0 = Release (static)|x64
-		{5203F034-0047-4EC0-B7E9-D037FAF5D536}.Release|Win32.ActiveCfg = Release|Win32
-		{5203F034-0047-4EC0-B7E9-D037FAF5D536}.Release|Win32.Build.0 = Release|Win32
-		{5203F034-0047-4EC0-B7E9-D037FAF5D536}.Release|x64.ActiveCfg = Release|x64
-		{5203F034-0047-4EC0-B7E9-D037FAF5D536}.Release|x64.Build.0 = Release|x64
-		{E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Debug|Win32.Build.0 = Debug|Win32
-		{E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Debug|x64.ActiveCfg = Debug|x64
-		{E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Debug|x64.Build.0 = Debug|x64
-		{E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Release (static)|x64.Build.0 = Release (static)|x64
-		{E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Release|Win32.ActiveCfg = Release|Win32
-		{E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Release|Win32.Build.0 = Release|Win32
-		{E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Release|x64.ActiveCfg = Release|x64
-		{E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Release|x64.Build.0 = Release|x64
-		{BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Debug|Win32.Build.0 = Debug|Win32
-		{BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Debug|x64.ActiveCfg = Debug|x64
-		{BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Debug|x64.Build.0 = Debug|x64
-		{BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Release (static)|x64.Build.0 = Release (static)|x64
-		{BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Release|Win32.ActiveCfg = Release|Win32
-		{BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Release|Win32.Build.0 = Release|Win32
-		{BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Release|x64.ActiveCfg = Release|x64
-		{BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Release|x64.Build.0 = Release|x64
-		{544D097C-9C24-4C57-A171-8C8029421185}.Debug|Win32.ActiveCfg = Debug|Win32
-		{544D097C-9C24-4C57-A171-8C8029421185}.Debug|Win32.Build.0 = Debug|Win32
-		{544D097C-9C24-4C57-A171-8C8029421185}.Debug|x64.ActiveCfg = Debug|x64
-		{544D097C-9C24-4C57-A171-8C8029421185}.Debug|x64.Build.0 = Debug|x64
-		{544D097C-9C24-4C57-A171-8C8029421185}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{544D097C-9C24-4C57-A171-8C8029421185}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{544D097C-9C24-4C57-A171-8C8029421185}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{544D097C-9C24-4C57-A171-8C8029421185}.Release (static)|x64.Build.0 = Release (static)|x64
-		{544D097C-9C24-4C57-A171-8C8029421185}.Release|Win32.ActiveCfg = Release|Win32
-		{544D097C-9C24-4C57-A171-8C8029421185}.Release|Win32.Build.0 = Release|Win32
-		{544D097C-9C24-4C57-A171-8C8029421185}.Release|x64.ActiveCfg = Release|x64
-		{544D097C-9C24-4C57-A171-8C8029421185}.Release|x64.Build.0 = Release|x64
-		{DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Debug|Win32.Build.0 = Debug|Win32
-		{DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Debug|x64.ActiveCfg = Debug|x64
-		{DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Debug|x64.Build.0 = Debug|x64
-		{DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Release (static)|x64.Build.0 = Release (static)|x64
-		{DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Release|Win32.ActiveCfg = Release|Win32
-		{DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Release|Win32.Build.0 = Release|Win32
-		{DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Release|x64.ActiveCfg = Release|x64
-		{DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Release|x64.Build.0 = Release|x64
-		{226D42CE-5833-444E-94FA-84C1D51892A8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{226D42CE-5833-444E-94FA-84C1D51892A8}.Debug|Win32.Build.0 = Debug|Win32
-		{226D42CE-5833-444E-94FA-84C1D51892A8}.Debug|x64.ActiveCfg = Debug|x64
-		{226D42CE-5833-444E-94FA-84C1D51892A8}.Debug|x64.Build.0 = Debug|x64
-		{226D42CE-5833-444E-94FA-84C1D51892A8}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{226D42CE-5833-444E-94FA-84C1D51892A8}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{226D42CE-5833-444E-94FA-84C1D51892A8}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{226D42CE-5833-444E-94FA-84C1D51892A8}.Release (static)|x64.Build.0 = Release (static)|x64
-		{226D42CE-5833-444E-94FA-84C1D51892A8}.Release|Win32.ActiveCfg = Release|Win32
-		{226D42CE-5833-444E-94FA-84C1D51892A8}.Release|Win32.Build.0 = Release|Win32
-		{226D42CE-5833-444E-94FA-84C1D51892A8}.Release|x64.ActiveCfg = Release|x64
-		{226D42CE-5833-444E-94FA-84C1D51892A8}.Release|x64.Build.0 = Release|x64
-		{B37FE734-01F4-4799-86B2-D084820715BE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B37FE734-01F4-4799-86B2-D084820715BE}.Debug|Win32.Build.0 = Debug|Win32
-		{B37FE734-01F4-4799-86B2-D084820715BE}.Debug|x64.ActiveCfg = Debug|x64
-		{B37FE734-01F4-4799-86B2-D084820715BE}.Debug|x64.Build.0 = Debug|x64
-		{B37FE734-01F4-4799-86B2-D084820715BE}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{B37FE734-01F4-4799-86B2-D084820715BE}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{B37FE734-01F4-4799-86B2-D084820715BE}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{B37FE734-01F4-4799-86B2-D084820715BE}.Release (static)|x64.Build.0 = Release (static)|x64
-		{B37FE734-01F4-4799-86B2-D084820715BE}.Release|Win32.ActiveCfg = Release|Win32
-		{B37FE734-01F4-4799-86B2-D084820715BE}.Release|Win32.Build.0 = Release|Win32
-		{B37FE734-01F4-4799-86B2-D084820715BE}.Release|x64.ActiveCfg = Release|x64
-		{B37FE734-01F4-4799-86B2-D084820715BE}.Release|x64.Build.0 = Release|x64
-		{B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Debug|Win32.Build.0 = Debug|Win32
-		{B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Debug|x64.ActiveCfg = Debug|x64
-		{B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Debug|x64.Build.0 = Debug|x64
-		{B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Release (static)|x64.Build.0 = Release (static)|x64
-		{B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Release|Win32.ActiveCfg = Release|Win32
-		{B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Release|Win32.Build.0 = Release|Win32
-		{B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Release|x64.ActiveCfg = Release|x64
-		{B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Release|x64.Build.0 = Release|x64
-		{5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Debug|Win32.Build.0 = Debug|Win32
-		{5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Debug|x64.ActiveCfg = Debug|x64
-		{5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Debug|x64.Build.0 = Debug|x64
-		{5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Release (static)|x64.Build.0 = Release (static)|x64
-		{5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Release|Win32.ActiveCfg = Release|Win32
-		{5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Release|Win32.Build.0 = Release|Win32
-		{5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Release|x64.ActiveCfg = Release|x64
-		{5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Release|x64.Build.0 = Release|x64
-		{E5D842C5-669F-4FC7-A5E0-44B562F86435}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E5D842C5-669F-4FC7-A5E0-44B562F86435}.Debug|Win32.Build.0 = Debug|Win32
-		{E5D842C5-669F-4FC7-A5E0-44B562F86435}.Debug|x64.ActiveCfg = Debug|x64
-		{E5D842C5-669F-4FC7-A5E0-44B562F86435}.Debug|x64.Build.0 = Debug|x64
-		{E5D842C5-669F-4FC7-A5E0-44B562F86435}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{E5D842C5-669F-4FC7-A5E0-44B562F86435}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{E5D842C5-669F-4FC7-A5E0-44B562F86435}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{E5D842C5-669F-4FC7-A5E0-44B562F86435}.Release (static)|x64.Build.0 = Release (static)|x64
-		{E5D842C5-669F-4FC7-A5E0-44B562F86435}.Release|Win32.ActiveCfg = Release|Win32
-		{E5D842C5-669F-4FC7-A5E0-44B562F86435}.Release|Win32.Build.0 = Release|Win32
-		{E5D842C5-669F-4FC7-A5E0-44B562F86435}.Release|x64.ActiveCfg = Release|x64
-		{E5D842C5-669F-4FC7-A5E0-44B562F86435}.Release|x64.Build.0 = Release|x64
-		{445A2500-3BBC-449A-A929-C419C2A16051}.Debug|Win32.ActiveCfg = Debug|Win32
-		{445A2500-3BBC-449A-A929-C419C2A16051}.Debug|Win32.Build.0 = Debug|Win32
-		{445A2500-3BBC-449A-A929-C419C2A16051}.Debug|x64.ActiveCfg = Debug|x64
-		{445A2500-3BBC-449A-A929-C419C2A16051}.Debug|x64.Build.0 = Debug|x64
-		{445A2500-3BBC-449A-A929-C419C2A16051}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{445A2500-3BBC-449A-A929-C419C2A16051}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{445A2500-3BBC-449A-A929-C419C2A16051}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{445A2500-3BBC-449A-A929-C419C2A16051}.Release (static)|x64.Build.0 = Release (static)|x64
-		{445A2500-3BBC-449A-A929-C419C2A16051}.Release|Win32.ActiveCfg = Release|Win32
-		{445A2500-3BBC-449A-A929-C419C2A16051}.Release|Win32.Build.0 = Release|Win32
-		{445A2500-3BBC-449A-A929-C419C2A16051}.Release|x64.ActiveCfg = Release|x64
-		{445A2500-3BBC-449A-A929-C419C2A16051}.Release|x64.Build.0 = Release|x64
-		{052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Debug|Win32.ActiveCfg = Debug|Win32
-		{052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Debug|Win32.Build.0 = Debug|Win32
-		{052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Debug|x64.ActiveCfg = Debug|x64
-		{052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Debug|x64.Build.0 = Debug|x64
-		{052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Release (static)|x64.Build.0 = Release (static)|x64
-		{052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Release|Win32.ActiveCfg = Release|Win32
-		{052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Release|Win32.Build.0 = Release|Win32
-		{052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Release|x64.ActiveCfg = Release|x64
-		{052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Release|x64.Build.0 = Release|x64
-		{5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Debug|Win32.Build.0 = Debug|Win32
-		{5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Debug|x64.ActiveCfg = Debug|x64
-		{5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Debug|x64.Build.0 = Debug|x64
-		{5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Release (static)|x64.Build.0 = Release (static)|x64
-		{5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Release|Win32.ActiveCfg = Release|Win32
-		{5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Release|Win32.Build.0 = Release|Win32
-		{5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Release|x64.ActiveCfg = Release|x64
-		{5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Release|x64.Build.0 = Release|x64
-		{56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Debug|Win32.ActiveCfg = Debug|Win32
-		{56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Debug|Win32.Build.0 = Debug|Win32
-		{56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Debug|x64.ActiveCfg = Debug|x64
-		{56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Debug|x64.Build.0 = Debug|x64
-		{56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Release (static)|x64.Build.0 = Release (static)|x64
-		{56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Release|Win32.ActiveCfg = Release|Win32
-		{56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Release|Win32.Build.0 = Release|Win32
-		{56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Release|x64.ActiveCfg = Release|x64
-		{56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Release|x64.Build.0 = Release|x64
-		{88422448-C5FB-46F3-A0B3-0811F90E537C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{88422448-C5FB-46F3-A0B3-0811F90E537C}.Debug|Win32.Build.0 = Debug|Win32
-		{88422448-C5FB-46F3-A0B3-0811F90E537C}.Debug|x64.ActiveCfg = Debug|x64
-		{88422448-C5FB-46F3-A0B3-0811F90E537C}.Debug|x64.Build.0 = Debug|x64
-		{88422448-C5FB-46F3-A0B3-0811F90E537C}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{88422448-C5FB-46F3-A0B3-0811F90E537C}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{88422448-C5FB-46F3-A0B3-0811F90E537C}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{88422448-C5FB-46F3-A0B3-0811F90E537C}.Release (static)|x64.Build.0 = Release (static)|x64
-		{88422448-C5FB-46F3-A0B3-0811F90E537C}.Release|Win32.ActiveCfg = Release|Win32
-		{88422448-C5FB-46F3-A0B3-0811F90E537C}.Release|Win32.Build.0 = Release|Win32
-		{88422448-C5FB-46F3-A0B3-0811F90E537C}.Release|x64.ActiveCfg = Release|x64
-		{88422448-C5FB-46F3-A0B3-0811F90E537C}.Release|x64.Build.0 = Release|x64
-		{9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Debug|Win32.Build.0 = Debug|Win32
-		{9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Debug|x64.ActiveCfg = Debug|x64
-		{9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Debug|x64.Build.0 = Debug|x64
-		{9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Release (static)|x64.Build.0 = Release (static)|x64
-		{9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Release|Win32.ActiveCfg = Release|Win32
-		{9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Release|Win32.Build.0 = Release|Win32
-		{9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Release|x64.ActiveCfg = Release|x64
-		{9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Release|x64.Build.0 = Release|x64
-		{4605418D-2292-470A-AB18-C2119B016F71}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4605418D-2292-470A-AB18-C2119B016F71}.Debug|Win32.Build.0 = Debug|Win32
-		{4605418D-2292-470A-AB18-C2119B016F71}.Debug|x64.ActiveCfg = Debug|x64
-		{4605418D-2292-470A-AB18-C2119B016F71}.Debug|x64.Build.0 = Debug|x64
-		{4605418D-2292-470A-AB18-C2119B016F71}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{4605418D-2292-470A-AB18-C2119B016F71}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{4605418D-2292-470A-AB18-C2119B016F71}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{4605418D-2292-470A-AB18-C2119B016F71}.Release (static)|x64.Build.0 = Release (static)|x64
-		{4605418D-2292-470A-AB18-C2119B016F71}.Release|Win32.ActiveCfg = Release|Win32
-		{4605418D-2292-470A-AB18-C2119B016F71}.Release|Win32.Build.0 = Release|Win32
-		{4605418D-2292-470A-AB18-C2119B016F71}.Release|x64.ActiveCfg = Release|x64
-		{4605418D-2292-470A-AB18-C2119B016F71}.Release|x64.Build.0 = Release|x64
-		{05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Debug|Win32.Build.0 = Debug|Win32
-		{05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Debug|x64.ActiveCfg = Debug|x64
-		{05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Debug|x64.Build.0 = Debug|x64
-		{05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Release (static)|x64.Build.0 = Release (static)|x64
-		{05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Release|Win32.ActiveCfg = Release|Win32
-		{05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Release|Win32.Build.0 = Release|Win32
-		{05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Release|x64.ActiveCfg = Release|x64
-		{05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Release|x64.Build.0 = Release|x64
-		{6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Debug|Win32.Build.0 = Debug|Win32
-		{6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Debug|x64.ActiveCfg = Debug|x64
-		{6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Debug|x64.Build.0 = Debug|x64
-		{6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Release (static)|x64.Build.0 = Release (static)|x64
-		{6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Release|Win32.ActiveCfg = Release|Win32
-		{6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Release|Win32.Build.0 = Release|Win32
-		{6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Release|x64.ActiveCfg = Release|x64
-		{6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Release|x64.Build.0 = Release|x64
-		{1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Debug|Win32.Build.0 = Debug|Win32
-		{1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Debug|x64.ActiveCfg = Debug|x64
-		{1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Debug|x64.Build.0 = Debug|x64
-		{1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Release (static)|x64.Build.0 = Release (static)|x64
-		{1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Release|Win32.ActiveCfg = Release|Win32
-		{1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Release|Win32.Build.0 = Release|Win32
-		{1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Release|x64.ActiveCfg = Release|x64
-		{1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Release|x64.Build.0 = Release|x64
-		{053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Debug|Win32.ActiveCfg = Debug|Win32
-		{053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Debug|Win32.Build.0 = Debug|Win32
-		{053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Debug|x64.ActiveCfg = Debug|x64
-		{053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Debug|x64.Build.0 = Debug|x64
-		{053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Release (static)|x64.Build.0 = Release (static)|x64
-		{053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Release|Win32.ActiveCfg = Release|Win32
-		{053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Release|Win32.Build.0 = Release|Win32
-		{053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Release|x64.ActiveCfg = Release|x64
-		{053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Release|x64.Build.0 = Release|x64
-		{231C032C-DE16-459A-8E7D-6509C2EC3998}.Debug|Win32.ActiveCfg = Debug|Win32
-		{231C032C-DE16-459A-8E7D-6509C2EC3998}.Debug|Win32.Build.0 = Debug|Win32
-		{231C032C-DE16-459A-8E7D-6509C2EC3998}.Debug|x64.ActiveCfg = Debug|x64
-		{231C032C-DE16-459A-8E7D-6509C2EC3998}.Debug|x64.Build.0 = Debug|x64
-		{231C032C-DE16-459A-8E7D-6509C2EC3998}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{231C032C-DE16-459A-8E7D-6509C2EC3998}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{231C032C-DE16-459A-8E7D-6509C2EC3998}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{231C032C-DE16-459A-8E7D-6509C2EC3998}.Release (static)|x64.Build.0 = Release (static)|x64
-		{231C032C-DE16-459A-8E7D-6509C2EC3998}.Release|Win32.ActiveCfg = Release|Win32
-		{231C032C-DE16-459A-8E7D-6509C2EC3998}.Release|Win32.Build.0 = Release|Win32
-		{231C032C-DE16-459A-8E7D-6509C2EC3998}.Release|x64.ActiveCfg = Release|x64
-		{231C032C-DE16-459A-8E7D-6509C2EC3998}.Release|x64.Build.0 = Release|x64
-		{419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Debug|Win32.Build.0 = Debug|Win32
-		{419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Debug|x64.ActiveCfg = Debug|x64
-		{419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Debug|x64.Build.0 = Debug|x64
-		{419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Release (static)|x64.Build.0 = Release (static)|x64
-		{419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Release|Win32.ActiveCfg = Release|Win32
-		{419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Release|Win32.Build.0 = Release|Win32
-		{419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Release|x64.ActiveCfg = Release|x64
-		{419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Release|x64.Build.0 = Release|x64
-		{40639893-4D75-48CD-811F-4B363CC71FFA}.Debug|Win32.ActiveCfg = Debug|Win32
-		{40639893-4D75-48CD-811F-4B363CC71FFA}.Debug|Win32.Build.0 = Debug|Win32
-		{40639893-4D75-48CD-811F-4B363CC71FFA}.Debug|x64.ActiveCfg = Debug|x64
-		{40639893-4D75-48CD-811F-4B363CC71FFA}.Debug|x64.Build.0 = Debug|x64
-		{40639893-4D75-48CD-811F-4B363CC71FFA}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{40639893-4D75-48CD-811F-4B363CC71FFA}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{40639893-4D75-48CD-811F-4B363CC71FFA}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{40639893-4D75-48CD-811F-4B363CC71FFA}.Release (static)|x64.Build.0 = Release (static)|x64
-		{40639893-4D75-48CD-811F-4B363CC71FFA}.Release|Win32.ActiveCfg = Release|Win32
-		{40639893-4D75-48CD-811F-4B363CC71FFA}.Release|Win32.Build.0 = Release|Win32
-		{40639893-4D75-48CD-811F-4B363CC71FFA}.Release|x64.ActiveCfg = Release|x64
-		{40639893-4D75-48CD-811F-4B363CC71FFA}.Release|x64.Build.0 = Release|x64
-		{5FD733BF-B3C6-4A96-BED7-35E2484448E1}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5FD733BF-B3C6-4A96-BED7-35E2484448E1}.Debug|Win32.Build.0 = Debug|Win32
-		{5FD733BF-B3C6-4A96-BED7-35E2484448E1}.Debug|x64.ActiveCfg = Debug|Win32
-		{5FD733BF-B3C6-4A96-BED7-35E2484448E1}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{5FD733BF-B3C6-4A96-BED7-35E2484448E1}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{5FD733BF-B3C6-4A96-BED7-35E2484448E1}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{5FD733BF-B3C6-4A96-BED7-35E2484448E1}.Release (static)|x64.Build.0 = Release (static)|x64
-		{5FD733BF-B3C6-4A96-BED7-35E2484448E1}.Release|Win32.ActiveCfg = Release|Win32
-		{5FD733BF-B3C6-4A96-BED7-35E2484448E1}.Release|Win32.Build.0 = Release|Win32
-		{5FD733BF-B3C6-4A96-BED7-35E2484448E1}.Release|x64.ActiveCfg = Release|x64
-		{5FD733BF-B3C6-4A96-BED7-35E2484448E1}.Release|x64.Build.0 = Release|x64
-		{649C4168-1C65-4E41-818F-85A1C52C1B8F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{649C4168-1C65-4E41-818F-85A1C52C1B8F}.Debug|Win32.Build.0 = Debug|Win32
-		{649C4168-1C65-4E41-818F-85A1C52C1B8F}.Debug|x64.ActiveCfg = Debug|Win32
-		{649C4168-1C65-4E41-818F-85A1C52C1B8F}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{649C4168-1C65-4E41-818F-85A1C52C1B8F}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{649C4168-1C65-4E41-818F-85A1C52C1B8F}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{649C4168-1C65-4E41-818F-85A1C52C1B8F}.Release (static)|x64.Build.0 = Release (static)|x64
-		{649C4168-1C65-4E41-818F-85A1C52C1B8F}.Release|Win32.ActiveCfg = Release|Win32
-		{649C4168-1C65-4E41-818F-85A1C52C1B8F}.Release|Win32.Build.0 = Release|Win32
-		{649C4168-1C65-4E41-818F-85A1C52C1B8F}.Release|x64.ActiveCfg = Release|x64
-		{649C4168-1C65-4E41-818F-85A1C52C1B8F}.Release|x64.Build.0 = Release|x64
-		{C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}.Debug|Win32.Build.0 = Debug|Win32
-		{C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}.Debug|x64.ActiveCfg = Debug|Win32
-		{C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}.Release (static)|x64.Build.0 = Release (static)|x64
-		{C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}.Release|Win32.ActiveCfg = Release|Win32
-		{C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}.Release|Win32.Build.0 = Release|Win32
-		{C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}.Release|x64.ActiveCfg = Release|x64
-		{C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}.Release|x64.Build.0 = Release|x64
-		{44A18410-3AA8-4A64-935B-D20223AD6885}.Debug|Win32.ActiveCfg = Debug|Win32
-		{44A18410-3AA8-4A64-935B-D20223AD6885}.Debug|Win32.Build.0 = Debug|Win32
-		{44A18410-3AA8-4A64-935B-D20223AD6885}.Debug|x64.ActiveCfg = Debug|Win32
-		{44A18410-3AA8-4A64-935B-D20223AD6885}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{44A18410-3AA8-4A64-935B-D20223AD6885}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{44A18410-3AA8-4A64-935B-D20223AD6885}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{44A18410-3AA8-4A64-935B-D20223AD6885}.Release (static)|x64.Build.0 = Release (static)|x64
-		{44A18410-3AA8-4A64-935B-D20223AD6885}.Release|Win32.ActiveCfg = Release|Win32
-		{44A18410-3AA8-4A64-935B-D20223AD6885}.Release|Win32.Build.0 = Release|Win32
-		{44A18410-3AA8-4A64-935B-D20223AD6885}.Release|x64.ActiveCfg = Release|x64
-		{44A18410-3AA8-4A64-935B-D20223AD6885}.Release|x64.Build.0 = Release|x64
-		{B44CB3E0-F2FD-4260-A632-C01FB881613E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B44CB3E0-F2FD-4260-A632-C01FB881613E}.Debug|Win32.Build.0 = Debug|Win32
-		{B44CB3E0-F2FD-4260-A632-C01FB881613E}.Debug|x64.ActiveCfg = Debug|Win32
-		{B44CB3E0-F2FD-4260-A632-C01FB881613E}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{B44CB3E0-F2FD-4260-A632-C01FB881613E}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{B44CB3E0-F2FD-4260-A632-C01FB881613E}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{B44CB3E0-F2FD-4260-A632-C01FB881613E}.Release (static)|x64.Build.0 = Release (static)|x64
-		{B44CB3E0-F2FD-4260-A632-C01FB881613E}.Release|Win32.ActiveCfg = Release|Win32
-		{B44CB3E0-F2FD-4260-A632-C01FB881613E}.Release|Win32.Build.0 = Release|Win32
-		{B44CB3E0-F2FD-4260-A632-C01FB881613E}.Release|x64.ActiveCfg = Release|x64
-		{B44CB3E0-F2FD-4260-A632-C01FB881613E}.Release|x64.Build.0 = Release|x64
-		{F4A9881E-0EB0-44A1-9664-B6CBDE992861}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F4A9881E-0EB0-44A1-9664-B6CBDE992861}.Debug|Win32.Build.0 = Debug|Win32
-		{F4A9881E-0EB0-44A1-9664-B6CBDE992861}.Debug|x64.ActiveCfg = Debug|Win32
-		{F4A9881E-0EB0-44A1-9664-B6CBDE992861}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{F4A9881E-0EB0-44A1-9664-B6CBDE992861}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{F4A9881E-0EB0-44A1-9664-B6CBDE992861}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{F4A9881E-0EB0-44A1-9664-B6CBDE992861}.Release (static)|x64.Build.0 = Release (static)|x64
-		{F4A9881E-0EB0-44A1-9664-B6CBDE992861}.Release|Win32.ActiveCfg = Release|Win32
-		{F4A9881E-0EB0-44A1-9664-B6CBDE992861}.Release|Win32.Build.0 = Release|Win32
-		{F4A9881E-0EB0-44A1-9664-B6CBDE992861}.Release|x64.ActiveCfg = Release|x64
-		{F4A9881E-0EB0-44A1-9664-B6CBDE992861}.Release|x64.Build.0 = Release|x64
-		{66D3A191-E4D5-45F3-86BD-EFBB249CD554}.Debug|Win32.ActiveCfg = Debug|Win32
-		{66D3A191-E4D5-45F3-86BD-EFBB249CD554}.Debug|Win32.Build.0 = Debug|Win32
-		{66D3A191-E4D5-45F3-86BD-EFBB249CD554}.Debug|x64.ActiveCfg = Debug|Win32
-		{66D3A191-E4D5-45F3-86BD-EFBB249CD554}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{66D3A191-E4D5-45F3-86BD-EFBB249CD554}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{66D3A191-E4D5-45F3-86BD-EFBB249CD554}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{66D3A191-E4D5-45F3-86BD-EFBB249CD554}.Release (static)|x64.Build.0 = Release (static)|x64
-		{66D3A191-E4D5-45F3-86BD-EFBB249CD554}.Release|Win32.ActiveCfg = Release|Win32
-		{66D3A191-E4D5-45F3-86BD-EFBB249CD554}.Release|Win32.Build.0 = Release|Win32
-		{66D3A191-E4D5-45F3-86BD-EFBB249CD554}.Release|x64.ActiveCfg = Release|x64
-		{66D3A191-E4D5-45F3-86BD-EFBB249CD554}.Release|x64.Build.0 = Release|x64
-		{CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}.Debug|Win32.ActiveCfg = Debug|Win32
-		{CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}.Debug|Win32.Build.0 = Debug|Win32
-		{CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}.Debug|x64.ActiveCfg = Debug|Win32
-		{CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}.Release (static)|x64.Build.0 = Release (static)|x64
-		{CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}.Release|Win32.ActiveCfg = Release|Win32
-		{CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}.Release|Win32.Build.0 = Release|Win32
-		{CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}.Release|x64.ActiveCfg = Release|x64
-		{CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}.Release|x64.Build.0 = Release|x64
-		{D5B9558F-EF25-4167-ACE4-723C7413B390}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D5B9558F-EF25-4167-ACE4-723C7413B390}.Debug|Win32.Build.0 = Debug|Win32
-		{D5B9558F-EF25-4167-ACE4-723C7413B390}.Debug|x64.ActiveCfg = Debug|Win32
-		{D5B9558F-EF25-4167-ACE4-723C7413B390}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{D5B9558F-EF25-4167-ACE4-723C7413B390}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{D5B9558F-EF25-4167-ACE4-723C7413B390}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{D5B9558F-EF25-4167-ACE4-723C7413B390}.Release (static)|x64.Build.0 = Release (static)|x64
-		{D5B9558F-EF25-4167-ACE4-723C7413B390}.Release|Win32.ActiveCfg = Release|Win32
-		{D5B9558F-EF25-4167-ACE4-723C7413B390}.Release|Win32.Build.0 = Release|Win32
-		{D5B9558F-EF25-4167-ACE4-723C7413B390}.Release|x64.ActiveCfg = Release|x64
-		{D5B9558F-EF25-4167-ACE4-723C7413B390}.Release|x64.Build.0 = Release|x64
-		{155112B9-A8A9-4E06-90F5-4AAAB32B2F70}.Debug|Win32.ActiveCfg = Debug|Win32
-		{155112B9-A8A9-4E06-90F5-4AAAB32B2F70}.Debug|Win32.Build.0 = Debug|Win32
-		{155112B9-A8A9-4E06-90F5-4AAAB32B2F70}.Debug|x64.ActiveCfg = Debug|Win32
-		{155112B9-A8A9-4E06-90F5-4AAAB32B2F70}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{155112B9-A8A9-4E06-90F5-4AAAB32B2F70}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{155112B9-A8A9-4E06-90F5-4AAAB32B2F70}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{155112B9-A8A9-4E06-90F5-4AAAB32B2F70}.Release (static)|x64.Build.0 = Release (static)|x64
-		{155112B9-A8A9-4E06-90F5-4AAAB32B2F70}.Release|Win32.ActiveCfg = Release|Win32
-		{155112B9-A8A9-4E06-90F5-4AAAB32B2F70}.Release|Win32.Build.0 = Release|Win32
-		{155112B9-A8A9-4E06-90F5-4AAAB32B2F70}.Release|x64.ActiveCfg = Release|x64
-		{155112B9-A8A9-4E06-90F5-4AAAB32B2F70}.Release|x64.Build.0 = Release|x64
-		{178D81A7-F2FB-41D7-B300-9D1A4DE5E137}.Debug|Win32.ActiveCfg = Debug|Win32
-		{178D81A7-F2FB-41D7-B300-9D1A4DE5E137}.Debug|Win32.Build.0 = Debug|Win32
-		{178D81A7-F2FB-41D7-B300-9D1A4DE5E137}.Debug|x64.ActiveCfg = Debug|Win32
-		{178D81A7-F2FB-41D7-B300-9D1A4DE5E137}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{178D81A7-F2FB-41D7-B300-9D1A4DE5E137}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{178D81A7-F2FB-41D7-B300-9D1A4DE5E137}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{178D81A7-F2FB-41D7-B300-9D1A4DE5E137}.Release (static)|x64.Build.0 = Release (static)|x64
-		{178D81A7-F2FB-41D7-B300-9D1A4DE5E137}.Release|Win32.ActiveCfg = Release|Win32
-		{178D81A7-F2FB-41D7-B300-9D1A4DE5E137}.Release|Win32.Build.0 = Release|Win32
-		{178D81A7-F2FB-41D7-B300-9D1A4DE5E137}.Release|x64.ActiveCfg = Release|x64
-		{178D81A7-F2FB-41D7-B300-9D1A4DE5E137}.Release|x64.Build.0 = Release|x64
-		{7E30C3B1-AEE7-483D-B231-C672365CD2D7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7E30C3B1-AEE7-483D-B231-C672365CD2D7}.Debug|Win32.Build.0 = Debug|Win32
-		{7E30C3B1-AEE7-483D-B231-C672365CD2D7}.Debug|x64.ActiveCfg = Debug|Win32
-		{7E30C3B1-AEE7-483D-B231-C672365CD2D7}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{7E30C3B1-AEE7-483D-B231-C672365CD2D7}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{7E30C3B1-AEE7-483D-B231-C672365CD2D7}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{7E30C3B1-AEE7-483D-B231-C672365CD2D7}.Release (static)|x64.Build.0 = Release (static)|x64
-		{7E30C3B1-AEE7-483D-B231-C672365CD2D7}.Release|Win32.ActiveCfg = Release|Win32
-		{7E30C3B1-AEE7-483D-B231-C672365CD2D7}.Release|Win32.Build.0 = Release|Win32
-		{7E30C3B1-AEE7-483D-B231-C672365CD2D7}.Release|x64.ActiveCfg = Release|x64
-		{7E30C3B1-AEE7-483D-B231-C672365CD2D7}.Release|x64.Build.0 = Release|x64
-		{2E26DB8B-9E37-4072-B397-8A7086E0ACD0}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2E26DB8B-9E37-4072-B397-8A7086E0ACD0}.Debug|Win32.Build.0 = Debug|Win32
-		{2E26DB8B-9E37-4072-B397-8A7086E0ACD0}.Debug|x64.ActiveCfg = Debug|Win32
-		{2E26DB8B-9E37-4072-B397-8A7086E0ACD0}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{2E26DB8B-9E37-4072-B397-8A7086E0ACD0}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{2E26DB8B-9E37-4072-B397-8A7086E0ACD0}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{2E26DB8B-9E37-4072-B397-8A7086E0ACD0}.Release (static)|x64.Build.0 = Release (static)|x64
-		{2E26DB8B-9E37-4072-B397-8A7086E0ACD0}.Release|Win32.ActiveCfg = Release|Win32
-		{2E26DB8B-9E37-4072-B397-8A7086E0ACD0}.Release|Win32.Build.0 = Release|Win32
-		{2E26DB8B-9E37-4072-B397-8A7086E0ACD0}.Release|x64.ActiveCfg = Release|x64
-		{2E26DB8B-9E37-4072-B397-8A7086E0ACD0}.Release|x64.Build.0 = Release|x64
-		{2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}.Debug|Win32.Build.0 = Debug|Win32
-		{2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}.Debug|x64.ActiveCfg = Debug|Win32
-		{2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}.Release (static)|x64.Build.0 = Release (static)|x64
-		{2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}.Release|Win32.ActiveCfg = Release|Win32
-		{2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}.Release|Win32.Build.0 = Release|Win32
-		{2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}.Release|x64.ActiveCfg = Release|x64
-		{2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}.Release|x64.Build.0 = Release|x64
-		{2CEB1965-A89C-4422-A9AC-B30FCE7913C3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2CEB1965-A89C-4422-A9AC-B30FCE7913C3}.Debug|Win32.Build.0 = Debug|Win32
-		{2CEB1965-A89C-4422-A9AC-B30FCE7913C3}.Debug|x64.ActiveCfg = Debug|Win32
-		{2CEB1965-A89C-4422-A9AC-B30FCE7913C3}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{2CEB1965-A89C-4422-A9AC-B30FCE7913C3}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{2CEB1965-A89C-4422-A9AC-B30FCE7913C3}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{2CEB1965-A89C-4422-A9AC-B30FCE7913C3}.Release (static)|x64.Build.0 = Release (static)|x64
-		{2CEB1965-A89C-4422-A9AC-B30FCE7913C3}.Release|Win32.ActiveCfg = Release|Win32
-		{2CEB1965-A89C-4422-A9AC-B30FCE7913C3}.Release|Win32.Build.0 = Release|Win32
-		{2CEB1965-A89C-4422-A9AC-B30FCE7913C3}.Release|x64.ActiveCfg = Release|x64
-		{2CEB1965-A89C-4422-A9AC-B30FCE7913C3}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{6ADA4322-693A-46BB-897B-17BB5BE9F08C} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA}
-		{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA}
-		{51028ACF-53D4-4478-8500-55E6B8A81375} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA}
-		{1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA}
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA}
-		{01C3B138-9D45-4ED6-A763-893C067262C2} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA}
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA}
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA}
-		{04FA9D77-E45F-4917-B972-B353BA6A6FA8} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA}
-		{BF149D97-7520-4788-9CD1-3D99C5C8150F} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA}
-		{5203F034-0047-4EC0-B7E9-D037FAF5D536} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA}
-		{E7B3D07D-2FE8-481B-8DAB-6255A412A42F} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA}
-		{BC1F021A-1EEC-4A7A-B746-5AA6048E478C} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA}
-		{DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA}
-		{226D42CE-5833-444E-94FA-84C1D51892A8} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA}
-		{B37FE734-01F4-4799-86B2-D084820715BE} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA}
-		{6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA}
-		{053E1EE2-75B4-4D9A-B8AE-89600BCB60A5} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA}
-		{9A942925-61E6-4975-935A-5D62E8248E64} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA}
-		{C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA}
-		{44A18410-3AA8-4A64-935B-D20223AD6885} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA}
-		{F4A9881E-0EB0-44A1-9664-B6CBDE992861} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA}
-		{66D3A191-E4D5-45F3-86BD-EFBB249CD554} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA}
-		{D5B9558F-EF25-4167-ACE4-723C7413B390} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA}
-		{155112B9-A8A9-4E06-90F5-4AAAB32B2F70} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA}
-		{178D81A7-F2FB-41D7-B300-9D1A4DE5E137} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA}
-		{7E30C3B1-AEE7-483D-B231-C672365CD2D7} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA}
-	EndGlobalSection
-EndGlobal
diff --git a/vc2005/bsp2img/bsp2img.vcproj b/vc2005/bsp2img/bsp2img.vcproj
deleted file mode 100644
index 49beb4a45..000000000
--- a/vc2005/bsp2img/bsp2img.vcproj
+++ /dev/null
@@ -1,567 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="bsp2img"
-	ProjectGUID="{4605418D-2292-470A-AB18-C2119B016F71}"
-	RootNamespace="bsp2img"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib libzlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib libzlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\tools\bsp2img\bsp2img.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\..\include\win32\resources\quakeforge.rc"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2005/builtins/builtins.vcproj b/vc2005/builtins/builtins.vcproj
deleted file mode 100644
index 63e384c61..000000000
--- a/vc2005/builtins/builtins.vcproj
+++ /dev/null
@@ -1,473 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="builtins"
-	ProjectGUID="{04FA9D77-E45F-4917-B972-B353BA6A6FA8}"
-	RootNamespace="builtins"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\libs\gamecode\builtins\bi_gib.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\gamecode\builtins\pr_cmds.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2005/clean.ps1 b/vc2005/clean.ps1
deleted file mode 100644
index b1e75f990..000000000
--- a/vc2005/clean.ps1
+++ /dev/null
@@ -1,3 +0,0 @@
-ls -recurse -include 'win32','x64','*.user' | rm -recurse
-if(test-path QuakeForge.suo) { rm QuakeForge.suo -force }
-if(test-path QuakeForge.ncb) { rm QuakeForge.ncb }
\ No newline at end of file
diff --git a/vc2005/common/common.vcproj b/vc2005/common/common.vcproj
deleted file mode 100644
index e473c7cce..000000000
--- a/vc2005/common/common.vcproj
+++ /dev/null
@@ -1,489 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="qw-common"
-	ProjectGUID="{BC1F021A-1EEC-4A7A-B746-5AA6048E478C}"
-	RootNamespace="common"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\qw\source\com.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\game.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\map_cfg.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\net_packetlog.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\pmove.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\pmovetst.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2005/console/console.vcproj b/vc2005/console/console.vcproj
deleted file mode 100644
index b71cf236e..000000000
--- a/vc2005/console/console.vcproj
+++ /dev/null
@@ -1,493 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="console"
-	ProjectGUID="{ED4AFBF5-C247-4352-966D-048B8998C6A1}"
-	RootNamespace="console"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\libs\console\buffer.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\console\complete.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\console\console.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\console\filelist.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\console\inputline.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\console\list.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\console\view.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2005/console_client/console_client.vcproj b/vc2005/console_client/console_client.vcproj
deleted file mode 100644
index b6ae66820..000000000
--- a/vc2005/console_client/console_client.vcproj
+++ /dev/null
@@ -1,481 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="console-client"
-	ProjectGUID="{226D42CE-5833-444E-94FA-84C1D51892A8}"
-	RootNamespace="console_client"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\libs\console\bi_inputline.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\console\client.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\console\menu.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\console\pr_keys.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2005/console_server/console_server.vcproj b/vc2005/console_server/console_server.vcproj
deleted file mode 100644
index 4c3347b3a..000000000
--- a/vc2005/console_server/console_server.vcproj
+++ /dev/null
@@ -1,469 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="console-server"
-	ProjectGUID="{B37FE734-01F4-4799-86B2-D084820715BE}"
-	RootNamespace="console_server"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\libs\console\server.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2005/engine/engine.vcproj b/vc2005/engine/engine.vcproj
deleted file mode 100644
index f3b7665ff..000000000
--- a/vc2005/engine/engine.vcproj
+++ /dev/null
@@ -1,509 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="engine"
-	ProjectGUID="{2626C0E1-6F5C-47D3-B80D-93942D766DD7}"
-	RootNamespace="engine"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\libs\gamecode\engine\pr_builtins.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\gamecode\engine\pr_debug.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\gamecode\engine\pr_edict.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\gamecode\engine\pr_exec.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\gamecode\engine\pr_load.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\gamecode\engine\pr_opcode.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\gamecode\engine\pr_parse.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\gamecode\engine\pr_resolve.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\gamecode\engine\pr_resource.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\gamecode\engine\pr_strings.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\gamecode\engine\pr_zone.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2005/gib/gib.vcproj b/vc2005/gib/gib.vcproj
deleted file mode 100644
index 4039956cb..000000000
--- a/vc2005/gib/gib.vcproj
+++ /dev/null
@@ -1,537 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="gib"
-	ProjectGUID="{01C3B138-9D45-4ED6-A763-893C067262C2}"
-	RootNamespace="gib"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\libs\gib\exp.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\gib\gib_buffer.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\gib\gib_builtin.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\gib\gib_classes.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\gib\gib_execute.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\gib\gib_function.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\gib\gib_handle.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\gib\gib_init.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\gib\gib_object.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\gib\gib_parse.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\gib\gib_process.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\gib\gib_regex.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\gib\gib_semantics.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\gib\gib_thread.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\gib\gib_tree.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\gib\gib_vars.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\gib\ops.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\gib\regex.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2005/hw-master/hw-master.vcproj b/vc2005/hw-master/hw-master.vcproj
deleted file mode 100644
index 133d54777..000000000
--- a/vc2005/hw-master/hw-master.vcproj
+++ /dev/null
@@ -1,567 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="hw-master"
-	ProjectGUID="{419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}"
-	RootNamespace="hwmaster"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib libzlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib libzlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\hw\source\master.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\..\include\win32\resources\quakeforge.rc"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2005/image/image.vcproj b/vc2005/image/image.vcproj
deleted file mode 100644
index e32ffd958..000000000
--- a/vc2005/image/image.vcproj
+++ /dev/null
@@ -1,481 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="image"
-	ProjectGUID="{5203F034-0047-4EC0-B7E9-D037FAF5D536}"
-	RootNamespace="image"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\libs\image\image.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\image\pcx.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\image\png.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\image\tga.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2005/include/config.h b/vc2005/include/config.h
deleted file mode 100644
index 1b787db16..000000000
--- a/vc2005/include/config.h
+++ /dev/null
@@ -1,740 +0,0 @@
-/* include/config.h.  Generated from config.h.in by configure.  */
-/* include/config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* list of cd plugins */
-#define CD_PLUGIN_LIST {"cd_win", cd_win_PluginInfo},{0, 0}
-
-/* list of cd prototypes */
-#define CD_PLUGIN_PROTOS extern plugin_t *cd_win_PluginInfo (void);
-
-/* list of client plugins */
-#define CLIENT_PLUGIN_LIST {"console_client", console_client_PluginInfo},{0, 0}
-
-/* list of client prototypes */
-#define CLIENT_PLUGIN_PROTOS extern plugin_t *console_client_PluginInfo (void);
-
-/* Define this to the command line for the C preprocessor */
-#define CPP_NAME "wave --c99 %d -o %o %i"
-
-/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
-   systems. This function is required for `alloca.c' support on those systems.
-   */
-/* #undef CRAY_STACKSEG_END */
-
-/* Define to 1 if using `alloca.c'. */
-/* #undef C_ALLOCA */
-
-/* Define this to the location of the global config file */
-#define FS_GLOBALCFG "~/quakeforge.conf"
-
-/* Define this to the path from which to load plugins */
-#define FS_PLUGINPATH "/usr/local/lib/quakeforge"
-
-/* Define this to the shared game directory root */
-#define FS_SHAREPATH "."
-
-/* Define this to the location of the user config file */
-#define FS_USERCFG "~/quakeforgerc"
-
-/* Define this to the unshared game directory root */
-#define FS_USERPATH "."
-
-/* Define this to the default GL dynamic lib */
-#define GL_DRIVER "OPENGL32.DLL"
-
-/* Define to 1 if you have the `access' function. */
-#define HAVE_ACCESS 1
-
-/* Define to 1 if you have `alloca', as a function or macro. */
-#define HAVE_ALLOCA 1
-
-/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
-   */
-/* #undef HAVE_ALLOCA_H */
-
-/* Define this if alloca is prototyped */
-/* #undef HAVE_ALLOCA_PROTO */
-#ifndef HAVE_ALLOCA_PROTO
-#ifndef QFASM
-void *alloca (int size);
-#endif
-#endif
-
-/* Define to 1 if you have the <alsa/asoundlib.h> header file. */
-/* #undef HAVE_ALSA_ASOUNDLIB_H */
-
-/* Define to 1 if you have the <arpa/inet.h> header file. */
-/* #undef HAVE_ARPA_INET_H */
-
-/* Define to 1 if you have the <asm/io.h> header file. */
-/* #undef HAVE_ASM_IO_H */
-
-/* Define to 1 if you have the <assert.h> header file. */
-#define HAVE_ASSERT_H 1
-
-/* Define to 1 if you have the <conio.h> header file. */
-#define HAVE_CONIO_H 1
-
-/* Define to 1 if you have the `connect' function. */
-#define HAVE_CONNECT 1
-
-/* Define to 1 if you have the <ctype.h> header file. */
-#define HAVE_CTYPE_H 1
-
-/* Define to 1 if you have the <curses.h> header file. */
-/* #undef HAVE_CURSES_H */
-
-/* Define to 1 if you have the <ddraw.h> header file. */
-#define HAVE_DDRAW_H 1
-
-/* Define if you have the XFree86 DGA extension */
-/* #undef HAVE_DGA */
-
-/* Define to 1 if you have the <dinput.h> header file. */
-#define HAVE_DINPUT_H 1
-
-/* Define to 1 if you have the <direct.h> header file. */
-#define HAVE_DIRECT_H 1
-
-/* Define to 1 if you have the <dirent.h> header file. */
-#define HAVE_DIRENT_H 1
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-/* #undef HAVE_DLFCN_H */
-
-/* Define if you have the dlopen function. */
-/* #undef HAVE_DLOPEN */
-
-/* Define to 1 if you have the <dmedia/audio.h> header file. */
-/* #undef HAVE_DMEDIA_AUDIO_H */
-
-/* Define to 1 if you have the <dmedia/cdaudio.h> header file. */
-/* #undef HAVE_DMEDIA_CDAUDIO_H */
-
-/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
-/* #undef HAVE_DOPRNT */
-
-/* Define to 1 if you have the <dpmi.h> header file. */
-/* #undef HAVE_DPMI_H */
-
-/* Define to 1 if you have the <dsound.h> header file. */
-#define HAVE_DSOUND_H 1
-
-/* Define to 1 if you have the <errno.h> header file. */
-#define HAVE_ERRNO_H 1
-
-/* Define to 1 if you have the <execinfo.h> header file. */
-/* #undef HAVE_EXECINFO_H */
-
-/* Define this if you have FB_AUX_VGA_PLANES_CFB4 */
-/* #undef HAVE_FB_AUX_VGA_PLANES_CFB4 */
-
-/* Define this if you have FB_AUX_VGA_PLANES_CFB4 */
-/* #undef HAVE_FB_AUX_VGA_PLANES_CFB8 */
-
-/* Define this if you have FB_AUX_VGA_PLANES_VGA4 */
-/* #undef HAVE_FB_AUX_VGA_PLANES_VGA4 */
-
-/* Define to 1 if you have the `fcntl' function. */
-/* #undef HAVE_FCNTL */
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-#define HAVE_FCNTL_H 1
-
-/* define this if you have flac libs */
-/* #undef HAVE_FLAC */
-
-/* Define to 1 if you have the <fnmatch.h> header file. */
-#define HAVE_FNMATCH_H 1
-
-/* Define this if fnmatch is prototyped in fnmatch.h */
-/* #undef HAVE_FNMATCH_PROTO */
-
-/* Define this if FPOS_T is a struct */
-/* #undef HAVE_FPOS_T_STRUCT */
-
-/* Define to 1 if you have the `ftime' function. */
-#define HAVE_FTIME 1
-
-/* Define to 1 if you have the `getaddrinfo' function. */
-#define HAVE_GETADDRINFO 1
-
-/* Define to 1 if you have the `gethostbyname' function. */
-#define HAVE_GETHOSTBYNAME 1
-
-/* Define to 1 if you have the `gethostname' function. */
-#define HAVE_GETHOSTNAME 1
-
-/* Define to 1 if you have the `getnameinfo' function. */
-#define HAVE_GETNAMEINFO 1
-
-/* Define to 1 if you have the `getpagesize' function. */
-/* #undef HAVE_GETPAGESIZE */
-
-/* Define to 1 if you have the `gettimeofday' function. */
-/* #undef HAVE_GETTIMEOFDAY */
-
-/* Define to 1 if you have the `getwd' function. */
-/* #undef HAVE_GETWD */
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-/* #undef HAVE_INTTYPES_H */
-
-/* Define this if your system has struct in_pktinfo */
-/* #undef HAVE_IN_PKTINFO */
-
-/* Define to 1 if you have the <io.h> header file. */
-#define HAVE_IO_H 1
-
-/* Define this if you want IPv6 support */
-/* #undef HAVE_IPV6 */
-
-/* Define if you have libjack */
-/* #undef HAVE_JACK */
-
-/* Define to 1 if you have a functional curl library. */
-#define HAVE_LIBCURL 1
-
-/* Define to 1 if you have the <libc.h> header file. */
-/* #undef HAVE_LIBC_H */
-
-/* Define to 1 if you have the `db' library (-ldb). */
-/* #undef HAVE_LIBDB */
-
-/* Define to 1 if you have the `efence' library (-lefence). */
-/* #undef HAVE_LIBEFENCE */
-
-/* Define to 1 if you have the `m' library (-lm). */
-/* #undef HAVE_LIBM */
-
-/* Define to 1 if you have the <limits.h> header file. */
-#define HAVE_LIMITS_H 1
-
-/* Define to 1 if you have the <linux/cdrom.h> header file. */
-/* #undef HAVE_LINUX_CDROM_H */
-
-/* Define to 1 if you have the <linux/fb.h> header file. */
-/* #undef HAVE_LINUX_FB_H */
-
-/* Define to 1 if you have the <linux/joystick.h> header file. */
-/* #undef HAVE_LINUX_JOYSTICK_H */
-
-/* Define to 1 if you have the <linux/soundcard.h> header file. */
-/* #undef HAVE_LINUX_SOUNDCARD_H */
-
-/* Define to 1 if you support file names longer than 14 characters. */
-#define HAVE_LONG_FILE_NAMES 1
-
-/* Define to 1 if you have the <machine/soundcard.h> header file. */
-/* #undef HAVE_MACHINE_SOUNDCARD_H */
-
-/* Define to 1 if you have the <malloc.h> header file. */
-#define HAVE_MALLOC_H 1
-
-/* Define to 1 if you have the <math.h> header file. */
-#define HAVE_MATH_H 1
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the <mgraph.h> header file. */
-/* #undef HAVE_MGRAPH_H */
-
-/* Define to 1 if you have the `mkdir' function. */
-#define HAVE_MKDIR 1
-
-/* Define to 1 if you have a working `mmap' system call. */
-/* #undef HAVE_MMAP */
-
-/* Define to 1 if you have the `mprotect' function. */
-/* #undef HAVE_MPROTECT */
-
-/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
-/* #undef HAVE_NDIR_H */
-
-/* Define to 1 if you have the <netdb.h> header file. */
-/* #undef HAVE_NETDB_H */
-
-/* Define to 1 if you have the <netinet/in.h> header file. */
-/* #undef HAVE_NETINET_IN_H */
-
-/* Define if you have libpng */
-/* #undef HAVE_PNG */
-
-/* Define to 1 if you have the <process.h> header file. */
-#define HAVE_PROCESS_H 1
-
-/* Define to 1 if you have the <pthread.h> header file. */
-/* #undef HAVE_PTHREAD_H */
-
-/* Define to 1 if you have the `putenv' function. */
-#define HAVE_PUTENV 1
-
-/* Define to 1 if you have the <pwd.h> header file. */
-/* #undef HAVE_PWD_H */
-
-/* Define to 1 if you have the <rpc/types.h> header file. */
-/* #undef HAVE_RPC_TYPES_H */
-
-/* Define this if you have sa_len member in struct sockaddr (BSD) */
-/* #undef HAVE_SA_LEN */
-
-/* Define to 1 if you have the `select' function. */
-#define HAVE_SELECT 1
-
-/* Define to 1 if you have the <setjmp.h> header file. */
-#define HAVE_SETJMP_H 1
-
-/* Define to 1 if you have the <signal.h> header file. */
-#define HAVE_SIGNAL_H 1
-
-/* Define this if you have sin6_len member in struct sockaddr_in6 (BSD) */
-/* #undef HAVE_SIN6_LEN */
-
-/* Define this if your system has size_t */
-#define HAVE_SIZE_T 1
-
-/* Define to 1 if you have the `snprintf' function. */
-#define HAVE_SNPRINTF 1
-
-/* Define to 1 if you have the `socket' function. */
-#define HAVE_SOCKET 1
-
-/* Define this if your system has socklen_t */
-/* #undef HAVE_SOCKLEN_T */
-
-/* Define this if you have ss_len member in struct sockaddr_storage (BSD) */
-/* #undef HAVE_SS_LEN */
-
-/* Define to 1 if you have the `stat' function. */
-#define HAVE_STAT 1
-
-/* Define to 1 if you have the <stdarg.h> header file. */
-#define HAVE_STDARG_H 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdio.h> header file. */
-#define HAVE_STDIO_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the `strcasestr' function. */
-/* #undef HAVE_STRCASESTR */
-
-/* Define this if strcasestr is prototyped in string.h */
-/* #undef HAVE_STRCASESTR_PROTO */
-
-/* Define to 1 if you have the `strerror' function. */
-#define HAVE_STRERROR 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-/* #undef HAVE_STRINGS_H 1 */
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the `strnlen' function. */
-#define HAVE_STRNLEN 1
-
-/* Define this if strnlen is prototyped in string.h */
-#define HAVE_STRNLEN_PROTO 1
-
-/* Define to 1 if you have the `strsep' function. */
-/* #undef HAVE_STRSEP */
-
-/* Define to 1 if you have the `strstr' function. */
-#define HAVE_STRSTR 1
-
-/* Define to 1 if `st_blksize' is member of `struct stat'. */
-/* #undef HAVE_STRUCT_STAT_ST_BLKSIZE */
-
-/* Define to 1 if your `struct stat' has `st_blksize'. Deprecated, use
-   `HAVE_STRUCT_STAT_ST_BLKSIZE' instead. */
-/* #undef HAVE_ST_BLKSIZE */
-
-/* Define this if C symbols are prefixed with an underscore */
-#define HAVE_SYM_PREFIX_UNDERSCORE 1
-
-/* Define to 1 if you have the <sys/asoundlib.h> header file. */
-/* #undef HAVE_SYS_ASOUNDLIB_H */
-
-/* Define to 1 if you have the <sys/audioio.h> header file. */
-/* #undef HAVE_SYS_AUDIOIO_H */
-
-/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
-   */
-/* #undef HAVE_SYS_DIR_H */
-
-/* Define to 1 if you have the <sys/filio.h> header file. */
-/* #undef HAVE_SYS_FILIO_H */
-
-/* Define to 1 if you have the <sys/ioctl.h> header file. */
-/* #undef HAVE_SYS_IOCTL_H */
-
-/* Define to 1 if you have the <sys/io.h> header file. */
-/* #undef HAVE_SYS_IO_H */
-
-/* Define to 1 if you have the <sys/ipc.h> header file. */
-/* #undef HAVE_SYS_IPC_H */
-
-/* Define to 1 if you have the <sys/mman.h> header file. */
-/* #undef HAVE_SYS_MMAN_H */
-
-/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
-   */
-/* #undef HAVE_SYS_NDIR_H */
-
-/* Define to 1 if you have the <sys/param.h> header file. */
-/* #undef HAVE_SYS_PARAM_H */
-
-/* Define to 1 if you have the <sys/poll.h> header file. */
-/* #undef HAVE_SYS_POLL_H */
-
-/* Define to 1 if you have the <sys/shm.h> header file. */
-/* #undef HAVE_SYS_SHM_H */
-
-/* Define to 1 if you have the <sys/signal.h> header file. */
-/* #undef HAVE_SYS_SIGNAL_H */
-
-/* Define to 1 if you have the <sys/socket.h> header file. */
-/* #undef HAVE_SYS_SOCKET_H */
-
-/* Define to 1 if you have the <sys/soundcard.h> header file. */
-/* #undef HAVE_SYS_SOUNDCARD_H */
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-/* #undef HAVE_SYS_TIME_H */
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <sys/uio.h> header file. */
-/* #undef HAVE_SYS_UIO_H */
-
-/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
-/* #undef HAVE_SYS_WAIT_H */
-
-/* Define this if you have tchar.h */
-#define HAVE_TCHAR_H 1
-
-/* Define to 1 if you have the <termios.h> header file. */
-/* #undef HAVE_TERMIOS_H */
-
-/* Define to 1 if you have the <time.h> header file. */
-#define HAVE_TIME_H 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-/* #undef HAVE_UNISTD_H */
-
-/* Define to 1 if you have the `usleep' function. */
-/* #undef HAVE_USLEEP */
-
-/* Define if va_copy is available */
-/* #undef HAVE_VA_COPY */
-
-/* Define to 1 if you have the <vgakeyboard.h> header file. */
-/* #undef HAVE_VGAKEYBOARD_H */
-
-/* Define to 1 if you have the <vgamouse.h> header file. */
-/* #undef HAVE_VGAMOUSE_H */
-
-/* Define if you have the XFree86 VIDMODE extension */
-/* #undef HAVE_VIDMODE */
-
-/* define this if you have ogg/vorbis libs */
-/* #undef HAVE_VORBIS */
-
-/* Define to 1 if you have the `vprintf' function. */
-#define HAVE_VPRINTF 1
-
-/* Define to 1 if you have the `vsnprintf' function. */
-#define HAVE_VSNPRINTF 1
-
-/* Define if you have WildMidi */
-/* #undef HAVE_WILDMIDI */
-
-/* Define to 1 if you have the <windows.h> header file. */
-#define HAVE_WINDOWS_H 1
-
-/* Define to 1 if you have the <winsock.h> header file. */
-#define HAVE_WINSOCK_H 1
-
-/* Define if you have XMMS */
-/* #undef HAVE_XMMS */
-
-/* Define if you have zlib */
-#define HAVE_ZLIB 1
-
-/* Define to 1 if you have the `_access' function. */
-#define HAVE__ACCESS 1
-
-/* Define to 1 if you have the `_ftime' function. */
-#define HAVE__FTIME 1
-
-/* Define to 1 if you have the <_mingw.h> header file. */
-/* #undef HAVE__MINGW_H */
-
-/* Define to 1 if you have the `_mkdir' function. */
-#define HAVE__MKDIR 1
-
-/* Define this if you have _SC_PAGESIZE */
-/* #undef HAVE__SC_PAGESIZE */
-
-/* Define to 1 if you have the `_snprintf' function. */
-#define HAVE__SNPRINTF 1
-
-/* Define if __va_copy is available */
-/* #undef HAVE__VA_COPY */
-
-/* Define to 1 if you have the `_vsnprintf' function. */
-#define HAVE__VSNPRINTF 1
-
-/* Define this if the GCC __attribute__ keyword is available */
-/* #undef HAVE___ATTRIBUTE__ */
-
-#ifndef HAVE___ATTRIBUTE__
-# define __attribute__(x)
-#endif
-
-/* Define this if the GCC __attribute__ keyword is available */
-/* #undef HAVE___ATTRIBUTE__VISIBILITY */
-
-#ifdef HAVE___ATTRIBUTE__VISIBILITY
-# define VISIBLE __attribute__((visibility ("default")))
-#else
-# define VISIBLE
-#endif
-
-/* Define this if the GCC __builtin_expect keyword is available */
-/* #undef HAVE___BUILTIN_EXPECT */
-
-#ifndef HAVE___BUILTIN_EXPECT
-# define __builtin_expect(x,c) x
-#endif
-
-/* Defined if libcurl supports AsynchDNS */
-/* #undef LIBCURL_FEATURE_ASYNCHDNS */
-
-/* Defined if libcurl supports IDN */
-#define LIBCURL_FEATURE_IDN 1
-
-/* Defined if libcurl supports IPv6 */
-#define LIBCURL_FEATURE_IPV6 1
-
-/* Defined if libcurl supports KRB4 */
-/* #undef LIBCURL_FEATURE_KRB4 */
-
-/* Defined if libcurl supports libz */
-#define LIBCURL_FEATURE_LIBZ 1
-
-/* Defined if libcurl supports NTLM */
-#define LIBCURL_FEATURE_NTLM 1
-
-/* Defined if libcurl supports SSL */
-/* #undef LIBCURL_FEATURE_SSL */
-
-/* Defined if libcurl supports SSPI */
-#define LIBCURL_FEATURE_SSPI 1
-
-/* Defined if libcurl supports DICT */
-/* #undef LIBCURL_PROTOCOL_DICT */
-
-/* Defined if libcurl supports FILE */
-/* #undef LIBCURL_PROTOCOL_FILE */
-
-/* Defined if libcurl supports FTP */
-#define LIBCURL_PROTOCOL_FTP 1
-
-/* Defined if libcurl supports FTPS */
-/* #undef LIBCURL_PROTOCOL_FTPS */
-
-/* Defined if libcurl supports HTTP */
-#define LIBCURL_PROTOCOL_HTTP 1
-
-/* Defined if libcurl supports HTTPS */
-/* #undef LIBCURL_PROTOCOL_HTTPS */
-
-/* Defined if libcurl supports LDAP */
-/* #undef LIBCURL_PROTOCOL_LDAP */
-
-/* Defined if libcurl supports TELNET */
-/* #undef LIBCURL_PROTOCOL_TELNET */
-
-/* Defined if libcurl supports TFTP */
-/* #undef LIBCURL_PROTOCOL_TFTP */
-
-/* Define to 1 if `major', `minor', and `makedev' are declared in <mkdev.h>.
-   */
-/* #undef MAJOR_IN_MKDEV */
-
-/* Define to 1 if `major', `minor', and `makedev' are declared in
-   <sysmacros.h>. */
-/* #undef MAJOR_IN_SYSMACROS */
-
-/* Define this to the QSG standard version you support in NetQuake */
-#define NQ_QSG_VERSION "1.0"
-
-/* Define this to the NetQuake standard version you support */
-#define NQ_VERSION "1.09"
-
-/* Name of package */
-#define PACKAGE "quakeforge"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT ""
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME ""
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING ""
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME ""
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION ""
-
-/* Define this to your operating system's path separator character */
-#define PATH_SEPARATOR '/'
-
-/* "Proper" package name */
-#define PROGRAM "QuakeForge"
-
-/* Define this to where qfcc should look for header files */
-#define QFCC_INCLUDE_PATH "/usr/local/include/QF/ruamoko"
-
-/* Define this to where qfcc should look for lib files */
-#define QFCC_LIB_PATH "/usr/local/lib/ruamoko"
-
-/* Define this to the QSG standard version you support in QuakeWorld */
-#define QW_QSG_VERSION "2.0"
-
-/* Define this to the QuakeWorld standard version you support */
-#define QW_VERSION "2.40"
-
-/* Define as the return type of signal handlers (`int' or `void'). */
-#define RETSIGTYPE void
-
-/* list of server plugins */
-#define SERVER_PLUGIN_LIST {"console_server", console_server_PluginInfo},{0, 0}
-
-/* list of server prototypes */
-#define SERVER_PLUGIN_PROTOS extern plugin_t *console_server_PluginInfo (void);
-
-/* Define this to the default sound output driver. */
-#define SND_OUTPUT_DEFAULT "win"
-
-/* list of sound output plugins */
-#define SND_OUTPUT_LIST {"snd_output_win", snd_output_win_PluginInfo},{0, 0}
-
-/* list of sound output prototypes */
-#define SND_OUTPUT_PROTOS extern plugin_t *snd_output_win_PluginInfo (void);
-
-/* list of sound render plugins */
-#define SND_RENDER_LIST {"snd_render_default", snd_render_default_PluginInfo},{0, 0}
-
-/* list of sound render prototypes */
-#define SND_RENDER_PROTOS extern plugin_t *snd_render_default_PluginInfo (void);
-
-/* If using the C implementation of alloca, define if you know the
-   direction of stack growth for your system; otherwise it will be
-   automatically deduced at runtime.
-	STACK_DIRECTION > 0 => grows toward higher addresses
-	STACK_DIRECTION < 0 => grows toward lower addresses
-	STACK_DIRECTION = 0 => direction of growth unknown */
-/* #undef STACK_DIRECTION */
-
-/* Define this if you are building static plugins */
-#define STATIC_PLUGINS 1
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-#define TIME_WITH_SYS_TIME 1
-
-/* Define to 1 if your <sys/time.h> declares `struct tm'. */
-/* #undef TM_IN_SYS_TIME */
-
-/* Define this if you want progs typechecking */
-/* #undef TYPECHECK_PROGS */
-
-/* Define this if you want to use Intel assembly optimizations */
-/* #undef USE_INTEL_ASM */
-
-/* Define if va_list is an array */
-/* #undef VA_LIST_IS_ARRAY */
-
-/* Version number of package */
-#define VERSION "0.5.5-SVN"
-
-/* Define to 1 if your processor stores words with the most significant byte
-   first (like Motorola and SPARC, unlike Intel and VAX). */
-/* #undef WORDS_BIGENDIAN */
-
-/* Define to 1 if the X Window System is missing or not being used. */
-/* #undef X_DISPLAY_MISSING */
-
-/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
-   `char[]'. */
-/* #undef YYTEXT_POINTER */
-
-/* Define to empty if `const' does not conform to ANSI C. */
-/* #undef const */
-
-/* Define curl_free() as free() if our version of curl lacks curl_free. */
-/* #undef curl_free */
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
-   calls it, or to nothing if 'inline' is not supported under any name.  */
-#ifndef __cplusplus
-#define inline __inline
-/* #undef inline */
-#endif
-
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-/* #undef size_t */
-
-/* Define strcasecmp as stricmp if you have one but not the other */
-#define strcasecmp stricmp
-
-/* new stuff, for VC2005 compatibility (phrosty) */
-
-#define _CRT_SECURE_NO_WARNINGS
-#define _CRT_NONSTDC_NO_WARNINGS
-
-/* used in qfcc.  should #define to _ReturnAddress()? */
-#define __builtin_return_address(x) (0)
-
-#define _WIN32_WINNT				0x0500
-#define DIRECTINPUT_VERSION	0x0600
-
-#define INITGUID
-
-#define snprintf _snprintf
-#define strncasecmp strnicmp
-
-#define ssize_t ptrdiff_t
-#define S_ISDIR(mode) (mode & _S_IFDIR)
-
-/* used in access() */
-#define R_OK 04
-
-/*
-	disable silent conversion warnings for fixing later..
-
-	4047: 'operator' : 'identifier1' differs in levels of indirection from 'identifier2'
-	4244: 'argument' : conversion from 'type1' to 'type2', possible loss of data
-	4267: 'var' : conversion from 'size_t' to 'type', possible loss of data (/Wp64 warning)
-	4305: 'identifier' : truncation from 'type1' to 'type2'
-	4311: 'variable' : pointer truncation from 'type' to 'type' (/Wp64 warning)
-	4312: 'operation' : conversion from 'type1' to 'type2' of greater size (/Wp64 warning)
-*/
-#pragma warning(disable:4047 4244 4267 4305 4311 4312)
diff --git a/vc2005/models-sw/models-sw.vcproj b/vc2005/models-sw/models-sw.vcproj
deleted file mode 100644
index 6eb490b83..000000000
--- a/vc2005/models-sw/models-sw.vcproj
+++ /dev/null
@@ -1,511 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="models-sw"
-	ProjectGUID="{F4A9881E-0EB0-44A1-9664-B6CBDE992861}"
-	RootNamespace="modelssw"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\libs\models\clip_hull.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\models\model.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\models\trace.c"
-				>
-			</File>
-			<Filter
-				Name="alias"
-				>
-				<File
-					RelativePath="..\..\libs\models\alias\model_alias.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\models\alias\sw_model_alias.c"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="brush"
-				>
-				<File
-					RelativePath="..\..\libs\models\brush\model_brush.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\models\brush\sw_model_brush.c"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="sprite"
-				>
-				<File
-					RelativePath="..\..\libs\models\sprite\model_sprite.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\models\sprite\sw_model_sprite.c"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2005/models/models.vcproj b/vc2005/models/models.vcproj
deleted file mode 100644
index 06c14ed04..000000000
--- a/vc2005/models/models.vcproj
+++ /dev/null
@@ -1,489 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="models"
-	ProjectGUID="{DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}"
-	RootNamespace="models"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\libs\models\clip_hull.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\models\model.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\models\null_model.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\models\trace.c"
-				>
-			</File>
-			<Filter
-				Name="brush"
-				>
-				<File
-					RelativePath="..\..\libs\models\brush\model_brush.c"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2005/modelsgl/modelsgl.vcproj b/vc2005/modelsgl/modelsgl.vcproj
deleted file mode 100644
index 4f455edbe..000000000
--- a/vc2005/modelsgl/modelsgl.vcproj
+++ /dev/null
@@ -1,521 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="models-gl"
-	ProjectGUID="{1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}"
-	RootNamespace="models"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\libs\models\clip_hull.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\models\gl_model_fullbright.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\models\model.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\models\trace.c"
-				>
-			</File>
-			<Filter
-				Name="alias"
-				>
-				<File
-					RelativePath="..\..\libs\models\alias\gl_mesh.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\models\alias\gl_model_alias.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\models\alias\model_alias.c"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="brush"
-				>
-				<File
-					RelativePath="..\..\libs\models\brush\gl_model_brush.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\models\brush\model_brush.c"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="sprite"
-				>
-				<File
-					RelativePath="..\..\libs\models\sprite\gl_model_sprite.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\models\sprite\model_sprite.c"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2005/net-main/net-main.vcproj b/vc2005/net-main/net-main.vcproj
deleted file mode 100644
index d986b743a..000000000
--- a/vc2005/net-main/net-main.vcproj
+++ /dev/null
@@ -1,487 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="net-main"
-	ProjectGUID="{053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}"
-	RootNamespace="netmain"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\libs\net\nm\net_dgrm.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\net\nm\net_loop.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\net\net_main.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\net\nm\net_vcr.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\net\nm\net_win.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\net\nm\net_wins.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2005/net/net.vcproj b/vc2005/net/net.vcproj
deleted file mode 100644
index 5b43da9e5..000000000
--- a/vc2005/net/net.vcproj
+++ /dev/null
@@ -1,473 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="net-chan"
-	ProjectGUID="{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}"
-	RootNamespace="net"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\libs\net\net_chan.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\net\nc\net_udp.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2005/nq-common/nq-common.vcproj b/vc2005/nq-common/nq-common.vcproj
deleted file mode 100644
index 0dccdd9a4..000000000
--- a/vc2005/nq-common/nq-common.vcproj
+++ /dev/null
@@ -1,515 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="nq-common"
-	ProjectGUID="{6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}"
-	RootNamespace="nqcommon"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\nq\source\com.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\nq\source\game.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\nq\source\host.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\nq\source\host_cmd.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\nq\source\sv_cl_phys.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\nq\source\sv_cvar.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\nq\source\sv_main.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\nq\source\sv_move.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\nq\source\sv_phys.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\nq\source\sv_pr_cmds.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\nq\source\sv_progs.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\nq\source\sv_user.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\nq\source\world.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2005/nq-sdl/nq-sdl.vcproj b/vc2005/nq-sdl/nq-sdl.vcproj
deleted file mode 100644
index f4813f262..000000000
--- a/vc2005/nq-sdl/nq-sdl.vcproj
+++ /dev/null
@@ -1,561 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="nq-sdl"
-	ProjectGUID="{2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}"
-	RootNamespace="nqsdl"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib sdl.lib sdlmain.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib sdl.lib sdlmain.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H;SDL_STATIC"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib dxguid.lib libzlib.lib libsdl.lib libsdlmain.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib sdl.lib sdlmain.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib sdl.lib sdlmain.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H;SDL_STATIC"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib dxguid.lib libzlib.lib libsdl.lib libsdlmain.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\nq\source\sys_sdl.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\..\include\win32\resources\quakeforge.rc"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2005/nq-sdl32/nq-sdl32.vcproj b/vc2005/nq-sdl32/nq-sdl32.vcproj
deleted file mode 100644
index 9c46d06f4..000000000
--- a/vc2005/nq-sdl32/nq-sdl32.vcproj
+++ /dev/null
@@ -1,567 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="nq-sdl32"
-	ProjectGUID="{2CEB1965-A89C-4422-A9AC-B30FCE7913C3}"
-	RootNamespace="nqsdl32"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib sdl.lib sdlmain.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib sdl.lib sdlmain.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H;SDL_STATIC"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib dxguid.lib libzlib.lib libsdl.lib libsdlmain.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib sdl.lib sdlmain.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib sdl.lib sdlmain.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H;SDL_STATIC"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib dxguid.lib libzlib.lib libsdl.lib libsdlmain.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\nq\source\sys_sdl.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\..\include\win32\resources\quakeforge.rc"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2005/nq-server/nq-server.vcproj b/vc2005/nq-server/nq-server.vcproj
deleted file mode 100644
index 2b89d7bbe..000000000
--- a/vc2005/nq-server/nq-server.vcproj
+++ /dev/null
@@ -1,571 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="nq-server"
-	ProjectGUID="{231C032C-DE16-459A-8E7D-6509C2EC3998}"
-	RootNamespace="nqserver"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib libzlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib libzlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\nq\source\sv_ded.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\nq\source\sys_wind.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\..\include\win32\resources\quakeforge.rc"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2005/nq-sgl/nq-sgl.vcproj b/vc2005/nq-sgl/nq-sgl.vcproj
deleted file mode 100644
index 3e61b1f10..000000000
--- a/vc2005/nq-sgl/nq-sgl.vcproj
+++ /dev/null
@@ -1,567 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="nq-sgl"
-	ProjectGUID="{2E26DB8B-9E37-4072-B397-8A7086E0ACD0}"
-	RootNamespace="nqsgl"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib sdl.lib sdlmain.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib sdl.lib sdlmain.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H;SDL_STATIC"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib dxguid.lib libzlib.lib libsdl.lib libsdlmain.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib sdl.lib sdlmain.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib sdl.lib sdlmain.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H;SDL_STATIC"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib dxguid.lib libzlib.lib libsdl.lib libsdlmain.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\nq\source\sys_sdl.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\..\include\win32\resources\quakeforge.rc"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2005/nq-wgl/nq-wgl.vcproj b/vc2005/nq-wgl/nq-wgl.vcproj
deleted file mode 100644
index a789c0871..000000000
--- a/vc2005/nq-wgl/nq-wgl.vcproj
+++ /dev/null
@@ -1,567 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="nq-wgl"
-	ProjectGUID="{1CD1A18B-95D5-4EA4-917C-34B10066BFCC}"
-	RootNamespace="nq-wgl"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib libzlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib libzlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\nq\source\sys_win.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\..\include\win32\resources\quakeforge.rc"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2005/nq/nq.vcproj b/vc2005/nq/nq.vcproj
deleted file mode 100644
index 82cf3e55f..000000000
--- a/vc2005/nq/nq.vcproj
+++ /dev/null
@@ -1,543 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="nq"
-	ProjectGUID="{155112B9-A8A9-4E06-90F5-4AAAB32B2F70}"
-	RootNamespace="nq"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\nq\source\cl_cam.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\nq\source\cl_cmd.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\nq\source\cl_demo.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\nq\source\cl_input.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\nq\source\cl_main.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\nq\source\cl_parse.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\nq\source\cl_screen.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\nq\source\cl_tent.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\nq\source\cl_view.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\nq\source\host_skin.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\nq\source\sbar.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\nq\source\skin.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\nq\include\chase.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\nq\include\client.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\nq\include\game.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\nq\include\host.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\nq\include\protocol.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\nq\include\server.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\nq\include\sv_pr_cmds.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\nq\include\sv_progs.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2005/pak/pak.vcproj b/vc2005/pak/pak.vcproj
deleted file mode 100644
index 0daa6d627..000000000
--- a/vc2005/pak/pak.vcproj
+++ /dev/null
@@ -1,571 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="pak"
-	ProjectGUID="{9EE8BD4B-47D3-4AD5-A8B9-831329792A05}"
-	RootNamespace="pak"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib libzlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib libzlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\tools\pak\pak.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\tools\pak\pak.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\..\include\win32\resources\quakeforge.rc"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2005/qfbsp/qfbsp.vcproj b/vc2005/qfbsp/qfbsp.vcproj
deleted file mode 100644
index 461d6734b..000000000
--- a/vc2005/qfbsp/qfbsp.vcproj
+++ /dev/null
@@ -1,637 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="qfbsp"
-	ProjectGUID="{B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}"
-	RootNamespace="qfbsp"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qfbsp\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qfbsp\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qfbsp\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qfbsp\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qfbsp\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib libzlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qfbsp\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib libzlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\tools\qfbsp\source\brush.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfbsp\source\csg4.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfbsp\source\map.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfbsp\source\merge.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfbsp\source\nodraw.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfbsp\source\options.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfbsp\source\outside.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfbsp\source\portals.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfbsp\source\qfbsp.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfbsp\source\readbsp.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfbsp\source\region.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfbsp\source\solidbsp.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfbsp\source\surfaces.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfbsp\source\tjunc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfbsp\source\writebsp.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\tools\qfbsp\include\bsp5.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfbsp\include\map.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfbsp\include\options.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\..\include\win32\resources\quakeforge.rc"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2005/qfcc/FlexBison.rules b/vc2005/qfcc/FlexBison.rules
deleted file mode 100644
index 0e4c1e3dc..000000000
--- a/vc2005/qfcc/FlexBison.rules
+++ /dev/null
@@ -1,246 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-* FlexBison.rules
-*
-*       Copyright 2006(c) Microsoft Corporation. All rights reserved.
-*
--->
-<VisualStudioToolFile
-	Name="Flex and Bison Tools"
-	Version="8.00"
-	>
-	<Rules>
-		<CustomBuildRule
-			Name="FlexGenerator"
-			DisplayName="Flex Generator"
-			CommandLine="flex.exe [AllOptions] [AdditionalOptions] [Inputs]"
-			Outputs="lex.$(InputName).c"
-			FileExtensions="*.l"
-			ExecutionDescription="Generating lexical analyser..."
-			>
-			<Properties>
-				<BooleanProperty
-					Name="BackingUpInfo"
-					DisplayName="Generate backing-up information"
-					Category="Debug information"
-					Description="Generates the file &apos;lex.backup&apos; that contains a list of scanner states which require backing up and the input characters on which they do so."
-					Switch="-b"
-				/>
-				<BooleanProperty
-					Name="DebuggerOn"
-					DisplayName="Run in debug mode"
-					Category="Debug information"
-					Description="Turn on debug mode in generated scanner"
-					Switch="-d"
-				/>
-				<BooleanProperty
-					Name="GenFast"
-					DisplayName="Generate fast large scanner"
-					PropertyPageName="Performance"
-					Description="Generate fast, large scanner"
-					Switch="-f"
-				/>
-				<BooleanProperty
-					Name="CaseInsensitive"
-					DisplayName="Case insensitive scanner"
-					Description="The case of letters given in the flex input patterns will be ignored, and tokens in the input will be matched regardless of case"
-					Switch="-i"
-				/>
-				<BooleanProperty
-					Name="CompatibilityOn"
-					DisplayName="Maximum compatibility with lex"
-					Description="Turns on maximum compatibility with the original AT&amp;T lex implementation. Note that this does not mean full compatibility."
-					Switch="-l"
-				/>
-				<BooleanProperty
-					Name="PerformanceReport"
-					DisplayName="Generate performance report"
-					PropertyPageName="Performance"
-					Description="Generates a performance report to stderr. The report consists of comments regarding features of the flex input file which will cause a serious loss of performance in the resulting scanner."
-					Switch="-p"
-				/>
-				<BooleanProperty
-					Name="SuppressDefault"
-					DisplayName="Suppress the default rule"
-					Description="Causes the default rule (that unmatched scanner input is echoed to stdout) to be suppressed. If the scanner encounters input that does not match any of its rules, it aborts with an error."
-					Switch="-s"
-				/>
-				<BooleanProperty
-					Name="SuppressWarnings"
-					DisplayName="Suppress warning messages"
-					Description="Suppress warning messages."
-					Switch="-w"
-				/>
-				<BooleanProperty
-					Name="BatchScanner"
-					DisplayName="Generate Batch Scanner"
-					PropertyPageName="Performance"
-					Description="Instructs flex to generate a batch scanner. In general, you use &apos;-B&apos; when you are certain that your scanner will never be used interactively, and you want to squeeze a little more performance out of it."
-					Switch="-B"
-				/>
-				<BooleanProperty
-					Name="FastScanner"
-					DisplayName="Use fast scanner table representation"
-					PropertyPageName="Performance"
-					Description="Specifies that the fast scanner table representation should be used (and stdio bypassed). This representation is about as fast as the full table representation &apos;(-f)&apos;, and for some sets of patterns will be considerably smaller (and for others, larger)."
-					Switch="-F"
-				/>
-				<BooleanProperty
-					Name="InteractiveScanner"
-					DisplayName="Generate an interactive scanner"
-					PropertyPageName="Performance"
-					Description="Instructs flex to generate an interactive scanner. An interactive scanner is one that looks ahead to decide what token has been matched only if it absolutely must."
-					Switch="-I"
-				/>
-				<BooleanProperty
-					Name="NoGenLineDirectives"
-					DisplayName="Don&apos;t generate #line directives"
-					Category="Debug information"
-					Description="Instructs flex not to generate &apos;#line&apos; directives. Without this option, flex peppers the generated scanner with #line directives so error messages in the actions will be correctly located with respect to either the original flex input file."
-					Switch="-L"
-				/>
-				<BooleanProperty
-					Name="TraceMode"
-					DisplayName="Trace mode"
-					Category="Debug information"
-					Description="Makes flex run in trace mode. It will generate a lot of messages to stderr concerning the form of the input and the resultant non-deterministic and deterministic finite automata."
-					Switch="-T"
-				/>
-				<StringProperty
-					Name="OutputFile"
-					DisplayName="Output File"
-					Description="The output file containing the implementation of the analyser"
-					Switch="-o[value]"
-					DefaultValue="lex.$(InputName).c"
-				/>
-				<StringProperty
-					Name="ScannerPrefix"
-					DisplayName="Scanner Prefix"
-					Description="Specify scanner prefix other than yy"
-					Switch="-P[value]"
-					DefaultValue="$(InputName)"
-				/>
-				<EnumProperty
-					Name="TableCompression"
-					DisplayName="Table Compression"
-					PropertyPageName="Performance"
-					Description="Controls the degree of table compression and, more generally, trade-offs between small scanners and fast scanners."
-					>
-					<Values>
-						<EnumValue
-							Value="0"
-							Switch="-Cem"
-							DisplayName="Equivalence classes and meta-equivalence classes (slowest &amp; smallest)"
-						/>
-						<EnumValue
-							Value="1"
-							Switch="-Cm"
-							DisplayName="Meta-equivalence classes"
-						/>
-						<EnumValue
-							Value="2"
-							Switch="-Ce"
-							DisplayName="Equivalence classes"
-						/>
-						<EnumValue
-							Value="3"
-							Switch="-C"
-							DisplayName="Compress scanner tables"
-						/>
-						<EnumValue
-							Value="4"
-							Switch="-Cfe"
-							DisplayName="Full scanner tables and equivalence classes"
-						/>
-						<EnumValue
-							Value="5"
-							Switch="-CFe"
-							DisplayName="Alternate fast scanner representation and equivalence classes"
-						/>
-						<EnumValue
-							Value="6"
-							Switch="-Cf"
-							DisplayName="Full scanner tables"
-						/>
-						<EnumValue
-							Value="7"
-							Switch="-CF"
-							DisplayName="Alternate fast scanner representation"
-						/>
-						<EnumValue
-							Value="8"
-							Switch="-Cfa"
-							DisplayName="Align data in full scanner tables (fastest &amp; largest)"
-						/>
-						<EnumValue
-							Value="9"
-							Switch="-CFa"
-							DisplayName="Align data in the alternate fast scanner representation (fastest &amp; largest)"
-						/>
-					</Values>
-				</EnumProperty>
-				<StringProperty
-					Name="SkeletonFile"
-					DisplayName="Use custom skeleton"
-					Description="Overrides the default skeleton file from which flex constructs its scanners"
-					Switch="-S[value]"
-				/>
-			</Properties>
-		</CustomBuildRule>
-		<CustomBuildRule
-			Name="BisonParser"
-			DisplayName="Bison Parser"
-			CommandLine="bison.exe [AllOptions] [AdditionalOptions] [Inputs]"
-			Outputs="$(InputName).tab.c"
-			FileExtensions="*.y"
-			ExecutionDescription="Generating parser based on grammar..."
-			>
-			<Properties>
-				<StringProperty
-					Name="FilePrefix"
-					DisplayName="File Prefix"
-					Description="Specify a prefix to use for all Bison output file names"
-					Switch="-b [value]"
-					DefaultValue="$(InputName)"
-				/>
-				<BooleanProperty
-					Name="Defines"
-					DisplayName="Use defines"
-					Description="Write an extra output file containing macro definitions for the token type names defined in the grammar and the semantic value type YYSTYPE, as well as a few extern variable declarations"
-					Switch="-d"
-				/>
-				<BooleanProperty
-					Name="NoGenLineDirectives"
-					DisplayName="Don&apos;t generate &apos;#line&apos; directives"
-					Description="Don&apos;t put any #line preprocessor commands in the parser file. Ordinarily Bison puts them in the parser file so that the C compiler and debuggers will associate errors with your source file, the grammar file."
-					Switch="-l"
-				/>
-				<StringProperty
-					Name="OutputFile"
-					DisplayName="Output file name"
-					Description="Specify the name outfile for the parser file"
-					Switch="-o [value]"
-				/>
-				<StringProperty
-					Name="RenameExternalSymbols"
-					DisplayName="Rename External Symbols"
-					Description="Rename the external symbols used in the parser so that they start with prefix instead of `yy&apos;."
-					Switch="-p [value]"
-					DefaultValue="$(InputName)"
-				/>
-				<BooleanProperty
-					Name="DebuggerOn"
-					DisplayName="Compile debugging facilities"
-					Description="Output a definition of the macro YYDEBUG into the parser file, so that the debugging facilities are compiled"
-					Switch="-t"
-				/>
-				<BooleanProperty
-					Name="Verbose"
-					DisplayName="Output parser states"
-					Description="Write an extra output file containing verbose descriptions of the parser states and what is done for each type of look-ahead token in that state"
-					Switch="-v"
-				/>
-			</Properties>
-		</CustomBuildRule>
-	</Rules>
-</VisualStudioToolFile>
diff --git a/vc2005/qfcc/qfcc.vcproj b/vc2005/qfcc/qfcc.vcproj
deleted file mode 100644
index 786974fe1..000000000
--- a/vc2005/qfcc/qfcc.vcproj
+++ /dev/null
@@ -1,970 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="qfcc"
-	ProjectGUID="{40639893-4D75-48CD-811F-4B363CC71FFA}"
-	RootNamespace="qfcc"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-		<ToolFile
-			RelativePath=".\FlexBison.rules"
-		/>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="FlexGenerator"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="BisonParser"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qfcc\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="FlexGenerator"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="BisonParser"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qfcc\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="FlexGenerator"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="BisonParser"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qfcc\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="FlexGenerator"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="BisonParser"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qfcc\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="FlexGenerator"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="BisonParser"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qfcc\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib libzlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="FlexGenerator"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="BisonParser"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qfcc\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib libzlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\tools\qfcc\source\class.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\source\constfold.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\source\cpp.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\source\debug.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\source\def.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\source\emit.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\source\expr.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\source\function.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\source\idstuff.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\source\immediate.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\source\linker.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\source\method.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\source\obj_file.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\source\opcodes.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\source\options.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\source\qc-lex.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\source\qc-lex.l"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="FlexGenerator"
-						NoGenLineDirectives="true"
-						OutputFile="$(InputDir)$(InputName).c"
-						ScannerPrefix=""
-						TableCompression="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="FlexGenerator"
-						NoGenLineDirectives="true"
-						OutputFile="$(InputDir)$(InputName).c"
-						ScannerPrefix=""
-						TableCompression="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="FlexGenerator"
-						NoGenLineDirectives="true"
-						OutputFile="$(InputDir)$(InputName).c"
-						ScannerPrefix=""
-						TableCompression="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="FlexGenerator"
-						NoGenLineDirectives="true"
-						OutputFile="$(InputDir)$(InputName).c"
-						ScannerPrefix=""
-						TableCompression="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release (static)|Win32"
-					>
-					<Tool
-						Name="FlexGenerator"
-						NoGenLineDirectives="true"
-						OutputFile="$(InputDir)$(InputName).c"
-						ScannerPrefix=""
-						TableCompression="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release (static)|x64"
-					>
-					<Tool
-						Name="FlexGenerator"
-						NoGenLineDirectives="true"
-						OutputFile="$(InputDir)$(InputName).c"
-						ScannerPrefix=""
-						TableCompression="0"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\source\qc-parse.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="__STDC__"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="__STDC__"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="__STDC__"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="__STDC__"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release (static)|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="__STDC__"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release (static)|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="__STDC__"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\source\qc-parse.y"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="BisonParser"
-						Defines="true"
-						NoGenLineDirectives="true"
-						OutputFile="$(InputDir)$(InputName).c"
-						RenameExternalSymbols=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="BisonParser"
-						Defines="true"
-						NoGenLineDirectives="true"
-						OutputFile="$(InputDir)$(InputName).c"
-						RenameExternalSymbols=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="BisonParser"
-						Defines="true"
-						NoGenLineDirectives="true"
-						OutputFile="$(InputDir)$(InputName).c"
-						RenameExternalSymbols=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="BisonParser"
-						Defines="true"
-						NoGenLineDirectives="true"
-						OutputFile="$(InputDir)$(InputName).c"
-						RenameExternalSymbols=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release (static)|Win32"
-					>
-					<Tool
-						Name="BisonParser"
-						Defines="true"
-						NoGenLineDirectives="true"
-						OutputFile="$(InputDir)$(InputName).c"
-						RenameExternalSymbols=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release (static)|x64"
-					>
-					<Tool
-						Name="BisonParser"
-						Defines="true"
-						NoGenLineDirectives="true"
-						OutputFile="$(InputDir)$(InputName).c"
-						RenameExternalSymbols=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\source\qfcc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\source\reloc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\source\strpool.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\source\struct.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\source\switch.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\source\type.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\tools\qfcc\include\class.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\include\cpp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\include\debug.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\include\def.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\include\emit.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\include\expr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\include\function.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\include\idstuff.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\include\immediate.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\include\linker.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\include\method.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\include\obj_file.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\include\opcodes.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\include\options.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\source\qc-parse.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\include\qfcc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\include\qfprogs.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\include\reloc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\include\strpool.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\include\struct.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\include\switch.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\include\type.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\..\include\win32\resources\quakeforge.rc"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2005/qfclient/qfclient.vcproj b/vc2005/qfclient/qfclient.vcproj
deleted file mode 100644
index 19d1fac4d..000000000
--- a/vc2005/qfclient/qfclient.vcproj
+++ /dev/null
@@ -1,625 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="qw-client"
-	ProjectGUID="{9A942925-61E6-4975-935A-5D62E8248E64}"
-	RootNamespace="QuakeForge"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H;CURL_STATICLIB"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H;CURL_STATICLIB"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\qw\source\cl_cam.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\cl_chat.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\cl_cmd.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\cl_cvar.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\cl_demo.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\cl_ents.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\cl_http.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\cl_input.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\cl_main.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\cl_ngraph.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\cl_parse.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\cl_pred.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\cl_screen.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\cl_skin.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\cl_slist.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\cl_tent.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\cl_view.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\locs.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\sbar.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\skin.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\teamplay.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\qw\include\cl_cam.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\include\cl_chat.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\include\cl_demo.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\include\cl_ents.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\include\cl_http.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\include\cl_input.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\include\cl_main.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\include\cl_parse.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\include\cl_pred.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\include\cl_skin.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\include\cl_slist.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\include\cl_tent.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\include\client.h"
-				>
-			</File>
-			<File
-				RelativePath="..\include\config.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\include\crudefile.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\include\game.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\include\host.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\include\map_cfg.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\include\server.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2005/qflight/qflight.vcproj b/vc2005/qflight/qflight.vcproj
deleted file mode 100644
index 820cbc14a..000000000
--- a/vc2005/qflight/qflight.vcproj
+++ /dev/null
@@ -1,625 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="qflight"
-	ProjectGUID="{5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}"
-	RootNamespace="qflight"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qflight\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qflight\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qflight\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qflight\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qflight\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib libzlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qflight\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib libzlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\tools\qflight\source\entities.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qflight\source\ltface.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qflight\source\noise.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qflight\source\options.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qflight\source\properties.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qflight\source\qflight.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qflight\source\threads.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qflight\source\trace.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qflight\source\vis.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\tools\qflight\include\entities.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qflight\include\light.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qflight\include\noise.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qflight\include\options.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qflight\include\properties.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qflight\include\threads.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\..\include\win32\resources\quakeforge.rc"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2005/qfmodelgen/qfmodelgen.vcproj b/vc2005/qfmodelgen/qfmodelgen.vcproj
deleted file mode 100644
index 24436bea5..000000000
--- a/vc2005/qfmodelgen/qfmodelgen.vcproj
+++ /dev/null
@@ -1,583 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="qfmodelgen"
-	ProjectGUID="{052C34FE-C9E2-43ED-95DA-FB3F27B44E37}"
-	RootNamespace="qfmodelgen"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qfmodelgen\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qfmodelgen\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qfmodelgen\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qfmodelgen\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qfmodelgen\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib libzlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qfmodelgen\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib libzlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\tools\qfmodelgen\source\lbmlib.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfmodelgen\source\modelgen.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfmodelgen\source\trilib.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\tools\qfmodelgen\include\lbmlib.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfmodelgen\include\trilib.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\..\include\win32\resources\quakeforge.rc"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2005/qfprogs/qfprogs.vcproj b/vc2005/qfprogs/qfprogs.vcproj
deleted file mode 100644
index d77e43a2e..000000000
--- a/vc2005/qfprogs/qfprogs.vcproj
+++ /dev/null
@@ -1,595 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="qfprogs"
-	ProjectGUID="{5FA27C8E-51B1-445A-A375-FBE74F0984B1}"
-	RootNamespace="qfprogs"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qfcc\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qfcc\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qfcc\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qfcc\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qfcc\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib libzlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qfcc\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib libzlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\tools\qfcc\source\disassemble.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\source\globals.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\source\lines.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\source\modules.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\source\obj_file.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\source\qfprogs.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\source\strings.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\source\stub.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\..\include\win32\resources\quakeforge.rc"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2005/qfserver/qfserver.vcproj b/vc2005/qfserver/qfserver.vcproj
deleted file mode 100644
index 2852ccec3..000000000
--- a/vc2005/qfserver/qfserver.vcproj
+++ /dev/null
@@ -1,677 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="qw-server"
-	ProjectGUID="{544D097C-9C24-4C57-A171-8C8029421185}"
-	RootNamespace="qfserver"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib libzlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib libzlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\qw\source\crudefile.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\sv_ccmds.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\sv_demo.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\sv_ents.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\sv_gib.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\sv_init.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\sv_main.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\sv_move.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\sv_phys.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\sv_pr_cmds.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\sv_pr_cpqw.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\sv_pr_qwe.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\sv_progs.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\sv_qtv.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\sv_recorder.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\sv_sbar.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\sv_send.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\sv_sys_win.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\sv_user.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\world.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\qw\include\sv_demo.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\include\sv_gib.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\include\sv_pr_cmds.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\include\sv_pr_cpqw.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\include\sv_pr_qwe.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\include\sv_progs.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\include\sv_qtv.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\include\sv_recorder.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\..\include\win32\resources\quakeforge.rc"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2005/qfvis/qfvis.vcproj b/vc2005/qfvis/qfvis.vcproj
deleted file mode 100644
index 4e34daab8..000000000
--- a/vc2005/qfvis/qfvis.vcproj
+++ /dev/null
@@ -1,593 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="qfvis"
-	ProjectGUID="{E5D842C5-669F-4FC7-A5E0-44B562F86435}"
-	RootNamespace="qfvis"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qfvis\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qfvis\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qfvis\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qfvis\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qfvis\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib libzlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qfvis\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib libzlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\tools\qfvis\source\base-vis.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfvis\source\flow.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfvis\source\options.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfvis\source\qfvis.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfvis\source\soundphs.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\tools\qfvis\include\options.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfvis\include\vis.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\..\include\win32\resources\quakeforge.rc"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2005/qfwavinfo/qfwavinfo.vcproj b/vc2005/qfwavinfo/qfwavinfo.vcproj
deleted file mode 100644
index 9e2ead0d5..000000000
--- a/vc2005/qfwavinfo/qfwavinfo.vcproj
+++ /dev/null
@@ -1,567 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="qfwavinfo"
-	ProjectGUID="{56BD559B-1590-4FC4-B441-AB1973BAC2BD}"
-	RootNamespace="qfwavinfo"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib libzlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib libzlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\tools\wav\qfwavinfo.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\..\include\win32\resources\quakeforge.rc"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2005/qtv/qtv.vcproj b/vc2005/qtv/qtv.vcproj
deleted file mode 100644
index 127035507..000000000
--- a/vc2005/qtv/qtv.vcproj
+++ /dev/null
@@ -1,599 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="qtv"
-	ProjectGUID="{05E68E3B-5901-43A9-981D-CF392C0F5C6C}"
-	RootNamespace="qtv"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qtv\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qtv\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qtv\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qtv\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qtv\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib libzlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qtv\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib libzlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\qtv\source\client.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qtv\source\connection.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qtv\source\qtv.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qtv\source\server.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qtv\source\sv_parse.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\qtv\include\client.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qtv\include\connection.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qtv\include\qtv.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qtv\include\server.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\..\include\win32\resources\quakeforge.rc"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2005/qw-client-sdl/qw-client-sdl.vcproj b/vc2005/qw-client-sdl/qw-client-sdl.vcproj
deleted file mode 100644
index 188d11f88..000000000
--- a/vc2005/qw-client-sdl/qw-client-sdl.vcproj
+++ /dev/null
@@ -1,563 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="qw-client-sdl"
-	ProjectGUID="{B44CB3E0-F2FD-4260-A632-C01FB881613E}"
-	RootNamespace="qwclientsdl"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib curl.lib zlib.lib sdl.lib sdlmain.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib curl.lib zlib.lib sdl.lib sdlmain.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H;SDL_STATIC"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib dxguid.lib libcurl.lib libzlib.lib libsdl.lib libsdlmain.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib curl.lib zlib.lib sdl.lib sdlmain.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib curl.lib zlib.lib sdl.lib sdlmain.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H;SDL_STATIC"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib dxguid.lib libcurl.lib libzlib.lib libsdl.lib libsdlmain.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\qw\source\cl_sys_sdl.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\..\include\win32\resources\quakeforge.rc"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2005/qw-client-sdl32/qw-client-sdl32.vcproj b/vc2005/qw-client-sdl32/qw-client-sdl32.vcproj
deleted file mode 100644
index ccbdb9c89..000000000
--- a/vc2005/qw-client-sdl32/qw-client-sdl32.vcproj
+++ /dev/null
@@ -1,567 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="qw-client-sdl32"
-	ProjectGUID="{CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}"
-	RootNamespace="qwclientsdl32"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib curl.lib zlib.lib sdl.lib sdlmain.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib curl.lib zlib.lib sdl.lib sdlmain.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H;SDL_STATIC"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib dxguid.lib libcurl.lib libzlib.lib libsdl.lib libsdlmain.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib curl.lib zlib.lib sdl.lib sdlmain.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib curl.lib zlib.lib sdl.lib sdlmain.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H;SDL_STATIC"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib dxguid.lib libcurl.lib libzlib.lib libsdl.lib libsdlmain.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\qw\source\cl_sys_sdl.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\..\include\win32\resources\quakeforge.rc"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2005/qw-client-sgl/qw-client-sgl.vcproj b/vc2005/qw-client-sgl/qw-client-sgl.vcproj
deleted file mode 100644
index 22adf9217..000000000
--- a/vc2005/qw-client-sgl/qw-client-sgl.vcproj
+++ /dev/null
@@ -1,567 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="qw-client-sgl"
-	ProjectGUID="{649C4168-1C65-4E41-818F-85A1C52C1B8F}"
-	RootNamespace="qwclientsgl"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib curl.lib zlib.lib sdl.lib sdlmain.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib curl.lib zlib.lib sdl.lib sdlmain.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H;SDL_STATIC"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib dxguid.lib libcurl.lib libzlib.lib libsdl.lib libsdlmain.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib curl.lib zlib.lib sdl.lib sdlmain.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib curl.lib zlib.lib sdl.lib sdlmain.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H;SDL_STATIC"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib dxguid.lib libcurl.lib libzlib.lib libsdl.lib libsdlmain.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\qw\source\cl_sys_sdl.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\..\include\win32\resources\quakeforge.rc"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2005/qw-client-wgl/qw-client-wgl.vcproj b/vc2005/qw-client-wgl/qw-client-wgl.vcproj
deleted file mode 100644
index 96fb8c16a..000000000
--- a/vc2005/qw-client-wgl/qw-client-wgl.vcproj
+++ /dev/null
@@ -1,563 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="qw-client-wgl"
-	ProjectGUID="{5FD733BF-B3C6-4A96-BED7-35E2484448E1}"
-	RootNamespace="qwclientwgl"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib curl.lib zlib.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib curl.lib zlib.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib curl.lib zlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib curl.lib zlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib libcurl.lib libzlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib libcurl.lib libzlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\qw\source\cl_sys_win.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\..\include\win32\resources\quakeforge.rc"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2005/qw-master/qw-master.vcproj b/vc2005/qw-master/qw-master.vcproj
deleted file mode 100644
index a8605e358..000000000
--- a/vc2005/qw-master/qw-master.vcproj
+++ /dev/null
@@ -1,567 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="qw-master"
-	ProjectGUID="{445A2500-3BBC-449A-A929-C419C2A16051}"
-	RootNamespace="qw-master"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib libzlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib libzlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\qw\source\master.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\..\include\win32\resources\quakeforge.rc"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2005/qw/qw.vcproj b/vc2005/qw/qw.vcproj
deleted file mode 100644
index d73566194..000000000
--- a/vc2005/qw/qw.vcproj
+++ /dev/null
@@ -1,473 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="qw"
-	ProjectGUID="{6ADA4322-693A-46BB-897B-17BB5BE9F08C}"
-	RootNamespace="qw"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\libs\qw\msg_backbuf.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\qw\msg_ucmd.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2005/readme.txt b/vc2005/readme.txt
deleted file mode 100644
index 8c50717db..000000000
--- a/vc2005/readme.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-Requirements
-=============
-- Visual C++ 2005 SP1
-- Windows Vista SDK (previous RC compilers won't recognize the
-  high-resolution Vista icon)
-- DirectX SDK (for DirectInput)
-- SDL (required for sdl, sdl32, and sgl builds)
-- bison/flex (required for qfcc, needs to be in your compiler path)
-
-Optional
-=========
-- zlib (#undef HAVE_ZLIB from vc2005/include/config.h if you don't want
-  this).  Expects zlib.lib and zlib.dll for Debug/Release builds, and
-  libzlib.lib for Release (static) build.
-- libcurl (#undef HAVE_LIBCURL from vc2005/include/config.h if you don't
-  want this).  Expects curl.lib and curl.dll for Debug/Release builds,
-  and libcurl.lib for Release (static) build.
-
-Notes
-======
-By default, qfcc is configured to use the Boost Wave preprocessor.  You
-can get this from http://www.boost.org, or change the CPP_NAME #define in
-vc2005/include/config.h to whatever preprocessor you want.  If you have
-GCC, you can simply replace "wave --c99" with "gcc" in the define and it
-should work.
-
-clean.ps1 is a Windows Powershell script that cleans up any build files.
diff --git a/vc2005/ruamoko/ruamoko.vcproj b/vc2005/ruamoko/ruamoko.vcproj
deleted file mode 100644
index 93fd48673..000000000
--- a/vc2005/ruamoko/ruamoko.vcproj
+++ /dev/null
@@ -1,517 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="ruamoko"
-	ProjectGUID="{51028ACF-53D4-4478-8500-55E6B8A81375}"
-	RootNamespace="ruamoko"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\libs\ruamoko\rua_cbuf.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\ruamoko\rua_cmd.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\ruamoko\rua_cvar.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\ruamoko\rua_file.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\ruamoko\rua_hash.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\ruamoko\rua_init.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\ruamoko\rua_math.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\ruamoko\rua_obj.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\ruamoko\rua_plist.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\ruamoko\rua_qfile.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\ruamoko\rua_qfs.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\ruamoko\rua_script.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\ruamoko\rua_string.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2005/sound/sound.vcproj b/vc2005/sound/sound.vcproj
deleted file mode 100644
index 50c25ce4c..000000000
--- a/vc2005/sound/sound.vcproj
+++ /dev/null
@@ -1,513 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="sound"
-	ProjectGUID="{BF149D97-7520-4788-9CD1-3D99C5C8150F}"
-	RootNamespace="sound"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\libs\audio\cd.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\audio\cd_win.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\audio\snd.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\audio\renderer\snd_channels.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\audio\renderer\snd_dma.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\audio\renderer\snd_mem.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\audio\renderer\snd_mix.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\audio\snd_progs.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\audio\renderer\snd_resample.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\audio\renderer\snd_sfx.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\audio\targets\snd_win.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\audio\renderer\wav.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2005/util/util.vcproj b/vc2005/util/util.vcproj
deleted file mode 100644
index 021e3d655..000000000
--- a/vc2005/util/util.vcproj
+++ /dev/null
@@ -1,617 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="util"
-	ProjectGUID="{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}"
-	RootNamespace="util"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H;ZLIB_DLL"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H;ZLIB_DLL"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H;ZLIB_DLL"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H;ZLIB_DLL"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\libs\util\bspfile.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\buildnum.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\cbuf.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\checksum.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\cmd.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\crc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\cvar.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\dirent.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\dstring.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\fendian.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\fnmatch.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\getopt.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\getopt1.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\hash.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\idparse.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\info.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\link.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\llist.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\mathlib.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\mdfour.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\msg.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\pakfile.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\plugin.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\qargs.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\qendian.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\qfplist.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\quakefs.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\quakeio.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\riff.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\script.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\sizebuf.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\string.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\sys.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\va.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\ver_check.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\wad.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\wadfile.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\zone.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2005/video-sdl/video-sdl.vcproj b/vc2005/video-sdl/video-sdl.vcproj
deleted file mode 100644
index 5efd89c56..000000000
--- a/vc2005/video-sdl/video-sdl.vcproj
+++ /dev/null
@@ -1,471 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="video-sdl"
-	ProjectGUID="{44A18410-3AA8-4A64-935B-D20223AD6885}"
-	RootNamespace="videosdl"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H;SDL_STATIC"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H;SDL_STATIC"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\libs\video\targets\context_sdl.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\video\targets\in_sdl.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2005/video-sgl/video-sgl.vcproj b/vc2005/video-sgl/video-sgl.vcproj
deleted file mode 100644
index 94be99a3a..000000000
--- a/vc2005/video-sgl/video-sgl.vcproj
+++ /dev/null
@@ -1,467 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="video-sgl"
-	ProjectGUID="{7E30C3B1-AEE7-483D-B231-C672365CD2D7}"
-	RootNamespace="videosgl"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H;SDL_STATIC"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H;SDL_STATIC"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\libs\video\targets\vid_sgl.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2005/video-sw/video-sw.vcproj b/vc2005/video-sw/video-sw.vcproj
deleted file mode 100644
index 9158369bf..000000000
--- a/vc2005/video-sw/video-sw.vcproj
+++ /dev/null
@@ -1,595 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="video-sw"
-	ProjectGUID="{66D3A191-E4D5-45F3-86BD-EFBB249CD554}"
-	RootNamespace="videosw"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H;SDL_STATIC"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H;SDL_STATIC"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<Filter
-				Name="renderer"
-				>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw\d_edge.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw\d_fill.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw\d_init.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw\d_modech.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw\d_part.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw\d_polyse.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw\d_scan.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw\d_sky.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw\d_sprite.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw\d_surf.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw\d_vars.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw\d_zpoint.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw\draw.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw\fpu.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw\nonintel.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw\screen.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw\sw_graph.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw\sw_raclip.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw\sw_ralias.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw\sw_rbsp.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw\sw_rdraw.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw\sw_redge.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw\sw_rmain.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw\sw_rmisc.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw\sw_rpart.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw\sw_rsky.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw\sw_rsprite.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw\sw_rsurf.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw\sw_skin.c"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="target"
-				>
-				<File
-					RelativePath="..\..\libs\video\targets\vid_common_sw.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\targets\vid_sdl.c"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2005/video-sw32/video-sw32.vcproj b/vc2005/video-sw32/video-sw32.vcproj
deleted file mode 100644
index fd4ed7caa..000000000
--- a/vc2005/video-sw32/video-sw32.vcproj
+++ /dev/null
@@ -1,571 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="video-sw32"
-	ProjectGUID="{D5B9558F-EF25-4167-ACE4-723C7413B390}"
-	RootNamespace="videosw32"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H;SDL_STATIC"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H;SDL_STATIC"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<Filter
-				Name="renderer"
-				>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw32\d_edge.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw32\d_fill.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw32\d_init.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw32\d_modech.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw32\d_part.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw32\d_polyse.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw32\d_scan.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw32\d_sky.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw32\d_sprite.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw32\d_surf.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw32\d_vars.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw32\d_zpoint.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw32\draw.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw32\screen.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw32\sw32_graph.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw32\sw32_raclip.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw32\sw32_ralias.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw32\sw32_rbsp.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw32\sw32_rdraw.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw32\sw32_redge.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw32\sw32_rmain.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw32\sw32_rmisc.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw32\sw32_rpart.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw32\sw32_rsky.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw32\sw32_rsprite.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw32\sw32_rsurf.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw32\sw32_skin.c"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="target"
-				>
-				<File
-					RelativePath="..\..\libs\video\targets\vid_common_sw32.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\targets\vid_sdl32.c"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2005/video-wgl/video-wgl.vcproj b/vc2005/video-wgl/video-wgl.vcproj
deleted file mode 100644
index 0087c8b78..000000000
--- a/vc2005/video-wgl/video-wgl.vcproj
+++ /dev/null
@@ -1,471 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="video-wgl"
-	ProjectGUID="{178D81A7-F2FB-41D7-B300-9D1A4DE5E137}"
-	RootNamespace="videowgl"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\libs\video\targets\in_win.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\video\targets\vid_wgl.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2005/video/video.vcproj b/vc2005/video/video.vcproj
deleted file mode 100644
index 44213b2a4..000000000
--- a/vc2005/video/video.vcproj
+++ /dev/null
@@ -1,537 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="video"
-	ProjectGUID="{E7B3D07D-2FE8-481B-8DAB-6255A412A42F}"
-	RootNamespace="video"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<Filter
-				Name="renderer"
-				>
-				<File
-					RelativePath="..\..\libs\video\renderer\r_cvar.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\r_efrag.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\r_ent.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\r_graph.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\r_light.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\r_main.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\r_part.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\r_progs.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\r_screen.c"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="targets"
-				>
-				<File
-					RelativePath="..\..\libs\video\targets\in_common.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\targets\in_event.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\targets\joy.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\targets\joy_win.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\targets\keys.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\targets\old_keys.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\targets\vid.c"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2005/videogl/videogl.vcproj b/vc2005/videogl/videogl.vcproj
deleted file mode 100644
index cfd456dc5..000000000
--- a/vc2005/videogl/videogl.vcproj
+++ /dev/null
@@ -1,555 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="video-gl"
-	ProjectGUID="{C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}"
-	RootNamespace="videogl"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<Filter
-				Name="target"
-				>
-				<File
-					RelativePath="..\..\libs\video\targets\qfgl_ext.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\targets\vid_common_gl.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\targets\vtxarray.c"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="renderer"
-				>
-				<File
-					RelativePath="..\..\libs\video\renderer\gl\gl_draw.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\gl\gl_dyn_lights.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\gl\gl_dyn_part.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\gl\gl_dyn_textures.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\gl\gl_graph.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\gl\gl_lightmap.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\gl\gl_mod_alias.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\gl\gl_mod_sprite.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\gl\gl_rmain.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\gl\gl_rmisc.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\gl\gl_rsurf.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\gl\gl_screen.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\gl\gl_skin.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\gl\gl_sky.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\gl\gl_sky_clip.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\gl\gl_textures.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\gl\gl_warp.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\gl\noisetextures.c"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2005/wad/wad.vcproj b/vc2005/wad/wad.vcproj
deleted file mode 100644
index 044bff20a..000000000
--- a/vc2005/wad/wad.vcproj
+++ /dev/null
@@ -1,579 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="wad"
-	ProjectGUID="{88422448-C5FB-46F3-A0B3-0811F90E537C}"
-	RootNamespace="wad"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib libzlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib libzlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\tools\wad\grab.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\wad\script.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\wad\wad.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\tools\wad\wad.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\..\include\win32\resources\quakeforge.rc"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2008/Makefile.am b/vc2008/Makefile.am
deleted file mode 100644
index 04c53f194..000000000
--- a/vc2008/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-## Process this file with automake to produce Makefile.in
-AUTOMAKE_OPTIONS=	foreign
-EXTRA_DIST = \
-	Makefile.am QuakeForge.sln bsp2img/bsp2img.vcproj \
-	builtins/builtins.vcproj clean.ps1 common/common.vcproj \
-	console/console.vcproj console_client/console_client.vcproj \
-	console_server/console_server.vcproj engine/engine.vcproj gib/gib.vcproj \
-	hw-master/hw-master.vcproj image/image.vcproj include/config.h \
-	models-sw/models-sw.vcproj models/models.vcproj modelsgl/modelsgl.vcproj \
-	net-main/net-main.vcproj net/net.vcproj nq-common/nq-common.vcproj \
-	nq-sdl/nq-sdl.vcproj nq-sdl32/nq-sdl32.vcproj nq-server/nq-server.vcproj \
-	nq-sgl/nq-sgl.vcproj nq-wgl/nq-wgl.vcproj nq/nq.vcproj pak/pak.vcproj \
-	qfbsp/qfbsp.vcproj qfcc/FlexBison.rules qfcc/qfcc.vcproj \
-	qfclient/qfclient.vcproj qflight/qflight.vcproj \
-	qfmodelgen/qfmodelgen.vcproj qfprogs/qfprogs.vcproj \
-	qfserver/qfserver.vcproj qfvis/qfvis.vcproj qfwavinfo/qfwavinfo.vcproj \
-	qtv/qtv.vcproj qw-client-sdl/qw-client-sdl.vcproj \
-	qw-client-sdl32/qw-client-sdl32.vcproj qw-client-sgl/qw-client-sgl.vcproj \
-	qw-client-wgl/qw-client-wgl.vcproj qw-master/qw-master.vcproj \
-	qw/qw.vcproj readme.txt ruamoko/ruamoko.vcproj sound/sound.vcproj \
-	util/util.vcproj video-sdl/video-sdl.vcproj video-sgl/video-sgl.vcproj \
-	video-sw/video-sw.vcproj video-sw32/video-sw32.vcproj \
-	video-wgl/video-wgl.vcproj video/video.vcproj videogl/videogl.vcproj \
-	wad/wad.vcproj
diff --git a/vc2008/QuakeForge.sln b/vc2008/QuakeForge.sln
deleted file mode 100644
index 296484c89..000000000
--- a/vc2008/QuakeForge.sln
+++ /dev/null
@@ -1,966 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{3CDA2798-7565-47C5-B972-F9E63DBEFFFA}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qw-client", "qfclient\qfclient.vcproj", "{9A942925-61E6-4975-935A-5D62E8248E64}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qw", "qw\qw.vcproj", "{6ADA4322-693A-46BB-897B-17BB5BE9F08C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "net-chan", "net\net.vcproj", "{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ruamoko", "ruamoko\ruamoko.vcproj", "{51028ACF-53D4-4478-8500-55E6B8A81375}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "models-gl", "modelsgl\modelsgl.vcproj", "{1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "console", "console\console.vcproj", "{ED4AFBF5-C247-4352-966D-048B8998C6A1}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gib", "gib\gib.vcproj", "{01C3B138-9D45-4ED6-A763-893C067262C2}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "util", "util\util.vcproj", "{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "engine", "engine\engine.vcproj", "{2626C0E1-6F5C-47D3-B80D-93942D766DD7}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "builtins", "builtins\builtins.vcproj", "{04FA9D77-E45F-4917-B972-B353BA6A6FA8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sound", "sound\sound.vcproj", "{BF149D97-7520-4788-9CD1-3D99C5C8150F}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "image", "image\image.vcproj", "{5203F034-0047-4EC0-B7E9-D037FAF5D536}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "video", "video\video.vcproj", "{E7B3D07D-2FE8-481B-8DAB-6255A412A42F}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qw-common", "common\common.vcproj", "{BC1F021A-1EEC-4A7A-B746-5AA6048E478C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qw-server", "qfserver\qfserver.vcproj", "{544D097C-9C24-4C57-A171-8C8029421185}"
-	ProjectSection(ProjectDependencies) = postProject
-		{6ADA4322-693A-46BB-897B-17BB5BE9F08C} = {6ADA4322-693A-46BB-897B-17BB5BE9F08C}
-		{B37FE734-01F4-4799-86B2-D084820715BE} = {B37FE734-01F4-4799-86B2-D084820715BE}
-		{BC1F021A-1EEC-4A7A-B746-5AA6048E478C} = {BC1F021A-1EEC-4A7A-B746-5AA6048E478C}
-		{DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A} = {DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}
-		{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} = {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1}
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7}
-		{51028ACF-53D4-4478-8500-55E6B8A81375} = {51028ACF-53D4-4478-8500-55E6B8A81375}
-		{04FA9D77-E45F-4917-B972-B353BA6A6FA8} = {04FA9D77-E45F-4917-B972-B353BA6A6FA8}
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}
-		{01C3B138-9D45-4ED6-A763-893C067262C2} = {01C3B138-9D45-4ED6-A763-893C067262C2}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "models", "models\models.vcproj", "{DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "console-client", "console_client\console_client.vcproj", "{226D42CE-5833-444E-94FA-84C1D51892A8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "console-server", "console_server\console_server.vcproj", "{B37FE734-01F4-4799-86B2-D084820715BE}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qfbsp", "qfbsp\qfbsp.vcproj", "{B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}"
-	ProjectSection(ProjectDependencies) = postProject
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qflight", "qflight\qflight.vcproj", "{5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}"
-	ProjectSection(ProjectDependencies) = postProject
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qfvis", "qfvis\qfvis.vcproj", "{E5D842C5-669F-4FC7-A5E0-44B562F86435}"
-	ProjectSection(ProjectDependencies) = postProject
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qw-master", "qw-master\qw-master.vcproj", "{445A2500-3BBC-449A-A929-C419C2A16051}"
-	ProjectSection(ProjectDependencies) = postProject
-		{B37FE734-01F4-4799-86B2-D084820715BE} = {B37FE734-01F4-4799-86B2-D084820715BE}
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1}
-		{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} = {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qfmodelgen", "qfmodelgen\qfmodelgen.vcproj", "{052C34FE-C9E2-43ED-95DA-FB3F27B44E37}"
-	ProjectSection(ProjectDependencies) = postProject
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qfprogs", "qfprogs\qfprogs.vcproj", "{5FA27C8E-51B1-445A-A375-FBE74F0984B1}"
-	ProjectSection(ProjectDependencies) = postProject
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qfwavinfo", "qfwavinfo\qfwavinfo.vcproj", "{56BD559B-1590-4FC4-B441-AB1973BAC2BD}"
-	ProjectSection(ProjectDependencies) = postProject
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wad", "wad\wad.vcproj", "{88422448-C5FB-46F3-A0B3-0811F90E537C}"
-	ProjectSection(ProjectDependencies) = postProject
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}
-		{5203F034-0047-4EC0-B7E9-D037FAF5D536} = {5203F034-0047-4EC0-B7E9-D037FAF5D536}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pak", "pak\pak.vcproj", "{9EE8BD4B-47D3-4AD5-A8B9-831329792A05}"
-	ProjectSection(ProjectDependencies) = postProject
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bsp2img", "bsp2img\bsp2img.vcproj", "{4605418D-2292-470A-AB18-C2119B016F71}"
-	ProjectSection(ProjectDependencies) = postProject
-		{5203F034-0047-4EC0-B7E9-D037FAF5D536} = {5203F034-0047-4EC0-B7E9-D037FAF5D536}
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qtv", "qtv\qtv.vcproj", "{05E68E3B-5901-43A9-981D-CF392C0F5C6C}"
-	ProjectSection(ProjectDependencies) = postProject
-		{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} = {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}
-		{B37FE734-01F4-4799-86B2-D084820715BE} = {B37FE734-01F4-4799-86B2-D084820715BE}
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1}
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}
-		{6ADA4322-693A-46BB-897B-17BB5BE9F08C} = {6ADA4322-693A-46BB-897B-17BB5BE9F08C}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nq-common", "nq-common\nq-common.vcproj", "{6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nq-wgl", "nq-wgl\nq-wgl.vcproj", "{1CD1A18B-95D5-4EA4-917C-34B10066BFCC}"
-	ProjectSection(ProjectDependencies) = postProject
-		{B37FE734-01F4-4799-86B2-D084820715BE} = {B37FE734-01F4-4799-86B2-D084820715BE}
-		{178D81A7-F2FB-41D7-B300-9D1A4DE5E137} = {178D81A7-F2FB-41D7-B300-9D1A4DE5E137}
-		{155112B9-A8A9-4E06-90F5-4AAAB32B2F70} = {155112B9-A8A9-4E06-90F5-4AAAB32B2F70}
-		{C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F} = {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7}
-		{5203F034-0047-4EC0-B7E9-D037FAF5D536} = {5203F034-0047-4EC0-B7E9-D037FAF5D536}
-		{01C3B138-9D45-4ED6-A763-893C067262C2} = {01C3B138-9D45-4ED6-A763-893C067262C2}
-		{6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80} = {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}
-		{04FA9D77-E45F-4917-B972-B353BA6A6FA8} = {04FA9D77-E45F-4917-B972-B353BA6A6FA8}
-		{E7B3D07D-2FE8-481B-8DAB-6255A412A42F} = {E7B3D07D-2FE8-481B-8DAB-6255A412A42F}
-		{BF149D97-7520-4788-9CD1-3D99C5C8150F} = {BF149D97-7520-4788-9CD1-3D99C5C8150F}
-		{226D42CE-5833-444E-94FA-84C1D51892A8} = {226D42CE-5833-444E-94FA-84C1D51892A8}
-		{51028ACF-53D4-4478-8500-55E6B8A81375} = {51028ACF-53D4-4478-8500-55E6B8A81375}
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1}
-		{053E1EE2-75B4-4D9A-B8AE-89600BCB60A5} = {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}
-		{1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7} = {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "net-main", "net-main\net-main.vcproj", "{053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nq-server", "nq-server\nq-server.vcproj", "{231C032C-DE16-459A-8E7D-6509C2EC3998}"
-	ProjectSection(ProjectDependencies) = postProject
-		{B37FE734-01F4-4799-86B2-D084820715BE} = {B37FE734-01F4-4799-86B2-D084820715BE}
-		{01C3B138-9D45-4ED6-A763-893C067262C2} = {01C3B138-9D45-4ED6-A763-893C067262C2}
-		{6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80} = {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}
-		{04FA9D77-E45F-4917-B972-B353BA6A6FA8} = {04FA9D77-E45F-4917-B972-B353BA6A6FA8}
-		{51028ACF-53D4-4478-8500-55E6B8A81375} = {51028ACF-53D4-4478-8500-55E6B8A81375}
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7}
-		{053E1EE2-75B4-4D9A-B8AE-89600BCB60A5} = {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1}
-		{DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A} = {DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hw-master", "hw-master\hw-master.vcproj", "{419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}"
-	ProjectSection(ProjectDependencies) = postProject
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1}
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}
-		{B37FE734-01F4-4799-86B2-D084820715BE} = {B37FE734-01F4-4799-86B2-D084820715BE}
-		{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} = {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qfcc", "qfcc\qfcc.vcproj", "{40639893-4D75-48CD-811F-4B363CC71FFA}"
-	ProjectSection(ProjectDependencies) = postProject
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7}
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qw-client-wgl", "qw-client-wgl\qw-client-wgl.vcproj", "{5FD733BF-B3C6-4A96-BED7-35E2484448E1}"
-	ProjectSection(ProjectDependencies) = postProject
-		{04FA9D77-E45F-4917-B972-B353BA6A6FA8} = {04FA9D77-E45F-4917-B972-B353BA6A6FA8}
-		{226D42CE-5833-444E-94FA-84C1D51892A8} = {226D42CE-5833-444E-94FA-84C1D51892A8}
-		{1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7} = {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7}
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1}
-		{51028ACF-53D4-4478-8500-55E6B8A81375} = {51028ACF-53D4-4478-8500-55E6B8A81375}
-		{BF149D97-7520-4788-9CD1-3D99C5C8150F} = {BF149D97-7520-4788-9CD1-3D99C5C8150F}
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}
-		{E7B3D07D-2FE8-481B-8DAB-6255A412A42F} = {E7B3D07D-2FE8-481B-8DAB-6255A412A42F}
-		{9A942925-61E6-4975-935A-5D62E8248E64} = {9A942925-61E6-4975-935A-5D62E8248E64}
-		{6ADA4322-693A-46BB-897B-17BB5BE9F08C} = {6ADA4322-693A-46BB-897B-17BB5BE9F08C}
-		{BC1F021A-1EEC-4A7A-B746-5AA6048E478C} = {BC1F021A-1EEC-4A7A-B746-5AA6048E478C}
-		{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} = {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}
-		{C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F} = {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}
-		{5203F034-0047-4EC0-B7E9-D037FAF5D536} = {5203F034-0047-4EC0-B7E9-D037FAF5D536}
-		{178D81A7-F2FB-41D7-B300-9D1A4DE5E137} = {178D81A7-F2FB-41D7-B300-9D1A4DE5E137}
-		{01C3B138-9D45-4ED6-A763-893C067262C2} = {01C3B138-9D45-4ED6-A763-893C067262C2}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qw-client-sgl", "qw-client-sgl\qw-client-sgl.vcproj", "{649C4168-1C65-4E41-818F-85A1C52C1B8F}"
-	ProjectSection(ProjectDependencies) = postProject
-		{5203F034-0047-4EC0-B7E9-D037FAF5D536} = {5203F034-0047-4EC0-B7E9-D037FAF5D536}
-		{01C3B138-9D45-4ED6-A763-893C067262C2} = {01C3B138-9D45-4ED6-A763-893C067262C2}
-		{04FA9D77-E45F-4917-B972-B353BA6A6FA8} = {04FA9D77-E45F-4917-B972-B353BA6A6FA8}
-		{E7B3D07D-2FE8-481B-8DAB-6255A412A42F} = {E7B3D07D-2FE8-481B-8DAB-6255A412A42F}
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}
-		{BF149D97-7520-4788-9CD1-3D99C5C8150F} = {BF149D97-7520-4788-9CD1-3D99C5C8150F}
-		{226D42CE-5833-444E-94FA-84C1D51892A8} = {226D42CE-5833-444E-94FA-84C1D51892A8}
-		{51028ACF-53D4-4478-8500-55E6B8A81375} = {51028ACF-53D4-4478-8500-55E6B8A81375}
-		{BC1F021A-1EEC-4A7A-B746-5AA6048E478C} = {BC1F021A-1EEC-4A7A-B746-5AA6048E478C}
-		{9A942925-61E6-4975-935A-5D62E8248E64} = {9A942925-61E6-4975-935A-5D62E8248E64}
-		{6ADA4322-693A-46BB-897B-17BB5BE9F08C} = {6ADA4322-693A-46BB-897B-17BB5BE9F08C}
-		{1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7} = {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7}
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1}
-		{C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F} = {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}
-		{44A18410-3AA8-4A64-935B-D20223AD6885} = {44A18410-3AA8-4A64-935B-D20223AD6885}
-		{7E30C3B1-AEE7-483D-B231-C672365CD2D7} = {7E30C3B1-AEE7-483D-B231-C672365CD2D7}
-		{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} = {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "video-gl", "videogl\videogl.vcproj", "{C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "video-sdl", "video-sdl\video-sdl.vcproj", "{44A18410-3AA8-4A64-935B-D20223AD6885}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qw-client-sdl", "qw-client-sdl\qw-client-sdl.vcproj", "{B44CB3E0-F2FD-4260-A632-C01FB881613E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{66D3A191-E4D5-45F3-86BD-EFBB249CD554} = {66D3A191-E4D5-45F3-86BD-EFBB249CD554}
-		{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} = {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}
-		{44A18410-3AA8-4A64-935B-D20223AD6885} = {44A18410-3AA8-4A64-935B-D20223AD6885}
-		{BC1F021A-1EEC-4A7A-B746-5AA6048E478C} = {BC1F021A-1EEC-4A7A-B746-5AA6048E478C}
-		{6ADA4322-693A-46BB-897B-17BB5BE9F08C} = {6ADA4322-693A-46BB-897B-17BB5BE9F08C}
-		{9A942925-61E6-4975-935A-5D62E8248E64} = {9A942925-61E6-4975-935A-5D62E8248E64}
-		{5203F034-0047-4EC0-B7E9-D037FAF5D536} = {5203F034-0047-4EC0-B7E9-D037FAF5D536}
-		{01C3B138-9D45-4ED6-A763-893C067262C2} = {01C3B138-9D45-4ED6-A763-893C067262C2}
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}
-		{04FA9D77-E45F-4917-B972-B353BA6A6FA8} = {04FA9D77-E45F-4917-B972-B353BA6A6FA8}
-		{E7B3D07D-2FE8-481B-8DAB-6255A412A42F} = {E7B3D07D-2FE8-481B-8DAB-6255A412A42F}
-		{BF149D97-7520-4788-9CD1-3D99C5C8150F} = {BF149D97-7520-4788-9CD1-3D99C5C8150F}
-		{226D42CE-5833-444E-94FA-84C1D51892A8} = {226D42CE-5833-444E-94FA-84C1D51892A8}
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7}
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1}
-		{51028ACF-53D4-4478-8500-55E6B8A81375} = {51028ACF-53D4-4478-8500-55E6B8A81375}
-		{F4A9881E-0EB0-44A1-9664-B6CBDE992861} = {F4A9881E-0EB0-44A1-9664-B6CBDE992861}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "models-sw", "models-sw\models-sw.vcproj", "{F4A9881E-0EB0-44A1-9664-B6CBDE992861}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "video-sw", "video-sw\video-sw.vcproj", "{66D3A191-E4D5-45F3-86BD-EFBB249CD554}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qw-client-sdl32", "qw-client-sdl32\qw-client-sdl32.vcproj", "{CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}"
-	ProjectSection(ProjectDependencies) = postProject
-		{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} = {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}
-		{44A18410-3AA8-4A64-935B-D20223AD6885} = {44A18410-3AA8-4A64-935B-D20223AD6885}
-		{BC1F021A-1EEC-4A7A-B746-5AA6048E478C} = {BC1F021A-1EEC-4A7A-B746-5AA6048E478C}
-		{F4A9881E-0EB0-44A1-9664-B6CBDE992861} = {F4A9881E-0EB0-44A1-9664-B6CBDE992861}
-		{6ADA4322-693A-46BB-897B-17BB5BE9F08C} = {6ADA4322-693A-46BB-897B-17BB5BE9F08C}
-		{9A942925-61E6-4975-935A-5D62E8248E64} = {9A942925-61E6-4975-935A-5D62E8248E64}
-		{5203F034-0047-4EC0-B7E9-D037FAF5D536} = {5203F034-0047-4EC0-B7E9-D037FAF5D536}
-		{01C3B138-9D45-4ED6-A763-893C067262C2} = {01C3B138-9D45-4ED6-A763-893C067262C2}
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}
-		{04FA9D77-E45F-4917-B972-B353BA6A6FA8} = {04FA9D77-E45F-4917-B972-B353BA6A6FA8}
-		{E7B3D07D-2FE8-481B-8DAB-6255A412A42F} = {E7B3D07D-2FE8-481B-8DAB-6255A412A42F}
-		{D5B9558F-EF25-4167-ACE4-723C7413B390} = {D5B9558F-EF25-4167-ACE4-723C7413B390}
-		{BF149D97-7520-4788-9CD1-3D99C5C8150F} = {BF149D97-7520-4788-9CD1-3D99C5C8150F}
-		{226D42CE-5833-444E-94FA-84C1D51892A8} = {226D42CE-5833-444E-94FA-84C1D51892A8}
-		{51028ACF-53D4-4478-8500-55E6B8A81375} = {51028ACF-53D4-4478-8500-55E6B8A81375}
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7}
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "video-sw32", "video-sw32\video-sw32.vcproj", "{D5B9558F-EF25-4167-ACE4-723C7413B390}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nq", "nq\nq.vcproj", "{155112B9-A8A9-4E06-90F5-4AAAB32B2F70}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "video-wgl", "video-wgl\video-wgl.vcproj", "{178D81A7-F2FB-41D7-B300-9D1A4DE5E137}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "video-sgl", "video-sgl\video-sgl.vcproj", "{7E30C3B1-AEE7-483D-B231-C672365CD2D7}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nq-sgl", "nq-sgl\nq-sgl.vcproj", "{2E26DB8B-9E37-4072-B397-8A7086E0ACD0}"
-	ProjectSection(ProjectDependencies) = postProject
-		{B37FE734-01F4-4799-86B2-D084820715BE} = {B37FE734-01F4-4799-86B2-D084820715BE}
-		{5203F034-0047-4EC0-B7E9-D037FAF5D536} = {5203F034-0047-4EC0-B7E9-D037FAF5D536}
-		{01C3B138-9D45-4ED6-A763-893C067262C2} = {01C3B138-9D45-4ED6-A763-893C067262C2}
-		{6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80} = {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}
-		{04FA9D77-E45F-4917-B972-B353BA6A6FA8} = {04FA9D77-E45F-4917-B972-B353BA6A6FA8}
-		{7E30C3B1-AEE7-483D-B231-C672365CD2D7} = {7E30C3B1-AEE7-483D-B231-C672365CD2D7}
-		{44A18410-3AA8-4A64-935B-D20223AD6885} = {44A18410-3AA8-4A64-935B-D20223AD6885}
-		{155112B9-A8A9-4E06-90F5-4AAAB32B2F70} = {155112B9-A8A9-4E06-90F5-4AAAB32B2F70}
-		{C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F} = {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}
-		{E7B3D07D-2FE8-481B-8DAB-6255A412A42F} = {E7B3D07D-2FE8-481B-8DAB-6255A412A42F}
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}
-		{BF149D97-7520-4788-9CD1-3D99C5C8150F} = {BF149D97-7520-4788-9CD1-3D99C5C8150F}
-		{51028ACF-53D4-4478-8500-55E6B8A81375} = {51028ACF-53D4-4478-8500-55E6B8A81375}
-		{226D42CE-5833-444E-94FA-84C1D51892A8} = {226D42CE-5833-444E-94FA-84C1D51892A8}
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7}
-		{053E1EE2-75B4-4D9A-B8AE-89600BCB60A5} = {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1}
-		{1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7} = {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nq-sdl", "nq-sdl\nq-sdl.vcproj", "{2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1}
-		{053E1EE2-75B4-4D9A-B8AE-89600BCB60A5} = {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7}
-		{51028ACF-53D4-4478-8500-55E6B8A81375} = {51028ACF-53D4-4478-8500-55E6B8A81375}
-		{226D42CE-5833-444E-94FA-84C1D51892A8} = {226D42CE-5833-444E-94FA-84C1D51892A8}
-		{155112B9-A8A9-4E06-90F5-4AAAB32B2F70} = {155112B9-A8A9-4E06-90F5-4AAAB32B2F70}
-		{BF149D97-7520-4788-9CD1-3D99C5C8150F} = {BF149D97-7520-4788-9CD1-3D99C5C8150F}
-		{66D3A191-E4D5-45F3-86BD-EFBB249CD554} = {66D3A191-E4D5-45F3-86BD-EFBB249CD554}
-		{E7B3D07D-2FE8-481B-8DAB-6255A412A42F} = {E7B3D07D-2FE8-481B-8DAB-6255A412A42F}
-		{04FA9D77-E45F-4917-B972-B353BA6A6FA8} = {04FA9D77-E45F-4917-B972-B353BA6A6FA8}
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}
-		{6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80} = {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}
-		{01C3B138-9D45-4ED6-A763-893C067262C2} = {01C3B138-9D45-4ED6-A763-893C067262C2}
-		{5203F034-0047-4EC0-B7E9-D037FAF5D536} = {5203F034-0047-4EC0-B7E9-D037FAF5D536}
-		{B37FE734-01F4-4799-86B2-D084820715BE} = {B37FE734-01F4-4799-86B2-D084820715BE}
-		{F4A9881E-0EB0-44A1-9664-B6CBDE992861} = {F4A9881E-0EB0-44A1-9664-B6CBDE992861}
-		{44A18410-3AA8-4A64-935B-D20223AD6885} = {44A18410-3AA8-4A64-935B-D20223AD6885}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nq-sdl32", "nq-sdl32\nq-sdl32.vcproj", "{2CEB1965-A89C-4422-A9AC-B30FCE7913C3}"
-	ProjectSection(ProjectDependencies) = postProject
-		{44A18410-3AA8-4A64-935B-D20223AD6885} = {44A18410-3AA8-4A64-935B-D20223AD6885}
-		{F4A9881E-0EB0-44A1-9664-B6CBDE992861} = {F4A9881E-0EB0-44A1-9664-B6CBDE992861}
-		{B37FE734-01F4-4799-86B2-D084820715BE} = {B37FE734-01F4-4799-86B2-D084820715BE}
-		{5203F034-0047-4EC0-B7E9-D037FAF5D536} = {5203F034-0047-4EC0-B7E9-D037FAF5D536}
-		{01C3B138-9D45-4ED6-A763-893C067262C2} = {01C3B138-9D45-4ED6-A763-893C067262C2}
-		{6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80} = {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}
-		{04FA9D77-E45F-4917-B972-B353BA6A6FA8} = {04FA9D77-E45F-4917-B972-B353BA6A6FA8}
-		{E7B3D07D-2FE8-481B-8DAB-6255A412A42F} = {E7B3D07D-2FE8-481B-8DAB-6255A412A42F}
-		{D5B9558F-EF25-4167-ACE4-723C7413B390} = {D5B9558F-EF25-4167-ACE4-723C7413B390}
-		{BF149D97-7520-4788-9CD1-3D99C5C8150F} = {BF149D97-7520-4788-9CD1-3D99C5C8150F}
-		{155112B9-A8A9-4E06-90F5-4AAAB32B2F70} = {155112B9-A8A9-4E06-90F5-4AAAB32B2F70}
-		{226D42CE-5833-444E-94FA-84C1D51892A8} = {226D42CE-5833-444E-94FA-84C1D51892A8}
-		{51028ACF-53D4-4478-8500-55E6B8A81375} = {51028ACF-53D4-4478-8500-55E6B8A81375}
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7}
-		{053E1EE2-75B4-4D9A-B8AE-89600BCB60A5} = {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1}
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release (static)|Win32 = Release (static)|Win32
-		Release (static)|x64 = Release (static)|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{9A942925-61E6-4975-935A-5D62E8248E64}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9A942925-61E6-4975-935A-5D62E8248E64}.Debug|Win32.Build.0 = Debug|Win32
-		{9A942925-61E6-4975-935A-5D62E8248E64}.Debug|x64.ActiveCfg = Debug|x64
-		{9A942925-61E6-4975-935A-5D62E8248E64}.Debug|x64.Build.0 = Debug|x64
-		{9A942925-61E6-4975-935A-5D62E8248E64}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{9A942925-61E6-4975-935A-5D62E8248E64}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{9A942925-61E6-4975-935A-5D62E8248E64}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{9A942925-61E6-4975-935A-5D62E8248E64}.Release (static)|x64.Build.0 = Release (static)|x64
-		{9A942925-61E6-4975-935A-5D62E8248E64}.Release|Win32.ActiveCfg = Release|Win32
-		{9A942925-61E6-4975-935A-5D62E8248E64}.Release|Win32.Build.0 = Release|Win32
-		{9A942925-61E6-4975-935A-5D62E8248E64}.Release|x64.ActiveCfg = Release|x64
-		{9A942925-61E6-4975-935A-5D62E8248E64}.Release|x64.Build.0 = Release|x64
-		{6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Debug|Win32.Build.0 = Debug|Win32
-		{6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Debug|x64.ActiveCfg = Debug|x64
-		{6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Debug|x64.Build.0 = Debug|x64
-		{6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Release (static)|x64.Build.0 = Release (static)|x64
-		{6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Release|Win32.ActiveCfg = Release|Win32
-		{6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Release|Win32.Build.0 = Release|Win32
-		{6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Release|x64.ActiveCfg = Release|x64
-		{6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Release|x64.Build.0 = Release|x64
-		{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Debug|Win32.Build.0 = Debug|Win32
-		{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Debug|x64.ActiveCfg = Debug|x64
-		{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Debug|x64.Build.0 = Debug|x64
-		{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Release (static)|x64.Build.0 = Release (static)|x64
-		{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Release|Win32.ActiveCfg = Release|Win32
-		{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Release|Win32.Build.0 = Release|Win32
-		{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Release|x64.ActiveCfg = Release|x64
-		{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Release|x64.Build.0 = Release|x64
-		{51028ACF-53D4-4478-8500-55E6B8A81375}.Debug|Win32.ActiveCfg = Debug|Win32
-		{51028ACF-53D4-4478-8500-55E6B8A81375}.Debug|Win32.Build.0 = Debug|Win32
-		{51028ACF-53D4-4478-8500-55E6B8A81375}.Debug|x64.ActiveCfg = Debug|x64
-		{51028ACF-53D4-4478-8500-55E6B8A81375}.Debug|x64.Build.0 = Debug|x64
-		{51028ACF-53D4-4478-8500-55E6B8A81375}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{51028ACF-53D4-4478-8500-55E6B8A81375}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{51028ACF-53D4-4478-8500-55E6B8A81375}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{51028ACF-53D4-4478-8500-55E6B8A81375}.Release (static)|x64.Build.0 = Release (static)|x64
-		{51028ACF-53D4-4478-8500-55E6B8A81375}.Release|Win32.ActiveCfg = Release|Win32
-		{51028ACF-53D4-4478-8500-55E6B8A81375}.Release|Win32.Build.0 = Release|Win32
-		{51028ACF-53D4-4478-8500-55E6B8A81375}.Release|x64.ActiveCfg = Release|x64
-		{51028ACF-53D4-4478-8500-55E6B8A81375}.Release|x64.Build.0 = Release|x64
-		{1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Debug|Win32.Build.0 = Debug|Win32
-		{1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Debug|x64.ActiveCfg = Debug|x64
-		{1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Debug|x64.Build.0 = Debug|x64
-		{1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Release (static)|x64.Build.0 = Release (static)|x64
-		{1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Release|Win32.ActiveCfg = Release|Win32
-		{1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Release|Win32.Build.0 = Release|Win32
-		{1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Release|x64.ActiveCfg = Release|x64
-		{1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Release|x64.Build.0 = Release|x64
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1}.Debug|Win32.ActiveCfg = Debug|Win32
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1}.Debug|Win32.Build.0 = Debug|Win32
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1}.Debug|x64.ActiveCfg = Debug|x64
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1}.Debug|x64.Build.0 = Debug|x64
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1}.Release (static)|x64.Build.0 = Release (static)|x64
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1}.Release|Win32.ActiveCfg = Release|Win32
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1}.Release|Win32.Build.0 = Release|Win32
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1}.Release|x64.ActiveCfg = Release|x64
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1}.Release|x64.Build.0 = Release|x64
-		{01C3B138-9D45-4ED6-A763-893C067262C2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{01C3B138-9D45-4ED6-A763-893C067262C2}.Debug|Win32.Build.0 = Debug|Win32
-		{01C3B138-9D45-4ED6-A763-893C067262C2}.Debug|x64.ActiveCfg = Debug|x64
-		{01C3B138-9D45-4ED6-A763-893C067262C2}.Debug|x64.Build.0 = Debug|x64
-		{01C3B138-9D45-4ED6-A763-893C067262C2}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{01C3B138-9D45-4ED6-A763-893C067262C2}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{01C3B138-9D45-4ED6-A763-893C067262C2}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{01C3B138-9D45-4ED6-A763-893C067262C2}.Release (static)|x64.Build.0 = Release (static)|x64
-		{01C3B138-9D45-4ED6-A763-893C067262C2}.Release|Win32.ActiveCfg = Release|Win32
-		{01C3B138-9D45-4ED6-A763-893C067262C2}.Release|Win32.Build.0 = Release|Win32
-		{01C3B138-9D45-4ED6-A763-893C067262C2}.Release|x64.ActiveCfg = Release|x64
-		{01C3B138-9D45-4ED6-A763-893C067262C2}.Release|x64.Build.0 = Release|x64
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Debug|Win32.ActiveCfg = Debug|Win32
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Debug|Win32.Build.0 = Debug|Win32
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Debug|x64.ActiveCfg = Debug|x64
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Debug|x64.Build.0 = Debug|x64
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Release (static)|x64.Build.0 = Release (static)|x64
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Release|Win32.ActiveCfg = Release|Win32
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Release|Win32.Build.0 = Release|Win32
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Release|x64.ActiveCfg = Release|x64
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Release|x64.Build.0 = Release|x64
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Debug|Win32.Build.0 = Debug|Win32
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Debug|x64.ActiveCfg = Debug|x64
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Debug|x64.Build.0 = Debug|x64
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Release (static)|x64.Build.0 = Release (static)|x64
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Release|Win32.ActiveCfg = Release|Win32
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Release|Win32.Build.0 = Release|Win32
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Release|x64.ActiveCfg = Release|x64
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Release|x64.Build.0 = Release|x64
-		{04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Debug|Win32.Build.0 = Debug|Win32
-		{04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Debug|x64.ActiveCfg = Debug|x64
-		{04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Debug|x64.Build.0 = Debug|x64
-		{04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Release (static)|x64.Build.0 = Release (static)|x64
-		{04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Release|Win32.ActiveCfg = Release|Win32
-		{04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Release|Win32.Build.0 = Release|Win32
-		{04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Release|x64.ActiveCfg = Release|x64
-		{04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Release|x64.Build.0 = Release|x64
-		{BF149D97-7520-4788-9CD1-3D99C5C8150F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{BF149D97-7520-4788-9CD1-3D99C5C8150F}.Debug|Win32.Build.0 = Debug|Win32
-		{BF149D97-7520-4788-9CD1-3D99C5C8150F}.Debug|x64.ActiveCfg = Debug|x64
-		{BF149D97-7520-4788-9CD1-3D99C5C8150F}.Debug|x64.Build.0 = Debug|x64
-		{BF149D97-7520-4788-9CD1-3D99C5C8150F}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{BF149D97-7520-4788-9CD1-3D99C5C8150F}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{BF149D97-7520-4788-9CD1-3D99C5C8150F}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{BF149D97-7520-4788-9CD1-3D99C5C8150F}.Release (static)|x64.Build.0 = Release (static)|x64
-		{BF149D97-7520-4788-9CD1-3D99C5C8150F}.Release|Win32.ActiveCfg = Release|Win32
-		{BF149D97-7520-4788-9CD1-3D99C5C8150F}.Release|Win32.Build.0 = Release|Win32
-		{BF149D97-7520-4788-9CD1-3D99C5C8150F}.Release|x64.ActiveCfg = Release|x64
-		{BF149D97-7520-4788-9CD1-3D99C5C8150F}.Release|x64.Build.0 = Release|x64
-		{5203F034-0047-4EC0-B7E9-D037FAF5D536}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5203F034-0047-4EC0-B7E9-D037FAF5D536}.Debug|Win32.Build.0 = Debug|Win32
-		{5203F034-0047-4EC0-B7E9-D037FAF5D536}.Debug|x64.ActiveCfg = Debug|x64
-		{5203F034-0047-4EC0-B7E9-D037FAF5D536}.Debug|x64.Build.0 = Debug|x64
-		{5203F034-0047-4EC0-B7E9-D037FAF5D536}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{5203F034-0047-4EC0-B7E9-D037FAF5D536}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{5203F034-0047-4EC0-B7E9-D037FAF5D536}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{5203F034-0047-4EC0-B7E9-D037FAF5D536}.Release (static)|x64.Build.0 = Release (static)|x64
-		{5203F034-0047-4EC0-B7E9-D037FAF5D536}.Release|Win32.ActiveCfg = Release|Win32
-		{5203F034-0047-4EC0-B7E9-D037FAF5D536}.Release|Win32.Build.0 = Release|Win32
-		{5203F034-0047-4EC0-B7E9-D037FAF5D536}.Release|x64.ActiveCfg = Release|x64
-		{5203F034-0047-4EC0-B7E9-D037FAF5D536}.Release|x64.Build.0 = Release|x64
-		{E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Debug|Win32.Build.0 = Debug|Win32
-		{E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Debug|x64.ActiveCfg = Debug|x64
-		{E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Debug|x64.Build.0 = Debug|x64
-		{E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Release (static)|x64.Build.0 = Release (static)|x64
-		{E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Release|Win32.ActiveCfg = Release|Win32
-		{E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Release|Win32.Build.0 = Release|Win32
-		{E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Release|x64.ActiveCfg = Release|x64
-		{E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Release|x64.Build.0 = Release|x64
-		{BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Debug|Win32.Build.0 = Debug|Win32
-		{BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Debug|x64.ActiveCfg = Debug|x64
-		{BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Debug|x64.Build.0 = Debug|x64
-		{BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Release (static)|x64.Build.0 = Release (static)|x64
-		{BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Release|Win32.ActiveCfg = Release|Win32
-		{BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Release|Win32.Build.0 = Release|Win32
-		{BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Release|x64.ActiveCfg = Release|x64
-		{BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Release|x64.Build.0 = Release|x64
-		{544D097C-9C24-4C57-A171-8C8029421185}.Debug|Win32.ActiveCfg = Debug|Win32
-		{544D097C-9C24-4C57-A171-8C8029421185}.Debug|Win32.Build.0 = Debug|Win32
-		{544D097C-9C24-4C57-A171-8C8029421185}.Debug|x64.ActiveCfg = Debug|x64
-		{544D097C-9C24-4C57-A171-8C8029421185}.Debug|x64.Build.0 = Debug|x64
-		{544D097C-9C24-4C57-A171-8C8029421185}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{544D097C-9C24-4C57-A171-8C8029421185}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{544D097C-9C24-4C57-A171-8C8029421185}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{544D097C-9C24-4C57-A171-8C8029421185}.Release (static)|x64.Build.0 = Release (static)|x64
-		{544D097C-9C24-4C57-A171-8C8029421185}.Release|Win32.ActiveCfg = Release|Win32
-		{544D097C-9C24-4C57-A171-8C8029421185}.Release|Win32.Build.0 = Release|Win32
-		{544D097C-9C24-4C57-A171-8C8029421185}.Release|x64.ActiveCfg = Release|x64
-		{544D097C-9C24-4C57-A171-8C8029421185}.Release|x64.Build.0 = Release|x64
-		{DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Debug|Win32.Build.0 = Debug|Win32
-		{DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Debug|x64.ActiveCfg = Debug|x64
-		{DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Debug|x64.Build.0 = Debug|x64
-		{DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Release (static)|x64.Build.0 = Release (static)|x64
-		{DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Release|Win32.ActiveCfg = Release|Win32
-		{DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Release|Win32.Build.0 = Release|Win32
-		{DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Release|x64.ActiveCfg = Release|x64
-		{DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Release|x64.Build.0 = Release|x64
-		{226D42CE-5833-444E-94FA-84C1D51892A8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{226D42CE-5833-444E-94FA-84C1D51892A8}.Debug|Win32.Build.0 = Debug|Win32
-		{226D42CE-5833-444E-94FA-84C1D51892A8}.Debug|x64.ActiveCfg = Debug|x64
-		{226D42CE-5833-444E-94FA-84C1D51892A8}.Debug|x64.Build.0 = Debug|x64
-		{226D42CE-5833-444E-94FA-84C1D51892A8}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{226D42CE-5833-444E-94FA-84C1D51892A8}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{226D42CE-5833-444E-94FA-84C1D51892A8}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{226D42CE-5833-444E-94FA-84C1D51892A8}.Release (static)|x64.Build.0 = Release (static)|x64
-		{226D42CE-5833-444E-94FA-84C1D51892A8}.Release|Win32.ActiveCfg = Release|Win32
-		{226D42CE-5833-444E-94FA-84C1D51892A8}.Release|Win32.Build.0 = Release|Win32
-		{226D42CE-5833-444E-94FA-84C1D51892A8}.Release|x64.ActiveCfg = Release|x64
-		{226D42CE-5833-444E-94FA-84C1D51892A8}.Release|x64.Build.0 = Release|x64
-		{B37FE734-01F4-4799-86B2-D084820715BE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B37FE734-01F4-4799-86B2-D084820715BE}.Debug|Win32.Build.0 = Debug|Win32
-		{B37FE734-01F4-4799-86B2-D084820715BE}.Debug|x64.ActiveCfg = Debug|x64
-		{B37FE734-01F4-4799-86B2-D084820715BE}.Debug|x64.Build.0 = Debug|x64
-		{B37FE734-01F4-4799-86B2-D084820715BE}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{B37FE734-01F4-4799-86B2-D084820715BE}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{B37FE734-01F4-4799-86B2-D084820715BE}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{B37FE734-01F4-4799-86B2-D084820715BE}.Release (static)|x64.Build.0 = Release (static)|x64
-		{B37FE734-01F4-4799-86B2-D084820715BE}.Release|Win32.ActiveCfg = Release|Win32
-		{B37FE734-01F4-4799-86B2-D084820715BE}.Release|Win32.Build.0 = Release|Win32
-		{B37FE734-01F4-4799-86B2-D084820715BE}.Release|x64.ActiveCfg = Release|x64
-		{B37FE734-01F4-4799-86B2-D084820715BE}.Release|x64.Build.0 = Release|x64
-		{B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Debug|Win32.Build.0 = Debug|Win32
-		{B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Debug|x64.ActiveCfg = Debug|x64
-		{B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Debug|x64.Build.0 = Debug|x64
-		{B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Release (static)|x64.Build.0 = Release (static)|x64
-		{B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Release|Win32.ActiveCfg = Release|Win32
-		{B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Release|Win32.Build.0 = Release|Win32
-		{B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Release|x64.ActiveCfg = Release|x64
-		{B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Release|x64.Build.0 = Release|x64
-		{5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Debug|Win32.Build.0 = Debug|Win32
-		{5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Debug|x64.ActiveCfg = Debug|x64
-		{5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Debug|x64.Build.0 = Debug|x64
-		{5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Release (static)|x64.Build.0 = Release (static)|x64
-		{5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Release|Win32.ActiveCfg = Release|Win32
-		{5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Release|Win32.Build.0 = Release|Win32
-		{5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Release|x64.ActiveCfg = Release|x64
-		{5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Release|x64.Build.0 = Release|x64
-		{E5D842C5-669F-4FC7-A5E0-44B562F86435}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E5D842C5-669F-4FC7-A5E0-44B562F86435}.Debug|Win32.Build.0 = Debug|Win32
-		{E5D842C5-669F-4FC7-A5E0-44B562F86435}.Debug|x64.ActiveCfg = Debug|x64
-		{E5D842C5-669F-4FC7-A5E0-44B562F86435}.Debug|x64.Build.0 = Debug|x64
-		{E5D842C5-669F-4FC7-A5E0-44B562F86435}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{E5D842C5-669F-4FC7-A5E0-44B562F86435}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{E5D842C5-669F-4FC7-A5E0-44B562F86435}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{E5D842C5-669F-4FC7-A5E0-44B562F86435}.Release (static)|x64.Build.0 = Release (static)|x64
-		{E5D842C5-669F-4FC7-A5E0-44B562F86435}.Release|Win32.ActiveCfg = Release|Win32
-		{E5D842C5-669F-4FC7-A5E0-44B562F86435}.Release|Win32.Build.0 = Release|Win32
-		{E5D842C5-669F-4FC7-A5E0-44B562F86435}.Release|x64.ActiveCfg = Release|x64
-		{E5D842C5-669F-4FC7-A5E0-44B562F86435}.Release|x64.Build.0 = Release|x64
-		{445A2500-3BBC-449A-A929-C419C2A16051}.Debug|Win32.ActiveCfg = Debug|Win32
-		{445A2500-3BBC-449A-A929-C419C2A16051}.Debug|Win32.Build.0 = Debug|Win32
-		{445A2500-3BBC-449A-A929-C419C2A16051}.Debug|x64.ActiveCfg = Debug|x64
-		{445A2500-3BBC-449A-A929-C419C2A16051}.Debug|x64.Build.0 = Debug|x64
-		{445A2500-3BBC-449A-A929-C419C2A16051}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{445A2500-3BBC-449A-A929-C419C2A16051}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{445A2500-3BBC-449A-A929-C419C2A16051}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{445A2500-3BBC-449A-A929-C419C2A16051}.Release (static)|x64.Build.0 = Release (static)|x64
-		{445A2500-3BBC-449A-A929-C419C2A16051}.Release|Win32.ActiveCfg = Release|Win32
-		{445A2500-3BBC-449A-A929-C419C2A16051}.Release|Win32.Build.0 = Release|Win32
-		{445A2500-3BBC-449A-A929-C419C2A16051}.Release|x64.ActiveCfg = Release|x64
-		{445A2500-3BBC-449A-A929-C419C2A16051}.Release|x64.Build.0 = Release|x64
-		{052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Debug|Win32.ActiveCfg = Debug|Win32
-		{052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Debug|Win32.Build.0 = Debug|Win32
-		{052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Debug|x64.ActiveCfg = Debug|x64
-		{052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Debug|x64.Build.0 = Debug|x64
-		{052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Release (static)|x64.Build.0 = Release (static)|x64
-		{052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Release|Win32.ActiveCfg = Release|Win32
-		{052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Release|Win32.Build.0 = Release|Win32
-		{052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Release|x64.ActiveCfg = Release|x64
-		{052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Release|x64.Build.0 = Release|x64
-		{5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Debug|Win32.Build.0 = Debug|Win32
-		{5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Debug|x64.ActiveCfg = Debug|x64
-		{5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Debug|x64.Build.0 = Debug|x64
-		{5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Release (static)|x64.Build.0 = Release (static)|x64
-		{5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Release|Win32.ActiveCfg = Release|Win32
-		{5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Release|Win32.Build.0 = Release|Win32
-		{5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Release|x64.ActiveCfg = Release|x64
-		{5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Release|x64.Build.0 = Release|x64
-		{56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Debug|Win32.ActiveCfg = Debug|Win32
-		{56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Debug|Win32.Build.0 = Debug|Win32
-		{56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Debug|x64.ActiveCfg = Debug|x64
-		{56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Debug|x64.Build.0 = Debug|x64
-		{56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Release (static)|x64.Build.0 = Release (static)|x64
-		{56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Release|Win32.ActiveCfg = Release|Win32
-		{56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Release|Win32.Build.0 = Release|Win32
-		{56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Release|x64.ActiveCfg = Release|x64
-		{56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Release|x64.Build.0 = Release|x64
-		{88422448-C5FB-46F3-A0B3-0811F90E537C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{88422448-C5FB-46F3-A0B3-0811F90E537C}.Debug|Win32.Build.0 = Debug|Win32
-		{88422448-C5FB-46F3-A0B3-0811F90E537C}.Debug|x64.ActiveCfg = Debug|x64
-		{88422448-C5FB-46F3-A0B3-0811F90E537C}.Debug|x64.Build.0 = Debug|x64
-		{88422448-C5FB-46F3-A0B3-0811F90E537C}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{88422448-C5FB-46F3-A0B3-0811F90E537C}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{88422448-C5FB-46F3-A0B3-0811F90E537C}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{88422448-C5FB-46F3-A0B3-0811F90E537C}.Release (static)|x64.Build.0 = Release (static)|x64
-		{88422448-C5FB-46F3-A0B3-0811F90E537C}.Release|Win32.ActiveCfg = Release|Win32
-		{88422448-C5FB-46F3-A0B3-0811F90E537C}.Release|Win32.Build.0 = Release|Win32
-		{88422448-C5FB-46F3-A0B3-0811F90E537C}.Release|x64.ActiveCfg = Release|x64
-		{88422448-C5FB-46F3-A0B3-0811F90E537C}.Release|x64.Build.0 = Release|x64
-		{9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Debug|Win32.Build.0 = Debug|Win32
-		{9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Debug|x64.ActiveCfg = Debug|x64
-		{9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Debug|x64.Build.0 = Debug|x64
-		{9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Release (static)|x64.Build.0 = Release (static)|x64
-		{9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Release|Win32.ActiveCfg = Release|Win32
-		{9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Release|Win32.Build.0 = Release|Win32
-		{9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Release|x64.ActiveCfg = Release|x64
-		{9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Release|x64.Build.0 = Release|x64
-		{4605418D-2292-470A-AB18-C2119B016F71}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4605418D-2292-470A-AB18-C2119B016F71}.Debug|Win32.Build.0 = Debug|Win32
-		{4605418D-2292-470A-AB18-C2119B016F71}.Debug|x64.ActiveCfg = Debug|x64
-		{4605418D-2292-470A-AB18-C2119B016F71}.Debug|x64.Build.0 = Debug|x64
-		{4605418D-2292-470A-AB18-C2119B016F71}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{4605418D-2292-470A-AB18-C2119B016F71}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{4605418D-2292-470A-AB18-C2119B016F71}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{4605418D-2292-470A-AB18-C2119B016F71}.Release (static)|x64.Build.0 = Release (static)|x64
-		{4605418D-2292-470A-AB18-C2119B016F71}.Release|Win32.ActiveCfg = Release|Win32
-		{4605418D-2292-470A-AB18-C2119B016F71}.Release|Win32.Build.0 = Release|Win32
-		{4605418D-2292-470A-AB18-C2119B016F71}.Release|x64.ActiveCfg = Release|x64
-		{4605418D-2292-470A-AB18-C2119B016F71}.Release|x64.Build.0 = Release|x64
-		{05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Debug|Win32.Build.0 = Debug|Win32
-		{05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Debug|x64.ActiveCfg = Debug|x64
-		{05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Debug|x64.Build.0 = Debug|x64
-		{05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Release (static)|x64.Build.0 = Release (static)|x64
-		{05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Release|Win32.ActiveCfg = Release|Win32
-		{05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Release|Win32.Build.0 = Release|Win32
-		{05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Release|x64.ActiveCfg = Release|x64
-		{05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Release|x64.Build.0 = Release|x64
-		{6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Debug|Win32.Build.0 = Debug|Win32
-		{6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Debug|x64.ActiveCfg = Debug|x64
-		{6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Debug|x64.Build.0 = Debug|x64
-		{6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Release (static)|x64.Build.0 = Release (static)|x64
-		{6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Release|Win32.ActiveCfg = Release|Win32
-		{6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Release|Win32.Build.0 = Release|Win32
-		{6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Release|x64.ActiveCfg = Release|x64
-		{6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Release|x64.Build.0 = Release|x64
-		{1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Debug|Win32.Build.0 = Debug|Win32
-		{1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Debug|x64.ActiveCfg = Debug|x64
-		{1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Debug|x64.Build.0 = Debug|x64
-		{1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Release (static)|x64.Build.0 = Release (static)|x64
-		{1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Release|Win32.ActiveCfg = Release|Win32
-		{1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Release|Win32.Build.0 = Release|Win32
-		{1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Release|x64.ActiveCfg = Release|x64
-		{1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Release|x64.Build.0 = Release|x64
-		{053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Debug|Win32.ActiveCfg = Debug|Win32
-		{053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Debug|Win32.Build.0 = Debug|Win32
-		{053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Debug|x64.ActiveCfg = Debug|x64
-		{053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Debug|x64.Build.0 = Debug|x64
-		{053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Release (static)|x64.Build.0 = Release (static)|x64
-		{053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Release|Win32.ActiveCfg = Release|Win32
-		{053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Release|Win32.Build.0 = Release|Win32
-		{053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Release|x64.ActiveCfg = Release|x64
-		{053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Release|x64.Build.0 = Release|x64
-		{231C032C-DE16-459A-8E7D-6509C2EC3998}.Debug|Win32.ActiveCfg = Debug|Win32
-		{231C032C-DE16-459A-8E7D-6509C2EC3998}.Debug|Win32.Build.0 = Debug|Win32
-		{231C032C-DE16-459A-8E7D-6509C2EC3998}.Debug|x64.ActiveCfg = Debug|x64
-		{231C032C-DE16-459A-8E7D-6509C2EC3998}.Debug|x64.Build.0 = Debug|x64
-		{231C032C-DE16-459A-8E7D-6509C2EC3998}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{231C032C-DE16-459A-8E7D-6509C2EC3998}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{231C032C-DE16-459A-8E7D-6509C2EC3998}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{231C032C-DE16-459A-8E7D-6509C2EC3998}.Release (static)|x64.Build.0 = Release (static)|x64
-		{231C032C-DE16-459A-8E7D-6509C2EC3998}.Release|Win32.ActiveCfg = Release|Win32
-		{231C032C-DE16-459A-8E7D-6509C2EC3998}.Release|Win32.Build.0 = Release|Win32
-		{231C032C-DE16-459A-8E7D-6509C2EC3998}.Release|x64.ActiveCfg = Release|x64
-		{231C032C-DE16-459A-8E7D-6509C2EC3998}.Release|x64.Build.0 = Release|x64
-		{419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Debug|Win32.Build.0 = Debug|Win32
-		{419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Debug|x64.ActiveCfg = Debug|x64
-		{419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Debug|x64.Build.0 = Debug|x64
-		{419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Release (static)|x64.Build.0 = Release (static)|x64
-		{419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Release|Win32.ActiveCfg = Release|Win32
-		{419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Release|Win32.Build.0 = Release|Win32
-		{419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Release|x64.ActiveCfg = Release|x64
-		{419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Release|x64.Build.0 = Release|x64
-		{40639893-4D75-48CD-811F-4B363CC71FFA}.Debug|Win32.ActiveCfg = Debug|Win32
-		{40639893-4D75-48CD-811F-4B363CC71FFA}.Debug|Win32.Build.0 = Debug|Win32
-		{40639893-4D75-48CD-811F-4B363CC71FFA}.Debug|x64.ActiveCfg = Debug|x64
-		{40639893-4D75-48CD-811F-4B363CC71FFA}.Debug|x64.Build.0 = Debug|x64
-		{40639893-4D75-48CD-811F-4B363CC71FFA}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{40639893-4D75-48CD-811F-4B363CC71FFA}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{40639893-4D75-48CD-811F-4B363CC71FFA}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{40639893-4D75-48CD-811F-4B363CC71FFA}.Release (static)|x64.Build.0 = Release (static)|x64
-		{40639893-4D75-48CD-811F-4B363CC71FFA}.Release|Win32.ActiveCfg = Release|Win32
-		{40639893-4D75-48CD-811F-4B363CC71FFA}.Release|Win32.Build.0 = Release|Win32
-		{40639893-4D75-48CD-811F-4B363CC71FFA}.Release|x64.ActiveCfg = Release|x64
-		{40639893-4D75-48CD-811F-4B363CC71FFA}.Release|x64.Build.0 = Release|x64
-		{5FD733BF-B3C6-4A96-BED7-35E2484448E1}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5FD733BF-B3C6-4A96-BED7-35E2484448E1}.Debug|Win32.Build.0 = Debug|Win32
-		{5FD733BF-B3C6-4A96-BED7-35E2484448E1}.Debug|x64.ActiveCfg = Debug|Win32
-		{5FD733BF-B3C6-4A96-BED7-35E2484448E1}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{5FD733BF-B3C6-4A96-BED7-35E2484448E1}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{5FD733BF-B3C6-4A96-BED7-35E2484448E1}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{5FD733BF-B3C6-4A96-BED7-35E2484448E1}.Release (static)|x64.Build.0 = Release (static)|x64
-		{5FD733BF-B3C6-4A96-BED7-35E2484448E1}.Release|Win32.ActiveCfg = Release|Win32
-		{5FD733BF-B3C6-4A96-BED7-35E2484448E1}.Release|Win32.Build.0 = Release|Win32
-		{5FD733BF-B3C6-4A96-BED7-35E2484448E1}.Release|x64.ActiveCfg = Release|x64
-		{5FD733BF-B3C6-4A96-BED7-35E2484448E1}.Release|x64.Build.0 = Release|x64
-		{649C4168-1C65-4E41-818F-85A1C52C1B8F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{649C4168-1C65-4E41-818F-85A1C52C1B8F}.Debug|Win32.Build.0 = Debug|Win32
-		{649C4168-1C65-4E41-818F-85A1C52C1B8F}.Debug|x64.ActiveCfg = Debug|Win32
-		{649C4168-1C65-4E41-818F-85A1C52C1B8F}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{649C4168-1C65-4E41-818F-85A1C52C1B8F}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{649C4168-1C65-4E41-818F-85A1C52C1B8F}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{649C4168-1C65-4E41-818F-85A1C52C1B8F}.Release (static)|x64.Build.0 = Release (static)|x64
-		{649C4168-1C65-4E41-818F-85A1C52C1B8F}.Release|Win32.ActiveCfg = Release|Win32
-		{649C4168-1C65-4E41-818F-85A1C52C1B8F}.Release|Win32.Build.0 = Release|Win32
-		{649C4168-1C65-4E41-818F-85A1C52C1B8F}.Release|x64.ActiveCfg = Release|x64
-		{649C4168-1C65-4E41-818F-85A1C52C1B8F}.Release|x64.Build.0 = Release|x64
-		{C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}.Debug|Win32.Build.0 = Debug|Win32
-		{C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}.Debug|x64.ActiveCfg = Debug|Win32
-		{C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}.Release (static)|x64.Build.0 = Release (static)|x64
-		{C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}.Release|Win32.ActiveCfg = Release|Win32
-		{C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}.Release|Win32.Build.0 = Release|Win32
-		{C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}.Release|x64.ActiveCfg = Release|x64
-		{C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}.Release|x64.Build.0 = Release|x64
-		{44A18410-3AA8-4A64-935B-D20223AD6885}.Debug|Win32.ActiveCfg = Debug|Win32
-		{44A18410-3AA8-4A64-935B-D20223AD6885}.Debug|Win32.Build.0 = Debug|Win32
-		{44A18410-3AA8-4A64-935B-D20223AD6885}.Debug|x64.ActiveCfg = Debug|Win32
-		{44A18410-3AA8-4A64-935B-D20223AD6885}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{44A18410-3AA8-4A64-935B-D20223AD6885}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{44A18410-3AA8-4A64-935B-D20223AD6885}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{44A18410-3AA8-4A64-935B-D20223AD6885}.Release (static)|x64.Build.0 = Release (static)|x64
-		{44A18410-3AA8-4A64-935B-D20223AD6885}.Release|Win32.ActiveCfg = Release|Win32
-		{44A18410-3AA8-4A64-935B-D20223AD6885}.Release|Win32.Build.0 = Release|Win32
-		{44A18410-3AA8-4A64-935B-D20223AD6885}.Release|x64.ActiveCfg = Release|x64
-		{44A18410-3AA8-4A64-935B-D20223AD6885}.Release|x64.Build.0 = Release|x64
-		{B44CB3E0-F2FD-4260-A632-C01FB881613E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B44CB3E0-F2FD-4260-A632-C01FB881613E}.Debug|Win32.Build.0 = Debug|Win32
-		{B44CB3E0-F2FD-4260-A632-C01FB881613E}.Debug|x64.ActiveCfg = Debug|Win32
-		{B44CB3E0-F2FD-4260-A632-C01FB881613E}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{B44CB3E0-F2FD-4260-A632-C01FB881613E}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{B44CB3E0-F2FD-4260-A632-C01FB881613E}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{B44CB3E0-F2FD-4260-A632-C01FB881613E}.Release (static)|x64.Build.0 = Release (static)|x64
-		{B44CB3E0-F2FD-4260-A632-C01FB881613E}.Release|Win32.ActiveCfg = Release|Win32
-		{B44CB3E0-F2FD-4260-A632-C01FB881613E}.Release|Win32.Build.0 = Release|Win32
-		{B44CB3E0-F2FD-4260-A632-C01FB881613E}.Release|x64.ActiveCfg = Release|x64
-		{B44CB3E0-F2FD-4260-A632-C01FB881613E}.Release|x64.Build.0 = Release|x64
-		{F4A9881E-0EB0-44A1-9664-B6CBDE992861}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F4A9881E-0EB0-44A1-9664-B6CBDE992861}.Debug|Win32.Build.0 = Debug|Win32
-		{F4A9881E-0EB0-44A1-9664-B6CBDE992861}.Debug|x64.ActiveCfg = Debug|Win32
-		{F4A9881E-0EB0-44A1-9664-B6CBDE992861}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{F4A9881E-0EB0-44A1-9664-B6CBDE992861}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{F4A9881E-0EB0-44A1-9664-B6CBDE992861}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{F4A9881E-0EB0-44A1-9664-B6CBDE992861}.Release (static)|x64.Build.0 = Release (static)|x64
-		{F4A9881E-0EB0-44A1-9664-B6CBDE992861}.Release|Win32.ActiveCfg = Release|Win32
-		{F4A9881E-0EB0-44A1-9664-B6CBDE992861}.Release|Win32.Build.0 = Release|Win32
-		{F4A9881E-0EB0-44A1-9664-B6CBDE992861}.Release|x64.ActiveCfg = Release|x64
-		{F4A9881E-0EB0-44A1-9664-B6CBDE992861}.Release|x64.Build.0 = Release|x64
-		{66D3A191-E4D5-45F3-86BD-EFBB249CD554}.Debug|Win32.ActiveCfg = Debug|Win32
-		{66D3A191-E4D5-45F3-86BD-EFBB249CD554}.Debug|Win32.Build.0 = Debug|Win32
-		{66D3A191-E4D5-45F3-86BD-EFBB249CD554}.Debug|x64.ActiveCfg = Debug|Win32
-		{66D3A191-E4D5-45F3-86BD-EFBB249CD554}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{66D3A191-E4D5-45F3-86BD-EFBB249CD554}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{66D3A191-E4D5-45F3-86BD-EFBB249CD554}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{66D3A191-E4D5-45F3-86BD-EFBB249CD554}.Release (static)|x64.Build.0 = Release (static)|x64
-		{66D3A191-E4D5-45F3-86BD-EFBB249CD554}.Release|Win32.ActiveCfg = Release|Win32
-		{66D3A191-E4D5-45F3-86BD-EFBB249CD554}.Release|Win32.Build.0 = Release|Win32
-		{66D3A191-E4D5-45F3-86BD-EFBB249CD554}.Release|x64.ActiveCfg = Release|x64
-		{66D3A191-E4D5-45F3-86BD-EFBB249CD554}.Release|x64.Build.0 = Release|x64
-		{CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}.Debug|Win32.ActiveCfg = Debug|Win32
-		{CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}.Debug|Win32.Build.0 = Debug|Win32
-		{CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}.Debug|x64.ActiveCfg = Debug|Win32
-		{CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}.Release (static)|x64.Build.0 = Release (static)|x64
-		{CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}.Release|Win32.ActiveCfg = Release|Win32
-		{CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}.Release|Win32.Build.0 = Release|Win32
-		{CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}.Release|x64.ActiveCfg = Release|x64
-		{CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}.Release|x64.Build.0 = Release|x64
-		{D5B9558F-EF25-4167-ACE4-723C7413B390}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D5B9558F-EF25-4167-ACE4-723C7413B390}.Debug|Win32.Build.0 = Debug|Win32
-		{D5B9558F-EF25-4167-ACE4-723C7413B390}.Debug|x64.ActiveCfg = Debug|Win32
-		{D5B9558F-EF25-4167-ACE4-723C7413B390}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{D5B9558F-EF25-4167-ACE4-723C7413B390}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{D5B9558F-EF25-4167-ACE4-723C7413B390}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{D5B9558F-EF25-4167-ACE4-723C7413B390}.Release (static)|x64.Build.0 = Release (static)|x64
-		{D5B9558F-EF25-4167-ACE4-723C7413B390}.Release|Win32.ActiveCfg = Release|Win32
-		{D5B9558F-EF25-4167-ACE4-723C7413B390}.Release|Win32.Build.0 = Release|Win32
-		{D5B9558F-EF25-4167-ACE4-723C7413B390}.Release|x64.ActiveCfg = Release|x64
-		{D5B9558F-EF25-4167-ACE4-723C7413B390}.Release|x64.Build.0 = Release|x64
-		{155112B9-A8A9-4E06-90F5-4AAAB32B2F70}.Debug|Win32.ActiveCfg = Debug|Win32
-		{155112B9-A8A9-4E06-90F5-4AAAB32B2F70}.Debug|Win32.Build.0 = Debug|Win32
-		{155112B9-A8A9-4E06-90F5-4AAAB32B2F70}.Debug|x64.ActiveCfg = Debug|Win32
-		{155112B9-A8A9-4E06-90F5-4AAAB32B2F70}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{155112B9-A8A9-4E06-90F5-4AAAB32B2F70}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{155112B9-A8A9-4E06-90F5-4AAAB32B2F70}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{155112B9-A8A9-4E06-90F5-4AAAB32B2F70}.Release (static)|x64.Build.0 = Release (static)|x64
-		{155112B9-A8A9-4E06-90F5-4AAAB32B2F70}.Release|Win32.ActiveCfg = Release|Win32
-		{155112B9-A8A9-4E06-90F5-4AAAB32B2F70}.Release|Win32.Build.0 = Release|Win32
-		{155112B9-A8A9-4E06-90F5-4AAAB32B2F70}.Release|x64.ActiveCfg = Release|x64
-		{155112B9-A8A9-4E06-90F5-4AAAB32B2F70}.Release|x64.Build.0 = Release|x64
-		{178D81A7-F2FB-41D7-B300-9D1A4DE5E137}.Debug|Win32.ActiveCfg = Debug|Win32
-		{178D81A7-F2FB-41D7-B300-9D1A4DE5E137}.Debug|Win32.Build.0 = Debug|Win32
-		{178D81A7-F2FB-41D7-B300-9D1A4DE5E137}.Debug|x64.ActiveCfg = Debug|Win32
-		{178D81A7-F2FB-41D7-B300-9D1A4DE5E137}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{178D81A7-F2FB-41D7-B300-9D1A4DE5E137}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{178D81A7-F2FB-41D7-B300-9D1A4DE5E137}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{178D81A7-F2FB-41D7-B300-9D1A4DE5E137}.Release (static)|x64.Build.0 = Release (static)|x64
-		{178D81A7-F2FB-41D7-B300-9D1A4DE5E137}.Release|Win32.ActiveCfg = Release|Win32
-		{178D81A7-F2FB-41D7-B300-9D1A4DE5E137}.Release|Win32.Build.0 = Release|Win32
-		{178D81A7-F2FB-41D7-B300-9D1A4DE5E137}.Release|x64.ActiveCfg = Release|x64
-		{178D81A7-F2FB-41D7-B300-9D1A4DE5E137}.Release|x64.Build.0 = Release|x64
-		{7E30C3B1-AEE7-483D-B231-C672365CD2D7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7E30C3B1-AEE7-483D-B231-C672365CD2D7}.Debug|Win32.Build.0 = Debug|Win32
-		{7E30C3B1-AEE7-483D-B231-C672365CD2D7}.Debug|x64.ActiveCfg = Debug|Win32
-		{7E30C3B1-AEE7-483D-B231-C672365CD2D7}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{7E30C3B1-AEE7-483D-B231-C672365CD2D7}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{7E30C3B1-AEE7-483D-B231-C672365CD2D7}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{7E30C3B1-AEE7-483D-B231-C672365CD2D7}.Release (static)|x64.Build.0 = Release (static)|x64
-		{7E30C3B1-AEE7-483D-B231-C672365CD2D7}.Release|Win32.ActiveCfg = Release|Win32
-		{7E30C3B1-AEE7-483D-B231-C672365CD2D7}.Release|Win32.Build.0 = Release|Win32
-		{7E30C3B1-AEE7-483D-B231-C672365CD2D7}.Release|x64.ActiveCfg = Release|x64
-		{7E30C3B1-AEE7-483D-B231-C672365CD2D7}.Release|x64.Build.0 = Release|x64
-		{2E26DB8B-9E37-4072-B397-8A7086E0ACD0}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2E26DB8B-9E37-4072-B397-8A7086E0ACD0}.Debug|Win32.Build.0 = Debug|Win32
-		{2E26DB8B-9E37-4072-B397-8A7086E0ACD0}.Debug|x64.ActiveCfg = Debug|Win32
-		{2E26DB8B-9E37-4072-B397-8A7086E0ACD0}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{2E26DB8B-9E37-4072-B397-8A7086E0ACD0}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{2E26DB8B-9E37-4072-B397-8A7086E0ACD0}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{2E26DB8B-9E37-4072-B397-8A7086E0ACD0}.Release (static)|x64.Build.0 = Release (static)|x64
-		{2E26DB8B-9E37-4072-B397-8A7086E0ACD0}.Release|Win32.ActiveCfg = Release|Win32
-		{2E26DB8B-9E37-4072-B397-8A7086E0ACD0}.Release|Win32.Build.0 = Release|Win32
-		{2E26DB8B-9E37-4072-B397-8A7086E0ACD0}.Release|x64.ActiveCfg = Release|x64
-		{2E26DB8B-9E37-4072-B397-8A7086E0ACD0}.Release|x64.Build.0 = Release|x64
-		{2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}.Debug|Win32.Build.0 = Debug|Win32
-		{2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}.Debug|x64.ActiveCfg = Debug|Win32
-		{2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}.Release (static)|x64.Build.0 = Release (static)|x64
-		{2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}.Release|Win32.ActiveCfg = Release|Win32
-		{2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}.Release|Win32.Build.0 = Release|Win32
-		{2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}.Release|x64.ActiveCfg = Release|x64
-		{2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}.Release|x64.Build.0 = Release|x64
-		{2CEB1965-A89C-4422-A9AC-B30FCE7913C3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2CEB1965-A89C-4422-A9AC-B30FCE7913C3}.Debug|Win32.Build.0 = Debug|Win32
-		{2CEB1965-A89C-4422-A9AC-B30FCE7913C3}.Debug|x64.ActiveCfg = Debug|Win32
-		{2CEB1965-A89C-4422-A9AC-B30FCE7913C3}.Release (static)|Win32.ActiveCfg = Release (static)|Win32
-		{2CEB1965-A89C-4422-A9AC-B30FCE7913C3}.Release (static)|Win32.Build.0 = Release (static)|Win32
-		{2CEB1965-A89C-4422-A9AC-B30FCE7913C3}.Release (static)|x64.ActiveCfg = Release (static)|x64
-		{2CEB1965-A89C-4422-A9AC-B30FCE7913C3}.Release (static)|x64.Build.0 = Release (static)|x64
-		{2CEB1965-A89C-4422-A9AC-B30FCE7913C3}.Release|Win32.ActiveCfg = Release|Win32
-		{2CEB1965-A89C-4422-A9AC-B30FCE7913C3}.Release|Win32.Build.0 = Release|Win32
-		{2CEB1965-A89C-4422-A9AC-B30FCE7913C3}.Release|x64.ActiveCfg = Release|x64
-		{2CEB1965-A89C-4422-A9AC-B30FCE7913C3}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{9A942925-61E6-4975-935A-5D62E8248E64} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA}
-		{6ADA4322-693A-46BB-897B-17BB5BE9F08C} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA}
-		{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA}
-		{51028ACF-53D4-4478-8500-55E6B8A81375} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA}
-		{1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA}
-		{ED4AFBF5-C247-4352-966D-048B8998C6A1} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA}
-		{01C3B138-9D45-4ED6-A763-893C067262C2} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA}
-		{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA}
-		{2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA}
-		{04FA9D77-E45F-4917-B972-B353BA6A6FA8} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA}
-		{BF149D97-7520-4788-9CD1-3D99C5C8150F} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA}
-		{5203F034-0047-4EC0-B7E9-D037FAF5D536} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA}
-		{E7B3D07D-2FE8-481B-8DAB-6255A412A42F} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA}
-		{BC1F021A-1EEC-4A7A-B746-5AA6048E478C} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA}
-		{DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA}
-		{226D42CE-5833-444E-94FA-84C1D51892A8} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA}
-		{B37FE734-01F4-4799-86B2-D084820715BE} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA}
-		{6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA}
-		{053E1EE2-75B4-4D9A-B8AE-89600BCB60A5} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA}
-		{C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA}
-		{44A18410-3AA8-4A64-935B-D20223AD6885} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA}
-		{F4A9881E-0EB0-44A1-9664-B6CBDE992861} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA}
-		{66D3A191-E4D5-45F3-86BD-EFBB249CD554} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA}
-		{D5B9558F-EF25-4167-ACE4-723C7413B390} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA}
-		{155112B9-A8A9-4E06-90F5-4AAAB32B2F70} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA}
-		{178D81A7-F2FB-41D7-B300-9D1A4DE5E137} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA}
-		{7E30C3B1-AEE7-483D-B231-C672365CD2D7} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA}
-	EndGlobalSection
-EndGlobal
diff --git a/vc2008/bsp2img/bsp2img.vcproj b/vc2008/bsp2img/bsp2img.vcproj
deleted file mode 100644
index b4608c799..000000000
--- a/vc2008/bsp2img/bsp2img.vcproj
+++ /dev/null
@@ -1,562 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="bsp2img"
-	ProjectGUID="{4605418D-2292-470A-AB18-C2119B016F71}"
-	RootNamespace="bsp2img"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib libzlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib libzlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\tools\bsp2img\bsp2img.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\..\include\win32\resources\quakeforge.rc"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2008/builtins/builtins.vcproj b/vc2008/builtins/builtins.vcproj
deleted file mode 100644
index 43fa081df..000000000
--- a/vc2008/builtins/builtins.vcproj
+++ /dev/null
@@ -1,474 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="builtins"
-	ProjectGUID="{04FA9D77-E45F-4917-B972-B353BA6A6FA8}"
-	RootNamespace="builtins"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\libs\gamecode\builtins\bi_gib.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\gamecode\builtins\pr_cmds.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2008/clean.ps1 b/vc2008/clean.ps1
deleted file mode 100644
index b1e75f990..000000000
--- a/vc2008/clean.ps1
+++ /dev/null
@@ -1,3 +0,0 @@
-ls -recurse -include 'win32','x64','*.user' | rm -recurse
-if(test-path QuakeForge.suo) { rm QuakeForge.suo -force }
-if(test-path QuakeForge.ncb) { rm QuakeForge.ncb }
\ No newline at end of file
diff --git a/vc2008/common/common.vcproj b/vc2008/common/common.vcproj
deleted file mode 100644
index 7c1404ac7..000000000
--- a/vc2008/common/common.vcproj
+++ /dev/null
@@ -1,490 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="qw-common"
-	ProjectGUID="{BC1F021A-1EEC-4A7A-B746-5AA6048E478C}"
-	RootNamespace="common"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\qw\source\com.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\game.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\map_cfg.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\net_packetlog.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\pmove.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\pmovetst.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2008/console/console.vcproj b/vc2008/console/console.vcproj
deleted file mode 100644
index f93f3975f..000000000
--- a/vc2008/console/console.vcproj
+++ /dev/null
@@ -1,494 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="console"
-	ProjectGUID="{ED4AFBF5-C247-4352-966D-048B8998C6A1}"
-	RootNamespace="console"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\libs\console\buffer.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\console\complete.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\console\console.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\console\filelist.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\console\inputline.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\console\list.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\console\view.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2008/console_client/console_client.vcproj b/vc2008/console_client/console_client.vcproj
deleted file mode 100644
index 0e2a378b0..000000000
--- a/vc2008/console_client/console_client.vcproj
+++ /dev/null
@@ -1,482 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="console-client"
-	ProjectGUID="{226D42CE-5833-444E-94FA-84C1D51892A8}"
-	RootNamespace="console_client"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\libs\console\bi_inputline.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\console\client.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\console\menu.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\console\pr_keys.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2008/console_server/console_server.vcproj b/vc2008/console_server/console_server.vcproj
deleted file mode 100644
index 33a611997..000000000
--- a/vc2008/console_server/console_server.vcproj
+++ /dev/null
@@ -1,470 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="console-server"
-	ProjectGUID="{B37FE734-01F4-4799-86B2-D084820715BE}"
-	RootNamespace="console_server"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\libs\console\server.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2008/engine/engine.vcproj b/vc2008/engine/engine.vcproj
deleted file mode 100644
index 203710bf7..000000000
--- a/vc2008/engine/engine.vcproj
+++ /dev/null
@@ -1,510 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="engine"
-	ProjectGUID="{2626C0E1-6F5C-47D3-B80D-93942D766DD7}"
-	RootNamespace="engine"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\libs\gamecode\engine\pr_builtins.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\gamecode\engine\pr_debug.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\gamecode\engine\pr_edict.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\gamecode\engine\pr_exec.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\gamecode\engine\pr_load.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\gamecode\engine\pr_opcode.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\gamecode\engine\pr_parse.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\gamecode\engine\pr_resolve.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\gamecode\engine\pr_resource.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\gamecode\engine\pr_strings.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\gamecode\engine\pr_zone.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2008/gib/gib.vcproj b/vc2008/gib/gib.vcproj
deleted file mode 100644
index 3fbb039b6..000000000
--- a/vc2008/gib/gib.vcproj
+++ /dev/null
@@ -1,538 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="gib"
-	ProjectGUID="{01C3B138-9D45-4ED6-A763-893C067262C2}"
-	RootNamespace="gib"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\libs\gib\exp.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\gib\gib_buffer.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\gib\gib_builtin.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\gib\gib_classes.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\gib\gib_execute.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\gib\gib_function.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\gib\gib_handle.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\gib\gib_init.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\gib\gib_object.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\gib\gib_parse.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\gib\gib_process.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\gib\gib_regex.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\gib\gib_semantics.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\gib\gib_thread.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\gib\gib_tree.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\gib\gib_vars.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\gib\ops.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\gib\regex.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2008/hw-master/hw-master.vcproj b/vc2008/hw-master/hw-master.vcproj
deleted file mode 100644
index 0e7273e3b..000000000
--- a/vc2008/hw-master/hw-master.vcproj
+++ /dev/null
@@ -1,562 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="hw-master"
-	ProjectGUID="{419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}"
-	RootNamespace="hwmaster"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib libzlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib libzlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\hw\source\master.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\..\include\win32\resources\quakeforge.rc"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2008/image/image.vcproj b/vc2008/image/image.vcproj
deleted file mode 100644
index 73970fb11..000000000
--- a/vc2008/image/image.vcproj
+++ /dev/null
@@ -1,482 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="image"
-	ProjectGUID="{5203F034-0047-4EC0-B7E9-D037FAF5D536}"
-	RootNamespace="image"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\libs\image\image.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\image\pcx.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\image\png.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\image\tga.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2008/include/config.h b/vc2008/include/config.h
deleted file mode 100644
index 1b787db16..000000000
--- a/vc2008/include/config.h
+++ /dev/null
@@ -1,740 +0,0 @@
-/* include/config.h.  Generated from config.h.in by configure.  */
-/* include/config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* list of cd plugins */
-#define CD_PLUGIN_LIST {"cd_win", cd_win_PluginInfo},{0, 0}
-
-/* list of cd prototypes */
-#define CD_PLUGIN_PROTOS extern plugin_t *cd_win_PluginInfo (void);
-
-/* list of client plugins */
-#define CLIENT_PLUGIN_LIST {"console_client", console_client_PluginInfo},{0, 0}
-
-/* list of client prototypes */
-#define CLIENT_PLUGIN_PROTOS extern plugin_t *console_client_PluginInfo (void);
-
-/* Define this to the command line for the C preprocessor */
-#define CPP_NAME "wave --c99 %d -o %o %i"
-
-/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
-   systems. This function is required for `alloca.c' support on those systems.
-   */
-/* #undef CRAY_STACKSEG_END */
-
-/* Define to 1 if using `alloca.c'. */
-/* #undef C_ALLOCA */
-
-/* Define this to the location of the global config file */
-#define FS_GLOBALCFG "~/quakeforge.conf"
-
-/* Define this to the path from which to load plugins */
-#define FS_PLUGINPATH "/usr/local/lib/quakeforge"
-
-/* Define this to the shared game directory root */
-#define FS_SHAREPATH "."
-
-/* Define this to the location of the user config file */
-#define FS_USERCFG "~/quakeforgerc"
-
-/* Define this to the unshared game directory root */
-#define FS_USERPATH "."
-
-/* Define this to the default GL dynamic lib */
-#define GL_DRIVER "OPENGL32.DLL"
-
-/* Define to 1 if you have the `access' function. */
-#define HAVE_ACCESS 1
-
-/* Define to 1 if you have `alloca', as a function or macro. */
-#define HAVE_ALLOCA 1
-
-/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
-   */
-/* #undef HAVE_ALLOCA_H */
-
-/* Define this if alloca is prototyped */
-/* #undef HAVE_ALLOCA_PROTO */
-#ifndef HAVE_ALLOCA_PROTO
-#ifndef QFASM
-void *alloca (int size);
-#endif
-#endif
-
-/* Define to 1 if you have the <alsa/asoundlib.h> header file. */
-/* #undef HAVE_ALSA_ASOUNDLIB_H */
-
-/* Define to 1 if you have the <arpa/inet.h> header file. */
-/* #undef HAVE_ARPA_INET_H */
-
-/* Define to 1 if you have the <asm/io.h> header file. */
-/* #undef HAVE_ASM_IO_H */
-
-/* Define to 1 if you have the <assert.h> header file. */
-#define HAVE_ASSERT_H 1
-
-/* Define to 1 if you have the <conio.h> header file. */
-#define HAVE_CONIO_H 1
-
-/* Define to 1 if you have the `connect' function. */
-#define HAVE_CONNECT 1
-
-/* Define to 1 if you have the <ctype.h> header file. */
-#define HAVE_CTYPE_H 1
-
-/* Define to 1 if you have the <curses.h> header file. */
-/* #undef HAVE_CURSES_H */
-
-/* Define to 1 if you have the <ddraw.h> header file. */
-#define HAVE_DDRAW_H 1
-
-/* Define if you have the XFree86 DGA extension */
-/* #undef HAVE_DGA */
-
-/* Define to 1 if you have the <dinput.h> header file. */
-#define HAVE_DINPUT_H 1
-
-/* Define to 1 if you have the <direct.h> header file. */
-#define HAVE_DIRECT_H 1
-
-/* Define to 1 if you have the <dirent.h> header file. */
-#define HAVE_DIRENT_H 1
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-/* #undef HAVE_DLFCN_H */
-
-/* Define if you have the dlopen function. */
-/* #undef HAVE_DLOPEN */
-
-/* Define to 1 if you have the <dmedia/audio.h> header file. */
-/* #undef HAVE_DMEDIA_AUDIO_H */
-
-/* Define to 1 if you have the <dmedia/cdaudio.h> header file. */
-/* #undef HAVE_DMEDIA_CDAUDIO_H */
-
-/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
-/* #undef HAVE_DOPRNT */
-
-/* Define to 1 if you have the <dpmi.h> header file. */
-/* #undef HAVE_DPMI_H */
-
-/* Define to 1 if you have the <dsound.h> header file. */
-#define HAVE_DSOUND_H 1
-
-/* Define to 1 if you have the <errno.h> header file. */
-#define HAVE_ERRNO_H 1
-
-/* Define to 1 if you have the <execinfo.h> header file. */
-/* #undef HAVE_EXECINFO_H */
-
-/* Define this if you have FB_AUX_VGA_PLANES_CFB4 */
-/* #undef HAVE_FB_AUX_VGA_PLANES_CFB4 */
-
-/* Define this if you have FB_AUX_VGA_PLANES_CFB4 */
-/* #undef HAVE_FB_AUX_VGA_PLANES_CFB8 */
-
-/* Define this if you have FB_AUX_VGA_PLANES_VGA4 */
-/* #undef HAVE_FB_AUX_VGA_PLANES_VGA4 */
-
-/* Define to 1 if you have the `fcntl' function. */
-/* #undef HAVE_FCNTL */
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-#define HAVE_FCNTL_H 1
-
-/* define this if you have flac libs */
-/* #undef HAVE_FLAC */
-
-/* Define to 1 if you have the <fnmatch.h> header file. */
-#define HAVE_FNMATCH_H 1
-
-/* Define this if fnmatch is prototyped in fnmatch.h */
-/* #undef HAVE_FNMATCH_PROTO */
-
-/* Define this if FPOS_T is a struct */
-/* #undef HAVE_FPOS_T_STRUCT */
-
-/* Define to 1 if you have the `ftime' function. */
-#define HAVE_FTIME 1
-
-/* Define to 1 if you have the `getaddrinfo' function. */
-#define HAVE_GETADDRINFO 1
-
-/* Define to 1 if you have the `gethostbyname' function. */
-#define HAVE_GETHOSTBYNAME 1
-
-/* Define to 1 if you have the `gethostname' function. */
-#define HAVE_GETHOSTNAME 1
-
-/* Define to 1 if you have the `getnameinfo' function. */
-#define HAVE_GETNAMEINFO 1
-
-/* Define to 1 if you have the `getpagesize' function. */
-/* #undef HAVE_GETPAGESIZE */
-
-/* Define to 1 if you have the `gettimeofday' function. */
-/* #undef HAVE_GETTIMEOFDAY */
-
-/* Define to 1 if you have the `getwd' function. */
-/* #undef HAVE_GETWD */
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-/* #undef HAVE_INTTYPES_H */
-
-/* Define this if your system has struct in_pktinfo */
-/* #undef HAVE_IN_PKTINFO */
-
-/* Define to 1 if you have the <io.h> header file. */
-#define HAVE_IO_H 1
-
-/* Define this if you want IPv6 support */
-/* #undef HAVE_IPV6 */
-
-/* Define if you have libjack */
-/* #undef HAVE_JACK */
-
-/* Define to 1 if you have a functional curl library. */
-#define HAVE_LIBCURL 1
-
-/* Define to 1 if you have the <libc.h> header file. */
-/* #undef HAVE_LIBC_H */
-
-/* Define to 1 if you have the `db' library (-ldb). */
-/* #undef HAVE_LIBDB */
-
-/* Define to 1 if you have the `efence' library (-lefence). */
-/* #undef HAVE_LIBEFENCE */
-
-/* Define to 1 if you have the `m' library (-lm). */
-/* #undef HAVE_LIBM */
-
-/* Define to 1 if you have the <limits.h> header file. */
-#define HAVE_LIMITS_H 1
-
-/* Define to 1 if you have the <linux/cdrom.h> header file. */
-/* #undef HAVE_LINUX_CDROM_H */
-
-/* Define to 1 if you have the <linux/fb.h> header file. */
-/* #undef HAVE_LINUX_FB_H */
-
-/* Define to 1 if you have the <linux/joystick.h> header file. */
-/* #undef HAVE_LINUX_JOYSTICK_H */
-
-/* Define to 1 if you have the <linux/soundcard.h> header file. */
-/* #undef HAVE_LINUX_SOUNDCARD_H */
-
-/* Define to 1 if you support file names longer than 14 characters. */
-#define HAVE_LONG_FILE_NAMES 1
-
-/* Define to 1 if you have the <machine/soundcard.h> header file. */
-/* #undef HAVE_MACHINE_SOUNDCARD_H */
-
-/* Define to 1 if you have the <malloc.h> header file. */
-#define HAVE_MALLOC_H 1
-
-/* Define to 1 if you have the <math.h> header file. */
-#define HAVE_MATH_H 1
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the <mgraph.h> header file. */
-/* #undef HAVE_MGRAPH_H */
-
-/* Define to 1 if you have the `mkdir' function. */
-#define HAVE_MKDIR 1
-
-/* Define to 1 if you have a working `mmap' system call. */
-/* #undef HAVE_MMAP */
-
-/* Define to 1 if you have the `mprotect' function. */
-/* #undef HAVE_MPROTECT */
-
-/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
-/* #undef HAVE_NDIR_H */
-
-/* Define to 1 if you have the <netdb.h> header file. */
-/* #undef HAVE_NETDB_H */
-
-/* Define to 1 if you have the <netinet/in.h> header file. */
-/* #undef HAVE_NETINET_IN_H */
-
-/* Define if you have libpng */
-/* #undef HAVE_PNG */
-
-/* Define to 1 if you have the <process.h> header file. */
-#define HAVE_PROCESS_H 1
-
-/* Define to 1 if you have the <pthread.h> header file. */
-/* #undef HAVE_PTHREAD_H */
-
-/* Define to 1 if you have the `putenv' function. */
-#define HAVE_PUTENV 1
-
-/* Define to 1 if you have the <pwd.h> header file. */
-/* #undef HAVE_PWD_H */
-
-/* Define to 1 if you have the <rpc/types.h> header file. */
-/* #undef HAVE_RPC_TYPES_H */
-
-/* Define this if you have sa_len member in struct sockaddr (BSD) */
-/* #undef HAVE_SA_LEN */
-
-/* Define to 1 if you have the `select' function. */
-#define HAVE_SELECT 1
-
-/* Define to 1 if you have the <setjmp.h> header file. */
-#define HAVE_SETJMP_H 1
-
-/* Define to 1 if you have the <signal.h> header file. */
-#define HAVE_SIGNAL_H 1
-
-/* Define this if you have sin6_len member in struct sockaddr_in6 (BSD) */
-/* #undef HAVE_SIN6_LEN */
-
-/* Define this if your system has size_t */
-#define HAVE_SIZE_T 1
-
-/* Define to 1 if you have the `snprintf' function. */
-#define HAVE_SNPRINTF 1
-
-/* Define to 1 if you have the `socket' function. */
-#define HAVE_SOCKET 1
-
-/* Define this if your system has socklen_t */
-/* #undef HAVE_SOCKLEN_T */
-
-/* Define this if you have ss_len member in struct sockaddr_storage (BSD) */
-/* #undef HAVE_SS_LEN */
-
-/* Define to 1 if you have the `stat' function. */
-#define HAVE_STAT 1
-
-/* Define to 1 if you have the <stdarg.h> header file. */
-#define HAVE_STDARG_H 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdio.h> header file. */
-#define HAVE_STDIO_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the `strcasestr' function. */
-/* #undef HAVE_STRCASESTR */
-
-/* Define this if strcasestr is prototyped in string.h */
-/* #undef HAVE_STRCASESTR_PROTO */
-
-/* Define to 1 if you have the `strerror' function. */
-#define HAVE_STRERROR 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-/* #undef HAVE_STRINGS_H 1 */
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the `strnlen' function. */
-#define HAVE_STRNLEN 1
-
-/* Define this if strnlen is prototyped in string.h */
-#define HAVE_STRNLEN_PROTO 1
-
-/* Define to 1 if you have the `strsep' function. */
-/* #undef HAVE_STRSEP */
-
-/* Define to 1 if you have the `strstr' function. */
-#define HAVE_STRSTR 1
-
-/* Define to 1 if `st_blksize' is member of `struct stat'. */
-/* #undef HAVE_STRUCT_STAT_ST_BLKSIZE */
-
-/* Define to 1 if your `struct stat' has `st_blksize'. Deprecated, use
-   `HAVE_STRUCT_STAT_ST_BLKSIZE' instead. */
-/* #undef HAVE_ST_BLKSIZE */
-
-/* Define this if C symbols are prefixed with an underscore */
-#define HAVE_SYM_PREFIX_UNDERSCORE 1
-
-/* Define to 1 if you have the <sys/asoundlib.h> header file. */
-/* #undef HAVE_SYS_ASOUNDLIB_H */
-
-/* Define to 1 if you have the <sys/audioio.h> header file. */
-/* #undef HAVE_SYS_AUDIOIO_H */
-
-/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
-   */
-/* #undef HAVE_SYS_DIR_H */
-
-/* Define to 1 if you have the <sys/filio.h> header file. */
-/* #undef HAVE_SYS_FILIO_H */
-
-/* Define to 1 if you have the <sys/ioctl.h> header file. */
-/* #undef HAVE_SYS_IOCTL_H */
-
-/* Define to 1 if you have the <sys/io.h> header file. */
-/* #undef HAVE_SYS_IO_H */
-
-/* Define to 1 if you have the <sys/ipc.h> header file. */
-/* #undef HAVE_SYS_IPC_H */
-
-/* Define to 1 if you have the <sys/mman.h> header file. */
-/* #undef HAVE_SYS_MMAN_H */
-
-/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
-   */
-/* #undef HAVE_SYS_NDIR_H */
-
-/* Define to 1 if you have the <sys/param.h> header file. */
-/* #undef HAVE_SYS_PARAM_H */
-
-/* Define to 1 if you have the <sys/poll.h> header file. */
-/* #undef HAVE_SYS_POLL_H */
-
-/* Define to 1 if you have the <sys/shm.h> header file. */
-/* #undef HAVE_SYS_SHM_H */
-
-/* Define to 1 if you have the <sys/signal.h> header file. */
-/* #undef HAVE_SYS_SIGNAL_H */
-
-/* Define to 1 if you have the <sys/socket.h> header file. */
-/* #undef HAVE_SYS_SOCKET_H */
-
-/* Define to 1 if you have the <sys/soundcard.h> header file. */
-/* #undef HAVE_SYS_SOUNDCARD_H */
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-/* #undef HAVE_SYS_TIME_H */
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <sys/uio.h> header file. */
-/* #undef HAVE_SYS_UIO_H */
-
-/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
-/* #undef HAVE_SYS_WAIT_H */
-
-/* Define this if you have tchar.h */
-#define HAVE_TCHAR_H 1
-
-/* Define to 1 if you have the <termios.h> header file. */
-/* #undef HAVE_TERMIOS_H */
-
-/* Define to 1 if you have the <time.h> header file. */
-#define HAVE_TIME_H 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-/* #undef HAVE_UNISTD_H */
-
-/* Define to 1 if you have the `usleep' function. */
-/* #undef HAVE_USLEEP */
-
-/* Define if va_copy is available */
-/* #undef HAVE_VA_COPY */
-
-/* Define to 1 if you have the <vgakeyboard.h> header file. */
-/* #undef HAVE_VGAKEYBOARD_H */
-
-/* Define to 1 if you have the <vgamouse.h> header file. */
-/* #undef HAVE_VGAMOUSE_H */
-
-/* Define if you have the XFree86 VIDMODE extension */
-/* #undef HAVE_VIDMODE */
-
-/* define this if you have ogg/vorbis libs */
-/* #undef HAVE_VORBIS */
-
-/* Define to 1 if you have the `vprintf' function. */
-#define HAVE_VPRINTF 1
-
-/* Define to 1 if you have the `vsnprintf' function. */
-#define HAVE_VSNPRINTF 1
-
-/* Define if you have WildMidi */
-/* #undef HAVE_WILDMIDI */
-
-/* Define to 1 if you have the <windows.h> header file. */
-#define HAVE_WINDOWS_H 1
-
-/* Define to 1 if you have the <winsock.h> header file. */
-#define HAVE_WINSOCK_H 1
-
-/* Define if you have XMMS */
-/* #undef HAVE_XMMS */
-
-/* Define if you have zlib */
-#define HAVE_ZLIB 1
-
-/* Define to 1 if you have the `_access' function. */
-#define HAVE__ACCESS 1
-
-/* Define to 1 if you have the `_ftime' function. */
-#define HAVE__FTIME 1
-
-/* Define to 1 if you have the <_mingw.h> header file. */
-/* #undef HAVE__MINGW_H */
-
-/* Define to 1 if you have the `_mkdir' function. */
-#define HAVE__MKDIR 1
-
-/* Define this if you have _SC_PAGESIZE */
-/* #undef HAVE__SC_PAGESIZE */
-
-/* Define to 1 if you have the `_snprintf' function. */
-#define HAVE__SNPRINTF 1
-
-/* Define if __va_copy is available */
-/* #undef HAVE__VA_COPY */
-
-/* Define to 1 if you have the `_vsnprintf' function. */
-#define HAVE__VSNPRINTF 1
-
-/* Define this if the GCC __attribute__ keyword is available */
-/* #undef HAVE___ATTRIBUTE__ */
-
-#ifndef HAVE___ATTRIBUTE__
-# define __attribute__(x)
-#endif
-
-/* Define this if the GCC __attribute__ keyword is available */
-/* #undef HAVE___ATTRIBUTE__VISIBILITY */
-
-#ifdef HAVE___ATTRIBUTE__VISIBILITY
-# define VISIBLE __attribute__((visibility ("default")))
-#else
-# define VISIBLE
-#endif
-
-/* Define this if the GCC __builtin_expect keyword is available */
-/* #undef HAVE___BUILTIN_EXPECT */
-
-#ifndef HAVE___BUILTIN_EXPECT
-# define __builtin_expect(x,c) x
-#endif
-
-/* Defined if libcurl supports AsynchDNS */
-/* #undef LIBCURL_FEATURE_ASYNCHDNS */
-
-/* Defined if libcurl supports IDN */
-#define LIBCURL_FEATURE_IDN 1
-
-/* Defined if libcurl supports IPv6 */
-#define LIBCURL_FEATURE_IPV6 1
-
-/* Defined if libcurl supports KRB4 */
-/* #undef LIBCURL_FEATURE_KRB4 */
-
-/* Defined if libcurl supports libz */
-#define LIBCURL_FEATURE_LIBZ 1
-
-/* Defined if libcurl supports NTLM */
-#define LIBCURL_FEATURE_NTLM 1
-
-/* Defined if libcurl supports SSL */
-/* #undef LIBCURL_FEATURE_SSL */
-
-/* Defined if libcurl supports SSPI */
-#define LIBCURL_FEATURE_SSPI 1
-
-/* Defined if libcurl supports DICT */
-/* #undef LIBCURL_PROTOCOL_DICT */
-
-/* Defined if libcurl supports FILE */
-/* #undef LIBCURL_PROTOCOL_FILE */
-
-/* Defined if libcurl supports FTP */
-#define LIBCURL_PROTOCOL_FTP 1
-
-/* Defined if libcurl supports FTPS */
-/* #undef LIBCURL_PROTOCOL_FTPS */
-
-/* Defined if libcurl supports HTTP */
-#define LIBCURL_PROTOCOL_HTTP 1
-
-/* Defined if libcurl supports HTTPS */
-/* #undef LIBCURL_PROTOCOL_HTTPS */
-
-/* Defined if libcurl supports LDAP */
-/* #undef LIBCURL_PROTOCOL_LDAP */
-
-/* Defined if libcurl supports TELNET */
-/* #undef LIBCURL_PROTOCOL_TELNET */
-
-/* Defined if libcurl supports TFTP */
-/* #undef LIBCURL_PROTOCOL_TFTP */
-
-/* Define to 1 if `major', `minor', and `makedev' are declared in <mkdev.h>.
-   */
-/* #undef MAJOR_IN_MKDEV */
-
-/* Define to 1 if `major', `minor', and `makedev' are declared in
-   <sysmacros.h>. */
-/* #undef MAJOR_IN_SYSMACROS */
-
-/* Define this to the QSG standard version you support in NetQuake */
-#define NQ_QSG_VERSION "1.0"
-
-/* Define this to the NetQuake standard version you support */
-#define NQ_VERSION "1.09"
-
-/* Name of package */
-#define PACKAGE "quakeforge"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT ""
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME ""
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING ""
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME ""
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION ""
-
-/* Define this to your operating system's path separator character */
-#define PATH_SEPARATOR '/'
-
-/* "Proper" package name */
-#define PROGRAM "QuakeForge"
-
-/* Define this to where qfcc should look for header files */
-#define QFCC_INCLUDE_PATH "/usr/local/include/QF/ruamoko"
-
-/* Define this to where qfcc should look for lib files */
-#define QFCC_LIB_PATH "/usr/local/lib/ruamoko"
-
-/* Define this to the QSG standard version you support in QuakeWorld */
-#define QW_QSG_VERSION "2.0"
-
-/* Define this to the QuakeWorld standard version you support */
-#define QW_VERSION "2.40"
-
-/* Define as the return type of signal handlers (`int' or `void'). */
-#define RETSIGTYPE void
-
-/* list of server plugins */
-#define SERVER_PLUGIN_LIST {"console_server", console_server_PluginInfo},{0, 0}
-
-/* list of server prototypes */
-#define SERVER_PLUGIN_PROTOS extern plugin_t *console_server_PluginInfo (void);
-
-/* Define this to the default sound output driver. */
-#define SND_OUTPUT_DEFAULT "win"
-
-/* list of sound output plugins */
-#define SND_OUTPUT_LIST {"snd_output_win", snd_output_win_PluginInfo},{0, 0}
-
-/* list of sound output prototypes */
-#define SND_OUTPUT_PROTOS extern plugin_t *snd_output_win_PluginInfo (void);
-
-/* list of sound render plugins */
-#define SND_RENDER_LIST {"snd_render_default", snd_render_default_PluginInfo},{0, 0}
-
-/* list of sound render prototypes */
-#define SND_RENDER_PROTOS extern plugin_t *snd_render_default_PluginInfo (void);
-
-/* If using the C implementation of alloca, define if you know the
-   direction of stack growth for your system; otherwise it will be
-   automatically deduced at runtime.
-	STACK_DIRECTION > 0 => grows toward higher addresses
-	STACK_DIRECTION < 0 => grows toward lower addresses
-	STACK_DIRECTION = 0 => direction of growth unknown */
-/* #undef STACK_DIRECTION */
-
-/* Define this if you are building static plugins */
-#define STATIC_PLUGINS 1
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-#define TIME_WITH_SYS_TIME 1
-
-/* Define to 1 if your <sys/time.h> declares `struct tm'. */
-/* #undef TM_IN_SYS_TIME */
-
-/* Define this if you want progs typechecking */
-/* #undef TYPECHECK_PROGS */
-
-/* Define this if you want to use Intel assembly optimizations */
-/* #undef USE_INTEL_ASM */
-
-/* Define if va_list is an array */
-/* #undef VA_LIST_IS_ARRAY */
-
-/* Version number of package */
-#define VERSION "0.5.5-SVN"
-
-/* Define to 1 if your processor stores words with the most significant byte
-   first (like Motorola and SPARC, unlike Intel and VAX). */
-/* #undef WORDS_BIGENDIAN */
-
-/* Define to 1 if the X Window System is missing or not being used. */
-/* #undef X_DISPLAY_MISSING */
-
-/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
-   `char[]'. */
-/* #undef YYTEXT_POINTER */
-
-/* Define to empty if `const' does not conform to ANSI C. */
-/* #undef const */
-
-/* Define curl_free() as free() if our version of curl lacks curl_free. */
-/* #undef curl_free */
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
-   calls it, or to nothing if 'inline' is not supported under any name.  */
-#ifndef __cplusplus
-#define inline __inline
-/* #undef inline */
-#endif
-
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-/* #undef size_t */
-
-/* Define strcasecmp as stricmp if you have one but not the other */
-#define strcasecmp stricmp
-
-/* new stuff, for VC2005 compatibility (phrosty) */
-
-#define _CRT_SECURE_NO_WARNINGS
-#define _CRT_NONSTDC_NO_WARNINGS
-
-/* used in qfcc.  should #define to _ReturnAddress()? */
-#define __builtin_return_address(x) (0)
-
-#define _WIN32_WINNT				0x0500
-#define DIRECTINPUT_VERSION	0x0600
-
-#define INITGUID
-
-#define snprintf _snprintf
-#define strncasecmp strnicmp
-
-#define ssize_t ptrdiff_t
-#define S_ISDIR(mode) (mode & _S_IFDIR)
-
-/* used in access() */
-#define R_OK 04
-
-/*
-	disable silent conversion warnings for fixing later..
-
-	4047: 'operator' : 'identifier1' differs in levels of indirection from 'identifier2'
-	4244: 'argument' : conversion from 'type1' to 'type2', possible loss of data
-	4267: 'var' : conversion from 'size_t' to 'type', possible loss of data (/Wp64 warning)
-	4305: 'identifier' : truncation from 'type1' to 'type2'
-	4311: 'variable' : pointer truncation from 'type' to 'type' (/Wp64 warning)
-	4312: 'operation' : conversion from 'type1' to 'type2' of greater size (/Wp64 warning)
-*/
-#pragma warning(disable:4047 4244 4267 4305 4311 4312)
diff --git a/vc2008/models-sw/models-sw.vcproj b/vc2008/models-sw/models-sw.vcproj
deleted file mode 100644
index e8aa3d541..000000000
--- a/vc2008/models-sw/models-sw.vcproj
+++ /dev/null
@@ -1,512 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="models-sw"
-	ProjectGUID="{F4A9881E-0EB0-44A1-9664-B6CBDE992861}"
-	RootNamespace="modelssw"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\libs\models\clip_hull.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\models\model.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\models\trace.c"
-				>
-			</File>
-			<Filter
-				Name="alias"
-				>
-				<File
-					RelativePath="..\..\libs\models\alias\model_alias.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\models\alias\sw_model_alias.c"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="brush"
-				>
-				<File
-					RelativePath="..\..\libs\models\brush\model_brush.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\models\brush\sw_model_brush.c"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="sprite"
-				>
-				<File
-					RelativePath="..\..\libs\models\sprite\model_sprite.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\models\sprite\sw_model_sprite.c"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2008/models/models.vcproj b/vc2008/models/models.vcproj
deleted file mode 100644
index cacad0007..000000000
--- a/vc2008/models/models.vcproj
+++ /dev/null
@@ -1,490 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="models"
-	ProjectGUID="{DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}"
-	RootNamespace="models"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\libs\models\clip_hull.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\models\model.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\models\null_model.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\models\trace.c"
-				>
-			</File>
-			<Filter
-				Name="brush"
-				>
-				<File
-					RelativePath="..\..\libs\models\brush\model_brush.c"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2008/modelsgl/modelsgl.vcproj b/vc2008/modelsgl/modelsgl.vcproj
deleted file mode 100644
index 128903bd5..000000000
--- a/vc2008/modelsgl/modelsgl.vcproj
+++ /dev/null
@@ -1,522 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="models-gl"
-	ProjectGUID="{1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}"
-	RootNamespace="models"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\libs\models\clip_hull.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\models\gl_model_fullbright.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\models\model.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\models\trace.c"
-				>
-			</File>
-			<Filter
-				Name="alias"
-				>
-				<File
-					RelativePath="..\..\libs\models\alias\gl_mesh.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\models\alias\gl_model_alias.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\models\alias\model_alias.c"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="brush"
-				>
-				<File
-					RelativePath="..\..\libs\models\brush\gl_model_brush.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\models\brush\model_brush.c"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="sprite"
-				>
-				<File
-					RelativePath="..\..\libs\models\sprite\gl_model_sprite.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\models\sprite\model_sprite.c"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2008/net-main/net-main.vcproj b/vc2008/net-main/net-main.vcproj
deleted file mode 100644
index 8f33ca46c..000000000
--- a/vc2008/net-main/net-main.vcproj
+++ /dev/null
@@ -1,488 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="net-main"
-	ProjectGUID="{053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}"
-	RootNamespace="netmain"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\libs\net\nm\net_dgrm.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\net\nm\net_loop.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\net\net_main.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\net\nm\net_vcr.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\net\nm\net_win.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\net\nm\net_wins.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2008/net/net.vcproj b/vc2008/net/net.vcproj
deleted file mode 100644
index b79e2718b..000000000
--- a/vc2008/net/net.vcproj
+++ /dev/null
@@ -1,474 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="net-chan"
-	ProjectGUID="{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}"
-	RootNamespace="net"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\libs\net\net_chan.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\net\nc\net_udp.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2008/nq-common/nq-common.vcproj b/vc2008/nq-common/nq-common.vcproj
deleted file mode 100644
index f5e82ed15..000000000
--- a/vc2008/nq-common/nq-common.vcproj
+++ /dev/null
@@ -1,516 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="nq-common"
-	ProjectGUID="{6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}"
-	RootNamespace="nqcommon"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\nq\source\com.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\nq\source\game.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\nq\source\host.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\nq\source\host_cmd.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\nq\source\sv_cl_phys.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\nq\source\sv_cvar.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\nq\source\sv_main.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\nq\source\sv_move.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\nq\source\sv_phys.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\nq\source\sv_pr_cmds.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\nq\source\sv_progs.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\nq\source\sv_user.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\nq\source\world.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2008/nq-sdl/nq-sdl.vcproj b/vc2008/nq-sdl/nq-sdl.vcproj
deleted file mode 100644
index 73f38ada0..000000000
--- a/vc2008/nq-sdl/nq-sdl.vcproj
+++ /dev/null
@@ -1,556 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="nq-sdl"
-	ProjectGUID="{2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}"
-	RootNamespace="nqsdl"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib sdl.lib sdlmain.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib sdl.lib sdlmain.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib sdl.lib sdlmain.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib sdl.lib sdlmain.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H;SDL_STATIC"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib dxguid.lib libzlib.lib libsdl.lib libsdlmain.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H;SDL_STATIC"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib dxguid.lib libzlib.lib libsdl.lib libsdlmain.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\nq\source\sys_sdl.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\..\include\win32\resources\quakeforge.rc"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2008/nq-sdl32/nq-sdl32.vcproj b/vc2008/nq-sdl32/nq-sdl32.vcproj
deleted file mode 100644
index 1e9ffcae2..000000000
--- a/vc2008/nq-sdl32/nq-sdl32.vcproj
+++ /dev/null
@@ -1,562 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="nq-sdl32"
-	ProjectGUID="{2CEB1965-A89C-4422-A9AC-B30FCE7913C3}"
-	RootNamespace="nqsdl32"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib sdl.lib sdlmain.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib sdl.lib sdlmain.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib sdl.lib sdlmain.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib sdl.lib sdlmain.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H;SDL_STATIC"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib dxguid.lib libzlib.lib libsdl.lib libsdlmain.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H;SDL_STATIC"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib dxguid.lib libzlib.lib libsdl.lib libsdlmain.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\nq\source\sys_sdl.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\..\include\win32\resources\quakeforge.rc"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2008/nq-server/nq-server.vcproj b/vc2008/nq-server/nq-server.vcproj
deleted file mode 100644
index 202f9b6f2..000000000
--- a/vc2008/nq-server/nq-server.vcproj
+++ /dev/null
@@ -1,566 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="nq-server"
-	ProjectGUID="{231C032C-DE16-459A-8E7D-6509C2EC3998}"
-	RootNamespace="nqserver"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib libzlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib libzlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\nq\source\sv_ded.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\nq\source\sys_wind.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\..\include\win32\resources\quakeforge.rc"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2008/nq-sgl/nq-sgl.vcproj b/vc2008/nq-sgl/nq-sgl.vcproj
deleted file mode 100644
index f6e9bc3b1..000000000
--- a/vc2008/nq-sgl/nq-sgl.vcproj
+++ /dev/null
@@ -1,562 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="nq-sgl"
-	ProjectGUID="{2E26DB8B-9E37-4072-B397-8A7086E0ACD0}"
-	RootNamespace="nqsgl"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib sdl.lib sdlmain.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib sdl.lib sdlmain.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib sdl.lib sdlmain.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib sdl.lib sdlmain.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H;SDL_STATIC"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib dxguid.lib libzlib.lib libsdl.lib libsdlmain.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H;SDL_STATIC"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib dxguid.lib libzlib.lib libsdl.lib libsdlmain.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\nq\source\sys_sdl.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\..\include\win32\resources\quakeforge.rc"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2008/nq-wgl/nq-wgl.vcproj b/vc2008/nq-wgl/nq-wgl.vcproj
deleted file mode 100644
index 6453a12bd..000000000
--- a/vc2008/nq-wgl/nq-wgl.vcproj
+++ /dev/null
@@ -1,562 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="nq-wgl"
-	ProjectGUID="{1CD1A18B-95D5-4EA4-917C-34B10066BFCC}"
-	RootNamespace="nq-wgl"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib libzlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib libzlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\nq\source\sys_win.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\..\include\win32\resources\quakeforge.rc"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2008/nq/nq.vcproj b/vc2008/nq/nq.vcproj
deleted file mode 100644
index 220f0ff7a..000000000
--- a/vc2008/nq/nq.vcproj
+++ /dev/null
@@ -1,544 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="nq"
-	ProjectGUID="{155112B9-A8A9-4E06-90F5-4AAAB32B2F70}"
-	RootNamespace="nq"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\nq\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\nq\source\cl_cam.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\nq\source\cl_cmd.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\nq\source\cl_demo.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\nq\source\cl_input.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\nq\source\cl_main.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\nq\source\cl_parse.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\nq\source\cl_screen.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\nq\source\cl_tent.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\nq\source\cl_view.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\nq\source\host_skin.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\nq\source\sbar.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\nq\source\skin.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\nq\include\chase.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\nq\include\client.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\nq\include\game.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\nq\include\host.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\nq\include\protocol.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\nq\include\server.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\nq\include\sv_pr_cmds.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\nq\include\sv_progs.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2008/pak/pak.vcproj b/vc2008/pak/pak.vcproj
deleted file mode 100644
index b5cd0bec8..000000000
--- a/vc2008/pak/pak.vcproj
+++ /dev/null
@@ -1,566 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="pak"
-	ProjectGUID="{9EE8BD4B-47D3-4AD5-A8B9-831329792A05}"
-	RootNamespace="pak"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib libzlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib libzlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\tools\pak\pak.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\tools\pak\pak.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\..\include\win32\resources\quakeforge.rc"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2008/qfbsp/qfbsp.vcproj b/vc2008/qfbsp/qfbsp.vcproj
deleted file mode 100644
index 97462b79e..000000000
--- a/vc2008/qfbsp/qfbsp.vcproj
+++ /dev/null
@@ -1,632 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="qfbsp"
-	ProjectGUID="{B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}"
-	RootNamespace="qfbsp"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qfbsp\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qfbsp\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qfbsp\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qfbsp\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qfbsp\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib libzlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qfbsp\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib libzlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\tools\qfbsp\source\brush.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfbsp\source\csg4.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfbsp\source\map.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfbsp\source\merge.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfbsp\source\nodraw.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfbsp\source\options.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfbsp\source\outside.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfbsp\source\portals.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfbsp\source\qfbsp.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfbsp\source\readbsp.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfbsp\source\region.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfbsp\source\solidbsp.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfbsp\source\surfaces.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfbsp\source\tjunc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfbsp\source\writebsp.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\tools\qfbsp\include\bsp5.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfbsp\include\map.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfbsp\include\options.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\..\include\win32\resources\quakeforge.rc"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2008/qfcc/FlexBison.rules b/vc2008/qfcc/FlexBison.rules
deleted file mode 100644
index 0e4c1e3dc..000000000
--- a/vc2008/qfcc/FlexBison.rules
+++ /dev/null
@@ -1,246 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-* FlexBison.rules
-*
-*       Copyright 2006(c) Microsoft Corporation. All rights reserved.
-*
--->
-<VisualStudioToolFile
-	Name="Flex and Bison Tools"
-	Version="8.00"
-	>
-	<Rules>
-		<CustomBuildRule
-			Name="FlexGenerator"
-			DisplayName="Flex Generator"
-			CommandLine="flex.exe [AllOptions] [AdditionalOptions] [Inputs]"
-			Outputs="lex.$(InputName).c"
-			FileExtensions="*.l"
-			ExecutionDescription="Generating lexical analyser..."
-			>
-			<Properties>
-				<BooleanProperty
-					Name="BackingUpInfo"
-					DisplayName="Generate backing-up information"
-					Category="Debug information"
-					Description="Generates the file &apos;lex.backup&apos; that contains a list of scanner states which require backing up and the input characters on which they do so."
-					Switch="-b"
-				/>
-				<BooleanProperty
-					Name="DebuggerOn"
-					DisplayName="Run in debug mode"
-					Category="Debug information"
-					Description="Turn on debug mode in generated scanner"
-					Switch="-d"
-				/>
-				<BooleanProperty
-					Name="GenFast"
-					DisplayName="Generate fast large scanner"
-					PropertyPageName="Performance"
-					Description="Generate fast, large scanner"
-					Switch="-f"
-				/>
-				<BooleanProperty
-					Name="CaseInsensitive"
-					DisplayName="Case insensitive scanner"
-					Description="The case of letters given in the flex input patterns will be ignored, and tokens in the input will be matched regardless of case"
-					Switch="-i"
-				/>
-				<BooleanProperty
-					Name="CompatibilityOn"
-					DisplayName="Maximum compatibility with lex"
-					Description="Turns on maximum compatibility with the original AT&amp;T lex implementation. Note that this does not mean full compatibility."
-					Switch="-l"
-				/>
-				<BooleanProperty
-					Name="PerformanceReport"
-					DisplayName="Generate performance report"
-					PropertyPageName="Performance"
-					Description="Generates a performance report to stderr. The report consists of comments regarding features of the flex input file which will cause a serious loss of performance in the resulting scanner."
-					Switch="-p"
-				/>
-				<BooleanProperty
-					Name="SuppressDefault"
-					DisplayName="Suppress the default rule"
-					Description="Causes the default rule (that unmatched scanner input is echoed to stdout) to be suppressed. If the scanner encounters input that does not match any of its rules, it aborts with an error."
-					Switch="-s"
-				/>
-				<BooleanProperty
-					Name="SuppressWarnings"
-					DisplayName="Suppress warning messages"
-					Description="Suppress warning messages."
-					Switch="-w"
-				/>
-				<BooleanProperty
-					Name="BatchScanner"
-					DisplayName="Generate Batch Scanner"
-					PropertyPageName="Performance"
-					Description="Instructs flex to generate a batch scanner. In general, you use &apos;-B&apos; when you are certain that your scanner will never be used interactively, and you want to squeeze a little more performance out of it."
-					Switch="-B"
-				/>
-				<BooleanProperty
-					Name="FastScanner"
-					DisplayName="Use fast scanner table representation"
-					PropertyPageName="Performance"
-					Description="Specifies that the fast scanner table representation should be used (and stdio bypassed). This representation is about as fast as the full table representation &apos;(-f)&apos;, and for some sets of patterns will be considerably smaller (and for others, larger)."
-					Switch="-F"
-				/>
-				<BooleanProperty
-					Name="InteractiveScanner"
-					DisplayName="Generate an interactive scanner"
-					PropertyPageName="Performance"
-					Description="Instructs flex to generate an interactive scanner. An interactive scanner is one that looks ahead to decide what token has been matched only if it absolutely must."
-					Switch="-I"
-				/>
-				<BooleanProperty
-					Name="NoGenLineDirectives"
-					DisplayName="Don&apos;t generate #line directives"
-					Category="Debug information"
-					Description="Instructs flex not to generate &apos;#line&apos; directives. Without this option, flex peppers the generated scanner with #line directives so error messages in the actions will be correctly located with respect to either the original flex input file."
-					Switch="-L"
-				/>
-				<BooleanProperty
-					Name="TraceMode"
-					DisplayName="Trace mode"
-					Category="Debug information"
-					Description="Makes flex run in trace mode. It will generate a lot of messages to stderr concerning the form of the input and the resultant non-deterministic and deterministic finite automata."
-					Switch="-T"
-				/>
-				<StringProperty
-					Name="OutputFile"
-					DisplayName="Output File"
-					Description="The output file containing the implementation of the analyser"
-					Switch="-o[value]"
-					DefaultValue="lex.$(InputName).c"
-				/>
-				<StringProperty
-					Name="ScannerPrefix"
-					DisplayName="Scanner Prefix"
-					Description="Specify scanner prefix other than yy"
-					Switch="-P[value]"
-					DefaultValue="$(InputName)"
-				/>
-				<EnumProperty
-					Name="TableCompression"
-					DisplayName="Table Compression"
-					PropertyPageName="Performance"
-					Description="Controls the degree of table compression and, more generally, trade-offs between small scanners and fast scanners."
-					>
-					<Values>
-						<EnumValue
-							Value="0"
-							Switch="-Cem"
-							DisplayName="Equivalence classes and meta-equivalence classes (slowest &amp; smallest)"
-						/>
-						<EnumValue
-							Value="1"
-							Switch="-Cm"
-							DisplayName="Meta-equivalence classes"
-						/>
-						<EnumValue
-							Value="2"
-							Switch="-Ce"
-							DisplayName="Equivalence classes"
-						/>
-						<EnumValue
-							Value="3"
-							Switch="-C"
-							DisplayName="Compress scanner tables"
-						/>
-						<EnumValue
-							Value="4"
-							Switch="-Cfe"
-							DisplayName="Full scanner tables and equivalence classes"
-						/>
-						<EnumValue
-							Value="5"
-							Switch="-CFe"
-							DisplayName="Alternate fast scanner representation and equivalence classes"
-						/>
-						<EnumValue
-							Value="6"
-							Switch="-Cf"
-							DisplayName="Full scanner tables"
-						/>
-						<EnumValue
-							Value="7"
-							Switch="-CF"
-							DisplayName="Alternate fast scanner representation"
-						/>
-						<EnumValue
-							Value="8"
-							Switch="-Cfa"
-							DisplayName="Align data in full scanner tables (fastest &amp; largest)"
-						/>
-						<EnumValue
-							Value="9"
-							Switch="-CFa"
-							DisplayName="Align data in the alternate fast scanner representation (fastest &amp; largest)"
-						/>
-					</Values>
-				</EnumProperty>
-				<StringProperty
-					Name="SkeletonFile"
-					DisplayName="Use custom skeleton"
-					Description="Overrides the default skeleton file from which flex constructs its scanners"
-					Switch="-S[value]"
-				/>
-			</Properties>
-		</CustomBuildRule>
-		<CustomBuildRule
-			Name="BisonParser"
-			DisplayName="Bison Parser"
-			CommandLine="bison.exe [AllOptions] [AdditionalOptions] [Inputs]"
-			Outputs="$(InputName).tab.c"
-			FileExtensions="*.y"
-			ExecutionDescription="Generating parser based on grammar..."
-			>
-			<Properties>
-				<StringProperty
-					Name="FilePrefix"
-					DisplayName="File Prefix"
-					Description="Specify a prefix to use for all Bison output file names"
-					Switch="-b [value]"
-					DefaultValue="$(InputName)"
-				/>
-				<BooleanProperty
-					Name="Defines"
-					DisplayName="Use defines"
-					Description="Write an extra output file containing macro definitions for the token type names defined in the grammar and the semantic value type YYSTYPE, as well as a few extern variable declarations"
-					Switch="-d"
-				/>
-				<BooleanProperty
-					Name="NoGenLineDirectives"
-					DisplayName="Don&apos;t generate &apos;#line&apos; directives"
-					Description="Don&apos;t put any #line preprocessor commands in the parser file. Ordinarily Bison puts them in the parser file so that the C compiler and debuggers will associate errors with your source file, the grammar file."
-					Switch="-l"
-				/>
-				<StringProperty
-					Name="OutputFile"
-					DisplayName="Output file name"
-					Description="Specify the name outfile for the parser file"
-					Switch="-o [value]"
-				/>
-				<StringProperty
-					Name="RenameExternalSymbols"
-					DisplayName="Rename External Symbols"
-					Description="Rename the external symbols used in the parser so that they start with prefix instead of `yy&apos;."
-					Switch="-p [value]"
-					DefaultValue="$(InputName)"
-				/>
-				<BooleanProperty
-					Name="DebuggerOn"
-					DisplayName="Compile debugging facilities"
-					Description="Output a definition of the macro YYDEBUG into the parser file, so that the debugging facilities are compiled"
-					Switch="-t"
-				/>
-				<BooleanProperty
-					Name="Verbose"
-					DisplayName="Output parser states"
-					Description="Write an extra output file containing verbose descriptions of the parser states and what is done for each type of look-ahead token in that state"
-					Switch="-v"
-				/>
-			</Properties>
-		</CustomBuildRule>
-	</Rules>
-</VisualStudioToolFile>
diff --git a/vc2008/qfcc/qfcc.vcproj b/vc2008/qfcc/qfcc.vcproj
deleted file mode 100644
index 59bc03f84..000000000
--- a/vc2008/qfcc/qfcc.vcproj
+++ /dev/null
@@ -1,965 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="qfcc"
-	ProjectGUID="{40639893-4D75-48CD-811F-4B363CC71FFA}"
-	RootNamespace="qfcc"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-		<ToolFile
-			RelativePath=".\FlexBison.rules"
-		/>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="FlexGenerator"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="BisonParser"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qfcc\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="FlexGenerator"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="BisonParser"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qfcc\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="FlexGenerator"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="BisonParser"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qfcc\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="FlexGenerator"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="BisonParser"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qfcc\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="FlexGenerator"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="BisonParser"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qfcc\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib libzlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="FlexGenerator"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="BisonParser"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qfcc\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib libzlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\tools\qfcc\source\class.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\source\constfold.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\source\cpp.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\source\debug.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\source\def.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\source\emit.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\source\expr.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\source\function.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\source\idstuff.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\source\immediate.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\source\linker.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\source\method.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\source\obj_file.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\source\opcodes.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\source\options.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\source\qc-lex.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\source\qc-lex.l"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="FlexGenerator"
-						NoGenLineDirectives="true"
-						OutputFile="$(InputDir)$(InputName).c"
-						ScannerPrefix=""
-						TableCompression="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="FlexGenerator"
-						NoGenLineDirectives="true"
-						OutputFile="$(InputDir)$(InputName).c"
-						ScannerPrefix=""
-						TableCompression="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="FlexGenerator"
-						NoGenLineDirectives="true"
-						OutputFile="$(InputDir)$(InputName).c"
-						ScannerPrefix=""
-						TableCompression="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="FlexGenerator"
-						NoGenLineDirectives="true"
-						OutputFile="$(InputDir)$(InputName).c"
-						ScannerPrefix=""
-						TableCompression="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release (static)|Win32"
-					>
-					<Tool
-						Name="FlexGenerator"
-						NoGenLineDirectives="true"
-						OutputFile="$(InputDir)$(InputName).c"
-						ScannerPrefix=""
-						TableCompression="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release (static)|x64"
-					>
-					<Tool
-						Name="FlexGenerator"
-						NoGenLineDirectives="true"
-						OutputFile="$(InputDir)$(InputName).c"
-						ScannerPrefix=""
-						TableCompression="0"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\source\qc-parse.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="__STDC__"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="__STDC__"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="__STDC__"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="__STDC__"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release (static)|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="__STDC__"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release (static)|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="__STDC__"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\source\qc-parse.y"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="BisonParser"
-						Defines="true"
-						NoGenLineDirectives="true"
-						OutputFile="$(InputDir)$(InputName).c"
-						RenameExternalSymbols=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="BisonParser"
-						Defines="true"
-						NoGenLineDirectives="true"
-						OutputFile="$(InputDir)$(InputName).c"
-						RenameExternalSymbols=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="BisonParser"
-						Defines="true"
-						NoGenLineDirectives="true"
-						OutputFile="$(InputDir)$(InputName).c"
-						RenameExternalSymbols=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="BisonParser"
-						Defines="true"
-						NoGenLineDirectives="true"
-						OutputFile="$(InputDir)$(InputName).c"
-						RenameExternalSymbols=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release (static)|Win32"
-					>
-					<Tool
-						Name="BisonParser"
-						Defines="true"
-						NoGenLineDirectives="true"
-						OutputFile="$(InputDir)$(InputName).c"
-						RenameExternalSymbols=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release (static)|x64"
-					>
-					<Tool
-						Name="BisonParser"
-						Defines="true"
-						NoGenLineDirectives="true"
-						OutputFile="$(InputDir)$(InputName).c"
-						RenameExternalSymbols=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\source\qfcc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\source\reloc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\source\strpool.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\source\struct.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\source\switch.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\source\type.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\tools\qfcc\include\class.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\include\cpp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\include\debug.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\include\def.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\include\emit.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\include\expr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\include\function.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\include\idstuff.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\include\immediate.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\include\linker.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\include\method.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\include\obj_file.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\include\opcodes.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\include\options.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\source\qc-parse.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\include\qfcc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\include\qfprogs.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\include\reloc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\include\strpool.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\include\struct.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\include\switch.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\include\type.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\..\include\win32\resources\quakeforge.rc"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2008/qfclient/qfclient.vcproj b/vc2008/qfclient/qfclient.vcproj
deleted file mode 100644
index 8739a5098..000000000
--- a/vc2008/qfclient/qfclient.vcproj
+++ /dev/null
@@ -1,626 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="qw-client"
-	ProjectGUID="{9A942925-61E6-4975-935A-5D62E8248E64}"
-	RootNamespace="QuakeForge"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H;CURL_STATICLIB"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H;CURL_STATICLIB"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\qw\source\cl_cam.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\cl_chat.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\cl_cmd.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\cl_cvar.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\cl_demo.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\cl_ents.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\cl_http.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\cl_input.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\cl_main.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\cl_ngraph.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\cl_parse.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\cl_pred.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\cl_screen.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\cl_skin.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\cl_slist.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\cl_tent.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\cl_view.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\locs.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\sbar.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\skin.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\teamplay.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\qw\include\cl_cam.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\include\cl_chat.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\include\cl_demo.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\include\cl_ents.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\include\cl_http.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\include\cl_input.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\include\cl_main.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\include\cl_parse.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\include\cl_pred.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\include\cl_skin.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\include\cl_slist.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\include\cl_tent.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\include\client.h"
-				>
-			</File>
-			<File
-				RelativePath="..\include\config.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\include\crudefile.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\include\game.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\include\host.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\include\map_cfg.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\include\server.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2008/qflight/qflight.vcproj b/vc2008/qflight/qflight.vcproj
deleted file mode 100644
index 3fc0ab1d6..000000000
--- a/vc2008/qflight/qflight.vcproj
+++ /dev/null
@@ -1,620 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="qflight"
-	ProjectGUID="{5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}"
-	RootNamespace="qflight"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qflight\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qflight\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qflight\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qflight\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qflight\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib libzlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qflight\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib libzlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\tools\qflight\source\entities.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qflight\source\ltface.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qflight\source\noise.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qflight\source\options.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qflight\source\properties.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qflight\source\qflight.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qflight\source\threads.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qflight\source\trace.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qflight\source\vis.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\tools\qflight\include\entities.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qflight\include\light.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qflight\include\noise.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qflight\include\options.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qflight\include\properties.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qflight\include\threads.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\..\include\win32\resources\quakeforge.rc"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2008/qfmodelgen/qfmodelgen.vcproj b/vc2008/qfmodelgen/qfmodelgen.vcproj
deleted file mode 100644
index 893da110a..000000000
--- a/vc2008/qfmodelgen/qfmodelgen.vcproj
+++ /dev/null
@@ -1,578 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="qfmodelgen"
-	ProjectGUID="{052C34FE-C9E2-43ED-95DA-FB3F27B44E37}"
-	RootNamespace="qfmodelgen"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qfmodelgen\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qfmodelgen\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qfmodelgen\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qfmodelgen\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qfmodelgen\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib libzlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qfmodelgen\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib libzlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\tools\qfmodelgen\source\lbmlib.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfmodelgen\source\modelgen.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfmodelgen\source\trilib.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\tools\qfmodelgen\include\lbmlib.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfmodelgen\include\trilib.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\..\include\win32\resources\quakeforge.rc"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2008/qfprogs/qfprogs.vcproj b/vc2008/qfprogs/qfprogs.vcproj
deleted file mode 100644
index 5141f8959..000000000
--- a/vc2008/qfprogs/qfprogs.vcproj
+++ /dev/null
@@ -1,590 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="qfprogs"
-	ProjectGUID="{5FA27C8E-51B1-445A-A375-FBE74F0984B1}"
-	RootNamespace="qfprogs"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qfcc\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qfcc\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qfcc\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qfcc\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qfcc\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib libzlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qfcc\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib libzlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\tools\qfcc\source\disassemble.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\source\globals.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\source\lines.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\source\modules.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\source\obj_file.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\source\qfprogs.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\source\strings.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfcc\source\stub.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\..\include\win32\resources\quakeforge.rc"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2008/qfserver/qfserver.vcproj b/vc2008/qfserver/qfserver.vcproj
deleted file mode 100644
index 909324104..000000000
--- a/vc2008/qfserver/qfserver.vcproj
+++ /dev/null
@@ -1,672 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="qw-server"
-	ProjectGUID="{544D097C-9C24-4C57-A171-8C8029421185}"
-	RootNamespace="qfserver"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib libzlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib libzlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\qw\source\crudefile.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\sv_ccmds.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\sv_demo.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\sv_ents.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\sv_gib.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\sv_init.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\sv_main.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\sv_move.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\sv_phys.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\sv_pr_cmds.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\sv_pr_cpqw.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\sv_pr_qwe.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\sv_progs.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\sv_qtv.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\sv_recorder.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\sv_sbar.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\sv_send.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\sv_sys_win.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\sv_user.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\source\world.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\qw\include\sv_demo.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\include\sv_gib.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\include\sv_pr_cmds.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\include\sv_pr_cpqw.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\include\sv_pr_qwe.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\include\sv_progs.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\include\sv_qtv.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qw\include\sv_recorder.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\..\include\win32\resources\quakeforge.rc"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2008/qfvis/qfvis.vcproj b/vc2008/qfvis/qfvis.vcproj
deleted file mode 100644
index 479049560..000000000
--- a/vc2008/qfvis/qfvis.vcproj
+++ /dev/null
@@ -1,588 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="qfvis"
-	ProjectGUID="{E5D842C5-669F-4FC7-A5E0-44B562F86435}"
-	RootNamespace="qfvis"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qfvis\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qfvis\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qfvis\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qfvis\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qfvis\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib libzlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\tools\qfvis\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib libzlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\tools\qfvis\source\base-vis.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfvis\source\flow.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfvis\source\options.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfvis\source\qfvis.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfvis\source\soundphs.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\tools\qfvis\include\options.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\qfvis\include\vis.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\..\include\win32\resources\quakeforge.rc"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2008/qfwavinfo/qfwavinfo.vcproj b/vc2008/qfwavinfo/qfwavinfo.vcproj
deleted file mode 100644
index 40df9c014..000000000
--- a/vc2008/qfwavinfo/qfwavinfo.vcproj
+++ /dev/null
@@ -1,562 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="qfwavinfo"
-	ProjectGUID="{56BD559B-1590-4FC4-B441-AB1973BAC2BD}"
-	RootNamespace="qfwavinfo"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib libzlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib libzlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\tools\wav\qfwavinfo.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\..\include\win32\resources\quakeforge.rc"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2008/qtv/qtv.vcproj b/vc2008/qtv/qtv.vcproj
deleted file mode 100644
index 0e2bb2d4b..000000000
--- a/vc2008/qtv/qtv.vcproj
+++ /dev/null
@@ -1,594 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="qtv"
-	ProjectGUID="{05E68E3B-5901-43A9-981D-CF392C0F5C6C}"
-	RootNamespace="qtv"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qtv\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qtv\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qtv\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qtv\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qtv\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib libzlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qtv\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib libzlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\qtv\source\client.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qtv\source\connection.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qtv\source\qtv.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qtv\source\server.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qtv\source\sv_parse.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\qtv\include\client.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qtv\include\connection.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qtv\include\qtv.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\qtv\include\server.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\..\include\win32\resources\quakeforge.rc"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2008/qw-client-sdl/qw-client-sdl.vcproj b/vc2008/qw-client-sdl/qw-client-sdl.vcproj
deleted file mode 100644
index 983be0451..000000000
--- a/vc2008/qw-client-sdl/qw-client-sdl.vcproj
+++ /dev/null
@@ -1,558 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="qw-client-sdl"
-	ProjectGUID="{B44CB3E0-F2FD-4260-A632-C01FB881613E}"
-	RootNamespace="qwclientsdl"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib curl.lib zlib.lib sdl.lib sdlmain.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib curl.lib zlib.lib sdl.lib sdlmain.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib curl.lib zlib.lib sdl.lib sdlmain.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib curl.lib zlib.lib sdl.lib sdlmain.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H;SDL_STATIC"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib dxguid.lib libcurl.lib libzlib.lib libsdl.lib libsdlmain.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H;SDL_STATIC"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib dxguid.lib libcurl.lib libzlib.lib libsdl.lib libsdlmain.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\qw\source\cl_sys_sdl.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\..\include\win32\resources\quakeforge.rc"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2008/qw-client-sdl32/qw-client-sdl32.vcproj b/vc2008/qw-client-sdl32/qw-client-sdl32.vcproj
deleted file mode 100644
index 33a31293d..000000000
--- a/vc2008/qw-client-sdl32/qw-client-sdl32.vcproj
+++ /dev/null
@@ -1,562 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="qw-client-sdl32"
-	ProjectGUID="{CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}"
-	RootNamespace="qwclientsdl32"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib curl.lib zlib.lib sdl.lib sdlmain.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib curl.lib zlib.lib sdl.lib sdlmain.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib curl.lib zlib.lib sdl.lib sdlmain.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib curl.lib zlib.lib sdl.lib sdlmain.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H;SDL_STATIC"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib dxguid.lib libcurl.lib libzlib.lib libsdl.lib libsdlmain.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H;SDL_STATIC"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib dxguid.lib libcurl.lib libzlib.lib libsdl.lib libsdlmain.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\qw\source\cl_sys_sdl.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\..\include\win32\resources\quakeforge.rc"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2008/qw-client-sgl/qw-client-sgl.vcproj b/vc2008/qw-client-sgl/qw-client-sgl.vcproj
deleted file mode 100644
index 2842872d1..000000000
--- a/vc2008/qw-client-sgl/qw-client-sgl.vcproj
+++ /dev/null
@@ -1,562 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="qw-client-sgl"
-	ProjectGUID="{649C4168-1C65-4E41-818F-85A1C52C1B8F}"
-	RootNamespace="qwclientsgl"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib curl.lib zlib.lib sdl.lib sdlmain.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib curl.lib zlib.lib sdl.lib sdlmain.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib curl.lib zlib.lib sdl.lib sdlmain.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib curl.lib zlib.lib sdl.lib sdlmain.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H;SDL_STATIC"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib dxguid.lib libcurl.lib libzlib.lib libsdl.lib libsdlmain.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H;SDL_STATIC"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib dxguid.lib libcurl.lib libzlib.lib libsdl.lib libsdlmain.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\qw\source\cl_sys_sdl.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\..\include\win32\resources\quakeforge.rc"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2008/qw-client-wgl/qw-client-wgl.vcproj b/vc2008/qw-client-wgl/qw-client-wgl.vcproj
deleted file mode 100644
index 0a2c37256..000000000
--- a/vc2008/qw-client-wgl/qw-client-wgl.vcproj
+++ /dev/null
@@ -1,558 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="qw-client-wgl"
-	ProjectGUID="{5FD733BF-B3C6-4A96-BED7-35E2484448E1}"
-	RootNamespace="qwclientwgl"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib curl.lib zlib.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib curl.lib zlib.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib curl.lib zlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib curl.lib zlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib libcurl.lib libzlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib libcurl.lib libzlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\qw\source\cl_sys_win.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\..\include\win32\resources\quakeforge.rc"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2008/qw-master/qw-master.vcproj b/vc2008/qw-master/qw-master.vcproj
deleted file mode 100644
index 4d7961feb..000000000
--- a/vc2008/qw-master/qw-master.vcproj
+++ /dev/null
@@ -1,562 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="qw-master"
-	ProjectGUID="{445A2500-3BBC-449A-A929-C419C2A16051}"
-	RootNamespace="qw-master"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib libzlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib libzlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\qw\source\master.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\..\include\win32\resources\quakeforge.rc"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2008/qw/qw.vcproj b/vc2008/qw/qw.vcproj
deleted file mode 100644
index e5cb0be82..000000000
--- a/vc2008/qw/qw.vcproj
+++ /dev/null
@@ -1,474 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="qw"
-	ProjectGUID="{6ADA4322-693A-46BB-897B-17BB5BE9F08C}"
-	RootNamespace="qw"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\libs\qw\msg_backbuf.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\qw\msg_ucmd.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2008/readme.txt b/vc2008/readme.txt
deleted file mode 100644
index b4ad78741..000000000
--- a/vc2008/readme.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-Requirements
-=============
-- Visual C++ 2008 SP1
-- DirectX SDK (for DirectInput)
-- SDL (required for sdl, sdl32, and sgl builds)
-- bison/flex (required for qfcc, needs to be in your compiler path)
-
-Optional
-=========
-- zlib (#undef HAVE_ZLIB from vc2008/include/config.h if you don't want
-  this).  Expects zlib.lib and zlib.dll for Debug/Release builds, and
-  libzlib.lib for Release (static) build.
-- libcurl (#undef HAVE_LIBCURL from vc2008/include/config.h if you don't
-  want this).  Expects curl.lib and curl.dll for Debug/Release builds,
-  and libcurl.lib for Release (static) build.
-
-Notes
-======
-By default, qfcc is configured to use the Boost Wave preprocessor.  You
-can get this from http://www.boost.org, or change the CPP_NAME #define in
-vc2008/include/config.h to whatever preprocessor you want.  If you have
-GCC, you can simply replace "wave --c99" with "gcc" in the define and it
-should work.
-
-clean.ps1 is a Windows Powershell script that cleans up any build files.
diff --git a/vc2008/ruamoko/ruamoko.vcproj b/vc2008/ruamoko/ruamoko.vcproj
deleted file mode 100644
index 924c02f7c..000000000
--- a/vc2008/ruamoko/ruamoko.vcproj
+++ /dev/null
@@ -1,518 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="ruamoko"
-	ProjectGUID="{51028ACF-53D4-4478-8500-55E6B8A81375}"
-	RootNamespace="ruamoko"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\libs\ruamoko\rua_cbuf.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\ruamoko\rua_cmd.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\ruamoko\rua_cvar.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\ruamoko\rua_file.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\ruamoko\rua_hash.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\ruamoko\rua_init.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\ruamoko\rua_math.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\ruamoko\rua_obj.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\ruamoko\rua_plist.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\ruamoko\rua_qfile.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\ruamoko\rua_qfs.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\ruamoko\rua_script.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\ruamoko\rua_string.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2008/sound/sound.vcproj b/vc2008/sound/sound.vcproj
deleted file mode 100644
index fe681171d..000000000
--- a/vc2008/sound/sound.vcproj
+++ /dev/null
@@ -1,514 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="sound"
-	ProjectGUID="{BF149D97-7520-4788-9CD1-3D99C5C8150F}"
-	RootNamespace="sound"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\libs\audio\cd.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\audio\cd\cd_win.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\audio\snd.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\audio\renderer\snd_channels.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\audio\renderer\snd_dma.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\audio\renderer\snd_mem.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\audio\renderer\snd_mix.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\audio\snd_progs.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\audio\renderer\snd_resample.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\audio\renderer\snd_sfx.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\audio\targets\snd_win.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\audio\renderer\wav.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2008/util/util.vcproj b/vc2008/util/util.vcproj
deleted file mode 100644
index e680f491d..000000000
--- a/vc2008/util/util.vcproj
+++ /dev/null
@@ -1,618 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="util"
-	ProjectGUID="{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}"
-	RootNamespace="util"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H;ZLIB_DLL"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H;ZLIB_DLL"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H;ZLIB_DLL"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H;ZLIB_DLL"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\libs\util\bspfile.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\buildnum.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\cbuf.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\checksum.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\cmd.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\crc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\cvar.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\dirent.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\dstring.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\fendian.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\fnmatch.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\getopt.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\getopt1.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\hash.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\idparse.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\info.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\link.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\llist.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\mathlib.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\mdfour.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\msg.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\pakfile.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\plugin.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\qargs.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\qendian.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\qfplist.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\quakefs.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\quakeio.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\riff.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\script.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\sizebuf.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\string.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\sys.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\va.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\ver_check.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\wad.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\wadfile.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\util\zone.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2008/video-sdl/video-sdl.vcproj b/vc2008/video-sdl/video-sdl.vcproj
deleted file mode 100644
index 2b03f2566..000000000
--- a/vc2008/video-sdl/video-sdl.vcproj
+++ /dev/null
@@ -1,472 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="video-sdl"
-	ProjectGUID="{44A18410-3AA8-4A64-935B-D20223AD6885}"
-	RootNamespace="videosdl"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H;SDL_STATIC"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H;SDL_STATIC"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\libs\video\targets\context_sdl.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\video\targets\in_sdl.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2008/video-sgl/video-sgl.vcproj b/vc2008/video-sgl/video-sgl.vcproj
deleted file mode 100644
index 920a06e47..000000000
--- a/vc2008/video-sgl/video-sgl.vcproj
+++ /dev/null
@@ -1,468 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="video-sgl"
-	ProjectGUID="{7E30C3B1-AEE7-483D-B231-C672365CD2D7}"
-	RootNamespace="videosgl"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H;SDL_STATIC"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H;SDL_STATIC"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\libs\video\targets\vid_sgl.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2008/video-sw/video-sw.vcproj b/vc2008/video-sw/video-sw.vcproj
deleted file mode 100644
index 75f419ae0..000000000
--- a/vc2008/video-sw/video-sw.vcproj
+++ /dev/null
@@ -1,596 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="video-sw"
-	ProjectGUID="{66D3A191-E4D5-45F3-86BD-EFBB249CD554}"
-	RootNamespace="videosw"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H;SDL_STATIC"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H;SDL_STATIC"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<Filter
-				Name="renderer"
-				>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw\d_edge.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw\d_fill.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw\d_init.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw\d_modech.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw\d_part.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw\d_polyse.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw\d_scan.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw\d_sky.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw\d_sprite.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw\d_surf.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw\d_vars.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw\d_zpoint.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw\draw.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw\fpu.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw\nonintel.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw\screen.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw\sw_graph.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw\sw_raclip.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw\sw_ralias.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw\sw_rbsp.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw\sw_rdraw.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw\sw_redge.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw\sw_rmain.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw\sw_rmisc.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw\sw_rpart.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw\sw_rsky.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw\sw_rsprite.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw\sw_rsurf.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw\sw_skin.c"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="target"
-				>
-				<File
-					RelativePath="..\..\libs\video\targets\vid_common_sw.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\targets\vid_sdl.c"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2008/video-sw32/video-sw32.vcproj b/vc2008/video-sw32/video-sw32.vcproj
deleted file mode 100644
index fc6bc6054..000000000
--- a/vc2008/video-sw32/video-sw32.vcproj
+++ /dev/null
@@ -1,572 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="video-sw32"
-	ProjectGUID="{D5B9558F-EF25-4167-ACE4-723C7413B390}"
-	RootNamespace="videosw32"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H;SDL_STATIC"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H;SDL_STATIC"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<Filter
-				Name="renderer"
-				>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw32\d_edge.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw32\d_fill.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw32\d_init.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw32\d_modech.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw32\d_part.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw32\d_polyse.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw32\d_scan.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw32\d_sky.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw32\d_sprite.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw32\d_surf.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw32\d_vars.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw32\d_zpoint.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw32\draw.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw32\screen.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw32\sw32_graph.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw32\sw32_raclip.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw32\sw32_ralias.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw32\sw32_rbsp.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw32\sw32_rdraw.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw32\sw32_redge.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw32\sw32_rmain.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw32\sw32_rmisc.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw32\sw32_rpart.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw32\sw32_rsky.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw32\sw32_rsprite.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw32\sw32_rsurf.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\sw32\sw32_skin.c"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="target"
-				>
-				<File
-					RelativePath="..\..\libs\video\targets\vid_common_sw32.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\targets\vid_sdl32.c"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2008/video-wgl/video-wgl.vcproj b/vc2008/video-wgl/video-wgl.vcproj
deleted file mode 100644
index a0b315c7c..000000000
--- a/vc2008/video-wgl/video-wgl.vcproj
+++ /dev/null
@@ -1,472 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="video-wgl"
-	ProjectGUID="{178D81A7-F2FB-41D7-B300-9D1A4DE5E137}"
-	RootNamespace="videowgl"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\libs\video\targets\in_win.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libs\video\targets\vid_wgl.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2008/video/video.vcproj b/vc2008/video/video.vcproj
deleted file mode 100644
index 737ecfe59..000000000
--- a/vc2008/video/video.vcproj
+++ /dev/null
@@ -1,538 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="video"
-	ProjectGUID="{E7B3D07D-2FE8-481B-8DAB-6255A412A42F}"
-	RootNamespace="video"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<Filter
-				Name="renderer"
-				>
-				<File
-					RelativePath="..\..\libs\video\renderer\r_cvar.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\r_efrag.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\r_ent.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\r_graph.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\r_light.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\r_main.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\r_part.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\r_progs.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\r_screen.c"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="targets"
-				>
-				<File
-					RelativePath="..\..\libs\video\targets\in_common.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\targets\in_event.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\targets\joy.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\targets\joy_win.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\targets\keys.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\targets\old_keys.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\targets\vid.c"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2008/videogl/videogl.vcproj b/vc2008/videogl/videogl.vcproj
deleted file mode 100644
index 44d30c3fc..000000000
--- a/vc2008/videogl/videogl.vcproj
+++ /dev/null
@@ -1,556 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="video-gl"
-	ProjectGUID="{C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}"
-	RootNamespace="videogl"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32;..\..\qw\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<Filter
-				Name="target"
-				>
-				<File
-					RelativePath="..\..\libs\video\targets\qfgl_ext.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\targets\vid_common_gl.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\targets\vtxarray.c"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="renderer"
-				>
-				<File
-					RelativePath="..\..\libs\video\renderer\gl\gl_draw.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\gl\gl_dyn_lights.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\gl\gl_dyn_part.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\gl\gl_dyn_textures.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\gl\gl_graph.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\gl\gl_lightmap.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\gl\gl_mod_alias.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\gl\gl_mod_sprite.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\gl\gl_rmain.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\gl\gl_rmisc.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\gl\gl_rsurf.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\gl\gl_screen.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\gl\gl_skin.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\gl\gl_sky.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\gl\gl_sky_clip.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\gl\gl_textures.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\gl\gl_warp.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\libs\video\renderer\gl\noisetextures.c"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vc2008/wad/wad.vcproj b/vc2008/wad/wad.vcproj
deleted file mode 100644
index 11fc5737d..000000000
--- a/vc2008/wad/wad.vcproj
+++ /dev/null
@@ -1,574 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="wad"
-	ProjectGUID="{88422448-C5FB-46F3-A0B3-0811F90E537C}"
-	RootNamespace="wad"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib zlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|Win32"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib libzlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release (static)|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\include;..\..\include;..\..\include\win32"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib libzlib.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\tools\wad\grab.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\wad\script.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tools\wad\wad.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\tools\wad\wad.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\..\include\win32\resources\quakeforge.rc"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

From c1ffb05b876c538a4de9914a7f6e1b5bc1192fe9 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 25 Jun 2020 16:14:39 +0900
Subject: [PATCH 1148/1519] Remove dead Makefile.am

Forgot this in the merge.
---
 libs/video/renderer/vulkan/Makefile.am | 35 --------------------------
 1 file changed, 35 deletions(-)
 delete mode 100644 libs/video/renderer/vulkan/Makefile.am

diff --git a/libs/video/renderer/vulkan/Makefile.am b/libs/video/renderer/vulkan/Makefile.am
deleted file mode 100644
index 707b6b064..000000000
--- a/libs/video/renderer/vulkan/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-AM_CFLAGS= @PREFER_PIC@
-AM_CPPFLAGS= -I$(top_srcdir)/include -DVK_NO_PROTOTYPES
-
-vulkan_src = \
-	buffer.c \
-	command.c \
-	descriptor.c \
-	device.c \
-	image.c \
-	instance.c \
-	memory.c \
-	pipeline.c \
-	renderpass.c \
-	swapchain.c \
-	util.c \
-	vulkan_draw.c \
-	vulkan_vid_common.c
-
-noinst_LTLIBRARIES=	libvulkan.la
-BUILT_SOURCES= $(shader_gen)
-
-SUFFICES=.frag .vert .fc .vc .slc .glsl
-.glsl.slc:
-	sed -e 's/^/"/' -e 's/$$/\\n"/' $< > $@
-.frag.fc:
-	sed -e 's/^/"/' -e 's/$$/\\n"/' $< > $@
-.vert.vc:
-	sed -e 's/^/"/' -e 's/$$/\\n"/' $< > $@
-
-libvulkan_la_SOURCES= $(vulkan_src)
-
-EXTRA_DIST = $(vulkan_src) $(shader_src) namehack.h util.h
-CLEANFILES= *.vc *.fc *.slc

From c2559c7511d613c2ce80e9fc583c5463ff2df712 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 25 Jun 2020 19:38:33 +0900
Subject: [PATCH 1149/1519] [qwaq] PR_RunPostLoadFuncs for qwaq-x11

Same issue as for the menus. But now I know why PR_LoadProgsFile is used
instead of PR_LoadProgs (at least for qwaq): avoidance of the gamedir
restriction (however, the menus are supposed to be restricted).
---
 ruamoko/qwaq/builtins/qwaq.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ruamoko/qwaq/builtins/qwaq.c b/ruamoko/qwaq/builtins/qwaq.c
index 111af8764..0a8070825 100644
--- a/ruamoko/qwaq/builtins/qwaq.c
+++ b/ruamoko/qwaq/builtins/qwaq.c
@@ -149,7 +149,7 @@ load_progs (const char *name)
 	pr.zone_size = 1024*1024;
 	PR_LoadProgsFile (&pr, file, size);
 	Qclose (file);
-	if (!PR_RunLoadFuncs (&pr))
+	if (!PR_RunLoadFuncs (&pr) || !PR_RunPostLoadFuncs (&pr))
 		PR_Error (&pr, "unable to load %s", pr.progs_name);
 	return 1;
 }

From 8f2bc18a4ffc08dc5d29357a8c2b20ccdc252177 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 25 Jun 2020 19:51:40 +0900
Subject: [PATCH 1150/1519] [build] Fix a merge error

Messed up the vulkan headers.
---
 include/QF/Makemodule.am | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/QF/Makemodule.am b/include/QF/Makemodule.am
index 9c691bddf..5282d5230 100644
--- a/include/QF/Makemodule.am
+++ b/include/QF/Makemodule.am
@@ -149,12 +149,13 @@ qf_gl_includedir = $(includedir)/QF/GL
 qf_glsl_includedir = $(includedir)/QF/GLSL
 qf_math_includedir = $(includedir)/QF/math
 qf_plugin_includedir = $(includedir)/QF/plugin
+qf_vulkan_includedir = $(includedir)/QF/vulkan
 qf_include_HEADERS = @qfac_include_qf@
 qf_gl_include_HEADERS = @qfac_include_qf_gl@
 qf_glsl_include_HEADERS = @qfac_include_qf_glsl@
 qf_math_include_HEADERS = @qfac_include_qf_math@
 qf_plugin_include_HEADERS = @qfac_include_qf_plugin@
-qf_plugin_include_HEADERS = @qfac_include_qf_vulkan@
+qf_vulkan_include_HEADERS = @qfac_include_qf_vulkan@
 
 ruamoko_qf_includedir = $(ruamoko_includedir)/QF
 ruamoko_qf_include_HEADERS = @qfac_qfcc_include_qf@

From ed42557dd1c0bc8fcd852917cdbb33ec693e6789 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 25 Jun 2020 22:45:12 +0900
Subject: [PATCH 1151/1519] [qfcc] Reset flowvars for aliased global variables

When a global variable is accessed via only an alias in a function the
actual def's flowvar would remain in the state it was from the last
function that accessed the global normally. This would result in invalid
flowvar accesses which can be difficult to reproduce (thus no test
case).
---
 tools/qfcc/source/flow.c | 36 +++++++++++++++++++++++++++---------
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/tools/qfcc/source/flow.c b/tools/qfcc/source/flow.c
index e26bcef1b..86f6dc9d5 100644
--- a/tools/qfcc/source/flow.c
+++ b/tools/qfcc/source/flow.c
@@ -463,6 +463,15 @@ flow_build_statements (function_t *func)
 	}
 }
 
+static int flow_def_clear_flowvars (def_t *def, void *data)
+{
+	if (def->flowvar) {
+		delete_flowvar (def->flowvar);
+	}
+	def->flowvar = 0;
+	return 0;
+}
+
 /**	Build an array of all the variables used by a function
  *
  *	The array exists so variables can be referenced by number and thus used
@@ -517,17 +526,26 @@ flow_build_vars (function_t *func)
 	set_iter_t *var_i;
 	flowvar_t  *var;
 
-	// first, count .return and .param_[0-7] as they are always needed
+	// First, run through the statements making sure any accessed variables
+	// have their flowvars reset.  Local variables will be fine, but global
+	// variables make have had flowvars added in a previous function, and it's
+	// easier to just clear them all.
+	// This is done before .return and .param so they won't get reset just
+	// after being counted
+	for (i = 0; i < func->num_statements; i++) {
+		s = func->statements[i];
+		flow_analyze_statement (s, 0, 0, 0, operands);
+		for (j = 0; j < FLOW_OPERANDS; j++) {
+			if (operands[j] && operands[j]->op_type == op_def) {
+				def_visit_all (operands[j]->o.def, 0,
+							   flow_def_clear_flowvars, 0);
+			}
+		}
+	}
+	// count .return and .param_[0-7] as they are always needed
 	for (i = 0; i < num_flow_params; i++) {
 		def_t      *def = param_symbol (flow_params[i].name)->s.def;
-		def_t      *a;
-		for (a = def->alias_defs; a; a = a->next) {
-			if (a->flowvar) {
-				delete_flowvar (a->flowvar);
-				a->flowvar = 0;
-			}
-			//free_def (def->alias_defs);
-		}
+		def_visit_all (def, 0, flow_def_clear_flowvars, 0);
 		flow_params[i].op.o.def = def;
 		num_vars += count_operand (&flow_params[i].op);
 	}

From aa8aaaaca9ce36582b0ed04297d5eefa451b8b44 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 26 Jun 2020 10:52:06 +0900
Subject: [PATCH 1152/1519] [build] Support silent rules for qfcc

---
 Makefile.am                   | 14 +++++-
 ruamoko/cl_menu/Makemodule.am |  2 +-
 ruamoko/game/Makemodule.am    |  2 +-
 ruamoko/qwaq/Makemodule.am    |  4 +-
 ruamoko/scheme/Makemodule.am  |  2 +-
 tools/qfcc/test/Makemodule.am | 90 +++++++++++++++++------------------
 6 files changed, 62 insertions(+), 52 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 9e68af2a5..54ca7be00 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -70,6 +70,16 @@ QFCC_DEP=qfcc$(EXEEXT)
 QFCC=$(top_builddir)/$(QFCC_DEP)
 GZ=@progs_gz@
 
+V_QFCC = $(V_QFCC_@AM_V@)
+V_QFCC_ = $(V_QFCC_@AM_DEFAULT_V@)
+V_QFCC_0 = @echo "  QFCC    " $@;
+V_QFCC_1 =
+
+V_QFCCLD = $(V_QFCCLD_@AM_V@)
+V_QFCCLD_ = $(V_QFCCLD_@AM_DEFAULT_V@)
+V_QFCCLD_0 = @echo "  QFCCLD  " $@;
+V_QFCCLD_1 =
+
 QCSYSTEM=--no-default-paths -I$(top_srcdir) -I$(top_srcdir)/ruamoko/include -I$(top_srcdir)/include
 QCFLAGS=-qq -O -g -Werror -Wall -Wno-integer-divide
 QCPPFLAGS=$(QCSYSTEM)
@@ -82,12 +92,12 @@ am__mv = mv -f
 
 SUFFIXES=.o .r .pas
 .r.o:
-	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+	$(V_QFCC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
 	$(QCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tqo -c -o $@ $< &&\
 	sed -i -e '1s@:@: $(QFCC_DEP)@' $$depbase.Tqo &&\
 	$(am__mv) $$depbase.Tqo $$depbase.Qo
 .pas.o:
-	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+	$(V_QFCC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
 	$(QCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tqo -c -o $@ $< &&\
 	sed -i -e '1s@:@: $(QFCC_DEP)@' $$depbase.Tqo &&\
 	$(am__mv) $$depbase.Tqo $$depbase.Qo
diff --git a/ruamoko/cl_menu/Makemodule.am b/ruamoko/cl_menu/Makemodule.am
index dfa7635ba..c6c57aa7a 100644
--- a/ruamoko/cl_menu/Makemodule.am
+++ b/ruamoko/cl_menu/Makemodule.am
@@ -37,7 +37,7 @@ ruamoko_cl_menu_menu_dat_SOURCES=$(ruamoko_menu_src)
 ruamoko_menu_obj=$(ruamoko_cl_menu_menu_dat_SOURCES:.r=.o)
 ruamoko_menu_dep=$(call qcautodep,$(ruamoko_cl_menu_menu_dat_SOURCES))
 ruamoko/cl_menu/menu.dat$(EXEEXT): $(ruamoko_menu_obj) $(QFCC_DEP) ruamoko/lib/libcsqc.a ruamoko/lib/libr.a ruamoko/gui/libgui.a
-	$(QLINK) -o $@ $(ruamoko_menu_obj) -Lruamoko/gui -lgui -lcsqc -lr
+	$(V_QFCCLD)$(QLINK) -o $@ $(ruamoko_menu_obj) -Lruamoko/gui -lgui -lcsqc -lr
 include $(ruamoko_menu_dep) # am--include-marker
 r_depfiles_remade += $(ruamoko_menu_dep)
 
diff --git a/ruamoko/game/Makemodule.am b/ruamoko/game/Makemodule.am
index 4063e9a62..576867c27 100644
--- a/ruamoko/game/Makemodule.am
+++ b/ruamoko/game/Makemodule.am
@@ -9,7 +9,7 @@ ruamoko_game_game_dat_SOURCES=$(ruamoko_game_src)
 ruamoko_game_obj=$(ruamoko_game_game_dat_SOURCES:.r=.o)
 ruamoko_game_dep=$(call qcautodep,$(ruamoko_game_game_dat_SOURCES))
 ruamoko/game/game.dat$(EXEEXT): $(ruamoko_game_obj) $(QFCC_DEP) ruamoko/lib/libr.a ruamoko/lib/libqw.a
-	$(QLINK) -o $@ $(ruamoko_game_obj) -lqw -lr
+	$(V_QFCCLD)$(QLINK) -o $@ $(ruamoko_game_obj) -lqw -lr
 include $(ruamoko_game_dep) # am--include-marker
 r_depfiles_remade += $(ruamoko_game_dep)
 
diff --git a/ruamoko/qwaq/Makemodule.am b/ruamoko/qwaq/Makemodule.am
index 149213268..bcb97af94 100644
--- a/ruamoko/qwaq/Makemodule.am
+++ b/ruamoko/qwaq/Makemodule.am
@@ -89,7 +89,7 @@ ruamoko_qwaq_qwaq_app_dat_SOURCES=$(qwaq_app_dat_src)
 ruamoko_qwaq_qwaq_app_obj=$(ruamoko_qwaq_qwaq_app_dat_SOURCES:.r=.o)
 ruamoko_qwaq_qwaq_app_dep=$(call qcautodep,$(ruamoko_qwaq_qwaq_app_dat_SOURCES:.o=.Qo))
 ruamoko/qwaq/qwaq-app.dat$(EXEEXT): $(ruamoko_qwaq_qwaq_app_obj) $(QFCC_DEP) ruamoko/lib/libcsqc.a ruamoko/lib/libr.a
-	$(QLINK) -o $@ $(ruamoko_qwaq_qwaq_app_obj) -lcsqc -lr
+	$(V_QFCCLD)$(QLINK) -o $@ $(ruamoko_qwaq_qwaq_app_obj) -lcsqc -lr
 include $(ruamoko_qwaq_qwaq_app_dep) # am--include-marker
 r_depfiles_remade += $(ruamoko_qwaq_qwaq_app_dep)
 
@@ -97,7 +97,7 @@ ruamoko_qwaq_gcd_dat_SOURCES=ruamoko/qwaq/gcd.r
 ruamoko_qwaq_gcd_obj=$(ruamoko_qwaq_gcd_dat_SOURCES:.r=.o)
 ruamoko_qwaq_gcd_dep=$(call qcautodep,$(ruamoko_qwaq_gcd_dat_SOURCES:.o=.Qo))
 ruamoko/qwaq/gcd.dat$(EXEEXT): $(ruamoko_qwaq_gcd_obj) $(QFCC_DEP) ruamoko/lib/libcsqc.a ruamoko/lib/libr.a
-	$(QLINK) -o $@ $(ruamoko_qwaq_gcd_obj) -lcsqc -lr
+	$(V_QFCCLD)$(QLINK) -o $@ $(ruamoko_qwaq_gcd_obj) -lcsqc -lr
 include $(ruamoko_qwaq_gcd_dep) # am--include-marker
 r_depfiles_remade += $(ruamoko_qwaq_gcd_dep)
 
diff --git a/ruamoko/scheme/Makemodule.am b/ruamoko/scheme/Makemodule.am
index b3fcfb5d9..8c1d43622 100644
--- a/ruamoko/scheme/Makemodule.am
+++ b/ruamoko/scheme/Makemodule.am
@@ -45,7 +45,7 @@ ruamoko_scheme_main_dat_SOURCES=$(ruamoko_scheme_src)
 ruamoko_scheme_main_obj=$(ruamoko_scheme_main_dat_SOURCES:.r=.o)
 ruamoko_scheme_main_dep=$(call qcautodep,$(ruamoko_scheme_main_dat_SOURCES))
 ruamoko/scheme/main.dat$(EXEEXT): $(ruamoko_scheme_main_obj) $(QFCC_DEP) ruamoko/scheme/libscheme.a ruamoko/lib/libcsqc.a ruamoko/lib/libr.a
-	$(QLINK) -o $@ $(ruamoko_scheme_main_obj) -Lruamoko/scheme -lscheme -lcsqc -lr
+	$(V_QFCCLD)$(QLINK) -o $@ $(ruamoko_scheme_main_obj) -Lruamoko/scheme -lscheme -lcsqc -lr
 include $(ruamoko_scheme_main_dep) # am--include-marker
 r_depfiles_remade += $(ruamoko_scheme_main_dep)
 
diff --git a/tools/qfcc/test/Makemodule.am b/tools/qfcc/test/Makemodule.am
index 85f94b800..3eb33892b 100644
--- a/tools/qfcc/test/Makemodule.am
+++ b/tools/qfcc/test/Makemodule.am
@@ -102,7 +102,7 @@ tools_qfcc_test_address_cast_dat_SOURCES=tools/qfcc/test/address-cast.r
 address_cast_obj=$(tools_qfcc_test_address_cast_dat_SOURCES:.r=.o)
 address_cast_dep=$(call qcautodep,$(tools_qfcc_test_address_cast_dat_SOURCES))
 tools/qfcc/test/address-cast.dat$(EXEEXT): $(address_cast_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(address_cast_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(address_cast_obj)
 tools/qfcc/test/address-cast.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(address_cast_dep) # am--include-marker
@@ -112,7 +112,7 @@ tools_qfcc_test_alignment_dat_SOURCES=tools/qfcc/test/alignment.r
 alignment_obj=$(tools_qfcc_test_alignment_dat_SOURCES:.r=.o)
 alignment_dep=$(call qcautodep,$(tools_qfcc_test_alignment_dat_SOURCES))
 tools/qfcc/test/alignment.dat$(EXEEXT): $(alignment_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(alignment_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(alignment_obj)
 tools/qfcc/test/alignment.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(alignment_dep) # am--include-marker
@@ -122,7 +122,7 @@ tools_qfcc_test_anonstruct_dat_SOURCES=tools/qfcc/test/anonstruct.r
 anonstruct_obj=$(tools_qfcc_test_anonstruct_dat_SOURCES:.r=.o)
 anonstruct_dep=$(call qcautodep,$(tools_qfcc_test_anonstruct_dat_SOURCES))
 tools/qfcc/test/anonstruct.dat$(EXEEXT): $(anonstruct_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(anonstruct_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(anonstruct_obj)
 tools/qfcc/test/anonstruct.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(anonstruct_dep) # am--include-marker
@@ -132,7 +132,7 @@ tools_qfcc_test_assignchain_dat_SOURCES=tools/qfcc/test/assignchain.r
 assignchain_obj=$(tools_qfcc_test_assignchain_dat_SOURCES:.r=.o)
 assignchain_dep=$(call qcautodep,$(tools_qfcc_test_assignchain_dat_SOURCES))
 tools/qfcc/test/assignchain.dat$(EXEEXT): $(assignchain_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(assignchain_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(assignchain_obj)
 tools/qfcc/test/assignchain.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(assignchain_dep) # am--include-marker
@@ -142,7 +142,7 @@ tools_qfcc_test_chewed_alias_dat_SOURCES=tools/qfcc/test/chewed-alias.r
 chewed_alias_obj=$(tools_qfcc_test_chewed_alias_dat_SOURCES:.r=.o)
 chewed_alias_dep=$(call qcautodep,$(tools_qfcc_test_chewed_alias_dat_SOURCES))
 tools/qfcc/test/chewed-alias.dat$(EXEEXT): $(chewed_alias_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(chewed_alias_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(chewed_alias_obj)
 tools/qfcc/test/chewed-alias.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(chewed_alias_dep) # am--include-marker
@@ -152,7 +152,7 @@ tools_qfcc_test_chewed_return_dat_SOURCES=tools/qfcc/test/chewed-return.r
 chewed_return_obj=$(tools_qfcc_test_chewed_return_dat_SOURCES:.r=.o)
 chewed_return_dep=$(call qcautodep,$(tools_qfcc_test_chewed_return_dat_SOURCES))
 tools/qfcc/test/chewed-return.dat$(EXEEXT): $(chewed_return_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(chewed_return_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(chewed_return_obj)
 tools/qfcc/test/chewed-return.run: $(qfcc_test_run_deps)
 	@TEST_HARNESS_OPTS=--float $(top_srcdir)/tools/qfcc/test/build-run $@
 include $(chewed_return_dep) # am--include-marker
@@ -162,7 +162,7 @@ tools_qfcc_test_comma_expr_dat_SOURCES=tools/qfcc/test/comma-expr.r
 comma_expr_obj=$(tools_qfcc_test_comma_expr_dat_SOURCES:.r=.o)
 comma_expr_dep=$(call qcautodep,$(tools_qfcc_test_comma_expr_dat_SOURCES))
 tools/qfcc/test/comma-expr.dat$(EXEEXT): $(comma_expr_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(comma_expr_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(comma_expr_obj)
 tools/qfcc/test/comma-expr.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(comma_expr_dep) # am--include-marker
@@ -172,7 +172,7 @@ tools_qfcc_test_compound_dat_SOURCES=tools/qfcc/test/compound.r
 compound_obj=$(tools_qfcc_test_compound_dat_SOURCES:.r=.o)
 compound_dep=$(call qcautodep,$(tools_qfcc_test_compound_dat_SOURCES))
 tools/qfcc/test/compound.dat$(EXEEXT): $(compound_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(compound_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(compound_obj)
 tools/qfcc/test/compound.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(compound_dep) # am--include-marker
@@ -182,7 +182,7 @@ tools_qfcc_test_deadbool_dat_SOURCES=tools/qfcc/test/deadbool.r
 deadbool_obj=$(tools_qfcc_test_deadbool_dat_SOURCES:.r=.o)
 deadbool_dep=$(call qcautodep,$(tools_qfcc_test_deadbool_dat_SOURCES))
 tools/qfcc/test/deadbool.dat$(EXEEXT): $(deadbool_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(deadbool_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(deadbool_obj)
 tools/qfcc/test/deadbool.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(deadbool_dep) # am--include-marker
@@ -192,7 +192,7 @@ tools_qfcc_test_double_dat_SOURCES=tools/qfcc/test/double.r
 double_obj=$(tools_qfcc_test_double_dat_SOURCES:.r=.o)
 double_dep=$(call qcautodep,$(tools_qfcc_test_double_dat_SOURCES))
 tools/qfcc/test/double.dat$(EXEEXT): $(double_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(double_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(double_obj)
 tools/qfcc/test/double.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(double_dep) # am--include-marker
@@ -202,7 +202,7 @@ tools_qfcc_test_double_alias_dat_SOURCES=tools/qfcc/test/double-alias.r
 double_alias_obj=$(tools_qfcc_test_double_alias_dat_SOURCES:.r=.o)
 double_alias_dep=$(call qcautodep,$(tools_qfcc_test_double_alias_dat_SOURCES))
 tools/qfcc/test/double-alias.dat$(EXEEXT): $(double_alias_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(double_alias_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(double_alias_obj)
 tools/qfcc/test/double-alias.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(double_alias_dep) # am--include-marker
@@ -245,7 +245,7 @@ tools_qfcc_test_enum_dat_SOURCES=tools/qfcc/test/enum.r
 enum_obj=$(tools_qfcc_test_enum_dat_SOURCES:.r=.o)
 enum_dep=$(call qcautodep,$(tools_qfcc_test_enum_dat_SOURCES))
 tools/qfcc/test/enum.dat$(EXEEXT): $(enum_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(enum_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(enum_obj)
 tools/qfcc/test/enum.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(enum_dep) # am--include-marker
@@ -255,7 +255,7 @@ tools_qfcc_test_fordecl_dat_SOURCES=tools/qfcc/test/fordecl.r
 fordecl_obj=$(tools_qfcc_test_fordecl_dat_SOURCES:.r=.o)
 fordecl_dep=$(call qcautodep,$(tools_qfcc_test_fordecl_dat_SOURCES))
 tools/qfcc/test/fordecl.dat$(EXEEXT): $(fordecl_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(fordecl_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(fordecl_obj)
 tools/qfcc/test/fordecl.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(fordecl_dep) # am--include-marker
@@ -265,7 +265,7 @@ tools_qfcc_test_func_expr_dat_SOURCES=tools/qfcc/test/func-expr.r
 func_expr_obj=$(tools_qfcc_test_func_expr_dat_SOURCES:.r=.o)
 func_expr_dep=$(call qcautodep,$(tools_qfcc_test_func_expr_dat_SOURCES))
 tools/qfcc/test/func-expr.dat$(EXEEXT): $(func_expr_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(func_expr_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(func_expr_obj)
 tools/qfcc/test/func-expr.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(func_expr_dep) # am--include-marker
@@ -275,7 +275,7 @@ tools_qfcc_test_func_expr2_dat_SOURCES=tools/qfcc/test/func-expr2.r
 func_expr2_obj=$(tools_qfcc_test_func_expr2_dat_SOURCES:.r=.o)
 func_expr2_dep=$(call qcautodep,$(tools_qfcc_test_func_expr2_dat_SOURCES))
 tools/qfcc/test/func-expr2.dat$(EXEEXT): $(func_expr2_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(func_expr2_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(func_expr2_obj)
 tools/qfcc/test/func-expr2.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(func_expr2_dep) # am--include-marker
@@ -285,7 +285,7 @@ tools_qfcc_test_func_static_dat_SOURCES=tools/qfcc/test/func-static.r
 func_static_obj=$(tools_qfcc_test_func_static_dat_SOURCES:.r=.o)
 func_static_dep=$(call qcautodep,$(tools_qfcc_test_func_static_dat_SOURCES))
 tools/qfcc/test/func-static.dat$(EXEEXT): $(func_static_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(func_static_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(func_static_obj)
 tools/qfcc/test/func-static.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(func_static_dep) # am--include-marker
@@ -295,7 +295,7 @@ tools_qfcc_test_gcd_dat_SOURCES=tools/qfcc/test/gcd.pas
 gcd_obj=$(tools_qfcc_test_gcd_dat_SOURCES:.pas=.o)
 gcd_dep=$(call qcautodep,$(tools_qfcc_test_gcd_dat_SOURCES))
 tools/qfcc/test/gcd.dat$(EXEEXT): $(gcd_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(gcd_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(gcd_obj)
 tools/qfcc/test/gcd.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(gcd_dep) # am--include-marker
@@ -305,7 +305,7 @@ tools_qfcc_test_infloop_dat_SOURCES=tools/qfcc/test/infloop.r
 infloop_obj=$(tools_qfcc_test_infloop_dat_SOURCES:.r=.o)
 infloop_dep=$(call qcautodep,$(tools_qfcc_test_infloop_dat_SOURCES))
 tools/qfcc/test/infloop.dat$(EXEEXT): $(infloop_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(infloop_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(infloop_obj)
 tools/qfcc/test/infloop.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(infloop_dep) # am--include-marker
@@ -315,7 +315,7 @@ tools_qfcc_test_ivar_struct_return_dat_SOURCES=tools/qfcc/test/ivar-struct-retur
 ivar_struct_return_obj=$(tools_qfcc_test_ivar_struct_return_dat_SOURCES:.r=.o)
 ivar_struct_return_dep=$(call qcautodep,$(tools_qfcc_test_ivar_struct_return_dat_SOURCES))
 tools/qfcc/test/ivar-struct-return.dat$(EXEEXT): $(ivar_struct_return_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(ivar_struct_return_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(ivar_struct_return_obj)
 tools/qfcc/test/ivar-struct-return.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(ivar_struct_return_dep) # am--include-marker
@@ -325,7 +325,7 @@ tools_qfcc_test_methodparams_dat_SOURCES=tools/qfcc/test/methodparams.r
 methodparams_obj=$(tools_qfcc_test_methodparams_dat_SOURCES:.r=.o)
 methodparams_dep=$(call qcautodep,$(tools_qfcc_test_methodparams_dat_SOURCES))
 tools/qfcc/test/methodparams.dat$(EXEEXT): $(methodparams_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(methodparams_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(methodparams_obj)
 tools/qfcc/test/methodparams.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(methodparams_dep) # am--include-marker
@@ -335,7 +335,7 @@ tools_qfcc_test_modulo_dat_SOURCES=tools/qfcc/test/modulo.r
 modulo_obj=$(tools_qfcc_test_modulo_dat_SOURCES:.r=.o)
 modulo_dep=$(call qcautodep,$(tools_qfcc_test_modulo_dat_SOURCES))
 tools/qfcc/test/modulo.dat$(EXEEXT): $(modulo_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(modulo_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(modulo_obj)
 tools/qfcc/test/modulo.run: $(qfcc_test_run_deps)
 	@TEST_HARNESS_OPTS=--float $(top_srcdir)/tools/qfcc/test/build-run $@
 include $(modulo_dep) # am--include-marker
@@ -345,7 +345,7 @@ tools_qfcc_test_nilparamret_dat_SOURCES=tools/qfcc/test/nilparamret.r
 nilparamret_obj=$(tools_qfcc_test_nilparamret_dat_SOURCES:.r=.o)
 nilparamret_dep=$(call qcautodep,$(tools_qfcc_test_nilparamret_dat_SOURCES))
 tools/qfcc/test/nilparamret.dat$(EXEEXT): $(nilparamret_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(nilparamret_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(nilparamret_obj)
 tools/qfcc/test/nilparamret.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(nilparamret_dep) # am--include-marker
@@ -355,7 +355,7 @@ tools_qfcc_test_overload_dat_SOURCES=tools/qfcc/test/overload.r
 overload_obj=$(tools_qfcc_test_overload_dat_SOURCES:.r=.o)
 overload_dep=$(call qcautodep,$(tools_qfcc_test_overload_dat_SOURCES))
 tools/qfcc/test/overload.dat$(EXEEXT): $(overload_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(overload_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(overload_obj)
 tools/qfcc/test/overload.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(overload_dep) # am--include-marker
@@ -365,7 +365,7 @@ tools_qfcc_test_paramret_dat_SOURCES=tools/qfcc/test/paramret.r
 paramret_obj=$(tools_qfcc_test_paramret_dat_SOURCES:.r=.o)
 paramret_dep=$(call qcautodep,$(tools_qfcc_test_paramret_dat_SOURCES))
 tools/qfcc/test/paramret.dat$(EXEEXT): $(paramret_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(paramret_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(paramret_obj)
 tools/qfcc/test/paramret.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(paramret_dep) # am--include-marker
@@ -375,7 +375,7 @@ tools_qfcc_test_quaternion_dat_SOURCES=tools/qfcc/test/quaternion.r
 quaternion_obj=$(tools_qfcc_test_quaternion_dat_SOURCES:.r=.o)
 quaternion_dep=$(call qcautodep,$(tools_qfcc_test_quaternion_dat_SOURCES))
 tools/qfcc/test/quaternion.dat$(EXEEXT): $(quaternion_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(quaternion_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(quaternion_obj)
 tools/qfcc/test/quaternion.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(quaternion_dep) # am--include-marker
@@ -385,7 +385,7 @@ tools_qfcc_test_return_ivar_dat_SOURCES=tools/qfcc/test/return-ivar.r
 return_ivar_obj=$(tools_qfcc_test_return_ivar_dat_SOURCES:.r=.o)
 return_ivar_dep=$(call qcautodep,$(tools_qfcc_test_return_ivar_dat_SOURCES))
 tools/qfcc/test/return-ivar.dat$(EXEEXT): $(return_ivar_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(return_ivar_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(return_ivar_obj)
 tools/qfcc/test/return-ivar.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(return_ivar_dep) # am--include-marker
@@ -395,7 +395,7 @@ tools_qfcc_test_sendv_dat_SOURCES=tools/qfcc/test/sendv.r
 sendv_obj=$(tools_qfcc_test_sendv_dat_SOURCES:.r=.o)
 sendv_dep=$(call qcautodep,$(tools_qfcc_test_sendv_dat_SOURCES))
 tools/qfcc/test/sendv.dat$(EXEEXT): $(sendv_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(sendv_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(sendv_obj)
 tools/qfcc/test/sendv.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(sendv_dep) # am--include-marker
@@ -405,7 +405,7 @@ tools_qfcc_test_state_dat_SOURCES=tools/qfcc/test/state.r
 state_obj=$(tools_qfcc_test_state_dat_SOURCES:.r=.o)
 state_dep=$(call qcautodep,$(tools_qfcc_test_state_dat_SOURCES))
 tools/qfcc/test/state.dat$(EXEEXT): $(state_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(state_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(state_obj)
 tools/qfcc/test/state.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(state_dep) # am--include-marker
@@ -415,7 +415,7 @@ tools_qfcc_test_struct_init_param_dat_SOURCES=tools/qfcc/test/struct-init-param.
 struct_init_param_obj=$(tools_qfcc_test_struct_init_param_dat_SOURCES:.r=.o)
 struct_init_param_dep=$(call qcautodep,$(tools_qfcc_test_struct_init_param_dat_SOURCES))
 tools/qfcc/test/struct-init-param.dat$(EXEEXT): $(struct_init_param_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(struct_init_param_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(struct_init_param_obj)
 tools/qfcc/test/struct-init-param.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(struct_init_param_dep) # am--include-marker
@@ -425,7 +425,7 @@ tools_qfcc_test_struct_nil_init_dat_SOURCES=tools/qfcc/test/struct-nil-init.r
 struct_nil_init_obj=$(tools_qfcc_test_struct_nil_init_dat_SOURCES:.r=.o)
 struct_nil_init_dep=$(call qcautodep,$(tools_qfcc_test_struct_nil_init_dat_SOURCES))
 tools/qfcc/test/struct-nil-init.dat$(EXEEXT): $(struct_nil_init_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(struct_nil_init_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(struct_nil_init_obj)
 tools/qfcc/test/struct-nil-init.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(struct_nil_init_dep) # am--include-marker
@@ -435,7 +435,7 @@ tools_qfcc_test_structarray_dat_SOURCES=tools/qfcc/test/structarray.r
 structarray_obj=$(tools_qfcc_test_structarray_dat_SOURCES:.r=.o)
 structarray_dep=$(call qcautodep,$(tools_qfcc_test_structarray_dat_SOURCES))
 tools/qfcc/test/structarray.dat$(EXEEXT): $(structarray_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(structarray_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(structarray_obj)
 tools/qfcc/test/structarray.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(structarray_dep) # am--include-marker
@@ -445,7 +445,7 @@ tools_qfcc_test_structlive_dat_SOURCES=tools/qfcc/test/structlive.r
 structlive_obj=$(tools_qfcc_test_structlive_dat_SOURCES:.r=.o)
 structlive_dep=$(call qcautodep,$(tools_qfcc_test_structlive_dat_SOURCES))
 tools/qfcc/test/structlive.dat$(EXEEXT): $(structlive_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(structlive_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(structlive_obj)
 tools/qfcc/test/structlive.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(structlive_dep) # am--include-marker
@@ -455,7 +455,7 @@ tools_qfcc_test_structptr_dat_SOURCES=tools/qfcc/test/structptr.r
 structptr_obj=$(tools_qfcc_test_structptr_dat_SOURCES:.r=.o)
 structptr_dep=$(call qcautodep,$(tools_qfcc_test_structptr_dat_SOURCES))
 tools/qfcc/test/structptr.dat$(EXEEXT): $(structptr_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(structptr_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(structptr_obj)
 tools/qfcc/test/structptr.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(structptr_dep) # am--include-marker
@@ -465,7 +465,7 @@ tools_qfcc_test_structstruct_dat_SOURCES=tools/qfcc/test/structstruct.r
 structstruct_obj=$(tools_qfcc_test_structstruct_dat_SOURCES:.r=.o)
 structstruct_dep=$(call qcautodep,$(tools_qfcc_test_structstruct_dat_SOURCES))
 tools/qfcc/test/structstruct.dat$(EXEEXT): $(structstruct_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(structstruct_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(structstruct_obj)
 tools/qfcc/test/structstruct.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(structstruct_dep) # am--include-marker
@@ -475,7 +475,7 @@ tools_qfcc_test_swap_dat_SOURCES=tools/qfcc/test/swap.r
 swap_obj=$(tools_qfcc_test_swap_dat_SOURCES:.r=.o)
 swap_dep=$(call qcautodep,$(tools_qfcc_test_swap_dat_SOURCES))
 tools/qfcc/test/swap.dat$(EXEEXT): $(swap_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(swap_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(swap_obj)
 tools/qfcc/test/swap.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(swap_dep) # am--include-marker
@@ -485,7 +485,7 @@ tools_qfcc_test_triangle_dat_SOURCES=tools/qfcc/test/triangle.r
 triangle_obj=$(tools_qfcc_test_triangle_dat_SOURCES:.r=.o)
 triangle_dep=$(call qcautodep,$(tools_qfcc_test_triangle_dat_SOURCES))
 tools/qfcc/test/triangle.dat$(EXEEXT): $(triangle_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(triangle_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(triangle_obj)
 tools/qfcc/test/triangle.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@ 100000 100000 1.00005 50002.4961
 include $(triangle_dep) # am--include-marker
@@ -495,7 +495,7 @@ tools_qfcc_test_typedef_dat_SOURCES=tools/qfcc/test/typedef.r
 typedef_obj=$(tools_qfcc_test_typedef_dat_SOURCES:.r=.o)
 typedef_dep=$(call qcautodep,$(tools_qfcc_test_typedef_dat_SOURCES))
 tools/qfcc/test/typedef.dat$(EXEEXT): $(typedef_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(typedef_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(typedef_obj)
 tools/qfcc/test/typedef.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(typedef_dep) # am--include-marker
@@ -505,7 +505,7 @@ tools_qfcc_test_typelinker_dat_SOURCES=tools/qfcc/test/typelinker_a.r tools/qfcc
 typelinker_obj=$(tools_qfcc_test_typelinker_dat_SOURCES:.r=.o)
 typelinker_dep=$(call qcautodep,$(tools_qfcc_test_typelinker_dat_SOURCES))
 tools/qfcc/test/typelinker.dat$(EXEEXT): $(typelinker_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(typelinker_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(typelinker_obj)
 tools/qfcc/test/typelinker.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(typelinker_dep) # am--include-marker
@@ -515,7 +515,7 @@ tools_qfcc_test_unaryminus_dat_SOURCES=tools/qfcc/test/unaryminus.r
 unaryminus_obj=$(tools_qfcc_test_unaryminus_dat_SOURCES:.r=.o)
 unaryminus_dep=$(call qcautodep,$(tools_qfcc_test_unaryminus_dat_SOURCES))
 tools/qfcc/test/unaryminus.dat$(EXEEXT): $(unaryminus_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(unaryminus_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(unaryminus_obj)
 tools/qfcc/test/unaryminus.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(unaryminus_dep) # am--include-marker
@@ -525,7 +525,7 @@ tools_qfcc_test_vecaddr_dat_SOURCES=tools/qfcc/test/vecaddr.r
 vecaddr_obj=$(tools_qfcc_test_vecaddr_dat_SOURCES:.r=.o)
 vecaddr_dep=$(call qcautodep,$(tools_qfcc_test_vecaddr_dat_SOURCES))
 tools/qfcc/test/vecaddr.dat$(EXEEXT): $(vecaddr_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(vecaddr_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(vecaddr_obj)
 tools/qfcc/test/vecaddr.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(vecaddr_dep) # am--include-marker
@@ -535,7 +535,7 @@ tools_qfcc_test_vecexpr_dat_SOURCES=tools/qfcc/test/vecexpr.r
 vecexpr_obj=$(tools_qfcc_test_vecexpr_dat_SOURCES:.r=.o)
 vecexpr_dep=$(call qcautodep,$(tools_qfcc_test_vecexpr_dat_SOURCES))
 tools/qfcc/test/vecexpr.dat$(EXEEXT): $(vecexpr_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(vecexpr_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(vecexpr_obj)
 tools/qfcc/test/vecexpr.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(vecexpr_dep) # am--include-marker
@@ -545,7 +545,7 @@ tools_qfcc_test_vecinit_dat_SOURCES=tools/qfcc/test/vecinit.r
 vecinit_obj=$(tools_qfcc_test_vecinit_dat_SOURCES:.r=.o)
 vecinit_dep=$(call qcautodep,$(tools_qfcc_test_vecinit_dat_SOURCES))
 tools/qfcc/test/vecinit.dat$(EXEEXT): $(vecinit_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(vecinit_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(vecinit_obj)
 tools/qfcc/test/vecinit.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(vecinit_dep) # am--include-marker
@@ -555,7 +555,7 @@ tools_qfcc_test_voidfor_dat_SOURCES=tools/qfcc/test/voidfor.r
 voidfor_obj=$(tools_qfcc_test_voidfor_dat_SOURCES:.r=.o)
 voidfor_dep=$(call qcautodep,$(tools_qfcc_test_voidfor_dat_SOURCES))
 tools/qfcc/test/voidfor.dat$(EXEEXT): $(voidfor_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(voidfor_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(voidfor_obj)
 tools/qfcc/test/voidfor.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(voidfor_dep) # am--include-marker
@@ -565,7 +565,7 @@ tools_qfcc_test_while_dat_SOURCES=tools/qfcc/test/while.r
 while_obj=$(tools_qfcc_test_while_dat_SOURCES:.r=.o)
 while_dep=$(call qcautodep,$(tools_qfcc_test_while_dat_SOURCES))
 tools/qfcc/test/while.dat$(EXEEXT): $(while_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(while_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(while_obj)
 tools/qfcc/test/while.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(while_dep) # am--include-marker
@@ -575,7 +575,7 @@ tools_qfcc_test_zerolinker_dat_SOURCES=tools/qfcc/test/zerolinker.r
 zerolinker_obj=$(tools_qfcc_test_zerolinker_dat_SOURCES:.r=.o)
 zerolinker_dep=$(call qcautodep,$(tools_qfcc_test_zerolinker_dat_SOURCES))
 tools/qfcc/test/zerolinker.dat$(EXEEXT): $(zerolinker_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(zerolinker_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(zerolinker_obj)
 tools/qfcc/test/zerolinker.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(zerolinker_dep) # am--include-marker

From 19c75f5e499d569564cf61d95e91cd5cbba589df Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 28 Jun 2020 13:53:11 +0900
Subject: [PATCH 1153/1519] [vulkan] Clean up QFV_CreateFramebuffer's prototype

It now takes qfv_imageviewset_t instead of separate count and
VkImageView array.
---
 include/QF/Vulkan/renderpass.h                 | 4 ++--
 libs/video/renderer/vulkan/renderpass.c        | 4 ++--
 libs/video/renderer/vulkan/vulkan_vid_common.c | 5 ++---
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/include/QF/Vulkan/renderpass.h b/include/QF/Vulkan/renderpass.h
index 9a197ac70..49134c730 100644
--- a/include/QF/Vulkan/renderpass.h
+++ b/include/QF/Vulkan/renderpass.h
@@ -28,6 +28,7 @@ typedef struct qfv_subpassdependency_s
 	DARRAY_ALLOCFIXED (qfv_subpassdependency_t, num, allocator)
 
 struct qfv_device_s;
+struct qfv_imageviewset_s;
 VkRenderPass
 QFV_CreateRenderPass (struct qfv_device_s *device,
 					  qfv_attachmentdescription_t *attachments,
@@ -37,8 +38,7 @@ QFV_CreateRenderPass (struct qfv_device_s *device,
 VkFramebuffer
 QFV_CreateFramebuffer (struct qfv_device_s *device,
 					   VkRenderPass renderPass,
-					   uint32_t numAttachments,
-					   VkImageView *attachments,
+					   struct qfv_imageviewset_s *attachments,
 					   VkExtent2D, uint32_t layers);
 
 #endif//__QF_Vulkan_renderpass_h
diff --git a/libs/video/renderer/vulkan/renderpass.c b/libs/video/renderer/vulkan/renderpass.c
index e61005278..40bc095ad 100644
--- a/libs/video/renderer/vulkan/renderpass.c
+++ b/libs/video/renderer/vulkan/renderpass.c
@@ -85,7 +85,7 @@ QFV_CreateRenderPass (qfv_device_t *device,
 
 VkFramebuffer
 QFV_CreateFramebuffer (qfv_device_t *device, VkRenderPass renderPass,
-					   uint32_t numAttachments, VkImageView *attachments,
+					   qfv_imageviewset_t *attachments,
 					   VkExtent2D extent, uint32_t layers)
 {
 	VkDevice    dev = device->dev;
@@ -93,7 +93,7 @@ QFV_CreateFramebuffer (qfv_device_t *device, VkRenderPass renderPass,
 
 	VkFramebufferCreateInfo createInfo = {
 		VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO, 0, 0,
-		renderPass, numAttachments, attachments,
+		renderPass, attachments->size, attachments->a,
 		extent.width, extent.height, layers,
 	};
 
diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c
index 452a74eb8..68dd2bbe8 100644
--- a/libs/video/renderer/vulkan/vulkan_vid_common.c
+++ b/libs/video/renderer/vulkan/vulkan_vid_common.c
@@ -445,9 +445,8 @@ Vulkan_CreateFramebuffers (vulkan_ctx_t *ctx)
 		attachments->a[2] = sc->imageViews->a[i];
 		__auto_type frame = &ctx->framebuffers.a[i];
 		frame->framebuffer = QFV_CreateFramebuffer (device, renderpass,
-												   attachments->size,
-												   attachments->a,
-												   sc->extent, 1);
+												    attachments,
+												    sc->extent, 1);
 		frame->fence = QFV_CreateFence (device, 1);
 		frame->imageAvailableSemaphore = QFV_CreateSemaphore (device);
 		frame->renderDoneSemaphore = QFV_CreateSemaphore (device);

From 7f96b0fbedb0a5a5e91bd20c9753c26321646898 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 28 Jun 2020 18:30:01 +0900
Subject: [PATCH 1154/1519] [qwaq] Fix incorrect setting of progs argc/argv

---
 ruamoko/qwaq/builtins/main.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ruamoko/qwaq/builtins/main.c b/ruamoko/qwaq/builtins/main.c
index da3607c01..931d33337 100644
--- a/ruamoko/qwaq/builtins/main.c
+++ b/ruamoko/qwaq/builtins/main.c
@@ -223,13 +223,13 @@ spawn_progs (qwaq_thread_t *thread)
 	}
 
 	PR_PushFrame (pr);
-	if (thread->args.size > 2) {
-		pr_argc = thread->args.size - 1;
+	if (thread->args.size) {
+		pr_argc = thread->args.size;
 	}
 	pr_argv = PR_Zone_Malloc (pr, (pr_argc + 1) * 4);
 	pr_argv[0] = PR_SetTempString (pr, name);
 	for (i = 1; i < pr_argc; i++)
-		pr_argv[i] = PR_SetTempString (pr, thread->args.a[1 + i]);
+		pr_argv[i] = PR_SetTempString (pr, thread->args.a[i]);
 	pr_argv[i] = 0;
 
 	PR_RESET_PARAMS (pr);

From 6d4e370a258f2682c4c90c9a139f42f7579fbadf Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 28 Jun 2020 18:48:38 +0900
Subject: [PATCH 1155/1519] [ruamoko] Handle 0-length @va_list for va_copy

Fixes a progs crash when using vsprintf with no format elements +
params.
---
 libs/ruamoko/rua_runtime.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/libs/ruamoko/rua_runtime.c b/libs/ruamoko/rua_runtime.c
index 697fc720b..24a8a894d 100644
--- a/libs/ruamoko/rua_runtime.c
+++ b/libs/ruamoko/rua_runtime.c
@@ -56,8 +56,13 @@ bi_va_copy (progs_t *pr)
 	__auto_type src_list = &G_STRUCT (pr, pr_type_t, src_args->list);
 	size_t      parm_size = pr->pr_param_size * sizeof(pr_type_t);
 	size_t      size = src_args->count * parm_size;
-	string_t    dst_list_block = PR_AllocTempBlock (pr, size);
-	__auto_type dst_list = (pr_type_t *) PR_GetString (pr, dst_list_block);
+	string_t    dst_list_block = 0;
+	pr_type_t  *dst_list = 0;
+
+	if (size) {
+		dst_list_block = PR_AllocTempBlock (pr, size);
+		dst_list = (pr_type_t *) PR_GetString (pr, dst_list_block);
+	}
 
 	memcpy (dst_list, src_list, size);
 	R_PACKED (pr, pr_va_list_t).count = src_args->count;

From cf3262991d68ca90ab71518592d45e4768b5d6ac Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 28 Jun 2020 19:08:18 +0900
Subject: [PATCH 1156/1519] [vulkan] Add a tool for making vulkan enum tables

The tables are generated from the enums pulled out of the vulkan headers
using a ruamoko program (thanks to its reflection capabilities). They
will be used for parsing property lists used to create render passes and
pipelines.
---
 libs/video/renderer/Makemodule.am             |   7 +
 .../video/renderer/vulkan/vkgen/Makemodule.am |  34 ++
 libs/video/renderer/vulkan/vkgen/stddef.h     |   2 +
 libs/video/renderer/vulkan/vkgen/stdint.h     |  11 +
 libs/video/renderer/vulkan/vkgen/vkgen.r      | 431 ++++++++++++++++++
 libs/video/renderer/vulkan/vkgen/vulkan.r     |   2 +
 6 files changed, 487 insertions(+)
 create mode 100644 libs/video/renderer/vulkan/vkgen/Makemodule.am
 create mode 100644 libs/video/renderer/vulkan/vkgen/stddef.h
 create mode 100644 libs/video/renderer/vulkan/vkgen/stdint.h
 create mode 100644 libs/video/renderer/vulkan/vkgen/vkgen.r
 create mode 100644 libs/video/renderer/vulkan/vkgen/vulkan.r

diff --git a/libs/video/renderer/Makemodule.am b/libs/video/renderer/Makemodule.am
index 65b594549..b1196dc2f 100644
--- a/libs/video/renderer/Makemodule.am
+++ b/libs/video/renderer/Makemodule.am
@@ -1,3 +1,5 @@
+include libs/video/renderer/vulkan/vkgen/Makemodule.am
+
 #lib_LTLIBRARIES += @VID_REND_TARGETS@
 plugin_LTLIBRARIES += @vid_render_plugins@
 noinst_LTLIBRARIES += libs/video/renderer/libQFrenderer.la @vid_render_static_plugins@
@@ -217,6 +219,11 @@ libs_video_renderer_vid_render_vulkan_la_SOURCES = \
 	libs/video/renderer/vulkan/vulkan_draw.c \
 	libs/video/renderer/vulkan/vulkan_vid_common.c
 
+qwaq_curses = ruamoko/qwaq/qwaq-curses$(EXEEXT)
+BUILT_SOURCES += libs/video/renderer/vulkan/vkenum.inc
+libs/video/renderer/vulkan/vkenum.inc: $(vkgen) $(qwaq_curses)
+	$(qwaq_curses) $(vkgen) -- $@
+
 CLEANFILES += \
 	libs/video/renderer/glsl/*.vc \
 	libs/video/renderer/glsl/*.fc \
diff --git a/libs/video/renderer/vulkan/vkgen/Makemodule.am b/libs/video/renderer/vulkan/vkgen/Makemodule.am
new file mode 100644
index 000000000..901dea622
--- /dev/null
+++ b/libs/video/renderer/vulkan/vkgen/Makemodule.am
@@ -0,0 +1,34 @@
+vkgen = libs/video/renderer/vulkan/vkgen.dat$(EXEEXT)
+noinst_PROGRAMS += $(vkgen)
+
+vkgen_dat_src= \
+	libs/video/renderer/vulkan/vkgen/vkgen.r \
+	libs/video/renderer/vulkan/vkgen/vulkan.r
+
+VKGENFLAGS = -I$(top_srcdir)/libs/video/renderer/vulkan/vkgen
+
+libs_video_renderer_vulkan_vkgen_dat_SOURCES=$(vkgen_dat_src)
+libs_video_renderer_vkgen_obj=$(libs_video_renderer_vulkan_vkgen_dat_SOURCES:.r=.o)
+libs_video_renderer_vkgen_dep=$(call qcautodep,$(libs_video_renderer_vulkan_vkgen_dat_SOURCES:.o=.Qo))
+libs/video/renderer/vulkan/vkgen.dat$(EXEEXT): $(libs_video_renderer_vkgen_obj) $(QFCC_DEP) ruamoko/lib/libcsqc.a ruamoko/lib/libr.a
+	$(V_QFCCLD)$(QLINK) -o $@ $(libs_video_renderer_vkgen_obj) -lcsqc -lr
+include $(libs_video_renderer_vkgen_dep) # am--include-marker
+r_depfiles_remade += $(libs_video_renderer_vkgen_dep)
+
+libs/video/renderer/vulkan/vkgen/vkgen.o: $(top_srcdir)/libs/video/renderer/vulkan/vkgen/vkgen.r
+	$(V_QFCC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+	$(QCOMPILE) ${VKGENFLAGS} -MT $@ -MD -MP -MF $$depbase.Tqo -c -o $@ $< &&\
+	sed -i -e '1s@:@: $(QFCC_DEP)@' $$depbase.Tqo &&\
+	$(am__mv) $$depbase.Tqo $$depbase.Qo
+
+libs/video/renderer/vulkan/vkgen/vulkan.o: $(top_srcdir)/libs/video/renderer/vulkan/vkgen/vulkan.r
+	$(V_QFCC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+	$(QCOMPILE) ${VKGENFLAGS} -MT $@ -MD -MP -MF $$depbase.Tqo -c -o $@ $< &&\
+	sed -i -e '1s@:@: $(QFCC_DEP)@' $$depbase.Tqo &&\
+	$(am__mv) $$depbase.Tqo $$depbase.Qo
+
+EXTRA_DIST += \
+	libs/video/renderer/vulkan/vkgen/stddef.h \
+	libs/video/renderer/vulkan/vkgen/stdint.h
+CLEANFILES += \
+	libs/video/renderer/vkgen/*.sym
diff --git a/libs/video/renderer/vulkan/vkgen/stddef.h b/libs/video/renderer/vulkan/vkgen/stddef.h
new file mode 100644
index 000000000..5252efc1d
--- /dev/null
+++ b/libs/video/renderer/vulkan/vkgen/stddef.h
@@ -0,0 +1,2 @@
+#define const
+#define __attribute__(x)
diff --git a/libs/video/renderer/vulkan/vkgen/stdint.h b/libs/video/renderer/vulkan/vkgen/stdint.h
new file mode 100644
index 000000000..04fc06933
--- /dev/null
+++ b/libs/video/renderer/vulkan/vkgen/stdint.h
@@ -0,0 +1,11 @@
+typedef int uint8_t;
+typedef int uint16_t;
+typedef int uint32_t;
+typedef int uint64_t;
+typedef int int8_t;
+typedef int int16_t;
+typedef int int32_t;
+typedef int int64_t;
+typedef int size_t;
+typedef int long;
+typedef int char;
diff --git a/libs/video/renderer/vulkan/vkgen/vkgen.r b/libs/video/renderer/vulkan/vkgen/vkgen.r
new file mode 100644
index 000000000..1400d3fbc
--- /dev/null
+++ b/libs/video/renderer/vulkan/vkgen/vkgen.r
@@ -0,0 +1,431 @@
+#include <hash.h>
+#include <qfile.h>
+#include <runtime.h>
+#include <string.h>
+#include <types.h>
+#include <Array.h>
+
+void printf (string fmt, ...) = #0;
+
+void fprintf (QFile file, string format, ...)
+{
+	printf("fprintf %d\n", @args.count);
+	Qputs (file, vsprintf (format, va_copy (@args)));
+}
+
+typedef void varfunc (qfot_var_t *var);
+
+string search_names[] = {
+	"VkGraphicsPipelineCreateInfo",
+	"VkComputePipelineCreateInfo",
+};
+#define numsearch (sizeof (search_names) / sizeof (search_names[0]))
+hashtab_t *available_types;
+hashtab_t *processed_types;
+Array *queue;
+Array *output_types;
+
+QFile output_file;
+
+@interface Enum: Object
+{
+	qfot_type_t *type;
+	int          prefix_length;
+}
+-initWithType: (qfot_type_t *) type;
+/**	\warning	returned string is ephemeral
+*/
+-(string) name;
+@end
+
+@implementation Enum
+-(void)process
+{
+	string      end = "_MAX_ENUM";
+	int         len;
+	string      prefix = nil;
+
+	if (str_mid([self name], -8) == "FlagBits") {
+		end = "_FLAG_BITS_MAX_ENUM";
+	}
+	len = -strlen (end);
+	for (int i = 0; i < type.strct.num_fields; i++) {
+		qfot_var_t *var = &type.strct.fields[i];
+		if (str_mid (var.name, len) == end) {
+			// len is negative so +1 consumes 1 more char (_)
+			prefix = str_hold (str_mid (var.name, 0, len + 1));
+		}
+	}
+	if (prefix) {
+		prefix_length = strlen (prefix);
+	}
+}
+
+-initWithType: (qfot_type_t *) type
+{
+	if (!(self = [super init])) {
+		return nil;
+	}
+	self.type = type;
+	[self process];
+	return self;
+}
+
+-(string) name
+{
+	return str_mid(type.strct.tag, 4);
+}
+
+-(void) addToQueue
+{
+	string name = [self name];
+	//printf ("    +%s\n", name);
+	if (!Hash_Find (processed_types, name)) {
+		Hash_Add (processed_types, (void *) name);
+		[queue addObject: self];
+	}
+}
+
+-(void) writeTable
+{
+	int         strip_bit = 0;
+	if (str_mid([self name], -8) == "FlagBits") {
+		strip_bit = 1;
+	}
+
+	fprintf (output_file, "enumval_t %s_values[] = {\n", [self name]);
+	for (int i = 0; i < type.strct.num_fields; i++) {
+		qfot_var_t *var = &type.strct.fields[i];
+		if (str_str (var.name, "_MAX_ENUM") >= 0
+			|| str_str (var.name, "_BEGIN_RANGE") >= 0
+			|| str_str (var.name, "_END_RANGE") >= 0
+			|| str_str (var.name, "_RANGE_SIZE") >= 0) {
+			continue;
+		}
+		fprintf (output_file, "\t{\"%s\", %d},\n", var.name, var.offset);
+		if (prefix_length) {
+			string      shortname = str_mid (var.name, prefix_length);
+			if (strip_bit) {
+				int bit_pos = str_str (shortname, "_BIT");
+				if (bit_pos >= 0) {
+					shortname = str_mid (shortname, 0, bit_pos);
+				}
+			}
+			fprintf (output_file, "\t{\"%s\", %d},\n", str_lower(shortname),
+					 var.offset);
+		}
+	}
+	fprintf (output_file, "\t{ }\n");
+	fprintf (output_file, "};\n");
+}
+@end
+
+@interface Struct: Object
+{
+	qfot_type_t *type;
+}
+-initWithType: (qfot_type_t *) type;
+/**	\warning	returned string is ephemeral
+*/
+-(string) name;
+-(void) forEachFieldCall: (varfunc) func;
+@end
+
+@implementation Struct
+-initWithType: (qfot_type_t *) type
+{
+	if (!(self = [super init])) {
+		return nil;
+	}
+	self.type = type;
+	return self;
+}
+
+-(string) name
+{
+	return str_mid(type.strct.tag, 4);
+}
+
+-(void) forEachFieldCall: (varfunc) func
+{
+	qfot_struct_t *strct =&type.strct;
+
+	for (int i = 0; i < strct.num_fields; i++) {
+		func (&strct.fields[i]);
+	}
+}
+
+-(void) addToQueue
+{
+	string name = [self name];
+	//printf ("    +%s\n", name);
+	if (!Hash_Find (processed_types, name)) {
+		Hash_Add (processed_types, (void *) name);
+		[queue addObject: self];
+	}
+}
+
+-(void) writeTable
+{
+	fprintf (output_file, "structfld_t %s_fields[] = {\n", [self name]);
+	for (int i = 0; i < type.strct.num_fields; i++) {
+		qfot_var_t *var = &type.strct.fields[i];
+		if (var.name == "sType" || var.name == "pNext") {
+			continue;
+		}
+		string type_name = var.type.encoding;
+		fprintf (output_file,
+				 "\t{\"%s\", field_offset (%s, %s), %s, %s}, // %s\n",
+				 var.name, [self name], var.name, "0", "0", type_name);
+	}
+	fprintf (output_file, "\t{ }\n");
+	fprintf (output_file, "};\n");
+}
+@end
+
+qfot_type_encodings_t *encodings;
+
+qfot_type_t *
+next_type (qfot_type_t *type)
+{
+	int         size = type.size;
+	if (!size)
+		size = 4;
+	return (qfot_type_t *) ((int *) type + size);
+}
+
+int
+type_is_null (qfot_type_t *type)
+{
+	return type.size == 0;
+}
+
+void print_type (qfot_type_t *type)
+{
+	printf ("type: %p %d %d %s", type, type.meta, type.size, type.encoding);
+	switch (type.meta) {
+		case ty_basic:
+			printf (" %d", type.type);
+			switch (type.type) {
+				case ev_pointer:
+				case ev_field:
+					printf (" ");
+					print_type (type.fldptr.aux_type);
+					break;
+				case ev_func:
+					printf (" %p %d\n", type.func.return_type,
+							type.func.num_params);
+				default:
+					printf ("\n");
+					break;
+			}
+			break;
+		case ty_struct:
+		case ty_union:
+		case ty_enum:
+			printf (" %s %d\n", type.strct.tag, type.strct.num_fields);
+			break;
+		case ty_array:
+			printf (" %p %d %d\n", type.array.type, type.array.base,
+					type.array.size);
+			break;
+		case ty_class:
+			printf (" %s\n", type.class);
+			break;
+		case ty_alias:
+			printf (" %d %s ", type.alias.type, type.alias.name);
+			print_type (type.alias.aux_type);
+			break;
+	}
+}
+
+void struct_func (qfot_var_t *var)
+{
+	qfot_type_t *alias;
+	if (var.type.meta == ty_enum) {
+		printf("%s a\n", var.name);
+	} else if (var.type.meta == ty_struct) {
+		printf("%s b\n", var.name);
+	} else if (var.type.meta == ty_union) {
+		printf("%s c\n", var.name);
+	} else if (var.type.meta == ty_alias) {
+		//printf("%s d\n", var.name);
+		// typedef fun ;)
+		alias = var.type.alias.full_type;
+		if (alias.meta == ty_alias) {
+			// double(+) typedef
+			if (alias.alias.name == "VkFlags") {
+				// enum flag fun :P
+				string tag = var.type.alias.name;
+				if (str_mid (tag, -5) == "Flags") {
+					tag = str_mid (tag, 0, -1) + "Bits";
+					id enumObj = (id) Hash_Find (available_types, tag);
+					if (enumObj) {
+						[enumObj addToQueue];
+					}
+				}
+			} else {
+				if (var.type.alias.name == "VkBool32") {
+					// drop
+				} else {
+					printf ("%s =%s\n", var.name, var.type.alias.name);
+				}
+			}
+		} else if (alias.meta == ty_enum) {
+			string tag = str_mid(alias.strct.tag, 4);
+			id enumObj = (id) Hash_Find (available_types, tag);
+			if (enumObj) {
+				[enumObj addToQueue];
+			}
+		} else if (alias.meta == ty_basic && alias.type == ev_pointer) {
+			//printf("e\n");
+			qfot_type_t *type = alias.fldptr.aux_type;
+			if (type.meta == ty_alias) {
+				id structObj = (id) Hash_Find (available_types, type.alias.name);
+				//printf ("    a:%s %p\n", type.alias.name, structObj);
+				if (structObj) {
+					[structObj addToQueue];
+				}
+			} else if (type_is_null (type)) {
+				// pointer to opaque struct. Probably VK_DEFINE_NON_DISPATCHABLE_HANDLE or VK_DEFINE_HANDLE
+				//drop
+				string createInfo = var.type.alias.name + "CreateInfo";
+				id structObj = (id) Hash_Find (available_types, createInfo);
+				if (structObj) {
+					[structObj addToQueue];
+				} else {
+					//printf("    b:%s\n", var.type.alias.name);
+				}
+			} else {
+				print_type (type);
+				printf("%s c:%s:%s\n", var.name, var.type.alias.name, pr_type_name[alias.type]);
+			}
+		} else if (alias.meta == ty_basic) {
+			//drop
+			//printf("    d:%s:%s\n", var.type.alias.name, pr_type_name[alias.type]);
+		} else if (alias.meta == ty_struct) {
+			string tag = str_mid(alias.strct.tag, 4);
+			id structObj = (id) Hash_Find (available_types, tag);
+			if (structObj) {
+				[structObj addToQueue];
+			}
+		} else {
+			printf("    d:%s:%s\n", var.type.alias.name, ty_meta_name[alias.meta]);
+		}
+	} else if (var.type.meta == ty_basic && var.type.type == ev_pointer) {
+		qfot_type_t *type = var.type.fldptr.aux_type;
+		if (type.meta == ty_struct || type.meta == ty_union) {
+			printf("%s f\n", var.name);
+		} else if (type.meta == ty_alias) {
+			printf("%s --- %s\n", var.name, type.alias.name);
+			id obj = (id) Hash_Find (available_types, type.alias.name);
+			if (obj && [obj class] == [Struct class]) {
+				[obj forEachFieldCall:struct_func];
+			}
+		} else if (type.meta == ty_basic && type.type == ev_void) {
+			//drop
+		} else {
+			printf("%s g\n", var.name);
+			print_type (var.type);
+		}
+	} else {
+		//drop
+		//printf("    %s:%s:%s\n", var.name, ty_meta_name[var.type.meta], pr_type_name[var.type.type]);
+	}
+}
+
+void
+scan_types (void)
+{
+	qfot_type_t *type;
+
+	for (type = encodings.types;
+		 ((int *)type - (int *) encodings.types) < encodings.size;
+		 type = next_type (type)) {
+		if (!type.size
+			|| (type.meta != ty_enum
+				&& type.meta != ty_struct
+				&& type.meta != ty_union)) {
+			continue;
+		}
+		string tag = str_mid(type.strct.tag, 4);
+		switch (type.meta) {
+			case ty_enum:
+				Hash_Add (available_types, [[Enum alloc] initWithType: type]);
+				//printf ("+ enum %s\n", tag);
+				break;
+			case ty_struct:
+			case ty_union:
+				Hash_Add (available_types, [[Struct alloc] initWithType: type]);
+				//printf ("+ struct %s\n", tag);
+				break;
+			case ty_basic:
+			case ty_array:
+			case ty_class:
+			case ty_alias:
+				break;
+		}
+	 }
+}
+
+static string
+get_string_key (void *str, void *unused)
+{
+	return (string) str;
+}
+
+static string
+get_object_key (void *obj, void *unused)
+{
+	return [(id)obj name];
+}
+
+int
+main(int argc, string *argv)
+{
+	encodings = PR_FindGlobal (".type_encodings");
+	if (!encodings) {
+		printf ("Can't find encodings\n");
+		return 1;
+	}
+	queue = [[Array alloc] init];
+	output_types = [[Array alloc] init];
+	available_types = Hash_NewTable (127, get_object_key, nil, nil);
+	processed_types = Hash_NewTable (127, get_string_key, nil, nil);
+	scan_types ();
+
+	for (int i = 0;
+		 i < sizeof (search_names) / sizeof (search_names[0]); i++) {
+		id obj = (id) Hash_Find (available_types, search_names[i]);
+		if (obj && [obj class] == [Struct class]) {
+			[obj addToQueue];
+		}
+	}
+
+	while ([queue count]) {
+		id obj = [queue objectAtIndex:0];
+		[queue removeObjectAtIndex:0];
+		if ([obj class] == [Struct class]) {
+			[obj forEachFieldCall:struct_func];
+		}
+		[output_types addObject:obj];
+	}
+
+	for (int i = 0; i < argc; i++) {
+		printf ("vkgen %d %s\n", i, argv[i]);
+	}
+
+	output_file = Qopen (argv[1], "wt");
+	for (int i = [output_types count]; i-- > 0; ) {
+		id obj = [output_types objectAtIndex:i];
+		if ([obj name] == "VkStructureType") {
+			continue;
+		}
+		if ([obj class] == [Struct class]) {
+			continue;
+		}
+		[obj writeTable];
+	}
+	Qclose (output_file);
+	return 0;
+}
diff --git a/libs/video/renderer/vulkan/vkgen/vulkan.r b/libs/video/renderer/vulkan/vkgen/vulkan.r
new file mode 100644
index 000000000..46b720d0c
--- /dev/null
+++ b/libs/video/renderer/vulkan/vkgen/vulkan.r
@@ -0,0 +1,2 @@
+#define __x86_64__
+#include </usr/include/vulkan/vulkan.h>

From 12a35f3912f1008565dc3098aeaa8e279ea47481 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 28 Jun 2020 23:32:38 +0900
Subject: [PATCH 1157/1519] [build] Put that ar warning to rest

---
 Makefile.am | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile.am b/Makefile.am
index 54ca7be00..71e429956 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -44,6 +44,7 @@ noinst_HEADERS =
 plugin_LTLIBRARIES =
 
 RANLIB=touch
+ARFLAGS=cr
 
 EXTRA_HEADERS =
 EXTRA_LTLIBRARIES =

From 0681136eb9036067c8cadae6be4b4a764315e848 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 25 Jun 2020 19:38:33 +0900
Subject: [PATCH 1158/1519] [qwaq] PR_RunPostLoadFuncs for qwaq-x11

Same issue as for the menus. But now I know why PR_LoadProgsFile is used
instead of PR_LoadProgs (at least for qwaq): avoidance of the gamedir
restriction (however, the menus are supposed to be restricted).
---
 ruamoko/qwaq/builtins/qwaq.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ruamoko/qwaq/builtins/qwaq.c b/ruamoko/qwaq/builtins/qwaq.c
index 111af8764..0a8070825 100644
--- a/ruamoko/qwaq/builtins/qwaq.c
+++ b/ruamoko/qwaq/builtins/qwaq.c
@@ -149,7 +149,7 @@ load_progs (const char *name)
 	pr.zone_size = 1024*1024;
 	PR_LoadProgsFile (&pr, file, size);
 	Qclose (file);
-	if (!PR_RunLoadFuncs (&pr))
+	if (!PR_RunLoadFuncs (&pr) || !PR_RunPostLoadFuncs (&pr))
 		PR_Error (&pr, "unable to load %s", pr.progs_name);
 	return 1;
 }

From 03f6af39f446ef86cec3ec42b49f7e714906a4bd Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 25 Jun 2020 22:45:12 +0900
Subject: [PATCH 1159/1519] [qfcc] Reset flowvars for aliased global variables

When a global variable is accessed via only an alias in a function the
actual def's flowvar would remain in the state it was from the last
function that accessed the global normally. This would result in invalid
flowvar accesses which can be difficult to reproduce (thus no test
case).
---
 tools/qfcc/source/flow.c | 36 +++++++++++++++++++++++++++---------
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/tools/qfcc/source/flow.c b/tools/qfcc/source/flow.c
index e26bcef1b..86f6dc9d5 100644
--- a/tools/qfcc/source/flow.c
+++ b/tools/qfcc/source/flow.c
@@ -463,6 +463,15 @@ flow_build_statements (function_t *func)
 	}
 }
 
+static int flow_def_clear_flowvars (def_t *def, void *data)
+{
+	if (def->flowvar) {
+		delete_flowvar (def->flowvar);
+	}
+	def->flowvar = 0;
+	return 0;
+}
+
 /**	Build an array of all the variables used by a function
  *
  *	The array exists so variables can be referenced by number and thus used
@@ -517,17 +526,26 @@ flow_build_vars (function_t *func)
 	set_iter_t *var_i;
 	flowvar_t  *var;
 
-	// first, count .return and .param_[0-7] as they are always needed
+	// First, run through the statements making sure any accessed variables
+	// have their flowvars reset.  Local variables will be fine, but global
+	// variables make have had flowvars added in a previous function, and it's
+	// easier to just clear them all.
+	// This is done before .return and .param so they won't get reset just
+	// after being counted
+	for (i = 0; i < func->num_statements; i++) {
+		s = func->statements[i];
+		flow_analyze_statement (s, 0, 0, 0, operands);
+		for (j = 0; j < FLOW_OPERANDS; j++) {
+			if (operands[j] && operands[j]->op_type == op_def) {
+				def_visit_all (operands[j]->o.def, 0,
+							   flow_def_clear_flowvars, 0);
+			}
+		}
+	}
+	// count .return and .param_[0-7] as they are always needed
 	for (i = 0; i < num_flow_params; i++) {
 		def_t      *def = param_symbol (flow_params[i].name)->s.def;
-		def_t      *a;
-		for (a = def->alias_defs; a; a = a->next) {
-			if (a->flowvar) {
-				delete_flowvar (a->flowvar);
-				a->flowvar = 0;
-			}
-			//free_def (def->alias_defs);
-		}
+		def_visit_all (def, 0, flow_def_clear_flowvars, 0);
 		flow_params[i].op.o.def = def;
 		num_vars += count_operand (&flow_params[i].op);
 	}

From a177f363f733251532130137d810211c62a00e8b Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 26 Jun 2020 10:52:06 +0900
Subject: [PATCH 1160/1519] [build] Support silent rules for qfcc

---
 Makefile.am                   | 14 +++++-
 ruamoko/cl_menu/Makemodule.am |  2 +-
 ruamoko/game/Makemodule.am    |  2 +-
 ruamoko/qwaq/Makemodule.am    |  4 +-
 ruamoko/scheme/Makemodule.am  |  2 +-
 tools/qfcc/test/Makemodule.am | 90 +++++++++++++++++------------------
 6 files changed, 62 insertions(+), 52 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 9e68af2a5..54ca7be00 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -70,6 +70,16 @@ QFCC_DEP=qfcc$(EXEEXT)
 QFCC=$(top_builddir)/$(QFCC_DEP)
 GZ=@progs_gz@
 
+V_QFCC = $(V_QFCC_@AM_V@)
+V_QFCC_ = $(V_QFCC_@AM_DEFAULT_V@)
+V_QFCC_0 = @echo "  QFCC    " $@;
+V_QFCC_1 =
+
+V_QFCCLD = $(V_QFCCLD_@AM_V@)
+V_QFCCLD_ = $(V_QFCCLD_@AM_DEFAULT_V@)
+V_QFCCLD_0 = @echo "  QFCCLD  " $@;
+V_QFCCLD_1 =
+
 QCSYSTEM=--no-default-paths -I$(top_srcdir) -I$(top_srcdir)/ruamoko/include -I$(top_srcdir)/include
 QCFLAGS=-qq -O -g -Werror -Wall -Wno-integer-divide
 QCPPFLAGS=$(QCSYSTEM)
@@ -82,12 +92,12 @@ am__mv = mv -f
 
 SUFFIXES=.o .r .pas
 .r.o:
-	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+	$(V_QFCC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
 	$(QCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tqo -c -o $@ $< &&\
 	sed -i -e '1s@:@: $(QFCC_DEP)@' $$depbase.Tqo &&\
 	$(am__mv) $$depbase.Tqo $$depbase.Qo
 .pas.o:
-	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+	$(V_QFCC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
 	$(QCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tqo -c -o $@ $< &&\
 	sed -i -e '1s@:@: $(QFCC_DEP)@' $$depbase.Tqo &&\
 	$(am__mv) $$depbase.Tqo $$depbase.Qo
diff --git a/ruamoko/cl_menu/Makemodule.am b/ruamoko/cl_menu/Makemodule.am
index dfa7635ba..c6c57aa7a 100644
--- a/ruamoko/cl_menu/Makemodule.am
+++ b/ruamoko/cl_menu/Makemodule.am
@@ -37,7 +37,7 @@ ruamoko_cl_menu_menu_dat_SOURCES=$(ruamoko_menu_src)
 ruamoko_menu_obj=$(ruamoko_cl_menu_menu_dat_SOURCES:.r=.o)
 ruamoko_menu_dep=$(call qcautodep,$(ruamoko_cl_menu_menu_dat_SOURCES))
 ruamoko/cl_menu/menu.dat$(EXEEXT): $(ruamoko_menu_obj) $(QFCC_DEP) ruamoko/lib/libcsqc.a ruamoko/lib/libr.a ruamoko/gui/libgui.a
-	$(QLINK) -o $@ $(ruamoko_menu_obj) -Lruamoko/gui -lgui -lcsqc -lr
+	$(V_QFCCLD)$(QLINK) -o $@ $(ruamoko_menu_obj) -Lruamoko/gui -lgui -lcsqc -lr
 include $(ruamoko_menu_dep) # am--include-marker
 r_depfiles_remade += $(ruamoko_menu_dep)
 
diff --git a/ruamoko/game/Makemodule.am b/ruamoko/game/Makemodule.am
index 4063e9a62..576867c27 100644
--- a/ruamoko/game/Makemodule.am
+++ b/ruamoko/game/Makemodule.am
@@ -9,7 +9,7 @@ ruamoko_game_game_dat_SOURCES=$(ruamoko_game_src)
 ruamoko_game_obj=$(ruamoko_game_game_dat_SOURCES:.r=.o)
 ruamoko_game_dep=$(call qcautodep,$(ruamoko_game_game_dat_SOURCES))
 ruamoko/game/game.dat$(EXEEXT): $(ruamoko_game_obj) $(QFCC_DEP) ruamoko/lib/libr.a ruamoko/lib/libqw.a
-	$(QLINK) -o $@ $(ruamoko_game_obj) -lqw -lr
+	$(V_QFCCLD)$(QLINK) -o $@ $(ruamoko_game_obj) -lqw -lr
 include $(ruamoko_game_dep) # am--include-marker
 r_depfiles_remade += $(ruamoko_game_dep)
 
diff --git a/ruamoko/qwaq/Makemodule.am b/ruamoko/qwaq/Makemodule.am
index 149213268..bcb97af94 100644
--- a/ruamoko/qwaq/Makemodule.am
+++ b/ruamoko/qwaq/Makemodule.am
@@ -89,7 +89,7 @@ ruamoko_qwaq_qwaq_app_dat_SOURCES=$(qwaq_app_dat_src)
 ruamoko_qwaq_qwaq_app_obj=$(ruamoko_qwaq_qwaq_app_dat_SOURCES:.r=.o)
 ruamoko_qwaq_qwaq_app_dep=$(call qcautodep,$(ruamoko_qwaq_qwaq_app_dat_SOURCES:.o=.Qo))
 ruamoko/qwaq/qwaq-app.dat$(EXEEXT): $(ruamoko_qwaq_qwaq_app_obj) $(QFCC_DEP) ruamoko/lib/libcsqc.a ruamoko/lib/libr.a
-	$(QLINK) -o $@ $(ruamoko_qwaq_qwaq_app_obj) -lcsqc -lr
+	$(V_QFCCLD)$(QLINK) -o $@ $(ruamoko_qwaq_qwaq_app_obj) -lcsqc -lr
 include $(ruamoko_qwaq_qwaq_app_dep) # am--include-marker
 r_depfiles_remade += $(ruamoko_qwaq_qwaq_app_dep)
 
@@ -97,7 +97,7 @@ ruamoko_qwaq_gcd_dat_SOURCES=ruamoko/qwaq/gcd.r
 ruamoko_qwaq_gcd_obj=$(ruamoko_qwaq_gcd_dat_SOURCES:.r=.o)
 ruamoko_qwaq_gcd_dep=$(call qcautodep,$(ruamoko_qwaq_gcd_dat_SOURCES:.o=.Qo))
 ruamoko/qwaq/gcd.dat$(EXEEXT): $(ruamoko_qwaq_gcd_obj) $(QFCC_DEP) ruamoko/lib/libcsqc.a ruamoko/lib/libr.a
-	$(QLINK) -o $@ $(ruamoko_qwaq_gcd_obj) -lcsqc -lr
+	$(V_QFCCLD)$(QLINK) -o $@ $(ruamoko_qwaq_gcd_obj) -lcsqc -lr
 include $(ruamoko_qwaq_gcd_dep) # am--include-marker
 r_depfiles_remade += $(ruamoko_qwaq_gcd_dep)
 
diff --git a/ruamoko/scheme/Makemodule.am b/ruamoko/scheme/Makemodule.am
index b3fcfb5d9..8c1d43622 100644
--- a/ruamoko/scheme/Makemodule.am
+++ b/ruamoko/scheme/Makemodule.am
@@ -45,7 +45,7 @@ ruamoko_scheme_main_dat_SOURCES=$(ruamoko_scheme_src)
 ruamoko_scheme_main_obj=$(ruamoko_scheme_main_dat_SOURCES:.r=.o)
 ruamoko_scheme_main_dep=$(call qcautodep,$(ruamoko_scheme_main_dat_SOURCES))
 ruamoko/scheme/main.dat$(EXEEXT): $(ruamoko_scheme_main_obj) $(QFCC_DEP) ruamoko/scheme/libscheme.a ruamoko/lib/libcsqc.a ruamoko/lib/libr.a
-	$(QLINK) -o $@ $(ruamoko_scheme_main_obj) -Lruamoko/scheme -lscheme -lcsqc -lr
+	$(V_QFCCLD)$(QLINK) -o $@ $(ruamoko_scheme_main_obj) -Lruamoko/scheme -lscheme -lcsqc -lr
 include $(ruamoko_scheme_main_dep) # am--include-marker
 r_depfiles_remade += $(ruamoko_scheme_main_dep)
 
diff --git a/tools/qfcc/test/Makemodule.am b/tools/qfcc/test/Makemodule.am
index 85f94b800..3eb33892b 100644
--- a/tools/qfcc/test/Makemodule.am
+++ b/tools/qfcc/test/Makemodule.am
@@ -102,7 +102,7 @@ tools_qfcc_test_address_cast_dat_SOURCES=tools/qfcc/test/address-cast.r
 address_cast_obj=$(tools_qfcc_test_address_cast_dat_SOURCES:.r=.o)
 address_cast_dep=$(call qcautodep,$(tools_qfcc_test_address_cast_dat_SOURCES))
 tools/qfcc/test/address-cast.dat$(EXEEXT): $(address_cast_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(address_cast_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(address_cast_obj)
 tools/qfcc/test/address-cast.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(address_cast_dep) # am--include-marker
@@ -112,7 +112,7 @@ tools_qfcc_test_alignment_dat_SOURCES=tools/qfcc/test/alignment.r
 alignment_obj=$(tools_qfcc_test_alignment_dat_SOURCES:.r=.o)
 alignment_dep=$(call qcautodep,$(tools_qfcc_test_alignment_dat_SOURCES))
 tools/qfcc/test/alignment.dat$(EXEEXT): $(alignment_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(alignment_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(alignment_obj)
 tools/qfcc/test/alignment.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(alignment_dep) # am--include-marker
@@ -122,7 +122,7 @@ tools_qfcc_test_anonstruct_dat_SOURCES=tools/qfcc/test/anonstruct.r
 anonstruct_obj=$(tools_qfcc_test_anonstruct_dat_SOURCES:.r=.o)
 anonstruct_dep=$(call qcautodep,$(tools_qfcc_test_anonstruct_dat_SOURCES))
 tools/qfcc/test/anonstruct.dat$(EXEEXT): $(anonstruct_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(anonstruct_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(anonstruct_obj)
 tools/qfcc/test/anonstruct.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(anonstruct_dep) # am--include-marker
@@ -132,7 +132,7 @@ tools_qfcc_test_assignchain_dat_SOURCES=tools/qfcc/test/assignchain.r
 assignchain_obj=$(tools_qfcc_test_assignchain_dat_SOURCES:.r=.o)
 assignchain_dep=$(call qcautodep,$(tools_qfcc_test_assignchain_dat_SOURCES))
 tools/qfcc/test/assignchain.dat$(EXEEXT): $(assignchain_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(assignchain_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(assignchain_obj)
 tools/qfcc/test/assignchain.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(assignchain_dep) # am--include-marker
@@ -142,7 +142,7 @@ tools_qfcc_test_chewed_alias_dat_SOURCES=tools/qfcc/test/chewed-alias.r
 chewed_alias_obj=$(tools_qfcc_test_chewed_alias_dat_SOURCES:.r=.o)
 chewed_alias_dep=$(call qcautodep,$(tools_qfcc_test_chewed_alias_dat_SOURCES))
 tools/qfcc/test/chewed-alias.dat$(EXEEXT): $(chewed_alias_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(chewed_alias_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(chewed_alias_obj)
 tools/qfcc/test/chewed-alias.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(chewed_alias_dep) # am--include-marker
@@ -152,7 +152,7 @@ tools_qfcc_test_chewed_return_dat_SOURCES=tools/qfcc/test/chewed-return.r
 chewed_return_obj=$(tools_qfcc_test_chewed_return_dat_SOURCES:.r=.o)
 chewed_return_dep=$(call qcautodep,$(tools_qfcc_test_chewed_return_dat_SOURCES))
 tools/qfcc/test/chewed-return.dat$(EXEEXT): $(chewed_return_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(chewed_return_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(chewed_return_obj)
 tools/qfcc/test/chewed-return.run: $(qfcc_test_run_deps)
 	@TEST_HARNESS_OPTS=--float $(top_srcdir)/tools/qfcc/test/build-run $@
 include $(chewed_return_dep) # am--include-marker
@@ -162,7 +162,7 @@ tools_qfcc_test_comma_expr_dat_SOURCES=tools/qfcc/test/comma-expr.r
 comma_expr_obj=$(tools_qfcc_test_comma_expr_dat_SOURCES:.r=.o)
 comma_expr_dep=$(call qcautodep,$(tools_qfcc_test_comma_expr_dat_SOURCES))
 tools/qfcc/test/comma-expr.dat$(EXEEXT): $(comma_expr_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(comma_expr_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(comma_expr_obj)
 tools/qfcc/test/comma-expr.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(comma_expr_dep) # am--include-marker
@@ -172,7 +172,7 @@ tools_qfcc_test_compound_dat_SOURCES=tools/qfcc/test/compound.r
 compound_obj=$(tools_qfcc_test_compound_dat_SOURCES:.r=.o)
 compound_dep=$(call qcautodep,$(tools_qfcc_test_compound_dat_SOURCES))
 tools/qfcc/test/compound.dat$(EXEEXT): $(compound_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(compound_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(compound_obj)
 tools/qfcc/test/compound.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(compound_dep) # am--include-marker
@@ -182,7 +182,7 @@ tools_qfcc_test_deadbool_dat_SOURCES=tools/qfcc/test/deadbool.r
 deadbool_obj=$(tools_qfcc_test_deadbool_dat_SOURCES:.r=.o)
 deadbool_dep=$(call qcautodep,$(tools_qfcc_test_deadbool_dat_SOURCES))
 tools/qfcc/test/deadbool.dat$(EXEEXT): $(deadbool_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(deadbool_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(deadbool_obj)
 tools/qfcc/test/deadbool.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(deadbool_dep) # am--include-marker
@@ -192,7 +192,7 @@ tools_qfcc_test_double_dat_SOURCES=tools/qfcc/test/double.r
 double_obj=$(tools_qfcc_test_double_dat_SOURCES:.r=.o)
 double_dep=$(call qcautodep,$(tools_qfcc_test_double_dat_SOURCES))
 tools/qfcc/test/double.dat$(EXEEXT): $(double_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(double_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(double_obj)
 tools/qfcc/test/double.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(double_dep) # am--include-marker
@@ -202,7 +202,7 @@ tools_qfcc_test_double_alias_dat_SOURCES=tools/qfcc/test/double-alias.r
 double_alias_obj=$(tools_qfcc_test_double_alias_dat_SOURCES:.r=.o)
 double_alias_dep=$(call qcautodep,$(tools_qfcc_test_double_alias_dat_SOURCES))
 tools/qfcc/test/double-alias.dat$(EXEEXT): $(double_alias_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(double_alias_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(double_alias_obj)
 tools/qfcc/test/double-alias.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(double_alias_dep) # am--include-marker
@@ -245,7 +245,7 @@ tools_qfcc_test_enum_dat_SOURCES=tools/qfcc/test/enum.r
 enum_obj=$(tools_qfcc_test_enum_dat_SOURCES:.r=.o)
 enum_dep=$(call qcautodep,$(tools_qfcc_test_enum_dat_SOURCES))
 tools/qfcc/test/enum.dat$(EXEEXT): $(enum_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(enum_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(enum_obj)
 tools/qfcc/test/enum.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(enum_dep) # am--include-marker
@@ -255,7 +255,7 @@ tools_qfcc_test_fordecl_dat_SOURCES=tools/qfcc/test/fordecl.r
 fordecl_obj=$(tools_qfcc_test_fordecl_dat_SOURCES:.r=.o)
 fordecl_dep=$(call qcautodep,$(tools_qfcc_test_fordecl_dat_SOURCES))
 tools/qfcc/test/fordecl.dat$(EXEEXT): $(fordecl_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(fordecl_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(fordecl_obj)
 tools/qfcc/test/fordecl.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(fordecl_dep) # am--include-marker
@@ -265,7 +265,7 @@ tools_qfcc_test_func_expr_dat_SOURCES=tools/qfcc/test/func-expr.r
 func_expr_obj=$(tools_qfcc_test_func_expr_dat_SOURCES:.r=.o)
 func_expr_dep=$(call qcautodep,$(tools_qfcc_test_func_expr_dat_SOURCES))
 tools/qfcc/test/func-expr.dat$(EXEEXT): $(func_expr_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(func_expr_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(func_expr_obj)
 tools/qfcc/test/func-expr.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(func_expr_dep) # am--include-marker
@@ -275,7 +275,7 @@ tools_qfcc_test_func_expr2_dat_SOURCES=tools/qfcc/test/func-expr2.r
 func_expr2_obj=$(tools_qfcc_test_func_expr2_dat_SOURCES:.r=.o)
 func_expr2_dep=$(call qcautodep,$(tools_qfcc_test_func_expr2_dat_SOURCES))
 tools/qfcc/test/func-expr2.dat$(EXEEXT): $(func_expr2_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(func_expr2_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(func_expr2_obj)
 tools/qfcc/test/func-expr2.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(func_expr2_dep) # am--include-marker
@@ -285,7 +285,7 @@ tools_qfcc_test_func_static_dat_SOURCES=tools/qfcc/test/func-static.r
 func_static_obj=$(tools_qfcc_test_func_static_dat_SOURCES:.r=.o)
 func_static_dep=$(call qcautodep,$(tools_qfcc_test_func_static_dat_SOURCES))
 tools/qfcc/test/func-static.dat$(EXEEXT): $(func_static_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(func_static_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(func_static_obj)
 tools/qfcc/test/func-static.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(func_static_dep) # am--include-marker
@@ -295,7 +295,7 @@ tools_qfcc_test_gcd_dat_SOURCES=tools/qfcc/test/gcd.pas
 gcd_obj=$(tools_qfcc_test_gcd_dat_SOURCES:.pas=.o)
 gcd_dep=$(call qcautodep,$(tools_qfcc_test_gcd_dat_SOURCES))
 tools/qfcc/test/gcd.dat$(EXEEXT): $(gcd_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(gcd_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(gcd_obj)
 tools/qfcc/test/gcd.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(gcd_dep) # am--include-marker
@@ -305,7 +305,7 @@ tools_qfcc_test_infloop_dat_SOURCES=tools/qfcc/test/infloop.r
 infloop_obj=$(tools_qfcc_test_infloop_dat_SOURCES:.r=.o)
 infloop_dep=$(call qcautodep,$(tools_qfcc_test_infloop_dat_SOURCES))
 tools/qfcc/test/infloop.dat$(EXEEXT): $(infloop_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(infloop_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(infloop_obj)
 tools/qfcc/test/infloop.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(infloop_dep) # am--include-marker
@@ -315,7 +315,7 @@ tools_qfcc_test_ivar_struct_return_dat_SOURCES=tools/qfcc/test/ivar-struct-retur
 ivar_struct_return_obj=$(tools_qfcc_test_ivar_struct_return_dat_SOURCES:.r=.o)
 ivar_struct_return_dep=$(call qcautodep,$(tools_qfcc_test_ivar_struct_return_dat_SOURCES))
 tools/qfcc/test/ivar-struct-return.dat$(EXEEXT): $(ivar_struct_return_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(ivar_struct_return_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(ivar_struct_return_obj)
 tools/qfcc/test/ivar-struct-return.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(ivar_struct_return_dep) # am--include-marker
@@ -325,7 +325,7 @@ tools_qfcc_test_methodparams_dat_SOURCES=tools/qfcc/test/methodparams.r
 methodparams_obj=$(tools_qfcc_test_methodparams_dat_SOURCES:.r=.o)
 methodparams_dep=$(call qcautodep,$(tools_qfcc_test_methodparams_dat_SOURCES))
 tools/qfcc/test/methodparams.dat$(EXEEXT): $(methodparams_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(methodparams_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(methodparams_obj)
 tools/qfcc/test/methodparams.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(methodparams_dep) # am--include-marker
@@ -335,7 +335,7 @@ tools_qfcc_test_modulo_dat_SOURCES=tools/qfcc/test/modulo.r
 modulo_obj=$(tools_qfcc_test_modulo_dat_SOURCES:.r=.o)
 modulo_dep=$(call qcautodep,$(tools_qfcc_test_modulo_dat_SOURCES))
 tools/qfcc/test/modulo.dat$(EXEEXT): $(modulo_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(modulo_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(modulo_obj)
 tools/qfcc/test/modulo.run: $(qfcc_test_run_deps)
 	@TEST_HARNESS_OPTS=--float $(top_srcdir)/tools/qfcc/test/build-run $@
 include $(modulo_dep) # am--include-marker
@@ -345,7 +345,7 @@ tools_qfcc_test_nilparamret_dat_SOURCES=tools/qfcc/test/nilparamret.r
 nilparamret_obj=$(tools_qfcc_test_nilparamret_dat_SOURCES:.r=.o)
 nilparamret_dep=$(call qcautodep,$(tools_qfcc_test_nilparamret_dat_SOURCES))
 tools/qfcc/test/nilparamret.dat$(EXEEXT): $(nilparamret_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(nilparamret_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(nilparamret_obj)
 tools/qfcc/test/nilparamret.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(nilparamret_dep) # am--include-marker
@@ -355,7 +355,7 @@ tools_qfcc_test_overload_dat_SOURCES=tools/qfcc/test/overload.r
 overload_obj=$(tools_qfcc_test_overload_dat_SOURCES:.r=.o)
 overload_dep=$(call qcautodep,$(tools_qfcc_test_overload_dat_SOURCES))
 tools/qfcc/test/overload.dat$(EXEEXT): $(overload_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(overload_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(overload_obj)
 tools/qfcc/test/overload.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(overload_dep) # am--include-marker
@@ -365,7 +365,7 @@ tools_qfcc_test_paramret_dat_SOURCES=tools/qfcc/test/paramret.r
 paramret_obj=$(tools_qfcc_test_paramret_dat_SOURCES:.r=.o)
 paramret_dep=$(call qcautodep,$(tools_qfcc_test_paramret_dat_SOURCES))
 tools/qfcc/test/paramret.dat$(EXEEXT): $(paramret_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(paramret_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(paramret_obj)
 tools/qfcc/test/paramret.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(paramret_dep) # am--include-marker
@@ -375,7 +375,7 @@ tools_qfcc_test_quaternion_dat_SOURCES=tools/qfcc/test/quaternion.r
 quaternion_obj=$(tools_qfcc_test_quaternion_dat_SOURCES:.r=.o)
 quaternion_dep=$(call qcautodep,$(tools_qfcc_test_quaternion_dat_SOURCES))
 tools/qfcc/test/quaternion.dat$(EXEEXT): $(quaternion_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(quaternion_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(quaternion_obj)
 tools/qfcc/test/quaternion.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(quaternion_dep) # am--include-marker
@@ -385,7 +385,7 @@ tools_qfcc_test_return_ivar_dat_SOURCES=tools/qfcc/test/return-ivar.r
 return_ivar_obj=$(tools_qfcc_test_return_ivar_dat_SOURCES:.r=.o)
 return_ivar_dep=$(call qcautodep,$(tools_qfcc_test_return_ivar_dat_SOURCES))
 tools/qfcc/test/return-ivar.dat$(EXEEXT): $(return_ivar_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(return_ivar_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(return_ivar_obj)
 tools/qfcc/test/return-ivar.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(return_ivar_dep) # am--include-marker
@@ -395,7 +395,7 @@ tools_qfcc_test_sendv_dat_SOURCES=tools/qfcc/test/sendv.r
 sendv_obj=$(tools_qfcc_test_sendv_dat_SOURCES:.r=.o)
 sendv_dep=$(call qcautodep,$(tools_qfcc_test_sendv_dat_SOURCES))
 tools/qfcc/test/sendv.dat$(EXEEXT): $(sendv_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(sendv_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(sendv_obj)
 tools/qfcc/test/sendv.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(sendv_dep) # am--include-marker
@@ -405,7 +405,7 @@ tools_qfcc_test_state_dat_SOURCES=tools/qfcc/test/state.r
 state_obj=$(tools_qfcc_test_state_dat_SOURCES:.r=.o)
 state_dep=$(call qcautodep,$(tools_qfcc_test_state_dat_SOURCES))
 tools/qfcc/test/state.dat$(EXEEXT): $(state_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(state_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(state_obj)
 tools/qfcc/test/state.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(state_dep) # am--include-marker
@@ -415,7 +415,7 @@ tools_qfcc_test_struct_init_param_dat_SOURCES=tools/qfcc/test/struct-init-param.
 struct_init_param_obj=$(tools_qfcc_test_struct_init_param_dat_SOURCES:.r=.o)
 struct_init_param_dep=$(call qcautodep,$(tools_qfcc_test_struct_init_param_dat_SOURCES))
 tools/qfcc/test/struct-init-param.dat$(EXEEXT): $(struct_init_param_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(struct_init_param_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(struct_init_param_obj)
 tools/qfcc/test/struct-init-param.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(struct_init_param_dep) # am--include-marker
@@ -425,7 +425,7 @@ tools_qfcc_test_struct_nil_init_dat_SOURCES=tools/qfcc/test/struct-nil-init.r
 struct_nil_init_obj=$(tools_qfcc_test_struct_nil_init_dat_SOURCES:.r=.o)
 struct_nil_init_dep=$(call qcautodep,$(tools_qfcc_test_struct_nil_init_dat_SOURCES))
 tools/qfcc/test/struct-nil-init.dat$(EXEEXT): $(struct_nil_init_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(struct_nil_init_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(struct_nil_init_obj)
 tools/qfcc/test/struct-nil-init.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(struct_nil_init_dep) # am--include-marker
@@ -435,7 +435,7 @@ tools_qfcc_test_structarray_dat_SOURCES=tools/qfcc/test/structarray.r
 structarray_obj=$(tools_qfcc_test_structarray_dat_SOURCES:.r=.o)
 structarray_dep=$(call qcautodep,$(tools_qfcc_test_structarray_dat_SOURCES))
 tools/qfcc/test/structarray.dat$(EXEEXT): $(structarray_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(structarray_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(structarray_obj)
 tools/qfcc/test/structarray.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(structarray_dep) # am--include-marker
@@ -445,7 +445,7 @@ tools_qfcc_test_structlive_dat_SOURCES=tools/qfcc/test/structlive.r
 structlive_obj=$(tools_qfcc_test_structlive_dat_SOURCES:.r=.o)
 structlive_dep=$(call qcautodep,$(tools_qfcc_test_structlive_dat_SOURCES))
 tools/qfcc/test/structlive.dat$(EXEEXT): $(structlive_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(structlive_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(structlive_obj)
 tools/qfcc/test/structlive.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(structlive_dep) # am--include-marker
@@ -455,7 +455,7 @@ tools_qfcc_test_structptr_dat_SOURCES=tools/qfcc/test/structptr.r
 structptr_obj=$(tools_qfcc_test_structptr_dat_SOURCES:.r=.o)
 structptr_dep=$(call qcautodep,$(tools_qfcc_test_structptr_dat_SOURCES))
 tools/qfcc/test/structptr.dat$(EXEEXT): $(structptr_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(structptr_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(structptr_obj)
 tools/qfcc/test/structptr.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(structptr_dep) # am--include-marker
@@ -465,7 +465,7 @@ tools_qfcc_test_structstruct_dat_SOURCES=tools/qfcc/test/structstruct.r
 structstruct_obj=$(tools_qfcc_test_structstruct_dat_SOURCES:.r=.o)
 structstruct_dep=$(call qcautodep,$(tools_qfcc_test_structstruct_dat_SOURCES))
 tools/qfcc/test/structstruct.dat$(EXEEXT): $(structstruct_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(structstruct_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(structstruct_obj)
 tools/qfcc/test/structstruct.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(structstruct_dep) # am--include-marker
@@ -475,7 +475,7 @@ tools_qfcc_test_swap_dat_SOURCES=tools/qfcc/test/swap.r
 swap_obj=$(tools_qfcc_test_swap_dat_SOURCES:.r=.o)
 swap_dep=$(call qcautodep,$(tools_qfcc_test_swap_dat_SOURCES))
 tools/qfcc/test/swap.dat$(EXEEXT): $(swap_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(swap_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(swap_obj)
 tools/qfcc/test/swap.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(swap_dep) # am--include-marker
@@ -485,7 +485,7 @@ tools_qfcc_test_triangle_dat_SOURCES=tools/qfcc/test/triangle.r
 triangle_obj=$(tools_qfcc_test_triangle_dat_SOURCES:.r=.o)
 triangle_dep=$(call qcautodep,$(tools_qfcc_test_triangle_dat_SOURCES))
 tools/qfcc/test/triangle.dat$(EXEEXT): $(triangle_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(triangle_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(triangle_obj)
 tools/qfcc/test/triangle.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@ 100000 100000 1.00005 50002.4961
 include $(triangle_dep) # am--include-marker
@@ -495,7 +495,7 @@ tools_qfcc_test_typedef_dat_SOURCES=tools/qfcc/test/typedef.r
 typedef_obj=$(tools_qfcc_test_typedef_dat_SOURCES:.r=.o)
 typedef_dep=$(call qcautodep,$(tools_qfcc_test_typedef_dat_SOURCES))
 tools/qfcc/test/typedef.dat$(EXEEXT): $(typedef_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(typedef_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(typedef_obj)
 tools/qfcc/test/typedef.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(typedef_dep) # am--include-marker
@@ -505,7 +505,7 @@ tools_qfcc_test_typelinker_dat_SOURCES=tools/qfcc/test/typelinker_a.r tools/qfcc
 typelinker_obj=$(tools_qfcc_test_typelinker_dat_SOURCES:.r=.o)
 typelinker_dep=$(call qcautodep,$(tools_qfcc_test_typelinker_dat_SOURCES))
 tools/qfcc/test/typelinker.dat$(EXEEXT): $(typelinker_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(typelinker_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(typelinker_obj)
 tools/qfcc/test/typelinker.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(typelinker_dep) # am--include-marker
@@ -515,7 +515,7 @@ tools_qfcc_test_unaryminus_dat_SOURCES=tools/qfcc/test/unaryminus.r
 unaryminus_obj=$(tools_qfcc_test_unaryminus_dat_SOURCES:.r=.o)
 unaryminus_dep=$(call qcautodep,$(tools_qfcc_test_unaryminus_dat_SOURCES))
 tools/qfcc/test/unaryminus.dat$(EXEEXT): $(unaryminus_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(unaryminus_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(unaryminus_obj)
 tools/qfcc/test/unaryminus.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(unaryminus_dep) # am--include-marker
@@ -525,7 +525,7 @@ tools_qfcc_test_vecaddr_dat_SOURCES=tools/qfcc/test/vecaddr.r
 vecaddr_obj=$(tools_qfcc_test_vecaddr_dat_SOURCES:.r=.o)
 vecaddr_dep=$(call qcautodep,$(tools_qfcc_test_vecaddr_dat_SOURCES))
 tools/qfcc/test/vecaddr.dat$(EXEEXT): $(vecaddr_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(vecaddr_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(vecaddr_obj)
 tools/qfcc/test/vecaddr.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(vecaddr_dep) # am--include-marker
@@ -535,7 +535,7 @@ tools_qfcc_test_vecexpr_dat_SOURCES=tools/qfcc/test/vecexpr.r
 vecexpr_obj=$(tools_qfcc_test_vecexpr_dat_SOURCES:.r=.o)
 vecexpr_dep=$(call qcautodep,$(tools_qfcc_test_vecexpr_dat_SOURCES))
 tools/qfcc/test/vecexpr.dat$(EXEEXT): $(vecexpr_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(vecexpr_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(vecexpr_obj)
 tools/qfcc/test/vecexpr.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(vecexpr_dep) # am--include-marker
@@ -545,7 +545,7 @@ tools_qfcc_test_vecinit_dat_SOURCES=tools/qfcc/test/vecinit.r
 vecinit_obj=$(tools_qfcc_test_vecinit_dat_SOURCES:.r=.o)
 vecinit_dep=$(call qcautodep,$(tools_qfcc_test_vecinit_dat_SOURCES))
 tools/qfcc/test/vecinit.dat$(EXEEXT): $(vecinit_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(vecinit_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(vecinit_obj)
 tools/qfcc/test/vecinit.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(vecinit_dep) # am--include-marker
@@ -555,7 +555,7 @@ tools_qfcc_test_voidfor_dat_SOURCES=tools/qfcc/test/voidfor.r
 voidfor_obj=$(tools_qfcc_test_voidfor_dat_SOURCES:.r=.o)
 voidfor_dep=$(call qcautodep,$(tools_qfcc_test_voidfor_dat_SOURCES))
 tools/qfcc/test/voidfor.dat$(EXEEXT): $(voidfor_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(voidfor_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(voidfor_obj)
 tools/qfcc/test/voidfor.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(voidfor_dep) # am--include-marker
@@ -565,7 +565,7 @@ tools_qfcc_test_while_dat_SOURCES=tools/qfcc/test/while.r
 while_obj=$(tools_qfcc_test_while_dat_SOURCES:.r=.o)
 while_dep=$(call qcautodep,$(tools_qfcc_test_while_dat_SOURCES))
 tools/qfcc/test/while.dat$(EXEEXT): $(while_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(while_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(while_obj)
 tools/qfcc/test/while.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(while_dep) # am--include-marker
@@ -575,7 +575,7 @@ tools_qfcc_test_zerolinker_dat_SOURCES=tools/qfcc/test/zerolinker.r
 zerolinker_obj=$(tools_qfcc_test_zerolinker_dat_SOURCES:.r=.o)
 zerolinker_dep=$(call qcautodep,$(tools_qfcc_test_zerolinker_dat_SOURCES))
 tools/qfcc/test/zerolinker.dat$(EXEEXT): $(zerolinker_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(zerolinker_obj)
+	$(V_QFCCLD)$(QLINK) -o $@ $(zerolinker_obj)
 tools/qfcc/test/zerolinker.run: $(qfcc_test_run_deps)
 	@$(top_srcdir)/tools/qfcc/test/build-run $@
 include $(zerolinker_dep) # am--include-marker

From 9347e4f9019c9ad69584a62f14c9fa4cefec293c Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 28 Jun 2020 18:30:01 +0900
Subject: [PATCH 1161/1519] [qwaq] Fix incorrect setting of progs argc/argv

---
 ruamoko/qwaq/builtins/main.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ruamoko/qwaq/builtins/main.c b/ruamoko/qwaq/builtins/main.c
index da3607c01..931d33337 100644
--- a/ruamoko/qwaq/builtins/main.c
+++ b/ruamoko/qwaq/builtins/main.c
@@ -223,13 +223,13 @@ spawn_progs (qwaq_thread_t *thread)
 	}
 
 	PR_PushFrame (pr);
-	if (thread->args.size > 2) {
-		pr_argc = thread->args.size - 1;
+	if (thread->args.size) {
+		pr_argc = thread->args.size;
 	}
 	pr_argv = PR_Zone_Malloc (pr, (pr_argc + 1) * 4);
 	pr_argv[0] = PR_SetTempString (pr, name);
 	for (i = 1; i < pr_argc; i++)
-		pr_argv[i] = PR_SetTempString (pr, thread->args.a[1 + i]);
+		pr_argv[i] = PR_SetTempString (pr, thread->args.a[i]);
 	pr_argv[i] = 0;
 
 	PR_RESET_PARAMS (pr);

From d90d409d2c8dfa017b978f3dfef6b3f698dd723b Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 28 Jun 2020 18:48:38 +0900
Subject: [PATCH 1162/1519] [ruamoko] Handle 0-length @va_list for va_copy

Fixes a progs crash when using vsprintf with no format elements +
params.
---
 libs/ruamoko/rua_runtime.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/libs/ruamoko/rua_runtime.c b/libs/ruamoko/rua_runtime.c
index 697fc720b..24a8a894d 100644
--- a/libs/ruamoko/rua_runtime.c
+++ b/libs/ruamoko/rua_runtime.c
@@ -56,8 +56,13 @@ bi_va_copy (progs_t *pr)
 	__auto_type src_list = &G_STRUCT (pr, pr_type_t, src_args->list);
 	size_t      parm_size = pr->pr_param_size * sizeof(pr_type_t);
 	size_t      size = src_args->count * parm_size;
-	string_t    dst_list_block = PR_AllocTempBlock (pr, size);
-	__auto_type dst_list = (pr_type_t *) PR_GetString (pr, dst_list_block);
+	string_t    dst_list_block = 0;
+	pr_type_t  *dst_list = 0;
+
+	if (size) {
+		dst_list_block = PR_AllocTempBlock (pr, size);
+		dst_list = (pr_type_t *) PR_GetString (pr, dst_list_block);
+	}
 
 	memcpy (dst_list, src_list, size);
 	R_PACKED (pr, pr_va_list_t).count = src_args->count;

From c3ecd9c16dcfd99f0aa1d27923da5a5d5836bb54 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 28 Jun 2020 23:32:38 +0900
Subject: [PATCH 1163/1519] [build] Put that ar warning to rest

---
 Makefile.am | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile.am b/Makefile.am
index 54ca7be00..71e429956 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -44,6 +44,7 @@ noinst_HEADERS =
 plugin_LTLIBRARIES =
 
 RANLIB=touch
+ARFLAGS=cr
 
 EXTRA_HEADERS =
 EXTRA_LTLIBRARIES =

From f6ea9e4d872b1585e2c1a1864caa3a9618755d79 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 1 Jul 2020 21:47:09 +0900
Subject: [PATCH 1164/1519] [util] Store source line in plist items

The first line of the parsed item is stored and can be retrieved using
PL_Line. Line numbers not stored for dictionary keys yet. Will be 0 for
any items generated by code rather than parsed from a file or string.
---
 include/QF/qfplist.h |  8 ++++++++
 libs/util/qfplist.c  | 24 +++++++++++++++++++-----
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/include/QF/qfplist.h b/include/QF/qfplist.h
index 7a12b7c4c..a7c73ec44 100644
--- a/include/QF/qfplist.h
+++ b/include/QF/qfplist.h
@@ -77,6 +77,14 @@ char *PL_WritePropertyList (plitem_t *pl);
 */
 pltype_t PL_Type (plitem_t *item) __attribute__((pure));
 
+/** Retrieve the line number of an object.
+
+	\param item The object
+	\return the line number on which the object began, or 0 if not from a
+			string
+*/
+int PL_Line (plitem_t *item) __attribute__((pure));
+
 /** Retrieve a string from a string object.
 
 	\param string The string object
diff --git a/libs/util/qfplist.c b/libs/util/qfplist.c
index 0bda96e59..04dd32055 100644
--- a/libs/util/qfplist.c
+++ b/libs/util/qfplist.c
@@ -49,6 +49,7 @@
 */
 struct plitem_s {
 	pltype_t	type;
+	int         line;
 	void		*data;
 };
 
@@ -176,17 +177,18 @@ PL_NewData (void *data, size_t size)
 }
 
 static plitem_t *
-new_string (char *str)
+new_string (char *str, int line)
 {
 	plitem_t   *item = PL_NewItem (QFString);
 	item->data = str;
+	item->line = line;
 	return item;
 }
 
 VISIBLE plitem_t *
 PL_NewString (const char *str)
 {
-	return new_string (strdup (str));
+	return new_string (strdup (str), 0);
 }
 
 VISIBLE void
@@ -688,6 +690,7 @@ PL_ParsePropertyListItem (pldata_t *pl)
 	case '{':
 	{
 		item = PL_NewDictionary ();
+		item->line = pl->line;
 
 		pl->pos++;
 
@@ -767,6 +770,7 @@ PL_ParsePropertyListItem (pldata_t *pl)
 
 	case '(': {
 		item = PL_NewArray ();
+		item->line = pl->line;
 
 		pl->pos++;
 
@@ -812,27 +816,31 @@ PL_ParsePropertyListItem (pldata_t *pl)
 		if (!str) {
 			return NULL;
 		} else {
-			return PL_NewData (str, len);
+			item = PL_NewData (str, len);
+			item->line = pl->line;
+			return item;
 		}
 	}
 
 	case '"': {
+		int line = pl->line;
 		char *str = PL_ParseQuotedString (pl);
 
 		if (!str) {
 			return NULL;
 		} else {
-			return new_string (str);
+			return new_string (str, line);
 		}
 	}
 
 	default: {
+		int line = pl->line;
 		char *str = PL_ParseUnquotedString (pl);
 
 		if (!str) {
 			return NULL;
 		} else {
-			return new_string (str);
+			return new_string (str, line);
 		}
 	}
 	} // switch
@@ -1038,3 +1046,9 @@ PL_Type (plitem_t *item)
 {
 	return item->type;
 }
+
+VISIBLE int
+PL_Line (plitem_t *item)
+{
+	return item->line;
+}

From 9785b944337cdba2707c2827b556e715812cef2e Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 2 Jul 2020 19:51:47 +0900
Subject: [PATCH 1165/1519] [qwaq] Fix a typo

---
 ruamoko/qwaq/builtins/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ruamoko/qwaq/builtins/main.c b/ruamoko/qwaq/builtins/main.c
index 931d33337..c4c426166 100644
--- a/ruamoko/qwaq/builtins/main.c
+++ b/ruamoko/qwaq/builtins/main.c
@@ -244,7 +244,7 @@ run_progs (void *data)
 	__auto_type thread = (qwaq_thread_t *) data;
 
 	spawn_progs (thread);
-	Sys_Printf ("starthing thread for %s\n", thread->args.a[0]);
+	Sys_Printf ("starting thread for %s\n", thread->args.a[0]);
 
 	PR_ExecuteProgram (thread->pr, thread->main_func);
 	PR_PopFrame (thread->pr);

From 8bd5f4f201206bf64b03a757963fd8b5a5263a62 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 2 Jul 2020 14:20:46 +0900
Subject: [PATCH 1166/1519] [util] Add code to parse a dictionary to a struct

PL_ParseDictionary itself does only one level, but it takes care of the
key-field mappings and property list item type checking leaving the
actual parsing to a helper specified by the field. That helper is free
to call PL_ParseDictionary recursively.
---
 include/QF/qfplist.h |  83 ++++++++++++++++++++++++++++
 libs/util/qfplist.c  | 125 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 208 insertions(+)

diff --git a/include/QF/qfplist.h b/include/QF/qfplist.h
index a7c73ec44..5d719b840 100644
--- a/include/QF/qfplist.h
+++ b/include/QF/qfplist.h
@@ -53,6 +53,52 @@ typedef enum {
 */
 typedef struct plitem_s plitem_t;
 
+struct plfield_s;
+/** Custom parser for the field.
+
+	With this, custom parsing of any property list object type is
+	supported. For example, parsing of strings into numeric values,
+	converting binary objects to images, and deeper parsing of array and
+	dictionary objects.
+
+	If null, then the default parser for the object type is used:
+	  * QFString: the  point to the actual string. The string continues
+		to be owned by the string object.
+	  * QFBinary: pointer to fixed-size DARRAY_TYPE(byte) (so size isn't
+		lost)
+	  * QFArray: pointer to fixed-size DARRAY_TYPE(plitem_t *) with the
+		indivisual objects. The individual objects continue to be owned
+		by the array object.
+	  * QFDictionary: pointer to the hashtab_t hash table used for the
+		dictionary object. The hash table continues to be owned by the
+		dictionary object.
+
+	\param field	Pointer to this field item.
+	\param item		The property list item being parsed into the field.
+	\param data		Pointer to the field in the structure being parsed.
+	\param messages	An array object the parser can use to store any
+					error messages. Messages should be strings, but no
+					checking is done: it is up to the top-level caller to
+					parse out the messages.
+	\return			0 for error, 1 for success. See \a PL_ParseDictionary.
+*/
+typedef int (*plparser_t) (const struct plfield_s *field,
+						   const struct plitem_s *item,
+						   void *data,
+						   struct plitem_s *messages);
+
+/** A field to be parsed from a dictionary item.
+
+	something
+*/
+typedef struct plfield_s {
+	const char *name;		///< matched by dictionary key
+	size_t      offset;		///< the offset of the field within the structure
+	pltype_t    type;		///< the required type of the dictionary object
+	plparser_t  parser;		///< custom parser function
+	void       *data;		///< additional data for \a parser
+} plfield_t;
+
 /** Create an in-memory representation of the contents of a property list.
 
 	\param string	the saved plist, as read from a file.
@@ -234,6 +280,43 @@ plitem_t *PL_NewString (const char *str);
 */
 void PL_Free (plitem_t *item);
 
+/**	Parse a dictionary object into a structure.
+
+	For each key in the dictionary, the corresponding field item is used to
+	determine how to parse the object associated with that key. Duplicate
+	field items are ignored: only the first item is used, and no checking is
+	done. Fields for which there is no key in the dictionary are also ignored,
+	and the destination is left unmodified. However, keys that have no
+	corresponding field are treated as errors and a suitable message is added
+	to the \a messages object.
+
+	When an error occurs (unknown key, incorrect item type (item type does not
+	match the type specified in the field item) or the field item's \a parser
+	returns 0), processing continues but the error result is returned.
+
+	Can be used recursively to parse deep hierarchies.
+
+	\param dict		The dictionary object to parse
+	\param fields	Array of field items describing the structure. Terminated
+					by a field item with a null \a name pointer.
+	\param data     Pointer to the structure into which the data will be
+					parsed.
+	\param messages Array object supplied by the caller used for storing
+					messages. The messages may or may not indicate errors (its
+					contents are not checked). This function itself will add
+					only string objects.
+					If there are any errors, suitable messages will be found in
+					the \a messages object. However, just because there are no
+					errors doesn't mean that \a messages will remain empty as
+					a field's \a parser may add other messages. The standard
+					message format is "[line number]: [message]". If the line
+					number is 0, then the actual line is unknown (due to the
+					source item not being parsed from a file or string).
+	\return			0 if there are any errors, 1 if there are no errors.
+*/
+int PL_ParseDictionary (const plfield_t *fields, const plitem_t *dict,
+						void *data, plitem_t *messages);
+
 ///@}
 
 #endif//__QF_qfplist_h
diff --git a/libs/util/qfplist.c b/libs/util/qfplist.c
index 04dd32055..35f136374 100644
--- a/libs/util/qfplist.c
+++ b/libs/util/qfplist.c
@@ -38,11 +38,13 @@
 
 #include "qfalloca.h"
 
+#include "QF/darray.h"
 #include "QF/dstring.h"
 #include "QF/hash.h"
 #include "QF/qfplist.h"
 #include "QF/qtypes.h"
 #include "QF/sys.h"
+#include "QF/va.h"
 
 /*
 	Generic property list item.
@@ -97,6 +99,13 @@ typedef struct pldata_s {	// Unparsed property list string
 							 : 10 + (inrange((ch), 'a', 'f') ? ((ch) - 'a') \
 															 : ((ch) - 'A')))
 
+static const char *pl_types[] = {
+	"dictionary",
+	"array",
+	"biinary",
+	"string",
+};
+
 static byte quotable_bitmap[32];
 static inline int
 is_quotable (byte x)
@@ -1052,3 +1061,119 @@ PL_Line (plitem_t *item)
 {
 	return item->line;
 }
+
+static void __attribute__((format(printf,3,4)))
+pl_message (plitem_t *messages, const plitem_t *item, const char *fmt, ...)
+{
+	va_list     args;
+	dstring_t  *string;
+
+	string = dstring_new ();
+
+	va_start (args, fmt);
+	dvsprintf (string, fmt, args);
+	va_end (args);
+
+	if (item) {
+		PL_A_AddObject (messages,
+						PL_NewString (va ("%d: %s", item->line, string->str)));
+	} else {
+		PL_A_AddObject (messages,
+						PL_NewString (va ("internal: %s", string->str)));
+	}
+	dstring_delete (string);
+}
+
+static int
+pl_default_parser (const plfield_t *field, const plitem_t *item, void *data,
+				   plitem_t *messages)
+{
+	switch (field->type) {
+		case QFDictionary:
+			{
+				*(hashtab_t **)data = (hashtab_t *)item->data;
+			}
+			return 1;
+		case QFArray:
+			{
+				plarray_t  *array = (plarray_t *)item->data;
+				typedef struct DARRAY_TYPE (plitem_t *) arraydata_t;
+				arraydata_t *arraydata = DARRAY_ALLOCFIXED(arraydata_t,
+														   array->numvals,
+														   malloc);
+				memcpy (arraydata->a, array->values,
+						array->numvals * sizeof (arraydata->a[0]));
+			}
+			return 1;
+		case QFBinary:
+			{
+				plbinary_t *binary = (plbinary_t *)item->data;
+				typedef struct DARRAY_TYPE (byte) bindata_t;
+				bindata_t  *bindata = DARRAY_ALLOCFIXED(bindata_t,
+														binary->size, malloc);
+				memcpy (bindata->a, binary->data, binary->size);
+				*(bindata_t **)data = bindata;
+			}
+			return 1;
+		case QFString:
+			*(char **)data = (char *)item->data;
+			return 1;
+	}
+	pl_message (messages, 0, "invalid item type: %d", field->type);
+	return 0;
+}
+
+VISIBLE int
+PL_ParseDictionary (const plfield_t *fields, const plitem_t *dict, void *data,
+					plitem_t *messages)
+{
+	void      **list, **l;
+	dictkey_t  *current;
+	int         result;
+	int        (*parser) (const plfield_t *, const plitem_t *, void *,
+						  plitem_t *);
+
+	if (dict->type != QFDictionary) {
+		pl_message (messages, dict, "error: not a dictionary object");
+		return 0;
+	}
+
+	if (!(l = list = Hash_GetList ((hashtab_t *) dict->data))) {
+		// empty struct: leave as default
+		return 1;
+	}
+
+	while ((current = (dictkey_t *) *l++)) {
+		const plfield_t *f;
+		for (f = fields; f->name; f++) {
+			if (strcmp (f->name, current->key) == 0) {
+				plitem_t   *item = current->value;
+				void       *flddata = (byte *)data + f->offset;
+
+				if (f->parser) {
+					parser = f->parser;
+				} else {
+					parser = pl_default_parser;
+				}
+				if (item->type != f->type) {
+					pl_message (messages, item, "error: %s is the wrong type"
+								" Got %s, expected %s",current->key,
+								pl_types[f->type],
+								pl_types[item->type]);
+					result = 0;
+				} else {
+					if (!parser (f, item, flddata, messages)) {
+						result = 0;
+					}
+				}
+			}
+		}
+		if (!f->name) {
+			pl_message (messages, dict, "error: unknown field %s",
+						current->key);
+			result = 0;
+		}
+	}
+	free (list);
+	return result;
+}

From 2ca9f80d56cce3aed3fa89d1f0a9ed919d5b6028 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 2 Jul 2020 14:24:39 +0900
Subject: [PATCH 1167/1519] [vulkan] Split up vkgen

It worked as a proof of concept, but as the code itself needs to be a
bit smarter, it would be a lot smarter to break up that code to make it
easier to work on the individual parts.
---
 .../video/renderer/vulkan/vkgen/Makemodule.am |   9 +-
 libs/video/renderer/vulkan/vkgen/vkenum.h     |  13 ++
 libs/video/renderer/vulkan/vkgen/vkenum.r     |  75 ++++++++
 libs/video/renderer/vulkan/vkgen/vkgen.h      |  18 ++
 libs/video/renderer/vulkan/vkgen/vkgen.r      | 162 +-----------------
 libs/video/renderer/vulkan/vkgen/vkstruct.h   |  16 ++
 libs/video/renderer/vulkan/vkgen/vkstruct.r   |  43 +++++
 libs/video/renderer/vulkan/vkgen/vktype.h     |  18 ++
 libs/video/renderer/vulkan/vkgen/vktype.r     |  33 ++++
 9 files changed, 228 insertions(+), 159 deletions(-)
 create mode 100644 libs/video/renderer/vulkan/vkgen/vkenum.h
 create mode 100644 libs/video/renderer/vulkan/vkgen/vkenum.r
 create mode 100644 libs/video/renderer/vulkan/vkgen/vkgen.h
 create mode 100644 libs/video/renderer/vulkan/vkgen/vkstruct.h
 create mode 100644 libs/video/renderer/vulkan/vkgen/vkstruct.r
 create mode 100644 libs/video/renderer/vulkan/vkgen/vktype.h
 create mode 100644 libs/video/renderer/vulkan/vkgen/vktype.r

diff --git a/libs/video/renderer/vulkan/vkgen/Makemodule.am b/libs/video/renderer/vulkan/vkgen/Makemodule.am
index 901dea622..5eb099c9c 100644
--- a/libs/video/renderer/vulkan/vkgen/Makemodule.am
+++ b/libs/video/renderer/vulkan/vkgen/Makemodule.am
@@ -2,7 +2,10 @@ vkgen = libs/video/renderer/vulkan/vkgen.dat$(EXEEXT)
 noinst_PROGRAMS += $(vkgen)
 
 vkgen_dat_src= \
+	libs/video/renderer/vulkan/vkgen/vkenum.r \
 	libs/video/renderer/vulkan/vkgen/vkgen.r \
+	libs/video/renderer/vulkan/vkgen/vkstruct.r \
+	libs/video/renderer/vulkan/vkgen/vktype.r \
 	libs/video/renderer/vulkan/vkgen/vulkan.r
 
 VKGENFLAGS = -I$(top_srcdir)/libs/video/renderer/vulkan/vkgen
@@ -29,6 +32,10 @@ libs/video/renderer/vulkan/vkgen/vulkan.o: $(top_srcdir)/libs/video/renderer/vul
 
 EXTRA_DIST += \
 	libs/video/renderer/vulkan/vkgen/stddef.h \
-	libs/video/renderer/vulkan/vkgen/stdint.h
+	libs/video/renderer/vulkan/vkgen/stdint.h \
+	libs/video/renderer/vulkan/vkgen/vkenum.h \
+	libs/video/renderer/vulkan/vkgen/vkgen.h \
+	libs/video/renderer/vulkan/vkgen/vkstruct.h \
+	libs/video/renderer/vulkan/vkgen/vktype.h \
 CLEANFILES += \
 	libs/video/renderer/vkgen/*.sym
diff --git a/libs/video/renderer/vulkan/vkgen/vkenum.h b/libs/video/renderer/vulkan/vkgen/vkenum.h
new file mode 100644
index 000000000..5deb7ff6f
--- /dev/null
+++ b/libs/video/renderer/vulkan/vkgen/vkenum.h
@@ -0,0 +1,13 @@
+#ifndef __renderer_vulkan_vkgen_vkenum_h
+#define __renderer_vulkan_vkgen_vkenum_h
+
+#include "vktype.h"
+
+@interface Enum: Type
+{
+	int          prefix_length;
+}
+-(void) writeTable;
+@end
+
+#endif//__renderer_vulkan_vkgen_vkenum_h
diff --git a/libs/video/renderer/vulkan/vkgen/vkenum.r b/libs/video/renderer/vulkan/vkgen/vkenum.r
new file mode 100644
index 000000000..898ef5c58
--- /dev/null
+++ b/libs/video/renderer/vulkan/vkgen/vkenum.r
@@ -0,0 +1,75 @@
+#include <string.h>
+
+#include "vkenum.h"
+#include "vkgen.h"
+
+@implementation Enum
+-(void)process
+{
+	string      end = "_MAX_ENUM";
+	int         len;
+	string      prefix = nil;
+
+	if (str_mid([self name], -8) == "FlagBits") {
+		end = "_FLAG_BITS_MAX_ENUM";
+	}
+	len = -strlen (end);
+	for (int i = 0; i < type.strct.num_fields; i++) {
+		qfot_var_t *var = &type.strct.fields[i];
+		if (str_mid (var.name, len) == end) {
+			// len is negative so +1 consumes 1 more char (_)
+			prefix = str_hold (str_mid (var.name, 0, len + 1));
+		}
+	}
+	if (prefix) {
+		prefix_length = strlen (prefix);
+	}
+}
+
+-initWithType: (qfot_type_t *) type
+{
+	if (!(self = [super initWithType: type])) {
+		return nil;
+	}
+	[self process];
+	return self;
+}
+
+-(string) name
+{
+	return str_mid(type.strct.tag, 4);
+}
+
+-(void) writeTable
+{
+	int         strip_bit = 0;
+	if (str_mid([self name], -8) == "FlagBits") {
+		strip_bit = 1;
+	}
+
+	fprintf (output_file, "enumval_t %s_values[] = {\n", [self name]);
+	for (int i = 0; i < type.strct.num_fields; i++) {
+		qfot_var_t *var = &type.strct.fields[i];
+		if (str_str (var.name, "_MAX_ENUM") >= 0
+			|| str_str (var.name, "_BEGIN_RANGE") >= 0
+			|| str_str (var.name, "_END_RANGE") >= 0
+			|| str_str (var.name, "_RANGE_SIZE") >= 0) {
+			continue;
+		}
+		fprintf (output_file, "\t{\"%s\", %d},\n", var.name, var.offset);
+		if (prefix_length) {
+			string      shortname = str_mid (var.name, prefix_length);
+			if (strip_bit) {
+				int bit_pos = str_str (shortname, "_BIT");
+				if (bit_pos >= 0) {
+					shortname = str_mid (shortname, 0, bit_pos);
+				}
+			}
+			fprintf (output_file, "\t{\"%s\", %d},\n", str_lower(shortname),
+					 var.offset);
+		}
+	}
+	fprintf (output_file, "\t{ }\n");
+	fprintf (output_file, "};\n");
+}
+@end
diff --git a/libs/video/renderer/vulkan/vkgen/vkgen.h b/libs/video/renderer/vulkan/vkgen/vkgen.h
new file mode 100644
index 000000000..3612a048f
--- /dev/null
+++ b/libs/video/renderer/vulkan/vkgen/vkgen.h
@@ -0,0 +1,18 @@
+#ifndef __renderer_vulkan_vkgen_vkgen_h
+#define __renderer_vulkan_vkgen_vkgen_h
+
+#include <hash.h>
+#include <qfile.h>
+#include <types.h>
+#include <Array.h>
+
+typedef void varfunc (qfot_var_t *var);
+
+void printf (string fmt, ...);
+void fprintf (QFile file, string format, ...);
+extern Array *queue;
+extern Array *output_types;
+extern QFile output_file;
+extern hashtab_t *processed_types;
+
+#endif//__renderer_vulkan_vkgen_vkgen_h
diff --git a/libs/video/renderer/vulkan/vkgen/vkgen.r b/libs/video/renderer/vulkan/vkgen/vkgen.r
index 1400d3fbc..7ef9f3ff6 100644
--- a/libs/video/renderer/vulkan/vkgen/vkgen.r
+++ b/libs/video/renderer/vulkan/vkgen/vkgen.r
@@ -5,6 +5,10 @@
 #include <types.h>
 #include <Array.h>
 
+#include "vkgen.h"
+#include "vkstruct.h"
+#include "vkenum.h"
+
 void printf (string fmt, ...) = #0;
 
 void fprintf (QFile file, string format, ...)
@@ -13,8 +17,6 @@ void fprintf (QFile file, string format, ...)
 	Qputs (file, vsprintf (format, va_copy (@args)));
 }
 
-typedef void varfunc (qfot_var_t *var);
-
 string search_names[] = {
 	"VkGraphicsPipelineCreateInfo",
 	"VkComputePipelineCreateInfo",
@@ -27,162 +29,6 @@ Array *output_types;
 
 QFile output_file;
 
-@interface Enum: Object
-{
-	qfot_type_t *type;
-	int          prefix_length;
-}
--initWithType: (qfot_type_t *) type;
-/**	\warning	returned string is ephemeral
-*/
--(string) name;
-@end
-
-@implementation Enum
--(void)process
-{
-	string      end = "_MAX_ENUM";
-	int         len;
-	string      prefix = nil;
-
-	if (str_mid([self name], -8) == "FlagBits") {
-		end = "_FLAG_BITS_MAX_ENUM";
-	}
-	len = -strlen (end);
-	for (int i = 0; i < type.strct.num_fields; i++) {
-		qfot_var_t *var = &type.strct.fields[i];
-		if (str_mid (var.name, len) == end) {
-			// len is negative so +1 consumes 1 more char (_)
-			prefix = str_hold (str_mid (var.name, 0, len + 1));
-		}
-	}
-	if (prefix) {
-		prefix_length = strlen (prefix);
-	}
-}
-
--initWithType: (qfot_type_t *) type
-{
-	if (!(self = [super init])) {
-		return nil;
-	}
-	self.type = type;
-	[self process];
-	return self;
-}
-
--(string) name
-{
-	return str_mid(type.strct.tag, 4);
-}
-
--(void) addToQueue
-{
-	string name = [self name];
-	//printf ("    +%s\n", name);
-	if (!Hash_Find (processed_types, name)) {
-		Hash_Add (processed_types, (void *) name);
-		[queue addObject: self];
-	}
-}
-
--(void) writeTable
-{
-	int         strip_bit = 0;
-	if (str_mid([self name], -8) == "FlagBits") {
-		strip_bit = 1;
-	}
-
-	fprintf (output_file, "enumval_t %s_values[] = {\n", [self name]);
-	for (int i = 0; i < type.strct.num_fields; i++) {
-		qfot_var_t *var = &type.strct.fields[i];
-		if (str_str (var.name, "_MAX_ENUM") >= 0
-			|| str_str (var.name, "_BEGIN_RANGE") >= 0
-			|| str_str (var.name, "_END_RANGE") >= 0
-			|| str_str (var.name, "_RANGE_SIZE") >= 0) {
-			continue;
-		}
-		fprintf (output_file, "\t{\"%s\", %d},\n", var.name, var.offset);
-		if (prefix_length) {
-			string      shortname = str_mid (var.name, prefix_length);
-			if (strip_bit) {
-				int bit_pos = str_str (shortname, "_BIT");
-				if (bit_pos >= 0) {
-					shortname = str_mid (shortname, 0, bit_pos);
-				}
-			}
-			fprintf (output_file, "\t{\"%s\", %d},\n", str_lower(shortname),
-					 var.offset);
-		}
-	}
-	fprintf (output_file, "\t{ }\n");
-	fprintf (output_file, "};\n");
-}
-@end
-
-@interface Struct: Object
-{
-	qfot_type_t *type;
-}
--initWithType: (qfot_type_t *) type;
-/**	\warning	returned string is ephemeral
-*/
--(string) name;
--(void) forEachFieldCall: (varfunc) func;
-@end
-
-@implementation Struct
--initWithType: (qfot_type_t *) type
-{
-	if (!(self = [super init])) {
-		return nil;
-	}
-	self.type = type;
-	return self;
-}
-
--(string) name
-{
-	return str_mid(type.strct.tag, 4);
-}
-
--(void) forEachFieldCall: (varfunc) func
-{
-	qfot_struct_t *strct =&type.strct;
-
-	for (int i = 0; i < strct.num_fields; i++) {
-		func (&strct.fields[i]);
-	}
-}
-
--(void) addToQueue
-{
-	string name = [self name];
-	//printf ("    +%s\n", name);
-	if (!Hash_Find (processed_types, name)) {
-		Hash_Add (processed_types, (void *) name);
-		[queue addObject: self];
-	}
-}
-
--(void) writeTable
-{
-	fprintf (output_file, "structfld_t %s_fields[] = {\n", [self name]);
-	for (int i = 0; i < type.strct.num_fields; i++) {
-		qfot_var_t *var = &type.strct.fields[i];
-		if (var.name == "sType" || var.name == "pNext") {
-			continue;
-		}
-		string type_name = var.type.encoding;
-		fprintf (output_file,
-				 "\t{\"%s\", field_offset (%s, %s), %s, %s}, // %s\n",
-				 var.name, [self name], var.name, "0", "0", type_name);
-	}
-	fprintf (output_file, "\t{ }\n");
-	fprintf (output_file, "};\n");
-}
-@end
-
 qfot_type_encodings_t *encodings;
 
 qfot_type_t *
diff --git a/libs/video/renderer/vulkan/vkgen/vkstruct.h b/libs/video/renderer/vulkan/vkgen/vkstruct.h
new file mode 100644
index 000000000..a8a0df7e9
--- /dev/null
+++ b/libs/video/renderer/vulkan/vkgen/vkstruct.h
@@ -0,0 +1,16 @@
+#ifndef __renderer_vulkan_vkgen_vkstruct_h
+#define __renderer_vulkan_vkgen_vkstruct_h
+
+#include <Object.h>
+
+#include "vkgen.h"
+#include "vktype.h"
+
+@interface Struct: Type
+{
+}
+-(void) forEachFieldCall: (varfunc) func;
+-(void) writeTable;
+@end
+
+#endif//__renderer_vulkan_vkgen_vkstruct_h
diff --git a/libs/video/renderer/vulkan/vkgen/vkstruct.r b/libs/video/renderer/vulkan/vkgen/vkstruct.r
new file mode 100644
index 000000000..fa5193b11
--- /dev/null
+++ b/libs/video/renderer/vulkan/vkgen/vkstruct.r
@@ -0,0 +1,43 @@
+#include <hash.h>
+#include <qfile.h>
+#include <runtime.h>
+#include <string.h>
+#include <types.h>
+#include <Array.h>
+
+#include "vkgen.h"
+#include "vkstruct.h"
+
+@implementation Struct
+
+-(string) name
+{
+	return str_mid(type.strct.tag, 4);
+}
+
+-(void) forEachFieldCall: (varfunc) func
+{
+	qfot_struct_t *strct =&type.strct;
+
+	for (int i = 0; i < strct.num_fields; i++) {
+		func (&strct.fields[i]);
+	}
+}
+
+-(void) writeTable
+{
+	fprintf (output_file, "structfld_t %s_fields[] = {\n", [self name]);
+	for (int i = 0; i < type.strct.num_fields; i++) {
+		qfot_var_t *var = &type.strct.fields[i];
+		if (var.name == "sType" || var.name == "pNext") {
+			continue;
+		}
+		string type_name = var.type.encoding;
+		fprintf (output_file,
+				 "\t{\"%s\", field_offset (%s, %s), %s, %s}, // %s\n",
+				 var.name, [self name], var.name, "0", "0", type_name);
+	}
+	fprintf (output_file, "\t{ }\n");
+	fprintf (output_file, "};\n");
+}
+@end
diff --git a/libs/video/renderer/vulkan/vkgen/vktype.h b/libs/video/renderer/vulkan/vkgen/vktype.h
new file mode 100644
index 000000000..a4ffb83c4
--- /dev/null
+++ b/libs/video/renderer/vulkan/vkgen/vktype.h
@@ -0,0 +1,18 @@
+#ifndef __renderer_vulkan_vkgen_vktype_h
+#define __renderer_vulkan_vkgen_vktype_h
+
+#include <types.h>
+#include <Object.h>
+
+@interface Type: Object
+{
+	qfot_type_t *type;
+}
+-initWithType: (qfot_type_t *) type;
+/**	\warning	returned string is ephemeral
+*/
+-(string) name;
+-(void) addToQueue;
+@end
+
+#endif//__renderer_vulkan_vkgen_vktype_h
diff --git a/libs/video/renderer/vulkan/vkgen/vktype.r b/libs/video/renderer/vulkan/vkgen/vktype.r
new file mode 100644
index 000000000..b3a7bcf2c
--- /dev/null
+++ b/libs/video/renderer/vulkan/vkgen/vktype.r
@@ -0,0 +1,33 @@
+#include <hash.h>
+
+#include "vkgen.h"
+#include "vktype.h"
+
+@implementation Type
+
+-initWithType: (qfot_type_t *) type
+{
+	if (!(self = [super init])) {
+		return nil;
+	}
+	self.type = type;
+	return self;
+}
+
+-(string) name
+{
+	//FIXME extract alias name and return proper type name
+	return type.encoding;
+}
+
+-(void) addToQueue
+{
+	string name = [self name];
+	//printf ("    +%s\n", name);
+	if (!Hash_Find (processed_types, name)) {
+		Hash_Add (processed_types, (void *) name);
+		[queue addObject: self];
+	}
+}
+
+@end

From 64100efe7837ed50cbabdece17907352e9004cd2 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 2 Jul 2020 19:51:47 +0900
Subject: [PATCH 1168/1519] [qwaq] Fix a typo

---
 ruamoko/qwaq/builtins/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ruamoko/qwaq/builtins/main.c b/ruamoko/qwaq/builtins/main.c
index 931d33337..c4c426166 100644
--- a/ruamoko/qwaq/builtins/main.c
+++ b/ruamoko/qwaq/builtins/main.c
@@ -244,7 +244,7 @@ run_progs (void *data)
 	__auto_type thread = (qwaq_thread_t *) data;
 
 	spawn_progs (thread);
-	Sys_Printf ("starthing thread for %s\n", thread->args.a[0]);
+	Sys_Printf ("starting thread for %s\n", thread->args.a[0]);
 
 	PR_ExecuteProgram (thread->pr, thread->main_func);
 	PR_PopFrame (thread->pr);

From 98795bf60443e0e36d37d23b0a462aa994afc0c5 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 3 Jul 2020 21:40:40 +0900
Subject: [PATCH 1169/1519] [gamecode] Add a comment about returning temp
 strings

---
 libs/gamecode/pr_strings.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libs/gamecode/pr_strings.c b/libs/gamecode/pr_strings.c
index 89d5ee60f..e8e1dff85 100644
--- a/libs/gamecode/pr_strings.c
+++ b/libs/gamecode/pr_strings.c
@@ -693,6 +693,11 @@ PR_FreeTempStrings (progs_t *pr)
 			PR_Error (pr, "internal string error: %d", __LINE__);
 		if (R_STRING (pr) < 0 && string_index (res, sr) == R_STRING (pr)
 			&& pr->pr_depth) {
+			// It looks like the temp string is being returned. While this
+			// may be a false positive (just a random integer with the same
+			// value), it is better to hold onto the temp string a little
+			// longer than to remove it prematurely. This allows functions
+			// to return the result of "str a" + "str b"
 			prstack_t  *frame = pr->pr_stack + pr->pr_depth - 1;
 			sr->next = frame->tstr;
 			frame->tstr = sr;

From 1910941426a2f17a900b463adfd3dd202b669d48 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 3 Jul 2020 21:41:51 +0900
Subject: [PATCH 1170/1519] [qwaq] Handle key events differently when running

Pressing F8 (or n) while the debug target was running would cause it to
stop at that point. While it's certainly desirable to stop a runaway
target on demand, that should be with a different input. Now, commands
that start the target running are ignored while the target is running.
No commands for when the target is running have been implemented yet,
but the provision is there.
---
 ruamoko/qwaq/debugger/debugger.h |  1 +
 ruamoko/qwaq/debugger/debugger.r | 21 ++++++++++++++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/ruamoko/qwaq/debugger/debugger.h b/ruamoko/qwaq/debugger/debugger.h
index 9e6c750d2..8694d06c0 100644
--- a/ruamoko/qwaq/debugger/debugger.h
+++ b/ruamoko/qwaq/debugger/debugger.h
@@ -28,6 +28,7 @@
 		int         onExit;
 	}           sub_cond;
 	SEL         traceHandler;
+	int         running;
 
 	Window     *source_window;
 	ScrollBar  *source_scrollbar;
diff --git a/ruamoko/qwaq/debugger/debugger.r b/ruamoko/qwaq/debugger/debugger.r
index 2d51e3c60..abd8a326b 100644
--- a/ruamoko/qwaq/debugger/debugger.r
+++ b/ruamoko/qwaq/debugger/debugger.r
@@ -127,7 +127,7 @@
 }
 
 static int
-proxy_event (Debugger *self, id proxy, qwaq_event_t *event)
+proxy_event_stopped (Debugger *self, id proxy, qwaq_event_t *event)
 {
 	if (event.what == qe_mouseclick && !(event.mouse.buttons & 0x78)) {
 		if (proxy == self.current_file) {
@@ -142,6 +142,7 @@ proxy_event (Debugger *self, id proxy, qwaq_event_t *event)
 				self.traceHandler = @selector(traceStep);
 				qdb_set_trace (self.target, 1);
 				self.trace_cond.state = qdb_get_state (self.target);
+				self.running = 1;
 				qdb_continue (self.target);
 				return 1;
 			case QFK_F8:
@@ -150,6 +151,7 @@ proxy_event (Debugger *self, id proxy, qwaq_event_t *event)
 				qdb_set_trace (self.target, 1);
 				self.trace_cond.state = qdb_get_state (self.target);
 				self.trace_cond.depth = qdb_get_stack_depth (self.target);
+				self.running = 1;
 				qdb_continue (self.target);
 				return 1;
 		}
@@ -157,15 +159,28 @@ proxy_event (Debugger *self, id proxy, qwaq_event_t *event)
 	return 0;
 }
 
+static int
+proxy_event_running (Debugger *self, id proxy, qwaq_event_t *event)
+{
+	return 0;
+}
+
 -(void)proxy_event:(id)proxy :(qwaq_event_t *)event
 {
-	if (proxy_event (self, proxy, event)) {
-		event.what = qe_none;
+	if (running) {
+		if (proxy_event_running (self, proxy, event)) {
+			event.what = qe_none;
+		}
+	} else {
+		if (proxy_event_stopped (self, proxy, event)) {
+			event.what = qe_none;
+		}
 	}
 }
 
 -stop:(prdebug_t)reason
 {
+	running = 0;
 	if (!file_proxy) {
 		[self setup];
 	}

From 225ee0ed3c3cbaf797449a23490e857bd230a98a Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 3 Jul 2020 21:46:09 +0900
Subject: [PATCH 1171/1519] [qwaq] Use an actual condition variable for control

I think I wasn't sure at the time whether the simple variable was
required for pthread_cond_wait (and friends) to work properly, but it
is: the time between the target posting the debug event and the target
waiting on the condition variable turns out to sometimes be enough for
the debugger to handle the event and signal the target to continue,
resulting in the target waiting on a signal that will never come because
another debug event will not be sent by the target until AFTER it has
exited from the debug handler.
---
 ruamoko/qwaq/builtins/debug.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/ruamoko/qwaq/builtins/debug.c b/ruamoko/qwaq/builtins/debug.c
index bb22d35e2..d16ac6f97 100644
--- a/ruamoko/qwaq/builtins/debug.c
+++ b/ruamoko/qwaq/builtins/debug.c
@@ -59,6 +59,7 @@ typedef struct qwaq_target_s {
 	prdebug_t   event;
 	void       *param;
 	rwcond_t    run_cond;
+	int         run_command;
 } qwaq_target_t;
 
 typedef struct qwaq_debug_s {
@@ -130,7 +131,10 @@ qwaq_debug_handler (prdebug_t debug_event, void *param, void *data)
 		Sys_Error ("event queue broke");
 	}
 	pthread_mutex_lock (&target->run_cond.mut);
-	pthread_cond_wait (&target->run_cond.rcond, &target->run_cond.mut);
+	while (!target->run_command) {
+		pthread_cond_wait (&target->run_cond.rcond, &target->run_cond.mut);
+	}
+	target->run_command = 0;
 	pthread_mutex_unlock (&target->run_cond.mut);
 	if (debug_event == prd_runerror || debug_event == prd_error) {
 		pthread_exit (param);
@@ -185,6 +189,7 @@ qwaq_target_load (progs_t *pr)
 	target->debugger = qwaq_debug_data;
 	target->handle = target_index (qwaq_debug_data, target);
 	qwaq_init_cond (&target->run_cond);
+	target->run_command = 0;
 
 	pr->debug_handler = qwaq_debug_handler;
 	pr->debug_data = target;
@@ -280,6 +285,7 @@ qdb_continue (progs_t *pr)
 	qwaq_target_t *target = get_target (debug, __FUNCTION__, handle);
 
 	pthread_mutex_lock (&target->run_cond.mut);
+	target->run_command = 1;
 	pthread_cond_signal (&target->run_cond.rcond);
 	pthread_mutex_unlock (&target->run_cond.mut);
 }

From 1914fa27565b68ae6b7193ac41f3ae4f51720a74 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 4 Jul 2020 01:36:46 +0900
Subject: [PATCH 1172/1519] [qwaq] Use full file path for file search

Fixes the memory leak (over 300 editors...)
---
 ruamoko/qwaq/debugger/debugger.r | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruamoko/qwaq/debugger/debugger.r b/ruamoko/qwaq/debugger/debugger.r
index abd8a326b..3acf1707e 100644
--- a/ruamoko/qwaq/debugger/debugger.r
+++ b/ruamoko/qwaq/debugger/debugger.r
@@ -53,6 +53,7 @@
 -(Editor *) find_file:(string) filename
 {
 	Editor     *file;
+	filename = qdb_get_file_path (target, filename);
 	for (int i = [files count]; i-- > 0; ) {
 		file = [files objectAtIndex: i];
 		if ([file filename] == filename) {
@@ -62,8 +63,7 @@
 	Rect rect = {{1, 1}, [source_window size]};
 	rect.extent.width -= 2;
 	rect.extent.height -= 2;
-	string filepath = qdb_get_file_path (target, filename);
-	file = [Editor withRect:rect file:filepath];
+	file = [Editor withRect:rect file:filename];
 	[files addObject: file];
 	return file;
 }

From e4ee5c70e0d8cc8adfeaa3becee78502f3f5c8d2 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 4 Jul 2020 01:40:02 +0900
Subject: [PATCH 1173/1519] [vulkan] Rework vkgen alias handling

This is much cleaner and now that all the types are there properly,
doing a parser generator should be easier.
---
 libs/video/renderer/Makemodule.am             |  19 ++-
 .../video/renderer/vulkan/vkgen/Makemodule.am |   2 +
 libs/video/renderer/vulkan/vkgen/vkalias.h    |  11 ++
 libs/video/renderer/vulkan/vkgen/vkalias.r    |  52 ++++++
 libs/video/renderer/vulkan/vkgen/vkenum.r     |  10 ++
 libs/video/renderer/vulkan/vkgen/vkgen.h      |   1 +
 libs/video/renderer/vulkan/vkgen/vkgen.r      | 158 +++++-------------
 libs/video/renderer/vulkan/vkgen/vkstruct.r   |  10 ++
 libs/video/renderer/vulkan/vkgen/vktype.h     |   7 +-
 libs/video/renderer/vulkan/vkgen/vktype.r     |  64 ++++++-
 10 files changed, 209 insertions(+), 125 deletions(-)
 create mode 100644 libs/video/renderer/vulkan/vkgen/vkalias.h
 create mode 100644 libs/video/renderer/vulkan/vkgen/vkalias.r

diff --git a/libs/video/renderer/Makemodule.am b/libs/video/renderer/Makemodule.am
index b1196dc2f..d6ae44226 100644
--- a/libs/video/renderer/Makemodule.am
+++ b/libs/video/renderer/Makemodule.am
@@ -219,12 +219,25 @@ libs_video_renderer_vid_render_vulkan_la_SOURCES = \
 	libs/video/renderer/vulkan/vulkan_draw.c \
 	libs/video/renderer/vulkan/vulkan_vid_common.c
 
+libs/video/renderer/vulkan/vulkan_vid_common.c: $(vkparse_src)
+
 qwaq_curses = ruamoko/qwaq/qwaq-curses$(EXEEXT)
-BUILT_SOURCES += libs/video/renderer/vulkan/vkenum.inc
+vkparse_src = \
+	libs/video/renderer/vulkan/vkenum.inc \
+	libs/video/renderer/vulkan/vkstruct.inc
+
+V_VKGEN = $(V_VKGEN_@AM_V@)
+V_VKGEN_ = $(V_VKGEN_@AM_DEFAULT_V@)
+V_VKGEN_0 = @echo "  VKGEN   " $@;
+V_VKGEN_1 =
+
 libs/video/renderer/vulkan/vkenum.inc: $(vkgen) $(qwaq_curses)
-	$(qwaq_curses) $(vkgen) -- $@
+	$(V_VKGEN)$(qwaq_curses) $(vkgen) -- enum $@
+libs/video/renderer/vulkan/vkstruct.inc: $(vkgen) $(qwaq_curses)
+	$(V_VKGEN)$(qwaq_curses) $(vkgen) -- struct $@
 
 CLEANFILES += \
 	libs/video/renderer/glsl/*.vc \
 	libs/video/renderer/glsl/*.fc \
-	libs/video/renderer/glsl/*.slc
+	libs/video/renderer/glsl/*.slc \
+	$(vkparse_src)
diff --git a/libs/video/renderer/vulkan/vkgen/Makemodule.am b/libs/video/renderer/vulkan/vkgen/Makemodule.am
index 5eb099c9c..66971a2c3 100644
--- a/libs/video/renderer/vulkan/vkgen/Makemodule.am
+++ b/libs/video/renderer/vulkan/vkgen/Makemodule.am
@@ -2,6 +2,7 @@ vkgen = libs/video/renderer/vulkan/vkgen.dat$(EXEEXT)
 noinst_PROGRAMS += $(vkgen)
 
 vkgen_dat_src= \
+	libs/video/renderer/vulkan/vkgen/vkalias.r \
 	libs/video/renderer/vulkan/vkgen/vkenum.r \
 	libs/video/renderer/vulkan/vkgen/vkgen.r \
 	libs/video/renderer/vulkan/vkgen/vkstruct.r \
@@ -33,6 +34,7 @@ libs/video/renderer/vulkan/vkgen/vulkan.o: $(top_srcdir)/libs/video/renderer/vul
 EXTRA_DIST += \
 	libs/video/renderer/vulkan/vkgen/stddef.h \
 	libs/video/renderer/vulkan/vkgen/stdint.h \
+	libs/video/renderer/vulkan/vkgen/vkalias.h \
 	libs/video/renderer/vulkan/vkgen/vkenum.h \
 	libs/video/renderer/vulkan/vkgen/vkgen.h \
 	libs/video/renderer/vulkan/vkgen/vkstruct.h \
diff --git a/libs/video/renderer/vulkan/vkgen/vkalias.h b/libs/video/renderer/vulkan/vkgen/vkalias.h
new file mode 100644
index 000000000..fadf6619f
--- /dev/null
+++ b/libs/video/renderer/vulkan/vkgen/vkalias.h
@@ -0,0 +1,11 @@
+#ifndef __renderer_vulkan_vkgen_vkalias_h
+#define __renderer_vulkan_vkgen_vkalias_h
+
+#include "vktype.h"
+
+@interface Alias: Type
+{
+}
+@end
+
+#endif//__renderer_vulkan_vkgen_vkalias_h
diff --git a/libs/video/renderer/vulkan/vkgen/vkalias.r b/libs/video/renderer/vulkan/vkgen/vkalias.r
new file mode 100644
index 000000000..f37396097
--- /dev/null
+++ b/libs/video/renderer/vulkan/vkgen/vkalias.r
@@ -0,0 +1,52 @@
+#include <string.h>
+
+#include "vkalias.h"
+#include "vkenum.h"
+#include "vkgen.h"
+#include "vkstruct.h"
+
+@implementation Alias
+-(string) name
+{
+	return type.alias.name;
+}
+
+-(Type *) resolveType
+{
+	return [Type findType: type.alias.aux_type];
+}
+
+-(void)addToQueue
+{
+	Type       *alias = [Type findType:type.alias.full_type];
+	string      name = [self name];
+
+	if ([alias name] == "VkFlags") {
+		if (str_mid (name, -5) == "Flags") {
+			string tag = str_mid (name, 0, -1) + "Bits";
+			id enumObj = [(id) Hash_Find (available_types, tag) resolveType];
+			[enumObj addToQueue];
+		}
+	} else if (name == "VkBool32") {
+		// drop
+	} else if ([alias class] == [Enum class]
+			   || [alias class] == [Struct class]) {
+		[alias addToQueue];
+	} else if (alias.type.meta == ty_basic && alias.type.type == ev_pointer) {
+		Type       *type = [Type findType:alias.type.fldptr.aux_type];
+		if (!type) {
+			// pointer to opaque struct. Probably VK_DEFINE_NON_DISPATCHABLE_HANDLE or VK_DEFINE_HANDLE
+			string createInfo = name + "CreateInfo";
+			id structObj = (id) Hash_Find (available_types, createInfo);
+			if (structObj) {
+				[structObj addToQueue];
+			}
+		} else if ([type class] == [Alias class]) {
+			type = [type resolveType];
+			if ([type class] == [Struct class]) {
+				[type addToQueue];
+			}
+		}
+	}
+}
+@end
diff --git a/libs/video/renderer/vulkan/vkgen/vkenum.r b/libs/video/renderer/vulkan/vkgen/vkenum.r
index 898ef5c58..10a476432 100644
--- a/libs/video/renderer/vulkan/vkgen/vkenum.r
+++ b/libs/video/renderer/vulkan/vkgen/vkenum.r
@@ -40,6 +40,16 @@
 	return str_mid(type.strct.tag, 4);
 }
 
+-(void) addToQueue
+{
+	string name = [self name];
+	if (!Hash_Find (processed_types, name)) {
+		printf ("    +%s\n", name);
+		Hash_Add (processed_types, (void *) name);
+		[queue addObject: self];
+	}
+}
+
 -(void) writeTable
 {
 	int         strip_bit = 0;
diff --git a/libs/video/renderer/vulkan/vkgen/vkgen.h b/libs/video/renderer/vulkan/vkgen/vkgen.h
index 3612a048f..0d488abe8 100644
--- a/libs/video/renderer/vulkan/vkgen/vkgen.h
+++ b/libs/video/renderer/vulkan/vkgen/vkgen.h
@@ -14,5 +14,6 @@ extern Array *queue;
 extern Array *output_types;
 extern QFile output_file;
 extern hashtab_t *processed_types;
+extern hashtab_t *available_types;
 
 #endif//__renderer_vulkan_vkgen_vkgen_h
diff --git a/libs/video/renderer/vulkan/vkgen/vkgen.r b/libs/video/renderer/vulkan/vkgen/vkgen.r
index 7ef9f3ff6..183ba591b 100644
--- a/libs/video/renderer/vulkan/vkgen/vkgen.r
+++ b/libs/video/renderer/vulkan/vkgen/vkgen.r
@@ -13,7 +13,6 @@ void printf (string fmt, ...) = #0;
 
 void fprintf (QFile file, string format, ...)
 {
-	printf("fprintf %d\n", @args.count);
 	Qputs (file, vsprintf (format, va_copy (@args)));
 }
 
@@ -87,97 +86,8 @@ void print_type (qfot_type_t *type)
 
 void struct_func (qfot_var_t *var)
 {
-	qfot_type_t *alias;
-	if (var.type.meta == ty_enum) {
-		printf("%s a\n", var.name);
-	} else if (var.type.meta == ty_struct) {
-		printf("%s b\n", var.name);
-	} else if (var.type.meta == ty_union) {
-		printf("%s c\n", var.name);
-	} else if (var.type.meta == ty_alias) {
-		//printf("%s d\n", var.name);
-		// typedef fun ;)
-		alias = var.type.alias.full_type;
-		if (alias.meta == ty_alias) {
-			// double(+) typedef
-			if (alias.alias.name == "VkFlags") {
-				// enum flag fun :P
-				string tag = var.type.alias.name;
-				if (str_mid (tag, -5) == "Flags") {
-					tag = str_mid (tag, 0, -1) + "Bits";
-					id enumObj = (id) Hash_Find (available_types, tag);
-					if (enumObj) {
-						[enumObj addToQueue];
-					}
-				}
-			} else {
-				if (var.type.alias.name == "VkBool32") {
-					// drop
-				} else {
-					printf ("%s =%s\n", var.name, var.type.alias.name);
-				}
-			}
-		} else if (alias.meta == ty_enum) {
-			string tag = str_mid(alias.strct.tag, 4);
-			id enumObj = (id) Hash_Find (available_types, tag);
-			if (enumObj) {
-				[enumObj addToQueue];
-			}
-		} else if (alias.meta == ty_basic && alias.type == ev_pointer) {
-			//printf("e\n");
-			qfot_type_t *type = alias.fldptr.aux_type;
-			if (type.meta == ty_alias) {
-				id structObj = (id) Hash_Find (available_types, type.alias.name);
-				//printf ("    a:%s %p\n", type.alias.name, structObj);
-				if (structObj) {
-					[structObj addToQueue];
-				}
-			} else if (type_is_null (type)) {
-				// pointer to opaque struct. Probably VK_DEFINE_NON_DISPATCHABLE_HANDLE or VK_DEFINE_HANDLE
-				//drop
-				string createInfo = var.type.alias.name + "CreateInfo";
-				id structObj = (id) Hash_Find (available_types, createInfo);
-				if (structObj) {
-					[structObj addToQueue];
-				} else {
-					//printf("    b:%s\n", var.type.alias.name);
-				}
-			} else {
-				print_type (type);
-				printf("%s c:%s:%s\n", var.name, var.type.alias.name, pr_type_name[alias.type]);
-			}
-		} else if (alias.meta == ty_basic) {
-			//drop
-			//printf("    d:%s:%s\n", var.type.alias.name, pr_type_name[alias.type]);
-		} else if (alias.meta == ty_struct) {
-			string tag = str_mid(alias.strct.tag, 4);
-			id structObj = (id) Hash_Find (available_types, tag);
-			if (structObj) {
-				[structObj addToQueue];
-			}
-		} else {
-			printf("    d:%s:%s\n", var.type.alias.name, ty_meta_name[alias.meta]);
-		}
-	} else if (var.type.meta == ty_basic && var.type.type == ev_pointer) {
-		qfot_type_t *type = var.type.fldptr.aux_type;
-		if (type.meta == ty_struct || type.meta == ty_union) {
-			printf("%s f\n", var.name);
-		} else if (type.meta == ty_alias) {
-			printf("%s --- %s\n", var.name, type.alias.name);
-			id obj = (id) Hash_Find (available_types, type.alias.name);
-			if (obj && [obj class] == [Struct class]) {
-				[obj forEachFieldCall:struct_func];
-			}
-		} else if (type.meta == ty_basic && type.type == ev_void) {
-			//drop
-		} else {
-			printf("%s g\n", var.name);
-			print_type (var.type);
-		}
-	} else {
-		//drop
-		//printf("    %s:%s:%s\n", var.name, ty_meta_name[var.type.meta], pr_type_name[var.type.type]);
-	}
+	Type       *type = [Type findType:var.type];
+	[type addToQueue];
 }
 
 void
@@ -188,30 +98,14 @@ scan_types (void)
 	for (type = encodings.types;
 		 ((int *)type - (int *) encodings.types) < encodings.size;
 		 type = next_type (type)) {
-		if (!type.size
-			|| (type.meta != ty_enum
-				&& type.meta != ty_struct
-				&& type.meta != ty_union)) {
-			continue;
+		if (type.size) {
+			string tag = str_mid(type.strct.tag, 4);
+			Type *avail_type = [Type fromType: type];
+			if (avail_type) {
+				Hash_Add (available_types, avail_type);
+			}
 		}
-		string tag = str_mid(type.strct.tag, 4);
-		switch (type.meta) {
-			case ty_enum:
-				Hash_Add (available_types, [[Enum alloc] initWithType: type]);
-				//printf ("+ enum %s\n", tag);
-				break;
-			case ty_struct:
-			case ty_union:
-				Hash_Add (available_types, [[Struct alloc] initWithType: type]);
-				//printf ("+ struct %s\n", tag);
-				break;
-			case ty_basic:
-			case ty_array:
-			case ty_class:
-			case ty_alias:
-				break;
-		}
-	 }
+	}
 }
 
 static string
@@ -226,9 +120,33 @@ get_object_key (void *obj, void *unused)
 	return [(id)obj name];
 }
 
+void
+usage (string name)
+{
+	printf ("%s [struct|enum] [output file]\n", name);
+}
+
 int
 main(int argc, string *argv)
 {
+	int         do_struct = 0;
+	int         do_enum = 0;
+
+	if (argc != 3) {
+		usage (argv[0]);
+		return 1;
+	}
+	switch (argv[1]) {
+		case "struct":
+			do_struct = 1;
+			break;
+		case "enum":
+			do_enum = 1;
+			break;
+		default:
+			usage (argv[0]);
+			return 1;
+	}
 	encodings = PR_FindGlobal (".type_encodings");
 	if (!encodings) {
 		printf ("Can't find encodings\n");
@@ -243,6 +161,8 @@ main(int argc, string *argv)
 	for (int i = 0;
 		 i < sizeof (search_names) / sizeof (search_names[0]); i++) {
 		id obj = (id) Hash_Find (available_types, search_names[i]);
+		obj = [obj resolveType];
+		printf("obj: %d %s\n", obj, class_get_class_name([obj class]));
 		if (obj && [obj class] == [Struct class]) {
 			[obj addToQueue];
 		}
@@ -261,13 +181,17 @@ main(int argc, string *argv)
 		printf ("vkgen %d %s\n", i, argv[i]);
 	}
 
-	output_file = Qopen (argv[1], "wt");
+	output_file = Qopen (argv[2], "wt");
 	for (int i = [output_types count]; i-- > 0; ) {
 		id obj = [output_types objectAtIndex:i];
 		if ([obj name] == "VkStructureType") {
 			continue;
 		}
-		if ([obj class] == [Struct class]) {
+		printf("obj: %d %s\n", obj, class_get_class_name([obj class]));
+		if (do_struct && [obj class] != [Struct class]) {
+			continue;
+		}
+		if (do_enum && [obj class] != [Enum class]) {
 			continue;
 		}
 		[obj writeTable];
diff --git a/libs/video/renderer/vulkan/vkgen/vkstruct.r b/libs/video/renderer/vulkan/vkgen/vkstruct.r
index fa5193b11..939f9094e 100644
--- a/libs/video/renderer/vulkan/vkgen/vkstruct.r
+++ b/libs/video/renderer/vulkan/vkgen/vkstruct.r
@@ -15,6 +15,16 @@
 	return str_mid(type.strct.tag, 4);
 }
 
+-(void) addToQueue
+{
+	string name = [self name];
+	if (!Hash_Find (processed_types, name)) {
+		printf ("    +%s\n", name);
+		Hash_Add (processed_types, (void *) name);
+		[queue addObject: self];
+	}
+}
+
 -(void) forEachFieldCall: (varfunc) func
 {
 	qfot_struct_t *strct =&type.strct;
diff --git a/libs/video/renderer/vulkan/vkgen/vktype.h b/libs/video/renderer/vulkan/vkgen/vktype.h
index a4ffb83c4..834bd1896 100644
--- a/libs/video/renderer/vulkan/vkgen/vktype.h
+++ b/libs/video/renderer/vulkan/vkgen/vktype.h
@@ -8,11 +8,16 @@
 {
 	qfot_type_t *type;
 }
--initWithType: (qfot_type_t *) type;
++fromType: (qfot_type_t *) type;
+/**	\warning	returned string is ephemeral
+*/
+-(string) key;
 /**	\warning	returned string is ephemeral
 */
 -(string) name;
 -(void) addToQueue;
+-(Type *) resolveType;
++(Type *) findType: (qfot_type_t *) type;
 @end
 
 #endif//__renderer_vulkan_vkgen_vktype_h
diff --git a/libs/video/renderer/vulkan/vkgen/vktype.r b/libs/video/renderer/vulkan/vkgen/vktype.r
index b3a7bcf2c..c5a678c48 100644
--- a/libs/video/renderer/vulkan/vkgen/vktype.r
+++ b/libs/video/renderer/vulkan/vkgen/vktype.r
@@ -1,19 +1,72 @@
 #include <hash.h>
 
+#include "vkalias.h"
+#include "vkenum.h"
 #include "vkgen.h"
+#include "vkstruct.h"
 #include "vktype.h"
 
 @implementation Type
 
+static hashtab_t *registered_types;
+
+static string get_type_key (void *type, void *unused)
+{
+	return ((Type *) type).type.encoding;
+}
+
++(void)initialize
+{
+	registered_types = Hash_NewTable (127, get_type_key, nil, nil);
+}
+
 -initWithType: (qfot_type_t *) type
 {
 	if (!(self = [super init])) {
 		return nil;
 	}
 	self.type = type;
+	Hash_Add (registered_types, self);
 	return self;
 }
 
++(Type *) findType: (qfot_type_t *) type
+{
+	if (type.meta == ty_alias && !type.alias.name) {
+		type = type.alias.full_type;
+	}
+	return (Type *) Hash_Find (registered_types, type.encoding);
+}
+
++fromType: (qfot_type_t *) type
+{
+	if (type.size == 0) {
+		return nil;
+	}
+	switch (type.meta) {
+		case ty_basic:
+		case ty_array:
+		case ty_class:
+			return [[Type alloc] initWithType: type];
+		case ty_enum:
+			return [[Enum alloc] initWithType: type];
+		case ty_struct:
+		case ty_union:
+			return [[Struct alloc] initWithType: type];
+		case ty_alias:
+			if (type.alias.name) {
+				return [[Alias alloc] initWithType: type];
+			}
+			break;
+	}
+	return nil;
+}
+
+-(string) key
+{
+	return type.encoding;
+}
+
 -(string) name
 {
 	//FIXME extract alias name and return proper type name
@@ -23,11 +76,14 @@
 -(void) addToQueue
 {
 	string name = [self name];
-	//printf ("    +%s\n", name);
-	if (!Hash_Find (processed_types, name)) {
-		Hash_Add (processed_types, (void *) name);
-		[queue addObject: self];
+	if (type.meta == ty_basic && type.type == ev_pointer) {
+		[[Type findType: type.fldptr.aux_type] addToQueue];
 	}
 }
 
+-(Type *) resolveType
+{
+	return self;
+}
+
 @end

From f544a6f0b0401b0a7cff79988c9c152cc186c205 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 4 Jul 2020 12:39:11 +0900
Subject: [PATCH 1174/1519] [qfcc] Treat null method return type as id

This prevents a segfault when the method's return type is undefined.
---
 tools/qfcc/source/method.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/qfcc/source/method.c b/tools/qfcc/source/method.c
index 244ae1513..1c461af85 100644
--- a/tools/qfcc/source/method.c
+++ b/tools/qfcc/source/method.c
@@ -89,6 +89,10 @@ new_method (type_t *ret_type, param_t *selector, param_t *opt_params)
 	dstring_t  *name = dstring_newstr ();
 	dstring_t  *types = dstring_newstr ();
 
+	if (!ret_type) {
+		ret_type = &type_id;
+	}
+
 	selector = reverse_params (selector);
 	selector = append_params (selector, opt_params);
 	cmd->next = selector;

From 7a478b4ce7f7fdcb94ddac77ef471055b72b09da Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 5 Jul 2020 14:38:44 +0900
Subject: [PATCH 1175/1519] [libr] Make PLItem more useful

I can't say that I like what's there even now, but at least PLItem can
be used without a lot of casting. Really, Ruamoko needs dictionary and
string classes so reading a property list can build more natural object
trees rather than this mess from when I knew too little.
---
 ruamoko/include/PropertyList.h | 44 ++++++++++++--------
 ruamoko/lib/PropertyList.r     | 75 ++++++++++++++++++++++++++++++++++
 2 files changed, 101 insertions(+), 18 deletions(-)

diff --git a/ruamoko/include/PropertyList.h b/ruamoko/include/PropertyList.h
index 3deb99a2b..c0c4bed35 100644
--- a/ruamoko/include/PropertyList.h
+++ b/ruamoko/include/PropertyList.h
@@ -4,7 +4,29 @@
 #include <plist.h>
 #include <Object.h>
 
-@interface PLItem: Object
+@class PLItem;
+
+@protocol PLDictionary
+- (int) count;
+- (int) numKeys;
+- (PLItem *) getObjectForKey:(string) key;
+- (PLItem *) allKeys;
+- addKey:(string) key value:(PLItem *) value;
+@end
+
+@protocol PLArray
+- (int) count;
+- (int) numObjects;
+- (PLItem *) getObjectAtIndex:(int) index;
+- addObject:(PLItem *) object;
+- insertObject:(PLItem *) object atIndex:(int) index;
+@end
+
+@protocol PLString
+- (string) string;
+@end
+
+@interface PLItem: Object <PLDictionary, PLArray, PLString>
 {
 	plitem_t    item;
 	int     own;
@@ -22,34 +44,20 @@
 - (pltype_t) type;
 @end
 
-@interface PLDictionary: PLItem
+@interface PLDictionary: PLItem <PLDictionary>
 + (PLDictionary *) new;
-
-- (int) count;
-- (int) numKeys;
-- (PLItem *) getObjectForKey:(string) key;
-- (PLItem *) allKeys;
-- addKey:(string) key value:(PLItem *) value;
 @end
 
-@interface PLArray: PLItem
+@interface PLArray: PLItem <PLArray>
 + (PLArray *) new;
-
-- (int) count;
-- (int) numObjects;
-- (PLItem *) getObjectAtIndex:(int) index;
-- addObject:(PLItem *) object;
-- insertObject:(PLItem *) object atIndex:(int) index;
 @end
 
 @interface PLData: PLItem
 + (PLData *) new:(void*) data size:(int) len;
 @end
 
-@interface PLString: PLItem
+@interface PLString: PLItem <PLString>
 + (PLString *) new:(string) str;
-
-- (string) string;
 @end
 
 #endif//__ruamoko_PropertyList_h
diff --git a/ruamoko/lib/PropertyList.r b/ruamoko/lib/PropertyList.r
index b65edc85d..b8469e473 100644
--- a/ruamoko/lib/PropertyList.r
+++ b/ruamoko/lib/PropertyList.r
@@ -94,6 +94,81 @@
 	return PL_Type (item);
 }
 
+- (int) count
+{
+	if ([self class] == [PLDictionary class]) {
+		return PL_D_NumKeys (item);
+	} else {
+		return PL_A_NumObjects (item);
+	}
+}
+
+- (int) numKeys
+{
+	return PL_D_NumKeys (item);
+}
+
+- (PLItem *) getObjectForKey:(string) key
+{
+	return [[PLItem itemClass: PL_ObjectForKey (item, key)] autorelease];
+}
+
+- (PLItem *) allKeys
+{
+	return [[PLItem itemClass: PL_D_AllKeys (item)] autorelease];
+}
+
+- addKey:(string) key value:(PLItem *) value
+{
+	if (!value.own) {
+		obj_error (self, 0, "add of unowned key/value to PLDictionary");
+		return self;
+	}
+	PL_D_AddObject (item, key, value.item);
+	value.own = 0;
+	[value release];
+	return self;
+}
+
+- (int) numObjects
+{
+	return PL_A_NumObjects (item);
+}
+
+- (PLItem *) getObjectAtIndex:(int) index
+{
+	return [[PLItem itemClass: PL_ObjectAtIndex (item, index)] autorelease];
+}
+
+- addObject:(PLItem *) object
+{
+	if (!object.own) {
+		obj_error (self, 0, "add of unowned object to PLArray");
+		return self;
+	}
+	PL_A_AddObject (item, object.item);
+	object.own = 0;
+	[object release];
+	return self;
+}
+
+- insertObject:(PLItem *) object atIndex:(int) index
+{
+	if (!object.own) {
+		obj_error (self, 0, "add of unowned object to PLArray");
+		return self;
+	}
+	PL_A_InsertObjectAtIndex (item, object.item, index);
+	object.own = 0;
+	[object release];
+	return self;
+}
+
+- (string) string
+{
+	return PL_String (item);
+}
+
 @end
 
 

From 0945f30731ac47fa08088f20d5d3fcedc5420610 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 5 Jul 2020 14:59:56 +0900
Subject: [PATCH 1176/1519] [vulkan] Use a property list to drive code gen

The property list specifies the base structures for which parser code
will be generated (along with any structures and enums upon which those
structures depend). It also defines option specialized parsers for
better control.
---
 libs/video/renderer/Makemodule.am           |  12 +-
 libs/video/renderer/vulkan/vkgen/vkalias.r  |  54 ++++++++
 libs/video/renderer/vulkan/vkgen/vkenum.r   |  18 +++
 libs/video/renderer/vulkan/vkgen/vkgen.r    |  93 +++++++++----
 libs/video/renderer/vulkan/vkgen/vkstruct.h |   4 +-
 libs/video/renderer/vulkan/vkgen/vkstruct.r | 141 ++++++++++++++++++--
 libs/video/renderer/vulkan/vkgen/vktype.h   |   7 +
 libs/video/renderer/vulkan/vkgen/vktype.r   |  41 ++++++
 libs/video/renderer/vulkan/vkparse.plist    |  53 ++++++++
 9 files changed, 382 insertions(+), 41 deletions(-)
 create mode 100644 libs/video/renderer/vulkan/vkparse.plist

diff --git a/libs/video/renderer/Makemodule.am b/libs/video/renderer/Makemodule.am
index d6ae44226..c41406663 100644
--- a/libs/video/renderer/Makemodule.am
+++ b/libs/video/renderer/Makemodule.am
@@ -223,18 +223,18 @@ libs/video/renderer/vulkan/vulkan_vid_common.c: $(vkparse_src)
 
 qwaq_curses = ruamoko/qwaq/qwaq-curses$(EXEEXT)
 vkparse_src = \
-	libs/video/renderer/vulkan/vkenum.inc \
-	libs/video/renderer/vulkan/vkstruct.inc
+	libs/video/renderer/vulkan/vkparse.inc
+vkparse_plist = \
+	$(srcdir)/libs/video/renderer/vulkan/vkparse.plist
 
 V_VKGEN = $(V_VKGEN_@AM_V@)
 V_VKGEN_ = $(V_VKGEN_@AM_DEFAULT_V@)
 V_VKGEN_0 = @echo "  VKGEN   " $@;
 V_VKGEN_1 =
 
-libs/video/renderer/vulkan/vkenum.inc: $(vkgen) $(qwaq_curses)
-	$(V_VKGEN)$(qwaq_curses) $(vkgen) -- enum $@
-libs/video/renderer/vulkan/vkstruct.inc: $(vkgen) $(qwaq_curses)
-	$(V_VKGEN)$(qwaq_curses) $(vkgen) -- struct $@
+libs/video/renderer/vulkan/vkparse.inc: $(vkgen) $(qwaq_curses) $(vkparse_plist)
+	$(V_VKGEN)$(qwaq_curses) $(vkgen) -- $(vkparse_plist) $@.t &&\
+	$(am__mv) $@.t $@
 
 CLEANFILES += \
 	libs/video/renderer/glsl/*.vc \
diff --git a/libs/video/renderer/vulkan/vkgen/vkalias.r b/libs/video/renderer/vulkan/vkgen/vkalias.r
index f37396097..6228ac230 100644
--- a/libs/video/renderer/vulkan/vkgen/vkalias.r
+++ b/libs/video/renderer/vulkan/vkgen/vkalias.r
@@ -49,4 +49,58 @@
 		}
 	}
 }
+
+-(string) parseType
+{
+	Type       *alias = [Type findType:type.alias.full_type];
+	string      name = [self name];
+
+	if ([alias name] == "VkFlags") {
+		if (str_mid (name, -5) == "Flags") {
+			string tag = str_mid (name, 0, -1) + "Bits";
+			id enumObj = [(id) Hash_Find (available_types, tag) resolveType];
+			return [enumObj parseType];
+		}
+	}
+	if (name == "uint32_t") {
+		return "QFString";
+	}
+	return [alias parseType];
+}
+
+-(string) parseFunc
+{
+	Type       *alias = [Type findType:type.alias.full_type];
+	string      name = [self name];
+
+	if ([alias name] == "VkFlags") {
+		if (str_mid (name, -5) == "Flags") {
+			string tag = str_mid (name, 0, -1) + "Bits";
+			id enumObj = [(id) Hash_Find (available_types, tag) resolveType];
+			return [enumObj parseFunc];
+		}
+	}
+	if (name == "uint32_t") {
+		return "parse_uint32_t";
+	}
+	return [alias parseFunc];
+}
+
+-(string) parseData
+{
+	Type       *alias = [Type findType:type.alias.full_type];
+	string      name = [self name];
+
+	if ([alias name] == "VkFlags") {
+		if (str_mid (name, -5) == "Flags") {
+			string tag = str_mid (name, 0, -1) + "Bits";
+			id enumObj = [(id) Hash_Find (available_types, tag) resolveType];
+			return [enumObj parseData];
+		}
+	}
+	if (name == "uint32_t") {
+		return "0";
+	}
+	return [alias parseData];
+}
 @end
diff --git a/libs/video/renderer/vulkan/vkgen/vkenum.r b/libs/video/renderer/vulkan/vkgen/vkenum.r
index 10a476432..768e4b8d4 100644
--- a/libs/video/renderer/vulkan/vkgen/vkenum.r
+++ b/libs/video/renderer/vulkan/vkgen/vkenum.r
@@ -82,4 +82,22 @@
 	fprintf (output_file, "\t{ }\n");
 	fprintf (output_file, "};\n");
 }
+
+-(string) parseType
+{
+	return "QFString";
+}
+
+-(string) parseFunc
+{
+	if (str_mid([self name], -8) == "FlagBits") {
+		return "parse_flags";
+	}
+	return "parse_enum";
+}
+
+-(string) parseData
+{
+	return [self name] + "_values";
+}
 @end
diff --git a/libs/video/renderer/vulkan/vkgen/vkgen.r b/libs/video/renderer/vulkan/vkgen/vkgen.r
index 183ba591b..7744d0cdc 100644
--- a/libs/video/renderer/vulkan/vkgen/vkgen.r
+++ b/libs/video/renderer/vulkan/vkgen/vkgen.r
@@ -4,11 +4,28 @@
 #include <string.h>
 #include <types.h>
 #include <Array.h>
+#include <AutoreleasePool.h>
+#include <PropertyList.h>
 
 #include "vkgen.h"
 #include "vkstruct.h"
 #include "vkenum.h"
 
+static AutoreleasePool *autorelease_pool;
+static void
+arp_start (void)
+{
+	autorelease_pool = [[AutoreleasePool alloc] init];
+}
+
+static void
+arp_end (void)
+{
+	[autorelease_pool release];
+	autorelease_pool = nil;
+}
+
+
 void printf (string fmt, ...) = #0;
 
 void fprintf (QFile file, string format, ...)
@@ -16,11 +33,6 @@ void fprintf (QFile file, string format, ...)
 	Qputs (file, vsprintf (format, va_copy (@args)));
 }
 
-string search_names[] = {
-	"VkGraphicsPipelineCreateInfo",
-	"VkComputePipelineCreateInfo",
-};
-#define numsearch (sizeof (search_names) / sizeof (search_names[0]))
 hashtab_t *available_types;
 hashtab_t *processed_types;
 Array *queue;
@@ -123,7 +135,7 @@ get_object_key (void *obj, void *unused)
 void
 usage (string name)
 {
-	printf ("%s [struct|enum] [output file]\n", name);
+	printf ("%s [plist file] [output file]\n", name);
 }
 
 int
@@ -131,36 +143,51 @@ main(int argc, string *argv)
 {
 	int         do_struct = 0;
 	int         do_enum = 0;
+	string      plist_filename;
+	QFile       plist_file;
+	PLItem     *plist;
+	PLItem     *search;
+	PLItem     *parse;
+
+	arp_start ();
 
 	if (argc != 3) {
 		usage (argv[0]);
 		return 1;
 	}
-	switch (argv[1]) {
-		case "struct":
-			do_struct = 1;
-			break;
-		case "enum":
-			do_enum = 1;
-			break;
-		default:
-			usage (argv[0]);
-			return 1;
+	plist_filename = argv[1];
+	plist_file = Qopen (plist_filename, "rt");
+	if (!plist_file) {
+		printf ("could not open property list file: %s\n", plist_filename);
+		return 1;
 	}
+	plist = [[PLItem fromFile: plist_file] retain];
+	if (!plist) {
+		printf ("error parsing: %s\n", plist_filename);
+		return 1;
+	}
+	Qclose (plist_file);
+	if ([plist class] != [PLDictionary class]) {
+		printf ("%s not a dictionary\n", plist_filename);
+	}
+	search = [[plist getObjectForKey: "search"] retain];
+	parse = [[plist getObjectForKey: "parse"] retain];
+
 	encodings = PR_FindGlobal (".type_encodings");
 	if (!encodings) {
 		printf ("Can't find encodings\n");
 		return 1;
 	}
-	queue = [[Array alloc] init];
-	output_types = [[Array alloc] init];
+	queue = [[Array array] retain];
+	output_types = [[Array array] retain];
 	available_types = Hash_NewTable (127, get_object_key, nil, nil);
 	processed_types = Hash_NewTable (127, get_string_key, nil, nil);
 	scan_types ();
 
-	for (int i = 0;
-		 i < sizeof (search_names) / sizeof (search_names[0]); i++) {
-		id obj = (id) Hash_Find (available_types, search_names[i]);
+	for (int i = [search numObjects]; i-- > 0; ) {
+		PLString   *str = (PLString *) [search getObjectAtIndex:i];
+		string search_name = [str string];
+		id obj = (id) Hash_Find (available_types, search_name);
 		obj = [obj resolveType];
 		printf("obj: %d %s\n", obj, class_get_class_name([obj class]));
 		if (obj && [obj class] == [Struct class]) {
@@ -181,20 +208,34 @@ main(int argc, string *argv)
 		printf ("vkgen %d %s\n", i, argv[i]);
 	}
 
+	arp_end ();
+
 	output_file = Qopen (argv[2], "wt");
 	for (int i = [output_types count]; i-- > 0; ) {
 		id obj = [output_types objectAtIndex:i];
 		if ([obj name] == "VkStructureType") {
 			continue;
 		}
-		printf("obj: %d %s\n", obj, class_get_class_name([obj class]));
-		if (do_struct && [obj class] != [Struct class]) {
-			continue;
-		}
-		if (do_enum && [obj class] != [Enum class]) {
+		if ([obj class] != [Enum class]) {
 			continue;
 		}
+
+		arp_start ();
 		[obj writeTable];
+		arp_end ();
+	}
+	for (int i = [output_types count]; i-- > 0; ) {
+		id obj = [output_types objectAtIndex:i];
+		if ([obj name] == "VkStructureType") {
+			continue;
+		}
+		if ([obj class] != [Struct class]) {
+			continue;
+		}
+
+		arp_start ();
+		[obj writeTable:parse];
+		arp_end ();
 	}
 	Qclose (output_file);
 	return 0;
diff --git a/libs/video/renderer/vulkan/vkgen/vkstruct.h b/libs/video/renderer/vulkan/vkgen/vkstruct.h
index a8a0df7e9..246d23070 100644
--- a/libs/video/renderer/vulkan/vkgen/vkstruct.h
+++ b/libs/video/renderer/vulkan/vkgen/vkstruct.h
@@ -6,11 +6,13 @@
 #include "vkgen.h"
 #include "vktype.h"
 
+@class PLItem;
+
 @interface Struct: Type
 {
 }
 -(void) forEachFieldCall: (varfunc) func;
--(void) writeTable;
+-(void) writeTable: (PLItem *) parse;
 @end
 
 #endif//__renderer_vulkan_vkgen_vkstruct_h
diff --git a/libs/video/renderer/vulkan/vkgen/vkstruct.r b/libs/video/renderer/vulkan/vkgen/vkstruct.r
index 939f9094e..ff364202b 100644
--- a/libs/video/renderer/vulkan/vkgen/vkstruct.r
+++ b/libs/video/renderer/vulkan/vkgen/vkstruct.r
@@ -4,6 +4,7 @@
 #include <string.h>
 #include <types.h>
 #include <Array.h>
+#include <PropertyList.h>
 
 #include "vkgen.h"
 #include "vkstruct.h"
@@ -34,20 +35,144 @@
 	}
 }
 
--(void) writeTable
+-(qfot_var_t *)findField:(string) fieldName
 {
-	fprintf (output_file, "structfld_t %s_fields[] = {\n", [self name]);
 	for (int i = 0; i < type.strct.num_fields; i++) {
 		qfot_var_t *var = &type.strct.fields[i];
-		if (var.name == "sType" || var.name == "pNext") {
-			continue;
+		if (var.name == fieldName) {
+			return var;
+		}
+	}
+	return nil;
+}
+
+-(void) writeTable: (PLItem *) parse
+{
+	PLItem     *field_dict = [parse getObjectForKey:[self name]];
+	PLItem     *field_defs = [field_dict allKeys];
+	Type       *field_type;
+
+	if (field_defs) {
+		PLItem     *field_def;
+		qfot_var_t *field;
+
+		for (int i = [field_defs count]; i-- > 0; ) {
+			string field_name = [[field_defs  getObjectAtIndex:i] string];
+			field_def = [field_dict getObjectForKey:field_name];
+			PLItem     *type_desc = [field_def getObjectForKey:"type"];
+			string      type_record;
+			string      type_type;
+			string      size_field = nil;
+			string      value_field = nil;
+
+			if (!type_desc) {
+				continue;
+			}
+			type_record = [[type_desc getObjectAtIndex:0] string];
+			type_type = [[type_desc getObjectAtIndex:1] string];
+
+			field_type = [[Type lookup: type_type] dereference];
+			fprintf (output_file, "static parse_%s_t parse_%s_%s_data = {\n",
+					 type_record, [self name], field_name);
+			fprintf (output_file, "\tparse_%s,\n", type_type);
+			if (type_record == "single") {
+				value_field = [[field_def getObjectForKey:"value"] string];
+				fprintf (output_file, "\tfield_offset (%s, %s),\n",
+						 [self name], value_field);
+			} else {
+				value_field = [[field_def getObjectForKey:"values"] string];
+				size_field = [[field_def getObjectForKey:"size"] string];
+				fprintf (output_file, "\tfield_offset (%s, %s),\n",
+						 [self name], value_field);
+				if (size_field) {
+					fprintf (output_file, "\tfield_offset (%s, %s),\n",
+							 [self name], size_field);
+				} else {
+					fprintf (output_file, "\t-1,\n");
+				}
+			}
+			fprintf (output_file, "};\n");
+		}
+	}
+	fprintf (output_file, "static plfield_t %s_fields[] = {\n", [self name]);
+	if (field_defs) {
+		PLItem     *field_def;
+		qfot_var_t *field;
+
+		for (int i = [field_defs count]; i-- > 0; ) {
+			string field_name = [[field_defs  getObjectAtIndex:i] string];
+			field_def = [field_dict getObjectForKey:field_name];
+			if ([field_def string] == "auto") {
+				field = [self findField:field_name];
+				if (!field) {
+					continue;
+				}
+				field_type = [Type findType: field.type];
+				fprintf (output_file,
+						 "\t{\"%s\", field_offset (%s, %s), %s, %s, %s},\n",
+						 field_name, [self name], field_name,
+						 [field_type parseType], [field_type parseFunc],
+						 [field_type parseData]);
+			} else {
+				PLItem     *type_desc = [field_def getObjectForKey:"type"];
+				string      type_record;
+				string      type_type;
+				string      parseType;
+
+				type_record = [[type_desc getObjectAtIndex:0] string];
+				type_type = [[type_desc getObjectAtIndex:1] string];
+
+				field_type = [[Type lookup: type_type] dereference];
+				if (type_record == "single") {
+					parseType = [field_type parseType];
+				} else {
+					parseType = "QFArray";
+				}
+				fprintf (output_file,
+						 "\t{\"%s\", 0, %s, parse_%s, &parse_%s_%s_data},\n",
+						 field_name, parseType, type_record,
+						 [self name], field_name);
+			}
+		}
+	} else {
+		for (int i = 0; i < type.strct.num_fields; i++) {
+			qfot_var_t *field = &type.strct.fields[i];
+			if (field.name == "sType" || field.name == "pNext") {
+				continue;
+			}
+			field_type = [Type findType: field.type];
+			fprintf (output_file,
+					 "\t{\"%s\", field_offset (%s, %s), %s, %s, %s},\n",
+					 field.name, [self name], field.name,
+					 [field_type parseType], [field_type parseFunc],
+					 [field_type parseData]);
 		}
-		string type_name = var.type.encoding;
-		fprintf (output_file,
-				 "\t{\"%s\", field_offset (%s, %s), %s, %s}, // %s\n",
-				 var.name, [self name], var.name, "0", "0", type_name);
 	}
 	fprintf (output_file, "\t{ }\n");
 	fprintf (output_file, "};\n");
+
+	fprintf (output_file, "static int parse_%s (const plfield_t *field,"
+			 " const plitem_t *item, void *data, plitem_t *messages)\n",
+			 [self name]);
+	fprintf (output_file, "{\n");
+	fprintf (output_file,
+			 "\treturn PL_ParseDictionary (%s_fields, item, data, messages);\n",
+			 [self name]);
+	fprintf (output_file, "}\n");
+}
+
+-(string) parseType
+{
+	return "QFDictionary";
+}
+
+-(string) parseFunc
+{
+	return "fix me";
+}
+
+-(string) parseData
+{
+	return "0";
 }
 @end
diff --git a/libs/video/renderer/vulkan/vkgen/vktype.h b/libs/video/renderer/vulkan/vkgen/vktype.h
index 834bd1896..fc5a53c84 100644
--- a/libs/video/renderer/vulkan/vkgen/vktype.h
+++ b/libs/video/renderer/vulkan/vkgen/vktype.h
@@ -18,6 +18,13 @@
 -(void) addToQueue;
 -(Type *) resolveType;
 +(Type *) findType: (qfot_type_t *) type;
++(Type *) lookup: (string) name;
+-(string) parseType;
+-(string) parseFunc;
+-(string) parseData;
+
+-(int) isPointer;
+-(Type *) dereference;
 @end
 
 #endif//__renderer_vulkan_vkgen_vktype_h
diff --git a/libs/video/renderer/vulkan/vkgen/vktype.r b/libs/video/renderer/vulkan/vkgen/vktype.r
index c5a678c48..83373d47a 100644
--- a/libs/video/renderer/vulkan/vkgen/vktype.r
+++ b/libs/video/renderer/vulkan/vkgen/vktype.r
@@ -38,6 +38,11 @@ static string get_type_key (void *type, void *unused)
 	return (Type *) Hash_Find (registered_types, type.encoding);
 }
 
++(Type *) lookup: (string) name
+{
+	return (Type *) Hash_Find (available_types, name);
+}
+
 +fromType: (qfot_type_t *) type
 {
 	if (type.size == 0) {
@@ -86,4 +91,40 @@ static string get_type_key (void *type, void *unused)
 	return self;
 }
 
+-(string) parseType
+{
+	return "no parse";
+}
+
+-(string) parseFunc
+{
+	return "0";
+}
+
+-(string) parseData
+{
+	return "0";
+}
+
+-(int) isPointer
+{
+	if ((type.meta == ty_basic || type.meta == ty_alias)
+		&& type.type == ev_pointer) {
+		return 1;
+	}
+	return 0;
+}
+
+-(Type *) dereference
+{
+	qfot_type_t *t = type;
+	if (t.meta == ty_alias) {
+		t = type.alias.full_type;
+	}
+	if (t.meta == ty_basic && t.type == ev_pointer) {
+		t = type.fldptr.aux_type;
+	}
+	return [Type findType:t];
+}
+
 @end
diff --git a/libs/video/renderer/vulkan/vkparse.plist b/libs/video/renderer/vulkan/vkparse.plist
new file mode 100644
index 000000000..3aae7c9c2
--- /dev/null
+++ b/libs/video/renderer/vulkan/vkparse.plist
@@ -0,0 +1,53 @@
+{
+	search = (
+		VkRenderPassCreateInfo
+	);
+	parse = {
+		VkRenderPassCreateInfo = {
+			flags = auto;
+			attachments = {
+				type = (array, VkAttachmentDescription);
+				size = attachmentCount;
+				values = pAttachments;
+			};
+			subpasses = {
+				type = (array, VkSubpassDescription);
+				size = subpassCount;
+				values = pSubpasses;
+			};
+			dependencies = {
+				type = (array, VkSubpassDependency);
+				size = dependencyCount;
+				values = pDependencies;
+			};
+		};
+		VkSubpassDescription = {
+			flags = auto;
+			pipelineBindPoint = auto;
+			inputAttachments = {
+				type = (array, VkAttachmentReference);
+				size = inputAttachmentCount;
+				values = pInputAttachments;
+			};
+			colorAttachments = {
+				type = (array, VkAttachmentReference);
+				size = colorAttachmentCount;
+				values = pColorAttachments;
+			};
+			resolveAttachments = {
+				type = (array, VkAttachmentReference);
+				values = pResolveAttachments;
+				matchSize = colorAttachments;
+			};
+			depthStencilAttachment = {
+				type = (single, VkAttachmentReference);
+				value = pDepthStencilAttachment;
+			};
+			preserveAttachments = {
+				type = (array, uint32_t);
+				size = preserveAttachmentCount;
+				values = pPreserveAttachments;
+			};
+		}
+	}
+}

From c6a8829a52ae878466b9ce21ed2b4ea492d203d9 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 14 Jul 2020 12:05:34 +0900
Subject: [PATCH 1177/1519] [util] Add code to parse a plist array to an array

---
 include/QF/qfplist.h | 10 +++++++++
 libs/util/qfplist.c  | 49 ++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 57 insertions(+), 2 deletions(-)

diff --git a/include/QF/qfplist.h b/include/QF/qfplist.h
index 5d719b840..089c04856 100644
--- a/include/QF/qfplist.h
+++ b/include/QF/qfplist.h
@@ -99,6 +99,14 @@ typedef struct plfield_s {
 	void       *data;		///< additional data for \a parser
 } plfield_t;
 
+typedef struct plelement_s {
+	pltype_t    type;		///< the required type of the array elements
+	size_t      stride;		///< the size of each element
+	void     *(*alloc) (size_t size);	///< allocator for array memory
+	plparser_t  parser;		///< custom parser function
+	void       *data;		///< additional data for \a parser
+} plelement_t;
+
 /** Create an in-memory representation of the contents of a property list.
 
 	\param string	the saved plist, as read from a file.
@@ -316,6 +324,8 @@ void PL_Free (plitem_t *item);
 */
 int PL_ParseDictionary (const plfield_t *fields, const plitem_t *dict,
 						void *data, plitem_t *messages);
+int PL_ParseArray (const plfield_t *fields, const plitem_t *dict,
+				   void *data, plitem_t *messages);
 
 ///@}
 
diff --git a/libs/util/qfplist.c b/libs/util/qfplist.c
index 35f136374..6949d3e53 100644
--- a/libs/util/qfplist.c
+++ b/libs/util/qfplist.c
@@ -1130,8 +1130,7 @@ PL_ParseDictionary (const plfield_t *fields, const plitem_t *dict, void *data,
 	void      **list, **l;
 	dictkey_t  *current;
 	int         result;
-	int        (*parser) (const plfield_t *, const plitem_t *, void *,
-						  plitem_t *);
+	plparser_t  parser;
 
 	if (dict->type != QFDictionary) {
 		pl_message (messages, dict, "error: not a dictionary object");
@@ -1177,3 +1176,49 @@ PL_ParseDictionary (const plfield_t *fields, const plitem_t *dict, void *data,
 	free (list);
 	return result;
 }
+
+VISIBLE int
+PL_ParseArray (const plfield_t *field, const plitem_t *array, void *data,
+			   plitem_t *messages)
+{
+	int         result;
+	plparser_t  parser;
+	plarray_t  *plarray = (plarray_t *) array->data;
+	plelement_t *element = (plelement_t *) field->data;
+	typedef struct arr_s DARRAY_TYPE(byte) arr_t;
+	arr_t      *arr;
+	plfield_t   f = { 0, 0, element->type, element->parser, element->data };
+
+	if (array->type != QFArray) {
+		pl_message (messages, array, "error: not an array object");
+		return 0;
+	}
+	if (field->parser) {
+		parser = field->parser;
+	} else {
+		parser = pl_default_parser;
+	}
+
+	arr = DARRAY_ALLOCFIXED (arr_t, plarray->numvals * element->stride,
+							 element->alloc);
+
+	for (int i = 0; i < plarray->numvals; i++) {
+		plitem_t   *item = plarray->values[i];
+		void       *eledata = &arr->a[i * element->stride];
+
+		if (item->type != element->type) {
+			pl_message (messages, item,
+						"error: element %d is the wrong type"
+						" Got %s, expected %s", i,
+						pl_types[element->type],
+						pl_types[item->type]);
+			result = 0;
+		} else {
+			if (!parser (&f, item, eledata, messages)) {
+				result = 0;
+			}
+		}
+	}
+	*(arr_t **) data = arr;
+	return result;
+}

From 79177e96e8ac9057fd3179fc569e9216ea01b942 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 16 Jul 2020 15:42:49 +0900
Subject: [PATCH 1178/1519] [vulkan] Start work on scripted pipeline

Nothing is actually done yet other than parsing the built-in property
list to property list items (the actual parser is just a skeleton), but
everything compiles
---
 libs/video/renderer/Makemodule.am             |  19 +-
 libs/video/renderer/vulkan/qfpipeline.plist   |  71 +++++++
 libs/video/renderer/vulkan/vkparse.c          | 186 ++++++++++++++++++
 libs/video/renderer/vulkan/vkparse.h          |  10 +
 libs/video/renderer/vulkan/vkparse.plist      |  22 +--
 .../video/renderer/vulkan/vulkan_vid_common.c |  18 ++
 6 files changed, 303 insertions(+), 23 deletions(-)
 create mode 100644 libs/video/renderer/vulkan/qfpipeline.plist
 create mode 100644 libs/video/renderer/vulkan/vkparse.c
 create mode 100644 libs/video/renderer/vulkan/vkparse.h

diff --git a/libs/video/renderer/Makemodule.am b/libs/video/renderer/Makemodule.am
index c41406663..0b68d0b41 100644
--- a/libs/video/renderer/Makemodule.am
+++ b/libs/video/renderer/Makemodule.am
@@ -73,12 +73,13 @@ libs_video_renderer_vid_render_gl_la_SOURCES=\
 shader_src= libs/video/renderer/glsl/quakeforge.glsl
 shader_gen= libs/video/renderer/glsl/quakeforge.slc
 
-BUILT_SOURCES += $(shader_gen)
-
-SUFFICES=.frag .vert .fc .vc .slc .glsl
+SUFFICES=.frag .vert .fc .vc .slc .glsl .plist .plc
 .glsl.slc:
 	sed -e 's/^/"/' -e 's/$$/\\n"/' $< > $@
 
+.plist.plc:
+	sed -e 's/"/\\"/g' -e 's/^/"/' -e 's/$$/\\n"/' $< > $@
+
 video_renderer_glsl_libs= \
 	libs/models/libmodels_glsl.la
 libs_video_renderer_vid_render_glsl_la_LDFLAGS=		$(plugin_ldflags)
@@ -196,6 +197,9 @@ libs_video_renderer_vid_render_sw32_la_SOURCES=\
 	libs/video/renderer/sw32/sw32_rsurf.c \
 	libs/video/renderer/sw32/vid_common_sw32.c
 
+pipeline_src = libs/video/renderer/vulkan/qfpipeline.plist
+pipeline_gen = libs/video/renderer/vulkan/qfpipeline.plc
+
 vulkan_libs =
 libs_video_renderer_vid_render_vulkan_la_LDFLAGS=       $(plugin_ldflags)
 libs_video_renderer_vid_render_vulkan_la_LIBADD=        $(vulkan_libs)
@@ -216,10 +220,14 @@ libs_video_renderer_vid_render_vulkan_la_SOURCES = \
 	libs/video/renderer/vulkan/swapchain.c \
 	libs/video/renderer/vulkan/util.c \
 	libs/video/renderer/vulkan/util.h \
+	libs/video/renderer/vulkan/vkparse.c \
 	libs/video/renderer/vulkan/vulkan_draw.c \
 	libs/video/renderer/vulkan/vulkan_vid_common.c
 
-libs/video/renderer/vulkan/vulkan_vid_common.c: $(vkparse_src)
+libs/video/renderer/vulkan/vkparse.lo: libs/video/renderer/vulkan/vkparse.c $(vkparse_src)
+
+libs/video/renderer/vulkan/vulkan_vid_common.lo: libs/video/renderer/vulkan/vulkan_vid_common.c $(pipeline_gen)
+
 
 qwaq_curses = ruamoko/qwaq/qwaq-curses$(EXEEXT)
 vkparse_src = \
@@ -240,4 +248,7 @@ CLEANFILES += \
 	libs/video/renderer/glsl/*.vc \
 	libs/video/renderer/glsl/*.fc \
 	libs/video/renderer/glsl/*.slc \
+	libs/video/renderer/vulkan/*.plc \
 	$(vkparse_src)
+
+BUILT_SOURCES += $(shader_gen)
diff --git a/libs/video/renderer/vulkan/qfpipeline.plist b/libs/video/renderer/vulkan/qfpipeline.plist
new file mode 100644
index 000000000..059405ceb
--- /dev/null
+++ b/libs/video/renderer/vulkan/qfpipeline.plist
@@ -0,0 +1,71 @@
+{
+	renderpass = {
+		attachments = (
+			{
+				flags = 0;
+				format = $swapchain.format;
+				samples = $msaaSamples;
+				loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR;
+				storeOp = VK_ATTACHMENT_STORE_OP_STORE;
+				stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
+				stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
+				initialLayout = VK_IMAGE_LAYOUT_UNDEFINED;
+				finalLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
+			},
+			{
+				flags = 0;
+				format = $swapchain.format;
+				samples = $msaaSamples;
+				loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR;
+				storeOp = VK_ATTACHMENT_STORE_OP_STORE;
+				stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
+				stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
+				initialLayout = VK_IMAGE_LAYOUT_UNDEFINED;
+				finalLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
+			},
+			{
+				flags = 0;
+				format = VK_FORMAT_D32_SFLOAT;
+				samples = VK_SAMPLE_COUNT_1_BIT;
+				loadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
+				storeOp = VK_ATTACHMENT_STORE_OP_STORE;
+				stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
+				stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
+				initialLayout = VK_IMAGE_LAYOUT_UNDEFINED;
+				finalLayout = VK_IMAGE_LAYOUT_PRESENT_SRC_KHR;
+			},
+		);
+		subpasses = (
+			{
+				inputAttachments = (
+					{
+						attachmeht = 0;
+						layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
+					}
+				);
+				resolveAttachments = (
+					{
+						attachmeht = 2;
+						layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
+					}
+				);
+				depthStencilAttachment = {
+					attachmeht = 1;
+					layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
+				};
+				preserveAttachments = ();
+			},
+		);
+		dependencies = (
+			{
+				srcSubpass = VK_SUBPASS_EXTERNAL;
+				dstSubpass = 0;
+				srcStageMask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
+				dstStageMask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
+				srcAccessMask = 0;
+				dstAccessMask = "VK_ACCESS_COLOR_ATTACHMENT_READ_BIT | VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT";
+				dependencyFlags = 0;
+			}
+		);
+	}
+}
diff --git a/libs/video/renderer/vulkan/vkparse.c b/libs/video/renderer/vulkan/vkparse.c
new file mode 100644
index 000000000..51df46a6e
--- /dev/null
+++ b/libs/video/renderer/vulkan/vkparse.c
@@ -0,0 +1,186 @@
+/*
+	vkparse.c
+
+	Parser for scripted vulkan structs
+
+	Copyright (C) 2020      Bill Currie <bill@taniwha.org>
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifdef HAVE_MATH_H
+# include <math.h>
+#endif
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+
+#include "QF/cvar.h"
+#include "QF/dstring.h"
+#include "QF/input.h"
+#include "QF/mathlib.h"
+#include "QF/qargs.h"
+#include "QF/qfplist.h"
+#include "QF/quakefs.h"
+#include "QF/sys.h"
+#include "QF/va.h"
+#include "QF/vid.h"
+#include "QF/Vulkan/qf_vid.h"
+#include "QF/Vulkan/device.h"
+#include "QF/Vulkan/command.h"
+#include "QF/Vulkan/instance.h"
+#include "QF/Vulkan/image.h"
+#include "QF/Vulkan/renderpass.h"
+#include "QF/Vulkan/swapchain.h"
+
+#include "compat.h"
+#include "d_iface.h"
+#include "r_internal.h"
+#include "vid_vulkan.h"
+
+#include "util.h"
+#include "vkparse.h"
+
+typedef struct enumval_s {
+	const char *name;
+	int         value;
+} enumval_t;
+
+typedef struct parse_single_s {
+	plparser_t  parser;
+	size_t      value_offset;
+} parse_single_t;
+
+typedef struct parse_array_s {
+	plparser_t  parser;
+	size_t      size_offset;
+	size_t      value_offset;
+} parse_array_t;
+
+static int parse_uint32_t (const plfield_t *field, const plitem_t *item,
+						   void *data, plitem_t *messages)
+{
+	return 0;
+}
+
+static int parse_enum (const plfield_t *field, const plitem_t *item,
+					   void *data, plitem_t *messages)
+{
+	return 0;
+}
+
+static int parse_flags (const plfield_t *field, const plitem_t *item,
+						void *data, plitem_t *messages)
+{
+	return 0;
+}
+
+static int parse_single (const plfield_t *field, const plitem_t *item,
+						 void *data, plitem_t *messages)
+{
+	return 0;
+}
+
+static int parse_array (const plfield_t *field, const plitem_t *item,
+						void *data, plitem_t *messages)
+{
+	return 0;
+}
+
+#include "libs/video/renderer/vulkan/vkparse.inc"
+
+typedef struct qfv_renderpass_s {
+	qfv_attachmentdescription_t *attachments;
+	qfv_subpassparametersset_t *subpasses;
+	qfv_subpassdependency_t *dependencies;
+} qfv_renderpass_t;
+
+static plelement_t parse_qfv_renderpass_attachments_data = {
+	QFDictionary,
+	sizeof (VkAttachmentDescription),
+	malloc,
+	parse_VkAttachmentDescription,
+	0,
+};
+
+static plelement_t parse_qfv_renderpass_subpasses_data = {
+	QFDictionary,
+	sizeof (VkSubpassDescription),
+	malloc,
+	parse_VkSubpassDescription,
+	0,
+};
+
+static plelement_t parse_qfv_renderpass_dependencies_data = {
+	QFDictionary,
+	sizeof (VkSubpassDependency),
+	malloc,
+	parse_VkSubpassDependency,
+	0,
+};
+
+static plfield_t renderpass_fields[] = {
+	{ "attachments", field_offset (qfv_renderpass_t, attachments), QFArray,
+		parse_array, &parse_qfv_renderpass_attachments_data },
+	{ "subpasses", field_offset (qfv_renderpass_t, subpasses), QFArray,
+		parse_array, &parse_qfv_renderpass_subpasses_data },
+	{ "dependencies", field_offset (qfv_renderpass_t, dependencies), QFArray,
+		parse_array, &parse_qfv_renderpass_dependencies_data },
+	{}
+};
+
+VkRenderPass
+QFV_ParseRenderPass (qfv_device_t *device, plitem_t *plist)
+{
+	qfv_renderpass_t renderpass_data = {};
+	plitem_t   *messages = PL_NewArray ();
+	VkRenderPass renderpass;
+
+	if (!PL_ParseDictionary (renderpass_fields, plist,
+							 &renderpass_data, messages)) {
+		for (int i = 0; i < PL_A_NumObjects (messages); i++) {
+			Sys_Printf ("%s\n", PL_String (PL_ObjectAtIndex (messages, i)));
+		}
+		return 0;
+	}
+	PL_Free (messages);
+	renderpass = QFV_CreateRenderPass (device,
+									   renderpass_data.attachments,
+									   renderpass_data.subpasses,
+									   renderpass_data.dependencies);
+
+	free (renderpass_data.attachments);
+	for (size_t i = 0; i < renderpass_data.subpasses->size; i++) {
+		free ((void *) renderpass_data.subpasses->a[i].pInputAttachments);
+		free ((void *) renderpass_data.subpasses->a[i].pColorAttachments);
+		free ((void *) renderpass_data.subpasses->a[i].pResolveAttachments);
+		free ((void *) renderpass_data.subpasses->a[i].pDepthStencilAttachment);
+		free ((void *) renderpass_data.subpasses->a[i].pPreserveAttachments);
+	}
+	free (renderpass_data.subpasses);
+	free (renderpass_data.dependencies);
+	return renderpass;
+}
diff --git a/libs/video/renderer/vulkan/vkparse.h b/libs/video/renderer/vulkan/vkparse.h
new file mode 100644
index 000000000..0d14eecbe
--- /dev/null
+++ b/libs/video/renderer/vulkan/vkparse.h
@@ -0,0 +1,10 @@
+#ifndef __vkparse_h
+#define __vkparse_h
+
+#include "QF/Vulkan/renderpass.h"
+
+VkRenderPass
+QFV_ParseRenderPass (qfv_device_t *device, plitem_t *plist);
+
+
+#endif//__vkparse_h
diff --git a/libs/video/renderer/vulkan/vkparse.plist b/libs/video/renderer/vulkan/vkparse.plist
index 3aae7c9c2..017025426 100644
--- a/libs/video/renderer/vulkan/vkparse.plist
+++ b/libs/video/renderer/vulkan/vkparse.plist
@@ -1,26 +1,10 @@
 {
 	search = (
-		VkRenderPassCreateInfo
+		VkAttachmentDescription,
+		VkSubpassDescription,
+		VkSubpassDependency,
 	);
 	parse = {
-		VkRenderPassCreateInfo = {
-			flags = auto;
-			attachments = {
-				type = (array, VkAttachmentDescription);
-				size = attachmentCount;
-				values = pAttachments;
-			};
-			subpasses = {
-				type = (array, VkSubpassDescription);
-				size = subpassCount;
-				values = pSubpasses;
-			};
-			dependencies = {
-				type = (array, VkSubpassDependency);
-				size = dependencyCount;
-				values = pDependencies;
-			};
-		};
 		VkSubpassDescription = {
 			flags = auto;
 			pipelineBindPoint = auto;
diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c
index 68dd2bbe8..6f0ba9892 100644
--- a/libs/video/renderer/vulkan/vulkan_vid_common.c
+++ b/libs/video/renderer/vulkan/vulkan_vid_common.c
@@ -44,6 +44,7 @@
 #include "QF/input.h"
 #include "QF/mathlib.h"
 #include "QF/qargs.h"
+#include "QF/qfplist.h"
 #include "QF/quakefs.h"
 #include "QF/sys.h"
 #include "QF/va.h"
@@ -63,6 +64,10 @@
 
 #include "util.h"
 
+static const char quakeforge_pipeline[] =
+#include "libs/video/renderer/vulkan/qfpipeline.plc"
+;
+
 cvar_t *vulkan_presentation_mode;
 
 static void
@@ -232,9 +237,22 @@ static qfv_pipelinestagepair_t imageLayoutTransitionStages[] = {
 		VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT },
 };
 
+static plitem_t *
+qfv_load_pipeline (void)
+{
+	return PL_GetPropertyList (quakeforge_pipeline);
+}
+
 void
 Vulkan_CreateRenderPass (vulkan_ctx_t *ctx)
 {
+	plitem_t   *item = qfv_load_pipeline ();
+
+	if (!item || !(item = PL_ObjectForKey (item, "renderpass"))) {
+		Sys_Printf ("error loading pipeline\n");
+	} else {
+		Sys_Printf ("Found renderer def\n");
+	}
 	qfv_device_t *device = ctx->device;
 	VkDevice    dev = device->dev;
 	qfv_devfuncs_t *df = device->funcs;

From 8290e3800f684aac2abeb5e253978804dcadfff2 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 16 Jul 2020 15:44:37 +0900
Subject: [PATCH 1179/1519] [qwaq] Ensure main thread return code gets returned

Needed for catching vkgen errors during the build.
---
 ruamoko/qwaq/builtins/main.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ruamoko/qwaq/builtins/main.c b/ruamoko/qwaq/builtins/main.c
index c4c426166..0a4faf28b 100644
--- a/ruamoko/qwaq/builtins/main.c
+++ b/ruamoko/qwaq/builtins/main.c
@@ -480,6 +480,7 @@ main (int argc, char **argv)
 			}
 		}
 		pthread_join (thread_data.a[main_ind]->thread_id, 0);
+		ret = thread_data.a[main_ind]->return_code;
 	}
 
 	Sys_Shutdown ();

From 72f583f16f3c2a3b997bc73c323bea672ddbf65b Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 16 Jul 2020 21:12:05 +0900
Subject: [PATCH 1180/1519] [util] Fix some plist object parsing errors

Forgot to break after finding the field when parsing a dictionary
object, and use the correct parser for array objects.
---
 libs/util/qfplist.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libs/util/qfplist.c b/libs/util/qfplist.c
index 6949d3e53..26476e44d 100644
--- a/libs/util/qfplist.c
+++ b/libs/util/qfplist.c
@@ -1165,6 +1165,7 @@ PL_ParseDictionary (const plfield_t *fields, const plitem_t *dict, void *data,
 						result = 0;
 					}
 				}
+				break;
 			}
 		}
 		if (!f->name) {
@@ -1193,8 +1194,8 @@ PL_ParseArray (const plfield_t *field, const plitem_t *array, void *data,
 		pl_message (messages, array, "error: not an array object");
 		return 0;
 	}
-	if (field->parser) {
-		parser = field->parser;
+	if (f.parser) {
+		parser = f.parser;
 	} else {
 		parser = pl_default_parser;
 	}

From ef33adac568af526f66612b42335f62a33c8731c Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 16 Jul 2020 22:02:26 +0900
Subject: [PATCH 1181/1519] [util] Make PL_String const correct

---
 include/QF/qfplist.h | 2 +-
 libs/util/qfplist.c  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/QF/qfplist.h b/include/QF/qfplist.h
index 089c04856..43eef595b 100644
--- a/include/QF/qfplist.h
+++ b/include/QF/qfplist.h
@@ -147,7 +147,7 @@ int PL_Line (plitem_t *item) __attribute__((pure));
 	\note	You are NOT responsible for freeing the returned object. It will
 	be destroyed when its container is.
 */
-const char *PL_String (plitem_t *string) __attribute__((pure));
+const char *PL_String (const plitem_t *string) __attribute__((pure));
 
 /** Retrieve a value from a dictionary object.
 
diff --git a/libs/util/qfplist.c b/libs/util/qfplist.c
index 26476e44d..650be7741 100644
--- a/libs/util/qfplist.c
+++ b/libs/util/qfplist.c
@@ -232,7 +232,7 @@ PL_Free (plitem_t *item)
 }
 
 VISIBLE const char *
-PL_String (plitem_t *string)
+PL_String (const plitem_t *string)
 {
 	if (string->type != QFString)
 		return NULL;

From 26cd93f78877feb222349746a95de8b22994095b Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 16 Jul 2020 22:04:33 +0900
Subject: [PATCH 1182/1519] [util] Expose PL_Message

It's far to useful elsewhere.
---
 include/QF/qfplist.h |  2 ++
 libs/util/qfplist.c  | 16 ++++++++--------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/include/QF/qfplist.h b/include/QF/qfplist.h
index 43eef595b..011090818 100644
--- a/include/QF/qfplist.h
+++ b/include/QF/qfplist.h
@@ -326,6 +326,8 @@ int PL_ParseDictionary (const plfield_t *fields, const plitem_t *dict,
 						void *data, plitem_t *messages);
 int PL_ParseArray (const plfield_t *fields, const plitem_t *dict,
 				   void *data, plitem_t *messages);
+void __attribute__((format(printf,3,4)))
+PL_Message (plitem_t *messages, const plitem_t *item, const char *fmt, ...);
 
 ///@}
 
diff --git a/libs/util/qfplist.c b/libs/util/qfplist.c
index 650be7741..6d3ff018d 100644
--- a/libs/util/qfplist.c
+++ b/libs/util/qfplist.c
@@ -1062,8 +1062,8 @@ PL_Line (plitem_t *item)
 	return item->line;
 }
 
-static void __attribute__((format(printf,3,4)))
-pl_message (plitem_t *messages, const plitem_t *item, const char *fmt, ...)
+VISIBLE void
+PL_Message (plitem_t *messages, const plitem_t *item, const char *fmt, ...)
 {
 	va_list     args;
 	dstring_t  *string;
@@ -1119,7 +1119,7 @@ pl_default_parser (const plfield_t *field, const plitem_t *item, void *data,
 			*(char **)data = (char *)item->data;
 			return 1;
 	}
-	pl_message (messages, 0, "invalid item type: %d", field->type);
+	PL_Message (messages, 0, "invalid item type: %d", field->type);
 	return 0;
 }
 
@@ -1133,7 +1133,7 @@ PL_ParseDictionary (const plfield_t *fields, const plitem_t *dict, void *data,
 	plparser_t  parser;
 
 	if (dict->type != QFDictionary) {
-		pl_message (messages, dict, "error: not a dictionary object");
+		PL_Message (messages, dict, "error: not a dictionary object");
 		return 0;
 	}
 
@@ -1155,7 +1155,7 @@ PL_ParseDictionary (const plfield_t *fields, const plitem_t *dict, void *data,
 					parser = pl_default_parser;
 				}
 				if (item->type != f->type) {
-					pl_message (messages, item, "error: %s is the wrong type"
+					PL_Message (messages, item, "error: %s is the wrong type"
 								" Got %s, expected %s",current->key,
 								pl_types[f->type],
 								pl_types[item->type]);
@@ -1169,7 +1169,7 @@ PL_ParseDictionary (const plfield_t *fields, const plitem_t *dict, void *data,
 			}
 		}
 		if (!f->name) {
-			pl_message (messages, dict, "error: unknown field %s",
+			PL_Message (messages, dict, "error: unknown field %s",
 						current->key);
 			result = 0;
 		}
@@ -1191,7 +1191,7 @@ PL_ParseArray (const plfield_t *field, const plitem_t *array, void *data,
 	plfield_t   f = { 0, 0, element->type, element->parser, element->data };
 
 	if (array->type != QFArray) {
-		pl_message (messages, array, "error: not an array object");
+		PL_Message (messages, array, "error: not an array object");
 		return 0;
 	}
 	if (f.parser) {
@@ -1208,7 +1208,7 @@ PL_ParseArray (const plfield_t *field, const plitem_t *array, void *data,
 		void       *eledata = &arr->a[i * element->stride];
 
 		if (item->type != element->type) {
-			pl_message (messages, item,
+			PL_Message (messages, item,
 						"error: element %d is the wrong type"
 						" Got %s, expected %s", i,
 						pl_types[element->type],

From 16c6818612a9690a221f4b80e0ecf2242bb54fee Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 16 Jul 2020 22:05:15 +0900
Subject: [PATCH 1183/1519] [util] Set parsed array size correctly

The array has to be allocated using byte elements and thus the size of
the array is the number of bytes, but it needs to be the actual number
of elements in the array. Problem caused by not knowing the actual type
(and C not having type variables anyway).
---
 libs/util/qfplist.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libs/util/qfplist.c b/libs/util/qfplist.c
index 6d3ff018d..ab24a9499 100644
--- a/libs/util/qfplist.c
+++ b/libs/util/qfplist.c
@@ -1202,6 +1202,10 @@ PL_ParseArray (const plfield_t *field, const plitem_t *array, void *data,
 
 	arr = DARRAY_ALLOCFIXED (arr_t, plarray->numvals * element->stride,
 							 element->alloc);
+	memset (arr->a, 0, arr->size);
+	// the array is allocated using bytes, but need the actual number of
+	// elements in the array
+	arr->size = arr->maxSize = plarray->numvals;
 
 	for (int i = 0; i < plarray->numvals; i++) {
 		plitem_t   *item = plarray->values[i];

From 2b23e01d9af5f2cbc7ecc841e8ebbd633e81e6ba Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 17 Jul 2020 00:22:47 +0900
Subject: [PATCH 1184/1519] [util] Make PL_Type and PL_Line const-correct

---
 include/QF/qfplist.h | 4 ++--
 libs/util/qfplist.c  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/QF/qfplist.h b/include/QF/qfplist.h
index 011090818..3fdfa7825 100644
--- a/include/QF/qfplist.h
+++ b/include/QF/qfplist.h
@@ -129,7 +129,7 @@ char *PL_WritePropertyList (plitem_t *pl);
 	\param item The object
 	\return the type of the object
 */
-pltype_t PL_Type (plitem_t *item) __attribute__((pure));
+pltype_t PL_Type (const plitem_t *item) __attribute__((pure));
 
 /** Retrieve the line number of an object.
 
@@ -137,7 +137,7 @@ pltype_t PL_Type (plitem_t *item) __attribute__((pure));
 	\return the line number on which the object began, or 0 if not from a
 			string
 */
-int PL_Line (plitem_t *item) __attribute__((pure));
+int PL_Line (const plitem_t *item) __attribute__((pure));
 
 /** Retrieve a string from a string object.
 
diff --git a/libs/util/qfplist.c b/libs/util/qfplist.c
index ab24a9499..2b96ecdf4 100644
--- a/libs/util/qfplist.c
+++ b/libs/util/qfplist.c
@@ -1051,13 +1051,13 @@ PL_WritePropertyList (plitem_t *pl)
 }
 
 VISIBLE pltype_t
-PL_Type (plitem_t *item)
+PL_Type (const plitem_t *item)
 {
 	return item->type;
 }
 
 VISIBLE int
-PL_Line (plitem_t *item)
+PL_Line (const plitem_t *item)
 {
 	return item->line;
 }

From 9f4f63796beba75470ac87d86f8686946c3b9890 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 17 Jul 2020 00:23:09 +0900
Subject: [PATCH 1185/1519] [util] Fix some unitialized vars

Not sure how they got past gcc. Maybe a bug in 9.3.0?
---
 libs/util/qfplist.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libs/util/qfplist.c b/libs/util/qfplist.c
index 2b96ecdf4..8eb7e867c 100644
--- a/libs/util/qfplist.c
+++ b/libs/util/qfplist.c
@@ -1129,7 +1129,7 @@ PL_ParseDictionary (const plfield_t *fields, const plitem_t *dict, void *data,
 {
 	void      **list, **l;
 	dictkey_t  *current;
-	int         result;
+	int         result = 1;
 	plparser_t  parser;
 
 	if (dict->type != QFDictionary) {
@@ -1182,7 +1182,7 @@ VISIBLE int
 PL_ParseArray (const plfield_t *field, const plitem_t *array, void *data,
 			   plitem_t *messages)
 {
-	int         result;
+	int         result = 1;
 	plparser_t  parser;
 	plarray_t  *plarray = (plarray_t *) array->data;
 	plelement_t *element = (plelement_t *) field->data;

From 8184c546dbed052ad807ef79ba0f4b948454e09f Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 17 Jul 2020 00:24:41 +0900
Subject: [PATCH 1186/1519] [vulkan] Fix dereference for non-pointer aliases

Fixes breakage for uint32_t for array/single handling.
---
 libs/video/renderer/vulkan/vkgen/vktype.r | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/video/renderer/vulkan/vkgen/vktype.r b/libs/video/renderer/vulkan/vkgen/vktype.r
index 83373d47a..caa7ac057 100644
--- a/libs/video/renderer/vulkan/vkgen/vktype.r
+++ b/libs/video/renderer/vulkan/vkgen/vktype.r
@@ -118,7 +118,7 @@ static string get_type_key (void *type, void *unused)
 -(Type *) dereference
 {
 	qfot_type_t *t = type;
-	if (t.meta == ty_alias) {
+	if (t.meta == ty_alias && t.type == ev_pointer) {
 		t = type.alias.full_type;
 	}
 	if (t.meta == ty_basic && t.type == ev_pointer) {

From f4c8d341e13162aa5b65c1fd5609332948bfe122 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 17 Jul 2020 00:29:53 +0900
Subject: [PATCH 1187/1519] [vulkan] Implement most of the parser

This gets renderpass parsing almost working (not hooked up, though). The
missing bits are support for expressions for flags (namely support for
the | operator) and references (eg $swapchain.format). However, this
shows that the basic concept for the parser is working.
---
 libs/video/renderer/vulkan/vkgen/vkstruct.r |   2 +
 libs/video/renderer/vulkan/vkparse.c        | 133 ++++++++++++++++++--
 2 files changed, 126 insertions(+), 9 deletions(-)

diff --git a/libs/video/renderer/vulkan/vkgen/vkstruct.r b/libs/video/renderer/vulkan/vkgen/vkstruct.r
index ff364202b..dc6aa39d6 100644
--- a/libs/video/renderer/vulkan/vkgen/vkstruct.r
+++ b/libs/video/renderer/vulkan/vkgen/vkstruct.r
@@ -74,6 +74,8 @@
 			field_type = [[Type lookup: type_type] dereference];
 			fprintf (output_file, "static parse_%s_t parse_%s_%s_data = {\n",
 					 type_record, [self name], field_name);
+			fprintf (output_file, "\t%s,\n", [field_type parseType]);
+			fprintf (output_file, "\tsizeof (%s),\n", type_type);
 			fprintf (output_file, "\tparse_%s,\n", type_type);
 			if (type_record == "single") {
 				value_field = [[field_def getObjectForKey:"value"] string];
diff --git a/libs/video/renderer/vulkan/vkparse.c b/libs/video/renderer/vulkan/vkparse.c
index 51df46a6e..7fb137b29 100644
--- a/libs/video/renderer/vulkan/vkparse.c
+++ b/libs/video/renderer/vulkan/vkparse.c
@@ -70,44 +70,159 @@ typedef struct enumval_s {
 } enumval_t;
 
 typedef struct parse_single_s {
+	pltype_t    type;
+	size_t      stride;
 	plparser_t  parser;
 	size_t      value_offset;
 } parse_single_t;
 
 typedef struct parse_array_s {
+	pltype_t    type;
+	size_t      stride;
 	plparser_t  parser;
-	size_t      size_offset;
 	size_t      value_offset;
+	size_t      size_offset;
 } parse_array_t;
 
+static int find_enum (const char *valstr, enumval_t *enumval, int *val)
+{
+	while (enumval->name && strcmp (enumval->name, valstr) != 0) {
+		enumval++;
+	}
+	if (enumval->name) {
+		*val = enumval->value;
+		return 1;
+	}
+	return 0;
+}
+
 static int parse_uint32_t (const plfield_t *field, const plitem_t *item,
 						   void *data, plitem_t *messages)
 {
-	return 0;
+	int         ret = 1;
+	const char *valstr = PL_String (item);
+	//Sys_Printf ("parse_uint32_t: %s %zd %d %p %p: %s\n",
+	//			field->name, field->offset, field->type, field->parser,
+	//			field->data, valstr);
+	if (strcmp (valstr, "VK_SUBPASS_EXTERNAL") == 0) {
+		*(uint32_t *) data = VK_SUBPASS_EXTERNAL;
+	} else {
+		char       *end;
+		unsigned long val = strtoul (valstr, &end, 0);
+		if (*valstr && !*end && val <= 0xffffffff) {
+			*(uint32_t *) data = val;
+		} else if (val > 0xffffffff) {
+			PL_Message (messages, item, "%lu bigger than 32 bits", val);
+			ret = 0;
+		} else {
+			PL_Message (messages, item, "invalid char at %d in '%s'\n",
+						(int) (end - valstr), valstr);
+			ret = 0;
+		}
+	}
+
+	return ret;
 }
 
 static int parse_enum (const plfield_t *field, const plitem_t *item,
 					   void *data, plitem_t *messages)
 {
-	return 0;
+	int         ret = 1;
+	int         val;
+	const char *valstr = PL_String (item);
+	__auto_type enumval = (enumval_t *) field->data;
+	//Sys_Printf ("parse_enum: %s %zd %d %p %p %s\n",
+	//			field->name, field->offset, field->type, field->parser,
+	//			field->data, valstr);
+	if (find_enum (valstr, enumval, &val)) {
+		*(int *) data = val;
+	} else {
+		PL_Message (messages, item, "invalid enum: %s", valstr);
+		ret = 0;
+	}
+	return ret;
 }
 
 static int parse_flags (const plfield_t *field, const plitem_t *item,
 						void *data, plitem_t *messages)
 {
-	return 0;
+	int         ret = 1;
+	int         val;
+	const char *valstr = PL_String (item);
+	__auto_type enumval = (enumval_t *) field->data;
+	//Sys_Printf ("parse_flags: %s %zd %d %p %p %s\n",
+	//			field->name, field->offset, field->type, field->parser,
+	//			field->data, valstr);
+	if (find_enum (valstr, enumval, &val)) {
+		*(int *) data = val;
+	} else if (strcmp (valstr, "0") == 0) {
+		*(int *) data = 0;
+	} else {
+		PL_Message (messages, item, "invalid enum: %s", valstr);
+		ret = 0;
+	}
+	return ret;
 }
 
 static int parse_single (const plfield_t *field, const plitem_t *item,
 						 void *data, plitem_t *messages)
 {
-	return 0;
+	__auto_type single = (parse_single_t *) field->data;
+	void       *flddata = (byte *)data + single->value_offset;
+
+	//Sys_Printf ("parse_single: %s %zd %d %p %p\n", field->name, field->offset,
+	//			field->type, field->parser, field->data);
+
+	if (PL_Type (item) != single->type) {
+		PL_Message (messages, item, "error: wrong type");
+		return 0;
+	}
+
+	plfield_t   f = { 0, 0, single->type, single->parser, 0 };
+	void       *value = calloc (1, single->stride);
+	if (!single->parser (&f, item, value, messages)) {
+		free (value);
+		return 0;
+	}
+
+	*(void **) flddata = value;
+	return 1;
 }
 
 static int parse_array (const plfield_t *field, const plitem_t *item,
 						void *data, plitem_t *messages)
 {
-	return 0;
+	__auto_type array = (parse_array_t *) field->data;
+	__auto_type value = (void **) ((byte *)data + array->value_offset);
+	__auto_type size = (uint32_t *) ((byte *)data + array->size_offset);
+
+	plelement_t element = {
+		array->type,
+		array->stride,
+		malloc,
+		array->parser,
+		0,
+	};
+	plfield_t   f = { 0, 0, 0, 0, &element };
+
+	typedef struct arr_s DARRAY_TYPE(byte) arr_t;
+	arr_t      *arr;
+
+	//Sys_Printf ("parse_array: %s %zd %d %p %p %p\n",
+	//			field->name, field->offset, field->type, field->parser,
+	//			field->data, data);
+	//Sys_Printf ("    %d %zd %p %zd %zd\n", array->type, array->stride,
+	//			array->parser, array->value_offset, array->size_offset);
+	if (!PL_ParseArray (&f, item, &arr, messages)) {
+		return 0;
+	}
+	*value = malloc (array->stride * arr->size);
+	memcpy (*value, arr->a, array->stride * arr->size);
+	if ((void *) size > data) {
+		*size = arr->size;
+	}
+	free (arr);
+	return 1;
 }
 
 #include "libs/video/renderer/vulkan/vkparse.inc"
@@ -144,11 +259,11 @@ static plelement_t parse_qfv_renderpass_dependencies_data = {
 
 static plfield_t renderpass_fields[] = {
 	{ "attachments", field_offset (qfv_renderpass_t, attachments), QFArray,
-		parse_array, &parse_qfv_renderpass_attachments_data },
+		PL_ParseArray, &parse_qfv_renderpass_attachments_data },
 	{ "subpasses", field_offset (qfv_renderpass_t, subpasses), QFArray,
-		parse_array, &parse_qfv_renderpass_subpasses_data },
+		PL_ParseArray, &parse_qfv_renderpass_subpasses_data },
 	{ "dependencies", field_offset (qfv_renderpass_t, dependencies), QFArray,
-		parse_array, &parse_qfv_renderpass_dependencies_data },
+		PL_ParseArray, &parse_qfv_renderpass_dependencies_data },
 	{}
 };
 

From 91ff15ca7c306eb4f0659f2befd2570fa7630c9d Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 17 Jul 2020 00:33:00 +0900
Subject: [PATCH 1188/1519] [vulkan] Correct some plist errors in the
 renderpass

Typos and incorrect attachment array reference.
---
 libs/video/renderer/vulkan/qfpipeline.plist | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libs/video/renderer/vulkan/qfpipeline.plist b/libs/video/renderer/vulkan/qfpipeline.plist
index 059405ceb..1c594aee0 100644
--- a/libs/video/renderer/vulkan/qfpipeline.plist
+++ b/libs/video/renderer/vulkan/qfpipeline.plist
@@ -37,20 +37,20 @@
 		);
 		subpasses = (
 			{
-				inputAttachments = (
+				colorAttachments = (
 					{
-						attachmeht = 0;
+						attachment = 0;
 						layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
 					}
 				);
 				resolveAttachments = (
 					{
-						attachmeht = 2;
+						attachment = 2;
 						layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
 					}
 				);
 				depthStencilAttachment = {
-					attachmeht = 1;
+					attachment = 1;
 					layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
 				};
 				preserveAttachments = ();

From 900728169e647b01877184eb512c8fe0416b371c Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 17 Jul 2020 01:20:02 +0900
Subject: [PATCH 1189/1519] [build] Support silent rules for sed

---
 libs/video/renderer/Makemodule.am | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/libs/video/renderer/Makemodule.am b/libs/video/renderer/Makemodule.am
index 0b68d0b41..1077ef6ca 100644
--- a/libs/video/renderer/Makemodule.am
+++ b/libs/video/renderer/Makemodule.am
@@ -73,12 +73,19 @@ libs_video_renderer_vid_render_gl_la_SOURCES=\
 shader_src= libs/video/renderer/glsl/quakeforge.glsl
 shader_gen= libs/video/renderer/glsl/quakeforge.slc
 
+V_SED = $(V_SED_@AM_V@)
+V_SED_ = $(V_SED_@AM_DEFAULT_V@)
+V_SED_0 = @echo "  SED     " $@;
+V_SED_1 =
+
 SUFFICES=.frag .vert .fc .vc .slc .glsl .plist .plc
 .glsl.slc:
-	sed -e 's/^/"/' -e 's/$$/\\n"/' $< > $@
+	$(V_SED)sed -e 's/^/"/' -e 's/$$/\\n"/' $< > $@.t &&\
+	$(am__mv) $@.t $@
 
 .plist.plc:
-	sed -e 's/"/\\"/g' -e 's/^/"/' -e 's/$$/\\n"/' $< > $@
+	$(V_SED)sed -e 's/"/\\"/g' -e 's/^/"/' -e 's/$$/\\n"/' $< > $@.t &&\
+	$(am__mv) $@.t $@
 
 video_renderer_glsl_libs= \
 	libs/models/libmodels_glsl.la
@@ -249,6 +256,7 @@ CLEANFILES += \
 	libs/video/renderer/glsl/*.fc \
 	libs/video/renderer/glsl/*.slc \
 	libs/video/renderer/vulkan/*.plc \
+	libs/video/renderer/vulkan/vkgen.sym \
 	$(vkparse_src)
 
 BUILT_SOURCES += $(shader_gen)

From 3413947e0cc6d50fb103feda206cec15159f569d Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 17 Jul 2020 20:11:44 +0900
Subject: [PATCH 1190/1519] [qfmap] Update script.py from io_object_mu

While not necessary for qf (at this stage), this brings in support for
optionally not parsing strings and better utf-8 and wide char handling.
---
 tools/io_qfmap/script.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/tools/io_qfmap/script.py b/tools/io_qfmap/script.py
index 9e34934f9..fc030e3e5 100644
--- a/tools/io_qfmap/script.py
+++ b/tools/io_qfmap/script.py
@@ -25,10 +25,15 @@ class ScriptError(Exception):
         self.line = line
 
 class Script:
-    def __init__(self, filename, text, single="{}()':"):
+    def __init__(self, filename, text, single="{}()':", quotes=True):
         self.filename = filename
+        if text[0:3] == "\xef\xbb\xbf":
+            text = text[3:]
+        elif text[0] == u"\ufeff":
+            text = text[1:]
         self.text = text
         self.single = single
+        self.quotes = quotes
         self.pos = 0
         self.line = 1
         self.unget = False
@@ -87,7 +92,7 @@ class Script:
             if not crossline:
                 self.error("line is incomplete")
             return None
-        if self.text[self.pos] == "\"":
+        if self.quotes and self.text[self.pos] == "\"":
             self.pos += 1
             start = self.pos
             if self.text[self.pos] == len(self.text):

From 92aa94d776380513f1c8898aab8e3df2df78db73 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 17 Aug 2020 11:30:53 +0900
Subject: [PATCH 1191/1519] [ruamoko] Fix incorrect clearing of dtables

The problem was caused by passing the index into the dtables array to
dtable_get which expects a handle. A handle is the ones-compliment
negative of the index which means that handle 0 is invalid (but 0 was
being passed... oops). Fixes the segfault when qw-client-x11 connects to
a server.
---
 libs/ruamoko/rua_obj.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libs/ruamoko/rua_obj.c b/libs/ruamoko/rua_obj.c
index 7ecc8ef28..baa8fe73b 100644
--- a/libs/ruamoko/rua_obj.c
+++ b/libs/ruamoko/rua_obj.c
@@ -2192,7 +2192,10 @@ rua_obj_cleanup (progs_t *pr, void *data)
 	}
 
 	for (i = 0; i < probj->dtables._size; i++) {
-		dtable_t   *dtable = dtable_get (probj, i);
+		/* dtable_get expects a handle, but a handle is the ones-compliment
+		 * negative of the index.
+		 */
+		dtable_t   *dtable = dtable_get (probj, ~i);
 		if (!dtable->imp) {
 			break;
 		}

From fdcdbefc05dbb0ad6e90523c6f6e21cf570fc84c Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 17 Aug 2020 13:07:21 +0900
Subject: [PATCH 1192/1519] [sizebuf] Add function to dump contents of a buffer

The usual 8-bit hex + chars (with chars wrapped into 7-bits) with
addresses block.
---
 include/QF/sizebuf.h |  1 +
 libs/util/sizebuf.c  | 31 +++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/include/QF/sizebuf.h b/include/QF/sizebuf.h
index 08436b1b8..a6fc39411 100644
--- a/include/QF/sizebuf.h
+++ b/include/QF/sizebuf.h
@@ -50,6 +50,7 @@ void SZ_Clear (sizebuf_t *buf);
 void *SZ_GetSpace (sizebuf_t *buf, int length);
 void SZ_Write (sizebuf_t *buf, const void *data, int length);
 void SZ_Print (sizebuf_t *buf, const char *data);	// strcats onto the sizebuf
+void SZ_Dump (sizebuf_t *buf);
 
 ///@}
 
diff --git a/libs/util/sizebuf.c b/libs/util/sizebuf.c
index 757672367..785287d0c 100644
--- a/libs/util/sizebuf.c
+++ b/libs/util/sizebuf.c
@@ -99,3 +99,34 @@ SZ_Print (sizebuf_t *buf, const char *data)
 
 	memcpy (SZ_GetSpace (buf, len), data, len);
 }
+
+VISIBLE void
+SZ_Dump (sizebuf_t *buf)
+{
+	int         i;
+	char        chars[17], c;
+
+	chars[16] = 0;
+	for (i = 0; i < buf->cursize; i++) {
+		if (i % 16 == 0) {
+			Sys_Printf ("%04x:", i);
+		} else if (i % 16 == 8) {
+			Sys_Printf (" ");
+		}
+		Sys_Printf (" %02x", buf->data[i]);
+		c = buf->data[i] & 0x7f;
+		if (c < ' ') {
+			c = '.';
+		}
+		chars[i % 16] = c;
+		if (i % 16 == 15) {
+			Sys_Printf ("  %s\n", chars);
+		}
+	}
+	i %= 16;
+	if (i) {
+		chars[i] = 0;
+		i = 16 - i;
+		Sys_Printf ("%*s  %s\n", i * 3 + (i > 7), "", chars);
+	}
+}

From 09384eb70388b1113417d2df01f6e2b73ab644df Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 17 Aug 2020 13:08:49 +0900
Subject: [PATCH 1193/1519] [netchan] Optionally dump the contents of packets

---
 libs/net/net_chan.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/libs/net/net_chan.c b/libs/net/net_chan.c
index 88f7ad08e..61f125117 100644
--- a/libs/net/net_chan.c
+++ b/libs/net/net_chan.c
@@ -257,12 +257,16 @@ Netchan_Transmit (netchan_t *chan, int length, byte *data)
 	if (net_nochoke)
 		chan->cleartime = *net_realtime;
 
-	if (showpackets->int_val & 1)
+	if (showpackets->int_val & 1) {
 		Sys_Printf ("--> s=%i(%i) a=%i(%i) %-4i %i\n",
 					chan->outgoing_sequence, send_reliable,
 					chan->incoming_sequence, chan->incoming_reliable_sequence,
 					send.cursize,
 					chan->outgoing_sequence - chan->incoming_sequence);
+		if (showpackets->int_val & 4) {
+			SZ_Dump (&send);
+		}
+	}
 }
 
 qboolean
@@ -289,9 +293,13 @@ Netchan_Process (netchan_t *chan)
 	sequence &= ~(1 << 31);
 	sequence_ack &= ~(1 << 31);
 
-	if (showpackets->int_val & 2)
+	if (showpackets->int_val & 2) {
 		Sys_Printf ("<-- s=%i(%i) a=%i(%i) %i\n", sequence, reliable_message,
 					sequence_ack, reliable_ack, net_message->message->cursize);
+		if (showpackets->int_val & 8) {
+			SZ_Dump (net_message->message);
+		}
+	}
 
 	// get a rate estimation
 #if 0 // FIXME: Dead code

From 62c20aa4abe6a68e1082471908241a3ad7db5ae6 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 17 Aug 2020 11:30:53 +0900
Subject: [PATCH 1194/1519] [ruamoko] Fix incorrect clearing of dtables

The problem was caused by passing the index into the dtables array to
dtable_get which expects a handle. A handle is the ones-compliment
negative of the index which means that handle 0 is invalid (but 0 was
being passed... oops). Fixes the segfault when qw-client-x11 connects to
a server.
---
 libs/ruamoko/rua_obj.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libs/ruamoko/rua_obj.c b/libs/ruamoko/rua_obj.c
index 7ecc8ef28..baa8fe73b 100644
--- a/libs/ruamoko/rua_obj.c
+++ b/libs/ruamoko/rua_obj.c
@@ -2192,7 +2192,10 @@ rua_obj_cleanup (progs_t *pr, void *data)
 	}
 
 	for (i = 0; i < probj->dtables._size; i++) {
-		dtable_t   *dtable = dtable_get (probj, i);
+		/* dtable_get expects a handle, but a handle is the ones-compliment
+		 * negative of the index.
+		 */
+		dtable_t   *dtable = dtable_get (probj, ~i);
 		if (!dtable->imp) {
 			break;
 		}

From 550b9c3bb2bdedc7ffcafd7f0f8cbad290122df3 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 17 Aug 2020 14:35:20 +0900
Subject: [PATCH 1195/1519] [qfcc] Fix silent make rules flex and bison

---
 tools/qfcc/source/Makemodule.am | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/qfcc/source/Makemodule.am b/tools/qfcc/source/Makemodule.am
index d8db07b5c..dacfd3448 100644
--- a/tools/qfcc/source/Makemodule.am
+++ b/tools/qfcc/source/Makemodule.am
@@ -80,13 +80,13 @@ BUILT_SOURCES += \
 	tools/qfcc/source/qp-lex.c
 
 tools/qfcc/source/qc-parse.c: tools/qfcc/source/qc-parse.y
-	$(YACC) $(YFLAGS) -Dapi.prefix={qc_yy} $< -o $@
+	$(AM_V_YACC)$(YACCCOMPILE) -Dapi.prefix={qc_yy} $< -o $@
 tools/qfcc/source/qc-lex.c: tools/qfcc/source/qc-lex.l tools/qfcc/source/qc-parse.h
-	$(LEX) $(LFLAGS) $(AM_LFLAGS) -Pqc_yy -o$@ $<
+	$(AM_V_LEX)$(LEXCOMPILE) -Pqc_yy -o$@ $<
 tools/qfcc/source/qp-parse.c: tools/qfcc/source/qp-parse.y
-	$(YACC) $(YFLAGS) -Dapi.prefix={qp_yy} $< -o $@
+	$(AM_V_YACC)$(YACCCOMPILE) -Dapi.prefix={qp_yy} $< -o $@
 tools/qfcc/source/qp-lex.c: tools/qfcc/source/qp-lex.l tools/qfcc/source/qp-parse.h
-	$(LEX) $(LFLAGS) $(AM_LFLAGS) -Pqp_yy -o$@ $<
+	$(AM_V_LEX)$(LEXCOMPILE) -Pqp_yy -o$@ $<
 
 EXTRA_DIST += \
 	tools/qfcc/source/qfpreqcc

From 4a8818f0b6d3d8bc1b5303a0e3f954fa9a6f3ee7 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 17 Aug 2020 14:36:08 +0900
Subject: [PATCH 1196/1519] [qfcc] Clean up some excess includes

---
 tools/qfcc/source/defspace.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/tools/qfcc/source/defspace.c b/tools/qfcc/source/defspace.c
index 72537f2d0..1cfe572c3 100644
--- a/tools/qfcc/source/defspace.c
+++ b/tools/qfcc/source/defspace.c
@@ -44,15 +44,9 @@
 #include "QF/sys.h"
 #include "QF/va.h"
 
-#include "tools/qfcc/include/qfcc.h"
+#include "tools/qfcc/include/def.h"
 #include "tools/qfcc/include/defspace.h"
 #include "tools/qfcc/include/diagnostic.h"
-#include "tools/qfcc/include/expr.h"
-#include "tools/qfcc/include/options.h"
-#include "tools/qfcc/include/reloc.h"
-#include "tools/qfcc/include/strpool.h"
-#include "tools/qfcc/include/struct.h"
-#include "tools/qfcc/include/type.h"
 
 typedef struct locref_s {
 	struct locref_s *next;

From e991c44232cf1a1ca19946374536bb88ed687fbc Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 14 Dec 2020 13:36:28 +0900
Subject: [PATCH 1197/1519] [util] Make a minor improvement to QuatMultVec

Switch from using addition to multiplication for doubling the value.

Also, fix lib/util/test Makemodule to actually work (too much c&p
coding).
---
 libs/util/mathlib.c          | 2 +-
 libs/util/test/Makemodule.am | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/libs/util/mathlib.c b/libs/util/mathlib.c
index 842f96df1..1267df2ad 100644
--- a/libs/util/mathlib.c
+++ b/libs/util/mathlib.c
@@ -268,7 +268,7 @@ QuatMultVec (const quat_t q, const vec3_t v, vec3_t out)
 	dqq = DotProduct (q, q);
 	VectorScale (tv, s, tv);
 	VectorMultAdd (tv, dqv, q, tv);
-	VectorAdd (tv, tv, tv);
+	VectorScale (tv, 2, tv);
 	VectorMultAdd (tv, s * s - dqq, v, out);
 }
 
diff --git a/libs/util/test/Makemodule.am b/libs/util/test/Makemodule.am
index cf35f885c..8bbb671ad 100644
--- a/libs/util/test/Makemodule.am
+++ b/libs/util/test/Makemodule.am
@@ -14,9 +14,10 @@ libs_util_tests = \
 	libs/util/test/test-set \
 	libs/util/test/test-txtbuffer \
 	libs/util/test/test-vrect
-check_PROGRAMS += $(libs_util_tests)
 
-TESTS += $(libs_model_tests)
+TESTS += $(libs_util_tests)
+
+check_PROGRAMS += $(libs_util_tests)
 
 libs_util_test_test_bary_SOURCES=libs/util/test/test-bary.c
 libs_util_test_test_bary_LDADD=libs/util/libQFutil.la

From 62f3e1f428406d3d5a0a7e3c87821111c7e922d0 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 19 Dec 2020 17:29:08 +0900
Subject: [PATCH 1198/1519] [util] Calculate quaternion to rotate between two
 vectors

The calculation fails (produces NaN) if the vectors are anti-parallel,
but works for all other combinations. I came up with this implementation
when I discovered Unity's Quaternion.FromToRotation could did not work
with very small angles. This implementation will produce a usable
quaternion below 0.00255 degrees (though it will be slightly larger than
unit). Unity's failed such that I could see KSP's skybox snap while it
rotated around my test vessel.
---
 include/QF/math/quaternion.h |   1 +
 libs/util/mathlib.c          |  18 +++++++
 libs/util/test/test-quat.c   | 102 +++++++++++++++++++++++++++++++++++
 3 files changed, 121 insertions(+)

diff --git a/include/QF/math/quaternion.h b/include/QF/math/quaternion.h
index d6e34814a..da39b7734 100644
--- a/include/QF/math/quaternion.h
+++ b/include/QF/math/quaternion.h
@@ -164,6 +164,7 @@ extern const vec_t *const quat_origin;
 
 void QuatMult (const quat_t q1, const quat_t q2, quat_t out);
 void QuatMultVec (const quat_t q, const vec3_t v, vec3_t out);
+void QuatRotation (const vec3_t a, const vec3_t b, quat_t out);
 void QuatInverse (const quat_t in, quat_t out);
 void QuatExp (const quat_t a, quat_t b);
 void QuatToMatrix (const quat_t q, vec_t *m, int homogenous, int vertical);
diff --git a/libs/util/mathlib.c b/libs/util/mathlib.c
index 1267df2ad..2d547f756 100644
--- a/libs/util/mathlib.c
+++ b/libs/util/mathlib.c
@@ -272,6 +272,24 @@ QuatMultVec (const quat_t q, const vec3_t v, vec3_t out)
 	VectorMultAdd (tv, s * s - dqq, v, out);
 }
 
+VISIBLE void
+QuatRotation(const vec3_t a, const vec3_t b, quat_t out)
+{
+	vec_t       ma, mb;
+	vec_t       den, mba_mab;
+	vec3_t      t;
+
+	ma = VectorLength(a);
+	mb = VectorLength(b);
+	den = 2 * ma * mb;
+	VectorScale (a, mb, t);
+	VectorMultAdd(t, ma, b, t);
+	mba_mab = VectorLength(t);
+	CrossProduct (a, b, t);
+	VectorScale(t, 1 / mba_mab, out);
+	out[3] = mba_mab / den;
+}
+
 VISIBLE void
 QuatInverse (const quat_t in, quat_t out)
 {
diff --git a/libs/util/test/test-quat.c b/libs/util/test/test-quat.c
index 44c8923b3..11cc5b617 100644
--- a/libs/util/test/test-quat.c
+++ b/libs/util/test/test-quat.c
@@ -29,6 +29,45 @@ static vec3_t test_angles[] = {
 };
 #define num_angle_tests (sizeof (test_angles) / sizeof (test_angles[0]))
 
+static struct {
+	vec3_t      a;
+	vec3_t      b;
+	quat_t      expect;
+} quat_vector_rotation_tests[] = {
+	{{1, 0, 0}, {1, 0, 0}, {0, 0, 0, 1}},
+	{{0, 1, 0}, {0, 1, 0}, {0, 0, 0, 1}},
+	{{0, 0, 1}, {0, 0, 1}, {0, 0, 0, 1}},
+	{{1, 0, 0}, {8, 0, 0}, {0, 0, 0, 1}},
+	{{0, 8, 0}, {0, 1, 0}, {0, 0, 0, 1}},
+	{{0, 0, 8}, {0, 0, 8}, {0, 0, 0, 1}},
+	{{1, 0, 0}, {-1, 0, 0}, {0, 0, 0, 0}}, // x, y, z = NaN
+	{{0, -1, 0}, {0, 1, 0}, {0, 0, 0, 0}}, // x, y, z = NaN
+	{{0, 0, 1}, {0, 0, -1}, {0, 0, 0, 0}}, // x, y, z = NaN
+	{{-1, 0, 0}, {8, 0, 0}, {0, 0, 0, 0}}, // x, y, z = NaN
+	{{0, 8, 0}, {0, -1, 0}, {0, 0, 0, 0}}, // x, y, z = NaN
+	{{0, 0, -8}, {0, 0, 8}, {0, 0, 0, 0}}, // x, y, z = NaN
+	// excessive for float, but if vec_t becomes double...
+	// 1/50 second orbiting JNSQ Kerbin at 120km altitude. While this has
+	// nothing to do with quakeforge (yet?), it came up when testing camera
+	// rotation in KSP and Unity failed miserably. I don't remember the exact
+	// details, but I could see significant snapping in the rotation (I thought
+	// it was a few times per second, but these numbers indicate it must have
+	// been every few seconds).
+	// The quaternion is unit to 9 sigfigs (a little larger)
+	{{1720000, 0, 0}, {1719999.9983028059, 76.409082595828366, 0}, {0, 0, 2.22119434e-5, 1}},
+	// 1/20 second, same situation
+	{{1720000, 0, 0}, {1719999.9893925365, 191.02270615971355, 0}, {0, 0, 5.55298575e-5, 1}},
+	// 1/5 second, same situation
+	{{1720000, 0, 0}, {1719999.8302805868, 764.09080107761736, 0}, {0, 0, 2.2211943e-4, 1}},
+	// 1/4 second, same situation
+	{{1720000, 0, 0}, {1719999.7348134194, 955.11348367609469, 0}, {0, 0, 2.77649262e-4, 1}},
+	// 1/3 second, same situation. This is (float) 1 ulp in w: about 0.0424
+	// degrees.
+	// The quaternion is unit to 9 sigfigs (a little larger)
+	{{1720000, 0, 0}, {1719999.5285571995, 1273.4845939975546, 0}, {0, 0, 3.70199094e-4, 0.99999994}},
+};
+#define num_quat_vector_rotation_tests (sizeof (quat_vector_rotation_tests) / sizeof (quat_vector_rotation_tests[0]))
+
 // return true if a and b are close enough (yay, floats)
 static int
 compare (vec_t a, vec_t b)
@@ -200,6 +239,60 @@ fail:
 	return 0;
 }
 
+static int
+test_rotation4 (const vec3_t a, const vec3_t b, const quat_t expect)
+{
+	int         i;
+	quat_t      quat;
+	vec3_t      t;
+	vec_t       d = 0;
+
+	VectorZero (t);
+
+	// find the rotation vector between a and b
+	QuatRotation (a, b, quat);
+
+	if (quat[3] == 0) {
+		if (expect[3] != 0) {
+			goto fail;
+		}
+		// expect NaN for the vector components because the vectors are
+		// anti-parallel and thus the rotation axis is undefined
+		if (!(isnan(quat[0]) && isnan(quat[1]) && isnan(quat[2]))) {
+			goto fail;
+		}
+	} else {
+		// the vectors are not anti-parallel and thus the rotation axis is
+		// defined, so NaN is invalid
+		if (isnan(quat[0]) || isnan(quat[1]) || isnan(quat[2])) {
+			goto fail;
+		}
+		for (i = 0; i < 4; i++) {
+			// yes, float precision will make it difficult to set up expect
+			// but it is at least consistent (ie, the "errors" are not at all
+			// random and thus will be the same from run to run)
+			if (quat[i] != expect[i]) {
+				goto fail;
+			}
+		}
+		QuatMultVec(quat, a, t);
+
+		d = DotProduct (t, b) / (VectorLength (t) * VectorLength (b)) - 1;
+		if (d * d > 1e-8) {
+			goto fail;
+		}
+	}
+	return 1;
+fail:
+	printf ("\ntest_rotation4\n");
+	printf ("%11.9g %11.9g %11.9g\n", VectorExpand(a));
+	printf ("%11.9g %11.9g %11.9g\n", VectorExpand(b));
+	printf ("%11.9g %11.9g %11.9g %11.9g\n", QuatExpand(quat));
+	printf ("%11.9g %11.9g %11.9g\n", VectorExpand(t));
+	printf ("%11.9g\n", d);
+	return 0;
+}
+
 #define s05 0.70710678118654757
 
 static struct {
@@ -285,6 +378,15 @@ main (int argc, const char **argv)
 			res = 1;
 	}
 
+	for (i = 0; i < num_quat_vector_rotation_tests; i++) {
+		vec_t      *a = quat_vector_rotation_tests[i].a;
+		vec_t      *b = quat_vector_rotation_tests[i].b;
+		vec_t      *expect = quat_vector_rotation_tests[i].expect;
+		if (!test_rotation4 (a, b, expect)) {
+			res = 1;
+		}
+	}
+
 	for (i = 0; i < num_quat_mat_tests; i ++) {
 		vec_t      *q = quat_mat_tests[i].q;
 		vec_t      *expect = quat_mat_tests[i].expect;

From af814ff9a80fb57ba52866a0dc5c2e89a4169320 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 19 Dec 2020 17:37:22 +0900
Subject: [PATCH 1199/1519] [util] Add a cache-line aligned memory allocator

This was inspired by
Hoard: A Scalable Memory Allocator
  for Multithreaded Applications

 Emery D. Berger, Kathryn S. McKinley, Robert D. Blumofe, Paul R.
 Wilson,

It's not anywhere near the same implementation, but it did take a few
basic concepts. The idea is twofold:
1) A pool of memory from which blocks can be allocated and then freed
en-mass and is fairly efficient for small (4-16 byte) blocks
2) Tread safety for use with the Vulkan renderer (and any other
multi-threaded tasks).

However, based on the Hoard paper, small allocations are cache-line
aligned. On top of that, larger allocations are page aligned.

I suspect it would help qfvis somewhat if I ever get around to tweaking
qfvis to use cmem.
---
 include/QF/cmem.h            |  96 ++++++++++
 libs/util/Makemodule.am      |   1 +
 libs/util/cmem.c             | 327 +++++++++++++++++++++++++++++++++
 libs/util/test/Makemodule.am |   5 +
 libs/util/test/test-cmem.c   | 346 +++++++++++++++++++++++++++++++++++
 5 files changed, 775 insertions(+)
 create mode 100644 include/QF/cmem.h
 create mode 100644 libs/util/cmem.c
 create mode 100644 libs/util/test/test-cmem.c

diff --git a/include/QF/cmem.h b/include/QF/cmem.h
new file mode 100644
index 000000000..966696d6c
--- /dev/null
+++ b/include/QF/cmem.h
@@ -0,0 +1,96 @@
+/*
+	cmem.h
+
+	Cache-line aligned memory allocator
+
+	Copyright (C) 2020  Bill Currie <bill@taniwha.org>
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifndef __cmem_h
+#define __cmem_h
+
+#include "QF/qtypes.h"
+
+#define MEM_LINE_SIZE 64
+
+typedef struct memline_s {
+	struct memline_s *next;
+	size_t      size;
+	size_t      pad[6];
+} memline_t;
+
+typedef struct memsline_s {
+	struct memsline_s *next;
+	size_t      size:2;
+	size_t      list:4;
+	size_t      prev:58;	// memsline_t **
+} memsline_t;
+
+typedef struct memblock_s {
+	struct memblock_s *next;
+	struct memblock_s **prev;
+	/* The pointer to pass to free()
+	 */
+	void       *mem;
+	memline_t  *free_lines;
+	/* Size of memory region before block "header".
+	 *
+	 * Since large blocks are allocated with page-size alignment, odds are
+	 * high that the there will be many cache lines "wasted" in the space
+	 * between the address returned from aligned_alloc (to cache-line
+	 * alignment) and the block itself. Setting them up as a pool makes the
+	 * lines available for smaller allocations, thus reducing waste.
+	 */
+	size_t      pre_size;
+	/* Size of memory region after block "header".
+	 *
+	 * Will be 0 for blocks that were allocated exclusively for small
+	 * allocations, otherwise indicates the size of the allocated block.
+	 */
+	size_t      post_size;
+	/* True if the post-header block is free to be reused.
+	 */
+	int         post_free;
+	int         pad;
+	size_t      pre_allocated;
+} memblock_t;
+
+typedef struct memsuper_s {
+	size_t      page_size;
+	size_t      page_mask;
+	memblock_t *memblocks;
+	/* Allocated cache lines from which smaller blocks can be allocated.
+	 *
+	 * The index is the base-2 log minus 2 of the size of the elements in the
+	 * cache line from which an element was last freed. Only 4-32 bytes are of
+	 * interest because nothing smaller than 4 bytes (int/float) will be
+	 * allocated, and 64 bytes and up consume entire cache lines.
+	 */
+	memsline_t *last_freed[4];
+	size_t      pad;
+} memsuper_t;
+
+memsuper_t *new_memsuper (void);
+void delete_memsuper (memsuper_t *super);
+void *cmemalloc (memsuper_t *super, size_t size);
+void cmemfree (memsuper_t *super, void *mem);
+
+#endif//__cmem_h
diff --git a/libs/util/Makemodule.am b/libs/util/Makemodule.am
index 272459d4d..af99b15d3 100644
--- a/libs/util/Makemodule.am
+++ b/libs/util/Makemodule.am
@@ -45,6 +45,7 @@ libs_util_libQFutil_la_SOURCES= \
 	libs/util/cbuf.c \
 	libs/util/checksum.c \
 	libs/util/cmd.c \
+	libs/util/cmem.c \
 	libs/util/crc.c \
 	libs/util/cvar.c \
 	libs/util/dstring.c \
diff --git a/libs/util/cmem.c b/libs/util/cmem.c
new file mode 100644
index 000000000..b446e58f0
--- /dev/null
+++ b/libs/util/cmem.c
@@ -0,0 +1,327 @@
+/*
+	cmem.c
+
+	Cache-line aligned memory allocator
+
+	Copyright (C) 2020  Bill Currie <bill@taniwha.org>
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#include <unistd.h>
+
+#include "QF/alloc.h"
+#include "QF/cmem.h"
+
+
+memsuper_t *
+new_memsuper (void)
+{
+	memsuper_t *super = aligned_alloc (MEM_LINE_SIZE, sizeof (*super));
+	memset (super, 0, sizeof (*super));
+	super->page_size = sysconf (_SC_PAGESIZE);
+	super->page_mask = (super->page_size - 1);
+	return super;
+}
+
+void
+delete_memsuper (memsuper_t *super)
+{
+	while (super->memblocks) {
+		memblock_t *t = super->memblocks;
+		super->memblocks = super->memblocks->next;
+		free (t->mem);
+	}
+	free (super);
+}
+
+static memblock_t *
+init_block (memsuper_t *super, void *mem, size_t alloc_size)
+{
+	size_t      size = super->page_size;
+	size_t      mask = super->page_mask;
+	size_t      ptr = (size_t) mem;
+	memblock_t *block;
+
+	block = (memblock_t *) (((ptr + size) & ~mask) - sizeof (memblock_t));
+	memset (block, 0, sizeof (memblock_t));
+
+	if (super->memblocks) {
+		super->memblocks->prev = &block->next;
+	}
+	block->next = super->memblocks;
+	block->prev = &super->memblocks;
+	super->memblocks = block;
+
+	block->mem = mem;
+	block->pre_size = (size_t) block - (size_t) mem;
+	block->post_size = alloc_size - block->pre_size - sizeof (memblock_t);
+	if (!((size_t) mem & mask) && block->pre_size) {
+		// can't use the first cache line of the page as it would be
+		// indistinguishable from a large block
+		block->pre_size -= MEM_LINE_SIZE;
+	}
+	if (block->pre_size) {
+		block->free_lines = (memline_t *) ((size_t) block - block->pre_size);
+		block->free_lines->next = 0;
+		block->free_lines->size = block->pre_size;
+	}
+	return block;
+}
+
+static memblock_t *
+block_alloc (memsuper_t *super, size_t size)
+{
+	memblock_t *block;
+	memblock_t *best = 0;
+	size_t      best_size = ~0u;
+
+	for (block = super->memblocks; block; block = block->next) {
+		if (block->post_free && block->post_size >= size
+			&& block->post_size < best_size) {
+			best = block;
+			best_size = block->post_size;
+		}
+	}
+	if (best) {
+		best->post_free = 0;
+		return best;
+	}
+
+	size_t      page_size = super->page_size;
+	size_t      alloc_size = sizeof (memblock_t) + page_size + size;
+	void       *mem = aligned_alloc (MEM_LINE_SIZE, alloc_size);
+	block = init_block (super, mem, alloc_size);
+	return block;
+}
+
+static void *
+line_alloc (memblock_t *block, size_t size)
+{
+	memline_t **line = &block->free_lines;
+	memline_t **best = 0;
+	memline_t  *mem;
+	size_t      best_size = ~0u;
+
+	while (*line) {
+		if ((*line)->size >= size && (*line)->size < best_size) {
+			best_size = (*line)->size;
+			best = line;
+		}
+		line = &(*line)->next;
+	}
+	if (!best) {
+		return 0;
+	}
+	mem = *best;
+	if (size < best_size) {
+		*best = (memline_t *)((size_t) mem + size);
+		(*best)->next = mem->next;
+		(*best)->size = mem->size - size;
+	} else {
+		*best = (*best)->next;
+	}
+	block->pre_allocated += size;
+	return mem;
+}
+
+static void
+line_free (memblock_t *block, void *mem)
+{
+	//FIXME right now, can free only single lines (need allocated lines to
+	// have a control block)
+	size_t      size = MEM_LINE_SIZE;
+	memline_t **l;
+	memline_t  *line = 0;
+
+	block->pre_allocated -= size;
+
+	for (l = &block->free_lines; *l; l = &(*l)->next) {
+		line = *l;
+
+		if ((size_t) mem + size < (size_t) line) {
+			// line to be freed is below the free line
+			break;
+		}
+		if ((size_t) mem + size == (size_t) line) {
+			// line to be freed is immediately below the free line
+			// merge with the free line
+			size += line->size;
+			line = line->next;
+			break;
+		}
+		if ((size_t) line + line->size == (size_t) mem) {
+			// line to be freed is immediately above the free line
+			// merge with the free line
+			line->size += size;
+			if (line->next && (size_t) line->next == (size_t) mem + size) {
+				line->size += line->next->size;
+				line->next = line->next->next;
+			}
+			return;
+		}
+	}
+	((memline_t *) mem)->next = line;
+	((memline_t *) mem)->size = size;
+	*l = mem;
+}
+
+static memsline_t *
+sline_new (memsuper_t *super, size_t size_ind)
+{
+	size_t      size = 4 << size_ind;
+	size_t      free_loc = (sizeof (memsline_t) + size - 1) & ~(size - 1);
+	memsline_t *sline = cmemalloc (super, MEM_LINE_SIZE);
+	sline->size = size_ind;
+	sline->list = free_loc >> 2;
+	while (free_loc + size < MEM_LINE_SIZE) {
+		*(uint16_t *)((size_t) sline + free_loc) = free_loc + size;
+		free_loc += size;
+	}
+	*(uint16_t *)((size_t) sline + free_loc) = 0;
+	if (super->last_freed[size_ind]) {
+		super->last_freed[size_ind]->prev = (size_t) &sline->next >> 6;
+	}
+	sline->next = super->last_freed[size_ind];
+	sline->prev = (size_t) &super->last_freed[size_ind] >> 6;
+	super->last_freed[size_ind] = sline;
+	return sline;
+}
+
+void *
+cmemalloc (memsuper_t *super, size_t size)
+{
+	size_t      ind = 0;
+	// allocation sizes start at 4 (sizeof(float)) and go up in powers of two
+	while ((4u << ind) < size) {
+		ind++;
+	}
+	// round size up
+	if (size > MEM_LINE_SIZE * 8 || size > super->page_size / 8) {
+		// the object is large enough it could cause excessive fragmentation,
+		memblock_t *block = block_alloc (super, 4 << ind);
+		if (!block) {
+			return 0;
+		}
+		return block + 1;
+	} else {
+		size = 4 << ind;
+		if (size >= MEM_LINE_SIZE) {
+			// whole cache lines are required for this object
+			// FIXME slow
+			memblock_t *block = super->memblocks;
+			void       *mem;
+
+			while (block) {
+				if ((mem = line_alloc (block, size))) {
+					return mem;
+				}
+				block = block->next;
+			}
+			/* The cache-line pool is page aligned for two reasons:
+			 * 1) so it fits exactly within a page
+			 * 2) the control block can be found easily
+			 * And the reason the pool is exactly one page large is so no
+			 * allocated line is ever page-aligned as that would make the line
+			 * indistinguishable from a large block.
+			 */
+			mem = aligned_alloc (super->page_size, super->page_size);
+			block = init_block (super, mem, super->page_size);
+			return line_alloc (block, size);
+		} else {
+			void       *mem = 0;
+			memsline_t **sline = &super->last_freed[ind];
+			if (!*sline) {
+				*sline = sline_new (super, ind);
+			}
+			if (*sline) {
+				size_t      list = (*sline)->list << 2;
+				mem = (void *) ((size_t) *sline + list);
+				(*sline)->list = *(uint16_t *) mem >> 2;
+				if (!(*sline)->list) {
+					// the sub-line is full, so remove it from the free
+					// list. Freeing a block from the line will add it back
+					// to the list
+					memsline_t *s = *sline;
+					if ((*sline)->next) {
+						(*sline)->next->prev = (*sline)->prev;
+					}
+					*sline = (*sline)->next;
+					s->next = 0;
+					s->prev = 0;
+				}
+			}
+			return mem;
+		}
+	}
+	return 0;
+}
+
+static void
+unlink_block (memblock_t *block)
+{
+	if (block->next) {
+		block->next->prev = block->prev;
+	}
+	*block->prev = block->next;
+}
+
+void
+cmemfree (memsuper_t *super, void *mem)
+{
+	memsline_t **super_sline;
+	memsline_t *sline;
+	memblock_t *block;
+
+	if ((size_t) mem & (MEM_LINE_SIZE - 1)) {
+		// sub line block
+		sline = (memsline_t *) ((size_t) mem & ~(MEM_LINE_SIZE - 1));
+		*(uint16_t *) mem = sline->list << 2;
+		sline->list = (size_t) mem & (MEM_LINE_SIZE - 1);
+		super_sline = &super->last_freed[sline->size];
+		if (*super_sline != sline) {
+			if (sline->next) {
+				sline->next->prev = sline->prev;
+			}
+			if (sline->prev) {
+				*(memsline_t **) (size_t)(sline->prev << 6) = sline->next;
+			}
+
+			(*super_sline)->prev = (size_t) &sline->next >> 6;
+			sline->next = *super_sline;
+			sline->prev = (size_t) super_sline >> 6;
+			(*super_sline) = sline;
+		}
+		return;
+	} else if ((size_t) mem & super->page_mask) {
+		// cache line
+		size_t      page_size = super->page_size;
+		size_t      page_mask = super->page_mask;
+		block = (memblock_t *) (((size_t) mem + page_size) & ~page_mask) - 1;
+		line_free (block, mem);
+	} else {
+		// large block
+		block = (memblock_t *) mem - 1;
+		block->post_free = 1;
+	}
+	if (!block->pre_allocated && (!block->post_size || block->post_free)) {
+		unlink_block (block);
+		free (block->mem);
+	}
+}
diff --git a/libs/util/test/Makemodule.am b/libs/util/test/Makemodule.am
index 8bbb671ad..39140bee7 100644
--- a/libs/util/test/Makemodule.am
+++ b/libs/util/test/Makemodule.am
@@ -1,5 +1,6 @@
 libs_util_tests = \
 	libs/util/test/test-bary \
+	libs/util/test/test-cmem \
 	libs/util/test/test-cs \
 	libs/util/test/test-darray \
 	libs/util/test/test-dq \
@@ -23,6 +24,10 @@ libs_util_test_test_bary_SOURCES=libs/util/test/test-bary.c
 libs_util_test_test_bary_LDADD=libs/util/libQFutil.la
 libs_util_test_test_bary_DEPENDENCIES=libs/util/libQFutil.la
 
+libs_util_test_test_cmem_SOURCES=libs/util/test/test-cmem.c
+libs_util_test_test_cmem_LDADD=libs/util/libQFutil.la
+libs_util_test_test_cmem_DEPENDENCIES=libs/util/libQFutil.la
+
 libs_util_test_test_cs_SOURCES=libs/util/test/test-cs.c
 libs_util_test_test_cs_LDADD=libs/util/libQFutil.la
 libs_util_test_test_cs_DEPENDENCIES=libs/util/libQFutil.la
diff --git a/libs/util/test/test-cmem.c b/libs/util/test/test-cmem.c
new file mode 100644
index 000000000..c8c2ee7e3
--- /dev/null
+++ b/libs/util/test/test-cmem.c
@@ -0,0 +1,346 @@
+#include <stdio.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "QF/cmem.h"
+
+static int
+test_block (memsuper_t *super)
+{
+	size_t      size = super->page_size;
+	void       *mem = cmemalloc (super, size);
+	memblock_t *block;
+
+	if (!mem) {
+		fprintf (stderr, "could not allocate %zd byte block\n",
+				 super->page_size);
+		return 0;
+	}
+	if ((size_t) mem & super->page_mask) {
+		fprintf (stderr, "mem not page aligned: %p %zd\n",
+				 mem, super->page_size);
+		return 0;
+	}
+	block = super->memblocks;
+	if (mem != block + 1) {
+		fprintf (stderr, "super does not point to mem\n");
+		return 0;
+	}
+	if (block->post_size < size) {
+		fprintf (stderr, "block post_size too small: %zd < %zd\n",
+				 block->post_size, size);
+		return 0;
+	}
+	if (block->post_size - size >= super->page_size) {
+		fprintf (stderr, "block post_size too big: %zd < %zd\n",
+				 block->post_size - size, super->page_size);
+		return 0;
+	}
+	memset (mem, 0, size);	// valgrind check
+	cmemfree (super, mem);
+	if (super->memblocks) {
+		fprintf (stderr, "super still points to mem\n");
+		return 0;
+	}
+	return 1;
+}
+
+static int
+test_line (memsuper_t *super)
+{
+	memline_t  *line1 = cmemalloc (super, MEM_LINE_SIZE);
+	memline_t  *line2 = cmemalloc (super, MEM_LINE_SIZE);
+	memline_t  *line3 = cmemalloc (super, MEM_LINE_SIZE);
+	memblock_t *block = super->memblocks;
+
+	if (block->next) {
+		fprintf (stderr, "too many memblocks\n");
+		return 0;
+	}
+	if (line1 < (memline_t *) block->mem || line1 >= (memline_t *) block) {
+		fprintf (stderr, "line1 outside block line pool\n");
+		return 0;
+	}
+	if (line2 < (memline_t *) block->mem || line2 >= (memline_t *) block) {
+		fprintf (stderr, "line2 outside block line pool\n");
+		return 0;
+	}
+	if (line3 < (memline_t *) block->mem || line3 >= (memline_t *) block) {
+		fprintf (stderr, "line3 outside block line pool\n");
+		return 0;
+	}
+	if (!((size_t) line1 & super->page_mask)) {
+		fprintf (stderr, "line1 is page aligned\n");
+		return 0;
+	}
+	if (!((size_t) line2 & super->page_mask)) {
+		fprintf (stderr, "line2 is page aligned\n");
+		return 0;
+	}
+	if (!((size_t) line3 & super->page_mask)) {
+		fprintf (stderr, "line3 is page aligned\n");
+		return 0;
+	}
+	if (line1 + 1 != line2 || line2 + 1 != line3) {
+		fprintf (stderr, "lines not contiguous\n");
+		return 0;
+	}
+	if (line3 + 1 != block->free_lines) {
+		fprintf (stderr, "line3 not contiguous with free lines\n");
+		return 0;
+	}
+	if (block->free_lines->next) {
+		fprintf (stderr, "multiple free line blocks\n");
+		return 0;
+	}
+	if (block->pre_allocated != 3 * MEM_LINE_SIZE) {
+		fprintf (stderr, "pre_allocated wrong size: %zd != %d\n",
+				 block->pre_allocated, 3 * MEM_LINE_SIZE);
+		return 0;
+	}
+	if (block->free_lines->size != block->pre_size - block->pre_allocated) {
+		fprintf (stderr, "free lines wrong size: %zd != %zd\n",
+				 block->free_lines->size,
+				 block->pre_size - block->pre_allocated);
+		return 0;
+	}
+	size_t      old_size = block->free_lines->size;
+	memline_t  *old_line = block->free_lines;
+	cmemfree (super, line2);
+	if (block->pre_allocated != 2 * MEM_LINE_SIZE) {
+		fprintf (stderr, "pre_allocated wrong size: %zd != %d\n",
+				 block->pre_allocated, 2 * MEM_LINE_SIZE);
+		return 0;
+	}
+	if (block->free_lines != line2) {
+		fprintf (stderr, "free lines not pointing to line2\n");
+		return 0;
+	}
+	if (!block->free_lines->next || block->free_lines->next->next) {
+		fprintf (stderr, "incorrect number of free blocks\n");
+		return 0;
+	}
+	if (line2->next != old_line || old_line->size != old_size) {
+		fprintf (stderr, "free line blocks corrupted\n");
+		return 0;
+	}
+	if (block->free_lines->size != MEM_LINE_SIZE) {
+		fprintf (stderr, "free line block wrong size: %zd != %d\n",
+				 block->free_lines->size, MEM_LINE_SIZE);
+		return 0;
+	}
+	cmemfree (super, line3);
+	if (block->free_lines != line2) {
+		fprintf (stderr, "free lines not pointing to line2 2\n");
+		return 0;
+	}
+	if (block->pre_allocated != MEM_LINE_SIZE) {
+		fprintf (stderr, "pre_allocated wrong size: %zd != %d\n",
+				 block->pre_allocated, MEM_LINE_SIZE);
+		return 0;
+	}
+	if (block->free_lines->size != block->pre_size - block->pre_allocated) {
+		fprintf (stderr, "free lines wrong size: %zd != %zd\n",
+				 block->free_lines->size,
+				 block->pre_size - block->pre_allocated);
+		return 0;
+	}
+	cmemfree (super, line1);
+	if (super->memblocks) {
+		fprintf (stderr, "line pool not freed\n");
+		return 0;
+	}
+	return 1;
+}
+
+static int
+test_sline (memsuper_t *super)
+{
+	void       *mem[] = {
+		//cmemalloc (super, 2),	// smaller than min size
+		cmemalloc (super, 4),
+		cmemalloc (super, 4),
+		cmemalloc (super, 8),
+		cmemalloc (super, 8),
+		cmemalloc (super, 16),
+		cmemalloc (super, 16),
+		cmemalloc (super, 32),
+		cmemalloc (super, 32),
+	};
+#define mem_size (sizeof (mem) / sizeof (mem[0]))
+	int fail = 0;
+	for (size_t i = 0; i < mem_size; i++) {
+		printf("%p\n", mem[i]);
+		if (!mem[i]) {
+			fprintf (stderr, "mem[%zd] is null\n", i);
+			fail = 1;
+		}
+		for (size_t j = i + 1; j < mem_size; j++) {
+			if (mem[i] == mem[j]) {
+				fprintf (stderr, "mem[%zd] is dupped with %zd\n", i, j);
+				fail = 1;
+			}
+		}
+	}
+	if (fail) {
+		return 0;
+	}
+#undef mem_size
+	return 1;
+}
+
+static int
+test_block_line (memsuper_t *super)
+{
+	void       *mem = cmemalloc (super, 2 * super->page_size);
+	void       *line;
+	memblock_t *block = super->memblocks;
+
+	if (block + 1 != (memblock_t *) mem) {
+		fprintf (stderr, "super memblocks do not point to mem\n");
+		return 0;
+	}
+	if (block->pre_size < MEM_LINE_SIZE) {
+		// need to figure out a way to guarantee a shared block
+		fprintf (stderr, "can't allocate line from block\n");
+		return 0;
+	}
+	if (block->next) {
+		fprintf (stderr, "excess blocks in super\n");
+		return 0;
+	}
+	line = cmemalloc (super, MEM_LINE_SIZE);
+	if (!((size_t) line & super->page_mask)) {
+		fprintf (stderr, "line is page aligned\n");
+		return 0;
+	}
+	if (super->memblocks->next) {
+		// need to figure out a way to guarantee a shared block
+		fprintf (stderr, "mem and line not in same block\n");
+		return 0;
+	}
+	cmemfree (super, mem);
+	if (!super->memblocks) {
+		fprintf (stderr, "shared block freed\n");
+		return 0;
+	}
+	if (cmemalloc (super, super->page_size) != mem) {
+		fprintf (stderr, "block not reused for mem\n");
+		return 0;
+	}
+	if (super->memblocks != block || super->memblocks->next) {
+		// need to figure out a way to guarantee a shared block
+		fprintf (stderr, "blocks corrupt\n");
+		return 0;
+	}
+	cmemfree (super, line);
+	if (!super->memblocks) {
+		fprintf (stderr, "shared block freed 2\n");
+		return 0;
+	}
+	cmemfree (super, mem);
+	if (super->memblocks) {
+		fprintf (stderr, "shared block not freed\n");
+		return 0;
+	}
+	return 1;
+}
+
+int
+main (void)
+{
+	memsuper_t *super = new_memsuper ();
+
+	if (sizeof (memsuper_t) != MEM_LINE_SIZE) {
+		fprintf (stderr, "memsuper_t not cache size: %zd\n",
+				 sizeof (memline_t));
+		return 1;
+	}
+	if (sizeof (memline_t) != MEM_LINE_SIZE) {
+		fprintf (stderr, "memline_t not cache size: %zd\n",
+				 sizeof (memline_t));
+		return 1;
+	}
+	if (sizeof (memsline_t) != 2 * sizeof (void *)) {
+		fprintf (stderr, "memsline_t not two pointers: %zd\n",
+				 sizeof (memsline_t));
+		return 1;
+	}
+	if (sizeof (memblock_t) != MEM_LINE_SIZE) {
+		fprintf (stderr, "memblock_t not cache size: %zd\n",
+				 sizeof (memblock_t));
+		return 1;
+	}
+	if ((size_t) super & (MEM_LINE_SIZE - 1)) {
+		fprintf (stderr, "super block not cache aligned: %p\n", super);
+		return 1;
+	}
+	if (super->page_size != (size_t) sysconf (_SC_PAGESIZE)) {
+		fprintf (stderr, "page size not equal to system page size: %zd, %zd\n",
+				 super->page_size, sysconf (_SC_PAGESIZE));
+		return 1;
+	}
+	if (!super->page_size || (super->page_size & (super->page_size - 1))) {
+		fprintf (stderr, "page size not power of two: %zd\n",
+				 super->page_size);
+		return 1;
+	}
+	if (super->page_mask + 1 != super->page_size) {
+		fprintf (stderr, "page mask not page size - 1: %zx %zx\n",
+				 super->page_mask, super->page_size);
+		return 1;
+	}
+	if (!super->page_mask || (super->page_mask & (super->page_mask + 1))) {
+		fprintf (stderr, "page mask not all 1s: %zx\n",
+				 super->page_mask);
+		return 1;
+	}
+	if (super->memblocks) {
+		fprintf (stderr, "super block list not null\n");
+		return 1;
+	}
+	if (!test_block (super)) {
+		fprintf (stderr, "block tests failed\n");
+	}
+	if (super->memblocks) {
+		fprintf (stderr, "super block list not null 2\n");
+		return 1;
+	}
+	if (!test_line (super)) {
+		fprintf (stderr, "line tests failed\n");
+		return 1;
+	}
+	if (super->memblocks) {
+		fprintf (stderr, "super block list not null 2\n");
+		return 1;
+	}
+	if (!test_block_line (super)) {
+		fprintf (stderr, "block-line tests failed\n");
+		return 1;
+	}
+	for (size_t i = 0; i < 2 * super->page_size / MEM_LINE_SIZE; i++) {
+		void       *line = cmemalloc (super, MEM_LINE_SIZE);
+		if (!line) {
+			fprintf (stderr, "could not allocate %d byte line\n",
+					 MEM_LINE_SIZE);
+			return 1;
+		}
+		if ((size_t) line % MEM_LINE_SIZE) {
+			fprintf (stderr, "line not cache-line aligned: %p %d\n",
+					 line, MEM_LINE_SIZE);
+			return 1;
+		}
+		if (!((size_t) line & super->page_mask)) {
+			fprintf (stderr, "line is page aligned: %p %zd\n",
+					 line, super->page_size);
+			return 1;
+		}
+	}
+	if (!test_sline (super)) {
+		fprintf (stderr, "sub-line tests failed\n");
+		return 1;
+	}
+	delete_memsuper (super);
+	return 0;
+}

From ab04a1915ed45646a7111b43371b451626ea6d2c Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 21 Dec 2020 02:12:51 +0900
Subject: [PATCH 1200/1519] [build] Fix a pile of gcc 10 issues

gcc got stricter about array accesses, complicating progs macros, and
much better at detecting buffer overflows.
---
 include/QF/math/vector.h                    |  7 +-
 include/QF/pr_comp.h                        |  4 +-
 include/QF/progs.h                          | 14 ++--
 libs/console/bi_inputline.c                 |  2 +-
 libs/gamecode/pr_debug.c                    |  8 +-
 libs/gamecode/pr_exec.c                     | 89 +++++++++++----------
 libs/gamecode/pr_parse.c                    |  6 +-
 libs/models/alias/model_alias.c             |  2 +-
 libs/ruamoko/rua_hash.c                     |  2 +-
 libs/ruamoko/rua_msgbuf.c                   |  5 +-
 libs/ruamoko/rua_obj.c                      |  2 +-
 libs/ruamoko/rua_plist.c                    |  2 +-
 libs/ruamoko/rua_qfile.c                    |  2 +-
 libs/ruamoko/rua_script.c                   |  2 +-
 libs/ruamoko/rua_set.c                      |  4 +-
 libs/util/zone.c                            |  3 +-
 libs/video/renderer/r_progs.c               |  2 +-
 libs/video/renderer/vulkan/vkgen/vkstruct.r | 39 +++++----
 nq/include/sv_progs.h                       |  2 +-
 qw/include/sv_progs.h                       |  2 +-
 qw/source/pmove.c                           |  2 +-
 qw/source/sv_progs.c                        |  4 +-
 ruamoko/qwaq/builtins/curses.c              |  4 +-
 ruamoko/qwaq/builtins/debug.c               |  2 +-
 ruamoko/qwaq/builtins/editbuffer.c          |  2 +-
 ruamoko/qwaq/builtins/main.c                |  1 +
 tools/qfbsp/source/outside.c                |  2 +
 tools/qfcc/include/qfcc.h                   |  4 +-
 tools/qflight/include/noise.h               |  2 +-
 tools/qfmodelgen/source/modelgen.c          | 10 ++-
 30 files changed, 125 insertions(+), 107 deletions(-)

diff --git a/include/QF/math/vector.h b/include/QF/math/vector.h
index 6a8b80809..993cbaf08 100644
--- a/include/QF/math/vector.h
+++ b/include/QF/math/vector.h
@@ -142,7 +142,12 @@ extern const vec_t *const vec3_origin;
 	} while (0)
 
 #define VectorIsZero(a) (!(a)[0] && !(a)[1] && !(a)[2])
-#define VectorZero(a) ((a)[2] = (a)[1] = (a)[0] = 0);
+#define VectorZero(a) \
+	do { \
+		(a)[0] = 0; \
+		(a)[1] = 0; \
+		(a)[2] = 0; \
+	} while (0)
 #define VectorSet(a,b,c,d) \
 	do { \
 		(d)[0] = a; \
diff --git a/include/QF/pr_comp.h b/include/QF/pr_comp.h
index a84e56953..0cd65d7e5 100644
--- a/include/QF/pr_comp.h
+++ b/include/QF/pr_comp.h
@@ -474,8 +474,8 @@ typedef union pr_type_u {
 	string_t    string_var;
 	func_t      func_var;
 	pr_int_t    entity_var;
-	float       vector_var[0];	// really 3, but this structure must be 32 bits
-	float       quat_var[0];	// really 4, but this structure must be 32 bits
+	float       vector_var;	// really [3], but this structure must be 32 bits
+	float       quat_var;	// really [4], but this structure must be 32 bits
 	pr_int_t    integer_var;
 	pointer_t   pointer_var;
 	pr_uint_t   uinteger_var;
diff --git a/include/QF/progs.h b/include/QF/progs.h
index 8a78926bf..64a9d20bb 100644
--- a/include/QF/progs.h
+++ b/include/QF/progs.h
@@ -445,7 +445,7 @@ void PR_Undefined (progs_t *pr, const char *type, const char *name) __attribute_
 
 	\hideinitializer
 */
-#define G_VECTOR(p,o)	G_var (p, o, vector)
+#define G_VECTOR(p,o)	(&G_var (p, o, vector))
 
 /** Access a quaternion global. Can be assigned to.
 
@@ -457,7 +457,7 @@ void PR_Undefined (progs_t *pr, const char *type, const char *name) __attribute_
 
 	\hideinitializer
 */
-#define G_QUAT(p,o)		G_var (p, o, quat)
+#define G_QUAT(p,o)		(&G_var (p, o, quat))
 
 /** Access a string index global. Can be assigned to.
 
@@ -661,7 +661,7 @@ void PR_Undefined (progs_t *pr, const char *type, const char *name) __attribute_
 
 	\hideinitializer
 */
-#define P_VECTOR(p,n)	P_var (p, n, vector)
+#define P_VECTOR(p,n)	(&P_var (p, n, vector))
 
 /** Access a quaterion parameter. Can be used any way a quat_t variable can.
 
@@ -673,7 +673,7 @@ void PR_Undefined (progs_t *pr, const char *type, const char *name) __attribute_
 
 	\hideinitializer
 */
-#define P_QUAT(p,n)		P_var (p, n, quat)
+#define P_QUAT(p,n)		(&P_var (p, n, quat))
 
 /** Access a string index parameter. Can be assigned to.
 
@@ -873,7 +873,7 @@ void PR_Undefined (progs_t *pr, const char *type, const char *name) __attribute_
 
 	\hideinitializer
 */
-#define R_VECTOR(p)		R_var (p, vector)
+#define R_VECTOR(p)		(&R_var (p, vector))
 
 /** Access the VM function return value as a \c ::quat_t quaternion.
 
@@ -884,7 +884,7 @@ void PR_Undefined (progs_t *pr, const char *type, const char *name) __attribute_
 
 	\hideinitializer
 */
-#define R_QUAT(p)		R_var (p, quat)
+#define R_QUAT(p)		(&R_var (p, quat))
 
 /** Access the VM function return value as a ::string_t (a VM string reference).
 
@@ -1054,7 +1054,7 @@ void PR_Undefined (progs_t *pr, const char *type, const char *name) __attribute_
 
 	\hideinitializer
 */
-#define E_VECTOR(e,o)	E_var (e, o, vector)
+#define E_VECTOR(e,o)	(&E_var (e, o, vector))
 
 /** Access a quaternion entity field. Can be used any way a quat_t variable
 	can.
diff --git a/libs/console/bi_inputline.c b/libs/console/bi_inputline.c
index f48a4551e..7e4e743a2 100644
--- a/libs/console/bi_inputline.c
+++ b/libs/console/bi_inputline.c
@@ -83,7 +83,7 @@ il_data_get (il_resources_t *res, unsigned index)
 	PR_RESGET (res->line_map, index);
 }
 
-static inline int
+static inline int __attribute__((pure))
 il_data_index (il_resources_t *res, il_data_t *line)
 {
 	PR_RESINDEX (res->line_map, line);
diff --git a/libs/gamecode/pr_debug.c b/libs/gamecode/pr_debug.c
index 3d99da30a..d8105c5f6 100644
--- a/libs/gamecode/pr_debug.c
+++ b/libs/gamecode/pr_debug.c
@@ -1133,9 +1133,7 @@ pr_debug_vector_view (qfot_type_t *type, pr_type_t *value, void *_data)
 	__auto_type data = (pr_debug_data_t *) _data;
 	dstring_t  *dstr = data->dstr;
 
-	dasprintf (dstr, "'%.9g %.9g %.9g'",
-			  value->vector_var[0], value->vector_var[1],
-			  value->vector_var[2]);
+	dasprintf (dstr, "'%.9g %.9g %.9g'", VectorExpand (&value->vector_var));
 }
 
 static void
@@ -1213,9 +1211,7 @@ pr_debug_quat_view (qfot_type_t *type, pr_type_t *value, void *_data)
 	__auto_type data = (pr_debug_data_t *) _data;
 	dstring_t  *dstr = data->dstr;
 
-	dasprintf (dstr, "'%.9g %.9g %.9g %.9g'",
-			   value->vector_var[0], value->vector_var[1],
-			   value->vector_var[2], value->vector_var[3]);
+	dasprintf (dstr, "'%.9g %.9g %.9g %.9g'", QuatExpand (&value->quat_var));
 }
 
 static void
diff --git a/libs/gamecode/pr_exec.c b/libs/gamecode/pr_exec.c
index 4a79f8173..9a9d03893 100644
--- a/libs/gamecode/pr_exec.c
+++ b/libs/gamecode/pr_exec.c
@@ -512,10 +512,10 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 				OPC.float_var = OPA.float_var + OPB.float_var;
 				break;
 			case OP_ADD_V:
-				VectorAdd (OPA.vector_var, OPB.vector_var, OPC.vector_var);
+				VectorAdd (&OPA.vector_var, &OPB.vector_var, &OPC.vector_var);
 				break;
 			case OP_ADD_Q:
-				QuatAdd (OPA.quat_var, OPB.quat_var, OPC.quat_var);
+				QuatAdd (&OPA.quat_var, &OPB.quat_var, &OPC.quat_var);
 				break;
 			case OP_ADD_S:
 				OPC.string_var = PR_CatStrings (pr,
@@ -531,10 +531,11 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 				OPC.float_var = OPA.float_var - OPB.float_var;
 				break;
 			case OP_SUB_V:
-				VectorSubtract (OPA.vector_var, OPB.vector_var, OPC.vector_var);
+				VectorSubtract (&OPA.vector_var, &OPB.vector_var,
+								&OPC.vector_var);
 				break;
 			case OP_SUB_Q:
-				QuatSubtract (OPA.quat_var, OPB.quat_var, OPC.quat_var);
+				QuatSubtract (&OPA.quat_var, &OPB.quat_var, &OPC.quat_var);
 				break;
 			case OP_MUL_D:
 				OPC_double_var = OPA_double_var * OPB_double_var;
@@ -543,14 +544,14 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 				OPC.float_var = OPA.float_var * OPB.float_var;
 				break;
 			case OP_MUL_V:
-				OPC.float_var = DotProduct (OPA.vector_var, OPB.vector_var);
+				OPC.float_var = DotProduct (&OPA.vector_var, &OPB.vector_var);
 				break;
 			case OP_MUL_DV:
 				{
 					// avoid issues with the likes of x = x.x * x;
 					// makes for faster code, too
 					double      scale = OPA_double_var;
-					VectorScale (OPB.vector_var, scale, OPC.vector_var);
+					VectorScale (&OPB.vector_var, scale, &OPC.vector_var);
 				}
 				break;
 			case OP_MUL_VD:
@@ -558,7 +559,7 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 					// avoid issues with the likes of x = x * x.x;
 					// makes for faster code, too
 					double      scale = OPB_double_var;
-					VectorScale (OPA.vector_var, scale, OPC.vector_var);
+					VectorScale (&OPA.vector_var, scale, &OPC.vector_var);
 				}
 				break;
 			case OP_MUL_FV:
@@ -566,7 +567,7 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 					// avoid issues with the likes of x = x.x * x;
 					// makes for faster code, too
 					float       scale = OPA.float_var;
-					VectorScale (OPB.vector_var, scale, OPC.vector_var);
+					VectorScale (&OPB.vector_var, scale, &OPC.vector_var);
 				}
 				break;
 			case OP_MUL_VF:
@@ -574,21 +575,21 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 					// avoid issues with the likes of x = x * x.x;
 					// makes for faster code, too
 					float       scale = OPB.float_var;
-					VectorScale (OPA.vector_var, scale, OPC.vector_var);
+					VectorScale (&OPA.vector_var, scale, &OPC.vector_var);
 				}
 				break;
 			case OP_MUL_Q:
-				QuatMult (OPA.quat_var, OPB.quat_var, OPC.quat_var);
+				QuatMult (&OPA.quat_var, &OPB.quat_var, &OPC.quat_var);
 				break;
 			case OP_MUL_QV:
-				QuatMultVec (OPA.quat_var, OPB.vector_var, OPC.vector_var);
+				QuatMultVec (&OPA.quat_var, &OPB.vector_var, &OPC.vector_var);
 				break;
 			case OP_MUL_DQ:
 				{
 					// avoid issues with the likes of x = x.s * x;
 					// makes for faster code, too
 					double      scale = OPA_double_var;
-					QuatScale (OPB.quat_var, scale, OPC.quat_var);
+					QuatScale (&OPB.quat_var, scale, &OPC.quat_var);
 				}
 				break;
 			case OP_MUL_QD:
@@ -596,7 +597,7 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 					// avoid issues with the likes of x = x * x.s;
 					// makes for faster code, too
 					double      scale = OPB_double_var;
-					QuatScale (OPA.quat_var, scale, OPC.quat_var);
+					QuatScale (&OPA.quat_var, scale, &OPC.quat_var);
 				}
 				break;
 			case OP_MUL_FQ:
@@ -604,7 +605,7 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 					// avoid issues with the likes of x = x.s * x;
 					// makes for faster code, too
 					float       scale = OPA.float_var;
-					QuatScale (OPB.quat_var, scale, OPC.quat_var);
+					QuatScale (&OPB.quat_var, scale, &OPC.quat_var);
 				}
 				break;
 			case OP_MUL_QF:
@@ -612,11 +613,11 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 					// avoid issues with the likes of x = x * x.s;
 					// makes for faster code, too
 					float       scale = OPB.float_var;
-					QuatScale (OPA.quat_var, scale, OPC.quat_var);
+					QuatScale (&OPA.quat_var, scale, &OPC.quat_var);
 				}
 				break;
 			case OP_CONJ_Q:
-				QuatConj (OPA.quat_var, OPC.quat_var);
+				QuatConj (&OPA.quat_var, &OPC.quat_var);
 				break;
 			case OP_DIV_D:
 				OPC_double_var = OPA_double_var / OPB_double_var;
@@ -673,10 +674,10 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 				OPC.integer_var = !FNZ (OPA);
 				break;
 			case OP_NOT_V:
-				OPC.integer_var = VectorIsZero (OPA.vector_var);
+				OPC.integer_var = VectorIsZero (&OPA.vector_var);
 				break;
 			case OP_NOT_Q:
-				OPC.integer_var = QuatIsZero (OPA.quat_var);
+				OPC.integer_var = QuatIsZero (&OPA.quat_var);
 				break;
 			case OP_NOT_S:
 				OPC.integer_var = !OPA.string_var ||
@@ -692,11 +693,11 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 				OPC.integer_var = OPA.float_var == OPB.float_var;
 				break;
 			case OP_EQ_V:
-				OPC.integer_var = VectorCompare (OPA.vector_var,
-												 OPB.vector_var);
+				OPC.integer_var = VectorCompare (&OPA.vector_var,
+												 &OPB.vector_var);
 				break;
 			case OP_EQ_Q:
-				OPC.integer_var = QuatCompare (OPA.quat_var, OPB.quat_var);
+				OPC.integer_var = QuatCompare (&OPA.quat_var, &OPB.quat_var);
 				break;
 			case OP_EQ_E:
 				OPC.integer_var = OPA.integer_var == OPB.integer_var;
@@ -708,11 +709,11 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 				OPC.integer_var = OPA.float_var != OPB.float_var;
 				break;
 			case OP_NE_V:
-				OPC.integer_var = !VectorCompare (OPA.vector_var,
-												  OPB.vector_var);
+				OPC.integer_var = !VectorCompare (&OPA.vector_var,
+												  &OPB.vector_var);
 				break;
 			case OP_NE_Q:
-				OPC.integer_var = !QuatCompare (OPA.quat_var, OPB.quat_var);
+				OPC.integer_var = !QuatCompare (&OPA.quat_var, &OPB.quat_var);
 				break;
 			case OP_LE_S:
 			case OP_GE_S:
@@ -753,10 +754,10 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 				OPB.integer_var = OPA.integer_var;
 				break;
 			case OP_STORE_V:
-				VectorCopy (OPA.vector_var, OPB.vector_var);
+				VectorCopy (&OPA.vector_var, &OPB.vector_var);
 				break;
 			case OP_STORE_Q:
-				QuatCopy (OPA.quat_var, OPB.quat_var);
+				QuatCopy (&OPA.quat_var, &OPB.quat_var);
 				break;
 			case OP_STORE_D:
 				OPB_double_var = OPA_double_var;
@@ -782,7 +783,7 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 					PR_BoundsCheck (pr, pointer, ev_vector);
 				}
 				ptr = pr->pr_globals + pointer;
-				VectorCopy (OPA.vector_var, ptr->vector_var);
+				VectorCopy (&OPA.vector_var, &ptr->vector_var);
 				break;
 			case OP_STOREP_Q:
 				pointer = OPB.integer_var;
@@ -790,7 +791,7 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 					PR_BoundsCheck (pr, pointer, ev_quat);
 				}
 				ptr = pr->pr_globals + pointer;
-				QuatCopy (OPA.quat_var, ptr->quat_var);
+				QuatCopy (&OPA.quat_var, &ptr->quat_var);
 				break;
 			case OP_STOREP_D:
 				pointer = OPB.integer_var;
@@ -909,7 +910,7 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 					PR_BoundsCheck (pr, pointer, ev_vector);
 				}
 				ptr = pr->pr_globals + pointer;
-				VectorCopy (ptr->vector_var, OPC.vector_var);
+				VectorCopy (&ptr->vector_var, &OPC.vector_var);
 				break;
 			case OP_LOADB_Q:
 				pointer = OPA.integer_var + OPB.integer_var;
@@ -917,7 +918,7 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 					PR_BoundsCheck (pr, pointer, ev_quat);
 				}
 				ptr = pr->pr_globals + pointer;
-				QuatCopy (ptr->quat_var, OPC.quat_var);
+				QuatCopy (&ptr->quat_var, &OPC.quat_var);
 				break;
 			case OP_LOADB_D:
 				pointer = OPA.integer_var + OPB.integer_var;
@@ -948,7 +949,7 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 					PR_BoundsCheck (pr, pointer, ev_vector);
 				}
 				ptr = pr->pr_globals + pointer;
-				VectorCopy (ptr->vector_var, OPC.vector_var);
+				VectorCopy (&ptr->vector_var, &OPC.vector_var);
 				break;
 			case OP_LOADBI_Q:
 				pointer = OPA.integer_var + (short) st->b;
@@ -956,7 +957,7 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 					PR_BoundsCheck (pr, pointer, ev_quat);
 				}
 				ptr = pr->pr_globals + pointer;
-				QuatCopy (ptr->quat_var, OPC.quat_var);
+				QuatCopy (&ptr->quat_var, &OPC.quat_var);
 				break;
 			case OP_LOADBI_D:
 				pointer = OPA.integer_var + (short) st->b;
@@ -997,7 +998,7 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 					PR_BoundsCheck (pr, pointer, ev_vector);
 				}
 				ptr = pr->pr_globals + pointer;
-				VectorCopy (OPA.vector_var, ptr->vector_var);
+				VectorCopy (&OPA.vector_var, &ptr->vector_var);
 				break;
 			case OP_STOREB_Q:
 				pointer = OPB.integer_var + OPC.integer_var;
@@ -1005,7 +1006,7 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 					PR_BoundsCheck (pr, pointer, ev_quat);
 				}
 				ptr = pr->pr_globals + pointer;
-				QuatCopy (OPA.quat_var, ptr->quat_var);
+				QuatCopy (&OPA.quat_var, &ptr->quat_var);
 				break;
 			case OP_STOREB_D:
 				pointer = OPB.integer_var + OPC.integer_var;
@@ -1036,7 +1037,7 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 					PR_BoundsCheck (pr, pointer, ev_vector);
 				}
 				ptr = pr->pr_globals + pointer;
-				VectorCopy (OPA.vector_var, ptr->vector_var);
+				VectorCopy (&OPA.vector_var, &ptr->vector_var);
 				break;
 			case OP_STOREBI_Q:
 				pointer = OPB.integer_var + (short) st->c;
@@ -1044,7 +1045,7 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 					PR_BoundsCheck (pr, pointer, ev_quat);
 				}
 				ptr = pr->pr_globals + pointer;
-				QuatCopy (OPA.quat_var, ptr->quat_var);
+				QuatCopy (&OPA.quat_var, &ptr->quat_var);
 				break;
 			case OP_STOREBI_D:
 				pointer = OPB.integer_var + (short) st->c;
@@ -1131,7 +1132,7 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 						PR_BoundsCheck (pr, pointer, ev_integer);
 					}
 
-					VectorCopy (ptr->vector_var, stk->vector_var);
+					VectorCopy (&ptr->vector_var, &stk->vector_var);
 					*pr->globals.stack = stack;
 				}
 				break;
@@ -1148,7 +1149,7 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 						PR_BoundsCheck (pr, pointer, ev_quat);
 					}
 
-					QuatCopy (ptr->quat_var, stk->quat_var);
+					QuatCopy (&ptr->quat_var, &stk->quat_var);
 					*pr->globals.stack = stack;
 				}
 				break;
@@ -1189,7 +1190,7 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 						PR_BoundsCheck (pr, pointer, ev_integer);
 					}
 
-					VectorCopy (ptr->vector_var, stk->vector_var);
+					VectorCopy (&ptr->vector_var, &stk->vector_var);
 					*pr->globals.stack = stack;
 				}
 				break;
@@ -1206,7 +1207,7 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 						PR_BoundsCheck (pr, pointer, ev_quat);
 					}
 
-					QuatCopy (ptr->quat_var, stk->quat_var);
+					QuatCopy (&ptr->quat_var, &stk->quat_var);
 					*pr->globals.stack = stack;
 				}
 				break;
@@ -1287,7 +1288,7 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 						PR_BoundsCheck (pr, pointer, ev_integer);
 					}
 
-					VectorCopy (ptr->vector_var, stk->vector_var);
+					VectorCopy (&ptr->vector_var, &stk->vector_var);
 					*pr->globals.stack = stack + 3;
 				}
 				break;
@@ -1304,7 +1305,7 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 						PR_BoundsCheck (pr, pointer, ev_quat);
 					}
 
-					QuatCopy (ptr->quat_var, stk->quat_var);
+					QuatCopy (&ptr->quat_var, &stk->quat_var);
 					*pr->globals.stack = stack + 4;
 				}
 				break;
@@ -1345,7 +1346,7 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 						PR_BoundsCheck (pr, pointer, ev_integer);
 					}
 
-					VectorCopy (ptr->vector_var, stk->vector_var);
+					VectorCopy (&ptr->vector_var, &stk->vector_var);
 					*pr->globals.stack = stack + 3;
 				}
 				break;
@@ -1362,7 +1363,7 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 						PR_BoundsCheck (pr, pointer, ev_quat);
 					}
 
-					QuatCopy (ptr->quat_var, stk->quat_var);
+					QuatCopy (&ptr->quat_var, &stk->quat_var);
 					*pr->globals.stack = stack + 4;
 				}
 				break;
diff --git a/libs/gamecode/pr_parse.c b/libs/gamecode/pr_parse.c
index 2652694e8..6471a44bb 100644
--- a/libs/gamecode/pr_parse.c
+++ b/libs/gamecode/pr_parse.c
@@ -92,10 +92,10 @@ PR_UglyValueString (progs_t *pr, etype_t type, pr_type_t *val, dstring_t *line)
 			dsprintf (line, "%d", val->integer_var);
 			break;
 		case ev_vector:
-			dsprintf (line, "%.9g %.9g %.9g", VectorExpand (val->vector_var));
+			dsprintf (line, "%.9g %.9g %.9g", VectorExpand (&val->vector_var));
 			break;
 		case ev_quat:
-			dsprintf (line, "%.9g %.9g %.9g %.9g", QuatExpand (val->quat_var));
+			dsprintf (line, "%.9g %.9g %.9g %.9g", QuatExpand (&val->quat_var));
 			break;
 		default:
 			dsprintf (line, "bad type %i", type);
@@ -241,7 +241,7 @@ ED_ParseEpair (progs_t *pr, pr_type_t *base, pr_def_t *key, const char *s)
 				while (*v && *v != ' ')
 					v++;
 				*v = 0;
-				d->vector_var[i] = atof (w);
+				(&d->vector_var)[i] = atof (w);
 				w = v = v + 1;
 			}
 			free (string);
diff --git a/libs/models/alias/model_alias.c b/libs/models/alias/model_alias.c
index af2731d71..8a4784b2d 100644
--- a/libs/models/alias/model_alias.c
+++ b/libs/models/alias/model_alias.c
@@ -138,7 +138,7 @@ Mod_LoadAliasFrame (void *pin, int *posenum, maliasframedesc_t *frame,
 
 	pdaliasframe = (daliasframe_t *) pin;
 
-	strncpy (frame->name, pdaliasframe->name, sizeof (frame->name));
+	memcpy (frame->name, pdaliasframe->name, sizeof (frame->name));
 	frame->name[sizeof (frame->name) - 1] = 0;
 	frame->firstpose = (*posenum);
 	frame->numposes = 1;
diff --git a/libs/ruamoko/rua_hash.c b/libs/ruamoko/rua_hash.c
index cff92eb4e..98d9722ba 100644
--- a/libs/ruamoko/rua_hash.c
+++ b/libs/ruamoko/rua_hash.c
@@ -85,7 +85,7 @@ table_get (hash_resources_t *res, int index)
 	PR_RESGET(res->table_map, index);
 }
 
-static inline int
+static inline int __attribute__((pure))
 table_index (hash_resources_t *res, bi_hashtab_t *table)
 {
 	PR_RESINDEX(res->table_map, table);
diff --git a/libs/ruamoko/rua_msgbuf.c b/libs/ruamoko/rua_msgbuf.c
index 9b026c90f..51c7bcf16 100644
--- a/libs/ruamoko/rua_msgbuf.c
+++ b/libs/ruamoko/rua_msgbuf.c
@@ -80,7 +80,7 @@ msgbuf_get (msgbuf_resources_t *res, int index)
 	PR_RESGET(res->msgbuf_map, index);
 }
 
-static inline int
+static inline int __attribute__((pure))
 msgbuf_index (msgbuf_resources_t *res, msgbuf_t *msgbuf)
 {
 	PR_RESINDEX(res->msgbuf_map, msgbuf);
@@ -358,8 +358,7 @@ static void
 bi_MsgBuf_ReadCoordAngleV (progs_t *pr)
 {
 	msgbuf_t   *mb = get_msgbuf (pr, __FUNCTION__, P_INT (pr, 0));
-	MSG_ReadCoordAngleV (&mb->msg, P_GPOINTER (pr, 1)->vector_var,
-						 P_GPOINTER (pr, 2)->vector_var);
+	MSG_ReadCoordAngleV (&mb->msg, P_VECTOR (pr, 1), P_VECTOR (pr, 2));
 }
 
 static void
diff --git a/libs/ruamoko/rua_obj.c b/libs/ruamoko/rua_obj.c
index baa8fe73b..155124b9f 100644
--- a/libs/ruamoko/rua_obj.c
+++ b/libs/ruamoko/rua_obj.c
@@ -108,7 +108,7 @@ dtable_get (probj_t *probj, int index)
 	PR_RESGET (probj->dtables, index);
 }
 
-static inline int
+static inline int __attribute__((pure))
 dtable_index (probj_t *probj, dtable_t *dtable)
 {
 	PR_RESINDEX (probj->dtables, dtable);
diff --git a/libs/ruamoko/rua_plist.c b/libs/ruamoko/rua_plist.c
index 9732b75c3..b71af2ead 100644
--- a/libs/ruamoko/rua_plist.c
+++ b/libs/ruamoko/rua_plist.c
@@ -84,7 +84,7 @@ plist_get (plist_resources_t *res, unsigned index)
 	PR_RESGET(res->plist_map, index);
 }
 
-static inline int
+static inline int __attribute__((pure))
 plist_index (plist_resources_t *res, bi_plist_t *plist)
 {
 	PR_RESINDEX(res->plist_map, plist);
diff --git a/libs/ruamoko/rua_qfile.c b/libs/ruamoko/rua_qfile.c
index d96c433a2..2f625a949 100644
--- a/libs/ruamoko/rua_qfile.c
+++ b/libs/ruamoko/rua_qfile.c
@@ -77,7 +77,7 @@ handle_get (qfile_resources_t *res, int index)
 	PR_RESGET(res->handle_map, index);
 }
 
-static inline int
+static inline int __attribute__((pure))
 handle_index (qfile_resources_t *res, qfile_t *handle)
 {
 	PR_RESINDEX(res->handle_map, handle);
diff --git a/libs/ruamoko/rua_script.c b/libs/ruamoko/rua_script.c
index ff5b2ab0a..7c2cd6666 100644
--- a/libs/ruamoko/rua_script.c
+++ b/libs/ruamoko/rua_script.c
@@ -78,7 +78,7 @@ script_get (script_resources_t *res, int index)
 	PR_RESGET(res->scripts, index);
 }
 
-static inline int
+static inline int __attribute__((pure))
 script_index (script_resources_t *res, rua_script_t *script)
 {
 	PR_RESINDEX(res->scripts, script);
diff --git a/libs/ruamoko/rua_set.c b/libs/ruamoko/rua_set.c
index 0fdd964e7..4e3ea732d 100644
--- a/libs/ruamoko/rua_set.c
+++ b/libs/ruamoko/rua_set.c
@@ -98,7 +98,7 @@ res_set_get (set_resources_t *res, int index)
 	PR_RESGET(res->set_map, index);
 }
 
-static inline int
+static inline int __attribute__((pure))
 res_set_index (set_resources_t *res, bi_set_t *set)
 {
 	PR_RESINDEX(res->set_map, set);
@@ -128,7 +128,7 @@ res_set_iter_get (set_resources_t *res, int index)
 	PR_RESGET(res->set_iter_map, index);
 }
 
-static inline int
+static inline int __attribute__((pure))
 res_set_iter_index (set_resources_t *res, bi_set_iter_t *set_iter)
 {
 	PR_RESINDEX(res->set_iter_map, set_iter);
diff --git a/libs/util/zone.c b/libs/util/zone.c
index 40af412ba..f52226d55 100644
--- a/libs/util/zone.c
+++ b/libs/util/zone.c
@@ -577,7 +577,8 @@ Hunk_AllocName (int size, const char *name)
 
 	h->size = size;
 	h->sentinal = HUNK_SENTINAL;
-	strncpy (h->name, name, 8);
+	memcpy (h->name, name, 8);
+	h->name[7] = 0;
 
 	return (void *) (h + 1);
 }
diff --git a/libs/video/renderer/r_progs.c b/libs/video/renderer/r_progs.c
index aba1de6ea..3f2925fba 100644
--- a/libs/video/renderer/r_progs.c
+++ b/libs/video/renderer/r_progs.c
@@ -101,7 +101,7 @@ qpic_get (draw_resources_t *res, int index)
 	PR_RESGET (res->qpic_map, index);
 }
 
-static inline int
+static inline int __attribute__((pure))
 qpic_index (draw_resources_t *res, qpic_res_t *qp)
 {
 	PR_RESINDEX (res->qpic_map, qp);
diff --git a/libs/video/renderer/vulkan/vkgen/vkstruct.r b/libs/video/renderer/vulkan/vkgen/vkstruct.r
index dc6aa39d6..b1bf22960 100644
--- a/libs/video/renderer/vulkan/vkgen/vkstruct.r
+++ b/libs/video/renderer/vulkan/vkgen/vkstruct.r
@@ -48,9 +48,15 @@
 
 -(void) writeTable: (PLItem *) parse
 {
-	PLItem     *field_dict = [parse getObjectForKey:[self name]];
+	string      name = [self name];
+	PLItem     *field_dict = [parse getObjectForKey:name];
 	PLItem     *field_defs = [field_dict allKeys];
 	Type       *field_type;
+	PLItem     *new_name = [field_dict getObjectForKey:".name"];
+
+	if (new_name) {
+		name = [new_name string];
+	}
 
 	if (field_defs) {
 		PLItem     *field_def;
@@ -65,7 +71,7 @@
 			string      size_field = nil;
 			string      value_field = nil;
 
-			if (!type_desc) {
+			if (!type_desc || str_mid(field_name, 0, 1) == ".") {
 				continue;
 			}
 			type_record = [[type_desc getObjectAtIndex:0] string];
@@ -73,22 +79,22 @@
 
 			field_type = [[Type lookup: type_type] dereference];
 			fprintf (output_file, "static parse_%s_t parse_%s_%s_data = {\n",
-					 type_record, [self name], field_name);
+					 type_record, name, field_name);
 			fprintf (output_file, "\t%s,\n", [field_type parseType]);
 			fprintf (output_file, "\tsizeof (%s),\n", type_type);
 			fprintf (output_file, "\tparse_%s,\n", type_type);
 			if (type_record == "single") {
 				value_field = [[field_def getObjectForKey:"value"] string];
 				fprintf (output_file, "\tfield_offset (%s, %s),\n",
-						 [self name], value_field);
+						 name, value_field);
 			} else {
 				value_field = [[field_def getObjectForKey:"values"] string];
 				size_field = [[field_def getObjectForKey:"size"] string];
 				fprintf (output_file, "\tfield_offset (%s, %s),\n",
-						 [self name], value_field);
+						 name, value_field);
 				if (size_field) {
 					fprintf (output_file, "\tfield_offset (%s, %s),\n",
-							 [self name], size_field);
+							 name, size_field);
 				} else {
 					fprintf (output_file, "\t-1,\n");
 				}
@@ -96,13 +102,16 @@
 			fprintf (output_file, "};\n");
 		}
 	}
-	fprintf (output_file, "static plfield_t %s_fields[] = {\n", [self name]);
+	fprintf (output_file, "static plfield_t %s_fields[] = {\n", name);
 	if (field_defs) {
 		PLItem     *field_def;
 		qfot_var_t *field;
 
 		for (int i = [field_defs count]; i-- > 0; ) {
 			string field_name = [[field_defs  getObjectAtIndex:i] string];
+			if (str_mid(field_name, 0, 1) == ".") {
+				continue;
+			}
 			field_def = [field_dict getObjectForKey:field_name];
 			if ([field_def string] == "auto") {
 				field = [self findField:field_name];
@@ -112,7 +121,7 @@
 				field_type = [Type findType: field.type];
 				fprintf (output_file,
 						 "\t{\"%s\", field_offset (%s, %s), %s, %s, %s},\n",
-						 field_name, [self name], field_name,
+						 field_name, name, field_name,
 						 [field_type parseType], [field_type parseFunc],
 						 [field_type parseData]);
 			} else {
@@ -133,7 +142,7 @@
 				fprintf (output_file,
 						 "\t{\"%s\", 0, %s, parse_%s, &parse_%s_%s_data},\n",
 						 field_name, parseType, type_record,
-						 [self name], field_name);
+						 name, field_name);
 			}
 		}
 	} else {
@@ -145,7 +154,7 @@
 			field_type = [Type findType: field.type];
 			fprintf (output_file,
 					 "\t{\"%s\", field_offset (%s, %s), %s, %s, %s},\n",
-					 field.name, [self name], field.name,
+					 field.name, name, field.name,
 					 [field_type parseType], [field_type parseFunc],
 					 [field_type parseData]);
 		}
@@ -154,12 +163,14 @@
 	fprintf (output_file, "};\n");
 
 	fprintf (output_file, "static int parse_%s (const plfield_t *field,"
-			 " const plitem_t *item, void *data, plitem_t *messages)\n",
-			 [self name]);
+			 " const plitem_t *item, void *data, plitem_t *messages,"
+			 " void *context)\n",
+			 name);
 	fprintf (output_file, "{\n");
 	fprintf (output_file,
-			 "\treturn PL_ParseDictionary (%s_fields, item, data, messages);\n",
-			 [self name]);
+			 "\treturn PL_ParseDictionary (%s_fields, item, data, messages,"
+			 " context);\n",
+			 name);
 	fprintf (output_file, "}\n");
 }
 
diff --git a/nq/include/sv_progs.h b/nq/include/sv_progs.h
index 07a8c8f7c..3d798ac16 100644
--- a/nq/include/sv_progs.h
+++ b/nq/include/sv_progs.h
@@ -208,7 +208,7 @@ extern progs_t sv_pr_state;
 #define SVstring(e,f)	SVFIELD (e, f, string)
 #define SVfunc(e,f)		SVFIELD (e, f, func)
 #define SVentity(e,f)	SVFIELD (e, f, entity)
-#define SVvector(e,f)	SVFIELD (e, f, vector)
+#define SVvector(e,f)	(&SVFIELD (e, f, vector))
 #define SVinteger(e,f)	SVFIELD (e, f, integer)
 #if TYPECHECK_PROGS
 #define SVdouble(e,f) E_DOUBLE (e, PR_AccessField (&sv_pr_state, #f, ev_##t, __FILE__, __LINE__))
diff --git a/qw/include/sv_progs.h b/qw/include/sv_progs.h
index 18bdde503..88fe18c24 100644
--- a/qw/include/sv_progs.h
+++ b/qw/include/sv_progs.h
@@ -193,7 +193,7 @@ extern progs_t sv_pr_state;
 #define SVstring(e,f)	SVFIELD (e, f, string)
 #define SVfunc(e,f)		SVFIELD (e, f, func)
 #define SVentity(e,f)	SVFIELD (e, f, entity)
-#define SVvector(e,f)	SVFIELD (e, f, vector)
+#define SVvector(e,f)	(&SVFIELD (e, f, vector))
 #define SVinteger(e,f)	SVFIELD (e, f, integer)
 #if TYPECHECK_PROGS
 #define SVdouble(e,f) E_DOUBLE (e, PR_AccessField (&sv_pr_state, #f, ev_##t, __FILE__, __LINE__))
diff --git a/qw/source/pmove.c b/qw/source/pmove.c
index 637528afa..358409bc5 100644
--- a/qw/source/pmove.c
+++ b/qw/source/pmove.c
@@ -738,7 +738,7 @@ SpectatorMove (void)
 	// friction
 	speed = DotProduct (pmove.velocity, pmove.velocity);
 	if (speed < 1) {
-		VectorZero (pmove.velocity)
+		VectorZero (pmove.velocity);
 	} else {
 		speed = sqrt (speed);
 		drop = 0;
diff --git a/qw/source/sv_progs.c b/qw/source/sv_progs.c
index 276ee2875..7ef651a15 100644
--- a/qw/source/sv_progs.c
+++ b/qw/source/sv_progs.c
@@ -101,8 +101,8 @@ free_edict (progs_t *pr, edict_t *ent)
 		ent->v[sv_fields.frame].float_var = 0;
 		ent->v[sv_fields.nextthink].float_var = -1;
 		ent->v[sv_fields.solid].float_var = 0;
-		memset (ent->v[sv_fields.origin].vector_var, 0, 3*sizeof (float));
-		memset (ent->v[sv_fields.angles].vector_var, 0, 3*sizeof (float));
+		memset (&ent->v[sv_fields.origin].vector_var, 0, 3*sizeof (float));
+		memset (&ent->v[sv_fields.angles].vector_var, 0, 3*sizeof (float));
 	} else {
 		ED_ClearEdict (pr, ent, 0);
 	}
diff --git a/ruamoko/qwaq/builtins/curses.c b/ruamoko/qwaq/builtins/curses.c
index 8f543f493..4f2044cf7 100644
--- a/ruamoko/qwaq/builtins/curses.c
+++ b/ruamoko/qwaq/builtins/curses.c
@@ -148,7 +148,7 @@ window_get (qwaq_resources_t *res, unsigned index)
 	PR_RESGET(res->window_map, index);
 }
 
-static inline int
+static inline int __attribute__((pure))
 window_index (qwaq_resources_t *res, window_t *win)
 {
 	PR_RESINDEX (res->window_map, win);
@@ -194,7 +194,7 @@ panel_get (qwaq_resources_t *res, unsigned index)
 	PR_RESGET(res->panel_map, index);
 }
 
-static inline int
+static inline int __attribute__((pure))
 panel_index (qwaq_resources_t *res, panel_t *win)
 {
 	PR_RESINDEX (res->panel_map, win);
diff --git a/ruamoko/qwaq/builtins/debug.c b/ruamoko/qwaq/builtins/debug.c
index d16ac6f97..19b215e38 100644
--- a/ruamoko/qwaq/builtins/debug.c
+++ b/ruamoko/qwaq/builtins/debug.c
@@ -94,7 +94,7 @@ target_get (qwaq_debug_t *debug, unsigned index)
 	PR_RESGET (debug->targets, index);
 }
 
-static inline int
+static inline int __attribute__((pure))
 target_index (qwaq_debug_t *debug, qwaq_target_t *target)
 {
 	PR_RESINDEX (debug->targets, target);
diff --git a/ruamoko/qwaq/builtins/editbuffer.c b/ruamoko/qwaq/builtins/editbuffer.c
index 12cde52ab..d687103d3 100644
--- a/ruamoko/qwaq/builtins/editbuffer.c
+++ b/ruamoko/qwaq/builtins/editbuffer.c
@@ -52,7 +52,7 @@ editbuffer_get (qwaq_ebresources_t *res, unsigned index)
 	PR_RESGET (res->buffers, index);
 }
 
-static inline int
+static inline int __attribute__((pure))
 editbuffer_index (qwaq_ebresources_t *res, editbuffer_t *buffer)
 {
 	PR_RESINDEX (res->buffers, buffer);
diff --git a/ruamoko/qwaq/builtins/main.c b/ruamoko/qwaq/builtins/main.c
index 0a4faf28b..f493e8528 100644
--- a/ruamoko/qwaq/builtins/main.c
+++ b/ruamoko/qwaq/builtins/main.c
@@ -86,6 +86,7 @@ open_file (const char *path, int *len)
 	if (!file) {
 		strerror_r(errno, errbuff, sizeof (errbuff));
 		Sys_Printf ("%s\n", errbuff);
+		*len = 0;
 		return 0;
 	}
 	*len = Qfilesize (file);
diff --git a/tools/qfbsp/source/outside.c b/tools/qfbsp/source/outside.c
index 15da18dba..d7ba0d142 100644
--- a/tools/qfbsp/source/outside.c
+++ b/tools/qfbsp/source/outside.c
@@ -180,6 +180,8 @@ MarkLeakTrail2 (void)
 	vec3_t      wc, pwc;
 	const vec_t *v;
 
+	VectorZero (wc);
+
 	leakfile = fopen (options.pointfile, "w");
 	if (!leakfile)
 		Sys_Error ("Couldn't open %s\n", options.pointfile);
diff --git a/tools/qfcc/include/qfcc.h b/tools/qfcc/include/qfcc.h
index 6fac011ce..9d552ab3e 100644
--- a/tools/qfcc/include/qfcc.h
+++ b/tools/qfcc/include/qfcc.h
@@ -101,8 +101,8 @@ extern	pr_info_t	pr;
 #define	D_DOUBLE(d)			(*(double *) ((d)->space->data + (d)->offset))
 #define	D_FLOAT(d)			D_var (float, d)
 #define	D_INT(d)			D_var (integer, d)
-#define	D_VECTOR(d)			D_var (vector, d)
-#define	D_QUAT(d)			D_var (quat, d)
+#define	D_VECTOR(d)			(&D_var (vector, d))
+#define	D_QUAT(d)			(&D_var (quat, d))
 #define	D_STRING(d)			D_var (string, d)
 #define	D_GETSTR(d)			GETSTR (D_STRING (d))
 #define	D_FUNCTION(d)		D_var (func, d)
diff --git a/tools/qflight/include/noise.h b/tools/qflight/include/noise.h
index be63d9de1..0b118d17a 100644
--- a/tools/qflight/include/noise.h
+++ b/tools/qflight/include/noise.h
@@ -34,7 +34,7 @@
 ///@{
 
 float noise3d (vec3_t v, int num) __attribute__((pure));
-float noiseXYZ (float x, float y, float z, int num) __attribute__((pure));
+float noiseXYZ (float x, float y, float z, int num) __attribute__((const));
 float noise_scaled (vec3_t v, float s, int num) __attribute__((pure));
 float noise_perlin (vec3_t v, float p, int num) __attribute__((pure));
 void snap_vector (vec3_t v_old, vec3_t v_new, float scale);
diff --git a/tools/qfmodelgen/source/modelgen.c b/tools/qfmodelgen/source/modelgen.c
index 5d3eee4d0..a4b18b1ac 100644
--- a/tools/qfmodelgen/source/modelgen.c
+++ b/tools/qfmodelgen/source/modelgen.c
@@ -178,15 +178,17 @@ SetQdirFromPath (char *path)
 static const char *
 ExpandPath (const char *path)
 {
-	static char full[1024];
+	static dstring_t *full;
 
-	//FIXME buffer overflow central
+	if (!full) {
+		full = dstring_new();
+	}
 	//if (!qdir)
 	//	Sys_Error ("ExpandPath called without qdir set");
 	if (path[0] == '/' || path[0] == '\\' || path[1] == ':')
 		return path;
-	sprintf (full, "%s%s", qdir, path);
-	return full;
+	dsprintf (full, "%s%s", qdir, path);
+	return full->str;
 }
 
 static void

From ebcef5c8a46b7d199df88ac9d4f3f1ae5b5b6cbd Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 21 Dec 2020 02:32:29 +0900
Subject: [PATCH 1201/1519] [util] Deal with gcc optimizing out isnan checks

This occurs because of -ffast-math, but I need to investigate how much
of an impact disabling it has on QF's performance.
---
 libs/util/test/test-quat.c | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/libs/util/test/test-quat.c b/libs/util/test/test-quat.c
index 11cc5b617..8e4738449 100644
--- a/libs/util/test/test-quat.c
+++ b/libs/util/test/test-quat.c
@@ -239,11 +239,16 @@ fail:
 	return 0;
 }
 
+// XXX FIXME see usage in test_rotation4. need to investigate whether
+// -ffast-math is any real benefit
+#define ISNAN(x) (((x) & 0x7f800000) == 0x7f800000 && ((x) & 0x7fffff))
+
 static int
 test_rotation4 (const vec3_t a, const vec3_t b, const quat_t expect)
 {
 	int         i;
-	quat_t      quat;
+	union { int x[4]; vec_t q[4]; } q;
+	vec_t      *quat = q.q;
 	vec3_t      t;
 	vec_t       d = 0;
 
@@ -258,13 +263,19 @@ test_rotation4 (const vec3_t a, const vec3_t b, const quat_t expect)
 		}
 		// expect NaN for the vector components because the vectors are
 		// anti-parallel and thus the rotation axis is undefined
-		if (!(isnan(quat[0]) && isnan(quat[1]) && isnan(quat[2]))) {
+		//XXX FIXME(?) still using -ffast-math which implies
+		// -ffinite-math-only which in turn disables nan/inf checks, so have
+		// to do it by hand
+		// if (!(isnan(quat[0]) && isnan(quat[1]) && isnan(quat[2]))) {
+		if (!(ISNAN(q.x[0]) && ISNAN(q.x[1]) && ISNAN(q.x[2]))) {
 			goto fail;
 		}
 	} else {
 		// the vectors are not anti-parallel and thus the rotation axis is
 		// defined, so NaN is invalid
-		if (isnan(quat[0]) || isnan(quat[1]) || isnan(quat[2])) {
+		// XXX FIXME see above
+		//if (isnan(quat[0]) || isnan(quat[1]) || isnan(quat[2])) {
+		if (ISNAN(q.x[0]) || ISNAN(q.x[1]) || ISNAN(q.x[2])) {
 			goto fail;
 		}
 		for (i = 0; i < 4; i++) {
@@ -288,6 +299,7 @@ fail:
 	printf ("%11.9g %11.9g %11.9g\n", VectorExpand(a));
 	printf ("%11.9g %11.9g %11.9g\n", VectorExpand(b));
 	printf ("%11.9g %11.9g %11.9g %11.9g\n", QuatExpand(quat));
+	printf ("%11.9g %11.9g %11.9g %11.9g\n", QuatExpand(expect));
 	printf ("%11.9g %11.9g %11.9g\n", VectorExpand(t));
 	printf ("%11.9g\n", d);
 	return 0;

From 591667c36dbcd71f31269ed78285ced5a191c549 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 21 Dec 2020 13:55:54 +0900
Subject: [PATCH 1202/1519] [util] Add a context parameter to the plist parsers

Not used by the dict/array parsers themselves, but is passed on to any
value parser callbacks for their own use.
---
 include/QF/qfplist.h                 |  9 ++++++---
 libs/util/qfplist.c                  | 10 +++++-----
 libs/video/renderer/vulkan/vkparse.c | 16 ++++++++--------
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/include/QF/qfplist.h b/include/QF/qfplist.h
index 3fdfa7825..70a1b8302 100644
--- a/include/QF/qfplist.h
+++ b/include/QF/qfplist.h
@@ -80,12 +80,14 @@ struct plfield_s;
 					error messages. Messages should be strings, but no
 					checking is done: it is up to the top-level caller to
 					parse out the messages.
+	\param context	Additional context data passed to the parser.
 	\return			0 for error, 1 for success. See \a PL_ParseDictionary.
 */
 typedef int (*plparser_t) (const struct plfield_s *field,
 						   const struct plitem_s *item,
 						   void *data,
-						   struct plitem_s *messages);
+						   struct plitem_s *messages,
+						   void *context);
 
 /** A field to be parsed from a dictionary item.
 
@@ -320,12 +322,13 @@ void PL_Free (plitem_t *item);
 					message format is "[line number]: [message]". If the line
 					number is 0, then the actual line is unknown (due to the
 					source item not being parsed from a file or string).
+	\param context	Additional context data passed to the parser.
 	\return			0 if there are any errors, 1 if there are no errors.
 */
 int PL_ParseDictionary (const plfield_t *fields, const plitem_t *dict,
-						void *data, plitem_t *messages);
+						void *data, plitem_t *messages, void *context);
 int PL_ParseArray (const plfield_t *fields, const plitem_t *dict,
-				   void *data, plitem_t *messages);
+				   void *data, plitem_t *messages, void *context);
 void __attribute__((format(printf,3,4)))
 PL_Message (plitem_t *messages, const plitem_t *item, const char *fmt, ...);
 
diff --git a/libs/util/qfplist.c b/libs/util/qfplist.c
index 8eb7e867c..2f71d42bc 100644
--- a/libs/util/qfplist.c
+++ b/libs/util/qfplist.c
@@ -1086,7 +1086,7 @@ PL_Message (plitem_t *messages, const plitem_t *item, const char *fmt, ...)
 
 static int
 pl_default_parser (const plfield_t *field, const plitem_t *item, void *data,
-				   plitem_t *messages)
+				   plitem_t *messages, void *context)
 {
 	switch (field->type) {
 		case QFDictionary:
@@ -1125,7 +1125,7 @@ pl_default_parser (const plfield_t *field, const plitem_t *item, void *data,
 
 VISIBLE int
 PL_ParseDictionary (const plfield_t *fields, const plitem_t *dict, void *data,
-					plitem_t *messages)
+					plitem_t *messages, void *context)
 {
 	void      **list, **l;
 	dictkey_t  *current;
@@ -1161,7 +1161,7 @@ PL_ParseDictionary (const plfield_t *fields, const plitem_t *dict, void *data,
 								pl_types[item->type]);
 					result = 0;
 				} else {
-					if (!parser (f, item, flddata, messages)) {
+					if (!parser (f, item, flddata, messages, context)) {
 						result = 0;
 					}
 				}
@@ -1180,7 +1180,7 @@ PL_ParseDictionary (const plfield_t *fields, const plitem_t *dict, void *data,
 
 VISIBLE int
 PL_ParseArray (const plfield_t *field, const plitem_t *array, void *data,
-			   plitem_t *messages)
+			   plitem_t *messages, void *context)
 {
 	int         result = 1;
 	plparser_t  parser;
@@ -1219,7 +1219,7 @@ PL_ParseArray (const plfield_t *field, const plitem_t *array, void *data,
 						pl_types[item->type]);
 			result = 0;
 		} else {
-			if (!parser (&f, item, eledata, messages)) {
+			if (!parser (&f, item, eledata, messages, context)) {
 				result = 0;
 			}
 		}
diff --git a/libs/video/renderer/vulkan/vkparse.c b/libs/video/renderer/vulkan/vkparse.c
index 7fb137b29..a4b037202 100644
--- a/libs/video/renderer/vulkan/vkparse.c
+++ b/libs/video/renderer/vulkan/vkparse.c
@@ -97,7 +97,7 @@ static int find_enum (const char *valstr, enumval_t *enumval, int *val)
 }
 
 static int parse_uint32_t (const plfield_t *field, const plitem_t *item,
-						   void *data, plitem_t *messages)
+						   void *data, plitem_t *messages, void *ctx)
 {
 	int         ret = 1;
 	const char *valstr = PL_String (item);
@@ -125,7 +125,7 @@ static int parse_uint32_t (const plfield_t *field, const plitem_t *item,
 }
 
 static int parse_enum (const plfield_t *field, const plitem_t *item,
-					   void *data, plitem_t *messages)
+					   void *data, plitem_t *messages, void *ctx)
 {
 	int         ret = 1;
 	int         val;
@@ -144,7 +144,7 @@ static int parse_enum (const plfield_t *field, const plitem_t *item,
 }
 
 static int parse_flags (const plfield_t *field, const plitem_t *item,
-						void *data, plitem_t *messages)
+						void *data, plitem_t *messages, void *ctx)
 {
 	int         ret = 1;
 	int         val;
@@ -165,7 +165,7 @@ static int parse_flags (const plfield_t *field, const plitem_t *item,
 }
 
 static int parse_single (const plfield_t *field, const plitem_t *item,
-						 void *data, plitem_t *messages)
+						 void *data, plitem_t *messages, void *ctx)
 {
 	__auto_type single = (parse_single_t *) field->data;
 	void       *flddata = (byte *)data + single->value_offset;
@@ -180,7 +180,7 @@ static int parse_single (const plfield_t *field, const plitem_t *item,
 
 	plfield_t   f = { 0, 0, single->type, single->parser, 0 };
 	void       *value = calloc (1, single->stride);
-	if (!single->parser (&f, item, value, messages)) {
+	if (!single->parser (&f, item, value, messages, ctx)) {
 		free (value);
 		return 0;
 	}
@@ -190,7 +190,7 @@ static int parse_single (const plfield_t *field, const plitem_t *item,
 }
 
 static int parse_array (const plfield_t *field, const plitem_t *item,
-						void *data, plitem_t *messages)
+						void *data, plitem_t *messages, void *ctx)
 {
 	__auto_type array = (parse_array_t *) field->data;
 	__auto_type value = (void **) ((byte *)data + array->value_offset);
@@ -213,7 +213,7 @@ static int parse_array (const plfield_t *field, const plitem_t *item,
 	//			field->data, data);
 	//Sys_Printf ("    %d %zd %p %zd %zd\n", array->type, array->stride,
 	//			array->parser, array->value_offset, array->size_offset);
-	if (!PL_ParseArray (&f, item, &arr, messages)) {
+	if (!PL_ParseArray (&f, item, &arr, messages, ctx)) {
 		return 0;
 	}
 	*value = malloc (array->stride * arr->size);
@@ -275,7 +275,7 @@ QFV_ParseRenderPass (qfv_device_t *device, plitem_t *plist)
 	VkRenderPass renderpass;
 
 	if (!PL_ParseDictionary (renderpass_fields, plist,
-							 &renderpass_data, messages)) {
+							 &renderpass_data, messages, 0)) {
 		for (int i = 0; i < PL_A_NumObjects (messages); i++) {
 			Sys_Printf ("%s\n", PL_String (PL_ObjectAtIndex (messages, i)));
 		}

From f3682638d4757b7b34a5c005a16110a2c9aabfb5 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 21 Dec 2020 14:06:21 +0900
Subject: [PATCH 1203/1519] [util] Add a mini expression parser

It is capable of parsing single expressions with fairly simple
operations. It current supports ints, enums, cvars and (external) data
structs. It is also thread-safe (in theory, needs proper testing) and
the memory it uses can be mass-freed.
---
 include/QF/cexpr.h           | 118 +++++++++++++
 libs/util/Makemodule.am      |  13 ++
 libs/util/cexpr-lex.l        | 281 +++++++++++++++++++++++++++++++
 libs/util/cexpr-parse.y      | 219 ++++++++++++++++++++++++
 libs/util/cexpr-type.c       | 314 +++++++++++++++++++++++++++++++++++
 libs/util/cexpr-vars.c       | 154 +++++++++++++++++
 libs/util/test/Makemodule.am |   5 +
 libs/util/test/test-cexpr.c  |  81 +++++++++
 8 files changed, 1185 insertions(+)
 create mode 100644 include/QF/cexpr.h
 create mode 100644 libs/util/cexpr-lex.l
 create mode 100644 libs/util/cexpr-parse.y
 create mode 100644 libs/util/cexpr-type.c
 create mode 100644 libs/util/cexpr-vars.c
 create mode 100644 libs/util/test/test-cexpr.c

diff --git a/include/QF/cexpr.h b/include/QF/cexpr.h
new file mode 100644
index 000000000..fcdeaad57
--- /dev/null
+++ b/include/QF/cexpr.h
@@ -0,0 +1,118 @@
+/*
+	cexpr.h
+
+	Config expression parser. Or concurrent.
+
+	Copyright (C) 2020  Bill Currie <bill@taniwha.org>
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifndef __expr_h
+#define __expr_h
+
+#include <stdlib.h>
+
+struct exprval_s;
+struct exprctx_s;
+
+typedef struct binop_s {
+	int         op;
+	struct exprtype_s *other;
+	struct exprtype_s *result;
+	void      (*func) (const struct exprval_s *val1,
+					   const struct exprval_s *val2,
+					   struct exprval_s *result,
+					   struct exprctx_s *context);
+} binop_t;
+
+typedef struct unop_s {
+	int         op;
+	struct exprtype_s *result;
+	void      (*func) (const struct exprval_s *val, struct exprval_s *result,
+					   struct exprctx_s *context);
+} unop_t;
+
+typedef struct exprtype_s {
+	const char *name;
+	size_t      size;
+	binop_t    *binops;
+	unop_t     *unops;
+	void       *data;
+} exprtype_t;
+
+typedef struct exprval_s {
+	exprtype_t *type;
+	void       *value;
+} exprval_t;
+
+typedef struct exprsym_s {
+	const char *name;
+	exprtype_t *type;
+	void       *value;
+	struct exprsym_s *next;
+} exprsym_t;
+
+typedef struct exprtab_s {
+	exprsym_t  *symbols;
+	struct hashtab_s *tab;
+} exprtab_t;
+
+typedef struct exprctx_s {
+	exprval_t  *result;
+	exprtab_t  *symtab;				// directly accessible symbols
+	exprtab_t  *external_variables;	// accessible via $id
+	struct memsuper_s *memsuper;
+	const struct plitem_s *item;
+	struct plitem_s *messages;
+	struct hashlink_s *hashlinks;
+} exprctx_t;
+
+typedef struct exprenum_s {
+	exprtype_t *type;
+	exprtab_t  *symtab;
+} exprenum_t;
+
+int cexpr_parse_enum (exprenum_t *enm, const char *str,
+					  const exprctx_t *context, void *data);
+binop_t *cexpr_find_cast (exprtype_t *dst_type, exprtype_t *src_type) __attribute__((pure));
+exprval_t *cexpr_value (exprtype_t *type, exprctx_t *ctx);
+exprval_t *cexpr_value_reference (exprtype_t *type, void *data, exprctx_t *ctx);
+int cexpr_eval_string (const char *str, exprctx_t *context);
+void cexpr_error(exprctx_t *ctx, const char *fmt, ...) __attribute__((format(printf,2,3)));
+
+void cexpr_struct_getfield (const exprval_t *a, const exprval_t *b,
+							exprval_t *c, exprctx_t *ctx);
+exprval_t *cexpr_cvar (const char *name, exprctx_t *ctx);
+exprval_t *cexpr_cvar_struct (exprctx_t *ctx);
+
+void cexpr_init_symtab (exprtab_t *symtab, exprctx_t *ctx);
+
+char *cexpr_yyget_text (void *scanner);
+
+extern exprtype_t cexpr_int;
+extern exprtype_t cexpr_uint;
+extern exprtype_t cexpr_float;
+extern exprtype_t cexpr_double;
+extern exprtype_t cexpr_exprval;
+extern exprtype_t cexpr_field;
+
+extern binop_t cexpr_struct_binops[];
+
+#endif
diff --git a/libs/util/Makemodule.am b/libs/util/Makemodule.am
index af99b15d3..f554289be 100644
--- a/libs/util/Makemodule.am
+++ b/libs/util/Makemodule.am
@@ -43,6 +43,10 @@ libs_util_libQFutil_la_SOURCES= \
 	libs/util/bspfile.c \
 	libs/util/buildnum.c \
 	libs/util/cbuf.c \
+	libs/util/cexpr-lex.l \
+	libs/util/cexpr-parse.y \
+	libs/util/cexpr-type.c \
+	libs/util/cexpr-vars.c \
 	libs/util/checksum.c \
 	libs/util/cmd.c \
 	libs/util/cmem.c \
@@ -82,4 +86,13 @@ libs_util_libQFutil_la_SOURCES= \
 	libs/util/zone.c \
 	$(dirent) $(fnmatch) $(getopt)
 
+BUILT_SOURCES += \
+    libs/util/cexpr-lex.c \
+    libs/util/cexpr-parse.c
+
+libs/util/cexpr-parse.c: libs/util/cexpr-parse.y
+	$(AM_V_YACC)$(YACCCOMPILE) $< -o $@
+libs/util/cexpr-lex.c: libs/util/cexpr-lex.l libs/util/cexpr-parse.h
+	$(AM_V_LEX)$(LEXCOMPILE) -o$@ $<
+
 EXTRA_DIST += $(fnmatch_src) $(getopt_src)
diff --git a/libs/util/cexpr-lex.l b/libs/util/cexpr-lex.l
new file mode 100644
index 000000000..cfb1b99c6
--- /dev/null
+++ b/libs/util/cexpr-lex.l
@@ -0,0 +1,281 @@
+/*
+	cexpr-lex.l
+
+	Config expression parser. Or concurrent.
+
+	Copyright (C) 2020  Bill Currie <bill@taniwha.org>
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+%option bison-bridge
+%option reentrant
+%option prefix="cexpr_yy"
+%option noyywrap
+
+%{
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#include <stdlib.h>
+#include <ctype.h>
+
+#include "QF/cmem.h"
+#include "QF/dstring.h"
+#include "QF/hash.h"
+#include "QF/qfplist.h"
+#include "QF/sys.h"
+
+#include "QF/cexpr.h"
+#include "libs/util/cexpr-parse.h"
+
+#define YY_NO_INPUT
+#define YY_NO_UNPUT
+
+#define YYSTYPE CEXPR_YYSTYPE
+#define YY_EXTRA_TYPE exprctx_t *
+
+exprctx_t *cexpr_yyget_extra (yyscan_t yyscanner) __attribute__((pure));
+int cexpr_yyget_lineno (yyscan_t yyscanner) __attribute__((pure));
+int cexpr_yyget_column (yyscan_t yyscanner) __attribute__((pure));
+YYSTYPE *cexpr_yyget_lval (yyscan_t yyscanner) __attribute__((pure));
+int cexpr_yyget_debug (yyscan_t yyscanner) __attribute__((pure));
+char *cexpr_yyget_text (yyscan_t yyscanner) __attribute__((pure));
+int cexpr_yyget_leng (yyscan_t yyscanner) __attribute__((pure));
+FILE *cexpr_yyget_out (yyscan_t yyscanner) __attribute__((pure));
+FILE *cexpr_yyget_in (yyscan_t yyscanner) __attribute__((pure));
+
+static exprval_t *parse_int (const char *str, exprctx_t *context);
+static exprval_t *parse_uint (const char *str, exprctx_t *context);
+static exprval_t *parse_float (const char *str, exprctx_t *context);
+static exprval_t *parse_double (const char *str, exprctx_t *context);
+static exprsym_t *parse_name (const char *str, exprctx_t *context);
+static exprval_t *parse_variable (const char *str, exprctx_t *context);
+
+VISIBLE void
+cexpr_error(exprctx_t *ctx, const char *fmt, ...)
+{
+	va_list     args;
+	dstring_t  *string;
+
+	string = dstring_new ();
+
+	va_start (args, fmt);
+	dvsprintf (string, fmt, args);
+	va_end (args);
+
+	if (ctx->messages) {
+		PL_Message (ctx->messages, ctx->item, "%s", string->str);
+	} else {
+		Sys_Printf ("%s\n", string->str);
+	}
+	dstring_delete (string);
+}
+
+%}
+
+s			[ \t]
+m			[\-+]
+D			[0-9]
+B			[01]
+X			[0-9a-fA-F]
+ID			[a-zA-Z_][a-zA-Z_0-9]*
+FLOAT		({D}+|{D}*\.{D}+|{D}+\.{D}*)([eE]{m}?{D}+)?
+FLOATf		{FLOAT}[fF]
+FLOATd		{FLOAT}[dD]
+INT			({D}+|0[xX]{X}+|0[bB]{B})
+STRING		\"(\\.|[^"\\])*\"
+
+%%
+%{
+	__auto_type context = yyget_extra (yyscanner);
+%}
+
+{INT}+				{
+						yylval->value = parse_int (yytext, context);
+						return VALUE;
+					}
+
+{INT}+[uU]			{
+						yylval->value = parse_uint (yytext, context);
+						return VALUE;
+					}
+
+{FLOAT}				{
+						yylval->value = parse_double (yytext, context);
+						return VALUE;
+					}
+{FLOATf}			{
+						yylval->value = parse_float (yytext, context);
+						return VALUE;
+					}
+{FLOATd}			{
+						yylval->value = parse_double (yytext, context);
+						return VALUE;
+					}
+
+{ID}				{
+						yylval->symbol = parse_name (yytext, context);
+						return NAME;
+					}
+
+\${ID}				{
+						yylval->value = parse_variable (yytext + 1, context);
+						return VALUE;
+					}
+
+{STRING}			{
+					}
+@					return '@';
+
+'(\\[^xX0-7\r\n]|[^'\r\n]|\\[xX][0-9A-Fa-f]+|\\[0-7]+)*'	{
+					}
+
+[+\-*/&|^%]=		{
+					}
+
+"%%="				{
+					}
+
+"<<="				{
+					}
+
+">>="				{
+					}
+
+[!(){}.*/&|^~+\-=\[\];,#%?:] {
+						return yytext[0];
+					}
+
+"%%"				{
+					}
+
+"<<"				return SHL;
+">>"				return SHR;
+
+"&&"				return AND;
+"||"				return OR;
+"=="				return EQ;
+"!="				return NE;
+"<="				return LE;
+">="				return GE;
+"<"					return LT;
+">"					return GT;
+
+"++"				{
+					}
+
+"--"				{
+					}
+
+<*>\r*\n			{
+					}
+
+<*>{s}*				/* skip */
+
+<*>.				cexpr_error (context, "all your typo are belong to us");
+
+%%
+
+VISIBLE int
+cexpr_eval_string (const char *str, exprctx_t *context)
+{
+	int         status;
+	yyscan_t    scanner;
+	cexpr_yypstate *ps = cexpr_yypstate_new ();
+
+	yylex_init_extra (context, &scanner);
+	yy_scan_string (str, scanner);
+
+	do {
+		CEXPR_YYSTYPE lval;
+		int         token = yylex (&lval, scanner);
+		status = cexpr_yypush_parse (ps, token, &lval, scanner, context);
+	} while (status == YYPUSH_MORE);
+
+	yylex_destroy (scanner);
+	cexpr_yypstate_delete (ps);
+	return status;
+}
+
+static exprval_t *parse_int (const char *str, exprctx_t *context)
+{
+	exprval_t  *val = cexpr_value (&cexpr_int, context);
+	*(int *) val->value = strtoimax (str, 0, 0);
+	return val;
+}
+
+static exprval_t *parse_uint (const char *str, exprctx_t *context)
+{
+	exprval_t  *val = cexpr_value (&cexpr_uint, context);
+	*(unsigned *) val->value = strtoumax (str, 0, 0);
+	return val;
+}
+
+static exprval_t *parse_float (const char *str, exprctx_t *context)
+{
+	exprval_t  *val = cexpr_value (&cexpr_int, context);
+	*(float *) val->value = strtof (str, 0);
+	return val;
+}
+
+static exprval_t *parse_double (const char *str, exprctx_t *context)
+{
+	exprval_t  *val = cexpr_value (&cexpr_int, context);
+	*(double *) val->value = strtod (str, 0);
+	return val;
+}
+
+static exprsym_t *
+parse_name (const char *name, exprctx_t *context)
+{
+	exprtab_t  *symtab = context->symtab;
+
+	__auto_type sym = (exprsym_t *) Hash_Find (symtab->tab, name);
+	return sym;
+}
+
+static exprval_t *
+parse_variable (const char *name, exprctx_t *context)
+{
+	exprval_t  *val = 0;
+	if (strcmp (name, "cvars") == 0) {
+		val = cexpr_cvar_struct (context);
+	} else {
+		exprtab_t  *symtab = context->external_variables;
+		__auto_type sym = (exprsym_t *) Hash_Find (symtab->tab, name);
+		if (sym) {
+			val = cexpr_value_reference (sym->type, sym->value, context);
+		} else {
+			val = cexpr_cvar (name, context);
+		}
+	}
+	if (!val) {
+		cexpr_error (context, "undefined variable %s", name);
+	}
+	return val;
+}
diff --git a/libs/util/cexpr-parse.y b/libs/util/cexpr-parse.y
new file mode 100644
index 000000000..ac41c549c
--- /dev/null
+++ b/libs/util/cexpr-parse.y
@@ -0,0 +1,219 @@
+/*
+	cexpr-parse.y
+
+	Config expression parser. Or concurrent.
+
+	Copyright (C) 2020  Bill Currie <bill@taniwha.org>
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+%define api.prefix {cexpr_yy}
+%define api.pure full
+%define api.push-pull push
+%parse-param {void *scanner} {exprctx_t *context}
+
+%{
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#include <stdio.h>
+
+#include "QF/cmem.h"
+#include "QF/hash.h"
+#include "QF/qfplist.h"
+#include "QF/sys.h"
+
+#include "QF/cexpr.h"
+
+static void assign_expr (exprval_t *dst, const exprval_t *src,
+						 exprctx_t *context);
+static exprval_t *binary_expr (int op, const exprval_t *a, const exprval_t *b,
+							   exprctx_t *context);
+static exprval_t *field_expr (const exprval_t *a, const exprval_t *b,
+							  exprctx_t *context);
+
+static void
+yyerror (void *scanner, exprctx_t *context, const char *s)
+{
+	cexpr_error (context, "%s before %s\n", s, cexpr_yyget_text (scanner));
+}
+
+%}
+
+%left			COMMA
+%right	<op>	'=' ASX
+%right			'?' ':'
+%left			OR
+%left			AND
+%left			'|'
+%left			'^'
+%left			'&'
+%left			EQ NE
+%left			LE GE LT GT
+
+%left			SHL SHR
+%left			'+' '-'
+%left			'*' '/' '%' MOD
+%right			SIZEOF UNARY INCOP
+%left			HYPERUNARY
+%left			'.' '(' '['
+
+%token <symbol> NAME
+%token <value>	VALUE
+
+%type <value>	expr field
+
+%union {
+	int        op;
+	exprsym_t *symbol;
+	exprval_t *value;
+	const char *string;
+}
+
+%%
+
+start
+	: expr				{ assign_expr (context->result, $1, context); }
+	;
+
+expr
+	: expr SHL expr		{ $$ = binary_expr (SHL, $1, $3, context); }
+	| expr SHR expr		{ $$ = binary_expr (SHR, $1, $3, context); }
+	| expr '+' expr		{ $$ = binary_expr ('+', $1, $3, context); }
+	| expr '-' expr		{ $$ = binary_expr ('-', $1, $3, context); }
+	| expr '*' expr		{ $$ = binary_expr ('*', $1, $3, context); }
+	| expr '/' expr		{ $$ = binary_expr ('/', $1, $3, context); }
+	| expr '&' expr		{ $$ = binary_expr ('&', $1, $3, context); }
+	| expr '|' expr		{ $$ = binary_expr ('|', $1, $3, context); }
+	| expr '^' expr		{ $$ = binary_expr ('^', $1, $3, context); }
+	| expr '%' expr		{ $$ = binary_expr ('%', $1, $3, context); }
+	| expr '.' field	{ $$ = field_expr ($1, $3, context); }
+	| expr MOD expr		{ $$ = binary_expr (MOD, $1, $3, context); }
+	| NAME
+		{
+			if ($1) {
+				$$ = (exprval_t *) cmemalloc (context->memsuper, sizeof (*$$));
+				$$->type = $1->type;
+				$$->value = $1->value;
+			} else {
+				cexpr_error (context, "undefined identifier %s",
+							 cexpr_yyget_text (scanner));
+			}
+		}
+	| VALUE
+	;
+
+field
+	: NAME
+		{
+			exprctx_t  *ctx = context;
+			const char *name = cexpr_yyget_text (scanner);
+			size_t      size = strlen (name) + 1;
+			//FIXME reuse strings
+			$$ = (exprval_t *) cmemalloc (ctx->memsuper, sizeof (exprval_t));
+			$$->type = &cexpr_field;
+			$$->value = cmemalloc (ctx->memsuper, size);
+			memcpy ($$->value, name, size);
+		}
+	;
+
+%%
+
+static void
+assign_expr (exprval_t *dst, const exprval_t *src, exprctx_t *context)
+{
+	binop_t    *binop;
+	if (!src) {
+		return;
+	}
+	for (binop = dst->type->binops; binop && binop->op; binop++) {
+		if (binop->op == '=' && binop->other == src->type) {
+			break;
+		}
+	}
+	if (binop && binop->op) {
+		binop->func (dst, src, dst, context);
+	} else {
+		if (dst->type != src->type) {
+			cexpr_error (context,
+						 "type mismatch in expression result: %s = %s\n",
+						 dst->type->name, src->type->name);
+			return;
+		}
+		memcpy (dst->value, src->value, dst->type->size);
+	}
+}
+
+static exprval_t *
+binary_expr (int op, const exprval_t *a, const exprval_t *b,
+			 exprctx_t *context)
+{
+	binop_t    *binop;
+
+	for (binop = a->type->binops; binop->op; binop++) {
+		exprtype_t *otype = binop->other;
+		if (!otype) {
+			otype = a->type;
+		}
+		if (binop->op == op && binop->other == b->type) {
+			break;
+		}
+	}
+	exprtype_t *rtype = binop->result;
+	if (!rtype) {
+		rtype = a->type;
+	}
+	exprval_t  *result = cexpr_value (rtype, context);
+	if (!binop->op) {
+		cexpr_error (context, "invalid binary expression: %s %c %s\n",
+					 a->type->name, op, b->type->name);
+	} else {
+		binop->func (a, b, result, context);
+	}
+	return result;
+}
+
+static exprval_t *
+field_expr (const exprval_t *a, const exprval_t *b, exprctx_t *context)
+{
+	binop_t    *binop;
+	exprval_t  *result = 0;
+
+	for (binop = a->type->binops; binop->op; binop++) {
+		if (binop->op == '.' && binop->other == b->type) {
+			break;
+		}
+	}
+	if (!binop->op) {
+		cexpr_error (context, "invalid binary expression: %s.%s\n",
+					 a->type->name, b->type->name);
+	} else {
+		exprval_t   c = { 0, &result };
+		binop->func (a, b, &c, context);
+	}
+	return result;
+}
diff --git a/libs/util/cexpr-type.c b/libs/util/cexpr-type.c
new file mode 100644
index 000000000..35c62ee85
--- /dev/null
+++ b/libs/util/cexpr-type.c
@@ -0,0 +1,314 @@
+/*
+	cexpr-type.c
+
+	Config expression parser. Or concurrent.
+
+	Copyright (C) 2020  Bill Currie <bill@taniwha.org>
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#include <math.h>
+
+#include "QF/cexpr.h"
+
+#include "libs/util/cexpr-parse.h"
+
+#define BINOP(pre, opname, type, op)										\
+static void																	\
+pre##_##opname (const exprval_t *a, const exprval_t *b, exprval_t *c,		\
+				exprctx_t *ctx)												\
+{																			\
+	(*(type *) c->value) = (*(type *) a->value) op (*(type *) b->value);	\
+}
+
+#define UNOP(pre, opname, type, op)									\
+static void															\
+pre##_##opname (const exprval_t *a, exprval_t *b, exprctx_t *ctx)	\
+{																	\
+	(*(type *) b->value) = op (*(type *) a->value);					\
+}
+
+BINOP(int, shl, int, <<)
+BINOP(int, shr, int, >>)
+BINOP(int, add, int, +)
+BINOP(int, sub, int, -)
+BINOP(int, mul, int, *)
+BINOP(int, div, int, /)
+BINOP(int, band, int, &)
+BINOP(int, bor, int, |)
+BINOP(int, xor, int, ^)
+BINOP(int, rem, int, %)
+
+UNOP(int, pos, int, +)
+UNOP(int, neg, int, -)
+UNOP(int, tnot, int, !)
+UNOP(int, bnot, int, ~)
+
+static void
+int_mod (const exprval_t *val1, const exprval_t *val2, exprval_t *result,
+		 exprctx_t *ctx)
+{
+	// implement true modulo for integers:
+	//  5 mod  3 = 2
+	// -5 mod  3 = 1
+	//  5 mod -3 = -1
+	// -5 mod -3 = -2
+	int         a = *(int *) val1->value;
+	int         b = *(int *) val2->value;
+	int         c = a % b;
+	// % is really remainder and so has the same sign rules
+	// as division: -5 % 3 = -2, so need to add b (3 here)
+	// if c's sign is incorrect, but only if c is non-zero
+	int         mask = (a ^ b) >> 31;
+	mask &= ~(!!c + 0) + 1; // +0 to convert bool to int (gcc)
+	*(int *) result->value = c + (mask & b);
+}
+
+binop_t int_binops[] = {
+	{ SHL, &cexpr_int, &cexpr_int, int_shl },
+	{ SHR, &cexpr_int, &cexpr_int, int_shr },
+	{ '+', &cexpr_int, &cexpr_int, int_add },
+	{ '-', &cexpr_int, &cexpr_int, int_sub },
+	{ '*', &cexpr_int, &cexpr_int, int_mul },
+	{ '/', &cexpr_int, &cexpr_int, int_div },
+	{ '&', &cexpr_int, &cexpr_int, int_band },
+	{ '|', &cexpr_int, &cexpr_int, int_bor },
+	{ '^', &cexpr_int, &cexpr_int, int_xor },
+	{ '%', &cexpr_int, &cexpr_int, int_rem },
+	{ MOD, &cexpr_int, &cexpr_int, int_mod },
+	{}
+};
+
+unop_t int_unops[] = {
+	{ '+', &cexpr_int, int_pos },
+	{ '-', &cexpr_int, int_neg },
+	{ '!', &cexpr_int, int_tnot },
+	{ '~', &cexpr_int, int_bnot },
+	{}
+};
+
+exprtype_t cexpr_int = {
+	"int",
+	sizeof (int),
+	int_binops,
+	int_unops,
+};
+
+BINOP(uint, shl, unsigned, <<)
+BINOP(uint, shr, unsigned, >>)
+BINOP(uint, add, unsigned, +)
+BINOP(uint, sub, unsigned, -)
+BINOP(uint, mul, unsigned, *)
+BINOP(uint, div, unsigned, /)
+BINOP(uint, band, unsigned, &)
+BINOP(uint, bor, unsigned, |)
+BINOP(uint, xor, unsigned, ^)
+BINOP(uint, rem, unsigned, %)
+
+UNOP(uint, pos, unsigned, +)
+UNOP(uint, neg, unsigned, -)
+UNOP(uint, tnot, unsigned, !)
+UNOP(uint, bnot, unsigned, ~)
+
+binop_t uint_binops[] = {
+	{ SHL, &cexpr_uint, &cexpr_uint, uint_shl },
+	{ SHR, &cexpr_uint, &cexpr_uint, uint_shr },
+	{ '+', &cexpr_uint, &cexpr_uint, uint_add },
+	{ '-', &cexpr_uint, &cexpr_uint, uint_sub },
+	{ '*', &cexpr_uint, &cexpr_uint, uint_mul },
+	{ '/', &cexpr_uint, &cexpr_uint, uint_div },
+	{ '&', &cexpr_uint, &cexpr_uint, uint_band },
+	{ '|', &cexpr_uint, &cexpr_uint, uint_bor },
+	{ '^', &cexpr_uint, &cexpr_uint, uint_xor },
+	{ '%', &cexpr_uint, &cexpr_uint, uint_rem },
+	{ MOD, &cexpr_uint, &cexpr_uint, uint_rem },
+	{}
+};
+
+unop_t uint_unops[] = {
+	{ '+', &cexpr_uint, uint_pos },
+	{ '-', &cexpr_uint, uint_neg },
+	{ '!', &cexpr_uint, uint_tnot },
+	{ '~', &cexpr_uint, uint_bnot },
+	{}
+};
+
+exprtype_t cexpr_uint = {
+	"uint",
+	sizeof (unsigned),
+	uint_binops,
+	uint_unops,
+};
+
+BINOP(float, add, float, +)
+BINOP(float, sub, float, -)
+BINOP(float, mul, float, *)
+BINOP(float, div, float, /)
+
+static void
+float_rem (const exprval_t *val1, const exprval_t *val2, exprval_t *result,
+		   exprctx_t *ctx)
+{
+	float       a = *(float *) val1->value;
+	float       b = *(float *) val2->value;
+	*(float *) result->value = a - b * truncf (a / b);
+}
+
+static void
+float_mod (const exprval_t *val1, const exprval_t *val2, exprval_t *result,
+		   exprctx_t *ctx)
+{
+	// implement true modulo for integers:
+	//  5 mod  3 = 2
+	// -5 mod  3 = 1
+	//  5 mod -3 = -1
+	// -5 mod -3 = -2
+	float       a = *(float *) val1->value;
+	float       b = *(float *) val2->value;
+	*(float *) result->value = a - b * floorf (a / b);
+}
+
+UNOP(float, pos, float, +)
+UNOP(float, neg, float, -)
+UNOP(float, tnot, float, !)
+
+binop_t float_binops[] = {
+	{ '+', &cexpr_float, &cexpr_float, float_add },
+	{ '-', &cexpr_float, &cexpr_float, float_sub },
+	{ '*', &cexpr_float, &cexpr_float, float_mul },
+	{ '/', &cexpr_float, &cexpr_float, float_div },
+	{ '%', &cexpr_float, &cexpr_float, float_rem },
+	{ MOD, &cexpr_float, &cexpr_float, float_mod },
+	{}
+};
+
+unop_t float_unops[] = {
+	{ '+', &cexpr_float, float_pos },
+	{ '-', &cexpr_float, float_neg },
+	{ '!', &cexpr_float, float_tnot },
+	{}
+};
+
+exprtype_t cexpr_float = {
+	"float",
+	sizeof (float),
+	float_binops,
+	float_unops,
+};
+
+BINOP(double, add, double, +)
+BINOP(double, sub, double, -)
+BINOP(double, mul, double, *)
+BINOP(double, div, double, /)
+
+static void
+double_rem (const exprval_t *val1, const exprval_t *val2, exprval_t *result,
+			exprctx_t *ctx)
+{
+	double      a = *(double *) val1->value;
+	double      b = *(double *) val2->value;
+	*(double *) result->value = a - b * truncf (a / b);
+}
+
+static void
+double_mod (const exprval_t *val1, const exprval_t *val2, exprval_t *result,
+			exprctx_t *ctx)
+{
+	// implement true modulo for integers:
+	//  5 mod  3 = 2
+	// -5 mod  3 = 1
+	//  5 mod -3 = -1
+	// -5 mod -3 = -2
+	double      a = *(double *) val1->value;
+	double      b = *(double *) val2->value;
+	*(double *) result->value = a - b * floorf (a / b);
+}
+
+UNOP(double, pos, double, +)
+UNOP(double, neg, double, -)
+UNOP(double, tnot, double, !)
+
+binop_t double_binops[] = {
+	{ '+', &cexpr_double, &cexpr_double, double_add },
+	{ '-', &cexpr_double, &cexpr_double, double_sub },
+	{ '*', &cexpr_double, &cexpr_double, double_mul },
+	{ '/', &cexpr_double, &cexpr_double, double_div },
+	{ '%', &cexpr_double, &cexpr_double, double_rem },
+	{ MOD, &cexpr_double, &cexpr_double, double_mod },
+	{}
+};
+
+unop_t double_unops[] = {
+	{ '+', &cexpr_double, double_pos },
+	{ '-', &cexpr_double, double_neg },
+	{ '!', &cexpr_double, double_tnot },
+	{}
+};
+
+exprtype_t cexpr_double = {
+	"double",
+	sizeof (double),
+	double_binops,
+	double_unops,
+};
+
+exprtype_t cexpr_exprval = {
+	"exprval",
+	sizeof (exprval_t *),
+	0,	// can't actually do anything with an exprval
+	0,
+};
+
+exprtype_t cexpr_field = {
+	"field",
+	0,	// has no size of its own, rather, it's the length of the name
+	0,	// can't actually do anything with a field
+	0,
+};
+
+VISIBLE binop_t *
+cexpr_find_cast (exprtype_t *dst_type, exprtype_t *src_type)
+{
+	binop_t    *binop = 0;
+
+	for (binop = dst_type->binops; binop && binop->op; binop++) {
+		if (binop->op == '=' && binop->other == src_type) {
+			break;
+		}
+	}
+	if (binop && binop->op) {
+		return binop;
+	}
+	return 0;
+}
+
+VISIBLE int
+cexpr_parse_enum (exprenum_t *enm, const char *str, const exprctx_t *ctx,
+				  void *data)
+{
+	exprval_t   result = { enm->type, data };
+	exprctx_t   context = *ctx;
+	context.symtab = enm->symtab;
+	context.result = &result;
+	return cexpr_eval_string (str, &context);
+}
diff --git a/libs/util/cexpr-vars.c b/libs/util/cexpr-vars.c
new file mode 100644
index 000000000..9f01e3134
--- /dev/null
+++ b/libs/util/cexpr-vars.c
@@ -0,0 +1,154 @@
+/*
+	cexpr-vars.c
+
+	Config expression parser. Or concurrent.
+
+	Copyright (C) 2020  Bill Currie <bill@taniwha.org>
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#include <stddef.h>
+#include <math.h>
+
+#include "QF/cexpr.h"
+#include "QF/cmem.h"
+#include "QF/cvar.h"
+#include "QF/hash.h"
+#include "QF/qfplist.h"
+
+#include "libs/util/cexpr-parse.h"
+
+VISIBLE void
+cexpr_struct_getfield (const exprval_t *a, const exprval_t *b, exprval_t *c,
+					   exprctx_t *ctx)
+{
+	__auto_type symtab = (exprtab_t *) a->type->data;
+	__auto_type name = (const char *) b->value;
+	__auto_type field = (exprsym_t *) Hash_Find (symtab->tab, name);
+	exprval_t *val = 0;
+	if (field) {
+		val = cmemalloc (ctx->memsuper, sizeof (exprval_t));
+		val->type = field->type;
+		val->value = a->value + (ptrdiff_t) field->value;
+	}
+	*(exprval_t **) c->value = val;
+}
+
+VISIBLE binop_t cexpr_struct_binops[] = {
+	{ '.', &cexpr_field, &cexpr_exprval, cexpr_struct_getfield },
+	{}
+};
+
+static void
+cvar_get (const exprval_t *a, const exprval_t *b, exprval_t *c, exprctx_t *ctx)
+{
+	__auto_type name = (const char *) b->value;
+	exprval_t  *var = cexpr_cvar (name, ctx);
+	if (!var) {
+		PL_Message (ctx->messages, ctx->item, "unknown cvar %s", name);
+	}
+	*(exprval_t **) c->value = var;
+}
+
+static binop_t cvar_binops[] = {
+	{ '.', &cexpr_field, &cexpr_exprval, cvar_get },
+	{}
+};
+
+static exprtype_t cvar_type = {
+	"cvar",
+	sizeof (void *),	// ref to struct (will always be 0)
+	cvar_binops,
+	0,
+};
+
+VISIBLE exprval_t *
+cexpr_cvar (const char *name, exprctx_t *ctx)
+{
+	cvar_t     *var = Cvar_FindVar (name);
+	if (!var) {
+		var = Cvar_FindAlias (name);
+	}
+	if (!var) {
+		return 0;
+	}
+
+	exprtype_t *type = ctx->result->type;
+	binop_t *cast = cexpr_find_cast (type, &cexpr_int);
+
+	exprval_t  *val = 0;
+	if (cast || val->type == &cexpr_int || val->type == &cexpr_uint) {
+		val = cexpr_value (type, ctx);
+		*(int *) val->value = var->int_val;
+	} else if (val->type == &cexpr_float) {
+		val = cexpr_value (type, ctx);
+		*(float *) val->value = var->value;
+	} else if (val->type == &cexpr_double) {
+		val = cexpr_value (type, ctx);
+		//FIXME cvars need to support double values
+		*(double *) val->value = var->value;
+	}
+	return val;
+}
+
+VISIBLE exprval_t *
+cexpr_cvar_struct (exprctx_t *ctx)
+{
+	exprval_t  *cvars = cexpr_value (&cvar_type, ctx);
+	*(void **) cvars->value = 0;
+	return cvars;
+}
+
+static const char *expr_getkey (const void *s, void *unused)
+{
+	__auto_type sym = (exprsym_t *) s;
+	return sym->name;
+}
+
+void cexpr_init_symtab (exprtab_t *symtab, exprctx_t *ctx)
+{
+	exprsym_t  *sym;
+
+	symtab->tab = Hash_NewTable (61, expr_getkey, 0, 0, &ctx->hashlinks);
+	for (sym = symtab->symbols; sym->name; sym++) {
+		Hash_Add (symtab->tab, sym);
+	}
+}
+
+VISIBLE exprval_t *
+cexpr_value_reference (exprtype_t *type, void *data, exprctx_t *ctx)
+{
+	__auto_type ref = (exprval_t *) cmemalloc (ctx->memsuper,
+											   sizeof (exprval_t));
+	ref->type = type;
+	ref->value = data;
+	return ref;
+}
+
+VISIBLE exprval_t *
+cexpr_value (exprtype_t *type, exprctx_t *ctx)
+{
+	exprval_t *val = cexpr_value_reference (type, 0, ctx);
+	val->value = cmemalloc (ctx->memsuper, type->size);
+	return val;
+}
diff --git a/libs/util/test/Makemodule.am b/libs/util/test/Makemodule.am
index 39140bee7..9447a7807 100644
--- a/libs/util/test/Makemodule.am
+++ b/libs/util/test/Makemodule.am
@@ -1,5 +1,6 @@
 libs_util_tests = \
 	libs/util/test/test-bary \
+	libs/util/test/test-cexpr \
 	libs/util/test/test-cmem \
 	libs/util/test/test-cs \
 	libs/util/test/test-darray \
@@ -24,6 +25,10 @@ libs_util_test_test_bary_SOURCES=libs/util/test/test-bary.c
 libs_util_test_test_bary_LDADD=libs/util/libQFutil.la
 libs_util_test_test_bary_DEPENDENCIES=libs/util/libQFutil.la
 
+libs_util_test_test_cexpr_SOURCES=libs/util/test/test-cexpr.c
+libs_util_test_test_cexpr_LDADD=libs/util/libQFutil.la
+libs_util_test_test_cexpr_DEPENDENCIES=libs/util/libQFutil.la
+
 libs_util_test_test_cmem_SOURCES=libs/util/test/test-cmem.c
 libs_util_test_test_cmem_LDADD=libs/util/libQFutil.la
 libs_util_test_test_cmem_DEPENDENCIES=libs/util/libQFutil.la
diff --git a/libs/util/test/test-cexpr.c b/libs/util/test/test-cexpr.c
new file mode 100644
index 000000000..095316222
--- /dev/null
+++ b/libs/util/test/test-cexpr.c
@@ -0,0 +1,81 @@
+/*
+	test-cexpr.c
+
+	Config expression parser. Or concurrent.
+
+	Copyright (C) 2020  Bill Currie <bill@taniwha.org>
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#include "QF/cexpr.h"
+#include "QF/cmem.h"
+#include "QF/hash.h"
+
+int a = 5;
+int b = 6;
+int c;
+
+exprsym_t symbols[] = {
+	{ "a", &cexpr_int, &a },
+	{ "b", &cexpr_int, &b },
+	{}
+};
+exprval_t result = { &cexpr_int, &c };
+
+exprtab_t symtab = {
+	symbols,
+	0
+};
+
+exprctx_t context = { &result, &symtab };
+
+#define TEST_BINOP(op)													\
+	do {																\
+		c = -4096;														\
+		cexpr_eval_string ("a " #op " b", &context);					\
+		printf ("c = a %s b -> %d = %d %s %d\n", #op, c, a, #op, b);	\
+		if (c != (a op b)) {											\
+			ret |= 1;													\
+		}																\
+	} while (0)
+
+int
+main(int argc, const char **argv)
+{
+	int         ret = 0;
+
+	cexpr_init_symtab (&symtab, &context);
+	context.memsuper = new_memsuper();
+
+	TEST_BINOP (<<);
+	TEST_BINOP (>>);
+	TEST_BINOP (+);
+	TEST_BINOP (-);
+	TEST_BINOP (*);
+	TEST_BINOP (/);
+	TEST_BINOP (&);
+	TEST_BINOP (|);
+	TEST_BINOP (^);
+	TEST_BINOP (%);
+
+	Hash_DelTable (symtab.tab);
+	delete_memsuper (context.memsuper);
+	return ret;
+}

From 4649294a275b9777e81b0852a26e9fa004a5fbf6 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 21 Dec 2020 14:47:15 +0900
Subject: [PATCH 1204/1519] [util] Fix inferred binary operator type checking

The problem is that I needed to support dynamic types on operators (for
bit-field enums), had things working, but a bad edit messed things up
and I had to rebuild that bit of code. Missed one bit :P
---
 libs/util/cexpr-parse.y | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/util/cexpr-parse.y b/libs/util/cexpr-parse.y
index ac41c549c..e789a40e9 100644
--- a/libs/util/cexpr-parse.y
+++ b/libs/util/cexpr-parse.y
@@ -179,7 +179,7 @@ binary_expr (int op, const exprval_t *a, const exprval_t *b,
 		if (!otype) {
 			otype = a->type;
 		}
-		if (binop->op == op && binop->other == b->type) {
+		if (binop->op == op && otype == b->type) {
 			break;
 		}
 	}

From 96df447c45481a9698402f136061b41deb331ed3 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 21 Dec 2020 18:38:31 +0900
Subject: [PATCH 1205/1519] [vulkan] Hook up the expression parser

The pipeline parser still isn't hooked up yet as something isn't quite
right, but it seems all the parsing works.
---
 include/vid_vulkan.h                          |   1 +
 libs/video/renderer/Makemodule.am             |  17 ++-
 libs/video/renderer/vulkan/qfpipeline.plist   |  13 +-
 libs/video/renderer/vulkan/vkgen/vkalias.r    |  18 +++
 libs/video/renderer/vulkan/vkgen/vkenum.h     |   3 +
 libs/video/renderer/vulkan/vkgen/vkenum.r     |  74 ++++++++--
 libs/video/renderer/vulkan/vkgen/vkgen.h      |   1 +
 libs/video/renderer/vulkan/vkgen/vkgen.r      |  21 ++-
 libs/video/renderer/vulkan/vkgen/vkstruct.h   |   1 +
 libs/video/renderer/vulkan/vkgen/vkstruct.r   |  95 +++++++++++-
 libs/video/renderer/vulkan/vkgen/vktype.h     |   1 +
 libs/video/renderer/vulkan/vkgen/vktype.r     |   5 +
 libs/video/renderer/vulkan/vkgen/vulkan.r     |   1 +
 libs/video/renderer/vulkan/vkparse.c          | 137 ++++++++++--------
 libs/video/renderer/vulkan/vkparse.h          |   6 +-
 libs/video/renderer/vulkan/vkparse.plist      |   5 +
 .../video/renderer/vulkan/vulkan_vid_common.c |  22 ++-
 17 files changed, 332 insertions(+), 89 deletions(-)

diff --git a/include/vid_vulkan.h b/include/vid_vulkan.h
index 2675d3036..411fcf4db 100644
--- a/include/vid_vulkan.h
+++ b/include/vid_vulkan.h
@@ -41,6 +41,7 @@ typedef struct vulkan_ctx_s {
 	struct qfv_instance_s *instance;
 	struct qfv_device_s *device;
 	struct qfv_swapchain_s *swapchain;
+	struct hashlink_s *hashlinks;	//FIXME want per thread
 	VkSurfaceKHR surface;	//FIXME surface = window, so "contains" swapchain
 
 	VkCommandPool cmdpool;
diff --git a/libs/video/renderer/Makemodule.am b/libs/video/renderer/Makemodule.am
index 1077ef6ca..e2b71bf07 100644
--- a/libs/video/renderer/Makemodule.am
+++ b/libs/video/renderer/Makemodule.am
@@ -233,12 +233,15 @@ libs_video_renderer_vid_render_vulkan_la_SOURCES = \
 
 libs/video/renderer/vulkan/vkparse.lo: libs/video/renderer/vulkan/vkparse.c $(vkparse_src)
 
-libs/video/renderer/vulkan/vulkan_vid_common.lo: libs/video/renderer/vulkan/vulkan_vid_common.c $(pipeline_gen)
+libs/video/renderer/vulkan/vulkan_vid_common.lo: libs/video/renderer/vulkan/vulkan_vid_common.c ${vkparse_src} $(pipeline_gen)
 
 
 qwaq_curses = ruamoko/qwaq/qwaq-curses$(EXEEXT)
+vkparse_cinc = libs/video/renderer/vulkan/vkparse.cinc
+vkparse_hinc = libs/video/renderer/vulkan/vkparse.hinc
 vkparse_src = \
-	libs/video/renderer/vulkan/vkparse.inc
+	${vkparse_cinc} \
+	${vkparse_hinc}
 vkparse_plist = \
 	$(srcdir)/libs/video/renderer/vulkan/vkparse.plist
 
@@ -247,9 +250,13 @@ V_VKGEN_ = $(V_VKGEN_@AM_DEFAULT_V@)
 V_VKGEN_0 = @echo "  VKGEN   " $@;
 V_VKGEN_1 =
 
-libs/video/renderer/vulkan/vkparse.inc: $(vkgen) $(qwaq_curses) $(vkparse_plist)
-	$(V_VKGEN)$(qwaq_curses) $(vkgen) -- $(vkparse_plist) $@.t &&\
-	$(am__mv) $@.t $@
+${vkparse_cinc}: $(vkgen) $(qwaq_curses) $(vkparse_plist)
+	$(V_VKGEN)$(qwaq_curses) $(vkgen) -- $(vkparse_plist) ${vkparse_cinc}.t ${vkparse_hinc}.t &&\
+	$(am__mv) ${vkparse_cinc}.t ${vkparse_cinc} &&\
+	$(am__mv) ${vkparse_hinc}.t ${vkparse_hinc}
+
+${vkparse_hinc}: ${vkparse_cinc}
+# do nothing: hinc generated at the same time as cinc
 
 CLEANFILES += \
 	libs/video/renderer/glsl/*.vc \
diff --git a/libs/video/renderer/vulkan/qfpipeline.plist b/libs/video/renderer/vulkan/qfpipeline.plist
index 1c594aee0..a8e1c36c9 100644
--- a/libs/video/renderer/vulkan/qfpipeline.plist
+++ b/libs/video/renderer/vulkan/qfpipeline.plist
@@ -14,18 +14,18 @@
 			},
 			{
 				flags = 0;
-				format = $swapchain.format;
-				samples = $msaaSamples;
+				format = VK_FORMAT_D32_SFLOAT;
+				samples = $cvars.msaaSamples;
 				loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR;
-				storeOp = VK_ATTACHMENT_STORE_OP_STORE;
+				storeOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
 				stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
 				stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
 				initialLayout = VK_IMAGE_LAYOUT_UNDEFINED;
-				finalLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
+				finalLayout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL;
 			},
 			{
 				flags = 0;
-				format = VK_FORMAT_D32_SFLOAT;
+				format = $swapchain.format;
 				samples = VK_SAMPLE_COUNT_1_BIT;
 				loadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
 				storeOp = VK_ATTACHMENT_STORE_OP_STORE;
@@ -37,6 +37,7 @@
 		);
 		subpasses = (
 			{
+				pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS;
 				colorAttachments = (
 					{
 						attachment = 0;
@@ -51,7 +52,7 @@
 				);
 				depthStencilAttachment = {
 					attachment = 1;
-					layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
+					layout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL;
 				};
 				preserveAttachments = ();
 			},
diff --git a/libs/video/renderer/vulkan/vkgen/vkalias.r b/libs/video/renderer/vulkan/vkgen/vkalias.r
index 6228ac230..132e6291a 100644
--- a/libs/video/renderer/vulkan/vkgen/vkalias.r
+++ b/libs/video/renderer/vulkan/vkgen/vkalias.r
@@ -50,6 +50,24 @@
 	}
 }
 
+-(string) cexprType
+{
+	Type       *alias = [Type findType:type.alias.full_type];
+	string      name = [self name];
+
+	if ([alias name] == "VkFlags") {
+		if (str_mid (name, -5) == "Flags") {
+			string tag = str_mid (name, 0, -1) + "Bits";
+			id enumObj = [(id) Hash_Find (available_types, tag) resolveType];
+			return [enumObj cexprType];
+		}
+	}
+	if (name == "uint32_t") {
+		return "cexpr_uint";
+	}
+	return [alias cexprType];
+}
+
 -(string) parseType
 {
 	Type       *alias = [Type findType:type.alias.full_type];
diff --git a/libs/video/renderer/vulkan/vkgen/vkenum.h b/libs/video/renderer/vulkan/vkgen/vkenum.h
index 5deb7ff6f..6694c24cb 100644
--- a/libs/video/renderer/vulkan/vkgen/vkenum.h
+++ b/libs/video/renderer/vulkan/vkgen/vkenum.h
@@ -3,11 +3,14 @@
 
 #include "vktype.h"
 
+@class PLItem;
+
 @interface Enum: Type
 {
 	int          prefix_length;
 }
 -(void) writeTable;
+-(void) writeSymtabInit:(PLItem *) parse;
 @end
 
 #endif//__renderer_vulkan_vkgen_vkenum_h
diff --git a/libs/video/renderer/vulkan/vkgen/vkenum.r b/libs/video/renderer/vulkan/vkgen/vkenum.r
index 768e4b8d4..e3894902a 100644
--- a/libs/video/renderer/vulkan/vkgen/vkenum.r
+++ b/libs/video/renderer/vulkan/vkgen/vkenum.r
@@ -50,6 +50,15 @@
 	}
 }
 
+static int
+skip_value(string name)
+{
+	return (str_str (name, "_MAX_ENUM") >= 0
+			|| str_str (name, "_BEGIN_RANGE") >= 0
+			|| str_str (name, "_END_RANGE") >= 0
+			|| str_str (name, "_RANGE_SIZE") >= 0);
+}
+
 -(void) writeTable
 {
 	int         strip_bit = 0;
@@ -57,16 +66,37 @@
 		strip_bit = 1;
 	}
 
-	fprintf (output_file, "enumval_t %s_values[] = {\n", [self name]);
-	for (int i = 0; i < type.strct.num_fields; i++) {
+	fprintf (output_file, "static exprtype_t %s_type = {\n", [self name]);
+	fprintf (output_file, "\t\"%s\",\n", [self name]);
+	fprintf (output_file, "\tsizeof (int),\n");
+	if (strip_bit) {
+		fprintf (output_file, "\tflag_binops,\n");
+		fprintf (output_file, "\tflag_unops,\n");
+	} else {
+		fprintf (output_file, "\t0,\n");
+		fprintf (output_file, "\t0,\n");
+	}
+	fprintf (output_file, "};\n");
+
+	fprintf (output_file, "static %s %s_values[] = {\n", [self name], [self name]);
+	for (int i = 0, index = 0; i < type.strct.num_fields; i++) {
 		qfot_var_t *var = &type.strct.fields[i];
-		if (str_str (var.name, "_MAX_ENUM") >= 0
-			|| str_str (var.name, "_BEGIN_RANGE") >= 0
-			|| str_str (var.name, "_END_RANGE") >= 0
-			|| str_str (var.name, "_RANGE_SIZE") >= 0) {
+		if (skip_value (var.name)) {
 			continue;
 		}
-		fprintf (output_file, "\t{\"%s\", %d},\n", var.name, var.offset);
+		fprintf (output_file, "\t%s,    // %d 0x%x\n",
+				 var.name, var.offset, var.offset);
+		index++;
+	}
+	fprintf (output_file, "};\n");
+	fprintf (output_file, "static exprsym_t %s_symbols[] = {\n", [self name]);
+	for (int i = 0, index = 0; i < type.strct.num_fields; i++) {
+		qfot_var_t *var = &type.strct.fields[i];
+		if (skip_value (var.name)) {
+			continue;
+		}
+		fprintf (output_file, "\t{\"%s\", &%s_type, %s_values + %d},\n",
+				 var.name, [self name], [self name], index);
 		if (prefix_length) {
 			string      shortname = str_mid (var.name, prefix_length);
 			if (strip_bit) {
@@ -75,12 +105,33 @@
 					shortname = str_mid (shortname, 0, bit_pos);
 				}
 			}
-			fprintf (output_file, "\t{\"%s\", %d},\n", str_lower(shortname),
-					 var.offset);
+			fprintf (output_file, "\t{\"%s\", &%s_type, %s_values + %d},\n",
+					 str_lower(shortname), [self name], [self name], index);
 		}
+		index++;
 	}
 	fprintf (output_file, "\t{ }\n");
 	fprintf (output_file, "};\n");
+	fprintf (output_file, "static exprtab_t %s_symtab = {\n", [self name]);
+	fprintf (output_file, "\t%s_symbols,\n", [self name]);
+	fprintf (output_file, "};\n");
+	fprintf (output_file, "exprenum_t %s_enum = {\n", [self name]);
+	fprintf (output_file, "\t&%s_type,\n", [self name]);
+	fprintf (output_file, "\t&%s_symtab,\n", [self name]);
+	fprintf (output_file, "};\n");
+
+	fprintf (header_file, "extern exprenum_t %s_enum;\n", [self name]);
+}
+
+-(void) writeSymtabInit:(PLItem *) parse
+{
+	fprintf (output_file, "\tcexpr_init_symtab (&%s_symtab, context);\n",
+			 [self name]);
+}
+
+-(string) cexprType
+{
+	return [self name] + "_type";
 }
 
 -(string) parseType
@@ -90,14 +141,11 @@
 
 -(string) parseFunc
 {
-	if (str_mid([self name], -8) == "FlagBits") {
-		return "parse_flags";
-	}
 	return "parse_enum";
 }
 
 -(string) parseData
 {
-	return [self name] + "_values";
+	return "&" + [self name] + "_enum";
 }
 @end
diff --git a/libs/video/renderer/vulkan/vkgen/vkgen.h b/libs/video/renderer/vulkan/vkgen/vkgen.h
index 0d488abe8..e60499f25 100644
--- a/libs/video/renderer/vulkan/vkgen/vkgen.h
+++ b/libs/video/renderer/vulkan/vkgen/vkgen.h
@@ -13,6 +13,7 @@ void fprintf (QFile file, string format, ...);
 extern Array *queue;
 extern Array *output_types;
 extern QFile output_file;
+extern QFile header_file;
 extern hashtab_t *processed_types;
 extern hashtab_t *available_types;
 
diff --git a/libs/video/renderer/vulkan/vkgen/vkgen.r b/libs/video/renderer/vulkan/vkgen/vkgen.r
index 7744d0cdc..025e3d2cc 100644
--- a/libs/video/renderer/vulkan/vkgen/vkgen.r
+++ b/libs/video/renderer/vulkan/vkgen/vkgen.r
@@ -25,7 +25,6 @@ arp_end (void)
 	autorelease_pool = nil;
 }
 
-
 void printf (string fmt, ...) = #0;
 
 void fprintf (QFile file, string format, ...)
@@ -39,6 +38,7 @@ Array *queue;
 Array *output_types;
 
 QFile output_file;
+QFile header_file;
 
 qfot_type_encodings_t *encodings;
 
@@ -135,7 +135,7 @@ get_object_key (void *obj, void *unused)
 void
 usage (string name)
 {
-	printf ("%s [plist file] [output file]\n", name);
+	printf ("%s [plist file] [output file] [header file]\n", name);
 }
 
 int
@@ -151,7 +151,7 @@ main(int argc, string *argv)
 
 	arp_start ();
 
-	if (argc != 3) {
+	if (argc != 4) {
 		usage (argv[0]);
 		return 1;
 	}
@@ -211,6 +211,7 @@ main(int argc, string *argv)
 	arp_end ();
 
 	output_file = Qopen (argv[2], "wt");
+	header_file = Qopen (argv[3], "wt");
 	for (int i = [output_types count]; i-- > 0; ) {
 		id obj = [output_types objectAtIndex:i];
 		if ([obj name] == "VkStructureType") {
@@ -237,6 +238,20 @@ main(int argc, string *argv)
 		[obj writeTable:parse];
 		arp_end ();
 	}
+	fprintf (output_file, "static void\n");
+	fprintf (output_file, "vkgen_init_symtabs (exprctx_t *context)\n");
+	fprintf (output_file, "{\n");
+	for (int i = [output_types count]; i-- > 0; ) {
+		id obj = [output_types objectAtIndex:i];
+		if ([obj name] == "VkStructureType") {
+			continue;
+		}
+		arp_start ();
+		[obj writeSymtabInit:parse];
+		arp_end ();
+	}
+	fprintf (output_file, "}\n");
 	Qclose (output_file);
+	Qclose (header_file);
 	return 0;
 }
diff --git a/libs/video/renderer/vulkan/vkgen/vkstruct.h b/libs/video/renderer/vulkan/vkgen/vkstruct.h
index 246d23070..c251cb4c0 100644
--- a/libs/video/renderer/vulkan/vkgen/vkstruct.h
+++ b/libs/video/renderer/vulkan/vkgen/vkstruct.h
@@ -13,6 +13,7 @@
 }
 -(void) forEachFieldCall: (varfunc) func;
 -(void) writeTable: (PLItem *) parse;
+-(void) writeSymtabInit:(PLItem *) parse;
 @end
 
 #endif//__renderer_vulkan_vkgen_vkstruct_h
diff --git a/libs/video/renderer/vulkan/vkgen/vkstruct.r b/libs/video/renderer/vulkan/vkgen/vkstruct.r
index b1bf22960..4c9040cb6 100644
--- a/libs/video/renderer/vulkan/vkgen/vkstruct.r
+++ b/libs/video/renderer/vulkan/vkgen/vkstruct.r
@@ -162,7 +162,11 @@
 	fprintf (output_file, "\t{ }\n");
 	fprintf (output_file, "};\n");
 
-	fprintf (output_file, "static int parse_%s (const plfield_t *field,"
+	fprintf (header_file, "int parse_%s (const plfield_t *field,"
+			 " const plitem_t *item, void *data, plitem_t *messages,"
+			 " void *context);\n",
+			 name);
+	fprintf (output_file, "int parse_%s (const plfield_t *field,"
 			 " const plitem_t *item, void *data, plitem_t *messages,"
 			 " void *context)\n",
 			 name);
@@ -172,6 +176,95 @@
 			 " context);\n",
 			 name);
 	fprintf (output_file, "}\n");
+
+	fprintf (output_file, "static exprsym_t %s_symbols[] = {\n", name);
+	if (field_defs) {
+		PLItem     *field_def;
+		qfot_var_t *field;
+
+		for (int i = [field_defs count]; i-- > 0; ) {
+			string field_name = [[field_defs  getObjectAtIndex:i] string];
+			field_def = [field_dict getObjectForKey:field_name];
+			PLItem     *type_desc = [field_def getObjectForKey:"type"];
+			string      type_record;
+			string      type_type;
+			string      size_field = nil;
+			string      value_field = nil;
+
+			if (str_mid(field_name, 0, 1) == ".") {
+				continue;
+			}
+			field_def = [field_dict getObjectForKey:field_name];
+			if ([field_def string] == "auto") {
+				field = [self findField:field_name];
+				if (!field) {
+					continue;
+				}
+				field_type = [Type findType: field.type];
+				fprintf (output_file,
+						 "\t{\"%s\", &%s, (void *) field_offset (%s, %s)},\n",
+						 field_name, [field_type cexprType], name, field_name);
+			} else {
+				type_record = [[type_desc getObjectAtIndex:0] string];
+				if (type_record == "single") {
+					value_field = [[field_def getObjectForKey:"value"] string];
+				} else {
+					value_field = [[field_def getObjectForKey:"values"] string];
+				}
+				if (!value_field) {
+					value_field = field_name;
+				}
+				fprintf (output_file,
+						 "\t{\"%s\", 0/*FIXME*/,"
+						 " (void *) field_offset (%s, %s)},\n",
+						 field_name, name, value_field);
+			}
+		}
+	} else {
+		for (int i = 0; i < type.strct.num_fields; i++) {
+			qfot_var_t *field = &type.strct.fields[i];
+			if (field.name == "sType" || field.name == "pNext") {
+				continue;
+			}
+			field_type = [Type findType: field.type];
+			fprintf (output_file,
+					 "\t{\"%s\", &%s, (void *) field_offset (%s, %s)},\n",
+					 field.name, [field_type cexprType], name, field.name);
+		}
+	}
+	fprintf (output_file, "\t{ }\n");
+	fprintf (output_file, "};\n");
+
+	fprintf (output_file, "static exprtab_t %s_symtab = {\n", name);
+	fprintf (output_file, "\t%s_symbols,\n", name);
+	fprintf (output_file, "};\n");
+
+	fprintf (output_file, "exprtype_t %s_type = {\n", name);
+	fprintf (output_file, "\t\"%s\",\n", name);
+	fprintf (output_file, "\tsizeof (%s),\n", name);
+	fprintf (output_file, "\tcexpr_struct_binops,\n");
+	fprintf (output_file, "\t0,\n");
+	fprintf (output_file, "\t&%s_symtab,\n", name);
+	fprintf (output_file, "};\n");
+	fprintf (header_file, "extern exprtype_t %s_type;\n", name);
+}
+
+-(void) writeSymtabInit:(PLItem *) parse
+{
+	string      name = [self name];
+	PLItem     *field_dict = [parse getObjectForKey:name];
+	PLItem     *new_name = [field_dict getObjectForKey:".name"];
+
+	if (new_name) {
+		name = [new_name string];
+	}
+
+	fprintf (output_file, "\tcexpr_init_symtab (&%s_symtab, context);\n", name);
+}
+
+-(string) cexprType
+{
+	return [self name] + "_type";
 }
 
 -(string) parseType
diff --git a/libs/video/renderer/vulkan/vkgen/vktype.h b/libs/video/renderer/vulkan/vkgen/vktype.h
index fc5a53c84..0008c83ab 100644
--- a/libs/video/renderer/vulkan/vkgen/vktype.h
+++ b/libs/video/renderer/vulkan/vkgen/vktype.h
@@ -19,6 +19,7 @@
 -(Type *) resolveType;
 +(Type *) findType: (qfot_type_t *) type;
 +(Type *) lookup: (string) name;
+-(string) cexprType;
 -(string) parseType;
 -(string) parseFunc;
 -(string) parseData;
diff --git a/libs/video/renderer/vulkan/vkgen/vktype.r b/libs/video/renderer/vulkan/vkgen/vktype.r
index caa7ac057..5d6c1b7ae 100644
--- a/libs/video/renderer/vulkan/vkgen/vktype.r
+++ b/libs/video/renderer/vulkan/vkgen/vktype.r
@@ -91,6 +91,11 @@ static string get_type_key (void *type, void *unused)
 	return self;
 }
 
+-(string) cexprType
+{
+	return "cexpr_" + [self name];
+}
+
 -(string) parseType
 {
 	return "no parse";
diff --git a/libs/video/renderer/vulkan/vkgen/vulkan.r b/libs/video/renderer/vulkan/vkgen/vulkan.r
index 46b720d0c..a2a53be7c 100644
--- a/libs/video/renderer/vulkan/vkgen/vulkan.r
+++ b/libs/video/renderer/vulkan/vkgen/vulkan.r
@@ -1,2 +1,3 @@
 #define __x86_64__
 #include </usr/include/vulkan/vulkan.h>
+#include "QF/Vulkan/swapchain.h"
diff --git a/libs/video/renderer/vulkan/vkparse.c b/libs/video/renderer/vulkan/vkparse.c
index a4b037202..55798c185 100644
--- a/libs/video/renderer/vulkan/vkparse.c
+++ b/libs/video/renderer/vulkan/vkparse.c
@@ -38,6 +38,8 @@
 # include <strings.h>
 #endif
 
+#include "QF/cexpr.h"
+#include "QF/cmem.h"
 #include "QF/cvar.h"
 #include "QF/dstring.h"
 #include "QF/input.h"
@@ -64,10 +66,41 @@
 #include "util.h"
 #include "vkparse.h"
 
-typedef struct enumval_s {
-	const char *name;
-	int         value;
-} enumval_t;
+static void flag_or (const exprval_t *val1, const exprval_t *val2,
+					 exprval_t *result, exprctx_t *ctx)
+{
+	*(int *) (result->value) = *(int *) (val1->value) | *(int *) (val2->value);
+}
+
+static void flag_and (const exprval_t *val1, const exprval_t *val2,
+					 exprval_t *result, exprctx_t *ctx)
+{
+	*(int *) (result->value) = *(int *) (val1->value) & *(int *) (val2->value);
+}
+
+static void flag_cast_int (const exprval_t *val1, const exprval_t *val2,
+						   exprval_t *result, exprctx_t *ctx)
+{
+	// FIXME should check value is valid
+	*(int *) (result->value) = *(int *) (val2->value);
+}
+
+static void flag_not (const exprval_t *val, exprval_t *result, exprctx_t *ctx)
+{
+	*(int *) (result->value) = ~(*(int *) (val->value));
+}
+
+binop_t flag_binops[] = {
+	{ '|', 0, 0, flag_or },
+	{ '&', 0, 0, flag_and },
+	{ '=', &cexpr_int, 0, flag_cast_int },
+	{}
+};
+
+unop_t flag_unops[] = {
+	{ '~', 0, flag_not },
+	{}
+};
 
 typedef struct parse_single_s {
 	pltype_t    type;
@@ -84,20 +117,8 @@ typedef struct parse_array_s {
 	size_t      size_offset;
 } parse_array_t;
 
-static int find_enum (const char *valstr, enumval_t *enumval, int *val)
-{
-	while (enumval->name && strcmp (enumval->name, valstr) != 0) {
-		enumval++;
-	}
-	if (enumval->name) {
-		*val = enumval->value;
-		return 1;
-	}
-	return 0;
-}
-
 static int parse_uint32_t (const plfield_t *field, const plitem_t *item,
-						   void *data, plitem_t *messages, void *ctx)
+						   void *data, plitem_t *messages, void *context)
 {
 	int         ret = 1;
 	const char *valstr = PL_String (item);
@@ -125,47 +146,25 @@ static int parse_uint32_t (const plfield_t *field, const plitem_t *item,
 }
 
 static int parse_enum (const plfield_t *field, const plitem_t *item,
-					   void *data, plitem_t *messages, void *ctx)
+					   void *data, plitem_t *messages, void *context)
 {
 	int         ret = 1;
-	int         val;
+	__auto_type enm = (exprenum_t *) field->data;
+	exprctx_t   ectx = *(exprctx_t *)context;
+	exprval_t   result = { enm->type, data };
+	ectx.symtab = enm->symtab;
+	ectx.result = &result;
 	const char *valstr = PL_String (item);
-	__auto_type enumval = (enumval_t *) field->data;
-	//Sys_Printf ("parse_enum: %s %zd %d %p %p %s\n",
-	//			field->name, field->offset, field->type, field->parser,
-	//			field->data, valstr);
-	if (find_enum (valstr, enumval, &val)) {
-		*(int *) data = val;
-	} else {
-		PL_Message (messages, item, "invalid enum: %s", valstr);
-		ret = 0;
-	}
-	return ret;
-}
-
-static int parse_flags (const plfield_t *field, const plitem_t *item,
-						void *data, plitem_t *messages, void *ctx)
-{
-	int         ret = 1;
-	int         val;
-	const char *valstr = PL_String (item);
-	__auto_type enumval = (enumval_t *) field->data;
-	//Sys_Printf ("parse_flags: %s %zd %d %p %p %s\n",
-	//			field->name, field->offset, field->type, field->parser,
-	//			field->data, valstr);
-	if (find_enum (valstr, enumval, &val)) {
-		*(int *) data = val;
-	} else if (strcmp (valstr, "0") == 0) {
-		*(int *) data = 0;
-	} else {
-		PL_Message (messages, item, "invalid enum: %s", valstr);
-		ret = 0;
-	}
+	Sys_Printf ("parse_enum: %s %zd %d %p %p %s\n",
+				field->name, field->offset, field->type, field->parser,
+				field->data, valstr);
+	ret = !cexpr_parse_enum (enm, valstr, &ectx, data);
+	Sys_Printf ("    %d\n", *(int *)data);
 	return ret;
 }
 
 static int parse_single (const plfield_t *field, const plitem_t *item,
-						 void *data, plitem_t *messages, void *ctx)
+						 void *data, plitem_t *messages, void *context)
 {
 	__auto_type single = (parse_single_t *) field->data;
 	void       *flddata = (byte *)data + single->value_offset;
@@ -180,7 +179,7 @@ static int parse_single (const plfield_t *field, const plitem_t *item,
 
 	plfield_t   f = { 0, 0, single->type, single->parser, 0 };
 	void       *value = calloc (1, single->stride);
-	if (!single->parser (&f, item, value, messages, ctx)) {
+	if (!single->parser (&f, item, value, messages, context)) {
 		free (value);
 		return 0;
 	}
@@ -190,7 +189,7 @@ static int parse_single (const plfield_t *field, const plitem_t *item,
 }
 
 static int parse_array (const plfield_t *field, const plitem_t *item,
-						void *data, plitem_t *messages, void *ctx)
+						void *data, plitem_t *messages, void *context)
 {
 	__auto_type array = (parse_array_t *) field->data;
 	__auto_type value = (void **) ((byte *)data + array->value_offset);
@@ -213,7 +212,7 @@ static int parse_array (const plfield_t *field, const plitem_t *item,
 	//			field->data, data);
 	//Sys_Printf ("    %d %zd %p %zd %zd\n", array->type, array->stride,
 	//			array->parser, array->value_offset, array->size_offset);
-	if (!PL_ParseArray (&f, item, &arr, messages, ctx)) {
+	if (!PL_ParseArray (&f, item, &arr, messages, context)) {
 		return 0;
 	}
 	*value = malloc (array->stride * arr->size);
@@ -225,7 +224,7 @@ static int parse_array (const plfield_t *field, const plitem_t *item,
 	return 1;
 }
 
-#include "libs/video/renderer/vulkan/vkparse.inc"
+#include "libs/video/renderer/vulkan/vkparse.cinc"
 
 typedef struct qfv_renderpass_s {
 	qfv_attachmentdescription_t *attachments;
@@ -268,20 +267,37 @@ static plfield_t renderpass_fields[] = {
 };
 
 VkRenderPass
-QFV_ParseRenderPass (qfv_device_t *device, plitem_t *plist)
+QFV_ParseRenderPass (vulkan_ctx_t *ctx, plitem_t *plist)
 {
+	qfv_device_t *device = ctx->device;
 	qfv_renderpass_t renderpass_data = {};
 	plitem_t   *messages = PL_NewArray ();
 	VkRenderPass renderpass;
+	exprsym_t   var_syms[] = {
+		{"swapchain", &qfv_swapchain_t_type, ctx->swapchain},
+		{}
+	};
+	exprtab_t   vars_tab = { var_syms, 0 };
+	exprctx_t   exprctx = {};
+
+	exprctx.external_variables = &vars_tab;
+	exprctx.memsuper = new_memsuper ();
+	exprctx.messages = messages;
+	exprctx.hashlinks = ctx->hashlinks;
+
+	cexpr_init_symtab (&vars_tab, &exprctx);
 
 	if (!PL_ParseDictionary (renderpass_fields, plist,
-							 &renderpass_data, messages, 0)) {
+							 &renderpass_data, messages, &exprctx)) {
 		for (int i = 0; i < PL_A_NumObjects (messages); i++) {
 			Sys_Printf ("%s\n", PL_String (PL_ObjectAtIndex (messages, i)));
 		}
 		return 0;
 	}
 	PL_Free (messages);
+	delete_memsuper (exprctx.memsuper);
+	ctx->hashlinks = exprctx.hashlinks;
+
 	renderpass = QFV_CreateRenderPass (device,
 									   renderpass_data.attachments,
 									   renderpass_data.subpasses,
@@ -299,3 +315,10 @@ QFV_ParseRenderPass (qfv_device_t *device, plitem_t *plist)
 	free (renderpass_data.dependencies);
 	return renderpass;
 }
+
+void
+QFV_InitParse (void)
+{
+	exprctx_t   context = {};
+	vkgen_init_symtabs (&context);
+}
diff --git a/libs/video/renderer/vulkan/vkparse.h b/libs/video/renderer/vulkan/vkparse.h
index 0d14eecbe..ae8a30af9 100644
--- a/libs/video/renderer/vulkan/vkparse.h
+++ b/libs/video/renderer/vulkan/vkparse.h
@@ -2,9 +2,9 @@
 #define __vkparse_h
 
 #include "QF/Vulkan/renderpass.h"
+#include "libs/video/renderer/vulkan/vkparse.hinc"
 
-VkRenderPass
-QFV_ParseRenderPass (qfv_device_t *device, plitem_t *plist);
-
+VkRenderPass QFV_ParseRenderPass (vulkan_ctx_t *ctx, plitem_t *plist);
+void QFV_InitParse (void);
 
 #endif//__vkparse_h
diff --git a/libs/video/renderer/vulkan/vkparse.plist b/libs/video/renderer/vulkan/vkparse.plist
index 017025426..1441a0267 100644
--- a/libs/video/renderer/vulkan/vkparse.plist
+++ b/libs/video/renderer/vulkan/vkparse.plist
@@ -3,8 +3,13 @@
 		VkAttachmentDescription,
 		VkSubpassDescription,
 		VkSubpassDependency,
+		qfv_swapchain_t,
 	);
 	parse = {
+		qfv_swapchain_s = {
+			.name = qfv_swapchain_t;
+			format = auto;
+		};
 		VkSubpassDescription = {
 			flags = auto;
 			pipelineBindPoint = auto;
diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c
index 6f0ba9892..b0d285ed6 100644
--- a/libs/video/renderer/vulkan/vulkan_vid_common.c
+++ b/libs/video/renderer/vulkan/vulkan_vid_common.c
@@ -39,6 +39,8 @@
 # include <strings.h>
 #endif
 
+#include "QF/cexpr.h"
+#include "QF/cmem.h"
 #include "QF/cvar.h"
 #include "QF/dstring.h"
 #include "QF/input.h"
@@ -63,12 +65,14 @@
 #include "vid_vulkan.h"
 
 #include "util.h"
+#include "vkparse.h"
 
 static const char quakeforge_pipeline[] =
 #include "libs/video/renderer/vulkan/qfpipeline.plc"
 ;
 
 cvar_t *vulkan_presentation_mode;
+cvar_t *msaaSamples;
 
 static void
 vulkan_presentation_mode_f (cvar_t *var)
@@ -87,6 +91,19 @@ vulkan_presentation_mode_f (cvar_t *var)
 	}
 }
 
+static void
+msaaSamples_f (cvar_t *var)
+{
+	exprctx_t   context = {};
+	context.memsuper = new_memsuper();
+
+	if (cexpr_parse_enum (&VkSampleCountFlagBits_enum, var->string, &context,
+						  &var->int_val)) {
+		Sys_Printf ("Invalid MSAA samples, using 1\n");
+		var->int_val = VK_SAMPLE_COUNT_1_BIT;
+	}
+}
+
 static void
 Vulkan_Init_Cvars (void)
 {
@@ -100,6 +117,9 @@ Vulkan_Init_Cvars (void)
 										 CVAR_NONE, vulkan_presentation_mode_f,
 										 "desired presentation mode (may fall "
 										 "back to fifo).");
+	msaaSamples = Cvar_Get ("msaaSamples", "VK_SAMPLE_COUNT_1_BIT",
+										 CVAR_NONE, msaaSamples_f,
+										 "desired MSAA sample size.");
 }
 
 static const char *instance_extensions[] = {
@@ -116,8 +136,8 @@ void
 Vulkan_Init_Common (vulkan_ctx_t *ctx)
 {
 	Sys_Printf ("Vulkan_Init_Common\n");
+	QFV_InitParse ();
 	Vulkan_Init_Cvars ();
-
 	ctx->instance = QFV_CreateInstance (ctx, PACKAGE_STRING, 0x000702ff, 0, instance_extensions);//FIXME version
 }
 

From ac8206555ee145ad4a690432b6df1d5b6ffb638e Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 21 Dec 2020 19:30:00 +0900
Subject: [PATCH 1206/1519] [vulkan] Get the parsed pipeline working

It turned out the msaa setting defaulting to 1 instead of 8 was the
problem no idea why at this stage (need to read up on just how that
setting works). Once I understand just how it works, I'll rework the
msaa handling.
---
 libs/video/renderer/vulkan/instance.c         |  2 +-
 libs/video/renderer/vulkan/renderpass.c       | 61 ++++++++++++++++
 libs/video/renderer/vulkan/vkparse.c          |  8 +--
 .../video/renderer/vulkan/vulkan_vid_common.c | 69 +------------------
 4 files changed, 68 insertions(+), 72 deletions(-)

diff --git a/libs/video/renderer/vulkan/instance.c b/libs/video/renderer/vulkan/instance.c
index 4d23b5a75..b228df2fe 100644
--- a/libs/video/renderer/vulkan/instance.c
+++ b/libs/video/renderer/vulkan/instance.c
@@ -296,6 +296,6 @@ QFV_GetMaxSampleCount (qfv_physdev_t *physdev)
 	while (maxSamples && maxSamples > counts) {
 		maxSamples >>= 1;
 	}
-	Sys_MaskPrintf (SYS_VULKAN, "Max samples: %x\n", maxSamples);
+	Sys_MaskPrintf (SYS_VULKAN, "Max samples: %x (%d)\n", maxSamples, counts);
 	return maxSamples;
 }
diff --git a/libs/video/renderer/vulkan/renderpass.c b/libs/video/renderer/vulkan/renderpass.c
index 40bc095ad..78cc46563 100644
--- a/libs/video/renderer/vulkan/renderpass.c
+++ b/libs/video/renderer/vulkan/renderpass.c
@@ -71,6 +71,67 @@ QFV_CreateRenderPass (qfv_device_t *device,
 	VkDevice    dev = device->dev;
 	qfv_devfuncs_t *dfunc = device->funcs;
 
+	if (developer->int_val & SYS_VULKAN) {
+		Sys_Printf ("attachments: %ld\n", attachments->size);
+		for (size_t i = 0; i < attachments->size; i++) {
+			Sys_Printf ("    flags: %x\n", attachments->a[i].flags);
+			Sys_Printf ("    format: %d\n", attachments->a[i].format);
+			Sys_Printf ("    samples: %x\n", attachments->a[i].samples);
+			Sys_Printf ("    loadOp: %d\n", attachments->a[i].loadOp);
+			Sys_Printf ("    storeOp: %d\n", attachments->a[i].storeOp);
+			Sys_Printf ("    stencilLoadOp: %d\n",
+						attachments->a[i].stencilLoadOp);
+			Sys_Printf ("    stencilStoreOp: %d\n",
+						attachments->a[i].stencilStoreOp);
+			Sys_Printf ("    initialLayout: %d\n",
+						attachments->a[i].initialLayout);
+			Sys_Printf ("    finalLayout: %d\n",
+						attachments->a[i].finalLayout);
+		}
+		Sys_Printf ("subpassparams: %ld\n", subpassparams->size);
+		for (size_t i = 0; i < subpassparams->size; i++) {
+			VkSubpassDescription *sp = &subpassparams->a[i];
+			Sys_Printf ("    flags: %x\n", sp->flags);
+			Sys_Printf ("    piplineBindPoint: %d\n", sp->pipelineBindPoint);
+			Sys_Printf ("    inputAttachmentCount: %d\n",
+						sp->inputAttachmentCount);
+			for (size_t j = 0; j < sp->inputAttachmentCount; j++) {
+				const VkAttachmentReference *ref = &sp->pInputAttachments[j];
+				Sys_Printf ("      c %d %d\n", ref->attachment, ref->layout);
+			}
+			Sys_Printf ("    colorAttachmentCount: %d\n",
+						sp->colorAttachmentCount);
+			for (size_t j = 0; j < sp->colorAttachmentCount; j++) {
+				const VkAttachmentReference *ref = &sp->pColorAttachments[j];
+				Sys_Printf ("      c %d %d\n", ref->attachment, ref->layout);
+			}
+			for (size_t j = 0; j < sp->colorAttachmentCount; j++) {
+				const VkAttachmentReference *ref = &sp->pResolveAttachments[j];
+				Sys_Printf ("      r %d %d\n", ref->attachment, ref->layout);
+			}
+			Sys_Printf ("    pDepthStencilAttachment: %p\n",
+						sp->pDepthStencilAttachment);
+			if (sp->pDepthStencilAttachment) {
+				const VkAttachmentReference *ref = sp->pDepthStencilAttachment;
+				Sys_Printf ("        %d %d\n", ref->attachment, ref->layout);
+			}
+			Sys_Printf ("    preserveAttachmentCount: %d\n",
+						sp->preserveAttachmentCount);
+			for (size_t j = 0; j < sp->preserveAttachmentCount; j++) {
+				Sys_Printf ("        %d\n", sp->pPreserveAttachments[j]);
+			}
+		}
+		Sys_Printf ("dependencies: %ld\n", dependencies->size);
+		for (size_t i = 0; i < dependencies->size; i++) {
+			Sys_Printf ("    srcSubpass: %d\n", dependencies->a[i].srcSubpass);
+			Sys_Printf ("    dstSubpass: %d\n", dependencies->a[i].dstSubpass);
+			Sys_Printf ("    srcStageMask: %x\n", dependencies->a[i].srcStageMask);
+			Sys_Printf ("    dstStageMask: %x\n", dependencies->a[i].dstStageMask);
+			Sys_Printf ("    srcAccessMask: %x\n", dependencies->a[i].srcAccessMask);
+			Sys_Printf ("    dstAccessMask: %x\n", dependencies->a[i].dstAccessMask);
+			Sys_Printf ("    dependencyFlags: %x\n", dependencies->a[i].dependencyFlags);
+		}
+	}
 	VkRenderPassCreateInfo createInfo = {
 		VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO, 0, 0,
 		attachments->size, attachments->a,
diff --git a/libs/video/renderer/vulkan/vkparse.c b/libs/video/renderer/vulkan/vkparse.c
index 55798c185..b6512d041 100644
--- a/libs/video/renderer/vulkan/vkparse.c
+++ b/libs/video/renderer/vulkan/vkparse.c
@@ -155,11 +155,11 @@ static int parse_enum (const plfield_t *field, const plitem_t *item,
 	ectx.symtab = enm->symtab;
 	ectx.result = &result;
 	const char *valstr = PL_String (item);
-	Sys_Printf ("parse_enum: %s %zd %d %p %p %s\n",
-				field->name, field->offset, field->type, field->parser,
-				field->data, valstr);
+	//Sys_Printf ("parse_enum: %s %zd %d %p %p %s\n",
+	//			field->name, field->offset, field->type, field->parser,
+	//			field->data, valstr);
 	ret = !cexpr_parse_enum (enm, valstr, &ectx, data);
-	Sys_Printf ("    %d\n", *(int *)data);
+	//Sys_Printf ("    %d\n", *(int *)data);
 	return ret;
 }
 
diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c
index b0d285ed6..ee0a209a1 100644
--- a/libs/video/renderer/vulkan/vulkan_vid_common.c
+++ b/libs/video/renderer/vulkan/vulkan_vid_common.c
@@ -117,7 +117,7 @@ Vulkan_Init_Cvars (void)
 										 CVAR_NONE, vulkan_presentation_mode_f,
 										 "desired presentation mode (may fall "
 										 "back to fifo).");
-	msaaSamples = Cvar_Get ("msaaSamples", "VK_SAMPLE_COUNT_1_BIT",
+	msaaSamples = Cvar_Get ("msaaSamples", "VK_SAMPLE_COUNT_8_BIT",
 										 CVAR_NONE, msaaSamples_f,
 										 "desired MSAA sample size.");
 }
@@ -366,72 +366,7 @@ Vulkan_CreateRenderPass (vulkan_ctx_t *ctx)
 
 	ctx->renderpass.colorImage = colorImage;
 	ctx->renderpass.depthImage = depthImage;
-
-	__auto_type attachments = QFV_AllocAttachmentDescription (3, alloca);
-	__auto_type attachmentRefs = QFV_AllocAttachmentReference (3, alloca);
-
-	// color attachment
-	attachments->a[0].flags = 0;
-	attachments->a[0].format = sc->format;
-	attachments->a[0].samples = msaaSamples;
-	attachments->a[0].loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR;
-	attachments->a[0].storeOp = VK_ATTACHMENT_STORE_OP_STORE;
-	attachments->a[0].stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
-	attachments->a[0].stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
-	attachments->a[0].initialLayout = VK_IMAGE_LAYOUT_UNDEFINED;
-	attachments->a[0].finalLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
-	attachmentRefs->a[0].attachment = 0;
-	attachmentRefs->a[0].layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
-
-	// depth attachment
-	attachments->a[1].flags = 0;
-	attachments->a[1].format = depthFormat;
-	attachments->a[1].samples = msaaSamples;
-	attachments->a[1].loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR;
-	attachments->a[1].storeOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
-	attachments->a[1].stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
-	attachments->a[1].stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
-	attachments->a[1].initialLayout = VK_IMAGE_LAYOUT_UNDEFINED;
-	attachments->a[1].finalLayout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL;
-	attachmentRefs->a[1].attachment = 1;
-	attachmentRefs->a[1].layout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL;
-
-	// resolve attachment
-	attachments->a[2].flags = 0;
-	attachments->a[2].format = sc->format;
-	attachments->a[2].samples = VK_SAMPLE_COUNT_1_BIT;
-	attachments->a[2].loadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
-	attachments->a[2].storeOp = VK_ATTACHMENT_STORE_OP_STORE;
-	attachments->a[2].stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
-	attachments->a[2].stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
-	attachments->a[2].initialLayout = VK_IMAGE_LAYOUT_UNDEFINED;
-	attachments->a[2].finalLayout = VK_IMAGE_LAYOUT_PRESENT_SRC_KHR;
-	attachmentRefs->a[2].attachment = 2;
-	attachmentRefs->a[2].layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
-
-	__auto_type subpasses = QFV_AllocSubpassParametersSet (1, alloca);
-	subpasses->a[0].flags = 0;
-	subpasses->a[0].pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS;
-	subpasses->a[0].inputAttachmentCount = 0;
-	subpasses->a[0].pInputAttachments = 0;
-	subpasses->a[0].colorAttachmentCount = 1;
-	subpasses->a[0].pColorAttachments = &attachmentRefs->a[0];
-	subpasses->a[0].pResolveAttachments = &attachmentRefs->a[2];
-	subpasses->a[0].pDepthStencilAttachment = &attachmentRefs->a[1];
-	subpasses->a[0].preserveAttachmentCount = 0;
-	subpasses->a[0].pPreserveAttachments = 0;
-
-	__auto_type depenencies = QFV_AllocSubpassDependencies (1, alloca);
-	depenencies->a[0].srcSubpass = VK_SUBPASS_EXTERNAL;
-	depenencies->a[0].dstSubpass = 0;
-	depenencies->a[0].srcStageMask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
-	depenencies->a[0].dstStageMask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
-	depenencies->a[0].srcAccessMask = 0;
-	depenencies->a[0].dstAccessMask = VK_ACCESS_COLOR_ATTACHMENT_READ_BIT | VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT;
-	depenencies->a[0].dependencyFlags = 0;
-
-	ctx->renderpass.renderpass = QFV_CreateRenderPass (device, attachments,
-													   subpasses, depenencies);
+	ctx->renderpass.renderpass = QFV_ParseRenderPass (ctx, item);
 }
 
 void

From 79f22ffebfb6c698624100b4383fab8ef285e454 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 21 Dec 2020 20:15:43 +0900
Subject: [PATCH 1207/1519] [util] Propagate cexpr errors back to the caller

Not much point in error detection when it's ignored.
---
 include/QF/cexpr.h     | 1 +
 libs/util/cexpr-lex.l  | 7 +++++--
 libs/util/cexpr-vars.c | 3 +--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/include/QF/cexpr.h b/include/QF/cexpr.h
index fcdeaad57..7524dec0c 100644
--- a/include/QF/cexpr.h
+++ b/include/QF/cexpr.h
@@ -82,6 +82,7 @@ typedef struct exprctx_s {
 	const struct plitem_s *item;
 	struct plitem_s *messages;
 	struct hashlink_s *hashlinks;
+	int         errors;
 } exprctx_t;
 
 typedef struct exprenum_s {
diff --git a/libs/util/cexpr-lex.l b/libs/util/cexpr-lex.l
index cfb1b99c6..cdae1ee04 100644
--- a/libs/util/cexpr-lex.l
+++ b/libs/util/cexpr-lex.l
@@ -82,6 +82,8 @@ cexpr_error(exprctx_t *ctx, const char *fmt, ...)
 	va_list     args;
 	dstring_t  *string;
 
+	ctx->errors++;
+
 	string = dstring_new ();
 
 	va_start (args, fmt);
@@ -211,6 +213,7 @@ cexpr_eval_string (const char *str, exprctx_t *context)
 	yylex_init_extra (context, &scanner);
 	yy_scan_string (str, scanner);
 
+	context->errors = 0;
 	do {
 		CEXPR_YYSTYPE lval;
 		int         token = yylex (&lval, scanner);
@@ -219,7 +222,7 @@ cexpr_eval_string (const char *str, exprctx_t *context)
 
 	yylex_destroy (scanner);
 	cexpr_yypstate_delete (ps);
-	return status;
+	return status || context->errors;
 }
 
 static exprval_t *parse_int (const char *str, exprctx_t *context)
@@ -271,7 +274,7 @@ parse_variable (const char *name, exprctx_t *context)
 		if (sym) {
 			val = cexpr_value_reference (sym->type, sym->value, context);
 		} else {
-			val = cexpr_cvar (name, context);
+			//val = cexpr_cvar (name, context);
 		}
 	}
 	if (!val) {
diff --git a/libs/util/cexpr-vars.c b/libs/util/cexpr-vars.c
index 9f01e3134..6ec8ce3d9 100644
--- a/libs/util/cexpr-vars.c
+++ b/libs/util/cexpr-vars.c
@@ -34,7 +34,6 @@
 #include "QF/cmem.h"
 #include "QF/cvar.h"
 #include "QF/hash.h"
-#include "QF/qfplist.h"
 
 #include "libs/util/cexpr-parse.h"
 
@@ -65,7 +64,7 @@ cvar_get (const exprval_t *a, const exprval_t *b, exprval_t *c, exprctx_t *ctx)
 	__auto_type name = (const char *) b->value;
 	exprval_t  *var = cexpr_cvar (name, ctx);
 	if (!var) {
-		PL_Message (ctx->messages, ctx->item, "unknown cvar %s", name);
+		cexpr_error (ctx, "unknown cvar %s", name);
 	}
 	*(exprval_t **) c->value = var;
 }

From 80aec45e35b5f7704dd65f7b39104ef80b1e48ca Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 21 Dec 2020 20:17:27 +0900
Subject: [PATCH 1208/1519] [vulkan] Ensure msaa settings are consistent

I had forgotten that msaa samples was governed by the driver (as a max)
and the renderpass setup code simply took the max. Thus why 1 vs 8
caused the display to render incorrectly.
---
 include/vid_vulkan.h                           |  1 +
 libs/video/renderer/vulkan/qfpipeline.plist    |  2 +-
 libs/video/renderer/vulkan/vkparse.c           |  1 +
 libs/video/renderer/vulkan/vulkan_vid_common.c | 10 +++++-----
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/include/vid_vulkan.h b/include/vid_vulkan.h
index 411fcf4db..1886730c6 100644
--- a/include/vid_vulkan.h
+++ b/include/vid_vulkan.h
@@ -41,6 +41,7 @@ typedef struct vulkan_ctx_s {
 	struct qfv_instance_s *instance;
 	struct qfv_device_s *device;
 	struct qfv_swapchain_s *swapchain;
+	VkSampleCountFlagBits msaaSamples;	// FIXME not here?
 	struct hashlink_s *hashlinks;	//FIXME want per thread
 	VkSurfaceKHR surface;	//FIXME surface = window, so "contains" swapchain
 
diff --git a/libs/video/renderer/vulkan/qfpipeline.plist b/libs/video/renderer/vulkan/qfpipeline.plist
index a8e1c36c9..66c9e0adb 100644
--- a/libs/video/renderer/vulkan/qfpipeline.plist
+++ b/libs/video/renderer/vulkan/qfpipeline.plist
@@ -15,7 +15,7 @@
 			{
 				flags = 0;
 				format = VK_FORMAT_D32_SFLOAT;
-				samples = $cvars.msaaSamples;
+				samples = $msaaSamples;
 				loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR;
 				storeOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
 				stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
diff --git a/libs/video/renderer/vulkan/vkparse.c b/libs/video/renderer/vulkan/vkparse.c
index b6512d041..b62637796 100644
--- a/libs/video/renderer/vulkan/vkparse.c
+++ b/libs/video/renderer/vulkan/vkparse.c
@@ -275,6 +275,7 @@ QFV_ParseRenderPass (vulkan_ctx_t *ctx, plitem_t *plist)
 	VkRenderPass renderpass;
 	exprsym_t   var_syms[] = {
 		{"swapchain", &qfv_swapchain_t_type, ctx->swapchain},
+		{"msaaSamples", &VkSampleCountFlagBits_type, &ctx->msaaSamples},
 		{}
 	};
 	exprtab_t   vars_tab = { var_syms, 0 };
diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c
index ee0a209a1..9c2b021f4 100644
--- a/libs/video/renderer/vulkan/vulkan_vid_common.c
+++ b/libs/video/renderer/vulkan/vulkan_vid_common.c
@@ -117,7 +117,7 @@ Vulkan_Init_Cvars (void)
 										 CVAR_NONE, vulkan_presentation_mode_f,
 										 "desired presentation mode (may fall "
 										 "back to fifo).");
-	msaaSamples = Cvar_Get ("msaaSamples", "VK_SAMPLE_COUNT_8_BIT",
+	msaaSamples = Cvar_Get ("msaaSamples", "VK_SAMPLE_COUNT_1_BIT",
 										 CVAR_NONE, msaaSamples_f,
 										 "desired MSAA sample size.");
 }
@@ -284,13 +284,13 @@ Vulkan_CreateRenderPass (vulkan_ctx_t *ctx)
 
 	VkExtent3D extent = {sc->extent.width, sc->extent.height, 1};
 
-	VkSampleCountFlagBits msaaSamples
-		= QFV_GetMaxSampleCount (device->physDev);
+	//FIXME incorporate cvar setting
+	ctx->msaaSamples = QFV_GetMaxSampleCount (device->physDev);
 
 	Sys_MaskPrintf (SYS_VULKAN, "color resource\n");
 	colorImage->image
 		= QFV_CreateImage (device, 0, VK_IMAGE_TYPE_2D,
-						   sc->format, extent, 1, 1, msaaSamples,
+						   sc->format, extent, 1, 1, ctx->msaaSamples,
 						   VK_IMAGE_USAGE_TRANSIENT_ATTACHMENT_BIT
 							   | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT);
 	colorImage->object
@@ -308,7 +308,7 @@ Vulkan_CreateRenderPass (vulkan_ctx_t *ctx)
 	VkFormat depthFormat = VK_FORMAT_D32_SFLOAT;
 	depthImage->image
 		= QFV_CreateImage (device, 0, VK_IMAGE_TYPE_2D,
-						   depthFormat, extent, 1, 1, msaaSamples,
+						   depthFormat, extent, 1, 1, ctx->msaaSamples,
 						   VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT);
 	depthImage->object
 		= QFV_AllocImageMemory (device, depthImage->image,

From 91c5baa7089741c9a9e7746004058f2572ee5fd6 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 23 Dec 2020 14:06:20 +0900
Subject: [PATCH 1209/1519] [util] Add size_t support to cexpr

---
 include/QF/cexpr.h                         |  1 +
 libs/util/cexpr-type.c                     | 46 ++++++++++++++++++++++
 libs/video/renderer/vulkan/vkgen/vkalias.r |  7 +++-
 3 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/include/QF/cexpr.h b/include/QF/cexpr.h
index 7524dec0c..0d2b4a8a4 100644
--- a/include/QF/cexpr.h
+++ b/include/QF/cexpr.h
@@ -109,6 +109,7 @@ char *cexpr_yyget_text (void *scanner);
 
 extern exprtype_t cexpr_int;
 extern exprtype_t cexpr_uint;
+extern exprtype_t cexpr_size_t;
 extern exprtype_t cexpr_float;
 extern exprtype_t cexpr_double;
 extern exprtype_t cexpr_exprval;
diff --git a/libs/util/cexpr-type.c b/libs/util/cexpr-type.c
index 35c62ee85..c0610b13d 100644
--- a/libs/util/cexpr-type.c
+++ b/libs/util/cexpr-type.c
@@ -160,6 +160,52 @@ exprtype_t cexpr_uint = {
 	uint_unops,
 };
 
+BINOP(size_t, shl, unsigned, <<)
+BINOP(size_t, shr, unsigned, >>)
+BINOP(size_t, add, unsigned, +)
+BINOP(size_t, sub, unsigned, -)
+BINOP(size_t, mul, unsigned, *)
+BINOP(size_t, div, unsigned, /)
+BINOP(size_t, band, unsigned, &)
+BINOP(size_t, bor, unsigned, |)
+BINOP(size_t, xor, unsigned, ^)
+BINOP(size_t, rem, unsigned, %)
+
+UNOP(size_t, pos, unsigned, +)
+UNOP(size_t, neg, unsigned, -)
+UNOP(size_t, tnot, unsigned, !)
+UNOP(size_t, bnot, unsigned, ~)
+
+binop_t size_t_binops[] = {
+	{ SHL, &cexpr_size_t, &cexpr_size_t, size_t_shl },
+	{ SHR, &cexpr_size_t, &cexpr_size_t, size_t_shr },
+	{ '+', &cexpr_size_t, &cexpr_size_t, size_t_add },
+	{ '-', &cexpr_size_t, &cexpr_size_t, size_t_sub },
+	{ '*', &cexpr_size_t, &cexpr_size_t, size_t_mul },
+	{ '/', &cexpr_size_t, &cexpr_size_t, size_t_div },
+	{ '&', &cexpr_size_t, &cexpr_size_t, size_t_band },
+	{ '|', &cexpr_size_t, &cexpr_size_t, size_t_bor },
+	{ '^', &cexpr_size_t, &cexpr_size_t, size_t_xor },
+	{ '%', &cexpr_size_t, &cexpr_size_t, size_t_rem },
+	{ MOD, &cexpr_size_t, &cexpr_size_t, size_t_rem },
+	{}
+};
+
+unop_t size_t_unops[] = {
+	{ '+', &cexpr_size_t, size_t_pos },
+	{ '-', &cexpr_size_t, size_t_neg },
+	{ '!', &cexpr_size_t, size_t_tnot },
+	{ '~', &cexpr_size_t, size_t_bnot },
+	{}
+};
+
+exprtype_t cexpr_size_t = {
+	"size_t",
+	sizeof (size_t),
+	size_t_binops,
+	size_t_unops,
+};
+
 BINOP(float, add, float, +)
 BINOP(float, sub, float, -)
 BINOP(float, mul, float, *)
diff --git a/libs/video/renderer/vulkan/vkgen/vkalias.r b/libs/video/renderer/vulkan/vkgen/vkalias.r
index 132e6291a..be783b207 100644
--- a/libs/video/renderer/vulkan/vkgen/vkalias.r
+++ b/libs/video/renderer/vulkan/vkgen/vkalias.r
@@ -65,6 +65,9 @@
 	if (name == "uint32_t") {
 		return "cexpr_uint";
 	}
+	if (name == "size_t") {
+		return "cexpr_size_t";
+	}
 	return [alias cexprType];
 }
 
@@ -80,7 +83,7 @@
 			return [enumObj parseType];
 		}
 	}
-	if (name == "uint32_t") {
+	if (name == "uint32_t" || name == "size_t") {
 		return "QFString";
 	}
 	return [alias parseType];
@@ -116,7 +119,7 @@
 			return [enumObj parseData];
 		}
 	}
-	if (name == "uint32_t") {
+	if (name == "uint32_t" || name == "size_t") {
 		return "0";
 	}
 	return [alias parseData];

From 5864b553ef95cdff5c3e038d32ff7441b9982f17 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 23 Dec 2020 14:07:30 +0900
Subject: [PATCH 1210/1519] [util] Add accessors for binary plist objects

---
 include/QF/qfplist.h | 17 +++++++++++++++++
 libs/util/qfplist.c  | 20 ++++++++++++++++++++
 2 files changed, 37 insertions(+)

diff --git a/include/QF/qfplist.h b/include/QF/qfplist.h
index 70a1b8302..1d45426d2 100644
--- a/include/QF/qfplist.h
+++ b/include/QF/qfplist.h
@@ -141,6 +141,23 @@ pltype_t PL_Type (const plitem_t *item) __attribute__((pure));
 */
 int PL_Line (const plitem_t *item) __attribute__((pure));
 
+/** Retrieve the data size from a binary object.
+
+	\param binary The binary object
+	\return the size in bytes of the binary object 0 if binary isn't a binary
+	object.
+*/
+size_t PL_BinarySize (const plitem_t *item) __attribute__((pure));
+
+/** Retrieve the data from a binary object.
+
+	\param binary The binary object
+	\return pointer to the actual data or NULL if binary isn't a binary object.
+	\note	You are NOT responsible for freeing the returned object. It will
+	be destroyed when its container is.
+*/
+const void *PL_BinaryData (const plitem_t *binary) __attribute__((pure));
+
 /** Retrieve a string from a string object.
 
 	\param string The string object
diff --git a/libs/util/qfplist.c b/libs/util/qfplist.c
index 2f71d42bc..b33d22084 100644
--- a/libs/util/qfplist.c
+++ b/libs/util/qfplist.c
@@ -231,6 +231,26 @@ PL_Free (plitem_t *item)
 	free (item);
 }
 
+VISIBLE size_t
+PL_BinarySize (const plitem_t *binary)
+{
+	plbinary_t *bin = (plbinary_t *) binary->data;
+
+	if (binary->type != QFBinary)
+		return 0;
+	return bin->size;
+}
+
+VISIBLE const void *
+PL_BinaryData (const plitem_t *binary)
+{
+	plbinary_t *bin = (plbinary_t *) binary->data;
+
+	if (binary->type != QFBinary)
+		return 0;
+	return bin->data;
+}
+
 VISIBLE const char *
 PL_String (const plitem_t *string)
 {

From f1848bb5b77299bdbf487fb86122ea520616d397 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 23 Dec 2020 14:08:53 +0900
Subject: [PATCH 1211/1519] [vulkan] Add support for parsing binary data

---
 libs/video/renderer/vulkan/vkgen/vkstruct.r | 34 ++++++++++++++++-----
 libs/video/renderer/vulkan/vkparse.c        | 29 ++++++++++++++++++
 2 files changed, 56 insertions(+), 7 deletions(-)

diff --git a/libs/video/renderer/vulkan/vkgen/vkstruct.r b/libs/video/renderer/vulkan/vkgen/vkstruct.r
index 4c9040cb6..6e6908bb8 100644
--- a/libs/video/renderer/vulkan/vkgen/vkstruct.r
+++ b/libs/video/renderer/vulkan/vkgen/vkstruct.r
@@ -80,14 +80,17 @@
 			field_type = [[Type lookup: type_type] dereference];
 			fprintf (output_file, "static parse_%s_t parse_%s_%s_data = {\n",
 					 type_record, name, field_name);
-			fprintf (output_file, "\t%s,\n", [field_type parseType]);
-			fprintf (output_file, "\tsizeof (%s),\n", type_type);
-			fprintf (output_file, "\tparse_%s,\n", type_type);
 			if (type_record == "single") {
+				fprintf (output_file, "\t%s,\n", [field_type parseType]);
+				fprintf (output_file, "\tsizeof (%s),\n", type_type);
+				fprintf (output_file, "\tparse_%s,\n", type_type);
 				value_field = [[field_def getObjectForKey:"value"] string];
 				fprintf (output_file, "\tfield_offset (%s, %s),\n",
 						 name, value_field);
-			} else {
+			} else if (type_record == "array") {
+				fprintf (output_file, "\t%s,\n", [field_type parseType]);
+				fprintf (output_file, "\tsizeof (%s),\n", type_type);
+				fprintf (output_file, "\tparse_%s,\n", type_type);
 				value_field = [[field_def getObjectForKey:"values"] string];
 				size_field = [[field_def getObjectForKey:"size"] string];
 				fprintf (output_file, "\tfield_offset (%s, %s),\n",
@@ -98,6 +101,19 @@
 				} else {
 					fprintf (output_file, "\t-1,\n");
 				}
+			} else if (type_record == "data") {
+				value_field = [[field_def getObjectForKey:"data"] string];
+				size_field = [[field_def getObjectForKey:"size"] string];
+				fprintf (output_file, "\tfield_offset (%s, %s),\n",
+						 name, value_field);
+				if (size_field) {
+					fprintf (output_file, "\tfield_offset (%s, %s),\n",
+							 name, size_field);
+				} else {
+					fprintf (output_file, "\t-1,\n");
+				}
+			} else {
+				fprintf (output_file, "\tno type,\n");
 			}
 			fprintf (output_file, "};\n");
 		}
@@ -128,7 +144,7 @@
 				PLItem     *type_desc = [field_def getObjectForKey:"type"];
 				string      type_record;
 				string      type_type;
-				string      parseType;
+				string      parseType = "no type";
 
 				type_record = [[type_desc getObjectAtIndex:0] string];
 				type_type = [[type_desc getObjectAtIndex:1] string];
@@ -136,8 +152,10 @@
 				field_type = [[Type lookup: type_type] dereference];
 				if (type_record == "single") {
 					parseType = [field_type parseType];
-				} else {
+				} else if (type_record == "array") {
 					parseType = "QFArray";
+				} else if (type_record == "data") {
+					parseType = "QFBinary";
 				}
 				fprintf (output_file,
 						 "\t{\"%s\", 0, %s, parse_%s, &parse_%s_%s_data},\n",
@@ -208,8 +226,10 @@
 				type_record = [[type_desc getObjectAtIndex:0] string];
 				if (type_record == "single") {
 					value_field = [[field_def getObjectForKey:"value"] string];
-				} else {
+				} else if (type_record == "array") {
 					value_field = [[field_def getObjectForKey:"values"] string];
+				} else if (type_record == "data") {
+					value_field = [[field_def getObjectForKey:"data"] string];
 				}
 				if (!value_field) {
 					value_field = field_name;
diff --git a/libs/video/renderer/vulkan/vkparse.c b/libs/video/renderer/vulkan/vkparse.c
index b62637796..fbe46d512 100644
--- a/libs/video/renderer/vulkan/vkparse.c
+++ b/libs/video/renderer/vulkan/vkparse.c
@@ -117,6 +117,11 @@ typedef struct parse_array_s {
 	size_t      size_offset;
 } parse_array_t;
 
+typedef struct parse_data_s {
+	size_t      value_offset;
+	size_t      size_offset;
+} parse_data_t;
+
 static int parse_uint32_t (const plfield_t *field, const plitem_t *item,
 						   void *data, plitem_t *messages, void *context)
 {
@@ -224,6 +229,30 @@ static int parse_array (const plfield_t *field, const plitem_t *item,
 	return 1;
 }
 
+static int parse_data (const plfield_t *field, const plitem_t *item,
+					   void *data, plitem_t *messages, void *context)
+{
+	__auto_type datad = (parse_data_t *) field->data;
+	__auto_type value = (void **) ((byte *)data + datad->value_offset);
+	__auto_type size = (size_t *) ((byte *)data + datad->size_offset);
+
+	const void *bindata = PL_BinaryData (item);
+	size_t      binsize = PL_BinarySize (item);
+
+	Sys_Printf ("parse_array: %s %zd %d %p %p %p\n",
+				field->name, field->offset, field->type, field->parser,
+				field->data, data);
+	Sys_Printf ("    %zd %zd\n", datad->value_offset, datad->size_offset);
+	Sys_Printf ("    %zd %p\n", binsize, bindata);
+
+	*value = malloc (binsize);
+	memcpy (*value, bindata, binsize);
+	if ((void *) size > data) {
+		*size = binsize;
+	}
+	return 1;
+}
+
 #include "libs/video/renderer/vulkan/vkparse.cinc"
 
 typedef struct qfv_renderpass_s {

From 7fb335a21559f3944b259111521e0470a2ea2677 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 23 Dec 2020 14:32:29 +0900
Subject: [PATCH 1212/1519] [vulkan] Add support for building and loading
 shaders

Shaders can be built as spv files and installed into
$libdir/quakeforge/shaders or as spvc files and compiled into the
engine. Loading supports $builtin/name to access builtin shaders,
$shader/path to access external standard shaders and quake filesystem
access for all other paths.
---
 Makefile.am                                 |  22 +++
 config.d/paths.m4                           |  13 ++
 config.d/vulkan.m4                          |   1 +
 include/QF/Vulkan/shader.h                  |  13 ++
 include/vid_vulkan.h                        |   2 +
 libs/video/renderer/Makemodule.am           |  42 ++++-
 libs/video/renderer/vulkan/passthrough.vert |   8 +
 libs/video/renderer/vulkan/pushcolor.frag   |  12 ++
 libs/video/renderer/vulkan/shader.c         | 192 ++++++++++++++++++++
 9 files changed, 296 insertions(+), 9 deletions(-)
 create mode 100644 include/QF/Vulkan/shader.h
 create mode 100644 libs/video/renderer/vulkan/passthrough.vert
 create mode 100644 libs/video/renderer/vulkan/pushcolor.frag
 create mode 100644 libs/video/renderer/vulkan/shader.c

diff --git a/Makefile.am b/Makefile.am
index 71e429956..b59b21eb7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -107,6 +107,27 @@ qcautodep = $(join $(addsuffix $(DEPDIR)/,$(dir $(basename $(1)))),$(addsuffix .
 r_depfiles_remade=
 pas_depfiles_remade=
 
+V_GLSLANG = $(V_GLSLANG_@AM_V@)
+V_GLSLANG_ = $(V_GLSLANG_@AM_DEFAULT_V@)
+V_GLSLANG_0 = @echo "  GLSLANG " $@;
+V_GLSLANG_1 =
+
+V_XXD = $(V_XXD_@AM_V@)
+V_XXD_ = $(V_XXD_@AM_DEFAULT_V@)
+V_XXD_0 = @echo "  XXD     " $@;
+V_XXD_1 =
+
+%.spv: %
+	@$(mkdir_p) $(builddir)/`dirname $@`
+	$(V_GLSLANG)$(GLSLANGVALIDATOR) -V $< -o $@ > /dev/null
+
+%.spvc: %
+	@$(mkdir_p) $(builddir)/`dirname $@`
+	$(V_GLSLANG)$(GLSLANGVALIDATOR) --vn `basename $< | tr . _` -V $< -o $@ > /dev/null
+
+shaderdir = @shaderdir@
+shader_DATA =
+
 include doc/Makemodule.am
 include RPM/Makemodule.am
 include debian/Makemodule.am
@@ -122,6 +143,7 @@ include tools/Makemodule.am
 include ruamoko/Makemodule.am
 
 DISTCLEANFILES += $(r_depfiles_remade) $(pas_depfiles_remade)
+CLEANFILES += $(shader_DATA)
 
 $(r_depfiles_remade):
 	$(MKDIR_P) $(@D)
diff --git a/config.d/paths.m4 b/config.d/paths.m4
index f340eda78..c5ce432ce 100644
--- a/config.d/paths.m4
+++ b/config.d/paths.m4
@@ -98,6 +98,19 @@ eval expanded_plugindir="$expanded_plugindir"
 AC_DEFINE_UNQUOTED(FS_PLUGINPATH, "$expanded_plugindir", [Define this to the path from which to load plugins])
 AC_SUBST(plugindir)
 
+SHADERDIR="\${libdir}/quakeforge/shaders"
+if test "x$shaderdir" = "xauto" -o "x$shaderdir" = "xyes" -o "x$shaderdir" = "x"; then
+	shaderdir="$SHADERDIR"
+elif test "x$shaderdir" = xno; then
+	shaderdir="."
+else
+	SHADERDIR="$shaderdir"
+fi
+eval expanded_shaderdir="$shaderdir"
+eval expanded_shaderdir="$expanded_shaderdir"
+AC_DEFINE_UNQUOTED(FS_SHADERPATH, "$expanded_shaderdir", [Define this to the path from which to load shaders])
+AC_SUBST(plugindir)
+
 AC_ARG_WITH(gl-driver,
 	[  --with-gl-driver=NAME   Name of OpenGL driver DLL/DSO],
 	gl_driver=$withval,
diff --git a/config.d/vulkan.m4 b/config.d/vulkan.m4
index 4c9df43f4..0c780e98a 100644
--- a/config.d/vulkan.m4
+++ b/config.d/vulkan.m4
@@ -16,5 +16,6 @@ if test "x$HAVE_VULKAN" = xyes; then
 	AC_DEFINE([HAVE_VULKAN], [1], [Define if yhou have the Vulkan libs])
 fi
 AC_SUBST(VULKAN_LIBS)
+AC_SUBST(GLSLANGVALIDATOR, [$glslangvalidator])
 
 AM_CONDITIONAL(X11_VULKAN, test "x$HAVE_VULKAN" = "xyes")
diff --git a/include/QF/Vulkan/shader.h b/include/QF/Vulkan/shader.h
new file mode 100644
index 000000000..6b8321cdd
--- /dev/null
+++ b/include/QF/Vulkan/shader.h
@@ -0,0 +1,13 @@
+#ifndef __QF_Vulkan_shader_h
+#define __QF_Vulkan_shader_h
+
+struct qfv_device_s;
+struct vulkan_ctx_s;
+
+VkShaderModule QFV_CreateShaderModule (struct qfv_device_s *device,
+									   const char *path);
+void QFV_RegisterShaderModule (struct vulkan_ctx_s *ctx, const char *name,
+							   VkShaderModule module);
+void QFV_DeregisterShaderModule (struct vulkan_ctx_s *ctx, const char *name);
+
+#endif//__QF_Vulkan_shader_h
diff --git a/include/vid_vulkan.h b/include/vid_vulkan.h
index 1886730c6..5eb2dd157 100644
--- a/include/vid_vulkan.h
+++ b/include/vid_vulkan.h
@@ -44,6 +44,8 @@ typedef struct vulkan_ctx_s {
 	VkSampleCountFlagBits msaaSamples;	// FIXME not here?
 	struct hashlink_s *hashlinks;	//FIXME want per thread
 	VkSurfaceKHR surface;	//FIXME surface = window, so "contains" swapchain
+	struct hashtab_s *shadermodules;
+	struct shadermodule_s *shadermodule_freelist;
 
 	VkCommandPool cmdpool;
 	VkCommandBuffer cmdbuffer;
diff --git a/libs/video/renderer/Makemodule.am b/libs/video/renderer/Makemodule.am
index e2b71bf07..b5ca83cf5 100644
--- a/libs/video/renderer/Makemodule.am
+++ b/libs/video/renderer/Makemodule.am
@@ -78,7 +78,7 @@ V_SED_ = $(V_SED_@AM_DEFAULT_V@)
 V_SED_0 = @echo "  SED     " $@;
 V_SED_1 =
 
-SUFFICES=.frag .vert .fc .vc .slc .glsl .plist .plc
+SUFFICES=.frag .vert .spv .spvc .fc .vc .slc .glsl .plist .plc
 .glsl.slc:
 	$(V_SED)sed -e 's/^/"/' -e 's/$$/\\n"/' $< > $@.t &&\
 	$(am__mv) $@.t $@
@@ -224,6 +224,7 @@ libs_video_renderer_vid_render_vulkan_la_SOURCES = \
 	libs/video/renderer/vulkan/namehack.h \
 	libs/video/renderer/vulkan/pipeline.c \
 	libs/video/renderer/vulkan/renderpass.c \
+	libs/video/renderer/vulkan/shader.c \
 	libs/video/renderer/vulkan/swapchain.c \
 	libs/video/renderer/vulkan/util.c \
 	libs/video/renderer/vulkan/util.h \
@@ -233,29 +234,44 @@ libs_video_renderer_vid_render_vulkan_la_SOURCES = \
 
 libs/video/renderer/vulkan/vkparse.lo: libs/video/renderer/vulkan/vkparse.c $(vkparse_src)
 
-libs/video/renderer/vulkan/vulkan_vid_common.lo: libs/video/renderer/vulkan/vulkan_vid_common.c ${vkparse_src} $(pipeline_gen)
+libs/video/renderer/vulkan/shader.lo: libs/video/renderer/vulkan/shader.c $(vkshader_c)
+
+libs/video/renderer/vulkan/vulkan_vid_common.lo: libs/video/renderer/vulkan/vulkan_vid_common.c $(vkparse_src) $(pipeline_gen)
 
 
 qwaq_curses = ruamoko/qwaq/qwaq-curses$(EXEEXT)
 vkparse_cinc = libs/video/renderer/vulkan/vkparse.cinc
 vkparse_hinc = libs/video/renderer/vulkan/vkparse.hinc
 vkparse_src = \
-	${vkparse_cinc} \
-	${vkparse_hinc}
+	$(vkparse_cinc) \
+	$(vkparse_hinc)
 vkparse_plist = \
 	$(srcdir)/libs/video/renderer/vulkan/vkparse.plist
 
+passthrough_src = libs/video/renderer/vulkan/passthrough.vert
+passthrough_c = libs/video/renderer/vulkan/passthrough.vert.spvc
+pushcolor_src = libs/video/renderer/vulkan/pushcolor.frag
+pushcolor_c = libs/video/renderer/vulkan/pushcolor.frag.spvc
+
+$(passthrough_c): $(passthrough_src)
+
+$(pushcolor_c): $(pushcolor_src)
+
+vkshader_c = \
+	$(passthrough_c) \
+	$(pushcolor_c)
+
 V_VKGEN = $(V_VKGEN_@AM_V@)
 V_VKGEN_ = $(V_VKGEN_@AM_DEFAULT_V@)
 V_VKGEN_0 = @echo "  VKGEN   " $@;
 V_VKGEN_1 =
 
-${vkparse_cinc}: $(vkgen) $(qwaq_curses) $(vkparse_plist)
-	$(V_VKGEN)$(qwaq_curses) $(vkgen) -- $(vkparse_plist) ${vkparse_cinc}.t ${vkparse_hinc}.t &&\
-	$(am__mv) ${vkparse_cinc}.t ${vkparse_cinc} &&\
-	$(am__mv) ${vkparse_hinc}.t ${vkparse_hinc}
+$(vkparse_cinc): $(vkgen) $(qwaq_curses) $(vkparse_plist)
+	$(V_VKGEN)$(qwaq_curses) $(vkgen) -- $(vkparse_plist) $(vkparse_cinc).t $(vkparse_hinc).t &&\
+	$(am__mv) $(vkparse_cinc).t $(vkparse_cinc) &&\
+	$(am__mv) $(vkparse_hinc).t $(vkparse_hinc)
 
-${vkparse_hinc}: ${vkparse_cinc}
+$(vkparse_hinc): $(vkparse_cinc)
 # do nothing: hinc generated at the same time as cinc
 
 CLEANFILES += \
@@ -263,7 +279,15 @@ CLEANFILES += \
 	libs/video/renderer/glsl/*.fc \
 	libs/video/renderer/glsl/*.slc \
 	libs/video/renderer/vulkan/*.plc \
+	libs/video/renderer/vulkan/*.spv \
+	libs/video/renderer/vulkan/*.spvc \
 	libs/video/renderer/vulkan/vkgen.sym \
 	$(vkparse_src)
 
 BUILT_SOURCES += $(shader_gen)
+
+#shader_DATA += \
+#	libs/video/renderer/vulkan/passthrough.vert.spv \
+#	libs/video/renderer/vulkan/pushcolor.frag.spv
+
+EXTRA_DIST += $(shader_DATA:.spv=)
diff --git a/libs/video/renderer/vulkan/passthrough.vert b/libs/video/renderer/vulkan/passthrough.vert
new file mode 100644
index 000000000..0283a53b3
--- /dev/null
+++ b/libs/video/renderer/vulkan/passthrough.vert
@@ -0,0 +1,8 @@
+#version 450
+
+layout (location = 0) in vec4 app_position;
+
+void main()
+{
+	gl_Position = app_position;
+}
diff --git a/libs/video/renderer/vulkan/pushcolor.frag b/libs/video/renderer/vulkan/pushcolor.frag
new file mode 100644
index 000000000..d19413fe1
--- /dev/null
+++ b/libs/video/renderer/vulkan/pushcolor.frag
@@ -0,0 +1,12 @@
+#version 450
+
+layout (location = 0) out vec4 frag_color;
+
+layout (push_constant) uniform ColorBlock {
+	vec4 Color;
+} PushConstant;
+
+void main()
+{
+	frag_color = PushConstant.Color;
+}
diff --git a/libs/video/renderer/vulkan/shader.c b/libs/video/renderer/vulkan/shader.c
new file mode 100644
index 000000000..704e01996
--- /dev/null
+++ b/libs/video/renderer/vulkan/shader.c
@@ -0,0 +1,192 @@
+/*
+	shader.c
+
+	Vulkan shader manager
+
+	Copyright (C) 2020      Bill Currie <bill@taniwha.org>
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifdef HAVE_MATH_H
+# include <math.h>
+#endif
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+
+#include "QF/alloc.h"
+#include "QF/cvar.h"
+#include "QF/dstring.h"
+#include "QF/hash.h"
+#include "QF/quakefs.h"
+#include "QF/sys.h"
+#include "QF/Vulkan/qf_vid.h"
+#include "QF/Vulkan/device.h"
+#include "QF/Vulkan/image.h"
+#include "QF/Vulkan/instance.h"
+#include "QF/Vulkan/renderpass.h"
+#include "QF/Vulkan/shader.h"
+
+#include "vid_vulkan.h"
+
+static
+#include "libs/video/renderer/vulkan/passthrough.vert.spvc"
+static
+#include "libs/video/renderer/vulkan/pushcolor.frag.spvc"
+
+typedef struct shaderdata_s {
+	const char *name;
+	const uint32_t *data;
+	size_t      size;
+} shaderdata_t;
+
+typedef struct shadermodule_s {
+	char       *name;
+	union {
+		VkShaderModule module;
+		struct shadermodule_s *next;
+	};
+} shadermodule_t;
+
+static shaderdata_t builtin_shaders[] = {
+	{ "passthrough.vert", passthrough_vert, sizeof (passthrough_vert) },
+	{ "pushcolor.frag", pushcolor_frag, sizeof (pushcolor_frag) },
+	{}
+};
+
+#define BUILTIN "$builtin/"
+#define BUILTIN_SIZE (sizeof (BUILTIN) - 1)
+#define SHADER "$shader/"
+#define SHADER_SIZE (sizeof (SHADER) - 1)
+
+VkShaderModule
+QFV_CreateShaderModule (qfv_device_t *device, const char *shader_path)
+{
+	VkDevice    dev = device->dev;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	shaderdata_t _data = {};
+	shaderdata_t *data = 0;
+	dstring_t  *path = 0;
+	QFile      *file;
+	VkShaderModule shader = 0;
+
+	if (strncmp (shader_path, BUILTIN, BUILTIN_SIZE) == 0) {
+		const char *name = shader_path + BUILTIN_SIZE;
+
+		for (int i = 0; builtin_shaders[i].name; i++) {
+			if (strcmp (builtin_shaders[i].name, name) == 0) {
+				data = &builtin_shaders[i];
+				break;
+			}
+		}
+	} else if (strncmp (shader_path, SHADER, SHADER_SIZE)) {
+		path = dstring_new ();
+		dsprintf (path, "%s/%s", FS_SHADERPATH, shader_path + SHADER_SIZE);
+		file = Qopen (path->str, "rbz");
+	} else {
+		file = QFS_FOpenFile (shader_path);
+	}
+
+	if (file) {
+		_data.size = Qfilesize (file);
+		_data.data = malloc (_data.size);
+		Qread (file, (void *) _data.data, _data.size);
+		Qclose (file);
+		data = &_data;
+	}
+
+	if (data) {
+		VkShaderModuleCreateInfo createInfo = {
+			VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO, 0,
+			0, data->size, data->data
+		};
+
+		dfunc->vkCreateShaderModule (dev, &createInfo, 0, &shader);
+	} else {
+		Sys_MaskPrintf (SYS_VULKAN,
+						"QFV_CreateShaderModule: could not find shader %s\n",
+						shader_path);
+	}
+
+	if (path) {
+		dstring_delete (path);
+	}
+	if (_data.data) {
+		free ((void *) _data.data);
+	}
+	return shader;
+}
+
+static shadermodule_t *
+new_module (vulkan_ctx_t *ctx)
+{
+	shadermodule_t *shadermodule;
+	ALLOC (128, shadermodule_t, ctx->shadermodule, shadermodule);
+	return shadermodule;
+}
+
+static void
+del_module (shadermodule_t *shadermodule, vulkan_ctx_t *ctx)
+{
+	free (shadermodule->name);
+	FREE (ctx->shadermodule, shadermodule);
+}
+
+static const char *
+sm_getkey (const void *sm, void *unused)
+{
+	return ((shadermodule_t *) sm)->name;
+}
+
+static void
+sm_free (void *sm, void *ctx)
+{
+	del_module (sm, ctx);
+}
+
+void
+QFV_RegisterShaderModule (vulkan_ctx_t *ctx, const char *name,
+						  VkShaderModule module)
+{
+	if (!ctx->shadermodules) {
+		ctx->shadermodules = Hash_NewTable (127, sm_getkey, sm_free, ctx, 0);
+	}
+	shadermodule_t *shadermodule = new_module (ctx);
+	shadermodule->name = strdup (name);
+	shadermodule->module = module;
+	Hash_Add (ctx->shadermodules, shadermodule);
+}
+
+void
+QFV_DeregisterShaderModule (vulkan_ctx_t *ctx, const char *name)
+{
+	if (!ctx->shadermodules) {
+		return;
+	}
+	Hash_Free (ctx->shadermodules, Hash_Del (ctx->shadermodules, name));
+}

From e1e2a0e71263022def45eba305a312ba98fe6912 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 23 Dec 2020 21:52:42 +0900
Subject: [PATCH 1213/1519] [ruamoko] Add a wrapper for PL_Line

Makes error reporting in rua code easier.
---
 libs/ruamoko/rua_plist.c       | 10 ++++++++++
 ruamoko/include/PropertyList.h |  1 +
 ruamoko/include/plist.h        |  1 +
 ruamoko/lib/PropertyList.r     |  5 +++++
 ruamoko/lib/plist.r            |  1 +
 5 files changed, 18 insertions(+)

diff --git a/libs/ruamoko/rua_plist.c b/libs/ruamoko/rua_plist.c
index b71af2ead..d45ee1b8d 100644
--- a/libs/ruamoko/rua_plist.c
+++ b/libs/ruamoko/rua_plist.c
@@ -229,6 +229,15 @@ bi_PL_Type (progs_t *pr)
 	R_INT (pr) = PL_Type (plist->plitem);
 }
 
+static void
+bi_PL_Line (progs_t *pr)
+{
+	int         handle = P_INT (pr, 0);
+	bi_plist_t *plist = get_plist (pr, __FUNCTION__, handle);
+
+	R_INT (pr) = PL_Line (plist->plitem);
+}
+
 static void
 bi_PL_String (progs_t *pr)
 {
@@ -432,6 +441,7 @@ static builtin_t builtins[] = {
 	{"PL_GetPropertyList",			bi_PL_GetPropertyList,			-1},
 	{"PL_WritePropertyList",		bi_PL_WritePropertyList,		-1},
 	{"PL_Type",						bi_PL_Type,						-1},
+	{"PL_Line",						bi_PL_Line,						-1},
 	{"PL_String",					bi_PL_String,					-1},
 	{"PL_ObjectForKey",				bi_PL_ObjectForKey,				-1},
 	{"PL_RemoveObjectForKey",		bi_PL_RemoveObjectForKey,		-1},
diff --git a/ruamoko/include/PropertyList.h b/ruamoko/include/PropertyList.h
index c0c4bed35..d2494a94a 100644
--- a/ruamoko/include/PropertyList.h
+++ b/ruamoko/include/PropertyList.h
@@ -42,6 +42,7 @@
 - initWithOwnItem:(plitem_t) item;
 - (string) write;
 - (pltype_t) type;
+- (int) line;
 @end
 
 @interface PLDictionary: PLItem <PLDictionary>
diff --git a/ruamoko/include/plist.h b/ruamoko/include/plist.h
index 4544e00ff..bfaa25516 100644
--- a/ruamoko/include/plist.h
+++ b/ruamoko/include/plist.h
@@ -10,6 +10,7 @@ typedef enum {QFDictionary, QFArray, QFBinary, QFString} pltype_t;	// possible t
 @extern plitem_t PL_GetPropertyList (string str);
 @extern string PL_WritePropertyList (plitem_t pl);
 @extern pltype_t PL_Type (plitem_t str);
+@extern int PL_Line (plitem_t str);
 @extern string PL_String (plitem_t str);
 @extern plitem_t PL_ObjectForKey (plitem_t item, string key);
 @extern plitem_t PL_RemoveObjectForKey (plitem_t item, string key);
diff --git a/ruamoko/lib/PropertyList.r b/ruamoko/lib/PropertyList.r
index b8469e473..c6df13070 100644
--- a/ruamoko/lib/PropertyList.r
+++ b/ruamoko/lib/PropertyList.r
@@ -94,6 +94,11 @@
 	return PL_Type (item);
 }
 
+- (int) line
+{
+	return PL_Line (item);
+}
+
 - (int) count
 {
 	if ([self class] == [PLDictionary class]) {
diff --git a/ruamoko/lib/plist.r b/ruamoko/lib/plist.r
index 40ab2e1fc..34f0ce6c1 100644
--- a/ruamoko/lib/plist.r
+++ b/ruamoko/lib/plist.r
@@ -4,6 +4,7 @@ plitem_t PL_GetFromFile (QFile file) = #0;
 plitem_t PL_GetPropertyList (string str) = #0;
 string PL_WritePropertyList (plitem_t pl) = #0;
 pltype_t PL_Type (plitem_t str) = #0;
+int PL_Line (plitem_t str) = #0;
 string PL_String (plitem_t str) = #0;
 plitem_t PL_ObjectForKey (plitem_t item, string key) = #0;
 plitem_t PL_RemoveObjectForKey (plitem_t item, string key) = #0;

From 017d2c1f4453daa7802e031958fab96a9ef7316d Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 23 Dec 2020 22:13:50 +0900
Subject: [PATCH 1214/1519] [vulkan] Refactor vkgen struct generation

The addition of data an then string support made keeping track of things
in struct's writeTable a nightmare.
---
 .../video/renderer/vulkan/vkgen/Makemodule.am |   6 +
 libs/video/renderer/vulkan/vkgen/vkenum.h     |   2 +-
 libs/video/renderer/vulkan/vkgen/vkenum.r     |   2 +-
 .../renderer/vulkan/vkgen/vkfieldarray.h      |  12 +
 .../renderer/vulkan/vkgen/vkfieldarray.r      |  52 ++++
 .../video/renderer/vulkan/vkgen/vkfieldauto.h |   9 +
 .../video/renderer/vulkan/vkgen/vkfieldauto.r |  43 ++++
 .../video/renderer/vulkan/vkgen/vkfielddata.h |   9 +
 .../video/renderer/vulkan/vkgen/vkfielddata.r |  45 ++++
 libs/video/renderer/vulkan/vkgen/vkfielddef.h |  28 +++
 libs/video/renderer/vulkan/vkgen/vkfielddef.r |  95 ++++++++
 .../renderer/vulkan/vkgen/vkfieldsingle.h     |  12 +
 .../renderer/vulkan/vkgen/vkfieldsingle.r     |  46 ++++
 .../renderer/vulkan/vkgen/vkfieldstring.h     |   9 +
 .../renderer/vulkan/vkgen/vkfieldstring.r     |  36 +++
 libs/video/renderer/vulkan/vkgen/vkgen.h      |   1 +
 libs/video/renderer/vulkan/vkgen/vkgen.r      |   9 +-
 libs/video/renderer/vulkan/vkgen/vkstruct.h   |   7 +-
 libs/video/renderer/vulkan/vkgen/vkstruct.r   | 229 +++++-------------
 libs/video/renderer/vulkan/vkparse.c          |  24 +-
 20 files changed, 499 insertions(+), 177 deletions(-)
 create mode 100644 libs/video/renderer/vulkan/vkgen/vkfieldarray.h
 create mode 100644 libs/video/renderer/vulkan/vkgen/vkfieldarray.r
 create mode 100644 libs/video/renderer/vulkan/vkgen/vkfieldauto.h
 create mode 100644 libs/video/renderer/vulkan/vkgen/vkfieldauto.r
 create mode 100644 libs/video/renderer/vulkan/vkgen/vkfielddata.h
 create mode 100644 libs/video/renderer/vulkan/vkgen/vkfielddata.r
 create mode 100644 libs/video/renderer/vulkan/vkgen/vkfielddef.h
 create mode 100644 libs/video/renderer/vulkan/vkgen/vkfielddef.r
 create mode 100644 libs/video/renderer/vulkan/vkgen/vkfieldsingle.h
 create mode 100644 libs/video/renderer/vulkan/vkgen/vkfieldsingle.r
 create mode 100644 libs/video/renderer/vulkan/vkgen/vkfieldstring.h
 create mode 100644 libs/video/renderer/vulkan/vkgen/vkfieldstring.r

diff --git a/libs/video/renderer/vulkan/vkgen/Makemodule.am b/libs/video/renderer/vulkan/vkgen/Makemodule.am
index 66971a2c3..31c22d936 100644
--- a/libs/video/renderer/vulkan/vkgen/Makemodule.am
+++ b/libs/video/renderer/vulkan/vkgen/Makemodule.am
@@ -4,6 +4,12 @@ noinst_PROGRAMS += $(vkgen)
 vkgen_dat_src= \
 	libs/video/renderer/vulkan/vkgen/vkalias.r \
 	libs/video/renderer/vulkan/vkgen/vkenum.r \
+	libs/video/renderer/vulkan/vkgen/vkfieldarray.r \
+	libs/video/renderer/vulkan/vkgen/vkfieldauto.r \
+	libs/video/renderer/vulkan/vkgen/vkfielddata.r \
+	libs/video/renderer/vulkan/vkgen/vkfielddef.r \
+	libs/video/renderer/vulkan/vkgen/vkfieldsingle.r \
+	libs/video/renderer/vulkan/vkgen/vkfieldstring.r \
 	libs/video/renderer/vulkan/vkgen/vkgen.r \
 	libs/video/renderer/vulkan/vkgen/vkstruct.r \
 	libs/video/renderer/vulkan/vkgen/vktype.r \
diff --git a/libs/video/renderer/vulkan/vkgen/vkenum.h b/libs/video/renderer/vulkan/vkgen/vkenum.h
index 6694c24cb..4df770b92 100644
--- a/libs/video/renderer/vulkan/vkgen/vkenum.h
+++ b/libs/video/renderer/vulkan/vkgen/vkenum.h
@@ -10,7 +10,7 @@
 	int          prefix_length;
 }
 -(void) writeTable;
--(void) writeSymtabInit:(PLItem *) parse;
+-(void) writeSymtabInit;
 @end
 
 #endif//__renderer_vulkan_vkgen_vkenum_h
diff --git a/libs/video/renderer/vulkan/vkgen/vkenum.r b/libs/video/renderer/vulkan/vkgen/vkenum.r
index e3894902a..234c99b61 100644
--- a/libs/video/renderer/vulkan/vkgen/vkenum.r
+++ b/libs/video/renderer/vulkan/vkgen/vkenum.r
@@ -123,7 +123,7 @@ skip_value(string name)
 	fprintf (header_file, "extern exprenum_t %s_enum;\n", [self name]);
 }
 
--(void) writeSymtabInit:(PLItem *) parse
+-(void) writeSymtabInit
 {
 	fprintf (output_file, "\tcexpr_init_symtab (&%s_symtab, context);\n",
 			 [self name]);
diff --git a/libs/video/renderer/vulkan/vkgen/vkfieldarray.h b/libs/video/renderer/vulkan/vkgen/vkfieldarray.h
new file mode 100644
index 000000000..5cf31880b
--- /dev/null
+++ b/libs/video/renderer/vulkan/vkgen/vkfieldarray.h
@@ -0,0 +1,12 @@
+#ifndef __renderer_vulkan_vkgen_vkfieldarray_h
+#define __renderer_vulkan_vkgen_vkfieldarray_h
+
+#include "vkfielddef.h"
+
+@interface ArrayField: FieldDef
+{
+	string type;
+}
+@end
+
+#endif//__renderer_vulkan_vkgen_vkfieldarray_h
diff --git a/libs/video/renderer/vulkan/vkgen/vkfieldarray.r b/libs/video/renderer/vulkan/vkgen/vkfieldarray.r
new file mode 100644
index 000000000..dd81dd9f4
--- /dev/null
+++ b/libs/video/renderer/vulkan/vkgen/vkfieldarray.r
@@ -0,0 +1,52 @@
+#include <PropertyList.h>
+
+#include "vkfieldarray.h"
+#include "vkgen.h"
+#include "vktype.h"
+
+@implementation ArrayField
+
+-init:(PLItem *) item struct:(Struct *)strct field:(string)fname
+{
+	self = [super init:item struct:strct field:fname];
+	if (!self) {
+		return self;
+	}
+
+	PLItem     *desc = [item getObjectForKey:"type"];
+	type = [[desc getObjectAtIndex:1] string];
+
+	value_field = [[item getObjectForKey:"values"] string];
+	size_field = [[item getObjectForKey:"size"] string];
+	return self;
+}
+
+-writeParseData
+{
+	Type       *field_type = [[Type lookup: type] dereference];
+
+	fprintf (output_file, "static parse_array_t parse_%s_%s_data = {\n",
+			 struct_name, field_name);
+	fprintf (output_file, "\t%s,\n", [field_type parseType]);
+	fprintf (output_file, "\tsizeof (%s),\n", type);
+	fprintf (output_file, "\tparse_%s,\n", type);
+	fprintf (output_file, "\tfield_offset (%s, %s),\n",
+			 struct_name, value_field);
+	if (size_field) {
+		fprintf (output_file, "\tfield_offset (%s, %s),\n",
+				 struct_name, size_field);
+	} else {
+		fprintf (output_file, "\t-1,\n");
+	}
+	fprintf (output_file, "};\n");
+	return self;
+}
+
+-writeField
+{
+	fprintf (output_file, "\t{\"%s\", 0, %s, parse_%s, &parse_%s_%s_data},\n",
+			 field_name, "QFArray", "array", struct_name, field_name);
+	return self;
+}
+
+@end
diff --git a/libs/video/renderer/vulkan/vkgen/vkfieldauto.h b/libs/video/renderer/vulkan/vkgen/vkfieldauto.h
new file mode 100644
index 000000000..a2e05deb8
--- /dev/null
+++ b/libs/video/renderer/vulkan/vkgen/vkfieldauto.h
@@ -0,0 +1,9 @@
+#ifndef __renderer_vulkan_vkgen_vkfieldauto_h
+#define __renderer_vulkan_vkgen_vkfieldauto_h
+
+#include "vkfielddef.h"
+
+@interface AutoField: FieldDef
+@end
+
+#endif//__renderer_vulkan_vkgen_vkfieldauto_h
diff --git a/libs/video/renderer/vulkan/vkgen/vkfieldauto.r b/libs/video/renderer/vulkan/vkgen/vkfieldauto.r
new file mode 100644
index 000000000..dab844c92
--- /dev/null
+++ b/libs/video/renderer/vulkan/vkgen/vkfieldauto.r
@@ -0,0 +1,43 @@
+#include "vkfieldauto.h"
+#include "vkgen.h"
+#include "vkstruct.h"
+
+@implementation AutoField
+
+-init:(PLItem *) item struct:(Struct *)strct field:(string)fname
+{
+	self = [super init:item struct:strct field:fname];
+	if (!self) {
+		return self;
+	}
+	field = [strct findField:field_name];
+
+	return self;
+}
+
+-writeParseData
+{
+	printf("FieldDef: '%s' '%s'\n", struct_name, field_name);
+	return self;
+}
+
+-writeField
+{
+	Type       *field_type = [Type findType: field.type];
+	fprintf (output_file, "\t{\"%s\", field_offset (%s, %s), %s, %s, %s},\n",
+			 field_name, struct_name, field_name,
+			 [field_type parseType], [field_type parseFunc],
+			 [field_type parseData]);
+	return self;
+}
+
+-writeSymbol
+{
+	Type       *field_type = [Type findType: field.type];
+	fprintf (output_file,
+			 "\t{\"%s\", &%s, (void *) field_offset (%s, %s)},\n",
+			 field_name, [field_type cexprType], struct_name, field_name);
+	return self;
+}
+
+@end
diff --git a/libs/video/renderer/vulkan/vkgen/vkfielddata.h b/libs/video/renderer/vulkan/vkgen/vkfielddata.h
new file mode 100644
index 000000000..cf8356262
--- /dev/null
+++ b/libs/video/renderer/vulkan/vkgen/vkfielddata.h
@@ -0,0 +1,9 @@
+#ifndef __renderer_vulkan_vkgen_vkfielddata_h
+#define __renderer_vulkan_vkgen_vkfielddata_h
+
+#include "vkfielddef.h"
+
+@interface DataField: FieldDef
+@end
+
+#endif//__renderer_vulkan_vkgen_vkfielddata_h
diff --git a/libs/video/renderer/vulkan/vkgen/vkfielddata.r b/libs/video/renderer/vulkan/vkgen/vkfielddata.r
new file mode 100644
index 000000000..d13ff8965
--- /dev/null
+++ b/libs/video/renderer/vulkan/vkgen/vkfielddata.r
@@ -0,0 +1,45 @@
+#include <PropertyList.h>
+
+#include "vkfielddata.h"
+#include "vkgen.h"
+#include "vkstruct.h"
+#include "vktype.h"
+
+@implementation DataField
+
+-init:(PLItem *) item struct:(Struct *)strct field:(string)fname
+{
+	self = [super init:item struct:strct field:fname];
+	if (!self) {
+		return self;
+	}
+
+	value_field = [[item getObjectForKey:"data"] string];
+	size_field = [[item getObjectForKey:"size"] string];
+	return self;
+}
+
+-writeParseData
+{
+	fprintf (output_file, "static parse_data_t parse_%s_%s_data = {\n",
+			 struct_name, field_name);
+	fprintf (output_file, "\tfield_offset (%s, %s),\n",
+			 struct_name, value_field);
+	if (size_field) {
+		fprintf (output_file, "\tfield_offset (%s, %s),\n",
+				 struct_name, size_field);
+	} else {
+		fprintf (output_file, "\tt-1,\n");
+	}
+	fprintf (output_file, "};\n");
+	return self;
+}
+
+-writeField
+{
+	fprintf (output_file, "\t{\"%s\", 0, %s, parse_%s, &parse_%s_%s_data},\n",
+			 field_name, "QFBinary", "data", struct_name, field_name);
+	return self;
+}
+
+@end
diff --git a/libs/video/renderer/vulkan/vkgen/vkfielddef.h b/libs/video/renderer/vulkan/vkgen/vkfielddef.h
new file mode 100644
index 000000000..0363a9e7f
--- /dev/null
+++ b/libs/video/renderer/vulkan/vkgen/vkfielddef.h
@@ -0,0 +1,28 @@
+#ifndef __renderer_vulkan_vkgen_vkfielddef_h
+#define __renderer_vulkan_vkgen_vkfielddef_h
+
+#include <types.h>
+#include <Object.h>
+
+@class PLItem;
+@class Struct;
+@class Type;
+
+@interface FieldDef: Object
+{
+	int line;
+	qfot_var_t *field;
+	string struct_name;
+	string field_name;
+	string value_field;
+	string size_field;
+}
++fielddef:(PLItem *)item struct:(Struct *)strct field:(string)fname;
+-init:(PLItem *)item struct:(Struct *)strct field:(string)fname;
+-writeParseData;
+-writeField;
+-writeSymbol;
+-(string) name;
+@end
+
+#endif//__renderer_vulkan_vkgen_vkfielddef_h
diff --git a/libs/video/renderer/vulkan/vkgen/vkfielddef.r b/libs/video/renderer/vulkan/vkgen/vkfielddef.r
new file mode 100644
index 000000000..9cc35c13a
--- /dev/null
+++ b/libs/video/renderer/vulkan/vkgen/vkfielddef.r
@@ -0,0 +1,95 @@
+#include <string.h>
+#include <PropertyList.h>
+
+#include "vkfieldarray.h"
+#include "vkfieldauto.h"
+#include "vkfielddata.h"
+#include "vkfielddef.h"
+#include "vkfieldsingle.h"
+#include "vkfieldstring.h"
+#include "vkstruct.h"
+
+@implementation FieldDef
+
++fielddef:(PLItem *)item struct:(Struct *)strct field:(string)fname
+{
+	string      record = [item string];
+	PLItem     *type_desc = [item getObjectForKey:"type"];
+
+	if (!item) {
+		record = "auto";
+	}
+	if (!record) {
+		if (item && !type_desc) {
+			return nil;
+		}
+		record = [type_desc string];
+		if (!record) {
+			record = [[type_desc getObjectAtIndex:0] string];
+		}
+	}
+	switch (record) {
+		case "auto":
+			return [[[AutoField alloc] init:item struct:strct field:fname] autorelease];
+		case "string":
+			return [[[StringField alloc] init:item struct:strct field:fname] autorelease];
+		case "data":
+			return [[[DataField alloc] init:item struct:strct field:fname] autorelease];
+		case "single":
+			return [[[SingleField alloc] init:item struct:strct field:fname] autorelease];
+		case "array":
+			return [[[ArrayField alloc] init:item struct:strct field:fname] autorelease];
+	}
+	return nil;
+}
+
+-init:(PLItem *)item struct:(Struct *)strct field:(string)fname
+{
+	self = [super init];
+	if (!self) {
+		return self;
+	}
+
+	line = [item line];
+	struct_name = str_hold ([strct outname]);
+	field_name = str_hold (fname);
+	return self;
+}
+
+-fromField:(qfot_var_t *)field struct:(Struct *)strct
+{
+	return self;
+}
+
+-(void)dealloc
+{
+	str_free (struct_name);
+	str_free (field_name);
+}
+
+-writeParseData
+{
+	fprintf (output_file, "undefined record type parse: %d\n", line);
+	return self;
+}
+
+-writeField
+{
+	fprintf (output_file, "undefined record type field: %d\n", line);
+	return self;
+}
+
+-writeSymbol
+{
+	fprintf (output_file,
+			 "\t{\"%s\", 0/*FIXME*/, (void *) field_offset (%s, %s)},\n",
+			 field_name, struct_name, value_field);
+	return self;
+}
+
+-(string) name
+{
+	return field_name;
+}
+
+@end
diff --git a/libs/video/renderer/vulkan/vkgen/vkfieldsingle.h b/libs/video/renderer/vulkan/vkgen/vkfieldsingle.h
new file mode 100644
index 000000000..2fcd312c4
--- /dev/null
+++ b/libs/video/renderer/vulkan/vkgen/vkfieldsingle.h
@@ -0,0 +1,12 @@
+#ifndef __renderer_vulkan_vkgen_vkfieldsingle_h
+#define __renderer_vulkan_vkgen_vkfieldsingle_h
+
+#include "vkfielddef.h"
+
+@interface SingleField: FieldDef
+{
+	string type;
+}
+@end
+
+#endif//__renderer_vulkan_vkgen_vkfieldsingle_h
diff --git a/libs/video/renderer/vulkan/vkgen/vkfieldsingle.r b/libs/video/renderer/vulkan/vkgen/vkfieldsingle.r
new file mode 100644
index 000000000..e30ced3dd
--- /dev/null
+++ b/libs/video/renderer/vulkan/vkgen/vkfieldsingle.r
@@ -0,0 +1,46 @@
+#include <PropertyList.h>
+
+#include "vkfieldsingle.h"
+#include "vkgen.h"
+#include "vktype.h"
+
+@implementation SingleField
+
+-init:(PLItem *) item struct:(Struct *)strct field:(string)fname
+{
+	self = [super init:item struct:strct field:fname];
+	if (!self) {
+		return self;
+	}
+
+	PLItem     *desc = [item getObjectForKey:"type"];
+	type = [[desc getObjectAtIndex:1] string];
+
+	value_field = [[item getObjectForKey:"value"] string];
+	return self;
+}
+
+-writeParseData
+{
+	Type       *field_type = [[Type lookup: type] dereference];
+
+	fprintf (output_file, "static parse_single_t parse_%s_%s_data = {\n",
+			 struct_name, field_name);
+	fprintf (output_file, "\t%s,\n", [field_type parseType]);
+	fprintf (output_file, "\tsizeof (%s),\n", type);
+	fprintf (output_file, "\tparse_%s,\n", type);
+	fprintf (output_file, "\tfield_offset (%s, %s),\n",
+			 struct_name, value_field);
+	fprintf (output_file, "};\n");
+	return self;
+}
+
+-writeField
+{
+	string      parse_type = [[[Type lookup: type] dereference] parseType];
+	fprintf (output_file, "\t{\"%s\", 0, %s, parse_%s, &parse_%s_%s_data},\n",
+			 field_name, parse_type, "single", struct_name, field_name);
+	return self;
+}
+
+@end
diff --git a/libs/video/renderer/vulkan/vkgen/vkfieldstring.h b/libs/video/renderer/vulkan/vkgen/vkfieldstring.h
new file mode 100644
index 000000000..fead71504
--- /dev/null
+++ b/libs/video/renderer/vulkan/vkgen/vkfieldstring.h
@@ -0,0 +1,9 @@
+#ifndef __renderer_vulkan_vkgen_vkfieldstring_h
+#define __renderer_vulkan_vkgen_vkfieldstring_h
+
+#include "vkfielddef.h"
+
+@interface StringField: FieldDef
+@end
+
+#endif//__renderer_vulkan_vkgen_vkfieldstring_h
diff --git a/libs/video/renderer/vulkan/vkgen/vkfieldstring.r b/libs/video/renderer/vulkan/vkgen/vkfieldstring.r
new file mode 100644
index 000000000..ff0ba525d
--- /dev/null
+++ b/libs/video/renderer/vulkan/vkgen/vkfieldstring.r
@@ -0,0 +1,36 @@
+#include <PropertyList.h>
+
+#include "vkfieldstring.h"
+#include "vkgen.h"
+
+@implementation StringField
+
+-init:(PLItem *) item struct:(Struct *)strct field:(string)fname
+{
+	self = [super init:item struct:strct field:fname];
+	if (!self) {
+		return self;
+	}
+
+	value_field = [[item getObjectForKey:"string"] string];
+	return self;
+}
+
+-writeParseData
+{
+	fprintf (output_file, "static parse_string_t parse_%s_%s_data = {\n",
+			 struct_name, field_name);
+	fprintf (output_file, "\tfield_offset (%s, %s),\n",
+			 struct_name, value_field);
+	fprintf (output_file, "};\n");
+	return self;
+}
+
+-writeField
+{
+	fprintf (output_file, "\t{\"%s\", 0, %s, parse_%s, &parse_%s_%s_data},\n",
+			 field_name, "QFString", "string", struct_name, field_name);
+	return self;
+}
+
+@end
diff --git a/libs/video/renderer/vulkan/vkgen/vkgen.h b/libs/video/renderer/vulkan/vkgen/vkgen.h
index e60499f25..8f9cd5c93 100644
--- a/libs/video/renderer/vulkan/vkgen/vkgen.h
+++ b/libs/video/renderer/vulkan/vkgen/vkgen.h
@@ -12,6 +12,7 @@ void printf (string fmt, ...);
 void fprintf (QFile file, string format, ...);
 extern Array *queue;
 extern Array *output_types;
+extern PLItem *parse;
 extern QFile output_file;
 extern QFile header_file;
 extern hashtab_t *processed_types;
diff --git a/libs/video/renderer/vulkan/vkgen/vkgen.r b/libs/video/renderer/vulkan/vkgen/vkgen.r
index 025e3d2cc..7a1edab8a 100644
--- a/libs/video/renderer/vulkan/vkgen/vkgen.r
+++ b/libs/video/renderer/vulkan/vkgen/vkgen.r
@@ -37,6 +37,7 @@ hashtab_t *processed_types;
 Array *queue;
 Array *output_types;
 
+PLItem *parse;
 QFile output_file;
 QFile header_file;
 
@@ -147,7 +148,6 @@ main(int argc, string *argv)
 	QFile       plist_file;
 	PLItem     *plist;
 	PLItem     *search;
-	PLItem     *parse;
 
 	arp_start ();
 
@@ -199,6 +199,9 @@ main(int argc, string *argv)
 		id obj = [queue objectAtIndex:0];
 		[queue removeObjectAtIndex:0];
 		if ([obj class] == [Struct class]) {
+			if ([[parse getObjectForKey:[obj name]] string] == "skip") {
+				continue;
+			}
 			[obj forEachFieldCall:struct_func];
 		}
 		[output_types addObject:obj];
@@ -235,7 +238,7 @@ main(int argc, string *argv)
 		}
 
 		arp_start ();
-		[obj writeTable:parse];
+		[obj writeTable];
 		arp_end ();
 	}
 	fprintf (output_file, "static void\n");
@@ -247,7 +250,7 @@ main(int argc, string *argv)
 			continue;
 		}
 		arp_start ();
-		[obj writeSymtabInit:parse];
+		[obj writeSymtabInit];
 		arp_end ();
 	}
 	fprintf (output_file, "}\n");
diff --git a/libs/video/renderer/vulkan/vkgen/vkstruct.h b/libs/video/renderer/vulkan/vkgen/vkstruct.h
index c251cb4c0..048b3332f 100644
--- a/libs/video/renderer/vulkan/vkgen/vkstruct.h
+++ b/libs/video/renderer/vulkan/vkgen/vkstruct.h
@@ -10,10 +10,13 @@
 
 @interface Struct: Type
 {
+	string outname;
 }
 -(void) forEachFieldCall: (varfunc) func;
--(void) writeTable: (PLItem *) parse;
--(void) writeSymtabInit:(PLItem *) parse;
+-(qfot_var_t *)findField:(string) fieldName;
+-(void) writeTable;
+-(void) writeSymtabInit;
+-(string) outname;
 @end
 
 #endif//__renderer_vulkan_vkgen_vkstruct_h
diff --git a/libs/video/renderer/vulkan/vkgen/vkstruct.r b/libs/video/renderer/vulkan/vkgen/vkstruct.r
index 6e6908bb8..6a8b21caa 100644
--- a/libs/video/renderer/vulkan/vkgen/vkstruct.r
+++ b/libs/video/renderer/vulkan/vkgen/vkstruct.r
@@ -6,6 +6,7 @@
 #include <Array.h>
 #include <PropertyList.h>
 
+#include "vkfielddef.h"
 #include "vkgen.h"
 #include "vkstruct.h"
 
@@ -46,122 +47,33 @@
 	return nil;
 }
 
--(void) writeTable: (PLItem *) parse
+-(void) writeTable
 {
-	string      name = [self name];
-	PLItem     *field_dict = [parse getObjectForKey:name];
-	PLItem     *field_defs = [field_dict allKeys];
-	Type       *field_type;
+	PLItem     *field_dict = [parse getObjectForKey:[self name]];
 	PLItem     *new_name = [field_dict getObjectForKey:".name"];
+	Array      *field_defs = [Array array];
 
+	if ([parse string] == "skip") {
+		return;
+	}
 	if (new_name) {
-		name = [new_name string];
+		outname = str_hold ([new_name string]);
 	}
 
-	if (field_defs) {
-		PLItem     *field_def;
-		qfot_var_t *field;
+	if (field_dict) {
+		PLItem     *field_keys = [field_dict allKeys];
 
-		for (int i = [field_defs count]; i-- > 0; ) {
-			string field_name = [[field_defs  getObjectAtIndex:i] string];
-			field_def = [field_dict getObjectForKey:field_name];
-			PLItem     *type_desc = [field_def getObjectForKey:"type"];
-			string      type_record;
-			string      type_type;
-			string      size_field = nil;
-			string      value_field = nil;
+		for (int i = [field_keys count]; i-- > 0; ) {
+			string      field_name = [[field_keys getObjectAtIndex:i] string];
 
-			if (!type_desc || str_mid(field_name, 0, 1) == ".") {
-				continue;
-			}
-			type_record = [[type_desc getObjectAtIndex:0] string];
-			type_type = [[type_desc getObjectAtIndex:1] string];
-
-			field_type = [[Type lookup: type_type] dereference];
-			fprintf (output_file, "static parse_%s_t parse_%s_%s_data = {\n",
-					 type_record, name, field_name);
-			if (type_record == "single") {
-				fprintf (output_file, "\t%s,\n", [field_type parseType]);
-				fprintf (output_file, "\tsizeof (%s),\n", type_type);
-				fprintf (output_file, "\tparse_%s,\n", type_type);
-				value_field = [[field_def getObjectForKey:"value"] string];
-				fprintf (output_file, "\tfield_offset (%s, %s),\n",
-						 name, value_field);
-			} else if (type_record == "array") {
-				fprintf (output_file, "\t%s,\n", [field_type parseType]);
-				fprintf (output_file, "\tsizeof (%s),\n", type_type);
-				fprintf (output_file, "\tparse_%s,\n", type_type);
-				value_field = [[field_def getObjectForKey:"values"] string];
-				size_field = [[field_def getObjectForKey:"size"] string];
-				fprintf (output_file, "\tfield_offset (%s, %s),\n",
-						 name, value_field);
-				if (size_field) {
-					fprintf (output_file, "\tfield_offset (%s, %s),\n",
-							 name, size_field);
-				} else {
-					fprintf (output_file, "\t-1,\n");
-				}
-			} else if (type_record == "data") {
-				value_field = [[field_def getObjectForKey:"data"] string];
-				size_field = [[field_def getObjectForKey:"size"] string];
-				fprintf (output_file, "\tfield_offset (%s, %s),\n",
-						 name, value_field);
-				if (size_field) {
-					fprintf (output_file, "\tfield_offset (%s, %s),\n",
-							 name, size_field);
-				} else {
-					fprintf (output_file, "\t-1,\n");
-				}
-			} else {
-				fprintf (output_file, "\tno type,\n");
-			}
-			fprintf (output_file, "};\n");
-		}
-	}
-	fprintf (output_file, "static plfield_t %s_fields[] = {\n", name);
-	if (field_defs) {
-		PLItem     *field_def;
-		qfot_var_t *field;
-
-		for (int i = [field_defs count]; i-- > 0; ) {
-			string field_name = [[field_defs  getObjectAtIndex:i] string];
 			if (str_mid(field_name, 0, 1) == ".") {
 				continue;
 			}
-			field_def = [field_dict getObjectForKey:field_name];
-			if ([field_def string] == "auto") {
-				field = [self findField:field_name];
-				if (!field) {
-					continue;
-				}
-				field_type = [Type findType: field.type];
-				fprintf (output_file,
-						 "\t{\"%s\", field_offset (%s, %s), %s, %s, %s},\n",
-						 field_name, name, field_name,
-						 [field_type parseType], [field_type parseFunc],
-						 [field_type parseData]);
-			} else {
-				PLItem     *type_desc = [field_def getObjectForKey:"type"];
-				string      type_record;
-				string      type_type;
-				string      parseType = "no type";
-
-				type_record = [[type_desc getObjectAtIndex:0] string];
-				type_type = [[type_desc getObjectAtIndex:1] string];
-
-				field_type = [[Type lookup: type_type] dereference];
-				if (type_record == "single") {
-					parseType = [field_type parseType];
-				} else if (type_record == "array") {
-					parseType = "QFArray";
-				} else if (type_record == "data") {
-					parseType = "QFBinary";
-				}
-				fprintf (output_file,
-						 "\t{\"%s\", 0, %s, parse_%s, &parse_%s_%s_data},\n",
-						 field_name, parseType, type_record,
-						 name, field_name);
-			}
+			PLItem     *field_item = [field_dict getObjectForKey:field_name];
+			FieldDef   *field_def = [FieldDef fielddef:field_item
+												struct:self
+												 field:field_name];
+			[field_defs addObject: field_def];
 		}
 	} else {
 		for (int i = 0; i < type.strct.num_fields; i++) {
@@ -169,76 +81,47 @@
 			if (field.name == "sType" || field.name == "pNext") {
 				continue;
 			}
-			field_type = [Type findType: field.type];
-			fprintf (output_file,
-					 "\t{\"%s\", field_offset (%s, %s), %s, %s, %s},\n",
-					 field.name, name, field.name,
-					 [field_type parseType], [field_type parseFunc],
-					 [field_type parseData]);
+			FieldDef   *field_def = [FieldDef fielddef:nil
+												struct:self
+												 field:field.name];
+			[field_defs addObject: field_def];
 		}
 	}
+	for (int i = [field_defs count]; i-- > 0; ) {
+		FieldDef   *field_def = [field_defs objectAtIndex:i];
+		[field_def writeParseData];
+	}
+	fprintf (output_file, "static plfield_t %s_fields[] = {\n", [self outname]);
+	for (int i = [field_defs count]; i-- > 0; ) {
+		FieldDef   *field_def = [field_defs objectAtIndex:i];
+		[field_def writeField];
+	}
 	fprintf (output_file, "\t{ }\n");
 	fprintf (output_file, "};\n");
 
 	fprintf (header_file, "int parse_%s (const plfield_t *field,"
 			 " const plitem_t *item, void *data, plitem_t *messages,"
 			 " void *context);\n",
-			 name);
+			 [self outname]);
 	fprintf (output_file, "int parse_%s (const plfield_t *field,"
 			 " const plitem_t *item, void *data, plitem_t *messages,"
 			 " void *context)\n",
-			 name);
+			 [self outname]);
 	fprintf (output_file, "{\n");
 	fprintf (output_file,
 			 "\treturn PL_ParseDictionary (%s_fields, item, data, messages,"
 			 " context);\n",
-			 name);
+			 [self outname]);
 	fprintf (output_file, "}\n");
 
-	fprintf (output_file, "static exprsym_t %s_symbols[] = {\n", name);
+	fprintf (output_file, "static exprsym_t %s_symbols[] = {\n", [self outname]);
 	if (field_defs) {
 		PLItem     *field_def;
 		qfot_var_t *field;
 
 		for (int i = [field_defs count]; i-- > 0; ) {
-			string field_name = [[field_defs  getObjectAtIndex:i] string];
-			field_def = [field_dict getObjectForKey:field_name];
-			PLItem     *type_desc = [field_def getObjectForKey:"type"];
-			string      type_record;
-			string      type_type;
-			string      size_field = nil;
-			string      value_field = nil;
-
-			if (str_mid(field_name, 0, 1) == ".") {
-				continue;
-			}
-			field_def = [field_dict getObjectForKey:field_name];
-			if ([field_def string] == "auto") {
-				field = [self findField:field_name];
-				if (!field) {
-					continue;
-				}
-				field_type = [Type findType: field.type];
-				fprintf (output_file,
-						 "\t{\"%s\", &%s, (void *) field_offset (%s, %s)},\n",
-						 field_name, [field_type cexprType], name, field_name);
-			} else {
-				type_record = [[type_desc getObjectAtIndex:0] string];
-				if (type_record == "single") {
-					value_field = [[field_def getObjectForKey:"value"] string];
-				} else if (type_record == "array") {
-					value_field = [[field_def getObjectForKey:"values"] string];
-				} else if (type_record == "data") {
-					value_field = [[field_def getObjectForKey:"data"] string];
-				}
-				if (!value_field) {
-					value_field = field_name;
-				}
-				fprintf (output_file,
-						 "\t{\"%s\", 0/*FIXME*/,"
-						 " (void *) field_offset (%s, %s)},\n",
-						 field_name, name, value_field);
-			}
+			FieldDef   *field_def = [field_defs objectAtIndex:i];
+			[field_def writeSymbol];
 		}
 	} else {
 		for (int i = 0; i < type.strct.num_fields; i++) {
@@ -246,40 +129,48 @@
 			if (field.name == "sType" || field.name == "pNext") {
 				continue;
 			}
-			field_type = [Type findType: field.type];
+			Type       *field_type = [Type findType: field.type];
 			fprintf (output_file,
 					 "\t{\"%s\", &%s, (void *) field_offset (%s, %s)},\n",
-					 field.name, [field_type cexprType], name, field.name);
+					 field.name, [field_type cexprType], [self outname], field.name);
 		}
 	}
 	fprintf (output_file, "\t{ }\n");
 	fprintf (output_file, "};\n");
 
-	fprintf (output_file, "static exprtab_t %s_symtab = {\n", name);
-	fprintf (output_file, "\t%s_symbols,\n", name);
+	fprintf (output_file, "static exprtab_t %s_symtab = {\n", [self outname]);
+	fprintf (output_file, "\t%s_symbols,\n", [self outname]);
 	fprintf (output_file, "};\n");
 
-	fprintf (output_file, "exprtype_t %s_type = {\n", name);
-	fprintf (output_file, "\t\"%s\",\n", name);
-	fprintf (output_file, "\tsizeof (%s),\n", name);
+	fprintf (output_file, "exprtype_t %s_type = {\n", [self outname]);
+	fprintf (output_file, "\t\"%s\",\n", [self outname]);
+	fprintf (output_file, "\tsizeof (%s),\n", [self outname]);
 	fprintf (output_file, "\tcexpr_struct_binops,\n");
 	fprintf (output_file, "\t0,\n");
-	fprintf (output_file, "\t&%s_symtab,\n", name);
+	fprintf (output_file, "\t&%s_symtab,\n", [self outname]);
 	fprintf (output_file, "};\n");
-	fprintf (header_file, "extern exprtype_t %s_type;\n", name);
+	fprintf (output_file, "\n");
+	fprintf (header_file, "extern exprtype_t %s_type;\n", [self outname]);
 }
 
--(void) writeSymtabInit:(PLItem *) parse
+-(void) writeSymtabInit
 {
-	string      name = [self name];
-	PLItem     *field_dict = [parse getObjectForKey:name];
-	PLItem     *new_name = [field_dict getObjectForKey:".name"];
+	PLItem     *field_dict = [parse getObjectForKey:[self outname]];
 
-	if (new_name) {
-		name = [new_name string];
+	if ([parse string] == "skip") {
+		return;
 	}
 
-	fprintf (output_file, "\tcexpr_init_symtab (&%s_symtab, context);\n", name);
+	fprintf (output_file, "\tcexpr_init_symtab (&%s_symtab, context);\n",
+			 [self outname]);
+}
+
+-(string) outname
+{
+	if (outname) {
+		return outname;
+	}
+	return [self name];
 }
 
 -(string) cexprType
diff --git a/libs/video/renderer/vulkan/vkparse.c b/libs/video/renderer/vulkan/vkparse.c
index fbe46d512..fbfbdf226 100644
--- a/libs/video/renderer/vulkan/vkparse.c
+++ b/libs/video/renderer/vulkan/vkparse.c
@@ -122,6 +122,10 @@ typedef struct parse_data_s {
 	size_t      size_offset;
 } parse_data_t;
 
+typedef struct parse_string_s {
+	size_t      value_offset;
+} parse_string_t;
+
 static int parse_uint32_t (const plfield_t *field, const plitem_t *item,
 						   void *data, plitem_t *messages, void *context)
 {
@@ -239,7 +243,7 @@ static int parse_data (const plfield_t *field, const plitem_t *item,
 	const void *bindata = PL_BinaryData (item);
 	size_t      binsize = PL_BinarySize (item);
 
-	Sys_Printf ("parse_array: %s %zd %d %p %p %p\n",
+	Sys_Printf ("parse_data: %s %zd %d %p %p %p\n",
 				field->name, field->offset, field->type, field->parser,
 				field->data, data);
 	Sys_Printf ("    %zd %zd\n", datad->value_offset, datad->size_offset);
@@ -253,6 +257,24 @@ static int parse_data (const plfield_t *field, const plitem_t *item,
 	return 1;
 }
 
+static int parse_string (const plfield_t *field, const plitem_t *item,
+						 void *data, plitem_t *messages, void *context)
+{
+	__auto_type string = (parse_string_t *) field->data;
+	__auto_type value = (char **) ((byte *)data + string->value_offset);
+
+	const char *str = PL_BinaryData (item);
+
+	Sys_Printf ("parse_string: %s %zd %d %p %p %p\n",
+				field->name, field->offset, field->type, field->parser,
+				field->data, data);
+	Sys_Printf ("    %zd\n", string->value_offset);
+	Sys_Printf ("    %s\n", str);
+
+	*value = strdup (str);
+	return 1;
+}
+
 #include "libs/video/renderer/vulkan/vkparse.cinc"
 
 typedef struct qfv_renderpass_s {

From 25ade4c0f3ab289f4b04946dc2701fbee4f81b84 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 24 Dec 2020 01:36:17 +0900
Subject: [PATCH 1215/1519] [vulkan] Add support for custom parsers

And provisionally parse shader stage defs.
---
 include/QF/Vulkan/pipeline.h                  |  3 -
 include/QF/Vulkan/qf_vid.h                    |  3 +-
 include/QF/Vulkan/shader.h                    |  9 +++
 libs/video/renderer/vid_render_vulkan.c       |  3 +
 libs/video/renderer/vulkan/pipeline.c         | 17 ------
 libs/video/renderer/vulkan/qfpipeline.plist   | 15 +++++
 libs/video/renderer/vulkan/shader.c           | 39 +++++++++++-
 .../video/renderer/vulkan/vkgen/Makemodule.am |  1 +
 .../renderer/vulkan/vkgen/vkfieldcustom.h     | 14 +++++
 .../renderer/vulkan/vkgen/vkfieldcustom.r     | 60 +++++++++++++++++++
 libs/video/renderer/vulkan/vkgen/vkfielddef.r |  3 +
 libs/video/renderer/vulkan/vkparse.c          | 55 ++++++++++++-----
 libs/video/renderer/vulkan/vkparse.h          |  6 ++
 libs/video/renderer/vulkan/vkparse.plist      | 33 +++++++++-
 .../video/renderer/vulkan/vulkan_vid_common.c | 40 ++++++++++++-
 15 files changed, 261 insertions(+), 40 deletions(-)
 create mode 100644 libs/video/renderer/vulkan/vkgen/vkfieldcustom.h
 create mode 100644 libs/video/renderer/vulkan/vkgen/vkfieldcustom.r

diff --git a/include/QF/Vulkan/pipeline.h b/include/QF/Vulkan/pipeline.h
index f77585217..c7d5013de 100644
--- a/include/QF/Vulkan/pipeline.h
+++ b/include/QF/Vulkan/pipeline.h
@@ -128,9 +128,6 @@ typedef struct qfv_pipelinecacheset_s
 #define QFV_AllocPipelineCacheSet(num, allocator) \
     DARRAY_ALLOCFIXED (qfv_pipelinecacheset_t, num, allocator)
 
-VkShaderModule QFV_CreateShaderModule (struct qfv_device_s *device,
-											size_t size, const uint32_t *code);
-
 struct dstring_s;
 VkPipelineCache QFV_CreatePipelineCache (struct qfv_device_s *device,
 										 struct dstring_s *cacheData);
diff --git a/include/QF/Vulkan/qf_vid.h b/include/QF/Vulkan/qf_vid.h
index d7ef64a97..d380d1236 100644
--- a/include/QF/Vulkan/qf_vid.h
+++ b/include/QF/Vulkan/qf_vid.h
@@ -38,8 +38,9 @@
 struct vulkan_ctx_s;
 void Vulkan_DestroyFramebuffers (struct vulkan_ctx_s *ctx);
 void Vulkan_CreateFramebuffers (struct vulkan_ctx_s *ctx);
-void Vulkan_DestroyRenderPass (struct vulkan_ctx_s *ctx);
 void Vulkan_CreateRenderPass (struct vulkan_ctx_s *ctx);
+void Vulkan_DestroyRenderPass (struct vulkan_ctx_s *ctx);
+void Vulkan_CreatePipelines (struct vulkan_ctx_s *ctx);
 void Vulkan_CreateSwapchain (struct vulkan_ctx_s *ctx);
 void Vulkan_CreateDevice (struct vulkan_ctx_s *ctx);
 void Vulkan_Init_Common (struct vulkan_ctx_s *ctx);
diff --git a/include/QF/Vulkan/shader.h b/include/QF/Vulkan/shader.h
index 6b8321cdd..b13f6a618 100644
--- a/include/QF/Vulkan/shader.h
+++ b/include/QF/Vulkan/shader.h
@@ -3,11 +3,20 @@
 
 struct qfv_device_s;
 struct vulkan_ctx_s;
+struct plitem_s;
+struct parsectx_s;
 
 VkShaderModule QFV_CreateShaderModule (struct qfv_device_s *device,
 									   const char *path);
+void QFV_DestroyShaderModule (struct qfv_device_s *device,
+							  VkShaderModule module);
+VkShaderModule QFV_FindShaderModule (struct vulkan_ctx_s *ctx,
+									 const char *name);
 void QFV_RegisterShaderModule (struct vulkan_ctx_s *ctx, const char *name,
 							   VkShaderModule module);
 void QFV_DeregisterShaderModule (struct vulkan_ctx_s *ctx, const char *name);
+int parse_VkShaderModule (const struct plitem_s *item, void **data,
+						  struct plitem_s *messages,
+						  struct parsectx_s *context);
 
 #endif//__QF_Vulkan_shader_h
diff --git a/libs/video/renderer/vid_render_vulkan.c b/libs/video/renderer/vid_render_vulkan.c
index 85181547c..52246162b 100644
--- a/libs/video/renderer/vid_render_vulkan.c
+++ b/libs/video/renderer/vid_render_vulkan.c
@@ -64,6 +64,9 @@ vulkan_R_Init (void)
 	Vulkan_CreateSwapchain (vulkan_ctx);
 	Vulkan_CreateRenderPass (vulkan_ctx);
 	Vulkan_CreateFramebuffers (vulkan_ctx);
+	// FIXME this should be staged so screen updates can begin while pipelines
+	// are being built
+	Vulkan_CreatePipelines (vulkan_ctx);
 
 	qfv_swapchain_t *sc = vulkan_ctx->swapchain;
 
diff --git a/libs/video/renderer/vulkan/pipeline.c b/libs/video/renderer/vulkan/pipeline.c
index 119fbf303..bfe48ce9f 100644
--- a/libs/video/renderer/vulkan/pipeline.c
+++ b/libs/video/renderer/vulkan/pipeline.c
@@ -64,23 +64,6 @@
 
 #include "util.h"
 
-VkShaderModule
-QFV_CreateShaderModule (qfv_device_t *device,
-						size_t size, const uint32_t *code)
-{
-	VkDevice    dev = device->dev;
-	qfv_devfuncs_t *dfunc = device->funcs;
-
-	VkShaderModuleCreateInfo createInfo = {
-		VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO, 0, 0,
-		size, code,
-	};
-
-	VkShaderModule module;
-	dfunc->vkCreateShaderModule (dev, &createInfo, 0, &module);
-	return module;
-}
-
 VkPipelineCache
 QFV_CreatePipelineCache (qfv_device_t *device, dstring_t *cacheData)
 {
diff --git a/libs/video/renderer/vulkan/qfpipeline.plist b/libs/video/renderer/vulkan/qfpipeline.plist
index 66c9e0adb..7af624b99 100644
--- a/libs/video/renderer/vulkan/qfpipeline.plist
+++ b/libs/video/renderer/vulkan/qfpipeline.plist
@@ -1,4 +1,19 @@
 {
+	modules = (
+		// specify shader modules to load into memory
+		{
+			// the name of the module for referecy by the pipeline
+			name = passthrough;
+			// the path to the spv file to load
+			// $shader refers to the shader install path
+			// $builtin refers to compiled-in shaders
+			file = $builtin/passthrough.vert;
+		},
+		{
+			name = pushcolor;
+			file = $builtin/pushcolor.frag;
+		},
+	);
 	renderpass = {
 		attachments = (
 			{
diff --git a/libs/video/renderer/vulkan/shader.c b/libs/video/renderer/vulkan/shader.c
index 704e01996..5ee89ca25 100644
--- a/libs/video/renderer/vulkan/shader.c
+++ b/libs/video/renderer/vulkan/shader.c
@@ -42,6 +42,7 @@
 #include "QF/cvar.h"
 #include "QF/dstring.h"
 #include "QF/hash.h"
+#include "QF/qfplist.h"
 #include "QF/quakefs.h"
 #include "QF/sys.h"
 #include "QF/Vulkan/qf_vid.h"
@@ -52,6 +53,7 @@
 #include "QF/Vulkan/shader.h"
 
 #include "vid_vulkan.h"
+#include "vkparse.h"
 
 static
 #include "libs/video/renderer/vulkan/passthrough.vert.spvc"
@@ -92,7 +94,7 @@ QFV_CreateShaderModule (qfv_device_t *device, const char *shader_path)
 	shaderdata_t _data = {};
 	shaderdata_t *data = 0;
 	dstring_t  *path = 0;
-	QFile      *file;
+	QFile      *file = 0;
 	VkShaderModule shader = 0;
 
 	if (strncmp (shader_path, BUILTIN, BUILTIN_SIZE) == 0) {
@@ -142,6 +144,15 @@ QFV_CreateShaderModule (qfv_device_t *device, const char *shader_path)
 	return shader;
 }
 
+void
+QFV_DestroyShaderModule (qfv_device_t *device, VkShaderModule module)
+{
+	VkDevice    dev = device->dev;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	dfunc->vkDestroyShaderModule (dev, module, 0);
+}
+
 static shadermodule_t *
 new_module (vulkan_ctx_t *ctx)
 {
@@ -169,10 +180,21 @@ sm_free (void *sm, void *ctx)
 	del_module (sm, ctx);
 }
 
+VkShaderModule
+QFV_FindShaderModule (vulkan_ctx_t *ctx, const char *name)
+{
+	//FIXME
+	if (!ctx->shadermodules) {
+		ctx->shadermodules = Hash_NewTable (127, sm_getkey, sm_free, ctx, 0);
+	}
+	return Hash_Find (ctx->shadermodules, name);
+}
+
 void
 QFV_RegisterShaderModule (vulkan_ctx_t *ctx, const char *name,
 						  VkShaderModule module)
 {
+	//FIXME
 	if (!ctx->shadermodules) {
 		ctx->shadermodules = Hash_NewTable (127, sm_getkey, sm_free, ctx, 0);
 	}
@@ -190,3 +212,18 @@ QFV_DeregisterShaderModule (vulkan_ctx_t *ctx, const char *name)
 	}
 	Hash_Free (ctx->shadermodules, Hash_Del (ctx->shadermodules, name));
 }
+
+int
+parse_VkShaderModule (const plitem_t *item, void **data,
+					  plitem_t *messages, parsectx_t *context)
+{
+	vulkan_ctx_t *ctx = context->vctx;
+	const char *name = PL_String (item);
+	__auto_type mptr = (VkShaderModule *)data[0];
+	VkShaderModule module = QFV_FindShaderModule (ctx, name);
+	if (module) {
+		*mptr = module;
+		return 1;
+	}
+	return 0;
+}
diff --git a/libs/video/renderer/vulkan/vkgen/Makemodule.am b/libs/video/renderer/vulkan/vkgen/Makemodule.am
index 31c22d936..4847bf6fd 100644
--- a/libs/video/renderer/vulkan/vkgen/Makemodule.am
+++ b/libs/video/renderer/vulkan/vkgen/Makemodule.am
@@ -6,6 +6,7 @@ vkgen_dat_src= \
 	libs/video/renderer/vulkan/vkgen/vkenum.r \
 	libs/video/renderer/vulkan/vkgen/vkfieldarray.r \
 	libs/video/renderer/vulkan/vkgen/vkfieldauto.r \
+	libs/video/renderer/vulkan/vkgen/vkfieldcustom.r \
 	libs/video/renderer/vulkan/vkgen/vkfielddata.r \
 	libs/video/renderer/vulkan/vkgen/vkfielddef.r \
 	libs/video/renderer/vulkan/vkgen/vkfieldsingle.r \
diff --git a/libs/video/renderer/vulkan/vkgen/vkfieldcustom.h b/libs/video/renderer/vulkan/vkgen/vkfieldcustom.h
new file mode 100644
index 000000000..4b7672a9e
--- /dev/null
+++ b/libs/video/renderer/vulkan/vkgen/vkfieldcustom.h
@@ -0,0 +1,14 @@
+#ifndef __renderer_vulkan_vkgen_vkfieldcustom_h
+#define __renderer_vulkan_vkgen_vkfieldcustom_h
+
+#include "vkfielddef.h"
+
+@interface CustomField: FieldDef
+{
+	string      pltype;
+	string      parser;
+	PLItem     *fields;
+}
+@end
+
+#endif//__renderer_vulkan_vkgen_vkfieldcustom_h
diff --git a/libs/video/renderer/vulkan/vkgen/vkfieldcustom.r b/libs/video/renderer/vulkan/vkgen/vkfieldcustom.r
new file mode 100644
index 000000000..e00085ac1
--- /dev/null
+++ b/libs/video/renderer/vulkan/vkgen/vkfieldcustom.r
@@ -0,0 +1,60 @@
+#include <PropertyList.h>
+
+#include "vkfieldcustom.h"
+#include "vkgen.h"
+#include "vktype.h"
+
+@implementation CustomField
+
+-init:(PLItem *) item struct:(Struct *)strct field:(string)fname
+{
+	self = [super init:item struct:strct field:fname];
+	if (!self) {
+		return self;
+	}
+
+	PLItem     *desc = [item getObjectForKey:"type"];
+	pltype = [[desc getObjectAtIndex:1] string];
+	parser = [[desc getObjectAtIndex:2] string];
+
+	fields = [item getObjectForKey:"fields"];
+	return self;
+}
+
+-writeParseData
+{
+	fprintf (output_file, "static size_t parse_%s_%s_offsets = {\n",
+			 struct_name, field_name);
+	for (int i = 0, count = [fields count]; i < count; i++) {
+		string field = [[fields getObjectAtIndex:i] string];
+		fprintf (output_file, "\tfield_offset (%s, %s),\n",
+				 struct_name, field);
+	}
+	fprintf (output_file, "};\n");
+
+	fprintf (output_file, "static parse_custom_t parse_%s_%s_data = {\n",
+			 struct_name, field_name);
+	fprintf (output_file, "\t%s,\n", parser);
+	fprintf (output_file, "\t&parse_%s_%s_offsets,\n",
+			 struct_name, field_name);
+	fprintf (output_file, "\t%d,\n", [fields count]);
+	fprintf (output_file, "};\n");
+	return self;
+}
+
+-writeField
+{
+	fprintf (output_file, "\t{\"%s\", 0, %s, parse_%s, &parse_%s_%s_data},\n",
+			 field_name, pltype, "custom", struct_name, field_name);
+	return self;
+}
+
+-writeSymbol
+{
+	fprintf (output_file,
+			 "\t{\"%s\", 0/*FIXME*/, 0/*(void *) field_offset (%s, %s)*/},\n",
+			 field_name, struct_name, "FIXME");
+	return self;
+}
+
+@end
diff --git a/libs/video/renderer/vulkan/vkgen/vkfielddef.r b/libs/video/renderer/vulkan/vkgen/vkfielddef.r
index 9cc35c13a..6aba1df05 100644
--- a/libs/video/renderer/vulkan/vkgen/vkfielddef.r
+++ b/libs/video/renderer/vulkan/vkgen/vkfielddef.r
@@ -3,6 +3,7 @@
 
 #include "vkfieldarray.h"
 #include "vkfieldauto.h"
+#include "vkfieldcustom.h"
 #include "vkfielddata.h"
 #include "vkfielddef.h"
 #include "vkfieldsingle.h"
@@ -31,6 +32,8 @@
 	switch (record) {
 		case "auto":
 			return [[[AutoField alloc] init:item struct:strct field:fname] autorelease];
+		case "custom":
+			return [[[CustomField alloc] init:item struct:strct field:fname] autorelease];
 		case "string":
 			return [[[StringField alloc] init:item struct:strct field:fname] autorelease];
 		case "data":
diff --git a/libs/video/renderer/vulkan/vkparse.c b/libs/video/renderer/vulkan/vkparse.c
index fbfbdf226..5b198a807 100644
--- a/libs/video/renderer/vulkan/vkparse.c
+++ b/libs/video/renderer/vulkan/vkparse.c
@@ -56,6 +56,7 @@
 #include "QF/Vulkan/instance.h"
 #include "QF/Vulkan/image.h"
 #include "QF/Vulkan/renderpass.h"
+#include "QF/Vulkan/shader.h"
 #include "QF/Vulkan/swapchain.h"
 
 #include "compat.h"
@@ -126,8 +127,16 @@ typedef struct parse_string_s {
 	size_t      value_offset;
 } parse_string_t;
 
-static int parse_uint32_t (const plfield_t *field, const plitem_t *item,
-						   void *data, plitem_t *messages, void *context)
+typedef struct parse_custom_s {
+	int       (*parse) (const plitem_t *item, void **data,
+						plitem_t *messages, parsectx_t *context);
+	size_t     *offsets;
+	size_t      num_offsets;
+} parse_custom_t;
+
+static int
+parse_uint32_t (const plfield_t *field, const plitem_t *item,
+				void *data, plitem_t *messages, void *context)
 {
 	int         ret = 1;
 	const char *valstr = PL_String (item);
@@ -154,12 +163,13 @@ static int parse_uint32_t (const plfield_t *field, const plitem_t *item,
 	return ret;
 }
 
-static int parse_enum (const plfield_t *field, const plitem_t *item,
-					   void *data, plitem_t *messages, void *context)
+static int
+parse_enum (const plfield_t *field, const plitem_t *item,
+			void *data, plitem_t *messages, void *context)
 {
 	int         ret = 1;
 	__auto_type enm = (exprenum_t *) field->data;
-	exprctx_t   ectx = *(exprctx_t *)context;
+	exprctx_t   ectx = *((parsectx_t *)context)->ectx;
 	exprval_t   result = { enm->type, data };
 	ectx.symtab = enm->symtab;
 	ectx.result = &result;
@@ -172,8 +182,9 @@ static int parse_enum (const plfield_t *field, const plitem_t *item,
 	return ret;
 }
 
-static int parse_single (const plfield_t *field, const plitem_t *item,
-						 void *data, plitem_t *messages, void *context)
+static int
+parse_single (const plfield_t *field, const plitem_t *item,
+			  void *data, plitem_t *messages, void *context)
 {
 	__auto_type single = (parse_single_t *) field->data;
 	void       *flddata = (byte *)data + single->value_offset;
@@ -197,8 +208,9 @@ static int parse_single (const plfield_t *field, const plitem_t *item,
 	return 1;
 }
 
-static int parse_array (const plfield_t *field, const plitem_t *item,
-						void *data, plitem_t *messages, void *context)
+static int
+parse_array (const plfield_t *field, const plitem_t *item,
+			 void *data, plitem_t *messages, void *context)
 {
 	__auto_type array = (parse_array_t *) field->data;
 	__auto_type value = (void **) ((byte *)data + array->value_offset);
@@ -233,8 +245,9 @@ static int parse_array (const plfield_t *field, const plitem_t *item,
 	return 1;
 }
 
-static int parse_data (const plfield_t *field, const plitem_t *item,
-					   void *data, plitem_t *messages, void *context)
+static int
+parse_data (const plfield_t *field, const plitem_t *item,
+			void *data, plitem_t *messages, void *context)
 {
 	__auto_type datad = (parse_data_t *) field->data;
 	__auto_type value = (void **) ((byte *)data + datad->value_offset);
@@ -257,8 +270,9 @@ static int parse_data (const plfield_t *field, const plitem_t *item,
 	return 1;
 }
 
-static int parse_string (const plfield_t *field, const plitem_t *item,
-						 void *data, plitem_t *messages, void *context)
+static int
+parse_string (const plfield_t *field, const plitem_t *item,
+			  void *data, plitem_t *messages, void *context)
 {
 	__auto_type string = (parse_string_t *) field->data;
 	__auto_type value = (char **) ((byte *)data + string->value_offset);
@@ -275,6 +289,18 @@ static int parse_string (const plfield_t *field, const plitem_t *item,
 	return 1;
 }
 
+static int
+parse_custom (const plfield_t *field, const plitem_t *item,
+			  void *data, plitem_t *messages, void *context)
+{
+	__auto_type custom = (parse_custom_t *) field->data;
+	void      **offsets = alloca (custom->num_offsets * sizeof (void *));
+	for (size_t i = 0; i < custom->num_offsets; i++) {
+		offsets[i] = data + custom->offsets[i];
+	}
+	return custom->parse (item, offsets, messages, context);
+}
+
 #include "libs/video/renderer/vulkan/vkparse.cinc"
 
 typedef struct qfv_renderpass_s {
@@ -331,6 +357,7 @@ QFV_ParseRenderPass (vulkan_ctx_t *ctx, plitem_t *plist)
 	};
 	exprtab_t   vars_tab = { var_syms, 0 };
 	exprctx_t   exprctx = {};
+	parsectx_t  parsectx = { &exprctx, ctx };
 
 	exprctx.external_variables = &vars_tab;
 	exprctx.memsuper = new_memsuper ();
@@ -340,7 +367,7 @@ QFV_ParseRenderPass (vulkan_ctx_t *ctx, plitem_t *plist)
 	cexpr_init_symtab (&vars_tab, &exprctx);
 
 	if (!PL_ParseDictionary (renderpass_fields, plist,
-							 &renderpass_data, messages, &exprctx)) {
+							 &renderpass_data, messages, &parsectx)) {
 		for (int i = 0; i < PL_A_NumObjects (messages); i++) {
 			Sys_Printf ("%s\n", PL_String (PL_ObjectAtIndex (messages, i)));
 		}
diff --git a/libs/video/renderer/vulkan/vkparse.h b/libs/video/renderer/vulkan/vkparse.h
index ae8a30af9..b95475bda 100644
--- a/libs/video/renderer/vulkan/vkparse.h
+++ b/libs/video/renderer/vulkan/vkparse.h
@@ -1,9 +1,15 @@
 #ifndef __vkparse_h
 #define __vkparse_h
 
+#include "QF/cexpr.h"
 #include "QF/Vulkan/renderpass.h"
 #include "libs/video/renderer/vulkan/vkparse.hinc"
 
+typedef struct parsectx_s {
+	struct exprctx_s *ectx;
+	struct vulkan_ctx_s *vctx;
+} parsectx_t;
+
 VkRenderPass QFV_ParseRenderPass (vulkan_ctx_t *ctx, plitem_t *plist);
 void QFV_InitParse (void);
 
diff --git a/libs/video/renderer/vulkan/vkparse.plist b/libs/video/renderer/vulkan/vkparse.plist
index 1441a0267..1ba7e8bb4 100644
--- a/libs/video/renderer/vulkan/vkparse.plist
+++ b/libs/video/renderer/vulkan/vkparse.plist
@@ -3,6 +3,8 @@
 		VkAttachmentDescription,
 		VkSubpassDescription,
 		VkSubpassDependency,
+		VkSpecializationInfo,
+		VkPipelineShaderStageCreateInfo,
 		qfv_swapchain_t,
 	);
 	parse = {
@@ -37,6 +39,35 @@
 				size = preserveAttachmentCount;
 				values = pPreserveAttachments;
 			};
-		}
+		};
+		VkSpecializationInfo = {
+			mapEntries = {
+				type = (array, VkSpecializationMapEntry);
+				size = mapEntryCount;
+				values = pMapEntries;
+			};
+			data = {
+				type = data;
+				size = dataSize;
+				data = pData;
+			};
+		};
+		VkPipelineShaderStageCreateInfo = {
+			flags = auto;
+			stage = auto;
+			name = {
+				type = string;
+				string = pName;
+			};
+			module = {
+				type = (custom, QFString, parse_VkShaderModule);
+				fields = (module);
+			};
+			specializationInfo = {
+				type = (single, VkSpecializationInfo);
+				value = pSpecializationInfo;
+			};
+		};
+		VkShaderModuleCreateInfo = skip;
 	}
 }
diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c
index 9c2b021f4..78c4e9add 100644
--- a/libs/video/renderer/vulkan/vulkan_vid_common.c
+++ b/libs/video/renderer/vulkan/vulkan_vid_common.c
@@ -57,6 +57,7 @@
 #include "QF/Vulkan/instance.h"
 #include "QF/Vulkan/image.h"
 #include "QF/Vulkan/renderpass.h"
+#include "QF/Vulkan/shader.h"
 #include "QF/Vulkan/swapchain.h"
 
 #include "compat.h"
@@ -260,7 +261,12 @@ static qfv_pipelinestagepair_t imageLayoutTransitionStages[] = {
 static plitem_t *
 qfv_load_pipeline (void)
 {
-	return PL_GetPropertyList (quakeforge_pipeline);
+	static plitem_t *pipeline;
+
+	if (!pipeline) {
+		pipeline = PL_GetPropertyList (quakeforge_pipeline);
+	}
+	return pipeline;
 }
 
 void
@@ -269,9 +275,9 @@ Vulkan_CreateRenderPass (vulkan_ctx_t *ctx)
 	plitem_t   *item = qfv_load_pipeline ();
 
 	if (!item || !(item = PL_ObjectForKey (item, "renderpass"))) {
-		Sys_Printf ("error loading pipeline\n");
+		Sys_Printf ("error loading renderpass\n");
 	} else {
-		Sys_Printf ("Found renderer def\n");
+		Sys_Printf ("Found renderpass def\n");
 	}
 	qfv_device_t *device = ctx->device;
 	VkDevice    dev = device->dev;
@@ -391,6 +397,34 @@ Vulkan_DestroyRenderPass (vulkan_ctx_t *ctx)
 	ctx->renderpass.depthImage = 0;
 }
 
+void
+Vulkan_CreatePipelines (vulkan_ctx_t *ctx)
+{
+	plitem_t   *item = qfv_load_pipeline ();
+
+	if (!item || !(item = PL_ObjectForKey (item, "modules"))) {
+		Sys_Printf ("error loading modules\n");
+	} else {
+		Sys_Printf ("Found modules def\n");
+	}
+	for (int i = PL_A_NumObjects (item); i-- > 0; ) {
+		plitem_t   *mod = PL_ObjectAtIndex (item, i);
+		const char *name = PL_String (PL_ObjectForKey (mod, "name"));
+		const char *file = PL_String (PL_ObjectForKey (mod, "file"));
+		if (!name || !file) {
+			continue;
+		}
+		if (QFV_FindShaderModule (ctx, name)) {
+			continue;
+		}
+		VkShaderModule module = QFV_CreateShaderModule (ctx->device, file);
+		if (module) {
+			Sys_Printf ("registering shader %s %p\n", name, module);
+			QFV_RegisterShaderModule (ctx, name, module);
+		}
+	}
+}
+
 void
 Vulkan_CreateFramebuffers (vulkan_ctx_t *ctx)
 {

From 5b0da2b14ce2402a102875a3d7209f7a31774271 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 24 Dec 2020 09:57:24 +0900
Subject: [PATCH 1216/1519] [util] Add an int to uint cast for cexpr

---
 libs/util/cexpr-parse.y | 6 +-----
 libs/util/cexpr-type.c  | 8 ++++++++
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/libs/util/cexpr-parse.y b/libs/util/cexpr-parse.y
index e789a40e9..eb56ed588 100644
--- a/libs/util/cexpr-parse.y
+++ b/libs/util/cexpr-parse.y
@@ -150,11 +150,7 @@ assign_expr (exprval_t *dst, const exprval_t *src, exprctx_t *context)
 	if (!src) {
 		return;
 	}
-	for (binop = dst->type->binops; binop && binop->op; binop++) {
-		if (binop->op == '=' && binop->other == src->type) {
-			break;
-		}
-	}
+	binop = cexpr_find_cast (dst->type, src->type);
 	if (binop && binop->op) {
 		binop->func (dst, src, dst, context);
 	} else {
diff --git a/libs/util/cexpr-type.c b/libs/util/cexpr-type.c
index c0610b13d..c1dbbafb0 100644
--- a/libs/util/cexpr-type.c
+++ b/libs/util/cexpr-type.c
@@ -125,6 +125,13 @@ BINOP(uint, bor, unsigned, |)
 BINOP(uint, xor, unsigned, ^)
 BINOP(uint, rem, unsigned, %)
 
+static void
+uint_cast_int (const exprval_t *val1, const exprval_t *src, exprval_t *result,
+			   exprctx_t *ctx)
+{
+	*(unsigned *) result->value = *(int *) src->value;
+}
+
 UNOP(uint, pos, unsigned, +)
 UNOP(uint, neg, unsigned, -)
 UNOP(uint, tnot, unsigned, !)
@@ -142,6 +149,7 @@ binop_t uint_binops[] = {
 	{ '^', &cexpr_uint, &cexpr_uint, uint_xor },
 	{ '%', &cexpr_uint, &cexpr_uint, uint_rem },
 	{ MOD, &cexpr_uint, &cexpr_uint, uint_rem },
+	{ '=', &cexpr_int,  &cexpr_uint, uint_cast_int },
 	{}
 };
 

From 2430f44d7b0330d49db79c32726f8dbbe76d9cb3 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 24 Dec 2020 09:58:27 +0900
Subject: [PATCH 1217/1519] [vulkan] Support parsing numeric types

---
 libs/video/renderer/vulkan/vkgen/vktype.r | 12 +++++
 libs/video/renderer/vulkan/vkparse.c      | 54 +++++++++++++++++------
 2 files changed, 52 insertions(+), 14 deletions(-)

diff --git a/libs/video/renderer/vulkan/vkgen/vktype.r b/libs/video/renderer/vulkan/vkgen/vktype.r
index 5d6c1b7ae..fbe44e350 100644
--- a/libs/video/renderer/vulkan/vkgen/vktype.r
+++ b/libs/video/renderer/vulkan/vkgen/vktype.r
@@ -74,6 +74,9 @@ static string get_type_key (void *type, void *unused)
 
 -(string) name
 {
+	if (type.meta == ty_basic) {
+		return pr_type_name[type.type];
+	}
 	//FIXME extract alias name and return proper type name
 	return type.encoding;
 }
@@ -98,16 +101,25 @@ static string get_type_key (void *type, void *unused)
 
 -(string) parseType
 {
+	if (type.meta == ty_basic) {
+		return "QFString";
+	}
 	return "no parse";
 }
 
 -(string) parseFunc
 {
+	if (type.meta == ty_basic) {
+		return "parse_basic";
+	}
 	return "0";
 }
 
 -(string) parseData
 {
+	if (type.meta == ty_basic) {
+		return "&cexpr_" + pr_type_name[type.type];
+	}
 	return "0";
 }
 
diff --git a/libs/video/renderer/vulkan/vkparse.c b/libs/video/renderer/vulkan/vkparse.c
index 5b198a807..ac198e756 100644
--- a/libs/video/renderer/vulkan/vkparse.c
+++ b/libs/video/renderer/vulkan/vkparse.c
@@ -135,29 +135,55 @@ typedef struct parse_custom_s {
 } parse_custom_t;
 
 static int
-parse_uint32_t (const plfield_t *field, const plitem_t *item,
-				void *data, plitem_t *messages, void *context)
+parse_basic (const plfield_t *field, const plitem_t *item,
+			 void *data, plitem_t *messages, void *context)
 {
 	int         ret = 1;
+	__auto_type etype = (exprtype_t *) field->data;
+	exprctx_t   ectx = *((parsectx_t *) context)->ectx;
+	exprval_t   result = { etype, data };
+	ectx.symtab = 0;
+	ectx.result = &result;
 	const char *valstr = PL_String (item);
 	//Sys_Printf ("parse_uint32_t: %s %zd %d %p %p: %s\n",
 	//			field->name, field->offset, field->type, field->parser,
 	//			field->data, valstr);
 	if (strcmp (valstr, "VK_SUBPASS_EXTERNAL") == 0) {
+		//FIXME handle subpass in a separate parser?
 		*(uint32_t *) data = VK_SUBPASS_EXTERNAL;
 	} else {
-		char       *end;
-		unsigned long val = strtoul (valstr, &end, 0);
-		if (*valstr && !*end && val <= 0xffffffff) {
-			*(uint32_t *) data = val;
-		} else if (val > 0xffffffff) {
-			PL_Message (messages, item, "%lu bigger than 32 bits", val);
-			ret = 0;
-		} else {
-			PL_Message (messages, item, "invalid char at %d in '%s'\n",
-						(int) (end - valstr), valstr);
-			ret = 0;
-		}
+		Sys_Printf ("parse_uint32_t: %s %zd %d %p %p %s\n",
+					field->name, field->offset, field->type, field->parser,
+					field->data, valstr);
+		ret = !cexpr_eval_string (valstr, &ectx);
+		Sys_Printf ("    %x\n", *(uint32_t *)data);
+	}
+
+	return ret;
+}
+
+static int
+parse_uint32_t (const plfield_t *field, const plitem_t *item,
+				void *data, plitem_t *messages, void *context)
+{
+	int         ret = 1;
+	exprctx_t   ectx = *((parsectx_t *) context)->ectx;
+	exprval_t   result = { &cexpr_uint, data };
+	ectx.symtab = 0;
+	ectx.result = &result;
+	const char *valstr = PL_String (item);
+	//Sys_Printf ("parse_uint32_t: %s %zd %d %p %p: %s\n",
+	//			field->name, field->offset, field->type, field->parser,
+	//			field->data, valstr);
+	if (strcmp (valstr, "VK_SUBPASS_EXTERNAL") == 0) {
+		//FIXME handle subpass in a separate parser?
+		*(uint32_t *) data = VK_SUBPASS_EXTERNAL;
+	} else {
+		Sys_Printf ("parse_uint32_t: %s %zd %d %p %p %s\n",
+					field->name, field->offset, field->type, field->parser,
+					field->data, valstr);
+		ret = !cexpr_eval_string (valstr, &ectx);
+		Sys_Printf ("    %d\n", *(uint32_t *)data);
 	}
 
 	return ret;

From 5c0ce2c414527e8bac3a84f79bb18e6312ccc3df Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 24 Dec 2020 11:50:52 +0900
Subject: [PATCH 1218/1519] [vulkan] Correct the usage of custom field offsets

I had missed the array declaration and thus initialized the pointer to
the offset array incorrectly. Didn't show up until I tried using
multiple offsets.
---
 libs/video/renderer/vulkan/vkgen/vkfieldcustom.r | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libs/video/renderer/vulkan/vkgen/vkfieldcustom.r b/libs/video/renderer/vulkan/vkgen/vkfieldcustom.r
index e00085ac1..3e9e56c74 100644
--- a/libs/video/renderer/vulkan/vkgen/vkfieldcustom.r
+++ b/libs/video/renderer/vulkan/vkgen/vkfieldcustom.r
@@ -23,7 +23,7 @@
 
 -writeParseData
 {
-	fprintf (output_file, "static size_t parse_%s_%s_offsets = {\n",
+	fprintf (output_file, "static size_t parse_%s_%s_offsets[] = {\n",
 			 struct_name, field_name);
 	for (int i = 0, count = [fields count]; i < count; i++) {
 		string field = [[fields getObjectAtIndex:i] string];
@@ -35,7 +35,7 @@
 	fprintf (output_file, "static parse_custom_t parse_%s_%s_data = {\n",
 			 struct_name, field_name);
 	fprintf (output_file, "\t%s,\n", parser);
-	fprintf (output_file, "\t&parse_%s_%s_offsets,\n",
+	fprintf (output_file, "\tparse_%s_%s_offsets,\n",
 			 struct_name, field_name);
 	fprintf (output_file, "\t%d,\n", [fields count]);
 	fprintf (output_file, "};\n");

From cb2bdb0224c915b8f8dcd2e59781a9ecb6bb57de Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 24 Dec 2020 13:33:37 +0900
Subject: [PATCH 1219/1519] [util] Rename PL_ParseDictionary to PL_ParseStruct

Struct is far more appropriate for its function, and I need to parse a
dictionary into a hash table.
---
 include/QF/qfplist.h                        | 4 ++--
 libs/util/qfplist.c                         | 4 ++--
 libs/video/renderer/vulkan/vkgen/vkstruct.r | 2 +-
 libs/video/renderer/vulkan/vkparse.c        | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/QF/qfplist.h b/include/QF/qfplist.h
index 1d45426d2..e8a64f054 100644
--- a/include/QF/qfplist.h
+++ b/include/QF/qfplist.h
@@ -342,8 +342,8 @@ void PL_Free (plitem_t *item);
 	\param context	Additional context data passed to the parser.
 	\return			0 if there are any errors, 1 if there are no errors.
 */
-int PL_ParseDictionary (const plfield_t *fields, const plitem_t *dict,
-						void *data, plitem_t *messages, void *context);
+int PL_ParseStruct (const plfield_t *fields, const plitem_t *dict,
+					void *data, plitem_t *messages, void *context);
 int PL_ParseArray (const plfield_t *fields, const plitem_t *dict,
 				   void *data, plitem_t *messages, void *context);
 void __attribute__((format(printf,3,4)))
diff --git a/libs/util/qfplist.c b/libs/util/qfplist.c
index b33d22084..d8338a332 100644
--- a/libs/util/qfplist.c
+++ b/libs/util/qfplist.c
@@ -1144,8 +1144,8 @@ pl_default_parser (const plfield_t *field, const plitem_t *item, void *data,
 }
 
 VISIBLE int
-PL_ParseDictionary (const plfield_t *fields, const plitem_t *dict, void *data,
-					plitem_t *messages, void *context)
+PL_ParseStruct (const plfield_t *fields, const plitem_t *dict, void *data,
+				plitem_t *messages, void *context)
 {
 	void      **list, **l;
 	dictkey_t  *current;
diff --git a/libs/video/renderer/vulkan/vkgen/vkstruct.r b/libs/video/renderer/vulkan/vkgen/vkstruct.r
index 6a8b21caa..761cbdade 100644
--- a/libs/video/renderer/vulkan/vkgen/vkstruct.r
+++ b/libs/video/renderer/vulkan/vkgen/vkstruct.r
@@ -109,7 +109,7 @@
 			 [self outname]);
 	fprintf (output_file, "{\n");
 	fprintf (output_file,
-			 "\treturn PL_ParseDictionary (%s_fields, item, data, messages,"
+			 "\treturn PL_ParseStruct (%s_fields, item, data, messages,"
 			 " context);\n",
 			 [self outname]);
 	fprintf (output_file, "}\n");
diff --git a/libs/video/renderer/vulkan/vkparse.c b/libs/video/renderer/vulkan/vkparse.c
index ac198e756..d2ae12949 100644
--- a/libs/video/renderer/vulkan/vkparse.c
+++ b/libs/video/renderer/vulkan/vkparse.c
@@ -392,8 +392,8 @@ QFV_ParseRenderPass (vulkan_ctx_t *ctx, plitem_t *plist)
 
 	cexpr_init_symtab (&vars_tab, &exprctx);
 
-	if (!PL_ParseDictionary (renderpass_fields, plist,
-							 &renderpass_data, messages, &parsectx)) {
+	if (!PL_ParseStruct (renderpass_fields, plist, &renderpass_data,
+						 messages, &parsectx)) {
 		for (int i = 0; i < PL_A_NumObjects (messages); i++) {
 			Sys_Printf ("%s\n", PL_String (PL_ObjectAtIndex (messages, i)));
 		}

From 55c1ed124df99fec8737c8e4d1f5cd6fc0232409 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 24 Dec 2020 15:52:32 +0900
Subject: [PATCH 1220/1519] [doxygen] Fix some missed issues for doc building

---
 doc/Makemodule.am          |  3 ++-
 doc/quakeforge.dox.conf.in | 13 +++----------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/doc/Makemodule.am b/doc/Makemodule.am
index b26d57841..91d9270b7 100644
--- a/doc/Makemodule.am
+++ b/doc/Makemodule.am
@@ -76,5 +76,6 @@ doc/progs/vm-mem.eps: doc/progs/vm-mem.fig
 doc/qtv/qwtv.svg: doc/qtv/qwtv.fig
 doc/qtv/qwtv.eps: doc/qtv/qwtv.fig
 
-doc: doc/quakeforge.dox.conf doc/progs/vm-mem.svg doc/progs/vm-mem.eps doc/qtv/qwtv.svg qtv/qwtv.eps ${DOX}
+.PHONY: doc
+doc: doc/quakeforge.dox.conf doc/progs/vm-mem.svg doc/progs/vm-mem.eps doc/qtv/qwtv.svg doc/qtv/qwtv.eps ${DOX}
 	doxygen doc/quakeforge.dox.conf
diff --git a/doc/quakeforge.dox.conf.in b/doc/quakeforge.dox.conf.in
index a235a895d..1e925e354 100644
--- a/doc/quakeforge.dox.conf.in
+++ b/doc/quakeforge.dox.conf.in
@@ -253,12 +253,6 @@ TAB_SIZE               = 4
 
 ALIASES                = QF=QuakeForge
 
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST              =
-
 # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
 # only. Doxygen will then generate output that is more tailored for C. For
 # instance, some of the names that are used will be different. The list of all
@@ -937,8 +931,8 @@ EXAMPLE_RECURSIVE      = NO
 # \image command).
 
 IMAGE_PATH             = @TOPSRC@/doc \
-                         @builddir@/progs \
-                         @builddir@/qtv
+                         @builddir@/doc/progs \
+                         @builddir@/doc/qtv
 
 # The INPUT_FILTER tag can be used to specify a program that doxygen should
 # invoke to filter for each input file. Doxygen will invoke the filter program
@@ -1756,7 +1750,7 @@ COMPACT_LATEX          = YES
 # The default value is: a4.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
-PAPER_TYPE             = a4wide
+PAPER_TYPE             = a4
 
 # The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
 # that should be included in the LaTeX output. The package can be specified just
@@ -2144,7 +2138,6 @@ SEARCH_INCLUDES        = YES
 # This tag requires that the tag SEARCH_INCLUDES is set to YES.
 
 INCLUDE_PATH           = @TOPSRC@/include \
-                         @TOPSRC@/hw/include \
                          @TOPSRC@/nq/include \
                          @TOPSRC@/qw/include \
                          @TOPSRC@/qtv/include

From fefb32bf13bd4d553465c5599403d190cf9f5262 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 24 Dec 2020 15:59:33 +0900
Subject: [PATCH 1221/1519] [util] Add a PL dictionary to hash table parser

---
 include/QF/qfplist.h | 88 ++++++++++++++++++++++++++++++++++++++++++--
 libs/util/qfplist.c  | 62 +++++++++++++++++++++++++++++++
 2 files changed, 147 insertions(+), 3 deletions(-)

diff --git a/include/QF/qfplist.h b/include/QF/qfplist.h
index e8a64f054..972f69dc3 100644
--- a/include/QF/qfplist.h
+++ b/include/QF/qfplist.h
@@ -147,7 +147,7 @@ int PL_Line (const plitem_t *item) __attribute__((pure));
 	\return the size in bytes of the binary object 0 if binary isn't a binary
 	object.
 */
-size_t PL_BinarySize (const plitem_t *item) __attribute__((pure));
+size_t PL_BinarySize (const plitem_t *binary) __attribute__((pure));
 
 /** Retrieve the data from a binary object.
 
@@ -323,9 +323,9 @@ void PL_Free (plitem_t *item);
 
 	Can be used recursively to parse deep hierarchies.
 
-	\param dict		The dictionary object to parse
 	\param fields	Array of field items describing the structure. Terminated
 					by a field item with a null \a name pointer.
+	\param dict		The dictionary object to parse
 	\param data     Pointer to the structure into which the data will be
 					parsed.
 	\param messages Array object supplied by the caller used for storing
@@ -344,8 +344,90 @@ void PL_Free (plitem_t *item);
 */
 int PL_ParseStruct (const plfield_t *fields, const plitem_t *dict,
 					void *data, plitem_t *messages, void *context);
-int PL_ParseArray (const plfield_t *fields, const plitem_t *dict,
+
+/**	Parse an array object into a dynamic arrah (see darray.h).
+
+	For each object in the array, the field item is used to determine how to
+	parse the object. If the array is empty, the destination will be
+	initialized to an empty array.
+
+	When an error occurs (incorrect item type (item type does not match the
+	type specified in the element object) or the element object's \a parser
+	returns 0), processing continues but the error result is returned.
+
+	Can be used recursively to parse deep hierarchies.
+
+	\param field	Pointer to a single field that has the field data pointer
+					set to reference a plelement_t object used to describe
+					the contents of the array.
+	\param array	The array object to parse
+	\param data     Pointer to the pointer to which the dynamic array will
+					be written. The dynamic array is allocated using
+					DARRAY_ALLOCFIXED().
+	\param messages Array object supplied by the caller used for storing
+					messages. The messages may or may not indicate errors (its
+					contents are not checked). This function itself will add
+					only string objects.
+					If there are any errors, suitable messages will be found in
+					the \a messages object. However, just because there are no
+					errors doesn't mean that \a messages will remain empty as
+					a field's \a parser may add other messages. The standard
+					message format is "[line number]: [message]". If the line
+					number is 0, then the actual line is unknown (due to the
+					source item not being parsed from a file or string).
+	\param context	Additional context data passed to the parser.
+	\return			0 if there are any errors, 1 if there are no errors.
+*/
+int PL_ParseArray (const plfield_t *field, const plitem_t *array,
 				   void *data, plitem_t *messages, void *context);
+
+/**	Parse a dictionary object into a hash table.
+
+	For each key in the dictionary, the element object is used to determine
+	how to parse the object associated with that key. Duplicate keys are an
+	error: they must be unique. A suitable message is added to the
+	\a messages object. If the dictionary object is empty, the destination
+	table is left unmodified.
+
+	When an error occurs (duplicate keys, incorrect type, or the element
+	object's \a parser returns 0), processing continues but the error
+	result is returned.
+
+	Can be used recursively to parse deep hierarchies.
+
+	Hash_Add() is used to add objects to the hash table, and Hash_Find() is
+	used to check for duplicates. Hash_Free() is used to free unused
+	objects. The means that the hash table is expected to use standard
+	objects with embedded keys (the parser is expected to put the key in the
+	object) and to have a free function.
+
+	The parser's data paramenter points to a pre-allocated block of memory
+	of the sized indicated by the element object's size field, using the
+	element object's alloc callback. The name field in the field paramenter
+	is set to the object's key and remains owned by the dictionary.
+
+	\param field	Pointer to a single field that has the field data pointer
+					set to reference a plelement_t object used to describe
+					the contents of the dictionary.
+	\param dict		The dictionary object to parse
+	\param data     Pointer to the structure into which the data will be
+					parsed.
+	\param messages Array object supplied by the caller used for storing
+					messages. The messages may or may not indicate errors (its
+					contents are not checked). This function itself will add
+					only string objects.
+					If there are any errors, suitable messages will be found in
+					the \a messages object. However, just because there are no
+					errors doesn't mean that \a messages will remain empty as
+					a field's \a parser may add other messages. The standard
+					message format is "[line number]: [message]". If the line
+					number is 0, then the actual line is unknown (due to the
+					source item not being parsed from a file or string).
+	\param context	Additional context data passed to the parser.
+	\return			0 if there are any errors, 1 if there are no errors.
+*/
+int PL_ParseSymtab (const plfield_t *field, const plitem_t *dict,
+					void *data, plitem_t *messages, void *context);
 void __attribute__((format(printf,3,4)))
 PL_Message (plitem_t *messages, const plitem_t *item, const char *fmt, ...);
 
diff --git a/libs/util/qfplist.c b/libs/util/qfplist.c
index d8338a332..e789435ef 100644
--- a/libs/util/qfplist.c
+++ b/libs/util/qfplist.c
@@ -1247,3 +1247,65 @@ PL_ParseArray (const plfield_t *field, const plitem_t *array, void *data,
 	*(arr_t **) data = arr;
 	return result;
 }
+
+VISIBLE int
+PL_ParseSymtab (const plfield_t *field, const plitem_t *dict, void *data,
+				plitem_t *messages, void *context)
+{
+	void      **list, **l;
+	dictkey_t  *current;
+	int         result = 1;
+	plparser_t  parser;
+	__auto_type tab = (hashtab_t *) data;
+
+	plelement_t *element = (plelement_t *) field->data;
+	plfield_t   f = { 0, 0, element->type, element->parser, element->data };
+
+	if (dict->type != QFDictionary) {
+		PL_Message (messages, dict, "error: not a dictionary object");
+		return 0;
+	}
+
+	if (f.parser) {
+		parser = f.parser;
+	} else {
+		PL_Message (messages, dict, "no parser set");
+		return 0;
+	}
+
+	if (!(l = list = Hash_GetList ((hashtab_t *) dict->data))) {
+		// empty struct: leave as default
+		return 1;
+	}
+
+	void       *obj = element->alloc (element->stride);
+	while ((current = (dictkey_t *) *l++)) {
+		const char *key = current->key;
+		plitem_t   *item = current->value;
+
+		if (item->type != element->type) {
+			PL_Message (messages, item,
+						"error: element %s is the wrong type"
+						" Got %s, expected %s", key,
+						pl_types[element->type],
+						pl_types[item->type]);
+			result = 0;
+			continue;
+		}
+		f.name = key;
+		if (Hash_Find (tab, key)) {
+			PL_Message (messages, item, "duplicate name");
+			result = 0;
+		} else {
+			if (!parser (&f, item, obj, messages, context)) {
+				result = 0;
+			} else {
+				Hash_Add (tab, obj);
+				obj = element->alloc (element->stride);
+			}
+		}
+	}
+	Hash_Free (tab, obj);
+	free (list);
+	return result;
+}

From 9db80259d1c75f937f08677f729563fc17488590 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 24 Dec 2020 16:39:05 +0900
Subject: [PATCH 1222/1519] [gl,glsl] Copy fog color rather than return pointer

The static variable meant that Fog_GetColor was not thread-safe (though
multiple calls in the one thread look to be ok for now). However, this
change takes it one step closer to being more generally usable.

Patch found in an old stash.
---
 include/r_internal.h                      |  2 +-
 libs/video/renderer/gl/gl_fog.c           | 37 ++++++++++++-----------
 libs/video/renderer/glsl/glsl_alias.c     |  2 +-
 libs/video/renderer/glsl/glsl_bsp.c       |  8 ++---
 libs/video/renderer/glsl/glsl_fog.c       | 25 +++++++--------
 libs/video/renderer/glsl/glsl_iqm.c       |  2 +-
 libs/video/renderer/glsl/glsl_particles.c |  4 +--
 libs/video/renderer/glsl/glsl_sprite.c    |  2 +-
 8 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/include/r_internal.h b/include/r_internal.h
index 31272a5a8..547d4d1bf 100644
--- a/include/r_internal.h
+++ b/include/r_internal.h
@@ -31,7 +31,7 @@ void Fog_Update (float density, float red, float green, float blue,
 struct plitem_s;
 void Fog_ParseWorldspawn (struct plitem_s *worldspawn);
 
-float *Fog_GetColor (void);
+void Fog_GetColor (quat_t fogcolor);
 float Fog_GetDensity (void) __attribute__((pure));
 void Fog_SetupFrame (void);
 void Fog_EnableGFog (void);
diff --git a/libs/video/renderer/gl/gl_fog.c b/libs/video/renderer/gl/gl_fog.c
index fe63419b5..b8747e37b 100644
--- a/libs/video/renderer/gl/gl_fog.c
+++ b/libs/video/renderer/gl/gl_fog.c
@@ -189,32 +189,29 @@ gl_Fog_ParseWorldspawn (plitem_t *worldspawn)
 
 	calculates fog color for this frame, taking into account fade times
 */
-float *
-gl_Fog_GetColor (void)
+void
+gl_Fog_GetColor (quat_t fogcolor)
 {
-	static float c[4];
 	float       f;
 	int         i;
 
 	if (fade_done > vr_data.realtime) {
 		f = (fade_done - vr_data.realtime) / fade_time;
-		c[0] = f * old_red + (1.0 - f) * fog_red;
-		c[1] = f * old_green + (1.0 - f) * fog_green;
-		c[2] = f * old_blue + (1.0 - f) * fog_blue;
-		c[3] = 1.0;
+		fogcolor[0] = f * old_red + (1.0 - f) * fog_red;
+		fogcolor[1] = f * old_green + (1.0 - f) * fog_green;
+		fogcolor[2] = f * old_blue + (1.0 - f) * fog_blue;
+		fogcolor[3] = 1.0;
 	} else {
-		c[0] = fog_red;
-		c[1] = fog_green;
-		c[2] = fog_blue;
-		c[3] = 1.0;
+		fogcolor[0] = fog_red;
+		fogcolor[1] = fog_green;
+		fogcolor[2] = fog_blue;
+		fogcolor[3] = 1.0;
 	}
 
 	//find closest 24-bit RGB value, so solid-colored sky can match the fog
 	//perfectly
 	for (i = 0; i < 3; i++)
-		c[i] = (float) (rint (c[i] * 255)) / 255.0f;
-
-	return c;
+		fogcolor[i] = (float) (rint (fogcolor[i] * 255)) / 255.0f;
 }
 
 /*
@@ -243,7 +240,10 @@ gl_Fog_GetDensity (void)
 void
 gl_Fog_SetupFrame (void)
 {
-	qfglFogfv (GL_FOG_COLOR, gl_Fog_GetColor ());
+	quat_t      fogcolor;
+
+	gl_Fog_GetColor (fogcolor);
+	qfglFogfv (GL_FOG_COLOR, fogcolor);
 	qfglFogf (GL_FOG_DENSITY, gl_Fog_GetDensity () / 64.0);
 }
 
@@ -294,8 +294,11 @@ gl_Fog_StartAdditive (void)
 void
 gl_Fog_StopAdditive (void)
 {
-	if (gl_Fog_GetDensity () > 0)
-		qfglFogfv (GL_FOG_COLOR, gl_Fog_GetColor ());
+	if (gl_Fog_GetDensity () > 0) {
+		quat_t      fogcolor;
+		gl_Fog_GetColor (fogcolor);
+		qfglFogfv (GL_FOG_COLOR, fogcolor);
+	}
 }
 
 //==============================================================================
diff --git a/libs/video/renderer/glsl/glsl_alias.c b/libs/video/renderer/glsl/glsl_alias.c
index 3fdd50b66..155845450 100644
--- a/libs/video/renderer/glsl/glsl_alias.c
+++ b/libs/video/renderer/glsl/glsl_alias.c
@@ -333,7 +333,7 @@ glsl_R_AliasBegin (void)
 	qfeglDisableVertexAttribArray (quake_mdl.colora.location);
 	qfeglDisableVertexAttribArray (quake_mdl.colorb.location);
 
-	VectorCopy (glsl_Fog_GetColor (), fog);
+	glsl_Fog_GetColor (fog);
 	fog[3] = glsl_Fog_GetDensity () / 64.0;
 	qfeglUniform4fv (quake_mdl.fog.location, 1, fog);
 
diff --git a/libs/video/renderer/glsl/glsl_bsp.c b/libs/video/renderer/glsl/glsl_bsp.c
index 682ffb628..767000b12 100644
--- a/libs/video/renderer/glsl/glsl_bsp.c
+++ b/libs/video/renderer/glsl/glsl_bsp.c
@@ -360,7 +360,7 @@ static void
 update_lightmap (msurface_t *surf)
 {
 	int         maps;
-
+return;
 	for (maps = 0; maps < MAXLIGHTMAPS && surf->styles[maps] != 255; maps++)
 		if (d_lightstylevalue[surf->styles[maps]] != surf->cached_light[maps])
 			goto dynamic;
@@ -871,7 +871,7 @@ bsp_begin (void)
 
 	qfeglVertexAttrib4fv (quake_bsp.color.location, default_color);
 
-	VectorCopy (glsl_Fog_GetColor (), fog);
+	glsl_Fog_GetColor (fog);
 	fog[3] = glsl_Fog_GetDensity () / 64.0;
 	qfeglUniform4fv (quake_bsp.fog.location, 1, fog);
 
@@ -926,7 +926,7 @@ turb_begin (void)
 
 	qfeglVertexAttrib4fv (quake_turb.color.location, default_color);
 
-	VectorCopy (glsl_Fog_GetColor (), fog);
+	glsl_Fog_GetColor (fog);
 	fog[3] = glsl_Fog_GetDensity () / 64.0;
 	qfeglUniform4fv (quake_turb.fog.location, 1, fog);
 
@@ -1030,7 +1030,7 @@ sky_begin (void)
 		qfeglEnable (GL_TEXTURE_2D);
 	}
 
-	VectorCopy (glsl_Fog_GetColor (), fog);
+	glsl_Fog_GetColor (fog);
 	fog[3] = glsl_Fog_GetDensity () / 64.0;
 	qfeglUniform4fv (sky_params.fog->location, 1, fog);
 
diff --git a/libs/video/renderer/glsl/glsl_fog.c b/libs/video/renderer/glsl/glsl_fog.c
index 8e246b6b7..8118b8497 100644
--- a/libs/video/renderer/glsl/glsl_fog.c
+++ b/libs/video/renderer/glsl/glsl_fog.c
@@ -189,32 +189,29 @@ glsl_Fog_ParseWorldspawn (plitem_t *worldspawn)
 
 	calculates fog color for this frame, taking into account fade times
 */
-float *
-glsl_Fog_GetColor (void)
+void
+glsl_Fog_GetColor (quat_t fogcolor)
 {
-	static float c[4];
 	float       f;
 	int         i;
 
 	if (fade_done > vr_data.realtime) {
 		f = (fade_done - vr_data.realtime) / fade_time;
-		c[0] = f * old_red + (1.0 - f) * fog_red;
-		c[1] = f * old_green + (1.0 - f) * fog_green;
-		c[2] = f * old_blue + (1.0 - f) * fog_blue;
-		c[3] = 1.0;
+		fogcolor[0] = f * old_red + (1.0 - f) * fog_red;
+		fogcolor[1] = f * old_green + (1.0 - f) * fog_green;
+		fogcolor[2] = f * old_blue + (1.0 - f) * fog_blue;
+		fogcolor[3] = 1.0;
 	} else {
-		c[0] = fog_red;
-		c[1] = fog_green;
-		c[2] = fog_blue;
-		c[3] = 1.0;
+		fogcolor[0] = fog_red;
+		fogcolor[1] = fog_green;
+		fogcolor[2] = fog_blue;
+		fogcolor[3] = 1.0;
 	}
 
 	//find closest 24-bit RGB value, so solid-colored sky can match the fog
 	//perfectly
 	for (i = 0; i < 3; i++)
-		c[i] = (float) (rint (c[i] * 255)) / 255.0f;
-
-	return c;
+		fogcolor[i] = (float) (rint (fogcolor[i] * 255)) / 255.0f;
 }
 
 /*
diff --git a/libs/video/renderer/glsl/glsl_iqm.c b/libs/video/renderer/glsl/glsl_iqm.c
index d189a4cbe..e757cf087 100644
--- a/libs/video/renderer/glsl/glsl_iqm.c
+++ b/libs/video/renderer/glsl/glsl_iqm.c
@@ -278,7 +278,7 @@ glsl_R_IQMBegin (void)
 
 	qfeglUseProgram (iqm_shader.program);
 
-	VectorCopy (glsl_Fog_GetColor (), fog);
+	glsl_Fog_GetColor (fog);
 	fog[3] = glsl_Fog_GetDensity () / 64.0;
 	qfeglUniform4fv (iqm_shader.fog.location, 1, fog);
 
diff --git a/libs/video/renderer/glsl/glsl_particles.c b/libs/video/renderer/glsl/glsl_particles.c
index c4e214c50..b1461f208 100644
--- a/libs/video/renderer/glsl/glsl_particles.c
+++ b/libs/video/renderer/glsl/glsl_particles.c
@@ -1579,7 +1579,7 @@ draw_qf_particles (void)
 	qfeglEnableVertexAttribArray (quake_part.color.location);
 	qfeglEnableVertexAttribArray (quake_part.st.location);
 
-	VectorCopy (glsl_Fog_GetColor (), fog);
+	glsl_Fog_GetColor (fog);
 	fog[3] = glsl_Fog_GetDensity () / 64.0;
 	qfeglUniform4fv (quake_part.fog.location, 1, fog);
 
@@ -1725,7 +1725,7 @@ draw_id_particles (void)
 
 	qfeglUniformMatrix4fv (quake_point.mvp_matrix.location, 1, false, vp_mat);
 
-	VectorCopy (glsl_Fog_GetColor (), fog);
+	glsl_Fog_GetColor (fog);
 	fog[3] = glsl_Fog_GetDensity () / 64.0;
 	qfeglUniform4fv (quake_point.fog.location, 1, fog);
 
diff --git a/libs/video/renderer/glsl/glsl_sprite.c b/libs/video/renderer/glsl/glsl_sprite.c
index 69c67335a..c0acdc078 100644
--- a/libs/video/renderer/glsl/glsl_sprite.c
+++ b/libs/video/renderer/glsl/glsl_sprite.c
@@ -335,7 +335,7 @@ R_SpriteBegin (void)
 	qfeglDisableVertexAttribArray (quake_sprite.colorb.location);
 	qfeglDisableVertexAttribArray (quake_sprite.blend.location);
 
-	VectorCopy (glsl_Fog_GetColor (), fog);
+	glsl_Fog_GetColor (fog);
 	fog[3] = glsl_Fog_GetDensity () / 64.0;
 	qfeglUniform4fv (quake_sprite.fog.location, 1, fog);
 

From c0c728b188c6c0a7c44f18ec8b0b9ea878137669 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 25 Dec 2020 00:17:20 +0900
Subject: [PATCH 1223/1519] [vulkan] Fix a few code generation issues

QC's int type is named "integer" (didn't feel like changing that right
now), so special case it to be "int".

Output the parse func name (instead of "fix me").

Output a parse func for enums (needed for arrays of enums
(VkDynamicState)).
---
 libs/video/renderer/vulkan/vkgen/vkenum.r   | 18 ++++++++++++++++++
 libs/video/renderer/vulkan/vkgen/vkstruct.r |  4 ++--
 libs/video/renderer/vulkan/vkgen/vktype.r   |  6 ++++++
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/libs/video/renderer/vulkan/vkgen/vkenum.r b/libs/video/renderer/vulkan/vkgen/vkenum.r
index 234c99b61..9f12c013e 100644
--- a/libs/video/renderer/vulkan/vkgen/vkenum.r
+++ b/libs/video/renderer/vulkan/vkgen/vkenum.r
@@ -120,6 +120,24 @@ skip_value(string name)
 	fprintf (output_file, "\t&%s_symtab,\n", [self name]);
 	fprintf (output_file, "};\n");
 
+	fprintf (output_file, "static plfield_t %s_field = { 0, 0, QFString,"
+			 " parse_enum, &%s_enum};\n",
+			 [self name], [self name]);
+	fprintf (output_file, "int parse_%s (const plfield_t *field,"
+			 " const plitem_t *item, void *data, plitem_t *messages,"
+			 " void *context)\n",
+			 [self name]);
+	fprintf (output_file, "{\n");
+	fprintf (output_file,
+			 "\treturn parse_enum (&%s_field, item, data, messages,"
+			 " context);\n",
+			 [self name]);
+	fprintf (output_file, "}\n");
+
+	fprintf (header_file, "int parse_%s (const plfield_t *field,"
+			 " const plitem_t *item, void *data, plitem_t *messages,"
+			 " void *context);\n",
+			 [self name]);
 	fprintf (header_file, "extern exprenum_t %s_enum;\n", [self name]);
 }
 
diff --git a/libs/video/renderer/vulkan/vkgen/vkstruct.r b/libs/video/renderer/vulkan/vkgen/vkstruct.r
index 761cbdade..ac03d8f41 100644
--- a/libs/video/renderer/vulkan/vkgen/vkstruct.r
+++ b/libs/video/renderer/vulkan/vkgen/vkstruct.r
@@ -175,7 +175,7 @@
 
 -(string) cexprType
 {
-	return [self name] + "_type";
+	return [self outname] + "_type";
 }
 
 -(string) parseType
@@ -185,7 +185,7 @@
 
 -(string) parseFunc
 {
-	return "fix me";
+	return "parse_" + [self outname];
 }
 
 -(string) parseData
diff --git a/libs/video/renderer/vulkan/vkgen/vktype.r b/libs/video/renderer/vulkan/vkgen/vktype.r
index fbe44e350..735e88339 100644
--- a/libs/video/renderer/vulkan/vkgen/vktype.r
+++ b/libs/video/renderer/vulkan/vkgen/vktype.r
@@ -75,6 +75,9 @@ static string get_type_key (void *type, void *unused)
 -(string) name
 {
 	if (type.meta == ty_basic) {
+		if (type.type == ev_integer) {
+			return "int";
+		}
 		return pr_type_name[type.type];
 	}
 	//FIXME extract alias name and return proper type name
@@ -118,6 +121,9 @@ static string get_type_key (void *type, void *unused)
 -(string) parseData
 {
 	if (type.meta == ty_basic) {
+		if (type.type == ev_integer) {
+			return "&cexpr_int";
+		}
 		return "&cexpr_" + pr_type_name[type.type];
 	}
 	return "0";

From d824db68a5df60bafd7359032d2ec9e9bbd623d4 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 25 Dec 2020 00:28:26 +0900
Subject: [PATCH 1224/1519] [util] Zero plist symtabl object memory

---
 libs/util/qfplist.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libs/util/qfplist.c b/libs/util/qfplist.c
index e789435ef..3e64e3c3e 100644
--- a/libs/util/qfplist.c
+++ b/libs/util/qfplist.c
@@ -1279,6 +1279,7 @@ PL_ParseSymtab (const plfield_t *field, const plitem_t *dict, void *data,
 	}
 
 	void       *obj = element->alloc (element->stride);
+	memset (obj, 0, element->stride);
 	while ((current = (dictkey_t *) *l++)) {
 		const char *key = current->key;
 		plitem_t   *item = current->value;
@@ -1302,6 +1303,7 @@ PL_ParseSymtab (const plfield_t *field, const plitem_t *dict, void *data,
 			} else {
 				Hash_Add (tab, obj);
 				obj = element->alloc (element->stride);
+				memset (obj, 0, element->stride);
 			}
 		}
 	}

From 4f8a06ddd3052f5e66e2ed8e1838524fc589c18f Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 21 Dec 2020 02:12:51 +0900
Subject: [PATCH 1225/1519] [build] Fix a pile of gcc 10 issues

gcc got stricter about array accesses, complicating progs macros, and
much better at detecting buffer overflows.
---
 include/QF/math/vector.h           |  7 ++-
 include/QF/pr_comp.h               |  4 +-
 include/QF/progs.h                 | 14 ++---
 libs/console/bi_inputline.c        |  2 +-
 libs/gamecode/pr_debug.c           |  8 +--
 libs/gamecode/pr_exec.c            | 89 +++++++++++++++---------------
 libs/gamecode/pr_parse.c           |  6 +-
 libs/models/alias/model_alias.c    |  2 +-
 libs/ruamoko/rua_hash.c            |  2 +-
 libs/ruamoko/rua_msgbuf.c          |  5 +-
 libs/ruamoko/rua_obj.c             |  2 +-
 libs/ruamoko/rua_plist.c           |  2 +-
 libs/ruamoko/rua_qfile.c           |  2 +-
 libs/ruamoko/rua_script.c          |  2 +-
 libs/ruamoko/rua_set.c             |  4 +-
 libs/util/zone.c                   |  3 +-
 libs/video/renderer/r_progs.c      |  2 +-
 nq/include/sv_progs.h              |  2 +-
 qw/include/sv_progs.h              |  2 +-
 qw/source/pmove.c                  |  2 +-
 qw/source/sv_progs.c               |  4 +-
 ruamoko/qwaq/builtins/curses.c     |  4 +-
 ruamoko/qwaq/builtins/debug.c      |  2 +-
 ruamoko/qwaq/builtins/editbuffer.c |  2 +-
 ruamoko/qwaq/builtins/main.c       |  1 +
 tools/qfbsp/source/outside.c       |  2 +
 tools/qfcc/include/qfcc.h          |  4 +-
 tools/qflight/include/noise.h      |  2 +-
 tools/qfmodelgen/source/modelgen.c | 10 ++--
 29 files changed, 100 insertions(+), 93 deletions(-)

diff --git a/include/QF/math/vector.h b/include/QF/math/vector.h
index 6a8b80809..993cbaf08 100644
--- a/include/QF/math/vector.h
+++ b/include/QF/math/vector.h
@@ -142,7 +142,12 @@ extern const vec_t *const vec3_origin;
 	} while (0)
 
 #define VectorIsZero(a) (!(a)[0] && !(a)[1] && !(a)[2])
-#define VectorZero(a) ((a)[2] = (a)[1] = (a)[0] = 0);
+#define VectorZero(a) \
+	do { \
+		(a)[0] = 0; \
+		(a)[1] = 0; \
+		(a)[2] = 0; \
+	} while (0)
 #define VectorSet(a,b,c,d) \
 	do { \
 		(d)[0] = a; \
diff --git a/include/QF/pr_comp.h b/include/QF/pr_comp.h
index a84e56953..0cd65d7e5 100644
--- a/include/QF/pr_comp.h
+++ b/include/QF/pr_comp.h
@@ -474,8 +474,8 @@ typedef union pr_type_u {
 	string_t    string_var;
 	func_t      func_var;
 	pr_int_t    entity_var;
-	float       vector_var[0];	// really 3, but this structure must be 32 bits
-	float       quat_var[0];	// really 4, but this structure must be 32 bits
+	float       vector_var;	// really [3], but this structure must be 32 bits
+	float       quat_var;	// really [4], but this structure must be 32 bits
 	pr_int_t    integer_var;
 	pointer_t   pointer_var;
 	pr_uint_t   uinteger_var;
diff --git a/include/QF/progs.h b/include/QF/progs.h
index 8a78926bf..64a9d20bb 100644
--- a/include/QF/progs.h
+++ b/include/QF/progs.h
@@ -445,7 +445,7 @@ void PR_Undefined (progs_t *pr, const char *type, const char *name) __attribute_
 
 	\hideinitializer
 */
-#define G_VECTOR(p,o)	G_var (p, o, vector)
+#define G_VECTOR(p,o)	(&G_var (p, o, vector))
 
 /** Access a quaternion global. Can be assigned to.
 
@@ -457,7 +457,7 @@ void PR_Undefined (progs_t *pr, const char *type, const char *name) __attribute_
 
 	\hideinitializer
 */
-#define G_QUAT(p,o)		G_var (p, o, quat)
+#define G_QUAT(p,o)		(&G_var (p, o, quat))
 
 /** Access a string index global. Can be assigned to.
 
@@ -661,7 +661,7 @@ void PR_Undefined (progs_t *pr, const char *type, const char *name) __attribute_
 
 	\hideinitializer
 */
-#define P_VECTOR(p,n)	P_var (p, n, vector)
+#define P_VECTOR(p,n)	(&P_var (p, n, vector))
 
 /** Access a quaterion parameter. Can be used any way a quat_t variable can.
 
@@ -673,7 +673,7 @@ void PR_Undefined (progs_t *pr, const char *type, const char *name) __attribute_
 
 	\hideinitializer
 */
-#define P_QUAT(p,n)		P_var (p, n, quat)
+#define P_QUAT(p,n)		(&P_var (p, n, quat))
 
 /** Access a string index parameter. Can be assigned to.
 
@@ -873,7 +873,7 @@ void PR_Undefined (progs_t *pr, const char *type, const char *name) __attribute_
 
 	\hideinitializer
 */
-#define R_VECTOR(p)		R_var (p, vector)
+#define R_VECTOR(p)		(&R_var (p, vector))
 
 /** Access the VM function return value as a \c ::quat_t quaternion.
 
@@ -884,7 +884,7 @@ void PR_Undefined (progs_t *pr, const char *type, const char *name) __attribute_
 
 	\hideinitializer
 */
-#define R_QUAT(p)		R_var (p, quat)
+#define R_QUAT(p)		(&R_var (p, quat))
 
 /** Access the VM function return value as a ::string_t (a VM string reference).
 
@@ -1054,7 +1054,7 @@ void PR_Undefined (progs_t *pr, const char *type, const char *name) __attribute_
 
 	\hideinitializer
 */
-#define E_VECTOR(e,o)	E_var (e, o, vector)
+#define E_VECTOR(e,o)	(&E_var (e, o, vector))
 
 /** Access a quaternion entity field. Can be used any way a quat_t variable
 	can.
diff --git a/libs/console/bi_inputline.c b/libs/console/bi_inputline.c
index f48a4551e..7e4e743a2 100644
--- a/libs/console/bi_inputline.c
+++ b/libs/console/bi_inputline.c
@@ -83,7 +83,7 @@ il_data_get (il_resources_t *res, unsigned index)
 	PR_RESGET (res->line_map, index);
 }
 
-static inline int
+static inline int __attribute__((pure))
 il_data_index (il_resources_t *res, il_data_t *line)
 {
 	PR_RESINDEX (res->line_map, line);
diff --git a/libs/gamecode/pr_debug.c b/libs/gamecode/pr_debug.c
index 3d99da30a..d8105c5f6 100644
--- a/libs/gamecode/pr_debug.c
+++ b/libs/gamecode/pr_debug.c
@@ -1133,9 +1133,7 @@ pr_debug_vector_view (qfot_type_t *type, pr_type_t *value, void *_data)
 	__auto_type data = (pr_debug_data_t *) _data;
 	dstring_t  *dstr = data->dstr;
 
-	dasprintf (dstr, "'%.9g %.9g %.9g'",
-			  value->vector_var[0], value->vector_var[1],
-			  value->vector_var[2]);
+	dasprintf (dstr, "'%.9g %.9g %.9g'", VectorExpand (&value->vector_var));
 }
 
 static void
@@ -1213,9 +1211,7 @@ pr_debug_quat_view (qfot_type_t *type, pr_type_t *value, void *_data)
 	__auto_type data = (pr_debug_data_t *) _data;
 	dstring_t  *dstr = data->dstr;
 
-	dasprintf (dstr, "'%.9g %.9g %.9g %.9g'",
-			   value->vector_var[0], value->vector_var[1],
-			   value->vector_var[2], value->vector_var[3]);
+	dasprintf (dstr, "'%.9g %.9g %.9g %.9g'", QuatExpand (&value->quat_var));
 }
 
 static void
diff --git a/libs/gamecode/pr_exec.c b/libs/gamecode/pr_exec.c
index 4a79f8173..9a9d03893 100644
--- a/libs/gamecode/pr_exec.c
+++ b/libs/gamecode/pr_exec.c
@@ -512,10 +512,10 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 				OPC.float_var = OPA.float_var + OPB.float_var;
 				break;
 			case OP_ADD_V:
-				VectorAdd (OPA.vector_var, OPB.vector_var, OPC.vector_var);
+				VectorAdd (&OPA.vector_var, &OPB.vector_var, &OPC.vector_var);
 				break;
 			case OP_ADD_Q:
-				QuatAdd (OPA.quat_var, OPB.quat_var, OPC.quat_var);
+				QuatAdd (&OPA.quat_var, &OPB.quat_var, &OPC.quat_var);
 				break;
 			case OP_ADD_S:
 				OPC.string_var = PR_CatStrings (pr,
@@ -531,10 +531,11 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 				OPC.float_var = OPA.float_var - OPB.float_var;
 				break;
 			case OP_SUB_V:
-				VectorSubtract (OPA.vector_var, OPB.vector_var, OPC.vector_var);
+				VectorSubtract (&OPA.vector_var, &OPB.vector_var,
+								&OPC.vector_var);
 				break;
 			case OP_SUB_Q:
-				QuatSubtract (OPA.quat_var, OPB.quat_var, OPC.quat_var);
+				QuatSubtract (&OPA.quat_var, &OPB.quat_var, &OPC.quat_var);
 				break;
 			case OP_MUL_D:
 				OPC_double_var = OPA_double_var * OPB_double_var;
@@ -543,14 +544,14 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 				OPC.float_var = OPA.float_var * OPB.float_var;
 				break;
 			case OP_MUL_V:
-				OPC.float_var = DotProduct (OPA.vector_var, OPB.vector_var);
+				OPC.float_var = DotProduct (&OPA.vector_var, &OPB.vector_var);
 				break;
 			case OP_MUL_DV:
 				{
 					// avoid issues with the likes of x = x.x * x;
 					// makes for faster code, too
 					double      scale = OPA_double_var;
-					VectorScale (OPB.vector_var, scale, OPC.vector_var);
+					VectorScale (&OPB.vector_var, scale, &OPC.vector_var);
 				}
 				break;
 			case OP_MUL_VD:
@@ -558,7 +559,7 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 					// avoid issues with the likes of x = x * x.x;
 					// makes for faster code, too
 					double      scale = OPB_double_var;
-					VectorScale (OPA.vector_var, scale, OPC.vector_var);
+					VectorScale (&OPA.vector_var, scale, &OPC.vector_var);
 				}
 				break;
 			case OP_MUL_FV:
@@ -566,7 +567,7 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 					// avoid issues with the likes of x = x.x * x;
 					// makes for faster code, too
 					float       scale = OPA.float_var;
-					VectorScale (OPB.vector_var, scale, OPC.vector_var);
+					VectorScale (&OPB.vector_var, scale, &OPC.vector_var);
 				}
 				break;
 			case OP_MUL_VF:
@@ -574,21 +575,21 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 					// avoid issues with the likes of x = x * x.x;
 					// makes for faster code, too
 					float       scale = OPB.float_var;
-					VectorScale (OPA.vector_var, scale, OPC.vector_var);
+					VectorScale (&OPA.vector_var, scale, &OPC.vector_var);
 				}
 				break;
 			case OP_MUL_Q:
-				QuatMult (OPA.quat_var, OPB.quat_var, OPC.quat_var);
+				QuatMult (&OPA.quat_var, &OPB.quat_var, &OPC.quat_var);
 				break;
 			case OP_MUL_QV:
-				QuatMultVec (OPA.quat_var, OPB.vector_var, OPC.vector_var);
+				QuatMultVec (&OPA.quat_var, &OPB.vector_var, &OPC.vector_var);
 				break;
 			case OP_MUL_DQ:
 				{
 					// avoid issues with the likes of x = x.s * x;
 					// makes for faster code, too
 					double      scale = OPA_double_var;
-					QuatScale (OPB.quat_var, scale, OPC.quat_var);
+					QuatScale (&OPB.quat_var, scale, &OPC.quat_var);
 				}
 				break;
 			case OP_MUL_QD:
@@ -596,7 +597,7 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 					// avoid issues with the likes of x = x * x.s;
 					// makes for faster code, too
 					double      scale = OPB_double_var;
-					QuatScale (OPA.quat_var, scale, OPC.quat_var);
+					QuatScale (&OPA.quat_var, scale, &OPC.quat_var);
 				}
 				break;
 			case OP_MUL_FQ:
@@ -604,7 +605,7 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 					// avoid issues with the likes of x = x.s * x;
 					// makes for faster code, too
 					float       scale = OPA.float_var;
-					QuatScale (OPB.quat_var, scale, OPC.quat_var);
+					QuatScale (&OPB.quat_var, scale, &OPC.quat_var);
 				}
 				break;
 			case OP_MUL_QF:
@@ -612,11 +613,11 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 					// avoid issues with the likes of x = x * x.s;
 					// makes for faster code, too
 					float       scale = OPB.float_var;
-					QuatScale (OPA.quat_var, scale, OPC.quat_var);
+					QuatScale (&OPA.quat_var, scale, &OPC.quat_var);
 				}
 				break;
 			case OP_CONJ_Q:
-				QuatConj (OPA.quat_var, OPC.quat_var);
+				QuatConj (&OPA.quat_var, &OPC.quat_var);
 				break;
 			case OP_DIV_D:
 				OPC_double_var = OPA_double_var / OPB_double_var;
@@ -673,10 +674,10 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 				OPC.integer_var = !FNZ (OPA);
 				break;
 			case OP_NOT_V:
-				OPC.integer_var = VectorIsZero (OPA.vector_var);
+				OPC.integer_var = VectorIsZero (&OPA.vector_var);
 				break;
 			case OP_NOT_Q:
-				OPC.integer_var = QuatIsZero (OPA.quat_var);
+				OPC.integer_var = QuatIsZero (&OPA.quat_var);
 				break;
 			case OP_NOT_S:
 				OPC.integer_var = !OPA.string_var ||
@@ -692,11 +693,11 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 				OPC.integer_var = OPA.float_var == OPB.float_var;
 				break;
 			case OP_EQ_V:
-				OPC.integer_var = VectorCompare (OPA.vector_var,
-												 OPB.vector_var);
+				OPC.integer_var = VectorCompare (&OPA.vector_var,
+												 &OPB.vector_var);
 				break;
 			case OP_EQ_Q:
-				OPC.integer_var = QuatCompare (OPA.quat_var, OPB.quat_var);
+				OPC.integer_var = QuatCompare (&OPA.quat_var, &OPB.quat_var);
 				break;
 			case OP_EQ_E:
 				OPC.integer_var = OPA.integer_var == OPB.integer_var;
@@ -708,11 +709,11 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 				OPC.integer_var = OPA.float_var != OPB.float_var;
 				break;
 			case OP_NE_V:
-				OPC.integer_var = !VectorCompare (OPA.vector_var,
-												  OPB.vector_var);
+				OPC.integer_var = !VectorCompare (&OPA.vector_var,
+												  &OPB.vector_var);
 				break;
 			case OP_NE_Q:
-				OPC.integer_var = !QuatCompare (OPA.quat_var, OPB.quat_var);
+				OPC.integer_var = !QuatCompare (&OPA.quat_var, &OPB.quat_var);
 				break;
 			case OP_LE_S:
 			case OP_GE_S:
@@ -753,10 +754,10 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 				OPB.integer_var = OPA.integer_var;
 				break;
 			case OP_STORE_V:
-				VectorCopy (OPA.vector_var, OPB.vector_var);
+				VectorCopy (&OPA.vector_var, &OPB.vector_var);
 				break;
 			case OP_STORE_Q:
-				QuatCopy (OPA.quat_var, OPB.quat_var);
+				QuatCopy (&OPA.quat_var, &OPB.quat_var);
 				break;
 			case OP_STORE_D:
 				OPB_double_var = OPA_double_var;
@@ -782,7 +783,7 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 					PR_BoundsCheck (pr, pointer, ev_vector);
 				}
 				ptr = pr->pr_globals + pointer;
-				VectorCopy (OPA.vector_var, ptr->vector_var);
+				VectorCopy (&OPA.vector_var, &ptr->vector_var);
 				break;
 			case OP_STOREP_Q:
 				pointer = OPB.integer_var;
@@ -790,7 +791,7 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 					PR_BoundsCheck (pr, pointer, ev_quat);
 				}
 				ptr = pr->pr_globals + pointer;
-				QuatCopy (OPA.quat_var, ptr->quat_var);
+				QuatCopy (&OPA.quat_var, &ptr->quat_var);
 				break;
 			case OP_STOREP_D:
 				pointer = OPB.integer_var;
@@ -909,7 +910,7 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 					PR_BoundsCheck (pr, pointer, ev_vector);
 				}
 				ptr = pr->pr_globals + pointer;
-				VectorCopy (ptr->vector_var, OPC.vector_var);
+				VectorCopy (&ptr->vector_var, &OPC.vector_var);
 				break;
 			case OP_LOADB_Q:
 				pointer = OPA.integer_var + OPB.integer_var;
@@ -917,7 +918,7 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 					PR_BoundsCheck (pr, pointer, ev_quat);
 				}
 				ptr = pr->pr_globals + pointer;
-				QuatCopy (ptr->quat_var, OPC.quat_var);
+				QuatCopy (&ptr->quat_var, &OPC.quat_var);
 				break;
 			case OP_LOADB_D:
 				pointer = OPA.integer_var + OPB.integer_var;
@@ -948,7 +949,7 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 					PR_BoundsCheck (pr, pointer, ev_vector);
 				}
 				ptr = pr->pr_globals + pointer;
-				VectorCopy (ptr->vector_var, OPC.vector_var);
+				VectorCopy (&ptr->vector_var, &OPC.vector_var);
 				break;
 			case OP_LOADBI_Q:
 				pointer = OPA.integer_var + (short) st->b;
@@ -956,7 +957,7 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 					PR_BoundsCheck (pr, pointer, ev_quat);
 				}
 				ptr = pr->pr_globals + pointer;
-				QuatCopy (ptr->quat_var, OPC.quat_var);
+				QuatCopy (&ptr->quat_var, &OPC.quat_var);
 				break;
 			case OP_LOADBI_D:
 				pointer = OPA.integer_var + (short) st->b;
@@ -997,7 +998,7 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 					PR_BoundsCheck (pr, pointer, ev_vector);
 				}
 				ptr = pr->pr_globals + pointer;
-				VectorCopy (OPA.vector_var, ptr->vector_var);
+				VectorCopy (&OPA.vector_var, &ptr->vector_var);
 				break;
 			case OP_STOREB_Q:
 				pointer = OPB.integer_var + OPC.integer_var;
@@ -1005,7 +1006,7 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 					PR_BoundsCheck (pr, pointer, ev_quat);
 				}
 				ptr = pr->pr_globals + pointer;
-				QuatCopy (OPA.quat_var, ptr->quat_var);
+				QuatCopy (&OPA.quat_var, &ptr->quat_var);
 				break;
 			case OP_STOREB_D:
 				pointer = OPB.integer_var + OPC.integer_var;
@@ -1036,7 +1037,7 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 					PR_BoundsCheck (pr, pointer, ev_vector);
 				}
 				ptr = pr->pr_globals + pointer;
-				VectorCopy (OPA.vector_var, ptr->vector_var);
+				VectorCopy (&OPA.vector_var, &ptr->vector_var);
 				break;
 			case OP_STOREBI_Q:
 				pointer = OPB.integer_var + (short) st->c;
@@ -1044,7 +1045,7 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 					PR_BoundsCheck (pr, pointer, ev_quat);
 				}
 				ptr = pr->pr_globals + pointer;
-				QuatCopy (OPA.quat_var, ptr->quat_var);
+				QuatCopy (&OPA.quat_var, &ptr->quat_var);
 				break;
 			case OP_STOREBI_D:
 				pointer = OPB.integer_var + (short) st->c;
@@ -1131,7 +1132,7 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 						PR_BoundsCheck (pr, pointer, ev_integer);
 					}
 
-					VectorCopy (ptr->vector_var, stk->vector_var);
+					VectorCopy (&ptr->vector_var, &stk->vector_var);
 					*pr->globals.stack = stack;
 				}
 				break;
@@ -1148,7 +1149,7 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 						PR_BoundsCheck (pr, pointer, ev_quat);
 					}
 
-					QuatCopy (ptr->quat_var, stk->quat_var);
+					QuatCopy (&ptr->quat_var, &stk->quat_var);
 					*pr->globals.stack = stack;
 				}
 				break;
@@ -1189,7 +1190,7 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 						PR_BoundsCheck (pr, pointer, ev_integer);
 					}
 
-					VectorCopy (ptr->vector_var, stk->vector_var);
+					VectorCopy (&ptr->vector_var, &stk->vector_var);
 					*pr->globals.stack = stack;
 				}
 				break;
@@ -1206,7 +1207,7 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 						PR_BoundsCheck (pr, pointer, ev_quat);
 					}
 
-					QuatCopy (ptr->quat_var, stk->quat_var);
+					QuatCopy (&ptr->quat_var, &stk->quat_var);
 					*pr->globals.stack = stack;
 				}
 				break;
@@ -1287,7 +1288,7 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 						PR_BoundsCheck (pr, pointer, ev_integer);
 					}
 
-					VectorCopy (ptr->vector_var, stk->vector_var);
+					VectorCopy (&ptr->vector_var, &stk->vector_var);
 					*pr->globals.stack = stack + 3;
 				}
 				break;
@@ -1304,7 +1305,7 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 						PR_BoundsCheck (pr, pointer, ev_quat);
 					}
 
-					QuatCopy (ptr->quat_var, stk->quat_var);
+					QuatCopy (&ptr->quat_var, &stk->quat_var);
 					*pr->globals.stack = stack + 4;
 				}
 				break;
@@ -1345,7 +1346,7 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 						PR_BoundsCheck (pr, pointer, ev_integer);
 					}
 
-					VectorCopy (ptr->vector_var, stk->vector_var);
+					VectorCopy (&ptr->vector_var, &stk->vector_var);
 					*pr->globals.stack = stack + 3;
 				}
 				break;
@@ -1362,7 +1363,7 @@ PR_ExecuteProgram (progs_t *pr, func_t fnum)
 						PR_BoundsCheck (pr, pointer, ev_quat);
 					}
 
-					QuatCopy (ptr->quat_var, stk->quat_var);
+					QuatCopy (&ptr->quat_var, &stk->quat_var);
 					*pr->globals.stack = stack + 4;
 				}
 				break;
diff --git a/libs/gamecode/pr_parse.c b/libs/gamecode/pr_parse.c
index 2652694e8..6471a44bb 100644
--- a/libs/gamecode/pr_parse.c
+++ b/libs/gamecode/pr_parse.c
@@ -92,10 +92,10 @@ PR_UglyValueString (progs_t *pr, etype_t type, pr_type_t *val, dstring_t *line)
 			dsprintf (line, "%d", val->integer_var);
 			break;
 		case ev_vector:
-			dsprintf (line, "%.9g %.9g %.9g", VectorExpand (val->vector_var));
+			dsprintf (line, "%.9g %.9g %.9g", VectorExpand (&val->vector_var));
 			break;
 		case ev_quat:
-			dsprintf (line, "%.9g %.9g %.9g %.9g", QuatExpand (val->quat_var));
+			dsprintf (line, "%.9g %.9g %.9g %.9g", QuatExpand (&val->quat_var));
 			break;
 		default:
 			dsprintf (line, "bad type %i", type);
@@ -241,7 +241,7 @@ ED_ParseEpair (progs_t *pr, pr_type_t *base, pr_def_t *key, const char *s)
 				while (*v && *v != ' ')
 					v++;
 				*v = 0;
-				d->vector_var[i] = atof (w);
+				(&d->vector_var)[i] = atof (w);
 				w = v = v + 1;
 			}
 			free (string);
diff --git a/libs/models/alias/model_alias.c b/libs/models/alias/model_alias.c
index af2731d71..8a4784b2d 100644
--- a/libs/models/alias/model_alias.c
+++ b/libs/models/alias/model_alias.c
@@ -138,7 +138,7 @@ Mod_LoadAliasFrame (void *pin, int *posenum, maliasframedesc_t *frame,
 
 	pdaliasframe = (daliasframe_t *) pin;
 
-	strncpy (frame->name, pdaliasframe->name, sizeof (frame->name));
+	memcpy (frame->name, pdaliasframe->name, sizeof (frame->name));
 	frame->name[sizeof (frame->name) - 1] = 0;
 	frame->firstpose = (*posenum);
 	frame->numposes = 1;
diff --git a/libs/ruamoko/rua_hash.c b/libs/ruamoko/rua_hash.c
index cff92eb4e..98d9722ba 100644
--- a/libs/ruamoko/rua_hash.c
+++ b/libs/ruamoko/rua_hash.c
@@ -85,7 +85,7 @@ table_get (hash_resources_t *res, int index)
 	PR_RESGET(res->table_map, index);
 }
 
-static inline int
+static inline int __attribute__((pure))
 table_index (hash_resources_t *res, bi_hashtab_t *table)
 {
 	PR_RESINDEX(res->table_map, table);
diff --git a/libs/ruamoko/rua_msgbuf.c b/libs/ruamoko/rua_msgbuf.c
index 9b026c90f..51c7bcf16 100644
--- a/libs/ruamoko/rua_msgbuf.c
+++ b/libs/ruamoko/rua_msgbuf.c
@@ -80,7 +80,7 @@ msgbuf_get (msgbuf_resources_t *res, int index)
 	PR_RESGET(res->msgbuf_map, index);
 }
 
-static inline int
+static inline int __attribute__((pure))
 msgbuf_index (msgbuf_resources_t *res, msgbuf_t *msgbuf)
 {
 	PR_RESINDEX(res->msgbuf_map, msgbuf);
@@ -358,8 +358,7 @@ static void
 bi_MsgBuf_ReadCoordAngleV (progs_t *pr)
 {
 	msgbuf_t   *mb = get_msgbuf (pr, __FUNCTION__, P_INT (pr, 0));
-	MSG_ReadCoordAngleV (&mb->msg, P_GPOINTER (pr, 1)->vector_var,
-						 P_GPOINTER (pr, 2)->vector_var);
+	MSG_ReadCoordAngleV (&mb->msg, P_VECTOR (pr, 1), P_VECTOR (pr, 2));
 }
 
 static void
diff --git a/libs/ruamoko/rua_obj.c b/libs/ruamoko/rua_obj.c
index baa8fe73b..155124b9f 100644
--- a/libs/ruamoko/rua_obj.c
+++ b/libs/ruamoko/rua_obj.c
@@ -108,7 +108,7 @@ dtable_get (probj_t *probj, int index)
 	PR_RESGET (probj->dtables, index);
 }
 
-static inline int
+static inline int __attribute__((pure))
 dtable_index (probj_t *probj, dtable_t *dtable)
 {
 	PR_RESINDEX (probj->dtables, dtable);
diff --git a/libs/ruamoko/rua_plist.c b/libs/ruamoko/rua_plist.c
index 9732b75c3..b71af2ead 100644
--- a/libs/ruamoko/rua_plist.c
+++ b/libs/ruamoko/rua_plist.c
@@ -84,7 +84,7 @@ plist_get (plist_resources_t *res, unsigned index)
 	PR_RESGET(res->plist_map, index);
 }
 
-static inline int
+static inline int __attribute__((pure))
 plist_index (plist_resources_t *res, bi_plist_t *plist)
 {
 	PR_RESINDEX(res->plist_map, plist);
diff --git a/libs/ruamoko/rua_qfile.c b/libs/ruamoko/rua_qfile.c
index d96c433a2..2f625a949 100644
--- a/libs/ruamoko/rua_qfile.c
+++ b/libs/ruamoko/rua_qfile.c
@@ -77,7 +77,7 @@ handle_get (qfile_resources_t *res, int index)
 	PR_RESGET(res->handle_map, index);
 }
 
-static inline int
+static inline int __attribute__((pure))
 handle_index (qfile_resources_t *res, qfile_t *handle)
 {
 	PR_RESINDEX(res->handle_map, handle);
diff --git a/libs/ruamoko/rua_script.c b/libs/ruamoko/rua_script.c
index ff5b2ab0a..7c2cd6666 100644
--- a/libs/ruamoko/rua_script.c
+++ b/libs/ruamoko/rua_script.c
@@ -78,7 +78,7 @@ script_get (script_resources_t *res, int index)
 	PR_RESGET(res->scripts, index);
 }
 
-static inline int
+static inline int __attribute__((pure))
 script_index (script_resources_t *res, rua_script_t *script)
 {
 	PR_RESINDEX(res->scripts, script);
diff --git a/libs/ruamoko/rua_set.c b/libs/ruamoko/rua_set.c
index 0fdd964e7..4e3ea732d 100644
--- a/libs/ruamoko/rua_set.c
+++ b/libs/ruamoko/rua_set.c
@@ -98,7 +98,7 @@ res_set_get (set_resources_t *res, int index)
 	PR_RESGET(res->set_map, index);
 }
 
-static inline int
+static inline int __attribute__((pure))
 res_set_index (set_resources_t *res, bi_set_t *set)
 {
 	PR_RESINDEX(res->set_map, set);
@@ -128,7 +128,7 @@ res_set_iter_get (set_resources_t *res, int index)
 	PR_RESGET(res->set_iter_map, index);
 }
 
-static inline int
+static inline int __attribute__((pure))
 res_set_iter_index (set_resources_t *res, bi_set_iter_t *set_iter)
 {
 	PR_RESINDEX(res->set_iter_map, set_iter);
diff --git a/libs/util/zone.c b/libs/util/zone.c
index 40af412ba..f52226d55 100644
--- a/libs/util/zone.c
+++ b/libs/util/zone.c
@@ -577,7 +577,8 @@ Hunk_AllocName (int size, const char *name)
 
 	h->size = size;
 	h->sentinal = HUNK_SENTINAL;
-	strncpy (h->name, name, 8);
+	memcpy (h->name, name, 8);
+	h->name[7] = 0;
 
 	return (void *) (h + 1);
 }
diff --git a/libs/video/renderer/r_progs.c b/libs/video/renderer/r_progs.c
index aba1de6ea..3f2925fba 100644
--- a/libs/video/renderer/r_progs.c
+++ b/libs/video/renderer/r_progs.c
@@ -101,7 +101,7 @@ qpic_get (draw_resources_t *res, int index)
 	PR_RESGET (res->qpic_map, index);
 }
 
-static inline int
+static inline int __attribute__((pure))
 qpic_index (draw_resources_t *res, qpic_res_t *qp)
 {
 	PR_RESINDEX (res->qpic_map, qp);
diff --git a/nq/include/sv_progs.h b/nq/include/sv_progs.h
index 07a8c8f7c..3d798ac16 100644
--- a/nq/include/sv_progs.h
+++ b/nq/include/sv_progs.h
@@ -208,7 +208,7 @@ extern progs_t sv_pr_state;
 #define SVstring(e,f)	SVFIELD (e, f, string)
 #define SVfunc(e,f)		SVFIELD (e, f, func)
 #define SVentity(e,f)	SVFIELD (e, f, entity)
-#define SVvector(e,f)	SVFIELD (e, f, vector)
+#define SVvector(e,f)	(&SVFIELD (e, f, vector))
 #define SVinteger(e,f)	SVFIELD (e, f, integer)
 #if TYPECHECK_PROGS
 #define SVdouble(e,f) E_DOUBLE (e, PR_AccessField (&sv_pr_state, #f, ev_##t, __FILE__, __LINE__))
diff --git a/qw/include/sv_progs.h b/qw/include/sv_progs.h
index 18bdde503..88fe18c24 100644
--- a/qw/include/sv_progs.h
+++ b/qw/include/sv_progs.h
@@ -193,7 +193,7 @@ extern progs_t sv_pr_state;
 #define SVstring(e,f)	SVFIELD (e, f, string)
 #define SVfunc(e,f)		SVFIELD (e, f, func)
 #define SVentity(e,f)	SVFIELD (e, f, entity)
-#define SVvector(e,f)	SVFIELD (e, f, vector)
+#define SVvector(e,f)	(&SVFIELD (e, f, vector))
 #define SVinteger(e,f)	SVFIELD (e, f, integer)
 #if TYPECHECK_PROGS
 #define SVdouble(e,f) E_DOUBLE (e, PR_AccessField (&sv_pr_state, #f, ev_##t, __FILE__, __LINE__))
diff --git a/qw/source/pmove.c b/qw/source/pmove.c
index 637528afa..358409bc5 100644
--- a/qw/source/pmove.c
+++ b/qw/source/pmove.c
@@ -738,7 +738,7 @@ SpectatorMove (void)
 	// friction
 	speed = DotProduct (pmove.velocity, pmove.velocity);
 	if (speed < 1) {
-		VectorZero (pmove.velocity)
+		VectorZero (pmove.velocity);
 	} else {
 		speed = sqrt (speed);
 		drop = 0;
diff --git a/qw/source/sv_progs.c b/qw/source/sv_progs.c
index 276ee2875..7ef651a15 100644
--- a/qw/source/sv_progs.c
+++ b/qw/source/sv_progs.c
@@ -101,8 +101,8 @@ free_edict (progs_t *pr, edict_t *ent)
 		ent->v[sv_fields.frame].float_var = 0;
 		ent->v[sv_fields.nextthink].float_var = -1;
 		ent->v[sv_fields.solid].float_var = 0;
-		memset (ent->v[sv_fields.origin].vector_var, 0, 3*sizeof (float));
-		memset (ent->v[sv_fields.angles].vector_var, 0, 3*sizeof (float));
+		memset (&ent->v[sv_fields.origin].vector_var, 0, 3*sizeof (float));
+		memset (&ent->v[sv_fields.angles].vector_var, 0, 3*sizeof (float));
 	} else {
 		ED_ClearEdict (pr, ent, 0);
 	}
diff --git a/ruamoko/qwaq/builtins/curses.c b/ruamoko/qwaq/builtins/curses.c
index 8f543f493..4f2044cf7 100644
--- a/ruamoko/qwaq/builtins/curses.c
+++ b/ruamoko/qwaq/builtins/curses.c
@@ -148,7 +148,7 @@ window_get (qwaq_resources_t *res, unsigned index)
 	PR_RESGET(res->window_map, index);
 }
 
-static inline int
+static inline int __attribute__((pure))
 window_index (qwaq_resources_t *res, window_t *win)
 {
 	PR_RESINDEX (res->window_map, win);
@@ -194,7 +194,7 @@ panel_get (qwaq_resources_t *res, unsigned index)
 	PR_RESGET(res->panel_map, index);
 }
 
-static inline int
+static inline int __attribute__((pure))
 panel_index (qwaq_resources_t *res, panel_t *win)
 {
 	PR_RESINDEX (res->panel_map, win);
diff --git a/ruamoko/qwaq/builtins/debug.c b/ruamoko/qwaq/builtins/debug.c
index bb22d35e2..f0414649c 100644
--- a/ruamoko/qwaq/builtins/debug.c
+++ b/ruamoko/qwaq/builtins/debug.c
@@ -93,7 +93,7 @@ target_get (qwaq_debug_t *debug, unsigned index)
 	PR_RESGET (debug->targets, index);
 }
 
-static inline int
+static inline int __attribute__((pure))
 target_index (qwaq_debug_t *debug, qwaq_target_t *target)
 {
 	PR_RESINDEX (debug->targets, target);
diff --git a/ruamoko/qwaq/builtins/editbuffer.c b/ruamoko/qwaq/builtins/editbuffer.c
index 12cde52ab..d687103d3 100644
--- a/ruamoko/qwaq/builtins/editbuffer.c
+++ b/ruamoko/qwaq/builtins/editbuffer.c
@@ -52,7 +52,7 @@ editbuffer_get (qwaq_ebresources_t *res, unsigned index)
 	PR_RESGET (res->buffers, index);
 }
 
-static inline int
+static inline int __attribute__((pure))
 editbuffer_index (qwaq_ebresources_t *res, editbuffer_t *buffer)
 {
 	PR_RESINDEX (res->buffers, buffer);
diff --git a/ruamoko/qwaq/builtins/main.c b/ruamoko/qwaq/builtins/main.c
index c4c426166..8a1104b22 100644
--- a/ruamoko/qwaq/builtins/main.c
+++ b/ruamoko/qwaq/builtins/main.c
@@ -86,6 +86,7 @@ open_file (const char *path, int *len)
 	if (!file) {
 		strerror_r(errno, errbuff, sizeof (errbuff));
 		Sys_Printf ("%s\n", errbuff);
+		*len = 0;
 		return 0;
 	}
 	*len = Qfilesize (file);
diff --git a/tools/qfbsp/source/outside.c b/tools/qfbsp/source/outside.c
index 15da18dba..d7ba0d142 100644
--- a/tools/qfbsp/source/outside.c
+++ b/tools/qfbsp/source/outside.c
@@ -180,6 +180,8 @@ MarkLeakTrail2 (void)
 	vec3_t      wc, pwc;
 	const vec_t *v;
 
+	VectorZero (wc);
+
 	leakfile = fopen (options.pointfile, "w");
 	if (!leakfile)
 		Sys_Error ("Couldn't open %s\n", options.pointfile);
diff --git a/tools/qfcc/include/qfcc.h b/tools/qfcc/include/qfcc.h
index 6fac011ce..9d552ab3e 100644
--- a/tools/qfcc/include/qfcc.h
+++ b/tools/qfcc/include/qfcc.h
@@ -101,8 +101,8 @@ extern	pr_info_t	pr;
 #define	D_DOUBLE(d)			(*(double *) ((d)->space->data + (d)->offset))
 #define	D_FLOAT(d)			D_var (float, d)
 #define	D_INT(d)			D_var (integer, d)
-#define	D_VECTOR(d)			D_var (vector, d)
-#define	D_QUAT(d)			D_var (quat, d)
+#define	D_VECTOR(d)			(&D_var (vector, d))
+#define	D_QUAT(d)			(&D_var (quat, d))
 #define	D_STRING(d)			D_var (string, d)
 #define	D_GETSTR(d)			GETSTR (D_STRING (d))
 #define	D_FUNCTION(d)		D_var (func, d)
diff --git a/tools/qflight/include/noise.h b/tools/qflight/include/noise.h
index be63d9de1..0b118d17a 100644
--- a/tools/qflight/include/noise.h
+++ b/tools/qflight/include/noise.h
@@ -34,7 +34,7 @@
 ///@{
 
 float noise3d (vec3_t v, int num) __attribute__((pure));
-float noiseXYZ (float x, float y, float z, int num) __attribute__((pure));
+float noiseXYZ (float x, float y, float z, int num) __attribute__((const));
 float noise_scaled (vec3_t v, float s, int num) __attribute__((pure));
 float noise_perlin (vec3_t v, float p, int num) __attribute__((pure));
 void snap_vector (vec3_t v_old, vec3_t v_new, float scale);
diff --git a/tools/qfmodelgen/source/modelgen.c b/tools/qfmodelgen/source/modelgen.c
index 5d3eee4d0..a4b18b1ac 100644
--- a/tools/qfmodelgen/source/modelgen.c
+++ b/tools/qfmodelgen/source/modelgen.c
@@ -178,15 +178,17 @@ SetQdirFromPath (char *path)
 static const char *
 ExpandPath (const char *path)
 {
-	static char full[1024];
+	static dstring_t *full;
 
-	//FIXME buffer overflow central
+	if (!full) {
+		full = dstring_new();
+	}
 	//if (!qdir)
 	//	Sys_Error ("ExpandPath called without qdir set");
 	if (path[0] == '/' || path[0] == '\\' || path[1] == ':')
 		return path;
-	sprintf (full, "%s%s", qdir, path);
-	return full;
+	dsprintf (full, "%s%s", qdir, path);
+	return full->str;
 }
 
 static void

From 09a10f80e1a5ec8111dd28745aabec459cd52f84 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 28 Dec 2020 12:29:04 +0900
Subject: [PATCH 1226/1519] [util] Add basic SIMD implemented vector functions

They take advantage of gcc's vector_size attribute and so only cross,
dot, qmul, qvmul and qrot (create rotation quaternion from two vectors)
are needed at this stage as basic (per-component) math is supported
natively by gcc.

The provided functions work on horizontal (array-of-structs) data, ie a
vec4d_t or vec4f_t represents a single vector, or traditional vector
layout. Vertical layout (struct-of-arrays) does not need any special
functions as the regular math can be used to operate on four vectors at
a time.

Functions are provided for loading a vec4 from a vec3 (4th element set
to 0) and storing a vec4 into a vec3 (discarding the 4th element).

With this, QF will require AVX2 support (needed for vec4d_t). Without
support for doubles, SSE is possible, but may not be worthwhile for
horizontal data.

Fused-multiply-add is NOT used because it alters the results between
unoptimized and optimized code, resulting in -mfma really meaning
-mfast-math-anyway. I really do not want to have to debug issues that
occur only in optimized code.
---
 config.d/compiling.m4        |   5 +
 include/QF/simd/types.h      |  85 +++++++++++
 include/QF/simd/vec4d.h      | 156 +++++++++++++++++++
 include/QF/simd/vec4f.h      | 159 +++++++++++++++++++
 libs/util/test/Makemodule.am |   5 +
 libs/util/test/test-simd.c   | 289 +++++++++++++++++++++++++++++++++++
 6 files changed, 699 insertions(+)
 create mode 100644 include/QF/simd/types.h
 create mode 100644 include/QF/simd/vec4d.h
 create mode 100644 include/QF/simd/vec4f.h
 create mode 100644 libs/util/test/test-simd.c

diff --git a/config.d/compiling.m4 b/config.d/compiling.m4
index 343218d35..d9ba92887 100644
--- a/config.d/compiling.m4
+++ b/config.d/compiling.m4
@@ -82,6 +82,11 @@ AC_ARG_ENABLE(optimize,
 	optimize=yes
 )
 
+QF_CC_OPTION(-mavx2)
+dnl fma is not used as it is the equivalent of turning on
+dnl -funsafe-math-optimizations
+dnl QF_CC_OPTION(-mfma)
+
 AC_MSG_CHECKING(for optimization)
 if test "x$optimize" = xyes -a "x$leave_cflags_alone" != "xyes"; then
 	AC_MSG_RESULT(yes)
diff --git a/include/QF/simd/types.h b/include/QF/simd/types.h
new file mode 100644
index 000000000..cd8b0da9d
--- /dev/null
+++ b/include/QF/simd/types.h
@@ -0,0 +1,85 @@
+/*
+	QF/simd/types.h
+
+	Type definitions for QF SIMD values
+
+	Copyright (C) 2020  Bill Currie <bill@taniwha.org>
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+
+#ifndef __QF_simd_types_h
+#define __QF_simd_types_h
+
+#define VEC_TYPE(t,n) typedef t n __attribute__ ((vector_size (4*sizeof (t))))
+
+/** Three element vector type for interfacing with compact data.
+ *
+ * This cannot be used directly by SIMD code and must be loaded and stored
+ * using load_vec3d() and store_vec3d() respectively.
+ */
+typedef double vec3d_t[3];
+
+#ifdef __AVX__
+/** Four element vector type for horizontal (AOS) vector data.
+ *
+ * This is used for both vectors (3D and 4D) and quaternions. 3D vectors
+ * are simply vec4d_t values with 0 in the 4th element.
+ *
+ * Also usable with vertical (SOA) code, in which case each vec4d_t represents
+ * a single component from four vectors, or a single row/column (depending on
+ * context) of an Nx4 or 4xN matrix.
+ */
+VEC_TYPE (double, vec4d_t);
+
+/** Used mostly for __builtin_shuffle.
+ */
+VEC_TYPE (long, vec4l_t);
+#endif
+
+/** Three element vector type for interfacing with compact data.
+ *
+ * This cannot be used directly by SIMD code and must be loaded and stored
+ * using load_vec3f() and store_vec3f() respectively.
+ */
+typedef float vec3f_t[3];
+
+/** Four element vector type for horizontal (AOS) vector data.
+ *
+ * This is used for both vectors (3D and 4D) and quaternions. 3D vectors
+ * are simply vec4f_t values with 0 in the 4th element.
+ *
+ * Also usable with vertical (SOA) code, in which case each vec4f_t represents
+ * a single component from four vectors, or a single row/column (depending on
+ * context) of an Nx4 or 4xN matrix.
+ */
+VEC_TYPE (float, vec4f_t);
+
+/** Used mostly for __builtin_shuffle.
+ */
+VEC_TYPE (int, vec4i_t);
+
+#define VEC4D_FMT "[%.17g, %.17g, %.17g, %.17g]"
+#define VEC4L_FMT "[%ld, %ld, %ld, %ld]"
+#define VEC4F_FMT "[%.9g, %.9g, %.9g, %.9g]"
+#define VEC4I_FMT "[%d, %d, %d, %d]"
+#define VEC4_EXP(v) (v)[0], (v)[1], (v)[2], (v)[3]
+
+#endif//__QF_simd_types_h
diff --git a/include/QF/simd/vec4d.h b/include/QF/simd/vec4d.h
new file mode 100644
index 000000000..d608933f5
--- /dev/null
+++ b/include/QF/simd/vec4d.h
@@ -0,0 +1,156 @@
+/*
+	QF/simd/vec4d.h
+
+	Vector functions for vec4d_t (ie, double precision)
+
+	Copyright (C) 2020  Bill Currie <bill@taniwha.org>
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+
+#ifndef __QF_simd_vec4d_h
+#define __QF_simd_vec4d_h
+
+#include <immintrin.h>
+
+#include "QF/simd/types.h"
+
+/** 3D vector cross product.
+ *
+ * The w (4th) component can be any value on input, and is guaranteed to be 0
+ * in the result. The result is not affected in any way by either vector's w
+ * componemnt
+ */
+vec4d_t crossd (vec4d_t a, vec4d_t b) __attribute__((const));
+vec4d_t
+crossd (vec4d_t a, vec4d_t b)
+{
+	static const vec4l_t A = {1, 2, 0, 3};
+	vec4d_t c = a * __builtin_shuffle (b, A);
+	vec4d_t d = __builtin_shuffle (a, A) * b;
+	c = c - d;
+	return __builtin_shuffle(c, A);
+}
+
+/** 4D vector dot product.
+ *
+ * The w component *IS* significant, but if it is 0 in either vector, then
+ * the result will be as for a 3D dot product.
+ *
+ * Note that the dot product is in all 4 of the return value's elements. This
+ * helps optimize vector math as the scalar is already pre-spread. If just the
+ * scalar is required, use result[0].
+ */
+vec4d_t dotd (vec4d_t a, vec4d_t b) __attribute__((const));
+vec4d_t
+dotd (vec4d_t a, vec4d_t b)
+{
+	vec4d_t c = a * b;
+	c = _mm256_hadd_pd (c, c);
+	static const vec4l_t A = {2, 3, 0, 1};
+	c += __builtin_shuffle(c, A);
+	return c;
+}
+
+/** Quaternion product.
+ *
+ * The vector is interpreted as a quaternion instead of a regular 4D vector.
+ * The quaternion may be of any magnitude, so this is more generally useful.
+ * than if the quaternion was required to be unit length.
+ */
+vec4d_t qmuld (vec4d_t a, vec4d_t b) __attribute__((const));
+vec4d_t
+qmuld (vec4d_t a, vec4d_t b)
+{
+	// results in [2*as*bs, as*b + bs*a + a x b] ([scalar, vector] notation)
+	// doesn't seem to adversly affect precision
+	vec4d_t c = crossd (a, b) + a * b[3] + a[3] * b;
+	vec4d_t d = dotd (a, b);
+	// zero out the vector component of dot product so only the scalar remains
+	d = _mm256_permute2f128_pd (d, d, 0x18);
+	d = _mm256_permute4x64_pd (d, 0xc0);
+	return c - d;
+}
+
+/** Optimized quaterion-vector multiplication for vector rotation.
+ *
+ * If the vector's w component is not zero, then the result's w component
+ * is the cosine of the full rotation angle scaled by the vector's w component.
+ * The quaternion is assumed to be unit. If the quaternion is not unit, the
+ * vector will be scaled by the square of the quaternion's magnitude.
+ */
+vec4d_t qvmuld (vec4d_t q, vec4d_t v) __attribute__((const));
+vec4d_t
+qvmuld (vec4d_t q, vec4d_t v)
+{
+	double s = q[3];
+	// zero the scalar of the quaternion. Results in an extra operation, but
+	// avoids adding precision issues.
+	vec4d_t z = {};
+	q = _mm256_blend_pd (q, z, 0x08);
+	vec4d_t c = crossd (q, v);
+	vec4d_t qv = dotd (q, v);	// q.w is 0 so v.w is irrelevant
+	vec4d_t qq = dotd (q, q);
+
+	return (s * s - qq) * v + 2 * (qv * q + s * c);
+}
+
+/** Create the quaternion representing the shortest rotation from a to b.
+ *
+ * Both a and b are assumed to be 3D vectors (w components 0), but a resonable
+ * (but incorrect) result will still be produced if either a or b is a 4D
+ * vector. The rotation axis will be the same as if both vectors were 3D, but
+ * the magnitude of the rotation will be different.
+ */
+vec4d_t qrotd (vec4d_t a, vec4d_t b) __attribute__((const));
+vec4d_t
+qrotd (vec4d_t a, vec4d_t b)
+{
+	vec4d_t ma = _mm256_sqrt_pd (dotd (a, a));
+	vec4d_t mb = _mm256_sqrt_pd (dotd (b, b));
+	vec4d_t den = 2 * ma * mb;
+	vec4d_t t = mb * a + ma * b;
+	vec4d_t mba_mab = _mm256_sqrt_pd (dotd (t, t));
+	vec4d_t q = crossd (a, b) / mba_mab;
+	q[3] = (mba_mab / den)[0];
+	return q;
+}
+
+vec4d_t loadvec3d (const double v3[]) __attribute__((pure, access(read_only, 1)));
+vec4d_t
+loadvec3d (const double v3[])
+{
+	vec4d_t v4 = {};
+
+	v4[0] = v3[0];
+	v4[1] = v3[1];
+	v4[2] = v3[2];
+	return v4;
+}
+
+void storevec3d (double v3[3], vec4d_t v4) __attribute__((access (write_only, 1)));
+void storevec3d (double v3[3], vec4d_t v4)
+{
+	v3[0] = v4[0];
+	v3[1] = v4[1];
+	v3[2] = v4[2];
+}
+
+#endif//__QF_simd_vec4d_h
diff --git a/include/QF/simd/vec4f.h b/include/QF/simd/vec4f.h
new file mode 100644
index 000000000..ea92b81d9
--- /dev/null
+++ b/include/QF/simd/vec4f.h
@@ -0,0 +1,159 @@
+/*
+	QF/simd/vec4f.h
+
+	Vector functions for vec4f_t (ie, float precision)
+
+	Copyright (C) 2020  Bill Currie <bill@taniwha.org>
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+
+#ifndef __QF_simd_vec4f_h
+#define __QF_simd_vec4f_h
+
+#include <immintrin.h>
+
+#include "QF/simd/types.h"
+
+/** 3D vector cross product.
+ *
+ * The w (4th) component can be any value on input, and is guaranteed to be 0
+ * in the result. The result is not affected in any way by either vector's w
+ * componemnt
+ */
+vec4f_t crossf (vec4f_t a, vec4f_t b) __attribute__((const));
+vec4f_t
+crossf (vec4f_t a, vec4f_t b)
+{
+	static const vec4i_t A = {1, 2, 0, 3};
+	vec4f_t c = a * __builtin_shuffle (b, A) - __builtin_shuffle (a, A) * b;
+	return __builtin_shuffle(c, A);
+}
+
+/** 4D vector dot product.
+ *
+ * The w component *IS* significant, but if it is 0 in either vector, then
+ * the result will be as for a 3D dot product.
+ *
+ * Note that the dot product is in all 4 of the return value's elements. This
+ * helps optimize vector math as the scalar is already pre-spread. If just the
+ * scalar is required, use result[0].
+ */
+vec4f_t dotf (vec4f_t a, vec4f_t b) __attribute__((const));
+vec4f_t
+dotf (vec4f_t a, vec4f_t b)
+{
+	vec4f_t c = a * b;
+	c = _mm_hadd_ps (c, c);
+	c = _mm_hadd_ps (c, c);
+	return c;
+}
+
+/** Quaternion product.
+ *
+ * The vector is interpreted as a quaternion instead of a regular 4D vector.
+ * The quaternion may be of any magnitude, so this is more generally useful.
+ * than if the quaternion was required to be unit length.
+ */
+vec4f_t qmulf (vec4f_t a, vec4f_t b) __attribute__((const));
+vec4f_t
+qmulf (vec4f_t a, vec4f_t b)
+{
+	// results in [2*as*bs, as*b + bs*a + a x b] ([scalar, vector] notation)
+	// doesn't seem to adversly affect precision
+	vec4f_t c = crossf (a, b) + a * b[3] + a[3] * b;
+	vec4f_t d = dotf (a, b);
+	// zero out the vector component of dot product so only the scalar remains
+	d = _mm_insert_ps (d, d, 0xf7);
+	return c - d;
+}
+
+/** Optimized quaterion-vector multiplication for vector rotation.
+ *
+ * If the vector's w component is not zero, then the result's w component
+ * is the cosine of the full rotation angle scaled by the vector's w component.
+ * The quaternion is assumed to be unit.
+ */
+vec4f_t qvmulf (vec4f_t q, vec4f_t v) __attribute__((const));
+vec4f_t
+qvmulf (vec4f_t q, vec4f_t v)
+{
+	float s = q[3];
+	// zero the scalar of the quaternion. Results in an extra operation, but
+	// avoids adding precision issues.
+	q = _mm_insert_ps (q, q, 0xf8);
+	vec4f_t c = crossf (q, v);	// q.w is 0 so v.w is irrelevant
+	vec4f_t qv = dotf (q, v);
+	vec4f_t qq = dotf (q, q);
+
+	return (s * s - qq) * v + 2 * (qv * q + s * c);
+}
+
+/** Create the quaternion representing the shortest rotation from a to b.
+ *
+ * Both a and b are assumed to be 3D vectors (w components 0), but a resonable
+ * (but incorrect) result will still be produced if either a or b is a 4D
+ * vector. The rotation axis will be the same as if both vectors were 3D, but
+ * the magnitude of the rotation will be different.
+ */
+vec4f_t qrotf (vec4f_t a, vec4f_t b) __attribute__((const));
+vec4f_t
+qrotf (vec4f_t a, vec4f_t b)
+{
+	vec4f_t ma = _mm_sqrt_ps (dotf (a, a));
+	vec4f_t mb = _mm_sqrt_ps (dotf (b, b));
+	vec4f_t den = 2 * ma * mb;
+	vec4f_t t = mb * a + ma * b;
+	vec4f_t mba_mab = _mm_sqrt_ps (dotf (t, t));
+	vec4f_t q = crossf (a, b) / mba_mab;
+	q[3] = (mba_mab / den)[0];
+	return q;
+}
+
+vec4f_t loadvec3f (const float v3[3]) __attribute__((pure, access(read_only, 1)));
+vec4f_t
+loadvec3f (const float v3[3])
+{
+	vec4f_t v4;
+
+	// this had to be in asm otherwise gcc thinks v4 is only partially
+	// initialized, and gcc 10 does not use the zero flags when generating
+	// the code, resulting in a memory access to load a 0 into v4[3]
+	//
+	// The first instruction zeros v4[3] while loading v4[0]
+	asm ("\n\
+		vinsertps $0x08, %1, %0, %0     \n\
+		vinsertps $0x10, %2, %0, %0     \n\
+		vinsertps $0x20, %3, %0, %0     \n\
+		"
+		: "=v"(v4)
+		: "m"(v3[0]), "m"(v3[1]), "m"(v3[2]));
+	return v4;
+}
+
+void storevec3f (float v3[3], vec4f_t v4) __attribute__((access (write_only, 1)));
+void storevec3f (float v3[3], vec4f_t v4)
+{
+	v3[0] = v4[0];
+	v3[1] = v4[1];
+	v3[2] = v4[2];
+}
+
+#endif//__QF_simd_vec4f_h
diff --git a/libs/util/test/Makemodule.am b/libs/util/test/Makemodule.am
index 9447a7807..ca777f864 100644
--- a/libs/util/test/Makemodule.am
+++ b/libs/util/test/Makemodule.am
@@ -14,6 +14,7 @@ libs_util_tests = \
 	libs/util/test/test-seb \
 	libs/util/test/test-seg \
 	libs/util/test/test-set \
+	libs/util/test/test-simd \
 	libs/util/test/test-txtbuffer \
 	libs/util/test/test-vrect
 
@@ -81,6 +82,10 @@ libs_util_test_test_set_SOURCES=libs/util/test/test-set.c
 libs_util_test_test_set_LDADD=libs/util/libQFutil.la
 libs_util_test_test_set_DEPENDENCIES=libs/util/libQFutil.la
 
+libs_util_test_test_simd_SOURCES=libs/util/test/test-simd.c
+libs_util_test_test_simd_LDADD=libs/util/libQFutil.la
+libs_util_test_test_simd_DEPENDENCIES=libs/util/libQFutil.la
+
 libs_util_test_test_txtbuffer_SOURCES=libs/util/test/test-txtbuffer.c
 libs_util_test_test_txtbuffer_LDADD=libs/util/libQFutil.la
 libs_util_test_test_txtbuffer_DEPENDENCIES=libs/util/libQFutil.la
diff --git a/libs/util/test/test-simd.c b/libs/util/test/test-simd.c
new file mode 100644
index 000000000..ec1b145ac
--- /dev/null
+++ b/libs/util/test/test-simd.c
@@ -0,0 +1,289 @@
+#include <stdio.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "QF/simd/vec4d.h"
+#include "QF/simd/vec4f.h"
+
+#define right   { 1, 0, 0 }
+#define forward { 0, 1, 0 }
+#define up      { 0, 0, 1 }
+#define one     { 1, 1, 1, 1 }
+#define half    { 0.5, 0.5, 0.5, 0.5 }
+#define zero    { 0, 0, 0, 0 }
+#define qident  { 0, 0, 0, 1 }
+#define qtest   { 0.64, 0.48, 0, 0.6 }
+
+#define nright   { -1,  0,  0 }
+#define nforward {  0, -1,  0 }
+#define nup      {  0,  0, -1 }
+#define none     { -1, -1, -1, -1 }
+#define nqident  {  0,  0,  0, -1 }
+
+#define s05 0.70710678118654757
+
+typedef  struct {
+	vec4d_t   (*op) (vec4d_t a, vec4d_t b);
+	vec4d_t     a;
+	vec4d_t     b;
+	vec4d_t     expect;
+	vec4d_t     ulp_errors;
+} vec4d_test_t;
+
+typedef  struct {
+	vec4f_t   (*op) (vec4f_t a, vec4f_t b);
+	vec4f_t     a;
+	vec4f_t     b;
+	vec4f_t     expect;
+	vec4f_t     ulp_errors;
+} vec4f_test_t;
+
+static vec4d_test_t vec4d_tests[] = {
+	// 3D dot products
+	{ dotd, right,   right,   one  },
+	{ dotd, right,   forward, zero },
+	{ dotd, right,   up,      zero },
+	{ dotd, forward, right,   zero },
+	{ dotd, forward, forward, one  },
+	{ dotd, forward, up,      zero },
+	{ dotd, up,      right,   zero },
+	{ dotd, up,      forward, zero },
+	{ dotd, up,      up,      one  },
+
+	// one is 4D, so its self dot product is 4
+	{ dotd, one,     one,     { 4,  4,  4,  4} },
+	{ dotd, one,    none,     {-4, -4, -4, -4} },
+
+	// 3D cross products
+	{ crossd, right,   right,    zero    },
+	{ crossd, right,   forward,  up      },
+	{ crossd, right,   up,      nforward },
+	{ crossd, forward, right,   nup      },
+	{ crossd, forward, forward,  zero    },
+	{ crossd, forward, up,       right   },
+	{ crossd, up,      right,    forward },
+	{ crossd, up,      forward, nright   },
+	{ crossd, up,      up,       zero    },
+	// double whammy tests: cross product with an angled vector and
+	// ensuring that a 4d vector (non-zero w component) does not affect
+	// the result, including the result's w component remaining zero.
+	{ crossd, right,   one,     { 0, -1,  1} },
+	{ crossd, forward, one,     { 1,  0, -1} },
+	{ crossd, up,      one,     {-1,  1,  0} },
+	{ crossd, one,     right,   { 0,  1, -1} },
+	{ crossd, one,     forward, {-1,  0,  1} },
+	{ crossd, one,     up,      { 1, -1,  0} },
+	// This one fails when optimizing with -mfma (which is why fma is not
+	// used): ulp errors in z and w
+	{ crossd, qtest,   qtest,   {0, 0, 0, 0} },
+
+	{ qmuld, qident,  qident,   qident  },
+	{ qmuld, qident,  right,    right   },
+	{ qmuld, qident,  forward,  forward },
+	{ qmuld, qident,  up,       up      },
+	{ qmuld, right,   qident,   right   },
+	{ qmuld, forward, qident,   forward },
+	{ qmuld, up,      qident,   up      },
+	{ qmuld, right,   right,   nqident  },
+	{ qmuld, right,   forward,  up      },
+	{ qmuld, right,   up,      nforward },
+	{ qmuld, forward, right,   nup      },
+	{ qmuld, forward, forward, nqident  },
+	{ qmuld, forward, up,       right   },
+	{ qmuld, up,      right,    forward },
+	{ qmuld, up,      forward, nright   },
+	{ qmuld, up,      up,      nqident  },
+	{ qmuld, one,     one,     { 2, 2, 2, -2 } },
+	{ qmuld, one,     { 2, 2, 2, -2 }, { 0, 0, 0, -8 } },
+	// This one fails when optimizing with -mfma (which is why fma is not
+	// used): ulp error in z
+	{ qmuld, qtest,   qtest,   {0.768, 0.576, 0, -0.28} },
+
+	// The one vector is not unit (magnitude 2), so using it as a rotation
+	// quaternion results in scaling by 4. However, it still has the effect
+	// of rotating 120 degrees around the axis equidistant from the three
+	// orthogonal axes such that x->y->z->x
+	{ qvmuld, one,    right,     { 0, 4, 0, 0 } },
+	{ qvmuld, one,    forward,   { 0, 0, 4, 0 } },
+	{ qvmuld, one,    up,        { 4, 0, 0, 0 } },
+	{ qvmuld, one,    {1,1,1,0}, { 4, 4, 4, 0 } },
+	{ qvmuld, one,    one,       { 4, 4, 4, -2 } },
+	// The half vector is unit.
+	{ qvmuld, half,   right,     forward },
+	{ qvmuld, half,   forward,   up      },
+	{ qvmuld, half,   up,        right   },
+	{ qvmuld, half,   {1,1,1,0}, { 1, 1, 1, 0 } },
+	// one is a 4D vector and qvmuld is meant for 3D vectors. However, it
+	// seems that the vector's w has no effect on the 3d portion of the
+	// result, but the result's w is cosine of the full rotation angle
+	// scaled by quaternion magnitude and vector w
+	{ qvmuld, half,   one,       { 1, 1, 1, -0.5 } },
+	{ qvmuld, half,   {2,2,2,2}, { 2, 2, 2, -1 } },
+	{ qvmuld, qtest,  right,     {0.5392, 0.6144, -0.576, 0} },
+	{ qvmuld, qtest,  forward,   {0.6144, 0.1808, 0.768, 0},
+	                             {0, -2.7e-17, 0, 0} },
+	{ qvmuld, qtest,  up,        {0.576, -0.768, -0.28, 0} },
+
+	{ qrotd, right,   right,    qident },
+	{ qrotd, right,   forward,  {    0,    0,  s05,  s05 },
+	                            {0, 0, -1.1e-16, 0} },
+	{ qrotd, right,   up,       {    0, -s05,    0,  s05 },
+	                            {0, 1.1e-16, 0, 0} },
+	{ qrotd, forward, right,    {    0,    0, -s05,  s05 },
+	                            {0, 0, 1.1e-16, 0} },
+	{ qrotd, forward, forward,  qident },
+	{ qrotd, forward, up,       {  s05,    0,    0,  s05 },
+	                            {-1.1e-16, 0, 0, 0} },
+	{ qrotd, up,      right,    {    0,  s05,    0,  s05 },
+	                            {0, -1.1e-16, 0, 0} },
+	{ qrotd, up,      forward,  { -s05,    0,    0,  s05 },
+	                            { 1.1e-16, 0, 0, 0} },
+	{ qrotd, up,      up,       qident },
+};
+#define num_vec4d_tests (sizeof (vec4d_tests) / (sizeof (vec4d_tests[0])))
+
+static vec4f_test_t vec4f_tests[] = {
+	// 3D dot products
+	{ dotf, right,   right,   one  },
+	{ dotf, right,   forward, zero },
+	{ dotf, right,   up,      zero },
+	{ dotf, forward, right,   zero },
+	{ dotf, forward, forward, one  },
+	{ dotf, forward, up,      zero },
+	{ dotf, up,      right,   zero },
+	{ dotf, up,      forward, zero },
+	{ dotf, up,      up,      one  },
+
+	// one is 4D, so its self dot product is 4
+	{ dotf, one,     one,     { 4,  4,  4,  4} },
+	{ dotf, one,    none,     {-4, -4, -4, -4} },
+
+	// 3D cross products
+	{ crossf, right,   right,    zero    },
+	{ crossf, right,   forward,  up      },
+	{ crossf, right,   up,      nforward },
+	{ crossf, forward, right,   nup      },
+	{ crossf, forward, forward,  zero    },
+	{ crossf, forward, up,       right   },
+	{ crossf, up,      right,    forward },
+	{ crossf, up,      forward, nright   },
+	{ crossf, up,      up,       zero    },
+	// double whammy tests: cross product with an angled vector and
+	// ensuring that a 4d vector (non-zero w component) does not affect
+	// the result, including the result's w component remaining zero.
+	{ crossf, right,   one,     { 0, -1,  1} },
+	{ crossf, forward, one,     { 1,  0, -1} },
+	{ crossf, up,      one,     {-1,  1,  0} },
+	{ crossf, one,     right,   { 0,  1, -1} },
+	{ crossf, one,     forward, {-1,  0,  1} },
+	{ crossf, one,     up,      { 1, -1,  0} },
+	{ crossf, qtest,   qtest,   {0, 0, 0, 0} },
+
+	{ qmulf, qident,  qident,   qident  },
+	{ qmulf, qident,  right,    right   },
+	{ qmulf, qident,  forward,  forward },
+	{ qmulf, qident,  up,       up      },
+	{ qmulf, right,   qident,   right   },
+	{ qmulf, forward, qident,   forward },
+	{ qmulf, up,      qident,   up      },
+	{ qmulf, right,   right,   nqident  },
+	{ qmulf, right,   forward,  up      },
+	{ qmulf, right,   up,      nforward },
+	{ qmulf, forward, right,   nup      },
+	{ qmulf, forward, forward, nqident  },
+	{ qmulf, forward, up,       right   },
+	{ qmulf, up,      right,    forward },
+	{ qmulf, up,      forward, nright   },
+	{ qmulf, up,      up,      nqident  },
+	{ qmulf, one,     one,     { 2, 2, 2, -2 } },
+	{ qmulf, one,     { 2, 2, 2, -2 }, { 0, 0, 0, -8 } },
+	{ qmulf, qtest,   qtest,   {0.768, 0.576, 0, -0.28},
+	                           {0, 6e-8, 0, 3e-8} },
+
+	// The one vector is not unit (magnitude 2), so using it as a rotation
+	// quaternion results in scaling by 4. However, it still has the effect
+	// of rotating 120 degrees around the axis equidistant from the three
+	// orthogonal axes such that x->y->z->x
+	{ qvmulf, one,    right,     { 0, 4, 0, 0 } },
+	{ qvmulf, one,    forward,   { 0, 0, 4, 0 } },
+	{ qvmulf, one,    up,        { 4, 0, 0, 0 } },
+	{ qvmulf, one,    {1,1,1,0}, { 4, 4, 4, 0 } },
+	{ qvmulf, one,    one,       { 4, 4, 4, -2 } },
+	{ qvmulf, qtest,  right,     {0.5392, 0.6144, -0.576, 0},
+	                             {0, -5.9e-08, -6e-8, 0} },
+	{ qvmulf, qtest,  forward,   {0.6144, 0.1808, 0.768, 0},
+	                             {-5.9e-08, 1.5e-08, 0, 0} },
+	{ qvmulf, qtest,  up,        {0.576, -0.768, -0.28, 0},
+	                             {6e-8, 0, 3e-8, 0} },
+
+	{ qrotf, right,   right,    qident },
+	{ qrotf, right,   forward,  {    0,    0,  s05,  s05 } },
+	{ qrotf, right,   up,       {    0, -s05,    0,  s05 } },
+	{ qrotf, forward, right,    {    0,    0, -s05,  s05 } },
+	{ qrotf, forward, forward,  qident },
+	{ qrotf, forward, up,       {  s05,    0,    0,  s05 } },
+	{ qrotf, up,      right,    {    0,  s05,    0,  s05 } },
+	{ qrotf, up,      forward,  { -s05,    0,    0,  s05 } },
+	{ qrotf, up,      up,       qident },
+};
+#define num_vec4f_tests (sizeof (vec4f_tests) / (sizeof (vec4f_tests[0])))
+
+static int
+run_vec4d_tests (void)
+{
+	int         ret = 0;
+
+	for (size_t i = 0; i < num_vec4d_tests; i++) {
+		__auto_type test = &vec4d_tests[i];
+		vec4d_t     result = test->op (test->a, test->b);
+		vec4d_t     expect = test->expect + test->ulp_errors;
+		vec4l_t     res = result != expect;
+		if (res[0] || res[1] || res[2] || res[3]) {
+			ret |= 1;
+			printf ("\nrun_vec4d_tests\n");
+			printf ("a: " VEC4D_FMT "\n", VEC4_EXP(test->a));
+			printf ("b: " VEC4D_FMT "\n", VEC4_EXP(test->b));
+			printf ("r: " VEC4D_FMT "\n", VEC4_EXP(result));
+			printf ("t: " VEC4L_FMT "\n", VEC4_EXP(res));
+			printf ("E: " VEC4D_FMT "\n", VEC4_EXP(expect));
+			printf ("e: " VEC4D_FMT "\n", VEC4_EXP(test->expect));
+			printf ("u: " VEC4D_FMT "\n", VEC4_EXP(test->ulp_errors));
+		}
+	}
+	return ret;
+}
+
+static int
+run_vec4f_tests (void)
+{
+	int         ret = 0;
+
+	for (size_t i = 0; i < num_vec4f_tests; i++) {
+		__auto_type test = &vec4f_tests[i];
+		vec4f_t     result = test->op (test->a, test->b);
+		vec4f_t     expect = test->expect + test->ulp_errors;
+		vec4i_t     res = result != expect;
+		if (res[0] || res[1] || res[2] || res[3]) {
+			ret |= 1;
+			printf ("\nrun_vec4f_tests\n");
+			printf ("a: " VEC4F_FMT "\n", VEC4_EXP(test->a));
+			printf ("b: " VEC4F_FMT "\n", VEC4_EXP(test->b));
+			printf ("r: " VEC4F_FMT "\n", VEC4_EXP(result));
+			printf ("t: " VEC4I_FMT "\n", VEC4_EXP(res));
+			printf ("E: " VEC4F_FMT "\n", VEC4_EXP(expect));
+			printf ("e: " VEC4F_FMT "\n", VEC4_EXP(test->expect));
+			printf ("u: " VEC4F_FMT "\n", VEC4_EXP(test->ulp_errors));
+		}
+	}
+	return ret;
+}
+
+int
+main (void)
+{
+	int         ret = 0;
+	ret |= run_vec4d_tests ();
+	ret |= run_vec4f_tests ();
+	return ret;
+}

From 03fcb530c71a7a107839598bba55f3a07b7a3953 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 28 Dec 2020 12:45:25 +0900
Subject: [PATCH 1227/1519] [util] Make quat test failure prints clearer

---
 libs/util/test/test-quat.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/libs/util/test/test-quat.c b/libs/util/test/test-quat.c
index 8e4738449..9144f56be 100644
--- a/libs/util/test/test-quat.c
+++ b/libs/util/test/test-quat.c
@@ -296,12 +296,12 @@ test_rotation4 (const vec3_t a, const vec3_t b, const quat_t expect)
 	return 1;
 fail:
 	printf ("\ntest_rotation4\n");
-	printf ("%11.9g %11.9g %11.9g\n", VectorExpand(a));
-	printf ("%11.9g %11.9g %11.9g\n", VectorExpand(b));
-	printf ("%11.9g %11.9g %11.9g %11.9g\n", QuatExpand(quat));
-	printf ("%11.9g %11.9g %11.9g %11.9g\n", QuatExpand(expect));
-	printf ("%11.9g %11.9g %11.9g\n", VectorExpand(t));
-	printf ("%11.9g\n", d);
+	printf ("a: %11.9g %11.9g %11.9g\n", VectorExpand(a));
+	printf ("b: %11.9g %11.9g %11.9g\n", VectorExpand(b));
+	printf ("q: %11.9g %11.9g %11.9g %11.9g\n", QuatExpand(quat));
+	printf ("e: %11.9g %11.9g %11.9g %11.9g\n", QuatExpand(expect));
+	printf ("t: %11.9g %11.9g %11.9g\n", VectorExpand(t));
+	printf ("d: %11.9g\n", d);
 	return 0;
 }
 
@@ -351,6 +351,7 @@ test_quat_mat(const quat_t q, const quat_t expect)
 			goto fail;
 	return 1;
 fail:
+	printf ("\ntest_quat_mat\n");
 	printf ("%11.9g %11.9g %11.9g %11.9g\n", QuatExpand (q));
 	printf ("%11.9g %11.9g %11.9g   %11.9g %11.9g %11.9g\n",
 			VectorExpand (m + 0), VectorExpand (expect + 0));

From 1ddd57b09ecdac19a7be6f322dd957541b0eda6f Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 28 Dec 2020 14:52:36 +0900
Subject: [PATCH 1228/1519] [util] Add qconj, vtrunc, vceil and vfloor
 functions

I had forgotten these rather critical functions. Both double and float
versions are included.
---
 include/QF/simd/vec4d.h    | 26 ++++++++++++++++++++
 include/QF/simd/vec4f.h    | 30 +++++++++++++++++++++++
 libs/util/test/test-simd.c | 50 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 106 insertions(+)

diff --git a/include/QF/simd/vec4d.h b/include/QF/simd/vec4d.h
index d608933f5..11e173eff 100644
--- a/include/QF/simd/vec4d.h
+++ b/include/QF/simd/vec4d.h
@@ -133,6 +133,14 @@ qrotd (vec4d_t a, vec4d_t b)
 	return q;
 }
 
+vec4d_t qconjd (vec4d_t q) __attribute__((const));
+vec4d_t
+qconjd (vec4d_t q)
+{
+	const vec4l_t neg = { 1lu << 63, 1lu << 63, 1lu << 63, 0 };
+	return _mm256_xor_pd (q, (__m256d) neg);
+}
+
 vec4d_t loadvec3d (const double v3[]) __attribute__((pure, access(read_only, 1)));
 vec4d_t
 loadvec3d (const double v3[])
@@ -153,4 +161,22 @@ void storevec3d (double v3[3], vec4d_t v4)
 	v3[2] = v4[2];
 }
 
+vec4d_t vceild (vec4d_t v) __attribute__((const));
+vec4d_t vceild (vec4d_t v)
+{
+	return _mm256_ceil_pd (v);
+}
+
+vec4d_t vfloord (vec4d_t v) __attribute__((const));
+vec4d_t vfloord (vec4d_t v)
+{
+	return _mm256_floor_pd (v);
+}
+
+vec4d_t vtruncd (vec4d_t v) __attribute__((const));
+vec4d_t vtruncd (vec4d_t v)
+{
+	return _mm256_round_pd (v, _MM_FROUND_TRUNC);
+}
+
 #endif//__QF_simd_vec4d_h
diff --git a/include/QF/simd/vec4f.h b/include/QF/simd/vec4f.h
index ea92b81d9..e2e09c341 100644
--- a/include/QF/simd/vec4f.h
+++ b/include/QF/simd/vec4f.h
@@ -127,6 +127,18 @@ qrotf (vec4f_t a, vec4f_t b)
 	return q;
 }
 
+/** Return the conjugate of the quaternion.
+ *
+ * That is, [-x, -y, -z, w].
+ */
+vec4f_t qconjf (vec4f_t q) __attribute__((const));
+vec4f_t
+qconjf (vec4f_t q)
+{
+	const vec4i_t neg = { 1u << 31, 1u << 31, 1u << 31, 0 };
+	return _mm_xor_ps (q, (__m128) neg);
+}
+
 vec4f_t loadvec3f (const float v3[3]) __attribute__((pure, access(read_only, 1)));
 vec4f_t
 loadvec3f (const float v3[3])
@@ -156,4 +168,22 @@ void storevec3f (float v3[3], vec4f_t v4)
 	v3[2] = v4[2];
 }
 
+vec4f_t vceilf (vec4f_t v) __attribute__((const));
+vec4f_t vceilf (vec4f_t v)
+{
+	return _mm_ceil_ps (v);
+}
+
+vec4f_t vfloorf (vec4f_t v) __attribute__((const));
+vec4f_t vfloorf (vec4f_t v)
+{
+	return _mm_floor_ps (v);
+}
+
+vec4f_t vtruncf (vec4f_t v) __attribute__((const));
+vec4f_t vtruncf (vec4f_t v)
+{
+	return _mm_round_ps (v, _MM_FROUND_TRUNC);
+}
+
 #endif//__QF_simd_vec4f_h
diff --git a/libs/util/test/test-simd.c b/libs/util/test/test-simd.c
index ec1b145ac..8fcc6935c 100644
--- a/libs/util/test/test-simd.c
+++ b/libs/util/test/test-simd.c
@@ -39,6 +39,46 @@ typedef  struct {
 	vec4f_t     ulp_errors;
 } vec4f_test_t;
 
+static vec4d_t tvtruncd (vec4d_t v, vec4d_t ignore)
+{
+	return vtruncd (v);
+}
+
+static vec4d_t tvceild (vec4d_t v, vec4d_t ignore)
+{
+	return vceild (v);
+}
+
+static vec4d_t tvfloord (vec4d_t v, vec4d_t ignore)
+{
+	return vfloord (v);
+}
+
+static vec4d_t tqconjd (vec4d_t v, vec4d_t ignore)
+{
+	return qconjd (v);
+}
+
+static vec4f_t tvtruncf (vec4f_t v, vec4f_t ignore)
+{
+	return vtruncf (v);
+}
+
+static vec4f_t tvceilf (vec4f_t v, vec4f_t ignore)
+{
+	return vceilf (v);
+}
+
+static vec4f_t tvfloorf (vec4f_t v, vec4f_t ignore)
+{
+	return vfloorf (v);
+}
+
+static vec4f_t tqconjf (vec4f_t v, vec4f_t ignore)
+{
+	return qconjf (v);
+}
+
 static vec4d_test_t vec4d_tests[] = {
 	// 3D dot products
 	{ dotd, right,   right,   one  },
@@ -140,6 +180,11 @@ static vec4d_test_t vec4d_tests[] = {
 	{ qrotd, up,      forward,  { -s05,    0,    0,  s05 },
 	                            { 1.1e-16, 0, 0, 0} },
 	{ qrotd, up,      up,       qident },
+
+	{ tvtruncd, { 1.1, 2.9, -1.1, -2.9 }, {}, { 1, 2, -1, -2 } },
+	{ tvceild,  { 1.1, 2.9, -1.1, -2.9 }, {}, { 2, 3, -1, -2 } },
+	{ tvfloord, { 1.1, 2.9, -1.1, -2.9 }, {}, { 1, 2, -2, -3 } },
+	{ tqconjd,  one, {}, { -1, -1, -1, 1 } },
 };
 #define num_vec4d_tests (sizeof (vec4d_tests) / (sizeof (vec4d_tests[0])))
 
@@ -226,6 +271,11 @@ static vec4f_test_t vec4f_tests[] = {
 	{ qrotf, up,      right,    {    0,  s05,    0,  s05 } },
 	{ qrotf, up,      forward,  { -s05,    0,    0,  s05 } },
 	{ qrotf, up,      up,       qident },
+
+	{ tvtruncf, { 1.1, 2.9, -1.1, -2.9 }, {}, { 1, 2, -1, -2 } },
+	{ tvceilf,  { 1.1, 2.9, -1.1, -2.9 }, {}, { 2, 3, -1, -2 } },
+	{ tvfloorf, { 1.1, 2.9, -1.1, -2.9 }, {}, { 1, 2, -2, -3 } },
+	{ tqconjf,  one, {}, { -1, -1, -1, 1 } },
 };
 #define num_vec4f_tests (sizeof (vec4f_tests) / (sizeof (vec4f_tests[0])))
 

From 3125009a7c7779de7434deca6913b17ef5eb7eab Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 28 Dec 2020 14:56:59 +0900
Subject: [PATCH 1229/1519] [util] Add vector and quaternion types to cexpr

Although there's no distinction between the two at the C level, I think
it's probably best to separate them in a scripting language.
---
 include/QF/cexpr.h      |   2 +
 include/QF/simd/vec4f.h |   4 +-
 libs/util/cexpr-type.c  | 125 +++++++++++++++++++++++++++++++++++++++-
 3 files changed, 127 insertions(+), 4 deletions(-)

diff --git a/include/QF/cexpr.h b/include/QF/cexpr.h
index 0d2b4a8a4..e257412d6 100644
--- a/include/QF/cexpr.h
+++ b/include/QF/cexpr.h
@@ -112,6 +112,8 @@ extern exprtype_t cexpr_uint;
 extern exprtype_t cexpr_size_t;
 extern exprtype_t cexpr_float;
 extern exprtype_t cexpr_double;
+extern exprtype_t cexpr_vector;
+extern exprtype_t cexpr_quaternion;
 extern exprtype_t cexpr_exprval;
 extern exprtype_t cexpr_field;
 
diff --git a/include/QF/simd/vec4f.h b/include/QF/simd/vec4f.h
index e2e09c341..997127a94 100644
--- a/include/QF/simd/vec4f.h
+++ b/include/QF/simd/vec4f.h
@@ -99,8 +99,8 @@ qvmulf (vec4f_t q, vec4f_t v)
 	// zero the scalar of the quaternion. Results in an extra operation, but
 	// avoids adding precision issues.
 	q = _mm_insert_ps (q, q, 0xf8);
-	vec4f_t c = crossf (q, v);	// q.w is 0 so v.w is irrelevant
-	vec4f_t qv = dotf (q, v);
+	vec4f_t c = crossf (q, v);
+	vec4f_t qv = dotf (q, v);	// q.w is 0 so v.w is irrelevant
 	vec4f_t qq = dotf (q, q);
 
 	return (s * s - qq) * v + 2 * (qv * q + s * c);
diff --git a/libs/util/cexpr-type.c b/libs/util/cexpr-type.c
index c1dbbafb0..81fc212cd 100644
--- a/libs/util/cexpr-type.c
+++ b/libs/util/cexpr-type.c
@@ -30,6 +30,8 @@
 #include <math.h>
 
 #include "QF/cexpr.h"
+#include "QF/mathlib.h"
+#include "QF/simd/vec4f.h"
 
 #include "libs/util/cexpr-parse.h"
 
@@ -232,7 +234,7 @@ static void
 float_mod (const exprval_t *val1, const exprval_t *val2, exprval_t *result,
 		   exprctx_t *ctx)
 {
-	// implement true modulo for integers:
+	// implement true modulo for floats:
 	//  5 mod  3 = 2
 	// -5 mod  3 = 1
 	//  5 mod -3 = -1
@@ -242,6 +244,26 @@ float_mod (const exprval_t *val1, const exprval_t *val2, exprval_t *result,
 	*(float *) result->value = a - b * floorf (a / b);
 }
 
+static void
+float_mul_vec4f (const exprval_t *val1, const exprval_t *val2,
+				 exprval_t *result, exprctx_t *ctx)
+{
+	float       s = *(float *) val1->value;
+	__auto_type v = (vec4f_t *) val2->value;
+	__auto_type r = (vec4f_t *) result->value;
+	*r = s * *v;
+}
+
+static void
+float_div_quat (const exprval_t *val1, const exprval_t *val2,
+				exprval_t *result, exprctx_t *ctx)
+{
+	float       a = *(float *) val1->value;
+	vec4f_t     b = *(vec4f_t *) val2->value;
+	__auto_type c = (vec4f_t *) result->value;
+	*c = a * qconjf (b) / dotf (b, b);
+}
+
 UNOP(float, pos, float, +)
 UNOP(float, neg, float, -)
 UNOP(float, tnot, float, !)
@@ -250,7 +272,10 @@ binop_t float_binops[] = {
 	{ '+', &cexpr_float, &cexpr_float, float_add },
 	{ '-', &cexpr_float, &cexpr_float, float_sub },
 	{ '*', &cexpr_float, &cexpr_float, float_mul },
+	{ '*', &cexpr_vector, &cexpr_vector, float_mul_vec4f },
+	{ '*', &cexpr_quaternion, &cexpr_quaternion, float_mul_vec4f },
 	{ '/', &cexpr_float, &cexpr_float, float_div },
+	{ '/', &cexpr_quaternion, &cexpr_quaternion, float_div_quat },
 	{ '%', &cexpr_float, &cexpr_float, float_rem },
 	{ MOD, &cexpr_float, &cexpr_float, float_mod },
 	{}
@@ -288,7 +313,7 @@ static void
 double_mod (const exprval_t *val1, const exprval_t *val2, exprval_t *result,
 			exprctx_t *ctx)
 {
-	// implement true modulo for integers:
+	// implement true modulo for doubles:
 	//  5 mod  3 = 2
 	// -5 mod  3 = 1
 	//  5 mod -3 = -1
@@ -326,6 +351,102 @@ exprtype_t cexpr_double = {
 	double_unops,
 };
 
+BINOP(vector, add, vec4f_t, +)
+BINOP(vector, sub, vec4f_t, -)
+BINOP(vector, mul, vec4f_t, *)
+BINOP(vector, div, vec4f_t, /)
+
+static void
+vector_rem (const exprval_t *val1, const exprval_t *val2, exprval_t *result,
+			exprctx_t *ctx)
+{
+	vec4f_t     a = *(vec4f_t *) val1->value;
+	vec4f_t     b = *(vec4f_t *) val2->value;
+	__auto_type c = (vec4f_t *) result->value;
+	*c = a - b * vtruncf (a / b);
+}
+
+static void
+vector_mod (const exprval_t *val1, const exprval_t *val2, exprval_t *result,
+			exprctx_t *ctx)
+{
+	// implement true modulo for doubles:
+	//  5 mod  3 = 2
+	// -5 mod  3 = 1
+	//  5 mod -3 = -1
+	// -5 mod -3 = -2
+	vec4f_t     a = *(vec4f_t *) val1->value;
+	vec4f_t     b = *(vec4f_t *) val2->value;
+	__auto_type c = (vec4f_t *) result->value;
+	*c = a - b * vfloorf (a / b);
+}
+
+UNOP(vector, pos, vec4f_t, +)
+UNOP(vector, neg, vec4f_t, -)
+
+static void
+vector_tnot (const exprval_t *val, exprval_t *result, exprctx_t *ctx)
+{
+	vec4f_t     v = *(vec4f_t *) val->value;
+	__auto_type c = (vec4i_t *) result->value;
+	*c = v != 0;
+}
+
+binop_t vector_binops[] = {
+	{ '+', &cexpr_vector, &cexpr_vector, vector_add },
+	{ '-', &cexpr_vector, &cexpr_vector, vector_sub },
+	{ '*', &cexpr_vector, &cexpr_vector, vector_mul },
+	{ '/', &cexpr_vector, &cexpr_vector, vector_div },
+	{ '%', &cexpr_vector, &cexpr_vector, vector_rem },
+	{ MOD, &cexpr_vector, &cexpr_vector, vector_mod },
+	{}
+};
+
+unop_t vector_unops[] = {
+	{ '+', &cexpr_vector, vector_pos },
+	{ '-', &cexpr_vector, vector_neg },
+	{ '!', &cexpr_vector, vector_tnot },
+	{}
+};
+
+exprtype_t cexpr_vector = {
+	"vector",
+	sizeof (vec4f_t),
+	vector_binops,
+	vector_unops,
+};
+
+static void
+quaternion_mul (const exprval_t *val1, const exprval_t *val2,
+				exprval_t *result, exprctx_t *ctx)
+{
+	vec4f_t     a = *(vec4f_t *) val1->value;
+	vec4f_t     b = *(vec4f_t *) val2->value;
+	__auto_type c = (vec4f_t *) result->value;
+	*c = qmulf (a, b);
+}
+
+binop_t quaternion_binops[] = {
+	{ '+', &cexpr_quaternion, &cexpr_quaternion, vector_add },
+	{ '-', &cexpr_quaternion, &cexpr_quaternion, vector_sub },
+	{ '*', &cexpr_quaternion, &cexpr_quaternion, quaternion_mul },
+	{}
+};
+
+unop_t quaternion_unops[] = {
+	{ '+', &cexpr_vector, vector_pos },
+	{ '-', &cexpr_vector, vector_neg },
+	{ '!', &cexpr_vector, vector_tnot },
+	{}
+};
+
+exprtype_t cexpr_quaternion = {
+	"quaterion",
+	sizeof (vec4f_t),
+	quaternion_binops,
+	quaternion_unops,
+};
+
 exprtype_t cexpr_exprval = {
 	"exprval",
 	sizeof (exprval_t *),

From 4039075f41dacb15a4a4f368bc433587f18b71b5 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 29 Dec 2020 18:19:43 +0900
Subject: [PATCH 1230/1519] [util] Use a linked list of free cache lines

The idea is to not search through blocks for an available allocation.
While the goal was to speed up allocation of cache lines of varying
cluster sizes, it's not enough due to fragmentation.
---
 include/QF/cmem.h          |  18 +++-
 libs/util/cmem.c           | 187 ++++++++++++++++++++++++-------------
 libs/util/test/test-cmem.c |   9 +-
 3 files changed, 144 insertions(+), 70 deletions(-)

diff --git a/include/QF/cmem.h b/include/QF/cmem.h
index 966696d6c..dafdd97f9 100644
--- a/include/QF/cmem.h
+++ b/include/QF/cmem.h
@@ -32,9 +32,21 @@
 #define MEM_LINE_SIZE 64
 
 typedef struct memline_s {
-	struct memline_s *next;
+	/* chain of free line blocks for fast allocation
+	 * chain begins in memsuper_t
+	 */
+	struct memline_s *free_next;
+	struct memline_s **free_prev;
+	/* chain of free line blocks within a membock for merging
+	 * chain begins in memblock_t
+	 */
+	struct memline_s *block_next;
+	struct memline_s **block_prev;
 	size_t      size;
-	size_t      pad[6];
+	/* owning block
+	 */
+	struct memblock_s *block;
+	size_t      pad[2];
 } memline_t;
 
 typedef struct memsline_s {
@@ -85,7 +97,7 @@ typedef struct memsuper_s {
 	 * allocated, and 64 bytes and up consume entire cache lines.
 	 */
 	memsline_t *last_freed[4];
-	size_t      pad;
+	memline_t  *free_lines;
 } memsuper_t;
 
 memsuper_t *new_memsuper (void);
diff --git a/libs/util/cmem.c b/libs/util/cmem.c
index b446e58f0..d395eb78f 100644
--- a/libs/util/cmem.c
+++ b/libs/util/cmem.c
@@ -51,7 +51,32 @@ delete_memsuper (memsuper_t *super)
 	free (super);
 }
 
-static memblock_t *
+static void
+link_free_line (memsuper_t *super, memline_t *line)
+{
+	if (super->free_lines) {
+		super->free_lines->free_prev = &line->free_next;
+	}
+	line->free_next = super->free_lines;
+	line->free_prev = &super->free_lines;
+	super->free_lines = line;
+}
+
+static void
+unlink_line (memline_t *line)
+{
+	if (line->block_next) {
+		line->block_next->block_prev = line->block_prev;
+	}
+	*line->block_prev = line->block_next;
+
+	if (line->free_next) {
+		line->free_next->free_prev = line->free_prev;
+	}
+	*line->free_prev = line->free_next;
+}
+
+static memblock_t * __attribute__((noinline))
 init_block (memsuper_t *super, void *mem, size_t alloc_size)
 {
 	size_t      size = super->page_size;
@@ -78,14 +103,20 @@ init_block (memsuper_t *super, void *mem, size_t alloc_size)
 		block->pre_size -= MEM_LINE_SIZE;
 	}
 	if (block->pre_size) {
-		block->free_lines = (memline_t *) ((size_t) block - block->pre_size);
-		block->free_lines->next = 0;
-		block->free_lines->size = block->pre_size;
+		memline_t  *line = (memline_t *) ((size_t) block - block->pre_size);
+
+		link_free_line (super, line);
+
+		line->block = block;
+		line->block_next = 0;
+		line->block_prev = &block->free_lines;
+		block->free_lines = line;
+		line->size = block->pre_size;
 	}
 	return block;
 }
 
-static memblock_t *
+static memblock_t * __attribute__((noinline))
 block_alloc (memsuper_t *super, size_t size)
 {
 	memblock_t *block;
@@ -111,38 +142,39 @@ block_alloc (memsuper_t *super, size_t size)
 	return block;
 }
 
-static void *
-line_alloc (memblock_t *block, size_t size)
+static void * __attribute__((noinline))
+alloc_line (memline_t *line, size_t size)
 {
-	memline_t **line = &block->free_lines;
-	memline_t **best = 0;
-	memline_t  *mem;
-	size_t      best_size = ~0u;
+	void       *mem = line;
 
-	while (*line) {
-		if ((*line)->size >= size && (*line)->size < best_size) {
-			best_size = (*line)->size;
-			best = line;
+	if (line->size > size) {
+		// split the line block and insert the new block into the list
+		memline_t  *split = (memline_t *)((size_t) line + size);
+		split->block = line->block;
+		split->size = line->size - size;
+		line->size = size;
+
+		split->block_next = line->block_next;
+		if (split->block_next) {
+			split->block_next->block_prev = &split->block_next;
 		}
-		line = &(*line)->next;
+		line->block_next = split;
+		split->block_prev = &line->block_next;
+
+		split->free_next = line->free_next;
+		if (split->free_next) {
+			split->free_next->free_prev = &split->free_next;
+		}
+		line->free_next = split;
+		split->free_prev = &line->free_next;
 	}
-	if (!best) {
-		return 0;
-	}
-	mem = *best;
-	if (size < best_size) {
-		*best = (memline_t *)((size_t) mem + size);
-		(*best)->next = mem->next;
-		(*best)->size = mem->size - size;
-	} else {
-		*best = (*best)->next;
-	}
-	block->pre_allocated += size;
+	line->block->pre_allocated += line->size;
+	unlink_line (line);
 	return mem;
 }
 
-static void
-line_free (memblock_t *block, void *mem)
+static void __attribute__((noinline))
+line_free (memsuper_t *super, memblock_t *block, void *mem)
 {
 	//FIXME right now, can free only single lines (need allocated lines to
 	// have a control block)
@@ -152,37 +184,55 @@ line_free (memblock_t *block, void *mem)
 
 	block->pre_allocated -= size;
 
-	for (l = &block->free_lines; *l; l = &(*l)->next) {
+	for (l = &block->free_lines; *l; l = &(*l)->block_next) {
 		line = *l;
-
+		if (line->block_next && line->block_next < line) {
+			*(int *)0 = 0;
+		}
 		if ((size_t) mem + size < (size_t) line) {
 			// line to be freed is below the free line
 			break;
 		}
 		if ((size_t) mem + size == (size_t) line) {
 			// line to be freed is immediately below the free line
-			// merge with the free line
+			// merge with the free line by "allocating" the line and then
+			// "freeing" it with the line to be freed
 			size += line->size;
-			line = line->next;
+			unlink_line (line);	// does not modify line->block_next
+			line = line->block_next;
 			break;
 		}
 		if ((size_t) line + line->size == (size_t) mem) {
 			// line to be freed is immediately above the free line
-			// merge with the free line
+			// merge with the free line by growing the line
 			line->size += size;
-			if (line->next && (size_t) line->next == (size_t) mem + size) {
-				line->size += line->next->size;
-				line->next = line->next->next;
+			if (line->block_next
+				&& (size_t) line->block_next == (size_t) mem + size) {
+				// the line to be freed connects two free lines
+				line->size += line->block_next->size;
+				unlink_line (line->block_next);
 			}
 			return;
 		}
+		if ((size_t) mem >= (size_t) line
+			&& (size_t) mem < (size_t) line + line->size) {
+			*(int *) 0 = 0;
+		}
+		line = 0;
 	}
-	((memline_t *) mem)->next = line;
-	((memline_t *) mem)->size = size;
-	*l = mem;
+	memline_t  *memline = (memline_t *) mem;
+	memline->block_next = line;
+	if (memline->block_next) {
+		memline->block_next->block_prev = &memline->block_next;
+	}
+	memline->block_prev = l;
+	memline->size = size;
+	memline->block = block;
+	*l = memline;
+	link_free_line (super, memline);
 }
 
-static memsline_t *
+static memsline_t * __attribute__((noinline))
 sline_new (memsuper_t *super, size_t size_ind)
 {
 	size_t      size = 4 << size_ind;
@@ -224,26 +274,29 @@ cmemalloc (memsuper_t *super, size_t size)
 		size = 4 << ind;
 		if (size >= MEM_LINE_SIZE) {
 			// whole cache lines are required for this object
-			// FIXME slow
-			memblock_t *block = super->memblocks;
-			void       *mem;
+			memline_t  *line = super->free_lines;
 
-			while (block) {
-				if ((mem = line_alloc (block, size))) {
-					return mem;
-				}
-				block = block->next;
+			while (line && line->size < size) {
+				line = line->free_next;
 			}
-			/* The cache-line pool is page aligned for two reasons:
-			 * 1) so it fits exactly within a page
-			 * 2) the control block can be found easily
-			 * And the reason the pool is exactly one page large is so no
-			 * allocated line is ever page-aligned as that would make the line
-			 * indistinguishable from a large block.
-			 */
-			mem = aligned_alloc (super->page_size, super->page_size);
-			block = init_block (super, mem, super->page_size);
-			return line_alloc (block, size);
+			if (!line) {
+				// need a new line, one that doesn't make me fe... wrong song
+				void       *mem;
+				/* The cache-line pool is page aligned for two reasons:
+				 * 1) so it fits exactly within a page
+				 * 2) the control block can be found easily
+				 * And the reason the pool is exactly one page large is so no
+				 * allocated line is ever page-aligned as that would make the
+				 * line indistinguishable from a large block.
+				 */
+				mem = aligned_alloc (super->page_size, super->page_size);
+				// sets super->free_lines, the block is guarnateed to be big
+				// enough to hold the requested allocation as otherwise a full
+				// block allocation would have been used
+				init_block (super, mem, super->page_size);
+				line = super->free_lines;
+			}
+			return alloc_line (line, size);;
 		} else {
 			void       *mem = 0;
 			memsline_t **sline = &super->last_freed[ind];
@@ -273,9 +326,15 @@ cmemalloc (memsuper_t *super, size_t size)
 	return 0;
 }
 
-static void
+static void __attribute__((noinline))
 unlink_block (memblock_t *block)
 {
+	if (block->pre_size) {
+		if (!block->free_lines || block->free_lines->block_next) {
+			*(int *) 0 = 0;
+		}
+		unlink_line (block->free_lines);
+	}
 	if (block->next) {
 		block->next->prev = block->prev;
 	}
@@ -303,7 +362,9 @@ cmemfree (memsuper_t *super, void *mem)
 				*(memsline_t **) (size_t)(sline->prev << 6) = sline->next;
 			}
 
-			(*super_sline)->prev = (size_t) &sline->next >> 6;
+			if (*super_sline) {
+				(*super_sline)->prev = (size_t) &sline->next >> 6;
+			}
 			sline->next = *super_sline;
 			sline->prev = (size_t) super_sline >> 6;
 			(*super_sline) = sline;
@@ -314,7 +375,7 @@ cmemfree (memsuper_t *super, void *mem)
 		size_t      page_size = super->page_size;
 		size_t      page_mask = super->page_mask;
 		block = (memblock_t *) (((size_t) mem + page_size) & ~page_mask) - 1;
-		line_free (block, mem);
+		line_free (super, block, mem);
 	} else {
 		// large block
 		block = (memblock_t *) mem - 1;
diff --git a/libs/util/test/test-cmem.c b/libs/util/test/test-cmem.c
index c8c2ee7e3..6acd76c33 100644
--- a/libs/util/test/test-cmem.c
+++ b/libs/util/test/test-cmem.c
@@ -90,7 +90,7 @@ test_line (memsuper_t *super)
 		fprintf (stderr, "line3 not contiguous with free lines\n");
 		return 0;
 	}
-	if (block->free_lines->next) {
+	if (block->free_lines->block_next) {
 		fprintf (stderr, "multiple free line blocks\n");
 		return 0;
 	}
@@ -117,11 +117,12 @@ test_line (memsuper_t *super)
 		fprintf (stderr, "free lines not pointing to line2\n");
 		return 0;
 	}
-	if (!block->free_lines->next || block->free_lines->next->next) {
+	if (!block->free_lines->block_next
+		|| block->free_lines->block_next->block_next) {
 		fprintf (stderr, "incorrect number of free blocks\n");
 		return 0;
 	}
-	if (line2->next != old_line || old_line->size != old_size) {
+	if (line2->block_next != old_line || old_line->size != old_size) {
 		fprintf (stderr, "free line blocks corrupted\n");
 		return 0;
 	}
@@ -254,7 +255,7 @@ main (void)
 
 	if (sizeof (memsuper_t) != MEM_LINE_SIZE) {
 		fprintf (stderr, "memsuper_t not cache size: %zd\n",
-				 sizeof (memline_t));
+				 sizeof (memsuper_t));
 		return 1;
 	}
 	if (sizeof (memline_t) != MEM_LINE_SIZE) {

From 73544f07908e18a29f12dd7261fe381d2e0a7160 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 29 Dec 2020 20:42:39 +0900
Subject: [PATCH 1231/1519] [util] Split cmem's free cache-line over size bins

They're binned by powers of two (with in between sizes going to the
smaller bin should I make cache-line allocations NPOT (which I think
might be worthwhile). However, there seems to still be a bug somewhere
causing a nasty leak as now my hacked qfvis consumes 40G in less than a
minute.
---
 include/QF/cmem.h | 12 +++++++++++-
 libs/util/cmem.c  | 38 +++++++++++++++++++++++++++-----------
 2 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/include/QF/cmem.h b/include/QF/cmem.h
index dafdd97f9..5f0d733ea 100644
--- a/include/QF/cmem.h
+++ b/include/QF/cmem.h
@@ -30,6 +30,7 @@
 #include "QF/qtypes.h"
 
 #define MEM_LINE_SIZE 64
+#define MAX_CACHE_LINES 9
 
 typedef struct memline_s {
 	/* chain of free line blocks for fast allocation
@@ -97,7 +98,16 @@ typedef struct memsuper_s {
 	 * allocated, and 64 bytes and up consume entire cache lines.
 	 */
 	memsline_t *last_freed[4];
-	memline_t  *free_lines;
+	/* Free chache lines grouped by size.
+	 *
+	 * The index is the base-2 log of the MINIMUM number of cache lines
+	 * available in each block. ie, blocks with 4, 5, 6 and 7 lines will all
+	 * be in the third list (index 2). For 4k page sizes, only 6 lists are
+	 * needed (32-63 lines) because a page can hold only 62 lines (1 for the
+	 * control block and one to avoid a cache-line being on a page boundary).
+	 * Having 9 (MAX_CACHE_LINES) lists allows page sizes up to 16kB.
+	 */
+	memline_t  *free_lines[MAX_CACHE_LINES];
 } memsuper_t;
 
 memsuper_t *new_memsuper (void);
diff --git a/libs/util/cmem.c b/libs/util/cmem.c
index d395eb78f..c98eeb389 100644
--- a/libs/util/cmem.c
+++ b/libs/util/cmem.c
@@ -29,6 +29,15 @@
 #include "QF/alloc.h"
 #include "QF/cmem.h"
 
+static size_t __attribute__((const))
+ilog2 (size_t x)
+{
+	size_t      l = 0;
+	while (x >>= 1) {
+		l++;
+	}
+	return l;
+}
 
 memsuper_t *
 new_memsuper (void)
@@ -54,12 +63,13 @@ delete_memsuper (memsuper_t *super)
 static void
 link_free_line (memsuper_t *super, memline_t *line)
 {
-	if (super->free_lines) {
-		super->free_lines->free_prev = &line->free_next;
+	size_t      ind = ilog2 (line->size) - 6;
+	if (super->free_lines[ind]) {
+		super->free_lines[ind]->free_prev = &line->free_next;
 	}
-	line->free_next = super->free_lines;
-	line->free_prev = &super->free_lines;
-	super->free_lines = line;
+	line->free_next = super->free_lines[ind];
+	line->free_prev = &super->free_lines[ind];
+	super->free_lines[ind] = line;
 }
 
 static void
@@ -105,13 +115,14 @@ init_block (memsuper_t *super, void *mem, size_t alloc_size)
 	if (block->pre_size) {
 		memline_t  *line = (memline_t *) ((size_t) block - block->pre_size);
 
-		link_free_line (super, line);
-
 		line->block = block;
+		line->size = block->pre_size;
+
 		line->block_next = 0;
 		line->block_prev = &block->free_lines;
 		block->free_lines = line;
-		line->size = block->pre_size;
+
+		link_free_line (super, line);
 	}
 	return block;
 }
@@ -274,8 +285,13 @@ cmemalloc (memsuper_t *super, size_t size)
 		size = 4 << ind;
 		if (size >= MEM_LINE_SIZE) {
 			// whole cache lines are required for this object
-			memline_t  *line = super->free_lines;
+			// convert from byte log2 to cache-line log2
+			ind -= 4;
+			memline_t  *line = 0;
 
+			while (!line && ind < MAX_CACHE_LINES) {
+				line = super->free_lines[ind++];
+			}
 			while (line && line->size < size) {
 				line = line->free_next;
 			}
@@ -293,8 +309,8 @@ cmemalloc (memsuper_t *super, size_t size)
 				// sets super->free_lines, the block is guarnateed to be big
 				// enough to hold the requested allocation as otherwise a full
 				// block allocation would have been used
-				init_block (super, mem, super->page_size);
-				line = super->free_lines;
+				memblock_t *block = init_block (super, mem, super->page_size);
+				line = block->free_lines;
 			}
 			return alloc_line (line, size);;
 		} else {

From d12abc513259b88898a933456a2fbbfcb9c51d4f Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 30 Dec 2020 01:47:53 +0900
Subject: [PATCH 1232/1519] [util] Relink grown free line block

This fixes one source of memory leaks, but it seems some are still
lurking as qfvis still leaks like a sieve.
---
 libs/util/cmem.c           |  17 +-
 libs/util/test/test-cmem.c | 337 ++++++++++++++++++++++++++++++++-----
 2 files changed, 307 insertions(+), 47 deletions(-)

diff --git a/libs/util/cmem.c b/libs/util/cmem.c
index c98eeb389..cc55ef01a 100644
--- a/libs/util/cmem.c
+++ b/libs/util/cmem.c
@@ -72,6 +72,15 @@ link_free_line (memsuper_t *super, memline_t *line)
 	super->free_lines[ind] = line;
 }
 
+static void
+unlink_free_line (memline_t *line)
+{
+	if (line->free_next) {
+		line->free_next->free_prev = line->free_prev;
+	}
+	*line->free_prev = line->free_next;
+}
+
 static void
 unlink_line (memline_t *line)
 {
@@ -80,10 +89,7 @@ unlink_line (memline_t *line)
 	}
 	*line->block_prev = line->block_next;
 
-	if (line->free_next) {
-		line->free_next->free_prev = line->free_prev;
-	}
-	*line->free_prev = line->free_next;
+	unlink_free_line (line);
 }
 
 static memblock_t * __attribute__((noinline))
@@ -223,6 +229,9 @@ line_free (memsuper_t *super, memblock_t *block, void *mem)
 				line->size += line->block_next->size;
 				unlink_line (line->block_next);
 			}
+			// the line changed size so needs to be relinked in the super
+			unlink_free_line (line);
+			link_free_line (super, line);
 			return;
 		}
 		if ((size_t) mem >= (size_t) line
diff --git a/libs/util/test/test-cmem.c b/libs/util/test/test-cmem.c
index 6acd76c33..107c20ad4 100644
--- a/libs/util/test/test-cmem.c
+++ b/libs/util/test/test-cmem.c
@@ -1,9 +1,10 @@
 #include <stdio.h>
-#include <stdio.h>
+#include <stddef.h>
 #include <string.h>
 #include <unistd.h>
 
 #include "QF/cmem.h"
+#include "QF/set.h"
 
 static int
 test_block (memsuper_t *super)
@@ -46,6 +47,133 @@ test_block (memsuper_t *super)
 	return 1;
 }
 
+static int
+check_block (memblock_t *block, int line_count, int allocated)
+{
+	set_t      *visited = set_new ();
+	size_t      free_bytes = 0;
+	int         ret = 1;
+	int         count = 0;
+
+	for (memline_t **l = &block->free_lines; *l; l = &(*l)->block_next) {
+		memline_t  *line = *l;
+		ptrdiff_t   ind = (memline_t *) block - line;
+		if (ind < 1 || (size_t ) ind > block->pre_size / MEM_LINE_SIZE) {
+			fprintf (stderr, "line outside of block\n");
+			return 0;
+		}
+		if (set_is_member (visited, ind)) {
+			fprintf (stderr, "loop in block free_lines\n");
+			return 0;
+		}
+		count++;
+		set_add (visited, ind);
+		if (!line->size) {
+			fprintf (stderr, "line with size 0\n");
+			ret = 0;
+		}
+		if (line->block_next && line->block_next < line) {
+			fprintf (stderr, "line link in wrong direction\n");
+			ret = 0;
+		}
+		if ((size_t) line + line->size == (size_t) line->block_next) {
+			fprintf (stderr, "adjacant free line blocks\n");
+			ret = 0;
+		}
+		if (line->block_prev != l) {
+			fprintf (stderr, "line block_prev link incorrect\n");
+			ret = 0;
+		}
+		if (line->size > block->pre_size) {
+			fprintf (stderr, "line size too large: %zd / %zd\n",
+					 line->size, block->pre_size);
+			ret = 0;
+		}
+		if (line->size % MEM_LINE_SIZE) {
+			fprintf (stderr, "bad line size: %zd / %zd\n",
+					 line->size, line->size % MEM_LINE_SIZE);
+			ret = 0;
+		}
+		if (ret) {
+			free_bytes += line->size;
+		}
+	}
+	if (ret) {
+		if (free_bytes + block->pre_allocated != block->pre_size) {
+			fprintf (stderr, "block space mismatch: s: %zd a: %zd f: %zd\n",
+					 block->pre_size, block->pre_allocated, free_bytes);
+			ret = 0;
+		}
+		if (line_count >= 0 && line_count != count) {
+			fprintf (stderr, "incorrect number of lines: e: %d g: %d\n",
+					 line_count, count);
+			ret = 0;
+		}
+		if (allocated >= 0 && (size_t) allocated != block->pre_allocated) {
+			fprintf (stderr, "pre_allocated wrong size: %zd != %d\n",
+					 block->pre_allocated, allocated);
+		}
+	}
+	set_delete (visited);
+	return ret;
+}
+
+static int
+check_for_loop (memline_t *line, memline_t **stop)
+{
+	memline_t  *next = line->free_next;
+
+	for (memline_t **l = line->free_prev; l != stop;
+		 l = line->free_prev) {
+		line = (memline_t *) l;
+		if (line == next) {
+			return 1;
+		}
+	}
+	return 0;
+}
+
+static int
+check_bins (memsuper_t *super, int mask)
+{
+	int ret = 1;
+	for (int i = MAX_CACHE_LINES; i-- > 0; ) {
+		if (mask >= 0) {
+			if (mask & (1 << i)) {
+				if (!super->free_lines[i]) {
+					fprintf (stderr, "super free_lines[%d] is empty\n", i);
+					ret = 0;
+				}
+			} else {
+				if (super->free_lines[i]) {
+					fprintf (stderr, "super free_lines[%d] is occupied\n", i);
+					ret = 0;
+				}
+			}
+		}
+		for (memline_t **l = &super->free_lines[i]; *l; l = &(*l)->free_next) {
+			memline_t  *line = *l;
+			if (line->free_prev != l) {
+				fprintf (stderr, "super free_lines[%d] has bad prev\n", i);
+				ret = 0;
+				break;
+			}
+			if (check_for_loop (line, &super->free_lines[i])) {
+				fprintf (stderr, "super free_lines[%d] loop detected\n", i);
+				ret = 0;
+				break;
+			}
+			if ((MEM_LINE_SIZE << i) > (int) line->size
+				|| (MEM_LINE_SIZE << (i + 1)) <= (int) line->size) {
+				fprintf (stderr, "line in wrong i: %d %d %zd\n",
+						 i, MEM_LINE_SIZE << i, line->size);
+				ret = 0;
+			}
+		}
+	}
+	return ret;
+}
+
 static int
 test_line (memsuper_t *super)
 {
@@ -90,68 +218,153 @@ test_line (memsuper_t *super)
 		fprintf (stderr, "line3 not contiguous with free lines\n");
 		return 0;
 	}
-	if (block->free_lines->block_next) {
-		fprintf (stderr, "multiple free line blocks\n");
+
+	if (!check_block (block, 1, 3 * MEM_LINE_SIZE)) {
+		fprintf (stderr, "line block check 1 failed\n");
 		return 0;
 	}
-	if (block->pre_allocated != 3 * MEM_LINE_SIZE) {
-		fprintf (stderr, "pre_allocated wrong size: %zd != %d\n",
-				 block->pre_allocated, 3 * MEM_LINE_SIZE);
+	if (!check_bins (super, 0x20)) {
+		fprintf (stderr, "bin check 1 failed\n");
 		return 0;
 	}
-	if (block->free_lines->size != block->pre_size - block->pre_allocated) {
-		fprintf (stderr, "free lines wrong size: %zd != %zd\n",
-				 block->free_lines->size,
-				 block->pre_size - block->pre_allocated);
-		return 0;
-	}
-	size_t      old_size = block->free_lines->size;
-	memline_t  *old_line = block->free_lines;
+
 	cmemfree (super, line2);
-	if (block->pre_allocated != 2 * MEM_LINE_SIZE) {
-		fprintf (stderr, "pre_allocated wrong size: %zd != %d\n",
-				 block->pre_allocated, 2 * MEM_LINE_SIZE);
+
+	if (!check_block (block, 2, 2 * MEM_LINE_SIZE)) {
+		fprintf (stderr, "line block check 2 failed\n");
 		return 0;
 	}
+	if (!check_bins (super, 0x21)) {
+		fprintf (stderr, "bin check 2 failed\n");
+		return 0;
+	}
+
 	if (block->free_lines != line2) {
-		fprintf (stderr, "free lines not pointing to line2\n");
+		fprintf (stderr, "block free_lines not pointing to line2\n");
 		return 0;
 	}
-	if (!block->free_lines->block_next
-		|| block->free_lines->block_next->block_next) {
-		fprintf (stderr, "incorrect number of free blocks\n");
-		return 0;
-	}
-	if (line2->block_next != old_line || old_line->size != old_size) {
-		fprintf (stderr, "free line blocks corrupted\n");
-		return 0;
-	}
-	if (block->free_lines->size != MEM_LINE_SIZE) {
-		fprintf (stderr, "free line block wrong size: %zd != %d\n",
-				 block->free_lines->size, MEM_LINE_SIZE);
+	if (super->free_lines[0] != line2) {
+		fprintf (stderr, "super free_lines[0] not pointing to line2\n");
 		return 0;
 	}
+
 	cmemfree (super, line3);
+	if (!check_block (block, 1, 1 * MEM_LINE_SIZE)) {
+		fprintf (stderr, "line block check 3 failed\n");
+		return 0;
+	}
+	if (!check_bins (super, 0x20)) {
+		fprintf (stderr, "bin check 3 failed\n");
+		return 0;
+	}
+
 	if (block->free_lines != line2) {
 		fprintf (stderr, "free lines not pointing to line2 2\n");
 		return 0;
 	}
-	if (block->pre_allocated != MEM_LINE_SIZE) {
-		fprintf (stderr, "pre_allocated wrong size: %zd != %d\n",
-				 block->pre_allocated, MEM_LINE_SIZE);
-		return 0;
-	}
-	if (block->free_lines->size != block->pre_size - block->pre_allocated) {
-		fprintf (stderr, "free lines wrong size: %zd != %zd\n",
-				 block->free_lines->size,
-				 block->pre_size - block->pre_allocated);
-		return 0;
-	}
+
 	cmemfree (super, line1);
 	if (super->memblocks) {
 		fprintf (stderr, "line pool not freed\n");
 		return 0;
 	}
+	if (!check_bins (super, 0x00)) {
+		fprintf (stderr, "bins not cleared\n");
+		return 0;
+	}
+
+	line1 = cmemalloc (super, MEM_LINE_SIZE);
+	line2 = cmemalloc (super, MEM_LINE_SIZE);
+	line3 = cmemalloc (super, MEM_LINE_SIZE);
+	block = super->memblocks;
+
+	if (!check_block (block, 1, 3 * MEM_LINE_SIZE)) {
+		fprintf (stderr, "line block check 4 failed\n");
+		return 0;
+	}
+	if (!check_bins (super, 0x20)) {
+		fprintf (stderr, "bin check 4 failed\n");
+		return 0;
+	}
+
+	cmemfree (super, line1);
+
+	if (!check_block (block, 2, 2 * MEM_LINE_SIZE)) {
+		fprintf (stderr, "line block check 5 failed\n");
+		return 0;
+	}
+	if (!check_bins (super, 0x21)) {
+		fprintf (stderr, "bin check 5 failed\n");
+		return 0;
+	}
+
+	cmemfree (super, line2);
+
+	if (!check_block (block, 2, 1 * MEM_LINE_SIZE)) {
+		fprintf (stderr, "line block check 6 failed\n");
+		return 0;
+	}
+	if (!check_bins (super, 0x22)) {
+		fprintf (stderr, "bin check 6 failed\n");
+		return 0;
+	}
+
+	cmemfree (super, line3);
+	if (super->memblocks) {
+		fprintf (stderr, "line pool not freed 2\n");
+		return 0;
+	}
+	if (!check_bins (super, 0x00)) {
+		fprintf (stderr, "bins not cleared 2\n");
+		return 0;
+	}
+
+	line1 = cmemalloc (super, MEM_LINE_SIZE);
+	line2 = cmemalloc (super, MEM_LINE_SIZE);
+	line3 = cmemalloc (super, MEM_LINE_SIZE);
+	block = super->memblocks;
+
+	if (!check_block (block, 1, 3 * MEM_LINE_SIZE)) {
+		fprintf (stderr, "line block check 7 failed\n");
+		return 0;
+	}
+	if (!check_bins (super, 0x20)) {
+		fprintf (stderr, "bin check 7 failed\n");
+		return 0;
+	}
+
+	cmemfree (super, line3);
+
+	if (!check_block (block, 1, 2 * MEM_LINE_SIZE)) {
+		fprintf (stderr, "line block check 8 failed\n");
+		return 0;
+	}
+	if (!check_bins (super, 0x20)) {
+		fprintf (stderr, "bin check 8 failed\n");
+		return 0;
+	}
+
+	cmemfree (super, line2);
+
+	if (!check_block (block, 1, 1 * MEM_LINE_SIZE)) {
+		fprintf (stderr, "line block check 9 failed\n");
+		return 0;
+	}
+	if (!check_bins (super, 0x20)) {
+		fprintf (stderr, "bin check 9 failed\n");
+		return 0;
+	}
+
+	cmemfree (super, line1);
+	if (super->memblocks) {
+		fprintf (stderr, "line pool not freed 3\n");
+		return 0;
+	}
+	if (!check_bins (super, 0x00)) {
+		fprintf (stderr, "bins not cleared 3\n");
+		return 0;
+	}
+
 	return 1;
 }
 
@@ -252,9 +465,10 @@ int
 main (void)
 {
 	memsuper_t *super = new_memsuper ();
+	int         i;
 
-	if (sizeof (memsuper_t) != MEM_LINE_SIZE) {
-		fprintf (stderr, "memsuper_t not cache size: %zd\n",
+	if (sizeof (memsuper_t) != 2 * MEM_LINE_SIZE) {
+		fprintf (stderr, "memsuper_t not 2 * cache size: %zd\n",
 				 sizeof (memsuper_t));
 		return 1;
 	}
@@ -301,13 +515,50 @@ main (void)
 		fprintf (stderr, "super block list not null\n");
 		return 1;
 	}
+	for (i = 4; i-- > 0; ) {
+		if (super->last_freed[i]) {
+			break;
+		}
+	}
+	if (i >= 0) {
+		fprintf (stderr, "super last_freed not all null\n");
+		return 1;
+	}
+	for (i = MAX_CACHE_LINES; i-- > 0; ) {
+		if (super->free_lines[i]) {
+			break;
+		}
+	}
+	if (i >= 0) {
+		fprintf (stderr, "super free_lines not all null\n");
+		return 1;
+	}
 	if (!test_block (super)) {
 		fprintf (stderr, "block tests failed\n");
+		return 1;
 	}
 	if (super->memblocks) {
 		fprintf (stderr, "super block list not null 2\n");
 		return 1;
 	}
+	for (i = 4; i-- > 0; ) {
+		if (super->last_freed[i]) {
+			break;
+		}
+	}
+	if (i >= 0) {
+		fprintf (stderr, "super last_freed not all null 2\n");
+		return 1;
+	}
+	for (i = MAX_CACHE_LINES; i-- > 0; ) {
+		if (super->free_lines[i]) {
+			break;
+		}
+	}
+	if (i >= 0) {
+		fprintf (stderr, "super free_lines not all null 2\n");
+		return 1;
+	}
 	if (!test_line (super)) {
 		fprintf (stderr, "line tests failed\n");
 		return 1;

From 9090c535192c7318f681e39787e9c10b79f8b8c7 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 30 Dec 2020 11:07:12 +0900
Subject: [PATCH 1233/1519] [util] Add failing sub-line allocator tests

I think the sub-line allocator falling over is the final source of
qfvis's leaks. It certainly causes a mess of the sub-lines. But having
some tests to get working sure beats scratching my head over qfvis :)
---
 libs/util/test/test-cmem.c | 109 +++++++++++++++++++++++++++++--------
 1 file changed, 87 insertions(+), 22 deletions(-)

diff --git a/libs/util/test/test-cmem.c b/libs/util/test/test-cmem.c
index 107c20ad4..3d995ba42 100644
--- a/libs/util/test/test-cmem.c
+++ b/libs/util/test/test-cmem.c
@@ -368,40 +368,105 @@ test_line (memsuper_t *super)
 	return 1;
 }
 
+typedef struct {
+	size_t      size;
+	int         group_id;
+} sline_block_t;
+
+static sline_block_t group_tests[] = {
+	{ 2,  4},
+	{ 4,  4},
+	{ 5,  8},
+	{ 3,  4},
+	{ 1,  4},
+	{ 6,  8},
+	{ 9, 16},
+	{ 4,  4},
+	{ 4,  4},
+	{ 7,  8},
+	{ 2,  4},
+	{ 4,  4},
+	{ 8,  8},
+	{13, 16},
+	{ 3,  4},
+	{ 1,  4},
+	{ 8,  8},
+	{ 8,  8},
+	{ 4,  4},
+	{ 4,  4},
+	{16, 16},
+	{32, 32},
+	{32, 33},
+};
+#define num_group_tests (sizeof (group_tests) / sizeof (group_tests[0]))
+#define mask(x) (((size_t) (x)) & ~(MEM_LINE_SIZE - 1))
+#define pagemask(x,o,s) (((size_t) (x)) & (o (s)->page_mask))
+
 static int
 test_sline (memsuper_t *super)
 {
-	void       *mem[] = {
-		//cmemalloc (super, 2),	// smaller than min size
-		cmemalloc (super, 4),
-		cmemalloc (super, 4),
-		cmemalloc (super, 8),
-		cmemalloc (super, 8),
-		cmemalloc (super, 16),
-		cmemalloc (super, 16),
-		cmemalloc (super, 32),
-		cmemalloc (super, 32),
-	};
-#define mem_size (sizeof (mem) / sizeof (mem[0]))
-	int fail = 0;
-	for (size_t i = 0; i < mem_size; i++) {
-		printf("%p\n", mem[i]);
+	void       *mem[num_group_tests];
+	int         ret = 1;
+
+	for (size_t i = 0; i < num_group_tests; i++) {
+		mem[i] = cmemalloc (super, group_tests[i].size);
 		if (!mem[i]) {
 			fprintf (stderr, "mem[%zd] is null\n", i);
-			fail = 1;
+			return 0;
 		}
-		for (size_t j = i + 1; j < mem_size; j++) {
+		if (!((size_t) mem[i] % MEM_LINE_SIZE)) {
+			fprintf (stderr, "mem[%zd] is aligned with chache line\n", i);
+			ret = 0;
+		}
+	}
+	for (size_t i = 0; i < num_group_tests; i++) {
+		for (size_t j = i + 1; j < num_group_tests; j++) {
 			if (mem[i] == mem[j]) {
 				fprintf (stderr, "mem[%zd] is dupped with %zd\n", i, j);
-				fail = 1;
+				ret = 0;
+			}
+			if (mask (mem[i]) == mask (mem[j])) {
+				if (group_tests[i].group_id != group_tests[j].group_id) {
+					fprintf (stderr, "mem[%zd](%d) is grouped with %zd(%d)\n",
+							 i, group_tests[i].group_id,
+							 j, group_tests[j].group_id);
+					ret = 0;
+				}
+			} else {
+				if (group_tests[i].group_id == group_tests[j].group_id) {
+					fprintf (stderr,
+							 "mem[%zd](%d) is not grouped with %zd(%d)\n",
+							 i, group_tests[i].group_id,
+							 j, group_tests[j].group_id);
+					ret = 0;
+				}
+			}
+			if (pagemask (mem[i], ~, super) != pagemask (mem[j], ~, super)) {
+				fprintf (stderr,
+						 "mem[%zd](%d) is not block grouped with %zd(%d)\n",
+						 i, group_tests[i].group_id,
+						 j, group_tests[j].group_id);
 			}
 		}
 	}
-	if (fail) {
-		return 0;
+	for (size_t i = 0; i < num_group_tests; i++) {
+		cmemfree (super, mem[i]);
+		void   *newmem = cmemalloc (super, group_tests[i].size);
+		if (newmem != mem[i]) {
+			fprintf (stderr,
+					"%2zd bytes not recycled (%2zd,%2d) (%06zx %06zx)\n",
+					 group_tests[i].size, i, group_tests[i].group_id,
+					 pagemask (mem[i], ~~, super),
+					 pagemask (newmem, ~~, super));
+			ret = 0;
+		}
+		if (!((size_t) newmem % MEM_LINE_SIZE)) {
+			fprintf (stderr, "newmem is aligned with chache line %p\n",
+					 newmem);
+			ret = 0;
+		}
 	}
-#undef mem_size
-	return 1;
+	return ret;
 }
 
 static int

From efdbd59909202933706e3b7a139a1fdde84c2fed Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 30 Dec 2020 18:12:28 +0900
Subject: [PATCH 1234/1519] [util] Fix handling of sline's list 'pointer'

I forgot to right-shift the value so offsets were becoming 0 or 8
instead of 0-15. This fixes the management of small objects. It turns
out that after this fix, qfvis's problems were caused by fragmentation
in the windings. Need to revisit line allocation and use POT-specialized
pools.
---
 libs/util/cmem.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/util/cmem.c b/libs/util/cmem.c
index cc55ef01a..77060f8f8 100644
--- a/libs/util/cmem.c
+++ b/libs/util/cmem.c
@@ -377,7 +377,7 @@ cmemfree (memsuper_t *super, void *mem)
 		// sub line block
 		sline = (memsline_t *) ((size_t) mem & ~(MEM_LINE_SIZE - 1));
 		*(uint16_t *) mem = sline->list << 2;
-		sline->list = (size_t) mem & (MEM_LINE_SIZE - 1);
+		sline->list = ((size_t) mem & (MEM_LINE_SIZE - 1)) >> 2;
 		super_sline = &super->last_freed[sline->size];
 		if (*super_sline != sline) {
 			if (sline->next) {

From 1fd02322f45d0e0bc5f57ff70e2f23c3732554bb Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 1 Jan 2021 19:53:39 +0900
Subject: [PATCH 1235/1519] [util] Clean up some minor issues in cmem

I forgot to remove the noinline attribute and do a check with
optimization (to catch the "pure" recommendation).
---
 libs/util/cmem.c           | 12 ++++++------
 libs/util/test/test-cmem.c |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/libs/util/cmem.c b/libs/util/cmem.c
index 77060f8f8..9dc461b87 100644
--- a/libs/util/cmem.c
+++ b/libs/util/cmem.c
@@ -92,7 +92,7 @@ unlink_line (memline_t *line)
 	unlink_free_line (line);
 }
 
-static memblock_t * __attribute__((noinline))
+static memblock_t *
 init_block (memsuper_t *super, void *mem, size_t alloc_size)
 {
 	size_t      size = super->page_size;
@@ -133,7 +133,7 @@ init_block (memsuper_t *super, void *mem, size_t alloc_size)
 	return block;
 }
 
-static memblock_t * __attribute__((noinline))
+static memblock_t *
 block_alloc (memsuper_t *super, size_t size)
 {
 	memblock_t *block;
@@ -159,7 +159,7 @@ block_alloc (memsuper_t *super, size_t size)
 	return block;
 }
 
-static void * __attribute__((noinline))
+static void *
 alloc_line (memline_t *line, size_t size)
 {
 	void       *mem = line;
@@ -190,7 +190,7 @@ alloc_line (memline_t *line, size_t size)
 	return mem;
 }
 
-static void __attribute__((noinline))
+static void
 line_free (memsuper_t *super, memblock_t *block, void *mem)
 {
 	//FIXME right now, can free only single lines (need allocated lines to
@@ -252,7 +252,7 @@ line_free (memsuper_t *super, memblock_t *block, void *mem)
 	link_free_line (super, memline);
 }
 
-static memsline_t * __attribute__((noinline))
+static memsline_t *
 sline_new (memsuper_t *super, size_t size_ind)
 {
 	size_t      size = 4 << size_ind;
@@ -351,7 +351,7 @@ cmemalloc (memsuper_t *super, size_t size)
 	return 0;
 }
 
-static void __attribute__((noinline))
+static void
 unlink_block (memblock_t *block)
 {
 	if (block->pre_size) {
diff --git a/libs/util/test/test-cmem.c b/libs/util/test/test-cmem.c
index 3d995ba42..4f146ccc7 100644
--- a/libs/util/test/test-cmem.c
+++ b/libs/util/test/test-cmem.c
@@ -118,7 +118,7 @@ check_block (memblock_t *block, int line_count, int allocated)
 	return ret;
 }
 
-static int
+static int __attribute__ ((pure))
 check_for_loop (memline_t *line, memline_t **stop)
 {
 	memline_t  *next = line->free_next;

From 7bf90e5f4a8659da87af15c50b2580988ad36405 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 1 Jan 2021 19:49:20 +0900
Subject: [PATCH 1236/1519] [util] Sort out implementation issues for simd

---
 include/QF/simd/vec4d.h    | 192 ++++++++++++++++++++++++++-----------
 include/QF/simd/vec4f.h    | 192 +++++++++++++++++++++++++------------
 libs/util/Makemodule.am    |   1 +
 libs/util/simd.c           |  37 +++++++
 libs/util/test/test-simd.c |   4 +
 5 files changed, 308 insertions(+), 118 deletions(-)
 create mode 100644 libs/util/simd.c

diff --git a/include/QF/simd/vec4d.h b/include/QF/simd/vec4d.h
index 11e173eff..6bd984357 100644
--- a/include/QF/simd/vec4d.h
+++ b/include/QF/simd/vec4d.h
@@ -32,13 +32,107 @@
 
 #include "QF/simd/types.h"
 
+GNU89INLINE inline vec4d_t vsqrtd (vec4d_t v) __attribute__((const));
+GNU89INLINE inline vec4d_t vceild (vec4d_t v) __attribute__((const));
+GNU89INLINE inline vec4d_t vfloord (vec4d_t v) __attribute__((const));
+GNU89INLINE inline vec4d_t vtruncd (vec4d_t v) __attribute__((const));
 /** 3D vector cross product.
  *
  * The w (4th) component can be any value on input, and is guaranteed to be 0
  * in the result. The result is not affected in any way by either vector's w
  * componemnt
  */
-vec4d_t crossd (vec4d_t a, vec4d_t b) __attribute__((const));
+GNU89INLINE inline vec4d_t crossd (vec4d_t a, vec4d_t b) __attribute__((const));
+/** 4D vector dot product.
+ *
+ * The w component *IS* significant, but if it is 0 in either vector, then
+ * the result will be as for a 3D dot product.
+ *
+ * Note that the dot product is in all 4 of the return value's elements. This
+ * helps optimize vector math as the scalar is already pre-spread. If just the
+ * scalar is required, use result[0].
+ */
+GNU89INLINE inline vec4d_t dotd (vec4d_t a, vec4d_t b) __attribute__((const));
+/** Quaternion product.
+ *
+ * The vector is interpreted as a quaternion instead of a regular 4D vector.
+ * The quaternion may be of any magnitude, so this is more generally useful.
+ * than if the quaternion was required to be unit length.
+ */
+GNU89INLINE inline vec4d_t qmuld (vec4d_t a, vec4d_t b) __attribute__((const));
+/** Optimized quaterion-vector multiplication for vector rotation.
+ *
+ * If the vector's w component is not zero, then the result's w component
+ * is the cosine of the full rotation angle scaled by the vector's w component.
+ * The quaternion is assumed to be unit. If the quaternion is not unit, the
+ * vector will be scaled by the square of the quaternion's magnitude.
+ */
+GNU89INLINE inline vec4d_t qvmuld (vec4d_t q, vec4d_t v) __attribute__((const));
+/** Create the quaternion representing the shortest rotation from a to b.
+ *
+ * Both a and b are assumed to be 3D vectors (w components 0), but a resonable
+ * (but incorrect) result will still be produced if either a or b is a 4D
+ * vector. The rotation axis will be the same as if both vectors were 3D, but
+ * the magnitude of the rotation will be different.
+ */
+GNU89INLINE inline vec4d_t qrotd (vec4d_t a, vec4d_t b) __attribute__((const));
+/** Return the conjugate of the quaternion.
+ *
+ * That is, [-x, -y, -z, w].
+ */
+GNU89INLINE inline vec4d_t qconjd (vec4d_t q) __attribute__((const));
+GNU89INLINE inline vec4d_t loadvec3d (const double v3[]) __attribute__((pure, access(read_only, 1)));
+GNU89INLINE inline void storevec3d (double v3[3], vec4d_t v4) __attribute__((access (write_only, 1)));
+
+#ifndef IMPLEMENT_VEC4D_Funcs
+GNU89INLINE inline
+#else
+VISIBLE
+#endif
+vec4d_t
+vsqrtd (vec4d_t v)
+{
+	return _mm256_sqrt_pd (v);
+}
+
+#ifndef IMPLEMENT_VEC4D_Funcs
+GNU89INLINE inline
+#else
+VISIBLE
+#endif
+vec4d_t
+vceild (vec4d_t v)
+{
+	return _mm256_ceil_pd (v);
+}
+
+#ifndef IMPLEMENT_VEC4D_Funcs
+GNU89INLINE inline
+#else
+VISIBLE
+#endif
+vec4d_t
+vfloord (vec4d_t v)
+{
+	return _mm256_floor_pd (v);
+}
+
+#ifndef IMPLEMENT_VEC4D_Funcs
+GNU89INLINE inline
+#else
+VISIBLE
+#endif
+vec4d_t
+vtruncd (vec4d_t v)
+{
+	return _mm256_round_pd (v, _MM_FROUND_TRUNC);
+}
+
+#ifndef IMPLEMENT_VEC4D_Funcs
+GNU89INLINE inline
+#else
+VISIBLE
+#endif
 vec4d_t
 crossd (vec4d_t a, vec4d_t b)
 {
@@ -49,16 +143,11 @@ crossd (vec4d_t a, vec4d_t b)
 	return __builtin_shuffle(c, A);
 }
 
-/** 4D vector dot product.
- *
- * The w component *IS* significant, but if it is 0 in either vector, then
- * the result will be as for a 3D dot product.
- *
- * Note that the dot product is in all 4 of the return value's elements. This
- * helps optimize vector math as the scalar is already pre-spread. If just the
- * scalar is required, use result[0].
- */
-vec4d_t dotd (vec4d_t a, vec4d_t b) __attribute__((const));
+#ifndef IMPLEMENT_VEC4D_Funcs
+GNU89INLINE inline
+#else
+VISIBLE
+#endif
 vec4d_t
 dotd (vec4d_t a, vec4d_t b)
 {
@@ -69,13 +158,11 @@ dotd (vec4d_t a, vec4d_t b)
 	return c;
 }
 
-/** Quaternion product.
- *
- * The vector is interpreted as a quaternion instead of a regular 4D vector.
- * The quaternion may be of any magnitude, so this is more generally useful.
- * than if the quaternion was required to be unit length.
- */
-vec4d_t qmuld (vec4d_t a, vec4d_t b) __attribute__((const));
+#ifndef IMPLEMENT_VEC4D_Funcs
+GNU89INLINE inline
+#else
+VISIBLE
+#endif
 vec4d_t
 qmuld (vec4d_t a, vec4d_t b)
 {
@@ -89,14 +176,11 @@ qmuld (vec4d_t a, vec4d_t b)
 	return c - d;
 }
 
-/** Optimized quaterion-vector multiplication for vector rotation.
- *
- * If the vector's w component is not zero, then the result's w component
- * is the cosine of the full rotation angle scaled by the vector's w component.
- * The quaternion is assumed to be unit. If the quaternion is not unit, the
- * vector will be scaled by the square of the quaternion's magnitude.
- */
-vec4d_t qvmuld (vec4d_t q, vec4d_t v) __attribute__((const));
+#ifndef IMPLEMENT_VEC4D_Funcs
+GNU89INLINE inline
+#else
+VISIBLE
+#endif
 vec4d_t
 qvmuld (vec4d_t q, vec4d_t v)
 {
@@ -112,19 +196,16 @@ qvmuld (vec4d_t q, vec4d_t v)
 	return (s * s - qq) * v + 2 * (qv * q + s * c);
 }
 
-/** Create the quaternion representing the shortest rotation from a to b.
- *
- * Both a and b are assumed to be 3D vectors (w components 0), but a resonable
- * (but incorrect) result will still be produced if either a or b is a 4D
- * vector. The rotation axis will be the same as if both vectors were 3D, but
- * the magnitude of the rotation will be different.
- */
-vec4d_t qrotd (vec4d_t a, vec4d_t b) __attribute__((const));
+#ifndef IMPLEMENT_VEC4D_Funcs
+GNU89INLINE inline
+#else
+VISIBLE
+#endif
 vec4d_t
 qrotd (vec4d_t a, vec4d_t b)
 {
-	vec4d_t ma = _mm256_sqrt_pd (dotd (a, a));
-	vec4d_t mb = _mm256_sqrt_pd (dotd (b, b));
+	vec4d_t ma = vsqrtd (dotd (a, a));
+	vec4d_t mb = vsqrtd (dotd (b, b));
 	vec4d_t den = 2 * ma * mb;
 	vec4d_t t = mb * a + ma * b;
 	vec4d_t mba_mab = _mm256_sqrt_pd (dotd (t, t));
@@ -133,7 +214,11 @@ qrotd (vec4d_t a, vec4d_t b)
 	return q;
 }
 
-vec4d_t qconjd (vec4d_t q) __attribute__((const));
+#ifndef IMPLEMENT_VEC4D_Funcs
+GNU89INLINE inline
+#else
+VISIBLE
+#endif
 vec4d_t
 qconjd (vec4d_t q)
 {
@@ -141,7 +226,11 @@ qconjd (vec4d_t q)
 	return _mm256_xor_pd (q, (__m256d) neg);
 }
 
-vec4d_t loadvec3d (const double v3[]) __attribute__((pure, access(read_only, 1)));
+#ifndef IMPLEMENT_VEC4D_Funcs
+GNU89INLINE inline
+#else
+VISIBLE
+#endif
 vec4d_t
 loadvec3d (const double v3[])
 {
@@ -153,30 +242,17 @@ loadvec3d (const double v3[])
 	return v4;
 }
 
-void storevec3d (double v3[3], vec4d_t v4) __attribute__((access (write_only, 1)));
-void storevec3d (double v3[3], vec4d_t v4)
+#ifndef IMPLEMENT_VEC4D_Funcs
+GNU89INLINE inline
+#else
+VISIBLE
+#endif
+void
+storevec3d (double v3[3], vec4d_t v4)
 {
 	v3[0] = v4[0];
 	v3[1] = v4[1];
 	v3[2] = v4[2];
 }
 
-vec4d_t vceild (vec4d_t v) __attribute__((const));
-vec4d_t vceild (vec4d_t v)
-{
-	return _mm256_ceil_pd (v);
-}
-
-vec4d_t vfloord (vec4d_t v) __attribute__((const));
-vec4d_t vfloord (vec4d_t v)
-{
-	return _mm256_floor_pd (v);
-}
-
-vec4d_t vtruncd (vec4d_t v) __attribute__((const));
-vec4d_t vtruncd (vec4d_t v)
-{
-	return _mm256_round_pd (v, _MM_FROUND_TRUNC);
-}
-
 #endif//__QF_simd_vec4d_h
diff --git a/include/QF/simd/vec4f.h b/include/QF/simd/vec4f.h
index 997127a94..5c0b4cc3d 100644
--- a/include/QF/simd/vec4f.h
+++ b/include/QF/simd/vec4f.h
@@ -32,21 +32,17 @@
 
 #include "QF/simd/types.h"
 
+GNU89INLINE inline vec4f_t vsqrtf (vec4f_t v) __attribute__((const));
+GNU89INLINE inline vec4f_t vceilf (vec4f_t v) __attribute__((const));
+GNU89INLINE inline vec4f_t vfloorf (vec4f_t v) __attribute__((const));
+GNU89INLINE inline vec4f_t vtruncf (vec4f_t v) __attribute__((const));
 /** 3D vector cross product.
  *
  * The w (4th) component can be any value on input, and is guaranteed to be 0
  * in the result. The result is not affected in any way by either vector's w
  * componemnt
  */
-vec4f_t crossf (vec4f_t a, vec4f_t b) __attribute__((const));
-vec4f_t
-crossf (vec4f_t a, vec4f_t b)
-{
-	static const vec4i_t A = {1, 2, 0, 3};
-	vec4f_t c = a * __builtin_shuffle (b, A) - __builtin_shuffle (a, A) * b;
-	return __builtin_shuffle(c, A);
-}
-
+GNU89INLINE inline vec4f_t crossf (vec4f_t a, vec4f_t b) __attribute__((const));
 /** 4D vector dot product.
  *
  * The w component *IS* significant, but if it is 0 in either vector, then
@@ -56,7 +52,99 @@ crossf (vec4f_t a, vec4f_t b)
  * helps optimize vector math as the scalar is already pre-spread. If just the
  * scalar is required, use result[0].
  */
-vec4f_t dotf (vec4f_t a, vec4f_t b) __attribute__((const));
+GNU89INLINE inline vec4f_t dotf (vec4f_t a, vec4f_t b) __attribute__((const));
+/** Quaternion product.
+ *
+ * The vector is interpreted as a quaternion instead of a regular 4D vector.
+ * The quaternion may be of any magnitude, so this is more generally useful.
+ * than if the quaternion was required to be unit length.
+ */
+GNU89INLINE inline vec4f_t qmulf (vec4f_t a, vec4f_t b) __attribute__((const));
+/** Optimized quaterion-vector multiplication for vector rotation.
+ *
+ * If the vector's w component is not zero, then the result's w component
+ * is the cosine of the full rotation angle scaled by the vector's w component.
+ * The quaternion is assumed to be unit.
+ */
+GNU89INLINE inline vec4f_t qvmulf (vec4f_t q, vec4f_t v) __attribute__((const));
+/** Create the quaternion representing the shortest rotation from a to b.
+ *
+ * Both a and b are assumed to be 3D vectors (w components 0), but a resonable
+ * (but incorrect) result will still be produced if either a or b is a 4D
+ * vector. The rotation axis will be the same as if both vectors were 3D, but
+ * the magnitude of the rotation will be different.
+ */
+GNU89INLINE inline vec4f_t qrotf (vec4f_t a, vec4f_t b) __attribute__((const));
+/** Return the conjugate of the quaternion.
+ *
+ * That is, [-x, -y, -z, w].
+ */
+GNU89INLINE inline vec4f_t qconjf (vec4f_t q) __attribute__((const));
+GNU89INLINE inline vec4f_t loadvec3f (const float v3[3]) __attribute__((pure, access(read_only, 1)));
+GNU89INLINE inline void storevec3f (float v3[3], vec4f_t v4) __attribute__((access (write_only, 1)));
+
+#ifndef IMPLEMENT_VEC4F_Funcs
+GNU89INLINE inline
+#else
+VISIBLE
+#endif
+vec4f_t
+vsqrtf (vec4f_t v)
+{
+	return _mm_sqrt_ps (v);
+}
+
+#ifndef IMPLEMENT_VEC4F_Funcs
+GNU89INLINE inline
+#else
+VISIBLE
+#endif
+vec4f_t
+vceilf (vec4f_t v)
+{
+	return _mm_ceil_ps (v);
+}
+
+#ifndef IMPLEMENT_VEC4F_Funcs
+GNU89INLINE inline
+#else
+VISIBLE
+#endif
+vec4f_t
+vfloorf (vec4f_t v)
+{
+	return _mm_floor_ps (v);
+}
+
+#ifndef IMPLEMENT_VEC4F_Funcs
+GNU89INLINE inline
+#else
+VISIBLE
+#endif
+vec4f_t
+vtruncf (vec4f_t v)
+{
+	return _mm_round_ps (v, _MM_FROUND_TRUNC);
+}
+
+#ifndef IMPLEMENT_VEC4F_Funcs
+GNU89INLINE inline
+#else
+VISIBLE
+#endif
+vec4f_t
+crossf (vec4f_t a, vec4f_t b)
+{
+	static const vec4i_t A = {1, 2, 0, 3};
+	vec4f_t c = a * __builtin_shuffle (b, A) - __builtin_shuffle (a, A) * b;
+	return __builtin_shuffle(c, A);
+}
+
+#ifndef IMPLEMENT_VEC4F_Funcs
+GNU89INLINE inline
+#else
+VISIBLE
+#endif
 vec4f_t
 dotf (vec4f_t a, vec4f_t b)
 {
@@ -66,13 +154,11 @@ dotf (vec4f_t a, vec4f_t b)
 	return c;
 }
 
-/** Quaternion product.
- *
- * The vector is interpreted as a quaternion instead of a regular 4D vector.
- * The quaternion may be of any magnitude, so this is more generally useful.
- * than if the quaternion was required to be unit length.
- */
-vec4f_t qmulf (vec4f_t a, vec4f_t b) __attribute__((const));
+#ifndef IMPLEMENT_VEC4F_Funcs
+GNU89INLINE inline
+#else
+VISIBLE
+#endif
 vec4f_t
 qmulf (vec4f_t a, vec4f_t b)
 {
@@ -85,13 +171,11 @@ qmulf (vec4f_t a, vec4f_t b)
 	return c - d;
 }
 
-/** Optimized quaterion-vector multiplication for vector rotation.
- *
- * If the vector's w component is not zero, then the result's w component
- * is the cosine of the full rotation angle scaled by the vector's w component.
- * The quaternion is assumed to be unit.
- */
-vec4f_t qvmulf (vec4f_t q, vec4f_t v) __attribute__((const));
+#ifndef IMPLEMENT_VEC4F_Funcs
+GNU89INLINE inline
+#else
+VISIBLE
+#endif
 vec4f_t
 qvmulf (vec4f_t q, vec4f_t v)
 {
@@ -106,19 +190,16 @@ qvmulf (vec4f_t q, vec4f_t v)
 	return (s * s - qq) * v + 2 * (qv * q + s * c);
 }
 
-/** Create the quaternion representing the shortest rotation from a to b.
- *
- * Both a and b are assumed to be 3D vectors (w components 0), but a resonable
- * (but incorrect) result will still be produced if either a or b is a 4D
- * vector. The rotation axis will be the same as if both vectors were 3D, but
- * the magnitude of the rotation will be different.
- */
-vec4f_t qrotf (vec4f_t a, vec4f_t b) __attribute__((const));
+#ifndef IMPLEMENT_VEC4F_Funcs
+GNU89INLINE inline
+#else
+VISIBLE
+#endif
 vec4f_t
 qrotf (vec4f_t a, vec4f_t b)
 {
-	vec4f_t ma = _mm_sqrt_ps (dotf (a, a));
-	vec4f_t mb = _mm_sqrt_ps (dotf (b, b));
+	vec4f_t ma = vsqrtf (dotf (a, a));
+	vec4f_t mb = vsqrtf (dotf (b, b));
 	vec4f_t den = 2 * ma * mb;
 	vec4f_t t = mb * a + ma * b;
 	vec4f_t mba_mab = _mm_sqrt_ps (dotf (t, t));
@@ -127,11 +208,11 @@ qrotf (vec4f_t a, vec4f_t b)
 	return q;
 }
 
-/** Return the conjugate of the quaternion.
- *
- * That is, [-x, -y, -z, w].
- */
-vec4f_t qconjf (vec4f_t q) __attribute__((const));
+#ifndef IMPLEMENT_VEC4F_Funcs
+GNU89INLINE inline
+#else
+VISIBLE
+#endif
 vec4f_t
 qconjf (vec4f_t q)
 {
@@ -139,7 +220,11 @@ qconjf (vec4f_t q)
 	return _mm_xor_ps (q, (__m128) neg);
 }
 
-vec4f_t loadvec3f (const float v3[3]) __attribute__((pure, access(read_only, 1)));
+#ifndef IMPLEMENT_VEC4F_Funcs
+GNU89INLINE inline
+#else
+VISIBLE
+#endif
 vec4f_t
 loadvec3f (const float v3[3])
 {
@@ -160,30 +245,17 @@ loadvec3f (const float v3[3])
 	return v4;
 }
 
-void storevec3f (float v3[3], vec4f_t v4) __attribute__((access (write_only, 1)));
-void storevec3f (float v3[3], vec4f_t v4)
+#ifndef IMPLEMENT_VEC4F_Funcs
+GNU89INLINE inline
+#else
+VISIBLE
+#endif
+void
+storevec3f (float v3[3], vec4f_t v4)
 {
 	v3[0] = v4[0];
 	v3[1] = v4[1];
 	v3[2] = v4[2];
 }
 
-vec4f_t vceilf (vec4f_t v) __attribute__((const));
-vec4f_t vceilf (vec4f_t v)
-{
-	return _mm_ceil_ps (v);
-}
-
-vec4f_t vfloorf (vec4f_t v) __attribute__((const));
-vec4f_t vfloorf (vec4f_t v)
-{
-	return _mm_floor_ps (v);
-}
-
-vec4f_t vtruncf (vec4f_t v) __attribute__((const));
-vec4f_t vtruncf (vec4f_t v)
-{
-	return _mm_round_ps (v, _MM_FROUND_TRUNC);
-}
-
 #endif//__QF_simd_vec4f_h
diff --git a/libs/util/Makemodule.am b/libs/util/Makemodule.am
index f554289be..d2ad47b0c 100644
--- a/libs/util/Makemodule.am
+++ b/libs/util/Makemodule.am
@@ -74,6 +74,7 @@ libs_util_libQFutil_la_SOURCES= \
 	libs/util/script.c \
 	libs/util/segtext.c \
 	libs/util/set.c \
+	libs/util/simd.c \
 	libs/util/sizebuf.c \
 	libs/util/string.c \
 	libs/util/sys.c \
diff --git a/libs/util/simd.c b/libs/util/simd.c
new file mode 100644
index 000000000..f5a0fcd35
--- /dev/null
+++ b/libs/util/simd.c
@@ -0,0 +1,37 @@
+/*
+	simd.c
+
+	SIMD math support
+
+	Copyright (C) 2020  Bill Currie <bill@taniwha.org>
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <math.h>
+
+#define IMPLEMENT_VEC4F_Funcs
+#define IMPLEMENT_VEC4D_Funcs
+
+#include "QF/simd/vec4d.h"
+#include "QF/simd/vec4f.h"
diff --git a/libs/util/test/test-simd.c b/libs/util/test/test-simd.c
index 8fcc6935c..006e57526 100644
--- a/libs/util/test/test-simd.c
+++ b/libs/util/test/test-simd.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <stdio.h>
 #include <stdio.h>
 #include <string.h>

From 015cee7b6f37c95451b0ad3b26405c6bad14d9b7 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 2 Jan 2021 10:44:45 +0900
Subject: [PATCH 1237/1519] [util] Add vector-quaternion shortcut functions

Care needs to be taken to ensure the right function is used with the
right arguments, but with these, the need to use qconj(d|f) for a
one-off inverse rotation is removed.
---
 include/QF/simd/vec4d.h    | 36 ++++++++++++++++++++++++++++++++++++
 include/QF/simd/vec4f.h    | 30 ++++++++++++++++++++++++++++++
 libs/util/test/test-simd.c | 35 +++++++++++++++++++++++++++++++++--
 3 files changed, 99 insertions(+), 2 deletions(-)

diff --git a/include/QF/simd/vec4d.h b/include/QF/simd/vec4d.h
index 6bd984357..1b8adbdfc 100644
--- a/include/QF/simd/vec4d.h
+++ b/include/QF/simd/vec4d.h
@@ -61,6 +61,8 @@ GNU89INLINE inline vec4d_t dotd (vec4d_t a, vec4d_t b) __attribute__((const));
  */
 GNU89INLINE inline vec4d_t qmuld (vec4d_t a, vec4d_t b) __attribute__((const));
 /** Optimized quaterion-vector multiplication for vector rotation.
+ *
+ * \note This is the inverse of vqmulf
  *
  * If the vector's w component is not zero, then the result's w component
  * is the cosine of the full rotation angle scaled by the vector's w component.
@@ -68,6 +70,16 @@ GNU89INLINE inline vec4d_t qmuld (vec4d_t a, vec4d_t b) __attribute__((const));
  * vector will be scaled by the square of the quaternion's magnitude.
  */
 GNU89INLINE inline vec4d_t qvmuld (vec4d_t q, vec4d_t v) __attribute__((const));
+/** Optimized vector-quaterion multiplication for vector rotation.
+ *
+ * \note This is the inverse of qvmulf
+ *
+ * If the vector's w component is not zero, then the result's w component
+ * is the cosine of the full rotation angle scaled by the vector's w component.
+ * The quaternion is assumed to be unit. If the quaternion is not unit, the
+ * vector will be scaled by the square of the quaternion's magnitude.
+ */
+GNU89INLINE inline vec4d_t vqmuld (vec4d_t v, vec4d_t q) __attribute__((const));
 /** Create the quaternion representing the shortest rotation from a to b.
  *
  * Both a and b are assumed to be 3D vectors (w components 0), but a resonable
@@ -183,6 +195,7 @@ VISIBLE
 #endif
 vec4d_t
 qvmuld (vec4d_t q, vec4d_t v)
+//             ^^^        ^^^
 {
 	double s = q[3];
 	// zero the scalar of the quaternion. Results in an extra operation, but
@@ -193,9 +206,32 @@ qvmuld (vec4d_t q, vec4d_t v)
 	vec4d_t qv = dotd (q, v);	// q.w is 0 so v.w is irrelevant
 	vec4d_t qq = dotd (q, q);
 
+	//                                   vvv
 	return (s * s - qq) * v + 2 * (qv * q + s * c);
 }
 
+#ifndef IMPLEMENT_VEC4D_Funcs
+GNU89INLINE inline
+#else
+VISIBLE
+#endif
+vec4d_t
+vqmuld (vec4d_t v, vec4d_t q)
+//             ^^^        ^^^
+{
+	double s = q[3];
+	// zero the scalar of the quaternion. Results in an extra operation, but
+	// avoids adding precision issues.
+	vec4d_t z = {};
+	q = _mm256_blend_pd (q, z, 0x08);
+	vec4d_t c = crossd (q, v);
+	vec4d_t qv = dotd (q, v);	// q.w is 0 so v.w is irrelevant
+	vec4d_t qq = dotd (q, q);
+
+	//                                   vvv
+	return (s * s - qq) * v + 2 * (qv * q - s * c);
+}
+
 #ifndef IMPLEMENT_VEC4D_Funcs
 GNU89INLINE inline
 #else
diff --git a/include/QF/simd/vec4f.h b/include/QF/simd/vec4f.h
index 5c0b4cc3d..f3ea3b22f 100644
--- a/include/QF/simd/vec4f.h
+++ b/include/QF/simd/vec4f.h
@@ -61,12 +61,23 @@ GNU89INLINE inline vec4f_t dotf (vec4f_t a, vec4f_t b) __attribute__((const));
  */
 GNU89INLINE inline vec4f_t qmulf (vec4f_t a, vec4f_t b) __attribute__((const));
 /** Optimized quaterion-vector multiplication for vector rotation.
+ *
+ * \note This is the inverse of vqmulf
  *
  * If the vector's w component is not zero, then the result's w component
  * is the cosine of the full rotation angle scaled by the vector's w component.
  * The quaternion is assumed to be unit.
  */
 GNU89INLINE inline vec4f_t qvmulf (vec4f_t q, vec4f_t v) __attribute__((const));
+/** Optimized vector-quaterion multiplication for vector rotation.
+ *
+ * \note This is the inverse of qvmulf
+ *
+ * If the vector's w component is not zero, then the result's w component
+ * is the cosine of the full rotation angle scaled by the vector's w component.
+ * The quaternion is assumed to be unit.
+ */
+GNU89INLINE inline vec4f_t vqmulf (vec4f_t v, vec4f_t q) __attribute__((const));
 /** Create the quaternion representing the shortest rotation from a to b.
  *
  * Both a and b are assumed to be 3D vectors (w components 0), but a resonable
@@ -190,6 +201,25 @@ qvmulf (vec4f_t q, vec4f_t v)
 	return (s * s - qq) * v + 2 * (qv * q + s * c);
 }
 
+#ifndef IMPLEMENT_VEC4F_Funcs
+GNU89INLINE inline
+#else
+VISIBLE
+#endif
+vec4f_t
+vqmulf (vec4f_t v, vec4f_t q)
+{
+	float s = q[3];
+	// zero the scalar of the quaternion. Results in an extra operation, but
+	// avoids adding precision issues.
+	q = _mm_insert_ps (q, q, 0xf8);
+	vec4f_t c = crossf (q, v);
+	vec4f_t qv = dotf (q, v);	// q.w is 0 so v.w is irrelevant
+	vec4f_t qq = dotf (q, q);
+
+	return (s * s - qq) * v + 2 * (qv * q - s * c);
+}
+
 #ifndef IMPLEMENT_VEC4F_Funcs
 GNU89INLINE inline
 #else
diff --git a/libs/util/test/test-simd.c b/libs/util/test/test-simd.c
index 006e57526..40a7276de 100644
--- a/libs/util/test/test-simd.c
+++ b/libs/util/test/test-simd.c
@@ -153,11 +153,22 @@ static vec4d_test_t vec4d_tests[] = {
 	{ qvmuld, one,    up,        { 4, 0, 0, 0 } },
 	{ qvmuld, one,    {1,1,1,0}, { 4, 4, 4, 0 } },
 	{ qvmuld, one,    one,       { 4, 4, 4, -2 } },
+	// inverse rotation, so x->z->y->x
+	{ vqmuld, right,     one,    { 0, 0, 4, 0 } },
+	{ vqmuld, forward,   one,    { 4, 0, 0, 0 } },
+	{ vqmuld, up,        one,    { 0, 4, 0, 0 } },
+	{ vqmuld, {1,1,1,0}, one,    { 4, 4, 4, 0 } },
+	{ vqmuld, one,       one,    { 4, 4, 4, -2 } },
 	// The half vector is unit.
 	{ qvmuld, half,   right,     forward },
 	{ qvmuld, half,   forward,   up      },
 	{ qvmuld, half,   up,        right   },
 	{ qvmuld, half,   {1,1,1,0}, { 1, 1, 1, 0 } },
+	// inverse
+	{ vqmuld, right,     half,   up      },
+	{ vqmuld, forward,   half,   right   },
+	{ vqmuld, up,        half,   forward },
+	{ vqmuld, {1,1,1,0}, half,   { 1, 1, 1, 0 } },
 	// one is a 4D vector and qvmuld is meant for 3D vectors. However, it
 	// seems that the vector's w has no effect on the 3d portion of the
 	// result, but the result's w is cosine of the full rotation angle
@@ -168,6 +179,13 @@ static vec4d_test_t vec4d_tests[] = {
 	{ qvmuld, qtest,  forward,   {0.6144, 0.1808, 0.768, 0},
 	                             {0, -2.7e-17, 0, 0} },
 	{ qvmuld, qtest,  up,        {0.576, -0.768, -0.28, 0} },
+	// inverse
+	{ vqmuld, one,       half,   { 1, 1, 1, -0.5 } },
+	{ vqmuld, {2,2,2,2}, half,   { 2, 2, 2, -1 } },
+	{ vqmuld, right,     qtest,  {0.5392, 0.6144, 0.576, 0} },
+	{ vqmuld, forward,   qtest,  {0.6144, 0.1808, -0.768, 0},
+	                             {0, -2.7e-17, 0, 0} },
+	{ vqmuld, up,        qtest,  {-0.576, 0.768, -0.28, 0} },
 
 	{ qrotd, right,   right,    qident },
 	{ qrotd, right,   forward,  {    0,    0,  s05,  s05 },
@@ -259,12 +277,25 @@ static vec4f_test_t vec4f_tests[] = {
 	{ qvmulf, one,    up,        { 4, 0, 0, 0 } },
 	{ qvmulf, one,    {1,1,1,0}, { 4, 4, 4, 0 } },
 	{ qvmulf, one,    one,       { 4, 4, 4, -2 } },
+	// inverse rotation, so x->z->y->x
+	{ vqmulf, right,     one,    { 0, 0, 4, 0 } },
+	{ vqmulf, forward,   one,    { 4, 0, 0, 0 } },
+	{ vqmulf, up,        one,    { 0, 4, 0, 0 } },
+	{ vqmulf, {1,1,1,0}, one,    { 4, 4, 4, 0 } },
+	{ vqmulf, one,       one,    { 4, 4, 4, -2 } },
+	//
 	{ qvmulf, qtest,  right,     {0.5392, 0.6144, -0.576, 0},
-	                             {0, -5.9e-08, -6e-8, 0} },
+	                             {0, -5.9e-8, -6e-8, 0} },
 	{ qvmulf, qtest,  forward,   {0.6144, 0.1808, 0.768, 0},
-	                             {-5.9e-08, 1.5e-08, 0, 0} },
+	                             {-5.9e-8, 1.5e-8, 0, 0} },
 	{ qvmulf, qtest,  up,        {0.576, -0.768, -0.28, 0},
 	                             {6e-8, 0, 3e-8, 0} },
+	{ vqmulf, right,     qtest,  {0.5392, 0.6144, 0.576, 0},
+	                             {0, -5.9e-8, 5.9e-8, 0} },
+	{ vqmulf, forward,   qtest,  {0.6144, 0.1808, -0.768, 0},
+	                             {-5.9e-8, 1.5e-8, 0, 0} },
+	{ vqmulf, up,        qtest,  {-0.576, 0.768, -0.28, 0},
+	                             {-5.9e-8, 0, 3e-8, 0} },
 
 	{ qrotf, right,   right,    qident },
 	{ qrotf, right,   forward,  {    0,    0,  s05,  s05 } },

From eb52d366c8f12d8b07a16834c9c96c995a4259a5 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 2 Jan 2021 12:10:58 +0900
Subject: [PATCH 1238/1519] [util] Add q-v and v-q multiplication to cexpr

---
 libs/util/cexpr-type.c | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/libs/util/cexpr-type.c b/libs/util/cexpr-type.c
index 81fc212cd..04eef6d70 100644
--- a/libs/util/cexpr-type.c
+++ b/libs/util/cexpr-type.c
@@ -356,6 +356,16 @@ BINOP(vector, sub, vec4f_t, -)
 BINOP(vector, mul, vec4f_t, *)
 BINOP(vector, div, vec4f_t, /)
 
+static void
+vector_quaternion_mul (const exprval_t *val1, const exprval_t *val2,
+					   exprval_t *result, exprctx_t *ctx)
+{
+	vec4f_t     a = *(vec4f_t *) val1->value;
+	vec4f_t     b = *(vec4f_t *) val2->value;
+	__auto_type c = (vec4f_t *) result->value;
+	*c = vqmulf (a, b);
+}
+
 static void
 vector_rem (const exprval_t *val1, const exprval_t *val2, exprval_t *result,
 			exprctx_t *ctx)
@@ -396,6 +406,7 @@ binop_t vector_binops[] = {
 	{ '+', &cexpr_vector, &cexpr_vector, vector_add },
 	{ '-', &cexpr_vector, &cexpr_vector, vector_sub },
 	{ '*', &cexpr_vector, &cexpr_vector, vector_mul },
+	{ '*', &cexpr_quaternion, &cexpr_vector, vector_quaternion_mul },
 	{ '/', &cexpr_vector, &cexpr_vector, vector_div },
 	{ '%', &cexpr_vector, &cexpr_vector, vector_rem },
 	{ MOD, &cexpr_vector, &cexpr_vector, vector_mod },
@@ -426,10 +437,21 @@ quaternion_mul (const exprval_t *val1, const exprval_t *val2,
 	*c = qmulf (a, b);
 }
 
+static void
+quaternion_vector_mul (const exprval_t *val1, const exprval_t *val2,
+					   exprval_t *result, exprctx_t *ctx)
+{
+	vec4f_t     a = *(vec4f_t *) val1->value;
+	vec4f_t     b = *(vec4f_t *) val2->value;
+	__auto_type c = (vec4f_t *) result->value;
+	*c = qvmulf (a, b);
+}
+
 binop_t quaternion_binops[] = {
 	{ '+', &cexpr_quaternion, &cexpr_quaternion, vector_add },
 	{ '-', &cexpr_quaternion, &cexpr_quaternion, vector_sub },
 	{ '*', &cexpr_quaternion, &cexpr_quaternion, quaternion_mul },
+	{ '*', &cexpr_vector, &cexpr_vector, quaternion_vector_mul },
 	{}
 };
 

From 81300f89f8ca473a90840a0dfce5998fe037852d Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 2 Jan 2021 14:02:33 +0900
Subject: [PATCH 1239/1519] [util] Allow multiple types for pl fields

I want to be able to use name references, but that requires string
items, so anything that would normally be dictionary or array (or
binary, even) would also need to accept string. This seemed to be the
cleanest solution. Any custom parser would then need to check the type
and act appropriately, but any inappropriate types have already been
pre-filtered by the standard parsers.
---
 include/QF/qfplist.h |  5 +++-
 libs/util/qfplist.c  | 66 ++++++++++++++++++++++++++++++++------------
 2 files changed, 53 insertions(+), 18 deletions(-)

diff --git a/include/QF/qfplist.h b/include/QF/qfplist.h
index 972f69dc3..20c7671bb 100644
--- a/include/QF/qfplist.h
+++ b/include/QF/qfplist.h
@@ -44,7 +44,10 @@ typedef enum {
 	QFArray,		///< The property list item represents an array.
 	QFBinary,		///< The property list item represents arbitrary binary
 					///< data.
-	QFString		///< The property list item represents a C string.
+	QFString,		///< The property list item represents a C string.
+
+	QFMultiType = (1 << 31)	///< if bit 31 is set, the type indicates a mask
+					///< of allowed types for plfield_t
 } pltype_t;
 
 /**	Generic property list item.
diff --git a/libs/util/qfplist.c b/libs/util/qfplist.c
index 3e64e3c3e..c3fc5a756 100644
--- a/libs/util/qfplist.c
+++ b/libs/util/qfplist.c
@@ -227,6 +227,8 @@ PL_Free (plitem_t *item)
 		case QFString:
 			free (item->data);
 			break;
+		case QFMultiType:
+			break;
 	}
 	free (item);
 }
@@ -1138,11 +1140,48 @@ pl_default_parser (const plfield_t *field, const plitem_t *item, void *data,
 		case QFString:
 			*(char **)data = (char *)item->data;
 			return 1;
+		case QFMultiType:
+			break;
 	}
 	PL_Message (messages, 0, "invalid item type: %d", field->type);
 	return 0;
 }
 
+static int
+types_match (pltype_t field_type, pltype_t item_type)
+{
+	if (field_type & QFMultiType) {
+		// field_type is a mask of allowed types
+		return field_type & (1 << item_type);
+	} else {
+		// exact match
+		return field_type == item_type;
+	}
+}
+
+static void
+type_mismatch (plitem_t *messages, const plitem_t *item, const char *name,
+			   pltype_t field_type, pltype_t item_type)
+{
+	const int num_types = sizeof (pl_types) / sizeof (pl_types[0]);
+	if (field_type & QFMultiType) {
+		PL_Message (messages, item,
+					"error: %s is the wrong type. Got %s, expected on of:",
+					name, pl_types[item_type]);
+		field_type &= ~QFMultiType;
+		for (int type = 0; field_type && type < num_types;
+			 type++, field_type >>= 1) {
+			if (field_type & 1) {
+				PL_Message (messages, item, "    %s", pl_types[type]);
+			}
+		}
+	} else {
+		PL_Message (messages, item,
+					"error: %s is the wrong type. Got %s, expected %s", name,
+					pl_types[item_type], pl_types[field_type]);
+	}
+}
+
 VISIBLE int
 PL_ParseStruct (const plfield_t *fields, const plitem_t *dict, void *data,
 				plitem_t *messages, void *context)
@@ -1174,11 +1213,9 @@ PL_ParseStruct (const plfield_t *fields, const plitem_t *dict, void *data,
 				} else {
 					parser = pl_default_parser;
 				}
-				if (item->type != f->type) {
-					PL_Message (messages, item, "error: %s is the wrong type"
-								" Got %s, expected %s",current->key,
-								pl_types[f->type],
-								pl_types[item->type]);
+				if (!types_match (f->type, item->type)) {
+					type_mismatch (messages, item, current->key,
+								   f->type, item->type);
 					result = 0;
 				} else {
 					if (!parser (f, item, flddata, messages, context)) {
@@ -1231,12 +1268,11 @@ PL_ParseArray (const plfield_t *field, const plitem_t *array, void *data,
 		plitem_t   *item = plarray->values[i];
 		void       *eledata = &arr->a[i * element->stride];
 
-		if (item->type != element->type) {
-			PL_Message (messages, item,
-						"error: element %d is the wrong type"
-						" Got %s, expected %s", i,
-						pl_types[element->type],
-						pl_types[item->type]);
+		if (!types_match (element->type, item->type)) {
+			char        index[16];
+			snprintf (index, sizeof(index) - 1, "%d", i);
+			index[15] = 0;
+			type_mismatch (messages, item, index, element->type, item->type);
 			result = 0;
 		} else {
 			if (!parser (&f, item, eledata, messages, context)) {
@@ -1284,12 +1320,8 @@ PL_ParseSymtab (const plfield_t *field, const plitem_t *dict, void *data,
 		const char *key = current->key;
 		plitem_t   *item = current->value;
 
-		if (item->type != element->type) {
-			PL_Message (messages, item,
-						"error: element %s is the wrong type"
-						" Got %s, expected %s", key,
-						pl_types[element->type],
-						pl_types[item->type]);
+		if (!types_match (element->type, item->type)) {
+			type_mismatch (messages, item, key, element->type, item->type);
 			result = 0;
 			continue;
 		}

From 4562e0b8760447438b543d2a098838a74d81b3c9 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 4 Jan 2021 00:11:52 +0900
Subject: [PATCH 1240/1519] [util] Implement more of cexpr

This adds unary, vector and function expressions.
---
 include/QF/cexpr.h      |  14 +++
 libs/util/cexpr-parse.y | 193 +++++++++++++++++++++++++++++++++++-----
 libs/util/cexpr-type.c  |   7 ++
 3 files changed, 194 insertions(+), 20 deletions(-)

diff --git a/include/QF/cexpr.h b/include/QF/cexpr.h
index e257412d6..77e5b0463 100644
--- a/include/QF/cexpr.h
+++ b/include/QF/cexpr.h
@@ -62,6 +62,11 @@ typedef struct exprval_s {
 	void       *value;
 } exprval_t;
 
+typedef struct exprlist_s {
+	struct exprlist_s *next;
+	exprval_t  *value;
+} exprlist_t;
+
 typedef struct exprsym_s {
 	const char *name;
 	exprtype_t *type;
@@ -69,6 +74,14 @@ typedef struct exprsym_s {
 	struct exprsym_s *next;
 } exprsym_t;
 
+typedef struct exprfunc_s {
+	exprtype_t *result;
+	int         num_params;
+	exprtype_t **param_types;
+	void      (*func) (const exprval_t **params, exprval_t *result,
+					   struct exprctx_s *context);
+} exprfunc_t;
+
 typedef struct exprtab_s {
 	exprsym_t  *symbols;
 	struct hashtab_s *tab;
@@ -116,6 +129,7 @@ extern exprtype_t cexpr_vector;
 extern exprtype_t cexpr_quaternion;
 extern exprtype_t cexpr_exprval;
 extern exprtype_t cexpr_field;
+extern exprtype_t cexpr_function;
 
 extern binop_t cexpr_struct_binops[];
 
diff --git a/libs/util/cexpr-parse.y b/libs/util/cexpr-parse.y
index eb56ed588..f208f4680 100644
--- a/libs/util/cexpr-parse.y
+++ b/libs/util/cexpr-parse.y
@@ -43,6 +43,7 @@
 #include <stdio.h>
 
 #include "QF/cmem.h"
+#include "QF/dstring.h"
 #include "QF/hash.h"
 #include "QF/qfplist.h"
 #include "QF/sys.h"
@@ -55,11 +56,17 @@ static exprval_t *binary_expr (int op, const exprval_t *a, const exprval_t *b,
 							   exprctx_t *context);
 static exprval_t *field_expr (const exprval_t *a, const exprval_t *b,
 							  exprctx_t *context);
+static exprval_t *unary_expr (int op, const exprval_t *val,
+							  exprctx_t *context);
+static exprval_t *vector_expr (exprlist_t *list, exprctx_t *context);
+static exprval_t *function_expr (exprsym_t *fsym, exprlist_t *list,
+								 exprctx_t *context);
+static exprlist_t *expr_item (exprval_t *val, exprctx_t *context);
 
 static void
 yyerror (void *scanner, exprctx_t *context, const char *s)
 {
-	cexpr_error (context, "%s before %s\n", s, cexpr_yyget_text (scanner));
+	cexpr_error (context, "%s before %s", s, cexpr_yyget_text (scanner));
 }
 
 %}
@@ -78,19 +85,21 @@ yyerror (void *scanner, exprctx_t *context, const char *s)
 %left			SHL SHR
 %left			'+' '-'
 %left			'*' '/' '%' MOD
-%right			SIZEOF UNARY INCOP
+%right	<op>	SIZEOF UNARY INCOP
 %left			HYPERUNARY
 %left			'.' '(' '['
 
 %token <symbol> NAME
 %token <value>	VALUE
 
-%type <value>	expr field
+%type <value>	expr field uexpr
+%type <list>	opt_arg_list arg_list arg_expr
 
 %union {
 	int        op;
 	exprsym_t *symbol;
 	exprval_t *value;
+	exprlist_t *list;
 	const char *string;
 }
 
@@ -100,20 +109,8 @@ start
 	: expr				{ assign_expr (context->result, $1, context); }
 	;
 
-expr
-	: expr SHL expr		{ $$ = binary_expr (SHL, $1, $3, context); }
-	| expr SHR expr		{ $$ = binary_expr (SHR, $1, $3, context); }
-	| expr '+' expr		{ $$ = binary_expr ('+', $1, $3, context); }
-	| expr '-' expr		{ $$ = binary_expr ('-', $1, $3, context); }
-	| expr '*' expr		{ $$ = binary_expr ('*', $1, $3, context); }
-	| expr '/' expr		{ $$ = binary_expr ('/', $1, $3, context); }
-	| expr '&' expr		{ $$ = binary_expr ('&', $1, $3, context); }
-	| expr '|' expr		{ $$ = binary_expr ('|', $1, $3, context); }
-	| expr '^' expr		{ $$ = binary_expr ('^', $1, $3, context); }
-	| expr '%' expr		{ $$ = binary_expr ('%', $1, $3, context); }
-	| expr '.' field	{ $$ = field_expr ($1, $3, context); }
-	| expr MOD expr		{ $$ = binary_expr (MOD, $1, $3, context); }
-	| NAME
+uexpr
+	: NAME
 		{
 			if ($1) {
 				$$ = (exprval_t *) cmemalloc (context->memsuper, sizeof (*$$));
@@ -125,6 +122,29 @@ expr
 			}
 		}
 	| VALUE
+	| '[' arg_list ']'	{ $$ = vector_expr ($2, context); }
+	| '(' expr ')'		{ $$ = $2; }
+	| NAME '(' opt_arg_list ')'	{ $$ = function_expr ($1, $3, context); }
+	| uexpr '.' field	{ $$ = field_expr ($1, $3, context); }
+	| '+' uexpr %prec UNARY	{ $$ = $2; }
+	| '-' uexpr %prec UNARY	{ $$ = unary_expr ('-', $2, context); }
+	| '!' uexpr %prec UNARY	{ $$ = unary_expr ('!', $2, context); }
+	| '~' uexpr %prec UNARY	{ $$ = unary_expr ('~', $2, context); }
+	;
+
+expr
+	: uexpr
+	| expr SHL expr		{ $$ = binary_expr (SHL, $1, $3, context); }
+	| expr SHR expr		{ $$ = binary_expr (SHR, $1, $3, context); }
+	| expr '+' expr		{ $$ = binary_expr ('+', $1, $3, context); }
+	| expr '-' expr		{ $$ = binary_expr ('-', $1, $3, context); }
+	| expr '*' expr		{ $$ = binary_expr ('*', $1, $3, context); }
+	| expr '/' expr		{ $$ = binary_expr ('/', $1, $3, context); }
+	| expr '&' expr		{ $$ = binary_expr ('&', $1, $3, context); }
+	| expr '|' expr		{ $$ = binary_expr ('|', $1, $3, context); }
+	| expr '^' expr		{ $$ = binary_expr ('^', $1, $3, context); }
+	| expr '%' expr		{ $$ = binary_expr ('%', $1, $3, context); }
+	| expr MOD expr		{ $$ = binary_expr (MOD, $1, $3, context); }
 	;
 
 field
@@ -141,6 +161,23 @@ field
 		}
 	;
 
+opt_arg_list
+	:					{ $$ = 0; }
+	| arg_list          { $$ = $1; }
+	;
+
+arg_list
+	: arg_expr
+	| arg_list ',' arg_expr
+		{
+			$3-> next = $1;
+			$$ = $3;
+		}
+
+arg_expr
+	: expr				{ $$ = expr_item ($1, context); }
+	;
+
 %%
 
 static void
@@ -156,7 +193,7 @@ assign_expr (exprval_t *dst, const exprval_t *src, exprctx_t *context)
 	} else {
 		if (dst->type != src->type) {
 			cexpr_error (context,
-						 "type mismatch in expression result: %s = %s\n",
+						 "type mismatch in expression result: %s = %s",
 						 dst->type->name, src->type->name);
 			return;
 		}
@@ -185,8 +222,9 @@ binary_expr (int op, const exprval_t *a, const exprval_t *b,
 	}
 	exprval_t  *result = cexpr_value (rtype, context);
 	if (!binop->op) {
-		cexpr_error (context, "invalid binary expression: %s %c %s\n",
+		cexpr_error (context, "invalid binary expression: %s %c %s",
 					 a->type->name, op, b->type->name);
+		memset (result->value, 0, rtype->size);
 	} else {
 		binop->func (a, b, result, context);
 	}
@@ -205,11 +243,126 @@ field_expr (const exprval_t *a, const exprval_t *b, exprctx_t *context)
 		}
 	}
 	if (!binop->op) {
-		cexpr_error (context, "invalid binary expression: %s.%s\n",
+		cexpr_error (context, "invalid binary expression: %s.%s",
 					 a->type->name, b->type->name);
+		result = cexpr_value (&cexpr_int, context);
+		*(int *) result->value = 0;
 	} else {
 		exprval_t   c = { 0, &result };
 		binop->func (a, b, &c, context);
 	}
 	return result;
 }
+
+static exprval_t *
+unary_expr (int op, const exprval_t *val, exprctx_t *context)
+{
+	unop_t     *unop;
+
+	for (unop = val->type->unops; unop->op; unop++) {
+		if (unop->op == op) {
+			break;
+		}
+	}
+	exprtype_t *rtype = unop->result;
+	if (!rtype) {
+		rtype = val->type;
+	}
+	exprval_t  *result = cexpr_value (rtype, context);
+	if (!unop->op) {
+		cexpr_error (context, "invalid unary expression: %c %s",
+					 op, val->type->name);
+	} else {
+		unop->func (val, result, context);
+	}
+	return result;
+}
+
+exprval_t *
+vector_expr (exprlist_t *list, exprctx_t *context)
+{
+	exprlist_t *l;
+	exprval_t  *val = cexpr_value (&cexpr_vector, context);
+	int         i;
+	for (i = 0; i < 4 && list; i++, list = l) {
+		exprval_t   dst = { &cexpr_float, ((float *) val->value) + i };
+		exprval_t  *src = list->value;
+		binop_t    *cast = cexpr_find_cast (&cexpr_float, src->type);
+		if (cast) {
+			cast->func (&dst, src, &dst, context);
+		} else {
+			cexpr_error (context, "invalid vector expression type: [%d] %s",
+						 i, val->type->name);
+		}
+		l = list->next;
+		cmemfree (context->memsuper, list);
+	}
+	for ( ; i < 4; i++) {
+		((float *) val->value)[i] = 0;
+	}
+	if (i == 4 && list) {
+		cexpr_error (context, "excess elements in vector expression");
+	}
+	return val;
+}
+
+static exprval_t *function_expr (exprsym_t *fsym, exprlist_t *list,
+								 exprctx_t *context)
+{
+	exprlist_t *l;
+	int         num_args = 0;
+	exprfunc_t *func = 0;
+	exprval_t  *result;
+
+	for (l = list; l; l = l->next) {
+		num_args++;
+	}
+	__auto_type args = (const exprval_t **) alloca (num_args * sizeof (exprval_t *));
+	__auto_type types = (exprtype_t **) alloca (num_args * sizeof (exprtype_t *));
+	for (num_args = 0; list; list = l, num_args++) {
+		args[num_args] = list->value;
+		types[num_args] = list->value->type;
+		l = list->next;
+		cmemfree (context->memsuper, list);
+	}
+	if (fsym->type != &cexpr_function) {
+		cexpr_error (context, "invalid function %s", fsym->name);
+		result = cexpr_value (&cexpr_int, context);
+		*(int *) result->value = 0;
+		return result;
+	}
+	for (exprfunc_t *f = fsym->value; f->result; f++) {
+		if (f->num_params == num_args
+			&& memcmp (f->param_types, types,
+					   num_args * sizeof (exprtype_t *)) == 0) {
+			func = f;
+			break;
+		}
+	}
+	if (!func) {
+		dstring_t  *argstr = dstring_newstr();
+		for (int i = 0; i < num_args; i++) {
+			dasprintf (argstr, "%s%s", types[i]->name,
+					   i + 1 < num_args ? ", ": "");
+		}
+		cexpr_error (context, "no overload for %s(%s)", fsym->name,
+					 argstr->str);
+		dstring_delete (argstr);
+		result = cexpr_value (&cexpr_int, context);
+		*(int *) result->value = 0;
+		return result;
+	}
+	result = cexpr_value (func->result, context);
+	func->func (args, result, context);
+	return result;
+}
+
+static exprlist_t *
+expr_item (exprval_t *val, exprctx_t *context)
+{
+	__auto_type item = (exprlist_t *) cmemalloc (context->memsuper,
+												 sizeof (exprlist_t));
+	item->next = 0;
+	item->value = val;
+	return item;
+}
diff --git a/libs/util/cexpr-type.c b/libs/util/cexpr-type.c
index 04eef6d70..1a68728de 100644
--- a/libs/util/cexpr-type.c
+++ b/libs/util/cexpr-type.c
@@ -483,6 +483,13 @@ exprtype_t cexpr_field = {
 	0,
 };
 
+exprtype_t cexpr_function = {
+	"function",
+	0,	// has no size of its own
+	0,	// can't actually do anything with a function other than call
+	0,
+};
+
 VISIBLE binop_t *
 cexpr_find_cast (exprtype_t *dst_type, exprtype_t *src_type)
 {

From 619fe1536784727fc99ff8bb58824e08f73f4093 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 4 Jan 2021 00:15:22 +0900
Subject: [PATCH 1241/1519] [util] Add vector swizzles to cexpr

That turned out to be a lot easier than expected: needed only 4 ifs per
vector "type" (xyzw vs rgba) instead of 340.
---
 libs/util/cexpr-type.c | 73 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 73 insertions(+)

diff --git a/libs/util/cexpr-type.c b/libs/util/cexpr-type.c
index 1a68728de..6b02be01d 100644
--- a/libs/util/cexpr-type.c
+++ b/libs/util/cexpr-type.c
@@ -391,6 +391,78 @@ vector_mod (const exprval_t *val1, const exprval_t *val2, exprval_t *result,
 	*c = a - b * vfloorf (a / b);
 }
 
+static void
+vector_swizzle (const exprval_t *val1, const exprval_t *val2,
+				exprval_t *result, exprctx_t *ctx)
+{
+#define m(x) (1 << ((x) - 'a'))
+#define v(x, mask) (((x) & 0x60) == 0x60 && (m(x) & (mask)))
+#define vind(x) ((x) & 3)
+#define cind(x) (-(((x) >> 3) ^ (x)) & 3)
+	const int   color = m('r') | m('g') | m('b') | m('a');
+	const int   vector = m('x') | m('y') | m('z') | m('w');
+	float      *vec = val1->value;
+	const char *name = val2->value;
+	exprval_t  *val = 0;
+
+	if (v (name[0], vector) && v (name[1], vector)
+		&& v (name[2], vector) && v (name[3], vector) && !name[4]) {
+		val = cexpr_value (&cexpr_vector, ctx);
+		float      *res = val->value;
+		res[0] = vec[vind (name[0])];
+		res[1] = vec[vind (name[1])];
+		res[2] = vec[vind (name[2])];
+		res[3] = vec[vind (name[3])];
+	} else if (v (name[0], color) && v (name[1], color)
+			   && v (name[2], color) && v (name[3], color) && !name[4]) {
+		val = cexpr_value (&cexpr_vector, ctx);
+		float      *res = val->value;
+		res[0] = vec[cind (name[0])];
+		res[1] = vec[cind (name[1])];
+		res[2] = vec[cind (name[2])];
+		res[3] = vec[cind (name[3])];
+	} else if (v (name[0], vector) && v (name[1], vector)
+			   && v (name[2], vector) && !name[3]) {
+		val = cexpr_value (&cexpr_vector, ctx);
+		float      *res = val->value;
+		res[0] = vec[vind (name[0])];
+		res[1] = vec[vind (name[1])];
+		res[2] = vec[vind (name[2])];
+		res[3] = 0;
+	} else if (v (name[0], color) && v (name[1], color)
+			   && v (name[2], color) && !name[3]) {
+		val = cexpr_value (&cexpr_vector, ctx);
+		float      *res = val->value;
+		res[0] = vec[cind (name[0])];
+		res[1] = vec[cind (name[1])];
+		res[2] = vec[cind (name[2])];
+		res[3] = 0;
+	} else if (v (name[0], vector) && v (name[1], vector) && !name[2]) {
+		val = cexpr_value (&cexpr_vector, ctx);
+		float      *res = val->value;
+		res[0] = vec[vind (name[0])];
+		res[1] = vec[vind (name[1])];
+		res[2] = 0;
+		res[3] = 0;
+	} else if (v (name[0], color) && v (name[1], color) && !name[2]) {
+		val = cexpr_value (&cexpr_vector, ctx);
+		float      *res = val->value;
+		res[0] = vec[cind (name[0])];
+		res[1] = vec[cind (name[1])];
+		res[2] = 0;
+		res[3] = 0;
+	} else if (v (name[0], vector) && !name[1]) {
+		val = cexpr_value (&cexpr_float, ctx);
+		float      *res = val->value;
+		res[0] = vec[vind (name[0])];
+	} else if (v (name[0], color) && !name[1]) {
+		val = cexpr_value (&cexpr_float, ctx);
+		float      *res = val->value;
+		res[0] = vec[cind (name[0])];
+	}
+	*(exprval_t **) result->value = val;
+}
+
 UNOP(vector, pos, vec4f_t, +)
 UNOP(vector, neg, vec4f_t, -)
 
@@ -410,6 +482,7 @@ binop_t vector_binops[] = {
 	{ '/', &cexpr_vector, &cexpr_vector, vector_div },
 	{ '%', &cexpr_vector, &cexpr_vector, vector_rem },
 	{ MOD, &cexpr_vector, &cexpr_vector, vector_mod },
+	{ '.', &cexpr_field, &cexpr_exprval, vector_swizzle },
 	{}
 };
 

From 55445a25f2438ddccf9aa4864086d3201b634e44 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 4 Jan 2021 00:18:35 +0900
Subject: [PATCH 1242/1519] [util] Add some tests for the new cexpr work

---
 libs/util/test/test-cexpr.c | 141 +++++++++++++++++++++++++++++++++++-
 1 file changed, 139 insertions(+), 2 deletions(-)

diff --git a/libs/util/test/test-cexpr.c b/libs/util/test/test-cexpr.c
index 095316222..338e71bbc 100644
--- a/libs/util/test/test-cexpr.c
+++ b/libs/util/test/test-cexpr.c
@@ -24,27 +24,125 @@
 		Boston, MA  02111-1307, USA
 
 */
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "QF/cexpr.h"
 #include "QF/cmem.h"
 #include "QF/hash.h"
+#include "QF/mathlib.h"
+#include "QF/simd/vec4f.h"
 
 int a = 5;
 int b = 6;
 int c;
+float point[4] = { 2, 3, 4, 1 };		// a point, so w = 1
+float normal[4] = { 1, 2, 3, 0 };		// a vector, so w = 0
+float direction[4] = { 4, 5, 6, 0 };	// a vector, so w = 0
+float plane[4];
+float intercept[4];
+
+exprtype_t *vector_params[] = {
+	&cexpr_vector,
+	&cexpr_vector,
+};
+
+exprtype_t *int_params[] = {
+	&cexpr_int,
+	&cexpr_int,
+};
+
+exprtype_t *float_params[] = {
+	&cexpr_float,
+	&cexpr_float,
+};
+
+exprtype_t *double_params[] = {
+	&cexpr_double,
+	&cexpr_double,
+};
+
+static void
+float_dot (const exprval_t **params, exprval_t *result, exprctx_t *context)
+{
+	// parameters are reversed!
+	vec4f_t    *a = params[1]->value;
+	vec4f_t    *b = params[0]->value;
+	vec4f_t    *d = result->value;
+	*d = dotf (*a, *b);
+}
+
+exprfunc_t dot_func[] = {
+	{ &cexpr_vector, 2, vector_params, float_dot},
+	{}
+};
+
+exprfunc_t sin_func[] = {
+	{ &cexpr_float, 1, float_params },
+	{ &cexpr_double, 1, double_params },
+	{}
+};
+
+exprfunc_t cos_func[] = {
+	{ &cexpr_float, 1, float_params },
+	{ &cexpr_double, 1, double_params },
+	{}
+};
+
+exprfunc_t atan2_func[] = {
+	{ &cexpr_float, 2, float_params },
+	{ &cexpr_double, 2, double_params },
+	{}
+};
+
+exprfunc_t int_func[] = {
+	{ &cexpr_int, 1, float_params },
+	{ &cexpr_int, 1, double_params },
+	{}
+};
+
+exprfunc_t float_func[] = {
+	{ &cexpr_float, 1, int_params },
+	{ &cexpr_float, 1, double_params },
+	{}
+};
+
+exprfunc_t double_func[] = {
+	{ &cexpr_double, 1, float_params },
+	{ &cexpr_double, 1, double_params },
+	{}
+};
 
 exprsym_t symbols[] = {
 	{ "a", &cexpr_int, &a },
 	{ "b", &cexpr_int, &b },
+	{ "point", &cexpr_vector, &point },
+	{ "normal", &cexpr_vector, &normal },
+	{ "plane", &cexpr_vector, &plane },
+	{ "direction", &cexpr_vector, &direction },
+	{ "intercept", &cexpr_vector, &intercept },
+	{ "dot", &cexpr_function, dot_func },
+	{ "sin", &cexpr_function, sin_func },
+	{ "cos", &cexpr_function, cos_func },
+	{ "atan2", &cexpr_function, atan2_func },
+	{ "float", &cexpr_function, float_func },
+	{ "double", &cexpr_function, double_func },
+	{ "int", &cexpr_function, int_func },
 	{}
 };
-exprval_t result = { &cexpr_int, &c };
+exprval_t test_result = { &cexpr_int, &c };
+exprval_t plane_result = { &cexpr_vector, &plane };
+// a bit hacky, but no l-values
+exprval_t dist_result = { &cexpr_float, &plane[3] };
+exprval_t intercept_result = { &cexpr_vector, &intercept };
 
 exprtab_t symtab = {
 	symbols,
 	0
 };
 
-exprctx_t context = { &result, &symtab };
+exprctx_t context = { &test_result, &symtab };
 
 #define TEST_BINOP(op)													\
 	do {																\
@@ -75,6 +173,45 @@ main(int argc, const char **argv)
 	TEST_BINOP (^);
 	TEST_BINOP (%);
 
+	context.result = &plane_result;
+	cexpr_eval_string ("point.wzyx", &context);
+	if (plane[0] != point[3] || plane[1] != point[2]
+		|| plane[2] != point[1] || plane[3] != point[0]) {
+		printf ("point.wzyx [%.9g, %.9g, %.9g] %.9g\n",
+				VectorExpand (plane), plane[3]);
+		ret |= 1;
+	}
+	cexpr_eval_string ("point.zyx", &context);
+	if (plane[0] != point[2] || plane[1] != point[1]
+		|| plane[2] != point[0] || plane[3] != 0) {
+		printf ("point.zyx [%.9g, %.9g, %.9g] %.9g\n",
+				VectorExpand (plane), plane[3]);
+		ret |= 1;
+	}
+	cexpr_eval_string ("point.yx", &context);
+	if (plane[0] != point[1] || plane[1] != point[0]
+		|| plane[2] != 0 || plane[3] != 0) {
+		printf ("point.yx [%.9g, %.9g, %.9g] %.9g\n",
+				VectorExpand (plane), plane[3]);
+		ret |= 1;
+	}
+	cexpr_eval_string ("normal", &context);
+	context.result = &dist_result;
+	cexpr_eval_string ("-dot(point, normal).x / 2f", &context);
+	if (!VectorCompare (normal, plane)
+		|| plane[3] != -DotProduct (normal, point) / 2) {
+		printf ("plane [%.9g, %.9g, %.9g] %.9g\n",
+				VectorExpand (plane), plane[3]);
+		ret |= 1;
+	}
+	context.result = &intercept_result;
+	cexpr_eval_string ("point - direction * dot(point, plane)/dot(direction,plane)", &context);
+	if (intercept[0] != 0.75 || intercept[1] != 1.4375
+		|| intercept[2] != 2.125 || intercept[3] != 1) {
+		printf ("[%.9g, %.9g, %.9g] %.9g\n", VectorExpand (intercept), intercept[3]);
+		ret |= 1;
+	}
+
 	Hash_DelTable (symtab.tab);
 	delete_memsuper (context.memsuper);
 	return ret;

From 5b842da394beaca4e8f2b45261bc10e88454c322 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 4 Jan 2021 00:21:48 +0900
Subject: [PATCH 1243/1519] [util] Fix types for double and float constants

---
 libs/util/cexpr-lex.l | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libs/util/cexpr-lex.l b/libs/util/cexpr-lex.l
index cdae1ee04..2cbbdaa79 100644
--- a/libs/util/cexpr-lex.l
+++ b/libs/util/cexpr-lex.l
@@ -241,14 +241,14 @@ static exprval_t *parse_uint (const char *str, exprctx_t *context)
 
 static exprval_t *parse_float (const char *str, exprctx_t *context)
 {
-	exprval_t  *val = cexpr_value (&cexpr_int, context);
+	exprval_t  *val = cexpr_value (&cexpr_float, context);
 	*(float *) val->value = strtof (str, 0);
 	return val;
 }
 
 static exprval_t *parse_double (const char *str, exprctx_t *context)
 {
-	exprval_t  *val = cexpr_value (&cexpr_int, context);
+	exprval_t  *val = cexpr_value (&cexpr_double, context);
 	*(double *) val->value = strtod (str, 0);
 	return val;
 }

From 0426879bf60119f3b7cc6dbe4ca701fc32268bcf Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 4 Jan 2021 14:54:04 +0900
Subject: [PATCH 1244/1519] [qfcc] Check returned type instead of expr type

Block expressions hide ex_error, but get_type() always returns null when
it finds one (which it does by recursing into block expression), so just
check the type itself.
---
 tools/qfcc/source/expr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index 9ecf0ad15..a8684a83b 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -2075,7 +2075,7 @@ return_expr (function_t *f, expr_t *e)
 
 	t = get_type (e);
 
-	if (e->type == ex_error) {
+	if (!t) {
 		return e;
 	}
 	if (is_void(ret_type)) {

From a6a3d4c6b52ceb0cd735ed019f749497c9b3de86 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 4 Jan 2021 15:30:27 +0900
Subject: [PATCH 1245/1519] [vulkan] Make array and single parsing smarter

Array and single type overrides now allow the parsing of the items
themselves to be customized. This makes it easy to handle arrays and
pointers to single items while also using custom specifications, rather
than relying entirely on the custom override.
---
 .../video/renderer/vulkan/vkgen/Makemodule.am |  1 +
 .../renderer/vulkan/vkgen/vkfieldarray.h      |  4 +-
 .../renderer/vulkan/vkgen/vkfieldarray.r      |  9 +--
 .../renderer/vulkan/vkgen/vkfieldsingle.h     |  4 +-
 .../renderer/vulkan/vkgen/vkfieldsingle.r     | 11 ++-
 .../video/renderer/vulkan/vkgen/vkfieldtype.h | 20 ++++++
 .../video/renderer/vulkan/vkgen/vkfieldtype.r | 69 +++++++++++++++++++
 7 files changed, 103 insertions(+), 15 deletions(-)
 create mode 100644 libs/video/renderer/vulkan/vkgen/vkfieldtype.h
 create mode 100644 libs/video/renderer/vulkan/vkgen/vkfieldtype.r

diff --git a/libs/video/renderer/vulkan/vkgen/Makemodule.am b/libs/video/renderer/vulkan/vkgen/Makemodule.am
index 4847bf6fd..b60e97f1d 100644
--- a/libs/video/renderer/vulkan/vkgen/Makemodule.am
+++ b/libs/video/renderer/vulkan/vkgen/Makemodule.am
@@ -11,6 +11,7 @@ vkgen_dat_src= \
 	libs/video/renderer/vulkan/vkgen/vkfielddef.r \
 	libs/video/renderer/vulkan/vkgen/vkfieldsingle.r \
 	libs/video/renderer/vulkan/vkgen/vkfieldstring.r \
+	libs/video/renderer/vulkan/vkgen/vkfieldtype.r \
 	libs/video/renderer/vulkan/vkgen/vkgen.r \
 	libs/video/renderer/vulkan/vkgen/vkstruct.r \
 	libs/video/renderer/vulkan/vkgen/vktype.r \
diff --git a/libs/video/renderer/vulkan/vkgen/vkfieldarray.h b/libs/video/renderer/vulkan/vkgen/vkfieldarray.h
index 5cf31880b..6f97f0aa7 100644
--- a/libs/video/renderer/vulkan/vkgen/vkfieldarray.h
+++ b/libs/video/renderer/vulkan/vkgen/vkfieldarray.h
@@ -3,9 +3,11 @@
 
 #include "vkfielddef.h"
 
+@class FieldType;
+
 @interface ArrayField: FieldDef
 {
-	string type;
+	FieldType *type;
 }
 @end
 
diff --git a/libs/video/renderer/vulkan/vkgen/vkfieldarray.r b/libs/video/renderer/vulkan/vkgen/vkfieldarray.r
index dd81dd9f4..159a41ba3 100644
--- a/libs/video/renderer/vulkan/vkgen/vkfieldarray.r
+++ b/libs/video/renderer/vulkan/vkgen/vkfieldarray.r
@@ -1,6 +1,7 @@
 #include <PropertyList.h>
 
 #include "vkfieldarray.h"
+#include "vkfieldtype.h"
 #include "vkgen.h"
 #include "vktype.h"
 
@@ -14,7 +15,7 @@
 	}
 
 	PLItem     *desc = [item getObjectForKey:"type"];
-	type = [[desc getObjectAtIndex:1] string];
+	type = [[FieldType fieldType:[desc getObjectAtIndex:1]] retain];
 
 	value_field = [[item getObjectForKey:"values"] string];
 	size_field = [[item getObjectForKey:"size"] string];
@@ -23,13 +24,9 @@
 
 -writeParseData
 {
-	Type       *field_type = [[Type lookup: type] dereference];
-
 	fprintf (output_file, "static parse_array_t parse_%s_%s_data = {\n",
 			 struct_name, field_name);
-	fprintf (output_file, "\t%s,\n", [field_type parseType]);
-	fprintf (output_file, "\tsizeof (%s),\n", type);
-	fprintf (output_file, "\tparse_%s,\n", type);
+	[type writeParseData];
 	fprintf (output_file, "\tfield_offset (%s, %s),\n",
 			 struct_name, value_field);
 	if (size_field) {
diff --git a/libs/video/renderer/vulkan/vkgen/vkfieldsingle.h b/libs/video/renderer/vulkan/vkgen/vkfieldsingle.h
index 2fcd312c4..83a3dad77 100644
--- a/libs/video/renderer/vulkan/vkgen/vkfieldsingle.h
+++ b/libs/video/renderer/vulkan/vkgen/vkfieldsingle.h
@@ -3,9 +3,11 @@
 
 #include "vkfielddef.h"
 
+@class FieldType;
+
 @interface SingleField: FieldDef
 {
-	string type;
+	FieldType *type;
 }
 @end
 
diff --git a/libs/video/renderer/vulkan/vkgen/vkfieldsingle.r b/libs/video/renderer/vulkan/vkgen/vkfieldsingle.r
index e30ced3dd..f1c4b4977 100644
--- a/libs/video/renderer/vulkan/vkgen/vkfieldsingle.r
+++ b/libs/video/renderer/vulkan/vkgen/vkfieldsingle.r
@@ -1,6 +1,7 @@
 #include <PropertyList.h>
 
 #include "vkfieldsingle.h"
+#include "vkfieldtype.h"
 #include "vkgen.h"
 #include "vktype.h"
 
@@ -14,7 +15,7 @@
 	}
 
 	PLItem     *desc = [item getObjectForKey:"type"];
-	type = [[desc getObjectAtIndex:1] string];
+	type = [[FieldType fieldType:[desc getObjectAtIndex:1]] retain];
 
 	value_field = [[item getObjectForKey:"value"] string];
 	return self;
@@ -22,13 +23,9 @@
 
 -writeParseData
 {
-	Type       *field_type = [[Type lookup: type] dereference];
-
 	fprintf (output_file, "static parse_single_t parse_%s_%s_data = {\n",
 			 struct_name, field_name);
-	fprintf (output_file, "\t%s,\n", [field_type parseType]);
-	fprintf (output_file, "\tsizeof (%s),\n", type);
-	fprintf (output_file, "\tparse_%s,\n", type);
+	[type writeParseData];
 	fprintf (output_file, "\tfield_offset (%s, %s),\n",
 			 struct_name, value_field);
 	fprintf (output_file, "};\n");
@@ -37,7 +34,7 @@
 
 -writeField
 {
-	string      parse_type = [[[Type lookup: type] dereference] parseType];
+	string      parse_type = [type parseType];
 	fprintf (output_file, "\t{\"%s\", 0, %s, parse_%s, &parse_%s_%s_data},\n",
 			 field_name, parse_type, "single", struct_name, field_name);
 	return self;
diff --git a/libs/video/renderer/vulkan/vkgen/vkfieldtype.h b/libs/video/renderer/vulkan/vkgen/vkfieldtype.h
new file mode 100644
index 000000000..fa27c7d8e
--- /dev/null
+++ b/libs/video/renderer/vulkan/vkgen/vkfieldtype.h
@@ -0,0 +1,20 @@
+#ifndef __renderer_vulkan_vkgen_vkfieldtype_h
+#define __renderer_vulkan_vkgen_vkfieldtype_h
+
+#include <Object.h>
+
+@class PLItem;
+
+@interface FieldType: Object
+{
+	string parse_type;
+	string type;
+	string parser;
+}
++fieldType:(PLItem *)item;
+-initWithItem:(PLItem *)item;
+-writeParseData;
+-(string)parseType;
+@end
+
+#endif//__renderer_vulkan_vkgen_vkfieldtype_h
diff --git a/libs/video/renderer/vulkan/vkgen/vkfieldtype.r b/libs/video/renderer/vulkan/vkgen/vkfieldtype.r
new file mode 100644
index 000000000..e3d7cf59d
--- /dev/null
+++ b/libs/video/renderer/vulkan/vkgen/vkfieldtype.r
@@ -0,0 +1,69 @@
+#include <PropertyList.h>
+#include <string.h>
+
+#include "vkfieldtype.h"
+#include "vkgen.h"
+#include "vktype.h"
+
+@implementation FieldType
+
++fieldType:(PLItem *)item
+{
+	return [[[self alloc] initWithItem:item] autorelease];
+}
+
+-(void)dealloc
+{
+	str_free (parser);
+	str_free (parse_type);
+}
+
+static string
+parseItemType (PLItem *item)
+{
+	string      str = [item string];
+	if (str) {
+		return str;
+	}
+	string      mask = "QFMultiType";
+	for (int i = [item count]; i-- > 0; ) {
+		str = [[item getObjectAtIndex:i] string];
+		mask = mask + " | (1 << " + str + ")";
+	}
+	return str_hold (mask);
+}
+
+-initWithItem:(PLItem *)item
+{
+	if (!(self = [super init])) {
+		return nil;
+	}
+
+	type = [item string];
+	if (type) {
+		Type       *field_type = [[Type lookup:type] dereference];
+		parse_type = [field_type parseType];
+		parser = str_hold ("parse_" + type);
+	} else {
+		parse_type = parseItemType([item getObjectForKey:"parse_type"]);
+		type = [[item getObjectForKey:"type"] string];
+		parser = [[item getObjectForKey:"parser"] string];
+	}
+
+	return self;
+}
+
+-writeParseData
+{
+	fprintf (output_file, "\t%s,\n", parse_type);
+	fprintf (output_file, "\tsizeof (%s),\n", type);
+	fprintf (output_file, "\t%s,\n", parser);
+	return self;
+}
+
+-(string) parseType
+{
+	return parse_type;
+}
+
+@end

From e4f75791ce273bc74a03828e2207fed1891736f2 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 4 Jan 2021 17:26:39 +0900
Subject: [PATCH 1246/1519] [vulkan] Clean up some tangled dependencies

Dependencies on vkparse.hinc were spreading through the code which I
didn't want as that removes a lot of the automation from the automake
files. This keeps all parser code internal to vkparse.c's scope, and any
accesses required for enum and struct (not yet) definitions can be
fetched by name.
---
 include/QF/Vulkan/shader.h                    |  3 --
 libs/video/renderer/vulkan/descriptor.c       |  1 -
 libs/video/renderer/vulkan/shader.c           | 16 ------
 libs/video/renderer/vulkan/vkgen/vkenum.h     |  1 +
 libs/video/renderer/vulkan/vkgen/vkenum.r     |  6 +++
 libs/video/renderer/vulkan/vkgen/vkgen.r      |  1 +
 libs/video/renderer/vulkan/vkgen/vkstruct.h   |  1 +
 libs/video/renderer/vulkan/vkgen/vkstruct.r   |  4 ++
 libs/video/renderer/vulkan/vkparse.c          | 52 +++++++++++++++----
 libs/video/renderer/vulkan/vkparse.h          |  3 ++
 .../video/renderer/vulkan/vulkan_vid_common.c |  5 +-
 11 files changed, 62 insertions(+), 31 deletions(-)

diff --git a/include/QF/Vulkan/shader.h b/include/QF/Vulkan/shader.h
index b13f6a618..41b38a862 100644
--- a/include/QF/Vulkan/shader.h
+++ b/include/QF/Vulkan/shader.h
@@ -15,8 +15,5 @@ VkShaderModule QFV_FindShaderModule (struct vulkan_ctx_s *ctx,
 void QFV_RegisterShaderModule (struct vulkan_ctx_s *ctx, const char *name,
 							   VkShaderModule module);
 void QFV_DeregisterShaderModule (struct vulkan_ctx_s *ctx, const char *name);
-int parse_VkShaderModule (const struct plitem_s *item, void **data,
-						  struct plitem_s *messages,
-						  struct parsectx_s *context);
 
 #endif//__QF_Vulkan_shader_h
diff --git a/libs/video/renderer/vulkan/descriptor.c b/libs/video/renderer/vulkan/descriptor.c
index 23c1a0d50..dc7cc6fa4 100644
--- a/libs/video/renderer/vulkan/descriptor.c
+++ b/libs/video/renderer/vulkan/descriptor.c
@@ -44,7 +44,6 @@
 #include "QF/hash.h"
 #include "QF/input.h"
 #include "QF/mathlib.h"
-#include "QF/qargs.h"
 #include "QF/quakefs.h"
 #include "QF/sys.h"
 #include "QF/va.h"
diff --git a/libs/video/renderer/vulkan/shader.c b/libs/video/renderer/vulkan/shader.c
index 5ee89ca25..e55833782 100644
--- a/libs/video/renderer/vulkan/shader.c
+++ b/libs/video/renderer/vulkan/shader.c
@@ -53,7 +53,6 @@
 #include "QF/Vulkan/shader.h"
 
 #include "vid_vulkan.h"
-#include "vkparse.h"
 
 static
 #include "libs/video/renderer/vulkan/passthrough.vert.spvc"
@@ -212,18 +211,3 @@ QFV_DeregisterShaderModule (vulkan_ctx_t *ctx, const char *name)
 	}
 	Hash_Free (ctx->shadermodules, Hash_Del (ctx->shadermodules, name));
 }
-
-int
-parse_VkShaderModule (const plitem_t *item, void **data,
-					  plitem_t *messages, parsectx_t *context)
-{
-	vulkan_ctx_t *ctx = context->vctx;
-	const char *name = PL_String (item);
-	__auto_type mptr = (VkShaderModule *)data[0];
-	VkShaderModule module = QFV_FindShaderModule (ctx, name);
-	if (module) {
-		*mptr = module;
-		return 1;
-	}
-	return 0;
-}
diff --git a/libs/video/renderer/vulkan/vkgen/vkenum.h b/libs/video/renderer/vulkan/vkgen/vkenum.h
index 4df770b92..5577b8a23 100644
--- a/libs/video/renderer/vulkan/vkgen/vkenum.h
+++ b/libs/video/renderer/vulkan/vkgen/vkenum.h
@@ -11,6 +11,7 @@
 }
 -(void) writeTable;
 -(void) writeSymtabInit;
+-(void) writeSymtabEntry;
 @end
 
 #endif//__renderer_vulkan_vkgen_vkenum_h
diff --git a/libs/video/renderer/vulkan/vkgen/vkenum.r b/libs/video/renderer/vulkan/vkgen/vkenum.r
index 9f12c013e..22342cb1c 100644
--- a/libs/video/renderer/vulkan/vkgen/vkenum.r
+++ b/libs/video/renderer/vulkan/vkgen/vkenum.r
@@ -147,6 +147,12 @@ skip_value(string name)
 			 [self name]);
 }
 
+-(void) writeSymtabEntry
+{
+	fprintf (output_file, "\tHash_Add (enum_symtab, &%s_enum);\n",
+			 [self name]);
+}
+
 -(string) cexprType
 {
 	return [self name] + "_type";
diff --git a/libs/video/renderer/vulkan/vkgen/vkgen.r b/libs/video/renderer/vulkan/vkgen/vkgen.r
index 7a1edab8a..d47873ad2 100644
--- a/libs/video/renderer/vulkan/vkgen/vkgen.r
+++ b/libs/video/renderer/vulkan/vkgen/vkgen.r
@@ -251,6 +251,7 @@ main(int argc, string *argv)
 		}
 		arp_start ();
 		[obj writeSymtabInit];
+		[obj writeSymtabEntry];
 		arp_end ();
 	}
 	fprintf (output_file, "}\n");
diff --git a/libs/video/renderer/vulkan/vkgen/vkstruct.h b/libs/video/renderer/vulkan/vkgen/vkstruct.h
index 048b3332f..08b489592 100644
--- a/libs/video/renderer/vulkan/vkgen/vkstruct.h
+++ b/libs/video/renderer/vulkan/vkgen/vkstruct.h
@@ -16,6 +16,7 @@
 -(qfot_var_t *)findField:(string) fieldName;
 -(void) writeTable;
 -(void) writeSymtabInit;
+-(void) writeSymtabEntry;
 -(string) outname;
 @end
 
diff --git a/libs/video/renderer/vulkan/vkgen/vkstruct.r b/libs/video/renderer/vulkan/vkgen/vkstruct.r
index ac03d8f41..6d5c2cfc2 100644
--- a/libs/video/renderer/vulkan/vkgen/vkstruct.r
+++ b/libs/video/renderer/vulkan/vkgen/vkstruct.r
@@ -165,6 +165,10 @@
 			 [self outname]);
 }
 
+-(void) writeSymtabEntry
+{
+}
+
 -(string) outname
 {
 	if (outname) {
diff --git a/libs/video/renderer/vulkan/vkparse.c b/libs/video/renderer/vulkan/vkparse.c
index d2ae12949..21e7bdf72 100644
--- a/libs/video/renderer/vulkan/vkparse.c
+++ b/libs/video/renderer/vulkan/vkparse.c
@@ -42,6 +42,7 @@
 #include "QF/cmem.h"
 #include "QF/cvar.h"
 #include "QF/dstring.h"
+#include "QF/hash.h"
 #include "QF/input.h"
 #include "QF/mathlib.h"
 #include "QF/qargs.h"
@@ -50,6 +51,7 @@
 #include "QF/sys.h"
 #include "QF/va.h"
 #include "QF/vid.h"
+#include "QF/simd/vec4f.h"
 #include "QF/Vulkan/qf_vid.h"
 #include "QF/Vulkan/device.h"
 #include "QF/Vulkan/command.h"
@@ -65,7 +67,10 @@
 #include "vid_vulkan.h"
 
 #include "util.h"
+
+#define vkparse_internal
 #include "vkparse.h"
+#undef vkparse_internal
 
 static void flag_or (const exprval_t *val1, const exprval_t *val2,
 					 exprval_t *result, exprctx_t *ctx)
@@ -145,19 +150,16 @@ parse_basic (const plfield_t *field, const plitem_t *item,
 	ectx.symtab = 0;
 	ectx.result = &result;
 	const char *valstr = PL_String (item);
-	//Sys_Printf ("parse_uint32_t: %s %zd %d %p %p: %s\n",
+	//Sys_Printf ("parse_basic: %s %zd %d %p %p: %s\n",
 	//			field->name, field->offset, field->type, field->parser,
 	//			field->data, valstr);
 	if (strcmp (valstr, "VK_SUBPASS_EXTERNAL") == 0) {
 		//FIXME handle subpass in a separate parser?
 		*(uint32_t *) data = VK_SUBPASS_EXTERNAL;
 	} else {
-		Sys_Printf ("parse_uint32_t: %s %zd %d %p %p %s\n",
-					field->name, field->offset, field->type, field->parser,
-					field->data, valstr);
 		ret = !cexpr_eval_string (valstr, &ectx);
-		Sys_Printf ("    %x\n", *(uint32_t *)data);
 	}
+	//Sys_Printf ("    %x\n", *(uint32_t *)data);
 
 	return ret;
 }
@@ -179,11 +181,11 @@ parse_uint32_t (const plfield_t *field, const plitem_t *item,
 		//FIXME handle subpass in a separate parser?
 		*(uint32_t *) data = VK_SUBPASS_EXTERNAL;
 	} else {
-		Sys_Printf ("parse_uint32_t: %s %zd %d %p %p %s\n",
-					field->name, field->offset, field->type, field->parser,
-					field->data, valstr);
+		//Sys_Printf ("parse_uint32_t: %s %zd %d %p %p %s\n",
+		//			field->name, field->offset, field->type, field->parser,
+		//			field->data, valstr);
 		ret = !cexpr_eval_string (valstr, &ectx);
-		Sys_Printf ("    %d\n", *(uint32_t *)data);
+		//Sys_Printf ("    %d\n", *(uint32_t *)data);
 	}
 
 	return ret;
@@ -327,6 +329,23 @@ parse_custom (const plfield_t *field, const plitem_t *item,
 	return custom->parse (item, offsets, messages, context);
 }
 
+
+static int
+parse_VkShaderModule (const plitem_t *item, void **data,
+					  plitem_t *messages, parsectx_t *context)
+{
+	vulkan_ctx_t *ctx = context->vctx;
+	const char *name = PL_String (item);
+	__auto_type mptr = (VkShaderModule *)data[0];
+	VkShaderModule module = QFV_FindShaderModule (ctx, name);
+	if (module) {
+		*mptr = module;
+		return 1;
+	}
+	return 0;
+}
+static hashtab_t *enum_symtab;
+
 #include "libs/video/renderer/vulkan/vkparse.cinc"
 
 typedef struct qfv_renderpass_s {
@@ -421,9 +440,24 @@ QFV_ParseRenderPass (vulkan_ctx_t *ctx, plitem_t *plist)
 	return renderpass;
 }
 
+static const char *
+enum_symtab_getkey (const void *e, void *unused)
+{
+	__auto_type enm = (const exprenum_t *) e;
+	return enm->type->name;
+}
+
 void
 QFV_InitParse (void)
 {
 	exprctx_t   context = {};
+	enum_symtab = Hash_NewTable (61, enum_symtab_getkey, 0, 0,
+								 &context.hashlinks);
 	vkgen_init_symtabs (&context);
 }
+
+exprenum_t *
+QFV_GetEnum (const char *name)
+{
+	return Hash_Find (enum_symtab, name);
+}
diff --git a/libs/video/renderer/vulkan/vkparse.h b/libs/video/renderer/vulkan/vkparse.h
index b95475bda..e34624dab 100644
--- a/libs/video/renderer/vulkan/vkparse.h
+++ b/libs/video/renderer/vulkan/vkparse.h
@@ -3,7 +3,9 @@
 
 #include "QF/cexpr.h"
 #include "QF/Vulkan/renderpass.h"
+#ifdef vkparse_internal
 #include "libs/video/renderer/vulkan/vkparse.hinc"
+#endif
 
 typedef struct parsectx_s {
 	struct exprctx_s *ectx;
@@ -12,5 +14,6 @@ typedef struct parsectx_s {
 
 VkRenderPass QFV_ParseRenderPass (vulkan_ctx_t *ctx, plitem_t *plist);
 void QFV_InitParse (void);
+exprenum_t *QFV_GetEnum (const char *name);
 
 #endif//__vkparse_h
diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c
index 78c4e9add..7647db9ff 100644
--- a/libs/video/renderer/vulkan/vulkan_vid_common.c
+++ b/libs/video/renderer/vulkan/vulkan_vid_common.c
@@ -98,11 +98,12 @@ msaaSamples_f (cvar_t *var)
 	exprctx_t   context = {};
 	context.memsuper = new_memsuper();
 
-	if (cexpr_parse_enum (&VkSampleCountFlagBits_enum, var->string, &context,
-						  &var->int_val)) {
+	if (cexpr_parse_enum (QFV_GetEnum ("VkSampleCountFlagBits"), var->string,
+						  &context, &var->int_val)) {
 		Sys_Printf ("Invalid MSAA samples, using 1\n");
 		var->int_val = VK_SAMPLE_COUNT_1_BIT;
 	}
+	delete_memsuper (context.memsuper);
 }
 
 static void

From d919a85c8e63cd7757f6b9be49cb0fc59d5124d3 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 4 Jan 2021 17:36:11 +0900
Subject: [PATCH 1247/1519] [vulkan] Implement pipeline layout creation

It seems to work when parsing the layouts. They can be created in-line
(in theory) or in a "setLayouts" node and then referenced by name.
---
 include/vid_vulkan.h                          |   1 +
 libs/video/renderer/vulkan/qfpipeline.plist   |  31 ++++
 libs/video/renderer/vulkan/vkparse.c          | 116 +++++++++++++++
 libs/video/renderer/vulkan/vkparse.h          |   2 +
 libs/video/renderer/vulkan/vkparse.plist      | 132 ++++++++++++++++++
 .../video/renderer/vulkan/vulkan_vid_common.c |  21 ++-
 6 files changed, 302 insertions(+), 1 deletion(-)

diff --git a/include/vid_vulkan.h b/include/vid_vulkan.h
index 5eb2dd157..29cbc8ff1 100644
--- a/include/vid_vulkan.h
+++ b/include/vid_vulkan.h
@@ -45,6 +45,7 @@ typedef struct vulkan_ctx_s {
 	struct hashlink_s *hashlinks;	//FIXME want per thread
 	VkSurfaceKHR surface;	//FIXME surface = window, so "contains" swapchain
 	struct hashtab_s *shadermodules;
+	struct hashtab_s *setLayouts;
 	struct shadermodule_s *shadermodule_freelist;
 
 	VkCommandPool cmdpool;
diff --git a/libs/video/renderer/vulkan/qfpipeline.plist b/libs/video/renderer/vulkan/qfpipeline.plist
index 7af624b99..d619b8406 100644
--- a/libs/video/renderer/vulkan/qfpipeline.plist
+++ b/libs/video/renderer/vulkan/qfpipeline.plist
@@ -14,6 +14,37 @@
 			file = $builtin/pushcolor.frag;
 		},
 	);
+	setLayouts = {
+		something = {
+			flags = 0;
+			bindings = (
+				{
+					binding = 0;
+					descriptorType = sampled_image;
+					descriptorCount = 1;
+					stageFlags = fragment;
+				},
+				{
+					binding = 1;
+					descriptorType = uniform_buffer;
+					descriptorCount = 1;
+					stageFlags = vertex;
+				},
+			);
+		};
+	};
+	pipelineLayouts = {
+		something = {
+			setLayouts = (something);
+			pushConstantRanges = (
+				{
+					stageFlags = fragment;
+					offset = 0;
+					size = "4 * 4";
+				},
+			);
+		};
+	};
 	renderpass = {
 		attachments = (
 			{
diff --git a/libs/video/renderer/vulkan/vkparse.c b/libs/video/renderer/vulkan/vkparse.c
index 21e7bdf72..0931ee755 100644
--- a/libs/video/renderer/vulkan/vkparse.c
+++ b/libs/video/renderer/vulkan/vkparse.c
@@ -53,6 +53,7 @@
 #include "QF/vid.h"
 #include "QF/simd/vec4f.h"
 #include "QF/Vulkan/qf_vid.h"
+#include "QF/Vulkan/descriptor.h"
 #include "QF/Vulkan/device.h"
 #include "QF/Vulkan/command.h"
 #include "QF/Vulkan/instance.h"
@@ -329,6 +330,21 @@ parse_custom (const plfield_t *field, const plitem_t *item,
 	return custom->parse (item, offsets, messages, context);
 }
 
+static int
+parse_RGBA (const plitem_t *item, void **data,
+			plitem_t *messages, parsectx_t *context)
+{
+	int         ret = 1;
+	exprctx_t   ectx = *context->ectx;
+	exprval_t   result = { &cexpr_vector, data[0] };
+	ectx.symtab = 0;
+	ectx.result = &result;
+	const char *valstr = PL_String (item);
+	Sys_Printf ("parse_RGBA: %s\n", valstr);
+	ret = !cexpr_eval_string (valstr, &ectx);
+	Sys_Printf ("    "VEC4F_FMT"\n", VEC4_EXP (*(vec4f_t *)data[0]));
+	return ret;
+}
 
 static int
 parse_VkShaderModule (const plitem_t *item, void **data,
@@ -344,6 +360,79 @@ parse_VkShaderModule (const plitem_t *item, void **data,
 	}
 	return 0;
 }
+
+typedef struct setlayout_s {
+	char       *name;
+	VkDescriptorSetLayout layout;
+} setlayout_t;
+
+static const char *
+setLayout_getkey (const void *sl, void *unused)
+{
+	return ((setlayout_t *)sl)->name;
+}
+
+static void
+setLayout_free (void *sl, void *_ctx)
+{
+	__auto_type setLayout = (setlayout_t *) sl;
+	__auto_type ctx = (vulkan_ctx_t *) _ctx;
+	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	dfunc->vkDestroyDescriptorSetLayout (device->dev, setLayout->layout, 0);
+	free (setLayout->name);
+	free (setLayout);
+}
+
+static int
+parse_VkDescriptorSetLayout (const plfield_t *field, const plitem_t *item,
+							 void *data, plitem_t *messages, void *context)
+{
+	__auto_type layout = (setlayout_t *) data;
+	vulkan_ctx_t *ctx = ((parsectx_t *) context)->vctx;
+	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	if (PL_Type (item) == QFString) {
+		// accessing a named set layout
+		const char *name = PL_String (item);
+		setlayout_t *l = Hash_Find (ctx->setLayouts, name);
+		if (!l) {
+			PL_Message (messages, item, "undefined set layout %s", name);
+			return 0;
+		}
+		*layout = *l;
+		return 1;
+	}
+
+	VkDescriptorSetLayoutCreateInfo createInfo = {};
+
+	if (!parse_VkDescriptorSetLayoutCreateInfo (0, item, &createInfo,
+												messages, context)) {
+		return 0;
+	}
+	layout->name = strdup (field->name);
+	VkResult res;
+	res = dfunc->vkCreateDescriptorSetLayout (device->dev, &createInfo, 0,
+											  &layout->layout);
+	if (res != VK_SUCCESS) {
+		PL_Message (messages, item, "could not create set layout");
+		return 0;
+	}
+	return 1;
+}
+
+static plelement_t setLayout_data = {
+	QFDictionary,
+	sizeof (setlayout_t),
+	malloc,
+	parse_VkDescriptorSetLayout,
+	0,
+};
+
+static plfield_t setLayout_field = { 0, 0, QFDictionary, 0, &setLayout_data };
+
 static hashtab_t *enum_symtab;
 
 #include "libs/video/renderer/vulkan/vkparse.cinc"
@@ -440,6 +529,33 @@ QFV_ParseRenderPass (vulkan_ctx_t *ctx, plitem_t *plist)
 	return renderpass;
 }
 
+void
+QFV_ParseDescriptorSetLayouts (vulkan_ctx_t *ctx, plitem_t *sets)
+{
+	plitem_t   *messages = PL_NewArray ();
+	exprctx_t   exprctx = {};
+	parsectx_t  parsectx = { &exprctx, ctx };
+
+	exprctx.memsuper = new_memsuper ();
+	exprctx.messages = messages;
+	exprctx.hashlinks = ctx->hashlinks;
+
+	if (!ctx->setLayouts) {
+		ctx->setLayouts = Hash_NewTable (23, setLayout_getkey, setLayout_free,
+										 ctx, &exprctx.hashlinks);
+	}
+	int res = PL_ParseSymtab (&setLayout_field, sets, ctx->setLayouts,
+							  messages, &parsectx);
+	if (!res || developer->int_val & SYS_VULKAN) {
+		for (int i = 0; i < PL_A_NumObjects (messages); i++) {
+			Sys_Printf ("%s\n", PL_String (PL_ObjectAtIndex (messages, i)));
+		}
+	}
+	PL_Free (messages);
+	delete_memsuper (exprctx.memsuper);
+	ctx->hashlinks = exprctx.hashlinks;
+}
+
 static const char *
 enum_symtab_getkey (const void *e, void *unused)
 {
diff --git a/libs/video/renderer/vulkan/vkparse.h b/libs/video/renderer/vulkan/vkparse.h
index e34624dab..0f47ac16a 100644
--- a/libs/video/renderer/vulkan/vkparse.h
+++ b/libs/video/renderer/vulkan/vkparse.h
@@ -12,6 +12,8 @@ typedef struct parsectx_s {
 	struct vulkan_ctx_s *vctx;
 } parsectx_t;
 
+
+void QFV_ParseDescriptorSetLayouts (vulkan_ctx_t *ctx, plitem_t *sets);
 VkRenderPass QFV_ParseRenderPass (vulkan_ctx_t *ctx, plitem_t *plist);
 void QFV_InitParse (void);
 exprenum_t *QFV_GetEnum (const char *name);
diff --git a/libs/video/renderer/vulkan/vkparse.plist b/libs/video/renderer/vulkan/vkparse.plist
index 1ba7e8bb4..95ad4368e 100644
--- a/libs/video/renderer/vulkan/vkparse.plist
+++ b/libs/video/renderer/vulkan/vkparse.plist
@@ -5,6 +5,18 @@
 		VkSubpassDependency,
 		VkSpecializationInfo,
 		VkPipelineShaderStageCreateInfo,
+		VkPipelineVertexInputStateCreateInfo,
+		VkPipelineInputAssemblyStateCreateInfo,
+		VkPipelineViewportStateCreateInfo,
+		VkPipelineRasterizationStateCreateInfo,
+		VkPipelineMultisampleStateCreateInfo,
+		VkPipelineDepthStencilStateCreateInfo,
+		VkPipelineColorBlendStateCreateInfo,
+		VkPipelineDynamicStateCreateInfo,
+		VkDescriptorSetLayoutBinding,
+		VkDescriptorSetLayoutCreateInfo,
+		VkPushConstantRange,
+		VkPipelineLayoutCreateInfo,
 		qfv_swapchain_t,
 	);
 	parse = {
@@ -69,5 +81,125 @@
 			};
 		};
 		VkShaderModuleCreateInfo = skip;
+		VkDescriptorSetLayoutBinding = {
+			binding = auto;
+			descriptorType = auto;
+			descriptorCount = auto;
+			stageFlags = auto;
+			// skip pImmutableSamplers (default to 0) until I know how it works
+		};
+		VkDescriptorSetLayoutCreateInfo = {
+			flags = auto;
+			bindings = {
+				type = (array, VkDescriptorSetLayoutBinding);
+				size = bindingCount;
+				values = pBindings;
+			};
+		};
+		VkPipelineVertexInputStateCreateInfo = {
+			//flags = auto; reserved for future use (Bits enum does not exist)
+			bindings = {
+				type = (array, VkVertexInputBindingDescription);
+				size = vertexBindingDescriptionCount;
+				values = pVertexBindingDescriptions;
+			};
+			attributes = {
+				type = (array, VkVertexInputAttributeDescription);
+				size = vertexAttributeDescriptionCount;
+				values = pVertexAttributeDescriptions;
+			};
+		};
+		VkPipelineInputAssemblyStateCreateInfo = {
+			//flags = auto; reserved for future use (Bits enum does not exist)
+			topology = auto;
+			primitiveRestartEnable = auto;
+		};
+		VkPipelineViewportStateCreateInfo = {
+			//flags = auto; reserved for future use (Bits enum does not exist)
+			//FIXME redo as one array
+			viewports = {
+				type = (array, VkViewport);
+				size = viewportCount;
+				values = pViewports;
+			};
+			scissors = {
+				type = (array, VkRect2D);
+				size = scissorCount;
+				values = pScissors;
+			};
+		};
+		VkPipelineRasterizationStateCreateInfo = {
+			//flags = auto; reserved for future use (Bits enum does not exist)
+			depthClampEnable = auto;
+			rasterizerDiscardEnable = auto;
+			polygonMode = auto;
+			cullMode = auto;
+			frontFace = auto;
+			depthBiasEnable = auto;
+			depthBiasConstantFactor = auto;
+			depthBiasClamp = auto;
+			depthBiasSlopeFactor = auto;
+			lineWidth = auto;
+		};
+		VkPipelineMultisampleStateCreateInfo = {
+			//flags = auto; reserved for future use (Bits enum does not exist)
+			rasterizationSamples = auto;
+			sampleShadingEnable = auto;
+			minSampleShading = auto;
+			//pSampleMask = auto; FIXME disabled until correct size is known
+			alphaToCoverageEnable = auto;
+			alphaToOneEnable = auto;
+		};
+		VkPipelineDepthStencilStateCreateInfo = {
+			//flags = auto; reserved for future use (Bits enum does not exist)
+			depthTestEnable = auto;
+			depthWriteEnable = auto;
+			depthCompareOp = auto;
+			depthBoundsTestEnable = auto;
+			stencilTestEnable = auto;
+			front = auto;
+			back = auto;
+			minDepthBounds = auto;
+			maxDepthBounds = auto;
+		};
+		VkPipelineColorBlendStateCreateInfo = {
+			//flags = auto; reserved for future use (Bits enum does not exist)
+			logicOpEnable = auto;
+			logicOp = auto;
+			attachments = {
+				type = (array, VkPipelineColorBlendAttachmentState);
+				size = attachmentCount;
+				values = pAttachments;
+			};
+			blendConstants = {
+				type = (custom, QFString, parse_RGBA);
+				fields = (blendConstants);
+			};
+		};
+		VkPipelineDynamicStateCreateInfo = {
+			//flags = auto; reserved for future use (Bits enum does not exist)
+			dynamicState = {
+				type = (array, VkDynamicState);
+				size = dynamicStateCount;
+				values = pDynamicStates;
+			};
+		};
+		VkPipelineLayoutCreateInfo = {
+			//flags = auto; reserved for future use (Bits enum does not exist)
+			setLayouts = {
+				type = (array,	{
+									parse_type = (QFDictionary, QFString);
+									type = VkDescriptorSetLayout;
+									parser = parse_VkDescriptorSetLayout;
+								});
+				size = setLayoutCount;
+				values = pSetLayouts;
+			};
+			pushConstantRanges = {
+				type = (array, VkPushConstantRange);
+				size = pushConstantRangeCount;
+				values = pPushConstantRanges;
+			};
+		}
 	}
 }
diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c
index 7647db9ff..f515abd83 100644
--- a/libs/video/renderer/vulkan/vulkan_vid_common.c
+++ b/libs/video/renderer/vulkan/vulkan_vid_common.c
@@ -52,6 +52,7 @@
 #include "QF/va.h"
 #include "QF/vid.h"
 #include "QF/Vulkan/qf_vid.h"
+#include "QF/Vulkan/descriptor.h"
 #include "QF/Vulkan/device.h"
 #include "QF/Vulkan/command.h"
 #include "QF/Vulkan/instance.h"
@@ -401,8 +402,10 @@ Vulkan_DestroyRenderPass (vulkan_ctx_t *ctx)
 void
 Vulkan_CreatePipelines (vulkan_ctx_t *ctx)
 {
-	plitem_t   *item = qfv_load_pipeline ();
+	plitem_t   *pipeline_def = qfv_load_pipeline ();
+	plitem_t   *item;
 
+	item = pipeline_def;
 	if (!item || !(item = PL_ObjectForKey (item, "modules"))) {
 		Sys_Printf ("error loading modules\n");
 	} else {
@@ -424,6 +427,22 @@ Vulkan_CreatePipelines (vulkan_ctx_t *ctx)
 			QFV_RegisterShaderModule (ctx, name, module);
 		}
 	}
+
+	item = pipeline_def;
+	if (!item || !(item = PL_ObjectForKey (item, "setLayouts"))) {
+		Sys_Printf ("error loading setLayouts\n");
+	} else {
+		Sys_Printf ("Found setLayouts\n");
+		QFV_ParseDescriptorSetLayouts (ctx, item);
+	}
+
+	/*item = pipeline_def;
+	if (!item || !(item = PL_ObjectForKey (item, "pipelineLayouts"))) {
+		Sys_Printf ("error loading pipelineLayouts\n");
+	} else {
+		Sys_Printf ("Found pipelineLayouts\n");
+		QFV_ParsePipelineLayouts (ctx, item);
+	}*/
 }
 
 void

From 7e726545b86e81eb329fe3d853bd0ade0bacef63 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 4 Jan 2021 19:28:27 +0900
Subject: [PATCH 1248/1519] [vulkan] Fix some string retention issues

I really need to come up with a better solution for managing strings in
quakec.
---
 libs/video/renderer/vulkan/vkgen/vkfieldcustom.r | 11 +++++++++--
 libs/video/renderer/vulkan/vkgen/vkfieldtype.r   |  6 ++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/libs/video/renderer/vulkan/vkgen/vkfieldcustom.r b/libs/video/renderer/vulkan/vkgen/vkfieldcustom.r
index 3e9e56c74..7c7843414 100644
--- a/libs/video/renderer/vulkan/vkgen/vkfieldcustom.r
+++ b/libs/video/renderer/vulkan/vkgen/vkfieldcustom.r
@@ -1,4 +1,5 @@
 #include <PropertyList.h>
+#include <string.h>
 
 #include "vkfieldcustom.h"
 #include "vkgen.h"
@@ -14,13 +15,19 @@
 	}
 
 	PLItem     *desc = [item getObjectForKey:"type"];
-	pltype = [[desc getObjectAtIndex:1] string];
-	parser = [[desc getObjectAtIndex:2] string];
+	pltype = str_hold ([[desc getObjectAtIndex:1] string]);
+	parser = str_hold ([[desc getObjectAtIndex:2] string]);
 
 	fields = [item getObjectForKey:"fields"];
 	return self;
 }
 
+-(void)dealloc
+{
+	str_free (pltype);
+	str_free (parser);
+}
+
 -writeParseData
 {
 	fprintf (output_file, "static size_t parse_%s_%s_offsets[] = {\n",
diff --git a/libs/video/renderer/vulkan/vkgen/vkfieldtype.r b/libs/video/renderer/vulkan/vkgen/vkfieldtype.r
index e3d7cf59d..cb1a04508 100644
--- a/libs/video/renderer/vulkan/vkgen/vkfieldtype.r
+++ b/libs/video/renderer/vulkan/vkgen/vkfieldtype.r
@@ -14,6 +14,7 @@
 
 -(void)dealloc
 {
+	str_free (type);
 	str_free (parser);
 	str_free (parse_type);
 }
@@ -42,12 +43,13 @@ parseItemType (PLItem *item)
 	type = [item string];
 	if (type) {
 		Type       *field_type = [[Type lookup:type] dereference];
+		type = str_hold (type);
 		parse_type = [field_type parseType];
 		parser = str_hold ("parse_" + type);
 	} else {
 		parse_type = parseItemType([item getObjectForKey:"parse_type"]);
-		type = [[item getObjectForKey:"type"] string];
-		parser = [[item getObjectForKey:"parser"] string];
+		type = str_hold ([[item getObjectForKey:"type"] string]);
+		parser = str_hold ([[item getObjectForKey:"parser"] string]);
 	}
 
 	return self;

From 1b8b7c04cbe1259af47106a87c22c3e1daf56acd Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 4 Jan 2021 23:42:10 +0900
Subject: [PATCH 1249/1519] [gamecode] Disconnect held strings from return slot

Fixes an internal string error when a return string has been freed.
---
 libs/gamecode/pr_strings.c | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/libs/gamecode/pr_strings.c b/libs/gamecode/pr_strings.c
index e8e1dff85..7efd2265c 100644
--- a/libs/gamecode/pr_strings.c
+++ b/libs/gamecode/pr_strings.c
@@ -344,7 +344,7 @@ get_string (progs_t *pr, string_t num)
 			case str_free:
 				break;
 		}
-		PR_Error (pr, "internal string error: %d", __LINE__);
+		PR_Error (pr, "internal string error: line:%d", __LINE__);
 	} else {
 		if (num >= pr->pr_stringsize)
 			return 0;
@@ -469,17 +469,17 @@ PR_SetReturnString (progs_t *pr, const char *s)
 			requeue_strref (res, sr);
 		} else if ((sr->type == str_return && !sr->rs_slot)
 				   || (sr->type != str_return && sr->rs_slot)) {
-			PR_Error (pr, "internal string error: %d %d %p", __LINE__,
+			PR_Error (pr, "internal string error: line:%d %d %p", __LINE__,
 					 sr->type, sr->rs_slot);
 		}
 		return string_index (res, sr);
 	}
 
 	// grab the string ref from the oldest slot, or make a new one if the
-	// slot is empty or the string has been held
-	if ((sr = res->rs_slot->strref) && sr->type != str_dynamic) {
+	// slot is empty
+	if ((sr = res->rs_slot->strref)) {
 		if (sr->type != str_return || sr->rs_slot != res->rs_slot) {
-			PR_Error (pr, "internal string error: %d", __LINE__);
+			PR_Error (pr, "internal string error: line:%d", __LINE__);
 		}
 		pr_strfree (pr, sr->s.string);
 	} else {
@@ -629,7 +629,10 @@ PR_HoldString (progs_t *pr, string_t str)
 	if (sr) {
 		switch (sr->type) {
 			case str_temp:
+				break;
 			case str_return:
+				sr->rs_slot->strref = 0;
+				sr->rs_slot = 0;
 				break;
 			case str_static:
 			case str_mutable:
@@ -637,7 +640,7 @@ PR_HoldString (progs_t *pr, string_t str)
 				// non-ephemeral string, no-op
 				return;
 			default:
-				PR_Error (pr, "internal string error: %d", __LINE__);
+				PR_Error (pr, "internal string error: line:%d", __LINE__);
 		}
 		sr->type = str_dynamic;
 		return;
@@ -666,7 +669,7 @@ PR_FreeString (progs_t *pr, string_t str)
 				pr_strfree (pr, sr->s.string);
 				break;
 			default:
-				PR_Error (pr, "internal string error: %d", __LINE__);
+				PR_Error (pr, "internal string error: line:%d", __LINE__);
 		}
 		free_string_ref (res, sr);
 		return;
@@ -690,7 +693,7 @@ PR_FreeTempStrings (progs_t *pr)
 			continue;
 		}
 		if (sr->type != str_temp)
-			PR_Error (pr, "internal string error: %d", __LINE__);
+			PR_Error (pr, "internal string error: line:%d", __LINE__);
 		if (R_STRING (pr) < 0 && string_index (res, sr) == R_STRING (pr)
 			&& pr->pr_depth) {
 			// It looks like the temp string is being returned. While this

From ec7d974dc104668bb02e4380f9ddafe095614f9f Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 5 Jan 2021 00:07:58 +0900
Subject: [PATCH 1250/1519] [gamecode] Move % handling to the flags state

% is effectively a format flag that cancels the format and outputs a
% single %. Fixes % not getting output for %%.
---
 libs/gamecode/pr_strings.c | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/libs/gamecode/pr_strings.c b/libs/gamecode/pr_strings.c
index 7efd2265c..7cb295284 100644
--- a/libs/gamecode/pr_strings.c
+++ b/libs/gamecode/pr_strings.c
@@ -868,6 +868,7 @@ fmt_append_item (fmt_state_t *state)
  *	\dot
  *	digraph PR_Sprintf_fmt_state_machine {
  *		format          -> flags            [label="{%}"];
+ *		flogs           -> format           [label="{%}"];
  *		flags           -> flags            [label="{#+0 -}"];
  *		flags           -> var_field_width  [label="{*}"];
  *		flags           -> precision        [label="{.}"];
@@ -906,6 +907,17 @@ fmt_state_flags (fmt_state_t *state)
 	state->c++;	// skip over %
 	while (1) {
 		switch (*state->c) {
+			case '%':
+				state->c++;
+				(*state->fi)->flags = 0;
+				(*state->fi)->precision = 1;
+				(*state->fi)->minFieldWidth = 0;
+				(*state->fi)->type = 's';
+				(*state->fi)->data.string_var = "%";
+
+				fmt_append_item (state);
+				state->state = fmt_state_format;
+				return;
 			case '0':
 				(*state->fi)->flags |= FMT_ZEROPAD;
 				break;
@@ -1111,15 +1123,6 @@ fmt_state_conversion (fmt_state_t *state)
 			(*state->fi)->data.string_var = "'";
 
 			state->fmt_count++;
-			fmt_append_item (state);
-			break;
-		case '%':
-			(*state->fi)->flags = 0;
-			(*state->fi)->precision = 0;
-			(*state->fi)->minFieldWidth = 0;
-			(*state->fi)->type = 's';
-			(*state->fi)->data.string_var = "%";
-
 			fmt_append_item (state);
 			break;
 		case 'x':

From 9039c6975a461d44f6f1719aa1646eaae6fe4f29 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 5 Jan 2021 08:35:53 +0900
Subject: [PATCH 1251/1519] [util] Clean up some missed vsqrt changes

---
 include/QF/simd/vec4d.h | 2 +-
 include/QF/simd/vec4f.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/QF/simd/vec4d.h b/include/QF/simd/vec4d.h
index 1b8adbdfc..e73873bc0 100644
--- a/include/QF/simd/vec4d.h
+++ b/include/QF/simd/vec4d.h
@@ -244,7 +244,7 @@ qrotd (vec4d_t a, vec4d_t b)
 	vec4d_t mb = vsqrtd (dotd (b, b));
 	vec4d_t den = 2 * ma * mb;
 	vec4d_t t = mb * a + ma * b;
-	vec4d_t mba_mab = _mm256_sqrt_pd (dotd (t, t));
+	vec4d_t mba_mab = vsqrtd (dotd (t, t));
 	vec4d_t q = crossd (a, b) / mba_mab;
 	q[3] = (mba_mab / den)[0];
 	return q;
diff --git a/include/QF/simd/vec4f.h b/include/QF/simd/vec4f.h
index f3ea3b22f..85eb252eb 100644
--- a/include/QF/simd/vec4f.h
+++ b/include/QF/simd/vec4f.h
@@ -232,7 +232,7 @@ qrotf (vec4f_t a, vec4f_t b)
 	vec4f_t mb = vsqrtf (dotf (b, b));
 	vec4f_t den = 2 * ma * mb;
 	vec4f_t t = mb * a + ma * b;
-	vec4f_t mba_mab = _mm_sqrt_ps (dotf (t, t));
+	vec4f_t mba_mab = vsqrtf (dotf (t, t));
 	vec4f_t q = crossf (a, b) / mba_mab;
 	q[3] = (mba_mab / den)[0];
 	return q;

From d8261ade9e1350fc713800e311892e6a01240b73 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 5 Jan 2021 08:38:35 +0900
Subject: [PATCH 1252/1519] [vulkan] Generate code for vulkan handles

The handles can be created in place or in resource blocks and referred
to by name (resource block code gen next).
---
 include/vid_vulkan.h                          |   2 +
 .../video/renderer/vulkan/vkgen/Makemodule.am |   1 +
 libs/video/renderer/vulkan/vkgen/vkenum.r     |   3 +-
 libs/video/renderer/vulkan/vkgen/vkgen.r      |  18 +++
 libs/video/renderer/vulkan/vkgen/vkhandle.h   |   8 ++
 libs/video/renderer/vulkan/vkgen/vkhandle.r   |  56 ++++++++++
 libs/video/renderer/vulkan/vkparse.c          |  81 +++++---------
 libs/video/renderer/vulkan/vkparse.plist      | 105 ++++++++++++++++++
 8 files changed, 221 insertions(+), 53 deletions(-)
 create mode 100644 libs/video/renderer/vulkan/vkgen/vkhandle.h
 create mode 100644 libs/video/renderer/vulkan/vkgen/vkhandle.r

diff --git a/include/vid_vulkan.h b/include/vid_vulkan.h
index 29cbc8ff1..d35c0139d 100644
--- a/include/vid_vulkan.h
+++ b/include/vid_vulkan.h
@@ -46,6 +46,8 @@ typedef struct vulkan_ctx_s {
 	VkSurfaceKHR surface;	//FIXME surface = window, so "contains" swapchain
 	struct hashtab_s *shadermodules;
 	struct hashtab_s *setLayouts;
+	struct hashtab_s *pipelineLayouts;
+	struct hashtab_s *renderPasses;
 	struct shadermodule_s *shadermodule_freelist;
 
 	VkCommandPool cmdpool;
diff --git a/libs/video/renderer/vulkan/vkgen/Makemodule.am b/libs/video/renderer/vulkan/vkgen/Makemodule.am
index b60e97f1d..21c2ae97e 100644
--- a/libs/video/renderer/vulkan/vkgen/Makemodule.am
+++ b/libs/video/renderer/vulkan/vkgen/Makemodule.am
@@ -13,6 +13,7 @@ vkgen_dat_src= \
 	libs/video/renderer/vulkan/vkgen/vkfieldstring.r \
 	libs/video/renderer/vulkan/vkgen/vkfieldtype.r \
 	libs/video/renderer/vulkan/vkgen/vkgen.r \
+	libs/video/renderer/vulkan/vkgen/vkhandle.r \
 	libs/video/renderer/vulkan/vkgen/vkstruct.r \
 	libs/video/renderer/vulkan/vkgen/vktype.r \
 	libs/video/renderer/vulkan/vkgen/vulkan.r
diff --git a/libs/video/renderer/vulkan/vkgen/vkenum.r b/libs/video/renderer/vulkan/vkgen/vkenum.r
index 22342cb1c..537916800 100644
--- a/libs/video/renderer/vulkan/vkgen/vkenum.r
+++ b/libs/video/renderer/vulkan/vkgen/vkenum.r
@@ -115,7 +115,7 @@ skip_value(string name)
 	fprintf (output_file, "static exprtab_t %s_symtab = {\n", [self name]);
 	fprintf (output_file, "\t%s_symbols,\n", [self name]);
 	fprintf (output_file, "};\n");
-	fprintf (output_file, "exprenum_t %s_enum = {\n", [self name]);
+	fprintf (output_file, "static exprenum_t %s_enum = {\n", [self name]);
 	fprintf (output_file, "\t&%s_type,\n", [self name]);
 	fprintf (output_file, "\t&%s_symtab,\n", [self name]);
 	fprintf (output_file, "};\n");
@@ -138,7 +138,6 @@ skip_value(string name)
 			 " const plitem_t *item, void *data, plitem_t *messages,"
 			 " void *context);\n",
 			 [self name]);
-	fprintf (header_file, "extern exprenum_t %s_enum;\n", [self name]);
 }
 
 -(void) writeSymtabInit
diff --git a/libs/video/renderer/vulkan/vkgen/vkgen.r b/libs/video/renderer/vulkan/vkgen/vkgen.r
index d47873ad2..3d4837744 100644
--- a/libs/video/renderer/vulkan/vkgen/vkgen.r
+++ b/libs/video/renderer/vulkan/vkgen/vkgen.r
@@ -10,6 +10,7 @@
 #include "vkgen.h"
 #include "vkstruct.h"
 #include "vkenum.h"
+#include "vkhandle.h"
 
 static AutoreleasePool *autorelease_pool;
 static void
@@ -148,6 +149,7 @@ main(int argc, string *argv)
 	QFile       plist_file;
 	PLItem     *plist;
 	PLItem     *search;
+	PLItem     *handles;
 
 	arp_start ();
 
@@ -171,6 +173,7 @@ main(int argc, string *argv)
 		printf ("%s not a dictionary\n", plist_filename);
 	}
 	search = [[plist getObjectForKey: "search"] retain];
+	handles = [[plist getObjectForKey: "handles"] retain];
 	parse = [[plist getObjectForKey: "parse"] retain];
 
 	encodings = PR_FindGlobal (".type_encodings");
@@ -195,6 +198,17 @@ main(int argc, string *argv)
 		}
 	}
 
+	PLItem *handle_keys = [handles allKeys];
+	for (int i = [handle_keys count]; i-- > 0; ) {
+		string search_name = [[handle_keys getObjectAtIndex:i] string];
+		id obj = (id) Hash_Find (available_types, search_name);
+		obj = [obj resolveType];
+		printf("handle: %d %s\n", obj, class_get_class_name([obj class]));
+		if (obj && [obj class] == [Struct class]) {
+			[obj addToQueue];
+		}
+	}
+
 	while ([queue count]) {
 		id obj = [queue objectAtIndex:0];
 		[queue removeObjectAtIndex:0];
@@ -241,6 +255,10 @@ main(int argc, string *argv)
 		[obj writeTable];
 		arp_end ();
 	}
+	for (int i = [handle_keys count]; i-- > 0; ) {
+		string      key = [[handle_keys getObjectAtIndex:i] string];
+		output_handle (key, [handles getObjectForKey: key]);
+	}
 	fprintf (output_file, "static void\n");
 	fprintf (output_file, "vkgen_init_symtabs (exprctx_t *context)\n");
 	fprintf (output_file, "{\n");
diff --git a/libs/video/renderer/vulkan/vkgen/vkhandle.h b/libs/video/renderer/vulkan/vkgen/vkhandle.h
new file mode 100644
index 000000000..47a68798b
--- /dev/null
+++ b/libs/video/renderer/vulkan/vkgen/vkhandle.h
@@ -0,0 +1,8 @@
+#ifndef __renderer_vulkan_vkgen_vkhandle_h
+#define __renderer_vulkan_vkgen_vkhandle_h
+
+@class PLItem;
+
+void output_handle (string name, PLItem *handle);
+
+#endif//__renderer_vulkan_vkgen_vkhandle_h
diff --git a/libs/video/renderer/vulkan/vkgen/vkhandle.r b/libs/video/renderer/vulkan/vkgen/vkhandle.r
new file mode 100644
index 000000000..d6e9a7f52
--- /dev/null
+++ b/libs/video/renderer/vulkan/vkgen/vkhandle.r
@@ -0,0 +1,56 @@
+#include <string.h>
+#include <PropertyList.h>
+
+#include "vkgen.h"
+#include "vkhandle.h"
+
+void
+output_handle (string name, PLItem *handle)
+{
+	string symtab = str_hold ([[handle getObjectForKey:"symtab"] string]);
+	string class = str_hold ([[handle getObjectForKey:"class"] string]);
+	string create = str_hold ([[handle getObjectForKey:"create"] string]);
+	fprintf (output_file, "static int parse_%s (const plfield_t *field, const plitem_t *item, void *data, plitem_t *messages, void *context)\n", name);
+	fprintf (output_file, "{\n");
+	fprintf (output_file, "\t__auto_type handle = (%s *) data;\n", name);
+	fprintf (output_file, "\tvulkan_ctx_t *ctx = ((parsectx_t *) context)->vctx;\n");
+	fprintf (output_file, "\tqfv_device_t *device = ctx->device;\n");
+	fprintf (output_file, "\tqfv_devfuncs_t *dfunc = device->funcs;\n");
+	fprintf (output_file, "\tif (PL_Type (item) == QFString) {\n");
+	fprintf (output_file, "\t\tconst char *name = PL_String (item);\n");
+	fprintf (output_file, "\t\thandleref_t *hr = Hash_Find (ctx->%s, name);\n", symtab);
+	fprintf (output_file, "\t\tif (!hr) {\n");
+	fprintf (output_file, "\t\t\tPL_Message (messages, item, \"undefined %s %%s\", name);\n", class);
+	fprintf (output_file, "\t\t\treturn 0;\n");
+	fprintf (output_file, "\t\t}\n");
+	fprintf (output_file, "\t\t*handle = (%s) hr->handle;\n", name);
+	fprintf (output_file, "\t\treturn 1;\n");
+	fprintf (output_file, "\t}\n");
+
+	fprintf (output_file, "\t%sCreateInfo createInfo = {};\n", name);
+
+	fprintf (output_file, "\tif (!parse_%sCreateInfo (0, item, &createInfo, messages, context)) {\n", name);
+	fprintf (output_file, "\t\treturn 0;\n");
+	fprintf (output_file, "\t}\n");
+	fprintf (output_file, "\tVkResult res;\n");
+	fprintf (output_file, "\tres = dfunc->%s (device->dev, &createInfo, 0, handle);\n", create);
+	fprintf (output_file, "\tif (res != VK_SUCCESS) {\n");
+	fprintf (output_file, "\t\tPL_Message (messages, item, \"could not create %s\");\n", class);
+	fprintf (output_file, "\t\treturn 0;\n");
+	fprintf (output_file, "\t}\n");
+	fprintf (output_file, "\treturn 1;\n");
+	fprintf (output_file, "}\n");
+
+	fprintf (output_file, "int parse_%s_handleref (const plfield_t *field, const plitem_t *item, void *data, plitem_t *messages, void *context)\n", name);
+	fprintf (output_file, "{\n");
+	fprintf (output_file, "\thandleref_t *handleref = data;\n");
+	fprintf (output_file, "\thandleref->name = strdup (field->name);\n");
+	fprintf (output_file, "\treturn parse_%s (field, item, &handleref->handle, messages, context);\n", name);
+	fprintf (output_file, "}\n");
+
+	fprintf (header_file, "static int parse_%s (const plfield_t *field, const plitem_t *item, void *data, plitem_t *messages, void *context);\n", name);
+	fprintf (header_file, "int parse_%s_handleref (const plfield_t *field, const plitem_t *item, void *data, plitem_t *messages, void *context);\n", name);
+	str_free (symtab);
+	str_free (class);
+	str_free (create);
+}
diff --git a/libs/video/renderer/vulkan/vkparse.c b/libs/video/renderer/vulkan/vkparse.c
index 0931ee755..af22a1dc0 100644
--- a/libs/video/renderer/vulkan/vkparse.c
+++ b/libs/video/renderer/vulkan/vkparse.c
@@ -361,82 +361,61 @@ parse_VkShaderModule (const plitem_t *item, void **data,
 	return 0;
 }
 
-typedef struct setlayout_s {
+typedef struct handleref_s {
 	char       *name;
-	VkDescriptorSetLayout layout;
-} setlayout_t;
+	uint64_t    handle;
+} handleref_t;
 
 static const char *
-setLayout_getkey (const void *sl, void *unused)
+handleref_getkey (const void *hr, void *unused)
 {
-	return ((setlayout_t *)sl)->name;
+	return ((handleref_t *)hr)->name;
 }
 
 static void
-setLayout_free (void *sl, void *_ctx)
+handleref_free (void *hr, void *_ctx)
 {
-	__auto_type setLayout = (setlayout_t *) sl;
+	__auto_type handleref = (handleref_t *) hr;
+	free (handleref->name);
+	free (handleref);
+}
+
+static void
+setLayout_free (void *hr, void *_ctx)
+{
+	__auto_type handleref = (handleref_t *) hr;
+	__auto_type layout = (VkDescriptorSetLayout) handleref->handle;
 	__auto_type ctx = (vulkan_ctx_t *) _ctx;
 	qfv_device_t *device = ctx->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
 
-	dfunc->vkDestroyDescriptorSetLayout (device->dev, setLayout->layout, 0);
-	free (setLayout->name);
-	free (setLayout);
+	dfunc->vkDestroyDescriptorSetLayout (device->dev, layout, 0);
+	handleref_free (handleref, ctx);
 }
 
+static hashtab_t *enum_symtab;
+
 static int
-parse_VkDescriptorSetLayout (const plfield_t *field, const plitem_t *item,
-							 void *data, plitem_t *messages, void *context)
+parse_BasePipeline (const plitem_t *item, void **data,
+					plitem_t *messages, parsectx_t *context)
 {
-	__auto_type layout = (setlayout_t *) data;
-	vulkan_ctx_t *ctx = ((parsectx_t *) context)->vctx;
-	qfv_device_t *device = ctx->device;
-	qfv_devfuncs_t *dfunc = device->funcs;
-
-	if (PL_Type (item) == QFString) {
-		// accessing a named set layout
-		const char *name = PL_String (item);
-		setlayout_t *l = Hash_Find (ctx->setLayouts, name);
-		if (!l) {
-			PL_Message (messages, item, "undefined set layout %s", name);
-			return 0;
-		}
-		*layout = *l;
-		return 1;
-	}
-
-	VkDescriptorSetLayoutCreateInfo createInfo = {};
-
-	if (!parse_VkDescriptorSetLayoutCreateInfo (0, item, &createInfo,
-												messages, context)) {
-		return 0;
-	}
-	layout->name = strdup (field->name);
-	VkResult res;
-	res = dfunc->vkCreateDescriptorSetLayout (device->dev, &createInfo, 0,
-											  &layout->layout);
-	if (res != VK_SUCCESS) {
-		PL_Message (messages, item, "could not create set layout");
-		return 0;
-	}
-	return 1;
+	*(VkPipeline *) data = 0;
+	PL_Message (messages, item, "not implemented");
+	return 0;
 }
 
+#include "libs/video/renderer/vulkan/vkparse.cinc"
+
 static plelement_t setLayout_data = {
 	QFDictionary,
-	sizeof (setlayout_t),
+	sizeof (handleref_t),
 	malloc,
-	parse_VkDescriptorSetLayout,
+	parse_VkDescriptorSetLayout_handleref,
 	0,
 };
 
 static plfield_t setLayout_field = { 0, 0, QFDictionary, 0, &setLayout_data };
 
-static hashtab_t *enum_symtab;
-
-#include "libs/video/renderer/vulkan/vkparse.cinc"
-
 typedef struct qfv_renderpass_s {
 	qfv_attachmentdescription_t *attachments;
 	qfv_subpassparametersset_t *subpasses;
@@ -541,7 +520,7 @@ QFV_ParseDescriptorSetLayouts (vulkan_ctx_t *ctx, plitem_t *sets)
 	exprctx.hashlinks = ctx->hashlinks;
 
 	if (!ctx->setLayouts) {
-		ctx->setLayouts = Hash_NewTable (23, setLayout_getkey, setLayout_free,
+		ctx->setLayouts = Hash_NewTable (23, handleref_getkey, setLayout_free,
 										 ctx, &exprctx.hashlinks);
 	}
 	int res = PL_ParseSymtab (&setLayout_field, sets, ctx->setLayouts,
diff --git a/libs/video/renderer/vulkan/vkparse.plist b/libs/video/renderer/vulkan/vkparse.plist
index 95ad4368e..c816b32c4 100644
--- a/libs/video/renderer/vulkan/vkparse.plist
+++ b/libs/video/renderer/vulkan/vkparse.plist
@@ -17,8 +17,26 @@
 		VkDescriptorSetLayoutCreateInfo,
 		VkPushConstantRange,
 		VkPipelineLayoutCreateInfo,
+		VkGraphicsPipelineCreateInfo,
 		qfv_swapchain_t,
 	);
+	handles = {
+		VkDescriptorSetLayout = {
+			symtab = setLayouts;
+			class = "set layout";
+			create = vkCreateDescriptorSetLayout;
+		};
+		VkRenderPass = {
+			symtab = renderPasses;
+			class = "render pass";
+			create = vkCreateRenderPass;
+		};
+		VkPipelineLayout = {
+			symtab = pipelineLayouts;
+			class = "pipeline layout";
+			create = vkCreatePipelineLayout;
+		};
+	};
 	parse = {
 		qfv_swapchain_s = {
 			.name = qfv_swapchain_t;
@@ -52,6 +70,24 @@
 				values = pPreserveAttachments;
 			};
 		};
+		VkRenderPassCreateInfo = {
+			//flags = auto; reserved for future use (Bits enum does not exist)
+			attachments = {
+				type = (array, VkAttachmentDescription);
+				size = attachmentCount;
+				values = pAttachments;
+			};
+			subpasses = {
+				type = (array, VkSubpassDescription);
+				size = subpassCount;
+				values = pSubpasses;
+			};
+			dependencies = {
+				type = (array, VkSubpassDependency);
+				size = dependencyCount;
+				values = pDependencies;
+			};
+		};
 		VkSpecializationInfo = {
 			mapEntries = {
 				type = (array, VkSpecializationMapEntry);
@@ -200,6 +236,75 @@
 				size = pushConstantRangeCount;
 				values = pPushConstantRanges;
 			};
+		};
+		VkPipelineTessellationStateCreateInfo = {
+			//flags = auto; reserved for future use (Bits enum does not exist)
+			patchControlPoints = auto;
+		};
+		VkGraphicsPipelineCreateInfo = {
+			flags = auto;
+			stages = {
+				type = (array, VkPipelineShaderStageCreateInfo);
+				size = stageCount;
+				values = pStages;
+			};
+			vertexInput = {
+				type = (single, VkPipelineVertexInputStateCreateInfo);
+				value = pVertexInputState;
+			};
+			inputAssembly = {
+				type = (single, VkPipelineInputAssemblyStateCreateInfo);
+				value = pInputAssemblyState;
+			};
+			tessellation = {
+				type = (single, VkPipelineTessellationStateCreateInfo);
+				value = pTessellationState;
+			};
+			viewport = {
+				type = (single, VkPipelineViewportStateCreateInfo);
+				value = pViewportState;
+			};
+			rasterization = {
+				type = (single, VkPipelineRasterizationStateCreateInfo);
+				value = pRasterizationState;
+			};
+			multisample = {
+				type = (single, VkPipelineMultisampleStateCreateInfo);
+				value = pMultisampleState;
+			};
+			depthStencil = {
+				type = (single, VkPipelineDepthStencilStateCreateInfo);
+				value = pDepthStencilState;
+			};
+			colorBlend = {
+				type = (single, VkPipelineColorBlendStateCreateInfo);
+				value = pColorBlendState;
+			};
+			dynamic = {
+				type = (single, VkPipelineDynamicStateCreateInfo);
+				value = pDynamicState;
+			};
+			layout = {
+				type = (single,	{
+									parse_type = (QFDictionary, QFString);
+									type = VkPipelineLayout;
+									parser = parse_VkPipelineLayout;
+								});
+				value = layout;
+			};
+			renderPass = {
+				type = (single,	{
+									parse_type = (QFDictionary, QFString);
+									type = VkRenderPass;
+									parser = parse_VkRenderPass;
+								});
+				value = renderPass;
+			};
+			basePipelineHandle = {
+				type = (custom, QFString, parse_BasePipeline);
+				fields = (basePipelineHandle);
+			};
+			basePipelineIndex = auto;
 		}
 	}
 }

From e5708100bbf8b65a9578c472a2be68d36c1b4e99 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 5 Jan 2021 14:15:35 +0900
Subject: [PATCH 1253/1519] [vulkan] Generate code for resource nodes

This makes it easy to add resource nodes defining contextually named
resources. It is already used for shaders, set layouts, and pipeline
layouts.
---
 include/QF/Vulkan/shader.h                    |   5 -
 include/vid_vulkan.h                          |   3 +-
 libs/video/renderer/vulkan/qfpipeline.plist   |  22 ++--
 libs/video/renderer/vulkan/shader.c           |  71 +----------
 .../video/renderer/vulkan/vkgen/Makemodule.am |   1 +
 libs/video/renderer/vulkan/vkgen/vkgen.r      |  16 +++
 libs/video/renderer/vulkan/vkgen/vkhandle.r   |  66 +++++-----
 libs/video/renderer/vulkan/vkgen/vkresource.h |   9 ++
 libs/video/renderer/vulkan/vkgen/vkresource.r |  44 +++++++
 libs/video/renderer/vulkan/vkparse.c          | 118 ++++++++++++++----
 libs/video/renderer/vulkan/vkparse.h          |  12 +-
 libs/video/renderer/vulkan/vkparse.plist      |  36 +++++-
 .../video/renderer/vulkan/vulkan_vid_common.c |  40 +-----
 13 files changed, 257 insertions(+), 186 deletions(-)
 create mode 100644 libs/video/renderer/vulkan/vkgen/vkresource.h
 create mode 100644 libs/video/renderer/vulkan/vkgen/vkresource.r

diff --git a/include/QF/Vulkan/shader.h b/include/QF/Vulkan/shader.h
index 41b38a862..f44189978 100644
--- a/include/QF/Vulkan/shader.h
+++ b/include/QF/Vulkan/shader.h
@@ -10,10 +10,5 @@ VkShaderModule QFV_CreateShaderModule (struct qfv_device_s *device,
 									   const char *path);
 void QFV_DestroyShaderModule (struct qfv_device_s *device,
 							  VkShaderModule module);
-VkShaderModule QFV_FindShaderModule (struct vulkan_ctx_s *ctx,
-									 const char *name);
-void QFV_RegisterShaderModule (struct vulkan_ctx_s *ctx, const char *name,
-							   VkShaderModule module);
-void QFV_DeregisterShaderModule (struct vulkan_ctx_s *ctx, const char *name);
 
 #endif//__QF_Vulkan_shader_h
diff --git a/include/vid_vulkan.h b/include/vid_vulkan.h
index d35c0139d..1741165ee 100644
--- a/include/vid_vulkan.h
+++ b/include/vid_vulkan.h
@@ -44,11 +44,10 @@ typedef struct vulkan_ctx_s {
 	VkSampleCountFlagBits msaaSamples;	// FIXME not here?
 	struct hashlink_s *hashlinks;	//FIXME want per thread
 	VkSurfaceKHR surface;	//FIXME surface = window, so "contains" swapchain
-	struct hashtab_s *shadermodules;
+	struct hashtab_s *shaderModules;
 	struct hashtab_s *setLayouts;
 	struct hashtab_s *pipelineLayouts;
 	struct hashtab_s *renderPasses;
-	struct shadermodule_s *shadermodule_freelist;
 
 	VkCommandPool cmdpool;
 	VkCommandBuffer cmdbuffer;
diff --git a/libs/video/renderer/vulkan/qfpipeline.plist b/libs/video/renderer/vulkan/qfpipeline.plist
index d619b8406..ed74f689a 100644
--- a/libs/video/renderer/vulkan/qfpipeline.plist
+++ b/libs/video/renderer/vulkan/qfpipeline.plist
@@ -1,19 +1,13 @@
 {
-	modules = (
+	shaderModules = {
 		// specify shader modules to load into memory
-		{
-			// the name of the module for referecy by the pipeline
-			name = passthrough;
-			// the path to the spv file to load
-			// $shader refers to the shader install path
-			// $builtin refers to compiled-in shaders
-			file = $builtin/passthrough.vert;
-		},
-		{
-			name = pushcolor;
-			file = $builtin/pushcolor.frag;
-		},
-	);
+		// key is the name of the module for referecy by the pipeline
+		// value the path to the spv file to load
+		// $shader refers to the shader install path
+		// $builtin refers to compiled-in shaders
+		passthrough = $builtin/passthrough.vert;
+		pushcolor = $builtin/pushcolor.frag;
+	};
 	setLayouts = {
 		something = {
 			flags = 0;
diff --git a/libs/video/renderer/vulkan/shader.c b/libs/video/renderer/vulkan/shader.c
index e55833782..f0064bb35 100644
--- a/libs/video/renderer/vulkan/shader.c
+++ b/libs/video/renderer/vulkan/shader.c
@@ -65,14 +65,6 @@ typedef struct shaderdata_s {
 	size_t      size;
 } shaderdata_t;
 
-typedef struct shadermodule_s {
-	char       *name;
-	union {
-		VkShaderModule module;
-		struct shadermodule_s *next;
-	};
-} shadermodule_t;
-
 static shaderdata_t builtin_shaders[] = {
 	{ "passthrough.vert", passthrough_vert, sizeof (passthrough_vert) },
 	{ "pushcolor.frag", pushcolor_frag, sizeof (pushcolor_frag) },
@@ -122,6 +114,9 @@ QFV_CreateShaderModule (qfv_device_t *device, const char *shader_path)
 	}
 
 	if (data) {
+		Sys_MaskPrintf (SYS_VULKAN,
+						"QFV_CreateShaderModule: creating shader module %s\n",
+						shader_path);
 		VkShaderModuleCreateInfo createInfo = {
 			VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO, 0,
 			0, data->size, data->data
@@ -151,63 +146,3 @@ QFV_DestroyShaderModule (qfv_device_t *device, VkShaderModule module)
 
 	dfunc->vkDestroyShaderModule (dev, module, 0);
 }
-
-static shadermodule_t *
-new_module (vulkan_ctx_t *ctx)
-{
-	shadermodule_t *shadermodule;
-	ALLOC (128, shadermodule_t, ctx->shadermodule, shadermodule);
-	return shadermodule;
-}
-
-static void
-del_module (shadermodule_t *shadermodule, vulkan_ctx_t *ctx)
-{
-	free (shadermodule->name);
-	FREE (ctx->shadermodule, shadermodule);
-}
-
-static const char *
-sm_getkey (const void *sm, void *unused)
-{
-	return ((shadermodule_t *) sm)->name;
-}
-
-static void
-sm_free (void *sm, void *ctx)
-{
-	del_module (sm, ctx);
-}
-
-VkShaderModule
-QFV_FindShaderModule (vulkan_ctx_t *ctx, const char *name)
-{
-	//FIXME
-	if (!ctx->shadermodules) {
-		ctx->shadermodules = Hash_NewTable (127, sm_getkey, sm_free, ctx, 0);
-	}
-	return Hash_Find (ctx->shadermodules, name);
-}
-
-void
-QFV_RegisterShaderModule (vulkan_ctx_t *ctx, const char *name,
-						  VkShaderModule module)
-{
-	//FIXME
-	if (!ctx->shadermodules) {
-		ctx->shadermodules = Hash_NewTable (127, sm_getkey, sm_free, ctx, 0);
-	}
-	shadermodule_t *shadermodule = new_module (ctx);
-	shadermodule->name = strdup (name);
-	shadermodule->module = module;
-	Hash_Add (ctx->shadermodules, shadermodule);
-}
-
-void
-QFV_DeregisterShaderModule (vulkan_ctx_t *ctx, const char *name)
-{
-	if (!ctx->shadermodules) {
-		return;
-	}
-	Hash_Free (ctx->shadermodules, Hash_Del (ctx->shadermodules, name));
-}
diff --git a/libs/video/renderer/vulkan/vkgen/Makemodule.am b/libs/video/renderer/vulkan/vkgen/Makemodule.am
index 21c2ae97e..2fba61b0b 100644
--- a/libs/video/renderer/vulkan/vkgen/Makemodule.am
+++ b/libs/video/renderer/vulkan/vkgen/Makemodule.am
@@ -14,6 +14,7 @@ vkgen_dat_src= \
 	libs/video/renderer/vulkan/vkgen/vkfieldtype.r \
 	libs/video/renderer/vulkan/vkgen/vkgen.r \
 	libs/video/renderer/vulkan/vkgen/vkhandle.r \
+	libs/video/renderer/vulkan/vkgen/vkresource.r \
 	libs/video/renderer/vulkan/vkgen/vkstruct.r \
 	libs/video/renderer/vulkan/vkgen/vktype.r \
 	libs/video/renderer/vulkan/vkgen/vulkan.r
diff --git a/libs/video/renderer/vulkan/vkgen/vkgen.r b/libs/video/renderer/vulkan/vkgen/vkgen.r
index 3d4837744..4636df52f 100644
--- a/libs/video/renderer/vulkan/vkgen/vkgen.r
+++ b/libs/video/renderer/vulkan/vkgen/vkgen.r
@@ -11,6 +11,7 @@
 #include "vkstruct.h"
 #include "vkenum.h"
 #include "vkhandle.h"
+#include "vkresource.h"
 
 static AutoreleasePool *autorelease_pool;
 static void
@@ -150,6 +151,7 @@ main(int argc, string *argv)
 	PLItem     *plist;
 	PLItem     *search;
 	PLItem     *handles;
+	PLItem     *resources;
 
 	arp_start ();
 
@@ -174,6 +176,7 @@ main(int argc, string *argv)
 	}
 	search = [[plist getObjectForKey: "search"] retain];
 	handles = [[plist getObjectForKey: "handles"] retain];
+	resources = [[plist getObjectForKey: "resources"] retain];
 	parse = [[plist getObjectForKey: "parse"] retain];
 
 	encodings = PR_FindGlobal (".type_encodings");
@@ -259,6 +262,19 @@ main(int argc, string *argv)
 		string      key = [[handle_keys getObjectAtIndex:i] string];
 		output_handle (key, [handles getObjectForKey: key]);
 	}
+	for (int i = [resources count]; i-- > 0; ) {
+		PLItem     *res = [resources getObjectAtIndex:i];
+		output_resource_data (res);
+	}
+	// keep the order intuitive (since it matters)
+	fprintf (output_file, "static parseres_t parse_resources[] = {\n");
+	for (int i = 0; i < [resources count]; i++) {
+		PLItem     *res = [resources getObjectAtIndex:i];
+		output_resource_entry (res);
+	}
+	fprintf (output_file, "\t{}\n");
+	fprintf (output_file, "};\n");
+
 	fprintf (output_file, "static void\n");
 	fprintf (output_file, "vkgen_init_symtabs (exprctx_t *context)\n");
 	fprintf (output_file, "{\n");
diff --git a/libs/video/renderer/vulkan/vkgen/vkhandle.r b/libs/video/renderer/vulkan/vkgen/vkhandle.r
index d6e9a7f52..da4a4fbcc 100644
--- a/libs/video/renderer/vulkan/vkgen/vkhandle.r
+++ b/libs/video/renderer/vulkan/vkgen/vkhandle.r
@@ -10,46 +10,54 @@ output_handle (string name, PLItem *handle)
 	string symtab = str_hold ([[handle getObjectForKey:"symtab"] string]);
 	string class = str_hold ([[handle getObjectForKey:"class"] string]);
 	string create = str_hold ([[handle getObjectForKey:"create"] string]);
-	fprintf (output_file, "static int parse_%s (const plfield_t *field, const plitem_t *item, void *data, plitem_t *messages, void *context)\n", name);
-	fprintf (output_file, "{\n");
-	fprintf (output_file, "\t__auto_type handle = (%s *) data;\n", name);
-	fprintf (output_file, "\tvulkan_ctx_t *ctx = ((parsectx_t *) context)->vctx;\n");
-	fprintf (output_file, "\tqfv_device_t *device = ctx->device;\n");
-	fprintf (output_file, "\tqfv_devfuncs_t *dfunc = device->funcs;\n");
-	fprintf (output_file, "\tif (PL_Type (item) == QFString) {\n");
-	fprintf (output_file, "\t\tconst char *name = PL_String (item);\n");
-	fprintf (output_file, "\t\thandleref_t *hr = Hash_Find (ctx->%s, name);\n", symtab);
-	fprintf (output_file, "\t\tif (!hr) {\n");
-	fprintf (output_file, "\t\t\tPL_Message (messages, item, \"undefined %s %%s\", name);\n", class);
-	fprintf (output_file, "\t\t\treturn 0;\n");
-	fprintf (output_file, "\t\t}\n");
-	fprintf (output_file, "\t\t*handle = (%s) hr->handle;\n", name);
-	fprintf (output_file, "\t\treturn 1;\n");
-	fprintf (output_file, "\t}\n");
+	string custom = str_hold ([[handle getObjectForKey:"custom"] string]);
+	if (!custom) {
+		fprintf (output_file, "static int parse_%s (const plfield_t *field, const plitem_t *item, void *data, plitem_t *messages, void *context)\n", name);
+		fprintf (output_file, "{\n");
+		fprintf (output_file, "\t__auto_type handle = (%s *) data;\n", name);
+		fprintf (output_file, "\tvulkan_ctx_t *ctx = ((parsectx_t *) context)->vctx;\n");
+		fprintf (output_file, "\tqfv_device_t *device = ctx->device;\n");
+		fprintf (output_file, "\tqfv_devfuncs_t *dfunc = device->funcs;\n");
+		fprintf (output_file, "\tif (PL_Type (item) == QFString) {\n");
+		fprintf (output_file, "\t\tconst char *name = PL_String (item);\n");
+		fprintf (output_file, "\t\thandleref_t *hr = Hash_Find (ctx->%s, name);\n", symtab);
+		fprintf (output_file, "\t\tif (!hr) {\n");
+		fprintf (output_file, "\t\t\tPL_Message (messages, item, \"undefined %s %%s\", name);\n", class);
+		fprintf (output_file, "\t\t\treturn 0;\n");
+		fprintf (output_file, "\t\t}\n");
+		fprintf (output_file, "\t\t*handle = (%s) hr->handle;\n", name);
+		fprintf (output_file, "\t\treturn 1;\n");
+		fprintf (output_file, "\t}\n");
 
-	fprintf (output_file, "\t%sCreateInfo createInfo = {};\n", name);
+		fprintf (output_file, "\t%sCreateInfo createInfo = {};\n", name);
 
-	fprintf (output_file, "\tif (!parse_%sCreateInfo (0, item, &createInfo, messages, context)) {\n", name);
-	fprintf (output_file, "\t\treturn 0;\n");
-	fprintf (output_file, "\t}\n");
-	fprintf (output_file, "\tVkResult res;\n");
-	fprintf (output_file, "\tres = dfunc->%s (device->dev, &createInfo, 0, handle);\n", create);
-	fprintf (output_file, "\tif (res != VK_SUCCESS) {\n");
-	fprintf (output_file, "\t\tPL_Message (messages, item, \"could not create %s\");\n", class);
-	fprintf (output_file, "\t\treturn 0;\n");
-	fprintf (output_file, "\t}\n");
-	fprintf (output_file, "\treturn 1;\n");
-	fprintf (output_file, "}\n");
+		fprintf (output_file, "\tif (!parse_%sCreateInfo (0, item, &createInfo, messages, context)) {\n", name);
+		fprintf (output_file, "\t\treturn 0;\n");
+		fprintf (output_file, "\t}\n");
+		fprintf (output_file, "\tVkResult res;\n");
+		fprintf (output_file, "\tres = dfunc->%s (device->dev, &createInfo, 0, handle);\n", create);
+		fprintf (output_file, "\tif (res != VK_SUCCESS) {\n");
+		fprintf (output_file, "\t\tPL_Message (messages, item, \"could not create %s\");\n", class);
+		fprintf (output_file, "\t\treturn 0;\n");
+		fprintf (output_file, "\t}\n");
+		fprintf (output_file, "\treturn 1;\n");
+		fprintf (output_file, "}\n");
+	}
 
 	fprintf (output_file, "int parse_%s_handleref (const plfield_t *field, const plitem_t *item, void *data, plitem_t *messages, void *context)\n", name);
 	fprintf (output_file, "{\n");
 	fprintf (output_file, "\thandleref_t *handleref = data;\n");
 	fprintf (output_file, "\thandleref->name = strdup (field->name);\n");
-	fprintf (output_file, "\treturn parse_%s (field, item, &handleref->handle, messages, context);\n", name);
+	if (custom) {
+		fprintf (output_file, "\treturn %s (field, item, &handleref->handle, messages, context);\n", custom);
+	} else {
+		fprintf (output_file, "\treturn parse_%s (field, item, &handleref->handle, messages, context);\n", name);
+	}
 	fprintf (output_file, "}\n");
 
 	fprintf (header_file, "static int parse_%s (const plfield_t *field, const plitem_t *item, void *data, plitem_t *messages, void *context);\n", name);
 	fprintf (header_file, "int parse_%s_handleref (const plfield_t *field, const plitem_t *item, void *data, plitem_t *messages, void *context);\n", name);
+	str_free (custom);
 	str_free (symtab);
 	str_free (class);
 	str_free (create);
diff --git a/libs/video/renderer/vulkan/vkgen/vkresource.h b/libs/video/renderer/vulkan/vkgen/vkresource.h
new file mode 100644
index 000000000..e72042c3e
--- /dev/null
+++ b/libs/video/renderer/vulkan/vkgen/vkresource.h
@@ -0,0 +1,9 @@
+#ifndef __renderer_vulkan_vkgen_vkresource_h
+#define __renderer_vulkan_vkgen_vkresource_h
+
+@class PLItem;
+
+void output_resource_data (PLItem *resource);
+void output_resource_entry (PLItem *resource);
+
+#endif//__renderer_vulkan_vkgen_vkresource_h
diff --git a/libs/video/renderer/vulkan/vkgen/vkresource.r b/libs/video/renderer/vulkan/vkgen/vkresource.r
new file mode 100644
index 000000000..47478d9f8
--- /dev/null
+++ b/libs/video/renderer/vulkan/vkgen/vkresource.r
@@ -0,0 +1,44 @@
+#include <string.h>
+#include <PropertyList.h>
+
+#include "vkgen.h"
+#include "vkresource.h"
+
+void
+output_resource_data (PLItem *resource)
+{
+	string name = str_hold ([[resource getObjectForKey:"name"] string]);
+	string parse_type = str_hold ([[resource getObjectForKey:"parse_type"] string]);
+	string parser = str_hold ([[resource getObjectForKey:"parser"] string]);
+	string type = str_hold ([[resource getObjectForKey:"type"] string]);
+
+	fprintf (output_file, "static plelement_t resource_%s_data = {\n", name);
+	fprintf (output_file, "\t%s,\n", parse_type);
+	fprintf (output_file, "\tsizeof (%s),\n", type);
+	fprintf (output_file, "\tmalloc,\n");
+	fprintf (output_file, "\t%s,\n", parser);
+	fprintf (output_file, "\t0,\n");
+	fprintf (output_file, "};\n");
+
+	fprintf (output_file, "static plfield_t resource_%s_field = {\n", name);
+	fprintf (output_file, "\t0, 0, %s, 0, &resource_%s_data\n",
+			 parse_type, name);
+	fprintf (output_file, "};\n");
+
+	str_free (name);
+	str_free (parse_type);
+	str_free (parser);
+	str_free (type);
+}
+
+void
+output_resource_entry (PLItem *resource)
+{
+	string name = str_hold ([[resource getObjectForKey:"name"] string]);
+	string table = str_hold ([[resource getObjectForKey:"table"] string]);
+	fprintf (output_file,
+		"\t{\"%s\", &resource_%s_field, field_offset (vulkan_ctx_t, %s) },\n",
+		 name, name, table);
+	str_free (name);
+	str_free (table);
+}
diff --git a/libs/video/renderer/vulkan/vkparse.c b/libs/video/renderer/vulkan/vkparse.c
index af22a1dc0..418ef707d 100644
--- a/libs/video/renderer/vulkan/vkparse.c
+++ b/libs/video/renderer/vulkan/vkparse.c
@@ -207,6 +207,9 @@ parse_enum (const plfield_t *field, const plitem_t *item,
 	//			field->name, field->offset, field->type, field->parser,
 	//			field->data, valstr);
 	ret = !cexpr_parse_enum (enm, valstr, &ectx, data);
+	if (!ret) {
+		PL_Message (messages, item, "error parsing enum: %s", valstr);
+	}
 	//Sys_Printf ("    %d\n", *(int *)data);
 	return ret;
 }
@@ -347,24 +350,37 @@ parse_RGBA (const plitem_t *item, void **data,
 }
 
 static int
-parse_VkShaderModule (const plitem_t *item, void **data,
-					  plitem_t *messages, parsectx_t *context)
+parse_VkShaderModule (const plfield_t *field, const plitem_t *item, void *data,
+					  plitem_t *messages, void *context)
 {
-	vulkan_ctx_t *ctx = context->vctx;
+	__auto_type handle = (VkShaderModule *) data;
+	vulkan_ctx_t *ctx = ((parsectx_t *) context)->vctx;
+
 	const char *name = PL_String (item);
-	__auto_type mptr = (VkShaderModule *)data[0];
-	VkShaderModule module = QFV_FindShaderModule (ctx, name);
-	if (module) {
-		*mptr = module;
-		return 1;
+	handleref_t *hr = Hash_Find (ctx->shaderModules, name);
+	if (!hr) {
+		PL_Message (messages, item, "undefined shader module %s", name);
+		return 0;
 	}
-	return 0;
+	*handle = (VkShaderModule) hr->handle;
+	return 1;
 }
 
-typedef struct handleref_s {
-	char       *name;
-	uint64_t    handle;
-} handleref_t;
+static int
+parse_VkShaderModule_resource (const plfield_t *field, const plitem_t *item,
+							   void *data, plitem_t *messages, void *context)
+{
+	__auto_type handle = (VkShaderModule *) data;
+	vulkan_ctx_t *ctx = ((parsectx_t *) context)->vctx;
+	qfv_device_t *device = ctx->device;
+
+	const char *shader_path = PL_String (item);
+	if (!(*handle = QFV_CreateShaderModule (device, shader_path))) {
+		PL_Message (messages, item, "could not find shader %s", shader_path);
+		return 0;
+	}
+	return 1;
+}
 
 static const char *
 handleref_getkey (const void *hr, void *unused)
@@ -393,6 +409,45 @@ setLayout_free (void *hr, void *_ctx)
 	handleref_free (handleref, ctx);
 }
 
+static void
+shaderModule_free (void *hr, void *_ctx)
+{
+	__auto_type handleref = (handleref_t *) hr;
+	__auto_type module = (VkShaderModule) handleref->handle;
+	__auto_type ctx = (vulkan_ctx_t *) _ctx;
+	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	dfunc->vkDestroyShaderModule (device->dev, module, 0);
+	handleref_free (handleref, ctx);
+}
+
+static void
+pipelineLayout_free (void *hr, void *_ctx)
+{
+	__auto_type handleref = (handleref_t *) hr;
+	__auto_type layout = (VkPipelineLayout) handleref->handle;
+	__auto_type ctx = (vulkan_ctx_t *) _ctx;
+	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	dfunc->vkDestroyPipelineLayout (device->dev, layout, 0);
+	handleref_free (handleref, ctx);
+}
+
+static void
+renderPass_free (void *hr, void *_ctx)
+{
+	__auto_type handleref = (handleref_t *) hr;
+	__auto_type renderPass = (VkRenderPass) handleref->handle;
+	__auto_type ctx = (vulkan_ctx_t *) _ctx;
+	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	dfunc->vkDestroyRenderPass (device->dev, renderPass, 0);
+	handleref_free (handleref, ctx);
+}
+
 static hashtab_t *enum_symtab;
 
 static int
@@ -406,16 +461,6 @@ parse_BasePipeline (const plitem_t *item, void **data,
 
 #include "libs/video/renderer/vulkan/vkparse.cinc"
 
-static plelement_t setLayout_data = {
-	QFDictionary,
-	sizeof (handleref_t),
-	malloc,
-	parse_VkDescriptorSetLayout_handleref,
-	0,
-};
-
-static plfield_t setLayout_field = { 0, 0, QFDictionary, 0, &setLayout_data };
-
 typedef struct qfv_renderpass_s {
 	qfv_attachmentdescription_t *attachments;
 	qfv_subpassparametersset_t *subpasses;
@@ -509,27 +554,46 @@ QFV_ParseRenderPass (vulkan_ctx_t *ctx, plitem_t *plist)
 }
 
 void
-QFV_ParseDescriptorSetLayouts (vulkan_ctx_t *ctx, plitem_t *sets)
+QFV_ParseResources (vulkan_ctx_t *ctx, plitem_t *pipelinedef)
 {
 	plitem_t   *messages = PL_NewArray ();
 	exprctx_t   exprctx = {};
 	parsectx_t  parsectx = { &exprctx, ctx };
+	int         ret = 1;
 
 	exprctx.memsuper = new_memsuper ();
 	exprctx.messages = messages;
 	exprctx.hashlinks = ctx->hashlinks;
 
 	if (!ctx->setLayouts) {
+		ctx->shaderModules = Hash_NewTable (23, handleref_getkey,
+											shaderModule_free,
+											ctx, &exprctx.hashlinks);
 		ctx->setLayouts = Hash_NewTable (23, handleref_getkey, setLayout_free,
 										 ctx, &exprctx.hashlinks);
+		ctx->pipelineLayouts = Hash_NewTable (23, handleref_getkey,
+											  pipelineLayout_free,
+											  ctx, &exprctx.hashlinks);
+		ctx->renderPasses = Hash_NewTable (23, handleref_getkey,
+										   renderPass_free,
+										   ctx, &exprctx.hashlinks);
 	}
-	int res = PL_ParseSymtab (&setLayout_field, sets, ctx->setLayouts,
-							  messages, &parsectx);
-	if (!res || developer->int_val & SYS_VULKAN) {
+
+	for (parseres_t *res = parse_resources; res->name; res++) {
+		plitem_t   *item = PL_ObjectForKey (pipelinedef, res->name);
+		if (item) {
+			__auto_type table = *(hashtab_t **) ((size_t) ctx + res->offset);
+			Sys_Printf ("found %s\n", res->name);
+			ret &= PL_ParseSymtab (res->field, item, table, messages,
+								   &parsectx);
+		}
+	}
+	if (!ret || developer->int_val & SYS_VULKAN) {
 		for (int i = 0; i < PL_A_NumObjects (messages); i++) {
 			Sys_Printf ("%s\n", PL_String (PL_ObjectAtIndex (messages, i)));
 		}
 	}
+
 	PL_Free (messages);
 	delete_memsuper (exprctx.memsuper);
 	ctx->hashlinks = exprctx.hashlinks;
diff --git a/libs/video/renderer/vulkan/vkparse.h b/libs/video/renderer/vulkan/vkparse.h
index 0f47ac16a..e63bb44e2 100644
--- a/libs/video/renderer/vulkan/vkparse.h
+++ b/libs/video/renderer/vulkan/vkparse.h
@@ -12,9 +12,19 @@ typedef struct parsectx_s {
 	struct vulkan_ctx_s *vctx;
 } parsectx_t;
 
+typedef struct parseres_s {
+	const char *name;
+	plfield_t  *field;
+	size_t      offset;
+} parseres_t;
+
+typedef struct handleref_s {
+	char       *name;
+	uint64_t    handle;
+} handleref_t;
 
-void QFV_ParseDescriptorSetLayouts (vulkan_ctx_t *ctx, plitem_t *sets);
 VkRenderPass QFV_ParseRenderPass (vulkan_ctx_t *ctx, plitem_t *plist);
+void QFV_ParseResources (vulkan_ctx_t *ctx, plitem_t *plist);
 void QFV_InitParse (void);
 exprenum_t *QFV_GetEnum (const char *name);
 
diff --git a/libs/video/renderer/vulkan/vkparse.plist b/libs/video/renderer/vulkan/vkparse.plist
index c816b32c4..844b471f9 100644
--- a/libs/video/renderer/vulkan/vkparse.plist
+++ b/libs/video/renderer/vulkan/vkparse.plist
@@ -21,6 +21,11 @@
 		qfv_swapchain_t,
 	);
 	handles = {
+		VkShaderModule = {
+			symtab = shaderModules;
+			class = "shader module";
+			custom = parse_VkShaderModule_resource;
+		};
 		VkDescriptorSetLayout = {
 			symtab = setLayouts;
 			class = "set layout";
@@ -37,6 +42,29 @@
 			create = vkCreatePipelineLayout;
 		};
 	};
+	resources = (
+		{
+			name = shaderModules;
+			parse_type = QFString;
+			parser = parse_VkShaderModule_handleref;
+			type = handleref_t;
+			table = shaderModules;
+		},
+		{
+			name = setLayouts;
+			parse_type = QFDictionary;
+			parser = parse_VkDescriptorSetLayout_handleref;
+			type = handleref_t;
+			table = setLayouts;
+		},
+		{
+			name = pipelineLayouts;
+			parse_type = QFDictionary;
+			parser = parse_VkPipelineLayout_handleref;
+			type = handleref_t;
+			table = pipelineLayouts;
+		},
+	);
 	parse = {
 		qfv_swapchain_s = {
 			.name = qfv_swapchain_t;
@@ -108,8 +136,12 @@
 				string = pName;
 			};
 			module = {
-				type = (custom, QFString, parse_VkShaderModule);
-				fields = (module);
+				type = (single,	{
+									parse_type = QFString;
+									type = VkShaderModule;
+									parser = parse_VkShaderModule;
+								});
+				value = module;
 			};
 			specializationInfo = {
 				type = (single, VkSpecializationInfo);
diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c
index f515abd83..12c9a463b 100644
--- a/libs/video/renderer/vulkan/vulkan_vid_common.c
+++ b/libs/video/renderer/vulkan/vulkan_vid_common.c
@@ -403,46 +403,10 @@ void
 Vulkan_CreatePipelines (vulkan_ctx_t *ctx)
 {
 	plitem_t   *pipeline_def = qfv_load_pipeline ();
-	plitem_t   *item;
 
-	item = pipeline_def;
-	if (!item || !(item = PL_ObjectForKey (item, "modules"))) {
-		Sys_Printf ("error loading modules\n");
-	} else {
-		Sys_Printf ("Found modules def\n");
+	if (pipeline_def) {
+		QFV_ParseResources (ctx, pipeline_def);
 	}
-	for (int i = PL_A_NumObjects (item); i-- > 0; ) {
-		plitem_t   *mod = PL_ObjectAtIndex (item, i);
-		const char *name = PL_String (PL_ObjectForKey (mod, "name"));
-		const char *file = PL_String (PL_ObjectForKey (mod, "file"));
-		if (!name || !file) {
-			continue;
-		}
-		if (QFV_FindShaderModule (ctx, name)) {
-			continue;
-		}
-		VkShaderModule module = QFV_CreateShaderModule (ctx->device, file);
-		if (module) {
-			Sys_Printf ("registering shader %s %p\n", name, module);
-			QFV_RegisterShaderModule (ctx, name, module);
-		}
-	}
-
-	item = pipeline_def;
-	if (!item || !(item = PL_ObjectForKey (item, "setLayouts"))) {
-		Sys_Printf ("error loading setLayouts\n");
-	} else {
-		Sys_Printf ("Found setLayouts\n");
-		QFV_ParseDescriptorSetLayouts (ctx, item);
-	}
-
-	/*item = pipeline_def;
-	if (!item || !(item = PL_ObjectForKey (item, "pipelineLayouts"))) {
-		Sys_Printf ("error loading pipelineLayouts\n");
-	} else {
-		Sys_Printf ("Found pipelineLayouts\n");
-		QFV_ParsePipelineLayouts (ctx, item);
-	}*/
 }
 
 void

From 518befdaed3a8aad617baeca7b633cc3c493aa6b Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 5 Jan 2021 17:40:07 +0900
Subject: [PATCH 1254/1519] [util] FIx an "only" in a comment

---
 include/QF/hash.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/QF/hash.h b/include/QF/hash.h
index fde2eed97..f96682fd9 100644
--- a/include/QF/hash.h
+++ b/include/QF/hash.h
@@ -46,7 +46,7 @@ typedef struct hashlink_s hashlink_t;
 				inserting or finding the element. First parameter is a pointer
 				to the element from which to extract the key, the second is
 				the user data pointer.
-	\param f	a function to free the element. Only ever called from
+	\param f	a function to free the element. Called from only
 				Hash_FlushTable and Hash_DelTable. The first parameter is the
 				element to be freed and the second is the user data pointer.
 	\param ud	user data pointer. set to whatever you want, it will be passed

From 7c661e7cc51d51839e7c6e7451c93800831c7485 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 5 Jan 2021 17:43:26 +0900
Subject: [PATCH 1255/1519] [vulkan] Remove renderpass from generated code

The creation of a render pass seems to need special handling.
---
 include/vid_vulkan.h                        |  2 +-
 libs/video/renderer/vulkan/qfpipeline.plist | 77 ++++++++++++++++++++-
 libs/video/renderer/vulkan/vkparse.c        | 16 -----
 libs/video/renderer/vulkan/vkparse.plist    | 15 +---
 4 files changed, 78 insertions(+), 32 deletions(-)

diff --git a/include/vid_vulkan.h b/include/vid_vulkan.h
index 1741165ee..74a1ef51a 100644
--- a/include/vid_vulkan.h
+++ b/include/vid_vulkan.h
@@ -44,10 +44,10 @@ typedef struct vulkan_ctx_s {
 	VkSampleCountFlagBits msaaSamples;	// FIXME not here?
 	struct hashlink_s *hashlinks;	//FIXME want per thread
 	VkSurfaceKHR surface;	//FIXME surface = window, so "contains" swapchain
+	struct plitem_s  *pipelineDef;
 	struct hashtab_s *shaderModules;
 	struct hashtab_s *setLayouts;
 	struct hashtab_s *pipelineLayouts;
-	struct hashtab_s *renderPasses;
 
 	VkCommandPool cmdpool;
 	VkCommandBuffer cmdbuffer;
diff --git a/libs/video/renderer/vulkan/qfpipeline.plist b/libs/video/renderer/vulkan/qfpipeline.plist
index ed74f689a..198604466 100644
--- a/libs/video/renderer/vulkan/qfpipeline.plist
+++ b/libs/video/renderer/vulkan/qfpipeline.plist
@@ -39,6 +39,81 @@
 			);
 		};
 	};
+	pipelines = {
+		something = {
+			stages = (
+				{ stage = vertex; name = main; module = passthrough; },
+				{ stage = fragment; name = main; module = pushcolor; },
+			);
+			vertexInput = {
+				bindings = (
+					{
+						binding = 0;
+						stride = "4 * 4";
+						inputRate = vertex;
+					},
+				);
+				attributes = (
+					{
+						location = 0;
+						binding = 0;
+						format = r32g32b32a32_sfloat;
+						offset = 0;
+					},
+				);
+			};
+			inputAssembly = {
+				topology = triangle_list;
+				primitiveRestartEnable = 0;
+			};
+			viewport = {
+				viewports = (
+					{
+						x = 0; y = 0;
+						width = 640; height = 480;
+						minDepth = 0; maxDepth = 1000;
+					}
+				);
+				scissors = (
+					{
+						offset = { x = 0; y = 0 };
+						extent = { width = 640; height = 480; };
+					},
+				);
+			};
+			rasterization = {
+				depthClampEnable = 1;
+				rasterizerDiscardEnable = 0;
+				polygonMode = fill;
+				cullMode = back;
+				frontFace = counter_clockwise;
+				depthBiasEnable = 0;
+				lineWidth = 1;
+			};
+			multisample = {
+				rasterizationSamples = $msaaSamples;
+				sampleShadingEnable = 0;
+				minSampleShading = 0.5;
+				alphaToCoverageEnable = 0;
+				alphaToOneEnable = 0;
+			};
+			depthStencil = {
+				depthTestEnable = 1;
+				depthWriteEnable = 1;
+				depthCompareOp = less;
+				depthBoundsTestEnable = 0;
+				stencilTestEnable = 0;
+			};
+			colorBlend = {
+				logicOpEnable = 0;
+			};
+			dymamic = {
+				dymamicState = ( viewport, scissor );
+			};
+			layout = something;
+			renderPass = renderpass;
+		};
+	};
 	renderpass = {
 		attachments = (
 			{
@@ -108,5 +183,5 @@
 				dependencyFlags = 0;
 			}
 		);
-	}
+	};
 }
diff --git a/libs/video/renderer/vulkan/vkparse.c b/libs/video/renderer/vulkan/vkparse.c
index 418ef707d..08ab9acfb 100644
--- a/libs/video/renderer/vulkan/vkparse.c
+++ b/libs/video/renderer/vulkan/vkparse.c
@@ -435,19 +435,6 @@ pipelineLayout_free (void *hr, void *_ctx)
 	handleref_free (handleref, ctx);
 }
 
-static void
-renderPass_free (void *hr, void *_ctx)
-{
-	__auto_type handleref = (handleref_t *) hr;
-	__auto_type renderPass = (VkRenderPass) handleref->handle;
-	__auto_type ctx = (vulkan_ctx_t *) _ctx;
-	qfv_device_t *device = ctx->device;
-	qfv_devfuncs_t *dfunc = device->funcs;
-
-	dfunc->vkDestroyRenderPass (device->dev, renderPass, 0);
-	handleref_free (handleref, ctx);
-}
-
 static hashtab_t *enum_symtab;
 
 static int
@@ -574,9 +561,6 @@ QFV_ParseResources (vulkan_ctx_t *ctx, plitem_t *pipelinedef)
 		ctx->pipelineLayouts = Hash_NewTable (23, handleref_getkey,
 											  pipelineLayout_free,
 											  ctx, &exprctx.hashlinks);
-		ctx->renderPasses = Hash_NewTable (23, handleref_getkey,
-										   renderPass_free,
-										   ctx, &exprctx.hashlinks);
 	}
 
 	for (parseres_t *res = parse_resources; res->name; res++) {
diff --git a/libs/video/renderer/vulkan/vkparse.plist b/libs/video/renderer/vulkan/vkparse.plist
index 844b471f9..e270fb9be 100644
--- a/libs/video/renderer/vulkan/vkparse.plist
+++ b/libs/video/renderer/vulkan/vkparse.plist
@@ -31,11 +31,6 @@
 			class = "set layout";
 			create = vkCreateDescriptorSetLayout;
 		};
-		VkRenderPass = {
-			symtab = renderPasses;
-			class = "render pass";
-			create = vkCreateRenderPass;
-		};
 		VkPipelineLayout = {
 			symtab = pipelineLayouts;
 			class = "pipeline layout";
@@ -129,7 +124,7 @@
 			};
 		};
 		VkPipelineShaderStageCreateInfo = {
-			flags = auto;
+			//flags = auto; reserved for future use (Bits enum does not exist)
 			stage = auto;
 			name = {
 				type = string;
@@ -324,14 +319,6 @@
 								});
 				value = layout;
 			};
-			renderPass = {
-				type = (single,	{
-									parse_type = (QFDictionary, QFString);
-									type = VkRenderPass;
-									parser = parse_VkRenderPass;
-								});
-				value = renderPass;
-			};
 			basePipelineHandle = {
 				type = (custom, QFString, parse_BasePipeline);
 				fields = (basePipelineHandle);

From d22be09ae339ed7628283fccbed0f0c690b8a053 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 5 Jan 2021 17:45:02 +0900
Subject: [PATCH 1256/1519] [vulkan] Clean up pipeline def loading

---
 .../video/renderer/vulkan/vulkan_vid_common.c | 22 ++++++++-----------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c
index 12c9a463b..486e078e4 100644
--- a/libs/video/renderer/vulkan/vulkan_vid_common.c
+++ b/libs/video/renderer/vulkan/vulkan_vid_common.c
@@ -260,22 +260,23 @@ static qfv_pipelinestagepair_t imageLayoutTransitionStages[] = {
 		VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT },
 };
 
-static plitem_t *
-qfv_load_pipeline (void)
+static void
+qfv_load_pipeline (vulkan_ctx_t *ctx)
 {
-	static plitem_t *pipeline;
-
-	if (!pipeline) {
-		pipeline = PL_GetPropertyList (quakeforge_pipeline);
+	if (!ctx->pipelineDef) {
+		ctx->pipelineDef = PL_GetPropertyList (quakeforge_pipeline);
+		if (ctx->pipelineDef) {
+			QFV_ParseResources (ctx, ctx->pipelineDef);
+		}
 	}
-	return pipeline;
 }
 
 void
 Vulkan_CreateRenderPass (vulkan_ctx_t *ctx)
 {
-	plitem_t   *item = qfv_load_pipeline ();
+	qfv_load_pipeline (ctx);
 
+	plitem_t   *item = ctx->pipelineDef;
 	if (!item || !(item = PL_ObjectForKey (item, "renderpass"))) {
 		Sys_Printf ("error loading renderpass\n");
 	} else {
@@ -402,11 +403,6 @@ Vulkan_DestroyRenderPass (vulkan_ctx_t *ctx)
 void
 Vulkan_CreatePipelines (vulkan_ctx_t *ctx)
 {
-	plitem_t   *pipeline_def = qfv_load_pipeline ();
-
-	if (pipeline_def) {
-		QFV_ParseResources (ctx, pipeline_def);
-	}
 }
 
 void

From dc704a9384a23ecdc5f327eb161507dcf3825e52 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 5 Jan 2021 17:46:03 +0900
Subject: [PATCH 1257/1519] [vulkan] Update the validation layer request

It's now Kronos as LunarG has been deprecated (explains why I got no
help with some of my debugging).
---
 libs/video/renderer/vulkan/instance.c          | 2 +-
 libs/video/renderer/vulkan/vulkan_vid_common.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libs/video/renderer/vulkan/instance.c b/libs/video/renderer/vulkan/instance.c
index b228df2fe..617d792e8 100644
--- a/libs/video/renderer/vulkan/instance.c
+++ b/libs/video/renderer/vulkan/instance.c
@@ -59,7 +59,7 @@ static VkExtensionProperties *instanceExtensionProperties;
 static strset_t *instanceExtensions;
 
 const char * const vulkanValidationLayers[] = {
-	"VK_LAYER_LUNARG_standard_validation",
+	"VK_LAYER_KHRONOS_validation",
 	0,
 };
 
diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c
index 486e078e4..23d5ca4cc 100644
--- a/libs/video/renderer/vulkan/vulkan_vid_common.c
+++ b/libs/video/renderer/vulkan/vulkan_vid_common.c
@@ -112,8 +112,8 @@ Vulkan_Init_Cvars (void)
 {
 	vulkan_use_validation = Cvar_Get ("vulkan_use_validation", "1", CVAR_NONE,
 									  0,
-									  "enable LunarG Standard Validation "
-									  "Layer if available (requires instance "
+									  "enable KRONOS Validation Layer if "
+									  "available (requires instance "
 									  "restart).");
 	// FIXME implement fallback choices (instead of just fifo)
 	vulkan_presentation_mode = Cvar_Get ("vulkan_presentation_mode", "mailbox",

From 3cf8a336a81f627c21573deaa2a232b1c1b7fe29 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 5 Jan 2021 17:48:00 +0900
Subject: [PATCH 1258/1519] [vulkan] Clear out the resource tables on shutdown

This would take care of undestroyed resources if there wasn't a problem
with invalid memory use. Not sure what's going on just yet.
---
 libs/video/renderer/vulkan/vkparse.c           | 12 +++++++++---
 libs/video/renderer/vulkan/vulkan_vid_common.c | 13 +++++++++++++
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/libs/video/renderer/vulkan/vkparse.c b/libs/video/renderer/vulkan/vkparse.c
index 08ab9acfb..55192ad36 100644
--- a/libs/video/renderer/vulkan/vkparse.c
+++ b/libs/video/renderer/vulkan/vkparse.c
@@ -405,7 +405,9 @@ setLayout_free (void *hr, void *_ctx)
 	qfv_device_t *device = ctx->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
 
-	dfunc->vkDestroyDescriptorSetLayout (device->dev, layout, 0);
+	if (layout) {
+		dfunc->vkDestroyDescriptorSetLayout (device->dev, layout, 0);
+	}
 	handleref_free (handleref, ctx);
 }
 
@@ -418,7 +420,9 @@ shaderModule_free (void *hr, void *_ctx)
 	qfv_device_t *device = ctx->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
 
-	dfunc->vkDestroyShaderModule (device->dev, module, 0);
+	if (module) {
+		dfunc->vkDestroyShaderModule (device->dev, module, 0);
+	}
 	handleref_free (handleref, ctx);
 }
 
@@ -431,7 +435,9 @@ pipelineLayout_free (void *hr, void *_ctx)
 	qfv_device_t *device = ctx->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
 
-	dfunc->vkDestroyPipelineLayout (device->dev, layout, 0);
+	if (layout) {
+		dfunc->vkDestroyPipelineLayout (device->dev, layout, 0);
+	};
 	handleref_free (handleref, ctx);
 }
 
diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c
index 23d5ca4cc..fc0a97edf 100644
--- a/libs/video/renderer/vulkan/vulkan_vid_common.c
+++ b/libs/video/renderer/vulkan/vulkan_vid_common.c
@@ -43,6 +43,7 @@
 #include "QF/cmem.h"
 #include "QF/cvar.h"
 #include "QF/dstring.h"
+#include "QF/hash.h"
 #include "QF/input.h"
 #include "QF/mathlib.h"
 #include "QF/qargs.h"
@@ -144,6 +145,15 @@ Vulkan_Init_Common (vulkan_ctx_t *ctx)
 	ctx->instance = QFV_CreateInstance (ctx, PACKAGE_STRING, 0x000702ff, 0, instance_extensions);//FIXME version
 }
 
+static void
+clear_table (hashtab_t **table)
+{
+	if (*table) {
+		Hash_DelTable (*table);
+		*table = 0;
+	}
+}
+
 void
 Vulkan_Shutdown_Common (vulkan_ctx_t *ctx)
 {
@@ -156,6 +166,9 @@ Vulkan_Shutdown_Common (vulkan_ctx_t *ctx)
 	if (ctx->swapchain) {
 		QFV_DestroySwapchain (ctx->swapchain);
 	}
+	clear_table (&ctx->pipelineLayouts);
+	clear_table (&ctx->setLayouts);
+	clear_table (&ctx->shaderModules);
 	ctx->instance->funcs->vkDestroySurfaceKHR (ctx->instance->instance,
 											   ctx->surface, 0);
 	if (ctx->device) {

From 37b6d11c01d5a7aba766d28bd9185918c81be7dc Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 5 Jan 2021 18:24:18 +0900
Subject: [PATCH 1259/1519] [ruamoko] Add binding for str_upper

I can't believe I didn't do that when I did str_lower.
---
 libs/ruamoko/rua_string.c | 17 +++++++++++++++++
 ruamoko/include/string.h  |  1 +
 ruamoko/lib/string.r      |  1 +
 3 files changed, 19 insertions(+)

diff --git a/libs/ruamoko/rua_string.c b/libs/ruamoko/rua_string.c
index 31b717273..754d1627e 100644
--- a/libs/ruamoko/rua_string.c
+++ b/libs/ruamoko/rua_string.c
@@ -265,6 +265,22 @@ bi_str_lower (progs_t *pr)
 	RETURN_STRING (pr, lower);
 }
 
+static void
+bi_str_upper (progs_t *pr)
+{
+	const char *str = P_GSTRING (pr, 0);
+	char       *upper = alloca (strlen (str) + 1);
+	char       *l = upper;
+	byte        c;
+
+	while ((c = *str++)) {
+		*l++ = toupper (c);
+	}
+	*l++ = 0;
+
+	RETURN_STRING (pr, upper);
+}
+
 static builtin_t builtins[] = {
 	{"strlen",		bi_strlen,		-1},
 	{"sprintf",		bi_sprintf,		-1},
@@ -283,6 +299,7 @@ static builtin_t builtins[] = {
 	{"str_char",	bi_str_char,	-1},
 	{"str_quote",	bi_str_quote,	-1},
 	{"str_lower",	bi_str_lower,	-1},
+	{"str_upper",	bi_str_upper,	-1},
 	{0}
 };
 
diff --git a/ruamoko/include/string.h b/ruamoko/include/string.h
index 8087ef67e..3d978cfd5 100644
--- a/ruamoko/include/string.h
+++ b/ruamoko/include/string.h
@@ -18,5 +18,6 @@ int str_str (string haystack, string needle);
 @extern int str_char (string str, int ind);
 string str_quote (string str);
 string str_lower (string str);
+string str_upper (string str);
 
 #endif//__ruamoko_string_h
diff --git a/ruamoko/lib/string.r b/ruamoko/lib/string.r
index 3858ef7d6..5169296a0 100644
--- a/ruamoko/lib/string.r
+++ b/ruamoko/lib/string.r
@@ -17,3 +17,4 @@ int str_str (string haystack, string needle) = #0;
 int str_char (string str, int ind) = #0;
 string str_quote (string str) = #0;
 string str_lower (string str) = #0;
+string str_upper (string str) = #0;

From d8b389d2b61cc58870e0e94d9bf088d46080a049 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 5 Jan 2021 18:26:01 +0900
Subject: [PATCH 1260/1519] [vulkan] Initialize sType in parsed structures

This fixes a lot of validation issues, but still some fun with
uninitialized memory and bad accesses.
---
 libs/video/renderer/vulkan/vkgen/vkstruct.r | 30 +++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/libs/video/renderer/vulkan/vkgen/vkstruct.r b/libs/video/renderer/vulkan/vkgen/vkstruct.r
index 6d5c2cfc2..108af71ef 100644
--- a/libs/video/renderer/vulkan/vkgen/vkstruct.r
+++ b/libs/video/renderer/vulkan/vkgen/vkstruct.r
@@ -47,11 +47,31 @@
 	return nil;
 }
 
+-(string)sTypeName
+{
+	string s = "VK_STRUCTURE_TYPE";
+	string      name = str_hold ([self outname]);
+	int         length = strlen (name);
+	int         start, end, c;
+	for (start = 2; start < length; start = end) {
+		for (end = start + 1; end < length; end++) {
+			c = str_char (name, end);
+			if (c >= 'A' && c <= 'Z') {
+				break;
+			}
+		}
+		s += "_" + str_mid (name, start, end);
+	}
+	str_free (name);
+	return str_upper (s);
+}
+
 -(void) writeTable
 {
 	PLItem     *field_dict = [parse getObjectForKey:[self name]];
 	PLItem     *new_name = [field_dict getObjectForKey:".name"];
 	Array      *field_defs = [Array array];
+	int         have_sType = 0;
 
 	if ([parse string] == "skip") {
 		return;
@@ -60,6 +80,12 @@
 		outname = str_hold ([new_name string]);
 	}
 
+	for (int i = 0; i < type.strct.num_fields; i++) {
+		qfot_var_t *field = &type.strct.fields[i];
+		if (field.name == "sType") {
+			have_sType = 1;
+		}
+	}
 	if (field_dict) {
 		PLItem     *field_keys = [field_dict allKeys];
 
@@ -108,6 +134,10 @@
 			 " void *context)\n",
 			 [self outname]);
 	fprintf (output_file, "{\n");
+	if (have_sType) {
+		fprintf (output_file, "\t((%s *) data)->sType", [self outname]);
+		fprintf (output_file, " = %s;\n", [self sTypeName]);
+	}
 	fprintf (output_file,
 			 "\treturn PL_ParseStruct (%s_fields, item, data, messages,"
 			 " context);\n",

From a45f8f98b6e001dd068c1c42c8d714c128437061 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 5 Jan 2021 19:55:17 +0900
Subject: [PATCH 1261/1519] [util] Make exprctx hashlinks double pointer

The way I wound up using the field meant that exprctx should not "own"
the hashlinks chain, but rather just point to it. This fixes the nasty
access errors I had.
---
 include/QF/cexpr.h                             |  2 +-
 libs/util/cexpr-vars.c                         |  2 +-
 libs/video/renderer/vulkan/vkparse.c           | 17 ++++++++---------
 libs/video/renderer/vulkan/vkparse.h           |  2 +-
 libs/video/renderer/vulkan/vulkan_vid_common.c |  9 +++++----
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/include/QF/cexpr.h b/include/QF/cexpr.h
index 77e5b0463..ac6eef683 100644
--- a/include/QF/cexpr.h
+++ b/include/QF/cexpr.h
@@ -94,7 +94,7 @@ typedef struct exprctx_s {
 	struct memsuper_s *memsuper;
 	const struct plitem_s *item;
 	struct plitem_s *messages;
-	struct hashlink_s *hashlinks;
+	struct hashlink_s **hashlinks;
 	int         errors;
 } exprctx_t;
 
diff --git a/libs/util/cexpr-vars.c b/libs/util/cexpr-vars.c
index 6ec8ce3d9..115f0ba64 100644
--- a/libs/util/cexpr-vars.c
+++ b/libs/util/cexpr-vars.c
@@ -128,7 +128,7 @@ void cexpr_init_symtab (exprtab_t *symtab, exprctx_t *ctx)
 {
 	exprsym_t  *sym;
 
-	symtab->tab = Hash_NewTable (61, expr_getkey, 0, 0, &ctx->hashlinks);
+	symtab->tab = Hash_NewTable (61, expr_getkey, 0, 0, ctx->hashlinks);
 	for (sym = symtab->symbols; sym->name; sym++) {
 		Hash_Add (symtab->tab, sym);
 	}
diff --git a/libs/video/renderer/vulkan/vkparse.c b/libs/video/renderer/vulkan/vkparse.c
index 55192ad36..394a402d9 100644
--- a/libs/video/renderer/vulkan/vkparse.c
+++ b/libs/video/renderer/vulkan/vkparse.c
@@ -513,7 +513,7 @@ QFV_ParseRenderPass (vulkan_ctx_t *ctx, plitem_t *plist)
 	exprctx.external_variables = &vars_tab;
 	exprctx.memsuper = new_memsuper ();
 	exprctx.messages = messages;
-	exprctx.hashlinks = ctx->hashlinks;
+	exprctx.hashlinks = &ctx->hashlinks;
 
 	cexpr_init_symtab (&vars_tab, &exprctx);
 
@@ -526,7 +526,6 @@ QFV_ParseRenderPass (vulkan_ctx_t *ctx, plitem_t *plist)
 	}
 	PL_Free (messages);
 	delete_memsuper (exprctx.memsuper);
-	ctx->hashlinks = exprctx.hashlinks;
 
 	renderpass = QFV_CreateRenderPass (device,
 									   renderpass_data.attachments,
@@ -556,17 +555,17 @@ QFV_ParseResources (vulkan_ctx_t *ctx, plitem_t *pipelinedef)
 
 	exprctx.memsuper = new_memsuper ();
 	exprctx.messages = messages;
-	exprctx.hashlinks = ctx->hashlinks;
+	exprctx.hashlinks = &ctx->hashlinks;
 
 	if (!ctx->setLayouts) {
 		ctx->shaderModules = Hash_NewTable (23, handleref_getkey,
 											shaderModule_free,
-											ctx, &exprctx.hashlinks);
+											ctx, &ctx->hashlinks);
 		ctx->setLayouts = Hash_NewTable (23, handleref_getkey, setLayout_free,
-										 ctx, &exprctx.hashlinks);
+										 ctx, &ctx->hashlinks);
 		ctx->pipelineLayouts = Hash_NewTable (23, handleref_getkey,
 											  pipelineLayout_free,
-											  ctx, &exprctx.hashlinks);
+											  ctx, &ctx->hashlinks);
 	}
 
 	for (parseres_t *res = parse_resources; res->name; res++) {
@@ -586,7 +585,6 @@ QFV_ParseResources (vulkan_ctx_t *ctx, plitem_t *pipelinedef)
 
 	PL_Free (messages);
 	delete_memsuper (exprctx.memsuper);
-	ctx->hashlinks = exprctx.hashlinks;
 }
 
 static const char *
@@ -597,11 +595,12 @@ enum_symtab_getkey (const void *e, void *unused)
 }
 
 void
-QFV_InitParse (void)
+QFV_InitParse (vulkan_ctx_t *ctx)
 {
 	exprctx_t   context = {};
 	enum_symtab = Hash_NewTable (61, enum_symtab_getkey, 0, 0,
-								 &context.hashlinks);
+								 &ctx->hashlinks);
+	context.hashlinks = &ctx->hashlinks;
 	vkgen_init_symtabs (&context);
 }
 
diff --git a/libs/video/renderer/vulkan/vkparse.h b/libs/video/renderer/vulkan/vkparse.h
index e63bb44e2..e4fe36774 100644
--- a/libs/video/renderer/vulkan/vkparse.h
+++ b/libs/video/renderer/vulkan/vkparse.h
@@ -25,7 +25,7 @@ typedef struct handleref_s {
 
 VkRenderPass QFV_ParseRenderPass (vulkan_ctx_t *ctx, plitem_t *plist);
 void QFV_ParseResources (vulkan_ctx_t *ctx, plitem_t *plist);
-void QFV_InitParse (void);
+void QFV_InitParse (vulkan_ctx_t *ctx);
 exprenum_t *QFV_GetEnum (const char *name);
 
 #endif//__vkparse_h
diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c
index fc0a97edf..af24c78eb 100644
--- a/libs/video/renderer/vulkan/vulkan_vid_common.c
+++ b/libs/video/renderer/vulkan/vulkan_vid_common.c
@@ -140,7 +140,7 @@ void
 Vulkan_Init_Common (vulkan_ctx_t *ctx)
 {
 	Sys_Printf ("Vulkan_Init_Common\n");
-	QFV_InitParse ();
+	QFV_InitParse (ctx);
 	Vulkan_Init_Cvars ();
 	ctx->instance = QFV_CreateInstance (ctx, PACKAGE_STRING, 0x000702ff, 0, instance_extensions);//FIXME version
 }
@@ -149,8 +149,9 @@ static void
 clear_table (hashtab_t **table)
 {
 	if (*table) {
-		Hash_DelTable (*table);
+		hashtab_t  *tab = *table;
 		*table = 0;
+		Hash_DelTable (tab);
 	}
 }
 
@@ -166,11 +167,11 @@ Vulkan_Shutdown_Common (vulkan_ctx_t *ctx)
 	if (ctx->swapchain) {
 		QFV_DestroySwapchain (ctx->swapchain);
 	}
+	ctx->instance->funcs->vkDestroySurfaceKHR (ctx->instance->instance,
+											   ctx->surface, 0);
 	clear_table (&ctx->pipelineLayouts);
 	clear_table (&ctx->setLayouts);
 	clear_table (&ctx->shaderModules);
-	ctx->instance->funcs->vkDestroySurfaceKHR (ctx->instance->instance,
-											   ctx->surface, 0);
 	if (ctx->device) {
 		QFV_DestroyDevice (ctx->device);
 	}

From b493e6ac324c7414f2fc8a902565f7da88214d7a Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 5 Jan 2021 23:39:52 +0900
Subject: [PATCH 1262/1519] [util] Expose plist type check support functions

---
 include/QF/qfplist.h |  5 +++++
 libs/util/qfplist.c  | 24 ++++++++++++------------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/include/QF/qfplist.h b/include/QF/qfplist.h
index 20c7671bb..3f22a9e16 100644
--- a/include/QF/qfplist.h
+++ b/include/QF/qfplist.h
@@ -310,6 +310,11 @@ plitem_t *PL_NewString (const char *str);
 */
 void PL_Free (plitem_t *item);
 
+int PL_CheckType (pltype_t field_type, pltype_t item_type);
+void PL_TypeMismatch (plitem_t *messages, const plitem_t *item,
+					  const char *name, pltype_t field_type,
+					  pltype_t item_type);
+
 /**	Parse a dictionary object into a structure.
 
 	For each key in the dictionary, the corresponding field item is used to
diff --git a/libs/util/qfplist.c b/libs/util/qfplist.c
index c3fc5a756..273148657 100644
--- a/libs/util/qfplist.c
+++ b/libs/util/qfplist.c
@@ -1147,8 +1147,8 @@ pl_default_parser (const plfield_t *field, const plitem_t *item, void *data,
 	return 0;
 }
 
-static int
-types_match (pltype_t field_type, pltype_t item_type)
+VISIBLE int
+PL_CheckType (pltype_t field_type, pltype_t item_type)
 {
 	if (field_type & QFMultiType) {
 		// field_type is a mask of allowed types
@@ -1159,9 +1159,9 @@ types_match (pltype_t field_type, pltype_t item_type)
 	}
 }
 
-static void
-type_mismatch (plitem_t *messages, const plitem_t *item, const char *name,
-			   pltype_t field_type, pltype_t item_type)
+VISIBLE void
+PL_TypeMismatch (plitem_t *messages, const plitem_t *item, const char *name,
+				 pltype_t field_type, pltype_t item_type)
 {
 	const int num_types = sizeof (pl_types) / sizeof (pl_types[0]);
 	if (field_type & QFMultiType) {
@@ -1213,9 +1213,9 @@ PL_ParseStruct (const plfield_t *fields, const plitem_t *dict, void *data,
 				} else {
 					parser = pl_default_parser;
 				}
-				if (!types_match (f->type, item->type)) {
-					type_mismatch (messages, item, current->key,
-								   f->type, item->type);
+				if (!PL_CheckType (f->type, item->type)) {
+					PL_TypeMismatch (messages, item, current->key,
+									 f->type, item->type);
 					result = 0;
 				} else {
 					if (!parser (f, item, flddata, messages, context)) {
@@ -1268,11 +1268,11 @@ PL_ParseArray (const plfield_t *field, const plitem_t *array, void *data,
 		plitem_t   *item = plarray->values[i];
 		void       *eledata = &arr->a[i * element->stride];
 
-		if (!types_match (element->type, item->type)) {
+		if (!PL_CheckType (element->type, item->type)) {
 			char        index[16];
 			snprintf (index, sizeof(index) - 1, "%d", i);
 			index[15] = 0;
-			type_mismatch (messages, item, index, element->type, item->type);
+			PL_TypeMismatch (messages, item, index, element->type, item->type);
 			result = 0;
 		} else {
 			if (!parser (&f, item, eledata, messages, context)) {
@@ -1320,8 +1320,8 @@ PL_ParseSymtab (const plfield_t *field, const plitem_t *dict, void *data,
 		const char *key = current->key;
 		plitem_t   *item = current->value;
 
-		if (!types_match (element->type, item->type)) {
-			type_mismatch (messages, item, key, element->type, item->type);
+		if (!PL_CheckType (element->type, item->type)) {
+			PL_TypeMismatch (messages, item, key, element->type, item->type);
 			result = 0;
 			continue;
 		}

From 0da99bc59ce90e1a9e59f0325151c037a3e43f43 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 5 Jan 2021 23:41:13 +0900
Subject: [PATCH 1263/1519] [util] Add promotion from float to int to cexpr

I won't go the other way nor will I add double to float.
---
 libs/util/cexpr-type.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/libs/util/cexpr-type.c b/libs/util/cexpr-type.c
index 6b02be01d..f400803cb 100644
--- a/libs/util/cexpr-type.c
+++ b/libs/util/cexpr-type.c
@@ -264,6 +264,13 @@ float_div_quat (const exprval_t *val1, const exprval_t *val2,
 	*c = a * qconjf (b) / dotf (b, b);
 }
 
+static void
+float_cast_int (const exprval_t *val1, const exprval_t *src, exprval_t *result,
+			    exprctx_t *ctx)
+{
+	*(float *) result->value = *(int *) src->value;
+}
+
 UNOP(float, pos, float, +)
 UNOP(float, neg, float, -)
 UNOP(float, tnot, float, !)
@@ -278,6 +285,7 @@ binop_t float_binops[] = {
 	{ '/', &cexpr_quaternion, &cexpr_quaternion, float_div_quat },
 	{ '%', &cexpr_float, &cexpr_float, float_rem },
 	{ MOD, &cexpr_float, &cexpr_float, float_mod },
+	{ '=', &cexpr_int,  &cexpr_float, float_cast_int },
 	{}
 };
 

From 5eb1afdcb363c6dd5d47c396bee031bdfc372a33 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 5 Jan 2021 23:42:30 +0900
Subject: [PATCH 1264/1519] [vulkan] Implement pipeline creation

The prototypes for handle parsers needed to be changes because it turned
out "single" was inappropriate for handles as "single" allocates memory
for the parsed object, but handles must be written directly.
---
 include/vid_vulkan.h                          |   1 +
 libs/video/renderer/vulkan/qfpipeline.plist   | 152 +++++++-------
 .../renderer/vulkan/vkgen/vkfieldcustom.r     |   3 +-
 .../video/renderer/vulkan/vkgen/vkfieldtype.h |   2 +
 .../video/renderer/vulkan/vkgen/vkfieldtype.r |  33 +--
 libs/video/renderer/vulkan/vkgen/vkhandle.r   |  15 +-
 libs/video/renderer/vulkan/vkparse.c          | 188 ++++++++++++------
 libs/video/renderer/vulkan/vkparse.h          |  14 +-
 libs/video/renderer/vulkan/vkparse.plist      |  19 +-
 .../video/renderer/vulkan/vulkan_vid_common.c |   9 +
 10 files changed, 256 insertions(+), 180 deletions(-)

diff --git a/include/vid_vulkan.h b/include/vid_vulkan.h
index 74a1ef51a..d34e067fe 100644
--- a/include/vid_vulkan.h
+++ b/include/vid_vulkan.h
@@ -53,6 +53,7 @@ typedef struct vulkan_ctx_s {
 	VkCommandBuffer cmdbuffer;
 	VkFence     fence;			// for ctx->cmdbuffer only
 	vulkan_renderpass_t renderpass;
+	VkPipeline  pipeline;
 	size_t      curFrame;
 	vulkan_framebufferset_t framebuffers;
 
diff --git a/libs/video/renderer/vulkan/qfpipeline.plist b/libs/video/renderer/vulkan/qfpipeline.plist
index 198604466..1f9c6de46 100644
--- a/libs/video/renderer/vulkan/qfpipeline.plist
+++ b/libs/video/renderer/vulkan/qfpipeline.plist
@@ -39,80 +39,88 @@
 			);
 		};
 	};
-	pipelines = {
-		something = {
-			stages = (
-				{ stage = vertex; name = main; module = passthrough; },
-				{ stage = fragment; name = main; module = pushcolor; },
+	pipeline = {
+		stages = (
+			{ stage = vertex; name = main; module = passthrough; },
+			{ stage = fragment; name = main; module = pushcolor; },
+		);
+		vertexInput = {
+			bindings = (
+				{
+					binding = 0;
+					stride = "4 * 4";
+					inputRate = vertex;
+				},
+			);
+			attributes = (
+				{
+					location = 0;
+					binding = 0;
+					format = r32g32b32a32_sfloat;
+					offset = 0;
+				},
 			);
-			vertexInput = {
-				bindings = (
-					{
-						binding = 0;
-						stride = "4 * 4";
-						inputRate = vertex;
-					},
-				);
-				attributes = (
-					{
-						location = 0;
-						binding = 0;
-						format = r32g32b32a32_sfloat;
-						offset = 0;
-					},
-				);
-			};
-			inputAssembly = {
-				topology = triangle_list;
-				primitiveRestartEnable = 0;
-			};
-			viewport = {
-				viewports = (
-					{
-						x = 0; y = 0;
-						width = 640; height = 480;
-						minDepth = 0; maxDepth = 1000;
-					}
-				);
-				scissors = (
-					{
-						offset = { x = 0; y = 0 };
-						extent = { width = 640; height = 480; };
-					},
-				);
-			};
-			rasterization = {
-				depthClampEnable = 1;
-				rasterizerDiscardEnable = 0;
-				polygonMode = fill;
-				cullMode = back;
-				frontFace = counter_clockwise;
-				depthBiasEnable = 0;
-				lineWidth = 1;
-			};
-			multisample = {
-				rasterizationSamples = $msaaSamples;
-				sampleShadingEnable = 0;
-				minSampleShading = 0.5;
-				alphaToCoverageEnable = 0;
-				alphaToOneEnable = 0;
-			};
-			depthStencil = {
-				depthTestEnable = 1;
-				depthWriteEnable = 1;
-				depthCompareOp = less;
-				depthBoundsTestEnable = 0;
-				stencilTestEnable = 0;
-			};
-			colorBlend = {
-				logicOpEnable = 0;
-			};
-			dymamic = {
-				dymamicState = ( viewport, scissor );
-			};
-			layout = something;
-			renderPass = renderpass;
 		};
+		inputAssembly = {
+			topology = triangle_list;
+			primitiveRestartEnable = 0;
+		};
+		viewport = {
+			viewports = (
+				{
+					x = 0; y = 0;
+					width = 640; height = 480;
+					minDepth = 0; maxDepth = 1;
+				}
+			);
+			scissors = (
+				{
+					offset = { x = 0; y = 0 };
+					extent = { width = 640; height = 480; };
+				},
+			);
+		};
+		rasterization = {
+			depthClampEnable = 0;
+			rasterizerDiscardEnable = 0;
+			polygonMode = fill;
+			cullMode = back;
+			frontFace = counter_clockwise;
+			depthBiasEnable = 0;
+			lineWidth = 1;
+		};
+		multisample = {
+			rasterizationSamples = $msaaSamples;
+			sampleShadingEnable = 0;
+			minSampleShading = 0.5f;
+			alphaToCoverageEnable = 0;
+			alphaToOneEnable = 0;
+		};
+		depthStencil = {
+			depthTestEnable = 1;
+			depthWriteEnable = 1;
+			depthCompareOp = less;
+			depthBoundsTestEnable = 0;
+			stencilTestEnable = 0;
+		};
+		colorBlend = {
+			logicOpEnable = 0;
+			attachments = ({
+				blendEnable = 0;
+				srcColorBlendFactor = src_color;
+				dstColorBlendFactor = zero;
+				colorBlendOp = add;
+				srcAlphaBlendFactor = src_alpha;
+				dstAlphaBlendFactor = zero;
+				alphaBlendOp = add;
+				colorWriteMask = r|g|b|a;
+			});
+		};
+		dynamic = {
+			dynamicState = ( viewport, scissor );
+		};
+		layout = something;
+		//renderPass = renderpass;
 	};
 	renderpass = {
 		attachments = (
diff --git a/libs/video/renderer/vulkan/vkgen/vkfieldcustom.r b/libs/video/renderer/vulkan/vkgen/vkfieldcustom.r
index 7c7843414..611cd7a9b 100644
--- a/libs/video/renderer/vulkan/vkgen/vkfieldcustom.r
+++ b/libs/video/renderer/vulkan/vkgen/vkfieldcustom.r
@@ -2,6 +2,7 @@
 #include <string.h>
 
 #include "vkfieldcustom.h"
+#include "vkfieldtype.h"
 #include "vkgen.h"
 #include "vktype.h"
 
@@ -15,7 +16,7 @@
 	}
 
 	PLItem     *desc = [item getObjectForKey:"type"];
-	pltype = str_hold ([[desc getObjectAtIndex:1] string]);
+	pltype = str_hold (parseItemType ([desc getObjectAtIndex:1]));
 	parser = str_hold ([[desc getObjectAtIndex:2] string]);
 
 	fields = [item getObjectForKey:"fields"];
diff --git a/libs/video/renderer/vulkan/vkgen/vkfieldtype.h b/libs/video/renderer/vulkan/vkgen/vkfieldtype.h
index fa27c7d8e..8e5d26bf8 100644
--- a/libs/video/renderer/vulkan/vkgen/vkfieldtype.h
+++ b/libs/video/renderer/vulkan/vkgen/vkfieldtype.h
@@ -17,4 +17,6 @@
 -(string)parseType;
 @end
 
+string parseItemType (PLItem *item);
+
 #endif//__renderer_vulkan_vkgen_vkfieldtype_h
diff --git a/libs/video/renderer/vulkan/vkgen/vkfieldtype.r b/libs/video/renderer/vulkan/vkgen/vkfieldtype.r
index cb1a04508..5f9429a20 100644
--- a/libs/video/renderer/vulkan/vkgen/vkfieldtype.r
+++ b/libs/video/renderer/vulkan/vkgen/vkfieldtype.r
@@ -5,6 +5,21 @@
 #include "vkgen.h"
 #include "vktype.h"
 
+string
+parseItemType (PLItem *item)
+{
+	string      str = [item string];
+	if (str) {
+		return str;
+	}
+	string      mask = "QFMultiType";
+	for (int i = [item count]; i-- > 0; ) {
+		str = [[item getObjectAtIndex:i] string];
+		mask = mask + " | (1 << " + str + ")";
+	}
+	return mask;
+}
+
 @implementation FieldType
 
 +fieldType:(PLItem *)item
@@ -19,21 +34,6 @@
 	str_free (parse_type);
 }
 
-static string
-parseItemType (PLItem *item)
-{
-	string      str = [item string];
-	if (str) {
-		return str;
-	}
-	string      mask = "QFMultiType";
-	for (int i = [item count]; i-- > 0; ) {
-		str = [[item getObjectAtIndex:i] string];
-		mask = mask + " | (1 << " + str + ")";
-	}
-	return str_hold (mask);
-}
-
 -initWithItem:(PLItem *)item
 {
 	if (!(self = [super init])) {
@@ -47,7 +47,8 @@ parseItemType (PLItem *item)
 		parse_type = [field_type parseType];
 		parser = str_hold ("parse_" + type);
 	} else {
-		parse_type = parseItemType([item getObjectForKey:"parse_type"]);
+		PLItem *typeItem = [item getObjectForKey:"parse_type"];
+		parse_type = str_hold (parseItemType(typeItem));
 		type = str_hold ([[item getObjectForKey:"type"] string]);
 		parser = str_hold ([[item getObjectForKey:"parser"] string]);
 	}
diff --git a/libs/video/renderer/vulkan/vkgen/vkhandle.r b/libs/video/renderer/vulkan/vkgen/vkhandle.r
index da4a4fbcc..b76d99af4 100644
--- a/libs/video/renderer/vulkan/vkgen/vkhandle.r
+++ b/libs/video/renderer/vulkan/vkgen/vkhandle.r
@@ -12,10 +12,10 @@ output_handle (string name, PLItem *handle)
 	string create = str_hold ([[handle getObjectForKey:"create"] string]);
 	string custom = str_hold ([[handle getObjectForKey:"custom"] string]);
 	if (!custom) {
-		fprintf (output_file, "static int parse_%s (const plfield_t *field, const plitem_t *item, void *data, plitem_t *messages, void *context)\n", name);
+		fprintf (output_file, "static int parse_%s (const plitem_t *item, void **data, plitem_t *messages, parsectx_t *context)\n", name);
 		fprintf (output_file, "{\n");
-		fprintf (output_file, "\t__auto_type handle = (%s *) data;\n", name);
-		fprintf (output_file, "\tvulkan_ctx_t *ctx = ((parsectx_t *) context)->vctx;\n");
+		fprintf (output_file, "\t__auto_type handle = (%s *) data[0];\n", name);
+		fprintf (output_file, "\tvulkan_ctx_t *ctx = context->vctx;\n");
 		fprintf (output_file, "\tqfv_device_t *device = ctx->device;\n");
 		fprintf (output_file, "\tqfv_devfuncs_t *dfunc = device->funcs;\n");
 		fprintf (output_file, "\tif (PL_Type (item) == QFString) {\n");
@@ -47,15 +47,18 @@ output_handle (string name, PLItem *handle)
 	fprintf (output_file, "int parse_%s_handleref (const plfield_t *field, const plitem_t *item, void *data, plitem_t *messages, void *context)\n", name);
 	fprintf (output_file, "{\n");
 	fprintf (output_file, "\thandleref_t *handleref = data;\n");
+	fprintf (output_file, "\tvoid *hrdata[] = { &handleref->handle };\n");
 	fprintf (output_file, "\thandleref->name = strdup (field->name);\n");
 	if (custom) {
-		fprintf (output_file, "\treturn %s (field, item, &handleref->handle, messages, context);\n", custom);
+		fprintf (output_file, "\treturn %s (item, hrdata, messages, context);\n", custom);
 	} else {
-		fprintf (output_file, "\treturn parse_%s (field, item, &handleref->handle, messages, context);\n", name);
+		fprintf (output_file, "\treturn parse_%s (item, hrdata, messages, context);\n", name);
 	}
 	fprintf (output_file, "}\n");
 
-	fprintf (header_file, "static int parse_%s (const plfield_t *field, const plitem_t *item, void *data, plitem_t *messages, void *context);\n", name);
+	if (!custom) {
+		fprintf (header_file, "static int parse_%s (const plitem_t *item, void **data, plitem_t *messages, parsectx_t *context);\n", name);
+	}
 	fprintf (header_file, "int parse_%s_handleref (const plfield_t *field, const plitem_t *item, void *data, plitem_t *messages, void *context);\n", name);
 	str_free (custom);
 	str_free (symtab);
diff --git a/libs/video/renderer/vulkan/vkparse.c b/libs/video/renderer/vulkan/vkparse.c
index 394a402d9..45236c7ff 100644
--- a/libs/video/renderer/vulkan/vkparse.c
+++ b/libs/video/renderer/vulkan/vkparse.c
@@ -58,6 +58,7 @@
 #include "QF/Vulkan/command.h"
 #include "QF/Vulkan/instance.h"
 #include "QF/Vulkan/image.h"
+#include "QF/Vulkan/pipeline.h"
 #include "QF/Vulkan/renderpass.h"
 #include "QF/Vulkan/shader.h"
 #include "QF/Vulkan/swapchain.h"
@@ -159,6 +160,10 @@ parse_basic (const plfield_t *field, const plitem_t *item,
 		*(uint32_t *) data = VK_SUBPASS_EXTERNAL;
 	} else {
 		ret = !cexpr_eval_string (valstr, &ectx);
+		if (!ret) {
+			PL_Message (messages, item, "error parsing %s: %s",
+						field->name, valstr);
+		}
 	}
 	//Sys_Printf ("    %x\n", *(uint32_t *)data);
 
@@ -224,8 +229,9 @@ parse_single (const plfield_t *field, const plitem_t *item,
 	//Sys_Printf ("parse_single: %s %zd %d %p %p\n", field->name, field->offset,
 	//			field->type, field->parser, field->data);
 
-	if (PL_Type (item) != single->type) {
-		PL_Message (messages, item, "error: wrong type");
+	if (!PL_CheckType (single->type, PL_Type (item))) {
+		PL_TypeMismatch (messages, item, field->name, single->type,
+						 PL_Type (item));
 		return 0;
 	}
 
@@ -309,13 +315,13 @@ parse_string (const plfield_t *field, const plitem_t *item,
 	__auto_type string = (parse_string_t *) field->data;
 	__auto_type value = (char **) ((byte *)data + string->value_offset);
 
-	const char *str = PL_BinaryData (item);
+	const char *str = PL_String (item);
 
-	Sys_Printf ("parse_string: %s %zd %d %p %p %p\n",
-				field->name, field->offset, field->type, field->parser,
-				field->data, data);
-	Sys_Printf ("    %zd\n", string->value_offset);
-	Sys_Printf ("    %s\n", str);
+	//Sys_Printf ("parse_string: %s %zd %d %p %p %p\n",
+	//			field->name, field->offset, field->type, field->parser,
+	//			field->data, data);
+	//Sys_Printf ("    %zd\n", string->value_offset);
+	//Sys_Printf ("    %s\n", str);
 
 	*value = strdup (str);
 	return 1;
@@ -350,11 +356,11 @@ parse_RGBA (const plitem_t *item, void **data,
 }
 
 static int
-parse_VkShaderModule (const plfield_t *field, const plitem_t *item, void *data,
-					  plitem_t *messages, void *context)
+parse_VkShaderModule (const plitem_t *item, void **data,
+					  plitem_t *messages, parsectx_t *context)
 {
-	__auto_type handle = (VkShaderModule *) data;
-	vulkan_ctx_t *ctx = ((parsectx_t *) context)->vctx;
+	__auto_type handle = (VkShaderModule *) data[0];
+	vulkan_ctx_t *ctx = context->vctx;
 
 	const char *name = PL_String (item);
 	handleref_t *hr = Hash_Find (ctx->shaderModules, name);
@@ -367,10 +373,10 @@ parse_VkShaderModule (const plfield_t *field, const plitem_t *item, void *data,
 }
 
 static int
-parse_VkShaderModule_resource (const plfield_t *field, const plitem_t *item,
-							   void *data, plitem_t *messages, void *context)
+parse_VkShaderModule_resource (const plitem_t *item, void **data,
+							   plitem_t *messages, parsectx_t *context)
 {
-	__auto_type handle = (VkShaderModule *) data;
+	__auto_type handle = (VkShaderModule *) data[0];
 	vulkan_ctx_t *ctx = ((parsectx_t *) context)->vctx;
 	qfv_device_t *device = ctx->device;
 
@@ -382,6 +388,15 @@ parse_VkShaderModule_resource (const plfield_t *field, const plitem_t *item,
 	return 1;
 }
 
+static int
+parse_VkDescriptorSetLayout_array (const plfield_t *field,
+								   const plitem_t *item, void *data,
+								   plitem_t *messages, void *context)
+{
+	void *layout[] = { data };
+	return parse_VkDescriptorSetLayout (item, layout, messages, context);
+}
+
 static const char *
 handleref_getkey (const void *hr, void *unused)
 {
@@ -494,57 +509,6 @@ static plfield_t renderpass_fields[] = {
 	{}
 };
 
-VkRenderPass
-QFV_ParseRenderPass (vulkan_ctx_t *ctx, plitem_t *plist)
-{
-	qfv_device_t *device = ctx->device;
-	qfv_renderpass_t renderpass_data = {};
-	plitem_t   *messages = PL_NewArray ();
-	VkRenderPass renderpass;
-	exprsym_t   var_syms[] = {
-		{"swapchain", &qfv_swapchain_t_type, ctx->swapchain},
-		{"msaaSamples", &VkSampleCountFlagBits_type, &ctx->msaaSamples},
-		{}
-	};
-	exprtab_t   vars_tab = { var_syms, 0 };
-	exprctx_t   exprctx = {};
-	parsectx_t  parsectx = { &exprctx, ctx };
-
-	exprctx.external_variables = &vars_tab;
-	exprctx.memsuper = new_memsuper ();
-	exprctx.messages = messages;
-	exprctx.hashlinks = &ctx->hashlinks;
-
-	cexpr_init_symtab (&vars_tab, &exprctx);
-
-	if (!PL_ParseStruct (renderpass_fields, plist, &renderpass_data,
-						 messages, &parsectx)) {
-		for (int i = 0; i < PL_A_NumObjects (messages); i++) {
-			Sys_Printf ("%s\n", PL_String (PL_ObjectAtIndex (messages, i)));
-		}
-		return 0;
-	}
-	PL_Free (messages);
-	delete_memsuper (exprctx.memsuper);
-
-	renderpass = QFV_CreateRenderPass (device,
-									   renderpass_data.attachments,
-									   renderpass_data.subpasses,
-									   renderpass_data.dependencies);
-
-	free (renderpass_data.attachments);
-	for (size_t i = 0; i < renderpass_data.subpasses->size; i++) {
-		free ((void *) renderpass_data.subpasses->a[i].pInputAttachments);
-		free ((void *) renderpass_data.subpasses->a[i].pColorAttachments);
-		free ((void *) renderpass_data.subpasses->a[i].pResolveAttachments);
-		free ((void *) renderpass_data.subpasses->a[i].pDepthStencilAttachment);
-		free ((void *) renderpass_data.subpasses->a[i].pPreserveAttachments);
-	}
-	free (renderpass_data.subpasses);
-	free (renderpass_data.dependencies);
-	return renderpass;
-}
-
 void
 QFV_ParseResources (vulkan_ctx_t *ctx, plitem_t *pipelinedef)
 {
@@ -609,3 +573,95 @@ QFV_GetEnum (const char *name)
 {
 	return Hash_Find (enum_symtab, name);
 }
+
+VkRenderPass
+QFV_ParseRenderPass (vulkan_ctx_t *ctx, plitem_t *plist)
+{
+	qfv_device_t *device = ctx->device;
+	qfv_renderpass_t renderpass_data = {};
+	plitem_t   *messages = PL_NewArray ();
+	VkRenderPass renderpass;
+	exprsym_t   var_syms[] = {
+		{"swapchain", &qfv_swapchain_t_type, ctx->swapchain},
+		{"msaaSamples", &VkSampleCountFlagBits_type, &ctx->msaaSamples},
+		{}
+	};
+	exprtab_t   vars_tab = { var_syms, 0 };
+	exprctx_t   exprctx = {};
+	parsectx_t  parsectx = { &exprctx, ctx };
+
+	exprctx.external_variables = &vars_tab;
+	exprctx.memsuper = new_memsuper ();
+	exprctx.messages = messages;
+	exprctx.hashlinks = &ctx->hashlinks;
+
+	cexpr_init_symtab (&vars_tab, &exprctx);
+
+	if (!PL_ParseStruct (renderpass_fields, plist, &renderpass_data,
+						 messages, &parsectx)) {
+		for (int i = 0; i < PL_A_NumObjects (messages); i++) {
+			Sys_Printf ("%s\n", PL_String (PL_ObjectAtIndex (messages, i)));
+		}
+		return 0;
+	}
+	PL_Free (messages);
+	delete_memsuper (exprctx.memsuper);
+
+	renderpass = QFV_CreateRenderPass (device,
+									   renderpass_data.attachments,
+									   renderpass_data.subpasses,
+									   renderpass_data.dependencies);
+
+	free (renderpass_data.attachments);
+	for (size_t i = 0; i < renderpass_data.subpasses->size; i++) {
+		free ((void *) renderpass_data.subpasses->a[i].pInputAttachments);
+		free ((void *) renderpass_data.subpasses->a[i].pColorAttachments);
+		free ((void *) renderpass_data.subpasses->a[i].pResolveAttachments);
+		free ((void *) renderpass_data.subpasses->a[i].pDepthStencilAttachment);
+		free ((void *) renderpass_data.subpasses->a[i].pPreserveAttachments);
+	}
+	free (renderpass_data.subpasses);
+	free (renderpass_data.dependencies);
+	return renderpass;
+}
+
+VkPipeline
+QFV_ParsePipeline (vulkan_ctx_t *ctx, plitem_t *plist)
+{
+	qfv_device_t *device = ctx->device;
+
+	plitem_t   *messages = PL_NewArray ();
+	exprctx_t   exprctx = {};
+	parsectx_t  parsectx = { &exprctx, ctx };
+	exprsym_t   var_syms[] = {
+		{"msaaSamples", &VkSampleCountFlagBits_type, &ctx->msaaSamples},
+		{}
+	};
+	exprtab_t   vars_tab = { var_syms, 0 };
+
+	exprctx.external_variables = &vars_tab;
+	exprctx.memsuper = new_memsuper ();
+	exprctx.messages = messages;
+	exprctx.hashlinks = &ctx->hashlinks;
+
+	cexpr_init_symtab (&vars_tab, &exprctx);
+
+	__auto_type cInfo = QFV_AllocGraphicsPipelineCreateInfoSet (1, alloca);
+	memset (&cInfo->a[0], 0, sizeof (cInfo->a[0]));
+
+	if (!parse_VkGraphicsPipelineCreateInfo (0, plist, &cInfo->a[0],
+											 messages, &parsectx)) {
+		for (int i = 0; i < PL_A_NumObjects (messages); i++) {
+			Sys_Printf ("%s\n", PL_String (PL_ObjectAtIndex (messages, i)));
+		}
+		return 0;
+	}
+	PL_Free (messages);
+	delete_memsuper (exprctx.memsuper);
+
+	cInfo->a[0].renderPass = ctx->renderpass.renderpass;
+	__auto_type plSet = QFV_CreateGraphicsPipelines (device, 0, cInfo);
+	VkPipeline pipeline = plSet->a[0];
+	free (plSet);
+	return pipeline;
+}
diff --git a/libs/video/renderer/vulkan/vkparse.h b/libs/video/renderer/vulkan/vkparse.h
index e4fe36774..394cd296d 100644
--- a/libs/video/renderer/vulkan/vkparse.h
+++ b/libs/video/renderer/vulkan/vkparse.h
@@ -1,17 +1,17 @@
 #ifndef __vkparse_h
 #define __vkparse_h
 
+typedef struct parsectx_s {
+	struct exprctx_s *ectx;
+	struct vulkan_ctx_s *vctx;
+} parsectx_t;
+
 #include "QF/cexpr.h"
 #include "QF/Vulkan/renderpass.h"
 #ifdef vkparse_internal
 #include "libs/video/renderer/vulkan/vkparse.hinc"
 #endif
 
-typedef struct parsectx_s {
-	struct exprctx_s *ectx;
-	struct vulkan_ctx_s *vctx;
-} parsectx_t;
-
 typedef struct parseres_s {
 	const char *name;
 	plfield_t  *field;
@@ -23,9 +23,11 @@ typedef struct handleref_s {
 	uint64_t    handle;
 } handleref_t;
 
-VkRenderPass QFV_ParseRenderPass (vulkan_ctx_t *ctx, plitem_t *plist);
 void QFV_ParseResources (vulkan_ctx_t *ctx, plitem_t *plist);
 void QFV_InitParse (vulkan_ctx_t *ctx);
 exprenum_t *QFV_GetEnum (const char *name);
 
+VkRenderPass QFV_ParseRenderPass (vulkan_ctx_t *ctx, plitem_t *plist);
+VkPipeline QFV_ParsePipeline (vulkan_ctx_t *ctx, plitem_t *plist);
+
 #endif//__vkparse_h
diff --git a/libs/video/renderer/vulkan/vkparse.plist b/libs/video/renderer/vulkan/vkparse.plist
index e270fb9be..97e767676 100644
--- a/libs/video/renderer/vulkan/vkparse.plist
+++ b/libs/video/renderer/vulkan/vkparse.plist
@@ -131,12 +131,8 @@
 				string = pName;
 			};
 			module = {
-				type = (single,	{
-									parse_type = QFString;
-									type = VkShaderModule;
-									parser = parse_VkShaderModule;
-								});
-				value = module;
+				type = (custom,	QFString, parse_VkShaderModule);
+				fields = (module);
 			};
 			specializationInfo = {
 				type = (single, VkSpecializationInfo);
@@ -253,7 +249,7 @@
 				type = (array,	{
 									parse_type = (QFDictionary, QFString);
 									type = VkDescriptorSetLayout;
-									parser = parse_VkDescriptorSetLayout;
+									parser = parse_VkDescriptorSetLayout_array;
 								});
 				size = setLayoutCount;
 				values = pSetLayouts;
@@ -312,12 +308,9 @@
 				value = pDynamicState;
 			};
 			layout = {
-				type = (single,	{
-									parse_type = (QFDictionary, QFString);
-									type = VkPipelineLayout;
-									parser = parse_VkPipelineLayout;
-								});
-				value = layout;
+				type = (custom,	(QFDictionary, QFString),
+						parse_VkPipelineLayout);
+				fields = (layout);
 			};
 			basePipelineHandle = {
 				type = (custom, QFString, parse_BasePipeline);
diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c
index af24c78eb..179748dfe 100644
--- a/libs/video/renderer/vulkan/vulkan_vid_common.c
+++ b/libs/video/renderer/vulkan/vulkan_vid_common.c
@@ -417,6 +417,15 @@ Vulkan_DestroyRenderPass (vulkan_ctx_t *ctx)
 void
 Vulkan_CreatePipelines (vulkan_ctx_t *ctx)
 {
+	qfv_load_pipeline (ctx);
+
+	plitem_t   *item = ctx->pipelineDef;
+	if (!item || !(item = PL_ObjectForKey (item, "pipeline"))) {
+		Sys_Printf ("error loading pipeline\n");
+	} else {
+		Sys_Printf ("Found pipeline def\n");
+	}
+	ctx->pipeline = QFV_ParsePipeline (ctx, item);
 }
 
 void

From 3b06ca01afe61f9c2fe334f8011c9be9e82597e5 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 5 Jan 2021 23:54:22 +0900
Subject: [PATCH 1265/1519] [vulkan] Destroy pipeline on shutdown

---
 include/QF/Vulkan/pipeline.h                   | 2 ++
 libs/video/renderer/vulkan/pipeline.c          | 9 +++++++++
 libs/video/renderer/vulkan/vulkan_vid_common.c | 4 ++++
 3 files changed, 15 insertions(+)

diff --git a/include/QF/Vulkan/pipeline.h b/include/QF/Vulkan/pipeline.h
index c7d5013de..bd6e292a9 100644
--- a/include/QF/Vulkan/pipeline.h
+++ b/include/QF/Vulkan/pipeline.h
@@ -150,5 +150,7 @@ qfv_pipelineset_t *
 QFV_CreateComputePipelines (struct qfv_device_s *device,
 							VkPipelineCache cache,
 							qfv_computepipelinecreateinfoset_t *cpciSet);
+void
+QFV_DestroyPipeline (struct qfv_device_s *device, VkPipeline pipeline);
 
 #endif//__QF_Vulkan_pipeline_h
diff --git a/libs/video/renderer/vulkan/pipeline.c b/libs/video/renderer/vulkan/pipeline.c
index bfe48ce9f..2db39812c 100644
--- a/libs/video/renderer/vulkan/pipeline.c
+++ b/libs/video/renderer/vulkan/pipeline.c
@@ -153,3 +153,12 @@ QFV_CreateComputePipelines (qfv_device_t *device,
 									 pipelines->a);
 	return pipelines;
 }
+
+void
+QFV_DestroyPipeline (qfv_device_t *device, VkPipeline pipeline)
+{
+	VkDevice    dev = device->dev;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	dfunc->vkDestroyPipeline (dev, pipeline, 0);
+}
diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c
index 179748dfe..38288c81b 100644
--- a/libs/video/renderer/vulkan/vulkan_vid_common.c
+++ b/libs/video/renderer/vulkan/vulkan_vid_common.c
@@ -58,6 +58,7 @@
 #include "QF/Vulkan/command.h"
 #include "QF/Vulkan/instance.h"
 #include "QF/Vulkan/image.h"
+#include "QF/Vulkan/pipeline.h"
 #include "QF/Vulkan/renderpass.h"
 #include "QF/Vulkan/shader.h"
 #include "QF/Vulkan/swapchain.h"
@@ -158,6 +159,9 @@ clear_table (hashtab_t **table)
 void
 Vulkan_Shutdown_Common (vulkan_ctx_t *ctx)
 {
+	if (ctx->pipeline) {
+		QFV_DestroyPipeline (ctx->device, ctx->pipeline);
+	}
 	if (ctx->framebuffers.size) {
 		Vulkan_DestroyFramebuffers (ctx);
 	}

From d4277ef130af9bdc051a3cfa7edb298c33247f27 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 7 Jan 2021 01:10:25 +0900
Subject: [PATCH 1266/1519] [util] Mark PL_CheckType as const

I keep forgetting to do optimized builds :(
---
 include/QF/qfplist.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/QF/qfplist.h b/include/QF/qfplist.h
index 3f22a9e16..8f8db669f 100644
--- a/include/QF/qfplist.h
+++ b/include/QF/qfplist.h
@@ -310,7 +310,7 @@ plitem_t *PL_NewString (const char *str);
 */
 void PL_Free (plitem_t *item);
 
-int PL_CheckType (pltype_t field_type, pltype_t item_type);
+int PL_CheckType (pltype_t field_type, pltype_t item_type) __attribute__((const));
 void PL_TypeMismatch (plitem_t *messages, const plitem_t *item,
 					  const char *name, pltype_t field_type,
 					  pltype_t item_type);

From 90428db3d5185b2bd1fad986e82c8a82a678da88 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 7 Jan 2021 22:47:58 +0900
Subject: [PATCH 1267/1519] [glsl] Remove stray return statement

I have no idea why that was in that patch and certainly does not seem to
be correct.
---
 libs/video/renderer/glsl/glsl_bsp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/video/renderer/glsl/glsl_bsp.c b/libs/video/renderer/glsl/glsl_bsp.c
index 767000b12..acdaf22c6 100644
--- a/libs/video/renderer/glsl/glsl_bsp.c
+++ b/libs/video/renderer/glsl/glsl_bsp.c
@@ -360,7 +360,7 @@ static void
 update_lightmap (msurface_t *surf)
 {
 	int         maps;
-return;
+
 	for (maps = 0; maps < MAXLIGHTMAPS && surf->styles[maps] != 255; maps++)
 		if (d_lightstylevalue[surf->styles[maps]] != surf->cached_light[maps])
 			goto dynamic;

From b6d2c630591e1d21725bab9f72cc0d296585b233 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 7 Jan 2021 22:49:43 +0900
Subject: [PATCH 1268/1519] [vulkan] Fix some formtatting

Both code and developer output.
---
 libs/video/renderer/vid_render_vulkan.c | 4 +---
 libs/video/renderer/vulkan/renderpass.c | 1 +
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/libs/video/renderer/vid_render_vulkan.c b/libs/video/renderer/vid_render_vulkan.c
index 52246162b..a2ab54024 100644
--- a/libs/video/renderer/vid_render_vulkan.c
+++ b/libs/video/renderer/vid_render_vulkan.c
@@ -124,9 +124,7 @@ vulkan_SCR_UpdateScreen (double time,  void (*f)(void), void (**g)(void))
 		= VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
 	VkSubmitInfo submitInfo = {
 		VK_STRUCTURE_TYPE_SUBMIT_INFO, 0,
-		1,
-		&framebuffer->imageAvailableSemaphore,
-		&waitStage,
+		1, &framebuffer->imageAvailableSemaphore, &waitStage,
 		1, &framebuffer->cmdBuffer,
 		1, &framebuffer->renderDoneSemaphore,
 	};
diff --git a/libs/video/renderer/vulkan/renderpass.c b/libs/video/renderer/vulkan/renderpass.c
index 78cc46563..65134ffd7 100644
--- a/libs/video/renderer/vulkan/renderpass.c
+++ b/libs/video/renderer/vulkan/renderpass.c
@@ -74,6 +74,7 @@ QFV_CreateRenderPass (qfv_device_t *device,
 	if (developer->int_val & SYS_VULKAN) {
 		Sys_Printf ("attachments: %ld\n", attachments->size);
 		for (size_t i = 0; i < attachments->size; i++) {
+			Sys_Printf ("  attachment: %zd\n", i);
 			Sys_Printf ("    flags: %x\n", attachments->a[i].flags);
 			Sys_Printf ("    format: %d\n", attachments->a[i].format);
 			Sys_Printf ("    samples: %x\n", attachments->a[i].samples);

From 5aa74df922fbc56117954aaafa02d5312a667a6d Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 8 Jan 2021 14:37:52 +0900
Subject: [PATCH 1269/1519] [renderer] Add a default 8x8 font

It is not compatible with the quake charset (it's the IBM charset). The
data is a simple bitmap but a converter to quake pic format is provided.
---
 include/r_local.h                 |   5 +
 libs/video/renderer/Makemodule.am |   1 +
 libs/video/renderer/font8x8.c     | 336 ++++++++++++++++++++++++++++++
 3 files changed, 342 insertions(+)
 create mode 100644 libs/video/renderer/font8x8.c

diff --git a/include/r_local.h b/include/r_local.h
index 189d38d38..ebf1a9dd6 100644
--- a/include/r_local.h
+++ b/include/r_local.h
@@ -346,7 +346,12 @@ extern byte crosshair_data[];
 #define CROSSHAIR_TILEY 2
 #define CROSSHAIR_COUNT (CROSSHAIR_TILEX * CROSSHAIR_TILEY)
 
+//NOTE: This is packed 8x8 bitmap data, one byte per scanline, 8 scanlines
+////per character. Also, it is NOT the quake font, but the IBM charset.
+extern byte font8x8_data[];
+
 struct qpic_s *Draw_CrosshairPic (void);
+struct qpic_s *Draw_Font8x8Pic (void);
 
 struct tex_s *R_DotParticleTexture (void);
 struct tex_s *R_SparkParticleTexture (void);
diff --git a/libs/video/renderer/Makemodule.am b/libs/video/renderer/Makemodule.am
index b5ca83cf5..990d17d88 100644
--- a/libs/video/renderer/Makemodule.am
+++ b/libs/video/renderer/Makemodule.am
@@ -13,6 +13,7 @@ EXTRA_LTLIBRARIES += \
 
 video_renderer_common_sources = \
 	libs/video/renderer/crosshair.c \
+	libs/video/renderer/font8x8.c \
 	libs/video/renderer/noisetextures.c \
 	libs/video/renderer/r_alias.c \
 	libs/video/renderer/r_bsp.c \
diff --git a/libs/video/renderer/font8x8.c b/libs/video/renderer/font8x8.c
new file mode 100644
index 000000000..ab78882a5
--- /dev/null
+++ b/libs/video/renderer/font8x8.c
@@ -0,0 +1,336 @@
+/*
+	r_font8x8.c
+
+	8x8 bitmap font data.
+
+	Copyright (C) 2021 Bill Currie <bill@taniwha.org>
+
+	Author: Bill Currie <bill@taniwha.org>
+	Date: 2021/1/8
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <stdlib.h>
+
+#include "QF/qtypes.h"
+#include "QF/wadfile.h"
+
+#include "r_internal.h"
+
+//NOTE: This is packed 8x8 bitmap data, one byte per scanline, 8 scanlines
+//per character. Also, it is NOT the quake font, but the IBM charset.
+byte font8x8_data[] = {
+	0xff, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0xff,
+	0x7E, 0x81, 0xA5, 0x81, 0xBD, 0x99, 0x81, 0x7E,
+	0x7E, 0xFF, 0xDB, 0xFF, 0xC3, 0xE7, 0xFF, 0x7E,
+	0x6C, 0xFE, 0xFE, 0xFE, 0x7C, 0x38, 0x10, 0x00,
+	0x10, 0x38, 0x7C, 0xFE, 0x7C, 0x38, 0x10, 0x00,
+	0x38, 0x7C, 0x38, 0xFE, 0xFE, 0x92, 0x10, 0x7C,
+	0x00, 0x10, 0x38, 0x7C, 0xFE, 0x7C, 0x38, 0x7C,
+	0x00, 0x00, 0x18, 0x3C, 0x3C, 0x18, 0x00, 0x00,
+	0xFF, 0xFF, 0xE7, 0xC3, 0xC3, 0xE7, 0xFF, 0xFF,
+	0x00, 0x3C, 0x66, 0x42, 0x42, 0x66, 0x3C, 0x00,
+	0xFF, 0xC3, 0x99, 0xBD, 0xBD, 0x99, 0xC3, 0xFF,
+	0x0F, 0x07, 0x0F, 0x7D, 0xCC, 0xCC, 0xCC, 0x78,
+	0x3C, 0x66, 0x66, 0x66, 0x3C, 0x18, 0x7E, 0x18,
+	0x3F, 0x33, 0x3F, 0x30, 0x30, 0x70, 0xF0, 0xE0,
+	0x7F, 0x63, 0x7F, 0x63, 0x63, 0x67, 0xE6, 0xC0,
+	0x99, 0x5A, 0x3C, 0xE7, 0xE7, 0x3C, 0x5A, 0x99,
+	0x80, 0xE0, 0xF8, 0xFE, 0xF8, 0xE0, 0x80, 0x00,
+	0x02, 0x0E, 0x3E, 0xFE, 0x3E, 0x0E, 0x02, 0x00,
+	0x18, 0x3C, 0x7E, 0x18, 0x18, 0x7E, 0x3C, 0x18,
+	0x66, 0x66, 0x66, 0x66, 0x66, 0x00, 0x66, 0x00,
+	0x7F, 0xDB, 0xDB, 0x7B, 0x1B, 0x1B, 0x1B, 0x00,
+	0x3E, 0x63, 0x38, 0x6C, 0x6C, 0x38, 0x86, 0xFC,
+	0x00, 0x00, 0x00, 0x00, 0x7E, 0x7E, 0x7E, 0x00,
+	0x18, 0x3C, 0x7E, 0x18, 0x7E, 0x3C, 0x18, 0xFF,
+	0x18, 0x3C, 0x7E, 0x18, 0x18, 0x18, 0x18, 0x00,
+	0x18, 0x18, 0x18, 0x18, 0x7E, 0x3C, 0x18, 0x00,
+	0x00, 0x18, 0x0C, 0xFE, 0x0C, 0x18, 0x00, 0x00,
+	0x00, 0x30, 0x60, 0xFE, 0x60, 0x30, 0x00, 0x00,
+	0x00, 0x00, 0xC0, 0xC0, 0xC0, 0xFE, 0x00, 0x00,
+	0x00, 0x24, 0x66, 0xFF, 0x66, 0x24, 0x00, 0x00,
+	0x00, 0x18, 0x3C, 0x7E, 0xFF, 0xFF, 0x00, 0x00,
+	0x00, 0xFF, 0xFF, 0x7E, 0x3C, 0x18, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x18, 0x3C, 0x3C, 0x18, 0x18, 0x00, 0x18, 0x00,
+	0x6C, 0x6C, 0x6C, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x6C, 0x6C, 0xFE, 0x6C, 0xFE, 0x6C, 0x6C, 0x00,
+	0x18, 0x7E, 0xC0, 0x7C, 0x06, 0xFC, 0x18, 0x00,
+	0x00, 0xC6, 0xCC, 0x18, 0x30, 0x66, 0xC6, 0x00,
+	0x38, 0x6C, 0x38, 0x76, 0xDC, 0xCC, 0x76, 0x00,
+	0x30, 0x30, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x18, 0x30, 0x60, 0x60, 0x60, 0x30, 0x18, 0x00,
+	0x60, 0x30, 0x18, 0x18, 0x18, 0x30, 0x60, 0x00,
+	0x00, 0x66, 0x3C, 0xFF, 0x3C, 0x66, 0x00, 0x00,
+	0x00, 0x18, 0x18, 0x7E, 0x18, 0x18, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x30,
+	0x00, 0x00, 0x00, 0x7E, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00,
+	0x06, 0x0C, 0x18, 0x30, 0x60, 0xC0, 0x80, 0x00,
+	0x7C, 0xCE, 0xDE, 0xF6, 0xE6, 0xC6, 0x7C, 0x00,
+	0x30, 0x70, 0x30, 0x30, 0x30, 0x30, 0xFC, 0x00,
+	0x78, 0xCC, 0x0C, 0x38, 0x60, 0xCC, 0xFC, 0x00,
+	0x78, 0xCC, 0x0C, 0x38, 0x0C, 0xCC, 0x78, 0x00,
+	0x1C, 0x3C, 0x6C, 0xCC, 0xFE, 0x0C, 0x1E, 0x00,
+	0xFC, 0xC0, 0xF8, 0x0C, 0x0C, 0xCC, 0x78, 0x00,
+	0x38, 0x60, 0xC0, 0xF8, 0xCC, 0xCC, 0x78, 0x00,
+	0xFC, 0xCC, 0x0C, 0x18, 0x30, 0x30, 0x30, 0x00,
+	0x78, 0xCC, 0xCC, 0x78, 0xCC, 0xCC, 0x78, 0x00,
+	0x78, 0xCC, 0xCC, 0x7C, 0x0C, 0x18, 0x70, 0x00,
+	0x00, 0x18, 0x18, 0x00, 0x00, 0x18, 0x18, 0x00,
+	0x00, 0x18, 0x18, 0x00, 0x00, 0x18, 0x18, 0x30,
+	0x18, 0x30, 0x60, 0xC0, 0x60, 0x30, 0x18, 0x00,
+	0x00, 0x00, 0x7E, 0x00, 0x7E, 0x00, 0x00, 0x00,
+	0x60, 0x30, 0x18, 0x0C, 0x18, 0x30, 0x60, 0x00,
+	0x3C, 0x66, 0x0C, 0x18, 0x18, 0x00, 0x18, 0x00,
+	0x7C, 0xC6, 0xDE, 0xDE, 0xDC, 0xC0, 0x7C, 0x00,
+	0x30, 0x78, 0xCC, 0xCC, 0xFC, 0xCC, 0xCC, 0x00,
+	0xFC, 0x66, 0x66, 0x7C, 0x66, 0x66, 0xFC, 0x00,
+	0x3C, 0x66, 0xC0, 0xC0, 0xC0, 0x66, 0x3C, 0x00,
+	0xF8, 0x6C, 0x66, 0x66, 0x66, 0x6C, 0xF8, 0x00,
+	0xFE, 0x62, 0x68, 0x78, 0x68, 0x62, 0xFE, 0x00,
+	0xFE, 0x62, 0x68, 0x78, 0x68, 0x60, 0xF0, 0x00,
+	0x3C, 0x66, 0xC0, 0xC0, 0xCE, 0x66, 0x3A, 0x00,
+	0xCC, 0xCC, 0xCC, 0xFC, 0xCC, 0xCC, 0xCC, 0x00,
+	0x78, 0x30, 0x30, 0x30, 0x30, 0x30, 0x78, 0x00,
+	0x1E, 0x0C, 0x0C, 0x0C, 0xCC, 0xCC, 0x78, 0x00,
+	0xE6, 0x66, 0x6C, 0x78, 0x6C, 0x66, 0xE6, 0x00,
+	0xF0, 0x60, 0x60, 0x60, 0x62, 0x66, 0xFE, 0x00,
+	0xC6, 0xEE, 0xFE, 0xFE, 0xD6, 0xC6, 0xC6, 0x00,
+	0xC6, 0xE6, 0xF6, 0xDE, 0xCE, 0xC6, 0xC6, 0x00,
+	0x38, 0x6C, 0xC6, 0xC6, 0xC6, 0x6C, 0x38, 0x00,
+	0xFC, 0x66, 0x66, 0x7C, 0x60, 0x60, 0xF0, 0x00,
+	0x7C, 0xC6, 0xC6, 0xC6, 0xD6, 0x7C, 0x0E, 0x00,
+	0xFC, 0x66, 0x66, 0x7C, 0x6C, 0x66, 0xE6, 0x00,
+	0x7C, 0xC6, 0xE0, 0x78, 0x0E, 0xC6, 0x7C, 0x00,
+	0xFC, 0xB4, 0x30, 0x30, 0x30, 0x30, 0x78, 0x00,
+	0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xFC, 0x00,
+	0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0x78, 0x30, 0x00,
+	0xC6, 0xC6, 0xC6, 0xC6, 0xD6, 0xFE, 0x6C, 0x00,
+	0xC6, 0xC6, 0x6C, 0x38, 0x6C, 0xC6, 0xC6, 0x00,
+	0xCC, 0xCC, 0xCC, 0x78, 0x30, 0x30, 0x78, 0x00,
+	0xFE, 0xC6, 0x8C, 0x18, 0x32, 0x66, 0xFE, 0x00,
+	0x78, 0x60, 0x60, 0x60, 0x60, 0x60, 0x78, 0x00,
+	0xC0, 0x60, 0x30, 0x18, 0x0C, 0x06, 0x02, 0x00,
+	0x78, 0x18, 0x18, 0x18, 0x18, 0x18, 0x78, 0x00,
+	0x10, 0x38, 0x6C, 0xC6, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,
+	0x30, 0x30, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x78, 0x0C, 0x7C, 0xCC, 0x76, 0x00,
+	0xE0, 0x60, 0x60, 0x7C, 0x66, 0x66, 0xDC, 0x00,
+	0x00, 0x00, 0x78, 0xCC, 0xC0, 0xCC, 0x78, 0x00,
+	0x1C, 0x0C, 0x0C, 0x7C, 0xCC, 0xCC, 0x76, 0x00,
+	0x00, 0x00, 0x78, 0xCC, 0xFC, 0xC0, 0x78, 0x00,
+	0x38, 0x6C, 0x64, 0xF0, 0x60, 0x60, 0xF0, 0x00,
+	0x00, 0x00, 0x76, 0xCC, 0xCC, 0x7C, 0x0C, 0xF8,
+	0xE0, 0x60, 0x6C, 0x76, 0x66, 0x66, 0xE6, 0x00,
+	0x30, 0x00, 0x70, 0x30, 0x30, 0x30, 0x78, 0x00,
+	0x0C, 0x00, 0x1C, 0x0C, 0x0C, 0xCC, 0xCC, 0x78,
+	0xE0, 0x60, 0x66, 0x6C, 0x78, 0x6C, 0xE6, 0x00,
+	0x70, 0x30, 0x30, 0x30, 0x30, 0x30, 0x78, 0x00,
+	0x00, 0x00, 0xCC, 0xFE, 0xFE, 0xD6, 0xD6, 0x00,
+	0x00, 0x00, 0xB8, 0xCC, 0xCC, 0xCC, 0xCC, 0x00,
+	0x00, 0x00, 0x78, 0xCC, 0xCC, 0xCC, 0x78, 0x00,
+	0x00, 0x00, 0xDC, 0x66, 0x66, 0x7C, 0x60, 0xF0,
+	0x00, 0x00, 0x76, 0xCC, 0xCC, 0x7C, 0x0C, 0x1E,
+	0x00, 0x00, 0xDC, 0x76, 0x62, 0x60, 0xF0, 0x00,
+	0x00, 0x00, 0x7C, 0xC0, 0x70, 0x1C, 0xF8, 0x00,
+	0x10, 0x30, 0xFC, 0x30, 0x30, 0x34, 0x18, 0x00,
+	0x00, 0x00, 0xCC, 0xCC, 0xCC, 0xCC, 0x76, 0x00,
+	0x00, 0x00, 0xCC, 0xCC, 0xCC, 0x78, 0x30, 0x00,
+	0x00, 0x00, 0xC6, 0xC6, 0xD6, 0xFE, 0x6C, 0x00,
+	0x00, 0x00, 0xC6, 0x6C, 0x38, 0x6C, 0xC6, 0x00,
+	0x00, 0x00, 0xCC, 0xCC, 0xCC, 0x7C, 0x0C, 0xF8,
+	0x00, 0x00, 0xFC, 0x98, 0x30, 0x64, 0xFC, 0x00,
+	0x1C, 0x30, 0x30, 0xE0, 0x30, 0x30, 0x1C, 0x00,
+	0x18, 0x18, 0x18, 0x00, 0x18, 0x18, 0x18, 0x00,
+	0xE0, 0x30, 0x30, 0x1C, 0x30, 0x30, 0xE0, 0x00,
+	0x76, 0xDC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x10, 0x38, 0x6C, 0xC6, 0xC6, 0xFE, 0x00,
+	0x7C, 0xC6, 0xC0, 0xC6, 0x7C, 0x0C, 0x06, 0x7C,
+	0x00, 0xCC, 0x00, 0xCC, 0xCC, 0xCC, 0x76, 0x00,
+	0x1C, 0x00, 0x78, 0xCC, 0xFC, 0xC0, 0x78, 0x00,
+	0x7E, 0x81, 0x3C, 0x06, 0x3E, 0x66, 0x3B, 0x00,
+	0xCC, 0x00, 0x78, 0x0C, 0x7C, 0xCC, 0x76, 0x00,
+	0xE0, 0x00, 0x78, 0x0C, 0x7C, 0xCC, 0x76, 0x00,
+	0x30, 0x30, 0x78, 0x0C, 0x7C, 0xCC, 0x76, 0x00,
+	0x00, 0x00, 0x7C, 0xC6, 0xC0, 0x78, 0x0C, 0x38,
+	0x7E, 0x81, 0x3C, 0x66, 0x7E, 0x60, 0x3C, 0x00,
+	0xCC, 0x00, 0x78, 0xCC, 0xFC, 0xC0, 0x78, 0x00,
+	0xE0, 0x00, 0x78, 0xCC, 0xFC, 0xC0, 0x78, 0x00,
+	0xCC, 0x00, 0x70, 0x30, 0x30, 0x30, 0x78, 0x00,
+	0x7C, 0x82, 0x38, 0x18, 0x18, 0x18, 0x3C, 0x00,
+	0xE0, 0x00, 0x70, 0x30, 0x30, 0x30, 0x78, 0x00,
+	0xC6, 0x10, 0x7C, 0xC6, 0xFE, 0xC6, 0xC6, 0x00,
+	0x30, 0x30, 0x00, 0x78, 0xCC, 0xFC, 0xCC, 0x00,
+	0x1C, 0x00, 0xFC, 0x60, 0x78, 0x60, 0xFC, 0x00,
+	0x00, 0x00, 0x7F, 0x0C, 0x7F, 0xCC, 0x7F, 0x00,
+	0x3E, 0x6C, 0xCC, 0xFE, 0xCC, 0xCC, 0xCE, 0x00,
+	0x78, 0x84, 0x00, 0x78, 0xCC, 0xCC, 0x78, 0x00,
+	0x00, 0xCC, 0x00, 0x78, 0xCC, 0xCC, 0x78, 0x00,
+	0x00, 0xE0, 0x00, 0x78, 0xCC, 0xCC, 0x78, 0x00,
+	0x78, 0x84, 0x00, 0xCC, 0xCC, 0xCC, 0x76, 0x00,
+	0x00, 0xE0, 0x00, 0xCC, 0xCC, 0xCC, 0x76, 0x00,
+	0x00, 0xCC, 0x00, 0xCC, 0xCC, 0x7C, 0x0C, 0xF8,
+	0xC3, 0x18, 0x3C, 0x66, 0x66, 0x3C, 0x18, 0x00,
+	0xCC, 0x00, 0xCC, 0xCC, 0xCC, 0xCC, 0x78, 0x00,
+	0x18, 0x18, 0x7E, 0xC0, 0xC0, 0x7E, 0x18, 0x18,
+	0x38, 0x6C, 0x64, 0xF0, 0x60, 0xE6, 0xFC, 0x00,
+	0xCC, 0xCC, 0x78, 0x30, 0xFC, 0x30, 0xFC, 0x30,
+	0xF8, 0xCC, 0xCC, 0xFA, 0xC6, 0xCF, 0xC6, 0xC3,
+	0x0E, 0x1B, 0x18, 0x3C, 0x18, 0x18, 0xD8, 0x70,
+	0x1C, 0x00, 0x78, 0x0C, 0x7C, 0xCC, 0x76, 0x00,
+	0x38, 0x00, 0x70, 0x30, 0x30, 0x30, 0x78, 0x00,
+	0x00, 0x1C, 0x00, 0x78, 0xCC, 0xCC, 0x78, 0x00,
+	0x00, 0x1C, 0x00, 0xCC, 0xCC, 0xCC, 0x76, 0x00,
+	0x00, 0xF8, 0x00, 0xB8, 0xCC, 0xCC, 0xCC, 0x00,
+	0xFC, 0x00, 0xCC, 0xEC, 0xFC, 0xDC, 0xCC, 0x00,
+	0x3C, 0x6C, 0x6C, 0x3E, 0x00, 0x7E, 0x00, 0x00,
+	0x38, 0x6C, 0x6C, 0x38, 0x00, 0x7C, 0x00, 0x00,
+	0x18, 0x00, 0x18, 0x18, 0x30, 0x66, 0x3C, 0x00,
+	0x00, 0x00, 0x00, 0xFC, 0xC0, 0xC0, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0xFC, 0x0C, 0x0C, 0x00, 0x00,
+	0xC6, 0xCC, 0xD8, 0x36, 0x6B, 0xC2, 0x84, 0x0F,
+	0xC3, 0xC6, 0xCC, 0xDB, 0x37, 0x6D, 0xCF, 0x03,
+	0x18, 0x00, 0x18, 0x18, 0x3C, 0x3C, 0x18, 0x00,
+	0x00, 0x33, 0x66, 0xCC, 0x66, 0x33, 0x00, 0x00,
+	0x00, 0xCC, 0x66, 0x33, 0x66, 0xCC, 0x00, 0x00,
+	0x22, 0x88, 0x22, 0x88, 0x22, 0x88, 0x22, 0x88,
+	0x55, 0xAA, 0x55, 0xAA, 0x55, 0xAA, 0x55, 0xAA,
+	0xDB, 0xF6, 0xDB, 0x6F, 0xDB, 0x7E, 0xD7, 0xED,
+	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0x18, 0xF8, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0xF8, 0x18, 0xF8, 0x18, 0x18, 0x18,
+	0x36, 0x36, 0x36, 0x36, 0xF6, 0x36, 0x36, 0x36,
+	0x00, 0x00, 0x00, 0x00, 0xFE, 0x36, 0x36, 0x36,
+	0x00, 0x00, 0xF8, 0x18, 0xF8, 0x18, 0x18, 0x18,
+	0x36, 0x36, 0xF6, 0x06, 0xF6, 0x36, 0x36, 0x36,
+	0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
+	0x00, 0x00, 0xFE, 0x06, 0xF6, 0x36, 0x36, 0x36,
+	0x36, 0x36, 0xF6, 0x06, 0xFE, 0x00, 0x00, 0x00,
+	0x36, 0x36, 0x36, 0x36, 0xFE, 0x00, 0x00, 0x00,
+	0x18, 0x18, 0xF8, 0x18, 0xF8, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0xF8, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0x18, 0x1F, 0x00, 0x00, 0x00,
+	0x18, 0x18, 0x18, 0x18, 0xFF, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0xFF, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0x18, 0x1F, 0x18, 0x18, 0x18,
+	0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00,
+	0x18, 0x18, 0x18, 0x18, 0xFF, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x1F, 0x18, 0x1F, 0x18, 0x18, 0x18,
+	0x36, 0x36, 0x36, 0x36, 0x37, 0x36, 0x36, 0x36,
+	0x36, 0x36, 0x37, 0x30, 0x3F, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x3F, 0x30, 0x37, 0x36, 0x36, 0x36,
+	0x36, 0x36, 0xF7, 0x00, 0xFF, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0xFF, 0x00, 0xF7, 0x36, 0x36, 0x36,
+	0x36, 0x36, 0x37, 0x30, 0x37, 0x36, 0x36, 0x36,
+	0x00, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0x00, 0x00,
+	0x36, 0x36, 0xF7, 0x00, 0xF7, 0x36, 0x36, 0x36,
+	0x18, 0x18, 0xFF, 0x00, 0xFF, 0x00, 0x00, 0x00,
+	0x36, 0x36, 0x36, 0x36, 0xFF, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0xFF, 0x00, 0xFF, 0x18, 0x18, 0x18,
+	0x00, 0x00, 0x00, 0x00, 0xFF, 0x36, 0x36, 0x36,
+	0x36, 0x36, 0x36, 0x36, 0x3F, 0x00, 0x00, 0x00,
+	0x18, 0x18, 0x1F, 0x18, 0x1F, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x1F, 0x18, 0x1F, 0x18, 0x18, 0x18,
+	0x00, 0x00, 0x00, 0x00, 0x3F, 0x36, 0x36, 0x36,
+	0x36, 0x36, 0x36, 0x36, 0xFF, 0x36, 0x36, 0x36,
+	0x18, 0x18, 0xFF, 0x18, 0xFF, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0x18, 0xF8, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x1F, 0x18, 0x18, 0x18,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0,
+	0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F,
+	0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x76, 0xDC, 0xC8, 0xDC, 0x76, 0x00,
+	0x00, 0x78, 0xCC, 0xF8, 0xCC, 0xCC, 0xF8, 0xC0,
+	0x00, 0xFC, 0xCC, 0xC0, 0xC0, 0xC0, 0xC0, 0x00,
+	0x00, 0x00, 0xFE, 0x6C, 0x6C, 0x6C, 0x6C, 0x00,
+	0xFC, 0xCC, 0x60, 0x30, 0x60, 0xCC, 0xFC, 0x00,
+	0x00, 0x00, 0x7E, 0xD8, 0xD8, 0xD8, 0x70, 0x00,
+	0x00, 0x66, 0x66, 0x66, 0x66, 0x7C, 0x60, 0xC0,
+	0x00, 0x76, 0xDC, 0x18, 0x18, 0x18, 0x18, 0x00,
+	0xFC, 0x30, 0x78, 0xCC, 0xCC, 0x78, 0x30, 0xFC,
+	0x38, 0x6C, 0xC6, 0xFE, 0xC6, 0x6C, 0x38, 0x00,
+	0x38, 0x6C, 0xC6, 0xC6, 0x6C, 0x6C, 0xEE, 0x00,
+	0x1C, 0x30, 0x18, 0x7C, 0xCC, 0xCC, 0x78, 0x00,
+	0x00, 0x00, 0x7E, 0xDB, 0xDB, 0x7E, 0x00, 0x00,
+	0x06, 0x0C, 0x7E, 0xDB, 0xDB, 0x7E, 0x60, 0xC0,
+	0x38, 0x60, 0xC0, 0xF8, 0xC0, 0x60, 0x38, 0x00,
+	0x78, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0x00,
+	0x00, 0x7E, 0x00, 0x7E, 0x00, 0x7E, 0x00, 0x00,
+	0x18, 0x18, 0x7E, 0x18, 0x18, 0x00, 0x7E, 0x00,
+	0x60, 0x30, 0x18, 0x30, 0x60, 0x00, 0xFC, 0x00,
+	0x18, 0x30, 0x60, 0x30, 0x18, 0x00, 0xFC, 0x00,
+	0x0E, 0x1B, 0x1B, 0x18, 0x18, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0x18, 0x18, 0xD8, 0xD8, 0x70,
+	0x18, 0x18, 0x00, 0x7E, 0x00, 0x18, 0x18, 0x00,
+	0x00, 0x76, 0xDC, 0x00, 0x76, 0xDC, 0x00, 0x00,
+	0x38, 0x6C, 0x6C, 0x38, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00,
+	0x0F, 0x0C, 0x0C, 0x0C, 0xEC, 0x6C, 0x3C, 0x1C,
+	0x58, 0x6C, 0x6C, 0x6C, 0x6C, 0x00, 0x00, 0x00,
+	0x70, 0x98, 0x30, 0x60, 0xF8, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x3C, 0x3C, 0x3C, 0x3C, 0x00, 0x00,
+	0xff, 0x99, 0x99, 0xff, 0xff, 0x99, 0x99, 0xff,
+};
+#define FONT_WIDTH 8
+#define FONT_HEIGHT 8
+#define FONT_HCHARS 16
+#define FONT_VCHARS 16
+#define FONT_BYTES ((FONT_VCHARS)*(FONT_HCHARS)*(FONT_HEIGHT)*(FONT_WIDTH))
+
+qpic_t *
+Draw_Font8x8Pic (void)
+{
+	qpic_t     *pic;
+	byte       *data;
+	byte       *out;
+	int         i, j, x, y, ind;
+
+	pic = calloc (1, field_offset (qpic_t, data[FONT_BYTES]));
+	pic->width = FONT_HCHARS * FONT_WIDTH;
+	pic->height = FONT_VCHARS * FONT_HEIGHT;
+	// convert the bitmap data to pixel data in a 16x16 character "image"
+	// assumes the quake palette where 254 is white, and 255 is transparent
+	data = font8x8_data;
+	for (j = 0; j < FONT_VCHARS; j++) {
+		for (i = 0; i < FONT_HCHARS; i++) {
+			for (y = 0; y < FONT_HEIGHT; y++) {
+				byte        scanline = *data++;
+				ind = (j * FONT_HEIGHT + y) * FONT_WIDTH * FONT_HCHARS;
+				ind += i * FONT_WIDTH;
+				out = pic->data + ind;
+				for (x = 0; x < FONT_WIDTH; x++) {
+					*out++ = 0xff - ((scanline & 0x80) >> 7);
+					scanline <<= 1;
+				}
+			}
+		}
+	}
+	return pic;
+}

From 06d45cff0d23b0a0de9c89ad001f56fc2e335e3c Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 9 Jan 2021 11:36:19 +0900
Subject: [PATCH 1270/1519] [build] Keep error messages from glslangValidator

The tool is horrible as a built tool due to it not being silent when all
is good (it outputs the input file name) and sends its error messages to
stdout instead of stderr. Then filtering causes the error code to be
lost. This uses a solution found on stack-exchange.
---
 Makefile.am | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index b59b21eb7..c869a6f3a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -119,11 +119,11 @@ V_XXD_1 =
 
 %.spv: %
 	@$(mkdir_p) $(builddir)/`dirname $@`
-	$(V_GLSLANG)$(GLSLANGVALIDATOR) -V $< -o $@ > /dev/null
+	$(V_GLSLANG)(((($(GLSLANGVALIDATOR) -V $< -o $@; echo $$? >&3) | sed -e '1d' 1>&2) 3>&1) | (read xs; exit $$xs))
 
 %.spvc: %
 	@$(mkdir_p) $(builddir)/`dirname $@`
-	$(V_GLSLANG)$(GLSLANGVALIDATOR) --vn `basename $< | tr . _` -V $< -o $@ > /dev/null
+	$(V_GLSLANG)(((($(GLSLANGVALIDATOR) --vn `basename $< | tr . _` -V $< -o $@; echo $$? >&3) | sed -e '1d' 1>&2) 3>&1) | (read xs; exit $$xs))
 
 shaderdir = @shaderdir@
 shader_DATA =

From 0c1699fdbb76da34d6463e631c94f34392430895 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 9 Jan 2021 20:42:23 +0900
Subject: [PATCH 1271/1519] Fix a pile of double semicolons

---
 libs/ruamoko/rua_set.c                   | 2 +-
 libs/util/cmem.c                         | 2 +-
 libs/util/qendian.c                      | 4 ++--
 libs/video/renderer/gl/gl_mod_alias.c    | 2 +-
 libs/video/renderer/glsl/glsl_textures.c | 2 +-
 libs/video/renderer/r_efrag.c            | 2 +-
 libs/video/renderer/vulkan/swapchain.c   | 2 +-
 qtv/source/sv_parse.c                    | 2 +-
 tools/bsp2img/bsp2img.c                  | 4 ++--
 tools/qfcc/include/dags.h                | 2 +-
 tools/qfcc/source/class.c                | 2 +-
 tools/qfcc/source/dags.c                 | 2 +-
 tools/qfcc/source/qfcc.c                 | 2 +-
 tools/qfcc/test/old/linkdef2.r           | 2 +-
 tools/qflight/source/entities.c          | 2 +-
 15 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/libs/ruamoko/rua_set.c b/libs/ruamoko/rua_set.c
index 4e3ea732d..3bc36c06b 100644
--- a/libs/ruamoko/rua_set.c
+++ b/libs/ruamoko/rua_set.c
@@ -392,7 +392,7 @@ bi_set_first (progs_t *pr)
 		res->set_iters->prev = &set_iter->next;
 	res->set_iters = set_iter;
 
-	set_iter->iter = iter;;
+	set_iter->iter = iter;
 
 	R_INT (pr) = res_set_iter_index (res, set_iter);
 }
diff --git a/libs/util/cmem.c b/libs/util/cmem.c
index 9dc461b87..1879f7ea3 100644
--- a/libs/util/cmem.c
+++ b/libs/util/cmem.c
@@ -321,7 +321,7 @@ cmemalloc (memsuper_t *super, size_t size)
 				memblock_t *block = init_block (super, mem, super->page_size);
 				line = block->free_lines;
 			}
-			return alloc_line (line, size);;
+			return alloc_line (line, size);
 		} else {
 			void       *mem = 0;
 			memsline_t **sline = &super->last_freed[ind];
diff --git a/libs/util/qendian.c b/libs/util/qendian.c
index 12873af9f..9858823be 100644
--- a/libs/util/qendian.c
+++ b/libs/util/qendian.c
@@ -41,9 +41,9 @@
 */
 
 #ifndef WORDS_BIGENDIAN
-VISIBLE qboolean    bigendien = false;;
+VISIBLE qboolean    bigendien = false;
 #else
-VISIBLE qboolean    bigendien = true;;
+VISIBLE qboolean    bigendien = true;
 #endif
 
 
diff --git a/libs/video/renderer/gl/gl_mod_alias.c b/libs/video/renderer/gl/gl_mod_alias.c
index c74e1815c..44a114ff5 100644
--- a/libs/video/renderer/gl/gl_mod_alias.c
+++ b/libs/video/renderer/gl/gl_mod_alias.c
@@ -190,7 +190,7 @@ GL_DrawAliasFrameMulti (vert_order_t *vo)
 static void
 GL_DrawAliasShadowTri (const aliashdr_t *paliashdr, const vert_order_t *vo)
 {
-	int         count = vo->count;;
+	int         count = vo->count;
 	const blended_vert_t *verts = vo->verts;
 	float       height, lheight;
 	vec3_t      point;
diff --git a/libs/video/renderer/glsl/glsl_textures.c b/libs/video/renderer/glsl/glsl_textures.c
index 62b331662..4e6303093 100644
--- a/libs/video/renderer/glsl/glsl_textures.c
+++ b/libs/video/renderer/glsl/glsl_textures.c
@@ -519,7 +519,7 @@ GLSL_SubpicUpdate (subpic_t *subpic, byte *data, int batch)
 void
 GLSL_ScrapFlush (scrap_t *scrap)
 {
-	vrect_t    *rect = scrap->batch;;
+	vrect_t    *rect = scrap->batch;
 
 	if (!rect)
 		return;
diff --git a/libs/video/renderer/r_efrag.c b/libs/video/renderer/r_efrag.c
index 74592fa30..870c01fc1 100644
--- a/libs/video/renderer/r_efrag.c
+++ b/libs/video/renderer/r_efrag.c
@@ -89,7 +89,7 @@ R_ClearEfrags (void)
 	if (!efrag_list)
 		efrag_list = calloc (1, sizeof (t_efrag_list));
 
-	r_free_efrags = efrag_list->efrags;;
+	r_free_efrags = efrag_list->efrags;
 	for (efl = efrag_list; efl; efl = efl->next) {
 		init_efrag_list (efl);
 		if (efl->next)
diff --git a/libs/video/renderer/vulkan/swapchain.c b/libs/video/renderer/vulkan/swapchain.c
index b2007953a..478700e83 100644
--- a/libs/video/renderer/vulkan/swapchain.c
+++ b/libs/video/renderer/vulkan/swapchain.c
@@ -43,7 +43,7 @@ QFV_CreateSwapchain (vulkan_ctx_t *ctx, VkSwapchainKHR old_swapchain)
 
 	uint32_t    numModes;
 	VkPresentModeKHR *modes;
-	VkPresentModeKHR useMode = VK_PRESENT_MODE_FIFO_KHR;;
+	VkPresentModeKHR useMode = VK_PRESENT_MODE_FIFO_KHR;
 	ifuncs->vkGetPhysicalDeviceSurfacePresentModesKHR (physDev,
 													   ctx->surface,
 													   &numModes, 0);
diff --git a/qtv/source/sv_parse.c b/qtv/source/sv_parse.c
index c179d125e..1b6ca5841 100644
--- a/qtv/source/sv_parse.c
+++ b/qtv/source/sv_parse.c
@@ -531,7 +531,7 @@ parse_player_delta (qmsg_t *msg, plent_state_t *from, plent_state_t *to)
 	if (flags & PF_SKINNUM)
 		to->skinnum = MSG_ReadByte (msg);
 	if (flags & PF_EFFECTS)
-		to->effects = (to->effects & 0xff00) | MSG_ReadByte (msg);;
+		to->effects = (to->effects & 0xff00) | MSG_ReadByte (msg);
 	if (flags & PF_WEAPONFRAME)
 		to->weaponframe = MSG_ReadByte (msg);
 	if (flags & PF_QF) {
diff --git a/tools/bsp2img/bsp2img.c b/tools/bsp2img/bsp2img.c
index 649fe1427..7b95c35a6 100644
--- a/tools/bsp2img/bsp2img.c
+++ b/tools/bsp2img/bsp2img.c
@@ -672,14 +672,14 @@ render_map (bsp_t *bsp)
 				vertexlist[i].X = -vertexlist[i].X;
 				tempf = vertexlist[i].Z;
 				vertexlist[i].Z = vertexlist[i].Y;
-				vertexlist[i].Y = tempf;;
+				vertexlist[i].Y = tempf;
 				break;
 
 			case 2:					/* +Y -- (-x <--> +x; +y out of screen,
 										   +z up) */
 				tempf = vertexlist[i].Z;
 				vertexlist[i].Z = -vertexlist[i].Y;
-				vertexlist[i].Y = tempf;;
+				vertexlist[i].Y = tempf;
 				break;
 
 			case -3:					/* -Z -- negate X and Z (ie. 180 rotate
diff --git a/tools/qfcc/include/dags.h b/tools/qfcc/include/dags.h
index 534e58511..2c677a972 100644
--- a/tools/qfcc/include/dags.h
+++ b/tools/qfcc/include/dags.h
@@ -89,7 +89,7 @@ typedef struct dag_s {
 	int         num_topo;		///< number of nodes in topo (may be <
 								///< num_nodes after dead node removal)
 	daglabel_t **labels;		///< array of all daglabels in this dag
-	int         num_labels;;
+	int         num_labels;
 	struct set_s *roots;		///< set of root nodes
 	struct flownode_s *flownode;///< flow node this dag represents
 } dag_t;
diff --git a/tools/qfcc/source/class.c b/tools/qfcc/source/class.c
index 52a3e194a..9203e9fbf 100644
--- a/tools/qfcc/source/class.c
+++ b/tools/qfcc/source/class.c
@@ -1563,7 +1563,7 @@ class_finish_module (void)
 	save_storage = current_storage;
 	current_storage = sc_static;
 	current_func = begin_function (init_sym, 0, current_symtab, 1);
-	build_code_function (init_sym, 0, init_expr);;
+	build_code_function (init_sym, 0, init_expr);
 	current_func = 0;
 	current_storage = save_storage;
 }
diff --git a/tools/qfcc/source/dags.c b/tools/qfcc/source/dags.c
index 8dec15fa2..1d98df411 100644
--- a/tools/qfcc/source/dags.c
+++ b/tools/qfcc/source/dags.c
@@ -500,7 +500,7 @@ static int
 dag_def_kill_aliases_visit (def_t *def, void *_l)
 {
 	daglabel_t *l = (daglabel_t *) _l;
-	dagnode_t  *node = l->dagnode;;
+	dagnode_t  *node = l->dagnode;
 	daglabel_t *label;
 
 	if (def == l->op->o.def)
diff --git a/tools/qfcc/source/qfcc.c b/tools/qfcc/source/qfcc.c
index 96c26e4b0..e6c3b7946 100644
--- a/tools/qfcc/source/qfcc.c
+++ b/tools/qfcc/source/qfcc.c
@@ -189,7 +189,7 @@ InitData (void)
 
 	pr.entity_data = defspace_new (ds_virtual);
 	pr.entity_fields = new_symtab (0, stab_global);
-	pr.entity_fields->space = pr.entity_data;;
+	pr.entity_fields->space = pr.entity_data;
 
 	clear_functions ();
 	clear_frame_macros ();
diff --git a/tools/qfcc/test/old/linkdef2.r b/tools/qfcc/test/old/linkdef2.r
index 133235f69..20a72fa3a 100644
--- a/tools/qfcc/test/old/linkdef2.r
+++ b/tools/qfcc/test/old/linkdef2.r
@@ -5,5 +5,5 @@ id obj;
 integer foo (void)
 {
 	[obj message];
-	return bar () + baz ();;
+	return bar () + baz ();
 }
diff --git a/tools/qflight/source/entities.c b/tools/qflight/source/entities.c
index c9d262356..d2bd2711c 100644
--- a/tools/qflight/source/entities.c
+++ b/tools/qflight/source/entities.c
@@ -183,7 +183,7 @@ LoadEntities (void)
 
 	// start parsing
 	num_entities = PL_A_NumObjects (entity_list);
-	entities = malloc (num_entities * sizeof (entity_t));;
+	entities = malloc (num_entities * sizeof (entity_t));
 
 	// go through all the entities
 	for (i = 0; i < num_entities; i++) {

From 16334158bded47847201bcf6b6a6f6f26838ea87 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 10 Jan 2021 01:35:39 +0900
Subject: [PATCH 1272/1519] [util] Support struct pointer accesses in cexpr

---
 include/QF/cexpr.h     |  3 +++
 libs/util/cexpr-vars.c | 14 ++++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/include/QF/cexpr.h b/include/QF/cexpr.h
index ac6eef683..53fc159e7 100644
--- a/include/QF/cexpr.h
+++ b/include/QF/cexpr.h
@@ -113,6 +113,8 @@ void cexpr_error(exprctx_t *ctx, const char *fmt, ...) __attribute__((format(pri
 
 void cexpr_struct_getfield (const exprval_t *a, const exprval_t *b,
 							exprval_t *c, exprctx_t *ctx);
+void cexpr_struct_pointer_getfield (const exprval_t *a, const exprval_t *b,
+									exprval_t *c, exprctx_t *ctx);
 exprval_t *cexpr_cvar (const char *name, exprctx_t *ctx);
 exprval_t *cexpr_cvar_struct (exprctx_t *ctx);
 
@@ -132,5 +134,6 @@ extern exprtype_t cexpr_field;
 extern exprtype_t cexpr_function;
 
 extern binop_t cexpr_struct_binops[];
+extern binop_t cexpr_struct_pointer_binops[];
 
 #endif
diff --git a/libs/util/cexpr-vars.c b/libs/util/cexpr-vars.c
index 115f0ba64..04c6871ad 100644
--- a/libs/util/cexpr-vars.c
+++ b/libs/util/cexpr-vars.c
@@ -58,6 +58,20 @@ VISIBLE binop_t cexpr_struct_binops[] = {
 	{}
 };
 
+VISIBLE void
+cexpr_struct_pointer_getfield (const exprval_t *a, const exprval_t *b,
+							   exprval_t *c, exprctx_t *ctx)
+{
+	// "dereference" the pointer
+	exprval_t   struct_val = { a->type, *(void **) a->value };
+	cexpr_struct_getfield (&struct_val, b, c, ctx);
+}
+
+VISIBLE binop_t cexpr_struct_pointer_binops[] = {
+	{ '.', &cexpr_field, &cexpr_exprval, cexpr_struct_pointer_getfield },
+	{}
+};
+
 static void
 cvar_get (const exprval_t *a, const exprval_t *b, exprval_t *c, exprctx_t *ctx)
 {

From e281b608e1bc3dbf972a2fa2d2022c2c39dc7a35 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 10 Jan 2021 01:38:31 +0900
Subject: [PATCH 1273/1519] [vulkan] Provide access to swapchain image count

This necessitated hand-writing qfv_swapchain_t's descriptors as I don't
feel like getting that complicated with vkgen at this stage and it's not
really appropriate anyway? qfv_swapchain_t is meant to be read-only and
not parsed from a plist.
---
 libs/video/renderer/vulkan/vkparse.c     | 32 ++++++++++++++++++++++++
 libs/video/renderer/vulkan/vkparse.plist |  5 ----
 2 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/libs/video/renderer/vulkan/vkparse.c b/libs/video/renderer/vulkan/vkparse.c
index 45236c7ff..b74d9af7d 100644
--- a/libs/video/renderer/vulkan/vkparse.c
+++ b/libs/video/renderer/vulkan/vkparse.c
@@ -469,6 +469,36 @@ parse_BasePipeline (const plitem_t *item, void **data,
 
 #include "libs/video/renderer/vulkan/vkparse.cinc"
 
+static exprsym_t imageset_symbols[] = {
+	{"size", &cexpr_size_t, (void *)field_offset (qfv_imageset_t, size)},
+	{ }
+};
+static exprtab_t imageset_symtab = {
+	imageset_symbols,
+};
+exprtype_t imageset_type = {
+	"imageset",
+	sizeof (qfv_imageset_t *),
+	cexpr_struct_pointer_binops,
+	0,
+	&imageset_symtab,
+};
+static exprsym_t qfv_swapchain_t_symbols[] = {
+	{"format", &VkFormat_type, (void *)field_offset (qfv_swapchain_t, format)},
+	{"images", &imageset_type, (void *)field_offset (qfv_swapchain_t, images)},
+	{ }
+};
+static exprtab_t qfv_swapchain_t_symtab = {
+	qfv_swapchain_t_symbols,
+};
+exprtype_t qfv_swapchain_t_type = {
+	"qfv_swapchain_t",
+	sizeof (qfv_swapchain_t),
+	cexpr_struct_binops,
+	0,
+	&qfv_swapchain_t_symtab,
+};
+
 typedef struct qfv_renderpass_s {
 	qfv_attachmentdescription_t *attachments;
 	qfv_subpassparametersset_t *subpasses;
@@ -566,6 +596,8 @@ QFV_InitParse (vulkan_ctx_t *ctx)
 								 &ctx->hashlinks);
 	context.hashlinks = &ctx->hashlinks;
 	vkgen_init_symtabs (&context);
+	cexpr_init_symtab (&qfv_swapchain_t_symtab, &context);
+	cexpr_init_symtab (&imageset_symtab, &context);
 }
 
 exprenum_t *
diff --git a/libs/video/renderer/vulkan/vkparse.plist b/libs/video/renderer/vulkan/vkparse.plist
index 97e767676..f6c92e110 100644
--- a/libs/video/renderer/vulkan/vkparse.plist
+++ b/libs/video/renderer/vulkan/vkparse.plist
@@ -18,7 +18,6 @@
 		VkPushConstantRange,
 		VkPipelineLayoutCreateInfo,
 		VkGraphicsPipelineCreateInfo,
-		qfv_swapchain_t,
 	);
 	handles = {
 		VkShaderModule = {
@@ -61,10 +60,6 @@
 		},
 	);
 	parse = {
-		qfv_swapchain_s = {
-			.name = qfv_swapchain_t;
-			format = auto;
-		};
 		VkSubpassDescription = {
 			flags = auto;
 			pipelineBindPoint = auto;

From 01b9c9bf7870c42e1f49ccaf29462965e89bb3b5 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 10 Jan 2021 01:53:15 +0900
Subject: [PATCH 1274/1519] [vulkan] Parse descriptor pools

---
 include/vid_vulkan.h                     |  1 +
 libs/video/renderer/vulkan/vkparse.c     | 18 ++++++++++++++++++
 libs/video/renderer/vulkan/vkparse.plist | 15 +++++++++++++++
 3 files changed, 34 insertions(+)

diff --git a/include/vid_vulkan.h b/include/vid_vulkan.h
index d34e067fe..6aff7ea32 100644
--- a/include/vid_vulkan.h
+++ b/include/vid_vulkan.h
@@ -48,6 +48,7 @@ typedef struct vulkan_ctx_s {
 	struct hashtab_s *shaderModules;
 	struct hashtab_s *setLayouts;
 	struct hashtab_s *pipelineLayouts;
+	struct hashtab_s *descriptorPools;
 
 	VkCommandPool cmdpool;
 	VkCommandBuffer cmdbuffer;
diff --git a/libs/video/renderer/vulkan/vkparse.c b/libs/video/renderer/vulkan/vkparse.c
index b74d9af7d..d7060d237 100644
--- a/libs/video/renderer/vulkan/vkparse.c
+++ b/libs/video/renderer/vulkan/vkparse.c
@@ -456,6 +456,21 @@ pipelineLayout_free (void *hr, void *_ctx)
 	handleref_free (handleref, ctx);
 }
 
+static void
+descriptorPool_free (void *hr, void *_ctx)
+{
+	__auto_type handleref = (handleref_t *) hr;
+	__auto_type pool = (VkDescriptorPool) handleref->handle;
+	__auto_type ctx = (vulkan_ctx_t *) _ctx;
+	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	if (pool) {
+		dfunc->vkDestroyDescriptorPool (device->dev, pool, 0);
+	};
+	handleref_free (handleref, ctx);
+}
+
 static hashtab_t *enum_symtab;
 
 static int
@@ -560,6 +575,9 @@ QFV_ParseResources (vulkan_ctx_t *ctx, plitem_t *pipelinedef)
 		ctx->pipelineLayouts = Hash_NewTable (23, handleref_getkey,
 											  pipelineLayout_free,
 											  ctx, &ctx->hashlinks);
+		ctx->descriptorPools = Hash_NewTable (23, handleref_getkey,
+											  descriptorPool_free,
+											  ctx, &ctx->hashlinks);
 	}
 
 	for (parseres_t *res = parse_resources; res->name; res++) {
diff --git a/libs/video/renderer/vulkan/vkparse.plist b/libs/video/renderer/vulkan/vkparse.plist
index f6c92e110..fc406b4c4 100644
--- a/libs/video/renderer/vulkan/vkparse.plist
+++ b/libs/video/renderer/vulkan/vkparse.plist
@@ -18,6 +18,7 @@
 		VkPushConstantRange,
 		VkPipelineLayoutCreateInfo,
 		VkGraphicsPipelineCreateInfo,
+		VkDescriptorPoolCreateInfo,
 	);
 	handles = {
 		VkShaderModule = {
@@ -25,6 +26,11 @@
 			class = "shader module";
 			custom = parse_VkShaderModule_resource;
 		};
+		VkDescriptorPool = {
+			symtab = descriptorPools;
+			class = "descriptor pool";
+			create = vkCreateDescriptorPool;
+		};
 		VkDescriptorSetLayout = {
 			symtab = setLayouts;
 			class = "set layout";
@@ -150,6 +156,15 @@
 				values = pBindings;
 			};
 		};
+		VkDescriptorPoolCreateInfo = {
+			flags = auto;
+			maxSets = auto;
+			bindings = {
+				type = (array, VkDescriptorPoolSize);
+				size = poolSizeCount;
+				values = pPoolSizes;
+			};
+		};
 		VkPipelineVertexInputStateCreateInfo = {
 			//flags = auto; reserved for future use (Bits enum does not exist)
 			bindings = {

From a35eec387792384a07f2bd94272576c1b684df21 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 10 Jan 2021 15:02:24 +0900
Subject: [PATCH 1275/1519] [util] Fail gracefully when no symtab is present

---
 libs/util/cexpr-lex.l | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libs/util/cexpr-lex.l b/libs/util/cexpr-lex.l
index 2cbbdaa79..9c9377beb 100644
--- a/libs/util/cexpr-lex.l
+++ b/libs/util/cexpr-lex.l
@@ -258,6 +258,9 @@ parse_name (const char *name, exprctx_t *context)
 {
 	exprtab_t  *symtab = context->symtab;
 
+	if (!symtab) {
+		return 0;
+	}
 	__auto_type sym = (exprsym_t *) Hash_Find (symtab->tab, name);
 	return sym;
 }

From e7106cce9eacad81cac5b1d42da1aa256188431e Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 10 Jan 2021 15:22:39 +0900
Subject: [PATCH 1276/1519] [plugin] Remove Draw_Init from draw funcs

It's never called outside the renderers.
---
 include/QF/plugin/vid_render.h          | 1 -
 libs/video/renderer/vid_render_gl.c     | 1 -
 libs/video/renderer/vid_render_glsl.c   | 1 -
 libs/video/renderer/vid_render_sw.c     | 1 -
 libs/video/renderer/vid_render_sw32.c   | 1 -
 libs/video/renderer/vid_render_vulkan.c | 1 -
 6 files changed, 6 deletions(-)

diff --git a/include/QF/plugin/vid_render.h b/include/QF/plugin/vid_render.h
index bdec285d1..6de6e9af7 100644
--- a/include/QF/plugin/vid_render.h
+++ b/include/QF/plugin/vid_render.h
@@ -108,7 +108,6 @@ typedef struct vid_model_funcs_s {
 } vid_model_funcs_t;
 
 typedef struct vid_render_funcs_s {
-	void (*Draw_Init) (void);
 	void (*Draw_Character) (int x, int y, unsigned ch);
 	void (*Draw_String) (int x, int y, const char *str);
 	void (*Draw_nString) (int x, int y, const char *str, int count);
diff --git a/libs/video/renderer/vid_render_gl.c b/libs/video/renderer/vid_render_gl.c
index 9085e751d..434588894 100644
--- a/libs/video/renderer/vid_render_gl.c
+++ b/libs/video/renderer/vid_render_gl.c
@@ -72,7 +72,6 @@ static vid_model_funcs_t model_funcs = {
 };
 
 vid_render_funcs_t gl_vid_render_funcs = {
-	gl_Draw_Init,
 	gl_Draw_Character,
 	gl_Draw_String,
 	gl_Draw_nString,
diff --git a/libs/video/renderer/vid_render_glsl.c b/libs/video/renderer/vid_render_glsl.c
index 22de04ea3..f8ca47174 100644
--- a/libs/video/renderer/vid_render_glsl.c
+++ b/libs/video/renderer/vid_render_glsl.c
@@ -72,7 +72,6 @@ static vid_model_funcs_t model_funcs = {
 };
 
 vid_render_funcs_t glsl_vid_render_funcs = {
-	glsl_Draw_Init,
 	glsl_Draw_Character,
 	glsl_Draw_String,
 	glsl_Draw_nString,
diff --git a/libs/video/renderer/vid_render_sw.c b/libs/video/renderer/vid_render_sw.c
index dcfb4abc7..a418d200c 100644
--- a/libs/video/renderer/vid_render_sw.c
+++ b/libs/video/renderer/vid_render_sw.c
@@ -65,7 +65,6 @@ static vid_model_funcs_t model_funcs = {
 };
 
 vid_render_funcs_t sw_vid_render_funcs = {
-	Draw_Init,
 	Draw_Character,
 	Draw_String,
 	Draw_nString,
diff --git a/libs/video/renderer/vid_render_sw32.c b/libs/video/renderer/vid_render_sw32.c
index ed7414a85..9fffb0298 100644
--- a/libs/video/renderer/vid_render_sw32.c
+++ b/libs/video/renderer/vid_render_sw32.c
@@ -70,7 +70,6 @@ static vid_model_funcs_t model_funcs = {
 };
 
 vid_render_funcs_t sw32_vid_render_funcs = {
-	sw32_Draw_Init,
 	sw32_Draw_Character,
 	sw32_Draw_String,
 	sw32_Draw_nString,
diff --git a/libs/video/renderer/vid_render_vulkan.c b/libs/video/renderer/vid_render_vulkan.c
index a2ab54024..a4299d827 100644
--- a/libs/video/renderer/vid_render_vulkan.c
+++ b/libs/video/renderer/vid_render_vulkan.c
@@ -194,7 +194,6 @@ static vid_model_funcs_t model_funcs = {
 };
 
 vid_render_funcs_t vulkan_vid_render_funcs = {
-	0,//vulkan_Draw_Init,
 	0,//vulkan_Draw_Character,
 	0,//vulkan_Draw_String,
 	0,//vulkan_Draw_nString,

From ef817a5cbf51dabc0e501944b6960e4c38f91c2c Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 10 Jan 2021 15:26:09 +0900
Subject: [PATCH 1277/1519] [vulkan] Allow images to be created initialized

Needed for loaded textures.
---
 include/QF/Vulkan/image.h                      | 3 ++-
 libs/video/renderer/vulkan/image.c             | 8 +++++---
 libs/video/renderer/vulkan/vulkan_vid_common.c | 4 ++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/include/QF/Vulkan/image.h b/include/QF/Vulkan/image.h
index edb5e025e..dc6bc5eea 100644
--- a/include/QF/Vulkan/image.h
+++ b/include/QF/Vulkan/image.h
@@ -37,7 +37,8 @@ VkImage QFV_CreateImage (struct qfv_device_s *device, int cubemap,
 						 uint32_t num_mipmaps,
 						 uint32_t num_layers,
 						 VkSampleCountFlagBits samples,
-						 VkImageUsageFlags usage_scenarios);
+						 VkImageUsageFlags usage_scenarios,
+						 int initialized);
 
 VkDeviceMemory QFV_AllocImageMemory (struct qfv_device_s *device,
 									 VkImage image,
diff --git a/libs/video/renderer/vulkan/image.c b/libs/video/renderer/vulkan/image.c
index 68decb94a..a60435a9d 100644
--- a/libs/video/renderer/vulkan/image.c
+++ b/libs/video/renderer/vulkan/image.c
@@ -69,7 +69,8 @@ QFV_CreateImage (qfv_device_t *device, int cubemap,
 				 uint32_t num_mipmaps,
 				 uint32_t num_layers,
 				 VkSampleCountFlagBits samples,
-				 VkImageUsageFlags usage_scenarios)
+				 VkImageUsageFlags usage_scenarios,
+				 int initialized)
 {
 	VkDevice    dev = device->dev;
 	qfv_devfuncs_t *dfunc = device->funcs;
@@ -79,11 +80,12 @@ QFV_CreateImage (qfv_device_t *device, int cubemap,
 		type, format, size, num_mipmaps,
 		cubemap ? 6 * num_layers : num_layers,
 		samples,
-		VK_IMAGE_TILING_OPTIMAL,
+		initialized ? VK_IMAGE_TILING_LINEAR : VK_IMAGE_TILING_OPTIMAL,
 		usage_scenarios,
 		VK_SHARING_MODE_EXCLUSIVE,
 		0, 0,
-		VK_IMAGE_LAYOUT_UNDEFINED,
+		initialized ? VK_IMAGE_LAYOUT_PREINITIALIZED
+					: VK_IMAGE_LAYOUT_UNDEFINED,
 	};
 	VkImage image;
 	dfunc->vkCreateImage (dev, &createInfo, 0, &image);
diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c
index 38288c81b..8d0aa4870 100644
--- a/libs/video/renderer/vulkan/vulkan_vid_common.c
+++ b/libs/video/renderer/vulkan/vulkan_vid_common.c
@@ -319,7 +319,7 @@ Vulkan_CreateRenderPass (vulkan_ctx_t *ctx)
 		= QFV_CreateImage (device, 0, VK_IMAGE_TYPE_2D,
 						   sc->format, extent, 1, 1, ctx->msaaSamples,
 						   VK_IMAGE_USAGE_TRANSIENT_ATTACHMENT_BIT
-							   | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT);
+							   | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT, 0);
 	colorImage->object
 		= QFV_AllocImageMemory (device, colorImage->image,
 								VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, 0, 0);
@@ -336,7 +336,7 @@ Vulkan_CreateRenderPass (vulkan_ctx_t *ctx)
 	depthImage->image
 		= QFV_CreateImage (device, 0, VK_IMAGE_TYPE_2D,
 						   depthFormat, extent, 1, 1, ctx->msaaSamples,
-						   VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT);
+						   VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT, 0);
 	depthImage->object
 		= QFV_AllocImageMemory (device, depthImage->image,
 								VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, 0, 0);

From fd07169a80607f4be4e030ee154c776ea8727c41 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 10 Jan 2021 15:27:39 +0900
Subject: [PATCH 1278/1519] [util] Support casts from int/uint to size_t

I don't want to do implicit down casts (size_t to uint) but I needed to
be able to reference swapchain array size.
---
 libs/util/cexpr-type.c | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/libs/util/cexpr-type.c b/libs/util/cexpr-type.c
index f400803cb..57c7a945b 100644
--- a/libs/util/cexpr-type.c
+++ b/libs/util/cexpr-type.c
@@ -31,6 +31,7 @@
 
 #include "QF/cexpr.h"
 #include "QF/mathlib.h"
+#include "QF/qfplist.h"
 #include "QF/simd/vec4f.h"
 
 #include "libs/util/cexpr-parse.h"
@@ -181,6 +182,26 @@ BINOP(size_t, bor, unsigned, |)
 BINOP(size_t, xor, unsigned, ^)
 BINOP(size_t, rem, unsigned, %)
 
+static void
+size_t_cast_int (const exprval_t *val1, const exprval_t *src,
+				 exprval_t *result, exprctx_t *ctx)
+{
+	int         val = *(int *) src->value;
+	if (val < 0) {
+		PL_Message (ctx->messages, ctx->item, "int value clamped to 0: %d",
+					val);
+		val = 0;
+	}
+	*(size_t *) result->value = val;
+}
+
+static void
+size_t_cast_uint (const exprval_t *val1, const exprval_t *src,
+				  exprval_t *result, exprctx_t *ctx)
+{
+	*(size_t *) result->value = *(unsigned *) src->value;
+}
+
 UNOP(size_t, pos, unsigned, +)
 UNOP(size_t, neg, unsigned, -)
 UNOP(size_t, tnot, unsigned, !)
@@ -198,6 +219,8 @@ binop_t size_t_binops[] = {
 	{ '^', &cexpr_size_t, &cexpr_size_t, size_t_xor },
 	{ '%', &cexpr_size_t, &cexpr_size_t, size_t_rem },
 	{ MOD, &cexpr_size_t, &cexpr_size_t, size_t_rem },
+	{ '=', &cexpr_int,    &cexpr_size_t, size_t_cast_int },
+	{ '=', &cexpr_uint,   &cexpr_size_t, size_t_cast_uint },
 	{}
 };
 

From b40b3cff1c32d8c1bbdd69f4f8629f019c864215 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 10 Jan 2021 15:29:47 +0900
Subject: [PATCH 1279/1519] [vulkan] Use a size_t temp to parse uint32 values

Needed for swapbuffer frame count
---
 libs/video/renderer/vulkan/vkparse.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/libs/video/renderer/vulkan/vkparse.c b/libs/video/renderer/vulkan/vkparse.c
index d7060d237..fbba8238b 100644
--- a/libs/video/renderer/vulkan/vkparse.c
+++ b/libs/video/renderer/vulkan/vkparse.c
@@ -175,8 +175,9 @@ parse_uint32_t (const plfield_t *field, const plitem_t *item,
 				void *data, plitem_t *messages, void *context)
 {
 	int         ret = 1;
+	size_t      val = 0;
 	exprctx_t   ectx = *((parsectx_t *) context)->ectx;
-	exprval_t   result = { &cexpr_uint, data };
+	exprval_t   result = { &cexpr_size_t, &val };
 	ectx.symtab = 0;
 	ectx.result = &result;
 	const char *valstr = PL_String (item);
@@ -191,6 +192,11 @@ parse_uint32_t (const plfield_t *field, const plitem_t *item,
 		//			field->name, field->offset, field->type, field->parser,
 		//			field->data, valstr);
 		ret = !cexpr_eval_string (valstr, &ectx);
+		if (!ret) {
+			PL_Message (messages, item, "error parsing %s: %s",
+						field->name, valstr);
+		}
+		*(uint32_t *) data = val;
 		//Sys_Printf ("    %d\n", *(uint32_t *)data);
 	}
 

From fed7149508c887d0d3abffe68099b009b71a6360 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 10 Jan 2021 15:50:24 +0900
Subject: [PATCH 1280/1519] [vulkan] Parse sampler definitions

---
 libs/video/renderer/vulkan/vkparse.c          | 49 ++++++++++++++-----
 libs/video/renderer/vulkan/vkparse.h          |  1 +
 libs/video/renderer/vulkan/vkparse.plist      | 20 ++++++++
 .../video/renderer/vulkan/vulkan_vid_common.c |  2 +
 4 files changed, 59 insertions(+), 13 deletions(-)

diff --git a/libs/video/renderer/vulkan/vkparse.c b/libs/video/renderer/vulkan/vkparse.c
index fbba8238b..cd5e98502 100644
--- a/libs/video/renderer/vulkan/vkparse.c
+++ b/libs/video/renderer/vulkan/vkparse.c
@@ -477,6 +477,21 @@ descriptorPool_free (void *hr, void *_ctx)
 	handleref_free (handleref, ctx);
 }
 
+static void
+sampler_free (void *hr, void *_ctx)
+{
+	__auto_type handleref = (handleref_t *) hr;
+	__auto_type sampler = (VkSampler) handleref->handle;
+	__auto_type ctx = (vulkan_ctx_t *) _ctx;
+	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	if (sampler) {
+		dfunc->vkDestroySampler (device->dev, sampler, 0);
+	};
+	handleref_free (handleref, ctx);
+}
+
 static hashtab_t *enum_symtab;
 
 static int
@@ -560,10 +575,23 @@ static plfield_t renderpass_fields[] = {
 	{}
 };
 
+static hashtab_t *
+handlref_symtab (void (*free_func)(void*,void*), vulkan_ctx_t *ctx)
+{
+	return Hash_NewTable (23, handleref_getkey, free_func,
+						  ctx, &ctx->hashlinks);
+}
+
 void
 QFV_ParseResources (vulkan_ctx_t *ctx, plitem_t *pipelinedef)
 {
 	plitem_t   *messages = PL_NewArray ();
+	exprsym_t   var_syms[] = {
+		{"swapchain", &qfv_swapchain_t_type, ctx->swapchain},
+		{"msaaSamples", &VkSampleCountFlagBits_type, &ctx->msaaSamples},
+		{}
+	};
+	exprtab_t   vars_tab = { var_syms, 0 };
 	exprctx_t   exprctx = {};
 	parsectx_t  parsectx = { &exprctx, ctx };
 	int         ret = 1;
@@ -571,19 +599,15 @@ QFV_ParseResources (vulkan_ctx_t *ctx, plitem_t *pipelinedef)
 	exprctx.memsuper = new_memsuper ();
 	exprctx.messages = messages;
 	exprctx.hashlinks = &ctx->hashlinks;
+	exprctx.external_variables = &vars_tab;
+	cexpr_init_symtab (&vars_tab, &exprctx);
 
 	if (!ctx->setLayouts) {
-		ctx->shaderModules = Hash_NewTable (23, handleref_getkey,
-											shaderModule_free,
-											ctx, &ctx->hashlinks);
-		ctx->setLayouts = Hash_NewTable (23, handleref_getkey, setLayout_free,
-										 ctx, &ctx->hashlinks);
-		ctx->pipelineLayouts = Hash_NewTable (23, handleref_getkey,
-											  pipelineLayout_free,
-											  ctx, &ctx->hashlinks);
-		ctx->descriptorPools = Hash_NewTable (23, handleref_getkey,
-											  descriptorPool_free,
-											  ctx, &ctx->hashlinks);
+		ctx->shaderModules = handlref_symtab (shaderModule_free, ctx);
+		ctx->setLayouts = handlref_symtab (setLayout_free, ctx);
+		ctx->pipelineLayouts = handlref_symtab (pipelineLayout_free, ctx);
+		ctx->descriptorPools = handlref_symtab (descriptorPool_free, ctx);
+		ctx->samplers = handlref_symtab (sampler_free, ctx);
 	}
 
 	for (parseres_t *res = parse_resources; res->name; res++) {
@@ -646,11 +670,10 @@ QFV_ParseRenderPass (vulkan_ctx_t *ctx, plitem_t *plist)
 	exprctx_t   exprctx = {};
 	parsectx_t  parsectx = { &exprctx, ctx };
 
-	exprctx.external_variables = &vars_tab;
 	exprctx.memsuper = new_memsuper ();
 	exprctx.messages = messages;
 	exprctx.hashlinks = &ctx->hashlinks;
-
+	exprctx.external_variables = &vars_tab;
 	cexpr_init_symtab (&vars_tab, &exprctx);
 
 	if (!PL_ParseStruct (renderpass_fields, plist, &renderpass_data,
diff --git a/libs/video/renderer/vulkan/vkparse.h b/libs/video/renderer/vulkan/vkparse.h
index 394cd296d..75dd8fe9d 100644
--- a/libs/video/renderer/vulkan/vkparse.h
+++ b/libs/video/renderer/vulkan/vkparse.h
@@ -7,6 +7,7 @@ typedef struct parsectx_s {
 } parsectx_t;
 
 #include "QF/cexpr.h"
+#include "QF/qfplist.h"
 #include "QF/Vulkan/renderpass.h"
 #ifdef vkparse_internal
 #include "libs/video/renderer/vulkan/vkparse.hinc"
diff --git a/libs/video/renderer/vulkan/vkparse.plist b/libs/video/renderer/vulkan/vkparse.plist
index fc406b4c4..edf68541e 100644
--- a/libs/video/renderer/vulkan/vkparse.plist
+++ b/libs/video/renderer/vulkan/vkparse.plist
@@ -19,6 +19,7 @@
 		VkPipelineLayoutCreateInfo,
 		VkGraphicsPipelineCreateInfo,
 		VkDescriptorPoolCreateInfo,
+		VkSamplerCreateInfo,
 	);
 	handles = {
 		VkShaderModule = {
@@ -41,6 +42,11 @@
 			class = "pipeline layout";
 			create = vkCreatePipelineLayout;
 		};
+		VkSampler = {
+			symtab = samplers;
+			class = "sampler";
+			create = vkCreateSampler;
+		};
 	};
 	resources = (
 		{
@@ -64,6 +70,20 @@
 			type = handleref_t;
 			table = pipelineLayouts;
 		},
+		{
+			name = descriptorPools;
+			parse_type = QFDictionary;
+			parser = parse_VkDescriptorPool_handleref;
+			type = handleref_t;
+			table = descriptorPools;
+		},
+		{
+			name = samplers;
+			parse_type = QFDictionary;
+			parser = parse_VkSampler_handleref;
+			type = handleref_t;
+			table = samplers;
+		},
 	);
 	parse = {
 		VkSubpassDescription = {
diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c
index 8d0aa4870..3f701e27a 100644
--- a/libs/video/renderer/vulkan/vulkan_vid_common.c
+++ b/libs/video/renderer/vulkan/vulkan_vid_common.c
@@ -176,6 +176,8 @@ Vulkan_Shutdown_Common (vulkan_ctx_t *ctx)
 	clear_table (&ctx->pipelineLayouts);
 	clear_table (&ctx->setLayouts);
 	clear_table (&ctx->shaderModules);
+	clear_table (&ctx->descriptorPools);
+	clear_table (&ctx->samplers);
 	if (ctx->device) {
 		QFV_DestroyDevice (ctx->device);
 	}

From ba6450d0b4630abca73d6b0a9dd46140495aad92 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 10 Jan 2021 15:52:27 +0900
Subject: [PATCH 1281/1519] [vulkan] Make a start on the 2D pipeline

Short wrappers for Draw functins are in vid_render_vulkan.c so the
vulkan context can be passed on to the actual functions. The 2D shaders
are set up similar to those in glsl, but with full 32-bit color (rgba)
support instead of paletted. However, the textures are not loaded yet,
nor is anything bound.
---
 include/QF/Vulkan/draw.h                      | 237 ++++++++++++++++++
 include/QF/Vulkan/qf_draw.h                   |  52 +++-
 include/QF/Vulkan/qf_vid.h                    |   2 +-
 include/vid_vulkan.h                          |   3 +
 libs/video/renderer/Makemodule.am             |  12 +-
 libs/video/renderer/vid_render_vulkan.c       | 154 ++++++++++--
 libs/video/renderer/vulkan/device.c           |   3 +-
 libs/video/renderer/vulkan/qfpipeline.plist   | 224 +++++++++++------
 libs/video/renderer/vulkan/shader.c           |   6 +
 libs/video/renderer/vulkan/twod.frag          |  19 ++
 libs/video/renderer/vulkan/twod.vert          |  27 ++
 libs/video/renderer/vulkan/vulkan_draw.c      | 142 ++++++++---
 .../video/renderer/vulkan/vulkan_vid_common.c |  19 +-
 13 files changed, 742 insertions(+), 158 deletions(-)
 create mode 100644 include/QF/Vulkan/draw.h
 create mode 100644 libs/video/renderer/vulkan/twod.frag
 create mode 100644 libs/video/renderer/vulkan/twod.vert

diff --git a/include/QF/Vulkan/draw.h b/include/QF/Vulkan/draw.h
new file mode 100644
index 000000000..8f6b78889
--- /dev/null
+++ b/include/QF/Vulkan/draw.h
@@ -0,0 +1,237 @@
+/*
+	draw.h
+
+	Video buffer handling definitions and prototypes
+
+	Copyright (C) 1996-1997  Id Software, Inc.
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+
+#ifndef __QF_draw_h
+#define __QF_draw_h
+
+/** \defgroup video Video Sub-sytem */
+
+/** \defgroup video_renderer Renderer Sub-system
+	\ingroup video
+*/
+
+/** \defgroup video_renderer_draw Generic draw functions
+	\ingroup video_renderer
+*/
+///@{
+
+#include "QF/wad.h"
+
+extern byte *draw_chars;
+
+/** Initialize the draw stuff.
+*/
+void Draw_Init (void);
+
+/** Draws one 8*8 graphics character with 0 being transparent.
+	It can be clipped to the top of the screen to allow the console to be
+	smoothly scrolled off.
+	\param x	horizontal location of the top left corner of the character.
+	\param y	vertical location of the top left corner of the character.
+	\param ch	8 bit character to draw.
+	\note		The character drawn is from the quake character set, which is
+				(by default) standard ascii for 0x20-0x7e (white). 0xa0-0xfe is
+				also standard ascii (brown). 0x01-0x1f and 0x80-0x9f are
+				various drawing characters, and 0x7f is a backwards arrow.
+*/
+void Draw_Character (int x, int y, unsigned ch);
+
+/** Draws a character string to the screen.
+	No line wrapping is performed.
+	\param x	horizontal location of the top left corner of the character.
+	\param y	vertical location of the top left corner of the character.
+	\param str	8 bit character string to draw.
+	\note		See Draw_Character() for character set description.
+				String is normal nul terminated C string.
+*/
+void Draw_String (int x, int y, const char *str);
+
+/** Draws a character sub-string to the screen.
+	No line wrapping is performed.
+	\param x	horizontal location of the top left corner of the character.
+	\param y	vertical location of the top left corner of the character.
+	\param str	8 bit character string to draw.
+	\param count Maximum characters of the string to draw.
+	\note		See Draw_Character() for character set description.
+				Draws up to \p count characters, or stops at the first nul
+				character.
+*/
+void Draw_nString (int x, int y, const char *str, int count);
+
+/** Draws a character string to the screen.
+	No line wrapping is performed.
+	\param x	horizontal location of the top left corner of the character.
+	\param y	vertical location of the top left corner of the character.
+	\param str	8 bit character string to draw.
+	\note		See Draw_Character() for character set description.
+				String is normal nul terminated C string.
+				Characters of the string are forced to have their high bit set
+				(ie, they will be in the range 0x80-0xff).
+*/
+void Draw_AltString (int x, int y, const char *str);
+
+/** Draw the console background with various optional effects.
+	\param lines Vertical size in pixels of the console.
+	\param alpha Console transparency level (255 = opaque).
+	\note		\p alpha is effective only in the OpenGL renderer. Effectively
+				255 (opaque) for the software renderer.
+
+	\c gl_conspin causes the background to spin.
+
+	\c gl_constretch causes the background to stretch rather than slide.
+*/
+void Draw_ConsoleBackground (int lines, byte alpha);
+
+/** Draw a crosshair at the center of the screen.
+	\c crosshair specifies which crosshair (1 = '+', 2 = large 'x' shape,
+	3 = fancy '+' shape)
+	\c cl_crossx and \c cl_crossy offset the crosshair from the center of the
+	screen.
+*/
+void Draw_Crosshair (void);
+
+/** Draw the specified crosshair on the screen.
+	\param ch	crosshair to draw
+	\param x	horizontal position of the center of the crosshair.
+	\param y	vertical position of the center of the crosshair.
+
+	See Draw_Crosshair() for description of crosshair values.
+*/
+void Draw_CrosshairAt (int ch, int x, int y);
+
+/** Clear a rectangle with a tiled background.
+	\param x	horizontal position of the upper left corner of the rectangle
+	\param y	horizontal position of the upper left corner of the rectangle
+	\param w	width of the rectangle
+	\param h	height of the rectangle
+
+	The background used is the "backtile" WAD lump.
+*/
+void Draw_TileClear (int x, int y, int w, int h);
+
+/** Clear a rectangle with a solid color.
+	\param x	horizontal position of the upper left corner of the rectangle
+	\param y	horizontal position of the upper left corner of the rectangle
+	\param w	width of the rectangle
+	\param h	height of the rectangle
+	\param c	8 bit color index.
+
+	The color comes from the quake palette.
+*/
+void Draw_Fill (int x, int y, int w, int h, int c);
+
+/** Draw a text box on the screen
+	\param x	horizontal location of the upper left corner of the box
+	\param y	vertical location of the upper left corner of the box
+	\param width horizontal size in character cells of the region
+	\param lines vertical size in character cells of the region
+	\param alpha transparency of the box
+*/
+void Draw_TextBox (int x, int y, int width, int lines, byte alpha);
+
+/** Darken the screen.
+*/
+void Draw_FadeScreen (void);
+
+/** Shift the screen colors.
+*/
+void Draw_BlendScreen (quat_t color);
+///@}
+
+/** \defgroup video_renderer_draw_qpic QPic functions
+	\ingroup video_renderer_draw
+*/
+///@{
+/** Load a qpic from the filesystem.
+	\param path	path of the file within the quake filesystem
+	\param alpha transparency level of the pic.
+	\return		pointer qpic data.
+	\note		Up to MAX_CACHED_PICS qpics can be loaded at a time this way
+*/
+qpic_t *Draw_CachePic (const char *path, qboolean alpha);
+
+/** Remove a qpic from the qpic cache.
+
+	This affects only those qpics that were loaded via Draw_CachePic.
+
+	\param path	path of the file within the quake filesystem
+*/
+void Draw_UncachePic (const char *path);
+
+/** Create a qpic from raw data.
+
+	\param width	The width of the pic.
+	\param height	The height of the pic.
+	\param data		The raw data bytes. The system palette will be used for
+					colors.
+	\return			pointer qpic data.
+*/
+qpic_t *Draw_MakePic (int width, int height, const byte *data);
+
+/** Destroy a qpic created by Draw_MakePic.
+
+	\param pic		The qpic to destory.
+*/
+void Draw_DestroyPic (qpic_t *pic);
+
+/** Load a qpic from gfx.wad.
+	\param name	name of the was lump to load
+	\return		pointer qpic data.
+*/
+qpic_t *Draw_PicFromWad (const char *name);
+
+/** Draw a qpic to the screen
+	\param x	horizontal location of the upper left corner of the qpic
+	\param y	vertical location of the upper left corner of the qpic
+	\param pic	qpic to draw
+*/
+void Draw_Pic (int x, int y, qpic_t *pic);
+
+/** Draw a qpic to the screen
+	\param x	horizontal location of the upper left corner of the qpic
+	\param y	vertical location of the upper left corner of the qpic
+	\param pic	qpic to draw
+*/
+void Draw_Picf (float x, float y, qpic_t *pic);
+
+/** Draw a sub-region of a qpic to the screan
+	\param x	horizontal screen location of the upper left corner of the
+				sub-region
+	\param y	vertical screen location of the upper left corner of the
+				sub-region
+	\param pic	qpic to draw
+	\param srcx	horizontal qpic location of the upper left corner of the
+				sub-region
+	\param srcy	vertical qpic location of the upper left corner of the
+				sub-region
+	\param width horizontal size of the sub-region to be drawn
+	\param height vertical size of the sub-region to be drawn
+*/
+void Draw_SubPic(int x, int y, qpic_t *pic, int srcx, int srcy, int width, int height);
+///@}
+
+#endif//__QF_draw_h
diff --git a/include/QF/Vulkan/qf_draw.h b/include/QF/Vulkan/qf_draw.h
index e4716f7ed..b0297c2d0 100644
--- a/include/QF/Vulkan/qf_draw.h
+++ b/include/QF/Vulkan/qf_draw.h
@@ -25,13 +25,49 @@
 
 */
 
-#ifndef __gl_draw_h
-#define __gl_draw_h
+#ifndef __QF_Vulkan_qf_draw_h
+#define __QF_Vulkan_qf_draw_h
 
-void Vulkan_Set2D (void);
-void Vulkan_Set2DScaled (void);
-void Vulkan_End2D (void);
-void Vulkan_DrawReset (void);
-void Vulkan_FlushText (void);
+struct vulkan_ctx_s;
 
-#endif//__gl_draw_h
+void Vulkan_Draw_Init (struct vulkan_ctx_s *ctx);
+void Vulkan_Draw_Character (int x, int y, unsigned ch,
+							struct vulkan_ctx_s *ctx);
+void Vulkan_Draw_String (int x, int y, const char *str,
+						 struct vulkan_ctx_s *ctx);
+void Vulkan_Draw_nString (int x, int y, const char *str, int count,
+						  struct vulkan_ctx_s *ctx);
+void Vulkan_Draw_AltString (int x, int y, const char *str,
+							struct vulkan_ctx_s *ctx);
+void Vulkan_Draw_ConsoleBackground (int lines, byte alpha,
+									struct vulkan_ctx_s *ctx);
+void Vulkan_Draw_Crosshair (struct vulkan_ctx_s *ctx);
+void Vulkan_Draw_CrosshairAt (int ch, int x, int y, struct vulkan_ctx_s *ctx);
+void Vulkan_Draw_TileClear (int x, int y, int w, int h,
+							struct vulkan_ctx_s *ctx);
+void Vulkan_Draw_Fill (int x, int y, int w, int h, int c,
+					   struct vulkan_ctx_s *ctx);
+void Vulkan_Draw_TextBox (int x, int y, int width, int lines, byte alpha,
+						  struct vulkan_ctx_s *ctx);
+void Vulkan_Draw_FadeScreen (struct vulkan_ctx_s *ctx);
+void Vulkan_Draw_BlendScreen (quat_t color, struct vulkan_ctx_s *ctx);
+qpic_t *Vulkan_Draw_CachePic (const char *path, qboolean alpha,
+							  struct vulkan_ctx_s *ctx);
+void Vulkan_Draw_UncachePic (const char *path, struct vulkan_ctx_s *ctx);
+qpic_t *Vulkan_Draw_MakePic (int width, int height, const byte *data,
+							 struct vulkan_ctx_s *ctx);
+void Vulkan_Draw_DestroyPic (qpic_t *pic, struct vulkan_ctx_s *ctx);
+qpic_t *Vulkan_Draw_PicFromWad (const char *name, struct vulkan_ctx_s *ctx);
+void Vulkan_Draw_Pic (int x, int y, qpic_t *pic, struct vulkan_ctx_s *ctx);
+void Vulkan_Draw_Picf (float x, float y, qpic_t *pic, struct vulkan_ctx_s *ctx);
+void Vulkan_Draw_SubPic(int x, int y, qpic_t *pic,
+						int srcx, int srcy, int width, int height,
+						struct vulkan_ctx_s *ctx);
+
+void Vulkan_Set2D (struct vulkan_ctx_s *ctx);
+void Vulkan_Set2DScaled (struct vulkan_ctx_s *ctx);
+void Vulkan_End2D (struct vulkan_ctx_s *ctx);
+void Vulkan_DrawReset (struct vulkan_ctx_s *ctx);
+void Vulkan_FlushText (struct vulkan_ctx_s *ctx);
+
+#endif//__QF_Vulkan_qf_draw_h
diff --git a/include/QF/Vulkan/qf_vid.h b/include/QF/Vulkan/qf_vid.h
index d380d1236..f859d93f2 100644
--- a/include/QF/Vulkan/qf_vid.h
+++ b/include/QF/Vulkan/qf_vid.h
@@ -40,7 +40,7 @@ void Vulkan_DestroyFramebuffers (struct vulkan_ctx_s *ctx);
 void Vulkan_CreateFramebuffers (struct vulkan_ctx_s *ctx);
 void Vulkan_CreateRenderPass (struct vulkan_ctx_s *ctx);
 void Vulkan_DestroyRenderPass (struct vulkan_ctx_s *ctx);
-void Vulkan_CreatePipelines (struct vulkan_ctx_s *ctx);
+VkPipeline Vulkan_CreatePipeline (struct vulkan_ctx_s *ctx, const char *name);
 void Vulkan_CreateSwapchain (struct vulkan_ctx_s *ctx);
 void Vulkan_CreateDevice (struct vulkan_ctx_s *ctx);
 void Vulkan_Init_Common (struct vulkan_ctx_s *ctx);
diff --git a/include/vid_vulkan.h b/include/vid_vulkan.h
index 6aff7ea32..0bc8d629d 100644
--- a/include/vid_vulkan.h
+++ b/include/vid_vulkan.h
@@ -20,6 +20,8 @@ typedef struct vulkan_framebuffer_s {
 	VkSemaphore imageAvailableSemaphore;
 	VkSemaphore renderDoneSemaphore;
 	VkCommandBuffer cmdBuffer;
+
+	VkDescriptorSet twodDescriptors;
 } vulkan_framebuffer_t;
 
 typedef struct vulkan_framebufferset_s
@@ -49,6 +51,7 @@ typedef struct vulkan_ctx_s {
 	struct hashtab_s *setLayouts;
 	struct hashtab_s *pipelineLayouts;
 	struct hashtab_s *descriptorPools;
+	struct hashtab_s *samplers;
 
 	VkCommandPool cmdpool;
 	VkCommandBuffer cmdbuffer;
diff --git a/libs/video/renderer/Makemodule.am b/libs/video/renderer/Makemodule.am
index 990d17d88..1d6c5eaea 100644
--- a/libs/video/renderer/Makemodule.am
+++ b/libs/video/renderer/Makemodule.am
@@ -213,7 +213,7 @@ libs_video_renderer_vid_render_vulkan_la_LDFLAGS=       $(plugin_ldflags)
 libs_video_renderer_vid_render_vulkan_la_LIBADD=        $(vulkan_libs)
 libs_video_renderer_vid_render_vulkan_la_DEPENDENCIES=$(vulkan_libs)
 libs_video_renderer_vid_render_vulkan_la_SOURCES = \
-	$(common_sources) \
+	$(video_renderer_common_sources) \
 	libs/video/renderer/vid_render_vulkan.c \
 	libs/video/renderer/vulkan/buffer.c \
 	libs/video/renderer/vulkan/command.c \
@@ -249,16 +249,26 @@ vkparse_src = \
 vkparse_plist = \
 	$(srcdir)/libs/video/renderer/vulkan/vkparse.plist
 
+twodv_src = libs/video/renderer/vulkan/twod.vert
+twodv_c = libs/video/renderer/vulkan/twod.vert.spvc
+twodf_src = libs/video/renderer/vulkan/twod.frag
+twodf_c = libs/video/renderer/vulkan/twod.frag.spvc
 passthrough_src = libs/video/renderer/vulkan/passthrough.vert
 passthrough_c = libs/video/renderer/vulkan/passthrough.vert.spvc
 pushcolor_src = libs/video/renderer/vulkan/pushcolor.frag
 pushcolor_c = libs/video/renderer/vulkan/pushcolor.frag.spvc
 
+$(twodv_c): $(twodv_src)
+
+$(twodf_c): $(twodf_src)
+
 $(passthrough_c): $(passthrough_src)
 
 $(pushcolor_c): $(pushcolor_src)
 
 vkshader_c = \
+	$(twodv_c) \
+	$(twodf_c) \
 	$(passthrough_c) \
 	$(pushcolor_c)
 
diff --git a/libs/video/renderer/vid_render_vulkan.c b/libs/video/renderer/vid_render_vulkan.c
index a4299d827..f84f9eb84 100644
--- a/libs/video/renderer/vid_render_vulkan.c
+++ b/libs/video/renderer/vid_render_vulkan.c
@@ -39,6 +39,7 @@
 #include "QF/plugin/general.h"
 #include "QF/plugin/vid_render.h"
 
+#include "QF/Vulkan/qf_draw.h"
 #include "QF/Vulkan/qf_vid.h"
 #include "QF/Vulkan/command.h"
 #include "QF/Vulkan/device.h"
@@ -66,7 +67,8 @@ vulkan_R_Init (void)
 	Vulkan_CreateFramebuffers (vulkan_ctx);
 	// FIXME this should be staged so screen updates can begin while pipelines
 	// are being built
-	Vulkan_CreatePipelines (vulkan_ctx);
+	vulkan_ctx->pipeline = Vulkan_CreatePipeline (vulkan_ctx, "pipeline");
+	Vulkan_Draw_Init (vulkan_ctx);
 
 	qfv_swapchain_t *sc = vulkan_ctx->swapchain;
 
@@ -81,7 +83,7 @@ vulkan_R_Init (void)
 		VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO, 0,
 		vulkan_ctx->renderpass.renderpass, 0,
 		{ {0, 0}, sc->extent },
-		2, clearValues
+		2, clearValues + 2
 	};
 	for (size_t i = 0; i < vulkan_ctx->framebuffers.size; i++) {
 		__auto_type framebuffer = &vulkan_ctx->framebuffers.a[i];
@@ -153,18 +155,124 @@ vulkan_SCR_UpdateScreen (double time,  void (*f)(void), void (**g)(void))
 	}
 }
 
+static void
+vulkan_Draw_Character (int x, int y, unsigned ch)
+{
+	Vulkan_Draw_Character (x, y, ch, vulkan_ctx);
+}
+
+static void
+vulkan_Draw_String (int x, int y, const char *str)
+{
+	Vulkan_Draw_String (x, y, str, vulkan_ctx);
+}
+
+static void
+vulkan_Draw_nString (int x, int y, const char *str, int count)
+{
+	Vulkan_Draw_nString (x, y, str, count, vulkan_ctx);
+}
+
+static void
+vulkan_Draw_AltString (int x, int y, const char *str)
+{
+	Vulkan_Draw_AltString (x, y, str, vulkan_ctx);
+}
+
+static void
+vulkan_Draw_ConsoleBackground (int lines, byte alpha)
+{
+	Vulkan_Draw_ConsoleBackground (lines, alpha, vulkan_ctx);
+}
+
+static void
+vulkan_Draw_Crosshair (void)
+{
+	Vulkan_Draw_Crosshair (vulkan_ctx);
+}
+
+static void
+vulkan_Draw_CrosshairAt (int ch, int x, int y)
+{
+	Vulkan_Draw_CrosshairAt (ch, x, y, vulkan_ctx);
+}
+
+static void
+vulkan_Draw_TileClear (int x, int y, int w, int h)
+{
+	Vulkan_Draw_TileClear (x, y, w, h, vulkan_ctx);
+}
+
+static void
+vulkan_Draw_Fill (int x, int y, int w, int h, int c)
+{
+	Vulkan_Draw_Fill (x, y, w, h, c, vulkan_ctx);
+}
+
+static void
+vulkan_Draw_TextBox (int x, int y, int width, int lines, byte alpha)
+{
+	Vulkan_Draw_TextBox (x, y, width, lines, alpha, vulkan_ctx);
+}
+
+static void
+vulkan_Draw_FadeScreen (void)
+{
+	Vulkan_Draw_FadeScreen (vulkan_ctx);
+}
+
+static void
+vulkan_Draw_BlendScreen (quat_t color)
+{
+	Vulkan_Draw_BlendScreen (color, vulkan_ctx);
+}
+
 static qpic_t *
 vulkan_Draw_CachePic (const char *path, qboolean alpha)
 {
-	return 0;
+	return Vulkan_Draw_CachePic (path, alpha, vulkan_ctx);
 }
 
-static qpic_t qpic = { 1, 1, {0} };
+static void
+vulkan_Draw_UncachePic (const char *path)
+{
+	Vulkan_Draw_UncachePic (path, vulkan_ctx);
+}
 
 static qpic_t *
 vulkan_Draw_MakePic (int width, int height, const byte *data)
 {
-	return &qpic;
+	return Vulkan_Draw_MakePic (width, height, data, vulkan_ctx);
+}
+
+static void
+vulkan_Draw_DestroyPic (qpic_t *pic)
+{
+	Vulkan_Draw_DestroyPic (pic, vulkan_ctx);
+}
+
+static qpic_t *
+vulkan_Draw_PicFromWad (const char *name)
+{
+	return Vulkan_Draw_PicFromWad (name, vulkan_ctx);
+}
+
+static void
+vulkan_Draw_Pic (int x, int y, qpic_t *pic)
+{
+	Vulkan_Draw_Pic (x, y, pic, vulkan_ctx);
+}
+
+static void
+vulkan_Draw_Picf (float x, float y, qpic_t *pic)
+{
+	Vulkan_Draw_Picf (x, y, pic, vulkan_ctx);
+}
+
+static void
+vulkan_Draw_SubPic (int x, int y, qpic_t *pic, int srcx, int srcy, int width, int height)
+{
+	Vulkan_Draw_SubPic (x, y, pic, srcx, srcy, width, height, vulkan_ctx);
 }
 
 static vid_model_funcs_t model_funcs = {
@@ -194,26 +302,26 @@ static vid_model_funcs_t model_funcs = {
 };
 
 vid_render_funcs_t vulkan_vid_render_funcs = {
-	0,//vulkan_Draw_Character,
-	0,//vulkan_Draw_String,
-	0,//vulkan_Draw_nString,
-	0,//vulkan_Draw_AltString,
-	0,//vulkan_Draw_ConsoleBackground,
-	0,//vulkan_Draw_Crosshair,
-	0,//vulkan_Draw_CrosshairAt,
-	0,//vulkan_Draw_TileClear,
-	0,//vulkan_Draw_Fill,
-	0,//vulkan_Draw_TextBox,
-	0,//vulkan_Draw_FadeScreen,
-	0,//vulkan_Draw_BlendScreen,
+	vulkan_Draw_Character,
+	vulkan_Draw_String,
+	vulkan_Draw_nString,
+	vulkan_Draw_AltString,
+	vulkan_Draw_ConsoleBackground,
+	vulkan_Draw_Crosshair,
+	vulkan_Draw_CrosshairAt,
+	vulkan_Draw_TileClear,
+	vulkan_Draw_Fill,
+	vulkan_Draw_TextBox,
+	vulkan_Draw_FadeScreen,
+	vulkan_Draw_BlendScreen,
 	vulkan_Draw_CachePic,
-	0,//vulkan_Draw_UncachePic,
+	vulkan_Draw_UncachePic,
 	vulkan_Draw_MakePic,
-	0,//vulkan_Draw_DestroyPic,
-	0,//vulkan_Draw_PicFromWad,
-	0,//vulkan_Draw_Pic,
-	0,//vulkan_Draw_Picf,
-	0,//vulkan_Draw_SubPic,
+	vulkan_Draw_DestroyPic,
+	vulkan_Draw_PicFromWad,
+	vulkan_Draw_Pic,
+	vulkan_Draw_Picf,
+	vulkan_Draw_SubPic,
 
 	vulkan_SCR_UpdateScreen,
 	SCR_DrawRam,
diff --git a/libs/video/renderer/vulkan/device.c b/libs/video/renderer/vulkan/device.c
index 0457d0570..86ba71f73 100644
--- a/libs/video/renderer/vulkan/device.c
+++ b/libs/video/renderer/vulkan/device.c
@@ -165,7 +165,7 @@ QFV_CreateDevice (vulkan_ctx_t *ctx, const char **extensions)
 			VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO, 0, 0,
 			family, 1, &priority
 		};
-		VkPhysicalDeviceFeatures features;
+		VkPhysicalDeviceFeatures features = {};
 		VkDeviceCreateInfo dCreateInfo = {
 			VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO, 0, 0,
 			1, &qCreateInfo,
@@ -173,7 +173,6 @@ QFV_CreateDevice (vulkan_ctx_t *ctx, const char **extensions)
 			next, ext,
 			&features
 		};
-		memset (&features, 0, sizeof (features));
 		qfv_device_t *device = calloc (1, sizeof (qfv_device_t)
 										  + sizeof (qfv_devfuncs_t));
 		device->funcs = (qfv_devfuncs_t *) (device + 1);
diff --git a/libs/video/renderer/vulkan/qfpipeline.plist b/libs/video/renderer/vulkan/qfpipeline.plist
index 1f9c6de46..03a4243b2 100644
--- a/libs/video/renderer/vulkan/qfpipeline.plist
+++ b/libs/video/renderer/vulkan/qfpipeline.plist
@@ -7,8 +7,61 @@
 		// $builtin refers to compiled-in shaders
 		passthrough = $builtin/passthrough.vert;
 		pushcolor = $builtin/pushcolor.frag;
+		twodv = $builtin/twod.vert;
+		twodf = $builtin/twod.frag;
+	};
+	samplers = {
+		quakepic = {
+			magFilter = nearest;
+			minFilter = nearest;
+			mipmapMode = nearest;
+			addressModeU = clamp_to_edge;
+			addressModeV = clamp_to_edge;
+			addressModeW = clamp_to_edge;
+			mipLodBias = 0;
+			anisotropyEnable = 0;//FIXME false!!!
+			maxAnisotropy = 0;
+			compareEnable = 0;//FIXME false!!!
+			compareOp = always;
+			minLod = 0;
+			maxLod = 0.25f;
+			borderColor = float_transparent_black;
+			unnormalizedCoordinates = 0;//FIXME false!!!
+		};
+	};
+	descriptorPools = {
+		twod = {
+			flags = 0;
+			maxSets = $swapchain.images.size;
+			bindings = (
+				{
+					type = uniform_buffer;
+					descriptorCount = $swapchain.images.size;
+				},
+				{
+					type = combined_image_sampler;
+					descriptorCount = $swapchain.images.size;
+				},
+			);
+		};
 	};
 	setLayouts = {
+		twod = {
+			bindings = (
+				{
+					binding = 0;
+					descriptorType = uniform_buffer;
+					descriptorCount = 1;
+					stageFlags = vertex;
+				},
+				{
+					binding = 1;
+					descriptorType = combined_image_sampler;
+					descriptorCount = 1;
+					stageFlags = fragment;
+				},
+			);
+		};
 		something = {
 			flags = 0;
 			bindings = (
@@ -28,6 +81,9 @@
 		};
 	};
 	pipelineLayouts = {
+		twod = {
+			setLayouts = (twod);
+		};
 		something = {
 			setLayouts = (something);
 			pushConstantRanges = (
@@ -39,88 +95,96 @@
 			);
 		};
 	};
-	pipeline = {
-		stages = (
-			{ stage = vertex; name = main; module = passthrough; },
-			{ stage = fragment; name = main; module = pushcolor; },
-		);
-		vertexInput = {
-			bindings = (
-				{
-					binding = 0;
-					stride = "4 * 4";
-					inputRate = vertex;
-				},
-			);
-			attributes = (
-				{
-					location = 0;
-					binding = 0;
-					format = r32g32b32a32_sfloat;
-					offset = 0;
-				},
+	pipelines = {
+		twod = {
+			stages = (
+				{ stage = vertex; name = main; module = twodv; },
+				{ stage = fragment; name = main; module = twodf; },
 			);
+			vertexInput = {
+				bindings = (
+					{
+						binding = 0;
+						stride = "2 * 4 * 4";
+						inputRate = vertex;
+					},
+				);
+				attributes = (
+					{
+						location = 0;
+						binding = 0;
+						format = r32g32b32a32_sfloat;
+						offset = 0;
+					},
+					{
+						location = 1;
+						binding = 0;
+						format = r32g32b32a32_sfloat;
+						offset = 4;
+					},
+				);
+			};
+			inputAssembly = {
+				topology = triangle_list;
+				primitiveRestartEnable = 0;
+			};
+			viewport = {
+				viewports = (
+					{
+						x = 0; y = 0;
+						width = 640; height = 480;
+						minDepth = 0; maxDepth = 1;
+					}
+				);
+				scissors = (
+					{
+						offset = { x = 0; y = 0 };
+						extent = { width = 640; height = 480; };
+					},
+				);
+			};
+			rasterization = {
+				depthClampEnable = 0;
+				rasterizerDiscardEnable = 0;
+				polygonMode = fill;
+				cullMode = back;
+				frontFace = counter_clockwise;
+				depthBiasEnable = 0;
+				lineWidth = 1;
+			};
+			multisample = {
+				rasterizationSamples = $msaaSamples;
+				sampleShadingEnable = 0;
+				minSampleShading = 0.5f;
+				alphaToCoverageEnable = 0;
+				alphaToOneEnable = 0;
+			};
+			depthStencil = {
+				depthTestEnable = 1;
+				depthWriteEnable = 1;
+				depthCompareOp = less;
+				depthBoundsTestEnable = 0;
+				stencilTestEnable = 0;
+			};
+			colorBlend = {
+				logicOpEnable = 0;
+				attachments = ({
+					blendEnable = 0;
+					srcColorBlendFactor = src_color;
+					dstColorBlendFactor = zero;
+					colorBlendOp = add;
+					srcAlphaBlendFactor = src_alpha;
+					dstAlphaBlendFactor = zero;
+					alphaBlendOp = add;
+					colorWriteMask = r|g|b|a;
+				});
+			};
+			dynamic = {
+				dynamicState = ( viewport, scissor );
+			};
+			layout = twod;
+			//renderPass = renderpass;
 		};
-		inputAssembly = {
-			topology = triangle_list;
-			primitiveRestartEnable = 0;
-		};
-		viewport = {
-			viewports = (
-				{
-					x = 0; y = 0;
-					width = 640; height = 480;
-					minDepth = 0; maxDepth = 1;
-				}
-			);
-			scissors = (
-				{
-					offset = { x = 0; y = 0 };
-					extent = { width = 640; height = 480; };
-				},
-			);
-		};
-		rasterization = {
-			depthClampEnable = 0;
-			rasterizerDiscardEnable = 0;
-			polygonMode = fill;
-			cullMode = back;
-			frontFace = counter_clockwise;
-			depthBiasEnable = 0;
-			lineWidth = 1;
-		};
-		multisample = {
-			rasterizationSamples = $msaaSamples;
-			sampleShadingEnable = 0;
-			minSampleShading = 0.5f;
-			alphaToCoverageEnable = 0;
-			alphaToOneEnable = 0;
-		};
-		depthStencil = {
-			depthTestEnable = 1;
-			depthWriteEnable = 1;
-			depthCompareOp = less;
-			depthBoundsTestEnable = 0;
-			stencilTestEnable = 0;
-		};
-		colorBlend = {
-			logicOpEnable = 0;
-			attachments = ({
-				blendEnable = 0;
-				srcColorBlendFactor = src_color;
-				dstColorBlendFactor = zero;
-				colorBlendOp = add;
-				srcAlphaBlendFactor = src_alpha;
-				dstAlphaBlendFactor = zero;
-				alphaBlendOp = add;
-				colorWriteMask = r|g|b|a;
-			});
-		};
-		dynamic = {
-			dynamicState = ( viewport, scissor );
-		};
-		layout = something;
-		//renderPass = renderpass;
 	};
 	renderpass = {
 		attachments = (
diff --git a/libs/video/renderer/vulkan/shader.c b/libs/video/renderer/vulkan/shader.c
index f0064bb35..25e1049ea 100644
--- a/libs/video/renderer/vulkan/shader.c
+++ b/libs/video/renderer/vulkan/shader.c
@@ -54,6 +54,10 @@
 
 #include "vid_vulkan.h"
 
+static
+#include "libs/video/renderer/vulkan/twod.vert.spvc"
+static
+#include "libs/video/renderer/vulkan/twod.frag.spvc"
 static
 #include "libs/video/renderer/vulkan/passthrough.vert.spvc"
 static
@@ -66,6 +70,8 @@ typedef struct shaderdata_s {
 } shaderdata_t;
 
 static shaderdata_t builtin_shaders[] = {
+	{ "twod.vert", twod_vert, sizeof (twod_vert) },
+	{ "twod.frag", twod_frag, sizeof (twod_frag) },
 	{ "passthrough.vert", passthrough_vert, sizeof (passthrough_vert) },
 	{ "pushcolor.frag", pushcolor_frag, sizeof (pushcolor_frag) },
 	{}
diff --git a/libs/video/renderer/vulkan/twod.frag b/libs/video/renderer/vulkan/twod.frag
new file mode 100644
index 000000000..83bda0874
--- /dev/null
+++ b/libs/video/renderer/vulkan/twod.frag
@@ -0,0 +1,19 @@
+#version 450
+
+layout (set = 0, binding = 1) uniform sampler2D Texture;
+
+layout (location = 0) in vec2 st;
+layout (location = 1) in vec4 color;
+
+layout (location = 0) out vec4 frag_color;
+
+void
+main (void)
+{
+	vec4        pix;
+
+	pix = texture (Texture, st);
+	if (pix.a < 0.5)
+		discard;
+	frag_color = pix * color;
+}
diff --git a/libs/video/renderer/vulkan/twod.vert b/libs/video/renderer/vulkan/twod.vert
new file mode 100644
index 000000000..83655d6a7
--- /dev/null
+++ b/libs/video/renderer/vulkan/twod.vert
@@ -0,0 +1,27 @@
+#version 450
+
+layout (set = 0, binding = 0) uniform Matrices {
+	mat4 Projection;
+	mat4 View;
+	mat4 Model;
+};
+/** Vertex position.
+
+	x, y, s, t
+
+	\a vertex provides the onscreen location at which to draw the icon
+	(\a x, \a y) and texture coordinate for the icon (\a s=z, \a t=w).
+*/
+layout (location = 0) in vec4 vertex;
+layout (location = 1) in vec4 vcolor;
+
+layout (location = 0) out vec2 st;
+layout (location = 1) out vec4 color;
+
+void
+main (void)
+{
+	gl_Position = Projection * vec4 (vertex.xy, 0.0, 1.0);
+	st = vertex.zw;
+	color = vcolor;
+}
diff --git a/libs/video/renderer/vulkan/vulkan_draw.c b/libs/video/renderer/vulkan/vulkan_draw.c
index 628306044..7f5e11111 100644
--- a/libs/video/renderer/vulkan/vulkan_draw.c
+++ b/libs/video/renderer/vulkan/vulkan_draw.c
@@ -3,10 +3,10 @@
 
 	2D drawing support for Vulkan
 
-	Copyright (C) 2011 Bill Currie <bill@taniwha.org>
+	Copyright (C) 2021 Bill Currie <bill@taniwha.org>
 
 	Author: Bill Currie <bill@taniwha.org>
-	Date: 2011/12/23
+	Date: 2021/1/10
 
 	This program is free software; you can redistribute it and/or
 	modify it under the terms of the GNU General Public License
@@ -49,10 +49,24 @@
 #include "QF/sys.h"
 #include "QF/vid.h"
 
+#include "compat.h"
 #include "QF/Vulkan/qf_draw.h"
 #include "QF/Vulkan/qf_vid.h"
+#include "QF/Vulkan/descriptor.h"
+#include "QF/Vulkan/device.h"
+#include "QF/Vulkan/image.h"
 
 #include "r_internal.h"
+#include "vid_vulkan.h"
+#include "vkparse.h"
+
+//FIXME move into a context struct
+VkImage         conchars_image;
+VkDeviceMemory  conchars_memory;
+VkImageView     conchars_view;
+VkSampler       conchars_sampler;
+
+VkPipeline		twod;
 
 static qpic_t *
 pic_data (const char *name, int w, int h, const byte *data)
@@ -67,135 +81,189 @@ pic_data (const char *name, int w, int h, const byte *data)
 }
 
 qpic_t *
-vulkan_Draw_MakePic (int width, int height, const byte *data)
+Vulkan_Draw_MakePic (int width, int height, const byte *data,
+					 vulkan_ctx_t *ctx)
 {
 	return pic_data (0, width, height, data);
 }
 
 void
-vulkan_Draw_DestroyPic (qpic_t *pic)
+Vulkan_Draw_DestroyPic (qpic_t *pic, vulkan_ctx_t *ctx)
 {
 }
 
 qpic_t *
-vulkan_Draw_PicFromWad (const char *name)
+Vulkan_Draw_PicFromWad (const char *name, vulkan_ctx_t *ctx)
 {
 	return pic_data (0, 1, 1, (const byte *)"");
 }
 
 qpic_t *
-vulkan_Draw_CachePic (const char *path, qboolean alpha)
+Vulkan_Draw_CachePic (const char *path, qboolean alpha, vulkan_ctx_t *ctx)
 {
 	return pic_data (0, 1, 1, (const byte *)"");
 }
 
 void
-vulkan_Draw_UncachePic (const char *path)
+Vulkan_Draw_UncachePic (const char *path, vulkan_ctx_t *ctx)
 {
 }
 
 void
-vulkan_Draw_TextBox (int x, int y, int width, int lines, byte alpha)
+Vulkan_Draw_TextBox (int x, int y, int width, int lines, byte alpha,
+					 vulkan_ctx_t *ctx)
+{
+}
+
+static void
+Vulkan_Draw_Shutdown (void *data)
+{
+	vulkan_ctx_t *ctx = data;
+	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	dfunc->vkDestroyPipeline (device->dev, twod, 0);
+	dfunc->vkDestroyImageView (device->dev, conchars_view, 0);
+	dfunc->vkFreeMemory (device->dev, conchars_memory, 0);
+	dfunc->vkDestroyImage (device->dev, conchars_image, 0);
+}
+
+void
+Vulkan_Draw_Init (vulkan_ctx_t *ctx)
+{
+	Sys_RegisterShutdown (Vulkan_Draw_Shutdown, ctx);
+
+	qfv_device_t *device = ctx->device;
+	qpic_t     *charspic = Draw_Font8x8Pic ();
+	VkExtent3D  extent = { charspic->width, charspic->height, 1 };
+	conchars_image = QFV_CreateImage (device, 0, VK_IMAGE_TYPE_2D,
+									  VK_FORMAT_A8B8G8R8_UNORM_PACK32,
+									  extent, 1, 1,
+									  VK_SAMPLE_COUNT_1_BIT,
+									  VK_IMAGE_USAGE_TRANSFER_DST_BIT
+									  | VK_IMAGE_USAGE_TRANSFER_SRC_BIT
+									  | VK_IMAGE_USAGE_SAMPLED_BIT,
+									  1);
+	conchars_memory = QFV_AllocImageMemory (device, conchars_image,
+											VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT,
+											0, 0);
+	QFV_BindImageMemory (device, conchars_image, conchars_memory, 0);
+	conchars_view = QFV_CreateImageView (device, conchars_image,
+										 VK_IMAGE_VIEW_TYPE_2D,
+										 VK_FORMAT_A8B8G8R8_UNORM_PACK32,
+										 VK_IMAGE_ASPECT_COLOR_BIT);
+	conchars_sampler = Hash_Find (ctx->samplers, "quakepic");
+
+	twod = Vulkan_CreatePipeline (ctx, "twod");
+
+	handleref_t *h;
+	__auto_type layouts = QFV_AllocDescriptorSetLayoutSet (ctx->framebuffers.size, alloca);
+	for (size_t i = 0; i < layouts->size; i++) {
+		h = Hash_Find (ctx->setLayouts, "twod");
+		layouts->a[i] = (VkDescriptorSetLayout) h->handle;
+	}
+	h = Hash_Find (ctx->descriptorPools, "twod");
+	__auto_type pool = (VkDescriptorPool) h->handle;
+	__auto_type sets = QFV_AllocateDescriptorSet (device, pool, layouts);
+	for (size_t i = 0; i < ctx->framebuffers.size; i++) {
+		ctx->framebuffers.a[i].twodDescriptors = sets->a[i];
+	}
+}
+
+void
+Vulkan_Draw_Character (int x, int y, unsigned int chr, vulkan_ctx_t *ctx)
 {
 }
 
 void
-vulkan_Draw_Init (void)
+Vulkan_Draw_String (int x, int y, const char *str, vulkan_ctx_t *ctx)
 {
 }
 
 void
-vulkan_Draw_Character (int x, int y, unsigned int chr)
+Vulkan_Draw_nString (int x, int y, const char *str, int count,
+					 vulkan_ctx_t *ctx)
 {
 }
 
 void
-vulkan_Draw_String (int x, int y, const char *str)
+Vulkan_Draw_AltString (int x, int y, const char *str, vulkan_ctx_t *ctx)
 {
 }
 
 void
-vulkan_Draw_nString (int x, int y, const char *str, int count)
+Vulkan_Draw_CrosshairAt (int ch, int x, int y, vulkan_ctx_t *ctx)
 {
 }
 
 void
-vulkan_Draw_AltString (int x, int y, const char *str)
+Vulkan_Draw_Crosshair (vulkan_ctx_t *ctx)
 {
 }
 
 void
-vulkan_Draw_CrosshairAt (int ch, int x, int y)
+Vulkan_Draw_Pic (int x, int y, qpic_t *pic, vulkan_ctx_t *ctx)
 {
 }
 
 void
-vulkan_Draw_Crosshair (void)
+Vulkan_Draw_Picf (float x, float y, qpic_t *pic, vulkan_ctx_t *ctx)
 {
 }
 
 void
-vulkan_Draw_Pic (int x, int y, qpic_t *pic)
+Vulkan_Draw_SubPic (int x, int y, qpic_t *pic,
+					int srcx, int srcy, int width, int height,
+					vulkan_ctx_t *ctx)
 {
 }
 
 void
-vulkan_Draw_Picf (float x, float y, qpic_t *pic)
+Vulkan_Draw_ConsoleBackground (int lines, byte alpha, vulkan_ctx_t *ctx)
 {
 }
 
 void
-vulkan_Draw_SubPic (int x, int y, qpic_t *pic, int srcx, int srcy, int width,
-				  int height)
+Vulkan_Draw_TileClear (int x, int y, int w, int h, vulkan_ctx_t *ctx)
 {
 }
 
 void
-vulkan_Draw_ConsoleBackground (int lines, byte alpha)
+Vulkan_Draw_Fill (int x, int y, int w, int h, int c, vulkan_ctx_t *ctx)
 {
 }
 
 void
-vulkan_Draw_TileClear (int x, int y, int w, int h)
+Vulkan_Draw_FadeScreen (vulkan_ctx_t *ctx)
 {
 }
 
 void
-vulkan_Draw_Fill (int x, int y, int w, int h, int c)
+Vulkan_Set2D (vulkan_ctx_t *ctx)
 {
 }
 
 void
-vulkan_Draw_FadeScreen (void)
+Vulkan_Set2DScaled (vulkan_ctx_t *ctx)
 {
 }
 
 void
-Vulkan_Set2D (void)
+Vulkan_End2D (vulkan_ctx_t *ctx)
 {
 }
 
 void
-Vulkan_Set2DScaled (void)
+Vulkan_DrawReset (vulkan_ctx_t *ctx)
 {
 }
 
 void
-Vulkan_End2D (void)
+Vulkan_FlushText (vulkan_ctx_t *ctx)
 {
 }
 
 void
-Vulkan_DrawReset (void)
-{
-}
-
-void
-Vulkan_FlushText (void)
-{
-}
-
-void
-vulkan_Draw_BlendScreen (quat_t color)
+Vulkan_Draw_BlendScreen (quat_t color, vulkan_ctx_t *ctx)
 {
 }
diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c
index 3f701e27a..c2b17d0fe 100644
--- a/libs/video/renderer/vulkan/vulkan_vid_common.c
+++ b/libs/video/renderer/vulkan/vulkan_vid_common.c
@@ -420,18 +420,25 @@ Vulkan_DestroyRenderPass (vulkan_ctx_t *ctx)
 	ctx->renderpass.depthImage = 0;
 }
 
-void
-Vulkan_CreatePipelines (vulkan_ctx_t *ctx)
+VkPipeline
+Vulkan_CreatePipeline (vulkan_ctx_t *ctx, const char *name)
 {
 	qfv_load_pipeline (ctx);
 
 	plitem_t   *item = ctx->pipelineDef;
-	if (!item || !(item = PL_ObjectForKey (item, "pipeline"))) {
-		Sys_Printf ("error loading pipeline\n");
+	if (!item || !(item = PL_ObjectForKey (item, "pipelines"))) {
+		Sys_Printf ("error loading pipelines\n");
+		return 0;
 	} else {
-		Sys_Printf ("Found pipeline def\n");
+		Sys_Printf ("Found pipelines def\n");
 	}
-	ctx->pipeline = QFV_ParsePipeline (ctx, item);
+	if (!(item = PL_ObjectForKey (item, name))) {
+		Sys_Printf ("error loading pipeline %s\n", name);
+		return 0;
+	} else {
+		Sys_Printf ("Found pipeline def %s\n", name);
+	}
+	return QFV_ParsePipeline (ctx, item);
 }
 
 void

From 23db917ec4efea4b2964009c95579b1ed766cd4e Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 11 Jan 2021 01:24:15 +0900
Subject: [PATCH 1282/1519] [vulkan] Create a staging buffer struct

And move the barrier prefabs into a more convenient place.
---
 include/QF/Vulkan/barrier.h                   | 21 ++++
 include/QF/Vulkan/qf_vid.h                    |  1 +
 include/QF/Vulkan/staging.h                   | 18 ++++
 include/vid_vulkan.h                          |  1 +
 libs/video/renderer/Makemodule.am             |  2 +
 libs/video/renderer/vid_render_vulkan.c       |  1 +
 libs/video/renderer/vulkan/barrier.c          | 92 ++++++++++++++++++
 libs/video/renderer/vulkan/staging.c          | 96 +++++++++++++++++++
 .../video/renderer/vulkan/vulkan_vid_common.c | 82 +++-------------
 9 files changed, 243 insertions(+), 71 deletions(-)
 create mode 100644 include/QF/Vulkan/barrier.h
 create mode 100644 include/QF/Vulkan/staging.h
 create mode 100644 libs/video/renderer/vulkan/barrier.c
 create mode 100644 libs/video/renderer/vulkan/staging.c

diff --git a/include/QF/Vulkan/barrier.h b/include/QF/Vulkan/barrier.h
new file mode 100644
index 000000000..12cea49ab
--- /dev/null
+++ b/include/QF/Vulkan/barrier.h
@@ -0,0 +1,21 @@
+#ifndef __QF_Vulkan_barrier_h
+#define __QF_Vulkan_barrier_h
+
+typedef struct {
+	VkPipelineStageFlags src;
+	VkPipelineStageFlags dst;
+} qfv_pipelinestagepair_t;
+
+//XXX Note: imageLayoutTransitionBarriers, imageLayoutTransitionStages and
+// the enum must be kept in sync
+enum {
+	qfv_LT_Undefined_to_TransferDst,
+	qfv_LT_TransferDst_to_ShaderReadOnly,
+	qfv_LT_Undefined_to_DepthStencil,
+	qfv_LT_Undefined_to_Color,
+};
+
+extern const VkImageMemoryBarrier imageLayoutTransitionBarriers[];
+extern const qfv_pipelinestagepair_t imageLayoutTransitionStages[];
+
+#endif//__QF_Vulkan_barrier_h
diff --git a/include/QF/Vulkan/qf_vid.h b/include/QF/Vulkan/qf_vid.h
index f859d93f2..d5f59cc84 100644
--- a/include/QF/Vulkan/qf_vid.h
+++ b/include/QF/Vulkan/qf_vid.h
@@ -45,5 +45,6 @@ void Vulkan_CreateSwapchain (struct vulkan_ctx_s *ctx);
 void Vulkan_CreateDevice (struct vulkan_ctx_s *ctx);
 void Vulkan_Init_Common (struct vulkan_ctx_s *ctx);
 void Vulkan_Shutdown_Common (struct vulkan_ctx_s *ctx);
+void Vulkan_CreateStagingBuffers (struct vulkan_ctx_s *ctx);
 
 #endif // __QF_Vulkan_vid_h
diff --git a/include/QF/Vulkan/staging.h b/include/QF/Vulkan/staging.h
new file mode 100644
index 000000000..d281f1854
--- /dev/null
+++ b/include/QF/Vulkan/staging.h
@@ -0,0 +1,18 @@
+#ifndef __QF_Vulkan_staging_h
+#define __QF_Vulkan_staging_h
+
+typedef struct qfv_stagebuf_s {
+	struct qfv_device_s *device;
+	VkBuffer    buffer;
+	VkDeviceMemory memory;
+	size_t      size;
+	void       *data;
+} qfv_stagebuf_t;
+
+
+qfv_stagebuf_t *QFV_CreateStagingBuffer (struct qfv_device_s *device,
+										 size_t size);
+void QFV_DestroyStagingBuffer (qfv_stagebuf_t *stage);
+void QFV_FlushStagingBuffer (qfv_stagebuf_t *stage, size_t offset, size_t size);
+
+#endif//__QF_Vulkan_staging_h
diff --git a/include/vid_vulkan.h b/include/vid_vulkan.h
index 0bc8d629d..05e127825 100644
--- a/include/vid_vulkan.h
+++ b/include/vid_vulkan.h
@@ -57,6 +57,7 @@ typedef struct vulkan_ctx_s {
 	VkCommandBuffer cmdbuffer;
 	VkFence     fence;			// for ctx->cmdbuffer only
 	vulkan_renderpass_t renderpass;
+	struct qfv_stagebuf_s *staging[2];
 	VkPipeline  pipeline;
 	size_t      curFrame;
 	vulkan_framebufferset_t framebuffers;
diff --git a/libs/video/renderer/Makemodule.am b/libs/video/renderer/Makemodule.am
index 1d6c5eaea..36b013d97 100644
--- a/libs/video/renderer/Makemodule.am
+++ b/libs/video/renderer/Makemodule.am
@@ -215,6 +215,7 @@ libs_video_renderer_vid_render_vulkan_la_DEPENDENCIES=$(vulkan_libs)
 libs_video_renderer_vid_render_vulkan_la_SOURCES = \
 	$(video_renderer_common_sources) \
 	libs/video/renderer/vid_render_vulkan.c \
+	libs/video/renderer/vulkan/barrier.c \
 	libs/video/renderer/vulkan/buffer.c \
 	libs/video/renderer/vulkan/command.c \
 	libs/video/renderer/vulkan/descriptor.c \
@@ -226,6 +227,7 @@ libs_video_renderer_vid_render_vulkan_la_SOURCES = \
 	libs/video/renderer/vulkan/pipeline.c \
 	libs/video/renderer/vulkan/renderpass.c \
 	libs/video/renderer/vulkan/shader.c \
+	libs/video/renderer/vulkan/staging.c \
 	libs/video/renderer/vulkan/swapchain.c \
 	libs/video/renderer/vulkan/util.c \
 	libs/video/renderer/vulkan/util.h \
diff --git a/libs/video/renderer/vid_render_vulkan.c b/libs/video/renderer/vid_render_vulkan.c
index f84f9eb84..64d8f3766 100644
--- a/libs/video/renderer/vid_render_vulkan.c
+++ b/libs/video/renderer/vid_render_vulkan.c
@@ -62,6 +62,7 @@ vulkan_R_Init (void)
 	qfv_device_t *device = vulkan_ctx->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
 
+	Vulkan_CreateStagingBuffers (vulkan_ctx);
 	Vulkan_CreateSwapchain (vulkan_ctx);
 	Vulkan_CreateRenderPass (vulkan_ctx);
 	Vulkan_CreateFramebuffers (vulkan_ctx);
diff --git a/libs/video/renderer/vulkan/barrier.c b/libs/video/renderer/vulkan/barrier.c
new file mode 100644
index 000000000..c7c1f21a3
--- /dev/null
+++ b/libs/video/renderer/vulkan/barrier.c
@@ -0,0 +1,92 @@
+/*
+	barrier.c
+
+	Memory barrier helpers
+
+	Copyright (C) 2021      Bill Currie <bill@taniwha.org>
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include "QF/Vulkan/qf_vid.h"
+#include "QF/Vulkan/barrier.h"
+
+const VkImageMemoryBarrier imageLayoutTransitionBarriers[] = {
+	// undefined -> transfer dst optimal
+	{	VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER, 0,
+		0,
+		VK_ACCESS_TRANSFER_WRITE_BIT,
+		VK_IMAGE_LAYOUT_UNDEFINED,
+		VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
+		VK_QUEUE_FAMILY_IGNORED, VK_QUEUE_FAMILY_IGNORED, 0,
+		{ VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1 }
+	},
+	// transfer dst optimal -> shader read only optimal
+	{	VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER, 0,
+		VK_ACCESS_TRANSFER_WRITE_BIT,
+		VK_ACCESS_SHADER_READ_BIT,
+		VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
+		VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL,
+		VK_QUEUE_FAMILY_IGNORED, VK_QUEUE_FAMILY_IGNORED, 0,
+		{ VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1 }
+	},
+	// undefined -> depth stencil attachment optimal
+	{	VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER, 0,
+		0,
+		VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT
+			| VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT,
+		VK_IMAGE_LAYOUT_UNDEFINED,
+		VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL,
+		VK_QUEUE_FAMILY_IGNORED, VK_QUEUE_FAMILY_IGNORED, 0,
+		{ VK_IMAGE_ASPECT_DEPTH_BIT, 0, 1, 0, 1 }
+	},
+	// undefined -> color attachment optimal
+	{	VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER, 0,
+		0,
+		VK_ACCESS_COLOR_ATTACHMENT_READ_BIT
+			| VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT,
+		VK_IMAGE_LAYOUT_UNDEFINED,
+		VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL,
+		VK_QUEUE_FAMILY_IGNORED, VK_QUEUE_FAMILY_IGNORED, 0,
+		{ VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1 }
+	},
+	{ /* end of transition barriers */ }
+};
+
+const qfv_pipelinestagepair_t imageLayoutTransitionStages[] = {
+	// undefined -> transfer dst optimal
+	{	VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT,
+		VK_PIPELINE_STAGE_TRANSFER_BIT },
+	// preinitialized -> shader read only optimal
+	{	VK_PIPELINE_STAGE_TRANSFER_BIT,
+		VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT },
+	// transfer dst optimal -> shader read only optimal
+	{	VK_PIPELINE_STAGE_TRANSFER_BIT,
+		VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT },
+	// undefined -> depth stencil attachment optimal
+	{	VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT,
+		VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT },
+	// undefined -> color attachment optimal
+	{	VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT,
+		VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT },
+};
diff --git a/libs/video/renderer/vulkan/staging.c b/libs/video/renderer/vulkan/staging.c
new file mode 100644
index 000000000..de791239c
--- /dev/null
+++ b/libs/video/renderer/vulkan/staging.c
@@ -0,0 +1,96 @@
+/*
+	shader.c
+
+	Vulkan shader manager
+
+	Copyright (C) 2021      Bill Currie <bill@taniwha.org>
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifdef HAVE_MATH_H
+# include <math.h>
+#endif
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+
+#include "QF/alloc.h"
+#include "QF/cvar.h"
+#include "QF/dstring.h"
+#include "QF/hash.h"
+#include "QF/qfplist.h"
+#include "QF/quakefs.h"
+#include "QF/sys.h"
+#include "QF/Vulkan/qf_vid.h"
+#include "QF/Vulkan/buffer.h"
+#include "QF/Vulkan/device.h"
+#include "QF/Vulkan/instance.h"
+#include "QF/Vulkan/staging.h"
+
+#include "vid_vulkan.h"
+
+qfv_stagebuf_t *
+QFV_CreateStagingBuffer (qfv_device_t *device, size_t size)
+{
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	qfv_stagebuf_t *stage = malloc (sizeof (qfv_stagebuf_t));
+	stage->device = device;
+	stage->buffer = QFV_CreateBuffer (device, size,
+									  VK_BUFFER_USAGE_TRANSFER_SRC_BIT);
+	stage->memory = QFV_AllocBufferMemory (device, stage->buffer,
+										   VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT,
+										   size, 0);
+	QFV_BindBufferMemory (device, stage->buffer, stage->memory, 0);
+	dfunc->vkMapMemory (device->dev, stage->memory, 0, size, 0, &stage->data);
+	return stage;
+}
+
+void
+QFV_DestroyStagingBuffer (qfv_stagebuf_t *stage)
+{
+	qfv_device_t *device = stage->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	dfunc->vkUnmapMemory (device->dev, stage->memory);
+	dfunc->vkFreeMemory (device->dev, stage->memory, 0);
+	dfunc->vkDestroyBuffer (device->dev, stage->buffer, 0);
+	free (stage);
+}
+
+void
+QFV_FlushStagingBuffer (qfv_stagebuf_t *stage, size_t offset, size_t size)
+{
+	qfv_device_t *device = stage->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	VkMappedMemoryRange range = {
+		VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE, 0,
+		stage->memory, offset, size
+	};
+	dfunc->vkFlushMappedMemoryRanges (device->dev, 1, &range);
+}
diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c
index c2b17d0fe..c230955dc 100644
--- a/libs/video/renderer/vulkan/vulkan_vid_common.c
+++ b/libs/video/renderer/vulkan/vulkan_vid_common.c
@@ -53,6 +53,7 @@
 #include "QF/va.h"
 #include "QF/vid.h"
 #include "QF/Vulkan/qf_vid.h"
+#include "QF/Vulkan/barrier.h"
 #include "QF/Vulkan/descriptor.h"
 #include "QF/Vulkan/device.h"
 #include "QF/Vulkan/command.h"
@@ -61,6 +62,7 @@
 #include "QF/Vulkan/pipeline.h"
 #include "QF/Vulkan/renderpass.h"
 #include "QF/Vulkan/shader.h"
+#include "QF/Vulkan/staging.h"
 #include "QF/Vulkan/swapchain.h"
 
 #include "compat.h"
@@ -171,6 +173,8 @@ Vulkan_Shutdown_Common (vulkan_ctx_t *ctx)
 	if (ctx->swapchain) {
 		QFV_DestroySwapchain (ctx->swapchain);
 	}
+	QFV_DestroyStagingBuffer (ctx->staging[0]);
+	QFV_DestroyStagingBuffer (ctx->staging[1]);
 	ctx->instance->funcs->vkDestroySurfaceKHR (ctx->instance->instance,
 											   ctx->surface, 0);
 	clear_table (&ctx->pipelineLayouts);
@@ -194,6 +198,13 @@ Vulkan_CreateDevice (vulkan_ctx_t *ctx)
 	ctx->device = QFV_CreateDevice (ctx, device_extensions);
 }
 
+void
+Vulkan_CreateStagingBuffers (vulkan_ctx_t *ctx)
+{
+	ctx->staging[0] = QFV_CreateStagingBuffer (ctx->device, 1024*1024);
+	ctx->staging[1] = QFV_CreateStagingBuffer (ctx->device, 1024*1024);
+}
+
 void
 Vulkan_CreateSwapchain (vulkan_ctx_t *ctx)
 {
@@ -209,77 +220,6 @@ Vulkan_CreateSwapchain (vulkan_ctx_t *ctx)
 	}
 }
 
-typedef struct {
-	VkPipelineStageFlags src;
-	VkPipelineStageFlags dst;
-} qfv_pipelinestagepair_t;
-
-//XXX Note: imageLayoutTransitionBarriers, imageLayoutTransitionStages and
-// the enum be kept in sync
-enum {
-	qfv_LT_Undefined_to_TransferDst,
-	qfv_LT_TransferDst_to_ShaderReadOnly,
-	qfv_LT_Undefined_to_DepthStencil,
-	qfv_LT_Undefined_to_Color,
-};
-
-static VkImageMemoryBarrier imageLayoutTransitionBarriers[] = {
-	// undefined -> transfer dst optimal
-	{	VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER, 0,
-		0,
-		VK_ACCESS_TRANSFER_WRITE_BIT,
-		VK_IMAGE_LAYOUT_UNDEFINED,
-		VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
-		VK_QUEUE_FAMILY_IGNORED, VK_QUEUE_FAMILY_IGNORED, 0,
-		{ VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1 }
-	},
-	// transfer dst optimal -> shader read only optimal
-	{	VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER, 0,
-		VK_ACCESS_TRANSFER_WRITE_BIT,
-		VK_ACCESS_SHADER_READ_BIT,
-		VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
-		VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL,
-		VK_QUEUE_FAMILY_IGNORED, VK_QUEUE_FAMILY_IGNORED, 0,
-		{ VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1 }
-	},
-	// undefined -> depth stencil attachment optimal
-	{	VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER, 0,
-		0,
-		VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT
-			| VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT,
-		VK_IMAGE_LAYOUT_UNDEFINED,
-		VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL,
-		VK_QUEUE_FAMILY_IGNORED, VK_QUEUE_FAMILY_IGNORED, 0,
-		{ VK_IMAGE_ASPECT_DEPTH_BIT, 0, 1, 0, 1 }
-	},
-	// undefined -> color attachment optimal
-	{	VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER, 0,
-		0,
-		VK_ACCESS_COLOR_ATTACHMENT_READ_BIT
-			| VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT,
-		VK_IMAGE_LAYOUT_UNDEFINED,
-		VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL,
-		VK_QUEUE_FAMILY_IGNORED, VK_QUEUE_FAMILY_IGNORED, 0,
-		{ VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1 }
-	},
-	{ /* end of transition barriers */ }
-};
-
-static qfv_pipelinestagepair_t imageLayoutTransitionStages[] = {
-	// undefined -> transfer dst optimal
-	{	VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT,
-		VK_PIPELINE_STAGE_TRANSFER_BIT },
-	// transfer dst optimal -> shader read only optimal
-	{	VK_PIPELINE_STAGE_TRANSFER_BIT,
-		VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT },
-	// undefined -> depth stencil attachment optimal
-	{	VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT,
-		VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT },
-	// undefined -> color attachment optimal
-	{	VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT,
-		VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT },
-};
-
 static void
 qfv_load_pipeline (vulkan_ctx_t *ctx)
 {

From b584d6f40381c6e223cef113aef7893dbf0abc01 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 11 Jan 2021 01:25:55 +0900
Subject: [PATCH 1283/1519] [vulkan] Abandon image "preinitialized" layout

Turn's out it's not useful for transfers. I might bring it back when I
figure out how to use it.
---
 include/QF/Vulkan/image.h                      | 3 +--
 libs/video/renderer/vulkan/image.c             | 8 +++-----
 libs/video/renderer/vulkan/qfpipeline.plist    | 2 +-
 libs/video/renderer/vulkan/vulkan_draw.c       | 3 +--
 libs/video/renderer/vulkan/vulkan_vid_common.c | 4 ++--
 5 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/include/QF/Vulkan/image.h b/include/QF/Vulkan/image.h
index dc6bc5eea..edb5e025e 100644
--- a/include/QF/Vulkan/image.h
+++ b/include/QF/Vulkan/image.h
@@ -37,8 +37,7 @@ VkImage QFV_CreateImage (struct qfv_device_s *device, int cubemap,
 						 uint32_t num_mipmaps,
 						 uint32_t num_layers,
 						 VkSampleCountFlagBits samples,
-						 VkImageUsageFlags usage_scenarios,
-						 int initialized);
+						 VkImageUsageFlags usage_scenarios);
 
 VkDeviceMemory QFV_AllocImageMemory (struct qfv_device_s *device,
 									 VkImage image,
diff --git a/libs/video/renderer/vulkan/image.c b/libs/video/renderer/vulkan/image.c
index a60435a9d..68decb94a 100644
--- a/libs/video/renderer/vulkan/image.c
+++ b/libs/video/renderer/vulkan/image.c
@@ -69,8 +69,7 @@ QFV_CreateImage (qfv_device_t *device, int cubemap,
 				 uint32_t num_mipmaps,
 				 uint32_t num_layers,
 				 VkSampleCountFlagBits samples,
-				 VkImageUsageFlags usage_scenarios,
-				 int initialized)
+				 VkImageUsageFlags usage_scenarios)
 {
 	VkDevice    dev = device->dev;
 	qfv_devfuncs_t *dfunc = device->funcs;
@@ -80,12 +79,11 @@ QFV_CreateImage (qfv_device_t *device, int cubemap,
 		type, format, size, num_mipmaps,
 		cubemap ? 6 * num_layers : num_layers,
 		samples,
-		initialized ? VK_IMAGE_TILING_LINEAR : VK_IMAGE_TILING_OPTIMAL,
+		VK_IMAGE_TILING_OPTIMAL,
 		usage_scenarios,
 		VK_SHARING_MODE_EXCLUSIVE,
 		0, 0,
-		initialized ? VK_IMAGE_LAYOUT_PREINITIALIZED
-					: VK_IMAGE_LAYOUT_UNDEFINED,
+		VK_IMAGE_LAYOUT_UNDEFINED,
 	};
 	VkImage image;
 	dfunc->vkCreateImage (dev, &createInfo, 0, &image);
diff --git a/libs/video/renderer/vulkan/qfpipeline.plist b/libs/video/renderer/vulkan/qfpipeline.plist
index 03a4243b2..819492c93 100644
--- a/libs/video/renderer/vulkan/qfpipeline.plist
+++ b/libs/video/renderer/vulkan/qfpipeline.plist
@@ -26,7 +26,7 @@
 			minLod = 0;
 			maxLod = 0.25f;
 			borderColor = float_transparent_black;
-			unnormalizedCoordinates = 0;//FIXME false!!!
+			unnormalizedCoordinates = 1;//FIXME true!!!
 		};
 	};
 	descriptorPools = {
diff --git a/libs/video/renderer/vulkan/vulkan_draw.c b/libs/video/renderer/vulkan/vulkan_draw.c
index 7f5e11111..634e401eb 100644
--- a/libs/video/renderer/vulkan/vulkan_draw.c
+++ b/libs/video/renderer/vulkan/vulkan_draw.c
@@ -142,8 +142,7 @@ Vulkan_Draw_Init (vulkan_ctx_t *ctx)
 									  VK_SAMPLE_COUNT_1_BIT,
 									  VK_IMAGE_USAGE_TRANSFER_DST_BIT
 									  | VK_IMAGE_USAGE_TRANSFER_SRC_BIT
-									  | VK_IMAGE_USAGE_SAMPLED_BIT,
-									  1);
+									  | VK_IMAGE_USAGE_SAMPLED_BIT);
 	conchars_memory = QFV_AllocImageMemory (device, conchars_image,
 											VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT,
 											0, 0);
diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c
index c230955dc..e35d5765c 100644
--- a/libs/video/renderer/vulkan/vulkan_vid_common.c
+++ b/libs/video/renderer/vulkan/vulkan_vid_common.c
@@ -261,7 +261,7 @@ Vulkan_CreateRenderPass (vulkan_ctx_t *ctx)
 		= QFV_CreateImage (device, 0, VK_IMAGE_TYPE_2D,
 						   sc->format, extent, 1, 1, ctx->msaaSamples,
 						   VK_IMAGE_USAGE_TRANSIENT_ATTACHMENT_BIT
-							   | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT, 0);
+							   | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT);
 	colorImage->object
 		= QFV_AllocImageMemory (device, colorImage->image,
 								VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, 0, 0);
@@ -278,7 +278,7 @@ Vulkan_CreateRenderPass (vulkan_ctx_t *ctx)
 	depthImage->image
 		= QFV_CreateImage (device, 0, VK_IMAGE_TYPE_2D,
 						   depthFormat, extent, 1, 1, ctx->msaaSamples,
-						   VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT, 0);
+						   VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT);
 	depthImage->object
 		= QFV_AllocImageMemory (device, depthImage->image,
 								VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, 0, 0);

From 88d48944cb7791f96bd568ac6619a3a382e24d51 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 11 Jan 2021 01:27:40 +0900
Subject: [PATCH 1284/1519] [vulkan] Upload the default character set

Nothing's shown yet, and the code is a tad messy, but it's serving as a
proof of concept for now.
---
 libs/video/renderer/vulkan/vulkan_draw.c | 65 +++++++++++++++++++++++-
 1 file changed, 63 insertions(+), 2 deletions(-)

diff --git a/libs/video/renderer/vulkan/vulkan_draw.c b/libs/video/renderer/vulkan/vulkan_draw.c
index 634e401eb..a7459bd4c 100644
--- a/libs/video/renderer/vulkan/vulkan_draw.c
+++ b/libs/video/renderer/vulkan/vulkan_draw.c
@@ -52,9 +52,11 @@
 #include "compat.h"
 #include "QF/Vulkan/qf_draw.h"
 #include "QF/Vulkan/qf_vid.h"
+#include "QF/Vulkan/barrier.h"
 #include "QF/Vulkan/descriptor.h"
 #include "QF/Vulkan/device.h"
 #include "QF/Vulkan/image.h"
+#include "QF/Vulkan/staging.h"
 
 #include "r_internal.h"
 #include "vid_vulkan.h"
@@ -134,10 +136,13 @@ Vulkan_Draw_Init (vulkan_ctx_t *ctx)
 	Sys_RegisterShutdown (Vulkan_Draw_Shutdown, ctx);
 
 	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+	VkCommandBuffer cmd = ctx->cmdbuffer;
+
 	qpic_t     *charspic = Draw_Font8x8Pic ();
 	VkExtent3D  extent = { charspic->width, charspic->height, 1 };
 	conchars_image = QFV_CreateImage (device, 0, VK_IMAGE_TYPE_2D,
-									  VK_FORMAT_A8B8G8R8_UNORM_PACK32,
+									  VK_FORMAT_A1R5G5B5_UNORM_PACK16,
 									  extent, 1, 1,
 									  VK_SAMPLE_COUNT_1_BIT,
 									  VK_IMAGE_USAGE_TRANSFER_DST_BIT
@@ -149,10 +154,66 @@ Vulkan_Draw_Init (vulkan_ctx_t *ctx)
 	QFV_BindImageMemory (device, conchars_image, conchars_memory, 0);
 	conchars_view = QFV_CreateImageView (device, conchars_image,
 										 VK_IMAGE_VIEW_TYPE_2D,
-										 VK_FORMAT_A8B8G8R8_UNORM_PACK32,
+										 VK_FORMAT_A1R5G5B5_UNORM_PACK16,
 										 VK_IMAGE_ASPECT_COLOR_BIT);
 	conchars_sampler = Hash_Find (ctx->samplers, "quakepic");
 
+	uint16_t *chars_data = ctx->staging[0]->data;
+	size_t size = charspic->width * charspic->height;
+	for (size_t i = 0; i < size; i++) {
+		// convert 0xff = transparent, 0xfe = white to 0x0000 and 0xffff
+		// for a1r5g5b5
+		uint16_t    pix = (charspic->data[i] & 1) - 1;
+		chars_data[i] = ~pix;
+	}
+	QFV_FlushStagingBuffer (ctx->staging[0], 0, size);
+	VkImageMemoryBarrier barrier;
+	qfv_pipelinestagepair_t stages;
+	dfunc->vkWaitForFences (device->dev, 1, &ctx->fence, VK_TRUE, ~0ull);
+	dfunc->vkResetCommandBuffer (cmd, 0);
+	VkCommandBufferBeginInfo beginInfo = {
+		VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, 0,
+		VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT, 0,
+	};
+	dfunc->vkBeginCommandBuffer (cmd, &beginInfo);
+
+	stages = imageLayoutTransitionStages[qfv_LT_Undefined_to_TransferDst];
+	barrier=imageLayoutTransitionBarriers[qfv_LT_Undefined_to_TransferDst];
+	barrier.image = conchars_image;
+	dfunc->vkCmdPipelineBarrier (cmd, stages.src, stages.dst, 0,
+								 0, 0,
+								 0, 0,
+								 1, &barrier);
+
+	VkBufferImageCopy region = {
+		0, 0, 0,
+		{ VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1 },
+		{ 0, 0, 0 },
+		{ charspic->width, charspic->height, 1 },
+	};
+	dfunc->vkCmdCopyBufferToImage (cmd,
+								   ctx->staging[0]->buffer, conchars_image,
+								   VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
+								   1, &region);
+
+	stages = imageLayoutTransitionStages[qfv_LT_TransferDst_to_ShaderReadOnly];
+	barrier=imageLayoutTransitionBarriers[qfv_LT_TransferDst_to_ShaderReadOnly];
+	barrier.image = conchars_image;
+	dfunc->vkCmdPipelineBarrier (cmd, stages.src, stages.dst, 0,
+								 0, 0,
+								 0, 0,
+								 1, &barrier);
+	dfunc->vkEndCommandBuffer (cmd);
+
+	VkSubmitInfo submitInfo = {
+		VK_STRUCTURE_TYPE_SUBMIT_INFO, 0,
+		0, 0, 0,
+		1, &cmd,
+		0, 0,
+	};
+	dfunc->vkResetFences (device->dev, 1, &ctx->fence);
+	dfunc->vkQueueSubmit (device->queue.queue, 1, &submitInfo, ctx->fence);
+
 	twod = Vulkan_CreatePipeline (ctx, "twod");
 
 	handleref_t *h;

From 6e636a27d06e8aef530af862eeb29c732a178a42 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 11 Jan 2021 16:57:31 +0900
Subject: [PATCH 1285/1519] [renderer] Continue the job of merging
 SCR_UpdateScreen

I think this is probably as merged as it will get (though the update
callbacks can probably do with some merging).
---
 include/QF/plugin/vid_render.h          |  4 +--
 include/QF/screen.h                     |  3 +++
 include/r_internal.h                    |  2 +-
 libs/video/renderer/gl/gl_screen.c      | 34 +++++--------------------
 libs/video/renderer/gl/namehack.h       |  4 +--
 libs/video/renderer/glsl/glsl_screen.c  | 18 +++----------
 libs/video/renderer/glsl/namehack.h     |  4 +--
 libs/video/renderer/r_screen.c          | 31 ++++++++++++++++++++++
 libs/video/renderer/sw/screen.c         | 30 +---------------------
 libs/video/renderer/sw32/namehack.h     |  4 +--
 libs/video/renderer/sw32/screen.c       | 30 +---------------------
 libs/video/renderer/vid_render_gl.c     |  2 +-
 libs/video/renderer/vid_render_glsl.c   |  2 +-
 libs/video/renderer/vid_render_sw.c     |  2 +-
 libs/video/renderer/vid_render_sw32.c   |  2 +-
 libs/video/renderer/vid_render_vulkan.c |  4 +--
 libs/video/renderer/vulkan/namehack.h   |  2 --
 nq/source/cl_screen.c                   |  2 +-
 qw/source/cl_screen.c                   |  2 +-
 ruamoko/qwaq/builtins/qwaq-bi.c         |  2 +-
 20 files changed, 63 insertions(+), 121 deletions(-)

diff --git a/include/QF/plugin/vid_render.h b/include/QF/plugin/vid_render.h
index 6de6e9af7..fc011a8b6 100644
--- a/include/QF/plugin/vid_render.h
+++ b/include/QF/plugin/vid_render.h
@@ -130,9 +130,6 @@ typedef struct vid_render_funcs_s {
 	void (*Draw_SubPic) (int x, int y, qpic_t *pic, int srcx, int srcy, int width, int height);
 
 
-	// scr_funcs is a null terminated array
-	void (*SCR_UpdateScreen) (double realtime, SCR_Func scr_3dfunc,
-							  SCR_Func *scr_funcs);
 	void (*SCR_DrawRam) (void);
 	void (*SCR_DrawTurtle) (void);
 	void (*SCR_DrawPause) (void);
@@ -146,6 +143,7 @@ typedef struct vid_render_funcs_s {
 	void (*Fog_ParseWorldspawn) (struct plitem_s *worldspawn);
 
 	void (*R_Init) (void);
+	void (*R_RenderFrame) (SCR_Func scr_3dfunc, SCR_Func *scr_funcs);
 	void (*R_ClearState) (void);
 	void (*R_LoadSkys) (const char *);
 	void (*R_NewMap) (model_t *worldmodel, model_t **models, int num_models);
diff --git a/include/QF/screen.h b/include/QF/screen.h
index 8dda2deb4..b904f1c7c 100644
--- a/include/QF/screen.h
+++ b/include/QF/screen.h
@@ -35,6 +35,9 @@ void SCR_Init_Cvars (void);
 void SCR_Init (void);
 
 typedef void (*SCR_Func)(void);
+// scr_funcs is a null terminated array
+void SCR_UpdateScreen (double realtime, SCR_Func scr_3dfunc,
+					   SCR_Func *scr_funcs);
 
 void SCR_SizeUp (void);
 void SCR_SizeDown (void);
diff --git a/include/r_internal.h b/include/r_internal.h
index 547d4d1bf..de11978fa 100644
--- a/include/r_internal.h
+++ b/include/r_internal.h
@@ -44,7 +44,7 @@ void gl_R_Init (void);
 void glsl_R_Init (void);
 void sw_R_Init (void);
 void sw32_R_Init (void);
-
+void R_RenderFrame (SCR_Func scr_3dfunc, SCR_Func *scr_funcs);
 void R_Init_Cvars (void);
 void R_InitEfrags (void);
 void R_ClearState (void);
diff --git a/libs/video/renderer/gl/gl_screen.c b/libs/video/renderer/gl/gl_screen.c
index fbe47106f..5758b5941 100644
--- a/libs/video/renderer/gl/gl_screen.c
+++ b/libs/video/renderer/gl/gl_screen.c
@@ -188,37 +188,23 @@ SCR_TileClear (void)
 	}
 }
 
-/*
-	SCR_UpdateScreen
-
-	This is called every frame, and can also be called explicitly to flush
-	text to the screen.
-
-	WARNING: be very careful calling this from elsewhere, because the refresh
-	needs almost the entire 256k of stack space!
-*/
 void
-gl_SCR_UpdateScreen (double realtime, SCR_Func scr_3dfunc, SCR_Func *scr_funcs)
+gl_R_RenderFrame (SCR_Func scr_3dfunc, SCR_Func *scr_funcs)
 {
 	double      time1 = 0, time2;
 	static int  begun = 0;
 
-	if (scr_skipupdate)
-		return;
-
-	if (begun)
+	if (begun) {
 		gl_ctx->end_rendering ();
-
-	vr_data.realtime = realtime;
+		begun = 0;
+	}
 
 	vid.numpages = 2 + gl_triplebuffer->int_val;
 
-	scr_copytop = 0;
+	//FIXME forces the status bar to redraw. needed because it does not fully
+	//update in sw modes but must in gl mode
 	vr_data.scr_copyeverything = 1;
 
-	if (!scr_initialized)
-		return;							// not initialized yet
-
 	begun = 1;
 
 	if (r_speeds->int_val) {
@@ -227,14 +213,6 @@ gl_SCR_UpdateScreen (double realtime, SCR_Func scr_3dfunc, SCR_Func *scr_funcs)
 		gl_c_alias_polys = 0;
 	}
 
-	if (oldfov != scr_fov->value) {		// determine size of refresh window
-		oldfov = scr_fov->value;
-		vid.recalc_refdef = true;
-	}
-
-	if (vid.recalc_refdef)
-		SCR_CalcRefdef ();
-
 	// do 3D refresh drawing, and then update the screen
 	scr_3dfunc ();
 
diff --git a/libs/video/renderer/gl/namehack.h b/libs/video/renderer/gl/namehack.h
index 075e31836..e33d0aef6 100644
--- a/libs/video/renderer/gl/namehack.h
+++ b/libs/video/renderer/gl/namehack.h
@@ -69,7 +69,7 @@
 #define SCR_CaptureBGR gl_SCR_CaptureBGR
 #define SCR_ScreenShot gl_SCR_ScreenShot
 #define SCR_ScreenShot_f gl_SCR_ScreenShot_f
-#define SCR_UpdateScreen gl_SCR_UpdateScreen
+#define R_RenderFrame gl_R_RenderFrame
 #define c_alias_polys gl_c_alias_polys
 #define c_brush_polys gl_c_brush_polys
 #define r_easter_eggs_f gl_r_easter_eggs_f
@@ -125,7 +125,7 @@
 #undef SCR_CaptureBGR
 #undef SCR_ScreenShot
 #undef SCR_ScreenShot_f
-#undef SCR_UpdateScreen
+#undef R_RenderFrame
 #undef c_alias_polys
 #undef c_brush_polys
 #undef r_easter_eggs_f
diff --git a/libs/video/renderer/glsl/glsl_screen.c b/libs/video/renderer/glsl/glsl_screen.c
index 89276999d..098f6a816 100644
--- a/libs/video/renderer/glsl/glsl_screen.c
+++ b/libs/video/renderer/glsl/glsl_screen.c
@@ -155,8 +155,7 @@ SCR_TileClear (void)
 }
 
 void
-glsl_SCR_UpdateScreen (double realtime, SCR_Func scr_3dfunc,
-					   SCR_Func *scr_funcs)
+glsl_R_RenderFrame (SCR_Func scr_3dfunc, SCR_Func *scr_funcs)
 {
 	static int  begun = 0;
 
@@ -169,23 +168,14 @@ glsl_SCR_UpdateScreen (double realtime, SCR_Func scr_3dfunc,
 		glsl_ctx->end_rendering ();
 	}
 
-	vr_data.realtime = realtime;
-	vr_data.scr_copyeverything = 1;
 	//FIXME useless cvar? vid.numpages = 2 + gl_triplebuffer->int_val;
 
-	if (!scr_initialized)
-		return;
-
 	qfeglClear (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
 	begun = 1;
-
-	if (oldfov != scr_fov->value) {
-		oldfov = scr_fov->value;
-		vid.recalc_refdef = true;
-	}
-	if (vid.recalc_refdef)
-		SCR_CalcRefdef ();
+	//FIXME forces the status bar to redraw. needed because it does not fully
+	//update in sw modes but must in glsl mode
+	vr_data.scr_copyeverything = 1;
 
 	scr_3dfunc ();
 
diff --git a/libs/video/renderer/glsl/namehack.h b/libs/video/renderer/glsl/namehack.h
index 7edaed944..aed6d2e21 100644
--- a/libs/video/renderer/glsl/namehack.h
+++ b/libs/video/renderer/glsl/namehack.h
@@ -72,7 +72,7 @@
 #define SCR_CaptureBGR glsl_SCR_CaptureBGR
 #define SCR_ScreenShot glsl_SCR_ScreenShot
 #define SCR_ScreenShot_f glsl_SCR_ScreenShot_f
-#define SCR_UpdateScreen glsl_SCR_UpdateScreen
+#define R_RenderFrame glsl_R_RenderFrame
 #define c_alias_polys glsl_c_alias_polys
 #define c_brush_polys glsl_c_brush_polys
 #define r_easter_eggs_f glsl_r_easter_eggs_f
@@ -128,7 +128,7 @@
 #undef SCR_CaptureBGR
 #undef SCR_ScreenShot
 #undef SCR_ScreenShot_f
-#undef SCR_UpdateScreen
+#undef R_RenderFrame
 #undef c_alias_polys
 #undef c_brush_polys
 #undef r_easter_eggs_f
diff --git a/libs/video/renderer/r_screen.c b/libs/video/renderer/r_screen.c
index 6eb307229..db6dcbcf7 100644
--- a/libs/video/renderer/r_screen.c
+++ b/libs/video/renderer/r_screen.c
@@ -170,6 +170,37 @@ SCR_CalcRefdef (void)
 	vr_funcs->R_ViewChanged (vid.aspect);
 }
 
+/*
+	SCR_UpdateScreen
+
+	This is called every frame, and can also be called explicitly to flush
+	text to the screen.
+
+	WARNING: be very careful calling this from elsewhere, because the refresh
+	needs almost the entire 256k of stack space!
+*/
+void
+SCR_UpdateScreen (double realtime, SCR_Func scr_3dfunc, SCR_Func *scr_funcs)
+{
+	if (scr_skipupdate || !scr_initialized) {
+		return;
+	}
+
+	vr_data.realtime = realtime;
+	scr_copytop = vr_data.scr_copyeverything = 0;
+
+	if (oldfov != scr_fov->value) {
+		oldfov = scr_fov->value;
+		vid.recalc_refdef = true;
+	}
+
+	if (vid.recalc_refdef) {
+		SCR_CalcRefdef ();
+	}
+
+	vr_funcs->R_RenderFrame (scr_3dfunc, scr_funcs);
+}
+
 float
 CalcFov (float fov_x, float width, float height)
 {
diff --git a/libs/video/renderer/sw/screen.c b/libs/video/renderer/sw/screen.c
index 5b69e7a0d..4ab9302c1 100644
--- a/libs/video/renderer/sw/screen.c
+++ b/libs/video/renderer/sw/screen.c
@@ -178,39 +178,11 @@ SCR_ScreenShot_f (void)
 	dstring_delete (pcxname);
 }
 
-/*
-	SCR_UpdateScreen
-
-	This is called every frame, and can also be called explicitly to flush
-	text to the screen.
-
-	WARNING: be very careful calling this from elsewhere, because the refresh
-	needs almost the entire 256k of stack space!
-*/
 void
-SCR_UpdateScreen (double realtime, SCR_Func scr_3dfunc, SCR_Func *scr_funcs)
+R_RenderFrame (SCR_Func scr_3dfunc, SCR_Func *scr_funcs)
 {
 	vrect_t     vrect;
 
-	if (scr_skipupdate)
-		return;
-
-	vr_data.realtime = realtime;
-
-	scr_copytop = 0;
-	vr_data.scr_copyeverything = 0;
-
-	if (!scr_initialized)
-		return;							// not initialized yet
-
-	if (oldfov != scr_fov->value) {		// determine size of refresh window
-		oldfov = scr_fov->value;
-		vid.recalc_refdef = true;
-	}
-
-	if (vid.recalc_refdef)
-		SCR_CalcRefdef ();
-
 	// do 3D refresh drawing, and then update the screen
 	D_EnableBackBufferAccess ();		// of all overlay stuff if drawing
 										// directly
diff --git a/libs/video/renderer/sw32/namehack.h b/libs/video/renderer/sw32/namehack.h
index cbdb673ce..6642d2d54 100644
--- a/libs/video/renderer/sw32/namehack.h
+++ b/libs/video/renderer/sw32/namehack.h
@@ -110,7 +110,7 @@
 #define SCR_CaptureBGR sw32_SCR_CaptureBGR
 #define SCR_ScreenShot sw32_SCR_ScreenShot
 #define SCR_ScreenShot_f sw32_SCR_ScreenShot_f
-#define SCR_UpdateScreen sw32_SCR_UpdateScreen
+#define R_RenderFrame sw32_R_RenderFrame
 #define TransformVector sw32_TransformVector
 #define Turbulent sw32_Turbulent
 #define acolormap sw32_acolormap
@@ -351,7 +351,7 @@ extern struct surf_s *sw32_surfaces;
 #undef SCR_CaptureBGR
 #undef SCR_ScreenShot
 #undef SCR_ScreenShot_f
-#undef SCR_UpdateScreen
+#undef R_RenderFrame
 #undef TransformVector
 #undef Turbulent
 #undef VID_InitBuffers
diff --git a/libs/video/renderer/sw32/screen.c b/libs/video/renderer/sw32/screen.c
index e4779d8da..543c8602a 100644
--- a/libs/video/renderer/sw32/screen.c
+++ b/libs/video/renderer/sw32/screen.c
@@ -136,39 +136,11 @@ sw32_SCR_ScreenShot_f (void)
 	dstring_delete (pcxname);
 }
 
-/*
-	SCR_UpdateScreen
-
-	This is called every frame, and can also be called explicitly to flush
-	text to the screen.
-
-	WARNING: be very careful calling this from elsewhere, because the refresh
-	needs almost the entire 256k of stack space!
-*/
 void
-sw32_SCR_UpdateScreen (double realtime, SCR_Func scr_3dfunc, SCR_Func *scr_funcs)
+sw32_R_RenderFrame (SCR_Func scr_3dfunc, SCR_Func *scr_funcs)
 {
 	vrect_t     vrect;
 
-	if (scr_skipupdate)
-		return;
-
-	vr_data.realtime = realtime;
-
-	scr_copytop = 0;
-	vr_data.scr_copyeverything = 0;
-
-	if (!scr_initialized)
-		return;							// not initialized yet
-
-	if (oldfov != scr_fov->value) {		// determine size of refresh window
-		oldfov = scr_fov->value;
-		vid.recalc_refdef = true;
-	}
-
-	if (vid.recalc_refdef)
-		SCR_CalcRefdef ();
-
 	// do 3D refresh drawing, and then update the screen
 	sw32_D_EnableBackBufferAccess ();		// of all overlay stuff if drawing
 										// directly
diff --git a/libs/video/renderer/vid_render_gl.c b/libs/video/renderer/vid_render_gl.c
index 434588894..c27b5d4ac 100644
--- a/libs/video/renderer/vid_render_gl.c
+++ b/libs/video/renderer/vid_render_gl.c
@@ -93,7 +93,6 @@ vid_render_funcs_t gl_vid_render_funcs = {
 	gl_Draw_Picf,
 	gl_Draw_SubPic,
 
-	gl_SCR_UpdateScreen,
 	SCR_DrawRam,
 	SCR_DrawTurtle,
 	SCR_DrawPause,
@@ -105,6 +104,7 @@ vid_render_funcs_t gl_vid_render_funcs = {
 	gl_Fog_ParseWorldspawn,
 
 	gl_R_Init,
+	gl_R_RenderFrame,
 	gl_R_ClearState,
 	gl_R_LoadSkys,
 	gl_R_NewMap,
diff --git a/libs/video/renderer/vid_render_glsl.c b/libs/video/renderer/vid_render_glsl.c
index f8ca47174..e3b549e35 100644
--- a/libs/video/renderer/vid_render_glsl.c
+++ b/libs/video/renderer/vid_render_glsl.c
@@ -93,7 +93,6 @@ vid_render_funcs_t glsl_vid_render_funcs = {
 	glsl_Draw_Picf,
 	glsl_Draw_SubPic,
 
-	glsl_SCR_UpdateScreen,
 	SCR_DrawRam,
 	SCR_DrawTurtle,
 	SCR_DrawPause,
@@ -105,6 +104,7 @@ vid_render_funcs_t glsl_vid_render_funcs = {
 	glsl_Fog_ParseWorldspawn,
 
 	glsl_R_Init,
+	glsl_R_RenderFrame,
 	glsl_R_ClearState,
 	glsl_R_LoadSkys,
 	glsl_R_NewMap,
diff --git a/libs/video/renderer/vid_render_sw.c b/libs/video/renderer/vid_render_sw.c
index a418d200c..5c9264381 100644
--- a/libs/video/renderer/vid_render_sw.c
+++ b/libs/video/renderer/vid_render_sw.c
@@ -86,7 +86,6 @@ vid_render_funcs_t sw_vid_render_funcs = {
 	Draw_Picf,
 	Draw_SubPic,
 
-	SCR_UpdateScreen,
 	SCR_DrawRam,
 	SCR_DrawTurtle,
 	SCR_DrawPause,
@@ -98,6 +97,7 @@ vid_render_funcs_t sw_vid_render_funcs = {
 	0,
 
 	sw_R_Init,
+	R_RenderFrame,
 	R_ClearState,
 	R_LoadSkys,
 	R_NewMap,
diff --git a/libs/video/renderer/vid_render_sw32.c b/libs/video/renderer/vid_render_sw32.c
index 9fffb0298..be727c8a9 100644
--- a/libs/video/renderer/vid_render_sw32.c
+++ b/libs/video/renderer/vid_render_sw32.c
@@ -91,7 +91,6 @@ vid_render_funcs_t sw32_vid_render_funcs = {
 	sw32_Draw_Picf,
 	sw32_Draw_SubPic,
 
-	sw32_SCR_UpdateScreen,
 	SCR_DrawRam,
 	SCR_DrawTurtle,
 	SCR_DrawPause,
@@ -103,6 +102,7 @@ vid_render_funcs_t sw32_vid_render_funcs = {
 	0,
 
 	sw32_R_Init,
+	sw32_R_RenderFrame,
 	sw32_R_ClearState,
 	sw32_R_LoadSkys,
 	sw32_R_NewMap,
diff --git a/libs/video/renderer/vid_render_vulkan.c b/libs/video/renderer/vid_render_vulkan.c
index 64d8f3766..a61a911a2 100644
--- a/libs/video/renderer/vid_render_vulkan.c
+++ b/libs/video/renderer/vid_render_vulkan.c
@@ -105,7 +105,7 @@ vulkan_R_Init (void)
 }
 
 static void
-vulkan_SCR_UpdateScreen (double time,  void (*f)(void), void (**g)(void))
+vulkan_R_RenderFrame (void (*f)(void), void (**g)(void))
 {
 	static int count = 0;
 	static double startTime;
@@ -324,7 +324,6 @@ vid_render_funcs_t vulkan_vid_render_funcs = {
 	vulkan_Draw_Picf,
 	vulkan_Draw_SubPic,
 
-	vulkan_SCR_UpdateScreen,
 	SCR_DrawRam,
 	SCR_DrawTurtle,
 	SCR_DrawPause,
@@ -336,6 +335,7 @@ vid_render_funcs_t vulkan_vid_render_funcs = {
 	0,//vulkan_Fog_ParseWorldspawn,
 
 	vulkan_R_Init,
+	vulkan_R_RenderFrame,
 	0,//vulkan_R_ClearState,
 	0,//vulkan_R_LoadSkys,
 	0,//vulkan_R_NewMap,
diff --git a/libs/video/renderer/vulkan/namehack.h b/libs/video/renderer/vulkan/namehack.h
index 7289995f2..17f107080 100644
--- a/libs/video/renderer/vulkan/namehack.h
+++ b/libs/video/renderer/vulkan/namehack.h
@@ -72,7 +72,6 @@
 #define SCR_CaptureBGR vulkan_SCR_CaptureBGR
 #define SCR_ScreenShot vulkan_SCR_ScreenShot
 #define SCR_ScreenShot_f vulkan_SCR_ScreenShot_f
-#define SCR_UpdateScreen vulkan_SCR_UpdateScreen
 #define c_alias_polys vulkan_c_alias_polys
 #define c_brush_polys vulkan_c_brush_polys
 #define r_easter_eggs_f vulkan_r_easter_eggs_f
@@ -128,7 +127,6 @@
 #undef SCR_CaptureBGR
 #undef SCR_ScreenShot
 #undef SCR_ScreenShot_f
-#undef SCR_UpdateScreen
 #undef c_alias_polys
 #undef c_brush_polys
 #undef r_easter_eggs_f
diff --git a/nq/source/cl_screen.c b/nq/source/cl_screen.c
index c7940e305..509352a1c 100644
--- a/nq/source/cl_screen.c
+++ b/nq/source/cl_screen.c
@@ -146,5 +146,5 @@ CL_UpdateScreen (double realtime)
 	scr_funcs_normal[3] = r_funcs->SCR_DrawPause;
 
 	V_PrepBlend ();
-	r_funcs->SCR_UpdateScreen (realtime, V_RenderView, scr_funcs[index]);
+	SCR_UpdateScreen (realtime, V_RenderView, scr_funcs[index]);
 }
diff --git a/qw/source/cl_screen.c b/qw/source/cl_screen.c
index 5b81f65a7..7827c30db 100644
--- a/qw/source/cl_screen.c
+++ b/qw/source/cl_screen.c
@@ -147,5 +147,5 @@ CL_UpdateScreen (double realtime)
 	scr_funcs_normal[3] = r_funcs->SCR_DrawPause;
 
 	V_PrepBlend ();
-	r_funcs->SCR_UpdateScreen (realtime, V_RenderView, scr_funcs[index]);
+	SCR_UpdateScreen (realtime, V_RenderView, scr_funcs[index]);
 }
diff --git a/ruamoko/qwaq/builtins/qwaq-bi.c b/ruamoko/qwaq/builtins/qwaq-bi.c
index 27a7ae04f..a78dd7763 100644
--- a/ruamoko/qwaq/builtins/qwaq-bi.c
+++ b/ruamoko/qwaq/builtins/qwaq-bi.c
@@ -127,7 +127,7 @@ bi_refresh (progs_t *pr)
 	IN_ProcessEvents ();
 	//GIB_Thread_Execute ();
 	Cbuf_Execute_Stack (qwaq_cbuf);
-	r_funcs->SCR_UpdateScreen (con_realtime, bi_3d, bi_2dfuncs);
+	SCR_UpdateScreen (con_realtime, bi_3d, bi_2dfuncs);
 	R_FLOAT (pr) = con_frametime;
 }
 

From bf4613acd5b2e57b01c2081ea49a93e6da25cbbd Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 12 Jan 2021 10:43:05 +0900
Subject: [PATCH 1286/1519] [vulkan] Remove missed preinitialized stages

---
 libs/video/renderer/vulkan/barrier.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/libs/video/renderer/vulkan/barrier.c b/libs/video/renderer/vulkan/barrier.c
index c7c1f21a3..e257eb990 100644
--- a/libs/video/renderer/vulkan/barrier.c
+++ b/libs/video/renderer/vulkan/barrier.c
@@ -77,9 +77,6 @@ const qfv_pipelinestagepair_t imageLayoutTransitionStages[] = {
 	// undefined -> transfer dst optimal
 	{	VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT,
 		VK_PIPELINE_STAGE_TRANSFER_BIT },
-	// preinitialized -> shader read only optimal
-	{	VK_PIPELINE_STAGE_TRANSFER_BIT,
-		VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT },
 	// transfer dst optimal -> shader read only optimal
 	{	VK_PIPELINE_STAGE_TRANSFER_BIT,
 		VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT },

From 8f6f32981c0d9b7034ebfd00585fa2722f2541ac Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 12 Jan 2021 11:26:20 +0900
Subject: [PATCH 1287/1519] [vulkan] Add some matrix buffers

It seems they could all be in the one buffer: there are indications that
uniform binding can be fairly fine-grained. I need to investigate that.
---
 include/QF/Vulkan/qf_vid.h                    |   4 +
 include/vid_vulkan.h                          |  12 ++
 libs/video/renderer/Makemodule.am             |   1 +
 libs/video/renderer/vid_render_vulkan.c       |   9 +-
 libs/video/renderer/vulkan/vulkan_matrices.c  | 204 ++++++++++++++++++
 .../video/renderer/vulkan/vulkan_vid_common.c |   1 +
 6 files changed, 230 insertions(+), 1 deletion(-)
 create mode 100644 libs/video/renderer/vulkan/vulkan_matrices.c

diff --git a/include/QF/Vulkan/qf_vid.h b/include/QF/Vulkan/qf_vid.h
index d5f59cc84..7e30a3a57 100644
--- a/include/QF/Vulkan/qf_vid.h
+++ b/include/QF/Vulkan/qf_vid.h
@@ -41,6 +41,10 @@ void Vulkan_CreateFramebuffers (struct vulkan_ctx_s *ctx);
 void Vulkan_CreateRenderPass (struct vulkan_ctx_s *ctx);
 void Vulkan_DestroyRenderPass (struct vulkan_ctx_s *ctx);
 VkPipeline Vulkan_CreatePipeline (struct vulkan_ctx_s *ctx, const char *name);
+void Vulkan_CreateMatrices (struct vulkan_ctx_s *ctx);
+void Vulkan_DestroyMatrices (struct vulkan_ctx_s *ctx);
+void Vulkan_CalcProjectionMatrices (struct vulkan_ctx_s *ctx, float aspect);
+void Vulkan_CalcViewMatrix (struct vulkan_ctx_s *ctx);
 void Vulkan_CreateSwapchain (struct vulkan_ctx_s *ctx);
 void Vulkan_CreateDevice (struct vulkan_ctx_s *ctx);
 void Vulkan_Init_Common (struct vulkan_ctx_s *ctx);
diff --git a/include/vid_vulkan.h b/include/vid_vulkan.h
index 05e127825..3ffa0052c 100644
--- a/include/vid_vulkan.h
+++ b/include/vid_vulkan.h
@@ -24,6 +24,15 @@ typedef struct vulkan_framebuffer_s {
 	VkDescriptorSet twodDescriptors;
 } vulkan_framebuffer_t;
 
+typedef struct vulkan_matrices_s {
+	VkBuffer    buffer_2d;
+	VkBuffer    buffer_3d;
+	VkDeviceMemory memory;
+	float      *projection_2d;
+	float      *projection_3d;
+	float      *view_3d;
+} vulkan_matrices_t;
+
 typedef struct vulkan_framebufferset_s
 	DARRAY_TYPE (vulkan_framebuffer_t) vulkan_framebufferset_t;
 
@@ -62,6 +71,9 @@ typedef struct vulkan_ctx_s {
 	size_t      curFrame;
 	vulkan_framebufferset_t framebuffers;
 
+	// projection and view matrices (model is push constant)
+	vulkan_matrices_t matrices;
+
 #define EXPORTED_VULKAN_FUNCTION(fname) PFN_##fname fname;
 #define GLOBAL_LEVEL_VULKAN_FUNCTION(fname) PFN_##fname fname;
 #include "QF/Vulkan/funclist.h"
diff --git a/libs/video/renderer/Makemodule.am b/libs/video/renderer/Makemodule.am
index 36b013d97..d6187a93a 100644
--- a/libs/video/renderer/Makemodule.am
+++ b/libs/video/renderer/Makemodule.am
@@ -233,6 +233,7 @@ libs_video_renderer_vid_render_vulkan_la_SOURCES = \
 	libs/video/renderer/vulkan/util.h \
 	libs/video/renderer/vulkan/vkparse.c \
 	libs/video/renderer/vulkan/vulkan_draw.c \
+	libs/video/renderer/vulkan/vulkan_matrices.c \
 	libs/video/renderer/vulkan/vulkan_vid_common.c
 
 libs/video/renderer/vulkan/vkparse.lo: libs/video/renderer/vulkan/vkparse.c $(vkparse_src)
diff --git a/libs/video/renderer/vid_render_vulkan.c b/libs/video/renderer/vid_render_vulkan.c
index a61a911a2..77368d093 100644
--- a/libs/video/renderer/vid_render_vulkan.c
+++ b/libs/video/renderer/vid_render_vulkan.c
@@ -63,6 +63,7 @@ vulkan_R_Init (void)
 	qfv_devfuncs_t *dfunc = device->funcs;
 
 	Vulkan_CreateStagingBuffers (vulkan_ctx);
+	Vulkan_CreateMatrices (vulkan_ctx);
 	Vulkan_CreateSwapchain (vulkan_ctx);
 	Vulkan_CreateRenderPass (vulkan_ctx);
 	Vulkan_CreateFramebuffers (vulkan_ctx);
@@ -276,6 +277,12 @@ vulkan_Draw_SubPic (int x, int y, qpic_t *pic, int srcx, int srcy, int width, in
 	Vulkan_Draw_SubPic (x, y, pic, srcx, srcy, width, height, vulkan_ctx);
 }
 
+static void
+vulkan_R_ViewChanged (float aspect)
+{
+	Vulkan_CalcProjectionMatrices (vulkan_ctx, aspect);
+}
+
 static vid_model_funcs_t model_funcs = {
 	0,//vulkan_Mod_LoadExternalTextures,
 	0,//vulkan_Mod_LoadLighting,
@@ -347,7 +354,7 @@ vid_render_funcs_t vulkan_vid_render_funcs = {
 	R_AllocEntity,
 	0,//vulkan_R_RenderView,
 	R_DecayLights,
-	0,//vulkan_R_ViewChanged,
+	vulkan_R_ViewChanged,
 	0,//vulkan_R_ClearParticles,
 	0,//vulkan_R_InitParticles,
 	0,//vulkan_SCR_ScreenShot_f,
diff --git a/libs/video/renderer/vulkan/vulkan_matrices.c b/libs/video/renderer/vulkan/vulkan_matrices.c
new file mode 100644
index 000000000..c734f82d0
--- /dev/null
+++ b/libs/video/renderer/vulkan/vulkan_matrices.c
@@ -0,0 +1,204 @@
+/*
+	vid_common_vulkan.c
+
+	Common Vulkan video driver functions
+
+	Copyright (C) 2021      Bill Currie <bill@taniwha.org>
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifdef HAVE_MATH_H
+# include <math.h>
+#endif
+
+#include "QF/cvar.h"
+#include "QF/mathlib.h"
+#include "QF/sys.h"
+#include "QF/vid.h"
+#include "QF/Vulkan/qf_vid.h"
+#include "QF/Vulkan/buffer.h"
+#include "QF/Vulkan/device.h"
+
+#include "compat.h"
+#include "d_iface.h"
+#include "r_internal.h"
+#include "vid_vulkan.h"
+
+#include "util.h"
+
+#define MAT_SIZE (16 * sizeof (float))
+
+static void
+ortho_mat (float *proj, float xmin, float xmax, float ymin, float ymax,
+		   float znear, float zfar)
+{
+	proj[0] = 2 / (xmax - xmin);
+	proj[4] = 0;
+	proj[8] = 0;
+	proj[12] = -(xmax + xmin) / (xmax - xmin);
+
+	proj[1] = 0;
+	proj[5] = 2 / (ymax - ymin);
+	proj[9] = 0;
+	proj[13] = -(ymax + ymin) / (ymax - ymin);
+
+	proj[2] = 0;
+	proj[6] = 0;
+	proj[10] = -2 / (zfar - znear);
+	proj[14] = -(zfar + znear) / (zfar - znear);
+
+	proj[3] = 0;
+	proj[7] = 0;
+	proj[11] = 0;
+	proj[15] = 1;
+}
+
+static void
+persp_mat (float *proj, float xmin, float xmax, float ymin, float ymax,
+		   float aspect)
+{
+	float       fovx, fovy, neard, fard;
+
+	fovx = r_refdef.fov_x;
+	fovy = r_refdef.fov_y;
+	neard = r_nearclip->value;
+	fard = r_farclip->value;
+
+	ymax = neard * tan (fovy * M_PI / 360);		// fov_2 / 2
+	ymin = -ymax;
+	xmax = neard * tan (fovx * M_PI / 360);		// fov_2 / 2
+	xmin = -xmax;
+
+	proj[0] = (2 * neard) / (xmax - xmin);
+	proj[4] = 0;
+	proj[8] = (xmax + xmin) / (xmax - xmin);
+	proj[12] = 0;
+
+	proj[1] = 0;
+	proj[5] = (2 * neard) / (ymax - ymin);
+	proj[9] = (ymax + ymin) / (ymax - ymin);
+	proj[13] = 0;
+
+	proj[2] = 0;
+	proj[6] = 0;
+	proj[10] = (fard + neard) / (neard - fard);
+	proj[14] = (2 * fard * neard) / (neard - fard);
+
+	proj[3] = 0;
+	proj[7] = 0;
+	proj[11] = -1;
+	proj[15] = 0;
+}
+
+void
+Vulkan_DestroyMatrices (vulkan_ctx_t *ctx)
+{
+	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	__auto_type mat = &ctx->matrices;
+
+	dfunc->vkUnmapMemory (device->dev, mat->memory);
+	dfunc->vkFreeMemory (device->dev, mat->memory, 0);
+	dfunc->vkDestroyBuffer (device->dev, mat->buffer_2d, 0);
+	dfunc->vkDestroyBuffer (device->dev, mat->buffer_3d, 0);
+}
+
+void
+Vulkan_CreateMatrices (vulkan_ctx_t *ctx)
+{
+	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	__auto_type mat = &ctx->matrices;
+	mat->buffer_2d = QFV_CreateBuffer (device, 1 * MAT_SIZE,
+									   VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT);
+	mat->buffer_3d = QFV_CreateBuffer (device, 2 * MAT_SIZE,
+									   VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT);
+
+	size_t      size = 0;
+	size_t      offset;
+	VkMemoryRequirements req;
+
+	dfunc->vkGetBufferMemoryRequirements (device->dev, mat->buffer_2d, &req);
+	size += req.size;
+	offset = size;
+
+	dfunc->vkGetBufferMemoryRequirements (device->dev, mat->buffer_3d, &req);
+	offset = (offset + req.alignment - 1) & ~(req.alignment - 1);
+	size += req.size;
+
+	mat->memory = QFV_AllocBufferMemory (device, mat->buffer_2d,
+										 VK_MEMORY_PROPERTY_HOST_CACHED_BIT,
+										 size, 0);
+	QFV_BindBufferMemory (device, mat->buffer_2d, mat->memory, 0);
+	QFV_BindBufferMemory (device, mat->buffer_3d, mat->memory, offset);
+	void       *data;
+	dfunc->vkMapMemory (device->dev, mat->memory, 0, size, 0, &data);
+	mat->projection_2d = data;
+	mat->projection_3d = mat->projection_2d + offset / sizeof (float);
+	mat->view_3d = mat->projection_3d + 16;
+}
+
+void
+Vulkan_CalcProjectionMatrices (vulkan_ctx_t *ctx, float aspect)
+{
+	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	__auto_type mat = &ctx->matrices;
+
+	int width = vid.conwidth;
+	int height = vid.conheight;
+
+	ortho_mat (mat->projection_2d, 0, width, 0, height, -99999, 99999);
+	persp_mat (mat->projection_3d, 0, width, 0, height, aspect);
+
+	Sys_MaskPrintf (SYS_VULKAN, "ortho:\n");
+	Sys_MaskPrintf (SYS_VULKAN, "   [[%g, %g, %g, %g],\n",
+					QuatExpand (mat->projection_2d + 0));
+	Sys_MaskPrintf (SYS_VULKAN, "    [%g, %g, %g, %g],\n",
+					QuatExpand (mat->projection_2d + 4));
+	Sys_MaskPrintf (SYS_VULKAN, "    [%g, %g, %g, %g],\n",
+					QuatExpand (mat->projection_2d + 8));
+	Sys_MaskPrintf (SYS_VULKAN, "    [%g, %g, %g, %g]]\n",
+					QuatExpand (mat->projection_2d + 12));
+	Sys_MaskPrintf (SYS_VULKAN, "presp:\n");
+	Sys_MaskPrintf (SYS_VULKAN, "   [[%g, %g, %g, %g],\n",
+					QuatExpand (mat->projection_3d + 0));
+	Sys_MaskPrintf (SYS_VULKAN, "    [%g, %g, %g, %g],\n",
+					QuatExpand (mat->projection_3d + 4));
+	Sys_MaskPrintf (SYS_VULKAN, "    [%g, %g, %g, %g],\n",
+					QuatExpand (mat->projection_3d + 8));
+	Sys_MaskPrintf (SYS_VULKAN, "    [%g, %g, %g, %g]]\n",
+					QuatExpand (mat->projection_3d + 12));
+
+	VkMappedMemoryRange ranges[] = {
+		{ VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE, 0, mat->memory, 0, MAT_SIZE },
+		{ VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE, 0, mat->memory,
+		  (mat->projection_3d - mat->projection_2d) * sizeof (float),
+		  MAT_SIZE},
+	};
+	dfunc->vkFlushMappedMemoryRanges (device->dev, 2, ranges);
+}
diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c
index e35d5765c..c166c239b 100644
--- a/libs/video/renderer/vulkan/vulkan_vid_common.c
+++ b/libs/video/renderer/vulkan/vulkan_vid_common.c
@@ -175,6 +175,7 @@ Vulkan_Shutdown_Common (vulkan_ctx_t *ctx)
 	}
 	QFV_DestroyStagingBuffer (ctx->staging[0]);
 	QFV_DestroyStagingBuffer (ctx->staging[1]);
+	Vulkan_DestroyMatrices (ctx);
 	ctx->instance->funcs->vkDestroySurfaceKHR (ctx->instance->instance,
 											   ctx->surface, 0);
 	clear_table (&ctx->pipelineLayouts);

From bb4ca7683ee028a107d5cebae98f93186491f0ef Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 12 Jan 2021 11:27:41 +0900
Subject: [PATCH 1288/1519] [vulkan] Get the 2D pipeline up and running

First pixels! This was a nightmare of little issues that the validation
layers couldn't help with: incorrect input assembly, incorrect vertex
attribute specs. Though the layers did help with getting the queues
working. Still, lots of work to go but this is a major breakthrough as
I now have access to visual debugging for textures and the like.
---
 include/QF/Vulkan/funclist.h                  |   8 +
 include/QF/Vulkan/qf_draw.h                   |   1 +
 include/vid_vulkan.h                          |   2 +
 libs/video/renderer/vid_render_vulkan.c       |  67 ++--
 libs/video/renderer/vulkan/qfpipeline.plist   |  16 +-
 libs/video/renderer/vulkan/twod.vert          |   9 +-
 libs/video/renderer/vulkan/vulkan_draw.c      | 286 +++++++++++++++++-
 .../video/renderer/vulkan/vulkan_vid_common.c |   7 +-
 8 files changed, 343 insertions(+), 53 deletions(-)

diff --git a/include/QF/Vulkan/funclist.h b/include/QF/Vulkan/funclist.h
index 8ab62852a..534097b5d 100644
--- a/include/QF/Vulkan/funclist.h
+++ b/include/QF/Vulkan/funclist.h
@@ -166,6 +166,14 @@ DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdNextSubpass)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdEndRenderPass)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdBindPipeline)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdClearColorImage)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdExecuteCommands)
+
+DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdSetViewport)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdSetScissor)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdBindVertexBuffers)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdBindIndexBuffer)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdBindDescriptorSets)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdDrawIndexed)
 
 #undef DEVICE_LEVEL_VULKAN_FUNCTION
 
diff --git a/include/QF/Vulkan/qf_draw.h b/include/QF/Vulkan/qf_draw.h
index b0297c2d0..c9e8b20ad 100644
--- a/include/QF/Vulkan/qf_draw.h
+++ b/include/QF/Vulkan/qf_draw.h
@@ -31,6 +31,7 @@
 struct vulkan_ctx_s;
 
 void Vulkan_Draw_Init (struct vulkan_ctx_s *ctx);
+void Vulkan_Draw_Shutdown (struct vulkan_ctx_s *ctx);
 void Vulkan_Draw_Character (int x, int y, unsigned ch,
 							struct vulkan_ctx_s *ctx);
 void Vulkan_Draw_String (int x, int y, const char *str,
diff --git a/include/vid_vulkan.h b/include/vid_vulkan.h
index 3ffa0052c..784c74312 100644
--- a/include/vid_vulkan.h
+++ b/include/vid_vulkan.h
@@ -21,6 +21,8 @@ typedef struct vulkan_framebuffer_s {
 	VkSemaphore renderDoneSemaphore;
 	VkCommandBuffer cmdBuffer;
 
+	struct qfv_cmdbufferset_s *subCommand;
+
 	VkDescriptorSet twodDescriptors;
 } vulkan_framebuffer_t;
 
diff --git a/libs/video/renderer/vid_render_vulkan.c b/libs/video/renderer/vid_render_vulkan.c
index 77368d093..431f6e0b4 100644
--- a/libs/video/renderer/vid_render_vulkan.c
+++ b/libs/video/renderer/vid_render_vulkan.c
@@ -59,9 +59,6 @@ static vulkan_ctx_t *vulkan_ctx;
 static void
 vulkan_R_Init (void)
 {
-	qfv_device_t *device = vulkan_ctx->device;
-	qfv_devfuncs_t *dfunc = device->funcs;
-
 	Vulkan_CreateStagingBuffers (vulkan_ctx);
 	Vulkan_CreateMatrices (vulkan_ctx);
 	Vulkan_CreateSwapchain (vulkan_ctx);
@@ -72,41 +69,18 @@ vulkan_R_Init (void)
 	vulkan_ctx->pipeline = Vulkan_CreatePipeline (vulkan_ctx, "pipeline");
 	Vulkan_Draw_Init (vulkan_ctx);
 
-	qfv_swapchain_t *sc = vulkan_ctx->swapchain;
-
-	VkCommandBufferBeginInfo beginInfo
-		= { VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO };
-	VkClearValue clearValues[3] = {
-		{ { {0.7294, 0.8549, 0.3333, 1.0} } },
-		{ { {1.0, 0.0} } },
-		{ { {0, 0, 0, 0} } },
-	};
-	VkRenderPassBeginInfo renderPassInfo = {
-		VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO, 0,
-		vulkan_ctx->renderpass.renderpass, 0,
-		{ {0, 0}, sc->extent },
-		2, clearValues + 2
-	};
-	for (size_t i = 0; i < vulkan_ctx->framebuffers.size; i++) {
-		__auto_type framebuffer = &vulkan_ctx->framebuffers.a[i];
-		dfunc->vkBeginCommandBuffer (framebuffer->cmdBuffer, &beginInfo);
-		renderPassInfo.framebuffer = framebuffer->framebuffer;
-		dfunc->vkCmdBeginRenderPass (framebuffer->cmdBuffer, &renderPassInfo,
-				VK_SUBPASS_CONTENTS_INLINE);
-
-		dfunc->vkCmdEndRenderPass (framebuffer->cmdBuffer);
-		dfunc->vkEndCommandBuffer (framebuffer->cmdBuffer);
-	}
 	Sys_Printf ("R_Init %p %d", vulkan_ctx->swapchain->swapchain,
 				vulkan_ctx->swapchain->numImages);
 	for (int32_t i = 0; i < vulkan_ctx->swapchain->numImages; i++) {
 		Sys_Printf (" %p", vulkan_ctx->swapchain->images->a[i]);
 	}
 	Sys_Printf ("\n");
+
+	SCR_Init ();
 }
 
 static void
-vulkan_R_RenderFrame (void (*f)(void), void (**g)(void))
+vulkan_R_RenderFrame (SCR_Func scr_3dfunc, SCR_Func *scr_funcs)
 {
 	static int count = 0;
 	static double startTime;
@@ -116,6 +90,12 @@ vulkan_R_RenderFrame (void (*f)(void), void (**g)(void))
 	VkDevice    dev = device->dev;
 	qfv_queue_t *queue = &vulkan_ctx->device->queue;
 
+	scr_3dfunc ();
+	while (*scr_funcs) {
+		(*scr_funcs) ();
+		scr_funcs++;
+	}
+
 	__auto_type framebuffer
 		= &vulkan_ctx->framebuffers.a[vulkan_ctx->curFrame];
 
@@ -124,6 +104,34 @@ vulkan_R_RenderFrame (void (*f)(void), void (**g)(void))
 						  framebuffer->imageAvailableSemaphore,
 						  0, &imageIndex);
 
+	Vulkan_FlushText (vulkan_ctx);
+
+	qfv_swapchain_t *sc = vulkan_ctx->swapchain;
+	VkCommandBufferBeginInfo beginInfo
+		= { VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO };
+	VkClearValue clearValues[2] = {
+		{ { {0.0, 0.0, 0.0, 1.0} } },
+		{ { {1.0, 0.0} } },
+	};
+	VkRenderPassBeginInfo renderPassInfo = {
+		VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO, 0,
+		vulkan_ctx->renderpass.renderpass, 0,
+		{ {0, 0}, sc->extent },
+		2, clearValues
+	};
+
+	dfunc->vkBeginCommandBuffer (framebuffer->cmdBuffer, &beginInfo);
+	renderPassInfo.framebuffer = framebuffer->framebuffer;
+	dfunc->vkCmdBeginRenderPass (framebuffer->cmdBuffer, &renderPassInfo,
+			VK_SUBPASS_CONTENTS_SECONDARY_COMMAND_BUFFERS);
+
+	dfunc->vkCmdExecuteCommands (framebuffer->cmdBuffer,
+								 framebuffer->subCommand->size,
+								 framebuffer->subCommand->a);
+
+	dfunc->vkCmdEndRenderPass (framebuffer->cmdBuffer);
+	dfunc->vkEndCommandBuffer (framebuffer->cmdBuffer);
+
 	VkPipelineStageFlags waitStage
 		= VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
 	VkSubmitInfo submitInfo = {
@@ -425,6 +433,7 @@ vulkan_vid_render_shutdown (void)
 	QFV_DeviceWaitIdle (device);
 	df->vkDestroyFence (dev, vulkan_ctx->fence, 0);
 	df->vkDestroyCommandPool (dev, vulkan_ctx->cmdpool, 0);
+	Vulkan_Draw_Shutdown (vulkan_ctx);
 	Vulkan_Shutdown_Common (vulkan_ctx);
 }
 
diff --git a/libs/video/renderer/vulkan/qfpipeline.plist b/libs/video/renderer/vulkan/qfpipeline.plist
index 819492c93..3d7ec1f10 100644
--- a/libs/video/renderer/vulkan/qfpipeline.plist
+++ b/libs/video/renderer/vulkan/qfpipeline.plist
@@ -24,7 +24,7 @@
 			compareEnable = 0;//FIXME false!!!
 			compareOp = always;
 			minLod = 0;
-			maxLod = 0.25f;
+			maxLod = 0;
 			borderColor = float_transparent_black;
 			unnormalizedCoordinates = 1;//FIXME true!!!
 		};
@@ -113,20 +113,26 @@
 					{
 						location = 0;
 						binding = 0;
-						format = r32g32b32a32_sfloat;
+						format = r32g32_sfloat;
 						offset = 0;
 					},
 					{
 						location = 1;
 						binding = 0;
+						format = r32g32_sint;
+						offset = 8;
+					},
+					{
+						location = 2;
+						binding = 0;
 						format = r32g32b32a32_sfloat;
-						offset = 4;
+						offset = 16;
 					},
 				);
 			};
 			inputAssembly = {
-				topology = triangle_list;
-				primitiveRestartEnable = 0;
+				topology = triangle_strip;
+				primitiveRestartEnable = 1;
 			};
 			viewport = {
 				viewports = (
diff --git a/libs/video/renderer/vulkan/twod.vert b/libs/video/renderer/vulkan/twod.vert
index 83655d6a7..5db2990db 100644
--- a/libs/video/renderer/vulkan/twod.vert
+++ b/libs/video/renderer/vulkan/twod.vert
@@ -2,8 +2,6 @@
 
 layout (set = 0, binding = 0) uniform Matrices {
 	mat4 Projection;
-	mat4 View;
-	mat4 Model;
 };
 /** Vertex position.
 
@@ -12,8 +10,9 @@ layout (set = 0, binding = 0) uniform Matrices {
 	\a vertex provides the onscreen location at which to draw the icon
 	(\a x, \a y) and texture coordinate for the icon (\a s=z, \a t=w).
 */
-layout (location = 0) in vec4 vertex;
-layout (location = 1) in vec4 vcolor;
+layout (location = 0) in vec2 vertex;
+layout (location = 1) in ivec2 uv;
+layout (location = 2) in vec4 vcolor;
 
 layout (location = 0) out vec2 st;
 layout (location = 1) out vec4 color;
@@ -22,6 +21,6 @@ void
 main (void)
 {
 	gl_Position = Projection * vec4 (vertex.xy, 0.0, 1.0);
-	st = vertex.zw;
+	st = vec2(uv);
 	color = vcolor;
 }
diff --git a/libs/video/renderer/vulkan/vulkan_draw.c b/libs/video/renderer/vulkan/vulkan_draw.c
index a7459bd4c..76cbb0c82 100644
--- a/libs/video/renderer/vulkan/vulkan_draw.c
+++ b/libs/video/renderer/vulkan/vulkan_draw.c
@@ -53,6 +53,8 @@
 #include "QF/Vulkan/qf_draw.h"
 #include "QF/Vulkan/qf_vid.h"
 #include "QF/Vulkan/barrier.h"
+#include "QF/Vulkan/buffer.h"
+#include "QF/Vulkan/command.h"
 #include "QF/Vulkan/descriptor.h"
 #include "QF/Vulkan/device.h"
 #include "QF/Vulkan/image.h"
@@ -62,13 +64,86 @@
 #include "vid_vulkan.h"
 #include "vkparse.h"
 
+typedef struct {
+	float       xy[2];
+	int         st[2];
+	float       color[4];
+} drawvert_t;
+
+#define MAX_QUADS (65536)
+#define VERTS_PER_QUAD (4)
+#define INDS_PER_QUAD (5)	// one per vert plus primitive reset
+
 //FIXME move into a context struct
 VkImage         conchars_image;
 VkDeviceMemory  conchars_memory;
 VkImageView     conchars_view;
 VkSampler       conchars_sampler;
 
-VkPipeline		twod;
+VkBuffer        quad_vert_buffer;
+VkBuffer        quad_ind_buffer;
+VkDeviceMemory  quad_memory;
+drawvert_t     *quad_verts;
+uint32_t       *quad_inds;
+uint32_t        num_quads;
+
+VkPipeline		twod_pipeline;
+VkPipelineLayout twod_layout;
+size_t          draw_cmdBuffer;
+
+static void
+create_quad_buffers (vulkan_ctx_t *ctx)
+{
+	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	//FIXME quad_inds can be a completely separate buffer that is
+	//pre-initialized to draw 2-tri triangle strips as the actual indices will
+	//never change
+	size_t      vert_size = MAX_QUADS * VERTS_PER_QUAD * sizeof (drawvert_t);
+	size_t      ind_size = MAX_QUADS * INDS_PER_QUAD * sizeof (uint32_t);
+
+	quad_vert_buffer = QFV_CreateBuffer (device, vert_size,
+										 VK_BUFFER_USAGE_VERTEX_BUFFER_BIT);
+	quad_ind_buffer = QFV_CreateBuffer (device, ind_size,
+										VK_BUFFER_USAGE_INDEX_BUFFER_BIT);
+	quad_memory = QFV_AllocBufferMemory (device, quad_vert_buffer,
+										 VK_MEMORY_PROPERTY_HOST_CACHED_BIT,
+										 vert_size + ind_size, 0);
+	QFV_BindBufferMemory (device, quad_vert_buffer, quad_memory, 0);
+	QFV_BindBufferMemory (device, quad_ind_buffer, quad_memory, vert_size);
+	void       *data;
+	dfunc->vkMapMemory (device->dev, quad_memory, 0, vert_size + ind_size,
+						0, &data);
+	quad_verts = data;
+	quad_inds = (uint32_t *) (quad_verts + MAX_QUADS * VERTS_PER_QUAD);
+	// pre-initialize quad_inds as the indices will never change
+	uint32_t   *ind = quad_inds;
+	for (int i = 0; i < MAX_QUADS; i++) {
+		for (int j = 0; j < VERTS_PER_QUAD; j++) {
+			*ind++ = i * VERTS_PER_QUAD + j;
+		}
+		// mark end of primitive
+		*ind++ = -1;
+	}
+	VkMappedMemoryRange range = {
+		VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE, 0,
+		quad_memory, vert_size, ind_size,
+	};
+	dfunc->vkFlushMappedMemoryRanges (device->dev, 1, &range);
+}
+
+static void
+destroy_quad_buffers (vulkan_ctx_t *ctx)
+{
+	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	dfunc->vkUnmapMemory (device->dev, quad_memory);
+	dfunc->vkFreeMemory (device->dev, quad_memory, 0);
+	dfunc->vkDestroyBuffer (device->dev, quad_vert_buffer, 0);
+	dfunc->vkDestroyBuffer (device->dev, quad_ind_buffer, 0);
+}
 
 static qpic_t *
 pic_data (const char *name, int w, int h, const byte *data)
@@ -117,14 +192,15 @@ Vulkan_Draw_TextBox (int x, int y, int width, int lines, byte alpha,
 {
 }
 
-static void
-Vulkan_Draw_Shutdown (void *data)
+void
+Vulkan_Draw_Shutdown (vulkan_ctx_t *ctx)
 {
-	vulkan_ctx_t *ctx = data;
 	qfv_device_t *device = ctx->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
 
-	dfunc->vkDestroyPipeline (device->dev, twod, 0);
+	destroy_quad_buffers (ctx);
+
+	dfunc->vkDestroyPipeline (device->dev, twod_pipeline, 0);
 	dfunc->vkDestroyImageView (device->dev, conchars_view, 0);
 	dfunc->vkFreeMemory (device->dev, conchars_memory, 0);
 	dfunc->vkDestroyImage (device->dev, conchars_image, 0);
@@ -133,12 +209,12 @@ Vulkan_Draw_Shutdown (void *data)
 void
 Vulkan_Draw_Init (vulkan_ctx_t *ctx)
 {
-	Sys_RegisterShutdown (Vulkan_Draw_Shutdown, ctx);
-
 	qfv_device_t *device = ctx->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
 	VkCommandBuffer cmd = ctx->cmdbuffer;
 
+	create_quad_buffers (ctx);
+
 	qpic_t     *charspic = Draw_Font8x8Pic ();
 	VkExtent3D  extent = { charspic->width, charspic->height, 1 };
 	conchars_image = QFV_CreateImage (device, 0, VK_IMAGE_TYPE_2D,
@@ -156,7 +232,9 @@ Vulkan_Draw_Init (vulkan_ctx_t *ctx)
 										 VK_IMAGE_VIEW_TYPE_2D,
 										 VK_FORMAT_A1R5G5B5_UNORM_PACK16,
 										 VK_IMAGE_ASPECT_COLOR_BIT);
-	conchars_sampler = Hash_Find (ctx->samplers, "quakepic");
+	handleref_t *h;
+	h = Hash_Find (ctx->samplers, "quakepic");
+	conchars_sampler = (VkSampler) h->handle;
 
 	uint16_t *chars_data = ctx->staging[0]->data;
 	size_t size = charspic->width * charspic->height;
@@ -164,9 +242,9 @@ Vulkan_Draw_Init (vulkan_ctx_t *ctx)
 		// convert 0xff = transparent, 0xfe = white to 0x0000 and 0xffff
 		// for a1r5g5b5
 		uint16_t    pix = (charspic->data[i] & 1) - 1;
-		chars_data[i] = ~pix;
+		chars_data[i] = pix;
 	}
-	QFV_FlushStagingBuffer (ctx->staging[0], 0, size);
+	QFV_FlushStagingBuffer (ctx->staging[0], 0, size * sizeof (uint16_t));
 	VkImageMemoryBarrier barrier;
 	qfv_pipelinestagepair_t stages;
 	dfunc->vkWaitForFences (device->dev, 1, &ctx->fence, VK_TRUE, ~0ull);
@@ -214,9 +292,11 @@ Vulkan_Draw_Init (vulkan_ctx_t *ctx)
 	dfunc->vkResetFences (device->dev, 1, &ctx->fence);
 	dfunc->vkQueueSubmit (device->queue.queue, 1, &submitInfo, ctx->fence);
 
-	twod = Vulkan_CreatePipeline (ctx, "twod");
+	twod_pipeline = Vulkan_CreatePipeline (ctx, "twod");
+
+	h = Hash_Find (ctx->pipelineLayouts, "twod");
+	twod_layout = (VkPipelineLayout) h->handle;
 
-	handleref_t *h;
 	__auto_type layouts = QFV_AllocDescriptorSetLayoutSet (ctx->framebuffers.size, alloca);
 	for (size_t i = 0; i < layouts->size; i++) {
 		h = Hash_Find (ctx->setLayouts, "twod");
@@ -224,31 +304,167 @@ Vulkan_Draw_Init (vulkan_ctx_t *ctx)
 	}
 	h = Hash_Find (ctx->descriptorPools, "twod");
 	__auto_type pool = (VkDescriptorPool) h->handle;
+
+	VkDescriptorBufferInfo bufferInfo = {
+		ctx->matrices.buffer_2d, 0, VK_WHOLE_SIZE
+	};
+	VkDescriptorImageInfo imageInfo = {
+		conchars_sampler,
+		conchars_view,
+		VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL,
+	};
+	__auto_type cmdBuffers
+		= QFV_AllocateCommandBuffers (device, ctx->cmdpool, 1,
+									  ctx->framebuffers.size);
+
 	__auto_type sets = QFV_AllocateDescriptorSet (device, pool, layouts);
 	for (size_t i = 0; i < ctx->framebuffers.size; i++) {
-		ctx->framebuffers.a[i].twodDescriptors = sets->a[i];
+		__auto_type frame = &ctx->framebuffers.a[i];
+		frame->twodDescriptors = sets->a[i];
+
+		VkWriteDescriptorSet write[] = {
+			{ VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, 0,
+			  frame->twodDescriptors, 0, 0, 1,
+			  VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER,
+			  0, &bufferInfo, 0 },
+			{ VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, 0,
+			  frame->twodDescriptors, 1, 0, 1,
+			  VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER,
+			  &imageInfo, 0, 0 },
+		};
+		dfunc->vkUpdateDescriptorSets (device->dev, 2, write, 0, 0);
+		draw_cmdBuffer = frame->subCommand->size;
+		DARRAY_APPEND (frame->subCommand, cmdBuffers->a[i]);
 	}
+	free (sets);
+	free (cmdBuffers);
+}
+
+static inline void
+draw_pic (float x, float y, int w, int h, qpic_t *pic,
+		  int srcx, int srcy, int srcw, int srch,
+		  float *color)
+{
+	if (num_quads + VERTS_PER_QUAD > MAX_QUADS) {
+		return;
+	}
+
+	drawvert_t *verts = quad_verts + num_quads * VERTS_PER_QUAD;
+	num_quads += VERTS_PER_QUAD;
+
+	float sl = (srcx);
+	float sr = (srcx + srcw);
+	float st = (srcy);
+	float sb = (srcy + srch);
+
+	verts[0].xy[0] = x;
+	verts[0].xy[1] = y;
+	verts[0].st[0] = sl;
+	verts[0].st[1] = st;
+	QuatCopy (color, verts[0].color);
+
+	verts[1].xy[0] = x;
+	verts[1].xy[1] = y + h;
+	verts[1].st[0] = sl;
+	verts[1].st[1] = sb;
+	QuatCopy (color, verts[1].color);
+
+	verts[2].xy[0] = x + w;
+	verts[2].xy[1] = y;
+	verts[2].st[0] = sr;
+	verts[2].st[1] = st;
+	QuatCopy (color, verts[2].color);
+
+	verts[3].xy[0] = x + w;
+	verts[3].xy[1] = y + h;
+	verts[3].st[0] = sr;
+	verts[3].st[1] = sb;
+	QuatCopy (color, verts[3].color);
+}
+
+static inline void
+queue_character (int x, int y, byte chr, vulkan_ctx_t *ctx)
+{
+	quat_t      color = {1, 1, 1, 1};
+	int         cx, cy;
+	cx = chr % 16;
+	cy = chr / 16;
+
+	draw_pic (x, y, 8, 8, 0/*FIXME*/, cx * 8, cy * 8, 8, 8, color);
 }
 
 void
 Vulkan_Draw_Character (int x, int y, unsigned int chr, vulkan_ctx_t *ctx)
 {
+	if (chr == ' ') {
+		return;
+	}
+	if (y <= -8 || y >= vid.conheight) {
+		return;
+	}
+	if (x <= -8 || x >= vid.conwidth) {
+		return;
+	}
+	queue_character (x, y, chr, ctx);
 }
 
 void
 Vulkan_Draw_String (int x, int y, const char *str, vulkan_ctx_t *ctx)
 {
+	byte        chr;
+
+	if (!str || !str[0]) {
+		return;
+	}
+	if (y <= -8 || y >= vid.conheight) {
+		return;
+	}
+	while (*str) {
+		if ((chr = *str++) != ' ' && x >= -8 && x < vid.conwidth) {
+			queue_character (x, y, chr, ctx);
+		}
+		x += 8;
+	}
 }
 
 void
 Vulkan_Draw_nString (int x, int y, const char *str, int count,
 					 vulkan_ctx_t *ctx)
 {
+	byte        chr;
+
+	if (!str || !str[0]) {
+		return;
+	}
+	if (y <= -8 || y >= vid.conheight) {
+		return;
+	}
+	while (count-- > 0 && *str) {
+		if ((chr = *str++) != ' ' && x >= -8 && x < vid.conwidth) {
+			queue_character (x, y, chr, ctx);
+		}
+		x += 8;
+	}
 }
 
 void
 Vulkan_Draw_AltString (int x, int y, const char *str, vulkan_ctx_t *ctx)
 {
+	byte        chr;
+
+	if (!str || !str[0]) {
+		return;
+	}
+	if (y <= -8 || y >= vid.conheight) {
+		return;
+	}
+	while (*str) {
+		if ((chr = *str++ | 0x80) != (' ' | 0x80)
+			&& x >= -8 && x < vid.conwidth) {
+			queue_character (x, y, chr, ctx);
+		}
+		x += 8;
+	}
 }
 
 void
@@ -321,6 +537,50 @@ Vulkan_DrawReset (vulkan_ctx_t *ctx)
 void
 Vulkan_FlushText (vulkan_ctx_t *ctx)
 {
+	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+	__auto_type frame = &ctx->framebuffers.a[ctx->curFrame];
+	VkCommandBuffer cmd = frame->subCommand->a[draw_cmdBuffer];
+
+	VkMappedMemoryRange range = {
+		VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE, 0,
+		quad_memory, 0, num_quads * VERTS_PER_QUAD * sizeof (drawvert_t),
+	};
+	dfunc->vkFlushMappedMemoryRanges (device->dev, 1, &range);
+
+	dfunc->vkResetCommandBuffer (cmd, 0);
+	VkCommandBufferInheritanceInfo inherit = {
+		VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_INFO, 0,
+		ctx->renderpass.renderpass, 0,
+		frame->framebuffer,
+		0, 0, 0
+	};
+	VkCommandBufferBeginInfo beginInfo = {
+		VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, 0,
+		VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT
+		| VK_COMMAND_BUFFER_USAGE_RENDER_PASS_CONTINUE_BIT, &inherit,
+	};
+	dfunc->vkBeginCommandBuffer (cmd, &beginInfo);
+
+	dfunc->vkCmdBindPipeline (cmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
+							  twod_pipeline);
+	VkViewport viewport = {0, 0, vid.width, vid.height, 0, 1};
+	VkRect2D scissor = { {0, 0}, {vid.width, vid.height} };
+	dfunc->vkCmdSetViewport (cmd, 0, 1, &viewport);
+	dfunc->vkCmdSetScissor (cmd, 0, 1, &scissor);
+	VkDeviceSize offsets[] = {0};
+	dfunc->vkCmdBindVertexBuffers (cmd, 0, 1, &quad_vert_buffer, offsets);
+	dfunc->vkCmdBindIndexBuffer (cmd, quad_ind_buffer, 0,
+								 VK_INDEX_TYPE_UINT32);
+	VkDescriptorSet set = frame->twodDescriptors;
+	VkPipelineLayout layout = twod_layout;
+	dfunc->vkCmdBindDescriptorSets (cmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
+									layout, 0, 1, &set, 0, 0);
+	dfunc->vkCmdDrawIndexed (cmd, num_quads * INDS_PER_QUAD, 1, 0, 0, 0);
+
+	dfunc->vkEndCommandBuffer (cmd);
+
+	num_quads = 0;
 }
 
 void
diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c
index c166c239b..126d602fd 100644
--- a/libs/video/renderer/vulkan/vulkan_vid_common.c
+++ b/libs/video/renderer/vulkan/vulkan_vid_common.c
@@ -3,7 +3,6 @@
 
 	Common Vulkan video driver functions
 
-	Copyright (C) 1996-1997 Id Software, Inc.
 	Copyright (C) 2019      Bill Currie <bill@taniwha.org>
 
 	This program is free software; you can redistribute it and/or
@@ -54,6 +53,7 @@
 #include "QF/vid.h"
 #include "QF/Vulkan/qf_vid.h"
 #include "QF/Vulkan/barrier.h"
+#include "QF/Vulkan/buffer.h"
 #include "QF/Vulkan/descriptor.h"
 #include "QF/Vulkan/device.h"
 #include "QF/Vulkan/command.h"
@@ -127,6 +127,7 @@ Vulkan_Init_Cvars (void)
 	msaaSamples = Cvar_Get ("msaaSamples", "VK_SAMPLE_COUNT_1_BIT",
 										 CVAR_NONE, msaaSamples_f,
 										 "desired MSAA sample size.");
+	R_Init_Cvars ();
 }
 
 static const char *instance_extensions[] = {
@@ -415,7 +416,11 @@ Vulkan_CreateFramebuffers (vulkan_ctx_t *ctx)
 		frame->imageAvailableSemaphore = QFV_CreateSemaphore (device);
 		frame->renderDoneSemaphore = QFV_CreateSemaphore (device);
 		frame->cmdBuffer = cmdBuffers->a[i];
+
+		frame->subCommand = malloc (sizeof (qfv_cmdbufferset_t));
+		DARRAY_INIT (frame->subCommand, 4);
 	}
+	free (cmdBuffers);
 }
 
 void

From 03f614ccb90bd99243c83674c7a05fb7ff7fd129 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 12 Jan 2021 13:07:51 +0900
Subject: [PATCH 1289/1519] [vulkan] Parse VkBool32 correctly as bool type

This makes it much clearer whether something is just a flag or an index
of some sort.
---
 libs/video/renderer/vulkan/qfpipeline.plist | 32 ++++++++++-----------
 libs/video/renderer/vulkan/vkgen/vkalias.r  | 22 ++++++++++++--
 libs/video/renderer/vulkan/vkgen/vkenum.r   |  6 ++++
 libs/video/renderer/vulkan/vkgen/vkgen.r    |  5 +++-
 4 files changed, 46 insertions(+), 19 deletions(-)

diff --git a/libs/video/renderer/vulkan/qfpipeline.plist b/libs/video/renderer/vulkan/qfpipeline.plist
index 3d7ec1f10..437ab5854 100644
--- a/libs/video/renderer/vulkan/qfpipeline.plist
+++ b/libs/video/renderer/vulkan/qfpipeline.plist
@@ -19,14 +19,14 @@
 			addressModeV = clamp_to_edge;
 			addressModeW = clamp_to_edge;
 			mipLodBias = 0;
-			anisotropyEnable = 0;//FIXME false!!!
+			anisotropyEnable = false;
 			maxAnisotropy = 0;
-			compareEnable = 0;//FIXME false!!!
+			compareEnable = false;
 			compareOp = always;
 			minLod = 0;
 			maxLod = 0;
 			borderColor = float_transparent_black;
-			unnormalizedCoordinates = 1;//FIXME true!!!
+			unnormalizedCoordinates = true;
 		};
 	};
 	descriptorPools = {
@@ -132,7 +132,7 @@
 			};
 			inputAssembly = {
 				topology = triangle_strip;
-				primitiveRestartEnable = 1;
+				primitiveRestartEnable = true;
 			};
 			viewport = {
 				viewports = (
@@ -150,32 +150,32 @@
 				);
 			};
 			rasterization = {
-				depthClampEnable = 0;
-				rasterizerDiscardEnable = 0;
+				depthClampEnable = false;
+				rasterizerDiscardEnable = false;
 				polygonMode = fill;
 				cullMode = back;
 				frontFace = counter_clockwise;
-				depthBiasEnable = 0;
+				depthBiasEnable = false;
 				lineWidth = 1;
 			};
 			multisample = {
 				rasterizationSamples = $msaaSamples;
-				sampleShadingEnable = 0;
+				sampleShadingEnable = false;
 				minSampleShading = 0.5f;
-				alphaToCoverageEnable = 0;
-				alphaToOneEnable = 0;
+				alphaToCoverageEnable = false;
+				alphaToOneEnable = false;
 			};
 			depthStencil = {
-				depthTestEnable = 1;
-				depthWriteEnable = 1;
+				depthTestEnable = true;
+				depthWriteEnable = true;
 				depthCompareOp = less;
-				depthBoundsTestEnable = 0;
-				stencilTestEnable = 0;
+				depthBoundsTestEnable = false;
+				stencilTestEnable = false;
 			};
 			colorBlend = {
-				logicOpEnable = 0;
+				logicOpEnable = false;
 				attachments = ({
-					blendEnable = 0;
+					blendEnable = false;
 					srcColorBlendFactor = src_color;
 					dstColorBlendFactor = zero;
 					colorBlendOp = add;
diff --git a/libs/video/renderer/vulkan/vkgen/vkalias.r b/libs/video/renderer/vulkan/vkgen/vkalias.r
index be783b207..cde6eb270 100644
--- a/libs/video/renderer/vulkan/vkgen/vkalias.r
+++ b/libs/video/renderer/vulkan/vkgen/vkalias.r
@@ -28,14 +28,16 @@
 			[enumObj addToQueue];
 		}
 	} else if (name == "VkBool32") {
-		// drop
+		id enumObj = [(id) Hash_Find (available_types, name) resolveType];
+		[enumObj addToQueue];
 	} else if ([alias class] == [Enum class]
 			   || [alias class] == [Struct class]) {
 		[alias addToQueue];
 	} else if (alias.type.meta == ty_basic && alias.type.type == ev_pointer) {
 		Type       *type = [Type findType:alias.type.fldptr.aux_type];
 		if (!type) {
-			// pointer to opaque struct. Probably VK_DEFINE_NON_DISPATCHABLE_HANDLE or VK_DEFINE_HANDLE
+			// pointer to opaque struct. Probably
+			// VK_DEFINE_NON_DISPATCHABLE_HANDLE or VK_DEFINE_HANDLE
 			string createInfo = name + "CreateInfo";
 			id structObj = (id) Hash_Find (available_types, createInfo);
 			if (structObj) {
@@ -62,6 +64,10 @@
 			return [enumObj cexprType];
 		}
 	}
+	if (name == "VkBool32") {
+		id enumObj = [(id) Hash_Find (available_types, name) resolveType];
+		return [enumObj cexprType];
+	}
 	if (name == "uint32_t") {
 		return "cexpr_uint";
 	}
@@ -83,6 +89,10 @@
 			return [enumObj parseType];
 		}
 	}
+	if (name == "VkBool32") {
+		id enumObj = [(id) Hash_Find (available_types, name) resolveType];
+		return [enumObj parseType];
+	}
 	if (name == "uint32_t" || name == "size_t") {
 		return "QFString";
 	}
@@ -101,6 +111,10 @@
 			return [enumObj parseFunc];
 		}
 	}
+	if (name == "VkBool32") {
+		id enumObj = [(id) Hash_Find (available_types, name) resolveType];
+		return [enumObj parseFunc];
+	}
 	if (name == "uint32_t") {
 		return "parse_uint32_t";
 	}
@@ -119,6 +133,10 @@
 			return [enumObj parseData];
 		}
 	}
+	if (name == "VkBool32") {
+		id enumObj = [(id) Hash_Find (available_types, name) resolveType];
+		return [enumObj parseData];
+	}
 	if (name == "uint32_t" || name == "size_t") {
 		return "0";
 	}
diff --git a/libs/video/renderer/vulkan/vkgen/vkenum.r b/libs/video/renderer/vulkan/vkgen/vkenum.r
index 537916800..7c974f6fb 100644
--- a/libs/video/renderer/vulkan/vkgen/vkenum.r
+++ b/libs/video/renderer/vulkan/vkgen/vkenum.r
@@ -3,6 +3,12 @@
 #include "vkenum.h"
 #include "vkgen.h"
 
+typedef enum VkBool32 {
+	VK_FALSE,
+	VK_TRUE,
+	VK_MAX_ENUM = VK_TRUE
+} VkBool32;
+
 @implementation Enum
 -(void)process
 {
diff --git a/libs/video/renderer/vulkan/vkgen/vkgen.r b/libs/video/renderer/vulkan/vkgen/vkgen.r
index 4636df52f..01637c54a 100644
--- a/libs/video/renderer/vulkan/vkgen/vkgen.r
+++ b/libs/video/renderer/vulkan/vkgen/vkgen.r
@@ -117,7 +117,10 @@ scan_types (void)
 			string tag = str_mid(type.strct.tag, 4);
 			Type *avail_type = [Type fromType: type];
 			if (avail_type) {
-				Hash_Add (available_types, avail_type);
+				if (!Hash_Find (available_types, [avail_type name])) {
+					printf ("scan: %s %s\n", tag, [avail_type name]);
+					Hash_Add (available_types, avail_type);
+				}
 			}
 		}
 	}

From 8a85b5c610b5c3d475bae6b3c51a3ce0f3b76690 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 12 Jan 2021 13:51:41 +0900
Subject: [PATCH 1290/1519] [vulkan] Switch to float/normalized for pics

It gives better results when pics are squished or expanded.
---
 libs/video/renderer/vulkan/qfpipeline.plist |  4 ++--
 libs/video/renderer/vulkan/twod.vert        |  4 ++--
 libs/video/renderer/vulkan/vulkan_draw.c    | 10 +++++-----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/libs/video/renderer/vulkan/qfpipeline.plist b/libs/video/renderer/vulkan/qfpipeline.plist
index 437ab5854..a291ddf09 100644
--- a/libs/video/renderer/vulkan/qfpipeline.plist
+++ b/libs/video/renderer/vulkan/qfpipeline.plist
@@ -26,7 +26,7 @@
 			minLod = 0;
 			maxLod = 0;
 			borderColor = float_transparent_black;
-			unnormalizedCoordinates = true;
+			unnormalizedCoordinates = false;
 		};
 	};
 	descriptorPools = {
@@ -119,7 +119,7 @@
 					{
 						location = 1;
 						binding = 0;
-						format = r32g32_sint;
+						format = r32g32_sfloat;
 						offset = 8;
 					},
 					{
diff --git a/libs/video/renderer/vulkan/twod.vert b/libs/video/renderer/vulkan/twod.vert
index 5db2990db..c5dc5063a 100644
--- a/libs/video/renderer/vulkan/twod.vert
+++ b/libs/video/renderer/vulkan/twod.vert
@@ -11,7 +11,7 @@ layout (set = 0, binding = 0) uniform Matrices {
 	(\a x, \a y) and texture coordinate for the icon (\a s=z, \a t=w).
 */
 layout (location = 0) in vec2 vertex;
-layout (location = 1) in ivec2 uv;
+layout (location = 1) in vec2 uv;
 layout (location = 2) in vec4 vcolor;
 
 layout (location = 0) out vec2 st;
@@ -21,6 +21,6 @@ void
 main (void)
 {
 	gl_Position = Projection * vec4 (vertex.xy, 0.0, 1.0);
-	st = vec2(uv);
+	st = uv;
 	color = vcolor;
 }
diff --git a/libs/video/renderer/vulkan/vulkan_draw.c b/libs/video/renderer/vulkan/vulkan_draw.c
index 76cbb0c82..5dca3b98e 100644
--- a/libs/video/renderer/vulkan/vulkan_draw.c
+++ b/libs/video/renderer/vulkan/vulkan_draw.c
@@ -66,7 +66,7 @@
 
 typedef struct {
 	float       xy[2];
-	int         st[2];
+	float       st[2];
 	float       color[4];
 } drawvert_t;
 
@@ -352,10 +352,10 @@ draw_pic (float x, float y, int w, int h, qpic_t *pic,
 	drawvert_t *verts = quad_verts + num_quads * VERTS_PER_QUAD;
 	num_quads += VERTS_PER_QUAD;
 
-	float sl = (srcx);
-	float sr = (srcx + srcw);
-	float st = (srcy);
-	float sb = (srcy + srch);
+	float sl = (srcx + 0.03125) / 128.0;
+	float sr = (srcx + srcw - 0.03125) / 128.0;
+	float st = (srcy + 0.03125) / 128.0;
+	float sb = (srcy + srch - 0.03125) / 128.0;
 
 	verts[0].xy[0] = x;
 	verts[0].xy[1] = y;

From 93aa038d9e8511a5857109c4468ce8bd027436a5 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 12 Jan 2021 14:56:02 +0900
Subject: [PATCH 1291/1519] [vulkan] Generate handle get functions

Cleans up (hides) the casting when fetching a handle.
---
 libs/video/renderer/vulkan/vkgen/vkhandle.r |  7 +++++++
 libs/video/renderer/vulkan/vkparse.h        |  7 +++++++
 libs/video/renderer/vulkan/vulkan_draw.c    | 13 ++++---------
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/libs/video/renderer/vulkan/vkgen/vkhandle.r b/libs/video/renderer/vulkan/vkgen/vkhandle.r
index b76d99af4..ec78c22ba 100644
--- a/libs/video/renderer/vulkan/vkgen/vkhandle.r
+++ b/libs/video/renderer/vulkan/vkgen/vkhandle.r
@@ -56,10 +56,17 @@ output_handle (string name, PLItem *handle)
 	}
 	fprintf (output_file, "}\n");
 
+	fprintf (output_file, "%s QFV_Get%s (vulkan_ctx_t *ctx, const char *name)\n", name, str_mid (name, 2));
+	fprintf (output_file, "{\n");
+	fprintf (output_file, "\thandleref_t *handleref = Hash_Find (ctx->%s, name);\n", symtab);
+	fprintf (output_file, "\treturn handleref ? (%s) handleref->handle : 0;\n", name);
+	fprintf (output_file, "}\n");
+
 	if (!custom) {
 		fprintf (header_file, "static int parse_%s (const plitem_t *item, void **data, plitem_t *messages, parsectx_t *context);\n", name);
 	}
 	fprintf (header_file, "int parse_%s_handleref (const plfield_t *field, const plitem_t *item, void *data, plitem_t *messages, void *context);\n", name);
+	fprintf (output_file, "%s QFV_Get%s (vulkan_ctx_t *ctx, const char *name);\n", name, str_mid (name, 2));
 	str_free (custom);
 	str_free (symtab);
 	str_free (class);
diff --git a/libs/video/renderer/vulkan/vkparse.h b/libs/video/renderer/vulkan/vkparse.h
index 75dd8fe9d..459c0f6a2 100644
--- a/libs/video/renderer/vulkan/vkparse.h
+++ b/libs/video/renderer/vulkan/vkparse.h
@@ -24,6 +24,13 @@ typedef struct handleref_s {
 	uint64_t    handle;
 } handleref_t;
 
+VkShaderModule QFV_GetShaderModule (vulkan_ctx_t *ctx, const char *name);
+VkDescriptorPool QFV_GetDescriptorPool (vulkan_ctx_t *ctx, const char *name);
+VkDescriptorSetLayout QFV_GetDescriptorSetLayout (vulkan_ctx_t *ctx,
+												  const char *name);
+VkPipelineLayout QFV_GetPipelineLayout (vulkan_ctx_t *ctx, const char *name);
+VkSampler QFV_GetSampler (vulkan_ctx_t *ctx, const char *name);
+
 void QFV_ParseResources (vulkan_ctx_t *ctx, plitem_t *plist);
 void QFV_InitParse (vulkan_ctx_t *ctx);
 exprenum_t *QFV_GetEnum (const char *name);
diff --git a/libs/video/renderer/vulkan/vulkan_draw.c b/libs/video/renderer/vulkan/vulkan_draw.c
index 5dca3b98e..89ead5380 100644
--- a/libs/video/renderer/vulkan/vulkan_draw.c
+++ b/libs/video/renderer/vulkan/vulkan_draw.c
@@ -232,9 +232,7 @@ Vulkan_Draw_Init (vulkan_ctx_t *ctx)
 										 VK_IMAGE_VIEW_TYPE_2D,
 										 VK_FORMAT_A1R5G5B5_UNORM_PACK16,
 										 VK_IMAGE_ASPECT_COLOR_BIT);
-	handleref_t *h;
-	h = Hash_Find (ctx->samplers, "quakepic");
-	conchars_sampler = (VkSampler) h->handle;
+	conchars_sampler = QFV_GetSampler (ctx, "quakepic");
 
 	uint16_t *chars_data = ctx->staging[0]->data;
 	size_t size = charspic->width * charspic->height;
@@ -294,16 +292,13 @@ Vulkan_Draw_Init (vulkan_ctx_t *ctx)
 
 	twod_pipeline = Vulkan_CreatePipeline (ctx, "twod");
 
-	h = Hash_Find (ctx->pipelineLayouts, "twod");
-	twod_layout = (VkPipelineLayout) h->handle;
+	twod_layout = QFV_GetPipelineLayout (ctx, "twod");
 
 	__auto_type layouts = QFV_AllocDescriptorSetLayoutSet (ctx->framebuffers.size, alloca);
 	for (size_t i = 0; i < layouts->size; i++) {
-		h = Hash_Find (ctx->setLayouts, "twod");
-		layouts->a[i] = (VkDescriptorSetLayout) h->handle;
+		layouts->a[i] = QFV_GetDescriptorSetLayout (ctx, "twod");
 	}
-	h = Hash_Find (ctx->descriptorPools, "twod");
-	__auto_type pool = (VkDescriptorPool) h->handle;
+	__auto_type pool = QFV_GetDescriptorPool (ctx, "twod");
 
 	VkDescriptorBufferInfo bufferInfo = {
 		ctx->matrices.buffer_2d, 0, VK_WHOLE_SIZE

From 858ac1932726a239e272a0aa1449149588ba141f Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 12 Jan 2021 16:14:46 +0900
Subject: [PATCH 1292/1519] [renderer] Move r_screen and r_cvar into main bin

r_screen because of SCR_UpdateScreen, and r_cvar because the cvars
really should never have been in a plugin in the first place (and
r_screen needed access).
---
 include/QF/plugin/vid_render.h          |  1 +
 libs/video/renderer/Makemodule.am       |  4 +-
 libs/video/renderer/r_cvar.c            | 22 ++++++----
 libs/video/renderer/r_main.c            |  2 -
 libs/video/renderer/r_screen.c          | 56 +++++++++++++------------
 libs/video/renderer/vid_render_gl.c     |  1 +
 libs/video/renderer/vid_render_glsl.c   |  1 +
 libs/video/renderer/vid_render_sw.c     |  1 +
 libs/video/renderer/vid_render_sw32.c   |  1 +
 libs/video/renderer/vid_render_vulkan.c |  1 +
 10 files changed, 51 insertions(+), 39 deletions(-)

diff --git a/include/QF/plugin/vid_render.h b/include/QF/plugin/vid_render.h
index fc011a8b6..462aaabf4 100644
--- a/include/QF/plugin/vid_render.h
+++ b/include/QF/plugin/vid_render.h
@@ -153,6 +153,7 @@ typedef struct vid_render_funcs_s {
 	void (*R_LineGraph) (int x, int y, int *h_vals, int count);
 	dlight_t *(*R_AllocDlight) (int key);
 	entity_t *(*R_AllocEntity) (void);
+	void (*R_MaxDlightsCheck) (struct cvar_s *var);
 	void (*R_RenderView) (void);
 	void (*R_DecayLights) (double frametime);
 
diff --git a/libs/video/renderer/Makemodule.am b/libs/video/renderer/Makemodule.am
index d6187a93a..3e5dd4f70 100644
--- a/libs/video/renderer/Makemodule.am
+++ b/libs/video/renderer/Makemodule.am
@@ -17,7 +17,6 @@ video_renderer_common_sources = \
 	libs/video/renderer/noisetextures.c \
 	libs/video/renderer/r_alias.c \
 	libs/video/renderer/r_bsp.c \
-	libs/video/renderer/r_cvar.c \
 	libs/video/renderer/r_dyn_textures.c \
 	libs/video/renderer/r_efrag.c \
 	libs/video/renderer/r_ent.c \
@@ -26,7 +25,6 @@ video_renderer_common_sources = \
 	libs/video/renderer/r_light.c \
 	libs/video/renderer/r_main.c \
 	libs/video/renderer/r_part.c \
-	libs/video/renderer/r_screen.c \
 	libs/video/renderer/vid_common.c
 
 renderer_libs= \
@@ -37,7 +35,9 @@ libs_video_renderer_libQFrenderer_la_LDFLAGS=		@STATIC@
 libs_video_renderer_libQFrenderer_la_LIBADD=		$(renderer_libs)
 libs_video_renderer_libQFrenderer_la_DEPENDENCIES=	$(renderer_libs)
 libs_video_renderer_libQFrenderer_la_SOURCES=\
+	libs/video/renderer/r_cvar.c \
 	libs/video/renderer/r_init.c \
+	libs/video/renderer/r_screen.c \
 	libs/video/renderer/r_progs.c
 
 video_renderer_gl_libs= \
diff --git a/libs/video/renderer/r_cvar.c b/libs/video/renderer/r_cvar.c
index d9f3e14d2..98cd22858 100644
--- a/libs/video/renderer/r_cvar.c
+++ b/libs/video/renderer/r_cvar.c
@@ -138,7 +138,7 @@ r_farclip_f (cvar_t *var)
 		Cvar_SetValue (r_particles_nearclip,
 					   bound (r_nearclip->value, r_particles_nearclip->value,
 							  r_farclip->value));
-	vid.recalc_refdef = true;
+	r_data->vid->recalc_refdef = true;
 }
 
 static void
@@ -149,7 +149,7 @@ r_nearclip_f (cvar_t *var)
 		Cvar_SetValue (r_particles_nearclip,
 					   bound (r_nearclip->value, r_particles_nearclip->value,
 							  r_farclip->value));
-	vid.recalc_refdef = true;
+	r_data->vid->recalc_refdef = true;
 }
 
 static void
@@ -176,13 +176,19 @@ viewsize_f (cvar_t *var)
 	if (var->int_val < 30 || var->int_val > 120) {
 		Cvar_SetValue (var, bound (30, var->int_val, 120));
 	} else {
-		vid.recalc_refdef = true;
+		r_data->vid->recalc_refdef = true;
 		r_viewsize = bound (0, var->int_val, 100);
-		if (vr_data.viewsize_callback)
-			vr_data.viewsize_callback (var);
+		if (r_data->viewsize_callback)
+			r_data->viewsize_callback (var);
 	}
 }
 
+static void
+r_dlight_max_f (cvar_t *var)
+{
+	r_funcs->R_MaxDlightsCheck (var);
+}
+
 void
 R_Init_Cvars (void)
 {
@@ -218,7 +224,7 @@ R_Init_Cvars (void)
 								  NULL, "Set to 1 for high quality dynamic "
 								  "lighting.");
 	r_dlight_max = Cvar_Get ("r_dlight_max", "32", CVAR_ARCHIVE,
-							 R_MaxDlightsCheck, "Number of dynamic lights.");
+							 r_dlight_max_f, "Number of dynamic lights.");
 	r_drawentities = Cvar_Get ("r_drawentities", "1", CVAR_NONE, NULL,
 							   "Toggles drawing of entities (almost "
 							   "everything but the world)");
@@ -309,6 +315,6 @@ R_Init_Cvars (void)
 	scr_viewsize = Cvar_Get ("viewsize", "100", CVAR_ARCHIVE, viewsize_f,
 							 "Set the screen size 30 minimum, 120 maximum");
 
-	vr_data.graphheight = r_graphheight;
-	vr_data.scr_viewsize = scr_viewsize;
+	r_data->graphheight = r_graphheight;
+	r_data->scr_viewsize = scr_viewsize;
 }
diff --git a/libs/video/renderer/r_main.c b/libs/video/renderer/r_main.c
index 0d38123d3..bc1590dd0 100644
--- a/libs/video/renderer/r_main.c
+++ b/libs/video/renderer/r_main.c
@@ -70,8 +70,6 @@ vec3_t      r_entorigin;		// the currently rendering entity in world
 entity_t   *currententity;
 entity_t    r_worldentity;
 
-qboolean    r_cache_thrash;		// set if surface cache is thrashing
-
 // view origin
 vec3_t      vup, base_vup;
 vec3_t      vpn, base_vpn;
diff --git a/libs/video/renderer/r_screen.c b/libs/video/renderer/r_screen.c
index db6dcbcf7..5e4e3ba61 100644
--- a/libs/video/renderer/r_screen.c
+++ b/libs/video/renderer/r_screen.c
@@ -97,6 +97,8 @@ byte       *draw_chars;					// 8*8 graphic characters FIXME location
 float       oldfov;
 int         oldsbar;
 
+qboolean    r_cache_thrash;		// set if surface cache is thrashing
+
 qboolean    scr_initialized;			// ready to draw
 
 qpic_t     *scr_ram;
@@ -117,7 +119,7 @@ R_SetVrect (vrect_t *vrectin, vrect_t *vrect, int lineadj)
 
 	// intermission is always full screen
 	size = min (r_viewsize, 100);
-	if (vr_data.force_fullscreen) {
+	if (r_data->force_fullscreen) {
 		size = 100.0;
 		lineadj = 0;
 	}
@@ -148,18 +150,18 @@ SCR_CalcRefdef (void)
 	refdef_t   *refdef = r_data->refdef;
 
 	// force a background redraw
-	vr_data.scr_fullupdate = 0;
-	vid.recalc_refdef = 0;
+	r_data->scr_fullupdate = 0;
+	r_data->vid->recalc_refdef = 0;
 
 	// bound field of view
 	Cvar_SetValue (scr_fov, bound (1, scr_fov->value, 170));
 
 	vrect.x = 0;
 	vrect.y = 0;
-	vrect.width = vid.width;
-	vrect.height = vid.height;
+	vrect.width = r_data->vid->width;
+	vrect.height = r_data->vid->height;
 
-	R_SetVrect (&vrect, &scr_vrect, vr_data.lineadj);
+	R_SetVrect (&vrect, &scr_vrect, r_data->lineadj);
 
 	refdef->vrect = scr_vrect;
 	refdef->fov_x = scr_fov->value;
@@ -167,7 +169,7 @@ SCR_CalcRefdef (void)
 		CalcFov (refdef->fov_x, refdef->vrect.width, refdef->vrect.height);
 
 	// notify the refresh of the change
-	vr_funcs->R_ViewChanged (vid.aspect);
+	r_funcs->R_ViewChanged (r_data->vid->aspect);
 }
 
 /*
@@ -186,19 +188,19 @@ SCR_UpdateScreen (double realtime, SCR_Func scr_3dfunc, SCR_Func *scr_funcs)
 		return;
 	}
 
-	vr_data.realtime = realtime;
-	scr_copytop = vr_data.scr_copyeverything = 0;
+	r_data->realtime = realtime;
+	scr_copytop = r_data->scr_copyeverything = 0;
 
 	if (oldfov != scr_fov->value) {
 		oldfov = scr_fov->value;
-		vid.recalc_refdef = true;
+		r_data->vid->recalc_refdef = true;
 	}
 
-	if (vid.recalc_refdef) {
+	if (r_data->vid->recalc_refdef) {
 		SCR_CalcRefdef ();
 	}
 
-	vr_funcs->R_RenderFrame (scr_3dfunc, scr_funcs);
+	r_funcs->R_RenderFrame (scr_3dfunc, scr_funcs);
 }
 
 float
@@ -221,7 +223,7 @@ CalcFov (float fov_x, float width, float height)
 static void
 ScreenShot_f (void)
 {
-	vr_funcs->SCR_ScreenShot_f ();
+	r_funcs->SCR_ScreenShot_f ();
 }
 
 /*
@@ -234,7 +236,7 @@ SCR_SizeUp_f (void)
 {
 	if (scr_viewsize->int_val < 120) {
 		Cvar_SetValue (scr_viewsize, scr_viewsize->int_val + 10);
-		vid.recalc_refdef = 1;
+		r_data->vid->recalc_refdef = 1;
 	}
 }
 
@@ -247,7 +249,7 @@ static void
 SCR_SizeDown_f (void)
 {
 	Cvar_SetValue (scr_viewsize, scr_viewsize->int_val - 10);
-	vid.recalc_refdef = 1;
+	r_data->vid->recalc_refdef = 1;
 }
 
 void
@@ -259,7 +261,7 @@ SCR_DrawRam (void)
 	if (!r_cache_thrash)
 		return;
 
-	vr_funcs->Draw_Pic (scr_vrect.x + 32, scr_vrect.y, scr_ram);
+	r_funcs->Draw_Pic (scr_vrect.x + 32, scr_vrect.y, scr_ram);
 }
 
 void
@@ -270,7 +272,7 @@ SCR_DrawTurtle (void)
 	if (!scr_showturtle->int_val)
 		return;
 
-	if (vr_data.frametime < 0.1) {
+	if (r_data->frametime < 0.1) {
 		count = 0;
 		return;
 	}
@@ -279,7 +281,7 @@ SCR_DrawTurtle (void)
 	if (count < 3)
 		return;
 
-	vr_funcs->Draw_Pic (scr_vrect.x, scr_vrect.y, scr_turtle);
+	r_funcs->Draw_Pic (scr_vrect.x, scr_vrect.y, scr_turtle);
 }
 
 void
@@ -290,12 +292,12 @@ SCR_DrawPause (void)
 	if (!scr_showpause->int_val)		// turn off for screenshots
 		return;
 
-	if (!vr_data.paused)
+	if (!r_data->paused)
 		return;
 
-	pic = vr_funcs->Draw_CachePic ("gfx/pause.lmp", true);
-	vr_funcs->Draw_Pic ((vid.conwidth - pic->width) / 2,
-					    (vid.conheight - 48 - pic->height) / 2, pic);
+	pic = r_funcs->Draw_CachePic ("gfx/pause.lmp", true);
+	r_funcs->Draw_Pic ((r_data->vid->conwidth - pic->width) / 2,
+					   (r_data->vid->conheight - 48 - pic->height) / 2, pic);
 }
 
 void
@@ -323,9 +325,9 @@ MipColor (int r, int g, int b)
 	for (i = 0; i < 256; i++) {
 		int         j;
 		j = i * 3;
-		r1 = vid.palette[j] - r;
-		g1 = vid.palette[j + 1] - g;
-		b1 = vid.palette[j + 2] - b;
+		r1 = r_data->vid->palette[j] - r;
+		g1 = r_data->vid->palette[j + 1] - g;
+		b1 = r_data->vid->palette[j + 2] - b;
 		dist = r1 * r1 + g1 * g1 + b1 * b1;
 		if (dist < bestdist) {
 			bestdist = dist;
@@ -391,8 +393,8 @@ SCR_Init (void)
 	Cmd_AddCommand ("sizeup", SCR_SizeUp_f, "Increases the screen size");
 	Cmd_AddCommand ("sizedown", SCR_SizeDown_f, "Decreases the screen size");
 
-	scr_ram = vr_funcs->Draw_PicFromWad ("ram");
-	scr_turtle = vr_funcs->Draw_PicFromWad ("turtle");
+	scr_ram = r_funcs->Draw_PicFromWad ("ram");
+	scr_turtle = r_funcs->Draw_PicFromWad ("turtle");
 
 	scr_initialized = true;
 }
diff --git a/libs/video/renderer/vid_render_gl.c b/libs/video/renderer/vid_render_gl.c
index c27b5d4ac..852a0a423 100644
--- a/libs/video/renderer/vid_render_gl.c
+++ b/libs/video/renderer/vid_render_gl.c
@@ -114,6 +114,7 @@ vid_render_funcs_t gl_vid_render_funcs = {
 	gl_R_LineGraph,
 	R_AllocDlight,
 	R_AllocEntity,
+	R_MaxDlightsCheck,
 	gl_R_RenderView,
 	R_DecayLights,
 	gl_R_ViewChanged,
diff --git a/libs/video/renderer/vid_render_glsl.c b/libs/video/renderer/vid_render_glsl.c
index e3b549e35..25bdb9224 100644
--- a/libs/video/renderer/vid_render_glsl.c
+++ b/libs/video/renderer/vid_render_glsl.c
@@ -114,6 +114,7 @@ vid_render_funcs_t glsl_vid_render_funcs = {
 	glsl_R_LineGraph,
 	R_AllocDlight,
 	R_AllocEntity,
+	R_MaxDlightsCheck,
 	glsl_R_RenderView,
 	R_DecayLights,
 	glsl_R_ViewChanged,
diff --git a/libs/video/renderer/vid_render_sw.c b/libs/video/renderer/vid_render_sw.c
index 5c9264381..02ff562e6 100644
--- a/libs/video/renderer/vid_render_sw.c
+++ b/libs/video/renderer/vid_render_sw.c
@@ -107,6 +107,7 @@ vid_render_funcs_t sw_vid_render_funcs = {
 	R_LineGraph,
 	R_AllocDlight,
 	R_AllocEntity,
+	R_MaxDlightsCheck,
 	R_RenderView,
 	R_DecayLights,
 	R_ViewChanged,
diff --git a/libs/video/renderer/vid_render_sw32.c b/libs/video/renderer/vid_render_sw32.c
index be727c8a9..97097e2ad 100644
--- a/libs/video/renderer/vid_render_sw32.c
+++ b/libs/video/renderer/vid_render_sw32.c
@@ -112,6 +112,7 @@ vid_render_funcs_t sw32_vid_render_funcs = {
 	sw32_R_LineGraph,
 	R_AllocDlight,
 	R_AllocEntity,
+	R_MaxDlightsCheck,
 	sw32_R_RenderView,
 	R_DecayLights,
 	sw32_R_ViewChanged,
diff --git a/libs/video/renderer/vid_render_vulkan.c b/libs/video/renderer/vid_render_vulkan.c
index 431f6e0b4..995763baf 100644
--- a/libs/video/renderer/vid_render_vulkan.c
+++ b/libs/video/renderer/vid_render_vulkan.c
@@ -360,6 +360,7 @@ vid_render_funcs_t vulkan_vid_render_funcs = {
 	0,//vulkan_R_LineGraph,
 	R_AllocDlight,
 	R_AllocEntity,
+	R_MaxDlightsCheck,
 	0,//vulkan_R_RenderView,
 	R_DecayLights,
 	vulkan_R_ViewChanged,

From db14025935b79ae2a87b42281307647ce42b4a2e Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 12 Jan 2021 17:34:57 +0900
Subject: [PATCH 1293/1519] [gamecode] Put strings and debug back in load funcs

It turns out they're required to be initialized before most of the rest
of the system.
---
 libs/gamecode/pr_debug.c   | 1 -
 libs/gamecode/pr_load.c    | 2 ++
 libs/gamecode/pr_strings.c | 1 -
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libs/gamecode/pr_debug.c b/libs/gamecode/pr_debug.c
index d8105c5f6..a272babf8 100644
--- a/libs/gamecode/pr_debug.c
+++ b/libs/gamecode/pr_debug.c
@@ -1702,7 +1702,6 @@ PR_Debug_Init (progs_t *pr)
 									pr->hashlink_freelist);
 
 	PR_Resources_Register (pr, "PR_Debug", res, pr_debug_clear);
-	PR_AddLoadFunc (pr, PR_LoadDebug);
 }
 
 void
diff --git a/libs/gamecode/pr_load.c b/libs/gamecode/pr_load.c
index 6ef18cc15..32033ae90 100644
--- a/libs/gamecode/pr_load.c
+++ b/libs/gamecode/pr_load.c
@@ -378,7 +378,9 @@ pr_run_ctors (progs_t *pr)
 }
 
 static int (*load_funcs_1[])(progs_t *) = {
+	PR_LoadStrings,
 	PR_RelocateBuiltins,
+	PR_LoadDebug,
 	0,
 };
 
diff --git a/libs/gamecode/pr_strings.c b/libs/gamecode/pr_strings.c
index 7cb295284..82e9540da 100644
--- a/libs/gamecode/pr_strings.c
+++ b/libs/gamecode/pr_strings.c
@@ -1222,5 +1222,4 @@ PR_Strings_Init (progs_t *pr)
 	res->print_str = dstring_new ();
 
 	PR_Resources_Register (pr, "Strings", res, pr_strings_clear);
-	PR_AddLoadFunc (pr, PR_LoadStrings);
 }

From bf62929f06abb232d9c594490ece29901af7ca31 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 3 Jul 2020 21:40:40 +0900
Subject: [PATCH 1294/1519] [gamecode] Add a comment about returning temp
 strings

---
 libs/gamecode/pr_strings.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libs/gamecode/pr_strings.c b/libs/gamecode/pr_strings.c
index 89d5ee60f..e8e1dff85 100644
--- a/libs/gamecode/pr_strings.c
+++ b/libs/gamecode/pr_strings.c
@@ -693,6 +693,11 @@ PR_FreeTempStrings (progs_t *pr)
 			PR_Error (pr, "internal string error: %d", __LINE__);
 		if (R_STRING (pr) < 0 && string_index (res, sr) == R_STRING (pr)
 			&& pr->pr_depth) {
+			// It looks like the temp string is being returned. While this
+			// may be a false positive (just a random integer with the same
+			// value), it is better to hold onto the temp string a little
+			// longer than to remove it prematurely. This allows functions
+			// to return the result of "str a" + "str b"
 			prstack_t  *frame = pr->pr_stack + pr->pr_depth - 1;
 			sr->next = frame->tstr;
 			frame->tstr = sr;

From a88f8213426cbf650bf521780cb9707a6496aafa Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 4 Jan 2021 23:42:10 +0900
Subject: [PATCH 1295/1519] [gamecode] Disconnect held strings from return slot

Fixes an internal string error when a return string has been freed.
---
 libs/gamecode/pr_strings.c | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/libs/gamecode/pr_strings.c b/libs/gamecode/pr_strings.c
index e8e1dff85..7efd2265c 100644
--- a/libs/gamecode/pr_strings.c
+++ b/libs/gamecode/pr_strings.c
@@ -344,7 +344,7 @@ get_string (progs_t *pr, string_t num)
 			case str_free:
 				break;
 		}
-		PR_Error (pr, "internal string error: %d", __LINE__);
+		PR_Error (pr, "internal string error: line:%d", __LINE__);
 	} else {
 		if (num >= pr->pr_stringsize)
 			return 0;
@@ -469,17 +469,17 @@ PR_SetReturnString (progs_t *pr, const char *s)
 			requeue_strref (res, sr);
 		} else if ((sr->type == str_return && !sr->rs_slot)
 				   || (sr->type != str_return && sr->rs_slot)) {
-			PR_Error (pr, "internal string error: %d %d %p", __LINE__,
+			PR_Error (pr, "internal string error: line:%d %d %p", __LINE__,
 					 sr->type, sr->rs_slot);
 		}
 		return string_index (res, sr);
 	}
 
 	// grab the string ref from the oldest slot, or make a new one if the
-	// slot is empty or the string has been held
-	if ((sr = res->rs_slot->strref) && sr->type != str_dynamic) {
+	// slot is empty
+	if ((sr = res->rs_slot->strref)) {
 		if (sr->type != str_return || sr->rs_slot != res->rs_slot) {
-			PR_Error (pr, "internal string error: %d", __LINE__);
+			PR_Error (pr, "internal string error: line:%d", __LINE__);
 		}
 		pr_strfree (pr, sr->s.string);
 	} else {
@@ -629,7 +629,10 @@ PR_HoldString (progs_t *pr, string_t str)
 	if (sr) {
 		switch (sr->type) {
 			case str_temp:
+				break;
 			case str_return:
+				sr->rs_slot->strref = 0;
+				sr->rs_slot = 0;
 				break;
 			case str_static:
 			case str_mutable:
@@ -637,7 +640,7 @@ PR_HoldString (progs_t *pr, string_t str)
 				// non-ephemeral string, no-op
 				return;
 			default:
-				PR_Error (pr, "internal string error: %d", __LINE__);
+				PR_Error (pr, "internal string error: line:%d", __LINE__);
 		}
 		sr->type = str_dynamic;
 		return;
@@ -666,7 +669,7 @@ PR_FreeString (progs_t *pr, string_t str)
 				pr_strfree (pr, sr->s.string);
 				break;
 			default:
-				PR_Error (pr, "internal string error: %d", __LINE__);
+				PR_Error (pr, "internal string error: line:%d", __LINE__);
 		}
 		free_string_ref (res, sr);
 		return;
@@ -690,7 +693,7 @@ PR_FreeTempStrings (progs_t *pr)
 			continue;
 		}
 		if (sr->type != str_temp)
-			PR_Error (pr, "internal string error: %d", __LINE__);
+			PR_Error (pr, "internal string error: line:%d", __LINE__);
 		if (R_STRING (pr) < 0 && string_index (res, sr) == R_STRING (pr)
 			&& pr->pr_depth) {
 			// It looks like the temp string is being returned. While this

From 1c5454cf6b9055f4357e9cc93c5c1c41af5f8874 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 5 Jan 2021 00:07:58 +0900
Subject: [PATCH 1296/1519] [gamecode] Move % handling to the flags state

% is effectively a format flag that cancels the format and outputs a
% single %. Fixes % not getting output for %%.
---
 libs/gamecode/pr_strings.c | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/libs/gamecode/pr_strings.c b/libs/gamecode/pr_strings.c
index 7efd2265c..7cb295284 100644
--- a/libs/gamecode/pr_strings.c
+++ b/libs/gamecode/pr_strings.c
@@ -868,6 +868,7 @@ fmt_append_item (fmt_state_t *state)
  *	\dot
  *	digraph PR_Sprintf_fmt_state_machine {
  *		format          -> flags            [label="{%}"];
+ *		flogs           -> format           [label="{%}"];
  *		flags           -> flags            [label="{#+0 -}"];
  *		flags           -> var_field_width  [label="{*}"];
  *		flags           -> precision        [label="{.}"];
@@ -906,6 +907,17 @@ fmt_state_flags (fmt_state_t *state)
 	state->c++;	// skip over %
 	while (1) {
 		switch (*state->c) {
+			case '%':
+				state->c++;
+				(*state->fi)->flags = 0;
+				(*state->fi)->precision = 1;
+				(*state->fi)->minFieldWidth = 0;
+				(*state->fi)->type = 's';
+				(*state->fi)->data.string_var = "%";
+
+				fmt_append_item (state);
+				state->state = fmt_state_format;
+				return;
 			case '0':
 				(*state->fi)->flags |= FMT_ZEROPAD;
 				break;
@@ -1111,15 +1123,6 @@ fmt_state_conversion (fmt_state_t *state)
 			(*state->fi)->data.string_var = "'";
 
 			state->fmt_count++;
-			fmt_append_item (state);
-			break;
-		case '%':
-			(*state->fi)->flags = 0;
-			(*state->fi)->precision = 0;
-			(*state->fi)->minFieldWidth = 0;
-			(*state->fi)->type = 's';
-			(*state->fi)->data.string_var = "%";
-
 			fmt_append_item (state);
 			break;
 		case 'x':

From 40d62e06c7ba470985b76d253a724e2431196636 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 12 Jan 2021 17:34:57 +0900
Subject: [PATCH 1297/1519] [gamecode] Put strings and debug back in load funcs

It turns out they're required to be initialized before most of the rest
of the system.
---
 libs/gamecode/pr_debug.c   | 1 -
 libs/gamecode/pr_load.c    | 2 ++
 libs/gamecode/pr_strings.c | 1 -
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libs/gamecode/pr_debug.c b/libs/gamecode/pr_debug.c
index d8105c5f6..a272babf8 100644
--- a/libs/gamecode/pr_debug.c
+++ b/libs/gamecode/pr_debug.c
@@ -1702,7 +1702,6 @@ PR_Debug_Init (progs_t *pr)
 									pr->hashlink_freelist);
 
 	PR_Resources_Register (pr, "PR_Debug", res, pr_debug_clear);
-	PR_AddLoadFunc (pr, PR_LoadDebug);
 }
 
 void
diff --git a/libs/gamecode/pr_load.c b/libs/gamecode/pr_load.c
index 6ef18cc15..32033ae90 100644
--- a/libs/gamecode/pr_load.c
+++ b/libs/gamecode/pr_load.c
@@ -378,7 +378,9 @@ pr_run_ctors (progs_t *pr)
 }
 
 static int (*load_funcs_1[])(progs_t *) = {
+	PR_LoadStrings,
 	PR_RelocateBuiltins,
+	PR_LoadDebug,
 	0,
 };
 
diff --git a/libs/gamecode/pr_strings.c b/libs/gamecode/pr_strings.c
index 7cb295284..82e9540da 100644
--- a/libs/gamecode/pr_strings.c
+++ b/libs/gamecode/pr_strings.c
@@ -1222,5 +1222,4 @@ PR_Strings_Init (progs_t *pr)
 	res->print_str = dstring_new ();
 
 	PR_Resources_Register (pr, "Strings", res, pr_strings_clear);
-	PR_AddLoadFunc (pr, PR_LoadStrings);
 }

From bfbfd7af61d0bed1f921ec9786c5cb9abcf74f72 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 12 Jan 2021 18:45:44 +0900
Subject: [PATCH 1298/1519] [glsl] Remove subpic_t's tnum

It's never actually used (the texture can be fetched using
GLSL_ScrapTexture) and gets in the way of sharing the scrap system with
the vulkan renderer.
---
 include/QF/GLSL/qf_textures.h            | 1 -
 libs/video/renderer/glsl/glsl_textures.c | 1 -
 2 files changed, 2 deletions(-)

diff --git a/include/QF/GLSL/qf_textures.h b/include/QF/GLSL/qf_textures.h
index 5f30fbf68..0a6e3ba6d 100644
--- a/include/QF/GLSL/qf_textures.h
+++ b/include/QF/GLSL/qf_textures.h
@@ -35,7 +35,6 @@ typedef struct subpic_s {
 	const struct subpic_s * const next;
 	const scrap_t * const scrap;
 	const struct vrect_s * const rect;
-	const int   tnum;					///< texture number
 	const int width;					///< requested width
 	const int height;					///< requested height
 	const float size;					///< size factor for tex coords (mult)
diff --git a/libs/video/renderer/glsl/glsl_textures.c b/libs/video/renderer/glsl/glsl_textures.c
index 4e6303093..8130dfdf5 100644
--- a/libs/video/renderer/glsl/glsl_textures.c
+++ b/libs/video/renderer/glsl/glsl_textures.c
@@ -437,7 +437,6 @@ GLSL_ScrapSubpic (scrap_t *scrap, int width, int height)
 	scrap->subpics = subpic;
 	*((scrap_t **) &subpic->scrap) = scrap;
 	*((vrect_t **) &subpic->rect) = rect;
-	*((int *) &subpic->tnum) = scrap->tnum;
 	*((int *) &subpic->width) = width;
 	*((int *) &subpic->height) = height;
 	*((float *) &subpic->size) = 1.0 / scrap->size;

From b6bc8ed5537ca99171ac6bf728e46092d7fa8c0d Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 12 Jan 2021 21:10:22 +0900
Subject: [PATCH 1299/1519] [renderer] Move core of scrap into shared code

The actual 2d area management code is now shared, with the actual
definition for scrap_t being left to the renderer specific
implementation.
---
 include/QF/GLSL/qf_textures.h            |  16 +-
 include/QF/render.h                      |   9 ++
 include/r_scrap.h                        |  49 ++++++
 libs/video/renderer/Makemodule.am        |   1 +
 libs/video/renderer/glsl/glsl_textures.c | 120 +++------------
 libs/video/renderer/r_init.c             |   2 +
 libs/video/renderer/r_scrap.c            | 183 +++++++++++++++++++++++
 7 files changed, 273 insertions(+), 107 deletions(-)
 create mode 100644 include/r_scrap.h
 create mode 100644 libs/video/renderer/r_scrap.c

diff --git a/include/QF/GLSL/qf_textures.h b/include/QF/GLSL/qf_textures.h
index 0a6e3ba6d..2298c3e16 100644
--- a/include/QF/GLSL/qf_textures.h
+++ b/include/QF/GLSL/qf_textures.h
@@ -31,14 +31,6 @@
 #include "QF/qtypes.h"
 
 typedef struct scrap_s scrap_t;
-typedef struct subpic_s {
-	const struct subpic_s * const next;
-	const scrap_t * const scrap;
-	const struct vrect_s * const rect;
-	const int width;					///< requested width
-	const int height;					///< requested height
-	const float size;					///< size factor for tex coords (mult)
-} subpic_t;
 
 int GLSL_LoadQuakeTexture (const char *identifier, int width, int height,
 						   byte *data);
@@ -55,9 +47,11 @@ scrap_t *GLSL_CreateScrap (int size, int format, int linear);
 void GLSL_DestroyScrap (scrap_t *scrap);
 void GLSL_ScrapClear (scrap_t *scrap);
 int GLSL_ScrapTexture (scrap_t *scrap) __attribute__((pure));
-subpic_t *GLSL_ScrapSubpic (scrap_t *scrap, int width, int height);	//XXX slow!
-void GLSL_SubpicDelete (subpic_t *subpic);	//XXX slow!
-void GLSL_SubpicUpdate (subpic_t *subpic, byte *data, int batch);
+//XXX slow!
+struct subpic_s *GLSL_ScrapSubpic (scrap_t *scrap, int width, int height);
+//XXX slow!
+void GLSL_SubpicDelete (struct subpic_s *subpic);
+void GLSL_SubpicUpdate (struct subpic_s *subpic, byte *data, int batch);
 void GLSL_ScrapFlush (scrap_t *scrap);
 
 #endif//__QF_GLSL_textures_h
diff --git a/include/QF/render.h b/include/QF/render.h
index 7f02672e2..607b8b800 100644
--- a/include/QF/render.h
+++ b/include/QF/render.h
@@ -55,6 +55,15 @@ typedef enum {
 extern struct vid_render_funcs_s *r_funcs;
 extern struct vid_render_data_s *r_data;
 
+typedef struct subpic_s {
+	const struct subpic_s *const next;
+	const struct scrap_s *const scrap;	///< renderer specific type
+	const struct vrect_s *const rect;
+	const int width;					///< requested width
+	const int height;					///< requested height
+	const float size;					///< size factor for tex coords (mult)
+} subpic_t;
+
 // dynamic lights ===========================================================
 
 typedef struct dlight_s
diff --git a/include/r_scrap.h b/include/r_scrap.h
new file mode 100644
index 000000000..5539d7480
--- /dev/null
+++ b/include/r_scrap.h
@@ -0,0 +1,49 @@
+/*
+	r_scrap.h
+
+	Renderer agnostic scrap management
+
+	Copyright (C) 2021 Bill Currie <bill@taniwha.org>
+
+	Author: Bill Currie <bill@taniwha.org>
+	Date: 2021/1/12
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+
+#ifndef __r_scrap_h
+#define __r_scrap_h
+
+typedef struct rscrap_s {
+	struct vrect_s *free_rects;			///< linked list of free areas
+	struct vrect_s *rects;				///< linked list of allocated rects
+	int         width;					///< overall width of scrap
+	int         height;					///< overall height of scrap
+} rscrap_t;
+
+void R_ScrapInit (rscrap_t *scrap, int width, int height);
+void R_ScrapDelete (rscrap_t *scrap);
+struct vrect_s *R_ScrapAlloc (rscrap_t *scrap, int width, int height);
+void R_ScrapFree (rscrap_t *scrap, struct vrect_s *rect);
+void R_ScrapClear (rscrap_t *scrap);
+size_t R_ScrapArea (rscrap_t *scrap) __attribute__((pure));
+void R_ScrapDump (rscrap_t *scrap);
+
+#endif//__r_scrap_h
diff --git a/libs/video/renderer/Makemodule.am b/libs/video/renderer/Makemodule.am
index 3e5dd4f70..05740af60 100644
--- a/libs/video/renderer/Makemodule.am
+++ b/libs/video/renderer/Makemodule.am
@@ -37,6 +37,7 @@ libs_video_renderer_libQFrenderer_la_DEPENDENCIES=	$(renderer_libs)
 libs_video_renderer_libQFrenderer_la_SOURCES=\
 	libs/video/renderer/r_cvar.c \
 	libs/video/renderer/r_init.c \
+	libs/video/renderer/r_scrap.c \
 	libs/video/renderer/r_screen.c \
 	libs/video/renderer/r_progs.c
 
diff --git a/libs/video/renderer/glsl/glsl_textures.c b/libs/video/renderer/glsl/glsl_textures.c
index 8130dfdf5..1edd77b71 100644
--- a/libs/video/renderer/glsl/glsl_textures.c
+++ b/libs/video/renderer/glsl/glsl_textures.c
@@ -44,6 +44,7 @@
 #include "QF/cmd.h"
 #include "QF/mathlib.h"
 #include "QF/model.h"
+#include "QF/render.h"
 #include "QF/sys.h"
 #include "QF/vrect.h"
 
@@ -51,15 +52,15 @@
 #include "QF/GLSL/funcs.h"
 #include "QF/GLSL/qf_textures.h"
 
+#include "r_scrap.h"
+
 struct scrap_s {
+	rscrap_t    rscrap;
 	GLuint      tnum;
-	int         size;	// in pixels, for now, always square, power of 2
 	int         format;
 	int         bpp;
 	byte       *data;	// local copy of the texture so updates can be batched
 	vrect_t    *batch;
-	vrect_t    *free_rects;
-	vrect_t    *rects;
 	subpic_t   *subpics;
 	struct scrap_s *next;
 };
@@ -248,23 +249,22 @@ static void
 glsl_scraps_f (void)
 {
 	scrap_t    *scrap;
-	vrect_t    *rect;
 	int         area;
+	int         size;
 
 	if (!scrap_list) {
 		Sys_Printf ("No scraps\n");
 		return;
 	}
 	for (scrap = scrap_list; scrap; scrap = scrap->next) {
-		for (rect = scrap->free_rects, area = 0; rect; rect = rect->next)
-			area += rect->width * rect->height;
+		area = R_ScrapArea (&scrap->rscrap);
+		// always square
+		size = scrap->rscrap.width;
 		Sys_Printf ("tnum=%u size=%d format=%04x bpp=%d free=%d%%\n",
-					scrap->tnum, scrap->size, scrap->format, scrap->bpp,
-					area * 100 / (scrap->size * scrap->size));
+					scrap->tnum, size, scrap->format, scrap->bpp,
+					area * 100 / (size * size));
 		if (Cmd_Argc () > 1) {
-			for (rect = scrap->rects, area = 0; rect; rect = rect->next)
-				Sys_Printf ("%d %d %d %d\n", rect->x, rect->y,
-							rect->width, rect->height);
+			R_ScrapDump (&scrap->rscrap);
 		}
 	}
 }
@@ -309,11 +309,9 @@ GLSL_CreateScrap (int size, int format, int linear)
 	}
 	scrap = malloc (sizeof (scrap_t));
 	qfeglGenTextures (1, &scrap->tnum);
-	scrap->size = size;
+	R_ScrapInit (&scrap->rscrap, size, size);
 	scrap->format = format;
 	scrap->bpp = bpp;
-	scrap->free_rects = VRect_New (0, 0, size, size);
-	scrap->rects = 0;
 	scrap->subpics = 0;
 	scrap->next = scrap_list;
 	scrap_list = scrap;
@@ -341,26 +339,13 @@ GLSL_CreateScrap (int size, int format, int linear)
 void
 GLSL_ScrapClear (scrap_t *scrap)
 {
-	vrect_t    *t;
 	subpic_t   *sp;
-
-	while (scrap->free_rects) {
-		t = scrap->free_rects;
-		scrap->free_rects = t->next;
-		VRect_Delete (t);
-	}
-	while (scrap->rects) {
-		t = scrap->rects;
-		scrap->rects = t->next;
-		VRect_Delete (t);
-	}
 	while (scrap->subpics) {
 		sp = scrap->subpics;
 		scrap->subpics = (subpic_t *) sp->next;
 		free (sp);
 	}
-
-	scrap->free_rects = VRect_New (0, 0, scrap->size, scrap->size);
+	R_ScrapClear (&scrap->rscrap);
 }
 
 void
@@ -375,7 +360,7 @@ GLSL_DestroyScrap (scrap_t *scrap)
 		}
 	}
 	GLSL_ScrapClear (scrap);
-	VRect_Delete (scrap->free_rects);
+	R_ScrapDelete (&scrap->rscrap);
 	GLSL_ReleaseTexture (scrap->tnum);
 	free (scrap->data);
 	free (scrap);
@@ -390,47 +375,13 @@ GLSL_ScrapTexture (scrap_t *scrap)
 subpic_t *
 GLSL_ScrapSubpic (scrap_t *scrap, int width, int height)
 {
-	int         i, w, h;
-	vrect_t   **t, **best;
-	vrect_t    *old, *frags, *rect;
+	vrect_t    *rect;
 	subpic_t   *subpic;
 
-	for (i = 0; i < 16; i++)
-		if (width <= (1 << i))
-			break;
-	w = 1 << i;
-	for (i = 0; i < 16; i++)
-		if (height <= (1 << i))
-			break;
-	h = 1 << i;
-
-	best = 0;
-	for (t = &scrap->free_rects; *t; t = &(*t)->next) {
-		if ((*t)->width < w || (*t)->height < h)
-			continue;						// won't fit
-		if (!best) {
-			best = t;
-			continue;
-		}
-		if ((*t)->width <= (*best)->width || (*t)->height <= (*best)->height)
-			best = t;
+	rect = R_ScrapAlloc (&scrap->rscrap, width, height);
+	if (!rect) {
+		return 0;
 	}
-	if (!best)
-		return 0;							// couldn't find a spot
-	old = *best;
-	*best = old->next;
-	rect = VRect_New (old->x, old->y, w, h);
-	frags = VRect_Difference (old, rect);
-	VRect_Delete (old);
-	if (frags) {
-		// old was bigger than the requested size
-		for (old = frags; old->next; old = old->next)
-			;
-		old->next = scrap->free_rects;
-		scrap->free_rects = frags;
-	}
-	rect->next = scrap->rects;
-	scrap->rects = rect;
 
 	subpic = malloc (sizeof (subpic_t));
 	*((subpic_t **) &subpic->next) = scrap->subpics;
@@ -439,7 +390,7 @@ GLSL_ScrapSubpic (scrap_t *scrap, int width, int height)
 	*((vrect_t **) &subpic->rect) = rect;
 	*((int *) &subpic->width) = width;
 	*((int *) &subpic->height) = height;
-	*((float *) &subpic->size) = 1.0 / scrap->size;
+	*((float *) &subpic->size) = 1.0 / scrap->rscrap.width;
 	return subpic;
 }
 
@@ -448,8 +399,6 @@ GLSL_SubpicDelete (subpic_t *subpic)
 {
 	scrap_t    *scrap = (scrap_t *) subpic->scrap;
 	vrect_t    *rect = (vrect_t *) subpic->rect;
-	vrect_t    *old, *merge;
-	vrect_t   **t;
 	subpic_t  **sp;
 
 	for (sp = &scrap->subpics; *sp; sp = (subpic_t **) &(*sp)->next)
@@ -459,29 +408,7 @@ GLSL_SubpicDelete (subpic_t *subpic)
 		Sys_Error ("GLSL_ScrapDelSubpic: broken subpic");
 	*sp = (subpic_t *) subpic->next;
 	free (subpic);
-	for (t = &scrap->rects; *t; t = &(*t)->next)
-		if (*t == rect)
-			break;
-	if (*t != rect)
-		Sys_Error ("GLSL_ScrapDelSubpic: broken subpic");
-	*t = rect->next;
-
-	do {
-		merge = 0;
-		for (t = &scrap->free_rects; *t; t = &(*t)->next) {
-			merge = VRect_Merge (*t, rect);
-			if (merge) {
-				old = *t;
-				*t = (*t)->next;
-				VRect_Delete (old);
-				VRect_Delete (rect);
-				rect = merge;
-				break;
-			}
-		}
-	} while (merge);
-	rect->next = scrap->free_rects;
-	scrap->free_rects = rect;
+	R_ScrapFree (&scrap->rscrap, rect);
 }
 
 void
@@ -502,7 +429,7 @@ GLSL_SubpicUpdate (subpic_t *subpic, byte *data, int batch)
 			scrap->batch = VRect_New (rect->x, rect->y,
 									  rect->width, rect->height);
 		}
-		step = scrap->size * scrap->bpp;
+		step = scrap->rscrap.width * scrap->bpp;
 		sbytes = subpic->width * scrap->bpp;
 		dest = scrap->data + rect->y * step + rect->x * scrap->bpp;
 		for (i = 0; i < subpic->height; i++, dest += step, data += sbytes)
@@ -519,6 +446,7 @@ void
 GLSL_ScrapFlush (scrap_t *scrap)
 {
 	vrect_t    *rect = scrap->batch;
+	int         size = scrap->rscrap.width;
 
 	if (!rect)
 		return;
@@ -526,9 +454,9 @@ GLSL_ScrapFlush (scrap_t *scrap)
 	//should update to not update the entire horizontal block
 	qfeglBindTexture (GL_TEXTURE_2D, scrap->tnum);
 	qfeglTexSubImage2D (GL_TEXTURE_2D, 0, 0, rect->y,
-					   scrap->size, rect->height, scrap->format,
+					   size, rect->height, scrap->format,
 					   GL_UNSIGNED_BYTE,
-					   scrap->data + rect->y * scrap->size * scrap->bpp);
+					   scrap->data + rect->y * size * scrap->bpp);
 	VRect_Delete (rect);
 	scrap->batch = 0;
 }
diff --git a/libs/video/renderer/r_init.c b/libs/video/renderer/r_init.c
index f298538ba..733004a21 100644
--- a/libs/video/renderer/r_init.c
+++ b/libs/video/renderer/r_init.c
@@ -46,6 +46,7 @@
 #include "QF/plugin/general.h"
 
 #include "r_internal.h"
+#include "r_scrap.h"
 #include "vid_internal.h"
 
 cvar_t         *vidrend_plugin;
@@ -61,6 +62,7 @@ vid_render_funcs_t *r_funcs;
 
 #define U __attribute__ ((used))
 static U void (*const r_progs_init)(struct progs_s *) = R_Progs_Init;
+static U void (*const r_scrapdelete)(rscrap_t *) = R_ScrapDelete;
 #undef U
 
 static void
diff --git a/libs/video/renderer/r_scrap.c b/libs/video/renderer/r_scrap.c
new file mode 100644
index 000000000..86a4ca0a6
--- /dev/null
+++ b/libs/video/renderer/r_scrap.c
@@ -0,0 +1,183 @@
+/*
+	r_scrap.c
+
+	Renderer agnostic scrap management
+
+	Copyright (C) 2021 Bill Currie <bill@taniwha.org>
+
+	Author: Bill Currie <bill@taniwha.org>
+	Date: 2021/1/12
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include "QF/sys.h"
+#include "QF/vrect.h"
+
+#include "compat.h"
+#include "r_scrap.h"
+
+static unsigned
+pow2rup (unsigned x)
+{
+	x--;
+	x |= x >> 1;
+	x |= x >> 2;
+	x |= x >> 4;
+	x |= x >> 8;
+	x |= x >> 16;
+	x++;
+	return x;
+}
+
+VISIBLE void
+R_ScrapInit (rscrap_t *scrap, int width, int height)
+{
+	width = pow2rup (width);
+	height = pow2rup (height);
+	scrap->width = width;
+	scrap->height = height;
+	scrap->rects = 0;
+	scrap->free_rects = VRect_New (0, 0, width, height);
+}
+
+VISIBLE void
+R_ScrapDelete (rscrap_t *scrap)
+{
+	R_ScrapClear (scrap);
+	VRect_Delete (scrap->free_rects);
+}
+
+VISIBLE vrect_t *
+R_ScrapAlloc (rscrap_t *scrap, int width, int height)
+{
+	int         w, h;
+	vrect_t   **t, **best;
+	vrect_t    *old, *frags, *rect;
+
+	w = pow2rup (width);
+	h = pow2rup (height);
+
+	best = 0;
+	for (t = &scrap->free_rects; *t; t = &(*t)->next) {
+		if ((*t)->width < w || (*t)->height < h)
+			continue;						// won't fit
+		if (!best) {
+			best = t;
+			continue;
+		}
+		if ((*t)->width <= (*best)->width || (*t)->height <= (*best)->height)
+			best = t;
+	}
+	if (!best)
+		return 0;							// couldn't find a spot
+	old = *best;
+	*best = old->next;
+	rect = VRect_New (old->x, old->y, w, h);
+	frags = VRect_Difference (old, rect);
+	VRect_Delete (old);
+	if (frags) {
+		// old was bigger than the requested size
+		for (old = frags; old->next; old = old->next)
+			;
+		old->next = scrap->free_rects;
+		scrap->free_rects = frags;
+	}
+	rect->next = scrap->rects;
+	scrap->rects = rect;
+
+	return rect;
+}
+
+VISIBLE void
+R_ScrapFree (rscrap_t *scrap, vrect_t *rect)
+{
+	vrect_t    *old, *merge;
+	vrect_t   **t;
+
+	for (t = &scrap->rects; *t; t = &(*t)->next)
+		if (*t == rect)
+			break;
+	if (*t != rect)
+		Sys_Error ("R_ScrapFree: broken rect");
+	*t = rect->next;
+
+	do {
+		merge = 0;
+		for (t = &scrap->free_rects; *t; t = &(*t)->next) {
+			merge = VRect_Merge (*t, rect);
+			if (merge) {
+				old = *t;
+				*t = (*t)->next;
+				VRect_Delete (old);
+				VRect_Delete (rect);
+				rect = merge;
+				break;
+			}
+		}
+	} while (merge);
+	rect->next = scrap->free_rects;
+	scrap->free_rects = rect;
+}
+
+VISIBLE void
+R_ScrapClear (rscrap_t *scrap)
+{
+	vrect_t    *t;
+
+	while (scrap->free_rects) {
+		t = scrap->free_rects;
+		scrap->free_rects = t->next;
+		VRect_Delete (t);
+	}
+	while (scrap->rects) {
+		t = scrap->rects;
+		scrap->rects = t->next;
+		VRect_Delete (t);
+	}
+
+	scrap->free_rects = VRect_New (0, 0, scrap->width, scrap->height);
+}
+
+VISIBLE size_t
+R_ScrapArea (rscrap_t *scrap)
+{
+	vrect_t    *rect;
+	size_t      area;
+
+	for (rect = scrap->free_rects, area = 0; rect; rect = rect->next) {
+		area += rect->width * rect->height;
+	}
+	return area;
+}
+
+VISIBLE void
+R_ScrapDump (rscrap_t *scrap)
+{
+	vrect_t    *rect;
+
+	for (rect = scrap->rects; rect; rect = rect->next) {
+		Sys_Printf ("%d %d %d %d\n", rect->x, rect->y,
+					rect->width, rect->height);
+	}
+}

From a7ac188d1d1808c34f58be980bf9804659f24e30 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 13 Jan 2021 10:43:23 +0900
Subject: [PATCH 1300/1519] [vulkan] Use a scrap texture for draw

The scrap texture did very good things for the glsl renderer and the
better control over data copying might help it do even better things for
vulkan, especially with lots of little icons.
---
 include/QF/Vulkan/command.h              |   6 +
 include/QF/Vulkan/staging.h              |   2 +
 include/QF/Vulkan/texture.h              |  43 ++++
 libs/video/renderer/Makemodule.am        |   1 +
 libs/video/renderer/vulkan/staging.c     |  13 +
 libs/video/renderer/vulkan/texture.c     | 299 +++++++++++++++++++++++
 libs/video/renderer/vulkan/vulkan_draw.c |  90 ++-----
 7 files changed, 390 insertions(+), 64 deletions(-)
 create mode 100644 include/QF/Vulkan/texture.h
 create mode 100644 libs/video/renderer/vulkan/texture.c

diff --git a/include/QF/Vulkan/command.h b/include/QF/Vulkan/command.h
index 046c8b2b3..925a63781 100644
--- a/include/QF/Vulkan/command.h
+++ b/include/QF/Vulkan/command.h
@@ -12,6 +12,12 @@ typedef struct qfv_semaphoreset_s
 typedef struct qfv_fenceset_s
 	DARRAY_TYPE (VkFence) qfv_fenceset_t;
 
+typedef struct qfv_bufferimagecopy_s
+	DARRAY_TYPE (VkBufferImageCopy) qfv_bufferimagecopy_t;
+
+#define QFV_AllocBufferImageCopy(num, allocator) \
+	DARRAY_ALLOCFIXED (qfv_bufferimagecopy_t, num, allocator)
+
 struct qfv_queue_s;
 struct qfv_device_s;
 VkCommandPool QFV_CreateCommandPool (struct qfv_device_s *device,
diff --git a/include/QF/Vulkan/staging.h b/include/QF/Vulkan/staging.h
index d281f1854..9a90edd6e 100644
--- a/include/QF/Vulkan/staging.h
+++ b/include/QF/Vulkan/staging.h
@@ -6,6 +6,7 @@ typedef struct qfv_stagebuf_s {
 	VkBuffer    buffer;
 	VkDeviceMemory memory;
 	size_t      size;
+	size_t      offset;		///< for batching building
 	void       *data;
 } qfv_stagebuf_t;
 
@@ -14,5 +15,6 @@ qfv_stagebuf_t *QFV_CreateStagingBuffer (struct qfv_device_s *device,
 										 size_t size);
 void QFV_DestroyStagingBuffer (qfv_stagebuf_t *stage);
 void QFV_FlushStagingBuffer (qfv_stagebuf_t *stage, size_t offset, size_t size);
+void *QFV_ClaimStagingBuffer (qfv_stagebuf_t *stage, size_t size);
 
 #endif//__QF_Vulkan_staging_h
diff --git a/include/QF/Vulkan/texture.h b/include/QF/Vulkan/texture.h
new file mode 100644
index 000000000..6a55815f6
--- /dev/null
+++ b/include/QF/Vulkan/texture.h
@@ -0,0 +1,43 @@
+#ifndef __QF_Vulkan_texture_h
+#define __QF_Vulkan_texture_h
+
+typedef enum {
+	QFV_LUMINANCE,
+	QFV_LUMINANCE_ALPHA,
+	QFV_RGB,
+	QFV_RGBA,
+} QFVFormat;
+
+typedef struct scrap_s scrap_t;
+
+scrap_t *QFV_CreateScrap (struct qfv_device_s *device, int size,
+						  QFVFormat format);
+void QFV_ScrapClear (scrap_t *scrap);
+void QFV_DestroyScrap (scrap_t *scrap);
+VkImageView QFV_ScrapImageView (scrap_t *scrap) __attribute__((pure));
+subpic_t *QFV_ScrapSubpic (scrap_t *scrap, int width, int height);
+void QFV_SubpicDelete (subpic_t *subpic);
+
+/** Add an update region to the batch queue.
+ *
+ * The region to be updated is recorded in the batch queue, space allocated
+ * in the staging buffer, and a pointer to the allocated space is returned.
+ *
+ * \note No data is stransfered. This facilitates writing generated data
+ * directly to the staging buffer.
+ */
+void *QFV_SubpicBatch (subpic_t *subpic, struct qfv_stagebuf_s *stage);
+
+/** Flush all batched subpic updates.
+ *
+ * The offset in the staging bufffer \a stage is reset to 0. The command
+ * buffer is populated with the appropriate image layout barriers and the
+ * necessary copy commands.
+ *
+ * \note The command buffer is neither begun nor ended, nor is it submitted
+ * to a queue. This is to maximize flexibility in command buffer usage.
+ */
+void QFV_ScrapFlush (scrap_t *scrap, struct qfv_stagebuf_s *stage,
+					 VkCommandBuffer cmd);
+
+#endif//__QF_Vulkan_texture_h
diff --git a/libs/video/renderer/Makemodule.am b/libs/video/renderer/Makemodule.am
index 05740af60..6f306ffe5 100644
--- a/libs/video/renderer/Makemodule.am
+++ b/libs/video/renderer/Makemodule.am
@@ -230,6 +230,7 @@ libs_video_renderer_vid_render_vulkan_la_SOURCES = \
 	libs/video/renderer/vulkan/shader.c \
 	libs/video/renderer/vulkan/staging.c \
 	libs/video/renderer/vulkan/swapchain.c \
+	libs/video/renderer/vulkan/texture.c \
 	libs/video/renderer/vulkan/util.c \
 	libs/video/renderer/vulkan/util.h \
 	libs/video/renderer/vulkan/vkparse.c \
diff --git a/libs/video/renderer/vulkan/staging.c b/libs/video/renderer/vulkan/staging.c
index de791239c..04e3897db 100644
--- a/libs/video/renderer/vulkan/staging.c
+++ b/libs/video/renderer/vulkan/staging.c
@@ -59,6 +59,8 @@ QFV_CreateStagingBuffer (qfv_device_t *device, size_t size)
 	qfv_devfuncs_t *dfunc = device->funcs;
 
 	qfv_stagebuf_t *stage = malloc (sizeof (qfv_stagebuf_t));
+	stage->size = size;
+	stage->offset = 0;
 	stage->device = device;
 	stage->buffer = QFV_CreateBuffer (device, size,
 									  VK_BUFFER_USAGE_TRANSFER_SRC_BIT);
@@ -94,3 +96,14 @@ QFV_FlushStagingBuffer (qfv_stagebuf_t *stage, size_t offset, size_t size)
 	};
 	dfunc->vkFlushMappedMemoryRanges (device->dev, 1, &range);
 }
+
+void *
+QFV_ClaimStagingBuffer (qfv_stagebuf_t *stage, size_t size)
+{
+	if (stage->offset + size > stage->size) {
+		return 0;
+	}
+	void       *data = (byte *) stage->data + stage->offset;
+	stage->offset += (size + 3) & ~3;
+	return data;
+}
diff --git a/libs/video/renderer/vulkan/texture.c b/libs/video/renderer/vulkan/texture.c
new file mode 100644
index 000000000..6529800b1
--- /dev/null
+++ b/libs/video/renderer/vulkan/texture.c
@@ -0,0 +1,299 @@
+/*
+	texuture.c
+
+	Vulkan texuture manager
+
+	Copyright (C) 2021      Bill Currie <bill@taniwha.org>
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifdef HAVE_MATH_H
+# include <math.h>
+#endif
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+
+#include "QF/alloc.h"
+#include "QF/cvar.h"
+#include "QF/dstring.h"
+#include "QF/hash.h"
+#include "QF/qfplist.h"
+#include "QF/quakefs.h"
+#include "QF/render.h"
+#include "QF/sys.h"
+#include "QF/Vulkan/qf_vid.h"
+#include "QF/Vulkan/barrier.h"
+#include "QF/Vulkan/buffer.h"
+#include "QF/Vulkan/command.h"
+#include "QF/Vulkan/device.h"
+#include "QF/Vulkan/image.h"
+#include "QF/Vulkan/instance.h"
+#include "QF/Vulkan/staging.h"
+#include "QF/Vulkan/texture.h"
+
+#include "r_scrap.h"
+#include "vid_vulkan.h"
+
+struct scrap_s {
+	rscrap_t    rscrap;
+	VkImage     image;
+	VkDeviceMemory memory;
+	VkImageView view;
+	size_t      bpp;
+	vrect_t    *batch;
+	vrect_t   **batch_tail;
+	vrect_t    *batch_free;
+	size_t      batch_count;
+	subpic_t   *subpics;
+	qfv_device_t *device;
+};
+
+scrap_t *
+QFV_CreateScrap (qfv_device_t *device, int size, QFVFormat format)
+{
+	int         bpp = 0;
+	VkFormat    fmt = VK_FORMAT_UNDEFINED;
+
+	switch (format) {
+		case QFV_LUMINANCE:
+			bpp = 1;
+			fmt = VK_FORMAT_R8_UNORM;
+			break;
+		case QFV_LUMINANCE_ALPHA:
+			bpp = 2;
+			fmt = VK_FORMAT_R8G8_UNORM;
+			break;
+		case QFV_RGB:
+			bpp = 3;
+			fmt = VK_FORMAT_R8G8B8_UNORM;
+			break;
+		case QFV_RGBA:
+			bpp = 4;
+			fmt = VK_FORMAT_R8G8B8A8_UNORM;
+			break;
+	}
+
+	scrap_t    *scrap = malloc (sizeof (scrap_t));
+
+	R_ScrapInit (&scrap->rscrap, size, size);
+
+	// R_ScrapInit rounds sizes up to next power of 2
+	size = scrap->rscrap.width;
+	VkExtent3D  extent = { size, size, 1 };
+	scrap->image = QFV_CreateImage (device, 0, VK_IMAGE_TYPE_2D, fmt,
+									extent, 1, 1, VK_SAMPLE_COUNT_1_BIT,
+									VK_IMAGE_USAGE_TRANSFER_DST_BIT
+									| VK_IMAGE_USAGE_SAMPLED_BIT);
+	scrap->memory = QFV_AllocImageMemory (device, scrap->image,
+										  VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT,
+										  0, 0);
+	QFV_BindImageMemory (device, scrap->image, scrap->memory, 0);
+	scrap->view = QFV_CreateImageView (device, scrap->image,
+									   VK_IMAGE_VIEW_TYPE_2D, fmt,
+									   VK_IMAGE_ASPECT_COLOR_BIT);
+	scrap->bpp = bpp;
+	scrap->subpics = 0;
+	scrap->device = device;
+	scrap->batch = 0;
+	scrap->batch_tail = &scrap->batch;
+	scrap->batch_free = 0;
+	scrap->batch_count = 0;
+	return scrap;
+}
+
+void
+QFV_ScrapClear (scrap_t *scrap)
+{
+	subpic_t   *sp;
+	while (scrap->subpics) {
+		sp = scrap->subpics;
+		scrap->subpics = (subpic_t *) sp->next;
+		free (sp);
+	}
+	R_ScrapClear (&scrap->rscrap);
+}
+
+void
+QFV_DestroyScrap (scrap_t *scrap)
+{
+	qfv_device_t *device = scrap->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	QFV_ScrapClear (scrap);
+	R_ScrapDelete (&scrap->rscrap);
+	dfunc->vkDestroyImageView (device->dev, scrap->view, 0);
+	dfunc->vkDestroyImage (device->dev, scrap->image, 0);
+	dfunc->vkFreeMemory (device->dev, scrap->memory, 0);
+
+	while (scrap->batch_free) {
+		vrect_t    *b = scrap->batch_free;
+		scrap->batch_free = b->next;
+		VRect_Delete (b);
+	}
+	free (scrap);
+}
+
+VkImageView
+QFV_ScrapImageView (scrap_t *scrap)
+{
+	return scrap->view;
+}
+
+subpic_t *
+QFV_ScrapSubpic (scrap_t *scrap, int width, int height)
+{
+	vrect_t    *rect;
+	subpic_t   *subpic;
+
+	rect = R_ScrapAlloc (&scrap->rscrap, width, height);
+	if (!rect) {
+		return 0;
+	}
+
+	subpic = malloc (sizeof (subpic_t));
+	*((subpic_t **) &subpic->next) = scrap->subpics;
+	scrap->subpics = subpic;
+	*((scrap_t **) &subpic->scrap) = scrap;
+	*((vrect_t **) &subpic->rect) = rect;
+	*((int *) &subpic->width) = width;
+	*((int *) &subpic->height) = height;
+	*((float *) &subpic->size) = 1.0 / scrap->rscrap.width;
+	return subpic;
+}
+
+void
+QFV_SubpicDelete (subpic_t *subpic)
+{
+	scrap_t    *scrap = (scrap_t *) subpic->scrap;
+	vrect_t    *rect = (vrect_t *) subpic->rect;
+	subpic_t  **sp;
+
+	for (sp = &scrap->subpics; *sp; sp = (subpic_t **) &(*sp)->next) {
+		if (*sp == subpic) {
+			break;
+		}
+	}
+	if (*sp != subpic) {
+		Sys_Error ("QFV_SubpicDelete: broken subpic");
+	}
+	*sp = (subpic_t *) subpic->next;
+	free (subpic);
+	R_ScrapFree (&scrap->rscrap, rect);
+}
+
+void *
+QFV_SubpicBatch (subpic_t *subpic, qfv_stagebuf_t *stage)
+{
+	scrap_t    *scrap = (scrap_t *) subpic->scrap;
+	vrect_t    *rect = (vrect_t *) subpic->rect;
+	vrect_t    *batch;
+	byte       *dest;
+	size_t      size;
+
+	size = subpic->width * subpic->height * scrap->bpp;
+	if (!(dest = QFV_ClaimStagingBuffer (stage, size))) {
+		return 0;
+	}
+
+	if (scrap->batch_free) {
+		batch = scrap->batch_free;
+		scrap->batch_free = batch->next;
+	} else {
+		batch = VRect_New (rect->x, rect->y, subpic->width, subpic->height);
+	}
+	*scrap->batch_tail = batch;
+	scrap->batch_tail = &batch->next;
+	batch->next = 0;
+	scrap->batch_count++;
+	return dest;
+}
+
+void
+QFV_ScrapFlush (scrap_t *scrap, qfv_stagebuf_t *stage, VkCommandBuffer cmd)
+{
+	qfv_device_t *device = scrap->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	if (!scrap->batch_count) {
+		return;
+	}
+
+	size_t      i;
+	__auto_type copy = QFV_AllocBufferImageCopy (128, alloca);
+	memset (copy->a, 0, 128 * sizeof (copy->a[0]));
+
+	for (i = 0; i < scrap->batch_count && i < 128; i++) {
+		copy->a[i].imageSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
+		copy->a[i].imageSubresource.layerCount = 1;
+		copy->a[i].imageExtent.depth = 1;
+	}
+
+	QFV_FlushStagingBuffer (stage, 0, stage->offset);
+
+	VkImageMemoryBarrier barrier;
+	qfv_pipelinestagepair_t stages;
+
+	stages = imageLayoutTransitionStages[qfv_LT_Undefined_to_TransferDst];
+	barrier = imageLayoutTransitionBarriers[qfv_LT_Undefined_to_TransferDst];
+	barrier.image = scrap->image;
+	dfunc->vkCmdPipelineBarrier (cmd, stages.src, stages.dst, 0, 0, 0, 0, 0,
+								 1, &barrier);
+
+	size_t      offset = 0, size;
+	vrect_t    *batch = scrap->batch;
+	while (scrap->batch_count) {
+		for (i = 0; i < scrap->batch_count && i < 128; i++) {
+			size = batch->width * batch->height * scrap->bpp;
+
+			copy->a[i].bufferOffset = offset;
+			copy->a[i].imageOffset.x = batch->x;
+			copy->a[i].imageOffset.y = batch->y;
+			copy->a[i].imageExtent.width = batch->width;
+			copy->a[i].imageExtent.height = batch->height;
+
+			offset += (size + 3) & ~3;
+			batch = batch->next;
+		}
+		dfunc->vkCmdCopyBufferToImage (cmd, stage->buffer, scrap->image,
+									   VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
+									   i, copy->a);
+		scrap->batch_count -= i;
+	}
+
+	stages = imageLayoutTransitionStages[qfv_LT_TransferDst_to_ShaderReadOnly];
+	barrier=imageLayoutTransitionBarriers[qfv_LT_TransferDst_to_ShaderReadOnly];
+	barrier.image = scrap->image;
+	dfunc->vkCmdPipelineBarrier (cmd, stages.src, stages.dst, 0, 0, 0, 0, 0,
+								 1, &barrier);
+
+	*scrap->batch_tail = scrap->batch_free;
+	scrap->batch_free = scrap->batch;
+	scrap->batch = 0;
+	scrap->batch_tail = &scrap->batch;
+	stage->offset = 0;
+}
diff --git a/libs/video/renderer/vulkan/vulkan_draw.c b/libs/video/renderer/vulkan/vulkan_draw.c
index 89ead5380..badc01332 100644
--- a/libs/video/renderer/vulkan/vulkan_draw.c
+++ b/libs/video/renderer/vulkan/vulkan_draw.c
@@ -46,6 +46,7 @@
 #include "QF/dstring.h"
 #include "QF/hash.h"
 #include "QF/quakefs.h"
+#include "QF/render.h"
 #include "QF/sys.h"
 #include "QF/vid.h"
 
@@ -59,6 +60,7 @@
 #include "QF/Vulkan/device.h"
 #include "QF/Vulkan/image.h"
 #include "QF/Vulkan/staging.h"
+#include "QF/Vulkan/texture.h"
 
 #include "r_internal.h"
 #include "vid_vulkan.h"
@@ -75,10 +77,9 @@ typedef struct {
 #define INDS_PER_QUAD (5)	// one per vert plus primitive reset
 
 //FIXME move into a context struct
-VkImage         conchars_image;
-VkDeviceMemory  conchars_memory;
-VkImageView     conchars_view;
 VkSampler       conchars_sampler;
+scrap_t        *draw_scrap;
+subpic_t       *conchars;
 
 VkBuffer        quad_vert_buffer;
 VkBuffer        quad_ind_buffer;
@@ -201,9 +202,7 @@ Vulkan_Draw_Shutdown (vulkan_ctx_t *ctx)
 	destroy_quad_buffers (ctx);
 
 	dfunc->vkDestroyPipeline (device->dev, twod_pipeline, 0);
-	dfunc->vkDestroyImageView (device->dev, conchars_view, 0);
-	dfunc->vkFreeMemory (device->dev, conchars_memory, 0);
-	dfunc->vkDestroyImage (device->dev, conchars_image, 0);
+	QFV_DestroyScrap (draw_scrap);
 }
 
 void
@@ -214,37 +213,24 @@ Vulkan_Draw_Init (vulkan_ctx_t *ctx)
 	VkCommandBuffer cmd = ctx->cmdbuffer;
 
 	create_quad_buffers (ctx);
-
-	qpic_t     *charspic = Draw_Font8x8Pic ();
-	VkExtent3D  extent = { charspic->width, charspic->height, 1 };
-	conchars_image = QFV_CreateImage (device, 0, VK_IMAGE_TYPE_2D,
-									  VK_FORMAT_A1R5G5B5_UNORM_PACK16,
-									  extent, 1, 1,
-									  VK_SAMPLE_COUNT_1_BIT,
-									  VK_IMAGE_USAGE_TRANSFER_DST_BIT
-									  | VK_IMAGE_USAGE_TRANSFER_SRC_BIT
-									  | VK_IMAGE_USAGE_SAMPLED_BIT);
-	conchars_memory = QFV_AllocImageMemory (device, conchars_image,
-											VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT,
-											0, 0);
-	QFV_BindImageMemory (device, conchars_image, conchars_memory, 0);
-	conchars_view = QFV_CreateImageView (device, conchars_image,
-										 VK_IMAGE_VIEW_TYPE_2D,
-										 VK_FORMAT_A1R5G5B5_UNORM_PACK16,
-										 VK_IMAGE_ASPECT_COLOR_BIT);
+	draw_scrap = QFV_CreateScrap (device, 2048, QFV_RGBA);
 	conchars_sampler = QFV_GetSampler (ctx, "quakepic");
 
-	uint16_t *chars_data = ctx->staging[0]->data;
+	qpic_t     *charspic = Draw_Font8x8Pic ();
+
+	conchars = QFV_ScrapSubpic (draw_scrap, charspic->width, charspic->height);
+
+	byte *chars_data = QFV_SubpicBatch (conchars, ctx->staging[0]);
 	size_t size = charspic->width * charspic->height;
 	for (size_t i = 0; i < size; i++) {
-		// convert 0xff = transparent, 0xfe = white to 0x0000 and 0xffff
-		// for a1r5g5b5
-		uint16_t    pix = (charspic->data[i] & 1) - 1;
-		chars_data[i] = pix;
+		byte        pix = charspic->data[i];
+		byte       *col = vid.palette + pix * 3;
+		*chars_data++ = *col++;
+		*chars_data++ = *col++;
+		*chars_data++ = *col++;
+		*chars_data++ = (pix == 255) - 1;
 	}
-	QFV_FlushStagingBuffer (ctx->staging[0], 0, size * sizeof (uint16_t));
-	VkImageMemoryBarrier barrier;
-	qfv_pipelinestagepair_t stages;
+
 	dfunc->vkWaitForFences (device->dev, 1, &ctx->fence, VK_TRUE, ~0ull);
 	dfunc->vkResetCommandBuffer (cmd, 0);
 	VkCommandBufferBeginInfo beginInfo = {
@@ -252,33 +238,7 @@ Vulkan_Draw_Init (vulkan_ctx_t *ctx)
 		VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT, 0,
 	};
 	dfunc->vkBeginCommandBuffer (cmd, &beginInfo);
-
-	stages = imageLayoutTransitionStages[qfv_LT_Undefined_to_TransferDst];
-	barrier=imageLayoutTransitionBarriers[qfv_LT_Undefined_to_TransferDst];
-	barrier.image = conchars_image;
-	dfunc->vkCmdPipelineBarrier (cmd, stages.src, stages.dst, 0,
-								 0, 0,
-								 0, 0,
-								 1, &barrier);
-
-	VkBufferImageCopy region = {
-		0, 0, 0,
-		{ VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1 },
-		{ 0, 0, 0 },
-		{ charspic->width, charspic->height, 1 },
-	};
-	dfunc->vkCmdCopyBufferToImage (cmd,
-								   ctx->staging[0]->buffer, conchars_image,
-								   VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
-								   1, &region);
-
-	stages = imageLayoutTransitionStages[qfv_LT_TransferDst_to_ShaderReadOnly];
-	barrier=imageLayoutTransitionBarriers[qfv_LT_TransferDst_to_ShaderReadOnly];
-	barrier.image = conchars_image;
-	dfunc->vkCmdPipelineBarrier (cmd, stages.src, stages.dst, 0,
-								 0, 0,
-								 0, 0,
-								 1, &barrier);
+	QFV_ScrapFlush (draw_scrap, ctx->staging[0], cmd);
 	dfunc->vkEndCommandBuffer (cmd);
 
 	VkSubmitInfo submitInfo = {
@@ -305,7 +265,7 @@ Vulkan_Draw_Init (vulkan_ctx_t *ctx)
 	};
 	VkDescriptorImageInfo imageInfo = {
 		conchars_sampler,
-		conchars_view,
+		QFV_ScrapImageView (draw_scrap),
 		VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL,
 	};
 	__auto_type cmdBuffers
@@ -347,10 +307,12 @@ draw_pic (float x, float y, int w, int h, qpic_t *pic,
 	drawvert_t *verts = quad_verts + num_quads * VERTS_PER_QUAD;
 	num_quads += VERTS_PER_QUAD;
 
-	float sl = (srcx + 0.03125) / 128.0;
-	float sr = (srcx + srcw - 0.03125) / 128.0;
-	float st = (srcy + 0.03125) / 128.0;
-	float sb = (srcy + srch - 0.03125) / 128.0;
+	//FIXME extract subpic from pic
+	float size = conchars->size;
+	float sl = (srcx + 0.03125) * size;
+	float sr = (srcx + srcw - 0.03125) * size;
+	float st = (srcy + 0.03125) * size;
+	float sb = (srcy + srch - 0.03125) * size;
 
 	verts[0].xy[0] = x;
 	verts[0].xy[1] = y;

From eebf3158facf24b268e07be68e764aa69290cd45 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 13 Jan 2021 15:24:50 +0900
Subject: [PATCH 1301/1519] [ruamoko] Check for null when allocating objects

It's difficult for progs to check for errors when the engine crashes out
from underneath them :P
---
 libs/ruamoko/rua_obj.c | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/libs/ruamoko/rua_obj.c b/libs/ruamoko/rua_obj.c
index 155124b9f..8612cd6f0 100644
--- a/libs/ruamoko/rua_obj.c
+++ b/libs/ruamoko/rua_obj.c
@@ -1700,12 +1700,14 @@ class_create_instance (progs_t *pr, pr_class_t *class)
 {
 	int         size = (class->instance_size + 1) * sizeof (pr_type_t);
 	pr_type_t  *mem;
-	pr_id_t    *id;
+	pr_id_t    *id = 0;
 
 	mem = PR_Zone_TagMalloc (pr, size, class->name);
-	memset (mem, 0, size);
-	id = (pr_id_t *) (mem + 1);
-	id->class_pointer = PR_SetPointer (pr, class);
+	if (mem) {
+		memset (mem, 0, size);
+		id = (pr_id_t *) (mem + 1);
+		id->class_pointer = PR_SetPointer (pr, class);
+	}
 	return id;
 }
 
@@ -1832,9 +1834,11 @@ rua_object_copy (progs_t *pr)
 	pr_id_t    *id;
 
 	id = class_create_instance (pr, class);
-	memcpy (id, object, sizeof (pr_type_t) * class->instance_size);
-	// copy the retain count
-	((pr_type_t *) id)[-1] = ((pr_type_t *) object)[-1];
+	if (id) {
+		memcpy (id, object, sizeof (pr_type_t) * class->instance_size);
+		// copy the retain count
+		((pr_type_t *) id)[-1] = ((pr_type_t *) object)[-1];
+	}
 	RETURN_POINTER (pr, id);
 }
 

From 41b366186966ae986637f82b44c172c855954f4b Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 13 Jan 2021 15:28:56 +0900
Subject: [PATCH 1302/1519] [vulkan] Use the scrap for draw

Draw now has its own staging buffer to use with its scrap. Also, a few
fixes were needed for the staging buffer and scrap flush routines.

Other than some synchronization issues with draw scrap flushing
(currently worked around with a fence-wait) things seem to be working
nicely.
---
 libs/video/renderer/vulkan/staging.c     |   3 +
 libs/video/renderer/vulkan/texture.c     |   4 +
 libs/video/renderer/vulkan/vulkan_draw.c | 116 +++++++++++++++--------
 3 files changed, 82 insertions(+), 41 deletions(-)

diff --git a/libs/video/renderer/vulkan/staging.c b/libs/video/renderer/vulkan/staging.c
index 04e3897db..be181d00b 100644
--- a/libs/video/renderer/vulkan/staging.c
+++ b/libs/video/renderer/vulkan/staging.c
@@ -90,6 +90,9 @@ QFV_FlushStagingBuffer (qfv_stagebuf_t *stage, size_t offset, size_t size)
 	qfv_device_t *device = stage->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
 
+	size_t atom = device->physDev->properties.limits.nonCoherentAtomSize;
+	offset &= ~(atom - 1);
+	size = (size + atom - 1) & ~ (atom - 1);
 	VkMappedMemoryRange range = {
 		VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE, 0,
 		stage->memory, offset, size
diff --git a/libs/video/renderer/vulkan/texture.c b/libs/video/renderer/vulkan/texture.c
index 6529800b1..12fba3932 100644
--- a/libs/video/renderer/vulkan/texture.c
+++ b/libs/video/renderer/vulkan/texture.c
@@ -223,6 +223,10 @@ QFV_SubpicBatch (subpic_t *subpic, qfv_stagebuf_t *stage)
 	if (scrap->batch_free) {
 		batch = scrap->batch_free;
 		scrap->batch_free = batch->next;
+		batch->x = rect->x;
+		batch->y = rect->y;
+		batch->width = subpic->width;
+		batch->height = subpic->height;
 	} else {
 		batch = VRect_New (rect->x, rect->y, subpic->width, subpic->height);
 	}
diff --git a/libs/video/renderer/vulkan/vulkan_draw.c b/libs/video/renderer/vulkan/vulkan_draw.c
index badc01332..ba2d7c24c 100644
--- a/libs/video/renderer/vulkan/vulkan_draw.c
+++ b/libs/video/renderer/vulkan/vulkan_draw.c
@@ -79,7 +79,8 @@ typedef struct {
 //FIXME move into a context struct
 VkSampler       conchars_sampler;
 scrap_t        *draw_scrap;
-subpic_t       *conchars;
+qfv_stagebuf_t *draw_stage;
+qpic_t         *conchars;
 
 VkBuffer        quad_vert_buffer;
 VkBuffer        quad_ind_buffer;
@@ -146,15 +147,58 @@ destroy_quad_buffers (vulkan_ctx_t *ctx)
 	dfunc->vkDestroyBuffer (device->dev, quad_ind_buffer, 0);
 }
 
+static void
+flush_draw_scrap (vulkan_ctx_t *ctx)
+{
+	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+	VkCommandBuffer cmd = ctx->cmdbuffer;
+
+	dfunc->vkWaitForFences (device->dev, 1, &ctx->fence, VK_TRUE, ~0ull);
+	dfunc->vkResetCommandBuffer (cmd, 0);
+	VkCommandBufferBeginInfo beginInfo = {
+		VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, 0,
+		VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT, 0,
+	};
+	dfunc->vkBeginCommandBuffer (cmd, &beginInfo);
+	QFV_ScrapFlush (draw_scrap, draw_stage, cmd);
+	dfunc->vkEndCommandBuffer (cmd);
+
+	VkSubmitInfo submitInfo = {
+		VK_STRUCTURE_TYPE_SUBMIT_INFO, 0,
+		0, 0, 0,
+		1, &cmd,
+		0, 0,
+	};
+	dfunc->vkResetFences (device->dev, 1, &ctx->fence);
+	dfunc->vkQueueSubmit (device->queue.queue, 1, &submitInfo, ctx->fence);
+	dfunc->vkWaitForFences (device->dev, 1, &ctx->fence, VK_TRUE, ~0ull);//FIXME
+}
+
 static qpic_t *
-pic_data (const char *name, int w, int h, const byte *data)
+pic_data (const char *name, int w, int h, const byte *data, vulkan_ctx_t *ctx)
 {
 	qpic_t     *pic;
+	subpic_t   *subpic;
+	byte       *picdata;
 
-	pic = malloc (field_offset (qpic_t, data[w * h]));
+	pic = malloc (field_offset (qpic_t, data[sizeof (subpic_t)]));
 	pic->width = w;
 	pic->height = h;
-	memcpy (pic->data, data, pic->width * pic->height);
+
+	subpic = QFV_ScrapSubpic (draw_scrap, w, h);
+	*(subpic_t **) pic->data = subpic;
+
+	picdata = QFV_SubpicBatch (subpic, draw_stage);
+	size_t size = w * h;
+	for (size_t i = 0; i < size; i++) {
+		byte        pix = *data++;
+		byte       *col = vid.palette + pix * 3;
+		*picdata++ = *col++;
+		*picdata++ = *col++;
+		*picdata++ = *col++;
+		*picdata++ = (pix == 255) - 1;
+	}
 	return pic;
 }
 
@@ -162,7 +206,7 @@ qpic_t *
 Vulkan_Draw_MakePic (int width, int height, const byte *data,
 					 vulkan_ctx_t *ctx)
 {
-	return pic_data (0, width, height, data);
+	return pic_data (0, width, height, data, ctx);
 }
 
 void
@@ -173,13 +217,18 @@ Vulkan_Draw_DestroyPic (qpic_t *pic, vulkan_ctx_t *ctx)
 qpic_t *
 Vulkan_Draw_PicFromWad (const char *name, vulkan_ctx_t *ctx)
 {
-	return pic_data (0, 1, 1, (const byte *)"");
+	qpic_t     *wadpic = W_GetLumpName (name);
+
+	if (!wadpic) {
+		return 0;
+	}
+	return pic_data (name, wadpic->width, wadpic->height, wadpic->data, ctx);
 }
 
 qpic_t *
 Vulkan_Draw_CachePic (const char *path, qboolean alpha, vulkan_ctx_t *ctx)
 {
-	return pic_data (0, 1, 1, (const byte *)"");
+	return pic_data (0, 1, 1, (const byte *)"", ctx);
 }
 
 void
@@ -203,6 +252,7 @@ Vulkan_Draw_Shutdown (vulkan_ctx_t *ctx)
 
 	dfunc->vkDestroyPipeline (device->dev, twod_pipeline, 0);
 	QFV_DestroyScrap (draw_scrap);
+	QFV_DestroyStagingBuffer (draw_stage);
 }
 
 void
@@ -210,45 +260,17 @@ Vulkan_Draw_Init (vulkan_ctx_t *ctx)
 {
 	qfv_device_t *device = ctx->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
-	VkCommandBuffer cmd = ctx->cmdbuffer;
 
 	create_quad_buffers (ctx);
 	draw_scrap = QFV_CreateScrap (device, 2048, QFV_RGBA);
+	draw_stage = QFV_CreateStagingBuffer (device, 4 * 1024 * 1024);
 	conchars_sampler = QFV_GetSampler (ctx, "quakepic");
 
 	qpic_t     *charspic = Draw_Font8x8Pic ();
 
-	conchars = QFV_ScrapSubpic (draw_scrap, charspic->width, charspic->height);
+	conchars = pic_data (0, charspic->width, charspic->height, charspic->data, ctx);
 
-	byte *chars_data = QFV_SubpicBatch (conchars, ctx->staging[0]);
-	size_t size = charspic->width * charspic->height;
-	for (size_t i = 0; i < size; i++) {
-		byte        pix = charspic->data[i];
-		byte       *col = vid.palette + pix * 3;
-		*chars_data++ = *col++;
-		*chars_data++ = *col++;
-		*chars_data++ = *col++;
-		*chars_data++ = (pix == 255) - 1;
-	}
-
-	dfunc->vkWaitForFences (device->dev, 1, &ctx->fence, VK_TRUE, ~0ull);
-	dfunc->vkResetCommandBuffer (cmd, 0);
-	VkCommandBufferBeginInfo beginInfo = {
-		VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, 0,
-		VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT, 0,
-	};
-	dfunc->vkBeginCommandBuffer (cmd, &beginInfo);
-	QFV_ScrapFlush (draw_scrap, ctx->staging[0], cmd);
-	dfunc->vkEndCommandBuffer (cmd);
-
-	VkSubmitInfo submitInfo = {
-		VK_STRUCTURE_TYPE_SUBMIT_INFO, 0,
-		0, 0, 0,
-		1, &cmd,
-		0, 0,
-	};
-	dfunc->vkResetFences (device->dev, 1, &ctx->fence);
-	dfunc->vkQueueSubmit (device->queue.queue, 1, &submitInfo, ctx->fence);
+	flush_draw_scrap (ctx);
 
 	twod_pipeline = Vulkan_CreatePipeline (ctx, "twod");
 
@@ -307,8 +329,11 @@ draw_pic (float x, float y, int w, int h, qpic_t *pic,
 	drawvert_t *verts = quad_verts + num_quads * VERTS_PER_QUAD;
 	num_quads += VERTS_PER_QUAD;
 
-	//FIXME extract subpic from pic
-	float size = conchars->size;
+	subpic_t   *subpic = *(subpic_t **) pic->data;
+	srcx += subpic->rect->x;
+	srcy += subpic->rect->y;
+
+	float size = subpic->size;
 	float sl = (srcx + 0.03125) * size;
 	float sr = (srcx + srcw - 0.03125) * size;
 	float st = (srcy + 0.03125) * size;
@@ -347,7 +372,7 @@ queue_character (int x, int y, byte chr, vulkan_ctx_t *ctx)
 	cx = chr % 16;
 	cy = chr / 16;
 
-	draw_pic (x, y, 8, 8, 0/*FIXME*/, cx * 8, cy * 8, 8, 8, color);
+	draw_pic (x, y, 8, 8, conchars, cx * 8, cy * 8, 8, 8, color);
 }
 
 void
@@ -437,11 +462,17 @@ Vulkan_Draw_Crosshair (vulkan_ctx_t *ctx)
 void
 Vulkan_Draw_Pic (int x, int y, qpic_t *pic, vulkan_ctx_t *ctx)
 {
+	static quat_t color = { 1, 1, 1, 1};
+	draw_pic (x, y, pic->width, pic->height, pic,
+			  0, 0, pic->width, pic->height, color);
 }
 
 void
 Vulkan_Draw_Picf (float x, float y, qpic_t *pic, vulkan_ctx_t *ctx)
 {
+	static quat_t color = { 1, 1, 1, 1};
+	draw_pic (x, y, pic->width, pic->height, pic,
+			  0, 0, pic->width, pic->height, color);
 }
 
 void
@@ -494,6 +525,9 @@ Vulkan_DrawReset (vulkan_ctx_t *ctx)
 void
 Vulkan_FlushText (vulkan_ctx_t *ctx)
 {
+	if (draw_stage->offset) {
+		flush_draw_scrap (ctx);
+	}
 	qfv_device_t *device = ctx->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
 	__auto_type frame = &ctx->framebuffers.a[ctx->curFrame];

From 1205c935d00329ae5ae4f3f1e6373a74eaea8ce0 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 13 Jan 2021 16:47:49 +0900
Subject: [PATCH 1303/1519] [qfcc] Add failing test for static init

The function local static init is being treated as a non-static init
(ie, initialized each call).
---
 tools/qfcc/test/Makemodule.am | 11 +++++++++++
 tools/qfcc/test/static-init.r | 19 +++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 tools/qfcc/test/static-init.r

diff --git a/tools/qfcc/test/Makemodule.am b/tools/qfcc/test/Makemodule.am
index 3eb33892b..f328fcb6e 100644
--- a/tools/qfcc/test/Makemodule.am
+++ b/tools/qfcc/test/Makemodule.am
@@ -36,6 +36,7 @@ test_progs_dat=\
 	tools/qfcc/test/return-ivar.dat \
 	tools/qfcc/test/sendv.dat \
 	tools/qfcc/test/state.dat \
+	tools/qfcc/test/static-init.dat \
 	tools/qfcc/test/struct-init-param.dat \
 	tools/qfcc/test/struct-nil-init.dat \
 	tools/qfcc/test/structarray.dat \
@@ -411,6 +412,16 @@ tools/qfcc/test/state.run: $(qfcc_test_run_deps)
 include $(state_dep) # am--include-marker
 r_depfiles_remade += $(state_dep)
 
+tools_qfcc_test_static_init_dat_SOURCES=tools/qfcc/test/static-init.r
+static_init_obj=$(tools_qfcc_test_static_init_dat_SOURCES:.r=.o)
+static_init_dep=$(call qcautodep,$(tools_qfcc_test_static_init_dat_SOURCES))
+tools/qfcc/test/static-init.dat$(EXEEXT): $(static_init_obj) $(QFCC_DEP)
+	$(V_QFCCLD)$(QLINK) -o $@ $(static_init_obj)
+tools/qfcc/test/static-init.run: $(qfcc_test_run_deps)
+	@$(top_srcdir)/tools/qfcc/test/build-run $@
+include $(static_init_dep) # am--include-marker
+r_depfiles_remade += $(static_init_dep)
+
 tools_qfcc_test_struct_init_param_dat_SOURCES=tools/qfcc/test/struct-init-param.r
 struct_init_param_obj=$(tools_qfcc_test_struct_init_param_dat_SOURCES:.r=.o)
 struct_init_param_dep=$(call qcautodep,$(tools_qfcc_test_struct_init_param_dat_SOURCES))
diff --git a/tools/qfcc/test/static-init.r b/tools/qfcc/test/static-init.r
new file mode 100644
index 000000000..bbbe3f9a7
--- /dev/null
+++ b/tools/qfcc/test/static-init.r
@@ -0,0 +1,19 @@
+#include "test-harness.h"
+
+int count_down ()
+{
+	static int count = 2;
+	count--;
+	return count > 0;
+}
+
+int main()
+{
+	int         ret = 0;
+	count_down ();
+	if (count_down ()) {
+		printf ("did not reach 0\n");
+		ret |= 1;
+	}
+	return ret;
+}

From c7da999b6a956c24b3df8173c2fc4c8b974be6ad Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 13 Jan 2021 18:08:30 +0900
Subject: [PATCH 1304/1519] [qfcc] Use local_expr only for local variables

ie, not function-scope static variables.
---
 tools/qfcc/source/def.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/qfcc/source/def.c b/tools/qfcc/source/def.c
index 1fb204a67..d3299a0ab 100644
--- a/tools/qfcc/source/def.c
+++ b/tools/qfcc/source/def.c
@@ -597,7 +597,7 @@ initialize_def (symbol_t *sym, expr_t *init, defspace_t *space,
 			error (init, "type mismatch in initializer");
 			return;
 		}
-		if (local_expr) {
+		if (storage == sc_local && local_expr) {
 			sym->s.def->initialized = 1;
 			init = assign_expr (new_symbol_expr (sym), init);
 			// fold_constants takes care of int/float conversions

From 1fcb16d8cfcd15ae8cecdb2a578b321af4101c1b Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 13 Jan 2021 16:47:49 +0900
Subject: [PATCH 1305/1519] [qfcc] Add failing test for static init

The function local static init is being treated as a non-static init
(ie, initialized each call).
---
 tools/qfcc/test/Makemodule.am | 11 +++++++++++
 tools/qfcc/test/static-init.r | 19 +++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 tools/qfcc/test/static-init.r

diff --git a/tools/qfcc/test/Makemodule.am b/tools/qfcc/test/Makemodule.am
index 3eb33892b..f328fcb6e 100644
--- a/tools/qfcc/test/Makemodule.am
+++ b/tools/qfcc/test/Makemodule.am
@@ -36,6 +36,7 @@ test_progs_dat=\
 	tools/qfcc/test/return-ivar.dat \
 	tools/qfcc/test/sendv.dat \
 	tools/qfcc/test/state.dat \
+	tools/qfcc/test/static-init.dat \
 	tools/qfcc/test/struct-init-param.dat \
 	tools/qfcc/test/struct-nil-init.dat \
 	tools/qfcc/test/structarray.dat \
@@ -411,6 +412,16 @@ tools/qfcc/test/state.run: $(qfcc_test_run_deps)
 include $(state_dep) # am--include-marker
 r_depfiles_remade += $(state_dep)
 
+tools_qfcc_test_static_init_dat_SOURCES=tools/qfcc/test/static-init.r
+static_init_obj=$(tools_qfcc_test_static_init_dat_SOURCES:.r=.o)
+static_init_dep=$(call qcautodep,$(tools_qfcc_test_static_init_dat_SOURCES))
+tools/qfcc/test/static-init.dat$(EXEEXT): $(static_init_obj) $(QFCC_DEP)
+	$(V_QFCCLD)$(QLINK) -o $@ $(static_init_obj)
+tools/qfcc/test/static-init.run: $(qfcc_test_run_deps)
+	@$(top_srcdir)/tools/qfcc/test/build-run $@
+include $(static_init_dep) # am--include-marker
+r_depfiles_remade += $(static_init_dep)
+
 tools_qfcc_test_struct_init_param_dat_SOURCES=tools/qfcc/test/struct-init-param.r
 struct_init_param_obj=$(tools_qfcc_test_struct_init_param_dat_SOURCES:.r=.o)
 struct_init_param_dep=$(call qcautodep,$(tools_qfcc_test_struct_init_param_dat_SOURCES))
diff --git a/tools/qfcc/test/static-init.r b/tools/qfcc/test/static-init.r
new file mode 100644
index 000000000..bbbe3f9a7
--- /dev/null
+++ b/tools/qfcc/test/static-init.r
@@ -0,0 +1,19 @@
+#include "test-harness.h"
+
+int count_down ()
+{
+	static int count = 2;
+	count--;
+	return count > 0;
+}
+
+int main()
+{
+	int         ret = 0;
+	count_down ();
+	if (count_down ()) {
+		printf ("did not reach 0\n");
+		ret |= 1;
+	}
+	return ret;
+}

From 64c7efdc0c734abefe9665373eb8d2247e9937d1 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 13 Jan 2021 18:08:30 +0900
Subject: [PATCH 1306/1519] [qfcc] Use local_expr only for local variables

ie, not function-scope static variables.
---
 tools/qfcc/source/def.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/qfcc/source/def.c b/tools/qfcc/source/def.c
index 1fb204a67..d3299a0ab 100644
--- a/tools/qfcc/source/def.c
+++ b/tools/qfcc/source/def.c
@@ -597,7 +597,7 @@ initialize_def (symbol_t *sym, expr_t *init, defspace_t *space,
 			error (init, "type mismatch in initializer");
 			return;
 		}
-		if (local_expr) {
+		if (storage == sc_local && local_expr) {
 			sym->s.def->initialized = 1;
 			init = assign_expr (new_symbol_expr (sym), init);
 			// fold_constants takes care of int/float conversions

From cef81741ebd1d0d3be9997d41998ba5c08fcf3b2 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 14 Jan 2021 00:44:34 +0900
Subject: [PATCH 1307/1519] [vulkan] Implement most of the 2D renderer

The console background is missing, and scaled vs unscaled (currently
always scaled) 2d, but otherwise everything seems to work. Lots of
places to clean up, though.
---
 libs/video/renderer/vulkan/qfpipeline.plist | 10 +--
 libs/video/renderer/vulkan/twod.frag        |  2 -
 libs/video/renderer/vulkan/vulkan_draw.c    | 85 ++++++++++++++++++++-
 3 files changed, 89 insertions(+), 8 deletions(-)

diff --git a/libs/video/renderer/vulkan/qfpipeline.plist b/libs/video/renderer/vulkan/qfpipeline.plist
index a291ddf09..385713c80 100644
--- a/libs/video/renderer/vulkan/qfpipeline.plist
+++ b/libs/video/renderer/vulkan/qfpipeline.plist
@@ -168,19 +168,19 @@
 			depthStencil = {
 				depthTestEnable = true;
 				depthWriteEnable = true;
-				depthCompareOp = less;
+				depthCompareOp = less_or_equal;
 				depthBoundsTestEnable = false;
 				stencilTestEnable = false;
 			};
 			colorBlend = {
 				logicOpEnable = false;
 				attachments = ({
-					blendEnable = false;
-					srcColorBlendFactor = src_color;
-					dstColorBlendFactor = zero;
+					blendEnable = true;
+					srcColorBlendFactor = src_alpha;
+					dstColorBlendFactor = one_minus_src_alpha;
 					colorBlendOp = add;
 					srcAlphaBlendFactor = src_alpha;
-					dstAlphaBlendFactor = zero;
+					dstAlphaBlendFactor = one_minus_src_alpha;
 					alphaBlendOp = add;
 					colorWriteMask = r|g|b|a;
 				});
diff --git a/libs/video/renderer/vulkan/twod.frag b/libs/video/renderer/vulkan/twod.frag
index 83bda0874..a6a40212d 100644
--- a/libs/video/renderer/vulkan/twod.frag
+++ b/libs/video/renderer/vulkan/twod.frag
@@ -13,7 +13,5 @@ main (void)
 	vec4        pix;
 
 	pix = texture (Texture, st);
-	if (pix.a < 0.5)
-		discard;
 	frag_color = pix * color;
 }
diff --git a/libs/video/renderer/vulkan/vulkan_draw.c b/libs/video/renderer/vulkan/vulkan_draw.c
index ba2d7c24c..0262e1802 100644
--- a/libs/video/renderer/vulkan/vulkan_draw.c
+++ b/libs/video/renderer/vulkan/vulkan_draw.c
@@ -72,6 +72,12 @@ typedef struct {
 	float       color[4];
 } drawvert_t;
 
+typedef struct cachepic_s {
+	struct cachepic_s *next;
+	char       *name;
+	qpic_t     *pic;
+} cachepic_t;
+
 #define MAX_QUADS (65536)
 #define VERTS_PER_QUAD (4)
 #define INDS_PER_QUAD (5)	// one per vert plus primitive reset
@@ -81,6 +87,8 @@ VkSampler       conchars_sampler;
 scrap_t        *draw_scrap;
 qfv_stagebuf_t *draw_stage;
 qpic_t         *conchars;
+qpic_t         *white_pic;
+static hashtab_t *pic_cache;
 
 VkBuffer        quad_vert_buffer;
 VkBuffer        quad_ind_buffer;
@@ -175,6 +183,41 @@ flush_draw_scrap (vulkan_ctx_t *ctx)
 	dfunc->vkWaitForFences (device->dev, 1, &ctx->fence, VK_TRUE, ~0ull);//FIXME
 }
 
+static void
+pic_free (qpic_t *pic)
+{
+	subpic_t   *subpic = *(subpic_t **) pic->data;
+	QFV_SubpicDelete (subpic);
+	free (pic);
+}
+
+//FIXME use cmem?
+static cachepic_t *
+new_cachepic (const char *name, qpic_t *pic)
+{
+	cachepic_t *cp;
+
+	cp = malloc (sizeof (cachepic_t));
+	cp->name = strdup (name);
+	cp->pic = pic;
+	return cp;
+}
+
+static void
+cachepic_free (void *_cp, void *unused)
+{
+	cachepic_t *cp = (cachepic_t *) _cp;
+	pic_free (cp->pic);
+	free (cp->name);
+	free (cp);
+}
+
+static const char *
+cachepic_getkey (const void *_cp, void *unused)
+{
+	return ((cachepic_t *) _cp)->name;
+}
+
 static qpic_t *
 pic_data (const char *name, int w, int h, const byte *data, vulkan_ctx_t *ctx)
 {
@@ -228,12 +271,29 @@ Vulkan_Draw_PicFromWad (const char *name, vulkan_ctx_t *ctx)
 qpic_t *
 Vulkan_Draw_CachePic (const char *path, qboolean alpha, vulkan_ctx_t *ctx)
 {
-	return pic_data (0, 1, 1, (const byte *)"", ctx);
+	qpic_t     *p;
+	qpic_t     *pic;
+	cachepic_t *cpic;
+
+	if ((cpic = Hash_Find (pic_cache, path))) {
+		return cpic->pic;
+	}
+	if (strlen (path) < 4 || strcmp (path + strlen (path) - 4, ".lmp")
+		|| !(p = (qpic_t *) QFS_LoadFile (QFS_FOpenFile (path), 0))) {
+		return 0;
+	}
+
+	pic = pic_data (path, p->width, p->height, p->data, ctx);
+	free (p);
+	cpic = new_cachepic (path, pic);
+	Hash_Add (pic_cache, cpic);
+	return pic;
 }
 
 void
 Vulkan_Draw_UncachePic (const char *path, vulkan_ctx_t *ctx)
 {
+	Hash_Free (pic_cache, Hash_Del (pic_cache, path));
 }
 
 void
@@ -261,6 +321,9 @@ Vulkan_Draw_Init (vulkan_ctx_t *ctx)
 	qfv_device_t *device = ctx->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
 
+	//FIXME move into struct
+	pic_cache = Hash_NewTable (127, cachepic_getkey, cachepic_free, 0, 0);
+
 	create_quad_buffers (ctx);
 	draw_scrap = QFV_CreateScrap (device, 2048, QFV_RGBA);
 	draw_stage = QFV_CreateStagingBuffer (device, 4 * 1024 * 1024);
@@ -269,6 +332,8 @@ Vulkan_Draw_Init (vulkan_ctx_t *ctx)
 	qpic_t     *charspic = Draw_Font8x8Pic ();
 
 	conchars = pic_data (0, charspic->width, charspic->height, charspic->data, ctx);
+	byte white_block = 0xfe;
+	white_pic = pic_data (0, 1, 1, &white_block, ctx);
 
 	flush_draw_scrap (ctx);
 
@@ -480,6 +545,8 @@ Vulkan_Draw_SubPic (int x, int y, qpic_t *pic,
 					int srcx, int srcy, int width, int height,
 					vulkan_ctx_t *ctx)
 {
+	static quat_t color = { 1, 1, 1, 1};
+	draw_pic (x, y, width, height, pic, srcx, srcy, width, height, color);
 }
 
 void
@@ -495,11 +562,24 @@ Vulkan_Draw_TileClear (int x, int y, int w, int h, vulkan_ctx_t *ctx)
 void
 Vulkan_Draw_Fill (int x, int y, int w, int h, int c, vulkan_ctx_t *ctx)
 {
+	quat_t      color;
+
+	VectorScale (vid.palette + c * 3, 1.0f/255.0f, color);
+	color[3] = 1;
+	draw_pic (x, y, w, h, white_pic, 0, 0, 1, 1, color);
+}
+
+static inline void
+draw_blendscreen (quat_t color)
+{
+	draw_pic (0, 0, vid.conwidth, vid.conheight, white_pic, 0, 0, 1, 1, color);
 }
 
 void
 Vulkan_Draw_FadeScreen (vulkan_ctx_t *ctx)
 {
+	static quat_t color = { 0, 0, 0, 0.7 };
+	draw_blendscreen (color);
 }
 
 void
@@ -577,4 +657,7 @@ Vulkan_FlushText (vulkan_ctx_t *ctx)
 void
 Vulkan_Draw_BlendScreen (quat_t color, vulkan_ctx_t *ctx)
 {
+	if (color[3]) {
+		draw_blendscreen (color);
+	}
 }

From ad9c3193faa5230c665ac4e215f6d3e58af6eced Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 15 Jan 2021 22:45:49 +0900
Subject: [PATCH 1308/1519] [vulkan] Use darray size to control cmd buffer
 count

This allows the array in which the command buffers are allocated to be
allocated on the stack using alloca and thus remove the need to
malloc/free of relatively small chunks.
---
 include/QF/Vulkan/command.h                    | 11 ++++++++---
 libs/video/renderer/vid_render_vulkan.c        |  7 +++----
 libs/video/renderer/vulkan/command.c           | 12 +++++-------
 libs/video/renderer/vulkan/vulkan_draw.c       |  9 ++++-----
 libs/video/renderer/vulkan/vulkan_vid_common.c |  7 +++----
 5 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/include/QF/Vulkan/command.h b/include/QF/Vulkan/command.h
index 925a63781..47418db1a 100644
--- a/include/QF/Vulkan/command.h
+++ b/include/QF/Vulkan/command.h
@@ -6,6 +6,9 @@
 typedef struct qfv_cmdbufferset_s
 	DARRAY_TYPE (VkCommandBuffer) qfv_cmdbufferset_t;
 
+#define QFV_AllocCommandBufferSet(num, allocator) \
+	DARRAY_ALLOCFIXED (qfv_cmdbufferset_t, num, allocator)
+
 typedef struct qfv_semaphoreset_s
 	DARRAY_TYPE (VkSemaphore) qfv_semaphoreset_t;
 
@@ -23,9 +26,11 @@ struct qfv_device_s;
 VkCommandPool QFV_CreateCommandPool (struct qfv_device_s *device,
 									  uint32_t queueFamily,
 									  int transient, int reset);
-qfv_cmdbufferset_t *QFV_AllocateCommandBuffers (struct qfv_device_s *device,
-												VkCommandPool pool,
-											    int secondary, int count);
+/** Allocate bufferset->size command buffers
+ */
+int QFV_AllocateCommandBuffers (struct qfv_device_s *device,
+								VkCommandPool pool, int secondary,
+								qfv_cmdbufferset_t *bufferset);
 
 VkSemaphore QFV_CreateSemaphore (struct qfv_device_s *device);
 VkFence QFV_CreateFence (struct qfv_device_s *device, int signaled);
diff --git a/libs/video/renderer/vid_render_vulkan.c b/libs/video/renderer/vid_render_vulkan.c
index 995763baf..f68e8c182 100644
--- a/libs/video/renderer/vid_render_vulkan.c
+++ b/libs/video/renderer/vid_render_vulkan.c
@@ -389,11 +389,10 @@ vulkan_vid_render_choose_visual (void)
 	vulkan_ctx->cmdpool = QFV_CreateCommandPool (vulkan_ctx->device,
 									 vulkan_ctx->device->queue.queueFamily,
 									 0, 1);
-	__auto_type cmdset = QFV_AllocateCommandBuffers (vulkan_ctx->device,
-													 vulkan_ctx->cmdpool,
-													 0, 1);
+	__auto_type cmdset = QFV_AllocCommandBufferSet (1, alloca);
+	QFV_AllocateCommandBuffers (vulkan_ctx->device, vulkan_ctx->cmdpool, 0,
+								cmdset);
 	vulkan_ctx->cmdbuffer = cmdset->a[0];
-	free (cmdset);
 	vulkan_ctx->fence = QFV_CreateFence (vulkan_ctx->device, 1);
 	Sys_Printf ("vk choose visual %p %p %d %p\n", vulkan_ctx->device->dev,
 				vulkan_ctx->device->queue.queue,
diff --git a/libs/video/renderer/vulkan/command.c b/libs/video/renderer/vulkan/command.c
index 8ba60ab32..10f0cc559 100644
--- a/libs/video/renderer/vulkan/command.c
+++ b/libs/video/renderer/vulkan/command.c
@@ -87,9 +87,9 @@ QFV_CreateCommandPool (qfv_device_t *device, uint32_t queueFamily,
 	return pool;
 }
 
-qfv_cmdbufferset_t *
+int
 QFV_AllocateCommandBuffers (qfv_device_t *device, VkCommandPool pool,
-							int secondary, int count)
+							int secondary, qfv_cmdbufferset_t *bufferset)
 {
 	VkDevice    dev = device->dev;
 	qfv_devfuncs_t *dfunc = device->funcs;
@@ -99,12 +99,10 @@ QFV_AllocateCommandBuffers (qfv_device_t *device, VkCommandPool pool,
 	}
 	VkCommandBufferAllocateInfo allocInfo = {
 		VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, 0,
-		pool, level, count
+		pool, level, bufferset->size
 	};
-	qfv_cmdbufferset_t *cmdbufferset;
-	cmdbufferset = DARRAY_ALLOCFIXED (*cmdbufferset, count, malloc);
-	dfunc->vkAllocateCommandBuffers (dev, &allocInfo, cmdbufferset->a);
-	return cmdbufferset;
+	int ret = dfunc->vkAllocateCommandBuffers (dev, &allocInfo, bufferset->a);
+	return ret == VK_SUCCESS;
 }
 
 VkSemaphore
diff --git a/libs/video/renderer/vulkan/vulkan_draw.c b/libs/video/renderer/vulkan/vulkan_draw.c
index 0262e1802..61b85d3e1 100644
--- a/libs/video/renderer/vulkan/vulkan_draw.c
+++ b/libs/video/renderer/vulkan/vulkan_draw.c
@@ -355,12 +355,12 @@ Vulkan_Draw_Init (vulkan_ctx_t *ctx)
 		QFV_ScrapImageView (draw_scrap),
 		VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL,
 	};
-	__auto_type cmdBuffers
-		= QFV_AllocateCommandBuffers (device, ctx->cmdpool, 1,
-									  ctx->framebuffers.size);
+	size_t      frames = ctx->framebuffers.size;
+	__auto_type cmdBuffers = QFV_AllocCommandBufferSet (frames, alloca);
+	QFV_AllocateCommandBuffers (device, ctx->cmdpool, 1, cmdBuffers);
 
 	__auto_type sets = QFV_AllocateDescriptorSet (device, pool, layouts);
-	for (size_t i = 0; i < ctx->framebuffers.size; i++) {
+	for (size_t i = 0; i < frames; i++) {
 		__auto_type frame = &ctx->framebuffers.a[i];
 		frame->twodDescriptors = sets->a[i];
 
@@ -379,7 +379,6 @@ Vulkan_Draw_Init (vulkan_ctx_t *ctx)
 		DARRAY_APPEND (frame->subCommand, cmdBuffers->a[i]);
 	}
 	free (sets);
-	free (cmdBuffers);
 }
 
 static inline void
diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c
index 126d602fd..16e60e5c1 100644
--- a/libs/video/renderer/vulkan/vulkan_vid_common.c
+++ b/libs/video/renderer/vulkan/vulkan_vid_common.c
@@ -402,9 +402,9 @@ Vulkan_CreateFramebuffers (vulkan_ctx_t *ctx)
 	attachments->a[0] = ctx->renderpass.colorImage->view;
 	attachments->a[1] = ctx->renderpass.depthImage->view;
 
-	__auto_type cmdBuffers
-		= QFV_AllocateCommandBuffers (device, cmdpool, 0,
-									  ctx->framebuffers.size);
+	__auto_type cmdBuffers = QFV_AllocCommandBufferSet (ctx->framebuffers.size,
+														alloca);
+	QFV_AllocateCommandBuffers (device, cmdpool, 0, cmdBuffers);
 
 	for (size_t i = 0; i < ctx->framebuffers.size; i++) {
 		attachments->a[2] = sc->imageViews->a[i];
@@ -420,7 +420,6 @@ Vulkan_CreateFramebuffers (vulkan_ctx_t *ctx)
 		frame->subCommand = malloc (sizeof (qfv_cmdbufferset_t));
 		DARRAY_INIT (frame->subCommand, 4);
 	}
-	free (cmdBuffers);
 }
 
 void

From 92afe9f265ef74243138cb12508bf3317c9487cf Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 15 Jan 2021 22:50:04 +0900
Subject: [PATCH 1309/1519] [vulkan] Convert stagebuf to a ring buffer

I should have known this would be necessary, but it fixes the corruption
when updating the scrap.
---
 include/QF/Vulkan/funclist.h                  |   1 +
 include/QF/Vulkan/staging.h                   |  24 +-
 include/QF/Vulkan/texture.h                   |  20 +-
 libs/video/renderer/Makemodule.am             |   1 +
 libs/video/renderer/vulkan/staging.c          | 180 ++++++-
 libs/video/renderer/vulkan/test/Makemodule.am |  19 +
 .../video/renderer/vulkan/test/test-staging.c | 438 ++++++++++++++++++
 libs/video/renderer/vulkan/texture.c          |  39 +-
 libs/video/renderer/vulkan/vulkan_draw.c      |  32 +-
 .../video/renderer/vulkan/vulkan_vid_common.c |   6 +-
 10 files changed, 688 insertions(+), 72 deletions(-)
 create mode 100644 libs/video/renderer/vulkan/test/Makemodule.am
 create mode 100644 libs/video/renderer/vulkan/test/test-staging.c

diff --git a/include/QF/Vulkan/funclist.h b/include/QF/Vulkan/funclist.h
index 534097b5d..63c5bde29 100644
--- a/include/QF/Vulkan/funclist.h
+++ b/include/QF/Vulkan/funclist.h
@@ -101,6 +101,7 @@ DEVICE_LEVEL_VULKAN_FUNCTION (vkCreateSemaphore)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkCreateFence)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkWaitForFences)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkResetFences)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkGetFenceStatus)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkQueueSubmit)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkQueueWaitIdle)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkDeviceWaitIdle)
diff --git a/include/QF/Vulkan/staging.h b/include/QF/Vulkan/staging.h
index 9a90edd6e..aaac5d749 100644
--- a/include/QF/Vulkan/staging.h
+++ b/include/QF/Vulkan/staging.h
@@ -1,20 +1,36 @@
 #ifndef __QF_Vulkan_staging_h
 #define __QF_Vulkan_staging_h
 
+typedef struct qfv_packet_s {
+	struct qfv_stagebuf_s *stage;	///< staging buffer that owns this packet
+	VkCommandBuffer cmd;
+	VkFence     fence;
+	size_t      offset;
+	size_t      length;
+} qfv_packet_t;
+
 typedef struct qfv_stagebuf_s {
 	struct qfv_device_s *device;
 	VkBuffer    buffer;
 	VkDeviceMemory memory;
-	size_t      size;
-	size_t      offset;		///< for batching building
+	qfv_packet_t *packet;	///< array of packets for controlling access
+	size_t      num_packets;///< number of packets in array
+	size_t      next_packet;///< index of the next packet to be used
+	size_t      size;		///< actual size of the buffer
+	size_t      end;		///< effective end of the buffer due to early wrap
+	size_t      head;
+	size_t      tail;
 	void       *data;
 } qfv_stagebuf_t;
 
 
 qfv_stagebuf_t *QFV_CreateStagingBuffer (struct qfv_device_s *device,
-										 size_t size);
+										 size_t size, int num_packets,
+										 VkCommandPool cmdPool);
 void QFV_DestroyStagingBuffer (qfv_stagebuf_t *stage);
 void QFV_FlushStagingBuffer (qfv_stagebuf_t *stage, size_t offset, size_t size);
-void *QFV_ClaimStagingBuffer (qfv_stagebuf_t *stage, size_t size);
+qfv_packet_t *QFV_PacketAcquire (qfv_stagebuf_t *stage);
+void *QFV_PacketExtend (qfv_packet_t *packet, size_t size);
+void QFV_PacketSubmit (qfv_packet_t *packet);
 
 #endif//__QF_Vulkan_staging_h
diff --git a/include/QF/Vulkan/texture.h b/include/QF/Vulkan/texture.h
index 6a55815f6..e24fa0eb1 100644
--- a/include/QF/Vulkan/texture.h
+++ b/include/QF/Vulkan/texture.h
@@ -18,26 +18,8 @@ VkImageView QFV_ScrapImageView (scrap_t *scrap) __attribute__((pure));
 subpic_t *QFV_ScrapSubpic (scrap_t *scrap, int width, int height);
 void QFV_SubpicDelete (subpic_t *subpic);
 
-/** Add an update region to the batch queue.
- *
- * The region to be updated is recorded in the batch queue, space allocated
- * in the staging buffer, and a pointer to the allocated space is returned.
- *
- * \note No data is stransfered. This facilitates writing generated data
- * directly to the staging buffer.
- */
 void *QFV_SubpicBatch (subpic_t *subpic, struct qfv_stagebuf_s *stage);
 
-/** Flush all batched subpic updates.
- *
- * The offset in the staging bufffer \a stage is reset to 0. The command
- * buffer is populated with the appropriate image layout barriers and the
- * necessary copy commands.
- *
- * \note The command buffer is neither begun nor ended, nor is it submitted
- * to a queue. This is to maximize flexibility in command buffer usage.
- */
-void QFV_ScrapFlush (scrap_t *scrap, struct qfv_stagebuf_s *stage,
-					 VkCommandBuffer cmd);
+void QFV_ScrapFlush (scrap_t *scrap);
 
 #endif//__QF_Vulkan_texture_h
diff --git a/libs/video/renderer/Makemodule.am b/libs/video/renderer/Makemodule.am
index 6f306ffe5..7a323f118 100644
--- a/libs/video/renderer/Makemodule.am
+++ b/libs/video/renderer/Makemodule.am
@@ -1,3 +1,4 @@
+include libs/video/renderer/vulkan/test/Makemodule.am
 include libs/video/renderer/vulkan/vkgen/Makemodule.am
 
 #lib_LTLIBRARIES += @VID_REND_TARGETS@
diff --git a/libs/video/renderer/vulkan/staging.c b/libs/video/renderer/vulkan/staging.c
index be181d00b..40ad459a6 100644
--- a/libs/video/renderer/vulkan/staging.c
+++ b/libs/video/renderer/vulkan/staging.c
@@ -47,6 +47,7 @@
 #include "QF/sys.h"
 #include "QF/Vulkan/qf_vid.h"
 #include "QF/Vulkan/buffer.h"
+#include "QF/Vulkan/command.h"
 #include "QF/Vulkan/device.h"
 #include "QF/Vulkan/instance.h"
 #include "QF/Vulkan/staging.h"
@@ -54,21 +55,39 @@
 #include "vid_vulkan.h"
 
 qfv_stagebuf_t *
-QFV_CreateStagingBuffer (qfv_device_t *device, size_t size)
+QFV_CreateStagingBuffer (qfv_device_t *device, size_t size, int num_packets,
+						 VkCommandPool cmdPool)
 {
 	qfv_devfuncs_t *dfunc = device->funcs;
 
-	qfv_stagebuf_t *stage = malloc (sizeof (qfv_stagebuf_t));
-	stage->size = size;
-	stage->offset = 0;
+	qfv_stagebuf_t *stage = malloc (sizeof (qfv_stagebuf_t)
+									+ num_packets * sizeof (qfv_packet_t));
 	stage->device = device;
 	stage->buffer = QFV_CreateBuffer (device, size,
 									  VK_BUFFER_USAGE_TRANSFER_SRC_BIT);
 	stage->memory = QFV_AllocBufferMemory (device, stage->buffer,
 										   VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT,
 										   size, 0);
-	QFV_BindBufferMemory (device, stage->buffer, stage->memory, 0);
+	stage->packet = (qfv_packet_t *) (stage + 1);
+	stage->num_packets = num_packets;
+	stage->next_packet = 0;
+	stage->size = size;
+	stage->end = size;
+	stage->head = 0;
+	stage->tail = 0;
+
 	dfunc->vkMapMemory (device->dev, stage->memory, 0, size, 0, &stage->data);
+	QFV_BindBufferMemory (device, stage->buffer, stage->memory, 0);
+
+	__auto_type bufferset = QFV_AllocCommandBufferSet (num_packets, alloca);
+	QFV_AllocateCommandBuffers (device, cmdPool, 0, bufferset);
+	for (int i = 0; i < num_packets; i++) {
+		stage->packet[i].stage = stage;
+		stage->packet[i].cmd = bufferset->a[i];
+		stage->packet[i].fence = QFV_CreateFence (device, 1);
+		stage->packet[i].offset = 0;
+		stage->packet[i].length = 0;
+	}
 	return stage;
 }
 
@@ -78,6 +97,10 @@ QFV_DestroyStagingBuffer (qfv_stagebuf_t *stage)
 	qfv_device_t *device = stage->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
 
+	for (size_t i = 0; i < stage->num_packets; i++) {
+		dfunc->vkDestroyFence (device->dev, stage->packet[i].fence, 0);
+	}
+
 	dfunc->vkUnmapMemory (device->dev, stage->memory);
 	dfunc->vkFreeMemory (device->dev, stage->memory, 0);
 	dfunc->vkDestroyBuffer (device->dev, stage->buffer, 0);
@@ -100,13 +123,150 @@ QFV_FlushStagingBuffer (qfv_stagebuf_t *stage, size_t offset, size_t size)
 	dfunc->vkFlushMappedMemoryRanges (device->dev, 1, &range);
 }
 
-void *
-QFV_ClaimStagingBuffer (qfv_stagebuf_t *stage, size_t size)
+static void
+advance_tail (qfv_stagebuf_t *stage, qfv_packet_t *packet)
 {
-	if (stage->offset + size > stage->size) {
+	qfv_device_t *device = stage->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	qfv_packet_t *start = packet;
+
+	while (1) {
+		if ((size_t) (++packet - stage->packet) >= stage->num_packets) {
+			packet = stage->packet;
+		}
+		if (packet != start
+			&& (dfunc->vkGetFenceStatus (device->dev, packet->fence)
+				== VK_SUCCESS)) {
+			if (packet->length == 0) {
+				continue;
+			}
+			if ((stage->tail == stage->end && packet->offset == 0)
+				|| stage->tail == packet->offset) {
+				stage->tail = packet->offset + packet->length;
+				packet->length = 0;
+				if (stage->tail >= stage->end) {
+					stage->end = stage->size;
+					stage->tail = stage->size;
+				}
+			}
+			continue;
+		}
+		// Packets are always aquired in sequence and thus the first busy
+		// packet after the start packet marks the end of available space.
+		// Alternatively, there is only one packet and we've looped around
+		// back to the start packet. Must ensure the tail is updated
+		if (stage->tail >= stage->end && packet->offset == 0) {
+			stage->end = stage->size;
+			stage->tail = packet->offset;
+		}
+		break;
+	}
+}
+
+qfv_packet_t *
+QFV_PacketAcquire (qfv_stagebuf_t *stage)
+{
+	qfv_device_t *device = stage->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+	qfv_packet_t *packet = &stage->packet[stage->next_packet++];
+	stage->next_packet %= stage->num_packets;
+
+	dfunc->vkWaitForFences (device->dev, 1, &packet->fence, VK_TRUE, ~0ull);
+
+	advance_tail (stage, packet);
+	if (stage->head == stage->size) {
+		stage->head = 0;
+	}
+	packet->offset = stage->head;
+	packet->length = 0;
+
+	dfunc->vkResetFences (device->dev, 1, &packet->fence);
+	dfunc->vkResetCommandBuffer (packet->cmd, 0);
+	VkCommandBufferBeginInfo beginInfo = {
+		VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, 0,
+		VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT, 0,
+	};
+	dfunc->vkBeginCommandBuffer (packet->cmd, &beginInfo);
+
+	return packet;
+}
+
+void *
+QFV_PacketExtend (qfv_packet_t *packet, size_t size)
+{
+	qfv_stagebuf_t *stage = packet->stage;
+	if (!size || size > stage->size) {
 		return 0;
 	}
-	void       *data = (byte *) stage->data + stage->offset;
-	stage->offset += (size + 3) & ~3;
+
+	//FIXME extra logic may be needed to wait wait for space to become
+	//available when the requested size should fit but can't due to in-flight
+	//packets
+	advance_tail (stage, packet);
+
+	size_t      head = stage->head;
+	size_t      end = stage->end;
+	if (head + size > stage->end) {
+		if (packet->length) {
+			// packets cannot wrap around the buffer (must use separate
+			// packets)
+			return 0;
+		}
+		if (stage->tail == 0) {
+			// the beginning of the the staging buffer is occupied
+			return 0;
+		}
+		packet->offset = 0;
+		head = 0;
+		end = stage->head;
+	}
+	if (head < stage->tail && head + size > stage->tail) {
+		// not enough room for the sub-packet
+		return 0;
+	}
+	void       *data = (byte *) stage->data + head;
+	stage->end = end;
+	stage->head = head + size;
+	packet->length += size;
 	return data;
 }
+
+void
+QFV_PacketSubmit (qfv_packet_t *packet)
+{
+	qfv_stagebuf_t *stage = packet->stage;
+	qfv_device_t *device = stage->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	if (!packet->length) {
+		// XXX at this stage, this looks the same as below, I think a queue
+		// completing is the only way to set a fence (other than creation),
+		// so submit the (hopefully) empty command buffer so the fence becomes
+		// set, but without waiting on or triggering any semaphores.
+		dfunc->vkEndCommandBuffer (packet->cmd);
+		VkSubmitInfo submitInfo = {
+			VK_STRUCTURE_TYPE_SUBMIT_INFO, 0,
+			0, 0, 0,
+			1, &packet->cmd,
+			0, 0,
+		};
+		dfunc->vkQueueSubmit (device->queue.queue, 1, &submitInfo,
+							  packet->fence);
+		return;
+	}
+
+	QFV_FlushStagingBuffer (stage, packet->offset, packet->length);
+
+	dfunc->vkEndCommandBuffer (packet->cmd);
+	//XXX it may become necessary to pass in semaphores etc (maybe add to
+	//packet?)
+	VkSubmitInfo submitInfo = {
+		VK_STRUCTURE_TYPE_SUBMIT_INFO, 0,
+		0, 0, 0,
+		1, &packet->cmd,
+		0, 0,
+	};
+	// The fence was reset when the packet was acquired
+	dfunc->vkQueueSubmit (device->queue.queue, 1, &submitInfo, packet->fence);
+}
diff --git a/libs/video/renderer/vulkan/test/Makemodule.am b/libs/video/renderer/vulkan/test/Makemodule.am
new file mode 100644
index 000000000..cacb206f3
--- /dev/null
+++ b/libs/video/renderer/vulkan/test/Makemodule.am
@@ -0,0 +1,19 @@
+libs_video_renderer_vulkan_tests = \
+	libs/video/renderer/vulkan/test/test-staging \
+	$e
+
+TESTS += $(libs_video_renderer_vulkan_tests)
+
+check_PROGRAMS += $(libs_video_renderer_vulkan_tests)
+
+libs_video_renderer_vulkan_test_libs= \
+	libs/video/renderer/vid_render_vulkan.la \
+	libs/util/libQFutil.la
+
+libs_video_renderer_vulkan_test_test_staging_SOURCES= 		\
+	libs/video/renderer/vulkan/test/test-staging.c	\
+	$e
+libs_video_renderer_vulkan_test_test_staging_LDADD=			\
+	$(libs_video_renderer_vulkan_test_libs)
+libs_video_renderer_vulkan_test_test_staging_DEPENDENCIES=	\
+	$(libs_video_renderer_vulkan_test_libs)
diff --git a/libs/video/renderer/vulkan/test/test-staging.c b/libs/video/renderer/vulkan/test/test-staging.c
new file mode 100644
index 000000000..bb5361cec
--- /dev/null
+++ b/libs/video/renderer/vulkan/test/test-staging.c
@@ -0,0 +1,438 @@
+#include <stdio.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "QF/Vulkan/qf_vid.h"
+#include "QF/Vulkan/device.h"
+#include "QF/Vulkan/instance.h"
+#include "QF/Vulkan/staging.h"
+
+void *stage_memory;
+
+static VkResult
+vkMapMemory (VkDevice device, VkDeviceMemory memory,
+			 VkDeviceSize offset, VkDeviceSize size, VkMemoryMapFlags flags,
+			 void **data)
+{
+	char       *buf = calloc (1, size);
+	stage_memory = buf;
+	*data = buf;
+	return VK_SUCCESS;
+}
+
+static VkResult
+vkBindBufferMemory (VkDevice device, VkBuffer buffer, VkDeviceMemory memory,
+					VkDeviceSize offset)
+{
+	return VK_SUCCESS;
+}
+
+static VkResult
+vkCreateBuffer (VkDevice device, const VkBufferCreateInfo *cinfo,
+				const VkAllocationCallbacks *allocator, VkBuffer *buffer)
+{
+	*buffer = 0;
+	return VK_SUCCESS;
+}
+
+static void
+vkGetBufferMemoryRequirements (VkDevice device, VkBuffer buffer,
+							   VkMemoryRequirements *requirements)
+{
+	memset (requirements, 0, sizeof (*requirements));
+}
+
+static VkResult
+vkAllocateCommandBuffers (VkDevice device,
+						  const VkCommandBufferAllocateInfo *info,
+						  VkCommandBuffer *buffers)
+{
+	static size_t cmdBuffer = 0;
+
+	for (uint32_t i = 0; i < info->commandBufferCount; i++) {
+		buffers[i] = (VkCommandBuffer) ++cmdBuffer;
+	}
+	return VK_SUCCESS;
+}
+
+static VkResult
+vkCreateFence (VkDevice device, const VkFenceCreateInfo *info,
+			   const VkAllocationCallbacks *allocator, VkFence *fence)
+{
+	int       *f = malloc (sizeof (int));
+	*f = info->flags & VK_FENCE_CREATE_SIGNALED_BIT ? 1 : 0;
+	*(int **)fence = f;
+	return VK_SUCCESS;
+}
+
+static VkResult
+vkWaitForFences (VkDevice device, uint32_t fenceCount, const VkFence *fences,
+				 VkBool32 waitAll, uint64_t timeout)
+{
+	for (uint32_t i = 0; i < fenceCount; i++) {
+		int        *f = (int *)fences[i];
+		*f = 0;
+	}
+	return VK_SUCCESS;
+}
+
+static VkResult
+vkResetFences (VkDevice device, uint32_t fenceCount, const VkFence *fences)
+{
+	for (uint32_t i = 0; i < fenceCount; i++) {
+		int        *f = (int *)fences[i];
+		*f = 0;
+	}
+	return VK_SUCCESS;
+}
+
+static VkResult
+vkGetFenceStatus (VkDevice device, VkFence fence)
+{
+	int        *f = (int *)fence;
+	return *f ? VK_SUCCESS : VK_NOT_READY;
+}
+
+static VkResult
+vkResetCommandBuffer (VkCommandBuffer buffer, VkCommandBufferResetFlags flags)
+{
+	return VK_SUCCESS;
+}
+
+static VkResult
+vkBeginCommandBuffer (VkCommandBuffer buffer,
+					  const VkCommandBufferBeginInfo *info)
+{
+	return VK_SUCCESS;
+}
+
+static VkResult
+vkEndCommandBuffer (VkCommandBuffer buffer)
+{
+	return VK_SUCCESS;
+}
+
+static VkResult
+vkFlushMappedMemoryRanges (VkDevice device, uint32_t count,
+						   const VkMappedMemoryRange *ranges)
+{
+	return VK_SUCCESS;
+}
+
+static VkResult
+vkQueueSubmit (VkQueue queue, uint32_t count, const VkSubmitInfo *submits,
+			   VkFence fence)
+{
+	int        *f = (int *)fence;
+	*f = 1;
+	return VK_SUCCESS;
+}
+
+qfv_devfuncs_t dfuncs = {
+	vkCreateBuffer:vkCreateBuffer,
+	vkGetBufferMemoryRequirements:vkGetBufferMemoryRequirements,
+	vkMapMemory:vkMapMemory,
+	vkBindBufferMemory:vkBindBufferMemory,
+	vkAllocateCommandBuffers:vkAllocateCommandBuffers,
+	vkCreateFence:vkCreateFence,
+	vkWaitForFences:vkWaitForFences,
+	vkResetFences:vkResetFences,
+	vkGetFenceStatus:vkGetFenceStatus,
+	vkResetCommandBuffer:vkResetCommandBuffer,
+	vkBeginCommandBuffer:vkBeginCommandBuffer,
+	vkEndCommandBuffer:vkEndCommandBuffer,
+	vkFlushMappedMemoryRanges:vkFlushMappedMemoryRanges,
+	vkQueueSubmit:vkQueueSubmit,
+};
+qfv_physdev_t physDev;
+qfv_device_t device = {
+	physDev:&physDev,
+	funcs:&dfuncs,
+};
+
+static void __attribute__ ((format (printf, 2, 3), noreturn))
+_error (int line, const char *fmt, ...)
+{
+	va_list     args;
+
+	va_start (args, fmt);
+	fprintf (stderr, "%d: ", line);
+	vfprintf (stderr, fmt, args);
+	fprintf (stderr, "\n");
+	va_end (args);
+	exit(1);
+}
+#define error(fmt...) _error(__LINE__, fmt)
+
+int
+main (void)
+{
+	qfv_stagebuf_t *stage = QFV_CreateStagingBuffer (&device, 1024, 4, 0);
+
+	if (stage->num_packets != 4) {
+		error ("stage has incorrect packet count: %zd\n", stage->num_packets);
+	}
+	if (stage->next_packet != 0) {
+		error ("stage has incorrect next_packet: %zd\n", stage->next_packet);
+	}
+	if (stage->size != 1024) {
+		error ("stage has incorrect size: %zd\n", stage->size);
+	}
+	if (stage->end != stage->size) {
+		error ("stage has incorrect end: %zd\n", stage->end);
+	}
+	if (stage->head || stage->tail != stage->head) {
+		error ("stage ring buffer not initialized: h:%zd t:%zd\n",
+			   stage->head, stage->tail);
+	}
+	if (!stage->data || stage->data != stage_memory) {
+		error ("stage memory not mapped: d:%p, m:%p\n",
+			   stage->data, stage_memory);
+	}
+
+	for (size_t i = 0; i < stage->num_packets; i++) {
+		qfv_packet_t *p = &stage->packet[i];
+		if (p->stage != stage) {
+			error ("packet[%zd] stage not set: ps:%p s:%p\n", i,
+				   p->stage, stage);
+		}
+		if (!p->cmd) {
+			error ("packet[%zd] has no command buffer\n", i);
+		}
+		if (!p->fence) {
+			error ("packet[%zd] has no fence\n", i);
+		}
+		for (size_t j = 0; j < i; j++) {
+			qfv_packet_t *q = &stage->packet[j];
+			if (q->cmd == p->cmd || q->fence == p->fence) {
+				error ("packet[%zd] has dup fence or cmd buf\n", i);
+			}
+		}
+		if (vkGetFenceStatus (device.dev, p->fence) != VK_SUCCESS) {
+			error ("packet[%zd].fence is not signaled\n", i);
+		}
+		if (p->offset || p->length) {
+			error ("packet[%zd] size/length not initialized: o:%zd l:%zd\n",
+				   i, p->offset, p->length);
+		}
+	}
+
+	qfv_packet_t *packet = QFV_PacketAcquire (stage);
+	if (vkGetFenceStatus (device.dev, packet->fence) != VK_NOT_READY) {
+		error ("packet.fence is signaled\n");
+	}
+
+	void *data;
+	size_t old_head, old_tail;
+
+	old_head = stage->head;
+	old_tail = stage->tail;
+	data = QFV_PacketExtend (packet, 0);
+	if (data) {
+		error ("0 byte extend did not return null\n");
+	}
+	if (stage->head != old_head || stage->tail != old_tail) {
+		error ("0 byte extend moved head or tail\n");
+	}
+
+	data = QFV_PacketExtend (packet, 2048);
+	if (data) {
+		error ("2048 byte extend did not return null\n");
+	}
+	if (stage->head != old_head || stage->tail != old_tail) {
+		error ("2048 byte extend moved head or tail\n");
+	}
+
+	data = QFV_PacketExtend (packet, 1024);
+	if (!data) {
+		error ("1024 byte extend failed\n");
+	}
+	if (stage->head == old_head) {
+		error ("1024 byte extend did not move head\n");
+	}
+	if (stage->tail != old_tail) {
+		error ("1024 byte extend moved tail\n");
+	}
+	if (stage->head > stage->size) {
+		error ("stage head out of bounds: %zd\n", stage->head);
+	}
+	if (packet->offset != old_head || packet->length != 1024) {
+		error ("packet offset/size incorrect: p:%zd,%zd h:%zd\n",
+			   packet->offset, packet->length, old_head);
+	}
+	if (stage->head < packet->offset + packet->length) {
+		error ("stage head before end of packet: %zd, pe:%zd\n",
+			   stage->head, packet->offset + packet->length);
+	}
+
+	old_head = stage->head;
+	old_tail = stage->tail;
+	data = QFV_PacketExtend (packet, 16);
+	if (data) {
+		error ("16 byte extend in full stage did not return null\n");
+	}
+	if (stage->head != old_head || stage->tail != old_tail) {
+		error ("16 byte extend moved head or tail\n");
+	}
+	QFV_PacketSubmit (packet);
+	if (vkGetFenceStatus (device.dev, packet->fence) != VK_SUCCESS) {
+		error ("packet.fence is not signaled\n");
+	}
+
+	if (stage->head != 1024 || stage->tail != 0) {
+		error ("stage head or tail not as expected: h: %zd t:%zd\n",
+			   stage->head, stage->tail);
+	}
+
+	qfv_packet_t *packet2 = QFV_PacketAcquire (stage);
+	if (!packet2 || packet2 == packet) {
+		error ("did not get new packet: n:%p o:%p\n", packet2, packet);
+	}
+	packet = packet2;
+	if (packet->offset != 0 || stage->head != 0 || stage->tail != 0) {
+		error ("new packet did not wrap: p:%zd h:%zd t:%zd\n",
+			   packet2->offset, stage->head, stage->tail);
+	}
+
+	old_head = stage->head;
+	old_tail = stage->tail;
+	data = QFV_PacketExtend (packet, 768);
+	if (!data) {
+		error ("768 byte extend failed\n");
+	}
+	if (stage->head == old_head) {
+		error ("768 byte extend did not move head\n");
+	}
+	if (stage->tail != 0) {
+		error ("768 byte extend dit not wrap tail: %zd\n", stage->tail);
+	}
+	if (stage->head > stage->size) {
+		error ("stage head out of bounds: %zd\n", stage->head);
+	}
+	if (packet->offset != old_head || packet->length != 768) {
+		error ("packet offset/size incorrect: p:%zd,%zd h:%zd\n",
+			   packet->offset, packet->length, old_head);
+	}
+	if (stage->head < packet->offset + packet->length) {
+		error ("stage head before end of packet: %zd, pe:%zd\n",
+			   stage->head, packet->offset + packet->length);
+	}
+
+	// test attempting to wrap the packet (without needed space)
+	old_head = stage->head;
+	old_tail = stage->tail;
+	data = QFV_PacketExtend (packet, 512);
+	if (data) {
+		error ("512 byte extend in partially full stage succeeded\n");
+	}
+	if (stage->head != old_head || stage->tail != old_tail) {
+		error ("512 byte extend moved head or tail\n");
+	}
+	QFV_PacketSubmit (packet);
+
+	if (stage->head != 768 || stage->tail != 0) {
+		error ("stage head or tail not as expected: h: %zd t:%zd\n",
+			   stage->head, stage->tail);
+	}
+
+	packet = QFV_PacketAcquire (stage);
+
+	// test wrapping a new packet
+	data = QFV_PacketExtend (packet, 512);
+	if (!data) {
+		error ("512 byte extend failed\n");
+	}
+	if (packet->offset != 0 || packet->length != 512) {
+		error ("packet offset/size incorrect: p:%zd,%zd\n",
+			   packet->offset, packet->length);
+	}
+	if (stage->head != 512 || stage->tail != stage->end || stage->end !=768) {
+		error ("stage head or tail not as expected: h: %zd t:%zd\n",
+			   stage->head, stage->tail);
+	}
+	data = QFV_PacketExtend (packet, 512);
+	if (!data) {
+		error ("second 512 byte extend failed\n");
+	}
+	if (packet->offset != 0 || packet->length != 1024) {
+		error ("packet offset/size incorrect: p:%zd,%zd\n",
+			   packet->offset, packet->length);
+	}
+	if (stage->head != 1024 || stage->tail != 0 || stage->end != 1024) {
+		error ("stage head or tail not as expected: h: %zd t:%zd\n",
+			   stage->head, stage->tail);
+	}
+	QFV_PacketSubmit (packet);
+
+	packet = QFV_PacketAcquire (stage);
+	data = QFV_PacketExtend (packet, 512);
+	if (!data) {
+		error ("512 byte extend failed\n");
+	}
+	if (packet->offset != 0 || packet->length != 512) {
+		error ("packet offset/size incorrect: p:%zd,%zd\n",
+			   packet->offset, packet->length);
+	}
+	QFV_PacketSubmit (packet);
+
+	if (stage->head != 512 || stage->tail != 0 || stage->end != 1024) {
+		error ("stage head or tail not as expected: h: %zd t:%zd\n",
+			   stage->head, stage->tail);
+	}
+
+	packet = QFV_PacketAcquire (stage);
+	data = QFV_PacketExtend (packet, 256);
+	if (!data) {
+		error ("256 byte extend failed\n");
+	}
+	if (packet->offset != 512 || packet->length != 256) {
+		error ("packet offset/size incorrect: p:%zd,%zd\n",
+			   packet->offset, packet->length);
+	}
+	if (stage->head != 768 || stage->tail != 512 || stage->end != 1024) {
+		error ("stage head or tail not as expected: h: %zd t:%zd\n",
+			   stage->head, stage->tail);
+	}
+	// don't submit yet. Normally, it would be an error, but the test harness
+	// needs to keep the packet on hand for the following tests to work
+	packet2 = QFV_PacketAcquire (stage);
+	old_head = stage->head;
+	old_tail = stage->tail;
+	data = QFV_PacketExtend (packet2, 768);
+	if (data) {
+		error ("768 byte extend did not return null\n");
+	}
+	if (stage->head != old_head || stage->tail != old_tail) {
+		error ("768 byte extend moved head or tail\n");
+	}
+
+	//should wrap
+	data = QFV_PacketExtend (packet2, 512);
+	if (!data) {
+		error ("512 byte extend failed\n");
+	}
+	if (packet2->offset != 0 || packet2->length != 512) {
+		error ("packet offset/size incorrect: p:%zd,%zd\n",
+			   packet2->offset, packet2->length);
+	}
+	if (stage->head != 512 || stage->tail != 512 || stage->end != 768) {
+		error ("stage head or tail not as expected: h: %zd t:%zd\n",
+			   stage->head, stage->tail);
+	}
+
+	//submit the first packet
+	QFV_PacketSubmit (packet);
+
+	packet = QFV_PacketAcquire (stage);
+	old_head = stage->head;
+	old_tail = stage->tail;
+	data = QFV_PacketExtend (packet, 768);
+	if (data) {
+		error ("768 byte extend did not return null\n");
+	}
+	if (stage->head != old_head || stage->tail != old_tail) {
+		error ("768 byte extend moved head or tail\n");
+	}
+	return 0;
+}
diff --git a/libs/video/renderer/vulkan/texture.c b/libs/video/renderer/vulkan/texture.c
index 12fba3932..f23e1297a 100644
--- a/libs/video/renderer/vulkan/texture.c
+++ b/libs/video/renderer/vulkan/texture.c
@@ -65,6 +65,7 @@ struct scrap_s {
 	VkDeviceMemory memory;
 	VkImageView view;
 	size_t      bpp;
+	qfv_packet_t *packet;
 	vrect_t    *batch;
 	vrect_t   **batch_tail;
 	vrect_t    *batch_free;
@@ -119,6 +120,7 @@ QFV_CreateScrap (qfv_device_t *device, int size, QFVFormat format)
 	scrap->bpp = bpp;
 	scrap->subpics = 0;
 	scrap->device = device;
+	scrap->packet = 0;
 	scrap->batch = 0;
 	scrap->batch_tail = &scrap->batch;
 	scrap->batch_free = 0;
@@ -215,9 +217,21 @@ QFV_SubpicBatch (subpic_t *subpic, qfv_stagebuf_t *stage)
 	byte       *dest;
 	size_t      size;
 
-	size = subpic->width * subpic->height * scrap->bpp;
-	if (!(dest = QFV_ClaimStagingBuffer (stage, size))) {
-		return 0;
+	if (!scrap->packet) {
+		scrap->packet = QFV_PacketAcquire (stage);
+	}
+	size = (subpic->width * subpic->height * scrap->bpp + 3) & ~3;
+	if (!(dest = QFV_PacketExtend (scrap->packet, size))) {
+		if (scrap->packet->length) {
+			QFV_ScrapFlush (scrap);
+
+			scrap->packet = QFV_PacketAcquire (stage);
+			dest = QFV_PacketExtend (scrap->packet, size);
+		}
+		if (!dest) {
+			printf ("could not get space for update\n");
+			return 0;
+		}
 	}
 
 	if (scrap->batch_free) {
@@ -238,7 +252,7 @@ QFV_SubpicBatch (subpic_t *subpic, qfv_stagebuf_t *stage)
 }
 
 void
-QFV_ScrapFlush (scrap_t *scrap, qfv_stagebuf_t *stage, VkCommandBuffer cmd)
+QFV_ScrapFlush (scrap_t *scrap)
 {
 	qfv_device_t *device = scrap->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
@@ -247,6 +261,8 @@ QFV_ScrapFlush (scrap_t *scrap, qfv_stagebuf_t *stage, VkCommandBuffer cmd)
 		return;
 	}
 
+	qfv_packet_t *packet = scrap->packet;
+	qfv_stagebuf_t *stage = packet->stage;
 	size_t      i;
 	__auto_type copy = QFV_AllocBufferImageCopy (128, alloca);
 	memset (copy->a, 0, 128 * sizeof (copy->a[0]));
@@ -257,7 +273,6 @@ QFV_ScrapFlush (scrap_t *scrap, qfv_stagebuf_t *stage, VkCommandBuffer cmd)
 		copy->a[i].imageExtent.depth = 1;
 	}
 
-	QFV_FlushStagingBuffer (stage, 0, stage->offset);
 
 	VkImageMemoryBarrier barrier;
 	qfv_pipelinestagepair_t stages;
@@ -265,10 +280,11 @@ QFV_ScrapFlush (scrap_t *scrap, qfv_stagebuf_t *stage, VkCommandBuffer cmd)
 	stages = imageLayoutTransitionStages[qfv_LT_Undefined_to_TransferDst];
 	barrier = imageLayoutTransitionBarriers[qfv_LT_Undefined_to_TransferDst];
 	barrier.image = scrap->image;
-	dfunc->vkCmdPipelineBarrier (cmd, stages.src, stages.dst, 0, 0, 0, 0, 0,
+	dfunc->vkCmdPipelineBarrier (packet->cmd, stages.src, stages.dst,
+								 0, 0, 0, 0, 0,
 								 1, &barrier);
 
-	size_t      offset = 0, size;
+	size_t      offset = packet->offset, size;
 	vrect_t    *batch = scrap->batch;
 	while (scrap->batch_count) {
 		for (i = 0; i < scrap->batch_count && i < 128; i++) {
@@ -283,7 +299,7 @@ QFV_ScrapFlush (scrap_t *scrap, qfv_stagebuf_t *stage, VkCommandBuffer cmd)
 			offset += (size + 3) & ~3;
 			batch = batch->next;
 		}
-		dfunc->vkCmdCopyBufferToImage (cmd, stage->buffer, scrap->image,
+		dfunc->vkCmdCopyBufferToImage (packet->cmd, stage->buffer, scrap->image,
 									   VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
 									   i, copy->a);
 		scrap->batch_count -= i;
@@ -292,12 +308,15 @@ QFV_ScrapFlush (scrap_t *scrap, qfv_stagebuf_t *stage, VkCommandBuffer cmd)
 	stages = imageLayoutTransitionStages[qfv_LT_TransferDst_to_ShaderReadOnly];
 	barrier=imageLayoutTransitionBarriers[qfv_LT_TransferDst_to_ShaderReadOnly];
 	barrier.image = scrap->image;
-	dfunc->vkCmdPipelineBarrier (cmd, stages.src, stages.dst, 0, 0, 0, 0, 0,
+	dfunc->vkCmdPipelineBarrier (packet->cmd, stages.src, stages.dst,
+								 0, 0, 0, 0, 0,
 								 1, &barrier);
 
 	*scrap->batch_tail = scrap->batch_free;
 	scrap->batch_free = scrap->batch;
 	scrap->batch = 0;
 	scrap->batch_tail = &scrap->batch;
-	stage->offset = 0;
+
+	QFV_PacketSubmit (scrap->packet);
+	scrap->packet = 0;
 }
diff --git a/libs/video/renderer/vulkan/vulkan_draw.c b/libs/video/renderer/vulkan/vulkan_draw.c
index 61b85d3e1..24202a8c3 100644
--- a/libs/video/renderer/vulkan/vulkan_draw.c
+++ b/libs/video/renderer/vulkan/vulkan_draw.c
@@ -158,29 +158,7 @@ destroy_quad_buffers (vulkan_ctx_t *ctx)
 static void
 flush_draw_scrap (vulkan_ctx_t *ctx)
 {
-	qfv_device_t *device = ctx->device;
-	qfv_devfuncs_t *dfunc = device->funcs;
-	VkCommandBuffer cmd = ctx->cmdbuffer;
-
-	dfunc->vkWaitForFences (device->dev, 1, &ctx->fence, VK_TRUE, ~0ull);
-	dfunc->vkResetCommandBuffer (cmd, 0);
-	VkCommandBufferBeginInfo beginInfo = {
-		VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, 0,
-		VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT, 0,
-	};
-	dfunc->vkBeginCommandBuffer (cmd, &beginInfo);
-	QFV_ScrapFlush (draw_scrap, draw_stage, cmd);
-	dfunc->vkEndCommandBuffer (cmd);
-
-	VkSubmitInfo submitInfo = {
-		VK_STRUCTURE_TYPE_SUBMIT_INFO, 0,
-		0, 0, 0,
-		1, &cmd,
-		0, 0,
-	};
-	dfunc->vkResetFences (device->dev, 1, &ctx->fence);
-	dfunc->vkQueueSubmit (device->queue.queue, 1, &submitInfo, ctx->fence);
-	dfunc->vkWaitForFences (device->dev, 1, &ctx->fence, VK_TRUE, ~0ull);//FIXME
+	QFV_ScrapFlush (draw_scrap);
 }
 
 static void
@@ -326,7 +304,8 @@ Vulkan_Draw_Init (vulkan_ctx_t *ctx)
 
 	create_quad_buffers (ctx);
 	draw_scrap = QFV_CreateScrap (device, 2048, QFV_RGBA);
-	draw_stage = QFV_CreateStagingBuffer (device, 4 * 1024 * 1024);
+	draw_stage = QFV_CreateStagingBuffer (device, 4 * 1024 * 1024, 4,
+										  ctx->cmdpool);
 	conchars_sampler = QFV_GetSampler (ctx, "quakepic");
 
 	qpic_t     *charspic = Draw_Font8x8Pic ();
@@ -604,9 +583,8 @@ Vulkan_DrawReset (vulkan_ctx_t *ctx)
 void
 Vulkan_FlushText (vulkan_ctx_t *ctx)
 {
-	if (draw_stage->offset) {
-		flush_draw_scrap (ctx);
-	}
+	flush_draw_scrap (ctx);
+
 	qfv_device_t *device = ctx->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
 	__auto_type frame = &ctx->framebuffers.a[ctx->curFrame];
diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c
index 16e60e5c1..02b9a0c07 100644
--- a/libs/video/renderer/vulkan/vulkan_vid_common.c
+++ b/libs/video/renderer/vulkan/vulkan_vid_common.c
@@ -203,8 +203,10 @@ Vulkan_CreateDevice (vulkan_ctx_t *ctx)
 void
 Vulkan_CreateStagingBuffers (vulkan_ctx_t *ctx)
 {
-	ctx->staging[0] = QFV_CreateStagingBuffer (ctx->device, 1024*1024);
-	ctx->staging[1] = QFV_CreateStagingBuffer (ctx->device, 1024*1024);
+	ctx->staging[0] = QFV_CreateStagingBuffer (ctx->device, 1024*1024, 1,
+											   ctx->cmdpool);
+	ctx->staging[1] = QFV_CreateStagingBuffer (ctx->device, 1024*1024, 1,
+											   ctx->cmdpool);
 }
 
 void

From 904a91c0b759757e0d388464afa1d8cfd743e691 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 16 Jan 2021 14:37:16 +0900
Subject: [PATCH 1310/1519] [vulkan] Use only one global staging buffer

I think I did two as a bit of a ring buffer, but the new ring buffer
system used inside a staging buffer makes it less necessary. Also, the
staging buffer is now a fair bit bigger (4M is probably not really
enough)
---
 include/vid_vulkan.h                           | 2 +-
 libs/video/renderer/vulkan/vulkan_vid_common.c | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/include/vid_vulkan.h b/include/vid_vulkan.h
index 784c74312..223412999 100644
--- a/include/vid_vulkan.h
+++ b/include/vid_vulkan.h
@@ -68,7 +68,7 @@ typedef struct vulkan_ctx_s {
 	VkCommandBuffer cmdbuffer;
 	VkFence     fence;			// for ctx->cmdbuffer only
 	vulkan_renderpass_t renderpass;
-	struct qfv_stagebuf_s *staging[2];
+	struct qfv_stagebuf_s *staging;
 	VkPipeline  pipeline;
 	size_t      curFrame;
 	vulkan_framebufferset_t framebuffers;
diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c
index 02b9a0c07..a40e38c52 100644
--- a/libs/video/renderer/vulkan/vulkan_vid_common.c
+++ b/libs/video/renderer/vulkan/vulkan_vid_common.c
@@ -174,8 +174,7 @@ Vulkan_Shutdown_Common (vulkan_ctx_t *ctx)
 	if (ctx->swapchain) {
 		QFV_DestroySwapchain (ctx->swapchain);
 	}
-	QFV_DestroyStagingBuffer (ctx->staging[0]);
-	QFV_DestroyStagingBuffer (ctx->staging[1]);
+	QFV_DestroyStagingBuffer (ctx->staging);
 	Vulkan_DestroyMatrices (ctx);
 	ctx->instance->funcs->vkDestroySurfaceKHR (ctx->instance->instance,
 											   ctx->surface, 0);
@@ -203,10 +202,8 @@ Vulkan_CreateDevice (vulkan_ctx_t *ctx)
 void
 Vulkan_CreateStagingBuffers (vulkan_ctx_t *ctx)
 {
-	ctx->staging[0] = QFV_CreateStagingBuffer (ctx->device, 1024*1024, 1,
-											   ctx->cmdpool);
-	ctx->staging[1] = QFV_CreateStagingBuffer (ctx->device, 1024*1024, 1,
-											   ctx->cmdpool);
+	ctx->staging = QFV_CreateStagingBuffer (ctx->device, 4*1024*1024, 1,
+											ctx->cmdpool);
 }
 
 void

From 5186d3ae49cb60ec8f8268ccc67d80455eeadce2 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 16 Jan 2021 14:42:25 +0900
Subject: [PATCH 1311/1519] [vulkan] Rework draw to use a context struct

Cleans up global space and makes it usable in multiple contexts. Also,
max quads dropped to 32k as each frame now has its own vertex buffer to
avoid issues with vertex overwrites (which I have seen). However, all
vertex buffers are in the one memory/buffer object (using offsets) and
the index buffer has been moved into a device-local memory object.
---
 include/vid_vulkan.h                     |   4 +-
 libs/video/renderer/vulkan/vulkan_draw.c | 282 ++++++++++++++---------
 2 files changed, 178 insertions(+), 108 deletions(-)

diff --git a/include/vid_vulkan.h b/include/vid_vulkan.h
index 223412999..c8d318a99 100644
--- a/include/vid_vulkan.h
+++ b/include/vid_vulkan.h
@@ -22,8 +22,6 @@ typedef struct vulkan_framebuffer_s {
 	VkCommandBuffer cmdBuffer;
 
 	struct qfv_cmdbufferset_s *subCommand;
-
-	VkDescriptorSet twodDescriptors;
 } vulkan_framebuffer_t;
 
 typedef struct vulkan_matrices_s {
@@ -64,6 +62,8 @@ typedef struct vulkan_ctx_s {
 	struct hashtab_s *descriptorPools;
 	struct hashtab_s *samplers;
 
+	struct drawctx_s *draw_context;
+
 	VkCommandPool cmdpool;
 	VkCommandBuffer cmdbuffer;
 	VkFence     fence;			// for ctx->cmdbuffer only
diff --git a/libs/video/renderer/vulkan/vulkan_draw.c b/libs/video/renderer/vulkan/vulkan_draw.c
index 24202a8c3..43068ae52 100644
--- a/libs/video/renderer/vulkan/vulkan_draw.c
+++ b/libs/video/renderer/vulkan/vulkan_draw.c
@@ -78,57 +78,89 @@ typedef struct cachepic_s {
 	qpic_t     *pic;
 } cachepic_t;
 
-#define MAX_QUADS (65536)
+typedef struct drawframe_s {
+	size_t      vert_offset;
+	drawvert_t *verts;
+	uint32_t    num_quads;
+	VkCommandBuffer cmd;
+	VkDescriptorSet descriptors;
+} drawframe_t;
+
+typedef struct drawframeset_s
+	DARRAY_TYPE (drawframe_t) drawframeset_t;
+
+typedef struct drawctx_s {
+	VkSampler   sampler;
+	scrap_t    *scrap;
+	qfv_stagebuf_t *stage;
+	qpic_t     *conchars;
+	qpic_t     *conback;
+	qpic_t     *white_pic;
+	hashtab_t  *pic_cache;
+	VkBuffer    vert_buffer;
+	VkDeviceMemory vert_memory;
+	VkBuffer    ind_buffer;
+	VkDeviceMemory ind_memory;
+	VkPipeline  pipeline;
+	VkPipelineLayout layout;
+	drawframeset_t frames;
+} drawctx_t;
+
+// enough for a full screen of 8x8 chars at 1920x1080 plus some extras (368)
+#define MAX_QUADS (32768)
 #define VERTS_PER_QUAD (4)
 #define INDS_PER_QUAD (5)	// one per vert plus primitive reset
 
-//FIXME move into a context struct
-VkSampler       conchars_sampler;
-scrap_t        *draw_scrap;
-qfv_stagebuf_t *draw_stage;
-qpic_t         *conchars;
-qpic_t         *white_pic;
-static hashtab_t *pic_cache;
-
-VkBuffer        quad_vert_buffer;
-VkBuffer        quad_ind_buffer;
-VkDeviceMemory  quad_memory;
-drawvert_t     *quad_verts;
-uint32_t       *quad_inds;
-uint32_t        num_quads;
-
-VkPipeline		twod_pipeline;
-VkPipelineLayout twod_layout;
-size_t          draw_cmdBuffer;
-
 static void
 create_quad_buffers (vulkan_ctx_t *ctx)
 {
 	qfv_device_t *device = ctx->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
 
-	//FIXME quad_inds can be a completely separate buffer that is
-	//pre-initialized to draw 2-tri triangle strips as the actual indices will
-	//never change
-	size_t      vert_size = MAX_QUADS * VERTS_PER_QUAD * sizeof (drawvert_t);
-	size_t      ind_size = MAX_QUADS * INDS_PER_QUAD * sizeof (uint32_t);
+	drawctx_t  *dctx = ctx->draw_context;
+
+	size_t      vert_size;
+	size_t      ind_size;
+	size_t      frames = ctx->framebuffers.size;
+	VkBuffer    vbuf, ibuf;
+	VkDeviceMemory vmem, imem;
+
+	vert_size = frames * MAX_QUADS * VERTS_PER_QUAD * sizeof (drawvert_t);
+	ind_size = MAX_QUADS * INDS_PER_QUAD * sizeof (uint32_t);
+
+	vbuf = QFV_CreateBuffer (device, vert_size,
+							 VK_BUFFER_USAGE_VERTEX_BUFFER_BIT);
+	ibuf = QFV_CreateBuffer (device, ind_size,
+							 VK_BUFFER_USAGE_INDEX_BUFFER_BIT);
+	vmem = QFV_AllocBufferMemory (device, vbuf,
+								  VK_MEMORY_PROPERTY_HOST_CACHED_BIT,
+								  vert_size, 0);
+	imem = QFV_AllocBufferMemory (device, ibuf,
+								  VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT,
+								  ind_size, 0);
+	QFV_BindBufferMemory (device, vbuf, vmem, 0);
+	QFV_BindBufferMemory (device, ibuf, imem, 0);
+
+	dctx->vert_buffer = vbuf;
+	dctx->vert_memory = vmem;
+	dctx->ind_buffer = ibuf;
+	dctx->ind_memory = imem;
 
-	quad_vert_buffer = QFV_CreateBuffer (device, vert_size,
-										 VK_BUFFER_USAGE_VERTEX_BUFFER_BIT);
-	quad_ind_buffer = QFV_CreateBuffer (device, ind_size,
-										VK_BUFFER_USAGE_INDEX_BUFFER_BIT);
-	quad_memory = QFV_AllocBufferMemory (device, quad_vert_buffer,
-										 VK_MEMORY_PROPERTY_HOST_CACHED_BIT,
-										 vert_size + ind_size, 0);
-	QFV_BindBufferMemory (device, quad_vert_buffer, quad_memory, 0);
-	QFV_BindBufferMemory (device, quad_ind_buffer, quad_memory, vert_size);
 	void       *data;
-	dfunc->vkMapMemory (device->dev, quad_memory, 0, vert_size + ind_size,
-						0, &data);
-	quad_verts = data;
-	quad_inds = (uint32_t *) (quad_verts + MAX_QUADS * VERTS_PER_QUAD);
-	// pre-initialize quad_inds as the indices will never change
-	uint32_t   *ind = quad_inds;
+	dfunc->vkMapMemory (device->dev, vmem, 0, vert_size, 0, &data);
+	drawvert_t *vert_data = data;
+
+	for (size_t f = 0; f < frames; f++) {
+		drawframe_t *frame = &dctx->frames.a[f];
+		size_t       ind = f * MAX_QUADS * VERTS_PER_QUAD;
+		frame->vert_offset = ind * sizeof (drawvert_t);
+		frame->verts = vert_data + ind;
+		frame->num_quads = 0;
+	}
+
+	// The indices will never change so pre-generate and stash them
+	qfv_packet_t *packet = QFV_PacketAcquire (ctx->staging);
+	uint32_t   *ind = QFV_PacketExtend (packet, ind_size);
 	for (int i = 0; i < MAX_QUADS; i++) {
 		for (int j = 0; j < VERTS_PER_QUAD; j++) {
 			*ind++ = i * VERTS_PER_QUAD + j;
@@ -136,11 +168,10 @@ create_quad_buffers (vulkan_ctx_t *ctx)
 		// mark end of primitive
 		*ind++ = -1;
 	}
-	VkMappedMemoryRange range = {
-		VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE, 0,
-		quad_memory, vert_size, ind_size,
-	};
-	dfunc->vkFlushMappedMemoryRanges (device->dev, 1, &range);
+	VkBufferCopy copy_region = { packet->offset, 0, ind_size };
+	dfunc->vkCmdCopyBuffer (packet->cmd, ctx->staging->buffer, ibuf,
+							1, &copy_region);
+	QFV_PacketSubmit (packet);
 }
 
 static void
@@ -148,17 +179,19 @@ destroy_quad_buffers (vulkan_ctx_t *ctx)
 {
 	qfv_device_t *device = ctx->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
+	drawctx_t  *dctx = ctx->draw_context;
 
-	dfunc->vkUnmapMemory (device->dev, quad_memory);
-	dfunc->vkFreeMemory (device->dev, quad_memory, 0);
-	dfunc->vkDestroyBuffer (device->dev, quad_vert_buffer, 0);
-	dfunc->vkDestroyBuffer (device->dev, quad_ind_buffer, 0);
+	dfunc->vkUnmapMemory (device->dev, dctx->vert_memory);
+	dfunc->vkFreeMemory (device->dev, dctx->vert_memory, 0);
+	dfunc->vkFreeMemory (device->dev, dctx->ind_memory, 0);
+	dfunc->vkDestroyBuffer (device->dev, dctx->vert_buffer, 0);
+	dfunc->vkDestroyBuffer (device->dev, dctx->ind_buffer, 0);
 }
 
 static void
 flush_draw_scrap (vulkan_ctx_t *ctx)
 {
-	QFV_ScrapFlush (draw_scrap);
+	QFV_ScrapFlush (ctx->draw_context->scrap);
 }
 
 static void
@@ -197,7 +230,7 @@ cachepic_getkey (const void *_cp, void *unused)
 }
 
 static qpic_t *
-pic_data (const char *name, int w, int h, const byte *data, vulkan_ctx_t *ctx)
+pic_data (const char *name, int w, int h, const byte *data, drawctx_t *dctx)
 {
 	qpic_t     *pic;
 	subpic_t   *subpic;
@@ -207,10 +240,10 @@ pic_data (const char *name, int w, int h, const byte *data, vulkan_ctx_t *ctx)
 	pic->width = w;
 	pic->height = h;
 
-	subpic = QFV_ScrapSubpic (draw_scrap, w, h);
+	subpic = QFV_ScrapSubpic (dctx->scrap, w, h);
 	*(subpic_t **) pic->data = subpic;
 
-	picdata = QFV_SubpicBatch (subpic, draw_stage);
+	picdata = QFV_SubpicBatch (subpic, dctx->stage);
 	size_t size = w * h;
 	for (size_t i = 0; i < size; i++) {
 		byte        pix = *data++;
@@ -227,7 +260,7 @@ qpic_t *
 Vulkan_Draw_MakePic (int width, int height, const byte *data,
 					 vulkan_ctx_t *ctx)
 {
-	return pic_data (0, width, height, data, ctx);
+	return pic_data (0, width, height, data, ctx->draw_context);
 }
 
 void
@@ -243,7 +276,7 @@ Vulkan_Draw_PicFromWad (const char *name, vulkan_ctx_t *ctx)
 	if (!wadpic) {
 		return 0;
 	}
-	return pic_data (name, wadpic->width, wadpic->height, wadpic->data, ctx);
+	return pic_data (name, wadpic->width, wadpic->height, wadpic->data, ctx->draw_context);
 }
 
 qpic_t *
@@ -252,8 +285,9 @@ Vulkan_Draw_CachePic (const char *path, qboolean alpha, vulkan_ctx_t *ctx)
 	qpic_t     *p;
 	qpic_t     *pic;
 	cachepic_t *cpic;
+	drawctx_t  *dctx = ctx->draw_context;
 
-	if ((cpic = Hash_Find (pic_cache, path))) {
+	if ((cpic = Hash_Find (dctx->pic_cache, path))) {
 		return cpic->pic;
 	}
 	if (strlen (path) < 4 || strcmp (path + strlen (path) - 4, ".lmp")
@@ -261,17 +295,18 @@ Vulkan_Draw_CachePic (const char *path, qboolean alpha, vulkan_ctx_t *ctx)
 		return 0;
 	}
 
-	pic = pic_data (path, p->width, p->height, p->data, ctx);
+	pic = pic_data (path, p->width, p->height, p->data, dctx);
 	free (p);
 	cpic = new_cachepic (path, pic);
-	Hash_Add (pic_cache, cpic);
+	Hash_Add (dctx->pic_cache, cpic);
 	return pic;
 }
 
 void
 Vulkan_Draw_UncachePic (const char *path, vulkan_ctx_t *ctx)
 {
-	Hash_Free (pic_cache, Hash_Del (pic_cache, path));
+	drawctx_t  *dctx = ctx->draw_context;
+	Hash_Free (dctx->pic_cache, Hash_Del (dctx->pic_cache, path));
 }
 
 void
@@ -285,12 +320,13 @@ Vulkan_Draw_Shutdown (vulkan_ctx_t *ctx)
 {
 	qfv_device_t *device = ctx->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
+	drawctx_t  *dctx = ctx->draw_context;
 
 	destroy_quad_buffers (ctx);
 
-	dfunc->vkDestroyPipeline (device->dev, twod_pipeline, 0);
-	QFV_DestroyScrap (draw_scrap);
-	QFV_DestroyStagingBuffer (draw_stage);
+	dfunc->vkDestroyPipeline (device->dev, dctx->pipeline, 0);
+	QFV_DestroyScrap (dctx->scrap);
+	QFV_DestroyStagingBuffer (dctx->stage);
 }
 
 void
@@ -299,26 +335,35 @@ Vulkan_Draw_Init (vulkan_ctx_t *ctx)
 	qfv_device_t *device = ctx->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
 
-	//FIXME move into struct
-	pic_cache = Hash_NewTable (127, cachepic_getkey, cachepic_free, 0, 0);
+	drawctx_t  *dctx = calloc (1, sizeof (drawctx_t));
+	ctx->draw_context = dctx;
+
+	size_t      frames = ctx->framebuffers.size;
+	DARRAY_INIT (&dctx->frames, frames);
+	DARRAY_RESIZE (&dctx->frames, frames);
+	dctx->frames.grow = 0;
+
+	dctx->pic_cache = Hash_NewTable (127, cachepic_getkey, cachepic_free,
+										 0, 0);
 
 	create_quad_buffers (ctx);
-	draw_scrap = QFV_CreateScrap (device, 2048, QFV_RGBA);
-	draw_stage = QFV_CreateStagingBuffer (device, 4 * 1024 * 1024, 4,
-										  ctx->cmdpool);
-	conchars_sampler = QFV_GetSampler (ctx, "quakepic");
+	dctx->scrap = QFV_CreateScrap (device, 2048, QFV_RGBA);
+	dctx->stage = QFV_CreateStagingBuffer (device, 4 * 1024 * 1024, 4,
+											   ctx->cmdpool);
+	dctx->sampler = QFV_GetSampler (ctx, "quakepic");
 
 	qpic_t     *charspic = Draw_Font8x8Pic ();
 
-	conchars = pic_data (0, charspic->width, charspic->height, charspic->data, ctx);
+	dctx->conchars = pic_data ("conchars", charspic->width, charspic->height,
+							   charspic->data, dctx);
 	byte white_block = 0xfe;
-	white_pic = pic_data (0, 1, 1, &white_block, ctx);
+	dctx->white_pic = pic_data ("white", 1, 1, &white_block, dctx);
 
 	flush_draw_scrap (ctx);
 
-	twod_pipeline = Vulkan_CreatePipeline (ctx, "twod");
+	dctx->pipeline = Vulkan_CreatePipeline (ctx, "twod");
 
-	twod_layout = QFV_GetPipelineLayout (ctx, "twod");
+	dctx->layout = QFV_GetPipelineLayout (ctx, "twod");
 
 	__auto_type layouts = QFV_AllocDescriptorSetLayoutSet (ctx->framebuffers.size, alloca);
 	for (size_t i = 0; i < layouts->size; i++) {
@@ -330,32 +375,32 @@ Vulkan_Draw_Init (vulkan_ctx_t *ctx)
 		ctx->matrices.buffer_2d, 0, VK_WHOLE_SIZE
 	};
 	VkDescriptorImageInfo imageInfo = {
-		conchars_sampler,
-		QFV_ScrapImageView (draw_scrap),
+		dctx->sampler,
+		QFV_ScrapImageView (dctx->scrap),
 		VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL,
 	};
-	size_t      frames = ctx->framebuffers.size;
 	__auto_type cmdBuffers = QFV_AllocCommandBufferSet (frames, alloca);
 	QFV_AllocateCommandBuffers (device, ctx->cmdpool, 1, cmdBuffers);
 
 	__auto_type sets = QFV_AllocateDescriptorSet (device, pool, layouts);
 	for (size_t i = 0; i < frames; i++) {
-		__auto_type frame = &ctx->framebuffers.a[i];
-		frame->twodDescriptors = sets->a[i];
+		__auto_type cframe = &ctx->framebuffers.a[i];
+		__auto_type dframe = &dctx->frames.a[i];
+		dframe->descriptors = sets->a[i];
 
 		VkWriteDescriptorSet write[] = {
 			{ VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, 0,
-			  frame->twodDescriptors, 0, 0, 1,
+			  dframe->descriptors, 0, 0, 1,
 			  VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER,
 			  0, &bufferInfo, 0 },
 			{ VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, 0,
-			  frame->twodDescriptors, 1, 0, 1,
+			  dframe->descriptors, 1, 0, 1,
 			  VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER,
 			  &imageInfo, 0, 0 },
 		};
 		dfunc->vkUpdateDescriptorSets (device->dev, 2, write, 0, 0);
-		draw_cmdBuffer = frame->subCommand->size;
-		DARRAY_APPEND (frame->subCommand, cmdBuffers->a[i]);
+		dframe->cmd = cmdBuffers->a[i];
+		DARRAY_APPEND (cframe->subCommand, cmdBuffers->a[i]);
 	}
 	free (sets);
 }
@@ -363,14 +408,14 @@ Vulkan_Draw_Init (vulkan_ctx_t *ctx)
 static inline void
 draw_pic (float x, float y, int w, int h, qpic_t *pic,
 		  int srcx, int srcy, int srcw, int srch,
-		  float *color)
+		  float *color, drawframe_t *frame)
 {
-	if (num_quads + VERTS_PER_QUAD > MAX_QUADS) {
+	if (frame->num_quads + VERTS_PER_QUAD > MAX_QUADS) {
 		return;
 	}
 
-	drawvert_t *verts = quad_verts + num_quads * VERTS_PER_QUAD;
-	num_quads += VERTS_PER_QUAD;
+	drawvert_t *verts = frame->verts + frame->num_quads * VERTS_PER_QUAD;
+	frame->num_quads += VERTS_PER_QUAD;
 
 	subpic_t   *subpic = *(subpic_t **) pic->data;
 	srcx += subpic->rect->x;
@@ -410,12 +455,15 @@ draw_pic (float x, float y, int w, int h, qpic_t *pic,
 static inline void
 queue_character (int x, int y, byte chr, vulkan_ctx_t *ctx)
 {
+	drawctx_t  *dctx = ctx->draw_context;
+	drawframe_t *frame = &dctx->frames.a[ctx->curFrame];
+
 	quat_t      color = {1, 1, 1, 1};
 	int         cx, cy;
 	cx = chr % 16;
 	cy = chr / 16;
 
-	draw_pic (x, y, 8, 8, conchars, cx * 8, cy * 8, 8, 8, color);
+	draw_pic (x, y, 8, 8, dctx->conchars, cx * 8, cy * 8, 8, 8, color, frame);
 }
 
 void
@@ -505,17 +553,23 @@ Vulkan_Draw_Crosshair (vulkan_ctx_t *ctx)
 void
 Vulkan_Draw_Pic (int x, int y, qpic_t *pic, vulkan_ctx_t *ctx)
 {
+	drawctx_t  *dctx = ctx->draw_context;
+	drawframe_t *frame = &dctx->frames.a[ctx->curFrame];
+
 	static quat_t color = { 1, 1, 1, 1};
 	draw_pic (x, y, pic->width, pic->height, pic,
-			  0, 0, pic->width, pic->height, color);
+			  0, 0, pic->width, pic->height, color, frame);
 }
 
 void
 Vulkan_Draw_Picf (float x, float y, qpic_t *pic, vulkan_ctx_t *ctx)
 {
+	drawctx_t  *dctx = ctx->draw_context;
+	drawframe_t *frame = &dctx->frames.a[ctx->curFrame];
+
 	static quat_t color = { 1, 1, 1, 1};
 	draw_pic (x, y, pic->width, pic->height, pic,
-			  0, 0, pic->width, pic->height, color);
+			  0, 0, pic->width, pic->height, color, frame);
 }
 
 void
@@ -523,8 +577,12 @@ Vulkan_Draw_SubPic (int x, int y, qpic_t *pic,
 					int srcx, int srcy, int width, int height,
 					vulkan_ctx_t *ctx)
 {
+	drawctx_t  *dctx = ctx->draw_context;
+	drawframe_t *frame = &dctx->frames.a[ctx->curFrame];
+
 	static quat_t color = { 1, 1, 1, 1};
-	draw_pic (x, y, width, height, pic, srcx, srcy, width, height, color);
+	draw_pic (x, y, width, height, pic, srcx, srcy, width, height,
+			  color, frame);
 }
 
 void
@@ -540,24 +598,31 @@ Vulkan_Draw_TileClear (int x, int y, int w, int h, vulkan_ctx_t *ctx)
 void
 Vulkan_Draw_Fill (int x, int y, int w, int h, int c, vulkan_ctx_t *ctx)
 {
+	drawctx_t  *dctx = ctx->draw_context;
+	drawframe_t *frame = &dctx->frames.a[ctx->curFrame];
+
 	quat_t      color;
 
 	VectorScale (vid.palette + c * 3, 1.0f/255.0f, color);
 	color[3] = 1;
-	draw_pic (x, y, w, h, white_pic, 0, 0, 1, 1, color);
+	draw_pic (x, y, w, h, dctx->white_pic, 0, 0, 1, 1, color, frame);
 }
 
 static inline void
-draw_blendscreen (quat_t color)
+draw_blendscreen (quat_t color, vulkan_ctx_t *ctx)
 {
-	draw_pic (0, 0, vid.conwidth, vid.conheight, white_pic, 0, 0, 1, 1, color);
+	drawctx_t  *dctx = ctx->draw_context;
+	drawframe_t *frame = &dctx->frames.a[ctx->curFrame];
+
+	draw_pic (0, 0, vid.conwidth, vid.conheight, dctx->white_pic, 0, 0, 1, 1,
+			  color, frame);
 }
 
 void
 Vulkan_Draw_FadeScreen (vulkan_ctx_t *ctx)
 {
 	static quat_t color = { 0, 0, 0, 0.7 };
-	draw_blendscreen (color);
+	draw_blendscreen (color, ctx);
 }
 
 void
@@ -587,12 +652,16 @@ Vulkan_FlushText (vulkan_ctx_t *ctx)
 
 	qfv_device_t *device = ctx->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
-	__auto_type frame = &ctx->framebuffers.a[ctx->curFrame];
-	VkCommandBuffer cmd = frame->subCommand->a[draw_cmdBuffer];
+	__auto_type cframe = &ctx->framebuffers.a[ctx->curFrame];
+	drawctx_t  *dctx = ctx->draw_context;
+	drawframe_t *dframe = &dctx->frames.a[ctx->curFrame];
+
+	VkCommandBuffer cmd = dframe->cmd;
 
 	VkMappedMemoryRange range = {
 		VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE, 0,
-		quad_memory, 0, num_quads * VERTS_PER_QUAD * sizeof (drawvert_t),
+		dctx->vert_memory, dframe->vert_offset,
+		dframe->num_quads * VERTS_PER_QUAD * sizeof (drawvert_t),
 	};
 	dfunc->vkFlushMappedMemoryRanges (device->dev, 1, &range);
 
@@ -600,7 +669,7 @@ Vulkan_FlushText (vulkan_ctx_t *ctx)
 	VkCommandBufferInheritanceInfo inherit = {
 		VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_INFO, 0,
 		ctx->renderpass.renderpass, 0,
-		frame->framebuffer,
+		cframe->framebuffer,
 		0, 0, 0
 	};
 	VkCommandBufferBeginInfo beginInfo = {
@@ -611,30 +680,31 @@ Vulkan_FlushText (vulkan_ctx_t *ctx)
 	dfunc->vkBeginCommandBuffer (cmd, &beginInfo);
 
 	dfunc->vkCmdBindPipeline (cmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
-							  twod_pipeline);
+							  dctx->pipeline);
 	VkViewport viewport = {0, 0, vid.width, vid.height, 0, 1};
 	VkRect2D scissor = { {0, 0}, {vid.width, vid.height} };
 	dfunc->vkCmdSetViewport (cmd, 0, 1, &viewport);
 	dfunc->vkCmdSetScissor (cmd, 0, 1, &scissor);
-	VkDeviceSize offsets[] = {0};
-	dfunc->vkCmdBindVertexBuffers (cmd, 0, 1, &quad_vert_buffer, offsets);
-	dfunc->vkCmdBindIndexBuffer (cmd, quad_ind_buffer, 0,
+	VkDeviceSize offsets[] = {dframe->vert_offset};
+	dfunc->vkCmdBindVertexBuffers (cmd, 0, 1, &dctx->vert_buffer, offsets);
+	dfunc->vkCmdBindIndexBuffer (cmd, dctx->ind_buffer, 0,
 								 VK_INDEX_TYPE_UINT32);
-	VkDescriptorSet set = frame->twodDescriptors;
-	VkPipelineLayout layout = twod_layout;
+	VkDescriptorSet set = dframe->descriptors;
+	VkPipelineLayout layout = dctx->layout;
 	dfunc->vkCmdBindDescriptorSets (cmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
 									layout, 0, 1, &set, 0, 0);
-	dfunc->vkCmdDrawIndexed (cmd, num_quads * INDS_PER_QUAD, 1, 0, 0, 0);
+	dfunc->vkCmdDrawIndexed (cmd, dframe->num_quads * INDS_PER_QUAD,
+							 1, 0, 0, 0);
 
 	dfunc->vkEndCommandBuffer (cmd);
 
-	num_quads = 0;
+	dframe->num_quads = 0;
 }
 
 void
 Vulkan_Draw_BlendScreen (quat_t color, vulkan_ctx_t *ctx)
 {
 	if (color[3]) {
-		draw_blendscreen (color);
+		draw_blendscreen (color, ctx);
 	}
 }

From 0150fc0487c93a26a901d2cce6cdfac36ba09002 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 16 Jan 2021 15:09:39 +0900
Subject: [PATCH 1312/1519] [vulkan] Use pipeline barriers for index buffer

And set the usage correctly.
---
 libs/video/renderer/vulkan/vulkan_draw.c | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/libs/video/renderer/vulkan/vulkan_draw.c b/libs/video/renderer/vulkan/vulkan_draw.c
index 43068ae52..2b9642554 100644
--- a/libs/video/renderer/vulkan/vulkan_draw.c
+++ b/libs/video/renderer/vulkan/vulkan_draw.c
@@ -131,7 +131,8 @@ create_quad_buffers (vulkan_ctx_t *ctx)
 	vbuf = QFV_CreateBuffer (device, vert_size,
 							 VK_BUFFER_USAGE_VERTEX_BUFFER_BIT);
 	ibuf = QFV_CreateBuffer (device, ind_size,
-							 VK_BUFFER_USAGE_INDEX_BUFFER_BIT);
+							 VK_BUFFER_USAGE_INDEX_BUFFER_BIT
+							 | VK_BUFFER_USAGE_TRANSFER_DST_BIT);
 	vmem = QFV_AllocBufferMemory (device, vbuf,
 								  VK_MEMORY_PROPERTY_HOST_CACHED_BIT,
 								  vert_size, 0);
@@ -168,9 +169,28 @@ create_quad_buffers (vulkan_ctx_t *ctx)
 		// mark end of primitive
 		*ind++ = -1;
 	}
+
+	VkBufferMemoryBarrier wr_barrier = {
+		VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER, 0,
+		0, VK_ACCESS_TRANSFER_WRITE_BIT,
+		VK_QUEUE_FAMILY_IGNORED, VK_QUEUE_FAMILY_IGNORED, ibuf, 0, ind_size
+	};
+	dfunc->vkCmdPipelineBarrier (packet->cmd,
+								 VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT,
+								 VK_PIPELINE_STAGE_TRANSFER_BIT,
+								 0, 0, 0, 1, &wr_barrier, 0, 0);
 	VkBufferCopy copy_region = { packet->offset, 0, ind_size };
 	dfunc->vkCmdCopyBuffer (packet->cmd, ctx->staging->buffer, ibuf,
 							1, &copy_region);
+	VkBufferMemoryBarrier rd_barrier = {
+		VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER, 0,
+		VK_ACCESS_TRANSFER_WRITE_BIT, VK_ACCESS_INDEX_READ_BIT,
+		VK_QUEUE_FAMILY_IGNORED, VK_QUEUE_FAMILY_IGNORED, ibuf, 0, ind_size
+	};
+	dfunc->vkCmdPipelineBarrier (packet->cmd,
+								 VK_PIPELINE_STAGE_TRANSFER_BIT,
+								 VK_PIPELINE_STAGE_VERTEX_INPUT_BIT,
+								 0, 0, 0, 1, &rd_barrier, 0, 0);
 	QFV_PacketSubmit (packet);
 }
 

From fa6ff04c5ae5cc7b611abd69ffae15a62ecdd2ce Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 16 Jan 2021 15:39:16 +0900
Subject: [PATCH 1313/1519] [image] Use an enum for tex_t formats

---
 include/QF/image.h | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/include/QF/image.h b/include/QF/image.h
index 106379bb7..396547f42 100644
--- a/include/QF/image.h
+++ b/include/QF/image.h
@@ -29,23 +29,26 @@
 #ifndef __QF_image_h
 #define __QF_image_h
 
-#include "QF/quakeio.h"
+#include "QF/qtypes.h"
+
+typedef enum QFFormat {
+	tex_palette = 0,
+	tex_l = 0x1909, //GL_LUMINANCE
+	tex_a = 0x1906, //GL_ALPHA
+	tex_la = 2,
+	tex_rgb = 3,
+	tex_rgba = 4,
+} QFFormat;
 
 // could not use texture_t as that is used for models.
 typedef struct tex_s {
-	int				width;
-	int				height;
-	int				format;
-	unsigned char  *palette;					// 0 = 32 bit, otherwise 8
-	unsigned char	data[4];					// variable length
+	int         width;
+	int         height;
+	QFFormat    format;
+	byte       *palette;					// 0 = 32 bit, otherwise 8
+	byte        data[4];					// variable length
 } tex_t;
 
-#define tex_palette 0
-#define tex_l 0x1909 //GL_LUMINANCE
-#define tex_a 0x1906 //GL_ALPHA
-#define tex_la 2
-#define tex_rgb 3
-#define tex_rgba 4
 
 tex_t *LoadImage (const char *imageFile);
 

From f3695ec3dd93e446b70040a9fa44b4d03c28ca67 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 16 Jan 2021 15:39:36 +0900
Subject: [PATCH 1314/1519] [vulkan] Use the previously existing tex_t formats

I'd forgotten we had these (though direct GL_* was used).
---
 include/QF/Vulkan/texture.h              |  9 ++-------
 libs/video/renderer/vulkan/texture.c     | 13 ++++++++-----
 libs/video/renderer/vulkan/vulkan_draw.c |  2 +-
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/include/QF/Vulkan/texture.h b/include/QF/Vulkan/texture.h
index e24fa0eb1..39f5b07f2 100644
--- a/include/QF/Vulkan/texture.h
+++ b/include/QF/Vulkan/texture.h
@@ -1,17 +1,12 @@
 #ifndef __QF_Vulkan_texture_h
 #define __QF_Vulkan_texture_h
 
-typedef enum {
-	QFV_LUMINANCE,
-	QFV_LUMINANCE_ALPHA,
-	QFV_RGB,
-	QFV_RGBA,
-} QFVFormat;
+#include "QF/image.h"
 
 typedef struct scrap_s scrap_t;
 
 scrap_t *QFV_CreateScrap (struct qfv_device_s *device, int size,
-						  QFVFormat format);
+						  QFFormat format);
 void QFV_ScrapClear (scrap_t *scrap);
 void QFV_DestroyScrap (scrap_t *scrap);
 VkImageView QFV_ScrapImageView (scrap_t *scrap) __attribute__((pure));
diff --git a/libs/video/renderer/vulkan/texture.c b/libs/video/renderer/vulkan/texture.c
index f23e1297a..b4eacf0e6 100644
--- a/libs/video/renderer/vulkan/texture.c
+++ b/libs/video/renderer/vulkan/texture.c
@@ -42,6 +42,7 @@
 #include "QF/cvar.h"
 #include "QF/dstring.h"
 #include "QF/hash.h"
+#include "QF/image.h"
 #include "QF/qfplist.h"
 #include "QF/quakefs.h"
 #include "QF/render.h"
@@ -75,25 +76,27 @@ struct scrap_s {
 };
 
 scrap_t *
-QFV_CreateScrap (qfv_device_t *device, int size, QFVFormat format)
+QFV_CreateScrap (qfv_device_t *device, int size, QFFormat format)
 {
 	int         bpp = 0;
 	VkFormat    fmt = VK_FORMAT_UNDEFINED;
 
 	switch (format) {
-		case QFV_LUMINANCE:
+		case tex_l:
+		case tex_a:
+		case tex_palette:
 			bpp = 1;
 			fmt = VK_FORMAT_R8_UNORM;
 			break;
-		case QFV_LUMINANCE_ALPHA:
+		case tex_la:
 			bpp = 2;
 			fmt = VK_FORMAT_R8G8_UNORM;
 			break;
-		case QFV_RGB:
+		case tex_rgb:
 			bpp = 3;
 			fmt = VK_FORMAT_R8G8B8_UNORM;
 			break;
-		case QFV_RGBA:
+		case tex_rgba:
 			bpp = 4;
 			fmt = VK_FORMAT_R8G8B8A8_UNORM;
 			break;
diff --git a/libs/video/renderer/vulkan/vulkan_draw.c b/libs/video/renderer/vulkan/vulkan_draw.c
index 2b9642554..e94f971f0 100644
--- a/libs/video/renderer/vulkan/vulkan_draw.c
+++ b/libs/video/renderer/vulkan/vulkan_draw.c
@@ -367,7 +367,7 @@ Vulkan_Draw_Init (vulkan_ctx_t *ctx)
 										 0, 0);
 
 	create_quad_buffers (ctx);
-	dctx->scrap = QFV_CreateScrap (device, 2048, QFV_RGBA);
+	dctx->scrap = QFV_CreateScrap (device, 2048, tex_rgba);
 	dctx->stage = QFV_CreateStagingBuffer (device, 4 * 1024 * 1024, 4,
 											   ctx->cmdpool);
 	dctx->sampler = QFV_GetSampler (ctx, "quakepic");

From 7282d2addea795de15a81b5d762e39735cd4a219 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 16 Jan 2021 20:27:48 +0900
Subject: [PATCH 1315/1519] [vulkan] Make renderpass dependencies more explicit

Doesn't seem to adversely affect anything and is more correct from what
I can tell reading some other documentation.
---
 libs/video/renderer/vulkan/qfpipeline.plist | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/libs/video/renderer/vulkan/qfpipeline.plist b/libs/video/renderer/vulkan/qfpipeline.plist
index 385713c80..2f3ef7445 100644
--- a/libs/video/renderer/vulkan/qfpipeline.plist
+++ b/libs/video/renderer/vulkan/qfpipeline.plist
@@ -254,12 +254,21 @@
 			{
 				srcSubpass = VK_SUBPASS_EXTERNAL;
 				dstSubpass = 0;
-				srcStageMask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
+				srcStageMask = VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT;
 				dstStageMask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
-				srcAccessMask = 0;
-				dstAccessMask = "VK_ACCESS_COLOR_ATTACHMENT_READ_BIT | VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT";
-				dependencyFlags = 0;
-			}
+				srcAccessMask = VK_ACCESS_MEMORY_READ_BIT;
+				dstAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT;
+				dependencyFlags = VK_DEPENDENCY_BY_REGION_BIT;
+			},
+			{
+				srcSubpass = 0;
+				dstSubpass = VK_SUBPASS_EXTERNAL;
+				srcStageMask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
+				dstStageMask = VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT;
+				srcAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT;
+				dstAccessMask = VK_ACCESS_MEMORY_READ_BIT;
+				dependencyFlags = VK_DEPENDENCY_BY_REGION_BIT;
+			},
 		);
 	};
 }

From fd8521da76d2d32dcef064297747c3da8b9f78c8 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 16 Jan 2021 21:03:36 +0900
Subject: [PATCH 1316/1519] [vulkan] Make frame-buffer count available to

It turns out I made a bit of a mistake in tying the frame-buffer count
to the number of swapchain images. This is the first step in sorting
that out.
---
 libs/video/renderer/vulkan/vkparse.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/libs/video/renderer/vulkan/vkparse.c b/libs/video/renderer/vulkan/vkparse.c
index cd5e98502..0fc00b835 100644
--- a/libs/video/renderer/vulkan/vkparse.c
+++ b/libs/video/renderer/vulkan/vkparse.c
@@ -535,6 +535,21 @@ exprtype_t qfv_swapchain_t_type = {
 	&qfv_swapchain_t_symtab,
 };
 
+static exprsym_t vulkan_framebufferset_t_symbols[] = {
+	{"size", &cexpr_size_t, (void *)field_offset (vulkan_framebufferset_t, size)},
+	{ }
+};
+static exprtab_t vulkan_framebufferset_t_symtab = {
+	vulkan_framebufferset_t_symbols,
+};
+exprtype_t vulkan_framebufferset_t_type = {
+	"framebufferset",
+	sizeof (vulkan_framebufferset_t *),
+	cexpr_struct_binops,
+	0,
+	&vulkan_framebufferset_t_symtab,
+};
+
 typedef struct qfv_renderpass_s {
 	qfv_attachmentdescription_t *attachments;
 	qfv_subpassparametersset_t *subpasses;
@@ -588,6 +603,7 @@ QFV_ParseResources (vulkan_ctx_t *ctx, plitem_t *pipelinedef)
 	plitem_t   *messages = PL_NewArray ();
 	exprsym_t   var_syms[] = {
 		{"swapchain", &qfv_swapchain_t_type, ctx->swapchain},
+		{"framebuffers", &vulkan_framebufferset_t_type, &ctx->framebuffers},
 		{"msaaSamples", &VkSampleCountFlagBits_type, &ctx->msaaSamples},
 		{}
 	};
@@ -645,6 +661,7 @@ QFV_InitParse (vulkan_ctx_t *ctx)
 	context.hashlinks = &ctx->hashlinks;
 	vkgen_init_symtabs (&context);
 	cexpr_init_symtab (&qfv_swapchain_t_symtab, &context);
+	cexpr_init_symtab (&vulkan_framebufferset_t_symtab, &context);
 	cexpr_init_symtab (&imageset_symtab, &context);
 }
 
@@ -663,6 +680,7 @@ QFV_ParseRenderPass (vulkan_ctx_t *ctx, plitem_t *plist)
 	VkRenderPass renderpass;
 	exprsym_t   var_syms[] = {
 		{"swapchain", &qfv_swapchain_t_type, ctx->swapchain},
+		{"framebuffers", &vulkan_framebufferset_t_type, &ctx->framebuffers},
 		{"msaaSamples", &VkSampleCountFlagBits_type, &ctx->msaaSamples},
 		{}
 	};

From 8078e10ea18e3326a5fb79f5f79086cd794d9fcd Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 16 Jan 2021 21:24:42 +0900
Subject: [PATCH 1317/1519] [vulkan] Make frame-buffers independent of
 swapchain

This is more correct as the environment (X11 etc) might provide more
swapchain images than we want: 3 frames in flight is generally
considered a good balance between saturating the hardware and latency.
---
 libs/video/renderer/vid_render_vulkan.c       | 19 +++++++++++++++++--
 libs/video/renderer/vulkan/qfpipeline.plist   |  6 +++---
 .../video/renderer/vulkan/vulkan_vid_common.c | 14 ++------------
 3 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/libs/video/renderer/vid_render_vulkan.c b/libs/video/renderer/vid_render_vulkan.c
index f68e8c182..646a3b740 100644
--- a/libs/video/renderer/vid_render_vulkan.c
+++ b/libs/video/renderer/vid_render_vulkan.c
@@ -45,6 +45,7 @@
 #include "QF/Vulkan/device.h"
 #include "QF/Vulkan/image.h"
 #include "QF/Vulkan/instance.h"
+#include "QF/Vulkan/renderpass.h"
 #include "QF/Vulkan/swapchain.h"
 
 #include "mod_internal.h"
@@ -62,8 +63,8 @@ vulkan_R_Init (void)
 	Vulkan_CreateStagingBuffers (vulkan_ctx);
 	Vulkan_CreateMatrices (vulkan_ctx);
 	Vulkan_CreateSwapchain (vulkan_ctx);
-	Vulkan_CreateRenderPass (vulkan_ctx);
 	Vulkan_CreateFramebuffers (vulkan_ctx);
+	Vulkan_CreateRenderPass (vulkan_ctx);
 	// FIXME this should be staged so screen updates can begin while pipelines
 	// are being built
 	vulkan_ctx->pipeline = Vulkan_CreatePipeline (vulkan_ctx, "pipeline");
@@ -100,13 +101,27 @@ vulkan_R_RenderFrame (SCR_Func scr_3dfunc, SCR_Func *scr_funcs)
 		= &vulkan_ctx->framebuffers.a[vulkan_ctx->curFrame];
 
 	dfunc->vkWaitForFences (dev, 1, &framebuffer->fence, VK_TRUE, 2000000000);
+	if (framebuffer->framebuffer) {
+		dfunc->vkDestroyFramebuffer (dev, framebuffer->framebuffer, 0);
+	}
 	QFV_AcquireNextImage (vulkan_ctx->swapchain,
 						  framebuffer->imageAvailableSemaphore,
 						  0, &imageIndex);
 
+	__auto_type attachments = DARRAY_ALLOCFIXED (qfv_imageviewset_t, 3,
+												 alloca);
+	qfv_swapchain_t *sc = vulkan_ctx->swapchain;
+	attachments->a[0] = vulkan_ctx->renderpass.colorImage->view;
+	attachments->a[1] = vulkan_ctx->renderpass.depthImage->view;
+	attachments->a[2] = sc->imageViews->a[imageIndex];
+
+	VkRenderPass renderpass = vulkan_ctx->renderpass.renderpass;
+	framebuffer->framebuffer = QFV_CreateFramebuffer (device, renderpass,
+													  attachments,
+													  sc->extent, 1);
+
 	Vulkan_FlushText (vulkan_ctx);
 
-	qfv_swapchain_t *sc = vulkan_ctx->swapchain;
 	VkCommandBufferBeginInfo beginInfo
 		= { VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO };
 	VkClearValue clearValues[2] = {
diff --git a/libs/video/renderer/vulkan/qfpipeline.plist b/libs/video/renderer/vulkan/qfpipeline.plist
index 2f3ef7445..4bc6017e9 100644
--- a/libs/video/renderer/vulkan/qfpipeline.plist
+++ b/libs/video/renderer/vulkan/qfpipeline.plist
@@ -32,15 +32,15 @@
 	descriptorPools = {
 		twod = {
 			flags = 0;
-			maxSets = $swapchain.images.size;
+			maxSets = $framebuffers.size;
 			bindings = (
 				{
 					type = uniform_buffer;
-					descriptorCount = $swapchain.images.size;
+					descriptorCount = $framebuffers.size;
 				},
 				{
 					type = combined_image_sampler;
-					descriptorCount = $swapchain.images.size;
+					descriptorCount = $framebuffers.size;
 				},
 			);
 		};
diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c
index a40e38c52..3d317f52c 100644
--- a/libs/video/renderer/vulkan/vulkan_vid_common.c
+++ b/libs/video/renderer/vulkan/vulkan_vid_common.c
@@ -387,30 +387,20 @@ Vulkan_CreateFramebuffers (vulkan_ctx_t *ctx)
 {
 	qfv_device_t *device = ctx->device;
 	VkCommandPool cmdpool = ctx->cmdpool;
-	qfv_swapchain_t *sc = ctx->swapchain;
-	VkRenderPass renderpass = ctx->renderpass.renderpass;
 
 	if (!ctx->framebuffers.grow) {
 		DARRAY_INIT (&ctx->framebuffers, 4);
 	}
 
-	DARRAY_RESIZE (&ctx->framebuffers, sc->numImages);
-
-	__auto_type attachments = DARRAY_ALLOCFIXED (qfv_imageviewset_t, 3,
-												 alloca);
-	attachments->a[0] = ctx->renderpass.colorImage->view;
-	attachments->a[1] = ctx->renderpass.depthImage->view;
+	DARRAY_RESIZE (&ctx->framebuffers, 3);//FIXME cvar
 
 	__auto_type cmdBuffers = QFV_AllocCommandBufferSet (ctx->framebuffers.size,
 														alloca);
 	QFV_AllocateCommandBuffers (device, cmdpool, 0, cmdBuffers);
 
 	for (size_t i = 0; i < ctx->framebuffers.size; i++) {
-		attachments->a[2] = sc->imageViews->a[i];
 		__auto_type frame = &ctx->framebuffers.a[i];
-		frame->framebuffer = QFV_CreateFramebuffer (device, renderpass,
-												    attachments,
-												    sc->extent, 1);
+		frame->framebuffer = 0;
 		frame->fence = QFV_CreateFence (device, 1);
 		frame->imageAvailableSemaphore = QFV_CreateSemaphore (device);
 		frame->renderDoneSemaphore = QFV_CreateSemaphore (device);

From debaffcb97f8bd968bb716b531d791faf87517e4 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 17 Jan 2021 22:26:48 +0900
Subject: [PATCH 1318/1519] [vulkan] Retain handle_keys item

Ugh, need to come up with valgrind for ruamoko :P
---
 libs/video/renderer/vulkan/vkgen/vkgen.r | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/video/renderer/vulkan/vkgen/vkgen.r b/libs/video/renderer/vulkan/vkgen/vkgen.r
index 01637c54a..a336a861c 100644
--- a/libs/video/renderer/vulkan/vkgen/vkgen.r
+++ b/libs/video/renderer/vulkan/vkgen/vkgen.r
@@ -204,7 +204,7 @@ main(int argc, string *argv)
 		}
 	}
 
-	PLItem *handle_keys = [handles allKeys];
+	PLItem *handle_keys = [[handles allKeys] retain];
 	for (int i = [handle_keys count]; i-- > 0; ) {
 		string search_name = [[handle_keys getObjectAtIndex:i] string];
 		id obj = (id) Hash_Find (available_types, search_name);

From 1e163fd2d73beca39f3729a95dcef51c3dab13e7 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 18 Jan 2021 02:08:55 +0900
Subject: [PATCH 1319/1519] [vulkan] Correct QFV_CreateImage samples type

Not sure why I though FlagBits was correct instead of Flags.
---
 include/QF/Vulkan/image.h          | 2 +-
 libs/video/renderer/vulkan/image.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/QF/Vulkan/image.h b/include/QF/Vulkan/image.h
index edb5e025e..501a5025e 100644
--- a/include/QF/Vulkan/image.h
+++ b/include/QF/Vulkan/image.h
@@ -36,7 +36,7 @@ VkImage QFV_CreateImage (struct qfv_device_s *device, int cubemap,
 						 VkExtent3D size,
 						 uint32_t num_mipmaps,
 						 uint32_t num_layers,
-						 VkSampleCountFlagBits samples,
+						 VkSampleCountFlags samples,
 						 VkImageUsageFlags usage_scenarios);
 
 VkDeviceMemory QFV_AllocImageMemory (struct qfv_device_s *device,
diff --git a/libs/video/renderer/vulkan/image.c b/libs/video/renderer/vulkan/image.c
index 68decb94a..bd71cc162 100644
--- a/libs/video/renderer/vulkan/image.c
+++ b/libs/video/renderer/vulkan/image.c
@@ -68,7 +68,7 @@ QFV_CreateImage (qfv_device_t *device, int cubemap,
 				 VkExtent3D size,
 				 uint32_t num_mipmaps,
 				 uint32_t num_layers,
-				 VkSampleCountFlagBits samples,
+				 VkSampleCountFlags samples,
 				 VkImageUsageFlags usage_scenarios)
 {
 	VkDevice    dev = device->dev;

From aa7ff9d6188b579c5169380c6b9afcf1d686eb25 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 18 Jan 2021 02:10:10 +0900
Subject: [PATCH 1320/1519] [vulkan] Implement console background drawing

That went better than expected after deciding to put the conback in the
scrap.
---
 libs/video/renderer/vulkan/vulkan_draw.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/libs/video/renderer/vulkan/vulkan_draw.c b/libs/video/renderer/vulkan/vulkan_draw.c
index e94f971f0..7aadd6692 100644
--- a/libs/video/renderer/vulkan/vulkan_draw.c
+++ b/libs/video/renderer/vulkan/vulkan_draw.c
@@ -608,6 +608,15 @@ Vulkan_Draw_SubPic (int x, int y, qpic_t *pic,
 void
 Vulkan_Draw_ConsoleBackground (int lines, byte alpha, vulkan_ctx_t *ctx)
 {
+	drawctx_t  *dctx = ctx->draw_context;
+	drawframe_t *frame = &dctx->frames.a[ctx->curFrame];
+
+	quat_t      color = { 1, 1, 1, bound (0, alpha, 255) / 255.0};
+	qpic_t     *cpic;
+	cpic = Vulkan_Draw_CachePic ("gfx/conback.lmp", false, ctx);
+	int         ofs = max (0, cpic->height - lines);
+	draw_pic (0, 0, vid.conwidth, lines, cpic,
+			  0, ofs, cpic->width, lines, color, frame);
 }
 
 void

From abd3b900044ba9863978a524a355e8223908fa35 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 18 Jan 2021 02:10:56 +0900
Subject: [PATCH 1321/1519] [vulkan] Implement basic quake texture loading

It optionally generates mipmaps, and supports the main texture types
(especially for texture packs), including palettes, but is otherwise
rather unsophisticated code. Needs a lot of work, but testing first.
---
 include/QF/Vulkan/funclist.h                |   1 +
 include/QF/Vulkan/qf_texture.h              |  13 +
 libs/video/renderer/Makemodule.am           |   1 +
 libs/video/renderer/vulkan/vulkan_texture.c | 249 ++++++++++++++++++++
 4 files changed, 264 insertions(+)
 create mode 100644 include/QF/Vulkan/qf_texture.h
 create mode 100644 libs/video/renderer/vulkan/vulkan_texture.c

diff --git a/include/QF/Vulkan/funclist.h b/include/QF/Vulkan/funclist.h
index 63c5bde29..209ee0561 100644
--- a/include/QF/Vulkan/funclist.h
+++ b/include/QF/Vulkan/funclist.h
@@ -162,6 +162,7 @@ DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdPipelineBarrier)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdCopyBuffer)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdCopyBufferToImage)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdCopyImageToBuffer)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdBlitImage)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdBeginRenderPass)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdNextSubpass)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdEndRenderPass)
diff --git a/include/QF/Vulkan/qf_texture.h b/include/QF/Vulkan/qf_texture.h
new file mode 100644
index 000000000..a1750682d
--- /dev/null
+++ b/include/QF/Vulkan/qf_texture.h
@@ -0,0 +1,13 @@
+#ifndef __QF_Vulkan_qf_texture_h
+#define __QF_Vulkan_qf_texture_h
+
+#include "QF/image.h"
+
+typedef struct qfv_tex_s qfv_tex_t;
+struct vulkan_ctx_s;
+
+qfv_tex_t *Vulkan_LoadTex (struct vulkan_ctx_s *ctx, tex_t *tex, int mip);
+VkImageView Vulkan_TexImageView (qfv_tex_t *tex) __attribute__((pure));
+void Vulkan_UnloadTex (struct vulkan_ctx_s *ctx, qfv_tex_t *tex);
+
+#endif//__QF_Vulkan_qf_texture_h
diff --git a/libs/video/renderer/Makemodule.am b/libs/video/renderer/Makemodule.am
index 7a323f118..d44139a22 100644
--- a/libs/video/renderer/Makemodule.am
+++ b/libs/video/renderer/Makemodule.am
@@ -237,6 +237,7 @@ libs_video_renderer_vid_render_vulkan_la_SOURCES = \
 	libs/video/renderer/vulkan/vkparse.c \
 	libs/video/renderer/vulkan/vulkan_draw.c \
 	libs/video/renderer/vulkan/vulkan_matrices.c \
+	libs/video/renderer/vulkan/vulkan_texture.c \
 	libs/video/renderer/vulkan/vulkan_vid_common.c
 
 libs/video/renderer/vulkan/vkparse.lo: libs/video/renderer/vulkan/vkparse.c $(vkparse_src)
diff --git a/libs/video/renderer/vulkan/vulkan_texture.c b/libs/video/renderer/vulkan/vulkan_texture.c
new file mode 100644
index 000000000..0b2c2e102
--- /dev/null
+++ b/libs/video/renderer/vulkan/vulkan_texture.c
@@ -0,0 +1,249 @@
+/*
+	vulkan_texuture.c
+
+	Quake specific Vulkan texuture manager
+
+	Copyright (C) 2021      Bill Currie <bill@taniwha.org>
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifdef HAVE_MATH_H
+# include <math.h>
+#endif
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+
+#include "QF/alloc.h"
+#include "QF/cvar.h"
+#include "QF/dstring.h"
+#include "QF/hash.h"
+#include "QF/image.h"
+#include "QF/mathlib.h"
+#include "QF/qfplist.h"
+#include "QF/quakefs.h"
+#include "QF/render.h"
+#include "QF/sys.h"
+#include "QF/Vulkan/qf_vid.h"
+#include "QF/Vulkan/qf_texture.h"
+#include "QF/Vulkan/barrier.h"
+#include "QF/Vulkan/buffer.h"
+#include "QF/Vulkan/command.h"
+#include "QF/Vulkan/device.h"
+#include "QF/Vulkan/image.h"
+#include "QF/Vulkan/instance.h"
+#include "QF/Vulkan/staging.h"
+#include "QF/Vulkan/texture.h"
+
+#include "r_scrap.h"
+#include "vid_vulkan.h"
+
+struct qfv_tex_s {	// qfv_tex_t
+	VkDeviceMemory memory;
+	size_t      offset;
+	VkImage     image;
+	VkImageView view;
+};
+
+static int
+ilog2 (unsigned x)
+{
+	if (x > 0x7fffffff) {
+		// avoid overflow
+		return 31;
+	}
+	x--;
+	x |= x >> 1;
+	x |= x >> 2;
+	x |= x >> 4;
+	x |= x >> 8;
+	x |= x >> 16;
+	x++;
+	int y = 0;
+	y |= ((x & 0xffff0000) != 0) << 4;
+	y |= ((x & 0xff00ff00) != 0) << 3;
+	y |= ((x & 0xf0f0f0f0) != 0) << 2;
+	y |= ((x & 0xcccccccc) != 0) << 1;
+	y |= ((x & 0xaaaaaaaa) != 0) << 0;
+	return y;
+}
+
+qfv_tex_t *
+Vulkan_LoadTex (vulkan_ctx_t *ctx, tex_t *tex, int mip)
+{
+	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+	int         bpp = 0;
+	VkFormat    format = VK_FORMAT_UNDEFINED;
+
+	switch (tex->format) {
+		case tex_l:
+		case tex_a:
+			format = VK_FORMAT_R8_UNORM;
+			bpp = 1;
+			break;
+		case tex_la:
+			format = VK_FORMAT_R8G8_UNORM;
+			bpp = 2;
+			break;
+		case tex_palette:
+			if (!tex->palette) {
+				return 0;
+			}
+			format = VK_FORMAT_R8G8B8_UNORM;
+			bpp = 3;
+			break;
+		case tex_rgb:
+			format = VK_FORMAT_R8G8B8_UNORM;
+			bpp = 3;
+			break;
+		case tex_rgba:
+			format = VK_FORMAT_R8G8B8A8_UNORM;
+			bpp = 4;
+			break;
+	}
+	if (format == VK_FORMAT_UNDEFINED) {
+		return 0;
+	}
+
+	if (mip) {
+		mip = ilog2 (max (tex->width, tex->height)) + 1;
+	} else {
+		mip = 1;
+	}
+
+	//qfv_devfuncs_t *dfunc = device->funcs;
+	//FIXME this whole thing is ineffiecient, especially for small textures
+	qfv_tex_t  *qtex = malloc (sizeof (qfv_tex_t));
+
+	VkExtent3D  extent = { tex->width, tex->height, 1 };
+	qtex->image = QFV_CreateImage (device, 0, VK_IMAGE_TYPE_2D, format, extent,
+								   mip, 1, VK_SAMPLE_COUNT_1_BIT,
+								   VK_IMAGE_USAGE_TRANSFER_DST_BIT
+								   | VK_IMAGE_USAGE_SAMPLED_BIT);
+	qtex->memory = QFV_AllocImageMemory (device, qtex->image,
+										 VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT,
+										 0, 0);
+	QFV_BindImageMemory (device, qtex->image, qtex->memory, 0);
+
+	size_t      bytes = bpp * tex->width * tex->height;
+	qfv_packet_t *packet = QFV_PacketAcquire (ctx->staging);
+	byte       *tex_data = QFV_PacketExtend (packet, bytes);
+
+	if (tex->format == tex_palette) {
+		byte       *data = tex->data;
+		for (size_t count = tex->width * tex->height; count-- > 0; ) {
+			byte        pix = *data++;
+			byte       *col = tex->palette + pix;
+			*tex_data++ = *col++;
+			*tex_data++ = *col++;
+			*tex_data++ = *col++;
+		}
+	} else {
+		memcpy (tex_data, tex->data, bytes);
+	}
+
+	VkImageMemoryBarrier barrier;
+	qfv_pipelinestagepair_t stages;
+
+	stages = imageLayoutTransitionStages[qfv_LT_Undefined_to_TransferDst];
+	barrier = imageLayoutTransitionBarriers[qfv_LT_Undefined_to_TransferDst];
+	barrier.image = qtex->image;
+	dfunc->vkCmdPipelineBarrier (packet->cmd, stages.src, stages.dst,
+								 0, 0, 0, 0, 0,
+								 1, &barrier);
+	VkBufferImageCopy copy = {
+		packet->offset, 0, 0,
+		{VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1},
+		{0, 0, 0}, {tex->width, tex->height, 1},
+	};
+	dfunc->vkCmdCopyBufferToImage (packet->cmd, packet->stage->buffer,
+								   qtex->image,
+								   VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
+								   1, &copy);
+	barrier.subresourceRange.baseMipLevel = 0;
+	stages.src = VK_PIPELINE_STAGE_TRANSFER_BIT;
+	stages.dst = VK_PIPELINE_STAGE_TRANSFER_BIT;
+	VkImageBlit blit = {
+		{VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1},
+		{{0, 0, 0}, {tex->width, tex->height, 1}},
+		{VK_IMAGE_ASPECT_COLOR_BIT, 1, 0, 1},
+		{{0, 0, 0}, {(tex->width + 1) >> 1, (tex->height + 1) >> 1, 1}},
+	};
+	while (--mip > 0) {
+		barrier.oldLayout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL;
+		barrier.newLayout = VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL;
+		barrier.srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT;
+		barrier.dstAccessMask = VK_ACCESS_TRANSFER_READ_BIT;
+
+		dfunc->vkCmdPipelineBarrier (packet->cmd, stages.src, stages.dst, 0,
+									 0, 0, 0, 0,
+									 1, &barrier);
+
+		dfunc->vkCmdBlitImage (packet->cmd,
+							 qtex->image, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
+							 qtex->image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
+							 1, &blit, VK_FILTER_LINEAR);
+
+		barrier.oldLayout = VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL;
+		barrier.newLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
+		barrier.srcAccessMask = VK_ACCESS_TRANSFER_READ_BIT;
+		barrier.dstAccessMask = VK_ACCESS_SHADER_READ_BIT;
+
+		dfunc->vkCmdPipelineBarrier (packet->cmd, stages.src, stages.dst, 0,
+									 0, 0, 0, 0,
+									 1, &barrier);
+
+		blit.srcSubresource.mipLevel++;
+		blit.srcOffsets[1].x = blit.dstOffsets[1].x;
+		blit.srcOffsets[1].y = blit.dstOffsets[1].y;
+		blit.dstSubresource.mipLevel++;
+		blit.dstOffsets[1].x = (blit.dstOffsets[1].x + 1) >> 1;
+		blit.dstOffsets[1].y = (blit.dstOffsets[1].y + 1) >> 1;
+		barrier.subresourceRange.baseMipLevel++;
+	}
+	QFV_PacketSubmit (packet);
+	return 0;
+}
+
+VkImageView
+Vulkan_TexImageView (qfv_tex_t *tex)
+{
+	return tex->view;
+}
+
+void
+Vulkan_UnloadTex (vulkan_ctx_t *ctx, qfv_tex_t *tex)
+{
+	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	dfunc->vkDestroyImageView (device->dev, tex->view, 0);
+	dfunc->vkDestroyImage (device->dev, tex->image, 0);
+	dfunc->vkFreeMemory (device->dev, tex->memory, 0);
+	free (tex);
+}

From dacda501300b0b72a1b3a2a3d719916ba9b88384 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 18 Jan 2021 12:46:06 +0900
Subject: [PATCH 1322/1519] [renderer] Stub out all the vulkan functions

nq-x11 now gets through all three demos without crashing (but without
rendering anything useful, though).
---
 include/QF/Vulkan/qf_particles.h              |  15 +
 include/r_dynamic.h                           |   6 -
 include/r_internal.h                          |   1 +
 libs/models/alias/gl_model_alias.c            |   2 +-
 libs/video/renderer/Makemodule.am             |   1 +
 libs/video/renderer/gl/gl_dyn_part.c          |  42 +--
 libs/video/renderer/glsl/glsl_particles.c     |  42 +--
 libs/video/renderer/r_efrag.c                 |   2 +-
 libs/video/renderer/sw/sw_rpart.c             |  92 +++---
 libs/video/renderer/sw32/sw32_rpart.c         |  94 +++---
 libs/video/renderer/vid_render_vulkan.c       | 201 +++++++++++--
 libs/video/renderer/vulkan/vulkan_particles.c | 268 ++++++++++++++++++
 12 files changed, 596 insertions(+), 170 deletions(-)
 create mode 100644 include/QF/Vulkan/qf_particles.h
 create mode 100644 libs/video/renderer/vulkan/vulkan_particles.c

diff --git a/include/QF/Vulkan/qf_particles.h b/include/QF/Vulkan/qf_particles.h
new file mode 100644
index 000000000..3ac71ac71
--- /dev/null
+++ b/include/QF/Vulkan/qf_particles.h
@@ -0,0 +1,15 @@
+#ifndef __QF_Vulkan_qf_particles_h
+#define __QF_Vulkan_qf_particles_h
+
+#include "QF/image.h"
+
+struct cvar_s;
+struct vulkan_ctx_s;;
+
+void Vulkan_R_ClearParticles (struct vulkan_ctx_s *ctx);
+void Vulkan_R_InitParticles (struct vulkan_ctx_s *ctx);
+void Vulkan_r_easter_eggs_f (struct cvar_s *var, struct vulkan_ctx_s *ctx);
+void Vulkan_r_particles_style_f (struct cvar_s *var, struct vulkan_ctx_s *ctx);
+void Vulkan_Particles_Init (struct vulkan_ctx_s *ctx);
+
+#endif//__QF_Vulkan_qf_particles_h
diff --git a/include/r_dynamic.h b/include/r_dynamic.h
index 1dd54fc11..8968cfa1c 100644
--- a/include/r_dynamic.h
+++ b/include/r_dynamic.h
@@ -49,12 +49,6 @@ void R_PushDlights (const vec3_t entorigin);
 struct cvar_s;
 void R_MaxDlightsCheck (struct cvar_s *var);
 void R_Particles_Init_Cvars (void);
-void R_Particle_New (ptype_t type, int texnum, const vec3_t org, float scale,
-					 const vec3_t vel, float die, int color, float alpha,
-					 float ramp);
-void R_Particle_NewRandom (ptype_t type, int texnum, const vec3_t org,
-						   int org_fuzz, float scale, int vel_fuzz, float die,
-						   int color, float alpha, float ramp);
 void R_InitBubble (void);
 
 void R_InitParticles (void);
diff --git a/include/r_internal.h b/include/r_internal.h
index de11978fa..b38f1706c 100644
--- a/include/r_internal.h
+++ b/include/r_internal.h
@@ -16,6 +16,7 @@ extern vid_render_funcs_t gl_vid_render_funcs;
 extern vid_render_funcs_t glsl_vid_render_funcs;
 extern vid_render_funcs_t sw_vid_render_funcs;
 extern vid_render_funcs_t sw32_vid_render_funcs;
+extern vid_render_funcs_t vulkan_vid_render_funcs;
 extern vid_render_funcs_t *vid_render_funcs;
 
 #define vr_data vid_render_data
diff --git a/libs/models/alias/gl_model_alias.c b/libs/models/alias/gl_model_alias.c
index 63618451e..5d09f93b7 100644
--- a/libs/models/alias/gl_model_alias.c
+++ b/libs/models/alias/gl_model_alias.c
@@ -53,7 +53,7 @@
 #include "compat.h"
 
 void *
-gl_Mod_LoadSkin (byte * skin, int skinsize, int snum, int gnum, qboolean group,
+gl_Mod_LoadSkin (byte *skin, int skinsize, int snum, int gnum, qboolean group,
 				 maliasskindesc_t *skindesc)
 {
 	byte   *pskin;
diff --git a/libs/video/renderer/Makemodule.am b/libs/video/renderer/Makemodule.am
index d44139a22..b58aaf3af 100644
--- a/libs/video/renderer/Makemodule.am
+++ b/libs/video/renderer/Makemodule.am
@@ -237,6 +237,7 @@ libs_video_renderer_vid_render_vulkan_la_SOURCES = \
 	libs/video/renderer/vulkan/vkparse.c \
 	libs/video/renderer/vulkan/vulkan_draw.c \
 	libs/video/renderer/vulkan/vulkan_matrices.c \
+	libs/video/renderer/vulkan/vulkan_particles.c \
 	libs/video/renderer/vulkan/vulkan_texture.c \
 	libs/video/renderer/vulkan/vulkan_vid_common.c
 
diff --git a/libs/video/renderer/gl/gl_dyn_part.c b/libs/video/renderer/gl/gl_dyn_part.c
index 5b7f1a63a..0572efec0 100644
--- a/libs/video/renderer/gl/gl_dyn_part.c
+++ b/libs/video/renderer/gl/gl_dyn_part.c
@@ -1591,6 +1591,27 @@ gl_R_DrawParticles (void)
 	qfglDepthMask (GL_TRUE);
 }
 
+static void
+gl_R_Particle_New (ptype_t type, int texnum, const vec3_t org, float scale,
+				   const vec3_t vel, float die, int color, float alpha,
+				   float ramp)
+{
+	if (numparticles >= r_maxparticles)
+		return;
+	particle_new (type, texnum, org, scale, vel, die, color, alpha, ramp);
+}
+
+static void
+gl_R_Particle_NewRandom (ptype_t type, int texnum, const vec3_t org,
+						 int org_fuzz, float scale, int vel_fuzz, float die,
+						 int color, float alpha, float ramp)
+{
+	if (numparticles >= r_maxparticles)
+		return;
+	particle_new_random (type, texnum, org, org_fuzz, scale, vel_fuzz, die,
+						 color, alpha, ramp);
+}
+
 static vid_particle_funcs_t particles_QF = {
 	R_RocketTrail_QF,
 	R_GrenadeTrail_QF,
@@ -1775,24 +1796,3 @@ gl_R_Particles_Init_Cvars (void)
 								  "0 for Id, 1 for QF.");
 	R_ParticleFunctionInit ();
 }
-
-void
-gl_R_Particle_New (ptype_t type, int texnum, const vec3_t org, float scale,
-				   const vec3_t vel, float die, int color, float alpha,
-				   float ramp)
-{
-	if (numparticles >= r_maxparticles)
-		return;
-	particle_new (type, texnum, org, scale, vel, die, color, alpha, ramp);
-}
-
-void
-gl_R_Particle_NewRandom (ptype_t type, int texnum, const vec3_t org,
-						 int org_fuzz, float scale, int vel_fuzz, float die,
-						 int color, float alpha, float ramp)
-{
-	if (numparticles >= r_maxparticles)
-		return;
-	particle_new_random (type, texnum, org, org_fuzz, scale, vel_fuzz, die,
-						 color, alpha, ramp);
-}
diff --git a/libs/video/renderer/glsl/glsl_particles.c b/libs/video/renderer/glsl/glsl_particles.c
index b1461f208..cb956188c 100644
--- a/libs/video/renderer/glsl/glsl_particles.c
+++ b/libs/video/renderer/glsl/glsl_particles.c
@@ -1800,6 +1800,27 @@ glsl_R_DrawParticles (void)
 	}
 }
 
+static void
+glsl_R_Particle_New (ptype_t type, int texnum, const vec3_t org, float scale,
+					 const vec3_t vel, float die, int color, float alpha,
+					 float ramp)
+{
+	if (numparticles >= r_maxparticles)
+		return;
+	particle_new (type, texnum, org, scale, vel, die, color, alpha, ramp);
+}
+
+static void
+glsl_R_Particle_NewRandom (ptype_t type, int texnum, const vec3_t org,
+						   int org_fuzz, float scale, int vel_fuzz, float die,
+						   int color, float alpha, float ramp)
+{
+	if (numparticles >= r_maxparticles)
+		return;
+	particle_new_random (type, texnum, org, org_fuzz, scale, vel_fuzz, die,
+						 color, alpha, ramp);
+}
+
 static vid_particle_funcs_t particles_QF = {
 	R_RocketTrail_QF,
 	R_GrenadeTrail_QF,
@@ -1984,24 +2005,3 @@ glsl_R_Particles_Init_Cvars (void)
 								  "0 for Id, 1 for QF.");
 	R_ParticleFunctionInit ();
 }
-
-void
-glsl_R_Particle_New (ptype_t type, int texnum, const vec3_t org, float scale,
-					 const vec3_t vel, float die, int color, float alpha,
-					 float ramp)
-{
-	if (numparticles >= r_maxparticles)
-		return;
-	particle_new (type, texnum, org, scale, vel, die, color, alpha, ramp);
-}
-
-void
-glsl_R_Particle_NewRandom (ptype_t type, int texnum, const vec3_t org,
-						   int org_fuzz, float scale, int vel_fuzz, float die,
-						   int color, float alpha, float ramp)
-{
-	if (numparticles >= r_maxparticles)
-		return;
-	particle_new_random (type, texnum, org, org_fuzz, scale, vel_fuzz, die,
-						 color, alpha, ramp);
-}
diff --git a/libs/video/renderer/r_efrag.c b/libs/video/renderer/r_efrag.c
index 870c01fc1..ae5e1fd8a 100644
--- a/libs/video/renderer/r_efrag.c
+++ b/libs/video/renderer/r_efrag.c
@@ -199,7 +199,7 @@ R_AddEfrags (entity_t *ent)
 {
 	model_t    *entmodel;
 
-	if (!ent->model)
+	if (!ent->model || !r_worldentity.model)
 		return;
 
 	if (ent == &r_worldentity)
diff --git a/libs/video/renderer/sw/sw_rpart.c b/libs/video/renderer/sw/sw_rpart.c
index 601a003c9..d7039504f 100644
--- a/libs/video/renderer/sw/sw_rpart.c
+++ b/libs/video/renderer/sw/sw_rpart.c
@@ -801,6 +801,52 @@ r_particles_style_f (cvar_t *var)
 {
 }
 
+static void
+R_Particle_New (ptype_t type, int texnum, const vec3_t org, float scale,
+			    const vec3_t vel, float die, int color, float alpha, float ramp)
+{
+	particle_t *p;
+
+	if (!free_particles)
+		return;
+	p = free_particles;
+	free_particles = p->next;
+	p->next = active_particles;
+	active_particles = p;
+
+	VectorCopy (org, p->org);
+	p->color = color;
+	p->tex = texnum;
+	p->scale = scale;
+	p->alpha = alpha;
+	VectorCopy (vel, p->vel);
+	p->type = type;
+	p->phys = R_ParticlePhysics (p->type);
+	p->die = die;
+	p->ramp = ramp;
+}
+
+static void
+R_Particle_NewRandom (ptype_t type, int texnum, const vec3_t org, int org_fuzz,
+					  float scale, int vel_fuzz, float die, int color,
+					  float alpha, float ramp)
+{
+	float       o_fuzz = org_fuzz, v_fuzz = vel_fuzz;
+	int         rnd;
+	vec3_t      porg, pvel;
+
+	rnd = mtwist_rand (&mt);
+	porg[0] = o_fuzz * ((rnd & 63) - 31.5) / 63.0 + org[0];
+	porg[1] = o_fuzz * (((rnd >> 6) & 63) - 31.5) / 63.0 + org[1];
+	porg[2] = o_fuzz * (((rnd >> 10) & 63) - 31.5) / 63.0 + org[2];
+	rnd = mtwist_rand (&mt);
+	pvel[0] = v_fuzz * ((rnd & 63) - 31.5) / 63.0;
+	pvel[1] = v_fuzz * (((rnd >> 6) & 63) - 31.5) / 63.0;
+	pvel[2] = v_fuzz * (((rnd >> 10) & 63) - 31.5) / 63.0;
+
+	R_Particle_New (type, texnum, porg, scale, pvel, die, color, alpha, ramp);
+}
+
 static vid_particle_funcs_t particles_QF = {
 	R_RocketTrail_QF,
 	R_GrenadeTrail_QF,
@@ -874,49 +920,3 @@ R_Particles_Init_Cvars (void)
 								  "0 for Id, 1 for QF.");
 	R_ParticleFunctionInit ();
 }
-
-void
-R_Particle_New (ptype_t type, int texnum, const vec3_t org, float scale,
-			    const vec3_t vel, float die, int color, float alpha, float ramp)
-{
-	particle_t *p;
-
-	if (!free_particles)
-		return;
-	p = free_particles;
-	free_particles = p->next;
-	p->next = active_particles;
-	active_particles = p;
-
-	VectorCopy (org, p->org);
-	p->color = color;
-	p->tex = texnum;
-	p->scale = scale;
-	p->alpha = alpha;
-	VectorCopy (vel, p->vel);
-	p->type = type;
-	p->phys = R_ParticlePhysics (p->type);
-	p->die = die;
-	p->ramp = ramp;
-}
-
-void
-R_Particle_NewRandom (ptype_t type, int texnum, const vec3_t org, int org_fuzz,
-					  float scale, int vel_fuzz, float die, int color,
-					  float alpha, float ramp)
-{
-	float       o_fuzz = org_fuzz, v_fuzz = vel_fuzz;
-	int         rnd;
-	vec3_t      porg, pvel;
-
-	rnd = mtwist_rand (&mt);
-	porg[0] = o_fuzz * ((rnd & 63) - 31.5) / 63.0 + org[0];
-	porg[1] = o_fuzz * (((rnd >> 6) & 63) - 31.5) / 63.0 + org[1];
-	porg[2] = o_fuzz * (((rnd >> 10) & 63) - 31.5) / 63.0 + org[2];
-	rnd = mtwist_rand (&mt);
-	pvel[0] = v_fuzz * ((rnd & 63) - 31.5) / 63.0;
-	pvel[1] = v_fuzz * (((rnd >> 6) & 63) - 31.5) / 63.0;
-	pvel[2] = v_fuzz * (((rnd >> 10) & 63) - 31.5) / 63.0;
-
-	R_Particle_New (type, texnum, porg, scale, pvel, die, color, alpha, ramp);
-}
diff --git a/libs/video/renderer/sw32/sw32_rpart.c b/libs/video/renderer/sw32/sw32_rpart.c
index 7b910005d..fe2e39601 100644
--- a/libs/video/renderer/sw32/sw32_rpart.c
+++ b/libs/video/renderer/sw32/sw32_rpart.c
@@ -814,6 +814,53 @@ sw32_r_particles_style_f (cvar_t *var)
 {
 }
 
+static void
+sw32_R_Particle_New (ptype_t type, int texnum, const vec3_t org, float scale,
+					 const vec3_t vel, float die, int color, float alpha,
+					 float ramp)
+{
+	particle_t *p;
+
+	if (!free_particles)
+		return;
+	p = free_particles;
+	free_particles = p->next;
+	p->next = active_particles;
+	active_particles = p;
+
+	VectorCopy (org, p->org);
+	p->color = color;
+	p->tex = texnum;
+	p->scale = scale;
+	p->alpha = alpha;
+	VectorCopy (vel, p->vel);
+	p->type = type;
+	p->phys = R_ParticlePhysics (p->type);
+	p->die = die;
+	p->ramp = ramp;
+}
+
+static void
+sw32_R_Particle_NewRandom (ptype_t type, int texnum, const vec3_t org,
+						   int org_fuzz, float scale, int vel_fuzz, float die,
+						   int color, float alpha, float ramp)
+{
+	float       o_fuzz = org_fuzz, v_fuzz = vel_fuzz;
+	int         rnd;
+	vec3_t      porg, pvel;
+
+	rnd = mtwist_rand (&mt);
+	porg[0] = o_fuzz * ((rnd & 63) - 31.5) / 63.0 + org[0];
+	porg[1] = o_fuzz * (((rnd >> 6) & 63) - 31.5) / 63.0 + org[1];
+	porg[2] = o_fuzz * (((rnd >> 12) & 63) - 31.5) / 63.0 + org[2];
+	rnd = mtwist_rand (&mt);
+	pvel[0] = v_fuzz * ((rnd & 63) - 31.5) / 63.0;
+	pvel[1] = v_fuzz * (((rnd >> 6) & 63) - 31.5) / 63.0;
+	pvel[2] = v_fuzz * (((rnd >> 12) & 63) - 31.5) / 63.0;
+
+	sw32_R_Particle_New (type, texnum, porg, scale, pvel, die, color, alpha, ramp);
+}
+
 static vid_particle_funcs_t particles_QF = {
 	R_RocketTrail_QF,
 	R_GrenadeTrail_QF,
@@ -887,50 +934,3 @@ sw32_R_Particles_Init_Cvars (void)
 								  "0 for Id, 1 for QF.");
 	R_ParticleFunctionInit ();
 }
-
-void
-sw32_R_Particle_New (ptype_t type, int texnum, const vec3_t org, float scale,
-					 const vec3_t vel, float die, int color, float alpha,
-					 float ramp)
-{
-	particle_t *p;
-
-	if (!free_particles)
-		return;
-	p = free_particles;
-	free_particles = p->next;
-	p->next = active_particles;
-	active_particles = p;
-
-	VectorCopy (org, p->org);
-	p->color = color;
-	p->tex = texnum;
-	p->scale = scale;
-	p->alpha = alpha;
-	VectorCopy (vel, p->vel);
-	p->type = type;
-	p->phys = R_ParticlePhysics (p->type);
-	p->die = die;
-	p->ramp = ramp;
-}
-
-void
-sw32_R_Particle_NewRandom (ptype_t type, int texnum, const vec3_t org,
-						   int org_fuzz, float scale, int vel_fuzz, float die,
-						   int color, float alpha, float ramp)
-{
-	float       o_fuzz = org_fuzz, v_fuzz = vel_fuzz;
-	int         rnd;
-	vec3_t      porg, pvel;
-
-	rnd = mtwist_rand (&mt);
-	porg[0] = o_fuzz * ((rnd & 63) - 31.5) / 63.0 + org[0];
-	porg[1] = o_fuzz * (((rnd >> 6) & 63) - 31.5) / 63.0 + org[1];
-	porg[2] = o_fuzz * (((rnd >> 12) & 63) - 31.5) / 63.0 + org[2];
-	rnd = mtwist_rand (&mt);
-	pvel[0] = v_fuzz * ((rnd & 63) - 31.5) / 63.0;
-	pvel[1] = v_fuzz * (((rnd >> 6) & 63) - 31.5) / 63.0;
-	pvel[2] = v_fuzz * (((rnd >> 12) & 63) - 31.5) / 63.0;
-
-	sw32_R_Particle_New (type, texnum, porg, scale, pvel, die, color, alpha, ramp);
-}
diff --git a/libs/video/renderer/vid_render_vulkan.c b/libs/video/renderer/vid_render_vulkan.c
index 646a3b740..80ccf0127 100644
--- a/libs/video/renderer/vid_render_vulkan.c
+++ b/libs/video/renderer/vid_render_vulkan.c
@@ -40,6 +40,7 @@
 #include "QF/plugin/vid_render.h"
 
 #include "QF/Vulkan/qf_draw.h"
+#include "QF/Vulkan/qf_particles.h"
 #include "QF/Vulkan/qf_vid.h"
 #include "QF/Vulkan/command.h"
 #include "QF/Vulkan/device.h"
@@ -57,6 +58,29 @@
 
 static vulkan_ctx_t *vulkan_ctx;
 
+static tex_t *
+vulkan_SCR_CaptureBGR (void)
+{
+	return 0;
+}
+
+static tex_t *
+vulkan_SCR_ScreenShot (int width, int height)
+{
+	return 0;
+}
+
+static void
+vulkan_Fog_Update (float density, float red, float green, float blue,
+				   float time)
+{
+}
+
+static void
+vulkan_Fog_ParseWorldspawn (struct plitem_s *worldspawn)
+{
+}
+
 static void
 vulkan_R_Init (void)
 {
@@ -69,6 +93,7 @@ vulkan_R_Init (void)
 	// are being built
 	vulkan_ctx->pipeline = Vulkan_CreatePipeline (vulkan_ctx, "pipeline");
 	Vulkan_Draw_Init (vulkan_ctx);
+	Vulkan_Particles_Init (vulkan_ctx);
 
 	Sys_Printf ("R_Init %p %d", vulkan_ctx->swapchain->swapchain,
 				vulkan_ctx->swapchain->numImages);
@@ -180,6 +205,31 @@ vulkan_R_RenderFrame (SCR_Func scr_3dfunc, SCR_Func *scr_funcs)
 	}
 }
 
+static void
+vulkan_R_ClearState (void)
+{
+}
+
+static void
+vulkan_R_LoadSkys (const char *skyname)
+{
+}
+
+static void
+vulkan_R_NewMap (model_t *worldmodel, model_t **models, int num_models)
+{
+}
+
+static void
+vulkan_R_LineGraph (int x, int y, int *h_vals, int count)
+{
+}
+
+static void
+vulkan_R_RenderView (void)
+{
+}
+
 static void
 vulkan_Draw_Character (int x, int y, unsigned ch)
 {
@@ -306,30 +356,127 @@ vulkan_R_ViewChanged (float aspect)
 	Vulkan_CalcProjectionMatrices (vulkan_ctx, aspect);
 }
 
+static void
+vulkan_R_ClearParticles (void)
+{
+	Vulkan_R_ClearParticles (vulkan_ctx);
+}
+
+static void
+vulkan_R_InitParticles (void)
+{
+	Vulkan_R_InitParticles (vulkan_ctx);
+}
+
+static void
+vulkan_SCR_ScreenShot_f (void)
+{
+}
+
+static void
+vulkan_r_easter_eggs_f (struct cvar_s *var)
+{
+	Vulkan_r_easter_eggs_f (var, vulkan_ctx);
+}
+
+static void
+vulkan_r_particles_style_f (struct cvar_s *var)
+{
+	Vulkan_r_particles_style_f (var, vulkan_ctx);
+}
+
+static void
+vulkan_Mod_LoadExternalTextures (model_t *mod)
+{
+}
+
+static void
+vulkan_Mod_LoadLighting (bsp_t *bsp)
+{
+}
+
+static void
+vulkan_Mod_SubdivideSurface (msurface_t *fa)
+{
+}
+
+static void
+vulkan_Mod_ProcessTexture (texture_t *tx)
+{
+}
+
+static void
+vulkan_Mod_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr,
+									   void *_m, int _s, int extra)
+{
+}
+
+static void *
+vulkan_Mod_LoadSkin (byte *skin, int skinsize, int snum, int gnum,
+					 qboolean group, maliasskindesc_t *skindesc)
+{
+	return skin + skinsize;
+}
+
+static void
+vulkan_Mod_FinalizeAliasModel (model_t *m, aliashdr_t *hdr)
+{
+}
+
+static void
+vulkan_Mod_LoadExternalSkins (model_t *mod)
+{
+}
+
+static void
+vulkan_Mod_IQMFinish (model_t *mod)
+{
+}
+
+static void
+vulkan_Mod_SpriteLoadTexture (mspriteframe_t *pspriteframe, int framenum)
+{
+}
+
+static void
+vulkan_Skin_SetupSkin (struct skin_s *skin, int cmap)
+{
+}
+
+static void
+vulkan_Skin_ProcessTranslation (int cmap, const byte *translation)
+{
+}
+
+static void
+vulkan_Skin_InitTranslations (void)
+{
+}
+
 static vid_model_funcs_t model_funcs = {
-	0,//vulkan_Mod_LoadExternalTextures,
-	0,//vulkan_Mod_LoadLighting,
-	0,//vulkan_Mod_SubdivideSurface,
-	0,//vulkan_Mod_ProcessTexture,
+	vulkan_Mod_LoadExternalTextures,
+	vulkan_Mod_LoadLighting,
+	vulkan_Mod_SubdivideSurface,
+	vulkan_Mod_ProcessTexture,
 
 	Mod_LoadIQM,
 	Mod_LoadAliasModel,
 	Mod_LoadSpriteModel,
 
-	0,//vulkan_Mod_MakeAliasModelDisplayLists,
-	0,//vulkan_Mod_LoadSkin,
-	0,//vulkan_Mod_FinalizeAliasModel,
-	0,//vulkan_Mod_LoadExternalSkins,
-	0,//vulkan_Mod_IQMFinish,
+	vulkan_Mod_MakeAliasModelDisplayLists,
+	vulkan_Mod_LoadSkin,
+	vulkan_Mod_FinalizeAliasModel,
+	vulkan_Mod_LoadExternalSkins,
+	vulkan_Mod_IQMFinish,
 	0,
-	0,//vulkan_Mod_SpriteLoadTexture,
+	vulkan_Mod_SpriteLoadTexture,
 
 	Skin_SetColormap,
 	Skin_SetSkin,
-	0,//vulkan_Skin_SetupSkin,
+	vulkan_Skin_SetupSkin,
 	Skin_SetTranslation,
-	0,//vulkan_Skin_ProcessTranslation,
-	0,//vulkan_Skin_InitTranslations,
+	vulkan_Skin_ProcessTranslation,
+	vulkan_Skin_InitTranslations,
 };
 
 vid_render_funcs_t vulkan_vid_render_funcs = {
@@ -357,33 +504,33 @@ vid_render_funcs_t vulkan_vid_render_funcs = {
 	SCR_DrawRam,
 	SCR_DrawTurtle,
 	SCR_DrawPause,
-	0,//vulkan_SCR_CaptureBGR,
-	0,//vulkan_SCR_ScreenShot,
+	vulkan_SCR_CaptureBGR,
+	vulkan_SCR_ScreenShot,
 	SCR_DrawStringToSnap,
 
-	0,//vulkan_Fog_Update,
-	0,//vulkan_Fog_ParseWorldspawn,
+	vulkan_Fog_Update,
+	vulkan_Fog_ParseWorldspawn,
 
 	vulkan_R_Init,
 	vulkan_R_RenderFrame,
-	0,//vulkan_R_ClearState,
-	0,//vulkan_R_LoadSkys,
-	0,//vulkan_R_NewMap,
+	vulkan_R_ClearState,
+	vulkan_R_LoadSkys,
+	vulkan_R_NewMap,
 	R_AddEfrags,
 	R_RemoveEfrags,
 	R_EnqueueEntity,
-	0,//vulkan_R_LineGraph,
+	vulkan_R_LineGraph,
 	R_AllocDlight,
 	R_AllocEntity,
 	R_MaxDlightsCheck,
-	0,//vulkan_R_RenderView,
+	vulkan_R_RenderView,
 	R_DecayLights,
 	vulkan_R_ViewChanged,
-	0,//vulkan_R_ClearParticles,
-	0,//vulkan_R_InitParticles,
-	0,//vulkan_SCR_ScreenShot_f,
-	0,//vulkan_r_easter_eggs_f,
-	0,//vulkan_r_particles_style_f,
+	vulkan_R_ClearParticles,
+	vulkan_R_InitParticles,
+	vulkan_SCR_ScreenShot_f,
+	vulkan_r_easter_eggs_f,
+	vulkan_r_particles_style_f,
 	0,
 	&model_funcs
 };
diff --git a/libs/video/renderer/vulkan/vulkan_particles.c b/libs/video/renderer/vulkan/vulkan_particles.c
new file mode 100644
index 000000000..282bfaf8a
--- /dev/null
+++ b/libs/video/renderer/vulkan/vulkan_particles.c
@@ -0,0 +1,268 @@
+/*
+	vulkan_particles.c
+
+	Quake specific Vulkan particle manager
+
+	Copyright (C) 2021      Bill Currie <bill@taniwha.org>
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifdef HAVE_MATH_H
+# include <math.h>
+#endif
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+
+#include "QF/cvar.h"
+#include "QF/render.h"
+#include "QF/plugin/vid_render.h"
+#include "QF/Vulkan/qf_vid.h"
+#include "QF/Vulkan/qf_particles.h"
+
+#include "r_internal.h"
+#include "vid_vulkan.h"
+
+void
+Vulkan_R_ClearParticles (struct vulkan_ctx_s *ctx)
+{
+}
+
+void
+Vulkan_R_InitParticles (struct vulkan_ctx_s *ctx)
+{
+}
+
+static void
+R_RocketTrail_QF (const entity_t *ent)
+{
+}
+
+static void
+R_GrenadeTrail_QF (const entity_t *ent)
+{
+}
+
+static void
+R_BloodTrail_QF (const entity_t *ent)
+{
+}
+
+static void
+R_SlightBloodTrail_QF (const entity_t *ent)
+{
+}
+
+static void
+R_WizTrail_QF (const entity_t *ent)
+{
+}
+
+static void
+R_FlameTrail_QF (const entity_t *ent)
+{
+}
+
+static void
+R_VoorTrail_QF (const entity_t *ent)
+{
+}
+
+static void
+R_GlowTrail_QF (const entity_t *ent, int glow_color)
+{
+}
+
+static void
+R_RunParticleEffect_QF (const vec3_t org, const vec3_t dir, int color,
+					    int count)
+{
+}
+
+static void
+R_BloodPuffEffect_QF (const vec3_t org, int count)
+{
+}
+
+static void
+R_GunshotEffect_QF (const vec3_t org, int count)
+{
+}
+
+static void
+R_LightningBloodEffect_QF (const vec3_t org)
+{
+}
+
+static void
+R_SpikeEffect_QF (const vec3_t org)
+{
+}
+
+static void
+R_KnightSpikeEffect_QF (const vec3_t org)
+{
+}
+
+static void
+R_SuperSpikeEffect_QF (const vec3_t org)
+{
+}
+
+static void
+R_WizSpikeEffect_QF (const vec3_t org)
+{
+}
+
+static void
+R_BlobExplosion_QF (const vec3_t org)
+{
+}
+
+static void
+R_ParticleExplosion_QF (const vec3_t org)
+{
+}
+
+static void
+R_ParticleExplosion2_QF (const vec3_t org, int colorStart, int colorLength)
+{
+}
+
+static void
+R_LavaSplash_QF (const vec3_t org)
+{
+}
+
+static void
+R_TeleportSplash_QF (const vec3_t org)
+{
+}
+
+static void
+R_DarkFieldParticles_ID (const entity_t *ent)
+{
+}
+
+static void
+R_EntityParticles_ID (const entity_t *ent)
+{
+}
+
+static void
+R_Particle_New (ptype_t type, int texnum, const vec3_t org,
+				float scale, const vec3_t vel, float die,
+				int color, float alpha, float ramp)
+{
+}
+
+static void
+R_Particle_NewRandom (ptype_t type, int texnum, const vec3_t org,
+					  int org_fuzz, float scale, int vel_fuzz,
+					  float die, int color, float alpha,
+					  float ramp)
+{
+}
+
+static vid_particle_funcs_t vulkan_particles_QF = {
+	R_RocketTrail_QF,
+	R_GrenadeTrail_QF,
+	R_BloodTrail_QF,
+	R_SlightBloodTrail_QF,
+	R_WizTrail_QF,
+	R_FlameTrail_QF,
+	R_VoorTrail_QF,
+	R_GlowTrail_QF,
+	R_RunParticleEffect_QF,
+	R_BloodPuffEffect_QF,
+	R_GunshotEffect_QF,
+	R_LightningBloodEffect_QF,
+	R_SpikeEffect_QF,
+	R_KnightSpikeEffect_QF,
+	R_SuperSpikeEffect_QF,
+	R_WizSpikeEffect_QF,
+	R_BlobExplosion_QF,
+	R_ParticleExplosion_QF,
+	R_ParticleExplosion2_QF,
+	R_LavaSplash_QF,
+	R_TeleportSplash_QF,
+	R_DarkFieldParticles_ID,
+	R_EntityParticles_ID,
+	R_Particle_New,
+	R_Particle_NewRandom,
+};
+
+void
+Vulkan_r_easter_eggs_f (cvar_t *var, struct vulkan_ctx_s *ctx)
+{
+	if (!easter_eggs || !r_particles_style) {
+		return;
+	}
+	if (easter_eggs->int_val) {
+		if (r_particles_style->int_val) {
+			//vulkan_vid_render_funcs.particles = &vulkan_particles_QF_egg;
+		} else {
+			//vulkan_vid_render_funcs.particles = &vulkan_particles_ID_egg;
+		}
+	} else {
+		if (r_particles_style->int_val) {
+			//vulkan_vid_render_funcs.particles = &vulkan_particles_QF;
+		} else {
+			//vulkan_vid_render_funcs.particles = &vulkan_particles_ID;
+		}
+	}
+	vulkan_vid_render_funcs.particles = &vulkan_particles_QF;
+}
+
+void
+Vulkan_r_particles_style_f (cvar_t *var, struct vulkan_ctx_s *ctx)
+{
+	Vulkan_r_particles_style_f (var, ctx);
+}
+
+void
+Vulkan_Particles_Init (struct vulkan_ctx_s *ctx)
+{
+	/*
+	easter_eggs = Cvar_Get ("easter_eggs", "0", CVAR_NONE, r_easter_eggs_f,
+							"Enables easter eggs.");
+	r_particles = Cvar_Get ("r_particles", "1", CVAR_ARCHIVE, r_particles_f,
+							"Toggles drawing of particles.");
+	r_particles_max = Cvar_Get ("r_particles_max", "2048", CVAR_ARCHIVE,
+								r_particles_max_f, "Maximum amount of "
+								"particles to display. No maximum, minimum "
+								"is 0.");
+	r_particles_nearclip = Cvar_Get ("r_particles_nearclip", "32",
+									 CVAR_ARCHIVE, r_particles_nearclip_f,
+									 "Distance of the particle near clipping "
+									 "plane from the player.");
+	r_particles_style = Cvar_Get ("r_particles_style", "1", CVAR_ARCHIVE,
+								  r_particles_style_f, "Sets particle style. "
+								  "0 for Id, 1 for QF.");
+	*/
+	vulkan_vid_render_funcs.particles = &vulkan_particles_QF;
+}

From c7b2843c0e6fc6ed88345268def633ee491dd0a6 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 18 Jan 2021 17:13:52 +0900
Subject: [PATCH 1323/1519] [vulkan] Create shanders for brush models

The fragment shader is a bit of a mini mega-shader, but I do want to try
out specializations.
---
 include/vid_vulkan.h                         |   1 +
 libs/video/renderer/Makemodule.am            |  10 ++
 libs/video/renderer/vulkan/quakebsp.frag     | 122 +++++++++++++++++++
 libs/video/renderer/vulkan/quakebsp.vert     |  28 +++++
 libs/video/renderer/vulkan/shader.c          |   6 +
 libs/video/renderer/vulkan/vulkan_matrices.c |   3 +-
 6 files changed, 169 insertions(+), 1 deletion(-)
 create mode 100644 libs/video/renderer/vulkan/quakebsp.frag
 create mode 100644 libs/video/renderer/vulkan/quakebsp.vert

diff --git a/include/vid_vulkan.h b/include/vid_vulkan.h
index c8d318a99..90d4908f2 100644
--- a/include/vid_vulkan.h
+++ b/include/vid_vulkan.h
@@ -31,6 +31,7 @@ typedef struct vulkan_matrices_s {
 	float      *projection_2d;
 	float      *projection_3d;
 	float      *view_3d;
+	float      *sky_3d;
 } vulkan_matrices_t;
 
 typedef struct vulkan_framebufferset_s
diff --git a/libs/video/renderer/Makemodule.am b/libs/video/renderer/Makemodule.am
index b58aaf3af..bfe8cb5e3 100644
--- a/libs/video/renderer/Makemodule.am
+++ b/libs/video/renderer/Makemodule.am
@@ -261,6 +261,10 @@ twodv_src = libs/video/renderer/vulkan/twod.vert
 twodv_c = libs/video/renderer/vulkan/twod.vert.spvc
 twodf_src = libs/video/renderer/vulkan/twod.frag
 twodf_c = libs/video/renderer/vulkan/twod.frag.spvc
+quakebspv_src = libs/video/renderer/vulkan/quakebsp.vert
+quakebspv_c = libs/video/renderer/vulkan/quakebsp.vert.spvc
+quakebspf_src = libs/video/renderer/vulkan/quakebsp.frag
+quakebspf_c = libs/video/renderer/vulkan/quakebsp.frag.spvc
 passthrough_src = libs/video/renderer/vulkan/passthrough.vert
 passthrough_c = libs/video/renderer/vulkan/passthrough.vert.spvc
 pushcolor_src = libs/video/renderer/vulkan/pushcolor.frag
@@ -270,6 +274,10 @@ $(twodv_c): $(twodv_src)
 
 $(twodf_c): $(twodf_src)
 
+$(quakebspv_c): $(quakebspv_src)
+
+$(quakebspf_c): $(quakebspf_src)
+
 $(passthrough_c): $(passthrough_src)
 
 $(pushcolor_c): $(pushcolor_src)
@@ -277,6 +285,8 @@ $(pushcolor_c): $(pushcolor_src)
 vkshader_c = \
 	$(twodv_c) \
 	$(twodf_c) \
+	$(quakebspv_c) \
+	$(quakebspf_c) \
 	$(passthrough_c) \
 	$(pushcolor_c)
 
diff --git a/libs/video/renderer/vulkan/quakebsp.frag b/libs/video/renderer/vulkan/quakebsp.frag
new file mode 100644
index 000000000..151243249
--- /dev/null
+++ b/libs/video/renderer/vulkan/quakebsp.frag
@@ -0,0 +1,122 @@
+#version 450
+
+layout (set = 0, binding = 1) uniform sampler2D Texture;
+layout (set = 0, binding = 2) uniform sampler2D Glowmap;
+layout (set = 0, binding = 3) uniform sampler2D Lightmap;
+layout (set = 0, binding = 4) uniform samplerCube SkyCube;
+layout (set = 0, binding = 5) uniform sampler2DArray SkySheet;
+
+layout (push_constant) uniform PushConstants {
+	float       time;
+	vec4        fog;
+};
+
+layout (location = 0) in vec4 tl_st;
+layout (location = 1) in vec4 color;
+layout (location = 2) out vec3 direction;
+
+layout (location = 0) out vec4 frag_color;
+
+layout (constant_id = 0) const bool doWarp = false;
+layout (constant_id = 1) const bool doLight = true;
+layout (constant_id = 2) const bool doSkyCube = false;
+layout (constant_id = 3) const bool doSkySheet = false;
+
+const float PI = 3.14159265;
+const float SPEED = 20.0;
+const float CYCLE = 128.0;
+const float FACTOR = PI * 2.0 / CYCLE;
+const vec2 BIAS = vec2 (1.0, 1.0);
+const float SCALE = 8.0;
+
+vec2
+warp_st (vec2 st, float time)
+{
+	vec2        angle = st.ts * CYCLE / 2.0;
+	vec2        phase = vec2 (time, time) * SPEED;
+	return st + (sin ((angle + phase) * FACTOR) + BIAS) / SCALE;
+}
+
+vec4
+fogBlend (vec4 color)
+{
+	float       az = fog.a * gl_FragCoord.z / gl_FragCoord.w;
+	vec3        fog_color = fog.rgb;
+	float       fog_factor = exp (-az * az);
+
+	return vec4 (mix (fog_color.rgb, color.rgb, fog_factor), color.a);
+}
+
+vec4
+sky_sheet (vec3 dir, float time)
+{
+	float       len;
+	vec2        flow = vec2 (1.0, 1.0);
+	vec2        base;
+	vec3        st1, st2;
+	vec4        c1, c2, c;
+
+	dir.z *= 3.0;
+	len = dot (dir, dir);
+	len = SCALE * inversesqrt (len);
+	base = dir.yx * vec2(1.0, -1.0) * len;
+
+	st1 = vec3 (base + flow * time / 8.0, 0);
+	st2 = vec3 (base + flow * time / 16.0, 1);
+
+	c1 = texture (SkySheet, st1);
+	c2 = texture (SkySheet, st2);
+
+	c = vec4 (mix (c2.rgb, c1.rgb, c1.a), max (c1.a, c2.a));
+
+	return c;
+}
+
+vec4
+sky_cube (vec3 dir, float time)
+{
+	// NOTE: quake's world is right-handed with Z up and X forward, but
+	// Vulkan's cube maps are left-handed with Y up and Z forward. The
+	// rotation to X foward is done by the Sky matrix so all that's left
+	// to do here is swizzle the Y and Z coordinates
+	return texture (SkyCube, dir.xzy);
+}
+
+vec4
+sky_color (vec3 dir, float time)
+{
+	if (!doSkySheet) {
+		return sky_cube (dir, time);
+	} if (!doSkyCube) {
+		return sky_sheet (dir, time);
+	} else {
+		// can see through the sheet (may look funny when looking down)
+		// maybe have 4 sheet layers instead of 2?
+		vec4        c1 = sky_sheet (dir, time);
+		vec4        c2 = sky_cube (dir, time);
+		return vec4 (mix (c2.rgb, c1.rgb, c1.a), max (c1.a, c2.a));
+	}
+}
+
+void
+main (void)
+{
+	vec4        c;
+	vec2        t_st = tl_st.xy;
+	vec2        l_st = tl_st.zw;
+
+	if (doWarp) {
+		t_st = warp_st (t_st, time);
+	}
+	if (doSkyCube || doSkySheet) {
+		c = sky_color (direction, time);
+	} else {
+		c = texture (Texture, t_st) * color;
+	}
+	if (doLight) {
+		c *= texture (Lightmap, l_st);
+	}
+	c += texture (Glowmap, t_st);
+
+	frag_color = fogBlend (c);
+}
diff --git a/libs/video/renderer/vulkan/quakebsp.vert b/libs/video/renderer/vulkan/quakebsp.vert
new file mode 100644
index 000000000..11ae0c90a
--- /dev/null
+++ b/libs/video/renderer/vulkan/quakebsp.vert
@@ -0,0 +1,28 @@
+#version 450
+
+layout (set = 0, binding = 0) uniform Matrices {
+	mat4 Projection;
+	mat4 View;
+	mat4 Sky;
+};
+
+layout (push_constant) uniform PushConstants {
+	mat4 Model;
+};
+
+layout (location = 0) in vec4 vertex;
+layout (location = 1) in vec4 tl_uv;
+layout (location = 2) in vec4 vcolor;
+
+layout (location = 0) out vec4 tl_st;
+layout (location = 1) out vec4 color;
+layout (location = 2) out vec3 direction;
+
+void
+main (void)
+{
+	gl_Position = Projection * (View * (Model * vertex));
+	direction = (Sky * vertex).xyz;
+	tl_st = tl_uv;
+	color = vcolor;
+}
diff --git a/libs/video/renderer/vulkan/shader.c b/libs/video/renderer/vulkan/shader.c
index 25e1049ea..4b0fed532 100644
--- a/libs/video/renderer/vulkan/shader.c
+++ b/libs/video/renderer/vulkan/shader.c
@@ -59,6 +59,10 @@ static
 static
 #include "libs/video/renderer/vulkan/twod.frag.spvc"
 static
+#include "libs/video/renderer/vulkan/quakebsp.vert.spvc"
+static
+#include "libs/video/renderer/vulkan/quakebsp.frag.spvc"
+static
 #include "libs/video/renderer/vulkan/passthrough.vert.spvc"
 static
 #include "libs/video/renderer/vulkan/pushcolor.frag.spvc"
@@ -72,6 +76,8 @@ typedef struct shaderdata_s {
 static shaderdata_t builtin_shaders[] = {
 	{ "twod.vert", twod_vert, sizeof (twod_vert) },
 	{ "twod.frag", twod_frag, sizeof (twod_frag) },
+	{ "quakebsp.vert", quakebsp_vert, sizeof (quakebsp_vert) },
+	{ "quakebsp.frag", quakebsp_frag, sizeof (quakebsp_frag) },
 	{ "passthrough.vert", passthrough_vert, sizeof (passthrough_vert) },
 	{ "pushcolor.frag", pushcolor_frag, sizeof (pushcolor_frag) },
 	{}
diff --git a/libs/video/renderer/vulkan/vulkan_matrices.c b/libs/video/renderer/vulkan/vulkan_matrices.c
index c734f82d0..62eb16c1d 100644
--- a/libs/video/renderer/vulkan/vulkan_matrices.c
+++ b/libs/video/renderer/vulkan/vulkan_matrices.c
@@ -134,7 +134,7 @@ Vulkan_CreateMatrices (vulkan_ctx_t *ctx)
 	__auto_type mat = &ctx->matrices;
 	mat->buffer_2d = QFV_CreateBuffer (device, 1 * MAT_SIZE,
 									   VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT);
-	mat->buffer_3d = QFV_CreateBuffer (device, 2 * MAT_SIZE,
+	mat->buffer_3d = QFV_CreateBuffer (device, 3 * MAT_SIZE,
 									   VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT);
 
 	size_t      size = 0;
@@ -159,6 +159,7 @@ Vulkan_CreateMatrices (vulkan_ctx_t *ctx)
 	mat->projection_2d = data;
 	mat->projection_3d = mat->projection_2d + offset / sizeof (float);
 	mat->view_3d = mat->projection_3d + 16;
+	mat->sky_3d = mat->view_3d + 16;
 }
 
 void

From 9b53d7d4e288e2a4763c808754ba405c0222b477 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 19 Jan 2021 08:26:53 +0900
Subject: [PATCH 1324/1519] [model] Remove empty brush model functions

It seems better to check for a null pointer and just not call.
---
 libs/models/brush/glsl_model_brush.c  | 10 ----------
 libs/models/brush/model_brush.c       | 11 +++++++----
 libs/models/brush/sw_model_brush.c    | 16 ----------------
 libs/models/null_model.c              | 15 ---------------
 libs/video/renderer/vid_render_glsl.c |  4 ++--
 libs/video/renderer/vid_render_sw.c   |  6 +++---
 libs/video/renderer/vid_render_sw32.c |  6 +++---
 7 files changed, 15 insertions(+), 53 deletions(-)

diff --git a/libs/models/brush/glsl_model_brush.c b/libs/models/brush/glsl_model_brush.c
index 8827844da..e840e0b29 100644
--- a/libs/models/brush/glsl_model_brush.c
+++ b/libs/models/brush/glsl_model_brush.c
@@ -132,11 +132,6 @@ glsl_Mod_ProcessTexture (texture_t *tx)
 	}
 }
 
-void
-glsl_Mod_LoadExternalTextures (model_t *mod)
-{
-}
-
 void
 glsl_Mod_LoadLighting (bsp_t *bsp)
 {
@@ -150,8 +145,3 @@ glsl_Mod_LoadLighting (bsp_t *bsp)
 	loadmodel->lightdata = Hunk_AllocName (bsp->lightdatasize, loadname);
 	memcpy (loadmodel->lightdata, bsp->lightdata, bsp->lightdatasize);
 }
-
-void
-glsl_Mod_SubdivideSurface (msurface_t *fa)
-{
-}
diff --git a/libs/models/brush/model_brush.c b/libs/models/brush/model_brush.c
index c81fbabe9..19d28a8c6 100644
--- a/libs/models/brush/model_brush.c
+++ b/libs/models/brush/model_brush.c
@@ -204,7 +204,7 @@ Mod_LoadTextures (bsp_t *bsp)
 
 		if (!strncmp (mt->name, "sky", 3))
 			loadmodel->skytexture = tx;
-		if (mod_funcs)
+		if (mod_funcs && mod_funcs->Mod_ProcessTexture)
 			mod_funcs->Mod_ProcessTexture (tx);
 	}
 
@@ -539,7 +539,7 @@ Mod_LoadFaces (bsp_t *bsp)
 		if (!strncmp (out->texinfo->texture->name, "sky", 3)) {	// sky
 			out->flags |= (SURF_DRAWSKY | SURF_DRAWTILED);
 			if (gl_sky_divide && gl_sky_divide->int_val)
-				if (mod_funcs)
+				if (mod_funcs && mod_funcs->Mod_SubdivideSurface)
 					mod_funcs->Mod_SubdivideSurface (out);
 			continue;
 		}
@@ -552,8 +552,10 @@ Mod_LoadFaces (bsp_t *bsp)
 				out->extents[i] = 16384;
 				out->texturemins[i] = -8192;
 			}
-			if (mod_funcs)	// cut up polygon for warps
+			if (mod_funcs && mod_funcs->Mod_SubdivideSurface) {
+				// cut up polygon for warps
 				mod_funcs->Mod_SubdivideSurface (out);
+			}
 			continue;
 		}
 	}
@@ -915,8 +917,9 @@ Mod_LoadBrushModel (model_t *mod, void *buffer)
 	Mod_LoadEdges (bsp);
 	Mod_LoadSurfedges (bsp);
 	Mod_LoadTextures (bsp);
-	if (mod_funcs)
+	if (mod_funcs && mod_funcs->Mod_LoadLighting) {
 		mod_funcs->Mod_LoadLighting (bsp);
+	}
 	Mod_LoadPlanes (bsp);
 	Mod_LoadTexinfo (bsp);
 	Mod_LoadFaces (bsp);
diff --git a/libs/models/brush/sw_model_brush.c b/libs/models/brush/sw_model_brush.c
index c78cd12b4..1f179bab2 100644
--- a/libs/models/brush/sw_model_brush.c
+++ b/libs/models/brush/sw_model_brush.c
@@ -40,22 +40,6 @@
 
 #include "mod_internal.h"
 
-
-void
-sw_Mod_SubdivideSurface (msurface_t *fa)
-{
-}
-
-void
-sw_Mod_ProcessTexture (texture_t *tx)
-{
-}
-
-void
-sw_Mod_LoadExternalTextures (model_t *mod)
-{
-}
-
 void
 sw_Mod_LoadLighting (bsp_t *bsp)
 {
diff --git a/libs/models/null_model.c b/libs/models/null_model.c
index 18cb987c1..6f482cc01 100644
--- a/libs/models/null_model.c
+++ b/libs/models/null_model.c
@@ -48,26 +48,11 @@ Mod_LoadSpriteModel (model_t *mod, void *buf)
 {
 }
 
-void
-Mod_ProcessTexture (texture_t *tx)
-{
-}
-
 void
 Mod_LoadExternalSkins (model_t *mod)
 {
 }
 
-void
-Mod_LoadExternalTextures (model_t *mod)
-{
-}
-
-void
-Mod_SubdivideSurface (msurface_t *fa)
-{
-}
-
 viddef_t    vid;
 
 VISIBLE void
diff --git a/libs/video/renderer/vid_render_glsl.c b/libs/video/renderer/vid_render_glsl.c
index 25bdb9224..6d6c87b3a 100644
--- a/libs/video/renderer/vid_render_glsl.c
+++ b/libs/video/renderer/vid_render_glsl.c
@@ -46,9 +46,9 @@
 gl_ctx_t *glsl_ctx;
 
 static vid_model_funcs_t model_funcs = {
-	glsl_Mod_LoadExternalTextures,
+	0,//Mod_LoadExternalTextures,
 	glsl_Mod_LoadLighting,
-	glsl_Mod_SubdivideSurface,
+	0,//Mod_SubdivideSurface,
 	glsl_Mod_ProcessTexture,
 
 	Mod_LoadIQM,
diff --git a/libs/video/renderer/vid_render_sw.c b/libs/video/renderer/vid_render_sw.c
index 02ff562e6..8c5360701 100644
--- a/libs/video/renderer/vid_render_sw.c
+++ b/libs/video/renderer/vid_render_sw.c
@@ -39,10 +39,10 @@
 sw_ctx_t *sw_ctx;
 
 static vid_model_funcs_t model_funcs = {
-	sw_Mod_LoadExternalTextures,
+	0,//Mod_LoadExternalTextures,
 	sw_Mod_LoadLighting,
-	sw_Mod_SubdivideSurface,
-	sw_Mod_ProcessTexture,
+	0,//Mod_SubdivideSurface,
+	0,//Mod_ProcessTexture,
 
 	Mod_LoadIQM,
 	Mod_LoadAliasModel,
diff --git a/libs/video/renderer/vid_render_sw32.c b/libs/video/renderer/vid_render_sw32.c
index 97097e2ad..af72bc0df 100644
--- a/libs/video/renderer/vid_render_sw32.c
+++ b/libs/video/renderer/vid_render_sw32.c
@@ -44,10 +44,10 @@
 sw_ctx_t *sw32_ctx;
 
 static vid_model_funcs_t model_funcs = {
-	sw_Mod_LoadExternalTextures,
+	0,//Mod_LoadExternalTextures,
 	sw_Mod_LoadLighting,
-	sw_Mod_SubdivideSurface,
-	sw_Mod_ProcessTexture,
+	0,//Mod_SubdivideSurface,
+	0,//Mod_ProcessTexture,
 
 	Mod_LoadIQM,
 	Mod_LoadAliasModel,

From e50430e00cf44c41a60b9241ee5858abc86e5550 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 19 Jan 2021 10:15:57 +0900
Subject: [PATCH 1325/1519] [image] Add parameter to load only the header

I want to be able to calculate texture sizes without actually loading
the images.
---
 include/QF/image.h                   |  8 ++--
 include/QF/pcx.h                     |  3 +-
 include/QF/png.h                     |  2 +-
 include/QF/tga.h                     |  2 +-
 libs/image/image.c                   | 11 ++---
 libs/image/pcx.c                     | 18 +++++++--
 libs/image/png.c                     | 60 ++++++++++++++++------------
 libs/image/tga.c                     | 31 +++++++++-----
 libs/models/alias/gl_model_alias.c   | 12 +++---
 libs/models/brush/gl_model_brush.c   | 13 +++---
 libs/models/brush/glsl_model_brush.c |  2 +-
 libs/models/iqm/gl_model_iqm.c       |  2 +-
 libs/models/iqm/glsl_model_iqm.c     |  4 +-
 libs/models/iqm/sw_model_iqm.c       |  4 +-
 libs/models/skin.c                   |  2 +-
 libs/models/sprite/gl_model_sprite.c |  2 +-
 libs/video/renderer/gl/gl_draw.c     |  6 +--
 libs/video/renderer/gl/gl_sky.c      |  4 +-
 libs/video/renderer/glsl/glsl_bsp.c  |  6 +--
 tools/qflmp/lmp.c                    |  2 +-
 tools/qfspritegen/spritegen.c        |  2 +-
 tools/wad/script.c                   |  2 +-
 22 files changed, 116 insertions(+), 82 deletions(-)

diff --git a/include/QF/image.h b/include/QF/image.h
index 396547f42..cd649c42e 100644
--- a/include/QF/image.h
+++ b/include/QF/image.h
@@ -45,11 +45,11 @@ typedef struct tex_s {
 	int         width;
 	int         height;
 	QFFormat    format;
-	byte       *palette;					// 0 = 32 bit, otherwise 8
-	byte        data[4];					// variable length
+	int         loaded;			// 0 if size info only, otherwise data loaded
+	byte       *palette;		// 0 = 32 bit, otherwise 8
+	byte        data[4];		// variable length
 } tex_t;
 
-
-tex_t *LoadImage (const char *imageFile);
+tex_t *LoadImage (const char *imageFile, int load);
 
 #endif//__QF_image_h
diff --git a/include/QF/pcx.h b/include/QF/pcx.h
index 8536b9f69..8ae83a156 100644
--- a/include/QF/pcx.h
+++ b/include/QF/pcx.h
@@ -71,10 +71,11 @@ pcx_t *EncodePCX (byte *data, int width, int height, int rowbytes,
 	\param f The file to read the texture from
 	\param convert If true, the texture is converted to RGB on load
 	\param pal The palette to apply during conversion
+	\param load If false, only the format and size info is loaded
 
 	\return A pointer to the texture.
 	\warning Uses Hunk_TempAlloc() to allocate the texture.
 */
-struct tex_s *LoadPCX (QFile *f, qboolean convert, byte *pal);
+struct tex_s *LoadPCX (QFile *f, qboolean convert, byte *pal, int load);
 
 #endif//__QF_pcx_h
diff --git a/include/QF/png.h b/include/QF/png.h
index c3e2ed562..b322a93f0 100644
--- a/include/QF/png.h
+++ b/include/QF/png.h
@@ -33,7 +33,7 @@
 
 #include "QF/quakefs.h"
 
-struct tex_s *LoadPNG (QFile *infile);
+struct tex_s *LoadPNG (QFile *infile, int load);
 void WritePNG (const char *fileName, const byte *data, int width, int height);
 void WritePNGqfs (const char *fileName, const byte *data,
 				  int width, int height);
diff --git a/include/QF/tga.h b/include/QF/tga.h
index 365f5d366..08d610d95 100644
--- a/include/QF/tga.h
+++ b/include/QF/tga.h
@@ -67,7 +67,7 @@ typedef struct _TargaHeader {
 # endif
 #endif
 
-struct tex_s *LoadTGA (QFile *fin);
+struct tex_s *LoadTGA (QFile *fin, int load);
 void WriteTGAfile (const char *tganame, byte *data, int width, int height);
 
 #endif//__QF_tga_h
diff --git a/libs/image/image.c b/libs/image/image.c
index 7df5d9bb2..4da1e5827 100644
--- a/libs/image/image.c
+++ b/libs/image/image.c
@@ -43,7 +43,7 @@
 #include "QF/tga.h"
 
 VISIBLE tex_t *
-LoadImage (const char *imageFile)
+LoadImage (const char *imageFile, int load)
 {
 	int         tmp;
 	dstring_t  *tmpFile;
@@ -64,7 +64,7 @@ LoadImage (const char *imageFile)
 	dstring_replace (tmpFile, tmp, tmpFile->size, ".png", 5);
 	fp = QFS_FOpenFile (tmpFile->str);
 	if (fp) {
-		tex = LoadPNG (fp);
+		tex = LoadPNG (fp, load);
 		Qclose (fp);
 		dstring_delete (tmpFile);
 		return (tex);
@@ -74,7 +74,7 @@ LoadImage (const char *imageFile)
 	dstring_replace (tmpFile, tmp, tmpFile->size, ".tga", 5);
 	fp = QFS_FOpenFile (tmpFile->str);
 	if (fp) {
-		tex = LoadTGA (fp);
+		tex = LoadTGA (fp, load);
 		Qclose (fp);
 		dstring_delete (tmpFile);
 		return (tex);
@@ -85,7 +85,7 @@ LoadImage (const char *imageFile)
 	dstring_replace (tmpFile, tmp, tmpFile->size, ".jpg", 5);
 	fp = QFS_FOpenFile (tmpFile->str);
 	if (fp) {
-		tex = LoadJPG (fp);
+		tex = LoadJPG (fp, load);
 		Qclose (fp);
 		dstring_delete (tmpFile);
 		return (tex);
@@ -96,7 +96,8 @@ LoadImage (const char *imageFile)
 	dstring_replace (tmpFile, tmp, tmpFile->size, ".pcx", 5);
 	fp = QFS_FOpenFile (tmpFile->str);
 	if (fp) {
-		tex = LoadPCX (fp, 1, NULL); // Convert, some users don't grok paletted
+		// Convert, some users don't grok paletted
+		tex = LoadPCX (fp, 1, NULL, load);
 		Qclose (fp);
 		dstring_delete (tmpFile);
 		return (tex);
diff --git a/libs/image/pcx.c b/libs/image/pcx.c
index 9ca47bc34..495b1b1d5 100644
--- a/libs/image/pcx.c
+++ b/libs/image/pcx.c
@@ -47,7 +47,7 @@
 
 
 VISIBLE tex_t *
-LoadPCX (QFile *f, qboolean convert, byte *pal)
+LoadPCX (QFile *f, qboolean convert, byte *pal, int load)
 {
 	pcx_t      *pcx;
 	int         pcx_mark;
@@ -58,8 +58,11 @@ LoadPCX (QFile *f, qboolean convert, byte *pal)
 	int         runLength = 1;
 	int         count;
 	tex_t      *tex;
-	int			fsize = Qfilesize(f);
+	int			fsize = sizeof (pcx_t);
 
+	if (load) {
+		fsize = Qfilesize(f);
+	}
 	// parse the PCX file
 	pcx_mark = Hunk_LowMark ();
 	pcx = Hunk_AllocName (fsize, "PCX");
@@ -79,14 +82,16 @@ LoadPCX (QFile *f, qboolean convert, byte *pal)
 		|| pcx->encoding != 1
 		|| pcx->bits_per_pixel != 8) {
 		Sys_Printf ("Bad pcx file: %x %d %d %d\n",
-					pcx->manufacturer, pcx->version, pcx->encoding, pcx->bits_per_pixel);
+					pcx->manufacturer, pcx->version, pcx->encoding,
+					pcx->bits_per_pixel);
+		Hunk_FreeToLowMark (pcx_mark);
 		return 0;
 	}
 
 	end = palette = ((byte *) pcx) + fsize - 768;
 	dataByte = (byte *) &pcx[1];
 
-	count = (pcx->xmax + 1) * (pcx->ymax + 1);
+	count = load ? (pcx->xmax + 1) * (pcx->ymax + 1) : 0;
 	if (convert) {
 		tex = Hunk_TempAlloc (field_offset (tex_t, data[count * 3]));
 		tex->format = tex_rgb;
@@ -101,6 +106,11 @@ LoadPCX (QFile *f, qboolean convert, byte *pal)
 	}
 	tex->width = pcx->xmax + 1;
 	tex->height = pcx->ymax + 1;
+	tex->loaded = load;
+	if (!load) {
+		Hunk_FreeToLowMark (pcx_mark);
+		return tex;
+	}
 	pix = tex->data;
 
 	while (count) {
diff --git a/libs/image/png.c b/libs/image/png.c
index 62d9977df..9e81ca138 100644
--- a/libs/image/png.c
+++ b/libs/image/png.c
@@ -115,7 +115,7 @@ readpng_init (QFile *infile, png_structp *png_ptr, png_infop *info_ptr)
 
 /* Load the png file and return a texture */
 VISIBLE tex_t *
-LoadPNG (QFile *infile)
+LoadPNG (QFile *infile, int load)
 {
 	double			gamma;
 	png_structp		png_ptr = NULL;
@@ -131,37 +131,41 @@ LoadPNG (QFile *infile)
 	png_get_IHDR (png_ptr, info_ptr, &width, &height, &bit_depth, &color_type,
 				  NULL, NULL, NULL);
 
-	if (color_type == PNG_COLOR_TYPE_PALETTE)
-		png_set_expand (png_ptr);
+	if (load) {
+		if (color_type == PNG_COLOR_TYPE_PALETTE)
+			png_set_expand (png_ptr);
 
-	if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
-		png_set_expand (png_ptr);
+		if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
+			png_set_expand (png_ptr);
 
-	if (png_get_valid (png_ptr, info_ptr, PNG_INFO_tRNS))
-		png_set_expand (png_ptr);
+		if (png_get_valid (png_ptr, info_ptr, PNG_INFO_tRNS))
+			png_set_expand (png_ptr);
 
-	if (bit_depth == 16)
-		png_set_strip_16 (png_ptr);
+		if (bit_depth == 16)
+			png_set_strip_16 (png_ptr);
 
-	if (color_type == PNG_COLOR_TYPE_GRAY
-		|| color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
-		png_set_gray_to_rgb (png_ptr);
+		if (color_type == PNG_COLOR_TYPE_GRAY
+			|| color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+			png_set_gray_to_rgb (png_ptr);
 
-	/* NOTE: gamma support? */
-	/* unlike the example in the libpng documentation, we have *no* idea where
-	 * this file may have come from--so if it doesn't have a file gamma, don't
-	 * do any correction ("do no harm")
-	 */
-	if (png_get_gAMA(png_ptr, info_ptr, &gamma))
-		png_set_gamma (png_ptr, 1.0, gamma);
+		/* NOTE: gamma support? */
+		/* unlike the example in the libpng documentation, we have *no* idea
+		 * wherethis file may have come from--so if it doesn't have a file
+		 * gamma, don't do any correction ("do no harm")
+		 */
+		if (png_get_gAMA(png_ptr, info_ptr, &gamma))
+			png_set_gamma (png_ptr, 1.0, gamma);
 
-	/* All transformations have been registered, now update the info_ptr
-	 * structure */
-	png_read_update_info (png_ptr, info_ptr);
+		/* All transformations have been registered, now update the info_ptr
+		 * structure */
+		png_read_update_info (png_ptr, info_ptr);
 
-	/* Allocate tex_t structure */
-	rowbytes = png_get_rowbytes(png_ptr, info_ptr);
-	tex = Hunk_TempAlloc (field_offset (tex_t, data[height * rowbytes]));
+		/* Allocate tex_t structure */
+		rowbytes = png_get_rowbytes(png_ptr, info_ptr);
+		tex = Hunk_TempAlloc (field_offset (tex_t, data[height * rowbytes]));
+	} else {
+		tex = Hunk_TempAlloc (field_offset (tex_t, data[0]));
+	}
 
 	tex->width = width;
 	tex->height = height;
@@ -170,6 +174,12 @@ LoadPNG (QFile *infile)
 	else
 		tex->format = tex_rgb;
 	tex->palette = NULL;
+	tex->loaded = load;
+
+	if (!load) {
+		png_read_end (png_ptr, NULL);
+		return tex;
+	}
 
 	if ((row_pointers = (png_bytepp) malloc (height * sizeof (png_bytep)))
 		== NULL) {
diff --git a/libs/image/tga.c b/libs/image/tga.c
index 323a05d04..1a4dad133 100644
--- a/libs/image/tga.c
+++ b/libs/image/tga.c
@@ -620,15 +620,18 @@ static decoder_t decoder_functions[] = {
 					  / sizeof (decoder_functions[0]))
 
 struct tex_s *
-LoadTGA (QFile *fin)
+LoadTGA (QFile *fin, int load)
 {
 	byte       *dataByte;
 	decoder_t   decode;
-	int         fsize = Qfilesize (fin);
+	int         fsize = sizeof (TargaHeader);
 	int			numPixels, targa_mark;
 	TargaHeader *targa;
 	tex_t      *tex;
 
+	if (load) {
+		fsize = Qfilesize (fin);
+	}
 	targa_mark = Hunk_LowMark ();
 	targa = Hunk_AllocName (fsize, "TGA");
 	Qread (fin, targa, fsize);
@@ -641,20 +644,30 @@ LoadTGA (QFile *fin)
 	targa->height = LittleShort (targa->height);
 
 	if (targa->image_type >= NUM_DECODERS
-		|| !(decode = decoder_functions[targa->image_type]))
-		Sys_Error ("LoadTGA: Unsupported targa type");
+		|| !(decode = decoder_functions[targa->image_type])) {
+		Sys_Printf ("LoadTGA: Unsupported targa type");
+		Hunk_FreeToLowMark (targa_mark);
+		return 0;
+	}
 
-	numPixels = targa->width * targa->height;
+	if (load) {
+		numPixels = targa->width * targa->height;
+	} else {
+		numPixels = 0;
+	}
 	tex = Hunk_TempAlloc (field_offset (tex_t, data[numPixels * 4]));
 	tex->width = targa->width;
 	tex->height = targa->height;
 	tex->palette = 0;
+	tex->loaded = load;
 
-	// skip TARGA image comment
-	dataByte = (byte *) (targa + 1);
-	dataByte += targa->id_length;
+	if (load) {
+		// skip TARGA image comment
+		dataByte = (byte *) (targa + 1);
+		dataByte += targa->id_length;
 
-	decode (targa, tex, dataByte);
+		decode (targa, tex, dataByte);
+	}
 
 	Hunk_FreeToLowMark (targa_mark);
 	return tex;
diff --git a/libs/models/alias/gl_model_alias.c b/libs/models/alias/gl_model_alias.c
index 5d09f93b7..82919aad4 100644
--- a/libs/models/alias/gl_model_alias.c
+++ b/libs/models/alias/gl_model_alias.c
@@ -120,9 +120,9 @@ Mod_LoadExternalSkin (maliasskindesc_t *pskindesc, char *filename)
 	if (!ptr)
 		ptr = filename;
 
-	tex = LoadImage (filename);
+	tex = LoadImage (filename, 1);
 	if (!tex)
-		tex = LoadImage (va ("textures/%s", ptr + 1));
+		tex = LoadImage (va ("textures/%s", ptr + 1), 1);
 	if (tex) {
 		pskindesc->texnum = GL_LoadTexture (filename, tex->width, tex->height,
 											tex->data, true, false,
@@ -130,13 +130,13 @@ Mod_LoadExternalSkin (maliasskindesc_t *pskindesc, char *filename)
 
 		pskindesc->fb_texnum = 0;
 
-		glow = LoadImage (va ("%s_luma", filename));
+		glow = LoadImage (va ("%s_luma", filename), 1);
 		if (!glow)
-			glow = LoadImage (va ("%s_glow", filename));
+			glow = LoadImage (va ("%s_glow", filename), 1);
 		if (!glow)
-			glow = LoadImage (va ("textures/%s_luma", ptr + 1));
+			glow = LoadImage (va ("textures/%s_luma", ptr + 1), 1);
 		if (!glow)
-			glow = LoadImage (va ("textures/%s_glow", ptr + 1));
+			glow = LoadImage (va ("textures/%s_glow", ptr + 1), 1);
 		if (glow)
 			pskindesc->fb_texnum =
 				GL_LoadTexture (va ("fb_%s", filename), glow->width,
diff --git a/libs/models/brush/gl_model_brush.c b/libs/models/brush/gl_model_brush.c
index 7b7e171ac..9c1057226 100644
--- a/libs/models/brush/gl_model_brush.c
+++ b/libs/models/brush/gl_model_brush.c
@@ -68,7 +68,7 @@ gl_Mod_ProcessTexture (texture_t *tx)
 }
 
 static tex_t *
-Mod_LoadAnExternalTexture (char * tname, char *mname)
+Mod_LoadAnExternalTexture (char *tname, char *mname)
 {
 	char		rname[32];
 	tex_t	   *image;
@@ -78,17 +78,16 @@ Mod_LoadAnExternalTexture (char * tname, char *mname)
 	if (rname[0] == '*') rname[0] = '#';
 
 	image = LoadImage (va ("textures/%.*s/%s", (int) strlen (mname + 5) - 4,
-						   mname + 5, rname));
+						   mname + 5, rname), 1);
 	if (!image)
-		image = LoadImage (va ("maps/%.*s/%s",
-								   (int) strlen (mname + 5) - 4,
-								   mname + 5, rname));
+		image = LoadImage (va ("maps/%.*s/%s", (int) strlen (mname + 5) - 4,
+							   mname + 5, rname), 1);
 //	if (!image)
 //			image = LoadImage (va ("textures/bmodels/%s", rname));
 	if (!image)
-			image = LoadImage (va ("textures/%s", rname));
+			image = LoadImage (va ("textures/%s", rname), 1);
 	if (!image)
-			image = LoadImage (va ("maps/%s", rname));
+			image = LoadImage (va ("maps/%s", rname), 1);
 
 	return image;
 }
diff --git a/libs/models/brush/glsl_model_brush.c b/libs/models/brush/glsl_model_brush.c
index e840e0b29..67fff7b44 100644
--- a/libs/models/brush/glsl_model_brush.c
+++ b/libs/models/brush/glsl_model_brush.c
@@ -135,7 +135,7 @@ glsl_Mod_ProcessTexture (texture_t *tx)
 void
 glsl_Mod_LoadLighting (bsp_t *bsp)
 {
-	// a big hacky, but it's as good a place as any
+	// a bit hacky, but it's as good a place as any
 	loadmodel->clear = glsl_brush_clear;
 	mod_lightmap_bytes = 1;
 	if (!bsp->lightdatasize) {
diff --git a/libs/models/iqm/gl_model_iqm.c b/libs/models/iqm/gl_model_iqm.c
index e2e877d1d..f57b18637 100644
--- a/libs/models/iqm/gl_model_iqm.c
+++ b/libs/models/iqm/gl_model_iqm.c
@@ -80,7 +80,7 @@ gl_iqm_load_textures (iqm_t *iqm)
 	for (i = 0; i < iqm->num_meshes; i++) {
 		dstring_copystr (str, iqm->text + iqm->meshes[i].material);
 		QFS_StripExtension (str->str, str->str);
-		if ((tex = LoadImage (va ("textures/%s", str->str))))
+		if ((tex = LoadImage (va ("textures/%s", str->str), 1)))
 			gl->textures[i] = GL_LoadTexture (str->str, tex->width,
 											  tex->height, tex->data, true,
 											  false,
diff --git a/libs/models/iqm/glsl_model_iqm.c b/libs/models/iqm/glsl_model_iqm.c
index 5e1a26030..6a79eede7 100644
--- a/libs/models/iqm/glsl_model_iqm.c
+++ b/libs/models/iqm/glsl_model_iqm.c
@@ -102,12 +102,12 @@ glsl_iqm_load_textures (iqm_t *iqm)
 	for (i = 0; i < iqm->num_meshes; i++) {
 		dstring_copystr (str, iqm->text + iqm->meshes[i].material);
 		QFS_StripExtension (str->str, str->str);
-		if ((tex = LoadImage (va ("textures/%s", str->str))))
+		if ((tex = LoadImage (va ("textures/%s", str->str), 1)))
 			glsl->textures[i] = GLSL_LoadRGBATexture (str->str, tex->width,
 													  tex->height, tex->data);
 		else
 			glsl->textures[i] = GLSL_LoadRGBATexture ("", 2, 2, null_texture);
-		if ((tex = LoadImage (va ("textures/%s_norm", str->str))))
+		if ((tex = LoadImage (va ("textures/%s_norm", str->str), 1)))
 			glsl->normmaps[i] = GLSL_LoadRGBATexture (str->str, tex->width,
 													  tex->height, tex->data);
 		else
diff --git a/libs/models/iqm/sw_model_iqm.c b/libs/models/iqm/sw_model_iqm.c
index 5b609ca75..4bc8fedb9 100644
--- a/libs/models/iqm/sw_model_iqm.c
+++ b/libs/models/iqm/sw_model_iqm.c
@@ -54,7 +54,7 @@
 #include "r_internal.h"
 
 static tex_t null_texture = {
-	2, 2, tex_palette, 0, {15, 15, 15, 15}
+	2, 2, tex_palette, 1, 0, {15, 15, 15, 15}
 };
 
 static void
@@ -165,7 +165,7 @@ sw_iqm_load_textures (iqm_t *iqm)
 			continue;
 		dstring_copystr (str, iqm->text + iqm->meshes[i].material);
 		QFS_StripExtension (str->str, str->str);
-		if ((tex = LoadImage (va ("textures/%s", str->str))))
+		if ((tex = LoadImage (va ("textures/%s", str->str), 1)))
 			tex = sw->skins[i] = convert_tex (tex);
 		else
 			tex = sw->skins[i] = &null_texture;
diff --git a/libs/models/skin.c b/libs/models/skin.c
index 9583383cc..5e1fe0d85 100644
--- a/libs/models/skin.c
+++ b/libs/models/skin.c
@@ -184,7 +184,7 @@ Skin_SetSkin (skin_t *skin, int cmap, const char *skinname)
 			name = 0;
 			break;
 		}
-		tex = LoadPCX (file, 0, r_data->vid->palette);
+		tex = LoadPCX (file, 0, r_data->vid->palette, 1);
 		Qclose (file);
 		if (!tex || tex->width > 320 || tex->height > 200) {
 			Sys_Printf ("Bad skin %s\n", name);
diff --git a/libs/models/sprite/gl_model_sprite.c b/libs/models/sprite/gl_model_sprite.c
index 647b5f687..f050e9bdb 100644
--- a/libs/models/sprite/gl_model_sprite.c
+++ b/libs/models/sprite/gl_model_sprite.c
@@ -49,7 +49,7 @@ gl_Mod_SpriteLoadTexture (mspriteframe_t *pspriteframe, int framenum)
 	tex_t      *targa;
 	const char *name;
 
-	targa = LoadImage (name = va ("%s_%i", loadmodel->name, framenum));
+	targa = LoadImage (name = va ("%s_%i", loadmodel->name, framenum), 1);
 	if (targa) {
 		if (targa->format < 4)
 			pspriteframe->gl_texturenum = GL_LoadTexture (name,
diff --git a/libs/video/renderer/gl/gl_draw.c b/libs/video/renderer/gl/gl_draw.c
index 6cebda1fb..d84e8f17e 100644
--- a/libs/video/renderer/gl/gl_draw.c
+++ b/libs/video/renderer/gl/gl_draw.c
@@ -175,7 +175,7 @@ gl_Draw_PicFromWad (const char *name)
 	tex_t	   *targa;
 
 	pic = W_GetLumpName (name);
-	targa = LoadImage (name);
+	targa = LoadImage (name, 1);
 	if (targa) {
 		p = malloc (sizeof (qpic_t) + sizeof (glpic_t));
 		p->width = pic->width;
@@ -236,7 +236,7 @@ gl_Draw_CachePic (const char *path, qboolean alpha)
 		// Adjust for endian..
 		SwapPic (dat);
 		// Check for a .tga first
-		targa = LoadImage (path);
+		targa = LoadImage (path, 1);
 		if (targa) {
 			if (targa->format < 4) {
 				gl->texnum = GL_LoadTexture ("", targa->width, targa->height,
@@ -353,7 +353,7 @@ gl_Draw_Init (void)
 	// write the version string into the background before turning it into a
 	// texture
 
-	image = LoadImage ("gfx/conchars");
+	image = LoadImage ("gfx/conchars", 1);
 	if (image) {
 		if (image->format < 4) {
 			char_texture = GL_LoadTexture ("charset", image->width,
diff --git a/libs/video/renderer/gl/gl_sky.c b/libs/video/renderer/gl/gl_sky.c
index a4d325f09..4f69ef8b7 100644
--- a/libs/video/renderer/gl/gl_sky.c
+++ b/libs/video/renderer/gl/gl_sky.c
@@ -131,11 +131,11 @@ gl_R_LoadSkys (const char *skyname)
 
 		qfglBindTexture (GL_TEXTURE_2D, SKY_TEX + i);
 
-		targa = LoadImage (name = va ("env/%s%s", skyname, suf[i]));
+		targa = LoadImage (name = va ("env/%s%s", skyname, suf[i]), 1);
 		if (!targa || targa->format < 3) {	// FIXME Can't do PCX right now
 			Sys_MaskPrintf (SYS_DEV, "Couldn't load %s\n", name);
 			// also look in gfx/env, where Darkplaces looks for skies
-			targa = LoadImage (name = va ("gfx/env/%s%s", skyname, suf[i]));
+			targa = LoadImage (name = va ("gfx/env/%s%s", skyname, suf[i]), 1);
 			if (!targa) {
 				Sys_MaskPrintf (SYS_DEV, "Couldn't load %s\n", name);
 				gl_skyloaded = false;
diff --git a/libs/video/renderer/glsl/glsl_bsp.c b/libs/video/renderer/glsl/glsl_bsp.c
index acdaf22c6..0dc19103e 100644
--- a/libs/video/renderer/glsl/glsl_bsp.c
+++ b/libs/video/renderer/glsl/glsl_bsp.c
@@ -1399,7 +1399,7 @@ glsl_R_LoadSkys (const char *sky)
 	//blender envmap
 	// bk rt ft
 	// dn up lt
-	tex = LoadImage (name = va ("env/%s_map", sky));
+	tex = LoadImage (name = va ("env/%s_map", sky), 1);
 	if (tex && tex->format >= 3 && tex->height * 3 == tex->width * 2
 		&& is_pow2 (tex->height)) {
 		tex_t      *sub;
@@ -1426,12 +1426,12 @@ glsl_R_LoadSkys (const char *sky)
 	} else {
 		skybox_loaded = true;
 		for (i = 0; i < 6; i++) {
-			tex = LoadImage (name = va ("env/%s%s", sky, sky_suffix[i]));
+			tex = LoadImage (name = va ("env/%s%s", sky, sky_suffix[i]), 1);
 			if (!tex || tex->format < 3) {	// FIXME pcx support
 				Sys_MaskPrintf (SYS_GLSL, "Couldn't load %s\n", name);
 				// also look in gfx/env, where Darkplaces looks for skies
 				tex = LoadImage (name = va ("gfx/env/%s%s", sky,
-											sky_suffix[i]));
+											sky_suffix[i]), 1);
 				if (!tex || tex->format < 3) {  // FIXME pcx support
 					Sys_MaskPrintf (SYS_GLSL, "Couldn't load %s\n", name);
 					skybox_loaded = false;
diff --git a/tools/qflmp/lmp.c b/tools/qflmp/lmp.c
index b8021166c..1840ce328 100644
--- a/tools/qflmp/lmp.c
+++ b/tools/qflmp/lmp.c
@@ -213,7 +213,7 @@ importFile (const char *inpath)
 	if (options.verbosity > 1)
 		Sys_Printf ("PCX file size: %d\n", fsize);
 
-	lmp = LoadPCX (infile, false, NULL);
+	lmp = LoadPCX (infile, false, NULL, 1);
 
 	if (!lmp) {
 		Sys_Printf ("%s: Failed to load %s as texture.\n",
diff --git a/tools/qfspritegen/spritegen.c b/tools/qfspritegen/spritegen.c
index 5234adc0c..08ddc86f1 100644
--- a/tools/qfspritegen/spritegen.c
+++ b/tools/qfspritegen/spritegen.c
@@ -190,7 +190,7 @@ LoadScreen (const char *name)
 	file = Qopen (name, "rb");
 	if (!file)
 		Sys_Error ("could not open");
-	image = LoadPCX (file, false, 0);
+	image = LoadPCX (file, false, 0, 1);
 }
 
 
diff --git a/tools/wad/script.c b/tools/wad/script.c
index eef6a90e9..b4eaeeeff 100644
--- a/tools/wad/script.c
+++ b/tools/wad/script.c
@@ -92,7 +92,7 @@ load_image (const char *name)
 
 	if (!(file = Qopen (name, "rb")))
 		Sys_Error ("couldn't open %s. %s", name, strerror(errno));
-	if (!(tex = LoadPNG (file)))
+	if (!(tex = LoadPNG (file, 1)))
 		Sys_Error ("couldn't read %s as PNG", name);
 
 	pixels = tex->width * tex->height;

From 40fc9f00005eb163181ce4922d29c93f9ff6bd48 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 19 Jan 2021 10:30:37 +0900
Subject: [PATCH 1326/1519] [model] Make Mod_LoadExternalTextures private

It never really needed to be externally accessible as it has always been
gl-specific and can be called by Mod_ProcessTexture anyway.
---
 include/QF/plugin/vid_render.h          |  1 -
 include/mod_internal.h                  |  3 -
 libs/models/brush/gl_model_brush.c      | 91 ++++++++++++-------------
 libs/models/model.c                     |  4 --
 libs/video/renderer/vid_render_gl.c     |  1 -
 libs/video/renderer/vid_render_glsl.c   |  1 -
 libs/video/renderer/vid_render_sw.c     |  1 -
 libs/video/renderer/vid_render_sw32.c   |  1 -
 libs/video/renderer/vid_render_vulkan.c |  6 --
 9 files changed, 45 insertions(+), 64 deletions(-)

diff --git a/include/QF/plugin/vid_render.h b/include/QF/plugin/vid_render.h
index 462aaabf4..447bc8ce6 100644
--- a/include/QF/plugin/vid_render.h
+++ b/include/QF/plugin/vid_render.h
@@ -80,7 +80,6 @@ typedef struct vid_particle_funcs_s {
 } vid_particle_funcs_t;
 
 typedef struct vid_model_funcs_s {
-	void (*Mod_LoadExternalTextures) (model_t *mod);
 	void (*Mod_LoadLighting) (bsp_t *bsp);
 	void (*Mod_SubdivideSurface) (msurface_t *fa);
 	void (*Mod_ProcessTexture) (texture_t *tx);
diff --git a/include/mod_internal.h b/include/mod_internal.h
index 7f6be3e4e..2dbf624bf 100644
--- a/include/mod_internal.h
+++ b/include/mod_internal.h
@@ -32,17 +32,14 @@ void sw_Mod_FinalizeAliasModel (model_t *m, aliashdr_t *hdr);
 void sw_Mod_LoadExternalSkins (model_t *mod);
 void sw_Mod_IQMFinish (model_t *mod);
 
-void gl_Mod_LoadExternalTextures (model_t *mod);
 void gl_Mod_LoadLighting (bsp_t *bsp);
 void gl_Mod_SubdivideSurface (msurface_t *fa);
 void gl_Mod_ProcessTexture(texture_t *tx);
 
-void glsl_Mod_LoadExternalTextures (model_t *mod);
 void glsl_Mod_LoadLighting (bsp_t *bsp);
 void glsl_Mod_SubdivideSurface (msurface_t *fa);
 void glsl_Mod_ProcessTexture(texture_t *tx);
 
-void sw_Mod_LoadExternalTextures (model_t *mod);
 void sw_Mod_LoadLighting (bsp_t *bsp);
 void sw_Mod_SubdivideSurface (msurface_t *fa);
 void sw_Mod_ProcessTexture(texture_t *tx);
diff --git a/libs/models/brush/gl_model_brush.c b/libs/models/brush/gl_model_brush.c
index 9c1057226..2c95cbe64 100644
--- a/libs/models/brush/gl_model_brush.c
+++ b/libs/models/brush/gl_model_brush.c
@@ -51,22 +51,6 @@
 #include "mod_internal.h"
 #include "r_internal.h"
 
-
-void
-gl_Mod_ProcessTexture (texture_t *tx)
-{
-	const char *name;
-
-	if (!strncmp (tx->name, "sky", 3))
-		return;
-	name = va ("fb_%s", tx->name);
-	tx->gl_fb_texturenum =
-		Mod_Fullbright ((byte *) (tx + 1), tx->width, tx->height, name);
-	tx->gl_texturenum =
-		GL_LoadTexture (tx->name, tx->width, tx->height, (byte *) (tx + 1),
-						true, false, 1);
-}
-
 static tex_t *
 Mod_LoadAnExternalTexture (char *tname, char *mname)
 {
@@ -92,44 +76,59 @@ Mod_LoadAnExternalTexture (char *tname, char *mname)
 	return image;
 }
 
-void
-gl_Mod_LoadExternalTextures (model_t *mod)
+static int
+Mod_LoadExternalTextures (model_t *mod, texture_t *tx)
 {
-	int			i;
 	tex_t	   *base, *luma;
-	texture_t  *tx;
+	int         external = 0;
+	if ((base = Mod_LoadAnExternalTexture (tx->name, mod->name))) {
+		external = 1;
+		tx->gl_texturenum =
+			GL_LoadTexture (tx->name, base->width, base->height,
+							base->data, true, false,
+							base->format > 2 ? base->format : 1);
 
-	for (i = 0; i < mod->numtextures; i++) {
-		tx = mod->textures[i];
-		if (!tx)
-			continue;
-
-		if ((base = Mod_LoadAnExternalTexture (tx->name, mod->name))) {
-			tx->gl_texturenum =
-				GL_LoadTexture (tx->name, base->width, base->height,
-								base->data, true, false,
-								base->format > 2 ? base->format : 1);
-
-			luma = Mod_LoadAnExternalTexture (va ("%s_luma", tx->name),
+		luma = Mod_LoadAnExternalTexture (va ("%s_luma", tx->name),
+										  mod->name);
+		if (!luma)
+			luma = Mod_LoadAnExternalTexture (va ("%s_glow", tx->name),
 											  mod->name);
-			if (!luma)
-				luma = Mod_LoadAnExternalTexture (va ("%s_glow", tx->name),
-												  mod->name);
 
-			tx->gl_fb_texturenum = 0;
+		tx->gl_fb_texturenum = 0;
 
-			if (luma) {
-				tx->gl_fb_texturenum =
-					GL_LoadTexture (va ("fb_%s", tx->name), luma->width,
-									luma->height, luma->data, true, true,
-									luma->format > 2 ? luma->format : 1);
-			} else if (base->format < 3) {
-				tx->gl_fb_texturenum =
-					Mod_Fullbright (base->data, base->width, base->height,
-									va ("fb_%s", tx->name));
-			}
+		if (luma) {
+			tx->gl_fb_texturenum =
+				GL_LoadTexture (va ("fb_%s", tx->name), luma->width,
+								luma->height, luma->data, true, true,
+								luma->format > 2 ? luma->format : 1);
+		} else if (base->format < 3) {
+			tx->gl_fb_texturenum =
+				Mod_Fullbright (base->data, base->width, base->height,
+								va ("fb_%s", tx->name));
 		}
 	}
+	return external;
+}
+
+void
+gl_Mod_ProcessTexture (texture_t *tx)
+{
+	const char *name;
+
+	if (gl_textures_external && gl_textures_external->int_val) {
+		if (Mod_LoadExternalTextures (loadmodel, tx)) {
+			return;
+		}
+	}
+	if (strncmp (tx->name, "sky", 3) == 0) {
+		return;
+	}
+	name = va ("fb_%s", tx->name);
+	tx->gl_fb_texturenum =
+		Mod_Fullbright ((byte *) (tx + 1), tx->width, tx->height, name);
+	tx->gl_texturenum =
+		GL_LoadTexture (tx->name, tx->width, tx->height, (byte *) (tx + 1),
+						true, false, 1);
 }
 
 void
diff --git a/libs/models/model.c b/libs/models/model.c
index bac0223de..d8ce5df03 100644
--- a/libs/models/model.c
+++ b/libs/models/model.c
@@ -231,10 +231,6 @@ Mod_RealLoadModel (model_t *mod, qboolean crash, cache_allocator_t allocator)
 		default:					// Version 29: Quake 1 .bsp
 									// Version 38: Quake 2 .bsp
 			Mod_LoadBrushModel (mod, buf);
-
-			if (gl_textures_external && gl_textures_external->int_val
-				&& mod_funcs && mod_funcs->Mod_LoadExternalTextures)
-				mod_funcs->Mod_LoadExternalTextures (mod);
 			break;
 	}
 	free (buf);
diff --git a/libs/video/renderer/vid_render_gl.c b/libs/video/renderer/vid_render_gl.c
index 852a0a423..8e12a67ec 100644
--- a/libs/video/renderer/vid_render_gl.c
+++ b/libs/video/renderer/vid_render_gl.c
@@ -46,7 +46,6 @@
 gl_ctx_t *gl_ctx;
 
 static vid_model_funcs_t model_funcs = {
-	gl_Mod_LoadExternalTextures,
 	gl_Mod_LoadLighting,
 	gl_Mod_SubdivideSurface,
 	gl_Mod_ProcessTexture,
diff --git a/libs/video/renderer/vid_render_glsl.c b/libs/video/renderer/vid_render_glsl.c
index 6d6c87b3a..be427f3ca 100644
--- a/libs/video/renderer/vid_render_glsl.c
+++ b/libs/video/renderer/vid_render_glsl.c
@@ -46,7 +46,6 @@
 gl_ctx_t *glsl_ctx;
 
 static vid_model_funcs_t model_funcs = {
-	0,//Mod_LoadExternalTextures,
 	glsl_Mod_LoadLighting,
 	0,//Mod_SubdivideSurface,
 	glsl_Mod_ProcessTexture,
diff --git a/libs/video/renderer/vid_render_sw.c b/libs/video/renderer/vid_render_sw.c
index 8c5360701..e30ef9e2e 100644
--- a/libs/video/renderer/vid_render_sw.c
+++ b/libs/video/renderer/vid_render_sw.c
@@ -39,7 +39,6 @@
 sw_ctx_t *sw_ctx;
 
 static vid_model_funcs_t model_funcs = {
-	0,//Mod_LoadExternalTextures,
 	sw_Mod_LoadLighting,
 	0,//Mod_SubdivideSurface,
 	0,//Mod_ProcessTexture,
diff --git a/libs/video/renderer/vid_render_sw32.c b/libs/video/renderer/vid_render_sw32.c
index af72bc0df..895098065 100644
--- a/libs/video/renderer/vid_render_sw32.c
+++ b/libs/video/renderer/vid_render_sw32.c
@@ -44,7 +44,6 @@
 sw_ctx_t *sw32_ctx;
 
 static vid_model_funcs_t model_funcs = {
-	0,//Mod_LoadExternalTextures,
 	sw_Mod_LoadLighting,
 	0,//Mod_SubdivideSurface,
 	0,//Mod_ProcessTexture,
diff --git a/libs/video/renderer/vid_render_vulkan.c b/libs/video/renderer/vid_render_vulkan.c
index 80ccf0127..8cfb7926a 100644
--- a/libs/video/renderer/vid_render_vulkan.c
+++ b/libs/video/renderer/vid_render_vulkan.c
@@ -385,11 +385,6 @@ vulkan_r_particles_style_f (struct cvar_s *var)
 	Vulkan_r_particles_style_f (var, vulkan_ctx);
 }
 
-static void
-vulkan_Mod_LoadExternalTextures (model_t *mod)
-{
-}
-
 static void
 vulkan_Mod_LoadLighting (bsp_t *bsp)
 {
@@ -454,7 +449,6 @@ vulkan_Skin_InitTranslations (void)
 }
 
 static vid_model_funcs_t model_funcs = {
-	vulkan_Mod_LoadExternalTextures,
 	vulkan_Mod_LoadLighting,
 	vulkan_Mod_SubdivideSurface,
 	vulkan_Mod_ProcessTexture,

From 6e0cb7b917c951b2d42555156160bbf8de3152c9 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 19 Jan 2021 13:05:39 +0900
Subject: [PATCH 1327/1519] [model] Isolate renderer specific texture data

This cleans up texture_t and possibly even improves locality of
reference when running through texture chains (not profiled, and not
actually the goal).
---
 include/QF/model.h                      | 12 ++-----
 include/QF/plugin/vid_render.h          |  1 +
 include/mod_internal.h                  |  3 --
 include/r_internal.h                    | 27 +++++++++++++++
 libs/models/brush/gl_model_brush.c      | 22 ++++++++----
 libs/models/brush/glsl_model_brush.c    | 32 ++++++++++++------
 libs/models/brush/model_brush.c         | 16 ++++++++-
 libs/video/renderer/gl/gl_rsurf.c       | 29 +++++++++-------
 libs/video/renderer/glsl/glsl_bsp.c     | 45 +++++++++++++------------
 libs/video/renderer/vid_render_gl.c     |  1 +
 libs/video/renderer/vid_render_glsl.c   |  1 +
 libs/video/renderer/vid_render_sw.c     |  1 +
 libs/video/renderer/vid_render_sw32.c   |  1 +
 libs/video/renderer/vid_render_vulkan.c |  1 +
 14 files changed, 130 insertions(+), 62 deletions(-)

diff --git a/include/QF/model.h b/include/QF/model.h
index d4b243241..e8cb22367 100644
--- a/include/QF/model.h
+++ b/include/QF/model.h
@@ -91,19 +91,13 @@ typedef struct instsurf_s {
 
 typedef struct texture_s {
 	char		*name;
-	unsigned int	width, height;
-	int			gl_texturenum;
-	int			gl_fb_texturenum;
-	int         sky_tex[2];
-	instsurf_t *tex_chain;	// for gl_texsort drawing
-	instsurf_t **tex_chain_tail;
-	struct elechain_s *elechain;
-	struct elechain_s **elechain_tail;
+	unsigned    width, height;
+	void       *render;		// renderer specific data
 	int			anim_total;				// total tenths in sequence ( 0 = no)
 	int			anim_min, anim_max;		// time for this frame min <=time< max
 	struct texture_s *anim_next;		// in the animation sequence
 	struct texture_s *alternate_anims;	// bmodels in frmae 1 use these
-	unsigned int	offsets[MIPLEVELS];		// four mip maps stored
+	unsigned    offsets[MIPLEVELS];		// four mip maps stored
 } texture_t;
 
 
diff --git a/include/QF/plugin/vid_render.h b/include/QF/plugin/vid_render.h
index 447bc8ce6..b2ea3d224 100644
--- a/include/QF/plugin/vid_render.h
+++ b/include/QF/plugin/vid_render.h
@@ -80,6 +80,7 @@ typedef struct vid_particle_funcs_s {
 } vid_particle_funcs_t;
 
 typedef struct vid_model_funcs_s {
+	size_t      texture_render_size;// size of renderer specific texture data
 	void (*Mod_LoadLighting) (bsp_t *bsp);
 	void (*Mod_SubdivideSurface) (msurface_t *fa);
 	void (*Mod_ProcessTexture) (texture_t *tx);
diff --git a/include/mod_internal.h b/include/mod_internal.h
index 2dbf624bf..125da1065 100644
--- a/include/mod_internal.h
+++ b/include/mod_internal.h
@@ -37,12 +37,9 @@ void gl_Mod_SubdivideSurface (msurface_t *fa);
 void gl_Mod_ProcessTexture(texture_t *tx);
 
 void glsl_Mod_LoadLighting (bsp_t *bsp);
-void glsl_Mod_SubdivideSurface (msurface_t *fa);
 void glsl_Mod_ProcessTexture(texture_t *tx);
 
 void sw_Mod_LoadLighting (bsp_t *bsp);
-void sw_Mod_SubdivideSurface (msurface_t *fa);
-void sw_Mod_ProcessTexture(texture_t *tx);
 
 void gl_Mod_SpriteLoadTexture (mspriteframe_t *pspriteframe, int framenum);
 void glsl_Mod_SpriteLoadTexture (mspriteframe_t *pspriteframe, int framenum);
diff --git a/include/r_internal.h b/include/r_internal.h
index b38f1706c..37edbbdd2 100644
--- a/include/r_internal.h
+++ b/include/r_internal.h
@@ -9,6 +9,33 @@
 #include "r_screen.h"
 #include "r_shared.h"
 
+typedef struct gltex_s {
+	texture_t  *texture;
+	int			gl_texturenum;
+	int			gl_fb_texturenum;
+	instsurf_t *tex_chain;	// for gl_texsort drawing
+	instsurf_t **tex_chain_tail;
+} gltex_t;
+
+typedef struct glsltex_s {
+	texture_t  *texture;
+	int			gl_texturenum;
+	int         sky_tex[2];
+	instsurf_t *tex_chain;	// for gl_texsort drawing
+	instsurf_t **tex_chain_tail;
+	struct elechain_s *elechain;
+	struct elechain_s **elechain_tail;
+} glsltex_t;
+
+typedef struct vulktex_s {
+	texture_t  *texture;
+	struct qfv_tex_s *tex;
+	instsurf_t *tex_chain;	// for gl_texsort drawing
+	instsurf_t **tex_chain_tail;
+	struct elechain_s *elechain;
+	struct elechain_s **elechain_tail;
+} vulktex_t;
+
 extern viddef_t 		vid;				// global video state
 
 extern vid_render_data_t vid_render_data;
diff --git a/libs/models/brush/gl_model_brush.c b/libs/models/brush/gl_model_brush.c
index 2c95cbe64..1d7d04634 100644
--- a/libs/models/brush/gl_model_brush.c
+++ b/libs/models/brush/gl_model_brush.c
@@ -51,6 +51,8 @@
 #include "mod_internal.h"
 #include "r_internal.h"
 
+static gltex_t gl_notexture = { };
+
 static tex_t *
 Mod_LoadAnExternalTexture (char *tname, char *mname)
 {
@@ -80,10 +82,13 @@ static int
 Mod_LoadExternalTextures (model_t *mod, texture_t *tx)
 {
 	tex_t	   *base, *luma;
+	gltex_t    *gltx;
 	int         external = 0;
+
+	gltx = tx->render;
 	if ((base = Mod_LoadAnExternalTexture (tx->name, mod->name))) {
 		external = 1;
-		tx->gl_texturenum =
+		gltx->gl_texturenum =
 			GL_LoadTexture (tx->name, base->width, base->height,
 							base->data, true, false,
 							base->format > 2 ? base->format : 1);
@@ -94,15 +99,15 @@ Mod_LoadExternalTextures (model_t *mod, texture_t *tx)
 			luma = Mod_LoadAnExternalTexture (va ("%s_glow", tx->name),
 											  mod->name);
 
-		tx->gl_fb_texturenum = 0;
+		gltx->gl_fb_texturenum = 0;
 
 		if (luma) {
-			tx->gl_fb_texturenum =
+			gltx->gl_fb_texturenum =
 				GL_LoadTexture (va ("fb_%s", tx->name), luma->width,
 								luma->height, luma->data, true, true,
 								luma->format > 2 ? luma->format : 1);
 		} else if (base->format < 3) {
-			tx->gl_fb_texturenum =
+			gltx->gl_fb_texturenum =
 				Mod_Fullbright (base->data, base->width, base->height,
 								va ("fb_%s", tx->name));
 		}
@@ -115,6 +120,10 @@ gl_Mod_ProcessTexture (texture_t *tx)
 {
 	const char *name;
 
+	if (!tx) {
+		r_notexture_mip->render = &gl_notexture;
+		return;
+	}
 	if (gl_textures_external && gl_textures_external->int_val) {
 		if (Mod_LoadExternalTextures (loadmodel, tx)) {
 			return;
@@ -123,10 +132,11 @@ gl_Mod_ProcessTexture (texture_t *tx)
 	if (strncmp (tx->name, "sky", 3) == 0) {
 		return;
 	}
+	gltex_t    *gltex = tx->render;
 	name = va ("fb_%s", tx->name);
-	tx->gl_fb_texturenum =
+	gltex->gl_fb_texturenum =
 		Mod_Fullbright ((byte *) (tx + 1), tx->width, tx->height, name);
-	tx->gl_texturenum =
+	gltex->gl_texturenum =
 		GL_LoadTexture (tx->name, tx->width, tx->height, (byte *) (tx + 1),
 						true, false, 1);
 }
diff --git a/libs/models/brush/glsl_model_brush.c b/libs/models/brush/glsl_model_brush.c
index 67fff7b44..e839f5317 100644
--- a/libs/models/brush/glsl_model_brush.c
+++ b/libs/models/brush/glsl_model_brush.c
@@ -57,6 +57,9 @@
 
 #include "compat.h"
 #include "mod_internal.h"
+#include "r_internal.h"
+
+static glsltex_t glsl_notexture = { };
 
 static void
 glsl_brush_clear (model_t *m)
@@ -66,11 +69,15 @@ glsl_brush_clear (model_t *m)
 	m->needload = true;
 	for (i = 0; i < m->numtextures; i++) {
 		// NOTE: some maps (eg e1m2) have empty texture slots
-		if (m->textures[i] && m->textures[i]->gl_texturenum) {
-			GLSL_ReleaseTexture (m->textures[i]->gl_texturenum);
-			GLSL_ReleaseTexture (m->textures[i]->sky_tex[0]);
-			GLSL_ReleaseTexture (m->textures[i]->sky_tex[1]);
-			m->textures[i]->gl_texturenum = 0;
+		glsltex_t  *tex = 0;
+		if (m->textures[i]) {
+			tex = m->textures[i]->render;
+		}
+		if (tex && tex->gl_texturenum) {
+			GLSL_ReleaseTexture (tex->gl_texturenum);
+			GLSL_ReleaseTexture (tex->sky_tex[0]);
+			GLSL_ReleaseTexture (tex->sky_tex[1]);
+			tex->gl_texturenum = 0;
 		}
 	}
 	for (i = 0; i < m->numsurfaces; i++) {
@@ -96,6 +103,11 @@ load_skytex (texture_t *tx, byte *data)
 void
 glsl_Mod_ProcessTexture (texture_t *tx)
 {
+	if (!tx) {
+		r_notexture_mip->render = &glsl_notexture;
+		return;
+	}
+	glsltex_t  *tex = tx->render;
 	if (!strncmp (tx->name, "sky", 3)) {
 		// sky textures need to be loaded as two separate textures to allow
 		// wrapping on both sky layers.
@@ -112,23 +124,23 @@ glsl_Mod_ProcessTexture (texture_t *tx)
 			// a square sky texture probably means it's black, but just in
 			// case some other magic is being done, duplicate the square to
 			// both sky layers.
-			tx->sky_tex[0] = load_skytex (tx, tx_data);
-			tx->sky_tex[1] = tx->sky_tex[0];
+			tex->sky_tex[0] = load_skytex (tx, tx_data);
+			tex->sky_tex[1] = tex->sky_tex[0];
 		} else if (tx_w == 2 * tx_h) {
 			data = alloca (tx_h * tx_h);
 			for (i = 0; i < 2; i++) {
 				for (j = 0; j < tx_h; j++)
 					memcpy (&data[j * tx_h], &tx_data[j * tx_w + i * tx_h],
 							tx_h);
-				tx->sky_tex[i] = load_skytex (tx, data);
+				tex->sky_tex[i] = load_skytex (tx, data);
 			}
-			tx->gl_texturenum = 0;
+			tex->gl_texturenum = 0;
 		} else {
 			Sys_Error ("Mod_ProcessTexture: invalid sky texture: %dx%d\n",
 					   tx_w, tx_h);
 		}
 	} else {
-		tx->gl_texturenum = GLSL_LoadQuakeMipTex (tx);
+		tex->gl_texturenum = GLSL_LoadQuakeMipTex (tx);
 	}
 }
 
diff --git a/libs/models/brush/model_brush.c b/libs/models/brush/model_brush.c
index 19d28a8c6..f3ab08689 100644
--- a/libs/models/brush/model_brush.c
+++ b/libs/models/brush/model_brush.c
@@ -204,8 +204,22 @@ Mod_LoadTextures (bsp_t *bsp)
 
 		if (!strncmp (mt->name, "sky", 3))
 			loadmodel->skytexture = tx;
-		if (mod_funcs && mod_funcs->Mod_ProcessTexture)
+	}
+	if (mod_funcs && mod_funcs->Mod_ProcessTexture) {
+		size_t      render_size = mod_funcs->texture_render_size;
+		byte       *render_data = 0;
+		if (render_size) {
+			render_data = Hunk_AllocName (m->nummiptex * render_size,
+										  loadname);
+		}
+		for (i = 0; i < m->nummiptex; i++) {
+			tx = loadmodel->textures[i];
+			tx->render = render_data;
+			render_data += render_size;
 			mod_funcs->Mod_ProcessTexture (tx);
+		}
+		// signal the end of the textures
+		mod_funcs->Mod_ProcessTexture (0);
 	}
 
 	// sequence the animations
diff --git a/libs/video/renderer/gl/gl_rsurf.c b/libs/video/renderer/gl/gl_rsurf.c
index 3cfb3c49b..f673e4cc4 100644
--- a/libs/video/renderer/gl/gl_rsurf.c
+++ b/libs/video/renderer/gl/gl_rsurf.c
@@ -85,7 +85,7 @@ static instsurf_t **sky_chain_tail;
 		(chain) = inst;										\
 	} while (0)
 
-static texture_t **r_texture_chains;
+static gltex_t   **r_texture_chains;
 static int  r_num_texture_chains;
 static int  max_texture_chains;
 
@@ -129,16 +129,17 @@ release_instsurfs (void)
 }
 
 void
-gl_R_AddTexture (texture_t *tex)
+gl_R_AddTexture (texture_t *tx)
 {
 	int         i;
 	if (r_num_texture_chains == max_texture_chains) {
 		max_texture_chains += 64;
 		r_texture_chains = realloc (r_texture_chains,
-								  max_texture_chains * sizeof (texture_t *));
+								  max_texture_chains * sizeof (gltex_t *));
 		for (i = r_num_texture_chains; i < max_texture_chains; i++)
 			r_texture_chains[i] = 0;
 	}
+	gltex_t    *tex = tx->render;
 	r_texture_chains[r_num_texture_chains++] = tex;
 	tex->tex_chain = NULL;
 	tex->tex_chain_tail = &tex->tex_chain;
@@ -174,7 +175,7 @@ R_RenderFullbrights (void)
 	int         i, j;
 	glpoly_t   *p;
 	instsurf_t *sc;
-	texture_t  *tex;
+	gltex_t    *tex;
 
 	for (i = 0; i < r_num_texture_chains; i++) {
 		if (!(tex = r_texture_chains[i]) || !tex->gl_fb_texturenum)
@@ -332,13 +333,15 @@ gl_R_DrawWaterSurfaces (void)
 
 	i = -1;
 	for (s = waterchain; s; s = s->tex_chain) {
+		gltex_t    *tex;
 		fa = s->surface;
 		if (s->transform)
 			qfglLoadMatrixf (s->transform);
 		else
 			qfglLoadMatrixf (gl_r_world_matrix);
-		if (i != fa->texinfo->texture->gl_texturenum) {
-			i = fa->texinfo->texture->gl_texturenum;
+		tex = fa->texinfo->texture->render;
+		if (i != tex->gl_texturenum) {
+			i = tex->gl_texturenum;
 			qfglBindTexture (GL_TEXTURE_2D, i);
 		}
 		GL_EmitWaterPolys (fa);
@@ -360,7 +363,7 @@ DrawTextureChains (int disable_blend, int do_bind)
 	int			i;
 	instsurf_t *s;
 	msurface_t *fa;
-	texture_t  *tex;
+	gltex_t    *tex;
 
 	if (gl_mtex_active_tmus >= 2) {
 		// Lightmaps
@@ -469,7 +472,7 @@ static void
 clear_texture_chains (void)
 {
 	int			i;
-	texture_t  *tex;
+	gltex_t    *tex;
 
 	for (i = 0; i < r_num_texture_chains; i++) {
 		tex = r_texture_chains[i];
@@ -478,7 +481,7 @@ clear_texture_chains (void)
 		tex->tex_chain = NULL;
 		tex->tex_chain_tail = &tex->tex_chain;
 	}
-	tex = r_notexture_mip;
+	tex = r_notexture_mip->render;
 	tex->tex_chain = NULL;
 	tex->tex_chain_tail = &tex->tex_chain;
 	release_instsurfs ();
@@ -496,12 +499,14 @@ chain_surface (msurface_t *surf, vec_t *transform, float *color)
 	} else if (surf->flags & SURF_DRAWSKY) {
 		CHAIN_SURF_F2B (surf, sky_chain);
 	} else {
-		texture_t  *tex;
+		texture_t  *tx;
+		gltex_t    *tex;
 
 		if (!surf->texinfo->texture->anim_total)
-			tex = surf->texinfo->texture;
+			tx = surf->texinfo->texture;
 		else
-			tex = R_TextureAnimation (surf);
+			tx = R_TextureAnimation (surf);
+		tex = tx->render;
 		CHAIN_SURF_F2B (surf, tex->tex_chain);
 
 		R_AddToLightmapChain (surf);
diff --git a/libs/video/renderer/glsl/glsl_bsp.c b/libs/video/renderer/glsl/glsl_bsp.c
index 0dc19103e..409450901 100644
--- a/libs/video/renderer/glsl/glsl_bsp.c
+++ b/libs/video/renderer/glsl/glsl_bsp.c
@@ -73,7 +73,7 @@ static instsurf_t **waterchain_tail = &waterchain;
 static instsurf_t  *sky_chain;
 static instsurf_t **sky_chain_tail = &sky_chain;
 
-static texture_t  **r_texture_chains;
+static glsltex_t  **r_texture_chains;
 static int          r_num_texture_chains;
 static int          max_texture_chains;
 
@@ -293,16 +293,17 @@ GET_RELEASE (instsurf_t, static_instsurf)
 GET_RELEASE (instsurf_t, instsurf)
 
 void
-glsl_R_AddTexture (texture_t *tex)
+glsl_R_AddTexture (texture_t *tx)
 {
 	int         i;
 	if (r_num_texture_chains == max_texture_chains) {
 		max_texture_chains += 64;
 		r_texture_chains = realloc (r_texture_chains,
-								  max_texture_chains * sizeof (texture_t *));
+								  max_texture_chains * sizeof (glsltex_t *));
 		for (i = r_num_texture_chains; i < max_texture_chains; i++)
 			r_texture_chains[i] = 0;
 	}
+	glsltex_t  *tex = tx->render;
 	r_texture_chains[r_num_texture_chains++] = tex;
 	tex->tex_chain = 0;
 	tex->tex_chain_tail = &tex->tex_chain;
@@ -325,7 +326,7 @@ glsl_R_InitSurfaceChains (model_t *model)
 }
 
 static inline void
-clear_tex_chain (texture_t *tex)
+clear_tex_chain (glsltex_t *tex)
 {
 	tex->tex_chain = 0;
 	tex->tex_chain_tail = &tex->tex_chain;
@@ -343,7 +344,7 @@ clear_texture_chains (void)
 			continue;
 		clear_tex_chain (r_texture_chains[i]);
 	}
-	clear_tex_chain (r_notexture_mip);
+	clear_tex_chain (r_notexture_mip->render);
 	release_elechains ();
 	release_elementss ();
 	release_instsurfs ();
@@ -382,12 +383,14 @@ chain_surface (msurface_t *surf, vec_t *transform, float *color)
 	} else if ((surf->flags & SURF_DRAWTURB) || (color && color[3] < 1.0)) {
 		CHAIN_SURF_B2F (surf, waterchain);
 	} else {
-		texture_t  *tex;
+		texture_t  *tx;
+		glsltex_t  *tex;
 
 		if (!surf->texinfo->texture->anim_total)
-			tex = surf->texinfo->texture;
+			tx = surf->texinfo->texture;
 		else
-			tex = R_TextureAnimation (surf);
+			tx = R_TextureAnimation (surf);
+		tex = tx->render;
 		CHAIN_SURF_F2B (surf, tex->tex_chain);
 
 		update_lightmap (surf);
@@ -444,7 +447,7 @@ glsl_R_RegisterTextures (model_t **models, int num_models)
 }
 
 static elechain_t *
-add_elechain (texture_t *tex, int ec_index)
+add_elechain (glsltex_t *tex, int ec_index)
 {
 	elechain_t *ec;
 
@@ -563,7 +566,7 @@ glsl_R_BuildDisplayLists (model_t **models, int num_models)
 		// non-bsp models don't have surfaces.
 		dm = m->submodels;
 		for (j = 0; j < m->numsurfaces; j++) {
-			texture_t  *tex;
+			glsltex_t  *tex;
 			if (j == dm->firstface + dm->numfaces) {
 				dm++;
 				if (dm - m->submodels == m->numsubmodels) {
@@ -578,7 +581,7 @@ glsl_R_BuildDisplayLists (model_t **models, int num_models)
 			surf->ec_index = dm - m->submodels;
 			if (!surf->ec_index && m != r_worldentity.model)
 				surf->ec_index = -1 - i;	// instanced model
-			tex = surf->texinfo->texture;
+			tex = surf->texinfo->texture->render;
 			CHAIN_SURF_F2B (surf, tex->tex_chain);
 		}
 	}
@@ -590,7 +593,7 @@ glsl_R_BuildDisplayLists (model_t **models, int num_models)
 	// For animated textures, if a surface is on one texture of the group, it
 	// will be on all.
 	for (i = 0; i < r_num_texture_chains; i++) {
-		texture_t  *tex;
+		glsltex_t  *tex;
 		instsurf_t *is;
 		elechain_t *ec = 0;
 		elements_t *el = 0;
@@ -1057,7 +1060,7 @@ sky_end (void)
 }
 
 static inline void
-add_surf_elements (texture_t *tex, instsurf_t *is,
+add_surf_elements (glsltex_t *tex, instsurf_t *is,
 				   elechain_t **ec, elements_t **el)
 {
 	msurface_t *surf = is->surface;
@@ -1096,7 +1099,7 @@ add_surf_elements (texture_t *tex, instsurf_t *is,
 }
 
 static void
-build_tex_elechain (texture_t *tex)
+build_tex_elechain (glsltex_t *tex)
 {
 	instsurf_t *is;
 	elechain_t *ec = 0;
@@ -1136,7 +1139,7 @@ glsl_R_DrawWorld (void)
 	bsp_begin ();
 	qfeglActiveTexture (GL_TEXTURE0 + 0);
 	for (i = 0; i < r_num_texture_chains; i++) {
-		texture_t  *tex;
+		glsltex_t  *tex;
 		elechain_t *ec = 0;
 
 		tex = r_texture_chains[i];
@@ -1163,7 +1166,7 @@ glsl_R_DrawWaterSurfaces ()
 {
 	instsurf_t *is;
 	msurface_t *surf;
-	texture_t  *tex = 0;
+	glsltex_t  *tex = 0;
 	elechain_t *ec = 0;
 	elements_t *el = 0;
 
@@ -1173,7 +1176,7 @@ glsl_R_DrawWaterSurfaces ()
 	turb_begin ();
 	for (is = waterchain; is; is = is->tex_chain) {
 		surf = is->surface;
-		if (tex != surf->texinfo->texture) {
+		if (tex != surf->texinfo->texture->render) {
 			if (tex) {
 				qfeglBindTexture (GL_TEXTURE_2D, tex->gl_texturenum);
 				for (ec = tex->elechain; ec; ec = ec->next)
@@ -1184,7 +1187,7 @@ glsl_R_DrawWaterSurfaces ()
 				tex->elechain = 0;
 				tex->elechain_tail = &tex->elechain;
 			}
-			tex = surf->texinfo->texture;
+			tex = surf->texinfo->texture->render;
 		}
 		add_surf_elements (tex, is, &ec, &el);
 	}
@@ -1209,7 +1212,7 @@ glsl_R_DrawSky (void)
 {
 	instsurf_t *is;
 	msurface_t *surf;
-	texture_t  *tex = 0;
+	glsltex_t  *tex = 0;
 	elechain_t *ec = 0;
 	elements_t *el = 0;
 
@@ -1219,7 +1222,7 @@ glsl_R_DrawSky (void)
 	sky_begin ();
 	for (is = sky_chain; is; is = is->tex_chain) {
 		surf = is->surface;
-		if (tex != surf->texinfo->texture) {
+		if (tex != surf->texinfo->texture->render) {
 			if (tex) {
 				if (!skybox_loaded) {
 					qfeglActiveTexture (GL_TEXTURE0 + 0);
@@ -1233,7 +1236,7 @@ glsl_R_DrawSky (void)
 				tex->elechain = 0;
 				tex->elechain_tail = &tex->elechain;
 			}
-			tex = surf->texinfo->texture;
+			tex = surf->texinfo->texture->render;
 		}
 		add_surf_elements (tex, is, &ec, &el);
 	}
diff --git a/libs/video/renderer/vid_render_gl.c b/libs/video/renderer/vid_render_gl.c
index 8e12a67ec..584f03ada 100644
--- a/libs/video/renderer/vid_render_gl.c
+++ b/libs/video/renderer/vid_render_gl.c
@@ -46,6 +46,7 @@
 gl_ctx_t *gl_ctx;
 
 static vid_model_funcs_t model_funcs = {
+	sizeof (gltex_t),
 	gl_Mod_LoadLighting,
 	gl_Mod_SubdivideSurface,
 	gl_Mod_ProcessTexture,
diff --git a/libs/video/renderer/vid_render_glsl.c b/libs/video/renderer/vid_render_glsl.c
index be427f3ca..d8abed43e 100644
--- a/libs/video/renderer/vid_render_glsl.c
+++ b/libs/video/renderer/vid_render_glsl.c
@@ -46,6 +46,7 @@
 gl_ctx_t *glsl_ctx;
 
 static vid_model_funcs_t model_funcs = {
+	sizeof (glsltex_t),
 	glsl_Mod_LoadLighting,
 	0,//Mod_SubdivideSurface,
 	glsl_Mod_ProcessTexture,
diff --git a/libs/video/renderer/vid_render_sw.c b/libs/video/renderer/vid_render_sw.c
index e30ef9e2e..0ef7a0108 100644
--- a/libs/video/renderer/vid_render_sw.c
+++ b/libs/video/renderer/vid_render_sw.c
@@ -39,6 +39,7 @@
 sw_ctx_t *sw_ctx;
 
 static vid_model_funcs_t model_funcs = {
+	0,
 	sw_Mod_LoadLighting,
 	0,//Mod_SubdivideSurface,
 	0,//Mod_ProcessTexture,
diff --git a/libs/video/renderer/vid_render_sw32.c b/libs/video/renderer/vid_render_sw32.c
index 895098065..a3fe10d97 100644
--- a/libs/video/renderer/vid_render_sw32.c
+++ b/libs/video/renderer/vid_render_sw32.c
@@ -44,6 +44,7 @@
 sw_ctx_t *sw32_ctx;
 
 static vid_model_funcs_t model_funcs = {
+	0,
 	sw_Mod_LoadLighting,
 	0,//Mod_SubdivideSurface,
 	0,//Mod_ProcessTexture,
diff --git a/libs/video/renderer/vid_render_vulkan.c b/libs/video/renderer/vid_render_vulkan.c
index 8cfb7926a..717809012 100644
--- a/libs/video/renderer/vid_render_vulkan.c
+++ b/libs/video/renderer/vid_render_vulkan.c
@@ -449,6 +449,7 @@ vulkan_Skin_InitTranslations (void)
 }
 
 static vid_model_funcs_t model_funcs = {
+	sizeof (vulktex_t),
 	vulkan_Mod_LoadLighting,
 	vulkan_Mod_SubdivideSurface,
 	vulkan_Mod_ProcessTexture,

From 7a353d5aeeecee59f42b1ac9ffd04d3d2b96b3d9 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 19 Jan 2021 13:53:08 +0900
Subject: [PATCH 1328/1519] [model] Build vulkan model libs

The contents are currently empty (required .c files), but this gets the
build system updated.
---
 config.d/build_control.m4                | 29 +++++++++++++++---------
 libs/models/Makemodule.am                | 17 +++++++++++++-
 libs/models/alias/Makemodule.am          | 15 ++++++++++--
 libs/models/alias/vulkan_model_alias.c   |  0
 libs/models/brush/Makemodule.am          | 16 +++++++++++--
 libs/models/brush/vulkan_model_brush.c   |  0
 libs/models/iqm/Makemodule.am            | 16 +++++++++++--
 libs/models/iqm/vulkan_model_iqm.c       |  0
 libs/models/sprite/Makemodule.am         | 16 +++++++++++--
 libs/models/sprite/vulkan_model_sprite.c |  0
 libs/models/vulkan_skin.c                |  0
 libs/video/renderer/Makemodule.am        |  7 +++---
 12 files changed, 93 insertions(+), 23 deletions(-)
 create mode 100644 libs/models/alias/vulkan_model_alias.c
 create mode 100644 libs/models/brush/vulkan_model_brush.c
 create mode 100644 libs/models/iqm/vulkan_model_iqm.c
 create mode 100644 libs/models/sprite/vulkan_model_sprite.c
 create mode 100644 libs/models/vulkan_skin.c

diff --git a/config.d/build_control.m4 b/config.d/build_control.m4
index d67d50033..be71d59f4 100644
--- a/config.d/build_control.m4
+++ b/config.d/build_control.m4
@@ -72,10 +72,14 @@ if test "x$HAVE_X" = xyes; then
 		CL_TARGETS="$CL_TARGETS X11"
 		VID_TARGETS="$VID_TARGETS libs/video/targets/libQFx11.la"
 		if test "$HAVE_VULKAN" = "yes"; then
-			QF_NEED(vid_render, [sw sw32 gl glsl vulkan])
-		else
-			QF_NEED(vid_render, [sw sw32 gl glsl])
+			QF_NEED(vid_render, [vulkan])
+			QF_NEED(models, [vulkan])
+			QF_NEED(alias, [vulkan])
+			QF_NEED(brush, [vulkan])
+			QF_NEED(iqm, [vulkan])
+			QF_NEED(sprite, [vulkan])
 		fi
+		QF_NEED(vid_render, [sw sw32 gl glsl])
 		QF_NEED(models, [sw gl glsl])
 		QF_NEED(alias, [sw gl glsl])
 		QF_NEED(brush, [sw gl glsl])
@@ -100,10 +104,13 @@ if test "x$HAVE_SDL" = xyes; then
 		CL_TARGETS="$CL_TARGETS SDL"
 		VID_TARGETS="$VID_TARGETS libs/video/targets/libQFsdl.la"
 		if test "$HAVE_VULKAN" = "yes"; then
-			QF_NEED(vid_render, [sw sw32 gl glsl vulkan])
-		else
-			QF_NEED(vid_render, [sw sw32 gl glsl])
+			QF_NEED(vid_render, [vulkan])
+			QF_NEED(alias, [vulkan])
+			QF_NEED(brush, [vulkan])
+			QF_NEED(iqm, [vulkan])
+			QF_NEED(sprite, [vulkan])
 		fi
+		QF_NEED(vid_render, [sw sw32 gl glsl])
 		QF_NEED(models, [sw gl glsl])
 		QF_NEED(alias, [sw gl glsl])
 		QF_NEED(brush, [sw gl glsl])
@@ -291,11 +298,11 @@ QF_PROCESS_NEED_DIRS(top, [libs hw nq qtv qw tools ruamoko])
 
 QF_PROCESS_NEED_LIBS(swrend, [asm])
 QF_PROCESS_NEED_DIRS(vid_render, [gl glsl sw sw32 vulkan])
-QF_PROCESS_NEED_LIBS(models, [gl glsl sw], [libs/models])
-QF_PROCESS_NEED_LIBS(alias, [gl glsl sw], [libs/models/alias])
-QF_PROCESS_NEED_LIBS(brush, [gl glsl sw], [libs/models/brush])
-QF_PROCESS_NEED_LIBS(iqm, [gl glsl sw], [libs/models/iqm])
-QF_PROCESS_NEED_LIBS(sprite, [gl glsl sw], [libs/models/sprite])
+QF_PROCESS_NEED_LIBS(models, [gl glsl sw vulkan], [libs/models])
+QF_PROCESS_NEED_LIBS(alias, [gl glsl sw vulkan], [libs/models/alias])
+QF_PROCESS_NEED_LIBS(brush, [gl glsl sw vulkan], [libs/models/brush])
+QF_PROCESS_NEED_LIBS(iqm, [gl glsl sw vulkan], [libs/models/iqm])
+QF_PROCESS_NEED_LIBS(sprite, [gl glsl sw vulkan], [libs/models/sprite])
 
 QF_PROCESS_NEED_LIBS(vid, [common sdl svga x11], [libs/video/targets])
 QF_PROCESS_NEED_LIBS(qw, [client common sdl server], [qw/source], a)
diff --git a/libs/models/Makemodule.am b/libs/models/Makemodule.am
index 2fbc7380d..24e5a3ca3 100644
--- a/libs/models/Makemodule.am
+++ b/libs/models/Makemodule.am
@@ -6,7 +6,11 @@ include libs/models/test/Makemodule.am
 
 lib_LTLIBRARIES +=	libs/models/libQFmodels.la
 noinst_LTLIBRARIES += @models_libs@
-EXTRA_LTLIBRARIES += libs/models/libmodels_gl.la libs/models/libmodels_glsl.la libs/models/libmodels_sw.la
+EXTRA_LTLIBRARIES += \
+	libs/models/libmodels_gl.la \
+	libs/models/libmodels_glsl.la \
+	libs/models/libmodels_sw.la \
+	libs/models/libmodels_vulkan.la
 
 models_sources = libs/models/clip_hull.c libs/models/model.c libs/models/portal.c libs/models/trace.c libs/models/winding.c
 
@@ -53,3 +57,14 @@ libs_models_libmodels_sw_la_LDFLAGS=
 libs_models_libmodels_sw_la_LIBADD=			$(sw_libs)
 libs_models_libmodels_sw_la_DEPENDENCIES=	$(sw_libs)
 libs_models_libmodels_sw_la_SOURCES=		libs/models/sw_skin.c libs/models/skin.c
+
+vulkan_libs= \
+	libs/models/alias/libalias_vulkan.la \
+	libs/models/brush/libbrush_vulkan.la \
+	libs/models/iqm/libiqm_vulkan.la \
+	libs/models/sprite/libsprite_vulkan.la \
+	libs/image/libQFimage.la
+libs_models_libmodels_vulkan_la_LDFLAGS=
+libs_models_libmodels_vulkan_la_LIBADD=			$(vulkan_libs)
+libs_models_libmodels_vulkan_la_DEPENDENCIES=	$(vulkan_libs)
+libs_models_libmodels_vulkan_la_SOURCES=		libs/models/vulkan_skin.c libs/models/skin.c
diff --git a/libs/models/alias/Makemodule.am b/libs/models/alias/Makemodule.am
index 42f2c5a73..cac8d4a09 100644
--- a/libs/models/alias/Makemodule.am
+++ b/libs/models/alias/Makemodule.am
@@ -1,15 +1,26 @@
 noinst_LTLIBRARIES +=	@alias_libs@
-EXTRA_LTLIBRARIES += libs/models/alias/libalias_gl.la libs/models/alias/libalias_glsl.la libs/models/alias/libalias_sw.la
+EXTRA_LTLIBRARIES += \
+	libs/models/alias/libalias_gl.la \
+	libs/models/alias/libalias_glsl.la \
+	libs/models/alias/libalias_sw.la \
+	libs/models/alias/libalias_vulkan.la
 
 alias_src= libs/models/alias/model_alias.c
 alias_gl_src= libs/models/alias/gl_mesh.c libs/models/alias/gl_model_alias.c libs/models/alias/floodfill.c
 alias_glsl_src= libs/models/alias/glsl_model_alias.c libs/models/alias/floodfill.c
 alias_sw_src= libs/models/alias/sw_model_alias.c
+alias_vulkan_src= libs/models/alias/vulkan_model_alias.c
 
 libs_models_alias_libalias_gl_la_SOURCES= $(alias_gl_src) $(alias_src)
 
 libs_models_alias_libalias_glsl_la_SOURCES= $(alias_glsl_src) $(alias_src)
 
 libs_models_alias_libalias_sw_la_SOURCES= $(alias_sw_src) $(alias_src)
+libs_models_alias_libalias_vulkan_la_SOURCES= $(alias_vulkan_src) $(alias_src)
 
-EXTRA_DIST += $(alias_gl_src) $(alias_glsl_src) $(alias_sw_src) $(alias_src)
+EXTRA_DIST += \
+	$(alias_gl_src) \
+	$(alias_glsl_src) \
+	$(alias_sw_src) \
+	$(alias_vulkan_src) \
+	$(alias_src)
diff --git a/libs/models/alias/vulkan_model_alias.c b/libs/models/alias/vulkan_model_alias.c
new file mode 100644
index 000000000..e69de29bb
diff --git a/libs/models/brush/Makemodule.am b/libs/models/brush/Makemodule.am
index a07ce0726..4a6f03a1f 100644
--- a/libs/models/brush/Makemodule.am
+++ b/libs/models/brush/Makemodule.am
@@ -1,10 +1,15 @@
 noinst_LTLIBRARIES += libs/models/brush/libbrush.la @brush_libs@
-EXTRA_LTLIBRARIES += libs/models/brush/libbrush_gl.la libs/models/brush/libbrush_glsl.la libs/models/brush/libbrush_sw.la
+EXTRA_LTLIBRARIES += \
+	libs/models/brush/libbrush_gl.la \
+	libs/models/brush/libbrush_glsl.la \
+	libs/models/brush/libbrush_sw.la \
+	libs/models/brush/libbrush_vulkan.la
 
 brush_src= libs/models/brush/model_brush.c
 brush_gl_src= libs/models/brush/gl_model_brush.c
 brush_glsl_src= libs/models/brush/glsl_model_brush.c
 brush_sw_src= libs/models/brush/sw_model_brush.c
+brush_vulkan_src= libs/models/brush/vulkan_model_brush.c
 
 libs_models_brush_libbrush_la_SOURCES= $(brush_src)
 
@@ -14,4 +19,11 @@ libs_models_brush_libbrush_glsl_la_SOURCES= $(brush_glsl_src) $(brush_src)
 
 libs_models_brush_libbrush_sw_la_SOURCES= $(brush_sw_src) $(brush_src)
 
-EXTRA_DIST += $(brush_gl_src) $(brush_glsl_src) $(brush_sw_src) $(brush_src)
+libs_models_brush_libbrush_vulkan_la_SOURCES= $(brush_vulkan_src) $(brush_src)
+
+EXTRA_DIST += \
+	$(brush_gl_src) \
+	$(brush_glsl_src) \
+	$(brush_sw_src) \
+	${brush_vulkan_src} \
+	$(brush_src)
diff --git a/libs/models/brush/vulkan_model_brush.c b/libs/models/brush/vulkan_model_brush.c
new file mode 100644
index 000000000..e69de29bb
diff --git a/libs/models/iqm/Makemodule.am b/libs/models/iqm/Makemodule.am
index 20c29548b..cc362050d 100644
--- a/libs/models/iqm/Makemodule.am
+++ b/libs/models/iqm/Makemodule.am
@@ -1,10 +1,15 @@
 noinst_LTLIBRARIES += @iqm_libs@
-EXTRA_LTLIBRARIES += libs/models/iqm/libiqm_gl.la libs/models/iqm/libiqm_glsl.la libs/models/iqm/libiqm_sw.la
+EXTRA_LTLIBRARIES += \
+	libs/models/iqm/libiqm_gl.la \
+	libs/models/iqm/libiqm_glsl.la \
+	libs/models/iqm/libiqm_sw.la \
+	libs/models/iqm/libiqm_vulkan.la
 
 iqm_src= libs/models/iqm/model_iqm.c
 iqm_gl_src= libs/models/iqm/gl_model_iqm.c
 iqm_glsl_src= libs/models/iqm/glsl_model_iqm.c
 iqm_sw_src= libs/models/iqm/sw_model_iqm.c
+iqm_vulkan_src= libs/models/iqm/vulkan_model_iqm.c
 
 libs_models_iqm_libiqm_gl_la_SOURCES= $(iqm_gl_src) $(iqm_src)
 
@@ -12,4 +17,11 @@ libs_models_iqm_libiqm_glsl_la_SOURCES= $(iqm_glsl_src) $(iqm_src)
 
 libs_models_iqm_libiqm_sw_la_SOURCES= $(iqm_sw_src) $(iqm_src)
 
-EXTRA_DIST += $(iqm_gl_src) $(iqm_glsl_src) $(iqm_sw_src) $(iqm_src)
+libs_models_iqm_libiqm_vulkan_la_SOURCES= $(iqm_vulkan_src) $(iqm_src)
+
+EXTRA_DIST += \
+	$(iqm_gl_src) \
+	$(iqm_glsl_src) \
+	$(iqm_sw_src) \
+	$(iqm_vulkan_src) \
+	$(iqm_src)
diff --git a/libs/models/iqm/vulkan_model_iqm.c b/libs/models/iqm/vulkan_model_iqm.c
new file mode 100644
index 000000000..e69de29bb
diff --git a/libs/models/sprite/Makemodule.am b/libs/models/sprite/Makemodule.am
index 76b9fa714..2021eb370 100644
--- a/libs/models/sprite/Makemodule.am
+++ b/libs/models/sprite/Makemodule.am
@@ -1,10 +1,15 @@
 noinst_LTLIBRARIES += @sprite_libs@
-EXTRA_LTLIBRARIES += libs/models/sprite/libsprite_gl.la libs/models/sprite/libsprite_glsl.la libs/models/sprite/libsprite_sw.la
+EXTRA_LTLIBRARIES += \
+	libs/models/sprite/libsprite_gl.la \
+	libs/models/sprite/libsprite_glsl.la \
+	libs/models/sprite/libsprite_sw.la \
+	libs/models/sprite/libsprite_vulkan.la
 
 sprite_src= libs/models/sprite/model_sprite.c
 sprite_gl_src= libs/models/sprite/gl_model_sprite.c
 sprite_glsl_src= libs/models/sprite/glsl_model_sprite.c
 sprite_sw_src= libs/models/sprite/sw_model_sprite.c
+sprite_vulkan_src= libs/models/sprite/vulkan_model_sprite.c
 
 libs_models_sprite_libsprite_gl_la_SOURCES=	$(sprite_gl_src) $(sprite_src)
 
@@ -12,4 +17,11 @@ libs_models_sprite_libsprite_glsl_la_SOURCES=	$(sprite_glsl_src) $(sprite_src)
 
 libs_models_sprite_libsprite_sw_la_SOURCES=	$(sprite_sw_src) $(sprite_src)
 
-EXTRA_DIST += $(sprite_gl_src) $(sprite_glsl_src) $(sprite_sw_src) $(sprite_src)
+libs_models_sprite_libsprite_vulkan_la_SOURCES=	$(sprite_vulkan_src) $(sprite_src)
+
+EXTRA_DIST += \
+	$(sprite_gl_src) \
+	$(sprite_glsl_src) \
+	$(sprite_sw_src) \
+	$(sprite_vulkan_src) \
+	$(sprite_src)
diff --git a/libs/models/sprite/vulkan_model_sprite.c b/libs/models/sprite/vulkan_model_sprite.c
new file mode 100644
index 000000000..e69de29bb
diff --git a/libs/models/vulkan_skin.c b/libs/models/vulkan_skin.c
new file mode 100644
index 000000000..e69de29bb
diff --git a/libs/video/renderer/Makemodule.am b/libs/video/renderer/Makemodule.am
index bfe8cb5e3..b149d528c 100644
--- a/libs/video/renderer/Makemodule.am
+++ b/libs/video/renderer/Makemodule.am
@@ -210,10 +210,11 @@ libs_video_renderer_vid_render_sw32_la_SOURCES=\
 pipeline_src = libs/video/renderer/vulkan/qfpipeline.plist
 pipeline_gen = libs/video/renderer/vulkan/qfpipeline.plc
 
-vulkan_libs =
+video_renderer_vulkan_libs = \
+	libs/models/libmodels_vulkan.la
 libs_video_renderer_vid_render_vulkan_la_LDFLAGS=       $(plugin_ldflags)
-libs_video_renderer_vid_render_vulkan_la_LIBADD=        $(vulkan_libs)
-libs_video_renderer_vid_render_vulkan_la_DEPENDENCIES=$(vulkan_libs)
+libs_video_renderer_vid_render_vulkan_la_LIBADD=        $(video_renderer_vulkan_libs)
+libs_video_renderer_vid_render_vulkan_la_DEPENDENCIES=$(video_renderer_vulkan_libs)
 libs_video_renderer_vid_render_vulkan_la_SOURCES = \
 	$(video_renderer_common_sources) \
 	libs/video/renderer/vid_render_vulkan.c \

From ba5e86d9274751748968493952bb406bef9b59a8 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 19 Jan 2021 14:54:39 +0900
Subject: [PATCH 1329/1519] [model] Move Mod_CalcFullbright to its own file

This allows it to be shared between renderers.
---
 libs/models/Makemodule.am         |  8 ++++-
 libs/models/fullbright.c          | 49 +++++++++++++++++++++++++++++++
 libs/models/gl_model_fullbright.c | 18 ------------
 3 files changed, 56 insertions(+), 19 deletions(-)
 create mode 100644 libs/models/fullbright.c

diff --git a/libs/models/Makemodule.am b/libs/models/Makemodule.am
index 24e5a3ca3..982e96a3a 100644
--- a/libs/models/Makemodule.am
+++ b/libs/models/Makemodule.am
@@ -12,7 +12,13 @@ EXTRA_LTLIBRARIES += \
 	libs/models/libmodels_sw.la \
 	libs/models/libmodels_vulkan.la
 
-models_sources = libs/models/clip_hull.c libs/models/model.c libs/models/portal.c libs/models/trace.c libs/models/winding.c
+models_sources = \
+	libs/models/clip_hull.c \
+	libs/models/fullbright.c \
+	libs/models/model.c \
+	libs/models/portal.c \
+	libs/models/trace.c \
+	libs/models/winding.c
 
 common_libs = \
 	libs/util/libQFutil.la
diff --git a/libs/models/fullbright.c b/libs/models/fullbright.c
new file mode 100644
index 000000000..79c32ede9
--- /dev/null
+++ b/libs/models/fullbright.c
@@ -0,0 +1,49 @@
+/*
+	fullbright.c
+
+	fullbright skin handling
+
+	Copyright (C) 1996-1997  Id Software, Inc.
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+// models are the only shared resource between a client and server running
+// on the same machine.
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include "r_local.h"
+
+
+VISIBLE int
+Mod_CalcFullbright (byte *in, byte *out, int pixels)
+{
+	byte	fb = 0;
+
+	while (pixels--) {
+		byte        pix = *in++;
+		byte        mask = (pix >= 256 - 32) - 1;
+		fb |= mask + 1;
+		*out++ = pix | mask;
+	}
+	return fb;
+}
diff --git a/libs/models/gl_model_fullbright.c b/libs/models/gl_model_fullbright.c
index 3417b6646..f319581ae 100644
--- a/libs/models/gl_model_fullbright.c
+++ b/libs/models/gl_model_fullbright.c
@@ -40,24 +40,6 @@
 
 #include "r_local.h"
 
-
-VISIBLE int
-Mod_CalcFullbright (byte *in, byte *out, int pixels)
-{
-	int		fb = 0;
-
-	while (pixels--) {
-		if (*in >= 256 - 32) {
-			fb = 1;
-			*out++ = *in++;
-		} else {
-			*out++ = 255;
-			in++;
-		}
-	}
-	return fb;
-}
-
 int
 Mod_Fullbright (byte *skin, int width, int height, const char *name)
 {

From 0f81432090c3e6a968de5fef52908b2983e25364 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 19 Jan 2021 18:15:05 +0900
Subject: [PATCH 1330/1519] [model] Load bsp textures into vulkan

The textures for an entire model are loaded into a single memory object
with shared between multiple images.
---
 include/QF/Vulkan/qf_texture.h              |   9 +-
 include/QF/model.h                          |   3 +-
 include/mod_internal.h                      |   6 +
 include/r_internal.h                        |   3 +-
 libs/models/alias/glsl_model_alias.c        |   2 +-
 libs/models/brush/glsl_model_brush.c        |   2 +-
 libs/models/brush/model_brush.c             |  11 +-
 libs/models/brush/vulkan_model_brush.c      | 212 ++++++++++++++++++++
 libs/models/iqm/gl_model_iqm.c              |   2 +-
 libs/models/iqm/glsl_model_iqm.c            |   2 +-
 libs/models/iqm/sw_model_iqm.c              |   2 +-
 libs/models/model.c                         |   2 +-
 libs/models/sprite/glsl_model_sprite.c      |   2 +-
 libs/video/renderer/r_init.c                |   1 +
 libs/video/renderer/vid_render_vulkan.c     |   4 +-
 libs/video/renderer/vulkan/vulkan_texture.c |   7 -
 16 files changed, 247 insertions(+), 23 deletions(-)

diff --git a/include/QF/Vulkan/qf_texture.h b/include/QF/Vulkan/qf_texture.h
index a1750682d..90906873c 100644
--- a/include/QF/Vulkan/qf_texture.h
+++ b/include/QF/Vulkan/qf_texture.h
@@ -2,9 +2,14 @@
 #define __QF_Vulkan_qf_texture_h
 
 #include "QF/image.h"
+#include "QF/Vulkan/qf_vid.h"
 
-typedef struct qfv_tex_s qfv_tex_t;
-struct vulkan_ctx_s;
+typedef struct qfv_tex_s {
+	VkDeviceMemory memory;
+	size_t      offset;
+	VkImage     image;
+	VkImageView view;
+} qfv_tex_t;
 
 qfv_tex_t *Vulkan_LoadTex (struct vulkan_ctx_s *ctx, tex_t *tex, int mip);
 VkImageView Vulkan_TexImageView (qfv_tex_t *tex) __attribute__((pure));
diff --git a/include/QF/model.h b/include/QF/model.h
index e8cb22367..1dbfe1b6f 100644
--- a/include/QF/model.h
+++ b/include/QF/model.h
@@ -422,7 +422,8 @@ typedef struct model_s {
 
 // additional model data
 	cache_user_t cache;
-	void       (*clear) (struct model_s *m);
+	void      (*clear) (struct model_s *m, void *data);
+	void       *data;
 } model_t;
 
 // ============================================================================
diff --git a/include/mod_internal.h b/include/mod_internal.h
index 125da1065..632411785 100644
--- a/include/mod_internal.h
+++ b/include/mod_internal.h
@@ -6,6 +6,8 @@
 #include "QF/skin.h"
 #include "QF/plugin/vid_render.h"
 
+struct vulkan_ctx_s;
+
 extern vid_model_funcs_t *m_funcs;
 
 void gl_Mod_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr, void *_m,
@@ -41,6 +43,10 @@ void glsl_Mod_ProcessTexture(texture_t *tx);
 
 void sw_Mod_LoadLighting (bsp_t *bsp);
 
+void Vulkan_Mod_LoadLighting (bsp_t *bsp, struct vulkan_ctx_s *ctx);
+void Vulkan_Mod_SubdivideSurface (msurface_t *fa, struct vulkan_ctx_s *ctx);
+void Vulkan_Mod_ProcessTexture(texture_t *tx, struct vulkan_ctx_s *ctx);
+
 void gl_Mod_SpriteLoadTexture (mspriteframe_t *pspriteframe, int framenum);
 void glsl_Mod_SpriteLoadTexture (mspriteframe_t *pspriteframe, int framenum);
 void sw_Mod_SpriteLoadTexture (mspriteframe_t *pspriteframe, int framenum);
diff --git a/include/r_internal.h b/include/r_internal.h
index 37edbbdd2..01c9af001 100644
--- a/include/r_internal.h
+++ b/include/r_internal.h
@@ -29,11 +29,12 @@ typedef struct glsltex_s {
 
 typedef struct vulktex_s {
 	texture_t  *texture;
-	struct qfv_tex_s *tex;
 	instsurf_t *tex_chain;	// for gl_texsort drawing
 	instsurf_t **tex_chain_tail;
 	struct elechain_s *elechain;
 	struct elechain_s **elechain_tail;
+	struct qfv_tex_s *tex;
+	struct qfv_tex_s *glow;
 } vulktex_t;
 
 extern viddef_t 		vid;				// global video state
diff --git a/libs/models/alias/glsl_model_alias.c b/libs/models/alias/glsl_model_alias.c
index 5e80ccbb8..215c9d400 100644
--- a/libs/models/alias/glsl_model_alias.c
+++ b/libs/models/alias/glsl_model_alias.c
@@ -55,7 +55,7 @@ static vec3_t vertex_normals[NUMVERTEXNORMALS] = {
 };
 
 static void
-glsl_alias_clear (model_t *m)
+glsl_alias_clear (model_t *m, void *data)
 {
 	int         i, j;
 	aliashdr_t *hdr;
diff --git a/libs/models/brush/glsl_model_brush.c b/libs/models/brush/glsl_model_brush.c
index e839f5317..23bb683ad 100644
--- a/libs/models/brush/glsl_model_brush.c
+++ b/libs/models/brush/glsl_model_brush.c
@@ -62,7 +62,7 @@
 static glsltex_t glsl_notexture = { };
 
 static void
-glsl_brush_clear (model_t *m)
+glsl_brush_clear (model_t *m, void *data)
 {
 	int         i;
 
diff --git a/libs/models/brush/model_brush.c b/libs/models/brush/model_brush.c
index f3ab08689..24af26c95 100644
--- a/libs/models/brush/model_brush.c
+++ b/libs/models/brush/model_brush.c
@@ -982,10 +982,13 @@ Mod_LoadBrushModel (model_t *mod, void *buffer)
 			char	name[12];
 
 			snprintf (name, sizeof (name), "*%i", i + 1);
-			loadmodel = Mod_FindName (name);
-			*loadmodel = *mod;
-			strcpy (loadmodel->name, name);
-			mod = loadmodel;
+			model_t    *m = Mod_FindName (name);
+			*m = *mod;
+			strcpy (m->name, name);
+			mod = m;
+			// make sure clear is called only for the main model
+			m->clear = 0;
+			m->data = 0;
 		}
 	}
 }
diff --git a/libs/models/brush/vulkan_model_brush.c b/libs/models/brush/vulkan_model_brush.c
index e69de29bb..5cc5f2984 100644
--- a/libs/models/brush/vulkan_model_brush.c
+++ b/libs/models/brush/vulkan_model_brush.c
@@ -0,0 +1,212 @@
+/*
+	vulkan_model_brush.c
+
+	Vulkan support routines for model loading and caching
+
+	Copyright (C) 1996-1997  Id Software, Inc.
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+// models are the only shared resource between a client and server running
+// on the same machine.
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+
+#include "QF/cvar.h"
+#include "QF/dstring.h"
+#include "QF/image.h"
+#include "QF/qendian.h"
+#include "QF/quakefs.h"
+#include "QF/sys.h"
+#include "QF/va.h"
+#include "QF/Vulkan/qf_bsp.h"
+#include "QF/Vulkan/qf_model.h"
+#include "QF/Vulkan/qf_texture.h"
+#include "QF/Vulkan/device.h"
+#include "QF/Vulkan/image.h"
+
+#include "compat.h"
+#include "mod_internal.h"
+#include "r_internal.h"
+#include "vid_vulkan.h"
+
+static vulktex_t vulkan_notexture = { };
+
+static void vulkan_brush_clear (model_t *model, void *data)
+{
+	modelctx_t *mctx = data;
+	vulkan_ctx_t *ctx = mctx->ctx;
+	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	for (int i = 0; i < model->numtextures; i++) {
+		texture_t  *tx = model->textures[i];
+		if (!tx) {
+			continue;
+		}
+		vulktex_t  *tex = tx->render;
+		dfunc->vkDestroyImage (device->dev, tex->tex->image, 0);
+		if (tex->glow) {
+			dfunc->vkDestroyImage (device->dev, tex->glow->image, 0);
+		}
+	}
+	dfunc->vkFreeMemory (device->dev, mctx->texture_memory, 0);
+}
+
+static size_t
+get_image_size (VkImage image, qfv_device_t *device)
+{
+	qfv_devfuncs_t *dfunc = device->funcs;
+	size_t      size;
+	size_t      align;
+
+	VkMemoryRequirements requirements;
+	dfunc->vkGetImageMemoryRequirements (device->dev, image, &requirements);
+	size = requirements.size;
+	align = requirements.alignment - 1;
+	size = (size + align) & ~(align);
+	return size;
+}
+
+static void
+load_textures (model_t *model, vulkan_ctx_t *ctx)
+{
+	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+	modelctx_t *mctx = model->data;
+	VkImage     image = 0;
+
+	size_t      memsize = 0;
+	for (int i = 0; i < model->numtextures; i++) {
+		texture_t  *tx = model->textures[i];
+		if (!tx) {
+			continue;
+		}
+		vulktex_t  *tex = tx->render;
+		tex->tex->offset = memsize;
+		memsize += get_image_size (tex->tex->image, device);
+		// just so we have one in the end
+		image = tex->tex->image;
+		if (tex->glow) {
+			tex->glow->offset = memsize;
+			memsize += get_image_size (tex->glow->image, device);
+		}
+	}
+	VkDeviceMemory mem;
+	mem = QFV_AllocImageMemory (device, image,
+								VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT,
+								memsize, 0);
+	mctx->texture_memory = mem;
+
+	for (int i = 0; i < model->numtextures; i++) {
+		texture_t  *tx = model->textures[i];
+		if (!tx) {
+			continue;
+		}
+		vulktex_t  *tex = tx->render;
+
+		dfunc->vkBindImageMemory (device->dev, tex->tex->image, mem,
+								  tex->tex->offset);
+		if (tex->glow) {
+			dfunc->vkBindImageMemory (device->dev, tex->glow->image, mem,
+									  tex->glow->offset);
+		}
+	}
+}
+
+void
+Vulkan_Mod_ProcessTexture (texture_t *tx, vulkan_ctx_t *ctx)
+{
+	qfv_device_t *device = ctx->device;
+
+	if (!tx) {
+		modelctx_t *mctx = Hunk_AllocName (sizeof (modelctx_t),
+										   loadmodel->name);
+		mctx->ctx = ctx;
+		loadmodel->clear = vulkan_brush_clear;
+		loadmodel->data = mctx;
+
+		r_notexture_mip->render = &vulkan_notexture;
+		load_textures (loadmodel, ctx);
+		return;
+	}
+
+	vulktex_t    *tex = tx->render;
+	tex->tex = (qfv_tex_t *) (tx + 1);
+	VkExtent3D extent = { tx->width, tx->height, 1 };
+
+	int layers = 1;
+	if (strncmp (tx->name, "sky", 3) == 0) {
+		layers = 2;
+	}
+
+	tex->tex->image = QFV_CreateImage (device, 0, VK_IMAGE_TYPE_2D,
+									   VK_FORMAT_R8G8B8A8_UNORM,
+									   extent, 4, layers,
+									   VK_SAMPLE_COUNT_1_BIT,
+									   VK_IMAGE_USAGE_TRANSFER_DST_BIT
+									   | VK_IMAGE_USAGE_SAMPLED_BIT);
+	if (layers > 1) {
+		// skys are unlit, so no fullbrights
+		return;
+	}
+
+	const char *name = va ("fb_%s", tx->name);
+	int         size = (tx->width * tx->height * 85) / 64;
+	int         fullbright_mark = Hunk_LowMark ();
+	byte       *pixels = Hunk_AllocName (size, name);
+
+	if (!Mod_CalcFullbright ((byte *) (tx + 1), pixels, size)) {
+		Hunk_FreeToLowMark (fullbright_mark);
+		return;
+	}
+	tex->glow = tex->tex + 1;
+	tex->glow->image = QFV_CreateImage (device, 0, VK_IMAGE_TYPE_2D,
+										VK_FORMAT_R8G8B8A8_UNORM,
+										extent, 4, 1,
+										VK_SAMPLE_COUNT_1_BIT,
+										VK_IMAGE_USAGE_TRANSFER_DST_BIT
+										| VK_IMAGE_USAGE_SAMPLED_BIT);
+	// store the pointer to the fullbright data: memory will never be set to
+	// actual device memory because all of the textures will be loaded in one
+	// big buffer
+	tex->glow->memory = (VkDeviceMemory) pixels;
+}
+
+void
+Vulkan_Mod_LoadLighting (bsp_t *bsp, vulkan_ctx_t *ctx)
+{
+	mod_lightmap_bytes = 1;
+	if (!bsp->lightdatasize) {
+		loadmodel->lightdata = NULL;
+		return;
+	}
+	loadmodel->lightdata = Hunk_AllocName (bsp->lightdatasize, loadname);
+	memcpy (loadmodel->lightdata, bsp->lightdata, bsp->lightdatasize);
+}
diff --git a/libs/models/iqm/gl_model_iqm.c b/libs/models/iqm/gl_model_iqm.c
index f57b18637..93a1e9992 100644
--- a/libs/models/iqm/gl_model_iqm.c
+++ b/libs/models/iqm/gl_model_iqm.c
@@ -56,7 +56,7 @@ static byte null_texture[] = {
 };
 
 static void
-gl_iqm_clear (model_t *mod)
+gl_iqm_clear (model_t *mod, void *data)
 {
 	iqm_t      *iqm = (iqm_t *) mod->aliashdr;
 	gliqm_t    *gl = (gliqm_t *) iqm->extra_data;
diff --git a/libs/models/iqm/glsl_model_iqm.c b/libs/models/iqm/glsl_model_iqm.c
index 6a79eede7..5b37e0fd2 100644
--- a/libs/models/iqm/glsl_model_iqm.c
+++ b/libs/models/iqm/glsl_model_iqm.c
@@ -68,7 +68,7 @@ static byte null_normmap[] = {
 };
 
 static void
-glsl_iqm_clear (model_t *mod)
+glsl_iqm_clear (model_t *mod, void *data)
 {
 	iqm_t      *iqm = (iqm_t *) mod->aliashdr;
 	glsliqm_t  *glsl = (glsliqm_t *) iqm->extra_data;
diff --git a/libs/models/iqm/sw_model_iqm.c b/libs/models/iqm/sw_model_iqm.c
index 4bc8fedb9..b15422090 100644
--- a/libs/models/iqm/sw_model_iqm.c
+++ b/libs/models/iqm/sw_model_iqm.c
@@ -58,7 +58,7 @@ static tex_t null_texture = {
 };
 
 static void
-sw_iqm_clear (model_t *mod)
+sw_iqm_clear (model_t *mod, void *data)
 {
 	iqm_t      *iqm = (iqm_t *) mod->aliashdr;
 	swiqm_t    *sw = (swiqm_t *) iqm->extra_data;
diff --git a/libs/models/model.c b/libs/models/model.c
index d8ce5df03..198a69f7c 100644
--- a/libs/models/model.c
+++ b/libs/models/model.c
@@ -123,7 +123,7 @@ Mod_ClearAll (void)
 
 	for (i = 0, mod = mod_known; i < mod_numknown; i++, mod++) {
 		if (!(*mod)->needload && (*mod)->clear) {
-			(*mod)->clear (*mod);
+			(*mod)->clear (*mod, (*mod)->data);
 		} else {
 			if ((*mod)->type != mod_alias)
 				(*mod)->needload = true;
diff --git a/libs/models/sprite/glsl_model_sprite.c b/libs/models/sprite/glsl_model_sprite.c
index 66e1318e2..bbef94e02 100644
--- a/libs/models/sprite/glsl_model_sprite.c
+++ b/libs/models/sprite/glsl_model_sprite.c
@@ -47,7 +47,7 @@
 #include "mod_internal.h"
 
 static void
-glsl_sprite_clear (model_t *m)
+glsl_sprite_clear (model_t *m, void *data)
 {
 	int         i, j;
 	msprite_t  *sprite = (msprite_t *) m->cache.data;
diff --git a/libs/video/renderer/r_init.c b/libs/video/renderer/r_init.c
index 733004a21..94385e1c2 100644
--- a/libs/video/renderer/r_init.c
+++ b/libs/video/renderer/r_init.c
@@ -68,6 +68,7 @@ static U void (*const r_scrapdelete)(rscrap_t *) = R_ScrapDelete;
 static void
 R_shutdown (void *data)
 {
+	Mod_ClearAll ();
 	if (vidrendmodule->functions->general->p_Shutdown) {
 		vidrendmodule->functions->general->p_Shutdown ();
 	}
diff --git a/libs/video/renderer/vid_render_vulkan.c b/libs/video/renderer/vid_render_vulkan.c
index 717809012..4d2744089 100644
--- a/libs/video/renderer/vid_render_vulkan.c
+++ b/libs/video/renderer/vid_render_vulkan.c
@@ -388,6 +388,7 @@ vulkan_r_particles_style_f (struct cvar_s *var)
 static void
 vulkan_Mod_LoadLighting (bsp_t *bsp)
 {
+	Vulkan_Mod_LoadLighting (bsp, vulkan_ctx);
 }
 
 static void
@@ -398,6 +399,7 @@ vulkan_Mod_SubdivideSurface (msurface_t *fa)
 static void
 vulkan_Mod_ProcessTexture (texture_t *tx)
 {
+	Vulkan_Mod_ProcessTexture (tx, vulkan_ctx);
 }
 
 static void
@@ -449,7 +451,7 @@ vulkan_Skin_InitTranslations (void)
 }
 
 static vid_model_funcs_t model_funcs = {
-	sizeof (vulktex_t),
+	sizeof (vulktex_t) + 2 * sizeof (struct qfv_tex_s *),
 	vulkan_Mod_LoadLighting,
 	vulkan_Mod_SubdivideSurface,
 	vulkan_Mod_ProcessTexture,
diff --git a/libs/video/renderer/vulkan/vulkan_texture.c b/libs/video/renderer/vulkan/vulkan_texture.c
index 0b2c2e102..c9dc0d60f 100644
--- a/libs/video/renderer/vulkan/vulkan_texture.c
+++ b/libs/video/renderer/vulkan/vulkan_texture.c
@@ -62,13 +62,6 @@
 #include "r_scrap.h"
 #include "vid_vulkan.h"
 
-struct qfv_tex_s {	// qfv_tex_t
-	VkDeviceMemory memory;
-	size_t      offset;
-	VkImage     image;
-	VkImageView view;
-};
-
 static int
 ilog2 (unsigned x)
 {

From 82889a2c52d77117f8b5e0d063afd43b9da5c4d0 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 19 Jan 2021 18:25:30 +0900
Subject: [PATCH 1331/1519] [model] Create and destroy the bsp image views

---
 libs/models/brush/vulkan_model_brush.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/libs/models/brush/vulkan_model_brush.c b/libs/models/brush/vulkan_model_brush.c
index 5cc5f2984..fe5fbfce5 100644
--- a/libs/models/brush/vulkan_model_brush.c
+++ b/libs/models/brush/vulkan_model_brush.c
@@ -72,8 +72,10 @@ static void vulkan_brush_clear (model_t *model, void *data)
 		}
 		vulktex_t  *tex = tx->render;
 		dfunc->vkDestroyImage (device->dev, tex->tex->image, 0);
+		dfunc->vkDestroyImageView (device->dev, tex->tex->view, 0);
 		if (tex->glow) {
 			dfunc->vkDestroyImage (device->dev, tex->glow->image, 0);
+			dfunc->vkDestroyImageView (device->dev, tex->glow->view, 0);
 		}
 	}
 	dfunc->vkFreeMemory (device->dev, mctx->texture_memory, 0);
@@ -133,9 +135,22 @@ load_textures (model_t *model, vulkan_ctx_t *ctx)
 
 		dfunc->vkBindImageMemory (device->dev, tex->tex->image, mem,
 								  tex->tex->offset);
+		VkImageViewType type = VK_IMAGE_VIEW_TYPE_2D;
+		if (strncmp (tx->name, "sky", 3) == 0) {
+			type = VK_IMAGE_VIEW_TYPE_2D_ARRAY;
+		}
+		tex->tex->view = QFV_CreateImageView (device, tex->tex->image,
+											  type, VK_FORMAT_R8G8B8A8_UNORM,
+											  VK_IMAGE_ASPECT_COLOR_BIT);
 		if (tex->glow) {
 			dfunc->vkBindImageMemory (device->dev, tex->glow->image, mem,
 									  tex->glow->offset);
+			// skys are unlit so never have a glow texture thus glow
+			// textures are always simple 2D
+			tex->glow->view = QFV_CreateImageView (device, tex->tex->image,
+												   VK_IMAGE_VIEW_TYPE_2D,
+												   VK_FORMAT_R8G8B8A8_UNORM,
+												   VK_IMAGE_ASPECT_COLOR_BIT);
 		}
 	}
 }

From 2de1c02f61eb69701efac1e61e5410ac6a1a5d51 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 20 Jan 2021 01:18:47 +0900
Subject: [PATCH 1332/1519] [image] Add support for float rgba for vulkan

---
 include/QF/image.h                          | 1 +
 libs/models/iqm/sw_model_iqm.c              | 9 +++++++++
 libs/video/renderer/vulkan/texture.c        | 4 ++++
 libs/video/renderer/vulkan/vulkan_texture.c | 4 ++++
 4 files changed, 18 insertions(+)

diff --git a/include/QF/image.h b/include/QF/image.h
index cd649c42e..62d57dd35 100644
--- a/include/QF/image.h
+++ b/include/QF/image.h
@@ -38,6 +38,7 @@ typedef enum QFFormat {
 	tex_la = 2,
 	tex_rgb = 3,
 	tex_rgba = 4,
+	tex_frgba = 5,
 } QFFormat;
 
 // could not use texture_t as that is used for models.
diff --git a/libs/models/iqm/sw_model_iqm.c b/libs/models/iqm/sw_model_iqm.c
index b15422090..582109a73 100644
--- a/libs/models/iqm/sw_model_iqm.c
+++ b/libs/models/iqm/sw_model_iqm.c
@@ -130,6 +130,15 @@ convert_tex (tex_t *tex)
 			for (i = 0; i < pixels; i++)
 				new->data[i] = convert_color (tex->data + i * bpp);
 			break;
+		case tex_frgba:
+			for (i = 0; i < pixels; i++) {
+				byte        col[3];
+				col[0] = ((float *)tex->data)[i * 4 + 0] * 255;
+				col[1] = ((float *)tex->data)[i * 4 + 1] * 255;
+				col[2] = ((float *)tex->data)[i * 4 + 2] * 255;
+				new->data[i] = convert_color (col);
+			}
+			break;
 	}
 	return new;
 }
diff --git a/libs/video/renderer/vulkan/texture.c b/libs/video/renderer/vulkan/texture.c
index b4eacf0e6..d926632a7 100644
--- a/libs/video/renderer/vulkan/texture.c
+++ b/libs/video/renderer/vulkan/texture.c
@@ -100,6 +100,10 @@ QFV_CreateScrap (qfv_device_t *device, int size, QFFormat format)
 			bpp = 4;
 			fmt = VK_FORMAT_R8G8B8A8_UNORM;
 			break;
+		case tex_frgba:
+			bpp = 16;
+			fmt = VK_FORMAT_R32G32B32A32_SFLOAT;
+			break;
 	}
 
 	scrap_t    *scrap = malloc (sizeof (scrap_t));
diff --git a/libs/video/renderer/vulkan/vulkan_texture.c b/libs/video/renderer/vulkan/vulkan_texture.c
index c9dc0d60f..05d602d63 100644
--- a/libs/video/renderer/vulkan/vulkan_texture.c
+++ b/libs/video/renderer/vulkan/vulkan_texture.c
@@ -118,6 +118,10 @@ Vulkan_LoadTex (vulkan_ctx_t *ctx, tex_t *tex, int mip)
 			format = VK_FORMAT_R8G8B8A8_UNORM;
 			bpp = 4;
 			break;
+		case tex_frgba:
+			format = VK_FORMAT_R32G32B32A32_SFLOAT;
+			bpp = 16;
+			break;
 	}
 	if (format == VK_FORMAT_UNDEFINED) {
 		return 0;

From df82cb88eec5f6b8573515ea09cd2110591da7d7 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 20 Jan 2021 01:23:24 +0900
Subject: [PATCH 1333/1519] [vulkan] Make some little cleanups

---
 include/QF/Vulkan/qf_particles.h              |  5 +++--
 libs/video/renderer/glsl/glsl_lightmap.c      |  3 ---
 libs/video/renderer/vulkan/vulkan_draw.c      |  4 ++--
 libs/video/renderer/vulkan/vulkan_particles.c | 11 ++++++++---
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/include/QF/Vulkan/qf_particles.h b/include/QF/Vulkan/qf_particles.h
index 3ac71ac71..c256a9610 100644
--- a/include/QF/Vulkan/qf_particles.h
+++ b/include/QF/Vulkan/qf_particles.h
@@ -6,10 +6,11 @@
 struct cvar_s;
 struct vulkan_ctx_s;;
 
-void Vulkan_R_ClearParticles (struct vulkan_ctx_s *ctx);
-void Vulkan_R_InitParticles (struct vulkan_ctx_s *ctx);
+void Vulkan_ClearParticles (struct vulkan_ctx_s *ctx);
+void Vulkan_InitParticles (struct vulkan_ctx_s *ctx);
 void Vulkan_r_easter_eggs_f (struct cvar_s *var, struct vulkan_ctx_s *ctx);
 void Vulkan_r_particles_style_f (struct cvar_s *var, struct vulkan_ctx_s *ctx);
 void Vulkan_Particles_Init (struct vulkan_ctx_s *ctx);
+void Vulkan_DrawParticles (struct vulkan_ctx_s *ctx);
 
 #endif//__QF_Vulkan_qf_particles_h
diff --git a/libs/video/renderer/glsl/glsl_lightmap.c b/libs/video/renderer/glsl/glsl_lightmap.c
index 11ae46ca8..b6f37142b 100644
--- a/libs/video/renderer/glsl/glsl_lightmap.c
+++ b/libs/video/renderer/glsl/glsl_lightmap.c
@@ -58,7 +58,6 @@
 #define BLOCK_SIZE (BLOCK_WIDTH * BLOCK_HEIGHT)
 
 static scrap_t *light_scrap;
-static byte    *light_data;
 static unsigned *blocklights;
 static int      bl_extents[2];
 
@@ -201,10 +200,8 @@ glsl_R_BuildLightmaps (model_t **models, int num_models)
 	//FIXME RGB support
 	if (!light_scrap) {
 		light_scrap = GLSL_CreateScrap (2048, GL_LUMINANCE, 1);
-		light_data = malloc (BLOCK_SIZE * MAX_LIGHTMAPS);
 	} else {
 		GLSL_ScrapClear (light_scrap);
-		memset (light_data, 0, BLOCK_SIZE * MAX_LIGHTMAPS);
 	}
 	glsl_R_BuildLightMap = R_BuildLightMap_1;
 
diff --git a/libs/video/renderer/vulkan/vulkan_draw.c b/libs/video/renderer/vulkan/vulkan_draw.c
index 7aadd6692..5cb213b16 100644
--- a/libs/video/renderer/vulkan/vulkan_draw.c
+++ b/libs/video/renderer/vulkan/vulkan_draw.c
@@ -369,7 +369,7 @@ Vulkan_Draw_Init (vulkan_ctx_t *ctx)
 	create_quad_buffers (ctx);
 	dctx->scrap = QFV_CreateScrap (device, 2048, tex_rgba);
 	dctx->stage = QFV_CreateStagingBuffer (device, 4 * 1024 * 1024, 4,
-											   ctx->cmdpool);
+										   ctx->cmdpool);
 	dctx->sampler = QFV_GetSampler (ctx, "quakepic");
 
 	qpic_t     *charspic = Draw_Font8x8Pic ();
@@ -385,7 +385,7 @@ Vulkan_Draw_Init (vulkan_ctx_t *ctx)
 
 	dctx->layout = QFV_GetPipelineLayout (ctx, "twod");
 
-	__auto_type layouts = QFV_AllocDescriptorSetLayoutSet (ctx->framebuffers.size, alloca);
+	__auto_type layouts = QFV_AllocDescriptorSetLayoutSet (frames, alloca);
 	for (size_t i = 0; i < layouts->size; i++) {
 		layouts->a[i] = QFV_GetDescriptorSetLayout (ctx, "twod");
 	}
diff --git a/libs/video/renderer/vulkan/vulkan_particles.c b/libs/video/renderer/vulkan/vulkan_particles.c
index 282bfaf8a..abb24924b 100644
--- a/libs/video/renderer/vulkan/vulkan_particles.c
+++ b/libs/video/renderer/vulkan/vulkan_particles.c
@@ -48,12 +48,12 @@
 #include "vid_vulkan.h"
 
 void
-Vulkan_R_ClearParticles (struct vulkan_ctx_s *ctx)
+Vulkan_ClearParticles (struct vulkan_ctx_s *ctx)
 {
 }
 
 void
-Vulkan_R_InitParticles (struct vulkan_ctx_s *ctx)
+Vulkan_InitParticles (struct vulkan_ctx_s *ctx)
 {
 }
 
@@ -241,7 +241,12 @@ Vulkan_r_easter_eggs_f (cvar_t *var, struct vulkan_ctx_s *ctx)
 void
 Vulkan_r_particles_style_f (cvar_t *var, struct vulkan_ctx_s *ctx)
 {
-	Vulkan_r_particles_style_f (var, ctx);
+	Vulkan_r_easter_eggs_f (var, ctx);
+}
+
+void
+Vulkan_DrawParticles (struct vulkan_ctx_s *ctx)
+{
 }
 
 void

From 0622a24380d96359c71356cff09a30e4a89ee651 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 20 Jan 2021 01:24:32 +0900
Subject: [PATCH 1334/1519] [util] Support size_t constants

Much like 1u and 1l, 1z is for size_t.
---
 libs/util/cexpr-lex.l | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/libs/util/cexpr-lex.l b/libs/util/cexpr-lex.l
index 9c9377beb..d34cd250a 100644
--- a/libs/util/cexpr-lex.l
+++ b/libs/util/cexpr-lex.l
@@ -71,6 +71,7 @@ FILE *cexpr_yyget_in (yyscan_t yyscanner) __attribute__((pure));
 
 static exprval_t *parse_int (const char *str, exprctx_t *context);
 static exprval_t *parse_uint (const char *str, exprctx_t *context);
+static exprval_t *parse_size_t (const char *str, exprctx_t *context);
 static exprval_t *parse_float (const char *str, exprctx_t *context);
 static exprval_t *parse_double (const char *str, exprctx_t *context);
 static exprsym_t *parse_name (const char *str, exprctx_t *context);
@@ -127,6 +128,11 @@ STRING		\"(\\.|[^"\\])*\"
 						return VALUE;
 					}
 
+{INT}+[zZ]			{
+						yylval->value = parse_size_t (yytext, context);
+						return VALUE;
+					}
+
 {FLOAT}				{
 						yylval->value = parse_double (yytext, context);
 						return VALUE;
@@ -239,6 +245,13 @@ static exprval_t *parse_uint (const char *str, exprctx_t *context)
 	return val;
 }
 
+static exprval_t *parse_size_t (const char *str, exprctx_t *context)
+{
+	exprval_t  *val = cexpr_value (&cexpr_size_t, context);
+	*(unsigned *) val->value = strtoumax (str, 0, 0);
+	return val;
+}
+
 static exprval_t *parse_float (const char *str, exprctx_t *context)
 {
 	exprval_t  *val = cexpr_value (&cexpr_float, context);

From d33f5b8d0d6e693d17acce115b55c2c42882e4bd Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 20 Jan 2021 01:25:54 +0900
Subject: [PATCH 1335/1519] [vulkan] Make a lot of progress for brush models

Light maps are maybe updating, but as nothing is actually rendered yet,
it's hard to tell.
---
 include/QF/Vulkan/qf_bsp.h                   |  134 ++
 include/QF/Vulkan/qf_lightmap.h              |   48 +
 include/QF/Vulkan/qf_main.h                  |   37 +
 include/QF/Vulkan/qf_model.h                 |   44 +
 include/QF/Vulkan/texture.h                  |    4 +
 include/r_local.h                            |    2 +
 include/vid_vulkan.h                         |    1 +
 libs/models/brush/vulkan_model_brush.c       |   52 +-
 libs/video/renderer/Makemodule.am            |    3 +
 libs/video/renderer/vid_render_vulkan.c      |   28 +-
 libs/video/renderer/vulkan/qfpipeline.plist  |  160 +++
 libs/video/renderer/vulkan/quakebsp.frag     |    9 +-
 libs/video/renderer/vulkan/quakebsp.vert     |    5 +-
 libs/video/renderer/vulkan/texture.c         |    6 +
 libs/video/renderer/vulkan/vulkan_bsp.c      | 1286 ++++++++++++++++++
 libs/video/renderer/vulkan/vulkan_draw.c     |    3 +-
 libs/video/renderer/vulkan/vulkan_lightmap.c |  279 ++++
 libs/video/renderer/vulkan/vulkan_main.c     |  250 ++++
 18 files changed, 2329 insertions(+), 22 deletions(-)
 create mode 100644 include/QF/Vulkan/qf_bsp.h
 create mode 100644 include/QF/Vulkan/qf_lightmap.h
 create mode 100644 include/QF/Vulkan/qf_main.h
 create mode 100644 include/QF/Vulkan/qf_model.h
 create mode 100644 libs/video/renderer/vulkan/vulkan_bsp.c
 create mode 100644 libs/video/renderer/vulkan/vulkan_lightmap.c
 create mode 100644 libs/video/renderer/vulkan/vulkan_main.c

diff --git a/include/QF/Vulkan/qf_bsp.h b/include/QF/Vulkan/qf_bsp.h
new file mode 100644
index 000000000..dec2fe085
--- /dev/null
+++ b/include/QF/Vulkan/qf_bsp.h
@@ -0,0 +1,134 @@
+/*
+	qf_bsp.h
+
+	Vulkan specific brush model stuff
+
+	Copyright (C) 2012 Bill Currie <bill@taniwha.org>
+	Copyright (C) 2021 Bill Currie <bill@taniwha.org>
+
+	Author: Bill Currie <bill@taniwha.org>
+	Date: 2012/1/7
+	Date: 2021/1/18
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifndef __QF_Vulkan_qf_bsp_h
+#define __QF_Vulkan_qf_bsp_h
+
+#include "QF/darray.h"
+#include "QF/model.h"
+#include "QF/Vulkan/qf_vid.h"
+
+typedef struct bspvert_s {
+	quat_t      vertex;
+	quat_t      tlst;
+} bspvert_t;
+
+typedef struct elements_s {
+	struct elements_s *_next;
+	struct elements_s *next;
+	byte       *base;
+	struct dstring_s *list;
+} elements_t;
+
+typedef struct elechain_s {
+	struct elechain_s *_next;
+	struct elechain_s *next;
+	int         index;
+	elements_t *elements;
+	vec_t      *transform;
+	float      *color;
+} elechain_t;
+
+typedef struct bspframe_s {
+	uint32_t    *indeces;
+	VkCommandBuffer bsp_cmd;
+	VkCommandBuffer turb_cmd;
+	VkCommandBuffer sky_cmd;
+	VkDescriptorSet descriptors;
+} bspframe_t;
+
+typedef struct bspframeset_s
+    DARRAY_TYPE (bspframe_t) bspframeset_t;
+
+typedef struct texchainset_s
+    DARRAY_TYPE (struct vulktex_s *) texchainset_t;
+
+typedef struct bspctx_s {
+	instsurf_t  *waterchain;
+	instsurf_t **waterchain_tail;
+	instsurf_t  *sky_chain;
+	instsurf_t **sky_chain_tail;
+
+	texchainset_t texture_chains;
+
+	// for world and non-instance models
+	instsurf_t  *static_instsurfs;
+	instsurf_t **static_instsurfs_tail;
+	instsurf_t  *free_static_instsurfs;
+
+	// for instance models
+	elechain_t  *elechains;
+	elechain_t **elechains_tail;
+	elechain_t  *free_elechains;
+	elements_t  *elementss;
+	elements_t **elementss_tail;
+	elements_t  *free_elementss;
+	instsurf_t  *instsurfs;
+	instsurf_t **instsurfs_tail;
+	instsurf_t  *free_instsurfs;
+
+	struct qfv_tex_s *skybox_tex;
+	quat_t       sky_rotation[2];
+	quat_t       sky_velocity;
+	quat_t       sky_fix;
+	double       sky_time;
+
+	quat_t       default_color;
+	quat_t       last_color;
+
+	struct scrap_s *light_scrap;
+	struct qfv_stagebuf_s *light_stage;
+
+	VkDeviceMemory texture_memory;
+	VkPipeline   main;
+	VkPipelineLayout layout;
+	size_t       vertex_buffer_size;
+	size_t       index_buffer_size;
+	VkBuffer     vertex_buffer;
+	VkDeviceMemory vertex_memory;
+	VkBuffer     index_buffer;
+	VkDeviceMemory index_memory;
+	bspframeset_t frames;
+} bspctx_t;
+
+struct vulkan_ctx_s;
+void Vulkan_ClearElements (struct vulkan_ctx_s *ctx);
+void Vulkan_DrawWorld (struct vulkan_ctx_s *ctx);
+void Vulkan_DrawSky (struct vulkan_ctx_s *ctx);
+void Vulkan_RegisterTextures (model_t **models, int num_models,
+							  struct vulkan_ctx_s *ctx);
+void Vulkan_BuildDisplayLists (model_t **models, int num_models,
+							   struct vulkan_ctx_s *ctx);
+void Vulkan_Bsp_Init (struct vulkan_ctx_s *ctx);
+void Vulkan_Bsp_Shutdown (struct vulkan_ctx_s *ctx);
+void Vulkan_DrawWaterSurfaces (struct vulkan_ctx_s *ctx);
+
+#endif//__QF_Vulkan_qf_bsp_h
diff --git a/include/QF/Vulkan/qf_lightmap.h b/include/QF/Vulkan/qf_lightmap.h
new file mode 100644
index 000000000..649a5b139
--- /dev/null
+++ b/include/QF/Vulkan/qf_lightmap.h
@@ -0,0 +1,48 @@
+/*
+	qf_lightmap.h
+
+	Vulkan lightmap stuff from the renderer.
+
+	Copyright (C) 2021 Bill Currie <bill@taniwha.org>
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+
+#ifndef __QF_Vulkan_qf_lightmap_h
+#define __QF_Vulkan_qf_lightmap_h
+
+#define MAX_LIGHTMAPS	1024
+#define BLOCK_WIDTH		64
+#define BLOCK_HEIGHT	64
+
+#include "QF/Vulkan/qf_vid.h"
+
+struct vulkan_ctx_s;
+struct model_s;
+struct msurface_s;
+
+void Vulkan_lightmap_init (struct vulkan_ctx_s *ctx);
+void Vulkan_BuildLightmaps (struct model_s **models, int num_models, struct vulkan_ctx_s *ctx);
+void Vulkan_CalcLightmaps (struct vulkan_ctx_s *ctx);
+void Vulkan_BuildLightMap (struct msurface_s *surf, struct vulkan_ctx_s *ctx);
+VkImageView Vulkan_LightmapImageView (struct vulkan_ctx_s *ctx) __attribute__((pure));
+void Vulkan_FlushLightmaps (struct vulkan_ctx_s *ctx);
+
+#endif//__QF_Vulkan_qf_lightmap_h
diff --git a/include/QF/Vulkan/qf_main.h b/include/QF/Vulkan/qf_main.h
new file mode 100644
index 000000000..4b487da5e
--- /dev/null
+++ b/include/QF/Vulkan/qf_main.h
@@ -0,0 +1,37 @@
+/*
+	qf_main.h
+
+	Vulkan main stuff from the renderer.
+
+	Copyright (C) 2021 Bill Currie <bill@taniwha.org>
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+
+#ifndef __QF_Vulkan_qf_main_h
+#define __QF_Vulkan_qf_main_h
+
+struct vulkan_ctx_s;
+
+void Vulkan_NewMap (model_t *worldmodel, struct model_s **models,
+					int num_models, struct vulkan_ctx_s *ctx);
+void Vulkan_RenderView (struct vulkan_ctx_s *ctx);
+
+#endif//__QF_Vulkan_qf_main_h
diff --git a/include/QF/Vulkan/qf_model.h b/include/QF/Vulkan/qf_model.h
new file mode 100644
index 000000000..3a42e131d
--- /dev/null
+++ b/include/QF/Vulkan/qf_model.h
@@ -0,0 +1,44 @@
+/*
+	qf_model.h
+
+	Vulkan specific model stuff
+
+	Copyright (C) 2012 Bill Currie <bill@taniwha.org>
+	Copyright (C) 2021 Bill Currie <bill@taniwha.org>
+
+	Author: Bill Currie <bill@taniwha.org>
+	Date: 2012/1/7
+	Date: 2021/1/19
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifndef __QF_Vulkan_qf_model_h
+#define __QF_Vulkan_qf_model_h
+
+#include "QF/darray.h"
+#include "QF/model.h"
+#include "QF/Vulkan/qf_vid.h"
+
+typedef struct modelctx_s {
+	struct vulkan_ctx_s *ctx;
+	VkDeviceMemory texture_memory;
+} modelctx_t;
+
+#endif//__QF_Vulkan_qf_model_h
diff --git a/include/QF/Vulkan/texture.h b/include/QF/Vulkan/texture.h
index 39f5b07f2..35aaf5bb5 100644
--- a/include/QF/Vulkan/texture.h
+++ b/include/QF/Vulkan/texture.h
@@ -5,8 +5,12 @@
 
 typedef struct scrap_s scrap_t;
 
+struct qfv_stagebuf_s;
+struct qfv_device_s;
+
 scrap_t *QFV_CreateScrap (struct qfv_device_s *device, int size,
 						  QFFormat format);
+size_t QFV_ScrapSize (scrap_t *scrap);
 void QFV_ScrapClear (scrap_t *scrap);
 void QFV_DestroyScrap (scrap_t *scrap);
 VkImageView QFV_ScrapImageView (scrap_t *scrap) __attribute__((pure));
diff --git a/include/r_local.h b/include/r_local.h
index ebf1a9dd6..4a3645ded 100644
--- a/include/r_local.h
+++ b/include/r_local.h
@@ -180,6 +180,7 @@ void R_InsertNewEdges (edge_t *edgestoadd, edge_t *edgelist);
 void R_StepActiveU (edge_t *pedge);
 void R_RemoveEdges (edge_t *pedge);
 void R_AddTexture (texture_t *tex);
+struct vulkan_ctx_s;
 void R_ClearTextures (void);
 void R_InitSurfaceChains (model_t *model);
 
@@ -313,6 +314,7 @@ void R_MarkLights (const vec3_t lightorigin, struct dlight_s *light, int bit,
 				   model_t *model);
 
 void R_LoadSkys (const char *);
+//void Vulkan_R_LoadSkys (const char *, struct vulkan_ctx_s *ctx);
 
 void R_LowFPPrecision (void);
 void R_HighFPPrecision (void);
diff --git a/include/vid_vulkan.h b/include/vid_vulkan.h
index 90d4908f2..92208425e 100644
--- a/include/vid_vulkan.h
+++ b/include/vid_vulkan.h
@@ -63,6 +63,7 @@ typedef struct vulkan_ctx_s {
 	struct hashtab_s *descriptorPools;
 	struct hashtab_s *samplers;
 
+	struct bspctx_s *bsp_context;
 	struct drawctx_s *draw_context;
 
 	VkCommandPool cmdpool;
diff --git a/libs/models/brush/vulkan_model_brush.c b/libs/models/brush/vulkan_model_brush.c
index fe5fbfce5..52826d280 100644
--- a/libs/models/brush/vulkan_model_brush.c
+++ b/libs/models/brush/vulkan_model_brush.c
@@ -217,11 +217,57 @@ Vulkan_Mod_ProcessTexture (texture_t *tx, vulkan_ctx_t *ctx)
 void
 Vulkan_Mod_LoadLighting (bsp_t *bsp, vulkan_ctx_t *ctx)
 {
-	mod_lightmap_bytes = 1;
+	mod_lightmap_bytes = 3;
 	if (!bsp->lightdatasize) {
 		loadmodel->lightdata = NULL;
 		return;
 	}
-	loadmodel->lightdata = Hunk_AllocName (bsp->lightdatasize, loadname);
-	memcpy (loadmodel->lightdata, bsp->lightdata, bsp->lightdatasize);
+
+	byte        d;
+	byte       *in, *out, *data;
+	size_t      i;
+	int         ver;
+	QFile      *lit_file;
+
+	loadmodel->lightdata = 0;
+	if (mod_lightmap_bytes > 1) {
+		// LordHavoc: check for a .lit file to load
+		dstring_t  *litfilename = dstring_new ();
+		dstring_copystr (litfilename, loadmodel->name);
+		QFS_StripExtension (litfilename->str, litfilename->str);
+		dstring_appendstr (litfilename, ".lit");
+		lit_file = QFS_VOpenFile (litfilename->str, 0, loadmodel->vpath);
+		data = (byte *) QFS_LoadHunkFile (lit_file);
+		if (data) {
+			if (data[0] == 'Q' && data[1] == 'L' && data[2] == 'I'
+				&& data[3] == 'T') {
+				ver = LittleLong (((int32_t *) data)[1]);
+				if (ver == 1) {
+					Sys_MaskPrintf (SYS_DEV, "%s loaded", litfilename->str);
+					loadmodel->lightdata = data + 8;
+				} else {
+					Sys_MaskPrintf (SYS_DEV,
+									"Unknown .lit file version (%d)\n", ver);
+				}
+			} else {
+				Sys_MaskPrintf (SYS_DEV, "Corrupt .lit file (old version?)\n");
+			}
+		}
+		dstring_delete (litfilename);
+	}
+	if (loadmodel->lightdata || !bsp->lightdatasize) {
+		return;
+	}
+	// LordHavoc: oh well, expand the white lighting data
+	loadmodel->lightdata = Hunk_AllocName (bsp->lightdatasize * 3,
+										   loadmodel->name);
+	in = bsp->lightdata;
+	out = loadmodel->lightdata;
+
+	for (i = 0; i < bsp->lightdatasize ; i++) {
+		d = *in++;
+		*out++ = d;
+		*out++ = d;
+		*out++ = d;
+	}
 }
diff --git a/libs/video/renderer/Makemodule.am b/libs/video/renderer/Makemodule.am
index b149d528c..a200747ff 100644
--- a/libs/video/renderer/Makemodule.am
+++ b/libs/video/renderer/Makemodule.am
@@ -236,7 +236,10 @@ libs_video_renderer_vid_render_vulkan_la_SOURCES = \
 	libs/video/renderer/vulkan/util.c \
 	libs/video/renderer/vulkan/util.h \
 	libs/video/renderer/vulkan/vkparse.c \
+	libs/video/renderer/vulkan/vulkan_bsp.c \
 	libs/video/renderer/vulkan/vulkan_draw.c \
+	libs/video/renderer/vulkan/vulkan_lightmap.c \
+	libs/video/renderer/vulkan/vulkan_main.c \
 	libs/video/renderer/vulkan/vulkan_matrices.c \
 	libs/video/renderer/vulkan/vulkan_particles.c \
 	libs/video/renderer/vulkan/vulkan_texture.c \
diff --git a/libs/video/renderer/vid_render_vulkan.c b/libs/video/renderer/vid_render_vulkan.c
index 4d2744089..e6f993b38 100644
--- a/libs/video/renderer/vid_render_vulkan.c
+++ b/libs/video/renderer/vid_render_vulkan.c
@@ -39,7 +39,10 @@
 #include "QF/plugin/general.h"
 #include "QF/plugin/vid_render.h"
 
+#include "QF/Vulkan/qf_bsp.h"
 #include "QF/Vulkan/qf_draw.h"
+#include "QF/Vulkan/qf_lightmap.h"
+#include "QF/Vulkan/qf_main.h"
 #include "QF/Vulkan/qf_particles.h"
 #include "QF/Vulkan/qf_vid.h"
 #include "QF/Vulkan/command.h"
@@ -92,6 +95,7 @@ vulkan_R_Init (void)
 	// FIXME this should be staged so screen updates can begin while pipelines
 	// are being built
 	vulkan_ctx->pipeline = Vulkan_CreatePipeline (vulkan_ctx, "pipeline");
+	Vulkan_Bsp_Init (vulkan_ctx);
 	Vulkan_Draw_Init (vulkan_ctx);
 	Vulkan_Particles_Init (vulkan_ctx);
 
@@ -116,12 +120,6 @@ vulkan_R_RenderFrame (SCR_Func scr_3dfunc, SCR_Func *scr_funcs)
 	VkDevice    dev = device->dev;
 	qfv_queue_t *queue = &vulkan_ctx->device->queue;
 
-	scr_3dfunc ();
-	while (*scr_funcs) {
-		(*scr_funcs) ();
-		scr_funcs++;
-	}
-
 	__auto_type framebuffer
 		= &vulkan_ctx->framebuffers.a[vulkan_ctx->curFrame];
 
@@ -145,6 +143,12 @@ vulkan_R_RenderFrame (SCR_Func scr_3dfunc, SCR_Func *scr_funcs)
 													  attachments,
 													  sc->extent, 1);
 
+	scr_3dfunc ();
+	while (*scr_funcs) {
+		(*scr_funcs) ();
+		scr_funcs++;
+	}
+
 	Vulkan_FlushText (vulkan_ctx);
 
 	VkCommandBufferBeginInfo beginInfo
@@ -168,6 +172,8 @@ vulkan_R_RenderFrame (SCR_Func scr_3dfunc, SCR_Func *scr_funcs)
 	dfunc->vkCmdExecuteCommands (framebuffer->cmdBuffer,
 								 framebuffer->subCommand->size,
 								 framebuffer->subCommand->a);
+	// reset for next time around
+	framebuffer->subCommand->size = 0;
 
 	dfunc->vkCmdEndRenderPass (framebuffer->cmdBuffer);
 	dfunc->vkEndCommandBuffer (framebuffer->cmdBuffer);
@@ -208,6 +214,9 @@ vulkan_R_RenderFrame (SCR_Func scr_3dfunc, SCR_Func *scr_funcs)
 static void
 vulkan_R_ClearState (void)
 {
+	R_ClearEfrags ();
+	R_ClearDlights ();
+	Vulkan_ClearParticles (vulkan_ctx);
 }
 
 static void
@@ -218,6 +227,7 @@ vulkan_R_LoadSkys (const char *skyname)
 static void
 vulkan_R_NewMap (model_t *worldmodel, model_t **models, int num_models)
 {
+	Vulkan_NewMap (worldmodel, models, num_models, vulkan_ctx);
 }
 
 static void
@@ -228,6 +238,7 @@ vulkan_R_LineGraph (int x, int y, int *h_vals, int count)
 static void
 vulkan_R_RenderView (void)
 {
+	Vulkan_RenderView (vulkan_ctx);
 }
 
 static void
@@ -359,13 +370,13 @@ vulkan_R_ViewChanged (float aspect)
 static void
 vulkan_R_ClearParticles (void)
 {
-	Vulkan_R_ClearParticles (vulkan_ctx);
+	Vulkan_ClearParticles (vulkan_ctx);
 }
 
 static void
 vulkan_R_InitParticles (void)
 {
-	Vulkan_R_InitParticles (vulkan_ctx);
+	Vulkan_InitParticles (vulkan_ctx);
 }
 
 static void
@@ -593,6 +604,7 @@ vulkan_vid_render_shutdown (void)
 	df->vkDestroyFence (dev, vulkan_ctx->fence, 0);
 	df->vkDestroyCommandPool (dev, vulkan_ctx->cmdpool, 0);
 	Vulkan_Draw_Shutdown (vulkan_ctx);
+	Vulkan_Bsp_Shutdown (vulkan_ctx);
 	Vulkan_Shutdown_Common (vulkan_ctx);
 }
 
diff --git a/libs/video/renderer/vulkan/qfpipeline.plist b/libs/video/renderer/vulkan/qfpipeline.plist
index 4bc6017e9..822e187a5 100644
--- a/libs/video/renderer/vulkan/qfpipeline.plist
+++ b/libs/video/renderer/vulkan/qfpipeline.plist
@@ -9,6 +9,8 @@
 		pushcolor = $builtin/pushcolor.frag;
 		twodv = $builtin/twod.vert;
 		twodf = $builtin/twod.frag;
+		quakebspv = $builtin/quakebsp.vert;
+		quakebspf = $builtin/quakebsp.frag;
 	};
 	samplers = {
 		quakepic = {
@@ -44,6 +46,20 @@
 				},
 			);
 		};
+		quakebsp = {
+			flags = 0;
+			maxSets = $framebuffers.size;
+			bindings = (
+				{
+					type = uniform_buffer;
+					descriptorCount = $framebuffers.size;
+				},
+				{
+					type = combined_image_sampler;
+					descriptorCount = "5z * $framebuffers.size";
+				},
+			);
+		};
 	};
 	setLayouts = {
 		twod = {
@@ -62,6 +78,46 @@
 				},
 			);
 		};
+		quakebsp = {
+			bindings = (
+				{
+					binding = 0;
+					descriptorType = uniform_buffer;
+					descriptorCount = 1;
+					stageFlags = vertex;
+				},
+				{
+					binding = 1;
+					descriptorType = combined_image_sampler;
+					descriptorCount = 1;
+					stageFlags = fragment;
+				},
+				{
+					binding = 2;
+					descriptorType = combined_image_sampler;
+					descriptorCount = 1;
+					stageFlags = fragment;
+				},
+				{
+					binding = 3;
+					descriptorType = combined_image_sampler;
+					descriptorCount = 1;
+					stageFlags = fragment;
+				},
+				{
+					binding = 4;
+					descriptorType = combined_image_sampler;
+					descriptorCount = 1;
+					stageFlags = fragment;
+				},
+				{
+					binding = 5;
+					descriptorType = combined_image_sampler;
+					descriptorCount = 1;
+					stageFlags = fragment;
+				},
+			);
+		};
 		something = {
 			flags = 0;
 			bindings = (
@@ -84,6 +140,21 @@
 		twod = {
 			setLayouts = (twod);
 		};
+		quakebsp = {
+			setLayouts = (quakebsp);
+			pushConstantRanges = (
+				{
+					stageFlags = vertex;
+					offset = 0;
+					size = "16 * 4";
+				},
+				{
+					stageFlags = fragment;
+					offset = 0;
+					size = 32;
+				},
+			);
+		};
 		something = {
 			setLayouts = (something);
 			pushConstantRanges = (
@@ -96,6 +167,95 @@
 		};
 	};
 	pipelines = {
+		quakebsp.main = {
+			stages = (
+				{ stage = vertex; name = main; module = quakebspv; },
+				{ stage = fragment; name = main; module = quakebspf; },
+			);
+			vertexInput = {
+				bindings = (
+					{
+						binding = 0;
+						stride = "3 * 4 * 4";
+						inputRate = vertex;
+					},
+				);
+				attributes = (
+					{
+						location = 0;
+						binding = 0;
+						format = r32g32b32a32_sfloat;
+						offset = 0;
+					},
+					{
+						location = 1;
+						binding = 0;
+						format = r32g32b32a32_sfloat;
+						offset = 8;
+					},
+				);
+			};
+			inputAssembly = {
+				topology = triangle_fan;
+				primitiveRestartEnable = true;
+			};
+			viewport = {
+				viewports = (
+					{
+						x = 0; y = 0;
+						width = 640; height = 480;
+						minDepth = 0; maxDepth = 1;
+					}
+				);
+				scissors = (
+					{
+						offset = { x = 0; y = 0 };
+						extent = { width = 640; height = 480; };
+					},
+				);
+			};
+			rasterization = {
+				depthClampEnable = false;
+				rasterizerDiscardEnable = false;
+				polygonMode = fill;
+				cullMode = back;
+				frontFace = clockwise;
+				depthBiasEnable = false;
+				lineWidth = 1;
+			};
+			multisample = {
+				rasterizationSamples = $msaaSamples;
+				sampleShadingEnable = false;
+				minSampleShading = 0.5f;
+				alphaToCoverageEnable = false;
+				alphaToOneEnable = false;
+			};
+			depthStencil = {
+				depthTestEnable = true;
+				depthWriteEnable = true;
+				depthCompareOp = less_or_equal;
+				depthBoundsTestEnable = false;
+				stencilTestEnable = false;
+			};
+			colorBlend = {
+				logicOpEnable = false;
+				attachments = ({
+					blendEnable = true;
+					srcColorBlendFactor = src_alpha;
+					dstColorBlendFactor = one_minus_src_alpha;
+					colorBlendOp = add;
+					srcAlphaBlendFactor = src_alpha;
+					dstAlphaBlendFactor = one_minus_src_alpha;
+					alphaBlendOp = add;
+					colorWriteMask = r|g|b|a;
+				});
+			};
+			dynamic = {
+				dynamicState = ( viewport, scissor, blend_constants );
+			};
+			layout = quakebsp;
+			//renderPass = renderpass;
+		};
 		twod = {
 			stages = (
 				{ stage = vertex; name = main; module = twodv; },
diff --git a/libs/video/renderer/vulkan/quakebsp.frag b/libs/video/renderer/vulkan/quakebsp.frag
index 151243249..219ce9212 100644
--- a/libs/video/renderer/vulkan/quakebsp.frag
+++ b/libs/video/renderer/vulkan/quakebsp.frag
@@ -3,8 +3,8 @@
 layout (set = 0, binding = 1) uniform sampler2D Texture;
 layout (set = 0, binding = 2) uniform sampler2D Glowmap;
 layout (set = 0, binding = 3) uniform sampler2D Lightmap;
-layout (set = 0, binding = 4) uniform samplerCube SkyCube;
-layout (set = 0, binding = 5) uniform sampler2DArray SkySheet;
+layout (set = 0, binding = 4) uniform sampler2DArray SkySheet;
+layout (set = 0, binding = 5) uniform samplerCube SkyCube;
 
 layout (push_constant) uniform PushConstants {
 	float       time;
@@ -12,8 +12,7 @@ layout (push_constant) uniform PushConstants {
 };
 
 layout (location = 0) in vec4 tl_st;
-layout (location = 1) in vec4 color;
-layout (location = 2) out vec3 direction;
+layout (location = 1) in vec3 direction;
 
 layout (location = 0) out vec4 frag_color;
 
@@ -111,7 +110,7 @@ main (void)
 	if (doSkyCube || doSkySheet) {
 		c = sky_color (direction, time);
 	} else {
-		c = texture (Texture, t_st) * color;
+		c = texture (Texture, t_st);
 	}
 	if (doLight) {
 		c *= texture (Lightmap, l_st);
diff --git a/libs/video/renderer/vulkan/quakebsp.vert b/libs/video/renderer/vulkan/quakebsp.vert
index 11ae0c90a..bb9e87e4a 100644
--- a/libs/video/renderer/vulkan/quakebsp.vert
+++ b/libs/video/renderer/vulkan/quakebsp.vert
@@ -12,11 +12,9 @@ layout (push_constant) uniform PushConstants {
 
 layout (location = 0) in vec4 vertex;
 layout (location = 1) in vec4 tl_uv;
-layout (location = 2) in vec4 vcolor;
 
 layout (location = 0) out vec4 tl_st;
-layout (location = 1) out vec4 color;
-layout (location = 2) out vec3 direction;
+layout (location = 1) out vec3 direction;
 
 void
 main (void)
@@ -24,5 +22,4 @@ main (void)
 	gl_Position = Projection * (View * (Model * vertex));
 	direction = (Sky * vertex).xyz;
 	tl_st = tl_uv;
-	color = vcolor;
 }
diff --git a/libs/video/renderer/vulkan/texture.c b/libs/video/renderer/vulkan/texture.c
index d926632a7..112c71a92 100644
--- a/libs/video/renderer/vulkan/texture.c
+++ b/libs/video/renderer/vulkan/texture.c
@@ -135,6 +135,12 @@ QFV_CreateScrap (qfv_device_t *device, int size, QFFormat format)
 	return scrap;
 }
 
+size_t
+QFV_ScrapSize (scrap_t *scrap)
+{
+	return scrap->rscrap.width * scrap->rscrap.height * scrap->bpp;
+}
+
 void
 QFV_ScrapClear (scrap_t *scrap)
 {
diff --git a/libs/video/renderer/vulkan/vulkan_bsp.c b/libs/video/renderer/vulkan/vulkan_bsp.c
new file mode 100644
index 000000000..466d6bbd7
--- /dev/null
+++ b/libs/video/renderer/vulkan/vulkan_bsp.c
@@ -0,0 +1,1286 @@
+/*
+	vulkan_bsp.c
+
+	Vulkan bsp
+
+	Copyright (C) 2012       Bill Currie <bill@taniwha.org>
+	Copyright (C) 2021       Bill Currie <bill@taniwha.org>
+
+	Author: Bill Currie <bill@taniwha.org>
+	Date: 2012/1/7
+	Date: 2021/1/18
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#define NH_DEFINE
+//#include "namehack.h"
+
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#include <stdlib.h>
+
+#include "qfalloca.h"
+
+#include "QF/cvar.h"
+#include "QF/darray.h"
+#include "QF/dstring.h"
+#include "QF/image.h"
+#include "QF/render.h"
+#include "QF/sys.h"
+#include "QF/va.h"
+#include "QF/vrect.h"
+
+#include "QF/Vulkan/qf_bsp.h"
+#include "QF/Vulkan/qf_lightmap.h"
+#include "QF/Vulkan/qf_texture.h"
+#include "QF/Vulkan/command.h"
+#include "QF/Vulkan/descriptor.h"
+#include "QF/Vulkan/device.h"
+#include "QF/Vulkan/staging.h"
+#include "QF/Vulkan/texture.h"
+
+#include "r_internal.h"
+#include "vid_vulkan.h"
+#include "vkparse.h"
+
+#define ALLOC_CHUNK 64
+
+typedef struct {
+	uint32_t    count;
+	uint32_t    indices[1];
+} glslpoly_t;
+
+#define CHAIN_SURF_F2B(surf,chain)							\
+	do { 													\
+		instsurf_t *inst = (surf)->instsurf;				\
+		if (__builtin_expect(!inst, 1))						\
+			(surf)->tinst = inst = get_instsurf (bctx);		\
+		inst->surface = (surf);								\
+		*(chain##_tail) = inst;								\
+		(chain##_tail) = &inst->tex_chain;					\
+		*(chain##_tail) = 0;								\
+	} while (0)
+
+#define CHAIN_SURF_B2F(surf,chain) 							\
+	do { 													\
+		instsurf_t *inst = (surf)->instsurf;				\
+		if (__builtin_expect(!inst, 1))						\
+			(surf)->tinst = inst = get_instsurf (bctx);		\
+		inst->surface = (surf);								\
+		inst->tex_chain = (chain);							\
+		(chain) = inst;										\
+	} while (0)
+
+#define GET_RELEASE(type,name) \
+static inline type *												\
+get_##name (bspctx_t *bctx)											\
+{																	\
+	type       *ele;												\
+	if (!bctx->free_##name##s) {									\
+		int         i;												\
+		bctx->free_##name##s = calloc (ALLOC_CHUNK, sizeof (type));	\
+		for (i = 0; i < ALLOC_CHUNK - 1; i++)						\
+			bctx->free_##name##s[i]._next = &bctx->free_##name##s[i + 1];	\
+	}																\
+	ele = bctx->free_##name##s;										\
+	bctx->free_##name##s = ele->_next;								\
+	ele->_next = 0;													\
+	*bctx->name##s_tail = ele;										\
+	bctx->name##s_tail = &ele->_next;								\
+	return ele;														\
+}																	\
+static inline void													\
+release_##name##s (bspctx_t *bctx)									\
+{																	\
+	if (bctx->name##s) {											\
+		*bctx->name##s_tail = bctx->free_##name##s;					\
+		bctx->free_##name##s = bctx->name##s;						\
+		bctx->name##s = 0;											\
+		bctx->name##s_tail = &bctx->name##s;						\
+	}																\
+}
+
+GET_RELEASE (elechain_t, elechain)
+GET_RELEASE (elements_t, elements)
+GET_RELEASE (instsurf_t, static_instsurf)
+GET_RELEASE (instsurf_t, instsurf)
+
+static void
+add_texture (texture_t *tx, vulkan_ctx_t *ctx)
+{
+	bspctx_t   *bctx = ctx->bsp_context;
+
+	vulktex_t  *tex = tx->render;
+	DARRAY_APPEND (&bctx->texture_chains, tex);
+	tex->tex_chain = 0;
+	tex->tex_chain_tail = &tex->tex_chain;
+	tex->elechain = 0;
+	tex->elechain_tail = &tex->elechain;
+}
+
+static void
+init_surface_chains (model_t *model, vulkan_ctx_t *ctx)
+{
+	bspctx_t   *bctx = ctx->bsp_context;
+	int         i;
+
+	release_static_instsurfs (bctx);
+	release_instsurfs (bctx);
+
+	for (i = 0; i < model->nummodelsurfaces; i++) {
+		model->surfaces[i].instsurf = get_static_instsurf (bctx);
+		model->surfaces[i].instsurf->surface = &model->surfaces[i];
+	}
+}
+
+static inline void
+clear_tex_chain (vulktex_t *tex)
+{
+	tex->tex_chain = 0;
+	tex->tex_chain_tail = &tex->tex_chain;
+	tex->elechain = 0;
+	tex->elechain_tail = &tex->elechain;
+}
+
+static void
+clear_texture_chains (bspctx_t *bctx)
+{
+	for (size_t i = 0; i < bctx->texture_chains.size; i++) {
+		if (!bctx->texture_chains.a[i])
+			continue;
+		clear_tex_chain (bctx->texture_chains.a[i]);
+	}
+	clear_tex_chain (r_notexture_mip->render);
+	release_elechains (bctx);
+	release_elementss (bctx);
+	release_instsurfs (bctx);
+}
+
+void
+Vulkan_ClearElements (vulkan_ctx_t *ctx)
+{
+	bspctx_t   *bctx = ctx->bsp_context;
+	release_elechains (bctx);
+	release_elementss (bctx);
+}
+
+static void
+update_lightmap (msurface_t *surf, vulkan_ctx_t *ctx)
+{
+	int         maps;
+
+	for (maps = 0; maps < MAXLIGHTMAPS && surf->styles[maps] != 255; maps++)
+		if (d_lightstylevalue[surf->styles[maps]] != surf->cached_light[maps])
+			goto dynamic;
+
+	if ((surf->dlightframe == r_framecount) || surf->cached_dlight) {
+dynamic:
+		if (r_dynamic->int_val)
+			Vulkan_BuildLightMap (surf, ctx);
+	}
+}
+
+static inline void
+chain_surface (msurface_t *surf, vec_t *transform, float *color,
+			   vulkan_ctx_t *ctx)
+{
+	bspctx_t   *bctx = ctx->bsp_context;
+	instsurf_t *is;
+
+	if (surf->flags & SURF_DRAWSKY) {
+		CHAIN_SURF_F2B (surf, bctx->sky_chain);
+	} else if ((surf->flags & SURF_DRAWTURB) || (color && color[3] < 1.0)) {
+		CHAIN_SURF_B2F (surf, bctx->waterchain);
+	} else {
+		texture_t  *tx;
+		vulktex_t  *tex;
+
+		if (!surf->texinfo->texture->anim_total)
+			tx = surf->texinfo->texture;
+		else
+			tx = R_TextureAnimation (surf);
+		tex = tx->render;
+		CHAIN_SURF_F2B (surf, tex->tex_chain);
+
+		update_lightmap (surf, ctx);
+	}
+	if (!(is = surf->instsurf))
+		is = surf->tinst;
+	is->transform = transform;
+	is->color = color;
+}
+
+static void
+register_textures (model_t *model, vulkan_ctx_t *ctx)
+{
+	int         i;
+	texture_t  *tex;
+
+	for (i = 0; i < model->numtextures; i++) {
+		tex = model->textures[i];
+		if (!tex)
+			continue;
+		add_texture (tex, ctx);
+	}
+}
+
+static void
+clear_textures (vulkan_ctx_t *ctx)
+{
+	bspctx_t   *bctx = ctx->bsp_context;
+	bctx->texture_chains.size = 0;
+}
+
+void
+Vulkan_RegisterTextures (model_t **models, int num_models, vulkan_ctx_t *ctx)
+{
+	int         i;
+	model_t    *m;
+
+	clear_textures (ctx);
+	init_surface_chains (r_worldentity.model, ctx);
+	add_texture (r_notexture_mip, ctx);
+	register_textures (r_worldentity.model, ctx);
+	for (i = 0; i < num_models; i++) {
+		m = models[i];
+		if (!m)
+			continue;
+		// sub-models are done as part of the main model
+		if (*m->name == '*')
+			continue;
+		// world has already been done, not interested in non-brush models
+		if (m == r_worldentity.model || m->type != mod_brush)
+			continue;
+		m->numsubmodels = 1; // no support for submodels in non-world model
+		register_textures (m, ctx);
+	}
+}
+
+static elechain_t *
+add_elechain (vulktex_t *tex, int ec_index, bspctx_t *bctx)
+{
+	elechain_t *ec;
+
+	ec = get_elechain (bctx);
+	ec->elements = get_elements (bctx);
+	ec->index = ec_index;
+	ec->transform = 0;
+	ec->color = 0;
+	*tex->elechain_tail = ec;
+	tex->elechain_tail = &ec->next;
+	return ec;
+}
+
+static void
+build_surf_displist (model_t **models, msurface_t *fa, int base,
+					 dstring_t *vert_list)
+{
+	int         numverts;
+	int         numtris;
+	int         numindices;
+	int         i;
+	vec_t      *vec;
+	mvertex_t  *vertices;
+	medge_t    *edges;
+	int        *surfedges;
+	int         index;
+	bspvert_t  *verts;
+	glslpoly_t *poly;
+	uint32_t   *ind;
+	float       s, t;
+
+	if (fa->ec_index < 0) {
+		vertices = models[-fa->ec_index - 1]->vertexes;
+		edges = models[-fa->ec_index - 1]->edges;
+		surfedges = models[-fa->ec_index - 1]->surfedges;
+	} else {
+		vertices = r_worldentity.model->vertexes;
+		edges = r_worldentity.model->edges;
+		surfedges = r_worldentity.model->surfedges;
+	}
+	numverts = fa->numedges;
+	numtris = numverts - 2;
+	numindices = numtris * 3;
+	verts = alloca (numverts * sizeof (bspvert_t));
+	poly = malloc (field_offset (glslpoly_t, indices[numindices]));
+	poly->count = numindices;
+	for (i = 0, ind = poly->indices; i < numtris; i++) {
+		*ind++ = base;
+		*ind++ = base + i + 1;
+		*ind++ = base + i + 2;
+	}
+	fa->polys = (glpoly_t *) poly;
+
+	for (i = 0; i < numverts; i++) {
+		index = surfedges[fa->firstedge + i];
+		if (index > 0)
+			vec = vertices[edges[index].v[0]].position;
+		else
+			vec = vertices[edges[-index].v[1]].position;
+
+		s = DotProduct (vec, fa->texinfo->vecs[0]) + fa->texinfo->vecs[0][3];
+		t = DotProduct (vec, fa->texinfo->vecs[1]) + fa->texinfo->vecs[1][3];
+		VectorCopy (vec, verts[i].vertex);
+		verts[i].vertex[3] = 1;
+		verts[i].tlst[0] = s / fa->texinfo->texture->width;
+		verts[i].tlst[1] = t / fa->texinfo->texture->height;
+
+		//lightmap texture coordinates
+		if (!fa->lightpic) {
+			// sky and water textures don't have lightmaps
+			verts[i].tlst[2] = 0;
+			verts[i].tlst[3] = 0;
+			continue;
+		}
+		s = DotProduct (vec, fa->texinfo->vecs[0]) + fa->texinfo->vecs[0][3];
+		t = DotProduct (vec, fa->texinfo->vecs[1]) + fa->texinfo->vecs[1][3];
+		s -= fa->texturemins[0];
+		t -= fa->texturemins[1];
+		s += fa->lightpic->rect->x * 16 + 8;
+		t += fa->lightpic->rect->y * 16 + 8;
+		s /= 16;
+		t /= 16;
+		verts[i].tlst[2] = s * fa->lightpic->size;
+		verts[i].tlst[3] = t * fa->lightpic->size;
+	}
+	dstring_append (vert_list, (char *) verts, numverts * sizeof (bspvert_t));
+}
+
+void
+Vulkan_BuildDisplayLists (model_t **models, int num_models, vulkan_ctx_t *ctx)
+{
+	bspctx_t   *bctx = ctx->bsp_context;
+	int         i, j;
+	int         vertex_index_base;
+	model_t    *m;
+	dmodel_t   *dm;
+	msurface_t *surf;
+	dstring_t  *vertices;
+
+	QuatSet (0, 0, sqrt(0.5), sqrt(0.5), bctx->sky_fix);	// proper skies
+	QuatSet (0, 0, 0, 1, bctx->sky_rotation[0]);
+	QuatCopy (bctx->sky_rotation[0], bctx->sky_rotation[1]);
+	QuatSet (0, 0, 0, 0, bctx->sky_velocity);
+	QuatExp (bctx->sky_velocity, bctx->sky_velocity);
+	bctx->sky_time = vr_data.realtime;
+
+	// now run through all surfaces, chaining them to their textures, thus
+	// effectively sorting the surfaces by texture (without worrying about
+	// surface order on the same texture chain).
+	for (i = 0; i < num_models; i++) {
+		m = models[i];
+		if (!m)
+			continue;
+		// sub-models are done as part of the main model
+		if (*m->name == '*')
+			continue;
+		// non-bsp models don't have surfaces.
+		dm = m->submodels;
+		for (j = 0; j < m->numsurfaces; j++) {
+			vulktex_t  *tex;
+			if (j == dm->firstface + dm->numfaces) {
+				dm++;
+				if (dm - m->submodels == m->numsubmodels) {
+					// limit the surfaces
+					// probably never hit
+					Sys_Printf ("R_BuildDisplayLists: too many surfaces\n");
+					m->numsurfaces = j;
+					break;
+				}
+			}
+			surf = m->surfaces + j;
+			surf->ec_index = dm - m->submodels;
+			if (!surf->ec_index && m != r_worldentity.model)
+				surf->ec_index = -1 - i;	// instanced model
+			tex = surf->texinfo->texture->render;
+			CHAIN_SURF_F2B (surf, tex->tex_chain);
+		}
+	}
+	// All vertices from all brush models go into one giant vbo.
+	vertices = dstring_new ();
+	vertex_index_base = 0;
+	// All usable surfaces have been chained to the (base) texture they use.
+	// Run through the textures, using their chains to build display maps.
+	// For animated textures, if a surface is on one texture of the group, it
+	// will be on all.
+	for (size_t i = 0; i < bctx->texture_chains.size; i++) {
+		vulktex_t  *tex;
+		instsurf_t *is;
+		elechain_t *ec = 0;
+		elements_t *el = 0;
+
+		tex = bctx->texture_chains.a[i];
+
+		for (is = tex->tex_chain; is; is = is->tex_chain) {
+			msurface_t *surf = is->surface;
+			if (!tex->elechain) {
+				ec = add_elechain (tex, surf->ec_index, bctx);
+				el = ec->elements;
+				el->base = (byte *) (intptr_t) vertices->size;
+				vertex_index_base = 0;
+			}
+			if (surf->ec_index != ec->index) {	// next sub-model
+				ec = add_elechain (tex, surf->ec_index, bctx);
+				el = ec->elements;
+				el->base = (byte *) (intptr_t) vertices->size;
+				vertex_index_base = 0;
+			}
+			if (vertex_index_base + surf->numedges > 65535) {
+				// elements index overflow
+				el->next = get_elements (bctx);
+				el = el->next;
+				el->base = (byte *) (intptr_t) vertices->size;
+				vertex_index_base = 0;
+			}
+			// we don't use it now, but pre-initializing the list won't hurt
+			if (!el->list)
+				el->list = dstring_new ();
+			dstring_clear (el->list);
+
+			surf->base = el->base;
+			build_surf_displist (models, surf, vertex_index_base, vertices);
+			vertex_index_base += surf->numedges;
+		}
+	}
+	clear_texture_chains (bctx);
+	Sys_MaskPrintf (SYS_GLSL, "R_BuildDisplayLists: %ld verts total\n",
+					(long) (vertices->size / sizeof (bspvert_t)));
+	/*XXX if (!bsp_vbo)
+		qfeglGenBuffers (1, &bsp_vbo);
+	qfeglBindBuffer (GL_ARRAY_BUFFER, bsp_vbo);
+	qfeglBufferData (GL_ARRAY_BUFFER, vertices->size, vertices->str,
+					GL_STATIC_DRAW);
+	qfeglBindBuffer (GL_ARRAY_BUFFER, 0);*/
+	dstring_delete (vertices);
+}
+
+static void
+R_DrawBrushModel (entity_t *e, vulkan_ctx_t *ctx)
+{
+	float       dot, radius;
+	int         i;
+	unsigned    k;
+	model_t    *model;
+	plane_t    *plane;
+	msurface_t *surf;
+	qboolean    rotated;
+	vec3_t      mins, maxs, org;
+
+	model = e->model;
+	if (e->transform[0] != 1 || e->transform[5] != 1 || e->transform[10] != 1) {
+		rotated = true;
+		radius = model->radius;
+		if (R_CullSphere (e->origin, radius))
+			return;
+	} else {
+		rotated = false;
+		VectorAdd (e->origin, model->mins, mins);
+		VectorAdd (e->origin, model->maxs, maxs);
+		if (R_CullBox (mins, maxs))
+			return;
+	}
+
+	VectorSubtract (r_refdef.vieworg, e->origin, org);
+	if (rotated) {
+		vec3_t      temp;
+
+		VectorCopy (org, temp);
+		org[0] = DotProduct (temp, e->transform + 0);
+		org[1] = DotProduct (temp, e->transform + 4);
+		org[2] = DotProduct (temp, e->transform + 8);
+	}
+
+	// calculate dynamic lighting for bmodel if it's not an instanced model
+	if (model->firstmodelsurface != 0 && r_dlight_lightmap->int_val) {
+		vec3_t      lightorigin;
+
+		for (k = 0; k < r_maxdlights; k++) {
+			if ((r_dlights[k].die < vr_data.realtime)
+				|| (!r_dlights[k].radius))
+				continue;
+
+			VectorSubtract (r_dlights[k].origin, e->origin, lightorigin);
+			R_RecursiveMarkLights (lightorigin, &r_dlights[k], k,
+							model->nodes + model->hulls[0].firstclipnode);
+		}
+	}
+
+	surf = &model->surfaces[model->firstmodelsurface];
+
+	for (i = 0; i < model->nummodelsurfaces; i++, surf++) {
+		// find the node side on which we are
+		plane = surf->plane;
+
+		dot = PlaneDiff (org, plane);
+
+		// enqueue the polygon
+		if (((surf->flags & SURF_PLANEBACK) && (dot < -BACKFACE_EPSILON))
+			|| (!(surf->flags & SURF_PLANEBACK) && (dot > BACKFACE_EPSILON))) {
+			chain_surface (surf, e->transform, e->colormod, ctx);
+		}
+	}
+}
+
+static inline void
+visit_leaf (mleaf_t *leaf)
+{
+	// deal with model fragments in this leaf
+	if (leaf->efrags)
+		R_StoreEfrags (leaf->efrags);
+}
+
+static inline int
+get_side (mnode_t *node)
+{
+	// find the node side on which we are
+	plane_t    *plane = node->plane;
+
+	if (plane->type < 3)
+		return (r_origin[plane->type] - plane->dist) < 0;
+	return (DotProduct (r_origin, plane->normal) - plane->dist) < 0;
+}
+
+static inline void
+visit_node (mnode_t *node, int side, vulkan_ctx_t *ctx)
+{
+	int         c;
+	msurface_t *surf;
+
+	// sneaky hack for side = side ? SURF_PLANEBACK : 0;
+	side = (~side + 1) & SURF_PLANEBACK;
+	// draw stuff
+	if ((c = node->numsurfaces)) {
+		surf = r_worldentity.model->surfaces + node->firstsurface;
+		for (; c; c--, surf++) {
+			if (surf->visframe != r_visframecount)
+				continue;
+
+			// side is either 0 or SURF_PLANEBACK
+			if (side ^ (surf->flags & SURF_PLANEBACK))
+				continue;               // wrong side
+
+			chain_surface (surf, 0, 0, ctx);
+		}
+	}
+}
+
+static inline int
+test_node (mnode_t *node)
+{
+	if (node->contents < 0)
+		return 0;
+	if (node->visframe != r_visframecount)
+		return 0;
+	if (R_CullBox (node->minmaxs, node->minmaxs + 3))
+		return 0;
+	return 1;
+}
+
+static void
+R_VisitWorldNodes (model_t *model, vulkan_ctx_t *ctx)
+{
+	typedef struct {
+		mnode_t    *node;
+		int         side;
+	} rstack_t;
+	rstack_t   *node_ptr;
+	rstack_t   *node_stack;
+	mnode_t    *node;
+	mnode_t    *front;
+	int         side;
+
+	node = model->nodes;
+	// +2 for paranoia
+	node_stack = alloca ((model->depth + 2) * sizeof (rstack_t));
+	node_ptr = node_stack;
+
+	while (1) {
+		while (test_node (node)) {
+			side = get_side (node);
+			front = node->children[side];
+			if (test_node (front)) {
+				node_ptr->node = node;
+				node_ptr->side = side;
+				node_ptr++;
+				node = front;
+				continue;
+			}
+			if (front->contents < 0 && front->contents != CONTENTS_SOLID)
+				visit_leaf ((mleaf_t *) front);
+			visit_node (node, side, ctx);
+			node = node->children[!side];
+		}
+		if (node->contents < 0 && node->contents != CONTENTS_SOLID)
+			visit_leaf ((mleaf_t *) node);
+		if (node_ptr != node_stack) {
+			node_ptr--;
+			node = node_ptr->node;
+			side = node_ptr->side;
+			visit_node (node, side, ctx);
+			node = node->children[!side];
+			continue;
+		}
+		break;
+	}
+	if (node->contents < 0 && node->contents != CONTENTS_SOLID)
+		visit_leaf ((mleaf_t *) node);
+}
+
+/*static void
+draw_elechain (elechain_t *ec, int matloc, int vertloc, int tlstloc,
+			   int colloc, bspctx_t *bctx)
+{
+	mat4_t      mat;
+	elements_t *el;
+	int         count;
+	float      *color;
+
+	if (colloc >= 0) {
+		color = ec->color;
+		if (!color)
+			color = bctx->default_color;
+		if (!QuatCompare (color, bctx->last_color)) {
+			QuatCopy (color, bctx->last_color);
+			qfeglVertexAttrib4fv (quake_bsp.color.location, color);
+		}
+	}
+	if (ec->transform) {
+		Mat4Mult (bsp_vp, ec->transform, mat);
+		qfeglUniformMatrix4fv (matloc, 1, false, mat);
+	} else {
+		qfeglUniformMatrix4fv (matloc, 1, false, bsp_vp);
+	}
+	for (el = ec->elements; el; el = el->next) {
+		if (!el->list->size)
+			continue;
+		count = el->list->size / sizeof (GLushort);
+		qfeglVertexAttribPointer (vertloc, 4, GL_FLOAT,
+								 0, sizeof (bspvert_t),
+								 el->base + field_offset (bspvert_t, vertex));
+		if (tlstloc >= 0)
+			qfeglVertexAttribPointer (tlstloc, 4, GL_FLOAT,
+									 0, sizeof (bspvert_t),
+									 el->base + field_offset (bspvert_t,tlst));
+		qfeglDrawElements (GL_TRIANGLES, count,
+						   GL_UNSIGNED_SHORT, el->list->str);
+		dstring_clear (el->list);
+	}
+}*/
+
+static void
+bsp_begin (vulkan_ctx_t *ctx)
+{
+	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+	bspctx_t   *bctx = ctx->bsp_context;
+	//XXX quat_t      fog;
+
+	bctx->default_color[3] = 1;
+	QuatCopy (bctx->default_color, bctx->last_color);
+
+	__auto_type cframe = &ctx->framebuffers.a[ctx->curFrame];
+	bspframe_t *bframe = &bctx->frames.a[ctx->curFrame];
+	DARRAY_APPEND (cframe->subCommand, bframe->bsp_cmd);
+
+	dfunc->vkResetCommandBuffer (bframe->bsp_cmd, 0);
+	VkCommandBufferInheritanceInfo inherit = {
+		VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_INFO, 0,
+		ctx->renderpass.renderpass, 0,
+		cframe->framebuffer,
+		0, 0, 0,
+	};
+	VkCommandBufferBeginInfo beginInfo = {
+		VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, 0,
+		VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT
+		| VK_COMMAND_BUFFER_USAGE_RENDER_PASS_CONTINUE_BIT, &inherit,
+	};
+	dfunc->vkBeginCommandBuffer (bframe->bsp_cmd, &beginInfo);
+
+	//XXX glsl_Fog_GetColor (fog);
+	//XXX fog[3] = glsl_Fog_GetDensity () / 64.0;
+}
+
+static void
+bsp_end (vulkan_ctx_t *ctx)
+{
+	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+	bspctx_t   *bctx = ctx->bsp_context;
+
+	bspframe_t *bframe = &bctx->frames.a[ctx->curFrame];
+	dfunc->vkEndCommandBuffer (bframe->bsp_cmd);
+}
+
+/*static void
+turb_begin (bspctx_t *bctx)
+{
+	quat_t      fog;
+
+	bctx->default_color[3] = bound (0, r_wateralpha->value, 1);
+	QuatCopy (bctx->default_color, bctx->last_color);
+	qfeglVertexAttrib4fv (quake_bsp.color.location, default_color);
+
+	Mat4Mult (glsl_projection, glsl_view, bsp_vp);
+
+	qfeglUseProgram (quake_turb.program);
+	qfeglEnableVertexAttribArray (quake_turb.vertex.location);
+	qfeglEnableVertexAttribArray (quake_turb.tlst.location);
+	qfeglDisableVertexAttribArray (quake_turb.color.location);
+
+	qfeglVertexAttrib4fv (quake_turb.color.location, default_color);
+
+	glsl_Fog_GetColor (fog);
+	fog[3] = glsl_Fog_GetDensity () / 64.0;
+	qfeglUniform4fv (quake_turb.fog.location, 1, fog);
+
+	qfeglUniform1i (quake_turb.palette.location, 1);
+	qfeglActiveTexture (GL_TEXTURE0 + 1);
+	qfeglEnable (GL_TEXTURE_2D);
+	qfeglBindTexture (GL_TEXTURE_2D, glsl_palette);
+
+	qfeglUniform1f (quake_turb.time.location, vr_data.realtime);
+
+	qfeglUniform1i (quake_turb.texture.location, 0);
+	qfeglActiveTexture (GL_TEXTURE0 + 0);
+	qfeglEnable (GL_TEXTURE_2D);
+
+	qfeglBindBuffer (GL_ARRAY_BUFFER, bsp_vbo);
+}*/
+
+/*static void
+turb_end (bspctx_t *bctx)
+{
+	qfeglDisableVertexAttribArray (quake_turb.vertex.location);
+	qfeglDisableVertexAttribArray (quake_turb.tlst.location);
+
+	qfeglActiveTexture (GL_TEXTURE0 + 0);
+	qfeglDisable (GL_TEXTURE_2D);
+	qfeglActiveTexture (GL_TEXTURE0 + 1);
+	qfeglDisable (GL_TEXTURE_2D);
+
+	qfeglBindBuffer (GL_ARRAY_BUFFER, 0);
+}*/
+
+/*XXX static void
+spin (mat4_t mat, bspctx_t *bctx)
+{
+	quat_t      q;
+	mat4_t      m;
+	float       blend;
+
+	while (vr_data.realtime - bctx->sky_time > 1) {
+		QuatCopy (bctx->sky_rotation[1], bctx->sky_rotation[0]);
+		QuatMult (bctx->sky_velocity, bctx->sky_rotation[0],
+				  bctx->sky_rotation[1]);
+		bctx->sky_time += 1;
+	}
+	blend = bound (0, (vr_data.realtime - bctx->sky_time), 1);
+
+	QuatBlend (bctx->sky_rotation[0], bctx->sky_rotation[1], blend, q);
+	QuatMult (bctx->sky_fix, q, q);
+	Mat4Identity (mat);
+	VectorNegate (r_origin, mat + 12);
+	QuatToMatrix (q, m, 1, 1);
+	Mat4Mult (m, mat, mat);
+}*/
+
+static void
+sky_begin (bspctx_t *bctx)
+{
+	//XXX mat4_t      mat;
+	//XXX quat_t      fog;
+
+	bctx->default_color[3] = 1;
+	QuatCopy (bctx->default_color, bctx->last_color);
+/*	qfeglVertexAttrib4fv (quake_bsp.color.location, bctx->default_color);
+
+	Mat4Mult (glsl_projection, glsl_view, bsp_vp);
+
+	if (bctx->skybox_tex) {
+		sky_params.mvp_matrix = &quake_skybox.mvp_matrix;
+		sky_params.vertex = &quake_skybox.vertex;
+		sky_params.sky_matrix = &quake_skybox.sky_matrix;
+		sky_params.fog = &quake_skybox.fog;
+
+		qfeglUseProgram (quake_skybox.program);
+		qfeglEnableVertexAttribArray (quake_skybox.vertex.location);
+
+		qfeglUniform1i (quake_skybox.sky.location, 0);
+		qfeglActiveTexture (GL_TEXTURE0 + 0);
+		qfeglEnable (GL_TEXTURE_CUBE_MAP);
+		qfeglBindTexture (GL_TEXTURE_CUBE_MAP, skybox_tex);
+	} else {
+		sky_params.mvp_matrix = &quake_skyid.mvp_matrix;
+		sky_params.sky_matrix = &quake_skyid.sky_matrix;
+		sky_params.vertex = &quake_skyid.vertex;
+		sky_params.fog = &quake_skyid.fog;
+
+		qfeglUseProgram (quake_skyid.program);
+		qfeglEnableVertexAttribArray (quake_skyid.vertex.location);
+
+		qfeglUniform1i (quake_skyid.palette.location, 2);
+		qfeglActiveTexture (GL_TEXTURE0 + 2);
+		qfeglEnable (GL_TEXTURE_2D);
+		qfeglBindTexture (GL_TEXTURE_2D, glsl_palette);
+
+		qfeglUniform1f (quake_skyid.time.location, vr_data.realtime);
+
+		qfeglUniform1i (quake_skyid.trans.location, 0);
+		qfeglActiveTexture (GL_TEXTURE0 + 0);
+		qfeglEnable (GL_TEXTURE_2D);
+
+		qfeglUniform1i (quake_skyid.solid.location, 1);
+		qfeglActiveTexture (GL_TEXTURE0 + 1);
+		qfeglEnable (GL_TEXTURE_2D);
+	}
+
+	glsl_Fog_GetColor (fog);
+	fog[3] = glsl_Fog_GetDensity () / 64.0;
+	qfeglUniform4fv (sky_params.fog->location, 1, fog);
+
+	spin (mat);
+	qfeglUniformMatrix4fv (sky_params.sky_matrix->location, 1, false, mat);
+
+	qfeglBindBuffer (GL_ARRAY_BUFFER, bsp_vbo);*/
+}
+
+static void
+sky_end (bspctx_t *bctx)
+{
+	/*XXX qfeglDisableVertexAttribArray (sky_params.vertex->location);
+
+	qfeglActiveTexture (GL_TEXTURE0 + 0);
+	qfeglDisable (GL_TEXTURE_2D);
+	qfeglDisable (GL_TEXTURE_CUBE_MAP);
+	qfeglActiveTexture (GL_TEXTURE0 + 1);
+	qfeglDisable (GL_TEXTURE_2D);
+	qfeglActiveTexture (GL_TEXTURE0 + 2);
+	qfeglDisable (GL_TEXTURE_2D);
+
+	qfeglBindBuffer (GL_ARRAY_BUFFER, 0);*/
+}
+
+static inline void
+add_surf_elements (vulktex_t *tex, instsurf_t *is,
+				   elechain_t **ec, elements_t **el, bspctx_t *bctx)
+{
+	msurface_t *surf = is->surface;
+	glslpoly_t *poly = (glslpoly_t *) surf->polys;
+
+	if (!tex->elechain) {
+		(*ec) = add_elechain (tex, surf->ec_index, bctx);
+		(*ec)->transform = is->transform;
+		(*ec)->color = is->color;
+		(*el) = (*ec)->elements;
+		(*el)->base = surf->base;
+		if (!(*el)->list)
+			(*el)->list = dstring_new ();
+		dstring_clear ((*el)->list);
+	}
+	if (is->transform != (*ec)->transform || is->color != (*ec)->color) {
+		(*ec) = add_elechain (tex, surf->ec_index, bctx);
+		(*ec)->transform = is->transform;
+		(*ec)->color = is->color;
+		(*el) = (*ec)->elements;
+		(*el)->base = surf->base;
+		if (!(*el)->list)
+			(*el)->list = dstring_new ();
+		dstring_clear ((*el)->list);
+	}
+	if (surf->base != (*el)->base) {
+		(*el)->next = get_elements (bctx);
+		(*el) = (*el)->next;
+		(*el)->base = surf->base;
+		if (!(*el)->list)
+			(*el)->list = dstring_new ();
+		dstring_clear ((*el)->list);
+	}
+	dstring_append ((*el)->list, (char *) poly->indices,
+					poly->count * sizeof (poly->indices[0]));
+}
+
+static void
+build_tex_elechain (vulktex_t *tex, bspctx_t *bctx)
+{
+	instsurf_t *is;
+	elechain_t *ec = 0;
+	elements_t *el = 0;
+
+	for (is = tex->tex_chain; is; is = is->tex_chain) {
+		add_surf_elements (tex, is, &ec, &el, bctx);
+	}
+}
+
+void
+Vulkan_DrawWorld (vulkan_ctx_t *ctx)
+{
+	bspctx_t   *bctx = ctx->bsp_context;
+	entity_t    worldent;
+
+	clear_texture_chains (bctx);	// do this first for water and skys
+
+	memset (&worldent, 0, sizeof (worldent));
+	worldent.model = r_worldentity.model;
+
+	currententity = &worldent;
+
+	R_VisitWorldNodes (worldent.model, ctx);
+	if (r_drawentities->int_val) {
+		entity_t   *ent;
+		for (ent = r_ent_queue; ent; ent = ent->next) {
+			if (ent->model->type != mod_brush)
+				continue;
+			currententity = ent;
+
+			R_DrawBrushModel (ent, ctx);
+		}
+	}
+
+	Vulkan_FlushLightmaps (ctx);
+	bsp_begin (ctx);
+	//XXX qfeglActiveTexture (GL_TEXTURE0 + 0);
+	for (size_t i = 0; i < bctx->texture_chains.size; i++) {
+		vulktex_t  *tex;
+		//XXX elechain_t *ec = 0;
+
+		tex = bctx->texture_chains.a[i];
+
+		build_tex_elechain (tex, bctx);
+
+		//XXX if (tex->elechain)
+		//XXX 	qfeglBindTexture (GL_TEXTURE_2D, tex->gl_texturenum);
+
+		/*XXX for (ec = tex->elechain; ec; ec = ec->next) {
+			draw_elechain (ec, quake_bsp.mvp_matrix.location,
+						   quake_bsp.vertex.location,
+						   quake_bsp.tlst.location,
+						   quake_bsp.color.location);
+		}*/
+		tex->elechain = 0;
+		tex->elechain_tail = &tex->elechain;
+	}
+	bsp_end (ctx);
+}
+
+void
+Vulkan_DrawWaterSurfaces (vulkan_ctx_t *ctx)
+{
+/*	bspctx_t   *bctx = ctx->bsp_context;
+	instsurf_t *is;
+	msurface_t *surf;
+	vulktex_t  *tex = 0;
+	elechain_t *ec = 0;
+	elements_t *el = 0;
+
+	if (!bctx->waterchain)
+		return;
+
+	turb_begin (bctx);
+	for (is = bctx->waterchain; is; is = is->tex_chain) {
+		surf = is->surface;
+		if (tex != surf->texinfo->texture) {
+			if (tex) {
+				//XXX qfeglBindTexture (GL_TEXTURE_2D, tex->gl_texturenum);
+				//for (ec = tex->elechain; ec; ec = ec->next)
+				//	draw_elechain (ec, quake_turb.mvp_matrix.location,
+				//				   quake_turb.vertex.location,
+				//				   quake_turb.tlst.location,
+				//				   quake_turb.color.location);
+				tex->elechain = 0;
+				tex->elechain_tail = &tex->elechain;
+			}
+			tex = surf->texinfo->texture;
+		}
+		add_surf_elements (tex, is, &ec, &el, bctx);
+	}
+	if (tex) {
+		//XXX qfeglBindTexture (GL_TEXTURE_2D, tex->gl_texturenum);
+		//for (ec = tex->elechain; ec; ec = ec->next)
+		//	draw_elechain (ec, quake_turb.mvp_matrix.location,
+		//				   quake_turb.vertex.location,
+		//				   quake_turb.tlst.location,
+		//				   quake_turb.color.location);
+		tex->elechain = 0;
+		tex->elechain_tail = &tex->elechain;
+	}
+	turb_end (bctx);
+
+	bctx->waterchain = 0;
+	bctx->waterchain_tail = &bctx->waterchain;*/
+}
+
+void
+Vulkan_DrawSky (vulkan_ctx_t *ctx)
+{
+	bspctx_t   *bctx = ctx->bsp_context;
+	instsurf_t *is;
+	msurface_t *surf;
+	vulktex_t  *tex = 0;
+	elechain_t *ec = 0;
+	elements_t *el = 0;
+
+	if (!bctx->sky_chain)
+		return;
+
+	sky_begin (bctx);
+	for (is = bctx->sky_chain; is; is = is->tex_chain) {
+		surf = is->surface;
+		if (tex != surf->texinfo->texture->render) {
+			if (tex) {
+				if (!bctx->skybox_tex) {
+					//XXX qfeglActiveTexture (GL_TEXTURE0 + 0);
+					//qfeglBindTexture (GL_TEXTURE_2D, tex->sky_tex[0]);
+					//qfeglActiveTexture (GL_TEXTURE0 + 1);
+					//qfeglBindTexture (GL_TEXTURE_2D, tex->sky_tex[1]);
+				}
+				//for (ec = tex->elechain; ec; ec = ec->next)
+				//	draw_elechain (ec, sky_params.mvp_matrix->location,
+				//				   sky_params.vertex->location, -1, -1);
+				tex->elechain = 0;
+				tex->elechain_tail = &tex->elechain;
+			}
+			tex = surf->texinfo->texture->render;
+		}
+		add_surf_elements (tex, is, &ec, &el, bctx);
+	}
+	if (tex) {
+		if (!bctx->skybox_tex) {
+			//XXX qfeglActiveTexture (GL_TEXTURE0 + 0);
+			//qfeglBindTexture (GL_TEXTURE_2D, tex->sky_tex[0]);
+			//qfeglActiveTexture (GL_TEXTURE0 + 1);
+			//qfeglBindTexture (GL_TEXTURE_2D, tex->sky_tex[1]);
+		}
+		//for (ec = tex->elechain; ec; ec = ec->next)
+		//	draw_elechain (ec, sky_params.mvp_matrix->location,
+		//				   sky_params.vertex->location, -1, -1);
+		tex->elechain = 0;
+		tex->elechain_tail = &tex->elechain;
+	}
+	sky_end (bctx);
+
+	bctx->sky_chain = 0;
+	bctx->sky_chain_tail = &bctx->sky_chain;
+}
+
+void
+Vulkan_Bsp_Init (vulkan_ctx_t *ctx)
+{
+	qfv_device_t *device = ctx->device;
+
+	bspctx_t   *bctx = calloc (1, sizeof (bspctx_t));
+	ctx->bsp_context = bctx;
+
+	bctx->waterchain_tail = &bctx->waterchain;
+	bctx->sky_chain_tail = &bctx->sky_chain;
+	bctx->static_instsurfs_tail = &bctx->static_instsurfs;
+	bctx->elechains_tail = &bctx->elechains;
+	bctx->elementss_tail = &bctx->elementss;
+	bctx->instsurfs_tail = &bctx->instsurfs;
+
+	bctx->light_scrap = QFV_CreateScrap (device, 2048, tex_frgba);
+	size_t      size = QFV_ScrapSize (bctx->light_scrap);
+	bctx->light_stage = QFV_CreateStagingBuffer (device, size, 3,
+												 ctx->cmdpool);
+
+	DARRAY_INIT (&bctx->texture_chains, 64);
+
+	size_t      frames = ctx->framebuffers.size;
+	DARRAY_INIT (&bctx->frames, frames);
+	DARRAY_RESIZE (&bctx->frames, frames);
+	bctx->frames.grow = 0;
+
+	bctx->main = Vulkan_CreatePipeline (ctx, "quakebsp.main");
+	bctx->layout = QFV_GetPipelineLayout (ctx, "quakebsp");
+
+	__auto_type layouts = QFV_AllocDescriptorSetLayoutSet (frames, alloca);
+	for (size_t i = 0; i < layouts->size; i++) {
+		layouts->a[i] = QFV_GetDescriptorSetLayout (ctx, "quakebsp");
+	}
+	__auto_type pool = QFV_GetDescriptorPool (ctx, "quakebsp");
+
+	__auto_type cmdBuffers = QFV_AllocCommandBufferSet (3 * frames, alloca);
+	QFV_AllocateCommandBuffers (device, ctx->cmdpool, 1, cmdBuffers);
+
+	__auto_type sets = QFV_AllocateDescriptorSet (device, pool, layouts);
+	for (size_t i = 0; i < frames; i++) {
+		__auto_type bframe = &bctx->frames.a[i];
+		bframe->descriptors = sets->a[i];
+		bframe->bsp_cmd = cmdBuffers->a[i];
+		bframe->turb_cmd = cmdBuffers->a[i];
+		bframe->sky_cmd = cmdBuffers->a[i];
+	}
+	free (sets);
+}
+
+void
+Vulkan_Bsp_Shutdown (struct vulkan_ctx_s *ctx)
+{
+	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+	bspctx_t   *bctx = ctx->bsp_context;
+
+	dfunc->vkDestroyPipeline (device->dev, bctx->main, 0);
+	DARRAY_CLEAR (&bctx->texture_chains);
+	DARRAY_CLEAR (&bctx->frames);
+	QFV_DestroyStagingBuffer (bctx->light_stage);
+	QFV_DestroyScrap (bctx->light_scrap);
+}
+
+static inline __attribute__((const)) int
+is_pow2 (unsigned x)
+{
+	int         count;
+
+	for (count = 0; x; x >>= 1)
+		if (x & 1)
+			count++;
+	return count == 1;
+}
+
+// NOTE: this expects the destination tex_t to be set up: memory allocated
+// and dimentions/format etc already set. the size of the rect to be copied
+// is taken from dst. Also, dst->format and src->format must be the same, and
+// either 3 or 4, or bad things will happen. Also, no clipping is done, so if
+// x < 0 or y < 0 or x + dst->width > src->width
+// or y + dst->height > src->height, bad things will happen.
+/*XXX static void
+copy_sub_tex (tex_t *src, int x, int y, tex_t *dst)
+{
+	int         dstbytes;
+	int         srcbytes;
+	int         i;
+
+	srcbytes = src->width * src->format;
+	dstbytes = dst->width * dst->format;
+
+	x *= src->format;
+	for (i = 0; i < dst->height; i++)
+		memcpy (dst->data + i * dstbytes, src->data + (i + y) * srcbytes + x,
+				dstbytes);
+}*/
+
+/*XXX	void
+Vulkan_R_LoadSkys (const char *sky, vulkan_ctx_t *ctx)
+{
+const char *name;
+	int         i;
+	tex_t      *tex;
+	// NOTE: quake's world and GL's world are rotated relative to each other
+	// quake has x right, y in, z up. gl has x right, y up, z out
+	// quake order:                      +x    -x    +z    -z    +y    -y
+	// gl order:                         +x    -x    +y    -y    +z    -z
+	// fizquake orger:                   -y    +y    +z    -z    +x    -x
+	// to get from quake order to fitzquake order, all that's needed is
+	// a -90 degree rotation on the (quake) z-axis. This is taken care of in
+	// the sky_matrix setup code.
+	// However, from the player's perspective, skymaps have lf and rt
+	// swapped, but everythink makes sense if looking at the cube from outside
+	// along the positive y axis, with the front of the cube being the nearest
+	// face. This matches nicely with Blender's default cube in front (num-1)
+	// view.
+	static const char *sky_suffix[] = { "ft", "bk", "up", "dn", "rt", "lf"};
+	static int  sky_coords[][2] = {
+		{2, 0},	// front
+		{0, 0}, // back
+		{1, 1}, // up
+		{0, 1}, // down
+		{2, 1}, // left
+		{1, 0}, // right
+	};
+
+	if (!sky || !*sky)
+		sky = r_skyname->string;
+
+	if (!*sky || !strcasecmp (sky, "none")) {
+		skybox_loaded = false;
+		return;
+	}
+
+	if (!skybox_tex)
+		qfeglGenTextures (1, &skybox_tex);
+
+	qfeglBindTexture (GL_TEXTURE_CUBE_MAP, skybox_tex);
+
+	//blender envmap
+	// bk rt ft
+	// dn up lt
+	tex = LoadImage (name = va ("env/%s_map", sky));
+	if (tex && tex->format >= 3 && tex->height * 3 == tex->width * 2
+		&& is_pow2 (tex->height)) {
+		tex_t      *sub;
+		int         size = tex->height / 2;
+
+		skybox_loaded = true;
+		sub = malloc (field_offset (tex_t, data[size * size * tex->format]));
+		sub->width = size;
+		sub->height = size;
+		sub->format = tex->format;
+		sub->palette = tex->palette;
+		for (i = 0; i < 6; i++) {
+			int         x, y;
+			x = sky_coords[i][0] * size;
+			y = sky_coords[i][1] * size;
+			copy_sub_tex (tex, x, y, sub);
+			qfeglTexImage2D (GL_TEXTURE_CUBE_MAP_POSITIVE_X + i, 0,
+							sub->format == 3 ? GL_RGB : GL_RGBA,
+							sub->width, sub->height, 0,
+							sub->format == 3 ? GL_RGB : GL_RGBA,
+							GL_UNSIGNED_BYTE, sub->data);
+		}
+		free (sub);
+	} else {
+		skybox_loaded = true;
+		for (i = 0; i < 6; i++) {
+			tex = LoadImage (name = va ("env/%s%s", sky, sky_suffix[i]));
+			if (!tex || tex->format < 3) {	// FIXME pcx support
+				Sys_MaskPrintf (SYS_GLSL, "Couldn't load %s\n", name);
+				// also look in gfx/env, where Darkplaces looks for skies
+				tex = LoadImage (name = va ("gfx/env/%s%s", sky,
+											sky_suffix[i]));
+				if (!tex || tex->format < 3) {  // FIXME pcx support
+					Sys_MaskPrintf (SYS_GLSL, "Couldn't load %s\n", name);
+					skybox_loaded = false;
+					continue;
+				}
+			}
+			Sys_MaskPrintf (SYS_GLSL, "Loaded %s\n", name);
+			qfeglTexImage2D (GL_TEXTURE_CUBE_MAP_POSITIVE_X + i, 0,
+							tex->format == 3 ? GL_RGB : GL_RGBA,
+							tex->width, tex->height, 0,
+							tex->format == 3 ? GL_RGB : GL_RGBA,
+							GL_UNSIGNED_BYTE, tex->data);
+		}
+	}
+	qfeglTexParameteri (GL_TEXTURE_CUBE_MAP, GL_TEXTURE_WRAP_S,
+					   GL_CLAMP_TO_EDGE);
+	qfeglTexParameteri (GL_TEXTURE_CUBE_MAP, GL_TEXTURE_WRAP_T,
+					   GL_CLAMP_TO_EDGE);
+	qfeglTexParameteri (GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+	qfeglTexParameteri (GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+	qfeglGenerateMipmap (GL_TEXTURE_CUBE_MAP);
+}*/
diff --git a/libs/video/renderer/vulkan/vulkan_draw.c b/libs/video/renderer/vulkan/vulkan_draw.c
index 5cb213b16..cca17f727 100644
--- a/libs/video/renderer/vulkan/vulkan_draw.c
+++ b/libs/video/renderer/vulkan/vulkan_draw.c
@@ -404,7 +404,6 @@ Vulkan_Draw_Init (vulkan_ctx_t *ctx)
 
 	__auto_type sets = QFV_AllocateDescriptorSet (device, pool, layouts);
 	for (size_t i = 0; i < frames; i++) {
-		__auto_type cframe = &ctx->framebuffers.a[i];
 		__auto_type dframe = &dctx->frames.a[i];
 		dframe->descriptors = sets->a[i];
 
@@ -420,7 +419,6 @@ Vulkan_Draw_Init (vulkan_ctx_t *ctx)
 		};
 		dfunc->vkUpdateDescriptorSets (device->dev, 2, write, 0, 0);
 		dframe->cmd = cmdBuffers->a[i];
-		DARRAY_APPEND (cframe->subCommand, cmdBuffers->a[i]);
 	}
 	free (sets);
 }
@@ -686,6 +684,7 @@ Vulkan_FlushText (vulkan_ctx_t *ctx)
 	drawframe_t *dframe = &dctx->frames.a[ctx->curFrame];
 
 	VkCommandBuffer cmd = dframe->cmd;
+	DARRAY_APPEND (cframe->subCommand, cmd);
 
 	VkMappedMemoryRange range = {
 		VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE, 0,
diff --git a/libs/video/renderer/vulkan/vulkan_lightmap.c b/libs/video/renderer/vulkan/vulkan_lightmap.c
new file mode 100644
index 000000000..495864d9f
--- /dev/null
+++ b/libs/video/renderer/vulkan/vulkan_lightmap.c
@@ -0,0 +1,279 @@
+/*
+	vulkan_lightmap.c
+
+	surface-related refresh code
+
+	Copyright (C) 1996-1997  Id Software, Inc.
+	Copyright (C) 2000       Joseph Carter <knghtbrd@debian.org>
+	Copyright (C) 2021       Bill Currie <bill@taniwha.org>
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#define NH_DEFINE
+#include "namehack.h"
+
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+
+#include <math.h>
+#include <stdio.h>
+
+#include "QF/cvar.h"
+#include "QF/render.h"
+#include "QF/sys.h"
+#include "QF/Vulkan/qf_bsp.h"
+#include "QF/Vulkan/qf_lightmap.h"
+#include "QF/Vulkan/qf_main.h"
+#include "QF/Vulkan/texture.h"
+
+#include "compat.h"
+#include "r_internal.h"
+#include "vid_vulkan.h"
+
+#define LUXEL_SIZE 4
+
+static inline void
+add_dynamic_lights (msurface_t *surf, float *block)
+{
+	unsigned    lnum;
+	int         sd, td;
+	float       dist, rad, minlight;
+	vec3_t      impact, local, lightorigin;
+	int         smax, tmax;
+	int         s, t;
+	mtexinfo_t *tex;
+	plane_t    *plane;
+
+	smax = (surf->extents[0] >> 4) + 1;
+	tmax = (surf->extents[1] >> 4) + 1;
+	tex = surf->texinfo;
+	plane = surf->plane;
+
+	for (lnum = 0; lnum < r_maxdlights; lnum++) {
+		if (!(surf->dlightbits[lnum / 32] & (1 << (lnum % 32))))
+			continue;					// not lit by this light
+
+		dlight_t   *light = &r_dlights[lnum];
+
+		VectorSubtract (light->origin, currententity->origin, lightorigin);
+		rad = light->radius;
+		dist = DotProduct (lightorigin, plane->normal) - plane->dist;
+		rad -= fabs (dist);
+
+		minlight = light->minlight;
+		if (rad < minlight) {
+			continue;
+		}
+		VectorMultSub (light->origin, dist, plane->normal, impact);
+
+		local[0] = DotProduct (impact,	tex->vecs[0]) + tex->vecs[0][3];
+		local[1] = DotProduct (impact,	tex->vecs[1]) + tex->vecs[1][3];
+
+		local[0] -= surf->texturemins[0];
+		local[1] -= surf->texturemins[1];
+
+		for (t = 0; t < tmax; t++) {
+			td = local[1] - t * 16;
+			if (td < 0) {
+				td = -td;
+			}
+			for (s = 0; s < smax; s++) {
+				sd = local[0] - s * 16;
+				if (sd < 0) {
+					sd = -sd;
+				}
+				if (sd > td) {
+					dist = sd + (td >> 1);
+				} else {
+					dist = td + (sd >> 1);
+				}
+				if (dist < minlight) {
+					float *out = block + (t * smax + s) * LUXEL_SIZE;
+					float l = (rad - dist) * 256;
+					VectorMultAdd (out, l, light->color, out);
+					out[3] = 1;
+					out += LUXEL_SIZE;
+				}
+			}
+		}
+	}
+}
+
+void
+Vulkan_BuildLightMap (msurface_t *surf, vulkan_ctx_t *ctx)
+{
+	bspctx_t   *bctx = ctx->bsp_context;
+	int         smax, tmax, size;
+	unsigned    scale;
+	int         i;
+	float      *out, *block;
+
+	surf->cached_dlight = (surf->dlightframe == r_framecount);
+
+	smax = (surf->extents[0] >> 4) + 1;
+	tmax = (surf->extents[1] >> 4) + 1;
+	size = smax * tmax * LUXEL_SIZE;
+
+	block = QFV_SubpicBatch (surf->lightpic, bctx->light_stage);
+
+	// set to full bright if no light data
+	if (!r_worldentity.model->lightdata) {
+		out = block;
+		while (size-- > 0) {
+			*out++ = 1;
+		}
+		return;
+	}
+
+	// clear to no light
+	memset (block, 0, size * sizeof(float));
+
+	// add all the lightmaps
+	if (surf->samples) {
+		byte		   *lightmap;
+
+		lightmap = surf->samples;
+		for (int maps = 0; maps < MAXLIGHTMAPS && surf->styles[maps] != 255;
+			 maps++) {
+			scale = d_lightstylevalue[surf->styles[maps]];
+			surf->cached_light[maps] = scale;				// 8.8 fraction
+			out = block;
+			for (i = 0; i < smax * tmax; i++) {
+				*out++ += *lightmap++ * scale / 256.0;
+				*out++ += *lightmap++ * scale / 256.0;
+				*out++ += *lightmap++ * scale / 256.0;
+			}
+		}
+	}
+	// add all the dynamic lights
+	if (surf->dlightframe == r_framecount) {
+		add_dynamic_lights (surf, block);
+	}
+}
+
+void
+Vulkan_CalcLightmaps (vulkan_ctx_t *ctx)
+{
+/*	int         i;
+
+	for (i = 0; i < MAX_LIGHTMAPS; i++) {
+		if (!gl_lightmap_polys[i])
+			continue;
+		if (gl_lightmap_modified[i]) {
+			qfglBindTexture (GL_TEXTURE_2D, gl_lightmap_textures + i);
+			GL_UploadLightmap (i);
+			gl_lightmap_modified[i] = false;
+		}
+	}*/
+}
+
+static void
+vulkan_create_surf_lightmap (msurface_t *surf, vulkan_ctx_t *ctx)
+{
+	bspctx_t   *bctx = ctx->bsp_context;
+	int         smax, tmax;
+
+	smax = (surf->extents[0] >> 4) + 1;
+	tmax = (surf->extents[1] >> 4) + 1;
+
+	surf->lightpic = QFV_ScrapSubpic (bctx->light_scrap, smax, tmax);
+	if (!surf->lightpic) {
+		Sys_Error ("FIXME taniwha is being lazy");
+	}
+}
+
+/*
+  GL_BuildLightmaps
+
+  Builds the lightmap texture with all the surfaces from all brush models
+*/
+void
+Vulkan_BuildLightmaps (model_t **models, int num_models, vulkan_ctx_t *ctx)
+{
+	bspctx_t   *bctx = ctx->bsp_context;
+	int         i, j;
+	model_t    *m;
+
+	QFV_ScrapClear (bctx->light_scrap);
+
+	r_framecount = 1;					// no dlightcache
+
+	for (j = 1; j < num_models; j++) {
+		m = models[j];
+		if (!m)
+			break;
+		if (m->name[0] == '*') {
+			// sub model surfaces are processed as part of the main model
+			continue;
+		}
+		// non-bsp models don't have surfaces.
+		for (i = 0; i < m->numsurfaces; i++) {
+			msurface_t *surf = m->surfaces + i;
+			surf->lightpic = 0;     // paranoia
+			if (surf->flags & SURF_DRAWTURB) {
+				continue;
+			}
+			if (surf->flags & SURF_DRAWSKY) {
+				continue;
+			}
+			vulkan_create_surf_lightmap (surf, ctx);
+		}
+	}
+
+	for (j = 1; j < num_models; j++) {
+		m = models[j];
+		if (!m) {
+			break;
+		}
+		if (m->name[0] == '*') {
+			// sub model surfaces are processed as part of the main model
+			continue;
+		}
+		// non-bsp models don't have surfaces.
+		for (i = 0; i < m->numsurfaces; i++) {
+			msurface_t *surf = m->surfaces + i;
+			if (surf->lightpic) {
+				Vulkan_BuildLightMap (surf, ctx);
+			}
+		}
+	}
+}
+
+VkImageView
+Vulkan_LightmapImageView (vulkan_ctx_t *ctx)
+{
+	bspctx_t   *bctx = ctx->bsp_context;
+	return QFV_ScrapImageView (bctx->light_scrap);
+}
+
+void
+Vulkan_FlushLightmaps (vulkan_ctx_t *ctx)
+{
+	bspctx_t   *bctx = ctx->bsp_context;
+	QFV_ScrapFlush (bctx->light_scrap);
+}
diff --git a/libs/video/renderer/vulkan/vulkan_main.c b/libs/video/renderer/vulkan/vulkan_main.c
new file mode 100644
index 000000000..1e1913de9
--- /dev/null
+++ b/libs/video/renderer/vulkan/vulkan_main.c
@@ -0,0 +1,250 @@
+/*
+	vulkan_main.c
+
+	Vulkan rendering
+
+	Copyright (C) 2021 Bill Currie <bill@taniwha.org>
+
+	Author: Bill Currie <bill@taniwha.org>
+	Date: 2021/1/19
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#define NH_DEFINE
+#include "namehack.h"
+
+#ifdef HAVE_STRING_H
+# include "string.h"
+#endif
+#ifdef HAVE_STRINGS_H
+# include "strings.h"
+#endif
+
+#include "QF/cmd.h"
+#include "QF/cvar.h"
+#include "QF/image.h"
+#include "QF/render.h"
+#include "QF/screen.h"
+#include "QF/sys.h"
+
+#include "QF/Vulkan/qf_vid.h"
+//#include "QF/Vulkan/qf_alias.h"
+#include "QF/Vulkan/qf_bsp.h"
+//#include "QF/Vulkan/qf_iqm.h"
+#include "QF/Vulkan/qf_lightmap.h"
+#include "QF/Vulkan/qf_main.h"
+#include "QF/Vulkan/qf_particles.h"
+//#include "QF/Vulkan/qf_textures.h"
+
+#include "mod_internal.h"
+#include "r_internal.h"
+#include "vid_vulkan.h"
+
+static void
+setup_frame (vulkan_ctx_t *ctx)
+{
+	R_AnimateLight ();
+	R_ClearEnts ();
+	r_framecount++;
+
+	VectorCopy (r_refdef.vieworg, r_origin);
+	AngleVectors (r_refdef.viewangles, vpn, vright, vup);
+	R_SetFrustum ();
+
+	r_viewleaf = Mod_PointInLeaf (r_origin, r_worldentity.model);
+}
+
+static void
+setup_view (vulkan_ctx_t *ctx)
+{
+	float      *mat = ctx->matrices.view_3d;
+	static mat4_t z_up = {
+		 0, 0, -1, 0,
+		-1, 0,  0, 0,
+		 0, 1,  0, 0,
+		 0, 0,  0, 1,
+	};
+
+	/*x = r_refdef.vrect.x;
+	y = (vid.height - (r_refdef.vrect.y + r_refdef.vrect.height));
+	w = r_refdef.vrect.width;
+	h = r_refdef.vrect.height;
+	qfeglViewport (x, y, w, h);*/
+
+	Mat4Zero (mat);
+	VectorCopy (vpn, mat + 0);
+	VectorNegate (vright, mat + 4);			// we want vleft
+	VectorCopy (vup, mat + 8);
+	mat[15] = 1;
+	Mat4Transpose (mat, mat);//AngleVectors gives the transpose of what we want
+	Mat4Mult (z_up, mat, glsl_view);
+
+	Mat4Identity (mat);
+	VectorNegate (r_refdef.vieworg, mat + 12);
+	Mat4Mult (glsl_view, mat, glsl_view);
+}
+
+static void
+R_RenderEntities (vulkan_ctx_t *ctx)
+{
+	//entity_t   *ent;
+	//int         begun;
+
+	if (!r_drawentities->int_val)
+		return;
+#define RE_LOOP(type_name, Type) \
+	do { \
+		begun = 0; \
+		for (ent = r_ent_queue; ent; ent = ent->next) { \
+			if (ent->model->type != mod_##type_name) \
+				continue; \
+			if (!begun) { \
+				glsl_R_##Type##Begin (); \
+				begun = 1; \
+			} \
+			currententity = ent; \
+			glsl_R_Draw##Type (); \
+		} \
+		if (begun) \
+			glsl_R_##Type##End (); \
+	} while (0)
+
+	//RE_LOOP (alias, Alias);
+	//RE_LOOP (iqm, IQM);
+	//RE_LOOP (sprite, Sprite);
+}
+
+static void
+R_DrawViewModel (void)
+{
+	currententity = vr_data.view_model;
+	if (vr_data.inhibit_viewmodel
+		|| !r_drawviewmodel->int_val
+		|| !r_drawentities->int_val
+		|| !currententity->model)
+		return;
+
+	// hack the depth range to prevent view model from poking into walls
+	//qfeglDepthRangef (0, 0.3);
+	//glsl_R_AliasBegin ();
+	//glsl_R_DrawAlias ();
+	//glsl_R_AliasEnd ();
+	//qfeglDepthRangef (0, 1);
+}
+
+void
+Vulkan_RenderView (vulkan_ctx_t *ctx)
+{
+	double      t[10] = {};
+	int         speeds = r_speeds->int_val;
+
+	if (speeds)
+		t[0] = Sys_DoubleTime ();
+	setup_frame (ctx);
+	setup_view (ctx);
+	if (speeds)
+		t[1] = Sys_DoubleTime ();
+	R_MarkLeaves ();
+	if (speeds)
+		t[2] = Sys_DoubleTime ();
+	R_PushDlights (vec3_origin);
+	if (speeds)
+		t[3] = Sys_DoubleTime ();
+	Vulkan_DrawWorld (ctx);
+	if (speeds)
+		t[4] = Sys_DoubleTime ();
+	Vulkan_DrawSky (ctx);
+	if (speeds)
+		t[5] = Sys_DoubleTime ();
+	R_RenderEntities (ctx);
+	if (speeds)
+		t[6] = Sys_DoubleTime ();
+	Vulkan_DrawWaterSurfaces (ctx);
+	if (speeds)
+		t[7] = Sys_DoubleTime ();
+	Vulkan_DrawParticles (ctx);
+	if (speeds)
+		t[8] = Sys_DoubleTime ();
+	R_DrawViewModel ();
+	if (speeds)
+		t[9] = Sys_DoubleTime ();
+	if (speeds) {
+		Sys_Printf ("frame: %g, setup: %g, mark: %g, pushdl: %g, world: %g,"
+					" sky: %g, ents: %g, water: %g, part: %g, view: %g\n",
+					(t[9] - t[0]) * 1000, (t[1] - t[0]) * 1000,
+					(t[2] - t[1]) * 1000, (t[3] - t[2]) * 1000,
+					(t[4] - t[3]) * 1000, (t[5] - t[4]) * 1000,
+					(t[6] - t[5]) * 1000, (t[7] - t[6]) * 1000,
+					(t[8] - t[7]) * 1000, (t[9] - t[8]) * 1000);
+	}
+}
+
+void
+Vulkan_NewMap (model_t *worldmodel, struct model_s **models, int num_models,
+			   vulkan_ctx_t *ctx)
+{
+	int         i;
+
+	for (i = 0; i < 256; i++) {
+		d_lightstylevalue[i] = 264;		// normal light value
+	}
+
+	memset (&r_worldentity, 0, sizeof (r_worldentity));
+	r_worldentity.model = worldmodel;
+
+	// Force a vis update
+	r_viewleaf = NULL;
+	R_MarkLeaves ();
+
+	R_FreeAllEntities ();
+	Vulkan_ClearParticles (ctx);
+	Vulkan_RegisterTextures (models, num_models, ctx);
+	Vulkan_BuildLightmaps (models, num_models, ctx);
+	Vulkan_BuildDisplayLists (models, num_models, ctx);
+}
+
+/*void
+glsl_R_LineGraph (int x, int y, int *h_vals, int count)
+{
+}*/
+
+/*void
+glsl_R_TimeRefresh_f (void)
+{
+	double      start, stop, time;
+	int         i;
+
+	glsl_ctx->end_rendering ();
+
+	start = Sys_DoubleTime ();
+	for (i = 0; i < 128; i++) {
+		r_refdef.viewangles[1] = i * (360.0 / 128.0);
+		Vulkan_RenderView (ctx);
+		glsl_ctx->end_rendering ();
+	}
+
+	stop = Sys_DoubleTime ();
+	time = stop - start;
+	Sys_Printf ("%g seconds (%g fps)\n", time, 128 / time);
+}*/

From 7d9ef9a47e8391b078ae6192f0cb5c2288ad8bff Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 20 Jan 2021 13:55:50 +0900
Subject: [PATCH 1336/1519] [model] Mark all cleared models as cleared

This fixes a nine year old bug that I discovered only today thanks to
the vulkan renderer. The problem was that when a model had a clear
callback, it was not getting marked as needing to be reloaded, and thus
the model would be "reused" after being trampled on by another model
loading over it.

Also, plug a potential string buffer overflow (strcpy just will not
die!).
---
 libs/models/model.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/libs/models/model.c b/libs/models/model.c
index 198a69f7c..8c5036278 100644
--- a/libs/models/model.c
+++ b/libs/models/model.c
@@ -122,14 +122,15 @@ Mod_ClearAll (void)
 	model_t   **mod;
 
 	for (i = 0, mod = mod_known; i < mod_numknown; i++, mod++) {
+		//FIXME this seems to be correct but need to double check the behavior
+		//with alias models
 		if (!(*mod)->needload && (*mod)->clear) {
 			(*mod)->clear (*mod, (*mod)->data);
-		} else {
-			if ((*mod)->type != mod_alias)
-				(*mod)->needload = true;
-			if ((*mod)->type == mod_sprite)
-				(*mod)->cache.data = 0;
 		}
+		if ((*mod)->type != mod_alias)
+			(*mod)->needload = true;
+		if ((*mod)->type == mod_sprite)
+			(*mod)->cache.data = 0;
 	}
 }
 
@@ -156,7 +157,8 @@ Mod_FindName (const char *name)
 			for (i = 1; i < MOD_BLOCK; i++)
 				mod[i] = mod[0] + i;
 		}
-		strcpy ((*mod)->name, name);
+		memset ((*mod), 0, sizeof (model_t));
+		strncpy ((*mod)->name, name, sizeof (*mod)->name - 1);
 		(*mod)->needload = true;
 		mod_numknown++;
 		Cache_Add (&(*mod)->cache, *mod, Mod_CallbackLoad);

From 9eef805b7db232c5784af82a3493121cef04ec58 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 20 Jan 2021 15:11:50 +0900
Subject: [PATCH 1337/1519] [vulkan] Generate triangle fans for bsp models

They're not uploaded to the card yet, but the basics seem to be working.
---
 include/QF/Vulkan/qf_bsp.h              |   3 +-
 include/QF/model.h                      |   2 +-
 libs/video/renderer/vid_render_vulkan.c |   3 +-
 libs/video/renderer/vulkan/vulkan_bsp.c | 133 ++++++++++++++----------
 4 files changed, 85 insertions(+), 56 deletions(-)

diff --git a/include/QF/Vulkan/qf_bsp.h b/include/QF/Vulkan/qf_bsp.h
index dec2fe085..0dae9450a 100644
--- a/include/QF/Vulkan/qf_bsp.h
+++ b/include/QF/Vulkan/qf_bsp.h
@@ -45,7 +45,6 @@ typedef struct elements_s {
 	struct elements_s *_next;
 	struct elements_s *next;
 	byte       *base;
-	struct dstring_s *list;
 } elements_t;
 
 typedef struct elechain_s {
@@ -107,6 +106,8 @@ typedef struct bspctx_s {
 	struct scrap_s *light_scrap;
 	struct qfv_stagebuf_s *light_stage;
 
+	struct bsppoly_s *polys;
+
 	VkDeviceMemory texture_memory;
 	VkPipeline   main;
 	VkPipelineLayout layout;
diff --git a/include/QF/model.h b/include/QF/model.h
index 1dbfe1b6f..8d0129721 100644
--- a/include/QF/model.h
+++ b/include/QF/model.h
@@ -153,7 +153,7 @@ typedef struct msurface_s {
 
 	int			light_s, light_t;	// gl lightmap coordinates
 
-	glpoly_t	*polys;				// multiple if warped
+	glpoly_t   *polys;				// multiple if warped
 	instsurf_t *instsurf;	///< null if not part of world model/sub-model
 	instsurf_t *tinst;		///< for instance models
 
diff --git a/libs/video/renderer/vid_render_vulkan.c b/libs/video/renderer/vid_render_vulkan.c
index e6f993b38..9e6dc90fd 100644
--- a/libs/video/renderer/vid_render_vulkan.c
+++ b/libs/video/renderer/vid_render_vulkan.c
@@ -44,6 +44,7 @@
 #include "QF/Vulkan/qf_lightmap.h"
 #include "QF/Vulkan/qf_main.h"
 #include "QF/Vulkan/qf_particles.h"
+#include "QF/Vulkan/qf_texture.h"
 #include "QF/Vulkan/qf_vid.h"
 #include "QF/Vulkan/command.h"
 #include "QF/Vulkan/device.h"
@@ -462,7 +463,7 @@ vulkan_Skin_InitTranslations (void)
 }
 
 static vid_model_funcs_t model_funcs = {
-	sizeof (vulktex_t) + 2 * sizeof (struct qfv_tex_s *),
+	sizeof (vulktex_t) + 2 * sizeof (qfv_tex_t),
 	vulkan_Mod_LoadLighting,
 	vulkan_Mod_SubdivideSurface,
 	vulkan_Mod_ProcessTexture,
diff --git a/libs/video/renderer/vulkan/vulkan_bsp.c b/libs/video/renderer/vulkan/vulkan_bsp.c
index 466d6bbd7..a755f3d86 100644
--- a/libs/video/renderer/vulkan/vulkan_bsp.c
+++ b/libs/video/renderer/vulkan/vulkan_bsp.c
@@ -70,10 +70,10 @@
 
 #define ALLOC_CHUNK 64
 
-typedef struct {
+typedef struct bsppoly_s {
 	uint32_t    count;
 	uint32_t    indices[1];
-} glslpoly_t;
+} bsppoly_t;
 
 #define CHAIN_SURF_F2B(surf,chain)							\
 	do { 													\
@@ -297,11 +297,18 @@ add_elechain (vulktex_t *tex, int ec_index, bspctx_t *bctx)
 }
 
 static void
+count_verts_inds (model_t **models, msurface_t *fa,
+				  uint32_t *verts, uint32_t *inds)
+{
+	*verts = fa->numedges;
+	*inds = fa->numedges + 1;
+}
+
+static bsppoly_t *
 build_surf_displist (model_t **models, msurface_t *fa, int base,
-					 dstring_t *vert_list)
+					 bspvert_t **vert_list)
 {
 	int         numverts;
-	int         numtris;
 	int         numindices;
 	int         i;
 	vec_t      *vec;
@@ -310,38 +317,41 @@ build_surf_displist (model_t **models, msurface_t *fa, int base,
 	int        *surfedges;
 	int         index;
 	bspvert_t  *verts;
-	glslpoly_t *poly;
+	bsppoly_t  *poly;
 	uint32_t   *ind;
 	float       s, t;
 
 	if (fa->ec_index < 0) {
-		vertices = models[-fa->ec_index - 1]->vertexes;
-		edges = models[-fa->ec_index - 1]->edges;
-		surfedges = models[-fa->ec_index - 1]->surfedges;
+		// instance model
+		vertices  = models[~fa->ec_index]->vertexes;
+		edges     = models[~fa->ec_index]->edges;
+		surfedges = models[~fa->ec_index]->surfedges;
 	} else {
-		vertices = r_worldentity.model->vertexes;
-		edges = r_worldentity.model->edges;
+		// main or sub model
+		vertices  = r_worldentity.model->vertexes;
+		edges     = r_worldentity.model->edges;
 		surfedges = r_worldentity.model->surfedges;
 	}
+	// create a triangle fan
 	numverts = fa->numedges;
-	numtris = numverts - 2;
-	numindices = numtris * 3;
-	verts = alloca (numverts * sizeof (bspvert_t));
-	poly = malloc (field_offset (glslpoly_t, indices[numindices]));
+	numindices = numverts + 1;
+	verts = *vert_list;
+	// surf->polys is set to the next slow before the call
+	poly = (bsppoly_t *) fa->polys;
 	poly->count = numindices;
-	for (i = 0, ind = poly->indices; i < numtris; i++) {
-		*ind++ = base;
-		*ind++ = base + i + 1;
-		*ind++ = base + i + 2;
+	for (i = 0, ind = poly->indices; i < numverts; i++) {
+		*ind++ = base + i;
 	}
+	*ind++ = -1;	// end of primitive
 	fa->polys = (glpoly_t *) poly;
 
 	for (i = 0; i < numverts; i++) {
 		index = surfedges[fa->firstedge + i];
-		if (index > 0)
+		if (index > 0) {
 			vec = vertices[edges[index].v[0]].position;
-		else
+		} else {
 			vec = vertices[edges[-index].v[1]].position;
+		}
 
 		s = DotProduct (vec, fa->texinfo->vecs[0]) + fa->texinfo->vecs[0][3];
 		t = DotProduct (vec, fa->texinfo->vecs[1]) + fa->texinfo->vecs[1][3];
@@ -368,19 +378,23 @@ build_surf_displist (model_t **models, msurface_t *fa, int base,
 		verts[i].tlst[2] = s * fa->lightpic->size;
 		verts[i].tlst[3] = t * fa->lightpic->size;
 	}
-	dstring_append (vert_list, (char *) verts, numverts * sizeof (bspvert_t));
+	*vert_list += numverts;
+	return (bsppoly_t *) &poly->indices[numindices];
 }
 
 void
 Vulkan_BuildDisplayLists (model_t **models, int num_models, vulkan_ctx_t *ctx)
 {
+	qfv_device_t *device = ctx->device;
 	bspctx_t   *bctx = ctx->bsp_context;
 	int         i, j;
 	int         vertex_index_base;
 	model_t    *m;
 	dmodel_t   *dm;
 	msurface_t *surf;
-	dstring_t  *vertices;
+	qfv_stagebuf_t *stage;
+	bspvert_t  *vertices;
+	bsppoly_t  *poly;
 
 	QuatSet (0, 0, sqrt(0.5), sqrt(0.5), bctx->sky_fix);	// proper skies
 	QuatSet (0, 0, 0, 1, bctx->sky_rotation[0]);
@@ -418,16 +432,38 @@ Vulkan_BuildDisplayLists (model_t **models, int num_models, vulkan_ctx_t *ctx)
 			if (!surf->ec_index && m != r_worldentity.model)
 				surf->ec_index = -1 - i;	// instanced model
 			tex = surf->texinfo->texture->render;
+			// append surf to the texture chain
 			CHAIN_SURF_F2B (surf, tex->tex_chain);
 		}
 	}
 	// All vertices from all brush models go into one giant vbo.
-	vertices = dstring_new ();
+	uint32_t    vertex_count = 0;
+	uint32_t    index_count = 0;
+	uint32_t    poly_count = 0;
+	for (size_t i = 0; i < bctx->texture_chains.size; i++) {
+		vulktex_t  *tex = bctx->texture_chains.a[i];
+		for (instsurf_t *is = tex->tex_chain; is; is = is->tex_chain) {
+			uint32_t    verts, inds;
+			count_verts_inds (models, is->surface, &verts, &inds);
+			vertex_count += verts;
+			index_count += inds;
+			poly_count++;
+		}
+	}
+	stage = QFV_CreateStagingBuffer (device,
+									 vertex_count * sizeof (bspvert_t), 1,
+									 ctx->cmdpool);
+	vertices = stage->data;
 	vertex_index_base = 0;
+	// holds all the polygon definitions (count + indices)
+	bctx->polys = malloc ((index_count + poly_count) * sizeof (uint32_t));
+
 	// All usable surfaces have been chained to the (base) texture they use.
 	// Run through the textures, using their chains to build display maps.
 	// For animated textures, if a surface is on one texture of the group, it
 	// will be on all.
+	poly = bctx->polys;
+	int count = 0;
 	for (size_t i = 0; i < bctx->texture_chains.size; i++) {
 		vulktex_t  *tex;
 		instsurf_t *is;
@@ -441,42 +477,43 @@ Vulkan_BuildDisplayLists (model_t **models, int num_models, vulkan_ctx_t *ctx)
 			if (!tex->elechain) {
 				ec = add_elechain (tex, surf->ec_index, bctx);
 				el = ec->elements;
-				el->base = (byte *) (intptr_t) vertices->size;
 				vertex_index_base = 0;
 			}
 			if (surf->ec_index != ec->index) {	// next sub-model
 				ec = add_elechain (tex, surf->ec_index, bctx);
 				el = ec->elements;
-				el->base = (byte *) (intptr_t) vertices->size;
 				vertex_index_base = 0;
 			}
 			if (vertex_index_base + surf->numedges > 65535) {
 				// elements index overflow
 				el->next = get_elements (bctx);
 				el = el->next;
-				el->base = (byte *) (intptr_t) vertices->size;
 				vertex_index_base = 0;
 			}
 			// we don't use it now, but pre-initializing the list won't hurt
-			if (!el->list)
-				el->list = dstring_new ();
-			dstring_clear (el->list);
+			//XXX if (!el->list)
+			//XXX 	el->list = dstring_new ();
+			//XXX dstring_clear (el->list);
 
-			surf->base = el->base;
-			build_surf_displist (models, surf, vertex_index_base, vertices);
+			surf->polys = (glpoly_t *) poly;
+			poly = build_surf_displist (models, surf, vertex_index_base,
+										&vertices);
 			vertex_index_base += surf->numedges;
+			count++;
 		}
 	}
 	clear_texture_chains (bctx);
-	Sys_MaskPrintf (SYS_GLSL, "R_BuildDisplayLists: %ld verts total\n",
-					(long) (vertices->size / sizeof (bspvert_t)));
+	Sys_MaskPrintf (SYS_VULKAN,
+					"R_BuildDisplayLists: verts:%u, inds:%u, polys:%u (%d) %zd\n",
+					vertex_count, index_count, poly_count, count,
+					((size_t) poly - (size_t) bctx->polys)/sizeof(uint32_t));
 	/*XXX if (!bsp_vbo)
 		qfeglGenBuffers (1, &bsp_vbo);
 	qfeglBindBuffer (GL_ARRAY_BUFFER, bsp_vbo);
 	qfeglBufferData (GL_ARRAY_BUFFER, vertices->size, vertices->str,
 					GL_STATIC_DRAW);
 	qfeglBindBuffer (GL_ARRAY_BUFFER, 0);*/
-	dstring_delete (vertices);
+	QFV_DestroyStagingBuffer (stage);
 }
 
 static void
@@ -890,38 +927,28 @@ add_surf_elements (vulktex_t *tex, instsurf_t *is,
 				   elechain_t **ec, elements_t **el, bspctx_t *bctx)
 {
 	msurface_t *surf = is->surface;
-	glslpoly_t *poly = (glslpoly_t *) surf->polys;
+	//XXX bsppoly_t  *poly = (bsppoly_t *) surf->polys;
 
 	if (!tex->elechain) {
 		(*ec) = add_elechain (tex, surf->ec_index, bctx);
 		(*ec)->transform = is->transform;
 		(*ec)->color = is->color;
 		(*el) = (*ec)->elements;
-		(*el)->base = surf->base;
-		if (!(*el)->list)
-			(*el)->list = dstring_new ();
-		dstring_clear ((*el)->list);
+		//XXX if (!(*el)->list)
+		//XXX 	(*el)->list = dstring_new ();
+		//XXX dstring_clear ((*el)->list);
 	}
 	if (is->transform != (*ec)->transform || is->color != (*ec)->color) {
 		(*ec) = add_elechain (tex, surf->ec_index, bctx);
 		(*ec)->transform = is->transform;
 		(*ec)->color = is->color;
 		(*el) = (*ec)->elements;
-		(*el)->base = surf->base;
-		if (!(*el)->list)
-			(*el)->list = dstring_new ();
-		dstring_clear ((*el)->list);
+		//XXX if (!(*el)->list)
+		//XXX 	(*el)->list = dstring_new ();
+		//XXX dstring_clear ((*el)->list);
 	}
-	if (surf->base != (*el)->base) {
-		(*el)->next = get_elements (bctx);
-		(*el) = (*el)->next;
-		(*el)->base = surf->base;
-		if (!(*el)->list)
-			(*el)->list = dstring_new ();
-		dstring_clear ((*el)->list);
-	}
-	dstring_append ((*el)->list, (char *) poly->indices,
-					poly->count * sizeof (poly->indices[0]));
+	//XXX dstring_append ((*el)->list, (char *) poly->indices,
+	//XXX 				poly->count * sizeof (poly->indices[0]));
 }
 
 static void

From 6f73a7388b16c4e80f5b732208253ccf8128e8c8 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 20 Jan 2021 16:25:26 +0900
Subject: [PATCH 1338/1519] [vulkan] Ensure staging buffer is idle before free

I never actually tested what would happen, but I suspect destroying a
staging buffer before it is finished its job would lead to unpleasant
issues.
---
 include/QF/Vulkan/command.h          |  3 +++
 libs/video/renderer/vulkan/staging.c | 10 ++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/include/QF/Vulkan/command.h b/include/QF/Vulkan/command.h
index 47418db1a..c9ed3021e 100644
--- a/include/QF/Vulkan/command.h
+++ b/include/QF/Vulkan/command.h
@@ -15,6 +15,9 @@ typedef struct qfv_semaphoreset_s
 typedef struct qfv_fenceset_s
 	DARRAY_TYPE (VkFence) qfv_fenceset_t;
 
+#define QFV_AllocFenceSet(num, allocator) \
+	DARRAY_ALLOCFIXED (qfv_fenceset_t, num, allocator)
+
 typedef struct qfv_bufferimagecopy_s
 	DARRAY_TYPE (VkBufferImageCopy) qfv_bufferimagecopy_t;
 
diff --git a/libs/video/renderer/vulkan/staging.c b/libs/video/renderer/vulkan/staging.c
index 40ad459a6..68bf6a9aa 100644
--- a/libs/video/renderer/vulkan/staging.c
+++ b/libs/video/renderer/vulkan/staging.c
@@ -1,7 +1,7 @@
 /*
-	shader.c
+	staging.c
 
-	Vulkan shader manager
+	Vulkan staging buffer manager
 
 	Copyright (C) 2021      Bill Currie <bill@taniwha.org>
 
@@ -97,6 +97,12 @@ QFV_DestroyStagingBuffer (qfv_stagebuf_t *stage)
 	qfv_device_t *device = stage->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
 
+	__auto_type fences = QFV_AllocFenceSet (stage->num_packets, alloca);
+	for (size_t i = 0; i < stage->num_packets; i++) {
+		fences->a[i] = stage->packet[i].fence;
+	}
+	dfunc->vkWaitForFences (device->dev, fences->size, fences->a, VK_TRUE,
+							~0ull);
 	for (size_t i = 0; i < stage->num_packets; i++) {
 		dfunc->vkDestroyFence (device->dev, stage->packet[i].fence, 0);
 	}

From 9ebecf08bb2ccc86730dfb4946ff2abdcc07fe2d Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 20 Jan 2021 16:28:04 +0900
Subject: [PATCH 1339/1519] [vulkan] Create a populate the vertex buffer

And create/map the index buffer.
---
 include/QF/Vulkan/qf_bsp.h              |   3 +-
 libs/video/renderer/vulkan/vulkan_bsp.c | 103 ++++++++++++++++++++----
 2 files changed, 91 insertions(+), 15 deletions(-)

diff --git a/include/QF/Vulkan/qf_bsp.h b/include/QF/Vulkan/qf_bsp.h
index 0dae9450a..c5a74c76e 100644
--- a/include/QF/Vulkan/qf_bsp.h
+++ b/include/QF/Vulkan/qf_bsp.h
@@ -57,7 +57,8 @@ typedef struct elechain_s {
 } elechain_t;
 
 typedef struct bspframe_s {
-	uint32_t    *indeces;
+	uint32_t    *index_data;
+	uint32_t     index_count;
 	VkCommandBuffer bsp_cmd;
 	VkCommandBuffer turb_cmd;
 	VkCommandBuffer sky_cmd;
diff --git a/libs/video/renderer/vulkan/vulkan_bsp.c b/libs/video/renderer/vulkan/vulkan_bsp.c
index a755f3d86..eb1ccacc4 100644
--- a/libs/video/renderer/vulkan/vulkan_bsp.c
+++ b/libs/video/renderer/vulkan/vulkan_bsp.c
@@ -58,6 +58,7 @@
 #include "QF/Vulkan/qf_bsp.h"
 #include "QF/Vulkan/qf_lightmap.h"
 #include "QF/Vulkan/qf_texture.h"
+#include "QF/Vulkan/buffer.h"
 #include "QF/Vulkan/command.h"
 #include "QF/Vulkan/descriptor.h"
 #include "QF/Vulkan/device.h"
@@ -386,6 +387,7 @@ void
 Vulkan_BuildDisplayLists (model_t **models, int num_models, vulkan_ctx_t *ctx)
 {
 	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
 	bspctx_t   *bctx = ctx->bsp_context;
 	int         i, j;
 	int         vertex_index_base;
@@ -450,10 +452,14 @@ Vulkan_BuildDisplayLists (model_t **models, int num_models, vulkan_ctx_t *ctx)
 			poly_count++;
 		}
 	}
-	stage = QFV_CreateStagingBuffer (device,
-									 vertex_count * sizeof (bspvert_t), 1,
+
+	size_t frames = bctx->frames.size;
+	size_t index_buffer_size = index_count * frames * sizeof (uint32_t);
+	size_t vertex_buffer_size = vertex_count * sizeof (bspvert_t);
+	stage = QFV_CreateStagingBuffer (device, vertex_buffer_size, 1,
 									 ctx->cmdpool);
-	vertices = stage->data;
+	qfv_packet_t *packet = QFV_PacketAcquire (stage);
+	vertices = QFV_PacketExtend (packet, vertex_buffer_size);
 	vertex_index_base = 0;
 	// holds all the polygon definitions (count + indices)
 	bctx->polys = malloc ((index_count + poly_count) * sizeof (uint32_t));
@@ -468,7 +474,7 @@ Vulkan_BuildDisplayLists (model_t **models, int num_models, vulkan_ctx_t *ctx)
 		vulktex_t  *tex;
 		instsurf_t *is;
 		elechain_t *ec = 0;
-		elements_t *el = 0;
+		//elements_t *el = 0;
 
 		tex = bctx->texture_chains.a[i];
 
@@ -476,20 +482,20 @@ Vulkan_BuildDisplayLists (model_t **models, int num_models, vulkan_ctx_t *ctx)
 			msurface_t *surf = is->surface;
 			if (!tex->elechain) {
 				ec = add_elechain (tex, surf->ec_index, bctx);
-				el = ec->elements;
+				//el = ec->elements;
 				vertex_index_base = 0;
 			}
 			if (surf->ec_index != ec->index) {	// next sub-model
 				ec = add_elechain (tex, surf->ec_index, bctx);
-				el = ec->elements;
+				//el = ec->elements;
 				vertex_index_base = 0;
 			}
-			if (vertex_index_base + surf->numedges > 65535) {
+			/*if (vertex_index_base + surf->numedges > 65535) {
 				// elements index overflow
 				el->next = get_elements (bctx);
 				el = el->next;
 				vertex_index_base = 0;
-			}
+			}*/
 			// we don't use it now, but pre-initializing the list won't hurt
 			//XXX if (!el->list)
 			//XXX 	el->list = dstring_new ();
@@ -507,12 +513,73 @@ Vulkan_BuildDisplayLists (model_t **models, int num_models, vulkan_ctx_t *ctx)
 					"R_BuildDisplayLists: verts:%u, inds:%u, polys:%u (%d) %zd\n",
 					vertex_count, index_count, poly_count, count,
 					((size_t) poly - (size_t) bctx->polys)/sizeof(uint32_t));
-	/*XXX if (!bsp_vbo)
-		qfeglGenBuffers (1, &bsp_vbo);
-	qfeglBindBuffer (GL_ARRAY_BUFFER, bsp_vbo);
-	qfeglBufferData (GL_ARRAY_BUFFER, vertices->size, vertices->str,
-					GL_STATIC_DRAW);
-	qfeglBindBuffer (GL_ARRAY_BUFFER, 0);*/
+	if (index_buffer_size > bctx->index_buffer_size) {
+		if (bctx->index_buffer) {
+			dfunc->vkUnmapMemory (device->dev, bctx->index_memory);
+			dfunc->vkDestroyBuffer (device->dev, bctx->index_buffer, 0);
+			dfunc->vkFreeMemory (device->dev, bctx->index_memory, 0);
+		}
+		bctx->index_buffer
+			= QFV_CreateBuffer (device, index_buffer_size,
+								VK_BUFFER_USAGE_TRANSFER_DST_BIT
+								| VK_BUFFER_USAGE_VERTEX_BUFFER_BIT);
+		bctx->index_memory
+			= QFV_AllocBufferMemory (device, bctx->index_buffer,
+									 VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT,
+									 index_buffer_size, 0);
+		QFV_BindBufferMemory (device,
+							  bctx->index_buffer, bctx->index_memory, 0);
+		bctx->index_buffer_size = index_buffer_size;
+		void       *data;
+		dfunc->vkMapMemory (device->dev, bctx->index_memory, 0,
+							index_buffer_size, 0, &data);
+		uint32_t   *index_data = data;
+		for (size_t i = 0; i < frames; i++) {
+			bctx->frames.a[i].index_data = index_data + index_count * i;
+		}
+	}
+	if (vertex_buffer_size > bctx->vertex_buffer_size) {
+		if (bctx->vertex_buffer) {
+			dfunc->vkDestroyBuffer (device->dev, bctx->vertex_buffer, 0);
+			dfunc->vkFreeMemory (device->dev, bctx->vertex_memory, 0);
+		}
+		bctx->vertex_buffer
+			= QFV_CreateBuffer (device, vertex_buffer_size,
+								VK_BUFFER_USAGE_TRANSFER_DST_BIT
+								| VK_BUFFER_USAGE_VERTEX_BUFFER_BIT);
+		bctx->vertex_memory
+			= QFV_AllocBufferMemory (device, bctx->vertex_buffer,
+									 VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT,
+									 vertex_buffer_size, 0);
+		QFV_BindBufferMemory (device,
+							  bctx->vertex_buffer, bctx->vertex_memory, 0);
+		bctx->vertex_buffer_size = vertex_buffer_size;
+	}
+
+	VkBufferMemoryBarrier wr_barrier = {
+		VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER, 0,
+		0, VK_ACCESS_TRANSFER_WRITE_BIT,
+		VK_QUEUE_FAMILY_IGNORED, VK_QUEUE_FAMILY_IGNORED,
+		bctx->vertex_buffer, 0, vertex_buffer_size,
+	};
+	dfunc->vkCmdPipelineBarrier (packet->cmd,
+								 VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT,
+								 VK_PIPELINE_STAGE_TRANSFER_BIT,
+								 0, 0, 0, 1, &wr_barrier, 0, 0);
+	VkBufferCopy copy_region = { packet->offset, 0, vertex_buffer_size };
+	dfunc->vkCmdCopyBuffer (packet->cmd, ctx->staging->buffer,
+							bctx->vertex_buffer, 1, &copy_region);
+	VkBufferMemoryBarrier rd_barrier = {
+		VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER, 0,
+		VK_ACCESS_TRANSFER_WRITE_BIT, VK_ACCESS_VERTEX_ATTRIBUTE_READ_BIT,
+		VK_QUEUE_FAMILY_IGNORED, VK_QUEUE_FAMILY_IGNORED,
+		bctx->vertex_buffer, 0, vertex_buffer_size,
+	};
+	dfunc->vkCmdPipelineBarrier (packet->cmd,
+								 VK_PIPELINE_STAGE_TRANSFER_BIT,
+								 VK_PIPELINE_STAGE_VERTEX_INPUT_BIT,
+								 0, 0, 0, 1, &rd_barrier, 0, 0);
+	QFV_PacketSubmit (packet);
 	QFV_DestroyStagingBuffer (stage);
 }
 
@@ -1176,6 +1243,14 @@ Vulkan_Bsp_Shutdown (struct vulkan_ctx_s *ctx)
 	DARRAY_CLEAR (&bctx->frames);
 	QFV_DestroyStagingBuffer (bctx->light_stage);
 	QFV_DestroyScrap (bctx->light_scrap);
+	if (bctx->vertex_buffer) {
+		dfunc->vkDestroyBuffer (device->dev, bctx->vertex_buffer, 0);
+		dfunc->vkFreeMemory (device->dev, bctx->vertex_memory, 0);
+	}
+	if (bctx->index_buffer) {
+		dfunc->vkDestroyBuffer (device->dev, bctx->index_buffer, 0);
+		dfunc->vkFreeMemory (device->dev, bctx->index_memory, 0);
+	}
 }
 
 static inline __attribute__((const)) int

From 1080c89a268de9bb5650068bcd207068c104ff1a Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 20 Jan 2021 16:51:35 +0900
Subject: [PATCH 1340/1519] [vulkan] Bind the bsp main pipeline

No drawing commands are issued yet, but vulkan seems to be happy with
the state.
---
 include/QF/Vulkan/qf_bsp.h              |  1 +
 libs/video/renderer/vulkan/vulkan_bsp.c | 30 ++++++++++++++++++++-----
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/include/QF/Vulkan/qf_bsp.h b/include/QF/Vulkan/qf_bsp.h
index c5a74c76e..6d4440bd6 100644
--- a/include/QF/Vulkan/qf_bsp.h
+++ b/include/QF/Vulkan/qf_bsp.h
@@ -59,6 +59,7 @@ typedef struct elechain_s {
 typedef struct bspframe_s {
 	uint32_t    *index_data;
 	uint32_t     index_count;
+	uint32_t     index_offset;
 	VkCommandBuffer bsp_cmd;
 	VkCommandBuffer turb_cmd;
 	VkCommandBuffer sky_cmd;
diff --git a/libs/video/renderer/vulkan/vulkan_bsp.c b/libs/video/renderer/vulkan/vulkan_bsp.c
index eb1ccacc4..aba44c043 100644
--- a/libs/video/renderer/vulkan/vulkan_bsp.c
+++ b/libs/video/renderer/vulkan/vulkan_bsp.c
@@ -522,7 +522,7 @@ Vulkan_BuildDisplayLists (model_t **models, int num_models, vulkan_ctx_t *ctx)
 		bctx->index_buffer
 			= QFV_CreateBuffer (device, index_buffer_size,
 								VK_BUFFER_USAGE_TRANSFER_DST_BIT
-								| VK_BUFFER_USAGE_VERTEX_BUFFER_BIT);
+								| VK_BUFFER_USAGE_INDEX_BUFFER_BIT);
 		bctx->index_memory
 			= QFV_AllocBufferMemory (device, bctx->index_buffer,
 									 VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT,
@@ -535,7 +535,9 @@ Vulkan_BuildDisplayLists (model_t **models, int num_models, vulkan_ctx_t *ctx)
 							index_buffer_size, 0, &data);
 		uint32_t   *index_data = data;
 		for (size_t i = 0; i < frames; i++) {
-			bctx->frames.a[i].index_data = index_data + index_count * i;
+			uint32_t    offset = index_count * i;
+			bctx->frames.a[i].index_data = index_data + offset;
+			bctx->frames.a[i].index_offset = offset * sizeof (uint32_t);
 		}
 	}
 	if (vertex_buffer_size > bctx->vertex_buffer_size) {
@@ -809,9 +811,10 @@ bsp_begin (vulkan_ctx_t *ctx)
 
 	__auto_type cframe = &ctx->framebuffers.a[ctx->curFrame];
 	bspframe_t *bframe = &bctx->frames.a[ctx->curFrame];
-	DARRAY_APPEND (cframe->subCommand, bframe->bsp_cmd);
+	VkCommandBuffer cmd = bframe->bsp_cmd;
+	DARRAY_APPEND (cframe->subCommand, cmd);
 
-	dfunc->vkResetCommandBuffer (bframe->bsp_cmd, 0);
+	dfunc->vkResetCommandBuffer (cmd, 0);
 	VkCommandBufferInheritanceInfo inherit = {
 		VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_INFO, 0,
 		ctx->renderpass.renderpass, 0,
@@ -823,7 +826,24 @@ bsp_begin (vulkan_ctx_t *ctx)
 		VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT
 		| VK_COMMAND_BUFFER_USAGE_RENDER_PASS_CONTINUE_BIT, &inherit,
 	};
-	dfunc->vkBeginCommandBuffer (bframe->bsp_cmd, &beginInfo);
+	dfunc->vkBeginCommandBuffer (cmd, &beginInfo);
+
+	dfunc->vkCmdBindPipeline (cmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
+							  bctx->main);
+	VkViewport  viewport = {0, 0, vid.width, vid.height, 0, 1};
+	VkRect2D    scissor = { {0, 0}, {vid.width, vid.height} };
+	dfunc->vkCmdSetViewport (cmd, 0, 1, &viewport);
+	dfunc->vkCmdSetScissor (cmd, 0, 1, &scissor);
+
+	VkDeviceSize offsets[] = { 0 };
+	dfunc->vkCmdBindVertexBuffers (cmd, 0, 1, &bctx->vertex_buffer, offsets);
+	dfunc->vkCmdBindIndexBuffer (cmd, bctx->index_buffer, bframe->index_offset,
+								 VK_INDEX_TYPE_UINT32);
+
+	VkDescriptorSet set = bframe->descriptors;
+	VkPipelineLayout layout = bctx->layout;
+	dfunc->vkCmdBindDescriptorSets (cmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
+									layout, 0, 1, &set, 0, 0);
 
 	//XXX glsl_Fog_GetColor (fog);
 	//XXX fog[3] = glsl_Fog_GetDensity () / 64.0;

From e0e6677bd337143412549cb2cb21564db563d1d0 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 21 Jan 2021 00:40:22 +0900
Subject: [PATCH 1341/1519] [vulkan] Upload brush model textures

Things aren't quite right with them (sky texture is very wrong), but the
heavy lifting is done.
---
 include/QF/Vulkan/image.h                   |   2 +
 include/QF/Vulkan/qf_texture.h              |   2 +
 libs/models/brush/vulkan_model_brush.c      | 154 ++++++++++++++++++++
 libs/video/renderer/vulkan/vulkan_texture.c |  34 ++++-
 4 files changed, 184 insertions(+), 8 deletions(-)

diff --git a/include/QF/Vulkan/image.h b/include/QF/Vulkan/image.h
index 501a5025e..489c86e40 100644
--- a/include/QF/Vulkan/image.h
+++ b/include/QF/Vulkan/image.h
@@ -28,6 +28,8 @@ typedef struct qfv_imagetransitionset_s
 	DARRAY_TYPE (qfv_imagetransition_t) qfv_imagetransitionset_t;
 typedef struct qfv_imagebarrierset_s
 	DARRAY_TYPE (VkImageMemoryBarrier) qfv_imagebarrierset_t;
+#define QFV_AllocImageBarrierSet(num, allocator) \
+	DARRAY_ALLOCFIXED (qfv_imagebarrierset_t, num, allocator)
 
 struct qfv_device_s;
 VkImage QFV_CreateImage (struct qfv_device_s *device, int cubemap,
diff --git a/include/QF/Vulkan/qf_texture.h b/include/QF/Vulkan/qf_texture.h
index 90906873c..a2ffbd38e 100644
--- a/include/QF/Vulkan/qf_texture.h
+++ b/include/QF/Vulkan/qf_texture.h
@@ -11,6 +11,8 @@ typedef struct qfv_tex_s {
 	VkImageView view;
 } qfv_tex_t;
 
+void Vulkan_ExpandPalette (byte *dst, const byte *src, const byte *palette,
+						   int alpha, int count);
 qfv_tex_t *Vulkan_LoadTex (struct vulkan_ctx_s *ctx, tex_t *tex, int mip);
 VkImageView Vulkan_TexImageView (qfv_tex_t *tex) __attribute__((pure));
 void Vulkan_UnloadTex (struct vulkan_ctx_s *ctx, qfv_tex_t *tex);
diff --git a/libs/models/brush/vulkan_model_brush.c b/libs/models/brush/vulkan_model_brush.c
index 52826d280..2b5ed2021 100644
--- a/libs/models/brush/vulkan_model_brush.c
+++ b/libs/models/brush/vulkan_model_brush.c
@@ -48,9 +48,13 @@
 #include "QF/Vulkan/qf_bsp.h"
 #include "QF/Vulkan/qf_model.h"
 #include "QF/Vulkan/qf_texture.h"
+#include "QF/Vulkan/barrier.h"
+#include "QF/Vulkan/command.h"
 #include "QF/Vulkan/device.h"
 #include "QF/Vulkan/image.h"
+#include "QF/Vulkan/staging.h"
 
+#include "qfalloca.h"
 #include "compat.h"
 #include "mod_internal.h"
 #include "r_internal.h"
@@ -96,6 +100,75 @@ get_image_size (VkImage image, qfv_device_t *device)
 	return size;
 }
 
+static void
+transfer_mips (byte *dst, const void *_src, const texture_t *tx)
+{
+	const byte *src = _src;
+	unsigned    width = tx->width;
+	unsigned    height = tx->height;
+	unsigned    count, offset;
+
+	for (int i = 0; i < MIPLEVELS; i++) {
+		// mip offsets are relative to the texture pointer rather than the
+		// end of the texture struct
+		offset = tx->offsets[i] - sizeof (texture_t);
+		count = width * height;
+		Vulkan_ExpandPalette (dst, src + offset, vid.palette, 1, count);
+		dst += count;
+		width >>= 1;
+		height >>= 1;
+	}
+}
+
+static void
+copy_mips (qfv_packet_t *packet, texture_t *tx, qfv_tex_t *tex,
+			qfv_devfuncs_t *dfunc)
+{
+	// base copy
+	VkBufferImageCopy copy = {
+		tex->offset, tx->width, 0,
+		{VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1},
+		{0, 0, 0}, {tx->width, tx->height, 1},
+	};
+	int         is_sky = 0;
+	int         sky_offset = 0;
+	size_t      size = tx->width * tx->height * 4;
+	int         copy_count = MIPLEVELS;
+
+	if (strncmp (tx->name, "sky", 3) == 0) {
+		if (tx->width == 2 * tx->height) {
+			copy.imageExtent.width /= 2;
+			sky_offset = tx->width * 4 / 2;
+		}
+		is_sky = 1;
+		copy_count *= 2;
+	}
+
+	__auto_type copies = QFV_AllocBufferImageCopy (copy_count, alloca);
+	copies->size = 0;
+
+	for (int i = 0; i < MIPLEVELS; i++) {
+		__auto_type c = &copies->a[copies->size++];
+		*c = copy;
+		if (is_sky) {
+			__auto_type c = &copies->a[copies->size++];
+			*c = copy;
+			c->bufferOffset += sky_offset * 4;
+			c->imageSubresource.baseArrayLayer = 1;
+		}
+		copy.bufferOffset += size;
+		size >>= 2;
+		copy.bufferRowLength >>= 1;
+		copy.imageExtent.width >>= 1;
+		copy.imageExtent.height >>= 1;
+		sky_offset >>= 1;
+	}
+	dfunc->vkCmdCopyBufferToImage (packet->cmd, packet->stage->buffer,
+								   tex->image,
+								   VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
+								   copies->size, copies->a);
+}
+
 static void
 load_textures (model_t *model, vulkan_ctx_t *ctx)
 {
@@ -103,7 +176,10 @@ load_textures (model_t *model, vulkan_ctx_t *ctx)
 	qfv_devfuncs_t *dfunc = device->funcs;
 	modelctx_t *mctx = model->data;
 	VkImage     image = 0;
+	byte       *buffer;
 
+	size_t      image_count = 0;
+	size_t      copy_count = 0;
 	size_t      memsize = 0;
 	for (int i = 0; i < model->numtextures; i++) {
 		texture_t  *tx = model->textures[i];
@@ -113,11 +189,18 @@ load_textures (model_t *model, vulkan_ctx_t *ctx)
 		vulktex_t  *tex = tx->render;
 		tex->tex->offset = memsize;
 		memsize += get_image_size (tex->tex->image, device);
+		image_count++;
+		copy_count += MIPLEVELS;
+		if (strncmp (tx->name, "sky", 3) == 0) {
+			copy_count += MIPLEVELS;
+		}
 		// just so we have one in the end
 		image = tex->tex->image;
 		if (tex->glow) {
+			copy_count += MIPLEVELS;
 			tex->glow->offset = memsize;
 			memsize += get_image_size (tex->glow->image, device);
+			image_count++;
 		}
 	}
 	VkDeviceMemory mem;
@@ -126,6 +209,11 @@ load_textures (model_t *model, vulkan_ctx_t *ctx)
 								memsize, 0);
 	mctx->texture_memory = mem;
 
+	qfv_stagebuf_t *stage = QFV_CreateStagingBuffer (device, memsize, 1,
+													 ctx->cmdpool);
+	qfv_packet_t *packet = QFV_PacketAcquire (stage);
+	buffer = QFV_PacketExtend (packet, memsize);
+
 	for (int i = 0; i < model->numtextures; i++) {
 		texture_t  *tx = model->textures[i];
 		if (!tx) {
@@ -142,6 +230,7 @@ load_textures (model_t *model, vulkan_ctx_t *ctx)
 		tex->tex->view = QFV_CreateImageView (device, tex->tex->image,
 											  type, VK_FORMAT_R8G8B8A8_UNORM,
 											  VK_IMAGE_ASPECT_COLOR_BIT);
+		transfer_mips (buffer + tex->tex->offset, tx + 1, tx);
 		if (tex->glow) {
 			dfunc->vkBindImageMemory (device->dev, tex->glow->image, mem,
 									  tex->glow->offset);
@@ -151,8 +240,67 @@ load_textures (model_t *model, vulkan_ctx_t *ctx)
 												   VK_IMAGE_VIEW_TYPE_2D,
 												   VK_FORMAT_R8G8B8A8_UNORM,
 												   VK_IMAGE_ASPECT_COLOR_BIT);
+			transfer_mips (buffer + tex->glow->offset, tex->glow->memory, tx);
 		}
 	}
+
+	// base barrier
+	VkImageMemoryBarrier barrier;
+	barrier = imageLayoutTransitionBarriers[qfv_LT_Undefined_to_TransferDst];
+	barrier.subresourceRange.levelCount = VK_REMAINING_MIP_LEVELS;
+	barrier.subresourceRange.layerCount = VK_REMAINING_ARRAY_LAYERS;
+
+	__auto_type barriers = QFV_AllocImageBarrierSet (image_count, malloc);
+	barriers->size = 0;
+	for (int i = 0; i < model->numtextures; i++) {
+		texture_t  *tx = model->textures[i];
+		if (!tx) {
+			continue;
+		}
+		vulktex_t  *tex = tx->render;
+		__auto_type b = &barriers->a[barriers->size++];
+		*b = barrier;
+		b->image = tex->tex->image;
+		if (tex->glow) {
+			b = &barriers->a[barriers->size++];
+			*b = barrier;
+			b->image = tex->glow->image;
+		}
+	}
+	qfv_pipelinestagepair_t stages;
+
+	stages = imageLayoutTransitionStages[qfv_LT_Undefined_to_TransferDst];
+	dfunc->vkCmdPipelineBarrier (packet->cmd, stages.src, stages.dst,
+								 0, 0, 0, 0, 0,
+								 barriers->size, barriers->a);
+	for (int i = 0, j = 0; i < model->numtextures; i++) {
+		texture_t  *tx = model->textures[i];
+		if (!tx) {
+			continue;
+		}
+		vulktex_t  *tex = tx->render;
+		__auto_type b = &barriers->a[j++];
+		b->oldLayout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL;
+		b->newLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
+		b->srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT;
+		b->dstAccessMask = VK_ACCESS_SHADER_READ_BIT;
+		copy_mips (packet, tx, tex->tex, dfunc);
+		if (tex->glow) {
+			b = &barriers->a[j++];
+			b->oldLayout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL;
+			b->newLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
+			b->srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT;
+			b->dstAccessMask = VK_ACCESS_SHADER_READ_BIT;
+			copy_mips (packet, tx, tex->glow, dfunc);
+		}
+	}
+
+	stages=imageLayoutTransitionStages[qfv_LT_TransferDst_to_ShaderReadOnly];
+	dfunc->vkCmdPipelineBarrier (packet->cmd, stages.src, stages.dst,
+								 0, 0, 0, 0, 0,
+								 barriers->size, barriers->a);
+	QFV_PacketSubmit (packet);
+	QFV_DestroyStagingBuffer (stage);
 }
 
 void
@@ -173,12 +321,18 @@ Vulkan_Mod_ProcessTexture (texture_t *tx, vulkan_ctx_t *ctx)
 	}
 
 	vulktex_t    *tex = tx->render;
+	tex->texture = tx;
 	tex->tex = (qfv_tex_t *) (tx + 1);
 	VkExtent3D extent = { tx->width, tx->height, 1 };
 
 	int layers = 1;
 	if (strncmp (tx->name, "sky", 3) == 0) {
 		layers = 2;
+		// the sky texture is normally 2 side-by-side squares, but
+		// some maps have just a single square
+		if (tx->width == 2 * tx->height) {
+			extent.width /= 2;
+		}
 	}
 
 	tex->tex->image = QFV_CreateImage (device, 0, VK_IMAGE_TYPE_2D,
diff --git a/libs/video/renderer/vulkan/vulkan_texture.c b/libs/video/renderer/vulkan/vulkan_texture.c
index 05d602d63..bc95431b0 100644
--- a/libs/video/renderer/vulkan/vulkan_texture.c
+++ b/libs/video/renderer/vulkan/vulkan_texture.c
@@ -85,6 +85,30 @@ ilog2 (unsigned x)
 	return y;
 }
 
+void
+Vulkan_ExpandPalette (byte *dst, const byte *src, const byte *palette,
+					  int alpha, int count)
+{
+	if (alpha) {
+		while (count-- > 0) {
+			byte        pix = *src++;
+			const byte *col = palette + pix;
+			*dst++ = *col++;
+			*dst++ = *col++;
+			*dst++ = *col++;
+			*dst++ = 0xff;
+		}
+	} else {
+		while (count-- > 0) {
+			byte        pix = *src++;
+			const byte *col = palette + pix;
+			*dst++ = *col++;
+			*dst++ = *col++;
+			*dst++ = *col++;
+		}
+	}
+}
+
 qfv_tex_t *
 Vulkan_LoadTex (vulkan_ctx_t *ctx, tex_t *tex, int mip)
 {
@@ -152,14 +176,8 @@ Vulkan_LoadTex (vulkan_ctx_t *ctx, tex_t *tex, int mip)
 	byte       *tex_data = QFV_PacketExtend (packet, bytes);
 
 	if (tex->format == tex_palette) {
-		byte       *data = tex->data;
-		for (size_t count = tex->width * tex->height; count-- > 0; ) {
-			byte        pix = *data++;
-			byte       *col = tex->palette + pix;
-			*tex_data++ = *col++;
-			*tex_data++ = *col++;
-			*tex_data++ = *col++;
-		}
+		Vulkan_ExpandPalette (tex_data, tex->data, tex->palette,
+							  0, tex->width * tex->height);
 	} else {
 		memcpy (tex_data, tex->data, bytes);
 	}

From 9e03096da6d116461a06bce1c35df4498094ebab Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 21 Jan 2021 02:13:40 +0900
Subject: [PATCH 1342/1519] [vulkan] Build brush model display lists

Not working particularly well yet, but no errors out of validation.
---
 include/QF/Vulkan/funclist.h                |   1 +
 include/QF/Vulkan/qf_bsp.h                  |  11 +-
 libs/video/renderer/r_init.c                |   1 -
 libs/video/renderer/vid_render_vulkan.c     |   1 +
 libs/video/renderer/vulkan/qfpipeline.plist |  25 ++-
 libs/video/renderer/vulkan/quakebsp.frag    |  17 ++-
 libs/video/renderer/vulkan/vulkan_bsp.c     | 161 ++++++++++++++------
 7 files changed, 151 insertions(+), 66 deletions(-)

diff --git a/include/QF/Vulkan/funclist.h b/include/QF/Vulkan/funclist.h
index 209ee0561..b0fe394d9 100644
--- a/include/QF/Vulkan/funclist.h
+++ b/include/QF/Vulkan/funclist.h
@@ -169,6 +169,7 @@ DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdEndRenderPass)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdBindPipeline)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdClearColorImage)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdExecuteCommands)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdPushConstants)
 
 DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdSetViewport)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdSetScissor)
diff --git a/include/QF/Vulkan/qf_bsp.h b/include/QF/Vulkan/qf_bsp.h
index 6d4440bd6..95f128e5b 100644
--- a/include/QF/Vulkan/qf_bsp.h
+++ b/include/QF/Vulkan/qf_bsp.h
@@ -44,7 +44,8 @@ typedef struct bspvert_s {
 typedef struct elements_s {
 	struct elements_s *_next;
 	struct elements_s *next;
-	byte       *base;
+	uint32_t    first_index;
+	uint32_t    index_count;
 } elements_t;
 
 typedef struct elechain_s {
@@ -57,9 +58,9 @@ typedef struct elechain_s {
 } elechain_t;
 
 typedef struct bspframe_s {
-	uint32_t    *index_data;
-	uint32_t     index_count;
-	uint32_t     index_offset;
+	uint32_t    *index_data;	// pointer into mega-buffer for this frame (c)
+	uint32_t     index_offset;	// offset of index_data within mega-buffer (c)
+	uint32_t     index_count;	// number if indices queued (d)
 	VkCommandBuffer bsp_cmd;
 	VkCommandBuffer turb_cmd;
 	VkCommandBuffer sky_cmd;
@@ -96,6 +97,7 @@ typedef struct bspctx_s {
 	instsurf_t **instsurfs_tail;
 	instsurf_t  *free_instsurfs;
 
+	struct qfv_tex_s *skysheet_tex;
 	struct qfv_tex_s *skybox_tex;
 	quat_t       sky_rotation[2];
 	quat_t       sky_velocity;
@@ -110,6 +112,7 @@ typedef struct bspctx_s {
 
 	struct bsppoly_s *polys;
 
+	VkSampler    sampler;
 	VkDeviceMemory texture_memory;
 	VkPipeline   main;
 	VkPipelineLayout layout;
diff --git a/libs/video/renderer/r_init.c b/libs/video/renderer/r_init.c
index 94385e1c2..733004a21 100644
--- a/libs/video/renderer/r_init.c
+++ b/libs/video/renderer/r_init.c
@@ -68,7 +68,6 @@ static U void (*const r_scrapdelete)(rscrap_t *) = R_ScrapDelete;
 static void
 R_shutdown (void *data)
 {
-	Mod_ClearAll ();
 	if (vidrendmodule->functions->general->p_Shutdown) {
 		vidrendmodule->functions->general->p_Shutdown ();
 	}
diff --git a/libs/video/renderer/vid_render_vulkan.c b/libs/video/renderer/vid_render_vulkan.c
index 9e6dc90fd..85d090b37 100644
--- a/libs/video/renderer/vid_render_vulkan.c
+++ b/libs/video/renderer/vid_render_vulkan.c
@@ -606,6 +606,7 @@ vulkan_vid_render_shutdown (void)
 	df->vkDestroyCommandPool (dev, vulkan_ctx->cmdpool, 0);
 	Vulkan_Draw_Shutdown (vulkan_ctx);
 	Vulkan_Bsp_Shutdown (vulkan_ctx);
+	Mod_ClearAll ();
 	Vulkan_Shutdown_Common (vulkan_ctx);
 }
 
diff --git a/libs/video/renderer/vulkan/qfpipeline.plist b/libs/video/renderer/vulkan/qfpipeline.plist
index 822e187a5..aa60ec958 100644
--- a/libs/video/renderer/vulkan/qfpipeline.plist
+++ b/libs/video/renderer/vulkan/qfpipeline.plist
@@ -30,6 +30,23 @@
 			borderColor = float_transparent_black;
 			unnormalizedCoordinates = false;
 		};
+		quakebsp = {
+			magFilter = linear;
+			minFilter = linear;
+			mipmapMode = linear;
+			addressModeU = repeat;
+			addressModeV = repeat;
+			addressModeW = repeat;
+			mipLodBias = 0;
+			anisotropyEnable = false;
+			maxAnisotropy = 0;
+			compareEnable = false;
+			compareOp = always;
+			minLod = 0;
+			maxLod = 1;
+			borderColor = float_transparent_black;
+			unnormalizedCoordinates = false;
+		};
 	};
 	descriptorPools = {
 		twod = {
@@ -110,12 +127,12 @@
 					descriptorCount = 1;
 					stageFlags = fragment;
 				},
-				{
+				/*{
 					binding = 5;
 					descriptorType = combined_image_sampler;
 					descriptorCount = 1;
 					stageFlags = fragment;
-				},
+				},*/
 			);
 		};
 		something = {
@@ -150,7 +167,7 @@
 				},
 				{
 					stageFlags = fragment;
-					offset = 0;
+					offset = 64;
 					size = 32;
 				},
 			);
@@ -176,7 +193,7 @@
 				bindings = (
 					{
 						binding = 0;
-						stride = "3 * 4 * 4";
+						stride = "2 * 4 * 4";
 						inputRate = vertex;
 					},
 				);
diff --git a/libs/video/renderer/vulkan/quakebsp.frag b/libs/video/renderer/vulkan/quakebsp.frag
index 219ce9212..24745fba0 100644
--- a/libs/video/renderer/vulkan/quakebsp.frag
+++ b/libs/video/renderer/vulkan/quakebsp.frag
@@ -4,9 +4,10 @@ layout (set = 0, binding = 1) uniform sampler2D Texture;
 layout (set = 0, binding = 2) uniform sampler2D Glowmap;
 layout (set = 0, binding = 3) uniform sampler2D Lightmap;
 layout (set = 0, binding = 4) uniform sampler2DArray SkySheet;
-layout (set = 0, binding = 5) uniform samplerCube SkyCube;
+//layout (set = 0, binding = 5) uniform samplerCube SkyCube;
 
 layout (push_constant) uniform PushConstants {
+	layout (offset = 64)
 	float       time;
 	vec4        fog;
 };
@@ -70,7 +71,7 @@ sky_sheet (vec3 dir, float time)
 
 	return c;
 }
-
+/*
 vec4
 sky_cube (vec3 dir, float time)
 {
@@ -80,20 +81,22 @@ sky_cube (vec3 dir, float time)
 	// to do here is swizzle the Y and Z coordinates
 	return texture (SkyCube, dir.xzy);
 }
-
+*/
 vec4
 sky_color (vec3 dir, float time)
 {
 	if (!doSkySheet) {
-		return sky_cube (dir, time);
+		return vec4 (1, 0, 1, 1);
+		//return sky_cube (dir, time);
 	} if (!doSkyCube) {
 		return sky_sheet (dir, time);
 	} else {
-		// can see through the sheet (may look funny when looking down)
+		/*// can see through the sheet (may look funny when looking down)
 		// maybe have 4 sheet layers instead of 2?
 		vec4        c1 = sky_sheet (dir, time);
 		vec4        c2 = sky_cube (dir, time);
-		return vec4 (mix (c2.rgb, c1.rgb, c1.a), max (c1.a, c2.a));
+		return vec4 (mix (c2.rgb, c1.rgb, c1.a), max (c1.a, c2.a));*/
+		return vec4 (1, 0, 1, 1);
 	}
 }
 
@@ -117,5 +120,5 @@ main (void)
 	}
 	c += texture (Glowmap, t_st);
 
-	frag_color = fogBlend (c);
+	frag_color = vec4(t_st, 1, 1);//fogBlend (c);
 }
diff --git a/libs/video/renderer/vulkan/vulkan_bsp.c b/libs/video/renderer/vulkan/vulkan_bsp.c
index aba44c043..d60f95bb5 100644
--- a/libs/video/renderer/vulkan/vulkan_bsp.c
+++ b/libs/video/renderer/vulkan/vulkan_bsp.c
@@ -496,10 +496,6 @@ Vulkan_BuildDisplayLists (model_t **models, int num_models, vulkan_ctx_t *ctx)
 				el = el->next;
 				vertex_index_base = 0;
 			}*/
-			// we don't use it now, but pre-initializing the list won't hurt
-			//XXX if (!el->list)
-			//XXX 	el->list = dstring_new ();
-			//XXX dstring_clear (el->list);
 
 			surf->polys = (glpoly_t *) poly;
 			poly = build_surf_displist (models, surf, vertex_index_base,
@@ -757,16 +753,14 @@ R_VisitWorldNodes (model_t *model, vulkan_ctx_t *ctx)
 		visit_leaf ((mleaf_t *) node);
 }
 
-/*static void
-draw_elechain (elechain_t *ec, int matloc, int vertloc, int tlstloc,
-			   int colloc, bspctx_t *bctx)
+static void
+draw_elechain (elechain_t *ec, VkPipelineLayout layout, qfv_devfuncs_t *dfunc,
+			   VkCommandBuffer cmd)
 {
-	mat4_t      mat;
 	elements_t *el;
-	int         count;
-	float      *color;
 
-	if (colloc >= 0) {
+	/*if (colloc >= 0) {
+		float      *color;
 		color = ec->color;
 		if (!color)
 			color = bctx->default_color;
@@ -774,29 +768,31 @@ draw_elechain (elechain_t *ec, int matloc, int vertloc, int tlstloc,
 			QuatCopy (color, bctx->last_color);
 			qfeglVertexAttrib4fv (quake_bsp.color.location, color);
 		}
-	}
+	}*/
 	if (ec->transform) {
-		Mat4Mult (bsp_vp, ec->transform, mat);
-		qfeglUniformMatrix4fv (matloc, 1, false, mat);
-	} else {
-		qfeglUniformMatrix4fv (matloc, 1, false, bsp_vp);
+		dfunc->vkCmdPushConstants (cmd, layout, VK_SHADER_STAGE_VERTEX_BIT,
+								   0, 16 * sizeof (float), ec->transform);
 	}
 	for (el = ec->elements; el; el = el->next) {
-		if (!el->list->size)
+		//FIXME check if these are contiguous and if so merge into one
+		//command
+		if (!el->index_count)
 			continue;
-		count = el->list->size / sizeof (GLushort);
-		qfeglVertexAttribPointer (vertloc, 4, GL_FLOAT,
-								 0, sizeof (bspvert_t),
-								 el->base + field_offset (bspvert_t, vertex));
-		if (tlstloc >= 0)
-			qfeglVertexAttribPointer (tlstloc, 4, GL_FLOAT,
-									 0, sizeof (bspvert_t),
-									 el->base + field_offset (bspvert_t,tlst));
-		qfeglDrawElements (GL_TRIANGLES, count,
-						   GL_UNSIGNED_SHORT, el->list->str);
-		dstring_clear (el->list);
+		dfunc->vkCmdDrawIndexed (cmd, el->index_count, 1, el->first_index,
+								 0, 0);
+		el->first_index = 0;
+		el->index_count = 0;
 	}
-}*/
+}
+
+static VkImageView
+get_view (qfv_tex_t *tex)
+{
+	if (tex) {
+		return tex->view;
+	}
+	return 0;
+}
 
 static void
 bsp_begin (vulkan_ctx_t *ctx)
@@ -814,6 +810,54 @@ bsp_begin (vulkan_ctx_t *ctx)
 	VkCommandBuffer cmd = bframe->bsp_cmd;
 	DARRAY_APPEND (cframe->subCommand, cmd);
 
+	VkDescriptorBufferInfo bufferInfo = {
+		ctx->matrices.buffer_3d, 0, VK_WHOLE_SIZE
+	};
+	VkDescriptorImageInfo imageInfo[] = {
+		{ bctx->sampler,
+		  QFV_ScrapImageView (bctx->light_scrap),
+		  VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL },
+		{ bctx->sampler,
+		  QFV_ScrapImageView (bctx->light_scrap),
+		  VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL },
+		{ bctx->sampler,
+		  QFV_ScrapImageView (bctx->light_scrap),
+		  VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL },
+		{ bctx->sampler,
+		  get_view (bctx->skysheet_tex),
+		  VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL },
+		{ bctx->sampler,
+		  get_view (bctx->skybox_tex),
+		  VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL },
+	};
+	VkWriteDescriptorSet write[] = {
+		{ VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, 0,
+		  bframe->descriptors, 0, 0, 1,
+		  VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER,
+		  0, &bufferInfo, 0 },
+		{ VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, 0,
+		  bframe->descriptors, 1, 0, 1,
+		  VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER,
+		  &imageInfo[0], 0, 0 },
+		{ VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, 0,
+		  bframe->descriptors, 2, 0, 1,
+		  VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER,
+		  &imageInfo[1], 0, 0 },
+		{ VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, 0,
+		  bframe->descriptors, 3, 0, 1,
+		  VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER,
+		  &imageInfo[2], 0, 0 },
+		{ VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, 0,
+		  bframe->descriptors, 4, 0, 1,
+		  VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER,
+		  &imageInfo[3], 0, 0 },
+		{ VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, 0,
+		  bframe->descriptors, 5, 0, 1,
+		  VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER,
+		  &imageInfo[4], 0, 0 },
+	};
+	dfunc->vkUpdateDescriptorSets (device->dev, 5, write, 0, 0);
+
 	dfunc->vkResetCommandBuffer (cmd, 0);
 	VkCommandBufferInheritanceInfo inherit = {
 		VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_INFO, 0,
@@ -1011,49 +1055,56 @@ sky_end (bspctx_t *bctx)
 
 static inline void
 add_surf_elements (vulktex_t *tex, instsurf_t *is,
-				   elechain_t **ec, elements_t **el, bspctx_t *bctx)
+				   elechain_t **ec, elements_t **el,
+				   bspctx_t *bctx, bspframe_t *bframe)
 {
 	msurface_t *surf = is->surface;
-	//XXX bsppoly_t  *poly = (bsppoly_t *) surf->polys;
+	bsppoly_t  *poly = (bsppoly_t *) surf->polys;
 
 	if (!tex->elechain) {
 		(*ec) = add_elechain (tex, surf->ec_index, bctx);
 		(*ec)->transform = is->transform;
 		(*ec)->color = is->color;
 		(*el) = (*ec)->elements;
-		//XXX if (!(*el)->list)
-		//XXX 	(*el)->list = dstring_new ();
-		//XXX dstring_clear ((*el)->list);
+		(*el)-> first_index = bframe->index_count;
 	}
 	if (is->transform != (*ec)->transform || is->color != (*ec)->color) {
 		(*ec) = add_elechain (tex, surf->ec_index, bctx);
 		(*ec)->transform = is->transform;
 		(*ec)->color = is->color;
 		(*el) = (*ec)->elements;
-		//XXX if (!(*el)->list)
-		//XXX 	(*el)->list = dstring_new ();
-		//XXX dstring_clear ((*el)->list);
+		(*el)-> first_index = bframe->index_count;
 	}
-	//XXX dstring_append ((*el)->list, (char *) poly->indices,
-	//XXX 				poly->count * sizeof (poly->indices[0]));
+	memcpy (bframe->index_data + bframe->index_count,
+			poly->indices, poly->count * sizeof (poly->indices[0]));
+	(*el)->index_count += poly->count;
 }
 
 static void
-build_tex_elechain (vulktex_t *tex, bspctx_t *bctx)
+build_tex_elechain (vulktex_t *tex, bspctx_t *bctx, bspframe_t *bframe)
 {
 	instsurf_t *is;
 	elechain_t *ec = 0;
 	elements_t *el = 0;
 
 	for (is = tex->tex_chain; is; is = is->tex_chain) {
-		add_surf_elements (tex, is, &ec, &el, bctx);
+		add_surf_elements (tex, is, &ec, &el, bctx, bframe);
 	}
 }
 
 void
 Vulkan_DrawWorld (vulkan_ctx_t *ctx)
 {
+	static float identity[] = {
+		1, 0, 0, 0,
+		0, 1, 0, 0,
+		0, 0, 1, 0,
+		0, 0, 0, 1,
+	};
+	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
 	bspctx_t   *bctx = ctx->bsp_context;
+	bspframe_t *bframe = &bctx->frames.a[ctx->curFrame];
 	entity_t    worldent;
 
 	clear_texture_chains (bctx);	// do this first for water and skys
@@ -1061,6 +1112,9 @@ Vulkan_DrawWorld (vulkan_ctx_t *ctx)
 	memset (&worldent, 0, sizeof (worldent));
 	worldent.model = r_worldentity.model;
 
+	vulktex_t  *tex = r_worldentity.model->skytexture->render;
+	bctx->skysheet_tex = tex->tex;
+
 	currententity = &worldent;
 
 	R_VisitWorldNodes (worldent.model, ctx);
@@ -1077,24 +1131,29 @@ Vulkan_DrawWorld (vulkan_ctx_t *ctx)
 
 	Vulkan_FlushLightmaps (ctx);
 	bsp_begin (ctx);
+
+	dfunc->vkCmdPushConstants (bframe->bsp_cmd, bctx->layout,
+							   VK_SHADER_STAGE_VERTEX_BIT,
+							   0, 16 * sizeof (float), identity);
+	float frag_pc[8] = { };
+	dfunc->vkCmdPushConstants (bframe->bsp_cmd, bctx->layout,
+							   VK_SHADER_STAGE_FRAGMENT_BIT,
+							   64, 8 * sizeof (float), &frag_pc);
 	//XXX qfeglActiveTexture (GL_TEXTURE0 + 0);
 	for (size_t i = 0; i < bctx->texture_chains.size; i++) {
 		vulktex_t  *tex;
-		//XXX elechain_t *ec = 0;
+		elechain_t *ec = 0;
 
 		tex = bctx->texture_chains.a[i];
 
-		build_tex_elechain (tex, bctx);
+		build_tex_elechain (tex, bctx, bframe);
 
 		//XXX if (tex->elechain)
 		//XXX 	qfeglBindTexture (GL_TEXTURE_2D, tex->gl_texturenum);
 
-		/*XXX for (ec = tex->elechain; ec; ec = ec->next) {
-			draw_elechain (ec, quake_bsp.mvp_matrix.location,
-						   quake_bsp.vertex.location,
-						   quake_bsp.tlst.location,
-						   quake_bsp.color.location);
-		}*/
+		for (ec = tex->elechain; ec; ec = ec->next) {
+			draw_elechain (ec, bctx->layout, dfunc, bframe->bsp_cmd);
+		}
 		tex->elechain = 0;
 		tex->elechain_tail = &tex->elechain;
 	}
@@ -1152,6 +1211,7 @@ void
 Vulkan_DrawSky (vulkan_ctx_t *ctx)
 {
 	bspctx_t   *bctx = ctx->bsp_context;
+	bspframe_t *bframe = &bctx->frames.a[ctx->curFrame];
 	instsurf_t *is;
 	msurface_t *surf;
 	vulktex_t  *tex = 0;
@@ -1180,7 +1240,7 @@ Vulkan_DrawSky (vulkan_ctx_t *ctx)
 			}
 			tex = surf->texinfo->texture->render;
 		}
-		add_surf_elements (tex, is, &ec, &el, bctx);
+		add_surf_elements (tex, is, &ec, &el, bctx, bframe);
 	}
 	if (tex) {
 		if (!bctx->skybox_tex) {
@@ -1230,6 +1290,7 @@ Vulkan_Bsp_Init (vulkan_ctx_t *ctx)
 
 	bctx->main = Vulkan_CreatePipeline (ctx, "quakebsp.main");
 	bctx->layout = QFV_GetPipelineLayout (ctx, "quakebsp");
+	bctx->sampler = QFV_GetSampler (ctx, "quakebsp");
 
 	__auto_type layouts = QFV_AllocDescriptorSetLayoutSet (frames, alloca);
 	for (size_t i = 0; i < layouts->size; i++) {

From 2c1a335715a9531b50266b802af44e1d9a423cfb Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 21 Jan 2021 12:39:08 +0900
Subject: [PATCH 1343/1519] [vulkan] Use vkCmdPushDescriptorSetKHR for bsp

This makes switching textures on the fly much easier.
---
 include/QF/Vulkan/funclist.h                  |  1 +
 include/QF/Vulkan/qf_bsp.h                    |  1 -
 libs/video/renderer/vulkan/qfpipeline.plist   | 15 +-------
 libs/video/renderer/vulkan/vulkan_bsp.c       | 35 ++++++++-----------
 .../video/renderer/vulkan/vulkan_vid_common.c |  2 ++
 5 files changed, 18 insertions(+), 36 deletions(-)

diff --git a/include/QF/Vulkan/funclist.h b/include/QF/Vulkan/funclist.h
index b0fe394d9..90c3a51d2 100644
--- a/include/QF/Vulkan/funclist.h
+++ b/include/QF/Vulkan/funclist.h
@@ -170,6 +170,7 @@ DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdBindPipeline)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdClearColorImage)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdExecuteCommands)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdPushConstants)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdPushDescriptorSetKHR)
 
 DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdSetViewport)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdSetScissor)
diff --git a/include/QF/Vulkan/qf_bsp.h b/include/QF/Vulkan/qf_bsp.h
index 95f128e5b..5b01da407 100644
--- a/include/QF/Vulkan/qf_bsp.h
+++ b/include/QF/Vulkan/qf_bsp.h
@@ -64,7 +64,6 @@ typedef struct bspframe_s {
 	VkCommandBuffer bsp_cmd;
 	VkCommandBuffer turb_cmd;
 	VkCommandBuffer sky_cmd;
-	VkDescriptorSet descriptors;
 } bspframe_t;
 
 typedef struct bspframeset_s
diff --git a/libs/video/renderer/vulkan/qfpipeline.plist b/libs/video/renderer/vulkan/qfpipeline.plist
index aa60ec958..fee54e446 100644
--- a/libs/video/renderer/vulkan/qfpipeline.plist
+++ b/libs/video/renderer/vulkan/qfpipeline.plist
@@ -63,20 +63,6 @@
 				},
 			);
 		};
-		quakebsp = {
-			flags = 0;
-			maxSets = $framebuffers.size;
-			bindings = (
-				{
-					type = uniform_buffer;
-					descriptorCount = $framebuffers.size;
-				},
-				{
-					type = combined_image_sampler;
-					descriptorCount = "5z * $framebuffers.size";
-				},
-			);
-		};
 	};
 	setLayouts = {
 		twod = {
@@ -96,6 +82,7 @@
 			);
 		};
 		quakebsp = {
+			flags = push_descriptor;
 			bindings = (
 				{
 					binding = 0;
diff --git a/libs/video/renderer/vulkan/vulkan_bsp.c b/libs/video/renderer/vulkan/vulkan_bsp.c
index d60f95bb5..5d7c9efc2 100644
--- a/libs/video/renderer/vulkan/vulkan_bsp.c
+++ b/libs/video/renderer/vulkan/vulkan_bsp.c
@@ -831,32 +831,31 @@ bsp_begin (vulkan_ctx_t *ctx)
 		  VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL },
 	};
 	VkWriteDescriptorSet write[] = {
-		{ VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, 0,
-		  bframe->descriptors, 0, 0, 1,
+		{ VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, 0, 0,
+		  0, 0, 1,
 		  VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER,
 		  0, &bufferInfo, 0 },
-		{ VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, 0,
-		  bframe->descriptors, 1, 0, 1,
+		{ VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, 0, 0,
+		  1, 0, 1,
 		  VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER,
 		  &imageInfo[0], 0, 0 },
-		{ VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, 0,
-		  bframe->descriptors, 2, 0, 1,
+		{ VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, 0, 0,
+		  2, 0, 1,
 		  VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER,
 		  &imageInfo[1], 0, 0 },
-		{ VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, 0,
-		  bframe->descriptors, 3, 0, 1,
+		{ VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, 0, 0,
+		  3, 0, 1,
 		  VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER,
 		  &imageInfo[2], 0, 0 },
-		{ VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, 0,
-		  bframe->descriptors, 4, 0, 1,
+		{ VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, 0, 0,
+		  4, 0, 1,
 		  VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER,
 		  &imageInfo[3], 0, 0 },
-		{ VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, 0,
-		  bframe->descriptors, 5, 0, 1,
+		{ VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, 0, 0,
+		  5, 0, 1,
 		  VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER,
 		  &imageInfo[4], 0, 0 },
 	};
-	dfunc->vkUpdateDescriptorSets (device->dev, 5, write, 0, 0);
 
 	dfunc->vkResetCommandBuffer (cmd, 0);
 	VkCommandBufferInheritanceInfo inherit = {
@@ -884,10 +883,8 @@ bsp_begin (vulkan_ctx_t *ctx)
 	dfunc->vkCmdBindIndexBuffer (cmd, bctx->index_buffer, bframe->index_offset,
 								 VK_INDEX_TYPE_UINT32);
 
-	VkDescriptorSet set = bframe->descriptors;
-	VkPipelineLayout layout = bctx->layout;
-	dfunc->vkCmdBindDescriptorSets (cmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
-									layout, 0, 1, &set, 0, 0);
+	dfunc->vkCmdPushDescriptorSetKHR (cmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
+									  bctx->layout, 0, 5, write);
 
 	//XXX glsl_Fog_GetColor (fog);
 	//XXX fog[3] = glsl_Fog_GetDensity () / 64.0;
@@ -1296,20 +1293,16 @@ Vulkan_Bsp_Init (vulkan_ctx_t *ctx)
 	for (size_t i = 0; i < layouts->size; i++) {
 		layouts->a[i] = QFV_GetDescriptorSetLayout (ctx, "quakebsp");
 	}
-	__auto_type pool = QFV_GetDescriptorPool (ctx, "quakebsp");
 
 	__auto_type cmdBuffers = QFV_AllocCommandBufferSet (3 * frames, alloca);
 	QFV_AllocateCommandBuffers (device, ctx->cmdpool, 1, cmdBuffers);
 
-	__auto_type sets = QFV_AllocateDescriptorSet (device, pool, layouts);
 	for (size_t i = 0; i < frames; i++) {
 		__auto_type bframe = &bctx->frames.a[i];
-		bframe->descriptors = sets->a[i];
 		bframe->bsp_cmd = cmdBuffers->a[i];
 		bframe->turb_cmd = cmdBuffers->a[i];
 		bframe->sky_cmd = cmdBuffers->a[i];
 	}
-	free (sets);
 }
 
 void
diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c
index 3d317f52c..d9220307b 100644
--- a/libs/video/renderer/vulkan/vulkan_vid_common.c
+++ b/libs/video/renderer/vulkan/vulkan_vid_common.c
@@ -132,11 +132,13 @@ Vulkan_Init_Cvars (void)
 
 static const char *instance_extensions[] = {
 	VK_KHR_SURFACE_EXTENSION_NAME,
+	VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME,
 	0,
 };
 
 static const char *device_extensions[] = {
 	VK_KHR_SWAPCHAIN_EXTENSION_NAME,
+	VK_KHR_PUSH_DESCRIPTOR_EXTENSION_NAME,
 	0,
 };
 

From eb9807576dedd70cc64396e31ee427007200176a Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 21 Jan 2021 14:37:39 +0900
Subject: [PATCH 1344/1519] [vulkan] Fix the bsp vertex index list creation

There's still a problem with the vertex data itself not getting sent to
the GPU properly, but vulkan is now happy with my tiny test map (which
required disabling skies entirely until I get null textures working).
---
 libs/video/renderer/vulkan/qfpipeline.plist |  4 +--
 libs/video/renderer/vulkan/quakebsp.frag    | 18 ++++++-------
 libs/video/renderer/vulkan/vulkan_bsp.c     | 29 +++++++--------------
 3 files changed, 20 insertions(+), 31 deletions(-)

diff --git a/libs/video/renderer/vulkan/qfpipeline.plist b/libs/video/renderer/vulkan/qfpipeline.plist
index fee54e446..26c3965ac 100644
--- a/libs/video/renderer/vulkan/qfpipeline.plist
+++ b/libs/video/renderer/vulkan/qfpipeline.plist
@@ -108,13 +108,13 @@
 					descriptorCount = 1;
 					stageFlags = fragment;
 				},
-				{
+				/*{
 					binding = 4;
 					descriptorType = combined_image_sampler;
 					descriptorCount = 1;
 					stageFlags = fragment;
 				},
-				/*{
+				{
 					binding = 5;
 					descriptorType = combined_image_sampler;
 					descriptorCount = 1;
diff --git a/libs/video/renderer/vulkan/quakebsp.frag b/libs/video/renderer/vulkan/quakebsp.frag
index 24745fba0..21c26dfaa 100644
--- a/libs/video/renderer/vulkan/quakebsp.frag
+++ b/libs/video/renderer/vulkan/quakebsp.frag
@@ -3,7 +3,7 @@
 layout (set = 0, binding = 1) uniform sampler2D Texture;
 layout (set = 0, binding = 2) uniform sampler2D Glowmap;
 layout (set = 0, binding = 3) uniform sampler2D Lightmap;
-layout (set = 0, binding = 4) uniform sampler2DArray SkySheet;
+//layout (set = 0, binding = 4) uniform sampler2DArray SkySheet;
 //layout (set = 0, binding = 5) uniform samplerCube SkyCube;
 
 layout (push_constant) uniform PushConstants {
@@ -46,7 +46,7 @@ fogBlend (vec4 color)
 
 	return vec4 (mix (fog_color.rgb, color.rgb, fog_factor), color.a);
 }
-
+/*
 vec4
 sky_sheet (vec3 dir, float time)
 {
@@ -71,7 +71,7 @@ sky_sheet (vec3 dir, float time)
 
 	return c;
 }
-/*
+
 vec4
 sky_cube (vec3 dir, float time)
 {
@@ -81,7 +81,7 @@ sky_cube (vec3 dir, float time)
 	// to do here is swizzle the Y and Z coordinates
 	return texture (SkyCube, dir.xzy);
 }
-*/
+
 vec4
 sky_color (vec3 dir, float time)
 {
@@ -91,15 +91,15 @@ sky_color (vec3 dir, float time)
 	} if (!doSkyCube) {
 		return sky_sheet (dir, time);
 	} else {
-		/*// can see through the sheet (may look funny when looking down)
+		// can see through the sheet (may look funny when looking down)
 		// maybe have 4 sheet layers instead of 2?
 		vec4        c1 = sky_sheet (dir, time);
 		vec4        c2 = sky_cube (dir, time);
-		return vec4 (mix (c2.rgb, c1.rgb, c1.a), max (c1.a, c2.a));*/
+		return vec4 (mix (c2.rgb, c1.rgb, c1.a), max (c1.a, c2.a));
 		return vec4 (1, 0, 1, 1);
 	}
 }
-
+*/
 void
 main (void)
 {
@@ -110,11 +110,11 @@ main (void)
 	if (doWarp) {
 		t_st = warp_st (t_st, time);
 	}
-	if (doSkyCube || doSkySheet) {
+	/*if (doSkyCube || doSkySheet) {
 		c = sky_color (direction, time);
 	} else {
 		c = texture (Texture, t_st);
-	}
+	}*/
 	if (doLight) {
 		c *= texture (Lightmap, l_st);
 	}
diff --git a/libs/video/renderer/vulkan/vulkan_bsp.c b/libs/video/renderer/vulkan/vulkan_bsp.c
index 5d7c9efc2..cf6e6dda2 100644
--- a/libs/video/renderer/vulkan/vulkan_bsp.c
+++ b/libs/video/renderer/vulkan/vulkan_bsp.c
@@ -33,9 +33,6 @@
 # include "config.h"
 #endif
 
-#define NH_DEFINE
-//#include "namehack.h"
-
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif
@@ -337,7 +334,7 @@ build_surf_displist (model_t **models, msurface_t *fa, int base,
 	numverts = fa->numedges;
 	numindices = numverts + 1;
 	verts = *vert_list;
-	// surf->polys is set to the next slow before the call
+	// surf->polys is set to the next slot before the call
 	poly = (bsppoly_t *) fa->polys;
 	poly->count = numindices;
 	for (i = 0, ind = poly->indices; i < numverts; i++) {
@@ -474,7 +471,6 @@ Vulkan_BuildDisplayLists (model_t **models, int num_models, vulkan_ctx_t *ctx)
 		vulktex_t  *tex;
 		instsurf_t *is;
 		elechain_t *ec = 0;
-		//elements_t *el = 0;
 
 		tex = bctx->texture_chains.a[i];
 
@@ -482,20 +478,10 @@ Vulkan_BuildDisplayLists (model_t **models, int num_models, vulkan_ctx_t *ctx)
 			msurface_t *surf = is->surface;
 			if (!tex->elechain) {
 				ec = add_elechain (tex, surf->ec_index, bctx);
-				//el = ec->elements;
-				vertex_index_base = 0;
 			}
 			if (surf->ec_index != ec->index) {	// next sub-model
 				ec = add_elechain (tex, surf->ec_index, bctx);
-				//el = ec->elements;
-				vertex_index_base = 0;
 			}
-			/*if (vertex_index_base + surf->numedges > 65535) {
-				// elements index overflow
-				el->next = get_elements (bctx);
-				el = el->next;
-				vertex_index_base = 0;
-			}*/
 
 			surf->polys = (glpoly_t *) poly;
 			poly = build_surf_displist (models, surf, vertex_index_base,
@@ -534,6 +520,7 @@ Vulkan_BuildDisplayLists (model_t **models, int num_models, vulkan_ctx_t *ctx)
 			uint32_t    offset = index_count * i;
 			bctx->frames.a[i].index_data = index_data + offset;
 			bctx->frames.a[i].index_offset = offset * sizeof (uint32_t);
+			bctx->frames.a[i].index_count = 0;
 		}
 	}
 	if (vertex_buffer_size > bctx->vertex_buffer_size) {
@@ -884,7 +871,7 @@ bsp_begin (vulkan_ctx_t *ctx)
 								 VK_INDEX_TYPE_UINT32);
 
 	dfunc->vkCmdPushDescriptorSetKHR (cmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
-									  bctx->layout, 0, 5, write);
+									  bctx->layout, 0, 4, write);
 
 	//XXX glsl_Fog_GetColor (fog);
 	//XXX fog[3] = glsl_Fog_GetDensity () / 64.0;
@@ -1063,18 +1050,19 @@ add_surf_elements (vulktex_t *tex, instsurf_t *is,
 		(*ec)->transform = is->transform;
 		(*ec)->color = is->color;
 		(*el) = (*ec)->elements;
-		(*el)-> first_index = bframe->index_count;
+		(*el)->first_index = bframe->index_count;
 	}
 	if (is->transform != (*ec)->transform || is->color != (*ec)->color) {
 		(*ec) = add_elechain (tex, surf->ec_index, bctx);
 		(*ec)->transform = is->transform;
 		(*ec)->color = is->color;
 		(*el) = (*ec)->elements;
-		(*el)-> first_index = bframe->index_count;
+		(*el)->first_index = bframe->index_count;
 	}
 	memcpy (bframe->index_data + bframe->index_count,
 			poly->indices, poly->count * sizeof (poly->indices[0]));
 	(*el)->index_count += poly->count;
+	bframe->index_count += poly->count;
 }
 
 static void
@@ -1105,12 +1093,13 @@ Vulkan_DrawWorld (vulkan_ctx_t *ctx)
 	entity_t    worldent;
 
 	clear_texture_chains (bctx);	// do this first for water and skys
+	bframe->index_count = 0;
 
 	memset (&worldent, 0, sizeof (worldent));
 	worldent.model = r_worldentity.model;
 
-	vulktex_t  *tex = r_worldentity.model->skytexture->render;
-	bctx->skysheet_tex = tex->tex;
+	//vulktex_t  *tex = r_worldentity.model->skytexture->render;
+	//bctx->skysheet_tex = tex->tex;
 
 	currententity = &worldent;
 

From 94b589567b7ec36c94a1ba40ab0307481424ec62 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 21 Jan 2021 16:39:11 +0900
Subject: [PATCH 1345/1519] [vulkan] Rename texture.c to scrap.c

I had originally planned on mixing the stage management with general
texture support code like I did in glsl, but I think that was a mistake
and I did keep looking for scrap.[ch] when I wanted to edit something to
do with the scrap...
---
 include/QF/Vulkan/{texture.h => scrap.h}          | 6 +++---
 libs/video/renderer/Makemodule.am                 | 2 +-
 libs/video/renderer/vulkan/{texture.c => scrap.c} | 6 +++---
 libs/video/renderer/vulkan/vulkan_bsp.c           | 2 +-
 libs/video/renderer/vulkan/vulkan_draw.c          | 2 +-
 libs/video/renderer/vulkan/vulkan_lightmap.c      | 2 +-
 libs/video/renderer/vulkan/vulkan_texture.c       | 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)
 rename include/QF/Vulkan/{texture.h => scrap.h} (87%)
 rename libs/video/renderer/vulkan/{texture.c => scrap.c} (99%)

diff --git a/include/QF/Vulkan/texture.h b/include/QF/Vulkan/scrap.h
similarity index 87%
rename from include/QF/Vulkan/texture.h
rename to include/QF/Vulkan/scrap.h
index 35aaf5bb5..563a46cc2 100644
--- a/include/QF/Vulkan/texture.h
+++ b/include/QF/Vulkan/scrap.h
@@ -1,5 +1,5 @@
-#ifndef __QF_Vulkan_texture_h
-#define __QF_Vulkan_texture_h
+#ifndef __QF_Vulkan_scrap_h
+#define __QF_Vulkan_scrap_h
 
 #include "QF/image.h"
 
@@ -21,4 +21,4 @@ void *QFV_SubpicBatch (subpic_t *subpic, struct qfv_stagebuf_s *stage);
 
 void QFV_ScrapFlush (scrap_t *scrap);
 
-#endif//__QF_Vulkan_texture_h
+#endif//__QF_Vulkan_scrap_h
diff --git a/libs/video/renderer/Makemodule.am b/libs/video/renderer/Makemodule.am
index a200747ff..5a30c9f0c 100644
--- a/libs/video/renderer/Makemodule.am
+++ b/libs/video/renderer/Makemodule.am
@@ -229,10 +229,10 @@ libs_video_renderer_vid_render_vulkan_la_SOURCES = \
 	libs/video/renderer/vulkan/namehack.h \
 	libs/video/renderer/vulkan/pipeline.c \
 	libs/video/renderer/vulkan/renderpass.c \
+	libs/video/renderer/vulkan/scrap.c \
 	libs/video/renderer/vulkan/shader.c \
 	libs/video/renderer/vulkan/staging.c \
 	libs/video/renderer/vulkan/swapchain.c \
-	libs/video/renderer/vulkan/texture.c \
 	libs/video/renderer/vulkan/util.c \
 	libs/video/renderer/vulkan/util.h \
 	libs/video/renderer/vulkan/vkparse.c \
diff --git a/libs/video/renderer/vulkan/texture.c b/libs/video/renderer/vulkan/scrap.c
similarity index 99%
rename from libs/video/renderer/vulkan/texture.c
rename to libs/video/renderer/vulkan/scrap.c
index 112c71a92..6e17e786c 100644
--- a/libs/video/renderer/vulkan/texture.c
+++ b/libs/video/renderer/vulkan/scrap.c
@@ -1,7 +1,7 @@
 /*
-	texuture.c
+	scrap.c
 
-	Vulkan texuture manager
+	Vulkan scrap manager
 
 	Copyright (C) 2021      Bill Currie <bill@taniwha.org>
 
@@ -54,8 +54,8 @@
 #include "QF/Vulkan/device.h"
 #include "QF/Vulkan/image.h"
 #include "QF/Vulkan/instance.h"
+#include "QF/Vulkan/scrap.h"
 #include "QF/Vulkan/staging.h"
-#include "QF/Vulkan/texture.h"
 
 #include "r_scrap.h"
 #include "vid_vulkan.h"
diff --git a/libs/video/renderer/vulkan/vulkan_bsp.c b/libs/video/renderer/vulkan/vulkan_bsp.c
index cf6e6dda2..d8c45d556 100644
--- a/libs/video/renderer/vulkan/vulkan_bsp.c
+++ b/libs/video/renderer/vulkan/vulkan_bsp.c
@@ -59,8 +59,8 @@
 #include "QF/Vulkan/command.h"
 #include "QF/Vulkan/descriptor.h"
 #include "QF/Vulkan/device.h"
+#include "QF/Vulkan/scrap.h"
 #include "QF/Vulkan/staging.h"
-#include "QF/Vulkan/texture.h"
 
 #include "r_internal.h"
 #include "vid_vulkan.h"
diff --git a/libs/video/renderer/vulkan/vulkan_draw.c b/libs/video/renderer/vulkan/vulkan_draw.c
index cca17f727..7345fccd5 100644
--- a/libs/video/renderer/vulkan/vulkan_draw.c
+++ b/libs/video/renderer/vulkan/vulkan_draw.c
@@ -59,8 +59,8 @@
 #include "QF/Vulkan/descriptor.h"
 #include "QF/Vulkan/device.h"
 #include "QF/Vulkan/image.h"
+#include "QF/Vulkan/scrap.h"
 #include "QF/Vulkan/staging.h"
-#include "QF/Vulkan/texture.h"
 
 #include "r_internal.h"
 #include "vid_vulkan.h"
diff --git a/libs/video/renderer/vulkan/vulkan_lightmap.c b/libs/video/renderer/vulkan/vulkan_lightmap.c
index 495864d9f..01025e110 100644
--- a/libs/video/renderer/vulkan/vulkan_lightmap.c
+++ b/libs/video/renderer/vulkan/vulkan_lightmap.c
@@ -49,7 +49,7 @@
 #include "QF/Vulkan/qf_bsp.h"
 #include "QF/Vulkan/qf_lightmap.h"
 #include "QF/Vulkan/qf_main.h"
-#include "QF/Vulkan/texture.h"
+#include "QF/Vulkan/scrap.h"
 
 #include "compat.h"
 #include "r_internal.h"
diff --git a/libs/video/renderer/vulkan/vulkan_texture.c b/libs/video/renderer/vulkan/vulkan_texture.c
index bc95431b0..a35498fef 100644
--- a/libs/video/renderer/vulkan/vulkan_texture.c
+++ b/libs/video/renderer/vulkan/vulkan_texture.c
@@ -56,8 +56,8 @@
 #include "QF/Vulkan/device.h"
 #include "QF/Vulkan/image.h"
 #include "QF/Vulkan/instance.h"
+#include "QF/Vulkan/scrap.h"
 #include "QF/Vulkan/staging.h"
-#include "QF/Vulkan/texture.h"
 
 #include "r_scrap.h"
 #include "vid_vulkan.h"

From dc79a8a935cfb3d2fffe2705a379b7fa82f70892 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 21 Jan 2021 17:13:17 +0900
Subject: [PATCH 1346/1519] [vulkan] Clear scrap image on creation

And fix the transitions in ScrapFlush.
---
 include/QF/Vulkan/barrier.h              |  1 +
 include/QF/Vulkan/scrap.h                |  2 +-
 libs/video/renderer/vulkan/barrier.c     | 12 ++++++++
 libs/video/renderer/vulkan/scrap.c       | 35 +++++++++++++++++++++---
 libs/video/renderer/vulkan/vulkan_bsp.c  |  2 +-
 libs/video/renderer/vulkan/vulkan_draw.c |  2 +-
 6 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/include/QF/Vulkan/barrier.h b/include/QF/Vulkan/barrier.h
index 12cea49ab..56438aeba 100644
--- a/include/QF/Vulkan/barrier.h
+++ b/include/QF/Vulkan/barrier.h
@@ -11,6 +11,7 @@ typedef struct {
 enum {
 	qfv_LT_Undefined_to_TransferDst,
 	qfv_LT_TransferDst_to_ShaderReadOnly,
+	qfv_LT_ShaderReadOnly_to_TransferDst,
 	qfv_LT_Undefined_to_DepthStencil,
 	qfv_LT_Undefined_to_Color,
 };
diff --git a/include/QF/Vulkan/scrap.h b/include/QF/Vulkan/scrap.h
index 563a46cc2..80c95bd96 100644
--- a/include/QF/Vulkan/scrap.h
+++ b/include/QF/Vulkan/scrap.h
@@ -9,7 +9,7 @@ struct qfv_stagebuf_s;
 struct qfv_device_s;
 
 scrap_t *QFV_CreateScrap (struct qfv_device_s *device, int size,
-						  QFFormat format);
+						  QFFormat format, struct qfv_stagebuf_s *stage);
 size_t QFV_ScrapSize (scrap_t *scrap);
 void QFV_ScrapClear (scrap_t *scrap);
 void QFV_DestroyScrap (scrap_t *scrap);
diff --git a/libs/video/renderer/vulkan/barrier.c b/libs/video/renderer/vulkan/barrier.c
index e257eb990..935b370e0 100644
--- a/libs/video/renderer/vulkan/barrier.c
+++ b/libs/video/renderer/vulkan/barrier.c
@@ -50,6 +50,15 @@ const VkImageMemoryBarrier imageLayoutTransitionBarriers[] = {
 		VK_QUEUE_FAMILY_IGNORED, VK_QUEUE_FAMILY_IGNORED, 0,
 		{ VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1 }
 	},
+	// shader read only optimal -> transfer dst optimal
+	{	VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER, 0,
+		VK_ACCESS_SHADER_READ_BIT,
+		VK_ACCESS_TRANSFER_WRITE_BIT,
+		VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL,
+		VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
+		VK_QUEUE_FAMILY_IGNORED, VK_QUEUE_FAMILY_IGNORED, 0,
+		{ VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1 }
+	},
 	// undefined -> depth stencil attachment optimal
 	{	VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER, 0,
 		0,
@@ -80,6 +89,9 @@ const qfv_pipelinestagepair_t imageLayoutTransitionStages[] = {
 	// transfer dst optimal -> shader read only optimal
 	{	VK_PIPELINE_STAGE_TRANSFER_BIT,
 		VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT },
+	// shader read only optimal -> transfer dst optimal
+	{	VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT,
+		VK_PIPELINE_STAGE_TRANSFER_BIT },
 	// undefined -> depth stencil attachment optimal
 	{	VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT,
 		VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT },
diff --git a/libs/video/renderer/vulkan/scrap.c b/libs/video/renderer/vulkan/scrap.c
index 6e17e786c..bc5efeda5 100644
--- a/libs/video/renderer/vulkan/scrap.c
+++ b/libs/video/renderer/vulkan/scrap.c
@@ -76,8 +76,10 @@ struct scrap_s {
 };
 
 scrap_t *
-QFV_CreateScrap (qfv_device_t *device, int size, QFFormat format)
+QFV_CreateScrap (qfv_device_t *device, int size, QFFormat format,
+				 qfv_stagebuf_t *stage)
 {
+	qfv_devfuncs_t *dfunc = device->funcs;
 	int         bpp = 0;
 	VkFormat    fmt = VK_FORMAT_UNDEFINED;
 
@@ -132,6 +134,32 @@ QFV_CreateScrap (qfv_device_t *device, int size, QFFormat format)
 	scrap->batch_tail = &scrap->batch;
 	scrap->batch_free = 0;
 	scrap->batch_count = 0;
+
+	VkImageMemoryBarrier barrier;
+	qfv_pipelinestagepair_t stages;
+
+	qfv_packet_t *packet = QFV_PacketAcquire (stage);
+	// no data for the packet
+	stages = imageLayoutTransitionStages[qfv_LT_Undefined_to_TransferDst];
+	barrier = imageLayoutTransitionBarriers[qfv_LT_Undefined_to_TransferDst];
+	barrier.image = scrap->image;
+	dfunc->vkCmdPipelineBarrier (packet->cmd, stages.src, stages.dst,
+								 0, 0, 0, 0, 0,
+								 1, &barrier);
+	VkClearColorValue color = {
+		float32:{0xde/255.0, 0xad/255.0, 0xbe/255.0, 0xef/255.0},
+	};
+	VkImageSubresourceRange range = { VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1 };
+	dfunc->vkCmdClearColorImage (packet->cmd, scrap->image,
+								 VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
+								 &color, 1, &range);
+	stages = imageLayoutTransitionStages[qfv_LT_TransferDst_to_ShaderReadOnly];
+	barrier=imageLayoutTransitionBarriers[qfv_LT_TransferDst_to_ShaderReadOnly];
+	barrier.image = scrap->image;
+	dfunc->vkCmdPipelineBarrier (packet->cmd, stages.src, stages.dst,
+								 0, 0, 0, 0, 0,
+								 1, &barrier);
+	QFV_PacketSubmit (packet);
 	return scrap;
 }
 
@@ -286,12 +314,11 @@ QFV_ScrapFlush (scrap_t *scrap)
 		copy->a[i].imageExtent.depth = 1;
 	}
 
-
 	VkImageMemoryBarrier barrier;
 	qfv_pipelinestagepair_t stages;
 
-	stages = imageLayoutTransitionStages[qfv_LT_Undefined_to_TransferDst];
-	barrier = imageLayoutTransitionBarriers[qfv_LT_Undefined_to_TransferDst];
+	stages = imageLayoutTransitionStages[qfv_LT_ShaderReadOnly_to_TransferDst];
+	barrier=imageLayoutTransitionBarriers[qfv_LT_ShaderReadOnly_to_TransferDst];
 	barrier.image = scrap->image;
 	dfunc->vkCmdPipelineBarrier (packet->cmd, stages.src, stages.dst,
 								 0, 0, 0, 0, 0,
diff --git a/libs/video/renderer/vulkan/vulkan_bsp.c b/libs/video/renderer/vulkan/vulkan_bsp.c
index d8c45d556..f485b0259 100644
--- a/libs/video/renderer/vulkan/vulkan_bsp.c
+++ b/libs/video/renderer/vulkan/vulkan_bsp.c
@@ -1262,7 +1262,7 @@ Vulkan_Bsp_Init (vulkan_ctx_t *ctx)
 	bctx->elementss_tail = &bctx->elementss;
 	bctx->instsurfs_tail = &bctx->instsurfs;
 
-	bctx->light_scrap = QFV_CreateScrap (device, 2048, tex_frgba);
+	bctx->light_scrap = QFV_CreateScrap (device, 2048, tex_frgba, ctx->staging);
 	size_t      size = QFV_ScrapSize (bctx->light_scrap);
 	bctx->light_stage = QFV_CreateStagingBuffer (device, size, 3,
 												 ctx->cmdpool);
diff --git a/libs/video/renderer/vulkan/vulkan_draw.c b/libs/video/renderer/vulkan/vulkan_draw.c
index 7345fccd5..2e41e2252 100644
--- a/libs/video/renderer/vulkan/vulkan_draw.c
+++ b/libs/video/renderer/vulkan/vulkan_draw.c
@@ -367,9 +367,9 @@ Vulkan_Draw_Init (vulkan_ctx_t *ctx)
 										 0, 0);
 
 	create_quad_buffers (ctx);
-	dctx->scrap = QFV_CreateScrap (device, 2048, tex_rgba);
 	dctx->stage = QFV_CreateStagingBuffer (device, 4 * 1024 * 1024, 4,
 										   ctx->cmdpool);
+	dctx->scrap = QFV_CreateScrap (device, 2048, tex_rgba, dctx->stage);
 	dctx->sampler = QFV_GetSampler (ctx, "quakepic");
 
 	qpic_t     *charspic = Draw_Font8x8Pic ();

From 2acdaa02525f3c13dcf93d32540f3e7ebb618806 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 21 Jan 2021 21:24:54 +0900
Subject: [PATCH 1347/1519] [vulkan] Fix a pile of data upload issues

Copying data from the wrong buffer was the cause of the corrupted brush
model vertices, and then lots of little errors (mostly forgetting to
multiply by bpp) for textures.
---
 libs/models/brush/vulkan_model_brush.c       | 10 ++++++----
 libs/video/renderer/vulkan/qfpipeline.plist  |  2 +-
 libs/video/renderer/vulkan/vulkan_bsp.c      |  2 +-
 libs/video/renderer/vulkan/vulkan_lightmap.c |  7 ++++---
 libs/video/renderer/vulkan/vulkan_texture.c  |  4 ++--
 5 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/libs/models/brush/vulkan_model_brush.c b/libs/models/brush/vulkan_model_brush.c
index 2b5ed2021..e40a76e28 100644
--- a/libs/models/brush/vulkan_model_brush.c
+++ b/libs/models/brush/vulkan_model_brush.c
@@ -114,7 +114,7 @@ transfer_mips (byte *dst, const void *_src, const texture_t *tx)
 		offset = tx->offsets[i] - sizeof (texture_t);
 		count = width * height;
 		Vulkan_ExpandPalette (dst, src + offset, vid.palette, 1, count);
-		dst += count;
+		dst += count * 4;
 		width >>= 1;
 		height >>= 1;
 	}
@@ -126,7 +126,7 @@ copy_mips (qfv_packet_t *packet, texture_t *tx, qfv_tex_t *tex,
 {
 	// base copy
 	VkBufferImageCopy copy = {
-		tex->offset, tx->width, 0,
+		tex->offset, tx->width, tx->height,
 		{VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1},
 		{0, 0, 0}, {tx->width, tx->height, 1},
 	};
@@ -153,14 +153,16 @@ copy_mips (qfv_packet_t *packet, texture_t *tx, qfv_tex_t *tex,
 		if (is_sky) {
 			__auto_type c = &copies->a[copies->size++];
 			*c = copy;
-			c->bufferOffset += sky_offset * 4;
+			c->bufferOffset += sky_offset;
 			c->imageSubresource.baseArrayLayer = 1;
 		}
 		copy.bufferOffset += size;
 		size >>= 2;
 		copy.bufferRowLength >>= 1;
+		copy.bufferImageHeight >>= 1;
 		copy.imageExtent.width >>= 1;
 		copy.imageExtent.height >>= 1;
+		copy.imageSubresource.mipLevel++;
 		sky_offset >>= 1;
 	}
 	dfunc->vkCmdCopyBufferToImage (packet->cmd, packet->stage->buffer,
@@ -322,7 +324,7 @@ Vulkan_Mod_ProcessTexture (texture_t *tx, vulkan_ctx_t *ctx)
 
 	vulktex_t    *tex = tx->render;
 	tex->texture = tx;
-	tex->tex = (qfv_tex_t *) (tx + 1);
+	tex->tex = (qfv_tex_t *) (tex + 1);
 	VkExtent3D extent = { tx->width, tx->height, 1 };
 
 	int layers = 1;
diff --git a/libs/video/renderer/vulkan/qfpipeline.plist b/libs/video/renderer/vulkan/qfpipeline.plist
index 26c3965ac..094f49948 100644
--- a/libs/video/renderer/vulkan/qfpipeline.plist
+++ b/libs/video/renderer/vulkan/qfpipeline.plist
@@ -43,7 +43,7 @@
 			compareEnable = false;
 			compareOp = always;
 			minLod = 0;
-			maxLod = 1;
+			maxLod = 4;
 			borderColor = float_transparent_black;
 			unnormalizedCoordinates = false;
 		};
diff --git a/libs/video/renderer/vulkan/vulkan_bsp.c b/libs/video/renderer/vulkan/vulkan_bsp.c
index f485b0259..b0b4c2162 100644
--- a/libs/video/renderer/vulkan/vulkan_bsp.c
+++ b/libs/video/renderer/vulkan/vulkan_bsp.c
@@ -552,7 +552,7 @@ Vulkan_BuildDisplayLists (model_t **models, int num_models, vulkan_ctx_t *ctx)
 								 VK_PIPELINE_STAGE_TRANSFER_BIT,
 								 0, 0, 0, 1, &wr_barrier, 0, 0);
 	VkBufferCopy copy_region = { packet->offset, 0, vertex_buffer_size };
-	dfunc->vkCmdCopyBuffer (packet->cmd, ctx->staging->buffer,
+	dfunc->vkCmdCopyBuffer (packet->cmd, stage->buffer,
 							bctx->vertex_buffer, 1, &copy_region);
 	VkBufferMemoryBarrier rd_barrier = {
 		VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER, 0,
diff --git a/libs/video/renderer/vulkan/vulkan_lightmap.c b/libs/video/renderer/vulkan/vulkan_lightmap.c
index 01025e110..30118e484 100644
--- a/libs/video/renderer/vulkan/vulkan_lightmap.c
+++ b/libs/video/renderer/vulkan/vulkan_lightmap.c
@@ -164,9 +164,10 @@ Vulkan_BuildLightMap (msurface_t *surf, vulkan_ctx_t *ctx)
 			surf->cached_light[maps] = scale;				// 8.8 fraction
 			out = block;
 			for (i = 0; i < smax * tmax; i++) {
-				*out++ += *lightmap++ * scale / 256.0;
-				*out++ += *lightmap++ * scale / 256.0;
-				*out++ += *lightmap++ * scale / 256.0;
+				*out++ += *lightmap++ * scale / 65536.0;
+				*out++ += *lightmap++ * scale / 65536.0;
+				*out++ += *lightmap++ * scale / 65536.0;
+				*out++ = 1;
 			}
 		}
 	}
diff --git a/libs/video/renderer/vulkan/vulkan_texture.c b/libs/video/renderer/vulkan/vulkan_texture.c
index a35498fef..295d1a89d 100644
--- a/libs/video/renderer/vulkan/vulkan_texture.c
+++ b/libs/video/renderer/vulkan/vulkan_texture.c
@@ -92,7 +92,7 @@ Vulkan_ExpandPalette (byte *dst, const byte *src, const byte *palette,
 	if (alpha) {
 		while (count-- > 0) {
 			byte        pix = *src++;
-			const byte *col = palette + pix;
+			const byte *col = palette + pix * 3;
 			*dst++ = *col++;
 			*dst++ = *col++;
 			*dst++ = *col++;
@@ -101,7 +101,7 @@ Vulkan_ExpandPalette (byte *dst, const byte *src, const byte *palette,
 	} else {
 		while (count-- > 0) {
 			byte        pix = *src++;
-			const byte *col = palette + pix;
+			const byte *col = palette + pix * 3;
 			*dst++ = *col++;
 			*dst++ = *col++;
 			*dst++ = *col++;

From f96d7109af39e5b1f5bf0becd197d70ccc9c3dbc Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 22 Jan 2021 02:13:58 +0900
Subject: [PATCH 1348/1519] [vulkan] Fix a pure warning

Need to do more testing with optimized builds, but...
---
 include/QF/Vulkan/scrap.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/QF/Vulkan/scrap.h b/include/QF/Vulkan/scrap.h
index 80c95bd96..b4818d558 100644
--- a/include/QF/Vulkan/scrap.h
+++ b/include/QF/Vulkan/scrap.h
@@ -10,7 +10,7 @@ struct qfv_device_s;
 
 scrap_t *QFV_CreateScrap (struct qfv_device_s *device, int size,
 						  QFFormat format, struct qfv_stagebuf_s *stage);
-size_t QFV_ScrapSize (scrap_t *scrap);
+size_t QFV_ScrapSize (scrap_t *scrap) __attribute__((pure));
 void QFV_ScrapClear (scrap_t *scrap);
 void QFV_DestroyScrap (scrap_t *scrap);
 VkImageView QFV_ScrapImageView (scrap_t *scrap) __attribute__((pure));

From 7e7b82086cf6384bebec038f9a8d7cacdd688b6c Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 22 Jan 2021 02:18:39 +0900
Subject: [PATCH 1349/1519] [vulkan] Round up the staging buffer size

Vulkan validation (quite rightly) doesn't like it when the flush range
goes past the end of the buffer, but also doesn't like it when the flush
range isn't cache-line aligned, so align the size of the buffer, too.
---
 include/QF/Vulkan/staging.h          | 1 +
 libs/video/renderer/vulkan/staging.c | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/include/QF/Vulkan/staging.h b/include/QF/Vulkan/staging.h
index aaac5d749..e8cf18ae7 100644
--- a/include/QF/Vulkan/staging.h
+++ b/include/QF/Vulkan/staging.h
@@ -17,6 +17,7 @@ typedef struct qfv_stagebuf_s {
 	size_t      num_packets;///< number of packets in array
 	size_t      next_packet;///< index of the next packet to be used
 	size_t      size;		///< actual size of the buffer
+	size_t      atom_mask;	///< for flush size rounding
 	size_t      end;		///< effective end of the buffer due to early wrap
 	size_t      head;
 	size_t      tail;
diff --git a/libs/video/renderer/vulkan/staging.c b/libs/video/renderer/vulkan/staging.c
index 68bf6a9aa..613422b2b 100644
--- a/libs/video/renderer/vulkan/staging.c
+++ b/libs/video/renderer/vulkan/staging.c
@@ -58,10 +58,13 @@ qfv_stagebuf_t *
 QFV_CreateStagingBuffer (qfv_device_t *device, size_t size, int num_packets,
 						 VkCommandPool cmdPool)
 {
+	size_t atom = device->physDev->properties.limits.nonCoherentAtomSize;
 	qfv_devfuncs_t *dfunc = device->funcs;
 
 	qfv_stagebuf_t *stage = malloc (sizeof (qfv_stagebuf_t)
 									+ num_packets * sizeof (qfv_packet_t));
+	stage->atom_mask = atom - 1;
+	size = (size + stage->atom_mask) & ~stage->atom_mask;
 	stage->device = device;
 	stage->buffer = QFV_CreateBuffer (device, size,
 									  VK_BUFFER_USAGE_TRANSFER_SRC_BIT);
@@ -119,9 +122,8 @@ QFV_FlushStagingBuffer (qfv_stagebuf_t *stage, size_t offset, size_t size)
 	qfv_device_t *device = stage->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
 
-	size_t atom = device->physDev->properties.limits.nonCoherentAtomSize;
-	offset &= ~(atom - 1);
-	size = (size + atom - 1) & ~ (atom - 1);
+	offset &= ~stage->atom_mask;
+	size = (size + stage->atom_mask) & ~stage->atom_mask;
 	VkMappedMemoryRange range = {
 		VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE, 0,
 		stage->memory, offset, size

From c75568c1cf11c9c1ea457bf95c72cdbb5fb0ba47 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 22 Jan 2021 02:20:32 +0900
Subject: [PATCH 1350/1519] [vulkan] Get wall rendering partially working

Many surfaces are missing (I suspect it's due to transform stage
management in the index emitter), and currently only the light maps are
rendered (still not binding the correct textures), but the basics are
working.
---
 libs/video/renderer/vulkan/qfpipeline.plist  |  2 +-
 libs/video/renderer/vulkan/quakebsp.frag     |  5 +++--
 libs/video/renderer/vulkan/quakebsp.vert     |  2 +-
 libs/video/renderer/vulkan/scrap.c           |  2 +-
 libs/video/renderer/vulkan/vulkan_bsp.c      | 20 ++++++++++++++++++++
 libs/video/renderer/vulkan/vulkan_main.c     |  7 ++++---
 libs/video/renderer/vulkan/vulkan_matrices.c |  6 +++---
 7 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/libs/video/renderer/vulkan/qfpipeline.plist b/libs/video/renderer/vulkan/qfpipeline.plist
index 094f49948..9b0a6a1d7 100644
--- a/libs/video/renderer/vulkan/qfpipeline.plist
+++ b/libs/video/renderer/vulkan/qfpipeline.plist
@@ -195,7 +195,7 @@
 						location = 1;
 						binding = 0;
 						format = r32g32b32a32_sfloat;
-						offset = 8;
+						offset = 16;
 					},
 				);
 			};
diff --git a/libs/video/renderer/vulkan/quakebsp.frag b/libs/video/renderer/vulkan/quakebsp.frag
index 21c26dfaa..d79408bf9 100644
--- a/libs/video/renderer/vulkan/quakebsp.frag
+++ b/libs/video/renderer/vulkan/quakebsp.frag
@@ -115,10 +115,11 @@ main (void)
 	} else {
 		c = texture (Texture, t_st);
 	}*/
+	c = texture (Texture, t_st);
 	if (doLight) {
 		c *= texture (Lightmap, l_st);
 	}
 	c += texture (Glowmap, t_st);
-
-	frag_color = vec4(t_st, 1, 1);//fogBlend (c);
+	c = texture (Lightmap, l_st);
+	frag_color = c;//fogBlend (c);
 }
diff --git a/libs/video/renderer/vulkan/quakebsp.vert b/libs/video/renderer/vulkan/quakebsp.vert
index bb9e87e4a..efc03bac8 100644
--- a/libs/video/renderer/vulkan/quakebsp.vert
+++ b/libs/video/renderer/vulkan/quakebsp.vert
@@ -20,6 +20,6 @@ void
 main (void)
 {
 	gl_Position = Projection * (View * (Model * vertex));
-	direction = (Sky * vertex).xyz;
+	direction = vertex.xyz;//(Sky * vertex).xyz;
 	tl_st = tl_uv;
 }
diff --git a/libs/video/renderer/vulkan/scrap.c b/libs/video/renderer/vulkan/scrap.c
index bc5efeda5..27c2ea3bd 100644
--- a/libs/video/renderer/vulkan/scrap.c
+++ b/libs/video/renderer/vulkan/scrap.c
@@ -270,7 +270,7 @@ QFV_SubpicBatch (subpic_t *subpic, qfv_stagebuf_t *stage)
 			dest = QFV_PacketExtend (scrap->packet, size);
 		}
 		if (!dest) {
-			printf ("could not get space for update\n");
+			printf ("scrap: could not get space for update\n");
 			return 0;
 		}
 	}
diff --git a/libs/video/renderer/vulkan/vulkan_bsp.c b/libs/video/renderer/vulkan/vulkan_bsp.c
index b0b4c2162..18e7d2c49 100644
--- a/libs/video/renderer/vulkan/vulkan_bsp.c
+++ b/libs/video/renderer/vulkan/vulkan_bsp.c
@@ -59,6 +59,7 @@
 #include "QF/Vulkan/command.h"
 #include "QF/Vulkan/descriptor.h"
 #include "QF/Vulkan/device.h"
+#include "QF/Vulkan/instance.h"
 #include "QF/Vulkan/scrap.h"
 #include "QF/Vulkan/staging.h"
 
@@ -450,9 +451,13 @@ Vulkan_BuildDisplayLists (model_t **models, int num_models, vulkan_ctx_t *ctx)
 		}
 	}
 
+	size_t atom = device->physDev->properties.limits.nonCoherentAtomSize;
+	size_t atom_mask = atom - 1;
 	size_t frames = bctx->frames.size;
 	size_t index_buffer_size = index_count * frames * sizeof (uint32_t);
 	size_t vertex_buffer_size = vertex_count * sizeof (bspvert_t);
+
+	index_buffer_size = (index_buffer_size + atom_mask) & ~atom_mask;
 	stage = QFV_CreateStagingBuffer (device, vertex_buffer_size, 1,
 									 ctx->cmdpool);
 	qfv_packet_t *packet = QFV_PacketAcquire (stage);
@@ -1144,6 +1149,21 @@ Vulkan_DrawWorld (vulkan_ctx_t *ctx)
 		tex->elechain_tail = &tex->elechain;
 	}
 	bsp_end (ctx);
+
+	size_t      atom = device->physDev->properties.limits.nonCoherentAtomSize;
+	size_t      atom_mask = atom - 1;
+	size_t      offset = bframe->index_offset;
+	size_t      size = bframe->index_count * sizeof (uint32_t);
+
+	offset &= ~atom_mask;
+	size = (size + atom_mask) & ~atom_mask;
+
+	//FIXME this needs to come at the end of the frame after all passes
+	VkMappedMemoryRange range = {
+		VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE, 0,
+		bctx->index_memory, offset, size
+	};
+	dfunc->vkFlushMappedMemoryRanges (device->dev, 1, &range);
 }
 
 void
diff --git a/libs/video/renderer/vulkan/vulkan_main.c b/libs/video/renderer/vulkan/vulkan_main.c
index 1e1913de9..f31558e7b 100644
--- a/libs/video/renderer/vulkan/vulkan_main.c
+++ b/libs/video/renderer/vulkan/vulkan_main.c
@@ -78,7 +78,8 @@ setup_frame (vulkan_ctx_t *ctx)
 static void
 setup_view (vulkan_ctx_t *ctx)
 {
-	float      *mat = ctx->matrices.view_3d;
+	mat4_t      mat;
+	float      *view = ctx->matrices.view_3d;
 	static mat4_t z_up = {
 		 0, 0, -1, 0,
 		-1, 0,  0, 0,
@@ -98,11 +99,11 @@ setup_view (vulkan_ctx_t *ctx)
 	VectorCopy (vup, mat + 8);
 	mat[15] = 1;
 	Mat4Transpose (mat, mat);//AngleVectors gives the transpose of what we want
-	Mat4Mult (z_up, mat, glsl_view);
+	Mat4Mult (z_up, mat, view);
 
 	Mat4Identity (mat);
 	VectorNegate (r_refdef.vieworg, mat + 12);
-	Mat4Mult (glsl_view, mat, glsl_view);
+	Mat4Mult (view, mat, view);
 }
 
 static void
diff --git a/libs/video/renderer/vulkan/vulkan_matrices.c b/libs/video/renderer/vulkan/vulkan_matrices.c
index 62eb16c1d..e1a1dd13e 100644
--- a/libs/video/renderer/vulkan/vulkan_matrices.c
+++ b/libs/video/renderer/vulkan/vulkan_matrices.c
@@ -96,14 +96,14 @@ persp_mat (float *proj, float xmin, float xmax, float ymin, float ymax,
 	proj[12] = 0;
 
 	proj[1] = 0;
-	proj[5] = (2 * neard) / (ymax - ymin);
+	proj[5] = -(2 * neard) / (ymax - ymin);
 	proj[9] = (ymax + ymin) / (ymax - ymin);
 	proj[13] = 0;
 
 	proj[2] = 0;
 	proj[6] = 0;
-	proj[10] = (fard + neard) / (neard - fard);
-	proj[14] = (2 * fard * neard) / (neard - fard);
+	proj[10] = (fard) / (neard - fard);
+	proj[14] = (fard * neard) / (neard - fard);
 
 	proj[3] = 0;
 	proj[7] = 0;

From 55badea1aedc30a1ae3a1b1cde45dad7fe9260bd Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 22 Jan 2021 02:42:58 +0900
Subject: [PATCH 1351/1519] [vulkan] Reset model transform for world surfaces

Fixes the misplaced walls.
---
 libs/video/renderer/vulkan/vulkan_bsp.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/libs/video/renderer/vulkan/vulkan_bsp.c b/libs/video/renderer/vulkan/vulkan_bsp.c
index 18e7d2c49..fe7c001f4 100644
--- a/libs/video/renderer/vulkan/vulkan_bsp.c
+++ b/libs/video/renderer/vulkan/vulkan_bsp.c
@@ -67,6 +67,13 @@
 #include "vid_vulkan.h"
 #include "vkparse.h"
 
+static float identity[] = {
+	1, 0, 0, 0,
+	0, 1, 0, 0,
+	0, 0, 1, 0,
+	0, 0, 0, 1,
+};
+
 #define ALLOC_CHUNK 64
 
 typedef struct bsppoly_s {
@@ -764,6 +771,10 @@ draw_elechain (elechain_t *ec, VkPipelineLayout layout, qfv_devfuncs_t *dfunc,
 	if (ec->transform) {
 		dfunc->vkCmdPushConstants (cmd, layout, VK_SHADER_STAGE_VERTEX_BIT,
 								   0, 16 * sizeof (float), ec->transform);
+	} else {
+		//FIXME should cache current transform
+		dfunc->vkCmdPushConstants (cmd, layout, VK_SHADER_STAGE_VERTEX_BIT,
+								   0, 16 * sizeof (float), identity);
 	}
 	for (el = ec->elements; el; el = el->next) {
 		//FIXME check if these are contiguous and if so merge into one
@@ -1085,12 +1096,6 @@ build_tex_elechain (vulktex_t *tex, bspctx_t *bctx, bspframe_t *bframe)
 void
 Vulkan_DrawWorld (vulkan_ctx_t *ctx)
 {
-	static float identity[] = {
-		1, 0, 0, 0,
-		0, 1, 0, 0,
-		0, 0, 1, 0,
-		0, 0, 0, 1,
-	};
 	qfv_device_t *device = ctx->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
 	bspctx_t   *bctx = ctx->bsp_context;

From c016ad9f5586d520e01546709047c5cbff5559cc Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 22 Jan 2021 13:08:33 +0900
Subject: [PATCH 1352/1519] [vulkan] Ignore light map alpha

Needed to use an rgba format to use floats (and optimal layout), but
having to set the alpha to 1 even for full-dark luxels is not very
efficient. Better to just ignore the alpha in the shader. Fixes the
occasional transparent surface in shadowed areas.
---
 libs/video/renderer/vulkan/quakebsp.frag     | 4 ++--
 libs/video/renderer/vulkan/vulkan_lightmap.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libs/video/renderer/vulkan/quakebsp.frag b/libs/video/renderer/vulkan/quakebsp.frag
index d79408bf9..916581292 100644
--- a/libs/video/renderer/vulkan/quakebsp.frag
+++ b/libs/video/renderer/vulkan/quakebsp.frag
@@ -117,9 +117,9 @@ main (void)
 	}*/
 	c = texture (Texture, t_st);
 	if (doLight) {
-		c *= texture (Lightmap, l_st);
+		c *= vec4 (texture (Lightmap, l_st).xyz, 1);
 	}
 	c += texture (Glowmap, t_st);
-	c = texture (Lightmap, l_st);
+	c = vec4(texture (Lightmap, l_st).xyz, 1);
 	frag_color = c;//fogBlend (c);
 }
diff --git a/libs/video/renderer/vulkan/vulkan_lightmap.c b/libs/video/renderer/vulkan/vulkan_lightmap.c
index 30118e484..6c74ab802 100644
--- a/libs/video/renderer/vulkan/vulkan_lightmap.c
+++ b/libs/video/renderer/vulkan/vulkan_lightmap.c
@@ -167,7 +167,7 @@ Vulkan_BuildLightMap (msurface_t *surf, vulkan_ctx_t *ctx)
 				*out++ += *lightmap++ * scale / 65536.0;
 				*out++ += *lightmap++ * scale / 65536.0;
 				*out++ += *lightmap++ * scale / 65536.0;
-				*out++ = 1;
+				out++;
 			}
 		}
 	}

From baf25f089107292f707b6357be91e4aa7640a3b0 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 22 Jan 2021 15:22:04 +0900
Subject: [PATCH 1353/1519] Document the ring buffer macros

---
 include/QF/ringbuffer.h | 88 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 88 insertions(+)

diff --git a/include/QF/ringbuffer.h b/include/QF/ringbuffer.h
index cc289640e..3ec4a3407 100644
--- a/include/QF/ringbuffer.h
+++ b/include/QF/ringbuffer.h
@@ -28,6 +28,16 @@
 #ifndef __QF_ringbuffer_h
 #define __QF_ringbuffer_h
 
+/** Type declaration for a type-safe ring buffer.
+ *
+ * While not in itself thread-safe, the buffer is designed (and tested) to be
+ * used in a threaded environment using sutable locking mechanisms.
+ *
+ * \param type		The type of data element stored in the ring buffer.
+ * \param size		The number of objects in the ring buffer. Note that the
+ * 					actual capacity of the buffer is `size - 1` due to the
+ * 					way ring buffers work.
+ */
 #define RING_BUFFER(type, size) 	\
 	struct {						\
 		type        buffer[size];	\
@@ -40,16 +50,46 @@
 		sizeof (rb->buffer) / sizeof (rb->buffer[0]);	\
 	})
 
+/** Return the amount of space available for writing in the ring buffer.
+ *
+ * Use this to know how much data can be written (RB_WRITE_DATA()), or just
+ * to see if any space is available.
+ *
+ * \note Does NOT affect buffer state.
+ *
+ * \param ring_buffer	The ring buffer to check for available space.
+ */
 #define RB_SPACE_AVAILABLE(ring_buffer)										\
 	({	__auto_type rb = &(ring_buffer);									\
 		(rb->tail + RB_buffer_size(rb) - rb->head - 1) % RB_buffer_size(rb);\
 	})
 
+/** Return the number of objects available in the ring buffer.
+ *
+ * Use this to know how much data can be read (RB_READ_DATA()) or discarded
+ * (RB_DROP_DATA()), or just to see if any data is available.
+ *
+ * \note Does NOT affect buffer state.
+ *
+ * \param ring_buffer	The ring buffer to check for available data.
+ */
 #define RB_DATA_AVAILABLE(ring_buffer)										\
 	({	__auto_type rb = &(ring_buffer);									\
 		(rb->head + RB_buffer_size (rb) - rb->tail) % RB_buffer_size (rb);	\
 	})
 
+/** Write \a count objects from \a data to the buffer, wrapping if necessary.
+ *
+ * \note Affects buffer state (advances the head).
+ *
+ * \note Does NOT check that the space is available. It is the caller's
+ * responsitiblity to do so using RB_SPACE_AVAILABLE().
+ *
+ * \param ring_buffer	The ring buffer to which the data will be written.
+ * \param data			Pointer to the data to be copied into the ring buffer.
+ * \param count			unsigned int. The number of objects to copy from
+ *						\a data
+ */
 #define RB_WRITE_DATA(ring_buffer, data, count)								\
 	({	__auto_type rb = &(ring_buffer);									\
 		const typeof (rb->buffer[0]) *d = (data);							\
@@ -66,6 +106,19 @@
 		memcpy (rb->buffer + h, d, c * sizeof (rb->buffer[0]));				\
 	})
 
+/** Read \a count objects from the buffer to \a data, wrapping if necessary.
+ *
+ * \note Affects buffer state (advances the tail).
+ *
+ * \note Does NOT check that the data is available. It is the caller's
+ * responsitiblity to do so using RB_DATA_AVAILABLE().
+ *
+ * \param ring_buffer	The ring buffer from which the data will be read.
+ * \param data			Pointer to the location into which data will be copied
+ * 						from the ring buffer.
+ * \param count			unsigned int. The number of objects to copy from
+ *						the buffer into \a data
+ */
 #define RB_READ_DATA(ring_buffer, data, count)								\
 	({	__auto_type rb = &(ring_buffer);									\
 		typeof (&rb->buffer[0]) d = (data);									\
@@ -83,6 +136,17 @@
 		rb->tail = (t + oc) % RB_buffer_size (rb);							\
 	})
 
+/** Discard \a count objects from the ring buffer.
+ *
+ * \note Affects buffer state (advances the tail).
+ *
+ * \note Does NOT check that the data is available. It is the caller's
+ * responsitiblity to do so using RB_DATA_AVAILABLE().
+ *
+ * \param ring_buffer	The ring buffer from which the objects will be
+ * 						discarded.
+ * \param count			The number of objects to discard.
+ */
 #define RB_DROP_DATA(ring_buffer, count)									\
 	({	__auto_type rb = &(ring_buffer);									\
 		unsigned    c = (count);											\
@@ -90,11 +154,35 @@
 		rb->tail = (t + c) % RB_buffer_size (rb);							\
 	})
 
+/** Read a single item from the buffer without affecting buffer state.
+ *
+ * \note Does NOT affect buffer state.
+ *
+ * \note Does NOT check that the data is available. It is the caller's
+ * responsitiblity to do so using RB_DATA_AVAILABLE().
+ *
+ * \param ring_buffer	The ring buffer from which to read the object.
+ * \param ahead			The tail-relative index of the object to read from
+ *						the buffer. Valid range is 0 to
+ *						`RB_DATA_AVAILABLE() - 1`
+ */
 #define RB_PEEK_DATA(ring_buffer, ahead)						\
 	({	__auto_type rb = &(ring_buffer);						\
 		rb->buffer[(rb->tail + ahead) % RB_buffer_size (rb)];	\
 	})
 
+/** WRite a single item to the buffer without affecting buffer state.
+ *
+ * \note Does NOT affect buffer state.
+ *
+ * \note Does NOT check that the data is available. It is the caller's
+ * responsitiblity to do so using RB_DATA_AVAILABLE().
+ *
+ * \param ring_buffer	The ring buffer from which to read the object.
+ * \param ahead			The tail-relative index of the buffer object to write.
+ *						Valid range is 0 to `RB_DATA_AVAILABLE() - 1`
+ * \param data			The data to write to the buffer.
+ */
 #define RB_POKE_DATA(ring_buffer, ahead, data)							\
 	({	__auto_type rb = &(ring_buffer);								\
 		rb->buffer[(rb->tail + ahead) % RB_buffer_size (rb)] = (data);	\

From 07b869d1bfb12d8127ae1f0cb867de9e035d30c6 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 22 Jan 2021 15:23:04 +0900
Subject: [PATCH 1354/1519] Fix some doxygen warnings

---
 doc/quakeforge.dox.conf.in | 7 -------
 include/snd_internal.h     | 3 ++-
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/doc/quakeforge.dox.conf.in b/doc/quakeforge.dox.conf.in
index 1e925e354..3d22be413 100644
--- a/doc/quakeforge.dox.conf.in
+++ b/doc/quakeforge.dox.conf.in
@@ -1116,13 +1116,6 @@ CLANG_DATABASE_PATH    =
 
 ALPHABETICAL_INDEX     = YES
 
-# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
-# which the alphabetical index list will be split.
-# Minimum value: 1, maximum value: 20, default value: 5.
-# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
-
-COLS_IN_ALPHA_INDEX    = 4
-
 # In case all classes in a project start with a common prefix, all classes will
 # be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
 # can be used to specify a prefix (or a list of prefixes) that should be ignored
diff --git a/include/snd_internal.h b/include/snd_internal.h
index ca4dc76c6..7978c4307 100644
--- a/include/snd_internal.h
+++ b/include/snd_internal.h
@@ -58,7 +58,8 @@ typedef struct sfxstream_s sfxstream_t;
 	\param buffer	sound data
 	\param count	number of frames to paint
 */
-typedef void sfxpaint_t (int, channel_t *, float *, unsigned);
+typedef void sfxpaint_t (int offset, channel_t *ch, float *buffer,
+						 unsigned count);
 
 /** Represent a sound sample in the mixer.
 */

From e6704b85e107fc00457759b04e67032c0c2ab64e Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 22 Jan 2021 18:29:35 +0900
Subject: [PATCH 1355/1519] Make RB_PEEK_DATA return the address of the data

This makes it a little more generally useful.
---
 include/QF/ringbuffer.h        |   9 +-
 ruamoko/qwaq/builtins/curses.c | 154 ++++++++++++++++-----------------
 ruamoko/qwaq/builtins/input.c  |   2 +-
 3 files changed, 83 insertions(+), 82 deletions(-)

diff --git a/include/QF/ringbuffer.h b/include/QF/ringbuffer.h
index 3ec4a3407..4c7e95e74 100644
--- a/include/QF/ringbuffer.h
+++ b/include/QF/ringbuffer.h
@@ -154,21 +154,22 @@
 		rb->tail = (t + c) % RB_buffer_size (rb);							\
 	})
 
-/** Read a single item from the buffer without affecting buffer state.
+/** Access a single item from the buffer without affecting buffer state.
  *
  * \note Does NOT affect buffer state.
  *
  * \note Does NOT check that the data is available. It is the caller's
  * responsitiblity to do so using RB_DATA_AVAILABLE().
  *
- * \param ring_buffer	The ring buffer from which to read the object.
- * \param ahead			The tail-relative index of the object to read from
+ * \param ring_buffer	The ring buffer from which to access the object.
+ * \param ahead			The tail-relative index of the object to access from
  *						the buffer. Valid range is 0 to
  *						`RB_DATA_AVAILABLE() - 1`
+ * \return				Address of the accessed element
  */
 #define RB_PEEK_DATA(ring_buffer, ahead)						\
 	({	__auto_type rb = &(ring_buffer);						\
-		rb->buffer[(rb->tail + ahead) % RB_buffer_size (rb)];	\
+		&rb->buffer[(rb->tail + ahead) % RB_buffer_size (rb)];	\
 	})
 
 /** WRite a single item to the buffer without affecting buffer state.
diff --git a/ruamoko/qwaq/builtins/curses.c b/ruamoko/qwaq/builtins/curses.c
index 4f2044cf7..c54721bca 100644
--- a/ruamoko/qwaq/builtins/curses.c
+++ b/ruamoko/qwaq/builtins/curses.c
@@ -273,7 +273,7 @@ qwaq_wait_result (qwaq_resources_t *res, int *result, int cmd, unsigned len)
 {
 	pthread_mutex_lock (&res->results_cond.mut);
 	while (RB_DATA_AVAILABLE (res->results) < len
-		   || RB_PEEK_DATA (res->results, 0) != cmd) {
+		   || *RB_PEEK_DATA (res->results, 0) != cmd) {
 		pthread_cond_wait (&res->results_cond.rcond,
 						   &res->results_cond.mut);
 	}
@@ -285,7 +285,7 @@ qwaq_wait_result (qwaq_resources_t *res, int *result, int cmd, unsigned len)
 static void
 cmd_syncprint (qwaq_resources_t *res)
 {
-	int         string_id = RB_PEEK_DATA (res->command_queue, 2);
+	int         string_id = *RB_PEEK_DATA (res->command_queue, 2);
 
 	Sys_Printf ("%s\n", res->strings[string_id].str);
 	release_string (res, string_id);
@@ -294,10 +294,10 @@ cmd_syncprint (qwaq_resources_t *res)
 static void
 cmd_newwin (qwaq_resources_t *res)
 {
-	int         xpos = RB_PEEK_DATA (res->command_queue, 2);
-	int         ypos = RB_PEEK_DATA (res->command_queue, 3);
-	int         xlen = RB_PEEK_DATA (res->command_queue, 4);
-	int         ylen = RB_PEEK_DATA (res->command_queue, 5);
+	int         xpos = *RB_PEEK_DATA (res->command_queue, 2);
+	int         ypos = *RB_PEEK_DATA (res->command_queue, 3);
+	int         xlen = *RB_PEEK_DATA (res->command_queue, 4);
+	int         ylen = *RB_PEEK_DATA (res->command_queue, 5);
 
 	window_t   *window = window_new (res);
 	window->win = newwin (ylen, xlen, ypos, xpos);
@@ -311,7 +311,7 @@ cmd_newwin (qwaq_resources_t *res)
 static void
 cmd_delwin (qwaq_resources_t *res)
 {
-	int         window_id = RB_PEEK_DATA (res->command_queue, 2);
+	int         window_id = *RB_PEEK_DATA (res->command_queue, 2);
 
 	window_t   *window = get_window (res, __FUNCTION__, window_id);
 	delwin (window->win);
@@ -321,7 +321,7 @@ cmd_delwin (qwaq_resources_t *res)
 static void
 cmd_getwrect (qwaq_resources_t *res)
 {
-	int         window_id = RB_PEEK_DATA (res->command_queue, 2);
+	int         window_id = *RB_PEEK_DATA (res->command_queue, 2);
 	int         xpos, ypos;
 	int         xlen, ylen;
 
@@ -339,7 +339,7 @@ cmd_getwrect (qwaq_resources_t *res)
 static void
 cmd_new_panel (qwaq_resources_t *res)
 {
-	int         window_id = RB_PEEK_DATA (res->command_queue, 2);
+	int         window_id = *RB_PEEK_DATA (res->command_queue, 2);
 
 	window_t   *window = get_window (res, __FUNCTION__, window_id);
 	panel_t    *panel = panel_new (res);
@@ -354,7 +354,7 @@ cmd_new_panel (qwaq_resources_t *res)
 static void
 cmd_del_panel (qwaq_resources_t *res)
 {
-	int         panel_id = RB_PEEK_DATA (res->command_queue, 2);
+	int         panel_id = *RB_PEEK_DATA (res->command_queue, 2);
 
 	panel_t   *panel = get_panel (res, __FUNCTION__, panel_id);
 	del_panel (panel->panel);
@@ -364,7 +364,7 @@ cmd_del_panel (qwaq_resources_t *res)
 static void
 cmd_hide_panel (qwaq_resources_t *res)
 {
-	int         panel_id = RB_PEEK_DATA (res->command_queue, 2);
+	int         panel_id = *RB_PEEK_DATA (res->command_queue, 2);
 
 	panel_t   *panel = get_panel (res, __FUNCTION__, panel_id);
 	hide_panel (panel->panel);
@@ -373,7 +373,7 @@ cmd_hide_panel (qwaq_resources_t *res)
 static void
 cmd_show_panel (qwaq_resources_t *res)
 {
-	int         panel_id = RB_PEEK_DATA (res->command_queue, 2);
+	int         panel_id = *RB_PEEK_DATA (res->command_queue, 2);
 
 	panel_t   *panel = get_panel (res, __FUNCTION__, panel_id);
 	show_panel (panel->panel);
@@ -382,7 +382,7 @@ cmd_show_panel (qwaq_resources_t *res)
 static void
 cmd_top_panel (qwaq_resources_t *res)
 {
-	int         panel_id = RB_PEEK_DATA (res->command_queue, 2);
+	int         panel_id = *RB_PEEK_DATA (res->command_queue, 2);
 
 	panel_t   *panel = get_panel (res, __FUNCTION__, panel_id);
 	top_panel (panel->panel);
@@ -391,7 +391,7 @@ cmd_top_panel (qwaq_resources_t *res)
 static void
 cmd_bottom_panel (qwaq_resources_t *res)
 {
-	int         panel_id = RB_PEEK_DATA (res->command_queue, 2);
+	int         panel_id = *RB_PEEK_DATA (res->command_queue, 2);
 
 	panel_t   *panel = get_panel (res, __FUNCTION__, panel_id);
 	bottom_panel (panel->panel);
@@ -400,9 +400,9 @@ cmd_bottom_panel (qwaq_resources_t *res)
 static void
 cmd_move_panel (qwaq_resources_t *res)
 {
-	int         panel_id = RB_PEEK_DATA (res->command_queue, 2);
-	int         x = RB_PEEK_DATA (res->command_queue, 3);
-	int         y = RB_PEEK_DATA (res->command_queue, 4);
+	int         panel_id = *RB_PEEK_DATA (res->command_queue, 2);
+	int         x = *RB_PEEK_DATA (res->command_queue, 3);
+	int         y = *RB_PEEK_DATA (res->command_queue, 4);
 
 	panel_t   *panel = get_panel (res, __FUNCTION__, panel_id);
 	move_panel (panel->panel, y, x);
@@ -411,7 +411,7 @@ cmd_move_panel (qwaq_resources_t *res)
 static void
 cmd_panel_window (qwaq_resources_t *res)
 {
-	int         panel_id = RB_PEEK_DATA (res->command_queue, 2);
+	int         panel_id = *RB_PEEK_DATA (res->command_queue, 2);
 
 	panel_t   *panel = get_panel (res, __FUNCTION__, panel_id);
 
@@ -423,8 +423,8 @@ cmd_panel_window (qwaq_resources_t *res)
 static void
 cmd_replace_panel (qwaq_resources_t *res)
 {
-	int         panel_id = RB_PEEK_DATA (res->command_queue, 2);
-	int         window_id = RB_PEEK_DATA (res->command_queue, 3);
+	int         panel_id = *RB_PEEK_DATA (res->command_queue, 2);
+	int         window_id = *RB_PEEK_DATA (res->command_queue, 3);
 
 	panel_t   *panel = get_panel (res, __FUNCTION__, panel_id);
 	window_t  *window = get_window (res, __FUNCTION__, window_id);
@@ -447,10 +447,10 @@ cmd_doupdate (qwaq_resources_t *res)
 static void
 cmd_mvwaddstr (qwaq_resources_t *res)
 {
-	int         window_id = RB_PEEK_DATA (res->command_queue, 2);
-	int         x = RB_PEEK_DATA (res->command_queue, 3);
-	int         y = RB_PEEK_DATA (res->command_queue, 4);
-	int         string_id = RB_PEEK_DATA (res->command_queue, 5);
+	int         window_id = *RB_PEEK_DATA (res->command_queue, 2);
+	int         x = *RB_PEEK_DATA (res->command_queue, 3);
+	int         y = *RB_PEEK_DATA (res->command_queue, 4);
+	int         string_id = *RB_PEEK_DATA (res->command_queue, 5);
 
 	window_t   *window = get_window (res, __FUNCTION__, window_id);
 	mvwaddstr (window->win, y, x, res->strings[string_id].str);
@@ -460,8 +460,8 @@ cmd_mvwaddstr (qwaq_resources_t *res)
 static void
 cmd_waddstr (qwaq_resources_t *res)
 {
-	int         window_id = RB_PEEK_DATA (res->command_queue, 2);
-	int         string_id = RB_PEEK_DATA (res->command_queue, 3);
+	int         window_id = *RB_PEEK_DATA (res->command_queue, 2);
+	int         string_id = *RB_PEEK_DATA (res->command_queue, 3);
 
 	window_t   *window = get_window (res, __FUNCTION__, window_id);
 	waddstr (window->win, res->strings[string_id].str);
@@ -471,10 +471,10 @@ cmd_waddstr (qwaq_resources_t *res)
 static void
 cmd_mvwaddch (qwaq_resources_t *res)
 {
-	int         window_id = RB_PEEK_DATA (res->command_queue, 2);
-	int         x = RB_PEEK_DATA (res->command_queue, 3);
-	int         y = RB_PEEK_DATA (res->command_queue, 4);
-	int         ch = RB_PEEK_DATA (res->command_queue, 5);
+	int         window_id = *RB_PEEK_DATA (res->command_queue, 2);
+	int         x = *RB_PEEK_DATA (res->command_queue, 3);
+	int         y = *RB_PEEK_DATA (res->command_queue, 4);
+	int         ch = *RB_PEEK_DATA (res->command_queue, 5);
 
 	window_t   *window = get_window (res, __FUNCTION__, window_id);
 	mvwaddch (window->win, y, x, ch);
@@ -483,8 +483,8 @@ cmd_mvwaddch (qwaq_resources_t *res)
 static void
 cmd_waddch (qwaq_resources_t *res)
 {
-	int         window_id = RB_PEEK_DATA (res->command_queue, 2);
-	int         ch = RB_PEEK_DATA (res->command_queue, 3);
+	int         window_id = *RB_PEEK_DATA (res->command_queue, 2);
+	int         ch = *RB_PEEK_DATA (res->command_queue, 3);
 
 	window_t   *window = get_window (res, __FUNCTION__, window_id);
 	waddch (window->win, ch);
@@ -493,7 +493,7 @@ cmd_waddch (qwaq_resources_t *res)
 static void
 cmd_wrefresh (qwaq_resources_t *res)
 {
-	int         window_id = RB_PEEK_DATA (res->command_queue, 2);
+	int         window_id = *RB_PEEK_DATA (res->command_queue, 2);
 
 	window_t   *window = get_window (res, __FUNCTION__, window_id);
 	wrefresh (window->win);
@@ -502,9 +502,9 @@ cmd_wrefresh (qwaq_resources_t *res)
 static void
 cmd_init_pair (qwaq_resources_t *res)
 {
-	int         pair = RB_PEEK_DATA (res->command_queue, 2);
-	int         f = RB_PEEK_DATA (res->command_queue, 3);
-	int         b = RB_PEEK_DATA (res->command_queue, 4);
+	int         pair = *RB_PEEK_DATA (res->command_queue, 2);
+	int         f = *RB_PEEK_DATA (res->command_queue, 3);
+	int         b = *RB_PEEK_DATA (res->command_queue, 4);
 
 	init_pair (pair, f, b);
 }
@@ -512,8 +512,8 @@ cmd_init_pair (qwaq_resources_t *res)
 static void
 cmd_wbkgd (qwaq_resources_t *res)
 {
-	int         window_id = RB_PEEK_DATA (res->command_queue, 2);
-	int         ch = RB_PEEK_DATA (res->command_queue, 3);
+	int         window_id = *RB_PEEK_DATA (res->command_queue, 2);
+	int         ch = *RB_PEEK_DATA (res->command_queue, 3);
 
 	window_t   *window = get_window (res, __FUNCTION__, window_id);
 	wbkgd (window->win, ch);
@@ -522,7 +522,7 @@ cmd_wbkgd (qwaq_resources_t *res)
 static void
 cmd_werase (qwaq_resources_t *res)
 {
-	int         window_id = RB_PEEK_DATA (res->command_queue, 2);
+	int         window_id = *RB_PEEK_DATA (res->command_queue, 2);
 
 	window_t   *window = get_window (res, __FUNCTION__, window_id);
 	werase (window->win);
@@ -531,8 +531,8 @@ cmd_werase (qwaq_resources_t *res)
 static void
 cmd_scrollok (qwaq_resources_t *res)
 {
-	int         window_id = RB_PEEK_DATA (res->command_queue, 2);
-	int         flag = RB_PEEK_DATA (res->command_queue, 3);
+	int         window_id = *RB_PEEK_DATA (res->command_queue, 2);
+	int         flag = *RB_PEEK_DATA (res->command_queue, 3);
 
 	window_t   *window = get_window (res, __FUNCTION__, window_id);
 	scrollok (window->win, flag);
@@ -541,8 +541,8 @@ cmd_scrollok (qwaq_resources_t *res)
 static void
 cmd_move (qwaq_resources_t *res)
 {
-	int         x = RB_PEEK_DATA (res->command_queue, 2);
-	int         y = RB_PEEK_DATA (res->command_queue, 3);
+	int         x = *RB_PEEK_DATA (res->command_queue, 2);
+	int         y = *RB_PEEK_DATA (res->command_queue, 3);
 
 	move (y, x);
 }
@@ -550,7 +550,7 @@ cmd_move (qwaq_resources_t *res)
 static void
 cmd_curs_set (qwaq_resources_t *res)
 {
-	int         visibility = RB_PEEK_DATA (res->command_queue, 2);
+	int         visibility = *RB_PEEK_DATA (res->command_queue, 2);
 
 	curs_set (visibility);
 }
@@ -558,15 +558,15 @@ cmd_curs_set (qwaq_resources_t *res)
 static void
 cmd_wborder (qwaq_resources_t *res)
 {
-	int         window_id = RB_PEEK_DATA (res->command_queue, 2);
-	int         ls = RB_PEEK_DATA (res->command_queue, 3);
-	int         rs = RB_PEEK_DATA (res->command_queue, 4);
-	int         ts = RB_PEEK_DATA (res->command_queue, 5);
-	int         bs = RB_PEEK_DATA (res->command_queue, 6);
-	int         tl = RB_PEEK_DATA (res->command_queue, 7);
-	int         tr = RB_PEEK_DATA (res->command_queue, 8);
-	int         bl = RB_PEEK_DATA (res->command_queue, 9);
-	int         br = RB_PEEK_DATA (res->command_queue, 10);
+	int         window_id = *RB_PEEK_DATA (res->command_queue, 2);
+	int         ls = *RB_PEEK_DATA (res->command_queue, 3);
+	int         rs = *RB_PEEK_DATA (res->command_queue, 4);
+	int         ts = *RB_PEEK_DATA (res->command_queue, 5);
+	int         bs = *RB_PEEK_DATA (res->command_queue, 6);
+	int         tl = *RB_PEEK_DATA (res->command_queue, 7);
+	int         tr = *RB_PEEK_DATA (res->command_queue, 8);
+	int         bl = *RB_PEEK_DATA (res->command_queue, 9);
+	int         br = *RB_PEEK_DATA (res->command_queue, 10);
 
 	window_t   *window = get_window (res, __FUNCTION__, window_id);
 	wborder (window->win, ls, rs, ts, bs, tl, tr, bl, br);
@@ -575,11 +575,11 @@ cmd_wborder (qwaq_resources_t *res)
 static void
 cmd_mvwblit_line (qwaq_resources_t *res)
 {
-	int         window_id = RB_PEEK_DATA (res->command_queue, 2);
-	int         x = RB_PEEK_DATA (res->command_queue, 3);
-	int         y = RB_PEEK_DATA (res->command_queue, 4);
-	int         chs_id = RB_PEEK_DATA (res->command_queue, 5);
-	int         len = RB_PEEK_DATA (res->command_queue, 6);
+	int         window_id = *RB_PEEK_DATA (res->command_queue, 2);
+	int         x = *RB_PEEK_DATA (res->command_queue, 3);
+	int         y = *RB_PEEK_DATA (res->command_queue, 4);
+	int         chs_id = *RB_PEEK_DATA (res->command_queue, 5);
+	int         len = *RB_PEEK_DATA (res->command_queue, 6);
 	int        *chs = (int *) res->strings[chs_id].str;
 	int         save_x;
 	int         save_y;
@@ -598,9 +598,9 @@ cmd_mvwblit_line (qwaq_resources_t *res)
 static void
 cmd_wresize (qwaq_resources_t *res)
 {
-	int         window_id = RB_PEEK_DATA (res->command_queue, 2);
-	int         width = RB_PEEK_DATA (res->command_queue, 3);
-	int         height = RB_PEEK_DATA (res->command_queue, 4);
+	int         window_id = *RB_PEEK_DATA (res->command_queue, 2);
+	int         width = *RB_PEEK_DATA (res->command_queue, 3);
+	int         height = *RB_PEEK_DATA (res->command_queue, 4);
 
 	window_t   *window = get_window (res, __FUNCTION__, window_id);
 	wresize (window->win, height, width);
@@ -609,8 +609,8 @@ cmd_wresize (qwaq_resources_t *res)
 static void
 cmd_resizeterm (qwaq_resources_t *res)
 {
-	int         width = RB_PEEK_DATA (res->command_queue, 2);
-	int         height = RB_PEEK_DATA (res->command_queue, 3);
+	int         width = *RB_PEEK_DATA (res->command_queue, 2);
+	int         height = *RB_PEEK_DATA (res->command_queue, 3);
 
 	resizeterm (height, width);
 }
@@ -618,11 +618,11 @@ cmd_resizeterm (qwaq_resources_t *res)
 static void
 cmd_mvwhline (qwaq_resources_t *res)
 {
-	int         window_id = RB_PEEK_DATA (res->command_queue, 2);
-	int         x = RB_PEEK_DATA (res->command_queue, 3);
-	int         y = RB_PEEK_DATA (res->command_queue, 4);
-	int         ch = RB_PEEK_DATA (res->command_queue, 5);
-	int         n = RB_PEEK_DATA (res->command_queue, 6);
+	int         window_id = *RB_PEEK_DATA (res->command_queue, 2);
+	int         x = *RB_PEEK_DATA (res->command_queue, 3);
+	int         y = *RB_PEEK_DATA (res->command_queue, 4);
+	int         ch = *RB_PEEK_DATA (res->command_queue, 5);
+	int         n = *RB_PEEK_DATA (res->command_queue, 6);
 
 	window_t   *window = get_window (res, __FUNCTION__, window_id);
 	mvwhline (window->win, y, x, ch, n);
@@ -631,11 +631,11 @@ cmd_mvwhline (qwaq_resources_t *res)
 static void
 cmd_mvwvline (qwaq_resources_t *res)
 {
-	int         window_id = RB_PEEK_DATA (res->command_queue, 2);
-	int         x = RB_PEEK_DATA (res->command_queue, 3);
-	int         y = RB_PEEK_DATA (res->command_queue, 4);
-	int         ch = RB_PEEK_DATA (res->command_queue, 5);
-	int         n = RB_PEEK_DATA (res->command_queue, 6);
+	int         window_id = *RB_PEEK_DATA (res->command_queue, 2);
+	int         x = *RB_PEEK_DATA (res->command_queue, 3);
+	int         y = *RB_PEEK_DATA (res->command_queue, 4);
+	int         ch = *RB_PEEK_DATA (res->command_queue, 5);
+	int         n = *RB_PEEK_DATA (res->command_queue, 6);
 
 	window_t   *window = get_window (res, __FUNCTION__, window_id);
 	mvwvline (window->win, y, x, ch, n);
@@ -645,13 +645,13 @@ static void
 dump_command (qwaq_resources_t *res, int len)
 {
 	if (0) {
-		qwaq_commands cmd = RB_PEEK_DATA (res->command_queue, 0);
+		qwaq_commands cmd = *RB_PEEK_DATA (res->command_queue, 0);
 		Sys_Printf ("%s[%d]", qwaq_command_names[cmd], len);
 		if (cmd == qwaq_cmd_syncprint) {
 			Sys_Printf (" ");
 		} else {
 			for (int i = 2; i < len; i++) {
-				Sys_Printf (" %d", RB_PEEK_DATA (res->command_queue, i));
+				Sys_Printf (" %d", *RB_PEEK_DATA (res->command_queue, i));
 			}
 			Sys_Printf ("\n");
 		}
@@ -692,10 +692,10 @@ process_commands (qwaq_resources_t *res)
 	// as the mutex is not released until after the data has been written to
 	// the buffer.
 	while ((avail = RB_DATA_AVAILABLE (res->command_queue)) >= 2
-		   && avail >= (len = RB_PEEK_DATA (res->command_queue, 1))) {
+		   && avail >= (len = *RB_PEEK_DATA (res->command_queue, 1))) {
 		pthread_mutex_unlock (&res->command_cond.mut);
 		dump_command (res, len);
-		qwaq_commands cmd = RB_PEEK_DATA (res->command_queue, 0);
+		qwaq_commands cmd = *RB_PEEK_DATA (res->command_queue, 0);
 		switch (cmd) {
 			case qwaq_cmd_syncprint:
 				cmd_syncprint (res);
diff --git a/ruamoko/qwaq/builtins/input.c b/ruamoko/qwaq/builtins/input.c
index ce2caec46..ce47b1914 100644
--- a/ruamoko/qwaq/builtins/input.c
+++ b/ruamoko/qwaq/builtins/input.c
@@ -185,7 +185,7 @@ qwaq_add_event (qwaq_resources_t *res, qwaq_event_t *event)
 	pthread_mutex_lock (&res->event_cond.mut);
 	unsigned    last = RB_DATA_AVAILABLE (res->event_queue);
 	if (event->what == qe_mousemove && last > 1
-		&& RB_PEEK_DATA(res->event_queue, last - 1).what == qe_mousemove) {
+		&& RB_PEEK_DATA(res->event_queue, last - 1)->what == qe_mousemove) {
 		RB_POKE_DATA(res->event_queue, last - 1, *event);
 		merged = 1;
 		pthread_cond_broadcast (&res->event_cond.rcond);

From 328a529a94d8153e6cd85e2126c627c34f06477d Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 23 Jan 2021 11:56:45 +0900
Subject: [PATCH 1356/1519] Create RB_ACQUIRE and RB_RELEASE

RB_RELEASE is actually RB_DROP_DATA renamed, but RB_ACQUIRE and
RB_RELEASE work well when working with more structured ring buffer
contents.
---
 include/QF/ringbuffer.h        | 28 ++++++++++++++++++++++++----
 ruamoko/qwaq/builtins/curses.c |  2 +-
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/include/QF/ringbuffer.h b/include/QF/ringbuffer.h
index 4c7e95e74..ac339ea70 100644
--- a/include/QF/ringbuffer.h
+++ b/include/QF/ringbuffer.h
@@ -52,8 +52,8 @@
 
 /** Return the amount of space available for writing in the ring buffer.
  *
- * Use this to know how much data can be written (RB_WRITE_DATA()), or just
- * to see if any space is available.
+ * Use this to know how much data can be written (RB_WRITE_DATA()) or acquired
+ * (RB_ACQUIRE()), or just to see if any space is available.
  *
  * \note Does NOT affect buffer state.
  *
@@ -67,7 +67,7 @@
 /** Return the number of objects available in the ring buffer.
  *
  * Use this to know how much data can be read (RB_READ_DATA()) or discarded
- * (RB_DROP_DATA()), or just to see if any data is available.
+ * (RB_RELEASE()), or just to see if any data is available.
  *
  * \note Does NOT affect buffer state.
  *
@@ -106,6 +106,26 @@
 		memcpy (rb->buffer + h, d, c * sizeof (rb->buffer[0]));				\
 	})
 
+/** Acquire \a count objects from the buffer, wrapping if necessary.
+ *
+ * \note Affects buffer state (advances the head).
+ *
+ * \note Does NOT check that the space is available. It is the caller's
+ * responsitiblity to do so using RB_SPACE_AVAILABLE().
+ *
+ * \param ring_buffer	The ring buffer to which the data will be written.
+ * \param count			unsigned int. The number of objects to copy from
+ *						\a data.
+ * \return				Address of the first object acquired.
+ */
+#define RB_ACQUIRE(ring_buffer, count)										\
+	({	__auto_type rb = &(ring_buffer);									\
+		unsigned    c = (count);											\
+		unsigned    h = rb->head;											\
+		rb->head = (h + c) % RB_buffer_size (rb);							\
+		&rb->buffer[h];														\
+	})
+
 /** Read \a count objects from the buffer to \a data, wrapping if necessary.
  *
  * \note Affects buffer state (advances the tail).
@@ -147,7 +167,7 @@
  * 						discarded.
  * \param count			The number of objects to discard.
  */
-#define RB_DROP_DATA(ring_buffer, count)									\
+#define RB_RELEASE(ring_buffer, count)										\
 	({	__auto_type rb = &(ring_buffer);									\
 		unsigned    c = (count);											\
 		unsigned    t = rb->tail;											\
diff --git a/ruamoko/qwaq/builtins/curses.c b/ruamoko/qwaq/builtins/curses.c
index c54721bca..0848158f7 100644
--- a/ruamoko/qwaq/builtins/curses.c
+++ b/ruamoko/qwaq/builtins/curses.c
@@ -795,7 +795,7 @@ process_commands (qwaq_resources_t *res)
 				break;
 		}
 		pthread_mutex_lock (&res->command_cond.mut);
-		RB_DROP_DATA (res->command_queue, len);
+		RB_RELEASE (res->command_queue, len);
 		pthread_cond_broadcast (&res->command_cond.wcond);
 		// unlocked at top of top if there's more data, otherwise just after
 		// the loop

From c989c8a6b631bec3cb9440f7723938b710cd8a3e Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 23 Jan 2021 12:01:52 +0900
Subject: [PATCH 1357/1519] [vulkan] Rewrite staging buffer packet handling

It now uses the ring buffer code I wrote for qwaq (and forgot about,
oops) to handle the packets themselves, and the logic for allocating and
freeing space from the buffer is a bit simpler and seems to be more
reliable. The automated test is a bit of a joke now, though, but coming
up with good tests for it... However, nq now cycles through the demos
without obvious issue under the same conditions that caused the light
map update code to segfault.
---
 include/QF/Vulkan/staging.h                   |  15 +-
 libs/models/brush/vulkan_model_brush.c        |   2 +-
 libs/video/renderer/vulkan/staging.c          | 202 +++++++------
 .../video/renderer/vulkan/test/test-staging.c | 279 +++---------------
 libs/video/renderer/vulkan/vulkan_bsp.c       |   6 +-
 libs/video/renderer/vulkan/vulkan_draw.c      |   2 +-
 .../video/renderer/vulkan/vulkan_vid_common.c |   2 +-
 7 files changed, 159 insertions(+), 349 deletions(-)

diff --git a/include/QF/Vulkan/staging.h b/include/QF/Vulkan/staging.h
index e8cf18ae7..ee3678625 100644
--- a/include/QF/Vulkan/staging.h
+++ b/include/QF/Vulkan/staging.h
@@ -1,6 +1,8 @@
 #ifndef __QF_Vulkan_staging_h
 #define __QF_Vulkan_staging_h
 
+#include "QF/ringbuffer.h"
+
 typedef struct qfv_packet_s {
 	struct qfv_stagebuf_s *stage;	///< staging buffer that owns this packet
 	VkCommandBuffer cmd;
@@ -13,21 +15,18 @@ typedef struct qfv_stagebuf_s {
 	struct qfv_device_s *device;
 	VkBuffer    buffer;
 	VkDeviceMemory memory;
-	qfv_packet_t *packet;	///< array of packets for controlling access
-	size_t      num_packets;///< number of packets in array
-	size_t      next_packet;///< index of the next packet to be used
-	size_t      size;		///< actual size of the buffer
+	RING_BUFFER(qfv_packet_t, 4) packets;	///< packets for controlling access
 	size_t      atom_mask;	///< for flush size rounding
+	size_t      size;		///< actual size of the buffer
 	size_t      end;		///< effective end of the buffer due to early wrap
-	size_t      head;
-	size_t      tail;
+	size_t      space_start;///< beginning of available space
+	size_t      space_end;	///< end of available space
 	void       *data;
 } qfv_stagebuf_t;
 
 
 qfv_stagebuf_t *QFV_CreateStagingBuffer (struct qfv_device_s *device,
-										 size_t size, int num_packets,
-										 VkCommandPool cmdPool);
+										 size_t size, VkCommandPool cmdPool);
 void QFV_DestroyStagingBuffer (qfv_stagebuf_t *stage);
 void QFV_FlushStagingBuffer (qfv_stagebuf_t *stage, size_t offset, size_t size);
 qfv_packet_t *QFV_PacketAcquire (qfv_stagebuf_t *stage);
diff --git a/libs/models/brush/vulkan_model_brush.c b/libs/models/brush/vulkan_model_brush.c
index e40a76e28..b64e8c11f 100644
--- a/libs/models/brush/vulkan_model_brush.c
+++ b/libs/models/brush/vulkan_model_brush.c
@@ -211,7 +211,7 @@ load_textures (model_t *model, vulkan_ctx_t *ctx)
 								memsize, 0);
 	mctx->texture_memory = mem;
 
-	qfv_stagebuf_t *stage = QFV_CreateStagingBuffer (device, memsize, 1,
+	qfv_stagebuf_t *stage = QFV_CreateStagingBuffer (device, memsize,
 													 ctx->cmdpool);
 	qfv_packet_t *packet = QFV_PacketAcquire (stage);
 	buffer = QFV_PacketExtend (packet, memsize);
diff --git a/libs/video/renderer/vulkan/staging.c b/libs/video/renderer/vulkan/staging.c
index 613422b2b..836a08e5e 100644
--- a/libs/video/renderer/vulkan/staging.c
+++ b/libs/video/renderer/vulkan/staging.c
@@ -55,14 +55,13 @@
 #include "vid_vulkan.h"
 
 qfv_stagebuf_t *
-QFV_CreateStagingBuffer (qfv_device_t *device, size_t size, int num_packets,
+QFV_CreateStagingBuffer (qfv_device_t *device, size_t size,
 						 VkCommandPool cmdPool)
 {
 	size_t atom = device->physDev->properties.limits.nonCoherentAtomSize;
 	qfv_devfuncs_t *dfunc = device->funcs;
 
-	qfv_stagebuf_t *stage = malloc (sizeof (qfv_stagebuf_t)
-									+ num_packets * sizeof (qfv_packet_t));
+	qfv_stagebuf_t *stage = calloc (1, sizeof (qfv_stagebuf_t));
 	stage->atom_mask = atom - 1;
 	size = (size + stage->atom_mask) & ~stage->atom_mask;
 	stage->device = device;
@@ -71,25 +70,23 @@ QFV_CreateStagingBuffer (qfv_device_t *device, size_t size, int num_packets,
 	stage->memory = QFV_AllocBufferMemory (device, stage->buffer,
 										   VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT,
 										   size, 0);
-	stage->packet = (qfv_packet_t *) (stage + 1);
-	stage->num_packets = num_packets;
-	stage->next_packet = 0;
 	stage->size = size;
 	stage->end = size;
-	stage->head = 0;
-	stage->tail = 0;
 
 	dfunc->vkMapMemory (device->dev, stage->memory, 0, size, 0, &stage->data);
 	QFV_BindBufferMemory (device, stage->buffer, stage->memory, 0);
 
-	__auto_type bufferset = QFV_AllocCommandBufferSet (num_packets, alloca);
+	int         count = RB_buffer_size (&stage->packets);
+
+	__auto_type bufferset = QFV_AllocCommandBufferSet (count, alloca);
 	QFV_AllocateCommandBuffers (device, cmdPool, 0, bufferset);
-	for (int i = 0; i < num_packets; i++) {
-		stage->packet[i].stage = stage;
-		stage->packet[i].cmd = bufferset->a[i];
-		stage->packet[i].fence = QFV_CreateFence (device, 1);
-		stage->packet[i].offset = 0;
-		stage->packet[i].length = 0;
+	for (int i = 0; i < count; i++) {
+		qfv_packet_t *packet = &stage->packets.buffer[i];
+		packet->stage = stage;
+		packet->cmd = bufferset->a[i];
+		packet->fence = QFV_CreateFence (device, 1);
+		packet->offset = 0;
+		packet->length = 0;
 	}
 	return stage;
 }
@@ -100,14 +97,15 @@ QFV_DestroyStagingBuffer (qfv_stagebuf_t *stage)
 	qfv_device_t *device = stage->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
 
-	__auto_type fences = QFV_AllocFenceSet (stage->num_packets, alloca);
-	for (size_t i = 0; i < stage->num_packets; i++) {
-		fences->a[i] = stage->packet[i].fence;
+	int         count = RB_buffer_size (&stage->packets);
+	__auto_type fences = QFV_AllocFenceSet (count, alloca);
+	for (int i = 0; i < count; i++) {
+		fences->a[i] = stage->packets.buffer[i].fence;
 	}
 	dfunc->vkWaitForFences (device->dev, fences->size, fences->a, VK_TRUE,
-							~0ull);
-	for (size_t i = 0; i < stage->num_packets; i++) {
-		dfunc->vkDestroyFence (device->dev, stage->packet[i].fence, 0);
+							500000000ull);
+	for (int i = 0; i < count; i++) {
+		dfunc->vkDestroyFence (device->dev, fences->a[i], 0);
 	}
 
 	dfunc->vkUnmapMemory (device->dev, stage->memory);
@@ -132,44 +130,87 @@ QFV_FlushStagingBuffer (qfv_stagebuf_t *stage, size_t offset, size_t size)
 }
 
 static void
-advance_tail (qfv_stagebuf_t *stage, qfv_packet_t *packet)
+release_space (qfv_stagebuf_t *stage, size_t offset, size_t length)
 {
+	if (stage->space_end != offset
+		&& offset != 0
+		&& stage->space_end != stage->end) {
+		Sys_Error ("staging: out of sequence packet release");
+	}
+	if (stage->space_end == stage->end) {
+		stage->space_end = 0;
+		stage->end = stage->size;
+	}
+	stage->space_end += length;
+}
+
+static void *
+acquire_space (qfv_packet_t *packet, size_t size)
+{
+	qfv_stagebuf_t *stage = packet->stage;
 	qfv_device_t *device = stage->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
 
-	qfv_packet_t *start = packet;
-
-	while (1) {
-		if ((size_t) (++packet - stage->packet) >= stage->num_packets) {
-			packet = stage->packet;
+	// clean up after any completed packets
+	while (RB_DATA_AVAILABLE (stage->packets) > 1) {
+		qfv_packet_t *p = RB_PEEK_DATA (stage->packets, 0);
+		if (dfunc->vkGetFenceStatus (device->dev, p->fence) != VK_SUCCESS) {
+			break;
 		}
-		if (packet != start
-			&& (dfunc->vkGetFenceStatus (device->dev, packet->fence)
-				== VK_SUCCESS)) {
-			if (packet->length == 0) {
-				continue;
-			}
-			if ((stage->tail == stage->end && packet->offset == 0)
-				|| stage->tail == packet->offset) {
-				stage->tail = packet->offset + packet->length;
-				packet->length = 0;
-				if (stage->tail >= stage->end) {
-					stage->end = stage->size;
-					stage->tail = stage->size;
-				}
-			}
-			continue;
-		}
-		// Packets are always aquired in sequence and thus the first busy
-		// packet after the start packet marks the end of available space.
-		// Alternatively, there is only one packet and we've looped around
-		// back to the start packet. Must ensure the tail is updated
-		if (stage->tail >= stage->end && packet->offset == 0) {
-			stage->end = stage->size;
-			stage->tail = packet->offset;
-		}
-		break;
+		release_space (stage, p->offset, p->length);
+		RB_RELEASE (stage->packets, 1);
 	}
+
+	if (size > stage->size) {
+		// utterly impossible allocation
+		return 0;
+	}
+
+	// if the staging buffer has been freed up and no data is assigned to the
+	// single existing packet, then ensure the packet starts at the beginning
+	// of the staging buffer in order to maximize the space available to it
+	// (some of the tests are redundant since if any space is assigned to a
+	// packet, the buffer cannot be fully freed up)
+	if (stage->space_end == stage->space_start
+		&& RB_DATA_AVAILABLE (stage->packets) == 1
+		&& packet->length == 0) {
+		stage->space_end = 0;
+		stage->space_start = 0;
+		packet->offset = 0;
+	}
+	if (stage->space_start >= stage->space_end) {
+		// all the space to the actual end of the buffer is free
+		if (stage->space_start + size <= stage->size) {
+			void       *data = (byte *) stage->data + stage->space_start;
+			stage->space_start += size;
+			return data;
+		}
+		// doesn't fit at the end of the buffer, try the beginning but only
+		// if the packet can be moved (no spaced has been allocated to it yet)
+		if (packet->length > 0) {
+			// can't move it
+			return 0;
+		}
+		// mark the unused end of the buffer such that it gets reclaimed
+		// properly when the preceeding packet is freed
+		stage->end = stage->space_start;
+		stage->space_start = 0;
+		packet->offset = 0;
+	}
+	while (stage->space_start + size > stage->space_end
+		   && RB_DATA_AVAILABLE (stage->packets) > 1) {
+		packet = RB_PEEK_DATA (stage->packets, 0);
+		dfunc->vkWaitForFences (device->dev, 1, &packet->fence, VK_TRUE,
+								~0ull);
+		release_space (stage, packet->offset, packet->length);
+		RB_RELEASE (stage->packets, 1);
+	}
+	if (stage->space_start + size > stage->space_end) {
+		return 0;
+	}
+	void       *data = (byte *) stage->data + stage->space_start;
+	stage->space_start += size;
+	return data;
 }
 
 qfv_packet_t *
@@ -177,16 +218,19 @@ QFV_PacketAcquire (qfv_stagebuf_t *stage)
 {
 	qfv_device_t *device = stage->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
-	qfv_packet_t *packet = &stage->packet[stage->next_packet++];
-	stage->next_packet %= stage->num_packets;
 
-	dfunc->vkWaitForFences (device->dev, 1, &packet->fence, VK_TRUE, ~0ull);
-
-	advance_tail (stage, packet);
-	if (stage->head == stage->size) {
-		stage->head = 0;
+	qfv_packet_t *packet = 0;
+	if (!RB_SPACE_AVAILABLE (stage->packets)) {
+		// need to wait for a packet to become available
+		packet = RB_PEEK_DATA (stage->packets, 0);
+		dfunc->vkWaitForFences (device->dev, 1, &packet->fence, VK_TRUE,
+								~0ull);
+		release_space (stage, packet->offset, packet->length);
+		RB_RELEASE (stage->packets, 1);
 	}
-	packet->offset = stage->head;
+	packet = RB_ACQUIRE (stage->packets, 1);
+
+	packet->offset = stage->space_start;
 	packet->length = 0;
 
 	dfunc->vkResetFences (device->dev, 1, &packet->fence);
@@ -203,40 +247,10 @@ QFV_PacketAcquire (qfv_stagebuf_t *stage)
 void *
 QFV_PacketExtend (qfv_packet_t *packet, size_t size)
 {
-	qfv_stagebuf_t *stage = packet->stage;
-	if (!size || size > stage->size) {
-		return 0;
+	void       *data = acquire_space (packet, size);
+	if (data) {
+		packet->length += size;
 	}
-
-	//FIXME extra logic may be needed to wait wait for space to become
-	//available when the requested size should fit but can't due to in-flight
-	//packets
-	advance_tail (stage, packet);
-
-	size_t      head = stage->head;
-	size_t      end = stage->end;
-	if (head + size > stage->end) {
-		if (packet->length) {
-			// packets cannot wrap around the buffer (must use separate
-			// packets)
-			return 0;
-		}
-		if (stage->tail == 0) {
-			// the beginning of the the staging buffer is occupied
-			return 0;
-		}
-		packet->offset = 0;
-		head = 0;
-		end = stage->head;
-	}
-	if (head < stage->tail && head + size > stage->tail) {
-		// not enough room for the sub-packet
-		return 0;
-	}
-	void       *data = (byte *) stage->data + head;
-	stage->end = end;
-	stage->head = head + size;
-	packet->length += size;
 	return data;
 }
 
diff --git a/libs/video/renderer/vulkan/test/test-staging.c b/libs/video/renderer/vulkan/test/test-staging.c
index bb5361cec..020af9ab2 100644
--- a/libs/video/renderer/vulkan/test/test-staging.c
+++ b/libs/video/renderer/vulkan/test/test-staging.c
@@ -66,12 +66,17 @@ vkCreateFence (VkDevice device, const VkFenceCreateInfo *info,
 	return VK_SUCCESS;
 }
 
+int wait_count = 0;
+
 static VkResult
 vkWaitForFences (VkDevice device, uint32_t fenceCount, const VkFence *fences,
 				 VkBool32 waitAll, uint64_t timeout)
 {
 	for (uint32_t i = 0; i < fenceCount; i++) {
 		int        *f = (int *)fences[i];
+		if (*f) {
+			wait_count++;
+		}
 		*f = 0;
 	}
 	return VK_SUCCESS;
@@ -145,7 +150,13 @@ qfv_devfuncs_t dfuncs = {
 	vkFlushMappedMemoryRanges:vkFlushMappedMemoryRanges,
 	vkQueueSubmit:vkQueueSubmit,
 };
-qfv_physdev_t physDev;
+qfv_physdev_t physDev = {
+	properties:{
+		limits:{
+			nonCoherentAtomSize:256,
+		},
+	},
+};
 qfv_device_t device = {
 	physDev:&physDev,
 	funcs:&dfuncs,
@@ -168,271 +179,59 @@ _error (int line, const char *fmt, ...)
 int
 main (void)
 {
-	qfv_stagebuf_t *stage = QFV_CreateStagingBuffer (&device, 1024, 4, 0);
+	qfv_stagebuf_t *stage = QFV_CreateStagingBuffer (&device, 1024, 0);
 
-	if (stage->num_packets != 4) {
-		error ("stage has incorrect packet count: %zd\n", stage->num_packets);
-	}
-	if (stage->next_packet != 0) {
-		error ("stage has incorrect next_packet: %zd\n", stage->next_packet);
-	}
 	if (stage->size != 1024) {
-		error ("stage has incorrect size: %zd\n", stage->size);
+		error ("stage has incorrect size: %zd", stage->size);
 	}
 	if (stage->end != stage->size) {
-		error ("stage has incorrect end: %zd\n", stage->end);
-	}
-	if (stage->head || stage->tail != stage->head) {
-		error ("stage ring buffer not initialized: h:%zd t:%zd\n",
-			   stage->head, stage->tail);
+		error ("stage has incorrect end: %zd", stage->end);
 	}
 	if (!stage->data || stage->data != stage_memory) {
-		error ("stage memory not mapped: d:%p, m:%p\n",
+		error ("stage memory not mapped: d:%p, m:%p",
 			   stage->data, stage_memory);
 	}
 
-	for (size_t i = 0; i < stage->num_packets; i++) {
-		qfv_packet_t *p = &stage->packet[i];
+	for (size_t i = 0; i < RB_buffer_size (&stage->packets); i++) {
+		qfv_packet_t *p = &stage->packets.buffer[i];
 		if (p->stage != stage) {
-			error ("packet[%zd] stage not set: ps:%p s:%p\n", i,
+			error ("packet[%zd] stage not set: ps:%p s:%p", i,
 				   p->stage, stage);
 		}
 		if (!p->cmd) {
-			error ("packet[%zd] has no command buffer\n", i);
+			error ("packet[%zd] has no command buffer", i);
 		}
 		if (!p->fence) {
-			error ("packet[%zd] has no fence\n", i);
-		}
-		for (size_t j = 0; j < i; j++) {
-			qfv_packet_t *q = &stage->packet[j];
-			if (q->cmd == p->cmd || q->fence == p->fence) {
-				error ("packet[%zd] has dup fence or cmd buf\n", i);
-			}
+			error ("packet[%zd] has no fence", i);
 		}
 		if (vkGetFenceStatus (device.dev, p->fence) != VK_SUCCESS) {
-			error ("packet[%zd].fence is not signaled\n", i);
+			error ("packet[%zd].fence is not signaled", i);
 		}
 		if (p->offset || p->length) {
-			error ("packet[%zd] size/length not initialized: o:%zd l:%zd\n",
+			error ("packet[%zd] size/length not initialized: o:%zd l:%zd",
 				   i, p->offset, p->length);
 		}
 	}
 
 	qfv_packet_t *packet = QFV_PacketAcquire (stage);
+	if (!packet) {
+		error ("could not get a packet");
+	}
+	if (RB_DATA_AVAILABLE (stage->packets) != 1) {
+		error ("in flight packet count incorrect");
+	}
 	if (vkGetFenceStatus (device.dev, packet->fence) != VK_NOT_READY) {
-		error ("packet.fence is signaled\n");
+		error ("packet.fence is signaled");
+	}
+	if (QFV_PacketExtend (packet, 2048)) {
+		error ("2048 byte request did not return null");
+	}
+	if (!QFV_PacketExtend (packet, 1024)) {
+		error ("1024 byte request returned null");
+	}
+	if (QFV_PacketExtend (packet, 1)) {
+		error ("1 byte request did not return null");
 	}
 
-	void *data;
-	size_t old_head, old_tail;
-
-	old_head = stage->head;
-	old_tail = stage->tail;
-	data = QFV_PacketExtend (packet, 0);
-	if (data) {
-		error ("0 byte extend did not return null\n");
-	}
-	if (stage->head != old_head || stage->tail != old_tail) {
-		error ("0 byte extend moved head or tail\n");
-	}
-
-	data = QFV_PacketExtend (packet, 2048);
-	if (data) {
-		error ("2048 byte extend did not return null\n");
-	}
-	if (stage->head != old_head || stage->tail != old_tail) {
-		error ("2048 byte extend moved head or tail\n");
-	}
-
-	data = QFV_PacketExtend (packet, 1024);
-	if (!data) {
-		error ("1024 byte extend failed\n");
-	}
-	if (stage->head == old_head) {
-		error ("1024 byte extend did not move head\n");
-	}
-	if (stage->tail != old_tail) {
-		error ("1024 byte extend moved tail\n");
-	}
-	if (stage->head > stage->size) {
-		error ("stage head out of bounds: %zd\n", stage->head);
-	}
-	if (packet->offset != old_head || packet->length != 1024) {
-		error ("packet offset/size incorrect: p:%zd,%zd h:%zd\n",
-			   packet->offset, packet->length, old_head);
-	}
-	if (stage->head < packet->offset + packet->length) {
-		error ("stage head before end of packet: %zd, pe:%zd\n",
-			   stage->head, packet->offset + packet->length);
-	}
-
-	old_head = stage->head;
-	old_tail = stage->tail;
-	data = QFV_PacketExtend (packet, 16);
-	if (data) {
-		error ("16 byte extend in full stage did not return null\n");
-	}
-	if (stage->head != old_head || stage->tail != old_tail) {
-		error ("16 byte extend moved head or tail\n");
-	}
-	QFV_PacketSubmit (packet);
-	if (vkGetFenceStatus (device.dev, packet->fence) != VK_SUCCESS) {
-		error ("packet.fence is not signaled\n");
-	}
-
-	if (stage->head != 1024 || stage->tail != 0) {
-		error ("stage head or tail not as expected: h: %zd t:%zd\n",
-			   stage->head, stage->tail);
-	}
-
-	qfv_packet_t *packet2 = QFV_PacketAcquire (stage);
-	if (!packet2 || packet2 == packet) {
-		error ("did not get new packet: n:%p o:%p\n", packet2, packet);
-	}
-	packet = packet2;
-	if (packet->offset != 0 || stage->head != 0 || stage->tail != 0) {
-		error ("new packet did not wrap: p:%zd h:%zd t:%zd\n",
-			   packet2->offset, stage->head, stage->tail);
-	}
-
-	old_head = stage->head;
-	old_tail = stage->tail;
-	data = QFV_PacketExtend (packet, 768);
-	if (!data) {
-		error ("768 byte extend failed\n");
-	}
-	if (stage->head == old_head) {
-		error ("768 byte extend did not move head\n");
-	}
-	if (stage->tail != 0) {
-		error ("768 byte extend dit not wrap tail: %zd\n", stage->tail);
-	}
-	if (stage->head > stage->size) {
-		error ("stage head out of bounds: %zd\n", stage->head);
-	}
-	if (packet->offset != old_head || packet->length != 768) {
-		error ("packet offset/size incorrect: p:%zd,%zd h:%zd\n",
-			   packet->offset, packet->length, old_head);
-	}
-	if (stage->head < packet->offset + packet->length) {
-		error ("stage head before end of packet: %zd, pe:%zd\n",
-			   stage->head, packet->offset + packet->length);
-	}
-
-	// test attempting to wrap the packet (without needed space)
-	old_head = stage->head;
-	old_tail = stage->tail;
-	data = QFV_PacketExtend (packet, 512);
-	if (data) {
-		error ("512 byte extend in partially full stage succeeded\n");
-	}
-	if (stage->head != old_head || stage->tail != old_tail) {
-		error ("512 byte extend moved head or tail\n");
-	}
-	QFV_PacketSubmit (packet);
-
-	if (stage->head != 768 || stage->tail != 0) {
-		error ("stage head or tail not as expected: h: %zd t:%zd\n",
-			   stage->head, stage->tail);
-	}
-
-	packet = QFV_PacketAcquire (stage);
-
-	// test wrapping a new packet
-	data = QFV_PacketExtend (packet, 512);
-	if (!data) {
-		error ("512 byte extend failed\n");
-	}
-	if (packet->offset != 0 || packet->length != 512) {
-		error ("packet offset/size incorrect: p:%zd,%zd\n",
-			   packet->offset, packet->length);
-	}
-	if (stage->head != 512 || stage->tail != stage->end || stage->end !=768) {
-		error ("stage head or tail not as expected: h: %zd t:%zd\n",
-			   stage->head, stage->tail);
-	}
-	data = QFV_PacketExtend (packet, 512);
-	if (!data) {
-		error ("second 512 byte extend failed\n");
-	}
-	if (packet->offset != 0 || packet->length != 1024) {
-		error ("packet offset/size incorrect: p:%zd,%zd\n",
-			   packet->offset, packet->length);
-	}
-	if (stage->head != 1024 || stage->tail != 0 || stage->end != 1024) {
-		error ("stage head or tail not as expected: h: %zd t:%zd\n",
-			   stage->head, stage->tail);
-	}
-	QFV_PacketSubmit (packet);
-
-	packet = QFV_PacketAcquire (stage);
-	data = QFV_PacketExtend (packet, 512);
-	if (!data) {
-		error ("512 byte extend failed\n");
-	}
-	if (packet->offset != 0 || packet->length != 512) {
-		error ("packet offset/size incorrect: p:%zd,%zd\n",
-			   packet->offset, packet->length);
-	}
-	QFV_PacketSubmit (packet);
-
-	if (stage->head != 512 || stage->tail != 0 || stage->end != 1024) {
-		error ("stage head or tail not as expected: h: %zd t:%zd\n",
-			   stage->head, stage->tail);
-	}
-
-	packet = QFV_PacketAcquire (stage);
-	data = QFV_PacketExtend (packet, 256);
-	if (!data) {
-		error ("256 byte extend failed\n");
-	}
-	if (packet->offset != 512 || packet->length != 256) {
-		error ("packet offset/size incorrect: p:%zd,%zd\n",
-			   packet->offset, packet->length);
-	}
-	if (stage->head != 768 || stage->tail != 512 || stage->end != 1024) {
-		error ("stage head or tail not as expected: h: %zd t:%zd\n",
-			   stage->head, stage->tail);
-	}
-	// don't submit yet. Normally, it would be an error, but the test harness
-	// needs to keep the packet on hand for the following tests to work
-	packet2 = QFV_PacketAcquire (stage);
-	old_head = stage->head;
-	old_tail = stage->tail;
-	data = QFV_PacketExtend (packet2, 768);
-	if (data) {
-		error ("768 byte extend did not return null\n");
-	}
-	if (stage->head != old_head || stage->tail != old_tail) {
-		error ("768 byte extend moved head or tail\n");
-	}
-
-	//should wrap
-	data = QFV_PacketExtend (packet2, 512);
-	if (!data) {
-		error ("512 byte extend failed\n");
-	}
-	if (packet2->offset != 0 || packet2->length != 512) {
-		error ("packet offset/size incorrect: p:%zd,%zd\n",
-			   packet2->offset, packet2->length);
-	}
-	if (stage->head != 512 || stage->tail != 512 || stage->end != 768) {
-		error ("stage head or tail not as expected: h: %zd t:%zd\n",
-			   stage->head, stage->tail);
-	}
-
-	//submit the first packet
-	QFV_PacketSubmit (packet);
-
-	packet = QFV_PacketAcquire (stage);
-	old_head = stage->head;
-	old_tail = stage->tail;
-	data = QFV_PacketExtend (packet, 768);
-	if (data) {
-		error ("768 byte extend did not return null\n");
-	}
-	if (stage->head != old_head || stage->tail != old_tail) {
-		error ("768 byte extend moved head or tail\n");
-	}
 	return 0;
 }
diff --git a/libs/video/renderer/vulkan/vulkan_bsp.c b/libs/video/renderer/vulkan/vulkan_bsp.c
index fe7c001f4..27c2b724a 100644
--- a/libs/video/renderer/vulkan/vulkan_bsp.c
+++ b/libs/video/renderer/vulkan/vulkan_bsp.c
@@ -465,8 +465,7 @@ Vulkan_BuildDisplayLists (model_t **models, int num_models, vulkan_ctx_t *ctx)
 	size_t vertex_buffer_size = vertex_count * sizeof (bspvert_t);
 
 	index_buffer_size = (index_buffer_size + atom_mask) & ~atom_mask;
-	stage = QFV_CreateStagingBuffer (device, vertex_buffer_size, 1,
-									 ctx->cmdpool);
+	stage = QFV_CreateStagingBuffer (device, vertex_buffer_size, ctx->cmdpool);
 	qfv_packet_t *packet = QFV_PacketAcquire (stage);
 	vertices = QFV_PacketExtend (packet, vertex_buffer_size);
 	vertex_index_base = 0;
@@ -1289,8 +1288,7 @@ Vulkan_Bsp_Init (vulkan_ctx_t *ctx)
 
 	bctx->light_scrap = QFV_CreateScrap (device, 2048, tex_frgba, ctx->staging);
 	size_t      size = QFV_ScrapSize (bctx->light_scrap);
-	bctx->light_stage = QFV_CreateStagingBuffer (device, size, 3,
-												 ctx->cmdpool);
+	bctx->light_stage = QFV_CreateStagingBuffer (device, size, ctx->cmdpool);
 
 	DARRAY_INIT (&bctx->texture_chains, 64);
 
diff --git a/libs/video/renderer/vulkan/vulkan_draw.c b/libs/video/renderer/vulkan/vulkan_draw.c
index 2e41e2252..6ec67b227 100644
--- a/libs/video/renderer/vulkan/vulkan_draw.c
+++ b/libs/video/renderer/vulkan/vulkan_draw.c
@@ -367,7 +367,7 @@ Vulkan_Draw_Init (vulkan_ctx_t *ctx)
 										 0, 0);
 
 	create_quad_buffers (ctx);
-	dctx->stage = QFV_CreateStagingBuffer (device, 4 * 1024 * 1024, 4,
+	dctx->stage = QFV_CreateStagingBuffer (device, 4 * 1024 * 1024,
 										   ctx->cmdpool);
 	dctx->scrap = QFV_CreateScrap (device, 2048, tex_rgba, dctx->stage);
 	dctx->sampler = QFV_GetSampler (ctx, "quakepic");
diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c
index d9220307b..4e5f338cc 100644
--- a/libs/video/renderer/vulkan/vulkan_vid_common.c
+++ b/libs/video/renderer/vulkan/vulkan_vid_common.c
@@ -204,7 +204,7 @@ Vulkan_CreateDevice (vulkan_ctx_t *ctx)
 void
 Vulkan_CreateStagingBuffers (vulkan_ctx_t *ctx)
 {
-	ctx->staging = QFV_CreateStagingBuffer (ctx->device, 4*1024*1024, 1,
+	ctx->staging = QFV_CreateStagingBuffer (ctx->device, 4*1024*1024,
 											ctx->cmdpool);
 }
 

From 68b734142990aa5be9246e35e9b89610a2a9f226 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 23 Jan 2021 13:51:09 +0900
Subject: [PATCH 1358/1519] [vulkan] Set main texture image view

Glow map and sky sheet and cube need to wait until I can get some
default textures going, but the world is rendering correctly otherwise
(though a tad dark: need to do a gamma setting).
---
 include/QF/Vulkan/qf_bsp.h               |   8 ++
 libs/video/renderer/vulkan/quakebsp.frag |  11 ++-
 libs/video/renderer/vulkan/vulkan_bsp.c  | 111 +++++++++++++----------
 3 files changed, 76 insertions(+), 54 deletions(-)

diff --git a/include/QF/Vulkan/qf_bsp.h b/include/QF/Vulkan/qf_bsp.h
index 5b01da407..92c63b034 100644
--- a/include/QF/Vulkan/qf_bsp.h
+++ b/include/QF/Vulkan/qf_bsp.h
@@ -57,6 +57,11 @@ typedef struct elechain_s {
 	float      *color;
 } elechain_t;
 
+// view matrix
+#define BSP_BUFFER_INFOS 1
+// Texture, GlowMap, LightMap, SkySheet, SkyCube
+#define BSP_IMAGE_INFOS 5
+
 typedef struct bspframe_s {
 	uint32_t    *index_data;	// pointer into mega-buffer for this frame (c)
 	uint32_t     index_offset;	// offset of index_data within mega-buffer (c)
@@ -64,6 +69,9 @@ typedef struct bspframe_s {
 	VkCommandBuffer bsp_cmd;
 	VkCommandBuffer turb_cmd;
 	VkCommandBuffer sky_cmd;
+	VkDescriptorBufferInfo bufferInfo[BSP_BUFFER_INFOS];
+	VkDescriptorImageInfo imageInfo[BSP_IMAGE_INFOS];
+	VkWriteDescriptorSet descriptors[BSP_BUFFER_INFOS + BSP_IMAGE_INFOS];
 } bspframe_t;
 
 typedef struct bspframeset_s
diff --git a/libs/video/renderer/vulkan/quakebsp.frag b/libs/video/renderer/vulkan/quakebsp.frag
index 916581292..73270557e 100644
--- a/libs/video/renderer/vulkan/quakebsp.frag
+++ b/libs/video/renderer/vulkan/quakebsp.frag
@@ -1,8 +1,8 @@
 #version 450
 
 layout (set = 0, binding = 1) uniform sampler2D Texture;
-layout (set = 0, binding = 2) uniform sampler2D Glowmap;
-layout (set = 0, binding = 3) uniform sampler2D Lightmap;
+layout (set = 0, binding = 2) uniform sampler2D GlowMap;
+layout (set = 0, binding = 3) uniform sampler2D LightMap;
 //layout (set = 0, binding = 4) uniform sampler2DArray SkySheet;
 //layout (set = 0, binding = 5) uniform samplerCube SkyCube;
 
@@ -117,9 +117,10 @@ main (void)
 	}*/
 	c = texture (Texture, t_st);
 	if (doLight) {
-		c *= vec4 (texture (Lightmap, l_st).xyz, 1);
+		c *= vec4 (texture (LightMap, l_st).xyz, 1);
 	}
-	c += texture (Glowmap, t_st);
-	c = vec4(texture (Lightmap, l_st).xyz, 1);
+	//c += texture (GlowMap, t_st);
+	//c = vec4(texture (LightMap, l_st).xyz, 1);
+	//c = vec4(texture (Texture, t_st).xyz, 1);
 	frag_color = c;//fogBlend (c);
 }
diff --git a/libs/video/renderer/vulkan/vulkan_bsp.c b/libs/video/renderer/vulkan/vulkan_bsp.c
index 27c2b724a..a7fab14ab 100644
--- a/libs/video/renderer/vulkan/vulkan_bsp.c
+++ b/libs/video/renderer/vulkan/vulkan_bsp.c
@@ -788,12 +788,12 @@ draw_elechain (elechain_t *ec, VkPipelineLayout layout, qfv_devfuncs_t *dfunc,
 }
 
 static VkImageView
-get_view (qfv_tex_t *tex)
+get_view (qfv_tex_t *tex, VkImageView default_view)
 {
 	if (tex) {
 		return tex->view;
 	}
-	return 0;
+	return default_view;
 }
 
 static void
@@ -812,52 +812,13 @@ bsp_begin (vulkan_ctx_t *ctx)
 	VkCommandBuffer cmd = bframe->bsp_cmd;
 	DARRAY_APPEND (cframe->subCommand, cmd);
 
-	VkDescriptorBufferInfo bufferInfo = {
-		ctx->matrices.buffer_3d, 0, VK_WHOLE_SIZE
-	};
-	VkDescriptorImageInfo imageInfo[] = {
-		{ bctx->sampler,
-		  QFV_ScrapImageView (bctx->light_scrap),
-		  VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL },
-		{ bctx->sampler,
-		  QFV_ScrapImageView (bctx->light_scrap),
-		  VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL },
-		{ bctx->sampler,
-		  QFV_ScrapImageView (bctx->light_scrap),
-		  VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL },
-		{ bctx->sampler,
-		  get_view (bctx->skysheet_tex),
-		  VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL },
-		{ bctx->sampler,
-		  get_view (bctx->skybox_tex),
-		  VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL },
-	};
-	VkWriteDescriptorSet write[] = {
-		{ VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, 0, 0,
-		  0, 0, 1,
-		  VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER,
-		  0, &bufferInfo, 0 },
-		{ VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, 0, 0,
-		  1, 0, 1,
-		  VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER,
-		  &imageInfo[0], 0, 0 },
-		{ VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, 0, 0,
-		  2, 0, 1,
-		  VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER,
-		  &imageInfo[1], 0, 0 },
-		{ VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, 0, 0,
-		  3, 0, 1,
-		  VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER,
-		  &imageInfo[2], 0, 0 },
-		{ VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, 0, 0,
-		  4, 0, 1,
-		  VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER,
-		  &imageInfo[3], 0, 0 },
-		{ VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, 0, 0,
-		  5, 0, 1,
-		  VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER,
-		  &imageInfo[4], 0, 0 },
-	};
+	//FIXME need per frame matrices
+	bframe->bufferInfo[0].buffer = ctx->matrices.buffer_3d;
+	bframe->imageInfo[0].imageView = 0;	// set by tex chain loop
+	bframe->imageInfo[1].imageView = 0;	// set by tex chain loop
+	bframe->imageInfo[2].imageView = QFV_ScrapImageView (bctx->light_scrap);
+	bframe->imageInfo[3].imageView = get_view (bctx->skysheet_tex, 0);
+	bframe->imageInfo[4].imageView = get_view (bctx->skybox_tex, 0);
 
 	dfunc->vkResetCommandBuffer (cmd, 0);
 	VkCommandBufferInheritanceInfo inherit = {
@@ -885,8 +846,15 @@ bsp_begin (vulkan_ctx_t *ctx)
 	dfunc->vkCmdBindIndexBuffer (cmd, bctx->index_buffer, bframe->index_offset,
 								 VK_INDEX_TYPE_UINT32);
 
+	// push VP matrices
 	dfunc->vkCmdPushDescriptorSetKHR (cmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
-									  bctx->layout, 0, 4, write);
+									  bctx->layout,
+									  0, 1, bframe->descriptors + 0);
+	// push static images
+	// XXX sky sheet and box not pushed yet
+	dfunc->vkCmdPushDescriptorSetKHR (cmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
+									  bctx->layout,
+									  0, 1, bframe->descriptors + 3);
 
 	//XXX glsl_Fog_GetColor (fog);
 	//XXX fog[3] = glsl_Fog_GetDensity () / 64.0;
@@ -1140,11 +1108,22 @@ Vulkan_DrawWorld (vulkan_ctx_t *ctx)
 		elechain_t *ec = 0;
 
 		tex = bctx->texture_chains.a[i];
+		if (!tex->tex) {
+			//FIXME bind to whit
+			continue;
+		}
 
 		build_tex_elechain (tex, bctx, bframe);
 
 		//XXX if (tex->elechain)
 		//XXX 	qfeglBindTexture (GL_TEXTURE_2D, tex->gl_texturenum);
+		bframe->imageInfo[0].imageView = get_view (tex->tex, 0);
+		bframe->imageInfo[1].imageView = get_view (tex->glow, 0);
+		//XXX glow map
+		dfunc->vkCmdPushDescriptorSetKHR (bframe->bsp_cmd,
+										  VK_PIPELINE_BIND_POINT_GRAPHICS,
+										  bctx->layout,
+										  0, 1, bframe->descriptors + 1);
 
 		for (ec = tex->elechain; ec; ec = ec->next) {
 			draw_elechain (ec, bctx->layout, dfunc, bframe->bsp_cmd);
@@ -1271,6 +1250,25 @@ Vulkan_DrawSky (vulkan_ctx_t *ctx)
 	bctx->sky_chain_tail = &bctx->sky_chain;
 }
 
+static VkDescriptorBufferInfo base_buffer_info = {
+	0, 0, VK_WHOLE_SIZE
+};
+static VkDescriptorImageInfo base_image_info = {
+	0, 0, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL
+};
+static VkWriteDescriptorSet base_buffer_write = {
+	VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, 0, 0,
+	0, 0, 1,
+	VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER,
+	0, 0, 0
+};
+static VkWriteDescriptorSet base_image_write = {
+	VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, 0, 0,
+	0, 0, 1,
+	VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER,
+	0, 0, 0
+};
+
 void
 Vulkan_Bsp_Init (vulkan_ctx_t *ctx)
 {
@@ -1314,6 +1312,21 @@ Vulkan_Bsp_Init (vulkan_ctx_t *ctx)
 		bframe->bsp_cmd = cmdBuffers->a[i];
 		bframe->turb_cmd = cmdBuffers->a[i];
 		bframe->sky_cmd = cmdBuffers->a[i];
+
+		for (int j = 0; j < BSP_BUFFER_INFOS; j++) {
+			bframe->bufferInfo[j] = base_buffer_info;
+			bframe->descriptors[j] = base_buffer_write;
+			bframe->descriptors[j].dstBinding = j;
+			bframe->descriptors[j].pBufferInfo = &bframe->bufferInfo[j];
+		}
+		for (int j = 0; j < BSP_IMAGE_INFOS; j++) {
+			bframe->imageInfo[j] = base_image_info;
+			bframe->imageInfo[j].sampler = bctx->sampler;
+			int k = j + BSP_BUFFER_INFOS;
+			bframe->descriptors[k] = base_image_write;
+			bframe->descriptors[k].dstBinding = k;
+			bframe->descriptors[k].pImageInfo = &bframe->imageInfo[j];
+		}
 	}
 }
 

From 93e9f89bd38b9a900eae83da8d2f67f3deb512e3 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 23 Jan 2021 15:40:31 +0900
Subject: [PATCH 1359/1519] [vulkan] Create some default textures

Black, white and magenta. This gets glow (full bright) maps working.
---
 include/QF/Vulkan/qf_texture.h              |  2 ++
 include/vid_vulkan.h                        |  6 ++++
 libs/video/renderer/vid_render_vulkan.c     |  2 ++
 libs/video/renderer/vulkan/quakebsp.frag    |  4 +--
 libs/video/renderer/vulkan/vulkan_bsp.c     | 28 +++++++++---------
 libs/video/renderer/vulkan/vulkan_texture.c | 32 ++++++++++++++++++++-
 6 files changed, 56 insertions(+), 18 deletions(-)

diff --git a/include/QF/Vulkan/qf_texture.h b/include/QF/Vulkan/qf_texture.h
index a2ffbd38e..d08fc0a46 100644
--- a/include/QF/Vulkan/qf_texture.h
+++ b/include/QF/Vulkan/qf_texture.h
@@ -16,5 +16,7 @@ void Vulkan_ExpandPalette (byte *dst, const byte *src, const byte *palette,
 qfv_tex_t *Vulkan_LoadTex (struct vulkan_ctx_s *ctx, tex_t *tex, int mip);
 VkImageView Vulkan_TexImageView (qfv_tex_t *tex) __attribute__((pure));
 void Vulkan_UnloadTex (struct vulkan_ctx_s *ctx, qfv_tex_t *tex);
+void Vulkan_Texture_Init (struct vulkan_ctx_s *ctx);
+void Vulkan_Texture_Shutdown (struct vulkan_ctx_s *ctx);
 
 #endif//__QF_Vulkan_qf_texture_h
diff --git a/include/vid_vulkan.h b/include/vid_vulkan.h
index 92208425e..3a234c0d2 100644
--- a/include/vid_vulkan.h
+++ b/include/vid_vulkan.h
@@ -75,6 +75,12 @@ typedef struct vulkan_ctx_s {
 	size_t      curFrame;
 	vulkan_framebufferset_t framebuffers;
 
+	struct qfv_tex_s *default_black;
+	struct qfv_tex_s *default_white;
+	struct qfv_tex_s *default_magenta;
+	struct qfv_tex_s *default_skysheet;
+	struct qfv_tex_s *default_skybox;
+
 	// projection and view matrices (model is push constant)
 	vulkan_matrices_t matrices;
 
diff --git a/libs/video/renderer/vid_render_vulkan.c b/libs/video/renderer/vid_render_vulkan.c
index 85d090b37..a54962b52 100644
--- a/libs/video/renderer/vid_render_vulkan.c
+++ b/libs/video/renderer/vid_render_vulkan.c
@@ -96,6 +96,7 @@ vulkan_R_Init (void)
 	// FIXME this should be staged so screen updates can begin while pipelines
 	// are being built
 	vulkan_ctx->pipeline = Vulkan_CreatePipeline (vulkan_ctx, "pipeline");
+	Vulkan_Texture_Init (vulkan_ctx);
 	Vulkan_Bsp_Init (vulkan_ctx);
 	Vulkan_Draw_Init (vulkan_ctx);
 	Vulkan_Particles_Init (vulkan_ctx);
@@ -607,6 +608,7 @@ vulkan_vid_render_shutdown (void)
 	Vulkan_Draw_Shutdown (vulkan_ctx);
 	Vulkan_Bsp_Shutdown (vulkan_ctx);
 	Mod_ClearAll ();
+	Vulkan_Texture_Shutdown (vulkan_ctx);
 	Vulkan_Shutdown_Common (vulkan_ctx);
 }
 
diff --git a/libs/video/renderer/vulkan/quakebsp.frag b/libs/video/renderer/vulkan/quakebsp.frag
index 73270557e..872c97893 100644
--- a/libs/video/renderer/vulkan/quakebsp.frag
+++ b/libs/video/renderer/vulkan/quakebsp.frag
@@ -119,8 +119,6 @@ main (void)
 	if (doLight) {
 		c *= vec4 (texture (LightMap, l_st).xyz, 1);
 	}
-	//c += texture (GlowMap, t_st);
-	//c = vec4(texture (LightMap, l_st).xyz, 1);
-	//c = vec4(texture (Texture, t_st).xyz, 1);
+	c += texture (GlowMap, t_st);
 	frag_color = c;//fogBlend (c);
 }
diff --git a/libs/video/renderer/vulkan/vulkan_bsp.c b/libs/video/renderer/vulkan/vulkan_bsp.c
index a7fab14ab..552ea075f 100644
--- a/libs/video/renderer/vulkan/vulkan_bsp.c
+++ b/libs/video/renderer/vulkan/vulkan_bsp.c
@@ -788,12 +788,15 @@ draw_elechain (elechain_t *ec, VkPipelineLayout layout, qfv_devfuncs_t *dfunc,
 }
 
 static VkImageView
-get_view (qfv_tex_t *tex, VkImageView default_view)
+get_view (qfv_tex_t *tex, qfv_tex_t *default_tex)
 {
 	if (tex) {
 		return tex->view;
 	}
-	return default_view;
+	if (default_tex) {
+		return default_tex->view;
+	}
+	return 0;
 }
 
 static void
@@ -817,8 +820,10 @@ bsp_begin (vulkan_ctx_t *ctx)
 	bframe->imageInfo[0].imageView = 0;	// set by tex chain loop
 	bframe->imageInfo[1].imageView = 0;	// set by tex chain loop
 	bframe->imageInfo[2].imageView = QFV_ScrapImageView (bctx->light_scrap);
-	bframe->imageInfo[3].imageView = get_view (bctx->skysheet_tex, 0);
-	bframe->imageInfo[4].imageView = get_view (bctx->skybox_tex, 0);
+	bframe->imageInfo[3].imageView = get_view (bctx->skysheet_tex,
+											   ctx->default_skysheet);
+	bframe->imageInfo[4].imageView = get_view (bctx->skybox_tex,
+											   ctx->default_skybox);
 
 	dfunc->vkResetCommandBuffer (cmd, 0);
 	VkCommandBufferInheritanceInfo inherit = {
@@ -1108,22 +1113,17 @@ Vulkan_DrawWorld (vulkan_ctx_t *ctx)
 		elechain_t *ec = 0;
 
 		tex = bctx->texture_chains.a[i];
-		if (!tex->tex) {
-			//FIXME bind to whit
-			continue;
-		}
 
 		build_tex_elechain (tex, bctx, bframe);
 
-		//XXX if (tex->elechain)
-		//XXX 	qfeglBindTexture (GL_TEXTURE_2D, tex->gl_texturenum);
-		bframe->imageInfo[0].imageView = get_view (tex->tex, 0);
-		bframe->imageInfo[1].imageView = get_view (tex->glow, 0);
-		//XXX glow map
+		bframe->imageInfo[0].imageView = get_view (tex->tex,
+												   ctx->default_white);
+		bframe->imageInfo[1].imageView = get_view (tex->glow,
+												   ctx->default_black);
 		dfunc->vkCmdPushDescriptorSetKHR (bframe->bsp_cmd,
 										  VK_PIPELINE_BIND_POINT_GRAPHICS,
 										  bctx->layout,
-										  0, 1, bframe->descriptors + 1);
+										  0, 2, bframe->descriptors + 1);
 
 		for (ec = tex->elechain; ec; ec = ec->next) {
 			draw_elechain (ec, bctx->layout, dfunc, bframe->bsp_cmd);
diff --git a/libs/video/renderer/vulkan/vulkan_texture.c b/libs/video/renderer/vulkan/vulkan_texture.c
index 295d1a89d..86bd890ab 100644
--- a/libs/video/renderer/vulkan/vulkan_texture.c
+++ b/libs/video/renderer/vulkan/vulkan_texture.c
@@ -170,6 +170,10 @@ Vulkan_LoadTex (vulkan_ctx_t *ctx, tex_t *tex, int mip)
 										 VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT,
 										 0, 0);
 	QFV_BindImageMemory (device, qtex->image, qtex->memory, 0);
+	qtex->view = QFV_CreateImageView (device, qtex->image,
+									  VK_IMAGE_VIEW_TYPE_2D,
+									  VK_FORMAT_R8G8B8A8_UNORM,
+									  VK_IMAGE_ASPECT_COLOR_BIT);
 
 	size_t      bytes = bpp * tex->width * tex->height;
 	qfv_packet_t *packet = QFV_PacketAcquire (ctx->staging);
@@ -241,8 +245,14 @@ Vulkan_LoadTex (vulkan_ctx_t *ctx, tex_t *tex, int mip)
 		blit.dstOffsets[1].y = (blit.dstOffsets[1].y + 1) >> 1;
 		barrier.subresourceRange.baseMipLevel++;
 	}
+	stages = imageLayoutTransitionStages[qfv_LT_TransferDst_to_ShaderReadOnly];
+	barrier=imageLayoutTransitionBarriers[qfv_LT_TransferDst_to_ShaderReadOnly];
+	barrier.image = qtex->image;
+	dfunc->vkCmdPipelineBarrier (packet->cmd, stages.src, stages.dst,
+								 0, 0, 0, 0, 0,
+								 1, &barrier);
 	QFV_PacketSubmit (packet);
-	return 0;
+	return qtex;
 }
 
 VkImageView
@@ -262,3 +272,23 @@ Vulkan_UnloadTex (vulkan_ctx_t *ctx, qfv_tex_t *tex)
 	dfunc->vkFreeMemory (device->dev, tex->memory, 0);
 	free (tex);
 }
+
+static tex_t default_black_tex = {1, 1, tex_rgba, 1, 0, {0, 0, 0, 0 }};
+static tex_t default_white_tex = {1, 1, tex_rgba, 1, 0, {255, 255, 255, 255 }};
+static tex_t default_magenta_tex = {1, 1, tex_rgba, 1, 0, {255, 0, 255, 255 }};
+
+void
+Vulkan_Texture_Init (vulkan_ctx_t *ctx)
+{
+	ctx->default_black = Vulkan_LoadTex (ctx, &default_black_tex, 1);
+	ctx->default_white = Vulkan_LoadTex (ctx, &default_white_tex, 1);
+	ctx->default_magenta = Vulkan_LoadTex (ctx, &default_magenta_tex, 1);
+}
+
+void
+Vulkan_Texture_Shutdown (vulkan_ctx_t *ctx)
+{
+	Vulkan_UnloadTex (ctx, ctx->default_black);
+	Vulkan_UnloadTex (ctx, ctx->default_white);
+	Vulkan_UnloadTex (ctx, ctx->default_magenta);
+}

From 82241693947ef9a271f65e1ddb36f73cec495411 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 23 Jan 2021 18:56:15 +0900
Subject: [PATCH 1360/1519] [util] Make plist parse errors a little more useful

Particularly the "unexpected character" ones.
---
 libs/util/qfplist.c | 45 +++++++++++++++++++++++++--------------------
 1 file changed, 25 insertions(+), 20 deletions(-)

diff --git a/libs/util/qfplist.c b/libs/util/qfplist.c
index 273148657..3fa64b9d0 100644
--- a/libs/util/qfplist.c
+++ b/libs/util/qfplist.c
@@ -85,11 +85,11 @@ struct plbinary_s {
 typedef struct plbinary_s	plbinary_t;
 
 typedef struct pldata_s {	// Unparsed property list string
-	const char		*ptr;
-	unsigned int	end;
-	unsigned int	pos;
-	unsigned int	line;
-	const char		*error;
+	const char *ptr;
+	unsigned    end;
+	unsigned    pos;
+	unsigned    line;
+	plitem_t   *error;
 } pldata_t;
 
 //	Ugly defines for fast checking and conversion from char to number
@@ -454,7 +454,7 @@ PL_SkipSpace (pldata_t *pl)
 						pl->pos++;
 					}
 					if (pl->pos >= pl->end) {
-						pl->error = "Reached end of string in comment";
+						pl->error = PL_NewString ("Reached end of string in comment");
 						return false;
 					}
 				} else if (pl->ptr[pl->pos + 1] == '*') {	// "/*" comments
@@ -473,7 +473,7 @@ PL_SkipSpace (pldata_t *pl)
 						pl->pos++;
 					}
 					if (pl->pos >= pl->end) {
-						pl->error = "Reached end of string in comment";
+						pl->error = PL_NewString ("Reached end of string in comment");
 						return false;
 					}
 				} else {
@@ -488,7 +488,7 @@ PL_SkipSpace (pldata_t *pl)
 		}
 		pl->pos++;
 	}
-	pl->error = "Reached end of string";
+	pl->error = PL_NewString ("Reached end of string");
 	return false;
 }
 
@@ -523,7 +523,7 @@ PL_ParseData (pldata_t *pl, int *len)
 		}
 		if (c == '>') {
 			if (nibbles & 1) {
-				pl->error = "invalid data, missing nibble";
+				pl->error = PL_NewString ("invalid data, missing nibble");
 				return NULL;
 			}
 			*len = nibbles / 2;
@@ -533,10 +533,10 @@ PL_ParseData (pldata_t *pl, int *len)
 									pl->ptr[start + i * 2 + 1]);
 			return str;
 		}
-		pl->error = "invalid character in data";
+		pl->error = PL_NewString (va ("invalid character in data: %02x", c));
 		return NULL;
 	}
-	pl->error = "Reached end of string while parsing data";
+	pl->error = PL_NewString ("Reached end of string while parsing data");
 	return NULL;
 }
 
@@ -603,7 +603,7 @@ PL_ParseQuotedString (pldata_t *pl)
 	}
 
 	if (pl->pos >= pl->end) {
-		pl->error = "Reached end of string while parsing quoted string";
+		pl->error = PL_NewString ("Reached end of string while parsing quoted string");
 		return NULL;
 	}
 
@@ -741,14 +741,14 @@ PL_ParsePropertyListItem (pldata_t *pl)
 			}
 
 			if (key->type != QFString) {
-				pl->error = "Key is not a string";
+				pl->error = PL_NewString ("Key is not a string");
 				PL_Free (key);
 				PL_Free (item);
 				return NULL;
 			}
 
 			if (pl->ptr[pl->pos] != '=') {
-				pl->error = "Unexpected character (expected '=')";
+				pl->error = PL_NewString (va ("Unexpected character %c (expected '=')", pl->ptr[pl->pos]));
 				PL_Free (key);
 				PL_Free (item);
 				return NULL;
@@ -772,7 +772,7 @@ PL_ParsePropertyListItem (pldata_t *pl)
 			if (pl->ptr[pl->pos] == ';') {
 				pl->pos++;
 			} else if (pl->ptr[pl->pos] != '}') {
-				pl->error = "Unexpected character (wanted ';' or '}')";
+				pl->error = PL_NewString (va ("Unexpected character %c (wanted ';' or '}')", pl->ptr[pl->pos]));
 				PL_Free (key);
 				PL_Free (value);
 				PL_Free (item);
@@ -790,7 +790,7 @@ PL_ParsePropertyListItem (pldata_t *pl)
 		}
 
 		if (pl->pos >= pl->end) {	// Catch the error
-			pl->error = "Unexpected end of string when parsing dictionary";
+			pl->error = PL_NewString ("Unexpected end of string when parsing dictionary");
 			PL_Free (item);
 			return NULL;
 		}
@@ -822,14 +822,14 @@ PL_ParsePropertyListItem (pldata_t *pl)
 			if (pl->ptr[pl->pos] == ',') {
 				pl->pos++;
 			} else if (pl->ptr[pl->pos] != ')') {
-				pl->error = "Unexpected character (wanted ',' or ')')";
+				pl->error = PL_NewString (va ("Unexpected character %c (wanted ',' or ')')", pl->ptr[pl->pos]));
 				PL_Free (value);
 				PL_Free (item);
 				return NULL;
 			}
 
 			if (!PL_A_AddObject (item, value)) {
-				pl->error = "Unexpected character (too many items in array)";
+				pl->error = PL_NewString ("Unexpected character (too many items in array)");
 				PL_Free (value);
 				PL_Free (item);
 				return NULL;
@@ -896,8 +896,13 @@ PL_GetPropertyList (const char *string)
 		free (pl);
 		return newpl;
 	} else {
-		if (pl && pl->error && pl->error[0])
-			Sys_Printf ("plist: %d,%d: %s", pl->line, pl->pos, pl->error);
+		if (pl && pl->error) {
+			const char *error = PL_String (pl->error);
+			if (error[0]) {
+				Sys_Printf ("plist: %d,%d: %s", pl->line, pl->pos, error);
+			}
+			PL_Free (pl->error);
+		}
 		free (pl);
 		return NULL;
 	}

From 4283d690ad892cb36ba682aaf9e3e3c6d8933bcc Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 23 Jan 2021 20:39:09 +0900
Subject: [PATCH 1361/1519] [vulkan] Generate correct parse data for size_t

Fixes a segfault when parsing specialization map data.
---
 libs/video/renderer/vulkan/vkgen/vkalias.r | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libs/video/renderer/vulkan/vkgen/vkalias.r b/libs/video/renderer/vulkan/vkgen/vkalias.r
index cde6eb270..e0aad2943 100644
--- a/libs/video/renderer/vulkan/vkgen/vkalias.r
+++ b/libs/video/renderer/vulkan/vkgen/vkalias.r
@@ -137,9 +137,12 @@
 		id enumObj = [(id) Hash_Find (available_types, name) resolveType];
 		return [enumObj parseData];
 	}
-	if (name == "uint32_t" || name == "size_t") {
+	if (name == "uint32_t") {
 		return "0";
 	}
+	if (name == "size_t") {
+		return "&cexpr_size_t";
+	}
 	return [alias parseData];
 }
 @end

From 77a8f901133a35e7dfd6e527cae0b4c347407dff Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 23 Jan 2021 20:40:11 +0900
Subject: [PATCH 1362/1519] [vulkan] Fix array parsing size error

The size was not getting written if it was the first value in the
structure.
---
 libs/video/renderer/vulkan/vkparse.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/video/renderer/vulkan/vkparse.c b/libs/video/renderer/vulkan/vkparse.c
index 0fc00b835..3c2447702 100644
--- a/libs/video/renderer/vulkan/vkparse.c
+++ b/libs/video/renderer/vulkan/vkparse.c
@@ -282,7 +282,7 @@ parse_array (const plfield_t *field, const plitem_t *item,
 	}
 	*value = malloc (array->stride * arr->size);
 	memcpy (*value, arr->a, array->stride * arr->size);
-	if ((void *) size > data) {
+	if ((void *) size >= data) {
 		*size = arr->size;
 	}
 	free (arr);

From 49408c695dcfa063691ad1437cc83addb512723d Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 23 Jan 2021 20:42:53 +0900
Subject: [PATCH 1363/1519] [vulkan] Get sky sheets mostly working

They render (incorrectly because the images weren't translated
correctly), but aren't animated (haven't pushed the time constant)
---
 include/QF/Vulkan/qf_bsp.h                  |  11 +
 include/vid_vulkan.h                        |   2 -
 libs/video/renderer/vulkan/qfpipeline.plist | 106 ++++++-
 libs/video/renderer/vulkan/quakebsp.frag    |  19 +-
 libs/video/renderer/vulkan/quakebsp.vert    |   2 +-
 libs/video/renderer/vulkan/vulkan_bsp.c     | 297 ++++++++++++++------
 6 files changed, 341 insertions(+), 96 deletions(-)

diff --git a/include/QF/Vulkan/qf_bsp.h b/include/QF/Vulkan/qf_bsp.h
index 92c63b034..969fdd92c 100644
--- a/include/QF/Vulkan/qf_bsp.h
+++ b/include/QF/Vulkan/qf_bsp.h
@@ -57,6 +57,13 @@ typedef struct elechain_s {
 	float      *color;
 } elechain_t;
 
+typedef enum {
+	qfv_bsp_texture,
+	qfv_bsp_glowmap,
+	qfv_bsp_lightmap,
+	qfv_bsp_skysheet,
+	qfv_bsp_skycube,
+} qfv_bsp_tex;
 // view matrix
 #define BSP_BUFFER_INFOS 1
 // Texture, GlowMap, LightMap, SkySheet, SkyCube
@@ -104,7 +111,10 @@ typedef struct bspctx_s {
 	instsurf_t **instsurfs_tail;
 	instsurf_t  *free_instsurfs;
 
+	struct qfv_tex_s *default_skysheet;
 	struct qfv_tex_s *skysheet_tex;
+
+	struct qfv_tex_s *default_skybox;
 	struct qfv_tex_s *skybox_tex;
 	quat_t       sky_rotation[2];
 	quat_t       sky_velocity;
@@ -122,6 +132,7 @@ typedef struct bspctx_s {
 	VkSampler    sampler;
 	VkDeviceMemory texture_memory;
 	VkPipeline   main;
+	VkPipeline   sky;
 	VkPipelineLayout layout;
 	size_t       vertex_buffer_size;
 	size_t       index_buffer_size;
diff --git a/include/vid_vulkan.h b/include/vid_vulkan.h
index 3a234c0d2..f4642afb1 100644
--- a/include/vid_vulkan.h
+++ b/include/vid_vulkan.h
@@ -78,8 +78,6 @@ typedef struct vulkan_ctx_s {
 	struct qfv_tex_s *default_black;
 	struct qfv_tex_s *default_white;
 	struct qfv_tex_s *default_magenta;
-	struct qfv_tex_s *default_skysheet;
-	struct qfv_tex_s *default_skybox;
 
 	// projection and view matrices (model is push constant)
 	vulkan_matrices_t matrices;
diff --git a/libs/video/renderer/vulkan/qfpipeline.plist b/libs/video/renderer/vulkan/qfpipeline.plist
index 9b0a6a1d7..b5f5cd6cb 100644
--- a/libs/video/renderer/vulkan/qfpipeline.plist
+++ b/libs/video/renderer/vulkan/qfpipeline.plist
@@ -108,7 +108,7 @@
 					descriptorCount = 1;
 					stageFlags = fragment;
 				},
-				/*{
+				{
 					binding = 4;
 					descriptorType = combined_image_sampler;
 					descriptorCount = 1;
@@ -119,7 +119,7 @@
 					descriptorType = combined_image_sampler;
 					descriptorCount = 1;
 					stageFlags = fragment;
-				},*/
+				},
 			);
 		};
 		something = {
@@ -260,6 +260,108 @@
 			layout = quakebsp;
 			//renderPass = renderpass;
 		};
+		quakebsp.skysheet = {
+			stages = (
+				{ stage = vertex; name = main; module = quakebspv; },
+				{
+					stage = fragment;
+					name = main;
+					module = quakebspf;
+					specializationInfo = {
+						mapEntries = (
+							{ size = 4; offset = 0; constantID = 0; },
+							{ size = 4; offset = 0; constantID = 1; },
+							{ size = 4; offset = 0; constantID = 2; },
+							{ size = 4; offset = 4; constantID = 3; },
+						);
+						data = <00000000ffffffff>;
+					};
+				},
+			);
+			vertexInput = {
+				bindings = (
+					{
+						binding = 0;
+						stride = "2 * 4 * 4";
+						inputRate = vertex;
+					},
+				);
+				attributes = (
+					{
+						location = 0;
+						binding = 0;
+						format = r32g32b32a32_sfloat;
+						offset = 0;
+					},
+					{
+						location = 1;
+						binding = 0;
+						format = r32g32b32a32_sfloat;
+						offset = 16;
+					},
+				);
+			};
+			inputAssembly = {
+				topology = triangle_fan;
+				primitiveRestartEnable = true;
+			};
+			viewport = {
+				viewports = (
+					{
+						x = 0; y = 0;
+						width = 640; height = 480;
+						minDepth = 0; maxDepth = 1;
+					}
+				);
+				scissors = (
+					{
+						offset = { x = 0; y = 0 };
+						extent = { width = 640; height = 480; };
+					},
+				);
+			};
+			rasterization = {
+				depthClampEnable = false;
+				rasterizerDiscardEnable = false;
+				polygonMode = fill;
+				cullMode = back;
+				frontFace = clockwise;
+				depthBiasEnable = false;
+				lineWidth = 1;
+			};
+			multisample = {
+				rasterizationSamples = $msaaSamples;
+				sampleShadingEnable = false;
+				minSampleShading = 0.5f;
+				alphaToCoverageEnable = false;
+				alphaToOneEnable = false;
+			};
+			depthStencil = {
+				depthTestEnable = true;
+				depthWriteEnable = true;
+				depthCompareOp = less_or_equal;
+				depthBoundsTestEnable = false;
+				stencilTestEnable = false;
+			};
+			colorBlend = {
+				logicOpEnable = false;
+				attachments = ({
+					blendEnable = true;
+					srcColorBlendFactor = src_alpha;
+					dstColorBlendFactor = one_minus_src_alpha;
+					colorBlendOp = add;
+					srcAlphaBlendFactor = src_alpha;
+					dstAlphaBlendFactor = one_minus_src_alpha;
+					alphaBlendOp = add;
+					colorWriteMask = r|g|b|a;
+				});
+			};
+			dynamic = {
+				dynamicState = ( viewport, scissor, blend_constants );
+			};
+			layout = quakebsp;
+			//renderPass = renderpass;
+		};
 		twod = {
 			stages = (
 				{ stage = vertex; name = main; module = twodv; },
diff --git a/libs/video/renderer/vulkan/quakebsp.frag b/libs/video/renderer/vulkan/quakebsp.frag
index 872c97893..483a3887e 100644
--- a/libs/video/renderer/vulkan/quakebsp.frag
+++ b/libs/video/renderer/vulkan/quakebsp.frag
@@ -3,8 +3,8 @@
 layout (set = 0, binding = 1) uniform sampler2D Texture;
 layout (set = 0, binding = 2) uniform sampler2D GlowMap;
 layout (set = 0, binding = 3) uniform sampler2D LightMap;
-//layout (set = 0, binding = 4) uniform sampler2DArray SkySheet;
-//layout (set = 0, binding = 5) uniform samplerCube SkyCube;
+layout (set = 0, binding = 4) uniform sampler2DArray SkySheet;
+layout (set = 0, binding = 5) uniform samplerCube SkyCube;
 
 layout (push_constant) uniform PushConstants {
 	layout (offset = 64)
@@ -46,7 +46,7 @@ fogBlend (vec4 color)
 
 	return vec4 (mix (fog_color.rgb, color.rgb, fog_factor), color.a);
 }
-/*
+
 vec4
 sky_sheet (vec3 dir, float time)
 {
@@ -99,7 +99,7 @@ sky_color (vec3 dir, float time)
 		return vec4 (1, 0, 1, 1);
 	}
 }
-*/
+
 void
 main (void)
 {
@@ -110,15 +110,14 @@ main (void)
 	if (doWarp) {
 		t_st = warp_st (t_st, time);
 	}
-	/*if (doSkyCube || doSkySheet) {
+	if (doSkyCube || doSkySheet) {
 		c = sky_color (direction, time);
 	} else {
 		c = texture (Texture, t_st);
-	}*/
-	c = texture (Texture, t_st);
-	if (doLight) {
-		c *= vec4 (texture (LightMap, l_st).xyz, 1);
+		if (doLight) {
+			c *= vec4 (texture (LightMap, l_st).xyz, 1);
+		}
+		c += texture (GlowMap, t_st);
 	}
-	c += texture (GlowMap, t_st);
 	frag_color = c;//fogBlend (c);
 }
diff --git a/libs/video/renderer/vulkan/quakebsp.vert b/libs/video/renderer/vulkan/quakebsp.vert
index efc03bac8..bb9e87e4a 100644
--- a/libs/video/renderer/vulkan/quakebsp.vert
+++ b/libs/video/renderer/vulkan/quakebsp.vert
@@ -20,6 +20,6 @@ void
 main (void)
 {
 	gl_Position = Projection * (View * (Model * vertex));
-	direction = vertex.xyz;//(Sky * vertex).xyz;
+	direction = (Sky * vertex).xyz;
 	tl_st = tl_uv;
 }
diff --git a/libs/video/renderer/vulkan/vulkan_bsp.c b/libs/video/renderer/vulkan/vulkan_bsp.c
index 552ea075f..bfd54f9e8 100644
--- a/libs/video/renderer/vulkan/vulkan_bsp.c
+++ b/libs/video/renderer/vulkan/vulkan_bsp.c
@@ -56,9 +56,11 @@
 #include "QF/Vulkan/qf_lightmap.h"
 #include "QF/Vulkan/qf_texture.h"
 #include "QF/Vulkan/buffer.h"
+#include "QF/Vulkan/barrier.h"
 #include "QF/Vulkan/command.h"
 #include "QF/Vulkan/descriptor.h"
 #include "QF/Vulkan/device.h"
+#include "QF/Vulkan/image.h"
 #include "QF/Vulkan/instance.h"
 #include "QF/Vulkan/scrap.h"
 #include "QF/Vulkan/staging.h"
@@ -751,6 +753,17 @@ R_VisitWorldNodes (model_t *model, vulkan_ctx_t *ctx)
 		visit_leaf ((mleaf_t *) node);
 }
 
+static void
+bind_view (qfv_bsp_tex tex, VkImageView view, bspframe_t *bframe,
+		   VkCommandBuffer cmd, VkPipelineLayout layout, qfv_devfuncs_t *dfunc)
+{
+	bframe->imageInfo[tex].imageView = view;
+	dfunc->vkCmdPushDescriptorSetKHR (cmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
+									  layout, 0, 1,
+									  bframe->descriptors + tex
+									  + BSP_BUFFER_INFOS);
+}
+
 static void
 draw_elechain (elechain_t *ec, VkPipelineLayout layout, qfv_devfuncs_t *dfunc,
 			   VkCommandBuffer cmd)
@@ -821,9 +834,9 @@ bsp_begin (vulkan_ctx_t *ctx)
 	bframe->imageInfo[1].imageView = 0;	// set by tex chain loop
 	bframe->imageInfo[2].imageView = QFV_ScrapImageView (bctx->light_scrap);
 	bframe->imageInfo[3].imageView = get_view (bctx->skysheet_tex,
-											   ctx->default_skysheet);
+											   bctx->default_skysheet);
 	bframe->imageInfo[4].imageView = get_view (bctx->skybox_tex,
-											   ctx->default_skybox);
+											   bctx->default_skybox);
 
 	dfunc->vkResetCommandBuffer (cmd, 0);
 	VkCommandBufferInheritanceInfo inherit = {
@@ -856,10 +869,9 @@ bsp_begin (vulkan_ctx_t *ctx)
 									  bctx->layout,
 									  0, 1, bframe->descriptors + 0);
 	// push static images
-	// XXX sky sheet and box not pushed yet
 	dfunc->vkCmdPushDescriptorSetKHR (cmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
 									  bctx->layout,
-									  0, 1, bframe->descriptors + 3);
+									  0, 3, bframe->descriptors + 3);
 
 	//XXX glsl_Fog_GetColor (fog);
 	//XXX fog[3] = glsl_Fog_GetDensity () / 64.0;
@@ -926,7 +938,7 @@ turb_end (bspctx_t *bctx)
 	qfeglBindBuffer (GL_ARRAY_BUFFER, 0);
 }*/
 
-/*XXX static void
+static void
 spin (mat4_t mat, bspctx_t *bctx)
 {
 	quat_t      q;
@@ -947,82 +959,88 @@ spin (mat4_t mat, bspctx_t *bctx)
 	VectorNegate (r_origin, mat + 12);
 	QuatToMatrix (q, m, 1, 1);
 	Mat4Mult (m, mat, mat);
-}*/
+}
 
 static void
-sky_begin (bspctx_t *bctx)
+sky_begin (vulkan_ctx_t *ctx)
 {
-	//XXX mat4_t      mat;
+	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+	bspctx_t   *bctx = ctx->bsp_context;
 	//XXX quat_t      fog;
 
 	bctx->default_color[3] = 1;
 	QuatCopy (bctx->default_color, bctx->last_color);
-/*	qfeglVertexAttrib4fv (quake_bsp.color.location, bctx->default_color);
 
-	Mat4Mult (glsl_projection, glsl_view, bsp_vp);
+	//XXX glsl_Fog_GetColor (fog);
+	//fog[3] = glsl_Fog_GetDensity () / 64.0;
+	//qfeglUniform4fv (sky_params.fog->location, 1, fog);
 
-	if (bctx->skybox_tex) {
-		sky_params.mvp_matrix = &quake_skybox.mvp_matrix;
-		sky_params.vertex = &quake_skybox.vertex;
-		sky_params.sky_matrix = &quake_skybox.sky_matrix;
-		sky_params.fog = &quake_skybox.fog;
+	spin (ctx->matrices.sky_3d, bctx);
 
-		qfeglUseProgram (quake_skybox.program);
-		qfeglEnableVertexAttribArray (quake_skybox.vertex.location);
+	__auto_type cframe = &ctx->framebuffers.a[ctx->curFrame];
+	bspframe_t *bframe = &bctx->frames.a[ctx->curFrame];
+	VkCommandBuffer cmd = bframe->sky_cmd;
+	DARRAY_APPEND (cframe->subCommand, cmd);
 
-		qfeglUniform1i (quake_skybox.sky.location, 0);
-		qfeglActiveTexture (GL_TEXTURE0 + 0);
-		qfeglEnable (GL_TEXTURE_CUBE_MAP);
-		qfeglBindTexture (GL_TEXTURE_CUBE_MAP, skybox_tex);
-	} else {
-		sky_params.mvp_matrix = &quake_skyid.mvp_matrix;
-		sky_params.sky_matrix = &quake_skyid.sky_matrix;
-		sky_params.vertex = &quake_skyid.vertex;
-		sky_params.fog = &quake_skyid.fog;
+	//FIXME need per frame matrices
+	bframe->bufferInfo[0].buffer = ctx->matrices.buffer_3d;
+	bframe->imageInfo[0].imageView = ctx->default_magenta->view;
+	bframe->imageInfo[1].imageView = ctx->default_magenta->view;
+	bframe->imageInfo[2].imageView = QFV_ScrapImageView (bctx->light_scrap);
+	bframe->imageInfo[3].imageView = get_view (bctx->skysheet_tex,
+											   bctx->default_skysheet);
+	bframe->imageInfo[4].imageView = get_view (bctx->skybox_tex,
+											   bctx->default_skybox);
 
-		qfeglUseProgram (quake_skyid.program);
-		qfeglEnableVertexAttribArray (quake_skyid.vertex.location);
+	dfunc->vkResetCommandBuffer (cmd, 0);
+	VkCommandBufferInheritanceInfo inherit = {
+		VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_INFO, 0,
+		ctx->renderpass.renderpass, 0,
+		cframe->framebuffer,
+		0, 0, 0,
+	};
+	VkCommandBufferBeginInfo beginInfo = {
+		VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, 0,
+		VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT
+		| VK_COMMAND_BUFFER_USAGE_RENDER_PASS_CONTINUE_BIT, &inherit,
+	};
+	dfunc->vkBeginCommandBuffer (cmd, &beginInfo);
 
-		qfeglUniform1i (quake_skyid.palette.location, 2);
-		qfeglActiveTexture (GL_TEXTURE0 + 2);
-		qfeglEnable (GL_TEXTURE_2D);
-		qfeglBindTexture (GL_TEXTURE_2D, glsl_palette);
+	dfunc->vkCmdBindPipeline (cmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
+							  bctx->sky);
+	VkViewport  viewport = {0, 0, vid.width, vid.height, 0, 1};
+	VkRect2D    scissor = { {0, 0}, {vid.width, vid.height} };
+	dfunc->vkCmdSetViewport (cmd, 0, 1, &viewport);
+	dfunc->vkCmdSetScissor (cmd, 0, 1, &scissor);
 
-		qfeglUniform1f (quake_skyid.time.location, vr_data.realtime);
+	VkDeviceSize offsets[] = { 0 };
+	dfunc->vkCmdBindVertexBuffers (cmd, 0, 1, &bctx->vertex_buffer, offsets);
+	dfunc->vkCmdBindIndexBuffer (cmd, bctx->index_buffer, bframe->index_offset,
+								 VK_INDEX_TYPE_UINT32);
 
-		qfeglUniform1i (quake_skyid.trans.location, 0);
-		qfeglActiveTexture (GL_TEXTURE0 + 0);
-		qfeglEnable (GL_TEXTURE_2D);
+	// push VP matrices
+	dfunc->vkCmdPushDescriptorSetKHR (cmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
+									  bctx->layout,
+									  0, 1, bframe->descriptors + 0);
+	// push static images
+	dfunc->vkCmdPushDescriptorSetKHR (cmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
+									  bctx->layout,
+									  0, 5, bframe->descriptors + 1);
 
-		qfeglUniform1i (quake_skyid.solid.location, 1);
-		qfeglActiveTexture (GL_TEXTURE0 + 1);
-		qfeglEnable (GL_TEXTURE_2D);
-	}
-
-	glsl_Fog_GetColor (fog);
-	fog[3] = glsl_Fog_GetDensity () / 64.0;
-	qfeglUniform4fv (sky_params.fog->location, 1, fog);
-
-	spin (mat);
-	qfeglUniformMatrix4fv (sky_params.sky_matrix->location, 1, false, mat);
-
-	qfeglBindBuffer (GL_ARRAY_BUFFER, bsp_vbo);*/
+	//XXX glsl_Fog_GetColor (fog);
+	//XXX fog[3] = glsl_Fog_GetDensity () / 64.0;
 }
 
 static void
-sky_end (bspctx_t *bctx)
+sky_end (vulkan_ctx_t *ctx)
 {
-	/*XXX qfeglDisableVertexAttribArray (sky_params.vertex->location);
+	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+	bspctx_t   *bctx = ctx->bsp_context;
 
-	qfeglActiveTexture (GL_TEXTURE0 + 0);
-	qfeglDisable (GL_TEXTURE_2D);
-	qfeglDisable (GL_TEXTURE_CUBE_MAP);
-	qfeglActiveTexture (GL_TEXTURE0 + 1);
-	qfeglDisable (GL_TEXTURE_2D);
-	qfeglActiveTexture (GL_TEXTURE0 + 2);
-	qfeglDisable (GL_TEXTURE_2D);
-
-	qfeglBindBuffer (GL_ARRAY_BUFFER, 0);*/
+	bspframe_t *bframe = &bctx->frames.a[ctx->curFrame];
+	dfunc->vkEndCommandBuffer (bframe->sky_cmd);
 }
 
 static inline void
@@ -1199,6 +1217,8 @@ Vulkan_DrawWaterSurfaces (vulkan_ctx_t *ctx)
 void
 Vulkan_DrawSky (vulkan_ctx_t *ctx)
 {
+	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
 	bspctx_t   *bctx = ctx->bsp_context;
 	bspframe_t *bframe = &bctx->frames.a[ctx->curFrame];
 	instsurf_t *is;
@@ -1210,20 +1230,24 @@ Vulkan_DrawSky (vulkan_ctx_t *ctx)
 	if (!bctx->sky_chain)
 		return;
 
-	sky_begin (bctx);
+	sky_begin (ctx);
+	dfunc->vkCmdPushConstants (bframe->sky_cmd, bctx->layout,
+							   VK_SHADER_STAGE_VERTEX_BIT,
+							   0, 16 * sizeof (float), identity);
+	float frag_pc[8] = { };
+	dfunc->vkCmdPushConstants (bframe->sky_cmd, bctx->layout,
+							   VK_SHADER_STAGE_FRAGMENT_BIT,
+							   64, 8 * sizeof (float), &frag_pc);
 	for (is = bctx->sky_chain; is; is = is->tex_chain) {
 		surf = is->surface;
 		if (tex != surf->texinfo->texture->render) {
 			if (tex) {
-				if (!bctx->skybox_tex) {
-					//XXX qfeglActiveTexture (GL_TEXTURE0 + 0);
-					//qfeglBindTexture (GL_TEXTURE_2D, tex->sky_tex[0]);
-					//qfeglActiveTexture (GL_TEXTURE0 + 1);
-					//qfeglBindTexture (GL_TEXTURE_2D, tex->sky_tex[1]);
+				bind_view (qfv_bsp_skysheet,
+						   get_view (tex->tex, ctx->default_black),
+						   bframe, bframe->sky_cmd, bctx->layout, dfunc);
+				for (ec = tex->elechain; ec; ec = ec->next) {
+					draw_elechain (ec, bctx->layout, dfunc, bframe->sky_cmd);
 				}
-				//for (ec = tex->elechain; ec; ec = ec->next)
-				//	draw_elechain (ec, sky_params.mvp_matrix->location,
-				//				   sky_params.vertex->location, -1, -1);
 				tex->elechain = 0;
 				tex->elechain_tail = &tex->elechain;
 			}
@@ -1232,24 +1256,123 @@ Vulkan_DrawSky (vulkan_ctx_t *ctx)
 		add_surf_elements (tex, is, &ec, &el, bctx, bframe);
 	}
 	if (tex) {
-		if (!bctx->skybox_tex) {
-			//XXX qfeglActiveTexture (GL_TEXTURE0 + 0);
-			//qfeglBindTexture (GL_TEXTURE_2D, tex->sky_tex[0]);
-			//qfeglActiveTexture (GL_TEXTURE0 + 1);
-			//qfeglBindTexture (GL_TEXTURE_2D, tex->sky_tex[1]);
+		bind_view (qfv_bsp_skysheet,
+				   get_view (tex->tex, ctx->default_black),
+				   bframe, bframe->sky_cmd, bctx->layout, dfunc);
+		for (ec = tex->elechain; ec; ec = ec->next) {
+			draw_elechain (ec, bctx->layout, dfunc, bframe->sky_cmd);
 		}
-		//for (ec = tex->elechain; ec; ec = ec->next)
-		//	draw_elechain (ec, sky_params.mvp_matrix->location,
-		//				   sky_params.vertex->location, -1, -1);
 		tex->elechain = 0;
 		tex->elechain_tail = &tex->elechain;
 	}
-	sky_end (bctx);
+	sky_end (ctx);
 
 	bctx->sky_chain = 0;
 	bctx->sky_chain_tail = &bctx->sky_chain;
 }
 
+static void
+create_default_skys (vulkan_ctx_t *ctx)
+{
+	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+	bspctx_t   *bctx = ctx->bsp_context;
+	VkImage     skybox;
+	VkImage     skysheet;
+	VkDeviceMemory memory;
+	VkImageView boxview;
+	VkImageView sheetview;
+
+	bctx->default_skybox = calloc (2, sizeof (qfv_tex_t));
+	bctx->default_skysheet = bctx->default_skybox + 1;
+
+	VkExtent3D extents = { 1, 1, 1 };
+	skybox = QFV_CreateImage (device, 1, VK_IMAGE_TYPE_2D,
+							  VK_FORMAT_B8G8R8A8_UNORM, extents, 1, 1,
+							  VK_SAMPLE_COUNT_1_BIT,
+							  VK_IMAGE_USAGE_SAMPLED_BIT
+							  | VK_IMAGE_USAGE_TRANSFER_DST_BIT);
+
+	skysheet = QFV_CreateImage (device, 0, VK_IMAGE_TYPE_2D,
+							  VK_FORMAT_B8G8R8A8_UNORM, extents, 1, 2,
+							  VK_SAMPLE_COUNT_1_BIT,
+							  VK_IMAGE_USAGE_SAMPLED_BIT
+							  | VK_IMAGE_USAGE_TRANSFER_DST_BIT);
+	VkMemoryRequirements requirements;
+	dfunc->vkGetImageMemoryRequirements (device->dev, skybox, &requirements);
+	size_t      boxsize = requirements.size;
+	dfunc->vkGetImageMemoryRequirements (device->dev, skysheet, &requirements);
+	size_t      sheetsize = requirements.size;
+
+	memory = QFV_AllocImageMemory (device, skybox,
+								   VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT,
+								   boxsize + sheetsize,
+								   VK_IMAGE_USAGE_TRANSFER_DST_BIT
+								   | VK_IMAGE_USAGE_SAMPLED_BIT);
+
+	QFV_BindImageMemory (device, skybox, memory, 0);
+	QFV_BindImageMemory (device, skysheet, memory, boxsize);
+
+	boxview = QFV_CreateImageView (device, skybox, VK_IMAGE_VIEW_TYPE_CUBE,
+								   VK_FORMAT_B8G8R8A8_UNORM,
+								   VK_IMAGE_ASPECT_COLOR_BIT);
+
+	sheetview = QFV_CreateImageView (device, skysheet,
+									 VK_IMAGE_VIEW_TYPE_2D_ARRAY,
+								     VK_FORMAT_B8G8R8A8_UNORM,
+								     VK_IMAGE_ASPECT_COLOR_BIT);
+
+	bctx->default_skybox->image = skybox;
+	bctx->default_skybox->view = boxview;
+	bctx->default_skybox->memory = memory;
+	bctx->default_skysheet->image = skysheet;
+	bctx->default_skysheet->view = sheetview;
+
+	// temporarily commandeer the light map's staging buffer
+	qfv_packet_t *packet = QFV_PacketAcquire (bctx->light_stage);
+	VkImageMemoryBarrier barrier;
+	VkImageMemoryBarrier barriers[2];
+	qfv_pipelinestagepair_t stages;
+
+	stages = imageLayoutTransitionStages[qfv_LT_Undefined_to_TransferDst];
+	barrier = imageLayoutTransitionBarriers[qfv_LT_Undefined_to_TransferDst];
+	barrier.subresourceRange.levelCount = VK_REMAINING_MIP_LEVELS;
+	barrier.subresourceRange.layerCount = VK_REMAINING_ARRAY_LAYERS;
+	barriers[0] = barrier;
+	barriers[1] = barrier;
+	barriers[0].image = skybox;
+	barriers[1].image = skysheet;
+	dfunc->vkCmdPipelineBarrier (packet->cmd, stages.src, stages.dst,
+								 0, 0, 0, 0, 0,
+								 2, barriers);
+
+	VkClearColorValue color = {};
+	VkImageSubresourceRange range = {
+		VK_IMAGE_ASPECT_COLOR_BIT,
+		0, VK_REMAINING_MIP_LEVELS,
+		0, VK_REMAINING_ARRAY_LAYERS
+	};
+	dfunc->vkCmdClearColorImage (packet->cmd, skybox,
+								 VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
+								 &color, 1, &range);
+	dfunc->vkCmdClearColorImage (packet->cmd, skysheet,
+								 VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
+								 &color, 1, &range);
+
+	stages = imageLayoutTransitionStages[qfv_LT_TransferDst_to_ShaderReadOnly];
+	barrier=imageLayoutTransitionBarriers[qfv_LT_TransferDst_to_ShaderReadOnly];
+	barrier.subresourceRange.levelCount = VK_REMAINING_MIP_LEVELS;
+	barrier.subresourceRange.layerCount = VK_REMAINING_ARRAY_LAYERS;
+	barriers[0] = barrier;
+	barriers[1] = barrier;
+	barriers[0].image = skybox;
+	barriers[1].image = skysheet;
+	dfunc->vkCmdPipelineBarrier (packet->cmd, stages.src, stages.dst,
+								 0, 0, 0, 0, 0,
+								 2, barriers);
+	QFV_PacketSubmit (packet);
+}
+
 static VkDescriptorBufferInfo base_buffer_info = {
 	0, 0, VK_WHOLE_SIZE
 };
@@ -1288,6 +1411,8 @@ Vulkan_Bsp_Init (vulkan_ctx_t *ctx)
 	size_t      size = QFV_ScrapSize (bctx->light_scrap);
 	bctx->light_stage = QFV_CreateStagingBuffer (device, size, ctx->cmdpool);
 
+	create_default_skys (ctx);
+
 	DARRAY_INIT (&bctx->texture_chains, 64);
 
 	size_t      frames = ctx->framebuffers.size;
@@ -1296,6 +1421,7 @@ Vulkan_Bsp_Init (vulkan_ctx_t *ctx)
 	bctx->frames.grow = 0;
 
 	bctx->main = Vulkan_CreatePipeline (ctx, "quakebsp.main");
+	bctx->sky = Vulkan_CreatePipeline (ctx, "quakebsp.skysheet");
 	bctx->layout = QFV_GetPipelineLayout (ctx, "quakebsp");
 	bctx->sampler = QFV_GetSampler (ctx, "quakebsp");
 
@@ -1309,9 +1435,9 @@ Vulkan_Bsp_Init (vulkan_ctx_t *ctx)
 
 	for (size_t i = 0; i < frames; i++) {
 		__auto_type bframe = &bctx->frames.a[i];
-		bframe->bsp_cmd = cmdBuffers->a[i];
-		bframe->turb_cmd = cmdBuffers->a[i];
-		bframe->sky_cmd = cmdBuffers->a[i];
+		bframe->bsp_cmd = cmdBuffers->a[i * 3 + 0];
+		bframe->turb_cmd = cmdBuffers->a[i * 3 + 1];
+		bframe->sky_cmd = cmdBuffers->a[i * 3 + 2];
 
 		for (int j = 0; j < BSP_BUFFER_INFOS; j++) {
 			bframe->bufferInfo[j] = base_buffer_info;
@@ -1338,6 +1464,7 @@ Vulkan_Bsp_Shutdown (struct vulkan_ctx_s *ctx)
 	bspctx_t   *bctx = ctx->bsp_context;
 
 	dfunc->vkDestroyPipeline (device->dev, bctx->main, 0);
+	dfunc->vkDestroyPipeline (device->dev, bctx->sky, 0);
 	DARRAY_CLEAR (&bctx->texture_chains);
 	DARRAY_CLEAR (&bctx->frames);
 	QFV_DestroyStagingBuffer (bctx->light_stage);
@@ -1350,6 +1477,14 @@ Vulkan_Bsp_Shutdown (struct vulkan_ctx_s *ctx)
 		dfunc->vkDestroyBuffer (device->dev, bctx->index_buffer, 0);
 		dfunc->vkFreeMemory (device->dev, bctx->index_memory, 0);
 	}
+
+	dfunc->vkDestroyImageView (device->dev, bctx->default_skysheet->view, 0);
+	dfunc->vkDestroyImage (device->dev, bctx->default_skysheet->image, 0);
+
+	dfunc->vkDestroyImageView (device->dev, bctx->default_skybox->view, 0);
+	dfunc->vkDestroyImage (device->dev, bctx->default_skybox->image, 0);
+	dfunc->vkFreeMemory (device->dev, bctx->default_skybox->memory, 0);
+	free (bctx->default_skybox);
 }
 
 static inline __attribute__((const)) int

From 145e7478a748e6df680403bbdbdcb15b24c83c93 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 23 Jan 2021 23:56:33 +0900
Subject: [PATCH 1364/1519] [vid] Create a 32-bit version of the palette

The 32-bit palette includes the alpha channel, with color 255's alpha
set to 0.
---
 include/QF/vid.h         |  1 +
 libs/video/targets/vid.c | 29 +++++++++++++++++++++++++----
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/include/QF/vid.h b/include/QF/vid.h
index 19618f66c..430e775ab 100644
--- a/include/QF/vid.h
+++ b/include/QF/vid.h
@@ -43,6 +43,7 @@ typedef struct {
 	byte			*gammatable;	// 256
 	byte            *basepal;		// 256 * 3
 	byte            *palette;		// 256 * 3
+	byte            *palette32;		// 256 * 4 includes alpha
 	byte			*colormap8;		// 256 * VID_GRADES size
 	unsigned short	*colormap16;	// 256 * VID_GRADES size
 	unsigned int	*colormap32;	// 256 * VID_GRADES size
diff --git a/libs/video/targets/vid.c b/libs/video/targets/vid.c
index 651101539..b656b5a22 100644
--- a/libs/video/targets/vid.c
+++ b/libs/video/targets/vid.c
@@ -200,6 +200,10 @@ void
 VID_UpdateGamma (cvar_t *vid_gamma)
 {
 	double gamma = bound (0.1, vid_gamma->value, 9.9);
+	byte       *p24;
+	byte       *p32;
+	byte       *col;
+	int         i;
 
 	viddef.recalc_refdef = 1;				// force a surface cache flush
 
@@ -207,13 +211,29 @@ VID_UpdateGamma (cvar_t *vid_gamma)
 		Sys_MaskPrintf (SYS_VID, "Setting hardware gamma to %g\n", gamma);
 		VID_BuildGammaTable (1.0);	// hardware gamma wants a linear palette
 		VID_SetGamma (gamma);
-		memcpy (viddef.palette, viddef.basepal, 256 * 3);
+		p24 = viddef.palette;
+		p32 = viddef.palette32;
+		col = viddef.basepal;
+		for (i = 0; i < 256; i++) {
+			*p32++ = *p24++ = *col++;
+			*p32++ = *p24++ = *col++;
+			*p32++ = *p24++ = *col++;
+			*p32++ = 255;
+		}
+		p32[-1] = 0;	// color 255 is transparent
 	} else {	// We have to hack the palette
-		int i;
 		Sys_MaskPrintf (SYS_VID, "Setting software gamma to %g\n", gamma);
 		VID_BuildGammaTable (gamma);
-		for (i = 0; i < 256 * 3; i++)
-			viddef.palette[i] = viddef.gammatable[viddef.basepal[i]];
+		p24 = viddef.palette;
+		p32 = viddef.palette32;
+		col = viddef.basepal;
+		for (i = 0; i < 256; i++) {
+			*p32++ = *p24++ = viddef.gammatable[*col++];
+			*p32++ = *p24++ = viddef.gammatable[*col++];
+			*p32++ = *p24++ = viddef.gammatable[*col++];
+			*p32++ = 255;
+		}
+		p32[-1] = 0;	// color 255 is transparent
 		viddef.vid_internal->set_palette (viddef.palette); // update with the new palette
 	}
 }
@@ -232,6 +252,7 @@ VID_InitGamma (unsigned char *pal)
 	viddef.gammatable = malloc (256);
 	viddef.basepal = pal;
 	viddef.palette = malloc (256 * 3);
+	viddef.palette32 = malloc (256 * 4);
 	if ((i = COM_CheckParm ("-gamma"))) {
 		gamma = atof (com_argv[i + 1]);
 	}

From 3132aa91a82f4d205cc38cb7b0f357077e6fa498 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 23 Jan 2021 23:58:34 +0900
Subject: [PATCH 1365/1519] [vulkan] Get sky sheets working

The sky texture is loaded with black's alpha set to 0. While this does
hit both layers, the screen is cleared to black so it shouldn't be a
problem (and will allow having a skybox behind the sheets).
---
 include/QF/Vulkan/qf_bsp.h                  |  5 +++++
 libs/models/brush/vulkan_model_brush.c      | 16 ++++++++++++----
 libs/video/renderer/vulkan/quakebsp.frag    |  2 +-
 libs/video/renderer/vulkan/vulkan_bsp.c     | 16 +++++++---------
 libs/video/renderer/vulkan/vulkan_texture.c | 11 ++++++++++-
 5 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/include/QF/Vulkan/qf_bsp.h b/include/QF/Vulkan/qf_bsp.h
index 969fdd92c..151e6e7be 100644
--- a/include/QF/Vulkan/qf_bsp.h
+++ b/include/QF/Vulkan/qf_bsp.h
@@ -81,6 +81,11 @@ typedef struct bspframe_s {
 	VkWriteDescriptorSet descriptors[BSP_BUFFER_INFOS + BSP_IMAGE_INFOS];
 } bspframe_t;
 
+typedef struct fragconst_s {
+	quat_t      fog;
+	float       time;
+} fragconst_t;
+
 typedef struct bspframeset_s
     DARRAY_TYPE (bspframe_t) bspframeset_t;
 
diff --git a/libs/models/brush/vulkan_model_brush.c b/libs/models/brush/vulkan_model_brush.c
index b64e8c11f..c9b336f0f 100644
--- a/libs/models/brush/vulkan_model_brush.c
+++ b/libs/models/brush/vulkan_model_brush.c
@@ -101,7 +101,7 @@ get_image_size (VkImage image, qfv_device_t *device)
 }
 
 static void
-transfer_mips (byte *dst, const void *_src, const texture_t *tx)
+transfer_mips (byte *dst, const void *_src, const texture_t *tx, byte *palette)
 {
 	const byte *src = _src;
 	unsigned    width = tx->width;
@@ -113,7 +113,7 @@ transfer_mips (byte *dst, const void *_src, const texture_t *tx)
 		// end of the texture struct
 		offset = tx->offsets[i] - sizeof (texture_t);
 		count = width * height;
-		Vulkan_ExpandPalette (dst, src + offset, vid.palette, 1, count);
+		Vulkan_ExpandPalette (dst, src + offset, palette, 2, count);
 		dst += count * 4;
 		width >>= 1;
 		height >>= 1;
@@ -218,6 +218,7 @@ load_textures (model_t *model, vulkan_ctx_t *ctx)
 
 	for (int i = 0; i < model->numtextures; i++) {
 		texture_t  *tx = model->textures[i];
+		byte       *palette = vid.palette32;
 		if (!tx) {
 			continue;
 		}
@@ -227,12 +228,18 @@ load_textures (model_t *model, vulkan_ctx_t *ctx)
 								  tex->tex->offset);
 		VkImageViewType type = VK_IMAGE_VIEW_TYPE_2D;
 		if (strncmp (tx->name, "sky", 3) == 0) {
+			palette = alloca (256 * 4);
+			memcpy (palette, vid.palette32, 256 * 4);
+			// sky's black is transparent
+			// this hits both layers, but so long as the screen is cleared
+			// to black, no one should notice :)
+			palette[3] = 0;
 			type = VK_IMAGE_VIEW_TYPE_2D_ARRAY;
 		}
 		tex->tex->view = QFV_CreateImageView (device, tex->tex->image,
 											  type, VK_FORMAT_R8G8B8A8_UNORM,
 											  VK_IMAGE_ASPECT_COLOR_BIT);
-		transfer_mips (buffer + tex->tex->offset, tx + 1, tx);
+		transfer_mips (buffer + tex->tex->offset, tx + 1, tx, palette);
 		if (tex->glow) {
 			dfunc->vkBindImageMemory (device->dev, tex->glow->image, mem,
 									  tex->glow->offset);
@@ -242,7 +249,8 @@ load_textures (model_t *model, vulkan_ctx_t *ctx)
 												   VK_IMAGE_VIEW_TYPE_2D,
 												   VK_FORMAT_R8G8B8A8_UNORM,
 												   VK_IMAGE_ASPECT_COLOR_BIT);
-			transfer_mips (buffer + tex->glow->offset, tex->glow->memory, tx);
+			transfer_mips (buffer + tex->glow->offset, tex->glow->memory, tx,
+						   palette);
 		}
 	}
 
diff --git a/libs/video/renderer/vulkan/quakebsp.frag b/libs/video/renderer/vulkan/quakebsp.frag
index 483a3887e..fe596246e 100644
--- a/libs/video/renderer/vulkan/quakebsp.frag
+++ b/libs/video/renderer/vulkan/quakebsp.frag
@@ -8,8 +8,8 @@ layout (set = 0, binding = 5) uniform samplerCube SkyCube;
 
 layout (push_constant) uniform PushConstants {
 	layout (offset = 64)
-	float       time;
 	vec4        fog;
+	float       time;
 };
 
 layout (location = 0) in vec4 tl_st;
diff --git a/libs/video/renderer/vulkan/vulkan_bsp.c b/libs/video/renderer/vulkan/vulkan_bsp.c
index bfd54f9e8..6da253bea 100644
--- a/libs/video/renderer/vulkan/vulkan_bsp.c
+++ b/libs/video/renderer/vulkan/vulkan_bsp.c
@@ -908,6 +908,9 @@ turb_begin (bspctx_t *bctx)
 
 	glsl_Fog_GetColor (fog);
 	fog[3] = glsl_Fog_GetDensity () / 64.0;
+	fragconst_t frag_constants = { time: vr_data.realtime };
+	dfunc->vkCmdPushConstants (cmd, bctx->layout, VK_SHADER_STAGE_FRAGMENT_BIT,
+							   64, sizeof (fragconst_t), &frag_constants);
 	qfeglUniform4fv (quake_turb.fog.location, 1, fog);
 
 	qfeglUniform1i (quake_turb.palette.location, 1);
@@ -967,15 +970,10 @@ sky_begin (vulkan_ctx_t *ctx)
 	qfv_device_t *device = ctx->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
 	bspctx_t   *bctx = ctx->bsp_context;
-	//XXX quat_t      fog;
 
 	bctx->default_color[3] = 1;
 	QuatCopy (bctx->default_color, bctx->last_color);
 
-	//XXX glsl_Fog_GetColor (fog);
-	//fog[3] = glsl_Fog_GetDensity () / 64.0;
-	//qfeglUniform4fv (sky_params.fog->location, 1, fog);
-
 	spin (ctx->matrices.sky_3d, bctx);
 
 	__auto_type cframe = &ctx->framebuffers.a[ctx->curFrame];
@@ -1121,10 +1119,10 @@ Vulkan_DrawWorld (vulkan_ctx_t *ctx)
 	dfunc->vkCmdPushConstants (bframe->bsp_cmd, bctx->layout,
 							   VK_SHADER_STAGE_VERTEX_BIT,
 							   0, 16 * sizeof (float), identity);
-	float frag_pc[8] = { };
+	fragconst_t frag_constants = { time: vr_data.realtime };
 	dfunc->vkCmdPushConstants (bframe->bsp_cmd, bctx->layout,
 							   VK_SHADER_STAGE_FRAGMENT_BIT,
-							   64, 8 * sizeof (float), &frag_pc);
+							   64, sizeof (fragconst_t), &frag_constants);
 	//XXX qfeglActiveTexture (GL_TEXTURE0 + 0);
 	for (size_t i = 0; i < bctx->texture_chains.size; i++) {
 		vulktex_t  *tex;
@@ -1234,10 +1232,10 @@ Vulkan_DrawSky (vulkan_ctx_t *ctx)
 	dfunc->vkCmdPushConstants (bframe->sky_cmd, bctx->layout,
 							   VK_SHADER_STAGE_VERTEX_BIT,
 							   0, 16 * sizeof (float), identity);
-	float frag_pc[8] = { };
+	fragconst_t frag_constants = { time: vr_data.realtime };
 	dfunc->vkCmdPushConstants (bframe->sky_cmd, bctx->layout,
 							   VK_SHADER_STAGE_FRAGMENT_BIT,
-							   64, 8 * sizeof (float), &frag_pc);
+							   64, sizeof (fragconst_t), &frag_constants);
 	for (is = bctx->sky_chain; is; is = is->tex_chain) {
 		surf = is->surface;
 		if (tex != surf->texinfo->texture->render) {
diff --git a/libs/video/renderer/vulkan/vulkan_texture.c b/libs/video/renderer/vulkan/vulkan_texture.c
index 86bd890ab..c1a4e28f0 100644
--- a/libs/video/renderer/vulkan/vulkan_texture.c
+++ b/libs/video/renderer/vulkan/vulkan_texture.c
@@ -89,7 +89,16 @@ void
 Vulkan_ExpandPalette (byte *dst, const byte *src, const byte *palette,
 					  int alpha, int count)
 {
-	if (alpha) {
+	if (alpha > 1) {
+		while (count-- > 0) {
+			int         pix = *src++;
+			const byte *col = palette + pix * 4;
+			*dst++ = *col++;
+			*dst++ = *col++;
+			*dst++ = *col++;
+			*dst++ = *col++;
+		}
+	} else if (alpha) {
 		while (count-- > 0) {
 			byte        pix = *src++;
 			const byte *col = palette + pix * 3;

From ada4f37b9d574d67e015b614d8149a68cf3a3395 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 24 Jan 2021 00:26:38 +0900
Subject: [PATCH 1366/1519] [vulkan] Fix the over-bright dynamic lights

I doubt they're anywhere near right, but they're much better. At least
they're not just solid blocks of white.
---
 libs/video/renderer/vulkan/vulkan_lightmap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/video/renderer/vulkan/vulkan_lightmap.c b/libs/video/renderer/vulkan/vulkan_lightmap.c
index 6c74ab802..0eeed8546 100644
--- a/libs/video/renderer/vulkan/vulkan_lightmap.c
+++ b/libs/video/renderer/vulkan/vulkan_lightmap.c
@@ -114,7 +114,7 @@ add_dynamic_lights (msurface_t *surf, float *block)
 				}
 				if (dist < minlight) {
 					float *out = block + (t * smax + s) * LUXEL_SIZE;
-					float l = (rad - dist) * 256;
+					float l = (rad - dist);
 					VectorMultAdd (out, l, light->color, out);
 					out[3] = 1;
 					out += LUXEL_SIZE;

From af5415010afeb1ed34f0a44f1ece1136e36c9c68 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 24 Jan 2021 00:54:26 +0900
Subject: [PATCH 1367/1519] [vulkan] Clamp the conback lines to the texture
 height

Fixes the bad background (with deadbeef scrap)
---
 libs/video/renderer/vulkan/vulkan_draw.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libs/video/renderer/vulkan/vulkan_draw.c b/libs/video/renderer/vulkan/vulkan_draw.c
index 6ec67b227..f4bf8c19e 100644
--- a/libs/video/renderer/vulkan/vulkan_draw.c
+++ b/libs/video/renderer/vulkan/vulkan_draw.c
@@ -613,6 +613,7 @@ Vulkan_Draw_ConsoleBackground (int lines, byte alpha, vulkan_ctx_t *ctx)
 	qpic_t     *cpic;
 	cpic = Vulkan_Draw_CachePic ("gfx/conback.lmp", false, ctx);
 	int         ofs = max (0, cpic->height - lines);
+	lines = min (lines, cpic->height);
 	draw_pic (0, 0, vid.conwidth, lines, cpic,
 			  0, ofs, cpic->width, lines, color, frame);
 }

From 7a19be7265f7396f26c3ecdcc198fff28fe52aaa Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 25 Jan 2021 00:54:41 +0900
Subject: [PATCH 1368/1519] [image] Change tex_t data from array to pointer

This makes tex_t more generally useable and probably more portable. The
goal was to be able to use tex_t with data that is in a separate chunk
of memory.
---
 include/QF/image.h                          | 2 +-
 libs/image/pcx.c                            | 6 ++++--
 libs/image/png.c                            | 6 ++++--
 libs/image/tga.c                            | 3 ++-
 libs/models/gl_skin.c                       | 6 ++++--
 libs/models/iqm/sw_model_iqm.c              | 8 ++++----
 libs/models/skin.c                          | 3 ++-
 libs/video/renderer/gl/gl_screen.c          | 6 ++++--
 libs/video/renderer/glsl/glsl_bsp.c         | 3 ++-
 libs/video/renderer/glsl/glsl_screen.c      | 3 ++-
 libs/video/renderer/r_dyn_textures.c        | 9 ++++++---
 libs/video/renderer/sw/screen.c             | 6 ++++--
 libs/video/renderer/sw32/screen.c           | 3 ++-
 libs/video/renderer/vulkan/vulkan_texture.c | 9 ++++++---
 14 files changed, 47 insertions(+), 26 deletions(-)

diff --git a/include/QF/image.h b/include/QF/image.h
index 62d57dd35..c7830c832 100644
--- a/include/QF/image.h
+++ b/include/QF/image.h
@@ -48,7 +48,7 @@ typedef struct tex_s {
 	QFFormat    format;
 	int         loaded;			// 0 if size info only, otherwise data loaded
 	byte       *palette;		// 0 = 32 bit, otherwise 8
-	byte        data[4];		// variable length
+	byte       *data;
 } tex_t;
 
 tex_t *LoadImage (const char *imageFile, int load);
diff --git a/libs/image/pcx.c b/libs/image/pcx.c
index 495b1b1d5..bfa4fc88d 100644
--- a/libs/image/pcx.c
+++ b/libs/image/pcx.c
@@ -93,11 +93,13 @@ LoadPCX (QFile *f, qboolean convert, byte *pal, int load)
 
 	count = load ? (pcx->xmax + 1) * (pcx->ymax + 1) : 0;
 	if (convert) {
-		tex = Hunk_TempAlloc (field_offset (tex_t, data[count * 3]));
+		tex = Hunk_TempAlloc (sizeof (tex_t) + count * 3);
+		tex->data = (byte *) (tex + 1);
 		tex->format = tex_rgb;
 		tex->palette = 0;
 	} else {
-		tex = Hunk_TempAlloc (field_offset (tex_t, data[count]));
+		tex = Hunk_TempAlloc (sizeof (tex_t) + count);
+		tex->data = (byte *) (tex + 1);
 		tex->format = tex_palette;
 		if (pal)
 			tex->palette = pal;
diff --git a/libs/image/png.c b/libs/image/png.c
index 9e81ca138..ddf9066a9 100644
--- a/libs/image/png.c
+++ b/libs/image/png.c
@@ -162,9 +162,11 @@ LoadPNG (QFile *infile, int load)
 
 		/* Allocate tex_t structure */
 		rowbytes = png_get_rowbytes(png_ptr, info_ptr);
-		tex = Hunk_TempAlloc (field_offset (tex_t, data[height * rowbytes]));
+		tex = Hunk_TempAlloc (sizeof (tex_t) + height * rowbytes);
+		tex->data = (byte *) (tex + 1);
 	} else {
-		tex = Hunk_TempAlloc (field_offset (tex_t, data[0]));
+		tex = Hunk_TempAlloc (sizeof (tex_t));
+		tex->data = 0;
 	}
 
 	tex->width = width;
diff --git a/libs/image/tga.c b/libs/image/tga.c
index 1a4dad133..1f72e2687 100644
--- a/libs/image/tga.c
+++ b/libs/image/tga.c
@@ -655,7 +655,8 @@ LoadTGA (QFile *fin, int load)
 	} else {
 		numPixels = 0;
 	}
-	tex = Hunk_TempAlloc (field_offset (tex_t, data[numPixels * 4]));
+	tex = Hunk_TempAlloc (sizeof (tex_t) + numPixels * 4);
+	tex->data = (byte *) (tex + 1);
 	tex->width = targa->width;
 	tex->height = targa->height;
 	tex->palette = 0;
diff --git a/libs/models/gl_skin.c b/libs/models/gl_skin.c
index 442def004..e88fbf2d6 100644
--- a/libs/models/gl_skin.c
+++ b/libs/models/gl_skin.c
@@ -72,7 +72,8 @@ do_fb_skin (glskin_t *s)
 {
 	int         size = s->tex->width * s->tex->height;
 
-	s->fb_tex = realloc (s->fb_tex, field_offset(tex_t, data[size]));
+	s->fb_tex = realloc (s->fb_tex, sizeof (tex_t) + size);
+	s->fb_tex->data = (byte *) (s->fb_tex + 1);
 	s->fb_tex->width = s->tex->width;
 	s->fb_tex->height = s->tex->height;
 	s->fb_tex->format = tex_palette;
@@ -87,7 +88,8 @@ gl_Skin_SetPlayerSkin (int width, int height, const byte *data)
 	glskin_t   *s;
 
 	s = &player_skin;
-	s->tex = realloc (s->tex, field_offset(tex_t, data[size]));
+	s->tex = realloc (s->tex, sizeof (tex_t) + size);
+	s->tex->data = (byte *) (s->tex + 1);
 	s->tex->width = width;
 	s->tex->height = height;
 	s->tex->format = tex_palette;
diff --git a/libs/models/iqm/sw_model_iqm.c b/libs/models/iqm/sw_model_iqm.c
index 582109a73..274a6f0a9 100644
--- a/libs/models/iqm/sw_model_iqm.c
+++ b/libs/models/iqm/sw_model_iqm.c
@@ -53,9 +53,8 @@
 #include "mod_internal.h"
 #include "r_internal.h"
 
-static tex_t null_texture = {
-	2, 2, tex_palette, 1, 0, {15, 15, 15, 15}
-};
+static byte null_data[] = {15, 15, 15, 15};
+static tex_t null_texture = { 2, 2, tex_palette, 1, 0, null_data };
 
 static void
 sw_iqm_clear (model_t *mod, void *data)
@@ -109,7 +108,8 @@ convert_tex (tex_t *tex)
 	int         i;
 
 	pixels = tex->width * tex->height;
-	new = malloc (field_offset (tex_t, data[pixels]));
+	new = malloc (sizeof (tex_t) + pixels);
+	new->data = (byte *) (new + 1);
 	new->width = tex->width;
 	new->height = tex->height;
 	new->format = tex_palette;
diff --git a/libs/models/skin.c b/libs/models/skin.c
index 5e1fe0d85..9897a4143 100644
--- a/libs/models/skin.c
+++ b/libs/models/skin.c
@@ -193,7 +193,8 @@ Skin_SetSkin (skin_t *skin, int cmap, const char *skinname)
 			tex = 0;
 			break;
 		}
-		out = malloc (field_offset (tex_t, data[PLAYER_WIDTH*PLAYER_HEIGHT]));
+		out = malloc (sizeof (tex_t) + PLAYER_WIDTH*PLAYER_HEIGHT);
+		out->data = (byte *) (out + 1);
 		out->width = PLAYER_WIDTH;
 		out->height = PLAYER_HEIGHT;
 		out->format = tex_palette;
diff --git a/libs/video/renderer/gl/gl_screen.c b/libs/video/renderer/gl/gl_screen.c
index 5758b5941..f8b0e6546 100644
--- a/libs/video/renderer/gl/gl_screen.c
+++ b/libs/video/renderer/gl/gl_screen.c
@@ -70,7 +70,8 @@ gl_SCR_CaptureBGR (void)
 	tex_t      *tex;
 
 	count = vid.width * vid.height;
-	tex = malloc (field_offset (tex_t, data[count * 3]));
+	tex = malloc (sizeof (tex_t) + count * 3);
+	tex->data = (byte *) (tex + 1);
 	SYS_CHECKMEM (tex);
 	tex->width = vid.width;
 	tex->height = vid.height;
@@ -100,7 +101,8 @@ gl_SCR_ScreenShot (int width, int height)
 	fracw = (float) vid.width / (float) w;
 	frach = (float) vid.height / (float) h;
 
-	tex = malloc (field_offset (tex_t, data[w * h]));
+	tex = malloc (sizeof (tex_t) + w * h);
+	tex->data = (byte *) (tex + 1);
 	if (!tex)
 		return 0;
 
diff --git a/libs/video/renderer/glsl/glsl_bsp.c b/libs/video/renderer/glsl/glsl_bsp.c
index 409450901..144f8094c 100644
--- a/libs/video/renderer/glsl/glsl_bsp.c
+++ b/libs/video/renderer/glsl/glsl_bsp.c
@@ -1409,7 +1409,8 @@ glsl_R_LoadSkys (const char *sky)
 		int         size = tex->height / 2;
 
 		skybox_loaded = true;
-		sub = malloc (field_offset (tex_t, data[size * size * tex->format]));
+		sub = malloc (sizeof (tex_t) + size * size * tex->format);
+		sub->data = (byte *) (sub + 1);
 		sub->width = size;
 		sub->height = size;
 		sub->format = tex->format;
diff --git a/libs/video/renderer/glsl/glsl_screen.c b/libs/video/renderer/glsl/glsl_screen.c
index 098f6a816..a19d3205a 100644
--- a/libs/video/renderer/glsl/glsl_screen.c
+++ b/libs/video/renderer/glsl/glsl_screen.c
@@ -201,7 +201,8 @@ glsl_SCR_CaptureBGR (void)
 	tex_t      *tex;
 
 	count = vid.width * vid.height;
-	tex = malloc (field_offset (tex_t, data[count * 3]));
+	tex = malloc (sizeof (tex_t) + count * 3);
+	tex->data = (byte *) (tex + 1);
 	SYS_CHECKMEM (tex);
 	tex->width = vid.width;
 	tex->height = vid.height;
diff --git a/libs/video/renderer/r_dyn_textures.c b/libs/video/renderer/r_dyn_textures.c
index 167027fad..67b0862c6 100644
--- a/libs/video/renderer/r_dyn_textures.c
+++ b/libs/video/renderer/r_dyn_textures.c
@@ -50,7 +50,8 @@ R_DotParticleTexture (void)
 	int         x, y, dx2, dy, d;
 	tex_t      *tex;
 
-	tex = malloc (field_offset (tex_t, data[sizeof (*data)]));
+	tex = malloc (sizeof (tex_t) + sizeof (*data));
+	tex->data = (byte *) (tex + 1);
 	tex->width = 32;
 	tex->height = 32;
 	tex->format = tex_la;
@@ -79,7 +80,8 @@ R_SparkParticleTexture (void)
 	int         x, y, dx2, dy, d;
 	tex_t      *tex;
 
-	tex = malloc (field_offset (tex_t, data[sizeof (*data)]));
+	tex = malloc (sizeof (tex_t) + sizeof (*data));
+	tex->data = (byte*) (tex + 1);
 	tex->width = 32;
 	tex->height = 32;
 	tex->format = tex_la;
@@ -113,7 +115,8 @@ R_SmokeParticleTexture (void)
 	int         x, y, c;
 	tex_t      *tex;
 
-	tex = malloc (field_offset (tex_t, data[sizeof (*data)]));
+	tex = malloc (sizeof (tex_t) + sizeof (*data));
+	tex->data = (byte *) (tex + 1);
 	tex->width = 32;
 	tex->height = 32;
 	tex->format = tex_la;
diff --git a/libs/video/renderer/sw/screen.c b/libs/video/renderer/sw/screen.c
index 4ab9302c1..125d8648f 100644
--- a/libs/video/renderer/sw/screen.c
+++ b/libs/video/renderer/sw/screen.c
@@ -64,7 +64,8 @@ SCR_CaptureBGR (void)
 	byte       *dst;
 
 	count = vid.width * vid.height;
-	tex = malloc (field_offset (tex_t, data[count * 3]));
+	tex = malloc (sizeof (tex_t) + count * 3);
+	tex->data = (byte *) (tex + 1);
 	SYS_CHECKMEM (tex);
 	tex->width = vid.width;
 	tex->height = vid.height;
@@ -102,7 +103,8 @@ SCR_ScreenShot (int width, int height)
 	fracw = (float) vid.width / (float) w;
 	frach = (float) vid.height / (float) h;
 
-	tex = malloc (field_offset (tex_t, data[w * h]));
+	tex = malloc (sizeof (tex_t) + w * h);
+	tex->data = (byte *) (tex + 1);
 	if (!tex)
 		return 0;
 
diff --git a/libs/video/renderer/sw32/screen.c b/libs/video/renderer/sw32/screen.c
index 543c8602a..ce84cb08c 100644
--- a/libs/video/renderer/sw32/screen.c
+++ b/libs/video/renderer/sw32/screen.c
@@ -67,7 +67,8 @@ sw32_SCR_CaptureBGR (void)
 	byte       *dst;
 
 	count = vid.width * vid.height;
-	tex = malloc (field_offset (tex_t, data[count * 3]));
+	tex = malloc (sizeof (tex_t) + count * 3);
+	tex->data = (byte *) (tex + 1);
 	SYS_CHECKMEM (tex);
 	tex->width = vid.width;
 	tex->height = vid.height;
diff --git a/libs/video/renderer/vulkan/vulkan_texture.c b/libs/video/renderer/vulkan/vulkan_texture.c
index c1a4e28f0..07bcc7f0a 100644
--- a/libs/video/renderer/vulkan/vulkan_texture.c
+++ b/libs/video/renderer/vulkan/vulkan_texture.c
@@ -282,9 +282,12 @@ Vulkan_UnloadTex (vulkan_ctx_t *ctx, qfv_tex_t *tex)
 	free (tex);
 }
 
-static tex_t default_black_tex = {1, 1, tex_rgba, 1, 0, {0, 0, 0, 0 }};
-static tex_t default_white_tex = {1, 1, tex_rgba, 1, 0, {255, 255, 255, 255 }};
-static tex_t default_magenta_tex = {1, 1, tex_rgba, 1, 0, {255, 0, 255, 255 }};
+static byte black_data[] = {0, 0, 0, 0};
+static byte white_data[] = {255, 255, 255, 255};
+static byte magenta_data[] = {255, 0, 255, 255};
+static tex_t default_black_tex = {1, 1, tex_rgba, 1, 0, black_data};
+static tex_t default_white_tex = {1, 1, tex_rgba, 1, 0, white_data};
+static tex_t default_magenta_tex = {1, 1, tex_rgba, 1, 0, magenta_data};
 
 void
 Vulkan_Texture_Init (vulkan_ctx_t *ctx)

From d8b81e86787ec19a6d4dc1e92cecb5fb5768fbea Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 25 Jan 2021 13:31:41 +0900
Subject: [PATCH 1369/1519] [models] Remove MAXALIASFRAMES

The dynamic array macros made this much easier than last time I looked
at it, especially when it came to figuring out the bad memory accesses
that I seem to remember from my last attempt 9 years ago.
---
 include/QF/model.h                   | 11 +++++----
 libs/models/alias/gl_mesh.c          | 32 ++++++++++++-------------
 libs/models/alias/glsl_model_alias.c |  6 ++---
 libs/models/alias/model_alias.c      | 36 ++++++++++------------------
 libs/models/alias/sw_model_alias.c   | 12 +++++-----
 5 files changed, 44 insertions(+), 53 deletions(-)

diff --git a/include/QF/model.h b/include/QF/model.h
index 8d0129721..703d11227 100644
--- a/include/QF/model.h
+++ b/include/QF/model.h
@@ -28,6 +28,7 @@
 #ifndef __QF_model_h
 #define __QF_model_h
 
+#include "QF/darray.h"
 #include "QF/qtypes.h"
 #include "QF/bspfile.h"
 #include "QF/spritegn.h"
@@ -320,11 +321,13 @@ typedef struct {
 	maliasframedesc_t	frames[1];
 } aliashdr_t;
 
-#define	MAXALIASFRAMES	256
+typedef struct stvertset_s DARRAY_TYPE (stvert_t) stvertset_t;
+typedef struct mtriangleset_s DARRAY_TYPE (mtriangle_t) mtriangleset_t;
+typedef struct trivertxset_s DARRAY_TYPE (trivertx_t *) trivertxset_t;
 extern	aliashdr_t	*pheader;
-extern	stvert_t	*stverts;
-extern	mtriangle_t	*triangles;
-extern	trivertx_t	*poseverts[MAXALIASFRAMES];
+extern	stvertset_t	 stverts;
+extern	mtriangleset_t triangles;
+extern	trivertxset_t poseverts;
 extern  int			 aliasbboxmins[3];
 extern  int			 aliasbboxmaxs[3];
 
diff --git a/libs/models/alias/gl_mesh.c b/libs/models/alias/gl_mesh.c
index 22498ddea..c55225057 100644
--- a/libs/models/alias/gl_mesh.c
+++ b/libs/models/alias/gl_mesh.c
@@ -133,7 +133,7 @@ StripLength (int starttri, int startv)
 
 	used[starttri] = 2;
 
-	last = &triangles[starttri];
+	last = &triangles.a[starttri];
 
 	stripcount = 0;
 	add_strip (last->vertindex[(startv) % 3], starttri);
@@ -145,7 +145,7 @@ StripLength (int starttri, int startv)
 
 	// look for a matching triangle
 nexttri:
-	for (j = starttri + 1, check = &triangles[starttri + 1];
+	for (j = starttri + 1, check = &triangles.a[starttri + 1];
 		 j < pheader->mdl.numtris; j++, check++) {
 		if (check->facesfront != last->facesfront)
 			continue;
@@ -191,7 +191,7 @@ FanLength (int starttri, int startv)
 
 	used[starttri] = 2;
 
-	last = &triangles[starttri];
+	last = &triangles.a[starttri];
 
 	stripcount = 0;
 	add_strip (last->vertindex[(startv) % 3], starttri);
@@ -204,7 +204,7 @@ FanLength (int starttri, int startv)
 
 	// look for a matching triangle
   nexttri:
-	for (j = starttri + 1, check = &triangles[starttri + 1];
+	for (j = starttri + 1, check = &triangles.a[starttri + 1];
 		 j < pheader->mdl.numtris; j++, check++) {
 		if (check->facesfront != last->facesfront)
 			continue;
@@ -304,9 +304,9 @@ BuildTris (void)
 			add_vertex (k);
 
 			// emit s/t coords into the commands stream
-			s = stverts[k].s;
-			t = stverts[k].t;
-			if (!triangles[besttris[0]].facesfront && stverts[k].onseam)
+			s = stverts.a[k].s;
+			t = stverts.a[k].t;
+			if (!triangles.a[besttris[0]].facesfront && stverts.a[k].onseam)
 				s += pheader->mdl.skinwidth / 2;	// on back side
 			s = (s + 0.5) / pheader->mdl.skinwidth;
 			t = (t + 0.5) / pheader->mdl.skinheight;
@@ -485,9 +485,9 @@ gl_Mod_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr, void *_m,
 
 		numorder = 0;
 		for (i=0; i < pheader->mdl.numtris; i++) {
-			add_vertex(triangles[i].vertindex[0]);
-			add_vertex(triangles[i].vertindex[1]);
-			add_vertex(triangles[i].vertindex[2]);
+			add_vertex(triangles.a[i].vertindex[0]);
+			add_vertex(triangles.a[i].vertindex[1]);
+			add_vertex(triangles.a[i].vertindex[2]);
 		}
 		paliashdr->poseverts = numorder;
 
@@ -497,9 +497,9 @@ gl_Mod_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr, void *_m,
 			float s, t;
 			int k;
 			k = vertexorder[i];
-			s = stverts[k].s;
-			t = stverts[k].t;
-			if (!triangles[i/3].facesfront && stverts[k].onseam)
+			s = stverts.a[k].s;
+			t = stverts.a[k].t;
+			if (!triangles.a[i/3].facesfront && stverts.a[k].onseam)
 				s += pheader->mdl.skinwidth / 2;	// on back side
 			s = (s + 0.5) / pheader->mdl.skinwidth;
 			t = (t + 0.5) / pheader->mdl.skinheight;
@@ -514,7 +514,7 @@ gl_Mod_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr, void *_m,
 							* sizeof (trivertx16_t));
 		paliashdr->posedata = (byte *) verts - (byte *) paliashdr;
 		for (i = 0; i < paliashdr->numposes; i++) {
-			trivertx_t *pv = poseverts[i];
+			trivertx_t *pv = poseverts.a[i];
 			for (j = 0; j < numorder; j++) {
 				trivertx16_t v;
 				// convert MD16's split coordinates into something a little
@@ -526,7 +526,7 @@ gl_Mod_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr, void *_m,
 				VectorMultAdd (pv[vertexorder[j] + hdr->mdl.numverts].v,
 							   256, pv[vertexorder[j]].v, v.v);
 				v.lightnormalindex =
-					poseverts[i][vertexorder[j]].lightnormalindex;
+					poseverts.a[i][vertexorder[j]].lightnormalindex;
 				*verts++ = v;
 			}
 		}
@@ -537,7 +537,7 @@ gl_Mod_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr, void *_m,
 		paliashdr->posedata = (byte *) verts - (byte *) paliashdr;
 		for (i = 0; i < paliashdr->numposes; i++) {
 			for (j = 0; j < numorder; j++)
-				*verts++ = poseverts[i][vertexorder[j]];
+				*verts++ = poseverts.a[i][vertexorder[j]];
 		}
 	}
 	dstring_delete (cache);
diff --git a/libs/models/alias/glsl_model_alias.c b/libs/models/alias/glsl_model_alias.c
index 215c9d400..cb612e962 100644
--- a/libs/models/alias/glsl_model_alias.c
+++ b/libs/models/alias/glsl_model_alias.c
@@ -147,7 +147,7 @@ glsl_Mod_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr, void *_m,
 
 	// copy triangles before editing them
 	tris = malloc (numtris * sizeof (mtriangle_t));
-	memcpy (tris, triangles, numtris * sizeof (mtriangle_t));
+	memcpy (tris, triangles.a, numtris * sizeof (mtriangle_t));
 
 	// initialize indexmap to -1 (unduplicated). any other value indicates
 	// both that the vertex has been duplicated and the index of the
@@ -157,7 +157,7 @@ glsl_Mod_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr, void *_m,
 
 	// copy stverts. need space for duplicates
 	st = malloc (2 * numverts * sizeof (stvert_t));
-	memcpy (st, stverts, numverts * sizeof (stvert_t));
+	memcpy (st, stverts.a, numverts * sizeof (stvert_t));
 
 	// check for onseam verts, and duplicate any that are associated with
 	// back-facing triangles. the s coordinate is shifted right by half
@@ -182,7 +182,7 @@ glsl_Mod_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr, void *_m,
 	verts = malloc (vertexsize);
 	for (i = 0, pose = 0; i < hdr->numposes; i++, pose += numverts) {
 		for (j = 0; j < hdr->mdl.numverts; j++) {
-			pv = &poseverts[i][j];
+			pv = &poseverts.a[i][j];
 			if (extra) {
 				VectorMultAdd (pv[hdr->mdl.numverts].v, 256, pv->v,
 							   verts[pose + j].vertex);
diff --git a/libs/models/alias/model_alias.c b/libs/models/alias/model_alias.c
index 8a4784b2d..c5018f929 100644
--- a/libs/models/alias/model_alias.c
+++ b/libs/models/alias/model_alias.c
@@ -51,14 +51,12 @@
 
 aliashdr_t *pheader;
 
-stvert_t    *stverts;
-mtriangle_t *triangles;
-int stverts_size = 0;
-int triangles_size = 0;
+stvertset_t stverts = { 0, 0, 256 };
+mtriangleset_t triangles = { 0, 0, 256 };
 
 // a pose is a single set of vertexes.  a frame may be an animating
 // sequence of poses
-trivertx_t *poseverts[MAXALIASFRAMES];
+trivertxset_t poseverts = { 0, 0, 256 };;
 int         posenum = 0;
 int			aliasbboxmins[3], aliasbboxmaxs[3];
 
@@ -151,7 +149,7 @@ Mod_LoadAliasFrame (void *pin, int *posenum, maliasframedesc_t *frame,
 
 	pinframe = (trivertx_t *) (pdaliasframe + 1);
 
-	poseverts[(*posenum)] = pinframe;
+	DARRAY_APPEND (&poseverts, pinframe);
 	(*posenum)++;
 
 	pinframe += pheader->mdl.numverts;
@@ -264,30 +262,20 @@ Mod_LoadAliasModel (model_t *mod, void *buffer, cache_allocator_t allocator)
 		Sys_Error ("model %s has a skin taller than %d", mod->name,
 				   MAX_LBM_HEIGHT);
 
+	DARRAY_RESIZE (&poseverts, 0);
 	pmodel->numverts = LittleLong (pinmodel->numverts);
 
 	if (pmodel->numverts <= 0)
 		Sys_Error ("model %s has no vertices", mod->name);
 
-	if (pmodel->numverts > stverts_size) {
-		stverts = realloc (stverts, pmodel->numverts * sizeof (stvert_t));
-		if (!stverts)
-			Sys_Error ("model_alias: out of memory");
-		stverts_size = pmodel->numverts;
-	}
+	DARRAY_RESIZE (&stverts, pmodel->numverts);
 
 	pmodel->numtris = LittleLong (pinmodel->numtris);
 
 	if (pmodel->numtris <= 0)
 		Sys_Error ("model %s has no triangles", mod->name);
 
-	if (pmodel->numtris > triangles_size) {
-		triangles = realloc (triangles,
-							 pmodel->numtris * sizeof (mtriangle_t));
-		if (!triangles)
-			Sys_Error ("model_alias: out of memory");
-		triangles_size = pmodel->numtris;
-	}
+	DARRAY_RESIZE (&triangles, pmodel->numtris);
 
 	pmodel->numframes = LittleLong (pinmodel->numframes);
 	numframes = pmodel->numframes;
@@ -313,19 +301,19 @@ Mod_LoadAliasModel (model_t *mod, void *buffer, cache_allocator_t allocator)
 	pinstverts = (stvert_t *) pskintype;
 
 	for (i = 0; i < pheader->mdl.numverts; i++) {
-		stverts[i].onseam = LittleLong (pinstverts[i].onseam);
-		stverts[i].s = LittleLong (pinstverts[i].s);
-		stverts[i].t = LittleLong (pinstverts[i].t);
+		stverts.a[i].onseam = LittleLong (pinstverts[i].onseam);
+		stverts.a[i].s = LittleLong (pinstverts[i].s);
+		stverts.a[i].t = LittleLong (pinstverts[i].t);
 	}
 
 	// load triangle lists
 	pintriangles = (dtriangle_t *) &pinstverts[pheader->mdl.numverts];
 
 	for (i = 0; i < pheader->mdl.numtris; i++) {
-		triangles[i].facesfront = LittleLong (pintriangles[i].facesfront);
+		triangles.a[i].facesfront = LittleLong (pintriangles[i].facesfront);
 
 		for (j = 0; j < 3; j++) {
-			triangles[i].vertindex[j] =
+			triangles.a[i].vertindex[j] =
 				LittleLong (pintriangles[i].vertindex[j]);
 		}
 	}
diff --git a/libs/models/alias/sw_model_alias.c b/libs/models/alias/sw_model_alias.c
index b252ad474..e021278a4 100644
--- a/libs/models/alias/sw_model_alias.c
+++ b/libs/models/alias/sw_model_alias.c
@@ -79,7 +79,7 @@ process_frame (maliasframedesc_t *frame, int posenum, int extra)
 	// from the high-order bits (see R_AliasTransformFinalVert16 in
 	// sw_ralias.c), but in adjacant arrays. This means we can get away with
 	// just one memcpy as there are no endian issues.
-	memcpy (frame_verts, poseverts[posenum], size);
+	memcpy (frame_verts, poseverts.a[posenum], size);
 }
 
 void
@@ -101,14 +101,14 @@ sw_Mod_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr, void *_m,
 	hdr->triangles = (byte *) ptri - (byte *) hdr;
 
 	for (i = 0; i < numv; i++) {
-		pstverts[i].onseam = stverts[i].onseam;
-		pstverts[i].s = stverts[i].s << 16;
-		pstverts[i].t = stverts[i].t << 16;
+		pstverts[i].onseam = stverts.a[i].onseam;
+		pstverts[i].s = stverts.a[i].s << 16;
+		pstverts[i].t = stverts.a[i].t << 16;
 	}
 
 	for (i = 0; i < numt; i++) {
-		ptri[i].facesfront = triangles[i].facesfront;
-		VectorCopy (triangles[i].vertindex, ptri[i].vertindex);
+		ptri[i].facesfront = triangles.a[i].facesfront;
+		VectorCopy (triangles.a[i].vertindex, ptri[i].vertindex);
 	}
 
 	for (i = 0; i < pheader->mdl.numframes; i++) {

From 3bbe33844ae76876aa7026be05566a8d365ef130 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 26 Jan 2021 00:39:34 +0900
Subject: [PATCH 1370/1519] [util] Add component-wise vector mult-add/sub
 macros

---
 include/QF/math/vector.h | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/include/QF/math/vector.h b/include/QF/math/vector.h
index 993cbaf08..630332907 100644
--- a/include/QF/math/vector.h
+++ b/include/QF/math/vector.h
@@ -74,6 +74,18 @@ extern const vec_t *const vec3_origin;
 		(c)[1] = (a)[1] - (s) * (b)[1]; \
 		(c)[2] = (a)[2] - (s) * (b)[2]; \
 	} while (0)
+#define VectorCompMultAdd(a,b,c,d) \
+	do { \
+		(d)[0] = (a)[0] + (b)[0] * (c)[0]; \
+		(d)[1] = (a)[1] + (b)[1] * (c)[1]; \
+		(d)[2] = (a)[2] + (b)[2] * (c)[2]; \
+	} while (0)
+#define VectorCompMultSub(a,b,c,d) \
+	do { \
+		(d)[0] = (a)[0] - (b)[0] * (c)[0]; \
+		(d)[1] = (a)[1] - (b)[1] * (c)[1]; \
+		(d)[2] = (a)[2] - (b)[2] * (c)[2]; \
+	} while (0)
 #define VectorLength(a) sqrt(DotProduct(a, a))
 
 #define VectorScale(a,b,c) \

From 57968249feb6ec0c8394148d75272909e54e967e Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 26 Jan 2021 00:55:45 +0900
Subject: [PATCH 1371/1519] [vulkan] Start work on the alias pipeline

---
 include/QF/Vulkan/qf_alias.h                |  84 ++++++
 include/QF/model.h                          |  13 +-
 libs/models/alias/vulkan_model_alias.c      | 291 ++++++++++++++++++++
 libs/video/renderer/Makemodule.am           |  10 +
 libs/video/renderer/vid_render_vulkan.c     |   6 +-
 libs/video/renderer/vulkan/alias.frag       |  55 ++++
 libs/video/renderer/vulkan/alias.vert       |  38 +++
 libs/video/renderer/vulkan/qfpipeline.plist | 201 +++++++++++++-
 libs/video/renderer/vulkan/shader.c         |   6 +
 libs/video/renderer/vulkan/vulkan_bsp.c     |   9 +-
 10 files changed, 695 insertions(+), 18 deletions(-)
 create mode 100644 include/QF/Vulkan/qf_alias.h
 create mode 100644 libs/video/renderer/vulkan/alias.frag
 create mode 100644 libs/video/renderer/vulkan/alias.vert

diff --git a/include/QF/Vulkan/qf_alias.h b/include/QF/Vulkan/qf_alias.h
new file mode 100644
index 000000000..efe3dd0dc
--- /dev/null
+++ b/include/QF/Vulkan/qf_alias.h
@@ -0,0 +1,84 @@
+/*
+	qf_alias.h
+
+	Vulkan specific brush model stuff
+
+	Copyright (C) 2012 Bill Currie <bill@taniwha.org>
+	Copyright (C) 2021 Bill Currie <bill@taniwha.org>
+
+	Author: Bill Currie <bill@taniwha.org>
+	Date: 2012/1/7
+	Date: 2021/1/18
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifndef __QF_Vulkan_qf_alias_h
+#define __QF_Vulkan_qf_alias_h
+
+#include "QF/darray.h"
+#include "QF/model.h"
+#include "QF/modelgen.h"
+#include "QF/Vulkan/qf_vid.h"
+
+typedef struct aliasvrt_s {
+	float       vertex[4];
+	float       normal[4];
+} aliasvrt_t;
+
+typedef struct aliasuv_s {
+	float       u, v;
+} aliasuv_t;
+
+typedef struct qfv_alias_mesh_s {
+	VkBuffer    vertex_buffer;
+	VkBuffer    uv_buffer;
+	VkBuffer    index_buffer;
+	VkDeviceMemory memory;
+} qfv_alias_mesh_t;
+
+typedef struct qfv_light_s {
+	vec3_t      color;
+	float       dist;
+	vec3_t      position;
+	int         type;
+	vec3_t      direction;
+	float       cone;
+} qfv_light_t;
+
+typedef struct qfv_light_buffer_s {
+	int         light_count;
+	qfv_light_t lights[] __attribute__((aligned(16)));
+} qfv_light_buffer_t;
+
+typedef struct alias_ctx_s {
+} alias_ctx_t;
+
+struct vulkan_ctx_s;
+void *Vulkan_Mod_LoadSkin (byte *skin, int skinsize, int snum, int gnum,
+		                   qboolean group, maliasskindesc_t *skindesc,
+						   struct vulkan_ctx_s *ctx);
+void Vulkan_Mod_FinalizeAliasModel (model_t *m, aliashdr_t *hdr,
+									struct vulkan_ctx_s *ctx);
+void Vulkan_Mod_LoadExternalSkins (model_t *mod, struct vulkan_ctx_s *ctx);
+void Vulkan_Mod_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr,
+											void *_m, int _s, int extra,
+											struct vulkan_ctx_s *ctx);
+
+#endif//__QF_Vulkan_qf_alias_h
diff --git a/include/QF/model.h b/include/QF/model.h
index 703d11227..d1129bfce 100644
--- a/include/QF/model.h
+++ b/include/QF/model.h
@@ -277,10 +277,15 @@ typedef struct {
 } maliasframedesc_t;
 
 typedef struct {
-	aliasskintype_t		type;
-	int					skin;
-	int					texnum;
-	int					fb_texnum;
+	aliasskintype_t type;
+	int            skin;
+	union {
+		struct {
+			int     texnum;
+			int     fb_texnum;
+		};
+		void       *tex;
+	};
 } maliasskindesc_t;
 
 typedef struct {
diff --git a/libs/models/alias/vulkan_model_alias.c b/libs/models/alias/vulkan_model_alias.c
index e69de29bb..97801febc 100644
--- a/libs/models/alias/vulkan_model_alias.c
+++ b/libs/models/alias/vulkan_model_alias.c
@@ -0,0 +1,291 @@
+/*
+	vulkan_model_alais.c
+
+	Alias model processing for Vulkan
+
+	Copyright (C) 2021 Bill Currie <bill@taniwha.org>
+
+	Author: Bill Currie <bill@taniwha.org>
+	Date: 2021/1/24
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+
+#include <stdlib.h>
+
+#include "QF/va.h"
+
+#include "QF/modelgen.h"
+#include "QF/vid.h"
+#include "QF/Vulkan/qf_alias.h"
+#include "QF/Vulkan/qf_texture.h"
+#include "QF/Vulkan/buffer.h"
+#include "QF/Vulkan/device.h"
+#include "QF/Vulkan/instance.h"
+#include "QF/Vulkan/staging.h"
+
+#include "mod_internal.h"
+#include "r_internal.h"
+#include "vid_vulkan.h"
+
+static vec3_t vertex_normals[NUMVERTEXNORMALS] = {
+#include "anorms.h"
+};
+
+static void
+vulkan_alias_clear (model_t *m, void *data)
+{
+}
+
+void *
+Vulkan_Mod_LoadSkin (byte *skin, int skinsize, int snum, int gnum,
+				     qboolean group, maliasskindesc_t *skindesc,
+					 vulkan_ctx_t *ctx)
+{
+	byte       *tskin;
+	int         w, h;
+
+	w = pheader->mdl.skinwidth;
+	h = pheader->mdl.skinheight;
+	tskin = malloc (skinsize);
+	memcpy (tskin, skin, skinsize);
+	Mod_FloodFillSkin (tskin, w, h);
+	tex_t skin_tex = {w, h, tex_palette, 1, vid.palette, tskin};
+	skindesc->tex = Vulkan_LoadTex (ctx, &skin_tex, 1);
+	free (tskin);
+	return skin + skinsize;
+}
+
+void
+Vulkan_Mod_FinalizeAliasModel (model_t *m, aliashdr_t *hdr, vulkan_ctx_t *ctx)
+{
+	if (hdr->mdl.ident == HEADER_MDL16)
+		VectorScale (hdr->mdl.scale, 1/256.0, hdr->mdl.scale);
+	m->clear = vulkan_alias_clear;
+}
+
+void
+Vulkan_Mod_LoadExternalSkins (model_t *mod, vulkan_ctx_t *ctx)
+{
+}
+
+void
+Vulkan_Mod_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr, void *_m,
+									   int _s, int extra, vulkan_ctx_t *ctx)
+{
+	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+	aliasvrt_t *verts;
+	aliasuv_t  *uv;
+	trivertx_t *pv;
+	int        *indexmap;
+	uint32_t   *indices;
+	int         numverts;
+	int         numtris;
+	int         i, j;
+	int         pose;
+	vec3_t      pos;
+
+	numverts = hdr->mdl.numverts;
+	numtris = hdr->mdl.numtris;
+
+	// initialize indexmap to -1 (unduplicated). any other value indicates
+	// both that the vertex has been duplicated and the index of the
+	// duplicate vertex.
+	indexmap = malloc (numverts * sizeof (int));
+	memset (indexmap, -1, numverts * sizeof (int));
+
+	// check for onseam verts, and duplicate any that are associated with
+	// back-facing triangles
+	for (i = 0; i < numtris; i++) {
+		for (j = 0; j < 3; j++) {
+			int         vind = triangles.a[i].vertindex[j];
+			if (stverts.a[vind].onseam && !triangles.a[i].facesfront) {
+				// duplicate the vertex if it has not alreaddy been
+				// duplicated
+				if (indexmap[vind] == -1) {
+					indexmap[vind] = numverts++;
+				}
+			}
+		}
+	}
+
+	// we now know exactly how many vertices we need, so built the vertex
+	// and index data arrays
+	// The layout is:
+	//    vbuf:{vertex, normal} * (numposes * numverts)
+	//    uvbuf:{uv} * (numverts)
+	//    ibuf:{index} * (numtris * 3)
+	// numverts includes the duplicated seam vertices.
+	// The vertex buffer will be bound with various offsets based on the
+	// current and previous pose, uvbuff "statically" bound as uvs are not
+	// animated by pose, and the same for ibuf: indices will never change for
+	// the mesh
+	size_t      atom = device->physDev->properties.limits.nonCoherentAtomSize;
+	size_t      atom_mask = atom - 1;
+	size_t      vert_count = numverts * hdr->numposes;
+	size_t      vert_size = vert_count * sizeof (aliasvrt_t);
+	size_t      uv_size = numverts * sizeof (aliasuv_t);
+	size_t      ind_size = numverts * sizeof (uint32_t);
+	vert_size = (vert_size + atom_mask) & ~atom_mask;
+	uv_size = (uv_size + atom_mask) & ~atom_mask;
+	ind_size = (ind_size + atom_mask) & ~atom_mask;
+	size_t      buff_size = vert_size + ind_size + uv_size;
+
+	VkBuffer    vbuff = QFV_CreateBuffer (device, buff_size,
+										  VK_BUFFER_USAGE_TRANSFER_DST_BIT
+										  | VK_BUFFER_USAGE_VERTEX_BUFFER_BIT);
+	VkBuffer    uvbuff = QFV_CreateBuffer (device, buff_size,
+										   VK_BUFFER_USAGE_TRANSFER_DST_BIT
+										   | VK_BUFFER_USAGE_VERTEX_BUFFER_BIT);
+	VkBuffer    ibuff = QFV_CreateBuffer (device, buff_size,
+										  VK_BUFFER_USAGE_TRANSFER_DST_BIT
+										  | VK_BUFFER_USAGE_INDEX_BUFFER_BIT);
+	VkDeviceMemory mem;
+	mem = QFV_AllocBufferMemory (device, vbuff,
+								 VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT,
+								 buff_size, 0);
+	QFV_BindBufferMemory (device, vbuff, mem, 0);
+	QFV_BindBufferMemory (device, uvbuff, mem, vert_size);
+	QFV_BindBufferMemory (device, ibuff, mem, vert_size + uv_size);
+
+	qfv_stagebuf_t *stage = QFV_CreateStagingBuffer (device, buff_size,
+													  ctx->cmdpool);
+	qfv_packet_t *packet = QFV_PacketAcquire (stage);
+	verts = QFV_PacketExtend (packet, vert_size);
+	uv = QFV_PacketExtend (packet, uv_size);
+	indices = QFV_PacketExtend (packet, ind_size);
+
+	// populate the uvs, duplicating and shifting any that are on the seam
+	// and associated with back-facing triangles (marked by non-negative
+	// indexmap entry).
+	// the s coordinate is shifted right by half the skin width.
+	for (i = 0; i < hdr->mdl.numverts; i++) {
+		int         vind = indexmap[i];
+		uv[i].u = (float) stverts.a[i].s / hdr->mdl.skinwidth;
+		uv[i].v = (float) stverts.a[i].t / hdr->mdl.skinheight;
+		if (vind != -1) {
+			uv[vind] = uv[i];
+			uv[vind].u += 0.5;
+		}
+	}
+
+	// poputlate the vertex position and normal data, duplicating for
+	// back-facing on-seam verts (indicated by non-negative indexmap entry)
+	for (i = 0, pose = 0; i < hdr->numposes; i++, pose += numverts) {
+		for (j = 0; j < hdr->mdl.numverts; j++) {
+			pv = &poseverts.a[i][j];
+			if (extra) {
+				VectorMultAdd (pv[hdr->mdl.numverts].v, 256, pv->v, pos);
+			} else {
+				VectorCopy (pv->v, pos);
+			}
+			VectorCompMultAdd (hdr->mdl.scale_origin, hdr->mdl.scale,
+							   pos, verts[pose + j].vertex);
+			VectorCopy (vertex_normals[pv->lightnormalindex],
+						verts[pose + j].normal);
+			// duplicate on-seam vert associated with back-facing triangle
+			if (indexmap[j] != -1) {
+				verts[pose + indexmap[j]] = verts[pose + j];
+			}
+		}
+	}
+
+	// now build the indices for DrawElements
+	for (i = 0; i < numverts; i++) {
+		indexmap[i] = indexmap[i] != -1 ? indexmap[i] : i;
+	}
+	for (i = 0; i < numtris; i++) {
+		for (j = 0; j < 3; j++) {
+			indices[3 * i + j] = indexmap[triangles.a[i].vertindex[j]];
+		}
+	}
+	// finished with indexmap
+	free (indexmap);
+
+	hdr->poseverts = numverts;
+
+	VkBufferMemoryBarrier wr_barriers[] = {
+		{	VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER, 0,
+			0, VK_ACCESS_TRANSFER_WRITE_BIT,
+			VK_QUEUE_FAMILY_IGNORED, VK_QUEUE_FAMILY_IGNORED,
+			vbuff, 0, vert_size},
+		{	VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER, 0,
+			0, VK_ACCESS_TRANSFER_WRITE_BIT,
+			VK_QUEUE_FAMILY_IGNORED, VK_QUEUE_FAMILY_IGNORED,
+			uvbuff, 0, uv_size},
+		{	VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER, 0,
+			0, VK_ACCESS_TRANSFER_WRITE_BIT,
+			VK_QUEUE_FAMILY_IGNORED, VK_QUEUE_FAMILY_IGNORED,
+			ibuff, 0, ind_size},
+	};
+	dfunc->vkCmdPipelineBarrier (packet->cmd,
+								 VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT,
+								 VK_PIPELINE_STAGE_TRANSFER_BIT,
+								 0, 0, 0, 3, wr_barriers, 0, 0);
+	VkBufferCopy copy_region[] = {
+		{ packet->offset, 0, vert_size },
+		{ packet->offset + vert_size, 0, uv_size },
+		{ packet->offset + vert_size + uv_size, 0, ind_size },
+	};
+	dfunc->vkCmdCopyBuffer (packet->cmd, stage->buffer,
+							vbuff, 1, &copy_region[0]);
+	dfunc->vkCmdCopyBuffer (packet->cmd, stage->buffer,
+							uvbuff, 1, &copy_region[1]);
+	dfunc->vkCmdCopyBuffer (packet->cmd, stage->buffer,
+							ibuff, 1, &copy_region[2]);
+	VkBufferMemoryBarrier rd_barriers[] = {
+		{	VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER, 0,
+			VK_ACCESS_TRANSFER_WRITE_BIT, VK_ACCESS_VERTEX_ATTRIBUTE_READ_BIT,
+			VK_QUEUE_FAMILY_IGNORED, VK_QUEUE_FAMILY_IGNORED,
+			vbuff, 0, vert_size },
+		{	VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER, 0,
+			VK_ACCESS_TRANSFER_WRITE_BIT, VK_ACCESS_VERTEX_ATTRIBUTE_READ_BIT,
+			VK_QUEUE_FAMILY_IGNORED, VK_QUEUE_FAMILY_IGNORED,
+			uvbuff, 0, uv_size },
+		{	VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER, 0,
+			VK_ACCESS_TRANSFER_WRITE_BIT, VK_ACCESS_INDEX_READ_BIT,
+			VK_QUEUE_FAMILY_IGNORED, VK_QUEUE_FAMILY_IGNORED,
+			ibuff, 0, ind_size },
+	};
+	dfunc->vkCmdPipelineBarrier (packet->cmd,
+								 VK_PIPELINE_STAGE_TRANSFER_BIT,
+								 VK_PIPELINE_STAGE_VERTEX_INPUT_BIT,
+								 0, 0, 0, 1, rd_barriers, 0, 0);
+	QFV_PacketSubmit (packet);
+	QFV_DestroyStagingBuffer (stage);
+
+	qfv_alias_mesh_t *mesh = Hunk_Alloc (sizeof (qfv_alias_mesh_t));
+	mesh->vertex_buffer = vbuff;
+	mesh->uv_buffer = uvbuff;
+	mesh->index_buffer = ibuff;
+	mesh->memory = mem;
+	hdr->commands = (byte *) mesh - (byte *) hdr;
+}
diff --git a/libs/video/renderer/Makemodule.am b/libs/video/renderer/Makemodule.am
index 5a30c9f0c..e3b154541 100644
--- a/libs/video/renderer/Makemodule.am
+++ b/libs/video/renderer/Makemodule.am
@@ -269,6 +269,10 @@ quakebspv_src = libs/video/renderer/vulkan/quakebsp.vert
 quakebspv_c = libs/video/renderer/vulkan/quakebsp.vert.spvc
 quakebspf_src = libs/video/renderer/vulkan/quakebsp.frag
 quakebspf_c = libs/video/renderer/vulkan/quakebsp.frag.spvc
+aliasv_src = libs/video/renderer/vulkan/alias.vert
+aliasv_c = libs/video/renderer/vulkan/alias.vert.spvc
+aliasf_src = libs/video/renderer/vulkan/alias.frag
+aliasf_c = libs/video/renderer/vulkan/alias.frag.spvc
 passthrough_src = libs/video/renderer/vulkan/passthrough.vert
 passthrough_c = libs/video/renderer/vulkan/passthrough.vert.spvc
 pushcolor_src = libs/video/renderer/vulkan/pushcolor.frag
@@ -282,6 +286,10 @@ $(quakebspv_c): $(quakebspv_src)
 
 $(quakebspf_c): $(quakebspf_src)
 
+$(aliasv_c): $(aliasv_src)
+
+$(aliasf_c): $(aliasf_src)
+
 $(passthrough_c): $(passthrough_src)
 
 $(pushcolor_c): $(pushcolor_src)
@@ -291,6 +299,8 @@ vkshader_c = \
 	$(twodf_c) \
 	$(quakebspv_c) \
 	$(quakebspf_c) \
+	$(aliasv_c) \
+	$(aliasf_c) \
 	$(passthrough_c) \
 	$(pushcolor_c)
 
diff --git a/libs/video/renderer/vid_render_vulkan.c b/libs/video/renderer/vid_render_vulkan.c
index a54962b52..2b001bcd3 100644
--- a/libs/video/renderer/vid_render_vulkan.c
+++ b/libs/video/renderer/vid_render_vulkan.c
@@ -39,6 +39,7 @@
 #include "QF/plugin/general.h"
 #include "QF/plugin/vid_render.h"
 
+#include "QF/Vulkan/qf_alias.h"
 #include "QF/Vulkan/qf_bsp.h"
 #include "QF/Vulkan/qf_draw.h"
 #include "QF/Vulkan/qf_lightmap.h"
@@ -419,18 +420,21 @@ static void
 vulkan_Mod_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr,
 									   void *_m, int _s, int extra)
 {
+	Vulkan_Mod_MakeAliasModelDisplayLists (m, hdr, _m, _s, extra, vulkan_ctx);
 }
 
 static void *
 vulkan_Mod_LoadSkin (byte *skin, int skinsize, int snum, int gnum,
 					 qboolean group, maliasskindesc_t *skindesc)
 {
-	return skin + skinsize;
+	return Vulkan_Mod_LoadSkin (skin, skinsize, snum, gnum, group, skindesc,
+								vulkan_ctx);
 }
 
 static void
 vulkan_Mod_FinalizeAliasModel (model_t *m, aliashdr_t *hdr)
 {
+	Vulkan_Mod_FinalizeAliasModel (m, hdr, vulkan_ctx);
 }
 
 static void
diff --git a/libs/video/renderer/vulkan/alias.frag b/libs/video/renderer/vulkan/alias.frag
new file mode 100644
index 000000000..935fa06b4
--- /dev/null
+++ b/libs/video/renderer/vulkan/alias.frag
@@ -0,0 +1,55 @@
+#version 450
+
+layout (set = 0, binding = 1) uniform sampler2D Texture;
+layout (set = 0, binding = 2) uniform sampler2D GlowMap;
+layout (set = 0, binding = 3) uniform sampler2D ColorA;
+layout (set = 0, binding = 4) uniform sampler2D ColorB;
+
+struct LightData {
+	vec3        color;
+	float       dist;
+	vec3        position;
+	int         type;
+	vec3        direction;
+	float       cone;
+};
+
+layout (constant_id = 0) const int MaxLights = 8;
+layout (set = 1, binding = 0) uniform Lights {
+	int         light_count;
+	LightData   lights[MaxLights];
+};
+
+layout (push_constant) uniform PushConstants {
+	layout (offset = 80)
+	vec4        fog;
+	vec4        color;
+};
+
+layout (location = 0) in vec2 st;
+layout (location = 1) in vec3 position;
+layout (location = 2) in vec3 normal;
+
+layout (location = 0) out vec4 frag_color;
+
+void
+main (void)
+{
+	vec4        c;
+	int         i;
+	vec3        light = vec3 (0);
+
+	c = texture (Texture, st);
+	c += texture (ColorA, st);
+	c += texture (ColorB, st);
+	c += texture (GlowMap, st);
+	if (MaxLights > 0) {
+		for (i = 0; i < light_count; i++) {
+			vec3 dist = lights[i].position - position;
+			float dd = dot (dist, dist);
+			float mag = max (0.0, dot (dist, normal));
+			light += lights[i].color * mag * lights[i].dist / dd;
+		}
+	}
+	frag_color = c * vec4(light, 1);//fogBlend (c);
+}
diff --git a/libs/video/renderer/vulkan/alias.vert b/libs/video/renderer/vulkan/alias.vert
new file mode 100644
index 000000000..871c3a0c0
--- /dev/null
+++ b/libs/video/renderer/vulkan/alias.vert
@@ -0,0 +1,38 @@
+#version 450
+
+layout (set = 0, binding = 0) uniform Matrices {
+	mat4 Projection;
+	mat4 View;
+	mat4 Sky;
+};
+
+layout (push_constant) uniform PushConstants {
+	mat4 Model;
+	float blend;
+};
+
+layout (location = 0) in vec4 vertexa;
+layout (location = 1) in vec3 normala;
+layout (location = 2) in vec4 vertexb;
+layout (location = 3) in vec3 normalb;
+layout (location = 4) in vec2 uv;
+
+layout (location = 0) out vec2 st;
+layout (location = 1) out vec3 position;
+layout (location = 2) out vec3 normal;
+
+void
+main (void)
+{
+	vec4        vertex;
+	vec3        norm;
+	vec4        pos;
+
+	vertex = mix (vertexa, vertexb, blend);
+	norm = mix (normala, normalb, blend);
+	pos = (Model * vertex);
+	gl_Position = Projection * (View * pos);
+	position = pos.xyz;
+	normal = mat3 (Model) * norm;
+	st = uv;
+}
diff --git a/libs/video/renderer/vulkan/qfpipeline.plist b/libs/video/renderer/vulkan/qfpipeline.plist
index b5f5cd6cb..5fd0680af 100644
--- a/libs/video/renderer/vulkan/qfpipeline.plist
+++ b/libs/video/renderer/vulkan/qfpipeline.plist
@@ -11,6 +11,8 @@
 		twodf = $builtin/twod.frag;
 		quakebspv = $builtin/quakebsp.vert;
 		quakebspf = $builtin/quakebsp.frag;
+		aliasv = $builtin/alias.vert;
+		aliasf = $builtin/alias.frag;
 	};
 	samplers = {
 		quakepic = {
@@ -30,7 +32,7 @@
 			borderColor = float_transparent_black;
 			unnormalizedCoordinates = false;
 		};
-		quakebsp = {
+		quakebsp.sampler = {
 			magFilter = linear;
 			minFilter = linear;
 			mipmapMode = linear;
@@ -81,7 +83,7 @@
 				},
 			);
 		};
-		quakebsp = {
+		quakebsp.textures = {
 			flags = push_descriptor;
 			bindings = (
 				{
@@ -122,6 +124,51 @@
 				},
 			);
 		};
+		alias.textures = {
+			flags = push_descriptor;
+			bindings = (
+				{
+					binding = 0;
+					descriptorType = uniform_buffer;
+					descriptorCount = 1;
+					stageFlags = vertex;
+				},
+				{
+					binding = 1;
+					descriptorType = combined_image_sampler;
+					descriptorCount = 1;
+					stageFlags = fragment;
+				},
+				{
+					binding = 2;
+					descriptorType = combined_image_sampler;
+					descriptorCount = 1;
+					stageFlags = fragment;
+				},
+				{
+					binding = 3;
+					descriptorType = combined_image_sampler;
+					descriptorCount = 1;
+					stageFlags = fragment;
+				},
+				{
+					binding = 4;
+					descriptorType = combined_image_sampler;
+					descriptorCount = 1;
+					stageFlags = fragment;
+				},
+			);
+		};
+		alias.lights = {
+			bindings = (
+				{
+					binding = 0;
+					descriptorType = uniform_buffer;
+					descriptorCount = 1;
+					stageFlags = fragment;
+				},
+			);
+		};
 		something = {
 			flags = 0;
 			bindings = (
@@ -144,8 +191,8 @@
 		twod = {
 			setLayouts = (twod);
 		};
-		quakebsp = {
-			setLayouts = (quakebsp);
+		quakebsp.layout = {
+			setLayouts = (quakebsp.textures);
 			pushConstantRanges = (
 				{
 					stageFlags = vertex;
@@ -159,6 +206,21 @@
 				},
 			);
 		};
+		alias.layout = {
+			setLayouts = (alias.textures, alias.lights);
+			pushConstantRanges = (
+				{
+					stageFlags = vertex;
+					offset = 0;
+					size = "16 * 4 + 4";
+				},
+				{
+					stageFlags = fragment;
+					offset = 80;
+					size = "2 * 4 * 4";
+				},
+			);
+		};
 		something = {
 			setLayouts = (something);
 			pushConstantRanges = (
@@ -171,6 +233,133 @@
 		};
 	};
 	pipelines = {
+		alias = {
+			stages = (
+				{ stage = vertex; name = main; module = aliasv; },
+				{
+					stage = fragment;
+					name = main;
+					module = aliasf;
+					specializationInfo = {
+						mapEntries = (
+							{ size = 4; offset = 0; constantID = 0; },
+						);
+						data = <00000000>;
+					};
+				},
+			);
+			vertexInput = {
+				bindings = (
+					{
+						binding = 0;
+						stride = "2 * 4 * 4";
+						inputRate = vertex;
+					},
+					{
+						binding = 1;
+						stride = "2 * 4 * 4";
+						inputRate = vertex;
+					},
+					{
+						binding = 2;
+						stride = "2 * 4";
+						inputRate = vertex;
+					},
+				);
+				attributes = (
+					{
+						location = 0;
+						binding = 0;
+						format = r32g32b32a32_sfloat;
+						offset = 0;
+					},
+					{
+						location = 1;
+						binding = 0;
+						format = r32g32b32a32_sfloat;
+						offset = 16;
+					},
+					{
+						location = 2;
+						binding = 1;
+						format = r32g32b32a32_sfloat;
+						offset = 0;
+					},
+					{
+						location = 3;
+						binding = 1;
+						format = r32g32b32a32_sfloat;
+						offset = 16;
+					},
+					{
+						location = 4;
+						binding = 2;
+						format = r32g32_sfloat;
+						offset = 0;
+					},
+				);
+			};
+			inputAssembly = {
+				topology = triangle;
+				primitiveRestartEnable = false;
+			};
+			viewport = {
+				viewports = (
+					{
+						x = 0; y = 0;
+						width = 640; height = 480;
+						minDepth = 0; maxDepth = 1;
+					}
+				);
+				scissors = (
+					{
+						offset = { x = 0; y = 0 };
+						extent = { width = 640; height = 480; };
+					},
+				);
+			};
+			rasterization = {
+				depthClampEnable = false;
+				rasterizerDiscardEnable = false;
+				polygonMode = fill;
+				cullMode = back;
+				frontFace = clockwise;
+				depthBiasEnable = false;
+				lineWidth = 1;
+			};
+			multisample = {
+				rasterizationSamples = $msaaSamples;
+				sampleShadingEnable = false;
+				minSampleShading = 0.5f;
+				alphaToCoverageEnable = false;
+				alphaToOneEnable = false;
+			};
+			depthStencil = {
+				depthTestEnable = true;
+				depthWriteEnable = true;
+				depthCompareOp = less_or_equal;
+				depthBoundsTestEnable = false;
+				stencilTestEnable = false;
+			};
+			colorBlend = {
+				logicOpEnable = false;
+				attachments = ({
+					blendEnable = true;
+					srcColorBlendFactor = src_alpha;
+					dstColorBlendFactor = one_minus_src_alpha;
+					colorBlendOp = add;
+					srcAlphaBlendFactor = src_alpha;
+					dstAlphaBlendFactor = one_minus_src_alpha;
+					alphaBlendOp = add;
+					colorWriteMask = r|g|b|a;
+				});
+			};
+			dynamic = {
+				dynamicState = ( viewport, scissor, blend_constants );
+			};
+			layout = alias;
+			//renderPass = renderpass;
+		};
 		quakebsp.main = {
 			stages = (
 				{ stage = vertex; name = main; module = quakebspv; },
@@ -257,7 +446,7 @@
 			dynamic = {
 				dynamicState = ( viewport, scissor, blend_constants );
 			};
-			layout = quakebsp;
+			layout = quakebsp.layout;
 			//renderPass = renderpass;
 		};
 		quakebsp.skysheet = {
@@ -359,7 +548,7 @@
 			dynamic = {
 				dynamicState = ( viewport, scissor, blend_constants );
 			};
-			layout = quakebsp;
+			layout = quakebsp.layout;
 			//renderPass = renderpass;
 		};
 		twod = {
diff --git a/libs/video/renderer/vulkan/shader.c b/libs/video/renderer/vulkan/shader.c
index 4b0fed532..a3cc9e3f0 100644
--- a/libs/video/renderer/vulkan/shader.c
+++ b/libs/video/renderer/vulkan/shader.c
@@ -63,6 +63,10 @@ static
 static
 #include "libs/video/renderer/vulkan/quakebsp.frag.spvc"
 static
+#include "libs/video/renderer/vulkan/alias.vert.spvc"
+static
+#include "libs/video/renderer/vulkan/alias.frag.spvc"
+static
 #include "libs/video/renderer/vulkan/passthrough.vert.spvc"
 static
 #include "libs/video/renderer/vulkan/pushcolor.frag.spvc"
@@ -78,6 +82,8 @@ static shaderdata_t builtin_shaders[] = {
 	{ "twod.frag", twod_frag, sizeof (twod_frag) },
 	{ "quakebsp.vert", quakebsp_vert, sizeof (quakebsp_vert) },
 	{ "quakebsp.frag", quakebsp_frag, sizeof (quakebsp_frag) },
+	{ "alias.vert", alias_vert, sizeof (alias_vert) },
+	{ "alias.frag", alias_frag, sizeof (alias_frag) },
 	{ "passthrough.vert", passthrough_vert, sizeof (passthrough_vert) },
 	{ "pushcolor.frag", pushcolor_frag, sizeof (pushcolor_frag) },
 	{}
diff --git a/libs/video/renderer/vulkan/vulkan_bsp.c b/libs/video/renderer/vulkan/vulkan_bsp.c
index 6da253bea..c95a14c97 100644
--- a/libs/video/renderer/vulkan/vulkan_bsp.c
+++ b/libs/video/renderer/vulkan/vulkan_bsp.c
@@ -1420,13 +1420,8 @@ Vulkan_Bsp_Init (vulkan_ctx_t *ctx)
 
 	bctx->main = Vulkan_CreatePipeline (ctx, "quakebsp.main");
 	bctx->sky = Vulkan_CreatePipeline (ctx, "quakebsp.skysheet");
-	bctx->layout = QFV_GetPipelineLayout (ctx, "quakebsp");
-	bctx->sampler = QFV_GetSampler (ctx, "quakebsp");
-
-	__auto_type layouts = QFV_AllocDescriptorSetLayoutSet (frames, alloca);
-	for (size_t i = 0; i < layouts->size; i++) {
-		layouts->a[i] = QFV_GetDescriptorSetLayout (ctx, "quakebsp");
-	}
+	bctx->layout = QFV_GetPipelineLayout (ctx, "quakebsp.layout");
+	bctx->sampler = QFV_GetSampler (ctx, "quakebsp.sampler");
 
 	__auto_type cmdBuffers = QFV_AllocCommandBufferSet (3 * frames, alloca);
 	QFV_AllocateCommandBuffers (device, ctx->cmdpool, 1, cmdBuffers);

From 56573d09e4795c3ec176d270fa3ee826cefb3500 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 26 Jan 2021 10:22:06 +0900
Subject: [PATCH 1372/1519] [vulkan] Get Vulkan_LoadTex working

Finally managed to actually use and thus sort out its issues.
---
 libs/video/renderer/vulkan/vulkan_texture.c | 34 +++++++++++++--------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/libs/video/renderer/vulkan/vulkan_texture.c b/libs/video/renderer/vulkan/vulkan_texture.c
index 07bcc7f0a..d5723ad3f 100644
--- a/libs/video/renderer/vulkan/vulkan_texture.c
+++ b/libs/video/renderer/vulkan/vulkan_texture.c
@@ -65,6 +65,7 @@
 static int
 ilog2 (unsigned x)
 {
+	unsigned o = x;
 	if (x > 0x7fffffff) {
 		// avoid overflow
 		return 31;
@@ -82,7 +83,7 @@ ilog2 (unsigned x)
 	y |= ((x & 0xf0f0f0f0) != 0) << 2;
 	y |= ((x & 0xcccccccc) != 0) << 1;
 	y |= ((x & 0xaaaaaaaa) != 0) << 0;
-	return y;
+	return y - ((o & (x - 1)) != 0);
 }
 
 void
@@ -140,8 +141,8 @@ Vulkan_LoadTex (vulkan_ctx_t *ctx, tex_t *tex, int mip)
 			if (!tex->palette) {
 				return 0;
 			}
-			format = VK_FORMAT_R8G8B8_UNORM;
-			bpp = 3;
+			format = VK_FORMAT_R8G8B8A8_UNORM;
+			bpp = 4;
 			break;
 		case tex_rgb:
 			format = VK_FORMAT_R8G8B8_UNORM;
@@ -174,6 +175,7 @@ Vulkan_LoadTex (vulkan_ctx_t *ctx, tex_t *tex, int mip)
 	qtex->image = QFV_CreateImage (device, 0, VK_IMAGE_TYPE_2D, format, extent,
 								   mip, 1, VK_SAMPLE_COUNT_1_BIT,
 								   VK_IMAGE_USAGE_TRANSFER_DST_BIT
+								   | VK_IMAGE_USAGE_TRANSFER_SRC_BIT
 								   | VK_IMAGE_USAGE_SAMPLED_BIT);
 	qtex->memory = QFV_AllocImageMemory (device, qtex->image,
 										 VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT,
@@ -190,7 +192,7 @@ Vulkan_LoadTex (vulkan_ctx_t *ctx, tex_t *tex, int mip)
 
 	if (tex->format == tex_palette) {
 		Vulkan_ExpandPalette (tex_data, tex->data, tex->palette,
-							  0, tex->width * tex->height);
+							  1, tex->width * tex->height);
 	} else {
 		memcpy (tex_data, tex->data, bytes);
 	}
@@ -201,6 +203,7 @@ Vulkan_LoadTex (vulkan_ctx_t *ctx, tex_t *tex, int mip)
 	stages = imageLayoutTransitionStages[qfv_LT_Undefined_to_TransferDst];
 	barrier = imageLayoutTransitionBarriers[qfv_LT_Undefined_to_TransferDst];
 	barrier.image = qtex->image;
+	barrier.subresourceRange.levelCount = VK_REMAINING_MIP_LEVELS;
 	dfunc->vkCmdPipelineBarrier (packet->cmd, stages.src, stages.dst,
 								 0, 0, 0, 0, 0,
 								 1, &barrier);
@@ -214,19 +217,29 @@ Vulkan_LoadTex (vulkan_ctx_t *ctx, tex_t *tex, int mip)
 								   VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
 								   1, &copy);
 	barrier.subresourceRange.baseMipLevel = 0;
+	barrier.subresourceRange.levelCount = 1;
 	stages.src = VK_PIPELINE_STAGE_TRANSFER_BIT;
 	stages.dst = VK_PIPELINE_STAGE_TRANSFER_BIT;
 	VkImageBlit blit = {
 		{VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1},
 		{{0, 0, 0}, {tex->width, tex->height, 1}},
 		{VK_IMAGE_ASPECT_COLOR_BIT, 1, 0, 1},
-		{{0, 0, 0}, {(tex->width + 1) >> 1, (tex->height + 1) >> 1, 1}},
+		{{0, 0, 0}, {max (tex->width >> 1, 1), max (tex->height >> 1, 1), 1}},
 	};
+	if (mip == 1) {
+		stages = imageLayoutTransitionStages[qfv_LT_TransferDst_to_ShaderReadOnly];
+		barrier=imageLayoutTransitionBarriers[qfv_LT_TransferDst_to_ShaderReadOnly];
+		barrier.image = qtex->image;
+		dfunc->vkCmdPipelineBarrier (packet->cmd, stages.src, stages.dst,
+									 0, 0, 0, 0, 0,
+									 1, &barrier);
+	}
 	while (--mip > 0) {
 		barrier.oldLayout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL;
 		barrier.newLayout = VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL;
 		barrier.srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT;
 		barrier.dstAccessMask = VK_ACCESS_TRANSFER_READ_BIT;
+		stages.dst = VK_PIPELINE_STAGE_TRANSFER_BIT;
 
 		dfunc->vkCmdPipelineBarrier (packet->cmd, stages.src, stages.dst, 0,
 									 0, 0, 0, 0,
@@ -242,6 +255,7 @@ Vulkan_LoadTex (vulkan_ctx_t *ctx, tex_t *tex, int mip)
 		barrier.srcAccessMask = VK_ACCESS_TRANSFER_READ_BIT;
 		barrier.dstAccessMask = VK_ACCESS_SHADER_READ_BIT;
 
+		stages.dst = VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT;
 		dfunc->vkCmdPipelineBarrier (packet->cmd, stages.src, stages.dst, 0,
 									 0, 0, 0, 0,
 									 1, &barrier);
@@ -250,16 +264,10 @@ Vulkan_LoadTex (vulkan_ctx_t *ctx, tex_t *tex, int mip)
 		blit.srcOffsets[1].x = blit.dstOffsets[1].x;
 		blit.srcOffsets[1].y = blit.dstOffsets[1].y;
 		blit.dstSubresource.mipLevel++;
-		blit.dstOffsets[1].x = (blit.dstOffsets[1].x + 1) >> 1;
-		blit.dstOffsets[1].y = (blit.dstOffsets[1].y + 1) >> 1;
+		blit.dstOffsets[1].x = max (blit.dstOffsets[1].x >> 1, 1);
+		blit.dstOffsets[1].y = max (blit.dstOffsets[1].y >> 1, 1);
 		barrier.subresourceRange.baseMipLevel++;
 	}
-	stages = imageLayoutTransitionStages[qfv_LT_TransferDst_to_ShaderReadOnly];
-	barrier=imageLayoutTransitionBarriers[qfv_LT_TransferDst_to_ShaderReadOnly];
-	barrier.image = qtex->image;
-	dfunc->vkCmdPipelineBarrier (packet->cmd, stages.src, stages.dst,
-								 0, 0, 0, 0, 0,
-								 1, &barrier);
 	QFV_PacketSubmit (packet);
 	return qtex;
 }

From 69a8b984a52a9ba9058438d45d1c660c5b5f68a1 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 26 Jan 2021 13:46:33 +0900
Subject: [PATCH 1373/1519] [vulkan] Sort out alias model load and unload

---
 libs/models/alias/vulkan_model_alias.c | 77 ++++++++++++++++++++------
 1 file changed, 61 insertions(+), 16 deletions(-)

diff --git a/libs/models/alias/vulkan_model_alias.c b/libs/models/alias/vulkan_model_alias.c
index 97801febc..88e2ced29 100644
--- a/libs/models/alias/vulkan_model_alias.c
+++ b/libs/models/alias/vulkan_model_alias.c
@@ -62,6 +62,34 @@ static vec3_t vertex_normals[NUMVERTEXNORMALS] = {
 static void
 vulkan_alias_clear (model_t *m, void *data)
 {
+	vulkan_ctx_t *ctx = data;
+	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+	aliashdr_t *hdr;
+	qfv_alias_mesh_t *mesh;
+
+	m->needload = true;	//FIXME is this right?
+	if (!(hdr = m->aliashdr)) {
+		hdr = Cache_Get (&m->cache);
+	}
+	mesh = (qfv_alias_mesh_t *) ((byte *) hdr + hdr->commands);
+	dfunc->vkDestroyBuffer (device->dev, mesh->vertex_buffer, 0);
+	dfunc->vkDestroyBuffer (device->dev, mesh->uv_buffer, 0);
+	dfunc->vkDestroyBuffer (device->dev, mesh->index_buffer, 0);
+	dfunc->vkFreeMemory (device->dev, mesh->memory, 0);
+
+	__auto_type skins = (maliasskindesc_t *) ((byte *) hdr + hdr->skindesc);
+	for (int i = 0; i < hdr->mdl.numskins; i++) {
+		if (skins[i].type == ALIAS_SKIN_GROUP) {
+			__auto_type group = (maliasskingroup_t *)
+								((byte *) hdr + skins[i].skin);
+			for (int j = 0; j < group->numskins; j++) {
+				Vulkan_UnloadTex (ctx, group->skindescs[j].tex);
+			}
+		} else {
+			Vulkan_UnloadTex (ctx, skins[i].tex);
+		}
+	}
 }
 
 void *
@@ -72,6 +100,8 @@ Vulkan_Mod_LoadSkin (byte *skin, int skinsize, int snum, int gnum,
 	byte       *tskin;
 	int         w, h;
 
+	//FIXME move all skins into arrays(?)
+	//FIXME fullbrights
 	w = pheader->mdl.skinwidth;
 	h = pheader->mdl.skinheight;
 	tskin = malloc (skinsize);
@@ -86,9 +116,8 @@ Vulkan_Mod_LoadSkin (byte *skin, int skinsize, int snum, int gnum,
 void
 Vulkan_Mod_FinalizeAliasModel (model_t *m, aliashdr_t *hdr, vulkan_ctx_t *ctx)
 {
-	if (hdr->mdl.ident == HEADER_MDL16)
-		VectorScale (hdr->mdl.scale, 1/256.0, hdr->mdl.scale);
 	m->clear = vulkan_alias_clear;
+	m->data = ctx;
 }
 
 void
@@ -96,6 +125,21 @@ Vulkan_Mod_LoadExternalSkins (model_t *mod, vulkan_ctx_t *ctx)
 {
 }
 
+static size_t
+get_buffer_size (qfv_device_t *device, VkBuffer buffer)
+{
+	qfv_devfuncs_t *dfunc = device->funcs;
+	size_t      size;
+	size_t      align;
+
+	VkMemoryRequirements requirements;
+	dfunc->vkGetBufferMemoryRequirements (device->dev, buffer, &requirements);
+	size = requirements.size;
+	align = requirements.alignment - 1;
+	size = (size + align) & ~(align);
+	return size;
+}
+
 void
 Vulkan_Mod_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr, void *_m,
 									   int _s, int extra, vulkan_ctx_t *ctx)
@@ -113,6 +157,9 @@ Vulkan_Mod_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr, void *_m,
 	int         pose;
 	vec3_t      pos;
 
+	if (hdr->mdl.ident == HEADER_MDL16)
+		VectorScale (hdr->mdl.scale, 1/256.0, hdr->mdl.scale);
+
 	numverts = hdr->mdl.numverts;
 	numtris = hdr->mdl.numtris;
 
@@ -148,33 +195,31 @@ Vulkan_Mod_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr, void *_m,
 	// current and previous pose, uvbuff "statically" bound as uvs are not
 	// animated by pose, and the same for ibuf: indices will never change for
 	// the mesh
-	size_t      atom = device->physDev->properties.limits.nonCoherentAtomSize;
-	size_t      atom_mask = atom - 1;
 	size_t      vert_count = numverts * hdr->numposes;
 	size_t      vert_size = vert_count * sizeof (aliasvrt_t);
 	size_t      uv_size = numverts * sizeof (aliasuv_t);
-	size_t      ind_size = numverts * sizeof (uint32_t);
-	vert_size = (vert_size + atom_mask) & ~atom_mask;
-	uv_size = (uv_size + atom_mask) & ~atom_mask;
-	ind_size = (ind_size + atom_mask) & ~atom_mask;
-	size_t      buff_size = vert_size + ind_size + uv_size;
+	size_t      ind_size = 3 * numtris * sizeof (uint32_t);
 
-	VkBuffer    vbuff = QFV_CreateBuffer (device, buff_size,
+	VkBuffer    vbuff = QFV_CreateBuffer (device, vert_size,
 										  VK_BUFFER_USAGE_TRANSFER_DST_BIT
 										  | VK_BUFFER_USAGE_VERTEX_BUFFER_BIT);
-	VkBuffer    uvbuff = QFV_CreateBuffer (device, buff_size,
+	VkBuffer    uvbuff = QFV_CreateBuffer (device, uv_size,
 										   VK_BUFFER_USAGE_TRANSFER_DST_BIT
 										   | VK_BUFFER_USAGE_VERTEX_BUFFER_BIT);
-	VkBuffer    ibuff = QFV_CreateBuffer (device, buff_size,
+	VkBuffer    ibuff = QFV_CreateBuffer (device, ind_size,
 										  VK_BUFFER_USAGE_TRANSFER_DST_BIT
 										  | VK_BUFFER_USAGE_INDEX_BUFFER_BIT);
+	size_t      voffs = 0;
+	size_t      uvoffs = voffs + get_buffer_size (device, vbuff);
+	size_t      ioffs = uvoffs + get_buffer_size (device, uvbuff);
+	size_t      buff_size = ioffs + get_buffer_size (device, ibuff);
 	VkDeviceMemory mem;
 	mem = QFV_AllocBufferMemory (device, vbuff,
 								 VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT,
 								 buff_size, 0);
-	QFV_BindBufferMemory (device, vbuff, mem, 0);
-	QFV_BindBufferMemory (device, uvbuff, mem, vert_size);
-	QFV_BindBufferMemory (device, ibuff, mem, vert_size + uv_size);
+	QFV_BindBufferMemory (device, vbuff, mem, voffs);
+	QFV_BindBufferMemory (device, uvbuff, mem, uvoffs);
+	QFV_BindBufferMemory (device, ibuff, mem, ioffs);
 
 	qfv_stagebuf_t *stage = QFV_CreateStagingBuffer (device, buff_size,
 													  ctx->cmdpool);
@@ -219,7 +264,7 @@ Vulkan_Mod_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr, void *_m,
 	}
 
 	// now build the indices for DrawElements
-	for (i = 0; i < numverts; i++) {
+	for (i = 0; i < hdr->mdl.numverts; i++) {
 		indexmap[i] = indexmap[i] != -1 ? indexmap[i] : i;
 	}
 	for (i = 0; i < numtris; i++) {

From 826e650c273e466caf325a220dcdd664ce182e11 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 26 Jan 2021 20:33:51 +0900
Subject: [PATCH 1374/1519] [models] Do full alias skin loading

This includes base, glow and two color maps (pants and shorts).
---
 include/QF/Vulkan/qf_alias.h           |  6 +++
 include/QF/model.h                     | 16 +++----
 include/mod_internal.h                 |  4 ++
 libs/models/alias/vulkan_model_alias.c | 48 ++++++++++++++++++---
 libs/models/fullbright.c               | 17 ++++++--
 libs/models/skin.c                     | 60 ++++++++++++++++++++++++++
 6 files changed, 131 insertions(+), 20 deletions(-)

diff --git a/include/QF/Vulkan/qf_alias.h b/include/QF/Vulkan/qf_alias.h
index efe3dd0dc..006bd8672 100644
--- a/include/QF/Vulkan/qf_alias.h
+++ b/include/QF/Vulkan/qf_alias.h
@@ -37,6 +37,12 @@
 #include "QF/modelgen.h"
 #include "QF/Vulkan/qf_vid.h"
 
+typedef struct aliasskin_s {
+	struct qfv_tex_s *tex;
+	struct qfv_tex_s *glow;
+	struct qfv_tex_s *colora;
+	struct qfv_tex_s *colorb;
+} aliasskin_t;
 typedef struct aliasvrt_s {
 	float       vertex[4];
 	float       normal[4];
diff --git a/include/QF/model.h b/include/QF/model.h
index d1129bfce..5512506f3 100644
--- a/include/QF/model.h
+++ b/include/QF/model.h
@@ -278,14 +278,9 @@ typedef struct {
 
 typedef struct {
 	aliasskintype_t type;
-	int            skin;
-	union {
-		struct {
-			int     texnum;
-			int     fb_texnum;
-		};
-		void       *tex;
-	};
+	int     skin;
+	int     texnum;
+	int     fb_texnum;
 } maliasskindesc_t;
 
 typedef struct {
@@ -447,7 +442,8 @@ void	Mod_TouchModel (const char *name);
 mleaf_t *Mod_PointInLeaf (const vec3_t p, model_t *model) __attribute__((pure));
 byte	*Mod_LeafPVS (mleaf_t *leaf, model_t *model);
 model_t	*Mod_FindName (const char *name);
-int     Mod_CalcFullbright (byte *in, byte *out, int pixels);
+int     Mod_CalcFullbright (const byte *in, byte *out, int pixels);
+void    Mod_ClearFullbright (const byte *in, byte *out, int pixels);
 int     Mod_Fullbright (byte * skin, int width, int height, const char *name);
 
 void    *Mod_LoadAliasFrame (void *pin, int *posenum, maliasframedesc_t *frame,
@@ -457,7 +453,7 @@ void    *Mod_LoadAliasGroup (void *pin, int *posenum, maliasframedesc_t *frame,
 
 void Mod_FindClipDepth (hull_t *hull);
 void	 Mod_LoadBrushModel (model_t *mod, void *buffer);
-void	 Mod_FloodFillSkin (byte * skin, int skinwidth, int skinheight);
+void	 Mod_FloodFillSkin (byte *skin, int skinwidth, int skinheight);
 
 void	 Mod_Print (void);
 
diff --git a/include/mod_internal.h b/include/mod_internal.h
index 632411785..382a8985f 100644
--- a/include/mod_internal.h
+++ b/include/mod_internal.h
@@ -62,6 +62,10 @@ void Skin_Init (void);
 skin_t *Skin_SetColormap (skin_t *skin, int cmap);
 skin_t *Skin_SetSkin (skin_t *skin, int cmap, const char *skinname);
 void Skin_SetTranslation (int cmap, int top, int bottom);
+int Skin_CalcTopColors (const byte *in, byte *out, int pixels);
+int Skin_CalcBottomColors (const byte *in, byte *out, int pixels);
+void Skin_ClearTopColors (const byte *in, byte *out, int pixels);
+void Skin_ClearBottomColors (const byte *in, byte *out, int pixels);
 
 void sw_Skin_SetupSkin (skin_t *skin, int cmap);
 void sw_Skin_ProcessTranslation (int cmap, const byte *translation);
diff --git a/libs/models/alias/vulkan_model_alias.c b/libs/models/alias/vulkan_model_alias.c
index 88e2ced29..3a7ad4705 100644
--- a/libs/models/alias/vulkan_model_alias.c
+++ b/libs/models/alias/vulkan_model_alias.c
@@ -59,6 +59,22 @@ static vec3_t vertex_normals[NUMVERTEXNORMALS] = {
 #include "anorms.h"
 };
 
+static void
+skin_clear (int skin_offset, aliashdr_t *hdr, vulkan_ctx_t *ctx)
+{
+	aliasskin_t *skin = (aliasskin_t *) ((byte *) hdr + skin_offset);
+	Vulkan_UnloadTex (ctx, skin->tex);
+	if (skin->glow) {
+		Vulkan_UnloadTex (ctx, skin->glow);
+	}
+	if (skin->colora) {
+		Vulkan_UnloadTex (ctx, skin->colora);
+	}
+	if (skin->colorb) {
+		Vulkan_UnloadTex (ctx, skin->colorb);
+	}
+}
+
 static void
 vulkan_alias_clear (model_t *m, void *data)
 {
@@ -84,32 +100,50 @@ vulkan_alias_clear (model_t *m, void *data)
 			__auto_type group = (maliasskingroup_t *)
 								((byte *) hdr + skins[i].skin);
 			for (int j = 0; j < group->numskins; j++) {
-				Vulkan_UnloadTex (ctx, group->skindescs[j].tex);
+				skin_clear (group->skindescs[j].skin, hdr, ctx);
 			}
 		} else {
-			Vulkan_UnloadTex (ctx, skins[i].tex);
+			skin_clear (skins[i].skin, hdr, ctx);
 		}
 	}
 }
 
 void *
-Vulkan_Mod_LoadSkin (byte *skin, int skinsize, int snum, int gnum,
+Vulkan_Mod_LoadSkin (byte *skinpix, int skinsize, int snum, int gnum,
 				     qboolean group, maliasskindesc_t *skindesc,
 					 vulkan_ctx_t *ctx)
 {
+	aliasskin_t *skin;
 	byte       *tskin;
 	int         w, h;
 
+	skin = Hunk_Alloc (sizeof (aliasskin_t));
+	skindesc->skin = (byte *) skin - (byte *) pheader;//FIXME pheader global
 	//FIXME move all skins into arrays(?)
-	//FIXME fullbrights
 	w = pheader->mdl.skinwidth;
 	h = pheader->mdl.skinheight;
-	tskin = malloc (skinsize);
+	tskin = malloc (2 * skinsize);
 	memcpy (tskin, skin, skinsize);
 	Mod_FloodFillSkin (tskin, w, h);
-	tex_t skin_tex = {w, h, tex_palette, 1, vid.palette, tskin};
-	skindesc->tex = Vulkan_LoadTex (ctx, &skin_tex, 1);
+
+	tex_t skin_tex = {w, h, tex_palette, 1, vid.palette, tskin + skinsize};
+	if (Mod_CalcFullbright (tskin, tskin + skinsize, skinsize)) {
+		skin->glow = Vulkan_LoadTex (ctx, &skin_tex, 1);
+		Mod_ClearFullbright (tskin, tskin, skinsize);
+	}
+	if (Skin_CalcTopColors (tskin, tskin + skinsize, skinsize)) {
+		skin->colora = Vulkan_LoadTex (ctx, &skin_tex, 1);
+		Skin_ClearTopColors (tskin, tskin, skinsize);
+	}
+	if (Skin_CalcBottomColors (tskin, tskin + skinsize, skinsize)) {
+		skin->colorb = Vulkan_LoadTex (ctx, &skin_tex, 1);
+		Skin_ClearBottomColors (tskin, tskin, skinsize);
+	}
+	skin_tex.data = tskin;
+	skin->tex = Vulkan_LoadTex (ctx, &skin_tex, 1);
+
 	free (tskin);
+
 	return skin + skinsize;
 }
 
diff --git a/libs/models/fullbright.c b/libs/models/fullbright.c
index 79c32ede9..62f9ccee5 100644
--- a/libs/models/fullbright.c
+++ b/libs/models/fullbright.c
@@ -33,17 +33,28 @@
 
 #include "r_local.h"
 
-
 VISIBLE int
-Mod_CalcFullbright (byte *in, byte *out, int pixels)
+Mod_CalcFullbright (const byte *in, byte *out, int pixels)
 {
 	byte	fb = 0;
 
-	while (pixels--) {
+	while (pixels-- > 0) {
 		byte        pix = *in++;
 		byte        mask = (pix >= 256 - 32) - 1;
 		fb |= mask + 1;
+		// mask is 0 for fullbright, otherwise 0xff
 		*out++ = pix | mask;
 	}
 	return fb;
 }
+
+VISIBLE void
+Mod_ClearFullbright (const byte *in, byte *out, int pixels)
+{
+	while (pixels-- > 0) {
+		byte        pix = *in++;
+		byte        mask = ~((pix >= 256 - 32) - 1);
+		// mask is 0xff for fullbright, otherwise 0
+		*out++ = pix | mask;
+	}
+}
diff --git a/libs/models/skin.c b/libs/models/skin.c
index 9897a4143..88d53cea6 100644
--- a/libs/models/skin.c
+++ b/libs/models/skin.c
@@ -246,3 +246,63 @@ Skin_Init (void)
 	skin_cache = Hash_NewTable (127, skin_getkey, skin_free, 0, 0);
 	m_funcs->Skin_InitTranslations ();
 }
+
+VISIBLE int
+Skin_CalcTopColors (const byte *in, byte *out, int pixels)
+{
+	byte        tc = 0;
+
+	while (pixels-- > 0) {
+		byte        pix = *in++;
+		byte        a = (pix < TOP_RANGE) - 1;
+		byte        b = (pix > TOP_RANGE + 15) - 1;
+		byte        mask = ~(a & b);
+		tc |= mask;
+		// mask is 0 for top color otherwise 0xff
+		*out++ = (pix - TOP_RANGE) | mask;
+	}
+	return tc;
+}
+
+VISIBLE int
+Skin_CalcBottomColors (const byte *in, byte *out, int pixels)
+{
+	byte        bc = 0;
+
+	while (pixels-- > 0) {
+		byte        pix = *in++;
+		byte        a = (pix < BOTTOM_RANGE) - 1;
+		byte        b = (pix > BOTTOM_RANGE + 15) - 1;
+		byte        mask = ~(a & b);
+		bc |= mask;
+		// mask is 0 for bottom color otherwise 0xff
+		*out++ = (pix - BOTTOM_RANGE) | mask;
+	}
+	return bc;
+}
+
+VISIBLE void
+Skin_ClearTopColors (const byte *in, byte *out, int pixels)
+{
+	while (pixels-- > 0) {
+		byte        pix = *in++;
+		byte        a = (pix < TOP_RANGE) - 1;
+		byte        b = (pix > TOP_RANGE + 15) - 1;
+		byte        mask = (a & b);
+		// mask is 0xff for top color otherwise 0
+		*out++ = (pix - TOP_RANGE) | mask;
+	}
+}
+
+VISIBLE void
+Skin_ClearBottomColors (const byte *in, byte *out, int pixels)
+{
+	while (pixels-- > 0) {
+		byte        pix = *in++;
+		byte        a = (pix < BOTTOM_RANGE) - 1;
+		byte        b = (pix > BOTTOM_RANGE + 15) - 1;
+		byte        mask = (a & b);
+		// mask is 0xff for bottom color otherwise 0
+		*out++ = (pix - BOTTOM_RANGE) | mask;
+	}
+}

From 12ec6c5c296a416e7fbc2a07526fd917aee66cbc Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 26 Jan 2021 20:45:07 +0900
Subject: [PATCH 1375/1519] [util] Add eol to plist parse errors

I suspect it got lost when I made the error message a string item.
---
 libs/util/qfplist.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/util/qfplist.c b/libs/util/qfplist.c
index 3fa64b9d0..fe0fc3268 100644
--- a/libs/util/qfplist.c
+++ b/libs/util/qfplist.c
@@ -899,7 +899,7 @@ PL_GetPropertyList (const char *string)
 		if (pl && pl->error) {
 			const char *error = PL_String (pl->error);
 			if (error[0]) {
-				Sys_Printf ("plist: %d,%d: %s", pl->line, pl->pos, error);
+				Sys_Printf ("plist: %d,%d: %s\n", pl->line, pl->pos, error);
 			}
 			PL_Free (pl->error);
 		}

From 748217b43833fcb0cc24f32d76115b1ead2312b4 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 26 Jan 2021 20:58:24 +0900
Subject: [PATCH 1376/1519] [vulkan] Start work on alias model rendering

---
 include/QF/Vulkan/qf_alias.h                  |  38 ++-
 include/vid_vulkan.h                          |   1 +
 libs/video/renderer/Makemodule.am             |   1 +
 libs/video/renderer/vid_render_vulkan.c       |   2 +
 libs/video/renderer/vulkan/alias.frag         |   8 +-
 libs/video/renderer/vulkan/qfpipeline.plist   |  65 +++--
 libs/video/renderer/vulkan/vulkan_alias.c     | 276 ++++++++++++++++++
 libs/video/renderer/vulkan/vulkan_draw.c      |   6 +-
 libs/video/renderer/vulkan/vulkan_main.c      |  15 +-
 .../video/renderer/vulkan/vulkan_vid_common.c |   1 +
 10 files changed, 378 insertions(+), 35 deletions(-)
 create mode 100644 libs/video/renderer/vulkan/vulkan_alias.c

diff --git a/include/QF/Vulkan/qf_alias.h b/include/QF/Vulkan/qf_alias.h
index 006bd8672..bcc5be337 100644
--- a/include/QF/Vulkan/qf_alias.h
+++ b/include/QF/Vulkan/qf_alias.h
@@ -43,6 +43,7 @@ typedef struct aliasskin_s {
 	struct qfv_tex_s *colora;
 	struct qfv_tex_s *colorb;
 } aliasskin_t;
+
 typedef struct aliasvrt_s {
 	float       vertex[4];
 	float       normal[4];
@@ -68,15 +69,39 @@ typedef struct qfv_light_s {
 	float       cone;
 } qfv_light_t;
 
+#define ALIAS_LIGHTS 8
+
 typedef struct qfv_light_buffer_s {
 	int         light_count;
-	qfv_light_t lights[] __attribute__((aligned(16)));
+	qfv_light_t lights[ALIAS_LIGHTS] __attribute__((aligned(16)));
 } qfv_light_buffer_t;
 
-typedef struct alias_ctx_s {
-} alias_ctx_t;
+#define ALIAS_BUFFER_INFOS 2
+#define ALIAS_IMAGE_INFOS 4
+
+typedef struct aliasframe_s {
+	VkCommandBuffer cmd;
+	VkDescriptorBufferInfo bufferInfo[ALIAS_BUFFER_INFOS];
+	VkDescriptorImageInfo imageInfo[ALIAS_IMAGE_INFOS];
+	VkWriteDescriptorSet descriptors[ALIAS_BUFFER_INFOS + ALIAS_IMAGE_INFOS];
+	qfv_light_buffer_t *lights;
+	VkBuffer     light_buffer;
+} aliasframe_t;
+
+typedef struct aliasframeset_s
+    DARRAY_TYPE (aliasframe_t) aliasframeset_t;
+
+typedef struct aliasctx_s {
+	aliasframeset_t frames;
+	VkPipeline   pipeline;
+	VkPipelineLayout layout;
+	VkSampler    sampler;
+
+	VkDeviceMemory light_memory;
+} aliasctx_t;
 
 struct vulkan_ctx_s;
+struct entity_s;
 void *Vulkan_Mod_LoadSkin (byte *skin, int skinsize, int snum, int gnum,
 		                   qboolean group, maliasskindesc_t *skindesc,
 						   struct vulkan_ctx_s *ctx);
@@ -87,4 +112,11 @@ void Vulkan_Mod_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr,
 											void *_m, int _s, int extra,
 											struct vulkan_ctx_s *ctx);
 
+void Vulkan_AliasBegin (struct vulkan_ctx_s *ctx);
+void Vulkan_DrawAlias (struct entity_s *ent, struct vulkan_ctx_s *ctx);
+void Vulkan_AliasEnd (struct vulkan_ctx_s *ctx);
+
+void Vulkan_Alias_Init (struct vulkan_ctx_s *ctx);
+void Vulkan_Alias_Shutdown (struct vulkan_ctx_s *ctx);
+
 #endif//__QF_Vulkan_qf_alias_h
diff --git a/include/vid_vulkan.h b/include/vid_vulkan.h
index f4642afb1..8a60707fe 100644
--- a/include/vid_vulkan.h
+++ b/include/vid_vulkan.h
@@ -63,6 +63,7 @@ typedef struct vulkan_ctx_s {
 	struct hashtab_s *descriptorPools;
 	struct hashtab_s *samplers;
 
+	struct aliasctx_s *alias_context;
 	struct bspctx_s *bsp_context;
 	struct drawctx_s *draw_context;
 
diff --git a/libs/video/renderer/Makemodule.am b/libs/video/renderer/Makemodule.am
index e3b154541..b322a7ca4 100644
--- a/libs/video/renderer/Makemodule.am
+++ b/libs/video/renderer/Makemodule.am
@@ -236,6 +236,7 @@ libs_video_renderer_vid_render_vulkan_la_SOURCES = \
 	libs/video/renderer/vulkan/util.c \
 	libs/video/renderer/vulkan/util.h \
 	libs/video/renderer/vulkan/vkparse.c \
+	libs/video/renderer/vulkan/vulkan_alias.c \
 	libs/video/renderer/vulkan/vulkan_bsp.c \
 	libs/video/renderer/vulkan/vulkan_draw.c \
 	libs/video/renderer/vulkan/vulkan_lightmap.c \
diff --git a/libs/video/renderer/vid_render_vulkan.c b/libs/video/renderer/vid_render_vulkan.c
index 2b001bcd3..fc8aebc11 100644
--- a/libs/video/renderer/vid_render_vulkan.c
+++ b/libs/video/renderer/vid_render_vulkan.c
@@ -98,6 +98,7 @@ vulkan_R_Init (void)
 	// are being built
 	vulkan_ctx->pipeline = Vulkan_CreatePipeline (vulkan_ctx, "pipeline");
 	Vulkan_Texture_Init (vulkan_ctx);
+	Vulkan_Alias_Init (vulkan_ctx);
 	Vulkan_Bsp_Init (vulkan_ctx);
 	Vulkan_Draw_Init (vulkan_ctx);
 	Vulkan_Particles_Init (vulkan_ctx);
@@ -611,6 +612,7 @@ vulkan_vid_render_shutdown (void)
 	df->vkDestroyCommandPool (dev, vulkan_ctx->cmdpool, 0);
 	Vulkan_Draw_Shutdown (vulkan_ctx);
 	Vulkan_Bsp_Shutdown (vulkan_ctx);
+	Vulkan_Alias_Shutdown (vulkan_ctx);
 	Mod_ClearAll ();
 	Vulkan_Texture_Shutdown (vulkan_ctx);
 	Vulkan_Shutdown_Common (vulkan_ctx);
diff --git a/libs/video/renderer/vulkan/alias.frag b/libs/video/renderer/vulkan/alias.frag
index 935fa06b4..d1ad194bb 100644
--- a/libs/video/renderer/vulkan/alias.frag
+++ b/libs/video/renderer/vulkan/alias.frag
@@ -1,9 +1,9 @@
 #version 450
 
-layout (set = 0, binding = 1) uniform sampler2D Texture;
-layout (set = 0, binding = 2) uniform sampler2D GlowMap;
-layout (set = 0, binding = 3) uniform sampler2D ColorA;
-layout (set = 0, binding = 4) uniform sampler2D ColorB;
+layout (set = 2, binding = 0) uniform sampler2D Texture;
+layout (set = 2, binding = 1) uniform sampler2D GlowMap;
+layout (set = 2, binding = 2) uniform sampler2D ColorA;
+layout (set = 2, binding = 3) uniform sampler2D ColorB;
 
 struct LightData {
 	vec3        color;
diff --git a/libs/video/renderer/vulkan/qfpipeline.plist b/libs/video/renderer/vulkan/qfpipeline.plist
index 5fd0680af..b6823707c 100644
--- a/libs/video/renderer/vulkan/qfpipeline.plist
+++ b/libs/video/renderer/vulkan/qfpipeline.plist
@@ -49,9 +49,26 @@
 			borderColor = float_transparent_black;
 			unnormalizedCoordinates = false;
 		};
+		alias.sampler = {
+			magFilter = linear;
+			minFilter = linear;
+			mipmapMode = linear;
+			addressModeU = clamp_to_edge;
+			addressModeV = clamp_to_edge;
+			addressModeW = clamp_to_edge;
+			mipLodBias = 0;
+			anisotropyEnable = false;
+			maxAnisotropy = 0;
+			compareEnable = false;
+			compareOp = always;
+			minLod = 0;
+			maxLod = 1000;
+			borderColor = float_transparent_black;
+			unnormalizedCoordinates = false;
+		};
 	};
 	descriptorPools = {
-		twod = {
+		twod.pool = {
 			flags = 0;
 			maxSets = $framebuffers.size;
 			bindings = (
@@ -65,9 +82,19 @@
 				},
 			);
 		};
+		alias.pool = {
+			flags = 0;
+			maxSets = "2z * $framebuffers.size";
+			bindings = (
+				{
+					type = uniform_buffer;
+					descriptorCount = "2z * $framebuffers.size";
+				},
+			);
+		};
 	};
 	setLayouts = {
-		twod = {
+		twod.set = {
 			bindings = (
 				{
 					binding = 0;
@@ -124,8 +151,7 @@
 				},
 			);
 		};
-		alias.textures = {
-			flags = push_descriptor;
+		alias.matrices = {
 			bindings = (
 				{
 					binding = 0;
@@ -133,6 +159,17 @@
 					descriptorCount = 1;
 					stageFlags = vertex;
 				},
+			);
+		};
+		alias.textures = {
+			flags = push_descriptor;
+			bindings = (
+				{
+					binding = 0;
+					descriptorType = combined_image_sampler;
+					descriptorCount = 1;
+					stageFlags = fragment;
+				},
 				{
 					binding = 1;
 					descriptorType = combined_image_sampler;
@@ -151,12 +188,6 @@
 					descriptorCount = 1;
 					stageFlags = fragment;
 				},
-				{
-					binding = 4;
-					descriptorType = combined_image_sampler;
-					descriptorCount = 1;
-					stageFlags = fragment;
-				},
 			);
 		};
 		alias.lights = {
@@ -188,8 +219,8 @@
 		};
 	};
 	pipelineLayouts = {
-		twod = {
-			setLayouts = (twod);
+		twod.layout = {
+			setLayouts = (twod.set);
 		};
 		quakebsp.layout = {
 			setLayouts = (quakebsp.textures);
@@ -207,7 +238,7 @@
 			);
 		};
 		alias.layout = {
-			setLayouts = (alias.textures, alias.lights);
+			setLayouts = (alias.matrices, alias.lights, alias.textures);
 			pushConstantRanges = (
 				{
 					stageFlags = vertex;
@@ -244,7 +275,7 @@
 						mapEntries = (
 							{ size = 4; offset = 0; constantID = 0; },
 						);
-						data = <00000000>;
+						data = <00000008>;
 					};
 				},
 			);
@@ -300,7 +331,7 @@
 				);
 			};
 			inputAssembly = {
-				topology = triangle;
+				topology = triangle_list;
 				primitiveRestartEnable = false;
 			};
 			viewport = {
@@ -357,7 +388,7 @@
 			dynamic = {
 				dynamicState = ( viewport, scissor, blend_constants );
 			};
-			layout = alias;
+			layout = alias.layout;
 			//renderPass = renderpass;
 		};
 		quakebsp.main = {
@@ -643,7 +674,7 @@
 			dynamic = {
 				dynamicState = ( viewport, scissor );
 			};
-			layout = twod;
+			layout = twod.layout;
 			//renderPass = renderpass;
 		};
 	};
diff --git a/libs/video/renderer/vulkan/vulkan_alias.c b/libs/video/renderer/vulkan/vulkan_alias.c
new file mode 100644
index 000000000..3fa9d7c52
--- /dev/null
+++ b/libs/video/renderer/vulkan/vulkan_alias.c
@@ -0,0 +1,276 @@
+/*
+	vulkan_alias.c
+
+	Vulkan alias model pipeline
+
+	Copyright (C) 2012       Bill Currie <bill@taniwha.org>
+	Copyright (C) 2021       Bill Currie <bill@taniwha.org>
+
+	Author: Bill Currie <bill@taniwha.org>
+	Date: 2012/1/7
+	Date: 2021/1/26
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#include <stdlib.h>
+
+#include "qfalloca.h"
+
+#include "QF/cvar.h"
+#include "QF/darray.h"
+#include "QF/dstring.h"
+#include "QF/image.h"
+#include "QF/render.h"
+#include "QF/skin.h"
+#include "QF/sys.h"
+#include "QF/va.h"
+#include "QF/vrect.h"
+
+#include "QF/Vulkan/qf_alias.h"
+#include "QF/Vulkan/qf_texture.h"
+#include "QF/Vulkan/command.h"
+#include "QF/Vulkan/descriptor.h"
+#include "QF/Vulkan/device.h"
+
+#include "r_internal.h"
+#include "vid_vulkan.h"
+#include "vkparse.h"
+
+static VkImageView
+get_view (qfv_tex_t *tex, qfv_tex_t *default_tex)
+{
+	if (tex) {
+		return tex->view;
+	}
+	if (default_tex) {
+		return default_tex->view;
+	}
+	return 0;
+}
+
+void
+Vulkan_DrawAlias (struct entity_s *ent, struct vulkan_ctx_s *ctx)
+{
+	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+	aliasctx_t *actx = ctx->alias_context;
+	aliasframe_t *aframe = &actx->frames.a[ctx->curFrame];
+	model_t    *model = ent->model;
+	aliashdr_t *hdr;
+	qfv_alias_mesh_t *mesh;
+	float       blend;
+	aliasskin_t *skin;
+
+	if (!(hdr = model->aliashdr)) {
+		hdr = Cache_Get (&model->cache);
+	}
+	mesh = (qfv_alias_mesh_t *) ((byte *) hdr + hdr->commands);
+
+	blend = R_AliasGetLerpedFrames (ent, hdr);
+
+	if (0/*XXX ent->skin && ent->skin->tex*/) {
+		//skin = ent->skin->tex;
+	} else {
+		maliasskindesc_t *skindesc;
+		skindesc = R_AliasGetSkindesc (ent->skinnum, hdr);
+		skin = (aliasskin_t *) ((byte *) hdr + skindesc->skin);
+	}
+
+	VkDeviceSize offsets[] = {
+		ent->pose1 * hdr->poseverts,
+		ent->pose2 * hdr->poseverts,
+		0,
+	};
+	VkBuffer    buffers[] = {
+		mesh->vertex_buffer,
+		mesh->vertex_buffer,
+		mesh->uv_buffer,
+	};
+	dfunc->vkCmdBindVertexBuffers (aframe->cmd, 0, 3, buffers, offsets);
+	dfunc->vkCmdBindIndexBuffer (aframe->cmd, mesh->index_buffer, 0,
+								 VK_INDEX_TYPE_UINT32);
+	dfunc->vkCmdPushConstants (aframe->cmd, actx->layout,
+							   VK_SHADER_STAGE_VERTEX_BIT,
+							   0, 16 * sizeof (float), ent->transform);
+	dfunc->vkCmdPushConstants (aframe->cmd, actx->layout,
+							   VK_SHADER_STAGE_VERTEX_BIT,
+							   64, sizeof (float), &blend);
+	aframe->imageInfo[0].imageView = get_view (skin->tex, ctx->default_white);
+	aframe->imageInfo[1].imageView = get_view (skin->glow, ctx->default_black);
+	aframe->imageInfo[2].imageView = get_view (skin->colora,
+											   ctx->default_black);
+	aframe->imageInfo[3].imageView = get_view (skin->colorb,
+											   ctx->default_black);
+	dfunc->vkCmdPushDescriptorSetKHR (aframe->cmd,
+									  VK_PIPELINE_BIND_POINT_GRAPHICS,
+									  actx->layout,
+									  0, 2, aframe->descriptors
+											+ ALIAS_BUFFER_INFOS);
+	dfunc->vkCmdDrawIndexed (aframe->cmd, 3 * hdr->mdl.numtris, 1, 0, 0, 0);
+}
+
+void
+Vulkan_AliasBegin (vulkan_ctx_t *ctx)
+{
+	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+	aliasctx_t *actx = ctx->alias_context;
+	//XXX quat_t      fog;
+
+	__auto_type cframe = &ctx->framebuffers.a[ctx->curFrame];
+	aliasframe_t *aframe = &actx->frames.a[ctx->curFrame];
+	VkCommandBuffer cmd = aframe->cmd;
+	DARRAY_APPEND (cframe->subCommand, cmd);
+
+	//FIXME need per frame matrices
+	aframe->bufferInfo[0].buffer = ctx->matrices.buffer_3d;
+	aframe->bufferInfo[1].buffer = aframe->light_buffer;
+
+	dfunc->vkResetCommandBuffer (cmd, 0);
+	VkCommandBufferInheritanceInfo inherit = {
+		VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_INFO, 0,
+		ctx->renderpass.renderpass, 0,
+		cframe->framebuffer,
+		0, 0, 0,
+	};
+	VkCommandBufferBeginInfo beginInfo = {
+		VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, 0,
+		VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT
+		| VK_COMMAND_BUFFER_USAGE_RENDER_PASS_CONTINUE_BIT, &inherit,
+	};
+	dfunc->vkBeginCommandBuffer (cmd, &beginInfo);
+
+	dfunc->vkCmdBindPipeline (cmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
+							  actx->pipeline);
+	VkViewport  viewport = {0, 0, vid.width, vid.height, 0, 1};
+	VkRect2D    scissor = { {0, 0}, {vid.width, vid.height} };
+	dfunc->vkCmdSetViewport (cmd, 0, 1, &viewport);
+	dfunc->vkCmdSetScissor (cmd, 0, 1, &scissor);
+
+	dfunc->vkUpdateDescriptorSets (device->dev, 2, aframe->descriptors, 0, 0);
+
+	//XXX glsl_Fog_GetColor (fog);
+	//XXX fog[3] = glsl_Fog_GetDensity () / 64.0;
+}
+
+void
+Vulkan_AliasEnd (vulkan_ctx_t *ctx)
+{
+	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+	aliasctx_t *actx = ctx->alias_context;
+
+	aliasframe_t *aframe = &actx->frames.a[ctx->curFrame];
+	dfunc->vkEndCommandBuffer (aframe->cmd);
+}
+
+static VkDescriptorBufferInfo base_buffer_info = {
+	0, 0, VK_WHOLE_SIZE
+};
+static VkDescriptorImageInfo base_image_info = {
+	0, 0, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL
+};
+static VkWriteDescriptorSet base_buffer_write = {
+	VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, 0, 0,
+	0, 0, 1,
+	VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER,
+	0, 0, 0
+};
+static VkWriteDescriptorSet base_image_write = {
+	VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, 0, 0,
+	0, 0, 1,
+	VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER,
+	0, 0, 0
+};
+
+void
+Vulkan_Alias_Init (vulkan_ctx_t *ctx)
+{
+	qfv_device_t *device = ctx->device;
+
+	aliasctx_t *actx = calloc (1, sizeof (aliasctx_t));
+	ctx->alias_context = actx;
+
+	size_t      frames = ctx->framebuffers.size;
+	DARRAY_INIT (&actx->frames, frames);
+	DARRAY_RESIZE (&actx->frames, frames);
+	actx->frames.grow = 0;
+
+	actx->pipeline = Vulkan_CreatePipeline (ctx, "alias");
+	actx->layout = QFV_GetPipelineLayout (ctx, "alias.layout");
+	actx->sampler = QFV_GetSampler (ctx, "alias.sampler");
+
+	__auto_type layouts = QFV_AllocDescriptorSetLayoutSet (2 * frames, alloca);
+	for (size_t i = 0; i < layouts->size / 2; i++) {
+		__auto_type mats = QFV_GetDescriptorSetLayout (ctx, "alias.matrices");
+		__auto_type lights = QFV_GetDescriptorSetLayout (ctx, "alias.lights");
+		layouts->a[2 * i + 0] = mats;
+		layouts->a[2 * i + 1] = lights;
+	}
+	__auto_type pool = QFV_GetDescriptorPool (ctx, "alias.pool");
+
+	__auto_type cmdBuffers = QFV_AllocCommandBufferSet (frames, alloca);
+	QFV_AllocateCommandBuffers (device, ctx->cmdpool, 1, cmdBuffers);
+
+	__auto_type sets = QFV_AllocateDescriptorSet (device, pool, layouts);
+	for (size_t i = 0; i < frames; i++) {
+		__auto_type aframe = &actx->frames.a[i];
+		aframe->cmd = cmdBuffers->a[i];
+
+		for (int j = 0; j < ALIAS_BUFFER_INFOS; j++) {
+			aframe->bufferInfo[j] = base_buffer_info;
+			aframe->descriptors[j] = base_buffer_write;
+			aframe->descriptors[j].dstSet = sets->a[2 * i + j];
+			aframe->descriptors[j].dstBinding = 0;
+			aframe->descriptors[j].pBufferInfo = &aframe->bufferInfo[j];
+		}
+		for (int j = 0; j < ALIAS_IMAGE_INFOS; j++) {
+			aframe->imageInfo[j] = base_image_info;
+			aframe->imageInfo[j].sampler = actx->sampler;
+			int k = j + ALIAS_BUFFER_INFOS;
+			aframe->descriptors[k] = base_image_write;
+			aframe->descriptors[k].dstBinding = j;
+			aframe->descriptors[k].pImageInfo = &aframe->imageInfo[j];
+		}
+	}
+	free (sets);
+}
+
+void
+Vulkan_Alias_Shutdown (struct vulkan_ctx_s *ctx)
+{
+	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+	aliasctx_t *actx = ctx->alias_context;
+
+	dfunc->vkDestroyPipeline (device->dev, actx->pipeline, 0);
+	DARRAY_CLEAR (&actx->frames);
+	free (actx);
+}
diff --git a/libs/video/renderer/vulkan/vulkan_draw.c b/libs/video/renderer/vulkan/vulkan_draw.c
index f4bf8c19e..3fc563cb2 100644
--- a/libs/video/renderer/vulkan/vulkan_draw.c
+++ b/libs/video/renderer/vulkan/vulkan_draw.c
@@ -383,13 +383,13 @@ Vulkan_Draw_Init (vulkan_ctx_t *ctx)
 
 	dctx->pipeline = Vulkan_CreatePipeline (ctx, "twod");
 
-	dctx->layout = QFV_GetPipelineLayout (ctx, "twod");
+	dctx->layout = QFV_GetPipelineLayout (ctx, "twod.layout");
 
 	__auto_type layouts = QFV_AllocDescriptorSetLayoutSet (frames, alloca);
 	for (size_t i = 0; i < layouts->size; i++) {
-		layouts->a[i] = QFV_GetDescriptorSetLayout (ctx, "twod");
+		layouts->a[i] = QFV_GetDescriptorSetLayout (ctx, "twod.set");
 	}
-	__auto_type pool = QFV_GetDescriptorPool (ctx, "twod");
+	__auto_type pool = QFV_GetDescriptorPool (ctx, "twod.pool");
 
 	VkDescriptorBufferInfo bufferInfo = {
 		ctx->matrices.buffer_2d, 0, VK_WHOLE_SIZE
diff --git a/libs/video/renderer/vulkan/vulkan_main.c b/libs/video/renderer/vulkan/vulkan_main.c
index f31558e7b..95fcd02ab 100644
--- a/libs/video/renderer/vulkan/vulkan_main.c
+++ b/libs/video/renderer/vulkan/vulkan_main.c
@@ -49,7 +49,7 @@
 #include "QF/sys.h"
 
 #include "QF/Vulkan/qf_vid.h"
-//#include "QF/Vulkan/qf_alias.h"
+#include "QF/Vulkan/qf_alias.h"
 #include "QF/Vulkan/qf_bsp.h"
 //#include "QF/Vulkan/qf_iqm.h"
 #include "QF/Vulkan/qf_lightmap.h"
@@ -109,8 +109,8 @@ setup_view (vulkan_ctx_t *ctx)
 static void
 R_RenderEntities (vulkan_ctx_t *ctx)
 {
-	//entity_t   *ent;
-	//int         begun;
+	entity_t   *ent;
+	int         begun;
 
 	if (!r_drawentities->int_val)
 		return;
@@ -121,17 +121,16 @@ R_RenderEntities (vulkan_ctx_t *ctx)
 			if (ent->model->type != mod_##type_name) \
 				continue; \
 			if (!begun) { \
-				glsl_R_##Type##Begin (); \
+				Vulkan_##Type##Begin (ctx); \
 				begun = 1; \
 			} \
-			currententity = ent; \
-			glsl_R_Draw##Type (); \
+			Vulkan_Draw##Type (ent, ctx); \
 		} \
 		if (begun) \
-			glsl_R_##Type##End (); \
+			Vulkan_##Type##End (ctx); \
 	} while (0)
 
-	//RE_LOOP (alias, Alias);
+	RE_LOOP (alias, Alias);
 	//RE_LOOP (iqm, IQM);
 	//RE_LOOP (sprite, Sprite);
 }
diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c
index 4e5f338cc..2ab5fc166 100644
--- a/libs/video/renderer/vulkan/vulkan_vid_common.c
+++ b/libs/video/renderer/vulkan/vulkan_vid_common.c
@@ -242,6 +242,7 @@ Vulkan_CreateRenderPass (vulkan_ctx_t *ctx)
 	plitem_t   *item = ctx->pipelineDef;
 	if (!item || !(item = PL_ObjectForKey (item, "renderpass"))) {
 		Sys_Printf ("error loading renderpass\n");
+		return;
 	} else {
 		Sys_Printf ("Found renderpass def\n");
 	}

From a64f477796b1b6fcd023e94fe2397722613fc8b7 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 27 Jan 2021 12:15:45 +0900
Subject: [PATCH 1377/1519] [vulkan] Get alias texture loading working

That was a mess, partly premature optimizations, and some silly
mistakes.
---
 libs/models/alias/vulkan_model_alias.c      |   2 +-
 libs/models/fullbright.c                    |  18 +--
 libs/models/skin.c                          |  44 +++----
 libs/video/renderer/vulkan/vulkan_texture.c | 125 +++++++++++++-------
 4 files changed, 115 insertions(+), 74 deletions(-)

diff --git a/libs/models/alias/vulkan_model_alias.c b/libs/models/alias/vulkan_model_alias.c
index 3a7ad4705..e3e5f0701 100644
--- a/libs/models/alias/vulkan_model_alias.c
+++ b/libs/models/alias/vulkan_model_alias.c
@@ -123,7 +123,7 @@ Vulkan_Mod_LoadSkin (byte *skinpix, int skinsize, int snum, int gnum,
 	w = pheader->mdl.skinwidth;
 	h = pheader->mdl.skinheight;
 	tskin = malloc (2 * skinsize);
-	memcpy (tskin, skin, skinsize);
+	memcpy (tskin, skinpix, skinsize);
 	Mod_FloodFillSkin (tskin, w, h);
 
 	tex_t skin_tex = {w, h, tex_palette, 1, vid.palette, tskin + skinsize};
diff --git a/libs/models/fullbright.c b/libs/models/fullbright.c
index 62f9ccee5..22cef6a83 100644
--- a/libs/models/fullbright.c
+++ b/libs/models/fullbright.c
@@ -40,10 +40,12 @@ Mod_CalcFullbright (const byte *in, byte *out, int pixels)
 
 	while (pixels-- > 0) {
 		byte        pix = *in++;
-		byte        mask = (pix >= 256 - 32) - 1;
-		fb |= mask + 1;
-		// mask is 0 for fullbright, otherwise 0xff
-		*out++ = pix | mask;
+		if (pix >= 256 - 32) {
+			fb = 1;
+			*out++ = pix;
+		} else {
+			*out++ = 0;
+		}
 	}
 	return fb;
 }
@@ -53,8 +55,10 @@ Mod_ClearFullbright (const byte *in, byte *out, int pixels)
 {
 	while (pixels-- > 0) {
 		byte        pix = *in++;
-		byte        mask = ~((pix >= 256 - 32) - 1);
-		// mask is 0xff for fullbright, otherwise 0
-		*out++ = pix | mask;
+		if (pix >= 256 - 32) {
+			*out++ = 0;
+		} else {
+			*out++ = pix;
+		}
 	}
 }
diff --git a/libs/models/skin.c b/libs/models/skin.c
index 88d53cea6..fd561143d 100644
--- a/libs/models/skin.c
+++ b/libs/models/skin.c
@@ -254,12 +254,12 @@ Skin_CalcTopColors (const byte *in, byte *out, int pixels)
 
 	while (pixels-- > 0) {
 		byte        pix = *in++;
-		byte        a = (pix < TOP_RANGE) - 1;
-		byte        b = (pix > TOP_RANGE + 15) - 1;
-		byte        mask = ~(a & b);
-		tc |= mask;
-		// mask is 0 for top color otherwise 0xff
-		*out++ = (pix - TOP_RANGE) | mask;
+		if (pix >= TOP_RANGE && pix < TOP_RANGE + 16) {
+			tc = 1;
+			*out++ = pix - TOP_RANGE;
+		} else {
+			*out++ = 0;
+		}
 	}
 	return tc;
 }
@@ -271,12 +271,12 @@ Skin_CalcBottomColors (const byte *in, byte *out, int pixels)
 
 	while (pixels-- > 0) {
 		byte        pix = *in++;
-		byte        a = (pix < BOTTOM_RANGE) - 1;
-		byte        b = (pix > BOTTOM_RANGE + 15) - 1;
-		byte        mask = ~(a & b);
-		bc |= mask;
-		// mask is 0 for bottom color otherwise 0xff
-		*out++ = (pix - BOTTOM_RANGE) | mask;
+		if (pix >= BOTTOM_RANGE && pix < BOTTOM_RANGE + 16) {
+			bc = 1;
+			*out++ = pix - BOTTOM_RANGE;
+		} else {
+			*out++ = 0;
+		}
 	}
 	return bc;
 }
@@ -286,11 +286,11 @@ Skin_ClearTopColors (const byte *in, byte *out, int pixels)
 {
 	while (pixels-- > 0) {
 		byte        pix = *in++;
-		byte        a = (pix < TOP_RANGE) - 1;
-		byte        b = (pix > TOP_RANGE + 15) - 1;
-		byte        mask = (a & b);
-		// mask is 0xff for top color otherwise 0
-		*out++ = (pix - TOP_RANGE) | mask;
+		if (pix >= TOP_RANGE && pix < TOP_RANGE + 16) {
+			*out++ = 0;
+		} else {
+			*out++ = pix;
+		}
 	}
 }
 
@@ -299,10 +299,10 @@ Skin_ClearBottomColors (const byte *in, byte *out, int pixels)
 {
 	while (pixels-- > 0) {
 		byte        pix = *in++;
-		byte        a = (pix < BOTTOM_RANGE) - 1;
-		byte        b = (pix > BOTTOM_RANGE + 15) - 1;
-		byte        mask = (a & b);
-		// mask is 0xff for bottom color otherwise 0
-		*out++ = (pix - BOTTOM_RANGE) | mask;
+		if (pix >= BOTTOM_RANGE && pix < BOTTOM_RANGE + 16) {
+			*out++ = 0;
+		} else {
+			*out++ = pix;
+		}
 	}
 }
diff --git a/libs/video/renderer/vulkan/vulkan_texture.c b/libs/video/renderer/vulkan/vulkan_texture.c
index d5723ad3f..0129f886c 100644
--- a/libs/video/renderer/vulkan/vulkan_texture.c
+++ b/libs/video/renderer/vulkan/vulkan_texture.c
@@ -119,6 +119,85 @@ Vulkan_ExpandPalette (byte *dst, const byte *src, const byte *palette,
 	}
 }
 
+static void
+blit_mips (int mips, VkImage image, tex_t *tex,
+		   qfv_devfuncs_t *dfunc, VkCommandBuffer cmd)
+{
+	qfv_pipelinestagepair_t pre_stages = {
+		VK_PIPELINE_STAGE_TRANSFER_BIT,
+		VK_PIPELINE_STAGE_TRANSFER_BIT,
+	};
+	qfv_pipelinestagepair_t post_stages = {
+		VK_PIPELINE_STAGE_TRANSFER_BIT,
+		VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT,
+	};
+	qfv_pipelinestagepair_t final_stages = {
+		VK_PIPELINE_STAGE_TRANSFER_BIT,
+		VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT,
+	};
+	VkImageMemoryBarrier pre_barrier = {
+		VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER, 0,
+		VK_ACCESS_TRANSFER_WRITE_BIT, VK_ACCESS_TRANSFER_READ_BIT,
+		VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
+		VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
+		VK_QUEUE_FAMILY_IGNORED, VK_QUEUE_FAMILY_IGNORED,
+		image,
+		{ VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1 }
+	};
+	VkImageMemoryBarrier post_barrier = {
+		VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER, 0,
+		VK_ACCESS_TRANSFER_READ_BIT, VK_ACCESS_SHADER_READ_BIT,
+		VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
+		VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL,
+		VK_QUEUE_FAMILY_IGNORED, VK_QUEUE_FAMILY_IGNORED,
+		image,
+		{ VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1 }
+	};
+	VkImageMemoryBarrier final_barrier = {
+		VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER, 0,
+		VK_ACCESS_TRANSFER_READ_BIT, VK_ACCESS_SHADER_READ_BIT,
+		VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
+		VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL,
+		VK_QUEUE_FAMILY_IGNORED, VK_QUEUE_FAMILY_IGNORED,
+		image,
+		{ VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1 }
+	};
+
+	VkImageBlit blit = {
+		{VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1},
+		{{0, 0, 0}, {tex->width, tex->height, 1}},
+		{VK_IMAGE_ASPECT_COLOR_BIT, 1, 0, 1},
+		{{0, 0, 0}, {max (tex->width >> 1, 1), max (tex->height >> 1, 1), 1}},
+	};
+
+	while (--mips > 0) {
+		dfunc->vkCmdPipelineBarrier (cmd, pre_stages.src, pre_stages.dst, 0,
+									 0, 0, 0, 0,
+									 1, &pre_barrier);
+		dfunc->vkCmdBlitImage (cmd,
+							   image, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
+							   image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
+							   1, &blit, VK_FILTER_LINEAR);
+
+		dfunc->vkCmdPipelineBarrier (cmd, post_stages.src, post_stages.dst, 0,
+									 0, 0, 0, 0,
+									 1, &post_barrier);
+
+		blit.srcSubresource.mipLevel++;
+		blit.srcOffsets[1].x = blit.dstOffsets[1].x;
+		blit.srcOffsets[1].y = blit.dstOffsets[1].y;
+		blit.dstSubresource.mipLevel++;
+		blit.dstOffsets[1].x = max (blit.dstOffsets[1].x >> 1, 1);
+		blit.dstOffsets[1].y = max (blit.dstOffsets[1].y >> 1, 1);
+		pre_barrier.subresourceRange.baseMipLevel++;
+		post_barrier.subresourceRange.baseMipLevel++;
+		final_barrier.subresourceRange.baseMipLevel++;
+	}
+	dfunc->vkCmdPipelineBarrier (cmd, final_stages.src, final_stages.dst, 0,
+								 0, 0, 0, 0,
+								 1, &final_barrier);
+}
+
 qfv_tex_t *
 Vulkan_LoadTex (vulkan_ctx_t *ctx, tex_t *tex, int mip)
 {
@@ -216,16 +295,6 @@ Vulkan_LoadTex (vulkan_ctx_t *ctx, tex_t *tex, int mip)
 								   qtex->image,
 								   VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
 								   1, &copy);
-	barrier.subresourceRange.baseMipLevel = 0;
-	barrier.subresourceRange.levelCount = 1;
-	stages.src = VK_PIPELINE_STAGE_TRANSFER_BIT;
-	stages.dst = VK_PIPELINE_STAGE_TRANSFER_BIT;
-	VkImageBlit blit = {
-		{VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1},
-		{{0, 0, 0}, {tex->width, tex->height, 1}},
-		{VK_IMAGE_ASPECT_COLOR_BIT, 1, 0, 1},
-		{{0, 0, 0}, {max (tex->width >> 1, 1), max (tex->height >> 1, 1), 1}},
-	};
 	if (mip == 1) {
 		stages = imageLayoutTransitionStages[qfv_LT_TransferDst_to_ShaderReadOnly];
 		barrier=imageLayoutTransitionBarriers[qfv_LT_TransferDst_to_ShaderReadOnly];
@@ -233,40 +302,8 @@ Vulkan_LoadTex (vulkan_ctx_t *ctx, tex_t *tex, int mip)
 		dfunc->vkCmdPipelineBarrier (packet->cmd, stages.src, stages.dst,
 									 0, 0, 0, 0, 0,
 									 1, &barrier);
-	}
-	while (--mip > 0) {
-		barrier.oldLayout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL;
-		barrier.newLayout = VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL;
-		barrier.srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT;
-		barrier.dstAccessMask = VK_ACCESS_TRANSFER_READ_BIT;
-		stages.dst = VK_PIPELINE_STAGE_TRANSFER_BIT;
-
-		dfunc->vkCmdPipelineBarrier (packet->cmd, stages.src, stages.dst, 0,
-									 0, 0, 0, 0,
-									 1, &barrier);
-
-		dfunc->vkCmdBlitImage (packet->cmd,
-							 qtex->image, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
-							 qtex->image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
-							 1, &blit, VK_FILTER_LINEAR);
-
-		barrier.oldLayout = VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL;
-		barrier.newLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
-		barrier.srcAccessMask = VK_ACCESS_TRANSFER_READ_BIT;
-		barrier.dstAccessMask = VK_ACCESS_SHADER_READ_BIT;
-
-		stages.dst = VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT;
-		dfunc->vkCmdPipelineBarrier (packet->cmd, stages.src, stages.dst, 0,
-									 0, 0, 0, 0,
-									 1, &barrier);
-
-		blit.srcSubresource.mipLevel++;
-		blit.srcOffsets[1].x = blit.dstOffsets[1].x;
-		blit.srcOffsets[1].y = blit.dstOffsets[1].y;
-		blit.dstSubresource.mipLevel++;
-		blit.dstOffsets[1].x = max (blit.dstOffsets[1].x >> 1, 1);
-		blit.dstOffsets[1].y = max (blit.dstOffsets[1].y >> 1, 1);
-		barrier.subresourceRange.baseMipLevel++;
+	} else {
+		blit_mips (mip, qtex->image, tex, dfunc, packet->cmd);
 	}
 	QFV_PacketSubmit (packet);
 	return qtex;

From 97febc0888681dbae463c948841cdd8d665e7be9 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 27 Jan 2021 12:51:22 +0900
Subject: [PATCH 1378/1519] [tools/misc] Update mdl.py for python 3

---
 tools/misc/mdl.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/misc/mdl.py b/tools/misc/mdl.py
index 00c788316..f9b6698c4 100644
--- a/tools/misc/mdl.py
+++ b/tools/misc/mdl.py
@@ -22,8 +22,8 @@ for i in range(m[6]):
 	else:
 		n = unpack ("i", model[:4])[0]
 		model = model [4:]
-		print n
-		k = (n, unpack (`n`+"f", model[:n*4]), [])
+		print (n)
+		k = (n, unpack (("%df" % n), model[:n*4]), [])
 		model = model [n*4:]
 		for j in range (n):
 			k[2].append (model[:s])
@@ -67,7 +67,7 @@ for i in range (m[11]):
 		g = (t, unpack ("i 3B B 3B B", model[:12]))
 		model = model[12:]
 		n = g[1][0]
-		g = g + (unpack (`n`+"f", model[:n*4]), [])
+		g = g + (unpack (("%df" % n), model[:n*4]), [])
 		model = model[n*4:]
 		for k in range (g[1][0]):
 			f = (unpack ("3B B 3B B 16s", model[:24]), [])

From 4da8feca360d786e4c3adc1dda1cb4a28df53fce Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 27 Jan 2021 16:13:37 +0900
Subject: [PATCH 1379/1519] [models] Fix some vulkan alias upload errors

Fixes the bogus vertex/index data and does barriers for all three
buffers.
---
 libs/models/alias/vulkan_model_alias.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libs/models/alias/vulkan_model_alias.c b/libs/models/alias/vulkan_model_alias.c
index e3e5f0701..a5520217c 100644
--- a/libs/models/alias/vulkan_model_alias.c
+++ b/libs/models/alias/vulkan_model_alias.c
@@ -144,7 +144,7 @@ Vulkan_Mod_LoadSkin (byte *skinpix, int skinsize, int snum, int gnum,
 
 	free (tskin);
 
-	return skin + skinsize;
+	return skinpix + skinsize;
 }
 
 void
@@ -288,8 +288,10 @@ Vulkan_Mod_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr, void *_m,
 			}
 			VectorCompMultAdd (hdr->mdl.scale_origin, hdr->mdl.scale,
 							   pos, verts[pose + j].vertex);
+			verts[pose + j].vertex[3] = 1;
 			VectorCopy (vertex_normals[pv->lightnormalindex],
 						verts[pose + j].normal);
+			verts[pose + j].normal[3] = 0;
 			// duplicate on-seam vert associated with back-facing triangle
 			if (indexmap[j] != -1) {
 				verts[pose + indexmap[j]] = verts[pose + j];
@@ -357,7 +359,7 @@ Vulkan_Mod_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr, void *_m,
 	dfunc->vkCmdPipelineBarrier (packet->cmd,
 								 VK_PIPELINE_STAGE_TRANSFER_BIT,
 								 VK_PIPELINE_STAGE_VERTEX_INPUT_BIT,
-								 0, 0, 0, 1, rd_barriers, 0, 0);
+								 0, 0, 0, 3, rd_barriers, 0, 0);
 	QFV_PacketSubmit (packet);
 	QFV_DestroyStagingBuffer (stage);
 

From 9f6441684611a432521b770130173c929084a90a Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 27 Jan 2021 16:16:28 +0900
Subject: [PATCH 1380/1519] [vulkan] Create the lights buffer

It's a tad bogus as it's the lights close to the camera, but it should
at least be a good start once things are working. There's currently
something very wrong with the state of things.
---
 include/QF/Vulkan/buffer.h                |  5 +++
 libs/video/renderer/vulkan/instance.c     |  9 ++++-
 libs/video/renderer/vulkan/vulkan_alias.c | 46 ++++++++++++++++++++++-
 libs/video/renderer/vulkan/vulkan_main.c  |  6 +--
 4 files changed, 59 insertions(+), 7 deletions(-)

diff --git a/include/QF/Vulkan/buffer.h b/include/QF/Vulkan/buffer.h
index 9346d0466..712b14a96 100644
--- a/include/QF/Vulkan/buffer.h
+++ b/include/QF/Vulkan/buffer.h
@@ -18,6 +18,11 @@ typedef struct qfv_buffertransitionset_s
 typedef struct qfv_bufferbarrierset_s
 	DARRAY_TYPE (VkBufferMemoryBarrier) qfv_bufferbarrierset_t;
 
+typedef struct qfv_bufferset_s
+	DARRAY_TYPE (VkBuffer) qfv_bufferset_t;
+#define QFV_AllocBufferSet(num, allocator) \
+	DARRAY_ALLOCFIXED (qfv_bufferset_t, num, allocator)
+
 struct qfv_device_s;
 VkBuffer QFV_CreateBuffer (struct qfv_device_s *device,
 						   VkDeviceSize size,
diff --git a/libs/video/renderer/vulkan/instance.c b/libs/video/renderer/vulkan/instance.c
index 617d792e8..d1c845c6b 100644
--- a/libs/video/renderer/vulkan/instance.c
+++ b/libs/video/renderer/vulkan/instance.c
@@ -125,6 +125,11 @@ static int message_types =
 	VK_DEBUG_UTILS_MESSAGE_TYPE_VALIDATION_BIT_EXT |
 	VK_DEBUG_UTILS_MESSAGE_TYPE_PERFORMANCE_BIT_EXT;
 
+static void
+debug_breakpoint (VkDebugUtilsMessageSeverityFlagBitsEXT messageSeverity)
+{
+}
+
 static VKAPI_ATTR VkBool32 VKAPI_CALL
 debug_callback (VkDebugUtilsMessageSeverityFlagBitsEXT messageSeverity,
 				VkDebugUtilsMessageTypeFlagsEXT messageType,
@@ -144,7 +149,9 @@ debug_callback (VkDebugUtilsMessageSeverityFlagBitsEXT messageSeverity,
 	if (messageSeverity & VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT) {
 		msgSev = "error: ";
 	}
-	fprintf (stderr, "validation layer: %s%s\n", msgSev, callbackData->pMessage);
+	fprintf (stderr, "validation layer: %s%s\n", msgSev,
+			 callbackData->pMessage);
+	debug_breakpoint (messageSeverity);
 	return VK_FALSE;
 }
 
diff --git a/libs/video/renderer/vulkan/vulkan_alias.c b/libs/video/renderer/vulkan/vulkan_alias.c
index 3fa9d7c52..4ba872a1a 100644
--- a/libs/video/renderer/vulkan/vulkan_alias.c
+++ b/libs/video/renderer/vulkan/vulkan_alias.c
@@ -55,6 +55,7 @@
 
 #include "QF/Vulkan/qf_alias.h"
 #include "QF/Vulkan/qf_texture.h"
+#include "QF/Vulkan/buffer.h"
 #include "QF/Vulkan/command.h"
 #include "QF/Vulkan/descriptor.h"
 #include "QF/Vulkan/device.h"
@@ -131,8 +132,9 @@ Vulkan_DrawAlias (struct entity_s *ent, struct vulkan_ctx_s *ctx)
 	dfunc->vkCmdPushDescriptorSetKHR (aframe->cmd,
 									  VK_PIPELINE_BIND_POINT_GRAPHICS,
 									  actx->layout,
-									  0, 2, aframe->descriptors
-											+ ALIAS_BUFFER_INFOS);
+									  ALIAS_BUFFER_INFOS, ALIAS_IMAGE_INFOS,
+									  aframe->descriptors
+									  + ALIAS_BUFFER_INFOS);
 	dfunc->vkCmdDrawIndexed (aframe->cmd, 3 * hdr->mdl.numtris, 1, 0, 0, 0);
 }
 
@@ -142,6 +144,8 @@ Vulkan_AliasBegin (vulkan_ctx_t *ctx)
 	qfv_device_t *device = ctx->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
 	aliasctx_t *actx = ctx->alias_context;
+
+	dlight_t   *lights[ALIAS_LIGHTS];
 	//XXX quat_t      fog;
 
 	__auto_type cframe = &ctx->framebuffers.a[ctx->curFrame];
@@ -149,6 +153,18 @@ Vulkan_AliasBegin (vulkan_ctx_t *ctx)
 	VkCommandBuffer cmd = aframe->cmd;
 	DARRAY_APPEND (cframe->subCommand, cmd);
 
+	R_FindNearLights (r_origin, ALIAS_LIGHTS, lights);
+	aframe->lights->light_count = 0;
+	for (int i = 0; i < ALIAS_LIGHTS; i++) {
+		if (!lights[i]) {
+			break;
+		}
+		aframe->lights->light_count++;
+		VectorCopy (lights[i]->color, aframe->lights->lights[i].color);
+		VectorCopy (lights[i]->origin, aframe->lights->lights[i].position);
+		aframe->lights->lights[i].dist = lights[i]->radius;
+	}
+
 	//FIXME need per frame matrices
 	aframe->bufferInfo[0].buffer = ctx->matrices.buffer_3d;
 	aframe->bufferInfo[1].buffer = aframe->light_buffer;
@@ -169,6 +185,12 @@ Vulkan_AliasBegin (vulkan_ctx_t *ctx)
 
 	dfunc->vkCmdBindPipeline (cmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
 							  actx->pipeline);
+	VkDescriptorSet sets[] = {
+		aframe->descriptors[0].dstSet,
+		aframe->descriptors[1].dstSet,
+	};
+	dfunc->vkCmdBindDescriptorSets (cmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
+									actx->layout, 0, 2, sets, 0, 0);
 	VkViewport  viewport = {0, 0, vid.width, vid.height, 0, 1};
 	VkRect2D    scissor = { {0, 0}, {vid.width, vid.height} };
 	dfunc->vkCmdSetViewport (cmd, 0, 1, &viewport);
@@ -214,6 +236,7 @@ void
 Vulkan_Alias_Init (vulkan_ctx_t *ctx)
 {
 	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
 
 	aliasctx_t *actx = calloc (1, sizeof (aliasctx_t));
 	ctx->alias_context = actx;
@@ -239,10 +262,29 @@ Vulkan_Alias_Init (vulkan_ctx_t *ctx)
 	__auto_type cmdBuffers = QFV_AllocCommandBufferSet (frames, alloca);
 	QFV_AllocateCommandBuffers (device, ctx->cmdpool, 1, cmdBuffers);
 
+	__auto_type lbuffers = QFV_AllocBufferSet (frames, alloca);
+	for (size_t i = 0; i < frames; i++) {
+		lbuffers->a[i] = QFV_CreateBuffer (device, sizeof (qfv_light_buffer_t),
+										   VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT);
+	}
+	VkMemoryRequirements requirements;
+	dfunc->vkGetBufferMemoryRequirements (device->dev, lbuffers->a[0],
+										  &requirements);
+	actx->light_memory = QFV_AllocBufferMemory (device, lbuffers->a[0],
+										VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT,
+										frames * requirements.size, 0);
+	byte       *light_data;
+	dfunc->vkMapMemory (device->dev, actx->light_memory, 0,
+						frames * requirements.size, 0, (void **) &light_data);
+
 	__auto_type sets = QFV_AllocateDescriptorSet (device, pool, layouts);
 	for (size_t i = 0; i < frames; i++) {
 		__auto_type aframe = &actx->frames.a[i];
 		aframe->cmd = cmdBuffers->a[i];
+		aframe->light_buffer = lbuffers->a[i];
+		aframe->lights = (qfv_light_buffer_t *) (light_data + i * requirements.size);
+		QFV_BindBufferMemory (device, lbuffers->a[i], actx->light_memory,
+							  i * requirements.size);
 
 		for (int j = 0; j < ALIAS_BUFFER_INFOS; j++) {
 			aframe->bufferInfo[j] = base_buffer_info;
diff --git a/libs/video/renderer/vulkan/vulkan_main.c b/libs/video/renderer/vulkan/vulkan_main.c
index 95fcd02ab..8df89eaa1 100644
--- a/libs/video/renderer/vulkan/vulkan_main.c
+++ b/libs/video/renderer/vulkan/vulkan_main.c
@@ -109,14 +109,12 @@ setup_view (vulkan_ctx_t *ctx)
 static void
 R_RenderEntities (vulkan_ctx_t *ctx)
 {
-	entity_t   *ent;
-	int         begun;
-
 	if (!r_drawentities->int_val)
 		return;
 #define RE_LOOP(type_name, Type) \
 	do { \
-		begun = 0; \
+		entity_t   *ent; \
+		int         begun = 0; \
 		for (ent = r_ent_queue; ent; ent = ent->next) { \
 			if (ent->model->type != mod_##type_name) \
 				continue; \

From caa7623a353943070b2d871ca9f2fe5a9a8daa70 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 27 Jan 2021 17:59:09 +0900
Subject: [PATCH 1381/1519] [vulkan] Clean up alias light buffer

Still wedging, but it seems to be something to do with the matrix
buffer.
---
 libs/video/renderer/vulkan/vulkan_alias.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/libs/video/renderer/vulkan/vulkan_alias.c b/libs/video/renderer/vulkan/vulkan_alias.c
index 4ba872a1a..0a74c0582 100644
--- a/libs/video/renderer/vulkan/vulkan_alias.c
+++ b/libs/video/renderer/vulkan/vulkan_alias.c
@@ -105,8 +105,8 @@ Vulkan_DrawAlias (struct entity_s *ent, struct vulkan_ctx_s *ctx)
 	}
 
 	VkDeviceSize offsets[] = {
-		ent->pose1 * hdr->poseverts,
-		ent->pose2 * hdr->poseverts,
+		ent->pose1 * hdr->poseverts * sizeof (aliasvrt_t),
+		ent->pose2 * hdr->poseverts * sizeof (aliasvrt_t),
 		0,
 	};
 	VkBuffer    buffers[] = {
@@ -289,7 +289,7 @@ Vulkan_Alias_Init (vulkan_ctx_t *ctx)
 		for (int j = 0; j < ALIAS_BUFFER_INFOS; j++) {
 			aframe->bufferInfo[j] = base_buffer_info;
 			aframe->descriptors[j] = base_buffer_write;
-			aframe->descriptors[j].dstSet = sets->a[2 * i + j];
+			aframe->descriptors[j].dstSet = sets->a[ALIAS_BUFFER_INFOS*i + j];
 			aframe->descriptors[j].dstBinding = 0;
 			aframe->descriptors[j].pBufferInfo = &aframe->bufferInfo[j];
 		}
@@ -312,6 +312,12 @@ Vulkan_Alias_Shutdown (struct vulkan_ctx_s *ctx)
 	qfv_devfuncs_t *dfunc = device->funcs;
 	aliasctx_t *actx = ctx->alias_context;
 
+	for (size_t i = 0; i < actx->frames.size; i++) {
+		__auto_type aframe = &actx->frames.a[i];
+		dfunc->vkDestroyBuffer (device->dev, aframe->light_buffer, 0);
+	}
+	dfunc->vkFreeMemory (device->dev, actx->light_memory, 0);
+
 	dfunc->vkDestroyPipeline (device->dev, actx->pipeline, 0);
 	DARRAY_CLEAR (&actx->frames);
 	free (actx);

From 64904e2b2766e605e150facc50b50d0decb430be Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 28 Jan 2021 10:49:23 +0900
Subject: [PATCH 1382/1519] [vulkan] Switch over to pushed descriptors

I don't really know why (I need to do some research), but this fixes the
lockups when accessing the matrices UBO. It has made a mess of my
carefully designed uniform binding layout, so I hope I can get bound
descriptor sets working the way I want, but I really need to progress on
the rest of the project.
---
 libs/video/renderer/vulkan/alias.frag       |  8 ++--
 libs/video/renderer/vulkan/qfpipeline.plist | 48 +++++++++++++++++++--
 libs/video/renderer/vulkan/vulkan_alias.c   | 27 +++++++-----
 3 files changed, 66 insertions(+), 17 deletions(-)

diff --git a/libs/video/renderer/vulkan/alias.frag b/libs/video/renderer/vulkan/alias.frag
index d1ad194bb..8fb794f47 100644
--- a/libs/video/renderer/vulkan/alias.frag
+++ b/libs/video/renderer/vulkan/alias.frag
@@ -1,5 +1,5 @@
 #version 450
-
+/*
 layout (set = 2, binding = 0) uniform sampler2D Texture;
 layout (set = 2, binding = 1) uniform sampler2D GlowMap;
 layout (set = 2, binding = 2) uniform sampler2D ColorA;
@@ -19,7 +19,7 @@ layout (set = 1, binding = 0) uniform Lights {
 	int         light_count;
 	LightData   lights[MaxLights];
 };
-
+*/
 layout (push_constant) uniform PushConstants {
 	layout (offset = 80)
 	vec4        fog;
@@ -38,7 +38,7 @@ main (void)
 	vec4        c;
 	int         i;
 	vec3        light = vec3 (0);
-
+/*
 	c = texture (Texture, st);
 	c += texture (ColorA, st);
 	c += texture (ColorB, st);
@@ -52,4 +52,6 @@ main (void)
 		}
 	}
 	frag_color = c * vec4(light, 1);//fogBlend (c);
+*/
+	frag_color = vec4((normal + 1)/2, 1);
 }
diff --git a/libs/video/renderer/vulkan/qfpipeline.plist b/libs/video/renderer/vulkan/qfpipeline.plist
index b6823707c..3cbf8db5e 100644
--- a/libs/video/renderer/vulkan/qfpipeline.plist
+++ b/libs/video/renderer/vulkan/qfpipeline.plist
@@ -110,7 +110,7 @@
 				},
 			);
 		};
-		quakebsp.textures = {
+		quakebsp.set = {
 			flags = push_descriptor;
 			bindings = (
 				{
@@ -151,6 +151,47 @@
 				},
 			);
 		};
+		alias.set = {
+			flags = push_descriptor;
+			bindings = (
+				{
+					binding = 0;
+					descriptorType = uniform_buffer;
+					descriptorCount = 1;
+					stageFlags = vertex;
+				},
+				{
+					binding = 1;
+					descriptorType = uniform_buffer;
+					descriptorCount = 1;
+					stageFlags = fragment;
+				},
+				{
+					binding = 2;
+					descriptorType = combined_image_sampler;
+					descriptorCount = 1;
+					stageFlags = fragment;
+				},
+				{
+					binding = 3;
+					descriptorType = combined_image_sampler;
+					descriptorCount = 1;
+					stageFlags = fragment;
+				},
+				{
+					binding = 4;
+					descriptorType = combined_image_sampler;
+					descriptorCount = 1;
+					stageFlags = fragment;
+				},
+				{
+					binding = 5;
+					descriptorType = combined_image_sampler;
+					descriptorCount = 1;
+					stageFlags = fragment;
+				},
+			);
+		};
 		alias.matrices = {
 			bindings = (
 				{
@@ -223,7 +264,7 @@
 			setLayouts = (twod.set);
 		};
 		quakebsp.layout = {
-			setLayouts = (quakebsp.textures);
+			setLayouts = (quakebsp.set);
 			pushConstantRanges = (
 				{
 					stageFlags = vertex;
@@ -238,7 +279,8 @@
 			);
 		};
 		alias.layout = {
-			setLayouts = (alias.matrices, alias.lights, alias.textures);
+			//setLayouts = (alias.matrices, alias.lights, alias.textures);
+			setLayouts = (alias.set);
 			pushConstantRanges = (
 				{
 					stageFlags = vertex;
diff --git a/libs/video/renderer/vulkan/vulkan_alias.c b/libs/video/renderer/vulkan/vulkan_alias.c
index 0a74c0582..3fd17c0b1 100644
--- a/libs/video/renderer/vulkan/vulkan_alias.c
+++ b/libs/video/renderer/vulkan/vulkan_alias.c
@@ -123,6 +123,7 @@ Vulkan_DrawAlias (struct entity_s *ent, struct vulkan_ctx_s *ctx)
 	dfunc->vkCmdPushConstants (aframe->cmd, actx->layout,
 							   VK_SHADER_STAGE_VERTEX_BIT,
 							   64, sizeof (float), &blend);
+	if (0) {
 	aframe->imageInfo[0].imageView = get_view (skin->tex, ctx->default_white);
 	aframe->imageInfo[1].imageView = get_view (skin->glow, ctx->default_black);
 	aframe->imageInfo[2].imageView = get_view (skin->colora,
@@ -135,6 +136,7 @@ Vulkan_DrawAlias (struct entity_s *ent, struct vulkan_ctx_s *ctx)
 									  ALIAS_BUFFER_INFOS, ALIAS_IMAGE_INFOS,
 									  aframe->descriptors
 									  + ALIAS_BUFFER_INFOS);
+	}
 	dfunc->vkCmdDrawIndexed (aframe->cmd, 3 * hdr->mdl.numtris, 1, 0, 0, 0);
 }
 
@@ -185,18 +187,21 @@ Vulkan_AliasBegin (vulkan_ctx_t *ctx)
 
 	dfunc->vkCmdBindPipeline (cmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
 							  actx->pipeline);
-	VkDescriptorSet sets[] = {
-		aframe->descriptors[0].dstSet,
-		aframe->descriptors[1].dstSet,
-	};
-	dfunc->vkCmdBindDescriptorSets (cmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
-									actx->layout, 0, 2, sets, 0, 0);
+	//VkDescriptorSet sets[] = {
+	//	aframe->descriptors[0].dstSet,
+	//	aframe->descriptors[1].dstSet,
+	//};
+	//dfunc->vkCmdBindDescriptorSets (cmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
+	//								actx->layout, 0, 2, sets, 0, 0);
+	dfunc->vkCmdPushDescriptorSetKHR (cmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
+									  actx->layout,
+									  0, 1, aframe->descriptors + 0);
 	VkViewport  viewport = {0, 0, vid.width, vid.height, 0, 1};
 	VkRect2D    scissor = { {0, 0}, {vid.width, vid.height} };
 	dfunc->vkCmdSetViewport (cmd, 0, 1, &viewport);
 	dfunc->vkCmdSetScissor (cmd, 0, 1, &scissor);
 
-	dfunc->vkUpdateDescriptorSets (device->dev, 2, aframe->descriptors, 0, 0);
+	//dfunc->vkUpdateDescriptorSets (device->dev, 2, aframe->descriptors, 0, 0);
 
 	//XXX glsl_Fog_GetColor (fog);
 	//XXX fog[3] = glsl_Fog_GetDensity () / 64.0;
@@ -257,7 +262,7 @@ Vulkan_Alias_Init (vulkan_ctx_t *ctx)
 		layouts->a[2 * i + 0] = mats;
 		layouts->a[2 * i + 1] = lights;
 	}
-	__auto_type pool = QFV_GetDescriptorPool (ctx, "alias.pool");
+	//__auto_type pool = QFV_GetDescriptorPool (ctx, "alias.pool");
 
 	__auto_type cmdBuffers = QFV_AllocCommandBufferSet (frames, alloca);
 	QFV_AllocateCommandBuffers (device, ctx->cmdpool, 1, cmdBuffers);
@@ -277,7 +282,7 @@ Vulkan_Alias_Init (vulkan_ctx_t *ctx)
 	dfunc->vkMapMemory (device->dev, actx->light_memory, 0,
 						frames * requirements.size, 0, (void **) &light_data);
 
-	__auto_type sets = QFV_AllocateDescriptorSet (device, pool, layouts);
+	//__auto_type sets = QFV_AllocateDescriptorSet (device, pool, layouts);
 	for (size_t i = 0; i < frames; i++) {
 		__auto_type aframe = &actx->frames.a[i];
 		aframe->cmd = cmdBuffers->a[i];
@@ -289,7 +294,7 @@ Vulkan_Alias_Init (vulkan_ctx_t *ctx)
 		for (int j = 0; j < ALIAS_BUFFER_INFOS; j++) {
 			aframe->bufferInfo[j] = base_buffer_info;
 			aframe->descriptors[j] = base_buffer_write;
-			aframe->descriptors[j].dstSet = sets->a[ALIAS_BUFFER_INFOS*i + j];
+			//aframe->descriptors[j].dstSet = sets->a[ALIAS_BUFFER_INFOS*i + j];
 			aframe->descriptors[j].dstBinding = 0;
 			aframe->descriptors[j].pBufferInfo = &aframe->bufferInfo[j];
 		}
@@ -302,7 +307,7 @@ Vulkan_Alias_Init (vulkan_ctx_t *ctx)
 			aframe->descriptors[k].pImageInfo = &aframe->imageInfo[j];
 		}
 	}
-	free (sets);
+	//free (sets);
 }
 
 void

From 28652c4d59134443dc8a4910fdc90f5dec829ac2 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 28 Jan 2021 14:14:21 +0900
Subject: [PATCH 1383/1519] [vulkan] Implement alias model texturing

I had messed up my index array creation, but once that was fixed the
textures worked well other than a lot of pixels are shades of grey due
to being in the top or bottom color map range.
---
 libs/models/alias/vulkan_model_alias.c    |  9 +++++----
 libs/video/renderer/vulkan/alias.frag     | 13 +++++++++----
 libs/video/renderer/vulkan/vulkan_alias.c |  6 ++----
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/libs/models/alias/vulkan_model_alias.c b/libs/models/alias/vulkan_model_alias.c
index a5520217c..832541071 100644
--- a/libs/models/alias/vulkan_model_alias.c
+++ b/libs/models/alias/vulkan_model_alias.c
@@ -300,12 +300,13 @@ Vulkan_Mod_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr, void *_m,
 	}
 
 	// now build the indices for DrawElements
-	for (i = 0; i < hdr->mdl.numverts; i++) {
-		indexmap[i] = indexmap[i] != -1 ? indexmap[i] : i;
-	}
 	for (i = 0; i < numtris; i++) {
 		for (j = 0; j < 3; j++) {
-			indices[3 * i + j] = indexmap[triangles.a[i].vertindex[j]];
+			int         vind = triangles.a[i].vertindex[j];
+			if (stverts.a[vind].onseam && !triangles.a[i].facesfront) {
+				vind = indexmap[vind];
+			}
+			indices[3 * i + j] = vind;
 		}
 	}
 	// finished with indexmap
diff --git a/libs/video/renderer/vulkan/alias.frag b/libs/video/renderer/vulkan/alias.frag
index 8fb794f47..513b92d2a 100644
--- a/libs/video/renderer/vulkan/alias.frag
+++ b/libs/video/renderer/vulkan/alias.frag
@@ -1,4 +1,8 @@
 #version 450
+layout (set = 0, binding = 2) uniform sampler2D Texture;
+layout (set = 0, binding = 3) uniform sampler2D GlowMap;
+layout (set = 0, binding = 4) uniform sampler2D ColorA;
+layout (set = 0, binding = 5) uniform sampler2D ColorB;
 /*
 layout (set = 2, binding = 0) uniform sampler2D Texture;
 layout (set = 2, binding = 1) uniform sampler2D GlowMap;
@@ -38,11 +42,10 @@ main (void)
 	vec4        c;
 	int         i;
 	vec3        light = vec3 (0);
-/*
 	c = texture (Texture, st);
 	c += texture (ColorA, st);
 	c += texture (ColorB, st);
-	c += texture (GlowMap, st);
+/*
 	if (MaxLights > 0) {
 		for (i = 0; i < light_count; i++) {
 			vec3 dist = lights[i].position - position;
@@ -51,7 +54,9 @@ main (void)
 			light += lights[i].color * mag * lights[i].dist / dd;
 		}
 	}
-	frag_color = c * vec4(light, 1);//fogBlend (c);
+	c *= vec4 (light, 1);
 */
-	frag_color = vec4((normal + 1)/2, 1);
+	c += texture (GlowMap, st);
+	//frag_color = vec4((normal + 1)/2, 1);
+	frag_color = c;//fogBlend (c);
 }
diff --git a/libs/video/renderer/vulkan/vulkan_alias.c b/libs/video/renderer/vulkan/vulkan_alias.c
index 3fd17c0b1..6d1628bc0 100644
--- a/libs/video/renderer/vulkan/vulkan_alias.c
+++ b/libs/video/renderer/vulkan/vulkan_alias.c
@@ -123,7 +123,6 @@ Vulkan_DrawAlias (struct entity_s *ent, struct vulkan_ctx_s *ctx)
 	dfunc->vkCmdPushConstants (aframe->cmd, actx->layout,
 							   VK_SHADER_STAGE_VERTEX_BIT,
 							   64, sizeof (float), &blend);
-	if (0) {
 	aframe->imageInfo[0].imageView = get_view (skin->tex, ctx->default_white);
 	aframe->imageInfo[1].imageView = get_view (skin->glow, ctx->default_black);
 	aframe->imageInfo[2].imageView = get_view (skin->colora,
@@ -133,10 +132,9 @@ Vulkan_DrawAlias (struct entity_s *ent, struct vulkan_ctx_s *ctx)
 	dfunc->vkCmdPushDescriptorSetKHR (aframe->cmd,
 									  VK_PIPELINE_BIND_POINT_GRAPHICS,
 									  actx->layout,
-									  ALIAS_BUFFER_INFOS, ALIAS_IMAGE_INFOS,
+									  0, ALIAS_IMAGE_INFOS,
 									  aframe->descriptors
 									  + ALIAS_BUFFER_INFOS);
-	}
 	dfunc->vkCmdDrawIndexed (aframe->cmd, 3 * hdr->mdl.numtris, 1, 0, 0, 0);
 }
 
@@ -303,7 +301,7 @@ Vulkan_Alias_Init (vulkan_ctx_t *ctx)
 			aframe->imageInfo[j].sampler = actx->sampler;
 			int k = j + ALIAS_BUFFER_INFOS;
 			aframe->descriptors[k] = base_image_write;
-			aframe->descriptors[k].dstBinding = j;
+			aframe->descriptors[k].dstBinding = k;
 			aframe->descriptors[k].pImageInfo = &aframe->imageInfo[j];
 		}
 	}

From 206c63181141b37dec4cda716053928289dd15a8 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 28 Jan 2021 15:20:24 +0900
Subject: [PATCH 1384/1519] [vulkan] Get alias lighting mostly working

It's not so much that parts aren't working, but rather there's no
base-level lighting so everything is black until a dlight is in the
vicinity
---
 libs/video/renderer/vulkan/alias.frag     | 11 ++++++-----
 libs/video/renderer/vulkan/vulkan_alias.c |  4 ++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/libs/video/renderer/vulkan/alias.frag b/libs/video/renderer/vulkan/alias.frag
index 513b92d2a..aa0deafdb 100644
--- a/libs/video/renderer/vulkan/alias.frag
+++ b/libs/video/renderer/vulkan/alias.frag
@@ -8,7 +8,7 @@ layout (set = 2, binding = 0) uniform sampler2D Texture;
 layout (set = 2, binding = 1) uniform sampler2D GlowMap;
 layout (set = 2, binding = 2) uniform sampler2D ColorA;
 layout (set = 2, binding = 3) uniform sampler2D ColorB;
-
+*/
 struct LightData {
 	vec3        color;
 	float       dist;
@@ -19,11 +19,12 @@ struct LightData {
 };
 
 layout (constant_id = 0) const int MaxLights = 8;
-layout (set = 1, binding = 0) uniform Lights {
+//layout (set = 1, binding = 0) uniform Lights {
+layout (set = 0, binding = 1) uniform Lights {
 	int         light_count;
 	LightData   lights[MaxLights];
 };
-*/
+
 layout (push_constant) uniform PushConstants {
 	layout (offset = 80)
 	vec4        fog;
@@ -45,7 +46,7 @@ main (void)
 	c = texture (Texture, st);
 	c += texture (ColorA, st);
 	c += texture (ColorB, st);
-/*
+
 	if (MaxLights > 0) {
 		for (i = 0; i < light_count; i++) {
 			vec3 dist = lights[i].position - position;
@@ -55,7 +56,7 @@ main (void)
 		}
 	}
 	c *= vec4 (light, 1);
-*/
+
 	c += texture (GlowMap, st);
 	//frag_color = vec4((normal + 1)/2, 1);
 	frag_color = c;//fogBlend (c);
diff --git a/libs/video/renderer/vulkan/vulkan_alias.c b/libs/video/renderer/vulkan/vulkan_alias.c
index 6d1628bc0..a71e0629e 100644
--- a/libs/video/renderer/vulkan/vulkan_alias.c
+++ b/libs/video/renderer/vulkan/vulkan_alias.c
@@ -193,7 +193,7 @@ Vulkan_AliasBegin (vulkan_ctx_t *ctx)
 	//								actx->layout, 0, 2, sets, 0, 0);
 	dfunc->vkCmdPushDescriptorSetKHR (cmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
 									  actx->layout,
-									  0, 1, aframe->descriptors + 0);
+									  0, 2, aframe->descriptors + 0);
 	VkViewport  viewport = {0, 0, vid.width, vid.height, 0, 1};
 	VkRect2D    scissor = { {0, 0}, {vid.width, vid.height} };
 	dfunc->vkCmdSetViewport (cmd, 0, 1, &viewport);
@@ -293,7 +293,7 @@ Vulkan_Alias_Init (vulkan_ctx_t *ctx)
 			aframe->bufferInfo[j] = base_buffer_info;
 			aframe->descriptors[j] = base_buffer_write;
 			//aframe->descriptors[j].dstSet = sets->a[ALIAS_BUFFER_INFOS*i + j];
-			aframe->descriptors[j].dstBinding = 0;
+			aframe->descriptors[j].dstBinding = j;
 			aframe->descriptors[j].pBufferInfo = &aframe->bufferInfo[j];
 		}
 		for (int j = 0; j < ALIAS_IMAGE_INFOS; j++) {

From 7ee02f39653e952101c73b8b67bc6dadf240e952 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 28 Jan 2021 19:17:40 +0900
Subject: [PATCH 1385/1519] [vulkan] Sort of implement ambient lighting

It works, but as it uses the camera position rather than the lit
entity's position, it is incorrect. I have some interim ideas to handle
it, though.
---
 libs/video/renderer/vulkan/alias.frag     | 21 ++++++++++++---
 libs/video/renderer/vulkan/vulkan_alias.c | 33 ++++++++++++++++++-----
 2 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/libs/video/renderer/vulkan/alias.frag b/libs/video/renderer/vulkan/alias.frag
index aa0deafdb..eff6ff10a 100644
--- a/libs/video/renderer/vulkan/alias.frag
+++ b/libs/video/renderer/vulkan/alias.frag
@@ -37,6 +37,22 @@ layout (location = 2) in vec3 normal;
 
 layout (location = 0) out vec4 frag_color;
 
+vec3
+calc_light (LightData light)
+{
+	if (light.type == 0) {
+		vec3 dist = light.position - position;
+		float dd = dot (dist, dist);
+		float mag = max (0.0, dot (dist, normal));
+		return light.color * mag * light.dist / dd;
+	} else if (light.type == 1) {
+	} else if (light.type == 2) {
+		float mag = max (0.0, -dot (light.direction, normal));
+		// position is ambient light
+		return light.color * dot (light.direction, normal) + light.position;
+	}
+}
+
 void
 main (void)
 {
@@ -49,10 +65,7 @@ main (void)
 
 	if (MaxLights > 0) {
 		for (i = 0; i < light_count; i++) {
-			vec3 dist = lights[i].position - position;
-			float dd = dot (dist, dist);
-			float mag = max (0.0, dot (dist, normal));
-			light += lights[i].color * mag * lights[i].dist / dd;
+			light += calc_light (lights[i]);
 		}
 	}
 	c *= vec4 (light, 1);
diff --git a/libs/video/renderer/vulkan/vulkan_alias.c b/libs/video/renderer/vulkan/vulkan_alias.c
index a71e0629e..a31267cfb 100644
--- a/libs/video/renderer/vulkan/vulkan_alias.c
+++ b/libs/video/renderer/vulkan/vulkan_alias.c
@@ -77,7 +77,7 @@ get_view (qfv_tex_t *tex, qfv_tex_t *default_tex)
 }
 
 void
-Vulkan_DrawAlias (struct entity_s *ent, struct vulkan_ctx_s *ctx)
+Vulkan_DrawAlias (entity_t *ent, struct vulkan_ctx_s *ctx)
 {
 	qfv_device_t *device = ctx->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
@@ -138,6 +138,22 @@ Vulkan_DrawAlias (struct entity_s *ent, struct vulkan_ctx_s *ctx)
 	dfunc->vkCmdDrawIndexed (aframe->cmd, 3 * hdr->mdl.numtris, 1, 0, 0, 0);
 }
 
+static void
+calc_lighting (qfv_light_t *light, entity_t *ent)
+{
+	vec3_t      ambient_color;
+	//FIXME should be ent->position
+	float       l = R_LightPoint (r_origin) / 128.0;
+
+	//XXX l = max (light, max (ent->model->min_light, ent->min_light));
+	light->type = 2;
+	VectorSet (1, 1, 1, ambient_color);	//FIXME
+	// position doubles as ambient light
+	VectorScale (ambient_color, l, light->position);
+	VectorSet (-1, 0, 0, light->direction);	//FIXME
+	VectorCopy (light->position, light->color);
+}
+
 void
 Vulkan_AliasBegin (vulkan_ctx_t *ctx)
 {
@@ -153,16 +169,19 @@ Vulkan_AliasBegin (vulkan_ctx_t *ctx)
 	VkCommandBuffer cmd = aframe->cmd;
 	DARRAY_APPEND (cframe->subCommand, cmd);
 
-	R_FindNearLights (r_origin, ALIAS_LIGHTS, lights);
-	aframe->lights->light_count = 0;
-	for (int i = 0; i < ALIAS_LIGHTS; i++) {
+	//FIXME ambient needs to be per entity
+	aframe->lights->light_count = 1;
+	calc_lighting (&aframe->lights->lights[0], 0);
+	R_FindNearLights (r_origin, ALIAS_LIGHTS - 1, lights);
+	for (int i = 0; i < ALIAS_LIGHTS - 1; i++) {
 		if (!lights[i]) {
 			break;
 		}
 		aframe->lights->light_count++;
-		VectorCopy (lights[i]->color, aframe->lights->lights[i].color);
-		VectorCopy (lights[i]->origin, aframe->lights->lights[i].position);
-		aframe->lights->lights[i].dist = lights[i]->radius;
+		VectorCopy (lights[i]->color, aframe->lights->lights[i + 1].color);
+		VectorCopy (lights[i]->origin, aframe->lights->lights[i + 1].position);
+		aframe->lights->lights[i + 1].dist = lights[i]->radius;
+		aframe->lights->lights[i + 1].type = 0;
 	}
 
 	//FIXME need per frame matrices

From cad1eb42fdc1f3e72feb0db3ce346fca41391b2f Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 30 Jan 2021 14:45:47 +0900
Subject: [PATCH 1386/1519] [qwaq] Put my qdb script in a safe place

The paths are generally wrong, and it's not overly complicated, but
having a reference helps me remember how to use the thing.
---
 ruamoko/qwaq/qdb | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100755 ruamoko/qwaq/qdb

diff --git a/ruamoko/qwaq/qdb b/ruamoko/qwaq/qdb
new file mode 100755
index 000000000..7f1ed27e2
--- /dev/null
+++ b/ruamoko/qwaq/qdb
@@ -0,0 +1,3 @@
+#! /bin/bash -x
+
+./qwaq-curses qwaq-app.dat $1

From f523f6ba80eeb7efdc0095c2c27a23e39439cc4d Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 30 Jan 2021 14:49:42 +0900
Subject: [PATCH 1387/1519] [vid] Disable X11 repeat control

For now, at least. It is a royal pain in the neck when doing a lot of
development work and I'm not sure it's worthwhile on modern CPUs.
---
 libs/video/targets/in_x11.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/libs/video/targets/in_x11.c b/libs/video/targets/in_x11.c
index 8ef111ec2..2787771c6 100644
--- a/libs/video/targets/in_x11.c
+++ b/libs/video/targets/in_x11.c
@@ -599,11 +599,11 @@ XLateKey (XKeyEvent * ev, int *k, int *u)
 static void
 x11_keydest_callback (keydest_t key_dest)
 {
-	if (key_dest == key_game) {
-		XAutoRepeatOff (x_disp);
-	} else {
-		XAutoRepeatOn (x_disp);
-	}
+//	if (key_dest == key_game) {
+//		XAutoRepeatOff (x_disp);
+//	} else {
+//		XAutoRepeatOn (x_disp);
+//	}
 }
 
 static void
@@ -792,7 +792,7 @@ IN_LL_Shutdown (void)
 	Sys_MaskPrintf (SYS_VID, "IN_LL_Shutdown\n");
 	in_mouse_avail = 0;
 	if (x_disp) {
-		XAutoRepeatOn (x_disp);
+//		XAutoRepeatOn (x_disp);
 		dga_off ();
 	}
 	if (in_mouse_accel && !in_mouse_accel->int_val)

From 7970525ef4fac3a3ea11e9ee85ff83d81dc853eb Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 31 Jan 2021 16:01:20 +0900
Subject: [PATCH 1388/1519] [util] Make va thread-safe

It now takes a context pointer (opaque data) that holds the buffers it
uses for the temporary strings. If the context pointer is null, a static
context is used (making those uses of va NOT thread-safe). Most calls to
va use the static context, but all such calls have been formatted
consistently so they are easy to find when it comes time to do a full
audit.
---
 include/QF/va.h                            | 57 ++++++++++++++++++++--
 include/vid_vulkan.h                       |  1 +
 libs/audio/cd_file.c                       |  4 +-
 libs/audio/renderer/snd_jack.c             |  2 +-
 libs/audio/renderer/snd_sfx.c              |  2 +-
 libs/console/client.c                      |  4 +-
 libs/console/complete.c                    |  2 +-
 libs/console/filelist.c                    |  2 +-
 libs/gib/exp.c                             | 16 +++---
 libs/gib/gib_builtin.c                     |  2 +-
 libs/gib/gib_classes.c                     |  4 +-
 libs/gib/gib_object.c                      |  2 +-
 libs/gib/gib_parse.c                       |  6 ++-
 libs/gib/gib_vars.c                        |  2 +-
 libs/models/alias/gl_model_alias.c         | 14 +++---
 libs/models/alias/glsl_model_alias.c       |  4 +-
 libs/models/alias/vulkan_model_alias.c     | 17 +++++--
 libs/models/brush/gl_model_brush.c         | 20 ++++----
 libs/models/brush/vulkan_model_brush.c     |  2 +-
 libs/models/iqm/gl_model_iqm.c             |  2 +-
 libs/models/iqm/glsl_model_iqm.c           |  4 +-
 libs/models/iqm/sw_model_iqm.c             |  2 +-
 libs/models/skin.c                         |  2 +-
 libs/models/sprite/gl_model_sprite.c       |  2 +-
 libs/models/sprite/glsl_model_sprite.c     |  2 +-
 libs/ruamoko/rua_cvar.c                    |  6 +--
 libs/ruamoko/rua_qfs.c                     |  3 +-
 libs/util/cvar.c                           |  4 +-
 libs/util/qfplist.c                        | 32 +++++++-----
 libs/util/quakefs.c                        | 18 +++----
 libs/util/va.c                             | 53 ++++++++++++++------
 libs/video/renderer/gl/gl_dyn_part.c       |  2 +-
 libs/video/renderer/gl/gl_screen.c         |  2 +-
 libs/video/renderer/gl/gl_sky.c            |  5 +-
 libs/video/renderer/glsl/glsl_bsp.c        |  6 +--
 libs/video/renderer/glsl/glsl_particles.c  |  2 +-
 libs/video/renderer/glsl/glsl_screen.c     |  4 +-
 libs/video/renderer/glsl/vid_common_glsl.c |  2 +-
 libs/video/renderer/sw/screen.c            |  2 +-
 libs/video/renderer/sw/sw_rpart.c          |  2 +-
 libs/video/renderer/sw32/screen.c          |  4 +-
 libs/video/renderer/sw32/sw32_rpart.c      |  2 +-
 libs/video/targets/context_sdl.c           |  4 +-
 libs/video/targets/context_x11.c           |  2 +-
 libs/video/targets/joy.c                   |  2 +-
 libs/video/targets/vid.c                   | 16 +++---
 libs/video/targets/vid_x11.c               |  4 +-
 libs/video/targets/vid_x11_vulkan.c        |  2 +
 nq/source/cl_demo.c                        |  2 +-
 nq/source/cl_main.c                        | 10 ++--
 nq/source/cl_parse.c                       |  2 +-
 nq/source/host.c                           |  6 +--
 nq/source/host_cmd.c                       | 22 ++++-----
 nq/source/sbar.c                           | 28 +++++------
 nq/source/sv_main.c                        |  2 +-
 nq/source/sv_pr_cmds.c                     |  2 +-
 qtv/source/client.c                        |  6 +--
 qtv/source/qtv.c                           |  2 +-
 qtv/source/sbar.c                          |  4 +-
 qtv/source/server.c                        |  5 +-
 qtv/source/sv_parse.c                      | 12 ++---
 qw/source/cl_chat.c                        |  2 +-
 qw/source/cl_cvar.c                        |  2 +-
 qw/source/cl_demo.c                        |  6 +--
 qw/source/cl_main.c                        | 12 ++---
 qw/source/cl_parse.c                       | 35 +++++++------
 qw/source/cl_skin.c                        |  5 +-
 qw/source/cl_slist.c                       |  2 +-
 qw/source/crudefile.c                      |  2 +-
 qw/source/locs.c                           |  4 +-
 qw/source/sbar.c                           | 29 ++++++-----
 qw/source/sv_ccmds.c                       | 32 ++++++------
 qw/source/sv_demo.c                        | 10 ++--
 qw/source/sv_init.c                        |  4 +-
 qw/source/sv_main.c                        |  6 +--
 qw/source/sv_pr_cmds.c                     | 10 ++--
 qw/source/sv_pr_qwe.c                      |  2 +-
 qw/source/sv_qtv.c                         |  8 +--
 qw/source/sv_sbar.c                        |  4 +-
 qw/source/sv_user.c                        | 16 +++---
 qw/source/teamplay.c                       |  8 +--
 ruamoko/qwaq/builtins/main.c               |  2 +-
 ruamoko/qwaq/builtins/qwaq.c               |  2 +-
 tools/qfbsp/source/brush.c                 |  2 +-
 tools/qfbsp/source/map.c                   |  2 +-
 tools/qfbsp/source/readbsp.c               |  4 +-
 tools/qfbsp/source/writebsp.c              |  2 +-
 tools/qfcc/source/class.c                  | 55 +++++++++++----------
 tools/qfcc/source/def.c                    |  6 +--
 tools/qfcc/source/dot_expr.c               | 31 ++++++------
 tools/qfcc/source/dot_flow.c               |  2 +-
 tools/qfcc/source/dot_type.c               |  2 +-
 tools/qfcc/source/dump_globals.c           | 30 ++++++------
 tools/qfcc/source/expr.c                   |  7 +--
 tools/qfcc/source/flow.c                   |  2 +-
 tools/qfcc/source/function.c               |  6 +--
 tools/qfcc/source/linker.c                 |  2 +-
 tools/qfcc/source/method.c                 |  4 +-
 tools/qfcc/source/obj_file.c               |  4 +-
 tools/qfcc/source/options.c                |  2 +-
 tools/qfcc/source/qc-parse.y               |  6 ++-
 tools/qfcc/source/qfcc.c                   |  4 +-
 tools/qfcc/source/qfprogs.c                |  4 +-
 tools/qfcc/source/statements.c             | 43 ++++++++--------
 tools/qfcc/source/struct.c                 |  6 +--
 tools/qflight/source/entities.c            |  3 +-
 tools/qflight/source/qflight.c             |  2 +-
 tools/wad/script.c                         |  2 +-
 108 files changed, 505 insertions(+), 390 deletions(-)

diff --git a/include/QF/va.h b/include/QF/va.h
index 1bf0eadaf..74a28aba7 100644
--- a/include/QF/va.h
+++ b/include/QF/va.h
@@ -34,9 +34,60 @@
 */
 ///@{
 
-// does a varargs printf into a temp buffer
-char	*va(const char *format, ...) __attribute__((format(printf,1,2)));
-// does a varargs printf into a malloced buffer
+/** Opaque context for va so it can have per-thread data.
+ */
+typedef struct va_ctx_s va_ctx_t;
+
+/** Create a va context with the specified number of buffers.
+ *
+ * Having multiple buffers allows va to be used in short chains.
+ *
+ * \param buffers	The number of buffers to create in the context. va() will
+ *					cycle through the buffers for each call.
+ * \return			Pointer to the context. Pass to va() for thread-safe usage.
+ */
+va_ctx_t *va_create_context (int buffers);
+
+/** Destroy a va context.
+ *
+ * \param ctx		The context to be destroyed. Must have been created by
+ *					va_create_context().
+ * \note			Any pointers to strings returned by va() using the context
+ *					referenced by \a ctx will become invalid as the backing
+ *					memory for the strings will have been freed.
+ */
+void va_destroy_context (va_ctx_t *ctx);
+
+/** Does a varargs printf into a private buffer.
+ *
+ * \param ctx		Context used for storing the private buffer such that va
+ *                  can be used in a multi-threaded environment. If null then
+ *					a static context is used, in which case va is NOT
+ *					thread-safe.
+ * \param format	Standard printf() format string.
+ * \return			Pointer to the beginning of the output string. The memory
+ *					for the returned string is owned by the context pointed to
+ *					by \a ctx.
+ * \note			The static context is created with 4 buffers, so va (0,...)
+ *					can be used to produce mildly complex output (eg, 3 calls
+ *					to va sent to a 4th) with a reduced risk of strings being
+ *					trampled.
+ */
+char	*va(va_ctx_t *ctx, const char *format, ...) __attribute__((format(printf,2,3)));
+
+/** Does a varargs printf into a malloced buffer.
+ *
+ * Combines the effect of strdup and sprintf, but in a safe manner. Essentially
+ * the equivalent of strdup (va (ctx, format, ...));
+ *
+ * \param format	Standard printf() format string.
+ * \return			Pointer to the beginning of the output string. The caller
+ *					is responsible for freeing the memory holding the string.
+ * \note			As nva() creates a new buffer every time it is called, it
+ *					is thread-safe and there is no risk of the string being
+ *					trampled. In addition, it does not use va(), so combining
+ *					nva() with va() is safe.
+ */
 char	*nva(const char *format, ...) __attribute__((format(printf,1,2)));
 
 ///@}
diff --git a/include/vid_vulkan.h b/include/vid_vulkan.h
index 8a60707fe..a213c7ac5 100644
--- a/include/vid_vulkan.h
+++ b/include/vid_vulkan.h
@@ -50,6 +50,7 @@ typedef struct vulkan_ctx_s {
 	void        (*create_window) (struct vulkan_ctx_s *ctx);
 	VkSurfaceKHR (*create_surface) (struct vulkan_ctx_s *ctx);
 
+	struct va_ctx_s *va_ctx;
 	struct qfv_instance_s *instance;
 	struct qfv_device_s *device;
 	struct qfv_swapchain_s *swapchain;
diff --git a/libs/audio/cd_file.c b/libs/audio/cd_file.c
index 94d394154..ef9979bd9 100644
--- a/libs/audio/cd_file.c
+++ b/libs/audio/cd_file.c
@@ -189,7 +189,7 @@ Load_Tracklist (void)
 static void
 I_OGGMus_SetPlayList (int track)
 {
-	const char *trackstring = va ("%i", track);
+	const char *trackstring = va (0, "%i", track);
 	int         i;
 
 	play_list = PL_ObjectForKey (tracklist, trackstring);
@@ -327,7 +327,7 @@ I_OGGMus_Info (void)
 
 	/* loop, and count up the Highest key number. */
 	for (iter = 1, count = 0; count < keycount && iter <= 99 ; iter++) {
-		trackstring = va ("%i", iter);
+		trackstring = va (0, "%i", iter);
 		if (!(currenttrack = PL_ObjectForKey (tracklist, trackstring))) {
 			continue;
 		}
diff --git a/libs/audio/renderer/snd_jack.c b/libs/audio/renderer/snd_jack.c
index f37ef3dc8..e35d61e50 100644
--- a/libs/audio/renderer/snd_jack.c
+++ b/libs/audio/renderer/snd_jack.c
@@ -329,7 +329,7 @@ s_jack_connect (void)
 	jack_set_process_callback (jack_handle, snd_jack_process, 0);
 	jack_on_shutdown (jack_handle, snd_jack_shutdown, 0);
 	for (i = 0; i < 2; i++)
-		jack_out[i] = jack_port_register (jack_handle, va ("out_%d", i + 1),
+		jack_out[i] = jack_port_register (jack_handle, va (0, "out_%d", i + 1),
 										  JACK_DEFAULT_AUDIO_TYPE,
 										  JackPortIsOutput, 0);
 	snd_shm->speed = jack_get_sample_rate (jack_handle);
diff --git a/libs/audio/renderer/snd_sfx.c b/libs/audio/renderer/snd_sfx.c
index 4dc57ee90..8152213a6 100644
--- a/libs/audio/renderer/snd_sfx.c
+++ b/libs/audio/renderer/snd_sfx.c
@@ -199,7 +199,7 @@ SND_PrecacheSound (const char *name)
 	if (!name)
 		Sys_Error ("SND_PrecacheSound: NULL");
 
-	sfx = SND_LoadSound (va ("sound/%s", name));
+	sfx = SND_LoadSound (va (0, "sound/%s", name));
 	if (sfx && precache->int_val) {
 		if (sfx->retain (sfx))
 			sfx->release (sfx);
diff --git a/libs/console/client.c b/libs/console/client.c
index 582113703..3370a7614 100644
--- a/libs/console/client.c
+++ b/libs/console/client.c
@@ -251,7 +251,7 @@ Condump_f (void)
 		Sys_Printf ("invalid character in filename\n");
 		return;
 	}
-	name = va ("%s/%s.txt", qfs_gamedir->dir.def, Cmd_Argv (1));
+	name = va (0, "%s/%s.txt", qfs_gamedir->dir.def, Cmd_Argv (1));//FIXME
 
 	if (!(file = QFS_WOpen (name, 0))) {
 		Sys_Printf ("could not open %s for writing: %s\n", name,
@@ -375,7 +375,7 @@ C_Print (const char *fmt, va_list args)
 
 	// log all messages to file
 	if (con_debuglog)
-		Sys_DebugLog (va ("%s/%s/qconsole.log", qfs_userpath,
+		Sys_DebugLog (va (0, "%s/%s/qconsole.log", qfs_userpath,//FIXME
 					  qfs_gamedir->dir.def), "%s", buffer->str);
 
 	if (!con_initialized)
diff --git a/libs/console/complete.c b/libs/console/complete.c
index 83dedc7a1..220906473 100644
--- a/libs/console/complete.c
+++ b/libs/console/complete.c
@@ -157,7 +157,7 @@ Con_BasicCompleteCommandLine (inputline_t *il)
 				   && strncmp (s + bound, cmd, strlen (s + bound)))
 				bound++;
 
-		overwrite = va("%.*s%.*s", bound, s, cmd_len, cmd);
+		overwrite = va (0, "%.*s%.*s", bound, s, cmd_len, cmd);
 
 		il->lines[il->edit_line][1] = '/';
 		strncpy (il->lines[il->edit_line] + 2, overwrite, il->line_size - 3);
diff --git a/libs/console/filelist.c b/libs/console/filelist.c
index dd979743a..b2942c593 100644
--- a/libs/console/filelist.c
+++ b/libs/console/filelist.c
@@ -167,7 +167,7 @@ Con_Skyboxlist_f (void)
 			for (j = 1; sb_endings[j]; j++) {
 				b = 0;
 				for (k = 0; k < skyboxlist->count; k++) {
-					if (strcmp(va("%s%s", basename->str, sb_endings[j]),
+					if (strcmp(va (0, "%s%s", basename->str, sb_endings[j]),
 							   skyboxlist->list[k]) == 0) {
 						b = 1;
 						*skyboxlist->list[k] = 0;
diff --git a/libs/gib/exp.c b/libs/gib/exp.c
index f56159e71..3ca5b19b8 100644
--- a/libs/gib/exp.c
+++ b/libs/gib/exp.c
@@ -311,7 +311,7 @@ EXP_ParseString (char *str)
 				} else {
 					EXP_DestroyTokens (chain);
 					EXP_Error (EXP_E_INVOP,
-							   va ("Unknown operator or function '%s'.", buf));
+							   va (0, "Unknown operator or function '%s'.", buf));
 					return 0;
 				}
 			}
@@ -347,8 +347,7 @@ EXP_SimplifyTokens (token * chain)
 				cur = cur->generic.prev;
 				if (EXP_DoFunction (cur))
 					return EXP_Error (EXP_E_SYNTAX,
-									  va
-									  ("Invalid number of arguments to function '%s'.",
+									  va (0, "Invalid number of arguments to function '%s'.",
 									   cur->func.func->str));
 			} else {
 				if (EXP_ContainsCommas (cur))
@@ -374,8 +373,7 @@ EXP_SimplifyTokens (token * chain)
 				if (cur->generic.next->generic.type == TOKEN_OP)
 					if (EXP_DoUnary (cur->generic.next))
 						return EXP_Error (EXP_E_SYNTAX,
-										  va
-										  ("Unary operator '%s' not followed by a unary operator or numerical value.",
+										  va (0, "Unary operator '%s' not followed by a unary operator or numerical value.",
 										   cur->generic.next->op.op->str));
 				if (optable[i].operands == 1
 					&& cur->generic.next->generic.type == TOKEN_NUM) {
@@ -482,14 +480,12 @@ EXP_Validate (token * chain)
 				cur->generic.next->op.op = EXP_FindOpByStr ("neg");
 			else if (cur->generic.next->op.op->operands == 2)
 				return EXP_Error (EXP_E_SYNTAX,
-								  va
-								  ("Operator '%s' does not follow a number or numerical value.",
+								  va (0, "Operator '%s' does not follow a number or numerical value.",
 								   cur->generic.next->op.op->str));
 		} else if (cur->generic.type == TOKEN_FUNC
 				   && cur->generic.next->generic.type != TOKEN_OPAREN)
 			return EXP_Error (EXP_E_SYNTAX,
-							  va
-							  ("Function '%s' called without an argument list.",
+							  va (0, "Function '%s' called without an argument list.",
 							   cur->func.func->str));
 		else if (cur->generic.type == TOKEN_COMMA
 				 &&
@@ -501,7 +497,7 @@ EXP_Validate (token * chain)
 		else if (cur->generic.type == TOKEN_OP
 				 && cur->generic.next->generic.type == TOKEN_CPAREN)
 			return EXP_Error (EXP_E_SYNTAX,
-							  va ("Operator '%s' is missing an operand.",
+							  va (0, "Operator '%s' is missing an operand.",
 								  cur->op.op->str));
 		else if (cur->generic.type == TOKEN_NUM
 				 && cur->generic.next->generic.type == TOKEN_NUM)
diff --git a/libs/gib/gib_builtin.c b/libs/gib/gib_builtin.c
index b7f571458..190ec8373 100644
--- a/libs/gib/gib_builtin.c
+++ b/libs/gib/gib_builtin.c
@@ -823,7 +823,7 @@ GIB_File_Write_f (void)
 	}
 
 	path = GIB_Argv (1);
-	QFS_WriteFile (va ("%s/%s", qfs_gamedir->dir.def, path),
+	QFS_WriteFile (va (0, "%s/%s", qfs_gamedir->dir.def, path),
 				   GIB_Argv(2), GIB_Argd(2)->size-1);
 }
 
diff --git a/libs/gib/gib_classes.c b/libs/gib/gib_classes.c
index 88922af50..55087dcdf 100644
--- a/libs/gib/gib_classes.c
+++ b/libs/gib/gib_classes.c
@@ -612,9 +612,9 @@ static const char *g_gcbs_name;
 static const char *gcbs_fname (const char *str)
 {
 	if (g_gcbs_mode == INSTANCE)
-		return va ("__%s_%s__", g_gcbs_name, str);
+		return va (0, "__%s_%s__", g_gcbs_name, str);
 	else
-		return va ("%s::%s", g_gcbs_name, str);
+		return va (0, "%s::%s", g_gcbs_name, str);
 }
 
 void
diff --git a/libs/gib/gib_object.c b/libs/gib/gib_object.c
index 3d69b887e..b9fbf66a9 100644
--- a/libs/gib/gib_object.c
+++ b/libs/gib/gib_object.c
@@ -205,7 +205,7 @@ GIB_Object_Create (const char *classname, qboolean classobj)
 	obj->data = malloc (sizeof (void *) * (class->depth+1));
 	obj->methods = classobj ? class->class_methods : class->methods;
 	obj->handle = classobj ? 0 : GIB_Handle_New (obj);
-	obj->handstr = strdup (va ("%lu", obj->handle));
+	obj->handstr = strdup (va (0, "%lu", obj->handle));
 	obj->refs = 1;
 	obj->signals = Hash_NewTable (128, GIB_Signal_Get_Key,
 								  GIB_Signal_Free, NULL, 0);
diff --git a/libs/gib/gib_parse.c b/libs/gib/gib_parse.c
index 0ace51571..c0afaa8d5 100644
--- a/libs/gib/gib_parse.c
+++ b/libs/gib/gib_parse.c
@@ -333,7 +333,8 @@ GIB_Parse_Tokens (const char *program, unsigned int *i, unsigned int pofs)
 	return nodes;
   ERROR:
 	if (c)
-		GIB_Parse_Error (va ("Could not find match for '%c'.", c), *i + pofs);
+		GIB_Parse_Error (va (0, "Could not find match for '%c'.", c),
+							 *i + pofs);
 	if (nodes)
 		GIB_Tree_Unref (&nodes);
 	return 0;
@@ -496,7 +497,8 @@ GIB_Parse_Embedded (gib_tree_t *token)
 	return lines;
   ERROR:
 	if (c)
-		GIB_Parse_Error (va ("Could not find match for '%c'.", c), i + token->start);
+		GIB_Parse_Error (va (0, "Could not find match for '%c'.", c),
+							 i + token->start);
 	if (lines)
 		GIB_Tree_Unref (&lines);
 	return 0;
diff --git a/libs/gib/gib_vars.c b/libs/gib/gib_vars.c
index 31d7b3c6a..2d40141e1 100644
--- a/libs/gib/gib_vars.c
+++ b/libs/gib/gib_vars.c
@@ -210,7 +210,7 @@ GIB_Var_Get_Very_Complex (hashtab_t ** first, hashtab_t ** second, dstring_t *ke
 			key->str[i] = 0;
 			if ((var = GIB_Var_Get_Very_Complex (&one, &two, key, n+1+varstartskip, &index2, create))) {
 				if (key->str[n] == '#')
-					str = va("%u", var->size);
+					str = va (0, "%u", var->size);
 				else
 					str = var->array[index2].value->str;
 				key->str[i] = c;
diff --git a/libs/models/alias/gl_model_alias.c b/libs/models/alias/gl_model_alias.c
index 82919aad4..ff5d62347 100644
--- a/libs/models/alias/gl_model_alias.c
+++ b/libs/models/alias/gl_model_alias.c
@@ -122,7 +122,7 @@ Mod_LoadExternalSkin (maliasskindesc_t *pskindesc, char *filename)
 
 	tex = LoadImage (filename, 1);
 	if (!tex)
-		tex = LoadImage (va ("textures/%s", ptr + 1), 1);
+		tex = LoadImage (va (0, "textures/%s", ptr + 1), 1);
 	if (tex) {
 		pskindesc->texnum = GL_LoadTexture (filename, tex->width, tex->height,
 											tex->data, true, false,
@@ -130,22 +130,22 @@ Mod_LoadExternalSkin (maliasskindesc_t *pskindesc, char *filename)
 
 		pskindesc->fb_texnum = 0;
 
-		glow = LoadImage (va ("%s_luma", filename), 1);
+		glow = LoadImage (va (0, "%s_luma", filename), 1);
 		if (!glow)
-			glow = LoadImage (va ("%s_glow", filename), 1);
+			glow = LoadImage (va (0, "%s_glow", filename), 1);
 		if (!glow)
-			glow = LoadImage (va ("textures/%s_luma", ptr + 1), 1);
+			glow = LoadImage (va (0, "textures/%s_luma", ptr + 1), 1);
 		if (!glow)
-			glow = LoadImage (va ("textures/%s_glow", ptr + 1), 1);
+			glow = LoadImage (va (0, "textures/%s_glow", ptr + 1), 1);
 		if (glow)
 			pskindesc->fb_texnum =
-				GL_LoadTexture (va ("fb_%s", filename), glow->width,
+				GL_LoadTexture (va (0, "fb_%s", filename), glow->width,
 								glow->height, glow->data, true, true,
 								glow->format > 2 ? glow->format : 1);
 		else if (tex->format < 3)
 			pskindesc->fb_texnum = Mod_Fullbright (tex->data, tex->width,
 												   tex->height,
-												   va ("fb_%s", filename));
+												   va (0, "fb_%s", filename));
 	}
 }
 
diff --git a/libs/models/alias/glsl_model_alias.c b/libs/models/alias/glsl_model_alias.c
index cb612e962..796b3f346 100644
--- a/libs/models/alias/glsl_model_alias.c
+++ b/libs/models/alias/glsl_model_alias.c
@@ -104,9 +104,9 @@ glsl_Mod_LoadSkin (byte *skin, int skinsize, int snum, int gnum,
 	memcpy (tskin, skin, skinsize);
 	Mod_FloodFillSkin (tskin, w, h);
 	if (group)
-		name = va ("%s_%i_%i", loadmodel->name, snum, gnum);
+		name = va (0, "%s_%i_%i", loadmodel->name, snum, gnum);
 	else
-		name = va ("%s_%i", loadmodel->name, snum);
+		name = va (0, "%s_%i", loadmodel->name, snum);
 	skindesc->texnum = GLSL_LoadQuakeTexture (name, w, h, tskin);
 	free (tskin);
 	return skin + skinsize;
diff --git a/libs/models/alias/vulkan_model_alias.c b/libs/models/alias/vulkan_model_alias.c
index 832541071..91ae665d0 100644
--- a/libs/models/alias/vulkan_model_alias.c
+++ b/libs/models/alias/vulkan_model_alias.c
@@ -128,19 +128,28 @@ Vulkan_Mod_LoadSkin (byte *skinpix, int skinsize, int snum, int gnum,
 
 	tex_t skin_tex = {w, h, tex_palette, 1, vid.palette, tskin + skinsize};
 	if (Mod_CalcFullbright (tskin, tskin + skinsize, skinsize)) {
-		skin->glow = Vulkan_LoadTex (ctx, &skin_tex, 1);
+		skin->glow = Vulkan_LoadTex (ctx, &skin_tex, 1,
+									 va (ctx->va_ctx, "%s:%d:%d:glow",
+										 loadmodel->name, snum, gnum));
 		Mod_ClearFullbright (tskin, tskin, skinsize);
 	}
 	if (Skin_CalcTopColors (tskin, tskin + skinsize, skinsize)) {
-		skin->colora = Vulkan_LoadTex (ctx, &skin_tex, 1);
+		skin->colora = Vulkan_LoadTex (ctx, &skin_tex, 1,
+									   va (ctx->va_ctx, "%s:%d:%d:colora",
+										   loadmodel->name, snum, gnum));
 		Skin_ClearTopColors (tskin, tskin, skinsize);
 	}
 	if (Skin_CalcBottomColors (tskin, tskin + skinsize, skinsize)) {
-		skin->colorb = Vulkan_LoadTex (ctx, &skin_tex, 1);
+		skin->colorb = Vulkan_LoadTex (ctx, &skin_tex, 1,
+									   va (ctx->va_ctx, "%s:%d:%d:colorb",
+										   loadmodel->name, snum, gnum));
 		Skin_ClearBottomColors (tskin, tskin, skinsize);
 	}
 	skin_tex.data = tskin;
-	skin->tex = Vulkan_LoadTex (ctx, &skin_tex, 1);
+	skin->tex = Vulkan_LoadTex (ctx, &skin_tex, 1,
+								va (ctx->va_ctx, "%s:%d:%d:tex",
+									loadmodel->name,
+									snum, gnum));
 
 	free (tskin);
 
diff --git a/libs/models/brush/gl_model_brush.c b/libs/models/brush/gl_model_brush.c
index 1d7d04634..878d2c344 100644
--- a/libs/models/brush/gl_model_brush.c
+++ b/libs/models/brush/gl_model_brush.c
@@ -63,17 +63,17 @@ Mod_LoadAnExternalTexture (char *tname, char *mname)
 
 	if (rname[0] == '*') rname[0] = '#';
 
-	image = LoadImage (va ("textures/%.*s/%s", (int) strlen (mname + 5) - 4,
+	image = LoadImage (va (0, "textures/%.*s/%s", (int) strlen (mname + 5) - 4,
 						   mname + 5, rname), 1);
 	if (!image)
-		image = LoadImage (va ("maps/%.*s/%s", (int) strlen (mname + 5) - 4,
+		image = LoadImage (va (0, "maps/%.*s/%s", (int) strlen (mname + 5) - 4,
 							   mname + 5, rname), 1);
 //	if (!image)
-//			image = LoadImage (va ("textures/bmodels/%s", rname));
+//			image = LoadImage (va (0, "textures/bmodels/%s", rname));
 	if (!image)
-			image = LoadImage (va ("textures/%s", rname), 1);
+			image = LoadImage (va (0, "textures/%s", rname), 1);
 	if (!image)
-			image = LoadImage (va ("maps/%s", rname), 1);
+			image = LoadImage (va (0, "maps/%s", rname), 1);
 
 	return image;
 }
@@ -93,23 +93,23 @@ Mod_LoadExternalTextures (model_t *mod, texture_t *tx)
 							base->data, true, false,
 							base->format > 2 ? base->format : 1);
 
-		luma = Mod_LoadAnExternalTexture (va ("%s_luma", tx->name),
+		luma = Mod_LoadAnExternalTexture (va (0, "%s_luma", tx->name),
 										  mod->name);
 		if (!luma)
-			luma = Mod_LoadAnExternalTexture (va ("%s_glow", tx->name),
+			luma = Mod_LoadAnExternalTexture (va (0, "%s_glow", tx->name),
 											  mod->name);
 
 		gltx->gl_fb_texturenum = 0;
 
 		if (luma) {
 			gltx->gl_fb_texturenum =
-				GL_LoadTexture (va ("fb_%s", tx->name), luma->width,
+				GL_LoadTexture (va (0, "fb_%s", tx->name), luma->width,
 								luma->height, luma->data, true, true,
 								luma->format > 2 ? luma->format : 1);
 		} else if (base->format < 3) {
 			gltx->gl_fb_texturenum =
 				Mod_Fullbright (base->data, base->width, base->height,
-								va ("fb_%s", tx->name));
+								va (0, "fb_%s", tx->name));
 		}
 	}
 	return external;
@@ -133,7 +133,7 @@ gl_Mod_ProcessTexture (texture_t *tx)
 		return;
 	}
 	gltex_t    *gltex = tx->render;
-	name = va ("fb_%s", tx->name);
+	name = va (0, "fb_%s", tx->name);
 	gltex->gl_fb_texturenum =
 		Mod_Fullbright ((byte *) (tx + 1), tx->width, tx->height, name);
 	gltex->gl_texturenum =
diff --git a/libs/models/brush/vulkan_model_brush.c b/libs/models/brush/vulkan_model_brush.c
index c9b336f0f..3d45dd63c 100644
--- a/libs/models/brush/vulkan_model_brush.c
+++ b/libs/models/brush/vulkan_model_brush.c
@@ -356,7 +356,7 @@ Vulkan_Mod_ProcessTexture (texture_t *tx, vulkan_ctx_t *ctx)
 		return;
 	}
 
-	const char *name = va ("fb_%s", tx->name);
+	const char *name = va (ctx->va_ctx, "fb_%s", tx->name);
 	int         size = (tx->width * tx->height * 85) / 64;
 	int         fullbright_mark = Hunk_LowMark ();
 	byte       *pixels = Hunk_AllocName (size, name);
diff --git a/libs/models/iqm/gl_model_iqm.c b/libs/models/iqm/gl_model_iqm.c
index 93a1e9992..fc9c50f1a 100644
--- a/libs/models/iqm/gl_model_iqm.c
+++ b/libs/models/iqm/gl_model_iqm.c
@@ -80,7 +80,7 @@ gl_iqm_load_textures (iqm_t *iqm)
 	for (i = 0; i < iqm->num_meshes; i++) {
 		dstring_copystr (str, iqm->text + iqm->meshes[i].material);
 		QFS_StripExtension (str->str, str->str);
-		if ((tex = LoadImage (va ("textures/%s", str->str), 1)))
+		if ((tex = LoadImage (va (0, "textures/%s", str->str), 1)))
 			gl->textures[i] = GL_LoadTexture (str->str, tex->width,
 											  tex->height, tex->data, true,
 											  false,
diff --git a/libs/models/iqm/glsl_model_iqm.c b/libs/models/iqm/glsl_model_iqm.c
index 5b37e0fd2..c8a82a112 100644
--- a/libs/models/iqm/glsl_model_iqm.c
+++ b/libs/models/iqm/glsl_model_iqm.c
@@ -102,12 +102,12 @@ glsl_iqm_load_textures (iqm_t *iqm)
 	for (i = 0; i < iqm->num_meshes; i++) {
 		dstring_copystr (str, iqm->text + iqm->meshes[i].material);
 		QFS_StripExtension (str->str, str->str);
-		if ((tex = LoadImage (va ("textures/%s", str->str), 1)))
+		if ((tex = LoadImage (va (0, "textures/%s", str->str), 1)))
 			glsl->textures[i] = GLSL_LoadRGBATexture (str->str, tex->width,
 													  tex->height, tex->data);
 		else
 			glsl->textures[i] = GLSL_LoadRGBATexture ("", 2, 2, null_texture);
-		if ((tex = LoadImage (va ("textures/%s_norm", str->str), 1)))
+		if ((tex = LoadImage (va (0, "textures/%s_norm", str->str), 1)))
 			glsl->normmaps[i] = GLSL_LoadRGBATexture (str->str, tex->width,
 													  tex->height, tex->data);
 		else
diff --git a/libs/models/iqm/sw_model_iqm.c b/libs/models/iqm/sw_model_iqm.c
index 274a6f0a9..f48867ae1 100644
--- a/libs/models/iqm/sw_model_iqm.c
+++ b/libs/models/iqm/sw_model_iqm.c
@@ -174,7 +174,7 @@ sw_iqm_load_textures (iqm_t *iqm)
 			continue;
 		dstring_copystr (str, iqm->text + iqm->meshes[i].material);
 		QFS_StripExtension (str->str, str->str);
-		if ((tex = LoadImage (va ("textures/%s", str->str), 1)))
+		if ((tex = LoadImage (va (0, "textures/%s", str->str), 1)))
 			tex = sw->skins[i] = convert_tex (tex);
 		else
 			tex = sw->skins[i] = &null_texture;
diff --git a/libs/models/skin.c b/libs/models/skin.c
index fd561143d..e5a0353f5 100644
--- a/libs/models/skin.c
+++ b/libs/models/skin.c
@@ -177,7 +177,7 @@ Skin_SetSkin (skin_t *skin, int cmap, const char *skinname)
 			break;
 		}
 
-		file = QFS_FOpenFile (va ("skins/%s.pcx", name));
+		file = QFS_FOpenFile (va (0, "skins/%s.pcx", name));
 		if (!file) {
 			Sys_Printf ("Couldn't load skin %s\n", name);
 			free (name);
diff --git a/libs/models/sprite/gl_model_sprite.c b/libs/models/sprite/gl_model_sprite.c
index f050e9bdb..1d5d1597c 100644
--- a/libs/models/sprite/gl_model_sprite.c
+++ b/libs/models/sprite/gl_model_sprite.c
@@ -49,7 +49,7 @@ gl_Mod_SpriteLoadTexture (mspriteframe_t *pspriteframe, int framenum)
 	tex_t      *targa;
 	const char *name;
 
-	targa = LoadImage (name = va ("%s_%i", loadmodel->name, framenum), 1);
+	targa = LoadImage (name = va (0, "%s_%i", loadmodel->name, framenum), 1);
 	if (targa) {
 		if (targa->format < 4)
 			pspriteframe->gl_texturenum = GL_LoadTexture (name,
diff --git a/libs/models/sprite/glsl_model_sprite.c b/libs/models/sprite/glsl_model_sprite.c
index bbef94e02..138b3d0d0 100644
--- a/libs/models/sprite/glsl_model_sprite.c
+++ b/libs/models/sprite/glsl_model_sprite.c
@@ -76,7 +76,7 @@ glsl_Mod_SpriteLoadTexture (mspriteframe_t *pspriteframe, int framenum)
 	const char *name;
 
 	loadmodel->clear = glsl_sprite_clear;
-	name = va ("%s_%i", loadmodel->name, framenum);
+	name = va (0, "%s_%i", loadmodel->name, framenum);
 	pspriteframe->gl_texturenum =
 		GLSL_LoadQuakeTexture (name, pspriteframe->width, pspriteframe->height,
 							   pspriteframe->pixels);
diff --git a/libs/ruamoko/rua_cvar.c b/libs/ruamoko/rua_cvar.c
index 18275988e..dbb652817 100644
--- a/libs/ruamoko/rua_cvar.c
+++ b/libs/ruamoko/rua_cvar.c
@@ -140,7 +140,7 @@ bi_Cvar_SetInteger (progs_t *pr)
 	if (!var)
 		var = Cvar_FindAlias (varname);
 	if (var)
-		Cvar_Set (var, va ("%d", val));
+		Cvar_Set (var, va (0, "%d", val));
 }
 
 static void
@@ -153,7 +153,7 @@ bi_Cvar_SetFloat (progs_t *pr)
 	if (!var)
 		var = Cvar_FindAlias (varname);
 	if (var)
-		Cvar_Set (var, va ("%g", val));
+		Cvar_Set (var, va (0, "%g", val));
 }
 
 static void
@@ -166,7 +166,7 @@ bi_Cvar_SetVector (progs_t *pr)
 	if (!var)
 		var = Cvar_FindAlias (varname);
 	if (var)
-		Cvar_Set (var, va ("%g %g %g", val[0], val[1], val[2]));
+		Cvar_Set (var, va (0, "%g %g %g", val[0], val[1], val[2]));
 }
 
 static void
diff --git a/libs/ruamoko/rua_qfs.c b/libs/ruamoko/rua_qfs.c
index 87b2c5add..4a3eebb59 100644
--- a/libs/ruamoko/rua_qfs.c
+++ b/libs/ruamoko/rua_qfs.c
@@ -146,7 +146,8 @@ bi_QFS_WriteFile (progs_t *pr)
 	int         count = P_INT (pr, 2);
 
 	check_buffer (pr, buf, count, "QFS_WriteFile");
-	QFS_WriteFile (va ("%s/%s", qfs_gamedir->dir.def, filename), buf, count);
+	QFS_WriteFile (va (0, "%s/%s", qfs_gamedir->dir.def, filename), buf,
+					   count);
 }
 
 static void
diff --git a/libs/util/cvar.c b/libs/util/cvar.c
index dc4485828..afcfeef33 100644
--- a/libs/util/cvar.c
+++ b/libs/util/cvar.c
@@ -284,7 +284,7 @@ Cvar_Set (cvar_t *var, const char *value)
 VISIBLE void
 Cvar_SetValue (cvar_t *var, float value)
 {
-	Cvar_Set (var, va ("%g", value));
+	Cvar_Set (var, va (0, "%g", value));
 }
 
 /*
@@ -608,7 +608,7 @@ Cvar_CvarList_f (void)
 			showhelp++;
 	}
 	for (var = cvar_vars, i = 0; var; var = var->next, i++) {
-		flags = va ("%c%c%c%c",
+		flags = va (0, "%c%c%c%c",
 					var->flags & CVAR_ROM ? 'r' : ' ',
 					var->flags & CVAR_ARCHIVE ? '*' : ' ',
 					var->flags & CVAR_USERINFO ? 'u' : ' ',
diff --git a/libs/util/qfplist.c b/libs/util/qfplist.c
index fe0fc3268..f36b6552e 100644
--- a/libs/util/qfplist.c
+++ b/libs/util/qfplist.c
@@ -90,6 +90,7 @@ typedef struct pldata_s {	// Unparsed property list string
 	unsigned    pos;
 	unsigned    line;
 	plitem_t   *error;
+	va_ctx_t   *va_ctx;
 } pldata_t;
 
 //	Ugly defines for fast checking and conversion from char to number
@@ -533,7 +534,8 @@ PL_ParseData (pldata_t *pl, int *len)
 									pl->ptr[start + i * 2 + 1]);
 			return str;
 		}
-		pl->error = PL_NewString (va ("invalid character in data: %02x", c));
+		pl->error = PL_NewString (va (pl->va_ctx,
+									  "invalid character in data: %02x", c));
 		return NULL;
 	}
 	pl->error = PL_NewString ("Reached end of string while parsing data");
@@ -748,7 +750,7 @@ PL_ParsePropertyListItem (pldata_t *pl)
 			}
 
 			if (pl->ptr[pl->pos] != '=') {
-				pl->error = PL_NewString (va ("Unexpected character %c (expected '=')", pl->ptr[pl->pos]));
+				pl->error = PL_NewString (va (pl->va_ctx, "Unexpected character %c (expected '=')", pl->ptr[pl->pos]));
 				PL_Free (key);
 				PL_Free (item);
 				return NULL;
@@ -772,7 +774,7 @@ PL_ParsePropertyListItem (pldata_t *pl)
 			if (pl->ptr[pl->pos] == ';') {
 				pl->pos++;
 			} else if (pl->ptr[pl->pos] != '}') {
-				pl->error = PL_NewString (va ("Unexpected character %c (wanted ';' or '}')", pl->ptr[pl->pos]));
+				pl->error = PL_NewString (va (pl->va_ctx, "Unexpected character %c (wanted ';' or '}')", pl->ptr[pl->pos]));
 				PL_Free (key);
 				PL_Free (value);
 				PL_Free (item);
@@ -822,7 +824,7 @@ PL_ParsePropertyListItem (pldata_t *pl)
 			if (pl->ptr[pl->pos] == ',') {
 				pl->pos++;
 			} else if (pl->ptr[pl->pos] != ')') {
-				pl->error = PL_NewString (va ("Unexpected character %c (wanted ',' or ')')", pl->ptr[pl->pos]));
+				pl->error = PL_NewString (va (pl->va_ctx, "Unexpected character %c (wanted ',' or ')')", pl->ptr[pl->pos]));
 				PL_Free (value);
 				PL_Free (item);
 				return NULL;
@@ -891,8 +893,10 @@ PL_GetPropertyList (const char *string)
 	pl->end = strlen (string);
 	pl->error = NULL;
 	pl->line = 1;
+	pl->va_ctx = va_create_context (4);
 
 	if ((newpl = PL_ParsePropertyListItem (pl))) {
+		va_destroy_context (pl->va_ctx);
 		free (pl);
 		return newpl;
 	} else {
@@ -903,6 +907,7 @@ PL_GetPropertyList (const char *string)
 			}
 			PL_Free (pl->error);
 		}
+		va_destroy_context (pl->va_ctx);
 		free (pl);
 		return NULL;
 	}
@@ -1093,22 +1098,25 @@ VISIBLE void
 PL_Message (plitem_t *messages, const plitem_t *item, const char *fmt, ...)
 {
 	va_list     args;
-	dstring_t  *string;
+	dstring_t  *va_str;
+	dstring_t  *msg_str;
+	char       *msg;
 
-	string = dstring_new ();
+	va_str = dstring_new ();
+	msg_str = dstring_new ();
 
 	va_start (args, fmt);
-	dvsprintf (string, fmt, args);
+	dvsprintf (va_str, fmt, args);
 	va_end (args);
 
 	if (item) {
-		PL_A_AddObject (messages,
-						PL_NewString (va ("%d: %s", item->line, string->str)));
+		msg = dsprintf (msg_str, "%d: %s", item->line, va_str->str);
 	} else {
-		PL_A_AddObject (messages,
-						PL_NewString (va ("internal: %s", string->str)));
+		msg = dsprintf (msg_str, "internal: %s", va_str->str);
 	}
-	dstring_delete (string);
+	PL_A_AddObject (messages, PL_NewString (msg));
+	dstring_delete (va_str);
+	dstring_delete (msg_str);
 }
 
 static int
diff --git a/libs/util/quakefs.c b/libs/util/quakefs.c
index 039548130..683378904 100644
--- a/libs/util/quakefs.c
+++ b/libs/util/quakefs.c
@@ -359,7 +359,7 @@ qfs_var_subst (const char *string, hashtab_t *vars)
 				dstring_appendsubstr (new, s, (e - s));
 				break;
 			}
-			var = va ("%.*s", (int) (e - s) - 1, s + 1);
+			var = va (0, "%.*s", (int) (e - s) - 1, s + 1);
 			sub = Hash_Find (vars, var);
 			if (sub)
 				dstring_appendstr (new, sub->val);
@@ -370,7 +370,7 @@ qfs_var_subst (const char *string, hashtab_t *vars)
 			s = e;
 			while (qfs_isident (*e))
 				e++;
-			var = va ("%.*s", (int) (e - s), s);
+			var = va (0, "%.*s", (int) (e - s), s);
 			sub = Hash_Find (vars, var);
 			if (sub)
 				dstring_appendstr (new, sub->val);
@@ -588,7 +588,7 @@ qfs_build_gamedir (const char **list)
 	gamedir = calloc (1, sizeof (gamedir_t));
 	path = dstring_newstr ();
 	while (j--) {
-		const char *name = va ("%s:%s", qfs_game, dir = list[j]);
+		const char *name = va (0, "%s:%s", qfs_game, dir = list[j]);
 		if (Hash_Find (dirs, name))
 			continue;
 		gdpl = qfs_find_gamedir (name, dirs);
@@ -1661,7 +1661,7 @@ QFS_FilelistAdd (filelist_t *filelist, const char *fname, const char *ext)
 	}
 	str = strdup (fname);
 
-	if (ext && (s = strstr(str, va(".%s", ext))))
+	if (ext && (s = strstr(str, va (0, ".%s", ext))))
 		*s = 0;
 	filelist->list[filelist->count++] = str;
 }
@@ -1680,9 +1680,9 @@ qfs_filelistfill_do (filelist_t *list, const searchpath_t *search, const char *c
 
 		for (i = 0; i < pak->numfiles; i++) {
 			char       *name = pak->files[i].name;
-			if (!fnmatch (va("%s%s*.%s", cp, separator, ext), name,
+			if (!fnmatch (va (0, "%s%s*.%s", cp, separator, ext), name,
 						  FNM_PATHNAME)
-				|| !fnmatch (va("%s%s*.%s.gz", cp, separator, ext), name,
+				|| !fnmatch (va (0, "%s%s*.%s.gz", cp, separator, ext), name,
 							 FNM_PATHNAME))
 				QFS_FilelistAdd (list, name, strip ? ext : 0);
 		}
@@ -1690,12 +1690,12 @@ qfs_filelistfill_do (filelist_t *list, const searchpath_t *search, const char *c
 		DIR        *dir_ptr;
 		struct dirent *dirent;
 
-		dir_ptr = opendir (va ("%s/%s", search->filename, cp));
+		dir_ptr = opendir (va (0, "%s/%s", search->filename, cp));
 		if (!dir_ptr)
 			return;
 		while ((dirent = readdir (dir_ptr)))
-			if (!fnmatch (va("*.%s", ext), dirent->d_name, 0)
-				|| !fnmatch (va("*.%s.gz", ext), dirent->d_name, 0))
+			if (!fnmatch (va (0, "*.%s", ext), dirent->d_name, 0)
+				|| !fnmatch (va (0, "*.%s.gz", ext), dirent->d_name, 0))
 				QFS_FilelistAdd (list, dirent->d_name, strip ? ext : 0);
 		closedir (dir_ptr);
 	}
diff --git a/libs/util/va.c b/libs/util/va.c
index dd24c05d1..c4b83aebb 100644
--- a/libs/util/va.c
+++ b/libs/util/va.c
@@ -40,28 +40,51 @@
 #include "QF/dstring.h"
 #include "QF/va.h"
 
+struct va_ctx_s {
+	dstring_t **strings;
+	int         num_strings;
+	int         str_index;
+};
 
-/*
-	va
-
-	does a varargs printf into a temp buffer, so I don't need to have
-	varargs versions of all text functions.
-*/
-VISIBLE char *
-va (const char *fmt, ...)
+VISIBLE va_ctx_t *
+va_create_context (int buffers)
 {
+	va_ctx_t   *ctx;
+
+	ctx = malloc (sizeof (va_ctx_t) + buffers * sizeof (dstring_t *));
+	ctx->strings = (dstring_t **) (ctx + 1);
+	ctx->num_strings = buffers;
+	ctx->str_index = 0;
+
+	for (int i = 0; i < buffers; i++) {
+		ctx->strings[i] = dstring_new ();
+	}
+	return ctx;
+}
+
+VISIBLE void
+va_destroy_context (va_ctx_t *ctx)
+{
+	for (int i = 0; i < ctx->num_strings; i++) {
+		dstring_delete (ctx->strings[i]);
+	}
+	free (ctx);
+}
+
+VISIBLE char *
+va (va_ctx_t *ctx, const char *fmt, ...)
+{
+	static va_ctx_t *_ctx;
 	va_list     args;
-	static dstring_t *string[4];
-#define NUM_STRINGS (sizeof (string) / sizeof (string[0]))
-	static int  str_index;
 	dstring_t  *dstr;
 
-	if (!string[0]) {
-		for (size_t i = 0; i < NUM_STRINGS; i++) {
-			string[i] = dstring_new ();
+	if (!ctx) {
+		if (!_ctx) {
+			_ctx = va_create_context (4);
 		}
+		ctx = _ctx;
 	}
-	dstr = string[str_index++ % NUM_STRINGS];
+	dstr = ctx->strings[ctx->str_index++ % ctx->num_strings];
 
 	va_start (args, fmt);
 	dvsprintf (dstr, fmt, args);
diff --git a/libs/video/renderer/gl/gl_dyn_part.c b/libs/video/renderer/gl/gl_dyn_part.c
index 0572efec0..c3b0ddf68 100644
--- a/libs/video/renderer/gl/gl_dyn_part.c
+++ b/libs/video/renderer/gl/gl_dyn_part.c
@@ -210,7 +210,7 @@ gl_R_ReadPointFile_f (void)
 		Sys_Error ("Can't duplicate mapname!");
 	QFS_StripExtension (mapname, mapname);
 
-	name = va ("%s.pts", mapname);
+	name = va (0, "%s.pts", mapname);
 	free (mapname);
 
 	f = QFS_FOpenFile (name);
diff --git a/libs/video/renderer/gl/gl_screen.c b/libs/video/renderer/gl/gl_screen.c
index f8b0e6546..96738d58e 100644
--- a/libs/video/renderer/gl/gl_screen.c
+++ b/libs/video/renderer/gl/gl_screen.c
@@ -152,7 +152,7 @@ gl_SCR_ScreenShot_f (void)
 
 	// find a file name to save it to
 	if (!QFS_NextFilename (pcxname,
-						   va ("%s/qf", qfs_gamedir->dir.shots), ".tga")) {
+						   va (0, "%s/qf", qfs_gamedir->dir.shots), ".tga")) {
 		Sys_Printf ("SCR_ScreenShot_f: Couldn't create a TGA file\n");
 	} else {
 		tex_t      *tex;
diff --git a/libs/video/renderer/gl/gl_sky.c b/libs/video/renderer/gl/gl_sky.c
index 4f69ef8b7..cb3258246 100644
--- a/libs/video/renderer/gl/gl_sky.c
+++ b/libs/video/renderer/gl/gl_sky.c
@@ -131,11 +131,12 @@ gl_R_LoadSkys (const char *skyname)
 
 		qfglBindTexture (GL_TEXTURE_2D, SKY_TEX + i);
 
-		targa = LoadImage (name = va ("env/%s%s", skyname, suf[i]), 1);
+		targa = LoadImage (name = va (0, "env/%s%s", skyname, suf[i]), 1);
 		if (!targa || targa->format < 3) {	// FIXME Can't do PCX right now
 			Sys_MaskPrintf (SYS_DEV, "Couldn't load %s\n", name);
 			// also look in gfx/env, where Darkplaces looks for skies
-			targa = LoadImage (name = va ("gfx/env/%s%s", skyname, suf[i]), 1);
+			targa = LoadImage (name = va (0, "gfx/env/%s%s", skyname,
+										  suf[i]), 1);
 			if (!targa) {
 				Sys_MaskPrintf (SYS_DEV, "Couldn't load %s\n", name);
 				gl_skyloaded = false;
diff --git a/libs/video/renderer/glsl/glsl_bsp.c b/libs/video/renderer/glsl/glsl_bsp.c
index 144f8094c..480c647a9 100644
--- a/libs/video/renderer/glsl/glsl_bsp.c
+++ b/libs/video/renderer/glsl/glsl_bsp.c
@@ -1402,7 +1402,7 @@ glsl_R_LoadSkys (const char *sky)
 	//blender envmap
 	// bk rt ft
 	// dn up lt
-	tex = LoadImage (name = va ("env/%s_map", sky), 1);
+	tex = LoadImage (name = va (0, "env/%s_map", sky), 1);
 	if (tex && tex->format >= 3 && tex->height * 3 == tex->width * 2
 		&& is_pow2 (tex->height)) {
 		tex_t      *sub;
@@ -1430,11 +1430,11 @@ glsl_R_LoadSkys (const char *sky)
 	} else {
 		skybox_loaded = true;
 		for (i = 0; i < 6; i++) {
-			tex = LoadImage (name = va ("env/%s%s", sky, sky_suffix[i]), 1);
+			tex = LoadImage (name = va (0, "env/%s%s", sky, sky_suffix[i]), 1);
 			if (!tex || tex->format < 3) {	// FIXME pcx support
 				Sys_MaskPrintf (SYS_GLSL, "Couldn't load %s\n", name);
 				// also look in gfx/env, where Darkplaces looks for skies
-				tex = LoadImage (name = va ("gfx/env/%s%s", sky,
+				tex = LoadImage (name = va (0, "gfx/env/%s%s", sky,
 											sky_suffix[i]), 1);
 				if (!tex || tex->format < 3) {  // FIXME pcx support
 					Sys_MaskPrintf (SYS_GLSL, "Couldn't load %s\n", name);
diff --git a/libs/video/renderer/glsl/glsl_particles.c b/libs/video/renderer/glsl/glsl_particles.c
index cb956188c..5a0dcd43a 100644
--- a/libs/video/renderer/glsl/glsl_particles.c
+++ b/libs/video/renderer/glsl/glsl_particles.c
@@ -318,7 +318,7 @@ glsl_R_ReadPointFile_f (void)
 		Sys_Error ("Can't duplicate mapname!");
 	QFS_StripExtension (mapname, mapname);
 
-	name = va ("%s.pts", mapname);
+	name = va (0, "%s.pts", mapname);
 	free (mapname);
 
 	f = QFS_FOpenFile (name);
diff --git a/libs/video/renderer/glsl/glsl_screen.c b/libs/video/renderer/glsl/glsl_screen.c
index a19d3205a..16063c7c5 100644
--- a/libs/video/renderer/glsl/glsl_screen.c
+++ b/libs/video/renderer/glsl/glsl_screen.c
@@ -231,8 +231,8 @@ glsl_SCR_ScreenShot_f (void)
 	dstring_t  *name = dstring_new ();
 
 	// find a file name to save it to
-	if (!QFS_NextFilename (name,
-						   va ("%s/qf", qfs_gamedir->dir.shots), ".png")) {
+	if (!QFS_NextFilename (name, va (0, "%s/qf",
+									 qfs_gamedir->dir.shots), ".png")) {
 		Sys_Printf ("SCR_ScreenShot_f: Couldn't create a PNG file\n");
 	} else {
 		tex_t      *tex;
diff --git a/libs/video/renderer/glsl/vid_common_glsl.c b/libs/video/renderer/glsl/vid_common_glsl.c
index a437fd96e..7fabdd6d2 100644
--- a/libs/video/renderer/glsl/vid_common_glsl.c
+++ b/libs/video/renderer/glsl/vid_common_glsl.c
@@ -268,7 +268,7 @@ type_name (GLenum type)
 		case GL_FIXED:
 			return "fixed";
 	}
-	return va("%x", type);
+	return va (0, "%x", type);
 }
 
 static void
diff --git a/libs/video/renderer/sw/screen.c b/libs/video/renderer/sw/screen.c
index 125d8648f..12b7116de 100644
--- a/libs/video/renderer/sw/screen.c
+++ b/libs/video/renderer/sw/screen.c
@@ -159,7 +159,7 @@ SCR_ScreenShot_f (void)
 
 	// find a file name to save it to
 	if (!QFS_NextFilename (pcxname,
-						   va ("%s/qf", qfs_gamedir->dir.shots), ".pcx")) {
+						   va (0, "%s/qf", qfs_gamedir->dir.shots), ".pcx")) {
 		Sys_Printf ("SCR_ScreenShot_f: Couldn't create a PCX");
 	} else {
 		// enable direct drawing of console to back buffer
diff --git a/libs/video/renderer/sw/sw_rpart.c b/libs/video/renderer/sw/sw_rpart.c
index d7039504f..c05281863 100644
--- a/libs/video/renderer/sw/sw_rpart.c
+++ b/libs/video/renderer/sw/sw_rpart.c
@@ -88,7 +88,7 @@ R_ReadPointFile_f (void)
 		Sys_Error ("Can't duplicate mapname!");
 	QFS_StripExtension (mapname, mapname);
 
-	name = va ("maps/%s.pts", mapname);
+	name = va (0, "maps/%s.pts", mapname);
 	free (mapname);
 
 	f = QFS_FOpenFile (name);
diff --git a/libs/video/renderer/sw32/screen.c b/libs/video/renderer/sw32/screen.c
index ce84cb08c..f1e9e1380 100644
--- a/libs/video/renderer/sw32/screen.c
+++ b/libs/video/renderer/sw32/screen.c
@@ -103,8 +103,8 @@ sw32_SCR_ScreenShot_f (void)
 	int         pcx_len;
 
 	// find a file name to save it to
-	if (!QFS_NextFilename (pcxname,
-						   va ("%s/qf", qfs_gamedir->dir.shots), ".pcx")) {
+	if (!QFS_NextFilename (pcxname, va (0, "%s/qf",
+										qfs_gamedir->dir.shots), ".pcx")) {
 		Sys_Printf ("SCR_ScreenShot_f: Couldn't create a PCX");
 	} else {
 		// enable direct drawing of console to back buffer
diff --git a/libs/video/renderer/sw32/sw32_rpart.c b/libs/video/renderer/sw32/sw32_rpart.c
index fe2e39601..655467525 100644
--- a/libs/video/renderer/sw32/sw32_rpart.c
+++ b/libs/video/renderer/sw32/sw32_rpart.c
@@ -93,7 +93,7 @@ sw32_R_ReadPointFile_f (void)
 		Sys_Error ("Can't duplicate mapname!");
 	QFS_StripExtension (mapname, mapname);
 
-	name = va ("maps/%s.pts", mapname);
+	name = va (0, "maps/%s.pts", mapname);
 	free (mapname);
 
 	f = QFS_FOpenFile (name);
diff --git a/libs/video/targets/context_sdl.c b/libs/video/targets/context_sdl.c
index 7a764553a..21fde4b06 100644
--- a/libs/video/targets/context_sdl.c
+++ b/libs/video/targets/context_sdl.c
@@ -40,10 +40,10 @@ VID_SetCaption (const char *text)
 	if (text && *text) {
 		char		*temp = strdup (text);
 
-		SDL_WM_SetCaption (va ("%s: %s", PACKAGE_STRING, temp), NULL);
+		SDL_WM_SetCaption (va (0, "%s: %s", PACKAGE_STRING, temp), NULL);
 		free (temp);
 	} else {
-		SDL_WM_SetCaption (va ("%s", PACKAGE_STRING), NULL);
+		SDL_WM_SetCaption (va (0, "%s", PACKAGE_STRING), NULL);
 	}
 }
 
diff --git a/libs/video/targets/context_x11.c b/libs/video/targets/context_x11.c
index 7f952aa99..c118feab2 100644
--- a/libs/video/targets/context_x11.c
+++ b/libs/video/targets/context_x11.c
@@ -566,7 +566,7 @@ X11_CreateWindow (int width, int height)
 		XFree (SizeHints);
 	}
 	// Set window title
-	X11_SetCaption (va ("%s", PACKAGE_STRING));
+	X11_SetCaption (va (0, "%s", PACKAGE_STRING));
 
 	// Set icon name
 	XSetIconName (x_disp, x_win, PACKAGE_NAME);
diff --git a/libs/video/targets/joy.c b/libs/video/targets/joy.c
index 0a209cdfe..da25db1f4 100644
--- a/libs/video/targets/joy.c
+++ b/libs/video/targets/joy.c
@@ -183,7 +183,7 @@ JOY_Init (void)
 static void
 joyamp_f (cvar_t *var)
 {
-	Cvar_Set (var, va ("%g", max (0.0001, var->value)));
+	Cvar_Set (var, va (0, "%g", max (0.0001, var->value)));
 }
 
 typedef struct {
diff --git a/libs/video/targets/vid.c b/libs/video/targets/vid.c
index b656b5a22..49f33c004 100644
--- a/libs/video/targets/vid.c
+++ b/libs/video/targets/vid.c
@@ -90,9 +90,9 @@ VID_GetWindowSize (int def_w, int def_h)
 {
 	int pnum, conheight;
 
-	vid_width = Cvar_Get ("vid_width", va ("%d", def_w), CVAR_NONE, NULL,
+	vid_width = Cvar_Get ("vid_width", va (0, "%d", def_w), CVAR_NONE, NULL,
 			"screen width");
-	vid_height = Cvar_Get ("vid_height", va ("%d", def_h), CVAR_NONE, NULL,
+	vid_height = Cvar_Get ("vid_height", va (0, "%d", def_h), CVAR_NONE, NULL,
 			"screen height");
 	vid_aspect = Cvar_Get ("vid_aspect", "4:3", CVAR_ROM, vid_aspect_f,
 			"Physical screen aspect ratio in \"width:height\" format. "
@@ -140,7 +140,7 @@ VID_GetWindowSize (int def_w, int def_h)
 	viddef.aspect = ((vid_aspect->vec[0] * viddef.height)
 				  / (vid_aspect->vec[1] * viddef.width));
 
-	con_width = Cvar_Get ("con_width", va ("%d", viddef.width), CVAR_NONE,
+	con_width = Cvar_Get ("con_width", va (0, "%d", viddef.width), CVAR_NONE,
 						  NULL, "console effective width (GL only)");
 	if ((pnum = COM_CheckParm ("-conwidth"))) {
 		if (pnum >= com_argc - 1)
@@ -148,20 +148,20 @@ VID_GetWindowSize (int def_w, int def_h)
 		Cvar_Set (con_width, com_argv[pnum + 1]);
 	}
 	// make con_width a multiple of 8 and >= 320
-	Cvar_Set (con_width, va ("%d", max (con_width->int_val & ~7, 320)));
+	Cvar_Set (con_width, va (0, "%d", max (con_width->int_val & ~7, 320)));
 	Cvar_SetFlags (con_width, con_width->flags | CVAR_ROM);
 	viddef.conwidth = con_width->int_val;
 
 	conheight = (viddef.conwidth * vid_aspect->vec[1]) / vid_aspect->vec[0];
-	con_height = Cvar_Get ("con_height", va ("%d", conheight), CVAR_NONE, NULL,
-						   "console effective height (GL only)");
+	con_height = Cvar_Get ("con_height", va (0, "%d", conheight), CVAR_NONE,
+						   NULL, "console effective height (GL only)");
 	if ((pnum = COM_CheckParm ("-conheight"))) {
 		if (pnum >= com_argc - 1)
 			Sys_Error ("VID: -conheight <width>");
 		Cvar_Set (con_height, com_argv[pnum + 1]);
 	}
 	// make con_height >= 200
-	Cvar_Set (con_height, va ("%d", max (con_height->int_val, 200)));
+	Cvar_Set (con_height, va (0, "%d", max (con_height->int_val, 200)));
 	Cvar_SetFlags (con_height, con_height->flags | CVAR_ROM);
 	viddef.conheight = con_height->int_val;
 
@@ -258,7 +258,7 @@ VID_InitGamma (unsigned char *pal)
 	}
 	gamma = bound (0.1, gamma, 9.9);
 
-	vid_gamma = Cvar_Get ("vid_gamma", va ("%f", gamma), CVAR_ARCHIVE,
+	vid_gamma = Cvar_Get ("vid_gamma", va (0, "%f", gamma), CVAR_ARCHIVE,
 						  VID_UpdateGamma, "Gamma correction");
 
 	VID_BuildGammaTable (vid_gamma->value);
diff --git a/libs/video/targets/vid_x11.c b/libs/video/targets/vid_x11.c
index 58183ba8f..b29b64b1f 100644
--- a/libs/video/targets/vid_x11.c
+++ b/libs/video/targets/vid_x11.c
@@ -182,10 +182,10 @@ VID_SetCaption (const char *text)
 	if (text && *text) {
 		char       *temp = strdup (text);
 
-		X11_SetCaption (va ("%s: %s", PACKAGE_STRING, temp));
+		X11_SetCaption (va (0, "%s: %s", PACKAGE_STRING, temp));
 		free (temp);
 	} else {
-		X11_SetCaption (va ("%s", PACKAGE_STRING));
+		X11_SetCaption (va (0, "%s", PACKAGE_STRING));
 	}
 }
 
diff --git a/libs/video/targets/vid_x11_vulkan.c b/libs/video/targets/vid_x11_vulkan.c
index cd228b051..d64bed09f 100644
--- a/libs/video/targets/vid_x11_vulkan.c
+++ b/libs/video/targets/vid_x11_vulkan.c
@@ -53,6 +53,7 @@
 #include "QF/cvar.h"
 #include "QF/set.h"
 #include "QF/sys.h"
+#include "QF/va.h"
 
 #include "QF/Vulkan/instance.h"
 
@@ -211,6 +212,7 @@ X11_Vulkan_Context (void)
 	ctx->create_window = x11_vulkan_create_window;
 	ctx->create_surface = x11_vulkan_create_surface;
 	ctx->required_extensions = required_extensions;
+	ctx->va_ctx = va_create_context (4);
 	return ctx;
 }
 
diff --git a/nq/source/cl_demo.c b/nq/source/cl_demo.c
index 55a10af26..2b264d850 100644
--- a/nq/source/cl_demo.c
+++ b/nq/source/cl_demo.c
@@ -312,7 +312,7 @@ CL_Record_f (void)
 
 // start up the map
 	if (c > 2)
-		Cmd_ExecuteString (va ("map %s", Cmd_Argv (2)), src_command);
+		Cmd_ExecuteString (va (0, "map %s", Cmd_Argv (2)), src_command);
 
 	CL_Record (Cmd_Argv (1), track);
 }
diff --git a/nq/source/cl_main.c b/nq/source/cl_main.c
index f93b924d6..9424a670e 100644
--- a/nq/source/cl_main.c
+++ b/nq/source/cl_main.c
@@ -106,7 +106,7 @@ CL_WriteConfiguration (void)
 	// dedicated servers initialize the host but don't parse and set the
 	// config.cfg cvars
 	if (host_initialized && !isDedicated && cl_writecfg->int_val) {
-		char       *path = va ("%s/config.cfg", qfs_gamedir->dir.def);
+		char       *path = va (0, "%s/config.cfg", qfs_gamedir->dir.def);
 		f = QFS_WOpen (path, 0);
 		if (!f) {
 			Sys_Printf ("Couldn't write config.cfg.\n");
@@ -344,10 +344,11 @@ CL_SignonReply (void)
 
 	case so_spawn:
 		MSG_WriteByte (&cls.message, clc_stringcmd);
-		MSG_WriteString (&cls.message, va ("name \"%s\"\n", cl_name->string));
+		MSG_WriteString (&cls.message, va (0, "name \"%s\"\n",
+										   cl_name->string));
 		MSG_WriteByte (&cls.message, clc_stringcmd);
 		MSG_WriteString (&cls.message,
-						 va ("color %i %i\n", (cl_color->int_val) >> 4,
+						 va (0, "color %i %i\n", (cl_color->int_val) >> 4,
 							 (cl_color->int_val) & 15));
 		MSG_WriteByte (&cls.message, clc_stringcmd);
 		MSG_WriteString (&cls.message, "spawn");
@@ -389,7 +390,8 @@ CL_NextDemo (void)
 		}
 	}
 
-	Cbuf_InsertText (host_cbuf, va ("playdemo %s\n", cls.demos[cls.demonum]));
+	Cbuf_InsertText (host_cbuf, va (0, "playdemo %s\n",
+									cls.demos[cls.demonum]));
 	cls.demonum++;
 }
 
diff --git a/nq/source/cl_parse.c b/nq/source/cl_parse.c
index bf9ce6418..981f72714 100644
--- a/nq/source/cl_parse.c
+++ b/nq/source/cl_parse.c
@@ -866,7 +866,7 @@ CL_ParseServerMessage (void)
 			continue;
 		}
 
-		SHOWNET (va ("%s(%d)", svc_strings[cmd], cmd));
+		SHOWNET (va (0, "%s(%d)", svc_strings[cmd], cmd));
 
 		// other commands
 		switch (cmd) {
diff --git a/nq/source/host.c b/nq/source/host.c
index c852311be..861e9d06b 100644
--- a/nq/source/host.c
+++ b/nq/source/host.c
@@ -529,7 +529,7 @@ Host_FilterTime (float time)
 	//FIXME not having the framerate cap is nice, but it breaks net play
 	timedifference = (timescale / 72.0) - (realtime - oldrealtime);
 
-	if (!cls.timedemo && (timedifference > 0))
+	if (0 && !cls.timedemo && (timedifference > 0))
 		return timedifference;                   // framerate is too high
 
 	host_frametime = realtime - oldrealtime;
@@ -541,7 +541,7 @@ Host_FilterTime (float time)
 	if (host_framerate->value > 0)
 		host_frametime = host_framerate->value;
 	else	// don't allow really long or short frames
-		host_frametime = bound (0.001, host_frametime, 0.1);
+		host_frametime = bound (0.000, host_frametime, 0.1);
 
 	return 0;
 }
@@ -696,7 +696,7 @@ _Host_Frame (float time)
 
 	if (cls.demo_capture) {
 		tex_t      *tex = r_funcs->SCR_CaptureBGR ();
-		WritePNGqfs (va ("%s/qfmv%06d.png", qfs_gamedir->dir.shots,
+		WritePNGqfs (va (0, "%s/qfmv%06d.png", qfs_gamedir->dir.shots,
 						 cls.demo_capture++),
 					 tex->data, tex->width, tex->height);
 		free (tex);
diff --git a/nq/source/host_cmd.c b/nq/source/host_cmd.c
index ce79f1212..76529838e 100644
--- a/nq/source/host_cmd.c
+++ b/nq/source/host_cmd.c
@@ -239,13 +239,13 @@ nice_time (float time)
 	int         t = time + 0.5;
 
 	if (t < 60) {
-		return va ("%ds", t);
+		return va (0, "%ds", t);
 	} else if (t < 3600) {
-		return va ("%dm%02ds", t / 60, t % 60);
+		return va (0, "%dm%02ds", t / 60, t % 60);
 	} else if (t < 86400) {
-		return va ("%dh%02dm%02ds", t / 3600, (t / 60) % 60, t % 60);
+		return va (0, "%dh%02dm%02ds", t / 3600, (t / 60) % 60, t % 60);
 	} else {
-		return va ("%dd%02dh%02dm%02ds",
+		return va (0, "%dd%02dh%02dm%02ds",
 				   t / 86400, (t / 3600) % 24, (t / 60) % 60, t % 60);
 	}
 }
@@ -279,7 +279,7 @@ Host_Map_f (void)
 	}
 
 	// check to make sure the level exists
-	expanded = va ("maps/%s.bsp", Cmd_Argv (1));
+	expanded = va (0, "maps/%s.bsp", Cmd_Argv (1));
 	f = QFS_FOpenFile (expanded);
 	if (!f) {
 		Sys_Printf ("Can't find %s\n", expanded);
@@ -395,7 +395,7 @@ spawn_parms_array (void)
 	const char *parm;
 
 	for (i = 0; i < NUM_SPAWN_PARMS; i++) {
-		parm = va ("%.9g", svs.clients->spawn_parms[i]);
+		parm = va (0, "%.9g", svs.clients->spawn_parms[i]);
 		PL_A_AddObject (parms, PL_NewString (parm));
 	}
 	return parms;
@@ -437,15 +437,15 @@ game_dict (void)
 	plitem_t   *game = PL_NewDictionary ();
 
 	PL_D_AddObject (game, "comment",
-					PL_NewString (va ("%-21s kills:%3i/%3i", cl.levelname,
+					PL_NewString (va (0, "%-21s kills:%3i/%3i", cl.levelname,
 									  cl.stats[STAT_MONSTERS],
 									  cl.stats[STAT_TOTALMONSTERS])));
 	PL_D_AddObject (game, "spawn_parms", spawn_parms_array ());
 	PL_D_AddObject (game, "current_skill",
-					PL_NewString (va ("%d", current_skill)));
+					PL_NewString (va (0, "%d", current_skill)));
 	PL_D_AddObject (game, "name", PL_NewString (sv.name));
 	// sv.time is a double, so it gets 17 digits
-	PL_D_AddObject (game, "time", PL_NewString (va ("%.17g", sv.time)));
+	PL_D_AddObject (game, "time", PL_NewString (va (0, "%.17g", sv.time)));
 	PL_D_AddObject (game, "lightstyles", lightstyles_array ());
 	PL_D_AddObject (game, "globals", ED_GlobalsDict (&sv_pr_state));
 	PL_D_AddObject (game, "entities", entities_array ());
@@ -478,7 +478,7 @@ convert_to_game_dict (script_t *script)
 	// values
 	Script_GetToken (script, 1);
 	skill = (int) (atof (script->token->str) + 0.1);
-	PL_D_AddObject (game, "current_skill", PL_NewString (va ("%d", skill)));
+	PL_D_AddObject (game, "current_skill", PL_NewString (va (0, "%d", skill)));
 
 	Script_GetToken (script, 1);
 	PL_D_AddObject (game, "name", PL_NewString (script->token->str));
@@ -752,7 +752,7 @@ Host_Name_f (void)
 	if (cmd_source == src_command) {
 		if (strcmp (cl_name->string, newName) == 0)
 			return;
-		Cvar_Set (cl_name, va ("%.15s", newName));
+		Cvar_Set (cl_name, va (0, "%.15s", newName));
 		if (cls.state >= ca_connected)
 			CL_Cmd_ForwardToServer ();
 		return;
diff --git a/nq/source/sbar.c b/nq/source/sbar.c
index dd8c9adef..fe7e3264a 100644
--- a/nq/source/sbar.c
+++ b/nq/source/sbar.c
@@ -1648,8 +1648,8 @@ Sbar_Init (void)
 	Key_KeydestCallback (sbar_keydest_callback);
 
 	for (i = 0; i < 10; i++) {
-		sb_nums[0][i] = r_funcs->Draw_PicFromWad (va ("num_%i", i));
-		sb_nums[1][i] = r_funcs->Draw_PicFromWad (va ("anum_%i", i));
+		sb_nums[0][i] = r_funcs->Draw_PicFromWad (va (0, "num_%i", i));
+		sb_nums[1][i] = r_funcs->Draw_PicFromWad (va (0, "anum_%i", i));
 	}
 
 	sb_nums[0][10] = r_funcs->Draw_PicFromWad ("num_minus");
@@ -1676,19 +1676,19 @@ Sbar_Init (void)
 
 	for (i = 0; i < 5; i++) {
 		sb_weapons[2 + i][0] =
-			r_funcs->Draw_PicFromWad (va ("inva%i_shotgun", i + 1));
+			r_funcs->Draw_PicFromWad (va (0, "inva%i_shotgun", i + 1));
 		sb_weapons[2 + i][1] =
-			r_funcs->Draw_PicFromWad (va ("inva%i_sshotgun", i + 1));
+			r_funcs->Draw_PicFromWad (va (0, "inva%i_sshotgun", i + 1));
 		sb_weapons[2 + i][2] =
-			r_funcs->Draw_PicFromWad (va ("inva%i_nailgun", i + 1));
+			r_funcs->Draw_PicFromWad (va (0, "inva%i_nailgun", i + 1));
 		sb_weapons[2 + i][3] =
-			r_funcs->Draw_PicFromWad (va ("inva%i_snailgun", i + 1));
+			r_funcs->Draw_PicFromWad (va (0, "inva%i_snailgun", i + 1));
 		sb_weapons[2 + i][4] =
-			r_funcs->Draw_PicFromWad (va ("inva%i_rlaunch", i + 1));
+			r_funcs->Draw_PicFromWad (va (0, "inva%i_rlaunch", i + 1));
 		sb_weapons[2 + i][5] =
-			r_funcs->Draw_PicFromWad (va ("inva%i_srlaunch", i + 1));
+			r_funcs->Draw_PicFromWad (va (0, "inva%i_srlaunch", i + 1));
 		sb_weapons[2 + i][6] =
-			r_funcs->Draw_PicFromWad (va ("inva%i_lightng", i + 1));
+			r_funcs->Draw_PicFromWad (va (0, "inva%i_lightng", i + 1));
 	}
 
 	sb_ammo[0] = r_funcs->Draw_PicFromWad ("sb_shells");
@@ -1753,15 +1753,15 @@ Sbar_Init (void)
 
 		for (i = 0; i < 5; i++) {
 			hsb_weapons[2 + i][0] =
-				r_funcs->Draw_PicFromWad (va ("inva%i_laser", i + 1));
+				r_funcs->Draw_PicFromWad (va (0, "inva%i_laser", i + 1));
 			hsb_weapons[2 + i][1] =
-				r_funcs->Draw_PicFromWad (va ("inva%i_mjolnir", i + 1));
+				r_funcs->Draw_PicFromWad (va (0, "inva%i_mjolnir", i + 1));
 			hsb_weapons[2 + i][2] =
-				r_funcs->Draw_PicFromWad (va ("inva%i_gren_prox", i + 1));
+				r_funcs->Draw_PicFromWad (va (0, "inva%i_gren_prox", i + 1));
 			hsb_weapons[2 + i][3] =
-				r_funcs->Draw_PicFromWad (va ("inva%i_prox_gren", i + 1));
+				r_funcs->Draw_PicFromWad (va (0, "inva%i_prox_gren", i + 1));
 			hsb_weapons[2 + i][4] =
-				r_funcs->Draw_PicFromWad (va ("inva%i_prox", i + 1));
+				r_funcs->Draw_PicFromWad (va (0, "inva%i_prox", i + 1));
 		}
 
 		hsb_items[0] = r_funcs->Draw_PicFromWad ("sb_wsuit");
diff --git a/nq/source/sv_main.c b/nq/source/sv_main.c
index 70b3d91f4..60ede5d87 100644
--- a/nq/source/sv_main.c
+++ b/nq/source/sv_main.c
@@ -1214,7 +1214,7 @@ SV_SpawnServer (const char *server)
 	*sv_globals.serverflags = svs.serverflags;
 
 	*sv_globals.time = sv.time;
-	ent_file = QFS_VOpenFile (va ("maps/%s.ent", server), 0,
+	ent_file = QFS_VOpenFile (va (0, "maps/%s.ent", server), 0,
 							  sv.worldmodel->vpath);
 	if ((buf = QFS_LoadFile (ent_file, 0))) {
 		ED_LoadFromFile (&sv_pr_state, (char *) buf);
diff --git a/nq/source/sv_pr_cmds.c b/nq/source/sv_pr_cmds.c
index d5dcc4bb4..0084b3b99 100644
--- a/nq/source/sv_pr_cmds.c
+++ b/nq/source/sv_pr_cmds.c
@@ -1280,7 +1280,7 @@ PF_changelevel (progs_t *pr)
 	svs.changelevel_issued = true;
 
 	s = P_GSTRING (pr, 0);
-	Cbuf_AddText (host_cbuf, va ("changelevel %s\n", s));
+	Cbuf_AddText (host_cbuf, va (0, "changelevel %s\n", s));
 }
 
 // entity (entity ent) testentitypos
diff --git a/qtv/source/client.c b/qtv/source/client.c
index 06955b12f..c55e57bd2 100644
--- a/qtv/source/client.c
+++ b/qtv/source/client.c
@@ -177,9 +177,9 @@ cl_prespawn_f (client_t *cl, void *unused)
 	if (buf >= sv->num_signon_buffers)
 		buf = 0;
 	if (buf == sv->num_signon_buffers - 1)
-		cmd = va ("cmd spawn %i 0\n", cl->server->spawncount);
+		cmd = va (0, "cmd spawn %i 0\n", cl->server->spawncount);
 	else
-		cmd = va ("cmd prespawn %i %i\n", cl->server->spawncount, buf + 1);
+		cmd = va (0, "cmd prespawn %i %i\n", cl->server->spawncount, buf + 1);
 	size = sv->signon_buffer_size[buf] + 1 + strlen (cmd) + 1;
 	msg = MSG_ReliableCheckBlock (&cl->backbuf, size);
 	SZ_Write (msg, sv->signon_buffers[buf], sv->signon_buffer_size[buf]);
@@ -1234,7 +1234,7 @@ Client_New (client_t *cl)
 	MSG_WriteByte (&cl->netchan.message, sv->cdtrack);
 	MSG_WriteByte (&cl->netchan.message, svc_stufftext);
 	MSG_WriteString (&cl->netchan.message,
-					 va ("fullserverinfo \"%s\"\n",
+					 va (0, "fullserverinfo \"%s\"\n",
 						 Info_MakeString (sv->info, 0)));
 }
 
diff --git a/qtv/source/qtv.c b/qtv/source/qtv.c
index a227bfc31..513bb069e 100644
--- a/qtv/source/qtv.c
+++ b/qtv/source/qtv.c
@@ -237,7 +237,7 @@ qtv_quit_f (void)
 static void
 qtv_net_init (void)
 {
-	qtv_port = Cvar_Get ("qtv_port", va ("%d", PORT_QTV), 0, 0,
+	qtv_port = Cvar_Get ("qtv_port", va (0, "%d", PORT_QTV), 0, 0,
 						 "udp port to use");
 	sv_timeout = Cvar_Get ("sv_timeout", "60", 0, 0, "server timeout");
 	NET_Init (qtv_port->int_val);
diff --git a/qtv/source/sbar.c b/qtv/source/sbar.c
index 092c85ea1..c6e9ead8a 100644
--- a/qtv/source/sbar.c
+++ b/qtv/source/sbar.c
@@ -52,7 +52,7 @@ draw_clients (view_t *view)
 	const char *s;
 	char       *d;
 
-	str = va ("[CL: %3d]", client_count);
+	str = va (0, "[CL: %3d]", client_count);
 	for (s = str, d = sb->text + view->xrel; *s; s++)
 		*d++ = *s;
 }
@@ -66,7 +66,7 @@ draw_servers (view_t *view)
 	const char *s;
 	char       *d;
 
-	str = va ("[SV: %2d]", server_count);
+	str = va (0, "[SV: %2d]", server_count);
 	for (s = str, d = sb->text + view->xrel; *s; s++)
 		*d++ = *s;
 }
diff --git a/qtv/source/server.c b/qtv/source/server.c
index c376905d2..00778acea 100644
--- a/qtv/source/server.c
+++ b/qtv/source/server.c
@@ -452,7 +452,8 @@ sv_new_f (void)
 	sv->qport = qport->int_val;
 	sv->info = Info_ParseString ("", MAX_INFO_STRING, 0);
 	Info_SetValueForStarKey (sv->info, "*ver",
-							 va ("%s QTV %s", QW_VERSION, PACKAGE_VERSION), 0);
+							 va (0, "%s QTV %s", QW_VERSION, PACKAGE_VERSION),
+							 0);
 	Info_SetValueForStarKey (sv->info, "*qsg_version", QW_QSG_VERSION, 0);
 	Info_SetValueForKey (sv->info, "name", "QTV Proxy", 0);
 	Hash_Add (server_hash, sv);
@@ -628,7 +629,7 @@ Server_Broadcast (server_t *sv, int reliable, int all, const byte *msg,
 void
 Server_BroadcastCommand (server_t *sv, const char *cmd)
 {
-	const char *msg = va ("%c%s", svc_stufftext, cmd);
+	const char *msg = va (0, "%c%s", svc_stufftext, cmd);
 	int         len = strlen (msg) + 1;
 	Server_Broadcast (sv, 1, 1, (const byte *) msg, len);
 }
diff --git a/qtv/source/sv_parse.c b/qtv/source/sv_parse.c
index 1b6ca5841..493aa613a 100644
--- a/qtv/source/sv_parse.c
+++ b/qtv/source/sv_parse.c
@@ -118,7 +118,7 @@ sv_serverdata (server_t *sv, qmsg_t *msg)
 
 	MSG_WriteByte (&sv->netchan.message, qtv_stringcmd);
 	MSG_WriteString (&sv->netchan.message,
-					 va ("soundlist %i %i", sv->spawncount, 0));
+					 va (0, "soundlist %i %i", sv->spawncount, 0));
 	sv->next_run = realtime;
 }
 
@@ -147,11 +147,11 @@ sv_soundlist (server_t *sv, qmsg_t *msg)
 	if (n) {
 		MSG_WriteByte (&sv->netchan.message, qtv_stringcmd);
 		MSG_WriteString (&sv->netchan.message,
-						 va ("soundlist %d %d", sv->spawncount, n));
+						 va (0, "soundlist %d %d", sv->spawncount, n));
 	} else {
 		MSG_WriteByte (&sv->netchan.message, qtv_stringcmd);
 		MSG_WriteString (&sv->netchan.message,
-						 va ("modellist %d %d", sv->spawncount, 0));
+						 va (0, "modellist %d %d", sv->spawncount, 0));
 	}
 	sv->next_run = realtime;
 }
@@ -183,11 +183,11 @@ sv_modellist (server_t *sv, qmsg_t *msg)
 	if (n) {
 		MSG_WriteByte (&sv->netchan.message, qtv_stringcmd);
 		MSG_WriteString (&sv->netchan.message,
-						 va ("modellist %d %d", sv->spawncount, n));
+						 va (0, "modellist %d %d", sv->spawncount, n));
 	} else {
 		MSG_WriteByte (&sv->netchan.message, qtv_stringcmd);
 		MSG_WriteString (&sv->netchan.message,
-						 va ("prespawn %d 0 0", sv->spawncount));
+						 va (0, "prespawn %d 0 0", sv->spawncount));
 		sv->signon = 1;
 	}
 	sv->next_run = realtime;
@@ -213,7 +213,7 @@ sv_skins_f (server_t *sv)
 	// to get everything ready at the last miniute before we start getting
 	// actual in-game update messages
 	MSG_WriteByte (&sv->netchan.message, qtv_stringcmd);
-	MSG_WriteString (&sv->netchan.message, va ("begin %d", sv->spawncount));
+	MSG_WriteString (&sv->netchan.message, va (0, "begin %d", sv->spawncount));
 	sv->next_run = realtime;
 	sv->connected = 2;
 	sv->delta = -1;
diff --git a/qw/source/cl_chat.c b/qw/source/cl_chat.c
index 7a3dcb186..b2099d22d 100644
--- a/qw/source/cl_chat.c
+++ b/qw/source/cl_chat.c
@@ -233,7 +233,7 @@ CL_ChatInfo (int val)
 		val = 0;
 	if (cls.chat != val) {
 		cls.chat = val;
-		Cbuf_AddText(cl_cbuf, va ("setinfo chat \"%d\"\n", val));
+		Cbuf_AddText(cl_cbuf, va (0, "setinfo chat \"%d\"\n", val));
 	}
 }
 
diff --git a/qw/source/cl_cvar.c b/qw/source/cl_cvar.c
index ebd569ba8..f9e116ae9 100644
--- a/qw/source/cl_cvar.c
+++ b/qw/source/cl_cvar.c
@@ -53,7 +53,7 @@ Cvar_Info (cvar_t *var)
 		if (cls.state >= ca_connected && !cls.demoplayback) {
 			MSG_WriteByte (&cls.netchan.message, clc_stringcmd);
 			MSG_WriteString (&cls.netchan.message,
-							 va ("setinfo \"%s\" \"%s\"\n", var->name,
+							 va (0, "setinfo \"%s\" \"%s\"\n", var->name,
 								 var->string));
 		}
 	}
diff --git a/qw/source/cl_demo.c b/qw/source/cl_demo.c
index 51c709adc..b6e0049e7 100644
--- a/qw/source/cl_demo.c
+++ b/qw/source/cl_demo.c
@@ -697,7 +697,7 @@ demo_start_recording (int track)
 
 	// send server info string
 	MSG_WriteByte (&buf, svc_stufftext);
-	MSG_WriteString (&buf, va ("fullserverinfo \"%s\"\n",
+	MSG_WriteString (&buf, va (0, "fullserverinfo \"%s\"\n",
 							   Info_MakeString (cl.serverinfo, 0)));
 
 	// flush packet
@@ -803,7 +803,7 @@ demo_start_recording (int track)
 	}
 
 	MSG_WriteByte (&buf, svc_stufftext);
-	MSG_WriteString (&buf, va ("cmd spawn %i 0\n", cl.servercount));
+	MSG_WriteString (&buf, va (0, "cmd spawn %i 0\n", cl.servercount));
 
 	if (buf.cursize) {
 		CL_WriteRecordDemoMessage (&buf, seq++);
@@ -863,7 +863,7 @@ demo_start_recording (int track)
 	// get the client to check and download skins
 	// when that is completed, a begin command will be issued
 	MSG_WriteByte (&buf, svc_stufftext);
-	MSG_WriteString (&buf, va ("skins\n"));
+	MSG_WriteString (&buf, va (0, "skins\n"));
 
 	CL_WriteRecordDemoMessage (&buf, seq++);
 
diff --git a/qw/source/cl_main.c b/qw/source/cl_main.c
index e1c305c2b..d9ee07b56 100644
--- a/qw/source/cl_main.c
+++ b/qw/source/cl_main.c
@@ -321,7 +321,7 @@ CL_CheckForResend (void)
 
 	connect_time = realtime + t2 - t1;	// for retransmit requests
 
-	VID_SetCaption (va ("Connecting to %s", cls.servername->str));
+	VID_SetCaption (va (0, "Connecting to %s", cls.servername->str));
 	Sys_Printf ("Connecting to %s...\n", cls.servername->str);
 	Netchan_SendPacket (strlen (getchallenge), (void *) getchallenge,
 						cls.server_addr);
@@ -785,7 +785,7 @@ CL_NextDemo (void)
 		}
 	}
 
-	Cbuf_InsertText (cl_cbuf, va ("playdemo %s\n", cls.demos[cls.demonum]));
+	Cbuf_InsertText (cl_cbuf, va (0, "playdemo %s\n", cls.demos[cls.demonum]));
 	cls.demonum++;
 }
 
@@ -1089,7 +1089,7 @@ CL_Download_f (void)
 		cls.downloadtype = dl_single;
 
 		MSG_WriteByte (&cls.netchan.message, clc_stringcmd);
-		SZ_Print (&cls.netchan.message, va ("download %s\n", Cmd_Argv (1)));
+		SZ_Print (&cls.netchan.message, va (0, "download %s\n", Cmd_Argv (1)));
 	} else {
 		Sys_Printf ("error downloading %s: %s\n", Cmd_Argv (1),
 					strerror (errno));
@@ -1515,7 +1515,7 @@ Host_WriteConfiguration (void)
 	QFile      *f;
 
 	if (host_initialized && cl_writecfg->int_val) {
-		char       *path = va ("%s/config.cfg", qfs_gamedir->dir.def);
+		char       *path = va (0, "%s/config.cfg", qfs_gamedir->dir.def);
 
 		f = QFS_WOpen (path, 0);
 		if (!f) {
@@ -1700,7 +1700,7 @@ Host_Frame (float time)
 
 	if (cls.demo_capture) {
 		tex_t      *tex = r_funcs->SCR_CaptureBGR ();
-		WritePNGqfs (va ("%s/qfmv%06d.png", qfs_gamedir->dir.shots,
+		WritePNGqfs (va (0, "%s/qfmv%06d.png", qfs_gamedir->dir.shots,
 						 cls.demo_capture++),
 					 tex->data, tex->width, tex->height);
 		free (tex);
@@ -1782,7 +1782,7 @@ CL_Autoexec (int phase)
 		Cbuf_AddText (cl_cbuf, "exec autoexec.cfg\n");
 	}
 
-	Cbuf_AddText (cl_cbuf, va ("cmd_warncmd %d\n", cmd_warncmd_val));
+	Cbuf_AddText (cl_cbuf, va (0, "cmd_warncmd %d\n", cmd_warncmd_val));
 }
 
 void
diff --git a/qw/source/cl_parse.c b/qw/source/cl_parse.c
index 2446413d6..21c7dabd2 100644
--- a/qw/source/cl_parse.c
+++ b/qw/source/cl_parse.c
@@ -265,7 +265,7 @@ CL_CheckOrDownloadFile (const char *filename)
 
 	MSG_WriteByte (&cls.netchan.message, clc_stringcmd);
 	MSG_WriteString (&cls.netchan.message,
-					 va ("download \"%s\"", cls.downloadname->str));
+					 va (0, "download \"%s\"", cls.downloadname->str));
 
 	cls.downloadnumber++;
 
@@ -373,12 +373,13 @@ Model_NextDownload (void)
 			aliashdr_t *ahdr = cl.model_precache[i]->aliashdr;
 			if (!ahdr)
 				ahdr = Cache_Get (&cl.model_precache[i]->cache);
-			Info_SetValueForKey (cls.userinfo, info_key, va ("%d", ahdr->crc),
+			Info_SetValueForKey (cls.userinfo, info_key, va (0, "%d",
+															 ahdr->crc),
 								 0);
 			if (!cls.demoplayback) {
 				MSG_WriteByte (&cls.netchan.message, clc_stringcmd);
-				SZ_Print (&cls.netchan.message, va ("setinfo %s %d", info_key,
-													ahdr->crc));
+				SZ_Print (&cls.netchan.message, va (0, "setinfo %s %d",
+													info_key, ahdr->crc));
 			}
 			if (!cl.model_precache[i]->aliashdr)
 				Cache_Release (&cl.model_precache[i]->cache);
@@ -402,7 +403,7 @@ Model_NextDownload (void)
 	if (!cls.demoplayback) {
 		MSG_WriteByte (&cls.netchan.message, clc_stringcmd);
 		MSG_WriteString (&cls.netchan.message,
-						 va (prespawn_name, cl.servercount,
+						 va (0, prespawn_name, cl.servercount,
 							 cl.worldmodel->checksum2));
 	}
 }
@@ -423,7 +424,7 @@ Sound_NextDownload (void)
 	for (; cl.sound_name[cls.downloadnumber][0];
 		 cls.downloadnumber++) {
 		s = cl.sound_name[cls.downloadnumber];
-		if (!CL_CheckOrDownloadFile (va ("sound/%s", s)))
+		if (!CL_CheckOrDownloadFile (va (0, "sound/%s", s)))
 			return;						// started a download
 	}
 
@@ -443,7 +444,7 @@ Sound_NextDownload (void)
 	if (!cls.demoplayback) {
 		MSG_WriteByte (&cls.netchan.message, clc_stringcmd);
 		MSG_WriteString (&cls.netchan.message,
-						 va (modellist_name, cl.servercount, 0));
+						 va (0, modellist_name, cl.servercount, 0));
 	}
 }
 
@@ -472,7 +473,7 @@ void
 CL_FinishDownload (void)
 {
 	Qclose (cls.download);
-	VID_SetCaption (va ("Connecting to %s", cls.servername->str));
+	VID_SetCaption (va (0, "Connecting to %s", cls.servername->str));
 
 	// rename the temp file to it's final name
 	if (strcmp (cls.downloadtempname->str, cls.downloadname->str)) {
@@ -662,8 +663,8 @@ CL_ParseDownload (void)
 	if (percent != 100) {
 		// request next block
 		if (percent != cls.downloadpercent)
-			VID_SetCaption (va ("Downloading %s %d%%", cls.downloadname->str,
-								percent));
+			VID_SetCaption (va (0, "Downloading %s %d%%",
+								cls.downloadname->str, percent));
 		cls.downloadpercent = percent;
 
 		MSG_WriteByte (&cls.netchan.message, clc_stringcmd);
@@ -842,7 +843,7 @@ CL_ParseServerData (void)
 	if (!cls.demoplayback) {
 		MSG_WriteByte (&cls.netchan.message, clc_stringcmd);
 		MSG_WriteString (&cls.netchan.message,
-						 va (soundlist_name, cl.servercount, 0));
+						 va (0, soundlist_name, cl.servercount, 0));
 	}
 
 	// now waiting for downloads, etc
@@ -878,7 +879,7 @@ CL_ParseSoundlist (void)
 	if (n && !cls.demoplayback) {
 		MSG_WriteByte (&cls.netchan.message, clc_stringcmd);
 		MSG_WriteString (&cls.netchan.message,
-						 va (soundlist_name, cl.servercount, n));
+						 va (0, soundlist_name, cl.servercount, n));
 		return;
 	}
 
@@ -929,7 +930,7 @@ CL_ParseModellist (void)
 		if (!cls.demoplayback) {
 			MSG_WriteByte (&cls.netchan.message, clc_stringcmd);
 			MSG_WriteString (&cls.netchan.message,
-							 va (modellist_name, cl.servercount, n));
+							 va (0, modellist_name, cl.servercount, n));
 		}
 		return;
 	}
@@ -1095,7 +1096,8 @@ CL_ProcessUserInfo (int slot, player_info_t *player)
 	while (!(player->name = Info_Key (player->userinfo, "name"))) {
 		if (player->userid)
 			Info_SetValueForKey (player->userinfo, "name",
-								 va ("user-%i [exploit]", player->userid), 1);
+								 va (0, "user-%i [exploit]",
+									 player->userid), 1);
 		else
 			Info_SetValueForKey (player->userinfo, "name", "", 1);
 	}
@@ -1248,7 +1250,8 @@ CL_SetStat (int stat, int value)
 			break;
 		case STAT_HEALTH:
 			if (cl_player_health_e->func)
-				GIB_Event_Callback (cl_player_health_e, 1, va ("%i", value));
+				GIB_Event_Callback (cl_player_health_e, 1,
+									va (0, "%i", value));
 			if (value <= 0)
 				Team_Dead ();
 			break;
@@ -1331,7 +1334,7 @@ CL_ParseServerMessage (void)
 			break;						// end of message
 		}
 
-		SHOWNET (va ("%s(%d)", svc_strings[cmd], cmd));
+		SHOWNET (va (0, "%s(%d)", svc_strings[cmd], cmd));
 
 		// other commands
 		switch (cmd) {
diff --git a/qw/source/cl_skin.c b/qw/source/cl_skin.c
index 21a9afea7..491d12652 100644
--- a/qw/source/cl_skin.c
+++ b/qw/source/cl_skin.c
@@ -78,7 +78,8 @@ Skin_NextDownload (void)
 		//XXX Skin_Find (sc);
 		if (noskins->int_val) //XXX FIXME
 			continue;
-		//XXX if (!CL_CheckOrDownloadFile (va ("skins/%s.pcx", sc->skin->name)))
+		//XXX if (!CL_CheckOrDownloadFile (va (0, "skins/%s.pcx",
+		//									   sc->skin->name)))
 			//XXX return;						// started a download
 	}
 
@@ -99,7 +100,7 @@ Skin_NextDownload (void)
 			// get next signon phase
 			MSG_WriteByte (&cls.netchan.message, clc_stringcmd);
 			MSG_WriteString (&cls.netchan.message,
-							 va ("begin %i", cl.servercount));
+							 va (0, "begin %i", cl.servercount));
 			Cache_Report ();				// print remaining memory
 		}
 		CL_SetState (ca_active);
diff --git a/qw/source/cl_slist.c b/qw/source/cl_slist.c
index 4b5ea16b8..ded6445c8 100644
--- a/qw/source/cl_slist.c
+++ b/qw/source/cl_slist.c
@@ -575,7 +575,7 @@ MSL_ParseServerList (const char *msl_data)
 	unsigned int msl_ptr;
 
 	for (msl_ptr = 0; msl_ptr < strlen (msl_data); msl_ptr = msl_ptr + 6) {
-		slist = SL_Add (slist, va ("%i.%i.%i.%i:%i",
+		slist = SL_Add (slist, va (0, "%i.%i.%i.%i:%i",
 								   (byte) msl_data[msl_ptr],
 								   (byte) msl_data[msl_ptr+1],
 								   (byte) msl_data[msl_ptr+2],
diff --git a/qw/source/crudefile.c b/qw/source/crudefile.c
index 3050a6efc..a02bc81bc 100644
--- a/qw/source/crudefile.c
+++ b/qw/source/crudefile.c
@@ -150,7 +150,7 @@ CF_BuildQuota (void)
 	cf_cursize = 0;
 
 	while ((i = readdir (dir))) {
-		cf_cursize += CF_GetFileSize (va ("%s/%s", path->str, i->d_name));
+		cf_cursize += CF_GetFileSize (va (0, "%s/%s", path->str, i->d_name));
 	}
 	closedir (dir);
 }
diff --git a/qw/source/locs.c b/qw/source/locs.c
index c30080dd7..ab92ec4c2 100644
--- a/qw/source/locs.c
+++ b/qw/source/locs.c
@@ -136,7 +136,7 @@ locs_load (const char *filename)
 	vec3_t      loc;
 	QFile      *file;
 
-	tmp = va ("maps/%s", filename);
+	tmp = va (0, "maps/%s", filename);
 	file = QFS_FOpenFile (tmp);
 	if (!file) {
 		Sys_Printf ("Couldn't load %s\n", tmp);
@@ -196,7 +196,7 @@ locs_save (const char *filename, qboolean gz)
 
 	if (gz) {
 		if (strcmp (QFS_FileExtension (filename), ".gz") != 0)
-			filename = va ("%s.gz", filename);
+			filename = va (0, "%s.gz", filename);
 		locfd = QFS_Open (filename, "z9w+");
 	} else
 		locfd = QFS_Open (filename, "w+");
diff --git a/qw/source/sbar.c b/qw/source/sbar.c
index 3a6e97778..a7b3ab415 100644
--- a/qw/source/sbar.c
+++ b/qw/source/sbar.c
@@ -1605,7 +1605,7 @@ draw_net (view_t *view)
 		int ping = cl.players[cl.playernum].ping;
 
 		ping = bound (0, ping, 999);
-		draw_string (view, 0, 0, va ("%3d ms ", ping));
+		draw_string (view, 0, 0, va (0, "%3d ms ", ping));
 	}
 
 	if (hud_ping->int_val && hud_pl->int_val)
@@ -1615,7 +1615,7 @@ draw_net (view_t *view)
 		int lost = CL_CalcNet ();
 
 		lost = bound (0, lost, 999);
-		draw_string (view, 56, 0, va ("%3d pl", lost));
+		draw_string (view, 56, 0, va (0, "%3d pl", lost));
 	}
 }
 
@@ -1950,8 +1950,8 @@ Sbar_Init (void)
 	Key_KeydestCallback (sbar_keydest_callback);
 
 	for (i = 0; i < 10; i++) {
-		sb_nums[0][i] = r_funcs->Draw_PicFromWad (va ("num_%i", i));
-		sb_nums[1][i] = r_funcs->Draw_PicFromWad (va ("anum_%i", i));
+		sb_nums[0][i] = r_funcs->Draw_PicFromWad (va (0, "num_%i", i));
+		sb_nums[1][i] = r_funcs->Draw_PicFromWad (va (0, "anum_%i", i));
 	}
 
 	sb_nums[0][10] = r_funcs->Draw_PicFromWad ("num_minus");
@@ -1977,19 +1977,26 @@ Sbar_Init (void)
 	sb_weapons[1][6] = r_funcs->Draw_PicFromWad ("inv2_lightng");
 
 	for (i = 0; i < 5; i++) {
-		sb_weapons[2 + i][0] = r_funcs->Draw_PicFromWad (va ("inva%i_shotgun",
+		sb_weapons[2 + i][0] = r_funcs->Draw_PicFromWad (va (0,
+															 "inva%i_shotgun",
 															 i + 1));
-		sb_weapons[2 + i][1] = r_funcs->Draw_PicFromWad (va ("inva%i_sshotgun",
+		sb_weapons[2 + i][1] = r_funcs->Draw_PicFromWad (va (0,
+															 "inva%i_sshotgun",
 															 i + 1));
-		sb_weapons[2 + i][2] = r_funcs->Draw_PicFromWad (va ("inva%i_nailgun",
+		sb_weapons[2 + i][2] = r_funcs->Draw_PicFromWad (va (0,
+															 "inva%i_nailgun",
 															 i + 1));
-		sb_weapons[2 + i][3] = r_funcs->Draw_PicFromWad (va ("inva%i_snailgun",
+		sb_weapons[2 + i][3] = r_funcs->Draw_PicFromWad (va (0,
+															 "inva%i_snailgun",
 															 i + 1));
-		sb_weapons[2 + i][4] = r_funcs->Draw_PicFromWad (va ("inva%i_rlaunch",
+		sb_weapons[2 + i][4] = r_funcs->Draw_PicFromWad (va (0,
+															 "inva%i_rlaunch",
 															 i + 1));
-		sb_weapons[2 + i][5] = r_funcs->Draw_PicFromWad (va ("inva%i_srlaunch",
+		sb_weapons[2 + i][5] = r_funcs->Draw_PicFromWad (va (0,
+															 "inva%i_srlaunch",
 															 i + 1));
-		sb_weapons[2 + i][6] = r_funcs->Draw_PicFromWad (va ("inva%i_lightng",
+		sb_weapons[2 + i][6] = r_funcs->Draw_PicFromWad (va (0,
+															 "inva%i_lightng",
 															 i + 1));
 	}
 
diff --git a/qw/source/sv_ccmds.c b/qw/source/sv_ccmds.c
index aef14bea6..22604df69 100644
--- a/qw/source/sv_ccmds.c
+++ b/qw/source/sv_ccmds.c
@@ -250,7 +250,7 @@ SV_Fraglogfile_f (void)
 	}
 	name = dstring_new ();
 	if (!QFS_NextFilename (name,
-						   va ("%s/frag_", qfs_gamedir->dir.def), ".log")) {
+						   va (0, "%s/frag_", qfs_gamedir->dir.def), ".log")) {
 		SV_Printf ("Can't open any logfiles.\n");
 		sv_fraglogfile = NULL;
 	} else {
@@ -396,29 +396,29 @@ nice_time (float time)
 
 #if 0 //FIXME ditch or cvar?
 	if (t < 60) {
-		return va ("%ds", t);
+		return va (0, "%ds", t);
 	} else if (t < 600) {
-		return va ("%dm%02ds", t / 60, t % 60);
+		return va (0, "%dm%02ds", t / 60, t % 60);
 	} else if (t < 3600) {
-		return va ("%dm", t / 60);
+		return va (0, "%dm", t / 60);
 	} else if (t < 36000) {
 		t /= 60;
-		return va ("%dh%02dm", t / 60, t % 60);
+		return va (0, "%dh%02dm", t / 60, t % 60);
 	} else if (t < 86400) {
-		return va ("%dh", t / 3600);
+		return va (0, "%dh", t / 3600);
 	} else {
 		t /= 3600;
-		return va ("%dd%02dh", t / 24, t % 24);
+		return va (0, "%dd%02dh", t / 24, t % 24);
 	}
 #endif
 	if (t < 60) {
-		return va ("%ds", t);
+		return va (0, "%ds", t);
 	} else if (t < 3600) {
-		return va ("%dm%02ds", t / 60, t % 60);
+		return va (0, "%dm%02ds", t / 60, t % 60);
 	} else if (t < 86400) {
-		return va ("%dh%02dm%02ds", t / 3600, (t / 60) % 60, t % 60);
+		return va (0, "%dh%02dm%02ds", t / 3600, (t / 60) % 60, t % 60);
 	} else {
-		return va ("%dd%02dh%02dm%02ds",
+		return va (0, "%dd%02dh%02dm%02ds",
 				   t / 86400, (t / 3600) % 24, (t / 60) % 60, t % 60);
 	}
 }
@@ -742,15 +742,15 @@ SV_Ban_f (void)
 	if (argc > argr) {
 		reason = Cmd_Args (argr);
 		SV_BroadcastPrintf (PRINT_HIGH, "Admin Banned user %s %s: %s\n",
-							cl->name, mins ? va ("for %.1f minutes", mins)
+							cl->name, mins ? va (0, "for %.1f minutes", mins)
 										   : "permanently", reason);
 	} else {
 		SV_BroadcastPrintf (PRINT_HIGH, "Admin Banned user %s %s\n",
-							cl->name, mins ? va ("for %.1f minutes", mins)
+							cl->name, mins ? va (0, "for %.1f minutes", mins)
 										   : "permanently");
 	}
 	SV_DropClient (cl);
-	Cmd_ExecuteString (va ("addip %s %f",
+	Cmd_ExecuteString (va (0, "addip %s %f",
 						   NET_BaseAdrToString (cl->netchan.remote_address),
 						   mins), src_command);
 }
@@ -812,7 +812,7 @@ SV_ConSay (const char *prefix, client_t *client)
 			dbuf = SVR_WriteBegin (dem_all, 0, strlen (text->str) + 7);
 			MSG_WriteByte (dbuf, svc_print);
 			MSG_WriteByte (dbuf, PRINT_HIGH);
-			MSG_WriteString (dbuf, va ("%s\n", text->str));
+			MSG_WriteString (dbuf, va (0, "%s\n", text->str));
 			MSG_WriteByte (dbuf, svc_print);
 			MSG_WriteByte (dbuf, PRINT_CHAT);
 			MSG_WriteString (dbuf, "");
@@ -1136,7 +1136,7 @@ SV_Snap (int uid)
 		cl->uploadfn = dstring_new ();
 
 	if (!QFS_NextFilename (cl->uploadfn,
-						   va ("%s/snap/%d-", qfs_gamedir->dir.def, uid),
+						   va (0, "%s/snap/%d-", qfs_gamedir->dir.def, uid),
 						   ".pcx")) {
 		SV_Printf ("Snap: Couldn't create a file, clean some out.\n");
 		dstring_delete (cl->uploadfn);
diff --git a/qw/source/sv_demo.c b/qw/source/sv_demo.c
index cc53372a8..b13135c93 100644
--- a/qw/source/sv_demo.c
+++ b/qw/source/sv_demo.c
@@ -191,7 +191,7 @@ SV_Stop (int reason)
 
 		sv_redirected = RD_NONE;		// onrecord script is called always
 										// from the console
-		Cmd_TokenizeString (va ("script %s \"%s\" \"%s\" \"%s\" %s",
+		Cmd_TokenizeString (va (0, "script %s \"%s\" \"%s\" \"%s\" %s",
 								sv_onrecordfinish->string, demo.path->str,
 								serverdemo->string,
 								path, p != NULL ? p + 1 : ""));
@@ -454,7 +454,7 @@ SV_Record (char *name)
 
 	// send server info string
 	MSG_WriteByte (&buf, svc_stufftext);
-	MSG_WriteString (&buf, va ("fullserverinfo \"%s\"\n",
+	MSG_WriteString (&buf, va (0, "fullserverinfo \"%s\"\n",
 							   Info_MakeString (svs.info, 0)));
 
 	// flush packet
@@ -524,7 +524,7 @@ SV_Record (char *name)
 	}
 
 	MSG_WriteByte (&buf, svc_stufftext);
-	MSG_WriteString (&buf, va ("cmd spawn %i 0\n", svs.spawncount));
+	MSG_WriteString (&buf, va (0, "cmd spawn %i 0\n", svs.spawncount));
 
 	if (buf.cursize) {
 		SV_WriteRecordDemoMessage (&buf);
@@ -576,7 +576,7 @@ SV_Record (char *name)
 	// get the client to check and download skins
 	// when that is completed, a begin command will be issued
 	MSG_WriteByte (&buf, svc_stufftext);
-	MSG_WriteString (&buf, va ("skins\n"));
+	MSG_WriteString (&buf, va (0, "skins\n"));
 
 	SV_WriteRecordDemoMessage (&buf);
 
@@ -797,7 +797,7 @@ Demo_Init (void)
 	sv_demoPings = Cvar_Get ("sv_demoPings", "3", CVAR_NONE, 0, "FIXME");
 	sv_demoNoVis = Cvar_Get ("sv_demoNoVis", "1", CVAR_NONE, 0, "FIXME");
 	sv_demoUseCache = Cvar_Get ("sv_demoUseCache", "0", CVAR_NONE, 0, "FIXME");
-	sv_demoCacheSize = Cvar_Get ("sv_demoCacheSize", va ("%d", size / 1024),
+	sv_demoCacheSize = Cvar_Get ("sv_demoCacheSize", va (0, "%d", size / 1024),
 								 CVAR_ROM, 0, "FIXME");
 	sv_demoMaxSize = Cvar_Get ("sv_demoMaxSize", "20480", CVAR_NONE, 0,
 							   "FIXME");
diff --git a/qw/source/sv_init.c b/qw/source/sv_init.c
index d5b6d0d2c..6e8b7bae5 100644
--- a/qw/source/sv_init.c
+++ b/qw/source/sv_init.c
@@ -374,7 +374,7 @@ SV_SpawnServer (const char *server)
 	SV_LoadProgs ();
 	SV_FreeAllEdictLeafs ();
 	SV_SetupUserCommands ();
-	Info_SetValueForStarKey (svs.info, "*progs", va ("%i", sv_pr_state.crc),
+	Info_SetValueForStarKey (svs.info, "*progs", va (0, "%i", sv_pr_state.crc),
 							 !sv_highchars->int_val);
 
 	// leave slots at start for only clients
@@ -437,7 +437,7 @@ SV_SpawnServer (const char *server)
 
 	// load and spawn all other entities
 	*sv_globals.time = sv.time;
-	ent_file = QFS_VOpenFile (va ("maps/%s.ent", server), 0,
+	ent_file = QFS_VOpenFile (va (0, "maps/%s.ent", server), 0,
 							  sv.worldmodel->vpath);
 	if ((buf = QFS_LoadFile (ent_file, 0))) {
 		ED_LoadFromFile (&sv_pr_state, (char *) buf);
diff --git a/qw/source/sv_main.c b/qw/source/sv_main.c
index ffc1a5db4..0156d689a 100644
--- a/qw/source/sv_main.c
+++ b/qw/source/sv_main.c
@@ -368,7 +368,7 @@ SV_DropClient (client_t *drop)
 	// Trigger GIB event
 	if (sv_client_disconnect_e->func)
 		GIB_Event_Callback (sv_client_disconnect_e, 1,
-							va ("%u", drop->userid));
+							va (0, "%u", drop->userid));
 }
 
 int
@@ -1459,7 +1459,7 @@ SV_AddIP_f (void)
 							  bantime / 60);
 				else
 					strncpy (timestr, "permanently", sizeof (timestr));
-				text = va ("You are %s %s\n%s",
+				text = va (0, "You are %s %s\n%s",
 						   typestr, timestr, type == ft_ban ? "" :
 						   "\nReconnecting won't help...");
 				MSG_ReliableWrite_Begin (&cl->backbuf, svc_centerprint,
@@ -1884,7 +1884,7 @@ SV_CheckVars (void)
 		Info_SetValueForKey (svs.info, "needpass", "",
 							 !sv_highchars->int_val);
 	else
-		Info_SetValueForKey (svs.info, "needpass", va ("%i", v),
+		Info_SetValueForKey (svs.info, "needpass", va (0, "%i", v),
 							 !sv_highchars->int_val);
 }
 
diff --git a/qw/source/sv_pr_cmds.c b/qw/source/sv_pr_cmds.c
index 49f0cc332..7298dc74a 100644
--- a/qw/source/sv_pr_cmds.c
+++ b/qw/source/sv_pr_cmds.c
@@ -1411,7 +1411,7 @@ PF_changelevel (progs_t *pr)
 	last_spawncount = svs.spawncount;
 
 	s = P_GSTRING (pr, 0);
-	Cbuf_AddText (sv_cbuf, va ("map %s\n", s));
+	Cbuf_AddText (sv_cbuf, va (0, "map %s\n", s));
 }
 
 /*
@@ -1460,13 +1460,13 @@ PF_logfrag (progs_t *pr)
 
 		snprintf(buf, sizeof(buf), "%d", u2);
 
-		GIB_Event_Callback (sv_frag_e, 4, type1, va ("%d", u1), type2, buf);
+		GIB_Event_Callback (sv_frag_e, 4, type1, va (0, "%d", u1), type2, buf);
 	}
 
 	if (e1 < 1 || e1 > MAX_CLIENTS || e2 < 1 || e2 > MAX_CLIENTS)
 		return;
 
-	s = va ("\\%s\\%s\\\n", svs.clients[e1 - 1].name,
+	s = va (0, "\\%s\\%s\\\n", svs.clients[e1 - 1].name,
 			svs.clients[e2 - 1].name);
 
 	SZ_Print (&svs.log[svs.logsequence & 1], s);
@@ -1511,7 +1511,7 @@ PF_infokey (progs_t *pr)
 		else if (!strcmp (key, "ping")) {
 			int         ping = SV_CalcPing (&svs.clients[e1 - 1]);
 
-			value = va ("%d", ping);
+			value = va (0, "%d", ping);
 		} else
 			value = Info_ValueForKey (svs.clients[e1 - 1].userinfo, key);
 	} else
@@ -1862,7 +1862,7 @@ PF_SV_FreeClient (progs_t *pr)
 	cl->state = cs_free;
 
 	//if (sv_client_disconnect_e->func)
-	//	GIB_Event_Callback (sv_client_disconnect_e, 2, va ("%u", cl->userid),
+	//	GIB_Event_Callback (sv_client_disconnect_e, 2, va (0, "%u", cl->userid),
 	//						"server");
 }
 
diff --git a/qw/source/sv_pr_qwe.c b/qw/source/sv_pr_qwe.c
index 010c8a5a6..ea4d533f4 100644
--- a/qw/source/sv_pr_qwe.c
+++ b/qw/source/sv_pr_qwe.c
@@ -451,7 +451,7 @@ PF_log (progs_t *pr)
 	char       *text;
 	QFile      *file;
 
-	name = va ("%s/%s.log", qfs_gamedir->dir.def, P_GSTRING (pr, 0));
+	name = va (0, "%s/%s.log", qfs_gamedir->dir.def, P_GSTRING (pr, 0));
 	file = QFS_Open (name, "a");
 
 	text = PF_VarString (pr, 2);
diff --git a/qw/source/sv_qtv.c b/qw/source/sv_qtv.c
index 6804a51e3..366c2d687 100644
--- a/qw/source/sv_qtv.c
+++ b/qw/source/sv_qtv.c
@@ -194,9 +194,9 @@ qtv_prespawn_f (sv_qtv_t *proxy)
 		buf = 0;
 
 	if (buf == sv.num_signon_buffers - 1)
-		command = va ("cmd spawn %i 0\n", svs.spawncount);
+		command = va (0, "cmd spawn %i 0\n", svs.spawncount);
 	else
-		command = va ("cmd prespawn %i %i\n", svs.spawncount, buf + 1);
+		command = va (0, "cmd prespawn %i %i\n", svs.spawncount, buf + 1);
 	size = (3 + sv.signon_buffer_size[buf]) + (1 + strlen (command) + 1);
 
 	msg = MSG_ReliableCheckBlock (&proxy->backbuf, size);
@@ -534,7 +534,7 @@ SV_qtvChanging (void)
 	int         i, len;
 	const char *msg;
 
-	msg = va ("%cchanging", qtv_stringcmd);
+	msg = va (0, "%cchanging", qtv_stringcmd);
 	len = strlen (msg) + 1;
 	for (i = 0; i < MAX_PROXIES; i++) {
 		proxy = proxies + i;
@@ -555,7 +555,7 @@ SV_qtvReconnect (void)
 	int         i, len;
 	const char *msg;
 
-	msg = va ("%creconnect", qtv_stringcmd);
+	msg = va (0, "%creconnect", qtv_stringcmd);
 	len = strlen (msg) + 1;
 	for (i = 0; i < MAX_PROXIES; i++) {
 		proxy = proxies + i;
diff --git a/qw/source/sv_sbar.c b/qw/source/sv_sbar.c
index 012a38835..12aa9115a 100644
--- a/qw/source/sv_sbar.c
+++ b/qw/source/sv_sbar.c
@@ -55,7 +55,7 @@ draw_cpu (view_t *view)
 	cpu = (svs.stats.latched_active + svs.stats.latched_idle);
 	cpu = 100 * svs.stats.latched_active / cpu;
 
-	cpu_str = va ("[CPU: %3d%%]", (int) cpu);
+	cpu_str = va (0, "[CPU: %3d%%]", (int) cpu);
 	for (s = cpu_str, d = sb->text + view->xrel; *s; s++)
 		*d++ = *s;
 	if (cpu > 70.0) {
@@ -74,7 +74,7 @@ draw_rec (view_t *view)
 	const char *s;
 	char       *d;
 
-	str = va ("[REC: %d]", SVR_NumRecorders ());
+	str = va (0, "[REC: %d]", SVR_NumRecorders ());
 	for (s = str, d = sb->text + view->xrel; *s; s++)
 		*d++ = *s;
 }
diff --git a/qw/source/sv_user.c b/qw/source/sv_user.c
index f9c44f48f..3fba2c17f 100644
--- a/qw/source/sv_user.c
+++ b/qw/source/sv_user.c
@@ -141,7 +141,7 @@ SV_WriteWorldVars (netchan_t *netchan)
 	// send server info string
 	MSG_WriteByte (&netchan->message, svc_stufftext);
 	MSG_WriteString (&netchan->message,
-					 va ("fullserverinfo \"%s\"\n",
+					 va (0, "fullserverinfo \"%s\"\n",
 						 Info_MakeString (svs.info, 0)));
 }
 
@@ -194,7 +194,7 @@ SV_New_f (void *unused)
 	// Trigger GIB connection event
 	if (sv_client_connect_e->func)
 		GIB_Event_Callback (sv_client_connect_e, 1,
-							va ("%u", host_client->userid));
+							va (0, "%u", host_client->userid));
 }
 
 void
@@ -351,9 +351,9 @@ SV_PreSpawn_f (void *unused)
 	host_client->prespawned = true;
 
 	if (buf == sv.num_signon_buffers - 1)
-		command = va ("cmd spawn %i 0\n", svs.spawncount);
+		command = va (0, "cmd spawn %i 0\n", svs.spawncount);
 	else
-		command = va ("cmd prespawn %i %i\n", svs.spawncount, buf + 1);
+		command = va (0, "cmd prespawn %i %i\n", svs.spawncount, buf + 1);
 
 	size = sv.signon_buffer_size[buf] + 1 + strlen (command) + 1;
 
@@ -605,7 +605,7 @@ SV_Begin_f (void *unused)
 
 	// Trigger GIB events
 	if (sv_client_spawn_e->func)
-		GIB_Event_Callback (sv_client_spawn_e, 1, va ("%u",
+		GIB_Event_Callback (sv_client_spawn_e, 1, va (0, "%u",
 													  host_client->userid));
 }
 
@@ -787,7 +787,7 @@ SV_BeginDownload_f (void *unused)
 		MSG_ReliableWrite_Short (&host_client->backbuf, DL_HTTP);
 		MSG_ReliableWrite_Byte (&host_client->backbuf, 0);
 		MSG_ReliableWrite_String (&host_client->backbuf,
-								  va ("%s/%s", sv_http_url_base->string,
+								  va (0, "%s/%s", sv_http_url_base->string,
 									  ren ? qfs_foundfile.realname : name));
 		MSG_ReliableWrite_String (&host_client->backbuf,
 								  ren ? qfs_foundfile.realname : "");
@@ -914,7 +914,7 @@ SV_Say (qboolean team)
 	dsprintf (text, fmt, host_client->name);
 
 	if (sv_chat_e->func)
-		GIB_Event_Callback (sv_chat_e, 2, va ("%i", host_client->userid), p,
+		GIB_Event_Callback (sv_chat_e, 2, va (0, "%i", host_client->userid), p,
 							type);
 
 	dstring_appendstr (text, p);
@@ -1201,7 +1201,7 @@ SV_SetUserinfo (client_t *client, const char *key, const char *value)
 
 	// trigger a GIB event
 	if (sv_setinfo_e->func)
-		GIB_Event_Callback (sv_setinfo_e, 4, va("%d", client->userid),
+		GIB_Event_Callback (sv_setinfo_e, 4, va (0, "%d", client->userid),
 							key, oldvalue, value);
 
 	if (sv_funcs.UserInfoChanged) {
diff --git a/qw/source/teamplay.c b/qw/source/teamplay.c
index c5df33cd3..b8158cbdb 100644
--- a/qw/source/teamplay.c
+++ b/qw/source/teamplay.c
@@ -424,7 +424,7 @@ Locs_Init (void)
 static const char *
 Team_F_Version (char *args)
 {
-	return va ("say %s", PACKAGE_STRING);
+	return va (0, "say %s", PACKAGE_STRING);
 }
 
 static const char *
@@ -446,7 +446,7 @@ Team_F_Skins (char *args)
 	if (l == 0) {
 		//XXXtotalfb = Skin_FbPercent (0);
 		totalfb = 0;
-		return va ("say Player models have %f%% brightness\n"
+		return va (0, "say Player models have %f%% brightness\n"
 			   "say Average percent fullbright for all loaded skins is "
 			   "%d.%d%%", allfb * 100, totalfb / 10, totalfb % 10);
 	}
@@ -455,8 +455,8 @@ Team_F_Skins (char *args)
 	totalfb = 0;
 
 	if (totalfb >= 0)
-		return va ("say \"Skin %s is %d.%d%% fullbright\"", args, totalfb / 10,
-				   totalfb % 10);
+		return va (0, "say \"Skin %s is %d.%d%% fullbright\"",
+				   args, totalfb / 10, totalfb % 10);
 	else
 		return ("say \"Skin not currently loaded.\"");
 }
diff --git a/ruamoko/qwaq/builtins/main.c b/ruamoko/qwaq/builtins/main.c
index f493e8528..dbafed33f 100644
--- a/ruamoko/qwaq/builtins/main.c
+++ b/ruamoko/qwaq/builtins/main.c
@@ -102,7 +102,7 @@ load_file (progs_t *pr, const char *name, off_t *_size)
 
 	file = open_file (name, &size);
 	if (!file) {
-		file = open_file (va ("%s.gz", name), &size);
+		file = open_file (va (0, "%s.gz", name), &size);
 		if (!file) {
 			return 0;
 		}
diff --git a/ruamoko/qwaq/builtins/qwaq.c b/ruamoko/qwaq/builtins/qwaq.c
index 0a8070825..f74b429cf 100644
--- a/ruamoko/qwaq/builtins/qwaq.c
+++ b/ruamoko/qwaq/builtins/qwaq.c
@@ -79,7 +79,7 @@ load_file (progs_t *pr, const char *name, off_t *_size)
 
 	file = open_file (name, &size);
 	if (!file) {
-		file = open_file (va ("%s.gz", name), &size);
+		file = open_file (va (0, "%s.gz", name), &size);
 		if (!file) {
 			return 0;
 		}
diff --git a/tools/qfbsp/source/brush.c b/tools/qfbsp/source/brush.c
index 97ddbfd4d..e0b05f2d9 100644
--- a/tools/qfbsp/source/brush.c
+++ b/tools/qfbsp/source/brush.c
@@ -347,7 +347,7 @@ CreateBrushFaces (void)
 			GetVectorForKey (FoundEntity, "origin", offset);
 
 		SetKeyValue (CurrentEntity, "origin",
-					 va ("%g %g %g", VectorExpand (offset)));
+					 va (0, "%g %g %g", VectorExpand (offset)));
 	}
 
 	for (i = 0; i < numbrushfaces; i++) {
diff --git a/tools/qfbsp/source/map.c b/tools/qfbsp/source/map.c
index d8bb6c893..870fb7c07 100644
--- a/tools/qfbsp/source/map.c
+++ b/tools/qfbsp/source/map.c
@@ -620,7 +620,7 @@ WriteEntitiesToString (void)
 		dstring_appendstr (buf, "{\n");
 
 		for (ep = entities[i].epairs; ep; ep = ep->next) {
-			dstring_appendstr (buf, va ("\"%s\" \"%s\"\n",
+			dstring_appendstr (buf, va (0, "\"%s\" \"%s\"\n",
 										ep->key, ep->value));
 		}
 		dstring_appendstr (buf, "}\n");
diff --git a/tools/qfbsp/source/readbsp.c b/tools/qfbsp/source/readbsp.c
index caf69255b..c554755c5 100644
--- a/tools/qfbsp/source/readbsp.c
+++ b/tools/qfbsp/source/readbsp.c
@@ -359,13 +359,13 @@ unique_name (wad_t *wad, const char *name)
 	do {
 		strncpy (uname, name, MIPTEXNAME);
 		uname[(MIPTEXNAME - 1)] = 0;
-		tag = va ("~%x", i++);
+		tag = va (0, "~%x", i++);
 		if (strlen (uname) + strlen (tag) <= (MIPTEXNAME - 1))
 			strcat (uname, tag);
 		else
 			strcpy (uname + (MIPTEXNAME - 1) - strlen (tag), tag);
 	} while (wad_find_lump (wad, uname));
-	return va ("%s", uname);	// just to make a safe returnable that doesn't
+	return va (0, "%s", uname);	// just to make a safe returnable that doesn't
 								// need to be freed
 }
 
diff --git a/tools/qfbsp/source/writebsp.c b/tools/qfbsp/source/writebsp.c
index 94f679313..dd7d0fa99 100644
--- a/tools/qfbsp/source/writebsp.c
+++ b/tools/qfbsp/source/writebsp.c
@@ -301,7 +301,7 @@ TEX_InitFromWad (const char *path)
 	wad = wad_open (path);
 #ifdef HAVE_ZLIB
 	if (!wad)
-		wad = wad_open (path = va ("%s.gz", path));
+		wad = wad_open (path = va (0, "%s.gz", path));
 #endif
 	if (!wad)
 		return -1;
diff --git a/tools/qfcc/source/class.c b/tools/qfcc/source/class.c
index 9203e9fbf..ddef199fa 100644
--- a/tools/qfcc/source/class.c
+++ b/tools/qfcc/source/class.c
@@ -258,7 +258,8 @@ emit_static_instances (const char *classname)
 	}
 	instances_struct[1].type = array_type (&type_pointer,
 										   data.num_instances + 1);
-	instances_def = emit_structure (va ("_OBJ_STATIC_INSTANCES_%s", classname),
+	instances_def = emit_structure (va (0, "_OBJ_STATIC_INSTANCES_%s",
+										classname),
 									's', instances_struct, 0, &data,
 									0, sc_static);
 	free (data.instances);
@@ -538,16 +539,16 @@ get_class_name (class_type_t *class_type, int pretty)
 			if (pretty)
 				return class_type->c.class->name;
 			else
-				return va ("%s_", class_type->c.class->name);
+				return va (0, "%s_", class_type->c.class->name);
 		case ct_category:
 			if (pretty)
-				return va ("%s (%s)", class_type->c.category->class->name,
+				return va (0, "%s (%s)", class_type->c.category->class->name,
 						   class_type->c.category->name);
 			else
-				return va ("%s_%s", class_type->c.category->class->name,
+				return va (0, "%s_%s", class_type->c.category->class->name,
 						   class_type->c.category->name);
 		case ct_protocol:
-			return va ("<%s>", class_type->c.protocol->name);
+			return va (0, "<%s>", class_type->c.protocol->name);
 	}
 	return "???";
 }
@@ -561,13 +562,13 @@ class_symbol (class_type_t *class_type, int external)
 
 	switch (class_type->type) {
 		case ct_category:
-			name = va ("_OBJ_CATEGORY_%s_%s",
+			name = va (0, "_OBJ_CATEGORY_%s_%s",
 					   class_type->c.category->class->name,
 					   class_type->c.category->name);
 			type = &type_category;
 			break;
 		case ct_class:
-			name = va ("_OBJ_CLASS_%s", class_type->c.class->name);
+			name = va (0, "_OBJ_CLASS_%s", class_type->c.class->name);
 			type = &type_class;
 			break;
 		case ct_protocol:
@@ -710,7 +711,8 @@ begin_category (category_t *category)
 	EMIT_STRING (space, pr_category->class_name, class->name);
 	EMIT_DEF (space, pr_category->protocols,
 			  emit_protocol_list (category->protocols,
-								  va ("%s_%s", class->name, category->name)));
+								  va (0, "%s_%s", class->name,
+									  category->name)));
 }
 
 typedef struct {
@@ -786,7 +788,7 @@ emit_ivars (symtab_t *ivars, const char *name)
 	}
 	ivar_list_struct[1].type = array_type (&type_ivar, ivar_data.count);
 
-	def = emit_structure (va ("_OBJ_INSTANCE_VARIABLES_%s", name), 's',
+	def = emit_structure (va (0, "_OBJ_INSTANCE_VARIABLES_%s", name), 's',
 						  ivar_list_struct, 0, &ivar_data, 0, sc_static);
 
 	dstring_delete (ivar_data.encoding);
@@ -803,7 +805,7 @@ begin_class (class_t *class)
 	def_t      *def;
 	defspace_t *space;
 
-	sym = make_symbol (va ("_OBJ_METACLASS_%s", class->name),
+	sym = make_symbol (va (0, "_OBJ_METACLASS_%s", class->name),
 					   &type_class, pr.far_data, sc_static);
 	meta_def = sym->s.def;
 	meta_def->initialized = meta_def->constant = meta_def->nosave = 1;
@@ -872,15 +874,15 @@ emit_class_ref (const char *class_name)
 	def_t      *ref_def;
 	def_t      *name_def;
 
-	ref_sym = make_symbol (va (".obj_class_ref_%s", class_name), &type_pointer,
-						   pr.far_data, sc_static);
+	ref_sym = make_symbol (va (0, ".obj_class_ref_%s", class_name),
+						   &type_pointer, pr.far_data, sc_static);
 	if (!ref_sym->table)
 		symtab_addsymbol (pr.symtab, ref_sym);
 	ref_def = ref_sym->s.def;
 	if (ref_def->initialized)
 		return;
 	ref_def->initialized = ref_def->constant = ref_def->nosave = 1;
-	name_sym = make_symbol (va (".obj_class_name_%s", class_name),
+	name_sym = make_symbol (va (0, ".obj_class_name_%s", class_name),
 							&type_pointer, pr.far_data, sc_extern);
 	if (!name_sym->table)
 		symtab_addsymbol (pr.symtab, name_sym);
@@ -896,7 +898,7 @@ emit_class_name (const char *class_name)
 	symbol_t   *name_sym;
 	def_t      *name_def;
 
-	name_sym = make_symbol (va (".obj_class_name_%s", class_name),
+	name_sym = make_symbol (va (0, ".obj_class_name_%s", class_name),
 							&type_pointer, pr.far_data, sc_global);
 	if (!name_sym->table)
 		symtab_addsymbol (pr.symtab, name_sym);
@@ -916,9 +918,9 @@ emit_category_ref (const char *class_name, const char *category_name)
 	def_t      *ref_def;
 	def_t      *name_def;
 
-	ref_sym = make_symbol (va (".obj_category_ref_%s_%s",
-						   class_name, category_name),
-					   &type_pointer, pr.far_data, sc_static);
+	ref_sym = make_symbol (va (0, ".obj_category_ref_%s_%s",
+							   class_name, category_name),
+						   &type_pointer, pr.far_data, sc_static);
 	if (!ref_sym->table)
 		symtab_addsymbol (pr.symtab, ref_sym);
 	ref_def = ref_sym->s.def;
@@ -926,9 +928,9 @@ emit_category_ref (const char *class_name, const char *category_name)
 		return;
 	ref_def->initialized = ref_def->constant = 1;
 	ref_def->nosave = 1;
-	name_sym = make_symbol (va (".obj_category_name_%s_%s",
-						   class_name, category_name),
-					   &type_pointer, pr.far_data, sc_extern);
+	name_sym = make_symbol (va (0, ".obj_category_name_%s_%s",
+								class_name, category_name),
+							&type_pointer, pr.far_data, sc_extern);
 	if (!name_sym->table)
 		symtab_addsymbol (pr.symtab, name_sym);
 	name_def = name_sym->s.def;
@@ -943,7 +945,7 @@ emit_category_name (const char *class_name, const char *category_name)
 	symbol_t   *name_sym;
 	def_t      *name_def;
 
-	name_sym = make_symbol (va (".obj_category_name_%s_%s",
+	name_sym = make_symbol (va (0, ".obj_category_name_%s_%s",
 							    class_name, category_name),
 							&type_pointer, pr.far_data, sc_global);
 	if (!name_sym->table)
@@ -1374,9 +1376,8 @@ class_pointer_symbol (class_t *class)
 
 	class_type.c.class = class;
 
-	sym = make_symbol (va ("_OBJ_CLASS_POINTER_%s", class->name),
-					   &type_Class,
-					   pr.near_data, sc_static);
+	sym = make_symbol (va (0, "_OBJ_CLASS_POINTER_%s", class->name),
+					   &type_Class, pr.near_data, sc_static);
 	if (!sym->table)
 		symtab_addsymbol (pr.symtab, sym);
 	def = sym->s.def;
@@ -1716,7 +1717,7 @@ emit_protocol (protocol_t *protocol)
 	pr_protocol_t *proto;
 	defspace_t *space;
 
-	proto_def = make_symbol (va ("_OBJ_PROTOCOL_%s", protocol->name),
+	proto_def = make_symbol (va (0, "_OBJ_PROTOCOL_%s", protocol->name),
 							 &type_protocol, pr.far_data, sc_static)->s.def;
 	if (proto_def->initialized)
 		return proto_def;
@@ -1728,7 +1729,7 @@ emit_protocol (protocol_t *protocol)
 	EMIT_STRING (space, proto->protocol_name, protocol->name);
 	EMIT_DEF (space, proto->protocol_list,
 			  emit_protocol_list (protocol->protocols,
-								  va ("PROTOCOL_%s", protocol->name)));
+								  va (0, "PROTOCOL_%s", protocol->name)));
 	EMIT_DEF (space, proto->instance_methods,
 			  emit_method_descriptions (protocol->methods, protocol->name, 1));
 	EMIT_DEF (space, proto->class_methods,
@@ -1786,7 +1787,7 @@ emit_protocol_list (protocollist_t *protocols, const char *name)
 	if (!protocols)
 		return 0;
 	proto_list_struct[2].type = array_type (&type_pointer, protocols->count);
-	return emit_structure (va ("_OBJ_PROTOCOLS_%s", name), 's',
+	return emit_structure (va (0, "_OBJ_PROTOCOLS_%s", name), 's',
 						   proto_list_struct, 0, protocols, 0, sc_static);
 }
 
diff --git a/tools/qfcc/source/def.c b/tools/qfcc/source/def.c
index d3299a0ab..7ac1d0822 100644
--- a/tools/qfcc/source/def.c
+++ b/tools/qfcc/source/def.c
@@ -187,7 +187,7 @@ alias_def (def_t *def, type_t *type, int offset)
 			return alias;
 	}
 	ALLOC (16384, def_t, defs, alias);
-	alias->name = save_string (va ("[%s:%d]", def->name, offset));
+	alias->name = save_string (va (0, "[%s:%d]", def->name, offset));
 	alias->return_addr = __builtin_return_address (0);
 	alias->offset = offset;
 	alias->offset_reloc = 1;
@@ -222,7 +222,7 @@ temp_def (type_t *type)
 		temp->offset = defspace_alloc_aligned_loc (space, size, alignment);
 		*space->def_tail = temp;
 		space->def_tail = &temp->next;
-		temp->name = save_string (va (".tmp%d", current_func->temp_num++));
+		temp->name = save_string (va (0, ".tmp%d", current_func->temp_num++));
 	}
 	temp->return_addr = __builtin_return_address (0);
 	temp->type = type;
@@ -424,7 +424,7 @@ init_vector_components (symbol_t *vector_sym, int is_field)
 		symbol_t   *sym;
 		const char *name;
 
-		name = va ("%s_%s", vector_sym->name, fields[i]);
+		name = va (0, "%s_%s", vector_sym->name, fields[i]);
 		sym = symtab_lookup (current_symtab, name);
 		if (sym) {
 			if (sym->table == current_symtab) {
diff --git a/tools/qfcc/source/dot_expr.c b/tools/qfcc/source/dot_expr.c
index 4db09bc39..84bae7aa2 100644
--- a/tools/qfcc/source/dot_expr.c
+++ b/tools/qfcc/source/dot_expr.c
@@ -180,13 +180,13 @@ print_bool (dstring_t *dstr, expr_t *e, int level, int id, expr_t *next)
 	for ( ; i < tl_count; i++)
 		dasprintf (dstr, "%*s<tr><td port=\"t%d\">t</td>%s</tr>\n",
 				   indent, "", i,
-				   i == count ? va ("<td rowspan=\"%d\"></td>",
+				   i == count ? va (0, "<td rowspan=\"%d\"></td>",
 									bool->true_list->size - count)
 							  : "");
 	for ( ; i < fl_count; i++)
 		dasprintf (dstr, "%*s<tr>%s<td port=\"f%d\">f</td></tr>\n",
 				   indent, "",
-				   i == count ? va ("<td rowspan=\"%d\"></td>",
+				   i == count ? va (0, "<td rowspan=\"%d\"></td>",
 									bool->false_list->size - count)
 							  : "",
 				   i);
@@ -449,22 +449,23 @@ print_value (dstring_t *dstr, expr_t *e, int level, int id, expr_t *next)
 
 	switch (e->e.value->lltype) {
 		case ev_string:
-			label = va ("\\\"%s\\\"", quote_string (e->e.value->v.string_val));
+			label = va (0, "\\\"%s\\\"",
+						quote_string (e->e.value->v.string_val));
 			break;
 		case ev_double:
-			label = va ("f %g", e->e.value->v.double_val);
+			label = va (0, "f %g", e->e.value->v.double_val);
 			break;
 		case ev_float:
-			label = va ("f %g", e->e.value->v.float_val);
+			label = va (0, "f %g", e->e.value->v.float_val);
 			break;
 		case ev_vector:
-			label = va ("'%g %g %g'",
+			label = va (0, "'%g %g %g'",
 						e->e.value->v.vector_val[0],
 						e->e.value->v.vector_val[1],
 						e->e.value->v.vector_val[2]);
 			break;
 		case ev_quat:
-			label = va ("'%g %g %g %g'",
+			label = va (0, "'%g %g %g %g'",
 						e->e.value->v.quaternion_val[0],
 						e->e.value->v.quaternion_val[1],
 						e->e.value->v.quaternion_val[2],
@@ -477,32 +478,32 @@ print_value (dstring_t *dstr, expr_t *e, int level, int id, expr_t *next)
 				print_type_str (type_str, type);
 			}
 			if (e->e.value->v.pointer.def)
-				label = va ("(*%s)[%d]<%s>",
+				label = va (0, "(*%s)[%d]<%s>",
 							type ? type_str->str : "???",
 							e->e.value->v.pointer.val,
 							e->e.value->v.pointer.def->name);
 			else
-				label = va ("(*%s)[%d]",
+				label = va (0, "(*%s)[%d]",
 							type ? type_str->str : "???",
 							e->e.value->v.pointer.val);
 			break;
 		case ev_field:
-			label = va ("field %d", e->e.value->v.pointer.val);
+			label = va (0, "field %d", e->e.value->v.pointer.val);
 			break;
 		case ev_entity:
-			label = va ("ent %d", e->e.value->v.integer_val);
+			label = va (0, "ent %d", e->e.value->v.integer_val);
 			break;
 		case ev_func:
-			label = va ("func %d", e->e.value->v.integer_val);
+			label = va (0, "func %d", e->e.value->v.integer_val);
 			break;
 		case ev_integer:
-			label = va ("i %d", e->e.value->v.integer_val);
+			label = va (0, "i %d", e->e.value->v.integer_val);
 			break;
 		case ev_uinteger:
-			label = va ("u %u", e->e.value->v.uinteger_val);
+			label = va (0, "u %u", e->e.value->v.uinteger_val);
 			break;
 		case ev_short:
-			label = va ("s %d", e->e.value->v.short_val);
+			label = va (0, "s %d", e->e.value->v.short_val);
 			break;
 		case ev_void:
 			label = "<void>";
diff --git a/tools/qfcc/source/dot_flow.c b/tools/qfcc/source/dot_flow.c
index 0320ebb2d..ecfbcc01f 100644
--- a/tools/qfcc/source/dot_flow.c
+++ b/tools/qfcc/source/dot_flow.c
@@ -114,7 +114,7 @@ print_flow_node_dag (dstring_t *dstr, flowgraph_t *graph, flownode_t *node,
 					 int level)
 {
 	if (node->dag)
-		print_dag (dstr, node->dag, va ("%d (%d)", node->id, node->dfn));
+		print_dag (dstr, node->dag, va (0, "%d (%d)", node->id, node->dfn));
 	else
 		print_flow_node (dstr, graph, node, level);
 }
diff --git a/tools/qfcc/source/dot_type.c b/tools/qfcc/source/dot_type.c
index ae58552b4..522fa91fb 100644
--- a/tools/qfcc/source/dot_type.c
+++ b/tools/qfcc/source/dot_type.c
@@ -175,7 +175,7 @@ print_struct (dstring_t *dstr, type_t *t, int level, int id)
 				continue;
 			}
 			val = sym->s.offset;
-			port = va (" port=\"f%d\"", pnum++);
+			port = va (0, " port=\"f%d\"", pnum++);
 		}
 		dasprintf (dstr, "%*s<tr><td>%s</td><td%s>%d</td></tr>\n",
 				   indent + 4, "",
diff --git a/tools/qfcc/source/dump_globals.c b/tools/qfcc/source/dump_globals.c
index fe166885c..317e70c03 100644
--- a/tools/qfcc/source/dump_globals.c
+++ b/tools/qfcc/source/dump_globals.c
@@ -93,20 +93,20 @@ dump_def (progs_t *pr, pr_def_t *def, int indent)
 				if (string < 0
 					|| (pr_uint_t) string >= pr->progs->numstrings) {
 					str = "invalid string offset";
-					comment = va (" %d %s", string, str);
+					comment = va (0, " %d %s", string, str);
 				} else {
 					str = quote_string (pr->pr_strings + G_INT (pr, offset));
-					comment = va (" %d \"%s\"", string, str);
+					comment = va (0, " %d \"%s\"", string, str);
 				}
 				break;
 			case ev_float:
-				comment = va (" %g", G_FLOAT (pr, offset));
+				comment = va (0, " %g", G_FLOAT (pr, offset));
 				break;
 			case ev_double:
-				comment = va (" %.17g", G_DOUBLE (pr, offset));
+				comment = va (0, " %.17g", G_DOUBLE (pr, offset));
 				break;
 			case ev_vector:
-				comment = va (" '%g %g %g'",
+				comment = va (0, " '%g %g %g'",
 							  G_VECTOR (pr, offset)[0],
 							  G_VECTOR (pr, offset)[1],
 							  G_VECTOR (pr, offset)[2]);
@@ -114,7 +114,7 @@ dump_def (progs_t *pr, pr_def_t *def, int indent)
 			case ev_entity:
 				break;
 			case ev_field:
-				comment = va (" %x", G_INT (pr, offset));
+				comment = va (0, " %x", G_INT (pr, offset));
 				break;
 			case ev_func:
 				{
@@ -123,26 +123,26 @@ dump_def (progs_t *pr, pr_def_t *def, int indent)
 					if (func < pr->progs->numfunctions) {
 						start = pr->pr_functions[func].first_statement;
 						if (start > 0)
-							comment = va (" %d @ %x", func, start);
+							comment = va (0, " %d @ %x", func, start);
 						else
-							comment = va (" %d = #%d", func, -start);
+							comment = va (0, " %d = #%d", func, -start);
 					} else {
-						comment = va (" %d = illegal function", func);
+						comment = va (0, " %d = illegal function", func);
 					}
 				}
 				break;
 			case ev_pointer:
-				comment = va (" %x", G_INT (pr, offset));
+				comment = va (0, " %x", G_INT (pr, offset));
 				break;
 			case ev_quat:
-				comment = va (" '%g %g %g %g'",
+				comment = va (0, " '%g %g %g %g'",
 							  G_QUAT (pr, offset)[0],
 							  G_QUAT (pr, offset)[1],
 							  G_QUAT (pr, offset)[2],
 							  G_QUAT (pr, offset)[3]);
 				break;
 			case ev_integer:
-				comment = va (" %d", G_INT (pr, offset));
+				comment = va (0, " %d", G_INT (pr, offset));
 				break;
 			case ev_short:
 				break;
@@ -255,9 +255,9 @@ dump_functions (progs_t *pr)
 
 		start = func->first_statement;
 		if (start > 0)
-			comment = va (" @ %x", start);
+			comment = va (0, " @ %x", start);
 		else
-			comment = va (" = #%d", -start);
+			comment = va (0, " = #%d", -start);
 
 		printf ("%-5d %s%s: %d (", i, name, comment, func->numparms);
 		if (func->numparms < 0)
@@ -537,7 +537,7 @@ dump_qfo_types (qfo_t *qfo, int base_address)
 			continue;
 		}
 		if (type->meta < 0 || type->meta >= NUM_META)
-			meta = va ("invalid meta: %d", type->meta);
+			meta = va (0, "invalid meta: %d", type->meta);
 		else
 			meta = ty_meta_names[type->meta];
 		printf ("%-5x %-9s %-20s", type_ptr + base_address, meta,
diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index a8684a83b..f86e9dece 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -479,7 +479,7 @@ new_label_name (void)
 	const char *fname = current_func->sym->name;
 	const char *lname;
 
-	lname = save_string (va ("$%s_%d", fname, lnum));
+	lname = save_string (va (0, "$%s_%d", fname, lnum));
 	return lname;
 }
 
@@ -543,7 +543,8 @@ named_label_expr (symbol_t *label)
 		return sym->s.expr;
 	}
 	l = new_label_expr ();
-	l->e.label.name = save_string (va ("%s_%s", l->e.label.name, label->name));
+	l->e.label.name = save_string (va (0, "%s_%s", l->e.label.name,
+									   label->name));
 	l->e.label.symbol = label;
 	label->sy_type = sy_expr;
 	label->s.expr = l;
@@ -1268,7 +1269,7 @@ new_ret_expr (type_t *type)
 expr_t *
 new_param_expr (type_t *type, int num)
 {
-	return param_expr (va (".param_%d", num), type);
+	return param_expr (va (0, ".param_%d", num), type);
 }
 
 expr_t *
diff --git a/tools/qfcc/source/flow.c b/tools/qfcc/source/flow.c
index 86f6dc9d5..3a1bb54c1 100644
--- a/tools/qfcc/source/flow.c
+++ b/tools/qfcc/source/flow.c
@@ -1607,7 +1607,7 @@ flow_build_graph (function_t *func)
 		flow_make_edges (graph);
 		flow_build_dfst (graph);
 		if (options.block_dot.flow)
-			dump_dot (va ("flow-%d", pass), graph, dump_dot_flow);
+			dump_dot (va (0, "flow-%d", pass), graph, dump_dot_flow);
 		pass++;
 	} while (flow_remove_unreachable_nodes (graph));
 	flow_find_predecessors (graph);
diff --git a/tools/qfcc/source/function.c b/tools/qfcc/source/function.c
index 940abf11e..4e7ef61f3 100644
--- a/tools/qfcc/source/function.c
+++ b/tools/qfcc/source/function.c
@@ -249,7 +249,7 @@ get_function (const char *name, const type_t *type, int overload, int create)
 
 	name = save_string (name);
 
-	full_name = save_string (va ("%s|%s", name, encode_params (type)));
+	full_name = save_string (va (0, "%s|%s", name, encode_params (type)));
 
 	func = Hash_Find (overloaded_functions, full_name);
 	if (func) {
@@ -382,7 +382,7 @@ find_function (expr_t *fexpr, expr_t *params)
 	dummy.type = find_type (&type);
 
 	qsort (funcs, func_count, sizeof (void *), func_compare);
-	dummy.full_name = save_string (va ("%s|%s", fexpr->e.symbol->name,
+	dummy.full_name = save_string (va (0, "%s|%s", fexpr->e.symbol->name,
 									   encode_params (&type)));
 	dummy_p = bsearch (&dummy_p, funcs, func_count, sizeof (void *),
 					   func_compare);
@@ -526,7 +526,7 @@ build_scope (symbol_t *fsym, symtab_t *parent)
 
 	if (args) {
 		while (i < MAX_PARMS) {
-			param = new_symbol_type (va (".par%d", i), &type_param);
+			param = new_symbol_type (va (0, ".par%d", i), &type_param);
 			initialize_def (param, 0, symtab->space, sc_param);
 			i++;
 		}
diff --git a/tools/qfcc/source/linker.c b/tools/qfcc/source/linker.c
index 2f6e4a565..eb5aeb2bb 100644
--- a/tools/qfcc/source/linker.c
+++ b/tools/qfcc/source/linker.c
@@ -1106,7 +1106,7 @@ linker_add_lib (const char *libname)
 
 	if (strncmp (libname, "-l", 2) == 0) {
 		while (path) {
-			path_name = va ("%s/lib%s.a", path->path, libname + 2);
+			path_name = va (0, "%s/lib%s.a", path->path, libname + 2);
 			pack = pack_open (path_name);
 			if (pack)
 				break;
diff --git a/tools/qfcc/source/method.c b/tools/qfcc/source/method.c
index 1c461af85..a1d05ce9d 100644
--- a/tools/qfcc/source/method.c
+++ b/tools/qfcc/source/method.c
@@ -609,7 +609,7 @@ emit_methods (methodlist_t *methods, const char *name, int instance)
 	methods->instance = instance;
 
 	methods_struct[2].type = array_type (&type_method, count);
-	return emit_structure (va ("_OBJ_%s_METHODS_%s", type, name), 's',
+	return emit_structure (va (0, "_OBJ_%s_METHODS_%s", type, name), 's',
 						   methods_struct, 0, methods, 0, sc_static);
 }
 
@@ -677,7 +677,7 @@ emit_method_descriptions (methodlist_t *methods, const char *name,
 	methods->instance = instance;
 
 	method_list_struct[1].type = array_type (&type_method_description, count);
-	return emit_structure (va ("_OBJ_%s_METHODS_%s", type, name), 's',
+	return emit_structure (va (0, "_OBJ_%s_METHODS_%s", type, name), 's',
 						   method_list_struct, 0, methods, 0, sc_static);
 }
 
diff --git a/tools/qfcc/source/obj_file.c b/tools/qfcc/source/obj_file.c
index 76a5219d4..a8e6ae5fb 100644
--- a/tools/qfcc/source/obj_file.c
+++ b/tools/qfcc/source/obj_file.c
@@ -455,7 +455,7 @@ qfo_write (qfo_t *qfo, const char *filename)
 
 	file = Qopen (filename, options.gzip ? "wbz9" : "wb");
 	if (!file) {
-		perror (va ("failed to open %s for writing", filename));
+		perror (va (0, "failed to open %s for writing", filename));
 		return -1;
 	}
 
@@ -1168,7 +1168,7 @@ qfo_to_progs (qfo_t *qfo, int *size)
 	if (options.verbosity >= 0) {
 		const char *big_function = "";
 		if (big_func)
-			big_function = va (" (%s)", strings + qfo->funcs[big_func].name);
+			big_function = va (0, " (%s)", strings + qfo->funcs[big_func].name);
 		printf ("%6i strofs\n", progs->numstrings);
 		printf ("%6i statements\n", progs->numstatements);
 		printf ("%6i functions\n", progs->numfunctions);
diff --git a/tools/qfcc/source/options.c b/tools/qfcc/source/options.c
index 758e388a3..09989684c 100644
--- a/tools/qfcc/source/options.c
+++ b/tools/qfcc/source/options.c
@@ -341,7 +341,7 @@ DecodeArgs (int argc, char **argv)
 				}
 				break;
 			case 'l':					// lib file
-				add_file (va ("-l%s", NORMALIZE (optarg)));
+				add_file (va (0, "-l%s", NORMALIZE (optarg)));
 				break;
 			case 'L':
 				linker_add_path (NORMALIZE (optarg));
diff --git a/tools/qfcc/source/qc-parse.y b/tools/qfcc/source/qc-parse.y
index b08884b92..32161c4b7 100644
--- a/tools/qfcc/source/qc-parse.y
+++ b/tools/qfcc/source/qc-parse.y
@@ -741,7 +741,8 @@ struct_def
 			} else if (is_anonymous_struct ($1)) {
 				// anonymous struct/union
 				// type->name always begins with "tag "
-				$1.sym = new_symbol (va (".anonymous.%s", $1.type->name + 4));
+				$1.sym = new_symbol (va (0, ".anonymous.%s",
+										 $1.type->name + 4));
 				$1.sym->type = $1.type;
 				$1.sym->sy_type = sy_var;
 				$1.sym->visibility = vis_anonymous;
@@ -1924,7 +1925,8 @@ ivar_decl
 			if (is_anonymous_struct ($1)) {
 				// anonymous struct/union
 				// type->name always begins with "tag "
-				$1.sym = new_symbol (va (".anonymous.%s", $1.type->name + 4));
+				$1.sym = new_symbol (va (0, ".anonymous.%s",
+										 $1.type->name + 4));
 				$1.sym->type = $1.type;
 				$1.sym->sy_type = sy_var;
 				$1.sym->visibility = vis_anonymous;
diff --git a/tools/qfcc/source/qfcc.c b/tools/qfcc/source/qfcc.c
index e6c3b7946..1a8406186 100644
--- a/tools/qfcc/source/qfcc.c
+++ b/tools/qfcc/source/qfcc.c
@@ -411,7 +411,7 @@ compile_to_obj (const char *file, const char *obj, lang_t lang)
 		}
 	}
 	if (options.frames_files) {
-		write_frame_macros (va ("%s.frame", file_basename (file, 0)));
+		write_frame_macros (va (0, "%s.frame", file_basename (file, 0)));
 	}
 	if (!err) {
 		qfo_t      *qfo;
@@ -777,7 +777,7 @@ progs_src_compile (void)
 				if (compile_file (qc_filename->str))
 					return 1;
 				if (options.frames_files) {
-					write_frame_macros (va ("%s.frame",
+					write_frame_macros (va (0, "%s.frame",
 											file_basename (qc_filename->str,
 														   0)));
 				}
diff --git a/tools/qfcc/source/qfprogs.c b/tools/qfcc/source/qfprogs.c
index 03d09123d..54b98b62a 100644
--- a/tools/qfcc/source/qfprogs.c
+++ b/tools/qfcc/source/qfprogs.c
@@ -183,7 +183,7 @@ load_file (progs_t *pr, const char *name, off_t *_size)
 
 	file = open_file (name, &size);
 	if (!file) {
-		file = open_file (va ("%s.gz", name), &size);
+		file = open_file (va (0, "%s.gz", name), &size);
 		if (!file)
 			return 0;
 	}
@@ -233,7 +233,7 @@ init_qf (void)
 {
 	Sys_Init ();
 
-	Cvar_Get ("pr_debug", va ("%d", 1+verbosity), 0, 0, "");
+	Cvar_Get ("pr_debug", va (0, "%d", 1+verbosity), 0, 0, "");
 	Cvar_Get ("pr_source_path", source_path, 0, 0, "");
 	PR_Init_Cvars ();
 
diff --git a/tools/qfcc/source/statements.c b/tools/qfcc/source/statements.c
index 2383dcc84..0743c5c40 100644
--- a/tools/qfcc/source/statements.c
+++ b/tools/qfcc/source/statements.c
@@ -97,14 +97,14 @@ tempop_string (operand_t *tmpop)
 {
 	tempop_t   *tempop = &tmpop->o.tempop;
 	if (tempop->alias) {
-		return va ("<tmp %s %p:%d:%p:%d:%d>",
+		return va (0, "<tmp %s %p:%d:%p:%d:%d>",
 				   pr_type_name[tempop->type->type],
 				   tmpop, tempop->users,
 				   tempop->alias,
 				   tempop->offset,
 				   tempop->alias->o.tempop.users);
 	}
-	return va ("<tmp %s %p:%d>", pr_type_name[tempop->type->type],
+	return va (0, "<tmp %s %p:%d>", pr_type_name[tempop->type->type],
 			   tmpop, tempop->users);
 }
 
@@ -119,47 +119,47 @@ operand_string (operand_t *op)
 		case op_value:
 			switch (op->o.value->lltype) {
 				case ev_string:
-					return va ("\"%s\"",
+					return va (0, "\"%s\"",
 							   quote_string (op->o.value->v.string_val));
 				case ev_double:
-					return va ("%g", op->o.value->v.double_val);
+					return va (0, "%g", op->o.value->v.double_val);
 				case ev_float:
-					return va ("%g", op->o.value->v.float_val);
+					return va (0, "%g", op->o.value->v.float_val);
 				case ev_vector:
-					return va ("'%g %g %g'",
+					return va (0, "'%g %g %g'",
 							   op->o.value->v.vector_val[0],
 							   op->o.value->v.vector_val[1],
 							   op->o.value->v.vector_val[2]);
 				case ev_quat:
-					return va ("'%g %g %g %g'",
+					return va (0, "'%g %g %g %g'",
 							   op->o.value->v.quaternion_val[0],
 							   op->o.value->v.quaternion_val[1],
 							   op->o.value->v.quaternion_val[2],
 							   op->o.value->v.quaternion_val[3]);
 				case ev_pointer:
 					if (op->o.value->v.pointer.def) {
-						return va ("ptr %s+%d",
+						return va (0, "ptr %s+%d",
 								   op->o.value->v.pointer.def->name,
 								   op->o.value->v.pointer.val);
 					} else if(op->o.value->v.pointer.tempop) {
 						operand_t  *tempop = op->o.value->v.pointer.tempop;
-						return va ("ptr %s+%d", tempop_string (tempop),
+						return va (0, "ptr %s+%d", tempop_string (tempop),
 								   op->o.value->v.pointer.val);
 					} else {
-						return va ("ptr %d", op->o.value->v.pointer.val);
+						return va (0, "ptr %d", op->o.value->v.pointer.val);
 					}
 				case ev_field:
-					return va ("field %d", op->o.value->v.pointer.val);
+					return va (0, "field %d", op->o.value->v.pointer.val);
 				case ev_entity:
-					return va ("ent %d", op->o.value->v.integer_val);
+					return va (0, "ent %d", op->o.value->v.integer_val);
 				case ev_func:
-					return va ("func %d", op->o.value->v.integer_val);
+					return va (0, "func %d", op->o.value->v.integer_val);
 				case ev_integer:
-					return va ("int %d", op->o.value->v.integer_val);
+					return va (0, "int %d", op->o.value->v.integer_val);
 				case ev_uinteger:
-					return va ("uint %u", op->o.value->v.uinteger_val);
+					return va (0, "uint %u", op->o.value->v.uinteger_val);
 				case ev_short:
-					return va ("short %d", op->o.value->v.short_val);
+					return va (0, "short %d", op->o.value->v.short_val);
 				case ev_void:
 					return "(void)";
 				case ev_invalid:
@@ -177,10 +177,11 @@ operand_string (operand_t *op)
 				const char *alias = operand_string (op->o.alias);
 				char       *buf = alloca (strlen (alias) + 1);
 				strcpy (buf, alias);
-				return va ("alias(%s,%s)", pr_type_name[op->type->type], buf);
+				return va (0, "alias(%s,%s)", pr_type_name[op->type->type],
+						   buf);
 			}
 		case op_nil:
-			return va ("nil");
+			return va (0, "nil");
 	}
 	return ("??");
 }
@@ -1036,7 +1037,7 @@ expr_call (sblock_t *sblock, expr_t *call, operand_t **op)
 			}
 		}
 	}
-	opcode = va ("<%sCALL%d>", pref, count);
+	opcode = va (0, "<%sCALL%d>", pref, count);
 	s = new_statement (st_func, opcode, call);
 	sblock = statement_subexpr (sblock, func, &s->opa);
 	s->opb = arguments[0];
@@ -2076,11 +2077,11 @@ make_statements (expr_t *e)
 	do {
 		did_something = thread_jumps (sblock);
 		if (options.block_dot.thread)
-			dump_dot (va ("thread-%d", pass), sblock, dump_dot_sblock);
+			dump_dot (va (0, "thread-%d", pass), sblock, dump_dot_sblock);
 		did_something |= remove_dead_blocks (sblock);
 		sblock = merge_blocks (sblock);
 		if (options.block_dot.dead)
-			dump_dot (va ("dead-%d", pass), sblock, dump_dot_sblock);
+			dump_dot (va (0, "dead-%d", pass), sblock, dump_dot_sblock);
 		pass++;
 	} while (did_something);
 	check_final_block (sblock);
diff --git a/tools/qfcc/source/struct.c b/tools/qfcc/source/struct.c
index c42935dd2..ef9bd7389 100644
--- a/tools/qfcc/source/struct.c
+++ b/tools/qfcc/source/struct.c
@@ -70,13 +70,13 @@ find_tag (ty_meta_e meta, symbol_t *tag, type_t *type)
 	symbol_t   *sym;
 
 	if (tag) {
-		tag_name = va ("tag %s", tag->name);
+		tag_name = va (0, "tag %s", tag->name);
 	} else {
 		const char *path = GETSTR (pr.source_file);
 		const char *file = strrchr (path, '/');
 		if (!file++)
 			file = path;
-		tag_name = va ("tag .%s.%d", file, pr.source_line);
+		tag_name = va (0, "tag .%s.%d", file, pr.source_line);
 	}
 	sym = symtab_lookup (current_symtab, tag_name);
 	if (sym) {
@@ -355,7 +355,7 @@ emit_structure (const char *name, int su, struct_def_t *defs, type_t *type,
 	for (i = 0, field_sym = type->t.symtab->symbols; field_sym;
 		 i++, field_sym = field_sym->next) {
 		field_def.type = field_sym->type;
-		field_def.name = save_string (va ("%s.%s", name, field_sym->name));
+		field_def.name = save_string (va (0, "%s.%s", name, field_sym->name));
 		field_def.space = struct_def->space;
 		field_def.offset = struct_def->offset + field_sym->s.offset;
 		if (!defs[i].emit) {
diff --git a/tools/qflight/source/entities.c b/tools/qflight/source/entities.c
index d2bd2711c..1383004df 100644
--- a/tools/qflight/source/entities.c
+++ b/tools/qflight/source/entities.c
@@ -125,7 +125,8 @@ MatchTargets (void)
 		// set the style on the source ent for switchable lights
 		if (entities[j].style) {
 			entities[i].style = entities[j].style;
-			SetKeyValue (&entities[i], "style", va ("%i", entities[i].style));
+			SetKeyValue (&entities[i], "style", va (0, "%i",
+													entities[i].style));
 		}
 
 		if (entities[i].spotcone >= 0) {
diff --git a/tools/qflight/source/qflight.c b/tools/qflight/source/qflight.c
index 4d2acfb73..75b9941d7 100644
--- a/tools/qflight/source/qflight.c
+++ b/tools/qflight/source/qflight.c
@@ -150,7 +150,7 @@ FindFaceOffsets (void)
 	surfaceorgs = (vec3_t *) calloc (bsp->numfaces, sizeof (vec3_t));
 
 	for (i = 1; i < bsp->nummodels; i++) {
-		ent = FindEntityWithKeyPair ("model", name = va ("*%d", i));
+		ent = FindEntityWithKeyPair ("model", name = va (0, "*%d", i));
 		VectorZero (org);
 		if (!ent)
 			Sys_Error ("FindFaceOffsets: Couldn't find entity for model %s.\n",
diff --git a/tools/wad/script.c b/tools/wad/script.c
index b4eaeeeff..e93efe0ac 100644
--- a/tools/wad/script.c
+++ b/tools/wad/script.c
@@ -159,7 +159,7 @@ write_file (void)
 	QFile      *file;
 	const char *name;
 
-	name = va ("%s/%s.lmp", destfile.str, lumpname->str);
+	name = va (0, "%s/%s.lmp", destfile.str, lumpname->str);
 	if (!(file = Qopen (name, "wb")))
 		Sys_Error ("couldn't open %s. %s", name, strerror(errno));
 	Qwrite (file, lumpbuffer, lump_p - lumpbuffer);

From eeda04e3c95475b25308841dde1bcb77415d5b85 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 31 Jan 2021 19:58:55 +0900
Subject: [PATCH 1389/1519] [vulkan] Name most resources

This makes debugging with renderdoc and validation messages much easier
(no more "what buffer is that?").
---
 include/QF/Vulkan/debug.h                     | 115 ++++++++++++++++++
 include/QF/Vulkan/funclist.h                  |  19 +++
 include/QF/Vulkan/qf_texture.h                |   3 +-
 include/QF/Vulkan/scrap.h                     |   5 +-
 include/QF/Vulkan/staging.h                   |   3 +-
 libs/models/alias/vulkan_model_alias.c        |  20 ++-
 libs/models/brush/vulkan_model_brush.c        |  28 ++++-
 libs/video/renderer/vulkan/device.c           |   4 +-
 libs/video/renderer/vulkan/scrap.c            |  13 +-
 libs/video/renderer/vulkan/staging.c          |  17 ++-
 libs/video/renderer/vulkan/vkparse.c          |   3 +
 libs/video/renderer/vulkan/vulkan_alias.c     |  25 +++-
 libs/video/renderer/vulkan/vulkan_bsp.c       |  42 ++++++-
 libs/video/renderer/vulkan/vulkan_draw.c      |   5 +-
 libs/video/renderer/vulkan/vulkan_texture.c   |  19 ++-
 .../video/renderer/vulkan/vulkan_vid_common.c |  16 ++-
 16 files changed, 310 insertions(+), 27 deletions(-)
 create mode 100644 include/QF/Vulkan/debug.h

diff --git a/include/QF/Vulkan/debug.h b/include/QF/Vulkan/debug.h
new file mode 100644
index 000000000..3250d5aca
--- /dev/null
+++ b/include/QF/Vulkan/debug.h
@@ -0,0 +1,115 @@
+#ifndef __QF_Vulkan_debug_h
+#define __QF_Vulkan_debug_h
+
+#define QFV_duCmdBeginLabel(device, cmd, name...)\
+	do { \
+		qfv_devfuncs_t *dfunc = device->funcs; \
+		if (dfunc->vkCmdBeginDebugUtilsLabelEXT) { \
+			VkDebugUtilsLabelEXT label = { \
+				VK_STRUCTURE_TYPE_DEBUG_UTILS_LABEL_EXT, 0, name \
+			}; \
+			dfunc->vkCmdBeginDebugUtilsLabelEXT (cmd, &label); \
+		} \
+	} while (0)
+
+#define QFV_duCmdEndLabel(device, cmd) \
+	do { \
+		qfv_devfuncs_t *dfunc = device->funcs; \
+		if (dfunc->vkCmdEndDebugUtilsLabelEXT) { \
+			dfunc->vkCmdEndDebugUtilsLabelEXT (cmd); \
+		} \
+	} while (0)
+
+#define QFV_duCmdInsertLabel(device, cmd, name...) \
+	do { \
+		qfv_devfuncs_t *dfunc = device->funcs; \
+		if (dfunc->vkCmdInsertDebugUtilsLabelEXT) { \
+			VkDebugUtilsLabelEXT label = { \
+				VK_STRUCTURE_TYPE_DEBUG_UTILS_LABEL_EXT, 0, name \
+			}; \
+			dfunc->vkCmdInsertDebugUtilsLabelEXT (cmd, &label); \
+		} \
+	} while (0)
+
+#define QFV_duCreateMessenger(inst, severity, type, callback, data, messenger)\
+	do { \
+		if (inst->funcs->vkCreateDebugUtilsMessengerEXT) { \
+			VkDebugUtilsMessengerCreateInfoEXT createInfo = { \
+				VK_STRUCTURE_TYPE_DEBUG_UTILS_MESSENGER_CREATE_INFO_EXT, 0, 0,\
+				severity, type, callback, data \
+			}; \
+			inst->funcs->vkCreateDebugUtilsMessengerEXT (inst, &createInfo, 0,\
+														 messenger); \
+		} \
+	} while (0)
+
+#define QFV_duDestroyMessenger(inst, messenger) \
+	do { \
+		if (inst->funcs->vkDestroyDebugUtilsMessengerEXT) { \
+			inst->funcs->vkDestroyDebugUtilsMessengerEXT (inst, messenger, 0);\
+		} \
+	} while (0)
+
+#define QFV_duQueueBeginLabel(device, queue, name...) \
+	do { \
+		qfv_devfuncs_t *dfunc = device->funcs; \
+		if (dfunc->vkQueueBeginDebugUtilsLabelEXT) { \
+			VkDebugUtilsLabelEXT label = { \
+				VK_STRUCTURE_TYPE_DEBUG_UTILS_LABEL_EXT, 0, name \
+			}; \
+			dfunc->vkQueueBeginDebugUtilsLabelEXT (queue, &label); \
+		} \
+	} while (0)
+
+#define QFV_duQueueEndLabel(device, queue) \
+	do { \
+		qfv_devfuncs_t *dfunc = device->funcs; \
+		if (dfunc->vkQueueEndDebugUtilsLabelEXT) { \
+			dfunc->vkQueueEndDebugUtilsLabelEXT (queue); \
+		} \
+	} while (0)
+
+#define QFV_duQueueInsertLabel(device, queue, name...) \
+	do { \
+		qfv_devfuncs_t *dfunc = device->funcs; \
+		if (dfunc->vkQueueInsertDebugUtilsLabelEXT) { \
+			VkDebugUtilsLabelEXT label = { \
+				VK_STRUCTURE_TYPE_DEBUG_UTILS_LABEL_EXT, 0, name \
+			}; \
+			dfunc->vkQueueInsertDebugUtilsLabelEXT (queue, &label); \
+		} \
+	} while (0)
+
+#define QFV_duSetObjectName(device, type, handle, name) \
+	do { \
+		qfv_devfuncs_t *dfunc = device->funcs; \
+		if (dfunc->vkSetDebugUtilsObjectNameEXT) { \
+			VkDebugUtilsObjectNameInfoEXT nameInfo = { \
+				VK_STRUCTURE_TYPE_DEBUG_UTILS_OBJECT_NAME_INFO_EXT, 0, \
+				type, (uint64_t) handle, name \
+			}; \
+			dfunc->vkSetDebugUtilsObjectNameEXT (device->dev, &nameInfo); \
+		} \
+	} while (0)
+
+#define QFV_duSetObjectTag(device, type, handle, name, size, tag) \
+	do { \
+		qfv_devfuncs_t *dfunc = device->funcs; \
+		if (dfunc->vkSetDebugUtilsObjectTagEXT) { \
+			VkDebugUtilsObjectTagInfoEXT tagInfo = { \
+				VK_STRUCTURE_TYPE_DEBUG_UTILS_OBJECT_TAG_INFO_EXT, 0, \
+				type, handle, name, size, tag \
+			}; \
+			dfunc->vkSetDebugUtilsObjectTagEXT (device->dev, &tagInfo); \
+		} \
+	} while (0)
+
+#define QFV_duSubmitMessage(inst, severity, types, data) \
+	do { \
+		if (inst->funcs->vkSubmitDebugUtilsMessageEXT) { \
+			inst->funcs->vkSubmitDebugUtilsMessageEXT (inst, severity, types, \
+													   data); \
+		} \
+	} while (0)
+
+#endif//__QF_Vulkan_debug_h
diff --git a/include/QF/Vulkan/funclist.h b/include/QF/Vulkan/funclist.h
index 90c3a51d2..a1601f814 100644
--- a/include/QF/Vulkan/funclist.h
+++ b/include/QF/Vulkan/funclist.h
@@ -43,6 +43,8 @@ INSTANCE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION
 	(vkCreateDebugUtilsMessengerEXT, VK_EXT_DEBUG_UTILS_EXTENSION_NAME)
 INSTANCE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION
 	(vkDestroyDebugUtilsMessengerEXT, VK_EXT_DEBUG_UTILS_EXTENSION_NAME)
+INSTANCE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION
+	(vkSubmitDebugUtilsMessageEXT, VK_EXT_DEBUG_UTILS_EXTENSION_NAME)
 INSTANCE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION
 	(vkGetPhysicalDeviceSurfaceSupportKHR, VK_KHR_SURFACE_EXTENSION_NAME)
 INSTANCE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION
@@ -196,4 +198,21 @@ DEVICE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION
 DEVICE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION
 	(vkQueuePresentKHR, VK_KHR_SWAPCHAIN_EXTENSION_NAME)
 
+DEVICE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION
+	(vkCmdBeginDebugUtilsLabelEXT, 0)
+DEVICE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION
+	(vkCmdEndDebugUtilsLabelEXT, 0)
+DEVICE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION
+	(vkCmdInsertDebugUtilsLabelEXT, 0)
+DEVICE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION
+	(vkQueueBeginDebugUtilsLabelEXT, 0)
+DEVICE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION
+	(vkQueueEndDebugUtilsLabelEXT, 0)
+DEVICE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION
+	(vkQueueInsertDebugUtilsLabelEXT, 0)
+DEVICE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION
+	(vkSetDebugUtilsObjectNameEXT, 0)
+DEVICE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION
+	(vkSetDebugUtilsObjectTagEXT, 0)
+
 #undef DEVICE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION
diff --git a/include/QF/Vulkan/qf_texture.h b/include/QF/Vulkan/qf_texture.h
index d08fc0a46..a70ba1116 100644
--- a/include/QF/Vulkan/qf_texture.h
+++ b/include/QF/Vulkan/qf_texture.h
@@ -13,7 +13,8 @@ typedef struct qfv_tex_s {
 
 void Vulkan_ExpandPalette (byte *dst, const byte *src, const byte *palette,
 						   int alpha, int count);
-qfv_tex_t *Vulkan_LoadTex (struct vulkan_ctx_s *ctx, tex_t *tex, int mip);
+qfv_tex_t *Vulkan_LoadTex (struct vulkan_ctx_s *ctx, tex_t *tex, int mip,
+						   const char *name);
 VkImageView Vulkan_TexImageView (qfv_tex_t *tex) __attribute__((pure));
 void Vulkan_UnloadTex (struct vulkan_ctx_s *ctx, qfv_tex_t *tex);
 void Vulkan_Texture_Init (struct vulkan_ctx_s *ctx);
diff --git a/include/QF/Vulkan/scrap.h b/include/QF/Vulkan/scrap.h
index b4818d558..31ceba506 100644
--- a/include/QF/Vulkan/scrap.h
+++ b/include/QF/Vulkan/scrap.h
@@ -8,8 +8,9 @@ typedef struct scrap_s scrap_t;
 struct qfv_stagebuf_s;
 struct qfv_device_s;
 
-scrap_t *QFV_CreateScrap (struct qfv_device_s *device, int size,
-						  QFFormat format, struct qfv_stagebuf_s *stage);
+scrap_t *QFV_CreateScrap (struct qfv_device_s *device, const char *name,
+						  int size, QFFormat format,
+						  struct qfv_stagebuf_s *stage);
 size_t QFV_ScrapSize (scrap_t *scrap) __attribute__((pure));
 void QFV_ScrapClear (scrap_t *scrap);
 void QFV_DestroyScrap (scrap_t *scrap);
diff --git a/include/QF/Vulkan/staging.h b/include/QF/Vulkan/staging.h
index ee3678625..9058e3c9a 100644
--- a/include/QF/Vulkan/staging.h
+++ b/include/QF/Vulkan/staging.h
@@ -26,7 +26,8 @@ typedef struct qfv_stagebuf_s {
 
 
 qfv_stagebuf_t *QFV_CreateStagingBuffer (struct qfv_device_s *device,
-										 size_t size, VkCommandPool cmdPool);
+										 const char *name, size_t size,
+										 VkCommandPool cmdPool);
 void QFV_DestroyStagingBuffer (qfv_stagebuf_t *stage);
 void QFV_FlushStagingBuffer (qfv_stagebuf_t *stage, size_t offset, size_t size);
 qfv_packet_t *QFV_PacketAcquire (qfv_stagebuf_t *stage);
diff --git a/libs/models/alias/vulkan_model_alias.c b/libs/models/alias/vulkan_model_alias.c
index 91ae665d0..07c63bee1 100644
--- a/libs/models/alias/vulkan_model_alias.c
+++ b/libs/models/alias/vulkan_model_alias.c
@@ -48,6 +48,7 @@
 #include "QF/Vulkan/qf_texture.h"
 #include "QF/Vulkan/buffer.h"
 #include "QF/Vulkan/device.h"
+#include "QF/Vulkan/debug.h"
 #include "QF/Vulkan/instance.h"
 #include "QF/Vulkan/staging.h"
 
@@ -252,6 +253,15 @@ Vulkan_Mod_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr, void *_m,
 	VkBuffer    ibuff = QFV_CreateBuffer (device, ind_size,
 										  VK_BUFFER_USAGE_TRANSFER_DST_BIT
 										  | VK_BUFFER_USAGE_INDEX_BUFFER_BIT);
+	QFV_duSetObjectName (device, VK_OBJECT_TYPE_BUFFER, vbuff,
+						 va (ctx->va_ctx, "buffer:alias:vertex:%s",
+							 loadmodel->name));
+	QFV_duSetObjectName (device, VK_OBJECT_TYPE_BUFFER, uvbuff,
+						 va (ctx->va_ctx, "buffer:alias:uv:%s",
+							 loadmodel->name));
+	QFV_duSetObjectName (device, VK_OBJECT_TYPE_BUFFER, ibuff,
+						 va (ctx->va_ctx, "buffer:alias:index:%s",
+							 loadmodel->name));
 	size_t      voffs = 0;
 	size_t      uvoffs = voffs + get_buffer_size (device, vbuff);
 	size_t      ioffs = uvoffs + get_buffer_size (device, uvbuff);
@@ -260,12 +270,18 @@ Vulkan_Mod_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr, void *_m,
 	mem = QFV_AllocBufferMemory (device, vbuff,
 								 VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT,
 								 buff_size, 0);
+	QFV_duSetObjectName (device, VK_OBJECT_TYPE_DEVICE_MEMORY, mem,
+						 va (ctx->va_ctx, "memory:alias:vuvi:%s",
+							 loadmodel->name));
 	QFV_BindBufferMemory (device, vbuff, mem, voffs);
 	QFV_BindBufferMemory (device, uvbuff, mem, uvoffs);
 	QFV_BindBufferMemory (device, ibuff, mem, ioffs);
 
-	qfv_stagebuf_t *stage = QFV_CreateStagingBuffer (device, buff_size,
-													  ctx->cmdpool);
+	qfv_stagebuf_t *stage = QFV_CreateStagingBuffer (device,
+													 va (ctx->va_ctx,
+														 "alias:%s",
+														 loadmodel->name),
+													 buff_size, ctx->cmdpool);
 	qfv_packet_t *packet = QFV_PacketAcquire (stage);
 	verts = QFV_PacketExtend (packet, vert_size);
 	uv = QFV_PacketExtend (packet, uv_size);
diff --git a/libs/models/brush/vulkan_model_brush.c b/libs/models/brush/vulkan_model_brush.c
index 3d45dd63c..ea08a25a4 100644
--- a/libs/models/brush/vulkan_model_brush.c
+++ b/libs/models/brush/vulkan_model_brush.c
@@ -50,6 +50,7 @@
 #include "QF/Vulkan/qf_texture.h"
 #include "QF/Vulkan/barrier.h"
 #include "QF/Vulkan/command.h"
+#include "QF/Vulkan/debug.h"
 #include "QF/Vulkan/device.h"
 #include "QF/Vulkan/image.h"
 #include "QF/Vulkan/staging.h"
@@ -209,10 +210,16 @@ load_textures (model_t *model, vulkan_ctx_t *ctx)
 	mem = QFV_AllocImageMemory (device, image,
 								VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT,
 								memsize, 0);
+	QFV_duSetObjectName (device, VK_OBJECT_TYPE_DEVICE_MEMORY,
+						 mem, va (ctx->va_ctx, "memory:%s:texture",
+								  loadmodel->name));
 	mctx->texture_memory = mem;
 
-	qfv_stagebuf_t *stage = QFV_CreateStagingBuffer (device, memsize,
-													 ctx->cmdpool);
+	qfv_stagebuf_t *stage = QFV_CreateStagingBuffer (device,
+													 va (ctx->va_ctx,
+														 "brush:%s",
+														 loadmodel->name),
+													 memsize, ctx->cmdpool);
 	qfv_packet_t *packet = QFV_PacketAcquire (stage);
 	buffer = QFV_PacketExtend (packet, memsize);
 
@@ -239,6 +246,10 @@ load_textures (model_t *model, vulkan_ctx_t *ctx)
 		tex->tex->view = QFV_CreateImageView (device, tex->tex->image,
 											  type, VK_FORMAT_R8G8B8A8_UNORM,
 											  VK_IMAGE_ASPECT_COLOR_BIT);
+		QFV_duSetObjectName (device, VK_OBJECT_TYPE_IMAGE_VIEW,
+							 tex->tex->view,
+							 va (ctx->va_ctx, "iview:%s:%s:tex",
+								 loadmodel->name, tx->name));
 		transfer_mips (buffer + tex->tex->offset, tx + 1, tx, palette);
 		if (tex->glow) {
 			dfunc->vkBindImageMemory (device->dev, tex->glow->image, mem,
@@ -249,6 +260,11 @@ load_textures (model_t *model, vulkan_ctx_t *ctx)
 												   VK_IMAGE_VIEW_TYPE_2D,
 												   VK_FORMAT_R8G8B8A8_UNORM,
 												   VK_IMAGE_ASPECT_COLOR_BIT);
+			QFV_duSetObjectName (device, VK_OBJECT_TYPE_IMAGE_VIEW,
+								 tex->glow->view,
+								 va (ctx->va_ctx, "iview:%s:%s:glow",
+									 loadmodel->name,
+									 tx->name));
 			transfer_mips (buffer + tex->glow->offset, tex->glow->memory, tx,
 						   palette);
 		}
@@ -351,6 +367,10 @@ Vulkan_Mod_ProcessTexture (texture_t *tx, vulkan_ctx_t *ctx)
 									   VK_SAMPLE_COUNT_1_BIT,
 									   VK_IMAGE_USAGE_TRANSFER_DST_BIT
 									   | VK_IMAGE_USAGE_SAMPLED_BIT);
+	QFV_duSetObjectName (device, VK_OBJECT_TYPE_IMAGE,
+						 tex->tex->image,
+						 va (ctx->va_ctx, "image:%s:%s:tex", loadmodel->name,
+							 tx->name));
 	if (layers > 1) {
 		// skys are unlit, so no fullbrights
 		return;
@@ -372,6 +392,10 @@ Vulkan_Mod_ProcessTexture (texture_t *tx, vulkan_ctx_t *ctx)
 										VK_SAMPLE_COUNT_1_BIT,
 										VK_IMAGE_USAGE_TRANSFER_DST_BIT
 										| VK_IMAGE_USAGE_SAMPLED_BIT);
+	QFV_duSetObjectName (device, VK_OBJECT_TYPE_IMAGE,
+						 tex->glow->image,
+						 va (ctx->va_ctx, "image:%s:%s:glow", loadmodel->name,
+							 tx->name));
 	// store the pointer to the fullbright data: memory will never be set to
 	// actual device memory because all of the textures will be loaded in one
 	// big buffer
diff --git a/libs/video/renderer/vulkan/device.c b/libs/video/renderer/vulkan/device.c
index 86ba71f73..4cfceb999 100644
--- a/libs/video/renderer/vulkan/device.c
+++ b/libs/video/renderer/vulkan/device.c
@@ -112,10 +112,12 @@ load_device_funcs (qfv_instance_t *inst, qfv_device_t *dev)
 	}
 
 #define DEVICE_LEVEL_VULKAN_FUNCTION_FROM_EXTENSION(name, ext) \
-	if (dev->extension_enabled (dev, ext)) { \
+	if (!ext || dev->extension_enabled (dev, ext)) { \
 		dfunc->name = (PFN_##name) ifunc->vkGetDeviceProcAddr (device, #name); \
 		if (!dfunc->name) { \
 			Sys_Printf ("Couldn't find device level function %s", #name); \
+		} else { \
+			Sys_Printf ("Found device level function %s\n", #name); \
 		} \
 	}
 
diff --git a/libs/video/renderer/vulkan/scrap.c b/libs/video/renderer/vulkan/scrap.c
index 27c2ea3bd..01eed4bf8 100644
--- a/libs/video/renderer/vulkan/scrap.c
+++ b/libs/video/renderer/vulkan/scrap.c
@@ -51,6 +51,7 @@
 #include "QF/Vulkan/barrier.h"
 #include "QF/Vulkan/buffer.h"
 #include "QF/Vulkan/command.h"
+#include "QF/Vulkan/debug.h"
 #include "QF/Vulkan/device.h"
 #include "QF/Vulkan/image.h"
 #include "QF/Vulkan/instance.h"
@@ -76,12 +77,13 @@ struct scrap_s {
 };
 
 scrap_t *
-QFV_CreateScrap (qfv_device_t *device, int size, QFFormat format,
-				 qfv_stagebuf_t *stage)
+QFV_CreateScrap (qfv_device_t *device, const char *name, int size,
+				 QFFormat format, qfv_stagebuf_t *stage)
 {
 	qfv_devfuncs_t *dfunc = device->funcs;
 	int         bpp = 0;
 	VkFormat    fmt = VK_FORMAT_UNDEFINED;
+	dstring_t  *str = dstring_new ();
 
 	switch (format) {
 		case tex_l:
@@ -119,13 +121,20 @@ QFV_CreateScrap (qfv_device_t *device, int size, QFFormat format,
 									extent, 1, 1, VK_SAMPLE_COUNT_1_BIT,
 									VK_IMAGE_USAGE_TRANSFER_DST_BIT
 									| VK_IMAGE_USAGE_SAMPLED_BIT);
+	QFV_duSetObjectName (device, VK_OBJECT_TYPE_IMAGE, scrap->image,
+						 dsprintf (str, "image:scrap:%s", name));
 	scrap->memory = QFV_AllocImageMemory (device, scrap->image,
 										  VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT,
 										  0, 0);
+	QFV_duSetObjectName (device, VK_OBJECT_TYPE_DEVICE_MEMORY, scrap->memory,
+						 dsprintf (str, "memory:scrap:%s", name));
 	QFV_BindImageMemory (device, scrap->image, scrap->memory, 0);
 	scrap->view = QFV_CreateImageView (device, scrap->image,
 									   VK_IMAGE_VIEW_TYPE_2D, fmt,
 									   VK_IMAGE_ASPECT_COLOR_BIT);
+	QFV_duSetObjectName (device, VK_OBJECT_TYPE_IMAGE_VIEW, scrap->view,
+						 dsprintf (str, "iview:scrap:%s", name));
+	dstring_delete (str);
 	scrap->bpp = bpp;
 	scrap->subpics = 0;
 	scrap->device = device;
diff --git a/libs/video/renderer/vulkan/staging.c b/libs/video/renderer/vulkan/staging.c
index 836a08e5e..cb3bb8ad0 100644
--- a/libs/video/renderer/vulkan/staging.c
+++ b/libs/video/renderer/vulkan/staging.c
@@ -48,6 +48,7 @@
 #include "QF/Vulkan/qf_vid.h"
 #include "QF/Vulkan/buffer.h"
 #include "QF/Vulkan/command.h"
+#include "QF/Vulkan/debug.h"
 #include "QF/Vulkan/device.h"
 #include "QF/Vulkan/instance.h"
 #include "QF/Vulkan/staging.h"
@@ -55,11 +56,12 @@
 #include "vid_vulkan.h"
 
 qfv_stagebuf_t *
-QFV_CreateStagingBuffer (qfv_device_t *device, size_t size,
+QFV_CreateStagingBuffer (qfv_device_t *device, const char * name, size_t size,
 						 VkCommandPool cmdPool)
 {
 	size_t atom = device->physDev->properties.limits.nonCoherentAtomSize;
 	qfv_devfuncs_t *dfunc = device->funcs;
+	dstring_t  *str = dstring_new ();
 
 	qfv_stagebuf_t *stage = calloc (1, sizeof (qfv_stagebuf_t));
 	stage->atom_mask = atom - 1;
@@ -67,9 +69,13 @@ QFV_CreateStagingBuffer (qfv_device_t *device, size_t size,
 	stage->device = device;
 	stage->buffer = QFV_CreateBuffer (device, size,
 									  VK_BUFFER_USAGE_TRANSFER_SRC_BIT);
+	QFV_duSetObjectName (device, VK_OBJECT_TYPE_BUFFER, stage->buffer,
+						 dsprintf (str, "staging:buffer:%s", name));
 	stage->memory = QFV_AllocBufferMemory (device, stage->buffer,
 										   VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT,
 										   size, 0);
+	QFV_duSetObjectName (device, VK_OBJECT_TYPE_DEVICE_MEMORY, stage->memory,
+						 dsprintf (str, "staging:memory:%s", name));
 	stage->size = size;
 	stage->end = size;
 
@@ -85,9 +91,18 @@ QFV_CreateStagingBuffer (qfv_device_t *device, size_t size,
 		packet->stage = stage;
 		packet->cmd = bufferset->a[i];
 		packet->fence = QFV_CreateFence (device, 1);
+		QFV_duSetObjectName (device, VK_OBJECT_TYPE_COMMAND_BUFFER,
+							 packet->cmd,
+							 dsprintf (str, "staging:packet:cmd:%s:%d",
+									   name, i));
+		QFV_duSetObjectName (device, VK_OBJECT_TYPE_FENCE,
+							 packet->fence,
+							 dsprintf (str, "staging:packet:fence:%s:%d",
+									   name, i));
 		packet->offset = 0;
 		packet->length = 0;
 	}
+	dstring_delete (str);
 	return stage;
 }
 
diff --git a/libs/video/renderer/vulkan/vkparse.c b/libs/video/renderer/vulkan/vkparse.c
index 3c2447702..4108a75f5 100644
--- a/libs/video/renderer/vulkan/vkparse.c
+++ b/libs/video/renderer/vulkan/vkparse.c
@@ -54,6 +54,7 @@
 #include "QF/simd/vec4f.h"
 #include "QF/Vulkan/qf_vid.h"
 #include "QF/Vulkan/descriptor.h"
+#include "QF/Vulkan/debug.h"
 #include "QF/Vulkan/device.h"
 #include "QF/Vulkan/command.h"
 #include "QF/Vulkan/instance.h"
@@ -391,6 +392,8 @@ parse_VkShaderModule_resource (const plitem_t *item, void **data,
 		PL_Message (messages, item, "could not find shader %s", shader_path);
 		return 0;
 	}
+	QFV_duSetObjectName (device, VK_OBJECT_TYPE_SHADER_MODULE, *handle,
+						 va (ctx->va_ctx, "shader:%s", shader_path));
 	return 1;
 }
 
diff --git a/libs/video/renderer/vulkan/vulkan_alias.c b/libs/video/renderer/vulkan/vulkan_alias.c
index a31267cfb..65fa232cc 100644
--- a/libs/video/renderer/vulkan/vulkan_alias.c
+++ b/libs/video/renderer/vulkan/vulkan_alias.c
@@ -57,6 +57,7 @@
 #include "QF/Vulkan/qf_texture.h"
 #include "QF/Vulkan/buffer.h"
 #include "QF/Vulkan/command.h"
+#include "QF/Vulkan/debug.h"
 #include "QF/Vulkan/descriptor.h"
 #include "QF/Vulkan/device.h"
 
@@ -270,15 +271,25 @@ Vulkan_Alias_Init (vulkan_ctx_t *ctx)
 
 	actx->pipeline = Vulkan_CreatePipeline (ctx, "alias");
 	actx->layout = QFV_GetPipelineLayout (ctx, "alias.layout");
+	QFV_duSetObjectName (device, VK_OBJECT_TYPE_PIPELINE_LAYOUT, actx->layout,
+						 va (ctx->va_ctx, "layout:%s", "alias.layout"));
 	actx->sampler = QFV_GetSampler (ctx, "alias.sampler");
+	QFV_duSetObjectName (device, VK_OBJECT_TYPE_SAMPLER, actx->sampler,
+						 va (ctx->va_ctx, "sampler:%s", "alias.sampler"));
 
-	__auto_type layouts = QFV_AllocDescriptorSetLayoutSet (2 * frames, alloca);
+	/*__auto_type layouts = QFV_AllocDescriptorSetLayoutSet (2 * frames, alloca);
 	for (size_t i = 0; i < layouts->size / 2; i++) {
 		__auto_type mats = QFV_GetDescriptorSetLayout (ctx, "alias.matrices");
 		__auto_type lights = QFV_GetDescriptorSetLayout (ctx, "alias.lights");
+		QFV_duSetObjectName (device, VK_OBJECT_TYPE_DESCRIPTOR_SET_LAYOUT,
+							 mats, va (ctx->va_ctx, "set_layout:%s:%d",
+									   "alias.matrices", i));
+		QFV_duSetObjectName (device, VK_OBJECT_TYPE_DESCRIPTOR_SET_LAYOUT,
+							 lights, va (ctx->va_ctx, "set_layout:%s:%d",
+										 "alias.lights", i));
 		layouts->a[2 * i + 0] = mats;
 		layouts->a[2 * i + 1] = lights;
-	}
+	}*/
 	//__auto_type pool = QFV_GetDescriptorPool (ctx, "alias.pool");
 
 	__auto_type cmdBuffers = QFV_AllocCommandBufferSet (frames, alloca);
@@ -288,6 +299,10 @@ Vulkan_Alias_Init (vulkan_ctx_t *ctx)
 	for (size_t i = 0; i < frames; i++) {
 		lbuffers->a[i] = QFV_CreateBuffer (device, sizeof (qfv_light_buffer_t),
 										   VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT);
+		QFV_duSetObjectName (device, VK_OBJECT_TYPE_BUFFER,
+							 lbuffers->a[i],
+							 va (ctx->va_ctx, "buffer:alias:%s:%zd",
+								 "lights", i));
 	}
 	VkMemoryRequirements requirements;
 	dfunc->vkGetBufferMemoryRequirements (device->dev, lbuffers->a[0],
@@ -295,6 +310,9 @@ Vulkan_Alias_Init (vulkan_ctx_t *ctx)
 	actx->light_memory = QFV_AllocBufferMemory (device, lbuffers->a[0],
 										VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT,
 										frames * requirements.size, 0);
+	QFV_duSetObjectName (device, VK_OBJECT_TYPE_DEVICE_MEMORY,
+						 actx->light_memory, va (ctx->va_ctx,
+												 "memory:alias:%s", "lights"));
 	byte       *light_data;
 	dfunc->vkMapMemory (device->dev, actx->light_memory, 0,
 						frames * requirements.size, 0, (void **) &light_data);
@@ -303,6 +321,9 @@ Vulkan_Alias_Init (vulkan_ctx_t *ctx)
 	for (size_t i = 0; i < frames; i++) {
 		__auto_type aframe = &actx->frames.a[i];
 		aframe->cmd = cmdBuffers->a[i];
+		QFV_duSetObjectName (device, VK_OBJECT_TYPE_COMMAND_BUFFER,
+							 aframe->cmd,
+							 va (ctx->va_ctx, "cmd:alias:%zd", i));
 		aframe->light_buffer = lbuffers->a[i];
 		aframe->lights = (qfv_light_buffer_t *) (light_data + i * requirements.size);
 		QFV_BindBufferMemory (device, lbuffers->a[i], actx->light_memory,
diff --git a/libs/video/renderer/vulkan/vulkan_bsp.c b/libs/video/renderer/vulkan/vulkan_bsp.c
index c95a14c97..a923f854a 100644
--- a/libs/video/renderer/vulkan/vulkan_bsp.c
+++ b/libs/video/renderer/vulkan/vulkan_bsp.c
@@ -58,6 +58,7 @@
 #include "QF/Vulkan/buffer.h"
 #include "QF/Vulkan/barrier.h"
 #include "QF/Vulkan/command.h"
+#include "QF/Vulkan/debug.h"
 #include "QF/Vulkan/descriptor.h"
 #include "QF/Vulkan/device.h"
 #include "QF/Vulkan/image.h"
@@ -467,7 +468,8 @@ Vulkan_BuildDisplayLists (model_t **models, int num_models, vulkan_ctx_t *ctx)
 	size_t vertex_buffer_size = vertex_count * sizeof (bspvert_t);
 
 	index_buffer_size = (index_buffer_size + atom_mask) & ~atom_mask;
-	stage = QFV_CreateStagingBuffer (device, vertex_buffer_size, ctx->cmdpool);
+	stage = QFV_CreateStagingBuffer (device, "bsp", vertex_buffer_size,
+									 ctx->cmdpool);
 	qfv_packet_t *packet = QFV_PacketAcquire (stage);
 	vertices = QFV_PacketExtend (packet, vertex_buffer_size);
 	vertex_index_base = 0;
@@ -518,10 +520,14 @@ Vulkan_BuildDisplayLists (model_t **models, int num_models, vulkan_ctx_t *ctx)
 			= QFV_CreateBuffer (device, index_buffer_size,
 								VK_BUFFER_USAGE_TRANSFER_DST_BIT
 								| VK_BUFFER_USAGE_INDEX_BUFFER_BIT);
+		QFV_duSetObjectName (device, VK_OBJECT_TYPE_BUFFER, bctx->index_buffer,
+							 "buffer:bsp:index");
 		bctx->index_memory
 			= QFV_AllocBufferMemory (device, bctx->index_buffer,
 									 VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT,
 									 index_buffer_size, 0);
+		QFV_duSetObjectName (device, VK_OBJECT_TYPE_DEVICE_MEMORY,
+							 bctx->index_memory, "memory:bsp:index");
 		QFV_BindBufferMemory (device,
 							  bctx->index_buffer, bctx->index_memory, 0);
 		bctx->index_buffer_size = index_buffer_size;
@@ -545,10 +551,14 @@ Vulkan_BuildDisplayLists (model_t **models, int num_models, vulkan_ctx_t *ctx)
 			= QFV_CreateBuffer (device, vertex_buffer_size,
 								VK_BUFFER_USAGE_TRANSFER_DST_BIT
 								| VK_BUFFER_USAGE_VERTEX_BUFFER_BIT);
+		QFV_duSetObjectName (device, VK_OBJECT_TYPE_BUFFER,
+							 bctx->vertex_buffer, "buffer:bsp:vertex");
 		bctx->vertex_memory
 			= QFV_AllocBufferMemory (device, bctx->vertex_buffer,
 									 VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT,
 									 vertex_buffer_size, 0);
+		QFV_duSetObjectName (device, VK_OBJECT_TYPE_DEVICE_MEMORY,
+							 bctx->vertex_memory, "memory:bsp:vertex");
 		QFV_BindBufferMemory (device,
 							  bctx->vertex_buffer, bctx->vertex_memory, 0);
 		bctx->vertex_buffer_size = vertex_buffer_size;
@@ -1290,12 +1300,17 @@ create_default_skys (vulkan_ctx_t *ctx)
 							  VK_SAMPLE_COUNT_1_BIT,
 							  VK_IMAGE_USAGE_SAMPLED_BIT
 							  | VK_IMAGE_USAGE_TRANSFER_DST_BIT);
+	QFV_duSetObjectName (device, VK_OBJECT_TYPE_IMAGE, skybox,
+						 "bsp:image:default_skybox");
 
 	skysheet = QFV_CreateImage (device, 0, VK_IMAGE_TYPE_2D,
 							  VK_FORMAT_B8G8R8A8_UNORM, extents, 1, 2,
 							  VK_SAMPLE_COUNT_1_BIT,
 							  VK_IMAGE_USAGE_SAMPLED_BIT
 							  | VK_IMAGE_USAGE_TRANSFER_DST_BIT);
+	QFV_duSetObjectName (device, VK_OBJECT_TYPE_IMAGE, skysheet,
+						 "bsp:image:default_skysheet");
+
 	VkMemoryRequirements requirements;
 	dfunc->vkGetImageMemoryRequirements (device->dev, skybox, &requirements);
 	size_t      boxsize = requirements.size;
@@ -1307,6 +1322,8 @@ create_default_skys (vulkan_ctx_t *ctx)
 								   boxsize + sheetsize,
 								   VK_IMAGE_USAGE_TRANSFER_DST_BIT
 								   | VK_IMAGE_USAGE_SAMPLED_BIT);
+	QFV_duSetObjectName (device, VK_OBJECT_TYPE_DEVICE_MEMORY, memory,
+						 "bsp:memory:default_skys");
 
 	QFV_BindImageMemory (device, skybox, memory, 0);
 	QFV_BindImageMemory (device, skysheet, memory, boxsize);
@@ -1314,11 +1331,15 @@ create_default_skys (vulkan_ctx_t *ctx)
 	boxview = QFV_CreateImageView (device, skybox, VK_IMAGE_VIEW_TYPE_CUBE,
 								   VK_FORMAT_B8G8R8A8_UNORM,
 								   VK_IMAGE_ASPECT_COLOR_BIT);
+	QFV_duSetObjectName (device, VK_OBJECT_TYPE_IMAGE_VIEW, boxview,
+						 "bsp:iview:default_skysheet");
 
 	sheetview = QFV_CreateImageView (device, skysheet,
 									 VK_IMAGE_VIEW_TYPE_2D_ARRAY,
 								     VK_FORMAT_B8G8R8A8_UNORM,
 								     VK_IMAGE_ASPECT_COLOR_BIT);
+	QFV_duSetObjectName (device, VK_OBJECT_TYPE_IMAGE_VIEW, sheetview,
+						 "bsp:iview:default_skysheet");
 
 	bctx->default_skybox->image = skybox;
 	bctx->default_skybox->view = boxview;
@@ -1405,9 +1426,11 @@ Vulkan_Bsp_Init (vulkan_ctx_t *ctx)
 	bctx->elementss_tail = &bctx->elementss;
 	bctx->instsurfs_tail = &bctx->instsurfs;
 
-	bctx->light_scrap = QFV_CreateScrap (device, 2048, tex_frgba, ctx->staging);
+	bctx->light_scrap = QFV_CreateScrap (device, "lightmap_atlas", 2048,
+										 tex_frgba, ctx->staging);
 	size_t      size = QFV_ScrapSize (bctx->light_scrap);
-	bctx->light_stage = QFV_CreateStagingBuffer (device, size, ctx->cmdpool);
+	bctx->light_stage = QFV_CreateStagingBuffer (device, "lightmap", size,
+												 ctx->cmdpool);
 
 	create_default_skys (ctx);
 
@@ -1421,7 +1444,11 @@ Vulkan_Bsp_Init (vulkan_ctx_t *ctx)
 	bctx->main = Vulkan_CreatePipeline (ctx, "quakebsp.main");
 	bctx->sky = Vulkan_CreatePipeline (ctx, "quakebsp.skysheet");
 	bctx->layout = QFV_GetPipelineLayout (ctx, "quakebsp.layout");
+	QFV_duSetObjectName (device, VK_OBJECT_TYPE_PIPELINE_LAYOUT, bctx->layout,
+						 va (ctx->va_ctx, "layout:%s", "quakebsp.layout"));
 	bctx->sampler = QFV_GetSampler (ctx, "quakebsp.sampler");
+	QFV_duSetObjectName (device, VK_OBJECT_TYPE_SAMPLER, bctx->sampler,
+						 va (ctx->va_ctx, "sampler:%s", "quakebsp.sampler"));
 
 	__auto_type cmdBuffers = QFV_AllocCommandBufferSet (3 * frames, alloca);
 	QFV_AllocateCommandBuffers (device, ctx->cmdpool, 1, cmdBuffers);
@@ -1431,6 +1458,15 @@ Vulkan_Bsp_Init (vulkan_ctx_t *ctx)
 		bframe->bsp_cmd = cmdBuffers->a[i * 3 + 0];
 		bframe->turb_cmd = cmdBuffers->a[i * 3 + 1];
 		bframe->sky_cmd = cmdBuffers->a[i * 3 + 2];
+		QFV_duSetObjectName (device, VK_OBJECT_TYPE_COMMAND_BUFFER,
+							 bframe->bsp_cmd,
+							 va (ctx->va_ctx, "cmd:bsp:%zd", i));
+		QFV_duSetObjectName (device, VK_OBJECT_TYPE_COMMAND_BUFFER,
+							 bframe->turb_cmd,
+							 va (ctx->va_ctx, "cmd:turb:%zd", i));
+		QFV_duSetObjectName (device, VK_OBJECT_TYPE_COMMAND_BUFFER,
+							 bframe->sky_cmd,
+							 va (ctx->va_ctx, "cmd:sky:%zd", i));
 
 		for (int j = 0; j < BSP_BUFFER_INFOS; j++) {
 			bframe->bufferInfo[j] = base_buffer_info;
diff --git a/libs/video/renderer/vulkan/vulkan_draw.c b/libs/video/renderer/vulkan/vulkan_draw.c
index 3fc563cb2..16b563600 100644
--- a/libs/video/renderer/vulkan/vulkan_draw.c
+++ b/libs/video/renderer/vulkan/vulkan_draw.c
@@ -367,9 +367,10 @@ Vulkan_Draw_Init (vulkan_ctx_t *ctx)
 										 0, 0);
 
 	create_quad_buffers (ctx);
-	dctx->stage = QFV_CreateStagingBuffer (device, 4 * 1024 * 1024,
+	dctx->stage = QFV_CreateStagingBuffer (device, "draw", 4 * 1024 * 1024,
 										   ctx->cmdpool);
-	dctx->scrap = QFV_CreateScrap (device, 2048, tex_rgba, dctx->stage);
+	dctx->scrap = QFV_CreateScrap (device, "draw_atlas", 2048, tex_rgba,
+								   dctx->stage);
 	dctx->sampler = QFV_GetSampler (ctx, "quakepic");
 
 	qpic_t     *charspic = Draw_Font8x8Pic ();
diff --git a/libs/video/renderer/vulkan/vulkan_texture.c b/libs/video/renderer/vulkan/vulkan_texture.c
index 0129f886c..9bff6e72b 100644
--- a/libs/video/renderer/vulkan/vulkan_texture.c
+++ b/libs/video/renderer/vulkan/vulkan_texture.c
@@ -48,11 +48,13 @@
 #include "QF/quakefs.h"
 #include "QF/render.h"
 #include "QF/sys.h"
+#include "QF/va.h"
 #include "QF/Vulkan/qf_vid.h"
 #include "QF/Vulkan/qf_texture.h"
 #include "QF/Vulkan/barrier.h"
 #include "QF/Vulkan/buffer.h"
 #include "QF/Vulkan/command.h"
+#include "QF/Vulkan/debug.h"
 #include "QF/Vulkan/device.h"
 #include "QF/Vulkan/image.h"
 #include "QF/Vulkan/instance.h"
@@ -199,7 +201,7 @@ blit_mips (int mips, VkImage image, tex_t *tex,
 }
 
 qfv_tex_t *
-Vulkan_LoadTex (vulkan_ctx_t *ctx, tex_t *tex, int mip)
+Vulkan_LoadTex (vulkan_ctx_t *ctx, tex_t *tex, int mip, const char *name)
 {
 	qfv_device_t *device = ctx->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
@@ -256,14 +258,20 @@ Vulkan_LoadTex (vulkan_ctx_t *ctx, tex_t *tex, int mip)
 								   VK_IMAGE_USAGE_TRANSFER_DST_BIT
 								   | VK_IMAGE_USAGE_TRANSFER_SRC_BIT
 								   | VK_IMAGE_USAGE_SAMPLED_BIT);
+	QFV_duSetObjectName (device, VK_OBJECT_TYPE_IMAGE, qtex->image,
+						 va (ctx->va_ctx, "image:%s", name));
 	qtex->memory = QFV_AllocImageMemory (device, qtex->image,
 										 VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT,
 										 0, 0);
+	QFV_duSetObjectName (device, VK_OBJECT_TYPE_DEVICE_MEMORY, qtex->memory,
+						 va (ctx->va_ctx, "memory:%s", name));
 	QFV_BindImageMemory (device, qtex->image, qtex->memory, 0);
 	qtex->view = QFV_CreateImageView (device, qtex->image,
 									  VK_IMAGE_VIEW_TYPE_2D,
 									  VK_FORMAT_R8G8B8A8_UNORM,
 									  VK_IMAGE_ASPECT_COLOR_BIT);
+	QFV_duSetObjectName (device, VK_OBJECT_TYPE_IMAGE_VIEW, qtex->view,
+						 va (ctx->va_ctx, "iview:%s", name));
 
 	size_t      bytes = bpp * tex->width * tex->height;
 	qfv_packet_t *packet = QFV_PacketAcquire (ctx->staging);
@@ -337,9 +345,12 @@ static tex_t default_magenta_tex = {1, 1, tex_rgba, 1, 0, magenta_data};
 void
 Vulkan_Texture_Init (vulkan_ctx_t *ctx)
 {
-	ctx->default_black = Vulkan_LoadTex (ctx, &default_black_tex, 1);
-	ctx->default_white = Vulkan_LoadTex (ctx, &default_white_tex, 1);
-	ctx->default_magenta = Vulkan_LoadTex (ctx, &default_magenta_tex, 1);
+	ctx->default_black = Vulkan_LoadTex (ctx, &default_black_tex, 1,
+										 "default_black");
+	ctx->default_white = Vulkan_LoadTex (ctx, &default_white_tex, 1,
+										 "default_white");
+	ctx->default_magenta = Vulkan_LoadTex (ctx, &default_magenta_tex, 1,
+										   "default_magenta");
 }
 
 void
diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c
index 2ab5fc166..ddd20e82c 100644
--- a/libs/video/renderer/vulkan/vulkan_vid_common.c
+++ b/libs/video/renderer/vulkan/vulkan_vid_common.c
@@ -54,6 +54,7 @@
 #include "QF/Vulkan/qf_vid.h"
 #include "QF/Vulkan/barrier.h"
 #include "QF/Vulkan/buffer.h"
+#include "QF/Vulkan/debug.h"
 #include "QF/Vulkan/descriptor.h"
 #include "QF/Vulkan/device.h"
 #include "QF/Vulkan/command.h"
@@ -204,8 +205,8 @@ Vulkan_CreateDevice (vulkan_ctx_t *ctx)
 void
 Vulkan_CreateStagingBuffers (vulkan_ctx_t *ctx)
 {
-	ctx->staging = QFV_CreateStagingBuffer (ctx->device, 4*1024*1024,
-											ctx->cmdpool);
+	ctx->staging = QFV_CreateStagingBuffer (ctx->device, "vulkan_ctx",
+											4*1024*1024, ctx->cmdpool);
 }
 
 void
@@ -238,9 +239,10 @@ void
 Vulkan_CreateRenderPass (vulkan_ctx_t *ctx)
 {
 	qfv_load_pipeline (ctx);
+	const char *name = "renderpass";//FIXME
 
 	plitem_t   *item = ctx->pipelineDef;
-	if (!item || !(item = PL_ObjectForKey (item, "renderpass"))) {
+	if (!item || !(item = PL_ObjectForKey (item, name))) {
 		Sys_Printf ("error loading renderpass\n");
 		return;
 	} else {
@@ -340,6 +342,9 @@ Vulkan_CreateRenderPass (vulkan_ctx_t *ctx)
 	ctx->renderpass.colorImage = colorImage;
 	ctx->renderpass.depthImage = depthImage;
 	ctx->renderpass.renderpass = QFV_ParseRenderPass (ctx, item);
+	QFV_duSetObjectName (ctx->device, VK_OBJECT_TYPE_RENDER_PASS,
+						 ctx->renderpass.renderpass,
+						 va (ctx->va_ctx, "pipeline:%s", name));
 }
 
 void
@@ -382,7 +387,10 @@ Vulkan_CreatePipeline (vulkan_ctx_t *ctx, const char *name)
 	} else {
 		Sys_Printf ("Found pipeline def %s\n", name);
 	}
-	return QFV_ParsePipeline (ctx, item);
+	VkPipeline pipeline = QFV_ParsePipeline (ctx, item);
+	QFV_duSetObjectName (ctx->device, VK_OBJECT_TYPE_PIPELINE, pipeline,
+						 va (ctx->va_ctx, "pipeline:%s", name));
+	return pipeline;
 }
 
 void

From 08b1d75582b37e245299b39ca2f34b804e34b6d5 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 1 Feb 2021 10:54:49 +0900
Subject: [PATCH 1390/1519] [nq] Put the fps lock back in

That wasn't meant to be removed yet as there are physics problems, but
it's useful for renderer testing. It snuck in with the va patch.
---
 nq/source/host.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nq/source/host.c b/nq/source/host.c
index 861e9d06b..65266f801 100644
--- a/nq/source/host.c
+++ b/nq/source/host.c
@@ -529,7 +529,7 @@ Host_FilterTime (float time)
 	//FIXME not having the framerate cap is nice, but it breaks net play
 	timedifference = (timescale / 72.0) - (realtime - oldrealtime);
 
-	if (0 && !cls.timedemo && (timedifference > 0))
+	if (!cls.timedemo && (timedifference > 0))
 		return timedifference;                   // framerate is too high
 
 	host_frametime = realtime - oldrealtime;
@@ -541,7 +541,7 @@ Host_FilterTime (float time)
 	if (host_framerate->value > 0)
 		host_frametime = host_framerate->value;
 	else	// don't allow really long or short frames
-		host_frametime = bound (0.000, host_frametime, 0.1);
+		host_frametime = bound (0.001, host_frametime, 0.1);
 
 	return 0;
 }

From c7eafd92547591b1f9e1e4e0607c5ccf88841177 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 1 Feb 2021 12:16:05 +0900
Subject: [PATCH 1391/1519] [vulkan] Make the mip map generation public

I've decided that alias model skins should be in a single four-level
array texture rather than spread over four textures, but there's no way
I want to write that code again: getting it right was hard enough the
first time :P
---
 include/QF/Vulkan/image.h                   | 26 +++++++
 libs/video/renderer/vulkan/image.c          | 83 +++++++++++++++++++++
 libs/video/renderer/vulkan/vulkan_texture.c | 82 +-------------------
 3 files changed, 111 insertions(+), 80 deletions(-)

diff --git a/include/QF/Vulkan/image.h b/include/QF/Vulkan/image.h
index 489c86e40..71ca57389 100644
--- a/include/QF/Vulkan/image.h
+++ b/include/QF/Vulkan/image.h
@@ -57,4 +57,30 @@ VkImageView QFV_CreateImageView (struct qfv_device_s *device,
 								 VkImage image, VkImageViewType type,
 								 VkFormat format, VkImageAspectFlags aspect);
 
+/** Generate all mipmaps for a given texture down to a 1x1 pixel.
+ *
+ * Uses the GPU blit command from one mip level to the next, thus the base mip
+ * level data must have already been transfered to the image and the image is
+ * expected to be in VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL. This includes any
+ * array levels.
+ *
+ *	\param device	The device owning the command buffer.
+ *	\param cmd		The command buffer to which the barrier and blit commands
+ *					will be written.
+ *	\param image	The image to be processed. All array layers of the base mip
+ *					level must be initialized and in "transfer dst optimal"
+ *					layout. All remaining mip levels must be in "undefined"
+ *					oayout.
+ *	\param mips		The total number of mip levels of the processed image.
+ *	\param width	The pixel width of the base image.
+ *	\param height	The pixel height of the base image.
+ *	\param layers	The number of array layers in the mbase image.
+ *
+ *	\note	The processed image will be in "shader read only optimal" layout on
+ *			completion.
+ */
+void QFV_GenerateMipMaps (struct qfv_device_s *device, VkCommandBuffer cmd,
+						  VkImage image, unsigned mips,
+						  unsigned width, unsigned height, unsigned layers);
+
 #endif//__QF_Vulkan_image_h
diff --git a/libs/video/renderer/vulkan/image.c b/libs/video/renderer/vulkan/image.c
index bd71cc162..92d584f80 100644
--- a/libs/video/renderer/vulkan/image.c
+++ b/libs/video/renderer/vulkan/image.c
@@ -49,6 +49,7 @@
 #include "QF/va.h"
 #include "QF/vid.h"
 #include "QF/Vulkan/qf_vid.h"
+#include "QF/Vulkan/barrier.h"
 #include "QF/Vulkan/device.h"
 #include "QF/Vulkan/image.h"
 #include "QF/Vulkan/instance.h"
@@ -192,3 +193,85 @@ QFV_CreateImageView (qfv_device_t *device, VkImage image,
 	dfunc->vkCreateImageView (dev, &createInfo, 0, &view);
 	return view;
 }
+
+void
+QFV_GenerateMipMaps (qfv_device_t *device, VkCommandBuffer cmd,
+					 VkImage image, unsigned mips,
+					 unsigned width, unsigned height, unsigned layers)
+{
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	qfv_pipelinestagepair_t pre_stages = {
+		VK_PIPELINE_STAGE_TRANSFER_BIT,
+		VK_PIPELINE_STAGE_TRANSFER_BIT,
+	};
+	qfv_pipelinestagepair_t post_stages = {
+		VK_PIPELINE_STAGE_TRANSFER_BIT,
+		VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT,
+	};
+	qfv_pipelinestagepair_t final_stages = {
+		VK_PIPELINE_STAGE_TRANSFER_BIT,
+		VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT,
+	};
+	VkImageMemoryBarrier pre_barrier = {
+		VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER, 0,
+		VK_ACCESS_TRANSFER_WRITE_BIT, VK_ACCESS_TRANSFER_READ_BIT,
+		VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
+		VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
+		VK_QUEUE_FAMILY_IGNORED, VK_QUEUE_FAMILY_IGNORED,
+		image,
+		{ VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, layers }
+	};
+	VkImageMemoryBarrier post_barrier = {
+		VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER, 0,
+		VK_ACCESS_TRANSFER_READ_BIT, VK_ACCESS_SHADER_READ_BIT,
+		VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
+		VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL,
+		VK_QUEUE_FAMILY_IGNORED, VK_QUEUE_FAMILY_IGNORED,
+		image,
+		{ VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, layers }
+	};
+	VkImageMemoryBarrier final_barrier = {
+		VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER, 0,
+		VK_ACCESS_TRANSFER_READ_BIT, VK_ACCESS_SHADER_READ_BIT,
+		VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
+		VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL,
+		VK_QUEUE_FAMILY_IGNORED, VK_QUEUE_FAMILY_IGNORED,
+		image,
+		{ VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, layers }
+	};
+
+	VkImageBlit blit = {
+		{VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, layers},
+		{{0, 0, 0}, {width, height, 1}},
+		{VK_IMAGE_ASPECT_COLOR_BIT, 1, 0, layers},
+		{{0, 0, 0}, {max (width >> 1, 1), max (height >> 1, 1), 1}},
+	};
+
+	while (--mips > 0) {
+		dfunc->vkCmdPipelineBarrier (cmd, pre_stages.src, pre_stages.dst, 0,
+									 0, 0, 0, 0,
+									 1, &pre_barrier);
+		dfunc->vkCmdBlitImage (cmd,
+							   image, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
+							   image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
+							   1, &blit, VK_FILTER_LINEAR);
+
+		dfunc->vkCmdPipelineBarrier (cmd, post_stages.src, post_stages.dst, 0,
+									 0, 0, 0, 0,
+									 1, &post_barrier);
+
+		blit.srcSubresource.mipLevel++;
+		blit.srcOffsets[1].x = blit.dstOffsets[1].x;
+		blit.srcOffsets[1].y = blit.dstOffsets[1].y;
+		blit.dstSubresource.mipLevel++;
+		blit.dstOffsets[1].x = max (blit.dstOffsets[1].x >> 1, 1);
+		blit.dstOffsets[1].y = max (blit.dstOffsets[1].y >> 1, 1);
+		pre_barrier.subresourceRange.baseMipLevel++;
+		post_barrier.subresourceRange.baseMipLevel++;
+		final_barrier.subresourceRange.baseMipLevel++;
+	}
+	dfunc->vkCmdPipelineBarrier (cmd, final_stages.src, final_stages.dst, 0,
+								 0, 0, 0, 0,
+								 1, &final_barrier);
+}
diff --git a/libs/video/renderer/vulkan/vulkan_texture.c b/libs/video/renderer/vulkan/vulkan_texture.c
index 9bff6e72b..4a1e2d2ab 100644
--- a/libs/video/renderer/vulkan/vulkan_texture.c
+++ b/libs/video/renderer/vulkan/vulkan_texture.c
@@ -121,85 +121,6 @@ Vulkan_ExpandPalette (byte *dst, const byte *src, const byte *palette,
 	}
 }
 
-static void
-blit_mips (int mips, VkImage image, tex_t *tex,
-		   qfv_devfuncs_t *dfunc, VkCommandBuffer cmd)
-{
-	qfv_pipelinestagepair_t pre_stages = {
-		VK_PIPELINE_STAGE_TRANSFER_BIT,
-		VK_PIPELINE_STAGE_TRANSFER_BIT,
-	};
-	qfv_pipelinestagepair_t post_stages = {
-		VK_PIPELINE_STAGE_TRANSFER_BIT,
-		VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT,
-	};
-	qfv_pipelinestagepair_t final_stages = {
-		VK_PIPELINE_STAGE_TRANSFER_BIT,
-		VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT,
-	};
-	VkImageMemoryBarrier pre_barrier = {
-		VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER, 0,
-		VK_ACCESS_TRANSFER_WRITE_BIT, VK_ACCESS_TRANSFER_READ_BIT,
-		VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
-		VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
-		VK_QUEUE_FAMILY_IGNORED, VK_QUEUE_FAMILY_IGNORED,
-		image,
-		{ VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1 }
-	};
-	VkImageMemoryBarrier post_barrier = {
-		VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER, 0,
-		VK_ACCESS_TRANSFER_READ_BIT, VK_ACCESS_SHADER_READ_BIT,
-		VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
-		VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL,
-		VK_QUEUE_FAMILY_IGNORED, VK_QUEUE_FAMILY_IGNORED,
-		image,
-		{ VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1 }
-	};
-	VkImageMemoryBarrier final_barrier = {
-		VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER, 0,
-		VK_ACCESS_TRANSFER_READ_BIT, VK_ACCESS_SHADER_READ_BIT,
-		VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
-		VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL,
-		VK_QUEUE_FAMILY_IGNORED, VK_QUEUE_FAMILY_IGNORED,
-		image,
-		{ VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1 }
-	};
-
-	VkImageBlit blit = {
-		{VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1},
-		{{0, 0, 0}, {tex->width, tex->height, 1}},
-		{VK_IMAGE_ASPECT_COLOR_BIT, 1, 0, 1},
-		{{0, 0, 0}, {max (tex->width >> 1, 1), max (tex->height >> 1, 1), 1}},
-	};
-
-	while (--mips > 0) {
-		dfunc->vkCmdPipelineBarrier (cmd, pre_stages.src, pre_stages.dst, 0,
-									 0, 0, 0, 0,
-									 1, &pre_barrier);
-		dfunc->vkCmdBlitImage (cmd,
-							   image, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
-							   image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
-							   1, &blit, VK_FILTER_LINEAR);
-
-		dfunc->vkCmdPipelineBarrier (cmd, post_stages.src, post_stages.dst, 0,
-									 0, 0, 0, 0,
-									 1, &post_barrier);
-
-		blit.srcSubresource.mipLevel++;
-		blit.srcOffsets[1].x = blit.dstOffsets[1].x;
-		blit.srcOffsets[1].y = blit.dstOffsets[1].y;
-		blit.dstSubresource.mipLevel++;
-		blit.dstOffsets[1].x = max (blit.dstOffsets[1].x >> 1, 1);
-		blit.dstOffsets[1].y = max (blit.dstOffsets[1].y >> 1, 1);
-		pre_barrier.subresourceRange.baseMipLevel++;
-		post_barrier.subresourceRange.baseMipLevel++;
-		final_barrier.subresourceRange.baseMipLevel++;
-	}
-	dfunc->vkCmdPipelineBarrier (cmd, final_stages.src, final_stages.dst, 0,
-								 0, 0, 0, 0,
-								 1, &final_barrier);
-}
-
 qfv_tex_t *
 Vulkan_LoadTex (vulkan_ctx_t *ctx, tex_t *tex, int mip, const char *name)
 {
@@ -311,7 +232,8 @@ Vulkan_LoadTex (vulkan_ctx_t *ctx, tex_t *tex, int mip, const char *name)
 									 0, 0, 0, 0, 0,
 									 1, &barrier);
 	} else {
-		blit_mips (mip, qtex->image, tex, dfunc, packet->cmd);
+		QFV_GenerateMipMaps (device, packet->cmd, qtex->image,
+							 mip, tex->width, tex->height, 1);
 	}
 	QFV_PacketSubmit (packet);
 	return qtex;

From afe8e9633e3c38e8d3a6ebf168d2f737015a0544 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 1 Feb 2021 12:24:27 +0900
Subject: [PATCH 1392/1519] [vulkan] Silence the matrix dump

It got annoying and has served its purpose. However, the code is still
there (#if 0) in case it's needed again.
---
 libs/video/renderer/vulkan/vulkan_matrices.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libs/video/renderer/vulkan/vulkan_matrices.c b/libs/video/renderer/vulkan/vulkan_matrices.c
index e1a1dd13e..ffd36219a 100644
--- a/libs/video/renderer/vulkan/vulkan_matrices.c
+++ b/libs/video/renderer/vulkan/vulkan_matrices.c
@@ -175,7 +175,7 @@ Vulkan_CalcProjectionMatrices (vulkan_ctx_t *ctx, float aspect)
 
 	ortho_mat (mat->projection_2d, 0, width, 0, height, -99999, 99999);
 	persp_mat (mat->projection_3d, 0, width, 0, height, aspect);
-
+#if 0
 	Sys_MaskPrintf (SYS_VULKAN, "ortho:\n");
 	Sys_MaskPrintf (SYS_VULKAN, "   [[%g, %g, %g, %g],\n",
 					QuatExpand (mat->projection_2d + 0));
@@ -194,7 +194,7 @@ Vulkan_CalcProjectionMatrices (vulkan_ctx_t *ctx, float aspect)
 					QuatExpand (mat->projection_3d + 8));
 	Sys_MaskPrintf (SYS_VULKAN, "    [%g, %g, %g, %g]]\n",
 					QuatExpand (mat->projection_3d + 12));
-
+#endif
 	VkMappedMemoryRange ranges[] = {
 		{ VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE, 0, mat->memory, 0, MAT_SIZE },
 		{ VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE, 0, mat->memory,

From bb6c6963d2b6cb45f42a0b3cc0e841183a76603d Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 1 Feb 2021 14:39:00 +0900
Subject: [PATCH 1393/1519] [model] Clean up the globals around model loading

Covers only the generic load code (alias etc to follow), but this should
take care of a lot of issues in the future.
---
 include/QF/Vulkan/qf_alias.h                 |   7 +-
 include/QF/model.h                           |  36 +--
 include/QF/plugin/vid_render.h               |  12 +-
 include/mod_internal.h                       |  54 ++--
 libs/models/alias/gl_mesh.c                  |   6 +-
 libs/models/alias/gl_model_alias.c           |  18 +-
 libs/models/alias/glsl_model_alias.c         |   6 +-
 libs/models/alias/model_alias.c              |  44 +--
 libs/models/alias/sw_model_alias.c           |  20 +-
 libs/models/alias/vulkan_model_alias.c       |  24 +-
 libs/models/brush/gl_model_brush.c           |  35 ++-
 libs/models/brush/glsl_model_brush.c         |  12 +-
 libs/models/brush/model_brush.c              | 285 ++++++++++---------
 libs/models/brush/sw_model_brush.c           |   8 +-
 libs/models/brush/vulkan_model_brush.c       |  71 +++--
 libs/models/clip_hull.c                      |   1 +
 libs/models/fullbright.c                     |   2 +-
 libs/models/gl_model_fullbright.c            |   2 +-
 libs/models/iqm/model_iqm.c                  |  10 +-
 libs/models/model.c                          |  33 +--
 libs/models/sprite/gl_model_sprite.c         |   5 +-
 libs/models/sprite/glsl_model_sprite.c       |   7 +-
 libs/models/sprite/model_sprite.c            |  27 +-
 libs/models/sprite/sw_model_sprite.c         |   3 +-
 libs/video/renderer/gl/gl_dyn_part.c         |   2 +-
 libs/video/renderer/gl/gl_lightmap.c         |   4 +-
 libs/video/renderer/gl/gl_rmisc.c            |   2 +-
 libs/video/renderer/glsl/glsl_bsp.c          |   4 +-
 libs/video/renderer/glsl/glsl_lightmap.c     |   4 +-
 libs/video/renderer/glsl/glsl_particles.c    |   2 +-
 libs/video/renderer/sw/sw_ralias.c           |   2 +-
 libs/video/renderer/sw/sw_rpart.c            |   2 +-
 libs/video/renderer/sw32/sw32_ralias.c       |   2 +-
 libs/video/renderer/sw32/sw32_rpart.c        |   2 +-
 libs/video/renderer/vid_render_vulkan.c      |  25 +-
 libs/video/renderer/vulkan/vulkan_bsp.c      |   4 +-
 libs/video/renderer/vulkan/vulkan_lightmap.c |   4 +-
 nq/source/cl_demo.c                          |   2 +-
 nq/source/cl_main.c                          |   2 +-
 nq/source/sv_main.c                          |   2 +-
 qw/source/cl_demo.c                          |   2 +-
 qw/source/sbar.c                             |   2 +-
 qw/source/sv_init.c                          |   2 +-
 qw/source/teamplay.c                         |   8 +-
 44 files changed, 408 insertions(+), 399 deletions(-)

diff --git a/include/QF/Vulkan/qf_alias.h b/include/QF/Vulkan/qf_alias.h
index bcc5be337..dac8f4ca7 100644
--- a/include/QF/Vulkan/qf_alias.h
+++ b/include/QF/Vulkan/qf_alias.h
@@ -102,13 +102,14 @@ typedef struct aliasctx_s {
 
 struct vulkan_ctx_s;
 struct entity_s;
-void *Vulkan_Mod_LoadSkin (byte *skin, int skinsize, int snum, int gnum,
-		                   qboolean group, maliasskindesc_t *skindesc,
+void *Vulkan_Mod_LoadSkin (model_t *mod, byte *skin, int skinsize, int snum,
+						   int gnum, qboolean group,
+						   maliasskindesc_t *skindesc,
 						   struct vulkan_ctx_s *ctx);
 void Vulkan_Mod_FinalizeAliasModel (model_t *m, aliashdr_t *hdr,
 									struct vulkan_ctx_s *ctx);
 void Vulkan_Mod_LoadExternalSkins (model_t *mod, struct vulkan_ctx_s *ctx);
-void Vulkan_Mod_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr,
+void Vulkan_Mod_MakeAliasModelDisplayLists (model_t *mod, aliashdr_t *hdr,
 											void *_m, int _s, int extra,
 											struct vulkan_ctx_s *ctx);
 
diff --git a/include/QF/model.h b/include/QF/model.h
index 5512506f3..c7fc9190f 100644
--- a/include/QF/model.h
+++ b/include/QF/model.h
@@ -346,6 +346,8 @@ typedef enum {mod_brush, mod_sprite, mod_alias, mod_iqm} modtype_t;
 #define EF_GLOWTRAIL	4096		// glowcolor particle trail
 
 typedef struct model_s {
+	//FIXME use pointers. needs care in bsp submodel loading
+	char		 path[MAX_QPATH];
 	char		 name[MAX_QPATH];
 	const struct vpath_s *vpath;// virtual path where this model was found
 	qboolean	 needload;		// bmodels and sprites don't cache normally
@@ -431,40 +433,20 @@ typedef struct model_s {
 
 // ============================================================================
 
-extern float RadiusFromBounds (const vec3_t mins, const vec3_t maxs) __attribute__((pure));
-void	Mod_Init (void);
-void	Mod_Init_Cvars (void);
-void	Mod_ClearAll (void);
+void Mod_Init (void);
+void Mod_Init_Cvars (void);
+void Mod_ClearAll (void);
 model_t *Mod_ForName (const char *name, qboolean crash);
-void	*Mod_Extradata (model_t *mod);	// handles caching
-void	Mod_TouchModel (const char *name);
-
+void Mod_TouchModel (const char *name);
+// brush specific
 mleaf_t *Mod_PointInLeaf (const vec3_t p, model_t *model) __attribute__((pure));
-byte	*Mod_LeafPVS (mleaf_t *leaf, model_t *model);
-model_t	*Mod_FindName (const char *name);
-int     Mod_CalcFullbright (const byte *in, byte *out, int pixels);
-void    Mod_ClearFullbright (const byte *in, byte *out, int pixels);
-int     Mod_Fullbright (byte * skin, int width, int height, const char *name);
-
-void    *Mod_LoadAliasFrame (void *pin, int *posenum, maliasframedesc_t *frame,
-							 int extra);
-void    *Mod_LoadAliasGroup (void *pin, int *posenum, maliasframedesc_t *frame,
-							 int extra);
-
-void Mod_FindClipDepth (hull_t *hull);
-void	 Mod_LoadBrushModel (model_t *mod, void *buffer);
-void	 Mod_FloodFillSkin (byte *skin, int skinwidth, int skinheight);
-
-void	 Mod_Print (void);
+byte *Mod_LeafPVS (mleaf_t *leaf, model_t *model);
+void Mod_Print (void);
 
 extern struct cvar_s *gl_mesh_cache;
 extern struct cvar_s *gl_subdivide_size;
 extern struct cvar_s *gl_alias_render_tri;
 extern struct cvar_s *gl_textures_external;
-extern model_t *loadmodel;
-extern char *loadname;
-extern byte *mod_base;
-extern byte mod_novis[MAX_MAP_LEAFS / 8];
 extern int mod_lightmap_bytes;
 
 #endif//__QF_model_h
diff --git a/include/QF/plugin/vid_render.h b/include/QF/plugin/vid_render.h
index b2ea3d224..cc634e562 100644
--- a/include/QF/plugin/vid_render.h
+++ b/include/QF/plugin/vid_render.h
@@ -81,22 +81,24 @@ typedef struct vid_particle_funcs_s {
 
 typedef struct vid_model_funcs_s {
 	size_t      texture_render_size;// size of renderer specific texture data
-	void (*Mod_LoadLighting) (bsp_t *bsp);
-	void (*Mod_SubdivideSurface) (msurface_t *fa);
-	void (*Mod_ProcessTexture) (texture_t *tx);
+	void (*Mod_LoadLighting) (model_t *mod, bsp_t *bsp);
+	void (*Mod_SubdivideSurface) (model_t *mod, msurface_t *fa);
+	void (*Mod_ProcessTexture) (model_t *mod, texture_t *tx);
 	void (*Mod_LoadIQM) (model_t *mod, void *buffer);
 	void (*Mod_LoadAliasModel) (model_t *mod, void *buffer,
 								cache_allocator_t allocator);
 	void (*Mod_LoadSpriteModel) (model_t *mod, void *buffer);
 	void (*Mod_MakeAliasModelDisplayLists) (model_t *m, aliashdr_t *hdr,
 											void *_m, int _s, int extra);
-	void *(*Mod_LoadSkin) (byte *skin, int skinsize, int snum, int gnum,
+	void *(*Mod_LoadSkin) (model_t *mod, byte *skin, int skinsize, int snum,
+						   int gnum,
 						   qboolean group, maliasskindesc_t *skindesc);
 	void (*Mod_FinalizeAliasModel) (model_t *m, aliashdr_t *hdr);
 	void (*Mod_LoadExternalSkins) (model_t *mod);
 	void (*Mod_IQMFinish) (model_t *mod);
 	int alias_cache;
-	void (*Mod_SpriteLoadTexture) (mspriteframe_t *pspriteframe, int framenum);
+	void (*Mod_SpriteLoadTexture) (model_t *mod, mspriteframe_t *pspriteframe,
+								   int framenum);
 
 	struct skin_s *(*Skin_SetColormap) (struct skin_s *skin, int cmap);
 	struct skin_s *(*Skin_SetSkin) (struct skin_s *skin, int cmap,
diff --git a/include/mod_internal.h b/include/mod_internal.h
index 382a8985f..f459bbeaa 100644
--- a/include/mod_internal.h
+++ b/include/mod_internal.h
@@ -6,50 +6,68 @@
 #include "QF/skin.h"
 #include "QF/plugin/vid_render.h"
 
+int Mod_CalcFullbright (const byte *in, byte *out, int pixels);
+void Mod_ClearFullbright (const byte *in, byte *out, int pixels);
+void Mod_FloodFillSkin (byte *skin, int skinwidth, int skinheight);
+//FIXME gl specific. rewrite to use above
+int Mod_Fullbright (byte * skin, int width, int height, const char *name);
+
+void Mod_LoadBrushModel (model_t *mod, void *buffer);
+void Mod_FindClipDepth (hull_t *hull);
+
+model_t	*Mod_FindName (const char *name);
+float RadiusFromBounds (const vec3_t mins, const vec3_t maxs) __attribute__((pure));
+
 struct vulkan_ctx_s;
 
 extern vid_model_funcs_t *m_funcs;
 
 void gl_Mod_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr, void *_m,
 										int _s, int extra);
-void *gl_Mod_LoadSkin (byte *skin, int skinsize, int snum, int gnum,
-					   qboolean group, maliasskindesc_t *skindesc);
+void *gl_Mod_LoadSkin (model_t *mod, byte *skin, int skinsize, int snum,
+					   int gnum, qboolean group, maliasskindesc_t *skindesc);
 void gl_Mod_FinalizeAliasModel (model_t *m, aliashdr_t *hdr);
 void gl_Mod_LoadExternalSkins (model_t *mod);
 void gl_Mod_IQMFinish (model_t *mod);
 
 void glsl_Mod_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr,
 										  void *_m, int _s, int extra);
-void *glsl_Mod_LoadSkin (byte *skin, int skinsize, int snum, int gnum,
-						 qboolean group, maliasskindesc_t *skindesc);
+void *glsl_Mod_LoadSkin (model_t *mod, byte *skin, int skinsize, int snum,
+						 int gnum, qboolean group, maliasskindesc_t *skindesc);
 void glsl_Mod_FinalizeAliasModel (model_t *m, aliashdr_t *hdr);
 void glsl_Mod_LoadExternalSkins (model_t *mod);
 void glsl_Mod_IQMFinish (model_t *mod);
 
 void sw_Mod_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr, void *_m,
 										int _s, int extra);
-void *sw_Mod_LoadSkin (byte *skin, int skinsize, int snum, int gnum,
-					   qboolean group, maliasskindesc_t *skindesc);
+void *sw_Mod_LoadSkin (model_t *mod, byte *skin, int skinsize, int snum,
+					   int gnum, qboolean group, maliasskindesc_t *skindesc);
 void sw_Mod_FinalizeAliasModel (model_t *m, aliashdr_t *hdr);
 void sw_Mod_LoadExternalSkins (model_t *mod);
 void sw_Mod_IQMFinish (model_t *mod);
 
-void gl_Mod_LoadLighting (bsp_t *bsp);
-void gl_Mod_SubdivideSurface (msurface_t *fa);
-void gl_Mod_ProcessTexture(texture_t *tx);
+void gl_Mod_LoadLighting (model_t *mod, bsp_t *bsp);
+void gl_Mod_SubdivideSurface (model_t *mod, msurface_t *fa);
+void gl_Mod_ProcessTexture (model_t *mod, texture_t *tx);
 
-void glsl_Mod_LoadLighting (bsp_t *bsp);
-void glsl_Mod_ProcessTexture(texture_t *tx);
+void glsl_Mod_LoadLighting (model_t *mod, bsp_t *bsp);
+void glsl_Mod_ProcessTexture (model_t *mod, texture_t *tx);
 
-void sw_Mod_LoadLighting (bsp_t *bsp);
+void sw_Mod_LoadLighting (model_t *mod, bsp_t *bsp);
 
-void Vulkan_Mod_LoadLighting (bsp_t *bsp, struct vulkan_ctx_s *ctx);
-void Vulkan_Mod_SubdivideSurface (msurface_t *fa, struct vulkan_ctx_s *ctx);
-void Vulkan_Mod_ProcessTexture(texture_t *tx, struct vulkan_ctx_s *ctx);
+void Vulkan_Mod_LoadLighting (model_t *mod, bsp_t *bsp,
+							  struct vulkan_ctx_s *ctx);
+void Vulkan_Mod_SubdivideSurface (model_t *mod, msurface_t *fa,
+								  struct vulkan_ctx_s *ctx);
+void Vulkan_Mod_ProcessTexture (model_t *mod, texture_t *tx,
+								struct vulkan_ctx_s *ctx);
 
-void gl_Mod_SpriteLoadTexture (mspriteframe_t *pspriteframe, int framenum);
-void glsl_Mod_SpriteLoadTexture (mspriteframe_t *pspriteframe, int framenum);
-void sw_Mod_SpriteLoadTexture (mspriteframe_t *pspriteframe, int framenum);
+void gl_Mod_SpriteLoadTexture (model_t *mod, mspriteframe_t *pspriteframe,
+							   int framenum);
+void glsl_Mod_SpriteLoadTexture (model_t *mod, mspriteframe_t *pspriteframe,
+								 int framenum);
+void sw_Mod_SpriteLoadTexture (model_t *mod, mspriteframe_t *pspriteframe,
+							   int framenum);
 
 void Mod_LoadIQM (model_t *mod, void *buffer);
 void Mod_FreeIQM (iqm_t *iqm);
diff --git a/libs/models/alias/gl_mesh.c b/libs/models/alias/gl_mesh.c
index c55225057..6820000cf 100644
--- a/libs/models/alias/gl_mesh.c
+++ b/libs/models/alias/gl_mesh.c
@@ -361,8 +361,8 @@ gl_Mod_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr, void *_m,
 
 			// look for a cached version
 			dstring_copystr (cache, "glquake/");
-			dstring_appendstr (cache, m->name);
-			QFS_StripExtension (m->name + strlen ("progs/"),
+			dstring_appendstr (cache, m->path);
+			QFS_StripExtension (m->path + strlen ("progs/"),
 							cache->str + strlen ("glquake/"));
 			dstring_appendstr (cache, ".qfms");
 
@@ -433,7 +433,7 @@ gl_Mod_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr, void *_m,
 		}
 		if (remesh) {
 			// build it from scratch
-			Sys_MaskPrintf (SYS_DEV, "meshing %s...\n", m->name);
+			Sys_MaskPrintf (SYS_DEV, "meshing %s...\n", m->path);
 
 			BuildTris ();					// trifans or lists
 
diff --git a/libs/models/alias/gl_model_alias.c b/libs/models/alias/gl_model_alias.c
index ff5d62347..dec3a6e98 100644
--- a/libs/models/alias/gl_model_alias.c
+++ b/libs/models/alias/gl_model_alias.c
@@ -53,15 +53,15 @@
 #include "compat.h"
 
 void *
-gl_Mod_LoadSkin (byte *skin, int skinsize, int snum, int gnum, qboolean group,
-				 maliasskindesc_t *skindesc)
+gl_Mod_LoadSkin (model_t *mod, byte *skin, int skinsize, int snum, int gnum,
+				 qboolean group, maliasskindesc_t *skindesc)
 {
 	byte   *pskin;
 	char	modname[MAX_QPATH + 4];
 	int		fb_texnum = 0, texnum = 0;
 	dstring_t  *name = dstring_new ();
 
-	pskin = Hunk_AllocName (skinsize, loadname);
+	pskin = Hunk_AllocName (skinsize, mod->name);
 	skindesc->skin = (byte *) pskin - (byte *) pheader;
 
 	memcpy (pskin, skin, skinsize);
@@ -69,13 +69,13 @@ gl_Mod_LoadSkin (byte *skin, int skinsize, int snum, int gnum, qboolean group,
 	Mod_FloodFillSkin (pskin, pheader->mdl.skinwidth, pheader->mdl.skinheight);
 	// save 8 bit texels for the player model to remap
 	// FIXME remove model restriction
-	if (strequal (loadmodel->name, "progs/player.mdl"))
+	if (strequal (mod->path, "progs/player.mdl"))
 		gl_Skin_SetPlayerSkin (pheader->mdl.skinwidth, pheader->mdl.skinheight,
 							   pskin);
 
-	QFS_StripExtension (loadmodel->name, modname);
+	QFS_StripExtension (mod->path, modname);
 
-	if (!loadmodel->fullbright) {
+	if (!mod->fullbright) {
 		if (group) {
 			dsprintf (name, "fb_%s_%i_%i", modname, snum, gnum);
 		} else {
@@ -95,7 +95,7 @@ gl_Mod_LoadSkin (byte *skin, int skinsize, int snum, int gnum, qboolean group,
 	Sys_MaskPrintf (SYS_GLT, "%s %d\n", name->str, texnum);
 	skindesc->texnum = texnum;
 	skindesc->fb_texnum = fb_texnum;
-	loadmodel->hasfullbrights = fb_texnum;
+	mod->hasfullbrights = fb_texnum;
 	dstring_delete (name);
 	// alpha param was true for non group skins
 	return skin + skinsize;
@@ -104,7 +104,7 @@ gl_Mod_LoadSkin (byte *skin, int skinsize, int snum, int gnum, qboolean group,
 void
 gl_Mod_FinalizeAliasModel (model_t *m, aliashdr_t *hdr)
 {
-	if (strequal (m->name, "progs/eyes.mdl")) {
+	if (strequal (m->path, "progs/eyes.mdl")) {
 		hdr->mdl.scale_origin[2] -= (22 + 8);
 		VectorScale (hdr->mdl.scale, 2, hdr->mdl.scale);
 	}
@@ -158,7 +158,7 @@ gl_Mod_LoadExternalSkins (model_t *mod)
 	maliasskingroup_t *pskingroup;
 	dstring_t  *filename = dstring_new ();
 
-	QFS_StripExtension (mod->name, modname);
+	QFS_StripExtension (mod->path, modname);
 
 	for (i = 0; i < pheader->mdl.numskins; i++) {
 		pskindesc = ((maliasskindesc_t *)
diff --git a/libs/models/alias/glsl_model_alias.c b/libs/models/alias/glsl_model_alias.c
index 796b3f346..609fa01b7 100644
--- a/libs/models/alias/glsl_model_alias.c
+++ b/libs/models/alias/glsl_model_alias.c
@@ -91,7 +91,7 @@ glsl_alias_clear (model_t *m, void *data)
 }
 
 void *
-glsl_Mod_LoadSkin (byte *skin, int skinsize, int snum, int gnum,
+glsl_Mod_LoadSkin (model_t *mod, byte *skin, int skinsize, int snum, int gnum,
 				   qboolean group, maliasskindesc_t *skindesc)
 {
 	byte       *tskin;
@@ -104,9 +104,9 @@ glsl_Mod_LoadSkin (byte *skin, int skinsize, int snum, int gnum,
 	memcpy (tskin, skin, skinsize);
 	Mod_FloodFillSkin (tskin, w, h);
 	if (group)
-		name = va (0, "%s_%i_%i", loadmodel->name, snum, gnum);
+		name = va (0, "%s_%i_%i", mod->path, snum, gnum);
 	else
-		name = va (0, "%s_%i", loadmodel->name, snum);
+		name = va (0, "%s_%i", mod->path, snum);
 	skindesc->texnum = GLSL_LoadQuakeTexture (name, w, h, tskin);
 	free (tskin);
 	return skin + skinsize;
diff --git a/libs/models/alias/model_alias.c b/libs/models/alias/model_alias.c
index c5018f929..e4225daea 100644
--- a/libs/models/alias/model_alias.c
+++ b/libs/models/alias/model_alias.c
@@ -62,7 +62,8 @@ int			aliasbboxmins[3], aliasbboxmaxs[3];
 
 
 static void *
-Mod_LoadAllSkins (int numskins, daliasskintype_t *pskintype, int *pskinindex)
+Mod_LoadAllSkins (model_t *mod, int numskins, daliasskintype_t *pskintype,
+				  int *pskinindex)
 {
 	byte       *skin;
 	float      *poutskinintervals;
@@ -77,7 +78,7 @@ Mod_LoadAllSkins (int numskins, daliasskintype_t *pskintype, int *pskinindex)
 
 	skinsize = pheader->mdl.skinwidth * pheader->mdl.skinheight;
 	pskindesc = Hunk_AllocName (numskins * sizeof (maliasskindesc_t),
-								loadname);
+								mod->name);
 
 	*pskinindex = (byte *) pskindesc - (byte *) pheader;
 
@@ -85,7 +86,7 @@ Mod_LoadAllSkins (int numskins, daliasskintype_t *pskintype, int *pskinindex)
 		pskindesc[snum].type = pskintype->type;
 		if (pskintype->type == ALIAS_SKIN_SINGLE) {
 			skin = (byte *) (pskintype + 1);
-			skin = m_funcs->Mod_LoadSkin (skin, skinsize, snum, 0, false,
+			skin = m_funcs->Mod_LoadSkin (mod, skin, skinsize, snum, 0, false,
 										  &pskindesc[snum]);
 		} else {
 			pskintype++;
@@ -93,14 +94,14 @@ Mod_LoadAllSkins (int numskins, daliasskintype_t *pskintype, int *pskinindex)
 			groupskins = LittleLong (pinskingroup->numskins);
 
 			t = field_offset (maliasskingroup_t, skindescs[groupskins]);
-			paliasskingroup = Hunk_AllocName (t, loadname);
+			paliasskingroup = Hunk_AllocName (t, mod->name);
 			paliasskingroup->numskins = groupskins;
 
 			pskindesc[snum].skin = (byte *) paliasskingroup - (byte *) pheader;
 
 			pinskinintervals = (daliasskininterval_t *) (pinskingroup + 1);
 			poutskinintervals = Hunk_AllocName (groupskins * sizeof (float),
-												loadname);
+												mod->name);
 			paliasskingroup->intervals =
 				(byte *) poutskinintervals - (byte *) pheader;
 			for (gnum = 0; gnum < groupskins; gnum++) {
@@ -117,8 +118,9 @@ Mod_LoadAllSkins (int numskins, daliasskintype_t *pskintype, int *pskinindex)
 
 			for (gnum = 0; gnum < groupskins; gnum++) {
 				paliasskingroup->skindescs[gnum].type = ALIAS_SKIN_SINGLE;
-				skin = mod_funcs->Mod_LoadSkin (skin, skinsize, snum, gnum,
-									true, &paliasskingroup->skindescs[gnum]);
+				skin = mod_funcs->Mod_LoadSkin (mod, skin, skinsize, snum,
+												gnum, true,
+											&paliasskingroup->skindescs[gnum]);
 			}
 		}
 		pskintype = (daliasskintype_t *) skin;
@@ -127,9 +129,9 @@ Mod_LoadAllSkins (int numskins, daliasskintype_t *pskintype, int *pskinindex)
 	return pskintype;
 }
 
-void *
-Mod_LoadAliasFrame (void *pin, int *posenum, maliasframedesc_t *frame,
-					int extra)
+static void *
+Mod_LoadAliasFrame (model_t *mod, void *pin, int *posenum,
+					maliasframedesc_t *frame, int extra)
 {
 	daliasframe_t  *pdaliasframe;
 	trivertx_t	   *pinframe;
@@ -159,9 +161,9 @@ Mod_LoadAliasFrame (void *pin, int *posenum, maliasframedesc_t *frame,
 	return pinframe;
 }
 
-void *
-Mod_LoadAliasGroup (void *pin, int *posenum, maliasframedesc_t *frame,
-					int extra)
+static void *
+Mod_LoadAliasGroup (model_t *mod, void *pin, int *posenum,
+					maliasframedesc_t *frame, int extra)
 {
 	daliasgroup_t	 *pingroup;
 	daliasinterval_t *pin_intervals;
@@ -178,7 +180,7 @@ Mod_LoadAliasGroup (void *pin, int *posenum, maliasframedesc_t *frame,
 	frame->numposes = numframes;
 
 	paliasgroup = Hunk_AllocName (field_offset (maliasgroup_t,
-												frames[numframes]), loadname);
+												frames[numframes]), mod->name);
 	paliasgroup->numframes = numframes;
 	frame->frame = (byte *) paliasgroup - (byte *) pheader;
 
@@ -189,7 +191,7 @@ Mod_LoadAliasGroup (void *pin, int *posenum, maliasframedesc_t *frame,
 	VectorCompMax (frame->bboxmax.v, aliasbboxmaxs, aliasbboxmaxs);
 
 	pin_intervals = (daliasinterval_t *) (pingroup + 1);
-	poutintervals = Hunk_AllocName (numframes * sizeof (float), loadname);
+	poutintervals = Hunk_AllocName (numframes * sizeof (float), mod->name);
 	paliasgroup->intervals = (byte *) poutintervals - (byte *) pheader;
 	frame->interval = LittleFloat (pin_intervals->interval);
 	for (i = 0; i < numframes; i++) {
@@ -203,7 +205,7 @@ Mod_LoadAliasGroup (void *pin, int *posenum, maliasframedesc_t *frame,
 	ptemp = (void *) pin_intervals;
 	for (i = 0; i < numframes; i++) {
 		maliasframedesc_t temp_frame;
-		ptemp = Mod_LoadAliasFrame (ptemp, posenum, &temp_frame, extra);
+		ptemp = Mod_LoadAliasFrame (mod, ptemp, posenum, &temp_frame, extra);
 		memcpy (&paliasgroup->frames[i], &temp_frame,
 				sizeof (paliasgroup->frames[i]));
 	}
@@ -242,7 +244,7 @@ Mod_LoadAliasModel (model_t *mod, void *buffer, cache_allocator_t allocator)
 	// allocate space for a working header, plus all the data except the
 	// frames, skin and group info
 	size = field_offset (aliashdr_t, frames[LittleLong (pinmodel->numframes)]);
-	pheader = Hunk_AllocName (size, loadname);
+	pheader = Hunk_AllocName (size, mod->name);
 	memset (pheader, 0, size);
 	pmodel = &pheader->mdl;
 	pheader->model = (byte *) pmodel - (byte *) pheader;
@@ -294,7 +296,7 @@ Mod_LoadAliasModel (model_t *mod, void *buffer, cache_allocator_t allocator)
 
 	// load the skins
 	pskintype = (daliasskintype_t *) &pinmodel[1];
-	pskintype = Mod_LoadAllSkins (pheader->mdl.numskins, pskintype,
+	pskintype = Mod_LoadAllSkins (mod, pheader->mdl.numskins, pskintype,
 								  &pheader->skindesc);
 
 	// load base s and t vertices
@@ -332,11 +334,11 @@ Mod_LoadAliasModel (model_t *mod, void *buffer, cache_allocator_t allocator)
 
 		if (frametype == ALIAS_SINGLE) {
 			pframetype = (daliasframetype_t *)
-				Mod_LoadAliasFrame (pframetype + 1, &posenum,
+				Mod_LoadAliasFrame (mod, pframetype + 1, &posenum,
 									&pheader->frames[i], extra);
 		} else {
 			pframetype = (daliasframetype_t *)
-				Mod_LoadAliasGroup (pframetype + 1, &posenum,
+				Mod_LoadAliasGroup (mod, pframetype + 1, &posenum,
 									&pheader->frames[i], extra);
 		}
 	}
@@ -367,7 +369,7 @@ Mod_LoadAliasModel (model_t *mod, void *buffer, cache_allocator_t allocator)
 		end = Hunk_LowMark ();
 		total = end - start;
 
-		mem = allocator (&mod->cache, total, loadname);
+		mem = allocator (&mod->cache, total, mod->name);
 		if (mem)
 			memcpy (mem, pheader, total);
 
diff --git a/libs/models/alias/sw_model_alias.c b/libs/models/alias/sw_model_alias.c
index e021278a4..61122298b 100644
--- a/libs/models/alias/sw_model_alias.c
+++ b/libs/models/alias/sw_model_alias.c
@@ -50,12 +50,12 @@
 
 
 void *
-sw_Mod_LoadSkin (byte *skin, int skinsize, int snum, int gnum,
+sw_Mod_LoadSkin (model_t *mod, byte *skin, int skinsize, int snum, int gnum,
 				 qboolean group, maliasskindesc_t *skindesc)
 {
 	byte		*pskin;
 
-	pskin = Hunk_AllocName (skinsize, loadname);
+	pskin = Hunk_AllocName (skinsize, mod->name);
 	skindesc->skin = (byte *) pskin - (byte *) pheader;
 
 	memcpy (pskin, skin, skinsize);
@@ -64,7 +64,7 @@ sw_Mod_LoadSkin (byte *skin, int skinsize, int snum, int gnum,
 }
 
 static void
-process_frame (maliasframedesc_t *frame, int posenum, int extra)
+process_frame (model_t *mod, maliasframedesc_t *frame, int posenum, int extra)
 {
 	int         size = pheader->mdl.numverts * sizeof (trivertx_t);
 	trivertx_t *frame_verts;
@@ -72,7 +72,7 @@ process_frame (maliasframedesc_t *frame, int posenum, int extra)
 	if (extra)
 		size *= 2;
 
-	frame_verts = Hunk_AllocName (size, loadname);
+	frame_verts = Hunk_AllocName (size, mod->name);
 	frame->frame = (byte *) frame_verts - (byte *) pheader;
 
 	// The low-order 8 bits (actually, fractional) are completely separate
@@ -83,7 +83,7 @@ process_frame (maliasframedesc_t *frame, int posenum, int extra)
 }
 
 void
-sw_Mod_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr, void *_m,
+sw_Mod_MakeAliasModelDisplayLists (model_t *mod, aliashdr_t *hdr, void *_m,
 								   int _s, int extra)
 {
 	int			 i, j;
@@ -93,9 +93,9 @@ sw_Mod_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr, void *_m,
 	mtriangle_t *ptri;
 
 	pstverts = (stvert_t *) Hunk_AllocName (numv * sizeof (stvert_t),
-											loadname);
+											mod->name);
 	ptri = (mtriangle_t *) Hunk_AllocName (numt * sizeof (mtriangle_t),
-										   loadname);
+										   mod->name);
 
 	hdr->stverts = (byte *) pstverts - (byte *) hdr;
 	hdr->triangles = (byte *) ptri - (byte *) hdr;
@@ -117,16 +117,16 @@ sw_Mod_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr, void *_m,
 			maliasgroup_t *group;
 			group = (maliasgroup_t *) ((byte *) pheader + frame->frame);
 			for (j = 0; j < group->numframes; j++)
-				process_frame ((maliasframedesc_t *) &group->frames[j],
+				process_frame (mod, (maliasframedesc_t *) &group->frames[j],
 							   posenum++, extra);
 		} else {
-			process_frame (frame, posenum++, extra);
+			process_frame (mod, frame, posenum++, extra);
 		}
 	}
 }
 
 void
-sw_Mod_FinalizeAliasModel (model_t *m, aliashdr_t *hdr)
+sw_Mod_FinalizeAliasModel (model_t *mod, aliashdr_t *hdr)
 {
 }
 
diff --git a/libs/models/alias/vulkan_model_alias.c b/libs/models/alias/vulkan_model_alias.c
index 07c63bee1..97e8a63d0 100644
--- a/libs/models/alias/vulkan_model_alias.c
+++ b/libs/models/alias/vulkan_model_alias.c
@@ -110,8 +110,8 @@ vulkan_alias_clear (model_t *m, void *data)
 }
 
 void *
-Vulkan_Mod_LoadSkin (byte *skinpix, int skinsize, int snum, int gnum,
-				     qboolean group, maliasskindesc_t *skindesc,
+Vulkan_Mod_LoadSkin (model_t *mod, byte *skinpix, int skinsize, int snum,
+					 int gnum, qboolean group, maliasskindesc_t *skindesc,
 					 vulkan_ctx_t *ctx)
 {
 	aliasskin_t *skin;
@@ -131,25 +131,25 @@ Vulkan_Mod_LoadSkin (byte *skinpix, int skinsize, int snum, int gnum,
 	if (Mod_CalcFullbright (tskin, tskin + skinsize, skinsize)) {
 		skin->glow = Vulkan_LoadTex (ctx, &skin_tex, 1,
 									 va (ctx->va_ctx, "%s:%d:%d:glow",
-										 loadmodel->name, snum, gnum));
+										 mod->name, snum, gnum));
 		Mod_ClearFullbright (tskin, tskin, skinsize);
 	}
 	if (Skin_CalcTopColors (tskin, tskin + skinsize, skinsize)) {
 		skin->colora = Vulkan_LoadTex (ctx, &skin_tex, 1,
 									   va (ctx->va_ctx, "%s:%d:%d:colora",
-										   loadmodel->name, snum, gnum));
+										   mod->name, snum, gnum));
 		Skin_ClearTopColors (tskin, tskin, skinsize);
 	}
 	if (Skin_CalcBottomColors (tskin, tskin + skinsize, skinsize)) {
 		skin->colorb = Vulkan_LoadTex (ctx, &skin_tex, 1,
 									   va (ctx->va_ctx, "%s:%d:%d:colorb",
-										   loadmodel->name, snum, gnum));
+										   mod->name, snum, gnum));
 		Skin_ClearBottomColors (tskin, tskin, skinsize);
 	}
 	skin_tex.data = tskin;
 	skin->tex = Vulkan_LoadTex (ctx, &skin_tex, 1,
 								va (ctx->va_ctx, "%s:%d:%d:tex",
-									loadmodel->name,
+									mod->name,
 									snum, gnum));
 
 	free (tskin);
@@ -185,7 +185,7 @@ get_buffer_size (qfv_device_t *device, VkBuffer buffer)
 }
 
 void
-Vulkan_Mod_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr, void *_m,
+Vulkan_Mod_MakeAliasModelDisplayLists (model_t *mod, aliashdr_t *hdr, void *_m,
 									   int _s, int extra, vulkan_ctx_t *ctx)
 {
 	qfv_device_t *device = ctx->device;
@@ -255,13 +255,13 @@ Vulkan_Mod_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr, void *_m,
 										  | VK_BUFFER_USAGE_INDEX_BUFFER_BIT);
 	QFV_duSetObjectName (device, VK_OBJECT_TYPE_BUFFER, vbuff,
 						 va (ctx->va_ctx, "buffer:alias:vertex:%s",
-							 loadmodel->name));
+							 mod->name));
 	QFV_duSetObjectName (device, VK_OBJECT_TYPE_BUFFER, uvbuff,
 						 va (ctx->va_ctx, "buffer:alias:uv:%s",
-							 loadmodel->name));
+							 mod->name));
 	QFV_duSetObjectName (device, VK_OBJECT_TYPE_BUFFER, ibuff,
 						 va (ctx->va_ctx, "buffer:alias:index:%s",
-							 loadmodel->name));
+							 mod->name));
 	size_t      voffs = 0;
 	size_t      uvoffs = voffs + get_buffer_size (device, vbuff);
 	size_t      ioffs = uvoffs + get_buffer_size (device, uvbuff);
@@ -272,7 +272,7 @@ Vulkan_Mod_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr, void *_m,
 								 buff_size, 0);
 	QFV_duSetObjectName (device, VK_OBJECT_TYPE_DEVICE_MEMORY, mem,
 						 va (ctx->va_ctx, "memory:alias:vuvi:%s",
-							 loadmodel->name));
+							 mod->name));
 	QFV_BindBufferMemory (device, vbuff, mem, voffs);
 	QFV_BindBufferMemory (device, uvbuff, mem, uvoffs);
 	QFV_BindBufferMemory (device, ibuff, mem, ioffs);
@@ -280,7 +280,7 @@ Vulkan_Mod_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr, void *_m,
 	qfv_stagebuf_t *stage = QFV_CreateStagingBuffer (device,
 													 va (ctx->va_ctx,
 														 "alias:%s",
-														 loadmodel->name),
+														 mod->name),
 													 buff_size, ctx->cmdpool);
 	qfv_packet_t *packet = QFV_PacketAcquire (stage);
 	verts = QFV_PacketExtend (packet, vert_size);
diff --git a/libs/models/brush/gl_model_brush.c b/libs/models/brush/gl_model_brush.c
index 878d2c344..05b3c0b94 100644
--- a/libs/models/brush/gl_model_brush.c
+++ b/libs/models/brush/gl_model_brush.c
@@ -86,7 +86,7 @@ Mod_LoadExternalTextures (model_t *mod, texture_t *tx)
 	int         external = 0;
 
 	gltx = tx->render;
-	if ((base = Mod_LoadAnExternalTexture (tx->name, mod->name))) {
+	if ((base = Mod_LoadAnExternalTexture (tx->name, mod->path))) {
 		external = 1;
 		gltx->gl_texturenum =
 			GL_LoadTexture (tx->name, base->width, base->height,
@@ -94,10 +94,10 @@ Mod_LoadExternalTextures (model_t *mod, texture_t *tx)
 							base->format > 2 ? base->format : 1);
 
 		luma = Mod_LoadAnExternalTexture (va (0, "%s_luma", tx->name),
-										  mod->name);
+										  mod->path);
 		if (!luma)
 			luma = Mod_LoadAnExternalTexture (va (0, "%s_glow", tx->name),
-											  mod->name);
+											  mod->path);
 
 		gltx->gl_fb_texturenum = 0;
 
@@ -116,7 +116,7 @@ Mod_LoadExternalTextures (model_t *mod, texture_t *tx)
 }
 
 void
-gl_Mod_ProcessTexture (texture_t *tx)
+gl_Mod_ProcessTexture (model_t *mod, texture_t *tx)
 {
 	const char *name;
 
@@ -125,7 +125,7 @@ gl_Mod_ProcessTexture (texture_t *tx)
 		return;
 	}
 	if (gl_textures_external && gl_textures_external->int_val) {
-		if (Mod_LoadExternalTextures (loadmodel, tx)) {
+		if (Mod_LoadExternalTextures (mod, tx)) {
 			return;
 		}
 	}
@@ -142,7 +142,7 @@ gl_Mod_ProcessTexture (texture_t *tx)
 }
 
 void
-gl_Mod_LoadLighting (bsp_t *bsp)
+gl_Mod_LoadLighting (model_t *mod, bsp_t *bsp)
 {
 	byte        d;
 	byte       *in, *out, *data;
@@ -151,13 +151,13 @@ gl_Mod_LoadLighting (bsp_t *bsp)
 	int         ver;
 	QFile      *lit_file;
 
-	dstring_copystr (litfilename, loadmodel->name);
-	loadmodel->lightdata = NULL;
+	dstring_copystr (litfilename, mod->path);
+	mod->lightdata = NULL;
 	if (mod_lightmap_bytes > 1) {
 		// LordHavoc: check for a .lit file to load
 		QFS_StripExtension (litfilename->str, litfilename->str);
 		dstring_appendstr (litfilename, ".lit");
-		lit_file = QFS_VOpenFile (litfilename->str, 0, loadmodel->vpath);
+		lit_file = QFS_VOpenFile (litfilename->str, 0, mod->vpath);
 		data = (byte *) QFS_LoadHunkFile (lit_file);
 		if (data) {
 			if (data[0] == 'Q' && data[1] == 'L' && data[2] == 'I'
@@ -165,7 +165,7 @@ gl_Mod_LoadLighting (bsp_t *bsp)
 				ver = LittleLong (((int32_t *) data)[1]);
 				if (ver == 1) {
 					Sys_MaskPrintf (SYS_DEV, "%s loaded", litfilename->str);
-					loadmodel->lightdata = data + 8;
+					mod->lightdata = data + 8;
 					return;
 				} else
 					Sys_MaskPrintf (SYS_DEV,
@@ -179,11 +179,10 @@ gl_Mod_LoadLighting (bsp_t *bsp)
 		dstring_delete (litfilename);
 		return;
 	}
-	loadmodel->lightdata = Hunk_AllocName (bsp->lightdatasize
-											* mod_lightmap_bytes,
-										   litfilename->str);
+	mod->lightdata = Hunk_AllocName (bsp->lightdatasize * mod_lightmap_bytes,
+									 litfilename->str);
 	in = bsp->lightdata;
-	out = loadmodel->lightdata;
+	out = mod->lightdata;
 
 	if (mod_lightmap_bytes > 1)
 		for (i = 0; i < bsp->lightdatasize ; i++) {
@@ -304,7 +303,7 @@ SubdividePolygon (int numverts, float *verts)
 	can be done reasonably.
 */
 void
-gl_Mod_SubdivideSurface (msurface_t *fa)
+gl_Mod_SubdivideSurface (model_t *mod, msurface_t *fa)
 {
 	float      *vec;
 	int         lindex, numverts, i;
@@ -315,12 +314,12 @@ gl_Mod_SubdivideSurface (msurface_t *fa)
 	// convert edges back to a normal polygon
 	numverts = 0;
 	for (i = 0; i < fa->numedges; i++) {
-		lindex = loadmodel->surfedges[fa->firstedge + i];
+		lindex = mod->surfedges[fa->firstedge + i];
 
 		if (lindex > 0)
-			vec = loadmodel->vertexes[loadmodel->edges[lindex].v[0]].position;
+			vec = mod->vertexes[mod->edges[lindex].v[0]].position;
 		else
-			vec = loadmodel->vertexes[loadmodel->edges[-lindex].v[1]].position;
+			vec = mod->vertexes[mod->edges[-lindex].v[1]].position;
 		VectorCopy (vec, verts[numverts]);
 		numverts++;
 	}
diff --git a/libs/models/brush/glsl_model_brush.c b/libs/models/brush/glsl_model_brush.c
index 23bb683ad..3a2717f57 100644
--- a/libs/models/brush/glsl_model_brush.c
+++ b/libs/models/brush/glsl_model_brush.c
@@ -101,7 +101,7 @@ load_skytex (texture_t *tx, byte *data)
 }
 
 void
-glsl_Mod_ProcessTexture (texture_t *tx)
+glsl_Mod_ProcessTexture (model_t *mod, texture_t *tx)
 {
 	if (!tx) {
 		r_notexture_mip->render = &glsl_notexture;
@@ -145,15 +145,15 @@ glsl_Mod_ProcessTexture (texture_t *tx)
 }
 
 void
-glsl_Mod_LoadLighting (bsp_t *bsp)
+glsl_Mod_LoadLighting (model_t *mod, bsp_t *bsp)
 {
 	// a bit hacky, but it's as good a place as any
-	loadmodel->clear = glsl_brush_clear;
+	mod->clear = glsl_brush_clear;
 	mod_lightmap_bytes = 1;
 	if (!bsp->lightdatasize) {
-		loadmodel->lightdata = NULL;
+		mod->lightdata = NULL;
 		return;
 	}
-	loadmodel->lightdata = Hunk_AllocName (bsp->lightdatasize, loadname);
-	memcpy (loadmodel->lightdata, bsp->lightdata, bsp->lightdatasize);
+	mod->lightdata = Hunk_AllocName (bsp->lightdatasize, mod->name);
+	memcpy (mod->lightdata, bsp->lightdata, bsp->lightdatasize);
 }
diff --git a/libs/models/brush/model_brush.c b/libs/models/brush/model_brush.c
index 24af26c95..38a33c893 100644
--- a/libs/models/brush/model_brush.c
+++ b/libs/models/brush/model_brush.c
@@ -53,8 +53,9 @@
 #include "QF/plugin/vid_render.h"
 
 #include "compat.h"
+#include "mod_internal.h"
 
-byte        mod_novis[MAX_MAP_LEAFS / 8];
+static byte mod_novis[MAX_MAP_LEAFS / 8];
 
 VISIBLE cvar_t		*gl_sky_divide; //FIXME visibility?
 VISIBLE int   mod_lightmap_bytes = 1;	//FIXME should this be visible?
@@ -122,8 +123,12 @@ Mod_DecompressVis (byte * in, model_t *model)
 VISIBLE byte *
 Mod_LeafPVS (mleaf_t *leaf, model_t *model)
 {
-	if (leaf == model->leafs)
+	if (leaf == model->leafs) {
+		if (!mod_novis[0]) {
+			memset (mod_novis, 0xff, sizeof (mod_novis));
+		}
 		return mod_novis;
+	}
 	return Mod_DecompressVis (leaf->compressed_vis, model);
 }
 
@@ -158,7 +163,7 @@ mod_unique_miptex_name (texture_t **textures, texture_t *tx, int ind)
 }
 
 static void
-Mod_LoadTextures (bsp_t *bsp)
+Mod_LoadTextures (model_t *mod, bsp_t *bsp)
 {
 	dmiptexlump_t  *m;
 	int				i, j, pixels, num, max, altmax;
@@ -167,14 +172,14 @@ Mod_LoadTextures (bsp_t *bsp)
 	texture_t	   *anims[10], *altanims[10];
 
 	if (!bsp->texdatasize) {
-		loadmodel->textures = NULL;
+		mod->textures = NULL;
 		return;
 	}
 	m = (dmiptexlump_t *) bsp->texdata;
 
-	loadmodel->numtextures = m->nummiptex;
-	loadmodel->textures = Hunk_AllocName (m->nummiptex * sizeof
-										  (*loadmodel->textures), loadname);
+	mod->numtextures = m->nummiptex;
+	mod->textures = Hunk_AllocName (m->nummiptex * sizeof (*mod->textures),
+									mod->name);
 
 	for (i = 0; i < m->nummiptex; i++) {
 		if (m->dataofs[i] == -1)
@@ -188,12 +193,12 @@ Mod_LoadTextures (bsp_t *bsp)
 		if ((mt->width & 15) || (mt->height & 15))
 			Sys_Error ("Texture %s is not 16 aligned", mt->name);
 		pixels = mt->width * mt->height / 64 * 85;
-		tx = Hunk_AllocName (sizeof (texture_t) + pixels, loadname);
+		tx = Hunk_AllocName (sizeof (texture_t) + pixels, mod->name);
 
-		loadmodel->textures[i] = tx;
+		mod->textures[i] = tx;
 
 		tx->name = strndup(mt->name, sizeof (mt->name));
-		mod_unique_miptex_name (loadmodel->textures, tx, i);
+		mod_unique_miptex_name (mod->textures, tx, i);
 		tx->width = mt->width;
 		tx->height = mt->height;
 		for (j = 0; j < MIPLEVELS; j++)
@@ -203,28 +208,28 @@ Mod_LoadTextures (bsp_t *bsp)
 		memcpy (tx + 1, mt + 1, pixels);
 
 		if (!strncmp (mt->name, "sky", 3))
-			loadmodel->skytexture = tx;
+			mod->skytexture = tx;
 	}
 	if (mod_funcs && mod_funcs->Mod_ProcessTexture) {
 		size_t      render_size = mod_funcs->texture_render_size;
 		byte       *render_data = 0;
 		if (render_size) {
 			render_data = Hunk_AllocName (m->nummiptex * render_size,
-										  loadname);
+										  mod->name);
 		}
 		for (i = 0; i < m->nummiptex; i++) {
-			tx = loadmodel->textures[i];
+			tx = mod->textures[i];
 			tx->render = render_data;
 			render_data += render_size;
-			mod_funcs->Mod_ProcessTexture (tx);
+			mod_funcs->Mod_ProcessTexture (mod, tx);
 		}
 		// signal the end of the textures
-		mod_funcs->Mod_ProcessTexture (0);
+		mod_funcs->Mod_ProcessTexture (mod, 0);
 	}
 
 	// sequence the animations
 	for (i = 0; i < m->nummiptex; i++) {
-		tx = loadmodel->textures[i];
+		tx = mod->textures[i];
 		if (!tx || tx->name[0] != '+')
 			continue;
 		if (tx->anim_next)
@@ -251,7 +256,7 @@ Mod_LoadTextures (bsp_t *bsp)
 			Sys_Error ("Bad animating texture %s", tx->name);
 
 		for (j = i + 1; j < m->nummiptex; j++) {
-			tx2 = loadmodel->textures[j];
+			tx2 = mod->textures[j];
 			if (!tx2 || tx2->name[0] != '+')
 				continue;
 			if (strcmp (tx2->name + 2, tx->name + 2))
@@ -302,29 +307,29 @@ Mod_LoadTextures (bsp_t *bsp)
 }
 
 static void
-Mod_LoadVisibility (bsp_t *bsp)
+Mod_LoadVisibility (model_t *mod, bsp_t *bsp)
 {
 	if (!bsp->visdatasize) {
-		loadmodel->visdata = NULL;
+		mod->visdata = NULL;
 		return;
 	}
-	loadmodel->visdata = Hunk_AllocName (bsp->visdatasize, loadname);
-	memcpy (loadmodel->visdata, bsp->visdata, bsp->visdatasize);
+	mod->visdata = Hunk_AllocName (bsp->visdatasize, mod->name);
+	memcpy (mod->visdata, bsp->visdata, bsp->visdatasize);
 }
 
 static void
-Mod_LoadEntities (bsp_t *bsp)
+Mod_LoadEntities (model_t *mod, bsp_t *bsp)
 {
 	if (!bsp->entdatasize) {
-		loadmodel->entities = NULL;
+		mod->entities = NULL;
 		return;
 	}
-	loadmodel->entities = Hunk_AllocName (bsp->entdatasize, loadname);
-	memcpy (loadmodel->entities, bsp->entdata, bsp->entdatasize);
+	mod->entities = Hunk_AllocName (bsp->entdatasize, mod->name);
+	memcpy (mod->entities, bsp->entdata, bsp->entdatasize);
 }
 
 static void
-Mod_LoadVertexes (bsp_t *bsp)
+Mod_LoadVertexes (model_t *mod, bsp_t *bsp)
 {
 	dvertex_t  *in;
 	int         count, i;
@@ -332,27 +337,27 @@ Mod_LoadVertexes (bsp_t *bsp)
 
 	in = bsp->vertexes;
 	count = bsp->numvertexes;
-	out = Hunk_AllocName (count * sizeof (*out), loadname);
+	out = Hunk_AllocName (count * sizeof (*out), mod->name);
 
-	loadmodel->vertexes = out;
-	loadmodel->numvertexes = count;
+	mod->vertexes = out;
+	mod->numvertexes = count;
 
 	for (i = 0; i < count; i++, in++, out++)
 		VectorCopy (in->point, out->position);
 }
 
 static void
-Mod_LoadSubmodels (bsp_t *bsp)
+Mod_LoadSubmodels (model_t *mod, bsp_t *bsp)
 {
 	dmodel_t   *in, *out;
 	int         count, i, j;
 
 	in = bsp->models;
 	count = bsp->nummodels;
-	out = Hunk_AllocName (count * sizeof (*out), loadname);
+	out = Hunk_AllocName (count * sizeof (*out), mod->name);
 
-	loadmodel->submodels = out;
-	loadmodel->numsubmodels = count;
+	mod->submodels = out;
+	mod->numsubmodels = count;
 
 	for (i = 0; i < count; i++, in++, out++) {
 		static vec3_t offset = {1, 1, 1};
@@ -367,11 +372,11 @@ Mod_LoadSubmodels (bsp_t *bsp)
 		out->numfaces = in->numfaces;
 	}
 
-	out = loadmodel->submodels;
+	out = mod->submodels;
 
 	if (out->visleafs > MAX_MAP_LEAFS) {
 		Sys_Error ("Mod_LoadSubmodels: too many visleafs (%d, max = %d) in %s",
-				   out->visleafs, MAX_MAP_LEAFS, loadmodel->name);
+				   out->visleafs, MAX_MAP_LEAFS, mod->path);
 	}
 
 	if (out->visleafs > 8192)
@@ -381,7 +386,7 @@ Mod_LoadSubmodels (bsp_t *bsp)
 }
 
 static void
-Mod_LoadEdges (bsp_t *bsp)
+Mod_LoadEdges (model_t *mod, bsp_t *bsp)
 {
 	dedge_t    *in;
 	int         count, i;
@@ -389,10 +394,10 @@ Mod_LoadEdges (bsp_t *bsp)
 
 	in = bsp->edges;
 	count = bsp->numedges;
-	out = Hunk_AllocName ((count + 1) * sizeof (*out), loadname);
+	out = Hunk_AllocName ((count + 1) * sizeof (*out), mod->name);
 
-	loadmodel->edges = out;
-	loadmodel->numedges = count;
+	mod->edges = out;
+	mod->numedges = count;
 
 	for (i = 0; i < count; i++, in++, out++) {
 		out->v[0] = in->v[0];
@@ -401,7 +406,7 @@ Mod_LoadEdges (bsp_t *bsp)
 }
 
 static void
-Mod_LoadTexinfo (bsp_t *bsp)
+Mod_LoadTexinfo (model_t *mod, bsp_t *bsp)
 {
 	float       len1, len2;
 	int         count, miptex, i, j;
@@ -410,10 +415,10 @@ Mod_LoadTexinfo (bsp_t *bsp)
 
 	in = bsp->texinfo;
 	count = bsp->numtexinfo;
-	out = Hunk_AllocName (count * sizeof (*out), loadname);
+	out = Hunk_AllocName (count * sizeof (*out), mod->name);
 
-	loadmodel->texinfo = out;
-	loadmodel->numtexinfo = count;
+	mod->texinfo = out;
+	mod->numtexinfo = count;
 
 	for (i = 0; i < count; i++, in++, out++) {
 		for (j = 0; j < 4; j++) {
@@ -436,13 +441,13 @@ Mod_LoadTexinfo (bsp_t *bsp)
 		miptex = in->miptex;
 		out->flags = in->flags;
 
-		if (!loadmodel->textures) {
+		if (!mod->textures) {
 			out->texture = r_notexture_mip;	// checkerboard texture
 			out->flags = 0;
 		} else {
-			if (miptex >= loadmodel->numtextures)
-				Sys_Error ("miptex >= loadmodel->numtextures");
-			out->texture = loadmodel->textures[miptex];
+			if (miptex >= mod->numtextures)
+				Sys_Error ("miptex >= mod->numtextures");
+			out->texture = mod->textures[miptex];
 			if (!out->texture) {
 				out->texture = r_notexture_mip;	// texture not found
 				out->flags = 0;
@@ -457,7 +462,7 @@ Mod_LoadTexinfo (bsp_t *bsp)
 	Fills in s->texturemins[] and s->extents[]
 */
 static void
-CalcSurfaceExtents (msurface_t *s)
+CalcSurfaceExtents (model_t *mod, msurface_t *s)
 {
 	float		mins[2], maxs[2], val;
 	int			e, i, j;
@@ -471,11 +476,11 @@ CalcSurfaceExtents (msurface_t *s)
 	tex = s->texinfo;
 
 	for (i = 0; i < s->numedges; i++) {
-		e = loadmodel->surfedges[s->firstedge + i];
+		e = mod->surfedges[s->firstedge + i];
 		if (e >= 0)
-			v = &loadmodel->vertexes[loadmodel->edges[e].v[0]];
+			v = &mod->vertexes[mod->edges[e].v[0]];
 		else
-			v = &loadmodel->vertexes[loadmodel->edges[-e].v[1]];
+			v = &mod->vertexes[mod->edges[-e].v[1]];
 
 		for (j = 0; j < 2; j++) {
 			val = v->position[0] * tex->vecs[j][0] +
@@ -502,7 +507,7 @@ CalcSurfaceExtents (msurface_t *s)
 }
 
 static void
-Mod_LoadFaces (bsp_t *bsp)
+Mod_LoadFaces (model_t *mod, bsp_t *bsp)
 {
 	dface_t    *in;
 	int			count, planenum, side, surfnum, i;
@@ -510,15 +515,15 @@ Mod_LoadFaces (bsp_t *bsp)
 
 	in = bsp->faces;
 	count = bsp->numfaces;
-	out = Hunk_AllocName (count * sizeof (*out), loadname);
+	out = Hunk_AllocName (count * sizeof (*out), mod->name);
 
 	if (count > 32767) {
 		Sys_MaskPrintf (SYS_WARN,
 						"%i faces exceeds standard limit of 32767.\n", count);
 	}
 
-	loadmodel->surfaces = out;
-	loadmodel->numsurfaces = count;
+	mod->surfaces = out;
+	mod->numsurfaces = count;
 
 	for (surfnum = 0; surfnum < count; surfnum++, in++, out++) {
 		out->firstedge = in->firstedge;
@@ -530,11 +535,11 @@ Mod_LoadFaces (bsp_t *bsp)
 		if (side)
 			out->flags |= SURF_PLANEBACK;
 
-		out->plane = loadmodel->planes + planenum;
+		out->plane = mod->planes + planenum;
 
-		out->texinfo = loadmodel->texinfo + in->texinfo;
+		out->texinfo = mod->texinfo + in->texinfo;
 
-		CalcSurfaceExtents (out);
+		CalcSurfaceExtents (mod, out);
 
 		// lighting info
 
@@ -544,7 +549,7 @@ Mod_LoadFaces (bsp_t *bsp)
 		if (i == -1)
 			out->samples = NULL;
 		else
-			out->samples = loadmodel->lightdata + (i * mod_lightmap_bytes);
+			out->samples = mod->lightdata + (i * mod_lightmap_bytes);
 
 		// set the drawing flags flag
 		if (!out->texinfo->texture || !out->texinfo->texture->name)
@@ -554,7 +559,7 @@ Mod_LoadFaces (bsp_t *bsp)
 			out->flags |= (SURF_DRAWSKY | SURF_DRAWTILED);
 			if (gl_sky_divide && gl_sky_divide->int_val)
 				if (mod_funcs && mod_funcs->Mod_SubdivideSurface)
-					mod_funcs->Mod_SubdivideSurface (out);
+					mod_funcs->Mod_SubdivideSurface (mod, out);
 			continue;
 		}
 
@@ -568,7 +573,7 @@ Mod_LoadFaces (bsp_t *bsp)
 			}
 			if (mod_funcs && mod_funcs->Mod_SubdivideSurface) {
 				// cut up polygon for warps
-				mod_funcs->Mod_SubdivideSurface (out);
+				mod_funcs->Mod_SubdivideSurface (mod, out);
 			}
 			continue;
 		}
@@ -586,7 +591,7 @@ Mod_SetParent (mnode_t *node, mnode_t *parent)
 }
 
 static void
-Mod_LoadNodes (bsp_t *bsp)
+Mod_LoadNodes (model_t *mod, bsp_t *bsp)
 {
 	dnode_t    *in;
 	int			count, i, j, p;
@@ -594,15 +599,15 @@ Mod_LoadNodes (bsp_t *bsp)
 
 	in = bsp->nodes;
 	count = bsp->numnodes;
-	out = Hunk_AllocName (count * sizeof (*out), loadname);
+	out = Hunk_AllocName (count * sizeof (*out), mod->name);
 
 	if (count > 32767) {
 		Sys_MaskPrintf (SYS_WARN,
 						"%i nodes exceeds standard limit of 32767.\n", count);
 	}
 
-	loadmodel->nodes = out;
-	loadmodel->numnodes = count;
+	mod->nodes = out;
+	mod->numnodes = count;
 
 	for (i = 0; i < count; i++, in++, out++) {
 		for (j = 0; j < 3; j++) {
@@ -611,7 +616,7 @@ Mod_LoadNodes (bsp_t *bsp)
 		}
 
 		p = in->planenum;
-		out->plane = loadmodel->planes + p;
+		out->plane = mod->planes + p;
 
 		out->firstsurface = in->firstface;
 		out->numsurfaces = in->numfaces;
@@ -620,27 +625,27 @@ Mod_LoadNodes (bsp_t *bsp)
 			p = in->children[j];
 			// this check is for extended bsp 29 files
 			if (p >= 0) {
-				out->children[j] = loadmodel->nodes + p;
+				out->children[j] = mod->nodes + p;
 			} else {
 				p = ~p;
-				if (p < loadmodel->numleafs) {
-					out->children[j] = (mnode_t *) (loadmodel->leafs + p);
+				if (p < mod->numleafs) {
+					out->children[j] = (mnode_t *) (mod->leafs + p);
 				} else {
 					Sys_Printf ("Mod_LoadNodes: invalid leaf index %i "
 								"(file has only %i leafs)\n", p,
-								loadmodel->numleafs);
+								mod->numleafs);
 					//map it to the solid leaf
-					out->children[j] = (mnode_t *)(loadmodel->leafs);
+					out->children[j] = (mnode_t *)(mod->leafs);
 				}
 			}
 		}
 	}
 
-	Mod_SetParent (loadmodel->nodes, NULL);	// sets nodes and leafs
+	Mod_SetParent (mod->nodes, NULL);	// sets nodes and leafs
 }
 
 static void
-Mod_LoadLeafs (bsp_t *bsp)
+Mod_LoadLeafs (model_t *mod, bsp_t *bsp)
 {
 	dleaf_t    *in;
 	int			count, i, j, p;
@@ -649,13 +654,13 @@ Mod_LoadLeafs (bsp_t *bsp)
 
 	in = bsp->leafs;
 	count = bsp->numleafs;
-	out = Hunk_AllocName (count * sizeof (*out), loadname);
+	out = Hunk_AllocName (count * sizeof (*out), mod->name);
 
-	loadmodel->leafs = out;
-	loadmodel->numleafs = count;
+	mod->leafs = out;
+	mod->numleafs = count;
 //	snprintf(s, sizeof (s), "maps/%s.bsp",
 //	Info_ValueForKey(cl.serverinfo,"map"));
-	if (!strncmp ("maps/", loadmodel->name, 5))
+	if (!strncmp ("maps/", mod->path, 5))
 		isnotmap = false;
 	for (i = 0; i < count; i++, in++, out++) {
 		for (j = 0; j < 3; j++) {
@@ -666,14 +671,14 @@ Mod_LoadLeafs (bsp_t *bsp)
 		p = in->contents;
 		out->contents = p;
 
-		out->firstmarksurface = loadmodel->marksurfaces + in->firstmarksurface;
+		out->firstmarksurface = mod->marksurfaces + in->firstmarksurface;
 		out->nummarksurfaces = in->nummarksurfaces;
 
 		p = in->visofs;
 		if (p == -1)
 			out->compressed_vis = NULL;
 		else
-			out->compressed_vis = loadmodel->visdata + p;
+			out->compressed_vis = mod->visdata + p;
 		out->efrags = NULL;
 
 		for (j = 0; j < 4; j++)
@@ -692,7 +697,7 @@ Mod_LoadLeafs (bsp_t *bsp)
 }
 
 static void
-Mod_LoadClipnodes (bsp_t *bsp)
+Mod_LoadClipnodes (model_t *mod, bsp_t *bsp)
 {
 	dclipnode_t *in;
 	mclipnode_t *out;
@@ -701,7 +706,7 @@ Mod_LoadClipnodes (bsp_t *bsp)
 
 	in = bsp->clipnodes;
 	count = bsp->numclipnodes;
-	out = Hunk_AllocName (count * sizeof (*out), loadname);
+	out = Hunk_AllocName (count * sizeof (*out), mod->name);
 
 	if (count > 32767) {
 		Sys_MaskPrintf (SYS_WARN,
@@ -709,15 +714,15 @@ Mod_LoadClipnodes (bsp_t *bsp)
 						count);
 	}
 
-	loadmodel->clipnodes = out;
-	loadmodel->numclipnodes = count;
+	mod->clipnodes = out;
+	mod->numclipnodes = count;
 
-	hull = &loadmodel->hulls[1];
-	loadmodel->hull_list[1] = hull;
+	hull = &mod->hulls[1];
+	mod->hull_list[1] = hull;
 	hull->clipnodes = out;
 	hull->firstclipnode = 0;
 	hull->lastclipnode = count - 1;
-	hull->planes = loadmodel->planes;
+	hull->planes = mod->planes;
 	hull->clip_mins[0] = -16;
 	hull->clip_mins[1] = -16;
 	hull->clip_mins[2] = -24;
@@ -725,12 +730,12 @@ Mod_LoadClipnodes (bsp_t *bsp)
 	hull->clip_maxs[1] = 16;
 	hull->clip_maxs[2] = 32;
 
-	hull = &loadmodel->hulls[2];
-	loadmodel->hull_list[2] = hull;
+	hull = &mod->hulls[2];
+	mod->hull_list[2] = hull;
 	hull->clipnodes = out;
 	hull->firstclipnode = 0;
 	hull->lastclipnode = count - 1;
-	hull->planes = loadmodel->planes;
+	hull->planes = mod->planes;
 	hull->clip_mins[0] = -32;
 	hull->clip_mins[1] = -32;
 	hull->clip_mins[2] = -24;
@@ -740,7 +745,7 @@ Mod_LoadClipnodes (bsp_t *bsp)
 
 	for (i = 0; i < count; i++, out++, in++) {
 		out->planenum = in->planenum;
-		if (out->planenum < 0 || out->planenum >= loadmodel->numplanes)
+		if (out->planenum < 0 || out->planenum >= mod->numplanes)
 			Sys_Error ("Mod_LoadClipnodes: planenum out of bounds");
 		out->children[0] = in->children[0];
 		out->children[1] = in->children[1];
@@ -765,39 +770,39 @@ Mod_LoadClipnodes (bsp_t *bsp)
 	Replicate the drawing hull structure as a clipping hull
 */
 static void
-Mod_MakeHull0 (void)
+Mod_MakeHull0 (model_t *mod)
 {
 	mclipnode_t *out;
 	hull_t		*hull;
 	int			 count, i, j;
 	mnode_t		*in, *child;
 
-	hull = &loadmodel->hulls[0];
-	loadmodel->hull_list[0] = hull;
+	hull = &mod->hulls[0];
+	mod->hull_list[0] = hull;
 
-	in = loadmodel->nodes;
-	count = loadmodel->numnodes;
-	out = Hunk_AllocName (count * sizeof (*out), loadname);
+	in = mod->nodes;
+	count = mod->numnodes;
+	out = Hunk_AllocName (count * sizeof (*out), mod->name);
 
 	hull->clipnodes = out;
 	hull->firstclipnode = 0;
 	hull->lastclipnode = count - 1;
-	hull->planes = loadmodel->planes;
+	hull->planes = mod->planes;
 
 	for (i = 0; i < count; i++, out++, in++) {
-		out->planenum = in->plane - loadmodel->planes;
+		out->planenum = in->plane - mod->planes;
 		for (j = 0; j < 2; j++) {
 			child = in->children[j];
 			if (child->contents < 0)
 				out->children[j] = child->contents;
 			else
-				out->children[j] = child - loadmodel->nodes;
+				out->children[j] = child - mod->nodes;
 		}
 	}
 }
 
 static void
-Mod_LoadMarksurfaces (bsp_t *bsp)
+Mod_LoadMarksurfaces (model_t *mod, bsp_t *bsp)
 {
 	int			 count, i, j;
 	msurface_t **out;
@@ -805,7 +810,7 @@ Mod_LoadMarksurfaces (bsp_t *bsp)
 
 	in = bsp->marksurfaces;
 	count = bsp->nummarksurfaces;
-	out = Hunk_AllocName (count * sizeof (*out), loadname);
+	out = Hunk_AllocName (count * sizeof (*out), mod->name);
 
 	if (count > 32767) {
 		Sys_MaskPrintf (SYS_WARN,
@@ -813,19 +818,19 @@ Mod_LoadMarksurfaces (bsp_t *bsp)
 						count);
 	}
 
-	loadmodel->marksurfaces = out;
-	loadmodel->nummarksurfaces = count;
+	mod->marksurfaces = out;
+	mod->nummarksurfaces = count;
 
 	for (i = 0; i < count; i++) {
 		j = in[i];
-		if (j >= loadmodel->numsurfaces)
+		if (j >= mod->numsurfaces)
 			Sys_Error ("Mod_ParseMarksurfaces: bad surface number");
-		out[i] = loadmodel->surfaces + j;
+		out[i] = mod->surfaces + j;
 	}
 }
 
 static void
-Mod_LoadSurfedges (bsp_t *bsp)
+Mod_LoadSurfedges (model_t *mod, bsp_t *bsp)
 {
 	int          count, i;
 	int32_t     *in;
@@ -833,17 +838,17 @@ Mod_LoadSurfedges (bsp_t *bsp)
 
 	in = bsp->surfedges;
 	count = bsp->numsurfedges;
-	out = Hunk_AllocName (count * sizeof (*out), loadname);
+	out = Hunk_AllocName (count * sizeof (*out), mod->name);
 
-	loadmodel->surfedges = out;
-	loadmodel->numsurfedges = count;
+	mod->surfedges = out;
+	mod->numsurfedges = count;
 
 	for (i = 0; i < count; i++)
 		out[i] = in[i];
 }
 
 static void
-Mod_LoadPlanes (bsp_t *bsp)
+Mod_LoadPlanes (model_t *mod, bsp_t *bsp)
 {
 	dplane_t   *in;
 	int			bits, count, i, j;
@@ -851,10 +856,10 @@ Mod_LoadPlanes (bsp_t *bsp)
 
 	in = bsp->planes;
 	count = bsp->numplanes;
-	out = Hunk_AllocName (count * 2 * sizeof (*out), loadname);
+	out = Hunk_AllocName (count * 2 * sizeof (*out), mod->name);
 
-	loadmodel->planes = out;
-	loadmodel->numplanes = count;
+	mod->planes = out;
+	mod->numplanes = count;
 
 	for (i = 0; i < count; i++, in++, out++) {
 		bits = 0;
@@ -897,22 +902,22 @@ do_checksums (const bsp_t *bsp, void *_mod)
 }
 
 static void
-recurse_draw_tree (mnode_t *node, int depth)
+recurse_draw_tree (model_t *mod, mnode_t *node, int depth)
 {
 	if (!node || node->contents < 0) {
-		if (depth > loadmodel->depth)
-			loadmodel->depth = depth;
+		if (depth > mod->depth)
+			mod->depth = depth;
 		return;
 	}
-	recurse_draw_tree (node->children[0], depth + 1);
-	recurse_draw_tree (node->children[1], depth + 1);
+	recurse_draw_tree (mod, node->children[0], depth + 1);
+	recurse_draw_tree (mod, node->children[1], depth + 1);
 }
 
 static void
-Mod_FindDrawDepth (void)
+Mod_FindDrawDepth (model_t *mod)
 {
-	loadmodel->depth = 0;
-	recurse_draw_tree (loadmodel->nodes, 1);
+	mod->depth = 0;
+	recurse_draw_tree (mod, mod->nodes, 1);
 }
 
 void
@@ -922,34 +927,34 @@ Mod_LoadBrushModel (model_t *mod, void *buffer)
 	int			i, j;
 	bsp_t      *bsp;
 
-	loadmodel->type = mod_brush;
+	mod->type = mod_brush;
 
 	bsp = LoadBSPMem (buffer, qfs_filesize, do_checksums, mod);
 
 	// load into heap
-	Mod_LoadVertexes (bsp);
-	Mod_LoadEdges (bsp);
-	Mod_LoadSurfedges (bsp);
-	Mod_LoadTextures (bsp);
+	Mod_LoadVertexes (mod, bsp);
+	Mod_LoadEdges (mod, bsp);
+	Mod_LoadSurfedges (mod, bsp);
+	Mod_LoadTextures (mod, bsp);
 	if (mod_funcs && mod_funcs->Mod_LoadLighting) {
-		mod_funcs->Mod_LoadLighting (bsp);
+		mod_funcs->Mod_LoadLighting (mod, bsp);
 	}
-	Mod_LoadPlanes (bsp);
-	Mod_LoadTexinfo (bsp);
-	Mod_LoadFaces (bsp);
-	Mod_LoadMarksurfaces (bsp);
-	Mod_LoadVisibility (bsp);
-	Mod_LoadLeafs (bsp);
-	Mod_LoadNodes (bsp);
-	Mod_LoadClipnodes (bsp);
-	Mod_LoadEntities (bsp);
-	Mod_LoadSubmodels (bsp);
+	Mod_LoadPlanes (mod, bsp);
+	Mod_LoadTexinfo (mod, bsp);
+	Mod_LoadFaces (mod, bsp);
+	Mod_LoadMarksurfaces (mod, bsp);
+	Mod_LoadVisibility (mod, bsp);
+	Mod_LoadLeafs (mod, bsp);
+	Mod_LoadNodes (mod, bsp);
+	Mod_LoadClipnodes (mod, bsp);
+	Mod_LoadEntities (mod, bsp);
+	Mod_LoadSubmodels (mod, bsp);
 
 	BSP_Free(bsp);
 
-	Mod_MakeHull0 ();
+	Mod_MakeHull0 (mod);
 
-	Mod_FindDrawDepth ();
+	Mod_FindDrawDepth (mod);
 	for (i = 0; i < MAX_MAP_HULLS; i++)
 		Mod_FindClipDepth (&mod->hulls[i]);
 
@@ -984,7 +989,7 @@ Mod_LoadBrushModel (model_t *mod, void *buffer)
 			snprintf (name, sizeof (name), "*%i", i + 1);
 			model_t    *m = Mod_FindName (name);
 			*m = *mod;
-			strcpy (m->name, name);
+			strcpy (m->path, name);
 			mod = m;
 			// make sure clear is called only for the main model
 			m->clear = 0;
diff --git a/libs/models/brush/sw_model_brush.c b/libs/models/brush/sw_model_brush.c
index 1f179bab2..65a0e4e48 100644
--- a/libs/models/brush/sw_model_brush.c
+++ b/libs/models/brush/sw_model_brush.c
@@ -41,13 +41,13 @@
 #include "mod_internal.h"
 
 void
-sw_Mod_LoadLighting (bsp_t *bsp)
+sw_Mod_LoadLighting (model_t *mod, bsp_t *bsp)
 {
 	mod_lightmap_bytes = 1;
 	if (!bsp->lightdatasize) {
-		loadmodel->lightdata = NULL;
+		mod->lightdata = NULL;
 		return;
 	}
-	loadmodel->lightdata = Hunk_AllocName (bsp->lightdatasize, loadname);
-	memcpy (loadmodel->lightdata, bsp->lightdata, bsp->lightdatasize);
+	mod->lightdata = Hunk_AllocName (bsp->lightdatasize, mod->name);
+	memcpy (mod->lightdata, bsp->lightdata, bsp->lightdatasize);
 }
diff --git a/libs/models/brush/vulkan_model_brush.c b/libs/models/brush/vulkan_model_brush.c
index ea08a25a4..ce9fd1e7e 100644
--- a/libs/models/brush/vulkan_model_brush.c
+++ b/libs/models/brush/vulkan_model_brush.c
@@ -63,15 +63,15 @@
 
 static vulktex_t vulkan_notexture = { };
 
-static void vulkan_brush_clear (model_t *model, void *data)
+static void vulkan_brush_clear (model_t *mod, void *data)
 {
 	modelctx_t *mctx = data;
 	vulkan_ctx_t *ctx = mctx->ctx;
 	qfv_device_t *device = ctx->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
 
-	for (int i = 0; i < model->numtextures; i++) {
-		texture_t  *tx = model->textures[i];
+	for (int i = 0; i < mod->numtextures; i++) {
+		texture_t  *tx = mod->textures[i];
 		if (!tx) {
 			continue;
 		}
@@ -173,19 +173,19 @@ copy_mips (qfv_packet_t *packet, texture_t *tx, qfv_tex_t *tex,
 }
 
 static void
-load_textures (model_t *model, vulkan_ctx_t *ctx)
+load_textures (model_t *mod, vulkan_ctx_t *ctx)
 {
 	qfv_device_t *device = ctx->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
-	modelctx_t *mctx = model->data;
+	modelctx_t *mctx = mod->data;
 	VkImage     image = 0;
 	byte       *buffer;
 
 	size_t      image_count = 0;
 	size_t      copy_count = 0;
 	size_t      memsize = 0;
-	for (int i = 0; i < model->numtextures; i++) {
-		texture_t  *tx = model->textures[i];
+	for (int i = 0; i < mod->numtextures; i++) {
+		texture_t  *tx = mod->textures[i];
 		if (!tx) {
 			continue;
 		}
@@ -211,20 +211,18 @@ load_textures (model_t *model, vulkan_ctx_t *ctx)
 								VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT,
 								memsize, 0);
 	QFV_duSetObjectName (device, VK_OBJECT_TYPE_DEVICE_MEMORY,
-						 mem, va (ctx->va_ctx, "memory:%s:texture",
-								  loadmodel->name));
+						 mem, va (ctx->va_ctx, "memory:%s:texture", mod->name));
 	mctx->texture_memory = mem;
 
 	qfv_stagebuf_t *stage = QFV_CreateStagingBuffer (device,
 													 va (ctx->va_ctx,
-														 "brush:%s",
-														 loadmodel->name),
+														 "brush:%s", mod->name),
 													 memsize, ctx->cmdpool);
 	qfv_packet_t *packet = QFV_PacketAcquire (stage);
 	buffer = QFV_PacketExtend (packet, memsize);
 
-	for (int i = 0; i < model->numtextures; i++) {
-		texture_t  *tx = model->textures[i];
+	for (int i = 0; i < mod->numtextures; i++) {
+		texture_t  *tx = mod->textures[i];
 		byte       *palette = vid.palette32;
 		if (!tx) {
 			continue;
@@ -249,7 +247,7 @@ load_textures (model_t *model, vulkan_ctx_t *ctx)
 		QFV_duSetObjectName (device, VK_OBJECT_TYPE_IMAGE_VIEW,
 							 tex->tex->view,
 							 va (ctx->va_ctx, "iview:%s:%s:tex",
-								 loadmodel->name, tx->name));
+								 mod->name, tx->name));
 		transfer_mips (buffer + tex->tex->offset, tx + 1, tx, palette);
 		if (tex->glow) {
 			dfunc->vkBindImageMemory (device->dev, tex->glow->image, mem,
@@ -263,8 +261,7 @@ load_textures (model_t *model, vulkan_ctx_t *ctx)
 			QFV_duSetObjectName (device, VK_OBJECT_TYPE_IMAGE_VIEW,
 								 tex->glow->view,
 								 va (ctx->va_ctx, "iview:%s:%s:glow",
-									 loadmodel->name,
-									 tx->name));
+									 mod->name, tx->name));
 			transfer_mips (buffer + tex->glow->offset, tex->glow->memory, tx,
 						   palette);
 		}
@@ -278,8 +275,8 @@ load_textures (model_t *model, vulkan_ctx_t *ctx)
 
 	__auto_type barriers = QFV_AllocImageBarrierSet (image_count, malloc);
 	barriers->size = 0;
-	for (int i = 0; i < model->numtextures; i++) {
-		texture_t  *tx = model->textures[i];
+	for (int i = 0; i < mod->numtextures; i++) {
+		texture_t  *tx = mod->textures[i];
 		if (!tx) {
 			continue;
 		}
@@ -299,8 +296,8 @@ load_textures (model_t *model, vulkan_ctx_t *ctx)
 	dfunc->vkCmdPipelineBarrier (packet->cmd, stages.src, stages.dst,
 								 0, 0, 0, 0, 0,
 								 barriers->size, barriers->a);
-	for (int i = 0, j = 0; i < model->numtextures; i++) {
-		texture_t  *tx = model->textures[i];
+	for (int i = 0, j = 0; i < mod->numtextures; i++) {
+		texture_t  *tx = mod->textures[i];
 		if (!tx) {
 			continue;
 		}
@@ -330,19 +327,18 @@ load_textures (model_t *model, vulkan_ctx_t *ctx)
 }
 
 void
-Vulkan_Mod_ProcessTexture (texture_t *tx, vulkan_ctx_t *ctx)
+Vulkan_Mod_ProcessTexture (model_t *mod, texture_t *tx, vulkan_ctx_t *ctx)
 {
 	qfv_device_t *device = ctx->device;
 
 	if (!tx) {
-		modelctx_t *mctx = Hunk_AllocName (sizeof (modelctx_t),
-										   loadmodel->name);
+		modelctx_t *mctx = Hunk_AllocName (sizeof (modelctx_t), mod->name);
 		mctx->ctx = ctx;
-		loadmodel->clear = vulkan_brush_clear;
-		loadmodel->data = mctx;
+		mod->clear = vulkan_brush_clear;
+		mod->data = mctx;
 
 		r_notexture_mip->render = &vulkan_notexture;
-		load_textures (loadmodel, ctx);
+		load_textures (mod, ctx);
 		return;
 	}
 
@@ -369,7 +365,7 @@ Vulkan_Mod_ProcessTexture (texture_t *tx, vulkan_ctx_t *ctx)
 									   | VK_IMAGE_USAGE_SAMPLED_BIT);
 	QFV_duSetObjectName (device, VK_OBJECT_TYPE_IMAGE,
 						 tex->tex->image,
-						 va (ctx->va_ctx, "image:%s:%s:tex", loadmodel->name,
+						 va (ctx->va_ctx, "image:%s:%s:tex", mod->name,
 							 tx->name));
 	if (layers > 1) {
 		// skys are unlit, so no fullbrights
@@ -394,7 +390,7 @@ Vulkan_Mod_ProcessTexture (texture_t *tx, vulkan_ctx_t *ctx)
 										| VK_IMAGE_USAGE_SAMPLED_BIT);
 	QFV_duSetObjectName (device, VK_OBJECT_TYPE_IMAGE,
 						 tex->glow->image,
-						 va (ctx->va_ctx, "image:%s:%s:glow", loadmodel->name,
+						 va (ctx->va_ctx, "image:%s:%s:glow", mod->name,
 							 tx->name));
 	// store the pointer to the fullbright data: memory will never be set to
 	// actual device memory because all of the textures will be loaded in one
@@ -403,11 +399,11 @@ Vulkan_Mod_ProcessTexture (texture_t *tx, vulkan_ctx_t *ctx)
 }
 
 void
-Vulkan_Mod_LoadLighting (bsp_t *bsp, vulkan_ctx_t *ctx)
+Vulkan_Mod_LoadLighting (model_t *mod, bsp_t *bsp, vulkan_ctx_t *ctx)
 {
 	mod_lightmap_bytes = 3;
 	if (!bsp->lightdatasize) {
-		loadmodel->lightdata = NULL;
+		mod->lightdata = NULL;
 		return;
 	}
 
@@ -417,14 +413,14 @@ Vulkan_Mod_LoadLighting (bsp_t *bsp, vulkan_ctx_t *ctx)
 	int         ver;
 	QFile      *lit_file;
 
-	loadmodel->lightdata = 0;
+	mod->lightdata = 0;
 	if (mod_lightmap_bytes > 1) {
 		// LordHavoc: check for a .lit file to load
 		dstring_t  *litfilename = dstring_new ();
-		dstring_copystr (litfilename, loadmodel->name);
+		dstring_copystr (litfilename, mod->name);
 		QFS_StripExtension (litfilename->str, litfilename->str);
 		dstring_appendstr (litfilename, ".lit");
-		lit_file = QFS_VOpenFile (litfilename->str, 0, loadmodel->vpath);
+		lit_file = QFS_VOpenFile (litfilename->str, 0, mod->vpath);
 		data = (byte *) QFS_LoadHunkFile (lit_file);
 		if (data) {
 			if (data[0] == 'Q' && data[1] == 'L' && data[2] == 'I'
@@ -432,7 +428,7 @@ Vulkan_Mod_LoadLighting (bsp_t *bsp, vulkan_ctx_t *ctx)
 				ver = LittleLong (((int32_t *) data)[1]);
 				if (ver == 1) {
 					Sys_MaskPrintf (SYS_DEV, "%s loaded", litfilename->str);
-					loadmodel->lightdata = data + 8;
+					mod->lightdata = data + 8;
 				} else {
 					Sys_MaskPrintf (SYS_DEV,
 									"Unknown .lit file version (%d)\n", ver);
@@ -443,14 +439,13 @@ Vulkan_Mod_LoadLighting (bsp_t *bsp, vulkan_ctx_t *ctx)
 		}
 		dstring_delete (litfilename);
 	}
-	if (loadmodel->lightdata || !bsp->lightdatasize) {
+	if (mod->lightdata || !bsp->lightdatasize) {
 		return;
 	}
 	// LordHavoc: oh well, expand the white lighting data
-	loadmodel->lightdata = Hunk_AllocName (bsp->lightdatasize * 3,
-										   loadmodel->name);
+	mod->lightdata = Hunk_AllocName (bsp->lightdatasize * 3, mod->name);
 	in = bsp->lightdata;
-	out = loadmodel->lightdata;
+	out = mod->lightdata;
 
 	for (i = 0; i < bsp->lightdatasize ; i++) {
 		d = *in++;
diff --git a/libs/models/clip_hull.c b/libs/models/clip_hull.c
index f47c1886d..0a01b62f1 100644
--- a/libs/models/clip_hull.c
+++ b/libs/models/clip_hull.c
@@ -36,6 +36,7 @@
 #include "QF/clip_hull.h"
 #include "QF/model.h"
 
+#include "mod_internal.h"
 
 VISIBLE clip_hull_t *
 MOD_Alloc_Hull (int nodes, int planes)
diff --git a/libs/models/fullbright.c b/libs/models/fullbright.c
index 22cef6a83..8d76b9db4 100644
--- a/libs/models/fullbright.c
+++ b/libs/models/fullbright.c
@@ -31,7 +31,7 @@
 # include "config.h"
 #endif
 
-#include "r_local.h"
+#include "mod_internal.h"
 
 VISIBLE int
 Mod_CalcFullbright (const byte *in, byte *out, int pixels)
diff --git a/libs/models/gl_model_fullbright.c b/libs/models/gl_model_fullbright.c
index f319581ae..ef94e59ca 100644
--- a/libs/models/gl_model_fullbright.c
+++ b/libs/models/gl_model_fullbright.c
@@ -38,7 +38,7 @@
 #include "QF/qendian.h"
 #include "QF/sys.h"
 
-#include "r_local.h"
+#include "mod_internal.h"
 
 int
 Mod_Fullbright (byte *skin, int width, int height, const char *name)
diff --git a/libs/models/iqm/model_iqm.c b/libs/models/iqm/model_iqm.c
index 4940da557..1091ee7d9 100644
--- a/libs/models/iqm/model_iqm.c
+++ b/libs/models/iqm/model_iqm.c
@@ -497,25 +497,25 @@ Mod_LoadIQM (model_t *mod, void *buffer)
 	uint32_t   *swap;
 
 	if (!strequal (hdr->magic, IQM_MAGIC))
-		Sys_Error ("%s: not an IQM", loadname);
+		Sys_Error ("%s: not an IQM", mod->path);
 	// Byte swap the header. Everything is the same type, so no problem :)
 	for (swap = &hdr->version; swap <= &hdr->ofs_extensions; swap++)
 		*swap = LittleLong (*swap);
 	//if (hdr->version < 1 || hdr->version > IQM_VERSION)
 	if (hdr->version != IQM_VERSION)
-		Sys_Error ("%s: unable to handle iqm version %d", loadname,
+		Sys_Error ("%s: unable to handle iqm version %d", mod->path,
 				   hdr->version);
 	if (hdr->filesize != (uint32_t) qfs_filesize)
-		Sys_Error ("%s: invalid filesize", loadname);
+		Sys_Error ("%s: invalid filesize", mod->path);
 	iqm = calloc (1, sizeof (iqm_t));
 	iqm->text = malloc (hdr->num_text);
 	memcpy (iqm->text, (byte *) buffer + hdr->ofs_text, hdr->num_text);
 	mod->aliashdr = (aliashdr_t *) iqm;
 	mod->type = mod_iqm;
 	if (hdr->num_meshes && !load_iqm_meshes (mod, hdr, (byte *) buffer))
-		Sys_Error ("%s: error loading meshes", loadname);
+		Sys_Error ("%s: error loading meshes", mod->path);
 	if (hdr->num_anims && !load_iqm_anims (mod, hdr, (byte *) buffer))
-		Sys_Error ("%s: error loading anims", loadname);
+		Sys_Error ("%s: error loading anims", mod->path);
 	m_funcs->Mod_IQMFinish (mod);
 }
 
diff --git a/libs/models/model.c b/libs/models/model.c
index 8c5036278..7eb606930 100644
--- a/libs/models/model.c
+++ b/libs/models/model.c
@@ -48,12 +48,10 @@
 #include "QF/plugin/vid_render.h"
 
 #include "compat.h"
+#include "mod_internal.h"
 
 vid_model_funcs_t *mod_funcs;
 
-model_t    *loadmodel;
-char       *loadname;					// for hunk tags
-
 #define	MOD_BLOCK	16					// allocate 16 models at a time
 model_t   **mod_known;
 int         mod_numknown;
@@ -75,7 +73,6 @@ Mod_Init (void)
 	int		m, x, y;
 	int		mip0size = 16*16, mip1size = 8*8, mip2size = 4*4, mip3size = 2*2;
 
-	memset (mod_novis, 0xff, sizeof (mod_novis));
 	r_notexture_mip = Hunk_AllocName (sizeof (texture_t) + mip0size + mip1size
 									  + mip2size + mip3size, "notexture");
 
@@ -145,7 +142,7 @@ Mod_FindName (const char *name)
 
 	// search the currently loaded models
 	for (i = 0, mod = mod_known; i < mod_numknown; i++, mod++)
-		if (!strcmp ((*mod)->name, name))
+		if (!strcmp ((*mod)->path, name))
 			break;
 
 	if (i == mod_numknown) {
@@ -158,7 +155,7 @@ Mod_FindName (const char *name)
 				mod[i] = mod[0] + i;
 		}
 		memset ((*mod), 0, sizeof (model_t));
-		strncpy ((*mod)->name, name, sizeof (*mod)->name - 1);
+		strncpy ((*mod)->path, name, sizeof (*mod)->path - 1);
 		(*mod)->needload = true;
 		mod_numknown++;
 		Cache_Add (&(*mod)->cache, *mod, Mod_CallbackLoad);
@@ -173,17 +170,17 @@ Mod_RealLoadModel (model_t *mod, qboolean crash, cache_allocator_t allocator)
 	uint32_t   *buf;
 
 	// load the file
-	buf = (uint32_t *) QFS_LoadFile (QFS_FOpenFile (mod->name), 0);
+	buf = (uint32_t *) QFS_LoadFile (QFS_FOpenFile (mod->path), 0);
 	if (!buf) {
 		if (crash)
-			Sys_Error ("Mod_LoadModel: %s not found", mod->name);
+			Sys_Error ("Mod_LoadModel: %s not found", mod->path);
 		return NULL;
 	}
 
-	if (loadname)
-		free (loadname);
-	loadname = QFS_FileBase (mod->name);
-	loadmodel = mod;
+	char *name = QFS_FileBase (mod->path);
+	strncpy (mod->name, name, sizeof (mod->name - 1));
+	mod->name[sizeof (mod->name) - 1] = 0;
+	free (name);
 
 	// fill it in
 	mod->vpath = qfs_foundfile.vpath;
@@ -204,17 +201,17 @@ Mod_RealLoadModel (model_t *mod, qboolean crash, cache_allocator_t allocator)
 			break;
 		case IDHEADER_MDL:			// Type 6: Quake 1 .mdl
 		case HEADER_MDL16:			// QF Type 6 extended for 16bit precision
-			if (strequal (mod->name, "progs/grenade.mdl")) {
+			if (strequal (mod->path, "progs/grenade.mdl")) {
 				mod->fullbright = 0;
 				mod->shadow_alpha = 255;
-			} else if (strnequal (mod->name, "progs/flame", 11)
-					   || strnequal (mod->name, "progs/bolt", 10)) {
+			} else if (strnequal (mod->path, "progs/flame", 11)
+					   || strnequal (mod->path, "progs/bolt", 10)) {
 				mod->fullbright = 1;
 				mod->shadow_alpha = 0;
 			}
-			if (strnequal (mod->name, "progs/v_", 8)) {
+			if (strnequal (mod->path, "progs/v_", 8)) {
 				mod->min_light = 0.12;
-			} else if (strequal (mod->name, "progs/player.mdl")) {
+			} else if (strequal (mod->path, "progs/player.mdl")) {
 				mod->min_light = 0.04;
 			}
 			if (mod_funcs)
@@ -309,7 +306,7 @@ Mod_Print (void)
 
 	Sys_Printf ("Cached models:\n");
 	for (i = 0, mod = mod_known; i < mod_numknown; i++, mod++) {
-		Sys_Printf ("%8p : %s\n", (*mod)->cache.data, (*mod)->name);
+		Sys_Printf ("%8p : %s\n", (*mod)->cache.data, (*mod)->path);
 	}
 }
 
diff --git a/libs/models/sprite/gl_model_sprite.c b/libs/models/sprite/gl_model_sprite.c
index 1d5d1597c..2abef1dfc 100644
--- a/libs/models/sprite/gl_model_sprite.c
+++ b/libs/models/sprite/gl_model_sprite.c
@@ -44,12 +44,13 @@
 #include "mod_internal.h"
 
 void
-gl_Mod_SpriteLoadTexture (mspriteframe_t *pspriteframe, int framenum)
+gl_Mod_SpriteLoadTexture (model_t *mod, mspriteframe_t *pspriteframe,
+						  int framenum)
 {
 	tex_t      *targa;
 	const char *name;
 
-	targa = LoadImage (name = va (0, "%s_%i", loadmodel->name, framenum), 1);
+	targa = LoadImage (name = va (0, "%s_%i", mod->path, framenum), 1);
 	if (targa) {
 		if (targa->format < 4)
 			pspriteframe->gl_texturenum = GL_LoadTexture (name,
diff --git a/libs/models/sprite/glsl_model_sprite.c b/libs/models/sprite/glsl_model_sprite.c
index 138b3d0d0..b5781124f 100644
--- a/libs/models/sprite/glsl_model_sprite.c
+++ b/libs/models/sprite/glsl_model_sprite.c
@@ -71,12 +71,13 @@ glsl_sprite_clear (model_t *m, void *data)
 }
 
 void
-glsl_Mod_SpriteLoadTexture (mspriteframe_t *pspriteframe, int framenum)
+glsl_Mod_SpriteLoadTexture (model_t *mod, mspriteframe_t *pspriteframe,
+							int framenum)
 {
 	const char *name;
 
-	loadmodel->clear = glsl_sprite_clear;
-	name = va (0, "%s_%i", loadmodel->name, framenum);
+	mod->clear = glsl_sprite_clear;
+	name = va (0, "%s_%i", mod->path, framenum);
 	pspriteframe->gl_texturenum =
 		GLSL_LoadQuakeTexture (name, pspriteframe->width, pspriteframe->height,
 							   pspriteframe->pixels);
diff --git a/libs/models/sprite/model_sprite.c b/libs/models/sprite/model_sprite.c
index ce962fec4..e4806bf6e 100644
--- a/libs/models/sprite/model_sprite.c
+++ b/libs/models/sprite/model_sprite.c
@@ -42,7 +42,8 @@
 #include "mod_internal.h"
 
 static void *
-Mod_LoadSpriteFrame (void *pin, mspriteframe_t **ppframe, int framenum)
+Mod_LoadSpriteFrame (model_t *mod, void *pin, mspriteframe_t **ppframe,
+					 int framenum)
 {
 	dspriteframe_t *pinframe;
 	int				width, height, size, origin[2];
@@ -54,7 +55,7 @@ Mod_LoadSpriteFrame (void *pin, mspriteframe_t **ppframe, int framenum)
 	height = LittleLong (pinframe->height);
 	size = width * height;
 
-	pspriteframe = Hunk_AllocName (sizeof (mspriteframe_t) + size, loadname);
+	pspriteframe = Hunk_AllocName (sizeof (mspriteframe_t) + size, mod->name);
 
 	memset (pspriteframe, 0, sizeof (mspriteframe_t) + size);
 
@@ -72,13 +73,14 @@ Mod_LoadSpriteFrame (void *pin, mspriteframe_t **ppframe, int framenum)
 
 	memcpy (pspriteframe->pixels, (byte *) (pinframe + 1), size);
 
-	m_funcs->Mod_SpriteLoadTexture (pspriteframe, framenum);
+	m_funcs->Mod_SpriteLoadTexture (mod, pspriteframe, framenum);
 
 	return (void *) ((byte *) pinframe + sizeof (dspriteframe_t) + size);
 }
 
 static void *
-Mod_LoadSpriteGroup (void *pin, mspriteframe_t **ppframe, int framenum)
+Mod_LoadSpriteGroup (model_t *mod, void *pin, mspriteframe_t **ppframe,
+					 int framenum)
 {
 	dspritegroup_t		*pingroup;
 	dspriteinterval_t	*pin_intervals;
@@ -92,7 +94,8 @@ Mod_LoadSpriteGroup (void *pin, mspriteframe_t **ppframe, int framenum)
 	numframes = LittleLong (pingroup->numframes);
 
 	pspritegroup = Hunk_AllocName (field_offset (mspritegroup_t,
-												 frames[numframes]), loadname);
+												 frames[numframes]),
+								   mod->name);
 
 	pspritegroup->numframes = numframes;
 
@@ -100,7 +103,7 @@ Mod_LoadSpriteGroup (void *pin, mspriteframe_t **ppframe, int framenum)
 
 	pin_intervals = (dspriteinterval_t *) (pingroup + 1);
 
-	poutintervals = Hunk_AllocName (numframes * sizeof (float), loadname);
+	poutintervals = Hunk_AllocName (numframes * sizeof (float), mod->name);
 
 	pspritegroup->intervals = poutintervals;
 
@@ -117,7 +120,7 @@ Mod_LoadSpriteGroup (void *pin, mspriteframe_t **ppframe, int framenum)
 
 	for (i = 0; i < numframes; i++) {
 		ptemp =
-			Mod_LoadSpriteFrame (ptemp, &pspritegroup->frames[i],
+			Mod_LoadSpriteFrame (mod, ptemp, &pspritegroup->frames[i],
 								 framenum * 100 + i);
 	}
 
@@ -136,14 +139,14 @@ Mod_LoadSpriteModel (model_t *mod, void *buffer)
 
 	version = LittleLong (pin->version);
 	if (version != SPR_VERSION)
-		Sys_Error ("%s has wrong version number "
-				  "(%i should be %i)", mod->name, version, SPR_VERSION);
+		Sys_Error ("%s has wrong version number (%i should be %i)",
+				   mod->path, version, SPR_VERSION);
 
 	numframes = LittleLong (pin->numframes);
 
 	size = field_offset (msprite_t, frames[numframes]);
 
-	psprite = Hunk_AllocName (size, loadname);
+	psprite = Hunk_AllocName (size, mod->name);
 
 	mod->cache.data = psprite;
 
@@ -175,11 +178,11 @@ Mod_LoadSpriteModel (model_t *mod, void *buffer)
 
 		if (frametype == SPR_SINGLE) {
 			pframetype = (dspriteframetype_t *)
-				Mod_LoadSpriteFrame (pframetype + 1,
+				Mod_LoadSpriteFrame (mod, pframetype + 1,
 									 &psprite->frames[i].frameptr, i);
 		} else {
 			pframetype = (dspriteframetype_t *)
-				Mod_LoadSpriteGroup (pframetype + 1,
+				Mod_LoadSpriteGroup (mod, pframetype + 1,
 									 &psprite->frames[i].frameptr, i);
 		}
 	}
diff --git a/libs/models/sprite/sw_model_sprite.c b/libs/models/sprite/sw_model_sprite.c
index 9d3f25bd2..8dc5a5461 100644
--- a/libs/models/sprite/sw_model_sprite.c
+++ b/libs/models/sprite/sw_model_sprite.c
@@ -31,6 +31,7 @@
 #include "mod_internal.h"
 
 void
-sw_Mod_SpriteLoadTexture (mspriteframe_t *pspriteframe, int framenum)
+sw_Mod_SpriteLoadTexture (model_t *mod, mspriteframe_t *pspriteframe,
+						  int framenum)
 {
 }
diff --git a/libs/video/renderer/gl/gl_dyn_part.c b/libs/video/renderer/gl/gl_dyn_part.c
index c3b0ddf68..5f510b26c 100644
--- a/libs/video/renderer/gl/gl_dyn_part.c
+++ b/libs/video/renderer/gl/gl_dyn_part.c
@@ -205,7 +205,7 @@ gl_R_ReadPointFile_f (void)
 	vec3_t      org;
 	QFile      *f;
 
-	mapname = strdup (r_worldentity.model->name);
+	mapname = strdup (r_worldentity.model->path);
 	if (!mapname)
 		Sys_Error ("Can't duplicate mapname!");
 	QFS_StripExtension (mapname, mapname);
diff --git a/libs/video/renderer/gl/gl_lightmap.c b/libs/video/renderer/gl/gl_lightmap.c
index 9dfa3df92..6eed72124 100644
--- a/libs/video/renderer/gl/gl_lightmap.c
+++ b/libs/video/renderer/gl/gl_lightmap.c
@@ -585,7 +585,7 @@ gl_overbright_f (cvar_t *var)
 
 		if (m->type != mod_brush)
 			continue;
-		if (m->name[0] == '*')
+		if (m->path[0] == '*')
 			continue;
 
 		for (j = 0, fa = m->surfaces; j < m->numsurfaces; j++, fa++) {
@@ -732,7 +732,7 @@ GL_BuildLightmaps (model_t **models, int num_models)
 		m = models[j];
 		if (!m)
 			break;
-		if (m->name[0] == '*') {
+		if (m->path[0] == '*') {
 			// sub model surfaces are processed as part of the main model
 			continue;
 		}
diff --git a/libs/video/renderer/gl/gl_rmisc.c b/libs/video/renderer/gl/gl_rmisc.c
index a47e6ba42..5946c98bd 100644
--- a/libs/video/renderer/gl/gl_rmisc.c
+++ b/libs/video/renderer/gl/gl_rmisc.c
@@ -226,7 +226,7 @@ gl_R_NewMap (model_t *worldmodel, struct model_s **models, int num_models)
 	for (i = 0; i < num_models; i++) {
 		if (!models[i])
 			continue;
-		if (*models[i]->name == '*')
+		if (*models[i]->path == '*')
 			continue;
 		if (models[i] != r_worldentity.model && models[i]->type == mod_brush)
 			register_textures (models[i]);
diff --git a/libs/video/renderer/glsl/glsl_bsp.c b/libs/video/renderer/glsl/glsl_bsp.c
index 480c647a9..8a6ee73f5 100644
--- a/libs/video/renderer/glsl/glsl_bsp.c
+++ b/libs/video/renderer/glsl/glsl_bsp.c
@@ -436,7 +436,7 @@ glsl_R_RegisterTextures (model_t **models, int num_models)
 		if (!m)
 			continue;
 		// sub-models are done as part of the main model
-		if (*m->name == '*')
+		if (*m->path == '*')
 			continue;
 		// world has already been done, not interested in non-brush models
 		if (m == r_worldentity.model || m->type != mod_brush)
@@ -561,7 +561,7 @@ glsl_R_BuildDisplayLists (model_t **models, int num_models)
 		if (!m)
 			continue;
 		// sub-models are done as part of the main model
-		if (*m->name == '*')
+		if (*m->path == '*')
 			continue;
 		// non-bsp models don't have surfaces.
 		dm = m->submodels;
diff --git a/libs/video/renderer/glsl/glsl_lightmap.c b/libs/video/renderer/glsl/glsl_lightmap.c
index b6f37142b..0776e015e 100644
--- a/libs/video/renderer/glsl/glsl_lightmap.c
+++ b/libs/video/renderer/glsl/glsl_lightmap.c
@@ -210,7 +210,7 @@ glsl_R_BuildLightmaps (model_t **models, int num_models)
 		m = models[j];
 		if (!m)
 			break;
-		if (m->name[0] == '*') {
+		if (m->path[0] == '*') {
 			// sub model surfaces are processed as part of the main model
 			continue;
 		}
@@ -231,7 +231,7 @@ glsl_R_BuildLightmaps (model_t **models, int num_models)
 		m = models[j];
 		if (!m)
 			break;
-		if (m->name[0] == '*') {
+		if (m->path[0] == '*') {
 			// sub model surfaces are processed as part of the main model
 			continue;
 		}
diff --git a/libs/video/renderer/glsl/glsl_particles.c b/libs/video/renderer/glsl/glsl_particles.c
index 5a0dcd43a..139423bb7 100644
--- a/libs/video/renderer/glsl/glsl_particles.c
+++ b/libs/video/renderer/glsl/glsl_particles.c
@@ -313,7 +313,7 @@ glsl_R_ReadPointFile_f (void)
 	vec3_t      org;
 	QFile      *f;
 
-	mapname = strdup (r_worldentity.model->name);
+	mapname = strdup (r_worldentity.model->path);
 	if (!mapname)
 		Sys_Error ("Can't duplicate mapname!");
 	QFS_StripExtension (mapname, mapname);
diff --git a/libs/video/renderer/sw/sw_ralias.c b/libs/video/renderer/sw/sw_ralias.c
index a275873d3..d28e41b04 100644
--- a/libs/video/renderer/sw/sw_ralias.c
+++ b/libs/video/renderer/sw/sw_ralias.c
@@ -106,7 +106,7 @@ R_AliasCheckBBox (void)
 	frame = currententity->frame;
 // TODO: don't repeat this check when drawing?
 	if ((frame >= pmdl->numframes) || (frame < 0)) {
-		Sys_MaskPrintf (SYS_DEV, "No such frame %d %s\n", frame, pmodel->name);
+		Sys_MaskPrintf (SYS_DEV, "No such frame %d %s\n", frame, pmodel->path);
 		frame = 0;
 	}
 
diff --git a/libs/video/renderer/sw/sw_rpart.c b/libs/video/renderer/sw/sw_rpart.c
index c05281863..a5be06453 100644
--- a/libs/video/renderer/sw/sw_rpart.c
+++ b/libs/video/renderer/sw/sw_rpart.c
@@ -83,7 +83,7 @@ R_ReadPointFile_f (void)
 	const char *name;
 	char       *mapname;
 
-	mapname = strdup (r_worldentity.model->name);
+	mapname = strdup (r_worldentity.model->path);
 	if (!mapname)
 		Sys_Error ("Can't duplicate mapname!");
 	QFS_StripExtension (mapname, mapname);
diff --git a/libs/video/renderer/sw32/sw32_ralias.c b/libs/video/renderer/sw32/sw32_ralias.c
index 167730ab1..4ead8055a 100644
--- a/libs/video/renderer/sw32/sw32_ralias.c
+++ b/libs/video/renderer/sw32/sw32_ralias.c
@@ -109,7 +109,7 @@ sw32_R_AliasCheckBBox (void)
 	frame = currententity->frame;
 // TODO: don't repeat this check when drawing?
 	if ((frame >= pmdl->numframes) || (frame < 0)) {
-		Sys_MaskPrintf (SYS_DEV, "No such frame %d %s\n", frame, pmodel->name);
+		Sys_MaskPrintf (SYS_DEV, "No such frame %d %s\n", frame, pmodel->path);
 		frame = 0;
 	}
 
diff --git a/libs/video/renderer/sw32/sw32_rpart.c b/libs/video/renderer/sw32/sw32_rpart.c
index 655467525..1364f5d1b 100644
--- a/libs/video/renderer/sw32/sw32_rpart.c
+++ b/libs/video/renderer/sw32/sw32_rpart.c
@@ -88,7 +88,7 @@ sw32_R_ReadPointFile_f (void)
 	const char *name;
 	char       *mapname;
 
-	mapname = strdup (r_worldentity.model->name);
+	mapname = strdup (r_worldentity.model->path);
 	if (!mapname)
 		Sys_Error ("Can't duplicate mapname!");
 	QFS_StripExtension (mapname, mapname);
diff --git a/libs/video/renderer/vid_render_vulkan.c b/libs/video/renderer/vid_render_vulkan.c
index fc8aebc11..3473a92cf 100644
--- a/libs/video/renderer/vid_render_vulkan.c
+++ b/libs/video/renderer/vid_render_vulkan.c
@@ -401,35 +401,35 @@ vulkan_r_particles_style_f (struct cvar_s *var)
 }
 
 static void
-vulkan_Mod_LoadLighting (bsp_t *bsp)
+vulkan_Mod_LoadLighting (model_t *mod, bsp_t *bsp)
 {
-	Vulkan_Mod_LoadLighting (bsp, vulkan_ctx);
+	Vulkan_Mod_LoadLighting (mod, bsp, vulkan_ctx);
 }
 
 static void
-vulkan_Mod_SubdivideSurface (msurface_t *fa)
+vulkan_Mod_SubdivideSurface (model_t *mod, msurface_t *fa)
 {
 }
 
 static void
-vulkan_Mod_ProcessTexture (texture_t *tx)
+vulkan_Mod_ProcessTexture (model_t *mod, texture_t *tx)
 {
-	Vulkan_Mod_ProcessTexture (tx, vulkan_ctx);
+	Vulkan_Mod_ProcessTexture (mod, tx, vulkan_ctx);
 }
 
 static void
-vulkan_Mod_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr,
+vulkan_Mod_MakeAliasModelDisplayLists (model_t *mod, aliashdr_t *hdr,
 									   void *_m, int _s, int extra)
 {
-	Vulkan_Mod_MakeAliasModelDisplayLists (m, hdr, _m, _s, extra, vulkan_ctx);
+	Vulkan_Mod_MakeAliasModelDisplayLists (mod, hdr, _m, _s, extra, vulkan_ctx);
 }
 
 static void *
-vulkan_Mod_LoadSkin (byte *skin, int skinsize, int snum, int gnum,
-					 qboolean group, maliasskindesc_t *skindesc)
+vulkan_Mod_LoadSkin (model_t *mod, byte *skin, int skinsize, int snum,
+					 int gnum, qboolean group, maliasskindesc_t *skindesc)
 {
-	return Vulkan_Mod_LoadSkin (skin, skinsize, snum, gnum, group, skindesc,
-								vulkan_ctx);
+	return Vulkan_Mod_LoadSkin (mod, skin, skinsize, snum, gnum, group,
+								skindesc, vulkan_ctx);
 }
 
 static void
@@ -449,7 +449,8 @@ vulkan_Mod_IQMFinish (model_t *mod)
 }
 
 static void
-vulkan_Mod_SpriteLoadTexture (mspriteframe_t *pspriteframe, int framenum)
+vulkan_Mod_SpriteLoadTexture (model_t *mod, mspriteframe_t *pspriteframe,
+							  int framenum)
 {
 }
 
diff --git a/libs/video/renderer/vulkan/vulkan_bsp.c b/libs/video/renderer/vulkan/vulkan_bsp.c
index a923f854a..ff64990ee 100644
--- a/libs/video/renderer/vulkan/vulkan_bsp.c
+++ b/libs/video/renderer/vulkan/vulkan_bsp.c
@@ -280,7 +280,7 @@ Vulkan_RegisterTextures (model_t **models, int num_models, vulkan_ctx_t *ctx)
 		if (!m)
 			continue;
 		// sub-models are done as part of the main model
-		if (*m->name == '*')
+		if (*m->path == '*')
 			continue;
 		// world has already been done, not interested in non-brush models
 		if (m == r_worldentity.model || m->type != mod_brush)
@@ -421,7 +421,7 @@ Vulkan_BuildDisplayLists (model_t **models, int num_models, vulkan_ctx_t *ctx)
 		if (!m)
 			continue;
 		// sub-models are done as part of the main model
-		if (*m->name == '*')
+		if (*m->path == '*')
 			continue;
 		// non-bsp models don't have surfaces.
 		dm = m->submodels;
diff --git a/libs/video/renderer/vulkan/vulkan_lightmap.c b/libs/video/renderer/vulkan/vulkan_lightmap.c
index 0eeed8546..623bd9d94 100644
--- a/libs/video/renderer/vulkan/vulkan_lightmap.c
+++ b/libs/video/renderer/vulkan/vulkan_lightmap.c
@@ -228,7 +228,7 @@ Vulkan_BuildLightmaps (model_t **models, int num_models, vulkan_ctx_t *ctx)
 		m = models[j];
 		if (!m)
 			break;
-		if (m->name[0] == '*') {
+		if (m->path[0] == '*') {
 			// sub model surfaces are processed as part of the main model
 			continue;
 		}
@@ -251,7 +251,7 @@ Vulkan_BuildLightmaps (model_t **models, int num_models, vulkan_ctx_t *ctx)
 		if (!m) {
 			break;
 		}
-		if (m->name[0] == '*') {
+		if (m->path[0] == '*') {
 			// sub model surfaces are processed as part of the main model
 			continue;
 		}
diff --git a/nq/source/cl_demo.c b/nq/source/cl_demo.c
index 2b264d850..772778b92 100644
--- a/nq/source/cl_demo.c
+++ b/nq/source/cl_demo.c
@@ -338,7 +338,7 @@ demo_default_name (const char *argv1)
 	strftime (timestring, 19, "%Y-%m-%d-%H-%M", localtime (&tim));
 
 	// the leading path-name is to be removed from cl.worldmodel->name
-	mapname = QFS_SkipPath (cl.worldmodel->name);
+	mapname = QFS_SkipPath (cl.worldmodel->path);
 
 	// the map name is cut off after any "." because this would prevent
 	// an extension being appended
diff --git a/nq/source/cl_main.c b/nq/source/cl_main.c
index 9424a670e..739e4a61c 100644
--- a/nq/source/cl_main.c
+++ b/nq/source/cl_main.c
@@ -408,7 +408,7 @@ CL_PrintEntities_f (void)
 			continue;
 		}
 		Sys_Printf ("%s:%2i  (%5.1f,%5.1f,%5.1f) [%5.1f %5.1f %5.1f]\n",
-					ent->model->name, ent->frame, VectorExpand (ent->origin),
+					ent->model->path, ent->frame, VectorExpand (ent->origin),
 					VectorExpand (ent->angles));
 	}
 }
diff --git a/nq/source/sv_main.c b/nq/source/sv_main.c
index 60ede5d87..9ee006e3b 100644
--- a/nq/source/sv_main.c
+++ b/nq/source/sv_main.c
@@ -1198,7 +1198,7 @@ SV_SpawnServer (const char *server)
 	ent = EDICT_NUM (&sv_pr_state, 0);
 	memset (&ent->v, 0, sv_pr_state.progs->entityfields * 4);
 	ent->free = false;
-	SVstring (ent, model) = PR_SetString (&sv_pr_state, sv.worldmodel->name);
+	SVstring (ent, model) = PR_SetString (&sv_pr_state, sv.worldmodel->path);
 	SVfloat (ent, modelindex) = 1;			// world model
 	SVfloat (ent, solid) = SOLID_BSP;
 	SVfloat (ent, movetype) = MOVETYPE_PUSH;
diff --git a/qw/source/cl_demo.c b/qw/source/cl_demo.c
index b6e0049e7..6151b6bd0 100644
--- a/qw/source/cl_demo.c
+++ b/qw/source/cl_demo.c
@@ -634,7 +634,7 @@ demo_default_name (const char *argv1)
 	strftime (timestring, 19, "%Y-%m-%d-%H-%M", localtime (&tim));
 
 	// the leading path-name is to be removed from cl.worldmodel->name
-	mapname = QFS_SkipPath (cl.worldmodel->name);
+	mapname = QFS_SkipPath (cl.worldmodel->path);
 
 	// the map name is cut off after any "." because this would prevent
 	// an extension being appended
diff --git a/qw/source/sbar.c b/qw/source/sbar.c
index a7b3ab415..4a517887e 100644
--- a/qw/source/sbar.c
+++ b/qw/source/sbar.c
@@ -1108,7 +1108,7 @@ Sbar_LogFrags (void)
 	if (t)
 		Qwrite (file, t, strlen (t));
 
-	Qprintf (file, "%s\n%s %s\n", cls.servername->str, cl.worldmodel->name,
+	Qprintf (file, "%s\n%s %s\n", cls.servername->str, cl.worldmodel->path,
 			 cl.levelname);
 
 	// scores
diff --git a/qw/source/sv_init.c b/qw/source/sv_init.c
index 6e8b7bae5..8535dacb6 100644
--- a/qw/source/sv_init.c
+++ b/qw/source/sv_init.c
@@ -420,7 +420,7 @@ SV_SpawnServer (const char *server)
 
 	ent = EDICT_NUM (&sv_pr_state, 0);
 	ent->free = false;
-	SVstring (ent, model) = PR_SetString (&sv_pr_state, sv.worldmodel->name);
+	SVstring (ent, model) = PR_SetString (&sv_pr_state, sv.worldmodel->path);
 	SVfloat (ent, modelindex) = 1;				// world model
 	SVfloat (ent, solid) = SOLID_BSP;
 	SVfloat (ent, movetype) = MOVETYPE_PUSH;
diff --git a/qw/source/teamplay.c b/qw/source/teamplay.c
index b8158cbdb..e8a38606d 100644
--- a/qw/source/teamplay.c
+++ b/qw/source/teamplay.c
@@ -288,8 +288,8 @@ Team_NewMap (void)
 
 	died = false;
 	recorded_location = false;
-	mapname = strdup (cl.worldmodel->name);
-	t2 = malloc (sizeof (cl.worldmodel->name));
+	mapname = strdup (cl.worldmodel->path);
+	t2 = malloc (sizeof (cl.worldmodel->path));
 	if (!mapname || !t2)
 		Sys_Error ("Can't duplicate mapname!");
 	map_to_loc (mapname,t2);
@@ -345,10 +345,10 @@ locs_loc (void)
 	}
 	if (Cmd_Argc () >= 3)
 		desc = Cmd_Args (2);
-	mapname = malloc (sizeof (cl.worldmodel->name));
+	mapname = malloc (sizeof (cl.worldmodel->path));
 	if (!mapname)
 		Sys_Error ("Can't duplicate mapname!");
-	map_to_loc (cl.worldmodel->name, mapname);
+	map_to_loc (cl.worldmodel->path, mapname);
 	snprintf (locfile, sizeof (locfile), "%s/%s",
 			  qfs_gamedir->dir.def, mapname);
 	free (mapname);

From f02b35a20cfbbd26472600e77fcfd004a30e0e80 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 1 Feb 2021 15:02:42 +0900
Subject: [PATCH 1394/1519] [model] Clean up the model array a little

Probably not really necessary, but I think I found a small opportunity
for a buffer overflow in there while I was modifying the code, so this
is probably better anyway.
---
 libs/models/model.c | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/libs/models/model.c b/libs/models/model.c
index 7eb606930..4c2d4ac30 100644
--- a/libs/models/model.c
+++ b/libs/models/model.c
@@ -39,6 +39,7 @@
 #endif
 
 #include "QF/cvar.h"
+#include "QF/darray.h"
 #include "QF/iqm.h"
 #include "QF/model.h"
 #include "QF/qendian.h"
@@ -53,9 +54,8 @@
 vid_model_funcs_t *mod_funcs;
 
 #define	MOD_BLOCK	16					// allocate 16 models at a time
-model_t   **mod_known;
-int         mod_numknown;
-int         mod_maxknown;
+static struct DARRAY_TYPE (model_t *) mod_known = {0, 0, MOD_BLOCK};
+static size_t mod_numknown;
 
 VISIBLE texture_t  *r_notexture_mip;
 
@@ -115,10 +115,10 @@ Mod_Init_Cvars (void)
 VISIBLE void
 Mod_ClearAll (void)
 {
-	int         i;
+	size_t      i;
 	model_t   **mod;
 
-	for (i = 0, mod = mod_known; i < mod_numknown; i++, mod++) {
+	for (i = 0, mod = mod_known.a; i < mod_numknown; i++, mod++) {
 		//FIXME this seems to be correct but need to double check the behavior
 		//with alias models
 		if (!(*mod)->needload && (*mod)->clear) {
@@ -134,25 +134,24 @@ Mod_ClearAll (void)
 model_t *
 Mod_FindName (const char *name)
 {
-	int         i;
+	size_t      i;
 	model_t   **mod;
 
 	if (!name[0])
 		Sys_Error ("Mod_FindName: empty name");
 
 	// search the currently loaded models
-	for (i = 0, mod = mod_known; i < mod_numknown; i++, mod++)
+	for (i = 0, mod = mod_known.a; i < mod_numknown; i++, mod++)
 		if (!strcmp ((*mod)->path, name))
 			break;
 
 	if (i == mod_numknown) {
-		if (mod_numknown == mod_maxknown) {
-			mod_maxknown += MOD_BLOCK;
-			mod_known = realloc (mod_known, mod_maxknown * sizeof (model_t *));
-			mod = mod_known + mod_numknown;
-			*mod = calloc (MOD_BLOCK, sizeof (model_t));
-			for (i = 1; i < MOD_BLOCK; i++)
-				mod[i] = mod[0] + i;
+		if (mod_numknown == mod_known.size) {
+			model_t    *block = calloc (MOD_BLOCK, sizeof (model_t));
+			for (i = 0; i < MOD_BLOCK; i++) {
+				DARRAY_APPEND (&mod_known, &block[i]);
+			}
+			mod = &mod_known.a[mod_numknown];
 		}
 		memset ((*mod), 0, sizeof (model_t));
 		strncpy ((*mod)->path, name, sizeof (*mod)->path - 1);
@@ -301,11 +300,11 @@ Mod_TouchModel (const char *name)
 VISIBLE void
 Mod_Print (void)
 {
-	int			i;
+	size_t      i;
 	model_t	  **mod;
 
 	Sys_Printf ("Cached models:\n");
-	for (i = 0, mod = mod_known; i < mod_numknown; i++, mod++) {
+	for (i = 0, mod = mod_known.a; i < mod_numknown; i++, mod++) {
 		Sys_Printf ("%8p : %s\n", (*mod)->cache.data, (*mod)->path);
 	}
 }

From 6969adf02c6a7209f70f91d0c8cdd6b73af2b8cb Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 1 Feb 2021 19:19:18 +0900
Subject: [PATCH 1395/1519] [models] Fix black models with fullbrights in GL

I had missed the breakage when I got vulkan alias model skins working.
---
 libs/models/gl_model_fullbright.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/libs/models/gl_model_fullbright.c b/libs/models/gl_model_fullbright.c
index ef94e59ca..60df0d50c 100644
--- a/libs/models/gl_model_fullbright.c
+++ b/libs/models/gl_model_fullbright.c
@@ -55,6 +55,13 @@ Mod_Fullbright (byte *skin, int width, int height, const char *name)
 
 	// Check for fullbright pixels
 	if (Mod_CalcFullbright (skin, ptexels, pixels)) {
+		//FIXME black should be transparent for fullbrights (or just fix
+		//fullbright rendering in gl)
+		for (int i = 0; i < pixels; i++) {
+			if (!ptexels[i]) {
+				ptexels[i] = 255;
+			}
+		}
 		Sys_MaskPrintf (SYS_DEV, "FB Model ID: '%s'\n", name);
 		texnum = GL_LoadTexture (name, width, height, ptexels, true, true, 1);
 	}

From 34dc7cf2df3253459c951508e61f6a5294b6dca0 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 1 Feb 2021 19:31:11 +0900
Subject: [PATCH 1396/1519] [models] Move brush data into its own struct

This is a big step towards a cleaner api. The struct reference in
model_t really should be a pointer, but bsp submodel(?) loading messed
that up, though that's just a matter of taking more care in the loading
code. It seems sensible to make that a separate step.
---
 include/QF/GL/qf_lightmap.h                  |   2 +-
 include/QF/GLSL/qf_lightmap.h                |   2 +-
 include/QF/Vulkan/qf_lightmap.h              |   3 +-
 include/QF/model.h                           | 104 ++++-----
 include/QF/plugin/vid_render.h               |   2 +-
 include/r_internal.h                         |   2 +-
 include/r_local.h                            |   8 +-
 libs/models/brush/gl_model_brush.c           |  18 +-
 libs/models/brush/glsl_model_brush.c         |  21 +-
 libs/models/brush/model_brush.c              | 222 ++++++++++---------
 libs/models/brush/sw_model_brush.c           |   6 +-
 libs/models/brush/vulkan_model_brush.c       |  36 +--
 libs/video/renderer/gl/gl_lightmap.c         |  46 ++--
 libs/video/renderer/gl/gl_mod_alias.c        |   2 +-
 libs/video/renderer/gl/gl_rmisc.c            |  22 +-
 libs/video/renderer/gl/gl_rsurf.c            |  53 ++---
 libs/video/renderer/glsl/glsl_alias.c        |   2 +-
 libs/video/renderer/glsl/glsl_bsp.c          |  96 ++++----
 libs/video/renderer/glsl/glsl_iqm.c          |   2 +-
 libs/video/renderer/glsl/glsl_lightmap.c     |  23 +-
 libs/video/renderer/glsl/namehack.h          |   1 -
 libs/video/renderer/r_bsp.c                  |   6 +-
 libs/video/renderer/r_efrag.c                |   4 +-
 libs/video/renderer/r_light.c                |  34 +--
 libs/video/renderer/sw/sw_rbsp.c             |  40 ++--
 libs/video/renderer/sw/sw_rdraw.c            |  17 +-
 libs/video/renderer/sw/sw_rmain.c            |  27 ++-
 libs/video/renderer/sw/sw_rsurf.c            |   2 +-
 libs/video/renderer/sw32/sw32_rbsp.c         |  40 ++--
 libs/video/renderer/sw32/sw32_rdraw.c        |  17 +-
 libs/video/renderer/sw32/sw32_rmain.c        |  28 ++-
 libs/video/renderer/sw32/sw32_rsurf.c        |   2 +-
 libs/video/renderer/vulkan/vulkan_alias.c    |   2 +-
 libs/video/renderer/vulkan/vulkan_bsp.c      |  96 ++++----
 libs/video/renderer/vulkan/vulkan_lightmap.c |  21 +-
 nq/source/cl_chase.c                         |   2 +-
 nq/source/cl_ents.c                          |   6 +-
 nq/source/cl_parse.c                         |   6 +-
 nq/source/cl_tent.c                          |   4 +-
 nq/source/sv_main.c                          |   8 +-
 nq/source/sv_pr_cmds.c                       |   4 +-
 nq/source/world.c                            |  12 +-
 qw/source/cl_chase.c                         |   2 +-
 qw/source/cl_entparse.c                      |   2 +-
 qw/source/cl_ents.c                          |  10 +-
 qw/source/cl_parse.c                         |   8 +-
 qw/source/cl_tent.c                          |   6 +-
 qw/source/pmovetst.c                         |   6 +-
 qw/source/sv_ents.c                          |   6 +-
 qw/source/sv_init.c                          |   9 +-
 qw/source/sv_pr_cmds.c                       |   4 +-
 qw/source/sv_send.c                          |   9 +-
 qw/source/sv_user.c                          |   9 +-
 qw/source/world.c                            |  12 +-
 54 files changed, 607 insertions(+), 527 deletions(-)

diff --git a/include/QF/GL/qf_lightmap.h b/include/QF/GL/qf_lightmap.h
index c048b181a..e0a05d4dd 100644
--- a/include/QF/GL/qf_lightmap.h
+++ b/include/QF/GL/qf_lightmap.h
@@ -50,6 +50,6 @@ void gl_lightmap_init (void);
 void GL_BuildLightmaps (struct model_s **models, int num_models);
 void R_BlendLightmaps (void);
 void R_CalcLightmaps (void);
-extern void (*R_BuildLightMap) (msurface_t *surf);
+extern void (*R_BuildLightMap) (mod_brush_t *brush, msurface_t *surf);
 
 #endif // __QF_GL_lightmap_h
diff --git a/include/QF/GLSL/qf_lightmap.h b/include/QF/GLSL/qf_lightmap.h
index 7619ed890..507eaeae6 100644
--- a/include/QF/GLSL/qf_lightmap.h
+++ b/include/QF/GLSL/qf_lightmap.h
@@ -36,7 +36,7 @@
 void glsl_lightmap_init (void);
 void glsl_R_BuildLightmaps (struct model_s **models, int num_models);
 void glsl_R_CalcLightmaps (void);
-extern void (*glsl_R_BuildLightMap) (msurface_t *surf);
+extern void (*glsl_R_BuildLightMap) (mod_brush_t *brush, msurface_t *surf);
 int  glsl_R_LightmapTexture (void) __attribute__((pure));
 void glsl_R_FlushLightmaps (void);
 
diff --git a/include/QF/Vulkan/qf_lightmap.h b/include/QF/Vulkan/qf_lightmap.h
index 649a5b139..eaca4e35f 100644
--- a/include/QF/Vulkan/qf_lightmap.h
+++ b/include/QF/Vulkan/qf_lightmap.h
@@ -36,12 +36,13 @@
 
 struct vulkan_ctx_s;
 struct model_s;
+struct mod_brush_s;
 struct msurface_s;
 
 void Vulkan_lightmap_init (struct vulkan_ctx_s *ctx);
 void Vulkan_BuildLightmaps (struct model_s **models, int num_models, struct vulkan_ctx_s *ctx);
 void Vulkan_CalcLightmaps (struct vulkan_ctx_s *ctx);
-void Vulkan_BuildLightMap (struct msurface_s *surf, struct vulkan_ctx_s *ctx);
+void Vulkan_BuildLightMap (struct mod_brush_s *brush, struct msurface_s *surf, struct vulkan_ctx_s *ctx);
 VkImageView Vulkan_LightmapImageView (struct vulkan_ctx_s *ctx) __attribute__((pure));
 void Vulkan_FlushLightmaps (struct vulkan_ctx_s *ctx);
 
diff --git a/include/QF/model.h b/include/QF/model.h
index c7fc9190f..6d7dfe61d 100644
--- a/include/QF/model.h
+++ b/include/QF/model.h
@@ -62,7 +62,6 @@ typedef struct efrag_s {
 	struct efrag_s		*entnext;
 } efrag_t;
 
-
 // in memory representation ===================================================
 
 // !!! if this is changed, it must be changed in asm_draw.h too !!!
@@ -228,6 +227,58 @@ typedef struct hull_s {
 	int         depth;				///< maximum depth of the tree
 } hull_t;
 
+typedef struct mod_brush_s {
+	int			 firstmodelsurface, nummodelsurfaces;
+
+	int			 numsubmodels;
+	dmodel_t	*submodels;
+
+	int			 numplanes;
+	plane_t		*planes;
+
+	int			 numleafs;		// number of visible leafs, not counting 0
+	mleaf_t		*leafs;
+
+	int			 numvertexes;
+	mvertex_t	*vertexes;
+
+	int			 numedges;
+	medge_t		*edges;
+
+	int			 numnodes;
+	mnode_t		*nodes;
+	int          depth;				///< maximum depth of the tree
+
+	int			 numtexinfo;
+	mtexinfo_t	*texinfo;
+
+	int			 numsurfaces;
+	msurface_t	*surfaces;
+
+	int			 numsurfedges;
+	int			*surfedges;
+
+	int			 numclipnodes;
+	mclipnode_t	*clipnodes;
+
+	int			 nummarksurfaces;
+	msurface_t	**marksurfaces;
+
+	hull_t		 hulls[MAX_MAP_HULLS];
+	hull_t		*hull_list[MAX_MAP_HULLS];
+
+	int			 numtextures;
+	texture_t	**textures;
+	texture_t	*skytexture;
+
+	byte		*visdata;
+	byte		*lightdata;
+	char		*entities;	//FIXME should not be here
+
+	unsigned int checksum;
+	unsigned int checksum2;
+} mod_brush_t;
+
 // SPRITE MODELS ==============================================================
 
 // FIXME: shorten these?
@@ -375,55 +426,8 @@ typedef struct model_s {
 	vec3_t		 clipmins, clipmaxs;
 
 // brush model
-	int			 firstmodelsurface, nummodelsurfaces;
-
-	int			 numsubmodels;
-	dmodel_t	*submodels;
-
-	int			 numplanes;
-	plane_t		*planes;
-
-	int			 numleafs;		// number of visible leafs, not counting 0
-	mleaf_t		*leafs;
-
-	int			 numvertexes;
-	mvertex_t	*vertexes;
-
-	int			 numedges;
-	medge_t		*edges;
-
-	int			 numnodes;
-	mnode_t		*nodes;
-	int          depth;				///< maximum depth of the tree
-
-	int			 numtexinfo;
-	mtexinfo_t	*texinfo;
-
-	int			 numsurfaces;
-	msurface_t	*surfaces;
-
-	int			 numsurfedges;
-	int			*surfedges;
-
-	int			 numclipnodes;
-	mclipnode_t	*clipnodes;
-
-	int			 nummarksurfaces;
-	msurface_t	**marksurfaces;
-
-	hull_t		 hulls[MAX_MAP_HULLS];
-	hull_t		*hull_list[MAX_MAP_HULLS];
-
-	int			 numtextures;
-	texture_t	**textures;
-	texture_t	*skytexture;
-
-	byte		*visdata;
-	byte		*lightdata;
-	char		*entities;
-
-	unsigned int checksum;
-	unsigned int checksum2;
+	//FIXME should be a pointer (submodels make things tricky)
+	mod_brush_t brush;
 
 // additional model data
 	cache_user_t cache;
diff --git a/include/QF/plugin/vid_render.h b/include/QF/plugin/vid_render.h
index cc634e562..bc80780e4 100644
--- a/include/QF/plugin/vid_render.h
+++ b/include/QF/plugin/vid_render.h
@@ -149,7 +149,7 @@ typedef struct vid_render_funcs_s {
 	void (*R_ClearState) (void);
 	void (*R_LoadSkys) (const char *);
 	void (*R_NewMap) (model_t *worldmodel, model_t **models, int num_models);
-	void (*R_AddEfrags) (entity_t *ent);
+	void (*R_AddEfrags) (mod_brush_t *brush, entity_t *ent);
 	void (*R_RemoveEfrags) (entity_t *ent);
 	void (*R_EnqueueEntity) (struct entity_s *ent);	//FIXME should not be here
 	void (*R_LineGraph) (int x, int y, int *h_vals, int count);
diff --git a/include/r_internal.h b/include/r_internal.h
index 01c9af001..651946140 100644
--- a/include/r_internal.h
+++ b/include/r_internal.h
@@ -83,7 +83,7 @@ void R_RenderView (void);			// must set r_refdef first
 void R_ViewChanged (float aspect);	// must set r_refdef first
 								// called whenever r_refdef or vid change
 
-void R_AddEfrags (entity_t *ent);
+void R_AddEfrags (mod_brush_t *, entity_t *ent);
 void R_RemoveEfrags (entity_t *ent);
 
 void R_NewMap (model_t *worldmodel, model_t **models, int num_models);
diff --git a/include/r_local.h b/include/r_local.h
index 4a3645ded..9e56b7343 100644
--- a/include/r_local.h
+++ b/include/r_local.h
@@ -182,7 +182,7 @@ void R_RemoveEdges (edge_t *pedge);
 void R_AddTexture (texture_t *tex);
 struct vulkan_ctx_s;
 void R_ClearTextures (void);
-void R_InitSurfaceChains (model_t *model);
+void R_InitSurfaceChains (mod_brush_t *brush);
 
 extern void R_Surf8Start (void);
 extern void R_Surf8End (void);
@@ -303,13 +303,13 @@ void R_ZGraph (void);
 void R_PrintAliasStats (void);
 void R_PrintTimes (void);
 void R_AnimateLight (void);
-int R_LightPoint (const vec3_t p);
+int R_LightPoint (mod_brush_t *brush, const vec3_t p);
 void R_SetupFrame (void);
 void R_cshift_f (void);
 void R_EmitEdge (mvertex_t *pv0, mvertex_t *pv1);
 void R_ClipEdge (mvertex_t *pv0, mvertex_t *pv1, clipplane_t *clip);
-void R_RecursiveMarkLights (const vec3_t lightorigin, struct dlight_s *light,
-							int bit, mnode_t *node);
+void R_RecursiveMarkLights (mod_brush_t *brush, const vec3_t lightorigin,
+							struct dlight_s *light, int bit, mnode_t *node);
 void R_MarkLights (const vec3_t lightorigin, struct dlight_s *light, int bit,
 				   model_t *model);
 
diff --git a/libs/models/brush/gl_model_brush.c b/libs/models/brush/gl_model_brush.c
index 05b3c0b94..9585bb108 100644
--- a/libs/models/brush/gl_model_brush.c
+++ b/libs/models/brush/gl_model_brush.c
@@ -150,9 +150,10 @@ gl_Mod_LoadLighting (model_t *mod, bsp_t *bsp)
 	size_t      i;
 	int         ver;
 	QFile      *lit_file;
+	mod_brush_t *brush = &mod->brush;
 
 	dstring_copystr (litfilename, mod->path);
-	mod->lightdata = NULL;
+	brush->lightdata = NULL;
 	if (mod_lightmap_bytes > 1) {
 		// LordHavoc: check for a .lit file to load
 		QFS_StripExtension (litfilename->str, litfilename->str);
@@ -165,7 +166,7 @@ gl_Mod_LoadLighting (model_t *mod, bsp_t *bsp)
 				ver = LittleLong (((int32_t *) data)[1]);
 				if (ver == 1) {
 					Sys_MaskPrintf (SYS_DEV, "%s loaded", litfilename->str);
-					mod->lightdata = data + 8;
+					brush->lightdata = data + 8;
 					return;
 				} else
 					Sys_MaskPrintf (SYS_DEV,
@@ -179,10 +180,10 @@ gl_Mod_LoadLighting (model_t *mod, bsp_t *bsp)
 		dstring_delete (litfilename);
 		return;
 	}
-	mod->lightdata = Hunk_AllocName (bsp->lightdatasize * mod_lightmap_bytes,
-									 litfilename->str);
+	brush->lightdata = Hunk_AllocName (bsp->lightdatasize * mod_lightmap_bytes,
+									   litfilename->str);
 	in = bsp->lightdata;
-	out = mod->lightdata;
+	out = brush->lightdata;
 
 	if (mod_lightmap_bytes > 1)
 		for (i = 0; i < bsp->lightdatasize ; i++) {
@@ -308,18 +309,19 @@ gl_Mod_SubdivideSurface (model_t *mod, msurface_t *fa)
 	float      *vec;
 	int         lindex, numverts, i;
 	vec3_t      verts[64];
+	mod_brush_t *brush = &mod->brush;
 
 	warpface = fa;
 
 	// convert edges back to a normal polygon
 	numverts = 0;
 	for (i = 0; i < fa->numedges; i++) {
-		lindex = mod->surfedges[fa->firstedge + i];
+		lindex = brush->surfedges[fa->firstedge + i];
 
 		if (lindex > 0)
-			vec = mod->vertexes[mod->edges[lindex].v[0]].position;
+			vec = brush->vertexes[brush->edges[lindex].v[0]].position;
 		else
-			vec = mod->vertexes[mod->edges[-lindex].v[1]].position;
+			vec = brush->vertexes[brush->edges[-lindex].v[1]].position;
 		VectorCopy (vec, verts[numverts]);
 		numverts++;
 	}
diff --git a/libs/models/brush/glsl_model_brush.c b/libs/models/brush/glsl_model_brush.c
index 3a2717f57..f44327acd 100644
--- a/libs/models/brush/glsl_model_brush.c
+++ b/libs/models/brush/glsl_model_brush.c
@@ -65,13 +65,14 @@ static void
 glsl_brush_clear (model_t *m, void *data)
 {
 	int         i;
+	mod_brush_t *brush = &m->brush;
 
 	m->needload = true;
-	for (i = 0; i < m->numtextures; i++) {
+	for (i = 0; i < brush->numtextures; i++) {
 		// NOTE: some maps (eg e1m2) have empty texture slots
 		glsltex_t  *tex = 0;
-		if (m->textures[i]) {
-			tex = m->textures[i]->render;
+		if (brush->textures[i]) {
+			tex = brush->textures[i]->render;
 		}
 		if (tex && tex->gl_texturenum) {
 			GLSL_ReleaseTexture (tex->gl_texturenum);
@@ -80,10 +81,10 @@ glsl_brush_clear (model_t *m, void *data)
 			tex->gl_texturenum = 0;
 		}
 	}
-	for (i = 0; i < m->numsurfaces; i++) {
-		if (m->surfaces[i].polys) {
-			free (m->surfaces[i].polys);
-			m->surfaces[i].polys = 0;
+	for (i = 0; i < brush->numsurfaces; i++) {
+		if (brush->surfaces[i].polys) {
+			free (brush->surfaces[i].polys);
+			brush->surfaces[i].polys = 0;
 		}
 	}
 }
@@ -151,9 +152,9 @@ glsl_Mod_LoadLighting (model_t *mod, bsp_t *bsp)
 	mod->clear = glsl_brush_clear;
 	mod_lightmap_bytes = 1;
 	if (!bsp->lightdatasize) {
-		mod->lightdata = NULL;
+		mod->brush.lightdata = NULL;
 		return;
 	}
-	mod->lightdata = Hunk_AllocName (bsp->lightdatasize, mod->name);
-	memcpy (mod->lightdata, bsp->lightdata, bsp->lightdatasize);
+	mod->brush.lightdata = Hunk_AllocName (bsp->lightdatasize, mod->name);
+	memcpy (mod->brush.lightdata, bsp->lightdata, bsp->lightdatasize);
 }
diff --git a/libs/models/brush/model_brush.c b/libs/models/brush/model_brush.c
index 38a33c893..8a703050d 100644
--- a/libs/models/brush/model_brush.c
+++ b/libs/models/brush/model_brush.c
@@ -67,10 +67,10 @@ Mod_PointInLeaf (const vec3_t p, model_t *model)
 	mnode_t    *node;
 	plane_t    *plane;
 
-	if (!model || !model->nodes)
+	if (!model || !model->brush.nodes)
 		Sys_Error ("Mod_PointInLeaf: bad model");
 
-	node = model->nodes;
+	node = model->brush.nodes;
 	while (1) {
 		if (node->contents < 0)
 			return (mleaf_t *) node;
@@ -86,13 +86,13 @@ Mod_PointInLeaf (const vec3_t p, model_t *model)
 }
 
 static inline byte *
-Mod_DecompressVis (byte * in, model_t *model)
+Mod_DecompressVis (byte * in, mod_brush_t *brush)
 {
 	static byte decompressed[MAX_MAP_LEAFS / 8];
 	byte       *out;
 	int			row, c;
 
-	row = (model->numleafs + 7) >> 3;
+	row = (brush->numleafs + 7) >> 3;
 	out = decompressed;
 
 	if (!in) {							// no vis info, so make all visible
@@ -123,13 +123,13 @@ Mod_DecompressVis (byte * in, model_t *model)
 VISIBLE byte *
 Mod_LeafPVS (mleaf_t *leaf, model_t *model)
 {
-	if (leaf == model->leafs) {
+	if (leaf == model->brush.leafs) {
 		if (!mod_novis[0]) {
 			memset (mod_novis, 0xff, sizeof (mod_novis));
 		}
 		return mod_novis;
 	}
-	return Mod_DecompressVis (leaf->compressed_vis, model);
+	return Mod_DecompressVis (leaf->compressed_vis, &model->brush);
 }
 
 // BRUSHMODEL LOADING =========================================================
@@ -170,16 +170,17 @@ Mod_LoadTextures (model_t *mod, bsp_t *bsp)
 	miptex_t	   *mt;
 	texture_t	   *tx, *tx2;
 	texture_t	   *anims[10], *altanims[10];
+	mod_brush_t    *brush = &mod->brush;
 
 	if (!bsp->texdatasize) {
-		mod->textures = NULL;
+		brush->textures = NULL;
 		return;
 	}
 	m = (dmiptexlump_t *) bsp->texdata;
 
-	mod->numtextures = m->nummiptex;
-	mod->textures = Hunk_AllocName (m->nummiptex * sizeof (*mod->textures),
-									mod->name);
+	brush->numtextures = m->nummiptex;
+	brush->textures = Hunk_AllocName (m->nummiptex * sizeof (*brush->textures),
+									  mod->name);
 
 	for (i = 0; i < m->nummiptex; i++) {
 		if (m->dataofs[i] == -1)
@@ -195,10 +196,10 @@ Mod_LoadTextures (model_t *mod, bsp_t *bsp)
 		pixels = mt->width * mt->height / 64 * 85;
 		tx = Hunk_AllocName (sizeof (texture_t) + pixels, mod->name);
 
-		mod->textures[i] = tx;
+		brush->textures[i] = tx;
 
 		tx->name = strndup(mt->name, sizeof (mt->name));
-		mod_unique_miptex_name (mod->textures, tx, i);
+		mod_unique_miptex_name (brush->textures, tx, i);
 		tx->width = mt->width;
 		tx->height = mt->height;
 		for (j = 0; j < MIPLEVELS; j++)
@@ -208,7 +209,7 @@ Mod_LoadTextures (model_t *mod, bsp_t *bsp)
 		memcpy (tx + 1, mt + 1, pixels);
 
 		if (!strncmp (mt->name, "sky", 3))
-			mod->skytexture = tx;
+			brush->skytexture = tx;
 	}
 	if (mod_funcs && mod_funcs->Mod_ProcessTexture) {
 		size_t      render_size = mod_funcs->texture_render_size;
@@ -218,7 +219,7 @@ Mod_LoadTextures (model_t *mod, bsp_t *bsp)
 										  mod->name);
 		}
 		for (i = 0; i < m->nummiptex; i++) {
-			tx = mod->textures[i];
+			tx = brush->textures[i];
 			tx->render = render_data;
 			render_data += render_size;
 			mod_funcs->Mod_ProcessTexture (mod, tx);
@@ -229,7 +230,7 @@ Mod_LoadTextures (model_t *mod, bsp_t *bsp)
 
 	// sequence the animations
 	for (i = 0; i < m->nummiptex; i++) {
-		tx = mod->textures[i];
+		tx = brush->textures[i];
 		if (!tx || tx->name[0] != '+')
 			continue;
 		if (tx->anim_next)
@@ -256,7 +257,7 @@ Mod_LoadTextures (model_t *mod, bsp_t *bsp)
 			Sys_Error ("Bad animating texture %s", tx->name);
 
 		for (j = i + 1; j < m->nummiptex; j++) {
-			tx2 = mod->textures[j];
+			tx2 = brush->textures[j];
 			if (!tx2 || tx2->name[0] != '+')
 				continue;
 			if (strcmp (tx2->name + 2, tx->name + 2))
@@ -310,22 +311,22 @@ static void
 Mod_LoadVisibility (model_t *mod, bsp_t *bsp)
 {
 	if (!bsp->visdatasize) {
-		mod->visdata = NULL;
+		mod->brush.visdata = NULL;
 		return;
 	}
-	mod->visdata = Hunk_AllocName (bsp->visdatasize, mod->name);
-	memcpy (mod->visdata, bsp->visdata, bsp->visdatasize);
+	mod->brush.visdata = Hunk_AllocName (bsp->visdatasize, mod->name);
+	memcpy (mod->brush.visdata, bsp->visdata, bsp->visdatasize);
 }
 
 static void
 Mod_LoadEntities (model_t *mod, bsp_t *bsp)
 {
 	if (!bsp->entdatasize) {
-		mod->entities = NULL;
+		mod->brush.entities = NULL;
 		return;
 	}
-	mod->entities = Hunk_AllocName (bsp->entdatasize, mod->name);
-	memcpy (mod->entities, bsp->entdata, bsp->entdatasize);
+	mod->brush.entities = Hunk_AllocName (bsp->entdatasize, mod->name);
+	memcpy (mod->brush.entities, bsp->entdata, bsp->entdatasize);
 }
 
 static void
@@ -339,8 +340,8 @@ Mod_LoadVertexes (model_t *mod, bsp_t *bsp)
 	count = bsp->numvertexes;
 	out = Hunk_AllocName (count * sizeof (*out), mod->name);
 
-	mod->vertexes = out;
-	mod->numvertexes = count;
+	mod->brush.vertexes = out;
+	mod->brush.numvertexes = count;
 
 	for (i = 0; i < count; i++, in++, out++)
 		VectorCopy (in->point, out->position);
@@ -351,13 +352,14 @@ Mod_LoadSubmodels (model_t *mod, bsp_t *bsp)
 {
 	dmodel_t   *in, *out;
 	int         count, i, j;
+	mod_brush_t *brush = &mod->brush;
 
 	in = bsp->models;
 	count = bsp->nummodels;
 	out = Hunk_AllocName (count * sizeof (*out), mod->name);
 
-	mod->submodels = out;
-	mod->numsubmodels = count;
+	brush->submodels = out;
+	brush->numsubmodels = count;
 
 	for (i = 0; i < count; i++, in++, out++) {
 		static vec3_t offset = {1, 1, 1};
@@ -372,7 +374,7 @@ Mod_LoadSubmodels (model_t *mod, bsp_t *bsp)
 		out->numfaces = in->numfaces;
 	}
 
-	out = mod->submodels;
+	out = brush->submodels;
 
 	if (out->visleafs > MAX_MAP_LEAFS) {
 		Sys_Error ("Mod_LoadSubmodels: too many visleafs (%d, max = %d) in %s",
@@ -396,8 +398,8 @@ Mod_LoadEdges (model_t *mod, bsp_t *bsp)
 	count = bsp->numedges;
 	out = Hunk_AllocName ((count + 1) * sizeof (*out), mod->name);
 
-	mod->edges = out;
-	mod->numedges = count;
+	mod->brush.edges = out;
+	mod->brush.numedges = count;
 
 	for (i = 0; i < count; i++, in++, out++) {
 		out->v[0] = in->v[0];
@@ -417,8 +419,8 @@ Mod_LoadTexinfo (model_t *mod, bsp_t *bsp)
 	count = bsp->numtexinfo;
 	out = Hunk_AllocName (count * sizeof (*out), mod->name);
 
-	mod->texinfo = out;
-	mod->numtexinfo = count;
+	mod->brush.texinfo = out;
+	mod->brush.numtexinfo = count;
 
 	for (i = 0; i < count; i++, in++, out++) {
 		for (j = 0; j < 4; j++) {
@@ -441,13 +443,13 @@ Mod_LoadTexinfo (model_t *mod, bsp_t *bsp)
 		miptex = in->miptex;
 		out->flags = in->flags;
 
-		if (!mod->textures) {
+		if (!mod->brush.textures) {
 			out->texture = r_notexture_mip;	// checkerboard texture
 			out->flags = 0;
 		} else {
-			if (miptex >= mod->numtextures)
-				Sys_Error ("miptex >= mod->numtextures");
-			out->texture = mod->textures[miptex];
+			if (miptex >= mod->brush.numtextures)
+				Sys_Error ("miptex >= mod->brush.numtextures");
+			out->texture = mod->brush.textures[miptex];
 			if (!out->texture) {
 				out->texture = r_notexture_mip;	// texture not found
 				out->flags = 0;
@@ -469,6 +471,7 @@ CalcSurfaceExtents (model_t *mod, msurface_t *s)
 	int			bmins[2], bmaxs[2];
 	mtexinfo_t *tex;
 	mvertex_t  *v;
+	mod_brush_t *brush = &mod->brush;
 
 	mins[0] = mins[1] = 999999;
 	maxs[0] = maxs[1] = -99999;
@@ -476,11 +479,11 @@ CalcSurfaceExtents (model_t *mod, msurface_t *s)
 	tex = s->texinfo;
 
 	for (i = 0; i < s->numedges; i++) {
-		e = mod->surfedges[s->firstedge + i];
+		e = brush->surfedges[s->firstedge + i];
 		if (e >= 0)
-			v = &mod->vertexes[mod->edges[e].v[0]];
+			v = &brush->vertexes[brush->edges[e].v[0]];
 		else
-			v = &mod->vertexes[mod->edges[-e].v[1]];
+			v = &brush->vertexes[brush->edges[-e].v[1]];
 
 		for (j = 0; j < 2; j++) {
 			val = v->position[0] * tex->vecs[j][0] +
@@ -512,6 +515,7 @@ Mod_LoadFaces (model_t *mod, bsp_t *bsp)
 	dface_t    *in;
 	int			count, planenum, side, surfnum, i;
 	msurface_t *out;
+	mod_brush_t *brush = &mod->brush;
 
 	in = bsp->faces;
 	count = bsp->numfaces;
@@ -522,8 +526,8 @@ Mod_LoadFaces (model_t *mod, bsp_t *bsp)
 						"%i faces exceeds standard limit of 32767.\n", count);
 	}
 
-	mod->surfaces = out;
-	mod->numsurfaces = count;
+	brush->surfaces = out;
+	brush->numsurfaces = count;
 
 	for (surfnum = 0; surfnum < count; surfnum++, in++, out++) {
 		out->firstedge = in->firstedge;
@@ -535,9 +539,9 @@ Mod_LoadFaces (model_t *mod, bsp_t *bsp)
 		if (side)
 			out->flags |= SURF_PLANEBACK;
 
-		out->plane = mod->planes + planenum;
+		out->plane = brush->planes + planenum;
 
-		out->texinfo = mod->texinfo + in->texinfo;
+		out->texinfo = brush->texinfo + in->texinfo;
 
 		CalcSurfaceExtents (mod, out);
 
@@ -549,7 +553,7 @@ Mod_LoadFaces (model_t *mod, bsp_t *bsp)
 		if (i == -1)
 			out->samples = NULL;
 		else
-			out->samples = mod->lightdata + (i * mod_lightmap_bytes);
+			out->samples = brush->lightdata + (i * mod_lightmap_bytes);
 
 		// set the drawing flags flag
 		if (!out->texinfo->texture || !out->texinfo->texture->name)
@@ -596,6 +600,7 @@ Mod_LoadNodes (model_t *mod, bsp_t *bsp)
 	dnode_t    *in;
 	int			count, i, j, p;
 	mnode_t    *out;
+	mod_brush_t *brush = &mod->brush;
 
 	in = bsp->nodes;
 	count = bsp->numnodes;
@@ -606,8 +611,8 @@ Mod_LoadNodes (model_t *mod, bsp_t *bsp)
 						"%i nodes exceeds standard limit of 32767.\n", count);
 	}
 
-	mod->nodes = out;
-	mod->numnodes = count;
+	brush->nodes = out;
+	brush->numnodes = count;
 
 	for (i = 0; i < count; i++, in++, out++) {
 		for (j = 0; j < 3; j++) {
@@ -616,7 +621,7 @@ Mod_LoadNodes (model_t *mod, bsp_t *bsp)
 		}
 
 		p = in->planenum;
-		out->plane = mod->planes + p;
+		out->plane = brush->planes + p;
 
 		out->firstsurface = in->firstface;
 		out->numsurfaces = in->numfaces;
@@ -625,23 +630,23 @@ Mod_LoadNodes (model_t *mod, bsp_t *bsp)
 			p = in->children[j];
 			// this check is for extended bsp 29 files
 			if (p >= 0) {
-				out->children[j] = mod->nodes + p;
+				out->children[j] = brush->nodes + p;
 			} else {
 				p = ~p;
-				if (p < mod->numleafs) {
-					out->children[j] = (mnode_t *) (mod->leafs + p);
+				if (p < brush->numleafs) {
+					out->children[j] = (mnode_t *) (brush->leafs + p);
 				} else {
 					Sys_Printf ("Mod_LoadNodes: invalid leaf index %i "
 								"(file has only %i leafs)\n", p,
-								mod->numleafs);
+								brush->numleafs);
 					//map it to the solid leaf
-					out->children[j] = (mnode_t *)(mod->leafs);
+					out->children[j] = (mnode_t *)(brush->leafs);
 				}
 			}
 		}
 	}
 
-	Mod_SetParent (mod->nodes, NULL);	// sets nodes and leafs
+	Mod_SetParent (brush->nodes, NULL);	// sets nodes and leafs
 }
 
 static void
@@ -651,13 +656,14 @@ Mod_LoadLeafs (model_t *mod, bsp_t *bsp)
 	int			count, i, j, p;
 	mleaf_t    *out;
 	qboolean    isnotmap = true;
+	mod_brush_t *brush = &mod->brush;
 
 	in = bsp->leafs;
 	count = bsp->numleafs;
 	out = Hunk_AllocName (count * sizeof (*out), mod->name);
 
-	mod->leafs = out;
-	mod->numleafs = count;
+	brush->leafs = out;
+	brush->numleafs = count;
 //	snprintf(s, sizeof (s), "maps/%s.bsp",
 //	Info_ValueForKey(cl.serverinfo,"map"));
 	if (!strncmp ("maps/", mod->path, 5))
@@ -671,14 +677,14 @@ Mod_LoadLeafs (model_t *mod, bsp_t *bsp)
 		p = in->contents;
 		out->contents = p;
 
-		out->firstmarksurface = mod->marksurfaces + in->firstmarksurface;
+		out->firstmarksurface = brush->marksurfaces + in->firstmarksurface;
 		out->nummarksurfaces = in->nummarksurfaces;
 
 		p = in->visofs;
 		if (p == -1)
 			out->compressed_vis = NULL;
 		else
-			out->compressed_vis = mod->visdata + p;
+			out->compressed_vis = brush->visdata + p;
 		out->efrags = NULL;
 
 		for (j = 0; j < 4; j++)
@@ -703,6 +709,7 @@ Mod_LoadClipnodes (model_t *mod, bsp_t *bsp)
 	mclipnode_t *out;
 	hull_t		*hull;
 	int			 count, i;
+	mod_brush_t *brush = &mod->brush;
 
 	in = bsp->clipnodes;
 	count = bsp->numclipnodes;
@@ -714,15 +721,15 @@ Mod_LoadClipnodes (model_t *mod, bsp_t *bsp)
 						count);
 	}
 
-	mod->clipnodes = out;
-	mod->numclipnodes = count;
+	brush->clipnodes = out;
+	brush->numclipnodes = count;
 
-	hull = &mod->hulls[1];
-	mod->hull_list[1] = hull;
+	hull = &brush->hulls[1];
+	brush->hull_list[1] = hull;
 	hull->clipnodes = out;
 	hull->firstclipnode = 0;
 	hull->lastclipnode = count - 1;
-	hull->planes = mod->planes;
+	hull->planes = brush->planes;
 	hull->clip_mins[0] = -16;
 	hull->clip_mins[1] = -16;
 	hull->clip_mins[2] = -24;
@@ -730,12 +737,12 @@ Mod_LoadClipnodes (model_t *mod, bsp_t *bsp)
 	hull->clip_maxs[1] = 16;
 	hull->clip_maxs[2] = 32;
 
-	hull = &mod->hulls[2];
-	mod->hull_list[2] = hull;
+	hull = &brush->hulls[2];
+	brush->hull_list[2] = hull;
 	hull->clipnodes = out;
 	hull->firstclipnode = 0;
 	hull->lastclipnode = count - 1;
-	hull->planes = mod->planes;
+	hull->planes = brush->planes;
 	hull->clip_mins[0] = -32;
 	hull->clip_mins[1] = -32;
 	hull->clip_mins[2] = -24;
@@ -745,7 +752,7 @@ Mod_LoadClipnodes (model_t *mod, bsp_t *bsp)
 
 	for (i = 0; i < count; i++, out++, in++) {
 		out->planenum = in->planenum;
-		if (out->planenum < 0 || out->planenum >= mod->numplanes)
+		if (out->planenum < 0 || out->planenum >= brush->numplanes)
 			Sys_Error ("Mod_LoadClipnodes: planenum out of bounds");
 		out->children[0] = in->children[0];
 		out->children[1] = in->children[1];
@@ -776,27 +783,28 @@ Mod_MakeHull0 (model_t *mod)
 	hull_t		*hull;
 	int			 count, i, j;
 	mnode_t		*in, *child;
+	mod_brush_t *brush = &mod->brush;
 
-	hull = &mod->hulls[0];
-	mod->hull_list[0] = hull;
+	hull = &brush->hulls[0];
+	brush->hull_list[0] = hull;
 
-	in = mod->nodes;
-	count = mod->numnodes;
+	in = brush->nodes;
+	count = brush->numnodes;
 	out = Hunk_AllocName (count * sizeof (*out), mod->name);
 
 	hull->clipnodes = out;
 	hull->firstclipnode = 0;
 	hull->lastclipnode = count - 1;
-	hull->planes = mod->planes;
+	hull->planes = brush->planes;
 
 	for (i = 0; i < count; i++, out++, in++) {
-		out->planenum = in->plane - mod->planes;
+		out->planenum = in->plane - brush->planes;
 		for (j = 0; j < 2; j++) {
 			child = in->children[j];
 			if (child->contents < 0)
 				out->children[j] = child->contents;
 			else
-				out->children[j] = child - mod->nodes;
+				out->children[j] = child - brush->nodes;
 		}
 	}
 }
@@ -807,6 +815,7 @@ Mod_LoadMarksurfaces (model_t *mod, bsp_t *bsp)
 	int			 count, i, j;
 	msurface_t **out;
 	uint32_t    *in;
+	mod_brush_t *brush = &mod->brush;
 
 	in = bsp->marksurfaces;
 	count = bsp->nummarksurfaces;
@@ -818,14 +827,14 @@ Mod_LoadMarksurfaces (model_t *mod, bsp_t *bsp)
 						count);
 	}
 
-	mod->marksurfaces = out;
-	mod->nummarksurfaces = count;
+	brush->marksurfaces = out;
+	brush->nummarksurfaces = count;
 
 	for (i = 0; i < count; i++) {
 		j = in[i];
-		if (j >= mod->numsurfaces)
+		if (j >= brush->numsurfaces)
 			Sys_Error ("Mod_ParseMarksurfaces: bad surface number");
-		out[i] = mod->surfaces + j;
+		out[i] = brush->surfaces + j;
 	}
 }
 
@@ -835,13 +844,14 @@ Mod_LoadSurfedges (model_t *mod, bsp_t *bsp)
 	int          count, i;
 	int32_t     *in;
 	int         *out;
+	mod_brush_t *brush = &mod->brush;
 
 	in = bsp->surfedges;
 	count = bsp->numsurfedges;
 	out = Hunk_AllocName (count * sizeof (*out), mod->name);
 
-	mod->surfedges = out;
-	mod->numsurfedges = count;
+	brush->surfedges = out;
+	brush->numsurfedges = count;
 
 	for (i = 0; i < count; i++)
 		out[i] = in[i];
@@ -853,13 +863,14 @@ Mod_LoadPlanes (model_t *mod, bsp_t *bsp)
 	dplane_t   *in;
 	int			bits, count, i, j;
 	plane_t    *out;
+	mod_brush_t *brush = &mod->brush;
 
 	in = bsp->planes;
 	count = bsp->numplanes;
 	out = Hunk_AllocName (count * 2 * sizeof (*out), mod->name);
 
-	mod->planes = out;
-	mod->numplanes = count;
+	brush->planes = out;
+	brush->numplanes = count;
 
 	for (i = 0; i < count; i++, in++, out++) {
 		bits = 0;
@@ -881,12 +892,13 @@ do_checksums (const bsp_t *bsp, void *_mod)
 	int         i;
 	model_t    *mod = (model_t *) _mod;
 	byte       *base;
+	mod_brush_t *brush = &mod->brush;
 
 	base = (byte *) bsp->header;
 
 	// checksum all of the map, except for entities
-	mod->checksum = 0;
-	mod->checksum2 = 0;
+	brush->checksum = 0;
+	brush->checksum2 = 0;
 	for (i = 0; i < HEADER_LUMPS; i++) {
 		lump_t     *lump = bsp->header->lumps + i;
 		int         csum;
@@ -894,30 +906,30 @@ do_checksums (const bsp_t *bsp, void *_mod)
 		if (i == LUMP_ENTITIES)
 			continue;
 		csum = Com_BlockChecksum (base + lump->fileofs, lump->filelen);
-		mod->checksum ^= csum;
+		brush->checksum ^= csum;
 
 		if (i != LUMP_VISIBILITY && i != LUMP_LEAFS && i != LUMP_NODES)
-			mod->checksum2 ^= csum;
+			brush->checksum2 ^= csum;
 	}
 }
 
 static void
-recurse_draw_tree (model_t *mod, mnode_t *node, int depth)
+recurse_draw_tree (mod_brush_t *brush, mnode_t *node, int depth)
 {
 	if (!node || node->contents < 0) {
-		if (depth > mod->depth)
-			mod->depth = depth;
+		if (depth > brush->depth)
+			brush->depth = depth;
 		return;
 	}
-	recurse_draw_tree (mod, node->children[0], depth + 1);
-	recurse_draw_tree (mod, node->children[1], depth + 1);
+	recurse_draw_tree (brush, node->children[0], depth + 1);
+	recurse_draw_tree (brush, node->children[1], depth + 1);
 }
 
 static void
-Mod_FindDrawDepth (model_t *mod)
+Mod_FindDrawDepth (mod_brush_t *brush)
 {
-	mod->depth = 0;
-	recurse_draw_tree (mod, mod->nodes, 1);
+	brush->depth = 0;
+	recurse_draw_tree (brush, brush->nodes, 1);
 }
 
 void
@@ -954,35 +966,35 @@ Mod_LoadBrushModel (model_t *mod, void *buffer)
 
 	Mod_MakeHull0 (mod);
 
-	Mod_FindDrawDepth (mod);
+	Mod_FindDrawDepth (&mod->brush);
 	for (i = 0; i < MAX_MAP_HULLS; i++)
-		Mod_FindClipDepth (&mod->hulls[i]);
+		Mod_FindClipDepth (&mod->brush.hulls[i]);
 
 	mod->numframes = 2;					// regular and alternate animation
 
 	// set up the submodels (FIXME: this is confusing)
-	for (i = 0; i < mod->numsubmodels; i++) {
-		bm = &mod->submodels[i];
+	for (i = 0; i < mod->brush.numsubmodels; i++) {
+		bm = &mod->brush.submodels[i];
 
-		mod->hulls[0].firstclipnode = bm->headnode[0];
-		mod->hull_list[0] = &mod->hulls[0];
+		mod->brush.hulls[0].firstclipnode = bm->headnode[0];
+		mod->brush.hull_list[0] = &mod->brush.hulls[0];
 		for (j = 1; j < MAX_MAP_HULLS; j++) {
-			mod->hulls[j].firstclipnode = bm->headnode[j];
-			mod->hulls[j].lastclipnode = mod->numclipnodes - 1;
-			mod->hull_list[j] = &mod->hulls[j];
+			mod->brush.hulls[j].firstclipnode = bm->headnode[j];
+			mod->brush.hulls[j].lastclipnode = mod->brush.numclipnodes - 1;
+			mod->brush.hull_list[j] = &mod->brush.hulls[j];
 		}
 
-		mod->firstmodelsurface = bm->firstface;
-		mod->nummodelsurfaces = bm->numfaces;
+		mod->brush.firstmodelsurface = bm->firstface;
+		mod->brush.nummodelsurfaces = bm->numfaces;
 
 		VectorCopy (bm->maxs, mod->maxs);
 		VectorCopy (bm->mins, mod->mins);
 
 		mod->radius = RadiusFromBounds (mod->mins, mod->maxs);
 
-		mod->numleafs = bm->visleafs;
+		mod->brush.numleafs = bm->visleafs;
 
-		if (i < mod->numsubmodels - 1) {
+		if (i < mod->brush.numsubmodels - 1) {
 			// duplicate the basic information
 			char	name[12];
 
diff --git a/libs/models/brush/sw_model_brush.c b/libs/models/brush/sw_model_brush.c
index 65a0e4e48..84080d49d 100644
--- a/libs/models/brush/sw_model_brush.c
+++ b/libs/models/brush/sw_model_brush.c
@@ -45,9 +45,9 @@ sw_Mod_LoadLighting (model_t *mod, bsp_t *bsp)
 {
 	mod_lightmap_bytes = 1;
 	if (!bsp->lightdatasize) {
-		mod->lightdata = NULL;
+		mod->brush.lightdata = NULL;
 		return;
 	}
-	mod->lightdata = Hunk_AllocName (bsp->lightdatasize, mod->name);
-	memcpy (mod->lightdata, bsp->lightdata, bsp->lightdatasize);
+	mod->brush.lightdata = Hunk_AllocName (bsp->lightdatasize, mod->name);
+	memcpy (mod->brush.lightdata, bsp->lightdata, bsp->lightdatasize);
 }
diff --git a/libs/models/brush/vulkan_model_brush.c b/libs/models/brush/vulkan_model_brush.c
index ce9fd1e7e..55eacb90b 100644
--- a/libs/models/brush/vulkan_model_brush.c
+++ b/libs/models/brush/vulkan_model_brush.c
@@ -69,9 +69,10 @@ static void vulkan_brush_clear (model_t *mod, void *data)
 	vulkan_ctx_t *ctx = mctx->ctx;
 	qfv_device_t *device = ctx->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
+	mod_brush_t *brush = &mod->brush;
 
-	for (int i = 0; i < mod->numtextures; i++) {
-		texture_t  *tx = mod->textures[i];
+	for (int i = 0; i < brush->numtextures; i++) {
+		texture_t  *tx = brush->textures[i];
 		if (!tx) {
 			continue;
 		}
@@ -180,12 +181,13 @@ load_textures (model_t *mod, vulkan_ctx_t *ctx)
 	modelctx_t *mctx = mod->data;
 	VkImage     image = 0;
 	byte       *buffer;
+	mod_brush_t *brush = &mod->brush;
 
 	size_t      image_count = 0;
 	size_t      copy_count = 0;
 	size_t      memsize = 0;
-	for (int i = 0; i < mod->numtextures; i++) {
-		texture_t  *tx = mod->textures[i];
+	for (int i = 0; i < brush->numtextures; i++) {
+		texture_t  *tx = brush->textures[i];
 		if (!tx) {
 			continue;
 		}
@@ -221,8 +223,8 @@ load_textures (model_t *mod, vulkan_ctx_t *ctx)
 	qfv_packet_t *packet = QFV_PacketAcquire (stage);
 	buffer = QFV_PacketExtend (packet, memsize);
 
-	for (int i = 0; i < mod->numtextures; i++) {
-		texture_t  *tx = mod->textures[i];
+	for (int i = 0; i < brush->numtextures; i++) {
+		texture_t  *tx = brush->textures[i];
 		byte       *palette = vid.palette32;
 		if (!tx) {
 			continue;
@@ -275,8 +277,8 @@ load_textures (model_t *mod, vulkan_ctx_t *ctx)
 
 	__auto_type barriers = QFV_AllocImageBarrierSet (image_count, malloc);
 	barriers->size = 0;
-	for (int i = 0; i < mod->numtextures; i++) {
-		texture_t  *tx = mod->textures[i];
+	for (int i = 0; i < brush->numtextures; i++) {
+		texture_t  *tx = brush->textures[i];
 		if (!tx) {
 			continue;
 		}
@@ -296,8 +298,8 @@ load_textures (model_t *mod, vulkan_ctx_t *ctx)
 	dfunc->vkCmdPipelineBarrier (packet->cmd, stages.src, stages.dst,
 								 0, 0, 0, 0, 0,
 								 barriers->size, barriers->a);
-	for (int i = 0, j = 0; i < mod->numtextures; i++) {
-		texture_t  *tx = mod->textures[i];
+	for (int i = 0, j = 0; i < brush->numtextures; i++) {
+		texture_t  *tx = brush->textures[i];
 		if (!tx) {
 			continue;
 		}
@@ -401,9 +403,11 @@ Vulkan_Mod_ProcessTexture (model_t *mod, texture_t *tx, vulkan_ctx_t *ctx)
 void
 Vulkan_Mod_LoadLighting (model_t *mod, bsp_t *bsp, vulkan_ctx_t *ctx)
 {
+	mod_brush_t *brush = &mod->brush;
+
 	mod_lightmap_bytes = 3;
 	if (!bsp->lightdatasize) {
-		mod->lightdata = NULL;
+		brush->lightdata = NULL;
 		return;
 	}
 
@@ -413,7 +417,7 @@ Vulkan_Mod_LoadLighting (model_t *mod, bsp_t *bsp, vulkan_ctx_t *ctx)
 	int         ver;
 	QFile      *lit_file;
 
-	mod->lightdata = 0;
+	brush->lightdata = 0;
 	if (mod_lightmap_bytes > 1) {
 		// LordHavoc: check for a .lit file to load
 		dstring_t  *litfilename = dstring_new ();
@@ -428,7 +432,7 @@ Vulkan_Mod_LoadLighting (model_t *mod, bsp_t *bsp, vulkan_ctx_t *ctx)
 				ver = LittleLong (((int32_t *) data)[1]);
 				if (ver == 1) {
 					Sys_MaskPrintf (SYS_DEV, "%s loaded", litfilename->str);
-					mod->lightdata = data + 8;
+					brush->lightdata = data + 8;
 				} else {
 					Sys_MaskPrintf (SYS_DEV,
 									"Unknown .lit file version (%d)\n", ver);
@@ -439,13 +443,13 @@ Vulkan_Mod_LoadLighting (model_t *mod, bsp_t *bsp, vulkan_ctx_t *ctx)
 		}
 		dstring_delete (litfilename);
 	}
-	if (mod->lightdata || !bsp->lightdatasize) {
+	if (brush->lightdata || !bsp->lightdatasize) {
 		return;
 	}
 	// LordHavoc: oh well, expand the white lighting data
-	mod->lightdata = Hunk_AllocName (bsp->lightdatasize * 3, mod->name);
+	brush->lightdata = Hunk_AllocName (bsp->lightdatasize * 3, mod->name);
 	in = bsp->lightdata;
-	out = mod->lightdata;
+	out = brush->lightdata;
 
 	for (i = 0; i < bsp->lightdatasize ; i++) {
 		d = *in++;
diff --git a/libs/video/renderer/gl/gl_lightmap.c b/libs/video/renderer/gl/gl_lightmap.c
index 6eed72124..c6270f5d4 100644
--- a/libs/video/renderer/gl/gl_lightmap.c
+++ b/libs/video/renderer/gl/gl_lightmap.c
@@ -74,7 +74,7 @@ glRect_t	 gl_lightmap_rectchange[MAX_LIGHTMAPS];
 
 static int	 lmshift = 7;
 
-void (*gl_R_BuildLightMap) (msurface_t *surf);
+void (*gl_R_BuildLightMap) (mod_brush_t *brush, msurface_t *surf);
 
 extern void gl_multitexture_f (cvar_t *var);
 
@@ -240,7 +240,7 @@ R_AddDynamicLights_3 (msurface_t *surf)
 }
 
 static void
-R_BuildLightMap_1 (msurface_t *surf)
+R_BuildLightMap_1 (mod_brush_t *brush, msurface_t *surf)
 {
 	byte		   *dest;
 	int				maps, size, stride, smax, tmax, i, j;
@@ -254,7 +254,7 @@ R_BuildLightMap_1 (msurface_t *surf)
 	size = smax * tmax * gl_internalformat;
 
 	// set to full bright if no light data
-	if (!r_worldentity.model->lightdata) {
+	if (!brush->lightdata) {
 		memset (&blocklights[0], 0xff, size * sizeof(int));
 		goto store;
 	}
@@ -300,7 +300,7 @@ R_BuildLightMap_1 (msurface_t *surf)
 }
 
 static void
-R_BuildLightMap_3 (msurface_t *surf)
+R_BuildLightMap_3 (mod_brush_t *brush, msurface_t *surf)
 {
 	byte		   *dest;
 	int				maps, size, stride, smax, tmax, i, j;
@@ -314,7 +314,7 @@ R_BuildLightMap_3 (msurface_t *surf)
 	size = smax * tmax * gl_internalformat;
 
 	// set to full bright if no light data
-	if (!r_worldentity.model->lightdata) {
+	if (!brush->lightdata) {
 		memset (&blocklights[0], 0xff, size * sizeof(int));
 		goto store;
 	}
@@ -365,7 +365,7 @@ R_BuildLightMap_3 (msurface_t *surf)
 }
 
 static void
-R_BuildLightMap_4 (msurface_t *surf)
+R_BuildLightMap_4 (mod_brush_t *brush, msurface_t *surf)
 {
 	byte		   *dest;
 	int				maps, size, smax, tmax, i, j, stride;
@@ -379,7 +379,7 @@ R_BuildLightMap_4 (msurface_t *surf)
 	size = smax * tmax * gl_internalformat;
 
 	// set to full bright if no light data
-	if (!r_worldentity.model->lightdata) {
+	if (!brush->lightdata) {
 		memset (&blocklights[0], 0xff, size * sizeof(int));
 		goto store;
 	}
@@ -535,6 +535,7 @@ gl_overbright_f (cvar_t *var)
 	model_t		*m;
 	msurface_t  *fa;
 	entity_t    *ent;
+	mod_brush_t *brush;
 
 	if (!var)
 		return;
@@ -588,7 +589,8 @@ gl_overbright_f (cvar_t *var)
 		if (m->path[0] == '*')
 			continue;
 
-		for (j = 0, fa = m->surfaces; j < m->numsurfaces; j++, fa++) {
+		brush = &m->brush;
+		for (j = 0, fa = brush->surfaces; j < brush->numsurfaces; j++, fa++) {
 			if (fa->flags & (SURF_DRAWTURB | SURF_DRAWSKY))
 				continue;
 
@@ -599,13 +601,13 @@ gl_overbright_f (cvar_t *var)
 			gl_lightmap_rectchange[num].w = BLOCK_WIDTH;
 			gl_lightmap_rectchange[num].h = BLOCK_HEIGHT;
 
-			gl_R_BuildLightMap (fa);
+			gl_R_BuildLightMap (brush, fa);
 		}
 	}
 
-	m = r_worldentity.model;
+	brush = &r_worldentity.model->brush;
 
-	for (i = 0, fa = m->surfaces; i < m->numsurfaces; i++, fa++) {
+	for (i = 0, fa = brush->surfaces; i < brush->numsurfaces; i++, fa++) {
 		if (fa->flags & (SURF_DRAWTURB | SURF_DRAWSKY))
 			continue;
 
@@ -616,7 +618,7 @@ gl_overbright_f (cvar_t *var)
 		gl_lightmap_rectchange[num].w = BLOCK_WIDTH;
 		gl_lightmap_rectchange[num].h = BLOCK_HEIGHT;
 
-		gl_R_BuildLightMap (fa);
+		gl_R_BuildLightMap (brush, fa);
 	}
 }
 
@@ -665,7 +667,7 @@ AllocBlock (int w, int h, int *x, int *y)
 }
 
 static void
-GL_CreateSurfaceLightmap (msurface_t *surf)
+GL_CreateSurfaceLightmap (mod_brush_t *brush, msurface_t *surf)
 {
 	int         smax, tmax;
 
@@ -677,7 +679,7 @@ GL_CreateSurfaceLightmap (msurface_t *surf)
 
 	surf->lightmaptexturenum =
 		AllocBlock (smax, tmax, &surf->light_s, &surf->light_t);
-	gl_R_BuildLightMap (surf);
+	gl_R_BuildLightMap (brush, surf);
 }
 
 /*
@@ -690,6 +692,7 @@ GL_BuildLightmaps (model_t **models, int num_models)
 {
 	int         i, j;
 	model_t    *m;
+	mod_brush_t *brush;
 
 	memset (allocated, 0, sizeof (allocated));
 
@@ -732,21 +735,22 @@ GL_BuildLightmaps (model_t **models, int num_models)
 		m = models[j];
 		if (!m)
 			break;
-		if (m->path[0] == '*') {
+		if (m->path[0] == '*' || m->type != mod_brush) {
 			// sub model surfaces are processed as part of the main model
 			continue;
 		}
-		r_pcurrentvertbase = m->vertexes;
+		brush = &m->brush;
+		r_pcurrentvertbase = brush->vertexes;
 		gl_currentmodel = m;
 		// non-bsp models don't have surfaces.
-		for (i = 0; i < m->numsurfaces; i++) {
-			if (m->surfaces[i].flags & SURF_DRAWTURB)
+		for (i = 0; i < brush->numsurfaces; i++) {
+			if (brush->surfaces[i].flags & SURF_DRAWTURB)
 				continue;
-			if (gl_sky_divide->int_val && (m->surfaces[i].flags &
+			if (gl_sky_divide->int_val && (brush->surfaces[i].flags &
 										   SURF_DRAWSKY))
 				continue;
-			GL_CreateSurfaceLightmap (m->surfaces + i);
-			GL_BuildSurfaceDisplayList (m->surfaces + i);
+			GL_CreateSurfaceLightmap (brush, brush->surfaces + i);
+			GL_BuildSurfaceDisplayList (brush->surfaces + i);
 		}
 	}
 
diff --git a/libs/video/renderer/gl/gl_mod_alias.c b/libs/video/renderer/gl/gl_mod_alias.c
index 44a114ff5..d47a1504f 100644
--- a/libs/video/renderer/gl/gl_mod_alias.c
+++ b/libs/video/renderer/gl/gl_mod_alias.c
@@ -436,7 +436,7 @@ gl_R_DrawAliasModel (entity_t *e)
 		float lightadj;
 
 		// get lighting information
-		R_LightPoint (e->origin);
+		R_LightPoint (&r_worldentity.model->brush, e->origin);
 
 		lightadj = (ambientcolor[0] + ambientcolor[1] + ambientcolor[2]) / 765.0;
 
diff --git a/libs/video/renderer/gl/gl_rmisc.c b/libs/video/renderer/gl/gl_rmisc.c
index 5946c98bd..5c61fd70d 100644
--- a/libs/video/renderer/gl/gl_rmisc.c
+++ b/libs/video/renderer/gl/gl_rmisc.c
@@ -167,13 +167,13 @@ gl_R_Init (void)
 }
 
 static void
-register_textures (model_t *model)
+register_textures (mod_brush_t *brush)
 {
 	int         i;
 	texture_t  *tex;
 
-	for (i = 0; i < model->numtextures; i++) {
-		tex = model->textures[i];
+	for (i = 0; i < brush->numtextures; i++) {
+		tex = brush->textures[i];
 		if (!tex)
 			continue;
 		gl_R_AddTexture (tex);
@@ -185,18 +185,20 @@ gl_R_NewMap (model_t *worldmodel, struct model_s **models, int num_models)
 {
 	int         i;
 	texture_t  *tex;
+	mod_brush_t *brush;
 
 	for (i = 0; i < 256; i++)
 		d_lightstylevalue[i] = 264;		// normal light value
 
 	memset (&r_worldentity, 0, sizeof (r_worldentity));
 	r_worldentity.model = worldmodel;
+	brush = &worldmodel->brush;
 
 	R_FreeAllEntities ();
 
 	// clear out efrags in case the level hasn't been reloaded
-	for (i = 0; i < r_worldentity.model->numleafs; i++)
-		r_worldentity.model->leafs[i].efrags = NULL;
+	for (i = 0; i < brush->numleafs; i++)
+		brush->leafs[i].efrags = NULL;
 
 	// Force a vis update
 	r_viewleaf = NULL;
@@ -209,8 +211,8 @@ gl_R_NewMap (model_t *worldmodel, struct model_s **models, int num_models)
 	// identify sky texture
 	gl_mirrortexturenum = -1;
 	gl_R_ClearTextures ();
-	for (i = 0; i < r_worldentity.model->numtextures; i++) {
-		tex = r_worldentity.model->textures[i];
+	for (i = 0; i < brush->numtextures; i++) {
+		tex = brush->textures[i];
 		if (!tex)
 			continue;
 		if (!strncmp (tex->name, "sky", 3)) {
@@ -220,16 +222,16 @@ gl_R_NewMap (model_t *worldmodel, struct model_s **models, int num_models)
 			gl_mirrortexturenum = i;
 	}
 
-	gl_R_InitSurfaceChains (r_worldentity.model);
+	gl_R_InitSurfaceChains (brush);
 	gl_R_AddTexture (r_notexture_mip);
-	register_textures (r_worldentity.model);
+	register_textures (brush);
 	for (i = 0; i < num_models; i++) {
 		if (!models[i])
 			continue;
 		if (*models[i]->path == '*')
 			continue;
 		if (models[i] != r_worldentity.model && models[i]->type == mod_brush)
-			register_textures (models[i]);
+			register_textures (&models[i]->brush);
 	}
 }
 
diff --git a/libs/video/renderer/gl/gl_rsurf.c b/libs/video/renderer/gl/gl_rsurf.c
index f673e4cc4..acd9f4ad3 100644
--- a/libs/video/renderer/gl/gl_rsurf.c
+++ b/libs/video/renderer/gl/gl_rsurf.c
@@ -146,15 +146,15 @@ gl_R_AddTexture (texture_t *tx)
 }
 
 void
-gl_R_InitSurfaceChains (model_t *model)
+gl_R_InitSurfaceChains (mod_brush_t *brush)
 {
 	int         i;
 
 	if (static_chains)
 		free (static_chains);
-	static_chains = calloc (model->nummodelsurfaces, sizeof (instsurf_t));
-	for (i = 0; i < model->nummodelsurfaces; i++)
-		model->surfaces[i].instsurf = static_chains + i;
+	static_chains = calloc (brush->nummodelsurfaces, sizeof (instsurf_t));
+	for (i = 0; i < brush->nummodelsurfaces; i++)
+		brush->surfaces[i].instsurf = static_chains + i;
 
 	release_instsurfs ();
 }
@@ -267,7 +267,7 @@ R_RenderBrushPoly_1 (msurface_t *fa)
 }
 
 static inline void
-R_AddToLightmapChain (msurface_t *fa)
+R_AddToLightmapChain (mod_brush_t *brush, msurface_t *fa)
 {
 	int		maps, smax, tmax;
 	glRect_t 	*theRect;
@@ -306,7 +306,7 @@ R_AddToLightmapChain (msurface_t *fa)
 				theRect->w = (fa->light_s - theRect->l) + smax;
 			if ((theRect->h + theRect->t) < (fa->light_t + tmax))
 				theRect->h = (fa->light_t - theRect->t) + tmax;
-			gl_R_BuildLightMap (fa);
+			gl_R_BuildLightMap (brush, fa);
 		}
 	}
 }
@@ -490,7 +490,8 @@ clear_texture_chains (void)
 }
 
 static inline void
-chain_surface (msurface_t *surf, vec_t *transform, float *color)
+chain_surface (mod_brush_t *brush, msurface_t *surf, vec_t *transform,
+			   float *color)
 {
 	instsurf_t *sc;
 
@@ -509,7 +510,7 @@ chain_surface (msurface_t *surf, vec_t *transform, float *color)
 		tex = tx->render;
 		CHAIN_SURF_F2B (surf, tex->tex_chain);
 
-		R_AddToLightmapChain (surf);
+		R_AddToLightmapChain (brush, surf);
 	}
 	if (!(sc = surf->instsurf))
 		sc = surf->tinst;
@@ -528,8 +529,10 @@ gl_R_DrawBrushModel (entity_t *e)
 	msurface_t *psurf;
 	qboolean    rotated;
 	vec3_t      mins, maxs;
+	mod_brush_t *brush;
 
 	model = e->model;
+	brush = &model->brush;
 
 	if (e->transform[0] != 1 || e->transform[5] != 1 || e->transform[10] != 1) {
 		rotated = true;
@@ -565,7 +568,7 @@ gl_R_DrawBrushModel (entity_t *e)
 	}
 
 	// calculate dynamic lighting for bmodel if it's not an instanced model
-	if (model->firstmodelsurface != 0 && r_dlight_lightmap->int_val) {
+	if (brush->firstmodelsurface != 0 && r_dlight_lightmap->int_val) {
 		vec3_t      lightorigin;
 
 		for (k = 0; k < r_maxdlights; k++) {
@@ -574,8 +577,8 @@ gl_R_DrawBrushModel (entity_t *e)
 				continue;
 
 			VectorSubtract (r_dlights[k].origin, e->origin, lightorigin);
-			R_RecursiveMarkLights (lightorigin, &r_dlights[k], k,
-							model->nodes + model->hulls[0].firstclipnode);
+			R_RecursiveMarkLights (brush, lightorigin, &r_dlights[k], k,
+							brush->nodes + brush->hulls[0].firstclipnode);
 		}
 	}
 
@@ -584,10 +587,10 @@ gl_R_DrawBrushModel (entity_t *e)
 	qfglGetFloatv (GL_MODELVIEW_MATRIX, e->full_transform);
 	qfglPopMatrix ();
 
-	psurf = &model->surfaces[model->firstmodelsurface];
+	psurf = &brush->surfaces[brush->firstmodelsurface];
 
 	// draw texture
-	for (i = 0; i < model->nummodelsurfaces; i++, psurf++) {
+	for (i = 0; i < brush->nummodelsurfaces; i++, psurf++) {
 		// find which side of the node we are on
 		pplane = psurf->plane;
 
@@ -596,7 +599,7 @@ gl_R_DrawBrushModel (entity_t *e)
 		// draw the polygon
 		if (((psurf->flags & SURF_PLANEBACK) && (dot < -BACKFACE_EPSILON)) ||
 			(!(psurf->flags & SURF_PLANEBACK) && (dot > BACKFACE_EPSILON))) {
-			chain_surface (psurf, e->full_transform, e->colormod);
+			chain_surface (brush, psurf, e->full_transform, e->colormod);
 		}
 	}
 }
@@ -623,7 +626,7 @@ get_side (mnode_t *node)
 }
 
 static inline void
-visit_node (mnode_t *node, int side)
+visit_node (mod_brush_t *brush, mnode_t *node, int side)
 {
 	int         c;
 	msurface_t *surf;
@@ -632,7 +635,7 @@ visit_node (mnode_t *node, int side)
 	side = (~side + 1) & SURF_PLANEBACK;
 	// draw stuff
 	if ((c = node->numsurfaces)) {
-		surf = r_worldentity.model->surfaces + node->firstsurface;
+		surf = brush->surfaces + node->firstsurface;
 		for (; c; c--, surf++) {
 			if (surf->visframe != r_visframecount)
 				continue;
@@ -641,7 +644,7 @@ visit_node (mnode_t *node, int side)
 			if (side ^ (surf->flags & SURF_PLANEBACK))
 				continue;				// wrong side
 
-			chain_surface (surf, 0, 0);
+			chain_surface (brush, surf, 0, 0);
 		}
 	}
 }
@@ -659,7 +662,7 @@ test_node (mnode_t *node)
 }
 
 static void
-R_VisitWorldNodes (model_t *model)
+R_VisitWorldNodes (mod_brush_t *brush)
 {
 	typedef struct {
 		mnode_t    *node;
@@ -671,9 +674,9 @@ R_VisitWorldNodes (model_t *model)
 	mnode_t    *front;
 	int         side;
 
-	node = model->nodes;
+	node = brush->nodes;
 	// +2 for paranoia
-	node_stack = alloca ((model->depth + 2) * sizeof (rstack_t));
+	node_stack = alloca ((brush->depth + 2) * sizeof (rstack_t));
 	node_ptr = node_stack;
 
 	while (1) {
@@ -689,7 +692,7 @@ R_VisitWorldNodes (model_t *model)
 			}
 			if (front->contents < 0 && front->contents != CONTENTS_SOLID)
 				visit_leaf ((mleaf_t *) front);
-			visit_node (node, side);
+			visit_node (brush, node, side);
 			node = node->children[!side];
 		}
 		if (node->contents < 0 && node->contents != CONTENTS_SOLID)
@@ -698,7 +701,7 @@ R_VisitWorldNodes (model_t *model)
 			node_ptr--;
 			node = node_ptr->node;
 			side = node_ptr->side;
-			visit_node (node, side);
+			visit_node (brush, node, side);
 			node = node->children[!side];
 			continue;
 		}
@@ -726,7 +729,7 @@ gl_R_DrawWorld (void)
 		gl_R_DrawSky ();
 	}
 
-	R_VisitWorldNodes (r_worldentity.model);
+	R_VisitWorldNodes (&r_worldentity.model->brush);
 	if (r_drawentities->int_val) {
 		entity_t   *ent;
 		for (ent = r_ent_queue; ent; ent = ent->next) {
@@ -821,7 +824,7 @@ GL_BuildSurfaceDisplayList (msurface_t *fa)
 	medge_t    *pedges, *r_pedge;
 
 	// reconstruct the polygon
-	pedges = gl_currentmodel->edges;
+	pedges = gl_currentmodel->brush.edges;
 	lnumverts = fa->numedges;
 
 	// draw texture
@@ -833,7 +836,7 @@ GL_BuildSurfaceDisplayList (msurface_t *fa)
 	poly->numverts = lnumverts;
 
 	for (i = 0; i < lnumverts; i++) {
-		lindex = gl_currentmodel->surfedges[fa->firstedge + i];
+		lindex = gl_currentmodel->brush.surfedges[fa->firstedge + i];
 
 		if (lindex > 0) {
 			r_pedge = &pedges[lindex];
diff --git a/libs/video/renderer/glsl/glsl_alias.c b/libs/video/renderer/glsl/glsl_alias.c
index 155845450..3cbf4f89d 100644
--- a/libs/video/renderer/glsl/glsl_alias.c
+++ b/libs/video/renderer/glsl/glsl_alias.c
@@ -159,7 +159,7 @@ calc_lighting (entity_t *ent, float *ambient, float *shadelight,
 	int         light;
 
 	VectorSet ( -1, 0, 0, lightvec);	//FIXME
-	light = R_LightPoint (ent->origin);
+	light = R_LightPoint (&r_worldentity.model->brush, ent->origin);
 	*ambient = max (light, max (ent->model->min_light, ent->min_light) * 128);
 	*shadelight = *ambient;
 
diff --git a/libs/video/renderer/glsl/glsl_bsp.c b/libs/video/renderer/glsl/glsl_bsp.c
index 8a6ee73f5..3b5ed0cd4 100644
--- a/libs/video/renderer/glsl/glsl_bsp.c
+++ b/libs/video/renderer/glsl/glsl_bsp.c
@@ -311,17 +311,17 @@ glsl_R_AddTexture (texture_t *tx)
 	tex->elechain_tail = &tex->elechain;
 }
 
-void
-glsl_R_InitSurfaceChains (model_t *model)
+static void
+glsl_R_InitSurfaceChains (mod_brush_t *brush)
 {
 	int         i;
 
 	release_static_instsurfs ();
 	release_instsurfs ();
 
-	for (i = 0; i < model->nummodelsurfaces; i++) {
-		model->surfaces[i].instsurf = get_static_instsurf ();
-		model->surfaces[i].instsurf->surface = &model->surfaces[i];
+	for (i = 0; i < brush->nummodelsurfaces; i++) {
+		brush->surfaces[i].instsurf = get_static_instsurf ();
+		brush->surfaces[i].instsurf->surface = &brush->surfaces[i];
 	}
 }
 
@@ -358,7 +358,7 @@ glsl_R_ClearElements (void)
 }
 
 static void
-update_lightmap (msurface_t *surf)
+update_lightmap (mod_brush_t *brush, msurface_t *surf)
 {
 	int         maps;
 
@@ -369,12 +369,13 @@ update_lightmap (msurface_t *surf)
 	if ((surf->dlightframe == r_framecount) || surf->cached_dlight) {
 dynamic:
 		if (r_dynamic->int_val)
-			glsl_R_BuildLightMap (surf);
+			glsl_R_BuildLightMap (brush, surf);
 	}
 }
 
 static inline void
-chain_surface (msurface_t *surf, vec_t *transform, float *color)
+chain_surface (mod_brush_t *brush, msurface_t *surf, vec_t *transform,
+			   float *color)
 {
 	instsurf_t *is;
 
@@ -393,7 +394,7 @@ chain_surface (msurface_t *surf, vec_t *transform, float *color)
 		tex = tx->render;
 		CHAIN_SURF_F2B (surf, tex->tex_chain);
 
-		update_lightmap (surf);
+		update_lightmap (brush, surf);
 	}
 	if (!(is = surf->instsurf))
 		is = surf->tinst;
@@ -402,13 +403,13 @@ chain_surface (msurface_t *surf, vec_t *transform, float *color)
 }
 
 static void
-register_textures (model_t *model)
+register_textures (mod_brush_t *brush)
 {
 	int         i;
 	texture_t  *tex;
 
-	for (i = 0; i < model->numtextures; i++) {
-		tex = model->textures[i];
+	for (i = 0; i < brush->numtextures; i++) {
+		tex = brush->textures[i];
 		if (!tex)
 			continue;
 		glsl_R_AddTexture (tex);
@@ -426,11 +427,12 @@ glsl_R_RegisterTextures (model_t **models, int num_models)
 {
 	int         i;
 	model_t    *m;
+	mod_brush_t *brush;
 
 	glsl_R_ClearTextures ();
-	glsl_R_InitSurfaceChains (r_worldentity.model);
+	glsl_R_InitSurfaceChains (&r_worldentity.model->brush);
 	glsl_R_AddTexture (r_notexture_mip);
-	register_textures (r_worldentity.model);
+	register_textures (&r_worldentity.model->brush);
 	for (i = 0; i < num_models; i++) {
 		m = models[i];
 		if (!m)
@@ -441,8 +443,9 @@ glsl_R_RegisterTextures (model_t **models, int num_models)
 		// world has already been done, not interested in non-brush models
 		if (m == r_worldentity.model || m->type != mod_brush)
 			continue;
-		m->numsubmodels = 1; // no support for submodels in non-world model
-		register_textures (m);
+		brush = &m->brush;
+		brush->numsubmodels = 1; // no support for submodels in non-world model
+		register_textures (brush);
 	}
 }
 
@@ -478,16 +481,17 @@ build_surf_displist (model_t **models, msurface_t *fa, int base,
 	glslpoly_t *poly;
 	GLushort   *ind;
 	float       s, t;
+	mod_brush_t *brush;
 
 	if (fa->ec_index < 0) {
-		vertices = models[-fa->ec_index - 1]->vertexes;
-		edges = models[-fa->ec_index - 1]->edges;
-		surfedges = models[-fa->ec_index - 1]->surfedges;
+		brush = &models[-fa->ec_index - 1]->brush;
 	} else {
-		vertices = r_worldentity.model->vertexes;
-		edges = r_worldentity.model->edges;
-		surfedges = r_worldentity.model->surfedges;
+		brush = &r_worldentity.model->brush;
 	}
+	vertices = brush->vertexes;
+	edges = brush->edges;
+	surfedges = brush->surfedges;
+
 	numverts = fa->numedges;
 	numtris = numverts - 2;
 	numindices = numtris * 3;
@@ -545,6 +549,7 @@ glsl_R_BuildDisplayLists (model_t **models, int num_models)
 	dmodel_t   *dm;
 	msurface_t *surf;
 	dstring_t  *vertices;
+	mod_brush_t *brush;
 
 	QuatSet (0, 0, sqrt(0.5), sqrt(0.5), sky_fix);	// proper skies
 	QuatSet (0, 0, 0, 1, sky_rotation[0]);
@@ -561,24 +566,25 @@ glsl_R_BuildDisplayLists (model_t **models, int num_models)
 		if (!m)
 			continue;
 		// sub-models are done as part of the main model
-		if (*m->path == '*')
+		if (*m->path == '*' || m->type != mod_brush)
 			continue;
+		brush = &m->brush;
 		// non-bsp models don't have surfaces.
-		dm = m->submodels;
-		for (j = 0; j < m->numsurfaces; j++) {
+		dm = brush->submodels;
+		for (j = 0; j < brush->numsurfaces; j++) {
 			glsltex_t  *tex;
 			if (j == dm->firstface + dm->numfaces) {
 				dm++;
-				if (dm - m->submodels == m->numsubmodels) {
+				if (dm - brush->submodels == brush->numsubmodels) {
 					// limit the surfaces
 					// probably never hit
 					Sys_Printf ("R_BuildDisplayLists: too many surfaces\n");
-					m->numsurfaces = j;
+					brush->numsurfaces = j;
 					break;
 				}
 			}
-			surf = m->surfaces + j;
-			surf->ec_index = dm - m->submodels;
+			surf = brush->surfaces + j;
+			surf->ec_index = dm - brush->submodels;
 			if (!surf->ec_index && m != r_worldentity.model)
 				surf->ec_index = -1 - i;	// instanced model
 			tex = surf->texinfo->texture->render;
@@ -654,8 +660,10 @@ R_DrawBrushModel (entity_t *e)
 	msurface_t *surf;
 	qboolean    rotated;
 	vec3_t      mins, maxs, org;
+	mod_brush_t *brush;
 
 	model = e->model;
+	brush = &model->brush;
 	if (e->transform[0] != 1 || e->transform[5] != 1 || e->transform[10] != 1) {
 		rotated = true;
 		radius = model->radius;
@@ -680,7 +688,7 @@ R_DrawBrushModel (entity_t *e)
 	}
 
 	// calculate dynamic lighting for bmodel if it's not an instanced model
-	if (model->firstmodelsurface != 0 && r_dlight_lightmap->int_val) {
+	if (brush->firstmodelsurface != 0 && r_dlight_lightmap->int_val) {
 		vec3_t      lightorigin;
 
 		for (k = 0; k < r_maxdlights; k++) {
@@ -689,14 +697,14 @@ R_DrawBrushModel (entity_t *e)
 				continue;
 
 			VectorSubtract (r_dlights[k].origin, e->origin, lightorigin);
-			R_RecursiveMarkLights (lightorigin, &r_dlights[k], k,
-							model->nodes + model->hulls[0].firstclipnode);
+			R_RecursiveMarkLights (brush, lightorigin, &r_dlights[k], k,
+							brush->nodes + brush->hulls[0].firstclipnode);
 		}
 	}
 
-	surf = &model->surfaces[model->firstmodelsurface];
+	surf = &brush->surfaces[brush->firstmodelsurface];
 
-	for (i = 0; i < model->nummodelsurfaces; i++, surf++) {
+	for (i = 0; i < brush->nummodelsurfaces; i++, surf++) {
 		// find the node side on which we are
 		plane = surf->plane;
 
@@ -705,7 +713,7 @@ R_DrawBrushModel (entity_t *e)
 		// enqueue the polygon
 		if (((surf->flags & SURF_PLANEBACK) && (dot < -BACKFACE_EPSILON))
 			|| (!(surf->flags & SURF_PLANEBACK) && (dot > BACKFACE_EPSILON))) {
-			chain_surface (surf, e->transform, e->colormod);
+			chain_surface (brush, surf, e->transform, e->colormod);
 		}
 	}
 }
@@ -730,7 +738,7 @@ get_side (mnode_t *node)
 }
 
 static inline void
-visit_node (mnode_t *node, int side)
+visit_node (mod_brush_t *brush, mnode_t *node, int side)
 {
 	int         c;
 	msurface_t *surf;
@@ -739,7 +747,7 @@ visit_node (mnode_t *node, int side)
 	side = (~side + 1) & SURF_PLANEBACK;
 	// draw stuff
 	if ((c = node->numsurfaces)) {
-		surf = r_worldentity.model->surfaces + node->firstsurface;
+		surf = brush->surfaces + node->firstsurface;
 		for (; c; c--, surf++) {
 			if (surf->visframe != r_visframecount)
 				continue;
@@ -748,7 +756,7 @@ visit_node (mnode_t *node, int side)
 			if (side ^ (surf->flags & SURF_PLANEBACK))
 				continue;               // wrong side
 
-			chain_surface (surf, 0, 0);
+			chain_surface (brush, surf, 0, 0);
 		}
 	}
 }
@@ -766,7 +774,7 @@ test_node (mnode_t *node)
 }
 
 static void
-R_VisitWorldNodes (model_t *model)
+R_VisitWorldNodes (mod_brush_t *brush)
 {
 	typedef struct {
 		mnode_t    *node;
@@ -778,9 +786,9 @@ R_VisitWorldNodes (model_t *model)
 	mnode_t    *front;
 	int         side;
 
-	node = model->nodes;
+	node = brush->nodes;
 	// +2 for paranoia
-	node_stack = alloca ((model->depth + 2) * sizeof (rstack_t));
+	node_stack = alloca ((brush->depth + 2) * sizeof (rstack_t));
 	node_ptr = node_stack;
 
 	while (1) {
@@ -796,7 +804,7 @@ R_VisitWorldNodes (model_t *model)
 			}
 			if (front->contents < 0 && front->contents != CONTENTS_SOLID)
 				visit_leaf ((mleaf_t *) front);
-			visit_node (node, side);
+			visit_node (brush, node, side);
 			node = node->children[!side];
 		}
 		if (node->contents < 0 && node->contents != CONTENTS_SOLID)
@@ -805,7 +813,7 @@ R_VisitWorldNodes (model_t *model)
 			node_ptr--;
 			node = node_ptr->node;
 			side = node_ptr->side;
-			visit_node (node, side);
+			visit_node (brush, node, side);
 			node = node->children[!side];
 			continue;
 		}
@@ -1123,7 +1131,7 @@ glsl_R_DrawWorld (void)
 
 	currententity = &worldent;
 
-	R_VisitWorldNodes (worldent.model);
+	R_VisitWorldNodes (&worldent.model->brush);
 	if (r_drawentities->int_val) {
 		entity_t   *ent;
 		for (ent = r_ent_queue; ent; ent = ent->next) {
diff --git a/libs/video/renderer/glsl/glsl_iqm.c b/libs/video/renderer/glsl/glsl_iqm.c
index e757cf087..ce2c2f31d 100644
--- a/libs/video/renderer/glsl/glsl_iqm.c
+++ b/libs/video/renderer/glsl/glsl_iqm.c
@@ -217,7 +217,7 @@ glsl_R_DrawIQM (void)
 	float       blend;
 	iqmframe_t *frame;
 
-	R_LightPoint (ent->origin);	//FIXME min_light?
+	R_LightPoint (&r_worldentity.model->brush, ent->origin);//FIXME min_light?
 	VectorScale (ambientcolor, 1/255.0, ambientcolor);
 	R_FindNearLights (ent->origin, MAX_IQM_LIGHTS, lights);
 
diff --git a/libs/video/renderer/glsl/glsl_lightmap.c b/libs/video/renderer/glsl/glsl_lightmap.c
index 0776e015e..65af9d238 100644
--- a/libs/video/renderer/glsl/glsl_lightmap.c
+++ b/libs/video/renderer/glsl/glsl_lightmap.c
@@ -61,7 +61,7 @@ static scrap_t *light_scrap;
 static unsigned *blocklights;
 static int      bl_extents[2];
 
-void (*glsl_R_BuildLightMap) (msurface_t *surf);
+void (*glsl_R_BuildLightMap) (mod_brush_t *brush, msurface_t *surf);
 
 static void
 R_AddDynamicLights_1 (msurface_t *surf)
@@ -121,7 +121,7 @@ R_AddDynamicLights_1 (msurface_t *surf)
 }
 
 static void
-R_BuildLightMap_1 (msurface_t *surf)
+R_BuildLightMap_1 (mod_brush_t *brush, msurface_t *surf)
 {
 	int         smax, tmax, size;
 	unsigned    scale;
@@ -138,7 +138,7 @@ R_BuildLightMap_1 (msurface_t *surf)
 
 	// clear to no light
 	memset (blocklights, 0, size * sizeof (blocklights[0]));
-	if (!r_worldentity.model->lightdata) {
+	if (!brush->lightdata) {
 		// because we by-pass the inversion, "no light" = "full bright"
 		GLSL_SubpicUpdate (surf->lightpic, (byte *) blocklights, 1);
 		return;
@@ -196,6 +196,7 @@ glsl_R_BuildLightmaps (model_t **models, int num_models)
 {
 	int         i, j, size;
 	model_t    *m;
+	mod_brush_t *brush;
 
 	//FIXME RGB support
 	if (!light_scrap) {
@@ -210,13 +211,14 @@ glsl_R_BuildLightmaps (model_t **models, int num_models)
 		m = models[j];
 		if (!m)
 			break;
-		if (m->path[0] == '*') {
+		if (m->path[0] == '*' || m->type != mod_brush) {
 			// sub model surfaces are processed as part of the main model
 			continue;
 		}
+		brush = &m->brush;
 		// non-bsp models don't have surfaces.
-		for (i = 0; i < m->numsurfaces; i++) {
-			msurface_t *surf = m->surfaces + i;
+		for (i = 0; i < brush->numsurfaces; i++) {
+			msurface_t *surf = brush->surfaces + i;
 			surf->lightpic = 0;		// paranoia
 			if (surf->flags & SURF_DRAWTURB)
 				continue;
@@ -231,15 +233,16 @@ glsl_R_BuildLightmaps (model_t **models, int num_models)
 		m = models[j];
 		if (!m)
 			break;
-		if (m->path[0] == '*') {
+		if (m->path[0] == '*' || m->type != mod_brush) {
 			// sub model surfaces are processed as part of the main model
 			continue;
 		}
+		brush = &m->brush;
 		// non-bsp models don't have surfaces.
-		for (i = 0; i < m->numsurfaces; i++) {
-			msurface_t *surf = m->surfaces + i;
+		for (i = 0; i < brush->numsurfaces; i++) {
+			msurface_t *surf = brush->surfaces + i;
 			if (surf->lightpic)
-				glsl_R_BuildLightMap (surf);
+				glsl_R_BuildLightMap (brush, surf);
 		}
 	}
 }
diff --git a/libs/video/renderer/glsl/namehack.h b/libs/video/renderer/glsl/namehack.h
index aed6d2e21..a6f62e701 100644
--- a/libs/video/renderer/glsl/namehack.h
+++ b/libs/video/renderer/glsl/namehack.h
@@ -52,7 +52,6 @@
 #define R_InitParticles glsl_R_InitParticles
 #define R_InitSky glsl_R_InitSky
 #define R_InitSprites glsl_R_InitSprites
-#define R_InitSurfaceChains glsl_R_InitSurfaceChains
 #define R_LineGraph glsl_R_LineGraph
 #define R_LoadSky_f glsl_R_LoadSky_f
 #define R_LoadSkys glsl_R_LoadSkys
diff --git a/libs/video/renderer/r_bsp.c b/libs/video/renderer/r_bsp.c
index a6fdc961d..2475873a5 100644
--- a/libs/video/renderer/r_bsp.c
+++ b/libs/video/renderer/r_bsp.c
@@ -67,13 +67,13 @@ R_MarkLeaves (void)
 		r_oldviewleaf = 0;	// so vis will be recalcualted when novis gets
 							// turned off
 		vis = solid;
-		memset (solid, 0xff, (r_worldentity.model->numleafs + 7) >> 3);
+		memset (solid, 0xff, (r_worldentity.model->brush.numleafs + 7) >> 3);
 	} else
 		vis = Mod_LeafPVS (r_viewleaf, r_worldentity.model);
 
-	for (i = 0; (int) i < r_worldentity.model->numleafs; i++) {
+	for (i = 0; (int) i < r_worldentity.model->brush.numleafs; i++) {
 		if (vis[i >> 3] & (1 << (i & 7))) {
-			leaf = &r_worldentity.model->leafs[i + 1];
+			leaf = &r_worldentity.model->brush.leafs[i + 1];
 			if ((c = leaf->nummarksurfaces)) {
 				mark = leaf->firstmarksurface;
 				do {
diff --git a/libs/video/renderer/r_efrag.c b/libs/video/renderer/r_efrag.c
index ae5e1fd8a..8785d3d7d 100644
--- a/libs/video/renderer/r_efrag.c
+++ b/libs/video/renderer/r_efrag.c
@@ -195,7 +195,7 @@ R_SplitEntityOnNode (mnode_t *node)
 }
 
 void
-R_AddEfrags (entity_t *ent)
+R_AddEfrags (mod_brush_t *brush, entity_t *ent)
 {
 	model_t    *entmodel;
 
@@ -215,7 +215,7 @@ R_AddEfrags (entity_t *ent)
 	VectorAdd (ent->origin, entmodel->mins, r_emins);
 	VectorAdd (ent->origin, entmodel->maxs, r_emaxs);
 
-	R_SplitEntityOnNode (r_worldentity.model->nodes);
+	R_SplitEntityOnNode (brush->nodes);
 
 	ent->topnode = r_pefragtopnode;
 }
diff --git a/libs/video/renderer/r_light.c b/libs/video/renderer/r_light.c
index bd242e7bc..8d3294c37 100644
--- a/libs/video/renderer/r_light.c
+++ b/libs/video/renderer/r_light.c
@@ -203,8 +203,8 @@ mark_surfaces (msurface_t *surf, const vec3_t lightorigin, dlight_t *light,
 // LordHavoc: heavily modified, to eliminate unnecessary texture uploads,
 //            and support bmodel lighting better
 void
-R_RecursiveMarkLights (const vec3_t lightorigin, dlight_t *light, int lightnum,
-					   mnode_t *node)
+R_RecursiveMarkLights (mod_brush_t *brush, const vec3_t lightorigin,
+					   dlight_t *light, int lightnum, mnode_t *node)
 {
 	unsigned    i;
 	float       ndist, maxdist;
@@ -240,14 +240,14 @@ loc0:
 	}
 
 	// mark the polygons
-	surf = r_worldentity.model->surfaces + node->firstsurface;
+	surf = brush->surfaces + node->firstsurface;
 	for (i = 0; i < node->numsurfaces; i++, surf++) {
 		mark_surfaces (surf, lightorigin, light, lightnum);
 	}
 
 	if (node->children[0]->contents >= 0) {
 		if (node->children[1]->contents >= 0)
-			R_RecursiveMarkLights (lightorigin, light, lightnum,
+			R_RecursiveMarkLights (brush, lightorigin, light, lightnum,
 								   node->children[1]);
 		node = node->children[0];
 		goto loc0;
@@ -262,11 +262,12 @@ void
 R_MarkLights (const vec3_t lightorigin, dlight_t *light, int lightnum,
 			  model_t *model)
 {
+	mod_brush_t *brush = &model->brush;
 	mleaf_t    *pvsleaf = Mod_PointInLeaf (lightorigin, model);
 
 	if (!pvsleaf->compressed_vis) {
-		mnode_t *node = model->nodes + model->hulls[0].firstclipnode;
-		R_RecursiveMarkLights (lightorigin, light, lightnum, node);
+		mnode_t *node = brush->nodes + brush->hulls[0].firstclipnode;
+		R_RecursiveMarkLights (brush, lightorigin, light, lightnum, node);
 	} else {
 		float       radius = light->radius;
 		vec3_t      mins, maxs;
@@ -280,16 +281,16 @@ R_MarkLights (const vec3_t lightorigin, dlight_t *light, int lightnum,
 		maxs[0] = lightorigin[0] + radius;
 		maxs[1] = lightorigin[1] + radius;
 		maxs[2] = lightorigin[2] + radius;
-		while (leafnum < model->numleafs) {
+		while (leafnum < brush->numleafs) {
 			int         b;
 			if (!(vis_bits = *in++)) {
 				leafnum += (*in++) * 8;
 				continue;
 			}
-			for (b = 1; b < 256 && leafnum < model->numleafs;
+			for (b = 1; b < 256 && leafnum < brush->numleafs;
 				 b <<= 1, leafnum++) {
 				int      m;
-				mleaf_t *leaf  = &model->leafs[leafnum + 1];
+				mleaf_t *leaf  = &brush->leafs[leafnum + 1];
 				if (!(vis_bits & b))
 					continue;
 				if (leaf->visframe != r_visframecount)
@@ -400,7 +401,8 @@ calc_lighting_3 (msurface_t  *surf, int ds, int dt)
 }
 
 static int
-RecursiveLightPoint (mnode_t *node, const vec3_t start, const vec3_t end)
+RecursiveLightPoint (mod_brush_t *brush, mnode_t *node, const vec3_t start,
+					 const vec3_t end)
 {
 	unsigned    i;
 	int         r, s, t, ds, dt, side;
@@ -430,7 +432,7 @@ loop:
 	mid[2] = start[2] + (end[2] - start[2]) * frac;
 
 	// go down front side
-	r = RecursiveLightPoint (node->children[side], start, mid);
+	r = RecursiveLightPoint (brush, node->children[side], start, mid);
 	if (r >= 0)
 		return r;						// hit something
 
@@ -441,7 +443,7 @@ loop:
 	VectorCopy (mid, lightspot);
 	lightplane = plane;
 
-	surf = r_worldentity.model->surfaces + node->firstsurface;
+	surf = brush->surfaces + node->firstsurface;
 	for (i = 0; i < node->numsurfaces; i++, surf++) {
 		if (surf->flags & SURF_DRAWTILED)
 			continue;					// no lightmaps
@@ -472,16 +474,16 @@ loop:
 	}
 
 	// go down back side
-	return RecursiveLightPoint (node->children[!side], mid, end);
+	return RecursiveLightPoint (brush, node->children[!side], mid, end);
 }
 
 int
-R_LightPoint (const vec3_t p)
+R_LightPoint (mod_brush_t *brush, const vec3_t p)
 {
 	vec3_t      end;
 	int         r;
 
-	if (!r_worldentity.model->lightdata) {
+	if (!brush->lightdata) {
 		// allow dlights to have some effect, so don't go /quite/ fullbright
 		ambientcolor[2] = ambientcolor[1] = ambientcolor[0] = 200;
 		return 200;
@@ -491,7 +493,7 @@ R_LightPoint (const vec3_t p)
 	end[1] = p[1];
 	end[2] = p[2] - 2048;
 
-	r = RecursiveLightPoint (r_worldentity.model->nodes, p, end);
+	r = RecursiveLightPoint (brush, brush->nodes, p, end);
 
 	if (r == -1)
 		r = 0;
diff --git a/libs/video/renderer/sw/sw_rbsp.c b/libs/video/renderer/sw/sw_rbsp.c
index 17fcbf5bb..7cf001b87 100644
--- a/libs/video/renderer/sw/sw_rbsp.c
+++ b/libs/video/renderer/sw/sw_rbsp.c
@@ -237,7 +237,7 @@ R_RecursiveClipBPoly (bedge_t *pedges, mnode_t *pnode, msurface_t *psurf)
 
 
 void
-R_DrawSolidClippedSubmodelPolygons (model_t *pmodel)
+R_DrawSolidClippedSubmodelPolygons (model_t *model)
 {
 	int         i, j, lindex;
 	vec_t       dot;
@@ -247,12 +247,13 @@ R_DrawSolidClippedSubmodelPolygons (model_t *pmodel)
 	mvertex_t   bverts[MAX_BMODEL_VERTS];
 	bedge_t     bedges[MAX_BMODEL_EDGES], *pbedge;
 	medge_t    *pedge, *pedges;
+	mod_brush_t *brush = &model->brush;
 
 	// FIXME: use bounding-box-based frustum clipping info?
 
-	psurf = &pmodel->surfaces[pmodel->firstmodelsurface];
-	numsurfaces = pmodel->nummodelsurfaces;
-	pedges = pmodel->edges;
+	psurf = &brush->surfaces[brush->firstmodelsurface];
+	numsurfaces = brush->nummodelsurfaces;
+	pedges = brush->edges;
 
 	for (i = 0; i < numsurfaces; i++, psurf++) {
 		// find which side of the node we are on
@@ -278,7 +279,7 @@ R_DrawSolidClippedSubmodelPolygons (model_t *pmodel)
 				numbedges += psurf->numedges;
 
 				for (j = 0; j < psurf->numedges; j++) {
-					lindex = pmodel->surfedges[psurf->firstedge + j];
+					lindex = brush->surfedges[psurf->firstedge + j];
 
 					if (lindex > 0) {
 						pedge = &pedges[lindex];
@@ -306,18 +307,19 @@ R_DrawSolidClippedSubmodelPolygons (model_t *pmodel)
 
 
 void
-R_DrawSubmodelPolygons (model_t *pmodel, int clipflags)
+R_DrawSubmodelPolygons (model_t *model, int clipflags)
 {
 	int         i;
 	vec_t       dot;
 	msurface_t *psurf;
 	int         numsurfaces;
 	plane_t    *pplane;
+	mod_brush_t *brush = &model->brush;
 
 	// FIXME: use bounding-box-based frustum clipping info?
 
-	psurf = &pmodel->surfaces[pmodel->firstmodelsurface];
-	numsurfaces = pmodel->nummodelsurfaces;
+	psurf = &brush->surfaces[brush->firstmodelsurface];
+	numsurfaces = brush->nummodelsurfaces;
 
 	for (i = 0; i < numsurfaces; i++, psurf++) {
 		// find which side of the node we are on
@@ -358,7 +360,7 @@ get_side (mnode_t *node)
 }
 
 static void
-visit_node (mnode_t *node, int side, int clipflags)
+visit_node (mod_brush_t *brush, mnode_t *node, int side, int clipflags)
 {
 	int         c;
 	msurface_t *surf;
@@ -367,7 +369,7 @@ visit_node (mnode_t *node, int side, int clipflags)
 	side = (~side + 1) & SURF_PLANEBACK;
 	// draw stuff
 	if ((c = node->numsurfaces)) {
-		surf = r_worldentity.model->surfaces + node->firstsurface;
+		surf = brush->surfaces + node->firstsurface;
 		for (; c; c--, surf++) {
 			if (surf->visframe != r_visframecount)
 				continue;
@@ -444,7 +446,7 @@ test_node (mnode_t *node, int *clipflags)
 }
 
 static void
-R_VisitWorldNodes (model_t *model, int clipflags)
+R_VisitWorldNodes (mod_brush_t *brush, int clipflags)
 {
 	typedef struct {
 		mnode_t    *node;
@@ -456,9 +458,9 @@ R_VisitWorldNodes (model_t *model, int clipflags)
 	mnode_t    *front;
 	int         side, cf;
 
-	node = model->nodes;
+	node = brush->nodes;
 	// +2 for paranoia
-	node_stack = alloca ((model->depth + 2) * sizeof (rstack_t));
+	node_stack = alloca ((brush->depth + 2) * sizeof (rstack_t));
 	node_ptr = node_stack;
 
 	cf = clipflags;
@@ -478,7 +480,7 @@ R_VisitWorldNodes (model_t *model, int clipflags)
 			}
 			if (front->contents < 0 && front->contents != CONTENTS_SOLID)
 				visit_leaf ((mleaf_t *) front);
-			visit_node (node, side, clipflags);
+			visit_node (brush, node, side, clipflags);
 			node = node->children[!side];
 		}
 		if (node->contents < 0 && node->contents != CONTENTS_SOLID)
@@ -488,7 +490,7 @@ R_VisitWorldNodes (model_t *model, int clipflags)
 			node = node_ptr->node;
 			side = node_ptr->side;
 			clipflags = node_ptr->clipflags;
-			visit_node (node, side, clipflags);
+			visit_node (brush, node, side, clipflags);
 			node = node->children[!side];
 			continue;
 		}
@@ -502,17 +504,17 @@ void
 R_RenderWorld (void)
 {
 	int         i;
-	model_t    *clmodel;
 	btofpoly_t  btofpolys[MAX_BTOFPOLYS];
+	mod_brush_t *brush;
 
 	pbtofpolys = btofpolys;
 
 	currententity = &r_worldentity;
 	VectorCopy (r_origin, modelorg);
-	clmodel = currententity->model;
-	r_pcurrentvertbase = clmodel->vertexes;
+	brush = &currententity->model->brush;
+	r_pcurrentvertbase = brush->vertexes;
 
-	R_VisitWorldNodes (clmodel, 15);
+	R_VisitWorldNodes (brush, 15);
 
 	// if the driver wants the polygons back to front, play the visible ones
 	// back in that order
diff --git a/libs/video/renderer/sw/sw_rdraw.c b/libs/video/renderer/sw/sw_rdraw.c
index c5c943fd5..3f460643d 100644
--- a/libs/video/renderer/sw/sw_rdraw.c
+++ b/libs/video/renderer/sw/sw_rdraw.c
@@ -353,6 +353,7 @@ R_RenderFace (msurface_t *fa, int clipflags)
 	vec3_t      p_normal;
 	medge_t    *pedges, tedge;
 	clipplane_t *pclip;
+	mod_brush_t *brush = &currententity->model->brush;
 
 	// skip out if no more surfs
 	if ((surface_p) >= surf_max) {
@@ -382,11 +383,11 @@ R_RenderFace (msurface_t *fa, int clipflags)
 	r_nearzi = 0;
 	r_nearzionly = false;
 	makeleftedge = makerightedge = false;
-	pedges = currententity->model->edges;
+	pedges = brush->edges;
 	r_lastvertvalid = false;
 
 	for (i = 0; i < fa->numedges; i++) {
-		lindex = currententity->model->surfedges[fa->firstedge + i];
+		lindex = brush->surfedges[fa->firstedge + i];
 
 		if (lindex > 0) {
 			r_pedge = &pedges[lindex];
@@ -623,6 +624,7 @@ R_RenderPoly (msurface_t *fa, int clipflags)
 	polyvert_t  pverts[100];			// FIXME: do real number, safely
 	int         vertpage, newverts, newpage, lastvert;
 	qboolean    visible;
+	mod_brush_t *brush = &currententity->model->brush;
 
 	// FIXME: clean this up and make it faster
 	// FIXME: guard against running out of vertices
@@ -641,12 +643,12 @@ R_RenderPoly (msurface_t *fa, int clipflags)
 
 	// reconstruct the polygon
 	// FIXME: these should be precalculated and loaded off disk
-	pedges = currententity->model->edges;
+	pedges = brush->edges;
 	lnumverts = fa->numedges;
 	vertpage = 0;
 
 	for (i = 0; i < lnumverts; i++) {
-		lindex = currententity->model->surfedges[fa->firstedge + i];
+		lindex = brush->surfedges[fa->firstedge + i];
 
 		if (lindex > 0) {
 			r_pedge = &pedges[lindex];
@@ -777,15 +779,16 @@ R_RenderPoly (msurface_t *fa, int clipflags)
 
 
 void
-R_ZDrawSubmodelPolys (model_t *pmodel)
+R_ZDrawSubmodelPolys (model_t *model)
 {
 	int         i, numsurfaces;
 	msurface_t *psurf;
 	float       dot;
 	plane_t    *pplane;
+	mod_brush_t *brush = &model->brush;
 
-	psurf = &pmodel->surfaces[pmodel->firstmodelsurface];
-	numsurfaces = pmodel->nummodelsurfaces;
+	psurf = &brush->surfaces[brush->firstmodelsurface];
+	numsurfaces = brush->nummodelsurfaces;
 
 	for (i = 0; i < numsurfaces; i++, psurf++) {
 		// find which side of the node we are on
diff --git a/libs/video/renderer/sw/sw_rmain.c b/libs/video/renderer/sw/sw_rmain.c
index 5d38ae04d..573827bda 100644
--- a/libs/video/renderer/sw/sw_rmain.c
+++ b/libs/video/renderer/sw/sw_rmain.c
@@ -164,6 +164,7 @@ void
 R_NewMap (model_t *worldmodel, struct model_s **models, int num_models)
 {
 	int         i;
+	mod_brush_t *brush = &worldmodel->brush;
 
 	memset (&r_worldentity, 0, sizeof (r_worldentity));
 	r_worldentity.model = worldmodel;
@@ -172,11 +173,11 @@ R_NewMap (model_t *worldmodel, struct model_s **models, int num_models)
 
 	// clear out efrags in case the level hasn't been reloaded
 	// FIXME: is this one short?
-	for (i = 0; i < r_worldentity.model->numleafs; i++)
-		r_worldentity.model->leafs[i].efrags = NULL;
+	for (i = 0; i < brush->numleafs; i++)
+		brush->leafs[i].efrags = NULL;
 
-	if (worldmodel->skytexture)
-		R_InitSky (worldmodel->skytexture);
+	if (brush->skytexture)
+		R_InitSky (brush->skytexture);
 
 	// Force a vis update
 	r_viewleaf = NULL;
@@ -381,7 +382,8 @@ R_DrawEntitiesOnList (void)
 				if (currententity->model->type == mod_iqm//FIXME
 					|| R_AliasCheckBBox ()) {
 					// 128 instead of 255 due to clamping below
-					j = max (R_LightPoint (currententity->origin), minlight * 128);
+					j = max (R_LightPoint (&r_worldentity.model->brush,
+										   currententity->origin), minlight * 128);
 
 					lighting.ambientlight = j;
 					lighting.shadelight = j;
@@ -448,7 +450,8 @@ R_DrawViewModel (void)
 
 	minlight = max (currententity->min_light, currententity->model->min_light);
 
-	j = max (R_LightPoint (currententity->origin), minlight * 128);
+	j = max (R_LightPoint (&r_worldentity.model->brush,
+						   currententity->origin), minlight * 128);
 
 	r_viewlighting.ambientlight = j;
 	r_viewlighting.shadelight = j;
@@ -568,19 +571,20 @@ R_DrawBEntitiesOnList (void)
 				clipflags = R_BmodelCheckBBox (clmodel, minmaxs);
 
 				if (clipflags != BMODEL_FULLY_CLIPPED) {
+					mod_brush_t *brush = &clmodel->brush;
 					VectorCopy (currententity->origin, r_entorigin);
 					VectorSubtract (r_origin, r_entorigin, modelorg);
 
 					// FIXME: is this needed?
 					VectorCopy (modelorg, r_worldmodelorg);
-					r_pcurrentvertbase = clmodel->vertexes;
+					r_pcurrentvertbase = brush->vertexes;
 
 					// FIXME: stop transforming twice
 					R_RotateBmodel ();
 
 					// calculate dynamic lighting for bmodel if it's not an
 					// instanced model
-					if (clmodel->firstmodelsurface != 0) {
+					if (brush->firstmodelsurface != 0) {
 						vec3_t      lightorigin;
 
 						for (k = 0; k < r_maxdlights; k++) {
@@ -590,9 +594,10 @@ R_DrawBEntitiesOnList (void)
 							VectorSubtract (r_dlights[k].origin,
 											currententity->origin,
 											lightorigin);
-							R_RecursiveMarkLights (lightorigin, &r_dlights[k],
-												   k, clmodel->nodes +
-										  clmodel->hulls[0].firstclipnode);
+							R_RecursiveMarkLights (brush, lightorigin,
+												   &r_dlights[k], k,
+												   brush->nodes
+										+ brush->hulls[0].firstclipnode);
 						}
 					}
 					// if the driver wants polygons, deliver those.
diff --git a/libs/video/renderer/sw/sw_rsurf.c b/libs/video/renderer/sw/sw_rsurf.c
index e4d3fa853..5133118cb 100644
--- a/libs/video/renderer/sw/sw_rsurf.c
+++ b/libs/video/renderer/sw/sw_rsurf.c
@@ -154,7 +154,7 @@ R_BuildLightMap (void)
 	size = smax * tmax;
 	lightmap = surf->samples;
 
-	if (!r_worldentity.model->lightdata) {
+	if (!r_worldentity.model->brush.lightdata) {
 		for (i = 0; i < size; i++)
 			blocklights[i] = 0;
 		return;
diff --git a/libs/video/renderer/sw32/sw32_rbsp.c b/libs/video/renderer/sw32/sw32_rbsp.c
index 017268dbb..521e70cd5 100644
--- a/libs/video/renderer/sw32/sw32_rbsp.c
+++ b/libs/video/renderer/sw32/sw32_rbsp.c
@@ -240,7 +240,7 @@ R_RecursiveClipBPoly (bedge_t *pedges, mnode_t *pnode, msurface_t *psurf)
 
 
 void
-sw32_R_DrawSolidClippedSubmodelPolygons (model_t *pmodel)
+sw32_R_DrawSolidClippedSubmodelPolygons (model_t *model)
 {
 	int         i, j, lindex;
 	vec_t       dot;
@@ -250,12 +250,13 @@ sw32_R_DrawSolidClippedSubmodelPolygons (model_t *pmodel)
 	mvertex_t   bverts[MAX_BMODEL_VERTS];
 	bedge_t     bedges[MAX_BMODEL_EDGES], *pbedge;
 	medge_t    *pedge, *pedges;
+	mod_brush_t *brush = &model->brush;
 
 	// FIXME: use bounding-box-based frustum clipping info?
 
-	psurf = &pmodel->surfaces[pmodel->firstmodelsurface];
-	numsurfaces = pmodel->nummodelsurfaces;
-	pedges = pmodel->edges;
+	psurf = &brush->surfaces[brush->firstmodelsurface];
+	numsurfaces = brush->nummodelsurfaces;
+	pedges = brush->edges;
 
 	for (i = 0; i < numsurfaces; i++, psurf++) {
 		// find which side of the node we are on
@@ -281,7 +282,7 @@ sw32_R_DrawSolidClippedSubmodelPolygons (model_t *pmodel)
 				numbedges += psurf->numedges;
 
 				for (j = 0; j < psurf->numedges; j++) {
-					lindex = pmodel->surfedges[psurf->firstedge + j];
+					lindex = brush->surfedges[psurf->firstedge + j];
 
 					if (lindex > 0) {
 						pedge = &pedges[lindex];
@@ -309,18 +310,19 @@ sw32_R_DrawSolidClippedSubmodelPolygons (model_t *pmodel)
 
 
 void
-sw32_R_DrawSubmodelPolygons (model_t *pmodel, int clipflags)
+sw32_R_DrawSubmodelPolygons (model_t *model, int clipflags)
 {
 	int         i;
 	vec_t       dot;
 	msurface_t *psurf;
 	int         numsurfaces;
 	plane_t    *pplane;
+	mod_brush_t *brush = &model->brush;
 
 	// FIXME: use bounding-box-based frustum clipping info?
 
-	psurf = &pmodel->surfaces[pmodel->firstmodelsurface];
-	numsurfaces = pmodel->nummodelsurfaces;
+	psurf = &brush->surfaces[brush->firstmodelsurface];
+	numsurfaces = brush->nummodelsurfaces;
 
 	for (i = 0; i < numsurfaces; i++, psurf++) {
 		// find which side of the node we are on
@@ -361,7 +363,7 @@ get_side (mnode_t *node)
 }
 
 static void
-visit_node (mnode_t *node, int side, int clipflags)
+visit_node (mod_brush_t *brush, mnode_t *node, int side, int clipflags)
 {
 	int         c;
 	msurface_t *surf;
@@ -370,7 +372,7 @@ visit_node (mnode_t *node, int side, int clipflags)
 	side = (~side + 1) & SURF_PLANEBACK;
 	// draw stuff
 	if ((c = node->numsurfaces)) {
-		surf = r_worldentity.model->surfaces + node->firstsurface;
+		surf = brush->surfaces + node->firstsurface;
 		for (; c; c--, surf++) {
 			if (surf->visframe != r_visframecount)
 				continue;
@@ -447,7 +449,7 @@ test_node (mnode_t *node, int *clipflags)
 }
 
 static void
-R_VisitWorldNodes (model_t *model, int clipflags)
+R_VisitWorldNodes (mod_brush_t *brush, int clipflags)
 {
 	typedef struct {
 		mnode_t    *node;
@@ -459,9 +461,9 @@ R_VisitWorldNodes (model_t *model, int clipflags)
 	mnode_t    *front;
 	int         side, cf;
 
-	node = model->nodes;
+	node = brush->nodes;
 	// +2 for paranoia
-	node_stack = alloca ((model->depth + 2) * sizeof (rstack_t));
+	node_stack = alloca ((brush->depth + 2) * sizeof (rstack_t));
 	node_ptr = node_stack;
 
 	cf = clipflags;
@@ -481,7 +483,7 @@ R_VisitWorldNodes (model_t *model, int clipflags)
 			}
 			if (front->contents < 0 && front->contents != CONTENTS_SOLID)
 				visit_leaf ((mleaf_t *) front);
-			visit_node (node, side, clipflags);
+			visit_node (brush, node, side, clipflags);
 			node = node->children[!side];
 		}
 		if (node->contents < 0 && node->contents != CONTENTS_SOLID)
@@ -491,7 +493,7 @@ R_VisitWorldNodes (model_t *model, int clipflags)
 			node = node_ptr->node;
 			side = node_ptr->side;
 			clipflags = node_ptr->clipflags;
-			visit_node (node, side, clipflags);
+			visit_node (brush, node, side, clipflags);
 			node = node->children[!side];
 			continue;
 		}
@@ -505,17 +507,17 @@ void
 sw32_R_RenderWorld (void)
 {
 	int         i;
-	model_t    *clmodel;
 	btofpoly_t  btofpolys[MAX_BTOFPOLYS];
+	mod_brush_t *brush;
 
 	pbtofpolys = btofpolys;
 
 	currententity = &r_worldentity;
 	VectorCopy (r_origin, modelorg);
-	clmodel = currententity->model;
-	r_pcurrentvertbase = clmodel->vertexes;
+	brush = &currententity->model->brush;
+	r_pcurrentvertbase = brush->vertexes;
 
-	R_VisitWorldNodes (clmodel, 15);
+	R_VisitWorldNodes (brush, 15);
 
 	// if the driver wants the polygons back to front, play the visible ones
 	// back in that order
diff --git a/libs/video/renderer/sw32/sw32_rdraw.c b/libs/video/renderer/sw32/sw32_rdraw.c
index 6624917a7..b106ab63a 100644
--- a/libs/video/renderer/sw32/sw32_rdraw.c
+++ b/libs/video/renderer/sw32/sw32_rdraw.c
@@ -349,6 +349,7 @@ sw32_R_RenderFace (msurface_t *fa, int clipflags)
 	vec3_t      p_normal;
 	medge_t    *pedges, tedge;
 	clipplane_t *pclip;
+	mod_brush_t *brush = &currententity->model->brush;
 
 	// skip out if no more surfs
 	if ((sw32_surface_p) >= sw32_surf_max) {
@@ -378,11 +379,11 @@ sw32_R_RenderFace (msurface_t *fa, int clipflags)
 	sw32_r_nearzi = 0;
 	sw32_r_nearzionly = false;
 	makeleftedge = makerightedge = false;
-	pedges = currententity->model->edges;
+	pedges = brush->edges;
 	sw32_r_lastvertvalid = false;
 
 	for (i = 0; i < fa->numedges; i++) {
-		lindex = currententity->model->surfedges[fa->firstedge + i];
+		lindex = brush->surfedges[fa->firstedge + i];
 
 		if (lindex > 0) {
 			sw32_r_pedge = &pedges[lindex];
@@ -621,6 +622,7 @@ sw32_R_RenderPoly (msurface_t *fa, int clipflags)
 	polyvert_t  pverts[100];			// FIXME: do real number, safely
 	int         vertpage, newverts, newpage, lastvert;
 	qboolean    visible;
+	mod_brush_t *brush = &currententity->model->brush;
 
 	// FIXME: clean this up and make it faster
 	// FIXME: guard against running out of vertices
@@ -639,12 +641,12 @@ sw32_R_RenderPoly (msurface_t *fa, int clipflags)
 
 	// reconstruct the polygon
 	// FIXME: these should be precalculated and loaded off disk
-	pedges = currententity->model->edges;
+	pedges = brush->edges;
 	lnumverts = fa->numedges;
 	vertpage = 0;
 
 	for (i = 0; i < lnumverts; i++) {
-		lindex = currententity->model->surfedges[fa->firstedge + i];
+		lindex = brush->surfedges[fa->firstedge + i];
 
 		if (lindex > 0) {
 			sw32_r_pedge = &pedges[lindex];
@@ -775,15 +777,16 @@ sw32_R_RenderPoly (msurface_t *fa, int clipflags)
 
 
 void
-sw32_R_ZDrawSubmodelPolys (model_t *pmodel)
+sw32_R_ZDrawSubmodelPolys (model_t *model)
 {
 	int         i, numsurfaces;
 	msurface_t *psurf;
 	float       dot;
 	plane_t    *pplane;
+	mod_brush_t *brush = &model->brush;
 
-	psurf = &pmodel->surfaces[pmodel->firstmodelsurface];
-	numsurfaces = pmodel->nummodelsurfaces;
+	psurf = &brush->surfaces[brush->firstmodelsurface];
+	numsurfaces = brush->nummodelsurfaces;
 
 	for (i = 0; i < numsurfaces; i++, psurf++) {
 		// find which side of the node we are on
diff --git a/libs/video/renderer/sw32/sw32_rmain.c b/libs/video/renderer/sw32/sw32_rmain.c
index fd204e587..67c59e2f9 100644
--- a/libs/video/renderer/sw32/sw32_rmain.c
+++ b/libs/video/renderer/sw32/sw32_rmain.c
@@ -180,6 +180,7 @@ void
 sw32_R_NewMap (model_t *worldmodel, struct model_s **models, int num_models)
 {
 	int         i;
+	mod_brush_t *brush = &worldmodel->brush;
 
 	memset (&r_worldentity, 0, sizeof (r_worldentity));
 	r_worldentity.model = worldmodel;
@@ -188,11 +189,11 @@ sw32_R_NewMap (model_t *worldmodel, struct model_s **models, int num_models)
 
 	// clear out efrags in case the level hasn't been reloaded
 	// FIXME: is this one short?
-	for (i = 0; i < r_worldentity.model->numleafs; i++)
-		r_worldentity.model->leafs[i].efrags = NULL;
+	for (i = 0; i < brush->numleafs; i++)
+		brush->leafs[i].efrags = NULL;
 
-	if (worldmodel->skytexture)
-		sw32_R_InitSky (worldmodel->skytexture);
+	if (brush->skytexture)
+		sw32_R_InitSky (brush->skytexture);
 
 	// Force a vis update
 	r_viewleaf = NULL;
@@ -388,7 +389,9 @@ R_DrawEntitiesOnList (void)
 				if (currententity->model->type == mod_iqm//FIXME
 					|| sw32_R_AliasCheckBBox ()) {
 					// 128 instead of 255 due to clamping below
-					j = max (R_LightPoint (currententity->origin), minlight * 128);
+					j = max (R_LightPoint (&r_worldentity.model->brush,
+										   currententity->origin),
+							 minlight * 128);
 
 					lighting.ambientlight = j;
 					lighting.shadelight = j;
@@ -454,7 +457,8 @@ R_DrawViewModel (void)
 
 	minlight = max (currententity->min_light, currententity->model->min_light);
 
-	j = max (R_LightPoint (currententity->origin), minlight * 128);
+	j = max (R_LightPoint (&r_worldentity.model->brush,
+						   currententity->origin), minlight * 128);
 
 	r_viewlighting.ambientlight = j;
 	r_viewlighting.shadelight = j;
@@ -574,19 +578,20 @@ R_DrawBEntitiesOnList (void)
 				clipflags = R_BmodelCheckBBox (clmodel, minmaxs);
 
 				if (clipflags != BMODEL_FULLY_CLIPPED) {
+					mod_brush_t *brush = &clmodel->brush;
 					VectorCopy (currententity->origin, r_entorigin);
 					VectorSubtract (r_origin, r_entorigin, modelorg);
 
 					// FIXME: is this needed?
 					VectorCopy (modelorg, sw32_r_worldmodelorg);
-					r_pcurrentvertbase = clmodel->vertexes;
+					r_pcurrentvertbase = brush->vertexes;
 
 					// FIXME: stop transforming twice
 					sw32_R_RotateBmodel ();
 
 					// calculate dynamic lighting for bmodel if it's not an
 					// instanced model
-					if (clmodel->firstmodelsurface != 0) {
+					if (brush->firstmodelsurface != 0) {
 						vec3_t      lightorigin;
 
 						for (k = 0; k < r_maxdlights; k++) {
@@ -596,9 +601,10 @@ R_DrawBEntitiesOnList (void)
 							VectorSubtract (r_dlights[k].origin,
 											currententity->origin,
 											lightorigin);
-							R_RecursiveMarkLights (lightorigin, &r_dlights[k],
-												   k, clmodel->nodes +
-										  clmodel->hulls[0].firstclipnode);
+							R_RecursiveMarkLights (brush, lightorigin,
+												   &r_dlights[k], k,
+												   brush->nodes
+										+ brush->hulls[0].firstclipnode);
 						}
 					}
 					// if the driver wants polygons, deliver those.
diff --git a/libs/video/renderer/sw32/sw32_rsurf.c b/libs/video/renderer/sw32/sw32_rsurf.c
index 9badf0c96..decd8c3a7 100644
--- a/libs/video/renderer/sw32/sw32_rsurf.c
+++ b/libs/video/renderer/sw32/sw32_rsurf.c
@@ -172,7 +172,7 @@ R_BuildLightMap (void)
 	size = smax * tmax;
 	lightmap = surf->samples;
 
-	if (!r_worldentity.model->lightdata) {
+	if (!r_worldentity.model->brush.lightdata) {
 		for (i = 0; i < size; i++)
 			blocklights[i] = 0;
 		return;
diff --git a/libs/video/renderer/vulkan/vulkan_alias.c b/libs/video/renderer/vulkan/vulkan_alias.c
index 65fa232cc..fec2d2cd6 100644
--- a/libs/video/renderer/vulkan/vulkan_alias.c
+++ b/libs/video/renderer/vulkan/vulkan_alias.c
@@ -144,7 +144,7 @@ calc_lighting (qfv_light_t *light, entity_t *ent)
 {
 	vec3_t      ambient_color;
 	//FIXME should be ent->position
-	float       l = R_LightPoint (r_origin) / 128.0;
+	float       l = R_LightPoint (&r_worldentity.model->brush, r_origin) / 128.0;
 
 	//XXX l = max (light, max (ent->model->min_light, ent->min_light));
 	light->type = 2;
diff --git a/libs/video/renderer/vulkan/vulkan_bsp.c b/libs/video/renderer/vulkan/vulkan_bsp.c
index ff64990ee..a0dcd9134 100644
--- a/libs/video/renderer/vulkan/vulkan_bsp.c
+++ b/libs/video/renderer/vulkan/vulkan_bsp.c
@@ -153,7 +153,7 @@ add_texture (texture_t *tx, vulkan_ctx_t *ctx)
 }
 
 static void
-init_surface_chains (model_t *model, vulkan_ctx_t *ctx)
+init_surface_chains (mod_brush_t *brush, vulkan_ctx_t *ctx)
 {
 	bspctx_t   *bctx = ctx->bsp_context;
 	int         i;
@@ -161,9 +161,9 @@ init_surface_chains (model_t *model, vulkan_ctx_t *ctx)
 	release_static_instsurfs (bctx);
 	release_instsurfs (bctx);
 
-	for (i = 0; i < model->nummodelsurfaces; i++) {
-		model->surfaces[i].instsurf = get_static_instsurf (bctx);
-		model->surfaces[i].instsurf->surface = &model->surfaces[i];
+	for (i = 0; i < brush->nummodelsurfaces; i++) {
+		brush->surfaces[i].instsurf = get_static_instsurf (bctx);
+		brush->surfaces[i].instsurf->surface = &brush->surfaces[i];
 	}
 }
 
@@ -199,7 +199,7 @@ Vulkan_ClearElements (vulkan_ctx_t *ctx)
 }
 
 static void
-update_lightmap (msurface_t *surf, vulkan_ctx_t *ctx)
+update_lightmap (mod_brush_t *brush, msurface_t *surf, vulkan_ctx_t *ctx)
 {
 	int         maps;
 
@@ -210,13 +210,13 @@ update_lightmap (msurface_t *surf, vulkan_ctx_t *ctx)
 	if ((surf->dlightframe == r_framecount) || surf->cached_dlight) {
 dynamic:
 		if (r_dynamic->int_val)
-			Vulkan_BuildLightMap (surf, ctx);
+			Vulkan_BuildLightMap (brush, surf, ctx);
 	}
 }
 
 static inline void
-chain_surface (msurface_t *surf, vec_t *transform, float *color,
-			   vulkan_ctx_t *ctx)
+chain_surface (mod_brush_t *brush, msurface_t *surf, vec_t *transform,
+			   float *color, vulkan_ctx_t *ctx)
 {
 	bspctx_t   *bctx = ctx->bsp_context;
 	instsurf_t *is;
@@ -236,7 +236,7 @@ chain_surface (msurface_t *surf, vec_t *transform, float *color,
 		tex = tx->render;
 		CHAIN_SURF_F2B (surf, tex->tex_chain);
 
-		update_lightmap (surf, ctx);
+		update_lightmap (brush, surf, ctx);
 	}
 	if (!(is = surf->instsurf))
 		is = surf->tinst;
@@ -245,13 +245,13 @@ chain_surface (msurface_t *surf, vec_t *transform, float *color,
 }
 
 static void
-register_textures (model_t *model, vulkan_ctx_t *ctx)
+register_textures (mod_brush_t *brush, vulkan_ctx_t *ctx)
 {
 	int         i;
 	texture_t  *tex;
 
-	for (i = 0; i < model->numtextures; i++) {
-		tex = model->textures[i];
+	for (i = 0; i < brush->numtextures; i++) {
+		tex = brush->textures[i];
 		if (!tex)
 			continue;
 		add_texture (tex, ctx);
@@ -270,11 +270,12 @@ Vulkan_RegisterTextures (model_t **models, int num_models, vulkan_ctx_t *ctx)
 {
 	int         i;
 	model_t    *m;
+	mod_brush_t *brush = &r_worldentity.model->brush;
 
 	clear_textures (ctx);
-	init_surface_chains (r_worldentity.model, ctx);
+	init_surface_chains (brush, ctx);
 	add_texture (r_notexture_mip, ctx);
-	register_textures (r_worldentity.model, ctx);
+	register_textures (brush, ctx);
 	for (i = 0; i < num_models; i++) {
 		m = models[i];
 		if (!m)
@@ -285,8 +286,9 @@ Vulkan_RegisterTextures (model_t **models, int num_models, vulkan_ctx_t *ctx)
 		// world has already been done, not interested in non-brush models
 		if (m == r_worldentity.model || m->type != mod_brush)
 			continue;
-		m->numsubmodels = 1; // no support for submodels in non-world model
-		register_textures (m, ctx);
+		brush = &m->brush;
+		brush->numsubmodels = 1; // no support for submodels in non-world model
+		register_textures (brush, ctx);
 	}
 }
 
@@ -329,18 +331,18 @@ build_surf_displist (model_t **models, msurface_t *fa, int base,
 	bsppoly_t  *poly;
 	uint32_t   *ind;
 	float       s, t;
+	mod_brush_t *brush;
 
 	if (fa->ec_index < 0) {
 		// instance model
-		vertices  = models[~fa->ec_index]->vertexes;
-		edges     = models[~fa->ec_index]->edges;
-		surfedges = models[~fa->ec_index]->surfedges;
+		brush = &models[~fa->ec_index]->brush;
 	} else {
 		// main or sub model
-		vertices  = r_worldentity.model->vertexes;
-		edges     = r_worldentity.model->edges;
-		surfedges = r_worldentity.model->surfedges;
+		brush = &r_worldentity.model->brush;
 	}
+	vertices  = brush->vertexes;
+	edges     = brush->edges;
+	surfedges = brush->surfedges;
 	// create a triangle fan
 	numverts = fa->numedges;
 	numindices = numverts + 1;
@@ -405,6 +407,7 @@ Vulkan_BuildDisplayLists (model_t **models, int num_models, vulkan_ctx_t *ctx)
 	qfv_stagebuf_t *stage;
 	bspvert_t  *vertices;
 	bsppoly_t  *poly;
+	mod_brush_t *brush;
 
 	QuatSet (0, 0, sqrt(0.5), sqrt(0.5), bctx->sky_fix);	// proper skies
 	QuatSet (0, 0, 0, 1, bctx->sky_rotation[0]);
@@ -421,24 +424,25 @@ Vulkan_BuildDisplayLists (model_t **models, int num_models, vulkan_ctx_t *ctx)
 		if (!m)
 			continue;
 		// sub-models are done as part of the main model
-		if (*m->path == '*')
+		if (*m->path == '*' || m->type != mod_brush)
 			continue;
+		brush = &m->brush;
 		// non-bsp models don't have surfaces.
-		dm = m->submodels;
-		for (j = 0; j < m->numsurfaces; j++) {
+		dm = brush->submodels;
+		for (j = 0; j < brush->numsurfaces; j++) {
 			vulktex_t  *tex;
 			if (j == dm->firstface + dm->numfaces) {
 				dm++;
-				if (dm - m->submodels == m->numsubmodels) {
+				if (dm - brush->submodels == brush->numsubmodels) {
 					// limit the surfaces
 					// probably never hit
 					Sys_Printf ("R_BuildDisplayLists: too many surfaces\n");
-					m->numsurfaces = j;
+					brush->numsurfaces = j;
 					break;
 				}
 			}
-			surf = m->surfaces + j;
-			surf->ec_index = dm - m->submodels;
+			surf = brush->surfaces + j;
+			surf->ec_index = dm - brush->submodels;
 			if (!surf->ec_index && m != r_worldentity.model)
 				surf->ec_index = -1 - i;	// instanced model
 			tex = surf->texinfo->texture->render;
@@ -602,8 +606,10 @@ R_DrawBrushModel (entity_t *e, vulkan_ctx_t *ctx)
 	msurface_t *surf;
 	qboolean    rotated;
 	vec3_t      mins, maxs, org;
+	mod_brush_t *brush;
 
 	model = e->model;
+	brush = &model->brush;
 	if (e->transform[0] != 1 || e->transform[5] != 1 || e->transform[10] != 1) {
 		rotated = true;
 		radius = model->radius;
@@ -628,7 +634,7 @@ R_DrawBrushModel (entity_t *e, vulkan_ctx_t *ctx)
 	}
 
 	// calculate dynamic lighting for bmodel if it's not an instanced model
-	if (model->firstmodelsurface != 0 && r_dlight_lightmap->int_val) {
+	if (brush->firstmodelsurface != 0 && r_dlight_lightmap->int_val) {
 		vec3_t      lightorigin;
 
 		for (k = 0; k < r_maxdlights; k++) {
@@ -637,14 +643,14 @@ R_DrawBrushModel (entity_t *e, vulkan_ctx_t *ctx)
 				continue;
 
 			VectorSubtract (r_dlights[k].origin, e->origin, lightorigin);
-			R_RecursiveMarkLights (lightorigin, &r_dlights[k], k,
-							model->nodes + model->hulls[0].firstclipnode);
+			R_RecursiveMarkLights (brush, lightorigin, &r_dlights[k], k,
+							brush->nodes + brush->hulls[0].firstclipnode);
 		}
 	}
 
-	surf = &model->surfaces[model->firstmodelsurface];
+	surf = &brush->surfaces[brush->firstmodelsurface];
 
-	for (i = 0; i < model->nummodelsurfaces; i++, surf++) {
+	for (i = 0; i < brush->nummodelsurfaces; i++, surf++) {
 		// find the node side on which we are
 		plane = surf->plane;
 
@@ -653,7 +659,7 @@ R_DrawBrushModel (entity_t *e, vulkan_ctx_t *ctx)
 		// enqueue the polygon
 		if (((surf->flags & SURF_PLANEBACK) && (dot < -BACKFACE_EPSILON))
 			|| (!(surf->flags & SURF_PLANEBACK) && (dot > BACKFACE_EPSILON))) {
-			chain_surface (surf, e->transform, e->colormod, ctx);
+			chain_surface (brush, surf, e->transform, e->colormod, ctx);
 		}
 	}
 }
@@ -678,7 +684,7 @@ get_side (mnode_t *node)
 }
 
 static inline void
-visit_node (mnode_t *node, int side, vulkan_ctx_t *ctx)
+visit_node (mod_brush_t *brush, mnode_t *node, int side, vulkan_ctx_t *ctx)
 {
 	int         c;
 	msurface_t *surf;
@@ -687,7 +693,7 @@ visit_node (mnode_t *node, int side, vulkan_ctx_t *ctx)
 	side = (~side + 1) & SURF_PLANEBACK;
 	// draw stuff
 	if ((c = node->numsurfaces)) {
-		surf = r_worldentity.model->surfaces + node->firstsurface;
+		surf = brush->surfaces + node->firstsurface;
 		for (; c; c--, surf++) {
 			if (surf->visframe != r_visframecount)
 				continue;
@@ -696,7 +702,7 @@ visit_node (mnode_t *node, int side, vulkan_ctx_t *ctx)
 			if (side ^ (surf->flags & SURF_PLANEBACK))
 				continue;               // wrong side
 
-			chain_surface (surf, 0, 0, ctx);
+			chain_surface (brush, surf, 0, 0, ctx);
 		}
 	}
 }
@@ -714,7 +720,7 @@ test_node (mnode_t *node)
 }
 
 static void
-R_VisitWorldNodes (model_t *model, vulkan_ctx_t *ctx)
+R_VisitWorldNodes (mod_brush_t *brush, vulkan_ctx_t *ctx)
 {
 	typedef struct {
 		mnode_t    *node;
@@ -726,9 +732,9 @@ R_VisitWorldNodes (model_t *model, vulkan_ctx_t *ctx)
 	mnode_t    *front;
 	int         side;
 
-	node = model->nodes;
+	node = brush->nodes;
 	// +2 for paranoia
-	node_stack = alloca ((model->depth + 2) * sizeof (rstack_t));
+	node_stack = alloca ((brush->depth + 2) * sizeof (rstack_t));
 	node_ptr = node_stack;
 
 	while (1) {
@@ -744,7 +750,7 @@ R_VisitWorldNodes (model_t *model, vulkan_ctx_t *ctx)
 			}
 			if (front->contents < 0 && front->contents != CONTENTS_SOLID)
 				visit_leaf ((mleaf_t *) front);
-			visit_node (node, side, ctx);
+			visit_node (brush, node, side, ctx);
 			node = node->children[!side];
 		}
 		if (node->contents < 0 && node->contents != CONTENTS_SOLID)
@@ -753,7 +759,7 @@ R_VisitWorldNodes (model_t *model, vulkan_ctx_t *ctx)
 			node_ptr--;
 			node = node_ptr->node;
 			side = node_ptr->side;
-			visit_node (node, side, ctx);
+			visit_node (brush, node, side, ctx);
 			node = node->children[!side];
 			continue;
 		}
@@ -1099,19 +1105,21 @@ Vulkan_DrawWorld (vulkan_ctx_t *ctx)
 	bspctx_t   *bctx = ctx->bsp_context;
 	bspframe_t *bframe = &bctx->frames.a[ctx->curFrame];
 	entity_t    worldent;
+	mod_brush_t *brush;
 
 	clear_texture_chains (bctx);	// do this first for water and skys
 	bframe->index_count = 0;
 
 	memset (&worldent, 0, sizeof (worldent));
 	worldent.model = r_worldentity.model;
+	brush = &r_worldentity.model->brush;
 
 	//vulktex_t  *tex = r_worldentity.model->skytexture->render;
 	//bctx->skysheet_tex = tex->tex;
 
 	currententity = &worldent;
 
-	R_VisitWorldNodes (worldent.model, ctx);
+	R_VisitWorldNodes (brush, ctx);
 	if (r_drawentities->int_val) {
 		entity_t   *ent;
 		for (ent = r_ent_queue; ent; ent = ent->next) {
diff --git a/libs/video/renderer/vulkan/vulkan_lightmap.c b/libs/video/renderer/vulkan/vulkan_lightmap.c
index 623bd9d94..ca5d433e8 100644
--- a/libs/video/renderer/vulkan/vulkan_lightmap.c
+++ b/libs/video/renderer/vulkan/vulkan_lightmap.c
@@ -125,7 +125,7 @@ add_dynamic_lights (msurface_t *surf, float *block)
 }
 
 void
-Vulkan_BuildLightMap (msurface_t *surf, vulkan_ctx_t *ctx)
+Vulkan_BuildLightMap (mod_brush_t *brush, msurface_t *surf, vulkan_ctx_t *ctx)
 {
 	bspctx_t   *bctx = ctx->bsp_context;
 	int         smax, tmax, size;
@@ -142,7 +142,7 @@ Vulkan_BuildLightMap (msurface_t *surf, vulkan_ctx_t *ctx)
 	block = QFV_SubpicBatch (surf->lightpic, bctx->light_stage);
 
 	// set to full bright if no light data
-	if (!r_worldentity.model->lightdata) {
+	if (!brush->lightdata) {
 		out = block;
 		while (size-- > 0) {
 			*out++ = 1;
@@ -219,6 +219,7 @@ Vulkan_BuildLightmaps (model_t **models, int num_models, vulkan_ctx_t *ctx)
 	bspctx_t   *bctx = ctx->bsp_context;
 	int         i, j;
 	model_t    *m;
+	mod_brush_t *brush;
 
 	QFV_ScrapClear (bctx->light_scrap);
 
@@ -228,13 +229,14 @@ Vulkan_BuildLightmaps (model_t **models, int num_models, vulkan_ctx_t *ctx)
 		m = models[j];
 		if (!m)
 			break;
-		if (m->path[0] == '*') {
+		if (m->path[0] == '*' || m->type != mod_brush) {
 			// sub model surfaces are processed as part of the main model
 			continue;
 		}
+		brush = &m->brush;
 		// non-bsp models don't have surfaces.
-		for (i = 0; i < m->numsurfaces; i++) {
-			msurface_t *surf = m->surfaces + i;
+		for (i = 0; i < brush->numsurfaces; i++) {
+			msurface_t *surf = brush->surfaces + i;
 			surf->lightpic = 0;     // paranoia
 			if (surf->flags & SURF_DRAWTURB) {
 				continue;
@@ -251,15 +253,16 @@ Vulkan_BuildLightmaps (model_t **models, int num_models, vulkan_ctx_t *ctx)
 		if (!m) {
 			break;
 		}
-		if (m->path[0] == '*') {
+		if (m->path[0] == '*' || m->type != mod_brush) {
 			// sub model surfaces are processed as part of the main model
 			continue;
 		}
+		brush = &m->brush;
 		// non-bsp models don't have surfaces.
-		for (i = 0; i < m->numsurfaces; i++) {
-			msurface_t *surf = m->surfaces + i;
+		for (i = 0; i < brush->numsurfaces; i++) {
+			msurface_t *surf = brush->surfaces + i;
 			if (surf->lightpic) {
-				Vulkan_BuildLightMap (surf, ctx);
+				Vulkan_BuildLightMap (brush, surf, ctx);
 			}
 		}
 	}
diff --git a/nq/source/cl_chase.c b/nq/source/cl_chase.c
index 92903bbfc..5d23817cd 100644
--- a/nq/source/cl_chase.c
+++ b/nq/source/cl_chase.c
@@ -86,7 +86,7 @@ TraceLine (vec3_t start, vec3_t end, vec3_t impact)
 
 	memset (&trace, 0, sizeof (trace));
 	trace.fraction = 1;
-	MOD_TraceLine (cl.worldmodel->hulls, 0, start, end, &trace);
+	MOD_TraceLine (cl.worldmodel->brush.hulls, 0, start, end, &trace);
 
 	VectorCopy (trace.endpos, impact);
 }
diff --git a/nq/source/cl_ents.c b/nq/source/cl_ents.c
index 6f6e90e29..ce76ebf71 100644
--- a/nq/source/cl_ents.c
+++ b/nq/source/cl_ents.c
@@ -381,7 +381,7 @@ CL_RelinkEntities (void)
 			if (i != cl.viewentity || chase_active->int_val) {
 				if (ent->efrag)
 					r_funcs->R_RemoveEfrags (ent);
-				r_funcs->R_AddEfrags (ent);
+				r_funcs->R_AddEfrags (&cl.worldmodel->brush, ent);
 			}
 			VectorCopy (ent->origin, ent->old_origin);
 		} else {
@@ -416,10 +416,10 @@ CL_RelinkEntities (void)
 				if (ent->efrag) {
 					if (!VectorCompare (ent->origin, ent->old_origin)) {
 						r_funcs->R_RemoveEfrags (ent);
-						r_funcs->R_AddEfrags (ent);
+						r_funcs->R_AddEfrags (&cl.worldmodel->brush, ent);
 					}
 				} else {
-					r_funcs->R_AddEfrags (ent);
+					r_funcs->R_AddEfrags (&cl.worldmodel->brush, ent);
 				}
 			}
 		}
diff --git a/nq/source/cl_parse.c b/nq/source/cl_parse.c
index 981f72714..3b076b43f 100644
--- a/nq/source/cl_parse.c
+++ b/nq/source/cl_parse.c
@@ -301,7 +301,7 @@ map_ent (const char *mapname)
 		edicts = ED_Parse (&edpr, buf);
 		free (buf);
 	} else {
-		edicts = ED_Parse (&edpr, cl.model_precache[1]->entities);
+		edicts = ED_Parse (&edpr, cl.model_precache[1]->brush.entities);
 	}
 	free (name);
 	return edicts;
@@ -315,7 +315,7 @@ CL_NewMap (const char *mapname)
 	Hunk_Check ();								// make sure nothing is hurt
 	Sbar_CenterPrint (0);
 
-	if (cl.model_precache[1] && cl.model_precache[1]->entities) {
+	if (cl.model_precache[1] && cl.model_precache[1]->brush.entities) {
 		cl.edicts = map_ent (mapname);
 		if (cl.edicts) {
 			cl.worldspawn = PL_ObjectAtIndex (cl.edicts, 0);
@@ -795,7 +795,7 @@ CL_ParseStatic (int version)
 	VectorCopy (baseline.origin, ent->origin);
 	CL_TransformEntity (ent, baseline.angles, true);
 
-	r_funcs->R_AddEfrags (ent);
+	r_funcs->R_AddEfrags (&cl.worldmodel->brush, ent);
 }
 
 static void
diff --git a/nq/source/cl_tent.c b/nq/source/cl_tent.c
index 89f05ee74..2286d829a 100644
--- a/nq/source/cl_tent.c
+++ b/nq/source/cl_tent.c
@@ -294,7 +294,7 @@ beam_setup (beam_t *b, qboolean transform)
 			CL_TransformEntity (&tent->ent, ang, true);
 		}
 		VectorCopy (ang, tent->ent.angles);
-		r_funcs->R_AddEfrags (&tent->ent);
+		r_funcs->R_AddEfrags (&cl.worldmodel->brush, &tent->ent);
 	}
 }
 
@@ -588,7 +588,7 @@ CL_UpdateExplosions (void)
 
 		ent->frame = f;
 		if (!ent->efrag)
-			r_funcs->R_AddEfrags (ent);
+			r_funcs->R_AddEfrags (&cl.worldmodel->brush, ent);
 	}
 }
 
diff --git a/nq/source/sv_main.c b/nq/source/sv_main.c
index 9ee006e3b..38604e66c 100644
--- a/nq/source/sv_main.c
+++ b/nq/source/sv_main.c
@@ -432,9 +432,9 @@ SV_AddToFatPVS (vec3_t org, mnode_t *node)
 static byte       *
 SV_FatPVS (vec3_t org)
 {
-	fatbytes = (sv.worldmodel->numleafs + 31) >> 3;
+	fatbytes = (sv.worldmodel->brush.numleafs + 31) >> 3;
 	memset (fatpvs, 0, fatbytes);
-	SV_AddToFatPVS (org, sv.worldmodel->nodes);
+	SV_AddToFatPVS (org, sv.worldmodel->brush.nodes);
 	return fatpvs;
 }
 
@@ -1189,7 +1189,7 @@ SV_SpawnServer (const char *server)
 
 	sv.model_precache[0] = sv_pr_state.pr_strings;
 	sv.model_precache[1] = sv.modelname;
-	for (i = 1; i < sv.worldmodel->numsubmodels; i++) {
+	for (i = 1; i < sv.worldmodel->brush.numsubmodels; i++) {
 		sv.model_precache[1 + i] = localmodels[i];
 		sv.models[i + 1] = Mod_ForName (localmodels[i], false);
 	}
@@ -1220,7 +1220,7 @@ SV_SpawnServer (const char *server)
 		ED_LoadFromFile (&sv_pr_state, (char *) buf);
 		free (buf);
 	} else {
-		ED_LoadFromFile (&sv_pr_state, sv.worldmodel->entities);
+		ED_LoadFromFile (&sv_pr_state, sv.worldmodel->brush.entities);
 	}
 
 	sv.active = true;
diff --git a/nq/source/sv_pr_cmds.c b/nq/source/sv_pr_cmds.c
index 0084b3b99..096010f77 100644
--- a/nq/source/sv_pr_cmds.c
+++ b/nq/source/sv_pr_cmds.c
@@ -585,7 +585,7 @@ PF_newcheckclient (progs_t *pr, int check)
 	VectorAdd (SVvector (ent, origin), SVvector (ent, view_ofs), org);
 	leaf = Mod_PointInLeaf (org, sv.worldmodel);
 	pvs = Mod_LeafPVS (leaf, sv.worldmodel);
-	memcpy (checkpvs, pvs, (sv.worldmodel->numleafs + 7) >> 3);
+	memcpy (checkpvs, pvs, (sv.worldmodel->brush.numleafs + 7) >> 3);
 
 	return i;
 }
@@ -630,7 +630,7 @@ PF_checkclient (progs_t *pr)
 	self = PROG_TO_EDICT (pr, *sv_globals.self);
 	VectorAdd (SVvector (self, origin), SVvector (self, view_ofs), view);
 	leaf = Mod_PointInLeaf (view, sv.worldmodel);
-	l = (leaf - sv.worldmodel->leafs) - 1;
+	l = (leaf - sv.worldmodel->brush.leafs) - 1;
 	if ((l < 0) || !(checkpvs[l >> 3] & (1 << (l & 7)))) {
 		c_notvis++;
 		RETURN_EDICT (pr, sv.edicts);
diff --git a/nq/source/world.c b/nq/source/world.c
index f7d379a2d..5f8bce898 100644
--- a/nq/source/world.c
+++ b/nq/source/world.c
@@ -245,7 +245,7 @@ SV_HullForEntity (edict_t *ent, const vec3_t mins, const vec3_t maxs,
 					   PR_GetString (&sv_pr_state,
 						   			 SVstring (ent, classname)));
 
-		hull_list = model->hull_list;
+		hull_list = model->brush.hull_list;
 	}
 	if (hull_list) {
 		// decide which clipping hull to use, based on the size
@@ -425,7 +425,7 @@ SV_FindTouchedLeafs (edict_t *ent, mnode_t *node)
 		leaf = (mleaf_t *) node;
 
 		edict_leaf = alloc_edict_leaf ();
-		edict_leaf->leafnum = leaf - sv.worldmodel->leafs - 1;
+		edict_leaf->leafnum = leaf - sv.worldmodel->brush.leafs - 1;
 		edict_leaf->next = SVdata (ent)->leafs;
 		SVdata (ent)->leafs = edict_leaf;
 		return;
@@ -497,7 +497,7 @@ SV_LinkEdict (edict_t *ent, qboolean touch_triggers)
 	// link to PVS leafs
 	free_edict_leafs (&SVdata (ent)->leafs);
 	if (SVfloat (ent, modelindex))
-		SV_FindTouchedLeafs (ent, sv.worldmodel->nodes);
+		SV_FindTouchedLeafs (ent, sv.worldmodel->brush.nodes);
 
 	if (SVfloat (ent, solid) == SOLID_NOT)
 		return;
@@ -560,7 +560,7 @@ SV_PointContents (const vec3_t p)
 {
 	int         cont;
 
-	cont = SV_HullPointContents (&sv.worldmodel->hulls[0], 0, p);
+	cont = SV_HullPointContents (&sv.worldmodel->brush.hulls[0], 0, p);
 	if (cont <= CONTENTS_CURRENT_0 && cont >= CONTENTS_CURRENT_DOWN)
 		cont = CONTENTS_WATER;
 	return cont;
@@ -569,7 +569,7 @@ SV_PointContents (const vec3_t p)
 int
 SV_TruePointContents (const vec3_t p)
 {
-	return SV_HullPointContents (&sv.worldmodel->hulls[0], 0, p);
+	return SV_HullPointContents (&sv.worldmodel->brush.hulls[0], 0, p);
 }
 
 /*
@@ -903,7 +903,7 @@ SV_TestPlayerPosition (edict_t *ent, const vec3_t origin)
 	vec3_t      boxmins, boxmaxs, offset;
 
 	// check world first
-	hull = &sv.worldmodel->hulls[1];
+	hull = &sv.worldmodel->brush.hulls[1];
 	if (SV_HullPointContents (hull, hull->firstclipnode, origin) !=
 		CONTENTS_EMPTY) return sv.edicts;
 
diff --git a/qw/source/cl_chase.c b/qw/source/cl_chase.c
index 2e5583429..8a3d6419d 100644
--- a/qw/source/cl_chase.c
+++ b/qw/source/cl_chase.c
@@ -86,7 +86,7 @@ TraceLine (vec3_t start, vec3_t end, vec3_t impact)
 
 	memset (&trace, 0, sizeof (trace));
 	trace.fraction = 1;
-	MOD_TraceLine (cl.worldmodel->hulls, 0, start, end, &trace);
+	MOD_TraceLine (cl.worldmodel->brush.hulls, 0, start, end, &trace);
 
 	VectorCopy (trace.endpos, impact);
 }
diff --git a/qw/source/cl_entparse.c b/qw/source/cl_entparse.c
index 3fdeda901..6fc04a4c4 100644
--- a/qw/source/cl_entparse.c
+++ b/qw/source/cl_entparse.c
@@ -542,7 +542,7 @@ CL_SetSolidEntities (void)
 			continue;
 		if (!cl.model_precache[state->modelindex])
 			continue;
-		if (cl.model_precache[state->modelindex]->hulls[1].firstclipnode
+		if (cl.model_precache[state->modelindex]->brush.hulls[1].firstclipnode
 			|| cl.model_precache[state->modelindex]->clipbox) {
 			if (pmove.numphysent == MAX_PHYSENTS) {
 				Sys_Printf ("WARNING: entity physent overflow, email "
diff --git a/qw/source/cl_ents.c b/qw/source/cl_ents.c
index 24f14933b..7c95040ed 100644
--- a/qw/source/cl_ents.c
+++ b/qw/source/cl_ents.c
@@ -335,7 +335,7 @@ CL_LinkPacketEntities (void)
 			if (i != cl.viewentity || chase_active->int_val) {
 				if (ent->efrag)
 					r_funcs->R_RemoveEfrags (ent);
-				r_funcs->R_AddEfrags (ent);
+				r_funcs->R_AddEfrags (&cl.worldmodel->brush, ent);
 			}
 			VectorCopy (ent->origin, ent->old_origin);
 		} else {
@@ -370,15 +370,15 @@ CL_LinkPacketEntities (void)
 				if (ent->efrag) {
 					if (!VectorCompare (ent->origin, ent->old_origin)) {
 						r_funcs->R_RemoveEfrags (ent);
-						r_funcs->R_AddEfrags (ent);
+						r_funcs->R_AddEfrags (&cl.worldmodel->brush, ent);
 					}
 				} else {
-					r_funcs->R_AddEfrags (ent);
+					r_funcs->R_AddEfrags (&cl.worldmodel->brush, ent);
 				}
 			}
 		}
 		if (!ent->efrag)
-			r_funcs->R_AddEfrags (ent);
+			r_funcs->R_AddEfrags (&cl.worldmodel->brush, ent);
 
 		// rotate binary objects locally
 		if (ent->model->flags & EF_ROTATE) {
@@ -567,7 +567,7 @@ CL_LinkPlayers (void)
 		}
 
 		// stuff entity in map
-		r_funcs->R_AddEfrags (ent);
+		r_funcs->R_AddEfrags (&cl.worldmodel->brush, ent);
 
 		if (state->pls.effects & EF_FLAG1)
 			CL_AddFlagModels (ent, 0, j);
diff --git a/qw/source/cl_parse.c b/qw/source/cl_parse.c
index 21c7dabd2..f38b30537 100644
--- a/qw/source/cl_parse.c
+++ b/qw/source/cl_parse.c
@@ -288,7 +288,7 @@ map_ent (const char *mapname)
 		edicts = ED_Parse (&edpr, buf);
 		free (buf);
 	} else {
-		edicts = ED_Parse (&edpr, cl.model_precache[1]->entities);
+		edicts = ED_Parse (&edpr, cl.model_precache[1]->brush.entities);
 	}
 	free (name);
 	return edicts;
@@ -305,7 +305,7 @@ CL_NewMap (const char *mapname)
 	Hunk_Check ();								// make sure nothing is hurt
 	Sbar_CenterPrint (0);
 
-	if (cl.model_precache[1] && cl.model_precache[1]->entities) {
+	if (cl.model_precache[1] && cl.model_precache[1]->brush.entities) {
 		cl.edicts = map_ent (mapname);
 		if (cl.edicts) {
 			cl.worldspawn = PL_ObjectAtIndex (cl.edicts, 0);
@@ -404,7 +404,7 @@ Model_NextDownload (void)
 		MSG_WriteByte (&cls.netchan.message, clc_stringcmd);
 		MSG_WriteString (&cls.netchan.message,
 						 va (0, prespawn_name, cl.servercount,
-							 cl.worldmodel->checksum2));
+							 cl.worldmodel->brush.checksum2));
 	}
 }
 
@@ -986,7 +986,7 @@ CL_ParseStatic (void)
 	VectorCopy (es.origin, ent->origin);
 	CL_TransformEntity (ent, es.angles, true);
 
-	r_funcs->R_AddEfrags (ent);
+	r_funcs->R_AddEfrags (&cl.worldmodel->brush, ent);
 }
 
 static void
diff --git a/qw/source/cl_tent.c b/qw/source/cl_tent.c
index 950734bea..c24f1f0bc 100644
--- a/qw/source/cl_tent.c
+++ b/qw/source/cl_tent.c
@@ -298,7 +298,7 @@ beam_setup (beam_t *b, qboolean transform)
 			CL_TransformEntity (&tent->ent, ang, true);
 		}
 		VectorCopy (ang, tent->ent.angles);
-		r_funcs->R_AddEfrags (&tent->ent);
+		r_funcs->R_AddEfrags (&cl.worldmodel->brush, &tent->ent);
 	}
 }
 
@@ -595,7 +595,7 @@ CL_UpdateExplosions (void)
 
 		ent->frame = f;
 		if (!ent->efrag)
-			r_funcs->R_AddEfrags (ent);
+			r_funcs->R_AddEfrags (&cl.worldmodel->brush, ent);
 	}
 }
 
@@ -658,7 +658,7 @@ CL_ParseProjectiles (qboolean nail2)
 		pr->angles[2] = 0;
 		CL_TransformEntity (&tent->ent, tent->ent.angles, true);
 
-		r_funcs->R_AddEfrags (&tent->ent);
+		r_funcs->R_AddEfrags (&cl.worldmodel->brush, &tent->ent);
 	}
 
 	*tail = cl_projectiles;
diff --git a/qw/source/pmovetst.c b/qw/source/pmovetst.c
index 6b3857feb..b79e860e0 100644
--- a/qw/source/pmovetst.c
+++ b/qw/source/pmovetst.c
@@ -136,7 +136,7 @@ PM_PointContents (const vec3_t p)
 	hull_t     *hull;
 	plane_t    *plane;
 
-	hull = &pmove.physents[0].model->hulls[0];
+	hull = &pmove.physents[0].model->brush.hulls[0];
 
 	num = hull->firstclipnode;
 
@@ -174,7 +174,7 @@ PM_TestPlayerPosition (const vec3_t pos)
 		pe = &pmove.physents[i];
 		// get the clipping hull
 		if (pe->model)
-			hull = &pmove.physents[i].model->hulls[1];
+			hull = &pmove.physents[i].model->brush.hulls[1];
 		else {
 			VectorSubtract (pe->mins, player_maxs, mins);
 			VectorSubtract (pe->maxs, player_mins, maxs);
@@ -235,7 +235,7 @@ PM_PlayerMove (const vec3_t start, const vec3_t end)
 		} else {
 			check_box = 1;
 			if (pe->model) {
-				hull = &pe->model->hulls[1];
+				hull = &pe->model->brush.hulls[1];
 				VectorSubtract (pe->model->mins, player_maxs, mins);
 				VectorSubtract (pe->model->maxs, player_mins, maxs);
 			} else {
diff --git a/qw/source/sv_ents.c b/qw/source/sv_ents.c
index 09e19ba83..a5d6b4db9 100644
--- a/qw/source/sv_ents.c
+++ b/qw/source/sv_ents.c
@@ -99,9 +99,9 @@ SV_AddToFatPVS (vec3_t org, mnode_t *node)
 static byte *
 SV_FatPVS (vec3_t org)
 {
-	fatbytes = (sv.worldmodel->numleafs + 31) >> 3;
+	fatbytes = (sv.worldmodel->brush.numleafs + 31) >> 3;
 	memset (fatpvs, 0, fatbytes);
-	SV_AddToFatPVS (org, sv.worldmodel->nodes);
+	SV_AddToFatPVS (org, sv.worldmodel->brush.nodes);
 	return fatpvs;
 }
 
@@ -738,7 +738,7 @@ calc_pvs (delta_t *delta)
 			if (pvs == NULL) {
 				pvs = SV_FatPVS (org);
 			} else {
-				SV_AddToFatPVS (org, sv.worldmodel->nodes);
+				SV_AddToFatPVS (org, sv.worldmodel->brush.nodes);
 			}
 		}
 	}
diff --git a/qw/source/sv_init.c b/qw/source/sv_init.c
index 8535dacb6..e0a370f92 100644
--- a/qw/source/sv_init.c
+++ b/qw/source/sv_init.c
@@ -229,7 +229,7 @@ SV_CalcPHS (void)
 
 	SV_Printf ("Building PHS...\n");
 
-	num = sv.worldmodel->numleafs;
+	num = sv.worldmodel->brush.numleafs;
 	rowwords = (num + 31) >> 5;
 	rowbytes = rowwords * 4;
 
@@ -237,7 +237,8 @@ SV_CalcPHS (void)
 	scan = sv.pvs;
 	vcount = 0;
 	for (i = 0; i < num; i++, scan += rowbytes) {
-		memcpy (scan, Mod_LeafPVS (sv.worldmodel->leafs + i, sv.worldmodel),
+		memcpy (scan, Mod_LeafPVS (sv.worldmodel->brush.leafs + i,
+								   sv.worldmodel),
 				rowbytes);
 		if (i == 0)
 			continue;
@@ -402,7 +403,7 @@ SV_SpawnServer (const char *server)
 	sv.model_precache[0] = sv_pr_state.pr_strings;
 	sv.model_precache[1] = sv.modelname;
 	sv.models[1] = sv.worldmodel;
-	for (i = 1; i < sv.worldmodel->numsubmodels; i++) {
+	for (i = 1; i < sv.worldmodel->brush.numsubmodels; i++) {
 		sv.model_precache[1 + i] = localmodels[i];
 		sv.models[i + 1] = Mod_ForName (localmodels[i], false);
 	}
@@ -443,7 +444,7 @@ SV_SpawnServer (const char *server)
 		ED_LoadFromFile (&sv_pr_state, (char *) buf);
 		free (buf);
 	} else {
-		ED_LoadFromFile (&sv_pr_state, sv.worldmodel->entities);
+		ED_LoadFromFile (&sv_pr_state, sv.worldmodel->brush.entities);
 	}
 
 	// look up some model indexes for specialized message compression
diff --git a/qw/source/sv_pr_cmds.c b/qw/source/sv_pr_cmds.c
index 7298dc74a..b8dc58de0 100644
--- a/qw/source/sv_pr_cmds.c
+++ b/qw/source/sv_pr_cmds.c
@@ -506,7 +506,7 @@ PF_newcheckclient (progs_t *pr, int check)
 	VectorAdd (SVvector (ent, origin), SVvector (ent, view_ofs), org);
 	leaf = Mod_PointInLeaf (org, sv.worldmodel);
 	pvs = Mod_LeafPVS (leaf, sv.worldmodel);
-	memcpy (checkpvs, pvs, (sv.worldmodel->numleafs + 7) >> 3);
+	memcpy (checkpvs, pvs, (sv.worldmodel->brush.numleafs + 7) >> 3);
 
 	return i;
 }
@@ -551,7 +551,7 @@ PF_checkclient (progs_t *pr)
 	self = PROG_TO_EDICT (pr, *sv_globals.self);
 	VectorAdd (SVvector (self, origin), SVvector (self, view_ofs), view);
 	leaf = Mod_PointInLeaf (view, sv.worldmodel);
-	l = (leaf - sv.worldmodel->leafs) - 1;
+	l = (leaf - sv.worldmodel->brush.leafs) - 1;
 	if ((l < 0) || !(checkpvs[l >> 3] & (1 << (l & 7)))) {
 		c_notvis++;
 		RETURN_EDICT (pr, sv.edicts);
diff --git a/qw/source/sv_send.c b/qw/source/sv_send.c
index 400b9484e..0948e6f18 100644
--- a/qw/source/sv_send.c
+++ b/qw/source/sv_send.c
@@ -297,12 +297,13 @@ SV_Multicast (const vec3_t origin, int to)
 	int         leafnum, j;
 	mleaf_t    *leaf;
 	qboolean    reliable;
+	mod_brush_t *brush = &sv.worldmodel->brush;
 
 	leaf = Mod_PointInLeaf (origin, sv.worldmodel);
 	if (!leaf)
 		leafnum = 0;
 	else
-		leafnum = leaf - sv.worldmodel->leafs;
+		leafnum = leaf - sv.worldmodel->brush.leafs;
 
 	reliable = false;
 
@@ -316,13 +317,13 @@ SV_Multicast (const vec3_t origin, int to)
 	case MULTICAST_PHS_R:
 		reliable = true;			// intentional fallthrough
 	case MULTICAST_PHS:
-		mask = sv.phs + leafnum * 4 * ((sv.worldmodel->numleafs + 31) >> 5);
+		mask = sv.phs + leafnum * 4 * ((brush->numleafs + 31) >> 5);
 		break;
 
 	case MULTICAST_PVS_R:
 		reliable = true;			// intentional fallthrough
 	case MULTICAST_PVS:
-		mask = sv.pvs + leafnum * 4 * ((sv.worldmodel->numleafs + 31) >> 5);
+		mask = sv.pvs + leafnum * 4 * ((brush->numleafs + 31) >> 5);
 		break;
 
 	default:
@@ -347,7 +348,7 @@ SV_Multicast (const vec3_t origin, int to)
 								sv.worldmodel);
 		if (leaf) {
 			// -1 is because pvs rows are 1 based, not 0 based like leafs
-			leafnum = leaf - sv.worldmodel->leafs - 1;
+			leafnum = leaf - brush->leafs - 1;
 			if (!(mask[leafnum >> 3] & (1 << (leafnum & 7)))) {
 //				SV_Printf ("supressed multicast\n");
 				continue;
diff --git a/qw/source/sv_user.c b/qw/source/sv_user.c
index 3fba2c17f..12c3de010 100644
--- a/qw/source/sv_user.c
+++ b/qw/source/sv_user.c
@@ -335,14 +335,15 @@ SV_PreSpawn_f (void *unused)
 
 //      Sys_MaskPrintf (SYS_DEV, , "Client check = %d\n", check);
 
-		if (sv_mapcheck->int_val && check != sv.worldmodel->checksum &&
-			check != sv.worldmodel->checksum2) {
+		if (sv_mapcheck->int_val && check != sv.worldmodel->brush.checksum &&
+			check != sv.worldmodel->brush.checksum2) {
 			SV_ClientPrintf (1, host_client, PRINT_HIGH, "Map model file does "
 							 "not match (%s), %i != %i/%i.\n"
 							 "You may need a new version of the map, or the "
 							 "proper install files.\n",
-							 sv.modelname, check, sv.worldmodel->checksum,
-							 sv.worldmodel->checksum2);
+							 sv.modelname, check,
+							 sv.worldmodel->brush.checksum,
+							 sv.worldmodel->brush.checksum2);
 			SV_DropClient (host_client);
 			return;
 		}
diff --git a/qw/source/world.c b/qw/source/world.c
index bbf4d930e..393daaf6f 100644
--- a/qw/source/world.c
+++ b/qw/source/world.c
@@ -245,7 +245,7 @@ SV_HullForEntity (edict_t *ent, const vec3_t mins, const vec3_t maxs,
 					   PR_GetString (&sv_pr_state,
 						   			 SVstring (ent, classname)));
 
-		hull_list = model->hull_list;
+		hull_list = model->brush.hull_list;
 	}
 	if (hull_list) {
 		// decide which clipping hull to use, based on the size
@@ -425,7 +425,7 @@ SV_FindTouchedLeafs (edict_t *ent, mnode_t *node)
 		leaf = (mleaf_t *) node;
 
 		edict_leaf = alloc_edict_leaf ();
-		edict_leaf->leafnum = leaf - sv.worldmodel->leafs - 1;
+		edict_leaf->leafnum = leaf - sv.worldmodel->brush.leafs - 1;
 		edict_leaf->next = SVdata (ent)->leafs;
 		SVdata (ent)->leafs = edict_leaf;
 		return;
@@ -497,7 +497,7 @@ SV_LinkEdict (edict_t *ent, qboolean touch_triggers)
 	// link to PVS leafs
 	free_edict_leafs (&SVdata (ent)->leafs);
 	if (SVfloat (ent, modelindex))
-		SV_FindTouchedLeafs (ent, sv.worldmodel->nodes);
+		SV_FindTouchedLeafs (ent, sv.worldmodel->brush.nodes);
 
 	if (SVfloat (ent, solid) == SOLID_NOT)
 		return;
@@ -560,7 +560,7 @@ SV_PointContents (const vec3_t p)
 {
 	int         cont;
 
-	cont = SV_HullPointContents (&sv.worldmodel->hulls[0], 0, p);
+	cont = SV_HullPointContents (&sv.worldmodel->brush.hulls[0], 0, p);
 	if (cont <= CONTENTS_CURRENT_0 && cont >= CONTENTS_CURRENT_DOWN)
 		cont = CONTENTS_WATER;
 	return cont;
@@ -569,7 +569,7 @@ SV_PointContents (const vec3_t p)
 int
 SV_TruePointContents (const vec3_t p)
 {
-	return SV_HullPointContents (&sv.worldmodel->hulls[0], 0, p);
+	return SV_HullPointContents (&sv.worldmodel->brush.hulls[0], 0, p);
 }
 
 /*
@@ -991,7 +991,7 @@ SV_TestPlayerPosition (edict_t *ent, const vec3_t origin)
 	vec3_t      boxmins, boxmaxs, offset;
 
 	// check world first
-	hull = &sv.worldmodel->hulls[1];
+	hull = &sv.worldmodel->brush.hulls[1];
 	if (SV_HullPointContents (hull, hull->firstclipnode, origin) !=
 		CONTENTS_EMPTY) return sv.edicts;
 

From ea72d0c60e9e2ead63fbfdaa96a62d16c52cde86 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 1 Feb 2021 21:11:45 +0900
Subject: [PATCH 1397/1519] [model] Clean up the globals for alias models

---
 include/QF/Vulkan/qf_alias.h            |  12 +-
 include/QF/model.h                      |  11 --
 include/QF/plugin/vid_render.h          |  12 +-
 include/mod_internal.h                  |  47 ++++---
 libs/models/alias/gl_mesh.c             | 118 ++++++++---------
 libs/models/alias/gl_model_alias.c      |  51 ++++----
 libs/models/alias/glsl_model_alias.c    |  75 +++++------
 libs/models/alias/model_alias.c         | 161 +++++++++++++-----------
 libs/models/alias/sw_model_alias.c      |  75 ++++++-----
 libs/models/alias/vulkan_model_alias.c  |  82 ++++++------
 libs/video/renderer/vid_render_sw.c     |   4 +-
 libs/video/renderer/vid_render_sw32.c   |   4 +-
 libs/video/renderer/vid_render_vulkan.c |  18 +--
 13 files changed, 350 insertions(+), 320 deletions(-)

diff --git a/include/QF/Vulkan/qf_alias.h b/include/QF/Vulkan/qf_alias.h
index dac8f4ca7..ebf4f6996 100644
--- a/include/QF/Vulkan/qf_alias.h
+++ b/include/QF/Vulkan/qf_alias.h
@@ -102,14 +102,16 @@ typedef struct aliasctx_s {
 
 struct vulkan_ctx_s;
 struct entity_s;
-void *Vulkan_Mod_LoadSkin (model_t *mod, byte *skin, int skinsize, int snum,
-						   int gnum, qboolean group,
+struct mod_alias_ctx_s;
+void *Vulkan_Mod_LoadSkin (struct mod_alias_ctx_s *alias_ctx, byte *skin,
+						   int skinsize, int snum, int gnum, qboolean group,
 						   maliasskindesc_t *skindesc,
 						   struct vulkan_ctx_s *ctx);
-void Vulkan_Mod_FinalizeAliasModel (model_t *m, aliashdr_t *hdr,
+void Vulkan_Mod_FinalizeAliasModel (struct mod_alias_ctx_s *alias_ctx,
 									struct vulkan_ctx_s *ctx);
-void Vulkan_Mod_LoadExternalSkins (model_t *mod, struct vulkan_ctx_s *ctx);
-void Vulkan_Mod_MakeAliasModelDisplayLists (model_t *mod, aliashdr_t *hdr,
+void Vulkan_Mod_LoadExternalSkins (struct mod_alias_ctx_s *alias_ctx,
+								   struct vulkan_ctx_s *ctx);
+void Vulkan_Mod_MakeAliasModelDisplayLists (struct mod_alias_ctx_s *alias_ctx,
 											void *_m, int _s, int extra,
 											struct vulkan_ctx_s *ctx);
 
diff --git a/include/QF/model.h b/include/QF/model.h
index 6d7dfe61d..a05d489a4 100644
--- a/include/QF/model.h
+++ b/include/QF/model.h
@@ -28,7 +28,6 @@
 #ifndef __QF_model_h
 #define __QF_model_h
 
-#include "QF/darray.h"
 #include "QF/qtypes.h"
 #include "QF/bspfile.h"
 #include "QF/spritegn.h"
@@ -372,16 +371,6 @@ typedef struct {
 	maliasframedesc_t	frames[1];
 } aliashdr_t;
 
-typedef struct stvertset_s DARRAY_TYPE (stvert_t) stvertset_t;
-typedef struct mtriangleset_s DARRAY_TYPE (mtriangle_t) mtriangleset_t;
-typedef struct trivertxset_s DARRAY_TYPE (trivertx_t *) trivertxset_t;
-extern	aliashdr_t	*pheader;
-extern	stvertset_t	 stverts;
-extern	mtriangleset_t triangles;
-extern	trivertxset_t poseverts;
-extern  int			 aliasbboxmins[3];
-extern  int			 aliasbboxmaxs[3];
-
 // Whole model ================================================================
 
 typedef enum {mod_brush, mod_sprite, mod_alias, mod_iqm} modtype_t;
diff --git a/include/QF/plugin/vid_render.h b/include/QF/plugin/vid_render.h
index bc80780e4..5d2ed3d18 100644
--- a/include/QF/plugin/vid_render.h
+++ b/include/QF/plugin/vid_render.h
@@ -37,6 +37,8 @@ struct plitem_s;
 struct cvar_s;
 struct skin_s;
 
+struct mod_alias_ctx_s;
+
 /*
 	All video plugins must export these functions
 */
@@ -88,13 +90,13 @@ typedef struct vid_model_funcs_s {
 	void (*Mod_LoadAliasModel) (model_t *mod, void *buffer,
 								cache_allocator_t allocator);
 	void (*Mod_LoadSpriteModel) (model_t *mod, void *buffer);
-	void (*Mod_MakeAliasModelDisplayLists) (model_t *m, aliashdr_t *hdr,
+	void (*Mod_MakeAliasModelDisplayLists) (struct mod_alias_ctx_s *alias_ctx,
 											void *_m, int _s, int extra);
-	void *(*Mod_LoadSkin) (model_t *mod, byte *skin, int skinsize, int snum,
-						   int gnum,
+	void *(*Mod_LoadSkin) (struct mod_alias_ctx_s *alias_ctx, byte *skin,
+						   int skinsize, int snum, int gnum,
 						   qboolean group, maliasskindesc_t *skindesc);
-	void (*Mod_FinalizeAliasModel) (model_t *m, aliashdr_t *hdr);
-	void (*Mod_LoadExternalSkins) (model_t *mod);
+	void (*Mod_FinalizeAliasModel) (struct mod_alias_ctx_s *alias_ctx);
+	void (*Mod_LoadExternalSkins) (struct mod_alias_ctx_s *alias_ctx);
 	void (*Mod_IQMFinish) (model_t *mod);
 	int alias_cache;
 	void (*Mod_SpriteLoadTexture) (model_t *mod, mspriteframe_t *pspriteframe,
diff --git a/include/mod_internal.h b/include/mod_internal.h
index f459bbeaa..d498ee9ce 100644
--- a/include/mod_internal.h
+++ b/include/mod_internal.h
@@ -1,11 +1,27 @@
 #ifndef __mod_internal_h
 #define __mod_internal_h
 
+#include "QF/darray.h"
 #include "QF/iqm.h"
 #include "QF/model.h"
 #include "QF/skin.h"
 #include "QF/plugin/vid_render.h"
 
+typedef struct stvertset_s DARRAY_TYPE (stvert_t) stvertset_t;
+typedef struct mtriangleset_s DARRAY_TYPE (mtriangle_t) mtriangleset_t;
+typedef struct trivertxset_s DARRAY_TYPE (trivertx_t *) trivertxset_t;
+
+typedef struct mod_alias_ctx_s {
+	aliashdr_t *header;
+	model_t    *mod;
+	stvertset_t stverts;
+	mtriangleset_t triangles;
+	trivertxset_t poseverts;
+	int         aliasbboxmins[3];
+	int         aliasbboxmaxs[3];
+
+} mod_alias_ctx_t;
+
 int Mod_CalcFullbright (const byte *in, byte *out, int pixels);
 void Mod_ClearFullbright (const byte *in, byte *out, int pixels);
 void Mod_FloodFillSkin (byte *skin, int skinwidth, int skinheight);
@@ -22,28 +38,29 @@ struct vulkan_ctx_s;
 
 extern vid_model_funcs_t *m_funcs;
 
-void gl_Mod_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr, void *_m,
+void gl_Mod_MakeAliasModelDisplayLists (mod_alias_ctx_t *alias_ctx, void *_m,
 										int _s, int extra);
-void *gl_Mod_LoadSkin (model_t *mod, byte *skin, int skinsize, int snum,
-					   int gnum, qboolean group, maliasskindesc_t *skindesc);
-void gl_Mod_FinalizeAliasModel (model_t *m, aliashdr_t *hdr);
-void gl_Mod_LoadExternalSkins (model_t *mod);
+void *gl_Mod_LoadSkin (mod_alias_ctx_t *alias_ctx, byte *skin, int skinsize,
+					   int snum, int gnum, qboolean group,
+					   maliasskindesc_t *skindesc);
+void gl_Mod_FinalizeAliasModel (mod_alias_ctx_t *alias_ctx);
+void gl_Mod_LoadExternalSkins (mod_alias_ctx_t *alias_ctx);
 void gl_Mod_IQMFinish (model_t *mod);
 
-void glsl_Mod_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr,
+void glsl_Mod_MakeAliasModelDisplayLists (mod_alias_ctx_t *alias_ctx,
 										  void *_m, int _s, int extra);
-void *glsl_Mod_LoadSkin (model_t *mod, byte *skin, int skinsize, int snum,
-						 int gnum, qboolean group, maliasskindesc_t *skindesc);
-void glsl_Mod_FinalizeAliasModel (model_t *m, aliashdr_t *hdr);
-void glsl_Mod_LoadExternalSkins (model_t *mod);
+void *glsl_Mod_LoadSkin (mod_alias_ctx_t *alias_ctx, byte *skin, int skinsize,
+						 int snum, int gnum, qboolean group,
+						 maliasskindesc_t *skindesc);
+void glsl_Mod_FinalizeAliasModel (mod_alias_ctx_t *alias_ctx);
+void glsl_Mod_LoadExternalSkins (mod_alias_ctx_t *alias_ctx);
 void glsl_Mod_IQMFinish (model_t *mod);
 
-void sw_Mod_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr, void *_m,
+void sw_Mod_MakeAliasModelDisplayLists (mod_alias_ctx_t *alias_ctx, void *_m,
 										int _s, int extra);
-void *sw_Mod_LoadSkin (model_t *mod, byte *skin, int skinsize, int snum,
-					   int gnum, qboolean group, maliasskindesc_t *skindesc);
-void sw_Mod_FinalizeAliasModel (model_t *m, aliashdr_t *hdr);
-void sw_Mod_LoadExternalSkins (model_t *mod);
+void *sw_Mod_LoadSkin (mod_alias_ctx_t *alias_ctx, byte *skin, int skinsize,
+					   int snum, int gnum, qboolean group,
+					   maliasskindesc_t *skindesc);
 void sw_Mod_IQMFinish (model_t *mod);
 
 void gl_Mod_LoadLighting (model_t *mod, bsp_t *bsp);
diff --git a/libs/models/alias/gl_mesh.c b/libs/models/alias/gl_mesh.c
index 6820000cf..73c65b56d 100644
--- a/libs/models/alias/gl_mesh.c
+++ b/libs/models/alias/gl_mesh.c
@@ -49,9 +49,6 @@
 
 // ALIAS MODEL DISPLAY LIST GENERATION ========================================
 
-static model_t    *aliasmodel;
-static aliashdr_t *paliashdr;
-
 static qboolean   *used;
 static int         used_size;
 
@@ -126,14 +123,15 @@ add_strip (int vert, int tri)
 }
 
 static int
-StripLength (int starttri, int startv)
+StripLength (mod_alias_ctx_t *alias_ctx, int starttri, int startv)
 {
+	aliashdr_t *header = alias_ctx->header;
 	int         m1, m2, j, k;
 	mtriangle_t *last, *check;
 
 	used[starttri] = 2;
 
-	last = &triangles.a[starttri];
+	last = &alias_ctx->triangles.a[starttri];
 
 	stripcount = 0;
 	add_strip (last->vertindex[(startv) % 3], starttri);
@@ -145,8 +143,8 @@ StripLength (int starttri, int startv)
 
 	// look for a matching triangle
 nexttri:
-	for (j = starttri + 1, check = &triangles.a[starttri + 1];
-		 j < pheader->mdl.numtris; j++, check++) {
+	for (j = starttri + 1, check = &alias_ctx->triangles.a[starttri + 1];
+		 j < header->mdl.numtris; j++, check++) {
 		if (check->facesfront != last->facesfront)
 			continue;
 		for (k = 0; k < 3; k++) {
@@ -176,7 +174,7 @@ nexttri:
 done:
 
 	// clear the temp used flags
-	for (j = starttri + 1; j < pheader->mdl.numtris; j++)
+	for (j = starttri + 1; j < header->mdl.numtris; j++)
 		if (used[j] == 2)
 			used[j] = 0;
 
@@ -184,14 +182,15 @@ done:
 }
 
 static int
-FanLength (int starttri, int startv)
+FanLength (mod_alias_ctx_t *alias_ctx, int starttri, int startv)
 {
+	aliashdr_t *header = alias_ctx->header;
 	int         m1, m2, j, k;
 	mtriangle_t *last, *check;
 
 	used[starttri] = 2;
 
-	last = &triangles.a[starttri];
+	last = &alias_ctx->triangles.a[starttri];
 
 	stripcount = 0;
 	add_strip (last->vertindex[(startv) % 3], starttri);
@@ -204,8 +203,8 @@ FanLength (int starttri, int startv)
 
 	// look for a matching triangle
   nexttri:
-	for (j = starttri + 1, check = &triangles.a[starttri + 1];
-		 j < pheader->mdl.numtris; j++, check++) {
+	for (j = starttri + 1, check = &alias_ctx->triangles.a[starttri + 1];
+		 j < header->mdl.numtris; j++, check++) {
 		if (check->facesfront != last->facesfront)
 			continue;
 		for (k = 0; k < 3; k++) {
@@ -232,7 +231,7 @@ FanLength (int starttri, int startv)
   done:
 
 	// clear the temp used flags
-	for (j = starttri + 1; j < pheader->mdl.numtris; j++)
+	for (j = starttri + 1; j < header->mdl.numtris; j++)
 		if (used[j] == 2)
 			used[j] = 0;
 
@@ -246,8 +245,9 @@ FanLength (int starttri, int startv)
 	for the model, which holds for all frames
 */
 static void
-BuildTris (void)
+BuildTris (mod_alias_ctx_t *alias_ctx)
 {
+	aliashdr_t *header = alias_ctx->header;
 	float		s, t;
 	int			bestlen, len, startv, type, i, j, k;
 	int			besttype = 0;
@@ -257,10 +257,10 @@ BuildTris (void)
 	numorder = 0;
 	numcommands = 0;
 	stripcount = 0;
-	alloc_used (pheader->mdl.numtris);
+	alloc_used (header->mdl.numtris);
 	memset (used, 0, used_size * sizeof (used[0]));
 
-	for (i = 0; i < pheader->mdl.numtris; i++) {
+	for (i = 0; i < header->mdl.numtris; i++) {
 		// pick an unused triangle and start the trifan
 		if (used[i])
 			continue;
@@ -270,9 +270,9 @@ BuildTris (void)
 //  type = 1;
 			for (startv = 0; startv < 3; startv++) {
 				if (type == 1)
-					len = StripLength (i, startv);
+					len = StripLength (alias_ctx, i, startv);
 				else
-					len = FanLength (i, startv);
+					len = FanLength (alias_ctx, i, startv);
 				if (len > bestlen) {
 					besttype = type;
 					bestlen = len;
@@ -304,12 +304,13 @@ BuildTris (void)
 			add_vertex (k);
 
 			// emit s/t coords into the commands stream
-			s = stverts.a[k].s;
-			t = stverts.a[k].t;
-			if (!triangles.a[besttris[0]].facesfront && stverts.a[k].onseam)
-				s += pheader->mdl.skinwidth / 2;	// on back side
-			s = (s + 0.5) / pheader->mdl.skinwidth;
-			t = (t + 0.5) / pheader->mdl.skinheight;
+			s = alias_ctx->stverts.a[k].s;
+			t = alias_ctx->stverts.a[k].t;
+			if (!alias_ctx->triangles.a[besttris[0]].facesfront
+				&& alias_ctx->stverts.a[k].onseam)
+				s += header->mdl.skinwidth / 2;	// on back side
+			s = (s + 0.5) / header->mdl.skinwidth;
+			t = (t + 0.5) / header->mdl.skinheight;
 
 			memcpy (&tmp, &s, 4);
 			add_command (tmp);
@@ -321,10 +322,10 @@ BuildTris (void)
 	add_command (0);					// end of list marker
 
 	Sys_MaskPrintf (SYS_DEV, "%3i tri %3i vert %3i cmd\n",
-					pheader->mdl.numtris, numorder, numcommands);
+					header->mdl.numtris, numorder, numcommands);
 
 	allverts += numorder;
-	alltris += pheader->mdl.numtris;
+	alltris += header->mdl.numtris;
 
 	if (bestverts)
 		free (bestverts);
@@ -333,9 +334,10 @@ BuildTris (void)
 }
 
 void
-gl_Mod_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr, void *_m,
+gl_Mod_MakeAliasModelDisplayLists (mod_alias_ctx_t *alias_ctx, void *_m,
 								   int _s, int extra)
 {
+	aliashdr_t *header = alias_ctx->header;
 	dstring_t  *cache, *fullpath;
 	unsigned char model_digest[MDFOUR_DIGEST_BYTES];
 	unsigned char mesh_digest[MDFOUR_DIGEST_BYTES];
@@ -345,24 +347,21 @@ gl_Mod_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr, void *_m,
 	qboolean    remesh = true;
 	qboolean    do_cache = false;
 
-	aliasmodel = m;
-	paliashdr = hdr;
-
 	cache = dstring_new ();
 	fullpath = dstring_new ();
 
 	if (!gl_alias_render_tri->int_val) {
 
 		if (gl_mesh_cache->int_val
-			&& gl_mesh_cache->int_val <= paliashdr->mdl.numtris) {
+			&& gl_mesh_cache->int_val <= header->mdl.numtris) {
 			do_cache = true;
 
 			mdfour (model_digest, (unsigned char *) _m, _s);
 
 			// look for a cached version
 			dstring_copystr (cache, "glquake/");
-			dstring_appendstr (cache, m->path);
-			QFS_StripExtension (m->path + strlen ("progs/"),
+			dstring_appendstr (cache, alias_ctx->mod->path);
+			QFS_StripExtension (alias_ctx->mod->path + strlen ("progs/"),
 							cache->str + strlen ("glquake/"));
 			dstring_appendstr (cache, ".qfms");
 
@@ -433,9 +432,9 @@ gl_Mod_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr, void *_m,
 		}
 		if (remesh) {
 			// build it from scratch
-			Sys_MaskPrintf (SYS_DEV, "meshing %s...\n", m->path);
+			Sys_MaskPrintf (SYS_DEV, "meshing %s...\n", alias_ctx->mod->path);
 
-			BuildTris ();					// trifans or lists
+			BuildTris (alias_ctx);					// trifans or lists
 
 			if (do_cache) {
 				// save out the cached version
@@ -474,35 +473,36 @@ gl_Mod_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr, void *_m,
 		}
 
 		// save the data out
-		paliashdr->poseverts = numorder;
+		header->poseverts = numorder;
 
 		cmds = Hunk_Alloc (numcommands * sizeof (int));
-		paliashdr->commands = (byte *) cmds - (byte *) paliashdr;
+		header->commands = (byte *) cmds - (byte *) header;
 		memcpy (cmds, commands, numcommands * sizeof (int));
 
 	} else {
 		tex_coord_t *tex_coord;
 
 		numorder = 0;
-		for (i=0; i < pheader->mdl.numtris; i++) {
-			add_vertex(triangles.a[i].vertindex[0]);
-			add_vertex(triangles.a[i].vertindex[1]);
-			add_vertex(triangles.a[i].vertindex[2]);
+		for (i=0; i < header->mdl.numtris; i++) {
+			add_vertex(alias_ctx->triangles.a[i].vertindex[0]);
+			add_vertex(alias_ctx->triangles.a[i].vertindex[1]);
+			add_vertex(alias_ctx->triangles.a[i].vertindex[2]);
 		}
-		paliashdr->poseverts = numorder;
+		header->poseverts = numorder;
 
 		tex_coord = Hunk_Alloc (numorder * sizeof(tex_coord_t));
-		paliashdr->tex_coord = (byte *) tex_coord - (byte *) paliashdr;
+		header->tex_coord = (byte *) tex_coord - (byte *) header;
 		for (i=0; i < numorder; i++) {
 			float s, t;
 			int k;
 			k = vertexorder[i];
-			s = stverts.a[k].s;
-			t = stverts.a[k].t;
-			if (!triangles.a[i/3].facesfront && stverts.a[k].onseam)
-				s += pheader->mdl.skinwidth / 2;	// on back side
-			s = (s + 0.5) / pheader->mdl.skinwidth;
-			t = (t + 0.5) / pheader->mdl.skinheight;
+			s = alias_ctx->stverts.a[k].s;
+			t = alias_ctx->stverts.a[k].t;
+			if (!alias_ctx->triangles.a[i/3].facesfront
+				&& alias_ctx->stverts.a[k].onseam)
+				s += header->mdl.skinwidth / 2;	// on back side
+			s = (s + 0.5) / header->mdl.skinwidth;
+			t = (t + 0.5) / header->mdl.skinheight;
 			tex_coord[i].st[0] = s;
 			tex_coord[i].st[1] = t;
 		}
@@ -510,11 +510,11 @@ gl_Mod_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr, void *_m,
 
 	if (extra) {
 		trivertx16_t *verts;
-		verts = Hunk_Alloc (paliashdr->numposes * paliashdr->poseverts
+		verts = Hunk_Alloc (header->numposes * header->poseverts
 							* sizeof (trivertx16_t));
-		paliashdr->posedata = (byte *) verts - (byte *) paliashdr;
-		for (i = 0; i < paliashdr->numposes; i++) {
-			trivertx_t *pv = poseverts.a[i];
+		header->posedata = (byte *) verts - (byte *) header;
+		for (i = 0; i < header->numposes; i++) {
+			trivertx_t *pv = alias_ctx->poseverts.a[i];
 			for (j = 0; j < numorder; j++) {
 				trivertx16_t v;
 				// convert MD16's split coordinates into something a little
@@ -523,21 +523,21 @@ gl_Mod_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr, void *_m,
 				// fractional bits of the vertex, giving 8.8. However, it's
 				// easier for us to multiply everything by 256 and adjust the
 				// model scale appropriately
-				VectorMultAdd (pv[vertexorder[j] + hdr->mdl.numverts].v,
+				VectorMultAdd (pv[vertexorder[j] + header->mdl.numverts].v,
 							   256, pv[vertexorder[j]].v, v.v);
 				v.lightnormalindex =
-					poseverts.a[i][vertexorder[j]].lightnormalindex;
+					alias_ctx->poseverts.a[i][vertexorder[j]].lightnormalindex;
 				*verts++ = v;
 			}
 		}
 	} else {
 		trivertx_t *verts;
-		verts = Hunk_Alloc (paliashdr->numposes * paliashdr->poseverts
+		verts = Hunk_Alloc (header->numposes * header->poseverts
 							* sizeof (trivertx_t));
-		paliashdr->posedata = (byte *) verts - (byte *) paliashdr;
-		for (i = 0; i < paliashdr->numposes; i++) {
+		header->posedata = (byte *) verts - (byte *) header;
+		for (i = 0; i < header->numposes; i++) {
 			for (j = 0; j < numorder; j++)
-				*verts++ = poseverts.a[i][vertexorder[j]];
+				*verts++ = alias_ctx->poseverts.a[i][vertexorder[j]];
 		}
 	}
 	dstring_delete (cache);
diff --git a/libs/models/alias/gl_model_alias.c b/libs/models/alias/gl_model_alias.c
index dec3a6e98..4b8d6ccb7 100644
--- a/libs/models/alias/gl_model_alias.c
+++ b/libs/models/alias/gl_model_alias.c
@@ -53,36 +53,38 @@
 #include "compat.h"
 
 void *
-gl_Mod_LoadSkin (model_t *mod, byte *skin, int skinsize, int snum, int gnum,
-				 qboolean group, maliasskindesc_t *skindesc)
+gl_Mod_LoadSkin (mod_alias_ctx_t *alias_ctx, byte *skin, int skinsize,
+				 int snum, int gnum, qboolean group,
+				 maliasskindesc_t *skindesc)
 {
+	aliashdr_t *header = alias_ctx->header;
 	byte   *pskin;
 	char	modname[MAX_QPATH + 4];
 	int		fb_texnum = 0, texnum = 0;
 	dstring_t  *name = dstring_new ();
 
-	pskin = Hunk_AllocName (skinsize, mod->name);
-	skindesc->skin = (byte *) pskin - (byte *) pheader;
+	pskin = Hunk_AllocName (skinsize, alias_ctx->mod->name);
+	skindesc->skin = (byte *) pskin - (byte *) header;
 
 	memcpy (pskin, skin, skinsize);
 
-	Mod_FloodFillSkin (pskin, pheader->mdl.skinwidth, pheader->mdl.skinheight);
+	Mod_FloodFillSkin (pskin, header->mdl.skinwidth, header->mdl.skinheight);
 	// save 8 bit texels for the player model to remap
 	// FIXME remove model restriction
-	if (strequal (mod->path, "progs/player.mdl"))
-		gl_Skin_SetPlayerSkin (pheader->mdl.skinwidth, pheader->mdl.skinheight,
+	if (strequal (alias_ctx->mod->path, "progs/player.mdl"))
+		gl_Skin_SetPlayerSkin (header->mdl.skinwidth, header->mdl.skinheight,
 							   pskin);
 
-	QFS_StripExtension (mod->path, modname);
+	QFS_StripExtension (alias_ctx->mod->path, modname);
 
-	if (!mod->fullbright) {
+	if (!alias_ctx->mod->fullbright) {
 		if (group) {
 			dsprintf (name, "fb_%s_%i_%i", modname, snum, gnum);
 		} else {
 			dsprintf (name, "fb_%s_%i", modname, snum);
 		}
-		fb_texnum = Mod_Fullbright (pskin, pheader->mdl.skinwidth,
-									pheader->mdl.skinheight, name->str);
+		fb_texnum = Mod_Fullbright (pskin, header->mdl.skinwidth,
+									header->mdl.skinheight, name->str);
 		Sys_MaskPrintf (SYS_GLT, "%s %d\n", name->str, fb_texnum);
 	}
 	if (group) {
@@ -90,23 +92,25 @@ gl_Mod_LoadSkin (model_t *mod, byte *skin, int skinsize, int snum, int gnum,
 	} else {
 		dsprintf (name, "%s_%i", modname, snum);
 	}
-	texnum = GL_LoadTexture (name->str, pheader->mdl.skinwidth,
-							 pheader->mdl.skinheight, pskin, true, false, 1);
+	texnum = GL_LoadTexture (name->str, header->mdl.skinwidth,
+							 header->mdl.skinheight, pskin, true, false, 1);
 	Sys_MaskPrintf (SYS_GLT, "%s %d\n", name->str, texnum);
 	skindesc->texnum = texnum;
 	skindesc->fb_texnum = fb_texnum;
-	mod->hasfullbrights = fb_texnum;
+	alias_ctx->mod->hasfullbrights = fb_texnum;
 	dstring_delete (name);
 	// alpha param was true for non group skins
 	return skin + skinsize;
 }
 
 void
-gl_Mod_FinalizeAliasModel (model_t *m, aliashdr_t *hdr)
+gl_Mod_FinalizeAliasModel (mod_alias_ctx_t *alias_ctx)
 {
-	if (strequal (m->path, "progs/eyes.mdl")) {
-		hdr->mdl.scale_origin[2] -= (22 + 8);
-		VectorScale (hdr->mdl.scale, 2, hdr->mdl.scale);
+	aliashdr_t *header = alias_ctx->header;
+
+	if (strequal (alias_ctx->mod->path, "progs/eyes.mdl")) {
+		header->mdl.scale_origin[2] -= (22 + 8);
+		VectorScale (header->mdl.scale, 2, header->mdl.scale);
 	}
 }
 
@@ -150,25 +154,26 @@ Mod_LoadExternalSkin (maliasskindesc_t *pskindesc, char *filename)
 }
 
 void
-gl_Mod_LoadExternalSkins (model_t *mod)
+gl_Mod_LoadExternalSkins (mod_alias_ctx_t *alias_ctx)
 {
+	aliashdr_t *header = alias_ctx->header;
 	char			   modname[MAX_QPATH + 4];
 	int				   i, j;
 	maliasskindesc_t  *pskindesc;
 	maliasskingroup_t *pskingroup;
 	dstring_t  *filename = dstring_new ();
 
-	QFS_StripExtension (mod->path, modname);
+	QFS_StripExtension (alias_ctx->mod->path, modname);
 
-	for (i = 0; i < pheader->mdl.numskins; i++) {
+	for (i = 0; i < header->mdl.numskins; i++) {
 		pskindesc = ((maliasskindesc_t *)
-					 ((byte *) pheader + pheader->skindesc)) + i;
+					 ((byte *) header + header->skindesc)) + i;
 		if (pskindesc->type == ALIAS_SKIN_SINGLE) {
 			dsprintf (filename, "%s_%i", modname, i);
 			Mod_LoadExternalSkin (pskindesc, filename->str);
 		} else {
 			pskingroup = (maliasskingroup_t *)
-				((byte *) pheader + pskindesc->skin);
+				((byte *) header + pskindesc->skin);
 
 			for (j = 0; j < pskingroup->numskins; j++) {
 				dsprintf (filename, "%s_%i_%i", modname, i, j);
diff --git a/libs/models/alias/glsl_model_alias.c b/libs/models/alias/glsl_model_alias.c
index 609fa01b7..c48500ad7 100644
--- a/libs/models/alias/glsl_model_alias.c
+++ b/libs/models/alias/glsl_model_alias.c
@@ -58,24 +58,24 @@ static void
 glsl_alias_clear (model_t *m, void *data)
 {
 	int         i, j;
-	aliashdr_t *hdr;
+	aliashdr_t *header;
 	GLuint      bufs[2];
 	maliasskindesc_t *skins;
 	maliasskingroup_t *group;
 
 	m->needload = true;
 
-	if (!(hdr = m->aliashdr))
-		hdr = Cache_Get (&m->cache);
+	if (!(header = m->aliashdr))
+		header = Cache_Get (&m->cache);
 
-	bufs[0] = hdr->posedata;
-	bufs[1] = hdr->commands;
+	bufs[0] = header->posedata;
+	bufs[1] = header->commands;
 	qfeglDeleteBuffers (2, bufs);
 
-	skins = ((maliasskindesc_t *) ((byte *) hdr + hdr->skindesc));
-	for (i = 0; i < hdr->mdl.numskins; i++) {
+	skins = ((maliasskindesc_t *) ((byte *) header + header->skindesc));
+	for (i = 0; i < header->mdl.numskins; i++) {
 		if (skins[i].type == ALIAS_SKIN_GROUP) {
-			group = (maliasskingroup_t *) ((byte *) hdr + skins[i].skin);
+			group = (maliasskingroup_t *) ((byte *) header + skins[i].skin);
 			for (j = 0; j < group->numskins; j++) {
 				GLSL_ReleaseTexture (group->skindescs[j].texnum);
 			}
@@ -91,44 +91,49 @@ glsl_alias_clear (model_t *m, void *data)
 }
 
 void *
-glsl_Mod_LoadSkin (model_t *mod, byte *skin, int skinsize, int snum, int gnum,
-				   qboolean group, maliasskindesc_t *skindesc)
+glsl_Mod_LoadSkin (mod_alias_ctx_t *alias_ctx, byte *skin, int skinsize,
+				   int snum, int gnum, qboolean group,
+				   maliasskindesc_t *skindesc)
 {
+	aliashdr_t *header = alias_ctx->header;
 	byte       *tskin;
 	const char *name;
 	int         w, h;
 
-	w = pheader->mdl.skinwidth;
-	h = pheader->mdl.skinheight;
+	w = header->mdl.skinwidth;
+	h = header->mdl.skinheight;
 	tskin = malloc (skinsize);
 	memcpy (tskin, skin, skinsize);
 	Mod_FloodFillSkin (tskin, w, h);
 	if (group)
-		name = va (0, "%s_%i_%i", mod->path, snum, gnum);
+		name = va (0, "%s_%i_%i", alias_ctx->mod->path, snum, gnum);
 	else
-		name = va (0, "%s_%i", mod->path, snum);
+		name = va (0, "%s_%i", alias_ctx->mod->path, snum);
 	skindesc->texnum = GLSL_LoadQuakeTexture (name, w, h, tskin);
 	free (tskin);
 	return skin + skinsize;
 }
 
 void
-glsl_Mod_FinalizeAliasModel (model_t *m, aliashdr_t *hdr)
+glsl_Mod_FinalizeAliasModel (mod_alias_ctx_t *alias_ctx)
 {
-	if (hdr->mdl.ident == HEADER_MDL16)
-		VectorScale (hdr->mdl.scale, 1/256.0, hdr->mdl.scale);
-	m->clear = glsl_alias_clear;
+	aliashdr_t *header = alias_ctx->header;
+
+	if (header->mdl.ident == HEADER_MDL16)
+		VectorScale (header->mdl.scale, 1/256.0, header->mdl.scale);
+	alias_ctx->mod->clear = glsl_alias_clear;
 }
 
 void
-glsl_Mod_LoadExternalSkins (model_t *mod)
+glsl_Mod_LoadExternalSkins (mod_alias_ctx_t *alias_ctx)
 {
 }
 
 void
-glsl_Mod_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr, void *_m,
+glsl_Mod_MakeAliasModelDisplayLists (mod_alias_ctx_t *alias_ctx, void *_m,
 									 int _s, int extra)
 {
+	aliashdr_t *header = alias_ctx->header;
 	mtriangle_t *tris;
 	stvert_t   *st;
 	aliasvrt_t *verts;
@@ -142,12 +147,12 @@ glsl_Mod_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr, void *_m,
 	int         i, j;
 	int         pose;
 
-	numverts = hdr->mdl.numverts;
-	numtris = hdr->mdl.numtris;
+	numverts = header->mdl.numverts;
+	numtris = header->mdl.numtris;
 
 	// copy triangles before editing them
 	tris = malloc (numtris * sizeof (mtriangle_t));
-	memcpy (tris, triangles.a, numtris * sizeof (mtriangle_t));
+	memcpy (tris, alias_ctx->triangles.a, numtris * sizeof (mtriangle_t));
 
 	// initialize indexmap to -1 (unduplicated). any other value indicates
 	// both that the vertex has been duplicated and the index of the
@@ -157,7 +162,7 @@ glsl_Mod_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr, void *_m,
 
 	// copy stverts. need space for duplicates
 	st = malloc (2 * numverts * sizeof (stvert_t));
-	memcpy (st, stverts.a, numverts * sizeof (stvert_t));
+	memcpy (st, alias_ctx->stverts.a, numverts * sizeof (stvert_t));
 
 	// check for onseam verts, and duplicate any that are associated with
 	// back-facing triangles. the s coordinate is shifted right by half
@@ -168,7 +173,7 @@ glsl_Mod_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr, void *_m,
 			if (st[vind].onseam && !tris[i].facesfront) {
 				if (indexmap[vind] == -1) {
 					st[numverts] = st[vind];
-					st[numverts].s += hdr->mdl.skinwidth / 2;
+					st[numverts].s += header->mdl.skinwidth / 2;
 					indexmap[vind] = numverts++;
 				}
 				tris[i].vertindex[j] = indexmap[vind];
@@ -178,13 +183,13 @@ glsl_Mod_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr, void *_m,
 
 	// we now know exactly how many vertices we need, so built the vertex
 	// array
-	vertexsize = hdr->numposes * numverts * sizeof (aliasvrt_t);
+	vertexsize = header->numposes * numverts * sizeof (aliasvrt_t);
 	verts = malloc (vertexsize);
-	for (i = 0, pose = 0; i < hdr->numposes; i++, pose += numverts) {
-		for (j = 0; j < hdr->mdl.numverts; j++) {
-			pv = &poseverts.a[i][j];
+	for (i = 0, pose = 0; i < header->numposes; i++, pose += numverts) {
+		for (j = 0; j < header->mdl.numverts; j++) {
+			pv = &alias_ctx->poseverts.a[i][j];
 			if (extra) {
-				VectorMultAdd (pv[hdr->mdl.numverts].v, 256, pv->v,
+				VectorMultAdd (pv[header->mdl.numverts].v, 256, pv->v,
 							   verts[pose + j].vertex);
 			} else {
 				VectorCopy (pv->v, verts[pose + j].vertex);
@@ -218,14 +223,14 @@ glsl_Mod_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr, void *_m,
 	// finished with tris
 	free (tris);
 
-	hdr->poseverts = numverts;
+	header->poseverts = numverts;
 
 	// load the vertex data and indices into GL
 	qfeglGenBuffers (2, bnum);
-	hdr->posedata = bnum[0];
-	hdr->commands = bnum[1];
-	qfeglBindBuffer (GL_ARRAY_BUFFER, hdr->posedata);
-	qfeglBindBuffer (GL_ELEMENT_ARRAY_BUFFER, hdr->commands);
+	header->posedata = bnum[0];
+	header->commands = bnum[1];
+	qfeglBindBuffer (GL_ARRAY_BUFFER, header->posedata);
+	qfeglBindBuffer (GL_ELEMENT_ARRAY_BUFFER, header->commands);
 	qfeglBufferData (GL_ARRAY_BUFFER, vertexsize, verts, GL_STATIC_DRAW);
 	qfeglBufferData (GL_ELEMENT_ARRAY_BUFFER, indexsize, indices,
 					GL_STATIC_DRAW);
diff --git a/libs/models/alias/model_alias.c b/libs/models/alias/model_alias.c
index e4225daea..727957fe5 100644
--- a/libs/models/alias/model_alias.c
+++ b/libs/models/alias/model_alias.c
@@ -49,22 +49,11 @@
 #include "mod_internal.h"
 #include "r_local.h"
 
-aliashdr_t *pheader;
-
-stvertset_t stverts = { 0, 0, 256 };
-mtriangleset_t triangles = { 0, 0, 256 };
-
-// a pose is a single set of vertexes.  a frame may be an animating
-// sequence of poses
-trivertxset_t poseverts = { 0, 0, 256 };;
-int         posenum = 0;
-int			aliasbboxmins[3], aliasbboxmaxs[3];
-
-
 static void *
-Mod_LoadAllSkins (model_t *mod, int numskins, daliasskintype_t *pskintype,
-				  int *pskinindex)
+Mod_LoadAllSkins (mod_alias_ctx_t *alias_ctx, int numskins,
+				  daliasskintype_t *pskintype, int *pskinindex)
 {
+	aliashdr_t *header = alias_ctx->header;
 	byte       *skin;
 	float      *poutskinintervals;
 	int         groupskins, skinsize, gnum, snum, t;
@@ -76,34 +65,34 @@ Mod_LoadAllSkins (model_t *mod, int numskins, daliasskintype_t *pskintype,
 	if (numskins < 1 || numskins > MAX_SKINS)
 		Sys_Error ("Mod_LoadAliasModel: Invalid # of skins: %d", numskins);
 
-	skinsize = pheader->mdl.skinwidth * pheader->mdl.skinheight;
+	skinsize = header->mdl.skinwidth * header->mdl.skinheight;
 	pskindesc = Hunk_AllocName (numskins * sizeof (maliasskindesc_t),
-								mod->name);
+								alias_ctx->mod->name);
 
-	*pskinindex = (byte *) pskindesc - (byte *) pheader;
+	*pskinindex = (byte *) pskindesc - (byte *) header;
 
 	for (snum = 0; snum < numskins; snum++) {
 		pskindesc[snum].type = pskintype->type;
 		if (pskintype->type == ALIAS_SKIN_SINGLE) {
 			skin = (byte *) (pskintype + 1);
-			skin = m_funcs->Mod_LoadSkin (mod, skin, skinsize, snum, 0, false,
-										  &pskindesc[snum]);
+			skin = m_funcs->Mod_LoadSkin (alias_ctx, skin, skinsize, snum, 0,
+										  false, &pskindesc[snum]);
 		} else {
 			pskintype++;
 			pinskingroup = (daliasskingroup_t *) pskintype;
 			groupskins = LittleLong (pinskingroup->numskins);
 
 			t = field_offset (maliasskingroup_t, skindescs[groupskins]);
-			paliasskingroup = Hunk_AllocName (t, mod->name);
+			paliasskingroup = Hunk_AllocName (t, alias_ctx->mod->name);
 			paliasskingroup->numskins = groupskins;
 
-			pskindesc[snum].skin = (byte *) paliasskingroup - (byte *) pheader;
+			pskindesc[snum].skin = (byte *) paliasskingroup - (byte *) header;
 
 			pinskinintervals = (daliasskininterval_t *) (pinskingroup + 1);
 			poutskinintervals = Hunk_AllocName (groupskins * sizeof (float),
-												mod->name);
+												alias_ctx->mod->name);
 			paliasskingroup->intervals =
-				(byte *) poutskinintervals - (byte *) pheader;
+				(byte *) poutskinintervals - (byte *) header;
 			for (gnum = 0; gnum < groupskins; gnum++) {
 				*poutskinintervals = LittleFloat (pinskinintervals->interval);
 				if (*poutskinintervals <= 0)
@@ -118,8 +107,8 @@ Mod_LoadAllSkins (model_t *mod, int numskins, daliasskintype_t *pskintype,
 
 			for (gnum = 0; gnum < groupskins; gnum++) {
 				paliasskingroup->skindescs[gnum].type = ALIAS_SKIN_SINGLE;
-				skin = mod_funcs->Mod_LoadSkin (mod, skin, skinsize, snum,
-												gnum, true,
+				skin = mod_funcs->Mod_LoadSkin (alias_ctx, skin, skinsize,
+												snum, gnum, true,
 											&paliasskingroup->skindescs[gnum]);
 			}
 		}
@@ -130,9 +119,10 @@ Mod_LoadAllSkins (model_t *mod, int numskins, daliasskintype_t *pskintype,
 }
 
 static void *
-Mod_LoadAliasFrame (model_t *mod, void *pin, int *posenum,
+Mod_LoadAliasFrame (mod_alias_ctx_t *alias_ctx, void *pin, int *posenum,
 					maliasframedesc_t *frame, int extra)
 {
+	aliashdr_t *header = alias_ctx->header;
 	daliasframe_t  *pdaliasframe;
 	trivertx_t	   *pinframe;
 
@@ -146,25 +136,29 @@ Mod_LoadAliasFrame (model_t *mod, void *pin, int *posenum,
 	// byte values, don't worry about endianness
 	VectorCopy (pdaliasframe->bboxmin.v, frame->bboxmin.v);
 	VectorCopy (pdaliasframe->bboxmax.v, frame->bboxmax.v);
-	VectorCompMin (frame->bboxmin.v, aliasbboxmins, aliasbboxmins);
-	VectorCompMax (frame->bboxmax.v, aliasbboxmaxs, aliasbboxmaxs);
+	VectorCompMin (frame->bboxmin.v, alias_ctx->aliasbboxmins,
+				   alias_ctx->aliasbboxmins);
+	VectorCompMax (frame->bboxmax.v, alias_ctx->aliasbboxmaxs,
+				   alias_ctx->aliasbboxmaxs);
 
 	pinframe = (trivertx_t *) (pdaliasframe + 1);
 
-	DARRAY_APPEND (&poseverts, pinframe);
+	DARRAY_APPEND (&alias_ctx->poseverts, pinframe);
 	(*posenum)++;
 
-	pinframe += pheader->mdl.numverts;
+	pinframe += header->mdl.numverts;
 	if (extra)
-		pinframe += pheader->mdl.numverts;
+		pinframe += header->mdl.numverts;
 
 	return pinframe;
 }
 
 static void *
-Mod_LoadAliasGroup (model_t *mod, void *pin, int *posenum,
+Mod_LoadAliasGroup (mod_alias_ctx_t *alias_ctx, void *pin, int *posenum,
 					maliasframedesc_t *frame, int extra)
 {
+	aliashdr_t *header = alias_ctx->header;
+	model_t    *mod = alias_ctx->mod;
 	daliasgroup_t	 *pingroup;
 	daliasinterval_t *pin_intervals;
 	float			 *poutintervals;
@@ -182,17 +176,19 @@ Mod_LoadAliasGroup (model_t *mod, void *pin, int *posenum,
 	paliasgroup = Hunk_AllocName (field_offset (maliasgroup_t,
 												frames[numframes]), mod->name);
 	paliasgroup->numframes = numframes;
-	frame->frame = (byte *) paliasgroup - (byte *) pheader;
+	frame->frame = (byte *) paliasgroup - (byte *) header;
 
 	// these are byte values, so we don't have to worry about endianness
 	VectorCopy (pingroup->bboxmin.v, frame->bboxmin.v);
 	VectorCopy (pingroup->bboxmax.v, frame->bboxmax.v);
-	VectorCompMin (frame->bboxmin.v, aliasbboxmins, aliasbboxmins);
-	VectorCompMax (frame->bboxmax.v, aliasbboxmaxs, aliasbboxmaxs);
+	VectorCompMin (frame->bboxmin.v, alias_ctx->aliasbboxmins,
+				   alias_ctx->aliasbboxmins);
+	VectorCompMax (frame->bboxmax.v, alias_ctx->aliasbboxmaxs,
+				   alias_ctx->aliasbboxmaxs);
 
 	pin_intervals = (daliasinterval_t *) (pingroup + 1);
 	poutintervals = Hunk_AllocName (numframes * sizeof (float), mod->name);
-	paliasgroup->intervals = (byte *) poutintervals - (byte *) pheader;
+	paliasgroup->intervals = (byte *) poutintervals - (byte *) header;
 	frame->interval = LittleFloat (pin_intervals->interval);
 	for (i = 0; i < numframes; i++) {
 		*poutintervals = LittleFloat (pin_intervals->interval);
@@ -205,7 +201,8 @@ Mod_LoadAliasGroup (model_t *mod, void *pin, int *posenum,
 	ptemp = (void *) pin_intervals;
 	for (i = 0; i < numframes; i++) {
 		maliasframedesc_t temp_frame;
-		ptemp = Mod_LoadAliasFrame (mod, ptemp, posenum, &temp_frame, extra);
+		ptemp = Mod_LoadAliasFrame (alias_ctx, ptemp, posenum, &temp_frame,
+									extra);
 		memcpy (&paliasgroup->frames[i], &temp_frame,
 				sizeof (paliasgroup->frames[i]));
 	}
@@ -225,6 +222,14 @@ Mod_LoadAliasModel (model_t *mod, void *buffer, cache_allocator_t allocator)
 	mdl_t      *pinmodel, *pmodel;
 	unsigned short crc;
 	stvert_t   *pinstverts;
+	mod_alias_ctx_t alias_ctx = {};
+	aliashdr_t *header;
+
+	alias_ctx.mod = mod;
+	//FIXME should be per batch rather than per model
+	DARRAY_INIT (&alias_ctx.poseverts, 256);
+	DARRAY_INIT (&alias_ctx.stverts, 256);
+	DARRAY_INIT (&alias_ctx.triangles, 256);
 
 	if (LittleLong (* (unsigned int *) buffer) == HEADER_MDL16)
 		extra = 1;		// extra precision bytes
@@ -244,12 +249,13 @@ Mod_LoadAliasModel (model_t *mod, void *buffer, cache_allocator_t allocator)
 	// allocate space for a working header, plus all the data except the
 	// frames, skin and group info
 	size = field_offset (aliashdr_t, frames[LittleLong (pinmodel->numframes)]);
-	pheader = Hunk_AllocName (size, mod->name);
-	memset (pheader, 0, size);
-	pmodel = &pheader->mdl;
-	pheader->model = (byte *) pmodel - (byte *) pheader;
+	header = Hunk_AllocName (size, mod->name);
+	memset (header, 0, size);
+	alias_ctx.header = header;
+	pmodel = &header->mdl;
+	header->model = (byte *) pmodel - (byte *) header;
 
-	pheader->crc = crc;
+	header->crc = crc;
 
 	mod->flags = LittleLong (pinmodel->flags);
 
@@ -264,20 +270,20 @@ Mod_LoadAliasModel (model_t *mod, void *buffer, cache_allocator_t allocator)
 		Sys_Error ("model %s has a skin taller than %d", mod->name,
 				   MAX_LBM_HEIGHT);
 
-	DARRAY_RESIZE (&poseverts, 0);
+	DARRAY_RESIZE (&alias_ctx.poseverts, 0);
 	pmodel->numverts = LittleLong (pinmodel->numverts);
 
 	if (pmodel->numverts <= 0)
 		Sys_Error ("model %s has no vertices", mod->name);
 
-	DARRAY_RESIZE (&stverts, pmodel->numverts);
+	DARRAY_RESIZE (&alias_ctx.stverts, pmodel->numverts);
 
 	pmodel->numtris = LittleLong (pinmodel->numtris);
 
 	if (pmodel->numtris <= 0)
 		Sys_Error ("model %s has no triangles", mod->name);
 
-	DARRAY_RESIZE (&triangles, pmodel->numtris);
+	DARRAY_RESIZE (&alias_ctx.triangles, pmodel->numtris);
 
 	pmodel->numframes = LittleLong (pinmodel->numframes);
 	numframes = pmodel->numframes;
@@ -296,73 +302,76 @@ Mod_LoadAliasModel (model_t *mod, void *buffer, cache_allocator_t allocator)
 
 	// load the skins
 	pskintype = (daliasskintype_t *) &pinmodel[1];
-	pskintype = Mod_LoadAllSkins (mod, pheader->mdl.numskins, pskintype,
-								  &pheader->skindesc);
+	pskintype = Mod_LoadAllSkins (&alias_ctx, header->mdl.numskins, pskintype,
+								  &header->skindesc);
 
 	// load base s and t vertices
 	pinstverts = (stvert_t *) pskintype;
 
-	for (i = 0; i < pheader->mdl.numverts; i++) {
-		stverts.a[i].onseam = LittleLong (pinstverts[i].onseam);
-		stverts.a[i].s = LittleLong (pinstverts[i].s);
-		stverts.a[i].t = LittleLong (pinstverts[i].t);
+	for (i = 0; i < header->mdl.numverts; i++) {
+		alias_ctx.stverts.a[i].onseam = LittleLong (pinstverts[i].onseam);
+		alias_ctx.stverts.a[i].s = LittleLong (pinstverts[i].s);
+		alias_ctx.stverts.a[i].t = LittleLong (pinstverts[i].t);
 	}
 
 	// load triangle lists
-	pintriangles = (dtriangle_t *) &pinstverts[pheader->mdl.numverts];
+	pintriangles = (dtriangle_t *) &pinstverts[header->mdl.numverts];
 
-	for (i = 0; i < pheader->mdl.numtris; i++) {
-		triangles.a[i].facesfront = LittleLong (pintriangles[i].facesfront);
+	for (i = 0; i < header->mdl.numtris; i++) {
+		alias_ctx.triangles.a[i].facesfront =
+			LittleLong (pintriangles[i].facesfront);
 
 		for (j = 0; j < 3; j++) {
-			triangles.a[i].vertindex[j] =
+			alias_ctx.triangles.a[i].vertindex[j] =
 				LittleLong (pintriangles[i].vertindex[j]);
 		}
 	}
 
 	// load the frames
-	posenum = 0;
-	pframetype = (daliasframetype_t *) &pintriangles[pheader->mdl.numtris];
-	aliasbboxmins[0] = aliasbboxmins[1] = aliasbboxmins[2] =  99999;
-	aliasbboxmaxs[0] = aliasbboxmaxs[1] = aliasbboxmaxs[2] = -99999;
+	int posenum = 0;
+	pframetype = (daliasframetype_t *) &pintriangles[header->mdl.numtris];
+	VectorSet (99999, 99999, 99999, alias_ctx.aliasbboxmins);
+	VectorSet (-99999, -99999, -99999, alias_ctx.aliasbboxmaxs);
 
 	for (i = 0; i < numframes; i++) {
 		aliasframetype_t frametype;
 
 		frametype = LittleLong (pframetype->type);
-		pheader->frames[i].type = frametype;
+		header->frames[i].type = frametype;
 
 		if (frametype == ALIAS_SINGLE) {
 			pframetype = (daliasframetype_t *)
-				Mod_LoadAliasFrame (mod, pframetype + 1, &posenum,
-									&pheader->frames[i], extra);
+				Mod_LoadAliasFrame (&alias_ctx, pframetype + 1, &posenum,
+									&header->frames[i], extra);
 		} else {
 			pframetype = (daliasframetype_t *)
-				Mod_LoadAliasGroup (mod, pframetype + 1, &posenum,
-									&pheader->frames[i], extra);
+				Mod_LoadAliasGroup (&alias_ctx, pframetype + 1, &posenum,
+									&header->frames[i], extra);
 		}
 	}
 
-	pheader->numposes = posenum;
+	header->numposes = posenum;
 
 	mod->type = mod_alias;
 
-	for (i = 0; i < 3; i++) {
-		mod->mins[i] = aliasbboxmins[i] * pheader->mdl.scale[i] +
-			pheader->mdl.scale_origin[i];
-		mod->maxs[i] = aliasbboxmaxs[i] * pheader->mdl.scale[i] +
-			pheader->mdl.scale_origin[i];
-	}
+	VectorCompMultAdd (header->mdl.scale_origin, header->mdl.scale,
+					   alias_ctx.aliasbboxmins, mod->mins);
+	VectorCompMultAdd (header->mdl.scale_origin, header->mdl.scale,
+					   alias_ctx.aliasbboxmaxs, mod->maxs);
 
 	mod->radius = RadiusFromBounds (mod->mins, mod->maxs);
 
 	// build the draw lists
-	m_funcs->Mod_MakeAliasModelDisplayLists (mod, pheader, buffer,
+	m_funcs->Mod_MakeAliasModelDisplayLists (&alias_ctx, buffer,
 											 qfs_filesize, extra);
 
-	m_funcs->Mod_FinalizeAliasModel (mod, pheader);
+	if (m_funcs->Mod_FinalizeAliasModel) {
+		m_funcs->Mod_FinalizeAliasModel (&alias_ctx);
+	}
 
-	m_funcs->Mod_LoadExternalSkins (mod);
+	if (m_funcs->Mod_LoadExternalSkins) {
+		m_funcs->Mod_LoadExternalSkins (&alias_ctx);
+	}
 
 	// move the complete, relocatable alias model to the cache
 	if (m_funcs->alias_cache) {
@@ -371,11 +380,11 @@ Mod_LoadAliasModel (model_t *mod, void *buffer, cache_allocator_t allocator)
 
 		mem = allocator (&mod->cache, total, mod->name);
 		if (mem)
-			memcpy (mem, pheader, total);
+			memcpy (mem, header, total);
 
 		Hunk_FreeToLowMark (start);
 		mod->aliashdr = 0;
 	} else {
-		mod->aliashdr = pheader;
+		mod->aliashdr = header;
 	}
 }
diff --git a/libs/models/alias/sw_model_alias.c b/libs/models/alias/sw_model_alias.c
index 61122298b..0bd57d5ce 100644
--- a/libs/models/alias/sw_model_alias.c
+++ b/libs/models/alias/sw_model_alias.c
@@ -50,13 +50,14 @@
 
 
 void *
-sw_Mod_LoadSkin (model_t *mod, byte *skin, int skinsize, int snum, int gnum,
+sw_Mod_LoadSkin (mod_alias_ctx_t *alias_ctx, byte *skin,
+				 int skinsize, int snum, int gnum,
 				 qboolean group, maliasskindesc_t *skindesc)
 {
 	byte		*pskin;
 
-	pskin = Hunk_AllocName (skinsize, mod->name);
-	skindesc->skin = (byte *) pskin - (byte *) pheader;
+	pskin = Hunk_AllocName (skinsize, alias_ctx->mod->name);
+	skindesc->skin = (byte *) pskin - (byte *) alias_ctx->header;
 
 	memcpy (pskin, skin, skinsize);
 
@@ -64,73 +65,67 @@ sw_Mod_LoadSkin (model_t *mod, byte *skin, int skinsize, int snum, int gnum,
 }
 
 static void
-process_frame (model_t *mod, maliasframedesc_t *frame, int posenum, int extra)
+process_frame (mod_alias_ctx_t *alias_ctx, maliasframedesc_t *frame,
+			   int posenum, int extra)
 {
-	int         size = pheader->mdl.numverts * sizeof (trivertx_t);
+	aliashdr_t *header = alias_ctx->header;
+	int         size = header->mdl.numverts * sizeof (trivertx_t);
 	trivertx_t *frame_verts;
 
 	if (extra)
 		size *= 2;
 
-	frame_verts = Hunk_AllocName (size, mod->name);
-	frame->frame = (byte *) frame_verts - (byte *) pheader;
+	frame_verts = Hunk_AllocName (size, alias_ctx->mod->name);
+	frame->frame = (byte *) frame_verts - (byte *) header;
 
 	// The low-order 8 bits (actually, fractional) are completely separate
 	// from the high-order bits (see R_AliasTransformFinalVert16 in
 	// sw_ralias.c), but in adjacant arrays. This means we can get away with
 	// just one memcpy as there are no endian issues.
-	memcpy (frame_verts, poseverts.a[posenum], size);
+	memcpy (frame_verts, alias_ctx->poseverts.a[posenum], size);
 }
 
 void
-sw_Mod_MakeAliasModelDisplayLists (model_t *mod, aliashdr_t *hdr, void *_m,
+sw_Mod_MakeAliasModelDisplayLists (mod_alias_ctx_t *alias_ctx, void *_m,
 								   int _s, int extra)
 {
+	aliashdr_t *header = alias_ctx->header;
 	int			 i, j;
 	int          posenum = 0;
-	int			 numv = hdr->mdl.numverts, numt = hdr->mdl.numtris;
-	stvert_t	*pstverts;
-	mtriangle_t *ptri;
+	int			 numv = header->mdl.numverts, numt = header->mdl.numtris;
+	stvert_t	*stverts;
+	mtriangle_t *tris;
 
-	pstverts = (stvert_t *) Hunk_AllocName (numv * sizeof (stvert_t),
-											mod->name);
-	ptri = (mtriangle_t *) Hunk_AllocName (numt * sizeof (mtriangle_t),
-										   mod->name);
+	stverts = (stvert_t *) Hunk_AllocName (numv * sizeof (stvert_t),
+										   alias_ctx->mod->name);
+	tris = (mtriangle_t *) Hunk_AllocName (numt * sizeof (mtriangle_t),
+										   alias_ctx->mod->name);
 
-	hdr->stverts = (byte *) pstverts - (byte *) hdr;
-	hdr->triangles = (byte *) ptri - (byte *) hdr;
+	header->stverts = (byte *) stverts - (byte *) header;
+	header->triangles = (byte *) tris - (byte *) header;
 
 	for (i = 0; i < numv; i++) {
-		pstverts[i].onseam = stverts.a[i].onseam;
-		pstverts[i].s = stverts.a[i].s << 16;
-		pstverts[i].t = stverts.a[i].t << 16;
+		stverts[i].onseam = alias_ctx->stverts.a[i].onseam;
+		stverts[i].s = alias_ctx->stverts.a[i].s << 16;
+		stverts[i].t = alias_ctx->stverts.a[i].t << 16;
 	}
 
 	for (i = 0; i < numt; i++) {
-		ptri[i].facesfront = triangles.a[i].facesfront;
-		VectorCopy (triangles.a[i].vertindex, ptri[i].vertindex);
+		tris[i].facesfront = alias_ctx->triangles.a[i].facesfront;
+		VectorCopy (alias_ctx->triangles.a[i].vertindex, tris[i].vertindex);
 	}
 
-	for (i = 0; i < pheader->mdl.numframes; i++) {
-		maliasframedesc_t *frame = pheader->frames + i;
+	for (i = 0; i < header->mdl.numframes; i++) {
+		maliasframedesc_t *frame = header->frames + i;
 		if (frame->type) {
 			maliasgroup_t *group;
-			group = (maliasgroup_t *) ((byte *) pheader + frame->frame);
-			for (j = 0; j < group->numframes; j++)
-				process_frame (mod, (maliasframedesc_t *) &group->frames[j],
-							   posenum++, extra);
+			group = (maliasgroup_t *) ((byte *) header + frame->frame);
+			for (j = 0; j < group->numframes; j++) {
+				__auto_type frame = (maliasframedesc_t *) &group->frames[j];
+				process_frame (alias_ctx, frame, posenum++, extra);
+			}
 		} else {
-			process_frame (mod, frame, posenum++, extra);
+			process_frame (alias_ctx, frame, posenum++, extra);
 		}
 	}
 }
-
-void
-sw_Mod_FinalizeAliasModel (model_t *mod, aliashdr_t *hdr)
-{
-}
-
-void
-sw_Mod_LoadExternalSkins (model_t *mod)
-{
-}
diff --git a/libs/models/alias/vulkan_model_alias.c b/libs/models/alias/vulkan_model_alias.c
index 97e8a63d0..c6493c750 100644
--- a/libs/models/alias/vulkan_model_alias.c
+++ b/libs/models/alias/vulkan_model_alias.c
@@ -110,19 +110,20 @@ vulkan_alias_clear (model_t *m, void *data)
 }
 
 void *
-Vulkan_Mod_LoadSkin (model_t *mod, byte *skinpix, int skinsize, int snum,
-					 int gnum, qboolean group, maliasskindesc_t *skindesc,
-					 vulkan_ctx_t *ctx)
+Vulkan_Mod_LoadSkin (mod_alias_ctx_t *alias_ctx, byte *skinpix, int skinsize,
+					 int snum, int gnum, qboolean group,
+					 maliasskindesc_t *skindesc, vulkan_ctx_t *ctx)
 {
+	aliashdr_t *header = alias_ctx->header;
 	aliasskin_t *skin;
 	byte       *tskin;
 	int         w, h;
 
 	skin = Hunk_Alloc (sizeof (aliasskin_t));
-	skindesc->skin = (byte *) skin - (byte *) pheader;//FIXME pheader global
+	skindesc->skin = (byte *) skin - (byte *) header;
 	//FIXME move all skins into arrays(?)
-	w = pheader->mdl.skinwidth;
-	h = pheader->mdl.skinheight;
+	w = header->mdl.skinwidth;
+	h = header->mdl.skinheight;
 	tskin = malloc (2 * skinsize);
 	memcpy (tskin, skinpix, skinsize);
 	Mod_FloodFillSkin (tskin, w, h);
@@ -131,25 +132,25 @@ Vulkan_Mod_LoadSkin (model_t *mod, byte *skinpix, int skinsize, int snum,
 	if (Mod_CalcFullbright (tskin, tskin + skinsize, skinsize)) {
 		skin->glow = Vulkan_LoadTex (ctx, &skin_tex, 1,
 									 va (ctx->va_ctx, "%s:%d:%d:glow",
-										 mod->name, snum, gnum));
+										 alias_ctx->mod->name, snum, gnum));
 		Mod_ClearFullbright (tskin, tskin, skinsize);
 	}
 	if (Skin_CalcTopColors (tskin, tskin + skinsize, skinsize)) {
 		skin->colora = Vulkan_LoadTex (ctx, &skin_tex, 1,
 									   va (ctx->va_ctx, "%s:%d:%d:colora",
-										   mod->name, snum, gnum));
+										   alias_ctx->mod->name, snum, gnum));
 		Skin_ClearTopColors (tskin, tskin, skinsize);
 	}
 	if (Skin_CalcBottomColors (tskin, tskin + skinsize, skinsize)) {
 		skin->colorb = Vulkan_LoadTex (ctx, &skin_tex, 1,
 									   va (ctx->va_ctx, "%s:%d:%d:colorb",
-										   mod->name, snum, gnum));
+										   alias_ctx->mod->name, snum, gnum));
 		Skin_ClearBottomColors (tskin, tskin, skinsize);
 	}
 	skin_tex.data = tskin;
 	skin->tex = Vulkan_LoadTex (ctx, &skin_tex, 1,
 								va (ctx->va_ctx, "%s:%d:%d:tex",
-									mod->name,
+									alias_ctx->mod->name,
 									snum, gnum));
 
 	free (tskin);
@@ -158,14 +159,14 @@ Vulkan_Mod_LoadSkin (model_t *mod, byte *skinpix, int skinsize, int snum,
 }
 
 void
-Vulkan_Mod_FinalizeAliasModel (model_t *m, aliashdr_t *hdr, vulkan_ctx_t *ctx)
+Vulkan_Mod_FinalizeAliasModel (mod_alias_ctx_t *alias_ctx, vulkan_ctx_t *ctx)
 {
-	m->clear = vulkan_alias_clear;
-	m->data = ctx;
+	alias_ctx->mod->clear = vulkan_alias_clear;
+	alias_ctx->mod->data = ctx;
 }
 
 void
-Vulkan_Mod_LoadExternalSkins (model_t *mod, vulkan_ctx_t *ctx)
+Vulkan_Mod_LoadExternalSkins (mod_alias_ctx_t *alias_ctx, vulkan_ctx_t *ctx)
 {
 }
 
@@ -185,9 +186,10 @@ get_buffer_size (qfv_device_t *device, VkBuffer buffer)
 }
 
 void
-Vulkan_Mod_MakeAliasModelDisplayLists (model_t *mod, aliashdr_t *hdr, void *_m,
+Vulkan_Mod_MakeAliasModelDisplayLists (mod_alias_ctx_t *alias_ctx, void *_m,
 									   int _s, int extra, vulkan_ctx_t *ctx)
 {
+	aliashdr_t *header = alias_ctx->header;
 	qfv_device_t *device = ctx->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
 	aliasvrt_t *verts;
@@ -201,11 +203,11 @@ Vulkan_Mod_MakeAliasModelDisplayLists (model_t *mod, aliashdr_t *hdr, void *_m,
 	int         pose;
 	vec3_t      pos;
 
-	if (hdr->mdl.ident == HEADER_MDL16)
-		VectorScale (hdr->mdl.scale, 1/256.0, hdr->mdl.scale);
+	if (header->mdl.ident == HEADER_MDL16)
+		VectorScale (header->mdl.scale, 1/256.0, header->mdl.scale);
 
-	numverts = hdr->mdl.numverts;
-	numtris = hdr->mdl.numtris;
+	numverts = header->mdl.numverts;
+	numtris = header->mdl.numtris;
 
 	// initialize indexmap to -1 (unduplicated). any other value indicates
 	// both that the vertex has been duplicated and the index of the
@@ -217,8 +219,9 @@ Vulkan_Mod_MakeAliasModelDisplayLists (model_t *mod, aliashdr_t *hdr, void *_m,
 	// back-facing triangles
 	for (i = 0; i < numtris; i++) {
 		for (j = 0; j < 3; j++) {
-			int         vind = triangles.a[i].vertindex[j];
-			if (stverts.a[vind].onseam && !triangles.a[i].facesfront) {
+			int         vind = alias_ctx->triangles.a[i].vertindex[j];
+			if (alias_ctx->stverts.a[vind].onseam
+				&& !alias_ctx->triangles.a[i].facesfront) {
 				// duplicate the vertex if it has not alreaddy been
 				// duplicated
 				if (indexmap[vind] == -1) {
@@ -239,7 +242,7 @@ Vulkan_Mod_MakeAliasModelDisplayLists (model_t *mod, aliashdr_t *hdr, void *_m,
 	// current and previous pose, uvbuff "statically" bound as uvs are not
 	// animated by pose, and the same for ibuf: indices will never change for
 	// the mesh
-	size_t      vert_count = numverts * hdr->numposes;
+	size_t      vert_count = numverts * header->numposes;
 	size_t      vert_size = vert_count * sizeof (aliasvrt_t);
 	size_t      uv_size = numverts * sizeof (aliasuv_t);
 	size_t      ind_size = 3 * numtris * sizeof (uint32_t);
@@ -255,13 +258,13 @@ Vulkan_Mod_MakeAliasModelDisplayLists (model_t *mod, aliashdr_t *hdr, void *_m,
 										  | VK_BUFFER_USAGE_INDEX_BUFFER_BIT);
 	QFV_duSetObjectName (device, VK_OBJECT_TYPE_BUFFER, vbuff,
 						 va (ctx->va_ctx, "buffer:alias:vertex:%s",
-							 mod->name));
+							 alias_ctx->mod->name));
 	QFV_duSetObjectName (device, VK_OBJECT_TYPE_BUFFER, uvbuff,
 						 va (ctx->va_ctx, "buffer:alias:uv:%s",
-							 mod->name));
+							 alias_ctx->mod->name));
 	QFV_duSetObjectName (device, VK_OBJECT_TYPE_BUFFER, ibuff,
 						 va (ctx->va_ctx, "buffer:alias:index:%s",
-							 mod->name));
+							 alias_ctx->mod->name));
 	size_t      voffs = 0;
 	size_t      uvoffs = voffs + get_buffer_size (device, vbuff);
 	size_t      ioffs = uvoffs + get_buffer_size (device, uvbuff);
@@ -272,7 +275,7 @@ Vulkan_Mod_MakeAliasModelDisplayLists (model_t *mod, aliashdr_t *hdr, void *_m,
 								 buff_size, 0);
 	QFV_duSetObjectName (device, VK_OBJECT_TYPE_DEVICE_MEMORY, mem,
 						 va (ctx->va_ctx, "memory:alias:vuvi:%s",
-							 mod->name));
+							 alias_ctx->mod->name));
 	QFV_BindBufferMemory (device, vbuff, mem, voffs);
 	QFV_BindBufferMemory (device, uvbuff, mem, uvoffs);
 	QFV_BindBufferMemory (device, ibuff, mem, ioffs);
@@ -280,7 +283,7 @@ Vulkan_Mod_MakeAliasModelDisplayLists (model_t *mod, aliashdr_t *hdr, void *_m,
 	qfv_stagebuf_t *stage = QFV_CreateStagingBuffer (device,
 													 va (ctx->va_ctx,
 														 "alias:%s",
-														 mod->name),
+														 alias_ctx->mod->name),
 													 buff_size, ctx->cmdpool);
 	qfv_packet_t *packet = QFV_PacketAcquire (stage);
 	verts = QFV_PacketExtend (packet, vert_size);
@@ -291,10 +294,10 @@ Vulkan_Mod_MakeAliasModelDisplayLists (model_t *mod, aliashdr_t *hdr, void *_m,
 	// and associated with back-facing triangles (marked by non-negative
 	// indexmap entry).
 	// the s coordinate is shifted right by half the skin width.
-	for (i = 0; i < hdr->mdl.numverts; i++) {
+	for (i = 0; i < header->mdl.numverts; i++) {
 		int         vind = indexmap[i];
-		uv[i].u = (float) stverts.a[i].s / hdr->mdl.skinwidth;
-		uv[i].v = (float) stverts.a[i].t / hdr->mdl.skinheight;
+		uv[i].u = (float) alias_ctx->stverts.a[i].s / header->mdl.skinwidth;
+		uv[i].v = (float) alias_ctx->stverts.a[i].t / header->mdl.skinheight;
 		if (vind != -1) {
 			uv[vind] = uv[i];
 			uv[vind].u += 0.5;
@@ -303,15 +306,15 @@ Vulkan_Mod_MakeAliasModelDisplayLists (model_t *mod, aliashdr_t *hdr, void *_m,
 
 	// poputlate the vertex position and normal data, duplicating for
 	// back-facing on-seam verts (indicated by non-negative indexmap entry)
-	for (i = 0, pose = 0; i < hdr->numposes; i++, pose += numverts) {
-		for (j = 0; j < hdr->mdl.numverts; j++) {
-			pv = &poseverts.a[i][j];
+	for (i = 0, pose = 0; i < header->numposes; i++, pose += numverts) {
+		for (j = 0; j < header->mdl.numverts; j++) {
+			pv = &alias_ctx->poseverts.a[i][j];
 			if (extra) {
-				VectorMultAdd (pv[hdr->mdl.numverts].v, 256, pv->v, pos);
+				VectorMultAdd (pv[header->mdl.numverts].v, 256, pv->v, pos);
 			} else {
 				VectorCopy (pv->v, pos);
 			}
-			VectorCompMultAdd (hdr->mdl.scale_origin, hdr->mdl.scale,
+			VectorCompMultAdd (header->mdl.scale_origin, header->mdl.scale,
 							   pos, verts[pose + j].vertex);
 			verts[pose + j].vertex[3] = 1;
 			VectorCopy (vertex_normals[pv->lightnormalindex],
@@ -327,8 +330,9 @@ Vulkan_Mod_MakeAliasModelDisplayLists (model_t *mod, aliashdr_t *hdr, void *_m,
 	// now build the indices for DrawElements
 	for (i = 0; i < numtris; i++) {
 		for (j = 0; j < 3; j++) {
-			int         vind = triangles.a[i].vertindex[j];
-			if (stverts.a[vind].onseam && !triangles.a[i].facesfront) {
+			int         vind = alias_ctx->triangles.a[i].vertindex[j];
+			if (alias_ctx->stverts.a[vind].onseam
+				&& !alias_ctx->triangles.a[i].facesfront) {
 				vind = indexmap[vind];
 			}
 			indices[3 * i + j] = vind;
@@ -337,7 +341,7 @@ Vulkan_Mod_MakeAliasModelDisplayLists (model_t *mod, aliashdr_t *hdr, void *_m,
 	// finished with indexmap
 	free (indexmap);
 
-	hdr->poseverts = numverts;
+	header->poseverts = numverts;
 
 	VkBufferMemoryBarrier wr_barriers[] = {
 		{	VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER, 0,
@@ -394,5 +398,5 @@ Vulkan_Mod_MakeAliasModelDisplayLists (model_t *mod, aliashdr_t *hdr, void *_m,
 	mesh->uv_buffer = uvbuff;
 	mesh->index_buffer = ibuff;
 	mesh->memory = mem;
-	hdr->commands = (byte *) mesh - (byte *) hdr;
+	header->commands = (byte *) mesh - (byte *) header;
 }
diff --git a/libs/video/renderer/vid_render_sw.c b/libs/video/renderer/vid_render_sw.c
index 0ef7a0108..2f790d847 100644
--- a/libs/video/renderer/vid_render_sw.c
+++ b/libs/video/renderer/vid_render_sw.c
@@ -50,8 +50,8 @@ static vid_model_funcs_t model_funcs = {
 
 	sw_Mod_MakeAliasModelDisplayLists,
 	sw_Mod_LoadSkin,
-	sw_Mod_FinalizeAliasModel,
-	sw_Mod_LoadExternalSkins,
+	0,
+	0,
 	sw_Mod_IQMFinish,
 	1,
 	sw_Mod_SpriteLoadTexture,
diff --git a/libs/video/renderer/vid_render_sw32.c b/libs/video/renderer/vid_render_sw32.c
index a3fe10d97..db94b291d 100644
--- a/libs/video/renderer/vid_render_sw32.c
+++ b/libs/video/renderer/vid_render_sw32.c
@@ -55,8 +55,8 @@ static vid_model_funcs_t model_funcs = {
 
 	sw_Mod_MakeAliasModelDisplayLists,
 	sw_Mod_LoadSkin,
-	sw_Mod_FinalizeAliasModel,
-	sw_Mod_LoadExternalSkins,
+	0,
+	0,
 	sw_Mod_IQMFinish,
 	1,
 	sw_Mod_SpriteLoadTexture,
diff --git a/libs/video/renderer/vid_render_vulkan.c b/libs/video/renderer/vid_render_vulkan.c
index 3473a92cf..8441795c1 100644
--- a/libs/video/renderer/vid_render_vulkan.c
+++ b/libs/video/renderer/vid_render_vulkan.c
@@ -418,28 +418,30 @@ vulkan_Mod_ProcessTexture (model_t *mod, texture_t *tx)
 }
 
 static void
-vulkan_Mod_MakeAliasModelDisplayLists (model_t *mod, aliashdr_t *hdr,
+vulkan_Mod_MakeAliasModelDisplayLists (mod_alias_ctx_t *alias_ctx,
 									   void *_m, int _s, int extra)
 {
-	Vulkan_Mod_MakeAliasModelDisplayLists (mod, hdr, _m, _s, extra, vulkan_ctx);
+	Vulkan_Mod_MakeAliasModelDisplayLists (alias_ctx, _m, _s, extra,
+										   vulkan_ctx);
 }
 
 static void *
-vulkan_Mod_LoadSkin (model_t *mod, byte *skin, int skinsize, int snum,
-					 int gnum, qboolean group, maliasskindesc_t *skindesc)
+vulkan_Mod_LoadSkin (mod_alias_ctx_t *alias_ctx, byte *skin, int skinsize,
+					 int snum, int gnum, qboolean group,
+					 maliasskindesc_t *skindesc)
 {
-	return Vulkan_Mod_LoadSkin (mod, skin, skinsize, snum, gnum, group,
+	return Vulkan_Mod_LoadSkin (alias_ctx, skin, skinsize, snum, gnum, group,
 								skindesc, vulkan_ctx);
 }
 
 static void
-vulkan_Mod_FinalizeAliasModel (model_t *m, aliashdr_t *hdr)
+vulkan_Mod_FinalizeAliasModel (mod_alias_ctx_t *alias_ctx)
 {
-	Vulkan_Mod_FinalizeAliasModel (m, hdr, vulkan_ctx);
+	Vulkan_Mod_FinalizeAliasModel (alias_ctx, vulkan_ctx);
 }
 
 static void
-vulkan_Mod_LoadExternalSkins (model_t *mod)
+vulkan_Mod_LoadExternalSkins (mod_alias_ctx_t *alias_ctx)
 {
 }
 

From 0d4ca46923d77c88a74f0fe8e8b95cbc06671652 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 2 Feb 2021 00:04:45 +0900
Subject: [PATCH 1398/1519] [vulkan] Move mip map generation commands to image

---
 include/QF/Vulkan/image.h                   |  1 +
 libs/video/renderer/vulkan/image.c          | 30 +++++++++++++++++++++
 libs/video/renderer/vulkan/vulkan_texture.c | 26 +-----------------
 3 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/include/QF/Vulkan/image.h b/include/QF/Vulkan/image.h
index 71ca57389..9942562b2 100644
--- a/include/QF/Vulkan/image.h
+++ b/include/QF/Vulkan/image.h
@@ -82,5 +82,6 @@ VkImageView QFV_CreateImageView (struct qfv_device_s *device,
 void QFV_GenerateMipMaps (struct qfv_device_s *device, VkCommandBuffer cmd,
 						  VkImage image, unsigned mips,
 						  unsigned width, unsigned height, unsigned layers);
+int QFV_MipLevels (int width, int height) __attribute__((const));
 
 #endif//__QF_Vulkan_image_h
diff --git a/libs/video/renderer/vulkan/image.c b/libs/video/renderer/vulkan/image.c
index 92d584f80..41b4586f0 100644
--- a/libs/video/renderer/vulkan/image.c
+++ b/libs/video/renderer/vulkan/image.c
@@ -275,3 +275,33 @@ QFV_GenerateMipMaps (qfv_device_t *device, VkCommandBuffer cmd,
 								 0, 0, 0, 0,
 								 1, &final_barrier);
 }
+
+static int
+ilog2 (unsigned x)
+{
+	unsigned o = x;
+	if (x > 0x7fffffff) {
+		// avoid overflow
+		return 31;
+	}
+	x--;
+	x |= x >> 1;
+	x |= x >> 2;
+	x |= x >> 4;
+	x |= x >> 8;
+	x |= x >> 16;
+	x++;
+	int y = 0;
+	y |= ((x & 0xffff0000) != 0) << 4;
+	y |= ((x & 0xff00ff00) != 0) << 3;
+	y |= ((x & 0xf0f0f0f0) != 0) << 2;
+	y |= ((x & 0xcccccccc) != 0) << 1;
+	y |= ((x & 0xaaaaaaaa) != 0) << 0;
+	return y - ((o & (x - 1)) != 0);
+}
+
+int
+QFV_MipLevels (int width, int height)
+{
+	return ilog2 (max (width, height)) + 1;
+}
diff --git a/libs/video/renderer/vulkan/vulkan_texture.c b/libs/video/renderer/vulkan/vulkan_texture.c
index 4a1e2d2ab..7d8b13155 100644
--- a/libs/video/renderer/vulkan/vulkan_texture.c
+++ b/libs/video/renderer/vulkan/vulkan_texture.c
@@ -64,30 +64,6 @@
 #include "r_scrap.h"
 #include "vid_vulkan.h"
 
-static int
-ilog2 (unsigned x)
-{
-	unsigned o = x;
-	if (x > 0x7fffffff) {
-		// avoid overflow
-		return 31;
-	}
-	x--;
-	x |= x >> 1;
-	x |= x >> 2;
-	x |= x >> 4;
-	x |= x >> 8;
-	x |= x >> 16;
-	x++;
-	int y = 0;
-	y |= ((x & 0xffff0000) != 0) << 4;
-	y |= ((x & 0xff00ff00) != 0) << 3;
-	y |= ((x & 0xf0f0f0f0) != 0) << 2;
-	y |= ((x & 0xcccccccc) != 0) << 1;
-	y |= ((x & 0xaaaaaaaa) != 0) << 0;
-	return y - ((o & (x - 1)) != 0);
-}
-
 void
 Vulkan_ExpandPalette (byte *dst, const byte *src, const byte *palette,
 					  int alpha, int count)
@@ -164,7 +140,7 @@ Vulkan_LoadTex (vulkan_ctx_t *ctx, tex_t *tex, int mip, const char *name)
 	}
 
 	if (mip) {
-		mip = ilog2 (max (tex->width, tex->height)) + 1;
+		mip = QFV_MipLevels (tex->width, tex->height);
 	} else {
 		mip = 1;
 	}

From 8e63ab9f94b8d028cb38b2c1918abde127d39e3c Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 2 Feb 2021 00:11:47 +0900
Subject: [PATCH 1399/1519] [vulkan] Use 4 layer arrays for alias skins

Doesn't seem to make much difference performance-wise, but speed does
seem to be fill-rate limited due to the 8x msaa. Still, it does mean
fewer bindings to worry about.
---
 include/QF/Vulkan/qf_alias.h                |   9 +-
 libs/models/alias/vulkan_model_alias.c      | 139 +++++++++++++++-----
 libs/video/renderer/vulkan/alias.frag       |  13 +-
 libs/video/renderer/vulkan/qfpipeline.plist |  18 ---
 libs/video/renderer/vulkan/vulkan_alias.c   |  11 +-
 5 files changed, 112 insertions(+), 78 deletions(-)

diff --git a/include/QF/Vulkan/qf_alias.h b/include/QF/Vulkan/qf_alias.h
index ebf4f6996..6f96e0fa0 100644
--- a/include/QF/Vulkan/qf_alias.h
+++ b/include/QF/Vulkan/qf_alias.h
@@ -37,13 +37,6 @@
 #include "QF/modelgen.h"
 #include "QF/Vulkan/qf_vid.h"
 
-typedef struct aliasskin_s {
-	struct qfv_tex_s *tex;
-	struct qfv_tex_s *glow;
-	struct qfv_tex_s *colora;
-	struct qfv_tex_s *colorb;
-} aliasskin_t;
-
 typedef struct aliasvrt_s {
 	float       vertex[4];
 	float       normal[4];
@@ -77,7 +70,7 @@ typedef struct qfv_light_buffer_s {
 } qfv_light_buffer_t;
 
 #define ALIAS_BUFFER_INFOS 2
-#define ALIAS_IMAGE_INFOS 4
+#define ALIAS_IMAGE_INFOS 1
 
 typedef struct aliasframe_s {
 	VkCommandBuffer cmd;
diff --git a/libs/models/alias/vulkan_model_alias.c b/libs/models/alias/vulkan_model_alias.c
index c6493c750..5b3ce995c 100644
--- a/libs/models/alias/vulkan_model_alias.c
+++ b/libs/models/alias/vulkan_model_alias.c
@@ -46,9 +46,11 @@
 #include "QF/vid.h"
 #include "QF/Vulkan/qf_alias.h"
 #include "QF/Vulkan/qf_texture.h"
+#include "QF/Vulkan/barrier.h"
 #include "QF/Vulkan/buffer.h"
 #include "QF/Vulkan/device.h"
 #include "QF/Vulkan/debug.h"
+#include "QF/Vulkan/image.h"
 #include "QF/Vulkan/instance.h"
 #include "QF/Vulkan/staging.h"
 
@@ -63,17 +65,13 @@ static vec3_t vertex_normals[NUMVERTEXNORMALS] = {
 static void
 skin_clear (int skin_offset, aliashdr_t *hdr, vulkan_ctx_t *ctx)
 {
-	aliasskin_t *skin = (aliasskin_t *) ((byte *) hdr + skin_offset);
-	Vulkan_UnloadTex (ctx, skin->tex);
-	if (skin->glow) {
-		Vulkan_UnloadTex (ctx, skin->glow);
-	}
-	if (skin->colora) {
-		Vulkan_UnloadTex (ctx, skin->colora);
-	}
-	if (skin->colorb) {
-		Vulkan_UnloadTex (ctx, skin->colorb);
-	}
+	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+	qfv_tex_t  *skin = (qfv_tex_t *) ((byte *) hdr + skin_offset);
+
+	dfunc->vkDestroyImageView (device->dev, skin->view, 0);
+	dfunc->vkDestroyImage (device->dev, skin->image, 0);
+	dfunc->vkFreeMemory (device->dev, skin->memory, 0);
 }
 
 static void
@@ -114,12 +112,14 @@ Vulkan_Mod_LoadSkin (mod_alias_ctx_t *alias_ctx, byte *skinpix, int skinsize,
 					 int snum, int gnum, qboolean group,
 					 maliasskindesc_t *skindesc, vulkan_ctx_t *ctx)
 {
+	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
 	aliashdr_t *header = alias_ctx->header;
-	aliasskin_t *skin;
+	qfv_tex_t  *skin;
 	byte       *tskin;
 	int         w, h;
 
-	skin = Hunk_Alloc (sizeof (aliasskin_t));
+	skin = Hunk_Alloc (sizeof (qfv_tex_t));
 	skindesc->skin = (byte *) skin - (byte *) header;
 	//FIXME move all skins into arrays(?)
 	w = header->mdl.skinwidth;
@@ -128,30 +128,97 @@ Vulkan_Mod_LoadSkin (mod_alias_ctx_t *alias_ctx, byte *skinpix, int skinsize,
 	memcpy (tskin, skinpix, skinsize);
 	Mod_FloodFillSkin (tskin, w, h);
 
-	tex_t skin_tex = {w, h, tex_palette, 1, vid.palette, tskin + skinsize};
-	if (Mod_CalcFullbright (tskin, tskin + skinsize, skinsize)) {
-		skin->glow = Vulkan_LoadTex (ctx, &skin_tex, 1,
-									 va (ctx->va_ctx, "%s:%d:%d:glow",
-										 alias_ctx->mod->name, snum, gnum));
-		Mod_ClearFullbright (tskin, tskin, skinsize);
+	int         mipLevels = QFV_MipLevels (w, h);
+	VkExtent3D  extent = { w, h, 1 };
+	skin->offset = 0;
+	skin->image = QFV_CreateImage (device, 0, VK_IMAGE_TYPE_2D,
+								   VK_FORMAT_R8G8B8A8_UNORM, extent,
+								   mipLevels, 4, VK_SAMPLE_COUNT_1_BIT,
+								   VK_IMAGE_USAGE_SAMPLED_BIT
+								   | VK_IMAGE_USAGE_TRANSFER_DST_BIT
+								   | VK_IMAGE_USAGE_TRANSFER_SRC_BIT);
+	QFV_duSetObjectName (device, VK_OBJECT_TYPE_IMAGE, skin->image,
+						 va (ctx->va_ctx, "image:%s:%d:%d",
+							 alias_ctx->mod->name, snum, gnum));
+	skin->memory = QFV_AllocImageMemory (device, skin->image,
+										 VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT,
+										 0, 0);
+	QFV_duSetObjectName (device, VK_OBJECT_TYPE_DEVICE_MEMORY, skin->memory,
+						 va (ctx->va_ctx, "memory:%s:%d:%d",
+							 alias_ctx->mod->name, snum, gnum));
+	QFV_BindImageMemory (device, skin->image, skin->memory, 0);
+	skin->view = QFV_CreateImageView (device, skin->image,
+									  VK_IMAGE_VIEW_TYPE_2D_ARRAY,
+									  VK_FORMAT_R8G8B8A8_UNORM,
+									  VK_IMAGE_ASPECT_COLOR_BIT);
+	QFV_duSetObjectName (device, VK_OBJECT_TYPE_IMAGE_VIEW, skin->view,
+						 va (ctx->va_ctx, "iview:%s:%d:%d",
+							 alias_ctx->mod->name, snum, gnum));
+
+	qfv_stagebuf_t *stage = QFV_CreateStagingBuffer (device, "alias stage",
+													 4 * skinsize * 4,
+													 ctx->cmdpool);
+	qfv_packet_t *packet = QFV_PacketAcquire (stage);
+	byte       *base_data = QFV_PacketExtend (packet, skinsize * 4);
+	byte       *cola_data = QFV_PacketExtend (packet, skinsize * 4);
+	byte       *colb_data = QFV_PacketExtend (packet, skinsize * 4);
+	byte       *glow_data = QFV_PacketExtend (packet, skinsize * 4);
+
+	Mod_CalcFullbright (tskin, tskin + skinsize, skinsize);
+	Vulkan_ExpandPalette (glow_data, tskin + skinsize, vid.palette, 1,
+						  skinsize);
+	Mod_ClearFullbright (tskin, tskin, skinsize);
+
+	Skin_CalcTopColors (tskin, tskin + skinsize, skinsize);
+	Vulkan_ExpandPalette (cola_data, tskin + skinsize, vid.palette, 1,
+						  skinsize);
+	Skin_ClearTopColors (tskin, tskin, skinsize);
+
+	Skin_CalcBottomColors (tskin, tskin + skinsize, skinsize);
+	Vulkan_ExpandPalette (colb_data, tskin + skinsize, vid.palette, 1,
+						  skinsize);
+	Skin_ClearBottomColors (tskin, tskin, skinsize);
+
+	Vulkan_ExpandPalette (base_data, tskin, vid.palette, 1, skinsize);
+
+	VkImageMemoryBarrier barrier;
+	qfv_pipelinestagepair_t stages;
+
+	stages = imageLayoutTransitionStages[qfv_LT_Undefined_to_TransferDst];
+	barrier = imageLayoutTransitionBarriers[qfv_LT_Undefined_to_TransferDst];
+	barrier.image = skin->image;
+	barrier.subresourceRange.levelCount = VK_REMAINING_MIP_LEVELS;
+	barrier.subresourceRange.layerCount = VK_REMAINING_ARRAY_LAYERS;
+	dfunc->vkCmdPipelineBarrier (packet->cmd, stages.src, stages.dst,
+								 0, 0, 0, 0, 0,
+								 1, &barrier);
+
+	VkBufferImageCopy copy = {
+		packet->offset, 0, 0,
+		{VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 4},
+		{0, 0, 0}, {w, h, 1},
+	};
+	dfunc->vkCmdCopyBufferToImage (packet->cmd, packet->stage->buffer,
+								   skin->image,
+								   VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
+								   1, &copy);
+
+	if (mipLevels == 1) {
+		stages = imageLayoutTransitionStages[qfv_LT_TransferDst_to_ShaderReadOnly];
+		barrier=imageLayoutTransitionBarriers[qfv_LT_TransferDst_to_ShaderReadOnly];
+		barrier.image = skin->image;
+		barrier.subresourceRange.levelCount = VK_REMAINING_MIP_LEVELS;
+		barrier.subresourceRange.layerCount = VK_REMAINING_ARRAY_LAYERS;
+		dfunc->vkCmdPipelineBarrier (packet->cmd, stages.src, stages.dst,
+									 0, 0, 0, 0, 0,
+									 1, &barrier);
+
+	} else {
+		QFV_GenerateMipMaps (device, packet->cmd, skin->image,
+							 mipLevels, w, h, 4);
 	}
-	if (Skin_CalcTopColors (tskin, tskin + skinsize, skinsize)) {
-		skin->colora = Vulkan_LoadTex (ctx, &skin_tex, 1,
-									   va (ctx->va_ctx, "%s:%d:%d:colora",
-										   alias_ctx->mod->name, snum, gnum));
-		Skin_ClearTopColors (tskin, tskin, skinsize);
-	}
-	if (Skin_CalcBottomColors (tskin, tskin + skinsize, skinsize)) {
-		skin->colorb = Vulkan_LoadTex (ctx, &skin_tex, 1,
-									   va (ctx->va_ctx, "%s:%d:%d:colorb",
-										   alias_ctx->mod->name, snum, gnum));
-		Skin_ClearBottomColors (tskin, tskin, skinsize);
-	}
-	skin_tex.data = tskin;
-	skin->tex = Vulkan_LoadTex (ctx, &skin_tex, 1,
-								va (ctx->va_ctx, "%s:%d:%d:tex",
-									alias_ctx->mod->name,
-									snum, gnum));
+	QFV_PacketSubmit (packet);
+	QFV_DestroyStagingBuffer (stage);
 
 	free (tskin);
 
diff --git a/libs/video/renderer/vulkan/alias.frag b/libs/video/renderer/vulkan/alias.frag
index eff6ff10a..bff1b87dd 100644
--- a/libs/video/renderer/vulkan/alias.frag
+++ b/libs/video/renderer/vulkan/alias.frag
@@ -1,8 +1,5 @@
 #version 450
-layout (set = 0, binding = 2) uniform sampler2D Texture;
-layout (set = 0, binding = 3) uniform sampler2D GlowMap;
-layout (set = 0, binding = 4) uniform sampler2D ColorA;
-layout (set = 0, binding = 5) uniform sampler2D ColorB;
+layout (set = 0, binding = 2) uniform sampler2DArray Skin;
 /*
 layout (set = 2, binding = 0) uniform sampler2D Texture;
 layout (set = 2, binding = 1) uniform sampler2D GlowMap;
@@ -59,9 +56,9 @@ main (void)
 	vec4        c;
 	int         i;
 	vec3        light = vec3 (0);
-	c = texture (Texture, st);
-	c += texture (ColorA, st);
-	c += texture (ColorB, st);
+	c = texture (Skin, vec3 (st, 0));
+	c += texture (Skin, vec3 (st, 1));
+	c += texture (Skin, vec3 (st, 2));
 
 	if (MaxLights > 0) {
 		for (i = 0; i < light_count; i++) {
@@ -70,7 +67,7 @@ main (void)
 	}
 	c *= vec4 (light, 1);
 
-	c += texture (GlowMap, st);
+	c += texture (Skin, vec3 (st, 3));
 	//frag_color = vec4((normal + 1)/2, 1);
 	frag_color = c;//fogBlend (c);
 }
diff --git a/libs/video/renderer/vulkan/qfpipeline.plist b/libs/video/renderer/vulkan/qfpipeline.plist
index 3cbf8db5e..5d44ec6ff 100644
--- a/libs/video/renderer/vulkan/qfpipeline.plist
+++ b/libs/video/renderer/vulkan/qfpipeline.plist
@@ -172,24 +172,6 @@
 					descriptorCount = 1;
 					stageFlags = fragment;
 				},
-				{
-					binding = 3;
-					descriptorType = combined_image_sampler;
-					descriptorCount = 1;
-					stageFlags = fragment;
-				},
-				{
-					binding = 4;
-					descriptorType = combined_image_sampler;
-					descriptorCount = 1;
-					stageFlags = fragment;
-				},
-				{
-					binding = 5;
-					descriptorType = combined_image_sampler;
-					descriptorCount = 1;
-					stageFlags = fragment;
-				},
 			);
 		};
 		alias.matrices = {
diff --git a/libs/video/renderer/vulkan/vulkan_alias.c b/libs/video/renderer/vulkan/vulkan_alias.c
index fec2d2cd6..d7f933cb9 100644
--- a/libs/video/renderer/vulkan/vulkan_alias.c
+++ b/libs/video/renderer/vulkan/vulkan_alias.c
@@ -88,7 +88,7 @@ Vulkan_DrawAlias (entity_t *ent, struct vulkan_ctx_s *ctx)
 	aliashdr_t *hdr;
 	qfv_alias_mesh_t *mesh;
 	float       blend;
-	aliasskin_t *skin;
+	qfv_tex_t  *skin;
 
 	if (!(hdr = model->aliashdr)) {
 		hdr = Cache_Get (&model->cache);
@@ -102,7 +102,7 @@ Vulkan_DrawAlias (entity_t *ent, struct vulkan_ctx_s *ctx)
 	} else {
 		maliasskindesc_t *skindesc;
 		skindesc = R_AliasGetSkindesc (ent->skinnum, hdr);
-		skin = (aliasskin_t *) ((byte *) hdr + skindesc->skin);
+		skin = (qfv_tex_t *) ((byte *) hdr + skindesc->skin);
 	}
 
 	VkDeviceSize offsets[] = {
@@ -124,12 +124,7 @@ Vulkan_DrawAlias (entity_t *ent, struct vulkan_ctx_s *ctx)
 	dfunc->vkCmdPushConstants (aframe->cmd, actx->layout,
 							   VK_SHADER_STAGE_VERTEX_BIT,
 							   64, sizeof (float), &blend);
-	aframe->imageInfo[0].imageView = get_view (skin->tex, ctx->default_white);
-	aframe->imageInfo[1].imageView = get_view (skin->glow, ctx->default_black);
-	aframe->imageInfo[2].imageView = get_view (skin->colora,
-											   ctx->default_black);
-	aframe->imageInfo[3].imageView = get_view (skin->colorb,
-											   ctx->default_black);
+	aframe->imageInfo[0].imageView = get_view (skin, 0);
 	dfunc->vkCmdPushDescriptorSetKHR (aframe->cmd,
 									  VK_PIPELINE_BIND_POINT_GRAPHICS,
 									  actx->layout,

From d6b678ac78785f8df92fabee0dbf3993e5c77769 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 2 Feb 2021 19:53:36 +0900
Subject: [PATCH 1400/1519] [vulkan] Implement team colors

It's not quite as expected, but that may be due to one of msaa, the 0-15
range in the palette not being all the way to white, the color gradients
being not quite linear (haven't checked yet) or some combination of the
above. However, it's that what should be yellow is more green. At least
the zombies are no longer white and the ogres don't look like they're
wearing skeleton suits.
---
 include/QF/Vulkan/qf_alias.h                |  8 +++++
 libs/models/alias/vulkan_model_alias.c      | 10 +++---
 libs/video/renderer/vulkan/alias.frag       | 11 ++++---
 libs/video/renderer/vulkan/qfpipeline.plist |  4 +--
 libs/video/renderer/vulkan/vulkan_alias.c   | 34 +++++++++------------
 5 files changed, 36 insertions(+), 31 deletions(-)

diff --git a/include/QF/Vulkan/qf_alias.h b/include/QF/Vulkan/qf_alias.h
index 6f96e0fa0..714cb06b3 100644
--- a/include/QF/Vulkan/qf_alias.h
+++ b/include/QF/Vulkan/qf_alias.h
@@ -53,6 +53,14 @@ typedef struct qfv_alias_mesh_s {
 	VkDeviceMemory memory;
 } qfv_alias_mesh_t;
 
+typedef struct qfv_alias_skin_s {
+	VkDeviceMemory memory;
+	VkImage     image;
+	VkImageView view;
+	byte        colora[4];
+	byte        colorb[4];
+} qfv_alias_skin_t;
+
 typedef struct qfv_light_s {
 	vec3_t      color;
 	float       dist;
diff --git a/libs/models/alias/vulkan_model_alias.c b/libs/models/alias/vulkan_model_alias.c
index 5b3ce995c..fd1f8c731 100644
--- a/libs/models/alias/vulkan_model_alias.c
+++ b/libs/models/alias/vulkan_model_alias.c
@@ -67,7 +67,7 @@ skin_clear (int skin_offset, aliashdr_t *hdr, vulkan_ctx_t *ctx)
 {
 	qfv_device_t *device = ctx->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
-	qfv_tex_t  *skin = (qfv_tex_t *) ((byte *) hdr + skin_offset);
+	qfv_alias_skin_t *skin = (qfv_alias_skin_t *) ((byte *) hdr + skin_offset);
 
 	dfunc->vkDestroyImageView (device->dev, skin->view, 0);
 	dfunc->vkDestroyImage (device->dev, skin->image, 0);
@@ -115,11 +115,13 @@ Vulkan_Mod_LoadSkin (mod_alias_ctx_t *alias_ctx, byte *skinpix, int skinsize,
 	qfv_device_t *device = ctx->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
 	aliashdr_t *header = alias_ctx->header;
-	qfv_tex_t  *skin;
+	qfv_alias_skin_t *skin;
 	byte       *tskin;
 	int         w, h;
 
-	skin = Hunk_Alloc (sizeof (qfv_tex_t));
+	skin = Hunk_Alloc (sizeof (qfv_alias_skin_t));
+	QuatCopy (vid.palette32 + (TOP_RANGE + 15) * 4, skin->colora);
+	QuatCopy (vid.palette32 + (BOTTOM_RANGE + 15) * 4, skin->colorb);
 	skindesc->skin = (byte *) skin - (byte *) header;
 	//FIXME move all skins into arrays(?)
 	w = header->mdl.skinwidth;
@@ -130,7 +132,6 @@ Vulkan_Mod_LoadSkin (mod_alias_ctx_t *alias_ctx, byte *skinpix, int skinsize,
 
 	int         mipLevels = QFV_MipLevels (w, h);
 	VkExtent3D  extent = { w, h, 1 };
-	skin->offset = 0;
 	skin->image = QFV_CreateImage (device, 0, VK_IMAGE_TYPE_2D,
 								   VK_FORMAT_R8G8B8A8_UNORM, extent,
 								   mipLevels, 4, VK_SAMPLE_COUNT_1_BIT,
@@ -212,7 +213,6 @@ Vulkan_Mod_LoadSkin (mod_alias_ctx_t *alias_ctx, byte *skinpix, int skinsize,
 		dfunc->vkCmdPipelineBarrier (packet->cmd, stages.src, stages.dst,
 									 0, 0, 0, 0, 0,
 									 1, &barrier);
-
 	} else {
 		QFV_GenerateMipMaps (device, packet->cmd, skin->image,
 							 mipLevels, w, h, 4);
diff --git a/libs/video/renderer/vulkan/alias.frag b/libs/video/renderer/vulkan/alias.frag
index bff1b87dd..3b5c9fddd 100644
--- a/libs/video/renderer/vulkan/alias.frag
+++ b/libs/video/renderer/vulkan/alias.frag
@@ -23,7 +23,10 @@ layout (set = 0, binding = 1) uniform Lights {
 };
 
 layout (push_constant) uniform PushConstants {
-	layout (offset = 80)
+	layout (offset = 68)
+	uint        base_color;
+	uint        colorA;
+	uint        colorB;
 	vec4        fog;
 	vec4        color;
 };
@@ -56,9 +59,9 @@ main (void)
 	vec4        c;
 	int         i;
 	vec3        light = vec3 (0);
-	c = texture (Skin, vec3 (st, 0));
-	c += texture (Skin, vec3 (st, 1));
-	c += texture (Skin, vec3 (st, 2));
+	c = texture (Skin, vec3 (st, 0)) * unpackUnorm4x8(base_color);
+	c += texture (Skin, vec3 (st, 1)) * unpackUnorm4x8(colorA);
+	c += texture (Skin, vec3 (st, 2)) * unpackUnorm4x8(colorB);
 
 	if (MaxLights > 0) {
 		for (i = 0; i < light_count; i++) {
diff --git a/libs/video/renderer/vulkan/qfpipeline.plist b/libs/video/renderer/vulkan/qfpipeline.plist
index 5d44ec6ff..33bc11b27 100644
--- a/libs/video/renderer/vulkan/qfpipeline.plist
+++ b/libs/video/renderer/vulkan/qfpipeline.plist
@@ -271,8 +271,8 @@
 				},
 				{
 					stageFlags = fragment;
-					offset = 80;
-					size = "2 * 4 * 4";
+					offset = 68;
+					size = "3 * 4 + 2 * 4 * 4";
 				},
 			);
 		};
diff --git a/libs/video/renderer/vulkan/vulkan_alias.c b/libs/video/renderer/vulkan/vulkan_alias.c
index d7f933cb9..76f4ac7b5 100644
--- a/libs/video/renderer/vulkan/vulkan_alias.c
+++ b/libs/video/renderer/vulkan/vulkan_alias.c
@@ -65,18 +65,6 @@
 #include "vid_vulkan.h"
 #include "vkparse.h"
 
-static VkImageView
-get_view (qfv_tex_t *tex, qfv_tex_t *default_tex)
-{
-	if (tex) {
-		return tex->view;
-	}
-	if (default_tex) {
-		return default_tex->view;
-	}
-	return 0;
-}
-
 void
 Vulkan_DrawAlias (entity_t *ent, struct vulkan_ctx_s *ctx)
 {
@@ -87,23 +75,28 @@ Vulkan_DrawAlias (entity_t *ent, struct vulkan_ctx_s *ctx)
 	model_t    *model = ent->model;
 	aliashdr_t *hdr;
 	qfv_alias_mesh_t *mesh;
-	float       blend;
-	qfv_tex_t  *skin;
+	qfv_alias_skin_t *skin;
+	float       vertex_constants[17];
+	byte        fragment_constants[3][4];
 
 	if (!(hdr = model->aliashdr)) {
 		hdr = Cache_Get (&model->cache);
 	}
 	mesh = (qfv_alias_mesh_t *) ((byte *) hdr + hdr->commands);
 
-	blend = R_AliasGetLerpedFrames (ent, hdr);
+	memcpy (vertex_constants, ent->transform, sizeof (ent->transform));
+	vertex_constants[16] = R_AliasGetLerpedFrames (ent, hdr);
 
 	if (0/*XXX ent->skin && ent->skin->tex*/) {
 		//skin = ent->skin->tex;
 	} else {
 		maliasskindesc_t *skindesc;
 		skindesc = R_AliasGetSkindesc (ent->skinnum, hdr);
-		skin = (qfv_tex_t *) ((byte *) hdr + skindesc->skin);
+		skin = (qfv_alias_skin_t *) ((byte *) hdr + skindesc->skin);
 	}
+	QuatScale (ent->colormod, 255, fragment_constants[0]);
+	QuatCopy (skin->colora, fragment_constants[1]);
+	QuatCopy (skin->colorb, fragment_constants[2]);
 
 	VkDeviceSize offsets[] = {
 		ent->pose1 * hdr->poseverts * sizeof (aliasvrt_t),
@@ -120,11 +113,12 @@ Vulkan_DrawAlias (entity_t *ent, struct vulkan_ctx_s *ctx)
 								 VK_INDEX_TYPE_UINT32);
 	dfunc->vkCmdPushConstants (aframe->cmd, actx->layout,
 							   VK_SHADER_STAGE_VERTEX_BIT,
-							   0, 16 * sizeof (float), ent->transform);
+							   0, sizeof (vertex_constants), vertex_constants);
 	dfunc->vkCmdPushConstants (aframe->cmd, actx->layout,
-							   VK_SHADER_STAGE_VERTEX_BIT,
-							   64, sizeof (float), &blend);
-	aframe->imageInfo[0].imageView = get_view (skin, 0);
+							   VK_SHADER_STAGE_FRAGMENT_BIT,
+							   68, sizeof (fragment_constants),
+							   fragment_constants);
+	aframe->imageInfo[0].imageView = skin->view;
 	dfunc->vkCmdPushDescriptorSetKHR (aframe->cmd,
 									  VK_PIPELINE_BIND_POINT_GRAPHICS,
 									  actx->layout,

From 22fe49d0ef9fe3fa2f036cb795cc7322594f4dfb Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 18 Feb 2013 15:26:28 +0900
Subject: [PATCH 1401/1519] Add support for loading an alternative palette.

Sort of at the request of leileilol (a utility to create quakepal.py was
asked for, but this seems to be better approach). However, the feature is
not used yet (needs hooks in the import and export modules).
---
 tools/io_mesh_qfmdl/quakepal.py | 45 ++++++++++++++++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

diff --git a/tools/io_mesh_qfmdl/quakepal.py b/tools/io_mesh_qfmdl/quakepal.py
index da7e4adec..7c2a6678f 100644
--- a/tools/io_mesh_qfmdl/quakepal.py
+++ b/tools/io_mesh_qfmdl/quakepal.py
@@ -1,4 +1,27 @@
-palette = (
+# vim:ts=4:et
+# ##### BEGIN GPL LICENSE BLOCK #####
+#
+#  This program is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License
+#  as published by the Free Software Foundation; either version 2
+#  of the License, or (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software Foundation,
+#  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# ##### END GPL LICENSE BLOCK #####
+
+# <pep8 compliant>
+
+from struct import unpack
+
+default_palette = (
     (0x00, 0x00, 0x00),
     (0x0f, 0x0f, 0x0f),
     (0x1f, 0x1f, 0x1f),
@@ -256,3 +279,23 @@ palette = (
     (0xff, 0xff, 0xff),
     (0x9f, 0x5b, 0x53),
 )
+
+palette = default_palette
+
+def load_palette(filepath):
+    if not filepath:
+        palette = default_palette
+    else:
+        try:
+            f = open(filepath, "rb")
+            pal = f.read(768)
+            if len(pal) < 768:
+                pal = pal + b'\0' * (768 - len(pal))
+            palette = []
+            for i in range(256):
+                palette.append(unpack("<3B", pal[i * 3 : i * 3 + 3]))
+            palette = tuple(palette)
+        except IOError:
+            palette = default_palette
+            return None
+    return palette

From ebb73e19b2309e0e5025215d99a7a267d4880c16 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 3 Feb 2021 00:08:33 +0900
Subject: [PATCH 1402/1519] [vulkan] Use the msaaSamples cvar

That took a bit of fiddling with the render pass to get things working
for both sampling and no sampling (ie, msaaSamples = 1).
---
 libs/video/renderer/vid_render_vulkan.c       | 16 ++--
 libs/video/renderer/vulkan/qfpipeline.plist   | 76 +++++++++++++++++--
 libs/video/renderer/vulkan/renderpass.c       | 10 ++-
 .../video/renderer/vulkan/vulkan_vid_common.c | 25 +++---
 4 files changed, 100 insertions(+), 27 deletions(-)

diff --git a/libs/video/renderer/vid_render_vulkan.c b/libs/video/renderer/vid_render_vulkan.c
index 8441795c1..ebca7b9b0 100644
--- a/libs/video/renderer/vid_render_vulkan.c
+++ b/libs/video/renderer/vid_render_vulkan.c
@@ -135,12 +135,15 @@ vulkan_R_RenderFrame (SCR_Func scr_3dfunc, SCR_Func *scr_funcs)
 						  framebuffer->imageAvailableSemaphore,
 						  0, &imageIndex);
 
-	__auto_type attachments = DARRAY_ALLOCFIXED (qfv_imageviewset_t, 3,
-												 alloca);
+	int         attachCount = vulkan_ctx->msaaSamples > 1 ? 3 : 2;
+	__auto_type attachments = DARRAY_ALLOCFIXED (qfv_imageviewset_t,
+												 attachCount, alloca);
 	qfv_swapchain_t *sc = vulkan_ctx->swapchain;
-	attachments->a[0] = vulkan_ctx->renderpass.colorImage->view;
+	attachments->a[0] = sc->imageViews->a[imageIndex];
 	attachments->a[1] = vulkan_ctx->renderpass.depthImage->view;
-	attachments->a[2] = sc->imageViews->a[imageIndex];
+	if (attachCount > 2) {
+		attachments->a[2] = vulkan_ctx->renderpass.colorImage->view;
+	}
 
 	VkRenderPass renderpass = vulkan_ctx->renderpass.renderpass;
 	framebuffer->framebuffer = QFV_CreateFramebuffer (device, renderpass,
@@ -157,15 +160,16 @@ vulkan_R_RenderFrame (SCR_Func scr_3dfunc, SCR_Func *scr_funcs)
 
 	VkCommandBufferBeginInfo beginInfo
 		= { VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO };
-	VkClearValue clearValues[2] = {
+	VkClearValue clearValues[3] = {
 		{ { {0.0, 0.0, 0.0, 1.0} } },
 		{ { {1.0, 0.0} } },
+		{ { {0.0, 0.0, 0.0, 1.0} } },
 	};
 	VkRenderPassBeginInfo renderPassInfo = {
 		VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO, 0,
 		vulkan_ctx->renderpass.renderpass, 0,
 		{ {0, 0}, sc->extent },
-		2, clearValues
+		3, clearValues
 	};
 
 	dfunc->vkBeginCommandBuffer (framebuffer->cmdBuffer, &beginInfo);
diff --git a/libs/video/renderer/vulkan/qfpipeline.plist b/libs/video/renderer/vulkan/qfpipeline.plist
index 33bc11b27..96de769c9 100644
--- a/libs/video/renderer/vulkan/qfpipeline.plist
+++ b/libs/video/renderer/vulkan/qfpipeline.plist
@@ -707,13 +707,75 @@
 			{
 				flags = 0;
 				format = $swapchain.format;
-				samples = $msaaSamples;
+				samples = 1;
 				loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR;
 				storeOp = VK_ATTACHMENT_STORE_OP_STORE;
 				stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
 				stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
 				initialLayout = VK_IMAGE_LAYOUT_UNDEFINED;
-				finalLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
+				finalLayout = VK_IMAGE_LAYOUT_PRESENT_SRC_KHR;
+			},
+			{
+				flags = 0;
+				format = VK_FORMAT_D32_SFLOAT;
+				samples = 1;
+				loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR;
+				storeOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
+				stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
+				stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
+				initialLayout = VK_IMAGE_LAYOUT_UNDEFINED;
+				finalLayout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL;
+			},
+		);
+		subpasses = (
+			{
+				pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS;
+				colorAttachments = (
+					{
+						attachment = 0;
+						layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
+					}
+				);
+				depthStencilAttachment = {
+					attachment = 1;
+					layout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL;
+				};
+				preserveAttachments = ();
+			},
+		);
+		dependencies = (
+			{
+				srcSubpass = VK_SUBPASS_EXTERNAL;
+				dstSubpass = 0;
+				srcStageMask = VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT;
+				dstStageMask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
+				srcAccessMask = VK_ACCESS_MEMORY_READ_BIT;
+				dstAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT;
+				dependencyFlags = VK_DEPENDENCY_BY_REGION_BIT;
+			},
+			{
+				srcSubpass = 0;
+				dstSubpass = VK_SUBPASS_EXTERNAL;
+				srcStageMask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
+				dstStageMask = VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT;
+				srcAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT;
+				dstAccessMask = VK_ACCESS_MEMORY_READ_BIT;
+				dependencyFlags = VK_DEPENDENCY_BY_REGION_BIT;
+			},
+		);
+	};
+	renderpass.msaa = {
+		attachments = (
+			{
+				flags = 0;
+				format = $swapchain.format;
+				samples = VK_SAMPLE_COUNT_1_BIT;
+				loadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
+				storeOp = VK_ATTACHMENT_STORE_OP_STORE;
+				stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
+				stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
+				initialLayout = VK_IMAGE_LAYOUT_UNDEFINED;
+				finalLayout = VK_IMAGE_LAYOUT_PRESENT_SRC_KHR;
 			},
 			{
 				flags = 0;
@@ -729,13 +791,13 @@
 			{
 				flags = 0;
 				format = $swapchain.format;
-				samples = VK_SAMPLE_COUNT_1_BIT;
-				loadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
+				samples = $msaaSamples;
+				loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR;
 				storeOp = VK_ATTACHMENT_STORE_OP_STORE;
 				stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
 				stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
 				initialLayout = VK_IMAGE_LAYOUT_UNDEFINED;
-				finalLayout = VK_IMAGE_LAYOUT_PRESENT_SRC_KHR;
+				finalLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
 			},
 		);
 		subpasses = (
@@ -743,13 +805,13 @@
 				pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS;
 				colorAttachments = (
 					{
-						attachment = 0;
+						attachment = 2;
 						layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
 					}
 				);
 				resolveAttachments = (
 					{
-						attachment = 2;
+						attachment = 0;
 						layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
 					}
 				);
diff --git a/libs/video/renderer/vulkan/renderpass.c b/libs/video/renderer/vulkan/renderpass.c
index 65134ffd7..4970b050b 100644
--- a/libs/video/renderer/vulkan/renderpass.c
+++ b/libs/video/renderer/vulkan/renderpass.c
@@ -106,9 +106,13 @@ QFV_CreateRenderPass (qfv_device_t *device,
 				const VkAttachmentReference *ref = &sp->pColorAttachments[j];
 				Sys_Printf ("      c %d %d\n", ref->attachment, ref->layout);
 			}
-			for (size_t j = 0; j < sp->colorAttachmentCount; j++) {
-				const VkAttachmentReference *ref = &sp->pResolveAttachments[j];
-				Sys_Printf ("      r %d %d\n", ref->attachment, ref->layout);
+			if (sp->pResolveAttachments) {
+				for (size_t j = 0; j < sp->colorAttachmentCount; j++) {
+					const VkAttachmentReference *ref
+						= &sp->pResolveAttachments[j];
+					Sys_Printf ("      r %d %d\n", ref->attachment,
+								ref->layout);
+				}
 			}
 			Sys_Printf ("    pDepthStencilAttachment: %p\n",
 						sp->pDepthStencilAttachment);
diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c
index ddd20e82c..ff026331a 100644
--- a/libs/video/renderer/vulkan/vulkan_vid_common.c
+++ b/libs/video/renderer/vulkan/vulkan_vid_common.c
@@ -240,28 +240,31 @@ Vulkan_CreateRenderPass (vulkan_ctx_t *ctx)
 {
 	qfv_load_pipeline (ctx);
 	const char *name = "renderpass";//FIXME
-
-	plitem_t   *item = ctx->pipelineDef;
-	if (!item || !(item = PL_ObjectForKey (item, name))) {
-		Sys_Printf ("error loading renderpass\n");
-		return;
-	} else {
-		Sys_Printf ("Found renderpass def\n");
-	}
 	qfv_device_t *device = ctx->device;
 	VkDevice    dev = device->dev;
 	qfv_devfuncs_t *df = device->funcs;
 	VkCommandBuffer cmd = ctx->cmdbuffer;
 	qfv_swapchain_t *sc = ctx->swapchain;
 
+	ctx->msaaSamples = min ((VkSampleCountFlagBits) msaaSamples->int_val,
+							QFV_GetMaxSampleCount (device->physDev));
+	if (ctx->msaaSamples > 1) {
+		name = "renderpass.msaa";
+	}
+
+	plitem_t   *item = ctx->pipelineDef;
+	if (!item || !(item = PL_ObjectForKey (item, name))) {
+		Sys_Printf ("error loading renderpass: %s\n", name);
+		return;
+	} else {
+		Sys_Printf ("Found renderpass def: %s\n", name);
+	}
+
 	qfv_imageresource_t *colorImage = malloc (sizeof (*colorImage));
 	qfv_imageresource_t *depthImage = malloc (sizeof (*depthImage));
 
 	VkExtent3D extent = {sc->extent.width, sc->extent.height, 1};
 
-	//FIXME incorporate cvar setting
-	ctx->msaaSamples = QFV_GetMaxSampleCount (device->physDev);
-
 	Sys_MaskPrintf (SYS_VULKAN, "color resource\n");
 	colorImage->image
 		= QFV_CreateImage (device, 0, VK_IMAGE_TYPE_2D,

From bc7858bb87b7150077a77c8da2a562bd74bbc0f5 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 3 Feb 2021 11:41:38 +0900
Subject: [PATCH 1403/1519] [model] Move parent pointer out of leaf/node struct

The node struct was 72 bytes thus two cache line. Moving the pointer
into the brush model data block allows nodes to fit in a single cache
line (not that they're aligned yet, but that's next). It doesn't seem to
have made any difference to performance (at least in the vulkan
renderer), but it hasn't hurt, either, as the only place that needed the
parent pointer was R_MarkLeaves.
---
 include/QF/model.h              |  7 +++----
 libs/models/brush/model_brush.c | 17 +++++++++++------
 libs/video/renderer/r_bsp.c     | 16 +++++++++-------
 3 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/include/QF/model.h b/include/QF/model.h
index a05d489a4..b65a5ad18 100644
--- a/include/QF/model.h
+++ b/include/QF/model.h
@@ -179,8 +179,6 @@ typedef struct mnode_s {
 
 	float		minmaxs[6];		// for bounding box culling
 
-	struct mnode_s	*parent;
-
 // node specific
 	plane_t		*plane;
 	struct mnode_s	*children[2];
@@ -198,8 +196,6 @@ typedef struct mleaf_s {
 	float		mins[3];
 	float		maxs[3];
 
-	struct mnode_s	*parent;
-
 // leaf specific
 	byte		*compressed_vis;
 	efrag_t		*efrags;
@@ -274,6 +270,9 @@ typedef struct mod_brush_s {
 	byte		*lightdata;
 	char		*entities;	//FIXME should not be here
 
+	mnode_t    **node_parents;
+	mnode_t    **leaf_parents;
+
 	unsigned int checksum;
 	unsigned int checksum2;
 } mod_brush_t;
diff --git a/libs/models/brush/model_brush.c b/libs/models/brush/model_brush.c
index 8a703050d..b18de9076 100644
--- a/libs/models/brush/model_brush.c
+++ b/libs/models/brush/model_brush.c
@@ -585,13 +585,15 @@ Mod_LoadFaces (model_t *mod, bsp_t *bsp)
 }
 
 static void
-Mod_SetParent (mnode_t *node, mnode_t *parent)
+Mod_SetParent (mod_brush_t *brush, mnode_t *node, mnode_t *parent)
 {
-	node->parent = parent;
-	if (node->contents < 0)
+	if (node->contents < 0) {
+		brush->leaf_parents[(mleaf_t *)node - brush->leafs] = parent;
 		return;
-	Mod_SetParent (node->children[0], node);
-	Mod_SetParent (node->children[1], node);
+	}
+	brush->node_parents[node - brush->nodes] = parent;
+	Mod_SetParent (brush, node->children[0], node);
+	Mod_SetParent (brush, node->children[1], node);
 }
 
 static void
@@ -646,7 +648,10 @@ Mod_LoadNodes (model_t *mod, bsp_t *bsp)
 		}
 	}
 
-	Mod_SetParent (brush->nodes, NULL);	// sets nodes and leafs
+	size_t      size = (brush->numleafs + brush->numnodes) * sizeof (mnode_t *);
+	brush->node_parents = Hunk_AllocName (size, mod->name);
+	brush->leaf_parents = brush->node_parents + brush->numnodes;
+	Mod_SetParent (brush, brush->nodes, NULL);	// sets nodes and leafs
 }
 
 static void
diff --git a/libs/video/renderer/r_bsp.c b/libs/video/renderer/r_bsp.c
index 2475873a5..47b78a643 100644
--- a/libs/video/renderer/r_bsp.c
+++ b/libs/video/renderer/r_bsp.c
@@ -54,6 +54,7 @@ R_MarkLeaves (void)
 	mleaf_t     *leaf;
 	mnode_t     *node;
 	msurface_t **mark;
+	mod_brush_t *brush = &r_worldentity.model->brush;
 
 	if (r_oldviewleaf == r_viewleaf && !r_novis->int_val)
 		return;
@@ -67,13 +68,13 @@ R_MarkLeaves (void)
 		r_oldviewleaf = 0;	// so vis will be recalcualted when novis gets
 							// turned off
 		vis = solid;
-		memset (solid, 0xff, (r_worldentity.model->brush.numleafs + 7) >> 3);
+		memset (solid, 0xff, (brush->numleafs + 7) >> 3);
 	} else
 		vis = Mod_LeafPVS (r_viewleaf, r_worldentity.model);
 
-	for (i = 0; (int) i < r_worldentity.model->brush.numleafs; i++) {
+	for (i = 0; (int) i < brush->numleafs; i++) {
 		if (vis[i >> 3] & (1 << (i & 7))) {
-			leaf = &r_worldentity.model->brush.leafs[i + 1];
+			leaf = &brush->leafs[i + 1];
 			if ((c = leaf->nummarksurfaces)) {
 				mark = leaf->firstmarksurface;
 				do {
@@ -81,13 +82,14 @@ R_MarkLeaves (void)
 					mark++;
 				} while (--c);
 			}
-			node = (mnode_t *) leaf;
-			do {
+			leaf->visframe = r_visframecount;
+			node = brush->leaf_parents[leaf - brush->leafs];
+			while (node) {
 				if (node->visframe == r_visframecount)
 					break;
 				node->visframe = r_visframecount;
-				node = node->parent;
-			} while (node);
+				node = brush->node_parents[node - brush->nodes];
+			}
 		}
 	}
 }

From 0bfb60775e204a5dedf3a1df8699d212f5c602ac Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 3 Feb 2021 13:19:19 +0900
Subject: [PATCH 1404/1519] [util] Ensure hunk allocs are cache alligned

This doesn't seem to make much difference in the vulkan renderer, but it
certainly doesn't hurt.
---
 include/QF/sys.h               |  3 ++-
 libs/audio/test/testsound.c    |  2 +-
 libs/util/sys.c                | 14 ++++++++++++--
 libs/util/zone.c               | 10 ++++++----
 nq/source/host.c               |  2 +-
 qtv/source/qtv.c               |  2 +-
 qw/source/cl_main.c            |  2 +-
 qw/source/sv_demo.c            |  2 +-
 qw/source/sv_main.c            |  2 +-
 ruamoko/qwaq/builtins/main.c   |  2 +-
 ruamoko/qwaq/builtins/qwaq.c   |  2 +-
 tools/bsp2img/bsp2img.c        |  2 +-
 tools/qfcc/test/test-harness.c |  2 +-
 tools/qflmp/lmp.c              |  2 +-
 tools/wad/wad.c                |  2 +-
 15 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/include/QF/sys.h b/include/QF/sys.h
index 8d32d14e2..58aa08b76 100644
--- a/include/QF/sys.h
+++ b/include/QF/sys.h
@@ -122,7 +122,8 @@ void Sys_Init_Cvars (void);
 // memory protection
 //
 void Sys_MakeCodeWriteable (uintptr_t startaddr, size_t length);
-void Sys_PageIn (void *ptr, int size);
+void Sys_PageIn (void *ptr, size_t size);
+void *Sys_Alloc (size_t size);
 
 //
 // system IO
diff --git a/libs/audio/test/testsound.c b/libs/audio/test/testsound.c
index f4518d7ac..698fc40ec 100644
--- a/libs/audio/test/testsound.c
+++ b/libs/audio/test/testsound.c
@@ -68,7 +68,7 @@ init (void)
 	COM_ParseConfig ();
 	Cvar_Get ("cmd_warncmd", "1", CVAR_NONE, NULL, NULL);
 
-	Memory_Init (malloc (MEMSIZE), MEMSIZE);
+	Memory_Init (Sys_Alloc (MEMSIZE), MEMSIZE);
 
 	QFS_Init ("qw");
 	PI_Init ();
diff --git a/libs/util/sys.c b/libs/util/sys.c
index 7e09b4f91..db0777f07 100644
--- a/libs/util/sys.c
+++ b/libs/util/sys.c
@@ -612,11 +612,11 @@ Sys_TimeID (void) //FIXME I need a new name, one that doesn't make me feel 3 fee
 }
 
 VISIBLE void
-Sys_PageIn (void *ptr, int size)
+Sys_PageIn (void *ptr, size_t size)
 {
 //may or may not be useful in linux #ifdef _WIN32
 	byte       *x;
-	int         m, n;
+	size_t      m, n;
 
 	// touch all the memory to make sure it's there. The 16-page skip is to
 	// keep Win 95 from thinking we're trying to page ourselves in (we are
@@ -632,6 +632,16 @@ Sys_PageIn (void *ptr, int size)
 //#endif
 }
 
+VISIBLE void *
+Sys_Alloc (size_t size)
+{
+	size_t      page_size = sysconf (_SC_PAGESIZE);
+	size_t      page_mask = page_size - 1;
+	size = (size + page_mask) & ~page_mask;
+	return mmap (0, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS,
+				 -1, 0);
+}
+
 VISIBLE void
 Sys_DebugLog (const char *file, const char *fmt, ...)
 {
diff --git a/libs/util/zone.c b/libs/util/zone.c
index f52226d55..fdd440764 100644
--- a/libs/util/zone.c
+++ b/libs/util/zone.c
@@ -56,6 +56,7 @@ static qboolean Cache_FreeLRU (void);
 #define	HUNK_SENTINAL	0x1df001ed
 
 #define MINFRAGMENT	64
+#define HUNK_ALIGN 64
 
 /*
    						ZONE MEMORY ALLOCATION
@@ -413,6 +414,7 @@ typedef struct {
 	int         sentinal;
 	int         size;			// including sizeof(hunk_t), -1 = not allocated
 	char        name[8];
+	char        fill[48];		// pad out to 64 bytes
 } hunk_t;
 
 byte       *hunk_base;
@@ -551,7 +553,7 @@ Hunk_AllocName (int size, const char *name)
 	if (size < 0)
 		Sys_Error ("Hunk_Alloc: bad size: %i", size);
 
-	size = sizeof (hunk_t) + ((size + 15) & ~15);
+	size = sizeof (hunk_t) + ((size + HUNK_ALIGN - 1) & ~(HUNK_ALIGN - 1));
 
 	if (hunk_size - hunk_low_used - hunk_high_used < size) {
 		Hunk_HighMark();
@@ -618,7 +620,7 @@ Hunk_HighAlloc (int size)
 	Hunk_Check ();
 #endif
 
-	size = ((size + 15) & ~15);
+	size = ((size + HUNK_ALIGN - 1) & ~(HUNK_ALIGN - 1));
 
 	if (hunk_size - hunk_low_used - hunk_high_used < size) {
 		Sys_Printf ("Hunk_HighAlloc: failed on %i bytes\n", size);
@@ -640,7 +642,7 @@ Hunk_TempAlloc (int size)
 {
 	void       *buf;
 
-	size = (size + 15) & ~15;
+	size = (size + HUNK_ALIGN - 1) & ~(HUNK_ALIGN - 1);
 
 	if (hunk_tempactive) {
 		if (hunk_high_used - hunk_tempmark >= size + (int) sizeof (hunk_t)) {
@@ -1009,7 +1011,7 @@ Cache_Alloc (cache_user_t *c, int size, const char *name)
 	if (size <= 0)
 		Sys_Error ("Cache_Alloc: size %i", size);
 
-	size = (size + sizeof (cache_system_t) + 15) & ~15;
+	size = (size + sizeof (cache_system_t) + HUNK_ALIGN - 1) & ~(HUNK_ALIGN-1);
 
 	// find memory for it
 	while (1) {
diff --git a/nq/source/host.c b/nq/source/host.c
index 65266f801..dba8202e4 100644
--- a/nq/source/host.c
+++ b/nq/source/host.c
@@ -859,7 +859,7 @@ Host_Init_Memory (void)
 		Sys_Error ("Only %4.1f megs of memory reported, can't execute game",
 				   mem_size / (float) 0x100000);
 
-	mem_base = malloc (mem_size);
+	mem_base = Sys_Alloc (mem_size);
 
 	if (!mem_base)
 		Sys_Error ("Can't allocate %d", mem_size);
diff --git a/qtv/source/qtv.c b/qtv/source/qtv.c
index 513bb069e..049f0a568 100644
--- a/qtv/source/qtv.c
+++ b/qtv/source/qtv.c
@@ -214,7 +214,7 @@ qtv_memory_init (void)
 
 	Cvar_SetFlags (qtv_mem_size, qtv_mem_size->flags | CVAR_ROM);
 	mem_size = (int) (qtv_mem_size->value * 1024 * 1024);
-	mem_base = malloc (mem_size);
+	mem_base = Sys_Alloc (mem_size);
 	if (!mem_base)
 		Sys_Error ("Can't allocate %d", mem_size);
 	Memory_Init (mem_base, mem_size);
diff --git a/qw/source/cl_main.c b/qw/source/cl_main.c
index d9ee07b56..5fcf0364e 100644
--- a/qw/source/cl_main.c
+++ b/qw/source/cl_main.c
@@ -1756,7 +1756,7 @@ CL_Init_Memory (void)
 		Sys_Error ("Only %4.1f megs of memory reported, can't execute game",
 				   mem_size / (float) 0x100000);
 
-	mem_base = malloc (mem_size);
+	mem_base = Sys_Alloc (mem_size);
 
 	if (!mem_base)
 		Sys_Error ("Can't allocate %d", mem_size);
diff --git a/qw/source/sv_demo.c b/qw/source/sv_demo.c
index b13135c93..1018ecb6c 100644
--- a/qw/source/sv_demo.c
+++ b/qw/source/sv_demo.c
@@ -774,7 +774,7 @@ Demo_Init (void)
 		if (p < com_argc - 1)
 			size = atoi (com_argv[p + 1]) * 1024;
 		else
-			Sys_Error ("Memory_Init: you must specify a size in KB after "
+			Sys_Error ("Demo_Init: you must specify a size in KB after "
 					   "-democache");
 	}
 
diff --git a/qw/source/sv_main.c b/qw/source/sv_main.c
index 0156d689a..d91a24832 100644
--- a/qw/source/sv_main.c
+++ b/qw/source/sv_main.c
@@ -2470,7 +2470,7 @@ SV_Init_Memory (void)
 		Sys_Error ("Only %4.1f megs of memory reported, can't execute game",
 				   mem_size / (float) 0x100000);
 
-	mem_base = malloc (mem_size);
+	mem_base = Sys_Alloc (mem_size);
 
 	if (!mem_base)
 		Sys_Error ("Can't allocate %d", mem_size);
diff --git a/ruamoko/qwaq/builtins/main.c b/ruamoko/qwaq/builtins/main.c
index dbafed33f..f8800df93 100644
--- a/ruamoko/qwaq/builtins/main.c
+++ b/ruamoko/qwaq/builtins/main.c
@@ -136,7 +136,7 @@ init_qf (void)
 
 	//Cvar_Set (developer, "1");
 
-	Memory_Init (malloc (8 * 1024 * 1024), 8 * 1024 * 1024);
+	Memory_Init (Sys_Alloc (8 * 1024 * 1024), 8 * 1024 * 1024);
 
 	Cvar_Get ("pr_debug", "2", 0, 0, 0);
 	Cvar_Get ("pr_boundscheck", "0", 0, 0, 0);
diff --git a/ruamoko/qwaq/builtins/qwaq.c b/ruamoko/qwaq/builtins/qwaq.c
index f74b429cf..c1733ae0e 100644
--- a/ruamoko/qwaq/builtins/qwaq.c
+++ b/ruamoko/qwaq/builtins/qwaq.c
@@ -114,7 +114,7 @@ init_qf (void)
 
 	//Cvar_Set (developer, "1");
 
-	Memory_Init (malloc (8 * 1024 * 1024), 8 * 1024 * 1024);
+	Memory_Init (Sys_Alloc (8 * 1024 * 1024), 8 * 1024 * 1024);
 
 	Cvar_Get ("pr_debug", "2", 0, 0, 0);
 	Cvar_Get ("pr_boundscheck", "0", 0, 0, 0);
diff --git a/tools/bsp2img/bsp2img.c b/tools/bsp2img/bsp2img.c
index 7b95c35a6..bf99eea67 100644
--- a/tools/bsp2img/bsp2img.c
+++ b/tools/bsp2img/bsp2img.c
@@ -925,7 +925,7 @@ write_pcx (image_t *image)
 
 	Sys_Init ();
 
-	Memory_Init (malloc (MEMSIZE), MEMSIZE);
+	Memory_Init (Sys_Alloc (MEMSIZE), MEMSIZE);
 	pcx = EncodePCX (image->image, image->width, image->height,
 					 image->width, palette, false, &pcx_len);
 	if (Qwrite (outfile, pcx, pcx_len) != pcx_len) {
diff --git a/tools/qfcc/test/test-harness.c b/tools/qfcc/test/test-harness.c
index ba9759c19..69de8c47b 100644
--- a/tools/qfcc/test/test-harness.c
+++ b/tools/qfcc/test/test-harness.c
@@ -134,7 +134,7 @@ init_qf (void)
 	Sys_Init ();
 	Cvar_Get ("developer", va ("%d", options.developer), 0, 0, 0);
 
-	Memory_Init (malloc (1024 * 1024), 1024 * 1024);
+	Memory_Init (Sys_Alloc (1024 * 1024), 1024 * 1024);
 
 	cvar_t *debug = Cvar_Get ("pr_debug", "2", 0, 0, 0);
 	Cvar_Get ("pr_boundscheck", "2", 0, 0, 0);
diff --git a/tools/qflmp/lmp.c b/tools/qflmp/lmp.c
index 1840ce328..06a77e370 100644
--- a/tools/qflmp/lmp.c
+++ b/tools/qflmp/lmp.c
@@ -334,7 +334,7 @@ main (int argc, char **argv)
 	this_program = argv[0];
 
 	Sys_Init ();
-	Memory_Init (malloc (MEMSIZE), MEMSIZE);
+	Memory_Init (Sys_Alloc (MEMSIZE), MEMSIZE);
 
 	decode_args (argc, argv);
 
diff --git a/tools/wad/wad.c b/tools/wad/wad.c
index a1caf6fc9..08abf6d81 100644
--- a/tools/wad/wad.c
+++ b/tools/wad/wad.c
@@ -396,7 +396,7 @@ main (int argc, char **argv)
 	lumpinfo_t *pf;
 
 	Sys_Init ();
-	Memory_Init (malloc (MEMSIZE), MEMSIZE);
+	Memory_Init (Sys_Alloc (MEMSIZE), MEMSIZE);
 
 	this_program = argv[0];
 

From 5d1d85f72e09f1ee385559b1c6f32b167e46a705 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 3 Feb 2021 13:21:08 +0900
Subject: [PATCH 1405/1519] [util] Resurrect Hunk_Print and fix some errors

It turned out that Hunk_HighAlloc was not creating a hunk header
(ancient bug by me), and I cleaned up a bunch of name-size issues, along
the way.
---
 include/QF/zone.h |  1 +
 libs/util/zone.c  | 42 +++++++++++++++++++++++-------------------
 2 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/include/QF/zone.h b/include/QF/zone.h
index 10063b2cc..023ff07d6 100644
--- a/include/QF/zone.h
+++ b/include/QF/zone.h
@@ -105,6 +105,7 @@ void Z_SetError (memzone_t *zone, void (*err) (void *data, const char *msg),
 				 void *data);
 void Z_CheckPointer (const memzone_t *zone, const void *ptr, int size);
 
+void Hunk_Print (qboolean all);
 void *Hunk_Alloc (int size);		// returns 0 filled memory
 void *Hunk_AllocName (int size, const char *name);
 int	Hunk_LowMark (void) __attribute__((pure));
diff --git a/libs/util/zone.c b/libs/util/zone.c
index fdd440764..14ef0b503 100644
--- a/libs/util/zone.c
+++ b/libs/util/zone.c
@@ -438,7 +438,8 @@ Hunk_Check (void)
 	for (h = (hunk_t *) hunk_base; (byte *) h != hunk_base + hunk_low_used;) {
 		if (h->sentinal != HUNK_SENTINAL)
 			Sys_Error ("Hunk_Check: trashed sentinal");
-		if (h->size < 16 || h->size + (byte *) h - hunk_base > hunk_size)
+		if (h->size < (int) sizeof (hunk_t)
+			|| h->size + (byte *) h - hunk_base > hunk_size)
 			Sys_Error ("Hunk_Check: bad size");
 		h = (hunk_t *) ((byte *) h + h->size);
 	}
@@ -451,15 +452,13 @@ Hunk_Check (void)
 	Otherwise, allocations with the same name will be totaled up before
 	printing.
 */
-/*
-static void
+
+VISIBLE void
 Hunk_Print (qboolean all)
 {
-	char        name[9];
 	hunk_t     *h, *next, *endlow, *starthigh, *endhigh;
 	int         count, sum, totalblocks;
 
-	name[8] = 0;
 	count = 0;
 	sum = 0;
 	totalblocks = 0;
@@ -488,7 +487,8 @@ Hunk_Print (qboolean all)
 		// run consistancy checks
 		if (h->sentinal != HUNK_SENTINAL)
 			Sys_Error ("Hunk_Check: trahsed sentinal");
-		if (h->size < 16 || h->size + (byte *) h - hunk_base > hunk_size)
+		if (h->size < (int) sizeof (hunk_t)
+			|| h->size + (byte *) h - hunk_base > hunk_size)
 			Sys_Error ("Hunk_Check: bad size");
 
 		next = (hunk_t *) ((byte *) h + h->size);
@@ -497,15 +497,14 @@ Hunk_Print (qboolean all)
 		sum += h->size;
 
 		// print the single block
-		memcpy (name, h->name, 8);
 		if (all)
-			Sys_Printf ("%8p :%8i %8s\n", h, h->size, name);
+			Sys_Printf ("%8p :%8i %8.8s\n", h, h->size, h->name);
 
 		// print the total
 		if (next == endlow || next == endhigh ||
 			strncmp (h->name, next->name, 8)) {
 			if (!all)
-				Sys_Printf ("          :%8i %8s (TOTAL)\n", sum, name);
+				Sys_Printf ("          :%8i %8.8s (TOTAL)\n", sum, h->name);
 			count = 0;
 			sum = 0;
 		}
@@ -516,7 +515,7 @@ Hunk_Print (qboolean all)
 	Sys_Printf ("-------------------------\n");
 	Sys_Printf ("%8i total blocks\n", totalblocks);
 }
-*/
+
 static void
 Hunk_FreeToHighMark (int mark)
 {
@@ -579,8 +578,7 @@ Hunk_AllocName (int size, const char *name)
 
 	h->size = size;
 	h->sentinal = HUNK_SENTINAL;
-	memcpy (h->name, name, 8);
-	h->name[7] = 0;
+	memcpy (h->name, name, sizeof (h->name));
 
 	return (void *) (h + 1);
 }
@@ -609,6 +607,8 @@ Hunk_FreeToLowMark (int mark)
 static void *
 Hunk_HighAlloc (int size)
 {
+	hunk_t     *h;
+
 	if (size < 0)
 		Sys_Error ("Hunk_HighAlloc: bad size: %i", size);
 
@@ -620,7 +620,7 @@ Hunk_HighAlloc (int size)
 	Hunk_Check ();
 #endif
 
-	size = ((size + HUNK_ALIGN - 1) & ~(HUNK_ALIGN - 1));
+	size = sizeof (hunk_t) + ((size + HUNK_ALIGN - 1) & ~(HUNK_ALIGN - 1));
 
 	if (hunk_size - hunk_low_used - hunk_high_used < size) {
 		Sys_Printf ("Hunk_HighAlloc: failed on %i bytes\n", size);
@@ -629,7 +629,11 @@ Hunk_HighAlloc (int size)
 
 	hunk_high_used += size;
 
-	return (void *) (hunk_base + hunk_size - hunk_high_used);
+	h = (void *) (hunk_base + hunk_size - hunk_high_used);
+	h->sentinal = HUNK_SENTINAL;
+	h->size = size;
+	h->name[0] = 0;
+	return h + 1;
 }
 
 /*
@@ -744,7 +748,7 @@ static inline void
 Cache_UnlinkLRU (cache_system_t * cs)
 {
 	if (!cs->lru_next || !cs->lru_prev)
-		Sys_Error ("Cache_UnlinkLRU: NULL link: %s %p %p",
+		Sys_Error ("Cache_UnlinkLRU: NULL link: %.16s %p %p",
 				   cs->name, cs->lru_next, cs->lru_prev);
 
 	cs->lru_next->lru_prev = cs->lru_prev;
@@ -757,7 +761,7 @@ static void
 Cache_MakeLRU (cache_system_t * cs)
 {
 	if (cs->lru_next || cs->lru_prev)
-		Sys_Error ("Cache_MakeLRU: active link: %s %p %p",
+		Sys_Error ("Cache_MakeLRU: active link: %.16s %p %p",
 				   cs->name, cs->lru_next, cs->lru_prev);
 
 	cache_head.lru_next->lru_prev = cs;
@@ -896,7 +900,7 @@ Cache_Print (void)
 	cache_system_t *cd;
 
 	for (cd = cache_head.next; cd != &cache_head; cd = cd->next) {
-		Sys_Printf ("%8d : %s\n", (int) cd->size, cd->name);
+		Sys_Printf ("%8d : %.16s\n", (int) cd->size, cd->name);
 	}
 }
 
@@ -929,7 +933,7 @@ Cache_Flush (void)
 	while (cache_head.prev != &cache_head) {
 		if (!cache_head.prev->user->data)
 			Sys_Error ("Cache_Flush: user/system out of sync for "
-					   "'%s' with %d size",
+					   "'%.16s' with %d size",
 					   cache_head.prev->name, (int) cache_head.prev->size);
 		Cache_Free (cache_head.prev->user);	// reclaim the space
 	}
@@ -970,7 +974,7 @@ Cache_Free (cache_user_t *c)
 	if (cs->readlock)
 		Sys_Error ("Cache_Free: attempt to free locked block");
 
-	Sys_MaskPrintf (SYS_DEV, "Cache_Free: freeing '%s' %p\n", cs->name, cs);
+	Sys_MaskPrintf (SYS_DEV, "Cache_Free: freeing '%.16s' %p\n", cs->name, cs);
 
 	Cache_UnlinkLRU (cs);
 

From 846fcc276c68a6d6a01ff0b3697746e8b76c86e6 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 3 Feb 2021 18:24:15 +0900
Subject: [PATCH 1406/1519] [nq] Allow free-fps for demo playback

I still need to look into making physics (and network, I imagine) work
with unlimited frame rates, but this gets in what I need for now.
---
 nq/source/host.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nq/source/host.c b/nq/source/host.c
index dba8202e4..bb4721677 100644
--- a/nq/source/host.c
+++ b/nq/source/host.c
@@ -529,7 +529,7 @@ Host_FilterTime (float time)
 	//FIXME not having the framerate cap is nice, but it breaks net play
 	timedifference = (timescale / 72.0) - (realtime - oldrealtime);
 
-	if (!cls.timedemo && (timedifference > 0))
+	if (!cls.demoplayback && (timedifference > 0))
 		return timedifference;                   // framerate is too high
 
 	host_frametime = realtime - oldrealtime;
@@ -541,7 +541,7 @@ Host_FilterTime (float time)
 	if (host_framerate->value > 0)
 		host_frametime = host_framerate->value;
 	else	// don't allow really long or short frames
-		host_frametime = bound (0.001, host_frametime, 0.1);
+		host_frametime = bound (0.000, host_frametime, 0.1);
 
 	return 0;
 }

From d2536e584f112bdbfaf3e23002678c16832eab96 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 4 Feb 2021 16:58:13 +0900
Subject: [PATCH 1407/1519] [util] Add plist support to cexpr

This allows plist objects to be accessed directly from cexpr expressions
using struct.field syntax for dictionary objects and array[index] syntax
for array objects.
---
 include/QF/cexpr.h      |  1 +
 libs/util/cexpr-parse.y | 30 +++++++++++++++
 libs/util/cexpr-type.c  | 83 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 114 insertions(+)

diff --git a/include/QF/cexpr.h b/include/QF/cexpr.h
index 53fc159e7..f511b6a9c 100644
--- a/include/QF/cexpr.h
+++ b/include/QF/cexpr.h
@@ -132,6 +132,7 @@ extern exprtype_t cexpr_quaternion;
 extern exprtype_t cexpr_exprval;
 extern exprtype_t cexpr_field;
 extern exprtype_t cexpr_function;
+extern exprtype_t cexpr_plitem;
 
 extern binop_t cexpr_struct_binops[];
 extern binop_t cexpr_struct_pointer_binops[];
diff --git a/libs/util/cexpr-parse.y b/libs/util/cexpr-parse.y
index f208f4680..07993af9b 100644
--- a/libs/util/cexpr-parse.y
+++ b/libs/util/cexpr-parse.y
@@ -56,6 +56,8 @@ static exprval_t *binary_expr (int op, const exprval_t *a, const exprval_t *b,
 							   exprctx_t *context);
 static exprval_t *field_expr (const exprval_t *a, const exprval_t *b,
 							  exprctx_t *context);
+static exprval_t *index_expr (const exprval_t *a, const exprval_t *b,
+							  exprctx_t *context);
 static exprval_t *unary_expr (int op, const exprval_t *val,
 							  exprctx_t *context);
 static exprval_t *vector_expr (exprlist_t *list, exprctx_t *context);
@@ -126,6 +128,7 @@ uexpr
 	| '(' expr ')'		{ $$ = $2; }
 	| NAME '(' opt_arg_list ')'	{ $$ = function_expr ($1, $3, context); }
 	| uexpr '.' field	{ $$ = field_expr ($1, $3, context); }
+	| uexpr '[' field ']'	{ $$ = index_expr ($1, $3, context); }
 	| '+' uexpr %prec UNARY	{ $$ = $2; }
 	| '-' uexpr %prec UNARY	{ $$ = unary_expr ('-', $2, context); }
 	| '!' uexpr %prec UNARY	{ $$ = unary_expr ('!', $2, context); }
@@ -237,6 +240,10 @@ field_expr (const exprval_t *a, const exprval_t *b, exprctx_t *context)
 	binop_t    *binop;
 	exprval_t  *result = 0;
 
+	if (!a) {
+		return 0;
+	}
+
 	for (binop = a->type->binops; binop->op; binop++) {
 		if (binop->op == '.' && binop->other == b->type) {
 			break;
@@ -254,6 +261,29 @@ field_expr (const exprval_t *a, const exprval_t *b, exprctx_t *context)
 	return result;
 }
 
+static exprval_t *
+index_expr (const exprval_t *a, const exprval_t *b, exprctx_t *context)
+{
+	binop_t    *binop;
+	exprval_t  *result = 0;
+
+	for (binop = a->type->binops; binop->op; binop++) {
+		if (binop->op == '[' && binop->other == b->type) {
+			break;
+		}
+	}
+	if (!binop->op) {
+		cexpr_error (context, "invalid index expression: %s.%s",
+					 a->type->name, b->type->name);
+		result = cexpr_value (&cexpr_int, context);
+		*(int *) result->value = 0;
+	} else {
+		exprval_t   c = { 0, &result };
+		binop->func (a, b, &c, context);
+	}
+	return result;
+}
+
 static exprval_t *
 unary_expr (int op, const exprval_t *val, exprctx_t *context)
 {
diff --git a/libs/util/cexpr-type.c b/libs/util/cexpr-type.c
index 57c7a945b..c01e0cac0 100644
--- a/libs/util/cexpr-type.c
+++ b/libs/util/cexpr-type.c
@@ -30,6 +30,7 @@
 #include <math.h>
 
 #include "QF/cexpr.h"
+#include "QF/cmem.h"
 #include "QF/mathlib.h"
 #include "QF/qfplist.h"
 #include "QF/simd/vec4f.h"
@@ -594,6 +595,88 @@ exprtype_t cexpr_function = {
 	0,
 };
 
+static void
+plitem_field (const exprval_t *a, const exprval_t *b, exprval_t *c,
+			  exprctx_t *ctx)
+{
+	__auto_type dict = *(plitem_t **) a->value;
+	__auto_type key = (const char *) b->value;
+
+	if (PL_Type (dict) != QFDictionary) {
+		cexpr_error(ctx, "not a dictionary object");
+		return;
+	}
+	plitem_t   *item = PL_ObjectForKey (dict, key);
+	exprval_t *val = 0;
+	if (!item) {
+		cexpr_error (ctx, "key not found: %s", key);
+	} else {
+		val = cexpr_value (&cexpr_plitem, ctx);
+		*(plitem_t **) val->value = item;
+	}
+	*(exprval_t **) c->value = val;
+}
+
+static void
+plitem_index (const exprval_t *a, int index, exprval_t *c,
+			  exprctx_t *ctx)
+{
+	__auto_type array = *(plitem_t **) a->type->data;
+
+	if (PL_Type (array) != QFArray) {
+		cexpr_error(ctx, "not an array object");
+		return;
+	}
+	plitem_t   *item = PL_ObjectAtIndex (array, index);
+	exprval_t *val = 0;
+	if (!item) {
+		cexpr_error (ctx, "invalid index: %d", index);
+	} else {
+		val = cexpr_value (&cexpr_plitem, ctx);
+		*(plitem_t **) val->value = item;
+	}
+	*(exprval_t **) c->value = val;
+}
+
+static void
+plitem_int (const exprval_t *a, const exprval_t *b, exprval_t *c,
+			exprctx_t *ctx)
+{
+	int         index = *(int *) a->value;
+	plitem_index (a, index, c, ctx);
+}
+
+static void
+plitem_uint (const exprval_t *a, const exprval_t *b, exprval_t *c,
+			 exprctx_t *ctx)
+{
+	int         index = *(int *) a->value;
+	plitem_index (a, index, c, ctx);
+}
+
+static void
+plitem_size_t (const exprval_t *a, const exprval_t *b, exprval_t *c,
+			   exprctx_t *ctx)
+{
+	int         index = *(int *) a->value;
+	plitem_index (a, index, c, ctx);
+}
+
+binop_t plitem_binops[] = {
+	{ '.', &cexpr_field, &cexpr_plitem, plitem_field },
+	{ '[', &cexpr_int, &cexpr_plitem, plitem_int },
+	{ '[', &cexpr_uint, &cexpr_plitem, plitem_uint },
+	{ '[', &cexpr_size_t, &cexpr_plitem, plitem_size_t },
+	{}
+};
+
+exprtype_t cexpr_plitem = {
+	"plitem",
+	sizeof (plitem_t *),
+	plitem_binops,
+	0,
+};
+
 VISIBLE binop_t *
 cexpr_find_cast (exprtype_t *dst_type, exprtype_t *src_type)
 {

From 8179c44042c60ef4db469e1302cc1b029f7a616d Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 4 Feb 2021 17:03:49 +0900
Subject: [PATCH 1408/1519] [vulkan] Rework pipeline parsing for better reuse

It's not entirely there yet, but the basics are working. Work is still
needed for avoiding duplication of objects (different threads will have
different contexts and thus different tables, so necessary per-thread
duplication should not become a problem) and general access to arbitrary
fields (mostly just parsing the strings)
---
 include/QF/Vulkan/qf_vid.h                    |  10 +-
 include/vid_vulkan.h                          |   1 +
 libs/video/renderer/vulkan/qfpipeline.plist   | 103 +++---
 .../video/renderer/vulkan/vkgen/Makemodule.am |   2 -
 libs/video/renderer/vulkan/vkgen/vkgen.r      |  32 --
 libs/video/renderer/vulkan/vkgen/vkhandle.h   |   8 -
 libs/video/renderer/vulkan/vkgen/vkhandle.r   |  74 ----
 libs/video/renderer/vulkan/vkgen/vkresource.h |   9 -
 libs/video/renderer/vulkan/vkgen/vkresource.r |  44 ---
 libs/video/renderer/vulkan/vkparse.c          | 323 ++++++++++++------
 libs/video/renderer/vulkan/vkparse.h          |  13 +-
 libs/video/renderer/vulkan/vkparse.plist      |  69 +---
 libs/video/renderer/vulkan/vulkan_alias.c     |   9 +-
 libs/video/renderer/vulkan/vulkan_bsp.c       |  13 +-
 libs/video/renderer/vulkan/vulkan_draw.c      |   9 +-
 .../video/renderer/vulkan/vulkan_vid_common.c | 100 ++++--
 16 files changed, 388 insertions(+), 431 deletions(-)
 delete mode 100644 libs/video/renderer/vulkan/vkgen/vkhandle.h
 delete mode 100644 libs/video/renderer/vulkan/vkgen/vkhandle.r
 delete mode 100644 libs/video/renderer/vulkan/vkgen/vkresource.h
 delete mode 100644 libs/video/renderer/vulkan/vkgen/vkresource.r

diff --git a/include/QF/Vulkan/qf_vid.h b/include/QF/Vulkan/qf_vid.h
index 7e30a3a57..1102845b5 100644
--- a/include/QF/Vulkan/qf_vid.h
+++ b/include/QF/Vulkan/qf_vid.h
@@ -40,7 +40,6 @@ void Vulkan_DestroyFramebuffers (struct vulkan_ctx_s *ctx);
 void Vulkan_CreateFramebuffers (struct vulkan_ctx_s *ctx);
 void Vulkan_CreateRenderPass (struct vulkan_ctx_s *ctx);
 void Vulkan_DestroyRenderPass (struct vulkan_ctx_s *ctx);
-VkPipeline Vulkan_CreatePipeline (struct vulkan_ctx_s *ctx, const char *name);
 void Vulkan_CreateMatrices (struct vulkan_ctx_s *ctx);
 void Vulkan_DestroyMatrices (struct vulkan_ctx_s *ctx);
 void Vulkan_CalcProjectionMatrices (struct vulkan_ctx_s *ctx, float aspect);
@@ -51,4 +50,13 @@ void Vulkan_Init_Common (struct vulkan_ctx_s *ctx);
 void Vulkan_Shutdown_Common (struct vulkan_ctx_s *ctx);
 void Vulkan_CreateStagingBuffers (struct vulkan_ctx_s *ctx);
 
+VkPipeline Vulkan_CreatePipeline (struct vulkan_ctx_s *ctx, const char *name);
+VkDescriptorPool Vulkan_CreateDescriptorPool (struct vulkan_ctx_s *ctx,
+											  const char *name);
+VkPipelineLayout Vulkan_CreatePipelineLayout (struct vulkan_ctx_s *ctx,
+											  const char *name);
+VkSampler Vulkan_CreateSampler (struct vulkan_ctx_s *ctx, const char *name);
+VkDescriptorSetLayout Vulkan_CreateDescriptorSetLayout(struct vulkan_ctx_s*ctx,
+													   const char *name);
+
 #endif // __QF_Vulkan_vid_h
diff --git a/include/vid_vulkan.h b/include/vid_vulkan.h
index a213c7ac5..38aa4b69f 100644
--- a/include/vid_vulkan.h
+++ b/include/vid_vulkan.h
@@ -58,6 +58,7 @@ typedef struct vulkan_ctx_s {
 	struct hashlink_s *hashlinks;	//FIXME want per thread
 	VkSurfaceKHR surface;	//FIXME surface = window, so "contains" swapchain
 	struct plitem_s  *pipelineDef;
+
 	struct hashtab_s *shaderModules;
 	struct hashtab_s *setLayouts;
 	struct hashtab_s *pipelineLayouts;
diff --git a/libs/video/renderer/vulkan/qfpipeline.plist b/libs/video/renderer/vulkan/qfpipeline.plist
index 96de769c9..8ba2937c2 100644
--- a/libs/video/renderer/vulkan/qfpipeline.plist
+++ b/libs/video/renderer/vulkan/qfpipeline.plist
@@ -1,19 +1,4 @@
 {
-	shaderModules = {
-		// specify shader modules to load into memory
-		// key is the name of the module for referecy by the pipeline
-		// value the path to the spv file to load
-		// $shader refers to the shader install path
-		// $builtin refers to compiled-in shaders
-		passthrough = $builtin/passthrough.vert;
-		pushcolor = $builtin/pushcolor.frag;
-		twodv = $builtin/twod.vert;
-		twodf = $builtin/twod.frag;
-		quakebspv = $builtin/quakebsp.vert;
-		quakebspf = $builtin/quakebsp.frag;
-		aliasv = $builtin/alias.vert;
-		aliasf = $builtin/alias.frag;
-	};
 	samplers = {
 		quakepic = {
 			magFilter = nearest;
@@ -32,7 +17,7 @@
 			borderColor = float_transparent_black;
 			unnormalizedCoordinates = false;
 		};
-		quakebsp.sampler = {
+		quakebsp_sampler = {
 			magFilter = linear;
 			minFilter = linear;
 			mipmapMode = linear;
@@ -49,7 +34,7 @@
 			borderColor = float_transparent_black;
 			unnormalizedCoordinates = false;
 		};
-		alias.sampler = {
+		alias_sampler = {
 			magFilter = linear;
 			minFilter = linear;
 			mipmapMode = linear;
@@ -68,7 +53,7 @@
 		};
 	};
 	descriptorPools = {
-		twod.pool = {
+		twod_pool = {
 			flags = 0;
 			maxSets = $framebuffers.size;
 			bindings = (
@@ -82,7 +67,7 @@
 				},
 			);
 		};
-		alias.pool = {
+		alias_pool = {
 			flags = 0;
 			maxSets = "2z * $framebuffers.size";
 			bindings = (
@@ -94,7 +79,7 @@
 		};
 	};
 	setLayouts = {
-		twod.set = {
+		twod_set = {
 			bindings = (
 				{
 					binding = 0;
@@ -110,7 +95,7 @@
 				},
 			);
 		};
-		quakebsp.set = {
+		quakebsp_set = {
 			flags = push_descriptor;
 			bindings = (
 				{
@@ -151,7 +136,7 @@
 				},
 			);
 		};
-		alias.set = {
+		alias_set = {
 			flags = push_descriptor;
 			bindings = (
 				{
@@ -174,7 +159,7 @@
 				},
 			);
 		};
-		alias.matrices = {
+		alias_matrices = {
 			bindings = (
 				{
 					binding = 0;
@@ -184,7 +169,7 @@
 				},
 			);
 		};
-		alias.textures = {
+		alias_textures = {
 			flags = push_descriptor;
 			bindings = (
 				{
@@ -213,7 +198,7 @@
 				},
 			);
 		};
-		alias.lights = {
+		alias_lights = {
 			bindings = (
 				{
 					binding = 0;
@@ -242,11 +227,11 @@
 		};
 	};
 	pipelineLayouts = {
-		twod.layout = {
-			setLayouts = (twod.set);
+		twod_layout = {
+			setLayouts = (twod_set);
 		};
-		quakebsp.layout = {
-			setLayouts = (quakebsp.set);
+		quakebsp_layout = {
+			setLayouts = (quakebsp_set);
 			pushConstantRanges = (
 				{
 					stageFlags = vertex;
@@ -260,9 +245,9 @@
 				},
 			);
 		};
-		alias.layout = {
-			//setLayouts = (alias.matrices, alias.lights, alias.textures);
-			setLayouts = (alias.set);
+		alias_layout = {
+			//setLayouts = (alias_matrices, alias_lights, alias_textures);
+			setLayouts = (alias_set);
 			pushConstantRanges = (
 				{
 					stageFlags = vertex;
@@ -290,11 +275,15 @@
 	pipelines = {
 		alias = {
 			stages = (
-				{ stage = vertex; name = main; module = aliasv; },
+				{
+					stage = vertex;
+					name = main;
+					module = $builtin/alias.vert;
+				},
 				{
 					stage = fragment;
 					name = main;
-					module = aliasf;
+					module = $builtin/alias.frag;
 					specializationInfo = {
 						mapEntries = (
 							{ size = 4; offset = 0; constantID = 0; },
@@ -412,13 +401,21 @@
 			dynamic = {
 				dynamicState = ( viewport, scissor, blend_constants );
 			};
-			layout = alias.layout;
+			layout = alias_layout;
 			//renderPass = renderpass;
 		};
-		quakebsp.main = {
+		quakebsp_main = {
 			stages = (
-				{ stage = vertex; name = main; module = quakebspv; },
-				{ stage = fragment; name = main; module = quakebspf; },
+				{
+					stage = vertex;
+					name = main;
+					module = $builtin/quakebsp.vert;
+				},
+				{
+					stage = fragment;
+					name = main;
+					module = $builtin/quakebsp.frag;
+				},
 			);
 			vertexInput = {
 				bindings = (
@@ -501,16 +498,20 @@
 			dynamic = {
 				dynamicState = ( viewport, scissor, blend_constants );
 			};
-			layout = quakebsp.layout;
+			layout = quakebsp_layout;
 			//renderPass = renderpass;
 		};
-		quakebsp.skysheet = {
+		quakebsp_skysheet = {
 			stages = (
-				{ stage = vertex; name = main; module = quakebspv; },
+				{
+					stage = vertex;
+					name = main;
+					module = $builtin/quakebsp.vert;
+				},
 				{
 					stage = fragment;
 					name = main;
-					module = quakebspf;
+					module = $builtin/quakebsp.frag;
 					specializationInfo = {
 						mapEntries = (
 							{ size = 4; offset = 0; constantID = 0; },
@@ -603,13 +604,21 @@
 			dynamic = {
 				dynamicState = ( viewport, scissor, blend_constants );
 			};
-			layout = quakebsp.layout;
+			layout = quakebsp_layout;
 			//renderPass = renderpass;
 		};
 		twod = {
 			stages = (
-				{ stage = vertex; name = main; module = twodv; },
-				{ stage = fragment; name = main; module = twodf; },
+				{
+					stage = vertex;
+					name = main;
+					module = $builtin/twod.vert;
+				},
+				{
+					stage = fragment;
+					name = main;
+					module = $builtin/twod.frag;
+				},
 			);
 			vertexInput = {
 				bindings = (
@@ -698,7 +707,7 @@
 			dynamic = {
 				dynamicState = ( viewport, scissor );
 			};
-			layout = twod.layout;
+			layout = twod_layout;
 			//renderPass = renderpass;
 		};
 	};
@@ -764,7 +773,7 @@
 			},
 		);
 	};
-	renderpass.msaa = {
+	renderpass_msaa = {
 		attachments = (
 			{
 				flags = 0;
diff --git a/libs/video/renderer/vulkan/vkgen/Makemodule.am b/libs/video/renderer/vulkan/vkgen/Makemodule.am
index 2fba61b0b..b60e97f1d 100644
--- a/libs/video/renderer/vulkan/vkgen/Makemodule.am
+++ b/libs/video/renderer/vulkan/vkgen/Makemodule.am
@@ -13,8 +13,6 @@ vkgen_dat_src= \
 	libs/video/renderer/vulkan/vkgen/vkfieldstring.r \
 	libs/video/renderer/vulkan/vkgen/vkfieldtype.r \
 	libs/video/renderer/vulkan/vkgen/vkgen.r \
-	libs/video/renderer/vulkan/vkgen/vkhandle.r \
-	libs/video/renderer/vulkan/vkgen/vkresource.r \
 	libs/video/renderer/vulkan/vkgen/vkstruct.r \
 	libs/video/renderer/vulkan/vkgen/vktype.r \
 	libs/video/renderer/vulkan/vkgen/vulkan.r
diff --git a/libs/video/renderer/vulkan/vkgen/vkgen.r b/libs/video/renderer/vulkan/vkgen/vkgen.r
index a336a861c..25bcbaf69 100644
--- a/libs/video/renderer/vulkan/vkgen/vkgen.r
+++ b/libs/video/renderer/vulkan/vkgen/vkgen.r
@@ -10,8 +10,6 @@
 #include "vkgen.h"
 #include "vkstruct.h"
 #include "vkenum.h"
-#include "vkhandle.h"
-#include "vkresource.h"
 
 static AutoreleasePool *autorelease_pool;
 static void
@@ -154,7 +152,6 @@ main(int argc, string *argv)
 	PLItem     *plist;
 	PLItem     *search;
 	PLItem     *handles;
-	PLItem     *resources;
 
 	arp_start ();
 
@@ -179,7 +176,6 @@ main(int argc, string *argv)
 	}
 	search = [[plist getObjectForKey: "search"] retain];
 	handles = [[plist getObjectForKey: "handles"] retain];
-	resources = [[plist getObjectForKey: "resources"] retain];
 	parse = [[plist getObjectForKey: "parse"] retain];
 
 	encodings = PR_FindGlobal (".type_encodings");
@@ -204,17 +200,6 @@ main(int argc, string *argv)
 		}
 	}
 
-	PLItem *handle_keys = [[handles allKeys] retain];
-	for (int i = [handle_keys count]; i-- > 0; ) {
-		string search_name = [[handle_keys getObjectAtIndex:i] string];
-		id obj = (id) Hash_Find (available_types, search_name);
-		obj = [obj resolveType];
-		printf("handle: %d %s\n", obj, class_get_class_name([obj class]));
-		if (obj && [obj class] == [Struct class]) {
-			[obj addToQueue];
-		}
-	}
-
 	while ([queue count]) {
 		id obj = [queue objectAtIndex:0];
 		[queue removeObjectAtIndex:0];
@@ -261,23 +246,6 @@ main(int argc, string *argv)
 		[obj writeTable];
 		arp_end ();
 	}
-	for (int i = [handle_keys count]; i-- > 0; ) {
-		string      key = [[handle_keys getObjectAtIndex:i] string];
-		output_handle (key, [handles getObjectForKey: key]);
-	}
-	for (int i = [resources count]; i-- > 0; ) {
-		PLItem     *res = [resources getObjectAtIndex:i];
-		output_resource_data (res);
-	}
-	// keep the order intuitive (since it matters)
-	fprintf (output_file, "static parseres_t parse_resources[] = {\n");
-	for (int i = 0; i < [resources count]; i++) {
-		PLItem     *res = [resources getObjectAtIndex:i];
-		output_resource_entry (res);
-	}
-	fprintf (output_file, "\t{}\n");
-	fprintf (output_file, "};\n");
-
 	fprintf (output_file, "static void\n");
 	fprintf (output_file, "vkgen_init_symtabs (exprctx_t *context)\n");
 	fprintf (output_file, "{\n");
diff --git a/libs/video/renderer/vulkan/vkgen/vkhandle.h b/libs/video/renderer/vulkan/vkgen/vkhandle.h
deleted file mode 100644
index 47a68798b..000000000
--- a/libs/video/renderer/vulkan/vkgen/vkhandle.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef __renderer_vulkan_vkgen_vkhandle_h
-#define __renderer_vulkan_vkgen_vkhandle_h
-
-@class PLItem;
-
-void output_handle (string name, PLItem *handle);
-
-#endif//__renderer_vulkan_vkgen_vkhandle_h
diff --git a/libs/video/renderer/vulkan/vkgen/vkhandle.r b/libs/video/renderer/vulkan/vkgen/vkhandle.r
deleted file mode 100644
index ec78c22ba..000000000
--- a/libs/video/renderer/vulkan/vkgen/vkhandle.r
+++ /dev/null
@@ -1,74 +0,0 @@
-#include <string.h>
-#include <PropertyList.h>
-
-#include "vkgen.h"
-#include "vkhandle.h"
-
-void
-output_handle (string name, PLItem *handle)
-{
-	string symtab = str_hold ([[handle getObjectForKey:"symtab"] string]);
-	string class = str_hold ([[handle getObjectForKey:"class"] string]);
-	string create = str_hold ([[handle getObjectForKey:"create"] string]);
-	string custom = str_hold ([[handle getObjectForKey:"custom"] string]);
-	if (!custom) {
-		fprintf (output_file, "static int parse_%s (const plitem_t *item, void **data, plitem_t *messages, parsectx_t *context)\n", name);
-		fprintf (output_file, "{\n");
-		fprintf (output_file, "\t__auto_type handle = (%s *) data[0];\n", name);
-		fprintf (output_file, "\tvulkan_ctx_t *ctx = context->vctx;\n");
-		fprintf (output_file, "\tqfv_device_t *device = ctx->device;\n");
-		fprintf (output_file, "\tqfv_devfuncs_t *dfunc = device->funcs;\n");
-		fprintf (output_file, "\tif (PL_Type (item) == QFString) {\n");
-		fprintf (output_file, "\t\tconst char *name = PL_String (item);\n");
-		fprintf (output_file, "\t\thandleref_t *hr = Hash_Find (ctx->%s, name);\n", symtab);
-		fprintf (output_file, "\t\tif (!hr) {\n");
-		fprintf (output_file, "\t\t\tPL_Message (messages, item, \"undefined %s %%s\", name);\n", class);
-		fprintf (output_file, "\t\t\treturn 0;\n");
-		fprintf (output_file, "\t\t}\n");
-		fprintf (output_file, "\t\t*handle = (%s) hr->handle;\n", name);
-		fprintf (output_file, "\t\treturn 1;\n");
-		fprintf (output_file, "\t}\n");
-
-		fprintf (output_file, "\t%sCreateInfo createInfo = {};\n", name);
-
-		fprintf (output_file, "\tif (!parse_%sCreateInfo (0, item, &createInfo, messages, context)) {\n", name);
-		fprintf (output_file, "\t\treturn 0;\n");
-		fprintf (output_file, "\t}\n");
-		fprintf (output_file, "\tVkResult res;\n");
-		fprintf (output_file, "\tres = dfunc->%s (device->dev, &createInfo, 0, handle);\n", create);
-		fprintf (output_file, "\tif (res != VK_SUCCESS) {\n");
-		fprintf (output_file, "\t\tPL_Message (messages, item, \"could not create %s\");\n", class);
-		fprintf (output_file, "\t\treturn 0;\n");
-		fprintf (output_file, "\t}\n");
-		fprintf (output_file, "\treturn 1;\n");
-		fprintf (output_file, "}\n");
-	}
-
-	fprintf (output_file, "int parse_%s_handleref (const plfield_t *field, const plitem_t *item, void *data, plitem_t *messages, void *context)\n", name);
-	fprintf (output_file, "{\n");
-	fprintf (output_file, "\thandleref_t *handleref = data;\n");
-	fprintf (output_file, "\tvoid *hrdata[] = { &handleref->handle };\n");
-	fprintf (output_file, "\thandleref->name = strdup (field->name);\n");
-	if (custom) {
-		fprintf (output_file, "\treturn %s (item, hrdata, messages, context);\n", custom);
-	} else {
-		fprintf (output_file, "\treturn parse_%s (item, hrdata, messages, context);\n", name);
-	}
-	fprintf (output_file, "}\n");
-
-	fprintf (output_file, "%s QFV_Get%s (vulkan_ctx_t *ctx, const char *name)\n", name, str_mid (name, 2));
-	fprintf (output_file, "{\n");
-	fprintf (output_file, "\thandleref_t *handleref = Hash_Find (ctx->%s, name);\n", symtab);
-	fprintf (output_file, "\treturn handleref ? (%s) handleref->handle : 0;\n", name);
-	fprintf (output_file, "}\n");
-
-	if (!custom) {
-		fprintf (header_file, "static int parse_%s (const plitem_t *item, void **data, plitem_t *messages, parsectx_t *context);\n", name);
-	}
-	fprintf (header_file, "int parse_%s_handleref (const plfield_t *field, const plitem_t *item, void *data, plitem_t *messages, void *context);\n", name);
-	fprintf (output_file, "%s QFV_Get%s (vulkan_ctx_t *ctx, const char *name);\n", name, str_mid (name, 2));
-	str_free (custom);
-	str_free (symtab);
-	str_free (class);
-	str_free (create);
-}
diff --git a/libs/video/renderer/vulkan/vkgen/vkresource.h b/libs/video/renderer/vulkan/vkgen/vkresource.h
deleted file mode 100644
index e72042c3e..000000000
--- a/libs/video/renderer/vulkan/vkgen/vkresource.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef __renderer_vulkan_vkgen_vkresource_h
-#define __renderer_vulkan_vkgen_vkresource_h
-
-@class PLItem;
-
-void output_resource_data (PLItem *resource);
-void output_resource_entry (PLItem *resource);
-
-#endif//__renderer_vulkan_vkgen_vkresource_h
diff --git a/libs/video/renderer/vulkan/vkgen/vkresource.r b/libs/video/renderer/vulkan/vkgen/vkresource.r
deleted file mode 100644
index 47478d9f8..000000000
--- a/libs/video/renderer/vulkan/vkgen/vkresource.r
+++ /dev/null
@@ -1,44 +0,0 @@
-#include <string.h>
-#include <PropertyList.h>
-
-#include "vkgen.h"
-#include "vkresource.h"
-
-void
-output_resource_data (PLItem *resource)
-{
-	string name = str_hold ([[resource getObjectForKey:"name"] string]);
-	string parse_type = str_hold ([[resource getObjectForKey:"parse_type"] string]);
-	string parser = str_hold ([[resource getObjectForKey:"parser"] string]);
-	string type = str_hold ([[resource getObjectForKey:"type"] string]);
-
-	fprintf (output_file, "static plelement_t resource_%s_data = {\n", name);
-	fprintf (output_file, "\t%s,\n", parse_type);
-	fprintf (output_file, "\tsizeof (%s),\n", type);
-	fprintf (output_file, "\tmalloc,\n");
-	fprintf (output_file, "\t%s,\n", parser);
-	fprintf (output_file, "\t0,\n");
-	fprintf (output_file, "};\n");
-
-	fprintf (output_file, "static plfield_t resource_%s_field = {\n", name);
-	fprintf (output_file, "\t0, 0, %s, 0, &resource_%s_data\n",
-			 parse_type, name);
-	fprintf (output_file, "};\n");
-
-	str_free (name);
-	str_free (parse_type);
-	str_free (parser);
-	str_free (type);
-}
-
-void
-output_resource_entry (PLItem *resource)
-{
-	string name = str_hold ([[resource getObjectForKey:"name"] string]);
-	string table = str_hold ([[resource getObjectForKey:"table"] string]);
-	fprintf (output_file,
-		"\t{\"%s\", &resource_%s_field, field_offset (vulkan_ctx_t, %s) },\n",
-		 name, name, table);
-	str_free (name);
-	str_free (table);
-}
diff --git a/libs/video/renderer/vulkan/vkparse.c b/libs/video/renderer/vulkan/vkparse.c
index 4108a75f5..88c580506 100644
--- a/libs/video/renderer/vulkan/vkparse.c
+++ b/libs/video/renderer/vulkan/vkparse.c
@@ -362,48 +362,103 @@ parse_RGBA (const plitem_t *item, void **data,
 	return ret;
 }
 
+static void
+add_handle (hashtab_t *tab, const char *name, uint64_t handle)
+{
+	handleref_t *hr = malloc (sizeof (handleref_t));
+	hr->name = strdup (name);
+	hr->handle = handle;
+	Hash_Add (tab, hr);
+}
+
 static int
 parse_VkShaderModule (const plitem_t *item, void **data,
 					  plitem_t *messages, parsectx_t *context)
 {
 	__auto_type handle = (VkShaderModule *) data[0];
 	vulkan_ctx_t *ctx = context->vctx;
+	qfv_device_t *device = ctx->device;
 
 	const char *name = PL_String (item);
 	handleref_t *hr = Hash_Find (ctx->shaderModules, name);
-	if (!hr) {
-		PL_Message (messages, item, "undefined shader module %s", name);
+	if (hr) {
+		*handle = (VkShaderModule) hr->handle;
+		return 1;
+	}
+	if (!(*handle = QFV_CreateShaderModule (device, name))) {
+		PL_Message (messages, item, "could not find shader %s", name);
 		return 0;
 	}
-	*handle = (VkShaderModule) hr->handle;
+	add_handle (ctx->shaderModules, name, (uint64_t) *handle);
 	return 1;
 }
 
 static int
-parse_VkShaderModule_resource (const plitem_t *item, void **data,
-							   plitem_t *messages, parsectx_t *context)
+parse_VkDescriptorSetLayout (const plfield_t *field, const plitem_t *item,
+							 void *data, plitem_t *messages, void *context)
 {
-	__auto_type handle = (VkShaderModule *) data[0];
+	__auto_type handle = (VkDescriptorSetLayout *) data;
+	int         ret = 1;
+	exprctx_t   ectx = *((parsectx_t *) context)->ectx;
 	vulkan_ctx_t *ctx = ((parsectx_t *) context)->vctx;
-	qfv_device_t *device = ctx->device;
 
-	const char *shader_path = PL_String (item);
-	if (!(*handle = QFV_CreateShaderModule (device, shader_path))) {
-		PL_Message (messages, item, "could not find shader %s", shader_path);
-		return 0;
+	const char *name = PL_String (item);
+	Sys_Printf ("parse_VkDescriptorSetLayout: %s\n", name);
+	name = va (ctx->va_ctx, "$properties.setLayouts.%s", name);
+
+	handleref_t *hr = Hash_Find (ctx->setLayouts, name);
+	if (hr) {
+		*handle = (VkDescriptorSetLayout) hr->handle;
+		return 1;
 	}
-	QFV_duSetObjectName (device, VK_OBJECT_TYPE_SHADER_MODULE, *handle,
-						 va (ctx->va_ctx, "shader:%s", shader_path));
-	return 1;
+
+	plitem_t   *setItem = 0;
+	exprval_t   result = { &cexpr_plitem, &setItem };
+	ectx.symtab = 0;
+	ectx.result = &result;
+	ret = !cexpr_eval_string (name, &ectx);
+	if (ret) {
+		VkDescriptorSetLayout setLayout;
+		setLayout = QFV_ParseDescriptorSetLayout (ctx, setItem);
+		*handle = (VkDescriptorSetLayout) setLayout;
+
+		add_handle (ctx->setLayouts, name, (uint64_t) setLayout);
+	}
+	return ret;
 }
 
 static int
-parse_VkDescriptorSetLayout_array (const plfield_t *field,
-								   const plitem_t *item, void *data,
-								   plitem_t *messages, void *context)
+parse_VkPipelineLayout (const plitem_t *item, void **data,
+						plitem_t *messages, parsectx_t *context)
 {
-	void *layout[] = { data };
-	return parse_VkDescriptorSetLayout (item, layout, messages, context);
+	__auto_type handle = (VkPipelineLayout *) data[0];
+	int         ret = 1;
+	exprctx_t   ectx = *((parsectx_t *) context)->ectx;
+	vulkan_ctx_t *ctx = ((parsectx_t *) context)->vctx;
+
+	const char *name = PL_String (item);
+	Sys_Printf ("parse_VkPipelineLayout: %s\n", name);
+	name = va (ctx->va_ctx, "$properties.pipelineLayouts.%s", name);
+
+	handleref_t *hr = Hash_Find (ctx->pipelineLayouts, name);
+	if (hr) {
+		*handle = (VkPipelineLayout) hr->handle;
+		return 1;
+	}
+
+	plitem_t   *setItem = 0;
+	exprval_t   result = { &cexpr_plitem, &setItem };
+	ectx.symtab = 0;
+	ectx.result = &result;
+	ret = !cexpr_eval_string (name, &ectx);
+	if (ret) {
+		VkPipelineLayout layout;
+		layout = QFV_ParsePipelineLayout (ctx, setItem);
+		*handle = (VkPipelineLayout) layout;
+
+		add_handle (ctx->pipelineLayouts, name, (uint64_t) layout);
+	}
+	return ret;
 }
 
 static const char *
@@ -600,54 +655,6 @@ handlref_symtab (void (*free_func)(void*,void*), vulkan_ctx_t *ctx)
 						  ctx, &ctx->hashlinks);
 }
 
-void
-QFV_ParseResources (vulkan_ctx_t *ctx, plitem_t *pipelinedef)
-{
-	plitem_t   *messages = PL_NewArray ();
-	exprsym_t   var_syms[] = {
-		{"swapchain", &qfv_swapchain_t_type, ctx->swapchain},
-		{"framebuffers", &vulkan_framebufferset_t_type, &ctx->framebuffers},
-		{"msaaSamples", &VkSampleCountFlagBits_type, &ctx->msaaSamples},
-		{}
-	};
-	exprtab_t   vars_tab = { var_syms, 0 };
-	exprctx_t   exprctx = {};
-	parsectx_t  parsectx = { &exprctx, ctx };
-	int         ret = 1;
-
-	exprctx.memsuper = new_memsuper ();
-	exprctx.messages = messages;
-	exprctx.hashlinks = &ctx->hashlinks;
-	exprctx.external_variables = &vars_tab;
-	cexpr_init_symtab (&vars_tab, &exprctx);
-
-	if (!ctx->setLayouts) {
-		ctx->shaderModules = handlref_symtab (shaderModule_free, ctx);
-		ctx->setLayouts = handlref_symtab (setLayout_free, ctx);
-		ctx->pipelineLayouts = handlref_symtab (pipelineLayout_free, ctx);
-		ctx->descriptorPools = handlref_symtab (descriptorPool_free, ctx);
-		ctx->samplers = handlref_symtab (sampler_free, ctx);
-	}
-
-	for (parseres_t *res = parse_resources; res->name; res++) {
-		plitem_t   *item = PL_ObjectForKey (pipelinedef, res->name);
-		if (item) {
-			__auto_type table = *(hashtab_t **) ((size_t) ctx + res->offset);
-			Sys_Printf ("found %s\n", res->name);
-			ret &= PL_ParseSymtab (res->field, item, table, messages,
-								   &parsectx);
-		}
-	}
-	if (!ret || developer->int_val & SYS_VULKAN) {
-		for (int i = 0; i < PL_A_NumObjects (messages); i++) {
-			Sys_Printf ("%s\n", PL_String (PL_ObjectAtIndex (messages, i)));
-		}
-	}
-
-	PL_Free (messages);
-	delete_memsuper (exprctx.memsuper);
-}
-
 static const char *
 enum_symtab_getkey (const void *e, void *unused)
 {
@@ -666,6 +673,14 @@ QFV_InitParse (vulkan_ctx_t *ctx)
 	cexpr_init_symtab (&qfv_swapchain_t_symtab, &context);
 	cexpr_init_symtab (&vulkan_framebufferset_t_symtab, &context);
 	cexpr_init_symtab (&imageset_symtab, &context);
+
+	if (!ctx->setLayouts) {
+		ctx->shaderModules = handlref_symtab (shaderModule_free, ctx);
+		ctx->setLayouts = handlref_symtab (setLayout_free, ctx);
+		ctx->pipelineLayouts = handlref_symtab (pipelineLayout_free, ctx);
+		ctx->descriptorPools = handlref_symtab (descriptorPool_free, ctx);
+		ctx->samplers = handlref_symtab (sampler_free, ctx);
+	}
 }
 
 exprenum_t *
@@ -674,13 +689,79 @@ QFV_GetEnum (const char *name)
 	return Hash_Find (enum_symtab, name);
 }
 
+static int
+parse_object (vulkan_ctx_t *ctx, plitem_t *plist,
+			  plparser_t parser, void *object)
+{
+	plitem_t   *messages = PL_NewArray ();
+	exprctx_t   exprctx = {};
+	parsectx_t  parsectx = { &exprctx, ctx };
+	exprsym_t   var_syms[] = {
+		{"swapchain", &qfv_swapchain_t_type, ctx->swapchain},
+		{"framebuffers", &vulkan_framebufferset_t_type, &ctx->framebuffers},
+		{"msaaSamples", &VkSampleCountFlagBits_type, &ctx->msaaSamples},
+		{"properties", &cexpr_plitem, &ctx->pipelineDef},
+		{}
+	};
+	exprtab_t   vars_tab = { var_syms, 0 };
+
+	exprctx.external_variables = &vars_tab;
+	exprctx.memsuper = new_memsuper ();
+	exprctx.messages = messages;
+	exprctx.hashlinks = &ctx->hashlinks;
+
+	cexpr_init_symtab (&vars_tab, &exprctx);
+
+
+	if (!parser (0, plist, object, messages, &parsectx)) {
+		for (int i = 0; i < PL_A_NumObjects (messages); i++) {
+			Sys_Printf ("%s\n", PL_String (PL_ObjectAtIndex (messages, i)));
+		}
+		return 0;
+	}
+	PL_Free (messages);
+	delete_memsuper (exprctx.memsuper);
+
+	return 1;
+}
+
+static int
+parse_qfv_renderpass (const plfield_t *field, const plitem_t *item, void *data,
+					  plitem_t *messages, void *context)
+{
+	return PL_ParseStruct (renderpass_fields, item, data, messages, context);
+}
+
 VkRenderPass
 QFV_ParseRenderPass (vulkan_ctx_t *ctx, plitem_t *plist)
 {
 	qfv_device_t *device = ctx->device;
+
 	qfv_renderpass_t renderpass_data = {};
-	plitem_t   *messages = PL_NewArray ();
+
+	if (!parse_object (ctx, plist, parse_qfv_renderpass, &renderpass_data)) {
+		return 0;
+	}
+
 	VkRenderPass renderpass;
+	renderpass = QFV_CreateRenderPass (device,
+									   renderpass_data.attachments,
+									   renderpass_data.subpasses,
+									   renderpass_data.dependencies);
+
+	free (renderpass_data.attachments);
+	for (size_t i = 0; i < renderpass_data.subpasses->size; i++) {
+		free ((void *) renderpass_data.subpasses->a[i].pInputAttachments);
+		free ((void *) renderpass_data.subpasses->a[i].pColorAttachments);
+		free ((void *) renderpass_data.subpasses->a[i].pResolveAttachments);
+		free ((void *) renderpass_data.subpasses->a[i].pDepthStencilAttachment);
+		free ((void *) renderpass_data.subpasses->a[i].pPreserveAttachments);
+	}
+	free (renderpass_data.subpasses);
+	free (renderpass_data.dependencies);
+	return renderpass;
+
+/*	plitem_t   *messages = PL_NewArray ();
 	exprsym_t   var_syms[] = {
 		{"swapchain", &qfv_swapchain_t_type, ctx->swapchain},
 		{"framebuffers", &vulkan_framebufferset_t_type, &ctx->framebuffers},
@@ -707,11 +788,6 @@ QFV_ParseRenderPass (vulkan_ctx_t *ctx, plitem_t *plist)
 	PL_Free (messages);
 	delete_memsuper (exprctx.memsuper);
 
-	renderpass = QFV_CreateRenderPass (device,
-									   renderpass_data.attachments,
-									   renderpass_data.subpasses,
-									   renderpass_data.dependencies);
-
 	free (renderpass_data.attachments);
 	for (size_t i = 0; i < renderpass_data.subpasses->size; i++) {
 		free ((void *) renderpass_data.subpasses->a[i].pInputAttachments);
@@ -722,7 +798,7 @@ QFV_ParseRenderPass (vulkan_ctx_t *ctx, plitem_t *plist)
 	}
 	free (renderpass_data.subpasses);
 	free (renderpass_data.dependencies);
-	return renderpass;
+	return renderpass;*/
 }
 
 VkPipeline
@@ -730,34 +806,13 @@ QFV_ParsePipeline (vulkan_ctx_t *ctx, plitem_t *plist)
 {
 	qfv_device_t *device = ctx->device;
 
-	plitem_t   *messages = PL_NewArray ();
-	exprctx_t   exprctx = {};
-	parsectx_t  parsectx = { &exprctx, ctx };
-	exprsym_t   var_syms[] = {
-		{"msaaSamples", &VkSampleCountFlagBits_type, &ctx->msaaSamples},
-		{}
-	};
-	exprtab_t   vars_tab = { var_syms, 0 };
-
-	exprctx.external_variables = &vars_tab;
-	exprctx.memsuper = new_memsuper ();
-	exprctx.messages = messages;
-	exprctx.hashlinks = &ctx->hashlinks;
-
-	cexpr_init_symtab (&vars_tab, &exprctx);
-
 	__auto_type cInfo = QFV_AllocGraphicsPipelineCreateInfoSet (1, alloca);
 	memset (&cInfo->a[0], 0, sizeof (cInfo->a[0]));
 
-	if (!parse_VkGraphicsPipelineCreateInfo (0, plist, &cInfo->a[0],
-											 messages, &parsectx)) {
-		for (int i = 0; i < PL_A_NumObjects (messages); i++) {
-			Sys_Printf ("%s\n", PL_String (PL_ObjectAtIndex (messages, i)));
-		}
+	if (!parse_object (ctx, plist, parse_VkGraphicsPipelineCreateInfo,
+					   &cInfo->a[0])) {
 		return 0;
 	}
-	PL_Free (messages);
-	delete_memsuper (exprctx.memsuper);
 
 	cInfo->a[0].renderPass = ctx->renderpass.renderpass;
 	__auto_type plSet = QFV_CreateGraphicsPipelines (device, 0, cInfo);
@@ -765,3 +820,77 @@ QFV_ParsePipeline (vulkan_ctx_t *ctx, plitem_t *plist)
 	free (plSet);
 	return pipeline;
 }
+
+VkDescriptorPool
+QFV_ParseDescriptorPool (vulkan_ctx_t *ctx, plitem_t *plist)
+{
+	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	VkDescriptorPoolCreateInfo cInfo = {};
+
+	if (!parse_object (ctx, plist, parse_VkDescriptorPoolCreateInfo, &cInfo)) {
+		return 0;
+	}
+
+	VkDescriptorPool pool;
+	dfunc->vkCreateDescriptorPool (device->dev, &cInfo, 0, &pool);
+
+	return pool;
+}
+
+VkDescriptorSetLayout
+QFV_ParseDescriptorSetLayout (vulkan_ctx_t *ctx, plitem_t *plist)
+{
+	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	VkDescriptorSetLayoutCreateInfo cInfo = {};
+
+	if (!parse_object (ctx, plist, parse_VkDescriptorSetLayoutCreateInfo,
+					   &cInfo)) {
+		return 0;
+	}
+
+	VkDescriptorSetLayout setLayout;
+	dfunc->vkCreateDescriptorSetLayout (device->dev, &cInfo, 0, &setLayout);
+
+	return setLayout;
+}
+
+VkPipelineLayout
+QFV_ParsePipelineLayout (vulkan_ctx_t *ctx, plitem_t *plist)
+{
+	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	VkPipelineLayoutCreateInfo cInfo = {};
+
+	if (!parse_object (ctx, plist, parse_VkPipelineLayoutCreateInfo,
+					   &cInfo)) {
+		return 0;
+	}
+
+	VkPipelineLayout layout;
+	dfunc->vkCreatePipelineLayout (device->dev, &cInfo, 0, &layout);
+
+	return layout;
+}
+
+VkSampler
+QFV_ParseSampler (vulkan_ctx_t *ctx, plitem_t *plist)
+{
+	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	VkSamplerCreateInfo cInfo = {};
+
+	if (!parse_object (ctx, plist, parse_VkSamplerCreateInfo, &cInfo)) {
+		return 0;
+	}
+
+	VkSampler sampler;
+	dfunc->vkCreateSampler (device->dev, &cInfo, 0, &sampler);
+
+	return sampler;
+}
diff --git a/libs/video/renderer/vulkan/vkparse.h b/libs/video/renderer/vulkan/vkparse.h
index 459c0f6a2..480c8bc99 100644
--- a/libs/video/renderer/vulkan/vkparse.h
+++ b/libs/video/renderer/vulkan/vkparse.h
@@ -24,18 +24,15 @@ typedef struct handleref_s {
 	uint64_t    handle;
 } handleref_t;
 
-VkShaderModule QFV_GetShaderModule (vulkan_ctx_t *ctx, const char *name);
-VkDescriptorPool QFV_GetDescriptorPool (vulkan_ctx_t *ctx, const char *name);
-VkDescriptorSetLayout QFV_GetDescriptorSetLayout (vulkan_ctx_t *ctx,
-												  const char *name);
-VkPipelineLayout QFV_GetPipelineLayout (vulkan_ctx_t *ctx, const char *name);
-VkSampler QFV_GetSampler (vulkan_ctx_t *ctx, const char *name);
-
-void QFV_ParseResources (vulkan_ctx_t *ctx, plitem_t *plist);
 void QFV_InitParse (vulkan_ctx_t *ctx);
 exprenum_t *QFV_GetEnum (const char *name);
 
 VkRenderPass QFV_ParseRenderPass (vulkan_ctx_t *ctx, plitem_t *plist);
 VkPipeline QFV_ParsePipeline (vulkan_ctx_t *ctx, plitem_t *plist);
+VkDescriptorPool QFV_ParseDescriptorPool (vulkan_ctx_t *ctx, plitem_t *plist);
+VkDescriptorSetLayout QFV_ParseDescriptorSetLayout (vulkan_ctx_t *ctx,
+													plitem_t *plist);
+VkPipelineLayout QFV_ParsePipelineLayout (vulkan_ctx_t *ctx, plitem_t *plist);
+VkSampler QFV_ParseSampler (vulkan_ctx_t *ctx, plitem_t *plist);
 
 #endif//__vkparse_h
diff --git a/libs/video/renderer/vulkan/vkparse.plist b/libs/video/renderer/vulkan/vkparse.plist
index edf68541e..c3a0bfdd9 100644
--- a/libs/video/renderer/vulkan/vkparse.plist
+++ b/libs/video/renderer/vulkan/vkparse.plist
@@ -21,70 +21,6 @@
 		VkDescriptorPoolCreateInfo,
 		VkSamplerCreateInfo,
 	);
-	handles = {
-		VkShaderModule = {
-			symtab = shaderModules;
-			class = "shader module";
-			custom = parse_VkShaderModule_resource;
-		};
-		VkDescriptorPool = {
-			symtab = descriptorPools;
-			class = "descriptor pool";
-			create = vkCreateDescriptorPool;
-		};
-		VkDescriptorSetLayout = {
-			symtab = setLayouts;
-			class = "set layout";
-			create = vkCreateDescriptorSetLayout;
-		};
-		VkPipelineLayout = {
-			symtab = pipelineLayouts;
-			class = "pipeline layout";
-			create = vkCreatePipelineLayout;
-		};
-		VkSampler = {
-			symtab = samplers;
-			class = "sampler";
-			create = vkCreateSampler;
-		};
-	};
-	resources = (
-		{
-			name = shaderModules;
-			parse_type = QFString;
-			parser = parse_VkShaderModule_handleref;
-			type = handleref_t;
-			table = shaderModules;
-		},
-		{
-			name = setLayouts;
-			parse_type = QFDictionary;
-			parser = parse_VkDescriptorSetLayout_handleref;
-			type = handleref_t;
-			table = setLayouts;
-		},
-		{
-			name = pipelineLayouts;
-			parse_type = QFDictionary;
-			parser = parse_VkPipelineLayout_handleref;
-			type = handleref_t;
-			table = pipelineLayouts;
-		},
-		{
-			name = descriptorPools;
-			parse_type = QFDictionary;
-			parser = parse_VkDescriptorPool_handleref;
-			type = handleref_t;
-			table = descriptorPools;
-		},
-		{
-			name = samplers;
-			parse_type = QFDictionary;
-			parser = parse_VkSampler_handleref;
-			type = handleref_t;
-			table = samplers;
-		},
-	);
 	parse = {
 		VkSubpassDescription = {
 			flags = auto;
@@ -279,7 +215,7 @@
 				type = (array,	{
 									parse_type = (QFDictionary, QFString);
 									type = VkDescriptorSetLayout;
-									parser = parse_VkDescriptorSetLayout_array;
+									parser = parse_VkDescriptorSetLayout;
 								});
 				size = setLayoutCount;
 				values = pSetLayouts;
@@ -338,8 +274,7 @@
 				value = pDynamicState;
 			};
 			layout = {
-				type = (custom,	(QFDictionary, QFString),
-						parse_VkPipelineLayout);
+				type = (custom,	QFString, parse_VkPipelineLayout);
 				fields = (layout);
 			};
 			basePipelineHandle = {
diff --git a/libs/video/renderer/vulkan/vulkan_alias.c b/libs/video/renderer/vulkan/vulkan_alias.c
index 76f4ac7b5..ad42daed4 100644
--- a/libs/video/renderer/vulkan/vulkan_alias.c
+++ b/libs/video/renderer/vulkan/vulkan_alias.c
@@ -63,7 +63,6 @@
 
 #include "r_internal.h"
 #include "vid_vulkan.h"
-#include "vkparse.h"
 
 void
 Vulkan_DrawAlias (entity_t *ent, struct vulkan_ctx_s *ctx)
@@ -259,12 +258,8 @@ Vulkan_Alias_Init (vulkan_ctx_t *ctx)
 	actx->frames.grow = 0;
 
 	actx->pipeline = Vulkan_CreatePipeline (ctx, "alias");
-	actx->layout = QFV_GetPipelineLayout (ctx, "alias.layout");
-	QFV_duSetObjectName (device, VK_OBJECT_TYPE_PIPELINE_LAYOUT, actx->layout,
-						 va (ctx->va_ctx, "layout:%s", "alias.layout"));
-	actx->sampler = QFV_GetSampler (ctx, "alias.sampler");
-	QFV_duSetObjectName (device, VK_OBJECT_TYPE_SAMPLER, actx->sampler,
-						 va (ctx->va_ctx, "sampler:%s", "alias.sampler"));
+	actx->layout = Vulkan_CreatePipelineLayout (ctx, "alias_layout");
+	actx->sampler = Vulkan_CreateSampler (ctx, "alias_sampler");
 
 	/*__auto_type layouts = QFV_AllocDescriptorSetLayoutSet (2 * frames, alloca);
 	for (size_t i = 0; i < layouts->size / 2; i++) {
diff --git a/libs/video/renderer/vulkan/vulkan_bsp.c b/libs/video/renderer/vulkan/vulkan_bsp.c
index a0dcd9134..5ae835897 100644
--- a/libs/video/renderer/vulkan/vulkan_bsp.c
+++ b/libs/video/renderer/vulkan/vulkan_bsp.c
@@ -68,7 +68,6 @@
 
 #include "r_internal.h"
 #include "vid_vulkan.h"
-#include "vkparse.h"
 
 static float identity[] = {
 	1, 0, 0, 0,
@@ -1449,14 +1448,10 @@ Vulkan_Bsp_Init (vulkan_ctx_t *ctx)
 	DARRAY_RESIZE (&bctx->frames, frames);
 	bctx->frames.grow = 0;
 
-	bctx->main = Vulkan_CreatePipeline (ctx, "quakebsp.main");
-	bctx->sky = Vulkan_CreatePipeline (ctx, "quakebsp.skysheet");
-	bctx->layout = QFV_GetPipelineLayout (ctx, "quakebsp.layout");
-	QFV_duSetObjectName (device, VK_OBJECT_TYPE_PIPELINE_LAYOUT, bctx->layout,
-						 va (ctx->va_ctx, "layout:%s", "quakebsp.layout"));
-	bctx->sampler = QFV_GetSampler (ctx, "quakebsp.sampler");
-	QFV_duSetObjectName (device, VK_OBJECT_TYPE_SAMPLER, bctx->sampler,
-						 va (ctx->va_ctx, "sampler:%s", "quakebsp.sampler"));
+	bctx->main = Vulkan_CreatePipeline (ctx, "quakebsp_main");
+	bctx->sky = Vulkan_CreatePipeline (ctx, "quakebsp_skysheet");
+	bctx->layout = Vulkan_CreatePipelineLayout (ctx, "quakebsp_layout");
+	bctx->sampler = Vulkan_CreateSampler (ctx, "quakebsp_sampler");
 
 	__auto_type cmdBuffers = QFV_AllocCommandBufferSet (3 * frames, alloca);
 	QFV_AllocateCommandBuffers (device, ctx->cmdpool, 1, cmdBuffers);
diff --git a/libs/video/renderer/vulkan/vulkan_draw.c b/libs/video/renderer/vulkan/vulkan_draw.c
index 16b563600..ff7e6ed15 100644
--- a/libs/video/renderer/vulkan/vulkan_draw.c
+++ b/libs/video/renderer/vulkan/vulkan_draw.c
@@ -64,7 +64,6 @@
 
 #include "r_internal.h"
 #include "vid_vulkan.h"
-#include "vkparse.h"
 
 typedef struct {
 	float       xy[2];
@@ -371,7 +370,7 @@ Vulkan_Draw_Init (vulkan_ctx_t *ctx)
 										   ctx->cmdpool);
 	dctx->scrap = QFV_CreateScrap (device, "draw_atlas", 2048, tex_rgba,
 								   dctx->stage);
-	dctx->sampler = QFV_GetSampler (ctx, "quakepic");
+	dctx->sampler = Vulkan_CreateSampler (ctx, "quakepic");
 
 	qpic_t     *charspic = Draw_Font8x8Pic ();
 
@@ -384,13 +383,13 @@ Vulkan_Draw_Init (vulkan_ctx_t *ctx)
 
 	dctx->pipeline = Vulkan_CreatePipeline (ctx, "twod");
 
-	dctx->layout = QFV_GetPipelineLayout (ctx, "twod.layout");
+	dctx->layout = Vulkan_CreatePipelineLayout (ctx, "twod_layout");
 
 	__auto_type layouts = QFV_AllocDescriptorSetLayoutSet (frames, alloca);
 	for (size_t i = 0; i < layouts->size; i++) {
-		layouts->a[i] = QFV_GetDescriptorSetLayout (ctx, "twod.set");
+		layouts->a[i] = Vulkan_CreateDescriptorSetLayout (ctx, "twod_set");
 	}
-	__auto_type pool = QFV_GetDescriptorPool (ctx, "twod.pool");
+	__auto_type pool = Vulkan_CreateDescriptorPool (ctx, "twod_pool");
 
 	VkDescriptorBufferInfo bufferInfo = {
 		ctx->matrices.buffer_2d, 0, VK_WHOLE_SIZE
diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c
index ff026331a..979d30a7c 100644
--- a/libs/video/renderer/vulkan/vulkan_vid_common.c
+++ b/libs/video/renderer/vulkan/vulkan_vid_common.c
@@ -224,21 +224,25 @@ Vulkan_CreateSwapchain (vulkan_ctx_t *ctx)
 	}
 }
 
-static void
-qfv_load_pipeline (vulkan_ctx_t *ctx)
+static plitem_t *
+qfv_load_pipeline (vulkan_ctx_t *ctx, const char *name)
 {
 	if (!ctx->pipelineDef) {
 		ctx->pipelineDef = PL_GetPropertyList (quakeforge_pipeline);
-		if (ctx->pipelineDef) {
-			QFV_ParseResources (ctx, ctx->pipelineDef);
-		}
 	}
+
+	plitem_t   *item = ctx->pipelineDef;
+	if (!item || !(item = PL_ObjectForKey (item, name))) {
+		Sys_Printf ("error loading %s\n", name);
+	} else {
+		Sys_Printf ("Found %s def\n", name);
+	}
+	return item;
 }
 
 void
 Vulkan_CreateRenderPass (vulkan_ctx_t *ctx)
 {
-	qfv_load_pipeline (ctx);
 	const char *name = "renderpass";//FIXME
 	qfv_device_t *device = ctx->device;
 	VkDevice    dev = device->dev;
@@ -249,15 +253,13 @@ Vulkan_CreateRenderPass (vulkan_ctx_t *ctx)
 	ctx->msaaSamples = min ((VkSampleCountFlagBits) msaaSamples->int_val,
 							QFV_GetMaxSampleCount (device->physDev));
 	if (ctx->msaaSamples > 1) {
-		name = "renderpass.msaa";
+		name = "renderpass_msaa";
 	}
 
-	plitem_t   *item = ctx->pipelineDef;
-	if (!item || !(item = PL_ObjectForKey (item, name))) {
-		Sys_Printf ("error loading renderpass: %s\n", name);
+	//FIXME a tad inconsistent
+	plitem_t   *item = qfv_load_pipeline (ctx, name);
+	if (!item) {
 		return;
-	} else {
-		Sys_Printf ("Found renderpass def: %s\n", name);
 	}
 
 	qfv_imageresource_t *colorImage = malloc (sizeof (*colorImage));
@@ -375,15 +377,7 @@ Vulkan_DestroyRenderPass (vulkan_ctx_t *ctx)
 VkPipeline
 Vulkan_CreatePipeline (vulkan_ctx_t *ctx, const char *name)
 {
-	qfv_load_pipeline (ctx);
-
-	plitem_t   *item = ctx->pipelineDef;
-	if (!item || !(item = PL_ObjectForKey (item, "pipelines"))) {
-		Sys_Printf ("error loading pipelines\n");
-		return 0;
-	} else {
-		Sys_Printf ("Found pipelines def\n");
-	}
+	plitem_t   *item = qfv_load_pipeline (ctx, "pipelines");
 	if (!(item = PL_ObjectForKey (item, name))) {
 		Sys_Printf ("error loading pipeline %s\n", name);
 		return 0;
@@ -396,6 +390,70 @@ Vulkan_CreatePipeline (vulkan_ctx_t *ctx, const char *name)
 	return pipeline;
 }
 
+VkDescriptorPool
+Vulkan_CreateDescriptorPool (vulkan_ctx_t *ctx, const char *name)
+{
+	plitem_t   *item = qfv_load_pipeline (ctx, "descriptorPools");
+	if (!(item = PL_ObjectForKey (item, name))) {
+		Sys_Printf ("error loading descriptor pool %s\n", name);
+		return 0;
+	} else {
+		Sys_Printf ("Found descriptor pool def %s\n", name);
+	}
+	VkDescriptorPool pool = QFV_ParseDescriptorPool (ctx, item);
+	QFV_duSetObjectName (ctx->device, VK_OBJECT_TYPE_DESCRIPTOR_POOL, pool,
+						 va (ctx->va_ctx, "descriptor_pool:%s", name));
+	return pool;
+}
+
+VkPipelineLayout
+Vulkan_CreatePipelineLayout (vulkan_ctx_t *ctx, const char *name)
+{
+	plitem_t   *item = qfv_load_pipeline (ctx, "pipelineLayouts");
+	if (!(item = PL_ObjectForKey (item, name))) {
+		Sys_Printf ("error loading pipeline layout %s\n", name);
+		return 0;
+	} else {
+		Sys_Printf ("Found pipeline layout def %s\n", name);
+	}
+	VkPipelineLayout layout = QFV_ParsePipelineLayout (ctx, item);
+	QFV_duSetObjectName (ctx->device, VK_OBJECT_TYPE_PIPELINE_LAYOUT, layout,
+						 va (ctx->va_ctx, "pipeline_layout:%s", name));
+	return layout;
+}
+
+VkSampler
+Vulkan_CreateSampler (vulkan_ctx_t *ctx, const char *name)
+{
+	plitem_t   *item = qfv_load_pipeline (ctx, "samplers");
+	if (!(item = PL_ObjectForKey (item, name))) {
+		Sys_Printf ("error loading sampler %s\n", name);
+		return 0;
+	} else {
+		Sys_Printf ("Found sampler def %s\n", name);
+	}
+	VkSampler sampler = QFV_ParseSampler (ctx, item);
+	QFV_duSetObjectName (ctx->device, VK_OBJECT_TYPE_SAMPLER, sampler,
+						 va (ctx->va_ctx, "sampler:%s", name));
+	return sampler;
+}
+
+VkDescriptorSetLayout
+Vulkan_CreateDescriptorSetLayout(vulkan_ctx_t *ctx, const char *name)
+{
+	plitem_t   *item = qfv_load_pipeline (ctx, "setLayouts");
+	if (!(item = PL_ObjectForKey (item, name))) {
+		Sys_Printf ("error loading descriptor set %s\n", name);
+		return 0;
+	} else {
+		Sys_Printf ("Found descriptor set def %s\n", name);
+	}
+	VkDescriptorSetLayout set = QFV_ParseDescriptorSetLayout (ctx, item);
+	QFV_duSetObjectName (ctx->device, VK_OBJECT_TYPE_DESCRIPTOR_SET_LAYOUT,
+						 set, va (ctx->va_ctx, "descriptor_set:%s", name));
+	return set;
+}
+
 void
 Vulkan_CreateFramebuffers (vulkan_ctx_t *ctx)
 {

From a54de63feedcbd44962139153dca1345b1829b54 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 4 Feb 2021 20:40:28 +0900
Subject: [PATCH 1409/1519] [vulkan] Take care of the duplicate handles

---
 libs/video/renderer/vulkan/vkparse.c          | 41 ++++++++++-------
 libs/video/renderer/vulkan/vkparse.h          |  5 +++
 .../video/renderer/vulkan/vulkan_vid_common.c | 44 +++++++++++++++++--
 3 files changed, 69 insertions(+), 21 deletions(-)

diff --git a/libs/video/renderer/vulkan/vkparse.c b/libs/video/renderer/vulkan/vkparse.c
index 88c580506..aa6c88325 100644
--- a/libs/video/renderer/vulkan/vkparse.c
+++ b/libs/video/renderer/vulkan/vkparse.c
@@ -362,8 +362,18 @@ parse_RGBA (const plitem_t *item, void **data,
 	return ret;
 }
 
-static void
-add_handle (hashtab_t *tab, const char *name, uint64_t handle)
+uint64_t
+QFV_GetHandle (hashtab_t *tab, const char *name)
+{
+	handleref_t *hr = Hash_Find (tab, name);
+	if (hr) {
+		return hr->handle;
+	}
+	return 0;
+}
+
+void
+QFV_AddHandle (hashtab_t *tab, const char *name, uint64_t handle)
 {
 	handleref_t *hr = malloc (sizeof (handleref_t));
 	hr->name = strdup (name);
@@ -380,16 +390,15 @@ parse_VkShaderModule (const plitem_t *item, void **data,
 	qfv_device_t *device = ctx->device;
 
 	const char *name = PL_String (item);
-	handleref_t *hr = Hash_Find (ctx->shaderModules, name);
-	if (hr) {
-		*handle = (VkShaderModule) hr->handle;
+	*handle = (VkShaderModule) QFV_GetHandle (ctx->shaderModules, name);
+	if (*handle) {
 		return 1;
 	}
 	if (!(*handle = QFV_CreateShaderModule (device, name))) {
 		PL_Message (messages, item, "could not find shader %s", name);
 		return 0;
 	}
-	add_handle (ctx->shaderModules, name, (uint64_t) *handle);
+	QFV_AddHandle (ctx->shaderModules, name, (uint64_t) *handle);
 	return 1;
 }
 
@@ -404,11 +413,10 @@ parse_VkDescriptorSetLayout (const plfield_t *field, const plitem_t *item,
 
 	const char *name = PL_String (item);
 	Sys_Printf ("parse_VkDescriptorSetLayout: %s\n", name);
-	name = va (ctx->va_ctx, "$properties.setLayouts.%s", name);
+	name = va (ctx->va_ctx, "$"QFV_PROPERTIES".setLayouts.%s", name);
 
-	handleref_t *hr = Hash_Find (ctx->setLayouts, name);
-	if (hr) {
-		*handle = (VkDescriptorSetLayout) hr->handle;
+	*handle = (VkDescriptorSetLayout) QFV_GetHandle (ctx->setLayouts, name);
+	if (*handle) {
 		return 1;
 	}
 
@@ -422,7 +430,7 @@ parse_VkDescriptorSetLayout (const plfield_t *field, const plitem_t *item,
 		setLayout = QFV_ParseDescriptorSetLayout (ctx, setItem);
 		*handle = (VkDescriptorSetLayout) setLayout;
 
-		add_handle (ctx->setLayouts, name, (uint64_t) setLayout);
+		QFV_AddHandle (ctx->setLayouts, name, (uint64_t) setLayout);
 	}
 	return ret;
 }
@@ -438,11 +446,10 @@ parse_VkPipelineLayout (const plitem_t *item, void **data,
 
 	const char *name = PL_String (item);
 	Sys_Printf ("parse_VkPipelineLayout: %s\n", name);
-	name = va (ctx->va_ctx, "$properties.pipelineLayouts.%s", name);
+	name = va (ctx->va_ctx, "$"QFV_PROPERTIES".pipelineLayouts.%s", name);
 
-	handleref_t *hr = Hash_Find (ctx->pipelineLayouts, name);
-	if (hr) {
-		*handle = (VkPipelineLayout) hr->handle;
+	*handle = (VkPipelineLayout) QFV_GetHandle (ctx->pipelineLayouts, name);
+	if (*handle) {
 		return 1;
 	}
 
@@ -456,7 +463,7 @@ parse_VkPipelineLayout (const plitem_t *item, void **data,
 		layout = QFV_ParsePipelineLayout (ctx, setItem);
 		*handle = (VkPipelineLayout) layout;
 
-		add_handle (ctx->pipelineLayouts, name, (uint64_t) layout);
+		QFV_AddHandle (ctx->pipelineLayouts, name, (uint64_t) layout);
 	}
 	return ret;
 }
@@ -700,7 +707,7 @@ parse_object (vulkan_ctx_t *ctx, plitem_t *plist,
 		{"swapchain", &qfv_swapchain_t_type, ctx->swapchain},
 		{"framebuffers", &vulkan_framebufferset_t_type, &ctx->framebuffers},
 		{"msaaSamples", &VkSampleCountFlagBits_type, &ctx->msaaSamples},
-		{"properties", &cexpr_plitem, &ctx->pipelineDef},
+		{QFV_PROPERTIES, &cexpr_plitem, &ctx->pipelineDef},
 		{}
 	};
 	exprtab_t   vars_tab = { var_syms, 0 };
diff --git a/libs/video/renderer/vulkan/vkparse.h b/libs/video/renderer/vulkan/vkparse.h
index 480c8bc99..c443e98e3 100644
--- a/libs/video/renderer/vulkan/vkparse.h
+++ b/libs/video/renderer/vulkan/vkparse.h
@@ -13,6 +13,8 @@ typedef struct parsectx_s {
 #include "libs/video/renderer/vulkan/vkparse.hinc"
 #endif
 
+#define QFV_PROPERTIES "properties"
+
 typedef struct parseres_s {
 	const char *name;
 	plfield_t  *field;
@@ -27,6 +29,9 @@ typedef struct handleref_s {
 void QFV_InitParse (vulkan_ctx_t *ctx);
 exprenum_t *QFV_GetEnum (const char *name);
 
+uint64_t QFV_GetHandle (struct hashtab_s *tab, const char *name);
+void QFV_AddHandle (struct hashtab_s *tab, const char *name, uint64_t handle);
+
 VkRenderPass QFV_ParseRenderPass (vulkan_ctx_t *ctx, plitem_t *plist);
 VkPipeline QFV_ParsePipeline (vulkan_ctx_t *ctx, plitem_t *plist);
 VkDescriptorPool QFV_ParseDescriptorPool (vulkan_ctx_t *ctx, plitem_t *plist);
diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c
index 979d30a7c..21c21b085 100644
--- a/libs/video/renderer/vulkan/vulkan_vid_common.c
+++ b/libs/video/renderer/vulkan/vulkan_vid_common.c
@@ -393,6 +393,14 @@ Vulkan_CreatePipeline (vulkan_ctx_t *ctx, const char *name)
 VkDescriptorPool
 Vulkan_CreateDescriptorPool (vulkan_ctx_t *ctx, const char *name)
 {
+	hashtab_t  *tab = ctx->descriptorPools;
+	const char *path;
+	path = va (ctx->va_ctx, "$"QFV_PROPERTIES".descriptorPools.%s", name);
+	__auto_type pool = (VkDescriptorPool) QFV_GetHandle (tab, path);
+	if (pool) {
+		return pool;
+	}
+
 	plitem_t   *item = qfv_load_pipeline (ctx, "descriptorPools");
 	if (!(item = PL_ObjectForKey (item, name))) {
 		Sys_Printf ("error loading descriptor pool %s\n", name);
@@ -400,7 +408,8 @@ Vulkan_CreateDescriptorPool (vulkan_ctx_t *ctx, const char *name)
 	} else {
 		Sys_Printf ("Found descriptor pool def %s\n", name);
 	}
-	VkDescriptorPool pool = QFV_ParseDescriptorPool (ctx, item);
+	pool = QFV_ParseDescriptorPool (ctx, item);
+	QFV_AddHandle (tab, path, (uint64_t) pool);
 	QFV_duSetObjectName (ctx->device, VK_OBJECT_TYPE_DESCRIPTOR_POOL, pool,
 						 va (ctx->va_ctx, "descriptor_pool:%s", name));
 	return pool;
@@ -409,6 +418,14 @@ Vulkan_CreateDescriptorPool (vulkan_ctx_t *ctx, const char *name)
 VkPipelineLayout
 Vulkan_CreatePipelineLayout (vulkan_ctx_t *ctx, const char *name)
 {
+	hashtab_t  *tab = ctx->pipelineLayouts;
+	const char *path;
+	path = va (ctx->va_ctx, "$"QFV_PROPERTIES".pipelineLayouts.%s", name);
+	__auto_type layout = (VkPipelineLayout) QFV_GetHandle (tab, path);
+	if (layout) {
+		return layout;
+	}
+
 	plitem_t   *item = qfv_load_pipeline (ctx, "pipelineLayouts");
 	if (!(item = PL_ObjectForKey (item, name))) {
 		Sys_Printf ("error loading pipeline layout %s\n", name);
@@ -416,7 +433,8 @@ Vulkan_CreatePipelineLayout (vulkan_ctx_t *ctx, const char *name)
 	} else {
 		Sys_Printf ("Found pipeline layout def %s\n", name);
 	}
-	VkPipelineLayout layout = QFV_ParsePipelineLayout (ctx, item);
+	layout = QFV_ParsePipelineLayout (ctx, item);
+	QFV_AddHandle (tab, path, (uint64_t) layout);
 	QFV_duSetObjectName (ctx->device, VK_OBJECT_TYPE_PIPELINE_LAYOUT, layout,
 						 va (ctx->va_ctx, "pipeline_layout:%s", name));
 	return layout;
@@ -425,6 +443,14 @@ Vulkan_CreatePipelineLayout (vulkan_ctx_t *ctx, const char *name)
 VkSampler
 Vulkan_CreateSampler (vulkan_ctx_t *ctx, const char *name)
 {
+	hashtab_t  *tab = ctx->samplers;
+	const char *path;
+	path = va (ctx->va_ctx, "$"QFV_PROPERTIES".samplers.%s", name);
+	__auto_type sampler = (VkSampler) QFV_GetHandle (tab, path);
+	if (sampler) {
+		return sampler;
+	}
+
 	plitem_t   *item = qfv_load_pipeline (ctx, "samplers");
 	if (!(item = PL_ObjectForKey (item, name))) {
 		Sys_Printf ("error loading sampler %s\n", name);
@@ -432,7 +458,8 @@ Vulkan_CreateSampler (vulkan_ctx_t *ctx, const char *name)
 	} else {
 		Sys_Printf ("Found sampler def %s\n", name);
 	}
-	VkSampler sampler = QFV_ParseSampler (ctx, item);
+	sampler = QFV_ParseSampler (ctx, item);
+	QFV_AddHandle (tab, path, (uint64_t) sampler);
 	QFV_duSetObjectName (ctx->device, VK_OBJECT_TYPE_SAMPLER, sampler,
 						 va (ctx->va_ctx, "sampler:%s", name));
 	return sampler;
@@ -441,6 +468,14 @@ Vulkan_CreateSampler (vulkan_ctx_t *ctx, const char *name)
 VkDescriptorSetLayout
 Vulkan_CreateDescriptorSetLayout(vulkan_ctx_t *ctx, const char *name)
 {
+	hashtab_t  *tab = ctx->setLayouts;
+	const char *path;
+	path = va (ctx->va_ctx, "$"QFV_PROPERTIES".setLayouts.%s", name);
+	__auto_type set = (VkDescriptorSetLayout) QFV_GetHandle (tab, path);
+	if (set) {
+		return set;
+	}
+
 	plitem_t   *item = qfv_load_pipeline (ctx, "setLayouts");
 	if (!(item = PL_ObjectForKey (item, name))) {
 		Sys_Printf ("error loading descriptor set %s\n", name);
@@ -448,7 +483,8 @@ Vulkan_CreateDescriptorSetLayout(vulkan_ctx_t *ctx, const char *name)
 	} else {
 		Sys_Printf ("Found descriptor set def %s\n", name);
 	}
-	VkDescriptorSetLayout set = QFV_ParseDescriptorSetLayout (ctx, item);
+	set = QFV_ParseDescriptorSetLayout (ctx, item);
+	QFV_AddHandle (tab, path, (uint64_t) set);
 	QFV_duSetObjectName (ctx->device, VK_OBJECT_TYPE_DESCRIPTOR_SET_LAYOUT,
 						 set, va (ctx->va_ctx, "descriptor_set:%s", name));
 	return set;

From e929dca3006b1b549994056386f1f32ac4bf5916 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 4 Feb 2021 22:37:20 +0900
Subject: [PATCH 1410/1519] [util] Auto-cast plist string items

The casting uses a recursive call to the expression parser, so the
expressions are type-checked automatically.
---
 include/QF/cexpr.h                        |  3 +++
 libs/util/cexpr-type.c                    | 25 +++++++++++++++++++++++
 libs/video/renderer/vulkan/vkgen/vkenum.r |  2 +-
 libs/video/renderer/vulkan/vkparse.c      |  6 ++++++
 4 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/include/QF/cexpr.h b/include/QF/cexpr.h
index f511b6a9c..4e2dd3bcb 100644
--- a/include/QF/cexpr.h
+++ b/include/QF/cexpr.h
@@ -118,6 +118,9 @@ void cexpr_struct_pointer_getfield (const exprval_t *a, const exprval_t *b,
 exprval_t *cexpr_cvar (const char *name, exprctx_t *ctx);
 exprval_t *cexpr_cvar_struct (exprctx_t *ctx);
 
+void cexpr_cast_plitem (const exprval_t *val1, const exprval_t *src,
+						exprval_t *result, exprctx_t *ctx);
+
 void cexpr_init_symtab (exprtab_t *symtab, exprctx_t *ctx);
 
 char *cexpr_yyget_text (void *scanner);
diff --git a/libs/util/cexpr-type.c b/libs/util/cexpr-type.c
index c01e0cac0..1ba3b3f0f 100644
--- a/libs/util/cexpr-type.c
+++ b/libs/util/cexpr-type.c
@@ -100,6 +100,7 @@ binop_t int_binops[] = {
 	{ '^', &cexpr_int, &cexpr_int, int_xor },
 	{ '%', &cexpr_int, &cexpr_int, int_rem },
 	{ MOD, &cexpr_int, &cexpr_int, int_mod },
+	{ '=', &cexpr_plitem, &cexpr_int, cexpr_cast_plitem },
 	{}
 };
 
@@ -154,6 +155,7 @@ binop_t uint_binops[] = {
 	{ '%', &cexpr_uint, &cexpr_uint, uint_rem },
 	{ MOD, &cexpr_uint, &cexpr_uint, uint_rem },
 	{ '=', &cexpr_int,  &cexpr_uint, uint_cast_int },
+	{ '=', &cexpr_plitem, &cexpr_uint, cexpr_cast_plitem },
 	{}
 };
 
@@ -222,6 +224,7 @@ binop_t size_t_binops[] = {
 	{ MOD, &cexpr_size_t, &cexpr_size_t, size_t_rem },
 	{ '=', &cexpr_int,    &cexpr_size_t, size_t_cast_int },
 	{ '=', &cexpr_uint,   &cexpr_size_t, size_t_cast_uint },
+	{ '=', &cexpr_plitem, &cexpr_size_t, cexpr_cast_plitem },
 	{}
 };
 
@@ -310,6 +313,7 @@ binop_t float_binops[] = {
 	{ '%', &cexpr_float, &cexpr_float, float_rem },
 	{ MOD, &cexpr_float, &cexpr_float, float_mod },
 	{ '=', &cexpr_int,  &cexpr_float, float_cast_int },
+	{ '=', &cexpr_plitem, &cexpr_float, cexpr_cast_plitem },
 	{}
 };
 
@@ -366,6 +370,7 @@ binop_t double_binops[] = {
 	{ '/', &cexpr_double, &cexpr_double, double_div },
 	{ '%', &cexpr_double, &cexpr_double, double_rem },
 	{ MOD, &cexpr_double, &cexpr_double, double_mod },
+	{ '=', &cexpr_plitem, &cexpr_double, cexpr_cast_plitem },
 	{}
 };
 
@@ -595,6 +600,26 @@ exprtype_t cexpr_function = {
 	0,
 };
 
+void
+cexpr_cast_plitem (const exprval_t *val1, const exprval_t *src,
+				   exprval_t *result, exprctx_t *ctx)
+{
+	plitem_t   *item = *(plitem_t **) src->value;
+	const char *str = PL_String (item);
+	if (!str) {
+		cexpr_error (ctx, "not a string object: %d", PL_Line (item));
+		return;
+	}
+
+	exprctx_t   ectx = *ctx;
+	ectx.result = result;
+	cexpr_eval_string (str, &ectx);
+	ctx->errors += ectx.errors;
+	if (ectx.errors) {
+		cexpr_error (ctx, "could not convert: %d", PL_Line (item));
+	}
+}
+
 static void
 plitem_field (const exprval_t *a, const exprval_t *b, exprval_t *c,
 			  exprctx_t *ctx)
diff --git a/libs/video/renderer/vulkan/vkgen/vkenum.r b/libs/video/renderer/vulkan/vkgen/vkenum.r
index 7c974f6fb..b4dc8b79f 100644
--- a/libs/video/renderer/vulkan/vkgen/vkenum.r
+++ b/libs/video/renderer/vulkan/vkgen/vkenum.r
@@ -79,7 +79,7 @@ skip_value(string name)
 		fprintf (output_file, "\tflag_binops,\n");
 		fprintf (output_file, "\tflag_unops,\n");
 	} else {
-		fprintf (output_file, "\t0,\n");
+		fprintf (output_file, "\tenum_binops,\n");
 		fprintf (output_file, "\t0,\n");
 	}
 	fprintf (output_file, "};\n");
diff --git a/libs/video/renderer/vulkan/vkparse.c b/libs/video/renderer/vulkan/vkparse.c
index aa6c88325..90e8d5d5e 100644
--- a/libs/video/renderer/vulkan/vkparse.c
+++ b/libs/video/renderer/vulkan/vkparse.c
@@ -103,6 +103,12 @@ binop_t flag_binops[] = {
 	{ '|', 0, 0, flag_or },
 	{ '&', 0, 0, flag_and },
 	{ '=', &cexpr_int, 0, flag_cast_int },
+	{ '=', &cexpr_plitem, 0, cexpr_cast_plitem },
+	{}
+};
+
+binop_t enum_binops[] = {
+	{ '=', &cexpr_plitem, 0, cexpr_cast_plitem },
 	{}
 };
 

From 7ffe197564c20d990741ce7b1234f78dc7442596 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 5 Feb 2021 10:19:57 +0900
Subject: [PATCH 1411/1519] [vulkan] Remove some dead code

I forgot to delete that block of code after getting the new code working.
---
 libs/video/renderer/vulkan/vkparse.c | 39 ----------------------------
 1 file changed, 39 deletions(-)

diff --git a/libs/video/renderer/vulkan/vkparse.c b/libs/video/renderer/vulkan/vkparse.c
index 90e8d5d5e..1155e3242 100644
--- a/libs/video/renderer/vulkan/vkparse.c
+++ b/libs/video/renderer/vulkan/vkparse.c
@@ -773,45 +773,6 @@ QFV_ParseRenderPass (vulkan_ctx_t *ctx, plitem_t *plist)
 	free (renderpass_data.subpasses);
 	free (renderpass_data.dependencies);
 	return renderpass;
-
-/*	plitem_t   *messages = PL_NewArray ();
-	exprsym_t   var_syms[] = {
-		{"swapchain", &qfv_swapchain_t_type, ctx->swapchain},
-		{"framebuffers", &vulkan_framebufferset_t_type, &ctx->framebuffers},
-		{"msaaSamples", &VkSampleCountFlagBits_type, &ctx->msaaSamples},
-		{}
-	};
-	exprtab_t   vars_tab = { var_syms, 0 };
-	exprctx_t   exprctx = {};
-	parsectx_t  parsectx = { &exprctx, ctx };
-
-	exprctx.memsuper = new_memsuper ();
-	exprctx.messages = messages;
-	exprctx.hashlinks = &ctx->hashlinks;
-	exprctx.external_variables = &vars_tab;
-	cexpr_init_symtab (&vars_tab, &exprctx);
-
-	if (!PL_ParseStruct (renderpass_fields, plist, &renderpass_data,
-						 messages, &parsectx)) {
-		for (int i = 0; i < PL_A_NumObjects (messages); i++) {
-			Sys_Printf ("%s\n", PL_String (PL_ObjectAtIndex (messages, i)));
-		}
-		return 0;
-	}
-	PL_Free (messages);
-	delete_memsuper (exprctx.memsuper);
-
-	free (renderpass_data.attachments);
-	for (size_t i = 0; i < renderpass_data.subpasses->size; i++) {
-		free ((void *) renderpass_data.subpasses->a[i].pInputAttachments);
-		free ((void *) renderpass_data.subpasses->a[i].pColorAttachments);
-		free ((void *) renderpass_data.subpasses->a[i].pResolveAttachments);
-		free ((void *) renderpass_data.subpasses->a[i].pDepthStencilAttachment);
-		free ((void *) renderpass_data.subpasses->a[i].pPreserveAttachments);
-	}
-	free (renderpass_data.subpasses);
-	free (renderpass_data.dependencies);
-	return renderpass;*/
 }
 
 VkPipeline

From 1275067655b0f083be5a0d25a7c6608ec2889a16 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 5 Feb 2021 10:22:32 +0900
Subject: [PATCH 1412/1519] [vulkan] Rename vulkan_framebuffer_t

It turns out I had conflated frame buffers with frames and wound up
making a minor mess when separating the number of frames the renderer
could have in flight from the number of swap-chain images. This is the
first step towards correcting that mistake.
---
 include/vid_vulkan.h                          |  8 +--
 libs/video/renderer/vid_render_vulkan.c       | 49 +++++++++----------
 libs/video/renderer/vulkan/qfpipeline.plist   | 10 ++--
 libs/video/renderer/vulkan/vkparse.c          | 20 ++++----
 libs/video/renderer/vulkan/vulkan_alias.c     |  4 +-
 libs/video/renderer/vulkan/vulkan_bsp.c       |  6 +--
 libs/video/renderer/vulkan/vulkan_draw.c      |  6 +--
 .../video/renderer/vulkan/vulkan_vid_common.c | 20 ++++----
 8 files changed, 60 insertions(+), 63 deletions(-)

diff --git a/include/vid_vulkan.h b/include/vid_vulkan.h
index 38aa4b69f..4ddab99e3 100644
--- a/include/vid_vulkan.h
+++ b/include/vid_vulkan.h
@@ -22,7 +22,7 @@ typedef struct vulkan_framebuffer_s {
 	VkCommandBuffer cmdBuffer;
 
 	struct qfv_cmdbufferset_s *subCommand;
-} vulkan_framebuffer_t;
+} vulkan_frame_t;
 
 typedef struct vulkan_matrices_s {
 	VkBuffer    buffer_2d;
@@ -34,8 +34,8 @@ typedef struct vulkan_matrices_s {
 	float      *sky_3d;
 } vulkan_matrices_t;
 
-typedef struct vulkan_framebufferset_s
-	DARRAY_TYPE (vulkan_framebuffer_t) vulkan_framebufferset_t;
+typedef struct vulkan_frameset_s
+	DARRAY_TYPE (vulkan_frame_t) vulkan_frameset_t;
 
 typedef struct vulkan_ctx_s {
 	void        (*load_vulkan) (struct vulkan_ctx_s *ctx);
@@ -76,7 +76,7 @@ typedef struct vulkan_ctx_s {
 	struct qfv_stagebuf_s *staging;
 	VkPipeline  pipeline;
 	size_t      curFrame;
-	vulkan_framebufferset_t framebuffers;
+	vulkan_frameset_t frames;
 
 	struct qfv_tex_s *default_black;
 	struct qfv_tex_s *default_white;
diff --git a/libs/video/renderer/vid_render_vulkan.c b/libs/video/renderer/vid_render_vulkan.c
index ebca7b9b0..92e68b0a2 100644
--- a/libs/video/renderer/vid_render_vulkan.c
+++ b/libs/video/renderer/vid_render_vulkan.c
@@ -124,15 +124,14 @@ vulkan_R_RenderFrame (SCR_Func scr_3dfunc, SCR_Func *scr_funcs)
 	VkDevice    dev = device->dev;
 	qfv_queue_t *queue = &vulkan_ctx->device->queue;
 
-	__auto_type framebuffer
-		= &vulkan_ctx->framebuffers.a[vulkan_ctx->curFrame];
+	__auto_type frame = &vulkan_ctx->frames.a[vulkan_ctx->curFrame];
 
-	dfunc->vkWaitForFences (dev, 1, &framebuffer->fence, VK_TRUE, 2000000000);
-	if (framebuffer->framebuffer) {
-		dfunc->vkDestroyFramebuffer (dev, framebuffer->framebuffer, 0);
+	dfunc->vkWaitForFences (dev, 1, &frame->fence, VK_TRUE, 2000000000);
+	if (frame->framebuffer) {
+		dfunc->vkDestroyFramebuffer (dev, frame->framebuffer, 0);
 	}
 	QFV_AcquireNextImage (vulkan_ctx->swapchain,
-						  framebuffer->imageAvailableSemaphore,
+						  frame->imageAvailableSemaphore,
 						  0, &imageIndex);
 
 	int         attachCount = vulkan_ctx->msaaSamples > 1 ? 3 : 2;
@@ -146,9 +145,8 @@ vulkan_R_RenderFrame (SCR_Func scr_3dfunc, SCR_Func *scr_funcs)
 	}
 
 	VkRenderPass renderpass = vulkan_ctx->renderpass.renderpass;
-	framebuffer->framebuffer = QFV_CreateFramebuffer (device, renderpass,
-													  attachments,
-													  sc->extent, 1);
+	frame->framebuffer = QFV_CreateFramebuffer (device, renderpass,
+											    attachments, sc->extent, 1);
 
 	scr_3dfunc ();
 	while (*scr_funcs) {
@@ -172,41 +170,40 @@ vulkan_R_RenderFrame (SCR_Func scr_3dfunc, SCR_Func *scr_funcs)
 		3, clearValues
 	};
 
-	dfunc->vkBeginCommandBuffer (framebuffer->cmdBuffer, &beginInfo);
-	renderPassInfo.framebuffer = framebuffer->framebuffer;
-	dfunc->vkCmdBeginRenderPass (framebuffer->cmdBuffer, &renderPassInfo,
-			VK_SUBPASS_CONTENTS_SECONDARY_COMMAND_BUFFERS);
+	dfunc->vkBeginCommandBuffer (frame->cmdBuffer, &beginInfo);
+	renderPassInfo.framebuffer = frame->framebuffer;
+	dfunc->vkCmdBeginRenderPass (frame->cmdBuffer, &renderPassInfo,
+								 VK_SUBPASS_CONTENTS_SECONDARY_COMMAND_BUFFERS);
 
-	dfunc->vkCmdExecuteCommands (framebuffer->cmdBuffer,
-								 framebuffer->subCommand->size,
-								 framebuffer->subCommand->a);
+	dfunc->vkCmdExecuteCommands (frame->cmdBuffer, frame->subCommand->size,
+								 frame->subCommand->a);
 	// reset for next time around
-	framebuffer->subCommand->size = 0;
+	frame->subCommand->size = 0;
 
-	dfunc->vkCmdEndRenderPass (framebuffer->cmdBuffer);
-	dfunc->vkEndCommandBuffer (framebuffer->cmdBuffer);
+	dfunc->vkCmdEndRenderPass (frame->cmdBuffer);
+	dfunc->vkEndCommandBuffer (frame->cmdBuffer);
 
 	VkPipelineStageFlags waitStage
 		= VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
 	VkSubmitInfo submitInfo = {
 		VK_STRUCTURE_TYPE_SUBMIT_INFO, 0,
-		1, &framebuffer->imageAvailableSemaphore, &waitStage,
-		1, &framebuffer->cmdBuffer,
-		1, &framebuffer->renderDoneSemaphore,
+		1, &frame->imageAvailableSemaphore, &waitStage,
+		1, &frame->cmdBuffer,
+		1, &frame->renderDoneSemaphore,
 	};
-	dfunc->vkResetFences (dev, 1, &framebuffer->fence);
-	dfunc->vkQueueSubmit (queue->queue, 1, &submitInfo, framebuffer->fence);
+	dfunc->vkResetFences (dev, 1, &frame->fence);
+	dfunc->vkQueueSubmit (queue->queue, 1, &submitInfo, frame->fence);
 
 	VkPresentInfoKHR presentInfo = {
 		VK_STRUCTURE_TYPE_PRESENT_INFO_KHR, 0,
-		1, &framebuffer->renderDoneSemaphore,
+		1, &frame->renderDoneSemaphore,
 		1, &vulkan_ctx->swapchain->swapchain, &imageIndex,
 		0
 	};
 	dfunc->vkQueuePresentKHR (queue->queue, &presentInfo);
 
 	vulkan_ctx->curFrame++;
-	vulkan_ctx->curFrame %= vulkan_ctx->framebuffers.size;
+	vulkan_ctx->curFrame %= vulkan_ctx->frames.size;
 
 	if (++count >= 100) {
 		double currenTime = Sys_DoubleTime ();
diff --git a/libs/video/renderer/vulkan/qfpipeline.plist b/libs/video/renderer/vulkan/qfpipeline.plist
index 8ba2937c2..324e08e7c 100644
--- a/libs/video/renderer/vulkan/qfpipeline.plist
+++ b/libs/video/renderer/vulkan/qfpipeline.plist
@@ -55,25 +55,25 @@
 	descriptorPools = {
 		twod_pool = {
 			flags = 0;
-			maxSets = $framebuffers.size;
+			maxSets = $frames.size;
 			bindings = (
 				{
 					type = uniform_buffer;
-					descriptorCount = $framebuffers.size;
+					descriptorCount = $frames.size;
 				},
 				{
 					type = combined_image_sampler;
-					descriptorCount = $framebuffers.size;
+					descriptorCount = $frames.size;
 				},
 			);
 		};
 		alias_pool = {
 			flags = 0;
-			maxSets = "2z * $framebuffers.size";
+			maxSets = "2z * $frames.size";
 			bindings = (
 				{
 					type = uniform_buffer;
-					descriptorCount = "2z * $framebuffers.size";
+					descriptorCount = "2z * $frames.size";
 				},
 			);
 		};
diff --git a/libs/video/renderer/vulkan/vkparse.c b/libs/video/renderer/vulkan/vkparse.c
index 1155e3242..7e336a167 100644
--- a/libs/video/renderer/vulkan/vkparse.c
+++ b/libs/video/renderer/vulkan/vkparse.c
@@ -606,19 +606,19 @@ exprtype_t qfv_swapchain_t_type = {
 	&qfv_swapchain_t_symtab,
 };
 
-static exprsym_t vulkan_framebufferset_t_symbols[] = {
-	{"size", &cexpr_size_t, (void *)field_offset (vulkan_framebufferset_t, size)},
+static exprsym_t vulkan_frameset_t_symbols[] = {
+	{"size", &cexpr_size_t, (void *)field_offset (vulkan_frameset_t, size)},
 	{ }
 };
-static exprtab_t vulkan_framebufferset_t_symtab = {
-	vulkan_framebufferset_t_symbols,
+static exprtab_t vulkan_frameset_t_symtab = {
+	vulkan_frameset_t_symbols,
 };
-exprtype_t vulkan_framebufferset_t_type = {
-	"framebufferset",
-	sizeof (vulkan_framebufferset_t *),
+exprtype_t vulkan_frameset_t_type = {
+	"frameset",
+	sizeof (vulkan_frameset_t *),
 	cexpr_struct_binops,
 	0,
-	&vulkan_framebufferset_t_symtab,
+	&vulkan_frameset_t_symtab,
 };
 
 typedef struct qfv_renderpass_s {
@@ -684,7 +684,7 @@ QFV_InitParse (vulkan_ctx_t *ctx)
 	context.hashlinks = &ctx->hashlinks;
 	vkgen_init_symtabs (&context);
 	cexpr_init_symtab (&qfv_swapchain_t_symtab, &context);
-	cexpr_init_symtab (&vulkan_framebufferset_t_symtab, &context);
+	cexpr_init_symtab (&vulkan_frameset_t_symtab, &context);
 	cexpr_init_symtab (&imageset_symtab, &context);
 
 	if (!ctx->setLayouts) {
@@ -711,7 +711,7 @@ parse_object (vulkan_ctx_t *ctx, plitem_t *plist,
 	parsectx_t  parsectx = { &exprctx, ctx };
 	exprsym_t   var_syms[] = {
 		{"swapchain", &qfv_swapchain_t_type, ctx->swapchain},
-		{"framebuffers", &vulkan_framebufferset_t_type, &ctx->framebuffers},
+		{"frames", &vulkan_frameset_t_type, &ctx->frames},
 		{"msaaSamples", &VkSampleCountFlagBits_type, &ctx->msaaSamples},
 		{QFV_PROPERTIES, &cexpr_plitem, &ctx->pipelineDef},
 		{}
diff --git a/libs/video/renderer/vulkan/vulkan_alias.c b/libs/video/renderer/vulkan/vulkan_alias.c
index ad42daed4..67598dc96 100644
--- a/libs/video/renderer/vulkan/vulkan_alias.c
+++ b/libs/video/renderer/vulkan/vulkan_alias.c
@@ -153,7 +153,7 @@ Vulkan_AliasBegin (vulkan_ctx_t *ctx)
 	dlight_t   *lights[ALIAS_LIGHTS];
 	//XXX quat_t      fog;
 
-	__auto_type cframe = &ctx->framebuffers.a[ctx->curFrame];
+	__auto_type cframe = &ctx->frames.a[ctx->curFrame];
 	aliasframe_t *aframe = &actx->frames.a[ctx->curFrame];
 	VkCommandBuffer cmd = aframe->cmd;
 	DARRAY_APPEND (cframe->subCommand, cmd);
@@ -252,7 +252,7 @@ Vulkan_Alias_Init (vulkan_ctx_t *ctx)
 	aliasctx_t *actx = calloc (1, sizeof (aliasctx_t));
 	ctx->alias_context = actx;
 
-	size_t      frames = ctx->framebuffers.size;
+	size_t      frames = ctx->frames.size;
 	DARRAY_INIT (&actx->frames, frames);
 	DARRAY_RESIZE (&actx->frames, frames);
 	actx->frames.grow = 0;
diff --git a/libs/video/renderer/vulkan/vulkan_bsp.c b/libs/video/renderer/vulkan/vulkan_bsp.c
index 5ae835897..7028aa754 100644
--- a/libs/video/renderer/vulkan/vulkan_bsp.c
+++ b/libs/video/renderer/vulkan/vulkan_bsp.c
@@ -838,7 +838,7 @@ bsp_begin (vulkan_ctx_t *ctx)
 	bctx->default_color[3] = 1;
 	QuatCopy (bctx->default_color, bctx->last_color);
 
-	__auto_type cframe = &ctx->framebuffers.a[ctx->curFrame];
+	__auto_type cframe = &ctx->frames.a[ctx->curFrame];
 	bspframe_t *bframe = &bctx->frames.a[ctx->curFrame];
 	VkCommandBuffer cmd = bframe->bsp_cmd;
 	DARRAY_APPEND (cframe->subCommand, cmd);
@@ -991,7 +991,7 @@ sky_begin (vulkan_ctx_t *ctx)
 
 	spin (ctx->matrices.sky_3d, bctx);
 
-	__auto_type cframe = &ctx->framebuffers.a[ctx->curFrame];
+	__auto_type cframe = &ctx->frames.a[ctx->curFrame];
 	bspframe_t *bframe = &bctx->frames.a[ctx->curFrame];
 	VkCommandBuffer cmd = bframe->sky_cmd;
 	DARRAY_APPEND (cframe->subCommand, cmd);
@@ -1443,7 +1443,7 @@ Vulkan_Bsp_Init (vulkan_ctx_t *ctx)
 
 	DARRAY_INIT (&bctx->texture_chains, 64);
 
-	size_t      frames = ctx->framebuffers.size;
+	size_t      frames = ctx->frames.size;
 	DARRAY_INIT (&bctx->frames, frames);
 	DARRAY_RESIZE (&bctx->frames, frames);
 	bctx->frames.grow = 0;
diff --git a/libs/video/renderer/vulkan/vulkan_draw.c b/libs/video/renderer/vulkan/vulkan_draw.c
index ff7e6ed15..249ff933e 100644
--- a/libs/video/renderer/vulkan/vulkan_draw.c
+++ b/libs/video/renderer/vulkan/vulkan_draw.c
@@ -120,7 +120,7 @@ create_quad_buffers (vulkan_ctx_t *ctx)
 
 	size_t      vert_size;
 	size_t      ind_size;
-	size_t      frames = ctx->framebuffers.size;
+	size_t      frames = ctx->frames.size;
 	VkBuffer    vbuf, ibuf;
 	VkDeviceMemory vmem, imem;
 
@@ -357,7 +357,7 @@ Vulkan_Draw_Init (vulkan_ctx_t *ctx)
 	drawctx_t  *dctx = calloc (1, sizeof (drawctx_t));
 	ctx->draw_context = dctx;
 
-	size_t      frames = ctx->framebuffers.size;
+	size_t      frames = ctx->frames.size;
 	DARRAY_INIT (&dctx->frames, frames);
 	DARRAY_RESIZE (&dctx->frames, frames);
 	dctx->frames.grow = 0;
@@ -680,7 +680,7 @@ Vulkan_FlushText (vulkan_ctx_t *ctx)
 
 	qfv_device_t *device = ctx->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
-	__auto_type cframe = &ctx->framebuffers.a[ctx->curFrame];
+	__auto_type cframe = &ctx->frames.a[ctx->curFrame];
 	drawctx_t  *dctx = ctx->draw_context;
 	drawframe_t *dframe = &dctx->frames.a[ctx->curFrame];
 
diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c
index 21c21b085..54879cdbb 100644
--- a/libs/video/renderer/vulkan/vulkan_vid_common.c
+++ b/libs/video/renderer/vulkan/vulkan_vid_common.c
@@ -168,7 +168,7 @@ Vulkan_Shutdown_Common (vulkan_ctx_t *ctx)
 	if (ctx->pipeline) {
 		QFV_DestroyPipeline (ctx->device, ctx->pipeline);
 	}
-	if (ctx->framebuffers.size) {
+	if (ctx->frames.size) {
 		Vulkan_DestroyFramebuffers (ctx);
 	}
 	if (ctx->renderpass.colorImage) {
@@ -496,18 +496,18 @@ Vulkan_CreateFramebuffers (vulkan_ctx_t *ctx)
 	qfv_device_t *device = ctx->device;
 	VkCommandPool cmdpool = ctx->cmdpool;
 
-	if (!ctx->framebuffers.grow) {
-		DARRAY_INIT (&ctx->framebuffers, 4);
+	if (!ctx->frames.grow) {
+		DARRAY_INIT (&ctx->frames, 4);
 	}
 
-	DARRAY_RESIZE (&ctx->framebuffers, 3);//FIXME cvar
+	DARRAY_RESIZE (&ctx->frames, 3);//FIXME cvar
 
-	__auto_type cmdBuffers = QFV_AllocCommandBufferSet (ctx->framebuffers.size,
+	__auto_type cmdBuffers = QFV_AllocCommandBufferSet (ctx->frames.size,
 														alloca);
 	QFV_AllocateCommandBuffers (device, cmdpool, 0, cmdBuffers);
 
-	for (size_t i = 0; i < ctx->framebuffers.size; i++) {
-		__auto_type frame = &ctx->framebuffers.a[i];
+	for (size_t i = 0; i < ctx->frames.size; i++) {
+		__auto_type frame = &ctx->frames.a[i];
 		frame->framebuffer = 0;
 		frame->fence = QFV_CreateFence (device, 1);
 		frame->imageAvailableSemaphore = QFV_CreateSemaphore (device);
@@ -526,13 +526,13 @@ Vulkan_DestroyFramebuffers (vulkan_ctx_t *ctx)
 	qfv_devfuncs_t *df = device->funcs;
 	VkDevice    dev = device->dev;
 
-	for (size_t i = 0; i < ctx->framebuffers.size; i++) {
-		__auto_type frame = &ctx->framebuffers.a[i];
+	for (size_t i = 0; i < ctx->frames.size; i++) {
+		__auto_type frame = &ctx->frames.a[i];
 		df->vkDestroyFence (dev, frame->fence, 0);
 		df->vkDestroySemaphore (dev, frame->imageAvailableSemaphore, 0);
 		df->vkDestroySemaphore (dev, frame->renderDoneSemaphore, 0);
 		df->vkDestroyFramebuffer (dev, frame->framebuffer, 0);
 	}
 
-	DARRAY_CLEAR (&ctx->framebuffers);
+	DARRAY_CLEAR (&ctx->frames);
 }

From f633a846a123e2f9390e85bab53ee176dac0e9d5 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 5 Feb 2021 11:06:18 +0900
Subject: [PATCH 1413/1519] [vulkan] Make the frames in flight configurable

---
 include/QF/Vulkan/cvars.h                      |  1 +
 libs/video/renderer/vulkan/vulkan_vid_common.c | 18 +++++++++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/include/QF/Vulkan/cvars.h b/include/QF/Vulkan/cvars.h
index 706bc44de..54a34048b 100644
--- a/include/QF/Vulkan/cvars.h
+++ b/include/QF/Vulkan/cvars.h
@@ -3,5 +3,6 @@
 
 extern struct cvar_s *vulkan_use_validation;
 extern struct cvar_s *vulkan_presentation_mode;
+extern struct cvar_s *vulkan_frame_count;
 
 #endif//__QF_Vulkan_cvars_h
diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c
index 54879cdbb..4dcda5d86 100644
--- a/libs/video/renderer/vulkan/vulkan_vid_common.c
+++ b/libs/video/renderer/vulkan/vulkan_vid_common.c
@@ -78,6 +78,7 @@ static const char quakeforge_pipeline[] =
 #include "libs/video/renderer/vulkan/qfpipeline.plc"
 ;
 
+cvar_t *vulkan_frame_count;
 cvar_t *vulkan_presentation_mode;
 cvar_t *msaaSamples;
 
@@ -98,6 +99,15 @@ vulkan_presentation_mode_f (cvar_t *var)
 	}
 }
 
+static void
+vulkan_frame_count_f (cvar_t *var)
+{
+	if (var->int_val < 1) {
+		Sys_Printf ("Invalid frame count: %d. Setting to 1\n", var->int_val);
+		Cvar_Set (var, "1");
+	}
+}
+
 static void
 msaaSamples_f (cvar_t *var)
 {
@@ -125,6 +135,12 @@ Vulkan_Init_Cvars (void)
 										 CVAR_NONE, vulkan_presentation_mode_f,
 										 "desired presentation mode (may fall "
 										 "back to fifo).");
+	vulkan_frame_count = Cvar_Get ("vulkan_frame_count", "3", CVAR_NONE,
+								   vulkan_frame_count_f,
+								   "Number of frames to render in the"
+								   " background. More frames can increase"
+								   " performance, but at the cost of latency."
+								   " The default of 3 is recommended.");
 	msaaSamples = Cvar_Get ("msaaSamples", "VK_SAMPLE_COUNT_1_BIT",
 										 CVAR_NONE, msaaSamples_f,
 										 "desired MSAA sample size.");
@@ -500,7 +516,7 @@ Vulkan_CreateFramebuffers (vulkan_ctx_t *ctx)
 		DARRAY_INIT (&ctx->frames, 4);
 	}
 
-	DARRAY_RESIZE (&ctx->frames, 3);//FIXME cvar
+	DARRAY_RESIZE (&ctx->frames, vulkan_frame_count->int_val);
 
 	__auto_type cmdBuffers = QFV_AllocCommandBufferSet (ctx->frames.size,
 														alloca);

From c536a363ecd902634195ff702d7cb2907340e130 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 5 Feb 2021 11:10:43 +0900
Subject: [PATCH 1414/1519] [vulkan] Remove namehack.h

Never really wanted in the first place (back when I did the plugin
renderers), but I didn't feel like doing the required work to avoid it
at the time. At least with Vulkan being a fresh start in an environment
that's already plugin-friendly, there was no real work involved. I'll
get to the other renderers eventually (especially now that I know gdb
does the right thing when there are multiple functions with the same
name).
---
 libs/video/renderer/vid_render_vulkan.c      |   5 -
 libs/video/renderer/vulkan/namehack.h        | 135 -------------------
 libs/video/renderer/vulkan/vulkan_draw.c     |   3 -
 libs/video/renderer/vulkan/vulkan_lightmap.c |   3 -
 libs/video/renderer/vulkan/vulkan_main.c     |   3 -
 5 files changed, 149 deletions(-)
 delete mode 100644 libs/video/renderer/vulkan/namehack.h

diff --git a/libs/video/renderer/vid_render_vulkan.c b/libs/video/renderer/vid_render_vulkan.c
index 92e68b0a2..a41a1d960 100644
--- a/libs/video/renderer/vid_render_vulkan.c
+++ b/libs/video/renderer/vid_render_vulkan.c
@@ -30,9 +30,6 @@
 
 #include <stdlib.h>
 
-//#define NH_DEFINE
-//#include "vulkan/namehack.h"
-
 #include "QF/darray.h"
 #include "QF/sys.h"
 
@@ -59,8 +56,6 @@
 #include "vid_internal.h"
 #include "vid_vulkan.h"
 
-#include "vulkan/namehack.h"
-
 static vulkan_ctx_t *vulkan_ctx;
 
 static tex_t *
diff --git a/libs/video/renderer/vulkan/namehack.h b/libs/video/renderer/vulkan/namehack.h
deleted file mode 100644
index 17f107080..000000000
--- a/libs/video/renderer/vulkan/namehack.h
+++ /dev/null
@@ -1,135 +0,0 @@
-#ifdef NH_DEFINE
-#undef NH_DEFINE
-#define Draw_Init vulkan_Draw_Init
-#define Draw_Character vulkan_Draw_Character
-#define Draw_String vulkan_Draw_String
-#define Draw_nString vulkan_Draw_nString
-#define Draw_AltString vulkan_Draw_AltString
-#define Draw_ConsoleBackground vulkan_Draw_ConsoleBackground
-#define Draw_Crosshair vulkan_Draw_Crosshair
-#define Draw_CrosshairAt vulkan_Draw_CrosshairAt
-#define Draw_TileClear vulkan_Draw_TileClear
-#define Draw_Fill vulkan_Draw_Fill
-#define Draw_TextBox vulkan_Draw_TextBox
-#define Draw_FadeScreen vulkan_Draw_FadeScreen
-#define Draw_BlendScreen vulkan_Draw_BlendScreen
-#define Draw_CachePic vulkan_Draw_CachePic
-#define Draw_UncachePic vulkan_Draw_UncachePic
-#define Draw_MakePic vulkan_Draw_MakePic
-#define Draw_DestroyPic vulkan_Draw_DestroyPic
-#define Draw_PicFromWad vulkan_Draw_PicFromWad
-#define Draw_Pic vulkan_Draw_Pic
-#define Draw_Picf vulkan_Draw_Picf
-#define Draw_SubPic vulkan_Draw_SubPic
-#define Fog_DisableGFog vulkan_Fog_DisableGFog
-#define Fog_EnableGFog vulkan_Fog_EnableGFog
-#define Fog_GetColor vulkan_Fog_GetColor
-#define Fog_GetDensity vulkan_Fog_GetDensity
-#define Fog_Init vulkan_Fog_Init
-#define Fog_ParseWorldspawn vulkan_Fog_ParseWorldspawn
-#define Fog_SetupFrame vulkan_Fog_SetupFrame
-#define Fog_StartAdditive vulkan_Fog_StartAdditive
-#define Fog_StopAdditive vulkan_Fog_StopAdditive
-#define Fog_Update vulkan_Fog_Update
-#define R_AddTexture vulkan_R_AddTexture
-#define R_BlendLightmaps vulkan_R_BlendLightmaps
-#define R_BuildLightMap vulkan_R_BuildLightMap
-#define R_CalcLightmaps vulkan_R_CalcLightmaps
-#define R_ClearParticles vulkan_R_ClearParticles
-#define R_ClearState vulkan_R_ClearState
-#define R_ClearTextures vulkan_R_ClearTextures
-#define R_DrawAliasModel vulkan_R_DrawAliasModel
-#define R_DrawBrushModel vulkan_R_DrawBrushModel
-#define R_DrawParticles vulkan_R_DrawParticles
-#define R_DrawSky vulkan_R_DrawSky
-#define R_DrawSkyChain vulkan_R_DrawSkyChain
-#define R_DrawSprite vulkan_R_DrawSprite
-#define R_DrawSpriteModel vulkan_R_DrawSpriteModel
-#define R_DrawWaterSurfaces vulkan_R_DrawWaterSurfaces
-#define R_DrawWorld vulkan_R_DrawWorld
-#define R_InitBubble vulkan_R_InitBubble
-#define R_InitGraphTextures vulkan_R_InitGraphTextures
-#define R_InitParticles vulkan_R_InitParticles
-#define R_InitSky vulkan_R_InitSky
-#define R_InitSprites vulkan_R_InitSprites
-#define R_InitSurfaceChains vulkan_R_InitSurfaceChains
-#define R_LineGraph vulkan_R_LineGraph
-#define R_LoadSky_f vulkan_R_LoadSky_f
-#define R_LoadSkys vulkan_R_LoadSkys
-#define R_NewMap vulkan_R_NewMap
-#define R_Particle_New vulkan_R_Particle_New
-#define R_Particle_NewRandom vulkan_R_Particle_NewRandom
-#define R_Particles_Init_Cvars vulkan_R_Particles_Init_Cvars
-#define R_ReadPointFile_f vulkan_R_ReadPointFile_f
-#define R_RenderDlights vulkan_R_RenderDlights
-#define R_RenderView vulkan_R_RenderView
-#define R_RotateForEntity vulkan_R_RotateForEntity
-#define R_SetupFrame vulkan_R_SetupFrame
-#define R_SpriteBegin vulkan_R_SpriteBegin
-#define R_SpriteEnd vulkan_R_SpriteEnd
-#define R_TimeRefresh_f vulkan_R_TimeRefresh_f
-#define R_ViewChanged vulkan_R_ViewChanged
-#define SCR_CaptureBGR vulkan_SCR_CaptureBGR
-#define SCR_ScreenShot vulkan_SCR_ScreenShot
-#define SCR_ScreenShot_f vulkan_SCR_ScreenShot_f
-#define c_alias_polys vulkan_c_alias_polys
-#define c_brush_polys vulkan_c_brush_polys
-#define r_easter_eggs_f vulkan_r_easter_eggs_f
-#define r_particles_style_f vulkan_r_particles_style_f
-#define r_world_matrix vulkan_r_world_matrix
-#else
-#undef Fog_DisableGFog
-#undef Fog_EnableGFog
-#undef Fog_GetColor
-#undef Fog_GetDensity
-#undef Fog_Init
-#undef Fog_ParseWorldspawn
-#undef Fog_SetupFrame
-#undef Fog_StartAdditive
-#undef Fog_StopAdditive
-#undef Fog_Update
-#undef R_AddTexture
-#undef R_BlendLightmaps
-#undef R_BuildLightMap
-#undef R_CalcLightmaps
-#undef R_ClearParticles
-#undef R_ClearState
-#undef R_ClearTextures
-#undef R_DrawAliasModel
-#undef R_DrawBrushModel
-#undef R_DrawParticles
-#undef R_DrawSky
-#undef R_DrawSkyChain
-#undef R_DrawSpriteModel
-#undef R_DrawWaterSurfaces
-#undef R_DrawWorld
-#undef R_Init
-#undef R_InitBubble
-#undef R_InitGraphTextures
-#undef R_InitParticles
-#undef R_InitSky
-#undef R_InitSprites
-#undef R_InitSurfaceChains
-#undef R_LineGraph
-#undef R_LoadSky_f
-#undef R_LoadSkys
-#undef R_NewMap
-#undef R_Particle_New
-#undef R_Particle_NewRandom
-#undef R_Particles_Init_Cvars
-#undef R_ReadPointFile_f
-#undef R_RenderDlights
-#undef R_RenderView
-#undef R_RotateForEntity
-#undef R_SetupFrame
-#undef R_TimeRefresh_f
-#undef R_ViewChanged
-#undef SCR_CaptureBGR
-#undef SCR_ScreenShot
-#undef SCR_ScreenShot_f
-#undef c_alias_polys
-#undef c_brush_polys
-#undef r_easter_eggs_f
-#undef r_particles_style_f
-#undef r_world_matrix
-#endif
diff --git a/libs/video/renderer/vulkan/vulkan_draw.c b/libs/video/renderer/vulkan/vulkan_draw.c
index 249ff933e..b03cb9e38 100644
--- a/libs/video/renderer/vulkan/vulkan_draw.c
+++ b/libs/video/renderer/vulkan/vulkan_draw.c
@@ -31,9 +31,6 @@
 # include "config.h"
 #endif
 
-#define NH_DEFINE
-#include "namehack.h"
-
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif
diff --git a/libs/video/renderer/vulkan/vulkan_lightmap.c b/libs/video/renderer/vulkan/vulkan_lightmap.c
index ca5d433e8..97c30c667 100644
--- a/libs/video/renderer/vulkan/vulkan_lightmap.c
+++ b/libs/video/renderer/vulkan/vulkan_lightmap.c
@@ -30,9 +30,6 @@
 # include "config.h"
 #endif
 
-#define NH_DEFINE
-#include "namehack.h"
-
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif
diff --git a/libs/video/renderer/vulkan/vulkan_main.c b/libs/video/renderer/vulkan/vulkan_main.c
index 8df89eaa1..b4bdc8872 100644
--- a/libs/video/renderer/vulkan/vulkan_main.c
+++ b/libs/video/renderer/vulkan/vulkan_main.c
@@ -31,9 +31,6 @@
 # include "config.h"
 #endif
 
-#define NH_DEFINE
-#include "namehack.h"
-
 #ifdef HAVE_STRING_H
 # include "string.h"
 #endif

From f023675f8c205d78c0de6202edf0a8a483406f52 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 5 Feb 2021 16:25:08 +0900
Subject: [PATCH 1415/1519] [vulkan] Clean up draw's memory handling a little

Use cmem for pic and cachpic name allocations. If nothing else, it at
least keeps memory a little less fragmented.
---
 libs/video/renderer/vulkan/vulkan_draw.c | 44 ++++++++++++++++--------
 1 file changed, 29 insertions(+), 15 deletions(-)

diff --git a/libs/video/renderer/vulkan/vulkan_draw.c b/libs/video/renderer/vulkan/vulkan_draw.c
index b03cb9e38..93b73d7b3 100644
--- a/libs/video/renderer/vulkan/vulkan_draw.c
+++ b/libs/video/renderer/vulkan/vulkan_draw.c
@@ -38,6 +38,7 @@
 # include <strings.h>
 #endif
 
+#include "QF/cmem.h"
 #include "QF/cvar.h"
 #include "QF/draw.h"
 #include "QF/dstring.h"
@@ -69,7 +70,6 @@ typedef struct {
 } drawvert_t;
 
 typedef struct cachepic_s {
-	struct cachepic_s *next;
 	char       *name;
 	qpic_t     *pic;
 } cachepic_t;
@@ -92,6 +92,11 @@ typedef struct drawctx_s {
 	qpic_t     *conchars;
 	qpic_t     *conback;
 	qpic_t     *white_pic;
+	// use two separate cmem blocks for pics and strings (cachepic names)
+	// to ensure the names are never in the same cacheline as a pic since the
+	// names are used only for lookup
+	memsuper_t *pic_memsuper;
+	memsuper_t *string_memsuper;
 	hashtab_t  *pic_cache;
 	VkBuffer    vert_buffer;
 	VkDeviceMemory vert_memory;
@@ -211,32 +216,34 @@ flush_draw_scrap (vulkan_ctx_t *ctx)
 }
 
 static void
-pic_free (qpic_t *pic)
+pic_free (drawctx_t *dctx, qpic_t *pic)
 {
 	subpic_t   *subpic = *(subpic_t **) pic->data;
 	QFV_SubpicDelete (subpic);
-	free (pic);
+	cmemfree (dctx->pic_memsuper, pic);
 }
 
-//FIXME use cmem?
 static cachepic_t *
-new_cachepic (const char *name, qpic_t *pic)
+new_cachepic (drawctx_t *dctx, const char *name, qpic_t *pic)
 {
 	cachepic_t *cp;
+	size_t      size = strlen (name) + 1;
 
-	cp = malloc (sizeof (cachepic_t));
-	cp->name = strdup (name);
+	cp = cmemalloc (dctx->pic_memsuper, sizeof (cachepic_t));
+	cp->name = cmemalloc (dctx->string_memsuper, size);
+	memcpy (cp->name, name, size);
 	cp->pic = pic;
 	return cp;
 }
 
 static void
-cachepic_free (void *_cp, void *unused)
+cachepic_free (void *_cp, void *_dctx)
 {
+	drawctx_t  *dctx = _dctx;
 	cachepic_t *cp = (cachepic_t *) _cp;
-	pic_free (cp->pic);
-	free (cp->name);
-	free (cp);
+	pic_free (dctx, cp->pic);
+	cmemfree (dctx->string_memsuper, cp->name);
+	cmemfree (dctx->pic_memsuper, cp);
 }
 
 static const char *
@@ -252,7 +259,8 @@ pic_data (const char *name, int w, int h, const byte *data, drawctx_t *dctx)
 	subpic_t   *subpic;
 	byte       *picdata;
 
-	pic = malloc (field_offset (qpic_t, data[sizeof (subpic_t)]));
+	pic = cmemalloc (dctx->pic_memsuper,
+					 field_offset (qpic_t, data[sizeof (subpic_t *)]));
 	pic->width = w;
 	pic->height = h;
 
@@ -292,7 +300,8 @@ Vulkan_Draw_PicFromWad (const char *name, vulkan_ctx_t *ctx)
 	if (!wadpic) {
 		return 0;
 	}
-	return pic_data (name, wadpic->width, wadpic->height, wadpic->data, ctx->draw_context);
+	return pic_data (name, wadpic->width, wadpic->height, wadpic->data,
+					 ctx->draw_context);
 }
 
 qpic_t *
@@ -313,7 +322,7 @@ Vulkan_Draw_CachePic (const char *path, qboolean alpha, vulkan_ctx_t *ctx)
 
 	pic = pic_data (path, p->width, p->height, p->data, dctx);
 	free (p);
-	cpic = new_cachepic (path, pic);
+	cpic = new_cachepic (dctx, path, pic);
 	Hash_Add (dctx->pic_cache, cpic);
 	return pic;
 }
@@ -341,6 +350,9 @@ Vulkan_Draw_Shutdown (vulkan_ctx_t *ctx)
 	destroy_quad_buffers (ctx);
 
 	dfunc->vkDestroyPipeline (device->dev, dctx->pipeline, 0);
+	Hash_DelTable (dctx->pic_cache);
+	delete_memsuper (dctx->pic_memsuper);
+	delete_memsuper (dctx->string_memsuper);
 	QFV_DestroyScrap (dctx->scrap);
 	QFV_DestroyStagingBuffer (dctx->stage);
 }
@@ -359,8 +371,10 @@ Vulkan_Draw_Init (vulkan_ctx_t *ctx)
 	DARRAY_RESIZE (&dctx->frames, frames);
 	dctx->frames.grow = 0;
 
+	dctx->pic_memsuper = new_memsuper ();
+	dctx->string_memsuper = new_memsuper ();
 	dctx->pic_cache = Hash_NewTable (127, cachepic_getkey, cachepic_free,
-										 0, 0);
+									 dctx, 0);
 
 	create_quad_buffers (ctx);
 	dctx->stage = QFV_CreateStagingBuffer (device, "draw", 4 * 1024 * 1024,

From 84dc73da2c0cad9e469610aac169d4120cd44bb6 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 5 Feb 2021 21:42:35 +0900
Subject: [PATCH 1416/1519] [test] Get the tests building again

They happen to all pass, which is nice :)
---
 libs/models/test/testclip.c                    | 5 +++--
 libs/models/test/testcontents.c                | 4 ++--
 libs/models/test/testportals.c                 | 4 ++--
 libs/video/renderer/vulkan/staging.c           | 2 +-
 libs/video/renderer/vulkan/test/test-staging.c | 2 +-
 tools/qfcc/test/test-harness.c                 | 4 ++--
 6 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/libs/models/test/testclip.c b/libs/models/test/testclip.c
index 6b6672e4b..f0f774c1e 100644
--- a/libs/models/test/testclip.c
+++ b/libs/models/test/testclip.c
@@ -6,6 +6,7 @@
 #include "QF/va.h"
 
 #include "getopt.h"
+#include "mod_internal.h"
 #include "world.h"
 
 #include "hulls.h"
@@ -323,9 +324,9 @@ run_test (test_t *test)
 		err = 1;
 
 	if (test->desc)
-		desc = va ("(%d) %s", (int)(long)(test - tests), test->desc);
+		desc = va (0, "(%d) %s", (int)(long)(test - tests), test->desc);
 	else
-		desc = va ("test #%d", (int)(long)(test - tests));
+		desc = va (0, "test #%d", (int)(long)(test - tests));
 	if (verbose >= 0 || err) {
 		if (output)
 			puts("");
diff --git a/libs/models/test/testcontents.c b/libs/models/test/testcontents.c
index 605ed7a6c..17b20f3ae 100644
--- a/libs/models/test/testcontents.c
+++ b/libs/models/test/testcontents.c
@@ -145,9 +145,9 @@ run_test (test_t *test)
 		res = 1;
 
 	if (test->desc)
-		desc = va ("(%d) %s", (int)(long)(test - tests), test->desc);
+		desc = va (0, "(%d) %s", (int)(long)(test - tests), test->desc);
 	else
-		desc = va ("test #%d", (int)(long)(test - tests));
+		desc = va (0, "test #%d", (int)(long)(test - tests));
 	if (verbose >= 0 || !res) {
 		if (output)
 			puts("");
diff --git a/libs/models/test/testportals.c b/libs/models/test/testportals.c
index 1cc2f50ec..facfa2914 100644
--- a/libs/models/test/testportals.c
+++ b/libs/models/test/testportals.c
@@ -170,9 +170,9 @@ nodeleaf_bail:
 	MOD_FreeBrushes (test->hull);
 
 	if (test->desc)
-		desc = va ("(%d) %s", (int)(long)(test - tests), test->desc);
+		desc = va (0, "(%d) %s", (int)(long)(test - tests), test->desc);
 	else
-		desc = va ("test #%d", (int)(long)(test - tests));
+		desc = va (0, "test #%d", (int)(long)(test - tests));
 	if (verbose >= 0 || err) {
 		if (output)
 			puts("");
diff --git a/libs/video/renderer/vulkan/staging.c b/libs/video/renderer/vulkan/staging.c
index cb3bb8ad0..759962c4d 100644
--- a/libs/video/renderer/vulkan/staging.c
+++ b/libs/video/renderer/vulkan/staging.c
@@ -56,7 +56,7 @@
 #include "vid_vulkan.h"
 
 qfv_stagebuf_t *
-QFV_CreateStagingBuffer (qfv_device_t *device, const char * name, size_t size,
+QFV_CreateStagingBuffer (qfv_device_t *device, const char *name, size_t size,
 						 VkCommandPool cmdPool)
 {
 	size_t atom = device->physDev->properties.limits.nonCoherentAtomSize;
diff --git a/libs/video/renderer/vulkan/test/test-staging.c b/libs/video/renderer/vulkan/test/test-staging.c
index 020af9ab2..fcfa4b8a9 100644
--- a/libs/video/renderer/vulkan/test/test-staging.c
+++ b/libs/video/renderer/vulkan/test/test-staging.c
@@ -179,7 +179,7 @@ _error (int line, const char *fmt, ...)
 int
 main (void)
 {
-	qfv_stagebuf_t *stage = QFV_CreateStagingBuffer (&device, 1024, 0);
+	qfv_stagebuf_t *stage = QFV_CreateStagingBuffer (&device, "", 1024, 0);
 
 	if (stage->size != 1024) {
 		error ("stage has incorrect size: %zd", stage->size);
diff --git a/tools/qfcc/test/test-harness.c b/tools/qfcc/test/test-harness.c
index 69de8c47b..822df9f41 100644
--- a/tools/qfcc/test/test-harness.c
+++ b/tools/qfcc/test/test-harness.c
@@ -104,7 +104,7 @@ load_file (progs_t *pr, const char *name, off_t *_size)
 
 	file = open_file (name, &size);
 	if (!file) {
-		file = open_file (va ("%s.gz", name), &size);
+		file = open_file (va (0, "%s.gz", name), &size);
 		if (!file) {
 			return 0;
 		}
@@ -132,7 +132,7 @@ static void
 init_qf (void)
 {
 	Sys_Init ();
-	Cvar_Get ("developer", va ("%d", options.developer), 0, 0, 0);
+	Cvar_Get ("developer", va (0, "%d", options.developer), 0, 0, 0);
 
 	Memory_Init (Sys_Alloc (1024 * 1024), 1024 * 1024);
 

From dfa7af03c6d4b96c3e2339bf23a695f5d97203cb Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 9 Feb 2021 09:57:07 +0900
Subject: [PATCH 1417/1519] [util] Plug a thread-safety hole in plists

---
 include/QF/progs.h                             |  4 +++-
 include/QF/qfplist.h                           | 11 +++++++++--
 libs/audio/cd_file.c                           |  2 +-
 libs/gamecode/pr_parse.c                       | 12 ++++++------
 libs/ruamoko/rua_plist.c                       |  7 ++++---
 libs/util/qfplist.c                            | 12 +++++++-----
 libs/util/quakefs.c                            |  4 ++--
 libs/video/renderer/vulkan/vulkan_vid_common.c |  3 ++-
 nq/source/host_cmd.c                           |  8 ++++----
 tools/qflight/source/entities.c                |  4 ++--
 tools/qflight/source/properties.c              |  2 +-
 11 files changed, 41 insertions(+), 28 deletions(-)

diff --git a/include/QF/progs.h b/include/QF/progs.h
index 64a9d20bb..89fa5d181 100644
--- a/include/QF/progs.h
+++ b/include/QF/progs.h
@@ -298,13 +298,15 @@ void ED_PrintNum (progs_t *pr, pr_int_t ent);
 // pr_parse.c
 struct script_s;
 struct plitem_s;
+struct hashlink_s;
 qboolean ED_ParseEpair (progs_t *pr, pr_type_t *base, pr_def_t *key,
 						const char *s);
 struct plitem_s *ED_EntityDict (progs_t *pr, edict_t *ed);
 struct plitem_s *ED_GlobalsDict (progs_t *pr);
 void ED_InitGlobals (progs_t *pr, struct plitem_s *globals);
 void ED_InitEntity (progs_t *pr, struct plitem_s *entity, edict_t *ent);
-struct plitem_s *ED_ConvertToPlist (struct script_s *script, int nohack);
+struct plitem_s *ED_ConvertToPlist (struct script_s *script, int nohack,
+									struct hashlink_s **hashlinks);
 struct plitem_s *ED_Parse (progs_t *pr, const char *data);
 void ED_LoadFromFile (progs_t *pr, const char *data);
 void ED_EntityParseFunction (progs_t *pr);
diff --git a/include/QF/qfplist.h b/include/QF/qfplist.h
index 8f8db669f..5de86d05f 100644
--- a/include/QF/qfplist.h
+++ b/include/QF/qfplist.h
@@ -28,6 +28,8 @@
 #ifndef __QF_qfplist_h
 #define __QF_qfplist_h
 
+struct hashlink_s;
+
 /** \defgroup qfplist Property lists
 	\ingroup utils
 */
@@ -115,11 +117,14 @@ typedef struct plelement_s {
 /** Create an in-memory representation of the contents of a property list.
 
 	\param string	the saved plist, as read from a file.
+	\param hashlinks Hashlink chain to use when creating dictionaries (see
+					Hash_NewTable()). May be null.
 
 	\return Returns an object equivalent to the passed-in string.
 	\note You are responsible for freeing the returned object.
 */
-plitem_t *PL_GetPropertyList (const char *string);
+plitem_t *PL_GetPropertyList (const char *string,
+							  struct hashlink_s **hashlinks);
 
 /** Create a property list string from the in-memory representation.
 
@@ -275,9 +280,11 @@ plitem_t *PL_RemoveObjectAtIndex (plitem_t *array, int index);
 
 /** Create a new dictionary object.
 	The dictionary will be empty.
+	\param hashlinks Hashlink chain to use when creating dictionaries (see
+					Hash_NewTable()). May be null.
 	\return the new dictionary object
 */
-plitem_t *PL_NewDictionary (void);
+plitem_t *PL_NewDictionary (struct hashlink_s **hashlinks);
 
 /** Create a new array object.
 	The array will be empty.
diff --git a/libs/audio/cd_file.c b/libs/audio/cd_file.c
index ef9979bd9..5ffe88290 100644
--- a/libs/audio/cd_file.c
+++ b/libs/audio/cd_file.c
@@ -172,7 +172,7 @@ Load_Tracklist (void)
 	buffile = calloc (size+10, sizeof (char));
 	Qread (oggfile, buffile, size);
 
-	tracklist = PL_GetPropertyList (buffile);
+	tracklist = PL_GetPropertyList (buffile, 0);
 	if (!tracklist || PL_Type (tracklist) != QFDictionary) {
 		Sys_Printf ("Malformed or empty tracklist file. check mus_ogglist\n");
 		return -1;
diff --git a/libs/gamecode/pr_parse.c b/libs/gamecode/pr_parse.c
index 6471a44bb..0f0a3dea5 100644
--- a/libs/gamecode/pr_parse.c
+++ b/libs/gamecode/pr_parse.c
@@ -109,7 +109,7 @@ VISIBLE plitem_t *
 ED_EntityDict (progs_t *pr, edict_t *ed)
 {
 	dstring_t  *dstr = dstring_newstr ();
-	plitem_t   *entity = PL_NewDictionary ();
+	plitem_t   *entity = PL_NewDictionary (pr->hashlink_freelist);
 	pr_uint_t   i;
 	int         j;
 	int         type;
@@ -155,7 +155,7 @@ VISIBLE plitem_t *
 ED_GlobalsDict (progs_t *pr)
 {
 	dstring_t  *dstr = dstring_newstr ();
-	plitem_t   *globals = PL_NewDictionary ();
+	plitem_t   *globals = PL_NewDictionary (pr->hashlink_freelist);
 	pr_uint_t   i;
 	const char *name;
 	const char *value;
@@ -290,7 +290,7 @@ ED_ParseEpair (progs_t *pr, pr_type_t *base, pr_def_t *key, const char *s)
 */
 
 VISIBLE plitem_t *
-ED_ConvertToPlist (script_t *script, int nohack)
+ED_ConvertToPlist (script_t *script, int nohack, struct hashlink_s **hashlinks)
 {
 	dstring_t  *dstr = dstring_newstr ();
 	plitem_t   *plist = PL_NewArray ();
@@ -304,7 +304,7 @@ ED_ConvertToPlist (script_t *script, int nohack)
 		token = script->token->str;
 		if (!strequal (token, "{"))
 			Sys_Error ("ED_ConvertToPlist: EOF without closing brace");
-		ent = PL_NewDictionary ();
+		ent = PL_NewDictionary (hashlinks);
 		while (1) {
 			int         n;
 
@@ -499,11 +499,11 @@ ED_Parse (progs_t *pr, const char *data)
 	if (Script_GetToken (script, 1)) {
 		if (strequal (script->token->str, "(")) {
 			// new style (plist) entity data
-			entity_list = PL_GetPropertyList (data);
+			entity_list = PL_GetPropertyList (data, pr->hashlink_freelist);
 		} else {
 			// oldstyle entity data
 			Script_UngetToken (script);
-			entity_list = ED_ConvertToPlist (script, 0);
+			entity_list = ED_ConvertToPlist (script, 0, pr->hashlink_freelist);
 		}
 	}
 	Script_Delete (script);
diff --git a/libs/ruamoko/rua_plist.c b/libs/ruamoko/rua_plist.c
index d45ee1b8d..ce5030e5c 100644
--- a/libs/ruamoko/rua_plist.c
+++ b/libs/ruamoko/rua_plist.c
@@ -195,7 +195,7 @@ bi_PL_GetFromFile (progs_t *pr)
 	Qread (file, buf, len);
 	buf[len] = 0;
 
-	plitem = PL_GetPropertyList (buf);
+	plitem = PL_GetPropertyList (buf, pr->hashlink_freelist);
 
 	R_INT (pr) = plist_retain (res, plitem);
 }
@@ -204,7 +204,8 @@ static void
 bi_PL_GetPropertyList (progs_t *pr)
 {
 	plist_resources_t *res = PR_Resources_Find (pr, "plist");
-	plitem_t   *plitem = PL_GetPropertyList (P_GSTRING (pr, 0));
+	plitem_t   *plitem = PL_GetPropertyList (P_GSTRING (pr, 0),
+											 pr->hashlink_freelist);
 
 	R_INT (pr) = plist_retain (res, plitem);
 }
@@ -373,7 +374,7 @@ static void
 bi_PL_NewDictionary (progs_t *pr)
 {
 	plist_resources_t *res = PR_Resources_Find (pr, "plist");
-	plitem_t   *plitem = PL_NewDictionary ();
+	plitem_t   *plitem = PL_NewDictionary (pr->hashlink_freelist);
 
 	R_INT (pr) = plist_retain (res, plitem);
 }
diff --git a/libs/util/qfplist.c b/libs/util/qfplist.c
index f36b6552e..9d4a7b2bf 100644
--- a/libs/util/qfplist.c
+++ b/libs/util/qfplist.c
@@ -91,6 +91,7 @@ typedef struct pldata_s {	// Unparsed property list string
 	unsigned    line;
 	plitem_t   *error;
 	va_ctx_t   *va_ctx;
+	hashlink_t **hashlinks;
 } pldata_t;
 
 //	Ugly defines for fast checking and conversion from char to number
@@ -157,11 +158,11 @@ PL_NewItem (pltype_t type)
 }
 
 VISIBLE plitem_t *
-PL_NewDictionary (void)
+PL_NewDictionary (hashlink_t **hashlinks)
 {
 	plitem_t   *item = PL_NewItem (QFDictionary);
-	//FIXME need a per-thread hashlink freelist for plist to be thread-safe
-	hashtab_t  *dict = Hash_NewTable (1021, dict_get_key, dict_free, NULL, 0);
+	hashtab_t  *dict = Hash_NewTable (1021, dict_get_key, dict_free, NULL,
+									  hashlinks);
 	item->data = dict;
 	return item;
 }
@@ -722,7 +723,7 @@ PL_ParsePropertyListItem (pldata_t *pl)
 	switch (pl->ptr[pl->pos]) {
 	case '{':
 	{
-		item = PL_NewDictionary ();
+		item = PL_NewDictionary (pl->hashlinks);
 		item->line = pl->line;
 
 		pl->pos++;
@@ -880,7 +881,7 @@ PL_ParsePropertyListItem (pldata_t *pl)
 }
 
 VISIBLE plitem_t *
-PL_GetPropertyList (const char *string)
+PL_GetPropertyList (const char *string, hashlink_t **hashlinks)
 {
 	pldata_t	*pl = calloc (1, sizeof (pldata_t));
 	plitem_t	*newpl = NULL;
@@ -894,6 +895,7 @@ PL_GetPropertyList (const char *string)
 	pl->error = NULL;
 	pl->line = 1;
 	pl->va_ctx = va_create_context (4);
+	pl->hashlinks = hashlinks;
 
 	if ((newpl = PL_ParsePropertyListItem (pl))) {
 		va_destroy_context (pl->va_ctx);
diff --git a/libs/util/quakefs.c b/libs/util/quakefs.c
index 683378904..569fab341 100644
--- a/libs/util/quakefs.c
+++ b/libs/util/quakefs.c
@@ -672,7 +672,7 @@ qfs_load_config (void)
 	buf[len + 2] = 0;
 	if (qfs_gd_plist)
 		PL_Free (qfs_gd_plist);
-	qfs_gd_plist = PL_GetPropertyList (buf);
+	qfs_gd_plist = PL_GetPropertyList (buf, 0);
 	free (buf);
 	if (qfs_gd_plist && PL_Type (qfs_gd_plist) == QFDictionary)
 		return;		// done
@@ -680,7 +680,7 @@ qfs_load_config (void)
 no_config:
 	if (qfs_gd_plist)
 		PL_Free (qfs_gd_plist);
-	qfs_gd_plist = PL_GetPropertyList (qfs_default_dirconf);
+	qfs_gd_plist = PL_GetPropertyList (qfs_default_dirconf, 0);
 }
 
 /*
diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c
index 4dcda5d86..0132bf6d0 100644
--- a/libs/video/renderer/vulkan/vulkan_vid_common.c
+++ b/libs/video/renderer/vulkan/vulkan_vid_common.c
@@ -244,7 +244,8 @@ static plitem_t *
 qfv_load_pipeline (vulkan_ctx_t *ctx, const char *name)
 {
 	if (!ctx->pipelineDef) {
-		ctx->pipelineDef = PL_GetPropertyList (quakeforge_pipeline);
+		ctx->pipelineDef = PL_GetPropertyList (quakeforge_pipeline,
+											   &ctx->hashlinks);
 	}
 
 	plitem_t   *item = ctx->pipelineDef;
diff --git a/nq/source/host_cmd.c b/nq/source/host_cmd.c
index 76529838e..c7e138f23 100644
--- a/nq/source/host_cmd.c
+++ b/nq/source/host_cmd.c
@@ -434,7 +434,7 @@ entities_array (void)
 static plitem_t *
 game_dict (void)
 {
-	plitem_t   *game = PL_NewDictionary ();
+	plitem_t   *game = PL_NewDictionary (0);
 
 	PL_D_AddObject (game, "comment",
 					PL_NewString (va (0, "%-21s kills:%3i/%3i", cl.levelname,
@@ -455,7 +455,7 @@ game_dict (void)
 static plitem_t *
 convert_to_game_dict (script_t *script)
 {
-	plitem_t   *game = PL_NewDictionary ();
+	plitem_t   *game = PL_NewDictionary (0);
 	plitem_t   *item;
 	plitem_t   *list;
 	int         skill;
@@ -500,7 +500,7 @@ convert_to_game_dict (script_t *script)
 	PL_D_AddObject (game, "lightstyles", item);
 
 	// load the edicts out of the savegame file
-	list = ED_ConvertToPlist (script, 0);
+	list = ED_ConvertToPlist (script, 0, 0);
 	item = PL_RemoveObjectAtIndex (list, 0);
 	PL_D_AddObject (game, "globals", item);
 	PL_D_AddObject (game, "entities", list);
@@ -647,7 +647,7 @@ Host_Loadgame_f (void)
 			Sys_Printf ("Unexpected EOF reading %s\n", name->str);
 			goto end;
 		}
-		game = PL_GetPropertyList (script->p);
+		game = PL_GetPropertyList (script->p, 0);
 	} else {
 		sscanf (script->token->str, "%i", &version);
 		if (version != SAVEGAME_VERSION) {
diff --git a/tools/qflight/source/entities.c b/tools/qflight/source/entities.c
index 1383004df..d3c608f6f 100644
--- a/tools/qflight/source/entities.c
+++ b/tools/qflight/source/entities.c
@@ -179,7 +179,7 @@ LoadEntities (void)
 
 	script = Script_New ();
 	Script_Start (script, "ent data", bsp->entdata);
-	entity_list = ED_ConvertToPlist (script, 1);
+	entity_list = ED_ConvertToPlist (script, 1, 0);
 	Script_Delete (script);
 
 	// start parsing
@@ -208,7 +208,7 @@ LoadEntities (void)
 		}
 		entity->dict = PL_ObjectAtIndex (entity_list, i);
 
-		dict = PL_NewDictionary ();
+		dict = PL_NewDictionary (0);
 
 		// go through all the keys in this entity
 		keys = PL_D_AllKeys (entity->dict);
diff --git a/tools/qflight/source/properties.c b/tools/qflight/source/properties.c
index e7774f6d4..c9297984b 100644
--- a/tools/qflight/source/properties.c
+++ b/tools/qflight/source/properties.c
@@ -334,6 +334,6 @@ LoadProperties (const char *filename)
 	Qread (f, buf, len);
 	Qclose (f);
 	buf[len] = 0;
-	properties = PL_GetPropertyList (buf);
+	properties = PL_GetPropertyList (buf, 0);
 	free (buf);
 }

From 8664a5b969a8f9f78a22bab9c55d9d38210f43a1 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 9 Feb 2021 10:02:04 +0900
Subject: [PATCH 1418/1519] [util] Enable parser debugging for cexpr

Not actually turned on in the code, but cexpr_yydebug is present.
---
 libs/util/cexpr-lex.l   | 2 ++
 libs/util/cexpr-parse.y | 1 +
 2 files changed, 3 insertions(+)

diff --git a/libs/util/cexpr-lex.l b/libs/util/cexpr-lex.l
index d34cd250a..46fbcdd55 100644
--- a/libs/util/cexpr-lex.l
+++ b/libs/util/cexpr-lex.l
@@ -50,6 +50,8 @@
 #include "QF/qfplist.h"
 #include "QF/sys.h"
 
+#define CEXPR_YYDEBUG 1
+
 #include "QF/cexpr.h"
 #include "libs/util/cexpr-parse.h"
 
diff --git a/libs/util/cexpr-parse.y b/libs/util/cexpr-parse.y
index 07993af9b..599955afd 100644
--- a/libs/util/cexpr-parse.y
+++ b/libs/util/cexpr-parse.y
@@ -27,6 +27,7 @@
 %define api.prefix {cexpr_yy}
 %define api.pure full
 %define api.push-pull push
+%define parse.trace
 %parse-param {void *scanner} {exprctx_t *context}
 
 %{

From fdba8228099c2a547c530228b9861e31f80d8a45 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 9 Feb 2021 14:43:45 +0900
Subject: [PATCH 1419/1519] [util] Fix a code-comment disagreement

And the comment was correct :P
---
 include/QF/darray.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/QF/darray.h b/include/QF/darray.h
index 2b8689726..f79403283 100644
--- a/include/QF/darray.h
+++ b/include/QF/darray.h
@@ -121,9 +121,9 @@
 #define DARRAY_CLEAR(array)												\
 	do {																\
 		__auto_type ar = (array);										\
-		free (ar->a);													\
 		ar->size = 0;													\
 		if (ar->grow) {													\
+			free (ar->a);												\
 			ar->maxSize = 0;											\
 			ar->a = 0;													\
 		}																\

From c8afbdf0f5a0f1e07ebfdb8fa8bb62f3e83137e6 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 9 Feb 2021 14:56:11 +0900
Subject: [PATCH 1420/1519] [util] Add an object-based fixed array allocator

---
 include/QF/darray.h | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/include/QF/darray.h b/include/QF/darray.h
index f79403283..50dc6c348 100644
--- a/include/QF/darray.h
+++ b/include/QF/darray.h
@@ -88,6 +88,30 @@
 		ar;																\
 	})
 
+/**	Allocate a fixed-size array using the given allocator
+
+	The allocated array is initilized to be ungrowable, and with both size
+	and maxSize set to the given size.
+
+	\param array_type	Expression acceptable by typeof for determining the
+						type of the array.
+	\param array_size   The size of the array.
+	\param alloc		Allocator taking (obj, size) where obj is allocator
+						specific data (eg, a memory pool).
+	\param data			Additional data for the allocator.
+*/
+#define DARRAY_ALLOCFIXED_OBJ(array_type, array_size, alloc, obj)		\
+	({																	\
+		__auto_type s = (array_size);									\
+		typeof (array_type) *ar = alloc ((obj),							\
+										 sizeof(*ar)					\
+										 + s * sizeof (*ar->a));		\
+		ar->size = ar->maxSize = s;										\
+		ar->grow = 0;													\
+		ar->a = (typeof (ar->a)) (ar + 1);								\
+		ar;																\
+	})
+
 /**	Initialized the array.
 
 	The array will be initialized to be empty but with grow set to the

From a408fd40daacb4b15cfc2ee7d67defde3951c199 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 9 Feb 2021 14:56:48 +0900
Subject: [PATCH 1421/1519] [util] Make plist more const-correct

---
 include/QF/qfplist.h | 8 ++++----
 libs/util/qfplist.c  | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/include/QF/qfplist.h b/include/QF/qfplist.h
index 5de86d05f..89cb00a85 100644
--- a/include/QF/qfplist.h
+++ b/include/QF/qfplist.h
@@ -185,7 +185,7 @@ const char *PL_String (const plitem_t *string) __attribute__((pure));
 	\note	You are NOT responsible for freeing the returned object. It will
 	be destroyed when its container is.
 */
-plitem_t *PL_ObjectForKey (plitem_t *dict, const char *key);
+plitem_t *PL_ObjectForKey (const plitem_t *dict, const char *key);
 
 /** Remove a value from a dictionary object.
 
@@ -195,7 +195,7 @@ plitem_t *PL_ObjectForKey (plitem_t *dict, const char *key);
 	isn't a dictionary.
 	\note	You are responsible for freeing the returned object.
 */
-plitem_t *PL_RemoveObjectForKey (plitem_t *dict, const char *key);
+plitem_t *PL_RemoveObjectForKey (const plitem_t *dict, const char *key);
 
 /** Retrieve a value from an array object.
 
@@ -206,7 +206,7 @@ plitem_t *PL_RemoveObjectForKey (plitem_t *dict, const char *key);
 	\note	You are NOT responsible for freeing the returned object. It will
 	be destroyed when its container is.
 */
-plitem_t *PL_ObjectAtIndex (plitem_t *array, int index) __attribute__((pure));
+plitem_t *PL_ObjectAtIndex (const plitem_t *array, int index) __attribute__((pure));
 
 /** Retrieve a list of all keys in a dictionary.
 
@@ -222,7 +222,7 @@ plitem_t *PL_D_AllKeys (plitem_t *dict);
 
 	\return Returns the number of keys in the dictionary.
 */
-int PL_D_NumKeys (plitem_t *dict) __attribute__((pure));
+int PL_D_NumKeys (const plitem_t *dict) __attribute__((pure));
 
 /** Add a key/value pair to a dictionary.
 
diff --git a/libs/util/qfplist.c b/libs/util/qfplist.c
index 9d4a7b2bf..b40fec69a 100644
--- a/libs/util/qfplist.c
+++ b/libs/util/qfplist.c
@@ -264,7 +264,7 @@ PL_String (const plitem_t *string)
 }
 
 VISIBLE plitem_t *
-PL_ObjectForKey (plitem_t *dict, const char *key)
+PL_ObjectForKey (const plitem_t *dict, const char *key)
 {
 	hashtab_t  *table = (hashtab_t *) dict->data;
 	dictkey_t  *k;
@@ -277,7 +277,7 @@ PL_ObjectForKey (plitem_t *dict, const char *key)
 }
 
 VISIBLE plitem_t *
-PL_RemoveObjectForKey (plitem_t *dict, const char *key)
+PL_RemoveObjectForKey (const plitem_t *dict, const char *key)
 {
 	hashtab_t  *table = (hashtab_t *) dict->data;
 	dictkey_t  *k;
@@ -320,7 +320,7 @@ PL_D_AllKeys (plitem_t *dict)
 }
 
 VISIBLE int
-PL_D_NumKeys (plitem_t *dict)
+PL_D_NumKeys (const plitem_t *dict)
 {
 	if (dict->type != QFDictionary)
 		return 0;
@@ -328,7 +328,7 @@ PL_D_NumKeys (plitem_t *dict)
 }
 
 VISIBLE plitem_t *
-PL_ObjectAtIndex (plitem_t *array, int index)
+PL_ObjectAtIndex (const plitem_t *array, int index)
 {
 	plarray_t  *arr = (plarray_t *) array->data;
 

From 14e4fd9f6a4a8403bead6e1c3dd62a7ea97039ae Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 9 Feb 2021 15:01:55 +0900
Subject: [PATCH 1422/1519] [util] Pass context to the plist array/symtab
 parser allocator

---
 include/QF/qfplist.h                 | 10 +++++-----
 libs/util/qfplist.c                  |  8 ++++----
 libs/video/renderer/vulkan/vkparse.c | 14 ++++++++++----
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/include/QF/qfplist.h b/include/QF/qfplist.h
index 89cb00a85..67eb68588 100644
--- a/include/QF/qfplist.h
+++ b/include/QF/qfplist.h
@@ -109,7 +109,7 @@ typedef struct plfield_s {
 typedef struct plelement_s {
 	pltype_t    type;		///< the required type of the array elements
 	size_t      stride;		///< the size of each element
-	void     *(*alloc) (size_t size);	///< allocator for array memory
+	void     *(*alloc) (void *ctx, size_t size);///< allocator for array memory
 	plparser_t  parser;		///< custom parser function
 	void       *data;		///< additional data for \a parser
 } plelement_t;
@@ -360,7 +360,7 @@ void PL_TypeMismatch (plitem_t *messages, const plitem_t *item,
 int PL_ParseStruct (const plfield_t *fields, const plitem_t *dict,
 					void *data, plitem_t *messages, void *context);
 
-/**	Parse an array object into a dynamic arrah (see darray.h).
+/**	Parse an array object into a dynamic array (see darray.h).
 
 	For each object in the array, the field item is used to determine how to
 	parse the object. If the array is empty, the destination will be
@@ -378,7 +378,7 @@ int PL_ParseStruct (const plfield_t *fields, const plitem_t *dict,
 	\param array	The array object to parse
 	\param data     Pointer to the pointer to which the dynamic array will
 					be written. The dynamic array is allocated using
-					DARRAY_ALLOCFIXED().
+					DARRAY_ALLOCFIXED_OBJ().
 	\param messages Array object supplied by the caller used for storing
 					messages. The messages may or may not indicate errors (its
 					contents are not checked). This function itself will add
@@ -390,7 +390,7 @@ int PL_ParseStruct (const plfield_t *fields, const plitem_t *dict,
 					message format is "[line number]: [message]". If the line
 					number is 0, then the actual line is unknown (due to the
 					source item not being parsed from a file or string).
-	\param context	Additional context data passed to the parser.
+	\param context	Additional context data passed to the parser and allocator.
 	\return			0 if there are any errors, 1 if there are no errors.
 */
 int PL_ParseArray (const plfield_t *field, const plitem_t *array,
@@ -438,7 +438,7 @@ int PL_ParseArray (const plfield_t *field, const plitem_t *array,
 					message format is "[line number]: [message]". If the line
 					number is 0, then the actual line is unknown (due to the
 					source item not being parsed from a file or string).
-	\param context	Additional context data passed to the parser.
+	\param context	Additional context data passed to the parser and allocator.
 	\return			0 if there are any errors, 1 if there are no errors.
 */
 int PL_ParseSymtab (const plfield_t *field, const plitem_t *dict,
diff --git a/libs/util/qfplist.c b/libs/util/qfplist.c
index b40fec69a..4b7e34e7a 100644
--- a/libs/util/qfplist.c
+++ b/libs/util/qfplist.c
@@ -1272,8 +1272,8 @@ PL_ParseArray (const plfield_t *field, const plitem_t *array, void *data,
 		parser = pl_default_parser;
 	}
 
-	arr = DARRAY_ALLOCFIXED (arr_t, plarray->numvals * element->stride,
-							 element->alloc);
+	arr = DARRAY_ALLOCFIXED_OBJ (arr_t, plarray->numvals * element->stride,
+								 element->alloc, context);
 	memset (arr->a, 0, arr->size);
 	// the array is allocated using bytes, but need the actual number of
 	// elements in the array
@@ -1329,7 +1329,7 @@ PL_ParseSymtab (const plfield_t *field, const plitem_t *dict, void *data,
 		return 1;
 	}
 
-	void       *obj = element->alloc (element->stride);
+	void       *obj = element->alloc (context, element->stride);
 	memset (obj, 0, element->stride);
 	while ((current = (dictkey_t *) *l++)) {
 		const char *key = current->key;
@@ -1349,7 +1349,7 @@ PL_ParseSymtab (const plfield_t *field, const plitem_t *dict, void *data,
 				result = 0;
 			} else {
 				Hash_Add (tab, obj);
-				obj = element->alloc (element->stride);
+				obj = element->alloc (context, element->stride);
 				memset (obj, 0, element->stride);
 			}
 		}
diff --git a/libs/video/renderer/vulkan/vkparse.c b/libs/video/renderer/vulkan/vkparse.c
index 7e336a167..3f02b8022 100644
--- a/libs/video/renderer/vulkan/vkparse.c
+++ b/libs/video/renderer/vulkan/vkparse.c
@@ -259,6 +259,12 @@ parse_single (const plfield_t *field, const plitem_t *item,
 	return 1;
 }
 
+static void *
+array_alloc (void *context, size_t size)
+{
+	return malloc (size);
+}
+
 static int
 parse_array (const plfield_t *field, const plitem_t *item,
 			 void *data, plitem_t *messages, void *context)
@@ -270,7 +276,7 @@ parse_array (const plfield_t *field, const plitem_t *item,
 	plelement_t element = {
 		array->type,
 		array->stride,
-		malloc,
+		array_alloc,
 		array->parser,
 		0,
 	};
@@ -630,7 +636,7 @@ typedef struct qfv_renderpass_s {
 static plelement_t parse_qfv_renderpass_attachments_data = {
 	QFDictionary,
 	sizeof (VkAttachmentDescription),
-	malloc,
+	array_alloc,
 	parse_VkAttachmentDescription,
 	0,
 };
@@ -638,7 +644,7 @@ static plelement_t parse_qfv_renderpass_attachments_data = {
 static plelement_t parse_qfv_renderpass_subpasses_data = {
 	QFDictionary,
 	sizeof (VkSubpassDescription),
-	malloc,
+	array_alloc,
 	parse_VkSubpassDescription,
 	0,
 };
@@ -646,7 +652,7 @@ static plelement_t parse_qfv_renderpass_subpasses_data = {
 static plelement_t parse_qfv_renderpass_dependencies_data = {
 	QFDictionary,
 	sizeof (VkSubpassDependency),
-	malloc,
+	array_alloc,
 	parse_VkSubpassDependency,
 	0,
 };

From bc763da9f696ac020358925216ed0d52f0b4777f Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 9 Feb 2021 15:02:22 +0900
Subject: [PATCH 1423/1519] [qfcc] Fix a typo in the man page

---
 tools/qfcc/doc/man/qfcc.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/qfcc/doc/man/qfcc.1 b/tools/qfcc/doc/man/qfcc.1
index 4105eaa1d..045aa8963 100644
--- a/tools/qfcc/doc/man/qfcc.1
+++ b/tools/qfcc/doc/man/qfcc.1
@@ -100,7 +100,7 @@ For each source file (listed either on the command line, or in
 \fBprogs.src\fP, write a file whose name is the base name of the source
 file with an extension of \fB.frame\fP, and contains a list of frame macro
 names with their associated frame numbers. Eg, \fBplayer.qc\fP will produce
-\fBplayer.frame\fPa. Note that files that do not create frame macros will
+\fBplayer.frame\fP. Note that files that do not create frame macros will
 not generate a frame file. At this time, the file is always written to the
 current directory.
 

From 0dcd946063e1b602c4b30850feab0407094c2e85 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 9 Feb 2021 15:24:28 +0900
Subject: [PATCH 1424/1519] [util] Add plist parser for dictionary -> array

PL_ParseLabeledArray works the same way as PL_ParseArray, but instead
takes a dictionary object. The keys of the items are ignored, and the
order is not preserved (at this stage), but this is a cleaner solution
to getting an array of objects when the definitions of those objects
need to be accessible by name as well.
---
 include/QF/qfplist.h | 39 +++++++++++++++++++++++++++
 libs/util/qfplist.c  | 63 +++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 98 insertions(+), 4 deletions(-)

diff --git a/include/QF/qfplist.h b/include/QF/qfplist.h
index 67eb68588..3e1086be0 100644
--- a/include/QF/qfplist.h
+++ b/include/QF/qfplist.h
@@ -396,6 +396,45 @@ int PL_ParseStruct (const plfield_t *fields, const plitem_t *dict,
 int PL_ParseArray (const plfield_t *field, const plitem_t *array,
 				   void *data, plitem_t *messages, void *context);
 
+/**	Parse a dictionary object into a dynamic array (see darray.h).
+
+	This is useful when the dictionary object is meant to be a labeled list
+	rather than a representation of a structure.
+
+	For each object in the array, the field item is used to determine how to
+	parse the object. If the array is empty, the destination will be
+	initialized to an empty array.
+
+	When an error occurs (incorrect item type (item type does not match the
+	type specified in the element object) or the element object's \a parser
+	returns 0), processing continues but the error result is returned.
+
+	Can be used recursively to parse deep hierarchies.
+
+	\param field	Pointer to a single field that has the field data pointer
+					set to reference a plelement_t object used to describe
+					the contents of the array.
+	\param dict		The dict object to parse
+	\param data     Pointer to the pointer to which the dynamic array will
+					be written. The dynamic array is allocated using
+					DARRAY_ALLOCFIXED_OBJ().
+	\param messages Array object supplied by the caller used for storing
+					messages. The messages may or may not indicate errors (its
+					contents are not checked). This function itself will add
+					only string objects.
+					If there are any errors, suitable messages will be found in
+					the \a messages object. However, just because there are no
+					errors doesn't mean that \a messages will remain empty as
+					a field's \a parser may add other messages. The standard
+					message format is "[line number]: [message]". If the line
+					number is 0, then the actual line is unknown (due to the
+					source item not being parsed from a file or string).
+	\param context	Additional context data passed to the parser and allocator.
+	\return			0 if there are any errors, 1 if there are no errors.
+*/
+int PL_ParseLabeledArray (const plfield_t *field, const plitem_t *dict,
+						  void *data, plitem_t *messages, void *context);
+
 /**	Parse a dictionary object into a hash table.
 
 	For each key in the dictionary, the element object is used to determine
diff --git a/libs/util/qfplist.c b/libs/util/qfplist.c
index 4b7e34e7a..6bee78c3f 100644
--- a/libs/util/qfplist.c
+++ b/libs/util/qfplist.c
@@ -1211,10 +1211,7 @@ PL_ParseStruct (const plfield_t *fields, const plitem_t *dict, void *data,
 		return 0;
 	}
 
-	if (!(l = list = Hash_GetList ((hashtab_t *) dict->data))) {
-		// empty struct: leave as default
-		return 1;
-	}
+	l = list = Hash_GetList ((hashtab_t *) dict->data);
 
 	while ((current = (dictkey_t *) *l++)) {
 		const plfield_t *f;
@@ -1299,6 +1296,64 @@ PL_ParseArray (const plfield_t *field, const plitem_t *array, void *data,
 	return result;
 }
 
+VISIBLE int
+PL_ParseLabeledArray (const plfield_t *field, const plitem_t *dict,
+					  void *data, plitem_t *messages, void *context)
+{
+	void      **list, **l;
+	dictkey_t  *current;
+	int         result = 1;
+	plparser_t  parser;
+	plelement_t *element = (plelement_t *) field->data;
+	typedef struct arr_s DARRAY_TYPE(byte) arr_t;
+	arr_t      *arr;
+	plfield_t   f = { 0, 0, element->type, element->parser, element->data };
+
+	if (dict->type != QFDictionary) {
+		PL_Message (messages, dict, "error: not a dictionary object");
+		return 0;
+	}
+	if (f.parser) {
+		parser = f.parser;
+	} else {
+		parser = pl_default_parser;
+	}
+
+	list = Hash_GetList ((hashtab_t *) dict->data);
+
+	int         numvals = 0;
+	for (l = list; *l; l++) {
+		numvals++;
+	}
+
+	arr = DARRAY_ALLOCFIXED_OBJ (arr_t, numvals * element->stride,
+								 element->alloc, context);
+	memset (arr->a, 0, arr->size);
+	// the array is allocated using bytes, but need the actual number of
+	// elements in the array
+	arr->size = arr->maxSize = numvals;
+
+	for (int i = 0; i < numvals; i++) {
+		current = list[i];
+		plitem_t   *item = current->value;
+		void       *eledata = &arr->a[i * element->stride];
+
+		if (!PL_CheckType (element->type, item->type)) {
+			char        index[16];
+			snprintf (index, sizeof(index) - 1, "%d", i);
+			index[15] = 0;
+			PL_TypeMismatch (messages, item, index, element->type, item->type);
+			result = 0;
+		} else {
+			if (!parser (&f, item, eledata, messages, context)) {
+				result = 0;
+			}
+		}
+	}
+	*(arr_t **) data = arr;
+	return result;
+}
+
 VISIBLE int
 PL_ParseSymtab (const plfield_t *field, const plitem_t *dict, void *data,
 				plitem_t *messages, void *context)

From 5535d1f8e6f32cc7817dce3c2b624ea90ff8eeb1 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 9 Feb 2021 16:53:21 +0900
Subject: [PATCH 1425/1519] [util] Keep track of plist dictionary key order

The order in which keys are added to the dictionary object is
maintained. Adding a key after removing an old key adds the new key to
the end of the list rather than reusing the old key's spot.
---
 include/QF/qfplist.h |  16 +++-
 libs/util/qfplist.c  | 169 ++++++++++++++++++++++++-------------------
 2 files changed, 109 insertions(+), 76 deletions(-)

diff --git a/include/QF/qfplist.h b/include/QF/qfplist.h
index 3e1086be0..f1cc95b8a 100644
--- a/include/QF/qfplist.h
+++ b/include/QF/qfplist.h
@@ -197,12 +197,24 @@ plitem_t *PL_ObjectForKey (const plitem_t *dict, const char *key);
 */
 plitem_t *PL_RemoveObjectForKey (const plitem_t *dict, const char *key);
 
+/** Retrieve a key from a dictionary object.
+
+	\param dict		The dictionary to get the key from
+	\param index	The index of the key
+	\return the key at the specified index, or NULL if index is out of range or
+	dict is not a dictionaly
+	isn't an array.
+	\note	You are NOT responsible for freeing the returned object. It will
+	be destroyed when its container is.
+*/
+const char *PL_KeyAtIndex (const plitem_t *array, int index) __attribute__((pure));
+
 /** Retrieve a value from an array object.
 
 	\param array	The array to get the value from
 	\param index	The index within the array to retrieve
-	\return the value associated with the key, or NULL if not found or array
-	isn't an array.
+	\return the value at the specified index, or NULL if index is out of range
+	or array is not an array.
 	\note	You are NOT responsible for freeing the returned object. It will
 	be destroyed when its container is.
 */
diff --git a/libs/util/qfplist.c b/libs/util/qfplist.c
index 6bee78c3f..6e4726c95 100644
--- a/libs/util/qfplist.c
+++ b/libs/util/qfplist.c
@@ -64,6 +64,12 @@ struct dictkey_s {
 };
 typedef struct dictkey_s	dictkey_t;
 
+struct pldict_s {
+	hashtab_t  *tab;
+	struct DARRAY_TYPE (dictkey_t *) keys;
+};
+typedef struct pldict_s     pldict_t;
+
 /*
 	Arrays
 */
@@ -161,8 +167,9 @@ VISIBLE plitem_t *
 PL_NewDictionary (hashlink_t **hashlinks)
 {
 	plitem_t   *item = PL_NewItem (QFDictionary);
-	hashtab_t  *dict = Hash_NewTable (1021, dict_get_key, dict_free, NULL,
-									  hashlinks);
+	pldict_t   *dict = malloc (sizeof (pldict_t));
+	dict->tab = Hash_NewTable (1021, dict_get_key, dict_free, NULL, hashlinks);
+	DARRAY_INIT (&dict->keys, 8);
 	item->data = dict;
 	return item;
 }
@@ -205,18 +212,25 @@ PL_NewString (const char *str)
 VISIBLE void
 PL_Free (plitem_t *item)
 {
+	pldict_t   *dict;
+	plarray_t  *array;
+
 	switch (item->type) {
 		case QFDictionary:
-			Hash_DelTable (item->data);
+			dict = item->data;
+			Hash_DelTable (dict->tab);
+			DARRAY_CLEAR (&dict->keys);
 			break;
 
-		case QFArray: {
-				int 	i = ((plarray_t *) item->data)->numvals;
+		case QFArray:
+			{
+				array = item->data;
+				int 	i = array->numvals;
 
 				while (i-- > 0) {
-					PL_Free (((plarray_t *) item->data)->values[i]);
+					PL_Free (array->values[i]);
 				}
-				free (((plarray_t *) item->data)->values);
+				free (array->values);
 				free (item->data);
 			}
 			break;
@@ -264,67 +278,85 @@ PL_String (const plitem_t *string)
 }
 
 VISIBLE plitem_t *
-PL_ObjectForKey (const plitem_t *dict, const char *key)
+PL_ObjectForKey (const plitem_t *item, const char *key)
 {
-	hashtab_t  *table = (hashtab_t *) dict->data;
+	pldict_t   *dict = (pldict_t *) item->data;
 	dictkey_t  *k;
 
-	if (dict->type != QFDictionary)
+	if (item->type != QFDictionary)
 		return NULL;
 
-	k = (dictkey_t *) Hash_Find (table, key);
+	k = (dictkey_t *) Hash_Find (dict->tab, key);
 	return k ? k->value : NULL;
 }
 
-VISIBLE plitem_t *
-PL_RemoveObjectForKey (const plitem_t *dict, const char *key)
+VISIBLE const char *
+PL_KeyAtIndex (const plitem_t *item, int index)
 {
-	hashtab_t  *table = (hashtab_t *) dict->data;
+	pldict_t   *dict = (pldict_t *) item->data;
+
+	if (item->type != QFDictionary)
+		return NULL;
+	if (index < 0 || (size_t) index >= dict->keys.size) {
+		return NULL;
+	}
+
+	return dict->keys.a[index]->key;
+}
+
+VISIBLE plitem_t *
+PL_RemoveObjectForKey (const plitem_t *item, const char *key)
+{
+	pldict_t   *dict = (pldict_t *) item->data;
 	dictkey_t  *k;
 	plitem_t   *value;
 
-	if (dict->type != QFDictionary)
+	if (item->type != QFDictionary)
 		return NULL;
 
-	k = (dictkey_t *) Hash_Del (table, key);
+	k = (dictkey_t *) Hash_Del (dict->tab, key);
 	if (!k)
 		return NULL;
 	value = k->value;
 	k->value = 0;
+	for (size_t i = 0; i < dict->keys.size; i++) {
+		if (dict->keys.a[i] == k) {
+			DARRAY_REMOVE_AT (&dict->keys, i);
+			break;
+		}
+	}
 	dict_free (k, 0);
 	return value;
 }
 
 VISIBLE plitem_t *
-PL_D_AllKeys (plitem_t *dict)
+PL_D_AllKeys (plitem_t *item)
 {
-	void		**list, **l;
-	dictkey_t	*current;
-	plitem_t	*array;
+	pldict_t   *dict = (pldict_t *) item->data;
+	dictkey_t  *current;
+	plitem_t   *array;
 
-	if (dict->type != QFDictionary)
-		return NULL;
-
-	if (!(l = list = Hash_GetList ((hashtab_t *) dict->data)))
+	if (item->type != QFDictionary)
 		return NULL;
 
 	if (!(array = PL_NewArray ()))
 		return NULL;
 
-	while ((current = (dictkey_t *) *l++)) {
+	for (size_t i = 0; i < dict->keys.size; i++) {
+		current = dict->keys.a[i];
 		PL_A_AddObject (array, PL_NewString (current->key));
 	}
-	free (list);
 
 	return array;
 }
 
 VISIBLE int
-PL_D_NumKeys (const plitem_t *dict)
+PL_D_NumKeys (const plitem_t *item)
 {
-	if (dict->type != QFDictionary)
+	pldict_t   *dict = (pldict_t *) item->data;
+	if (item->type != QFDictionary)
 		return 0;
-	return Hash_NumElements ((hashtab_t *) dict->data);
+	return Hash_NumElements (dict->tab);
 }
 
 VISIBLE plitem_t *
@@ -339,14 +371,15 @@ PL_ObjectAtIndex (const plitem_t *array, int index)
 }
 
 VISIBLE qboolean
-PL_D_AddObject (plitem_t *dict, const char *key, plitem_t *value)
+PL_D_AddObject (plitem_t *item, const char *key, plitem_t *value)
 {
+	pldict_t   *dict = (pldict_t *) item->data;
 	dictkey_t	*k;
 
-	if (dict->type != QFDictionary)
+	if (item->type != QFDictionary)
 		return false;
 
-	if ((k = Hash_Find ((hashtab_t *)dict->data, key))) {
+	if ((k = Hash_Find (dict->tab, key))) {
 		PL_Free ((plitem_t *) k->value);
 		k->value = value;
 	} else {
@@ -358,7 +391,8 @@ PL_D_AddObject (plitem_t *dict, const char *key, plitem_t *value)
 		k->key = strdup (key);
 		k->value = value;
 
-		Hash_Add ((hashtab_t *)dict->data, k);
+		Hash_Add (dict->tab, k);
+		DARRAY_APPEND (&dict->keys, k);
 	}
 	return true;
 }
@@ -1024,24 +1058,24 @@ write_string (dstring_t *dstr, const char *str)
 static void
 write_item (dstring_t *dstr, plitem_t *item, int level)
 {
-	void		**list, **l;
 	dictkey_t	*current;
 	plarray_t	*array;
+	pldict_t    *dict;
 	plbinary_t	*binary;
 	int			i;
 
 	switch (item->type) {
 		case QFDictionary:
 			write_string_len (dstr, "{\n", 2);
-			l = list = Hash_GetList ((hashtab_t *) item->data);
-			while ((current = (dictkey_t *) *l++)) {
+			dict = (pldict_t *) item->data;
+			for (size_t i = 0; i < dict->keys.size; i++) {
+				current = dict->keys.a[i];
 				write_tabs (dstr, level + 1);
 				write_string (dstr, current->key);
 				write_string_len (dstr, " = ", 3);
 				write_item (dstr, current->value, level + 1);
 				write_string_len (dstr, ";\n", 2);
 			}
-			free (list);
 			write_tabs (dstr, level);
 			write_string_len (dstr, "}", 1);
 			break;
@@ -1128,7 +1162,7 @@ pl_default_parser (const plfield_t *field, const plitem_t *item, void *data,
 	switch (field->type) {
 		case QFDictionary:
 			{
-				*(hashtab_t **)data = (hashtab_t *)item->data;
+				*(hashtab_t **)data = ((pldict_t *)item->data)->tab;
 			}
 			return 1;
 		case QFArray:
@@ -1198,23 +1232,23 @@ PL_TypeMismatch (plitem_t *messages, const plitem_t *item, const char *name,
 }
 
 VISIBLE int
-PL_ParseStruct (const plfield_t *fields, const plitem_t *dict, void *data,
+PL_ParseStruct (const plfield_t *fields, const plitem_t *item, void *data,
 				plitem_t *messages, void *context)
 {
-	void      **list, **l;
+	pldict_t   *dict = item->data;
 	dictkey_t  *current;
 	int         result = 1;
 	plparser_t  parser;
 
-	if (dict->type != QFDictionary) {
-		PL_Message (messages, dict, "error: not a dictionary object");
+	if (item->type != QFDictionary) {
+		PL_Message (messages, item, "error: not a dictionary object");
 		return 0;
 	}
 
-	l = list = Hash_GetList ((hashtab_t *) dict->data);
 
-	while ((current = (dictkey_t *) *l++)) {
+	for (size_t i = 0; i < dict->keys.size; i++) {
 		const plfield_t *f;
+		current = dict->keys.a[i];
 		for (f = fields; f->name; f++) {
 			if (strcmp (f->name, current->key) == 0) {
 				plitem_t   *item = current->value;
@@ -1238,12 +1272,11 @@ PL_ParseStruct (const plfield_t *fields, const plitem_t *dict, void *data,
 			}
 		}
 		if (!f->name) {
-			PL_Message (messages, dict, "error: unknown field %s",
+			PL_Message (messages, item, "error: unknown field %s",
 						current->key);
 			result = 0;
 		}
 	}
-	free (list);
 	return result;
 }
 
@@ -1297,10 +1330,10 @@ PL_ParseArray (const plfield_t *field, const plitem_t *array, void *data,
 }
 
 VISIBLE int
-PL_ParseLabeledArray (const plfield_t *field, const plitem_t *dict,
+PL_ParseLabeledArray (const plfield_t *field, const plitem_t *item,
 					  void *data, plitem_t *messages, void *context)
 {
-	void      **list, **l;
+	pldict_t   *dict = item->data;
 	dictkey_t  *current;
 	int         result = 1;
 	plparser_t  parser;
@@ -1309,8 +1342,8 @@ PL_ParseLabeledArray (const plfield_t *field, const plitem_t *dict,
 	arr_t      *arr;
 	plfield_t   f = { 0, 0, element->type, element->parser, element->data };
 
-	if (dict->type != QFDictionary) {
-		PL_Message (messages, dict, "error: not a dictionary object");
+	if (item->type != QFDictionary) {
+		PL_Message (messages, item, "error: not a dictionary object");
 		return 0;
 	}
 	if (f.parser) {
@@ -1319,28 +1352,21 @@ PL_ParseLabeledArray (const plfield_t *field, const plitem_t *dict,
 		parser = pl_default_parser;
 	}
 
-	list = Hash_GetList ((hashtab_t *) dict->data);
-
-	int         numvals = 0;
-	for (l = list; *l; l++) {
-		numvals++;
-	}
-
-	arr = DARRAY_ALLOCFIXED_OBJ (arr_t, numvals * element->stride,
+	arr = DARRAY_ALLOCFIXED_OBJ (arr_t, dict->keys.size * element->stride,
 								 element->alloc, context);
 	memset (arr->a, 0, arr->size);
 	// the array is allocated using bytes, but need the actual number of
 	// elements in the array
-	arr->size = arr->maxSize = numvals;
+	arr->size = arr->maxSize = dict->keys.size;
 
-	for (int i = 0; i < numvals; i++) {
-		current = list[i];
+	for (size_t i = 0; i < dict->keys.size; i++) {
+		current = dict->keys.a[i];
 		plitem_t   *item = current->value;
 		void       *eledata = &arr->a[i * element->stride];
 
 		if (!PL_CheckType (element->type, item->type)) {
 			char        index[16];
-			snprintf (index, sizeof(index) - 1, "%d", i);
+			snprintf (index, sizeof(index) - 1, "%zd", i);
 			index[15] = 0;
 			PL_TypeMismatch (messages, item, index, element->type, item->type);
 			result = 0;
@@ -1355,10 +1381,10 @@ PL_ParseLabeledArray (const plfield_t *field, const plitem_t *dict,
 }
 
 VISIBLE int
-PL_ParseSymtab (const plfield_t *field, const plitem_t *dict, void *data,
+PL_ParseSymtab (const plfield_t *field, const plitem_t *item, void *data,
 				plitem_t *messages, void *context)
 {
-	void      **list, **l;
+	pldict_t   *dict = item->data;
 	dictkey_t  *current;
 	int         result = 1;
 	plparser_t  parser;
@@ -1367,26 +1393,22 @@ PL_ParseSymtab (const plfield_t *field, const plitem_t *dict, void *data,
 	plelement_t *element = (plelement_t *) field->data;
 	plfield_t   f = { 0, 0, element->type, element->parser, element->data };
 
-	if (dict->type != QFDictionary) {
-		PL_Message (messages, dict, "error: not a dictionary object");
+	if (item->type != QFDictionary) {
+		PL_Message (messages, item, "error: not a dictionary object");
 		return 0;
 	}
 
 	if (f.parser) {
 		parser = f.parser;
 	} else {
-		PL_Message (messages, dict, "no parser set");
+		PL_Message (messages, item, "no parser set");
 		return 0;
 	}
 
-	if (!(l = list = Hash_GetList ((hashtab_t *) dict->data))) {
-		// empty struct: leave as default
-		return 1;
-	}
-
 	void       *obj = element->alloc (context, element->stride);
 	memset (obj, 0, element->stride);
-	while ((current = (dictkey_t *) *l++)) {
+	for (size_t i = 0; i < dict->keys.size; i++) {
+		current = dict->keys.a[i];
 		const char *key = current->key;
 		plitem_t   *item = current->value;
 
@@ -1410,6 +1432,5 @@ PL_ParseSymtab (const plfield_t *field, const plitem_t *dict, void *data,
 		}
 	}
 	Hash_Free (tab, obj);
-	free (list);
 	return result;
 }

From 35f12c36ff631b3d9ef31c0f373e83a11c3d1508 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 9 Feb 2021 19:29:48 +0900
Subject: [PATCH 1426/1519] [util] Catch some more cexpr errors

---
 libs/util/cexpr-parse.y |  5 ++++-
 libs/util/cexpr-type.c  | 10 +++++-----
 libs/util/cexpr-vars.c  |  2 ++
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/libs/util/cexpr-parse.y b/libs/util/cexpr-parse.y
index 599955afd..8ccf0b20b 100644
--- a/libs/util/cexpr-parse.y
+++ b/libs/util/cexpr-parse.y
@@ -129,7 +129,7 @@ uexpr
 	| '(' expr ')'		{ $$ = $2; }
 	| NAME '(' opt_arg_list ')'	{ $$ = function_expr ($1, $3, context); }
 	| uexpr '.' field	{ $$ = field_expr ($1, $3, context); }
-	| uexpr '[' field ']'	{ $$ = index_expr ($1, $3, context); }
+	| uexpr '[' expr ']'	{ $$ = index_expr ($1, $3, context); }
 	| '+' uexpr %prec UNARY	{ $$ = $2; }
 	| '-' uexpr %prec UNARY	{ $$ = unary_expr ('-', $2, context); }
 	| '!' uexpr %prec UNARY	{ $$ = unary_expr ('!', $2, context); }
@@ -268,6 +268,9 @@ index_expr (const exprval_t *a, const exprval_t *b, exprctx_t *context)
 	binop_t    *binop;
 	exprval_t  *result = 0;
 
+	if (!a || !b) {
+		return 0;
+	}
 	for (binop = a->type->binops; binop->op; binop++) {
 		if (binop->op == '[' && binop->other == b->type) {
 			break;
diff --git a/libs/util/cexpr-type.c b/libs/util/cexpr-type.c
index 1ba3b3f0f..2aff20006 100644
--- a/libs/util/cexpr-type.c
+++ b/libs/util/cexpr-type.c
@@ -646,14 +646,14 @@ static void
 plitem_index (const exprval_t *a, int index, exprval_t *c,
 			  exprctx_t *ctx)
 {
-	__auto_type array = *(plitem_t **) a->type->data;
+	__auto_type array = *(plitem_t **) a->value;
 
 	if (PL_Type (array) != QFArray) {
 		cexpr_error(ctx, "not an array object");
 		return;
 	}
 	plitem_t   *item = PL_ObjectAtIndex (array, index);
-	exprval_t *val = 0;
+	exprval_t  *val = 0;
 	if (!item) {
 		cexpr_error (ctx, "invalid index: %d", index);
 	} else {
@@ -667,7 +667,7 @@ static void
 plitem_int (const exprval_t *a, const exprval_t *b, exprval_t *c,
 			exprctx_t *ctx)
 {
-	int         index = *(int *) a->value;
+	int         index = *(int *) b->value;
 	plitem_index (a, index, c, ctx);
 }
 
@@ -675,7 +675,7 @@ static void
 plitem_uint (const exprval_t *a, const exprval_t *b, exprval_t *c,
 			 exprctx_t *ctx)
 {
-	int         index = *(int *) a->value;
+	int         index = *(unsigned *) b->value;
 	plitem_index (a, index, c, ctx);
 }
 
@@ -683,7 +683,7 @@ static void
 plitem_size_t (const exprval_t *a, const exprval_t *b, exprval_t *c,
 			   exprctx_t *ctx)
 {
-	int         index = *(int *) a->value;
+	int         index = *(size_t *) b->value;
 	plitem_index (a, index, c, ctx);
 }
 
diff --git a/libs/util/cexpr-vars.c b/libs/util/cexpr-vars.c
index 04c6871ad..9b390b523 100644
--- a/libs/util/cexpr-vars.c
+++ b/libs/util/cexpr-vars.c
@@ -49,6 +49,8 @@ cexpr_struct_getfield (const exprval_t *a, const exprval_t *b, exprval_t *c,
 		val = cmemalloc (ctx->memsuper, sizeof (exprval_t));
 		val->type = field->type;
 		val->value = a->value + (ptrdiff_t) field->value;
+	} else {
+		cexpr_error (ctx, "%s has no field %s", a->type->name, name);
 	}
 	*(exprval_t **) c->value = val;
 }

From 55104ac430bed00caf6b5a9fb9c0861ca2eecb68 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 9 Feb 2021 19:30:30 +0900
Subject: [PATCH 1427/1519] [util] Allow "any type" results for cexpr

Setting the result type cexpr_exprval tells cexpr to simply return whoe
exprval object rather than the referenced value, thus allowing the
caller to check the type when the expression is context sensitive.
---
 libs/util/cexpr-parse.y | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libs/util/cexpr-parse.y b/libs/util/cexpr-parse.y
index 8ccf0b20b..ad734def7 100644
--- a/libs/util/cexpr-parse.y
+++ b/libs/util/cexpr-parse.y
@@ -191,6 +191,10 @@ assign_expr (exprval_t *dst, const exprval_t *src, exprctx_t *context)
 	if (!src) {
 		return;
 	}
+	if (dst->type == &cexpr_exprval) {
+		*(exprval_t **) dst->value = (exprval_t *) src;
+		return;
+	}
 	binop = cexpr_find_cast (dst->type, src->type);
 	if (binop && binop->op) {
 		binop->func (dst, src, dst, context);

From cffd48434ca28b86ba0131ec872b6715a88a064e Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 10 Feb 2021 17:43:11 +0900
Subject: [PATCH 1428/1519] [vulkan] Move the shaders into their own directory

---
 libs/video/renderer/Makemodule.am             | 34 ++++++++++---------
 libs/video/renderer/vulkan/shader.c           | 16 ++++-----
 .../renderer/vulkan/{ => shader}/alias.frag   |  0
 .../renderer/vulkan/{ => shader}/alias.vert   |  0
 .../vulkan/{ => shader}/passthrough.vert      |  0
 .../vulkan/{ => shader}/pushcolor.frag        |  0
 .../vulkan/{ => shader}/quakebsp.frag         |  0
 .../vulkan/{ => shader}/quakebsp.vert         |  0
 .../renderer/vulkan/{ => shader}/twod.frag    |  0
 .../renderer/vulkan/{ => shader}/twod.vert    |  0
 10 files changed, 26 insertions(+), 24 deletions(-)
 rename libs/video/renderer/vulkan/{ => shader}/alias.frag (100%)
 rename libs/video/renderer/vulkan/{ => shader}/alias.vert (100%)
 rename libs/video/renderer/vulkan/{ => shader}/passthrough.vert (100%)
 rename libs/video/renderer/vulkan/{ => shader}/pushcolor.frag (100%)
 rename libs/video/renderer/vulkan/{ => shader}/quakebsp.frag (100%)
 rename libs/video/renderer/vulkan/{ => shader}/quakebsp.vert (100%)
 rename libs/video/renderer/vulkan/{ => shader}/twod.frag (100%)
 rename libs/video/renderer/vulkan/{ => shader}/twod.vert (100%)

diff --git a/libs/video/renderer/Makemodule.am b/libs/video/renderer/Makemodule.am
index b322a7ca4..cb0eec6d1 100644
--- a/libs/video/renderer/Makemodule.am
+++ b/libs/video/renderer/Makemodule.am
@@ -262,22 +262,24 @@ vkparse_src = \
 vkparse_plist = \
 	$(srcdir)/libs/video/renderer/vulkan/vkparse.plist
 
-twodv_src = libs/video/renderer/vulkan/twod.vert
-twodv_c = libs/video/renderer/vulkan/twod.vert.spvc
-twodf_src = libs/video/renderer/vulkan/twod.frag
-twodf_c = libs/video/renderer/vulkan/twod.frag.spvc
-quakebspv_src = libs/video/renderer/vulkan/quakebsp.vert
-quakebspv_c = libs/video/renderer/vulkan/quakebsp.vert.spvc
-quakebspf_src = libs/video/renderer/vulkan/quakebsp.frag
-quakebspf_c = libs/video/renderer/vulkan/quakebsp.frag.spvc
-aliasv_src = libs/video/renderer/vulkan/alias.vert
-aliasv_c = libs/video/renderer/vulkan/alias.vert.spvc
-aliasf_src = libs/video/renderer/vulkan/alias.frag
-aliasf_c = libs/video/renderer/vulkan/alias.frag.spvc
-passthrough_src = libs/video/renderer/vulkan/passthrough.vert
-passthrough_c = libs/video/renderer/vulkan/passthrough.vert.spvc
-pushcolor_src = libs/video/renderer/vulkan/pushcolor.frag
-pushcolor_c = libs/video/renderer/vulkan/pushcolor.frag.spvc
+vkshaderpath = libs/video/renderer/vulkan/shader
+
+twodv_src = $(vkshaderpath)/twod.vert
+twodv_c = $(vkshaderpath)/twod.vert.spvc
+twodf_src = $(vkshaderpath)/twod.frag
+twodf_c = $(vkshaderpath)/twod.frag.spvc
+quakebspv_src = $(vkshaderpath)/quakebsp.vert
+quakebspv_c = $(vkshaderpath)/quakebsp.vert.spvc
+quakebspf_src = $(vkshaderpath)/quakebsp.frag
+quakebspf_c = $(vkshaderpath)/quakebsp.frag.spvc
+aliasv_src = $(vkshaderpath)/alias.vert
+aliasv_c = $(vkshaderpath)/alias.vert.spvc
+aliasf_src = $(vkshaderpath)/alias.frag
+aliasf_c = $(vkshaderpath)/alias.frag.spvc
+passthrough_src = $(vkshaderpath)/passthrough.vert
+passthrough_c = $(vkshaderpath)/passthrough.vert.spvc
+pushcolor_src = $(vkshaderpath)/pushcolor.frag
+pushcolor_c = $(vkshaderpath)/pushcolor.frag.spvc
 
 $(twodv_c): $(twodv_src)
 
diff --git a/libs/video/renderer/vulkan/shader.c b/libs/video/renderer/vulkan/shader.c
index a3cc9e3f0..90a93684b 100644
--- a/libs/video/renderer/vulkan/shader.c
+++ b/libs/video/renderer/vulkan/shader.c
@@ -55,21 +55,21 @@
 #include "vid_vulkan.h"
 
 static
-#include "libs/video/renderer/vulkan/twod.vert.spvc"
+#include "libs/video/renderer/vulkan/shader/twod.vert.spvc"
 static
-#include "libs/video/renderer/vulkan/twod.frag.spvc"
+#include "libs/video/renderer/vulkan/shader/twod.frag.spvc"
 static
-#include "libs/video/renderer/vulkan/quakebsp.vert.spvc"
+#include "libs/video/renderer/vulkan/shader/quakebsp.vert.spvc"
 static
-#include "libs/video/renderer/vulkan/quakebsp.frag.spvc"
+#include "libs/video/renderer/vulkan/shader/quakebsp.frag.spvc"
 static
-#include "libs/video/renderer/vulkan/alias.vert.spvc"
+#include "libs/video/renderer/vulkan/shader/alias.vert.spvc"
 static
-#include "libs/video/renderer/vulkan/alias.frag.spvc"
+#include "libs/video/renderer/vulkan/shader/alias.frag.spvc"
 static
-#include "libs/video/renderer/vulkan/passthrough.vert.spvc"
+#include "libs/video/renderer/vulkan/shader/passthrough.vert.spvc"
 static
-#include "libs/video/renderer/vulkan/pushcolor.frag.spvc"
+#include "libs/video/renderer/vulkan/shader/pushcolor.frag.spvc"
 
 typedef struct shaderdata_s {
 	const char *name;
diff --git a/libs/video/renderer/vulkan/alias.frag b/libs/video/renderer/vulkan/shader/alias.frag
similarity index 100%
rename from libs/video/renderer/vulkan/alias.frag
rename to libs/video/renderer/vulkan/shader/alias.frag
diff --git a/libs/video/renderer/vulkan/alias.vert b/libs/video/renderer/vulkan/shader/alias.vert
similarity index 100%
rename from libs/video/renderer/vulkan/alias.vert
rename to libs/video/renderer/vulkan/shader/alias.vert
diff --git a/libs/video/renderer/vulkan/passthrough.vert b/libs/video/renderer/vulkan/shader/passthrough.vert
similarity index 100%
rename from libs/video/renderer/vulkan/passthrough.vert
rename to libs/video/renderer/vulkan/shader/passthrough.vert
diff --git a/libs/video/renderer/vulkan/pushcolor.frag b/libs/video/renderer/vulkan/shader/pushcolor.frag
similarity index 100%
rename from libs/video/renderer/vulkan/pushcolor.frag
rename to libs/video/renderer/vulkan/shader/pushcolor.frag
diff --git a/libs/video/renderer/vulkan/quakebsp.frag b/libs/video/renderer/vulkan/shader/quakebsp.frag
similarity index 100%
rename from libs/video/renderer/vulkan/quakebsp.frag
rename to libs/video/renderer/vulkan/shader/quakebsp.frag
diff --git a/libs/video/renderer/vulkan/quakebsp.vert b/libs/video/renderer/vulkan/shader/quakebsp.vert
similarity index 100%
rename from libs/video/renderer/vulkan/quakebsp.vert
rename to libs/video/renderer/vulkan/shader/quakebsp.vert
diff --git a/libs/video/renderer/vulkan/twod.frag b/libs/video/renderer/vulkan/shader/twod.frag
similarity index 100%
rename from libs/video/renderer/vulkan/twod.frag
rename to libs/video/renderer/vulkan/shader/twod.frag
diff --git a/libs/video/renderer/vulkan/twod.vert b/libs/video/renderer/vulkan/shader/twod.vert
similarity index 100%
rename from libs/video/renderer/vulkan/twod.vert
rename to libs/video/renderer/vulkan/shader/twod.vert

From 121425a75bba7056a931c3b9494e438f20e558de Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 14 Feb 2021 11:20:54 +0900
Subject: [PATCH 1429/1519] [vulkan] Allow all struct objects to be referenced

---
 libs/video/renderer/vulkan/vkgen/vkstruct.r |  8 +++--
 libs/video/renderer/vulkan/vkparse.c        | 35 +++++++++++++++++----
 2 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/libs/video/renderer/vulkan/vkgen/vkstruct.r b/libs/video/renderer/vulkan/vkgen/vkstruct.r
index 108af71ef..77b11fad5 100644
--- a/libs/video/renderer/vulkan/vkgen/vkstruct.r
+++ b/libs/video/renderer/vulkan/vkgen/vkstruct.r
@@ -139,9 +139,13 @@
 		fprintf (output_file, " = %s;\n", [self sTypeName]);
 	}
 	fprintf (output_file,
+			 "\tif (PL_Type (item) == QFString\n"
+			 "\t\t&& !(item = parse_reference (item, \"%s\", messages, context))) {\n"
+			 "\t\treturn 0;\n"
+			 "\t}\n"
 			 "\treturn PL_ParseStruct (%s_fields, item, data, messages,"
 			 " context);\n",
-			 [self outname]);
+			 [self outname], [self outname]);
 	fprintf (output_file, "}\n");
 
 	fprintf (output_file, "static exprsym_t %s_symbols[] = {\n", [self outname]);
@@ -214,7 +218,7 @@
 
 -(string) parseType
 {
-	return "QFDictionary";
+	return "QFMultiType | (1 << QFString) | (1 << QFDictionary)";
 }
 
 -(string) parseFunc
diff --git a/libs/video/renderer/vulkan/vkparse.c b/libs/video/renderer/vulkan/vkparse.c
index 3f02b8022..ad2696c8f 100644
--- a/libs/video/renderer/vulkan/vkparse.c
+++ b/libs/video/renderer/vulkan/vkparse.c
@@ -232,6 +232,24 @@ parse_enum (const plfield_t *field, const plitem_t *item,
 	return ret;
 }
 
+static const plitem_t *
+parse_reference (const plitem_t *item, const char *type, plitem_t *messages,
+				 parsectx_t *pctx)
+{
+	exprctx_t   ectx = *pctx->ectx;
+	vulkan_ctx_t *ctx = pctx->vctx;
+	plitem_t   *refItem = 0;
+	exprval_t   result = { &cexpr_plitem, &refItem };
+	ectx.symtab = 0;
+	ectx.result = &result;
+	const char *name = PL_String (item);
+	if (cexpr_eval_string (name, &ectx)) {
+		PL_Message (messages, item, va (ctx->va_ctx, "not a %s reference", type));
+		return 0;
+	}
+	return refItem;
+}
+
 static int
 parse_single (const plfield_t *field, const plitem_t *item,
 			  void *data, plitem_t *messages, void *context)
@@ -420,12 +438,15 @@ parse_VkDescriptorSetLayout (const plfield_t *field, const plitem_t *item,
 {
 	__auto_type handle = (VkDescriptorSetLayout *) data;
 	int         ret = 1;
-	exprctx_t   ectx = *((parsectx_t *) context)->ectx;
-	vulkan_ctx_t *ctx = ((parsectx_t *) context)->vctx;
+	parsectx_t *pctx = context;
+	exprctx_t   ectx = *pctx->ectx;
+	vulkan_ctx_t *ctx = pctx->vctx;
 
 	const char *name = PL_String (item);
 	Sys_Printf ("parse_VkDescriptorSetLayout: %s\n", name);
-	name = va (ctx->va_ctx, "$"QFV_PROPERTIES".setLayouts.%s", name);
+	if (name[0] != '$') {
+		name = va (ctx->va_ctx, "$"QFV_PROPERTIES".setLayouts.%s", name);
+	}
 
 	*handle = (VkDescriptorSetLayout) QFV_GetHandle (ctx->setLayouts, name);
 	if (*handle) {
@@ -453,12 +474,14 @@ parse_VkPipelineLayout (const plitem_t *item, void **data,
 {
 	__auto_type handle = (VkPipelineLayout *) data[0];
 	int         ret = 1;
-	exprctx_t   ectx = *((parsectx_t *) context)->ectx;
-	vulkan_ctx_t *ctx = ((parsectx_t *) context)->vctx;
+	exprctx_t   ectx = *context->ectx;
+	vulkan_ctx_t *ctx = context->vctx;
 
 	const char *name = PL_String (item);
 	Sys_Printf ("parse_VkPipelineLayout: %s\n", name);
-	name = va (ctx->va_ctx, "$"QFV_PROPERTIES".pipelineLayouts.%s", name);
+	if (name[0] != '$') {
+		name = va (ctx->va_ctx, "$"QFV_PROPERTIES".pipelineLayouts.%s", name);
+	}
 
 	*handle = (VkPipelineLayout) QFV_GetHandle (ctx->pipelineLayouts, name);
 	if (*handle) {

From a94949c00928a9be998bf226412558dbb25b9932 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 14 Feb 2021 11:35:06 +0900
Subject: [PATCH 1430/1519] [vulkan] Start moving towards a deferred renderer

After getting lights even vaguely working for alias models, I realized
that it just wasn't going to be feasible to do nice lighting with
forward rendering. This gets the bulk of the work done for deferred
rendering, but still need to sort out the shaders before any real
testing can be done.
---
 include/QF/Vulkan/image.h                     |  13 +-
 include/QF/Vulkan/qf_alias.h                  |  36 +-
 include/QF/Vulkan/qf_bsp.h                    |  13 +-
 include/QF/Vulkan/qf_vid.h                    |  15 +-
 include/QF/Vulkan/renderpass.h                |   6 +
 include/vid_vulkan.h                          |  23 +-
 libs/video/renderer/Makemodule.am             |   4 +-
 libs/video/renderer/vid_render_vulkan.c       |  40 +-
 libs/video/renderer/vulkan/deferred.plist     | 342 ++++++++++++++
 libs/video/renderer/vulkan/qfpipeline.plist   | 163 +++----
 libs/video/renderer/vulkan/vkparse.c          | 424 ++++++++++++++++--
 libs/video/renderer/vulkan/vkparse.h          |  31 +-
 libs/video/renderer/vulkan/vkparse.plist      |  45 ++
 libs/video/renderer/vulkan/vulkan_alias.c     | 231 +++++-----
 libs/video/renderer/vulkan/vulkan_bsp.c       | 256 ++++++-----
 libs/video/renderer/vulkan/vulkan_draw.c      |   5 +-
 .../video/renderer/vulkan/vulkan_vid_common.c | 251 +++++------
 17 files changed, 1347 insertions(+), 551 deletions(-)
 create mode 100644 libs/video/renderer/vulkan/deferred.plist

diff --git a/include/QF/Vulkan/image.h b/include/QF/Vulkan/image.h
index 9942562b2..5e5623137 100644
--- a/include/QF/Vulkan/image.h
+++ b/include/QF/Vulkan/image.h
@@ -3,8 +3,17 @@
 
 #include "QF/darray.h"
 
-typedef struct qfv_imageset_s DARRAY_TYPE (VkImage) qfv_imageset_t;
-typedef struct qfv_imageviewset_s DARRAY_TYPE (VkImageView) qfv_imageviewset_t;
+typedef struct qfv_imageset_s
+	DARRAY_TYPE (VkImage) qfv_imageset_t;
+
+#define QFV_AllocImages(num, allocator) \
+	DARRAY_ALLOCFIXED (qfv_imageset_t, num, allocator)
+
+typedef struct qfv_imageviewset_s
+	DARRAY_TYPE (VkImageView) qfv_imageviewset_t;
+
+#define QFV_AllocImageViews(num, allocator) \
+	DARRAY_ALLOCFIXED (qfv_imageviewset_t, num, allocator)
 
 typedef struct qfv_imageresource_s {
 	struct qfv_device_s *device;
diff --git a/include/QF/Vulkan/qf_alias.h b/include/QF/Vulkan/qf_alias.h
index 714cb06b3..597888a4d 100644
--- a/include/QF/Vulkan/qf_alias.h
+++ b/include/QF/Vulkan/qf_alias.h
@@ -36,6 +36,7 @@
 #include "QF/model.h"
 #include "QF/modelgen.h"
 #include "QF/Vulkan/qf_vid.h"
+#include "QF/Vulkan/command.h"
 
 typedef struct aliasvrt_s {
 	float       vertex[4];
@@ -61,32 +62,22 @@ typedef struct qfv_alias_skin_s {
 	byte        colorb[4];
 } qfv_alias_skin_t;
 
-typedef struct qfv_light_s {
-	vec3_t      color;
-	float       dist;
-	vec3_t      position;
-	int         type;
-	vec3_t      direction;
-	float       cone;
-} qfv_light_t;
-
-#define ALIAS_LIGHTS 8
-
-typedef struct qfv_light_buffer_s {
-	int         light_count;
-	qfv_light_t lights[ALIAS_LIGHTS] __attribute__((aligned(16)));
-} qfv_light_buffer_t;
-
-#define ALIAS_BUFFER_INFOS 2
+#define ALIAS_BUFFER_INFOS 1
 #define ALIAS_IMAGE_INFOS 1
 
+enum {
+	QFV_aliasDepth,
+	QFV_aliasGBuffer,
+	//QFV_aliasTranslucent,
+
+	QFV_aliasNumPasses
+};
+
 typedef struct aliasframe_s {
-	VkCommandBuffer cmd;
+	qfv_cmdbufferset_t cmdSet;
 	VkDescriptorBufferInfo bufferInfo[ALIAS_BUFFER_INFOS];
 	VkDescriptorImageInfo imageInfo[ALIAS_IMAGE_INFOS];
 	VkWriteDescriptorSet descriptors[ALIAS_BUFFER_INFOS + ALIAS_IMAGE_INFOS];
-	qfv_light_buffer_t *lights;
-	VkBuffer     light_buffer;
 } aliasframe_t;
 
 typedef struct aliasframeset_s
@@ -94,11 +85,10 @@ typedef struct aliasframeset_s
 
 typedef struct aliasctx_s {
 	aliasframeset_t frames;
-	VkPipeline   pipeline;
+	VkPipeline   depth;
+	VkPipeline   gbuf;
 	VkPipelineLayout layout;
 	VkSampler    sampler;
-
-	VkDeviceMemory light_memory;
 } aliasctx_t;
 
 struct vulkan_ctx_s;
diff --git a/include/QF/Vulkan/qf_bsp.h b/include/QF/Vulkan/qf_bsp.h
index 151e6e7be..b78aaf643 100644
--- a/include/QF/Vulkan/qf_bsp.h
+++ b/include/QF/Vulkan/qf_bsp.h
@@ -35,6 +35,7 @@
 #include "QF/darray.h"
 #include "QF/model.h"
 #include "QF/Vulkan/qf_vid.h"
+#include "QF/Vulkan/command.h"
 
 typedef struct bspvert_s {
 	quat_t      vertex;
@@ -69,13 +70,19 @@ typedef enum {
 // Texture, GlowMap, LightMap, SkySheet, SkyCube
 #define BSP_IMAGE_INFOS 5
 
+enum {
+	QFV_bspDepth,
+	QFV_bspGBuffer,
+	QFV_bspTranslucent,
+
+	QFV_bspNumPasses
+};
+
 typedef struct bspframe_s {
 	uint32_t    *index_data;	// pointer into mega-buffer for this frame (c)
 	uint32_t     index_offset;	// offset of index_data within mega-buffer (c)
 	uint32_t     index_count;	// number if indices queued (d)
-	VkCommandBuffer bsp_cmd;
-	VkCommandBuffer turb_cmd;
-	VkCommandBuffer sky_cmd;
+	qfv_cmdbufferset_t cmdSet;
 	VkDescriptorBufferInfo bufferInfo[BSP_BUFFER_INFOS];
 	VkDescriptorImageInfo imageInfo[BSP_IMAGE_INFOS];
 	VkWriteDescriptorSet descriptors[BSP_BUFFER_INFOS + BSP_IMAGE_INFOS];
diff --git a/include/QF/Vulkan/qf_vid.h b/include/QF/Vulkan/qf_vid.h
index 1102845b5..f81e934a1 100644
--- a/include/QF/Vulkan/qf_vid.h
+++ b/include/QF/Vulkan/qf_vid.h
@@ -35,9 +35,22 @@
 #endif
 #include <vulkan/vulkan.h>
 
+//FIXME location
+enum {
+	QFV_passDepth,			// geometry
+	QFV_passGBuffer,		// geometry
+	QFV_passTranslucent,	// geometry
+	QFV_passLighting,		// single quad
+	QFV_passCompose,		// single quad
+
+	QFV_NumPasses
+};
+
 struct vulkan_ctx_s;
-void Vulkan_DestroyFramebuffers (struct vulkan_ctx_s *ctx);
+void Vulkan_DestroyFrames (struct vulkan_ctx_s *ctx);
+void Vulkan_CreateFrames (struct vulkan_ctx_s *ctx);
 void Vulkan_CreateFramebuffers (struct vulkan_ctx_s *ctx);
+void Vulkan_DestroyFramebuffers (struct vulkan_ctx_s *ctx);
 void Vulkan_CreateRenderPass (struct vulkan_ctx_s *ctx);
 void Vulkan_DestroyRenderPass (struct vulkan_ctx_s *ctx);
 void Vulkan_CreateMatrices (struct vulkan_ctx_s *ctx);
diff --git a/include/QF/Vulkan/renderpass.h b/include/QF/Vulkan/renderpass.h
index 49134c730..a584d476d 100644
--- a/include/QF/Vulkan/renderpass.h
+++ b/include/QF/Vulkan/renderpass.h
@@ -27,6 +27,12 @@ typedef struct qfv_subpassdependency_s
 #define QFV_AllocSubpassDependencies(num, allocator) \
 	DARRAY_ALLOCFIXED (qfv_subpassdependency_t, num, allocator)
 
+typedef struct qfv_framebufferset_s
+	DARRAY_TYPE (VkFramebuffer) qfv_framebufferset_t;
+
+#define QFV_AllocFrameBuffers(num, allocator) \
+	DARRAY_ALLOCFIXED (qfv_framebufferset_t, num, allocator)
+
 struct qfv_device_s;
 struct qfv_imageviewset_s;
 VkRenderPass
diff --git a/include/vid_vulkan.h b/include/vid_vulkan.h
index 4ddab99e3..dcf4f624b 100644
--- a/include/vid_vulkan.h
+++ b/include/vid_vulkan.h
@@ -8,20 +8,15 @@
 
 #include "QF/darray.h"
 
-typedef struct vulkan_renderpass_s {
-	VkRenderPass renderpass;
-	struct qfv_imageresource_s *colorImage;
-	struct qfv_imageresource_s *depthImage;
-} vulkan_renderpass_t;
-
-typedef struct vulkan_framebuffer_s {
+typedef struct vulkan_frame_s {
 	VkFramebuffer framebuffer;
 	VkFence     fence;
 	VkSemaphore imageAvailableSemaphore;
 	VkSemaphore renderDoneSemaphore;
 	VkCommandBuffer cmdBuffer;
 
-	struct qfv_cmdbufferset_s *subCommand;
+	int         cmdSetCount;
+	struct qfv_cmdbufferset_s *cmdSets;
 } vulkan_frame_t;
 
 typedef struct vulkan_matrices_s {
@@ -59,11 +54,22 @@ typedef struct vulkan_ctx_s {
 	VkSurfaceKHR surface;	//FIXME surface = window, so "contains" swapchain
 	struct plitem_s  *pipelineDef;
 
+	struct plitem_s  *renderpassDef;
+	VkRenderPass renderpass;
+	struct qfv_imageset_s *attachment_images;
+	struct qfv_imageviewset_s *attachment_views;
+	VkDeviceMemory attachmentMemory;
+
+	uint32_t    swapImageIndex;
+	struct qfv_framebufferset_s *framebuffers;
+
 	struct hashtab_s *shaderModules;
 	struct hashtab_s *setLayouts;
 	struct hashtab_s *pipelineLayouts;
 	struct hashtab_s *descriptorPools;
 	struct hashtab_s *samplers;
+	struct hashtab_s *images;
+	struct hashtab_s *imageViews;
 
 	struct aliasctx_s *alias_context;
 	struct bspctx_s *bsp_context;
@@ -72,7 +78,6 @@ typedef struct vulkan_ctx_s {
 	VkCommandPool cmdpool;
 	VkCommandBuffer cmdbuffer;
 	VkFence     fence;			// for ctx->cmdbuffer only
-	vulkan_renderpass_t renderpass;
 	struct qfv_stagebuf_s *staging;
 	VkPipeline  pipeline;
 	size_t      curFrame;
diff --git a/libs/video/renderer/Makemodule.am b/libs/video/renderer/Makemodule.am
index cb0eec6d1..66db70d11 100644
--- a/libs/video/renderer/Makemodule.am
+++ b/libs/video/renderer/Makemodule.am
@@ -209,6 +209,8 @@ libs_video_renderer_vid_render_sw32_la_SOURCES=\
 
 pipeline_src = libs/video/renderer/vulkan/qfpipeline.plist
 pipeline_gen = libs/video/renderer/vulkan/qfpipeline.plc
+renderpass_src = libs/video/renderer/vulkan/deferred.plist
+renderpass_gen = libs/video/renderer/vulkan/deferred.plc
 
 video_renderer_vulkan_libs = \
 	libs/models/libmodels_vulkan.la
@@ -250,7 +252,7 @@ libs/video/renderer/vulkan/vkparse.lo: libs/video/renderer/vulkan/vkparse.c $(vk
 
 libs/video/renderer/vulkan/shader.lo: libs/video/renderer/vulkan/shader.c $(vkshader_c)
 
-libs/video/renderer/vulkan/vulkan_vid_common.lo: libs/video/renderer/vulkan/vulkan_vid_common.c $(vkparse_src) $(pipeline_gen)
+libs/video/renderer/vulkan/vulkan_vid_common.lo: libs/video/renderer/vulkan/vulkan_vid_common.c $(vkparse_src) $(pipeline_gen) ${renderpass_gen}
 
 
 qwaq_curses = ruamoko/qwaq/qwaq-curses$(EXEEXT)
diff --git a/libs/video/renderer/vid_render_vulkan.c b/libs/video/renderer/vid_render_vulkan.c
index a41a1d960..b8f9dc718 100644
--- a/libs/video/renderer/vid_render_vulkan.c
+++ b/libs/video/renderer/vid_render_vulkan.c
@@ -87,8 +87,9 @@ vulkan_R_Init (void)
 	Vulkan_CreateStagingBuffers (vulkan_ctx);
 	Vulkan_CreateMatrices (vulkan_ctx);
 	Vulkan_CreateSwapchain (vulkan_ctx);
-	Vulkan_CreateFramebuffers (vulkan_ctx);
+	Vulkan_CreateFrames (vulkan_ctx);
 	Vulkan_CreateRenderPass (vulkan_ctx);
+	Vulkan_CreateFramebuffers (vulkan_ctx);
 	// FIXME this should be staged so screen updates can begin while pipelines
 	// are being built
 	vulkan_ctx->pipeline = Vulkan_CreatePipeline (vulkan_ctx, "pipeline");
@@ -111,6 +112,8 @@ vulkan_R_Init (void)
 static void
 vulkan_R_RenderFrame (SCR_Func scr_3dfunc, SCR_Func *scr_funcs)
 {
+	const VkSubpassContents subpassContents
+		= VK_SUBPASS_CONTENTS_SECONDARY_COMMAND_BUFFERS;
 	static int count = 0;
 	static double startTime;
 	uint32_t imageIndex = 0;
@@ -128,20 +131,9 @@ vulkan_R_RenderFrame (SCR_Func scr_3dfunc, SCR_Func *scr_funcs)
 	QFV_AcquireNextImage (vulkan_ctx->swapchain,
 						  frame->imageAvailableSemaphore,
 						  0, &imageIndex);
+	vulkan_ctx->swapImageIndex = imageIndex;
 
-	int         attachCount = vulkan_ctx->msaaSamples > 1 ? 3 : 2;
-	__auto_type attachments = DARRAY_ALLOCFIXED (qfv_imageviewset_t,
-												 attachCount, alloca);
-	qfv_swapchain_t *sc = vulkan_ctx->swapchain;
-	attachments->a[0] = sc->imageViews->a[imageIndex];
-	attachments->a[1] = vulkan_ctx->renderpass.depthImage->view;
-	if (attachCount > 2) {
-		attachments->a[2] = vulkan_ctx->renderpass.colorImage->view;
-	}
-
-	VkRenderPass renderpass = vulkan_ctx->renderpass.renderpass;
-	frame->framebuffer = QFV_CreateFramebuffer (device, renderpass,
-											    attachments, sc->extent, 1);
+	frame->framebuffer = vulkan_ctx->framebuffers->a[imageIndex];
 
 	scr_3dfunc ();
 	while (*scr_funcs) {
@@ -160,20 +152,26 @@ vulkan_R_RenderFrame (SCR_Func scr_3dfunc, SCR_Func *scr_funcs)
 	};
 	VkRenderPassBeginInfo renderPassInfo = {
 		VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO, 0,
-		vulkan_ctx->renderpass.renderpass, 0,
-		{ {0, 0}, sc->extent },
+		vulkan_ctx->renderpass, 0,
+		{ {0, 0}, vulkan_ctx->swapchain->extent },
 		3, clearValues
 	};
 
 	dfunc->vkBeginCommandBuffer (frame->cmdBuffer, &beginInfo);
 	renderPassInfo.framebuffer = frame->framebuffer;
 	dfunc->vkCmdBeginRenderPass (frame->cmdBuffer, &renderPassInfo,
-								 VK_SUBPASS_CONTENTS_SECONDARY_COMMAND_BUFFERS);
+								 subpassContents);
 
-	dfunc->vkCmdExecuteCommands (frame->cmdBuffer, frame->subCommand->size,
-								 frame->subCommand->a);
-	// reset for next time around
-	frame->subCommand->size = 0;
+	for (int i = 0; i < frame->cmdSetCount; i++) {
+		dfunc->vkCmdExecuteCommands (frame->cmdBuffer, frame->cmdSets[i].size,
+									 frame->cmdSets[i].a);
+		// reset for next time around
+		frame->cmdSets[i].size = 0;
+
+		if (i < frame->cmdSetCount) {
+			dfunc->vkCmdNextSubpass (frame->cmdBuffer, subpassContents);
+		}
+	}
 
 	dfunc->vkCmdEndRenderPass (frame->cmdBuffer);
 	dfunc->vkEndCommandBuffer (frame->cmdBuffer);
diff --git a/libs/video/renderer/vulkan/deferred.plist b/libs/video/renderer/vulkan/deferred.plist
new file mode 100644
index 000000000..e7e7e1f12
--- /dev/null
+++ b/libs/video/renderer/vulkan/deferred.plist
@@ -0,0 +1,342 @@
+{
+	images = {
+		depth = {
+			imageType = VK_IMAGE_TYPE_2D;	//FIXME short form is 2d...
+			format = x8_d24_unorm_pack32;
+			samples = 1;
+			extent = {
+				width = $swapchain.extent.width;
+				height = $swapchain.extent.height;
+				depth = 1;
+			};
+			mipLevels = 1;
+			arrayLayers = 1;
+			tiling = optimal;
+			usage = depth_stencil_attachment|input_attachment;
+		};
+		color = {
+			imageType = VK_IMAGE_TYPE_2D;
+			format = r8g8b8a8_unorm;
+			samples = 1;
+			extent = {
+				width = $swapchain.extent.width;
+				height = $swapchain.extent.height;
+				depth = 1;
+			};
+			mipLevels = 1;
+			arrayLayers = 1;
+			tiling = optimal;
+			usage = color_attachment|input_attachment;
+		};
+		normals = {
+			imageType = VK_IMAGE_TYPE_2D;
+			format = r16g16b16a16_sfloat;
+			samples = 1;
+			extent = {
+				width = $swapchain.extent.width;
+				height = $swapchain.extent.height;
+				depth = 1;
+			};
+			mipLevels = 1;
+			arrayLayers = 1;
+			tiling = optimal;
+			usage = color_attachment|input_attachment;
+		};
+		opaque = {
+			imageType = VK_IMAGE_TYPE_2D;
+			format = r8g8b8a8_unorm;
+			samples = 1;
+			extent = {
+				width = $swapchain.extent.width;
+				height = $swapchain.extent.height;
+				depth = 1;
+			};
+			mipLevels = 1;
+			arrayLayers = 1;
+			tiling = optimal;
+			usage = color_attachment|input_attachment;
+		};
+		translucent = {
+			imageType = VK_IMAGE_TYPE_2D;
+			format = r8g8b8a8_unorm;
+			samples = 1;
+			extent = {
+				width = $swapchain.extent.width;
+				height = $swapchain.extent.height;
+				depth = 1;
+			};
+			mipLevels = 1;
+			arrayLayers = 1;
+			tiling = optimal;
+			usage = color_attachment|input_attachment;
+		};
+	};
+	imageViews = {
+		depth = {
+			image = depth;
+			viewType = VK_IMAGE_VIEW_TYPE_2D;
+			format = $properties.images.depth.format;
+			components = {
+				r = identity;
+				g = identity;
+				b = identity;
+				a = identity;
+			};
+			subresourceRange = {
+				aspectMask = depth;
+				levelCount = 1;
+				layerCount = 1;
+			};
+		};
+		color = {
+			image = color;
+			viewType = VK_IMAGE_VIEW_TYPE_2D;
+			format = $properties.images.color.format;
+			components = {
+				r = identity;
+				g = identity;
+				b = identity;
+				a = identity;
+			};
+			subresourceRange = {
+				aspectMask = color;
+				levelCount = 1;
+				layerCount = 1;
+			};
+		};
+		normals = {
+			image = normals;
+			viewType = VK_IMAGE_VIEW_TYPE_2D;
+			format = $properties.images.normals.format;
+			components = {
+				r = identity;
+				g = identity;
+				b = identity;
+				a = identity;
+			};
+			subresourceRange = {
+				aspectMask = color;
+				levelCount = 1;
+				layerCount = 1;
+			};
+		};
+		opaque = {
+			image = opaque;
+			viewType = VK_IMAGE_VIEW_TYPE_2D;
+			format = $properties.images.opaque.format;
+			components = {
+				r = identity;
+				g = identity;
+				b = identity;
+				a = identity;
+			};
+			subresourceRange = {
+				aspectMask = color;
+				levelCount = 1;
+				layerCount = 1;
+			};
+		};
+		translucent = {
+			image = translucent;
+			viewType = VK_IMAGE_VIEW_TYPE_2D;
+			format = $properties.images.translucent.format;
+			components = {
+				r = identity;
+				g = identity;
+				b = identity;
+				a = identity;
+			};
+			subresourceRange = {
+				aspectMask = color;
+				levelCount = 1;
+				layerCount = 1;
+			};
+		};
+	};
+	framebuffer = {
+		renderPass = renderpass;
+		attachments = (depth, color, normals, opaque, translucent,
+					   "$swapchain.views[$swapImageIndex]");
+		width = $swapchain.extent.width;
+		height = $swapchain.extent.height;
+	};
+	renderpass = {
+		attachments = (
+			{
+				format = $properties.images.depth.format;
+				samples = 1;
+				loadOp = dont_care;
+				storeOp = dont_care;
+				stencilLoadOp = dont_care;
+				stencilStoreOp = dont_care;
+				initialLayout = undefined;
+				finalLayout = depth_stencil_attachment_optimal;
+			},
+			{
+				format = $properties.images.color.format;
+				samples = 1;
+				loadOp = dont_care;
+				storeOp = dont_care;
+				stencilLoadOp = dont_care;
+				stencilStoreOp = dont_care;
+				initialLayout = undefined;
+				finalLayout = color_attachment_optimal;
+			},
+			{
+				format = $properties.images.normals.format;
+				samples = 1;
+				loadOp = dont_care;
+				storeOp = dont_care;
+				stencilLoadOp = dont_care;
+				stencilStoreOp = dont_care;
+				initialLayout = undefined;
+				finalLayout = color_attachment_optimal;
+			},
+			{
+				format = $properties.images.opaque.format;
+				samples = 1;
+				loadOp = dont_care;
+				storeOp = dont_care;
+				stencilLoadOp = dont_care;
+				stencilStoreOp = dont_care;
+				initialLayout = undefined;
+				finalLayout = color_attachment_optimal;
+			},
+			{
+				format = $properties.images.translucent.format;
+				samples = 1;
+				loadOp = dont_care;
+				storeOp = dont_care;
+				stencilLoadOp = dont_care;
+				stencilStoreOp = dont_care;
+				initialLayout = undefined;
+				finalLayout = color_attachment_optimal;
+			},
+			{
+				format = $swapchain.format;
+				samples = 1;
+				loadOp = clear;
+				storeOp = store;
+				stencilLoadOp = dont_care;
+				stencilStoreOp = dont_care;
+				initialLayout = undefined;
+				finalLayout = present_src_khr;
+			},
+		);
+		subpasses = (
+			{	// depth
+				pipelineBindPoint = graphics;
+				depthStencilAttachment = {
+					attachment = 0;
+					layout = depth_stencil_attachment_optimal;
+				};
+			},
+			{	// g-buffer generation
+				pipelineBindPoint = graphics;
+				colorAttachments = (
+					{	// color
+						attachment = 1;
+						layout = color_attachment_optimal;
+					},
+					{	// normals
+						attachment = 2;
+						layout = color_attachment_optimal;
+					},
+				);
+				depthStencilAttachment = {
+					attachment = 0;
+					layout = depth_stencil_attachment_optimal;
+				};
+			},
+			{	// lighting
+				pipelineBindPoint = graphics;
+				inputAttachments = (
+					{	// depth
+						attachment = 0;
+						layout = shader_read_only_optimal;
+					},
+					{	// color
+						attachment = 1;
+						layout = shader_read_only_optimal;
+					},
+					{	// normals
+						attachment = 2;
+						layout = shader_read_only_optimal;
+					},
+				);
+				colorAttachments = (
+					{	// opaque
+						attachment = 3;
+						layout = color_attachment_optimal;
+					},
+				);
+			},
+			{	// translucent
+				pipelineBindPoint = graphics;
+				colorAttachments = (
+					{	// translucent
+						attachment = 4;
+						layout = color_attachment_optimal;
+					},
+				);
+			},
+			{	// compose
+				pipelineBindPoint = graphics;
+				inputAttachments = (
+					{	// opaque
+						attachment = 3;
+						layout = shader_read_only_optimal;
+					},
+					{	// translucent
+						attachment = 4;
+						layout = shader_read_only_optimal;
+					},
+				);
+				colorAttachments = (
+					{	// swapchain
+						attachment = 5;
+						layout = color_attachment_optimal;
+					},
+				);
+			},
+		);
+		dependencies = (
+			{
+				srcSubpass = 0;
+				dstSubpass = 1;
+				srcStageMask = color_attachment_output;
+				dstStageMask = fragment_shader;
+				srcAccessMask = color_attachment_write;
+				dstAccessMask = shader_read;
+				dependencyFlags = by_region;
+			},
+			{
+				srcSubpass = 1;
+				dstSubpass = 2;
+				srcStageMask = color_attachment_output;
+				dstStageMask = fragment_shader;
+				srcAccessMask = color_attachment_write;
+				dstAccessMask = shader_read;
+				dependencyFlags = by_region;
+			},
+			{
+				srcSubpass = 2;
+				dstSubpass = 4;
+				srcStageMask = color_attachment_output;
+				dstStageMask = fragment_shader;
+				srcAccessMask = color_attachment_write;
+				dstAccessMask = shader_read;
+				dependencyFlags = by_region;
+			},
+			{
+				srcSubpass = 3;
+				dstSubpass = 4;
+				srcStageMask = color_attachment_output;
+				dstStageMask = fragment_shader;
+				srcAccessMask = color_attachment_write;
+				dstAccessMask = shader_read;
+				dependencyFlags = by_region;
+			},
+		);
+	};
+}
diff --git a/libs/video/renderer/vulkan/qfpipeline.plist b/libs/video/renderer/vulkan/qfpipeline.plist
index 324e08e7c..2cd110385 100644
--- a/libs/video/renderer/vulkan/qfpipeline.plist
+++ b/libs/video/renderer/vulkan/qfpipeline.plist
@@ -273,7 +273,45 @@
 		};
 	};
 	pipelines = {
-		alias = {
+		alias_depth = {
+			stages = (
+				{
+					stage = vertex;
+					name = main;
+					module = $builtin/alias.vert;
+				},
+			);
+			vertexInput = {
+				bindings = (
+					"$properties.pipelines.alias_gbuf.vertexInput.bindings[0]",
+					"$properties.pipelines.alias_gbuf.vertexInput.bindings[1]",
+				);
+				attributes = (
+					"$properties.pipelines.alias_gbuf.vertexInput.attributes[0]",
+					"$properties.pipelines.alias_gbuf.vertexInput.attributes[1]",
+					"$properties.pipelines.alias_gbuf.vertexInput.attributes[2]",
+					"$properties.pipelines.alias_gbuf.vertexInput.attributes[3]",
+				);
+			};
+			inputAssembly = $properties.pipelines.alias_gbuf.inputAssembly;
+			viewport = $properties.pipelines.alias_gbuf.viewport;
+			rasterization = $properties.pipelines.alias_gbuf.rasterization;
+			multisample = $properties.pipelines.alias_gbuf.multisample;
+			depthStencil = {
+				depthTestEnable = true;
+				depthWriteEnable = true;
+				depthCompareOp = less_or_equal;
+				depthBoundsTestEnable = false;
+				stencilTestEnable = false;
+			};
+			colorBlend = $properties.pipelines.alias_gbuf.colorBlend;
+			dynamic = {
+				dynamicState = ( viewport, scissor );
+			};
+			layout = alias_layout;
+			//renderPass = renderpass;
+		};
+		alias_gbuf = {
 			stages = (
 				{
 					stage = vertex;
@@ -404,7 +442,41 @@
 			layout = alias_layout;
 			//renderPass = renderpass;
 		};
-		quakebsp_main = {
+		bsp_depth = {
+			stages = (
+				{
+					stage = vertex;
+					name = main;
+					module = $builtin/quakebsp.vert;
+				},
+			);
+			vertexInput = {
+				bindings = (
+					"$properties.pipelines.bsp_gbuf.vertexInput.bindings[0]",
+				);
+				attributes = (
+					"$properties.pipelines.bsp_gbuf.vertexInput.attributes[0]",
+				);
+			};
+			inputAssembly = $properties.pipelines.bsp_main.inputAssembly;
+			viewport = $properties.pipelines.bsp_main.viewport;
+			rasterization = $properties.pipelines.bsp_main.rasterization;
+			multisample = $properties.pipelines.bsp_main.multisample;
+			depthStencil = {
+				depthTestEnable = true;
+				depthWriteEnable = true;
+				depthCompareOp = less_or_equal;
+				depthBoundsTestEnable = false;
+				stencilTestEnable = false;
+			};
+			colorBlend = $properties.pipelines.bsp_gbuf.colorBlend;
+			dynamic = {
+				dynamicState = ( viewport, scissor );
+			};
+			layout = quakebsp_layout;
+			//renderPass = renderpass;
+		};
+		bsp_gbuf = {
 			stages = (
 				{
 					stage = vertex;
@@ -523,86 +595,15 @@
 					};
 				},
 			);
-			vertexInput = {
-				bindings = (
-					{
-						binding = 0;
-						stride = "2 * 4 * 4";
-						inputRate = vertex;
-					},
-				);
-				attributes = (
-					{
-						location = 0;
-						binding = 0;
-						format = r32g32b32a32_sfloat;
-						offset = 0;
-					},
-					{
-						location = 1;
-						binding = 0;
-						format = r32g32b32a32_sfloat;
-						offset = 16;
-					},
-				);
-			};
-			inputAssembly = {
-				topology = triangle_fan;
-				primitiveRestartEnable = true;
-			};
-			viewport = {
-				viewports = (
-					{
-						x = 0; y = 0;
-						width = 640; height = 480;
-						minDepth = 0; maxDepth = 1;
-					}
-				);
-				scissors = (
-					{
-						offset = { x = 0; y = 0 };
-						extent = { width = 640; height = 480; };
-					},
-				);
-			};
-			rasterization = {
-				depthClampEnable = false;
-				rasterizerDiscardEnable = false;
-				polygonMode = fill;
-				cullMode = back;
-				frontFace = clockwise;
-				depthBiasEnable = false;
-				lineWidth = 1;
-			};
-			multisample = {
-				rasterizationSamples = $msaaSamples;
-				sampleShadingEnable = false;
-				minSampleShading = 0.5f;
-				alphaToCoverageEnable = false;
-				alphaToOneEnable = false;
-			};
-			depthStencil = {
-				depthTestEnable = true;
-				depthWriteEnable = true;
-				depthCompareOp = less_or_equal;
-				depthBoundsTestEnable = false;
-				stencilTestEnable = false;
-			};
-			colorBlend = {
-				logicOpEnable = false;
-				attachments = ({
-					blendEnable = true;
-					srcColorBlendFactor = src_alpha;
-					dstColorBlendFactor = one_minus_src_alpha;
-					colorBlendOp = add;
-					srcAlphaBlendFactor = src_alpha;
-					dstAlphaBlendFactor = one_minus_src_alpha;
-					alphaBlendOp = add;
-					colorWriteMask = r|g|b|a;
-				});
-			};
+			vertexInput = $properties.pipelines.bsp_gbuf.vertexInput;
+			inputAssembly = $properties.pipelines.bsp_gbuf.inputAssembly;
+			viewport = $properties.pipelines.bsp_gbuf.viewport;
+			rasterization = $properties.pipelines.bsp_gbuf.rasterization;
+			multisample = $properties.pipelines.bsp_gbuf.multisample;
+			depthStencil = $properties.pipelines.bsp_gbuf.depthStencil;
+			colorBlend = $properties.pipelines.bsp_gbuf.colorBlend;
 			dynamic = {
-				dynamicState = ( viewport, scissor, blend_constants );
+				dynamicState = ( viewport, scissor );
 			};
 			layout = quakebsp_layout;
 			//renderPass = renderpass;
diff --git a/libs/video/renderer/vulkan/vkparse.c b/libs/video/renderer/vulkan/vkparse.c
index ad2696c8f..2d9b3c806 100644
--- a/libs/video/renderer/vulkan/vkparse.c
+++ b/libs/video/renderer/vulkan/vkparse.c
@@ -460,7 +460,8 @@ parse_VkDescriptorSetLayout (const plfield_t *field, const plitem_t *item,
 	ret = !cexpr_eval_string (name, &ectx);
 	if (ret) {
 		VkDescriptorSetLayout setLayout;
-		setLayout = QFV_ParseDescriptorSetLayout (ctx, setItem);
+		setLayout = QFV_ParseDescriptorSetLayout (ctx, setItem,
+												  pctx->properties);
 		*handle = (VkDescriptorSetLayout) setLayout;
 
 		QFV_AddHandle (ctx->setLayouts, name, (uint64_t) setLayout);
@@ -495,7 +496,7 @@ parse_VkPipelineLayout (const plitem_t *item, void **data,
 	ret = !cexpr_eval_string (name, &ectx);
 	if (ret) {
 		VkPipelineLayout layout;
-		layout = QFV_ParsePipelineLayout (ctx, setItem);
+		layout = QFV_ParsePipelineLayout (ctx, setItem, context->properties);
 		*handle = (VkPipelineLayout) layout;
 
 		QFV_AddHandle (ctx->pipelineLayouts, name, (uint64_t) layout);
@@ -503,6 +504,92 @@ parse_VkPipelineLayout (const plitem_t *item, void **data,
 	return ret;
 }
 
+static int
+parse_VkImage (const plitem_t *item, void **data, plitem_t *messages,
+			   parsectx_t *context)
+{
+	__auto_type handle = (VkImage *) data[0];
+	int         ret = 1;
+	exprctx_t   ectx = *context->ectx;
+	vulkan_ctx_t *ctx = context->vctx;
+
+	const char *name = PL_String (item);
+	Sys_Printf ("parse_VkImage: %s\n", name);
+	if (name[0] != '$') {
+		name = va (ctx->va_ctx, "$"QFV_PROPERTIES".images.%s", name);
+	}
+
+	*handle = (VkImage) QFV_GetHandle (ctx->images, name);
+	if (*handle) {
+		return 1;
+	}
+
+	plitem_t   *imageItem = 0;
+	exprval_t   result = { &cexpr_plitem, &imageItem };
+	ectx.symtab = 0;
+	ectx.result = &result;
+	ret = !cexpr_eval_string (name, &ectx);
+	if (ret) {
+		VkImage image;
+		image = QFV_ParseImage (ctx, imageItem, context->properties);
+		*handle = (VkImage) image;
+
+		QFV_AddHandle (ctx->images, name, (uint64_t) image);
+	}
+	return ret;
+}
+
+static exprtype_t imageview_type = {
+	"VkImageView",
+	sizeof (VkImageView),
+	0, 0, 0
+};
+
+static int
+parse_VkImageView (const plfield_t *field, const plitem_t *item, void *data,
+				   plitem_t *messages, void *_context)
+{
+	parsectx_t *context = _context;
+	__auto_type handle = (VkImageView *) data;
+	int         ret = 1;
+	exprctx_t   ectx = *context->ectx;
+	vulkan_ctx_t *ctx = context->vctx;
+
+	const char *name = PL_String (item);
+	Sys_Printf ("parse_VkImageView: %s\n", name);
+	if (name[0] != '$') {
+		name = va (ctx->va_ctx, "$"QFV_PROPERTIES".imageViews.%s", name);
+	}
+
+	*handle = (VkImageView) QFV_GetHandle (ctx->imageViews, name);
+	if (*handle) {
+		return 1;
+	}
+
+	exprval_t  *value = 0;
+	exprval_t   result = { &cexpr_exprval, &value };
+	ectx.symtab = 0;
+	ectx.result = &result;
+	ret = !cexpr_eval_string (name, &ectx);
+
+	plitem_t   *imageViewItem = 0;
+	if (ret) {
+		VkImageView imageView;
+		if (value->type == &imageview_type) {
+			imageView = *(VkImageView *) value->value;
+		} else if (value->type == &cexpr_plitem) {
+			imageView = QFV_ParseImageView (ctx, imageViewItem,
+											context->properties);
+			QFV_AddHandle (ctx->imageViews, name, (uint64_t) imageView);
+		} else {
+			PL_Message (messages, item, "not a VkImageView");
+			return 0;
+		}
+		*handle = (VkImageView) imageView;
+	}
+	return ret;
+}
+
 static const char *
 handleref_getkey (const void *hr, void *unused)
 {
@@ -592,6 +679,36 @@ sampler_free (void *hr, void *_ctx)
 	handleref_free (handleref, ctx);
 }
 
+static void
+image_free (void *hr, void *_ctx)
+{
+	__auto_type handleref = (handleref_t *) hr;
+	__auto_type image = (VkImage) handleref->handle;
+	__auto_type ctx = (vulkan_ctx_t *) _ctx;
+	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	if (image) {
+		dfunc->vkDestroyImage (device->dev, image, 0);
+	};
+	handleref_free (handleref, ctx);
+}
+
+static void
+imageView_free (void *hr, void *_ctx)
+{
+	__auto_type handleref = (handleref_t *) hr;
+	__auto_type imageView = (VkImageView) handleref->handle;
+	__auto_type ctx = (vulkan_ctx_t *) _ctx;
+	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	if (imageView) {
+		dfunc->vkDestroyImageView (device->dev, imageView, 0);
+	};
+	handleref_free (handleref, ctx);
+}
+
 static hashtab_t *enum_symtab;
 
 static int
@@ -605,23 +722,71 @@ parse_BasePipeline (const plitem_t *item, void **data,
 
 #include "libs/video/renderer/vulkan/vkparse.cinc"
 
-static exprsym_t imageset_symbols[] = {
-	{"size", &cexpr_size_t, (void *)field_offset (qfv_imageset_t, size)},
+static void
+imageviewset_index (const exprval_t *a, size_t index, exprval_t *c,
+					exprctx_t *ctx)
+{
+	__auto_type set = *(qfv_imageviewset_t **) a->value;
+	exprval_t  *val = 0;
+	if (index >= set->size) {
+		cexpr_error (ctx, "invalid index: %zd", index);
+	} else {
+		val = cexpr_value (&imageview_type, ctx);
+		*(VkImageView *) val->value = set->a[index];
+	}
+	*(exprval_t **) c->value = val;
+}
+
+static void
+imageviewset_int (const exprval_t *a, const exprval_t *b, exprval_t *c,
+				  exprctx_t *ctx)
+{
+	size_t      index = *(int *) b->value;
+	imageviewset_index (a, index, c, ctx);
+}
+
+static void
+imageviewset_uint (const exprval_t *a, const exprval_t *b, exprval_t *c,
+				   exprctx_t *ctx)
+{
+	size_t      index = *(unsigned *) b->value;
+	imageviewset_index (a, index, c, ctx);
+}
+
+static void
+imageviewset_size_t (const exprval_t *a, const exprval_t *b, exprval_t *c,
+					 exprctx_t *ctx)
+{
+	size_t      index = *(size_t *) b->value;
+	imageviewset_index (a, index, c, ctx);
+}
+
+binop_t imageviewset_binops[] = {
+	{ '.', &cexpr_field, &cexpr_exprval, cexpr_struct_pointer_getfield },
+	{ '[', &cexpr_int, &imageview_type, imageviewset_int },
+	{ '[', &cexpr_uint, &imageview_type, imageviewset_uint },
+	{ '[', &cexpr_size_t, &imageview_type, imageviewset_size_t },
+	{}
+};
+
+static exprsym_t imageviewset_symbols[] = {
+	{"size", &cexpr_size_t, (void *)field_offset (qfv_imageviewset_t, size)},
 	{ }
 };
-static exprtab_t imageset_symtab = {
-	imageset_symbols,
+static exprtab_t imageviewset_symtab = {
+	imageviewset_symbols,
 };
-exprtype_t imageset_type = {
-	"imageset",
-	sizeof (qfv_imageset_t *),
-	cexpr_struct_pointer_binops,
+exprtype_t imageviewset_type = {
+	"imageviewset",
+	sizeof (qfv_imageviewset_t *),
+	imageviewset_binops,
 	0,
-	&imageset_symtab,
+	&imageviewset_symtab,
 };
 static exprsym_t qfv_swapchain_t_symbols[] = {
 	{"format", &VkFormat_type, (void *)field_offset (qfv_swapchain_t, format)},
-	{"images", &imageset_type, (void *)field_offset (qfv_swapchain_t, images)},
+	{"extent", &VkExtent2D_type, (void *)field_offset (qfv_swapchain_t, extent)},
+	{"views", &imageviewset_type, (void *)field_offset (qfv_swapchain_t, imageViews)},
 	{ }
 };
 static exprtab_t qfv_swapchain_t_symtab = {
@@ -714,7 +879,7 @@ QFV_InitParse (vulkan_ctx_t *ctx)
 	vkgen_init_symtabs (&context);
 	cexpr_init_symtab (&qfv_swapchain_t_symtab, &context);
 	cexpr_init_symtab (&vulkan_frameset_t_symtab, &context);
-	cexpr_init_symtab (&imageset_symtab, &context);
+	cexpr_init_symtab (&imageviewset_symtab, &context);
 
 	if (!ctx->setLayouts) {
 		ctx->shaderModules = handlref_symtab (shaderModule_free, ctx);
@@ -722,6 +887,8 @@ QFV_InitParse (vulkan_ctx_t *ctx)
 		ctx->pipelineLayouts = handlref_symtab (pipelineLayout_free, ctx);
 		ctx->descriptorPools = handlref_symtab (descriptorPool_free, ctx);
 		ctx->samplers = handlref_symtab (sampler_free, ctx);
+		ctx->images = handlref_symtab (image_free, ctx);
+		ctx->imageViews = handlref_symtab (imageView_free, ctx);
 	}
 }
 
@@ -733,16 +900,17 @@ QFV_GetEnum (const char *name)
 
 static int
 parse_object (vulkan_ctx_t *ctx, plitem_t *plist,
-			  plparser_t parser, void *object)
+			  plparser_t parser, void *object, plitem_t *properties)
 {
 	plitem_t   *messages = PL_NewArray ();
 	exprctx_t   exprctx = {};
-	parsectx_t  parsectx = { &exprctx, ctx };
+	parsectx_t  parsectx = { &exprctx, ctx, properties };
 	exprsym_t   var_syms[] = {
 		{"swapchain", &qfv_swapchain_t_type, ctx->swapchain},
 		{"frames", &vulkan_frameset_t_type, &ctx->frames},
 		{"msaaSamples", &VkSampleCountFlagBits_type, &ctx->msaaSamples},
-		{QFV_PROPERTIES, &cexpr_plitem, &ctx->pipelineDef},
+		{"swapImageIndex", &cexpr_uint, &ctx->swapImageIndex},
+		{QFV_PROPERTIES, &cexpr_plitem, &parsectx.properties},
 		{}
 	};
 	exprtab_t   vars_tab = { var_syms, 0 };
@@ -775,13 +943,14 @@ parse_qfv_renderpass (const plfield_t *field, const plitem_t *item, void *data,
 }
 
 VkRenderPass
-QFV_ParseRenderPass (vulkan_ctx_t *ctx, plitem_t *plist)
+QFV_ParseRenderPass (vulkan_ctx_t *ctx, plitem_t *plist, plitem_t *properties)
 {
 	qfv_device_t *device = ctx->device;
 
 	qfv_renderpass_t renderpass_data = {};
 
-	if (!parse_object (ctx, plist, parse_qfv_renderpass, &renderpass_data)) {
+	if (!parse_object (ctx, plist, parse_qfv_renderpass, &renderpass_data,
+					   properties)) {
 		return 0;
 	}
 
@@ -805,7 +974,7 @@ QFV_ParseRenderPass (vulkan_ctx_t *ctx, plitem_t *plist)
 }
 
 VkPipeline
-QFV_ParsePipeline (vulkan_ctx_t *ctx, plitem_t *plist)
+QFV_ParsePipeline (vulkan_ctx_t *ctx, plitem_t *plist, plitem_t *properties)
 {
 	qfv_device_t *device = ctx->device;
 
@@ -813,11 +982,11 @@ QFV_ParsePipeline (vulkan_ctx_t *ctx, plitem_t *plist)
 	memset (&cInfo->a[0], 0, sizeof (cInfo->a[0]));
 
 	if (!parse_object (ctx, plist, parse_VkGraphicsPipelineCreateInfo,
-					   &cInfo->a[0])) {
+					   &cInfo->a[0], properties)) {
 		return 0;
 	}
 
-	cInfo->a[0].renderPass = ctx->renderpass.renderpass;
+	cInfo->a[0].renderPass = ctx->renderpass;
 	__auto_type plSet = QFV_CreateGraphicsPipelines (device, 0, cInfo);
 	VkPipeline pipeline = plSet->a[0];
 	free (plSet);
@@ -825,14 +994,16 @@ QFV_ParsePipeline (vulkan_ctx_t *ctx, plitem_t *plist)
 }
 
 VkDescriptorPool
-QFV_ParseDescriptorPool (vulkan_ctx_t *ctx, plitem_t *plist)
+QFV_ParseDescriptorPool (vulkan_ctx_t *ctx, plitem_t *plist,
+						 plitem_t *properties)
 {
 	qfv_device_t *device = ctx->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
 
 	VkDescriptorPoolCreateInfo cInfo = {};
 
-	if (!parse_object (ctx, plist, parse_VkDescriptorPoolCreateInfo, &cInfo)) {
+	if (!parse_object (ctx, plist, parse_VkDescriptorPoolCreateInfo, &cInfo,
+					   properties)) {
 		return 0;
 	}
 
@@ -843,7 +1014,8 @@ QFV_ParseDescriptorPool (vulkan_ctx_t *ctx, plitem_t *plist)
 }
 
 VkDescriptorSetLayout
-QFV_ParseDescriptorSetLayout (vulkan_ctx_t *ctx, plitem_t *plist)
+QFV_ParseDescriptorSetLayout (vulkan_ctx_t *ctx, plitem_t *plist,
+							  plitem_t *properties)
 {
 	qfv_device_t *device = ctx->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
@@ -851,7 +1023,7 @@ QFV_ParseDescriptorSetLayout (vulkan_ctx_t *ctx, plitem_t *plist)
 	VkDescriptorSetLayoutCreateInfo cInfo = {};
 
 	if (!parse_object (ctx, plist, parse_VkDescriptorSetLayoutCreateInfo,
-					   &cInfo)) {
+					   &cInfo, properties)) {
 		return 0;
 	}
 
@@ -862,7 +1034,8 @@ QFV_ParseDescriptorSetLayout (vulkan_ctx_t *ctx, plitem_t *plist)
 }
 
 VkPipelineLayout
-QFV_ParsePipelineLayout (vulkan_ctx_t *ctx, plitem_t *plist)
+QFV_ParsePipelineLayout (vulkan_ctx_t *ctx, plitem_t *plist,
+						 plitem_t *properties)
 {
 	qfv_device_t *device = ctx->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
@@ -870,7 +1043,7 @@ QFV_ParsePipelineLayout (vulkan_ctx_t *ctx, plitem_t *plist)
 	VkPipelineLayoutCreateInfo cInfo = {};
 
 	if (!parse_object (ctx, plist, parse_VkPipelineLayoutCreateInfo,
-					   &cInfo)) {
+					   &cInfo, properties)) {
 		return 0;
 	}
 
@@ -881,14 +1054,15 @@ QFV_ParsePipelineLayout (vulkan_ctx_t *ctx, plitem_t *plist)
 }
 
 VkSampler
-QFV_ParseSampler (vulkan_ctx_t *ctx, plitem_t *plist)
+QFV_ParseSampler (vulkan_ctx_t *ctx, plitem_t *plist, plitem_t *properties)
 {
 	qfv_device_t *device = ctx->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
 
 	VkSamplerCreateInfo cInfo = {};
 
-	if (!parse_object (ctx, plist, parse_VkSamplerCreateInfo, &cInfo)) {
+	if (!parse_object (ctx, plist, parse_VkSamplerCreateInfo, &cInfo,
+					   properties)) {
 		return 0;
 	}
 
@@ -897,3 +1071,195 @@ QFV_ParseSampler (vulkan_ctx_t *ctx, plitem_t *plist)
 
 	return sampler;
 }
+
+VkImage
+QFV_ParseImage (vulkan_ctx_t *ctx, plitem_t *plist, plitem_t *properties)
+{
+	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	VkImageCreateInfo cInfo = {};
+
+	if (!parse_object (ctx, plist, parse_VkImageCreateInfo, &cInfo,
+					   properties)) {
+		return 0;
+	}
+
+	VkImage image;
+	dfunc->vkCreateImage (device->dev, &cInfo, 0, &image);
+
+	return image;
+}
+
+VkImageView
+QFV_ParseImageView (vulkan_ctx_t *ctx, plitem_t *plist, plitem_t *properties)
+{
+	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	VkImageViewCreateInfo cInfo = {};
+
+	if (!parse_object (ctx, plist, parse_VkImageViewCreateInfo, &cInfo,
+					   properties)) {
+		return 0;
+	}
+
+	VkImageView imageView;
+	dfunc->vkCreateImageView (device->dev, &cInfo, 0, &imageView);
+
+	return imageView;
+}
+
+typedef struct {
+	uint32_t    count;
+	VkImageCreateInfo *info;
+} imagecreate_t;
+
+typedef struct {
+	uint32_t    count;
+	VkImageViewCreateInfo *info;
+} imageviewcreate_t;
+
+static plelement_t qfv_imagecreate_dict = {
+	QFDictionary,
+	sizeof (VkImageCreateInfo),
+	array_alloc,
+	parse_VkImageCreateInfo,
+};
+
+static plelement_t qfv_imageviewcreate_dict = {
+	QFDictionary,
+	sizeof (VkImageViewCreateInfo),
+	array_alloc,
+	parse_VkImageViewCreateInfo,
+};
+
+static int
+parse_imagecreate_dict (const plfield_t *field, const plitem_t *item,
+						void *data, plitem_t *messages, void *context)
+{
+	plfield_t   f = { "images", 0, QFArray, parse_array,
+					  &qfv_imagecreate_dict };
+	typedef struct arr_s DARRAY_TYPE(byte) arr_t;
+	arr_t      *arr = 0;
+	int         ret;
+
+	if ((ret = PL_ParseLabeledArray (&f, item, &arr, messages, context))) {
+		imagecreate_t  *imagecreate = data;
+		imagecreate->count = arr->size;
+		imagecreate->info = (VkImageCreateInfo *) arr->a;
+	} else {
+		//FIXME leaky boat when succeeds
+		if (arr) {
+			free (arr);
+		}
+	}
+	return ret;
+}
+
+static int
+parse_imageviewcreate_dict (const plfield_t *field, const plitem_t *item,
+							void *data, plitem_t *messages, void *context)
+{
+	plfield_t   f = { "images", 0, QFArray, parse_array,
+					  &qfv_imageviewcreate_dict };
+	typedef struct arr_s DARRAY_TYPE(byte) arr_t;
+	arr_t      *arr = 0;
+	int         ret;
+
+	if ((ret = PL_ParseLabeledArray (&f, item, &arr, messages, context))) {
+		imageviewcreate_t  *imageviewcreate = data;
+		imageviewcreate->count = arr->size;
+		imageviewcreate->info = (VkImageViewCreateInfo *) arr->a;
+	} else {
+		//FIXME leaky boat when succeeds
+		if (arr) {
+			free (arr);
+		}
+	}
+	return ret;
+}
+
+qfv_imageset_t *
+QFV_ParseImageSet (vulkan_ctx_t *ctx, plitem_t *item, plitem_t *properties)
+{
+	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	imagecreate_t create = {};
+
+	pltype_t    type = PL_Type (item);
+
+	if (type == QFDictionary) {
+		if (!parse_object (ctx, item, parse_imagecreate_dict, &create,
+						   properties)) {
+			return 0;
+		}
+	} else {
+		Sys_Printf ("Neither array nor dictionary: %d\n", PL_Line (item));
+		return 0;
+	}
+
+	__auto_type set = QFV_AllocImages (create.count, malloc);
+	for (uint32_t i = 0; i < create.count; i++) {
+		dfunc->vkCreateImage (device->dev, &create.info[i], 0, &set->a[i]);
+
+		const char *name = PL_KeyAtIndex (item, i);
+		name = va (ctx->va_ctx, "$"QFV_PROPERTIES".images.%s", name);
+		QFV_AddHandle (ctx->images, name, (uint64_t) set->a[i]);
+	}
+
+	return set;
+}
+
+qfv_imageviewset_t *
+QFV_ParseImageViewSet (vulkan_ctx_t *ctx, plitem_t *item,
+					   plitem_t *properties)
+{
+	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	imageviewcreate_t create = {};
+
+	pltype_t    type = PL_Type (item);
+
+	if (type == QFDictionary) {
+		if (!parse_object (ctx, item, parse_imageviewcreate_dict, &create,
+						   properties)) {
+			return 0;
+		}
+	} else {
+		Sys_Printf ("Neither array nor dictionary: %d\n", PL_Line (item));
+		return 0;
+	}
+
+	__auto_type set = QFV_AllocImageViews (create.count, malloc);
+	for (uint32_t i = 0; i < create.count; i++) {
+		dfunc->vkCreateImageView (device->dev, &create.info[i], 0, &set->a[i]);
+
+		const char *name = PL_KeyAtIndex (item, i);
+		name = va (ctx->va_ctx, "$"QFV_PROPERTIES".imageViews.%s", name);
+		QFV_AddHandle (ctx->imageViews, name, (uint64_t) set->a[i]);
+	}
+
+	return set;
+}
+
+VkFramebuffer
+QFV_ParseFramebuffer (vulkan_ctx_t *ctx, plitem_t *plist, plitem_t *properties)
+{
+	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	VkFramebufferCreateInfo cInfo = {};
+
+	if (!parse_object (ctx, plist, parse_VkFramebufferCreateInfo, &cInfo,
+					   properties)) {
+		return 0;
+	}
+
+	VkFramebuffer framebuffer;
+	dfunc->vkCreateFramebuffer (device->dev, &cInfo, 0, &framebuffer);
+
+	return framebuffer;
+}
diff --git a/libs/video/renderer/vulkan/vkparse.h b/libs/video/renderer/vulkan/vkparse.h
index c443e98e3..f8aea8a7f 100644
--- a/libs/video/renderer/vulkan/vkparse.h
+++ b/libs/video/renderer/vulkan/vkparse.h
@@ -4,6 +4,8 @@
 typedef struct parsectx_s {
 	struct exprctx_s *ectx;
 	struct vulkan_ctx_s *vctx;
+	struct plitem_s *properties;
+	void       *data;
 } parsectx_t;
 
 #include "QF/cexpr.h"
@@ -32,12 +34,29 @@ exprenum_t *QFV_GetEnum (const char *name);
 uint64_t QFV_GetHandle (struct hashtab_s *tab, const char *name);
 void QFV_AddHandle (struct hashtab_s *tab, const char *name, uint64_t handle);
 
-VkRenderPass QFV_ParseRenderPass (vulkan_ctx_t *ctx, plitem_t *plist);
-VkPipeline QFV_ParsePipeline (vulkan_ctx_t *ctx, plitem_t *plist);
-VkDescriptorPool QFV_ParseDescriptorPool (vulkan_ctx_t *ctx, plitem_t *plist);
+VkRenderPass QFV_ParseRenderPass (vulkan_ctx_t *ctx, plitem_t *plist,
+								  plitem_t *properties);
+VkPipeline QFV_ParsePipeline (vulkan_ctx_t *ctx, plitem_t *plist,
+							  plitem_t *properties);
+VkDescriptorPool QFV_ParseDescriptorPool (vulkan_ctx_t *ctx, plitem_t *plist,
+										  plitem_t *properties);
 VkDescriptorSetLayout QFV_ParseDescriptorSetLayout (vulkan_ctx_t *ctx,
-													plitem_t *plist);
-VkPipelineLayout QFV_ParsePipelineLayout (vulkan_ctx_t *ctx, plitem_t *plist);
-VkSampler QFV_ParseSampler (vulkan_ctx_t *ctx, plitem_t *plist);
+													plitem_t *plist,
+													plitem_t *properties);
+VkPipelineLayout QFV_ParsePipelineLayout (vulkan_ctx_t *ctx, plitem_t *plist,
+										  plitem_t *properties);
+VkSampler QFV_ParseSampler (vulkan_ctx_t *ctx, plitem_t *plist,
+							plitem_t *properties);
+VkImage QFV_ParseImage (vulkan_ctx_t *ctx, plitem_t *plist,
+						plitem_t *properties);
+VkImageView QFV_ParseImageView (vulkan_ctx_t *ctx, plitem_t *plist,
+								plitem_t *properties);
+struct qfv_imageset_s *QFV_ParseImageSet (vulkan_ctx_t *ctx, plitem_t *plist,
+										  plitem_t *properties);
+struct qfv_imageviewset_s *QFV_ParseImageViewSet (vulkan_ctx_t *ctx,
+												  plitem_t *plist,
+												  plitem_t *properties);
+VkFramebuffer QFV_ParseFramebuffer (vulkan_ctx_t *ctx, plitem_t *plist,
+									plitem_t *properties);
 
 #endif//__vkparse_h
diff --git a/libs/video/renderer/vulkan/vkparse.plist b/libs/video/renderer/vulkan/vkparse.plist
index c3a0bfdd9..ced50835a 100644
--- a/libs/video/renderer/vulkan/vkparse.plist
+++ b/libs/video/renderer/vulkan/vkparse.plist
@@ -20,6 +20,9 @@
 		VkGraphicsPipelineCreateInfo,
 		VkDescriptorPoolCreateInfo,
 		VkSamplerCreateInfo,
+		VkImageCreateInfo,
+		VkImageViewCreateInfo,
+		VkFramebufferCreateInfo,
 	);
 	parse = {
 		VkSubpassDescription = {
@@ -282,6 +285,48 @@
 				fields = (basePipelineHandle);
 			};
 			basePipelineIndex = auto;
+		};
+		VkImageCreateInfo = {
+			flags = auto;
+			imageType = auto;
+			format = auto;
+			extent = auto;
+			mipLevels = auto;
+			arrayLayers = auto;
+			samples = auto;
+			tiling = auto;
+			usage = auto;
+			sharingMode = skip;	// FIXME for now
+			queueFamilyIndexCount = skip;	// FIXME for now
+			pQueueFamilyIndices = skip;	// FIXME for now
+			initialLayout = auto;
+		};
+		VkImageViewCreateInfo = {
+			flags = auto;
+			image = {
+				type = (custom,	(QFDictionary, QFString),
+						parse_VkImage);
+				fields = (image);
+			};
+			viewType = auto;
+			format = auto;
+			components = auto;
+			subresourceRange = auto;
+		};
+		VkFramebufferCreateInfo = {
+			//flags = auto; reserved for future use (Bits enum does not exist)
+			renderPass = {
+				type = (custom,	QFString, parse_VkShaderModule);
+				fields = (renderPass);
+			};
+			attachments = {
+				type = (array, VkImageView);
+				size = attachmentCount;
+				values = pAttachments;
+			};
+			width = auto;
+			height = auto;
+			layers = auto;
 		}
 	}
 }
diff --git a/libs/video/renderer/vulkan/vulkan_alias.c b/libs/video/renderer/vulkan/vulkan_alias.c
index 67598dc96..973e5445b 100644
--- a/libs/video/renderer/vulkan/vulkan_alias.c
+++ b/libs/video/renderer/vulkan/vulkan_alias.c
@@ -64,16 +64,65 @@
 #include "r_internal.h"
 #include "vid_vulkan.h"
 
-void
-Vulkan_DrawAlias (entity_t *ent, struct vulkan_ctx_s *ctx)
+static const char *alias_pass_names[] = {
+	"depth",
+	"g-buffer",
+	"translucent",
+};
+
+static void
+emit_commands (VkCommandBuffer cmd, int pose1, int pose2,
+			   qfv_alias_skin_t *skin,
+			   void *vert_constants, int vert_size,
+			   void *frag_constants, int frag_size,
+			   aliashdr_t *hdr, vulkan_ctx_t *ctx)
 {
 	qfv_device_t *device = ctx->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
 	aliasctx_t *actx = ctx->alias_context;
 	aliasframe_t *aframe = &actx->frames.a[ctx->curFrame];
+
+	__auto_type mesh = (qfv_alias_mesh_t *) ((byte *) hdr + hdr->commands);
+
+	VkDeviceSize offsets[] = {
+		pose1 * hdr->poseverts * sizeof (aliasvrt_t),
+		pose2 * hdr->poseverts * sizeof (aliasvrt_t),
+		0,
+	};
+	VkBuffer    buffers[] = {
+		mesh->vertex_buffer,
+		mesh->vertex_buffer,
+		mesh->uv_buffer,
+	};
+	int         bindingCount = skin ? 3 : 2;
+
+	dfunc->vkCmdBindVertexBuffers (cmd, 0, bindingCount, buffers, offsets);
+	dfunc->vkCmdBindIndexBuffer (cmd, mesh->index_buffer, 0,
+								 VK_INDEX_TYPE_UINT32);
+	dfunc->vkCmdPushConstants (cmd, actx->layout, VK_SHADER_STAGE_VERTEX_BIT,
+							   0, vert_size, vert_constants);
+	if (skin) {
+		dfunc->vkCmdPushConstants (cmd, actx->layout,
+								   VK_SHADER_STAGE_FRAGMENT_BIT,
+								   68, frag_size, frag_constants);
+		aframe->imageInfo[0].imageView = skin->view;
+		dfunc->vkCmdPushDescriptorSetKHR (cmd,
+										  VK_PIPELINE_BIND_POINT_GRAPHICS,
+										  actx->layout,
+										  0, ALIAS_IMAGE_INFOS,
+										  aframe->descriptors
+										  + ALIAS_BUFFER_INFOS);
+	}
+	dfunc->vkCmdDrawIndexed (cmd, 3 * hdr->mdl.numtris, 1, 0, 0, 0);
+}
+
+void
+Vulkan_DrawAlias (entity_t *ent, vulkan_ctx_t *ctx)
+{
+	aliasctx_t *actx = ctx->alias_context;
+	aliasframe_t *aframe = &actx->frames.a[ctx->curFrame];
 	model_t    *model = ent->model;
 	aliashdr_t *hdr;
-	qfv_alias_mesh_t *mesh;
 	qfv_alias_skin_t *skin;
 	float       vertex_constants[17];
 	byte        fragment_constants[3][4];
@@ -81,7 +130,6 @@ Vulkan_DrawAlias (entity_t *ent, struct vulkan_ctx_s *ctx)
 	if (!(hdr = model->aliashdr)) {
 		hdr = Cache_Get (&model->cache);
 	}
-	mesh = (qfv_alias_mesh_t *) ((byte *) hdr + hdr->commands);
 
 	memcpy (vertex_constants, ent->transform, sizeof (ent->transform));
 	vertex_constants[16] = R_AliasGetLerpedFrames (ent, hdr);
@@ -97,90 +145,26 @@ Vulkan_DrawAlias (entity_t *ent, struct vulkan_ctx_s *ctx)
 	QuatCopy (skin->colora, fragment_constants[1]);
 	QuatCopy (skin->colorb, fragment_constants[2]);
 
-	VkDeviceSize offsets[] = {
-		ent->pose1 * hdr->poseverts * sizeof (aliasvrt_t),
-		ent->pose2 * hdr->poseverts * sizeof (aliasvrt_t),
-		0,
-	};
-	VkBuffer    buffers[] = {
-		mesh->vertex_buffer,
-		mesh->vertex_buffer,
-		mesh->uv_buffer,
-	};
-	dfunc->vkCmdBindVertexBuffers (aframe->cmd, 0, 3, buffers, offsets);
-	dfunc->vkCmdBindIndexBuffer (aframe->cmd, mesh->index_buffer, 0,
-								 VK_INDEX_TYPE_UINT32);
-	dfunc->vkCmdPushConstants (aframe->cmd, actx->layout,
-							   VK_SHADER_STAGE_VERTEX_BIT,
-							   0, sizeof (vertex_constants), vertex_constants);
-	dfunc->vkCmdPushConstants (aframe->cmd, actx->layout,
-							   VK_SHADER_STAGE_FRAGMENT_BIT,
-							   68, sizeof (fragment_constants),
-							   fragment_constants);
-	aframe->imageInfo[0].imageView = skin->view;
-	dfunc->vkCmdPushDescriptorSetKHR (aframe->cmd,
-									  VK_PIPELINE_BIND_POINT_GRAPHICS,
-									  actx->layout,
-									  0, ALIAS_IMAGE_INFOS,
-									  aframe->descriptors
-									  + ALIAS_BUFFER_INFOS);
-	dfunc->vkCmdDrawIndexed (aframe->cmd, 3 * hdr->mdl.numtris, 1, 0, 0, 0);
+	emit_commands (aframe->cmdSet.a[QFV_aliasDepth], ent->pose1, ent->pose2,
+				   0, vertex_constants, sizeof (vertex_constants),
+				   fragment_constants, sizeof (fragment_constants),
+				   hdr, ctx);
 }
 
 static void
-calc_lighting (qfv_light_t *light, entity_t *ent)
-{
-	vec3_t      ambient_color;
-	//FIXME should be ent->position
-	float       l = R_LightPoint (&r_worldentity.model->brush, r_origin) / 128.0;
-
-	//XXX l = max (light, max (ent->model->min_light, ent->min_light));
-	light->type = 2;
-	VectorSet (1, 1, 1, ambient_color);	//FIXME
-	// position doubles as ambient light
-	VectorScale (ambient_color, l, light->position);
-	VectorSet (-1, 0, 0, light->direction);	//FIXME
-	VectorCopy (light->position, light->color);
-}
-
-void
-Vulkan_AliasBegin (vulkan_ctx_t *ctx)
+alias_begin_subpass (VkCommandBuffer cmd, VkPipeline pipeline,
+					 vulkan_ctx_t *ctx)
 {
 	qfv_device_t *device = ctx->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
 	aliasctx_t *actx = ctx->alias_context;
-
-	dlight_t   *lights[ALIAS_LIGHTS];
-	//XXX quat_t      fog;
-
 	__auto_type cframe = &ctx->frames.a[ctx->curFrame];
 	aliasframe_t *aframe = &actx->frames.a[ctx->curFrame];
-	VkCommandBuffer cmd = aframe->cmd;
-	DARRAY_APPEND (cframe->subCommand, cmd);
-
-	//FIXME ambient needs to be per entity
-	aframe->lights->light_count = 1;
-	calc_lighting (&aframe->lights->lights[0], 0);
-	R_FindNearLights (r_origin, ALIAS_LIGHTS - 1, lights);
-	for (int i = 0; i < ALIAS_LIGHTS - 1; i++) {
-		if (!lights[i]) {
-			break;
-		}
-		aframe->lights->light_count++;
-		VectorCopy (lights[i]->color, aframe->lights->lights[i + 1].color);
-		VectorCopy (lights[i]->origin, aframe->lights->lights[i + 1].position);
-		aframe->lights->lights[i + 1].dist = lights[i]->radius;
-		aframe->lights->lights[i + 1].type = 0;
-	}
-
-	//FIXME need per frame matrices
-	aframe->bufferInfo[0].buffer = ctx->matrices.buffer_3d;
-	aframe->bufferInfo[1].buffer = aframe->light_buffer;
 
 	dfunc->vkResetCommandBuffer (cmd, 0);
 	VkCommandBufferInheritanceInfo inherit = {
 		VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_INFO, 0,
-		ctx->renderpass.renderpass, 0,
+		ctx->renderpass, 0,
 		cframe->framebuffer,
 		0, 0, 0,
 	};
@@ -192,7 +176,7 @@ Vulkan_AliasBegin (vulkan_ctx_t *ctx)
 	dfunc->vkBeginCommandBuffer (cmd, &beginInfo);
 
 	dfunc->vkCmdBindPipeline (cmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
-							  actx->pipeline);
+							  pipeline);
 	//VkDescriptorSet sets[] = {
 	//	aframe->descriptors[0].dstSet,
 	//	aframe->descriptors[1].dstSet,
@@ -213,15 +197,43 @@ Vulkan_AliasBegin (vulkan_ctx_t *ctx)
 	//XXX fog[3] = glsl_Fog_GetDensity () / 64.0;
 }
 
-void
-Vulkan_AliasEnd (vulkan_ctx_t *ctx)
+static void
+alias_end_subpass (VkCommandBuffer cmd, vulkan_ctx_t *ctx)
 {
 	qfv_device_t *device = ctx->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
-	aliasctx_t *actx = ctx->alias_context;
 
+	dfunc->vkEndCommandBuffer (cmd);
+}
+
+void
+Vulkan_AliasBegin (vulkan_ctx_t *ctx)
+{
+	aliasctx_t *actx = ctx->alias_context;
+	__auto_type cframe = &ctx->frames.a[ctx->curFrame];
 	aliasframe_t *aframe = &actx->frames.a[ctx->curFrame];
-	dfunc->vkEndCommandBuffer (aframe->cmd);
+
+	//XXX quat_t      fog;
+	DARRAY_APPEND (&cframe->cmdSets[QFV_passDepth],
+				   aframe->cmdSet.a[QFV_aliasDepth]);
+	DARRAY_APPEND (&cframe->cmdSets[QFV_passGBuffer],
+				   aframe->cmdSet.a[QFV_aliasGBuffer]);
+
+	//FIXME need per frame matrices
+	aframe->bufferInfo[0].buffer = ctx->matrices.buffer_3d;
+
+	alias_begin_subpass (aframe->cmdSet.a[QFV_aliasDepth], actx->depth, ctx);
+	alias_begin_subpass (aframe->cmdSet.a[QFV_aliasGBuffer], actx->gbuf, ctx);
+}
+
+void
+Vulkan_AliasEnd (vulkan_ctx_t *ctx)
+{
+	aliasctx_t *actx = ctx->alias_context;
+	aliasframe_t *aframe = &actx->frames.a[ctx->curFrame];
+
+	alias_end_subpass (aframe->cmdSet.a[QFV_aliasDepth], ctx);
+	alias_end_subpass (aframe->cmdSet.a[QFV_aliasGBuffer], ctx);
 }
 
 static VkDescriptorBufferInfo base_buffer_info = {
@@ -247,7 +259,6 @@ void
 Vulkan_Alias_Init (vulkan_ctx_t *ctx)
 {
 	qfv_device_t *device = ctx->device;
-	qfv_devfuncs_t *dfunc = device->funcs;
 
 	aliasctx_t *actx = calloc (1, sizeof (aliasctx_t));
 	ctx->alias_context = actx;
@@ -257,7 +268,8 @@ Vulkan_Alias_Init (vulkan_ctx_t *ctx)
 	DARRAY_RESIZE (&actx->frames, frames);
 	actx->frames.grow = 0;
 
-	actx->pipeline = Vulkan_CreatePipeline (ctx, "alias");
+	actx->depth = Vulkan_CreatePipeline (ctx, "alias_depth");
+	actx->gbuf = Vulkan_CreatePipeline (ctx, "alias_gbuf");
 	actx->layout = Vulkan_CreatePipelineLayout (ctx, "alias_layout");
 	actx->sampler = Vulkan_CreateSampler (ctx, "alias_sampler");
 
@@ -276,43 +288,22 @@ Vulkan_Alias_Init (vulkan_ctx_t *ctx)
 	}*/
 	//__auto_type pool = QFV_GetDescriptorPool (ctx, "alias.pool");
 
-	__auto_type cmdBuffers = QFV_AllocCommandBufferSet (frames, alloca);
-	QFV_AllocateCommandBuffers (device, ctx->cmdpool, 1, cmdBuffers);
-
-	__auto_type lbuffers = QFV_AllocBufferSet (frames, alloca);
-	for (size_t i = 0; i < frames; i++) {
-		lbuffers->a[i] = QFV_CreateBuffer (device, sizeof (qfv_light_buffer_t),
-										   VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT);
-		QFV_duSetObjectName (device, VK_OBJECT_TYPE_BUFFER,
-							 lbuffers->a[i],
-							 va (ctx->va_ctx, "buffer:alias:%s:%zd",
-								 "lights", i));
-	}
-	VkMemoryRequirements requirements;
-	dfunc->vkGetBufferMemoryRequirements (device->dev, lbuffers->a[0],
-										  &requirements);
-	actx->light_memory = QFV_AllocBufferMemory (device, lbuffers->a[0],
-										VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT,
-										frames * requirements.size, 0);
-	QFV_duSetObjectName (device, VK_OBJECT_TYPE_DEVICE_MEMORY,
-						 actx->light_memory, va (ctx->va_ctx,
-												 "memory:alias:%s", "lights"));
-	byte       *light_data;
-	dfunc->vkMapMemory (device->dev, actx->light_memory, 0,
-						frames * requirements.size, 0, (void **) &light_data);
-
 	//__auto_type sets = QFV_AllocateDescriptorSet (device, pool, layouts);
 	for (size_t i = 0; i < frames; i++) {
 		__auto_type aframe = &actx->frames.a[i];
-		aframe->cmd = cmdBuffers->a[i];
-		QFV_duSetObjectName (device, VK_OBJECT_TYPE_COMMAND_BUFFER,
-							 aframe->cmd,
-							 va (ctx->va_ctx, "cmd:alias:%zd", i));
-		aframe->light_buffer = lbuffers->a[i];
-		aframe->lights = (qfv_light_buffer_t *) (light_data + i * requirements.size);
-		QFV_BindBufferMemory (device, lbuffers->a[i], actx->light_memory,
-							  i * requirements.size);
 
+		DARRAY_INIT (&aframe->cmdSet, QFV_aliasNumPasses);
+		DARRAY_RESIZE (&aframe->cmdSet, QFV_aliasNumPasses);
+		aframe->cmdSet.grow = 0;
+
+		QFV_AllocateCommandBuffers (device, ctx->cmdpool, 1, &aframe->cmdSet);
+
+		for (int j = 0; j < QFV_aliasNumPasses; j++) {
+			QFV_duSetObjectName (device, VK_OBJECT_TYPE_COMMAND_BUFFER,
+								 aframe->cmdSet.a[j],
+								 va (ctx->va_ctx, "cmd:alias:%zd:%s", i,
+									 alias_pass_names[j]));
+		}
 		for (int j = 0; j < ALIAS_BUFFER_INFOS; j++) {
 			aframe->bufferInfo[j] = base_buffer_info;
 			aframe->descriptors[j] = base_buffer_write;
@@ -333,7 +324,7 @@ Vulkan_Alias_Init (vulkan_ctx_t *ctx)
 }
 
 void
-Vulkan_Alias_Shutdown (struct vulkan_ctx_s *ctx)
+Vulkan_Alias_Shutdown (vulkan_ctx_t *ctx)
 {
 	qfv_device_t *device = ctx->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
@@ -341,11 +332,11 @@ Vulkan_Alias_Shutdown (struct vulkan_ctx_s *ctx)
 
 	for (size_t i = 0; i < actx->frames.size; i++) {
 		__auto_type aframe = &actx->frames.a[i];
-		dfunc->vkDestroyBuffer (device->dev, aframe->light_buffer, 0);
+		free (aframe->cmdSet.a);
 	}
-	dfunc->vkFreeMemory (device->dev, actx->light_memory, 0);
 
-	dfunc->vkDestroyPipeline (device->dev, actx->pipeline, 0);
-	DARRAY_CLEAR (&actx->frames);
+	dfunc->vkDestroyPipeline (device->dev, actx->depth, 0);
+	dfunc->vkDestroyPipeline (device->dev, actx->gbuf, 0);
+	free (actx->frames.a);
 	free (actx);
 }
diff --git a/libs/video/renderer/vulkan/vulkan_bsp.c b/libs/video/renderer/vulkan/vulkan_bsp.c
index 7028aa754..895caed49 100644
--- a/libs/video/renderer/vulkan/vulkan_bsp.c
+++ b/libs/video/renderer/vulkan/vulkan_bsp.c
@@ -69,6 +69,12 @@
 #include "r_internal.h"
 #include "vid_vulkan.h"
 
+static const char *bsp_pass_names[] = {
+	"depth",
+	"g-buffer",
+	"translucent",
+};
+
 static float identity[] = {
 	1, 0, 0, 0,
 	0, 1, 0, 0,
@@ -779,33 +785,44 @@ bind_view (qfv_bsp_tex tex, VkImageView view, bspframe_t *bframe,
 									  + BSP_BUFFER_INFOS);
 }
 
+static void
+push_transform (vec_t *transform, VkPipelineLayout layout,
+				qfv_devfuncs_t *dfunc, VkCommandBuffer cmd)
+{
+	dfunc->vkCmdPushConstants (cmd, layout, VK_SHADER_STAGE_VERTEX_BIT,
+							   0, 16 * sizeof (float), transform);
+}
+
+static void
+push_fragconst (fragconst_t *fragconst, VkPipelineLayout layout,
+				qfv_devfuncs_t *dfunc, VkCommandBuffer cmd)
+{
+	dfunc->vkCmdPushConstants (cmd, layout, VK_SHADER_STAGE_FRAGMENT_BIT,
+							   0, sizeof (fragconst_t), fragconst);
+}
+
+static void
+push_descriptors (int count, VkWriteDescriptorSet *descriptors,
+				  VkPipelineLayout layout, qfv_devfuncs_t *dfunc,
+				  VkCommandBuffer cmd)
+{
+	dfunc->vkCmdPushDescriptorSetKHR (cmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
+									  layout, 0, count, descriptors);
+}
+
 static void
 draw_elechain (elechain_t *ec, VkPipelineLayout layout, qfv_devfuncs_t *dfunc,
 			   VkCommandBuffer cmd)
 {
 	elements_t *el;
 
-	/*if (colloc >= 0) {
-		float      *color;
-		color = ec->color;
-		if (!color)
-			color = bctx->default_color;
-		if (!QuatCompare (color, bctx->last_color)) {
-			QuatCopy (color, bctx->last_color);
-			qfeglVertexAttrib4fv (quake_bsp.color.location, color);
-		}
-	}*/
 	if (ec->transform) {
-		dfunc->vkCmdPushConstants (cmd, layout, VK_SHADER_STAGE_VERTEX_BIT,
-								   0, 16 * sizeof (float), ec->transform);
+		push_transform (ec->transform, layout, dfunc, cmd);
 	} else {
 		//FIXME should cache current transform
-		dfunc->vkCmdPushConstants (cmd, layout, VK_SHADER_STAGE_VERTEX_BIT,
-								   0, 16 * sizeof (float), identity);
+		push_transform (identity, layout, dfunc, cmd);
 	}
 	for (el = ec->elements; el; el = el->next) {
-		//FIXME check if these are contiguous and if so merge into one
-		//command
 		if (!el->index_count)
 			continue;
 		dfunc->vkCmdDrawIndexed (cmd, el->index_count, 1, el->first_index,
@@ -828,35 +845,18 @@ get_view (qfv_tex_t *tex, qfv_tex_t *default_tex)
 }
 
 static void
-bsp_begin (vulkan_ctx_t *ctx)
+bsp_begin_subpass (VkCommandBuffer cmd, VkPipeline pipeline, vulkan_ctx_t *ctx)
 {
 	qfv_device_t *device = ctx->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
 	bspctx_t   *bctx = ctx->bsp_context;
-	//XXX quat_t      fog;
-
-	bctx->default_color[3] = 1;
-	QuatCopy (bctx->default_color, bctx->last_color);
-
 	__auto_type cframe = &ctx->frames.a[ctx->curFrame];
 	bspframe_t *bframe = &bctx->frames.a[ctx->curFrame];
-	VkCommandBuffer cmd = bframe->bsp_cmd;
-	DARRAY_APPEND (cframe->subCommand, cmd);
-
-	//FIXME need per frame matrices
-	bframe->bufferInfo[0].buffer = ctx->matrices.buffer_3d;
-	bframe->imageInfo[0].imageView = 0;	// set by tex chain loop
-	bframe->imageInfo[1].imageView = 0;	// set by tex chain loop
-	bframe->imageInfo[2].imageView = QFV_ScrapImageView (bctx->light_scrap);
-	bframe->imageInfo[3].imageView = get_view (bctx->skysheet_tex,
-											   bctx->default_skysheet);
-	bframe->imageInfo[4].imageView = get_view (bctx->skybox_tex,
-											   bctx->default_skybox);
 
 	dfunc->vkResetCommandBuffer (cmd, 0);
 	VkCommandBufferInheritanceInfo inherit = {
 		VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_INFO, 0,
-		ctx->renderpass.renderpass, 0,
+		ctx->renderpass, 0,
 		cframe->framebuffer,
 		0, 0, 0,
 	};
@@ -868,7 +868,7 @@ bsp_begin (vulkan_ctx_t *ctx)
 	dfunc->vkBeginCommandBuffer (cmd, &beginInfo);
 
 	dfunc->vkCmdBindPipeline (cmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
-							  bctx->main);
+							  pipeline);
 	VkViewport  viewport = {0, 0, vid.width, vid.height, 0, 1};
 	VkRect2D    scissor = { {0, 0}, {vid.width, vid.height} };
 	dfunc->vkCmdSetViewport (cmd, 0, 1, &viewport);
@@ -893,14 +893,54 @@ bsp_begin (vulkan_ctx_t *ctx)
 }
 
 static void
-bsp_end (vulkan_ctx_t *ctx)
+bsp_end_subpass (VkCommandBuffer cmd, vulkan_ctx_t *ctx)
 {
 	qfv_device_t *device = ctx->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
-	bspctx_t   *bctx = ctx->bsp_context;
 
+	dfunc->vkEndCommandBuffer (cmd);
+}
+
+static void
+bsp_begin (vulkan_ctx_t *ctx)
+{
+	bspctx_t   *bctx = ctx->bsp_context;
+	//XXX quat_t      fog;
+
+	bctx->default_color[3] = 1;
+	QuatCopy (bctx->default_color, bctx->last_color);
+
+	__auto_type cframe = &ctx->frames.a[ctx->curFrame];
 	bspframe_t *bframe = &bctx->frames.a[ctx->curFrame];
-	dfunc->vkEndCommandBuffer (bframe->bsp_cmd);
+
+	DARRAY_APPEND (&cframe->cmdSets[QFV_passDepth],
+				   bframe->cmdSet.a[QFV_bspDepth]);
+	DARRAY_APPEND (&cframe->cmdSets[QFV_passGBuffer],
+				   bframe->cmdSet.a[QFV_bspGBuffer]);
+
+	//FIXME need per frame matrices
+	bframe->bufferInfo[0].buffer = ctx->matrices.buffer_3d;
+	bframe->imageInfo[0].imageView = 0;	// set by tex chain loop
+	bframe->imageInfo[1].imageView = 0;	// set by tex chain loop
+	bframe->imageInfo[2].imageView = QFV_ScrapImageView (bctx->light_scrap);
+	bframe->imageInfo[3].imageView = get_view (bctx->skysheet_tex,
+											   bctx->default_skysheet);
+	bframe->imageInfo[4].imageView = get_view (bctx->skybox_tex,
+											   bctx->default_skybox);
+
+	//FIXME pipeline
+	bsp_begin_subpass (bframe->cmdSet.a[QFV_bspDepth], bctx->main, ctx);
+	bsp_begin_subpass (bframe->cmdSet.a[QFV_bspGBuffer], bctx->main, ctx);
+}
+
+static void
+bsp_end (vulkan_ctx_t *ctx)
+{
+	bspctx_t   *bctx = ctx->bsp_context;
+	bspframe_t *bframe = &bctx->frames.a[ctx->curFrame];
+
+	bsp_end_subpass (bframe->cmdSet.a[QFV_bspDepth], ctx);
+	bsp_end_subpass (bframe->cmdSet.a[QFV_bspGBuffer], ctx);
 }
 
 /*static void
@@ -982,8 +1022,6 @@ spin (mat4_t mat, bspctx_t *bctx)
 static void
 sky_begin (vulkan_ctx_t *ctx)
 {
-	qfv_device_t *device = ctx->device;
-	qfv_devfuncs_t *dfunc = device->funcs;
 	bspctx_t   *bctx = ctx->bsp_context;
 
 	bctx->default_color[3] = 1;
@@ -993,8 +1031,10 @@ sky_begin (vulkan_ctx_t *ctx)
 
 	__auto_type cframe = &ctx->frames.a[ctx->curFrame];
 	bspframe_t *bframe = &bctx->frames.a[ctx->curFrame];
-	VkCommandBuffer cmd = bframe->sky_cmd;
-	DARRAY_APPEND (cframe->subCommand, cmd);
+
+	//FIXME where should skys go? g-buffer is overkill. Translucent pre-pass?
+	DARRAY_APPEND (&cframe->cmdSets[QFV_passTranslucent],
+				   bframe->cmdSet.a[QFV_bspTranslucent]);
 
 	//FIXME need per frame matrices
 	bframe->bufferInfo[0].buffer = ctx->matrices.buffer_3d;
@@ -1006,54 +1046,18 @@ sky_begin (vulkan_ctx_t *ctx)
 	bframe->imageInfo[4].imageView = get_view (bctx->skybox_tex,
 											   bctx->default_skybox);
 
-	dfunc->vkResetCommandBuffer (cmd, 0);
-	VkCommandBufferInheritanceInfo inherit = {
-		VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_INFO, 0,
-		ctx->renderpass.renderpass, 0,
-		cframe->framebuffer,
-		0, 0, 0,
-	};
-	VkCommandBufferBeginInfo beginInfo = {
-		VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, 0,
-		VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT
-		| VK_COMMAND_BUFFER_USAGE_RENDER_PASS_CONTINUE_BIT, &inherit,
-	};
-	dfunc->vkBeginCommandBuffer (cmd, &beginInfo);
-
-	dfunc->vkCmdBindPipeline (cmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
-							  bctx->sky);
-	VkViewport  viewport = {0, 0, vid.width, vid.height, 0, 1};
-	VkRect2D    scissor = { {0, 0}, {vid.width, vid.height} };
-	dfunc->vkCmdSetViewport (cmd, 0, 1, &viewport);
-	dfunc->vkCmdSetScissor (cmd, 0, 1, &scissor);
-
-	VkDeviceSize offsets[] = { 0 };
-	dfunc->vkCmdBindVertexBuffers (cmd, 0, 1, &bctx->vertex_buffer, offsets);
-	dfunc->vkCmdBindIndexBuffer (cmd, bctx->index_buffer, bframe->index_offset,
-								 VK_INDEX_TYPE_UINT32);
-
-	// push VP matrices
-	dfunc->vkCmdPushDescriptorSetKHR (cmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
-									  bctx->layout,
-									  0, 1, bframe->descriptors + 0);
-	// push static images
-	dfunc->vkCmdPushDescriptorSetKHR (cmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
-									  bctx->layout,
-									  0, 5, bframe->descriptors + 1);
-
-	//XXX glsl_Fog_GetColor (fog);
-	//XXX fog[3] = glsl_Fog_GetDensity () / 64.0;
+	//FIXME sky pass
+	bsp_begin_subpass (bframe->cmdSet.a[QFV_bspTranslucent], bctx->sky, ctx);
 }
 
 static void
 sky_end (vulkan_ctx_t *ctx)
 {
-	qfv_device_t *device = ctx->device;
-	qfv_devfuncs_t *dfunc = device->funcs;
 	bspctx_t   *bctx = ctx->bsp_context;
-
 	bspframe_t *bframe = &bctx->frames.a[ctx->curFrame];
-	dfunc->vkEndCommandBuffer (bframe->sky_cmd);
+
+	//FIXME sky pass
+	bsp_end_subpass (bframe->cmdSet.a[QFV_bspTranslucent], ctx);
 }
 
 static inline void
@@ -1133,13 +1137,13 @@ Vulkan_DrawWorld (vulkan_ctx_t *ctx)
 	Vulkan_FlushLightmaps (ctx);
 	bsp_begin (ctx);
 
-	dfunc->vkCmdPushConstants (bframe->bsp_cmd, bctx->layout,
-							   VK_SHADER_STAGE_VERTEX_BIT,
-							   0, 16 * sizeof (float), identity);
+	push_transform (identity, bctx->layout, dfunc,
+					bframe->cmdSet.a[QFV_bspDepth]);
+	push_transform (identity, bctx->layout, dfunc,
+					bframe->cmdSet.a[QFV_bspGBuffer]);
 	fragconst_t frag_constants = { time: vr_data.realtime };
-	dfunc->vkCmdPushConstants (bframe->bsp_cmd, bctx->layout,
-							   VK_SHADER_STAGE_FRAGMENT_BIT,
-							   64, sizeof (fragconst_t), &frag_constants);
+	push_fragconst (&frag_constants, bctx->layout, dfunc,
+					bframe->cmdSet.a[QFV_bspGBuffer]);
 	//XXX qfeglActiveTexture (GL_TEXTURE0 + 0);
 	for (size_t i = 0; i < bctx->texture_chains.size; i++) {
 		vulktex_t  *tex;
@@ -1153,13 +1157,15 @@ Vulkan_DrawWorld (vulkan_ctx_t *ctx)
 												   ctx->default_white);
 		bframe->imageInfo[1].imageView = get_view (tex->glow,
 												   ctx->default_black);
-		dfunc->vkCmdPushDescriptorSetKHR (bframe->bsp_cmd,
-										  VK_PIPELINE_BIND_POINT_GRAPHICS,
-										  bctx->layout,
-										  0, 2, bframe->descriptors + 1);
+
+		push_descriptors (2, bframe->descriptors + 1, bctx->layout, dfunc,
+						  bframe->cmdSet.a[QFV_bspGBuffer]);
 
 		for (ec = tex->elechain; ec; ec = ec->next) {
-			draw_elechain (ec, bctx->layout, dfunc, bframe->bsp_cmd);
+			draw_elechain (ec, bctx->layout, dfunc,
+						   bframe->cmdSet.a[QFV_bspDepth]);
+			draw_elechain (ec, bctx->layout, dfunc,
+						   bframe->cmdSet.a[QFV_bspGBuffer]);
 		}
 		tex->elechain = 0;
 		tex->elechain_tail = &tex->elechain;
@@ -1246,22 +1252,24 @@ Vulkan_DrawSky (vulkan_ctx_t *ctx)
 		return;
 
 	sky_begin (ctx);
-	dfunc->vkCmdPushConstants (bframe->sky_cmd, bctx->layout,
-							   VK_SHADER_STAGE_VERTEX_BIT,
-							   0, 16 * sizeof (float), identity);
+	//FIXME sky pass
+	push_transform (identity, bctx->layout, dfunc,
+					bframe->cmdSet.a[QFV_bspTranslucent]);
 	fragconst_t frag_constants = { time: vr_data.realtime };
-	dfunc->vkCmdPushConstants (bframe->sky_cmd, bctx->layout,
-							   VK_SHADER_STAGE_FRAGMENT_BIT,
-							   64, sizeof (fragconst_t), &frag_constants);
+	push_fragconst (&frag_constants, bctx->layout, dfunc,
+					bframe->cmdSet.a[QFV_bspTranslucent]);
 	for (is = bctx->sky_chain; is; is = is->tex_chain) {
 		surf = is->surface;
 		if (tex != surf->texinfo->texture->render) {
 			if (tex) {
 				bind_view (qfv_bsp_skysheet,
 						   get_view (tex->tex, ctx->default_black),
-						   bframe, bframe->sky_cmd, bctx->layout, dfunc);
+						   bframe,
+						   bframe->cmdSet.a[QFV_bspTranslucent],//FIXME
+						   bctx->layout, dfunc);
 				for (ec = tex->elechain; ec; ec = ec->next) {
-					draw_elechain (ec, bctx->layout, dfunc, bframe->sky_cmd);
+					draw_elechain (ec, bctx->layout, dfunc,//FIXME
+								   bframe->cmdSet.a[QFV_bspTranslucent]);
 				}
 				tex->elechain = 0;
 				tex->elechain_tail = &tex->elechain;
@@ -1271,11 +1279,12 @@ Vulkan_DrawSky (vulkan_ctx_t *ctx)
 		add_surf_elements (tex, is, &ec, &el, bctx, bframe);
 	}
 	if (tex) {
-		bind_view (qfv_bsp_skysheet,
-				   get_view (tex->tex, ctx->default_black),
-				   bframe, bframe->sky_cmd, bctx->layout, dfunc);
+		bind_view (qfv_bsp_skysheet, get_view (tex->tex, ctx->default_black),
+				   bframe, bframe->cmdSet.a[QFV_bspTranslucent],//FIXME
+				   bctx->layout, dfunc);
 		for (ec = tex->elechain; ec; ec = ec->next) {
-			draw_elechain (ec, bctx->layout, dfunc, bframe->sky_cmd);
+			draw_elechain (ec, bctx->layout, dfunc,//FIXME
+						   bframe->cmdSet.a[QFV_bspTranslucent]);
 		}
 		tex->elechain = 0;
 		tex->elechain_tail = &tex->elechain;
@@ -1453,23 +1462,21 @@ Vulkan_Bsp_Init (vulkan_ctx_t *ctx)
 	bctx->layout = Vulkan_CreatePipelineLayout (ctx, "quakebsp_layout");
 	bctx->sampler = Vulkan_CreateSampler (ctx, "quakebsp_sampler");
 
-	__auto_type cmdBuffers = QFV_AllocCommandBufferSet (3 * frames, alloca);
-	QFV_AllocateCommandBuffers (device, ctx->cmdpool, 1, cmdBuffers);
-
 	for (size_t i = 0; i < frames; i++) {
 		__auto_type bframe = &bctx->frames.a[i];
-		bframe->bsp_cmd = cmdBuffers->a[i * 3 + 0];
-		bframe->turb_cmd = cmdBuffers->a[i * 3 + 1];
-		bframe->sky_cmd = cmdBuffers->a[i * 3 + 2];
-		QFV_duSetObjectName (device, VK_OBJECT_TYPE_COMMAND_BUFFER,
-							 bframe->bsp_cmd,
-							 va (ctx->va_ctx, "cmd:bsp:%zd", i));
-		QFV_duSetObjectName (device, VK_OBJECT_TYPE_COMMAND_BUFFER,
-							 bframe->turb_cmd,
-							 va (ctx->va_ctx, "cmd:turb:%zd", i));
-		QFV_duSetObjectName (device, VK_OBJECT_TYPE_COMMAND_BUFFER,
-							 bframe->sky_cmd,
-							 va (ctx->va_ctx, "cmd:sky:%zd", i));
+
+		DARRAY_INIT (&bframe->cmdSet, QFV_bspNumPasses);
+		DARRAY_RESIZE (&bframe->cmdSet, QFV_bspNumPasses);
+		bframe->cmdSet.grow = 0;
+
+		QFV_AllocateCommandBuffers (device, ctx->cmdpool, 1, &bframe->cmdSet);
+
+		for (int j = 0; j < QFV_bspNumPasses; j++) {
+			QFV_duSetObjectName (device, VK_OBJECT_TYPE_COMMAND_BUFFER,
+								 bframe->cmdSet.a[i],
+								 va (ctx->va_ctx, "cmd:bsp:%zd:%s", i,
+									 bsp_pass_names[j]));
+		}
 
 		for (int j = 0; j < BSP_BUFFER_INFOS; j++) {
 			bframe->bufferInfo[j] = base_buffer_info;
@@ -1495,6 +1502,11 @@ Vulkan_Bsp_Shutdown (struct vulkan_ctx_s *ctx)
 	qfv_devfuncs_t *dfunc = device->funcs;
 	bspctx_t   *bctx = ctx->bsp_context;
 
+	for (size_t i = 0; i < bctx->frames.size; i++) {
+		__auto_type bframe = &bctx->frames.a[i];
+		free (bframe->cmdSet.a);
+	}
+
 	dfunc->vkDestroyPipeline (device->dev, bctx->main, 0);
 	dfunc->vkDestroyPipeline (device->dev, bctx->sky, 0);
 	DARRAY_CLEAR (&bctx->texture_chains);
diff --git a/libs/video/renderer/vulkan/vulkan_draw.c b/libs/video/renderer/vulkan/vulkan_draw.c
index 93b73d7b3..43b246273 100644
--- a/libs/video/renderer/vulkan/vulkan_draw.c
+++ b/libs/video/renderer/vulkan/vulkan_draw.c
@@ -696,7 +696,8 @@ Vulkan_FlushText (vulkan_ctx_t *ctx)
 	drawframe_t *dframe = &dctx->frames.a[ctx->curFrame];
 
 	VkCommandBuffer cmd = dframe->cmd;
-	DARRAY_APPEND (cframe->subCommand, cmd);
+	//FIXME which pass?
+	DARRAY_APPEND (&cframe->cmdSets[QFV_passTranslucent], cmd);
 
 	VkMappedMemoryRange range = {
 		VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE, 0,
@@ -708,7 +709,7 @@ Vulkan_FlushText (vulkan_ctx_t *ctx)
 	dfunc->vkResetCommandBuffer (cmd, 0);
 	VkCommandBufferInheritanceInfo inherit = {
 		VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_INFO, 0,
-		ctx->renderpass.renderpass, 0,
+		ctx->renderpass, 0,
 		cframe->framebuffer,
 		0, 0, 0
 	};
diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c
index 0132bf6d0..a6f444798 100644
--- a/libs/video/renderer/vulkan/vulkan_vid_common.c
+++ b/libs/video/renderer/vulkan/vulkan_vid_common.c
@@ -78,6 +78,10 @@ static const char quakeforge_pipeline[] =
 #include "libs/video/renderer/vulkan/qfpipeline.plc"
 ;
 
+static const char quakeforge_renderpass[] =
+#include "libs/video/renderer/vulkan/deferred.plc"
+;
+
 cvar_t *vulkan_frame_count;
 cvar_t *vulkan_presentation_mode;
 cvar_t *msaaSamples;
@@ -163,6 +167,7 @@ void
 Vulkan_Init_Common (vulkan_ctx_t *ctx)
 {
 	Sys_Printf ("Vulkan_Init_Common\n");
+
 	QFV_InitParse (ctx);
 	Vulkan_Init_Cvars ();
 	ctx->instance = QFV_CreateInstance (ctx, PACKAGE_STRING, 0x000702ff, 0, instance_extensions);//FIXME version
@@ -185,9 +190,9 @@ Vulkan_Shutdown_Common (vulkan_ctx_t *ctx)
 		QFV_DestroyPipeline (ctx->device, ctx->pipeline);
 	}
 	if (ctx->frames.size) {
-		Vulkan_DestroyFramebuffers (ctx);
+		Vulkan_DestroyFrames (ctx);
 	}
-	if (ctx->renderpass.colorImage) {
+	if (ctx->renderpass) {
 		Vulkan_DestroyRenderPass (ctx);
 	}
 	if (ctx->swapchain) {
@@ -216,6 +221,15 @@ void
 Vulkan_CreateDevice (vulkan_ctx_t *ctx)
 {
 	ctx->device = QFV_CreateDevice (ctx, device_extensions);
+
+	//FIXME msaa and deferred rendering...
+	//also, location
+	ctx->msaaSamples = 1;
+	/*ctx->msaaSamples = min ((VkSampleCountFlagBits) msaaSamples->int_val,
+							QFV_GetMaxSampleCount (device->physDev));
+	if (ctx->msaaSamples > 1) {
+		name = "renderpass_msaa";
+	}*/
 }
 
 void
@@ -257,138 +271,54 @@ qfv_load_pipeline (vulkan_ctx_t *ctx, const char *name)
 	return item;
 }
 
+static plitem_t *
+qfv_load_renderpass (vulkan_ctx_t *ctx, const char *name)
+{
+	if (!ctx->renderpassDef) {
+		ctx->renderpassDef = PL_GetPropertyList (quakeforge_renderpass,
+												 &ctx->hashlinks);
+	}
+
+	plitem_t   *item = ctx->renderpassDef;
+	if (!item || !(item = PL_ObjectForKey (item, name))) {
+		Sys_Printf ("error loading %s\n", name);
+	} else {
+		Sys_Printf ("Found %s def\n", name);
+	}
+	return item;
+}
+
+static size_t
+get_image_size (VkImage image, qfv_device_t *device)
+{
+	qfv_devfuncs_t *dfunc = device->funcs;
+	size_t      size;
+	size_t      align;
+
+	VkMemoryRequirements requirements;
+	dfunc->vkGetImageMemoryRequirements (device->dev, image, &requirements);
+	size = requirements.size;
+	align = requirements.alignment - 1;
+	size = (size + align) & ~(align);
+	return size;
+}
+
 void
 Vulkan_CreateRenderPass (vulkan_ctx_t *ctx)
 {
 	const char *name = "renderpass";//FIXME
-	qfv_device_t *device = ctx->device;
-	VkDevice    dev = device->dev;
-	qfv_devfuncs_t *df = device->funcs;
-	VkCommandBuffer cmd = ctx->cmdbuffer;
-	qfv_swapchain_t *sc = ctx->swapchain;
 
-	ctx->msaaSamples = min ((VkSampleCountFlagBits) msaaSamples->int_val,
-							QFV_GetMaxSampleCount (device->physDev));
-	if (ctx->msaaSamples > 1) {
-		name = "renderpass_msaa";
-	}
+	plitem_t   *item = qfv_load_renderpass (ctx, name);
 
-	//FIXME a tad inconsistent
-	plitem_t   *item = qfv_load_pipeline (ctx, name);
-	if (!item) {
-		return;
-	}
-
-	qfv_imageresource_t *colorImage = malloc (sizeof (*colorImage));
-	qfv_imageresource_t *depthImage = malloc (sizeof (*depthImage));
-
-	VkExtent3D extent = {sc->extent.width, sc->extent.height, 1};
-
-	Sys_MaskPrintf (SYS_VULKAN, "color resource\n");
-	colorImage->image
-		= QFV_CreateImage (device, 0, VK_IMAGE_TYPE_2D,
-						   sc->format, extent, 1, 1, ctx->msaaSamples,
-						   VK_IMAGE_USAGE_TRANSIENT_ATTACHMENT_BIT
-							   | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT);
-	colorImage->object
-		= QFV_AllocImageMemory (device, colorImage->image,
-								VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, 0, 0);
-	QFV_BindImageMemory (device, colorImage->image, colorImage->object, 0);
-	colorImage->view
-		= QFV_CreateImageView (device, colorImage->image,
-							   VK_IMAGE_VIEW_TYPE_2D,
-							   sc->format, VK_IMAGE_ASPECT_COLOR_BIT);
-	Sys_MaskPrintf (SYS_VULKAN, "	image: %p object: %p view:%p\n",
-					colorImage->image, colorImage->object, colorImage->view);
-
-	Sys_MaskPrintf (SYS_VULKAN, "depth resource\n");
-	VkFormat depthFormat = VK_FORMAT_D32_SFLOAT;
-	depthImage->image
-		= QFV_CreateImage (device, 0, VK_IMAGE_TYPE_2D,
-						   depthFormat, extent, 1, 1, ctx->msaaSamples,
-						   VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT);
-	depthImage->object
-		= QFV_AllocImageMemory (device, depthImage->image,
-								VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, 0, 0);
-	QFV_BindImageMemory (device, depthImage->image, depthImage->object, 0);
-	depthImage->view
-		= QFV_CreateImageView (device, depthImage->image,
-							   VK_IMAGE_VIEW_TYPE_2D,
-							   depthFormat, VK_IMAGE_ASPECT_DEPTH_BIT);
-	Sys_MaskPrintf (SYS_VULKAN, "	image: %p object: %p view:%p\n",
-					depthImage->image, depthImage->object, depthImage->view);
-
-	VkImageMemoryBarrier barrier;
-	qfv_pipelinestagepair_t stages;
-
-	df->vkWaitForFences (dev, 1, &ctx->fence, VK_TRUE, ~0ull);
-	df->vkResetCommandBuffer (cmd, 0);
-	VkCommandBufferBeginInfo beginInfo = {
-		VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, 0,
-		VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT, 0,
-	};
-	df->vkBeginCommandBuffer (cmd, &beginInfo);
-
-	stages = imageLayoutTransitionStages[qfv_LT_Undefined_to_Color];
-	barrier = imageLayoutTransitionBarriers[qfv_LT_Undefined_to_Color];
-	barrier.image = colorImage->image;
-
-	df->vkCmdPipelineBarrier (cmd, stages.src, stages.dst, 0,
-							  0, 0,
-							  0, 0,
-							  1, &barrier);
-
-	stages = imageLayoutTransitionStages[qfv_LT_Undefined_to_DepthStencil];
-	barrier = imageLayoutTransitionBarriers[qfv_LT_Undefined_to_DepthStencil];
-	barrier.image = depthImage->image;
-	if (depthFormat == VK_FORMAT_D32_SFLOAT_S8_UINT
-		|| depthFormat == VK_FORMAT_D24_UNORM_S8_UINT) {
-		barrier.subresourceRange.aspectMask |= VK_IMAGE_ASPECT_STENCIL_BIT;
-	}
-
-	df->vkCmdPipelineBarrier (cmd, stages.src, stages.dst, 0,
-							  0, 0,
-							  0, 0,
-							  1, &barrier);
-	df->vkEndCommandBuffer (cmd);
-
-	VkSubmitInfo submitInfo = {
-		VK_STRUCTURE_TYPE_SUBMIT_INFO, 0,
-		0, 0, 0,
-		1, &cmd,
-		0, 0
-	};
-	df->vkResetFences (dev, 1, &ctx->fence);
-	df->vkQueueSubmit (device->queue.queue, 1, &submitInfo, ctx->fence);
-
-	ctx->renderpass.colorImage = colorImage;
-	ctx->renderpass.depthImage = depthImage;
-	ctx->renderpass.renderpass = QFV_ParseRenderPass (ctx, item);
+	ctx->renderpass = QFV_ParseRenderPass (ctx, item, ctx->renderpassDef);
 	QFV_duSetObjectName (ctx->device, VK_OBJECT_TYPE_RENDER_PASS,
-						 ctx->renderpass.renderpass,
-						 va (ctx->va_ctx, "pipeline:%s", name));
+						 ctx->renderpass, va (ctx->va_ctx, "renderpass:%s",
+											  name));
 }
 
 void
 Vulkan_DestroyRenderPass (vulkan_ctx_t *ctx)
 {
-	qfv_device_t *device = ctx->device;
-	VkDevice    dev = device->dev;
-	qfv_devfuncs_t *df = device->funcs;
-
-	df->vkDestroyRenderPass (dev, ctx->renderpass.renderpass, 0);
-
-	df->vkDestroyImageView (dev, ctx->renderpass.colorImage->view, 0);
-	df->vkDestroyImage (dev, ctx->renderpass.colorImage->image, 0);
-	df->vkFreeMemory (dev, ctx->renderpass.colorImage->object, 0);
-	free (ctx->renderpass.colorImage);
-	ctx->renderpass.colorImage = 0;
-
-	df->vkDestroyImageView (dev, ctx->renderpass.depthImage->view, 0);
-	df->vkDestroyImage (dev, ctx->renderpass.depthImage->image, 0);
-	df->vkFreeMemory (dev, ctx->renderpass.depthImage->object, 0);
-	free (ctx->renderpass.depthImage);
-	ctx->renderpass.depthImage = 0;
 }
 
 VkPipeline
@@ -401,7 +331,7 @@ Vulkan_CreatePipeline (vulkan_ctx_t *ctx, const char *name)
 	} else {
 		Sys_Printf ("Found pipeline def %s\n", name);
 	}
-	VkPipeline pipeline = QFV_ParsePipeline (ctx, item);
+	VkPipeline pipeline = QFV_ParsePipeline (ctx, item, ctx->pipelineDef);
 	QFV_duSetObjectName (ctx->device, VK_OBJECT_TYPE_PIPELINE, pipeline,
 						 va (ctx->va_ctx, "pipeline:%s", name));
 	return pipeline;
@@ -425,7 +355,7 @@ Vulkan_CreateDescriptorPool (vulkan_ctx_t *ctx, const char *name)
 	} else {
 		Sys_Printf ("Found descriptor pool def %s\n", name);
 	}
-	pool = QFV_ParseDescriptorPool (ctx, item);
+	pool = QFV_ParseDescriptorPool (ctx, item, ctx->pipelineDef);
 	QFV_AddHandle (tab, path, (uint64_t) pool);
 	QFV_duSetObjectName (ctx->device, VK_OBJECT_TYPE_DESCRIPTOR_POOL, pool,
 						 va (ctx->va_ctx, "descriptor_pool:%s", name));
@@ -450,7 +380,7 @@ Vulkan_CreatePipelineLayout (vulkan_ctx_t *ctx, const char *name)
 	} else {
 		Sys_Printf ("Found pipeline layout def %s\n", name);
 	}
-	layout = QFV_ParsePipelineLayout (ctx, item);
+	layout = QFV_ParsePipelineLayout (ctx, item, ctx->pipelineDef);
 	QFV_AddHandle (tab, path, (uint64_t) layout);
 	QFV_duSetObjectName (ctx->device, VK_OBJECT_TYPE_PIPELINE_LAYOUT, layout,
 						 va (ctx->va_ctx, "pipeline_layout:%s", name));
@@ -475,7 +405,7 @@ Vulkan_CreateSampler (vulkan_ctx_t *ctx, const char *name)
 	} else {
 		Sys_Printf ("Found sampler def %s\n", name);
 	}
-	sampler = QFV_ParseSampler (ctx, item);
+	sampler = QFV_ParseSampler (ctx, item, ctx->pipelineDef);
 	QFV_AddHandle (tab, path, (uint64_t) sampler);
 	QFV_duSetObjectName (ctx->device, VK_OBJECT_TYPE_SAMPLER, sampler,
 						 va (ctx->va_ctx, "sampler:%s", name));
@@ -500,7 +430,7 @@ Vulkan_CreateDescriptorSetLayout(vulkan_ctx_t *ctx, const char *name)
 	} else {
 		Sys_Printf ("Found descriptor set def %s\n", name);
 	}
-	set = QFV_ParseDescriptorSetLayout (ctx, item);
+	set = QFV_ParseDescriptorSetLayout (ctx, item, ctx->pipelineDef);
 	QFV_AddHandle (tab, path, (uint64_t) set);
 	QFV_duSetObjectName (ctx->device, VK_OBJECT_TYPE_DESCRIPTOR_SET_LAYOUT,
 						 set, va (ctx->va_ctx, "descriptor_set:%s", name));
@@ -508,7 +438,7 @@ Vulkan_CreateDescriptorSetLayout(vulkan_ctx_t *ctx, const char *name)
 }
 
 void
-Vulkan_CreateFramebuffers (vulkan_ctx_t *ctx)
+Vulkan_CreateFrames (vulkan_ctx_t *ctx)
 {
 	qfv_device_t *device = ctx->device;
 	VkCommandPool cmdpool = ctx->cmdpool;
@@ -531,13 +461,16 @@ Vulkan_CreateFramebuffers (vulkan_ctx_t *ctx)
 		frame->renderDoneSemaphore = QFV_CreateSemaphore (device);
 		frame->cmdBuffer = cmdBuffers->a[i];
 
-		frame->subCommand = malloc (sizeof (qfv_cmdbufferset_t));
-		DARRAY_INIT (frame->subCommand, 4);
+		frame->cmdSetCount = QFV_NumPasses;
+		frame->cmdSets = malloc (QFV_NumPasses * sizeof (qfv_cmdbufferset_t));
+		for (int j = 0; j < QFV_NumPasses; j++) {
+			DARRAY_INIT (&frame->cmdSets[j], 4);
+		}
 	}
 }
 
 void
-Vulkan_DestroyFramebuffers (vulkan_ctx_t *ctx)
+Vulkan_DestroyFrames (vulkan_ctx_t *ctx)
 {
 	qfv_device_t *device = ctx->device;
 	qfv_devfuncs_t *df = device->funcs;
@@ -553,3 +486,59 @@ Vulkan_DestroyFramebuffers (vulkan_ctx_t *ctx)
 
 	DARRAY_CLEAR (&ctx->frames);
 }
+
+void
+Vulkan_CreateFramebuffers (vulkan_ctx_t *ctx)
+{
+	qfv_device_t *device = ctx->device;
+
+	plitem_t   *item = qfv_load_renderpass (ctx, "images");
+	if (!item) {
+		return;
+	}
+
+	__auto_type images = QFV_ParseImageSet (ctx, item, ctx->renderpassDef);
+	ctx->attachment_images = images;
+	size_t      memSize = 0;
+	for (size_t i = 0; i < images->size; i++) {
+		memSize += get_image_size (images->a[i], device);
+	}
+	VkDeviceMemory mem;
+	mem = QFV_AllocImageMemory (device, images->a[0],
+								VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT,
+								memSize, 0);
+	ctx->attachmentMemory = mem;
+	QFV_duSetObjectName (device, VK_OBJECT_TYPE_DEVICE_MEMORY,
+						 mem, "memory:framebuffers");
+	size_t      offset = 0;
+	for (size_t i = 0; i < images->size; i++) {
+		QFV_BindImageMemory (device, images->a[i], mem, offset);
+		offset += get_image_size (images->a[i], device);
+	}
+
+	item = qfv_load_renderpass (ctx, "imageViews");
+	if (!item) {
+		return;
+	}
+
+	__auto_type views = QFV_ParseImageViewSet (ctx, item, ctx->renderpassDef);
+	ctx->attachment_views = views;
+
+	item = qfv_load_renderpass (ctx, "framebuffer");
+	if (!item) {
+		return;
+	}
+
+	ctx->framebuffers = QFV_AllocFrameBuffers (ctx->swapchain->numImages,
+											   malloc);
+	for (size_t i = 0; i < ctx->framebuffers->size; i++) {
+		ctx->swapImageIndex = i;
+		ctx->framebuffers->a[i] = QFV_ParseFramebuffer (ctx, item,
+														ctx->renderpassDef);
+	}
+}
+
+void
+Vulkan_DestroyFramebuffers (vulkan_ctx_t *ctx)
+{
+}

From 4bda49d79867d3139093994cb4e20d5085348bbd Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 17 Feb 2021 13:29:53 +0900
Subject: [PATCH 1431/1519] [util] Correct the lex priority for int constants

The actual need to specify unsigned int constant is a bit of a pain, but
not being able to do so due to lex priority errors is even more of a
pain.
---
 libs/util/cexpr-lex.l | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libs/util/cexpr-lex.l b/libs/util/cexpr-lex.l
index 46fbcdd55..b82724af4 100644
--- a/libs/util/cexpr-lex.l
+++ b/libs/util/cexpr-lex.l
@@ -120,13 +120,13 @@ STRING		\"(\\.|[^"\\])*\"
 	__auto_type context = yyget_extra (yyscanner);
 %}
 
-{INT}+				{
-						yylval->value = parse_int (yytext, context);
+{INT}+[uU]			{
+						yylval->value = parse_uint (yytext, context);
 						return VALUE;
 					}
 
-{INT}+[uU]			{
-						yylval->value = parse_uint (yytext, context);
+{INT}+				{
+						yylval->value = parse_int (yytext, context);
 						return VALUE;
 					}
 

From b08c3881b9988876e71e722b8d7afe9e953504c0 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 17 Feb 2021 13:32:04 +0900
Subject: [PATCH 1432/1519] [vulkan] Add a comment about using size_t

Due to wanting to access array sizes when parsing uint32_t type values,
parse_uint32_t needs to handle size_t values even though it throws out
any excess bits.
---
 libs/video/renderer/vulkan/vkparse.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libs/video/renderer/vulkan/vkparse.c b/libs/video/renderer/vulkan/vkparse.c
index 2d9b3c806..ee8efb8a4 100644
--- a/libs/video/renderer/vulkan/vkparse.c
+++ b/libs/video/renderer/vulkan/vkparse.c
@@ -182,9 +182,11 @@ parse_uint32_t (const plfield_t *field, const plitem_t *item,
 				void *data, plitem_t *messages, void *context)
 {
 	int         ret = 1;
+	// use size_t (and cexpr_size_t) for val so references to array sizes
+	// can be used
 	size_t      val = 0;
-	exprctx_t   ectx = *((parsectx_t *) context)->ectx;
 	exprval_t   result = { &cexpr_size_t, &val };
+	exprctx_t   ectx = *((parsectx_t *) context)->ectx;
 	ectx.symtab = 0;
 	ectx.result = &result;
 	const char *valstr = PL_String (item);

From 64740b0f730257255892bb7160761ef60a813a88 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 17 Feb 2021 13:35:19 +0900
Subject: [PATCH 1433/1519] [vulkan] Create shaders for alias deferred
 rendering

A simple (no uv output) vertex shader that still blends the two frames,
and the relevant g-buffer fragment shader.
---
 libs/video/renderer/Makemodule.am             | 10 ++++++
 libs/video/renderer/vulkan/qfpipeline.plist   | 10 +++---
 libs/video/renderer/vulkan/shader.c           |  6 ++++
 .../renderer/vulkan/shader/alias_depth.vert   | 28 ++++++++++++++++
 .../renderer/vulkan/shader/alias_gbuf.frag    | 32 +++++++++++++++++++
 5 files changed, 81 insertions(+), 5 deletions(-)
 create mode 100644 libs/video/renderer/vulkan/shader/alias_depth.vert
 create mode 100644 libs/video/renderer/vulkan/shader/alias_gbuf.frag

diff --git a/libs/video/renderer/Makemodule.am b/libs/video/renderer/Makemodule.am
index 66db70d11..4194b1f8b 100644
--- a/libs/video/renderer/Makemodule.am
+++ b/libs/video/renderer/Makemodule.am
@@ -278,6 +278,10 @@ aliasv_src = $(vkshaderpath)/alias.vert
 aliasv_c = $(vkshaderpath)/alias.vert.spvc
 aliasf_src = $(vkshaderpath)/alias.frag
 aliasf_c = $(vkshaderpath)/alias.frag.spvc
+alias_depth_src = $(vkshaderpath)/alias_depth.vert
+alias_depth_c = $(vkshaderpath)/alias_depth.vert.spvc
+alias_gbuf_src = $(vkshaderpath)/alias_gbuf.frag
+alias_gbuf_c = $(vkshaderpath)/alias_gbuf.frag.spvc
 passthrough_src = $(vkshaderpath)/passthrough.vert
 passthrough_c = $(vkshaderpath)/passthrough.vert.spvc
 pushcolor_src = $(vkshaderpath)/pushcolor.frag
@@ -293,8 +297,12 @@ $(quakebspf_c): $(quakebspf_src)
 
 $(aliasv_c): $(aliasv_src)
 
+$(alias_depth_c): $(alias_depth_src)
+
 $(aliasf_c): $(aliasf_src)
 
+$(alias_gbuf_c): $(alias_gbuf_src)
+
 $(passthrough_c): $(passthrough_src)
 
 $(pushcolor_c): $(pushcolor_src)
@@ -305,7 +313,9 @@ vkshader_c = \
 	$(quakebspv_c) \
 	$(quakebspf_c) \
 	$(aliasv_c) \
+	$(alias_depth_c) \
 	$(aliasf_c) \
+	$(alias_gbuf_c) \
 	$(passthrough_c) \
 	$(pushcolor_c)
 
diff --git a/libs/video/renderer/vulkan/qfpipeline.plist b/libs/video/renderer/vulkan/qfpipeline.plist
index 2cd110385..faf35b779 100644
--- a/libs/video/renderer/vulkan/qfpipeline.plist
+++ b/libs/video/renderer/vulkan/qfpipeline.plist
@@ -278,7 +278,7 @@
 				{
 					stage = vertex;
 					name = main;
-					module = $builtin/alias.vert;
+					module = $builtin/alias_depth.vert;
 				},
 			);
 			vertexInput = {
@@ -321,7 +321,7 @@
 				{
 					stage = fragment;
 					name = main;
-					module = $builtin/alias.frag;
+					module = $builtin/alias_gbuf.frag;
 					specializationInfo = {
 						mapEntries = (
 							{ size = 4; offset = 0; constantID = 0; },
@@ -447,7 +447,7 @@
 				{
 					stage = vertex;
 					name = main;
-					module = $builtin/quakebsp.vert;
+					module = $builtin/bsp_depth.vert;
 				},
 			);
 			vertexInput = {
@@ -481,12 +481,12 @@
 				{
 					stage = vertex;
 					name = main;
-					module = $builtin/quakebsp.vert;
+					module = $builtin/bsp_gbuf.vert;
 				},
 				{
 					stage = fragment;
 					name = main;
-					module = $builtin/quakebsp.frag;
+					module = $builtin/bsp_gbuf.frag;
 				},
 			);
 			vertexInput = {
diff --git a/libs/video/renderer/vulkan/shader.c b/libs/video/renderer/vulkan/shader.c
index 90a93684b..857d457d4 100644
--- a/libs/video/renderer/vulkan/shader.c
+++ b/libs/video/renderer/vulkan/shader.c
@@ -65,8 +65,12 @@ static
 static
 #include "libs/video/renderer/vulkan/shader/alias.vert.spvc"
 static
+#include "libs/video/renderer/vulkan/shader/alias_depth.vert.spvc"
+static
 #include "libs/video/renderer/vulkan/shader/alias.frag.spvc"
 static
+#include "libs/video/renderer/vulkan/shader/alias_gbuf.frag.spvc"
+static
 #include "libs/video/renderer/vulkan/shader/passthrough.vert.spvc"
 static
 #include "libs/video/renderer/vulkan/shader/pushcolor.frag.spvc"
@@ -83,7 +87,9 @@ static shaderdata_t builtin_shaders[] = {
 	{ "quakebsp.vert", quakebsp_vert, sizeof (quakebsp_vert) },
 	{ "quakebsp.frag", quakebsp_frag, sizeof (quakebsp_frag) },
 	{ "alias.vert", alias_vert, sizeof (alias_vert) },
+	{ "alias_depth.vert", alias_depth_vert, sizeof (alias_depth_vert) },
 	{ "alias.frag", alias_frag, sizeof (alias_frag) },
+	{ "alias_gbuf.frag", alias_gbuf_frag, sizeof (alias_gbuf_frag) },
 	{ "passthrough.vert", passthrough_vert, sizeof (passthrough_vert) },
 	{ "pushcolor.frag", pushcolor_frag, sizeof (pushcolor_frag) },
 	{}
diff --git a/libs/video/renderer/vulkan/shader/alias_depth.vert b/libs/video/renderer/vulkan/shader/alias_depth.vert
new file mode 100644
index 000000000..44437788e
--- /dev/null
+++ b/libs/video/renderer/vulkan/shader/alias_depth.vert
@@ -0,0 +1,28 @@
+#version 450
+
+layout (set = 0, binding = 0) uniform Matrices {
+	mat4 Projection;
+	mat4 View;
+	mat4 Sky;
+};
+
+layout (push_constant) uniform PushConstants {
+	mat4 Model;
+	float blend;
+};
+
+layout (location = 0) in vec4 vertexa;
+layout (location = 1) in vec3 normala;
+layout (location = 2) in vec4 vertexb;
+layout (location = 3) in vec3 normalb;
+
+void
+main (void)
+{
+	vec4        vertex;
+	vec4        pos;
+
+	vertex = mix (vertexa, vertexb, blend);
+	pos = (Model * vertex);
+	gl_Position = Projection * (View * pos);
+}
diff --git a/libs/video/renderer/vulkan/shader/alias_gbuf.frag b/libs/video/renderer/vulkan/shader/alias_gbuf.frag
new file mode 100644
index 000000000..e8b14a305
--- /dev/null
+++ b/libs/video/renderer/vulkan/shader/alias_gbuf.frag
@@ -0,0 +1,32 @@
+#version 450
+layout (set = 0, binding = 2) uniform sampler2DArray Skin;
+
+layout (push_constant) uniform PushConstants {
+	layout (offset = 68)
+	uint        base_color;
+	uint        colorA;
+	uint        colorB;
+	vec4        fog;
+	vec4        color;
+};
+
+layout (location = 0) in vec2 st;
+layout (location = 1) in vec3 position;
+layout (location = 2) in vec3 normal;
+
+layout (location = 0) out vec4 frag_color;
+layout (location = 1) out vec4 frag_normal;
+
+void
+main (void)
+{
+	vec4        c;
+	int         i;
+	vec3        light = vec3 (0);
+	c = texture (Skin, vec3 (st, 0)) * unpackUnorm4x8(base_color);
+	c += texture (Skin, vec3 (st, 1)) * unpackUnorm4x8(colorA);
+	c += texture (Skin, vec3 (st, 2)) * unpackUnorm4x8(colorB);
+
+	frag_color = c;
+	frag_normal = vec4(normal, 0);
+}

From 4245c6ad3bcc0f460dbe34a23df28d3a1dcd5008 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 17 Feb 2021 13:50:36 +0900
Subject: [PATCH 1434/1519] [vulkan] Specify subpass number in pipeline def

This gets the alias model render pass and pipeline passing validation.

I don't know why I didn't add the subpass field to the
VkGraphicsPipelineCreateInfo parser def, though it could be I simply
missed it, or I thought I wouldn't need it at the time.
---
 libs/video/renderer/vulkan/qfpipeline.plist | 34 +++++++++++++++------
 libs/video/renderer/vulkan/vkparse.plist    |  1 +
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/libs/video/renderer/vulkan/qfpipeline.plist b/libs/video/renderer/vulkan/qfpipeline.plist
index faf35b779..2892f5fec 100644
--- a/libs/video/renderer/vulkan/qfpipeline.plist
+++ b/libs/video/renderer/vulkan/qfpipeline.plist
@@ -274,6 +274,7 @@
 	};
 	pipelines = {
 		alias_depth = {
+			subpass = 0;
 			stages = (
 				{
 					stage = vertex;
@@ -312,6 +313,7 @@
 			//renderPass = renderpass;
 		};
 		alias_gbuf = {
+			subpass = 1;
 			stages = (
 				{
 					stage = vertex;
@@ -425,16 +427,28 @@
 			};
 			colorBlend = {
 				logicOpEnable = false;
-				attachments = ({
-					blendEnable = true;
-					srcColorBlendFactor = src_alpha;
-					dstColorBlendFactor = one_minus_src_alpha;
-					colorBlendOp = add;
-					srcAlphaBlendFactor = src_alpha;
-					dstAlphaBlendFactor = one_minus_src_alpha;
-					alphaBlendOp = add;
-					colorWriteMask = r|g|b|a;
-				});
+				attachments = (
+					{
+						blendEnable = false;
+						srcColorBlendFactor = src_alpha;
+						dstColorBlendFactor = one_minus_src_alpha;
+						colorBlendOp = add;
+						srcAlphaBlendFactor = src_alpha;
+						dstAlphaBlendFactor = one_minus_src_alpha;
+						alphaBlendOp = add;
+						colorWriteMask = r|g|b|a;
+					},
+					{
+						blendEnable = false;
+						srcColorBlendFactor = src_alpha;
+						dstColorBlendFactor = one_minus_src_alpha;
+						colorBlendOp = add;
+						srcAlphaBlendFactor = src_alpha;
+						dstAlphaBlendFactor = one_minus_src_alpha;
+						alphaBlendOp = add;
+						colorWriteMask = r|g|b|a;
+					},
+				);
 			};
 			dynamic = {
 				dynamicState = ( viewport, scissor, blend_constants );
diff --git a/libs/video/renderer/vulkan/vkparse.plist b/libs/video/renderer/vulkan/vkparse.plist
index ced50835a..9eb5e7e04 100644
--- a/libs/video/renderer/vulkan/vkparse.plist
+++ b/libs/video/renderer/vulkan/vkparse.plist
@@ -280,6 +280,7 @@
 				type = (custom,	QFString, parse_VkPipelineLayout);
 				fields = (layout);
 			};
+			subpass = auto;
 			basePipelineHandle = {
 				type = (custom, QFString, parse_BasePipeline);
 				fields = (basePipelineHandle);

From cbc8ad271ab50e842e18c0aefa021de45b73a674 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 19 Feb 2021 11:14:54 +0900
Subject: [PATCH 1435/1519] [vulkan] Convert bsp and draw to deferred

This has bsp and draw passing muster with the validation layers.
---
 include/QF/Vulkan/qf_alias.h                  |   6 +-
 include/QF/Vulkan/qf_bsp.h                    |   7 +-
 include/QF/Vulkan/qf_vid.h                    |   2 +-
 libs/video/renderer/Makemodule.am             |  21 +++
 libs/video/renderer/vulkan/device.c           |   4 +-
 libs/video/renderer/vulkan/qfpipeline.plist   |  60 ++++++---
 libs/video/renderer/vulkan/shader.c           |  12 ++
 .../renderer/vulkan/shader/bsp_depth.vert     |  19 +++
 .../renderer/vulkan/shader/bsp_gbuf.frag      | 126 ++++++++++++++++++
 .../renderer/vulkan/shader/bsp_gbuf.geom      |  29 ++++
 .../renderer/vulkan/shader/bsp_gbuf.vert      |  25 ++++
 libs/video/renderer/vulkan/vulkan_alias.c     |   9 +-
 libs/video/renderer/vulkan/vulkan_bsp.c       |  21 +--
 libs/video/renderer/vulkan/vulkan_draw.c      |   2 +-
 14 files changed, 304 insertions(+), 39 deletions(-)
 create mode 100644 libs/video/renderer/vulkan/shader/bsp_depth.vert
 create mode 100644 libs/video/renderer/vulkan/shader/bsp_gbuf.frag
 create mode 100644 libs/video/renderer/vulkan/shader/bsp_gbuf.geom
 create mode 100644 libs/video/renderer/vulkan/shader/bsp_gbuf.vert

diff --git a/include/QF/Vulkan/qf_alias.h b/include/QF/Vulkan/qf_alias.h
index 597888a4d..5f3964a2b 100644
--- a/include/QF/Vulkan/qf_alias.h
+++ b/include/QF/Vulkan/qf_alias.h
@@ -65,13 +65,13 @@ typedef struct qfv_alias_skin_s {
 #define ALIAS_BUFFER_INFOS 1
 #define ALIAS_IMAGE_INFOS 1
 
-enum {
+typedef enum {
 	QFV_aliasDepth,
 	QFV_aliasGBuffer,
-	//QFV_aliasTranslucent,
+	QFV_aliasTranslucent,
 
 	QFV_aliasNumPasses
-};
+} QFV_AliasSubpass;
 
 typedef struct aliasframe_s {
 	qfv_cmdbufferset_t cmdSet;
diff --git a/include/QF/Vulkan/qf_bsp.h b/include/QF/Vulkan/qf_bsp.h
index b78aaf643..ff3f6612a 100644
--- a/include/QF/Vulkan/qf_bsp.h
+++ b/include/QF/Vulkan/qf_bsp.h
@@ -70,13 +70,13 @@ typedef enum {
 // Texture, GlowMap, LightMap, SkySheet, SkyCube
 #define BSP_IMAGE_INFOS 5
 
-enum {
+typedef enum {
 	QFV_bspDepth,
 	QFV_bspGBuffer,
 	QFV_bspTranslucent,
 
 	QFV_bspNumPasses
-};
+} QFV_BspSubpass;
 
 typedef struct bspframe_s {
 	uint32_t    *index_data;	// pointer into mega-buffer for this frame (c)
@@ -143,7 +143,8 @@ typedef struct bspctx_s {
 
 	VkSampler    sampler;
 	VkDeviceMemory texture_memory;
-	VkPipeline   main;
+	VkPipeline   depth;
+	VkPipeline   gbuf;
 	VkPipeline   sky;
 	VkPipelineLayout layout;
 	size_t       vertex_buffer_size;
diff --git a/include/QF/Vulkan/qf_vid.h b/include/QF/Vulkan/qf_vid.h
index f81e934a1..db423d014 100644
--- a/include/QF/Vulkan/qf_vid.h
+++ b/include/QF/Vulkan/qf_vid.h
@@ -39,8 +39,8 @@
 enum {
 	QFV_passDepth,			// geometry
 	QFV_passGBuffer,		// geometry
-	QFV_passTranslucent,	// geometry
 	QFV_passLighting,		// single quad
+	QFV_passTranslucent,	// geometry
 	QFV_passCompose,		// single quad
 
 	QFV_NumPasses
diff --git a/libs/video/renderer/Makemodule.am b/libs/video/renderer/Makemodule.am
index 4194b1f8b..a5c3fc1a0 100644
--- a/libs/video/renderer/Makemodule.am
+++ b/libs/video/renderer/Makemodule.am
@@ -274,6 +274,15 @@ quakebspv_src = $(vkshaderpath)/quakebsp.vert
 quakebspv_c = $(vkshaderpath)/quakebsp.vert.spvc
 quakebspf_src = $(vkshaderpath)/quakebsp.frag
 quakebspf_c = $(vkshaderpath)/quakebsp.frag.spvc
+
+bsp_depth_src = $(vkshaderpath)/bsp_depth.vert
+bsp_depth_c = $(vkshaderpath)/bsp_depth.vert.spvc
+bsp_gbufv_src = $(vkshaderpath)/bsp_gbuf.vert
+bsp_gbufv_c = $(vkshaderpath)/bsp_gbuf.vert.spvc
+bsp_gbufg_src = $(vkshaderpath)/bsp_gbuf.geom
+bsp_gbufg_c = $(vkshaderpath)/bsp_gbuf.geom.spvc
+bsp_gbuff_src = $(vkshaderpath)/bsp_gbuf.frag
+bsp_gbuff_c = $(vkshaderpath)/bsp_gbuf.frag.spvc
 aliasv_src = $(vkshaderpath)/alias.vert
 aliasv_c = $(vkshaderpath)/alias.vert.spvc
 aliasf_src = $(vkshaderpath)/alias.frag
@@ -295,6 +304,14 @@ $(quakebspv_c): $(quakebspv_src)
 
 $(quakebspf_c): $(quakebspf_src)
 
+$(bsp_depth_c): $(bsp_depth_src)
+
+$(bsp_gbufv_c): $(bsp_gbufv_src)
+
+$(bsp_gbufg_c): $(bsp_gbufg_src)
+
+$(bsp_gbuff_c): $(bsp_gbuff_src)
+
 $(aliasv_c): $(aliasv_src)
 
 $(alias_depth_c): $(alias_depth_src)
@@ -312,6 +329,10 @@ vkshader_c = \
 	$(twodf_c) \
 	$(quakebspv_c) \
 	$(quakebspf_c) \
+	$(bsp_depth_c) \
+	$(bsp_gbufv_c) \
+	$(bsp_gbufg_c) \
+	$(bsp_gbuff_c) \
 	$(aliasv_c) \
 	$(alias_depth_c) \
 	$(aliasf_c) \
diff --git a/libs/video/renderer/vulkan/device.c b/libs/video/renderer/vulkan/device.c
index 4cfceb999..58e04c110 100644
--- a/libs/video/renderer/vulkan/device.c
+++ b/libs/video/renderer/vulkan/device.c
@@ -167,7 +167,9 @@ QFV_CreateDevice (vulkan_ctx_t *ctx, const char **extensions)
 			VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO, 0, 0,
 			family, 1, &priority
 		};
-		VkPhysicalDeviceFeatures features = {};
+		VkPhysicalDeviceFeatures features = {
+			.geometryShader = 1,
+		};
 		VkDeviceCreateInfo dCreateInfo = {
 			VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO, 0, 0,
 			1, &qCreateInfo,
diff --git a/libs/video/renderer/vulkan/qfpipeline.plist b/libs/video/renderer/vulkan/qfpipeline.plist
index 2892f5fec..d71ce6037 100644
--- a/libs/video/renderer/vulkan/qfpipeline.plist
+++ b/libs/video/renderer/vulkan/qfpipeline.plist
@@ -457,6 +457,7 @@
 			//renderPass = renderpass;
 		};
 		bsp_depth = {
+			subpass = 0;
 			stages = (
 				{
 					stage = vertex;
@@ -472,10 +473,10 @@
 					"$properties.pipelines.bsp_gbuf.vertexInput.attributes[0]",
 				);
 			};
-			inputAssembly = $properties.pipelines.bsp_main.inputAssembly;
-			viewport = $properties.pipelines.bsp_main.viewport;
-			rasterization = $properties.pipelines.bsp_main.rasterization;
-			multisample = $properties.pipelines.bsp_main.multisample;
+			inputAssembly = $properties.pipelines.bsp_gbuf.inputAssembly;
+			viewport = $properties.pipelines.bsp_gbuf.viewport;
+			rasterization = $properties.pipelines.bsp_gbuf.rasterization;
+			multisample = $properties.pipelines.bsp_gbuf.multisample;
 			depthStencil = {
 				depthTestEnable = true;
 				depthWriteEnable = true;
@@ -491,12 +492,18 @@
 			//renderPass = renderpass;
 		};
 		bsp_gbuf = {
+			subpass = 1;
 			stages = (
 				{
 					stage = vertex;
 					name = main;
 					module = $builtin/bsp_gbuf.vert;
 				},
+				{
+					stage = geometry;
+					name = main;
+					module = $builtin/bsp_gbuf.geom;
+				},
 				{
 					stage = fragment;
 					name = main;
@@ -570,16 +577,28 @@
 			};
 			colorBlend = {
 				logicOpEnable = false;
-				attachments = ({
-					blendEnable = true;
-					srcColorBlendFactor = src_alpha;
-					dstColorBlendFactor = one_minus_src_alpha;
-					colorBlendOp = add;
-					srcAlphaBlendFactor = src_alpha;
-					dstAlphaBlendFactor = one_minus_src_alpha;
-					alphaBlendOp = add;
-					colorWriteMask = r|g|b|a;
-				});
+				attachments = (
+					{
+						blendEnable = false;
+						srcColorBlendFactor = src_alpha;
+						dstColorBlendFactor = one_minus_src_alpha;
+						colorBlendOp = add;
+						srcAlphaBlendFactor = src_alpha;
+						dstAlphaBlendFactor = one_minus_src_alpha;
+						alphaBlendOp = add;
+						colorWriteMask = r|g|b|a;
+					},
+					{
+						blendEnable = false;
+						srcColorBlendFactor = src_alpha;
+						dstColorBlendFactor = one_minus_src_alpha;
+						colorBlendOp = add;
+						srcAlphaBlendFactor = src_alpha;
+						dstAlphaBlendFactor = one_minus_src_alpha;
+						alphaBlendOp = add;
+						colorWriteMask = r|g|b|a;
+					}
+				);
 			};
 			dynamic = {
 				dynamicState = ( viewport, scissor, blend_constants );
@@ -587,17 +606,23 @@
 			layout = quakebsp_layout;
 			//renderPass = renderpass;
 		};
-		quakebsp_skysheet = {
+		bsp_skysheet = {
+			subpass = 1;
 			stages = (
 				{
 					stage = vertex;
 					name = main;
-					module = $builtin/quakebsp.vert;
+					module = $builtin/bsp_gbuf.vert;
+				},
+				{
+					stage = geometry;
+					name = main;
+					module = $builtin/bsp_gbuf.geom;
 				},
 				{
 					stage = fragment;
 					name = main;
-					module = $builtin/quakebsp.frag;
+					module = $builtin/bsp_gbuf.frag;
 					specializationInfo = {
 						mapEntries = (
 							{ size = 4; offset = 0; constantID = 0; },
@@ -623,6 +648,7 @@
 			//renderPass = renderpass;
 		};
 		twod = {
+			subpass = 3;
 			stages = (
 				{
 					stage = vertex;
diff --git a/libs/video/renderer/vulkan/shader.c b/libs/video/renderer/vulkan/shader.c
index 857d457d4..64c0954cb 100644
--- a/libs/video/renderer/vulkan/shader.c
+++ b/libs/video/renderer/vulkan/shader.c
@@ -63,6 +63,14 @@ static
 static
 #include "libs/video/renderer/vulkan/shader/quakebsp.frag.spvc"
 static
+#include "libs/video/renderer/vulkan/shader/bsp_depth.vert.spvc"
+static
+#include "libs/video/renderer/vulkan/shader/bsp_gbuf.vert.spvc"
+static
+#include "libs/video/renderer/vulkan/shader/bsp_gbuf.geom.spvc"
+static
+#include "libs/video/renderer/vulkan/shader/bsp_gbuf.frag.spvc"
+static
 #include "libs/video/renderer/vulkan/shader/alias.vert.spvc"
 static
 #include "libs/video/renderer/vulkan/shader/alias_depth.vert.spvc"
@@ -86,6 +94,10 @@ static shaderdata_t builtin_shaders[] = {
 	{ "twod.frag", twod_frag, sizeof (twod_frag) },
 	{ "quakebsp.vert", quakebsp_vert, sizeof (quakebsp_vert) },
 	{ "quakebsp.frag", quakebsp_frag, sizeof (quakebsp_frag) },
+	{ "bsp_depth.vert", bsp_depth_vert, sizeof (bsp_depth_vert) },
+	{ "bsp_gbuf.vert", bsp_gbuf_vert, sizeof (bsp_gbuf_vert) },
+	{ "bsp_gbuf.geom", bsp_gbuf_geom, sizeof (bsp_gbuf_geom) },
+	{ "bsp_gbuf.frag", bsp_gbuf_frag, sizeof (bsp_gbuf_frag) },
 	{ "alias.vert", alias_vert, sizeof (alias_vert) },
 	{ "alias_depth.vert", alias_depth_vert, sizeof (alias_depth_vert) },
 	{ "alias.frag", alias_frag, sizeof (alias_frag) },
diff --git a/libs/video/renderer/vulkan/shader/bsp_depth.vert b/libs/video/renderer/vulkan/shader/bsp_depth.vert
new file mode 100644
index 000000000..02a4fed80
--- /dev/null
+++ b/libs/video/renderer/vulkan/shader/bsp_depth.vert
@@ -0,0 +1,19 @@
+#version 450
+
+layout (set = 0, binding = 0) uniform Matrices {
+	mat4 Projection;
+	mat4 View;
+	mat4 Sky;
+};
+
+layout (push_constant) uniform PushConstants {
+	mat4 Model;
+};
+
+layout (location = 0) in vec4 vertex;
+
+void
+main (void)
+{
+	gl_Position = Projection * (View * (Model * vertex));
+}
diff --git a/libs/video/renderer/vulkan/shader/bsp_gbuf.frag b/libs/video/renderer/vulkan/shader/bsp_gbuf.frag
new file mode 100644
index 000000000..272499efa
--- /dev/null
+++ b/libs/video/renderer/vulkan/shader/bsp_gbuf.frag
@@ -0,0 +1,126 @@
+#version 450
+
+layout (set = 0, binding = 1) uniform sampler2D Texture;
+layout (set = 0, binding = 2) uniform sampler2D GlowMap;
+layout (set = 0, binding = 3) uniform sampler2D LightMap;
+layout (set = 0, binding = 4) uniform sampler2DArray SkySheet;
+layout (set = 0, binding = 5) uniform samplerCube SkyCube;
+
+layout (push_constant) uniform PushConstants {
+	layout (offset = 64)
+	vec4        fog;
+	float       time;
+};
+
+layout (location = 0) in vec4 tl_st;
+layout (location = 1) in vec3 direction;
+layout (location = 2) in vec3 normal;
+
+layout (location = 0) out vec4 frag_color;
+layout (location = 1) out vec4 frag_normal;
+
+layout (constant_id = 0) const bool doWarp = false;
+layout (constant_id = 1) const bool doLight = true;
+layout (constant_id = 2) const bool doSkyCube = false;
+layout (constant_id = 3) const bool doSkySheet = false;
+
+const float PI = 3.14159265;
+const float SPEED = 20.0;
+const float CYCLE = 128.0;
+const float FACTOR = PI * 2.0 / CYCLE;
+const vec2 BIAS = vec2 (1.0, 1.0);
+const float SCALE = 8.0;
+
+vec2
+warp_st (vec2 st, float time)
+{
+	vec2        angle = st.ts * CYCLE / 2.0;
+	vec2        phase = vec2 (time, time) * SPEED;
+	return st + (sin ((angle + phase) * FACTOR) + BIAS) / SCALE;
+}
+
+vec4
+fogBlend (vec4 color)
+{
+	float       az = fog.a * gl_FragCoord.z / gl_FragCoord.w;
+	vec3        fog_color = fog.rgb;
+	float       fog_factor = exp (-az * az);
+
+	return vec4 (mix (fog_color.rgb, color.rgb, fog_factor), color.a);
+}
+
+vec4
+sky_sheet (vec3 dir, float time)
+{
+	float       len;
+	vec2        flow = vec2 (1.0, 1.0);
+	vec2        base;
+	vec3        st1, st2;
+	vec4        c1, c2, c;
+
+	dir.z *= 3.0;
+	len = dot (dir, dir);
+	len = SCALE * inversesqrt (len);
+	base = dir.yx * vec2(1.0, -1.0) * len;
+
+	st1 = vec3 (base + flow * time / 8.0, 0);
+	st2 = vec3 (base + flow * time / 16.0, 1);
+
+	c1 = texture (SkySheet, st1);
+	c2 = texture (SkySheet, st2);
+
+	c = vec4 (mix (c2.rgb, c1.rgb, c1.a), max (c1.a, c2.a));
+
+	return c;
+}
+
+vec4
+sky_cube (vec3 dir, float time)
+{
+	// NOTE: quake's world is right-handed with Z up and X forward, but
+	// Vulkan's cube maps are left-handed with Y up and Z forward. The
+	// rotation to X foward is done by the Sky matrix so all that's left
+	// to do here is swizzle the Y and Z coordinates
+	return texture (SkyCube, dir.xzy);
+}
+
+vec4
+sky_color (vec3 dir, float time)
+{
+	if (!doSkySheet) {
+		return vec4 (1, 0, 1, 1);
+		//return sky_cube (dir, time);
+	} if (!doSkyCube) {
+		return sky_sheet (dir, time);
+	} else {
+		// can see through the sheet (may look funny when looking down)
+		// maybe have 4 sheet layers instead of 2?
+		vec4        c1 = sky_sheet (dir, time);
+		vec4        c2 = sky_cube (dir, time);
+		return vec4 (mix (c2.rgb, c1.rgb, c1.a), max (c1.a, c2.a));
+		return vec4 (1, 0, 1, 1);
+	}
+}
+
+void
+main (void)
+{
+	vec4        c;
+	vec2        t_st = tl_st.xy;
+	vec2        l_st = tl_st.zw;
+
+	if (doWarp) {
+		t_st = warp_st (t_st, time);
+	}
+	if (doSkyCube || doSkySheet) {
+		c = sky_color (direction, time);
+	} else {
+		c = texture (Texture, t_st);
+		if (doLight) {
+			c *= vec4 (texture (LightMap, l_st).xyz, 1);
+		}
+		c += texture (GlowMap, t_st);
+	}
+	frag_color = c;//fogBlend (c);
+	frag_normal = vec4 (normal, 0);
+}
diff --git a/libs/video/renderer/vulkan/shader/bsp_gbuf.geom b/libs/video/renderer/vulkan/shader/bsp_gbuf.geom
new file mode 100644
index 000000000..f1107f759
--- /dev/null
+++ b/libs/video/renderer/vulkan/shader/bsp_gbuf.geom
@@ -0,0 +1,29 @@
+#version 450
+
+layout (triangles) in;
+layout (triangle_strip, max_vertices = 3) out;
+layout (location = 0) in vec4 v_tl_st[];
+layout (location = 1) in vec3 v_direction[];
+
+layout (location = 0) out vec4 tl_st;
+layout (location = 1) out vec3 direction;
+layout (location = 2) out vec3 normal;
+
+void
+main()
+{
+	vec3        a = gl_in[0].gl_Position.xyz;
+	vec3        b = gl_in[1].gl_Position.xyz;
+	vec3        c = gl_in[2].gl_Position.xyz;
+
+	vec3        n = normalize (cross (b - a, c - a));
+
+	for (int vert = 0; vert < 3; vert++) {
+		gl_Position = gl_in[vert].gl_Position;
+		tl_st = v_tl_st[vert];
+		direction = v_direction[vert];
+		normal = n;
+		EmitVertex ();
+	}
+	EndPrimitive ();
+}
diff --git a/libs/video/renderer/vulkan/shader/bsp_gbuf.vert b/libs/video/renderer/vulkan/shader/bsp_gbuf.vert
new file mode 100644
index 000000000..bb9e87e4a
--- /dev/null
+++ b/libs/video/renderer/vulkan/shader/bsp_gbuf.vert
@@ -0,0 +1,25 @@
+#version 450
+
+layout (set = 0, binding = 0) uniform Matrices {
+	mat4 Projection;
+	mat4 View;
+	mat4 Sky;
+};
+
+layout (push_constant) uniform PushConstants {
+	mat4 Model;
+};
+
+layout (location = 0) in vec4 vertex;
+layout (location = 1) in vec4 tl_uv;
+
+layout (location = 0) out vec4 tl_st;
+layout (location = 1) out vec3 direction;
+
+void
+main (void)
+{
+	gl_Position = Projection * (View * (Model * vertex));
+	direction = (Sky * vertex).xyz;
+	tl_st = tl_uv;
+}
diff --git a/libs/video/renderer/vulkan/vulkan_alias.c b/libs/video/renderer/vulkan/vulkan_alias.c
index 973e5445b..f7d9b2f0b 100644
--- a/libs/video/renderer/vulkan/vulkan_alias.c
+++ b/libs/video/renderer/vulkan/vulkan_alias.c
@@ -152,7 +152,7 @@ Vulkan_DrawAlias (entity_t *ent, vulkan_ctx_t *ctx)
 }
 
 static void
-alias_begin_subpass (VkCommandBuffer cmd, VkPipeline pipeline,
+alias_begin_subpass (QFV_AliasSubpass subpass, VkPipeline pipeline,
 					 vulkan_ctx_t *ctx)
 {
 	qfv_device_t *device = ctx->device;
@@ -160,11 +160,12 @@ alias_begin_subpass (VkCommandBuffer cmd, VkPipeline pipeline,
 	aliasctx_t *actx = ctx->alias_context;
 	__auto_type cframe = &ctx->frames.a[ctx->curFrame];
 	aliasframe_t *aframe = &actx->frames.a[ctx->curFrame];
+	VkCommandBuffer cmd = aframe->cmdSet.a[subpass];
 
 	dfunc->vkResetCommandBuffer (cmd, 0);
 	VkCommandBufferInheritanceInfo inherit = {
 		VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_INFO, 0,
-		ctx->renderpass, 0,
+		ctx->renderpass, subpass,
 		cframe->framebuffer,
 		0, 0, 0,
 	};
@@ -222,8 +223,8 @@ Vulkan_AliasBegin (vulkan_ctx_t *ctx)
 	//FIXME need per frame matrices
 	aframe->bufferInfo[0].buffer = ctx->matrices.buffer_3d;
 
-	alias_begin_subpass (aframe->cmdSet.a[QFV_aliasDepth], actx->depth, ctx);
-	alias_begin_subpass (aframe->cmdSet.a[QFV_aliasGBuffer], actx->gbuf, ctx);
+	alias_begin_subpass (QFV_aliasDepth, actx->depth, ctx);
+	alias_begin_subpass (QFV_aliasGBuffer, actx->gbuf, ctx);
 }
 
 void
diff --git a/libs/video/renderer/vulkan/vulkan_bsp.c b/libs/video/renderer/vulkan/vulkan_bsp.c
index 895caed49..dfd58b1f5 100644
--- a/libs/video/renderer/vulkan/vulkan_bsp.c
+++ b/libs/video/renderer/vulkan/vulkan_bsp.c
@@ -845,18 +845,20 @@ get_view (qfv_tex_t *tex, qfv_tex_t *default_tex)
 }
 
 static void
-bsp_begin_subpass (VkCommandBuffer cmd, VkPipeline pipeline, vulkan_ctx_t *ctx)
+bsp_begin_subpass (QFV_BspSubpass subpass, VkPipeline pipeline,
+				   vulkan_ctx_t *ctx)
 {
 	qfv_device_t *device = ctx->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
 	bspctx_t   *bctx = ctx->bsp_context;
 	__auto_type cframe = &ctx->frames.a[ctx->curFrame];
 	bspframe_t *bframe = &bctx->frames.a[ctx->curFrame];
+	VkCommandBuffer cmd = bframe->cmdSet.a[subpass];
 
 	dfunc->vkResetCommandBuffer (cmd, 0);
 	VkCommandBufferInheritanceInfo inherit = {
 		VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_INFO, 0,
-		ctx->renderpass, 0,
+		ctx->renderpass, subpass,
 		cframe->framebuffer,
 		0, 0, 0,
 	};
@@ -928,9 +930,8 @@ bsp_begin (vulkan_ctx_t *ctx)
 	bframe->imageInfo[4].imageView = get_view (bctx->skybox_tex,
 											   bctx->default_skybox);
 
-	//FIXME pipeline
-	bsp_begin_subpass (bframe->cmdSet.a[QFV_bspDepth], bctx->main, ctx);
-	bsp_begin_subpass (bframe->cmdSet.a[QFV_bspGBuffer], bctx->main, ctx);
+	bsp_begin_subpass (QFV_bspDepth, bctx->depth, ctx);
+	bsp_begin_subpass (QFV_bspGBuffer, bctx->gbuf, ctx);
 }
 
 static void
@@ -1047,7 +1048,7 @@ sky_begin (vulkan_ctx_t *ctx)
 											   bctx->default_skybox);
 
 	//FIXME sky pass
-	bsp_begin_subpass (bframe->cmdSet.a[QFV_bspTranslucent], bctx->sky, ctx);
+	bsp_begin_subpass (QFV_bspTranslucent, bctx->sky, ctx);
 }
 
 static void
@@ -1457,8 +1458,9 @@ Vulkan_Bsp_Init (vulkan_ctx_t *ctx)
 	DARRAY_RESIZE (&bctx->frames, frames);
 	bctx->frames.grow = 0;
 
-	bctx->main = Vulkan_CreatePipeline (ctx, "quakebsp_main");
-	bctx->sky = Vulkan_CreatePipeline (ctx, "quakebsp_skysheet");
+	bctx->depth = Vulkan_CreatePipeline (ctx, "bsp_depth");
+	bctx->gbuf = Vulkan_CreatePipeline (ctx, "bsp_gbuf");
+	bctx->sky = Vulkan_CreatePipeline (ctx, "bsp_skysheet");
 	bctx->layout = Vulkan_CreatePipelineLayout (ctx, "quakebsp_layout");
 	bctx->sampler = Vulkan_CreateSampler (ctx, "quakebsp_sampler");
 
@@ -1507,7 +1509,8 @@ Vulkan_Bsp_Shutdown (struct vulkan_ctx_s *ctx)
 		free (bframe->cmdSet.a);
 	}
 
-	dfunc->vkDestroyPipeline (device->dev, bctx->main, 0);
+	dfunc->vkDestroyPipeline (device->dev, bctx->depth, 0);
+	dfunc->vkDestroyPipeline (device->dev, bctx->gbuf, 0);
 	dfunc->vkDestroyPipeline (device->dev, bctx->sky, 0);
 	DARRAY_CLEAR (&bctx->texture_chains);
 	DARRAY_CLEAR (&bctx->frames);
diff --git a/libs/video/renderer/vulkan/vulkan_draw.c b/libs/video/renderer/vulkan/vulkan_draw.c
index 43b246273..4b962edd6 100644
--- a/libs/video/renderer/vulkan/vulkan_draw.c
+++ b/libs/video/renderer/vulkan/vulkan_draw.c
@@ -709,7 +709,7 @@ Vulkan_FlushText (vulkan_ctx_t *ctx)
 	dfunc->vkResetCommandBuffer (cmd, 0);
 	VkCommandBufferInheritanceInfo inherit = {
 		VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_INFO, 0,
-		ctx->renderpass, 0,
+		ctx->renderpass, QFV_passTranslucent,
 		cframe->framebuffer,
 		0, 0, 0
 	};

From 0cd2ece38e4ae951e3d61512437ccf953971eab3 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 23 Feb 2021 14:37:13 +0900
Subject: [PATCH 1436/1519] [util] Correct element order for vector expressions

---
 libs/util/cexpr-parse.y | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/libs/util/cexpr-parse.y b/libs/util/cexpr-parse.y
index ad734def7..4c57c98c0 100644
--- a/libs/util/cexpr-parse.y
+++ b/libs/util/cexpr-parse.y
@@ -321,9 +321,22 @@ vector_expr (exprlist_t *list, exprctx_t *context)
 {
 	exprlist_t *l;
 	exprval_t  *val = cexpr_value (&cexpr_vector, context);
+	float      *vector = val->value;
 	int         i;
+	exprlist_t *rlist = 0;
+
+	// list is built in reverse order, so need to reverse it to make converting
+	// to an array easier
+	while (list) {
+		exprlist_t *t = list->next;
+		list->next = rlist;
+		rlist = list;
+		list = t;
+	}
+	list = rlist;
+
 	for (i = 0; i < 4 && list; i++, list = l) {
-		exprval_t   dst = { &cexpr_float, ((float *) val->value) + i };
+		exprval_t   dst = { &cexpr_float, &vector[i] };
 		exprval_t  *src = list->value;
 		binop_t    *cast = cexpr_find_cast (&cexpr_float, src->type);
 		if (cast) {
@@ -335,12 +348,12 @@ vector_expr (exprlist_t *list, exprctx_t *context)
 		l = list->next;
 		cmemfree (context->memsuper, list);
 	}
-	for ( ; i < 4; i++) {
-		((float *) val->value)[i] = 0;
-	}
 	if (i == 4 && list) {
 		cexpr_error (context, "excess elements in vector expression");
 	}
+	for ( ; i < 4; i++) {
+		vector[i] = 0;
+	}
 	return val;
 }
 

From 82eabb5ca2acf4053fa3ed08ff2a2fbc84c2a9f3 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 23 Feb 2021 14:37:48 +0900
Subject: [PATCH 1437/1519] [vulkan] Parse clear values

And get the render pass working in general. Note that this is only the
render pass and frame buffers: actual commands still have problems.
---
 include/vid_vulkan.h                          |  5 ++
 libs/video/renderer/vid_render_vulkan.c       | 19 ++---
 libs/video/renderer/vulkan/deferred.plist     | 16 +++-
 libs/video/renderer/vulkan/vkparse.c          | 85 +++++++++++++++++++
 libs/video/renderer/vulkan/vkparse.h          |  3 +
 libs/video/renderer/vulkan/vkparse.plist      | 13 ++-
 libs/video/renderer/vulkan/vulkan_draw.c      |  1 +
 .../video/renderer/vulkan/vulkan_vid_common.c | 13 +++
 8 files changed, 140 insertions(+), 15 deletions(-)

diff --git a/include/vid_vulkan.h b/include/vid_vulkan.h
index dcf4f624b..a672f02d1 100644
--- a/include/vid_vulkan.h
+++ b/include/vid_vulkan.h
@@ -32,6 +32,9 @@ typedef struct vulkan_matrices_s {
 typedef struct vulkan_frameset_s
 	DARRAY_TYPE (vulkan_frame_t) vulkan_frameset_t;
 
+typedef struct clearvalueset_s
+	DARRAY_TYPE (VkClearValue) clearvalueset_t;
+
 typedef struct vulkan_ctx_s {
 	void        (*load_vulkan) (struct vulkan_ctx_s *ctx);
 	void        (*unload_vulkan) (struct vulkan_ctx_s *ctx);
@@ -56,6 +59,7 @@ typedef struct vulkan_ctx_s {
 
 	struct plitem_s  *renderpassDef;
 	VkRenderPass renderpass;
+	clearvalueset_t *clearValues;
 	struct qfv_imageset_s *attachment_images;
 	struct qfv_imageviewset_s *attachment_views;
 	VkDeviceMemory attachmentMemory;
@@ -70,6 +74,7 @@ typedef struct vulkan_ctx_s {
 	struct hashtab_s *samplers;
 	struct hashtab_s *images;
 	struct hashtab_s *imageViews;
+	struct hashtab_s *renderpasses;
 
 	struct aliasctx_s *alias_context;
 	struct bspctx_s *bsp_context;
diff --git a/libs/video/renderer/vid_render_vulkan.c b/libs/video/renderer/vid_render_vulkan.c
index b8f9dc718..84f7b41f9 100644
--- a/libs/video/renderer/vid_render_vulkan.c
+++ b/libs/video/renderer/vid_render_vulkan.c
@@ -125,9 +125,6 @@ vulkan_R_RenderFrame (SCR_Func scr_3dfunc, SCR_Func *scr_funcs)
 	__auto_type frame = &vulkan_ctx->frames.a[vulkan_ctx->curFrame];
 
 	dfunc->vkWaitForFences (dev, 1, &frame->fence, VK_TRUE, 2000000000);
-	if (frame->framebuffer) {
-		dfunc->vkDestroyFramebuffer (dev, frame->framebuffer, 0);
-	}
 	QFV_AcquireNextImage (vulkan_ctx->swapchain,
 						  frame->imageAvailableSemaphore,
 						  0, &imageIndex);
@@ -145,16 +142,11 @@ vulkan_R_RenderFrame (SCR_Func scr_3dfunc, SCR_Func *scr_funcs)
 
 	VkCommandBufferBeginInfo beginInfo
 		= { VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO };
-	VkClearValue clearValues[3] = {
-		{ { {0.0, 0.0, 0.0, 1.0} } },
-		{ { {1.0, 0.0} } },
-		{ { {0.0, 0.0, 0.0, 1.0} } },
-	};
 	VkRenderPassBeginInfo renderPassInfo = {
 		VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO, 0,
 		vulkan_ctx->renderpass, 0,
 		{ {0, 0}, vulkan_ctx->swapchain->extent },
-		3, clearValues
+		vulkan_ctx->clearValues->size, vulkan_ctx->clearValues->a
 	};
 
 	dfunc->vkBeginCommandBuffer (frame->cmdBuffer, &beginInfo);
@@ -163,12 +155,15 @@ vulkan_R_RenderFrame (SCR_Func scr_3dfunc, SCR_Func *scr_funcs)
 								 subpassContents);
 
 	for (int i = 0; i < frame->cmdSetCount; i++) {
-		dfunc->vkCmdExecuteCommands (frame->cmdBuffer, frame->cmdSets[i].size,
-									 frame->cmdSets[i].a);
+		if (frame->cmdSets[i].size) {
+			dfunc->vkCmdExecuteCommands (frame->cmdBuffer,
+										 frame->cmdSets[i].size,
+										 frame->cmdSets[i].a);
+		}
 		// reset for next time around
 		frame->cmdSets[i].size = 0;
 
-		if (i < frame->cmdSetCount) {
+		if (i < frame->cmdSetCount - 1) {
 			dfunc->vkCmdNextSubpass (frame->cmdBuffer, subpassContents);
 		}
 	}
diff --git a/libs/video/renderer/vulkan/deferred.plist b/libs/video/renderer/vulkan/deferred.plist
index e7e7e1f12..c03c30625 100644
--- a/libs/video/renderer/vulkan/deferred.plist
+++ b/libs/video/renderer/vulkan/deferred.plist
@@ -13,6 +13,7 @@
 			arrayLayers = 1;
 			tiling = optimal;
 			usage = depth_stencil_attachment|input_attachment;
+			initialLayout = undefined;
 		};
 		color = {
 			imageType = VK_IMAGE_TYPE_2D;
@@ -27,6 +28,7 @@
 			arrayLayers = 1;
 			tiling = optimal;
 			usage = color_attachment|input_attachment;
+			initialLayout = undefined;
 		};
 		normals = {
 			imageType = VK_IMAGE_TYPE_2D;
@@ -41,6 +43,7 @@
 			arrayLayers = 1;
 			tiling = optimal;
 			usage = color_attachment|input_attachment;
+			initialLayout = undefined;
 		};
 		opaque = {
 			imageType = VK_IMAGE_TYPE_2D;
@@ -55,6 +58,7 @@
 			arrayLayers = 1;
 			tiling = optimal;
 			usage = color_attachment|input_attachment;
+			initialLayout = undefined;
 		};
 		translucent = {
 			imageType = VK_IMAGE_TYPE_2D;
@@ -69,6 +73,7 @@
 			arrayLayers = 1;
 			tiling = optimal;
 			usage = color_attachment|input_attachment;
+			initialLayout = undefined;
 		};
 	};
 	imageViews = {
@@ -154,12 +159,21 @@
 		};
 	};
 	framebuffer = {
-		renderPass = renderpass;
+		renderPass = $properties.renderpass;
 		attachments = (depth, color, normals, opaque, translucent,
 					   "$swapchain.views[$swapImageIndex]");
 		width = $swapchain.extent.width;
 		height = $swapchain.extent.height;
+		layers = 1;
 	};
+	clearValues = (
+		{ depthStencil = { depth = 1; stencil = 0; }; },
+		{ color = "[0, 0, 0, 1]"; },	// color
+		{ color = "[0, 0, 0, 1]"; },	// normals
+		{ color = "[0, 0, 0, 1]"; },	// opaque
+		{ color = "[0, 0, 0, 0]"; },	// translucent
+		{ color = "[0, 0, 0, 1]"; },	// swapchain
+	);
 	renderpass = {
 		attachments = (
 			{
diff --git a/libs/video/renderer/vulkan/vkparse.c b/libs/video/renderer/vulkan/vkparse.c
index ee8efb8a4..72ec5abbb 100644
--- a/libs/video/renderer/vulkan/vkparse.c
+++ b/libs/video/renderer/vulkan/vkparse.c
@@ -413,6 +413,42 @@ QFV_AddHandle (hashtab_t *tab, const char *name, uint64_t handle)
 	Hash_Add (tab, hr);
 }
 
+static int
+parse_VkRenderPass (const plitem_t *item, void **data,
+					plitem_t *messages, parsectx_t *context)
+{
+	__auto_type handle = (VkRenderPass *) data[0];
+	int         ret = 1;
+	parsectx_t *pctx = context;
+	exprctx_t   ectx = *pctx->ectx;
+	vulkan_ctx_t *ctx = pctx->vctx;
+
+	const char *name = PL_String (item);
+	Sys_Printf ("parse_VkRenderPass: %s\n", name);
+	if (name[0] != '$') {
+		name = va (ctx->va_ctx, "$"QFV_PROPERTIES".%s", name);
+	}
+
+	*handle = (VkRenderPass) QFV_GetHandle (ctx->renderpasses, name);
+	if (*handle) {
+		return 1;
+	}
+
+	plitem_t   *setItem = 0;
+	exprval_t   result = { &cexpr_plitem, &setItem };
+	ectx.symtab = 0;
+	ectx.result = &result;
+	ret = !cexpr_eval_string (name, &ectx);
+	if (ret) {
+		VkRenderPass setLayout;
+		setLayout = QFV_ParseRenderPass (ctx, setItem, pctx->properties);
+		*handle = (VkRenderPass) setLayout;
+
+		QFV_AddHandle (ctx->setLayouts, name, (uint64_t) setLayout);
+	}
+	return ret;
+}
+
 static int
 parse_VkShaderModule (const plitem_t *item, void **data,
 					  plitem_t *messages, parsectx_t *context)
@@ -711,6 +747,21 @@ imageView_free (void *hr, void *_ctx)
 	handleref_free (handleref, ctx);
 }
 
+static void
+renderpass_free (void *hr, void *_ctx)
+{
+	__auto_type handleref = (handleref_t *) hr;
+	__auto_type renderpass = (VkRenderPass) handleref->handle;
+	__auto_type ctx = (vulkan_ctx_t *) _ctx;
+	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	if (renderpass) {
+		dfunc->vkDestroyRenderPass (device->dev, renderpass, 0);
+	};
+	handleref_free (handleref, ctx);
+}
+
 static hashtab_t *enum_symtab;
 
 static int
@@ -891,6 +942,7 @@ QFV_InitParse (vulkan_ctx_t *ctx)
 		ctx->samplers = handlref_symtab (sampler_free, ctx);
 		ctx->images = handlref_symtab (image_free, ctx);
 		ctx->imageViews = handlref_symtab (imageView_free, ctx);
+		ctx->renderpasses = handlref_symtab (renderpass_free, ctx);
 	}
 }
 
@@ -1262,6 +1314,39 @@ QFV_ParseFramebuffer (vulkan_ctx_t *ctx, plitem_t *plist, plitem_t *properties)
 
 	VkFramebuffer framebuffer;
 	dfunc->vkCreateFramebuffer (device->dev, &cInfo, 0, &framebuffer);
+	printf ("framebuffer, renderPass: %p, %p\n", framebuffer, cInfo.renderPass);
 
 	return framebuffer;
 }
+
+static int
+parse_clearvalueset (const plfield_t *field, const plitem_t *item, void *data,
+					 plitem_t *messages, void *context)
+{
+	parsectx_t *parsectx = context;
+	vulkan_ctx_t *ctx = parsectx->vctx;
+
+	plelement_t element = {
+		QFDictionary,
+		sizeof (VkClearValue),
+		array_alloc,
+		parse_VkClearValue,
+		0,
+	};
+	plfield_t   f = { 0, 0, 0, 0, &element };
+
+	if (!PL_ParseArray (&f, item, &ctx->clearValues, messages, context)) {
+		return 0;
+	}
+	return 1;
+}
+
+int
+QFV_ParseClearValues (vulkan_ctx_t *ctx, plitem_t *plist, plitem_t *properties)
+{
+	if (!parse_object (ctx, plist, parse_clearvalueset, &ctx->clearValues,
+					   properties)) {
+		return 0;
+	}
+	return 1;
+}
diff --git a/libs/video/renderer/vulkan/vkparse.h b/libs/video/renderer/vulkan/vkparse.h
index f8aea8a7f..2550e1b17 100644
--- a/libs/video/renderer/vulkan/vkparse.h
+++ b/libs/video/renderer/vulkan/vkparse.h
@@ -58,5 +58,8 @@ struct qfv_imageviewset_s *QFV_ParseImageViewSet (vulkan_ctx_t *ctx,
 												  plitem_t *properties);
 VkFramebuffer QFV_ParseFramebuffer (vulkan_ctx_t *ctx, plitem_t *plist,
 									plitem_t *properties);
+int QFV_ParseClearValues (vulkan_ctx_t *ctx, plitem_t *plist,
+						  plitem_t *properties);
+
 
 #endif//__vkparse_h
diff --git a/libs/video/renderer/vulkan/vkparse.plist b/libs/video/renderer/vulkan/vkparse.plist
index 9eb5e7e04..22d9173dc 100644
--- a/libs/video/renderer/vulkan/vkparse.plist
+++ b/libs/video/renderer/vulkan/vkparse.plist
@@ -23,6 +23,7 @@
 		VkImageCreateInfo,
 		VkImageViewCreateInfo,
 		VkFramebufferCreateInfo,
+		VkClearValue,
 	);
 	parse = {
 		VkSubpassDescription = {
@@ -317,7 +318,7 @@
 		VkFramebufferCreateInfo = {
 			//flags = auto; reserved for future use (Bits enum does not exist)
 			renderPass = {
-				type = (custom,	QFString, parse_VkShaderModule);
+				type = (custom,	QFString, parse_VkRenderPass);
 				fields = (renderPass);
 			};
 			attachments = {
@@ -328,6 +329,14 @@
 			width = auto;
 			height = auto;
 			layers = auto;
-		}
+		};
+		VkClearColorValue = skip;
+		VkClearValue = {
+			color = {
+				type = (custom, QFString, parse_RGBA);
+				fields = (color);
+			};
+			depthStencil = auto;
+		};
 	}
 }
diff --git a/libs/video/renderer/vulkan/vulkan_draw.c b/libs/video/renderer/vulkan/vulkan_draw.c
index 4b962edd6..2ab8bd05a 100644
--- a/libs/video/renderer/vulkan/vulkan_draw.c
+++ b/libs/video/renderer/vulkan/vulkan_draw.c
@@ -718,6 +718,7 @@ Vulkan_FlushText (vulkan_ctx_t *ctx)
 		VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT
 		| VK_COMMAND_BUFFER_USAGE_RENDER_PASS_CONTINUE_BIT, &inherit,
 	};
+	printf ("Vulkan_FlushText: %p %p\n", inherit.renderPass, inherit.framebuffer);
 	dfunc->vkBeginCommandBuffer (cmd, &beginInfo);
 
 	dfunc->vkCmdBindPipeline (cmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c
index a6f444798..903dc8d19 100644
--- a/libs/video/renderer/vulkan/vulkan_vid_common.c
+++ b/libs/video/renderer/vulkan/vulkan_vid_common.c
@@ -308,12 +308,25 @@ Vulkan_CreateRenderPass (vulkan_ctx_t *ctx)
 {
 	const char *name = "renderpass";//FIXME
 
+	hashtab_t  *tab = ctx->renderpasses;
+	const char *path;
+	path = va (ctx->va_ctx, "$"QFV_PROPERTIES".%s", name);
+	__auto_type renderpass = (VkRenderPass) QFV_GetHandle (tab, path);
+	if (renderpass) {
+		ctx->renderpass = renderpass;
+		return;
+	}
+
 	plitem_t   *item = qfv_load_renderpass (ctx, name);
 
 	ctx->renderpass = QFV_ParseRenderPass (ctx, item, ctx->renderpassDef);
+	QFV_AddHandle (tab, path, (uint64_t) ctx->renderpass);
 	QFV_duSetObjectName (ctx->device, VK_OBJECT_TYPE_RENDER_PASS,
 						 ctx->renderpass, va (ctx->va_ctx, "renderpass:%s",
 											  name));
+	item = qfv_load_renderpass (ctx, "clearValues");
+	QFV_ParseClearValues (ctx, item, ctx->renderpassDef);
+	printf ("renderpass: %p\n", ctx->renderpass);
 }
 
 void

From e6ecf5e8559b1e99038fe39614522392313332ab Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 23 Feb 2021 15:43:02 +0900
Subject: [PATCH 1438/1519] [vulkan] Fix up commands for deferred rendering

Nothing gets output yet (lighting and composite passes not implemented),
but everything passes validation until exit (not destroying everything).
---
 libs/video/renderer/Makemodule.am             |  5 +
 libs/video/renderer/vulkan/qfpipeline.plist   | 29 +++---
 libs/video/renderer/vulkan/shader.c           |  3 +
 .../video/renderer/vulkan/shader/bsp_sky.frag | 96 +++++++++++++++++++
 libs/video/renderer/vulkan/vulkan_alias.c     |  2 +-
 libs/video/renderer/vulkan/vulkan_bsp.c       | 11 ++-
 6 files changed, 133 insertions(+), 13 deletions(-)
 create mode 100644 libs/video/renderer/vulkan/shader/bsp_sky.frag

diff --git a/libs/video/renderer/Makemodule.am b/libs/video/renderer/Makemodule.am
index a5c3fc1a0..93f6a51b4 100644
--- a/libs/video/renderer/Makemodule.am
+++ b/libs/video/renderer/Makemodule.am
@@ -283,6 +283,8 @@ bsp_gbufg_src = $(vkshaderpath)/bsp_gbuf.geom
 bsp_gbufg_c = $(vkshaderpath)/bsp_gbuf.geom.spvc
 bsp_gbuff_src = $(vkshaderpath)/bsp_gbuf.frag
 bsp_gbuff_c = $(vkshaderpath)/bsp_gbuf.frag.spvc
+bsp_skyf_src = $(vkshaderpath)/bsp_sky.frag
+bsp_skyf_c = $(vkshaderpath)/bsp_sky.frag.spvc
 aliasv_src = $(vkshaderpath)/alias.vert
 aliasv_c = $(vkshaderpath)/alias.vert.spvc
 aliasf_src = $(vkshaderpath)/alias.frag
@@ -312,6 +314,8 @@ $(bsp_gbufg_c): $(bsp_gbufg_src)
 
 $(bsp_gbuff_c): $(bsp_gbuff_src)
 
+$(bsp_skyf_c): $(bsp_skyf_src)
+
 $(aliasv_c): $(aliasv_src)
 
 $(alias_depth_c): $(alias_depth_src)
@@ -333,6 +337,7 @@ vkshader_c = \
 	$(bsp_gbufv_c) \
 	$(bsp_gbufg_c) \
 	$(bsp_gbuff_c) \
+	$(bsp_skyf_c) \
 	$(aliasv_c) \
 	$(alias_depth_c) \
 	$(aliasf_c) \
diff --git a/libs/video/renderer/vulkan/qfpipeline.plist b/libs/video/renderer/vulkan/qfpipeline.plist
index d71ce6037..03e200fc7 100644
--- a/libs/video/renderer/vulkan/qfpipeline.plist
+++ b/libs/video/renderer/vulkan/qfpipeline.plist
@@ -607,28 +607,21 @@
 			//renderPass = renderpass;
 		};
 		bsp_skysheet = {
-			subpass = 1;
+			subpass = 2;
 			stages = (
 				{
 					stage = vertex;
 					name = main;
 					module = $builtin/bsp_gbuf.vert;
 				},
-				{
-					stage = geometry;
-					name = main;
-					module = $builtin/bsp_gbuf.geom;
-				},
 				{
 					stage = fragment;
 					name = main;
-					module = $builtin/bsp_gbuf.frag;
+					module = $builtin/bsp_sky.frag;
 					specializationInfo = {
 						mapEntries = (
 							{ size = 4; offset = 0; constantID = 0; },
-							{ size = 4; offset = 0; constantID = 1; },
-							{ size = 4; offset = 0; constantID = 2; },
-							{ size = 4; offset = 4; constantID = 3; },
+							{ size = 4; offset = 4; constantID = 1; },
 						);
 						data = <00000000ffffffff>;
 					};
@@ -640,7 +633,21 @@
 			rasterization = $properties.pipelines.bsp_gbuf.rasterization;
 			multisample = $properties.pipelines.bsp_gbuf.multisample;
 			depthStencil = $properties.pipelines.bsp_gbuf.depthStencil;
-			colorBlend = $properties.pipelines.bsp_gbuf.colorBlend;
+			colorBlend = {
+				logicOpEnable = false;
+				attachments = (
+					{
+						blendEnable = false;
+						srcColorBlendFactor = src_alpha;
+						dstColorBlendFactor = one_minus_src_alpha;
+						colorBlendOp = add;
+						srcAlphaBlendFactor = src_alpha;
+						dstAlphaBlendFactor = one_minus_src_alpha;
+						alphaBlendOp = add;
+						colorWriteMask = r|g|b|a;
+					},
+				);
+			};
 			dynamic = {
 				dynamicState = ( viewport, scissor );
 			};
diff --git a/libs/video/renderer/vulkan/shader.c b/libs/video/renderer/vulkan/shader.c
index 64c0954cb..4063e6f33 100644
--- a/libs/video/renderer/vulkan/shader.c
+++ b/libs/video/renderer/vulkan/shader.c
@@ -71,6 +71,8 @@ static
 static
 #include "libs/video/renderer/vulkan/shader/bsp_gbuf.frag.spvc"
 static
+#include "libs/video/renderer/vulkan/shader/bsp_sky.frag.spvc"
+static
 #include "libs/video/renderer/vulkan/shader/alias.vert.spvc"
 static
 #include "libs/video/renderer/vulkan/shader/alias_depth.vert.spvc"
@@ -98,6 +100,7 @@ static shaderdata_t builtin_shaders[] = {
 	{ "bsp_gbuf.vert", bsp_gbuf_vert, sizeof (bsp_gbuf_vert) },
 	{ "bsp_gbuf.geom", bsp_gbuf_geom, sizeof (bsp_gbuf_geom) },
 	{ "bsp_gbuf.frag", bsp_gbuf_frag, sizeof (bsp_gbuf_frag) },
+	{ "bsp_sky.frag", bsp_sky_frag, sizeof (bsp_sky_frag) },
 	{ "alias.vert", alias_vert, sizeof (alias_vert) },
 	{ "alias_depth.vert", alias_depth_vert, sizeof (alias_depth_vert) },
 	{ "alias.frag", alias_frag, sizeof (alias_frag) },
diff --git a/libs/video/renderer/vulkan/shader/bsp_sky.frag b/libs/video/renderer/vulkan/shader/bsp_sky.frag
new file mode 100644
index 000000000..28ce41421
--- /dev/null
+++ b/libs/video/renderer/vulkan/shader/bsp_sky.frag
@@ -0,0 +1,96 @@
+#version 450
+
+layout (set = 0, binding = 4) uniform sampler2DArray SkySheet;
+layout (set = 0, binding = 5) uniform samplerCube SkyCube;
+
+layout (push_constant) uniform PushConstants {
+	layout (offset = 64)
+	vec4        fog;
+	float       time;
+};
+
+layout (location = 0) in vec4 tl_st;
+layout (location = 1) in vec3 direction;
+
+layout (location = 0) out vec4 frag_color;
+
+layout (constant_id = 0) const bool doSkyCube = false;
+layout (constant_id = 1) const bool doSkySheet = false;
+
+const float SCALE = 8.0;
+
+vec4
+fogBlend (vec4 color)
+{
+	float       az = fog.a * gl_FragCoord.z / gl_FragCoord.w;
+	vec3        fog_color = fog.rgb;
+	float       fog_factor = exp (-az * az);
+
+	return vec4 (mix (fog_color.rgb, color.rgb, fog_factor), color.a);
+}
+
+vec4
+sky_sheet (vec3 dir, float time)
+{
+	float       len;
+	vec2        flow = vec2 (1.0, 1.0);
+	vec2        base;
+	vec3        st1, st2;
+	vec4        c1, c2, c;
+
+	dir.z *= 3.0;
+	len = dot (dir, dir);
+	len = SCALE * inversesqrt (len);
+	base = dir.yx * vec2(1.0, -1.0) * len;
+
+	st1 = vec3 (base + flow * time / 8.0, 0);
+	st2 = vec3 (base + flow * time / 16.0, 1);
+
+	c1 = texture (SkySheet, st1);
+	c2 = texture (SkySheet, st2);
+
+	c = vec4 (mix (c2.rgb, c1.rgb, c1.a), max (c1.a, c2.a));
+
+	return c;
+}
+
+vec4
+sky_cube (vec3 dir, float time)
+{
+	// NOTE: quake's world is right-handed with Z up and X forward, but
+	// Vulkan's cube maps are left-handed with Y up and Z forward. The
+	// rotation to X foward is done by the Sky matrix so all that's left
+	// to do here is swizzle the Y and Z coordinates
+	return texture (SkyCube, dir.xzy);
+}
+
+vec4
+sky_color (vec3 dir, float time)
+{
+	if (!doSkySheet) {
+		return vec4 (1, 0, 1, 1);
+		//return sky_cube (dir, time);
+	} if (!doSkyCube) {
+		return sky_sheet (dir, time);
+	} else {
+		// can see through the sheet (may look funny when looking down)
+		// maybe have 4 sheet layers instead of 2?
+		vec4        c1 = sky_sheet (dir, time);
+		vec4        c2 = sky_cube (dir, time);
+		return vec4 (mix (c2.rgb, c1.rgb, c1.a), max (c1.a, c2.a));
+		return vec4 (1, 0, 1, 1);
+	}
+}
+
+void
+main (void)
+{
+	vec4        c;
+
+	if (doSkyCube || doSkySheet) {
+		c = sky_color (direction, time);
+	} else {
+		c = vec4 (0, 0, 0, 1);
+	}
+	frag_color = c;//fogBlend (c);
+}
diff --git a/libs/video/renderer/vulkan/vulkan_alias.c b/libs/video/renderer/vulkan/vulkan_alias.c
index f7d9b2f0b..8468335c1 100644
--- a/libs/video/renderer/vulkan/vulkan_alias.c
+++ b/libs/video/renderer/vulkan/vulkan_alias.c
@@ -186,7 +186,7 @@ alias_begin_subpass (QFV_AliasSubpass subpass, VkPipeline pipeline,
 	//								actx->layout, 0, 2, sets, 0, 0);
 	dfunc->vkCmdPushDescriptorSetKHR (cmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
 									  actx->layout,
-									  0, 2, aframe->descriptors + 0);
+									  0, 1, aframe->descriptors + 0);
 	VkViewport  viewport = {0, 0, vid.width, vid.height, 0, 1};
 	VkRect2D    scissor = { {0, 0}, {vid.width, vid.height} };
 	dfunc->vkCmdSetViewport (cmd, 0, 1, &viewport);
diff --git a/libs/video/renderer/vulkan/vulkan_bsp.c b/libs/video/renderer/vulkan/vulkan_bsp.c
index dfd58b1f5..8b33cebb3 100644
--- a/libs/video/renderer/vulkan/vulkan_bsp.c
+++ b/libs/video/renderer/vulkan/vulkan_bsp.c
@@ -798,7 +798,7 @@ push_fragconst (fragconst_t *fragconst, VkPipelineLayout layout,
 				qfv_devfuncs_t *dfunc, VkCommandBuffer cmd)
 {
 	dfunc->vkCmdPushConstants (cmd, layout, VK_SHADER_STAGE_FRAGMENT_BIT,
-							   0, sizeof (fragconst_t), fragconst);
+							   64, sizeof (fragconst_t), fragconst);//FIXME 64
 }
 
 static void
@@ -1259,6 +1259,15 @@ Vulkan_DrawSky (vulkan_ctx_t *ctx)
 	fragconst_t frag_constants = { time: vr_data.realtime };
 	push_fragconst (&frag_constants, bctx->layout, dfunc,
 					bframe->cmdSet.a[QFV_bspTranslucent]);
+	bind_view (qfv_bsp_texture, ctx->default_black->view, bframe,
+			   bframe->cmdSet.a[QFV_bspTranslucent],//FIXME
+			   bctx->layout, dfunc);
+	bind_view (qfv_bsp_glowmap, ctx->default_black->view, bframe,
+			   bframe->cmdSet.a[QFV_bspTranslucent],//FIXME
+			   bctx->layout, dfunc);
+	bind_view (qfv_bsp_lightmap, ctx->default_black->view, bframe,
+			   bframe->cmdSet.a[QFV_bspTranslucent],//FIXME
+			   bctx->layout, dfunc);
 	for (is = bctx->sky_chain; is; is = is->tex_chain) {
 		surf = is->surface;
 		if (tex != surf->texinfo->texture->render) {

From 9229b67633cf2308a78d211c0547f9b926dcbaf4 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 24 Feb 2021 16:27:56 +0900
Subject: [PATCH 1439/1519] [vulkan] Clean up the new render pass and
 framebuffers

---
 include/QF/Vulkan/qf_alias.h                   |  2 +-
 libs/video/renderer/vid_render_vulkan.c        |  2 ++
 libs/video/renderer/vulkan/vulkan_draw.c       |  1 -
 libs/video/renderer/vulkan/vulkan_vid_common.c | 17 ++++++++++++++---
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/include/QF/Vulkan/qf_alias.h b/include/QF/Vulkan/qf_alias.h
index 5f3964a2b..7cd5b5bad 100644
--- a/include/QF/Vulkan/qf_alias.h
+++ b/include/QF/Vulkan/qf_alias.h
@@ -1,7 +1,7 @@
 /*
 	qf_alias.h
 
-	Vulkan specific brush model stuff
+	Vulkan specific alias model stuff
 
 	Copyright (C) 2012 Bill Currie <bill@taniwha.org>
 	Copyright (C) 2021 Bill Currie <bill@taniwha.org>
diff --git a/libs/video/renderer/vid_render_vulkan.c b/libs/video/renderer/vid_render_vulkan.c
index 84f7b41f9..9893c08da 100644
--- a/libs/video/renderer/vid_render_vulkan.c
+++ b/libs/video/renderer/vid_render_vulkan.c
@@ -607,6 +607,8 @@ vulkan_vid_render_shutdown (void)
 	Vulkan_Alias_Shutdown (vulkan_ctx);
 	Mod_ClearAll ();
 	Vulkan_Texture_Shutdown (vulkan_ctx);
+	Vulkan_DestroyFramebuffers (vulkan_ctx);
+	Vulkan_DestroyRenderPass (vulkan_ctx);
 	Vulkan_Shutdown_Common (vulkan_ctx);
 }
 
diff --git a/libs/video/renderer/vulkan/vulkan_draw.c b/libs/video/renderer/vulkan/vulkan_draw.c
index 2ab8bd05a..4b962edd6 100644
--- a/libs/video/renderer/vulkan/vulkan_draw.c
+++ b/libs/video/renderer/vulkan/vulkan_draw.c
@@ -718,7 +718,6 @@ Vulkan_FlushText (vulkan_ctx_t *ctx)
 		VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT
 		| VK_COMMAND_BUFFER_USAGE_RENDER_PASS_CONTINUE_BIT, &inherit,
 	};
-	printf ("Vulkan_FlushText: %p %p\n", inherit.renderPass, inherit.framebuffer);
 	dfunc->vkBeginCommandBuffer (cmd, &beginInfo);
 
 	dfunc->vkCmdBindPipeline (cmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c
index 903dc8d19..98fec5945 100644
--- a/libs/video/renderer/vulkan/vulkan_vid_common.c
+++ b/libs/video/renderer/vulkan/vulkan_vid_common.c
@@ -192,9 +192,6 @@ Vulkan_Shutdown_Common (vulkan_ctx_t *ctx)
 	if (ctx->frames.size) {
 		Vulkan_DestroyFrames (ctx);
 	}
-	if (ctx->renderpass) {
-		Vulkan_DestroyRenderPass (ctx);
-	}
 	if (ctx->swapchain) {
 		QFV_DestroySwapchain (ctx->swapchain);
 	}
@@ -332,6 +329,10 @@ Vulkan_CreateRenderPass (vulkan_ctx_t *ctx)
 void
 Vulkan_DestroyRenderPass (vulkan_ctx_t *ctx)
 {
+	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	dfunc->vkDestroyRenderPass (device->dev, ctx->renderpass, 0);
 }
 
 VkPipeline
@@ -554,4 +555,14 @@ Vulkan_CreateFramebuffers (vulkan_ctx_t *ctx)
 void
 Vulkan_DestroyFramebuffers (vulkan_ctx_t *ctx)
 {
+	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	for (size_t i = 0; i < ctx->attachment_views->size; i++) {
+		dfunc->vkDestroyImageView (device->dev, ctx->attachment_views->a[i], 0);
+	}
+	for (size_t i = 0; i < ctx->attachment_images->size; i++) {
+		dfunc->vkDestroyImage (device->dev, ctx->attachment_images->a[i], 0);
+	}
+	dfunc->vkFreeMemory (device->dev, ctx->attachmentMemory, 0);
 }

From 10a1b99a92a9d83caee473e188d16b71a4f8ba9e Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 24 Feb 2021 19:58:31 +0900
Subject: [PATCH 1440/1519] [vulkan] Implement lighting and compose passes

Lighting doesn't actually do lights yet, but it's producing pixels.
Translucent seems to be working (2d draw uses it), and compose seems to
be working.
---
 include/QF/Vulkan/funclist.h                  |   1 +
 include/QF/Vulkan/qf_compose.h                |  62 ++++
 include/QF/Vulkan/qf_lighting.h               |  65 +++++
 include/vid_vulkan.h                          |   5 +
 libs/video/renderer/Makemodule.am             |  12 +
 libs/video/renderer/vid_render_vulkan.c       |   9 +
 libs/video/renderer/vulkan/deferred.plist     |  32 ++-
 libs/video/renderer/vulkan/qfpipeline.plist   | 271 +++++++++++++++++-
 libs/video/renderer/vulkan/shader.c           |   6 +
 .../video/renderer/vulkan/shader/compose.frag |  19 ++
 .../renderer/vulkan/shader/lighting.frag      |  33 +++
 libs/video/renderer/vulkan/vkparse.c          |   2 +
 libs/video/renderer/vulkan/vulkan_alias.c     |   3 +-
 libs/video/renderer/vulkan/vulkan_bsp.c       |  12 +
 libs/video/renderer/vulkan/vulkan_compose.c   | 175 +++++++++++
 libs/video/renderer/vulkan/vulkan_lighting.c  | 202 +++++++++++++
 .../video/renderer/vulkan/vulkan_vid_common.c |  50 ++++
 17 files changed, 930 insertions(+), 29 deletions(-)
 create mode 100644 include/QF/Vulkan/qf_compose.h
 create mode 100644 include/QF/Vulkan/qf_lighting.h
 create mode 100644 libs/video/renderer/vulkan/shader/compose.frag
 create mode 100644 libs/video/renderer/vulkan/shader/lighting.frag
 create mode 100644 libs/video/renderer/vulkan/vulkan_compose.c
 create mode 100644 libs/video/renderer/vulkan/vulkan_lighting.c

diff --git a/include/QF/Vulkan/funclist.h b/include/QF/Vulkan/funclist.h
index a1601f814..e4a21d52a 100644
--- a/include/QF/Vulkan/funclist.h
+++ b/include/QF/Vulkan/funclist.h
@@ -179,6 +179,7 @@ DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdSetScissor)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdBindVertexBuffers)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdBindIndexBuffer)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdBindDescriptorSets)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdDraw)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdDrawIndexed)
 
 #undef DEVICE_LEVEL_VULKAN_FUNCTION
diff --git a/include/QF/Vulkan/qf_compose.h b/include/QF/Vulkan/qf_compose.h
new file mode 100644
index 000000000..f8fd497a1
--- /dev/null
+++ b/include/QF/Vulkan/qf_compose.h
@@ -0,0 +1,62 @@
+/*
+	qf_compose.h
+
+	Vulkan compose pass
+
+	Copyright (C) 2021 Bill Currie <bill@taniwha.org>
+
+	Author: Bill Currie <bill@taniwha.org>
+	Date: 2021/2/24
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifndef __QF_Vulkan_qf_compose_h
+#define __QF_Vulkan_qf_compose_h
+
+#include "QF/darray.h"
+#include "QF/model.h"
+#include "QF/modelgen.h"
+#include "QF/Vulkan/qf_vid.h"
+#include "QF/Vulkan/command.h"
+
+#define COMPOSE_IMAGE_INFOS 2
+
+typedef struct composeframe_s {
+	VkCommandBuffer cmd;
+	VkDescriptorImageInfo imageInfo[COMPOSE_IMAGE_INFOS];
+	VkWriteDescriptorSet descriptors[COMPOSE_IMAGE_INFOS];
+} composeframe_t;
+
+typedef struct composeframeset_s
+    DARRAY_TYPE (composeframe_t) composeframeset_t;
+
+typedef struct composectx_s {
+	composeframeset_t frames;
+	VkPipeline   pipeline;
+	VkPipelineLayout layout;
+} composectx_t;
+
+struct vulkan_ctx_s;
+
+void Vulkan_Compose_Init (struct vulkan_ctx_s *ctx);
+void Vulkan_Compose_Shutdown (struct vulkan_ctx_s *ctx);
+void Vulkan_Compose_Draw (struct vulkan_ctx_s *ctx);
+
+#endif//__QF_Vulkan_qf_compose_h
diff --git a/include/QF/Vulkan/qf_lighting.h b/include/QF/Vulkan/qf_lighting.h
new file mode 100644
index 000000000..d2cee31ac
--- /dev/null
+++ b/include/QF/Vulkan/qf_lighting.h
@@ -0,0 +1,65 @@
+/*
+	qf_lighting.h
+
+	Vulkan lighting pass
+
+	Copyright (C) 2021 Bill Currie <bill@taniwha.org>
+
+	Author: Bill Currie <bill@taniwha.org>
+	Date: 2021/2/23
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifndef __QF_Vulkan_qf_lighting_h
+#define __QF_Vulkan_qf_lighting_h
+
+#include "QF/darray.h"
+#include "QF/model.h"
+#include "QF/modelgen.h"
+#include "QF/Vulkan/qf_vid.h"
+#include "QF/Vulkan/command.h"
+
+#define LIGHTING_BUFFER_INFOS 1
+#define LIGHTING_IMAGE_INFOS 3
+
+typedef struct lightingframe_s {
+	VkCommandBuffer cmd;
+	VkDescriptorBufferInfo bufferInfo[LIGHTING_BUFFER_INFOS];
+	VkDescriptorImageInfo imageInfo[LIGHTING_IMAGE_INFOS];
+	VkWriteDescriptorSet descriptors[LIGHTING_BUFFER_INFOS
+									 + LIGHTING_IMAGE_INFOS];
+} lightingframe_t;
+
+typedef struct lightingframeset_s
+    DARRAY_TYPE (lightingframe_t) lightingframeset_t;
+
+typedef struct lightingctx_s {
+	lightingframeset_t frames;
+	VkPipeline   pipeline;
+	VkPipelineLayout layout;
+} lightingctx_t;
+
+struct vulkan_ctx_s;
+
+void Vulkan_Lighting_Init (struct vulkan_ctx_s *ctx);
+void Vulkan_Lighting_Shutdown (struct vulkan_ctx_s *ctx);
+void Vulkan_Lighting_Draw (struct vulkan_ctx_s *ctx);
+
+#endif//__QF_Vulkan_qf_lighting_h
diff --git a/include/vid_vulkan.h b/include/vid_vulkan.h
index a672f02d1..080b8079f 100644
--- a/include/vid_vulkan.h
+++ b/include/vid_vulkan.h
@@ -79,6 +79,11 @@ typedef struct vulkan_ctx_s {
 	struct aliasctx_s *alias_context;
 	struct bspctx_s *bsp_context;
 	struct drawctx_s *draw_context;
+	struct lightingctx_s *lighting_context;
+	struct composectx_s *compose_context;
+
+	VkBuffer    quad_buffer;
+	VkDeviceMemory quad_memory;
 
 	VkCommandPool cmdpool;
 	VkCommandBuffer cmdbuffer;
diff --git a/libs/video/renderer/Makemodule.am b/libs/video/renderer/Makemodule.am
index 93f6a51b4..8789de037 100644
--- a/libs/video/renderer/Makemodule.am
+++ b/libs/video/renderer/Makemodule.am
@@ -240,7 +240,9 @@ libs_video_renderer_vid_render_vulkan_la_SOURCES = \
 	libs/video/renderer/vulkan/vkparse.c \
 	libs/video/renderer/vulkan/vulkan_alias.c \
 	libs/video/renderer/vulkan/vulkan_bsp.c \
+	libs/video/renderer/vulkan/vulkan_compose.c \
 	libs/video/renderer/vulkan/vulkan_draw.c \
+	libs/video/renderer/vulkan/vulkan_lighting.c \
 	libs/video/renderer/vulkan/vulkan_lightmap.c \
 	libs/video/renderer/vulkan/vulkan_main.c \
 	libs/video/renderer/vulkan/vulkan_matrices.c \
@@ -285,6 +287,10 @@ bsp_gbuff_src = $(vkshaderpath)/bsp_gbuf.frag
 bsp_gbuff_c = $(vkshaderpath)/bsp_gbuf.frag.spvc
 bsp_skyf_src = $(vkshaderpath)/bsp_sky.frag
 bsp_skyf_c = $(vkshaderpath)/bsp_sky.frag.spvc
+lightingf_src = $(vkshaderpath)/lighting.frag
+lightingf_c = $(vkshaderpath)/lighting.frag.spvc
+composef_src = $(vkshaderpath)/compose.frag
+composef_c = $(vkshaderpath)/compose.frag.spvc
 aliasv_src = $(vkshaderpath)/alias.vert
 aliasv_c = $(vkshaderpath)/alias.vert.spvc
 aliasf_src = $(vkshaderpath)/alias.frag
@@ -316,6 +322,10 @@ $(bsp_gbuff_c): $(bsp_gbuff_src)
 
 $(bsp_skyf_c): $(bsp_skyf_src)
 
+$(lightingf_c): $(lightingf_src)
+
+$(composef_c): $(composef_src)
+
 $(aliasv_c): $(aliasv_src)
 
 $(alias_depth_c): $(alias_depth_src)
@@ -338,6 +348,8 @@ vkshader_c = \
 	$(bsp_gbufg_c) \
 	$(bsp_gbuff_c) \
 	$(bsp_skyf_c) \
+	$(lightingf_c) \
+	$(composef_c) \
 	$(aliasv_c) \
 	$(alias_depth_c) \
 	$(aliasf_c) \
diff --git a/libs/video/renderer/vid_render_vulkan.c b/libs/video/renderer/vid_render_vulkan.c
index 9893c08da..059250fff 100644
--- a/libs/video/renderer/vid_render_vulkan.c
+++ b/libs/video/renderer/vid_render_vulkan.c
@@ -38,7 +38,9 @@
 
 #include "QF/Vulkan/qf_alias.h"
 #include "QF/Vulkan/qf_bsp.h"
+#include "QF/Vulkan/qf_compose.h"
 #include "QF/Vulkan/qf_draw.h"
+#include "QF/Vulkan/qf_lighting.h"
 #include "QF/Vulkan/qf_lightmap.h"
 #include "QF/Vulkan/qf_main.h"
 #include "QF/Vulkan/qf_particles.h"
@@ -98,6 +100,8 @@ vulkan_R_Init (void)
 	Vulkan_Bsp_Init (vulkan_ctx);
 	Vulkan_Draw_Init (vulkan_ctx);
 	Vulkan_Particles_Init (vulkan_ctx);
+	Vulkan_Lighting_Init (vulkan_ctx);
+	Vulkan_Compose_Init (vulkan_ctx);
 
 	Sys_Printf ("R_Init %p %d", vulkan_ctx->swapchain->swapchain,
 				vulkan_ctx->swapchain->numImages);
@@ -140,6 +144,9 @@ vulkan_R_RenderFrame (SCR_Func scr_3dfunc, SCR_Func *scr_funcs)
 
 	Vulkan_FlushText (vulkan_ctx);
 
+	Vulkan_Lighting_Draw (vulkan_ctx);
+	Vulkan_Compose_Draw (vulkan_ctx);
+
 	VkCommandBufferBeginInfo beginInfo
 		= { VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO };
 	VkRenderPassBeginInfo renderPassInfo = {
@@ -602,6 +609,8 @@ vulkan_vid_render_shutdown (void)
 	QFV_DeviceWaitIdle (device);
 	df->vkDestroyFence (dev, vulkan_ctx->fence, 0);
 	df->vkDestroyCommandPool (dev, vulkan_ctx->cmdpool, 0);
+	Vulkan_Compose_Shutdown (vulkan_ctx);
+	Vulkan_Lighting_Shutdown (vulkan_ctx);
 	Vulkan_Draw_Shutdown (vulkan_ctx);
 	Vulkan_Bsp_Shutdown (vulkan_ctx);
 	Vulkan_Alias_Shutdown (vulkan_ctx);
diff --git a/libs/video/renderer/vulkan/deferred.plist b/libs/video/renderer/vulkan/deferred.plist
index c03c30625..0245906da 100644
--- a/libs/video/renderer/vulkan/deferred.plist
+++ b/libs/video/renderer/vulkan/deferred.plist
@@ -179,7 +179,7 @@
 			{
 				format = $properties.images.depth.format;
 				samples = 1;
-				loadOp = dont_care;
+				loadOp = clear;
 				storeOp = dont_care;
 				stencilLoadOp = dont_care;
 				stencilStoreOp = dont_care;
@@ -238,14 +238,14 @@
 			},
 		);
 		subpasses = (
-			{	// depth
+			{	// 0 depth
 				pipelineBindPoint = graphics;
 				depthStencilAttachment = {
 					attachment = 0;
 					layout = depth_stencil_attachment_optimal;
 				};
 			},
-			{	// g-buffer generation
+			{	// 1 g-buffer generation
 				pipelineBindPoint = graphics;
 				colorAttachments = (
 					{	// color
@@ -261,8 +261,9 @@
 					attachment = 0;
 					layout = depth_stencil_attachment_optimal;
 				};
+				preserveAttachments = (4);
 			},
-			{	// lighting
+			{	// 2 lighting
 				pipelineBindPoint = graphics;
 				inputAttachments = (
 					{	// depth
@@ -284,8 +285,9 @@
 						layout = color_attachment_optimal;
 					},
 				);
+				preserveAttachments = (4);
 			},
-			{	// translucent
+			{	// 3 translucent
 				pipelineBindPoint = graphics;
 				colorAttachments = (
 					{	// translucent
@@ -293,8 +295,9 @@
 						layout = color_attachment_optimal;
 					},
 				);
+				preserveAttachments = (0, 1, 2, 3);
 			},
-			{	// compose
+			{	// 4 compose
 				pipelineBindPoint = graphics;
 				inputAttachments = (
 					{	// opaque
@@ -312,12 +315,13 @@
 						layout = color_attachment_optimal;
 					},
 				);
+				preserveAttachments = (0, 1, 2);
 			},
 		);
 		dependencies = (
 			{
-				srcSubpass = 0;
-				dstSubpass = 1;
+				srcSubpass = 0;	// depth
+				dstSubpass = 1; // g-buffer
 				srcStageMask = color_attachment_output;
 				dstStageMask = fragment_shader;
 				srcAccessMask = color_attachment_write;
@@ -325,8 +329,8 @@
 				dependencyFlags = by_region;
 			},
 			{
-				srcSubpass = 1;
-				dstSubpass = 2;
+				srcSubpass = 1;	// g-buffer
+				dstSubpass = 2;	// lighting
 				srcStageMask = color_attachment_output;
 				dstStageMask = fragment_shader;
 				srcAccessMask = color_attachment_write;
@@ -334,8 +338,8 @@
 				dependencyFlags = by_region;
 			},
 			{
-				srcSubpass = 2;
-				dstSubpass = 4;
+				srcSubpass = 2;	// lighting
+				dstSubpass = 4;	// compose
 				srcStageMask = color_attachment_output;
 				dstStageMask = fragment_shader;
 				srcAccessMask = color_attachment_write;
@@ -343,8 +347,8 @@
 				dependencyFlags = by_region;
 			},
 			{
-				srcSubpass = 3;
-				dstSubpass = 4;
+				srcSubpass = 3;	// translucent
+				dstSubpass = 4;	// compose
 				srcStageMask = color_attachment_output;
 				dstStageMask = fragment_shader;
 				srcAccessMask = color_attachment_write;
diff --git a/libs/video/renderer/vulkan/qfpipeline.plist b/libs/video/renderer/vulkan/qfpipeline.plist
index 03e200fc7..825f71a59 100644
--- a/libs/video/renderer/vulkan/qfpipeline.plist
+++ b/libs/video/renderer/vulkan/qfpipeline.plist
@@ -77,6 +77,36 @@
 				},
 			);
 		};
+		lighting_attach_pool = {
+			flags = 0;
+			maxSets = $frames.size;
+			bindings = (
+				{
+					type = input_attachment;
+					descriptorCount = "3z * $frames.size";
+				},
+			);
+		};
+		lighting_lights_pool = {
+			flags = 0;
+			maxSets = $frames.size;
+			bindings = (
+				{
+					type = uniform_buffer;
+					descriptorCount = $frames.size;
+				},
+			);
+		};
+		compose_attach_pool = {
+			flags = 0;
+			maxSets = $frames.size;
+			bindings = (
+				{
+					type = input_attachment;
+					descriptorCount = "2z * $frames.size";
+				},
+			);
+		};
 	};
 	setLayouts = {
 		twod_set = {
@@ -208,20 +238,51 @@
 				},
 			);
 		};
-		something = {
-			flags = 0;
+		lighting_attach = {
 			bindings = (
 				{
 					binding = 0;
-					descriptorType = sampled_image;
+					descriptorType = input_attachment;
 					descriptorCount = 1;
 					stageFlags = fragment;
 				},
 				{
 					binding = 1;
+					descriptorType = input_attachment;
+					descriptorCount = 1;
+					stageFlags = fragment;
+				},
+				{
+					binding = 2;
+					descriptorType = input_attachment;
+					descriptorCount = 1;
+					stageFlags = fragment;
+				},
+			);
+		};
+		lighting_lights = {
+			bindings = (
+				{
+					binding = 0;
 					descriptorType = uniform_buffer;
 					descriptorCount = 1;
-					stageFlags = vertex;
+					stageFlags = fragment;
+				},
+			);
+		};
+		compose_attach = {
+			bindings = (
+				{
+					binding = 0;
+					descriptorType = input_attachment;
+					descriptorCount = 1;
+					stageFlags = fragment;
+				},
+				{
+					binding = 1;
+					descriptorType = input_attachment;
+					descriptorCount = 1;
+					stageFlags = fragment;
 				},
 			);
 		};
@@ -261,15 +322,11 @@
 				},
 			);
 		};
-		something = {
-			setLayouts = (something);
-			pushConstantRanges = (
-				{
-					stageFlags = fragment;
-					offset = 0;
-					size = "4 * 4";
-				},
-			);
+		lighting_layout = {
+			setLayouts = (lighting_attach, lighting_lights);
+		};
+		compose_layout = {
+			setLayouts = (compose_attach);
 		};
 	};
 	pipelines = {
@@ -758,6 +815,194 @@
 			layout = twod_layout;
 			//renderPass = renderpass;
 		};
+		lighting = {
+			subpass = 2;
+			stages = (
+				{
+					stage = vertex;
+					name = main;
+					module = $builtin/passthrough.vert;
+				},
+				{
+					stage = fragment;
+					name = main;
+					module = $builtin/lighting.frag;
+				},
+			);
+			vertexInput = {
+				bindings = (
+					{
+						binding = 0;
+						stride = "4 * 4";
+						inputRate = vertex;
+					},
+				);
+				attributes = (
+					{
+						location = 0;
+						binding = 0;
+						format = r32g32b32a32_sfloat;
+						offset = 0;
+					},
+				);
+			};
+			inputAssembly = {
+				topology = triangle_strip;
+				primitiveRestartEnable = false;
+			};
+			viewport = {
+				viewports = (
+					{
+						x = 0; y = 0;
+						width = 640; height = 480;
+						minDepth = 0; maxDepth = 1;
+					}
+				);
+				scissors = (
+					{
+						offset = { x = 0; y = 0 };
+						extent = { width = 640; height = 480; };
+					},
+				);
+			};
+			rasterization = {
+				depthClampEnable = false;
+				rasterizerDiscardEnable = false;
+				polygonMode = fill;
+				cullMode = back;
+				frontFace = counter_clockwise;
+				depthBiasEnable = false;
+				lineWidth = 1;
+			};
+			multisample = {
+				rasterizationSamples = $msaaSamples;
+				sampleShadingEnable = false;
+				minSampleShading = 0.5f;
+				alphaToCoverageEnable = false;
+				alphaToOneEnable = false;
+			};
+			depthStencil = {
+				depthTestEnable = false;
+				depthWriteEnable = false;
+				depthCompareOp = less_or_equal;
+				depthBoundsTestEnable = false;
+				stencilTestEnable = false;
+			};
+			colorBlend = {
+				logicOpEnable = false;
+				attachments = (
+					{
+						blendEnable = false;
+						srcColorBlendFactor = src_alpha;
+						dstColorBlendFactor = one_minus_src_alpha;
+						colorBlendOp = add;
+						srcAlphaBlendFactor = src_alpha;
+						dstAlphaBlendFactor = one_minus_src_alpha;
+						alphaBlendOp = add;
+						colorWriteMask = r|g|b|a;
+					},
+				);
+			};
+			dynamic = {
+				dynamicState = ( viewport, scissor );
+			};
+			layout = lighting_layout;
+			//renderPass = renderpass;
+		};
+		compose = {
+			subpass = 4;
+			stages = (
+				{
+					stage = vertex;
+					name = main;
+					module = $builtin/passthrough.vert;
+				},
+				{
+					stage = fragment;
+					name = main;
+					module = $builtin/compose.frag;
+				},
+			);
+			vertexInput = {
+				bindings = (
+					{
+						binding = 0;
+						stride = "4 * 4";
+						inputRate = vertex;
+					},
+				);
+				attributes = (
+					{
+						location = 0;
+						binding = 0;
+						format = r32g32b32a32_sfloat;
+						offset = 0;
+					},
+				);
+			};
+			inputAssembly = {
+				topology = triangle_strip;
+				primitiveRestartEnable = false;
+			};
+			viewport = {
+				viewports = (
+					{
+						x = 0; y = 0;
+						width = 640; height = 480;
+						minDepth = 0; maxDepth = 1;
+					}
+				);
+				scissors = (
+					{
+						offset = { x = 0; y = 0 };
+						extent = { width = 640; height = 480; };
+					},
+				);
+			};
+			rasterization = {
+				depthClampEnable = false;
+				rasterizerDiscardEnable = false;
+				polygonMode = fill;
+				cullMode = back;
+				frontFace = counter_clockwise;
+				depthBiasEnable = false;
+				lineWidth = 1;
+			};
+			multisample = {
+				rasterizationSamples = $msaaSamples;
+				sampleShadingEnable = false;
+				minSampleShading = 0.5f;
+				alphaToCoverageEnable = false;
+				alphaToOneEnable = false;
+			};
+			depthStencil = {
+				depthTestEnable = false;
+				depthWriteEnable = false;
+				depthCompareOp = less_or_equal;
+				depthBoundsTestEnable = false;
+				stencilTestEnable = false;
+			};
+			colorBlend = {
+				logicOpEnable = false;
+				attachments = (
+					{
+						blendEnable = false;
+						srcColorBlendFactor = src_alpha;
+						dstColorBlendFactor = one_minus_src_alpha;
+						colorBlendOp = add;
+						srcAlphaBlendFactor = src_alpha;
+						dstAlphaBlendFactor = one_minus_src_alpha;
+						alphaBlendOp = add;
+						colorWriteMask = r|g|b|a;
+					},
+				);
+			};
+			dynamic = {
+				dynamicState = ( viewport, scissor );
+			};
+			layout = compose_layout;
+			//renderPass = renderpass;
+		};
 	};
 	renderpass = {
 		attachments = (
diff --git a/libs/video/renderer/vulkan/shader.c b/libs/video/renderer/vulkan/shader.c
index 4063e6f33..4168d9b63 100644
--- a/libs/video/renderer/vulkan/shader.c
+++ b/libs/video/renderer/vulkan/shader.c
@@ -73,6 +73,10 @@ static
 static
 #include "libs/video/renderer/vulkan/shader/bsp_sky.frag.spvc"
 static
+#include "libs/video/renderer/vulkan/shader/lighting.frag.spvc"
+static
+#include "libs/video/renderer/vulkan/shader/compose.frag.spvc"
+static
 #include "libs/video/renderer/vulkan/shader/alias.vert.spvc"
 static
 #include "libs/video/renderer/vulkan/shader/alias_depth.vert.spvc"
@@ -101,6 +105,8 @@ static shaderdata_t builtin_shaders[] = {
 	{ "bsp_gbuf.geom", bsp_gbuf_geom, sizeof (bsp_gbuf_geom) },
 	{ "bsp_gbuf.frag", bsp_gbuf_frag, sizeof (bsp_gbuf_frag) },
 	{ "bsp_sky.frag", bsp_sky_frag, sizeof (bsp_sky_frag) },
+	{ "lighting.frag", lighting_frag, sizeof (lighting_frag) },
+	{ "compose.frag", compose_frag, sizeof (compose_frag) },
 	{ "alias.vert", alias_vert, sizeof (alias_vert) },
 	{ "alias_depth.vert", alias_depth_vert, sizeof (alias_depth_vert) },
 	{ "alias.frag", alias_frag, sizeof (alias_frag) },
diff --git a/libs/video/renderer/vulkan/shader/compose.frag b/libs/video/renderer/vulkan/shader/compose.frag
new file mode 100644
index 000000000..39ac94845
--- /dev/null
+++ b/libs/video/renderer/vulkan/shader/compose.frag
@@ -0,0 +1,19 @@
+#version 450
+
+layout (input_attachment_index = 0, set = 0, binding = 0) uniform subpassInput opaque;
+layout (input_attachment_index = 1, set = 0, binding = 1) uniform subpassInput translucent;
+
+layout (location = 0) out vec4 frag_color;
+
+void
+main (void)
+{
+	vec3        o;
+	vec4        t;
+	vec3        c;
+
+	o = subpassLoad (opaque).rgb;
+	t = subpassLoad (translucent);
+	c = mix (o, t.rgb, t.a);
+	frag_color = vec4 (c, 1);
+}
diff --git a/libs/video/renderer/vulkan/shader/lighting.frag b/libs/video/renderer/vulkan/shader/lighting.frag
new file mode 100644
index 000000000..555682645
--- /dev/null
+++ b/libs/video/renderer/vulkan/shader/lighting.frag
@@ -0,0 +1,33 @@
+#version 450
+
+layout (input_attachment_index = 0, set = 0, binding = 0) uniform subpassInput depth;
+layout (input_attachment_index = 1, set = 0, binding = 1) uniform subpassInput color;
+layout (input_attachment_index = 2, set = 0, binding = 2) uniform subpassInput normal;
+
+struct LightData {
+	vec3        color;
+	float       dist;
+	vec3        position;
+	int         type;
+	vec3        direction;
+	float       cone;
+};
+
+layout (constant_id = 0) const int MaxLights = 8;
+/*layout (set = 1, binding = 0) uniform Lights {
+	int         lightCount;
+	LightData   lights[MaxLights];
+};*/
+
+layout (location = 0) out vec4 frag_color;
+
+void
+main (void)
+{
+	float       d = subpassLoad (depth).r;
+	vec4        c;
+
+	//c = vec4 (d, d, d, 1);
+	c = vec4 (subpassLoad (color).rgb, 1);
+	frag_color = c;
+}
diff --git a/libs/video/renderer/vulkan/vkparse.c b/libs/video/renderer/vulkan/vkparse.c
index 72ec5abbb..de12d60c0 100644
--- a/libs/video/renderer/vulkan/vkparse.c
+++ b/libs/video/renderer/vulkan/vkparse.c
@@ -1259,6 +1259,8 @@ QFV_ParseImageSet (vulkan_ctx_t *ctx, plitem_t *item, plitem_t *properties)
 		dfunc->vkCreateImage (device->dev, &create.info[i], 0, &set->a[i]);
 
 		const char *name = PL_KeyAtIndex (item, i);
+		QFV_duSetObjectName (device, VK_OBJECT_TYPE_IMAGE, set->a[i],
+							 va (ctx->va_ctx, "image:%s", name));
 		name = va (ctx->va_ctx, "$"QFV_PROPERTIES".images.%s", name);
 		QFV_AddHandle (ctx->images, name, (uint64_t) set->a[i]);
 	}
diff --git a/libs/video/renderer/vulkan/vulkan_alias.c b/libs/video/renderer/vulkan/vulkan_alias.c
index 8468335c1..d3663d0df 100644
--- a/libs/video/renderer/vulkan/vulkan_alias.c
+++ b/libs/video/renderer/vulkan/vulkan_alias.c
@@ -176,8 +176,7 @@ alias_begin_subpass (QFV_AliasSubpass subpass, VkPipeline pipeline,
 	};
 	dfunc->vkBeginCommandBuffer (cmd, &beginInfo);
 
-	dfunc->vkCmdBindPipeline (cmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
-							  pipeline);
+	dfunc->vkCmdBindPipeline (cmd, VK_PIPELINE_BIND_POINT_GRAPHICS, pipeline);
 	//VkDescriptorSet sets[] = {
 	//	aframe->descriptors[0].dstSet,
 	//	aframe->descriptors[1].dstSet,
diff --git a/libs/video/renderer/vulkan/vulkan_bsp.c b/libs/video/renderer/vulkan/vulkan_bsp.c
index 8b33cebb3..046ba6c0a 100644
--- a/libs/video/renderer/vulkan/vulkan_bsp.c
+++ b/libs/video/renderer/vulkan/vulkan_bsp.c
@@ -827,6 +827,15 @@ draw_elechain (elechain_t *ec, VkPipelineLayout layout, qfv_devfuncs_t *dfunc,
 			continue;
 		dfunc->vkCmdDrawIndexed (cmd, el->index_count, 1, el->first_index,
 								 0, 0);
+	}
+}
+
+static void
+reset_elechain (elechain_t *ec)
+{
+	elements_t *el;
+
+	for (el = ec->elements; el; el = el->next) {
 		el->first_index = 0;
 		el->index_count = 0;
 	}
@@ -1167,6 +1176,7 @@ Vulkan_DrawWorld (vulkan_ctx_t *ctx)
 						   bframe->cmdSet.a[QFV_bspDepth]);
 			draw_elechain (ec, bctx->layout, dfunc,
 						   bframe->cmdSet.a[QFV_bspGBuffer]);
+			reset_elechain (ec);
 		}
 		tex->elechain = 0;
 		tex->elechain_tail = &tex->elechain;
@@ -1280,6 +1290,7 @@ Vulkan_DrawSky (vulkan_ctx_t *ctx)
 				for (ec = tex->elechain; ec; ec = ec->next) {
 					draw_elechain (ec, bctx->layout, dfunc,//FIXME
 								   bframe->cmdSet.a[QFV_bspTranslucent]);
+					reset_elechain (ec);
 				}
 				tex->elechain = 0;
 				tex->elechain_tail = &tex->elechain;
@@ -1295,6 +1306,7 @@ Vulkan_DrawSky (vulkan_ctx_t *ctx)
 		for (ec = tex->elechain; ec; ec = ec->next) {
 			draw_elechain (ec, bctx->layout, dfunc,//FIXME
 						   bframe->cmdSet.a[QFV_bspTranslucent]);
+			reset_elechain (ec);
 		}
 		tex->elechain = 0;
 		tex->elechain_tail = &tex->elechain;
diff --git a/libs/video/renderer/vulkan/vulkan_compose.c b/libs/video/renderer/vulkan/vulkan_compose.c
new file mode 100644
index 000000000..e2748dcb3
--- /dev/null
+++ b/libs/video/renderer/vulkan/vulkan_compose.c
@@ -0,0 +1,175 @@
+/*
+	vulkan_compose.c
+
+	Vulkan compose pass pipeline
+
+	Copyright (C) 2021       Bill Currie <bill@taniwha.org>
+
+	Author: Bill Currie <bill@taniwha.org>
+	Date: 2021/2/23
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#include <stdlib.h>
+
+#include "qfalloca.h"
+
+#include "QF/sys.h"
+
+#include "QF/Vulkan/qf_compose.h"
+#include "QF/Vulkan/debug.h"
+#include "QF/Vulkan/descriptor.h"
+#include "QF/Vulkan/device.h"
+#include "QF/Vulkan/image.h"
+
+#include "r_internal.h"
+#include "vid_vulkan.h"
+
+void
+Vulkan_Compose_Draw (vulkan_ctx_t *ctx)
+{
+	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	composectx_t *cctx = ctx->compose_context;
+	__auto_type frame = &ctx->frames.a[ctx->curFrame];
+	composeframe_t *cframe = &cctx->frames.a[ctx->curFrame];
+	VkCommandBuffer cmd = cframe->cmd;
+
+	DARRAY_APPEND (&frame->cmdSets[QFV_passCompose], cmd);
+
+	dfunc->vkResetCommandBuffer (cmd, 0);
+	VkCommandBufferInheritanceInfo inherit = {
+		VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_INFO, 0,
+		ctx->renderpass, QFV_passCompose,
+		frame->framebuffer,
+		0, 0, 0,
+	};
+	VkCommandBufferBeginInfo beginInfo = {
+		VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, 0,
+		VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT
+		| VK_COMMAND_BUFFER_USAGE_RENDER_PASS_CONTINUE_BIT, &inherit,
+	};
+	dfunc->vkBeginCommandBuffer (cmd, &beginInfo);
+
+	dfunc->vkCmdBindPipeline (cmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
+							  cctx->pipeline);
+
+	cframe->imageInfo[0].imageView = ctx->attachment_views->a[3];
+	cframe->imageInfo[1].imageView = ctx->attachment_views->a[4];
+	dfunc->vkUpdateDescriptorSets (device->dev, 2, cframe->descriptors, 0, 0);
+
+	VkDescriptorSet sets[] = {
+		cframe->descriptors[0].dstSet,
+	};
+	dfunc->vkCmdBindDescriptorSets (cmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
+									cctx->layout, 0, 1, sets, 0, 0);
+
+	VkViewport  viewport = {0, 0, vid.width, vid.height, 0, 1};
+	VkRect2D    scissor = { {0, 0}, {vid.width, vid.height} };
+	dfunc->vkCmdSetViewport (cmd, 0, 1, &viewport);
+	dfunc->vkCmdSetScissor (cmd, 0, 1, &scissor);
+
+	VkDeviceSize offset = 0;
+	dfunc->vkCmdBindVertexBuffers (cmd, 0, 1, &ctx->quad_buffer, &offset);
+	dfunc->vkCmdDraw (cmd, 4, 1, 0, 0);
+
+	dfunc->vkEndCommandBuffer (cmd);
+}
+
+static VkDescriptorImageInfo base_image_info = {
+	0, 0, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL
+};
+static VkWriteDescriptorSet base_image_write = {
+	VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, 0, 0,
+	0, 0, 1,
+	VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT,
+	0, 0, 0
+};
+
+void
+Vulkan_Compose_Init (vulkan_ctx_t *ctx)
+{
+	qfv_device_t *device = ctx->device;
+
+	composectx_t *cctx = calloc (1, sizeof (composectx_t));
+	ctx->compose_context = cctx;
+
+	size_t      frames = ctx->frames.size;
+	DARRAY_INIT (&cctx->frames, frames);
+	DARRAY_RESIZE (&cctx->frames, frames);
+	cctx->frames.grow = 0;
+
+	cctx->pipeline = Vulkan_CreatePipeline (ctx, "compose");
+	cctx->layout = Vulkan_CreatePipelineLayout (ctx, "compose_layout");
+
+	__auto_type cmdSet = QFV_AllocCommandBufferSet (1, alloca);
+
+	__auto_type attach = QFV_AllocDescriptorSetLayoutSet (frames, alloca);
+	for (size_t i = 0; i < frames; i++) {
+		attach->a[i] = Vulkan_CreateDescriptorSetLayout (ctx,
+														 "compose_attach");
+	}
+	__auto_type attach_pool = Vulkan_CreateDescriptorPool (ctx,
+														"compose_attach_pool");
+
+	__auto_type attach_set = QFV_AllocateDescriptorSet (device, attach_pool,
+														attach);
+	for (size_t i = 0; i < frames; i++) {
+		__auto_type cframe = &cctx->frames.a[i];
+
+		QFV_AllocateCommandBuffers (device, ctx->cmdpool, 1, cmdSet);
+		cframe->cmd = cmdSet->a[0];
+
+		QFV_duSetObjectName (device, VK_OBJECT_TYPE_COMMAND_BUFFER,
+							 cframe->cmd, "cmd:compose");
+		for (int j = 0; j < COMPOSE_IMAGE_INFOS; j++) {
+			cframe->imageInfo[j] = base_image_info;
+			cframe->imageInfo[j].sampler = 0;
+			cframe->descriptors[j] = base_image_write;
+			cframe->descriptors[j].dstSet = attach_set->a[i];
+			cframe->descriptors[j].dstBinding = j;
+			cframe->descriptors[j].pImageInfo = &cframe->imageInfo[j];
+		}
+	}
+	free (attach_set);
+}
+
+void
+Vulkan_Compose_Shutdown (vulkan_ctx_t *ctx)
+{
+	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+	composectx_t *cctx = ctx->compose_context;
+
+	dfunc->vkDestroyPipeline (device->dev, cctx->pipeline, 0);
+	free (cctx->frames.a);
+	free (cctx);
+}
diff --git a/libs/video/renderer/vulkan/vulkan_lighting.c b/libs/video/renderer/vulkan/vulkan_lighting.c
new file mode 100644
index 000000000..604e7ff94
--- /dev/null
+++ b/libs/video/renderer/vulkan/vulkan_lighting.c
@@ -0,0 +1,202 @@
+/*
+	vulkan_lighting.c
+
+	Vulkan lighting pass pipeline
+
+	Copyright (C) 2021       Bill Currie <bill@taniwha.org>
+
+	Author: Bill Currie <bill@taniwha.org>
+	Date: 2021/2/23
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#include <stdlib.h>
+
+#include "qfalloca.h"
+
+#include "QF/sys.h"
+
+#include "QF/Vulkan/qf_lighting.h"
+#include "QF/Vulkan/debug.h"
+#include "QF/Vulkan/descriptor.h"
+#include "QF/Vulkan/device.h"
+#include "QF/Vulkan/image.h"
+
+#include "r_internal.h"
+#include "vid_vulkan.h"
+
+void
+Vulkan_Lighting_Draw (vulkan_ctx_t *ctx)
+{
+	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	lightingctx_t *lctx = ctx->lighting_context;
+	__auto_type cframe = &ctx->frames.a[ctx->curFrame];
+	lightingframe_t *lframe = &lctx->frames.a[ctx->curFrame];
+	VkCommandBuffer cmd = lframe->cmd;
+
+	DARRAY_APPEND (&cframe->cmdSets[QFV_passLighting], cmd);
+
+	dfunc->vkResetCommandBuffer (cmd, 0);
+	VkCommandBufferInheritanceInfo inherit = {
+		VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_INFO, 0,
+		ctx->renderpass, QFV_passLighting,
+		cframe->framebuffer,
+		0, 0, 0,
+	};
+	VkCommandBufferBeginInfo beginInfo = {
+		VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, 0,
+		VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT
+		| VK_COMMAND_BUFFER_USAGE_RENDER_PASS_CONTINUE_BIT, &inherit,
+	};
+	dfunc->vkBeginCommandBuffer (cmd, &beginInfo);
+
+	dfunc->vkCmdBindPipeline (cmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
+							  lctx->pipeline);
+
+	lframe->imageInfo[0].imageView = ctx->attachment_views->a[0];
+	lframe->imageInfo[1].imageView = ctx->attachment_views->a[1];
+	lframe->imageInfo[2].imageView = ctx->attachment_views->a[2];
+	dfunc->vkUpdateDescriptorSets (device->dev, 3, lframe->descriptors+1, 0, 0);
+
+	VkDescriptorSet sets[] = {
+		lframe->descriptors[1].dstSet,
+		lframe->descriptors[0].dstSet,
+	};
+	dfunc->vkCmdBindDescriptorSets (cmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
+									lctx->layout, 0, 2, sets, 0, 0);
+
+	VkViewport  viewport = {0, 0, vid.width, vid.height, 0, 1};
+	VkRect2D    scissor = { {0, 0}, {vid.width, vid.height} };
+	dfunc->vkCmdSetViewport (cmd, 0, 1, &viewport);
+	dfunc->vkCmdSetScissor (cmd, 0, 1, &scissor);
+
+	VkDeviceSize offset = 0;
+	dfunc->vkCmdBindVertexBuffers (cmd, 0, 1, &ctx->quad_buffer, &offset);
+	dfunc->vkCmdDraw (cmd, 4, 1, 0, 0);
+
+	dfunc->vkEndCommandBuffer (cmd);
+}
+
+static VkDescriptorBufferInfo base_buffer_info = {
+	0, 0, VK_WHOLE_SIZE
+};
+static VkDescriptorImageInfo base_image_info = {
+	0, 0, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL
+};
+static VkWriteDescriptorSet base_buffer_write = {
+	VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, 0, 0,
+	0, 0, 1,
+	VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER,
+	0, 0, 0
+};
+static VkWriteDescriptorSet base_image_write = {
+	VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, 0, 0,
+	0, 0, 1,
+	VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT,
+	0, 0, 0
+};
+
+void
+Vulkan_Lighting_Init (vulkan_ctx_t *ctx)
+{
+	qfv_device_t *device = ctx->device;
+
+	lightingctx_t *lctx = calloc (1, sizeof (lightingctx_t));
+	ctx->lighting_context = lctx;
+
+	size_t      frames = ctx->frames.size;
+	DARRAY_INIT (&lctx->frames, frames);
+	DARRAY_RESIZE (&lctx->frames, frames);
+	lctx->frames.grow = 0;
+
+	lctx->pipeline = Vulkan_CreatePipeline (ctx, "lighting");
+	lctx->layout = Vulkan_CreatePipelineLayout (ctx, "lighting_layout");
+
+	__auto_type cmdSet = QFV_AllocCommandBufferSet (1, alloca);
+
+	__auto_type attach = QFV_AllocDescriptorSetLayoutSet (frames, alloca);
+	__auto_type lights = QFV_AllocDescriptorSetLayoutSet (frames, alloca);
+	for (size_t i = 0; i < frames; i++) {
+		attach->a[i] = Vulkan_CreateDescriptorSetLayout (ctx,
+														 "lighting_attach");
+		lights->a[i] = Vulkan_CreateDescriptorSetLayout (ctx,
+														 "lighting_lights");
+	}
+	__auto_type attach_pool = Vulkan_CreateDescriptorPool (ctx,
+														"lighting_attach_pool");
+	__auto_type lights_pool = Vulkan_CreateDescriptorPool (ctx,
+														"lighting_lights_pool");
+
+	__auto_type attach_set = QFV_AllocateDescriptorSet (device, attach_pool,
+														attach);
+	__auto_type lights_set = QFV_AllocateDescriptorSet (device, lights_pool,
+														lights);
+	for (size_t i = 0; i < frames; i++) {
+		__auto_type lframe = &lctx->frames.a[i];
+
+		QFV_AllocateCommandBuffers (device, ctx->cmdpool, 1, cmdSet);
+		lframe->cmd = cmdSet->a[0];
+
+		QFV_duSetObjectName (device, VK_OBJECT_TYPE_COMMAND_BUFFER,
+							 lframe->cmd, "cmd:lighting");
+		for (int j = 0; j < LIGHTING_BUFFER_INFOS; j++) {
+			lframe->bufferInfo[j] = base_buffer_info;
+			lframe->descriptors[j] = base_buffer_write;
+			lframe->descriptors[j].dstSet = lights_set->a[i];
+			lframe->descriptors[j].dstBinding = j;
+			lframe->descriptors[j].pBufferInfo = &lframe->bufferInfo[j];
+		}
+		for (int j = 0; j < LIGHTING_IMAGE_INFOS; j++) {
+			lframe->imageInfo[j] = base_image_info;
+			lframe->imageInfo[j].sampler = 0;
+			int k = j + LIGHTING_BUFFER_INFOS;
+			lframe->descriptors[k] = base_image_write;
+			lframe->descriptors[k].dstSet = attach_set->a[i];
+			lframe->descriptors[k].dstBinding = j;
+			lframe->descriptors[k].pImageInfo = &lframe->imageInfo[j];
+		}
+	}
+	free (attach_set);
+	free (lights_set);
+}
+
+void
+Vulkan_Lighting_Shutdown (vulkan_ctx_t *ctx)
+{
+	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+	lightingctx_t *lctx = ctx->lighting_context;
+
+	dfunc->vkDestroyPipeline (device->dev, lctx->pipeline, 0);
+	free (lctx->frames.a);
+	free (lctx);
+}
diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c
index 98fec5945..909f26236 100644
--- a/libs/video/renderer/vulkan/vulkan_vid_common.c
+++ b/libs/video/renderer/vulkan/vulkan_vid_common.c
@@ -324,6 +324,53 @@ Vulkan_CreateRenderPass (vulkan_ctx_t *ctx)
 	item = qfv_load_renderpass (ctx, "clearValues");
 	QFV_ParseClearValues (ctx, item, ctx->renderpassDef);
 	printf ("renderpass: %p\n", ctx->renderpass);
+
+	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+	static float quad_vertices[] = {
+		-1, -1, 0, 1,
+		-1,  1, 0, 1,
+		 1, -1, 0, 1,
+		 1,  1, 0, 1,
+	};
+	ctx->quad_buffer = QFV_CreateBuffer (device, sizeof (quad_vertices),
+										 VK_BUFFER_USAGE_VERTEX_BUFFER_BIT
+										 | VK_BUFFER_USAGE_TRANSFER_DST_BIT);
+	ctx->quad_memory = QFV_AllocBufferMemory (device, ctx->quad_buffer,
+										VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT,
+										0, 0);
+	QFV_BindBufferMemory (device, ctx->quad_buffer, ctx->quad_memory, 0);
+
+	qfv_packet_t *packet = QFV_PacketAcquire (ctx->staging);
+	float      *verts = QFV_PacketExtend (packet, sizeof (quad_vertices));
+	memcpy (verts, quad_vertices, sizeof (quad_vertices));
+
+	VkBufferMemoryBarrier wr_barriers[] = {
+		{   VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER, 0,
+			0, VK_ACCESS_TRANSFER_WRITE_BIT,
+			VK_QUEUE_FAMILY_IGNORED, VK_QUEUE_FAMILY_IGNORED,
+			ctx->quad_buffer, 0, sizeof (quad_vertices) },
+	};
+	dfunc->vkCmdPipelineBarrier (packet->cmd,
+								 VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT,
+								 VK_PIPELINE_STAGE_TRANSFER_BIT,
+								 0, 0, 0, 1, wr_barriers, 0, 0);
+	VkBufferCopy copy_region[] = {
+		{ packet->offset, 0, sizeof (quad_vertices) },
+	};
+	dfunc->vkCmdCopyBuffer (packet->cmd, ctx->staging->buffer,
+							ctx->quad_buffer, 1, &copy_region[0]);
+	VkBufferMemoryBarrier rd_barriers[] = {
+		{   VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER, 0,
+			VK_ACCESS_TRANSFER_WRITE_BIT, VK_ACCESS_VERTEX_ATTRIBUTE_READ_BIT,
+			VK_QUEUE_FAMILY_IGNORED, VK_QUEUE_FAMILY_IGNORED,
+			ctx->quad_buffer, 0, sizeof (quad_vertices) },
+	};
+	dfunc->vkCmdPipelineBarrier (packet->cmd,
+								 VK_PIPELINE_STAGE_TRANSFER_BIT,
+								 VK_PIPELINE_STAGE_VERTEX_INPUT_BIT,
+								 0, 0, 0, 1, rd_barriers, 0, 0);
+	QFV_PacketSubmit (packet);
 }
 
 void
@@ -333,6 +380,9 @@ Vulkan_DestroyRenderPass (vulkan_ctx_t *ctx)
 	qfv_devfuncs_t *dfunc = device->funcs;
 
 	dfunc->vkDestroyRenderPass (device->dev, ctx->renderpass, 0);
+
+	dfunc->vkFreeMemory (device->dev, ctx->quad_memory, 0);
+	dfunc->vkDestroyBuffer (device->dev, ctx->quad_buffer, 0);
 }
 
 VkPipeline

From 6c1d6666b410596212a045284e77047b397bc201 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 24 Feb 2021 20:24:46 +0900
Subject: [PATCH 1441/1519] [vulkan] Actually write the alias g-buffer commands

It seems to help for some reason.
---
 libs/video/renderer/vulkan/qfpipeline.plist       | 6 ------
 libs/video/renderer/vulkan/shader/alias_gbuf.frag | 4 ++--
 libs/video/renderer/vulkan/vulkan_alias.c         | 4 ++++
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/libs/video/renderer/vulkan/qfpipeline.plist b/libs/video/renderer/vulkan/qfpipeline.plist
index 825f71a59..cb7cf82f9 100644
--- a/libs/video/renderer/vulkan/qfpipeline.plist
+++ b/libs/video/renderer/vulkan/qfpipeline.plist
@@ -177,12 +177,6 @@
 				},
 				{
 					binding = 1;
-					descriptorType = uniform_buffer;
-					descriptorCount = 1;
-					stageFlags = fragment;
-				},
-				{
-					binding = 2;
 					descriptorType = combined_image_sampler;
 					descriptorCount = 1;
 					stageFlags = fragment;
diff --git a/libs/video/renderer/vulkan/shader/alias_gbuf.frag b/libs/video/renderer/vulkan/shader/alias_gbuf.frag
index e8b14a305..6ef33dd43 100644
--- a/libs/video/renderer/vulkan/shader/alias_gbuf.frag
+++ b/libs/video/renderer/vulkan/shader/alias_gbuf.frag
@@ -1,5 +1,5 @@
 #version 450
-layout (set = 0, binding = 2) uniform sampler2DArray Skin;
+layout (set = 0, binding = 1) uniform sampler2DArray Skin;
 
 layout (push_constant) uniform PushConstants {
 	layout (offset = 68)
@@ -28,5 +28,5 @@ main (void)
 	c += texture (Skin, vec3 (st, 2)) * unpackUnorm4x8(colorB);
 
 	frag_color = c;
-	frag_normal = vec4(normal, 0);
+	frag_normal = vec4(normal, 1);
 }
diff --git a/libs/video/renderer/vulkan/vulkan_alias.c b/libs/video/renderer/vulkan/vulkan_alias.c
index d3663d0df..cc1905c4a 100644
--- a/libs/video/renderer/vulkan/vulkan_alias.c
+++ b/libs/video/renderer/vulkan/vulkan_alias.c
@@ -149,6 +149,10 @@ Vulkan_DrawAlias (entity_t *ent, vulkan_ctx_t *ctx)
 				   0, vertex_constants, sizeof (vertex_constants),
 				   fragment_constants, sizeof (fragment_constants),
 				   hdr, ctx);
+	emit_commands (aframe->cmdSet.a[QFV_aliasGBuffer], ent->pose1, ent->pose2,
+				   skin, vertex_constants, sizeof (vertex_constants),
+				   fragment_constants, sizeof (fragment_constants),
+				   hdr, ctx);
 }
 
 static void

From f8961e43767128b9d825640aa22e33327a8067be Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 25 Feb 2021 10:12:19 +0900
Subject: [PATCH 1442/1519] [qflight] Fix some typos in comments

---
 tools/qflight/include/properties.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/qflight/include/properties.h b/tools/qflight/include/properties.h
index d5e73db7f..8d39361b7 100644
--- a/tools/qflight/include/properties.h
+++ b/tools/qflight/include/properties.h
@@ -76,7 +76,7 @@ void parse_color (const char *str, vec3_t color);
 	\arg HalfLife	"R G B i" where R G & B are 0-255 and i is the same as
 					for normal id lights. The RGB values will be scaled by
 					1/255 such that 255 becomes 1.0.
-	\arg RGB		"R B B" where R G & B are left as-is and the intensity
+	\arg RGB		"R G B" where R G & B are left as-is and the intensity
 					is set to 1.0.
 	\arg id			Standard quake single value light intensity. The color
 					is set to white ([1.0 1.0 1.0]).
@@ -124,7 +124,7 @@ int parse_noise (const char *arg);
 
 	The database is loaded via LoadProperties().
 
-	If a set of properties named "worldspawn" is in the database, the it
+	If a set of properties named "worldspawn" is in the database, then it
 	will be used for default values, otherwise the database will be
 	ignored.
 
@@ -163,7 +163,7 @@ void set_sun_properties (entity_t *ent, struct plitem_s *dict);
 	Supported properties:
 	\arg \c light			see \ref parse_light
 	\arg \c style			light style: 0-254
-	\arg \c angle			spotlight con angle in degress. defaults to 20
+	\arg \c angle			spotlight cone angle in degress. defaults to 20
 	\arg \c wait			light "falloff". defaults to 1.0
 	\arg \c lightradius		size of light. interacts with falloff for
 							distance clipping (?). defaults to 0

From 4eb07220cd7eca8cdd9696cddb10a7515e5d3366 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 25 Feb 2021 11:55:25 +0900
Subject: [PATCH 1443/1519] [util] Make plists more const-correct

---
 include/QF/qfplist.h     | 6 +++---
 libs/gamecode/pr_parse.c | 2 +-
 libs/util/qfplist.c      | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/include/QF/qfplist.h b/include/QF/qfplist.h
index f1cc95b8a..cef305086 100644
--- a/include/QF/qfplist.h
+++ b/include/QF/qfplist.h
@@ -132,7 +132,7 @@ plitem_t *PL_GetPropertyList (const char *string,
 	\return the text representation of the property list
 	\note You are responsible for freeing the returned string.
 */
-char *PL_WritePropertyList (plitem_t *pl);
+char *PL_WritePropertyList (const plitem_t *pl);
 
 /** Retrieve the type of an object.
 
@@ -226,7 +226,7 @@ plitem_t *PL_ObjectAtIndex (const plitem_t *array, int index) __attribute__((pur
 	\return an Array containing Strings or NULL if dict isn't a dictionary
 	\note You are responsible for freeing this array.
 */
-plitem_t *PL_D_AllKeys (plitem_t *dict);
+plitem_t *PL_D_AllKeys (const plitem_t *dict);
 
 /** Retrieve the number of keys in a dictionary.
 
@@ -265,7 +265,7 @@ qboolean PL_A_AddObject (plitem_t *array, plitem_t *item);
 
 	\return number of objects in the array
 */
-int PL_A_NumObjects (plitem_t *array) __attribute__((pure));
+int PL_A_NumObjects (const plitem_t *array) __attribute__((pure));
 
 /** Insert an item into an array before the specified location.
 
diff --git a/libs/gamecode/pr_parse.c b/libs/gamecode/pr_parse.c
index 0f0a3dea5..b33d14e6c 100644
--- a/libs/gamecode/pr_parse.c
+++ b/libs/gamecode/pr_parse.c
@@ -501,7 +501,7 @@ ED_Parse (progs_t *pr, const char *data)
 			// new style (plist) entity data
 			entity_list = PL_GetPropertyList (data, pr->hashlink_freelist);
 		} else {
-			// oldstyle entity data
+			// old style entity data
 			Script_UngetToken (script);
 			entity_list = ED_ConvertToPlist (script, 0, pr->hashlink_freelist);
 		}
diff --git a/libs/util/qfplist.c b/libs/util/qfplist.c
index 6e4726c95..56c168168 100644
--- a/libs/util/qfplist.c
+++ b/libs/util/qfplist.c
@@ -330,7 +330,7 @@ PL_RemoveObjectForKey (const plitem_t *item, const char *key)
 }
 
 VISIBLE plitem_t *
-PL_D_AllKeys (plitem_t *item)
+PL_D_AllKeys (const plitem_t *item)
 {
 	pldict_t   *dict = (pldict_t *) item->data;
 	dictkey_t  *current;
@@ -440,7 +440,7 @@ PL_A_AddObject (plitem_t *array, plitem_t *item)
 }
 
 VISIBLE int
-PL_A_NumObjects (plitem_t *array)
+PL_A_NumObjects (const plitem_t *array)
 {
 	if (array->type != QFArray)
 		return 0;
@@ -1056,7 +1056,7 @@ write_string (dstring_t *dstr, const char *str)
 }
 
 static void
-write_item (dstring_t *dstr, plitem_t *item, int level)
+write_item (dstring_t *dstr, const plitem_t *item, int level)
 {
 	dictkey_t	*current;
 	plarray_t	*array;
@@ -1107,7 +1107,7 @@ write_item (dstring_t *dstr, plitem_t *item, int level)
 }
 
 VISIBLE char *
-PL_WritePropertyList (plitem_t *pl)
+PL_WritePropertyList (const plitem_t *pl)
 {
 	dstring_t  *dstr = dstring_newstr ();
 

From 918c3af095a4e840689f5092d864b5d9ec1c5efd Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 25 Feb 2021 13:46:33 +0900
Subject: [PATCH 1444/1519] [vulkan] Add a position buffer to the g-buffer

While I could reconstruct the position from the screen coords and depth,
this is easier and good enough for now. Reconstruction is an
optimization thing.
---
 include/QF/Vulkan/qf_lighting.h               |  2 +-
 include/QF/Vulkan/qf_vid.h                    | 10 ++
 libs/video/renderer/vulkan/deferred.plist     | 96 ++++++++++++++-----
 libs/video/renderer/vulkan/qfpipeline.plist   | 30 +++++-
 libs/video/renderer/vulkan/shader/alias.vert  |  4 +-
 .../renderer/vulkan/shader/alias_gbuf.frag    |  4 +-
 .../renderer/vulkan/shader/bsp_gbuf.frag      |  3 +
 .../renderer/vulkan/shader/bsp_gbuf.geom      | 13 ++-
 .../renderer/vulkan/shader/bsp_gbuf.vert      |  3 +-
 .../renderer/vulkan/shader/lighting.frag      | 12 ++-
 libs/video/renderer/vulkan/vulkan_compose.c   |  6 +-
 libs/video/renderer/vulkan/vulkan_lighting.c  | 13 ++-
 12 files changed, 154 insertions(+), 42 deletions(-)

diff --git a/include/QF/Vulkan/qf_lighting.h b/include/QF/Vulkan/qf_lighting.h
index d2cee31ac..fab2ffc3d 100644
--- a/include/QF/Vulkan/qf_lighting.h
+++ b/include/QF/Vulkan/qf_lighting.h
@@ -37,7 +37,7 @@
 #include "QF/Vulkan/command.h"
 
 #define LIGHTING_BUFFER_INFOS 1
-#define LIGHTING_IMAGE_INFOS 3
+#define LIGHTING_IMAGE_INFOS 4
 
 typedef struct lightingframe_s {
 	VkCommandBuffer cmd;
diff --git a/include/QF/Vulkan/qf_vid.h b/include/QF/Vulkan/qf_vid.h
index db423d014..5ac5dddd4 100644
--- a/include/QF/Vulkan/qf_vid.h
+++ b/include/QF/Vulkan/qf_vid.h
@@ -46,6 +46,16 @@ enum {
 	QFV_NumPasses
 };
 
+enum {
+	QFV_attachDepth,
+	QFV_attachColor,
+	QFV_attachNormal,
+	QFV_attachPosition,
+	QFV_attachOpaque,
+	QFV_attachTranslucent,
+	QFV_attachSwapchain,
+};
+
 struct vulkan_ctx_s;
 void Vulkan_DestroyFrames (struct vulkan_ctx_s *ctx);
 void Vulkan_CreateFrames (struct vulkan_ctx_s *ctx);
diff --git a/libs/video/renderer/vulkan/deferred.plist b/libs/video/renderer/vulkan/deferred.plist
index 0245906da..6eded7acb 100644
--- a/libs/video/renderer/vulkan/deferred.plist
+++ b/libs/video/renderer/vulkan/deferred.plist
@@ -12,7 +12,7 @@
 			mipLevels = 1;
 			arrayLayers = 1;
 			tiling = optimal;
-			usage = depth_stencil_attachment|input_attachment;
+			usage = depth_stencil_attachment|input_attachment|transient_attachment;
 			initialLayout = undefined;
 		};
 		color = {
@@ -27,10 +27,10 @@
 			mipLevels = 1;
 			arrayLayers = 1;
 			tiling = optimal;
-			usage = color_attachment|input_attachment;
+			usage = color_attachment|input_attachment|transient_attachment;
 			initialLayout = undefined;
 		};
-		normals = {
+		normal = {
 			imageType = VK_IMAGE_TYPE_2D;
 			format = r16g16b16a16_sfloat;
 			samples = 1;
@@ -42,7 +42,22 @@
 			mipLevels = 1;
 			arrayLayers = 1;
 			tiling = optimal;
-			usage = color_attachment|input_attachment;
+			usage = color_attachment|input_attachment|transient_attachment;
+			initialLayout = undefined;
+		};
+		position = {
+			imageType = VK_IMAGE_TYPE_2D;
+			format = r32g32b32a32_sfloat;
+			samples = 1;
+			extent = {
+				width = $swapchain.extent.width;
+				height = $swapchain.extent.height;
+				depth = 1;
+			};
+			mipLevels = 1;
+			arrayLayers = 1;
+			tiling = optimal;
+			usage = color_attachment|input_attachment|transient_attachment;
 			initialLayout = undefined;
 		};
 		opaque = {
@@ -57,7 +72,7 @@
 			mipLevels = 1;
 			arrayLayers = 1;
 			tiling = optimal;
-			usage = color_attachment|input_attachment;
+			usage = color_attachment|input_attachment|transient_attachment;
 			initialLayout = undefined;
 		};
 		translucent = {
@@ -72,7 +87,7 @@
 			mipLevels = 1;
 			arrayLayers = 1;
 			tiling = optimal;
-			usage = color_attachment|input_attachment;
+			usage = color_attachment|input_attachment|transient_attachment;
 			initialLayout = undefined;
 		};
 	};
@@ -109,10 +124,26 @@
 				layerCount = 1;
 			};
 		};
-		normals = {
-			image = normals;
+		normal = {
+			image = normal;
 			viewType = VK_IMAGE_VIEW_TYPE_2D;
-			format = $properties.images.normals.format;
+			format = $properties.images.normal.format;
+			components = {
+				r = identity;
+				g = identity;
+				b = identity;
+				a = identity;
+			};
+			subresourceRange = {
+				aspectMask = color;
+				levelCount = 1;
+				layerCount = 1;
+			};
+		};
+		position = {
+			image = position;
+			viewType = VK_IMAGE_VIEW_TYPE_2D;
+			format = $properties.images.position.format;
 			components = {
 				r = identity;
 				g = identity;
@@ -160,7 +191,7 @@
 	};
 	framebuffer = {
 		renderPass = $properties.renderpass;
-		attachments = (depth, color, normals, opaque, translucent,
+		attachments = (depth, color, normal, position, opaque, translucent,
 					   "$swapchain.views[$swapImageIndex]");
 		width = $swapchain.extent.width;
 		height = $swapchain.extent.height;
@@ -169,7 +200,8 @@
 	clearValues = (
 		{ depthStencil = { depth = 1; stencil = 0; }; },
 		{ color = "[0, 0, 0, 1]"; },	// color
-		{ color = "[0, 0, 0, 1]"; },	// normals
+		{ color = "[0, 0, 0, 1]"; },	// normal
+		{ color = "[0, 0, 0, 1]"; },	// position
 		{ color = "[0, 0, 0, 1]"; },	// opaque
 		{ color = "[0, 0, 0, 0]"; },	// translucent
 		{ color = "[0, 0, 0, 1]"; },	// swapchain
@@ -197,7 +229,17 @@
 				finalLayout = color_attachment_optimal;
 			},
 			{
-				format = $properties.images.normals.format;
+				format = $properties.images.normal.format;
+				samples = 1;
+				loadOp = dont_care;
+				storeOp = dont_care;
+				stencilLoadOp = dont_care;
+				stencilStoreOp = dont_care;
+				initialLayout = undefined;
+				finalLayout = color_attachment_optimal;
+			},
+			{
+				format = $properties.images.position.format;
 				samples = 1;
 				loadOp = dont_care;
 				storeOp = dont_care;
@@ -252,16 +294,20 @@
 						attachment = 1;
 						layout = color_attachment_optimal;
 					},
-					{	// normals
+					{	// normal
 						attachment = 2;
 						layout = color_attachment_optimal;
 					},
+					{	// position
+						attachment = 3;
+						layout = color_attachment_optimal;
+					},
 				);
 				depthStencilAttachment = {
 					attachment = 0;
 					layout = depth_stencil_attachment_optimal;
 				};
-				preserveAttachments = (4);
+				preserveAttachments = (5);
 			},
 			{	// 2 lighting
 				pipelineBindPoint = graphics;
@@ -274,48 +320,52 @@
 						attachment = 1;
 						layout = shader_read_only_optimal;
 					},
-					{	// normals
+					{	// normal
 						attachment = 2;
 						layout = shader_read_only_optimal;
 					},
+					{	// position
+						attachment = 3;
+						layout = shader_read_only_optimal;
+					},
 				);
 				colorAttachments = (
 					{	// opaque
-						attachment = 3;
+						attachment = 4;
 						layout = color_attachment_optimal;
 					},
 				);
-				preserveAttachments = (4);
+				preserveAttachments = (5);
 			},
 			{	// 3 translucent
 				pipelineBindPoint = graphics;
 				colorAttachments = (
 					{	// translucent
-						attachment = 4;
+						attachment = 5;
 						layout = color_attachment_optimal;
 					},
 				);
-				preserveAttachments = (0, 1, 2, 3);
+				preserveAttachments = (0, 1, 2, 3, 4);
 			},
 			{	// 4 compose
 				pipelineBindPoint = graphics;
 				inputAttachments = (
 					{	// opaque
-						attachment = 3;
+						attachment = 4;
 						layout = shader_read_only_optimal;
 					},
 					{	// translucent
-						attachment = 4;
+						attachment = 5;
 						layout = shader_read_only_optimal;
 					},
 				);
 				colorAttachments = (
 					{	// swapchain
-						attachment = 5;
+						attachment = 6;
 						layout = color_attachment_optimal;
 					},
 				);
-				preserveAttachments = (0, 1, 2);
+				preserveAttachments = (0, 1, 2, 3);
 			},
 		);
 		dependencies = (
diff --git a/libs/video/renderer/vulkan/qfpipeline.plist b/libs/video/renderer/vulkan/qfpipeline.plist
index cb7cf82f9..446ed30c6 100644
--- a/libs/video/renderer/vulkan/qfpipeline.plist
+++ b/libs/video/renderer/vulkan/qfpipeline.plist
@@ -83,7 +83,7 @@
 			bindings = (
 				{
 					type = input_attachment;
-					descriptorCount = "3z * $frames.size";
+					descriptorCount = "4z * $frames.size";
 				},
 			);
 		};
@@ -132,7 +132,7 @@
 					binding = 0;
 					descriptorType = uniform_buffer;
 					descriptorCount = 1;
-					stageFlags = vertex;
+					stageFlags = vertex|geometry;
 				},
 				{
 					binding = 1;
@@ -252,6 +252,12 @@
 					descriptorCount = 1;
 					stageFlags = fragment;
 				},
+				{
+					binding = 3;
+					descriptorType = input_attachment;
+					descriptorCount = 1;
+					stageFlags = fragment;
+				},
 			);
 		};
 		lighting_lights = {
@@ -499,6 +505,16 @@
 						alphaBlendOp = add;
 						colorWriteMask = r|g|b|a;
 					},
+					{
+						blendEnable = false;
+						srcColorBlendFactor = src_alpha;
+						dstColorBlendFactor = one_minus_src_alpha;
+						colorBlendOp = add;
+						srcAlphaBlendFactor = src_alpha;
+						dstAlphaBlendFactor = one_minus_src_alpha;
+						alphaBlendOp = add;
+						colorWriteMask = r|g|b|a;
+					},
 				);
 			};
 			dynamic = {
@@ -639,6 +655,16 @@
 						alphaBlendOp = add;
 						colorWriteMask = r|g|b|a;
 					},
+					{
+						blendEnable = false;
+						srcColorBlendFactor = src_alpha;
+						dstColorBlendFactor = one_minus_src_alpha;
+						colorBlendOp = add;
+						srcAlphaBlendFactor = src_alpha;
+						dstAlphaBlendFactor = one_minus_src_alpha;
+						alphaBlendOp = add;
+						colorWriteMask = r|g|b|a;
+					},
 					{
 						blendEnable = false;
 						srcColorBlendFactor = src_alpha;
diff --git a/libs/video/renderer/vulkan/shader/alias.vert b/libs/video/renderer/vulkan/shader/alias.vert
index 871c3a0c0..a54b43674 100644
--- a/libs/video/renderer/vulkan/shader/alias.vert
+++ b/libs/video/renderer/vulkan/shader/alias.vert
@@ -18,7 +18,7 @@ layout (location = 3) in vec3 normalb;
 layout (location = 4) in vec2 uv;
 
 layout (location = 0) out vec2 st;
-layout (location = 1) out vec3 position;
+layout (location = 1) out vec4 position;
 layout (location = 2) out vec3 normal;
 
 void
@@ -32,7 +32,7 @@ main (void)
 	norm = mix (normala, normalb, blend);
 	pos = (Model * vertex);
 	gl_Position = Projection * (View * pos);
-	position = pos.xyz;
+	position = pos;
 	normal = mat3 (Model) * norm;
 	st = uv;
 }
diff --git a/libs/video/renderer/vulkan/shader/alias_gbuf.frag b/libs/video/renderer/vulkan/shader/alias_gbuf.frag
index 6ef33dd43..0808b87f7 100644
--- a/libs/video/renderer/vulkan/shader/alias_gbuf.frag
+++ b/libs/video/renderer/vulkan/shader/alias_gbuf.frag
@@ -11,11 +11,12 @@ layout (push_constant) uniform PushConstants {
 };
 
 layout (location = 0) in vec2 st;
-layout (location = 1) in vec3 position;
+layout (location = 1) in vec4 position;
 layout (location = 2) in vec3 normal;
 
 layout (location = 0) out vec4 frag_color;
 layout (location = 1) out vec4 frag_normal;
+layout (location = 2) out vec4 frag_position;
 
 void
 main (void)
@@ -29,4 +30,5 @@ main (void)
 
 	frag_color = c;
 	frag_normal = vec4(normal, 1);
+	frag_position = position;
 }
diff --git a/libs/video/renderer/vulkan/shader/bsp_gbuf.frag b/libs/video/renderer/vulkan/shader/bsp_gbuf.frag
index 272499efa..e4578ce5e 100644
--- a/libs/video/renderer/vulkan/shader/bsp_gbuf.frag
+++ b/libs/video/renderer/vulkan/shader/bsp_gbuf.frag
@@ -15,9 +15,11 @@ layout (push_constant) uniform PushConstants {
 layout (location = 0) in vec4 tl_st;
 layout (location = 1) in vec3 direction;
 layout (location = 2) in vec3 normal;
+layout (location = 3) in vec4 position;
 
 layout (location = 0) out vec4 frag_color;
 layout (location = 1) out vec4 frag_normal;
+layout (location = 2) out vec4 frag_position;
 
 layout (constant_id = 0) const bool doWarp = false;
 layout (constant_id = 1) const bool doLight = true;
@@ -123,4 +125,5 @@ main (void)
 	}
 	frag_color = c;//fogBlend (c);
 	frag_normal = vec4 (normal, 0);
+	frag_position = position;
 }
diff --git a/libs/video/renderer/vulkan/shader/bsp_gbuf.geom b/libs/video/renderer/vulkan/shader/bsp_gbuf.geom
index f1107f759..bb46ae43a 100644
--- a/libs/video/renderer/vulkan/shader/bsp_gbuf.geom
+++ b/libs/video/renderer/vulkan/shader/bsp_gbuf.geom
@@ -1,5 +1,11 @@
 #version 450
 
+layout (set = 0, binding = 0) uniform Matrices {
+	mat4 Projection;
+	mat4 View;
+	mat4 Sky;
+};
+
 layout (triangles) in;
 layout (triangle_strip, max_vertices = 3) out;
 layout (location = 0) in vec4 v_tl_st[];
@@ -8,6 +14,7 @@ layout (location = 1) in vec3 v_direction[];
 layout (location = 0) out vec4 tl_st;
 layout (location = 1) out vec3 direction;
 layout (location = 2) out vec3 normal;
+layout (location = 3) out vec4 position;
 
 void
 main()
@@ -16,13 +23,15 @@ main()
 	vec3        b = gl_in[1].gl_Position.xyz;
 	vec3        c = gl_in[2].gl_Position.xyz;
 
-	vec3        n = normalize (cross (b - a, c - a));
+	vec3        n = normalize (cross (c - a, b - a));
 
 	for (int vert = 0; vert < 3; vert++) {
-		gl_Position = gl_in[vert].gl_Position;
+		vec4        p = gl_in[vert].gl_Position;
+		gl_Position = Projection * (View * (p));
 		tl_st = v_tl_st[vert];
 		direction = v_direction[vert];
 		normal = n;
+		position = p;
 		EmitVertex ();
 	}
 	EndPrimitive ();
diff --git a/libs/video/renderer/vulkan/shader/bsp_gbuf.vert b/libs/video/renderer/vulkan/shader/bsp_gbuf.vert
index bb9e87e4a..abfb6c4e6 100644
--- a/libs/video/renderer/vulkan/shader/bsp_gbuf.vert
+++ b/libs/video/renderer/vulkan/shader/bsp_gbuf.vert
@@ -19,7 +19,8 @@ layout (location = 1) out vec3 direction;
 void
 main (void)
 {
-	gl_Position = Projection * (View * (Model * vertex));
+	// geometry shader will take care of Projection and View
+	gl_Position = Model * vertex;
 	direction = (Sky * vertex).xyz;
 	tl_st = tl_uv;
 }
diff --git a/libs/video/renderer/vulkan/shader/lighting.frag b/libs/video/renderer/vulkan/shader/lighting.frag
index 555682645..89ea7940d 100644
--- a/libs/video/renderer/vulkan/shader/lighting.frag
+++ b/libs/video/renderer/vulkan/shader/lighting.frag
@@ -3,6 +3,7 @@
 layout (input_attachment_index = 0, set = 0, binding = 0) uniform subpassInput depth;
 layout (input_attachment_index = 1, set = 0, binding = 1) uniform subpassInput color;
 layout (input_attachment_index = 2, set = 0, binding = 2) uniform subpassInput normal;
+layout (input_attachment_index = 3, set = 0, binding = 3) uniform subpassInput position;
 
 struct LightData {
 	vec3        color;
@@ -25,9 +26,12 @@ void
 main (void)
 {
 	float       d = subpassLoad (depth).r;
-	vec4        c;
+	vec3        c = subpassLoad (color).rgb;
+	vec3        n = subpassLoad (normal).rgb;
+	vec3        p = subpassLoad (position).rgb;
 
-	//c = vec4 (d, d, d, 1);
-	c = vec4 (subpassLoad (color).rgb, 1);
-	frag_color = c;
+	c = vec3 (d, d, d);
+	c = (n + 1)/2;
+	c = (p / 1024 + 1) / 2;
+	frag_color = vec4 (c, 1);
 }
diff --git a/libs/video/renderer/vulkan/vulkan_compose.c b/libs/video/renderer/vulkan/vulkan_compose.c
index e2748dcb3..fc7316ede 100644
--- a/libs/video/renderer/vulkan/vulkan_compose.c
+++ b/libs/video/renderer/vulkan/vulkan_compose.c
@@ -82,8 +82,10 @@ Vulkan_Compose_Draw (vulkan_ctx_t *ctx)
 	dfunc->vkCmdBindPipeline (cmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
 							  cctx->pipeline);
 
-	cframe->imageInfo[0].imageView = ctx->attachment_views->a[3];
-	cframe->imageInfo[1].imageView = ctx->attachment_views->a[4];
+	cframe->imageInfo[0].imageView
+		= ctx->attachment_views->a[QFV_attachOpaque];
+	cframe->imageInfo[1].imageView
+		= ctx->attachment_views->a[QFV_attachTranslucent];
 	dfunc->vkUpdateDescriptorSets (device->dev, 2, cframe->descriptors, 0, 0);
 
 	VkDescriptorSet sets[] = {
diff --git a/libs/video/renderer/vulkan/vulkan_lighting.c b/libs/video/renderer/vulkan/vulkan_lighting.c
index 604e7ff94..84c756cdc 100644
--- a/libs/video/renderer/vulkan/vulkan_lighting.c
+++ b/libs/video/renderer/vulkan/vulkan_lighting.c
@@ -82,10 +82,15 @@ Vulkan_Lighting_Draw (vulkan_ctx_t *ctx)
 	dfunc->vkCmdBindPipeline (cmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
 							  lctx->pipeline);
 
-	lframe->imageInfo[0].imageView = ctx->attachment_views->a[0];
-	lframe->imageInfo[1].imageView = ctx->attachment_views->a[1];
-	lframe->imageInfo[2].imageView = ctx->attachment_views->a[2];
-	dfunc->vkUpdateDescriptorSets (device->dev, 3, lframe->descriptors+1, 0, 0);
+	lframe->imageInfo[0].imageView = ctx->attachment_views->a[QFV_attachDepth];
+	lframe->imageInfo[1].imageView = ctx->attachment_views->a[QFV_attachColor];
+	lframe->imageInfo[2].imageView
+		= ctx->attachment_views->a[QFV_attachNormal];
+	lframe->imageInfo[3].imageView
+		= ctx->attachment_views->a[QFV_attachPosition];
+	dfunc->vkUpdateDescriptorSets (device->dev, LIGHTING_IMAGE_INFOS,
+								   lframe->descriptors + LIGHTING_BUFFER_INFOS,
+								   0, 0);
 
 	VkDescriptorSet sets[] = {
 		lframe->descriptors[1].dstSet,

From 33575f93d59b2d9f3415e6399f8e0c345ebeb4a7 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 25 Feb 2021 15:51:54 +0900
Subject: [PATCH 1445/1519] [vulkan] Implement deferred lighting for dlights

Static lights are yet to come (so the screen is black most of the time),
but dynamic lights work very nicely (and look very good) despite the
falloff being incorrect.
---
 include/QF/Vulkan/qf_lighting.h               | 19 ++++
 libs/video/renderer/vulkan/qfpipeline.plist   |  9 ++
 .../renderer/vulkan/shader/lighting.frag      | 38 +++++--
 libs/video/renderer/vulkan/vulkan_lighting.c  | 99 ++++++++++++++++++-
 4 files changed, 152 insertions(+), 13 deletions(-)

diff --git a/include/QF/Vulkan/qf_lighting.h b/include/QF/Vulkan/qf_lighting.h
index fab2ffc3d..8eaa53a6f 100644
--- a/include/QF/Vulkan/qf_lighting.h
+++ b/include/QF/Vulkan/qf_lighting.h
@@ -36,11 +36,29 @@
 #include "QF/Vulkan/qf_vid.h"
 #include "QF/Vulkan/command.h"
 
+typedef struct qfv_light_s {
+	vec3_t      color;
+	float       intensity;
+	vec3_t      position;
+	int         radius;
+	vec3_t      direction;
+	float       cone;
+} qfv_light_t;
+
+#define NUM_LIGHTS 128
+
+typedef struct qfv_light_buffer_s {
+	int         lightCount;
+	qfv_light_t lights[NUM_LIGHTS] __attribute__((aligned(16)));
+} qfv_light_buffer_t;
+
+
 #define LIGHTING_BUFFER_INFOS 1
 #define LIGHTING_IMAGE_INFOS 4
 
 typedef struct lightingframe_s {
 	VkCommandBuffer cmd;
+	VkBuffer    light_buffer;
 	VkDescriptorBufferInfo bufferInfo[LIGHTING_BUFFER_INFOS];
 	VkDescriptorImageInfo imageInfo[LIGHTING_IMAGE_INFOS];
 	VkWriteDescriptorSet descriptors[LIGHTING_BUFFER_INFOS
@@ -54,6 +72,7 @@ typedef struct lightingctx_s {
 	lightingframeset_t frames;
 	VkPipeline   pipeline;
 	VkPipelineLayout layout;
+	VkDeviceMemory light_memory;
 } lightingctx_t;
 
 struct vulkan_ctx_s;
diff --git a/libs/video/renderer/vulkan/qfpipeline.plist b/libs/video/renderer/vulkan/qfpipeline.plist
index 446ed30c6..536c98a05 100644
--- a/libs/video/renderer/vulkan/qfpipeline.plist
+++ b/libs/video/renderer/vulkan/qfpipeline.plist
@@ -575,6 +575,15 @@
 					stage = fragment;
 					name = main;
 					module = $builtin/bsp_gbuf.frag;
+					specializationInfo = {
+						mapEntries = (
+							{ size = 4; offset = 0; constantID = 0; },
+							{ size = 4; offset = 0; constantID = 1; },
+							{ size = 4; offset = 0; constantID = 2; },
+							{ size = 4; offset = 4; constantID = 1; },
+						);
+						data = <00000000ffffffff>;
+					};
 				},
 			);
 			vertexInput = {
diff --git a/libs/video/renderer/vulkan/shader/lighting.frag b/libs/video/renderer/vulkan/shader/lighting.frag
index 89ea7940d..9eef7c8bd 100644
--- a/libs/video/renderer/vulkan/shader/lighting.frag
+++ b/libs/video/renderer/vulkan/shader/lighting.frag
@@ -7,31 +7,49 @@ layout (input_attachment_index = 3, set = 0, binding = 3) uniform subpassInput p
 
 struct LightData {
 	vec3        color;
-	float       dist;
+	float       intensity;
 	vec3        position;
-	int         type;
+	int         radius;
 	vec3        direction;
 	float       cone;
 };
 
-layout (constant_id = 0) const int MaxLights = 8;
-/*layout (set = 1, binding = 0) uniform Lights {
+layout (constant_id = 0) const int MaxLights = 128;
+layout (set = 1, binding = 0) uniform Lights {
 	int         lightCount;
 	LightData   lights[MaxLights];
-};*/
+};
 
 layout (location = 0) out vec4 frag_color;
 
+vec3
+calc_light (LightData light, vec3 position, vec3 normal)
+{
+	vec3        dist = light.position - position;
+	vec3        incoming = normalize (dist);
+	float       spotdot = -dot (incoming, light.direction);
+	float       lightdot = dot (incoming, normal);
+	float       d = dot (dist, dist);
+	float       r = light.radius;
+
+	float       intensity = light.intensity * step (d, r * r);
+	intensity *= step (spotdot, light.cone) * clamp (lightdot, 0, 1);
+	return light.color * intensity;
+}
+
 void
 main (void)
 {
-	float       d = subpassLoad (depth).r;
+	//float       d = subpassLoad (depth).r;
 	vec3        c = subpassLoad (color).rgb;
 	vec3        n = subpassLoad (normal).rgb;
 	vec3        p = subpassLoad (position).rgb;
+	vec3        light = vec3 (0);
 
-	c = vec3 (d, d, d);
-	c = (n + 1)/2;
-	c = (p / 1024 + 1) / 2;
-	frag_color = vec4 (c, 1);
+	if (MaxLights > 0) {
+		for (int i = 0; i < lightCount; i++) {
+			light += calc_light (lights[i], p, n);
+		}
+	}
+	frag_color = vec4 (c * light, 1);
 }
diff --git a/libs/video/renderer/vulkan/vulkan_lighting.c b/libs/video/renderer/vulkan/vulkan_lighting.c
index 84c756cdc..8e41cf312 100644
--- a/libs/video/renderer/vulkan/vulkan_lighting.c
+++ b/libs/video/renderer/vulkan/vulkan_lighting.c
@@ -42,22 +42,85 @@
 #include "qfalloca.h"
 
 #include "QF/sys.h"
+#include "QF/va.h"
 
 #include "QF/Vulkan/qf_lighting.h"
+#include "QF/Vulkan/buffer.h"
 #include "QF/Vulkan/debug.h"
 #include "QF/Vulkan/descriptor.h"
 #include "QF/Vulkan/device.h"
 #include "QF/Vulkan/image.h"
+#include "QF/Vulkan/staging.h"
+
+#include "compat.h"
 
 #include "r_internal.h"
 #include "vid_vulkan.h"
 
+static void
+update_lights (vulkan_ctx_t *ctx)
+{
+	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+	lightingctx_t *lctx = ctx->lighting_context;
+	lightingframe_t *lframe = &lctx->frames.a[ctx->curFrame];
+
+	dlight_t   *lights[NUM_LIGHTS];
+	qfv_packet_t *packet = QFV_PacketAcquire (ctx->staging);
+	qfv_light_buffer_t *light_data = QFV_PacketExtend (packet,
+													   sizeof (*light_data));
+
+	light_data->lightCount = 0;
+	R_FindNearLights (r_origin, NUM_LIGHTS - 1, lights);
+	for (int i = 0; i < NUM_LIGHTS - 1; i++) {
+		if (!lights[i]) {
+			break;
+		}
+		light_data->lightCount++;
+		VectorCopy (lights[i]->color, light_data->lights[i].color);
+		VectorCopy (lights[i]->origin, light_data->lights[i].position);
+		light_data->lights[i].radius = lights[i]->radius;
+		light_data->lights[i].intensity = 1;
+		VectorZero (light_data->lights[i].direction);
+		light_data->lights[i].cone = 1;
+	}
+
+	VkBufferMemoryBarrier wr_barriers[] = {
+		{   VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER, 0,
+			0, VK_ACCESS_TRANSFER_WRITE_BIT,
+			VK_QUEUE_FAMILY_IGNORED, VK_QUEUE_FAMILY_IGNORED,
+			lframe->light_buffer, 0, sizeof (qfv_light_buffer_t) },
+	};
+	dfunc->vkCmdPipelineBarrier (packet->cmd,
+								 VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT,
+								 VK_PIPELINE_STAGE_TRANSFER_BIT,
+								 0, 0, 0, 1, wr_barriers, 0, 0);
+	VkBufferCopy copy_region[] = {
+		{ packet->offset, 0, sizeof (qfv_light_buffer_t) },
+	};
+	dfunc->vkCmdCopyBuffer (packet->cmd, ctx->staging->buffer,
+							lframe->light_buffer, 1, &copy_region[0]);
+	VkBufferMemoryBarrier rd_barriers[] = {
+		{   VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER, 0,
+			VK_ACCESS_TRANSFER_WRITE_BIT, VK_ACCESS_VERTEX_ATTRIBUTE_READ_BIT,
+			VK_QUEUE_FAMILY_IGNORED, VK_QUEUE_FAMILY_IGNORED,
+			lframe->light_buffer, 0, sizeof (qfv_light_buffer_t) },
+	};
+	dfunc->vkCmdPipelineBarrier (packet->cmd,
+								 VK_PIPELINE_STAGE_TRANSFER_BIT,
+								 VK_PIPELINE_STAGE_VERTEX_INPUT_BIT,
+								 0, 0, 0, 1, rd_barriers, 0, 0);
+	QFV_PacketSubmit (packet);
+}
+
 void
 Vulkan_Lighting_Draw (vulkan_ctx_t *ctx)
 {
 	qfv_device_t *device = ctx->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
 
+	update_lights (ctx);
+
 	lightingctx_t *lctx = ctx->lighting_context;
 	__auto_type cframe = &ctx->frames.a[ctx->curFrame];
 	lightingframe_t *lframe = &lctx->frames.a[ctx->curFrame];
@@ -82,15 +145,16 @@ Vulkan_Lighting_Draw (vulkan_ctx_t *ctx)
 	dfunc->vkCmdBindPipeline (cmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
 							  lctx->pipeline);
 
+	lframe->bufferInfo[0].buffer = lframe->light_buffer;
 	lframe->imageInfo[0].imageView = ctx->attachment_views->a[QFV_attachDepth];
 	lframe->imageInfo[1].imageView = ctx->attachment_views->a[QFV_attachColor];
 	lframe->imageInfo[2].imageView
 		= ctx->attachment_views->a[QFV_attachNormal];
 	lframe->imageInfo[3].imageView
 		= ctx->attachment_views->a[QFV_attachPosition];
-	dfunc->vkUpdateDescriptorSets (device->dev, LIGHTING_IMAGE_INFOS,
-								   lframe->descriptors + LIGHTING_BUFFER_INFOS,
-								   0, 0);
+	dfunc->vkUpdateDescriptorSets (device->dev,
+								   LIGHTING_BUFFER_INFOS + LIGHTING_IMAGE_INFOS,
+								   lframe->descriptors, 0, 0);
 
 	VkDescriptorSet sets[] = {
 		lframe->descriptors[1].dstSet,
@@ -134,6 +198,7 @@ void
 Vulkan_Lighting_Init (vulkan_ctx_t *ctx)
 {
 	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
 
 	lightingctx_t *lctx = calloc (1, sizeof (lightingctx_t));
 	ctx->lighting_context = lctx;
@@ -146,6 +211,25 @@ Vulkan_Lighting_Init (vulkan_ctx_t *ctx)
 	lctx->pipeline = Vulkan_CreatePipeline (ctx, "lighting");
 	lctx->layout = Vulkan_CreatePipelineLayout (ctx, "lighting_layout");
 
+	__auto_type lbuffers = QFV_AllocBufferSet (frames, alloca);
+	for (size_t i = 0; i < frames; i++) {
+		lbuffers->a[i] = QFV_CreateBuffer (device, sizeof (qfv_light_buffer_t),
+										   VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT
+										   | VK_BUFFER_USAGE_TRANSFER_DST_BIT);
+		QFV_duSetObjectName (device, VK_OBJECT_TYPE_BUFFER,
+							 lbuffers->a[i],
+							 va (ctx->va_ctx, "buffer:lighting:%zd", i));
+	}
+	VkMemoryRequirements requirements;
+	dfunc->vkGetBufferMemoryRequirements (device->dev, lbuffers->a[0],
+										  &requirements);
+	lctx->light_memory = QFV_AllocBufferMemory (device, lbuffers->a[0],
+										VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT,
+										frames * requirements.size, 0);
+	QFV_duSetObjectName (device, VK_OBJECT_TYPE_DEVICE_MEMORY,
+						 lctx->light_memory, "memory:lighting");
+
+
 	__auto_type cmdSet = QFV_AllocCommandBufferSet (1, alloca);
 
 	__auto_type attach = QFV_AllocDescriptorSetLayoutSet (frames, alloca);
@@ -171,6 +255,10 @@ Vulkan_Lighting_Init (vulkan_ctx_t *ctx)
 		QFV_AllocateCommandBuffers (device, ctx->cmdpool, 1, cmdSet);
 		lframe->cmd = cmdSet->a[0];
 
+		lframe->light_buffer = lbuffers->a[i];
+		QFV_BindBufferMemory (device, lbuffers->a[i], lctx->light_memory,
+							  i * requirements.size);
+
 		QFV_duSetObjectName (device, VK_OBJECT_TYPE_COMMAND_BUFFER,
 							 lframe->cmd, "cmd:lighting");
 		for (int j = 0; j < LIGHTING_BUFFER_INFOS; j++) {
@@ -201,6 +289,11 @@ Vulkan_Lighting_Shutdown (vulkan_ctx_t *ctx)
 	qfv_devfuncs_t *dfunc = device->funcs;
 	lightingctx_t *lctx = ctx->lighting_context;
 
+	for (size_t i = 0; i < lctx->frames.size; i++) {
+		lightingframe_t *lframe = &lctx->frames.a[i];
+		dfunc->vkDestroyBuffer (device->dev, lframe->light_buffer, 0);
+	}
+	dfunc->vkFreeMemory (device->dev, lctx->light_memory, 0);
 	dfunc->vkDestroyPipeline (device->dev, lctx->pipeline, 0);
 	free (lctx->frames.a);
 	free (lctx);

From fd97bb145674f55a85b9e395e626794d066a9129 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 25 Feb 2021 16:11:47 +0900
Subject: [PATCH 1446/1519] [vulkan] Implement linear falloff

It's possibly too bright, but it might be the lights themselves. Still,
it looks better than the no-falloff implementation.
---
 libs/video/renderer/vulkan/shader/lighting.frag | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libs/video/renderer/vulkan/shader/lighting.frag b/libs/video/renderer/vulkan/shader/lighting.frag
index 9eef7c8bd..3dfb755be 100644
--- a/libs/video/renderer/vulkan/shader/lighting.frag
+++ b/libs/video/renderer/vulkan/shader/lighting.frag
@@ -29,12 +29,12 @@ calc_light (LightData light, vec3 position, vec3 normal)
 	vec3        incoming = normalize (dist);
 	float       spotdot = -dot (incoming, light.direction);
 	float       lightdot = dot (incoming, normal);
-	float       d = dot (dist, dist);
+	float       d = sqrt (dot (dist, dist));
 	float       r = light.radius;
 
-	float       intensity = light.intensity * step (d, r * r);
+	float       intensity = light.intensity * step (d, r);
 	intensity *= step (spotdot, light.cone) * clamp (lightdot, 0, 1);
-	return light.color * intensity;
+	return light.color * intensity * (r - d);
 }
 
 void

From 407ea15e35260aba8f159402a3ab23798eb96a52 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 2 Mar 2021 15:05:19 +0900
Subject: [PATCH 1447/1519] [util] Fix some test bitrot

---
 libs/util/test/test-plist.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/util/test/test-plist.c b/libs/util/test/test-plist.c
index 0335493f2..bc8e0457a 100644
--- a/libs/util/test/test-plist.c
+++ b/libs/util/test/test-plist.c
@@ -29,7 +29,7 @@ test_string_io (const char *str)
 	item = PL_NewString (str);
 	saved = PL_WritePropertyList (item);
 	PL_Free (item);
-	item = PL_GetPropertyList (saved);
+	item = PL_GetPropertyList (saved, 0);
 	res = PL_String (item);
 	if (!strcmp (str, res))
 		return 1;

From 22c0bec03a9017529e63467d8769cb32612fe6ae Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 3 Mar 2021 13:02:35 +0900
Subject: [PATCH 1448/1519] [build] Clean up obsolete QF_PROCESS_NEED_DIRS

Its need went away with the shift to non-recursive make. The macro is
still available just in case.
---
 config.d/build_control.m4 | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/config.d/build_control.m4 b/config.d/build_control.m4
index be71d59f4..09e4a10c0 100644
--- a/config.d/build_control.m4
+++ b/config.d/build_control.m4
@@ -260,13 +260,8 @@ fi
 
 QF_NEED(top, [libs hw nq qtv qw])
 
-QF_PROCESS_NEED_DIRS(tools,[bsp2img carne pak qfbsp qfcc qflight qflmp qfmodelgen qfspritegen qfvis wad wav])
 QF_PROCESS_NEED_FUNC(tools,[bsp2img carne pak qfbsp qfcc qflight qflmp qfmodelgen qfspritegen qfvis wad wav], QF_NEED(top,tools))
 
-QF_PROCESS_NEED_DIRS(libs,[util gamecode ruamoko gib audio image models video console net qw client])
-
-QF_PROCESS_NEED_DIRS(ruamoko,[qwaq])
-
 if test "$ENABLE_tools_qfcc" = "yes" -a "$ENABLE_tools_pak" = "yes"; then
 	QF_NEED(top, [ruamoko])
 	qfac_qfcc_include_qf="\$(qfcc_include_qf)"
@@ -294,10 +289,7 @@ if test "$HAVE_ZLIB" = "yes"; then
 fi
 QF_SUBST(progs_gz)
 
-QF_PROCESS_NEED_DIRS(top, [libs hw nq qtv qw tools ruamoko])
-
 QF_PROCESS_NEED_LIBS(swrend, [asm])
-QF_PROCESS_NEED_DIRS(vid_render, [gl glsl sw sw32 vulkan])
 QF_PROCESS_NEED_LIBS(models, [gl glsl sw vulkan], [libs/models])
 QF_PROCESS_NEED_LIBS(alias, [gl glsl sw vulkan], [libs/models/alias])
 QF_PROCESS_NEED_LIBS(brush, [gl glsl sw vulkan], [libs/models/brush])

From 9617bbef97be221895953c426d847b365005574e Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 3 Mar 2021 13:04:26 +0900
Subject: [PATCH 1449/1519] [build] Create static libs for render targets

The static libs are used to build the plugins, but make it easy to use
only those modules needed for tests. Fixes the link error when running
"make check" with non-static plugins.
---
 config.d/build_control.m4                     |  8 ++++
 libs/video/renderer/Makemodule.am             | 39 ++++++++++++++++---
 libs/video/renderer/vulkan/test/Makemodule.am |  2 +-
 .../video/renderer/vulkan/vkgen/Makemodule.am |  2 +
 4 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/config.d/build_control.m4 b/config.d/build_control.m4
index 09e4a10c0..a5fc7bc51 100644
--- a/config.d/build_control.m4
+++ b/config.d/build_control.m4
@@ -41,6 +41,7 @@ if test "x$HAVE_FBDEV" = xyes; then
 		CL_TARGETS="$CL_TARGETS FBDEV"
 		VID_TARGETS="$VID_TARGETS libs/video/targets/libQFfbdev.la"
 		QF_NEED(vid_render, [sw])
+		QF_NEED(render, [sw])
 		QF_NEED(models, [sw])
 		QF_NEED(alias, [sw])
 		QF_NEED(brush, [sw])
@@ -73,6 +74,7 @@ if test "x$HAVE_X" = xyes; then
 		VID_TARGETS="$VID_TARGETS libs/video/targets/libQFx11.la"
 		if test "$HAVE_VULKAN" = "yes"; then
 			QF_NEED(vid_render, [vulkan])
+			QF_NEED(render, [vulkan])
 			QF_NEED(models, [vulkan])
 			QF_NEED(alias, [vulkan])
 			QF_NEED(brush, [vulkan])
@@ -80,6 +82,7 @@ if test "x$HAVE_X" = xyes; then
 			QF_NEED(sprite, [vulkan])
 		fi
 		QF_NEED(vid_render, [sw sw32 gl glsl])
+		QF_NEED(render, [sw sw32 gl glsl])
 		QF_NEED(models, [sw gl glsl])
 		QF_NEED(alias, [sw gl glsl])
 		QF_NEED(brush, [sw gl glsl])
@@ -105,12 +108,14 @@ if test "x$HAVE_SDL" = xyes; then
 		VID_TARGETS="$VID_TARGETS libs/video/targets/libQFsdl.la"
 		if test "$HAVE_VULKAN" = "yes"; then
 			QF_NEED(vid_render, [vulkan])
+			QF_NEED(render, [vulkan])
 			QF_NEED(alias, [vulkan])
 			QF_NEED(brush, [vulkan])
 			QF_NEED(iqm, [vulkan])
 			QF_NEED(sprite, [vulkan])
 		fi
 		QF_NEED(vid_render, [sw sw32 gl glsl])
+		QF_NEED(render, [sw sw32 gl glsl])
 		QF_NEED(models, [sw gl glsl])
 		QF_NEED(alias, [sw gl glsl])
 		QF_NEED(brush, [sw gl glsl])
@@ -133,6 +138,7 @@ if test "x$HAVE_SVGA" = xyes; then
 		CL_TARGETS="$CL_TARGETS SVGAlib"
 		VID_TARGETS="$VID_TARGETS libs/video/targets/libQFsvga.la"
 		QF_NEED(vid_render, [sw])
+		QF_NEED(render, [sw])
 		QF_NEED(models, [sw])
 		QF_NEED(alias, [sw])
 		QF_NEED(brush, [sw])
@@ -155,6 +161,7 @@ fi
 #		CL_TARGETS="$CL_TARGETS WGL"
 #		VID_TARGETS="$VID_TARGETS libs/video/targets/libQFwgl.la"
 #		QF_NEED(vid_render, [gl])
+#		QF_NEED(render, [gl])
 #		QF_NEED(models, [gl])
 #		QF_NEED(alias, [gl])
 #		QF_NEED(brush, [gl])
@@ -290,6 +297,7 @@ fi
 QF_SUBST(progs_gz)
 
 QF_PROCESS_NEED_LIBS(swrend, [asm])
+QF_PROCESS_NEED_LIBS(render, [gl glsl sw sw32 vulkan], [libs/video/renderer])
 QF_PROCESS_NEED_LIBS(models, [gl glsl sw vulkan], [libs/models])
 QF_PROCESS_NEED_LIBS(alias, [gl glsl sw vulkan], [libs/models/alias])
 QF_PROCESS_NEED_LIBS(brush, [gl glsl sw vulkan], [libs/models/brush])
diff --git a/libs/video/renderer/Makemodule.am b/libs/video/renderer/Makemodule.am
index 8789de037..9eb2c2354 100644
--- a/libs/video/renderer/Makemodule.am
+++ b/libs/video/renderer/Makemodule.am
@@ -3,8 +3,12 @@ include libs/video/renderer/vulkan/vkgen/Makemodule.am
 
 #lib_LTLIBRARIES += @VID_REND_TARGETS@
 plugin_LTLIBRARIES += @vid_render_plugins@
-noinst_LTLIBRARIES += libs/video/renderer/libQFrenderer.la @vid_render_static_plugins@
+noinst_LTLIBRARIES += \
+	libs/video/renderer/libQFrenderer.la \
+	@render_libs@ \
+	@vid_render_static_plugins@
 
+#plugins
 EXTRA_LTLIBRARIES += \
 	libs/video/renderer/vid_render_sw.la \
 	libs/video/renderer/vid_render_sw32.la \
@@ -12,6 +16,14 @@ EXTRA_LTLIBRARIES += \
 	libs/video/renderer/vid_render_glsl.la \
 	libs/video/renderer/vid_render_vulkan.la
 
+#helper libraries
+EXTRA_LTLIBRARIES += \
+	libs/video/renderer/librender_sw.la \
+	libs/video/renderer/librender_sw32.la \
+	libs/video/renderer/librender_gl.la \
+	libs/video/renderer/librender_glsl.la \
+	libs/video/renderer/librender_vulkan.la
+
 video_renderer_common_sources = \
 	libs/video/renderer/crosshair.c \
 	libs/video/renderer/font8x8.c \
@@ -43,13 +55,16 @@ libs_video_renderer_libQFrenderer_la_SOURCES=\
 	libs/video/renderer/r_progs.c
 
 video_renderer_gl_libs= \
+	libs/video/renderer/librender_gl.la \
 	libs/models/libmodels_gl.la
 libs_video_renderer_vid_render_gl_la_LDFLAGS=		$(plugin_ldflags)
 libs_video_renderer_vid_render_gl_la_LIBADD=		$(video_renderer_gl_libs)
 libs_video_renderer_vid_render_gl_la_DEPENDENCIES=	$(video_renderer_gl_libs)
 libs_video_renderer_vid_render_gl_la_SOURCES=\
 	$(video_renderer_common_sources) \
-	libs/video/renderer/vid_render_gl.c \
+	libs/video/renderer/vid_render_gl.c
+
+libs_video_renderer_librender_gl_la_SOURCES = \
 	libs/video/renderer/gl/gl_draw.c \
 	libs/video/renderer/gl/gl_dyn_lights.c \
 	libs/video/renderer/gl/gl_dyn_part.c \
@@ -91,13 +106,16 @@ SUFFICES=.frag .vert .spv .spvc .fc .vc .slc .glsl .plist .plc
 	$(am__mv) $@.t $@
 
 video_renderer_glsl_libs= \
+	libs/video/renderer/librender_glsl.la \
 	libs/models/libmodels_glsl.la
 libs_video_renderer_vid_render_glsl_la_LDFLAGS=		$(plugin_ldflags)
 libs_video_renderer_vid_render_glsl_la_LIBADD=		$(video_renderer_glsl_libs)
 libs_video_renderer_vid_render_glsl_la_DEPENDENCIES=$(video_renderer_glsl_libs)
 libs_video_renderer_vid_render_glsl_la_SOURCES=\
 	$(video_renderer_common_sources) \
-	libs/video/renderer/vid_render_glsl.c \
+	libs/video/renderer/vid_render_glsl.c
+
+libs_video_renderer_librender_glsl_la_SOURCES = \
 	libs/video/renderer/glsl/glsl_alias.c \
 	libs/video/renderer/glsl/glsl_bsp.c \
 	libs/video/renderer/glsl/glsl_draw.c \
@@ -116,13 +134,16 @@ libs_video_renderer_vid_render_glsl_la_SOURCES=\
 	libs/video/renderer/glsl/vid_common_glsl.c
 
 video_renderer_sw_libs= \
+	libs/video/renderer/librender_sw.la \
 	libs/models/libmodels_sw.la
 libs_video_renderer_vid_render_sw_la_LDFLAGS=		$(plugin_ldflags)
 libs_video_renderer_vid_render_sw_la_LIBADD=		$(video_renderer_sw_libs)
 libs_video_renderer_vid_render_sw_la_DEPENDENCIES=	$(video_renderer_sw_libs)
 libs_video_renderer_vid_render_sw_la_SOURCES=\
 	$(video_renderer_common_sources) \
-	libs/video/renderer/vid_render_sw.c \
+	libs/video/renderer/vid_render_sw.c
+
+libs_video_renderer_librender_sw_la_SOURCES = \
 	libs/video/renderer/sw/d_copy.S \
 	libs/video/renderer/sw/d_draw.S \
 	libs/video/renderer/sw/d_edge.c \
@@ -170,13 +191,16 @@ libs_video_renderer_vid_render_sw_la_SOURCES=\
 	libs/video/renderer/sw/vid_common_sw.c
 
 video_renderer_sw32_libs= \
+	libs/video/renderer/librender_sw32.la \
 	libs/models/libmodels_sw.la
 libs_video_renderer_vid_render_sw32_la_LDFLAGS=		$(plugin_ldflags)
 libs_video_renderer_vid_render_sw32_la_LIBADD=		$(video_renderer_sw32_libs)
 libs_video_renderer_vid_render_sw32_la_DEPENDENCIES=$(video_renderer_sw32_libs)
 libs_video_renderer_vid_render_sw32_la_SOURCES=\
 	$(video_renderer_common_sources) \
-	libs/video/renderer/vid_render_sw32.c \
+	libs/video/renderer/vid_render_sw32.c
+
+libs_video_renderer_librender_sw32_la_SOURCES = \
 	libs/video/renderer/sw32/d_edge.c \
 	libs/video/renderer/sw32/d_fill.c \
 	libs/video/renderer/sw32/d_init.c \
@@ -213,13 +237,16 @@ renderpass_src = libs/video/renderer/vulkan/deferred.plist
 renderpass_gen = libs/video/renderer/vulkan/deferred.plc
 
 video_renderer_vulkan_libs = \
+	libs/video/renderer/librender_vulkan.la \
 	libs/models/libmodels_vulkan.la
 libs_video_renderer_vid_render_vulkan_la_LDFLAGS=       $(plugin_ldflags)
 libs_video_renderer_vid_render_vulkan_la_LIBADD=        $(video_renderer_vulkan_libs)
 libs_video_renderer_vid_render_vulkan_la_DEPENDENCIES=$(video_renderer_vulkan_libs)
 libs_video_renderer_vid_render_vulkan_la_SOURCES = \
 	$(video_renderer_common_sources) \
-	libs/video/renderer/vid_render_vulkan.c \
+	libs/video/renderer/vid_render_vulkan.c
+
+libs_video_renderer_librender_vulkan_la_SOURCES = \
 	libs/video/renderer/vulkan/barrier.c \
 	libs/video/renderer/vulkan/buffer.c \
 	libs/video/renderer/vulkan/command.c \
diff --git a/libs/video/renderer/vulkan/test/Makemodule.am b/libs/video/renderer/vulkan/test/Makemodule.am
index cacb206f3..84c5ff136 100644
--- a/libs/video/renderer/vulkan/test/Makemodule.am
+++ b/libs/video/renderer/vulkan/test/Makemodule.am
@@ -7,7 +7,7 @@ TESTS += $(libs_video_renderer_vulkan_tests)
 check_PROGRAMS += $(libs_video_renderer_vulkan_tests)
 
 libs_video_renderer_vulkan_test_libs= \
-	libs/video/renderer/vid_render_vulkan.la \
+	libs/video/renderer/librender_vulkan.la \
 	libs/util/libQFutil.la
 
 libs_video_renderer_vulkan_test_test_staging_SOURCES= 		\
diff --git a/libs/video/renderer/vulkan/vkgen/Makemodule.am b/libs/video/renderer/vulkan/vkgen/Makemodule.am
index b60e97f1d..ecb5853ee 100644
--- a/libs/video/renderer/vulkan/vkgen/Makemodule.am
+++ b/libs/video/renderer/vulkan/vkgen/Makemodule.am
@@ -47,5 +47,7 @@ EXTRA_DIST += \
 	libs/video/renderer/vulkan/vkgen/vkgen.h \
 	libs/video/renderer/vulkan/vkgen/vkstruct.h \
 	libs/video/renderer/vulkan/vkgen/vktype.h \
+	$e
+
 CLEANFILES += \
 	libs/video/renderer/vkgen/*.sym

From 45c02556439763bc517875026e56907fe618ea86 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 3 Mar 2021 16:17:15 +0900
Subject: [PATCH 1450/1519] [util] Add simd 4x4 matrix functions

Currently just add, subtract, multiply (m m and m v).
---
 include/QF/simd/mat4f.h    | 123 +++++++++++++++++++++++++++++++
 include/QF/simd/types.h    |   4 ++
 libs/util/simd.c           |   2 +
 libs/util/test/test-simd.c | 143 ++++++++++++++++++++++++++++++++++++-
 4 files changed, 270 insertions(+), 2 deletions(-)
 create mode 100644 include/QF/simd/mat4f.h

diff --git a/include/QF/simd/mat4f.h b/include/QF/simd/mat4f.h
new file mode 100644
index 000000000..3e1880ad6
--- /dev/null
+++ b/include/QF/simd/mat4f.h
@@ -0,0 +1,123 @@
+/*
+	QF/simd/mat4f.h
+
+	Matrix functions for mat4f_t (ie, float precision)
+
+	Copyright (C) 2021  Bill Currie <bill@taniwha.org>
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+
+#ifndef __QF_simd_mat4f_h
+#define __QF_simd_mat4f_h
+
+#include <immintrin.h>
+
+#include "QF/simd/types.h"
+
+GNU89INLINE inline void maddf (mat4f_t c, const mat4f_t a, const mat4f_t b);
+GNU89INLINE inline void msubf (mat4f_t c, const mat4f_t a, const mat4f_t b);
+GNU89INLINE inline void mmulf (mat4f_t c, const mat4f_t a, const mat4f_t b);
+GNU89INLINE inline vec4f_t mvmulf (const mat4f_t m, vec4f_t v) __attribute__((const));
+GNU89INLINE inline vec4f_t m3vmulf (const mat4f_t m, vec4f_t v) __attribute__((const));
+GNU89INLINE inline void mat4fidentity (mat4f_t m);
+
+#ifndef IMPLEMENT_MAT4F_Funcs
+GNU89INLINE inline
+#else
+VISIBLE
+#endif
+void
+maddf (mat4f_t c, const mat4f_t a, const mat4f_t b)
+{
+	c[0] = a[0] + b[0];
+	c[1] = a[1] + b[1];
+	c[2] = a[2] + b[2];
+	c[3] = a[3] + b[3];
+}
+
+#ifndef IMPLEMENT_MAT4F_Funcs
+GNU89INLINE inline
+#else
+VISIBLE
+#endif
+void
+msubf (mat4f_t c, const mat4f_t a, const mat4f_t b)
+{
+	c[0] = a[0] - b[0];
+	c[1] = a[1] - b[1];
+	c[2] = a[2] - b[2];
+	c[3] = a[3] - b[3];
+}
+
+#ifndef IMPLEMENT_MAT4F_Funcs
+GNU89INLINE inline
+#else
+VISIBLE
+#endif
+void
+mmulf (mat4f_t c, const mat4f_t a, const mat4f_t b)
+{
+	c[0] = a[0] * b[0][0] + a[1] * b[0][1] + a[2] * b[0][2] + a[3] * b[0][3];
+	c[1] = a[0] * b[1][0] + a[1] * b[1][1] + a[2] * b[1][2] + a[3] * b[1][3];
+	c[2] = a[0] * b[2][0] + a[1] * b[2][1] + a[2] * b[2][2] + a[3] * b[2][3];
+	c[3] = a[0] * b[3][0] + a[1] * b[3][1] + a[2] * b[3][2] + a[3] * b[3][3];
+}
+
+#ifndef IMPLEMENT_MAT4F_Funcs
+GNU89INLINE inline
+#else
+VISIBLE
+#endif
+vec4f_t
+mvmulf (const mat4f_t m, vec4f_t v)
+{
+	return m[0] * v[0] + m[1] * v[1] + m[2] * v[2] + m[3] * v[3];
+}
+
+#ifndef IMPLEMENT_MAT4F_Funcs
+GNU89INLINE inline
+#else
+VISIBLE
+#endif
+vec4f_t
+m3vmulf (const mat4f_t m, vec4f_t v)
+{
+	vec4f_t     w;
+	w = m[0] * v[0] + m[1] * v[1] + m[2] * v[2];
+	w[3] = 1;
+	return w;
+}
+
+#ifndef IMPLEMENT_MAT4F_Funcs
+GNU89INLINE inline
+#else
+VISIBLE
+#endif
+void
+mat4fidentity (mat4f_t m)
+{
+	m[0] = (vec4f_t) { 1, 0, 0, 0 };
+	m[1] = (vec4f_t) { 0, 1, 0, 0 };
+	m[2] = (vec4f_t) { 0, 0, 1, 0 };
+	m[3] = (vec4f_t) { 0, 0, 0, 1 };
+}
+
+#endif//__QF_simd_mat4f_h
diff --git a/include/QF/simd/types.h b/include/QF/simd/types.h
index cd8b0da9d..e056abfac 100644
--- a/include/QF/simd/types.h
+++ b/include/QF/simd/types.h
@@ -82,4 +82,8 @@ VEC_TYPE (int, vec4i_t);
 #define VEC4I_FMT "[%d, %d, %d, %d]"
 #define VEC4_EXP(v) (v)[0], (v)[1], (v)[2], (v)[3]
 
+#define MAT4_ROW(m, r) (m)[0][r], (m)[1][r], (m)[2][r], (m)[3][r]
+
+typedef vec4f_t mat4f_t[4];
+typedef vec4i_t mat4i_t[4];
 #endif//__QF_simd_types_h
diff --git a/libs/util/simd.c b/libs/util/simd.c
index f5a0fcd35..84acc8798 100644
--- a/libs/util/simd.c
+++ b/libs/util/simd.c
@@ -32,6 +32,8 @@
 
 #define IMPLEMENT_VEC4F_Funcs
 #define IMPLEMENT_VEC4D_Funcs
+#define IMPLEMENT_MAT4F_Funcs
 
 #include "QF/simd/vec4d.h"
 #include "QF/simd/vec4f.h"
+#include "QF/simd/mat4f.h"
diff --git a/libs/util/test/test-simd.c b/libs/util/test/test-simd.c
index 40a7276de..6fe524852 100644
--- a/libs/util/test/test-simd.c
+++ b/libs/util/test/test-simd.c
@@ -9,6 +9,7 @@
 
 #include "QF/simd/vec4d.h"
 #include "QF/simd/vec4f.h"
+#include "QF/simd/mat4f.h"
 
 #define right   { 1, 0, 0 }
 #define forward { 0, 1, 0 }
@@ -25,6 +26,22 @@
 #define none     { -1, -1, -1, -1 }
 #define nqident  {  0,  0,  0, -1 }
 
+#define identity \
+	{	{ 1, 0, 0, 0 }, \
+		{ 0, 1, 0, 0 }, \
+		{ 0, 0, 1, 0 }, \
+		{ 0, 0, 0, 1 } }
+#define rotate120 \
+	{	{ 0, 1, 0, 0 }, \
+		{ 0, 0, 1, 0 }, \
+		{ 1, 0, 0, 0 }, \
+		{ 0, 0, 0, 1 } }
+#define rotate240 \
+	{	{ 0, 0, 1, 0 }, \
+		{ 1, 0, 0, 0 }, \
+		{ 0, 1, 0, 0 }, \
+		{ 0, 0, 0, 1 } }
+
 #define s05 0.70710678118654757
 
 typedef  struct {
@@ -43,6 +60,22 @@ typedef  struct {
 	vec4f_t     ulp_errors;
 } vec4f_test_t;
 
+typedef  struct {
+	void   (*op) (mat4f_t c, const mat4f_t a, const mat4f_t b);
+	mat4f_t     a;
+	mat4f_t     b;
+	mat4f_t     expect;
+	mat4f_t     ulp_errors;
+} mat4f_test_t;
+
+typedef  struct {
+	vec4f_t   (*op) (const mat4f_t a, vec4f_t b);
+	mat4f_t     a;
+	vec4f_t     b;
+	vec4f_t     expect;
+	vec4f_t     ulp_errors;
+} mv4f_test_t;
+
 static vec4d_t tvtruncd (vec4d_t v, vec4d_t ignore)
 {
 	return vtruncd (v);
@@ -314,6 +347,26 @@ static vec4f_test_t vec4f_tests[] = {
 };
 #define num_vec4f_tests (sizeof (vec4f_tests) / (sizeof (vec4f_tests[0])))
 
+static mat4f_test_t mat4f_tests[] = {
+	{ mmulf, identity, identity, identity },
+	{ mmulf, rotate120, identity, rotate120 },
+	{ mmulf, identity, rotate120, rotate120 },
+	{ mmulf, rotate120, rotate120, rotate240 },
+	{ mmulf, rotate120, rotate240, identity },
+	{ mmulf, rotate240, rotate120, identity },
+};
+#define num_mat4f_tests (sizeof (mat4f_tests) / (sizeof (mat4f_tests[0])))
+
+static mv4f_test_t mv4f_tests[] = {
+	{ mvmulf, identity, { 1, 0, 0, 0 }, { 1, 0, 0, 0 } },
+	{ mvmulf, identity, { 0, 1, 0, 0 }, { 0, 1, 0, 0 } },
+	{ mvmulf, identity, { 0, 0, 1, 0 }, { 0, 0, 1, 0 } },
+	{ mvmulf, identity, { 0, 0, 0, 1 }, { 0, 0, 0, 1 } },
+	{ mvmulf, rotate120, { 1, 2, 3, 4 }, { 3, 1, 2, 4 } },
+	{ mvmulf, rotate240, { 1, 2, 3, 4 }, { 2, 3, 1, 4 } },
+};
+#define num_mv4f_tests (sizeof (mv4f_tests) / (sizeof (mv4f_tests[0])))
+
 static int
 run_vec4d_tests (void)
 {
@@ -326,7 +379,7 @@ run_vec4d_tests (void)
 		vec4l_t     res = result != expect;
 		if (res[0] || res[1] || res[2] || res[3]) {
 			ret |= 1;
-			printf ("\nrun_vec4d_tests\n");
+			printf ("\nrun_vec4d_tests %zd\n", i);
 			printf ("a: " VEC4D_FMT "\n", VEC4_EXP(test->a));
 			printf ("b: " VEC4D_FMT "\n", VEC4_EXP(test->b));
 			printf ("r: " VEC4D_FMT "\n", VEC4_EXP(result));
@@ -351,7 +404,7 @@ run_vec4f_tests (void)
 		vec4i_t     res = result != expect;
 		if (res[0] || res[1] || res[2] || res[3]) {
 			ret |= 1;
-			printf ("\nrun_vec4f_tests\n");
+			printf ("\nrun_vec4f_tests %zd\n", i);
 			printf ("a: " VEC4F_FMT "\n", VEC4_EXP(test->a));
 			printf ("b: " VEC4F_FMT "\n", VEC4_EXP(test->b));
 			printf ("r: " VEC4F_FMT "\n", VEC4_EXP(result));
@@ -364,11 +417,97 @@ run_vec4f_tests (void)
 	return ret;
 }
 
+static int
+run_mat4f_tests (void)
+{
+	int         ret = 0;
+
+	for (size_t i = 0; i < num_mat4f_tests; i++) {
+		__auto_type test = &mat4f_tests[i];
+		mat4f_t     result;
+		mat4f_t     expect;
+		mat4i_t     res = {};
+
+		test->op (result, test->a, test->b);
+		maddf (expect, test->expect, test->ulp_errors);
+
+		int         fail = 0;
+		for (int j = 0; j < 4; j++) {
+			res[j] = result[j] != expect[j];
+			fail |= res[j][0] || res[j][1] || res[j][2] || res[j][3];
+		}
+		if (fail) {
+			ret |= 1;
+			printf ("\nrun_mat4f_tests %zd\n", i);
+			printf ("a: " VEC4F_FMT "\n", MAT4_ROW(test->a, 0));
+			printf ("   " VEC4F_FMT "\n", MAT4_ROW(test->a, 1));
+			printf ("   " VEC4F_FMT "\n", MAT4_ROW(test->a, 2));
+			printf ("   " VEC4F_FMT "\n", MAT4_ROW(test->a, 3));
+			printf ("b: " VEC4F_FMT "\n", MAT4_ROW(test->b, 0));
+			printf ("   " VEC4F_FMT "\n", MAT4_ROW(test->b, 1));
+			printf ("   " VEC4F_FMT "\n", MAT4_ROW(test->b, 2));
+			printf ("   " VEC4F_FMT "\n", MAT4_ROW(test->b, 3));
+			printf ("r: " VEC4F_FMT "\n", MAT4_ROW(result, 0));
+			printf ("   " VEC4F_FMT "\n", MAT4_ROW(result, 1));
+			printf ("   " VEC4F_FMT "\n", MAT4_ROW(result, 2));
+			printf ("   " VEC4F_FMT "\n", MAT4_ROW(result, 3));
+			printf ("t: " VEC4I_FMT "\n", MAT4_ROW(res, 0));
+			printf ("   " VEC4I_FMT "\n", MAT4_ROW(res, 1));
+			printf ("   " VEC4I_FMT "\n", MAT4_ROW(res, 2));
+			printf ("   " VEC4I_FMT "\n", MAT4_ROW(res, 3));
+			printf ("E: " VEC4F_FMT "\n", MAT4_ROW(expect, 0));
+			printf ("   " VEC4F_FMT "\n", MAT4_ROW(expect, 1));
+			printf ("   " VEC4F_FMT "\n", MAT4_ROW(expect, 2));
+			printf ("   " VEC4F_FMT "\n", MAT4_ROW(expect, 3));
+			printf ("e: " VEC4F_FMT "\n", MAT4_ROW(test->expect, 0));
+			printf ("   " VEC4F_FMT "\n", MAT4_ROW(test->expect, 1));
+			printf ("   " VEC4F_FMT "\n", MAT4_ROW(test->expect, 2));
+			printf ("   " VEC4F_FMT "\n", MAT4_ROW(test->expect, 3));
+			printf ("u: " VEC4F_FMT "\n", MAT4_ROW(test->ulp_errors, 0));
+			printf ("   " VEC4F_FMT "\n", MAT4_ROW(test->ulp_errors, 1));
+			printf ("   " VEC4F_FMT "\n", MAT4_ROW(test->ulp_errors, 2));
+			printf ("   " VEC4F_FMT "\n", MAT4_ROW(test->ulp_errors, 3));
+		}
+	}
+	return ret;
+}
+
+static int
+run_mv4f_tests (void)
+{
+	int         ret = 0;
+
+	for (size_t i = 0; i < num_mv4f_tests; i++) {
+		__auto_type test = &mv4f_tests[i];
+		vec4f_t     result = test->op (test->a, test->b);
+		vec4f_t     expect = test->expect + test->ulp_errors;
+		vec4i_t     res = result != expect;
+
+		if (res[0] || res[1] || res[2] || res[3]) {
+			ret |= 1;
+			printf ("\nrun_mat4f_tests %zd\n", i);
+			printf ("a: " VEC4F_FMT "\n", MAT4_ROW(test->a, 0));
+			printf ("   " VEC4F_FMT "\n", MAT4_ROW(test->a, 1));
+			printf ("   " VEC4F_FMT "\n", MAT4_ROW(test->a, 2));
+			printf ("   " VEC4F_FMT "\n", MAT4_ROW(test->a, 3));
+			printf ("b: " VEC4F_FMT "\n", VEC4_EXP(test->b));
+			printf ("r: " VEC4F_FMT "\n", VEC4_EXP(result));
+			printf ("t: " VEC4I_FMT "\n", VEC4_EXP(res));
+			printf ("E: " VEC4F_FMT "\n", VEC4_EXP(expect));
+			printf ("e: " VEC4F_FMT "\n", VEC4_EXP(test->expect));
+			printf ("u: " VEC4F_FMT "\n", VEC4_EXP(test->ulp_errors));
+		}
+	}
+	return ret;
+}
+
 int
 main (void)
 {
 	int         ret = 0;
 	ret |= run_vec4d_tests ();
 	ret |= run_vec4f_tests ();
+	ret |= run_mat4f_tests ();
+	ret |= run_mv4f_tests ();
 	return ret;
 }

From eb0aa2dceaa63ccab8d025135dcf7ac8f9221064 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 3 Mar 2021 16:21:37 +0900
Subject: [PATCH 1451/1519] [renderer] Clean up most globals in efrags

There's still the memory management itself to clean up, but the main
code no longer uses any static/global variables (holdover from when the
function was recursive rather).
---
 libs/video/renderer/r_efrag.c | 61 +++++++++++++++++------------------
 1 file changed, 29 insertions(+), 32 deletions(-)

diff --git a/libs/video/renderer/r_efrag.c b/libs/video/renderer/r_efrag.c
index 8785d3d7d..4c93c935c 100644
--- a/libs/video/renderer/r_efrag.c
+++ b/libs/video/renderer/r_efrag.c
@@ -33,11 +33,9 @@
 #include "QF/render.h"
 #include "QF/sys.h"
 
+#include "qfalloca.h"
 #include "r_internal.h"
 
-static mnode_t    *r_pefragtopnode;
-static vec3_t      r_emins, r_emaxs;
-
 typedef struct s_efrag_list {
 	struct s_efrag_list *next;
 	efrag_t     efrags[MAX_EFRAGS];
@@ -48,10 +46,6 @@ static t_efrag_list *efrag_list;
 
 /* ENTITY FRAGMENT FUNCTIONS */
 
-static efrag_t   **lastlink;
-static entity_t   *r_addent;
-
-
 static inline void
 init_efrag_list (t_efrag_list *efl)
 {
@@ -133,32 +127,39 @@ R_RemoveEfrags (entity_t *ent)
 	ent->efrag = 0;
 }
 
-#define NODE_STACK_SIZE 1024
-static mnode_t *node_stack[NODE_STACK_SIZE];
-static mnode_t **node_ptr = node_stack + NODE_STACK_SIZE;
-
 static void
-R_SplitEntityOnNode (mnode_t *node)
+R_SplitEntityOnNode (mod_brush_t *brush, entity_t *ent,
+					 vec3_t emins, vec3_t emaxs)
 {
 	efrag_t    *ef;
 	plane_t    *splitplane;
 	mleaf_t    *leaf;
 	int         sides;
+	efrag_t   **lastlink;
+	mnode_t   **node_stack;
+	mnode_t   **node_ptr;
+	mnode_t    *node = brush->nodes;
 
-	*--node_ptr = 0;
+	node_stack = alloca ((brush->depth + 2) * sizeof (mnode_t *));
+	node_ptr = node_stack;
+
+	lastlink = &ent->efrag;
+
+	*node_ptr++ = 0;
 
 	while (node) {
 		// add an efrag if the node is a leaf
 		if (__builtin_expect (node->contents < 0, 0)) {
-			if (!r_pefragtopnode)
-				r_pefragtopnode = node;
+			if (!ent->topnode) {
+				ent->topnode = node;
+			}
 
 			leaf = (mleaf_t *) node;
 
 			ef = new_efrag ();	// ensures ef->entnext is 0
 
 			// add the link to the chain of links on the entity
-			ef->entity = r_addent;
+			ef->entity = ent;
 			*lastlink = ef;
 			lastlink = &ef->entnext;
 
@@ -167,28 +168,29 @@ R_SplitEntityOnNode (mnode_t *node)
 			ef->leafnext = leaf->efrags;
 			leaf->efrags = ef;
 
-			node = *node_ptr++;
+			node = *--node_ptr;
 		} else {
 			// NODE_MIXED
 			splitplane = node->plane;
-			sides = BOX_ON_PLANE_SIDE (r_emins, r_emaxs, splitplane);
+			sides = BOX_ON_PLANE_SIDE (emins, emaxs, splitplane);
 
 			if (sides == 3) {
 				// split on this plane
 				// if this is the first splitter of this bmodel, remember it
-				if (!r_pefragtopnode)
-					r_pefragtopnode = node;
+				if (!ent->topnode) {
+					ent->topnode = node;
+				}
 			}
 			// recurse down the contacted sides
 			if (sides & 1 && node->children[0]->contents != CONTENTS_SOLID) {
 				if (sides & 2 && node->children[1]->contents != CONTENTS_SOLID)
-					*--node_ptr = node->children[1];
+					*node_ptr++ = node->children[1];
 				node = node->children[0];
 			} else {
 				if (sides & 2 && node->children[1]->contents != CONTENTS_SOLID)
 					node = node->children[1];
 				else
-					node = *node_ptr++;
+					node = *--node_ptr;
 			}
 		}
 	}
@@ -198,6 +200,7 @@ void
 R_AddEfrags (mod_brush_t *brush, entity_t *ent)
 {
 	model_t    *entmodel;
+	vec3_t      emins, emaxs;
 
 	if (!ent->model || !r_worldentity.model)
 		return;
@@ -205,19 +208,13 @@ R_AddEfrags (mod_brush_t *brush, entity_t *ent)
 	if (ent == &r_worldentity)
 		return;							// never add the world
 
-	r_addent = ent;
-
-	lastlink = &ent->efrag;
-	r_pefragtopnode = 0;
-
 	entmodel = ent->model;
 
-	VectorAdd (ent->origin, entmodel->mins, r_emins);
-	VectorAdd (ent->origin, entmodel->maxs, r_emaxs);
+	VectorAdd (ent->origin, entmodel->mins, emins);
+	VectorAdd (ent->origin, entmodel->maxs, emaxs);
 
-	R_SplitEntityOnNode (brush->nodes);
-
-	ent->topnode = r_pefragtopnode;
+	ent->topnode = 0;
+	R_SplitEntityOnNode (brush, ent, emins, emaxs);
 }
 
 void

From 60348ab458561afb26409e1d83fe0067d806f046 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 3 Mar 2021 16:34:44 +0900
Subject: [PATCH 1452/1519] [headers] Fix some inconsistent include guards

---
 include/QF/cexpr.h  | 6 +++---
 include/QF/cmem.h   | 6 +++---
 include/QF/darray.h | 8 +++++---
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/include/QF/cexpr.h b/include/QF/cexpr.h
index 4e2dd3bcb..9a79690a6 100644
--- a/include/QF/cexpr.h
+++ b/include/QF/cexpr.h
@@ -24,8 +24,8 @@
 		Boston, MA  02111-1307, USA
 
 */
-#ifndef __expr_h
-#define __expr_h
+#ifndef __QF_expr_h
+#define __QF_expr_h
 
 #include <stdlib.h>
 
@@ -140,4 +140,4 @@ extern exprtype_t cexpr_plitem;
 extern binop_t cexpr_struct_binops[];
 extern binop_t cexpr_struct_pointer_binops[];
 
-#endif
+#endif//__QF_expr_h
diff --git a/include/QF/cmem.h b/include/QF/cmem.h
index 5f0d733ea..f9c47d4c1 100644
--- a/include/QF/cmem.h
+++ b/include/QF/cmem.h
@@ -24,8 +24,8 @@
 		Boston, MA  02111-1307, USA
 
 */
-#ifndef __cmem_h
-#define __cmem_h
+#ifndef __QF_cmem_h
+#define __QF_cmem_h
 
 #include "QF/qtypes.h"
 
@@ -115,4 +115,4 @@ void delete_memsuper (memsuper_t *super);
 void *cmemalloc (memsuper_t *super, size_t size);
 void cmemfree (memsuper_t *super, void *mem);
 
-#endif//__cmem_h
+#endif//__QF_cmem_h
diff --git a/include/QF/darray.h b/include/QF/darray.h
index 50dc6c348..c2e21d7e1 100644
--- a/include/QF/darray.h
+++ b/include/QF/darray.h
@@ -28,8 +28,10 @@
 
 */
 
-#ifndef __darray_h
-#define __darray_h
+#ifndef __QF_darray_h
+#define __QF_darray_h
+
+#include "QF/sys.h"
 
 /** \defgroup darray Dynamic Arrays
 	\ingroup utils
@@ -363,4 +365,4 @@
 
 ///@}
 
-#endif//__darray_h
+#endif//__QF_darray_h

From e3762d8f38dec6a7617c49deb4b619ff69f9c314 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 3 Mar 2021 18:01:35 +0900
Subject: [PATCH 1453/1519] [util] Make plist mostly null-safe

The main purpose is to allow fluent-style:
    const char *targetname = PL_String (PL_ObjectForKey (entity, "targetname"));
    if (targetname && !PL_ObjectForKey (targets, targetname)) {
        PL_D_AddObject (targets, targetname, entity);
    }

[note: the above is iffy due to ownership of entity, but the code from
which the above comes works around the issue]
---
 include/QF/qfplist.h |  52 ++++++++-------
 libs/util/qfplist.c  | 152 ++++++++++++++++++++++++-------------------
 2 files changed, 113 insertions(+), 91 deletions(-)

diff --git a/include/QF/qfplist.h b/include/QF/qfplist.h
index cef305086..a4994476d 100644
--- a/include/QF/qfplist.h
+++ b/include/QF/qfplist.h
@@ -136,14 +136,14 @@ char *PL_WritePropertyList (const plitem_t *pl);
 
 /** Retrieve the type of an object.
 
-	\param item The object
+	\param item The object. Must not be null.
 	\return the type of the object
 */
 pltype_t PL_Type (const plitem_t *item) __attribute__((pure));
 
 /** Retrieve the line number of an object.
 
-	\param item The object
+	\param item The object. Must not be null.
 	\return the line number on which the object began, or 0 if not from a
 			string
 */
@@ -152,15 +152,16 @@ int PL_Line (const plitem_t *item) __attribute__((pure));
 /** Retrieve the data size from a binary object.
 
 	\param binary The binary object
-	\return the size in bytes of the binary object 0 if binary isn't a binary
-	object.
+	\return the size in bytes of the binary object 0 if \a binary isn't a
+	binary object (includes if \a binary is null).
 */
 size_t PL_BinarySize (const plitem_t *binary) __attribute__((pure));
 
 /** Retrieve the data from a binary object.
 
 	\param binary The binary object
-	\return pointer to the actual data or NULL if binary isn't a binary object.
+	\return pointer to the actual data or NULL if \b binary isn't a binary
+	object (includes if \a binary is null).
 	\note	You are NOT responsible for freeing the returned object. It will
 	be destroyed when its container is.
 */
@@ -170,7 +171,7 @@ const void *PL_BinaryData (const plitem_t *binary) __attribute__((pure));
 
 	\param string The string object
 	\return pointer to the actual string value or NULL if string isn't a
-	string.
+	string (includes if \a string is null).
 	\note	You are NOT responsible for freeing the returned object. It will
 	be destroyed when its container is.
 */
@@ -180,8 +181,8 @@ const char *PL_String (const plitem_t *string) __attribute__((pure));
 
 	\param dict	The dictionary to retrieve a value from
 	\param key	The unique key associated with the value
-	\return the value associated with the key, or NULL if not found or dict
-	isn't a dictionary.
+	\return the value associated with the key, or NULL if not found or \a dict
+	isn't a dictionary (includes if \a dict is null).
 	\note	You are NOT responsible for freeing the returned object. It will
 	be destroyed when its container is.
 */
@@ -191,8 +192,8 @@ plitem_t *PL_ObjectForKey (const plitem_t *dict, const char *key);
 
 	\param dict	The Dictionary to remove the value from
 	\param key	The unique key associated with the value to be removed
-	\return the value associated with the key, or NULL if not found or dict
-	isn't a dictionary.
+	\return the value associated with the key, or NULL if not found or \a dict
+	isn't a dictionary (includes if \a dict is null).
 	\note	You are responsible for freeing the returned object.
 */
 plitem_t *PL_RemoveObjectForKey (const plitem_t *dict, const char *key);
@@ -202,19 +203,18 @@ plitem_t *PL_RemoveObjectForKey (const plitem_t *dict, const char *key);
 	\param dict		The dictionary to get the key from
 	\param index	The index of the key
 	\return the key at the specified index, or NULL if index is out of range or
-	dict is not a dictionaly
-	isn't an array.
+	dict is not a dictionary (includes if \a dict is null).
 	\note	You are NOT responsible for freeing the returned object. It will
 	be destroyed when its container is.
 */
-const char *PL_KeyAtIndex (const plitem_t *array, int index) __attribute__((pure));
+const char *PL_KeyAtIndex (const plitem_t *dict, int index) __attribute__((pure));
 
 /** Retrieve a value from an array object.
 
 	\param array	The array to get the value from
 	\param index	The index within the array to retrieve
-	\return the value at the specified index, or NULL if index is out of range
-	or array is not an array.
+	\return the value at the specified index, or NULL if \a index is out of
+	range or \a array is not an array (includes in \a array is null).
 	\note	You are NOT responsible for freeing the returned object. It will
 	be destroyed when its container is.
 */
@@ -223,7 +223,8 @@ plitem_t *PL_ObjectAtIndex (const plitem_t *array, int index) __attribute__((pur
 /** Retrieve a list of all keys in a dictionary.
 
 	\param dict The dictionary to list
-	\return an Array containing Strings or NULL if dict isn't a dictionary
+	\return an Array containing Strings or NULL if \a dict isn't a dictionary
+	(includes if \a dict is null).
 	\note You are responsible for freeing this array.
 */
 plitem_t *PL_D_AllKeys (const plitem_t *dict);
@@ -232,7 +233,8 @@ plitem_t *PL_D_AllKeys (const plitem_t *dict);
 
 	\param dict The dictionary to get the number of keys of.
 
-	\return Returns the number of keys in the dictionary.
+	\return Returns the number of keys in the dictionary or 0 if \a dict isn't
+	a dictionary (includes if \a dict is null).
 */
 int PL_D_NumKeys (const plitem_t *dict) __attribute__((pure));
 
@@ -242,7 +244,8 @@ int PL_D_NumKeys (const plitem_t *dict) __attribute__((pure));
 	\param key The key of the key/value pair to be added to the dictionary
 	\param value The value of the key/value pair to be added to the dictionary
 
-	\return true on success, false on failure
+	\return true on success, false on failure (\a dict is null or not a
+	dictionary)
 
 	\note the dictionary becomes the owner of the value.
 */
@@ -253,7 +256,8 @@ qboolean PL_D_AddObject (plitem_t *dict, const char *key, plitem_t *value);
 	\param array The array to which the item will be added
 	\param item The item to be added to the array
 
-	\return true on success, false on failure
+	\return true on success, false on failure (\a array is null or not an
+	array)
 
 	\note the array becomes the owner of the added item.
 */
@@ -263,7 +267,8 @@ qboolean PL_A_AddObject (plitem_t *array, plitem_t *item);
 
 	\param array The array from which to get the number of objects
 
-	\return number of objects in the array
+	\return number of objects in the array or 0 if \a array is null or not
+	an array.
 */
 int PL_A_NumObjects (const plitem_t *array) __attribute__((pure));
 
@@ -273,7 +278,8 @@ int PL_A_NumObjects (const plitem_t *array) __attribute__((pure));
 	\param item The item to be added to the array
 	\param index The location at which to insert the item into the array
 
-	\return true on success, false on failure
+	\return true on success, false on failure (\a array is null or not an
+	array).
 
 	\note the array becomes the owner of the added item.
 */
@@ -285,7 +291,7 @@ qboolean PL_A_InsertObjectAtIndex (plitem_t *array, plitem_t *item, int index);
 	\param array	The array from which to remove the value
 	\param index	The index within the array to remove
 	\return the value associated with the index, or NULL if not found or array
-	isn't an array.
+	is noll or an array.
 	\note	You are responsible for freeing the returned object.
 */
 plitem_t *PL_RemoveObjectAtIndex (plitem_t *array, int index);
@@ -323,7 +329,7 @@ plitem_t *PL_NewString (const char *str);
 /** Free a property list object.
 
 	This function takes care of freeing any referenced property list data, so
-	call it only on top-level objects.
+	call it only on top-level objects. Safe to call with a null argument.
 
 	\param item the property list object to be freed
 */
diff --git a/libs/util/qfplist.c b/libs/util/qfplist.c
index 56c168168..454c549f7 100644
--- a/libs/util/qfplist.c
+++ b/libs/util/qfplist.c
@@ -132,11 +132,11 @@ init_quotables (void)
 		quotable_bitmap[*c / 8] &= ~(1 << (*c % 8));
 }
 
-static plitem_t *PL_ParsePropertyListItem (pldata_t *);
-static qboolean PL_SkipSpace (pldata_t *);
-static char *PL_ParseQuotedString (pldata_t *);
-static char *PL_ParseUnquotedString (pldata_t *);
-static char *PL_ParseData (pldata_t *, int *);
+static plitem_t *pl_parsepropertylistitem (pldata_t *);
+static qboolean pl_skipspace (pldata_t *);
+static char *pl_parsequotedstring (pldata_t *);
+static char *pl_parseunquotedstring (pldata_t *);
+static char *pl_parsedata (pldata_t *, int *);
 
 static const char *
 dict_get_key (const void *i, void *unused)
@@ -156,7 +156,7 @@ dict_free (void *i, void *unused)
 }
 
 static plitem_t *
-PL_NewItem (pltype_t type)
+pl_newitem (pltype_t type)
 {
 	plitem_t   *item = calloc (1, sizeof (plitem_t));
 	item->type = type;
@@ -166,7 +166,7 @@ PL_NewItem (pltype_t type)
 VISIBLE plitem_t *
 PL_NewDictionary (hashlink_t **hashlinks)
 {
-	plitem_t   *item = PL_NewItem (QFDictionary);
+	plitem_t   *item = pl_newitem (QFDictionary);
 	pldict_t   *dict = malloc (sizeof (pldict_t));
 	dict->tab = Hash_NewTable (1021, dict_get_key, dict_free, NULL, hashlinks);
 	DARRAY_INIT (&dict->keys, 8);
@@ -177,7 +177,7 @@ PL_NewDictionary (hashlink_t **hashlinks)
 VISIBLE plitem_t *
 PL_NewArray (void)
 {
-	plitem_t   *item = PL_NewItem (QFArray);
+	plitem_t   *item = pl_newitem (QFArray);
 	plarray_t  *array = calloc (1, sizeof (plarray_t));
 	item->data = array;
 	return item;
@@ -186,7 +186,7 @@ PL_NewArray (void)
 VISIBLE plitem_t *
 PL_NewData (void *data, size_t size)
 {
-	plitem_t   *item = PL_NewItem (QFBinary);
+	plitem_t   *item = pl_newitem (QFBinary);
 	plbinary_t *bin = malloc (sizeof (plbinary_t));
 	item->data = bin;
 	bin->data = data;
@@ -197,7 +197,7 @@ PL_NewData (void *data, size_t size)
 static plitem_t *
 new_string (char *str, int line)
 {
-	plitem_t   *item = PL_NewItem (QFString);
+	plitem_t   *item = pl_newitem (QFString);
 	item->data = str;
 	item->line = line;
 	return item;
@@ -215,6 +215,9 @@ PL_Free (plitem_t *item)
 	pldict_t   *dict;
 	plarray_t  *array;
 
+	if (!item) {
+		return;
+	}
 	switch (item->type) {
 		case QFDictionary:
 			dict = item->data;
@@ -252,51 +255,54 @@ PL_Free (plitem_t *item)
 VISIBLE size_t
 PL_BinarySize (const plitem_t *binary)
 {
-	plbinary_t *bin = (plbinary_t *) binary->data;
-
-	if (binary->type != QFBinary)
+	if (!binary || binary->type != QFBinary) {
 		return 0;
+	}
+
+	plbinary_t *bin = (plbinary_t *) binary->data;
 	return bin->size;
 }
 
 VISIBLE const void *
 PL_BinaryData (const plitem_t *binary)
 {
-	plbinary_t *bin = (plbinary_t *) binary->data;
-
-	if (binary->type != QFBinary)
+	if (!binary || binary->type != QFBinary) {
 		return 0;
+	}
+
+	plbinary_t *bin = (plbinary_t *) binary->data;
 	return bin->data;
 }
 
 VISIBLE const char *
 PL_String (const plitem_t *string)
 {
-	if (string->type != QFString)
+	if (!string || string->type != QFString) {
 		return NULL;
+	}
 	return string->data;
 }
 
 VISIBLE plitem_t *
 PL_ObjectForKey (const plitem_t *item, const char *key)
 {
-	pldict_t   *dict = (pldict_t *) item->data;
-	dictkey_t  *k;
-
-	if (item->type != QFDictionary)
+	if (!item || item->type != QFDictionary) {
 		return NULL;
+	}
 
-	k = (dictkey_t *) Hash_Find (dict->tab, key);
+	pldict_t   *dict = (pldict_t *) item->data;
+	dictkey_t  *k = (dictkey_t *) Hash_Find (dict->tab, key);
 	return k ? k->value : NULL;
 }
 
 VISIBLE const char *
 PL_KeyAtIndex (const plitem_t *item, int index)
 {
-	pldict_t   *dict = (pldict_t *) item->data;
-
-	if (item->type != QFDictionary)
+	if (!item || item->type != QFDictionary) {
 		return NULL;
+	}
+
+	pldict_t   *dict = (pldict_t *) item->data;
 	if (index < 0 || (size_t) index >= dict->keys.size) {
 		return NULL;
 	}
@@ -307,13 +313,14 @@ PL_KeyAtIndex (const plitem_t *item, int index)
 VISIBLE plitem_t *
 PL_RemoveObjectForKey (const plitem_t *item, const char *key)
 {
+	if (!item || item->type != QFDictionary) {
+		return NULL;
+	}
+
 	pldict_t   *dict = (pldict_t *) item->data;
 	dictkey_t  *k;
 	plitem_t   *value;
 
-	if (item->type != QFDictionary)
-		return NULL;
-
 	k = (dictkey_t *) Hash_Del (dict->tab, key);
 	if (!k)
 		return NULL;
@@ -332,13 +339,14 @@ PL_RemoveObjectForKey (const plitem_t *item, const char *key)
 VISIBLE plitem_t *
 PL_D_AllKeys (const plitem_t *item)
 {
+	if (!item || item->type != QFDictionary) {
+		return NULL;
+	}
+
 	pldict_t   *dict = (pldict_t *) item->data;
 	dictkey_t  *current;
 	plitem_t   *array;
 
-	if (item->type != QFDictionary)
-		return NULL;
-
 	if (!(array = PL_NewArray ()))
 		return NULL;
 
@@ -353,32 +361,35 @@ PL_D_AllKeys (const plitem_t *item)
 VISIBLE int
 PL_D_NumKeys (const plitem_t *item)
 {
-	pldict_t   *dict = (pldict_t *) item->data;
-	if (item->type != QFDictionary)
+	if (!item || item->type != QFDictionary) {
 		return 0;
+	}
+
+	pldict_t   *dict = (pldict_t *) item->data;
 	return Hash_NumElements (dict->tab);
 }
 
 VISIBLE plitem_t *
 PL_ObjectAtIndex (const plitem_t *array, int index)
 {
-	plarray_t  *arr = (plarray_t *) array->data;
-
-	if (array->type != QFArray)
+	if (!array || array->type != QFArray) {
 		return NULL;
+	}
 
+	plarray_t  *arr = (plarray_t *) array->data;
 	return index >= 0 && index < arr->numvals ? arr->values[index] : NULL;
 }
 
 VISIBLE qboolean
 PL_D_AddObject (plitem_t *item, const char *key, plitem_t *value)
 {
+	if (!item || item->type != QFDictionary || !value) {
+		return false;
+	}
+
 	pldict_t   *dict = (pldict_t *) item->data;
 	dictkey_t	*k;
 
-	if (item->type != QFDictionary)
-		return false;
-
 	if ((k = Hash_Find (dict->tab, key))) {
 		PL_Free ((plitem_t *) k->value);
 		k->value = value;
@@ -400,10 +411,11 @@ PL_D_AddObject (plitem_t *item, const char *key, plitem_t *value)
 VISIBLE qboolean
 PL_A_InsertObjectAtIndex (plitem_t *array, plitem_t *item, int index)
 {
-	plarray_t  *arr;
-
-	if (array->type != QFArray)
+	if (!array || array->type != QFArray || !item) {
 		return false;
+	}
+
+	plarray_t  *arr;
 
 	arr = (plarray_t *)array->data;
 
@@ -442,20 +454,22 @@ PL_A_AddObject (plitem_t *array, plitem_t *item)
 VISIBLE int
 PL_A_NumObjects (const plitem_t *array)
 {
-	if (array->type != QFArray)
+	if (!array || array->type != QFArray) {
 		return 0;
+	}
 	return ((plarray_t *) array->data)->numvals;
 }
 
 VISIBLE plitem_t *
 PL_RemoveObjectAtIndex (plitem_t *array, int index)
 {
+	if (!array || array->type != QFArray) {
+		return 0;
+	}
+
 	plarray_t  *arr;
 	plitem_t   *item;
 
-	if (array->type != QFArray)
-		return 0;
-
 	arr = (plarray_t *)array->data;
 
 	if (index < 0 || index >= arr->numvals)
@@ -472,7 +486,7 @@ PL_RemoveObjectAtIndex (plitem_t *array, int index)
 }
 
 static qboolean
-PL_SkipSpace (pldata_t *pl)
+pl_skipspace (pldata_t *pl)
 {
 	while (pl->pos < pl->end) {
 		char	c = pl->ptr[pl->pos];
@@ -545,7 +559,7 @@ make_byte (byte h, byte l)
 }
 
 static char *
-PL_ParseData (pldata_t *pl, int *len)
+pl_parsedata (pldata_t *pl, int *len)
 {
 	unsigned    start = ++pl->pos;
 	int         nibbles = 0, i;
@@ -578,7 +592,7 @@ PL_ParseData (pldata_t *pl, int *len)
 }
 
 static char *
-PL_ParseQuotedString (pldata_t *pl)
+pl_parsequotedstring (pldata_t *pl)
 {
 	unsigned int	start = ++pl->pos;
 	unsigned int	escaped = 0;
@@ -731,7 +745,7 @@ PL_ParseQuotedString (pldata_t *pl)
 }
 
 static char *
-PL_ParseUnquotedString (pldata_t *pl)
+pl_parseunquotedstring (pldata_t *pl)
 {
 	unsigned int	start = pl->pos;
 	char			*str;
@@ -747,11 +761,11 @@ PL_ParseUnquotedString (pldata_t *pl)
 }
 
 static plitem_t *
-PL_ParsePropertyListItem (pldata_t *pl)
+pl_parsepropertylistitem (pldata_t *pl)
 {
 	plitem_t	*item = NULL;
 
-	if (!PL_SkipSpace (pl))
+	if (!pl_skipspace (pl))
 		return NULL;
 
 	switch (pl->ptr[pl->pos]) {
@@ -762,16 +776,16 @@ PL_ParsePropertyListItem (pldata_t *pl)
 
 		pl->pos++;
 
-		while (PL_SkipSpace (pl) && pl->ptr[pl->pos] != '}') {
+		while (pl_skipspace (pl) && pl->ptr[pl->pos] != '}') {
 			plitem_t	*key;
 			plitem_t	*value;
 
-			if (!(key = PL_ParsePropertyListItem (pl))) {
+			if (!(key = pl_parsepropertylistitem (pl))) {
 				PL_Free (item);
 				return NULL;
 			}
 
-			if (!(PL_SkipSpace (pl))) {
+			if (!(pl_skipspace (pl))) {
 				PL_Free (key);
 				PL_Free (item);
 				return NULL;
@@ -793,13 +807,13 @@ PL_ParsePropertyListItem (pldata_t *pl)
 			pl->pos++;
 
 			// If there is no value, lose the key
-			if (!(value = PL_ParsePropertyListItem (pl))) {
+			if (!(value = pl_parsepropertylistitem (pl))) {
 				PL_Free (key);
 				PL_Free (item);
 				return NULL;
 			}
 
-			if (!(PL_SkipSpace (pl))) {
+			if (!(pl_skipspace (pl))) {
 				PL_Free (key);
 				PL_Free (value);
 				PL_Free (item);
@@ -842,15 +856,15 @@ PL_ParsePropertyListItem (pldata_t *pl)
 
 		pl->pos++;
 
-		while (PL_SkipSpace (pl) && pl->ptr[pl->pos] != ')') {
+		while (pl_skipspace (pl) && pl->ptr[pl->pos] != ')') {
 			plitem_t	*value;
 
-			if (!(value = PL_ParsePropertyListItem (pl))) {
+			if (!(value = pl_parsepropertylistitem (pl))) {
 				PL_Free (item);
 				return NULL;
 			}
 
-			if (!(PL_SkipSpace (pl))) {
+			if (!(pl_skipspace (pl))) {
 				PL_Free (value);
 				PL_Free (item);
 				return NULL;
@@ -879,7 +893,7 @@ PL_ParsePropertyListItem (pldata_t *pl)
 
 	case '<': {
 		int len;
-		char *str = PL_ParseData (pl, &len);
+		char *str = pl_parsedata (pl, &len);
 
 		if (!str) {
 			return NULL;
@@ -892,7 +906,7 @@ PL_ParsePropertyListItem (pldata_t *pl)
 
 	case '"': {
 		int line = pl->line;
-		char *str = PL_ParseQuotedString (pl);
+		char *str = pl_parsequotedstring (pl);
 
 		if (!str) {
 			return NULL;
@@ -903,7 +917,7 @@ PL_ParsePropertyListItem (pldata_t *pl)
 
 	default: {
 		int line = pl->line;
-		char *str = PL_ParseUnquotedString (pl);
+		char *str = pl_parseunquotedstring (pl);
 
 		if (!str) {
 			return NULL;
@@ -931,7 +945,7 @@ PL_GetPropertyList (const char *string, hashlink_t **hashlinks)
 	pl->va_ctx = va_create_context (4);
 	pl->hashlinks = hashlinks;
 
-	if ((newpl = PL_ParsePropertyListItem (pl))) {
+	if ((newpl = pl_parsepropertylistitem (pl))) {
 		va_destroy_context (pl->va_ctx);
 		free (pl);
 		return newpl;
@@ -1111,10 +1125,12 @@ PL_WritePropertyList (const plitem_t *pl)
 {
 	dstring_t  *dstr = dstring_newstr ();
 
-	if (!quotable_bitmap[0])
-		init_quotables ();
-	write_item (dstr, pl, 0);
-	write_string_len (dstr, "\n", 1);
+	if (pl) {
+		if (!quotable_bitmap[0])
+			init_quotables ();
+		write_item (dstr, pl, 0);
+		write_string_len (dstr, "\n", 1);
+	}
 	return dstring_freeze (dstr);
 }
 

From 2cc30f9dfdf897fccdc61e30c99103e04cac67d7 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 3 Mar 2021 18:10:58 +0900
Subject: [PATCH 1454/1519] [headers] Fix a doxygen warning

---
 include/QF/darray.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/QF/darray.h b/include/QF/darray.h
index c2e21d7e1..0ea0a26d6 100644
--- a/include/QF/darray.h
+++ b/include/QF/darray.h
@@ -100,7 +100,7 @@
 	\param array_size   The size of the array.
 	\param alloc		Allocator taking (obj, size) where obj is allocator
 						specific data (eg, a memory pool).
-	\param data			Additional data for the allocator.
+	\param obj			Additional data for the allocator.
 */
 #define DARRAY_ALLOCFIXED_OBJ(array_type, array_size, alloc, obj)		\
 	({																	\

From 0da3b35ef566f451617d5b3866c8c449e7678c4a Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 3 Mar 2021 18:11:59 +0900
Subject: [PATCH 1455/1519] [util] Add macro for using vectors with scanf

---
 include/QF/math/vector.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/include/QF/math/vector.h b/include/QF/math/vector.h
index 630332907..6189d002c 100644
--- a/include/QF/math/vector.h
+++ b/include/QF/math/vector.h
@@ -176,6 +176,8 @@ extern const vec_t *const vec3_origin;
 
 //For printf etc
 #define VectorExpand(v) (v)[0], (v)[1], (v)[2]
+//For scanf etc
+#define VectorExpandAddr(v) &(v)[0], &(v)[1], &(v)[2]
 
 /*
  * VectorDistance, the distance between two points.

From 4d8ce22c17e67df9ed1d6fb5ce0faaddb4d97d5d Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 3 Mar 2021 18:14:16 +0900
Subject: [PATCH 1456/1519] [vulkan] Load the map's lights into an array

It's not used yet as work needs to be done to better support generic
entities, but this is the next step to real-time lighting (though, to be
honest, I expect it will be too slow to be usable).
---
 include/QF/Vulkan/qf_lighting.h               |   7 +-
 .../renderer/vulkan/shader/lighting.frag      |   2 +-
 libs/video/renderer/vulkan/vulkan_lighting.c  | 108 ++++++++++++++++++
 libs/video/renderer/vulkan/vulkan_main.c      |   2 +
 4 files changed, 116 insertions(+), 3 deletions(-)

diff --git a/include/QF/Vulkan/qf_lighting.h b/include/QF/Vulkan/qf_lighting.h
index 8eaa53a6f..cd9e7d46c 100644
--- a/include/QF/Vulkan/qf_lighting.h
+++ b/include/QF/Vulkan/qf_lighting.h
@@ -40,11 +40,13 @@ typedef struct qfv_light_s {
 	vec3_t      color;
 	float       intensity;
 	vec3_t      position;
-	int         radius;
+	float       radius;
 	vec3_t      direction;
 	float       cone;
 } qfv_light_t;
 
+typedef struct qfv_lightset_s DARRAY_TYPE (qfv_light_t) qfv_lightset_t;
+
 #define NUM_LIGHTS 128
 
 typedef struct qfv_light_buffer_s {
@@ -52,7 +54,6 @@ typedef struct qfv_light_buffer_s {
 	qfv_light_t lights[NUM_LIGHTS] __attribute__((aligned(16)));
 } qfv_light_buffer_t;
 
-
 #define LIGHTING_BUFFER_INFOS 1
 #define LIGHTING_IMAGE_INFOS 4
 
@@ -73,6 +74,7 @@ typedef struct lightingctx_s {
 	VkPipeline   pipeline;
 	VkPipelineLayout layout;
 	VkDeviceMemory light_memory;
+	qfv_lightset_t lights;
 } lightingctx_t;
 
 struct vulkan_ctx_s;
@@ -80,5 +82,6 @@ struct vulkan_ctx_s;
 void Vulkan_Lighting_Init (struct vulkan_ctx_s *ctx);
 void Vulkan_Lighting_Shutdown (struct vulkan_ctx_s *ctx);
 void Vulkan_Lighting_Draw (struct vulkan_ctx_s *ctx);
+void Vulkan_LoadLights (const char *entity_data, struct vulkan_ctx_s *ctx);
 
 #endif//__QF_Vulkan_qf_lighting_h
diff --git a/libs/video/renderer/vulkan/shader/lighting.frag b/libs/video/renderer/vulkan/shader/lighting.frag
index 3dfb755be..e2db7cc78 100644
--- a/libs/video/renderer/vulkan/shader/lighting.frag
+++ b/libs/video/renderer/vulkan/shader/lighting.frag
@@ -9,7 +9,7 @@ struct LightData {
 	vec3        color;
 	float       intensity;
 	vec3        position;
-	int         radius;
+	float       radius;
 	vec3        direction;
 	float       cone;
 };
diff --git a/libs/video/renderer/vulkan/vulkan_lighting.c b/libs/video/renderer/vulkan/vulkan_lighting.c
index 8e41cf312..07f0f9927 100644
--- a/libs/video/renderer/vulkan/vulkan_lighting.c
+++ b/libs/video/renderer/vulkan/vulkan_lighting.c
@@ -41,6 +41,10 @@
 
 #include "qfalloca.h"
 
+#include "QF/dstring.h"
+#include "QF/progs.h"
+#include "QF/qfplist.h"
+#include "QF/script.h"
 #include "QF/sys.h"
 #include "QF/va.h"
 
@@ -203,6 +207,8 @@ Vulkan_Lighting_Init (vulkan_ctx_t *ctx)
 	lightingctx_t *lctx = calloc (1, sizeof (lightingctx_t));
 	ctx->lighting_context = lctx;
 
+	DARRAY_INIT (&lctx->lights, 16);
+
 	size_t      frames = ctx->frames.size;
 	DARRAY_INIT (&lctx->frames, frames);
 	DARRAY_RESIZE (&lctx->frames, frames);
@@ -295,6 +301,108 @@ Vulkan_Lighting_Shutdown (vulkan_ctx_t *ctx)
 	}
 	dfunc->vkFreeMemory (device->dev, lctx->light_memory, 0);
 	dfunc->vkDestroyPipeline (device->dev, lctx->pipeline, 0);
+	DARRAY_CLEAR (&lctx->lights);
 	free (lctx->frames.a);
 	free (lctx);
 }
+
+static void
+parse_light (qfv_light_t *light, const plitem_t *entity,
+			 const plitem_t *targets)
+{
+	const char *str;
+
+	if ((str = PL_String (PL_ObjectForKey (entity, "origin")))) {
+		sscanf (str, "%f %f %f", VectorExpandAddr (light->position));
+	}
+
+	light->cone = 1;
+	if ((str = PL_String (PL_ObjectForKey (entity, "target")))) {
+		vec3_t      position = {};
+		plitem_t   *target = PL_ObjectForKey (targets, str);
+		if (target) {
+			if ((str = PL_String (PL_ObjectForKey (target, "origin")))) {
+				sscanf (str, "%f %f %f", VectorExpandAddr (position));
+			}
+			VectorSubtract (position, light->position, light->direction);
+			VectorNormalize (light->direction);
+		}
+
+		float angle = 40;
+		if ((str = PL_String (PL_ObjectForKey (entity, "angle")))) {
+			angle = atof (str);
+		}
+		light->cone = -cos (angle * M_PI / 360); // half angle
+	}
+
+	light->intensity = 1;
+	if ((str = PL_String (PL_ObjectForKey (entity, "light")))
+		|| (str = PL_String (PL_ObjectForKey (entity, "_light")))) {
+		light->radius = atof (str);
+	}
+
+	VectorSet (1, 1, 1, light->color);
+}
+
+void
+Vulkan_LoadLights (const char *entity_data, vulkan_ctx_t *ctx)
+{
+	lightingctx_t *lctx = ctx->lighting_context;
+	plitem_t   *entities = 0;
+
+	lctx->lights.size = 0;
+
+	script_t   *script = Script_New ();
+	Script_Start (script, "ent data", entity_data);
+
+	if (Script_GetToken (script, 1)) {
+		if (strequal (script->token->str, "(")) {
+			// new style (plist) entity data
+			entities = PL_GetPropertyList (entity_data, &ctx->hashlinks);
+		} else {
+			// old style entity data
+			Script_UngetToken (script);
+			// FIXME ED_ConvertToPlist aborts if an error is encountered.
+			entities = ED_ConvertToPlist (script, 0, &ctx->hashlinks);
+		}
+	}
+	Script_Delete (script);
+
+	if (entities) {
+		plitem_t   *targets = PL_NewDictionary (&ctx->hashlinks);
+
+		// find all the targets so spotlights can be aimed
+		for (int i = 1; i < PL_A_NumObjects (entities); i++) {
+			plitem_t   *entity = PL_ObjectAtIndex (entities, i);
+			const char *targetname = PL_String (PL_ObjectForKey (entity,
+																 "targetname"));
+			if (targetname && !PL_ObjectForKey (targets, targetname)) {
+				PL_D_AddObject (targets, targetname, entity);
+			}
+		}
+
+		for (int i = 1; i < PL_A_NumObjects (entities); i++) {
+			plitem_t   *entity = PL_ObjectAtIndex (entities, i);
+			const char *classname = PL_String (PL_ObjectForKey (entity,
+																"classname"));
+			if (classname && strnequal (classname, "light", 5)) {
+				qfv_light_t light = {};
+
+				parse_light (&light, entity, targets);
+				printf ("[%g, %g, %g] %g, [%g %g %g] %g, [%g %g %g] %g\n",
+						VectorExpand (light.color), light.intensity,
+						VectorExpand (light.position), light.radius,
+						VectorExpand (light.direction), light.cone);
+				DARRAY_APPEND (&lctx->lights, light);
+			}
+		}
+		// targets does not own the objects, so need to remove them before
+		// freeing targets
+		for (int i = PL_D_NumKeys (targets); i-- > 0; ) {
+			PL_RemoveObjectForKey (targets, PL_KeyAtIndex (targets, i));
+		}
+		PL_Free (targets);
+		PL_Free (entities);
+	}
+	printf ("loaded %zd lights\n", lctx->lights.size);
+}
diff --git a/libs/video/renderer/vulkan/vulkan_main.c b/libs/video/renderer/vulkan/vulkan_main.c
index b4bdc8872..69916682e 100644
--- a/libs/video/renderer/vulkan/vulkan_main.c
+++ b/libs/video/renderer/vulkan/vulkan_main.c
@@ -49,6 +49,7 @@
 #include "QF/Vulkan/qf_alias.h"
 #include "QF/Vulkan/qf_bsp.h"
 //#include "QF/Vulkan/qf_iqm.h"
+#include "QF/Vulkan/qf_lighting.h"
 #include "QF/Vulkan/qf_lightmap.h"
 #include "QF/Vulkan/qf_main.h"
 #include "QF/Vulkan/qf_particles.h"
@@ -217,6 +218,7 @@ Vulkan_NewMap (model_t *worldmodel, struct model_s **models, int num_models,
 	Vulkan_RegisterTextures (models, num_models, ctx);
 	Vulkan_BuildLightmaps (models, num_models, ctx);
 	Vulkan_BuildDisplayLists (models, num_models, ctx);
+	Vulkan_LoadLights (worldmodel->brush.entities, ctx);
 }
 
 /*void

From 0366b72d4a3e17a32008db4d1a60d11fd40fbac3 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 3 Mar 2021 18:16:27 +0900
Subject: [PATCH 1457/1519] [vulkan] remove the fps printing

Now that pixels are rendered, there's no need to print the fps
separately as the in-game display works quite nicely.
---
 libs/video/renderer/vid_render_vulkan.c | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/libs/video/renderer/vid_render_vulkan.c b/libs/video/renderer/vid_render_vulkan.c
index 059250fff..00c307dbc 100644
--- a/libs/video/renderer/vid_render_vulkan.c
+++ b/libs/video/renderer/vid_render_vulkan.c
@@ -118,8 +118,6 @@ vulkan_R_RenderFrame (SCR_Func scr_3dfunc, SCR_Func *scr_funcs)
 {
 	const VkSubpassContents subpassContents
 		= VK_SUBPASS_CONTENTS_SECONDARY_COMMAND_BUFFERS;
-	static int count = 0;
-	static double startTime;
 	uint32_t imageIndex = 0;
 	qfv_device_t *device = vulkan_ctx->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
@@ -199,16 +197,6 @@ vulkan_R_RenderFrame (SCR_Func scr_3dfunc, SCR_Func *scr_funcs)
 
 	vulkan_ctx->curFrame++;
 	vulkan_ctx->curFrame %= vulkan_ctx->frames.size;
-
-	if (++count >= 100) {
-		double currenTime = Sys_DoubleTime ();
-		double time = currenTime - startTime;
-		startTime = currenTime;
-		printf ("%d frames in %g s: %g fps         \r",
-				count, time, count / time);
-		fflush (stdout);
-		count = 0;
-	}
 }
 
 static void

From 4a97bc3ba549ee2abe0ed3033051f6265fe03a35 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 4 Mar 2021 17:39:05 +0900
Subject: [PATCH 1458/1519] [util] Create simd quaternion to matrix function

This seems to be pretty close to as fast as it gets (might be able to do
better with some shuffles of the negation constants instead of loading
separate constants).
---
 include/QF/simd/mat4f.h    | 50 +++++++++++++++++++++++
 libs/util/test/test-quat.c | 32 +++++++++++++++
 libs/util/test/test-simd.c | 82 +++++++++++++++++++++++++++++++++++++-
 3 files changed, 163 insertions(+), 1 deletion(-)

diff --git a/include/QF/simd/mat4f.h b/include/QF/simd/mat4f.h
index 3e1880ad6..24773da87 100644
--- a/include/QF/simd/mat4f.h
+++ b/include/QF/simd/mat4f.h
@@ -38,6 +38,7 @@ GNU89INLINE inline void mmulf (mat4f_t c, const mat4f_t a, const mat4f_t b);
 GNU89INLINE inline vec4f_t mvmulf (const mat4f_t m, vec4f_t v) __attribute__((const));
 GNU89INLINE inline vec4f_t m3vmulf (const mat4f_t m, vec4f_t v) __attribute__((const));
 GNU89INLINE inline void mat4fidentity (mat4f_t m);
+GNU89INLINE inline void mat4fquat (mat4f_t m, vec4f_t q);
 
 #ifndef IMPLEMENT_MAT4F_Funcs
 GNU89INLINE inline
@@ -120,4 +121,53 @@ mat4fidentity (mat4f_t m)
 	m[3] = (vec4f_t) { 0, 0, 0, 1 };
 }
 
+#ifndef IMPLEMENT_MAT4F_Funcs
+GNU89INLINE inline
+#else
+VISIBLE
+#endif
+void
+mat4fquat (mat4f_t m, vec4f_t q)
+{
+	vec4f_t xq = q[0] * q;
+	vec4f_t yq = q[1] * q;
+	vec4f_t zq = q[2] * q;
+	vec4f_t wq = q[3] * q;
+
+	static const vec4i_t shuff103 = { 1, 0, 3, 2 };
+	static const vec4i_t shuff230 = { 2, 3, 0, 1 };
+	static const vec4i_t shuff321 = { 3, 2, 1, 0 };
+#define p (0)
+#define m (1u << 31)
+	static const vec4i_t mpm = { m, p, m, 0 };
+	static const vec4i_t pmm = { p, m, m, 0 };
+	static const vec4i_t mmp = { m, m, p, 0 };
+	static const vec4i_t mask = { ~0u, ~0u, ~0u, 0 };
+#undef p
+#undef m
+	{
+		vec4f_t a = xq;
+		vec4f_t b = _mm_xor_ps (__builtin_shuffle (yq, shuff103), (__m128) mpm);
+		vec4f_t c = _mm_xor_ps (__builtin_shuffle (zq, shuff230), (__m128) pmm);
+		vec4f_t d = _mm_xor_ps (__builtin_shuffle (wq, shuff321), (__m128) mmp);
+
+		m[0] = _mm_and_ps (a + b - c - d, (__m128) mask);
+	}
+	{
+		vec4f_t a = _mm_xor_ps (__builtin_shuffle (xq, shuff103), (__m128) mpm);
+		vec4f_t b = yq;
+		vec4f_t c = _mm_xor_ps (__builtin_shuffle (zq, shuff321), (__m128) mmp);
+		vec4f_t d = _mm_xor_ps (__builtin_shuffle (wq, shuff230), (__m128) pmm);
+		m[1] = _mm_and_ps (b + c - a - d, (__m128) mask);
+	}
+	{
+		vec4f_t a = _mm_xor_ps (__builtin_shuffle (xq, shuff230), (__m128) pmm);
+		vec4f_t b = _mm_xor_ps (__builtin_shuffle (yq, shuff321), (__m128) mmp);
+		vec4f_t c = zq;
+		vec4f_t d = _mm_xor_ps (__builtin_shuffle (wq, shuff103), (__m128) mpm);
+		m[2] = _mm_and_ps (a - b + c - d, (__m128) mask);
+	}
+	m[3] = (vec4f_t) { 0, 0, 0, 1 };
+}
+
 #endif//__QF_simd_mat4f_h
diff --git a/libs/util/test/test-quat.c b/libs/util/test/test-quat.c
index 9144f56be..cafceb2c8 100644
--- a/libs/util/test/test-quat.c
+++ b/libs/util/test/test-quat.c
@@ -362,6 +362,31 @@ fail:
 	return 0;
 }
 
+static int
+test_quat_mat2(const quat_t q, const quat_t expect)
+{
+	int         i;
+	vec_t       m[9];
+
+	QuatToMatrix (q, m, 0, 1);
+	Mat3Transpose (m, m);
+
+	for (i = 0; i < 9; i++)
+		if (m[i] != expect[i])	// exact tests here
+			goto fail;
+	return 1;
+fail:
+	printf ("\ntest_quat_mat\n");
+	printf ("%11.9g %11.9g %11.9g %11.9g\n", QuatExpand (q));
+	printf ("%11.9g %11.9g %11.9g   %11.9g %11.9g %11.9g\n",
+			VectorExpand (m + 0), VectorExpand (expect + 0));
+	printf ("%11.9g %11.9g %11.9g   %11.9g %11.9g %11.9g\n",
+			VectorExpand (m + 3), VectorExpand (expect + 3));
+	printf ("%11.9g %11.9g %11.9g   %11.9g %11.9g %11.9g\n",
+			VectorExpand (m + 6), VectorExpand (expect + 6));
+	return 0;
+}
+
 int
 main (int argc, const char **argv)
 {
@@ -407,5 +432,12 @@ main (int argc, const char **argv)
 			res = 1;
 	}
 
+	for (i = 0; i < num_quat_mat_tests; i ++) {
+		vec_t      *q = quat_mat_tests[i].q;
+		vec_t      *expect = quat_mat_tests[i].expect;
+		if (!test_quat_mat2 (q, expect))
+			res = 1;
+	}
+
 	return res;
 }
diff --git a/libs/util/test/test-simd.c b/libs/util/test/test-simd.c
index 6fe524852..b14a1be9c 100644
--- a/libs/util/test/test-simd.c
+++ b/libs/util/test/test-simd.c
@@ -7,6 +7,7 @@
 #include <string.h>
 #include <unistd.h>
 
+#include "QF/mathlib.h"
 #include "QF/simd/vec4d.h"
 #include "QF/simd/vec4f.h"
 #include "QF/simd/mat4f.h"
@@ -76,6 +77,13 @@ typedef  struct {
 	vec4f_t     ulp_errors;
 } mv4f_test_t;
 
+typedef  struct {
+	void   (*op) (mat4f_t m, vec4f_t q);
+	vec4f_t     q;
+	mat4f_t     expect;
+	mat4f_t     ulp_errors;
+} mq4f_test_t;
+
 static vec4d_t tvtruncd (vec4d_t v, vec4d_t ignore)
 {
 	return vtruncd (v);
@@ -367,6 +375,20 @@ static mv4f_test_t mv4f_tests[] = {
 };
 #define num_mv4f_tests (sizeof (mv4f_tests) / (sizeof (mv4f_tests[0])))
 
+// expect filled in using non-simd QuatToMatrix (has its own tests)
+static mq4f_test_t mq4f_tests[] = {
+	{ mat4fquat, { 0, 0, 0, 1 } },
+	{ mat4fquat, {  0.5,  0.5,  0.5, 0.5 } },
+	{ mat4fquat, {  0.5,  0.5, -0.5, 0.5 } },
+	{ mat4fquat, {  0.5, -0.5,  0.5, 0.5 } },
+	{ mat4fquat, {  0.5, -0.5, -0.5, 0.5 } },
+	{ mat4fquat, { -0.5,  0.5,  0.5, 0.5 } },
+	{ mat4fquat, { -0.5,  0.5, -0.5, 0.5 } },
+	{ mat4fquat, { -0.5, -0.5,  0.5, 0.5 } },
+	{ mat4fquat, { -0.5, -0.5, -0.5, 0.5 } },
+};
+#define num_mq4f_tests (sizeof (mq4f_tests) / (sizeof (mq4f_tests[0])))
+
 static int
 run_vec4d_tests (void)
 {
@@ -485,7 +507,7 @@ run_mv4f_tests (void)
 
 		if (res[0] || res[1] || res[2] || res[3]) {
 			ret |= 1;
-			printf ("\nrun_mat4f_tests %zd\n", i);
+			printf ("\nrun_mv4f_tests %zd\n", i);
 			printf ("a: " VEC4F_FMT "\n", MAT4_ROW(test->a, 0));
 			printf ("   " VEC4F_FMT "\n", MAT4_ROW(test->a, 1));
 			printf ("   " VEC4F_FMT "\n", MAT4_ROW(test->a, 2));
@@ -501,6 +523,63 @@ run_mv4f_tests (void)
 	return ret;
 }
 
+static int
+run_mq4f_tests (void)
+{
+	int         ret = 0;
+
+	for (size_t i = 0; i < num_mq4f_tests; i++) {
+		__auto_type test = &mq4f_tests[i];
+		quat_t      q;
+		vec_t       m[16];
+		memcpy (q, &test->q, sizeof (quat_t));
+		QuatToMatrix (q, m, 1, 1);
+		memcpy (&test->expect, m, sizeof (mat4f_t));
+	}
+	for (size_t i = 0; i < num_mq4f_tests; i++) {
+		__auto_type test = &mq4f_tests[i];
+		mat4f_t     result;
+		mat4f_t     expect;
+		mat4i_t     res = {};
+
+		test->op (result, test->q);
+		maddf (expect, test->expect, test->ulp_errors);
+		memcpy (expect, (void *) &test->expect, sizeof (mat4f_t));
+
+		int         fail = 0;
+		for (int j = 0; j < 4; j++) {
+			res[j] = result[j] != expect[j];
+			fail |= res[j][0] || res[j][1] || res[j][2] || res[j][3];
+		}
+		if (fail) {
+			ret |= 1;
+			printf ("\nrun_mq4f_tests %zd\n", i);
+			printf ("q: " VEC4F_FMT "\n", VEC4_EXP(test->q));
+			printf ("r: " VEC4F_FMT "\n", MAT4_ROW(result, 0));
+			printf ("   " VEC4F_FMT "\n", MAT4_ROW(result, 1));
+			printf ("   " VEC4F_FMT "\n", MAT4_ROW(result, 2));
+			printf ("   " VEC4F_FMT "\n", MAT4_ROW(result, 3));
+			printf ("t: " VEC4I_FMT "\n", MAT4_ROW(res, 0));
+			printf ("   " VEC4I_FMT "\n", MAT4_ROW(res, 1));
+			printf ("   " VEC4I_FMT "\n", MAT4_ROW(res, 2));
+			printf ("   " VEC4I_FMT "\n", MAT4_ROW(res, 3));
+			printf ("E: " VEC4F_FMT "\n", MAT4_ROW(expect, 0));
+			printf ("   " VEC4F_FMT "\n", MAT4_ROW(expect, 1));
+			printf ("   " VEC4F_FMT "\n", MAT4_ROW(expect, 2));
+			printf ("   " VEC4F_FMT "\n", MAT4_ROW(expect, 3));
+			printf ("e: " VEC4F_FMT "\n", MAT4_ROW(test->expect, 0));
+			printf ("   " VEC4F_FMT "\n", MAT4_ROW(test->expect, 1));
+			printf ("   " VEC4F_FMT "\n", MAT4_ROW(test->expect, 2));
+			printf ("   " VEC4F_FMT "\n", MAT4_ROW(test->expect, 3));
+			printf ("u: " VEC4F_FMT "\n", MAT4_ROW(test->ulp_errors, 0));
+			printf ("   " VEC4F_FMT "\n", MAT4_ROW(test->ulp_errors, 1));
+			printf ("   " VEC4F_FMT "\n", MAT4_ROW(test->ulp_errors, 2));
+			printf ("   " VEC4F_FMT "\n", MAT4_ROW(test->ulp_errors, 3));
+		}
+	}
+	return ret;
+}
+
 int
 main (void)
 {
@@ -509,5 +588,6 @@ main (void)
 	ret |= run_vec4f_tests ();
 	ret |= run_mat4f_tests ();
 	ret |= run_mv4f_tests ();
+	ret |= run_mq4f_tests ();
 	return ret;
 }

From 14bc560624cbaac5fcff6ab2e1f3975edcc92847 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 7 Mar 2021 17:39:22 +0900
Subject: [PATCH 1459/1519] [build] Add option to enable gcov data generation

Nice to be able to check how good the tests are (or aren't, as the case
may be).
---
 config.d/compiling.m4 | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/config.d/compiling.m4 b/config.d/compiling.m4
index d9ba92887..7a4908efa 100644
--- a/config.d/compiling.m4
+++ b/config.d/compiling.m4
@@ -223,6 +223,12 @@ QF_CC_OPTION(-Wsuggest-attribute=const)
 QF_CC_OPTION(-Wsuggest-attribute=noreturn)
 QF_CC_OPTION(-Wsuggest-attribute=format)
 
+AC_ARG_ENABLE(coverage,
+[  --enable-coverage       Enable generation of data for gcov])
+if test "x$enable_coverage" = xyes; then
+	QF_CC_OPTION(-fprofile-arcs -ftest-coverage)
+fi
+
 dnl QuakeForge uses lots of BCPL-style (//) comments, which can cause problems
 dnl with many compilers that do not support the latest ISO standards. Well,
 dnl that is our cover story -- the reality is that we like them and do not want
@@ -250,8 +256,7 @@ if test "x$GCC" != xyes; then
 fi
 
 AC_ARG_ENABLE(Werror,
-[  --disable-Werror        Do not treat warnings as errors]
-)
+[  --disable-Werror        Do not treat warnings as errors])
 dnl We want warnings, lots of warnings...
 dnl The help text should be INVERTED before release!
 dnl when in git, this test defaults to ENABLED.

From 941a1267bcbb341f7c8d2612bb54384f5f81dee3 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 9 Mar 2021 11:35:18 +0900
Subject: [PATCH 1460/1519] [util] Fix a count error when resizing darrays

Turns out I had never fully tested inserts.
---
 include/QF/darray.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/QF/darray.h b/include/QF/darray.h
index 0ea0a26d6..61500256a 100644
--- a/include/QF/darray.h
+++ b/include/QF/darray.h
@@ -253,7 +253,7 @@
 		}																\
 		DARRAY_RESIZE (ar, ar->size + sp);								\
 		memmove (&ar->a[po + sp], &ar->a[po],							\
-				 (ar->size - po) * sizeof (*ar->a));					\
+				 (ar->size - po - sp) * sizeof (*ar->a));				\
 		&ar->a[po];														\
 	})
 

From 2c5742a0765eb7017ba9e9cc40ab74f7674e193f Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 9 Mar 2021 11:37:47 +0900
Subject: [PATCH 1461/1519] [renderer] Remove some variable warts

Ugh, Hungarian notation is still lurking...
---
 libs/video/renderer/r_efrag.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/libs/video/renderer/r_efrag.c b/libs/video/renderer/r_efrag.c
index 4c93c935c..cbfd0d2c8 100644
--- a/libs/video/renderer/r_efrag.c
+++ b/libs/video/renderer/r_efrag.c
@@ -218,26 +218,26 @@ R_AddEfrags (mod_brush_t *brush, entity_t *ent)
 }
 
 void
-R_StoreEfrags (const efrag_t *pefrag)
+R_StoreEfrags (const efrag_t *efrag)
 {
-	entity_t   *pent;
+	entity_t   *ent;
 	model_t    *model;
 
-	while (pefrag) {
-		pent = pefrag->entity;
-		model = pent->model;
+	while (efrag) {
+		ent = efrag->entity;
+		model = ent->model;
 
 		switch (model->type) {
 			case mod_alias:
 			case mod_brush:
 			case mod_sprite:
 			case mod_iqm:
-				if (pent->visframe != r_framecount) {
-					R_EnqueueEntity (pent);
+				if (ent->visframe != r_framecount) {
+					R_EnqueueEntity (ent);
 					// mark that we've recorded this entity for this frame
-					pent->visframe = r_framecount;
+					ent->visframe = r_framecount;
 				}
-				pefrag = pefrag->leafnext;
+				efrag = efrag->leafnext;
 				break;
 
 			default:

From 3230270ae3046ce010f34aaee35389351913bd86 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 9 Mar 2021 11:39:41 +0900
Subject: [PATCH 1462/1519] [entity] Start work on a new entity library

The plan is to have a fully component based entity system. This adds
hierarchical transforms. Not particularly useful for quake itself at
this stage, but it will allow for much more flexibility later on,
especially when QuakeForge becomes more general-purpose.
---
 include/QF/entity.h               | 122 ++++++
 libs/Makemodule.am                |   1 +
 libs/entity/Makemodule.am         |  13 +
 libs/entity/hierarchy.c           | 444 +++++++++++++++++++
 libs/entity/test/Makemodule.am    |  19 +
 libs/entity/test/test-hierarchy.c | 707 ++++++++++++++++++++++++++++++
 libs/entity/transform.c           | 317 ++++++++++++++
 7 files changed, 1623 insertions(+)
 create mode 100644 include/QF/entity.h
 create mode 100644 libs/entity/Makemodule.am
 create mode 100644 libs/entity/hierarchy.c
 create mode 100644 libs/entity/test/Makemodule.am
 create mode 100644 libs/entity/test/test-hierarchy.c
 create mode 100644 libs/entity/transform.c

diff --git a/include/QF/entity.h b/include/QF/entity.h
new file mode 100644
index 000000000..9bf676190
--- /dev/null
+++ b/include/QF/entity.h
@@ -0,0 +1,122 @@
+/*
+	entity.h
+
+	Entity management
+
+	Copyright (C) 2021 Bill Currie <bill@taniwha.org>
+
+	Author: Bill Currie <bill@taniwha.org>
+	Date: 2021/02/26
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+
+#ifndef __QF_entity_h
+#define __QF_entity_h
+
+#include "QF/darray.h"
+#include "QF/mathlib.h"
+#include "QF/simd/vec4f.h"
+#include "QF/simd/mat4f.h"
+
+/** \defgroup entity Entity management
+	\ingroup utils
+*/
+///@{
+
+typedef struct mat4fset_s DARRAY_TYPE (mat4f_t) mat4fset_t;
+typedef struct vec4fset_s DARRAY_TYPE (vec4f_t) vec4fset_t;
+typedef struct uint32set_s DARRAY_TYPE (uint32_t) uint32set_t;
+typedef struct byteset_s DARRAY_TYPE (byte) byteset_t;
+typedef struct stringset_s DARRAY_TYPE (char *) stringset_t;
+typedef struct xformset_s DARRAY_TYPE (struct transform_s *) xformset_t;
+typedef struct entityset_s DARRAY_TYPE (struct entity_s *) entityset_t;
+
+#define null_transform (~0u)
+
+typedef struct hierarchy_s {
+	xformset_t  transform;
+	entityset_t entity;
+	uint32set_t childCount;
+	uint32set_t childIndex;
+	uint32set_t parentIndex;
+	stringset_t name;
+	uint32set_t tag;
+	byteset_t   modified;
+	mat4fset_t  localMatrix;
+	mat4fset_t  localInverse;
+	mat4fset_t  worldMatrix;
+	mat4fset_t  worldInverse;
+	vec4fset_t  localRotation;
+	vec4fset_t  localScale;
+	vec4fset_t  worldRotation;
+	vec4fset_t  worldScale;
+} hierarchy_t;
+
+typedef struct transform_s {
+	hierarchy_t *hierarchy;
+	uint32_t    index;
+} transform_t;
+
+transform_t *Transform_New (transform_t *parent);
+void Transform_Delete (transform_t *transform);
+transform_t *Transform_NewNamed (transform_t *parent, const char *name);
+uint32_t Transform_ChildCount (const transform_t *transform) __attribute__((pure));
+transform_t *Transform_GetChild (const transform_t *transform,
+								 uint32_t childIndex) __attribute__((pure));
+void Transform_SetParent (transform_t *transform, transform_t *parent);
+transform_t *Transform_GetParent (const transform_t *transform) __attribute__((pure));
+void Transform_SetName (transform_t *transform, const char *name);
+const char *Transform_GetName (const transform_t *transform) __attribute__((pure));
+void Transform_SetTag (transform_t *transform, uint32_t tag);
+uint32_t Transform_GetTag (const transform_t *transform) __attribute__((pure));
+void Transform_GetLocalMatrix (const transform_t *transform, mat4f_t mat);
+void Transform_GetLocalInverse (const transform_t *transform, mat4f_t mat);
+void Transform_GetWorldMatrix (const transform_t *transform, mat4f_t mat);
+void Transform_GetWorldInverse (const transform_t *transform, mat4f_t mat);
+vec4f_t Transform_GetLocalPosition (const transform_t *transform) __attribute__((pure));
+void Transform_SetLocalPosition (transform_t *transform_t, vec4f_t position);
+vec4f_t Transform_GetLocalRotation (const transform_t *transform) __attribute__((pure));
+void Transform_SetLocalRotation (transform_t *transform_t, vec4f_t rotation);
+vec4f_t Transform_GetLocalScale (const transform_t *transform) __attribute__((pure));
+void Transform_SetLocalScale (transform_t *transform_t, vec4f_t scale);
+vec4f_t Transform_GetWorldPosition (const transform_t *transform) __attribute__((pure));
+void Transform_SetWorldPosition (transform_t *transform_t, vec4f_t position);
+vec4f_t Transform_GetWorldRotation (const transform_t *transform) __attribute__((pure));
+void Transform_SetWorldRotation (transform_t *transform_t, vec4f_t rotation);
+vec4f_t Transform_GetWorldScale (const transform_t *transform) __attribute__((pure));
+// NOTE: these use X: right, Y: forward, Z:up
+// aslo, not guaranteed to be normalized or even orthogonal
+vec4f_t Transform_Forward (const transform_t *transform) __attribute__((pure));
+vec4f_t Transform_Right (const transform_t *transform) __attribute__((pure));
+vec4f_t Transform_Up (const transform_t *transform) __attribute__((pure));
+// no SetWorldScale because after rotations, non uniform scale becomes shear
+
+hierarchy_t *Hierarchy_New (size_t grow, int createRoot);
+hierarchy_t *Hierarchy_Copy (hierarchy_t *src);
+void Hierarchy_Delete (hierarchy_t *hierarchy);
+
+void Hierarchy_UpdateMatrices (hierarchy_t *hierarchy);
+uint32_t Hierarchy_InsertHierarchy (hierarchy_t *dst, const hierarchy_t *src,
+									uint32_t dstParent, uint32_t srcRoot);
+void Hierarchy_RemoveHierarchy (hierarchy_t *hierarchy, uint32_t index);
+///@}
+
+#endif//__QF_entity_h
diff --git a/libs/Makemodule.am b/libs/Makemodule.am
index 5a68c67ba..86fcac7df 100644
--- a/libs/Makemodule.am
+++ b/libs/Makemodule.am
@@ -7,6 +7,7 @@ include libs/image/Makemodule.am
 include libs/models/Makemodule.am
 include libs/video/Makemodule.am
 include libs/console/Makemodule.am
+include libs/entity/Makemodule.am
 
 include libs/net/Makemodule.am
 include libs/client/Makemodule.am
diff --git a/libs/entity/Makemodule.am b/libs/entity/Makemodule.am
new file mode 100644
index 000000000..d8ac9a7e1
--- /dev/null
+++ b/libs/entity/Makemodule.am
@@ -0,0 +1,13 @@
+include libs/entity/test/Makemodule.am
+
+entity_deps=libs/util/libQFutil.la
+
+lib_LTLIBRARIES += libs/entity/libQFentity.la
+
+libs_entity_libQFentity_la_LDFLAGS=		$(lib_ldflags)
+libs_entity_libQFentity_la_LIBADD=		$(entity_deps)
+libs_entity_libQFentity_la_DEPENDENCIES=	$(entity_deps)
+libs_entity_libQFentity_la_SOURCES= \
+	libs/entity/hierarchy.c \
+	libs/entity/transform.c \
+	$e
diff --git a/libs/entity/hierarchy.c b/libs/entity/hierarchy.c
new file mode 100644
index 000000000..cadb3771c
--- /dev/null
+++ b/libs/entity/hierarchy.c
@@ -0,0 +1,444 @@
+/*
+	hierarchy.c
+
+	General hierarchy handling
+
+	Copyright (C) 2021 Bill Currke
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+
+#include "QF/entity.h"
+
+static void
+hierarchy_UpdateTransformIndices (hierarchy_t *hierarchy, uint32_t start,
+								  int offset)
+{
+	for (size_t i = start; i < hierarchy->transform.size; i++) {
+		if (hierarchy->transform.a[i]) {
+			hierarchy->transform.a[i]->index += offset;
+		}
+	}
+}
+
+static void
+hierarchy_UpdateChildIndices (hierarchy_t *hierarchy, uint32_t start,
+							  int offset)
+{
+	for (size_t i = start; i < hierarchy->childIndex.size; i++) {
+		hierarchy->childIndex.a[i] += offset;
+	}
+}
+
+static void
+hierarchy_UpdateParentIndices (hierarchy_t *hierarchy, uint32_t start,
+							   int offset)
+{
+	for (size_t i = start; i < hierarchy->parentIndex.size; i++) {
+		hierarchy->parentIndex.a[i] += offset;
+	}
+}
+
+static void
+hierarchy_calcLocalInverse (hierarchy_t *h, uint32_t index)
+{
+	// This takes advantage of the fact that localMatrix is a simple
+	// homogenous scale/rotate/translate matrix with no shear
+	vec4f_t     x = h->localMatrix.a[index][0];
+	vec4f_t     y = h->localMatrix.a[index][1];
+	vec4f_t     z = h->localMatrix.a[index][2];
+	vec4f_t     t = h->localMatrix.a[index][3];
+
+	// "one" is to ensure both the scalar and translation have 1 in their
+	// forth components
+	vec4f_t     one = { 0, 0, 0, 1 };
+	vec4f_t     nx = { x[0], y[0], z[0], 0 };
+	vec4f_t     ny = { x[1], y[1], z[1], 0 };
+	vec4f_t     nz = { x[2], y[2], z[2], 0 };
+	vec4f_t     nt = one - t[0] * nx - t[1] * ny - t[2] * nz;
+	// vertical dot product!!!
+	vec4f_t     s = 1 / (nx * nx + ny * ny + nz * nz + one);
+	h->localInverse.a[index][0] = nx * s;
+	h->localInverse.a[index][1] = ny * s;
+	h->localInverse.a[index][2] = nz * s;
+	h->localInverse.a[index][3] = nt * s;
+}
+
+void
+Hierarchy_UpdateMatrices (hierarchy_t *h)
+{
+	for (size_t i = 0; i < h->localInverse.size; i++) {
+		if (h->modified.a[i]) {
+			hierarchy_calcLocalInverse (h, i);
+		}
+	}
+	if (h->modified.a[0]) {
+		memcpy (h->worldMatrix.a[0],
+				h->localMatrix.a[0], sizeof (mat4_t));
+		memcpy (h->worldInverse.a[0],
+				h->localInverse.a[0], sizeof (mat4_t));
+		h->worldRotation.a[0] = h->localRotation.a[0];
+		h->worldScale.a[0] = h->localScale.a[0];
+	}
+	for (size_t i = 1; i < h->worldMatrix.size; i++) {
+		uint32_t    parent = h->parentIndex.a[i];
+
+		if (h->modified.a[i] || h->modified.a[parent]) {
+			mmulf (h->worldMatrix.a[i],
+				   h->worldMatrix.a[parent], h->localMatrix.a[i]);
+			h->modified.a[i] = 1;
+		}
+	}
+	for (size_t i = 1; i < h->worldInverse.size; i++) {
+		uint32_t    parent = h->parentIndex.a[i];
+
+		if (h->modified.a[i] || h->modified.a[parent]) {
+			mmulf (h->worldInverse.a[i],
+				   h->localInverse.a[i], h->worldInverse.a[parent]);
+		}
+	}
+	for (size_t i = 1; i < h->worldRotation.size; i++) {
+		uint32_t    parent = h->parentIndex.a[i];
+		if (h->modified.a[i] || h->modified.a[parent]) {
+			h->worldRotation.a[i] = qmulf (h->worldRotation.a[parent],
+										   h->localRotation.a[i]);
+		}
+	}
+	for (size_t i = 1; i < h->worldScale.size; i++) {
+		uint32_t    parent = h->parentIndex.a[i];
+		if (h->modified.a[i] || h->modified.a[parent]) {
+			h->worldScale.a[i] = m3vmulf (h->worldMatrix.a[parent],
+										  h->localScale.a[i]);
+		}
+	}
+	memset (h->modified.a, 0, h->modified.size);
+}
+
+static void
+hierarchy_open (hierarchy_t *hierarchy, uint32_t index, uint32_t count)
+{
+	DARRAY_OPEN_AT (&hierarchy->transform, index, count);
+	DARRAY_OPEN_AT (&hierarchy->entity, index, count);
+	DARRAY_OPEN_AT (&hierarchy->childCount, index, count);
+	DARRAY_OPEN_AT (&hierarchy->childIndex, index, count);
+	DARRAY_OPEN_AT (&hierarchy->parentIndex, index, count);
+	DARRAY_OPEN_AT (&hierarchy->name, index, count);
+	DARRAY_OPEN_AT (&hierarchy->tag, index, count);
+	DARRAY_OPEN_AT (&hierarchy->modified, index, count);
+	DARRAY_OPEN_AT (&hierarchy->localMatrix, index, count);
+	DARRAY_OPEN_AT (&hierarchy->localInverse, index, count);
+	DARRAY_OPEN_AT (&hierarchy->worldMatrix, index, count);
+	DARRAY_OPEN_AT (&hierarchy->worldInverse, index, count);
+	DARRAY_OPEN_AT (&hierarchy->localRotation, index, count);
+	DARRAY_OPEN_AT (&hierarchy->localScale, index, count);
+	DARRAY_OPEN_AT (&hierarchy->worldRotation, index, count);
+	DARRAY_OPEN_AT (&hierarchy->worldScale, index, count);
+}
+
+static void
+hierarchy_close (hierarchy_t *hierarchy, uint32_t index, uint32_t count)
+{
+	if (count) {
+		DARRAY_CLOSE_AT (&hierarchy->transform, index, count);
+		DARRAY_CLOSE_AT (&hierarchy->entity, index, count);
+		DARRAY_CLOSE_AT (&hierarchy->childCount, index, count);
+		DARRAY_CLOSE_AT (&hierarchy->childIndex, index, count);
+		DARRAY_CLOSE_AT (&hierarchy->parentIndex, index, count);
+		DARRAY_CLOSE_AT (&hierarchy->name, index, count);
+		DARRAY_CLOSE_AT (&hierarchy->tag, index, count);
+		DARRAY_CLOSE_AT (&hierarchy->modified, index, count);
+		DARRAY_CLOSE_AT (&hierarchy->localMatrix, index, count);
+		DARRAY_CLOSE_AT (&hierarchy->localInverse, index, count);
+		DARRAY_CLOSE_AT (&hierarchy->worldMatrix, index, count);
+		DARRAY_CLOSE_AT (&hierarchy->worldInverse, index, count);
+		DARRAY_CLOSE_AT (&hierarchy->localRotation, index, count);
+		DARRAY_CLOSE_AT (&hierarchy->localScale, index, count);
+		DARRAY_CLOSE_AT (&hierarchy->worldRotation, index, count);
+		DARRAY_CLOSE_AT (&hierarchy->worldScale, index, count);
+	}
+}
+
+static void
+hierarchy_move (hierarchy_t *dst, const hierarchy_t *src,
+				uint32_t dstIndex, uint32_t srcIndex, uint32_t count)
+{
+	memcpy (&dst->transform.a[dstIndex], &src->transform.a[srcIndex],
+			count * sizeof(dst->transform.a[0]));
+	memset (&src->transform.a[srcIndex], 0,
+			count * sizeof(dst->transform.a[0]));
+	memcpy (&dst->entity.a[dstIndex], &src->entity.a[srcIndex],
+			count * sizeof(dst->entity.a[0]));
+	memcpy (&dst->name.a[dstIndex], &src->name.a[srcIndex],
+			count * sizeof(dst->name.a[0]));
+	memcpy (&dst->tag.a[dstIndex], &src->tag.a[srcIndex],
+			count * sizeof(dst->tag.a[0]));
+	memset (&dst->modified.a[dstIndex], 1, count * sizeof(dst->modified.a[0]));
+	memcpy (&dst->localMatrix.a[dstIndex], &src->localMatrix.a[srcIndex],
+			count * sizeof(dst->localMatrix.a[0]));
+	memcpy (&dst->localInverse.a[dstIndex], &src->localInverse.a[srcIndex],
+			count * sizeof(dst->localInverse.a[0]));
+	memcpy (&dst->localRotation.a[dstIndex], &src->localRotation.a[srcIndex],
+			count * sizeof(dst->localRotation.a[0]));
+	memcpy (&dst->localScale.a[dstIndex], &src->localScale.a[srcIndex],
+			count * sizeof(dst->localScale.a[0]));
+
+	for (uint32_t i = 0; i < count; i++) {
+		dst->transform.a[dstIndex + i]->hierarchy = dst;
+		dst->transform.a[dstIndex + i]->index = dstIndex + i;
+	}
+}
+
+static void
+hierarchy_init (hierarchy_t *dst, uint32_t index,
+				uint32_t parentIndex, uint32_t childIndex, uint32_t count)
+{
+	memset (&dst->transform.a[index], 0,
+			count * sizeof(dst->transform.a[0]));
+	memset (&dst->entity.a[index], 0, count * sizeof(dst->entity.a[0]));
+	memset (&dst->name.a[index], 0, count * sizeof(dst->name.a[0]));
+	memset (&dst->tag.a[index], 0, count * sizeof(dst->tag.a[0]));
+	memset (&dst->modified.a[index], 1, count * sizeof(dst->modified.a[0]));
+
+	for (uint32_t i = 0; i < count; i++) {
+		mat4fidentity (dst->localMatrix.a[index]);
+		mat4fidentity (dst->localInverse.a[index]);
+		dst->localRotation.a[index] = (vec4f_t) { 0, 0, 0, 1 };
+		dst->localScale.a[index] = (vec4f_t) { 1, 1, 1, 1 };
+
+		dst->parentIndex.a[index + i] = parentIndex;
+		dst->childCount.a[index + i] = 0;
+		dst->childIndex.a[index + i] = childIndex;
+	}
+}
+
+static uint32_t
+hierarchy_insert (hierarchy_t *dst, const hierarchy_t *src,
+				  uint32_t dstParent, uint32_t srcRoot, uint32_t count)
+{
+	uint32_t    insertIndex;	// where the transforms will be inserted
+	uint32_t    childIndex;		// where the transforms' children will inserted
+
+	// The newly added transforms are always last children of the parent
+	// transform
+	insertIndex = dst->childIndex.a[dstParent] + dst->childCount.a[dstParent];
+
+	// By design, all of a transform's children are in one contiguous block,
+	// and the blocks of children for each transform are ordered by their
+	// parents. Thus the child index of each transform increases monotonically
+	// for each child index in the array, regardless of the level of the owning
+	// transform (higher levels always come before lower levels).
+	uint32_t    neighbor = insertIndex - 1;	// insertIndex never zero
+	childIndex = dst->childIndex.a[neighbor] + dst->childCount.a[neighbor];
+
+	// Any transforms that come after the inserted transforms need to have
+	// thier indices adjusted.
+	hierarchy_UpdateTransformIndices (dst, insertIndex, count);
+	// The parent transform's child index is not affected, but the child
+	// indices of all transforms immediately after the parent transform are.
+	hierarchy_UpdateChildIndices (dst, dstParent + 1, count);
+	hierarchy_UpdateParentIndices (dst, childIndex, count);
+
+	// The beginning of the block of children for the new transforms was
+	// computed from the pre-insert indices of the related transforms, thus
+	// the index must be updated by the number of transforms being inserted
+	// (it would have been updated thusly if the insert was done before
+	// updating the indices of the other transforms).
+	childIndex += count;
+
+	hierarchy_open (dst, insertIndex, count);
+	if (src) {
+		hierarchy_move (dst, src, insertIndex, srcRoot, count);
+	} else {
+		hierarchy_init (dst, insertIndex, dstParent, childIndex, count);
+	}
+	for (uint32_t i = 0; i < count; i++) {
+		dst->parentIndex.a[insertIndex + i] = dstParent;
+		dst->childIndex.a[insertIndex + i] = childIndex;
+		dst->childCount.a[insertIndex + i] = 0;
+	}
+
+	dst->childCount.a[dstParent] += count;
+	return insertIndex;
+}
+
+static void
+hierarchy_insert_children (hierarchy_t *dst, const hierarchy_t *src,
+						   uint32_t dstParent, uint32_t srcRoot)
+{
+	uint32_t    insertIndex;
+	uint32_t    childIndex = src->childIndex.a[srcRoot];
+	uint32_t    childCount = src->childCount.a[srcRoot];
+
+	if (childCount) {
+		insertIndex = hierarchy_insert (dst, src, dstParent,
+										childIndex, childCount);
+		for (uint32_t i = 0; i < childCount; i++) {
+			hierarchy_insert_children (dst, src, insertIndex + i,
+									   childIndex + i);
+		}
+	}
+}
+
+uint32_t
+Hierarchy_InsertHierarchy (hierarchy_t *dst, const hierarchy_t *src,
+						   uint32_t dstParent, uint32_t srcRoot)
+{
+	uint32_t    insertIndex;
+
+	if (dstParent == null_transform) {
+		if (dst->transform.size) {
+			Sys_Error ("attempt to insert root in non-empty hierarchy");
+		}
+		hierarchy_open (dst, 0, 1);
+		hierarchy_move (dst, src, 0, srcRoot, 1);
+		dst->parentIndex.a[0] = null_transform;
+		dst->childIndex.a[0] = 1;
+		dst->childCount.a[0] = 0;
+		insertIndex = 0;
+	} else {
+		if (!dst->transform.size) {
+			Sys_Error ("attempt to insert non-root in empty hierarchy");
+		}
+		insertIndex = hierarchy_insert (dst, src, dstParent, srcRoot, 1);
+	}
+	// if src is null, then inserting a new transform which has no children
+	if (src) {
+		hierarchy_insert_children (dst, src, insertIndex, srcRoot);
+	}
+	Hierarchy_UpdateMatrices (dst);
+	return insertIndex;
+}
+
+static void
+hierarchy_remove_children (hierarchy_t *hierarchy, uint32_t index)
+{
+	uint32_t    childIndex = hierarchy->childIndex.a[index];
+	uint32_t    childCount = hierarchy->childCount.a[index];
+	uint32_t    parentIndex = hierarchy->parentIndex.a[index];
+	uint32_t    nieceIndex = null_transform;
+
+	if (parentIndex != null_transform) {
+		uint32_t    siblingIndex = hierarchy->childIndex.a[parentIndex];
+		siblingIndex += hierarchy->childCount.a[parentIndex] - 1;
+		nieceIndex = hierarchy->childIndex.a[siblingIndex];
+	}
+	for (uint32_t i = childCount; i-- > 0; ) {
+		hierarchy_remove_children (hierarchy, childIndex + i);
+	}
+	hierarchy_close (hierarchy, childIndex, childCount);
+	hierarchy->childCount.a[index] = 0;
+
+	if (childCount) {
+		hierarchy_UpdateTransformIndices (hierarchy, childIndex, -childCount);
+		hierarchy_UpdateChildIndices (hierarchy, index, -childCount);
+		if (nieceIndex != null_transform) {
+			hierarchy_UpdateParentIndices (hierarchy, nieceIndex, -childCount);
+		}
+	}
+}
+
+void
+Hierarchy_RemoveHierarchy (hierarchy_t *hierarchy, uint32_t index)
+{
+	uint32_t    parentIndex = hierarchy->parentIndex.a[index];
+	uint32_t    childIndex = hierarchy->childIndex.a[index];
+	uint32_t    siblingIndex = null_transform;
+	if (parentIndex != null_transform) {
+		siblingIndex = hierarchy->childIndex.a[parentIndex];
+	}
+	hierarchy_remove_children (hierarchy, index);
+	hierarchy_close (hierarchy, index, 1);
+	if (siblingIndex != null_transform) {
+		hierarchy_UpdateTransformIndices (hierarchy, index, -1);
+		hierarchy_UpdateChildIndices (hierarchy, siblingIndex, -1);
+		hierarchy_UpdateParentIndices (hierarchy, childIndex - 1, -1);
+	}
+}
+
+hierarchy_t *
+Hierarchy_New (size_t grow, int createRoot)
+{
+	if (!grow) {
+		grow = 16;
+	}
+	hierarchy_t *hierarchy = malloc (sizeof (hierarchy_t));
+
+	DARRAY_INIT (&hierarchy->transform, grow);
+	DARRAY_INIT (&hierarchy->entity, grow);
+	DARRAY_INIT (&hierarchy->childCount, grow);
+	DARRAY_INIT (&hierarchy->childIndex, grow);
+	DARRAY_INIT (&hierarchy->parentIndex, grow);
+	DARRAY_INIT (&hierarchy->name, grow);
+	DARRAY_INIT (&hierarchy->tag, grow);
+	DARRAY_INIT (&hierarchy->modified, grow);
+	DARRAY_INIT (&hierarchy->localMatrix, grow);
+	DARRAY_INIT (&hierarchy->localInverse, grow);
+	DARRAY_INIT (&hierarchy->worldMatrix, grow);
+	DARRAY_INIT (&hierarchy->worldInverse, grow);
+	DARRAY_INIT (&hierarchy->localRotation, grow);
+	DARRAY_INIT (&hierarchy->localScale, grow);
+	DARRAY_INIT (&hierarchy->worldRotation, grow);
+	DARRAY_INIT (&hierarchy->worldScale, grow);
+
+	if (createRoot) {
+		hierarchy_open (hierarchy, 0, 1);
+		hierarchy_init (hierarchy, 0, null_transform, 1, 1);
+	}
+
+	return hierarchy;
+}
+
+void
+Hierarchy_Delete (hierarchy_t *hierarchy)
+{
+	for (size_t i = 0; i < hierarchy->transform.size; i++) {
+		free (hierarchy->transform.a[i]);
+	}
+	for (size_t i = 0; i < hierarchy->name.size; i++) {
+		free (hierarchy->name.a[i]);
+	}
+	DARRAY_CLEAR (&hierarchy->transform);
+	DARRAY_CLEAR (&hierarchy->entity);
+	DARRAY_CLEAR (&hierarchy->childCount);
+	DARRAY_CLEAR (&hierarchy->childIndex);
+	DARRAY_CLEAR (&hierarchy->parentIndex);
+	DARRAY_CLEAR (&hierarchy->name);
+	DARRAY_CLEAR (&hierarchy->tag);
+	DARRAY_CLEAR (&hierarchy->modified);
+	DARRAY_CLEAR (&hierarchy->localMatrix);
+	DARRAY_CLEAR (&hierarchy->localInverse);
+	DARRAY_CLEAR (&hierarchy->worldMatrix);
+	DARRAY_CLEAR (&hierarchy->worldInverse);
+	DARRAY_CLEAR (&hierarchy->localRotation);
+	DARRAY_CLEAR (&hierarchy->localScale);
+	DARRAY_CLEAR (&hierarchy->worldRotation);
+	DARRAY_CLEAR (&hierarchy->worldScale);
+	free (hierarchy);
+}
diff --git a/libs/entity/test/Makemodule.am b/libs/entity/test/Makemodule.am
new file mode 100644
index 000000000..b0f98ae2b
--- /dev/null
+++ b/libs/entity/test/Makemodule.am
@@ -0,0 +1,19 @@
+libs_entity_tests = \
+	libs/entity/test/test-hierarchy \
+	$e
+
+TESTS += $(libs_entity_tests)
+
+check_PROGRAMS += $(libs_entity_tests)
+
+libs_entity_test_libs= \
+	libs/entity/libQFentity.la \
+	libs/util/libQFutil.la
+
+libs_entity_test_test_hierarchy_SOURCES= 		\
+	libs/entity/test/test-hierarchy.c	\
+	$e
+libs_entity_test_test_hierarchy_LDADD=			\
+	$(libs_entity_test_libs)
+libs_entity_test_test_hierarchy_DEPENDENCIES=	\
+	$(libs_entity_test_libs)
diff --git a/libs/entity/test/test-hierarchy.c b/libs/entity/test/test-hierarchy.c
new file mode 100644
index 000000000..513f33fca
--- /dev/null
+++ b/libs/entity/test/test-hierarchy.c
@@ -0,0 +1,707 @@
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "QF/entity.h"
+
+// NOTE: these are the columns of the matrix! (not that it matters for a
+// symmetrical matrix, but...)
+mat4f_t identity = {
+	{ 1, 0, 0, 0 },
+	{ 0, 1, 0, 0 },
+	{ 0, 0, 1, 0 },
+	{ 0, 0, 0, 1 },
+};
+vec4f_t one = { 1, 1, 1, 1 };
+
+static int
+vec4_equal (vec4f_t a, vec4f_t b)
+{
+	vec4i_t     res = a != b;
+	return !(res[0] || res[1] || res[2] || res[3]);
+}
+
+static int
+mat4_equal (const mat4f_t a, const mat4f_t b)
+{
+	vec4i_t     res = {};
+
+	for (int i = 0; i < 4; i++) {
+		res |= a[i] != b[i];
+	}
+	return !(res[0] || res[1] || res[2] || res[3]);
+}
+
+static int
+check_hierarchy_size (hierarchy_t *h, uint32_t size)
+{
+	if (h->transform.size != size
+		|| h->entity.size != size
+		|| h->childCount.size != size
+		|| h->childIndex.size != size
+		|| h->parentIndex.size != size
+		|| h->name.size != size
+		|| h->tag.size != size
+		|| h->modified.size != size
+		|| h->localMatrix.size != size
+		|| h->localInverse.size != size
+		|| h->worldMatrix.size != size
+		|| h->worldInverse.size != size
+		|| h->localRotation.size != size
+		|| h->localScale.size != size
+		|| h->worldRotation.size != size
+		|| h->worldScale.size != size) {
+		printf ("hierarchy does not have exactly %u"
+				" transform or array sizes are inconsistent\n", size);
+		return 0;
+	}
+	for (size_t i = 0; i < h->transform.size; i++) {
+		if (h->transform.a[i]->hierarchy != h) {
+			printf ("transform %zd (%s) does not point to hierarchy\n",
+					i, h->name.a[i]);
+		}
+	}
+	return 1;
+}
+
+static void
+dump_hierarchy (hierarchy_t *h)
+{
+	for (size_t i = 0; i < h->transform.size; i++) {
+		printf ("%2zd: %5s %2u %2u %2u %2u\n", i, h->name.a[i],
+				h->transform.a[i]->index, h->parentIndex.a[i],
+				h->childIndex.a[i], h->childCount.a[i]);
+	}
+	puts ("");
+}
+
+static int
+check_indices (transform_t *transform, uint32_t index, uint32_t parentIndex,
+			   uint32_t childIndex, uint32_t childCount)
+{
+	hierarchy_t *h = transform->hierarchy;
+	if (transform->index != index) {
+		printf ("%s/%s index incorrect: expect %u got %u\n",
+				h->name.a[transform->index], h->name.a[index],
+				index, transform->index);
+		return 0;
+	}
+	if (h->parentIndex.a[index] != parentIndex) {
+		printf ("%s parent index incorrect: expect %u got %u\n",
+				h->name.a[index], parentIndex, h->parentIndex.a[index]);
+		return 0;
+	}
+	if (h->childIndex.a[index] != childIndex) {
+		printf ("%s child index incorrect: expect %u got %u\n",
+				h->name.a[index], childIndex, h->childIndex.a[index]);
+		return 0;
+	}
+	if (h->childCount.a[index] != childCount) {
+		printf ("%s child count incorrect: expect %u got %u\n",
+				h->name.a[index], childCount, h->childCount.a[index]);
+		return 0;
+	}
+	return 1;
+}
+
+static int
+test_single_transform (void)
+{
+	transform_t *transform = Transform_New (0);
+	hierarchy_t *h;
+
+	if (!transform) {
+		printf ("Transform_New returned null\n");
+		return 1;
+	}
+	if (!(h = transform->hierarchy)) {
+		printf ("New transform has no hierarchy\n");
+		return 1;
+	}
+	if (!check_hierarchy_size (h, 1)) { return 1; }
+	if (!check_indices (transform, 0, null_transform, 1, 0)) { return 1; }
+
+	if (!mat4_equal (h->localMatrix.a[0], identity)
+		|| !mat4_equal (h->localInverse.a[0], identity)
+		|| !mat4_equal (h->worldMatrix.a[0], identity)
+		|| !mat4_equal (h->worldInverse.a[0], identity)) {
+		printf ("New transform matrices not identity\n");
+		return 1;
+	}
+
+	if (!vec4_equal (h->localRotation.a[0], identity[3])
+		|| !vec4_equal (h->localScale.a[0], one)) {
+		printf ("New transform rotation or scale not identity\n");
+		return 1;
+	}
+
+	// Delete the hierarchy directly as setparent isn't fully tested
+	Hierarchy_Delete (transform->hierarchy);
+
+	return 0;
+}
+
+static int
+test_parent_child_init (void)
+{
+	transform_t *parent = Transform_New (0);
+	transform_t *child = Transform_New (parent);
+
+	if (parent->hierarchy != child->hierarchy) {
+		printf ("parent and child transforms have separate hierarchies\n");
+		return 1;
+	}
+
+	if (!check_hierarchy_size (parent->hierarchy, 2)) { return 1; }
+
+	if (!check_indices (parent, 0, null_transform, 1, 1)) { return 1; }
+	if (!check_indices (child,  1, 0, 2, 0)) { return 1; }
+
+	hierarchy_t *h = parent->hierarchy;
+	if (!mat4_equal (h->localMatrix.a[0], identity)
+		|| !mat4_equal (h->localInverse.a[0], identity)
+		|| !mat4_equal (h->worldMatrix.a[0], identity)
+		|| !mat4_equal (h->worldInverse.a[0], identity)) {
+		printf ("Parent transform matrices not identity\n");
+		return 1;
+	}
+
+	if (!vec4_equal (h->localRotation.a[0], identity[3])
+		|| !vec4_equal (h->localScale.a[0], one)) {
+		printf ("Parent transform rotation or scale not identity\n");
+		return 1;
+	}
+
+	if (!mat4_equal (h->localMatrix.a[1], identity)
+		|| !mat4_equal (h->localInverse.a[1], identity)
+		|| !mat4_equal (h->worldMatrix.a[1], identity)
+		|| !mat4_equal (h->worldInverse.a[1], identity)) {
+		printf ("Child transform matrices not identity\n");
+		return 1;
+	}
+
+	if (!vec4_equal (h->localRotation.a[1], identity[3])
+		|| !vec4_equal (h->localScale.a[1], one)) {
+		printf ("Child transform rotation or scale not identity\n");
+		return 1;
+	}
+
+	// Delete the hierarchy directly as setparent isn't fully tested
+	Hierarchy_Delete (parent->hierarchy);
+
+	return 0;
+}
+
+static int
+test_parent_child_setparent (void)
+{
+	transform_t *parent = Transform_New (0);
+	transform_t *child = Transform_New (0);
+
+	Transform_SetName (parent, "parent");
+	Transform_SetName (child, "child");
+
+	if (!check_indices (parent, 0, null_transform, 1, 0)) { return 1; }
+	if (!check_indices (child,  0, null_transform, 1, 0)) { return 1; }
+
+	if (parent->hierarchy == child->hierarchy) {
+		printf ("parent and child transforms have same hierarchy before"
+				" set paret\n");
+		return 1;
+	}
+
+	Transform_SetParent (child, parent);
+
+	if (parent->hierarchy != child->hierarchy) {
+		printf ("parent and child transforms have separate hierarchies\n");
+		return 1;
+	}
+
+	if (!check_hierarchy_size (parent->hierarchy, 2)) { return 1; }
+
+	if (!check_indices (parent, 0, null_transform, 1, 1)) { return 1; }
+	if (!check_indices (child,  1, 0, 2, 0)) { return 1; }
+
+	hierarchy_t *h = parent->hierarchy;
+	if (!mat4_equal (h->localMatrix.a[0], identity)
+		|| !mat4_equal (h->localInverse.a[0], identity)
+		|| !mat4_equal (h->worldMatrix.a[0], identity)
+		|| !mat4_equal (h->worldInverse.a[0], identity)) {
+		printf ("Parent transform matrices not identity\n");
+		return 1;
+	}
+
+	if (!vec4_equal (h->localRotation.a[0], identity[3])
+		|| !vec4_equal (h->localScale.a[0], one)) {
+		printf ("Parent transform rotation or scale not identity\n");
+		return 1;
+	}
+
+	if (!mat4_equal (h->localMatrix.a[1], identity)
+		|| !mat4_equal (h->localInverse.a[1], identity)
+		|| !mat4_equal (h->worldMatrix.a[1], identity)
+		|| !mat4_equal (h->worldInverse.a[1], identity)) {
+		printf ("Child transform matrices not identity\n");
+		return 1;
+	}
+
+	if (!vec4_equal (h->localRotation.a[1], identity[3])
+		|| !vec4_equal (h->localScale.a[1], one)) {
+		printf ("Child transform rotation or scale not identity\n");
+		return 1;
+	}
+
+	// Delete the hierarchy directly as setparent isn't fully tested
+	Hierarchy_Delete (parent->hierarchy);
+
+	return 0;
+}
+
+static int
+test_build_hierarchy (void)
+{
+	printf ("test_build_hierarchy\n");
+
+	transform_t *root = Transform_NewNamed (0, "root");
+	transform_t *A = Transform_NewNamed (root, "A");
+	transform_t *B = Transform_NewNamed (root, "B");
+	transform_t *C = Transform_NewNamed (root, "C");
+
+	if (!check_indices (root, 0, null_transform, 1, 3)) { return 1; }
+	if (!check_indices (A, 1, 0, 4, 0)) { return 1; }
+	if (!check_indices (B, 2, 0, 4, 0)) { return 1; }
+	if (!check_indices (C, 3, 0, 4, 0)) { return 1; }
+
+	transform_t *B1 = Transform_NewNamed (B, "B1");
+
+	if (!check_indices (root, 0, null_transform, 1, 3)) { return 1; }
+	if (!check_indices ( A, 1, 0, 4, 0)) { return 1; }
+	if (!check_indices ( B, 2, 0, 4, 1)) { return 1; }
+	if (!check_indices ( C, 3, 0, 5, 0)) { return 1; }
+	if (!check_indices (B1, 4, 2, 5, 0)) { return 1; }
+
+	transform_t *A1 = Transform_NewNamed (A, "A1");
+
+	if (!check_indices (root, 0, null_transform, 1, 3)) { return 1; }
+	if (!check_indices ( A, 1, 0, 4, 1)) { return 1; }
+	if (!check_indices ( B, 2, 0, 5, 1)) { return 1; }
+	if (!check_indices ( C, 3, 0, 6, 0)) { return 1; }
+	if (!check_indices (A1, 4, 1, 6, 0)) { return 1; }
+	if (!check_indices (B1, 5, 2, 6, 0)) { return 1; }
+	transform_t *A1a = Transform_NewNamed (A1, "A1a");
+	transform_t *B2 = Transform_NewNamed (B, "B2");
+	transform_t *A2 = Transform_NewNamed (A, "A2");
+	transform_t *B3 = Transform_NewNamed (B, "B3");
+	transform_t *B2a = Transform_NewNamed (B2, "B2a");
+
+	if (!check_hierarchy_size (root->hierarchy, 11)) { return 1; }
+
+	if (!check_indices (root, 0, null_transform, 1, 3)) { return 1; }
+	if (!check_indices (  A,  1, 0,  4, 2)) { return 1; }
+	if (!check_indices (  B,  2, 0,  6, 3)) { return 1; }
+	if (!check_indices (  C,  3, 0,  9, 0)) { return 1; }
+	if (!check_indices ( A1,  4, 1,  9, 1)) { return 1; }
+	if (!check_indices ( A2,  5, 1, 10, 0)) { return 1; }
+	if (!check_indices ( B1,  6, 2, 10, 0)) { return 1; }
+	if (!check_indices ( B2,  7, 2, 10, 1)) { return 1; }
+	if (!check_indices ( B3,  8, 2, 11, 0)) { return 1; }
+	if (!check_indices (A1a,  9, 4, 11, 0)) { return 1; }
+	if (!check_indices (B2a, 10, 7, 11, 0)) { return 1; }
+
+	transform_t *D = Transform_NewNamed (root, "D");
+
+	if (!check_hierarchy_size (root->hierarchy, 12)) { return 1; }
+
+	if (!check_indices (root, 0, null_transform, 1, 4)) { return 1; }
+	if (!check_indices (  A,  1, 0,  5, 2)) { return 1; }
+	if (!check_indices (  B,  2, 0,  7, 3)) { return 1; }
+	if (!check_indices (  C,  3, 0, 10, 0)) { return 1; }
+	if (!check_indices (  D,  4, 0, 10, 0)) { return 1; }
+	if (!check_indices ( A1,  5, 1, 10, 1)) { return 1; }
+	if (!check_indices ( A2,  6, 1, 11, 0)) { return 1; }
+	if (!check_indices ( B1,  7, 2, 11, 0)) { return 1; }
+	if (!check_indices ( B2,  8, 2, 11, 1)) { return 1; }
+	if (!check_indices ( B3,  9, 2, 12, 0)) { return 1; }
+	if (!check_indices (A1a, 10, 5, 12, 0)) { return 1; }
+	if (!check_indices (B2a, 11, 8, 12, 0)) { return 1; }
+
+	dump_hierarchy (root->hierarchy);
+	transform_t *C1 = Transform_NewNamed (C, "C1");
+	dump_hierarchy (root->hierarchy);
+	if (!check_hierarchy_size (root->hierarchy, 13)) { return 1; }
+
+	if (!check_indices (root, 0, null_transform, 1, 4)) { return 1; }
+	if (!check_indices (  A,  1, 0,  5, 2)) { return 1; }
+	if (!check_indices (  B,  2, 0,  7, 3)) { return 1; }
+	if (!check_indices (  C,  3, 0, 10, 1)) { return 1; }
+	if (!check_indices (  D,  4, 0, 11, 0)) { return 1; }
+	if (!check_indices ( A1,  5, 1, 11, 1)) { return 1; }
+	if (!check_indices ( A2,  6, 1, 12, 0)) { return 1; }
+	if (!check_indices ( B1,  7, 2, 12, 0)) { return 1; }
+	if (!check_indices ( B2,  8, 2, 12, 1)) { return 1; }
+	if (!check_indices ( B3,  9, 2, 13, 0)) { return 1; }
+	if (!check_indices ( C1, 10, 3, 13, 0)) { return 1; }
+	if (!check_indices (A1a, 11, 5, 13, 0)) { return 1; }
+	if (!check_indices (B2a, 12, 8, 13, 0)) { return 1; }
+
+	// Delete the hierarchy directly as setparent isn't fully tested
+	Hierarchy_Delete (root->hierarchy);
+
+	return 0;
+}
+
+static int
+test_build_hierarchy2 (void)
+{
+	printf ("test_build_hierarchy2\n");
+
+	transform_t *root = Transform_NewNamed (0, "root");
+	transform_t *A = Transform_NewNamed (root, "A");
+	transform_t *B = Transform_NewNamed (root, "B");
+	transform_t *C = Transform_NewNamed (root, "C");
+	transform_t *B1 = Transform_NewNamed (B, "B1");
+	transform_t *A1 = Transform_NewNamed (A, "A1");
+	transform_t *A1a = Transform_NewNamed (A1, "A1a");
+	transform_t *B2 = Transform_NewNamed (B, "B2");
+	transform_t *A2 = Transform_NewNamed (A, "A2");
+	transform_t *B3 = Transform_NewNamed (B, "B3");
+	transform_t *B2a = Transform_NewNamed (B2, "B2a");
+	transform_t *D = Transform_NewNamed (root, "D");
+	transform_t *C1 = Transform_NewNamed (C, "C1");
+
+	if (!check_hierarchy_size (root->hierarchy, 13)) { return 1; }
+
+	if (!check_indices (root, 0, null_transform, 1, 4)) { return 1; }
+	if (!check_indices (  A,  1, 0,  5, 2)) { return 1; }
+	if (!check_indices (  B,  2, 0,  7, 3)) { return 1; }
+	if (!check_indices (  C,  3, 0, 10, 1)) { return 1; }
+	if (!check_indices (  D,  4, 0, 11, 0)) { return 1; }
+	if (!check_indices ( A1,  5, 1, 11, 1)) { return 1; }
+	if (!check_indices ( A2,  6, 1, 12, 0)) { return 1; }
+	if (!check_indices ( B1,  7, 2, 12, 0)) { return 1; }
+	if (!check_indices ( B2,  8, 2, 12, 1)) { return 1; }
+	if (!check_indices ( B3,  9, 2, 13, 0)) { return 1; }
+	if (!check_indices ( C1, 10, 3, 13, 0)) { return 1; }
+	if (!check_indices (A1a, 11, 5, 13, 0)) { return 1; }
+	if (!check_indices (B2a, 12, 8, 13, 0)) { return 1; }
+
+	transform_t *T = Transform_NewNamed (0, "T");
+	transform_t *X = Transform_NewNamed (T, "X");
+	transform_t *Y = Transform_NewNamed (T, "Y");
+	transform_t *Z = Transform_NewNamed (T, "Z");
+	transform_t *Y1 = Transform_NewNamed (Y, "Y1");
+	transform_t *X1 = Transform_NewNamed (X, "X1");
+	transform_t *X1a = Transform_NewNamed (X1, "X1a");
+	transform_t *Y2 = Transform_NewNamed (Y, "Y2");
+	transform_t *X2 = Transform_NewNamed (X, "X2");
+	transform_t *Y3 = Transform_NewNamed (Y, "Y3");
+	transform_t *Y2a = Transform_NewNamed (Y2, "Y2a");
+	transform_t *Z1 = Transform_NewNamed (Z, "Z1");
+
+	dump_hierarchy (T->hierarchy);
+	if (!check_hierarchy_size (T->hierarchy, 12)) { return 1; }
+
+	if (!check_indices (  T,  0, null_transform, 1, 3)) { return 1; }
+	if (!check_indices (  X,  1, 0,  4, 2)) { return 1; }
+	if (!check_indices (  Y,  2, 0,  6, 3)) { return 1; }
+	if (!check_indices (  Z,  3, 0,  9, 1)) { return 1; }
+	if (!check_indices ( X1,  4, 1, 10, 1)) { return 1; }
+	if (!check_indices ( X2,  5, 1, 11, 0)) { return 1; }
+	if (!check_indices ( Y1,  6, 2, 11, 0)) { return 1; }
+	if (!check_indices ( Y2,  7, 2, 11, 1)) { return 1; }
+	if (!check_indices ( Y3,  8, 2, 12, 0)) { return 1; }
+	if (!check_indices ( Z1,  9, 3, 12, 0)) { return 1; }
+	if (!check_indices (X1a, 10, 4, 12, 0)) { return 1; }
+	if (!check_indices (Y2a, 11, 7, 12, 0)) { return 1; }
+
+	Transform_SetParent (T, B);
+
+	dump_hierarchy (root->hierarchy);
+
+	if (!check_hierarchy_size (root->hierarchy, 25)) { return 1; }
+
+	if (!check_indices (root, 0, null_transform, 1, 4)) { return 1; }
+	if (!check_indices (  A,  1,  0,  5, 2)) { return 1; }
+	if (!check_indices (  B,  2,  0,  7, 4)) { return 1; }
+	if (!check_indices (  C,  3,  0, 11, 1)) { return 1; }
+	if (!check_indices (  D,  4,  0, 12, 0)) { return 1; }
+	if (!check_indices ( A1,  5,  1, 12, 1)) { return 1; }
+	if (!check_indices ( A2,  6,  1, 13, 0)) { return 1; }
+	if (!check_indices ( B1,  7,  2, 13, 0)) { return 1; }
+	if (!check_indices ( B2,  8,  2, 13, 1)) { return 1; }
+	if (!check_indices ( B3,  9,  2, 14, 0)) { return 1; }
+	if (!check_indices (  T, 10,  2, 14, 3)) { return 1; }
+	if (!check_indices ( C1, 11,  3, 17, 0)) { return 1; }
+	if (!check_indices (A1a, 12,  5, 17, 0)) { return 1; }
+	if (!check_indices (B2a, 13,  8, 17, 0)) { return 1; }
+	if (!check_indices (  X, 14, 10, 17, 2)) { return 1; }
+	if (!check_indices (  Y, 15, 10, 19, 3)) { return 1; }
+	if (!check_indices (  Z, 16, 10, 22, 1)) { return 1; }
+	if (!check_indices ( X1, 17, 14, 23, 1)) { return 1; }
+	if (!check_indices ( X2, 18, 14, 24, 0)) { return 1; }
+	if (!check_indices ( Y1, 19, 15, 24, 0)) { return 1; }
+	if (!check_indices ( Y2, 20, 15, 24, 1)) { return 1; }
+	if (!check_indices ( Y3, 21, 15, 25, 0)) { return 1; }
+	if (!check_indices ( Z1, 22, 16, 25, 0)) { return 1; }
+	if (!check_indices (X1a, 23, 17, 25, 0)) { return 1; }
+	if (!check_indices (Y2a, 24, 20, 25, 0)) { return 1; }
+
+	Transform_SetParent (Y, 0);
+
+	dump_hierarchy (root->hierarchy);
+	dump_hierarchy (Y->hierarchy);
+	if (!check_hierarchy_size (root->hierarchy, 20)) { return 1; }
+	if (!check_hierarchy_size (Y->hierarchy, 5)) { return 1; }
+
+	if (!check_indices (root, 0, null_transform, 1, 4)) { return 1; }
+	if (!check_indices (  A,  1,  0,  5, 2)) { return 1; }
+	if (!check_indices (  B,  2,  0,  7, 4)) { return 1; }
+	if (!check_indices (  C,  3,  0, 11, 1)) { return 1; }
+	if (!check_indices (  D,  4,  0, 12, 0)) { return 1; }
+	if (!check_indices ( A1,  5,  1, 12, 1)) { return 1; }
+	if (!check_indices ( A2,  6,  1, 13, 0)) { return 1; }
+	if (!check_indices ( B1,  7,  2, 13, 0)) { return 1; }
+	if (!check_indices ( B2,  8,  2, 13, 1)) { return 1; }
+	if (!check_indices ( B3,  9,  2, 14, 0)) { return 1; }
+	if (!check_indices (  T, 10,  2, 14, 3)) { return 1; }
+	if (!check_indices ( C1, 11,  3, 17, 0)) { return 1; }
+	if (!check_indices (A1a, 12,  5, 17, 0)) { return 1; }
+	if (!check_indices (B2a, 13,  8, 17, 0)) { return 1; }
+	if (!check_indices (  X, 14, 10, 16, 2)) { return 1; }
+	if (!check_indices (  Z, 15, 10, 18, 1)) { return 1; }
+	if (!check_indices ( X1, 16, 14, 19, 1)) { return 1; }
+	if (!check_indices ( X2, 17, 14, 20, 0)) { return 1; }
+	if (!check_indices ( Z1, 18, 15, 20, 0)) { return 1; }
+	if (!check_indices (X1a, 19, 16, 20, 0)) { return 1; }
+
+	if (!check_indices (  Y, 0, null_transform, 1, 3)) { return 1; }
+	if (!check_indices ( Y1, 1, 0, 4, 0)) { return 1; }
+	if (!check_indices ( Y2, 2, 0, 4, 1)) { return 1; }
+	if (!check_indices ( Y3, 3, 0, 5, 0)) { return 1; }
+	if (!check_indices (Y2a, 4, 2, 5, 0)) { return 1; }
+
+	// Delete the hierarchy directly as setparent isn't fully tested
+	Hierarchy_Delete (root->hierarchy);
+	Hierarchy_Delete (Y->hierarchy);
+
+	return 0;
+}
+
+static int
+check_vector (const transform_t *transform,
+			  vec4f_t (*func) (const transform_t *t),
+			  vec4f_t expect, const char *msg)
+{
+	vec4f_t     res = func(transform);
+	if (!vec4_equal (res, expect)) {
+		printf ("%s %s: expected "VEC4F_FMT" got "VEC4F_FMT"\n",
+				Transform_GetName (transform), msg,
+				VEC4_EXP (expect), VEC4_EXP (res));
+		return 0;
+	}
+	return 1;
+}
+
+static int
+test_frames (void)
+{
+	transform_t *root = Transform_NewNamed (0, "root");
+	transform_t *A = Transform_NewNamed (root, "A");
+	transform_t *B = Transform_NewNamed (root, "B");
+	transform_t *A1 = Transform_NewNamed (A, "A1");
+	transform_t *B1 = Transform_NewNamed (B, "B1");
+
+	Transform_SetLocalPosition (root, (vec4f_t) { 0, 0, 1, 1 });
+	Transform_SetLocalPosition (A, (vec4f_t) { 1, 0, 0, 1 });
+	Transform_SetLocalRotation (A, (vec4f_t) { 0.5, 0.5, 0.5, 0.5 });
+	Transform_SetLocalPosition (B, (vec4f_t) { 0, 1, 0, 1 });
+	Transform_SetLocalRotation (B, (vec4f_t) { 0.5, -0.5, 0.5, 0.5 });
+	Transform_SetLocalPosition (A1, (vec4f_t) { 1, 0, 0, 1 });
+	Transform_SetLocalRotation (A1, (vec4f_t) { -0.5, -0.5, -0.5, 0.5 });
+	Transform_SetLocalPosition (B1, (vec4f_t) { 0, 1, 0, 1 });
+	Transform_SetLocalRotation (B1, (vec4f_t) { -0.5, 0.5, -0.5, 0.5 });
+
+	hierarchy_t *h = root->hierarchy;
+	for (size_t i = 0; i < h->transform.size; i++) {
+		mat4f_t     res;
+		mmulf (res, h->localMatrix.a[i], h->localInverse.a[i]);
+		if (!mat4_equal (res, identity)) {
+			printf ("%s: localInverse not inverse of localMatrix\n",
+					h->name.a[i]);
+			printf ("l: " VEC4F_FMT "\n", MAT4_ROW(h->localMatrix.a[i], 0));
+			printf ("   " VEC4F_FMT "\n", MAT4_ROW(h->localMatrix.a[i], 1));
+			printf ("   " VEC4F_FMT "\n", MAT4_ROW(h->localMatrix.a[i], 2));
+			printf ("   " VEC4F_FMT "\n", MAT4_ROW(h->localMatrix.a[i], 3));
+			printf ("i: " VEC4F_FMT "\n", MAT4_ROW(h->localInverse.a[i], 0));
+			printf ("   " VEC4F_FMT "\n", MAT4_ROW(h->localInverse.a[i], 1));
+			printf ("   " VEC4F_FMT "\n", MAT4_ROW(h->localInverse.a[i], 2));
+			printf ("   " VEC4F_FMT "\n", MAT4_ROW(h->localInverse.a[i], 3));
+			printf ("r: " VEC4F_FMT "\n", MAT4_ROW(res, 0));
+			printf ("   " VEC4F_FMT "\n", MAT4_ROW(res, 1));
+			printf ("   " VEC4F_FMT "\n", MAT4_ROW(res, 2));
+			printf ("   " VEC4F_FMT "\n", MAT4_ROW(res, 3));
+			return 1;
+		}
+		puts (h->name.a[i]);
+		printf ("l: " VEC4F_FMT "\n", MAT4_ROW(h->localMatrix.a[i], 0));
+		printf ("   " VEC4F_FMT "\n", MAT4_ROW(h->localMatrix.a[i], 1));
+		printf ("   " VEC4F_FMT "\n", MAT4_ROW(h->localMatrix.a[i], 2));
+		printf ("   " VEC4F_FMT "\n", MAT4_ROW(h->localMatrix.a[i], 3));
+		printf ("i: " VEC4F_FMT "\n", MAT4_ROW(h->localInverse.a[i], 0));
+		printf ("   " VEC4F_FMT "\n", MAT4_ROW(h->localInverse.a[i], 1));
+		printf ("   " VEC4F_FMT "\n", MAT4_ROW(h->localInverse.a[i], 2));
+		printf ("   " VEC4F_FMT "\n", MAT4_ROW(h->localInverse.a[i], 3));
+	}
+	for (size_t i = 0; i < h->transform.size; i++) {
+		mat4f_t     res;
+		mmulf (res, h->worldMatrix.a[i], h->worldInverse.a[i]);
+		if (!mat4_equal (res, identity)) {
+			printf ("%s: worldInverse not inverse of worldMatrix\n",
+					h->name.a[i]);
+			printf ("l: " VEC4F_FMT "\n", MAT4_ROW(h->worldMatrix.a[i], 0));
+			printf ("   " VEC4F_FMT "\n", MAT4_ROW(h->worldMatrix.a[i], 1));
+			printf ("   " VEC4F_FMT "\n", MAT4_ROW(h->worldMatrix.a[i], 2));
+			printf ("   " VEC4F_FMT "\n", MAT4_ROW(h->worldMatrix.a[i], 3));
+			printf ("i: " VEC4F_FMT "\n", MAT4_ROW(h->worldInverse.a[i], 0));
+			printf ("   " VEC4F_FMT "\n", MAT4_ROW(h->worldInverse.a[i], 1));
+			printf ("   " VEC4F_FMT "\n", MAT4_ROW(h->worldInverse.a[i], 2));
+			printf ("   " VEC4F_FMT "\n", MAT4_ROW(h->worldInverse.a[i], 3));
+			printf ("r: " VEC4F_FMT "\n", MAT4_ROW(res, 0));
+			printf ("   " VEC4F_FMT "\n", MAT4_ROW(res, 1));
+			printf ("   " VEC4F_FMT "\n", MAT4_ROW(res, 2));
+			printf ("   " VEC4F_FMT "\n", MAT4_ROW(res, 3));
+			return 1;
+		}
+		puts (h->name.a[i]);
+		printf ("l: " VEC4F_FMT "\n", MAT4_ROW(h->worldMatrix.a[i], 0));
+		printf ("   " VEC4F_FMT "\n", MAT4_ROW(h->worldMatrix.a[i], 1));
+		printf ("   " VEC4F_FMT "\n", MAT4_ROW(h->worldMatrix.a[i], 2));
+		printf ("   " VEC4F_FMT "\n", MAT4_ROW(h->worldMatrix.a[i], 3));
+		printf ("i: " VEC4F_FMT "\n", MAT4_ROW(h->worldInverse.a[i], 0));
+		printf ("   " VEC4F_FMT "\n", MAT4_ROW(h->worldInverse.a[i], 1));
+		printf ("   " VEC4F_FMT "\n", MAT4_ROW(h->worldInverse.a[i], 2));
+		printf ("   " VEC4F_FMT "\n", MAT4_ROW(h->worldInverse.a[i], 3));
+	}
+
+	if (!check_vector (root, Transform_GetLocalPosition,
+					   (vec4f_t) { 0, 0, 1, 1 }, "local position")) {
+		return 1;
+	}
+	if (!check_vector (root, Transform_GetWorldPosition,
+					   (vec4f_t) { 0, 0, 1, 1 }, "world position")) {
+		return 1;
+	}
+	if (!check_vector (root, Transform_Right, (vec4f_t) { 1, 0, 0, 0 },
+					   "right")) {
+		return 1;
+	}
+	if (!check_vector (root, Transform_Forward, (vec4f_t) { 0, 1, 0, 0 },
+					   "right")) {
+		return 1;
+	}
+	if (!check_vector (root, Transform_Up, (vec4f_t) { 0, 0, 1, 0 },
+					   "up")) {
+		return 1;
+	}
+
+	if (!check_vector (A, Transform_GetLocalPosition, (vec4f_t) { 1, 0, 0, 1 },
+					   "local position")) {
+		return 1;
+	}
+	if (!check_vector (A, Transform_GetWorldPosition, (vec4f_t) { 1, 0, 1, 1 },
+					   "world position")) {
+		return 1;
+	}
+	if (!check_vector (A, Transform_Right, (vec4f_t) { 0, 1, 0, 0 },
+					   "right")) {
+		return 1;
+	}
+	if (!check_vector (A, Transform_Forward, (vec4f_t) { 0, 0, 1, 0 },
+					   "forward")) {
+		return 1;
+	}
+	if (!check_vector (A, Transform_Up, (vec4f_t) { 1, 0, 0, 0 },
+					   "up")) {
+		return 1;
+	}
+	if (!check_vector (A1, Transform_GetLocalPosition, (vec4f_t) { 1, 0, 0, 1 },
+					   "local position")) {
+		return 1;
+	}
+	if (!check_vector (A1, Transform_GetWorldPosition, (vec4f_t) { 1, 1, 1, 1 },
+					   "world position")) {
+		return 1;
+	}
+	if (!check_vector (A1, Transform_Right, (vec4f_t) { 1, 0, 0, 0 },
+					   "right")) {
+		return 1;
+	}
+	if (!check_vector (A1, Transform_Forward, (vec4f_t) { 0, 1, 0, 0 },
+					   "forward")) {
+		return 1;
+	}
+	if (!check_vector (A1, Transform_Up, (vec4f_t) { 0, 0, 1, 0 },
+					   "up")) {
+		return 1;
+	}
+
+	if (!check_vector (B, Transform_GetLocalPosition, (vec4f_t) { 0, 1, 0, 1 },
+					   "local position")) {
+		return 1;
+	}
+	if (!check_vector (B, Transform_GetWorldPosition, (vec4f_t) { 0, 1, 1, 1 },
+					   "world position")) {
+		return 1;
+	}
+	if (!check_vector (B, Transform_Right, (vec4f_t) { 0, 0, 1, 0 },
+					   "right")) {
+		return 1;
+	}
+	if (!check_vector (B, Transform_Forward, (vec4f_t) {-1, 0, 0, 0 },
+					   "forward")) {
+		return 1;
+	}
+	if (!check_vector (B, Transform_Up, (vec4f_t) { 0,-1, 0, 0 },
+					   "up")) {
+		return 1;
+	}
+	if (!check_vector (B1, Transform_GetLocalPosition, (vec4f_t) { 0, 1, 0, 1 },
+					   "local position")) {
+		return 1;
+	}
+	if (!check_vector (B1, Transform_GetWorldPosition, (vec4f_t) {-1, 1, 1, 1 },
+					   "world position")) {
+		return 1;
+	}
+	if (!check_vector (B1, Transform_Right, (vec4f_t) { 1, 0, 0, 0 },
+					   "right")) {
+		return 1;
+	}
+	if (!check_vector (B1, Transform_Forward, (vec4f_t) { 0, 1, 0, 0 },
+					   "forward")) {
+		return 1;
+	}
+	if (!check_vector (B1, Transform_Up, (vec4f_t) { 0, 0, 1, 0 },
+					   "up")) {
+		return 1;
+	}
+
+	return 0;
+}
+
+int
+main (void)
+{
+	if (test_single_transform ()) { return 1; }
+	if (test_parent_child_init ()) { return 1; }
+	if (test_parent_child_setparent ()) { return 1; }
+	if (test_build_hierarchy ()) { return 1; }
+	if (test_build_hierarchy2 ()) { return 1; }
+	if (test_frames ()) { return 1; }
+
+	return 0;
+}
diff --git a/libs/entity/transform.c b/libs/entity/transform.c
new file mode 100644
index 000000000..18382e56c
--- /dev/null
+++ b/libs/entity/transform.c
@@ -0,0 +1,317 @@
+/*
+	transform.c
+
+	General transform handling
+
+	Copyright (C) 2021 Bill Currke
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+
+#include "QF/entity.h"
+#include "QF/render.h"
+
+transform_t *
+Transform_New (transform_t *parent)
+{
+	transform_t *transform = malloc (sizeof (transform_t));
+
+	if (parent) {
+		transform->hierarchy = parent->hierarchy;
+		transform->index = Hierarchy_InsertHierarchy (parent->hierarchy, 0,
+													  parent->index, 0);
+	} else {
+		transform->hierarchy = Hierarchy_New (16, 1);//FIXME should be config
+		transform->index = 0;
+	}
+	transform->hierarchy->transform.a[transform->index] = transform;
+	Hierarchy_UpdateMatrices (transform->hierarchy);
+	return transform;
+}
+
+void
+Transform_Delete (transform_t *transform)
+{
+	if (transform->index != 0) {
+		// The transform is not the root, so pull it out of its current
+		// hierarchy so deleting it is easier
+		Transform_SetParent (transform, 0);
+	}
+	Hierarchy_Delete (transform->hierarchy);
+}
+
+transform_t *
+Transform_NewNamed (transform_t *parent, const char *name)
+{
+	transform_t *transform = Transform_New (parent);
+	Transform_SetName (transform, name);
+	return transform;
+}
+
+uint32_t
+Transform_ChildCount (const transform_t *transform)
+{
+	hierarchy_t *h = transform->hierarchy;
+	return h->childCount.a[transform->index];
+}
+
+transform_t *
+Transform_GetChild (const transform_t *transform, uint32_t childIndex)
+{
+	hierarchy_t *h = transform->hierarchy;
+	if (childIndex >= h->childCount.a[transform->index]) {
+		return 0;
+	}
+	return h->transform.a[h->childIndex.a[transform->index] + childIndex];
+}
+
+void
+Transform_SetParent (transform_t *transform, transform_t *parent)
+{
+	if (parent) {
+		hierarchy_t *hierarchy = transform->hierarchy;
+		uint32_t    index = transform->index;
+		Hierarchy_InsertHierarchy (parent->hierarchy, hierarchy,
+								   parent->index, index);
+		Hierarchy_RemoveHierarchy (hierarchy, index);
+		if (!hierarchy->name.size) {
+			Hierarchy_Delete (hierarchy);
+		}
+	} else {
+		// null parent -> make transform root
+		if (!transform->index) {
+			// already root
+			return;
+		}
+		hierarchy_t *hierarchy = transform->hierarchy;
+		uint32_t    index = transform->index;
+
+		hierarchy_t *new_hierarchy = Hierarchy_New (16, 0);
+		Hierarchy_InsertHierarchy (new_hierarchy, hierarchy, null_transform,
+								   index);
+		Hierarchy_RemoveHierarchy (hierarchy, index);
+	}
+}
+
+transform_t *
+Transform_GetParent (const transform_t *transform)
+{
+	if (transform->index == 0) {
+		return 0;
+	}
+	hierarchy_t *h = transform->hierarchy;
+	return h->transform.a[h->parentIndex.a[transform->index]];
+}
+
+void
+Transform_SetName (transform_t *transform, const char *name)
+{
+	hierarchy_t *h = transform->hierarchy;
+	//FIXME create a string pool (similar to qfcc's, or even move that to util)
+	if (h->name.a[transform->index]) {
+		free (h->name.a[transform->index]);
+	}
+	h->name.a[transform->index] = strdup (name);
+}
+
+const char *
+Transform_GetName (const transform_t *transform)
+{
+	hierarchy_t *h = transform->hierarchy;
+	return h->name.a[transform->index];
+}
+
+void
+Transform_SetTag (transform_t *transform, uint32_t tag)
+{
+	hierarchy_t *h = transform->hierarchy;
+	h->tag.a[transform->index] = tag;
+}
+
+uint32_t
+Transform_GetTag (const transform_t *transform)
+{
+	hierarchy_t *h = transform->hierarchy;
+	return h->tag.a[transform->index];
+}
+
+void
+Transform_GetLocalMatrix (const transform_t *transform, mat4f_t mat)
+{
+	hierarchy_t *h = transform->hierarchy;
+	memcpy (mat, h->localMatrix.a[transform->index], sizeof (mat4f_t));
+}
+
+void
+Transform_GetLocalInverse (const transform_t *transform, mat4f_t mat)
+{
+	hierarchy_t *h = transform->hierarchy;
+	memcpy (mat, h->localInverse.a[transform->index], sizeof (mat4f_t));
+}
+
+void
+Transform_GetWorldMatrix (const transform_t *transform, mat4f_t mat)
+{
+	hierarchy_t *h = transform->hierarchy;
+	memcpy (mat, h->worldMatrix.a[transform->index], sizeof (mat4f_t));
+}
+
+void
+Transform_GetWorldInverse (const transform_t *transform, mat4f_t mat)
+{
+	hierarchy_t *h = transform->hierarchy;
+	memcpy (mat, h->worldInverse.a[transform->index], sizeof (mat4f_t));
+}
+
+vec4f_t
+Transform_GetLocalPosition (const transform_t *transform)
+{
+	hierarchy_t *h = transform->hierarchy;
+	return h->localMatrix.a[transform->index][3];
+}
+
+void
+Transform_SetLocalPosition (transform_t *transform, vec4f_t position)
+{
+	hierarchy_t *h = transform->hierarchy;
+	h->localMatrix.a[transform->index][3] = position;
+	h->modified.a[transform->index] = 1;
+	Hierarchy_UpdateMatrices (h);
+}
+
+vec4f_t
+Transform_GetLocalRotation (const transform_t *transform)
+{
+	hierarchy_t *h = transform->hierarchy;
+	return h->localRotation.a[transform->index];
+}
+
+void
+Transform_SetLocalRotation (transform_t *transform, vec4f_t rotation)
+{
+	hierarchy_t *h = transform->hierarchy;
+	vec4f_t     scale = h->localScale.a[transform->index];
+
+	mat4f_t     mat;
+	mat4fquat (mat, rotation);
+
+	h->localMatrix.a[transform->index][0] = mat[0] * scale[0];
+	h->localMatrix.a[transform->index][1] = mat[1] * scale[1];
+	h->localMatrix.a[transform->index][2] = mat[2] * scale[2];
+	h->modified.a[transform->index] = 1;
+	Hierarchy_UpdateMatrices (h);
+}
+
+vec4f_t
+Transform_GetLocalScale (const transform_t *transform)
+{
+	hierarchy_t *h = transform->hierarchy;
+	return h->localScale.a[transform->index];
+}
+
+void
+Transform_SetLocalScale (transform_t *transform, vec4f_t scale)
+{
+	hierarchy_t *h = transform->hierarchy;
+	vec4f_t     rotation = h->localRotation.a[transform->index];
+
+	mat4f_t     mat;
+	mat4fquat (mat, rotation);
+
+	h->localMatrix.a[transform->index][0] = mat[0] * scale[0];
+	h->localMatrix.a[transform->index][1] = mat[1] * scale[1];
+	h->localMatrix.a[transform->index][2] = mat[2] * scale[2];
+	h->modified.a[transform->index] = 1;
+	Hierarchy_UpdateMatrices (h);
+}
+
+vec4f_t
+Transform_GetWorldPosition (const transform_t *transform)
+{
+	hierarchy_t *h = transform->hierarchy;
+	return h->worldMatrix.a[transform->index][3];
+}
+
+void
+Transform_SetWorldPosition (transform_t *transform, vec4f_t position)
+{
+	if (transform->index) {
+		hierarchy_t *h = transform->hierarchy;
+		uint32_t    parent = h->parentIndex.a[transform->index];
+		position = mvmulf (h->worldInverse.a[parent], position);
+	}
+	Transform_SetLocalPosition (transform, position);
+}
+
+vec4f_t
+Transform_GetWorldRotation (const transform_t *transform)
+{
+	hierarchy_t *h = transform->hierarchy;
+	return h->worldRotation.a[transform->index];
+}
+
+void
+Transform_SetWorldRotation (transform_t *transform, vec4f_t rotation)
+{
+	if (transform->index) {
+		hierarchy_t *h = transform->hierarchy;
+		uint32_t    parent = h->parentIndex.a[transform->index];
+		rotation = qmulf (qconjf (h->worldRotation.a[parent]), rotation);
+	}
+	Transform_SetLocalRotation (transform, rotation);
+}
+
+vec4f_t
+Transform_GetWorldScale (const transform_t *transform)
+{
+	hierarchy_t *h = transform->hierarchy;
+	return h->worldScale.a[transform->index];
+}
+
+vec4f_t
+Transform_Forward (const transform_t *transform)
+{
+	hierarchy_t *h = transform->hierarchy;
+	return h->worldMatrix.a[transform->index][1];
+}
+
+vec4f_t
+Transform_Right (const transform_t *transform)
+{
+	hierarchy_t *h = transform->hierarchy;
+	return h->worldMatrix.a[transform->index][0];
+}
+
+vec4f_t
+Transform_Up (const transform_t *transform)
+{
+	hierarchy_t *h = transform->hierarchy;
+	return h->worldMatrix.a[transform->index][2];
+}

From 09e1a63470f2bd38f37895003d7fde1c96fde130 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 9 Mar 2021 23:50:32 +0900
Subject: [PATCH 1463/1519] [util] Add a simd mat4 transpose function

---
 include/QF/simd/mat4f.h | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/include/QF/simd/mat4f.h b/include/QF/simd/mat4f.h
index 24773da87..719e4c561 100644
--- a/include/QF/simd/mat4f.h
+++ b/include/QF/simd/mat4f.h
@@ -38,6 +38,7 @@ GNU89INLINE inline void mmulf (mat4f_t c, const mat4f_t a, const mat4f_t b);
 GNU89INLINE inline vec4f_t mvmulf (const mat4f_t m, vec4f_t v) __attribute__((const));
 GNU89INLINE inline vec4f_t m3vmulf (const mat4f_t m, vec4f_t v) __attribute__((const));
 GNU89INLINE inline void mat4fidentity (mat4f_t m);
+GNU89INLINE inline void mat4ftranspose (mat4f_t t, const mat4f_t m);
 GNU89INLINE inline void mat4fquat (mat4f_t m, vec4f_t q);
 
 #ifndef IMPLEMENT_MAT4F_Funcs
@@ -121,6 +122,24 @@ mat4fidentity (mat4f_t m)
 	m[3] = (vec4f_t) { 0, 0, 0, 1 };
 }
 
+#ifndef IMPLEMENT_MAT4F_Funcs
+GNU89INLINE inline
+#else
+VISIBLE
+#endif
+void
+mat4ftranspose (mat4f_t t, const mat4f_t m)
+{
+	vec4f_t     a = m[0];
+	vec4f_t     b = m[1];
+	vec4f_t     c = m[2];
+	vec4f_t     d = m[3];
+	t[0] = (vec4f_t) { a[0], b[0], c[0], d[0] };
+	t[1] = (vec4f_t) { a[1], b[1], c[1], d[1] };
+	t[2] = (vec4f_t) { a[2], b[2], c[2], d[2] };
+	t[3] = (vec4f_t) { a[3], b[3], c[3], d[3] };
+}
+
 #ifndef IMPLEMENT_MAT4F_Funcs
 GNU89INLINE inline
 #else

From fbc1bd9f6ef834a1ccf7e6bdd33c551277c39794 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 9 Mar 2021 23:52:40 +0900
Subject: [PATCH 1464/1519] [renderer] Clean up entity_t to a certain extent

This is the first step towards component-based entities.

There's still some transform-related stuff in the struct that needs to
be moved, but it's all entirely client related (rather than renderer)
and will probably go into a "client" component. Also, the current
components are directly included structs rather than references as I
didn't want to deal with the object management at this stage.

As part of the process (because transforms use simd) this also starts
the process of moving QF to using simd for vectors and matrices. There's
now a mess of simd and sisd code mixed together, but it works
surprisingly well together.
---
 include/QF/entity.h                       |  12 +-
 include/QF/render.h                       |  71 ++++----
 include/r_local.h                         |   6 +-
 libs/entity/transform.c                   |  21 ++-
 libs/video/renderer/gl/gl_dyn_part.c      |   2 +-
 libs/video/renderer/gl/gl_lightmap.c      |   4 +-
 libs/video/renderer/gl/gl_mod_alias.c     |  76 +++++----
 libs/video/renderer/gl/gl_mod_iqm.c       |   6 +-
 libs/video/renderer/gl/gl_mod_sprite.c    | 109 ++++++------
 libs/video/renderer/gl/gl_rmain.c         |  23 ++-
 libs/video/renderer/gl/gl_rmisc.c         |   5 +-
 libs/video/renderer/gl/gl_rsurf.c         |  29 ++--
 libs/video/renderer/glsl/glsl_alias.c     |  55 +++---
 libs/video/renderer/glsl/glsl_bsp.c       |  48 +++---
 libs/video/renderer/glsl/glsl_iqm.c       |  27 +--
 libs/video/renderer/glsl/glsl_main.c      |  88 +++++-----
 libs/video/renderer/glsl/glsl_particles.c |  16 +-
 libs/video/renderer/glsl/glsl_sprite.c    |  37 ++--
 libs/video/renderer/r_alias.c             |   6 +-
 libs/video/renderer/r_bsp.c               |   6 +-
 libs/video/renderer/r_efrag.c             |  26 +--
 libs/video/renderer/r_ent.c               |  44 +++--
 libs/video/renderer/r_iqm.c               |   4 +-
 libs/video/renderer/r_light.c             |   2 +-
 libs/video/renderer/sw/sw_ralias.c        |  52 +++---
 libs/video/renderer/sw/sw_rbsp.c          |  16 +-
 libs/video/renderer/sw/sw_rdraw.c         |   4 +-
 libs/video/renderer/sw/sw_riqm.c          |  31 ++--
 libs/video/renderer/sw/sw_rmain.c         |  39 +++--
 libs/video/renderer/sw/sw_rmisc.c         |   2 +-
 libs/video/renderer/sw/sw_rpart.c         |   2 +-
 libs/video/renderer/sw/sw_rsprite.c       |  15 +-
 libs/video/renderer/sw/sw_rsurf.c         |   2 +-
 libs/video/renderer/sw32/sw32_ralias.c    |  47 ++---
 libs/video/renderer/sw32/sw32_rbsp.c      |  18 +-
 libs/video/renderer/sw32/sw32_rdraw.c     |   4 +-
 libs/video/renderer/sw32/sw32_riqm.c      |  27 +--
 libs/video/renderer/sw32/sw32_rmain.c     |  39 +++--
 libs/video/renderer/sw32/sw32_rmisc.c     |   2 +-
 libs/video/renderer/sw32/sw32_rpart.c     |   2 +-
 libs/video/renderer/sw32/sw32_rsprite.c   |  15 +-
 libs/video/renderer/sw32/sw32_rsurf.c     |   2 +-
 libs/video/renderer/vulkan/vulkan_alias.c |  27 +--
 libs/video/renderer/vulkan/vulkan_bsp.c   |  34 ++--
 libs/video/renderer/vulkan/vulkan_main.c  |   8 +-
 nq/source/Makemodule.am                   |   1 +
 nq/source/cl_ents.c                       | 106 +++++++-----
 nq/source/cl_main.c                       |   5 +-
 nq/source/cl_parse.c                      |  22 +--
 nq/source/cl_tent.c                       |  31 ++--
 nq/source/cl_view.c                       |   8 +-
 qw/source/Makemodule.am                   |   1 +
 qw/source/cl_demo.c                       |  10 +-
 qw/source/cl_entparse.c                   |   4 +-
 qw/source/cl_ents.c                       | 198 ++++++++++++----------
 qw/source/cl_parse.c                      |   6 +-
 qw/source/cl_tent.c                       |  44 +++--
 qw/source/cl_view.c                       |  15 +-
 ruamoko/qwaq/Makemodule.am                |   1 +
 59 files changed, 881 insertions(+), 682 deletions(-)

diff --git a/include/QF/entity.h b/include/QF/entity.h
index 9bf676190..032db67a2 100644
--- a/include/QF/entity.h
+++ b/include/QF/entity.h
@@ -92,16 +92,18 @@ void Transform_GetLocalInverse (const transform_t *transform, mat4f_t mat);
 void Transform_GetWorldMatrix (const transform_t *transform, mat4f_t mat);
 void Transform_GetWorldInverse (const transform_t *transform, mat4f_t mat);
 vec4f_t Transform_GetLocalPosition (const transform_t *transform) __attribute__((pure));
-void Transform_SetLocalPosition (transform_t *transform_t, vec4f_t position);
+void Transform_SetLocalPosition (transform_t *transform, vec4f_t position);
 vec4f_t Transform_GetLocalRotation (const transform_t *transform) __attribute__((pure));
-void Transform_SetLocalRotation (transform_t *transform_t, vec4f_t rotation);
+void Transform_SetLocalRotation (transform_t *transform, vec4f_t rotation);
 vec4f_t Transform_GetLocalScale (const transform_t *transform) __attribute__((pure));
-void Transform_SetLocalScale (transform_t *transform_t, vec4f_t scale);
+void Transform_SetLocalScale (transform_t *transform, vec4f_t scale);
 vec4f_t Transform_GetWorldPosition (const transform_t *transform) __attribute__((pure));
-void Transform_SetWorldPosition (transform_t *transform_t, vec4f_t position);
+void Transform_SetWorldPosition (transform_t *transform, vec4f_t position);
 vec4f_t Transform_GetWorldRotation (const transform_t *transform) __attribute__((pure));
-void Transform_SetWorldRotation (transform_t *transform_t, vec4f_t rotation);
+void Transform_SetWorldRotation (transform_t *transform, vec4f_t rotation);
 vec4f_t Transform_GetWorldScale (const transform_t *transform) __attribute__((pure));
+void Transform_SetLocalTransform (transform_t *transform, vec4f_t scale,
+								  vec4f_t rotation, vec4f_t position);
 // NOTE: these use X: right, Y: forward, Z:up
 // aslo, not guaranteed to be normalized or even orthogonal
 vec4f_t Transform_Forward (const transform_t *transform) __attribute__((pure));
diff --git a/include/QF/render.h b/include/QF/render.h
index 607b8b800..d6a871865 100644
--- a/include/QF/render.h
+++ b/include/QF/render.h
@@ -90,47 +90,56 @@ typedef struct
 
 //===============
 
+typedef struct animation_s {
+	int         frame;
+	float       syncbase;	// randomize time base for local animations
+	float       frame_start_time;
+	float       frame_interval;
+	int         pose1;
+	int         pose2;
+	float       blend;
+	int         nolerp;		// don't lerp this frame (pose data invalid)
+} animation_t;
+
+typedef struct visibility_s {
+	struct entity_s *entity;	// owning entity
+	struct efrag_s *efrag;		// linked list of efrags
+	struct mnode_s *topnode;	// bmodels, first world node that
+								// splits bmodel, or NULL if not split
+								// applies to other models, too
+	int         visframe;		// last frame this entity was
+								// found in an active leaf
+	int         trivial_accept;	// view clipping (frustum and depth)
+} visibility_t;
+
+typedef struct renderer_s {
+	struct model_s *model;			// NULL = no model
+	struct skin_s *skin;
+	float       colormod[4];	// color tint and alpha for model
+	int         skinnum;		// for Alias models
+	int         fullbright;
+	float       min_light;
+	mat4_t      full_transform;
+} renderer_t;
+
 typedef struct entity_s {
 	struct entity_s *next;
 	struct entity_s *unext;	//FIXME this shouldn't be here. for qw demos
 
+	struct transform_s *transform;
+	animation_t animation;
+	visibility_t visibility;
+	renderer_t  renderer;
+	int         active;
+	//XXX FIXME XXX should not be here
+	float                   scale;
 	vec3_t					origin;
 	vec3_t					old_origin;
 	vec3_t					angles;
-	vec_t					transform[4 * 4];
-	vec_t					full_transform[4 * 4];
-	struct model_s			*model;			// NULL = no model
-	int						frame;
-	int						skinnum;		// for Alias models
-	struct skin_s			*skin;
-
-	float					syncbase;		// for client-side animations
-
-	struct efrag_s			*efrag;			// linked list of efrags
-	int						visframe;		// last frame this entity was
-											// found in an active leaf
-	float					colormod[4];	// color tint and alpha for model
-	float					scale;			// size scaler of the model
-
-	int						fullbright;
-	float					min_light;
-
-	// FIXME: could turn these into a union
-	int						trivial_accept;
-	struct mnode_s			*topnode; // for bmodels, first world node that
-									  // splits bmodel, or NULL if not split
-
-	// Animation interpolation
-	float                   frame_start_time;
-	float                   frame_interval;
-	int						pose1;
-	int						pose2;
-	struct model_s			*pose_model;	// no lerp if not the same as model
 } entity_t;
 
 // !!! if this is changed, it must be changed in asm_draw.h too !!!
-typedef struct
-{
+typedef struct {
 	vrect_t		vrect;				// subwindow in video for refresh
 									// FIXME: not need vrect next field here?
 	vrect_t		aliasvrect;			// scaled Alias version
diff --git a/include/r_local.h b/include/r_local.h
index 9e56b7343..37d5308c1 100644
--- a/include/r_local.h
+++ b/include/r_local.h
@@ -33,6 +33,8 @@
 #include "QF/model.h"
 #include "QF/render.h"
 #include "QF/vid.h"
+#include "QF/simd/mat4f.h"
+#include "QF/simd/vec4f.h"
 #include "r_shared.h"
 
 #define ALIAS_BASE_SIZE_RATIO		(1.0 / 11.0)
@@ -136,8 +138,8 @@ extern qboolean	r_cache_thrash;	// set if thrashing the surface cache
 extern	qboolean		insubmodel;
 extern	vec3_t			r_worldmodelorg;
 
-extern mat4_t   glsl_projection;
-extern mat4_t   glsl_view;
+extern mat4f_t   glsl_projection;
+extern mat4f_t   glsl_view;
 
 void R_SetFrustum (void);
 
diff --git a/libs/entity/transform.c b/libs/entity/transform.c
index 18382e56c..0e274f83a 100644
--- a/libs/entity/transform.c
+++ b/libs/entity/transform.c
@@ -295,18 +295,35 @@ Transform_GetWorldScale (const transform_t *transform)
 	return h->worldScale.a[transform->index];
 }
 
+void
+Transform_SetLocalTransform (transform_t *transform, vec4f_t scale,
+							 vec4f_t rotation, vec4f_t position)
+{
+	hierarchy_t *h = transform->hierarchy;
+	mat4f_t     mat;
+	mat4fquat (mat, rotation);
+
+	position[3] = 1;
+	h->localMatrix.a[transform->index][0] = mat[0] * scale[0];
+	h->localMatrix.a[transform->index][1] = mat[1] * scale[1];
+	h->localMatrix.a[transform->index][2] = mat[2] * scale[2];
+	h->localMatrix.a[transform->index][3] = position;
+	h->modified.a[transform->index] = 1;
+	Hierarchy_UpdateMatrices (h);
+}
+
 vec4f_t
 Transform_Forward (const transform_t *transform)
 {
 	hierarchy_t *h = transform->hierarchy;
-	return h->worldMatrix.a[transform->index][1];
+	return h->worldMatrix.a[transform->index][0];
 }
 
 vec4f_t
 Transform_Right (const transform_t *transform)
 {
 	hierarchy_t *h = transform->hierarchy;
-	return h->worldMatrix.a[transform->index][0];
+	return -h->worldMatrix.a[transform->index][1];
 }
 
 vec4f_t
diff --git a/libs/video/renderer/gl/gl_dyn_part.c b/libs/video/renderer/gl/gl_dyn_part.c
index 5f510b26c..5aa093813 100644
--- a/libs/video/renderer/gl/gl_dyn_part.c
+++ b/libs/video/renderer/gl/gl_dyn_part.c
@@ -205,7 +205,7 @@ gl_R_ReadPointFile_f (void)
 	vec3_t      org;
 	QFile      *f;
 
-	mapname = strdup (r_worldentity.model->path);
+	mapname = strdup (r_worldentity.renderer.model->path);
 	if (!mapname)
 		Sys_Error ("Can't duplicate mapname!");
 	QFS_StripExtension (mapname, mapname);
diff --git a/libs/video/renderer/gl/gl_lightmap.c b/libs/video/renderer/gl/gl_lightmap.c
index c6270f5d4..d46c35014 100644
--- a/libs/video/renderer/gl/gl_lightmap.c
+++ b/libs/video/renderer/gl/gl_lightmap.c
@@ -582,7 +582,7 @@ gl_overbright_f (cvar_t *var)
 		return;
 
 	for (ent = r_ent_queue; ent; ent = ent->next) {
-		m = ent->model;
+		m = ent->renderer.model;
 
 		if (m->type != mod_brush)
 			continue;
@@ -605,7 +605,7 @@ gl_overbright_f (cvar_t *var)
 		}
 	}
 
-	brush = &r_worldentity.model->brush;
+	brush = &r_worldentity.renderer.model->brush;
 
 	for (i = 0, fa = brush->surfaces; i < brush->numsurfaces; i++, fa++) {
 		if (fa->flags & (SURF_DRAWTURB | SURF_DRAWSKY))
diff --git a/libs/video/renderer/gl/gl_mod_alias.c b/libs/video/renderer/gl/gl_mod_alias.c
index d47a1504f..4b90ba54a 100644
--- a/libs/video/renderer/gl/gl_mod_alias.c
+++ b/libs/video/renderer/gl/gl_mod_alias.c
@@ -43,6 +43,7 @@
 #include <stdlib.h>
 
 #include "QF/cvar.h"
+#include "QF/entity.h"
 #include "QF/locs.h"
 #include "QF/mathlib.h"
 #include "QF/qargs.h"
@@ -299,14 +300,14 @@ GL_GetAliasFrameVerts16 (aliashdr_t *paliashdr, entity_t *e)
 
 
 	if (blend == 0.0) {
-		verts = verts + e->pose1 * count;
+		verts = verts + e->animation.pose1 * count;
 	} else if (blend == 1.0) {
-		verts = verts + e->pose2 * count;
+		verts = verts + e->animation.pose2 * count;
 	} else {
 		trivertx16_t *verts1, *verts2;
 
-		verts1 = verts + e->pose1 * count;
-		verts2 = verts + e->pose2 * count;
+		verts1 = verts + e->animation.pose1 * count;
+		verts2 = verts + e->animation.pose2 * count;
 
 		for (i = 0, vo_v = vo->verts; i < count;
 			 i++, vo_v++, verts1++, verts2++) {
@@ -362,14 +363,14 @@ GL_GetAliasFrameVerts (aliashdr_t *paliashdr, entity_t *e)
 		blend = 1.0;
 
 	if (blend == 0.0) {
-		verts = verts + e->pose1 * count;
+		verts = verts + e->animation.pose1 * count;
 	} else if (blend == 1.0) {
-		verts = verts + e->pose2 * count;
+		verts = verts + e->animation.pose2 * count;
 	} else {
 		trivertx_t *verts1, *verts2;
 
-		verts1 = verts + e->pose1 * count;
-		verts2 = verts + e->pose2 * count;
+		verts1 = verts + e->animation.pose1 * count;
+		verts2 = verts + e->animation.pose2 * count;
 
 		for (i = 0, vo_v = vo->verts; i < count;
 			 i++, vo_v++, verts1++, verts2++) {
@@ -415,7 +416,7 @@ gl_R_DrawAliasModel (entity_t *e)
 	vec3_t      dist, scale;
 	vert_order_t *vo;
 
-	model = e->model;
+	model = e->renderer.model;
 
 	radius = model->radius;
 	if (e->scale != 1.0)
@@ -425,18 +426,18 @@ gl_R_DrawAliasModel (entity_t *e)
 
 	VectorSubtract (r_origin, e->origin, modelorg);
 
-	gl_modelalpha = e->colormod[3];
+	gl_modelalpha = e->renderer.colormod[3];
 
-	is_fullbright = (model->fullbright || e->fullbright);
-	minlight = max (model->min_light, e->min_light);
+	is_fullbright = (model->fullbright || e->renderer.fullbright);
+	minlight = max (model->min_light, e->renderer.min_light);
 
-	qfglColor4fv (e->colormod);
+	qfglColor4fv (e->renderer.colormod);
 
 	if (!is_fullbright) {
 		float lightadj;
 
 		// get lighting information
-		R_LightPoint (&r_worldentity.model->brush, e->origin);
+		R_LightPoint (&r_worldentity.renderer.model->brush, e->origin);
 
 		lightadj = (ambientcolor[0] + ambientcolor[1] + ambientcolor[2]) / 765.0;
 
@@ -530,24 +531,25 @@ gl_R_DrawAliasModel (entity_t *e)
 				VectorScale (emission, 1.5 / d, emission);
 			}
 
-			emission[0] *= e->colormod[0];
-			emission[1] *= e->colormod[1];
-			emission[2] *= e->colormod[2];
-			emission[3] *= e->colormod[3];
+			emission[0] *= e->renderer.colormod[0];
+			emission[1] *= e->renderer.colormod[1];
+			emission[2] *= e->renderer.colormod[2];
+			emission[3] *= e->renderer.colormod[3];
 
 			qfglColor4fv (emission);
 		}
 	}
 
 	// locate the proper data
-	if (!(paliashdr = e->model->aliashdr))
-		paliashdr = Cache_Get (&e->model->cache);
+	if (!(paliashdr = e->renderer.model->aliashdr)) {
+		paliashdr = Cache_Get (&e->renderer.model->cache);
+	}
 	gl_c_alias_polys += paliashdr->mdl.numtris;
 
 	// if the model has a colorised/external skin, use it, otherwise use
 	// the skin embedded in the model data
-	if (e->skin && e->skin->texnum && !gl_nocolors->int_val) {
-		skin_t *skin = e->skin;
+	if (e->renderer.skin && e->renderer.skin->texnum && !gl_nocolors->int_val) {
+		skin_t *skin = e->renderer.skin;
 
 		texture = skin->texnum;
 		if (gl_fb_models->int_val) {
@@ -556,10 +558,11 @@ gl_R_DrawAliasModel (entity_t *e)
 	} else {
 		maliasskindesc_t *skindesc;
 
-		skindesc = R_AliasGetSkindesc (e->skinnum, paliashdr);
+		skindesc = R_AliasGetSkindesc (e->renderer.skinnum, paliashdr);
 		texture = skindesc->texnum;
-		if (gl_fb_models->int_val && !is_fullbright)
+		if (gl_fb_models->int_val && !is_fullbright) {
 			fb_texture = skindesc->fb_texnum;
+		}
 	}
 
 	if (paliashdr->mdl.ident == HEADER_MDL16) {
@@ -640,7 +643,7 @@ gl_R_DrawAliasModel (entity_t *e)
 						qfglDisable (GL_NORMALIZE);
 				}
 
-				qfglColor4fv (e->colormod);
+				qfglColor4fv (e->renderer.colormod);
 
 				qfglBindTexture (GL_TEXTURE_2D, fb_texture);
 				GL_DrawAliasFrameTri (vo);
@@ -660,7 +663,7 @@ gl_R_DrawAliasModel (entity_t *e)
 						qfglDisable (GL_NORMALIZE);
 				}
 
-				qfglColor4fv (e->colormod);
+				qfglColor4fv (e->renderer.colormod);
 
 				qfglBindTexture (GL_TEXTURE_2D, fb_texture);
 				GL_DrawAliasFrame (vo);
@@ -678,7 +681,7 @@ gl_R_DrawAliasModel (entity_t *e)
 
 	// torches, grenades, and lightning bolts do not have shadows
 	if (r_shadows->int_val && model->shadow_alpha) {
-		mat4_t      shadow_mat;
+		mat4f_t     shadow_mat;
 
 		qfglPushMatrix ();
 		gl_R_RotateForEntity (e);
@@ -690,19 +693,19 @@ gl_R_DrawAliasModel (entity_t *e)
 		qfglDepthMask (GL_FALSE);
 
 		if (gl_modelalpha < 1.0) {
-			VectorBlend (e->colormod, dark, 0.5, color);
+			VectorBlend (e->renderer.colormod, dark, 0.5, color);
 			color[3] = gl_modelalpha * (model->shadow_alpha / 255.0);
 			qfglColor4fv (color);
 		} else {
 			color_black[3] = model->shadow_alpha;
 			qfglColor4ubv (color_black);
 		}
-		shadevector[0] = 1;
-		shadevector[1] = 0;
-		shadevector[2] = 1;
-		VectorNormalize (shadevector);
-		Mat4Transpose (e->transform, shadow_mat);
-		Mat4as3MultVec (shadow_mat, shadevector, shadevector);
+		//FIXME fully vectorize
+		vec4f_t     vec = { 707106781, 0, 707106781, 0 };
+		Transform_GetWorldMatrix (e->transform, shadow_mat);
+		mat4ftranspose (shadow_mat, shadow_mat);
+		vec = mvmulf (shadow_mat, vec);
+		VectorCopy (vec, shadevector);
 		if (vo->tex_coord)
 			GL_DrawAliasShadowTri (paliashdr, vo);
 		else
@@ -722,6 +725,7 @@ gl_R_DrawAliasModel (entity_t *e)
 		qfglDisable (GL_LIGHT0 + used_lights);
 	}
 
-	if (!e->model->aliashdr)
-		Cache_Release (&e->model->cache);
+	if (!e->renderer.model->aliashdr) {
+		Cache_Release (&e->renderer.model->cache);
+	}
 }
diff --git a/libs/video/renderer/gl/gl_mod_iqm.c b/libs/video/renderer/gl/gl_mod_iqm.c
index 4c50795b7..601a76fbf 100644
--- a/libs/video/renderer/gl/gl_mod_iqm.c
+++ b/libs/video/renderer/gl/gl_mod_iqm.c
@@ -90,7 +90,7 @@ gl_draw_iqm_frame (iqm_t *iqm, gliqm_t *gl, iqmframe_t *frame, iqmmesh *mesh)
 void
 gl_R_DrawIQMModel (entity_t *ent)
 {
-	model_t    *model = ent->model;
+	model_t    *model = ent->renderer.model;
 	iqm_t      *iqm = (iqm_t *) model->aliashdr;
 	gliqm_t    *gl = (gliqm_t *) iqm->extra_data;
 	float       blend;
@@ -98,8 +98,8 @@ gl_R_DrawIQMModel (entity_t *ent)
 	int         i;
 
 	blend = R_IQMGetLerpedFrames (ent, iqm);
-	frame = R_IQMBlendPalette (iqm, ent->pose1, ent->pose2, blend, 0,
-							   gl->blend_palette, gl->palette_size);
+	frame = R_IQMBlendPalette (iqm, ent->animation.pose1, ent->animation.pose2,
+							   blend, 0, gl->blend_palette, gl->palette_size);
 
 	qfglPushMatrix ();
 	gl_R_RotateForEntity (ent);
diff --git a/libs/video/renderer/gl/gl_mod_sprite.c b/libs/video/renderer/gl/gl_mod_sprite.c
index c5b484ed7..b6ce25f22 100644
--- a/libs/video/renderer/gl/gl_mod_sprite.c
+++ b/libs/video/renderer/gl/gl_mod_sprite.c
@@ -41,6 +41,7 @@
 #include "QF/GL/defines.h"
 #include "QF/GL/funcs.h"
 
+#include "QF/entity.h"
 #include "QF/model.h"
 #include "QF/render.h"
 #include "QF/sys.h"
@@ -66,8 +67,8 @@ R_GetSpriteFrame (entity_t *currententity)
 	mspriteframe_t *pspriteframe;
 	mspritegroup_t *pspritegroup;
 
-	psprite = currententity->model->cache.data;
-	frame = currententity->frame;
+	psprite = currententity->renderer.model->cache.data;
+	frame = currententity->animation.frame;
 
 	if ((frame >= psprite->numframes) || (frame < 0)) {
 		Sys_MaskPrintf (SYS_DEV, "R_DrawSprite: no such frame %d\n", frame);
@@ -82,7 +83,7 @@ R_GetSpriteFrame (entity_t *currententity)
 		numframes = pspritegroup->numframes;
 		fullinterval = pintervals[numframes - 1];
 
-		time = vr_data.realtime + currententity->syncbase;
+		time = vr_data.realtime + currententity->animation.syncbase;
 
 		// when loading in Mod_LoadSpriteGroup, we guaranteed all interval
 		// values are positive, so we don't have to worry about division by 0
@@ -103,35 +104,32 @@ static void
 R_DrawSpriteModel_f (entity_t *e)
 {
 	float			 modelalpha, color[4];
-	float			*up, *right;
+	vec4f_t          up = {}, right = {};
+	vec4f_t          origin, point1, point2;
 	msprite_t		*psprite;
 	mspriteframe_t	*frame;
-	vec3_t			 point, point1, point2, v_up;
 
 	// don't bother culling, it's just a single polygon without a surface cache
 	frame = R_GetSpriteFrame (e);
-	psprite = e->model->cache.data;
+	psprite = e->renderer.model->cache.data;
 
 	if (psprite->type == SPR_ORIENTED) {	// bullet marks on walls
-		up = e->transform + 2 * 4;
-		right = e->transform + 1 * 4;
+		up = Transform_Up (e->transform);
+		right = Transform_Right (e->transform);
 	} else if (psprite->type == SPR_VP_PARALLEL_UPRIGHT) {
-		v_up[0] = 0;
-		v_up[1] = 0;
-		v_up[2] = 1;
-		up = v_up;
-		right = vright;
+		up = (vec4f_t) { 0, 0, 1, 0 };
+		VectorCopy (vright, right);
 	} else {								// normal sprite
-		up = vup;
-		right = vright;
+		VectorCopy (vup, up);
+		VectorCopy (vright, right);
 	}
 	if (e->scale != 1.0) {
-		VectorScale (up, e->scale, up);
-		VectorScale (right, e->scale, right);
+		up *= e->scale;
+		right *= e->scale;
 	}
 
-	VectorCopy (e->colormod, color);
-	modelalpha = color[3] = e->colormod[3];
+	VectorCopy (e->renderer.colormod, color);
+	modelalpha = color[3] = e->renderer.colormod[3];
 	if (modelalpha < 1.0)
 		qfglDepthMask (GL_FALSE);
 
@@ -141,23 +139,24 @@ R_DrawSpriteModel_f (entity_t *e)
 
 	qfglColor4fv (color);
 
+	origin = Transform_GetWorldPosition (e->transform);
+	point1 = origin + frame->down * up + frame->left * right;
+	point2 = origin + frame->up * up + frame->left * right;
+
 	qfglTexCoord2f (0, 1);
-	VectorMultAdd (e->origin, frame->down, up, point1);
-	VectorMultAdd (point1, frame->left, right, point);
-	qfglVertex3fv (point);
+	qfglVertex3fv (&point1[0]);
 
 	qfglTexCoord2f (0, 0);
-	VectorMultAdd (e->origin, frame->up, up, point2);
-	VectorMultAdd (point2, frame->left, right, point);
-	qfglVertex3fv (point);
+	qfglVertex3fv (&point2[0]);
+
+	point2 += frame->right * right;
+	point1 += frame->right * right;
 
 	qfglTexCoord2f (1, 0);
-	VectorMultAdd (point2, frame->right, right, point);
-	qfglVertex3fv (point);
+	qfglVertex3fv (&point2[0]);
 
 	qfglTexCoord2f (1, 1);
-	VectorMultAdd (point1, frame->right, right, point);
-	qfglVertex3fv (point);
+	qfglVertex3fv (&point1[0]);
 
 	qfglEnd ();
 
@@ -169,60 +168,60 @@ static void
 R_DrawSpriteModel_VA_f (entity_t *e)
 {
 	unsigned char	 modelalpha, color[4];
-	float			*up, *right;
+	vec4f_t          up = {}, right = {};
+	vec4f_t          origin, point1, point2;
 	int				 i;
 //	unsigned int	 vacount;
 	msprite_t		*psprite;
 	mspriteframe_t	*frame;
-	vec3_t			 point1, point2, v_up;
 	varray_t2f_c4ub_v3f_t		*VA;
 
 	VA = gl_spriteVertexArray; // FIXME: Despair
 
 	// don't bother culling, it's just a single polygon without a surface cache
 	frame = R_GetSpriteFrame (e);
-	psprite = e->model->cache.data;
+	psprite = e->renderer.model->cache.data;
 
 	qfglBindTexture (GL_TEXTURE_2D, frame->gl_texturenum); // FIXME: DESPAIR
 
 	if (psprite->type == SPR_ORIENTED) {	// bullet marks on walls
-		up = e->transform + 2 * 4;
-		right = e->transform + 1 * 4;
+		up = Transform_Up (e->transform);
+		right = Transform_Right (e->transform);
 	} else if (psprite->type == SPR_VP_PARALLEL_UPRIGHT) {
-		v_up[0] = 0;
-		v_up[1] = 0;
-		v_up[2] = 1;
-		up = v_up;
-		right = vright;
+		up = (vec4f_t) { 0, 0, 1, 0 };
+		VectorCopy (vright, right);
 	} else {								// normal sprite
-		up = vup;
-		right = vright;
+		VectorCopy (vup, up);
+		VectorCopy (vright, right);
 	}
 	if (e->scale != 1.0) {
-		VectorScale (up, e->scale, up);
-		VectorScale (right, e->scale, right);
+		up *= e->scale;
+		right *= e->scale;
 	}
 
-	for (i = 0; i < 4; i++)
-		color[i] = e->colormod[i] * 255;
+	for (i = 0; i < 4; i++) {
+		color[i] = e->renderer.colormod[i] * 255;
+	}
 	memcpy (VA[0].color, color, 4);
+	memcpy (VA[1].color, color, 4);
+	memcpy (VA[2].color, color, 4);
+	memcpy (VA[3].color, color, 4);
 
 	modelalpha = color[3];
 	if (modelalpha < 255)
 		qfglDepthMask (GL_FALSE);
 
-	VectorMultAdd (e->origin, frame->down, up, point1);
-	VectorMultAdd (point1, frame->left, right, VA[0].vertex);
+	origin = Transform_GetWorldPosition (e->transform);
+	point1 = origin + frame->down * up + frame->left * right;
+	VectorCopy (point1, VA[0].vertex);
 
-	memcpy (VA[1].color, color, 4);
-	VectorMultAdd (e->origin, frame->up, up, point2);
-	VectorMultAdd (point2, frame->left, right, VA[1].vertex);
+	point2 = origin + frame->up * up + frame->left * right;
+	VectorCopy (point2, VA[1].vertex);
 
-	memcpy (VA[2].color, color, 4);
-	VectorMultAdd (point2, frame->right, right, VA[2].vertex);
-
-	memcpy (VA[3].color, color, 4);
-	VectorMultAdd (point1, frame->right, right, VA[3].vertex);
+	point2 += frame->right * right;
+	point1 += frame->right * right;
+	VectorCopy (point2, VA[2].vertex);
+	VectorCopy (point1, VA[3].vertex);
 
 //	VA += 4;
 //	vacount += 4;
diff --git a/libs/video/renderer/gl/gl_rmain.c b/libs/video/renderer/gl/gl_rmain.c
index 1f9b30696..23d7f7be4 100644
--- a/libs/video/renderer/gl/gl_rmain.c
+++ b/libs/video/renderer/gl/gl_rmain.c
@@ -44,6 +44,7 @@
 
 #include "QF/cvar.h"
 #include "QF/draw.h"
+#include "QF/entity.h"
 #include "QF/locs.h"
 #include "QF/mathlib.h"
 #include "QF/qargs.h"
@@ -178,7 +179,9 @@ glrmain_init (void)
 void
 gl_R_RotateForEntity (entity_t *e)
 {
-	qfglMultMatrixf (e->transform);
+	mat4f_t     mat;
+	Transform_GetWorldMatrix (e->transform, mat);
+	qfglMultMatrixf (&mat[0][0]);
 }
 
 /*
@@ -217,7 +220,7 @@ R_DrawEntitiesOnList (void)
 	}
 
 	for (ent = r_ent_queue; ent; ent = ent->next) {
-		if (ent->model->type != mod_alias)
+		if (ent->renderer.model->type != mod_alias)
 			continue;
 		currententity = ent;
 
@@ -249,7 +252,7 @@ R_DrawEntitiesOnList (void)
 	}
 
 	for (ent = r_ent_queue; ent; ent = ent->next) {
-		if (ent->model->type != mod_iqm)
+		if (ent->renderer.model->type != mod_iqm)
 			continue;
 		currententity = ent;
 
@@ -262,7 +265,7 @@ R_DrawEntitiesOnList (void)
 	if (gl_va_capable)
 		qfglInterleavedArrays (GL_T2F_C4UB_V3F, 0, gl_spriteVertexArray);
 	for (ent = r_ent_queue; ent; ent = ent->next) {
-		if (ent->model->type != mod_sprite)
+		if (ent->renderer.model->type != mod_sprite)
 			continue;
 		currententity = ent;
 
@@ -279,7 +282,7 @@ R_DrawViewModel (void)
 		|| !r_drawviewmodel->int_val
 		|| gl_envmap
 		|| !r_drawentities->int_val
-		|| !currententity->model)
+		|| !currententity->renderer.model)
 		return;
 
 	// hack the depth range to prevent view model from poking into walls
@@ -349,7 +352,7 @@ gl_R_SetupFrame (void)
 	R_SetFrustum ();
 
 	// current viewleaf
-	r_viewleaf = Mod_PointInLeaf (r_origin, r_worldentity.model);
+	r_viewleaf = Mod_PointInLeaf (r_origin, r_worldentity.renderer.model);
 
 	r_cache_thrash = false;
 
@@ -559,10 +562,12 @@ R_Mirror (void)
 static void
 R_RenderView_ (void)
 {
-	if (r_norefresh->int_val)
+	if (r_norefresh->int_val) {
 		return;
-	if (!r_worldentity.model)
+	}
+	if (!r_worldentity.renderer.model) {
 		Sys_Error ("R_RenderView: NULL worldmodel");
+	}
 
 	gl_mirror = false;
 
@@ -892,7 +897,7 @@ R_RenderViewFishEye (void)
 void
 gl_R_ClearState (void)
 {
-	r_worldentity.model = 0;
+	r_worldentity.renderer.model = 0;
 	R_ClearEfrags ();
 	R_ClearDlights ();
 	gl_R_ClearParticles ();
diff --git a/libs/video/renderer/gl/gl_rmisc.c b/libs/video/renderer/gl/gl_rmisc.c
index 5c61fd70d..d9a1c6797 100644
--- a/libs/video/renderer/gl/gl_rmisc.c
+++ b/libs/video/renderer/gl/gl_rmisc.c
@@ -191,7 +191,7 @@ gl_R_NewMap (model_t *worldmodel, struct model_s **models, int num_models)
 		d_lightstylevalue[i] = 264;		// normal light value
 
 	memset (&r_worldentity, 0, sizeof (r_worldentity));
-	r_worldentity.model = worldmodel;
+	r_worldentity.renderer.model = worldmodel;
 	brush = &worldmodel->brush;
 
 	R_FreeAllEntities ();
@@ -230,7 +230,8 @@ gl_R_NewMap (model_t *worldmodel, struct model_s **models, int num_models)
 			continue;
 		if (*models[i]->path == '*')
 			continue;
-		if (models[i] != r_worldentity.model && models[i]->type == mod_brush)
+		if (models[i] != r_worldentity.renderer.model
+			&& models[i]->type == mod_brush)
 			register_textures (&models[i]->brush);
 	}
 }
diff --git a/libs/video/renderer/gl/gl_rsurf.c b/libs/video/renderer/gl/gl_rsurf.c
index acd9f4ad3..b954fc066 100644
--- a/libs/video/renderer/gl/gl_rsurf.c
+++ b/libs/video/renderer/gl/gl_rsurf.c
@@ -45,6 +45,7 @@
 #include <stdio.h>
 
 #include "QF/cvar.h"
+#include "QF/entity.h"
 #include "QF/render.h"
 #include "QF/sys.h"
 #include "QF/GL/defines.h"
@@ -530,11 +531,14 @@ gl_R_DrawBrushModel (entity_t *e)
 	qboolean    rotated;
 	vec3_t      mins, maxs;
 	mod_brush_t *brush;
+	mat4f_t     worldMatrix;
 
-	model = e->model;
+	model = e->renderer.model;
 	brush = &model->brush;
 
-	if (e->transform[0] != 1 || e->transform[5] != 1 || e->transform[10] != 1) {
+	Transform_GetWorldMatrix (e->transform, worldMatrix);
+	if (worldMatrix[0][0] != 1 || worldMatrix[1][1] != 1
+		|| worldMatrix[2][2] != 1) {
 		rotated = true;
 		radius = model->radius;
 #if 0 //QSG FIXME
@@ -559,12 +563,11 @@ gl_R_DrawBrushModel (entity_t *e)
 
 	VectorSubtract (r_refdef.vieworg, e->origin, modelorg);
 	if (rotated) {
-		vec3_t      temp;
+		vec4f_t     temp = { modelorg[0], modelorg[1], modelorg[2], 0 };
 
-		VectorCopy (modelorg, temp);
-		modelorg[0] = DotProduct (temp, e->transform + 0);
-		modelorg[1] = DotProduct (temp, e->transform + 4);
-		modelorg[2] = DotProduct (temp, e->transform + 8);
+		modelorg[0] = dotf (temp, worldMatrix[0])[0];
+		modelorg[1] = dotf (temp, worldMatrix[1])[0];
+		modelorg[2] = dotf (temp, worldMatrix[2])[0];
 	}
 
 	// calculate dynamic lighting for bmodel if it's not an instanced model
@@ -584,7 +587,7 @@ gl_R_DrawBrushModel (entity_t *e)
 
 	qfglPushMatrix ();
 	gl_R_RotateForEntity (e);
-	qfglGetFloatv (GL_MODELVIEW_MATRIX, e->full_transform);
+	qfglGetFloatv (GL_MODELVIEW_MATRIX, e->renderer.full_transform);
 	qfglPopMatrix ();
 
 	psurf = &brush->surfaces[brush->firstmodelsurface];
@@ -599,7 +602,8 @@ gl_R_DrawBrushModel (entity_t *e)
 		// draw the polygon
 		if (((psurf->flags & SURF_PLANEBACK) && (dot < -BACKFACE_EPSILON)) ||
 			(!(psurf->flags & SURF_PLANEBACK) && (dot > BACKFACE_EPSILON))) {
-			chain_surface (brush, psurf, e->full_transform, e->colormod);
+			chain_surface (brush, psurf, e->renderer.full_transform,
+						   e->renderer.colormod);
 		}
 	}
 }
@@ -717,7 +721,7 @@ gl_R_DrawWorld (void)
 	entity_t    worldent;
 
 	memset (&worldent, 0, sizeof (worldent));
-	worldent.model = r_worldentity.model;
+	worldent.renderer.model = r_worldentity.renderer.model;
 
 	VectorCopy (r_refdef.vieworg, modelorg);
 
@@ -729,12 +733,13 @@ gl_R_DrawWorld (void)
 		gl_R_DrawSky ();
 	}
 
-	R_VisitWorldNodes (&r_worldentity.model->brush);
+	R_VisitWorldNodes (&r_worldentity.renderer.model->brush);
 	if (r_drawentities->int_val) {
 		entity_t   *ent;
 		for (ent = r_ent_queue; ent; ent = ent->next) {
-			if (ent->model->type != mod_brush)
+			if (ent->renderer.model->type != mod_brush) {
 				continue;
+			}
 			currententity = ent;
 
 			gl_R_DrawBrushModel (currententity);
diff --git a/libs/video/renderer/glsl/glsl_alias.c b/libs/video/renderer/glsl/glsl_alias.c
index 3cbf4f89d..e0c29cfe4 100644
--- a/libs/video/renderer/glsl/glsl_alias.c
+++ b/libs/video/renderer/glsl/glsl_alias.c
@@ -43,6 +43,7 @@
 #include <stdlib.h>
 
 #include "QF/cvar.h"
+#include "QF/entity.h"
 #include "QF/render.h"
 #include "QF/skin.h"
 #include "QF/sys.h"
@@ -111,7 +112,7 @@ static struct {
 	{"fog", 1},
 };
 
-static mat4_t alias_vp;
+static mat4f_t alias_vp;
 
 void
 glsl_R_InitAlias (void)
@@ -159,8 +160,9 @@ calc_lighting (entity_t *ent, float *ambient, float *shadelight,
 	int         light;
 
 	VectorSet ( -1, 0, 0, lightvec);	//FIXME
-	light = R_LightPoint (&r_worldentity.model->brush, ent->origin);
-	*ambient = max (light, max (ent->model->min_light, ent->min_light) * 128);
+	light = R_LightPoint (&r_worldentity.renderer.model->brush, ent->origin);
+	*ambient = max (light, max (ent->renderer.model->min_light,
+								ent->renderer.min_light) * 128);
 	*shadelight = *ambient;
 
 	for (i = 0; i < r_maxdlights; i++) {
@@ -228,50 +230,52 @@ glsl_R_DrawAlias (void)
 	float       skin_size[2];
 	float       blend;
 	entity_t   *ent = currententity;
-	model_t    *model = ent->model;
+	model_t    *model = ent->renderer.model;
 	aliashdr_t *hdr;
 	vec_t       norm_mat[9];
-	mat4_t      mvp_mat;
 	int         skin_tex;
 	int         colormap;
 	aliasvrt_t *pose1 = 0;		// VBO's are null based
 	aliasvrt_t *pose2 = 0;		// VBO's are null based
+	mat4f_t     worldMatrix;
 
 	if (!(hdr = model->aliashdr))
 		hdr = Cache_Get (&model->cache);
 
 	calc_lighting (ent, &ambient, &shadelight, lightvec);
 
+	Transform_GetWorldMatrix (ent->transform, worldMatrix);
 	// we need only the rotation for normals.
-	VectorCopy (ent->transform + 0, norm_mat + 0);
-	VectorCopy (ent->transform + 4, norm_mat + 3);
-	VectorCopy (ent->transform + 8, norm_mat + 6);
+	VectorCopy (worldMatrix[0], norm_mat + 0);
+	VectorCopy (worldMatrix[1], norm_mat + 3);
+	VectorCopy (worldMatrix[2], norm_mat + 6);
 
 	// ent model scaling and offset
-	Mat4Zero (mvp_mat);
-	mvp_mat[0] = hdr->mdl.scale[0];
-	mvp_mat[5] = hdr->mdl.scale[1];
-	mvp_mat[10] = hdr->mdl.scale[2];
-	mvp_mat[15] = 1;
-	VectorCopy (hdr->mdl.scale_origin, mvp_mat + 12);
-	Mat4Mult (ent->transform, mvp_mat, mvp_mat);
-	Mat4Mult (alias_vp, mvp_mat, mvp_mat);
+	mat4f_t     mvp_mat = {
+		{ hdr->mdl.scale[0], 0, 0, 0 },
+		{ 0, hdr->mdl.scale[1], 0, 0 },
+		{ 0, 0, hdr->mdl.scale[2], 0 },
+		{ hdr->mdl.scale_origin[0], hdr->mdl.scale_origin[1],
+		  hdr->mdl.scale_origin[2], 1 },
+	};
+	mmulf (mvp_mat, worldMatrix, mvp_mat);
+	mmulf (mvp_mat, alias_vp, mvp_mat);
 
 	colormap = glsl_colormap;
-	if (ent->skin && ent->skin->auxtex)
-		colormap = ent->skin->auxtex;
-	if (ent->skin && ent->skin->texnum) {
-		skin_t     *skin = ent->skin;
+	if (ent->renderer.skin && ent->renderer.skin->auxtex)
+		colormap = ent->renderer.skin->auxtex;
+	if (ent->renderer.skin && ent->renderer.skin->texnum) {
+		skin_t     *skin = ent->renderer.skin;
 		skin_tex = skin->texnum;
 	} else {
 		maliasskindesc_t *skindesc;
-		skindesc = R_AliasGetSkindesc (ent->skinnum, hdr);
+		skindesc = R_AliasGetSkindesc (ent->renderer.skinnum, hdr);
 		skin_tex = skindesc->texnum;
 	}
 	blend = R_AliasGetLerpedFrames (ent, hdr);
 
-	pose1 += ent->pose1 * hdr->poseverts;
-	pose2 += ent->pose2 * hdr->poseverts;
+	pose1 += ent->animation.pose1 * hdr->poseverts;
+	pose2 += ent->animation.pose2 * hdr->poseverts;
 
 	skin_size[0] = hdr->mdl.skinwidth;
 	skin_size[1] = hdr->mdl.skinheight;
@@ -293,7 +297,8 @@ glsl_R_DrawAlias (void)
 	qfeglUniform1f (quake_mdl.shadelight.location, shadelight);
 	qfeglUniform3fv (quake_mdl.lightvec.location, 1, lightvec);
 	qfeglUniform2fv (quake_mdl.skin_size.location, 1, skin_size);
-	qfeglUniformMatrix4fv (quake_mdl.mvp_matrix.location, 1, false, mvp_mat);
+	qfeglUniformMatrix4fv (quake_mdl.mvp_matrix.location, 1, false,
+						   &mvp_mat[0][0]);
 	qfeglUniformMatrix3fv (quake_mdl.norm_matrix.location, 1, false, norm_mat);
 
 #ifndef TETRAHEDRON
@@ -321,7 +326,7 @@ glsl_R_AliasBegin (void)
 	quat_t      fog;
 
 	// pre-multiply the view and projection matricies
-	Mat4Mult (glsl_projection, glsl_view, alias_vp);
+	mmulf (alias_vp, glsl_projection, glsl_view);
 
 	qfeglUseProgram (quake_mdl.program);
 	qfeglEnableVertexAttribArray (quake_mdl.vertexa.location);
diff --git a/libs/video/renderer/glsl/glsl_bsp.c b/libs/video/renderer/glsl/glsl_bsp.c
index 3b5ed0cd4..3fc716cf8 100644
--- a/libs/video/renderer/glsl/glsl_bsp.c
+++ b/libs/video/renderer/glsl/glsl_bsp.c
@@ -46,6 +46,7 @@
 
 #include "QF/cvar.h"
 #include "QF/dstring.h"
+#include "QF/entity.h"
 #include "QF/image.h"
 #include "QF/render.h"
 #include "QF/sys.h"
@@ -94,7 +95,7 @@ static instsurf_t **instsurfs_tail = &instsurfs;
 static instsurf_t  *free_instsurfs;
 
 static GLuint   bsp_vbo;
-static mat4_t   bsp_vp;
+static mat4f_t  bsp_vp;
 
 static GLuint   skybox_tex;
 static qboolean skybox_loaded;
@@ -430,9 +431,9 @@ glsl_R_RegisterTextures (model_t **models, int num_models)
 	mod_brush_t *brush;
 
 	glsl_R_ClearTextures ();
-	glsl_R_InitSurfaceChains (&r_worldentity.model->brush);
+	glsl_R_InitSurfaceChains (&r_worldentity.renderer.model->brush);
 	glsl_R_AddTexture (r_notexture_mip);
-	register_textures (&r_worldentity.model->brush);
+	register_textures (&r_worldentity.renderer.model->brush);
 	for (i = 0; i < num_models; i++) {
 		m = models[i];
 		if (!m)
@@ -441,7 +442,7 @@ glsl_R_RegisterTextures (model_t **models, int num_models)
 		if (*m->path == '*')
 			continue;
 		// world has already been done, not interested in non-brush models
-		if (m == r_worldentity.model || m->type != mod_brush)
+		if (m == r_worldentity.renderer.model || m->type != mod_brush)
 			continue;
 		brush = &m->brush;
 		brush->numsubmodels = 1; // no support for submodels in non-world model
@@ -486,7 +487,7 @@ build_surf_displist (model_t **models, msurface_t *fa, int base,
 	if (fa->ec_index < 0) {
 		brush = &models[-fa->ec_index - 1]->brush;
 	} else {
-		brush = &r_worldentity.model->brush;
+		brush = &r_worldentity.renderer.model->brush;
 	}
 	vertices = brush->vertexes;
 	edges = brush->edges;
@@ -585,7 +586,7 @@ glsl_R_BuildDisplayLists (model_t **models, int num_models)
 			}
 			surf = brush->surfaces + j;
 			surf->ec_index = dm - brush->submodels;
-			if (!surf->ec_index && m != r_worldentity.model)
+			if (!surf->ec_index && m != r_worldentity.renderer.model)
 				surf->ec_index = -1 - i;	// instanced model
 			tex = surf->texinfo->texture->render;
 			CHAIN_SURF_F2B (surf, tex->tex_chain);
@@ -662,9 +663,12 @@ R_DrawBrushModel (entity_t *e)
 	vec3_t      mins, maxs, org;
 	mod_brush_t *brush;
 
-	model = e->model;
+	model = e->renderer.model;
 	brush = &model->brush;
-	if (e->transform[0] != 1 || e->transform[5] != 1 || e->transform[10] != 1) {
+	mat4f_t mat;
+	Transform_GetWorldMatrix (e->transform, mat);
+	memcpy (e->renderer.full_transform, mat, sizeof (mat));//FIXME
+	if (mat[0][0] != 1 || mat[1][1] != 1 || mat[2][2] != 1) {
 		rotated = true;
 		radius = model->radius;
 		if (R_CullSphere (e->origin, radius))
@@ -679,12 +683,11 @@ R_DrawBrushModel (entity_t *e)
 
 	VectorSubtract (r_refdef.vieworg, e->origin, org);
 	if (rotated) {
-		vec3_t      temp;
+		vec4f_t     temp = { org[0], org[1], org[2], 0 };
 
-		VectorCopy (org, temp);
-		org[0] = DotProduct (temp, e->transform + 0);
-		org[1] = DotProduct (temp, e->transform + 4);
-		org[2] = DotProduct (temp, e->transform + 8);
+		org[0] = dotf (temp, mat[0])[0];
+		org[1] = dotf (temp, mat[1])[0];
+		org[2] = dotf (temp, mat[2])[0];
 	}
 
 	// calculate dynamic lighting for bmodel if it's not an instanced model
@@ -713,7 +716,8 @@ R_DrawBrushModel (entity_t *e)
 		// enqueue the polygon
 		if (((surf->flags & SURF_PLANEBACK) && (dot < -BACKFACE_EPSILON))
 			|| (!(surf->flags & SURF_PLANEBACK) && (dot > BACKFACE_EPSILON))) {
-			chain_surface (brush, surf, e->transform, e->colormod);
+			chain_surface (brush, surf, e->renderer.full_transform,
+						   e->renderer.colormod);
 		}
 	}
 }
@@ -842,10 +846,10 @@ draw_elechain (elechain_t *ec, int matloc, int vertloc, int tlstloc,
 		}
 	}
 	if (ec->transform) {
-		Mat4Mult (bsp_vp, ec->transform, mat);
+		Mat4Mult (&bsp_vp[0][0], ec->transform, mat);//FIXME
 		qfeglUniformMatrix4fv (matloc, 1, false, mat);
 	} else {
-		qfeglUniformMatrix4fv (matloc, 1, false, bsp_vp);
+		qfeglUniformMatrix4fv (matloc, 1, false, &bsp_vp[0][0]);
 	}
 	for (el = ec->elements; el; el = el->next) {
 		if (!el->list->size)
@@ -873,7 +877,7 @@ bsp_begin (void)
 	QuatCopy (default_color, last_color);
 	qfeglVertexAttrib4fv (quake_bsp.color.location, default_color);
 
-	Mat4Mult (glsl_projection, glsl_view, bsp_vp);
+	mmulf (bsp_vp, glsl_projection, glsl_view);
 
 	qfeglUseProgram (quake_bsp.program);
 	qfeglEnableVertexAttribArray (quake_bsp.vertex.location);
@@ -928,7 +932,7 @@ turb_begin (void)
 	QuatCopy (default_color, last_color);
 	qfeglVertexAttrib4fv (quake_bsp.color.location, default_color);
 
-	Mat4Mult (glsl_projection, glsl_view, bsp_vp);
+	mmulf (bsp_vp, glsl_projection, glsl_view);
 
 	qfeglUseProgram (quake_turb.program);
 	qfeglEnableVertexAttribArray (quake_turb.vertex.location);
@@ -1001,7 +1005,7 @@ sky_begin (void)
 	QuatCopy (default_color, last_color);
 	qfeglVertexAttrib4fv (quake_bsp.color.location, default_color);
 
-	Mat4Mult (glsl_projection, glsl_view, bsp_vp);
+	mmulf (bsp_vp, glsl_projection, glsl_view);
 
 	if (skybox_loaded) {
 		sky_params.mvp_matrix = &quake_skybox.mvp_matrix;
@@ -1127,15 +1131,15 @@ glsl_R_DrawWorld (void)
 	clear_texture_chains ();	// do this first for water and skys
 
 	memset (&worldent, 0, sizeof (worldent));
-	worldent.model = r_worldentity.model;
+	worldent.renderer.model = r_worldentity.renderer.model;
 
 	currententity = &worldent;
 
-	R_VisitWorldNodes (&worldent.model->brush);
+	R_VisitWorldNodes (&worldent.renderer.model->brush);
 	if (r_drawentities->int_val) {
 		entity_t   *ent;
 		for (ent = r_ent_queue; ent; ent = ent->next) {
-			if (ent->model->type != mod_brush)
+			if (ent->renderer.model->type != mod_brush)
 				continue;
 			currententity = ent;
 
diff --git a/libs/video/renderer/glsl/glsl_iqm.c b/libs/video/renderer/glsl/glsl_iqm.c
index ce2c2f31d..76a9ae85e 100644
--- a/libs/video/renderer/glsl/glsl_iqm.c
+++ b/libs/video/renderer/glsl/glsl_iqm.c
@@ -43,6 +43,7 @@
 #include <stdlib.h>
 
 #include "QF/cvar.h"
+#include "QF/entity.h"
 #include "QF/render.h"
 #include "QF/skin.h"
 #include "QF/sys.h"
@@ -137,7 +138,7 @@ static struct va_attr_s {
 	{&iqm_shader.vcolor,   4, GL_UNSIGNED_BYTE, 1},
 };
 
-static mat4_t iqm_vp;
+static mat4f_t iqm_vp;
 
 void
 glsl_R_InitIQM (void)
@@ -207,28 +208,31 @@ glsl_R_DrawIQM (void)
 {
 	static quat_t color = { 1, 1, 1, 1};
 	entity_t   *ent = currententity;
-	model_t    *model = ent->model;
+	model_t    *model = ent->renderer.model;
 	iqm_t      *iqm = (iqm_t *) model->aliashdr;
 	glsliqm_t  *glsl = (glsliqm_t *) iqm->extra_data;
 	dlight_t   *lights[MAX_IQM_LIGHTS];
 	int         i;
 	vec_t       norm_mat[9];
-	mat4_t      mvp_mat;
+	mat4f_t     mvp_mat;
 	float       blend;
 	iqmframe_t *frame;
 
-	R_LightPoint (&r_worldentity.model->brush, ent->origin);//FIXME min_light?
+	R_LightPoint (&r_worldentity.renderer.model->brush, ent->origin);//FIXME min_light?
 	VectorScale (ambientcolor, 1/255.0, ambientcolor);
 	R_FindNearLights (ent->origin, MAX_IQM_LIGHTS, lights);
 
 	// we need only the rotation for normals.
-	VectorCopy (ent->transform + 0, norm_mat + 0);
-	VectorCopy (ent->transform + 4, norm_mat + 3);
-	VectorCopy (ent->transform + 8, norm_mat + 6);
-	Mat4Mult (iqm_vp, ent->transform, mvp_mat);
+	mat4f_t mat;
+	Transform_GetWorldMatrix (ent->transform, mat);
+	VectorCopy (mat[0], norm_mat + 0);
+	VectorCopy (mat[1], norm_mat + 3);
+	VectorCopy (mat[2], norm_mat + 6);
+	mmulf (mvp_mat, iqm_vp, mat);
 
 	blend = R_IQMGetLerpedFrames (ent, iqm);
-	frame = R_IQMBlendFrames (iqm, ent->pose1, ent->pose2, blend, 0);
+	frame = R_IQMBlendFrames (iqm, ent->animation.pose1, ent->animation.pose2,
+							  blend, 0);
 
 	qfeglUniform3fv (iqm_shader.ambient.location, 1, ambientcolor);
 	for (i = 0; i < MAX_IQM_LIGHTS; i++) {
@@ -249,7 +253,8 @@ glsl_R_DrawIQM (void)
 	qfeglBindBuffer (GL_ARRAY_BUFFER, glsl->vertex_array);
 	qfeglBindBuffer (GL_ELEMENT_ARRAY_BUFFER, glsl->element_array);
 
-	qfeglUniformMatrix4fv (iqm_shader.mvp_matrix.location, 1, false, mvp_mat);
+	qfeglUniformMatrix4fv (iqm_shader.mvp_matrix.location, 1, false,
+						   &mvp_mat[0][0]);
 	qfeglUniformMatrix3fv (iqm_shader.norm_matrix.location, 1, false,
 						   norm_mat);
 	qfeglUniformMatrix4fv (iqm_shader.bonemats.location, iqm->num_joints,
@@ -274,7 +279,7 @@ glsl_R_IQMBegin (void)
 	quat_t      fog;
 
 	// pre-multiply the view and projection matricies
-	Mat4Mult (glsl_projection, glsl_view, iqm_vp);
+	mmulf (iqm_vp, glsl_projection, glsl_view);
 
 	qfeglUseProgram (iqm_shader.program);
 
diff --git a/libs/video/renderer/glsl/glsl_main.c b/libs/video/renderer/glsl/glsl_main.c
index 32688b2ae..ba8c2dce7 100644
--- a/libs/video/renderer/glsl/glsl_main.c
+++ b/libs/video/renderer/glsl/glsl_main.c
@@ -60,15 +60,15 @@
 #include "r_internal.h"
 #include "vid_gl.h"
 
-mat4_t glsl_projection;
-mat4_t glsl_view;
+mat4f_t glsl_projection;
+mat4f_t glsl_view;
 
 void
 glsl_R_ViewChanged (float aspect)
 {
 	double      xmin, xmax, ymin, ymax;
 	float       fovx, fovy, neard, fard;
-	vec_t      *proj = glsl_projection;
+	vec4f_t    *proj = glsl_projection;
 
 	fovx = r_refdef.fov_x;
 	fovy = r_refdef.fov_y;
@@ -80,25 +80,30 @@ glsl_R_ViewChanged (float aspect)
 	xmax = neard * tan (fovx * M_PI / 360);		// fov_2 / 2
 	xmin = -xmax;
 
-	proj[0] = (2 * neard) / (xmax - xmin);
-	proj[4] = 0;
-	proj[8] = (xmax + xmin) / (xmax - xmin);
-	proj[12] = 0;
-
-	proj[1] = 0;
-	proj[5] = (2 * neard) / (ymax - ymin);
-	proj[9] = (ymax + ymin) / (ymax - ymin);
-	proj[13] = 0;
-
-	proj[2] = 0;
-	proj[6] = 0;
-	proj[10] = (fard + neard) / (neard - fard);
-	proj[14] = (2 * fard * neard) / (neard - fard);
-
-	proj[3] = 0;
-	proj[7] = 0;
-	proj[11] = -1;
-	proj[15] = 0;
+	proj[0] = (vec4f_t) {
+		(2 * neard) / (xmax - xmin),
+		0,
+		0,
+		0
+	};
+	proj[1] = (vec4f_t) {
+		0,
+		(2 * neard) / (ymax - ymin),
+		0,
+		0
+	};
+	proj[2] = (vec4f_t) {
+		(xmax + xmin) / (xmax - xmin),
+		(ymax + ymin) / (ymax - ymin),
+		(fard + neard) / (neard - fard),
+		-1
+	};
+	proj[3] = (vec4f_t) {
+		0,
+		0,
+		(2 * fard * neard) / (neard - fard),
+		0
+	};
 }
 
 void
@@ -110,22 +115,24 @@ glsl_R_SetupFrame (void)
 
 	VectorCopy (r_refdef.vieworg, r_origin);
 	AngleVectors (r_refdef.viewangles, vpn, vright, vup);
+
 	R_SetFrustum ();
 
-	r_viewleaf = Mod_PointInLeaf (r_origin, r_worldentity.model);
+	r_viewleaf = Mod_PointInLeaf (r_origin, r_worldentity.renderer.model);
 }
 
 static void
 R_SetupView (void)
 {
 	float       x, y, w, h;
-	mat4_t      mat;
-	static mat4_t z_up = {
-		 0, 0, -1, 0,
-		-1, 0,  0, 0,
-		 0, 1,  0, 0,
-		 0, 0,  0, 1,
+	static mat4f_t z_up = {
+		{ 0, 0, -1, 0},
+		{-1, 0,  0, 0},
+		{ 0, 1,  0, 0},
+		{ 0, 0,  0, 1},
 	};
+	vec4f_t     rotation;
+	vec4f_t     offset = { 0, 0, 0, 1 };
 
 	x = r_refdef.vrect.x;
 	y = (vid.height - (r_refdef.vrect.y + r_refdef.vrect.height));
@@ -133,17 +140,12 @@ R_SetupView (void)
 	h = r_refdef.vrect.height;
 	qfeglViewport (x, y, w, h);
 
-	Mat4Zero (mat);
-	VectorCopy (vpn, mat + 0);
-	VectorNegate (vright, mat + 4);			// we want vleft
-	VectorCopy (vup, mat + 8);
-	mat[15] = 1;
-	Mat4Transpose (mat, mat);//AngleVectors gives the transpose of what we want
-	Mat4Mult (z_up, mat, glsl_view);
-
-	Mat4Identity (mat);
-	VectorNegate (r_refdef.vieworg, mat + 12);
-	Mat4Mult (glsl_view, mat, glsl_view);
+	AngleQuat (r_refdef.viewangles, &rotation[0]);
+	rotation = qconjf (rotation);
+	mat4fquat (glsl_view, rotation);
+	mmulf (glsl_view, z_up, glsl_view);
+	VectorNegate (r_refdef.vieworg, offset);
+	glsl_view[3] = mvmulf (glsl_view, offset);
 
 	qfeglEnable (GL_CULL_FACE);
 	qfeglEnable (GL_DEPTH_TEST);
@@ -161,7 +163,7 @@ R_RenderEntities (void)
 	do { \
 		begun = 0; \
 		for (ent = r_ent_queue; ent; ent = ent->next) { \
-			if (ent->model->type != mod_##type_name) \
+			if (ent->renderer.model->type != mod_##type_name) \
 				continue; \
 			if (!begun) { \
 				glsl_R_##Type##Begin (); \
@@ -186,7 +188,7 @@ R_DrawViewModel (void)
 	if (vr_data.inhibit_viewmodel
 		|| !r_drawviewmodel->int_val
 		|| !r_drawentities->int_val
-		|| !currententity->model)
+		|| !currententity->renderer.model)
 		return;
 
 	// hack the depth range to prevent view model from poking into walls
@@ -273,7 +275,7 @@ glsl_R_NewMap (model_t *worldmodel, struct model_s **models, int num_models)
 		d_lightstylevalue[i] = 264;		// normal light value
 
 	memset (&r_worldentity, 0, sizeof (r_worldentity));
-	r_worldentity.model = worldmodel;
+	r_worldentity.renderer.model = worldmodel;
 
 	// Force a vis update
 	r_viewleaf = NULL;
diff --git a/libs/video/renderer/glsl/glsl_particles.c b/libs/video/renderer/glsl/glsl_particles.c
index 139423bb7..eb7eccb6d 100644
--- a/libs/video/renderer/glsl/glsl_particles.c
+++ b/libs/video/renderer/glsl/glsl_particles.c
@@ -313,7 +313,7 @@ glsl_R_ReadPointFile_f (void)
 	vec3_t      org;
 	QFile      *f;
 
-	mapname = strdup (r_worldentity.model->path);
+	mapname = strdup (r_worldentity.renderer.model->path);
 	if (!mapname)
 		Sys_Error ("Can't duplicate mapname!");
 	QFS_StripExtension (mapname, mapname);
@@ -1568,10 +1568,10 @@ draw_qf_particles (void)
 	particle_t *part;
 	vec3_t      up_scale, right_scale, up_right_scale, down_right_scale;
 	partvert_t *VA;
-	mat4_t      vp_mat;
+	mat4f_t     vp_mat;
 	quat_t      fog;
 
-	Mat4Mult (glsl_projection, glsl_view, vp_mat);
+	mmulf (vp_mat, glsl_projection, glsl_view);
 
 	qfeglDepthMask (GL_FALSE);
 	qfeglUseProgram (quake_part.program);
@@ -1583,7 +1583,8 @@ draw_qf_particles (void)
 	fog[3] = glsl_Fog_GetDensity () / 64.0;
 	qfeglUniform4fv (quake_part.fog.location, 1, fog);
 
-	qfeglUniformMatrix4fv (quake_part.mvp_matrix.location, 1, false, vp_mat);
+	qfeglUniformMatrix4fv (quake_part.mvp_matrix.location, 1, false,
+						   &vp_mat[0][0]);
 
 	qfeglUniform1i (quake_part.texture.location, 0);
 	qfeglActiveTexture (GL_TEXTURE0 + 0);
@@ -1712,10 +1713,10 @@ draw_id_particles (void)
 	float       minparticledist;
 	particle_t *part;
 	partvert_t *VA;
-	mat4_t      vp_mat;
+	mat4f_t     vp_mat;
 	quat_t      fog;
 
-	Mat4Mult (glsl_projection, glsl_view, vp_mat);
+	mmulf (vp_mat, glsl_projection, glsl_view);
 
 	// LordHavoc: particles should not affect zbuffer
 	qfeglDepthMask (GL_FALSE);
@@ -1723,7 +1724,8 @@ draw_id_particles (void)
 	qfeglEnableVertexAttribArray (quake_point.vertex.location);
 	qfeglEnableVertexAttribArray (quake_point.color.location);
 
-	qfeglUniformMatrix4fv (quake_point.mvp_matrix.location, 1, false, vp_mat);
+	qfeglUniformMatrix4fv (quake_point.mvp_matrix.location, 1, false,
+						   &vp_mat[0][0]);
 
 	glsl_Fog_GetColor (fog);
 	fog[3] = glsl_Fog_GetDensity () / 64.0;
diff --git a/libs/video/renderer/glsl/glsl_sprite.c b/libs/video/renderer/glsl/glsl_sprite.c
index c0acdc078..7582e9db3 100644
--- a/libs/video/renderer/glsl/glsl_sprite.c
+++ b/libs/video/renderer/glsl/glsl_sprite.c
@@ -42,6 +42,7 @@
 #endif
 
 #include "QF/cvar.h"
+#include "QF/entity.h"
 #include "QF/draw.h"
 #include "QF/dstring.h"
 #include "QF/quakefs.h"
@@ -131,7 +132,7 @@ static void
 R_GetSpriteFrames (entity_t *ent, msprite_t *sprite, mspriteframe_t **frame1,
 				   mspriteframe_t **frame2, float *blend)
 {
-	int         framenum = currententity->frame;
+	int         framenum = currententity->animation.frame;
 	int         pose;
 	int         i, numframes;
 	float      *intervals;
@@ -153,7 +154,7 @@ R_GetSpriteFrames (entity_t *ent, msprite_t *sprite, mspriteframe_t **frame1,
 		numframes = group->numframes;
 		fullinterval = intervals[numframes - 1];
 
-		time = vr_data.realtime + currententity->syncbase;
+		time = vr_data.realtime + currententity->animation.syncbase;
 		targettime = time - ((int) (time / fullinterval)) * fullinterval;
 
 		for (i = 0; i < numframes - 1; i++) {
@@ -170,17 +171,17 @@ R_GetSpriteFrames (entity_t *ent, msprite_t *sprite, mspriteframe_t **frame1,
 	//group frames.
 	*blend = R_EntityBlend (ent, pose, frame_interval);
 	if (group) {
-		*frame1 = group->frames[ent->pose1];
-		*frame2 = group->frames[ent->pose2];
+		*frame1 = group->frames[ent->animation.pose1];
+		*frame2 = group->frames[ent->animation.pose2];
 	} else {
-		*frame1 = sprite->frames[ent->pose1].frameptr;
-		*frame2 = sprite->frames[ent->pose2].frameptr;
+		*frame1 = sprite->frames[ent->animation.pose1].frameptr;
+		*frame2 = sprite->frames[ent->animation.pose2].frameptr;
 	}
 }
 
 static void
-make_quad (mspriteframe_t *frame, const vec3_t vpn, const vec3_t vright,
-		   const vec3_t vup, float verts[6][3])
+make_quad (mspriteframe_t *frame, vec4f_t vpn, vec4f_t vright,
+		   vec4f_t vup, float verts[6][3])
 {
 	vec3_t      left, up, right, down;
 	vec3_t      ul, ur, ll, lr;
@@ -209,11 +210,11 @@ void
 R_DrawSprite (void)
 {
 	entity_t   *ent = currententity;
-	msprite_t  *sprite = (msprite_t *) ent->model->cache.data;
+	msprite_t  *sprite = (msprite_t *) ent->renderer.model->cache.data;
 	mspriteframe_t *frame1, *frame2;
 	float       blend, sr, cr, dot, angle;
 	vec3_t      tvec;
-	vec3_t      svpn, svright, svup;
+	vec4f_t     svpn = {}, svright = {}, svup = {};
 	static quat_t color = { 1, 1, 1, 1};
 	float       vertsa[6][3], vertsb[6][3];
 	static float uvab[6][4] = {
@@ -242,7 +243,7 @@ R_DrawSprite (void)
 			VectorSet (0, 0, 1, svup);
 			// CrossProduct (svup, -r_origin, svright)
 			VectorSet (tvec[1], -tvec[0], 0, svright);
-			VectorNormalize (svright);
+			svright /= vsqrtf (dotf (svright, svright));
 			// CrossProduct (svright, svup, svpn);
 			VectorSet (-svright[1], svright[0], 0, svpn);
 			break;
@@ -267,16 +268,16 @@ R_DrawSprite (void)
 			VectorSet (0, 0, 1, svup);
 			// CrossProduct (svup, -r_origin, svright)
 			VectorSet (vpn[1], -vpn[0], 0, svright);
-			VectorNormalize (svright);
+			svright /= vsqrtf (dotf (svright, svright));
 			// CrossProduct (svright, svup, svpn);
 			VectorSet (-svright[1], svright[0], 0, svpn);
 			break;
 		case SPR_ORIENTED:
 			// generate the prite's axes according to the sprite's world
 			// orientation
-			VectorCopy (currententity->transform + 0, svpn);
-			VectorNegate (currententity->transform + 4, svright);
-			VectorCopy (currententity->transform + 8, svup);
+			svup = Transform_Up (currententity->transform);
+			svright = Transform_Right (currententity->transform);
+			svpn = Transform_Forward (currententity->transform);
 			break;
 		case SPR_VP_PARALLEL_ORIENTED:
 			// generate the sprite's axes parallel to the viewplane, but
@@ -324,7 +325,7 @@ R_DrawSprite (void)
 void
 R_SpriteBegin (void)
 {
-	mat4_t      mat;
+	mat4f_t     mat;
 	quat_t      fog;
 
 	qfeglUseProgram (quake_sprite.program);
@@ -352,8 +353,8 @@ R_SpriteBegin (void)
 	qfeglEnable (GL_TEXTURE_2D);
 	qfeglBindTexture (GL_TEXTURE_2D, glsl_palette);
 
-	Mat4Mult (glsl_projection, glsl_view, mat);
-	qfeglUniformMatrix4fv (quake_sprite.matrix.location, 1, false, mat);
+	mmulf (mat, glsl_projection, glsl_view);
+	qfeglUniformMatrix4fv (quake_sprite.matrix.location, 1, false, &mat[0][0]);
 }
 
 void
diff --git a/libs/video/renderer/r_alias.c b/libs/video/renderer/r_alias.c
index aa1541ca2..b956f0500 100644
--- a/libs/video/renderer/r_alias.c
+++ b/libs/video/renderer/r_alias.c
@@ -63,7 +63,7 @@ R_AliasGetSkindesc (int skinnum, aliashdr_t *ahdr)
 		numskins = paliasskingroup->numskins;
 		fullskininterval = pskinintervals[numskins - 1];
 
-		skintime = vr_data.realtime + currententity->syncbase;
+		skintime = vr_data.realtime + currententity->animation.syncbase;
 
 		// when loading in Mod_LoadAliasSkinGroup, we guaranteed all interval
 		// values are positive, so we don't have to worry about division by 0
@@ -118,7 +118,7 @@ alias_get_frame (int framenum, aliashdr_t *hdr, float *frame_interval)
 	numframes = group->numframes;
 	fullinterval = intervals[numframes - 1];
 
-	time = vr_data.realtime + currententity->syncbase;
+	time = vr_data.realtime + currententity->animation.syncbase;
 
 	// when loading in Mod_LoadAliasGroup, we guaranteed all interval values
 	// are positive, so we don't have to worry about division by 0
@@ -148,6 +148,6 @@ R_AliasGetLerpedFrames (entity_t *ent, aliashdr_t *hdr)
 	maliasframedesc_t *frame;
 	float       interval;
 
-	frame = alias_get_frame (ent->frame, hdr, &interval);
+	frame = alias_get_frame (ent->animation.frame, hdr, &interval);
 	return R_EntityBlend (ent, frame->firstpose, interval);
 }
diff --git a/libs/video/renderer/r_bsp.c b/libs/video/renderer/r_bsp.c
index 47b78a643..03af6696b 100644
--- a/libs/video/renderer/r_bsp.c
+++ b/libs/video/renderer/r_bsp.c
@@ -54,7 +54,7 @@ R_MarkLeaves (void)
 	mleaf_t     *leaf;
 	mnode_t     *node;
 	msurface_t **mark;
-	mod_brush_t *brush = &r_worldentity.model->brush;
+	mod_brush_t *brush = &r_worldentity.renderer.model->brush;
 
 	if (r_oldviewleaf == r_viewleaf && !r_novis->int_val)
 		return;
@@ -70,7 +70,7 @@ R_MarkLeaves (void)
 		vis = solid;
 		memset (solid, 0xff, (brush->numleafs + 7) >> 3);
 	} else
-		vis = Mod_LeafPVS (r_viewleaf, r_worldentity.model);
+		vis = Mod_LeafPVS (r_viewleaf, r_worldentity.renderer.model);
 
 	for (i = 0; (int) i < brush->numleafs; i++) {
 		if (vis[i >> 3] & (1 << (i & 7))) {
@@ -105,7 +105,7 @@ R_TextureAnimation (msurface_t *surf)
 	texture_t  *base = surf->texinfo->texture;
 	int         count, relative;
 
-	if (currententity->frame) {
+	if (currententity->animation.frame) {
 		if (base->alternate_anims)
 			base = base->alternate_anims;
 	}
diff --git a/libs/video/renderer/r_efrag.c b/libs/video/renderer/r_efrag.c
index cbfd0d2c8..86d494b6d 100644
--- a/libs/video/renderer/r_efrag.c
+++ b/libs/video/renderer/r_efrag.c
@@ -101,7 +101,7 @@ R_RemoveEfrags (entity_t *ent)
 {
 	efrag_t    *ef, *old, *walk, **prev;
 
-	ef = ent->efrag;
+	ef = ent->visibility.efrag;
 
 	while (ef) {
 		prev = &ef->leaf->efrags;
@@ -124,7 +124,7 @@ R_RemoveEfrags (entity_t *ent)
 		r_free_efrags = old;
 	}
 
-	ent->efrag = 0;
+	ent->visibility.efrag = 0;
 }
 
 static void
@@ -143,15 +143,15 @@ R_SplitEntityOnNode (mod_brush_t *brush, entity_t *ent,
 	node_stack = alloca ((brush->depth + 2) * sizeof (mnode_t *));
 	node_ptr = node_stack;
 
-	lastlink = &ent->efrag;
+	lastlink = &ent->visibility.efrag;
 
 	*node_ptr++ = 0;
 
 	while (node) {
 		// add an efrag if the node is a leaf
 		if (__builtin_expect (node->contents < 0, 0)) {
-			if (!ent->topnode) {
-				ent->topnode = node;
+			if (!ent->visibility.topnode) {
+				ent->visibility.topnode = node;
 			}
 
 			leaf = (mleaf_t *) node;
@@ -177,8 +177,8 @@ R_SplitEntityOnNode (mod_brush_t *brush, entity_t *ent,
 			if (sides == 3) {
 				// split on this plane
 				// if this is the first splitter of this bmodel, remember it
-				if (!ent->topnode) {
-					ent->topnode = node;
+				if (!ent->visibility.topnode) {
+					ent->visibility.topnode = node;
 				}
 			}
 			// recurse down the contacted sides
@@ -202,18 +202,18 @@ R_AddEfrags (mod_brush_t *brush, entity_t *ent)
 	model_t    *entmodel;
 	vec3_t      emins, emaxs;
 
-	if (!ent->model || !r_worldentity.model)
+	if (!ent->renderer.model || !r_worldentity.renderer.model)
 		return;
 
 	if (ent == &r_worldentity)
 		return;							// never add the world
 
-	entmodel = ent->model;
+	entmodel = ent->renderer.model;
 
 	VectorAdd (ent->origin, entmodel->mins, emins);
 	VectorAdd (ent->origin, entmodel->maxs, emaxs);
 
-	ent->topnode = 0;
+	ent->visibility.topnode = 0;
 	R_SplitEntityOnNode (brush, ent, emins, emaxs);
 }
 
@@ -225,17 +225,17 @@ R_StoreEfrags (const efrag_t *efrag)
 
 	while (efrag) {
 		ent = efrag->entity;
-		model = ent->model;
+		model = ent->renderer.model;
 
 		switch (model->type) {
 			case mod_alias:
 			case mod_brush:
 			case mod_sprite:
 			case mod_iqm:
-				if (ent->visframe != r_framecount) {
+				if (ent->visibility.visframe != r_framecount) {
 					R_EnqueueEntity (ent);
 					// mark that we've recorded this entity for this frame
-					ent->visframe = r_framecount;
+					ent->visibility.visframe = r_framecount;
 				}
 				efrag = efrag->leafnext;
 				break;
diff --git a/libs/video/renderer/r_ent.c b/libs/video/renderer/r_ent.c
index e72d10399..5a20bcb1f 100644
--- a/libs/video/renderer/r_ent.c
+++ b/libs/video/renderer/r_ent.c
@@ -38,6 +38,7 @@
 #include <math.h>
 #include <stdlib.h>
 
+#include "QF/entity.h"
 #include "QF/model.h"
 #include "QF/msg.h"
 #include "QF/render.h"
@@ -70,6 +71,7 @@ R_AllocEntity (void)
 	if ((ent = free_entities)) {
 		free_entities = ent->next;
 		ent->next = 0;
+		ent->transform = 0;
 		return ent;
 	}
 
@@ -78,9 +80,12 @@ R_AllocEntity (void)
 	*entpool_tail = pool;
 	entpool_tail = &pool->next;
 
-	for (ent = pool->entities, i = 0; i < ENT_POOL_SIZE - 1; i++, ent++)
+	for (ent = pool->entities, i = 0; i < ENT_POOL_SIZE - 1; i++, ent++) {
 		ent->next = ent + 1;
+		ent->transform = 0;
+	}
 	ent->next = 0;
+	ent->transform = 0;
 	free_entities = pool->entities;
 
 	return R_AllocEntity ();
@@ -94,9 +99,18 @@ R_FreeAllEntities (void)
 	int         i;
 
 	for (pool = entity_pools; pool; pool = pool->next) {
-		for (ent = pool->entities, i = 0; i < ENT_POOL_SIZE - 1; i++, ent++)
+		for (ent = pool->entities, i = 0; i < ENT_POOL_SIZE - 1; i++, ent++) {
 			ent->next = ent + 1;
+			if (ent->transform) {
+				Transform_Delete (ent->transform);
+				ent->transform = 0;
+			}
+		}
 		ent->next = pool->next ? pool->next->entities : 0;
+		if (ent->transform) {
+			Transform_Delete (ent->transform);
+			ent->transform = 0;
+		}
 	}
 	free_entities = entity_pools ? entity_pools->entities : 0;
 }
@@ -121,27 +135,27 @@ R_EntityBlend (entity_t *ent, int pose, float interval)
 {
 	float       blend;
 
-	if (ent->pose_model != ent->model) {
-		ent->pose_model = ent->model;
-		ent->pose1 = pose;
-		ent->pose2 = pose;
+	if (ent->animation.nolerp) {
+		ent->animation.nolerp = 0;
+		ent->animation.pose1 = pose;
+		ent->animation.pose2 = pose;
 		return 0.0;
 	}
-	ent->frame_interval = interval;
-	if (ent->pose2 != pose) {
-		ent->frame_start_time = vr_data.realtime;
-		if (ent->pose2 == -1) {
-			ent->pose1 = pose;
+	ent->animation.frame_interval = interval;
+	if (ent->animation.pose2 != pose) {
+		ent->animation.frame_start_time = vr_data.realtime;
+		if (ent->animation.pose2 == -1) {
+			ent->animation.pose1 = pose;
 		} else {
-			ent->pose1 = ent->pose2;
+			ent->animation.pose1 = ent->animation.pose2;
 		}
-		ent->pose2 = pose;
+		ent->animation.pose2 = pose;
 		blend = 0.0;
 	} else if (vr_data.paused) {
 		blend = 1.0;
 	} else {
-		blend = (vr_data.realtime - ent->frame_start_time)
-				/ ent->frame_interval;
+		blend = (vr_data.realtime - ent->animation.frame_start_time)
+				/ ent->animation.frame_interval;
 		blend = min (blend, 1.0);
 	}
 	return blend;
diff --git a/libs/video/renderer/r_iqm.c b/libs/video/renderer/r_iqm.c
index 224182a79..71dc47b3a 100644
--- a/libs/video/renderer/r_iqm.c
+++ b/libs/video/renderer/r_iqm.c
@@ -49,7 +49,7 @@
 float
 R_IQMGetLerpedFrames (entity_t *ent, iqm_t *iqm)
 {
-	int         frame = ent->frame;
+	int         frame = ent->animation.frame;
 	float       time, fullinterval;
 	iqmanim    *anim;
 
@@ -62,7 +62,7 @@ R_IQMGetLerpedFrames (entity_t *ent, iqm_t *iqm)
 	}
 	anim = &iqm->anims[frame];
 	fullinterval = anim->num_frames / anim->framerate;
-	time = vr_data.realtime + currententity->syncbase;
+	time = vr_data.realtime + currententity->animation.syncbase;
 	time -= ((int) (time / fullinterval)) * fullinterval;
 	frame = (int) (time * anim->framerate) + anim->first_frame;
 	return R_EntityBlend (ent, frame, 1.0 / anim->framerate);
diff --git a/libs/video/renderer/r_light.c b/libs/video/renderer/r_light.c
index 8d3294c37..96899621e 100644
--- a/libs/video/renderer/r_light.c
+++ b/libs/video/renderer/r_light.c
@@ -328,7 +328,7 @@ R_PushDlights (const vec3_t entorigin)
 		if (l->die < vr_data.realtime || !l->radius)
 			continue;
 		VectorSubtract (l->origin, entorigin, lightorigin);
-		R_MarkLights (lightorigin, l, i, r_worldentity.model);
+		R_MarkLights (lightorigin, l, i, r_worldentity.renderer.model);
 	}
 }
 
diff --git a/libs/video/renderer/sw/sw_ralias.c b/libs/video/renderer/sw/sw_ralias.c
index d28e41b04..1fcd1ce12 100644
--- a/libs/video/renderer/sw/sw_ralias.c
+++ b/libs/video/renderer/sw/sw_ralias.c
@@ -30,6 +30,7 @@
 
 #include <stdlib.h>
 
+#include "QF/entity.h"
 #include "QF/image.h"
 #include "QF/render.h"
 #include "QF/skin.h"
@@ -94,8 +95,8 @@ R_AliasCheckBBox (void)
 	int         minz;
 
 	// expand, rotate, and translate points into worldspace
-	currententity->trivial_accept = 0;
-	pmodel = currententity->model;
+	currententity->visibility.trivial_accept = 0;
+	pmodel = currententity->renderer.model;
 	if (!(pahdr = pmodel->aliashdr))
 		pahdr = Cache_Get (&pmodel->cache);
 	pmdl = (mdl_t *) ((byte *) pahdr + pahdr->model);
@@ -103,7 +104,7 @@ R_AliasCheckBBox (void)
 	R_AliasSetUpTransform (0);
 
 	// construct the base bounding box for this frame
-	frame = currententity->frame;
+	frame = currententity->animation.frame;
 // TODO: don't repeat this check when drawing?
 	if ((frame >= pmdl->numframes) || (frame < 0)) {
 		Sys_MaskPrintf (SYS_DEV, "No such frame %d %s\n", frame, pmodel->path);
@@ -218,11 +219,11 @@ R_AliasCheckBBox (void)
 		return false;					// trivial reject off one side
 	}
 
-	currententity->trivial_accept = !anyclip & !zclipped;
+	currententity->visibility.trivial_accept = !anyclip & !zclipped;
 
-	if (currententity->trivial_accept) {
+	if (currententity->visibility.trivial_accept) {
 		if (minz > (r_aliastransition + (pmdl->size * r_resfudge))) {
-			currententity->trivial_accept |= 2;
+			currententity->visibility.trivial_accept |= 2;
 		}
 	}
 
@@ -355,10 +356,12 @@ R_AliasSetUpTransform (int trivial_accept)
 	float       rotationmatrix[3][4], t2matrix[3][4];
 	static float tmatrix[3][4];
 	static float viewmatrix[3][4];
+	mat4f_t     mat;
 
-	VectorCopy (currententity->transform + 0, alias_forward);
-	VectorNegate (currententity->transform + 4, alias_right);
-	VectorCopy (currententity->transform + 8, alias_up);
+	Transform_GetWorldMatrix (currententity->transform, mat);
+	VectorCopy (mat[0], alias_forward);
+	VectorNegate (mat[1], alias_right);
+	VectorCopy (mat[2], alias_up);
 
 	tmatrix[0][0] = pmdl->scale[0];
 	tmatrix[1][1] = pmdl->scale[1];
@@ -542,7 +545,7 @@ R_AliasSetupSkin (void)
 {
 	int         skinnum;
 
-	skinnum = currententity->skinnum;
+	skinnum = currententity->renderer.skinnum;
 	if ((skinnum >= pmdl->numskins) || (skinnum < 0)) {
 		Sys_MaskPrintf (SYS_DEV, "R_AliasSetupSkin: no such skin # %d\n",
 						skinnum);
@@ -559,16 +562,16 @@ R_AliasSetupSkin (void)
 	r_affinetridesc.skinheight = pmdl->skinheight;
 
 	acolormap = vid.colormap8;
-	if (currententity->skin) {
+	if (currententity->renderer.skin) {
 		tex_t      *base;
 
-		base = currententity->skin->texels;
+		base = currententity->renderer.skin->texels;
 		if (base) {
 			r_affinetridesc.pskin = base->data;
 			r_affinetridesc.skinwidth = base->width;
 			r_affinetridesc.skinheight = base->height;
 		}
-		acolormap = currententity->skin->colormap;
+		acolormap = currententity->renderer.skin->colormap;
 	}
 }
 
@@ -611,7 +614,7 @@ R_AliasSetupFrame (void)
 {
 	maliasframedesc_t *frame;
 
-	frame = R_AliasGetFramedesc (currententity->frame, paliashdr);
+	frame = R_AliasGetFramedesc (currententity->animation.frame, paliashdr);
 	r_apverts = (trivertx_t *) ((byte *) paliashdr + frame->frame);
 }
 
@@ -624,8 +627,8 @@ R_AliasDrawModel (alight_t *plighting)
 
 	r_amodels_drawn++;
 
-	if (!(paliashdr = currententity->model->aliashdr))
-		paliashdr = Cache_Get (&currententity->model->cache);
+	if (!(paliashdr = currententity->renderer.model->aliashdr))
+		paliashdr = Cache_Get (&currententity->renderer.model->cache);
 	pmdl = (mdl_t *) ((byte *) paliashdr + paliashdr->model);
 
 	size = (CACHE_SIZE - 1)
@@ -641,12 +644,12 @@ R_AliasDrawModel (alight_t *plighting)
 	pauxverts = (auxvert_t *) &pfinalverts[pmdl->numverts + 1];
 
 	R_AliasSetupSkin ();
-	R_AliasSetUpTransform (currententity->trivial_accept);
+	R_AliasSetUpTransform (currententity->visibility.trivial_accept);
 	R_AliasSetupLighting (plighting);
 	R_AliasSetupFrame ();
 
-	r_affinetridesc.drawtype = (currententity->trivial_accept == 3) &&
-		r_recursiveaffinetriangles;
+	r_affinetridesc.drawtype = ((currententity->visibility.trivial_accept == 3)
+								&& r_recursiveaffinetriangles);
 
 	if (!acolormap)
 		acolormap = vid.colormap8;
@@ -664,11 +667,14 @@ R_AliasDrawModel (alight_t *plighting)
 	else
 		ziscale = (float) 0x8000 *(float) 0x10000 *3.0;
 
-	if (currententity->trivial_accept && pmdl->ident != HEADER_MDL16)
+	if (currententity->visibility.trivial_accept
+		&& pmdl->ident != HEADER_MDL16) {
 		R_AliasPrepareUnclippedPoints ();
-	else
+	} else {
 		R_AliasPreparePoints ();
+	}
 
-	if (!currententity->model->aliashdr)
-		Cache_Release (&currententity->model->cache);
+	if (!currententity->renderer.model->aliashdr) {
+		Cache_Release (&currententity->renderer.model->cache);
+	}
 }
diff --git a/libs/video/renderer/sw/sw_rbsp.c b/libs/video/renderer/sw/sw_rbsp.c
index 7cf001b87..e9b3fde8a 100644
--- a/libs/video/renderer/sw/sw_rbsp.c
+++ b/libs/video/renderer/sw/sw_rbsp.c
@@ -33,6 +33,7 @@
 
 #include "qfalloca.h"
 
+#include "QF/entity.h"
 #include "QF/render.h"
 #include "QF/sys.h"
 
@@ -77,9 +78,11 @@ R_EntityRotate (vec3_t vec)
 void
 R_RotateBmodel (void)
 {
-	VectorCopy (currententity->transform + 0, entity_rotation[0]);
-	VectorCopy (currententity->transform + 4, entity_rotation[1]);
-	VectorCopy (currententity->transform + 8, entity_rotation[2]);
+	mat4f_t     mat;
+	Transform_GetWorldMatrix (currententity->transform, mat);
+	VectorCopy (mat[0], entity_rotation[0]);
+	VectorCopy (mat[1], entity_rotation[1]);
+	VectorCopy (mat[2], entity_rotation[2]);
 
 	// rotate modelorg and the transformation matrix
 	R_EntityRotate (modelorg);
@@ -297,7 +300,8 @@ R_DrawSolidClippedSubmodelPolygons (model_t *model)
 
 				pbedge[j - 1].pnext = NULL;	// mark end of edges
 
-				R_RecursiveClipBPoly (pbedge, currententity->topnode, psurf);
+				R_RecursiveClipBPoly (pbedge,
+									  currententity->visibility.topnode, psurf);
 			} else {
 				Sys_Error ("no edges in bmodel");
 			}
@@ -330,7 +334,7 @@ R_DrawSubmodelPolygons (model_t *model, int clipflags)
 		// draw the polygon
 		if (((psurf->flags & SURF_PLANEBACK) && (dot < -BACKFACE_EPSILON)) ||
 			(!(psurf->flags & SURF_PLANEBACK) && (dot > BACKFACE_EPSILON))) {
-			r_currentkey = ((mleaf_t *) currententity->topnode)->key;
+			r_currentkey = ((mleaf_t *) currententity->visibility.topnode)->key;
 
 			// FIXME: use bounding-box-based frustum clipping info?
 			R_RenderFace (psurf, clipflags);
@@ -511,7 +515,7 @@ R_RenderWorld (void)
 
 	currententity = &r_worldentity;
 	VectorCopy (r_origin, modelorg);
-	brush = &currententity->model->brush;
+	brush = &currententity->renderer.model->brush;
 	r_pcurrentvertbase = brush->vertexes;
 
 	R_VisitWorldNodes (brush, 15);
diff --git a/libs/video/renderer/sw/sw_rdraw.c b/libs/video/renderer/sw/sw_rdraw.c
index 3f460643d..67c298187 100644
--- a/libs/video/renderer/sw/sw_rdraw.c
+++ b/libs/video/renderer/sw/sw_rdraw.c
@@ -353,7 +353,7 @@ R_RenderFace (msurface_t *fa, int clipflags)
 	vec3_t      p_normal;
 	medge_t    *pedges, tedge;
 	clipplane_t *pclip;
-	mod_brush_t *brush = &currententity->model->brush;
+	mod_brush_t *brush = &currententity->renderer.model->brush;
 
 	// skip out if no more surfs
 	if ((surface_p) >= surf_max) {
@@ -624,7 +624,7 @@ R_RenderPoly (msurface_t *fa, int clipflags)
 	polyvert_t  pverts[100];			// FIXME: do real number, safely
 	int         vertpage, newverts, newpage, lastvert;
 	qboolean    visible;
-	mod_brush_t *brush = &currententity->model->brush;
+	mod_brush_t *brush = &currententity->renderer.model->brush;
 
 	// FIXME: clean this up and make it faster
 	// FIXME: guard against running out of vertices
diff --git a/libs/video/renderer/sw/sw_riqm.c b/libs/video/renderer/sw/sw_riqm.c
index 285342b3f..8674e3ca6 100644
--- a/libs/video/renderer/sw/sw_riqm.c
+++ b/libs/video/renderer/sw/sw_riqm.c
@@ -40,6 +40,7 @@
 #include <stdlib.h>
 
 #include "QF/cvar.h"
+#include "QF/entity.h"
 #include "QF/image.h"
 #include "QF/render.h"
 #include "QF/skin.h"
@@ -231,9 +232,12 @@ R_IQMSetupLighting (entity_t *ent, alight_t *plighting)
 	r_shadelight *= VID_GRADES;
 
 	// rotate the lighting vector into the model's frame of reference
-	r_plightvec[0] = DotProduct (plighting->plightvec, ent->transform + 0);
-	r_plightvec[1] = DotProduct (plighting->plightvec, ent->transform + 4);
-	r_plightvec[2] = DotProduct (plighting->plightvec, ent->transform + 8);
+	mat4f_t     mat;
+	Transform_GetWorldMatrix (ent->transform, mat);
+	//FIXME vectorize
+	r_plightvec[0] = DotProduct (plighting->plightvec, mat[0]);
+	r_plightvec[1] = DotProduct (plighting->plightvec, mat[1]);
+	r_plightvec[2] = DotProduct (plighting->plightvec, mat[2]);
 }
 
 static void
@@ -244,9 +248,11 @@ R_IQMSetUpTransform (int trivial_accept)
 	static float viewmatrix[3][4];
 	vec3_t      forward, left, up;
 
-	VectorCopy (currententity->transform + 0, forward);
-	VectorCopy (currententity->transform + 4, left);
-	VectorCopy (currententity->transform + 8, up);
+	mat4f_t     mat;
+	Transform_GetWorldMatrix (currententity->transform, mat);
+	VectorCopy (mat[0], forward);
+	VectorCopy (mat[1], left);
+	VectorCopy (mat[2], up);
 
 // TODO: can do this with simple matrix rearrangement
 
@@ -293,7 +299,7 @@ void
 R_IQMDrawModel (alight_t *plighting)
 {
 	entity_t   *ent = currententity;
-	model_t    *model = ent->model;
+	model_t    *model = ent->renderer.model;
 	iqm_t      *iqm = (iqm_t *) model->aliashdr;
 	swiqm_t    *sw = (swiqm_t *) iqm->extra_data;
 	int         size;
@@ -304,18 +310,19 @@ R_IQMDrawModel (alight_t *plighting)
 		+ sizeof (finalvert_t) * (iqm->num_verts + 1)
 		+ sizeof (auxvert_t) * iqm->num_verts;
 	blend = R_IQMGetLerpedFrames (ent, iqm);
-	frame = R_IQMBlendPalette (iqm, ent->pose1, ent->pose2, blend, size,
-							   sw->blend_palette, sw->palette_size);
+	frame = R_IQMBlendPalette (iqm, ent->animation.pose1, ent->animation.pose2,
+							   blend, size, sw->blend_palette,
+							   sw->palette_size);
 
 	pfinalverts = (finalvert_t *) &frame[sw->palette_size];
 	pfinalverts = (finalvert_t *)
 		(((intptr_t) &pfinalverts[0] + CACHE_SIZE - 1) & ~(CACHE_SIZE - 1));
 	pauxverts = (auxvert_t *) &pfinalverts[iqm->num_verts + 1];
 
-	R_IQMSetUpTransform (ent->trivial_accept);
+	R_IQMSetUpTransform (ent->visibility.trivial_accept);
 
 	R_IQMSetupLighting (ent, plighting);
-	r_affinetridesc.drawtype = (ent->trivial_accept == 3) &&
+	r_affinetridesc.drawtype = (ent->visibility.trivial_accept == 3) &&
 			r_recursiveaffinetriangles;
 
 	//if (!acolormap)
@@ -326,7 +333,7 @@ R_IQMDrawModel (alight_t *plighting)
 	else
 		ziscale = (float) 0x8000 *(float) 0x10000 *3.0;
 
-	if (ent->trivial_accept)
+	if (ent->visibility.trivial_accept)
 		R_IQMPrepareUnclippedPoints (iqm, sw, frame);
 	else
 		R_IQMPreparePoints (iqm, sw, frame);
diff --git a/libs/video/renderer/sw/sw_rmain.c b/libs/video/renderer/sw/sw_rmain.c
index 573827bda..7cf5416c0 100644
--- a/libs/video/renderer/sw/sw_rmain.c
+++ b/libs/video/renderer/sw/sw_rmain.c
@@ -42,6 +42,7 @@
 
 #include "QF/cmd.h"
 #include "QF/cvar.h"
+#include "QF/entity.h"
 #include "QF/locs.h"
 #include "QF/mathlib.h"
 #include "QF/render.h"
@@ -167,7 +168,7 @@ R_NewMap (model_t *worldmodel, struct model_s **models, int num_models)
 	mod_brush_t *brush = &worldmodel->brush;
 
 	memset (&r_worldentity, 0, sizeof (r_worldentity));
-	r_worldentity.model = worldmodel;
+	r_worldentity.renderer.model = worldmodel;
 
 	R_FreeAllEntities ();
 
@@ -362,7 +363,7 @@ R_DrawEntitiesOnList (void)
 	for (ent = r_ent_queue; ent; ent = ent->next) {
 		currententity = ent;
 
-		switch (currententity->model->type) {
+		switch (currententity->renderer.model->type) {
 			case mod_sprite:
 				VectorCopy (currententity->origin, r_entorigin);
 				VectorSubtract (r_origin, r_entorigin, modelorg);
@@ -374,15 +375,16 @@ R_DrawEntitiesOnList (void)
 				VectorCopy (currententity->origin, r_entorigin);
 				VectorSubtract (r_origin, r_entorigin, modelorg);
 
-				minlight = max (currententity->model->min_light, currententity->min_light);
+				minlight = max (currententity->renderer.model->min_light,
+							    currententity->renderer.min_light);
 
 				// see if the bounding box lets us trivially reject, also
 				// sets trivial accept status
-				currententity->trivial_accept = 0;	//FIXME
-				if (currententity->model->type == mod_iqm//FIXME
+				currententity->visibility.trivial_accept = 0;	//FIXME
+				if (currententity->renderer.model->type == mod_iqm//FIXME
 					|| R_AliasCheckBBox ()) {
 					// 128 instead of 255 due to clamping below
-					j = max (R_LightPoint (&r_worldentity.model->brush,
+					j = max (R_LightPoint (&r_worldentity.renderer.model->brush,
 										   currententity->origin), minlight * 128);
 
 					lighting.ambientlight = j;
@@ -407,7 +409,7 @@ R_DrawEntitiesOnList (void)
 					if (lighting.ambientlight + lighting.shadelight > 192)
 						lighting.shadelight = 192 - lighting.ambientlight;
 
-					if (currententity->model->type == mod_iqm)
+					if (currententity->renderer.model->type == mod_iqm)
 						R_IQMDrawModel (&lighting);
 					else
 						R_AliasDrawModel (&lighting);
@@ -439,7 +441,7 @@ R_DrawViewModel (void)
 		return;
 
 	currententity = vr_data.view_model;
-	if (!currententity->model)
+	if (!currententity->renderer.model)
 		return;
 
 	VectorCopy (currententity->origin, r_entorigin);
@@ -448,9 +450,10 @@ R_DrawViewModel (void)
 	VectorCopy (vup, viewlightvec);
 	VectorNegate (viewlightvec, viewlightvec);
 
-	minlight = max (currententity->min_light, currententity->model->min_light);
+	minlight = max (currententity->renderer.min_light,
+					currententity->renderer.model->min_light);
 
-	j = max (R_LightPoint (&r_worldentity.model->brush,
+	j = max (R_LightPoint (&r_worldentity.renderer.model->brush,
 						   currententity->origin), minlight * 128);
 
 	r_viewlighting.ambientlight = j;
@@ -489,11 +492,12 @@ R_BmodelCheckBBox (model_t *clmodel, float *minmaxs)
 	int         i, *pindex, clipflags;
 	vec3_t      acceptpt, rejectpt;
 	double      d;
+	mat4f_t     mat;
 
 	clipflags = 0;
 
-	if (currententity->transform[0] != 1 || currententity->transform[5] != 1
-		|| currententity->transform[10] != 1) {
+	Transform_GetWorldMatrix (currententity->transform, mat);
+	if (mat[0][0] != 1 || mat[1][1] != 1 || mat[2][2] != 1) {
 		for (i = 0; i < 4; i++) {
 			d = DotProduct (currententity->origin, view_clipplanes[i].normal);
 			d -= view_clipplanes[i].dist;
@@ -556,9 +560,9 @@ R_DrawBEntitiesOnList (void)
 	for (ent = r_ent_queue; ent; ent = ent->next) {
 		currententity = ent;
 
-		switch (currententity->model->type) {
+		switch (currententity->renderer.model->type) {
 			case mod_brush:
-				clmodel = currententity->model;
+				clmodel = currententity->renderer.model;
 
 				// see if the bounding box lets us trivially reject, also
 				// sets trivial accept status
@@ -606,8 +610,9 @@ R_DrawBEntitiesOnList (void)
 					if (r_drawpolys | r_drawculledpolys) {
 						R_ZDrawSubmodelPolys (clmodel);
 					} else {
-						if (currententity->topnode) {
-							mnode_t    *topnode = currententity->topnode;
+						if (currententity->visibility.topnode) {
+							mnode_t    *topnode
+								= currententity->visibility.topnode;
 
 							if (topnode->contents >= 0) {
 								// not a leaf; has to be clipped to the world
@@ -756,7 +761,7 @@ R_RenderView_ (void)
 // done in screen.c
 	R_LowFPPrecision ();
 
-	if (!r_worldentity.model)
+	if (!r_worldentity.renderer.model)
 		Sys_Error ("R_RenderView: NULL worldmodel");
 
 	if (!r_dspeeds->int_val) {
diff --git a/libs/video/renderer/sw/sw_rmisc.c b/libs/video/renderer/sw/sw_rmisc.c
index b2272ff14..dee5c780e 100644
--- a/libs/video/renderer/sw/sw_rmisc.c
+++ b/libs/video/renderer/sw/sw_rmisc.c
@@ -244,7 +244,7 @@ R_SetupFrame (void)
 	R_SetFrustum ();
 
 	// current viewleaf
-	r_viewleaf = Mod_PointInLeaf (r_origin, r_worldentity.model);
+	r_viewleaf = Mod_PointInLeaf (r_origin, r_worldentity.renderer.model);
 
 	r_dowarpold = r_dowarp;
 	r_dowarp = r_waterwarp->int_val && (r_viewleaf->contents <=
diff --git a/libs/video/renderer/sw/sw_rpart.c b/libs/video/renderer/sw/sw_rpart.c
index a5be06453..d154ad739 100644
--- a/libs/video/renderer/sw/sw_rpart.c
+++ b/libs/video/renderer/sw/sw_rpart.c
@@ -83,7 +83,7 @@ R_ReadPointFile_f (void)
 	const char *name;
 	char       *mapname;
 
-	mapname = strdup (r_worldentity.model->path);
+	mapname = strdup (r_worldentity.renderer.model->path);
 	if (!mapname)
 		Sys_Error ("Can't duplicate mapname!");
 	QFS_StripExtension (mapname, mapname);
diff --git a/libs/video/renderer/sw/sw_rsprite.c b/libs/video/renderer/sw/sw_rsprite.c
index 4ee5d74c3..8eb4151e7 100644
--- a/libs/video/renderer/sw/sw_rsprite.c
+++ b/libs/video/renderer/sw/sw_rsprite.c
@@ -37,6 +37,7 @@
 
 #include <math.h>
 
+#include "QF/entity.h"
 #include "QF/render.h"
 #include "QF/sys.h"
 
@@ -246,7 +247,7 @@ R_GetSpriteframe (msprite_t *psprite)
 	int         i, numframes, frame;
 	float      *pintervals, fullinterval, targettime, time;
 
-	frame = currententity->frame;
+	frame = currententity->animation.frame;
 
 	if ((frame >= psprite->numframes) || (frame < 0)) {
 		Sys_Printf ("R_DrawSprite: no such frame %d\n", frame);
@@ -261,7 +262,7 @@ R_GetSpriteframe (msprite_t *psprite)
 		numframes = pspritegroup->numframes;
 		fullinterval = pintervals[numframes - 1];
 
-		time = vr_data.realtime + currententity->syncbase;
+		time = vr_data.realtime + currententity->animation.syncbase;
 
 		// when loading in Mod_LoadSpriteGroup, we guaranteed all interval
 		// values are positive, so we don't have to worry about division by 0
@@ -287,7 +288,7 @@ R_DrawSprite (void)
 	vec3_t      tvec;
 	float       dot, angle, sr, cr;
 
-	psprite = currententity->model->cache.data;
+	psprite = currententity->renderer.model->cache.data;
 
 	r_spritedesc.pspriteframe = R_GetSpriteframe (psprite);
 
@@ -361,9 +362,11 @@ R_DrawSprite (void)
 	} else if (psprite->type == SPR_ORIENTED) {
 		// generate the sprite's axes, according to the sprite's world
 		// orientation
-		VectorCopy (currententity->transform + 0, r_spritedesc.vpn);
-		VectorNegate (currententity->transform + 4, r_spritedesc.vright);
-		VectorCopy (currententity->transform + 8, r_spritedesc.vup);
+		mat4f_t     mat;
+		Transform_GetWorldMatrix (currententity->transform, mat);
+		VectorCopy (mat[0], r_spritedesc.vpn);
+		VectorNegate (mat[1], r_spritedesc.vright);
+		VectorCopy (mat[2], r_spritedesc.vup);
 	} else if (psprite->type == SPR_VP_PARALLEL_ORIENTED) {
 		// generate the sprite's axes, parallel to the viewplane, but rotated
 		// in that plane around the center according to the sprite entity's
diff --git a/libs/video/renderer/sw/sw_rsurf.c b/libs/video/renderer/sw/sw_rsurf.c
index 5133118cb..1dded8c00 100644
--- a/libs/video/renderer/sw/sw_rsurf.c
+++ b/libs/video/renderer/sw/sw_rsurf.c
@@ -154,7 +154,7 @@ R_BuildLightMap (void)
 	size = smax * tmax;
 	lightmap = surf->samples;
 
-	if (!r_worldentity.model->brush.lightdata) {
+	if (!r_worldentity.renderer.model->brush.lightdata) {
 		for (i = 0; i < size; i++)
 			blocklights[i] = 0;
 		return;
diff --git a/libs/video/renderer/sw32/sw32_ralias.c b/libs/video/renderer/sw32/sw32_ralias.c
index 4ead8055a..1dacb5bc7 100644
--- a/libs/video/renderer/sw32/sw32_ralias.c
+++ b/libs/video/renderer/sw32/sw32_ralias.c
@@ -31,6 +31,7 @@
 #define NH_DEFINE
 #include "namehack.h"
 
+#include "QF/entity.h"
 #include "QF/image.h"
 #include "QF/render.h"
 #include "QF/skin.h"
@@ -97,8 +98,8 @@ sw32_R_AliasCheckBBox (void)
 	int         minz;
 
 	// expand, rotate, and translate points into worldspace
-	currententity->trivial_accept = 0;
-	pmodel = currententity->model;
+	currententity->visibility.trivial_accept = 0;
+	pmodel = currententity->renderer.model;
 	if (!(pahdr = pmodel->aliashdr))
 		pahdr = Cache_Get (&pmodel->cache);
 	pmdl = (mdl_t *) ((byte *) pahdr + pahdr->model);
@@ -106,7 +107,7 @@ sw32_R_AliasCheckBBox (void)
 	sw32_R_AliasSetUpTransform (0);
 
 	// construct the base bounding box for this frame
-	frame = currententity->frame;
+	frame = currententity->animation.frame;
 // TODO: don't repeat this check when drawing?
 	if ((frame >= pmdl->numframes) || (frame < 0)) {
 		Sys_MaskPrintf (SYS_DEV, "No such frame %d %s\n", frame, pmodel->path);
@@ -221,11 +222,11 @@ sw32_R_AliasCheckBBox (void)
 		return false;					// trivial reject off one side
 	}
 
-	currententity->trivial_accept = !anyclip & !zclipped;
+	currententity->visibility.trivial_accept = !anyclip & !zclipped;
 
-	if (currententity->trivial_accept) {
+	if (currententity->visibility.trivial_accept) {
 		if (minz > (sw32_r_aliastransition + (pmdl->size * sw32_r_resfudge))) {
-			currententity->trivial_accept |= 2;
+			currententity->visibility.trivial_accept |= 2;
 		}
 	}
 
@@ -366,9 +367,11 @@ sw32_R_AliasSetUpTransform (int trivial_accept)
 	static float tmatrix[3][4];
 	static float viewmatrix[3][4];
 
-	VectorCopy (currententity->transform + 0, alias_forward);
-	VectorNegate (currententity->transform + 4, alias_right);
-	VectorCopy (currententity->transform + 8, alias_up);
+	mat4f_t     mat;
+	Transform_GetWorldMatrix (currententity->transform, mat);
+	VectorCopy (mat[0], alias_forward);
+	VectorNegate (mat[1], alias_right);
+	VectorCopy (mat[2], alias_up);
 
 	tmatrix[0][0] = pmdl->scale[0];
 	tmatrix[1][1] = pmdl->scale[1];
@@ -543,7 +546,7 @@ R_AliasSetupSkin (void)
 {
 	int         skinnum;
 
-	skinnum = currententity->skinnum;
+	skinnum = currententity->renderer.skinnum;
 	if ((skinnum >= pmdl->numskins) || (skinnum < 0)) {
 		Sys_MaskPrintf (SYS_DEV, "R_AliasSetupSkin: no such skin # %d\n",
 						skinnum);
@@ -559,16 +562,16 @@ R_AliasSetupSkin (void)
 	sw32_r_affinetridesc.skinheight = pmdl->skinheight;
 
 	sw32_acolormap = vid.colormap8;
-	if (currententity->skin) {
+	if (currententity->renderer.skin) {
 		tex_t      *base;
 
-		base = currententity->skin->texels;
+		base = currententity->renderer.skin->texels;
 		if (base) {
 			sw32_r_affinetridesc.pskin = base->data;
 			sw32_r_affinetridesc.skinwidth = base->width;
 			sw32_r_affinetridesc.skinheight = base->height;
 		}
-		sw32_acolormap = currententity->skin->colormap;
+		sw32_acolormap = currententity->renderer.skin->colormap;
 	}
 }
 
@@ -611,7 +614,7 @@ R_AliasSetupFrame (void)
 {
 	maliasframedesc_t *frame;
 
-	frame = R_AliasGetFramedesc (currententity->frame, paliashdr);
+	frame = R_AliasGetFramedesc (currententity->animation.frame, paliashdr);
 	sw32_r_apverts = (trivertx_t *) ((byte *) paliashdr + frame->frame);
 }
 
@@ -624,8 +627,8 @@ sw32_R_AliasDrawModel (alight_t *plighting)
 
 	sw32_r_amodels_drawn++;
 
-	if (!(paliashdr = currententity->model->aliashdr))
-		paliashdr = Cache_Get (&currententity->model->cache);
+	if (!(paliashdr = currententity->renderer.model->aliashdr))
+		paliashdr = Cache_Get (&currententity->renderer.model->cache);
 	pmdl = (mdl_t *) ((byte *) paliashdr + paliashdr->model);
 
 	size = (CACHE_SIZE - 1)
@@ -641,7 +644,7 @@ sw32_R_AliasDrawModel (alight_t *plighting)
 	sw32_pauxverts = (auxvert_t *) &pfinalverts[pmdl->numverts + 1];
 
 	R_AliasSetupSkin ();
-	sw32_R_AliasSetUpTransform (currententity->trivial_accept);
+	sw32_R_AliasSetUpTransform (currententity->visibility.trivial_accept);
 	R_AliasSetupLighting (plighting);
 	R_AliasSetupFrame ();
 
@@ -663,11 +666,13 @@ sw32_R_AliasDrawModel (alight_t *plighting)
 	else
 		sw32_ziscale = (float) 0x8000 *(float) 0x10000 *3.0;
 
-	if (currententity->trivial_accept)
+	if (currententity->visibility.trivial_accept) {
 		R_AliasPrepareUnclippedPoints ();
-	else
+	} else {
 		R_AliasPreparePoints ();
+	}
 
-	if (!currententity->model->aliashdr)
-		Cache_Release (&currententity->model->cache);
+	if (!currententity->renderer.model->aliashdr) {
+		Cache_Release (&currententity->renderer.model->cache);
+	}
 }
diff --git a/libs/video/renderer/sw32/sw32_rbsp.c b/libs/video/renderer/sw32/sw32_rbsp.c
index 521e70cd5..1f62b381e 100644
--- a/libs/video/renderer/sw32/sw32_rbsp.c
+++ b/libs/video/renderer/sw32/sw32_rbsp.c
@@ -36,6 +36,7 @@
 
 #include "qfalloca.h"
 
+#include "QF/entity.h"
 #include "QF/render.h"
 #include "QF/sys.h"
 
@@ -80,9 +81,11 @@ R_EntityRotate (vec3_t vec)
 void
 sw32_R_RotateBmodel (void)
 {
-	VectorCopy (currententity->transform + 0, entity_rotation[0]);
-	VectorCopy (currententity->transform + 4, entity_rotation[1]);
-	VectorCopy (currententity->transform + 8, entity_rotation[2]);
+	mat4f_t     mat;
+	Transform_GetWorldMatrix (currententity->transform, mat);
+	VectorCopy (mat[0], entity_rotation[0]);
+	VectorCopy (mat[1], entity_rotation[1]);
+	VectorCopy (mat[2], entity_rotation[2]);
 
 	// rotate modelorg and the transformation matrix
 	R_EntityRotate (modelorg);
@@ -300,7 +303,9 @@ sw32_R_DrawSolidClippedSubmodelPolygons (model_t *model)
 
 				pbedge[j - 1].pnext = NULL;	// mark end of edges
 
-				R_RecursiveClipBPoly (pbedge, currententity->topnode, psurf);
+				R_RecursiveClipBPoly (pbedge,
+									  currententity->visibility.topnode,
+									  psurf);
 			} else {
 				Sys_Error ("no edges in bmodel");
 			}
@@ -333,7 +338,8 @@ sw32_R_DrawSubmodelPolygons (model_t *model, int clipflags)
 		// draw the polygon
 		if (((psurf->flags & SURF_PLANEBACK) && (dot < -BACKFACE_EPSILON)) ||
 			(!(psurf->flags & SURF_PLANEBACK) && (dot > BACKFACE_EPSILON))) {
-			sw32_r_currentkey = ((mleaf_t *) currententity->topnode)->key;
+			sw32_r_currentkey
+				= ((mleaf_t *) currententity->visibility.topnode)->key;
 
 			// FIXME: use bounding-box-based frustum clipping info?
 			sw32_R_RenderFace (psurf, clipflags);
@@ -514,7 +520,7 @@ sw32_R_RenderWorld (void)
 
 	currententity = &r_worldentity;
 	VectorCopy (r_origin, modelorg);
-	brush = &currententity->model->brush;
+	brush = &currententity->renderer.model->brush;
 	r_pcurrentvertbase = brush->vertexes;
 
 	R_VisitWorldNodes (brush, 15);
diff --git a/libs/video/renderer/sw32/sw32_rdraw.c b/libs/video/renderer/sw32/sw32_rdraw.c
index b106ab63a..7c1e696be 100644
--- a/libs/video/renderer/sw32/sw32_rdraw.c
+++ b/libs/video/renderer/sw32/sw32_rdraw.c
@@ -349,7 +349,7 @@ sw32_R_RenderFace (msurface_t *fa, int clipflags)
 	vec3_t      p_normal;
 	medge_t    *pedges, tedge;
 	clipplane_t *pclip;
-	mod_brush_t *brush = &currententity->model->brush;
+	mod_brush_t *brush = &currententity->renderer.model->brush;
 
 	// skip out if no more surfs
 	if ((sw32_surface_p) >= sw32_surf_max) {
@@ -622,7 +622,7 @@ sw32_R_RenderPoly (msurface_t *fa, int clipflags)
 	polyvert_t  pverts[100];			// FIXME: do real number, safely
 	int         vertpage, newverts, newpage, lastvert;
 	qboolean    visible;
-	mod_brush_t *brush = &currententity->model->brush;
+	mod_brush_t *brush = &currententity->renderer.model->brush;
 
 	// FIXME: clean this up and make it faster
 	// FIXME: guard against running out of vertices
diff --git a/libs/video/renderer/sw32/sw32_riqm.c b/libs/video/renderer/sw32/sw32_riqm.c
index b53186bd9..1db5fbbdc 100644
--- a/libs/video/renderer/sw32/sw32_riqm.c
+++ b/libs/video/renderer/sw32/sw32_riqm.c
@@ -43,6 +43,7 @@
 #include "namehack.h"
 
 #include "QF/cvar.h"
+#include "QF/entity.h"
 #include "QF/image.h"
 #include "QF/render.h"
 #include "QF/skin.h"
@@ -222,9 +223,12 @@ R_IQMSetupLighting (entity_t *ent, alight_t *plighting)
 	r_shadelight *= VID_GRADES;
 
 	// rotate the lighting vector into the model's frame of reference
-	r_plightvec[0] = DotProduct (plighting->plightvec, ent->transform + 0);
-	r_plightvec[1] = DotProduct (plighting->plightvec, ent->transform + 4);
-	r_plightvec[2] = DotProduct (plighting->plightvec, ent->transform + 8);
+	mat4f_t     mat;
+	Transform_GetWorldMatrix (ent->transform, mat);
+	//FIXME vectorize
+	r_plightvec[0] = DotProduct (plighting->plightvec, mat[0]);
+	r_plightvec[1] = DotProduct (plighting->plightvec, mat[1]);
+	r_plightvec[2] = DotProduct (plighting->plightvec, mat[2]);
 }
 
 static void
@@ -235,9 +239,11 @@ R_IQMSetUpTransform (int trivial_accept)
 	static float viewmatrix[3][4];
 	vec3_t      forward, left, up;
 
-	VectorCopy (currententity->transform + 0, forward);
-	VectorCopy (currententity->transform + 4, left);
-	VectorCopy (currententity->transform + 8, up);
+	mat4f_t     mat;
+	Transform_GetWorldMatrix (currententity->transform, mat);
+	VectorCopy (mat[0], forward);
+	VectorCopy (mat[1], left);
+	VectorCopy (mat[2], up);
 
 // TODO: can do this with simple matrix rearrangement
 
@@ -284,7 +290,7 @@ void
 sw32_R_IQMDrawModel (alight_t *plighting)
 {
 	entity_t   *ent = currententity;
-	model_t    *model = ent->model;
+	model_t    *model = ent->renderer.model;
 	iqm_t      *iqm = (iqm_t *) model->aliashdr;
 	swiqm_t    *sw = (swiqm_t *) iqm->extra_data;
 	int         size;
@@ -295,7 +301,8 @@ sw32_R_IQMDrawModel (alight_t *plighting)
 		+ sizeof (finalvert_t) * (iqm->num_verts + 1)
 		+ sizeof (auxvert_t) * iqm->num_verts;
 	blend = R_IQMGetLerpedFrames (ent, iqm);
-	frame = R_IQMBlendPalette (iqm, ent->pose1, ent->pose2, blend, size,
+	frame = R_IQMBlendPalette (iqm, ent->animation.pose1, ent->animation.pose2,
+							   blend, size,
 							   sw->blend_palette, sw->palette_size);
 
 	pfinalverts = (finalvert_t *) &frame[sw->palette_size];
@@ -303,7 +310,7 @@ sw32_R_IQMDrawModel (alight_t *plighting)
 		(((intptr_t) &pfinalverts[0] + CACHE_SIZE - 1) & ~(CACHE_SIZE - 1));
 	pauxverts = (auxvert_t *) &pfinalverts[iqm->num_verts + 1];
 
-	R_IQMSetUpTransform (ent->trivial_accept);
+	R_IQMSetUpTransform (ent->visibility.trivial_accept);
 
 	R_IQMSetupLighting (ent, plighting);
 
@@ -315,7 +322,7 @@ sw32_R_IQMDrawModel (alight_t *plighting)
 	else
 		sw32_ziscale = (float) 0x8000 *(float) 0x10000 *3.0;
 
-	if (ent->trivial_accept)
+	if (ent->visibility.trivial_accept)
 		R_IQMPrepareUnclippedPoints (iqm, sw, frame);
 	else
 		R_IQMPreparePoints (iqm, sw, frame);
diff --git a/libs/video/renderer/sw32/sw32_rmain.c b/libs/video/renderer/sw32/sw32_rmain.c
index 67c59e2f9..812a43205 100644
--- a/libs/video/renderer/sw32/sw32_rmain.c
+++ b/libs/video/renderer/sw32/sw32_rmain.c
@@ -42,6 +42,7 @@
 
 #include "QF/cmd.h"
 #include "QF/cvar.h"
+#include "QF/entity.h"
 #include "QF/locs.h"
 #include "QF/mathlib.h"
 #include "QF/render.h"
@@ -183,7 +184,7 @@ sw32_R_NewMap (model_t *worldmodel, struct model_s **models, int num_models)
 	mod_brush_t *brush = &worldmodel->brush;
 
 	memset (&r_worldentity, 0, sizeof (r_worldentity));
-	r_worldentity.model = worldmodel;
+	r_worldentity.renderer.model = worldmodel;
 
 	R_FreeAllEntities ();
 
@@ -369,7 +370,7 @@ R_DrawEntitiesOnList (void)
 	for (ent = r_ent_queue; ent; ent = ent->next) {
 		currententity = ent;
 
-		switch (currententity->model->type) {
+		switch (currententity->renderer.model->type) {
 			case mod_sprite:
 				VectorCopy (currententity->origin, r_entorigin);
 				VectorSubtract (r_origin, r_entorigin, modelorg);
@@ -381,15 +382,16 @@ R_DrawEntitiesOnList (void)
 				VectorCopy (currententity->origin, r_entorigin);
 				VectorSubtract (r_origin, r_entorigin, modelorg);
 
-				minlight = max (currententity->min_light, currententity->model->min_light);
+				minlight = max (currententity->renderer.min_light,
+								currententity->renderer.model->min_light);
 
 				// see if the bounding box lets us trivially reject, also
 				// sets trivial accept status
-				currententity->trivial_accept = 0;	//FIXME
-				if (currententity->model->type == mod_iqm//FIXME
+				currententity->visibility.trivial_accept = 0;	//FIXME
+				if (currententity->renderer.model->type == mod_iqm//FIXME
 					|| sw32_R_AliasCheckBBox ()) {
 					// 128 instead of 255 due to clamping below
-					j = max (R_LightPoint (&r_worldentity.model->brush,
+					j = max (R_LightPoint (&r_worldentity.renderer.model->brush,
 										   currententity->origin),
 							 minlight * 128);
 
@@ -415,7 +417,7 @@ R_DrawEntitiesOnList (void)
 					if (lighting.ambientlight + lighting.shadelight > 192)
 						lighting.shadelight = 192 - lighting.ambientlight;
 
-					if (currententity->model->type == mod_iqm)
+					if (currententity->renderer.model->type == mod_iqm)
 						sw32_R_IQMDrawModel (&lighting);
 					else
 						sw32_R_AliasDrawModel (&lighting);
@@ -446,7 +448,7 @@ R_DrawViewModel (void)
 		return;
 
 	currententity = vr_data.view_model;
-	if (!currententity->model)
+	if (!currententity->renderer.model)
 		return;
 
 	VectorCopy (currententity->origin, r_entorigin);
@@ -455,9 +457,10 @@ R_DrawViewModel (void)
 	VectorCopy (vup, viewlightvec);
 	VectorNegate (viewlightvec, viewlightvec);
 
-	minlight = max (currententity->min_light, currententity->model->min_light);
+	minlight = max (currententity->renderer.min_light,
+					currententity->renderer.model->min_light);
 
-	j = max (R_LightPoint (&r_worldentity.model->brush,
+	j = max (R_LightPoint (&r_worldentity.renderer.model->brush,
 						   currententity->origin), minlight * 128);
 
 	r_viewlighting.ambientlight = j;
@@ -496,11 +499,12 @@ R_BmodelCheckBBox (model_t *clmodel, float *minmaxs)
 	int         i, *pindex, clipflags;
 	vec3_t      acceptpt, rejectpt;
 	double      d;
+	mat4f_t     mat;
 
 	clipflags = 0;
 
-	if (currententity->transform[0] != 1 || currententity->transform[5] != 1
-		|| currententity->transform[10] != 1) {
+	Transform_GetWorldMatrix (currententity->transform, mat);
+	if (mat[0][0] != 1 || mat[1][1] != 1 || mat[2][2] != 1) {
 		for (i = 0; i < 4; i++) {
 			d = DotProduct (currententity->origin, sw32_view_clipplanes[i].normal);
 			d -= sw32_view_clipplanes[i].dist;
@@ -563,9 +567,9 @@ R_DrawBEntitiesOnList (void)
 	for (ent = r_ent_queue; ent; ent = ent->next) {
 		currententity = ent;
 
-		switch (currententity->model->type) {
+		switch (currententity->renderer.model->type) {
 			case mod_brush:
-				clmodel = currententity->model;
+				clmodel = currententity->renderer.model;
 
 				// see if the bounding box lets us trivially reject, also
 				// sets trivial accept status
@@ -613,8 +617,9 @@ R_DrawBEntitiesOnList (void)
 					if (sw32_r_drawpolys | sw32_r_drawculledpolys) {
 						sw32_R_ZDrawSubmodelPolys (clmodel);
 					} else {
-						if (currententity->topnode) {
-							mnode_t    *topnode = currententity->topnode;
+						if (currententity->visibility.topnode) {
+							mnode_t    *topnode
+								= currententity->visibility.topnode;
 
 							if (topnode->contents >= 0) {
 								// not a leaf; has to be clipped to the world
@@ -759,7 +764,7 @@ R_RenderView_ (void)
 #endif
 	R_PushDlights (vec3_origin);
 
-	if (!r_worldentity.model)
+	if (!r_worldentity.renderer.model)
 		Sys_Error ("R_RenderView: NULL worldmodel");
 
 	if (!r_dspeeds->int_val) {
diff --git a/libs/video/renderer/sw32/sw32_rmisc.c b/libs/video/renderer/sw32/sw32_rmisc.c
index 1b329b54f..753268993 100644
--- a/libs/video/renderer/sw32/sw32_rmisc.c
+++ b/libs/video/renderer/sw32/sw32_rmisc.c
@@ -240,7 +240,7 @@ sw32_R_SetupFrame (void)
 	R_SetFrustum ();
 
 	// current viewleaf
-	r_viewleaf = Mod_PointInLeaf (r_origin, r_worldentity.model);
+	r_viewleaf = Mod_PointInLeaf (r_origin, r_worldentity.renderer.model);
 
 	sw32_r_dowarpold = sw32_r_dowarp;
 	sw32_r_dowarp = r_waterwarp->int_val && (r_viewleaf->contents <=
diff --git a/libs/video/renderer/sw32/sw32_rpart.c b/libs/video/renderer/sw32/sw32_rpart.c
index 1364f5d1b..fc640bc8e 100644
--- a/libs/video/renderer/sw32/sw32_rpart.c
+++ b/libs/video/renderer/sw32/sw32_rpart.c
@@ -88,7 +88,7 @@ sw32_R_ReadPointFile_f (void)
 	const char *name;
 	char       *mapname;
 
-	mapname = strdup (r_worldentity.model->path);
+	mapname = strdup (r_worldentity.renderer.model->path);
 	if (!mapname)
 		Sys_Error ("Can't duplicate mapname!");
 	QFS_StripExtension (mapname, mapname);
diff --git a/libs/video/renderer/sw32/sw32_rsprite.c b/libs/video/renderer/sw32/sw32_rsprite.c
index 92be9b51e..9c6cb7221 100644
--- a/libs/video/renderer/sw32/sw32_rsprite.c
+++ b/libs/video/renderer/sw32/sw32_rsprite.c
@@ -40,6 +40,7 @@
 
 #include <math.h>
 
+#include "QF/entity.h"
 #include "QF/render.h"
 #include "QF/sys.h"
 
@@ -242,7 +243,7 @@ R_GetSpriteframe (msprite_t *psprite)
 	int         i, numframes, frame;
 	float      *pintervals, fullinterval, targettime, time;
 
-	frame = currententity->frame;
+	frame = currententity->animation.frame;
 
 	if ((frame >= psprite->numframes) || (frame < 0)) {
 		Sys_Printf ("R_DrawSprite: no such frame %d\n", frame);
@@ -257,7 +258,7 @@ R_GetSpriteframe (msprite_t *psprite)
 		numframes = pspritegroup->numframes;
 		fullinterval = pintervals[numframes - 1];
 
-		time = vr_data.realtime + currententity->syncbase;
+		time = vr_data.realtime + currententity->animation.syncbase;
 
 		// when loading in Mod_LoadSpriteGroup, we guaranteed all interval
 		// values are positive, so we don't have to worry about division by 0
@@ -283,7 +284,7 @@ sw32_R_DrawSprite (void)
 	vec3_t      tvec;
 	float       dot, angle, sr, cr;
 
-	psprite = currententity->model->cache.data;
+	psprite = currententity->renderer.model->cache.data;
 
 	sw32_r_spritedesc.pspriteframe = R_GetSpriteframe (psprite);
 
@@ -357,9 +358,11 @@ sw32_R_DrawSprite (void)
 	} else if (psprite->type == SPR_ORIENTED) {
 		// generate the sprite's axes, according to the sprite's world
 		// orientation
-		VectorCopy (currententity->transform + 0, sw32_r_spritedesc.vpn);
-		VectorNegate (currententity->transform + 4, sw32_r_spritedesc.vright);
-		VectorCopy (currententity->transform + 8, sw32_r_spritedesc.vup);
+		mat4f_t     mat;
+		Transform_GetWorldMatrix (currententity->transform, mat);
+		VectorCopy (mat[0], r_spritedesc.vpn);
+		VectorNegate (mat[1], r_spritedesc.vright);
+		VectorCopy (mat[2], r_spritedesc.vup);
 	} else if (psprite->type == SPR_VP_PARALLEL_ORIENTED) {
 		// generate the sprite's axes, parallel to the viewplane, but rotated
 		// in that plane around the center according to the sprite entity's
diff --git a/libs/video/renderer/sw32/sw32_rsurf.c b/libs/video/renderer/sw32/sw32_rsurf.c
index decd8c3a7..dfc9c31cc 100644
--- a/libs/video/renderer/sw32/sw32_rsurf.c
+++ b/libs/video/renderer/sw32/sw32_rsurf.c
@@ -172,7 +172,7 @@ R_BuildLightMap (void)
 	size = smax * tmax;
 	lightmap = surf->samples;
 
-	if (!r_worldentity.model->brush.lightdata) {
+	if (!r_worldentity.renderer.model->brush.lightdata) {
 		for (i = 0; i < size; i++)
 			blocklights[i] = 0;
 		return;
diff --git a/libs/video/renderer/vulkan/vulkan_alias.c b/libs/video/renderer/vulkan/vulkan_alias.c
index cc1905c4a..25a2d9d13 100644
--- a/libs/video/renderer/vulkan/vulkan_alias.c
+++ b/libs/video/renderer/vulkan/vulkan_alias.c
@@ -45,7 +45,7 @@
 
 #include "QF/cvar.h"
 #include "QF/darray.h"
-#include "QF/dstring.h"
+#include "QF/entity.h"
 #include "QF/image.h"
 #include "QF/render.h"
 #include "QF/skin.h"
@@ -121,36 +121,41 @@ Vulkan_DrawAlias (entity_t *ent, vulkan_ctx_t *ctx)
 {
 	aliasctx_t *actx = ctx->alias_context;
 	aliasframe_t *aframe = &actx->frames.a[ctx->curFrame];
-	model_t    *model = ent->model;
+	model_t    *model = ent->renderer.model;
 	aliashdr_t *hdr;
 	qfv_alias_skin_t *skin;
-	float       vertex_constants[17];
+	struct {
+		mat4f_t     mat;
+		float       blend;
+	}           vertex_constants;
 	byte        fragment_constants[3][4];
 
 	if (!(hdr = model->aliashdr)) {
 		hdr = Cache_Get (&model->cache);
 	}
 
-	memcpy (vertex_constants, ent->transform, sizeof (ent->transform));
-	vertex_constants[16] = R_AliasGetLerpedFrames (ent, hdr);
+	Transform_GetWorldMatrix (ent->transform, vertex_constants.mat);
+	vertex_constants.blend = R_AliasGetLerpedFrames (ent, hdr);
 
 	if (0/*XXX ent->skin && ent->skin->tex*/) {
 		//skin = ent->skin->tex;
 	} else {
 		maliasskindesc_t *skindesc;
-		skindesc = R_AliasGetSkindesc (ent->skinnum, hdr);
+		skindesc = R_AliasGetSkindesc (ent->renderer.skinnum, hdr);
 		skin = (qfv_alias_skin_t *) ((byte *) hdr + skindesc->skin);
 	}
-	QuatScale (ent->colormod, 255, fragment_constants[0]);
+	QuatScale (ent->renderer.colormod, 255, fragment_constants[0]);
 	QuatCopy (skin->colora, fragment_constants[1]);
 	QuatCopy (skin->colorb, fragment_constants[2]);
 
-	emit_commands (aframe->cmdSet.a[QFV_aliasDepth], ent->pose1, ent->pose2,
-				   0, vertex_constants, sizeof (vertex_constants),
+	emit_commands (aframe->cmdSet.a[QFV_aliasDepth],
+				   ent->animation.pose1, ent->animation.pose2,
+				   0, &vertex_constants, 17 * sizeof (float),
 				   fragment_constants, sizeof (fragment_constants),
 				   hdr, ctx);
-	emit_commands (aframe->cmdSet.a[QFV_aliasGBuffer], ent->pose1, ent->pose2,
-				   skin, vertex_constants, sizeof (vertex_constants),
+	emit_commands (aframe->cmdSet.a[QFV_aliasGBuffer],
+				   ent->animation.pose1, ent->animation.pose2,
+				   skin, &vertex_constants, 17 * sizeof (float),
 				   fragment_constants, sizeof (fragment_constants),
 				   hdr, ctx);
 }
diff --git a/libs/video/renderer/vulkan/vulkan_bsp.c b/libs/video/renderer/vulkan/vulkan_bsp.c
index 046ba6c0a..38aa57ee9 100644
--- a/libs/video/renderer/vulkan/vulkan_bsp.c
+++ b/libs/video/renderer/vulkan/vulkan_bsp.c
@@ -45,7 +45,7 @@
 
 #include "QF/cvar.h"
 #include "QF/darray.h"
-#include "QF/dstring.h"
+#include "QF/entity.h"
 #include "QF/image.h"
 #include "QF/render.h"
 #include "QF/sys.h"
@@ -275,7 +275,7 @@ Vulkan_RegisterTextures (model_t **models, int num_models, vulkan_ctx_t *ctx)
 {
 	int         i;
 	model_t    *m;
-	mod_brush_t *brush = &r_worldentity.model->brush;
+	mod_brush_t *brush = &r_worldentity.renderer.model->brush;
 
 	clear_textures (ctx);
 	init_surface_chains (brush, ctx);
@@ -289,7 +289,7 @@ Vulkan_RegisterTextures (model_t **models, int num_models, vulkan_ctx_t *ctx)
 		if (*m->path == '*')
 			continue;
 		// world has already been done, not interested in non-brush models
-		if (m == r_worldentity.model || m->type != mod_brush)
+		if (m == r_worldentity.renderer.model || m->type != mod_brush)
 			continue;
 		brush = &m->brush;
 		brush->numsubmodels = 1; // no support for submodels in non-world model
@@ -343,7 +343,7 @@ build_surf_displist (model_t **models, msurface_t *fa, int base,
 		brush = &models[~fa->ec_index]->brush;
 	} else {
 		// main or sub model
-		brush = &r_worldentity.model->brush;
+		brush = &r_worldentity.renderer.model->brush;
 	}
 	vertices  = brush->vertexes;
 	edges     = brush->edges;
@@ -448,7 +448,7 @@ Vulkan_BuildDisplayLists (model_t **models, int num_models, vulkan_ctx_t *ctx)
 			}
 			surf = brush->surfaces + j;
 			surf->ec_index = dm - brush->submodels;
-			if (!surf->ec_index && m != r_worldentity.model)
+			if (!surf->ec_index && m != r_worldentity.renderer.model)
 				surf->ec_index = -1 - i;	// instanced model
 			tex = surf->texinfo->texture->render;
 			// append surf to the texture chain
@@ -613,9 +613,12 @@ R_DrawBrushModel (entity_t *e, vulkan_ctx_t *ctx)
 	vec3_t      mins, maxs, org;
 	mod_brush_t *brush;
 
-	model = e->model;
+	model = e->renderer.model;
 	brush = &model->brush;
-	if (e->transform[0] != 1 || e->transform[5] != 1 || e->transform[10] != 1) {
+	mat4f_t mat;
+	Transform_GetWorldMatrix (e->transform, mat);
+	memcpy (e->renderer.full_transform, mat, sizeof (mat));//FIXME
+	if (mat[0][0] != 1 || mat[1][1] != 1 || mat[2][2] != 1) {
 		rotated = true;
 		radius = model->radius;
 		if (R_CullSphere (e->origin, radius))
@@ -633,9 +636,9 @@ R_DrawBrushModel (entity_t *e, vulkan_ctx_t *ctx)
 		vec3_t      temp;
 
 		VectorCopy (org, temp);
-		org[0] = DotProduct (temp, e->transform + 0);
-		org[1] = DotProduct (temp, e->transform + 4);
-		org[2] = DotProduct (temp, e->transform + 8);
+		org[0] = DotProduct (temp, mat[0]);
+		org[1] = DotProduct (temp, mat[1]);
+		org[2] = DotProduct (temp, mat[2]);
 	}
 
 	// calculate dynamic lighting for bmodel if it's not an instanced model
@@ -664,7 +667,8 @@ R_DrawBrushModel (entity_t *e, vulkan_ctx_t *ctx)
 		// enqueue the polygon
 		if (((surf->flags & SURF_PLANEBACK) && (dot < -BACKFACE_EPSILON))
 			|| (!(surf->flags & SURF_PLANEBACK) && (dot > BACKFACE_EPSILON))) {
-			chain_surface (brush, surf, e->transform, e->colormod, ctx);
+			chain_surface (brush, surf, e->renderer.full_transform,
+						   e->renderer.colormod, ctx);
 		}
 	}
 }
@@ -1124,10 +1128,10 @@ Vulkan_DrawWorld (vulkan_ctx_t *ctx)
 	bframe->index_count = 0;
 
 	memset (&worldent, 0, sizeof (worldent));
-	worldent.model = r_worldentity.model;
-	brush = &r_worldentity.model->brush;
+	worldent.renderer.model = r_worldentity.renderer.model;
+	brush = &r_worldentity.renderer.model->brush;
 
-	//vulktex_t  *tex = r_worldentity.model->skytexture->render;
+	//vulktex_t  *tex = r_worldentity.renderer.model->skytexture->render;
 	//bctx->skysheet_tex = tex->tex;
 
 	currententity = &worldent;
@@ -1136,7 +1140,7 @@ Vulkan_DrawWorld (vulkan_ctx_t *ctx)
 	if (r_drawentities->int_val) {
 		entity_t   *ent;
 		for (ent = r_ent_queue; ent; ent = ent->next) {
-			if (ent->model->type != mod_brush)
+			if (ent->renderer.model->type != mod_brush)
 				continue;
 			currententity = ent;
 
diff --git a/libs/video/renderer/vulkan/vulkan_main.c b/libs/video/renderer/vulkan/vulkan_main.c
index 69916682e..e63ff0b03 100644
--- a/libs/video/renderer/vulkan/vulkan_main.c
+++ b/libs/video/renderer/vulkan/vulkan_main.c
@@ -70,7 +70,7 @@ setup_frame (vulkan_ctx_t *ctx)
 	AngleVectors (r_refdef.viewangles, vpn, vright, vup);
 	R_SetFrustum ();
 
-	r_viewleaf = Mod_PointInLeaf (r_origin, r_worldentity.model);
+	r_viewleaf = Mod_PointInLeaf (r_origin, r_worldentity.renderer.model);
 }
 
 static void
@@ -114,7 +114,7 @@ R_RenderEntities (vulkan_ctx_t *ctx)
 		entity_t   *ent; \
 		int         begun = 0; \
 		for (ent = r_ent_queue; ent; ent = ent->next) { \
-			if (ent->model->type != mod_##type_name) \
+			if (ent->renderer.model->type != mod_##type_name) \
 				continue; \
 			if (!begun) { \
 				Vulkan_##Type##Begin (ctx); \
@@ -138,7 +138,7 @@ R_DrawViewModel (void)
 	if (vr_data.inhibit_viewmodel
 		|| !r_drawviewmodel->int_val
 		|| !r_drawentities->int_val
-		|| !currententity->model)
+		|| !currententity->renderer.model)
 		return;
 
 	// hack the depth range to prevent view model from poking into walls
@@ -207,7 +207,7 @@ Vulkan_NewMap (model_t *worldmodel, struct model_s **models, int num_models,
 	}
 
 	memset (&r_worldentity, 0, sizeof (r_worldentity));
-	r_worldentity.model = worldmodel;
+	r_worldentity.renderer.model = worldmodel;
 
 	// Force a vis update
 	r_viewleaf = NULL;
diff --git a/nq/source/Makemodule.am b/nq/source/Makemodule.am
index 2157cd42b..2da0c7fb4 100644
--- a/nq/source/Makemodule.am
+++ b/nq/source/Makemodule.am
@@ -45,6 +45,7 @@ nq_cl_plugin_LIBS= \
 		@client_static_plugin_libs@
 
 nq_client_LIBFILES= \
+		libs/entity/libQFentity.la \
 		libs/video/targets/libQFjs.la \
 		libs/audio/libQFcd.la \
 		libs/audio/libQFsound.la
diff --git a/nq/source/cl_ents.c b/nq/source/cl_ents.c
index ce76ebf71..933097913 100644
--- a/nq/source/cl_ents.c
+++ b/nq/source/cl_ents.c
@@ -32,6 +32,7 @@
 #include "QF/cmd.h"
 #include "QF/console.h"
 #include "QF/cvar.h"
+#include "QF/entity.h"
 #include "QF/input.h"
 #include "QF/keys.h"
 #include "QF/msg.h"
@@ -179,41 +180,40 @@ CL_LerpPoint (void)
 void
 CL_TransformEntity (entity_t *ent, const vec3_t angles, qboolean force)
 {
-	vec3_t      ang;
-	vec_t      *forward, *left, *up;
+	union {
+		quat_t      q;
+		vec4f_t     v;
+	}           rotation;
+	vec4f_t     position;
+	vec4f_t     scale;
 
+	VectorCopy (ent->origin, position);
+	position[3] = 1;
+	VectorSet (ent->scale, ent->scale, ent->scale, scale);
+	scale[3] = 1;
 	if (VectorIsZero (angles)) {
-		VectorSet (1, 0, 0, ent->transform + 0);
-		VectorSet (0, 1, 0, ent->transform + 4);
-		VectorSet (0, 0, 1, ent->transform + 8);
-	} else if (force || !VectorCompare (angles, ent->angles)) {
-		forward = ent->transform + 0;
-		left = ent->transform + 4;
-		up = ent->transform + 8;
+		QuatSet (0, 0, 0, 1, rotation.q);
+	} else {
+		vec3_t      ang;
 		VectorCopy (angles, ang);
-		if (ent->model && ent->model->type == mod_alias) {
+		if (ent->renderer.model && ent->renderer.model->type == mod_alias) {
 			// stupid quake bug
 			// why, oh, why, do alias models pitch in the opposite direction
 			// to everything else?
 			ang[PITCH] = -ang[PITCH];
 		}
-		AngleVectors (ang, forward, left, up);
-		VectorNegate (left, left);  // AngleVectors is right-handed
+		AngleQuat (ang, rotation.q);
 	}
-	VectorCopy (angles, ent->angles);
-	ent->transform[3] = 0;
-	ent->transform[7] = 0;
-	ent->transform[11] = 0;
-	VectorCopy (ent->origin, ent->transform + 12);
-	ent->transform[15] = 1;
+	Transform_SetLocalTransform (ent->transform, scale, rotation.v, position);
 }
 
 static void
 CL_ModelEffects (entity_t *ent, int num, int glow_color)
 {
 	dlight_t   *dl;
-	model_t    *model = ent->model;
+	model_t    *model = ent->renderer.model;
 
+	// add automatic particle trails
 	if (model->flags & EF_ROCKET) {
 		dl = r_funcs->R_AllocDlight (num);
 		if (dl) {
@@ -250,11 +250,12 @@ CL_EntityEffects (int num, entity_t *ent, entity_state_t *state)
 	if (state->effects & EF_BRIGHTFIELD)
 		r_funcs->particles->R_EntityParticles (ent);
 	if (state->effects & EF_MUZZLEFLASH) {
-		vec_t      *fv = ent->transform;
-
 		dl = r_funcs->R_AllocDlight (num);
 		if (dl) {
-			VectorMultAdd (ent->origin, 18, fv, dl->origin);
+			vec4f_t     position = Transform_GetWorldPosition (ent->transform);
+			vec4f_t     fv = Transform_Forward (ent->transform);
+			position += 18 * fv;
+			VectorCopy (position, dl->origin);
 			dl->origin[2] += 16;
 			dl->radius = 200 + (rand () & 31);
 			dl->die = cl.time + 0.1;
@@ -271,19 +272,24 @@ static void
 set_entity_model (entity_t *ent, int modelindex)
 {
 	int         i = ent - cl_entities;
-	ent->model = cl.model_precache[modelindex];
+	renderer_t *renderer = &ent->renderer;
+	animation_t *animation = &ent->animation;
+	renderer->model = cl.model_precache[modelindex];
 	// automatic animation (torches, etc) can be either all together
 	// or randomized
-	if (ent->model) {
-		if (ent->model->synctype == ST_RAND)
-			ent->syncbase = (float) (rand () & 0x7fff) / 0x7fff;
-		else
-			ent->syncbase = 0.0;
+	if (renderer->model) {
+		if (renderer->model->synctype == ST_RAND) {
+			animation->syncbase = (float) (rand () & 0x7fff) / 0x7fff;
+		} else {
+			animation->syncbase = 0.0;
+		}
 	} else {
 		cl_forcelink[i] = true;	// hack to make null model players work
 	}
-	if (i <= cl.maxclients)
-		ent->skin = mod_funcs->Skin_SetColormap (ent->skin, i);
+	animation->nolerp = 1; // don't try to lerp when the model has changed
+	if (i <= cl.maxclients) {
+		renderer->skin = mod_funcs->Skin_SetColormap (renderer->skin, i);
+	}
 }
 
 void
@@ -291,6 +297,8 @@ CL_RelinkEntities (void)
 {
 	entity_t   *ent;
 	entity_state_t *new, *old;
+	renderer_t *renderer;
+	animation_t *animation;
 	float       bobjrotate, frac, f, d;
 	int         i, j;
 	int         entvalid;
@@ -326,6 +334,9 @@ CL_RelinkEntities (void)
 		new = &nq_entstates.frame[0 + cl.mindex][i];
 		old = &nq_entstates.frame[1 - cl.mindex][i];
 		ent = &cl_entities[i];
+		renderer = &ent->renderer;
+		animation = &ent->animation;
+
 		// if the object wasn't included in the last packet, remove it
 		entvalid = cl_msgtime[i] == cl.mtime[0];
 		if (entvalid && !new->modelindex) {
@@ -334,10 +345,11 @@ CL_RelinkEntities (void)
 			entvalid = 0;
 		}
 		if (!entvalid) {
-			ent->model = NULL;
-			ent->pose1 = ent->pose2 = -1;
-			if (ent->efrag)
+			renderer->model = NULL;
+			animation->pose1 = animation->pose2 = -1;
+			if (ent->visibility.efrag) {
 				r_funcs->R_RemoveEfrags (ent);	// just became empty
+			}
 			continue;
 		}
 
@@ -348,39 +360,43 @@ CL_RelinkEntities (void)
 			old->modelindex = new->modelindex;
 			set_entity_model (ent, new->modelindex);
 		}
-		ent->frame = new->frame;
+		animation->frame = new->frame;
 		if (cl_forcelink[i] || new->colormap != old->colormap) {
 			old->colormap = new->colormap;
-			ent->skin = mod_funcs->Skin_SetColormap (ent->skin, new->colormap);
+			renderer->skin = mod_funcs->Skin_SetColormap (renderer->skin,
+														  new->colormap);
 		}
 		if (cl_forcelink[i] || new->skinnum != old->skinnum) {
 			old->skinnum = new->skinnum;
-			ent->skinnum = new->skinnum;
+			renderer->skinnum = new->skinnum;
 			if (i <= cl.maxclients) {
-				ent->skin = mod_funcs->Skin_SetColormap (ent->skin, i);
+				renderer->skin = mod_funcs->Skin_SetColormap (renderer->skin,
+															  i);
 				mod_funcs->Skin_SetTranslation (i, cl.scores[i - 1].topcolor,
 												cl.scores[i - 1].bottomcolor);
 			}
 		}
 		ent->scale = new->scale / 16.0;
 
-		VectorCopy (ent_colormod[new->colormod], ent->colormod);
-		ent->colormod[3] = ENTALPHA_DECODE (new->alpha);
+		VectorCopy (ent_colormod[new->colormod], renderer->colormod);
+		renderer->colormod[3] = ENTALPHA_DECODE (new->alpha);
 
 		model_flags = 0;
-		if (ent->model)
-			model_flags = ent->model->flags;
+		if (renderer->model) {
+			model_flags = renderer->model->flags;
+		}
 
 		if (cl_forcelink[i]) {
 			// The entity was not updated in the last message so move to the
 			// final spot
-			ent->pose1 = ent->pose2 = -1;
+			animation->pose1 = animation->pose2 = -1;
 			VectorCopy (new->origin, ent->origin);
 			if (!(model_flags & EF_ROTATE))
 				CL_TransformEntity (ent, new->angles, true);
 			if (i != cl.viewentity || chase_active->int_val) {
-				if (ent->efrag)
+				if (ent->visibility.efrag) {
 					r_funcs->R_RemoveEfrags (ent);
+				}
 				r_funcs->R_AddEfrags (&cl.worldmodel->brush, ent);
 			}
 			VectorCopy (ent->origin, ent->old_origin);
@@ -395,7 +411,7 @@ CL_RelinkEntities (void)
 				VectorCopy (new->origin, ent->origin);
 				if (!(model_flags & EF_ROTATE))
 					CL_TransformEntity (ent, new->angles, true);
-				ent->pose1 = ent->pose2 = -1;
+				animation->pose1 = animation->pose2 = -1;
 			} else {
 				vec3_t      angles, d;
 				// interpolate the origin and angles
@@ -413,7 +429,7 @@ CL_RelinkEntities (void)
 				}
 			}
 			if (i != cl.viewentity || chase_active->int_val) {
-				if (ent->efrag) {
+				if (ent->visibility.efrag) {
 					if (!VectorCompare (ent->origin, ent->old_origin)) {
 						r_funcs->R_RemoveEfrags (ent);
 						r_funcs->R_AddEfrags (&cl.worldmodel->brush, ent);
diff --git a/nq/source/cl_main.c b/nq/source/cl_main.c
index 739e4a61c..f31256138 100644
--- a/nq/source/cl_main.c
+++ b/nq/source/cl_main.c
@@ -403,12 +403,13 @@ CL_PrintEntities_f (void)
 
 	for (i = 0, ent = cl_entities; i < cl.num_entities; i++, ent++) {
 		Sys_Printf ("%3i:", i);
-		if (!ent->model) {
+		if (!ent->renderer.model) {
 			Sys_Printf ("EMPTY\n");
 			continue;
 		}
 		Sys_Printf ("%s:%2i  (%5.1f,%5.1f,%5.1f) [%5.1f %5.1f %5.1f]\n",
-					ent->model->path, ent->frame, VectorExpand (ent->origin),
+					ent->renderer.model->path, ent->animation.frame,
+					VectorExpand (ent->origin),
 					VectorExpand (ent->angles));
 	}
 }
diff --git a/nq/source/cl_parse.c b/nq/source/cl_parse.c
index 3b076b43f..10ac2d4f5 100644
--- a/nq/source/cl_parse.c
+++ b/nq/source/cl_parse.c
@@ -433,7 +433,7 @@ CL_ParseServerInfo (void)
 	}
 
 	// local state
-	cl_entities[0].model = cl.worldmodel = cl.model_precache[1];
+	cl_entities[0].renderer.model = cl.worldmodel = cl.model_precache[1];
 	if (!centerprint)
 		centerprint = dstring_newstr ();
 	else
@@ -766,9 +766,9 @@ CL_ParseClientdata (void)
 		cl.stats[STAT_WEAPONFRAME] |= MSG_ReadByte (net_message) << 8;
 	if (bits & SU_WEAPONALPHA) {
 		byte alpha = MSG_ReadByte (net_message);
-		cl.viewent.colormod[3] = ENTALPHA_DECODE (alpha);
+		cl.viewent.renderer.colormod[3] = ENTALPHA_DECODE (alpha);
 	} else {
-		cl.viewent.colormod[3] = 1.0;
+		cl.viewent.renderer.colormod[3] = 1.0;
 	}
 }
 
@@ -785,12 +785,12 @@ CL_ParseStatic (int version)
 
 	// copy it to the current state
 	//FIXME alpha & lerp
-	ent->model = cl.model_precache[baseline.modelindex];
-	ent->frame = baseline.frame;
-	ent->skin = 0;
-	ent->skinnum = baseline.skinnum;
-	VectorCopy (ent_colormod[baseline.colormod], ent->colormod);
-	ent->colormod[3] = ENTALPHA_DECODE (baseline.alpha);
+	ent->renderer.model = cl.model_precache[baseline.modelindex];
+	ent->animation.frame = baseline.frame;
+	ent->renderer.skin = 0;
+	ent->renderer.skinnum = baseline.skinnum;
+	VectorCopy (ent_colormod[baseline.colormod], ent->renderer.colormod);
+	ent->renderer.colormod[3] = ENTALPHA_DECODE (baseline.alpha);
 	ent->scale = baseline.scale / 16.0;
 	VectorCopy (baseline.origin, ent->origin);
 	CL_TransformEntity (ent, baseline.angles, true);
@@ -1024,7 +1024,9 @@ CL_ParseServerMessage (void)
 						mod_funcs->Skin_SetTranslation (i + 1, top, bot);
 					cl.scores[i].topcolor = top;
 					cl.scores[i].bottomcolor = bot;
-					ent->skin = mod_funcs->Skin_SetColormap (ent->skin, i + 1);
+					ent->renderer.skin
+						= mod_funcs->Skin_SetColormap (ent->renderer.skin,
+													   i + 1);
 				}
 				break;
 
diff --git a/nq/source/cl_tent.c b/nq/source/cl_tent.c
index 2286d829a..3a8a1b899 100644
--- a/nq/source/cl_tent.c
+++ b/nq/source/cl_tent.c
@@ -38,6 +38,7 @@
 #include <math.h>
 #include <stdlib.h>
 
+#include "QF/entity.h"
 #include "QF/model.h"
 #include "QF/msg.h"
 #include "QF/sound.h"
@@ -132,12 +133,16 @@ CL_TEnts_Init (void)
 void
 CL_Init_Entity (entity_t *ent)
 {
+	if (ent->transform) {
+		Transform_Delete (ent->transform);
+	}
 	memset (ent, 0, sizeof (*ent));
 
-	ent->skin = 0;
-	QuatSet (1.0, 1.0, 1.0, 1.0, ent->colormod);
+	ent->transform = Transform_New (0);
+	ent->renderer.skin = 0;
+	QuatSet (1.0, 1.0, 1.0, 1.0, ent->renderer.colormod);
 	ent->scale = 1.0;
-	ent->pose1 = ent->pose2 = -1;
+	ent->animation.pose1 = ent->animation.pose2 = -1;
 }
 
 static tent_t *
@@ -150,8 +155,10 @@ new_temp_entity (void)
 		temp_entities = malloc (TEMP_BATCH * sizeof (tent_t));
 		for (i = 0; i < TEMP_BATCH - 1; i++) {
 			temp_entities[i].next = &temp_entities[i + 1];
+			temp_entities[i].ent.transform = 0;
 		}
 		temp_entities[i].next = 0;
+		temp_entities[i].ent.transform = 0;
 	}
 	tent = temp_entities;
 	temp_entities = tent->next;
@@ -208,7 +215,7 @@ CL_ClearTEnts (void)
 
 	for (to = cl_beams; to; to = to->next) {
 		for (t = to->to.beam.tents; t; t = t->next)
-			t->ent.efrag = 0;
+			t->ent.visibility.efrag = 0;
 		free_temp_entities (to->to.beam.tents);
 	}
 	free_tent_objects (cl_beams);
@@ -216,7 +223,7 @@ CL_ClearTEnts (void)
 
 	for (to = cl_explosions; to; to = to->next) {
 		for (t = to->to.ex.tent; t; t = t->next)
-			t->ent.efrag = 0;
+			t->ent.visibility.efrag = 0;
 		free_temp_entities (to->to.ex.tent);
 	}
 	free_tent_objects (cl_explosions);
@@ -231,7 +238,7 @@ beam_clear (beam_t *b)
 
 		for (t = b->tents; t; t = t->next) {
 			r_funcs->R_RemoveEfrags (&t->ent);
-			t->ent.efrag = 0;
+			t->ent.visibility.efrag = 0;
 		}
 		free_temp_entities (b->tents);
 		b->tents = 0;
@@ -285,7 +292,7 @@ beam_setup (beam_t *b, qboolean transform)
 
 		VectorMultAdd (org, d, dist, tent->ent.origin);
 		d += 1.0;
-		tent->ent.model = b->model;
+		tent->ent.renderer.model = b->model;
 		ang[PITCH] = pitch;
 		ang[YAW] = yaw;
 		if (transform) {
@@ -428,7 +435,7 @@ CL_ParseTEnt (void)
 			//FIXME need better model management
 			if (!cl_spr_explod->cache.data)
 				cl_spr_explod = Mod_ForName ("progs/s_explod.spr", true);
-			ex->tent->ent.model = cl_spr_explod;
+			ex->tent->ent.renderer.model = cl_spr_explod;
 			CL_TransformEntity (&ex->tent->ent, ex->tent->ent.angles, true);
 			break;
 
@@ -573,10 +580,10 @@ CL_UpdateExplosions (void)
 		ex = &(*to)->to.ex;
 		ent = &ex->tent->ent;
 		f = 10 * (cl.time - ex->start);
-		if (f >= ent->model->numframes) {
+		if (f >= ent->renderer.model->numframes) {
 			tent_obj_t *_to;
 			r_funcs->R_RemoveEfrags (ent);
-			ent->efrag = 0;
+			ent->visibility.efrag = 0;
 			free_temp_entities (ex->tent);
 			_to = *to;
 			*to = _to->next;
@@ -586,8 +593,8 @@ CL_UpdateExplosions (void)
 		}
 		to = &(*to)->next;
 
-		ent->frame = f;
-		if (!ent->efrag)
+		ent->animation.frame = f;
+		if (!ent->visibility.efrag)
 			r_funcs->R_AddEfrags (&cl.worldmodel->brush, ent);
 	}
 }
diff --git a/nq/source/cl_view.c b/nq/source/cl_view.c
index 71383ff08..132df122f 100644
--- a/nq/source/cl_view.c
+++ b/nq/source/cl_view.c
@@ -614,7 +614,7 @@ V_CalcIntermissionRefdef (void)
 
 	VectorCopy (origin, r_data->refdef->vieworg);
 	VectorCopy (angles, r_data->refdef->viewangles);
-	view->model = NULL;
+	view->renderer.model = NULL;
 
 	// always idle in intermission
 	old = v_idlescale->value;
@@ -699,9 +699,9 @@ V_CalcRefdef (void)
 	else if (r_data->scr_viewsize->int_val == 80)
 		view->origin[2] += 0.5;
 
-	view->model = cl.model_precache[cl.stats[STAT_WEAPON]];
-	view->frame = cl.stats[STAT_WEAPONFRAME];
-	view->skin = 0;
+	view->renderer.model = cl.model_precache[cl.stats[STAT_WEAPON]];
+	view->animation.frame = cl.stats[STAT_WEAPONFRAME];
+	view->renderer.skin = 0;
 
 	// set up the refresh position
 	VectorAdd (r_data->refdef->viewangles, cl.punchangle,
diff --git a/qw/source/Makemodule.am b/qw/source/Makemodule.am
index 553a32f65..739789020 100644
--- a/qw/source/Makemodule.am
+++ b/qw/source/Makemodule.am
@@ -87,6 +87,7 @@ qw_cl_plugin_LIBS= \
 qw_client_LIBS= \
 		libs/qw/libqw.a \
 		libs/net/libnet_chan.la \
+		libs/entity/libQFentity.la \
 		libs/console/libQFconsole.la \
 		libs/video/targets/libQFjs.la \
 		libs/audio/libQFcd.la \
diff --git a/qw/source/cl_demo.c b/qw/source/cl_demo.c
index 6151b6bd0..d063211d4 100644
--- a/qw/source/cl_demo.c
+++ b/qw/source/cl_demo.c
@@ -758,17 +758,19 @@ demo_start_recording (int track)
 	for (ent = cl_static_entities; ent; ent = ent->unext) {
 		MSG_WriteByte (&buf, svc_spawnstatic);
 
-		for (j = 1; j < cl.nummodels; j++)
-			if (ent->model == cl.model_precache[j])
+		for (j = 1; j < cl.nummodels; j++) {
+			if (ent->renderer.model == cl.model_precache[j]) {
 				break;
+			}
+		}
 		if (j == cl.nummodels)
 			MSG_WriteByte (&buf, 0);
 		else
 			MSG_WriteByte (&buf, j);
 
-		MSG_WriteByte (&buf, ent->frame);
+		MSG_WriteByte (&buf, ent->animation.frame);
 		MSG_WriteByte (&buf, 0);
-		MSG_WriteByte (&buf, ent->skinnum);
+		MSG_WriteByte (&buf, ent->renderer.skinnum);
 		MSG_WriteCoordAngleV (&buf, ent->origin, ent->angles);
 
 		if (buf.cursize > MAX_MSGLEN / 2) {
diff --git a/qw/source/cl_entparse.c b/qw/source/cl_entparse.c
index 6fc04a4c4..2d130574d 100644
--- a/qw/source/cl_entparse.c
+++ b/qw/source/cl_entparse.c
@@ -482,7 +482,7 @@ CL_ParsePlayerinfo (void)
 		bits = MSG_ReadByte (net_message);
 		if (bits & PF_ALPHA) {
 			val = MSG_ReadByte (net_message);
-			ent->colormod[3] = val / 255.0;
+			ent->renderer.colormod[3] = val / 255.0;
 		}
 		if (bits & PF_SCALE) {
 			val = MSG_ReadByte (net_message);
@@ -505,7 +505,7 @@ CL_ParsePlayerinfo (void)
 				g = (float) ((val >> 2) & 7) * (1.0 / 7.0);
 				b = (float) (val & 3) * (1.0 / 3.0);
 			}
-			VectorSet (r, g, b, ent->colormod);
+			VectorSet (r, g, b, ent->renderer.colormod);
 		}
 		if (bits & PF_FRAME2) {
 			state->pls.frame |= MSG_ReadByte (net_message) << 8;
diff --git a/qw/source/cl_ents.c b/qw/source/cl_ents.c
index 7c95040ed..d294f9981 100644
--- a/qw/source/cl_ents.c
+++ b/qw/source/cl_ents.c
@@ -36,6 +36,7 @@
 #endif
 
 #include "QF/cvar.h"
+#include "QF/entity.h"
 #include "QF/locs.h"
 #include "QF/msg.h"
 #include "QF/render.h"
@@ -172,40 +173,38 @@ is_gib (entity_state_t *s1)
 void
 CL_TransformEntity (entity_t *ent, const vec3_t angles, qboolean force)
 {
-	vec3_t      ang;
-	vec_t      *forward, *left, *up;
+	union {
+		quat_t      q;
+		vec4f_t     v;
+	}           rotation;
+	vec4f_t     position;
+	vec4f_t     scale;
 
+	VectorCopy (ent->origin, position);
+	position[3] = 1;
+	VectorSet (ent->scale, ent->scale, ent->scale, scale);
+	scale[3] = 1;
 	if (VectorIsZero (angles)) {
-		VectorSet (1, 0, 0, ent->transform + 0);
-		VectorSet (0, 1, 0, ent->transform + 4);
-		VectorSet (0, 0, 1, ent->transform + 8);
-	} else if (force || !VectorCompare (angles, ent->angles)) {
-		forward = ent->transform + 0;
-		left = ent->transform + 4;
-		up = ent->transform + 8;
+		QuatSet (0, 0, 0, 1, rotation.q);
+	} else {
+		vec3_t      ang;
 		VectorCopy (angles, ang);
-		if (ent->model && ent->model->type == mod_alias) {
+		if (ent->renderer.model && ent->renderer.model->type == mod_alias) {
 			// stupid quake bug
 			// why, oh, why, do alias models pitch in the opposite direction
 			// to everything else?
 			ang[PITCH] = -ang[PITCH];
 		}
-		AngleVectors (ang, forward, left, up);
-		VectorNegate (left, left);  // AngleVectors is right-handed
+		AngleQuat (ang, rotation.q);
 	}
-	VectorCopy (angles, ent->angles);
-	ent->transform[3] = 0;
-	ent->transform[7] = 0;
-	ent->transform[11] = 0;
-	VectorCopy (ent->origin, ent->transform + 12);
-	ent->transform[15] = 1;
+	Transform_SetLocalTransform (ent->transform, scale, rotation.v, position);
 }
 
 static void
 CL_ModelEffects (entity_t *ent, int num, int glow_color)
 {
 	dlight_t   *dl;
-	model_t    *model = ent->model;
+	model_t    *model = ent->renderer.model;
 
 	// add automatic particle trails
 	if (model->flags & EF_ROCKET) {
@@ -239,14 +238,17 @@ CL_ModelEffects (entity_t *ent, int num, int glow_color)
 static void
 set_entity_model (entity_t *ent, int modelindex)
 {
-	ent->model = cl.model_precache[modelindex];
+	renderer_t *renderer = &ent->renderer;
+	animation_t *animation = &ent->animation;
+	renderer->model = cl.model_precache[modelindex];
 	// automatic animation (torches, etc) can be either all together
 	// or randomized
-	if (ent->model) {
-		if (ent->model->synctype == ST_RAND)
-			ent->syncbase = (float) (rand () & 0x7fff) / 0x7fff;
-		else
-			ent->syncbase = 0.0;
+	if (renderer->model) {
+		if (renderer->model->synctype == ST_RAND) {
+			animation->syncbase = (float) (rand () & 0x7fff) / 0x7fff;
+		} else {
+			animation->syncbase = 0.0;
+		}
 	}
 }
 
@@ -257,6 +259,8 @@ CL_LinkPacketEntities (void)
 	float       frac, f;
 	entity_t   *ent;
 	entity_state_t *new, *old;
+	renderer_t *renderer;
+	animation_t *animation;
 	vec3_t      delta;
 
 	frac = 1;
@@ -264,14 +268,17 @@ CL_LinkPacketEntities (void)
 		new = &qw_entstates.frame[cl.link_sequence & UPDATE_MASK][i];
 		old = &qw_entstates.frame[cl.prev_sequence & UPDATE_MASK][i];
 		ent = &cl_entities[i];
+		renderer = &ent->renderer;
+		animation = &ent->animation;
 		forcelink = cl_entity_valid[0][i] != cl_entity_valid[1][i];
 		cl_entity_valid[1][i] = cl_entity_valid[0][i];
 		// if the object wasn't included in the last packet, remove it
 		if (!cl_entity_valid[0][i]) {
-			ent->model = NULL;
-			ent->pose1 = ent->pose2 = -1;
-			if (ent->efrag)
+			renderer->model = NULL;
+			animation->pose1 = animation->pose2 = -1;
+			if (ent->visibility.efrag) {
 				r_funcs->R_RemoveEfrags (ent);	// just became empty
+			}
 			continue;
 		}
 
@@ -283,8 +290,9 @@ CL_LinkPacketEntities (void)
 		if (!new->modelindex
 			|| (cl_deadbodyfilter->int_val && is_dead_body (new))
 			|| (cl_gibfilter->int_val && is_gib (new))) {
-			if (ent->efrag)
+			if (ent->visibility.efrag) {
 				r_funcs->R_RemoveEfrags (ent);
+			}
 			continue;
 		}
 
@@ -295,46 +303,50 @@ CL_LinkPacketEntities (void)
 			old->modelindex = new->modelindex;
 			set_entity_model (ent, new->modelindex);
 		}
-		ent->frame = new->frame;
+		animation->frame = new->frame;
 		if (forcelink || new->colormap != old->colormap
 			|| new->skinnum != old->skinnum) {
 			old->skinnum = new->skinnum;
-			ent->skinnum = new->skinnum;
+			renderer->skinnum = new->skinnum;
 			old->colormap = new->colormap;
 			if (new->colormap && (new->colormap <= MAX_CLIENTS)
 				&& cl.players[new->colormap - 1].name
 				&& cl.players[new->colormap - 1].name->value[0]
 				&& new->modelindex == cl_playerindex) {
 				player_info_t *player = &cl.players[new->colormap - 1];
-				ent->skin = mod_funcs->Skin_SetSkin (ent->skin, new->colormap,
-													 player->skinname->value);
-				ent->skin = mod_funcs->Skin_SetColormap (ent->skin,
-														 new->colormap);
+				renderer->skin
+					= mod_funcs->Skin_SetSkin (renderer->skin, new->colormap,
+											   player->skinname->value);
+				renderer->skin = mod_funcs->Skin_SetColormap (renderer->skin,
+															  new->colormap);
 			} else {
-				ent->skin = mod_funcs->Skin_SetColormap (ent->skin, 0);
+				renderer->skin = mod_funcs->Skin_SetColormap (renderer->skin,
+															  0);
 			}
 		}
 		ent->scale = new->scale / 16.0;
 
-		VectorCopy (ent_colormod[new->colormod], ent->colormod);
-		ent->colormod[3] = new->alpha / 255.0;
+		VectorCopy (ent_colormod[new->colormod], renderer->colormod);
+		renderer->colormod[3] = new->alpha / 255.0;
 
-		ent->min_light = 0;
-		ent->fullbright = 0;
+		renderer->min_light = 0;
+		renderer->fullbright = 0;
 		if (new->modelindex == cl_playerindex) {
-			ent->min_light = min (cl.fbskins, cl_fb_players->value);
-			if (ent->min_light >= 1.0)
-				ent->fullbright = 1;
+			renderer->min_light = min (cl.fbskins, cl_fb_players->value);
+			if (renderer->min_light >= 1.0) {
+				renderer->fullbright = 1;
+			}
 		}
 
 		if (forcelink) {
-			ent->pose1 = ent->pose2 = -1;
+			animation->pose1 = animation->pose2 = -1;
 			VectorCopy (new->origin, ent->origin);
-			if (!(ent->model->flags & EF_ROTATE))
+			if (!(renderer->model->flags & EF_ROTATE))
 				CL_TransformEntity (ent, new->angles, true);
 			if (i != cl.viewentity || chase_active->int_val) {
-				if (ent->efrag)
+				if (ent->visibility.efrag) {
 					r_funcs->R_RemoveEfrags (ent);
+				}
 				r_funcs->R_AddEfrags (&cl.worldmodel->brush, ent);
 			}
 			VectorCopy (ent->origin, ent->old_origin);
@@ -347,14 +359,15 @@ CL_LinkPacketEntities (void)
 				|| fabs (delta[2]) > 100) {
 				// assume a teleportation, not a motion
 				VectorCopy (new->origin, ent->origin);
-				if (!(ent->model->flags & EF_ROTATE))
+				if (!(renderer->model->flags & EF_ROTATE)) {
 					CL_TransformEntity (ent, new->angles, true);
-				ent->pose1 = ent->pose2 = -1;
+				}
+				animation->pose1 = animation->pose2 = -1;
 			} else {
 				vec3_t      angles, d;
 				// interpolate the origin and angles
 				VectorMultAdd (old->origin, f, delta, ent->origin);
-				if (!(ent->model->flags & EF_ROTATE)) {
+				if (!(renderer->model->flags & EF_ROTATE)) {
 					VectorSubtract (new->angles, old->angles, d);
 					for (j = 0; j < 3; j++) {
 						if (d[j] > 180)
@@ -367,7 +380,7 @@ CL_LinkPacketEntities (void)
 				}
 			}
 			if (i != cl.viewentity || chase_active->int_val) {
-				if (ent->efrag) {
+				if (ent->visibility.efrag) {
 					if (!VectorCompare (ent->origin, ent->old_origin)) {
 						r_funcs->R_RemoveEfrags (ent);
 						r_funcs->R_AddEfrags (&cl.worldmodel->brush, ent);
@@ -377,11 +390,12 @@ CL_LinkPacketEntities (void)
 				}
 			}
 		}
-		if (!ent->efrag)
+		if (!ent->visibility.efrag) {
 			r_funcs->R_AddEfrags (&cl.worldmodel->brush, ent);
+		}
 
 		// rotate binary objects locally
-		if (ent->model->flags & EF_ROTATE) {
+		if (renderer->model->flags & EF_ROTATE) {
 			vec3_t      angles;
 			angles[PITCH] = 0;
 			angles[YAW] = anglemod (100 * cl.time);
@@ -392,8 +406,9 @@ CL_LinkPacketEntities (void)
 		//CL_NewDlight (i, ent->origin, new->effects, 0, 0);
 		if (VectorDistance_fast (old->origin, ent->origin) > (256 * 256))
 			VectorCopy (ent->origin, old->origin);
-		if (ent->model->flags & ~EF_ROTATE)
+		if (renderer->model->flags & ~EF_ROTATE) {
 			CL_ModelEffects (ent, -new->number, new->glow_color);
+		}
 	}
 }
 
@@ -414,36 +429,40 @@ CL_AddFlagModels (entity_t *ent, int team, int key)
 	};
 	float       f;
 	entity_t   *fent;
-	vec_t      *v_forward, *v_left;
-	vec3_t      ang;
-
-	if (cl_flagindex == -1)
-		return;
-
-	f = 14.0;
-	if (ent->frame >= 29 && ent->frame <= 40) {
-		f = flag_offsets[ent->frame - 29];
-	} else if (ent->frame >= 103 && ent->frame <= 118) {
-		if (ent->frame <= 106)							// 103-104 nailattack
-			f = 20.0;									// 105-106 light
-		else											// 107-112 rocketattack
-			f = 21.0;									// 112-118 shotattack
-	}
 
 	fent = &cl_flag_ents[key];
-	fent->model = cl.model_precache[cl_flagindex];
-	fent->skinnum = team;
 
-	v_forward = ent->transform + 0;
-	v_left = ent->transform + 4;
+	if (cl_flagindex == -1) {
+		fent->active = 0;
+		return;
+	}
 
-	VectorMultAdd (ent->origin, -f, v_forward, fent->origin);
-	VectorMultAdd (fent->origin, -22, v_left, fent->origin);
-	fent->origin[2] -= 16.0;
+	fent->active = 1;
+	f = 14.0;
+	if (ent->animation.frame >= 29 && ent->animation.frame <= 40) {
+		f = flag_offsets[ent->animation.frame - 29];
+	} else if (ent->animation.frame >= 103 && ent->animation.frame <= 118) {
+		if (ent->animation.frame <= 106) {			// 103-104 nailattack
+			f = 20.0;								// 105-106 light
+		} else {									// 107-112 rocketattack
+			f = 21.0;								// 112-118 shotattack
+		}
+	}
 
-	VectorCopy (ent->angles, ang);
-	ang[2] -= 45.0;
-	CL_TransformEntity (fent, ang, false);
+	vec4f_t     position = { 22, -f, -16, 1};
+
+	if (!Transform_GetParent (fent->transform)) {
+		vec4f_t     scale = { 1, 1, 1, 1 };
+		// -45 degree roll (x is forward)
+		vec4f_t     rotation = { -0.382683432, 0, 0, 0.923879533 };
+		Transform_SetParent (fent->transform, ent->transform);
+		Transform_SetLocalTransform (fent->transform, scale, rotation,
+									 position);
+	} else {
+		Transform_SetLocalPosition (fent->transform, position);
+	}
+	fent->renderer.model = cl.model_precache[cl_flagindex];
+	fent->renderer.skinnum = team;
 
 	r_funcs->R_EnqueueEntity (fent);//FIXME should use efrag (needs smarter
 									// handling //in the player code)
@@ -477,7 +496,7 @@ CL_LinkPlayers (void)
 	for (j = 0, info = cl.players, state = frame->playerstate; j < MAX_CLIENTS;
 		 j++, info++, state++) {
 		ent = &cl_player_ents[j];
-		if (ent->efrag)
+		if (ent->visibility.efrag)
 			r_funcs->R_RemoveEfrags (ent);
 		if (state->messagenum != cl.parsecount)
 			continue;							// not present this frame
@@ -544,26 +563,27 @@ CL_LinkPlayers (void)
 		}
 		ang[ROLL] = V_CalcRoll (ang, state->pls.velocity) * 4.0;
 
-		ent->model = cl.model_precache[state->pls.modelindex];
-		ent->frame = state->pls.frame;
-		ent->skinnum = state->pls.skinnum;
+		ent->renderer.model = cl.model_precache[state->pls.modelindex];
+		ent->animation.frame = state->pls.frame;
+		ent->renderer.skinnum = state->pls.skinnum;
 
 		CL_TransformEntity (ent, ang, false);
 
-		ent->min_light = 0;
-		ent->fullbright = 0;
+		ent->renderer.min_light = 0;
+		ent->renderer.fullbright = 0;
 
 		if (state->pls.modelindex == cl_playerindex) { //XXX
 			// use custom skin
-			ent->skin = info->skin;
+			ent->renderer.skin = info->skin;
 
-			ent->min_light = min (cl.fbskins, cl_fb_players->value);
+			ent->renderer.min_light = min (cl.fbskins, cl_fb_players->value);
 
-			if (ent->min_light >= 1.0)
-				ent->fullbright = 1;
+			if (ent->renderer.min_light >= 1.0) {
+				ent->renderer.fullbright = 1;
+			}
 		} else {
 			// FIXME no team colors on nonstandard player models
-			ent->skin = 0;
+			ent->renderer.skin = 0;
 		}
 
 		// stuff entity in map
diff --git a/qw/source/cl_parse.c b/qw/source/cl_parse.c
index f38b30537..2523f8feb 100644
--- a/qw/source/cl_parse.c
+++ b/qw/source/cl_parse.c
@@ -979,9 +979,9 @@ CL_ParseStatic (void)
 	cl_static_tail = &ent->unext;
 
 	// copy it to the current state
-	ent->model = cl.model_precache[es.modelindex];
-	ent->frame = es.frame;
-	ent->skinnum = es.skinnum;
+	ent->renderer.model = cl.model_precache[es.modelindex];
+	ent->animation.frame = es.frame;
+	ent->renderer.skinnum = es.skinnum;
 
 	VectorCopy (es.origin, ent->origin);
 	CL_TransformEntity (ent, es.angles, true);
diff --git a/qw/source/cl_tent.c b/qw/source/cl_tent.c
index c24f1f0bc..e44ec9b3a 100644
--- a/qw/source/cl_tent.c
+++ b/qw/source/cl_tent.c
@@ -39,6 +39,7 @@
 #include <stdlib.h>
 
 #include "QF/console.h"
+#include "QF/entity.h"
 #include "QF/model.h"
 #include "QF/msg.h"
 #include "QF/sound.h"
@@ -136,12 +137,16 @@ CL_TEnts_Init (void)
 void
 CL_Init_Entity (entity_t *ent)
 {
+	if (ent->transform) {
+		Transform_Delete (ent->transform);
+	}
 	memset (ent, 0, sizeof (*ent));
 
-	ent->skin = 0;
-	QuatSet (1.0, 1.0, 1.0, 1.0, ent->colormod);
+	ent->transform = Transform_New (0);
+	ent->renderer.skin = 0;
+	QuatSet (1.0, 1.0, 1.0, 1.0, ent->renderer.colormod);
 	ent->scale = 1.0;
-	ent->pose1 = ent->pose2 = -1;
+	ent->animation.pose1 = ent->animation.pose2 = -1;
 }
 
 static tent_t *
@@ -154,8 +159,10 @@ new_temp_entity (void)
 		temp_entities = malloc (TEMP_BATCH * sizeof (tent_t));
 		for (i = 0; i < TEMP_BATCH - 1; i++) {
 			temp_entities[i].next = &temp_entities[i + 1];
+			temp_entities[i].ent.transform = 0;
 		}
 		temp_entities[i].next = 0;
+		temp_entities[i].ent.transform = 0;
 	}
 	tent = temp_entities;
 	temp_entities = tent->next;
@@ -211,16 +218,18 @@ CL_ClearTEnts (void)
 	tent_obj_t *to;
 
 	for (to = cl_beams; to; to = to->next) {
-		for (t = to->to.beam.tents; t; t = t->next)
-			t->ent.efrag = 0;
+		for (t = to->to.beam.tents; t; t = t->next) {
+			t->ent.visibility.efrag = 0;
+		}
 		free_temp_entities (to->to.beam.tents);
 	}
 	free_tent_objects (cl_beams);
 	cl_beams = 0;
 
 	for (to = cl_explosions; to; to = to->next) {
-		for (t = to->to.ex.tent; t; t = t->next)
-			t->ent.efrag = 0;
+		for (t = to->to.ex.tent; t; t = t->next) {
+			t->ent.visibility.efrag = 0;
+		}
 		free_temp_entities (to->to.ex.tent);
 	}
 	free_tent_objects (cl_explosions);
@@ -235,7 +244,7 @@ beam_clear (beam_t *b)
 
 		for (t = b->tents; t; t = t->next) {
 			r_funcs->R_RemoveEfrags (&t->ent);
-			t->ent.efrag = 0;
+			t->ent.visibility.efrag = 0;
 		}
 		free_temp_entities (b->tents);
 		b->tents = 0;
@@ -289,7 +298,7 @@ beam_setup (beam_t *b, qboolean transform)
 
 		VectorMultAdd (org, d, dist, tent->ent.origin);
 		d += 1.0;
-		tent->ent.model = b->model;
+		tent->ent.renderer.model = b->model;
 		ang[PITCH] = pitch;
 		ang[YAW] = yaw;
 		if (transform) {
@@ -432,7 +441,7 @@ CL_ParseTEnt (void)
 			//FIXME need better model management
 			if (!cl_spr_explod->cache.data)
 				cl_spr_explod = Mod_ForName ("progs/s_explod.spr", true);
-			ex->tent->ent.model = cl_spr_explod;
+			ex->tent->ent.renderer.model = cl_spr_explod;
 			CL_TransformEntity (&ex->tent->ent, ex->tent->ent.angles, true);
 			break;
 
@@ -580,10 +589,10 @@ CL_UpdateExplosions (void)
 		ex = &(*to)->to.ex;
 		ent = &ex->tent->ent;
 		f = 10 * (cl.time - ex->start);
-		if (f >= ent->model->numframes) {
+		if (f >= ent->renderer.model->numframes) {
 			tent_obj_t *_to;
 			r_funcs->R_RemoveEfrags (ent);
-			ent->efrag = 0;
+			ent->visibility.efrag = 0;
 			free_temp_entities (ex->tent);
 			_to = *to;
 			*to = _to->next;
@@ -593,9 +602,10 @@ CL_UpdateExplosions (void)
 		}
 		to = &(*to)->next;
 
-		ent->frame = f;
-		if (!ent->efrag)
+		ent->animation.frame = f;
+		if (!ent->visibility.efrag) {
 			r_funcs->R_AddEfrags (&cl.worldmodel->brush, ent);
+		}
 	}
 }
 
@@ -613,7 +623,7 @@ CL_ClearProjectiles (void)
 
 	for (tent = cl_projectiles; tent; tent = tent->next) {
 		r_funcs->R_RemoveEfrags (&tent->ent);
-		tent->ent.efrag = 0;
+		tent->ent.visibility.efrag = 0;
 	}
 	free_temp_entities (cl_projectiles);
 	cl_projectiles = 0;
@@ -648,8 +658,8 @@ CL_ParseProjectiles (qboolean nail2)
 		tail = &tent->next;
 
 		pr = &tent->ent;
-		pr->model = cl.model_precache[cl_spikeindex];
-		pr->skin = 0;
+		pr->renderer.model = cl.model_precache[cl_spikeindex];
+		pr->renderer.skin = 0;
 		pr->origin[0] = ((bits[0] + ((bits[1] & 15) << 8)) << 1) - 4096;
 		pr->origin[1] = (((bits[1] >> 4) + (bits[2] << 4)) << 1) - 4096;
 		pr->origin[2] = ((bits[3] + ((bits[4] & 15) << 8)) << 1) - 4096;
diff --git a/qw/source/cl_view.c b/qw/source/cl_view.c
index 4ad5da14f..59e7920cd 100644
--- a/qw/source/cl_view.c
+++ b/qw/source/cl_view.c
@@ -617,7 +617,7 @@ V_CalcIntermissionRefdef (void)
 
 	VectorCopy (origin, r_data->refdef->vieworg);
 	VectorCopy (angles, r_data->refdef->viewangles);
-	view->model = NULL;
+	view->renderer.model = NULL;
 
 	// always idle in intermission
 	old = v_idlescale->value;
@@ -700,12 +700,13 @@ V_CalcRefdef (void)
 	else if (r_data->scr_viewsize->int_val == 80)
 		view->origin[2] += 0.5;
 
-	if (view_message->pls.flags & (PF_GIB | PF_DEAD))
-		view->model = NULL;
-	else
-		view->model = cl.model_precache[cl.stats[STAT_WEAPON]];
-	view->frame = view_message->pls.weaponframe;
-	view->skin = 0;
+	if (view_message->pls.flags & (PF_GIB | PF_DEAD)) {
+		view->renderer.model = NULL;
+	} else {
+		view->renderer.model = cl.model_precache[cl.stats[STAT_WEAPON]];
+	}
+	view->animation.frame = view_message->pls.weaponframe;
+	view->renderer.skin = 0;
 
 	// set up the refresh position
 	VectorAdd (r_data->refdef->viewangles, cl.punchangle,
diff --git a/ruamoko/qwaq/Makemodule.am b/ruamoko/qwaq/Makemodule.am
index bcb97af94..781db5c76 100644
--- a/ruamoko/qwaq/Makemodule.am
+++ b/ruamoko/qwaq/Makemodule.am
@@ -65,6 +65,7 @@ qwaq_cl_plugin_libs= \
 	@client_static_plugin_libs@
 
 qwaq_client_libs= \
+	$(top_builddir)/libs/entity/libQFentity.la \
 	$(top_builddir)/libs/console/libQFconsole.la \
 	$(top_builddir)/libs/video/targets/libQFjs.la \
 	$(top_builddir)/libs/audio/libQFcd.la \

From 098ceed5ff6213e515259ddcee3b5e024aab544f Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 10 Mar 2021 18:00:16 +0900
Subject: [PATCH 1465/1519] [client] Merge nq and qw temp entity handling

This finally gets cl_tent merged away.
---
 include/client/entities.h                     |   3 +
 include/client/temp_entities.h                | 119 ++++
 libs/client/Makemodule.am                     |   4 +-
 libs/client/cl_entities.c                     |  34 +
 .../client/cl_temp_entities.c                 | 448 ++++++++-----
 nq/include/client.h                           |  10 -
 nq/source/Makemodule.am                       |   2 +-
 nq/source/cl_ents.c                           |  40 +-
 nq/source/cl_main.c                           |   8 +-
 nq/source/cl_parse.c                          |  15 +-
 nq/source/cl_tent.c                           | 630 ------------------
 nq/source/cl_view.c                           |   2 +-
 qw/include/Makemodule.am                      |   1 -
 qw/include/cl_ents.h                          |   4 +-
 qw/include/cl_parse.h                         |   1 -
 qw/include/cl_tent.h                          |  38 --
 qw/source/Makemodule.am                       |   2 +-
 qw/source/cl_entparse.c                       |   3 +-
 qw/source/cl_ents.c                           |  49 +-
 qw/source/cl_main.c                           |   3 +-
 qw/source/cl_parse.c                          |  21 +-
 qw/source/cl_view.c                           |   2 +-
 22 files changed, 482 insertions(+), 957 deletions(-)
 create mode 100644 include/client/temp_entities.h
 rename qw/source/cl_tent.c => libs/client/cl_temp_entities.c (54%)
 delete mode 100644 nq/source/cl_tent.c
 delete mode 100644 qw/include/cl_tent.h

diff --git a/include/client/entities.h b/include/client/entities.h
index ae046b8c4..1dba394d6 100644
--- a/include/client/entities.h
+++ b/include/client/entities.h
@@ -67,4 +67,7 @@ extern entstates_t qw_entstates;
 
 extern vec3_t ent_colormod[256];
 
+struct entity_s;
+void CL_TransformEntity (struct entity_s *ent, const vec3_t angles);
+
 #endif//__client_entities_h
diff --git a/include/client/temp_entities.h b/include/client/temp_entities.h
new file mode 100644
index 000000000..c4dbc0868
--- /dev/null
+++ b/include/client/temp_entities.h
@@ -0,0 +1,119 @@
+/*
+	temp_entities.h
+
+	Temporary entity management
+
+	Copyright (C) 2021 Bill Currie <bill@taniwha.org>
+
+	Author: Bill Currie <bill@taniwha.org>
+	Date: 2021/3/10
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifndef __client_temp_entities_h
+#define __client_temp_entities_h
+
+#include "QF/simd/vec4f.h"
+
+typedef enum TE_Effect {
+	TE_NoEffect,		// for invalid nq/qw -> qf mapping
+	TE_Beam,			// grappling hook beam
+	TE_Blood,			// bullet hitting body
+	TE_Explosion,		// rocket explosion
+	TE_Explosion2,		// color mapped explosion
+	TE_Explosion3,		// Nehahra colored light explosion
+	TE_Gunshot1,		// NQ gunshot (20 particles)
+	TE_Gunshot2,		// QW gunshot (has particle count)
+	TE_KnightSpike,		// spike hitting wall
+	TE_LavaSplash,
+	TE_Lightning1,		// lightning bolts
+	TE_Lightning2,		// lightning bolts
+	TE_Lightning3,		// lightning bolts
+	TE_Lightning4,		// Nehahra lightning
+	TE_LightningBlood,	// lightning hitting body
+	TE_Spike,			// spike hitting wall
+	TE_SuperSpike,		// super spike hitting wall
+	TE_TarExplosion,	// tarbaby explosion
+	TE_Teleport,
+	TE_WizSpike,		// spike hitting wall
+} TE_Effect;
+
+typedef enum TE_nqEffect {
+	TE_nqSpike,
+	TE_nqSuperSpike,
+	TE_nqGunshot,
+	TE_nqExplosion,
+	TE_nqTarExplosion,
+	TE_nqLightning1,
+	TE_nqLightning2,
+	TE_nqWizSpike,
+	TE_nqKnightSpike,
+	TE_nqLightning3,
+	TE_nqLavaSplash,
+	TE_nqTeleport,
+	TE_nqExplosion2,
+	TE_nqBeam,
+	TE_nqExplosion3 = 16,
+	TE_nqLightning4,
+} TE_nqEffect;
+
+typedef enum TE_qwEffect {
+	TE_qwSpike,
+	TE_qwSuperSpike,
+	TE_qwGunshot,
+	TE_qwExplosion,
+	TE_qwTarExplosion,
+	TE_qwLightning1,
+	TE_qwLightning2,
+	TE_qwWizSpike,
+	TE_qwKnightSpike,
+	TE_qwLightning3,
+	TE_qwLavaSplash,
+	TE_qwTeleport,
+	TE_qwBlood,
+	TE_qwLightningBlood,
+	TE_qwExplosion2 = 16,
+	TE_qwBeam,
+} TE_qwEffect;
+
+//FIXME find a better way to get this info from the parser
+typedef struct TEntContext_s {
+	vec4f_t     simorg;
+	struct model_s *worldModel;
+	int         playerEntity;
+} TEntContext_t;
+
+struct msg_s;
+struct entity_s;
+
+void CL_TEnts_Init (void);
+void CL_Init_Entity (struct entity_s *ent);
+void CL_ClearTEnts (void);
+void CL_UpdateTEnts (double time, TEntContext_t *ctx);
+void CL_ParseTEnt_nq (struct msg_s *net_message, double time,
+					  TEntContext_t *ctx);
+void CL_ParseTEnt_qw (struct msg_s *net_message, double time,
+					  TEntContext_t *ctx);
+void CL_ParseParticleEffect (struct msg_s *net_message);
+void CL_ClearProjectiles (void);
+void CL_ParseProjectiles (struct msg_s *net_message, qboolean nail2,
+						  TEntContext_t *ctx);
+
+#endif//__client_temp_entities_h
diff --git a/libs/client/Makemodule.am b/libs/client/Makemodule.am
index 962430a4b..9129b9dbd 100644
--- a/libs/client/Makemodule.am
+++ b/libs/client/Makemodule.am
@@ -3,4 +3,6 @@ noinst_LTLIBRARIES += libs/client/libQFclient.la
 libs_client_libQFclient_la_LDFLAGS=	@STATIC@
 libs_client_libQFclient_la_LIBADD=	libs/gamecode/libQFgamecode.la libs/util/libQFutil.la
 libs_client_libQFclient_la_SOURCES= \
-		libs/client/cl_entities.c
+		libs/client/cl_temp_entities.c \
+		libs/client/cl_entities.c \
+		$e
diff --git a/libs/client/cl_entities.c b/libs/client/cl_entities.c
index 01397321a..837cfbe60 100644
--- a/libs/client/cl_entities.c
+++ b/libs/client/cl_entities.c
@@ -31,6 +31,10 @@
 # include "config.h"
 #endif
 
+#include "QF/entity.h"
+#include "QF/render.h" //FIXME for entity_t
+#include "QF/simd/vec4f.h"
+
 #include "client/entities.h"
 
 /*  QW has a max of 512 entities and wants 64 frames of data per entity, plus
@@ -340,3 +344,33 @@ vec3_t ent_colormod[256] = {
 	{1, 1, 0.666667},
 	{1, 1, 1}
 };
+
+void
+CL_TransformEntity (entity_t *ent, const vec3_t angles)
+{
+	union {
+		quat_t      q;
+		vec4f_t     v;
+	}           rotation;
+	vec4f_t     position;
+	vec4f_t     scale;
+
+	VectorCopy (ent->origin, position);
+	position[3] = 1;
+	VectorSet (ent->scale, ent->scale, ent->scale, scale);
+	scale[3] = 1;
+	if (VectorIsZero (angles)) {
+		QuatSet (0, 0, 0, 1, rotation.q);
+	} else {
+		vec3_t      ang;
+		VectorCopy (angles, ang);
+		if (ent->renderer.model && ent->renderer.model->type == mod_alias) {
+			// stupid quake bug
+			// why, oh, why, do alias models pitch in the opposite direction
+			// to everything else?
+			ang[PITCH] = -ang[PITCH];
+		}
+		AngleQuat (ang, rotation.q);
+	}
+	Transform_SetLocalTransform (ent->transform, scale, rotation.v, position);
+}
diff --git a/qw/source/cl_tent.c b/libs/client/cl_temp_entities.c
similarity index 54%
rename from qw/source/cl_tent.c
rename to libs/client/cl_temp_entities.c
index e44ec9b3a..a0627e42d 100644
--- a/qw/source/cl_tent.c
+++ b/libs/client/cl_temp_entities.c
@@ -1,9 +1,12 @@
 /*
-	cl_tent.c
+	cl_temp_entities.c
 
-	client side temporary entities
+	Client side temporary entity management
 
-	Copyright (C) 1996-1997  Id Software, Inc.
+	Copyright (C) 2021 Bill Currie <bill@taniwha.org>
+
+	Author: Bill Currie <bill@taniwha.org>
+	Date: 2021/3/10
 
 	This program is free software; you can redistribute it and/or
 	modify it under the terms of the GNU General Public License
@@ -27,7 +30,6 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif
@@ -35,23 +37,16 @@
 # include <strings.h>
 #endif
 
-#include <math.h>
-#include <stdlib.h>
-
-#include "QF/console.h"
 #include "QF/entity.h"
-#include "QF/model.h"
 #include "QF/msg.h"
+#include "QF/quakefs.h"
+#include "QF/render.h"
 #include "QF/sound.h"
-#include "QF/sys.h"
 
-#include "compat.h"
+#include "QF/plugin/vid_render.h"	//FIXME
 
-#include "qw/include/cl_ents.h"
-#include "qw/include/cl_main.h"
-#include "qw/include/cl_parse.h"
-#include "qw/include/cl_tent.h"
-#include "qw/include/client.h"
+#include "client/entities.h"
+#include "client/temp_entities.h"
 
 typedef struct tent_s {
 	struct tent_s *next;
@@ -94,28 +89,29 @@ static tent_t *cl_projectiles;
 static sfx_t *cl_sfx_wizhit;
 static sfx_t *cl_sfx_knighthit;
 static sfx_t *cl_sfx_tink1;
-static sfx_t *cl_sfx_ric1;
-static sfx_t *cl_sfx_ric2;
-static sfx_t *cl_sfx_ric3;
 static sfx_t *cl_sfx_r_exp3;
+static sfx_t *cl_sfx_ric[4];
 
 static model_t *cl_mod_beam;
 static model_t *cl_mod_bolt;
 static model_t *cl_mod_bolt2;
 static model_t *cl_mod_bolt3;
 static model_t *cl_spr_explod;
+static model_t *cl_spike;
 
 static void
 CL_TEnts_Precache (int phase)
 {
-	if (!phase)
+	if (!phase) {
 		return;
+	}
 	cl_sfx_wizhit = S_PrecacheSound ("wizard/hit.wav");
 	cl_sfx_knighthit = S_PrecacheSound ("hknight/hit.wav");
 	cl_sfx_tink1 = S_PrecacheSound ("weapons/tink1.wav");
-	cl_sfx_ric1 = S_PrecacheSound ("weapons/ric1.wav");
-	cl_sfx_ric2 = S_PrecacheSound ("weapons/ric2.wav");
-	cl_sfx_ric3 = S_PrecacheSound ("weapons/ric3.wav");
+	cl_sfx_ric[3] = S_PrecacheSound ("weapons/ric1.wav");
+	cl_sfx_ric[2] = S_PrecacheSound ("weapons/ric2.wav");
+	cl_sfx_ric[1] = S_PrecacheSound ("weapons/ric3.wav");
+	cl_sfx_ric[0] = cl_sfx_ric[1];
 	cl_sfx_r_exp3 = S_PrecacheSound ("weapons/r_exp3.wav");
 
 	cl_mod_bolt = Mod_ForName ("progs/bolt.mdl", true);
@@ -123,8 +119,11 @@ CL_TEnts_Precache (int phase)
 	cl_mod_bolt3 = Mod_ForName ("progs/bolt3.mdl", true);
 	cl_spr_explod = Mod_ForName ("progs/s_explod.spr", true);
 	cl_mod_beam = Mod_ForName ("progs/beam.mdl", false);
-	if (!cl_mod_beam)
+	cl_spike = Mod_ForName ("progs/spike.mdl", false);
+
+	if (!cl_mod_beam) {
 		cl_mod_beam = cl_mod_bolt;
+	}
 }
 
 void
@@ -214,23 +213,23 @@ free_tent_objects (tent_obj_t *tobjs)
 void
 CL_ClearTEnts (void)
 {
-	tent_t     *t;
-	tent_obj_t *to;
+	tent_t     *tent;
+	tent_obj_t *tobj;
 
-	for (to = cl_beams; to; to = to->next) {
-		for (t = to->to.beam.tents; t; t = t->next) {
-			t->ent.visibility.efrag = 0;
+	for (tobj = cl_beams; tobj; tobj = tobj->next) {
+		for (tent = tobj->to.beam.tents; tent; tent = tent->next) {
+			tent->ent.visibility.efrag = 0;
 		}
-		free_temp_entities (to->to.beam.tents);
+		free_temp_entities (tobj->to.beam.tents);
 	}
 	free_tent_objects (cl_beams);
 	cl_beams = 0;
 
-	for (to = cl_explosions; to; to = to->next) {
-		for (t = to->to.ex.tent; t; t = t->next) {
-			t->ent.visibility.efrag = 0;
+	for (tobj = cl_explosions; tobj; tobj = tobj->next) {
+		for (tent = tobj->to.ex.tent; tent; tent = tent->next) {
+			tent->ent.visibility.efrag = 0;
 		}
-		free_temp_entities (to->to.ex.tent);
+		free_temp_entities (tobj->to.ex.tent);
 	}
 	free_tent_objects (cl_explosions);
 	cl_explosions = 0;
@@ -252,7 +251,7 @@ beam_clear (beam_t *b)
 }
 
 static inline void
-beam_setup (beam_t *b, qboolean transform)
+beam_setup (beam_t *b, qboolean transform, double time, TEntContext_t *ctx)
 {
 	tent_t     *tent;
 	float       forward, pitch, yaw, d;
@@ -287,8 +286,7 @@ beam_setup (beam_t *b, qboolean transform)
 	ent_count = ceil (d / 30);
 	d = 0;
 
-	seed = b->seed + ((int) (cl.time * BEAM_SEED_INTERVAL) %
-					  BEAM_SEED_INTERVAL);
+	seed = b->seed + ((int) (time * BEAM_SEED_INTERVAL) % BEAM_SEED_INTERVAL);
 
 	ang[ROLL] = 0;
 	while (ent_count--) {
@@ -304,15 +302,15 @@ beam_setup (beam_t *b, qboolean transform)
 		if (transform) {
 			seed = seed * BEAM_SEED_PRIME;
 			ang[ROLL] = seed % 360;
-			CL_TransformEntity (&tent->ent, ang, true);
+			CL_TransformEntity (&tent->ent, ang);
 		}
 		VectorCopy (ang, tent->ent.angles);
-		r_funcs->R_AddEfrags (&cl.worldmodel->brush, &tent->ent);
+		r_funcs->R_AddEfrags (&ctx->worldModel->brush, &tent->ent);
 	}
 }
 
 static void
-CL_ParseBeam (model_t *m)
+CL_ParseBeam (qmsg_t *net_message, model_t *m, double time, TEntContext_t *ctx)
 {
 	tent_obj_t *to;
 	beam_t     *b;
@@ -326,9 +324,11 @@ CL_ParseBeam (model_t *m)
 
 	to = 0;
 	if (ent) {
-		for (to = cl_beams; to; to = to->next)
-			if (to->to.beam.entity == ent)
+		for (to = cl_beams; to; to = to->next) {
+			if (to->to.beam.entity == ent) {
 				break;
+			}
+		}
 	}
 	if (!to) {
 		to = new_tent_object ();
@@ -341,93 +341,60 @@ CL_ParseBeam (model_t *m)
 
 	beam_clear (b);
 	b->model = m;
-	b->endtime = cl.time + 0.2;
+	b->endtime = time + 0.2;
 	b->seed = rand ();
 	VectorCopy (end, b->end);
-	if (b->entity != cl.viewentity) {
+	if (b->entity != ctx->playerEntity) {
 		// this will be done in CL_UpdateBeams
 		VectorCopy (start, b->start);
-		beam_setup (b, true);
+		beam_setup (b, true, time, ctx);
 	}
 }
 
-void
-CL_ParseTEnt (void)
+static void
+parse_tent (qmsg_t *net_message, double time, TEntContext_t *ctx,
+			TE_Effect type)
 {
-	byte        type;
 	dlight_t   *dl;
 	tent_obj_t *to;
 	explosion_t *ex;
 	int         colorStart, colorLength;
-	int         cnt = -1;
-	vec3_t      pos;
-	sfx_t      *spike_sound[] = {
-		cl_sfx_ric3, cl_sfx_ric3, cl_sfx_ric2, cl_sfx_ric1,
-	};
+	quat_t      color;
+	vec3_t      position;
+	int         count;
+	const char *name;
 
-	type = MSG_ReadByte (net_message);
 	switch (type) {
-		case TE_WIZSPIKE:				// spike hitting wall
-			MSG_ReadCoordV (net_message, pos);
-			r_funcs->particles->R_WizSpikeEffect (pos);
-			S_StartSound (-1, 0, cl_sfx_wizhit, pos, 1, 1);
+		case TE_NoEffect:
+			// invalid mapping, can't do anything
 			break;
-
-		case TE_KNIGHTSPIKE:			// spike hitting wall
-			MSG_ReadCoordV (net_message, pos);
-			r_funcs->particles->R_KnightSpikeEffect (pos);
-			S_StartSound (-1, 0, cl_sfx_knighthit, pos, 1, 1);
+		case TE_Beam:
+			CL_ParseBeam (net_message, cl_mod_beam, time, ctx);
 			break;
-
-		case TE_SPIKE:					// spike hitting wall
-			MSG_ReadCoordV (net_message, pos);
-			r_funcs->particles->R_SpikeEffect (pos);
-			{
-				int		i;
-				sfx_t  *sound;
-
-				i = (rand () % 20) - 16;
-				if (i >= 0)
-					sound = spike_sound[i];
-				else
-					sound = cl_sfx_tink1;
-				S_StartSound (-1, 0, sound, pos, 1, 1);
-			}
+		case TE_Blood:
+			count = MSG_ReadByte (net_message) * 20;
+			MSG_ReadCoordV (net_message, position);
+			r_funcs->particles->R_BloodPuffEffect (position, count);
 			break;
+		case TE_Explosion:
+			MSG_ReadCoordV (net_message, position);
 
-		case TE_SUPERSPIKE:				// super spike hitting wall
-			MSG_ReadCoordV (net_message, pos);
-			r_funcs->particles->R_SuperSpikeEffect (pos);
-			{
-				int		i;
-				sfx_t  *sound;
-
-				i = (rand () % 20) - 16;
-				if (i >= 0)
-					sound = spike_sound[i];
-				else
-					sound = cl_sfx_tink1;
-				S_StartSound (-1, 0, sound, pos, 1, 1);
-			}
-			break;
-
-		case TE_EXPLOSION:				// rocket explosion
 			// particles
-			MSG_ReadCoordV (net_message, pos);
-			r_funcs->particles->R_ParticleExplosion (pos);
+			r_funcs->particles->R_ParticleExplosion (position);
 
 			// light
 			dl = r_funcs->R_AllocDlight (0);
 			if (dl) {
-				VectorCopy (pos, dl->origin);
+				VectorCopy (position, dl->origin);
 				dl->radius = 350;
-				dl->die = cl.time + 0.5;
+				dl->die = time + 0.5;
 				dl->decay = 300;
 				QuatSet (0.86, 0.31, 0.24, 0.7, dl->color);
+				//FIXME? nq: QuatSet (1.0, 0.5, 0.25, 0.7, dl->color);
 			}
 
 			// sound
-			S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1);
+			S_StartSound (-1, 0, cl_sfx_r_exp3, position, 1, 1);
 
 			// sprite
 			to = new_tent_object ();
@@ -436,105 +403,201 @@ CL_ParseTEnt (void)
 			ex = &to->to.ex;
 			ex->tent = new_temp_entity ();
 
-			VectorCopy (pos, ex->tent->ent.origin);
-			ex->start = cl.time;
+			VectorCopy (position, ex->tent->ent.origin);
+			ex->start = time;
 			//FIXME need better model management
-			if (!cl_spr_explod->cache.data)
+			if (!cl_spr_explod->cache.data) {
 				cl_spr_explod = Mod_ForName ("progs/s_explod.spr", true);
+			}
 			ex->tent->ent.renderer.model = cl_spr_explod;
-			CL_TransformEntity (&ex->tent->ent, ex->tent->ent.angles, true);
+			CL_TransformEntity (&ex->tent->ent, ex->tent->ent.angles);
 			break;
-
-		case TE_TAREXPLOSION:			// tarbaby explosion
-			MSG_ReadCoordV (net_message, pos);
-			r_funcs->particles->R_BlobExplosion (pos);
-
-			S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1);
-			break;
-
-		case TE_LIGHTNING1:				// lightning bolts
-			CL_ParseBeam (cl_mod_bolt);
-			break;
-
-		case TE_LIGHTNING2:				// lightning bolts
-			CL_ParseBeam (cl_mod_bolt2);
-			break;
-
-		case TE_LIGHTNING3:				// lightning bolts
-			CL_ParseBeam (cl_mod_bolt3);
-			break;
-
-		// PGM 01/21/97
-		case TE_BEAM:					// grappling hook beam
-			CL_ParseBeam (cl_mod_beam);
-			break;
-		// PGM 01/21/97
-
-		case TE_LAVASPLASH:
-			MSG_ReadCoordV (net_message, pos);
-			r_funcs->particles->R_LavaSplash (pos);
-			break;
-
-		case TE_TELEPORT:
-			MSG_ReadCoordV (net_message, pos);
-			r_funcs->particles->R_TeleportSplash (pos);
-			break;
-
-		case TE_EXPLOSION2:				// color mapped explosion
-			MSG_ReadCoordV (net_message, pos);
+		case TE_Explosion2:
+			MSG_ReadCoordV (net_message, position);
 			colorStart = MSG_ReadByte (net_message);
 			colorLength = MSG_ReadByte (net_message);
-			S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1);
-			r_funcs->particles->R_ParticleExplosion2 (pos, colorStart,
+			S_StartSound (-1, 0, cl_sfx_r_exp3, position, 1, 1);
+			r_funcs->particles->R_ParticleExplosion2 (position, colorStart,
 													  colorLength);
 			dl = r_funcs->R_AllocDlight (0);
 			if (!dl)
 				break;
-			VectorCopy (pos, dl->origin);
+			VectorCopy (position, dl->origin);
 			dl->radius = 350;
-			dl->die = cl.time + 0.5;
+			dl->die = time + 0.5;
 			dl->decay = 300;
 			colorStart = (colorStart + (rand () % colorLength)) * 3;
 			VectorScale (&r_data->vid->palette[colorStart], 1.0 / 255.0,
 						 dl->color);
 			dl->color[3] = 0.7;
 			break;
-
-		case TE_GUNSHOT:				// bullet hitting wall
-			cnt = MSG_ReadByte (net_message) * 20;
-			MSG_ReadCoordV (net_message, pos);
-			r_funcs->particles->R_GunshotEffect (pos, cnt);
+		case TE_Explosion3:
+			MSG_ReadCoordV (net_message, position);
+			MSG_ReadCoordV (net_message, color);		// OUCH!
+			color[3] = 0.7;
+			r_funcs->particles->R_ParticleExplosion (position);
+			S_StartSound (-1, 0, cl_sfx_r_exp3, position, 1, 1);
+			dl = r_funcs->R_AllocDlight (0);
+			if (dl) {
+				VectorCopy (position, dl->origin);
+				dl->radius = 350;
+				dl->die = time + 0.5;
+				dl->decay = 300;
+				QuatCopy (color, dl->color);
+			}
 			break;
-
-		case TE_BLOOD:					// bullet hitting body
-			cnt = MSG_ReadByte (net_message) * 20;
-			MSG_ReadCoordV (net_message, pos);
-			r_funcs->particles->R_BloodPuffEffect (pos, cnt);
+		case TE_Gunshot1:
+			MSG_ReadCoordV (net_message, position);
+			r_funcs->particles->R_GunshotEffect (position, 20);
 			break;
-
-		case TE_LIGHTNINGBLOOD:			// lightning hitting body
-			MSG_ReadCoordV (net_message, pos);
+		case TE_Gunshot2:
+			count = MSG_ReadByte (net_message) * 20;
+			MSG_ReadCoordV (net_message, position);
+			r_funcs->particles->R_GunshotEffect (position, count);
+			break;
+		case TE_KnightSpike:
+			MSG_ReadCoordV (net_message, position);
+			r_funcs->particles->R_KnightSpikeEffect (position);
+			S_StartSound (-1, 0, cl_sfx_knighthit, position, 1, 1);
+			break;
+		case TE_LavaSplash:
+			MSG_ReadCoordV (net_message, position);
+			r_funcs->particles->R_LavaSplash (position);
+			break;
+		case TE_Lightning1:
+			CL_ParseBeam (net_message, cl_mod_bolt, time, ctx);
+			break;
+		case TE_Lightning2:
+			CL_ParseBeam (net_message, cl_mod_bolt2, time, ctx);
+			break;
+		case TE_Lightning3:
+			CL_ParseBeam (net_message, cl_mod_bolt3, time, ctx);
+			break;
+		case TE_Lightning4:
+			name = MSG_ReadString (net_message);
+			CL_ParseBeam (net_message, Mod_ForName (name, true), time, ctx);
+			break;
+		case TE_LightningBlood:
+			MSG_ReadCoordV (net_message, position);
 
 			// light
 			dl = r_funcs->R_AllocDlight (0);
 			if (dl) {
-				VectorCopy (pos, dl->origin);
+				VectorCopy (position, dl->origin);
 				dl->radius = 150;
-				dl->die = cl.time + 0.1;
+				dl->die = time + 0.1;
 				dl->decay = 200;
 				QuatSet (0.25, 0.40, 0.65, 1, dl->color);
 			}
 
-			r_funcs->particles->R_LightningBloodEffect (pos);
+			r_funcs->particles->R_LightningBloodEffect (position);
 			break;
+		case TE_Spike:
+			MSG_ReadCoordV (net_message, position);
+			r_funcs->particles->R_SpikeEffect (position);
+			{
+				int		i;
+				sfx_t  *sound;
 
-		default:
-			Sys_Error ("CL_ParseTEnt: bad type %d", type);
+				i = (rand () % 20) - 16;
+				if (i >= 0) {
+					sound = cl_sfx_ric[i];
+				} else {
+					sound = cl_sfx_tink1;
+				}
+				S_StartSound (-1, 0, sound, position, 1, 1);
+			}
+			break;
+		case TE_SuperSpike:
+			MSG_ReadCoordV (net_message, position);
+			r_funcs->particles->R_SuperSpikeEffect (position);
+			{
+				int		i;
+				sfx_t  *sound;
+
+				i = (rand () % 20) - 16;
+				if (i >= 0) {
+					sound = cl_sfx_ric[i];
+				} else {
+					sound = cl_sfx_tink1;
+				}
+				S_StartSound (-1, 0, sound, position, 1, 1);
+			}
+			break;
+		case TE_TarExplosion:
+			MSG_ReadCoordV (net_message, position);
+			r_funcs->particles->R_BlobExplosion (position);
+
+			S_StartSound (-1, 0, cl_sfx_r_exp3, position, 1, 1);
+			break;
+		case TE_Teleport:
+			MSG_ReadCoordV (net_message, position);
+			r_funcs->particles->R_TeleportSplash (position);
+			break;
+		case TE_WizSpike:
+			MSG_ReadCoordV (net_message, position);
+			r_funcs->particles->R_WizSpikeEffect (position);
+			S_StartSound (-1, 0, cl_sfx_wizhit, position, 1, 1);
+			break;
 	}
 }
 
+// the effect type is a byte so a max of 256 values
+static const TE_Effect nqEffects[256] = {
+	[TE_nqSpike]        = TE_Spike,
+	[TE_nqSuperSpike]   = TE_SuperSpike,
+	[TE_nqGunshot]      = TE_Gunshot1,
+	[TE_nqExplosion]    = TE_Explosion,
+	[TE_nqTarExplosion] = TE_TarExplosion,
+	[TE_nqLightning1]   = TE_Lightning1,
+	[TE_nqLightning2]   = TE_Lightning2,
+	[TE_nqWizSpike]     = TE_WizSpike,
+	[TE_nqKnightSpike]  = TE_KnightSpike,
+	[TE_nqLightning3]   = TE_Lightning3,
+	[TE_nqLavaSplash]   = TE_LavaSplash,
+	[TE_nqTeleport]     = TE_Teleport,
+	[TE_nqExplosion2]   = TE_Explosion2,
+	[TE_nqBeam]         = TE_Beam,
+	[TE_nqExplosion3]   = TE_Explosion3,
+	[TE_nqLightning4]   = TE_Lightning4,
+};
+
+void
+CL_ParseTEnt_nq (qmsg_t *net_message, double time, TEntContext_t *ctx)
+{
+	byte        type = MSG_ReadByte (net_message);
+	parse_tent (net_message, time, ctx, nqEffects[type]);
+}
+
+// the effect type is a byte so a max of 256 values
+static const TE_Effect qwEffects[256] = {
+	[TE_qwSpike]          = TE_Spike,
+	[TE_qwSuperSpike]     = TE_SuperSpike,
+	[TE_qwGunshot]        = TE_Gunshot2,
+	[TE_qwExplosion]      = TE_Explosion,
+	[TE_qwTarExplosion]   = TE_TarExplosion,
+	[TE_qwLightning1]     = TE_Lightning1,
+	[TE_qwLightning2]     = TE_Lightning2,
+	[TE_qwWizSpike]       = TE_WizSpike,
+	[TE_qwKnightSpike]    = TE_KnightSpike,
+	[TE_qwLightning3]     = TE_Lightning3,
+	[TE_qwLavaSplash]     = TE_LavaSplash,
+	[TE_qwTeleport]       = TE_Teleport,
+	[TE_qwBlood]          = TE_Blood,
+	[TE_qwLightningBlood] = TE_LightningBlood,
+	[TE_qwExplosion2]     = TE_Explosion2,
+	[TE_qwBeam]           = TE_Beam,
+};
+
+void
+CL_ParseTEnt_qw (qmsg_t *net_message, double time, TEntContext_t *ctx)
+{
+	byte        type = MSG_ReadByte (net_message);
+	parse_tent (net_message, time, ctx, qwEffects[type]);
+}
+
 static void
-CL_UpdateBeams (void)
+CL_UpdateBeams (double time, TEntContext_t *ctx)
 {
 	tent_obj_t **to;
 	beam_t     *b;
@@ -546,7 +609,7 @@ CL_UpdateBeams (void)
 		b = &(*to)->to.beam;
 		if (!b->endtime)
 			continue;
-		if (!b->model || b->endtime < cl.time) {
+		if (!b->model || b->endtime < time) {
 			tent_obj_t *_to;
 			b->endtime = 0;
 			beam_clear (b);
@@ -559,26 +622,26 @@ CL_UpdateBeams (void)
 		to = &(*to)->next;
 
 		// if coming from the player, update the start position
-		if (b->entity == cl.viewentity) {
+		if (b->entity == ctx->playerEntity) {
 			beam_clear (b);
-			VectorCopy (cl.simorg, b->start);
-			beam_setup (b, false);
+			VectorCopy (ctx->simorg, b->start);
+			beam_setup (b, false, time, ctx);
 		}
 
-		seed = b->seed + ((int) (cl.time * BEAM_SEED_INTERVAL) %
+		seed = b->seed + ((int) (time * BEAM_SEED_INTERVAL) %
 						  BEAM_SEED_INTERVAL);
 
 		// add new entities for the lightning
 		for (t = b->tents; t; t = t->next) {
 			seed = seed * BEAM_SEED_PRIME;
 			t->ent.angles[ROLL] = seed % 360;
-			CL_TransformEntity (&t->ent, t->ent.angles, true);
+			CL_TransformEntity (&t->ent, t->ent.angles);
 		}
 	}
 }
 
 static void
-CL_UpdateExplosions (void)
+CL_UpdateExplosions (double time, TEntContext_t *ctx)
 {
 	int         f;
 	tent_obj_t **to;
@@ -588,7 +651,7 @@ CL_UpdateExplosions (void)
 	for (to = &cl_explosions; *to; ) {
 		ex = &(*to)->to.ex;
 		ent = &ex->tent->ent;
-		f = 10 * (cl.time - ex->start);
+		f = 10 * (time - ex->start);
 		if (f >= ent->renderer.model->numframes) {
 			tent_obj_t *_to;
 			r_funcs->R_RemoveEfrags (ent);
@@ -604,16 +667,39 @@ CL_UpdateExplosions (void)
 
 		ent->animation.frame = f;
 		if (!ent->visibility.efrag) {
-			r_funcs->R_AddEfrags (&cl.worldmodel->brush, ent);
+			r_funcs->R_AddEfrags (&ctx->worldModel->brush, ent);
 		}
 	}
 }
 
 void
-CL_UpdateTEnts (void)
+CL_UpdateTEnts (double time, TEntContext_t *ctx)
 {
-	CL_UpdateBeams ();
-	CL_UpdateExplosions ();
+	CL_UpdateBeams (time, ctx);
+	CL_UpdateExplosions (time, ctx);
+}
+
+/*
+	CL_ParseParticleEffect
+
+	Parse an effect out of the server message
+*/
+void
+CL_ParseParticleEffect (qmsg_t *net_message)
+{
+	int         i, count, color;
+	vec3_t      org, dir;
+
+	MSG_ReadCoordV (net_message, org);
+	for (i = 0; i < 3; i++)
+		dir[i] = ((signed char) MSG_ReadByte (net_message)) * (15.0 / 16.0);
+	count = MSG_ReadByte (net_message);
+	color = MSG_ReadByte (net_message);
+
+	if (count == 255)
+		r_funcs->particles->R_ParticleExplosion (org);
+	else
+		r_funcs->particles->R_RunParticleEffect (org, dir, color, count);
 }
 
 void
@@ -633,7 +719,7 @@ CL_ClearProjectiles (void)
 	Nails are passed as efficient temporary entities
 */
 void
-CL_ParseProjectiles (qboolean nail2)
+CL_ParseProjectiles (qmsg_t *net_message, qboolean nail2, TEntContext_t *ctx)
 {
 	tent_t     *tent;
 	tent_t     *head = 0, **tail = &head;
@@ -658,7 +744,7 @@ CL_ParseProjectiles (qboolean nail2)
 		tail = &tent->next;
 
 		pr = &tent->ent;
-		pr->renderer.model = cl.model_precache[cl_spikeindex];
+		pr->renderer.model = cl_spike;
 		pr->renderer.skin = 0;
 		pr->origin[0] = ((bits[0] + ((bits[1] & 15) << 8)) << 1) - 4096;
 		pr->origin[1] = (((bits[1] >> 4) + (bits[2] << 4)) << 1) - 4096;
@@ -666,9 +752,9 @@ CL_ParseProjectiles (qboolean nail2)
 		pr->angles[0] = (bits[4] >> 4) * (360.0 / 16.0);
 		pr->angles[1] = bits[5] * (360.0 / 256.0);
 		pr->angles[2] = 0;
-		CL_TransformEntity (&tent->ent, tent->ent.angles, true);
+		CL_TransformEntity (&tent->ent, tent->ent.angles);
 
-		r_funcs->R_AddEfrags (&cl.worldmodel->brush, &tent->ent);
+		r_funcs->R_AddEfrags (&ctx->worldModel->brush, &tent->ent);
 	}
 
 	*tail = cl_projectiles;
diff --git a/nq/include/client.h b/nq/include/client.h
index 817bebaf6..07c43ae87 100644
--- a/nq/include/client.h
+++ b/nq/include/client.h
@@ -304,10 +304,6 @@ void CL_Input_Init (void);
 void CL_SendCmd (void);
 void CL_SendMove (usercmd_t *cmd);
 
-void CL_ParseParticleEffect (void);
-void CL_ParseTEnt (void);
-void CL_UpdateTEnts (void);
-
 void CL_ClearState (void);
 
 int  CL_ReadFromServer (void);
@@ -344,13 +340,7 @@ void V_SetContentsColor (int contents);
 void V_PrepBlend (void);
 
 // cl_tent
-void CL_TEnts_Init (void);
-void CL_ClearTEnts (void);
-void CL_Init_Entity (struct entity_s *ent);
-void CL_ParseTEnt (void);
 void CL_SignonReply (void);
-void CL_TransformEntity (struct entity_s *ent, const vec3_t
-						 angles, qboolean force);
 void CL_RelinkEntities (void);
 void CL_ClearEnts (void);
 
diff --git a/nq/source/Makemodule.am b/nq/source/Makemodule.am
index 2da0c7fb4..6caa9fe32 100644
--- a/nq/source/Makemodule.am
+++ b/nq/source/Makemodule.am
@@ -70,7 +70,7 @@ nq_server_LIB_DEPS=$(nq_server_LIBFILES) $(nq_common_LIBFILES)
 
 nq_source_libnq_client_a_SOURCES= \
 		nq/source/cl_chase.c nq/source/cl_cmd.c nq/source/cl_demo.c nq/source/cl_ents.c nq/source/cl_input.c nq/source/cl_main.c \
-		nq/source/cl_screen.c nq/source/cl_parse.c nq/source/cl_tent.c nq/source/cl_view.c nq/source/sbar.c
+		nq/source/cl_screen.c nq/source/cl_parse.c nq/source/cl_view.c nq/source/sbar.c
 
 nq_source_libnq_server_a_SOURCES= \
 		nq/source/host.c nq/source/host_cmd.c nq/source/sv_cl_phys.c nq/source/sv_cvar.c nq/source/sv_main.c \
diff --git a/nq/source/cl_ents.c b/nq/source/cl_ents.c
index 933097913..3fdd3d0af 100644
--- a/nq/source/cl_ents.c
+++ b/nq/source/cl_ents.c
@@ -47,6 +47,8 @@
 
 #include "compat.h"
 
+#include "client/temp_entities.h"
+
 #include "nq/include/chase.h"
 #include "nq/include/client.h"
 #include "nq/include/host.h"
@@ -177,36 +179,6 @@ CL_LerpPoint (void)
 	return frac;
 }
 
-void
-CL_TransformEntity (entity_t *ent, const vec3_t angles, qboolean force)
-{
-	union {
-		quat_t      q;
-		vec4f_t     v;
-	}           rotation;
-	vec4f_t     position;
-	vec4f_t     scale;
-
-	VectorCopy (ent->origin, position);
-	position[3] = 1;
-	VectorSet (ent->scale, ent->scale, ent->scale, scale);
-	scale[3] = 1;
-	if (VectorIsZero (angles)) {
-		QuatSet (0, 0, 0, 1, rotation.q);
-	} else {
-		vec3_t      ang;
-		VectorCopy (angles, ang);
-		if (ent->renderer.model && ent->renderer.model->type == mod_alias) {
-			// stupid quake bug
-			// why, oh, why, do alias models pitch in the opposite direction
-			// to everything else?
-			ang[PITCH] = -ang[PITCH];
-		}
-		AngleQuat (ang, rotation.q);
-	}
-	Transform_SetLocalTransform (ent->transform, scale, rotation.v, position);
-}
-
 static void
 CL_ModelEffects (entity_t *ent, int num, int glow_color)
 {
@@ -392,7 +364,7 @@ CL_RelinkEntities (void)
 			animation->pose1 = animation->pose2 = -1;
 			VectorCopy (new->origin, ent->origin);
 			if (!(model_flags & EF_ROTATE))
-				CL_TransformEntity (ent, new->angles, true);
+				CL_TransformEntity (ent, new->angles);
 			if (i != cl.viewentity || chase_active->int_val) {
 				if (ent->visibility.efrag) {
 					r_funcs->R_RemoveEfrags (ent);
@@ -410,7 +382,7 @@ CL_RelinkEntities (void)
 				// assume a teleportation, not a motion
 				VectorCopy (new->origin, ent->origin);
 				if (!(model_flags & EF_ROTATE))
-					CL_TransformEntity (ent, new->angles, true);
+					CL_TransformEntity (ent, new->angles);
 				animation->pose1 = animation->pose2 = -1;
 			} else {
 				vec3_t      angles, d;
@@ -425,7 +397,7 @@ CL_RelinkEntities (void)
 							d[j] += 360;
 					}
 					VectorMultAdd (old->angles, f, d, angles);
-					CL_TransformEntity (ent, angles, false);
+					CL_TransformEntity (ent, angles);
 				}
 			}
 			if (i != cl.viewentity || chase_active->int_val) {
@@ -445,7 +417,7 @@ CL_RelinkEntities (void)
 			vec3_t      angles;
 			VectorCopy (new->angles, angles);
 			angles[YAW] = bobjrotate;
-			CL_TransformEntity (ent, angles, false);
+			CL_TransformEntity (ent, angles);
 		}
 		CL_EntityEffects (i, ent, new);
 		CL_NewDlight (i, ent->origin, new->effects, new->glow_size,
diff --git a/nq/source/cl_main.c b/nq/source/cl_main.c
index f31256138..25ff7bd39 100644
--- a/nq/source/cl_main.c
+++ b/nq/source/cl_main.c
@@ -52,6 +52,8 @@
 #include "clview.h"
 #include "sbar.h"
 
+#include "client/temp_entities.h"
+
 #include "nq/include/chase.h"
 #include "nq/include/cl_skin.h"
 #include "nq/include/client.h"
@@ -423,6 +425,10 @@ int
 CL_ReadFromServer (void)
 {
 	int         ret;
+	TEntContext_t tentCtx = {
+		{VectorExpand (cl_entities[cl.viewentity].origin), 1},
+		cl.worldmodel, cl.viewentity
+	};
 
 	cl.oldtime = cl.time;
 	cl.time += host_frametime;
@@ -442,7 +448,7 @@ CL_ReadFromServer (void)
 		Sys_Printf ("\n");
 
 	CL_RelinkEntities ();
-	CL_UpdateTEnts ();
+	CL_UpdateTEnts (cl.time, &tentCtx);
 
 	// bring the links up to date
 	return 0;
diff --git a/nq/source/cl_parse.c b/nq/source/cl_parse.c
index 10ac2d4f5..260920d13 100644
--- a/nq/source/cl_parse.c
+++ b/nq/source/cl_parse.c
@@ -53,6 +53,8 @@
 
 #include "QF/plugin/vid_render.h"
 
+#include "client/temp_entities.h"
+
 #include "compat.h"
 #include "sbar.h"
 
@@ -591,7 +593,7 @@ CL_ParseUpdate (int bits)
 		//VectorCopy (state->msg_origins[0], state->msg_origins[1]);
 		//VectorCopy (state->msg_origins[0], ent->origin);
 		//VectorCopy (state->msg_angles[0], state->msg_angles[1]);
-		//CL_TransformEntity (ent, state->msg_angles[0], true);
+		//CL_TransformEntity (ent, state->msg_angles[0]);
 		//state->forcelink = true;
 		cl_forcelink[num] = true;
 	}
@@ -793,7 +795,7 @@ CL_ParseStatic (int version)
 	ent->renderer.colormod[3] = ENTALPHA_DECODE (baseline.alpha);
 	ent->scale = baseline.scale / 16.0;
 	VectorCopy (baseline.origin, ent->origin);
-	CL_TransformEntity (ent, baseline.angles, true);
+	CL_TransformEntity (ent, baseline.angles);
 
 	r_funcs->R_AddEfrags (&cl.worldmodel->brush, ent);
 }
@@ -835,6 +837,11 @@ CL_ParseServerMessage (void)
 	static dstring_t *stuffbuf;
 	signon_t    so;
 
+	TEntContext_t tentCtx = {
+		{VectorExpand (cl_entities[cl.viewentity].origin), 1},
+		cl.worldmodel, cl.viewentity
+	};
+
 	// if recording demos, copy the message out
 	if (cl_shownet->int_val == 1)
 		Sys_Printf ("%i ", net_message->message->cursize);
@@ -1031,7 +1038,7 @@ CL_ParseServerMessage (void)
 				break;
 
 			case svc_particle:
-				CL_ParseParticleEffect ();
+				CL_ParseParticleEffect (net_message);
 				break;
 
 			case svc_damage:
@@ -1051,7 +1058,7 @@ CL_ParseServerMessage (void)
 				break;
 
 			case svc_temp_entity:
-				CL_ParseTEnt ();
+				CL_ParseTEnt_nq (net_message, cl.time, &tentCtx);
 				break;
 
 			case svc_setpause:
diff --git a/nq/source/cl_tent.c b/nq/source/cl_tent.c
deleted file mode 100644
index 3a8a1b899..000000000
--- a/nq/source/cl_tent.c
+++ /dev/null
@@ -1,630 +0,0 @@
-/*
-	cl_tent.c
-
-	client side temporary entities
-
-	Copyright (C) 1996-1997  Id Software, Inc.
-
-	This program is free software; you can redistribute it and/or
-	modify it under the terms of the GNU General Public License
-	as published by the Free Software Foundation; either version 2
-	of the License, or (at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-	See the GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to:
-
-		Free Software Foundation, Inc.
-		59 Temple Place - Suite 330
-		Boston, MA  02111-1307, USA
-
-*/
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#ifdef HAVE_STRING_H
-# include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-
-#include <math.h>
-#include <stdlib.h>
-
-#include "QF/entity.h"
-#include "QF/model.h"
-#include "QF/msg.h"
-#include "QF/sound.h"
-#include "QF/sys.h"
-
-#include "QF/plugin/vid_render.h"
-
-#include "compat.h"
-
-#include "nq/include/client.h"
-
-typedef struct tent_s {
-	struct tent_s *next;
-	entity_t    ent;
-} tent_t;
-
-#define TEMP_BATCH 64
-static tent_t *temp_entities = 0;
-
-typedef struct {
-	int         entity;
-	struct model_s *model;
-	float       endtime;
-	vec3_t      start, end;
-	tent_t     *tents;
-	int         seed;
-} beam_t;
-
-#define BEAM_SEED_INTERVAL 72
-#define BEAM_SEED_PRIME 3191
-
-typedef struct {
-	float       start;
-	tent_t     *tent;
-} explosion_t;
-
-typedef struct tent_obj_s {
-	struct tent_obj_s *next;
-	union {
-		beam_t      beam;
-		explosion_t ex;
-	} to;
-} tent_obj_t;
-
-static tent_obj_t *tent_objects;
-static tent_obj_t *cl_beams;
-static tent_obj_t *cl_explosions;
-
-static sfx_t *cl_sfx_wizhit;
-static sfx_t *cl_sfx_knighthit;
-static sfx_t *cl_sfx_tink1;
-static sfx_t *cl_sfx_ric1;
-static sfx_t *cl_sfx_ric2;
-static sfx_t *cl_sfx_ric3;
-static sfx_t *cl_sfx_r_exp3;
-
-static model_t *cl_mod_beam;
-static model_t *cl_mod_bolt;
-static model_t *cl_mod_bolt2;
-static model_t *cl_mod_bolt3;
-static model_t *cl_spr_explod;
-
-static void
-CL_TEnts_Precache (int phase)
-{
-	if (!phase)
-		return;
-	cl_sfx_wizhit = S_PrecacheSound ("wizard/hit.wav");
-	cl_sfx_knighthit = S_PrecacheSound ("hknight/hit.wav");
-	cl_sfx_tink1 = S_PrecacheSound ("weapons/tink1.wav");
-	cl_sfx_ric1 = S_PrecacheSound ("weapons/ric1.wav");
-	cl_sfx_ric2 = S_PrecacheSound ("weapons/ric2.wav");
-	cl_sfx_ric3 = S_PrecacheSound ("weapons/ric3.wav");
-	cl_sfx_r_exp3 = S_PrecacheSound ("weapons/r_exp3.wav");
-
-	cl_mod_bolt = Mod_ForName ("progs/bolt.mdl", true);
-	cl_mod_bolt2 = Mod_ForName ("progs/bolt2.mdl", true);
-	cl_mod_bolt3 = Mod_ForName ("progs/bolt3.mdl", true);
-	cl_spr_explod = Mod_ForName ("progs/s_explod.spr", true);
-	cl_mod_beam = Mod_ForName ("progs/beam.mdl", false);
-	if (!cl_mod_beam)
-		cl_mod_beam = cl_mod_bolt;
-}
-
-void
-CL_TEnts_Init (void)
-{
-	QFS_GamedirCallback (CL_TEnts_Precache);
-	CL_TEnts_Precache (1);
-}
-
-void
-CL_Init_Entity (entity_t *ent)
-{
-	if (ent->transform) {
-		Transform_Delete (ent->transform);
-	}
-	memset (ent, 0, sizeof (*ent));
-
-	ent->transform = Transform_New (0);
-	ent->renderer.skin = 0;
-	QuatSet (1.0, 1.0, 1.0, 1.0, ent->renderer.colormod);
-	ent->scale = 1.0;
-	ent->animation.pose1 = ent->animation.pose2 = -1;
-}
-
-static tent_t *
-new_temp_entity (void)
-{
-	tent_t     *tent;
-	if (!temp_entities) {
-		int         i;
-
-		temp_entities = malloc (TEMP_BATCH * sizeof (tent_t));
-		for (i = 0; i < TEMP_BATCH - 1; i++) {
-			temp_entities[i].next = &temp_entities[i + 1];
-			temp_entities[i].ent.transform = 0;
-		}
-		temp_entities[i].next = 0;
-		temp_entities[i].ent.transform = 0;
-	}
-	tent = temp_entities;
-	temp_entities = tent->next;
-	tent->next = 0;
-	CL_Init_Entity (&tent->ent);
-	return tent;
-}
-
-static void
-free_temp_entities (tent_t *tents)
-{
-	tent_t    **t = &tents;
-
-	while (*t)
-		t = &(*t)->next;
-	*t = temp_entities;
-	temp_entities = tents;
-}
-
-static tent_obj_t *
-new_tent_object (void)
-{
-	tent_obj_t *tobj;
-	if (!tent_objects) {
-		int         i;
-
-		tent_objects = malloc (TEMP_BATCH * sizeof (tent_obj_t));
-		for (i = 0; i < TEMP_BATCH - 1; i++)
-			tent_objects[i].next = &tent_objects[i + 1];
-		tent_objects[i].next = 0;
-	}
-	tobj = tent_objects;
-	tent_objects = tobj->next;
-	tobj->next = 0;
-	return tobj;
-}
-
-static void
-free_tent_objects (tent_obj_t *tobjs)
-{
-	tent_obj_t **t = &tobjs;
-
-	while (*t)
-		t = &(*t)->next;
-	*t = tent_objects;
-	tent_objects = tobjs;
-}
-
-void
-CL_ClearTEnts (void)
-{
-	tent_t     *t;
-	tent_obj_t *to;
-
-	for (to = cl_beams; to; to = to->next) {
-		for (t = to->to.beam.tents; t; t = t->next)
-			t->ent.visibility.efrag = 0;
-		free_temp_entities (to->to.beam.tents);
-	}
-	free_tent_objects (cl_beams);
-	cl_beams = 0;
-
-	for (to = cl_explosions; to; to = to->next) {
-		for (t = to->to.ex.tent; t; t = t->next)
-			t->ent.visibility.efrag = 0;
-		free_temp_entities (to->to.ex.tent);
-	}
-	free_tent_objects (cl_explosions);
-	cl_explosions = 0;
-}
-
-static inline void
-beam_clear (beam_t *b)
-{
-	if (b->tents) {
-		tent_t     *t;
-
-		for (t = b->tents; t; t = t->next) {
-			r_funcs->R_RemoveEfrags (&t->ent);
-			t->ent.visibility.efrag = 0;
-		}
-		free_temp_entities (b->tents);
-		b->tents = 0;
-	}
-}
-
-static inline void
-beam_setup (beam_t *b, qboolean transform)
-{
-	tent_t     *tent;
-	float       forward, pitch, yaw, d;
-	int         ent_count;
-	vec3_t      dist, org, ang;
-	unsigned    seed;
-
-	// calculate pitch and yaw
-	VectorSubtract (b->end, b->start, dist);
-
-	if (dist[1] == 0 && dist[0] == 0) {
-		yaw = 0;
-		if (dist[2] > 0)
-			pitch = 90;
-		else
-			pitch = 270;
-	} else {
-		yaw = (int) (atan2 (dist[1], dist[0]) * 180 / M_PI);
-		if (yaw < 0)
-			yaw += 360;
-
-		forward = sqrt (dist[0] * dist[0] + dist[1] * dist[1]);
-		pitch = (int) (atan2 (dist[2], forward) * 180 / M_PI);
-		if (pitch < 0)
-			pitch += 360;
-	}
-
-	// add new entities for the lightning
-	VectorCopy (b->start, org);
-	d = VectorNormalize (dist);
-	VectorScale (dist, 30, dist);
-	ent_count = ceil (d / 30);
-	d = 0;
-
-	seed = b->seed + ((int) (cl.time * BEAM_SEED_INTERVAL) %
-					  BEAM_SEED_INTERVAL);
-
-	ang[ROLL] = 0;
-	while (ent_count--) {
-		tent = new_temp_entity ();
-		tent->next = b->tents;
-		b->tents = tent;
-
-		VectorMultAdd (org, d, dist, tent->ent.origin);
-		d += 1.0;
-		tent->ent.renderer.model = b->model;
-		ang[PITCH] = pitch;
-		ang[YAW] = yaw;
-		if (transform) {
-			seed = seed * BEAM_SEED_PRIME;
-			ang[ROLL] = seed % 360;
-			CL_TransformEntity (&tent->ent, ang, true);
-		}
-		VectorCopy (ang, tent->ent.angles);
-		r_funcs->R_AddEfrags (&cl.worldmodel->brush, &tent->ent);
-	}
-}
-
-static void
-CL_ParseBeam (model_t *m)
-{
-	tent_obj_t *to;
-	beam_t     *b;
-	int         ent;
-	vec3_t      start, end;
-
-	ent = MSG_ReadShort (net_message);
-
-	MSG_ReadCoordV (net_message, start);
-	MSG_ReadCoordV (net_message, end);
-
-	to = 0;
-	if (ent) {
-		for (to = cl_beams; to; to = to->next)
-			if (to->to.beam.entity == ent)
-				break;
-	}
-	if (!to) {
-		to = new_tent_object ();
-		to->next = cl_beams;
-		cl_beams = to;
-		to->to.beam.tents = 0;
-		to->to.beam.entity = ent;
-	}
-	b = &to->to.beam;
-
-	beam_clear (b);
-	b->model = m;
-	b->endtime = cl.time + 0.2;
-	b->seed = rand ();
-	VectorCopy (end, b->end);
-	if (b->entity != cl.viewentity) {
-		// this will be done in CL_UpdateBeams
-		VectorCopy (start, b->start);
-		beam_setup (b, true);
-	}
-}
-
-void
-CL_ParseTEnt (void)
-{
-	byte        type;
-	dlight_t   *dl;
-	tent_obj_t *to;
-	explosion_t *ex;
-	int         colorStart, colorLength;
-	quat_t      col;
-	vec3_t      pos;
-	sfx_t      *spike_sound[] = {
-		cl_sfx_ric3, cl_sfx_ric3, cl_sfx_ric2, cl_sfx_ric1,
-	};
-
-	type = MSG_ReadByte (net_message);
-	switch (type) {
-		case TE_WIZSPIKE:				// spike hitting wall
-			MSG_ReadCoordV (net_message, pos);
-			r_funcs->particles->R_WizSpikeEffect (pos);
-			S_StartSound (-1, 0, cl_sfx_wizhit, pos, 1, 1);
-			break;
-
-		case TE_KNIGHTSPIKE:			// spike hitting wall
-			MSG_ReadCoordV (net_message, pos);
-			r_funcs->particles->R_KnightSpikeEffect (pos);
-			S_StartSound (-1, 0, cl_sfx_knighthit, pos, 1, 1);
-			break;
-
-		case TE_SPIKE:					// spike hitting wall
-			MSG_ReadCoordV (net_message, pos);
-			r_funcs->particles->R_SpikeEffect (pos);
-			{
-				int		i;
-				sfx_t  *sound;
-
-				i = (rand () % 20) - 16;
-				if (i >= 0)
-					sound = spike_sound[i];
-				else
-					sound = cl_sfx_tink1;
-				S_StartSound (-1, 0, sound, pos, 1, 1);
-			}
-			break;
-
-		case TE_SUPERSPIKE:				// super spike hitting wall
-			MSG_ReadCoordV (net_message, pos);
-			r_funcs->particles->R_SuperSpikeEffect (pos);
-			{
-				int		i;
-				sfx_t  *sound;
-
-				i = (rand () % 20) - 16;
-				if (i >= 0)
-					sound = spike_sound[i];
-				else
-					sound = cl_sfx_tink1;
-				S_StartSound (-1, 0, sound, pos, 1, 1);
-			}
-			break;
-
-		case TE_EXPLOSION:				// rocket explosion
-			// particles
-			MSG_ReadCoordV (net_message, pos);
-			r_funcs->particles->R_ParticleExplosion (pos);
-
-			// light
-			dl = r_funcs->R_AllocDlight (0);
-			if (dl) {
-				VectorCopy (pos, dl->origin);
-				dl->radius = 350;
-				dl->die = cl.time + 0.5;
-				dl->decay = 300;
-				QuatSet (1.0, 0.5, 0.25, 0.7, dl->color);
-			}
-
-			// sound
-			S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1);
-
-			// sprite
-			to = new_tent_object ();
-			to->next = cl_explosions;
-			cl_explosions = to;
-			ex = &to->to.ex;
-			ex->tent = new_temp_entity ();
-
-			VectorCopy (pos, ex->tent->ent.origin);
-			ex->start = cl.time;
-			//FIXME need better model management
-			if (!cl_spr_explod->cache.data)
-				cl_spr_explod = Mod_ForName ("progs/s_explod.spr", true);
-			ex->tent->ent.renderer.model = cl_spr_explod;
-			CL_TransformEntity (&ex->tent->ent, ex->tent->ent.angles, true);
-			break;
-
-		case TE_TAREXPLOSION:			// tarbaby explosion
-			MSG_ReadCoordV (net_message, pos);
-			r_funcs->particles->R_BlobExplosion (pos);
-
-			S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1);
-			break;
-
-		case TE_LIGHTNING1:				// lightning bolts
-			CL_ParseBeam (cl_mod_bolt);
-			break;
-
-		case TE_LIGHTNING2:				// lightning bolts
-			CL_ParseBeam (cl_mod_bolt2);
-			break;
-
-		case TE_LIGHTNING3:				// lightning bolts
-			CL_ParseBeam (cl_mod_bolt3);
-			break;
-
-		case TE_LIGHTNING4NEH:			// Nehahra lightning
-			CL_ParseBeam (Mod_ForName (MSG_ReadString (net_message), true));
-			break;
-
-		// PGM 01/21/97
-		case TE_BEAM:					// grappling hook beam
-			CL_ParseBeam (cl_mod_beam);
-			break;
-		// PGM 01/21/97
-
-		case TE_LAVASPLASH:
-			MSG_ReadCoordV (net_message, pos);
-			r_funcs->particles->R_LavaSplash (pos);
-			break;
-
-		case TE_TELEPORT:
-			MSG_ReadCoordV (net_message, pos);
-			r_funcs->particles->R_TeleportSplash (pos);
-			break;
-
-		case TE_EXPLOSION2:				// color mapped explosion
-			MSG_ReadCoordV (net_message, pos);
-			colorStart = MSG_ReadByte (net_message);
-			colorLength = MSG_ReadByte (net_message);
-			S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1);
-			r_funcs->particles->R_ParticleExplosion2 (pos, colorStart,
-													  colorLength);
-			dl = r_funcs->R_AllocDlight (0);
-			if (!dl)
-				break;
-			VectorCopy (pos, dl->origin);
-			dl->radius = 350;
-			dl->die = cl.time + 0.5;
-			dl->decay = 300;
-			colorStart = (colorStart + (rand () % colorLength)) * 3;
-			VectorScale (&r_data->vid->palette[colorStart], 1.0 / 255.0,
-						 dl->color);
-			dl->color[3] = 0.7;
-			break;
-
-		case TE_EXPLOSION3:				// Nehahra colored light explosion
-			MSG_ReadCoordV (net_message, pos);
-			MSG_ReadCoordV (net_message, col);			// OUCH!
-			col[3] = 0.7;
-			r_funcs->particles->R_ParticleExplosion (pos);
-			S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1);
-			dl = r_funcs->R_AllocDlight (0);
-			if (dl) {
-				VectorCopy (pos, dl->origin);
-				dl->radius = 350;
-				dl->die = cl.time + 0.5;
-				dl->decay = 300;
-				QuatCopy (col, dl->color);
-			}
-			break;
-
-		case TE_GUNSHOT:				// bullet hitting wall
-			MSG_ReadCoordV (net_message, pos);
-			r_funcs->particles->R_GunshotEffect (pos, 20);
-			break;
-
-		default:
-			Sys_Error ("CL_ParseTEnt: bad type %d", type);
-	}
-}
-
-static void
-CL_UpdateBeams (void)
-{
-	tent_obj_t **to;
-	beam_t     *b;
-	unsigned    seed;
-	tent_t     *t;
-
-	// update lightning
-	for (to = &cl_beams; *to; ) {
-		b = &(*to)->to.beam;
-		if (!b->endtime)
-			continue;
-		if (!b->model || b->endtime < cl.time) {
-			tent_obj_t *_to;
-			b->endtime = 0;
-			beam_clear (b);
-			_to = *to;
-			*to = _to->next;
-			_to->next = tent_objects;
-			tent_objects = _to;
-			continue;
-		}
-		to = &(*to)->next;
-
-		// if coming from the player, update the start position
-		if (b->entity == cl.viewentity) {
-			beam_clear (b);
-			VectorCopy (cl_entities[cl.viewentity].origin, b->start);
-			beam_setup (b, false);
-		}
-
-		seed = b->seed + ((int) (cl.time * BEAM_SEED_INTERVAL) %
-						  BEAM_SEED_INTERVAL);
-
-		// add new entities for the lightning
-		for (t = b->tents; t; t = t->next) {
-			seed = seed * BEAM_SEED_PRIME;
-			t->ent.angles[ROLL] = seed % 360;
-			CL_TransformEntity (&t->ent, t->ent.angles, true);
-		}
-	}
-}
-
-static void
-CL_UpdateExplosions (void)
-{
-	int         f;
-	tent_obj_t **to;
-	explosion_t *ex;
-	entity_t   *ent;
-
-	for (to = &cl_explosions; *to; ) {
-		ex = &(*to)->to.ex;
-		ent = &ex->tent->ent;
-		f = 10 * (cl.time - ex->start);
-		if (f >= ent->renderer.model->numframes) {
-			tent_obj_t *_to;
-			r_funcs->R_RemoveEfrags (ent);
-			ent->visibility.efrag = 0;
-			free_temp_entities (ex->tent);
-			_to = *to;
-			*to = _to->next;
-			_to->next = tent_objects;
-			tent_objects = _to;
-			continue;
-		}
-		to = &(*to)->next;
-
-		ent->animation.frame = f;
-		if (!ent->visibility.efrag)
-			r_funcs->R_AddEfrags (&cl.worldmodel->brush, ent);
-	}
-}
-
-void
-CL_UpdateTEnts (void)
-{
-	CL_UpdateBeams ();
-	CL_UpdateExplosions ();
-}
-
-/*
-	CL_ParseParticleEffect
-
-	Parse an effect out of the server message
-*/
-void
-CL_ParseParticleEffect (void)
-{
-	int         i, count, color;
-	vec3_t      org, dir;
-
-	MSG_ReadCoordV (net_message, org);
-	for (i = 0; i < 3; i++)
-		dir[i] = ((signed char) MSG_ReadByte (net_message)) * (15.0 / 16.0);
-	count = MSG_ReadByte (net_message);
-	color = MSG_ReadByte (net_message);
-
-	if (count == 255)
-		r_funcs->particles->R_ParticleExplosion (org);
-	else
-		r_funcs->particles->R_RunParticleEffect (org, dir, color, count);
-}
diff --git a/nq/source/cl_view.c b/nq/source/cl_view.c
index 132df122f..e6812a263 100644
--- a/nq/source/cl_view.c
+++ b/nq/source/cl_view.c
@@ -728,7 +728,7 @@ V_CalcRefdef (void)
 	if (cl.chase && chase_active->int_val)
 		Chase_Update ();
 
-	CL_TransformEntity (view, view->angles, true);
+	CL_TransformEntity (view, view->angles);
 }
 
 /*
diff --git a/qw/include/Makemodule.am b/qw/include/Makemodule.am
index 2f5076b12..c30d5decf 100644
--- a/qw/include/Makemodule.am
+++ b/qw/include/Makemodule.am
@@ -11,7 +11,6 @@ EXTRA_DIST += \
 	qw/include/cl_pred.h \
 	qw/include/cl_skin.h \
 	qw/include/cl_slist.h \
-	qw/include/cl_tent.h \
 	qw/include/client.h \
 	qw/include/crudefile.h \
 	qw/include/game.h \
diff --git a/qw/include/cl_ents.h b/qw/include/cl_ents.h
index 275cd04f6..b56e162d9 100644
--- a/qw/include/cl_ents.h
+++ b/qw/include/cl_ents.h
@@ -34,11 +34,9 @@
 void CL_SetSolidPlayers (int playernum);
 void CL_ClearPredict (void);
 void CL_SetUpPlayerPrediction(qboolean dopred);
-void CL_TransformEntity (struct entity_s * ent, const vec3_t angles,
-						 qboolean force);
+void CL_ClearEnts (void);
 void CL_EmitEntities (void);
 void CL_ClearProjectiles (void);
-void CL_ParseProjectiles (qboolean nail2);
 void CL_ParsePacketEntities (qboolean delta);
 void CL_SetSolidEntities (void);
 void CL_ParsePlayerinfo (void);
diff --git a/qw/include/cl_parse.h b/qw/include/cl_parse.h
index 4dd3646c6..b624dd0d3 100644
--- a/qw/include/cl_parse.h
+++ b/qw/include/cl_parse.h
@@ -40,7 +40,6 @@ extern int	parsecountmod;
 extern double	parsecounttime;
 extern int	cl_playerindex;
 extern int	cl_flagindex;
-extern int	cl_spikeindex;
 extern int	viewentity;
 extern int	cl_h_playerindex;
 extern int	cl_gib1index;
diff --git a/qw/include/cl_tent.h b/qw/include/cl_tent.h
deleted file mode 100644
index 71af54705..000000000
--- a/qw/include/cl_tent.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-	client.h
-
-	Client definitions
-
-	Copyright (C) 1996-1997  Id Software, Inc.
-
-	This program is free software; you can redistribute it and/or
-	modify it under the terms of the GNU General Public License
-	as published by the Free Software Foundation; either version 2
-	of the License, or (at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-	See the GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to:
-
-		Free Software Foundation, Inc.
-		59 Temple Place - Suite 330
-		Boston, MA  02111-1307, USA
-
-*/
-
-#ifndef _CL_TENT_H
-#define _CL_TENT_H
-
-void CL_TEnts_Init (void);
-void CL_ClearEnts (void);
-void CL_ClearTEnts (void);
-void CL_Init_Entity (struct entity_s *ent);
-void CL_ParseTEnt (void);
-void CL_UpdateTEnts (void);
-
-#endif
diff --git a/qw/source/Makemodule.am b/qw/source/Makemodule.am
index 739789020..00e30b4bc 100644
--- a/qw/source/Makemodule.am
+++ b/qw/source/Makemodule.am
@@ -103,7 +103,7 @@ qw_source_libqw_client_a_SOURCES= \
 		qw/source/cl_cam.c qw/source/cl_chase.c qw/source/cl_chat.c qw/source/cl_cmd.c qw/source/cl_cvar.c qw/source/cl_demo.c \
 		qw/source/cl_entparse.c qw/source/cl_ents.c qw/source/cl_http.c qw/source/cl_input.c qw/source/cl_main.c qw/source/cl_ngraph.c \
 		qw/source/cl_parse.c qw/source/cl_pred.c qw/source/cl_rss.c qw/source/cl_screen.c qw/source/cl_skin.c qw/source/cl_slist.c \
-		qw/source/cl_tent.c qw/source/cl_view.c \
+		qw/source/cl_view.c \
 		qw/source/locs.c qw/source/sbar.c qw/source/teamplay.c
 
 # Software-rendering clients
diff --git a/qw/source/cl_entparse.c b/qw/source/cl_entparse.c
index 2d130574d..3a3d67264 100644
--- a/qw/source/cl_entparse.c
+++ b/qw/source/cl_entparse.c
@@ -45,6 +45,8 @@
 #include "compat.h"
 #include "clview.h"
 
+#include "client/temp_entities.h"
+
 #include "qw/msg_ucmd.h"
 #include "qw/pmove.h"
 #include "qw/bothdefs.h"
@@ -54,7 +56,6 @@
 #include "qw/include/cl_main.h"
 #include "qw/include/cl_parse.h"
 #include "qw/include/cl_pred.h"
-#include "qw/include/cl_tent.h"
 #include "qw/include/host.h"
 
 static struct predicted_player {
diff --git a/qw/source/cl_ents.c b/qw/source/cl_ents.c
index d294f9981..11acacaf2 100644
--- a/qw/source/cl_ents.c
+++ b/qw/source/cl_ents.c
@@ -47,6 +47,8 @@
 #include "clview.h"
 #include "d_iface.h"
 
+#include "client/temp_entities.h"
+
 #include "qw/bothdefs.h"
 #include "qw/msg_ucmd.h"
 #include "qw/pmove.h"
@@ -57,7 +59,6 @@
 #include "qw/include/cl_main.h"
 #include "qw/include/cl_parse.h"
 #include "qw/include/cl_pred.h"
-#include "qw/include/cl_tent.h"
 #include "qw/include/host.h"
 
 entity_t    cl_player_ents[MAX_CLIENTS];
@@ -170,36 +171,6 @@ is_gib (entity_state_t *s1)
 	return 0;
 }
 
-void
-CL_TransformEntity (entity_t *ent, const vec3_t angles, qboolean force)
-{
-	union {
-		quat_t      q;
-		vec4f_t     v;
-	}           rotation;
-	vec4f_t     position;
-	vec4f_t     scale;
-
-	VectorCopy (ent->origin, position);
-	position[3] = 1;
-	VectorSet (ent->scale, ent->scale, ent->scale, scale);
-	scale[3] = 1;
-	if (VectorIsZero (angles)) {
-		QuatSet (0, 0, 0, 1, rotation.q);
-	} else {
-		vec3_t      ang;
-		VectorCopy (angles, ang);
-		if (ent->renderer.model && ent->renderer.model->type == mod_alias) {
-			// stupid quake bug
-			// why, oh, why, do alias models pitch in the opposite direction
-			// to everything else?
-			ang[PITCH] = -ang[PITCH];
-		}
-		AngleQuat (ang, rotation.q);
-	}
-	Transform_SetLocalTransform (ent->transform, scale, rotation.v, position);
-}
-
 static void
 CL_ModelEffects (entity_t *ent, int num, int glow_color)
 {
@@ -342,7 +313,7 @@ CL_LinkPacketEntities (void)
 			animation->pose1 = animation->pose2 = -1;
 			VectorCopy (new->origin, ent->origin);
 			if (!(renderer->model->flags & EF_ROTATE))
-				CL_TransformEntity (ent, new->angles, true);
+				CL_TransformEntity (ent, new->angles);
 			if (i != cl.viewentity || chase_active->int_val) {
 				if (ent->visibility.efrag) {
 					r_funcs->R_RemoveEfrags (ent);
@@ -360,7 +331,7 @@ CL_LinkPacketEntities (void)
 				// assume a teleportation, not a motion
 				VectorCopy (new->origin, ent->origin);
 				if (!(renderer->model->flags & EF_ROTATE)) {
-					CL_TransformEntity (ent, new->angles, true);
+					CL_TransformEntity (ent, new->angles);
 				}
 				animation->pose1 = animation->pose2 = -1;
 			} else {
@@ -376,7 +347,7 @@ CL_LinkPacketEntities (void)
 							d[j] += 360;
 					}
 					VectorMultAdd (old->angles, f, d, angles);
-					CL_TransformEntity (ent, angles, false);
+					CL_TransformEntity (ent, angles);
 				}
 			}
 			if (i != cl.viewentity || chase_active->int_val) {
@@ -400,7 +371,7 @@ CL_LinkPacketEntities (void)
 			angles[PITCH] = 0;
 			angles[YAW] = anglemod (100 * cl.time);
 			angles[ROLL] = 0;
-			CL_TransformEntity (ent, angles, false);
+			CL_TransformEntity (ent, angles);
 		}
 		//CL_EntityEffects (i, ent, new);
 		//CL_NewDlight (i, ent->origin, new->effects, 0, 0);
@@ -567,7 +538,7 @@ CL_LinkPlayers (void)
 		ent->animation.frame = state->pls.frame;
 		ent->renderer.skinnum = state->pls.skinnum;
 
-		CL_TransformEntity (ent, ang, false);
+		CL_TransformEntity (ent, ang);
 
 		ent->renderer.min_light = 0;
 		ent->renderer.fullbright = 0;
@@ -611,9 +582,13 @@ CL_EmitEntities (void)
 	if (!cl.validsequence)
 		return;
 
+	TEntContext_t tentCtx = {
+		{VectorExpand (cl.simorg), 1}, cl.worldmodel, cl.viewentity
+	};
+
 	CL_LinkPlayers ();
 	CL_LinkPacketEntities ();
-	CL_UpdateTEnts ();
+	CL_UpdateTEnts (cl.time, &tentCtx);
 	if (cl_draw_locs->int_val) {
 		//FIXME custom ent rendering code would be nice
 		dlight_t   *dl;
diff --git a/qw/source/cl_main.c b/qw/source/cl_main.c
index 5fcf0364e..656d6eb57 100644
--- a/qw/source/cl_main.c
+++ b/qw/source/cl_main.c
@@ -96,6 +96,8 @@
 #include "compat.h"
 #include "sbar.h"
 
+#include "client/temp_entities.h"
+
 #include "qw/bothdefs.h"
 #include "qw/pmove.h"
 
@@ -110,7 +112,6 @@
 #include "qw/include/cl_pred.h"
 #include "qw/include/cl_skin.h"
 #include "qw/include/cl_slist.h"
-#include "qw/include/cl_tent.h"
 #include "qw/include/client.h"
 #include "qw/include/game.h"
 #include "qw/include/host.h"
diff --git a/qw/source/cl_parse.c b/qw/source/cl_parse.c
index 2523f8feb..2266d1029 100644
--- a/qw/source/cl_parse.c
+++ b/qw/source/cl_parse.c
@@ -65,6 +65,8 @@
 #include "clview.h"
 #include "sbar.h"
 
+#include "client/temp_entities.h"
+
 #include "qw/bothdefs.h"
 #include "qw/pmove.h"
 #include "qw/protocol.h"
@@ -77,7 +79,6 @@
 #include "qw/include/cl_main.h"
 #include "qw/include/cl_parse.h"
 #include "qw/include/cl_skin.h"
-#include "qw/include/cl_tent.h"
 #include "qw/include/client.h"
 #include "qw/include/host.h"
 #include "qw/include/map_cfg.h"
@@ -161,7 +162,7 @@ int         oldparsecountmod;
 int         parsecountmod;
 double      parsecounttime;
 
-int         cl_spikeindex, cl_playerindex, cl_flagindex;
+int         cl_playerindex, cl_flagindex;
 int         cl_h_playerindex, cl_gib1index, cl_gib2index, cl_gib3index;
 
 int         packet_latency[NET_TIMINGS];
@@ -437,7 +438,6 @@ Sound_NextDownload (void)
 	// done with sounds, request models now
 	memset (cl.model_precache, 0, sizeof (cl.model_precache));
 	cl_playerindex = -1;
-	cl_spikeindex = -1;
 	cl_flagindex = -1;
 	cl_h_playerindex = -1;
 	cl_gib1index = cl_gib2index = cl_gib3index = -1;
@@ -906,9 +906,7 @@ CL_ParseModellist (void)
 			Host_Error ("Server sent too many model_precache");
 		strcpy (cl.model_name[cl.nummodels], str);
 
-		if (!strcmp (cl.model_name[cl.nummodels], "progs/spike.mdl"))
-			cl_spikeindex = cl.nummodels;
-		else if (!strcmp (cl.model_name[cl.nummodels], "progs/player.mdl"))
+		if (!strcmp (cl.model_name[cl.nummodels], "progs/player.mdl"))
 			cl_playerindex = cl.nummodels;
 		else if (!strcmp (cl.model_name[cl.nummodels], "progs/flag.mdl"))
 			cl_flagindex = cl.nummodels;
@@ -984,7 +982,7 @@ CL_ParseStatic (void)
 	ent->renderer.skinnum = es.skinnum;
 
 	VectorCopy (es.origin, ent->origin);
-	CL_TransformEntity (ent, es.angles, true);
+	CL_TransformEntity (ent, es.angles);
 
 	r_funcs->R_AddEfrags (&cl.worldmodel->brush, ent);
 }
@@ -1305,6 +1303,9 @@ CL_ParseServerMessage (void)
 	int         cmd = 0, i, j;
 	const char *str;
 	static dstring_t *stuffbuf;
+	TEntContext_t tentCtx = {
+		{VectorExpand (cl.simorg), 1}, cl.worldmodel, cl.viewentity
+	};
 
 	received_framecount = host_framecount;
 	cl.last_servermessage = realtime;
@@ -1507,7 +1508,7 @@ CL_ParseServerMessage (void)
 				break;
 
 			case svc_temp_entity:
-				CL_ParseTEnt ();
+				CL_ParseTEnt_qw (net_message, cl.time, &tentCtx);
 				break;
 
 			case svc_setpause:
@@ -1639,7 +1640,7 @@ CL_ParseServerMessage (void)
 				break;
 
 			case svc_nails:
-				CL_ParseProjectiles (false);
+				CL_ParseProjectiles (net_message, false, &tentCtx);
 				break;
 
 			case svc_chokecount:		// some preceding packets were choked
@@ -1690,7 +1691,7 @@ CL_ParseServerMessage (void)
 				break;
 
 			case svc_nails2:			// FIXME from qwex
-				CL_ParseProjectiles (true);
+				CL_ParseProjectiles (net_message, true, &tentCtx);
 				break;
 		}
 	}
diff --git a/qw/source/cl_view.c b/qw/source/cl_view.c
index 59e7920cd..08d4dd501 100644
--- a/qw/source/cl_view.c
+++ b/qw/source/cl_view.c
@@ -731,7 +731,7 @@ V_CalcRefdef (void)
 	if (cl.chase && chase_active->int_val)
 		Chase_Update ();
 
-	CL_TransformEntity (view, view->angles, true);
+	CL_TransformEntity (view, view->angles);
 }
 
 static void

From 693225a16fac7d5e99e87db1ff59d80e50bd293b Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 10 Mar 2021 18:05:12 +0900
Subject: [PATCH 1466/1519] [util] Add a fixme for a comment

The code itself is fine, but the comment is rubbish because it's
confusing, though essentially correct.
---
 libs/util/mathlib.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libs/util/mathlib.c b/libs/util/mathlib.c
index 2d547f756..33eae277d 100644
--- a/libs/util/mathlib.c
+++ b/libs/util/mathlib.c
@@ -501,6 +501,8 @@ BoxOnPlaneSide (const vec3_t emins, const vec3_t emaxs, plane_t *p)
 #endif
 
 /*
+	FIXME these comments are a confused mess (the code is fine)
+
 	angles is a left(?) handed system: 'pitch yaw roll' with x (pitch) axis to
 	the right, y (yaw) axis up and z (roll) axis forward.
 

From 56d84ef63ecaf9ae399027e5dad1f680925842b3 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 10 Mar 2021 18:35:35 +0900
Subject: [PATCH 1467/1519] [gl] Fix the compressed sprites

Seems to be an ancient bug.
---
 libs/video/renderer/gl/gl_mod_sprite.c | 40 ++++++++++++++------------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/libs/video/renderer/gl/gl_mod_sprite.c b/libs/video/renderer/gl/gl_mod_sprite.c
index b6ce25f22..d0dd91444 100644
--- a/libs/video/renderer/gl/gl_mod_sprite.c
+++ b/libs/video/renderer/gl/gl_mod_sprite.c
@@ -105,7 +105,7 @@ R_DrawSpriteModel_f (entity_t *e)
 {
 	float			 modelalpha, color[4];
 	vec4f_t          up = {}, right = {};
-	vec4f_t          origin, point1, point2;
+	vec4f_t          origin, point;
 	msprite_t		*psprite;
 	mspriteframe_t	*frame;
 
@@ -140,23 +140,23 @@ R_DrawSpriteModel_f (entity_t *e)
 	qfglColor4fv (color);
 
 	origin = Transform_GetWorldPosition (e->transform);
-	point1 = origin + frame->down * up + frame->left * right;
-	point2 = origin + frame->up * up + frame->left * right;
+	point = origin + frame->down * up + frame->left * right;
 
 	qfglTexCoord2f (0, 1);
-	qfglVertex3fv (&point1[0]);
+	qfglVertex3fv (&point[0]);
 
+	point = origin + frame->up * up + frame->left * right;
 	qfglTexCoord2f (0, 0);
-	qfglVertex3fv (&point2[0]);
+	qfglVertex3fv (&point[0]);
 
-	point2 += frame->right * right;
-	point1 += frame->right * right;
+	point = origin + frame->up * up + frame->right * right;
 
 	qfglTexCoord2f (1, 0);
-	qfglVertex3fv (&point2[0]);
+	qfglVertex3fv (&point[0]);
 
+	point = origin + frame->down * up + frame->right * right;
 	qfglTexCoord2f (1, 1);
-	qfglVertex3fv (&point1[0]);
+	qfglVertex3fv (&point[0]);
 
 	qfglEnd ();
 
@@ -169,7 +169,7 @@ R_DrawSpriteModel_VA_f (entity_t *e)
 {
 	unsigned char	 modelalpha, color[4];
 	vec4f_t          up = {}, right = {};
-	vec4f_t          origin, point1, point2;
+	vec4f_t          origin, point;
 	int				 i;
 //	unsigned int	 vacount;
 	msprite_t		*psprite;
@@ -212,16 +212,18 @@ R_DrawSpriteModel_VA_f (entity_t *e)
 		qfglDepthMask (GL_FALSE);
 
 	origin = Transform_GetWorldPosition (e->transform);
-	point1 = origin + frame->down * up + frame->left * right;
-	VectorCopy (point1, VA[0].vertex);
 
-	point2 = origin + frame->up * up + frame->left * right;
-	VectorCopy (point2, VA[1].vertex);
+	point = origin + frame->down * up + frame->left * right;
+	VectorCopy (point, VA[0].vertex);
 
-	point2 += frame->right * right;
-	point1 += frame->right * right;
-	VectorCopy (point2, VA[2].vertex);
-	VectorCopy (point1, VA[3].vertex);
+	point = origin + frame->up * up + frame->left * right;
+	VectorCopy (point, VA[1].vertex);
+
+	point = origin + frame->up * up + frame->right * right;
+	VectorCopy (point, VA[2].vertex);
+
+	point = origin + frame->down * up + frame->right * right;
+	VectorCopy (point, VA[3].vertex);
 
 //	VA += 4;
 //	vacount += 4;
@@ -242,7 +244,7 @@ gl_R_InitSprites (void)
 	int		i;
 
 	if (r_init) {
-		if (gl_va_capable) {			// 0 == gl_va_capable
+		if (gl_va_capable) {
 			gl_R_DrawSpriteModel = R_DrawSpriteModel_VA_f;
 
 #if 0

From 169e0192f2f851d4b01044e2a7e460e517c28032 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 10 Mar 2021 19:06:15 +0900
Subject: [PATCH 1468/1519] [gl] Use the correct value for sqrt(0.5)

707106781 looks right, but isn't quite.
---
 libs/video/renderer/gl/gl_mod_alias.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libs/video/renderer/gl/gl_mod_alias.c b/libs/video/renderer/gl/gl_mod_alias.c
index 4b90ba54a..8e4670a77 100644
--- a/libs/video/renderer/gl/gl_mod_alias.c
+++ b/libs/video/renderer/gl/gl_mod_alias.c
@@ -701,10 +701,10 @@ gl_R_DrawAliasModel (entity_t *e)
 			qfglColor4ubv (color_black);
 		}
 		//FIXME fully vectorize
-		vec4f_t     vec = { 707106781, 0, 707106781, 0 };
+		vec4f_t     vec = { 0.707106781, 0, 0.707106781, 0 };
 		Transform_GetWorldMatrix (e->transform, shadow_mat);
 		mat4ftranspose (shadow_mat, shadow_mat);
-		vec = mvmulf (shadow_mat, vec);
+		vec = m3vmulf (shadow_mat, vec);
 		VectorCopy (vec, shadevector);
 		if (vo->tex_coord)
 			GL_DrawAliasShadowTri (paliashdr, vo);

From 5949753579c32b0d477890bb4bb5e88b6e76fd34 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 10 Mar 2021 19:40:19 +0900
Subject: [PATCH 1469/1519] Make m3vmulf return v[3] unchanged

---
 include/QF/simd/mat4f.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/QF/simd/mat4f.h b/include/QF/simd/mat4f.h
index 719e4c561..658cf582b 100644
--- a/include/QF/simd/mat4f.h
+++ b/include/QF/simd/mat4f.h
@@ -104,7 +104,7 @@ m3vmulf (const mat4f_t m, vec4f_t v)
 {
 	vec4f_t     w;
 	w = m[0] * v[0] + m[1] * v[1] + m[2] * v[2];
-	w[3] = 1;
+	w[3] = v[3];
 	return w;
 }
 

From 62cce7f98c39b41cae345b59afe9f69fee05de7c Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 10 Mar 2021 21:15:53 +0900
Subject: [PATCH 1470/1519] [gl] Remove some more warts

seeing ptexels and pixels together is very confusing
---
 libs/models/gl_model_fullbright.c | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/libs/models/gl_model_fullbright.c b/libs/models/gl_model_fullbright.c
index 60df0d50c..6635cbef5 100644
--- a/libs/models/gl_model_fullbright.c
+++ b/libs/models/gl_model_fullbright.c
@@ -43,29 +43,28 @@
 int
 Mod_Fullbright (byte *skin, int width, int height, const char *name)
 {
-	byte   *ptexels;
+	byte   *texels;
 	int		pixels;
 	int		texnum = 0;
 
 	pixels = width * height;
 
-//	ptexels = Hunk_Alloc(s);
-	ptexels = malloc (pixels);
-	SYS_CHECKMEM (ptexels);
+	texels = malloc (pixels);
+	SYS_CHECKMEM (texels);
 
 	// Check for fullbright pixels
-	if (Mod_CalcFullbright (skin, ptexels, pixels)) {
+	if (Mod_CalcFullbright (skin, texels, pixels)) {
 		//FIXME black should be transparent for fullbrights (or just fix
 		//fullbright rendering in gl)
+		Sys_MaskPrintf (SYS_DEV, "FB Model ID: '%s'\n", name);
 		for (int i = 0; i < pixels; i++) {
-			if (!ptexels[i]) {
-				ptexels[i] = 255;
+			if (!texels[i]) {
+				texels[i] = 255;
 			}
 		}
-		Sys_MaskPrintf (SYS_DEV, "FB Model ID: '%s'\n", name);
-		texnum = GL_LoadTexture (name, width, height, ptexels, true, true, 1);
+		texnum = GL_LoadTexture (name, width, height, texels, true, true, 1);
 	}
 
-	free (ptexels);
+	free (texels);
 	return texnum;
 }

From c05a15dec5caf897e3fa73a5829be0c133f4fb46 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 10 Mar 2021 21:17:34 +0900
Subject: [PATCH 1471/1519] [glsl] Use vec4f_t in a few more places

No idea if it makes a noticeable speed difference, but it makes a huge
readability difference.
---
 libs/video/renderer/glsl/glsl_sprite.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/libs/video/renderer/glsl/glsl_sprite.c b/libs/video/renderer/glsl/glsl_sprite.c
index 7582e9db3..63704ebfa 100644
--- a/libs/video/renderer/glsl/glsl_sprite.c
+++ b/libs/video/renderer/glsl/glsl_sprite.c
@@ -183,20 +183,20 @@ static void
 make_quad (mspriteframe_t *frame, vec4f_t vpn, vec4f_t vright,
 		   vec4f_t vup, float verts[6][3])
 {
-	vec3_t      left, up, right, down;
-	vec3_t      ul, ur, ll, lr;
+	vec4f_t     left, up, right, down;
+	vec4f_t     ul, ur, ll, lr;
 
 	// build the sprite poster in worldspace
 	// first, rotate the sprite axes into world space
-	VectorScale (vright, frame->right, right);
-	VectorScale (vup, frame->up, up);
-	VectorScale (vright, frame->left, left);
-	VectorScale (vup, frame->down, down);
+	right = frame->right * vright;
+	up = frame->up * vup;
+	left = frame->left * vright;
+	down = frame->down * vup;
 	// next, build the sprite corners from the axes
-	VectorAdd (up, left, ul);
-	VectorAdd (up, right, ur);
-	VectorAdd (down, left, ll);
-	VectorAdd (down, right, lr);
+	ul = up + left;
+	ur = up + right;
+	ll = down + left;
+	lr = down + right;
 	// finally, translate the sprite corners, creating two triangles
 	VectorAdd (currententity->origin, ul, verts[0]);	// first triangle
 	VectorAdd (currententity->origin, ur, verts[1]);

From 51e86941958a763dc555b556ed57d26accda90ba Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 11 Mar 2021 09:11:08 +0900
Subject: [PATCH 1472/1519] [qw] Use a dynamic array to track static entities

This takes care of another fixme in the cleanup of entity_t.
---
 include/QF/darray.h  | 2 ++
 include/QF/render.h  | 1 -
 qw/include/client.h  | 3 ++-
 qw/source/cl_demo.c  | 4 +++-
 qw/source/cl_parse.c | 9 +++------
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/include/QF/darray.h b/include/QF/darray.h
index 61500256a..e41cd5edb 100644
--- a/include/QF/darray.h
+++ b/include/QF/darray.h
@@ -69,6 +69,8 @@
 		ele_type   *a;			\
 	}
 
+#define DARRAY_STATIC_INIT(g) { .grow = g }
+
 /**	Allocate a fixed-size array using the given allocator
 
 	The allocated array is initilized to be ungrowable, and with both size
diff --git a/include/QF/render.h b/include/QF/render.h
index d6a871865..99fb105a9 100644
--- a/include/QF/render.h
+++ b/include/QF/render.h
@@ -124,7 +124,6 @@ typedef struct renderer_s {
 
 typedef struct entity_s {
 	struct entity_s *next;
-	struct entity_s *unext;	//FIXME this shouldn't be here. for qw demos
 
 	struct transform_s *transform;
 	animation_t animation;
diff --git a/qw/include/client.h b/qw/include/client.h
index 23d22e893..3c64c128b 100644
--- a/qw/include/client.h
+++ b/qw/include/client.h
@@ -28,6 +28,7 @@
 #ifndef _CLIENT_H
 #define _CLIENT_H
 
+#include "QF/entity.h"
 #include "QF/info.h"
 #include "QF/quakefs.h"
 #include "QF/vid.h"
@@ -341,7 +342,7 @@ extern	struct cvar_s	*cl_fb_players;
 
 extern	client_state_t	cl;
 
-extern	entity_t		*cl_static_entities;
+extern	entityset_t		cl_static_entities;
 extern	entity_t		cl_entities[512];
 extern	byte			cl_entity_valid[2][512];
 
diff --git a/qw/source/cl_demo.c b/qw/source/cl_demo.c
index d063211d4..31594d51f 100644
--- a/qw/source/cl_demo.c
+++ b/qw/source/cl_demo.c
@@ -755,7 +755,9 @@ demo_start_recording (int track)
 		SZ_Clear (&buf);
 	}
 	// spawnstatic
-	for (ent = cl_static_entities; ent; ent = ent->unext) {
+	for (size_t staticIndex = 0; staticIndex < cl_static_entities.size;
+		 staticIndex++) {
+		ent = cl_static_entities.a[staticIndex];
 		MSG_WriteByte (&buf, svc_spawnstatic);
 
 		for (j = 1; j < cl.nummodels; j++) {
diff --git a/qw/source/cl_parse.c b/qw/source/cl_parse.c
index 2266d1029..7366b4da0 100644
--- a/qw/source/cl_parse.c
+++ b/qw/source/cl_parse.c
@@ -169,8 +169,7 @@ int         packet_latency[NET_TIMINGS];
 
 extern cvar_t *hud_scoreboard_uid;
 
-entity_t *cl_static_entities;
-static entity_t **cl_static_tail;
+entityset_t cl_static_entities = DARRAY_STATIC_INIT (32);
 
 static void
 CL_LoadSky (void)
@@ -298,8 +297,7 @@ map_ent (const char *mapname)
 static void
 CL_NewMap (const char *mapname)
 {
-	cl_static_entities = 0;
-	cl_static_tail = &cl_static_entities;
+	cl_static_entities.size = 0;
 	r_funcs->R_NewMap (cl.worldmodel, cl.model_precache, cl.nummodels);
 	Team_NewMap ();
 	Con_NewMap ();
@@ -973,8 +971,7 @@ CL_ParseStatic (void)
 	ent = r_funcs->R_AllocEntity ();
 	CL_Init_Entity (ent);
 
-	*cl_static_tail = ent;
-	cl_static_tail = &ent->unext;
+	DARRAY_APPEND (&cl_static_entities, ent);
 
 	// copy it to the current state
 	ent->renderer.model = cl.model_precache[es.modelindex];

From b8267f2eddbb8e53c72a5c80c67055ee10f149d7 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 11 Mar 2021 11:25:04 +0900
Subject: [PATCH 1473/1519] [client] Merge nq/qw entity effects code

---
 include/client/effects.h       |  43 ++++++++
 libs/client/Makemodule.am      |   3 +-
 libs/client/cl_effects.c       | 175 +++++++++++++++++++++++++++++++++
 libs/client/cl_temp_entities.c |   1 +
 nq/source/cl_ents.c            | 135 +------------------------
 qw/source/cl_ents.c            | 112 ++-------------------
 6 files changed, 231 insertions(+), 238 deletions(-)
 create mode 100644 include/client/effects.h
 create mode 100644 libs/client/cl_effects.c

diff --git a/include/client/effects.h b/include/client/effects.h
new file mode 100644
index 000000000..1f1259274
--- /dev/null
+++ b/include/client/effects.h
@@ -0,0 +1,43 @@
+/*
+	effects.h
+
+	Effect management
+
+	Copyright (C) 2021 Bill Currie <bill@taniwha.org>
+
+	Author: Bill Currie <bill@taniwha.org>
+	Date: 2021/3/11
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifndef __client_effects_h
+#define __client_effects_h
+
+struct entity_s;
+struct entity_state_s;
+
+void CL_NewDlight (int key, vec3_t org, int effects, byte glow_size,
+				   byte glow_color, double time);
+void CL_ModelEffects (struct entity_s *ent, int num, int glow_color,
+					  double time);
+void CL_EntityEffects (int num, struct entity_s *ent,
+					   struct entity_state_s *state, double time);
+
+#endif//__client_effects_h
diff --git a/libs/client/Makemodule.am b/libs/client/Makemodule.am
index 9129b9dbd..943f6bf9e 100644
--- a/libs/client/Makemodule.am
+++ b/libs/client/Makemodule.am
@@ -3,6 +3,7 @@ noinst_LTLIBRARIES += libs/client/libQFclient.la
 libs_client_libQFclient_la_LDFLAGS=	@STATIC@
 libs_client_libQFclient_la_LIBADD=	libs/gamecode/libQFgamecode.la libs/util/libQFutil.la
 libs_client_libQFclient_la_SOURCES= \
-		libs/client/cl_temp_entities.c \
+		libs/client/cl_effects.c \
 		libs/client/cl_entities.c \
+		libs/client/cl_temp_entities.c \
 		$e
diff --git a/libs/client/cl_effects.c b/libs/client/cl_effects.c
new file mode 100644
index 000000000..3030431a8
--- /dev/null
+++ b/libs/client/cl_effects.c
@@ -0,0 +1,175 @@
+/*
+	cl_effect.c
+
+	Client side effect management
+
+	Copyright (C) 1996-1997  Id Software, Inc.
+	Copyright (C) 2021 Bill Currie <bill@taniwha.org>
+
+	Author: Bill Currie <bill@taniwha.org>
+	Date: 2021/3/11
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+
+#include "QF/entity.h"
+#include "QF/render.h"
+
+#include "QF/plugin/vid_render.h"	//FIXME
+
+#include "client/entities.h"
+#include "client/effects.h"
+
+void
+CL_NewDlight (int key, vec3_t org, int effects, byte glow_size,
+			  byte glow_color, double time)
+{
+	float       radius;
+	dlight_t   *dl;
+	static quat_t normal = {0.4, 0.2, 0.05, 0.7};
+	static quat_t red = {0.5, 0.05, 0.05, 0.7};
+	static quat_t blue = {0.05, 0.05, 0.5, 0.7};
+	static quat_t purple = {0.5, 0.05, 0.5, 0.7};
+
+	effects &= EF_BLUE | EF_RED | EF_BRIGHTLIGHT | EF_DIMLIGHT;
+	if (!effects) {
+		if (!glow_size)
+			return;
+	}
+
+	dl = r_funcs->R_AllocDlight (key);
+	if (!dl)
+		return;
+	VectorCopy (org, dl->origin);
+
+	if (effects & (EF_BLUE | EF_RED | EF_BRIGHTLIGHT | EF_DIMLIGHT)) {
+		radius = 200 + (rand () & 31);
+		if (effects & EF_BRIGHTLIGHT) {
+			radius += 200;
+			dl->origin[2] += 16;
+		}
+		if (effects & EF_DIMLIGHT)
+			if (effects & ~EF_DIMLIGHT)
+				radius -= 100;
+		dl->radius = radius;
+		dl->die = time + 0.1;
+
+		switch (effects & (EF_RED | EF_BLUE)) {
+			case EF_RED | EF_BLUE:
+				QuatCopy (purple, dl->color);
+				break;
+			case EF_RED:
+				QuatCopy (red, dl->color);
+				break;
+			case EF_BLUE:
+				QuatCopy (blue, dl->color);
+				break;
+			default:
+				QuatCopy (normal, dl->color);
+				break;
+		}
+	}
+
+	if (glow_size) {
+		dl->radius += glow_size < 128 ? glow_size * 8.0 :
+			(glow_size - 256) * 8.0;
+		dl->die = time + 0.1;
+		if (glow_color) {
+			if (glow_color == 255) {
+				dl->color[0] = dl->color[1] = dl->color[2] = 1.0;
+			} else {
+				byte        *tempcolor;
+
+				tempcolor = (byte *) &d_8to24table[glow_color];
+				VectorScale (tempcolor, 1 / 255.0, dl->color);
+			}
+		}
+	}
+}
+
+void
+CL_ModelEffects (entity_t *ent, int num, int glow_color, double time)
+{
+	dlight_t   *dl;
+	model_t    *model = ent->renderer.model;
+
+	// add automatic particle trails
+	if (model->flags & EF_ROCKET) {
+		dl = r_funcs->R_AllocDlight (num);
+		if (dl) {
+			VectorCopy (ent->origin, dl->origin);
+			dl->radius = 200.0;
+			dl->die = time + 0.1;
+			//FIXME VectorCopy (r_firecolor->vec, dl->color);
+			VectorSet (0.9, 0.7, 0.0, dl->color);
+			dl->color[3] = 0.7;
+		}
+		r_funcs->particles->R_RocketTrail (ent);
+	} else if (model->flags & EF_GRENADE)
+		r_funcs->particles->R_GrenadeTrail (ent);
+	else if (model->flags & EF_GIB)
+		r_funcs->particles->R_BloodTrail (ent);
+	else if (model->flags & EF_ZOMGIB)
+		r_funcs->particles->R_SlightBloodTrail (ent);
+	else if (model->flags & EF_TRACER)
+		r_funcs->particles->R_WizTrail (ent);
+	else if (model->flags & EF_TRACER2)
+		r_funcs->particles->R_FlameTrail (ent);
+	else if (model->flags & EF_TRACER3)
+		r_funcs->particles->R_VoorTrail (ent);
+	else if (model->flags & EF_GLOWTRAIL)
+		if (r_funcs->particles->R_GlowTrail)
+			r_funcs->particles->R_GlowTrail (ent, glow_color);
+}
+
+void
+CL_EntityEffects (int num, entity_t *ent, entity_state_t *state, double time)
+{
+	dlight_t   *dl;
+
+	if (state->effects & EF_BRIGHTFIELD)
+		r_funcs->particles->R_EntityParticles (ent);
+	if (state->effects & EF_MUZZLEFLASH) {
+		dl = r_funcs->R_AllocDlight (num);
+		if (dl) {
+			vec4f_t     position = Transform_GetWorldPosition (ent->transform);
+			vec4f_t     fv = Transform_Forward (ent->transform);
+			position += 18 * fv;
+			VectorCopy (position, dl->origin);
+			dl->origin[2] += 16;
+			dl->radius = 200 + (rand () & 31);
+			dl->die = time + 0.1;
+			dl->minlight = 32;
+			dl->color[0] = 0.2;
+			dl->color[1] = 0.1;
+			dl->color[2] = 0.05;
+			dl->color[3] = 0.7;
+		}
+	}
+}
diff --git a/libs/client/cl_temp_entities.c b/libs/client/cl_temp_entities.c
index a0627e42d..0b6672f0f 100644
--- a/libs/client/cl_temp_entities.c
+++ b/libs/client/cl_temp_entities.c
@@ -3,6 +3,7 @@
 
 	Client side temporary entity management
 
+	Copyright (C) 1996-1997  Id Software, Inc.
 	Copyright (C) 2021 Bill Currie <bill@taniwha.org>
 
 	Author: Bill Currie <bill@taniwha.org>
diff --git a/nq/source/cl_ents.c b/nq/source/cl_ents.c
index 3fdd3d0af..957cadb6a 100644
--- a/nq/source/cl_ents.c
+++ b/nq/source/cl_ents.c
@@ -47,6 +47,7 @@
 
 #include "compat.h"
 
+#include "client/effects.h"
 #include "client/temp_entities.h"
 
 #include "nq/include/chase.h"
@@ -75,73 +76,6 @@ CL_ClearEnts (void)
 		CL_Init_Entity (cl_entities + i);
 }
 
-static void
-CL_NewDlight (int key, vec3_t org, int effects, byte glow_size,
-			  byte glow_color)
-{
-	float       radius;
-	dlight_t   *dl;
-	static quat_t normal = {0.4, 0.2, 0.05, 0.7};
-	static quat_t red = {0.5, 0.05, 0.05, 0.7};
-	static quat_t blue = {0.05, 0.05, 0.5, 0.7};
-	static quat_t purple = {0.5, 0.05, 0.5, 0.7};
-
-	effects &= EF_BLUE | EF_RED | EF_BRIGHTLIGHT | EF_DIMLIGHT;
-	if (!effects) {
-		if (!glow_size)
-			return;
-	}
-
-	dl = r_funcs->R_AllocDlight (key);
-	if (!dl)
-		return;
-	VectorCopy (org, dl->origin);
-
-	if (effects & (EF_BLUE | EF_RED | EF_BRIGHTLIGHT | EF_DIMLIGHT)) {
-		radius = 200 + (rand () & 31);
-		if (effects & EF_BRIGHTLIGHT) {
-			radius += 200;
-			dl->origin[2] += 16;
-		}
-		if (effects & EF_DIMLIGHT)
-			if (effects & ~EF_DIMLIGHT)
-				radius -= 100;
-		dl->radius = radius;
-		dl->die = cl.time + 0.1;
-
-		switch (effects & (EF_RED | EF_BLUE)) {
-			case EF_RED | EF_BLUE:
-				QuatCopy (purple, dl->color);
-				break;
-			case EF_RED:
-				QuatCopy (red, dl->color);
-				break;
-			case EF_BLUE:
-				QuatCopy (blue, dl->color);
-				break;
-			default:
-				QuatCopy (normal, dl->color);
-				break;
-		}
-	}
-
-	if (glow_size) {
-		dl->radius += glow_size < 128 ? glow_size * 8.0 :
-			(glow_size - 256) * 8.0;
-		dl->die = cl.time + 0.1;
-		if (glow_color) {
-			if (glow_color == 255) {
-				dl->color[0] = dl->color[1] = dl->color[2] = 1.0;
-			} else {
-				byte        *tempcolor;
-
-				tempcolor = (byte *) &d_8to24table[glow_color];
-				VectorScale (tempcolor, 1 / 255.0, dl->color);
-			}
-		}
-	}
-}
-
 /*
 	CL_LerpPoint
 
@@ -179,67 +113,6 @@ CL_LerpPoint (void)
 	return frac;
 }
 
-static void
-CL_ModelEffects (entity_t *ent, int num, int glow_color)
-{
-	dlight_t   *dl;
-	model_t    *model = ent->renderer.model;
-
-	// add automatic particle trails
-	if (model->flags & EF_ROCKET) {
-		dl = r_funcs->R_AllocDlight (num);
-		if (dl) {
-			VectorCopy (ent->origin, dl->origin);
-			dl->radius = 200.0;
-			dl->die = cl.time + 0.1;
-			//FIXME VectorCopy (r_firecolor->vec, dl->color);
-			VectorSet (0.9, 0.7, 0.0, dl->color);
-			dl->color[3] = 0.7;
-		}
-		r_funcs->particles->R_RocketTrail (ent);
-	} else if (model->flags & EF_GRENADE)
-		r_funcs->particles->R_GrenadeTrail (ent);
-	else if (model->flags & EF_GIB)
-		r_funcs->particles->R_BloodTrail (ent);
-	else if (model->flags & EF_ZOMGIB)
-		r_funcs->particles->R_SlightBloodTrail (ent);
-	else if (model->flags & EF_TRACER)
-		r_funcs->particles->R_WizTrail (ent);
-	else if (model->flags & EF_TRACER2)
-		r_funcs->particles->R_FlameTrail (ent);
-	else if (model->flags & EF_TRACER3)
-		r_funcs->particles->R_VoorTrail (ent);
-	else if (model->flags & EF_GLOWTRAIL)
-		if (r_funcs->particles->R_GlowTrail)
-			r_funcs->particles->R_GlowTrail (ent, glow_color);
-}
-
-static void
-CL_EntityEffects (int num, entity_t *ent, entity_state_t *state)
-{
-	dlight_t   *dl;
-
-	if (state->effects & EF_BRIGHTFIELD)
-		r_funcs->particles->R_EntityParticles (ent);
-	if (state->effects & EF_MUZZLEFLASH) {
-		dl = r_funcs->R_AllocDlight (num);
-		if (dl) {
-			vec4f_t     position = Transform_GetWorldPosition (ent->transform);
-			vec4f_t     fv = Transform_Forward (ent->transform);
-			position += 18 * fv;
-			VectorCopy (position, dl->origin);
-			dl->origin[2] += 16;
-			dl->radius = 200 + (rand () & 31);
-			dl->die = cl.time + 0.1;
-			dl->minlight = 32;
-			dl->color[0] = 0.2;
-			dl->color[1] = 0.1;
-			dl->color[2] = 0.05;
-			dl->color[3] = 0.7;
-		}
-	}
-}
-
 static void
 set_entity_model (entity_t *ent, int modelindex)
 {
@@ -419,13 +292,13 @@ CL_RelinkEntities (void)
 			angles[YAW] = bobjrotate;
 			CL_TransformEntity (ent, angles);
 		}
-		CL_EntityEffects (i, ent, new);
+		CL_EntityEffects (i, ent, new, cl.time);
 		CL_NewDlight (i, ent->origin, new->effects, new->glow_size,
-					  new->glow_color);
+					  new->glow_color, cl.time);
 		if (VectorDistance_fast (old->origin, ent->origin) > (256 * 256))
 			VectorCopy (ent->origin, old->origin);
 		if (model_flags & ~EF_ROTATE)
-			CL_ModelEffects (ent, i, new->glow_color);
+			CL_ModelEffects (ent, i, new->glow_color, cl.time);
 
 		cl_forcelink[i] = false;
 	}
diff --git a/qw/source/cl_ents.c b/qw/source/cl_ents.c
index 11acacaf2..0cf0f835e 100644
--- a/qw/source/cl_ents.c
+++ b/qw/source/cl_ents.c
@@ -47,6 +47,7 @@
 #include "clview.h"
 #include "d_iface.h"
 
+#include "client/effects.h"
 #include "client/temp_entities.h"
 
 #include "qw/bothdefs.h"
@@ -82,73 +83,6 @@ CL_ClearEnts (void)
 		CL_Init_Entity (&cl_player_ents[i]);
 }
 
-static void
-CL_NewDlight (int key, vec3_t org, int effects, byte glow_size,
-			  byte glow_color)
-{
-	float       radius;
-	dlight_t   *dl;
-	static quat_t normal = {0.4, 0.2, 0.05, 0.7};
-	static quat_t red = {0.5, 0.05, 0.05, 0.7};
-	static quat_t blue = {0.05, 0.05, 0.5, 0.7};
-	static quat_t purple = {0.5, 0.05, 0.5, 0.7};
-
-	effects &= EF_BLUE | EF_RED | EF_BRIGHTLIGHT | EF_DIMLIGHT;
-	if (!effects) {
-		if (!glow_size)
-			return;
-	}
-
-	dl = r_funcs->R_AllocDlight (key);
-	if (!dl)
-		return;
-	VectorCopy (org, dl->origin);
-
-	if (effects & (EF_BLUE | EF_RED | EF_BRIGHTLIGHT | EF_DIMLIGHT)) {
-		radius = 200 + (rand () & 31);
-		if (effects & EF_BRIGHTLIGHT) {
-			radius += 200;
-			dl->origin[2] += 16;
-		}
-		if (effects & EF_DIMLIGHT)
-			if (effects & ~EF_DIMLIGHT)
-				radius -= 100;
-		dl->radius = radius;
-		dl->die = cl.time + 0.1;
-
-		switch (effects & (EF_RED | EF_BLUE)) {
-			case EF_RED | EF_BLUE:
-				QuatCopy (purple, dl->color);
-				break;
-			case EF_RED:
-				QuatCopy (red, dl->color);
-				break;
-			case EF_BLUE:
-				QuatCopy (blue, dl->color);
-				break;
-			default:
-				QuatCopy (normal, dl->color);
-				break;
-		}
-	}
-
-	if (glow_size) {
-		dl->radius += glow_size < 128 ? glow_size * 8.0 :
-			(glow_size - 256) * 8.0;
-		dl->die = cl.time + 0.1;
-		if (glow_color) {
-			if (glow_color == 255) {
-				dl->color[0] = dl->color[1] = dl->color[2] = 1.0;
-			} else {
-				byte        *tempcolor;
-
-				tempcolor = (byte *) &d_8to24table[glow_color];
-				VectorScale (tempcolor, 1 / 255.0, dl->color);
-			}
-		}
-	}
-}
-
 // Hack hack hack
 static inline int
 is_dead_body (entity_state_t *s1)
@@ -171,41 +105,6 @@ is_gib (entity_state_t *s1)
 	return 0;
 }
 
-static void
-CL_ModelEffects (entity_t *ent, int num, int glow_color)
-{
-	dlight_t   *dl;
-	model_t    *model = ent->renderer.model;
-
-	// add automatic particle trails
-	if (model->flags & EF_ROCKET) {
-		dl = r_funcs->R_AllocDlight (num);
-		if (dl) {
-			VectorCopy (ent->origin, dl->origin);
-			dl->radius = 200.0;
-			dl->die = cl.time + 0.1;
-			//FIXME VectorCopy (r_firecolor->vec, dl->color);
-			VectorSet (0.9, 0.7, 0.0, dl->color);
-			dl->color[3] = 0.7;
-		}
-		r_funcs->particles->R_RocketTrail (ent);
-	} else if (model->flags & EF_GRENADE)
-		r_funcs->particles->R_GrenadeTrail (ent);
-	else if (model->flags & EF_GIB)
-		r_funcs->particles->R_BloodTrail (ent);
-	else if (model->flags & EF_ZOMGIB)
-		r_funcs->particles->R_SlightBloodTrail (ent);
-	else if (model->flags & EF_TRACER)
-		r_funcs->particles->R_WizTrail (ent);
-	else if (model->flags & EF_TRACER2)
-		r_funcs->particles->R_FlameTrail (ent);
-	else if (model->flags & EF_TRACER3)
-		r_funcs->particles->R_VoorTrail (ent);
-	else if (model->flags & EF_GLOWTRAIL)
-		if (r_funcs->particles->R_GlowTrail)
-			r_funcs->particles->R_GlowTrail (ent, glow_color);
-}
-
 static void
 set_entity_model (entity_t *ent, int modelindex)
 {
@@ -221,6 +120,7 @@ set_entity_model (entity_t *ent, int modelindex)
 			animation->syncbase = 0.0;
 		}
 	}
+	animation->nolerp = 1; // don't try to lerp when the model has changed
 }
 
 static void
@@ -255,7 +155,7 @@ CL_LinkPacketEntities (void)
 
 		// spawn light flashes, even ones coming from invisible objects
 		CL_NewDlight (i, new->origin, new->effects, new->glow_size,
-					  new->glow_color);
+					  new->glow_color, cl.time);
 
 		// if set to invisible, skip
 		if (!new->modelindex
@@ -374,11 +274,11 @@ CL_LinkPacketEntities (void)
 			CL_TransformEntity (ent, angles);
 		}
 		//CL_EntityEffects (i, ent, new);
-		//CL_NewDlight (i, ent->origin, new->effects, 0, 0);
+		//CL_NewDlight (i, ent->origin, new->effects, 0, 0, cl.time);
 		if (VectorDistance_fast (old->origin, ent->origin) > (256 * 256))
 			VectorCopy (ent->origin, old->origin);
 		if (renderer->model->flags & ~EF_ROTATE) {
-			CL_ModelEffects (ent, -new->number, new->glow_color);
+			CL_ModelEffects (ent, -new->number, new->glow_color, cl.time);
 		}
 	}
 }
@@ -492,7 +392,7 @@ CL_LinkPlayers (void)
 			QuatSet (0.0, 1.0, 0.0, 1.0, dl->color);
 		} else {
 			CL_NewDlight (j + 1, org, state->pls.effects, state->pls.glow_size,
-						  state->pls.glow_color);
+						  state->pls.glow_color, cl.time);
 		}
 
 		// Draw player?

From abaccbec538ae18f9d9eb710c1d4815a9d69e6e1 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 11 Mar 2021 11:38:33 +0900
Subject: [PATCH 1474/1519] [client] Move qw's loc code into client

This makes the location code available to nq (not used yet) but more
importantly moves some definitely client-side code into the right place.
---
 include/Makemodule.am                 |  3 ++
 include/QF/Makemodule.am              |  1 -
 include/{QF => client}/locs.h         |  1 +
 libs/client/Makemodule.am             |  1 +
 {qw/source => libs/client}/locs.c     | 44 +++++++++++++++++++++++++--
 libs/video/renderer/gl/gl_mod_alias.c |  1 -
 libs/video/renderer/gl/gl_rmain.c     |  1 -
 libs/video/renderer/sw/sw_rmain.c     |  1 -
 libs/video/renderer/sw32/sw32_rmain.c |  1 -
 qw/source/Makemodule.am               |  2 +-
 qw/source/cl_entparse.c               |  1 -
 qw/source/cl_ents.c                   | 32 ++-----------------
 qw/source/teamplay.c                  |  3 +-
 13 files changed, 51 insertions(+), 41 deletions(-)
 rename include/{QF => client}/locs.h (97%)
 rename {qw/source => libs/client}/locs.c (84%)

diff --git a/include/Makemodule.am b/include/Makemodule.am
index 9fd003768..645a820bf 100644
--- a/include/Makemodule.am
+++ b/include/Makemodule.am
@@ -76,7 +76,10 @@ EXTRA_DIST += \
 	include/vregset.h \
 	include/winquake.h \
 	include/world.h \
+	include/client/effects.h \
 	include/client/entities.h \
+	include/client/temp_entities.h \
+	include/client/locs.h \
 	include/qw/bothdefs.h \
 	include/qw/msg_backbuf.h \
 	include/qw/msg_ucmd.h \
diff --git a/include/QF/Makemodule.am b/include/QF/Makemodule.am
index 5282d5230..aefd432f7 100644
--- a/include/QF/Makemodule.am
+++ b/include/QF/Makemodule.am
@@ -25,7 +25,6 @@ include_qf = \
 	include/QF/keys.h \
 	include/QF/link.h \
 	include/QF/llist.h \
-	include/QF/locs.h \
 	include/QF/mathlib.h \
 	include/QF/mdfour.h \
 	include/QF/mersenne.h \
diff --git a/include/QF/locs.h b/include/client/locs.h
similarity index 97%
rename from include/QF/locs.h
rename to include/client/locs.h
index 4f7dc9b5c..8786c6532 100644
--- a/include/QF/locs.h
+++ b/include/client/locs.h
@@ -46,5 +46,6 @@ int  locs_nearest (const vec3_t loc) __attribute__((pure));
 void locs_reset (void);
 void locs_save (const char *filename, qboolean gz);
 void map_to_loc (const char *mapname, char *filename);
+void locs_draw (vec3_t simorg);
 
 #endif//__QF_locs_h
diff --git a/libs/client/Makemodule.am b/libs/client/Makemodule.am
index 943f6bf9e..074daea58 100644
--- a/libs/client/Makemodule.am
+++ b/libs/client/Makemodule.am
@@ -6,4 +6,5 @@ libs_client_libQFclient_la_SOURCES= \
 		libs/client/cl_effects.c \
 		libs/client/cl_entities.c \
 		libs/client/cl_temp_entities.c \
+		libs/client/locs.c \
 		$e
diff --git a/qw/source/locs.c b/libs/client/locs.c
similarity index 84%
rename from qw/source/locs.c
rename to libs/client/locs.c
index ab92ec4c2..dd6a17d9f 100644
--- a/qw/source/locs.c
+++ b/libs/client/locs.c
@@ -41,15 +41,19 @@
 
 #include <limits.h>
 
-#include "QF/locs.h"
+#include "QF/mathlib.h"
+#include "QF/render.h"
 #include "QF/qtypes.h"
 #include "QF/quakefs.h"
 #include "QF/sys.h"
 #include "QF/va.h"
 
-#include "compat.h"
+#include "QF/plugin/vid_render.h"	//FIXME
 
-#include "qw/include/client.h"
+#include "compat.h"
+#include "d_iface.h"	//FIXME part_tex_smoke and part_tex_dot
+
+#include "client/locs.h"
 
 #define LOCATION_BLOCK	128				// 128 locations per block.
 
@@ -276,3 +280,37 @@ map_to_loc (const char *mapname, char *filename)
 	t1++;
 	strcpy (t1, "loc");
 }
+
+void
+locs_draw (vec3_t simorg)
+{
+	//FIXME custom ent rendering code would be nice
+	dlight_t   *dl;
+	location_t *nearloc;
+	vec3_t      trueloc;
+	int         i;
+
+	nearloc = locs_find (simorg);
+	if (nearloc) {
+		dl = r_funcs->R_AllocDlight (4096);
+		if (dl) {
+			VectorCopy (nearloc->loc, dl->origin);
+			dl->radius = 200;
+			dl->die = r_data->realtime + 0.1;
+			dl->color[0] = 0;
+			dl->color[1] = 1;
+			dl->color[2] = 0;
+			dl->color[3] = 0.7;
+		}
+		VectorCopy (nearloc->loc, trueloc);
+		r_funcs->particles->R_Particle_New (pt_smokecloud, part_tex_smoke,
+				trueloc, 2.0,
+				vec3_origin, r_data->realtime + 9.0, 254,
+				0.25 + qfrandom (0.125), 0.0);
+		for (i = 0; i < 15; i++)
+			r_funcs->particles->R_Particle_NewRandom (pt_fallfade,
+					part_tex_dot, trueloc, 12,
+					0.7, 96, r_data->realtime + 5.0,
+					104 + (rand () & 7), 1.0, 0.0);
+	}
+}
diff --git a/libs/video/renderer/gl/gl_mod_alias.c b/libs/video/renderer/gl/gl_mod_alias.c
index 8e4670a77..92c67038d 100644
--- a/libs/video/renderer/gl/gl_mod_alias.c
+++ b/libs/video/renderer/gl/gl_mod_alias.c
@@ -44,7 +44,6 @@
 
 #include "QF/cvar.h"
 #include "QF/entity.h"
-#include "QF/locs.h"
 #include "QF/mathlib.h"
 #include "QF/qargs.h"
 #include "QF/render.h"
diff --git a/libs/video/renderer/gl/gl_rmain.c b/libs/video/renderer/gl/gl_rmain.c
index 23d7f7be4..8079b790b 100644
--- a/libs/video/renderer/gl/gl_rmain.c
+++ b/libs/video/renderer/gl/gl_rmain.c
@@ -45,7 +45,6 @@
 #include "QF/cvar.h"
 #include "QF/draw.h"
 #include "QF/entity.h"
-#include "QF/locs.h"
 #include "QF/mathlib.h"
 #include "QF/qargs.h"
 #include "QF/render.h"
diff --git a/libs/video/renderer/sw/sw_rmain.c b/libs/video/renderer/sw/sw_rmain.c
index 7cf5416c0..8ab480bcc 100644
--- a/libs/video/renderer/sw/sw_rmain.c
+++ b/libs/video/renderer/sw/sw_rmain.c
@@ -43,7 +43,6 @@
 #include "QF/cmd.h"
 #include "QF/cvar.h"
 #include "QF/entity.h"
-#include "QF/locs.h"
 #include "QF/mathlib.h"
 #include "QF/render.h"
 #include "QF/screen.h"
diff --git a/libs/video/renderer/sw32/sw32_rmain.c b/libs/video/renderer/sw32/sw32_rmain.c
index 812a43205..36d94fd2a 100644
--- a/libs/video/renderer/sw32/sw32_rmain.c
+++ b/libs/video/renderer/sw32/sw32_rmain.c
@@ -43,7 +43,6 @@
 #include "QF/cmd.h"
 #include "QF/cvar.h"
 #include "QF/entity.h"
-#include "QF/locs.h"
 #include "QF/mathlib.h"
 #include "QF/render.h"
 #include "QF/screen.h"
diff --git a/qw/source/Makemodule.am b/qw/source/Makemodule.am
index 00e30b4bc..bad7bd189 100644
--- a/qw/source/Makemodule.am
+++ b/qw/source/Makemodule.am
@@ -104,7 +104,7 @@ qw_source_libqw_client_a_SOURCES= \
 		qw/source/cl_entparse.c qw/source/cl_ents.c qw/source/cl_http.c qw/source/cl_input.c qw/source/cl_main.c qw/source/cl_ngraph.c \
 		qw/source/cl_parse.c qw/source/cl_pred.c qw/source/cl_rss.c qw/source/cl_screen.c qw/source/cl_skin.c qw/source/cl_slist.c \
 		qw/source/cl_view.c \
-		qw/source/locs.c qw/source/sbar.c qw/source/teamplay.c
+		qw/source/sbar.c qw/source/teamplay.c
 
 # Software-rendering clients
 
diff --git a/qw/source/cl_entparse.c b/qw/source/cl_entparse.c
index 3a3d67264..ac7f0ae21 100644
--- a/qw/source/cl_entparse.c
+++ b/qw/source/cl_entparse.c
@@ -36,7 +36,6 @@
 #endif
 
 #include "QF/cvar.h"
-#include "QF/locs.h"
 #include "QF/msg.h"
 #include "QF/render.h"
 #include "QF/skin.h"
diff --git a/qw/source/cl_ents.c b/qw/source/cl_ents.c
index 0cf0f835e..757cc7e56 100644
--- a/qw/source/cl_ents.c
+++ b/qw/source/cl_ents.c
@@ -37,7 +37,6 @@
 
 #include "QF/cvar.h"
 #include "QF/entity.h"
-#include "QF/locs.h"
 #include "QF/msg.h"
 #include "QF/render.h"
 #include "QF/skin.h"
@@ -48,6 +47,7 @@
 #include "d_iface.h"
 
 #include "client/effects.h"
+#include "client/locs.h"
 #include "client/temp_entities.h"
 
 #include "qw/bothdefs.h"
@@ -490,35 +490,7 @@ CL_EmitEntities (void)
 	CL_LinkPacketEntities ();
 	CL_UpdateTEnts (cl.time, &tentCtx);
 	if (cl_draw_locs->int_val) {
-		//FIXME custom ent rendering code would be nice
-		dlight_t   *dl;
-		location_t *nearloc;
-		vec3_t      trueloc;
-		int         i;
-
-		nearloc = locs_find (cl.simorg);
-		if (nearloc) {
-			dl = r_funcs->R_AllocDlight (4096);
-			if (dl) {
-				VectorCopy (nearloc->loc, dl->origin);
-				dl->radius = 200;
-				dl->die = r_data->realtime + 0.1;
-				dl->color[0] = 0;
-				dl->color[1] = 1;
-				dl->color[2] = 0;
-				dl->color[3] = 0.7;
-			}
-			VectorCopy (nearloc->loc, trueloc);
-			r_funcs->particles->R_Particle_New (pt_smokecloud, part_tex_smoke,
-					trueloc, 2.0,
-					vec3_origin, r_data->realtime + 9.0, 254,
-					0.25 + qfrandom (0.125), 0.0);
-			for (i = 0; i < 15; i++)
-				r_funcs->particles->R_Particle_NewRandom (pt_fallfade,
-						part_tex_dot, trueloc, 12,
-						0.7, 96, r_data->realtime + 5.0,
-						104 + (rand () & 7), 1.0, 0.0);
-		}
+		locs_draw (cl.simorg);
 	}
 }
 
diff --git a/qw/source/teamplay.c b/qw/source/teamplay.c
index e8a38606d..75e6aefe3 100644
--- a/qw/source/teamplay.c
+++ b/qw/source/teamplay.c
@@ -43,7 +43,6 @@
 #include "QF/cmd.h"
 #include "QF/cvar.h"
 #include "QF/gib.h"
-#include "QF/locs.h"
 #include "QF/model.h"
 #include "QF/va.h"
 #include "QF/skin.h"
@@ -52,6 +51,8 @@
 
 #include "compat.h"
 
+#include "client/locs.h"
+
 #include "qw/bothdefs.h"
 #include "qw/include/cl_input.h"
 #include "qw/include/client.h"

From c9bbc2971aea47af43c88b8383607ea38934d6f0 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 11 Mar 2021 12:47:08 +0900
Subject: [PATCH 1475/1519] [qw] Rename view_message to view_state

Makes more sense to me.
---
 qw/source/cl_view.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/qw/source/cl_view.c b/qw/source/cl_view.c
index 08d4dd501..763de6767 100644
--- a/qw/source/cl_view.c
+++ b/qw/source/cl_view.c
@@ -82,7 +82,7 @@ cvar_t     *v_idlescale;
 float       v_dmg_time, v_dmg_roll, v_dmg_pitch;
 
 frame_t    *view_frame;
-player_state_t *view_message;
+player_state_t *view_state;
 
 cshift_t    cshift_empty = { {130, 80, 50}, 0};
 cshift_t    cshift_water = { {130, 80, 50}, 128};
@@ -189,7 +189,7 @@ V_DriftPitch (void)
 	int         frameno = (cls.netchan.outgoing_sequence - 1) & UPDATE_MASK;
 	usercmd_t  *cmd = &cl.frames[frameno].cmd;
 
-	if (view_message->onground == -1 || cls.demoplayback) {
+	if (view_state->onground == -1 || cls.demoplayback) {
 		cl.driftmove = 0;
 		cl.pitchvel = 0;
 		return;
@@ -600,7 +600,7 @@ V_CalcViewRoll (void)
 		v_dmg_time -= host_frametime;
 	}
 
-	if (view_message->pls.flags & PF_DEAD)		// PF_GIB will also set PF_DEAD
+	if (view_state->pls.flags & PF_DEAD)		// PF_GIB will also set PF_DEAD
 		r_data->refdef->viewangles[ROLL] = 80;	// dead view angle
 }
 
@@ -700,12 +700,12 @@ V_CalcRefdef (void)
 	else if (r_data->scr_viewsize->int_val == 80)
 		view->origin[2] += 0.5;
 
-	if (view_message->pls.flags & (PF_GIB | PF_DEAD)) {
+	if (view_state->pls.flags & (PF_GIB | PF_DEAD)) {
 		view->renderer.model = NULL;
 	} else {
 		view->renderer.model = cl.model_precache[cl.stats[STAT_WEAPON]];
 	}
-	view->animation.frame = view_message->pls.weaponframe;
+	view->animation.frame = view_state->pls.weaponframe;
 	view->renderer.skin = 0;
 
 	// set up the refresh position
@@ -755,11 +755,11 @@ V_RenderView (void)
 		return;
 
 	view_frame = &cl.frames[cls.netchan.incoming_sequence & UPDATE_MASK];
-	view_message = &view_frame->playerstate[cl.playernum];
+	view_state = &view_frame->playerstate[cl.playernum];
 
-	if (view_message->pls.flags & PF_GIB)
+	if (view_state->pls.flags & PF_GIB)
 		cl.viewheight = 8;			// gib view height
-	else if (view_message->pls.flags & PF_DEAD)
+	else if (view_state->pls.flags & PF_DEAD)
 		cl.viewheight = -16;			// corpse view height
 	else {
 		cl.viewheight = DEFAULT_VIEWHEIGHT;	// view height

From ca38f9b616b802e8b0e783a3860d56cc2a42b7a0 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 11 Mar 2021 14:27:36 +0900
Subject: [PATCH 1476/1519] [qw] Use entity_state_t as a base for
 player_state_t

This will, in the long run, help clean up a lot of the differences in
the handling of entities in the clients.
---
 include/client/entities.h |   6 +-
 include/qw/protocol.h     |  19 +----
 qtv/source/client.c       |  60 +++++++--------
 qtv/source/sv_parse.c     |  46 ++++++------
 qw/source/cl_cam.c        |  32 ++++----
 qw/source/cl_entparse.c   |  61 ++++++++--------
 qw/source/cl_ents.c       |  34 ++++-----
 qw/source/cl_main.c       |   4 +-
 qw/source/cl_pred.c       |  41 ++++++-----
 qw/source/cl_view.c       |  10 +--
 qw/source/sv_ents.c       | 150 +++++++++++++++++++-------------------
 11 files changed, 225 insertions(+), 238 deletions(-)

diff --git a/include/client/entities.h b/include/client/entities.h
index 1dba394d6..45420cbb7 100644
--- a/include/client/entities.h
+++ b/include/client/entities.h
@@ -40,9 +40,11 @@ typedef struct entity_state_s {
 	unsigned    flags;			// nolerp, etc
 
 	vec3_t      origin;
+	vec3_t      velocity;
 	vec3_t      angles;
-	unsigned short modelindex;
-	unsigned short frame;
+	uint16_t    modelindex;
+	uint16_t    frame;
+	int         weaponframe;
 	int         effects;
 	byte        colormap;
 	byte        skinnum;
diff --git a/include/qw/protocol.h b/include/qw/protocol.h
index 76f2c625d..9fb818d37 100644
--- a/include/qw/protocol.h
+++ b/include/qw/protocol.h
@@ -320,26 +320,9 @@ typedef struct usercmd_s {
 } usercmd_t;
 
 typedef struct plent_state_s {
-	int         number;
-
-	unsigned int flags;
-	vec3_t      origin;
+	entity_state_t es;
 	usercmd_t   cmd;
-	vec3_t      velocity;
-	int         modelindex;
-	int         frame;
-	int         skinnum;
-	int         effects;
-	int         weaponframe;
-
 	byte        msec;
-
-	// QSG 2
-	byte	    alpha;
-	byte	    scale;
-	byte	    glow_size;
-	byte	    glow_color;
-	byte	    colormod;
 } plent_state_t;
 
 typedef struct {
diff --git a/qtv/source/client.c b/qtv/source/client.c
index c55e57bd2..6da363953 100644
--- a/qtv/source/client.c
+++ b/qtv/source/client.c
@@ -446,9 +446,9 @@ spectator_move (client_t *cl, usercmd_t *ucmd)
 
 	AngleVectors (cl->state.cmd.angles, forward, right, up);
 
-	speed = DotProduct (cl->state.velocity, cl->state.velocity);
+	speed = DotProduct (cl->state.es.velocity, cl->state.es.velocity);
 	if (speed < 1) {
-		VectorZero (cl->state.velocity);
+		VectorZero (cl->state.es.velocity);
 	} else {
 		speed = sqrt (speed);
 		drop = 0;
@@ -462,7 +462,7 @@ spectator_move (client_t *cl, usercmd_t *ucmd)
 			newspeed = 0;
 		newspeed /= speed;
 
-		VectorScale (cl->state.velocity, newspeed, cl->state.velocity);
+		VectorScale (cl->state.es.velocity, newspeed, cl->state.es.velocity);
 	}
 
 	fmove = ucmd->forwardmove;
@@ -484,7 +484,7 @@ spectator_move (client_t *cl, usercmd_t *ucmd)
 		wishspeed = sv->movevars.spectatormaxspeed;
 	}
 
-	currentspeed = DotProduct (cl->state.velocity, wishdir);
+	currentspeed = DotProduct (cl->state.es.velocity, wishdir);
 	addspeed = wishspeed - currentspeed;
 	if (addspeed <= 0)
 		return;
@@ -492,10 +492,10 @@ spectator_move (client_t *cl, usercmd_t *ucmd)
 	if (accelspeed > addspeed)
 		accelspeed = addspeed;
 
-	VectorMultAdd (cl->state.velocity, accelspeed, wishdir,
-				   cl->state.velocity);
-	VectorMultAdd (cl->state.origin, frametime, cl->state.velocity,
-				   cl->state.origin);
+	VectorMultAdd (cl->state.es.velocity, accelspeed, wishdir,
+				   cl->state.es.velocity);
+	VectorMultAdd (cl->state.es.origin, frametime, cl->state.es.velocity,
+				   cl->state.es.origin);
 }
 
 static void
@@ -612,7 +612,7 @@ client_parse_message (client_t *cl)
 				break;
 			case clc_tmove:
 				MSG_ReadCoordV (net_message, o);
-				VectorCopy (o, cl->state.origin);
+				VectorCopy (o, cl->state.es.origin);
 				break;
 			case clc_upload:
 				size = MSG_ReadShort (net_message);
@@ -627,18 +627,18 @@ static void
 write_player (int num, plent_state_t *pl, server_t *sv, sizebuf_t *msg)
 {
 	int         i;
-	int         pflags = (pl->flags & (PF_GIB | PF_DEAD))
+	int         pflags = (pl->es.flags & (PF_GIB | PF_DEAD))
 						| PF_MSEC | PF_COMMAND;
 	int         qf_bits = 0;
 
-	if (pl->modelindex != sv->playermodel)
+	if (pl->es.modelindex != sv->playermodel)
 		pflags |= PF_MODEL;
 	for (i = 0; i < 3; i++)
-		if (pl->velocity[i])
+		if (pl->es.velocity[i])
 			pflags |= PF_VELOCITY1 << i;
-	if (pl->effects & 0xff)
+	if (pl->es.effects & 0xff)
 		pflags |= PF_EFFECTS;
-	if (pl->skinnum)
+	if (pl->es.skinnum)
 		pflags |= PF_SKINNUM;
 
 	qf_bits = 0;
@@ -670,21 +670,21 @@ write_player (int num, plent_state_t *pl, server_t *sv, sizebuf_t *msg)
 //	} else if (ent == clent) {
 //		// don't send a lot of data on personal entity
 //		pflags &= ~(PF_MSEC | PF_COMMAND);
-//		if (pl->weaponframe)
+//		if (pl->es.weaponframe)
 //			pflags |= PF_WEAPONFRAME;
 //	}
 
 //	if (client->spec_track && client->spec_track - 1 == j
-//		&& pl->weaponframe)
+//		&& pl->es.weaponframe)
 //		pflags |= PF_WEAPONFRAME;
 
 	MSG_WriteByte (msg, svc_playerinfo);
 	MSG_WriteByte (msg, num);
 	MSG_WriteShort (msg, pflags);
 
-	MSG_WriteCoordV (msg, pl->origin);
+	MSG_WriteCoordV (msg, pl->es.origin);
 
-	MSG_WriteByte (msg, pl->frame);
+	MSG_WriteByte (msg, pl->es.frame);
 
 	if (pflags & PF_MSEC) {
 		//msec = 1000 * (sv.time - cl->localtime);
@@ -699,36 +699,36 @@ write_player (int num, plent_state_t *pl, server_t *sv, sizebuf_t *msg)
 
 	for (i = 0; i < 3; i++)
 		if (pflags & (PF_VELOCITY1 << i))
-			MSG_WriteShort (msg, pl->velocity[i]);
+			MSG_WriteShort (msg, pl->es.velocity[i]);
 
 	if (pflags & PF_MODEL)
-		MSG_WriteByte (msg, pl->modelindex);
+		MSG_WriteByte (msg, pl->es.modelindex);
 
 	if (pflags & PF_SKINNUM)
-		MSG_WriteByte (msg, pl->skinnum);
+		MSG_WriteByte (msg, pl->es.skinnum);
 
 	if (pflags & PF_EFFECTS)
-		MSG_WriteByte (msg, pl->effects);
+		MSG_WriteByte (msg, pl->es.effects);
 
 	if (pflags & PF_WEAPONFRAME)
-		MSG_WriteByte (msg, pl->weaponframe);
+		MSG_WriteByte (msg, pl->es.weaponframe);
 
 	if (pflags & PF_QF) {
 		MSG_WriteByte (msg, qf_bits);
 		if (qf_bits & PF_ALPHA)
-			MSG_WriteByte (msg, pl->alpha);
+			MSG_WriteByte (msg, pl->es.alpha);
 		if (qf_bits & PF_SCALE)
-			MSG_WriteByte (msg, pl->scale);
+			MSG_WriteByte (msg, pl->es.scale);
 		if (qf_bits & PF_EFFECTS2)
-			MSG_WriteByte (msg, pl->effects >> 8);
+			MSG_WriteByte (msg, pl->es.effects >> 8);
 		if (qf_bits & PF_GLOWSIZE)
-			MSG_WriteByte (msg, pl->scale);
+			MSG_WriteByte (msg, pl->es.glow_size);
 		if (qf_bits & PF_GLOWCOLOR)
-			MSG_WriteByte (msg, pl->glow_color);
+			MSG_WriteByte (msg, pl->es.glow_color);
 		if (qf_bits & PF_COLORMOD)
-			MSG_WriteByte (msg, pl->colormod);
+			MSG_WriteByte (msg, pl->es.colormod);
 		if (qf_bits & PF_FRAME2)
-			MSG_WriteByte (msg, pl->frame >> 8);
+			MSG_WriteByte (msg, pl->es.frame >> 8);
 	}
 }
 #if 0
diff --git a/qtv/source/sv_parse.c b/qtv/source/sv_parse.c
index 493aa613a..268e9999d 100644
--- a/qtv/source/sv_parse.c
+++ b/qtv/source/sv_parse.c
@@ -514,9 +514,9 @@ parse_player_delta (qmsg_t *msg, plent_state_t *from, plent_state_t *to)
 	int          i;
 	int          flags;
 
-	flags = to->flags = MSG_ReadShort (msg);
-	MSG_ReadCoordV (msg, to->origin);
-	to->frame = (to->frame & 0xff00) | MSG_ReadByte (msg);
+	flags = to->es.flags = MSG_ReadShort (msg);
+	MSG_ReadCoordV (msg, to->es.origin);
+	to->es.frame = (to->es.frame & 0xff00) | MSG_ReadByte (msg);
 	if (flags & PF_MSEC)
 		to->msec = MSG_ReadByte (msg);
 //	qtv_printf ("%02x\n", msg->message->data[msg->readcount]);
@@ -524,36 +524,36 @@ parse_player_delta (qmsg_t *msg, plent_state_t *from, plent_state_t *to)
 		MSG_ReadDeltaUsercmd (msg, &from->cmd, &to->cmd);
 	for (i = 0; i < 3; i++) {
 		if (flags & (PF_VELOCITY1 << i))
-			to->velocity[i] = (short) MSG_ReadShort (msg);
+			to->es.velocity[i] = (short) MSG_ReadShort (msg);
 	}
 	if (flags & PF_MODEL)
-		to->modelindex = MSG_ReadByte (msg);
+		to->es.modelindex = MSG_ReadByte (msg);
 	if (flags & PF_SKINNUM)
-		to->skinnum = MSG_ReadByte (msg);
+		to->es.skinnum = MSG_ReadByte (msg);
 	if (flags & PF_EFFECTS)
-		to->effects = (to->effects & 0xff00) | MSG_ReadByte (msg);
+		to->es.effects = (to->es.effects & 0xff00) | MSG_ReadByte (msg);
 	if (flags & PF_WEAPONFRAME)
-		to->weaponframe = MSG_ReadByte (msg);
+		to->es.weaponframe = MSG_ReadByte (msg);
 	if (flags & PF_QF) {
 		int         bits;
 
 		bits = MSG_ReadByte (msg);
 		if (bits & PF_ALPHA)
-			to->alpha = MSG_ReadByte (msg);
+			to->es.alpha = MSG_ReadByte (msg);
 		if (bits & PF_SCALE)
-			to->scale = MSG_ReadByte (msg);
+			to->es.scale = MSG_ReadByte (msg);
 		if (bits & PF_EFFECTS2)
-			to->effects = (to->effects & 0x00ff)
-						| (MSG_ReadByte (msg) << 8);
+			to->es.effects = (to->es.effects & 0x00ff)
+						   | (MSG_ReadByte (msg) << 8);
 		if (bits & PF_GLOWSIZE)
-			to->glow_size = MSG_ReadByte (msg);
+			to->es.glow_size = MSG_ReadByte (msg);
 		if (bits & PF_GLOWCOLOR)
-			to->glow_color = MSG_ReadByte (msg);
+			to->es.glow_color = MSG_ReadByte (msg);
 		if (bits & PF_COLORMOD)
-			to->colormod = MSG_ReadByte (msg);
+			to->es.colormod = MSG_ReadByte (msg);
 		if (bits & PF_FRAME2)
-			to->frame = (to->frame & 0xff)
-					  | (MSG_ReadByte (msg) << 8);
+			to->es.frame = (to->es.frame & 0xff)
+						 | (MSG_ReadByte (msg) << 8);
 	}
 }
 
@@ -567,12 +567,12 @@ sv_playerinfo (server_t *sv, qmsg_t *msg)
 	int          fromind, toind;
 	static plent_state_t null_player_state;
 
-	if (!null_player_state.alpha) {
-		null_player_state.alpha = 255;
-		null_player_state.scale = 16;
-		null_player_state.glow_size = 0;
-		null_player_state.glow_color = 254;
-		null_player_state.colormod = 255;
+	if (!null_player_state.es.alpha) {
+		null_player_state.es.alpha = 255;
+		null_player_state.es.scale = 16;
+		null_player_state.es.glow_size = 0;
+		null_player_state.es.glow_color = 254;
+		null_player_state.es.colormod = 255;
 	}
 	fromind = MSG_ReadByte (msg);
 	toind = sv->netchan.incoming_sequence & UPDATE_MASK;
diff --git a/qw/source/cl_cam.c b/qw/source/cl_cam.c
index 5a7f0d486..91e7a44eb 100644
--- a/qw/source/cl_cam.c
+++ b/qw/source/cl_cam.c
@@ -218,23 +218,23 @@ Cam_TryFlyby (player_state_t * self, player_state_t * player, vec3_t vec,
 	vectoangles (vec, v);
 	VectorCopy (v, pmove.angles);
 	VectorNormalize (vec);
-	VectorMultAdd (player->pls.origin, 800, vec, v);
+	VectorMultAdd (player->pls.es.origin, 800, vec, v);
 	// v is endpos
 	// fake a player move
-	trace = Cam_DoTrace (player->pls.origin, v);
+	trace = Cam_DoTrace (player->pls.es.origin, v);
 	if ( /* trace.inopen || */ trace.inwater)
 		return 9999;
 	VectorCopy (trace.endpos, vec);
-	len = VectorDistance (trace.endpos, player->pls.origin);
+	len = VectorDistance (trace.endpos, player->pls.es.origin);
 
 	if (len < 32 || len > 800)
 		return 9999;
 	if (checkvis) {
-		trace = Cam_DoTrace (self->pls.origin, vec);
+		trace = Cam_DoTrace (self->pls.es.origin, vec);
 		if (trace.fraction != 1 || trace.inwater)
 			return 9999;
 
-		len = VectorDistance (trace.endpos, self->pls.origin);
+		len = VectorDistance (trace.endpos, self->pls.es.origin);
 	}
 
 	return len;
@@ -248,11 +248,11 @@ Cam_IsVisible (player_state_t * player, vec3_t vec)
 	trace_t     trace;
 	vec3_t      v;
 
-	trace = Cam_DoTrace (player->pls.origin, vec);
+	trace = Cam_DoTrace (player->pls.es.origin, vec);
 	if (trace.fraction != 1 || /* trace.inopen || */ trace.inwater)
 		return false;
 	// check distance, don't let the player get too far away or too close
-	VectorSubtract (player->pls.origin, vec, v);
+	VectorSubtract (player->pls.es.origin, vec, v);
 	d = VectorLength (v);
 
 	return (d > 16.0);
@@ -440,22 +440,22 @@ Cam_Track (usercmd_t *cmd)
 		cmd->forwardmove = cmd->sidemove = cmd->upmove = 0;
 
 		VectorCopy (player->viewangles, cl.viewangles);
-		VectorCopy (player->pls.origin, desired_position);
-		if (memcmp (&desired_position, &self->pls.origin,
+		VectorCopy (player->pls.es.origin, desired_position);
+		if (memcmp (&desired_position, &self->pls.es.origin,
 					sizeof (desired_position)) != 0) {
 			if (!cls.demoplayback) {
 				MSG_WriteByte (&cls.netchan.message, clc_tmove);
 				MSG_WriteCoordV (&cls.netchan.message, desired_position);
 			}
 			// move there locally immediately
-			VectorCopy (desired_position, self->pls.origin);
+			VectorCopy (desired_position, self->pls.es.origin);
 		}
-		self->pls.weaponframe = player->pls.weaponframe;
+		self->pls.es.weaponframe = player->pls.es.weaponframe;
 
 	} else {
 		// Ok, move to our desired position and set our angles to view
 		// the player
-		VectorSubtract (desired_position, self->pls.origin, vec);
+		VectorSubtract (desired_position, self->pls.es.origin, vec);
 		len = VectorLength (vec);
 		cmd->forwardmove = cmd->sidemove = cmd->upmove = 0;
 		if (len > 16) {					// close enough?
@@ -465,9 +465,9 @@ Cam_Track (usercmd_t *cmd)
 			}
 		}
 		// move there locally immediately
-		VectorCopy (desired_position, self->pls.origin);
+		VectorCopy (desired_position, self->pls.es.origin);
 
-		VectorSubtract (player->pls.origin, desired_position, vec);
+		VectorSubtract (player->pls.es.origin, desired_position, vec);
 		vectoangles (vec, cl.viewangles);
 		cl.viewangles[0] = -cl.viewangles[0];
 	}
@@ -520,7 +520,7 @@ Cam_SetView (void)
 	player = frame->playerstate + spec_track;
 	self = frame->playerstate + cl.playernum;
 
-	VectorSubtract (player->pls.origin, cl.simorg, vec);
+	VectorSubtract (player->pls.es.origin, cl.simorg, vec);
 	if (cam_forceview) {
 		cam_forceview = false;
 		vectoangles (vec, cam_viewangles);
@@ -560,7 +560,7 @@ Cam_FinishMove (usercmd_t *cmd)
 		player = frame->playerstate + spec_track;
 		self = frame->playerstate + cl.playernum;
 
-		VectorSubtract (player->pls.origin, self->pls.origin, vec);
+		VectorSubtract (player->pls.es.origin, self->pls.es.origin, vec);
 		if (cam_forceview) {
 			cam_forceview = false;
 			vectoangles (vec, cam_viewangles);
diff --git a/qw/source/cl_entparse.c b/qw/source/cl_entparse.c
index ac7f0ae21..b1b5d3386 100644
--- a/qw/source/cl_entparse.c
+++ b/qw/source/cl_entparse.c
@@ -360,7 +360,7 @@ CL_ParseDemoPlayerinfo (int num)
 	info = &cl.players[num];
 	state = &cl.frames[parsecountmod].playerstate[num];
 
-	state->pls.number = num;
+	state->pls.es.number = num;
 
 	if (info->prevcount > cl.parsecount || !cl.parsecount) {
 		prevstate = &dummy;
@@ -383,25 +383,25 @@ CL_ParseDemoPlayerinfo (int num)
 	memcpy (state, prevstate, sizeof (player_state_t));
 
 	flags = MSG_ReadShort (net_message);
-	state->pls.flags = TranslateFlags (flags);
+	state->pls.es.flags = TranslateFlags (flags);
 	state->messagenum = cl.parsecount;
 	state->pls.cmd.msec = 0;
-	state->pls.frame = MSG_ReadByte (net_message);
+	state->pls.es.frame = MSG_ReadByte (net_message);
 	state->state_time = parsecounttime;
 	for (i=0; i <3; i++)
 		if (flags & (DF_ORIGIN << i))
-			state->pls.origin[i] = MSG_ReadCoord (net_message);
+			state->pls.es.origin[i] = MSG_ReadCoord (net_message);
 	for (i=0; i <3; i++)
 		if (flags & (DF_ANGLES << i))
 			state->pls.cmd.angles[i] = MSG_ReadAngle16 (net_message);
 	if (flags & DF_MODEL)
-		state->pls.modelindex = MSG_ReadByte (net_message);
+		state->pls.es.modelindex = MSG_ReadByte (net_message);
 	if (flags & DF_SKINNUM)
-		state->pls.skinnum = MSG_ReadByte (net_message);
+		state->pls.es.skinnum = MSG_ReadByte (net_message);
 	if (flags & DF_EFFECTS)
-		state->pls.effects = MSG_ReadByte (net_message);
+		state->pls.es.effects = MSG_ReadByte (net_message);
 	if (flags & DF_WEAPONFRAME)
-		state->pls.weaponframe = MSG_ReadByte (net_message);
+		state->pls.es.weaponframe = MSG_ReadByte (net_message);
 	VectorCopy (state->pls.cmd.angles, state->viewangles);
 }
 
@@ -422,14 +422,14 @@ CL_ParsePlayerinfo (void)
 
 	state = &cl.frames[parsecountmod].playerstate[num];
 
-	state->pls.number = num;
+	state->pls.es.number = num;
 
-	flags = state->pls.flags = MSG_ReadShort (net_message);
+	flags = state->pls.es.flags = MSG_ReadShort (net_message);
 
 	state->messagenum = cl.parsecount;
-	MSG_ReadCoordV (net_message, state->pls.origin);
+	MSG_ReadCoordV (net_message, state->pls.es.origin);
 
-	state->pls.frame = MSG_ReadByte (net_message);
+	state->pls.es.frame = MSG_ReadByte (net_message);
 
 	// the other player's last move was likely some time
 	// before the packet was sent out, so accurately track
@@ -445,30 +445,30 @@ CL_ParsePlayerinfo (void)
 
 	for (i = 0; i < 3; i++) {
 		if (flags & (PF_VELOCITY1 << i))
-			state->pls.velocity[i] = (short) MSG_ReadShort (net_message);
+			state->pls.es.velocity[i] = (short) MSG_ReadShort (net_message);
 		else
-			state->pls.velocity[i] = 0;
+			state->pls.es.velocity[i] = 0;
 	}
 	if (flags & PF_MODEL)
 		i = MSG_ReadByte (net_message);
 	else
 		i = cl_playerindex;
-	state->pls.modelindex = i;
+	state->pls.es.modelindex = i;
 
 	if (flags & PF_SKINNUM)
-		state->pls.skinnum = MSG_ReadByte (net_message);
+		state->pls.es.skinnum = MSG_ReadByte (net_message);
 	else
-		state->pls.skinnum = 0;
+		state->pls.es.skinnum = 0;
 
 	if (flags & PF_EFFECTS)
-		state->pls.effects = MSG_ReadByte (net_message);
+		state->pls.es.effects = MSG_ReadByte (net_message);
 	else
-		state->pls.effects = 0;
+		state->pls.es.effects = 0;
 
 	if (flags & PF_WEAPONFRAME)
-		state->pls.weaponframe = MSG_ReadByte (net_message);
+		state->pls.es.weaponframe = MSG_ReadByte (net_message);
 	else
-		state->pls.weaponframe = 0;
+		state->pls.es.weaponframe = 0;
 
 	VectorCopy (state->pls.cmd.angles, state->viewangles);
 
@@ -489,13 +489,13 @@ CL_ParsePlayerinfo (void)
 			ent->scale = val / 16.0;
 		}
 		if (bits & PF_EFFECTS2) {
-			state->pls.effects |= MSG_ReadByte (net_message) << 8;
+			state->pls.es.effects |= MSG_ReadByte (net_message) << 8;
 		}
 		if (bits & PF_GLOWSIZE) {
-			state->pls.glow_size = MSG_ReadByte (net_message);
+			state->pls.es.glow_size = MSG_ReadByte (net_message);
 		}
 		if (bits & PF_GLOWCOLOR) {
-			state->pls.glow_color = MSG_ReadByte (net_message);
+			state->pls.es.glow_color = MSG_ReadByte (net_message);
 		}
 		if (bits & PF_COLORMOD) {
 			float       r = 1.0, g = 1.0, b = 1.0;
@@ -508,7 +508,7 @@ CL_ParsePlayerinfo (void)
 			VectorSet (r, g, b, ent->renderer.colormod);
 		}
 		if (bits & PF_FRAME2) {
-			state->pls.frame |= MSG_ReadByte (net_message) << 8;
+			state->pls.es.frame |= MSG_ReadByte (net_message) << 8;
 		}
 	}
 }
@@ -599,22 +599,23 @@ CL_SetUpPlayerPrediction (qboolean dopred)
 		if (state->messagenum != cl.parsecount)
 			continue;					// not present this frame
 
-		if (!state->pls.modelindex)
+		if (!state->pls.es.modelindex)
 			continue;
 
 		pplayer->active = true;
-		pplayer->flags = state->pls.flags;
+		pplayer->flags = state->pls.es.flags;
 
 		// note that the local player is special, since he moves locally
 		// we use his last predicted postition
 		if (j == cl.playernum) {
 			VectorCopy (cl.frames[cls.netchan.outgoing_sequence & UPDATE_MASK].
-						playerstate[cl.playernum].pls.origin, pplayer->origin);
+						playerstate[cl.playernum].pls.es.origin,
+						pplayer->origin);
 		} else {
 			// predict only half the move to minimize overruns
 			msec = 500 * (playertime - state->state_time);
 			if (msec <= 0 || !dopred) {
-				VectorCopy (state->pls.origin, pplayer->origin);
+				VectorCopy (state->pls.es.origin, pplayer->origin);
 //				Sys_MaskPrintf (SYS_DEV, "nopredict\n");
 			} else {
 				// predict players movement
@@ -622,7 +623,7 @@ CL_SetUpPlayerPrediction (qboolean dopred)
 //				Sys_MaskPrintf (SYS_DEV, "predict: %i\n", msec);
 
 				CL_PredictUsercmd (state, &exact, &state->pls.cmd, false);
-				VectorCopy (exact.pls.origin, pplayer->origin);
+				VectorCopy (exact.pls.es.origin, pplayer->origin);
 			}
 		}
 	}
diff --git a/qw/source/cl_ents.c b/qw/source/cl_ents.c
index 757cc7e56..1e8ab80d9 100644
--- a/qw/source/cl_ents.c
+++ b/qw/source/cl_ents.c
@@ -349,7 +349,7 @@ static void
 CL_LinkPlayers (void)
 {
 	double			playertime;
-	int				msec, oldphysent, i, j;
+	int				msec, oldphysent, j;
 	entity_t	   *ent;
 	frame_t		   *frame;
 	player_info_t  *info;
@@ -381,7 +381,7 @@ CL_LinkPlayers (void)
 			r_data->player_entity = &cl_player_ents[j];
 			clientplayer = true;
 		} else {
-			VectorCopy (state->pls.origin, org);
+			VectorCopy (state->pls.es.origin, org);
 			clientplayer = false;
 		}
 		if (info->chat && info->chat->value[0] != '0') {
@@ -391,28 +391,28 @@ CL_LinkPlayers (void)
 			dl->die = cl.time + 0.1;
 			QuatSet (0.0, 1.0, 0.0, 1.0, dl->color);
 		} else {
-			CL_NewDlight (j + 1, org, state->pls.effects, state->pls.glow_size,
-						  state->pls.glow_color, cl.time);
+			CL_NewDlight (j + 1, org, state->pls.es.effects,
+						  state->pls.es.glow_size, state->pls.es.glow_color,
+						  cl.time);
 		}
 
 		// Draw player?
 		if (!Cam_DrawPlayer (j))
 			continue;
 
-		if (!state->pls.modelindex)
+		if (!state->pls.es.modelindex)
 			continue;
 
 		// Hack hack hack
 		if (cl_deadbodyfilter->int_val
-			&& state->pls.modelindex == cl_playerindex
-			&& ((i = state->pls.frame) == 49 || i == 60 || i == 69 || i == 84
-				|| i == 93 || i == 102))
+			&& state->pls.es.modelindex == cl_playerindex
+			&& is_dead_body (&state->pls.es))
 			continue;
 
 		// predict only half the move to minimize overruns
 		msec = 500 * (playertime - state->state_time);
 		if (msec <= 0 || (!cl_predict_players->int_val) || cls.demoplayback2) {
-			VectorCopy (state->pls.origin, ent->origin);
+			VectorCopy (state->pls.es.origin, ent->origin);
 		} else {									// predict players movement
 			state->pls.cmd.msec = msec = min (msec, 255);
 
@@ -420,7 +420,7 @@ CL_LinkPlayers (void)
 			CL_SetSolidPlayers (j);
 			CL_PredictUsercmd (state, &exact, &state->pls.cmd, clientplayer);
 			pmove.numphysent = oldphysent;
-			VectorCopy (exact.pls.origin, ent->origin);
+			VectorCopy (exact.pls.es.origin, ent->origin);
 		}
 
 		// angles
@@ -432,18 +432,18 @@ CL_LinkPlayers (void)
 			ang[PITCH] = -state->viewangles[PITCH] / 3.0;
 			ang[YAW] = state->viewangles[YAW];
 		}
-		ang[ROLL] = V_CalcRoll (ang, state->pls.velocity) * 4.0;
+		ang[ROLL] = V_CalcRoll (ang, state->pls.es.velocity) * 4.0;
 
-		ent->renderer.model = cl.model_precache[state->pls.modelindex];
-		ent->animation.frame = state->pls.frame;
-		ent->renderer.skinnum = state->pls.skinnum;
+		ent->renderer.model = cl.model_precache[state->pls.es.modelindex];
+		ent->animation.frame = state->pls.es.frame;
+		ent->renderer.skinnum = state->pls.es.skinnum;
 
 		CL_TransformEntity (ent, ang);
 
 		ent->renderer.min_light = 0;
 		ent->renderer.fullbright = 0;
 
-		if (state->pls.modelindex == cl_playerindex) { //XXX
+		if (state->pls.es.modelindex == cl_playerindex) { //XXX
 			// use custom skin
 			ent->renderer.skin = info->skin;
 
@@ -460,9 +460,9 @@ CL_LinkPlayers (void)
 		// stuff entity in map
 		r_funcs->R_AddEfrags (&cl.worldmodel->brush, ent);
 
-		if (state->pls.effects & EF_FLAG1)
+		if (state->pls.es.effects & EF_FLAG1)
 			CL_AddFlagModels (ent, 0, j);
-		else if (state->pls.effects & EF_FLAG2)
+		else if (state->pls.es.effects & EF_FLAG2)
 			CL_AddFlagModels (ent, 1, j);
 	}
 }
diff --git a/qw/source/cl_main.c b/qw/source/cl_main.c
index 656d6eb57..ea143c9ae 100644
--- a/qw/source/cl_main.c
+++ b/qw/source/cl_main.c
@@ -1631,8 +1631,8 @@ Host_Frame (float time)
 		oldself = &cl.frames[(cls.netchan.outgoing_sequence - 1)
 							 & UPDATE_MASK].playerstate[cl.playernum];
 		self->messagenum = cl.parsecount;
-		VectorCopy (oldself->pls.origin, self->pls.origin);
-		VectorCopy (oldself->pls.velocity, self->pls.velocity);
+		VectorCopy (oldself->pls.es.origin, self->pls.es.origin);
+		VectorCopy (oldself->pls.es.velocity, self->pls.es.velocity);
 		VectorCopy (oldself->viewangles, self->viewangles);
 
 		CL_ParseClientdata ();
diff --git a/qw/source/cl_pred.c b/qw/source/cl_pred.c
index 1ac6e5ca1..1fe115949 100644
--- a/qw/source/cl_pred.c
+++ b/qw/source/cl_pred.c
@@ -51,10 +51,10 @@ CL_PredictUsercmd (player_state_t * from, player_state_t * to, usercmd_t *u,
 				   qboolean clientplayer)
 {
 	if (!clientplayer) {
-		if (VectorIsZero (from->pls.velocity)) {
-			VectorCopy (from->pls.origin, to->pls.origin);
+		if (VectorIsZero (from->pls.es.velocity)) {
+			VectorCopy (from->pls.es.origin, to->pls.es.origin);
 			VectorCopy (u->angles, to->viewangles);
-			VectorCopy (from->pls.velocity, to->pls.velocity);
+			VectorCopy (from->pls.es.velocity, to->pls.es.velocity);
 			return;
 		}
 	}
@@ -72,9 +72,9 @@ CL_PredictUsercmd (player_state_t * from, player_state_t * to, usercmd_t *u,
 		return;
 	}
 
-	VectorCopy (from->pls.origin, pmove.origin);
+	VectorCopy (from->pls.es.origin, pmove.origin);
 	VectorCopy (u->angles, pmove.angles);
-	VectorCopy (from->pls.velocity, pmove.velocity);
+	VectorCopy (from->pls.es.velocity, pmove.velocity);
 
 	pmove.oldbuttons = from->oldbuttons;
 	pmove.oldonground = from->oldonground;
@@ -92,11 +92,11 @@ CL_PredictUsercmd (player_state_t * from, player_state_t * to, usercmd_t *u,
 	to->waterjumptime = pmove.waterjumptime;
 	to->oldbuttons = pmove.oldbuttons;	// Tonik
 	to->oldonground = pmove.oldonground;
-	VectorCopy (pmove.origin, to->pls.origin);
+	VectorCopy (pmove.origin, to->pls.es.origin);
 	VectorCopy (pmove.angles, to->viewangles);
-	VectorCopy (pmove.velocity, to->pls.velocity);
+	VectorCopy (pmove.velocity, to->pls.es.velocity);
 	to->onground = onground;
-	to->pls.weaponframe = from->pls.weaponframe;
+	to->pls.es.weaponframe = from->pls.es.weaponframe;
 }
 
 void
@@ -137,8 +137,8 @@ CL_PredictMove (void)
 	from = &cl.frames[cls.netchan.incoming_sequence & UPDATE_MASK];
 
 	if (!cl_predict->int_val) {
-		VectorCopy (from->playerstate[cl.playernum].pls.velocity, cl.simvel);
-		VectorCopy (from->playerstate[cl.playernum].pls.origin, cl.simorg);
+		VectorCopy (from->playerstate[cl.playernum].pls.es.velocity, cl.simvel);
+		VectorCopy (from->playerstate[cl.playernum].pls.es.origin, cl.simorg);
 		return;
 	}
 
@@ -175,21 +175,22 @@ CL_PredictMove (void)
 	}
 
 	for (i = 0; i < 3; i++)
-		if (fabs (from->playerstate[cl.playernum].pls.origin[i] -
-				  to->playerstate[cl.playernum].pls.origin[i]) > 128) {
+		if (fabs (from->playerstate[cl.playernum].pls.es.origin[i] -
+				  to->playerstate[cl.playernum].pls.es.origin[i]) > 128) {
 			// teleported, so don't lerp
-			VectorCopy (to->playerstate[cl.playernum].pls.velocity, cl.simvel);
-			VectorCopy (to->playerstate[cl.playernum].pls.origin, cl.simorg);
+			VectorCopy (to->playerstate[cl.playernum].pls.es.velocity,
+						cl.simvel);
+			VectorCopy (to->playerstate[cl.playernum].pls.es.origin, cl.simorg);
 			return;
 		}
 
 	for (i = 0; i < 3; i++) {
-		cl.simorg[i] = from->playerstate[cl.playernum].pls.origin[i] +
-			f * (to->playerstate[cl.playernum].pls.origin[i] -
-				   from->playerstate[cl.playernum].pls.origin[i]);
-		cl.simvel[i] = from->playerstate[cl.playernum].pls.velocity[i] +
-			f * (to->playerstate[cl.playernum].pls.velocity[i] -
-				 from->playerstate[cl.playernum].pls.velocity[i]);
+		cl.simorg[i] = from->playerstate[cl.playernum].pls.es.origin[i] +
+			f * (to->playerstate[cl.playernum].pls.es.origin[i] -
+				   from->playerstate[cl.playernum].pls.es.origin[i]);
+		cl.simvel[i] = from->playerstate[cl.playernum].pls.es.velocity[i] +
+			f * (to->playerstate[cl.playernum].pls.es.velocity[i] -
+				 from->playerstate[cl.playernum].pls.es.velocity[i]);
 	}
 }
 
diff --git a/qw/source/cl_view.c b/qw/source/cl_view.c
index 763de6767..3b1ca0688 100644
--- a/qw/source/cl_view.c
+++ b/qw/source/cl_view.c
@@ -600,7 +600,7 @@ V_CalcViewRoll (void)
 		v_dmg_time -= host_frametime;
 	}
 
-	if (view_state->pls.flags & PF_DEAD)		// PF_GIB will also set PF_DEAD
+	if (view_state->pls.es.flags & PF_DEAD)		// PF_GIB will also set PF_DEAD
 		r_data->refdef->viewangles[ROLL] = 80;	// dead view angle
 }
 
@@ -700,12 +700,12 @@ V_CalcRefdef (void)
 	else if (r_data->scr_viewsize->int_val == 80)
 		view->origin[2] += 0.5;
 
-	if (view_state->pls.flags & (PF_GIB | PF_DEAD)) {
+	if (view_state->pls.es.flags & (PF_GIB | PF_DEAD)) {
 		view->renderer.model = NULL;
 	} else {
 		view->renderer.model = cl.model_precache[cl.stats[STAT_WEAPON]];
 	}
-	view->animation.frame = view_state->pls.weaponframe;
+	view->animation.frame = view_state->pls.es.weaponframe;
 	view->renderer.skin = 0;
 
 	// set up the refresh position
@@ -757,9 +757,9 @@ V_RenderView (void)
 	view_frame = &cl.frames[cls.netchan.incoming_sequence & UPDATE_MASK];
 	view_state = &view_frame->playerstate[cl.playernum];
 
-	if (view_state->pls.flags & PF_GIB)
+	if (view_state->pls.es.flags & PF_GIB)
 		cl.viewheight = 8;			// gib view height
-	else if (view_state->pls.flags & PF_DEAD)
+	else if (view_state->pls.es.flags & PF_DEAD)
 		cl.viewheight = -16;			// corpse view height
 	else {
 		cl.viewheight = DEFAULT_VIEWHEIGHT;	// view height
diff --git a/qw/source/sv_ents.c b/qw/source/sv_ents.c
index a5d6b4db9..50c7a3d97 100644
--- a/qw/source/sv_ents.c
+++ b/qw/source/sv_ents.c
@@ -400,7 +400,7 @@ write_demoplayer (delta_t *delta, plent_state_t *from, plent_state_t *to,
 	int         flags;
 	int         j;
 
-	flags = to->flags >> 1;		// convert PF_(GIB|DEAD) to DF_(GIB|DEAD)
+	flags = to->es.flags >> 1;	// convert PF_(GIB|DEAD) to DF_(GIB|DEAD)
 	flags &= DF_GIB | DF_DEAD;	// PF_MSEC and PF_COMMAND aren't wanted
 	if (full) {
 		flags |= DF_ORIGIN | (DF_ORIGIN << 1) | (DF_ORIGIN << 2)
@@ -408,55 +408,55 @@ write_demoplayer (delta_t *delta, plent_state_t *from, plent_state_t *to,
 				| DF_EFFECTS | DF_SKINNUM | DF_WEAPONFRAME | DF_MODEL;
 	} else {
 		for (j = 0; j < 3; j++)
-			if (from->origin[j] != to->origin[j])
+			if (from->es.origin[j] != to->es.origin[j])
 				flags |= DF_ORIGIN << j;
 
 		for (j = 0; j < 3; j++)
 			if (from->cmd.angles[j] != to->cmd.angles[j])
 				flags |= DF_ANGLES << j;
 
-		if (from->modelindex != to->modelindex)
+		if (from->es.modelindex != to->es.modelindex)
 			flags |= DF_MODEL;
-		if ((from->effects & 0xff) != (to->effects & 0xff))
+		if ((from->es.effects & 0xff) != (to->es.effects & 0xff))
 			flags |= DF_EFFECTS;
-		if (from->skinnum != to->skinnum)
+		if (from->es.skinnum != to->es.skinnum)
 			flags |= DF_SKINNUM;
-		if (from->weaponframe != to->weaponframe)
+		if (from->es.weaponframe != to->es.weaponframe)
 			flags |= DF_WEAPONFRAME;
 	}
 
 	MSG_WriteByte (msg, svc_playerinfo);
-	MSG_WriteByte (msg, to->number);
+	MSG_WriteByte (msg, to->es.number);
 	MSG_WriteShort (msg, flags);
 
-	MSG_WriteByte (msg, to->frame);
+	MSG_WriteByte (msg, to->es.frame);
 
 	for (j = 0; j < 3; j++)
 		if (flags & (DF_ORIGIN << j))
-			MSG_WriteCoord (msg, to->origin[j]);
+			MSG_WriteCoord (msg, to->es.origin[j]);
 
 	for (j = 0; j < 3; j++)
 		if (flags & (DF_ANGLES << j))
 			MSG_WriteAngle16 (msg, to->cmd.angles[j]);
 
 	if (flags & DF_MODEL)
-		MSG_WriteByte (msg, to->modelindex);
+		MSG_WriteByte (msg, to->es.modelindex);
 
 	if (flags & DF_SKINNUM)
-		MSG_WriteByte (msg, to->skinnum);
+		MSG_WriteByte (msg, to->es.skinnum);
 
 	if (flags & DF_EFFECTS)
-		MSG_WriteByte (msg, to->effects);
+		MSG_WriteByte (msg, to->es.effects);
 
 	if (flags & DF_WEAPONFRAME)
-		MSG_WriteByte (msg, to->weaponframe);
+		MSG_WriteByte (msg, to->es.weaponframe);
 }
 
 static void
 write_player (delta_t *delta, plent_state_t *from, plent_state_t *to,
 			  sizebuf_t *msg, int mask, int full)
 {
-	int         flags = to->flags;
+	int         flags = to->es.flags;
 	int         qf_bits = 0;
 	int         i;
 	int         ds = delta->delta_sequence & 0x7f;
@@ -472,30 +472,30 @@ write_player (delta_t *delta, plent_state_t *from, plent_state_t *to,
 		ds = -1;
 	} else {
 		for (i = 0; i < 3; i++)
-			if (from->velocity[i] != to->velocity[i])
+			if (from->es.velocity[i] != to->es.velocity[i])
 				flags |= PF_VELOCITY1 << i;
-		if (from->modelindex != to->modelindex)
+		if (from->es.modelindex != to->es.modelindex)
 			flags |= PF_MODEL;
-		if (from->skinnum != to->skinnum)
+		if (from->es.skinnum != to->es.skinnum)
 			flags |= PF_SKINNUM;
-		if ((from->effects & 0xff) != (to->effects &0xff))
+		if ((from->es.effects & 0xff) != (to->es.effects &0xff))
 			flags |= PF_EFFECTS;
-		if (from->weaponframe != to->weaponframe)
+		if (from->es.weaponframe != to->es.weaponframe)
 			flags |= PF_WEAPONFRAME;
 
-		if (from->alpha != to->alpha)
+		if (from->es.alpha != to->es.alpha)
 			qf_bits |= PF_ALPHA;
-		if (from->scale != to->scale)
+		if (from->es.scale != to->es.scale)
 			qf_bits |= PF_SCALE;
-		if ((from->effects & 0xff00) != (to->effects & 0xff00))
+		if ((from->es.effects & 0xff00) != (to->es.effects & 0xff00))
 			qf_bits |= PF_EFFECTS2;
-		if (from->glow_size != to->glow_size)
+		if (from->es.glow_size != to->es.glow_size)
 			qf_bits |= PF_GLOWSIZE;
-		if (from->glow_color != to->glow_color)
+		if (from->es.glow_color != to->es.glow_color)
 			qf_bits |= PF_GLOWCOLOR;
-		if (from->colormod != to->colormod)
+		if (from->es.colormod != to->es.colormod)
 			qf_bits |= PF_COLORMOD;
-		if ((from->frame & 0xff00) != (to->frame & 0xff00))
+		if ((from->es.frame & 0xff00) != (to->es.frame & 0xff00))
 			qf_bits |= PF_FRAME2;
 		if (qf_bits)
 			flags |= PF_QF;
@@ -506,12 +506,12 @@ write_player (delta_t *delta, plent_state_t *from, plent_state_t *to,
 	MSG_WriteByte (msg, svc_playerinfo);
 	if (delta->type == dt_tp_qtv)
 		MSG_WriteByte (msg, ds);
-	MSG_WriteByte (msg, to->number);
+	MSG_WriteByte (msg, to->es.number);
 	MSG_WriteShort (msg, flags);
 
-	MSG_WriteCoordV (msg, to->origin);
+	MSG_WriteCoordV (msg, to->es.origin);
 
-	MSG_WriteByte (msg, to->frame);
+	MSG_WriteByte (msg, to->es.frame);
 
 	if (flags & PF_MSEC)
 		MSG_WriteByte (msg, to->msec);
@@ -519,32 +519,32 @@ write_player (delta_t *delta, plent_state_t *from, plent_state_t *to,
 		MSG_WriteDeltaUsercmd (msg, &from->cmd, &to->cmd);
 	for (i = 0; i < 3; i++)
 		if (flags & (PF_VELOCITY1 << i))
-			MSG_WriteShort (msg, to->velocity[i]);
+			MSG_WriteShort (msg, to->es.velocity[i]);
 	if (flags & PF_MODEL)
-		MSG_WriteByte (msg, to->modelindex);
+		MSG_WriteByte (msg, to->es.modelindex);
 	if (flags & PF_SKINNUM)
-		MSG_WriteByte (msg, to->skinnum);
+		MSG_WriteByte (msg, to->es.skinnum);
 	if (flags & PF_EFFECTS)
-		MSG_WriteByte (msg, to->effects);
+		MSG_WriteByte (msg, to->es.effects);
 	if (flags & PF_WEAPONFRAME)
-		MSG_WriteByte (msg, to->weaponframe);
+		MSG_WriteByte (msg, to->es.weaponframe);
 
 	if (flags & PF_QF) {
 		MSG_WriteByte (msg, qf_bits);
 		if (qf_bits & PF_ALPHA)
-			MSG_WriteByte (msg, to->alpha);
+			MSG_WriteByte (msg, to->es.alpha);
 		if (qf_bits & PF_SCALE)
-			MSG_WriteByte (msg, to->scale);
+			MSG_WriteByte (msg, to->es.scale);
 		if (qf_bits & PF_EFFECTS2)
-			MSG_WriteByte (msg, to->effects >> 8);
+			MSG_WriteByte (msg, to->es.effects >> 8);
 		if (qf_bits & PF_GLOWSIZE)
-			MSG_WriteByte (msg, to->glow_size);
+			MSG_WriteByte (msg, to->es.glow_size);
 		if (qf_bits & PF_GLOWCOLOR)
-			MSG_WriteByte (msg, to->glow_color);
+			MSG_WriteByte (msg, to->es.glow_color);
 		if (qf_bits & PF_COLORMOD)
-			MSG_WriteByte (msg, to->colormod);
+			MSG_WriteByte (msg, to->es.colormod);
 		if (qf_bits & PF_FRAME2)
-			MSG_WriteByte (msg, to->frame);
+			MSG_WriteByte (msg, to->es.frame);
 	}
 }
 
@@ -566,19 +566,19 @@ SV_WritePlayersToClient (delta_t *delta, byte *pvs, sizebuf_t *msg)
 	void (*write) (delta_t *, plent_state_t *, plent_state_t *, sizebuf_t *,
 				   int, int);
 
-	if (!null_player_state.alpha) {
-		null_player_state.alpha = 255;
-		null_player_state.scale = 16;
-		null_player_state.glow_size = 0;
-		null_player_state.glow_color = 254;
-		null_player_state.colormod = 255;
+	if (!null_player_state.es.alpha) {
+		null_player_state.es.alpha = 255;
+		null_player_state.es.scale = 16;
+		null_player_state.es.glow_size = 0;
+		null_player_state.es.glow_color = 254;
+		null_player_state.es.colormod = 255;
 	}
-	null_player_state.modelindex = 0;
+	null_player_state.es.modelindex = 0;
 
 	if (delta->client) {
 		clent = delta->client->edict;
 		spec_track = delta->client->spec_track;
-		null_player_state.modelindex = sv_playermodel;
+		null_player_state.es.modelindex = sv_playermodel;
 		full = 0;		// normal qw clients don't get real deltas on players
 	}
 
@@ -625,9 +625,9 @@ SV_WritePlayersToClient (delta_t *delta, byte *pvs, sizebuf_t *msg)
 			state = &pack->players[pack->num_players];
 		pack->num_players++;
 
-		state->number = j;
-		state->flags = 0;
-		VectorCopy (SVvector (ent, origin), state->origin);
+		state->es.number = j;
+		state->es.flags = 0;
+		VectorCopy (SVvector (ent, origin), state->es.origin);
 
 		state->msec = min (255, 1000 * (sv.time - cl->localtime));
 
@@ -639,44 +639,44 @@ SV_WritePlayersToClient (delta_t *delta, byte *pvs, sizebuf_t *msg)
 			state->cmd.angles[0] = 0;
 		}
 
-		VectorCopy (SVvector (ent, velocity), state->velocity);
-		state->modelindex = SVfloat (ent, modelindex);
-		state->frame = SVfloat (ent, frame);
-		state->skinnum = SVfloat (ent, skin);
-		state->effects = SVfloat (ent, effects);
-		state->weaponframe = SVfloat (ent, weaponframe);
+		VectorCopy (SVvector (ent, velocity), state->es.velocity);
+		state->es.modelindex = SVfloat (ent, modelindex);
+		state->es.frame = SVfloat (ent, frame);
+		state->es.skinnum = SVfloat (ent, skin);
+		state->es.effects = SVfloat (ent, effects);
+		state->es.weaponframe = SVfloat (ent, weaponframe);
 
 		if (SVfloat (ent, health) <= 0)
-			state->flags |= PF_DEAD;
+			state->es.flags |= PF_DEAD;
 		if (SVvector (ent, mins)[2] != -24)
-			state->flags |= PF_GIB;
-		state->flags |= PF_MSEC | PF_COMMAND;
+			state->es.flags |= PF_GIB;
+		state->es.flags |= PF_MSEC | PF_COMMAND;
 
-		state->alpha = 255;
-		state->scale = 16;
-		state->glow_size = 0;
-		state->glow_color = 254;
-		state->colormod = 255;
+		state->es.alpha = 255;
+		state->es.scale = 16;
+		state->es.glow_size = 0;
+		state->es.glow_color = 254;
+		state->es.colormod = 255;
 		if (sv_fields.alpha != -1 && SVfloat (ent, alpha)) {
 			float       alpha = SVfloat (ent, alpha);
-			state->alpha = bound (0, alpha, 1) * 255.0;
+			state->es.alpha = bound (0, alpha, 1) * 255.0;
 		}
 		if (sv_fields.scale != -1 && SVfloat (ent, scale)) {
 			float       scale = SVfloat (ent, scale);
-			state->scale = bound (0, scale, 15.9375) * 16;
+			state->es.scale = bound (0, scale, 15.9375) * 16;
 		}
 		if (sv_fields.glow_size != -1 && SVfloat (ent, glow_size)) {
 			int         glow_size = SVfloat (ent, glow_size);
-			state->glow_size = bound (-1024, glow_size, 1016) >> 3;
+			state->es.glow_size = bound (-1024, glow_size, 1016) >> 3;
 		}
 		if (sv_fields.glow_color != -1 && SVfloat (ent, glow_color))
-			state->glow_color = SVfloat (ent, glow_color);
+			state->es.glow_color = SVfloat (ent, glow_color);
 		if (sv_fields.colormod != -1
 			&& !VectorIsZero (SVvector (ent, colormod))) {
 			float      *colormod= SVvector (ent, colormod);
-			state->colormod = ((int) (bound (0, colormod[0], 1) * 7) << 5) |
-							  ((int) (bound (0, colormod[1], 1) * 7) << 2) |
-							   (int) (bound (0, colormod[2], 1) * 3);
+			state->es.colormod = ((int) (bound (0, colormod[0], 1) * 7) << 5) |
+								 ((int) (bound (0, colormod[1], 1) * 7) << 2) |
+								  (int) (bound (0, colormod[2], 1) * 3);
 		}
 
 		if (cl->spectator) {
@@ -693,10 +693,10 @@ SV_WritePlayersToClient (delta_t *delta, byte *pvs, sizebuf_t *msg)
 
 		if (from_pack && from_pack->players) {
 			while (k < from_pack->num_players
-				   && from_pack->players[k].number < state->number)
+				   && from_pack->players[k].es.number < state->es.number)
 				k++;
 			if (k < from_pack->num_players
-				&& from_pack->players[k].number == state->number) {
+				&& from_pack->players[k].es.number == state->es.number) {
 				write (delta, &from_pack->players[k], state, msg, mask, full);
 				continue;
 			}

From 36761192a6d6ff1f037ee0a49e746b93c01dede9 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 11 Mar 2021 15:23:35 +0900
Subject: [PATCH 1477/1519] [qw] Partially clean up muzzle flash handling

It needs some more work (see FIXME in the code).
---
 include/client/effects.h |  4 ++++
 libs/client/cl_effects.c | 39 ++++++++++++++++++++++-----------------
 qw/source/cl_parse.c     | 30 ++++++++++++------------------
 3 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/include/client/effects.h b/include/client/effects.h
index 1f1259274..9fea133d2 100644
--- a/include/client/effects.h
+++ b/include/client/effects.h
@@ -30,6 +30,8 @@
 #ifndef __client_effects_h
 #define __client_effects_h
 
+#include "QF/simd/types.h"
+
 struct entity_s;
 struct entity_state_s;
 
@@ -39,5 +41,7 @@ void CL_ModelEffects (struct entity_s *ent, int num, int glow_color,
 					  double time);
 void CL_EntityEffects (int num, struct entity_s *ent,
 					   struct entity_state_s *state, double time);
+void CL_MuzzleFlash (vec4f_t position, vec4f_t fv, float zoffset, int num,
+					 double time);
 
 #endif//__client_effects_h
diff --git a/libs/client/cl_effects.c b/libs/client/cl_effects.c
index 3030431a8..cc702587c 100644
--- a/libs/client/cl_effects.c
+++ b/libs/client/cl_effects.c
@@ -148,28 +148,33 @@ CL_ModelEffects (entity_t *ent, int num, int glow_color, double time)
 			r_funcs->particles->R_GlowTrail (ent, glow_color);
 }
 
+void
+CL_MuzzleFlash (vec4f_t position, vec4f_t fv, float zoffset, int num,
+				double time)
+{
+	dlight_t   *dl = r_funcs->R_AllocDlight (num);
+	if (dl) {
+		position += 18 * fv;
+		VectorCopy (position, dl->origin);
+		dl->origin[2] += zoffset;
+		dl->radius = 200 + (rand () & 31);
+		dl->die = time + 0.1;
+		dl->minlight = 32;
+		dl->color[0] = 0.2;
+		dl->color[1] = 0.1;
+		dl->color[2] = 0.05;
+		dl->color[3] = 0.7;
+	}
+}
+
 void
 CL_EntityEffects (int num, entity_t *ent, entity_state_t *state, double time)
 {
-	dlight_t   *dl;
-
 	if (state->effects & EF_BRIGHTFIELD)
 		r_funcs->particles->R_EntityParticles (ent);
 	if (state->effects & EF_MUZZLEFLASH) {
-		dl = r_funcs->R_AllocDlight (num);
-		if (dl) {
-			vec4f_t     position = Transform_GetWorldPosition (ent->transform);
-			vec4f_t     fv = Transform_Forward (ent->transform);
-			position += 18 * fv;
-			VectorCopy (position, dl->origin);
-			dl->origin[2] += 16;
-			dl->radius = 200 + (rand () & 31);
-			dl->die = time + 0.1;
-			dl->minlight = 32;
-			dl->color[0] = 0.2;
-			dl->color[1] = 0.1;
-			dl->color[2] = 0.05;
-			dl->color[3] = 0.7;
-		}
+		vec4f_t     position = Transform_GetWorldPosition (ent->transform);
+		vec4f_t     fv = Transform_Forward (ent->transform);
+		CL_MuzzleFlash (position, fv, 16, num, time);
 	}
 }
diff --git a/qw/source/cl_parse.c b/qw/source/cl_parse.c
index 7366b4da0..095f636bc 100644
--- a/qw/source/cl_parse.c
+++ b/qw/source/cl_parse.c
@@ -65,6 +65,7 @@
 #include "clview.h"
 #include "sbar.h"
 
+#include "client/effects.h"
 #include "client/temp_entities.h"
 
 #include "qw/bothdefs.h"
@@ -1255,12 +1256,14 @@ CL_SetStat (int stat, int value)
 }
 
 static void
-CL_MuzzleFlash (void)
+CL_ParseMuzzleFlash (void)
 {
-	dlight_t   *dl;
+	//FIXME this should just enable the effect on the relevant entity and
+	//then automatic entity updates take care of the rest
 	int			i;
 	player_state_t *pl;
-	vec3_t		fv, rv, uv;
+	vec3_t		f, r, u;
+	vec4f_t     position = { 0, 0, 0, 1}, fv = {};
 
 	i = MSG_ReadShort (net_message);
 
@@ -1269,23 +1272,14 @@ CL_MuzzleFlash (void)
 
 	pl = &cl.frames[parsecountmod].playerstate[i - 1];
 
-	dl = r_funcs->R_AllocDlight (i);
-	if (!dl)
-		return;
-
 	if (i - 1 == cl.playernum)
-		AngleVectors (cl.viewangles, fv, rv, uv);
+		AngleVectors (cl.viewangles, f, r, u);
 	else
-		AngleVectors (pl->viewangles, fv, rv, uv);
+		AngleVectors (pl->viewangles, f, r, u);
 
-	VectorMultAdd (pl->pls.origin, 18, fv, dl->origin);
-	dl->radius = 200 + (rand () & 31);
-	dl->die = cl.time + 0.1;
-	dl->minlight = 32;
-	dl->color[0] = 0.2;
-	dl->color[1] = 0.1;
-	dl->color[2] = 0.05;
-	dl->color[3] = 0.7;
+	VectorCopy (f, fv);
+	VectorCopy (pl->pls.es.origin, position);
+	CL_MuzzleFlash (position, fv, 0, i, cl.time);
 }
 
 #define SHOWNET(x) \
@@ -1621,7 +1615,7 @@ CL_ParseServerMessage (void)
 				break;
 
 			case svc_muzzleflash:
-				CL_MuzzleFlash ();
+				CL_ParseMuzzleFlash ();
 				break;
 
 			case svc_updateuserinfo:

From 8466de2325a874d787b422f84e95d044793cef90 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 11 Mar 2021 16:19:49 +0900
Subject: [PATCH 1478/1519] [client] Use vec4_t in entity_state_t

And clean up the mess (sort of:P)
---
 include/client/effects.h  |  2 +-
 include/client/entities.h |  5 +++--
 include/client/locs.h     | 19 ++++++++++---------
 include/clview.h          |  3 ++-
 libs/client/cl_effects.c  |  2 +-
 libs/client/locs.c        | 31 +++++++++++++++++--------------
 nq/include/client.h       |  8 ++++----
 nq/source/cl_demo.c       |  4 ++--
 nq/source/cl_ents.c       | 16 ++++++++--------
 nq/source/cl_parse.c      | 13 +++++++------
 nq/source/cl_view.c       | 12 +++++++-----
 nq/source/sv_main.c       |  3 ++-
 qtv/source/client.c       |  3 ++-
 qtv/source/sv_parse.c     |  5 +++--
 qw/include/client.h       |  4 ++--
 qw/source/cl_cam.c        |  8 ++++----
 qw/source/cl_demo.c       |  2 +-
 qw/source/cl_entparse.c   |  2 +-
 qw/source/cl_ents.c       |  7 ++++---
 qw/source/cl_parse.c      |  6 ++++--
 qw/source/cl_pred.c       | 11 +++--------
 qw/source/cl_view.c       | 20 +++++++++++---------
 qw/source/sv_ents.c       |  2 +-
 qw/source/sv_init.c       |  4 ++--
 qw/source/teamplay.c      |  8 ++++----
 25 files changed, 106 insertions(+), 94 deletions(-)

diff --git a/include/client/effects.h b/include/client/effects.h
index 9fea133d2..dbec75769 100644
--- a/include/client/effects.h
+++ b/include/client/effects.h
@@ -35,7 +35,7 @@
 struct entity_s;
 struct entity_state_s;
 
-void CL_NewDlight (int key, vec3_t org, int effects, byte glow_size,
+void CL_NewDlight (int key, vec4f_t org, int effects, byte glow_size,
 				   byte glow_color, double time);
 void CL_ModelEffects (struct entity_s *ent, int num, int glow_color,
 					  double time);
diff --git a/include/client/entities.h b/include/client/entities.h
index 45420cbb7..fda534295 100644
--- a/include/client/entities.h
+++ b/include/client/entities.h
@@ -32,6 +32,7 @@
 #define __client_entities_h
 
 #include "QF/qtypes.h"
+#include "QF/simd/types.h"
 
 // entity_state_t is the information conveyed from the server
 // in an update message
@@ -39,8 +40,8 @@ typedef struct entity_state_s {
 	int         number;			// edict index
 	unsigned    flags;			// nolerp, etc
 
-	vec3_t      origin;
-	vec3_t      velocity;
+	vec4f_t     origin;
+	vec4f_t     velocity;
 	vec3_t      angles;
 	uint16_t    modelindex;
 	uint16_t    frame;
diff --git a/include/client/locs.h b/include/client/locs.h
index 8786c6532..06817ef5a 100644
--- a/include/client/locs.h
+++ b/include/client/locs.h
@@ -29,23 +29,24 @@
 #define __QF_locs_h
 
 #include "QF/qtypes.h"
+#include "QF/simd/types.h"
 
 typedef struct
 {
-	vec3_t	loc;
-	char	*name;
+	vec4f_t     loc;
+	char       *name;
 } location_t;
 
-location_t *locs_find(const vec3_t target) __attribute__((pure));
-void locs_add (const vec3_t location, const char *name);
-void locs_del (const vec3_t loc);
-void locs_edit (const vec3_t loc, const char *desc);
+location_t *locs_find(vec4f_t target) __attribute__((pure));
+void locs_add (vec4f_t location, const char *name);
+void locs_del (vec4f_t loc);
+void locs_edit (vec4f_t loc, const char *desc);
 void locs_load(const char *filename);
-void locs_mark (const vec3_t loc, const char *desc);
-int  locs_nearest (const vec3_t loc) __attribute__((pure));
+void locs_mark (vec4f_t loc, const char *desc);
+int  locs_nearest (vec4f_t loc) __attribute__((pure));
 void locs_reset (void);
 void locs_save (const char *filename, qboolean gz);
 void map_to_loc (const char *mapname, char *filename);
-void locs_draw (vec3_t simorg);
+void locs_draw (vec4f_t simorg);
 
 #endif//__QF_locs_h
diff --git a/include/clview.h b/include/clview.h
index 7568ab23b..2b2cbffb2 100644
--- a/include/clview.h
+++ b/include/clview.h
@@ -30,6 +30,7 @@
 #define __clview_h_
 
 #include "QF/mathlib.h"
+#include "QF/simd/types.h"
 
 #define INFO_CSHIFT_BONUS		(1 << 0)
 #define INFO_CSHIFT_CONTENTS	(1 << 1)
@@ -39,7 +40,7 @@
 void V_Init (void);
 void V_Init_Cvars (void);
 void V_RenderView (void);
-float V_CalcRoll (const vec3_t angles, const vec3_t velocity);
+float V_CalcRoll (const vec3_t angles, vec4f_t velocity);
 void V_UpdatePalette (void);
 void V_StartPitchDrift (void);
 void V_StopPitchDrift (void);
diff --git a/libs/client/cl_effects.c b/libs/client/cl_effects.c
index cc702587c..af40dc62c 100644
--- a/libs/client/cl_effects.c
+++ b/libs/client/cl_effects.c
@@ -47,7 +47,7 @@
 #include "client/effects.h"
 
 void
-CL_NewDlight (int key, vec3_t org, int effects, byte glow_size,
+CL_NewDlight (int key, vec4f_t org, int effects, byte glow_size,
 			  byte glow_color, double time)
 {
 	float       radius;
diff --git a/libs/client/locs.c b/libs/client/locs.c
index dd6a17d9f..07deee426 100644
--- a/libs/client/locs.c
+++ b/libs/client/locs.c
@@ -48,6 +48,8 @@
 #include "QF/sys.h"
 #include "QF/va.h"
 
+#include "QF/simd/vec4f.h"
+
 #include "QF/plugin/vid_render.h"	//FIXME
 
 #include "compat.h"
@@ -63,7 +65,7 @@ int          locations_count = 0;
 int          location_blocks = 0;
 
 int
-locs_nearest (const vec3_t loc)
+locs_nearest (vec4f_t loc)
 {
 	float       best_distance = 9999999, distance;
 	int         i, j = -1;
@@ -71,7 +73,8 @@ locs_nearest (const vec3_t loc)
 
 	for (i = 0; i < locations_count; i++) {
 		cur = locations[i];
-		distance = VectorDistance_fast (loc, cur->loc);
+		vec4f_t     d = loc - cur->loc;
+		distance = dotf (d, d)[0];
 		if ((distance < best_distance)) {
 			best_distance = distance;
 			j = i;
@@ -81,7 +84,7 @@ locs_nearest (const vec3_t loc)
 }
 
 location_t *
-locs_find (const vec3_t target)
+locs_find (vec4f_t target)
 {
 	int i;
 
@@ -110,7 +113,7 @@ locs_more (void)
 }
 
 void
-locs_add (const vec3_t location, const char *name)
+locs_add (vec4f_t location, const char *name)
 {
 	int         num;
 
@@ -137,7 +140,7 @@ locs_load (const char *filename)
 	const char *tmp;
 	char       *t1, *t2;
 	const char *line;
-	vec3_t      loc;
+	vec4f_t     loc;
 	QFile      *file;
 
 	tmp = va (0, "maps/%s", filename);
@@ -216,7 +219,7 @@ locs_save (const char *filename, qboolean gz)
 }
 
 void
-locs_mark (const vec3_t loc, const char *desc)
+locs_mark (vec4f_t loc, const char *desc)
 {
 	locs_add (loc, desc);
 	Sys_Printf ("Marked current location: %s\n", desc);
@@ -229,14 +232,14 @@ locs_mark (const vec3_t loc, const char *desc)
     call with NULL description to modify location vectors
 */
 void
-locs_edit (const vec3_t loc, const char *desc)
+locs_edit (vec4f_t loc, const char *desc)
 {
 	int i;
 
 	if (locations_count) {
 		i = locs_nearest (loc);
 		if (!desc) {
-			VectorCopy (loc, locations[i]->loc);
+			locations[i]->loc = loc;
 			Sys_Printf ("Moving location marker for %s\n",
 					locations[i]->name);
 		} else {
@@ -250,7 +253,7 @@ locs_edit (const vec3_t loc, const char *desc)
 }
 
 void
-locs_del (const vec3_t loc)
+locs_del (vec4f_t loc)
 {
 	int i;
 
@@ -282,12 +285,12 @@ map_to_loc (const char *mapname, char *filename)
 }
 
 void
-locs_draw (vec3_t simorg)
+locs_draw (vec4f_t simorg)
 {
 	//FIXME custom ent rendering code would be nice
 	dlight_t   *dl;
 	location_t *nearloc;
-	vec3_t      trueloc;
+	vec4f_t     trueloc;
 	int         i;
 
 	nearloc = locs_find (simorg);
@@ -302,14 +305,14 @@ locs_draw (vec3_t simorg)
 			dl->color[2] = 0;
 			dl->color[3] = 0.7;
 		}
-		VectorCopy (nearloc->loc, trueloc);
+		trueloc = nearloc->loc;
 		r_funcs->particles->R_Particle_New (pt_smokecloud, part_tex_smoke,
-				trueloc, 2.0,
+				&trueloc[0], 2.0,//FIXME
 				vec3_origin, r_data->realtime + 9.0, 254,
 				0.25 + qfrandom (0.125), 0.0);
 		for (i = 0; i < 15; i++)
 			r_funcs->particles->R_Particle_NewRandom (pt_fallfade,
-					part_tex_dot, trueloc, 12,
+					part_tex_dot, &trueloc[0], 12,//FIXME
 					0.7, 96, r_data->realtime + 5.0,
 					104 + (rand () & 7), 1.0, 0.0);
 	}
diff --git a/nq/include/client.h b/nq/include/client.h
index 07c43ae87..4af07cd24 100644
--- a/nq/include/client.h
+++ b/nq/include/client.h
@@ -162,13 +162,13 @@ typedef struct {
 // server each frame.  The server sets punchangle when the view is temporarily
 // offset, and an angle reset commands at the start of each level and after
 // teleporting.
-	int         mindex;
-	vec3_t      mviewangles[2];	// During demo playback viewangles is lerped
+	int         frameIndex;
+	vec3_t      frameViewAngles[2];	// During demo playback viewangles is lerped
 								// between these
 	vec3_t      viewangles;
-	vec3_t      mvelocity[2];	// Update by server, used for lean+bob
+	vec4f_t     frameVelocity[2];	// Update by server, used for lean+bob
 								// (0 is newest)
-	vec3_t      velocity;		// Lerped between mvelocity[0] and [1]
+	vec4f_t     velocity;		// Lerped between frameVelocity[0] and [1]
 	vec3_t      punchangle;		// Temporary offset
 
 // pitch drifting vars
diff --git a/nq/source/cl_demo.c b/nq/source/cl_demo.c
index 772778b92..39cdf9d24 100644
--- a/nq/source/cl_demo.c
+++ b/nq/source/cl_demo.c
@@ -182,14 +182,14 @@ read_demopacket (void)
 	if (net_message->message->cursize > MAX_DEMMSG)
 		Host_Error ("Demo message > MAX_DEMMSG: %d/%d",
 					net_message->message->cursize, MAX_DEMMSG);
-	VectorCopy (cl.mviewangles[0], cl.mviewangles[1]);
+	VectorCopy (cl.frameViewAngles[0], cl.frameViewAngles[1]);
 	for (i = 0; i < 3; i++) {
 		r = Qread (cls.demofile, &f, 4);
 		if (r != 4) {
 			CL_StopPlayback ();
 			return 0;
 		}
-		cl.mviewangles[0][i] = LittleFloat (f);
+		cl.frameViewAngles[0][i] = LittleFloat (f);
 	}
 	r = Qread (cls.demofile, net_message->message->data,
 			   net_message->message->cursize);
diff --git a/nq/source/cl_ents.c b/nq/source/cl_ents.c
index 957cadb6a..e8aecb26c 100644
--- a/nq/source/cl_ents.c
+++ b/nq/source/cl_ents.c
@@ -156,19 +156,18 @@ CL_RelinkEntities (void)
 	frac = CL_LerpPoint ();
 
 	// interpolate player info
-	for (i = 0; i < 3; i++)
-		cl.velocity[i] = cl.mvelocity[1][i] +
-			frac * (cl.mvelocity[0][i] - cl.mvelocity[1][i]);
+	cl.velocity = cl.frameVelocity[1]
+		+ frac * (cl.frameVelocity[0] - cl.frameVelocity[1]);
 
 	if (cls.demoplayback) {
 		// interpolate the angles
 		for (j = 0; j < 3; j++) {
-			d = cl.mviewangles[0][j] - cl.mviewangles[1][j];
+			d = cl.frameViewAngles[0][j] - cl.frameViewAngles[1][j];
 			if (d > 180)
 				d -= 360;
 			else if (d < -180)
 				d += 360;
-			cl.viewangles[j] = cl.mviewangles[1][j] + frac * d;
+			cl.viewangles[j] = cl.frameViewAngles[1][j] + frac * d;
 		}
 	}
 
@@ -176,8 +175,8 @@ CL_RelinkEntities (void)
 
 	// start on the entity after the world
 	for (i = 1; i < cl.num_entities; i++) {
-		new = &nq_entstates.frame[0 + cl.mindex][i];
-		old = &nq_entstates.frame[1 - cl.mindex][i];
+		new = &nq_entstates.frame[0 + cl.frameIndex][i];
+		old = &nq_entstates.frame[1 - cl.frameIndex][i];
 		ent = &cl_entities[i];
 		renderer = &ent->renderer;
 		animation = &ent->animation;
@@ -293,7 +292,8 @@ CL_RelinkEntities (void)
 			CL_TransformEntity (ent, angles);
 		}
 		CL_EntityEffects (i, ent, new, cl.time);
-		CL_NewDlight (i, ent->origin, new->effects, new->glow_size,
+		vec4f_t org = { VectorExpand (ent->origin), 1}; //FIXME
+		CL_NewDlight (i, org, new->effects, new->glow_size,
 					  new->glow_color, cl.time);
 		if (VectorDistance_fast (old->origin, ent->origin) > (256 * 256))
 			VectorCopy (ent->origin, old->origin);
diff --git a/nq/source/cl_parse.c b/nq/source/cl_parse.c
index 260920d13..ccf535e18 100644
--- a/nq/source/cl_parse.c
+++ b/nq/source/cl_parse.c
@@ -491,7 +491,7 @@ CL_ParseUpdate (int bits)
 		num = MSG_ReadByte (net_message);
 
 	baseline = CL_EntityNum (num);
-	state = &nq_entstates.frame[0 + cl.mindex][num];
+	state = &nq_entstates.frame[0 + cl.frameIndex][num];
 
 	for (i = 0; i < 16; i++)
 		if (bits & (1 << i))
@@ -620,7 +620,8 @@ CL_ParseBaseline (entity_state_t *baseline, int version)
 	baseline->colormap = MSG_ReadByte (net_message);
 	baseline->skinnum = MSG_ReadByte (net_message);
 
-	MSG_ReadCoordAngleV (net_message, baseline->origin, baseline->angles);
+	MSG_ReadCoordAngleV (net_message, &baseline->origin[0], baseline->angles);
+	baseline->origin[3] = 1;//FIXME
 
 	if (bits & B_ALPHA)
 		baseline->alpha = MSG_ReadByte (net_message);
@@ -659,17 +660,17 @@ CL_ParseClientdata (void)
 	else
 		cl.idealpitch = 0;
 
-	VectorCopy (cl.mvelocity[0], cl.mvelocity[1]);
+	cl.frameVelocity[1] = cl.frameVelocity[0];
 	for (i = 0; i < 3; i++) {
 		if (bits & (SU_PUNCH1 << i))
 			cl.punchangle[i] = ((signed char) MSG_ReadByte (net_message));
 		else
 			cl.punchangle[i] = 0;
 		if (bits & (SU_VELOCITY1 << i))
-			cl.mvelocity[0][i] = ((signed char) MSG_ReadByte (net_message))
+			cl.frameVelocity[0][i] = ((signed char) MSG_ReadByte (net_message))
 				* 16;
 		else
-			cl.mvelocity[0][i] = 0;
+			cl.frameVelocity[0][i] = 0;
 	}
 
 	//FIXME
@@ -918,7 +919,7 @@ CL_ParseServerMessage (void)
 			case svc_time:
 				cl.mtime[1] = cl.mtime[0];
 				cl.mtime[0] = MSG_ReadFloat (net_message);
-				cl.mindex = !cl.mindex;
+				cl.frameIndex = !cl.frameIndex;
 				break;
 
 			case svc_print:
diff --git a/nq/source/cl_view.c b/nq/source/cl_view.c
index e6812a263..fa62de0fd 100644
--- a/nq/source/cl_view.c
+++ b/nq/source/cl_view.c
@@ -33,6 +33,8 @@
 #include "QF/msg.h"
 #include "QF/screen.h"
 
+#include "QF/simd/vec4f.h"
+
 #include "QF/plugin/vid_render.h"
 
 #include "compat.h"
@@ -87,7 +89,7 @@ cshift_t    cshift_bonus = { {215, 186, 60}, 50};
 #define sqr(x) ((x) * (x))
 
 float
-V_CalcRoll (const vec3_t angles, const vec3_t velocity)
+V_CalcRoll (const vec3_t angles, vec4f_t velocity)
 {
 	float       side, sign, value;
 	vec3_t      forward, right, up;
@@ -110,7 +112,7 @@ V_CalcRoll (const vec3_t angles, const vec3_t velocity)
 static float
 V_CalcBob (void)
 {
-	vec_t      *velocity = cl.velocity;
+	vec4f_t     velocity = cl.velocity;
 	float       cycle;
 	static double bobtime;
 	static float bob;
@@ -132,8 +134,8 @@ V_CalcBob (void)
 
 	// bob is proportional to velocity in the xy plane
 	// (don't count Z, or jumping messes it up)
-
-	bob = sqrt (sqr (velocity[0]) + sqr (velocity[1])) * cl_bob->value;
+	velocity[2] = 0;
+	bob = sqrt (dotf (velocity, velocity)[0]) * cl_bob->value;
 	bob = bob * 0.3 + bob * 0.7 * sin (cycle * M_PI);
 	if (bob > 4)
 		bob = 4;
@@ -582,7 +584,7 @@ V_CalcViewRoll (void)
 {
 	float       side;
 	vec_t      *angles = cl_entities[cl.viewentity].angles;
-	vec_t      *velocity = cl.velocity;
+	vec4f_t     velocity = cl.velocity;
 
 	side = V_CalcRoll (angles, velocity);
 	r_data->refdef->viewangles[ROLL] += side;
diff --git a/nq/source/sv_main.c b/nq/source/sv_main.c
index 38604e66c..d8a98b5b4 100644
--- a/nq/source/sv_main.c
+++ b/nq/source/sv_main.c
@@ -1037,7 +1037,8 @@ SV_CreateBaseline (void)
 		MSG_WriteByte (&sv.signon, baseline->colormap);
 		MSG_WriteByte (&sv.signon, baseline->skinnum);
 
-		MSG_WriteCoordAngleV (&sv.signon, baseline->origin, baseline->angles);
+		MSG_WriteCoordAngleV (&sv.signon, &baseline->origin[0],//FIXME
+							  baseline->angles);
 
 		if (bits & B_ALPHA)
 			MSG_WriteByte (&sv.signon, baseline->alpha);
diff --git a/qtv/source/client.c b/qtv/source/client.c
index 6da363953..43e3f424f 100644
--- a/qtv/source/client.c
+++ b/qtv/source/client.c
@@ -682,7 +682,8 @@ write_player (int num, plent_state_t *pl, server_t *sv, sizebuf_t *msg)
 	MSG_WriteByte (msg, num);
 	MSG_WriteShort (msg, pflags);
 
-	MSG_WriteCoordV (msg, pl->es.origin);
+	MSG_WriteCoordV (msg, &pl->es.origin[0]);//FIXME
+	pl->es.origin[3] = 1;
 
 	MSG_WriteByte (msg, pl->es.frame);
 
diff --git a/qtv/source/sv_parse.c b/qtv/source/sv_parse.c
index 268e9999d..fcf5c3616 100644
--- a/qtv/source/sv_parse.c
+++ b/qtv/source/sv_parse.c
@@ -515,7 +515,7 @@ parse_player_delta (qmsg_t *msg, plent_state_t *from, plent_state_t *to)
 	int          flags;
 
 	flags = to->es.flags = MSG_ReadShort (msg);
-	MSG_ReadCoordV (msg, to->es.origin);
+	MSG_ReadCoordV (msg, &to->es.origin[0]);
 	to->es.frame = (to->es.frame & 0xff00) | MSG_ReadByte (msg);
 	if (flags & PF_MSEC)
 		to->msec = MSG_ReadByte (msg);
@@ -752,7 +752,8 @@ parse_baseline (qmsg_t *msg, entity_state_t *ent)
 	ent->frame = MSG_ReadByte (msg);
 	ent->colormap = MSG_ReadByte (msg);
 	ent->skinnum = MSG_ReadByte (msg);
-	MSG_ReadCoordAngleV (msg, ent->origin, ent->angles);
+	MSG_ReadCoordAngleV (msg, &ent->origin[0], ent->angles); //FIXME
+	ent->origin[3] = 1;
 	ent->colormod = 255;
 	ent->alpha = 255;
 	ent->scale = 16;
diff --git a/qw/include/client.h b/qw/include/client.h
index 3c64c128b..5389579c4 100644
--- a/qw/include/client.h
+++ b/qw/include/client.h
@@ -222,8 +222,8 @@ typedef struct {
 // the client simulates or interpolates movement to get these values
 	double      time;			// this is the time value that the client
 								// is rendering at.  always <= realtime
-	vec3_t      simorg;
-	vec3_t      simvel;
+	vec4f_t     simorg;
+	vec4f_t     simvel;
 	vec3_t      simangles;
 
 	vec3_t      punchangle;		// temporary view kick from weapon firing
diff --git a/qw/source/cl_cam.c b/qw/source/cl_cam.c
index 91e7a44eb..1b1959f13 100644
--- a/qw/source/cl_cam.c
+++ b/qw/source/cl_cam.c
@@ -221,7 +221,7 @@ Cam_TryFlyby (player_state_t * self, player_state_t * player, vec3_t vec,
 	VectorMultAdd (player->pls.es.origin, 800, vec, v);
 	// v is endpos
 	// fake a player move
-	trace = Cam_DoTrace (player->pls.es.origin, v);
+	trace = Cam_DoTrace (&player->pls.es.origin[0], v);//FIXME
 	if ( /* trace.inopen || */ trace.inwater)
 		return 9999;
 	VectorCopy (trace.endpos, vec);
@@ -230,7 +230,7 @@ Cam_TryFlyby (player_state_t * self, player_state_t * player, vec3_t vec,
 	if (len < 32 || len > 800)
 		return 9999;
 	if (checkvis) {
-		trace = Cam_DoTrace (self->pls.es.origin, vec);
+		trace = Cam_DoTrace (&self->pls.es.origin[0], vec);//FIXME
 		if (trace.fraction != 1 || trace.inwater)
 			return 9999;
 
@@ -242,13 +242,13 @@ Cam_TryFlyby (player_state_t * self, player_state_t * player, vec3_t vec,
 
 // Is player visible?
 static qboolean
-Cam_IsVisible (player_state_t * player, vec3_t vec)
+Cam_IsVisible (player_state_t *player, vec3_t vec)
 {
 	float       d;
 	trace_t     trace;
 	vec3_t      v;
 
-	trace = Cam_DoTrace (player->pls.es.origin, vec);
+	trace = Cam_DoTrace (&player->pls.es.origin[0], vec);//FIXME
 	if (trace.fraction != 1 || /* trace.inopen || */ trace.inwater)
 		return false;
 	// check distance, don't let the player get too far away or too close
diff --git a/qw/source/cl_demo.c b/qw/source/cl_demo.c
index 31594d51f..0694b5f25 100644
--- a/qw/source/cl_demo.c
+++ b/qw/source/cl_demo.c
@@ -797,7 +797,7 @@ demo_start_recording (int track)
 			MSG_WriteByte (&buf, es->frame);
 			MSG_WriteByte (&buf, es->colormap);
 			MSG_WriteByte (&buf, es->skinnum);
-			MSG_WriteCoordAngleV (&buf, es->origin, es->angles);
+			MSG_WriteCoordAngleV (&buf, &es->origin[0], es->angles);//FIXME
 
 			if (buf.cursize > MAX_MSGLEN / 2) {
 				CL_WriteRecordDemoMessage (&buf, seq++);
diff --git a/qw/source/cl_entparse.c b/qw/source/cl_entparse.c
index b1b5d3386..a7716b729 100644
--- a/qw/source/cl_entparse.c
+++ b/qw/source/cl_entparse.c
@@ -427,7 +427,7 @@ CL_ParsePlayerinfo (void)
 	flags = state->pls.es.flags = MSG_ReadShort (net_message);
 
 	state->messagenum = cl.parsecount;
-	MSG_ReadCoordV (net_message, state->pls.es.origin);
+	MSG_ReadCoordV (net_message, &state->pls.es.origin[0]);//FIXME
 
 	state->pls.es.frame = MSG_ReadByte (net_message);
 
diff --git a/qw/source/cl_ents.c b/qw/source/cl_ents.c
index 1e8ab80d9..606fc1ce8 100644
--- a/qw/source/cl_ents.c
+++ b/qw/source/cl_ents.c
@@ -356,7 +356,8 @@ CL_LinkPlayers (void)
 	player_state_t	exact;
 	player_state_t *state;
 	qboolean		clientplayer;
-	vec3_t			org, ang = {0, 0, 0};
+	vec3_t			ang = {0, 0, 0};
+	vec4f_t         org;
 
 	playertime = realtime - cls.latency + 0.02;
 	if (playertime > realtime)
@@ -377,11 +378,11 @@ CL_LinkPlayers (void)
 
 		// spawn light flashes, even ones coming from invisible objects
 		if (j == cl.playernum) {
-			VectorCopy (cl.simorg, org);
+			org = cl.simorg;
 			r_data->player_entity = &cl_player_ents[j];
 			clientplayer = true;
 		} else {
-			VectorCopy (state->pls.es.origin, org);
+			org = state->pls.es.origin;
 			clientplayer = false;
 		}
 		if (info->chat && info->chat->value[0] != '0') {
diff --git a/qw/source/cl_parse.c b/qw/source/cl_parse.c
index 095f636bc..bfd1fa5a2 100644
--- a/qw/source/cl_parse.c
+++ b/qw/source/cl_parse.c
@@ -945,7 +945,8 @@ CL_ParseBaseline (entity_state_t *es)
 	es->colormap = MSG_ReadByte (net_message);
 	es->skinnum = MSG_ReadByte (net_message);
 
-	MSG_ReadCoordAngleV (net_message, es->origin, es->angles);
+	MSG_ReadCoordAngleV (net_message, &es->origin[0], es->angles);//FIXME
+	es->origin[3] = 1;
 
 	// LordHavoc: set up baseline to for new effects (alpha, colormod, etc)
 	es->colormod = 255;
@@ -1541,7 +1542,8 @@ CL_ParseServerMessage (void)
 				cl.completed_time = realtime;
 				r_data->vid->recalc_refdef = true;		// go to full screen
 				Sys_MaskPrintf (SYS_DEV, "intermission simorg: ");
-				MSG_ReadCoordV (net_message, cl.simorg);
+				MSG_ReadCoordV (net_message, &cl.simorg[0]);//FIXME
+				cl.simorg[3] = 1;
 				for (i = 0; i < 3; i++)
 					Sys_MaskPrintf (SYS_DEV, "%f ", cl.simorg[i]);
 				Sys_MaskPrintf (SYS_DEV, "\nintermission simangles: ");
diff --git a/qw/source/cl_pred.c b/qw/source/cl_pred.c
index 1fe115949..f48533673 100644
--- a/qw/source/cl_pred.c
+++ b/qw/source/cl_pred.c
@@ -184,14 +184,9 @@ CL_PredictMove (void)
 			return;
 		}
 
-	for (i = 0; i < 3; i++) {
-		cl.simorg[i] = from->playerstate[cl.playernum].pls.es.origin[i] +
-			f * (to->playerstate[cl.playernum].pls.es.origin[i] -
-				   from->playerstate[cl.playernum].pls.es.origin[i]);
-		cl.simvel[i] = from->playerstate[cl.playernum].pls.es.velocity[i] +
-			f * (to->playerstate[cl.playernum].pls.es.velocity[i] -
-				 from->playerstate[cl.playernum].pls.es.velocity[i]);
-	}
+	cl.simorg = from->playerstate[cl.playernum].pls.es.origin
+				+ f * (to->playerstate[cl.playernum].pls.es.origin -
+					   from->playerstate[cl.playernum].pls.es.origin);
 }
 
 void
diff --git a/qw/source/cl_view.c b/qw/source/cl_view.c
index 3b1ca0688..9497e3ef9 100644
--- a/qw/source/cl_view.c
+++ b/qw/source/cl_view.c
@@ -33,6 +33,8 @@
 #include "QF/msg.h"
 #include "QF/screen.h"
 
+#include "QF/simd/vec4f.h"
+
 #include "compat.h"
 #include "clview.h"
 
@@ -93,7 +95,7 @@ cshift_t    cshift_bonus = { {215, 186, 60}, 50};
 #define sqr(x) ((x) * (x))
 
 float
-V_CalcRoll (const vec3_t angles, const vec3_t velocity)
+V_CalcRoll (const vec3_t angles, const vec4f_t velocity)
 {
 	float       side, sign, value;
 	vec3_t      forward, right, up;
@@ -116,7 +118,7 @@ V_CalcRoll (const vec3_t angles, const vec3_t velocity)
 static float
 V_CalcBob (void)
 {
-	vec_t      *velocity = cl.simvel;
+	vec4f_t     velocity = cl.simvel;
 	float       cycle;
 	static double bobtime;
 	static float bob;
@@ -138,8 +140,8 @@ V_CalcBob (void)
 
 	// bob is proportional to velocity in the xy plane
 	// (don't count Z, or jumping messes it up)
-
-	bob = sqrt (sqr (velocity[0]) + sqr (velocity[1])) * cl_bob->value;
+	velocity[2] = 0;
+	bob = sqrt (dotf (velocity, velocity)[0]) * cl_bob->value;
 	bob = bob * 0.3 + bob * 0.7 * sin (cycle * M_PI);
 	if (bob > 4)
 		bob = 4;
@@ -240,7 +242,7 @@ V_ParseDamage (void)
 {
 	float       count, side;
 	int         armor, blood;
-	vec_t      *origin = cl.simorg;
+	vec4f_t     origin = cl.simorg;
 	vec_t      *angles = cl.simangles;
 	vec3_t      from, forward, right, up;
 
@@ -535,7 +537,7 @@ CalcGunAngle (void)
 static void
 V_BoundOffsets (void)
 {
-	vec_t      *origin = cl.simorg;
+	vec4f_t     origin = cl.simorg;
 
 	// absolutely bound refresh reletive to entity clipping hull
 	// so the view can never be inside a solid wall
@@ -587,7 +589,7 @@ V_CalcViewRoll (void)
 {
 	float       side;
 	vec_t      *angles = cl.simangles;
-	vec_t      *velocity = cl.simvel;
+	vec4f_t     velocity = cl.simvel;
 
 	side = V_CalcRoll (angles, velocity);
 	r_data->refdef->viewangles[ROLL] += side;
@@ -609,7 +611,7 @@ V_CalcIntermissionRefdef (void)
 {
 	entity_t   *view;
 	float       old;
-	vec_t      *origin = cl.simorg;
+	vec4f_t     origin = cl.simorg;
 	vec_t      *angles = cl.simangles;
 
 	// view is the weapon model (visible only from inside body)
@@ -635,7 +637,7 @@ V_CalcRefdef (void)
 	static float oldz = 0;
 	int         i;
 	vec3_t      forward, right, up;
-	vec_t      *origin = cl.simorg;
+	vec4f_t     origin = cl.simorg;
 	vec_t      *viewangles = cl.simangles;
 
 	V_DriftPitch ();
diff --git a/qw/source/sv_ents.c b/qw/source/sv_ents.c
index 50c7a3d97..ccbf9278b 100644
--- a/qw/source/sv_ents.c
+++ b/qw/source/sv_ents.c
@@ -509,7 +509,7 @@ write_player (delta_t *delta, plent_state_t *from, plent_state_t *to,
 	MSG_WriteByte (msg, to->es.number);
 	MSG_WriteShort (msg, flags);
 
-	MSG_WriteCoordV (msg, to->es.origin);
+	MSG_WriteCoordV (msg, &to->es.origin[0]);//FIXME
 
 	MSG_WriteByte (msg, to->es.frame);
 
diff --git a/qw/source/sv_init.c b/qw/source/sv_init.c
index e0a370f92..6fbd6cbc7 100644
--- a/qw/source/sv_init.c
+++ b/qw/source/sv_init.c
@@ -167,8 +167,8 @@ SV_CreateBaseline (void)
 		MSG_WriteByte (&sv.signon, SVdata (svent)->state.colormap);
 		MSG_WriteByte (&sv.signon, SVdata (svent)->state.skinnum);
 
-		MSG_WriteCoordAngleV (&sv.signon, SVdata (svent)->state.origin,
-							  SVdata (svent)->state.angles);
+		MSG_WriteCoordAngleV (&sv.signon, &SVdata (svent)->state.origin[0],
+							  SVdata (svent)->state.angles);//FIXME
 	}
 }
 
diff --git a/qw/source/teamplay.c b/qw/source/teamplay.c
index 75e6aefe3..159da95f0 100644
--- a/qw/source/teamplay.c
+++ b/qw/source/teamplay.c
@@ -58,7 +58,7 @@
 #include "qw/include/client.h"
 
 static qboolean died = false, recorded_location = false;
-static vec3_t   death_location, last_recorded_location;
+static vec4f_t  death_location, last_recorded_location;
 
 cvar_t         *cl_deadbodyfilter;
 cvar_t         *cl_gibfilter;
@@ -165,7 +165,7 @@ Team_ParseSay (dstring_t *buf, const char *s)
 					location = locs_find (death_location);
 					if (location) {
 						recorded_location = true;
-						VectorCopy (death_location, last_recorded_location);
+						last_recorded_location = death_location;
 						t1 = location->name;
 						break;
 					}
@@ -187,7 +187,7 @@ Team_ParseSay (dstring_t *buf, const char *s)
 				location = locs_find (cl.simorg);
 				if (location) {
 					recorded_location = true;
-					VectorCopy (cl.simorg, last_recorded_location);
+					last_recorded_location = cl.simorg;
 					t1 = location->name;
 				} else
 					snprintf (t2, sizeof (t2), "Unknown!");
@@ -279,7 +279,7 @@ void
 Team_Dead (void)
 {
 	died = true;
-	VectorCopy (cl.simorg, death_location);
+	death_location = cl.simorg;
 }
 
 void

From 2015474468ac316b51e2276cc37a055c62cb4fcc Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 12 Mar 2021 11:48:53 +0900
Subject: [PATCH 1479/1519] Move and clean up clview.h

Redundant or dead prototypes deleted, and the client/view.h seems a good
place for the file.
---
 include/Makemodule.am               |  2 +-
 include/{clview.h => client/view.h} | 13 ++++---------
 libs/video/renderer/sw32/draw.c     |  3 ++-
 nq/source/cl_main.c                 |  2 +-
 nq/source/cl_view.c                 |  5 +++--
 qw/source/cl_entparse.c             |  2 +-
 qw/source/cl_ents.c                 |  2 +-
 qw/source/cl_input.c                |  3 ++-
 qw/source/cl_main.c                 |  2 +-
 qw/source/cl_parse.c                |  2 +-
 qw/source/cl_screen.c               |  3 ++-
 qw/source/cl_view.c                 |  7 ++++---
 12 files changed, 23 insertions(+), 23 deletions(-)
 rename include/{clview.h => client/view.h} (85%)

diff --git a/include/Makemodule.am b/include/Makemodule.am
index 645a820bf..0755ed1b5 100644
--- a/include/Makemodule.am
+++ b/include/Makemodule.am
@@ -11,7 +11,6 @@ EXTRA_DIST += \
 	include/block16.h \
 	include/block8.h \
 	include/buildnum.h \
-	include/clview.h \
 	include/compat.h \
 	include/context_sdl.h \
 	include/context_x11.h \
@@ -80,6 +79,7 @@ EXTRA_DIST += \
 	include/client/entities.h \
 	include/client/temp_entities.h \
 	include/client/locs.h \
+	include/client/view.h \
 	include/qw/bothdefs.h \
 	include/qw/msg_backbuf.h \
 	include/qw/msg_ucmd.h \
diff --git a/include/clview.h b/include/client/view.h
similarity index 85%
rename from include/clview.h
rename to include/client/view.h
index 2b2cbffb2..756eb1d21 100644
--- a/include/clview.h
+++ b/include/client/view.h
@@ -1,5 +1,5 @@
 /*
-	clview.h
+	view.h
 
 	(description)
 
@@ -26,8 +26,8 @@
 */
 // view.h
 
-#ifndef __clview_h_
-#define __clview_h_
+#ifndef __client_view_h_
+#define __client_view_h_
 
 #include "QF/mathlib.h"
 #include "QF/simd/types.h"
@@ -41,14 +41,9 @@ void V_Init (void);
 void V_Init_Cvars (void);
 void V_RenderView (void);
 float V_CalcRoll (const vec3_t angles, vec4f_t velocity);
-void V_UpdatePalette (void);
 void V_StartPitchDrift (void);
 void V_StopPitchDrift (void);
 
-void V_RenderView (void);
-void V_UpdatePalette (void);
-void V_Register (void);
 void V_SetContentsColor (int contents);
-void V_CalcBlend (void);
 
-#endif // __clview_h_
+#endif // __client_view_h_
diff --git a/libs/video/renderer/sw32/draw.c b/libs/video/renderer/sw32/draw.c
index 13454c437..fdb24e2c5 100644
--- a/libs/video/renderer/sw32/draw.c
+++ b/libs/video/renderer/sw32/draw.c
@@ -1362,6 +1362,7 @@ sw32_Draw_BlendScreen (quat_t color)
 	}
 	break;
 	default:
-		Sys_Error("V_UpdatePalette: unsupported r_pixbytes %i", sw32_r_pixbytes);
+		Sys_Error("sw32_Draw_BlendScreen: unsupported r_pixbytes %i",
+				  sw32_r_pixbytes);
 	}
 }
diff --git a/nq/source/cl_main.c b/nq/source/cl_main.c
index 25ff7bd39..e2c222713 100644
--- a/nq/source/cl_main.c
+++ b/nq/source/cl_main.c
@@ -49,10 +49,10 @@
 #include "QF/plugin/vid_render.h"
 
 #include "compat.h"
-#include "clview.h"
 #include "sbar.h"
 
 #include "client/temp_entities.h"
+#include "client/view.h"
 
 #include "nq/include/chase.h"
 #include "nq/include/cl_skin.h"
diff --git a/nq/source/cl_view.c b/nq/source/cl_view.c
index fa62de0fd..1ccf06d98 100644
--- a/nq/source/cl_view.c
+++ b/nq/source/cl_view.c
@@ -38,7 +38,8 @@
 #include "QF/plugin/vid_render.h"
 
 #include "compat.h"
-#include "clview.h"
+
+#include "client/view.h"
 
 #include "nq/include/chase.h"
 #include "nq/include/client.h"
@@ -393,7 +394,7 @@ V_CalcPowerupCshift (void)
   LordHavoc made this a real, true alpha blend.  Cleaned it up
   a bit, but otherwise this is his code.  --KB
 */
-void
+static void
 V_CalcBlend (void)
 {
 	float       a2, a3;
diff --git a/qw/source/cl_entparse.c b/qw/source/cl_entparse.c
index a7716b729..60c8cf2c4 100644
--- a/qw/source/cl_entparse.c
+++ b/qw/source/cl_entparse.c
@@ -42,9 +42,9 @@
 #include "QF/sys.h"
 
 #include "compat.h"
-#include "clview.h"
 
 #include "client/temp_entities.h"
+#include "client/view.h"
 
 #include "qw/msg_ucmd.h"
 #include "qw/pmove.h"
diff --git a/qw/source/cl_ents.c b/qw/source/cl_ents.c
index 606fc1ce8..b70b143cc 100644
--- a/qw/source/cl_ents.c
+++ b/qw/source/cl_ents.c
@@ -43,12 +43,12 @@
 #include "QF/sys.h"
 
 #include "compat.h"
-#include "clview.h"
 #include "d_iface.h"
 
 #include "client/effects.h"
 #include "client/locs.h"
 #include "client/temp_entities.h"
+#include "client/view.h"
 
 #include "qw/bothdefs.h"
 #include "qw/msg_ucmd.h"
diff --git a/qw/source/cl_input.c b/qw/source/cl_input.c
index 55ef38f5d..5a2fe2b6e 100644
--- a/qw/source/cl_input.c
+++ b/qw/source/cl_input.c
@@ -46,7 +46,8 @@
 #include "QF/va.h"
 
 #include "compat.h"
-#include "clview.h"
+
+#include "client/view.h"
 
 #include "qw/msg_ucmd.h"
 
diff --git a/qw/source/cl_main.c b/qw/source/cl_main.c
index ea143c9ae..be73db0e7 100644
--- a/qw/source/cl_main.c
+++ b/qw/source/cl_main.c
@@ -92,11 +92,11 @@
 #include "QF/plugin/console.h"
 
 #include "buildnum.h"
-#include "clview.h"
 #include "compat.h"
 #include "sbar.h"
 
 #include "client/temp_entities.h"
+#include "client/view.h"
 
 #include "qw/bothdefs.h"
 #include "qw/pmove.h"
diff --git a/qw/source/cl_parse.c b/qw/source/cl_parse.c
index bfd1fa5a2..b75355fa1 100644
--- a/qw/source/cl_parse.c
+++ b/qw/source/cl_parse.c
@@ -62,11 +62,11 @@
 #include "QF/va.h"
 
 #include "compat.h"
-#include "clview.h"
 #include "sbar.h"
 
 #include "client/effects.h"
 #include "client/temp_entities.h"
+#include "client/view.h"
 
 #include "qw/bothdefs.h"
 #include "qw/pmove.h"
diff --git a/qw/source/cl_screen.c b/qw/source/cl_screen.c
index 7827c30db..22c8b5b96 100644
--- a/qw/source/cl_screen.c
+++ b/qw/source/cl_screen.c
@@ -44,9 +44,10 @@
 #include "QF/pcx.h"
 #include "QF/screen.h"
 
-#include "clview.h"
 #include "sbar.h"
 
+#include "client/view.h"
+
 #include "qw/include/client.h"
 
 static qpic_t  *scr_net;
diff --git a/qw/source/cl_view.c b/qw/source/cl_view.c
index 9497e3ef9..f20d5747a 100644
--- a/qw/source/cl_view.c
+++ b/qw/source/cl_view.c
@@ -36,7 +36,8 @@
 #include "QF/simd/vec4f.h"
 
 #include "compat.h"
-#include "clview.h"
+
+#include "client/view.h"
 
 #include "qw/bothdefs.h"
 
@@ -95,7 +96,7 @@ cshift_t    cshift_bonus = { {215, 186, 60}, 50};
 #define sqr(x) ((x) * (x))
 
 float
-V_CalcRoll (const vec3_t angles, const vec4f_t velocity)
+V_CalcRoll (const vec3_t angles, vec4f_t velocity)
 {
 	float       side, sign, value;
 	vec3_t      forward, right, up;
@@ -399,7 +400,7 @@ V_CalcPowerupCshift (void)
   LordHavoc made this a real, true alpha blend.  Cleaned it up
   a bit, but otherwise this is his code.  --KB
 */
-void
+static void
 V_CalcBlend (void)
 {
 	float       a2, a3;

From 5158cc5527556219fcff0fcf0b63bbc3a9037294 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 19 Mar 2021 11:04:47 +0900
Subject: [PATCH 1480/1519] [util] Add normal and magnitude float vector
 functions

---
 include/QF/simd/vec4f.h                | 37 ++++++++++++++++++++++++++
 libs/video/renderer/glsl/glsl_sprite.c |  4 +--
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/include/QF/simd/vec4f.h b/include/QF/simd/vec4f.h
index 85eb252eb..8fe207b74 100644
--- a/include/QF/simd/vec4f.h
+++ b/include/QF/simd/vec4f.h
@@ -93,6 +93,9 @@ GNU89INLINE inline vec4f_t qrotf (vec4f_t a, vec4f_t b) __attribute__((const));
 GNU89INLINE inline vec4f_t qconjf (vec4f_t q) __attribute__((const));
 GNU89INLINE inline vec4f_t loadvec3f (const float v3[3]) __attribute__((pure, access(read_only, 1)));
 GNU89INLINE inline void storevec3f (float v3[3], vec4f_t v4) __attribute__((access (write_only, 1)));
+GNU89INLINE inline vec4f_t normalf (vec4f_t v) __attribute__((pure));
+GNU89INLINE inline vec4f_t magnitudef (vec4f_t v) __attribute__((pure));
+GNU89INLINE inline vec4f_t magnitude3f (vec4f_t v) __attribute__((pure));
 
 #ifndef IMPLEMENT_VEC4F_Funcs
 GNU89INLINE inline
@@ -288,4 +291,38 @@ storevec3f (float v3[3], vec4f_t v4)
 	v3[2] = v4[2];
 }
 
+#ifndef IMPLEMENT_VEC4F_Funcs
+GNU89INLINE inline
+#else
+VISIBLE
+#endif
+vec4f_t
+normalf (vec4f_t v)
+{
+	return v / vsqrtf (dotf (v, v));
+}
+
+#ifndef IMPLEMENT_VEC4F_Funcs
+GNU89INLINE inline
+#else
+VISIBLE
+#endif
+vec4f_t
+magnitudef (vec4f_t v)
+{
+	return vsqrtf (dotf (v, v));
+}
+
+#ifndef IMPLEMENT_VEC4F_Funcs
+GNU89INLINE inline
+#else
+VISIBLE
+#endif
+vec4f_t
+magnitude3f (vec4f_t v)
+{
+	v[3] = 0;
+	return vsqrtf (dotf (v, v));
+}
+
 #endif//__QF_simd_vec4f_h
diff --git a/libs/video/renderer/glsl/glsl_sprite.c b/libs/video/renderer/glsl/glsl_sprite.c
index 63704ebfa..4d35bc8d6 100644
--- a/libs/video/renderer/glsl/glsl_sprite.c
+++ b/libs/video/renderer/glsl/glsl_sprite.c
@@ -243,7 +243,7 @@ R_DrawSprite (void)
 			VectorSet (0, 0, 1, svup);
 			// CrossProduct (svup, -r_origin, svright)
 			VectorSet (tvec[1], -tvec[0], 0, svright);
-			svright /= vsqrtf (dotf (svright, svright));
+			svright = normalf (svright);
 			// CrossProduct (svright, svup, svpn);
 			VectorSet (-svright[1], svright[0], 0, svpn);
 			break;
@@ -268,7 +268,7 @@ R_DrawSprite (void)
 			VectorSet (0, 0, 1, svup);
 			// CrossProduct (svup, -r_origin, svright)
 			VectorSet (vpn[1], -vpn[0], 0, svright);
-			svright /= vsqrtf (dotf (svright, svright));
+			svright = normalf (svright);
 			// CrossProduct (svright, svup, svpn);
 			VectorSet (-svright[1], svright[0], 0, svpn);
 			break;

From 5bf21931c7b40d2becb32377d7183f10753fea47 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 19 Mar 2021 20:18:45 +0900
Subject: [PATCH 1481/1519] [renderer] Remove more old fields from entity_t

The only transform related field remaining is old_origin. This also
brings the renderer closer to using simd (lots of stuff to fix still,
though).
---
 include/QF/render.h                           |  11 +-
 include/client/entities.h                     |   3 +-
 include/client/view.h                         |  15 +
 libs/client/cl_effects.c                      |   3 +-
 libs/client/cl_entities.c                     |  21 +-
 libs/client/cl_temp_entities.c                |  84 ++---
 libs/client/locs.c                            |   2 +-
 libs/video/renderer/gl/gl_dyn_part.c          |  79 +++--
 libs/video/renderer/gl/gl_lightmap.c          |  16 +-
 libs/video/renderer/gl/gl_mod_alias.c         |  34 +-
 libs/video/renderer/gl/gl_mod_iqm.c           |   1 -
 libs/video/renderer/gl/gl_mod_sprite.c        |   8 -
 libs/video/renderer/gl/gl_rmain.c             |  59 ++--
 libs/video/renderer/gl/gl_rmisc.c             |   5 +-
 libs/video/renderer/gl/gl_rsurf.c             |  13 +-
 libs/video/renderer/gl/gl_sky.c               |  20 +-
 libs/video/renderer/gl/gl_sky_clip.c          |  14 +-
 libs/video/renderer/glsl/glsl_alias.c         |   7 +-
 libs/video/renderer/glsl/glsl_bsp.c           |  16 +-
 libs/video/renderer/glsl/glsl_iqm.c           |  12 +-
 libs/video/renderer/glsl/glsl_lightmap.c      |  10 +-
 libs/video/renderer/glsl/glsl_main.c          |  17 +-
 libs/video/renderer/glsl/glsl_particles.c     |  81 +++--
 libs/video/renderer/glsl/glsl_sprite.c        |  24 +-
 libs/video/renderer/r_efrag.c                 |   6 +-
 libs/video/renderer/sw/d_edge.c               |   7 +-
 libs/video/renderer/sw/sw_rmain.c             |  41 +--
 libs/video/renderer/sw/sw_rmisc.c             |  10 +-
 libs/video/renderer/sw/sw_rpart.c             |  42 ++-
 libs/video/renderer/sw/sw_rsprite.c           |   9 +-
 libs/video/renderer/sw/sw_rsurf.c             |  10 +-
 libs/video/renderer/sw32/d_edge.c             |   7 +-
 libs/video/renderer/sw32/sw32_rmain.c         |  30 +-
 libs/video/renderer/sw32/sw32_rmisc.c         |  10 +-
 libs/video/renderer/sw32/sw32_rpart.c         |  42 ++-
 libs/video/renderer/sw32/sw32_rsprite.c       |   9 +-
 libs/video/renderer/sw32/sw32_rsurf.c         |  10 +-
 .../renderer/vulkan/shader/lighting.frag      |   2 +-
 libs/video/renderer/vulkan/vulkan_bsp.c       |  17 +-
 libs/video/renderer/vulkan/vulkan_lightmap.c  |   9 +-
 libs/video/renderer/vulkan/vulkan_main.c      |  38 ++-
 nq/include/client.h                           |   5 +-
 nq/source/cl_chase.c                          | 123 ++++----
 nq/source/cl_demo.c                           |   2 +-
 nq/source/cl_ents.c                           |  61 ++--
 nq/source/cl_input.c                          |  45 +--
 nq/source/cl_main.c                           |  14 +-
 nq/source/cl_parse.c                          |  20 +-
 nq/source/cl_screen.c                         |   4 +-
 nq/source/cl_view.c                           | 265 +++++++---------
 qw/include/client.h                           |  12 +-
 qw/source/cl_chase.c                          | 123 ++++----
 qw/source/cl_demo.c                           |  22 +-
 qw/source/cl_entparse.c                       |   5 +-
 qw/source/cl_ents.c                           |  47 ++-
 qw/source/cl_input.c                          |   2 +
 qw/source/cl_main.c                           |   2 +
 qw/source/cl_parse.c                          |  37 ++-
 qw/source/cl_pred.c                           |  26 +-
 qw/source/cl_screen.c                         |   4 +-
 qw/source/cl_view.c                           | 293 ++++++++----------
 qw/source/teamplay.c                          |  16 +-
 62 files changed, 1070 insertions(+), 912 deletions(-)

diff --git a/include/QF/render.h b/include/QF/render.h
index 99fb105a9..adc5e141e 100644
--- a/include/QF/render.h
+++ b/include/QF/render.h
@@ -32,6 +32,7 @@
 #include "QF/model.h"
 #include "QF/qdefs.h" // FIXME
 #include "QF/vid.h"
+#include "QF/simd/types.h"
 
 typedef enum {
 	pt_static,
@@ -131,10 +132,7 @@ typedef struct entity_s {
 	renderer_t  renderer;
 	int         active;
 	//XXX FIXME XXX should not be here
-	float                   scale;
-	vec3_t					origin;
-	vec3_t					old_origin;
-	vec3_t					angles;
+	vec4f_t     old_origin;
 } entity_t;
 
 // !!! if this is changed, it must be changed in asm_draw.h too !!!
@@ -159,8 +157,9 @@ typedef struct {
 	float		xOrigin;			// should probably always be 0.5
 	float		yOrigin;			// between be around 0.3 to 0.5
 
-	vec3_t		vieworg;
-	vec3_t		viewangles;
+	//FIXME was vec3_t, need to deal with asm (maybe? is it worth it?)
+	vec4f_t     viewposition;
+	vec4f_t     viewrotation;
 
 	float		fov_x, fov_y;
 
diff --git a/include/client/entities.h b/include/client/entities.h
index fda534295..5981d1c9d 100644
--- a/include/client/entities.h
+++ b/include/client/entities.h
@@ -71,6 +71,7 @@ extern entstates_t qw_entstates;
 extern vec3_t ent_colormod[256];
 
 struct entity_s;
-void CL_TransformEntity (struct entity_s *ent, const vec3_t angles);
+void CL_TransformEntity (struct entity_s *ent, float scale,
+						 const vec3_t angles, vec4f_t position);
 
 #endif//__client_entities_h
diff --git a/include/client/view.h b/include/client/view.h
index 756eb1d21..40ad78df3 100644
--- a/include/client/view.h
+++ b/include/client/view.h
@@ -37,6 +37,21 @@
 #define INFO_CSHIFT_DAMAGE		(1 << 2)
 #define INFO_CSHIFT_POWERUP		(1 << 3)
 
+typedef struct viewstate_s {
+	vec4f_t     movecmd;
+	vec4f_t     velocity;
+	vec4f_t     origin;
+	vec3_t      angles;
+	int         weaponframe;
+	int         onground;
+	uint32_t    flags;
+	float       frametime;
+	vec4f_t     punchangle;
+} viewstate_t;
+
+#define VF_DEAD 1
+#define VF_GIB 2
+
 void V_Init (void);
 void V_Init_Cvars (void);
 void V_RenderView (void);
diff --git a/libs/client/cl_effects.c b/libs/client/cl_effects.c
index af40dc62c..707699141 100644
--- a/libs/client/cl_effects.c
+++ b/libs/client/cl_effects.c
@@ -123,7 +123,8 @@ CL_ModelEffects (entity_t *ent, int num, int glow_color, double time)
 	if (model->flags & EF_ROCKET) {
 		dl = r_funcs->R_AllocDlight (num);
 		if (dl) {
-			VectorCopy (ent->origin, dl->origin);
+			VectorCopy (Transform_GetWorldPosition (ent->transform),
+						dl->origin);
 			dl->radius = 200.0;
 			dl->die = time + 0.1;
 			//FIXME VectorCopy (r_firecolor->vec, dl->color);
diff --git a/libs/client/cl_entities.c b/libs/client/cl_entities.c
index 837cfbe60..599576863 100644
--- a/libs/client/cl_entities.c
+++ b/libs/client/cl_entities.c
@@ -346,21 +346,14 @@ vec3_t ent_colormod[256] = {
 };
 
 void
-CL_TransformEntity (entity_t *ent, const vec3_t angles)
+CL_TransformEntity (entity_t *ent, float scale, const vec3_t angles,
+					vec4f_t position)
 {
-	union {
-		quat_t      q;
-		vec4f_t     v;
-	}           rotation;
-	vec4f_t     position;
-	vec4f_t     scale;
+	vec4f_t     rotation;
+	vec4f_t     scalevec = { scale, scale, scale, 1};
 
-	VectorCopy (ent->origin, position);
-	position[3] = 1;
-	VectorSet (ent->scale, ent->scale, ent->scale, scale);
-	scale[3] = 1;
 	if (VectorIsZero (angles)) {
-		QuatSet (0, 0, 0, 1, rotation.q);
+		rotation = (vec4f_t) { 0, 0, 0, 1 };
 	} else {
 		vec3_t      ang;
 		VectorCopy (angles, ang);
@@ -370,7 +363,7 @@ CL_TransformEntity (entity_t *ent, const vec3_t angles)
 			// to everything else?
 			ang[PITCH] = -ang[PITCH];
 		}
-		AngleQuat (ang, rotation.q);
+		AngleQuat (ang, &rotation[0]);//FIXME
 	}
-	Transform_SetLocalTransform (ent->transform, scale, rotation.v, position);
+	Transform_SetLocalTransform (ent->transform, scalevec, rotation, position);
 }
diff --git a/libs/client/cl_temp_entities.c b/libs/client/cl_temp_entities.c
index 0b6672f0f..03fab9b73 100644
--- a/libs/client/cl_temp_entities.c
+++ b/libs/client/cl_temp_entities.c
@@ -61,7 +61,8 @@ typedef struct {
 	int         entity;
 	struct model_s *model;
 	float       endtime;
-	vec3_t      start, end;
+	vec4f_t     start, end;
+	vec4f_t     rotation;
 	tent_t     *tents;
 	int         seed;
 } beam_t;
@@ -100,6 +101,8 @@ static model_t *cl_mod_bolt3;
 static model_t *cl_spr_explod;
 static model_t *cl_spike;
 
+static vec4f_t beam_rolls[360];
+
 static void
 CL_TEnts_Precache (int phase)
 {
@@ -132,6 +135,10 @@ CL_TEnts_Init (void)
 {
 	QFS_GamedirCallback (CL_TEnts_Precache);
 	CL_TEnts_Precache (1);
+	for (int i = 0; i < 360; i++) {
+		float       ang = i * M_PI / 360;
+		beam_rolls[i] = (vec4f_t) { sin (ang), 0, 0, cos (ang) };
+	}
 }
 
 void
@@ -145,7 +152,6 @@ CL_Init_Entity (entity_t *ent)
 	ent->transform = Transform_New (0);
 	ent->renderer.skin = 0;
 	QuatSet (1.0, 1.0, 1.0, 1.0, ent->renderer.colormod);
-	ent->scale = 1.0;
 	ent->animation.pose1 = ent->animation.pose2 = -1;
 }
 
@@ -255,57 +261,52 @@ static inline void
 beam_setup (beam_t *b, qboolean transform, double time, TEntContext_t *ctx)
 {
 	tent_t     *tent;
-	float       forward, pitch, yaw, d;
+	float       d;
 	int         ent_count;
-	vec3_t      dist, org, ang;
+	vec4f_t     dist, org;
+	vec4f_t     rotation;
+	vec4f_t     scale = { 1, 1, 1, 1 };
 	unsigned    seed;
 
 	// calculate pitch and yaw
-	VectorSubtract (b->end, b->start, dist);
+	dist = b->end - b->start;
 
-	if (dist[1] == 0 && dist[0] == 0) {
-		yaw = 0;
-		if (dist[2] > 0)
-			pitch = 90;
-		else
-			pitch = 270;
+	// FIXME interpolation may be off when passing through the -x axis
+	if (dist[0] < 0 && dist[1] == 0 && dist[2] == 0) {
+		// anti-parallel with the +x axis, so assome 180 degree rotation around
+		// the z-axis
+		rotation = (vec4f_t) { 0, 0, 1, 0 };
 	} else {
-		yaw = (int) (atan2 (dist[1], dist[0]) * 180 / M_PI);
-		if (yaw < 0)
-			yaw += 360;
-
-		forward = sqrt (dist[0] * dist[0] + dist[1] * dist[1]);
-		pitch = (int) (atan2 (dist[2], forward) * 180 / M_PI);
-		if (pitch < 0)
-			pitch += 360;
+		rotation = qrotf ((vec4f_t) { 1, 0, 0, 0 }, dist);
 	}
+	b->rotation = rotation;
 
 	// add new entities for the lightning
-	VectorCopy (b->start, org);
-	d = VectorNormalize (dist);
-	VectorScale (dist, 30, dist);
+	org = b->start;
+	d = magnitudef (dist)[0];
+	dist = normalf (dist) * 30;
 	ent_count = ceil (d / 30);
 	d = 0;
 
 	seed = b->seed + ((int) (time * BEAM_SEED_INTERVAL) % BEAM_SEED_INTERVAL);
 
-	ang[ROLL] = 0;
 	while (ent_count--) {
 		tent = new_temp_entity ();
 		tent->next = b->tents;
 		b->tents = tent;
 
-		VectorMultAdd (org, d, dist, tent->ent.origin);
+		vec4f_t     position = org + d * dist;
 		d += 1.0;
 		tent->ent.renderer.model = b->model;
-		ang[PITCH] = pitch;
-		ang[YAW] = yaw;
 		if (transform) {
 			seed = seed * BEAM_SEED_PRIME;
-			ang[ROLL] = seed % 360;
-			CL_TransformEntity (&tent->ent, ang);
+			Transform_SetLocalTransform (tent->ent.transform, scale,
+										 qmulf (rotation,
+												beam_rolls[seed % 360]),
+										 position);
+		} else {
+			Transform_SetLocalPosition (tent->ent.transform, position);
 		}
-		VectorCopy (ang, tent->ent.angles);
 		r_funcs->R_AddEfrags (&ctx->worldModel->brush, &tent->ent);
 	}
 }
@@ -404,14 +405,14 @@ parse_tent (qmsg_t *net_message, double time, TEntContext_t *ctx,
 			ex = &to->to.ex;
 			ex->tent = new_temp_entity ();
 
-			VectorCopy (position, ex->tent->ent.origin);
 			ex->start = time;
 			//FIXME need better model management
 			if (!cl_spr_explod->cache.data) {
 				cl_spr_explod = Mod_ForName ("progs/s_explod.spr", true);
 			}
 			ex->tent->ent.renderer.model = cl_spr_explod;
-			CL_TransformEntity (&ex->tent->ent, ex->tent->ent.angles);
+			Transform_SetLocalPosition (ex->tent->ent.transform,//FIXME
+										(vec4f_t) {VectorExpand (position), 1});
 			break;
 		case TE_Explosion2:
 			MSG_ReadCoordV (net_message, position);
@@ -635,8 +636,9 @@ CL_UpdateBeams (double time, TEntContext_t *ctx)
 		// add new entities for the lightning
 		for (t = b->tents; t; t = t->next) {
 			seed = seed * BEAM_SEED_PRIME;
-			t->ent.angles[ROLL] = seed % 360;
-			CL_TransformEntity (&t->ent, t->ent.angles);
+			Transform_SetLocalRotation (t->ent.transform,
+										qmulf (b->rotation,
+											   beam_rolls[seed % 360]));
 		}
 	}
 }
@@ -727,6 +729,8 @@ CL_ParseProjectiles (qmsg_t *net_message, qboolean nail2, TEntContext_t *ctx)
 	byte		bits[6];
 	int			i, c, j, num;
 	entity_t   *pr;
+	vec4f_t     position = { 0, 0, 0, 1 };
+	vec3_t      angles;
 
 	c = MSG_ReadByte (net_message);
 
@@ -747,13 +751,13 @@ CL_ParseProjectiles (qmsg_t *net_message, qboolean nail2, TEntContext_t *ctx)
 		pr = &tent->ent;
 		pr->renderer.model = cl_spike;
 		pr->renderer.skin = 0;
-		pr->origin[0] = ((bits[0] + ((bits[1] & 15) << 8)) << 1) - 4096;
-		pr->origin[1] = (((bits[1] >> 4) + (bits[2] << 4)) << 1) - 4096;
-		pr->origin[2] = ((bits[3] + ((bits[4] & 15) << 8)) << 1) - 4096;
-		pr->angles[0] = (bits[4] >> 4) * (360.0 / 16.0);
-		pr->angles[1] = bits[5] * (360.0 / 256.0);
-		pr->angles[2] = 0;
-		CL_TransformEntity (&tent->ent, tent->ent.angles);
+		position[0] = ((bits[0] + ((bits[1] & 15) << 8)) << 1) - 4096;
+		position[1] = (((bits[1] >> 4) + (bits[2] << 4)) << 1) - 4096;
+		position[2] = ((bits[3] + ((bits[4] & 15) << 8)) << 1) - 4096;
+		angles[0] = (bits[4] >> 4) * (360.0 / 16.0);
+		angles[1] = bits[5] * (360.0 / 256.0);
+		angles[2] = 0;
+		CL_TransformEntity (&tent->ent, 1, angles, position);
 
 		r_funcs->R_AddEfrags (&ctx->worldModel->brush, &tent->ent);
 	}
diff --git a/libs/client/locs.c b/libs/client/locs.c
index 07deee426..2ab477921 100644
--- a/libs/client/locs.c
+++ b/libs/client/locs.c
@@ -140,7 +140,7 @@ locs_load (const char *filename)
 	const char *tmp;
 	char       *t1, *t2;
 	const char *line;
-	vec4f_t     loc;
+	vec4f_t     loc = { 0, 0, 0, 1 };
 	QFile      *file;
 
 	tmp = va (0, "maps/%s", filename);
diff --git a/libs/video/renderer/gl/gl_dyn_part.c b/libs/video/renderer/gl/gl_dyn_part.c
index 5aa093813..13afc1fe9 100644
--- a/libs/video/renderer/gl/gl_dyn_part.c
+++ b/libs/video/renderer/gl/gl_dyn_part.c
@@ -42,6 +42,7 @@
 
 #include "QF/cmd.h"
 #include "QF/cvar.h"
+#include "QF/entity.h"
 #include "QF/mersenne.h"
 #include "QF/qargs.h"
 #include "QF/quakefs.h"
@@ -521,12 +522,14 @@ R_RocketTrail_QF (const entity_t *ent)
 	float		dist, maxlen, origlen, percent, pscale, pscalenext;
 	float		len = 0.0;
 	vec3_t		old_origin, vec;
+	vec3_t		org;
 
 	if (numparticles >= r_maxparticles)
 		return;
 
 	VectorCopy (ent->old_origin, old_origin);
-	VectorSubtract (ent->origin, old_origin, vec);
+	VectorCopy (Transform_GetWorldPosition (ent->transform), org);
+	VectorSubtract (org, old_origin, vec);
 	maxlen = VectorNormalize (vec);
 	origlen = vr_data.frametime / maxlen;
 	pscale = 1.5 + qfrandom (1.5);
@@ -555,12 +558,14 @@ R_GrenadeTrail_QF (const entity_t *ent)
 	float		dist, maxlen, origlen, percent, pscale, pscalenext;
 	float		len = 0.0;
 	vec3_t		old_origin, vec;
+	vec3_t		org;
 
 	if (numparticles >= r_maxparticles)
 		return;
 
 	VectorCopy (ent->old_origin, old_origin);
-	VectorSubtract (ent->origin, old_origin, vec);
+	VectorCopy (Transform_GetWorldPosition (ent->transform), org);
+	VectorSubtract (org, old_origin, vec);
 	maxlen = VectorNormalize (vec);
 	origlen = vr_data.frametime / maxlen;
 	pscale = 6.0 + qfrandom (7.0);
@@ -590,12 +595,14 @@ R_BloodTrail_QF (const entity_t *ent)
 	float		len = 0.0;
 	int			j;
 	vec3_t		old_origin, porg, pvel, vec;
+	vec3_t		org;
 
 	if (numparticles >= r_maxparticles)
 		return;
 
 	VectorCopy (ent->old_origin, old_origin);
-	VectorSubtract (ent->origin, old_origin, vec);
+	VectorCopy (Transform_GetWorldPosition (ent->transform), org);
+	VectorSubtract (org, old_origin, vec);
 	maxlen = VectorNormalize (vec);
 	origlen = vr_data.frametime / maxlen;
 	pscale = 5.0 + qfrandom (10.0);
@@ -630,12 +637,14 @@ R_SlightBloodTrail_QF (const entity_t *ent)
 	float		len = 0.0;
 	int			j;
 	vec3_t      old_origin, porg, pvel, vec;
+	vec3_t      org;
 
 	if (numparticles >= r_maxparticles)
 		return;
 
 	VectorCopy (ent->old_origin, old_origin);
-	VectorSubtract (ent->origin, old_origin, vec);
+	VectorCopy (Transform_GetWorldPosition (ent->transform), org);
+	VectorSubtract (org, old_origin, vec);
 	maxlen = VectorNormalize (vec);
 	origlen = vr_data.frametime / maxlen;
 	pscale = 1.5 + qfrandom (7.5);
@@ -670,12 +679,14 @@ R_WizTrail_QF (const entity_t *ent)
 	float		dist = 3.0, len = 0.0;
 	static int	tracercount;
 	vec3_t		old_origin, pvel, subtract, vec;
+	vec3_t		org;
 
 	if (numparticles >= r_maxparticles)
 		return;
 
 	VectorCopy (ent->old_origin, old_origin);
-	VectorSubtract (ent->origin, old_origin, vec);
+	VectorCopy (Transform_GetWorldPosition (ent->transform), org);
+	VectorSubtract (org, old_origin, vec);
 	maxlen = VectorNormalize (vec);
 	origlen = vr_data.frametime / maxlen;
 	VectorScale (vec, maxlen - dist, subtract);
@@ -711,12 +722,14 @@ R_FlameTrail_QF (const entity_t *ent)
 	float		dist = 3.0, len = 0.0;
 	static int	tracercount;
 	vec3_t		old_origin, pvel, subtract, vec;
+	vec3_t		org;
 
 	if (numparticles >= r_maxparticles)
 		return;
 
 	VectorCopy (ent->old_origin, old_origin);
-	VectorSubtract (ent->origin, old_origin, vec);
+	VectorCopy (Transform_GetWorldPosition (ent->transform), org);
+	VectorSubtract (org, old_origin, vec);
 	maxlen = VectorNormalize (vec);
 	origlen = vr_data.frametime / maxlen;
 	VectorScale (vec, maxlen - dist, subtract);
@@ -752,12 +765,14 @@ R_VoorTrail_QF (const entity_t *ent)
 	float		dist = 3.0, len = 0.0;
 	int			j;
 	vec3_t		subtract, old_origin, porg, vec;
+	vec3_t		org;
 
 	if (numparticles >= r_maxparticles)
 		return;
 
 	VectorCopy (ent->old_origin, old_origin);
-	VectorSubtract (ent->origin, old_origin, vec);
+	VectorCopy (Transform_GetWorldPosition (ent->transform), org);
+	VectorSubtract (org, old_origin, vec);
 	maxlen = VectorNormalize (vec);
 	origlen = vr_data.frametime / maxlen;
 	VectorScale (vec, maxlen - dist, subtract);
@@ -790,7 +805,8 @@ R_GlowTrail_QF (const entity_t *ent, int glow_color)
 		return;
 
 	VectorCopy (ent->old_origin, old_origin);
-	VectorSubtract (ent->origin, old_origin, vec);
+	VectorCopy (Transform_GetWorldPosition (ent->transform), org);
+	VectorSubtract (org, old_origin, vec);
 	maxlen = VectorNormalize (vec);
 	origlen = vr_data.frametime / maxlen;
 	VectorScale (vec, (maxlen - dist), subtract);
@@ -869,12 +885,14 @@ R_RocketTrail_EE (const entity_t *ent)
 	float		dist, maxlen, origlen, percent, pscale, pscalenext;
 	float		len = 0.0;
 	vec3_t		old_origin, subtract, vec;
+	vec3_t		org;
 
 	if (numparticles >= r_maxparticles)
 		return;
 
 	VectorCopy (ent->old_origin, old_origin);
-	VectorSubtract (ent->origin, old_origin, vec);
+	VectorCopy (Transform_GetWorldPosition (ent->transform), org);
+	VectorSubtract (org, old_origin, vec);
 	maxlen = VectorNormalize (vec);
 	origlen = vr_data.frametime / maxlen;
 	pscale = 1.5 + qfrandom (1.5);
@@ -904,12 +922,14 @@ R_GrenadeTrail_EE (const entity_t *ent)
 	float		dist, maxlen, origlen, percent, pscale, pscalenext;
 	float		len = 0.0;
 	vec3_t		old_origin, subtract, vec;
+	vec3_t		org;
 
 	if (numparticles >= r_maxparticles)
 		return;
 
 	VectorCopy (ent->old_origin, old_origin);
-	VectorSubtract (ent->origin, ent->old_origin, vec);
+	VectorCopy (Transform_GetWorldPosition (ent->transform), org);
+	VectorSubtract (org, ent->old_origin, vec);
 	maxlen = VectorNormalize (vec);
 	origlen = vr_data.frametime / maxlen;
 	pscale = 6.0 + qfrandom (7.0);
@@ -1143,7 +1163,7 @@ R_DarkFieldParticles_ID (const entity_t *ent)
 //		l = r_maxparticles - numparticles;
 //	}
 
-	VectorCopy (ent->origin, org);
+	VectorCopy (Transform_GetWorldPosition (ent->transform), org);
 
 	for (i = -16; i < 16; i += 8) {
 		dir [1] = i * 8;
@@ -1177,6 +1197,7 @@ R_EntityParticles_ID (const entity_t *ent)
 	float       angle, sp, sy, cp, cy; // cr, sr
 	float       beamlength = 16.0, dist = 64.0;
 	vec3_t      forward, porg;
+	vec3_t      org;
 
 	if (numparticles + j >= r_maxparticles) {
 		return;
@@ -1184,6 +1205,8 @@ R_EntityParticles_ID (const entity_t *ent)
 		j = r_maxparticles - numparticles;
 	}
 
+	VectorCopy (Transform_GetWorldPosition (ent->transform), org);
+
 	if (!avelocities[0][0]) {
 		for (i = 0; i < NUMVERTEXNORMALS; i++) {
 			int         k;
@@ -1209,11 +1232,11 @@ R_EntityParticles_ID (const entity_t *ent)
 		forward[1] = cp * sy;
 		forward[2] = -sp;
 
-		porg[0] = ent->origin[0] + r_avertexnormals[i][0] * dist +
+		porg[0] = org[0] + r_avertexnormals[i][0] * dist +
 			forward[0] * beamlength;
-		porg[1] = ent->origin[1] + r_avertexnormals[i][1] * dist +
+		porg[1] = org[1] + r_avertexnormals[i][1] * dist +
 			forward[1] * beamlength;
-		porg[2] = ent->origin[2] + r_avertexnormals[i][2] * dist +
+		porg[2] = org[2] + r_avertexnormals[i][2] * dist +
 			forward[2] * beamlength;
 		particle_new (pt_explode, part_tex_dot, porg, 1.0, vec3_origin,
 					  vr_data.realtime + 0.01, 0x6f, 1.0, 0);
@@ -1232,7 +1255,8 @@ R_RocketTrail_ID (const entity_t *ent)
 		return;
 
 	VectorCopy (ent->old_origin, old_origin);
-	VectorSubtract (ent->origin, ent->old_origin, vec);
+	VectorCopy (Transform_GetWorldPosition (ent->transform), org);
+	VectorSubtract (org, ent->old_origin, vec);
 	maxlen = VectorNormalize (vec);
 	VectorScale (vec, (maxlen - dist), subtract);
 
@@ -1264,7 +1288,8 @@ R_GrenadeTrail_ID (const entity_t *ent)
 		return;
 
 	VectorCopy (ent->old_origin, old_origin);
-	VectorSubtract (ent->origin, ent->old_origin, vec);
+	VectorCopy (Transform_GetWorldPosition (ent->transform), org);
+	VectorSubtract (org, ent->old_origin, vec);
 	maxlen = VectorNormalize (vec);
 	VectorScale (vec, maxlen - dist, subtract);
 
@@ -1291,12 +1316,14 @@ R_BloodTrail_ID (const entity_t *ent)
 	float			dist = 3.0, len = 0.0;
 	unsigned int	rnd;
 	vec3_t			old_origin, subtract, vec, porg;
+	vec3_t			org;
 
 	if (numparticles >= r_maxparticles)
 		return;
 
 	VectorCopy (ent->old_origin, old_origin);
-	VectorSubtract (ent->origin, old_origin, vec);
+	VectorCopy (Transform_GetWorldPosition (ent->transform), org);
+	VectorSubtract (org, old_origin, vec);
 	maxlen = VectorNormalize (vec);
 	VectorScale (vec, maxlen - dist, subtract);
 
@@ -1322,12 +1349,14 @@ R_SlightBloodTrail_ID (const entity_t *ent)
 	float			dist = 6.0, len = 0.0;
 	unsigned int	rnd;
 	vec3_t			old_origin, porg, subtract, vec;
+	vec3_t			org;
 
 	if (numparticles >= r_maxparticles)
 		return;
 
 	VectorCopy (ent->old_origin, old_origin);
-	VectorSubtract (ent->origin, old_origin, vec);
+	VectorCopy (Transform_GetWorldPosition (ent->transform), org);
+	VectorSubtract (org, old_origin, vec);
 	maxlen = VectorNormalize (vec);
 	VectorScale (vec, maxlen - dist, subtract);
 
@@ -1353,12 +1382,14 @@ R_WizTrail_ID (const entity_t *ent)
 	float		dist = 3.0, len = 0.0;
 	static int	tracercount;
 	vec3_t		old_origin, pvel, subtract, vec;
+	vec3_t		org;
 
 	if (numparticles >= r_maxparticles)
 		return;
 
 	VectorCopy (ent->old_origin, old_origin);
-	VectorSubtract (ent->origin, old_origin, vec);
+	VectorCopy (Transform_GetWorldPosition (ent->transform), org);
+	VectorSubtract (org, old_origin, vec);
 	maxlen = VectorNormalize (vec);
 	VectorScale (vec, maxlen - dist, subtract);
 
@@ -1390,12 +1421,14 @@ R_FlameTrail_ID (const entity_t *ent)
 	float		dist = 3.0, len = 0.0;
 	static int	tracercount;
 	vec3_t		old_origin, pvel, subtract, vec;
+	vec3_t		org;
 
 	if (numparticles >= r_maxparticles)
 		return;
 
 	VectorCopy (ent->old_origin, old_origin);
-	VectorSubtract (ent->origin, old_origin, vec);
+	VectorCopy (Transform_GetWorldPosition (ent->transform), org);
+	VectorSubtract (org, old_origin, vec);
 	maxlen = VectorNormalize (vec);
 	VectorScale (vec, maxlen - dist, subtract);
 
@@ -1427,12 +1460,14 @@ R_VoorTrail_ID (const entity_t *ent)
 	float			dist = 3.0, len = 0.0;
 	unsigned int	rnd;
 	vec3_t			old_origin, porg, subtract, vec;
+	vec3_t			org;
 
 	if (numparticles >= r_maxparticles)
 		return;
 
 	VectorCopy (ent->old_origin, old_origin);
-	VectorSubtract (ent->origin, old_origin, vec);
+	VectorCopy (Transform_GetWorldPosition (ent->transform), org);
+	VectorSubtract (org, old_origin, vec);
 	maxlen = VectorNormalize (vec);
 	VectorScale (vec, maxlen - dist, subtract);
 
@@ -1471,7 +1506,7 @@ gl_R_DrawParticles (void)
 	qfglDepthMask (GL_FALSE);
 	qfglInterleavedArrays (GL_T2F_C4UB_V3F, 0, particleVertexArray);
 
-	minparticledist = DotProduct (r_refdef.vieworg, vpn) +
+	minparticledist = DotProduct (r_refdef.viewposition, vpn) +
 		r_particles_nearclip->value;
 
 	activeparticles = 0;
diff --git a/libs/video/renderer/gl/gl_lightmap.c b/libs/video/renderer/gl/gl_lightmap.c
index d46c35014..2ea33a8c0 100644
--- a/libs/video/renderer/gl/gl_lightmap.c
+++ b/libs/video/renderer/gl/gl_lightmap.c
@@ -43,6 +43,7 @@
 #include <stdio.h>
 
 #include "QF/cvar.h"
+#include "QF/entity.h"
 #include "QF/render.h"
 #include "QF/sys.h"
 #include "QF/GL/defines.h"
@@ -117,16 +118,22 @@ R_AddDynamicLights_1 (msurface_t *surf)
 	unsigned int    sdtable[18];
 	unsigned int   *bl;
 	vec3_t			impact, local;
+	vec4f_t         entorigin = { 0, 0, 0, 1 };
 
 	smax = (surf->extents[0] >> 4) + 1;
 	smax_bytes = smax * gl_internalformat;
 	tmax = (surf->extents[1] >> 4) + 1;
 
+	if (currententity->transform) {
+		//FIXME give world entity a transform
+		entorigin = Transform_GetWorldPosition (currententity->transform);
+	}
+
 	for (lnum = 0; lnum < r_maxdlights; lnum++) {
 		if (!(surf->dlightbits[lnum / 32] & (1 << (lnum % 32))))
 			continue;					// not lit by this light
 
-		VectorSubtract (r_dlights[lnum].origin, currententity->origin, local);
+		VectorSubtract (r_dlights[lnum].origin, entorigin, local);
 		dist = DotProduct (local, surf->plane->normal) - surf->plane->dist;
 		VectorMultSub (r_dlights[lnum].origin, dist, surf->plane->normal,
 					   impact);
@@ -182,16 +189,21 @@ R_AddDynamicLights_3 (msurface_t *surf)
 	unsigned int    sdtable[18];
 	unsigned int   *bl;
 	vec3_t			impact, local;
+	vec4f_t         entorigin = { 0, 0, 0, 1 };
 
 	smax = (surf->extents[0] >> 4) + 1;
 	smax_bytes = smax * gl_internalformat;
 	tmax = (surf->extents[1] >> 4) + 1;
 
+	if (currententity->transform) {
+		entorigin = Transform_GetWorldPosition (currententity->transform);
+	}
+
 	for (lnum = 0; lnum < r_maxdlights; lnum++) {
 		if (!(surf->dlightbits[lnum / 32] & (1 << (lnum % 32))))
 			continue;					// not lit by this light
 
-		VectorSubtract (r_dlights[lnum].origin, currententity->origin, local);
+		VectorSubtract (r_dlights[lnum].origin, entorigin, local);
 		dist = DotProduct (local, surf->plane->normal) - surf->plane->dist;
 		VectorMultSub (r_dlights[lnum].origin, dist, surf->plane->normal,
 					   impact);
diff --git a/libs/video/renderer/gl/gl_mod_alias.c b/libs/video/renderer/gl/gl_mod_alias.c
index 92c67038d..3f96b4364 100644
--- a/libs/video/renderer/gl/gl_mod_alias.c
+++ b/libs/video/renderer/gl/gl_mod_alias.c
@@ -196,8 +196,10 @@ GL_DrawAliasShadowTri (const aliashdr_t *paliashdr, const vert_order_t *vo)
 	vec3_t      point;
 	const vec_t *scale = paliashdr->mdl.scale;
 	const vec_t *scale_origin = paliashdr->mdl.scale_origin;
+	vec4f_t     entorigin;
 
-	lheight = currententity->origin[2] - lightspot[2];
+	entorigin = Transform_GetWorldPosition (currententity->transform);
+	lheight = entorigin[2] - lightspot[2];
 	height = -lheight + 1.0;
 
 	qfglBegin (GL_TRIANGLES);
@@ -232,8 +234,10 @@ GL_DrawAliasShadow (const aliashdr_t *paliashdr, const vert_order_t *vo)
 	const int  *order = vo->order;
 	vec3_t      point;
 	const blended_vert_t *verts = vo->verts;
+	vec4f_t     entorigin;
 
-	lheight = currententity->origin[2] - lightspot[2];
+	entorigin = Transform_GetWorldPosition (currententity->transform);
+	lheight = entorigin[2] - lightspot[2];
 	height = -lheight + 1.0;
 
 	while ((count = *order++)) {
@@ -413,17 +417,23 @@ gl_R_DrawAliasModel (entity_t *e)
 	dlight_t   *l;
 	model_t    *model;
 	vec3_t      dist, scale;
+	vec4f_t     origin;
 	vert_order_t *vo;
 
 	model = e->renderer.model;
 
 	radius = model->radius;
-	if (e->scale != 1.0)
-		radius *= e->scale;
-	if (R_CullSphere (e->origin, radius))
+	origin = Transform_GetWorldPosition (e->transform);
+	VectorCopy (Transform_GetWorldScale (e->transform), scale);
+	//FIXME assumes uniform scale
+	if (scale[0] != 1.0) {
+		radius *= scale[0];
+	}
+	if (R_CullSphere (&origin[0], radius)) {//FIXME
 		return;
+	}
 
-	VectorSubtract (r_origin, e->origin, modelorg);
+	VectorSubtract (r_origin, origin, modelorg);
 
 	gl_modelalpha = e->renderer.colormod[3];
 
@@ -436,7 +446,7 @@ gl_R_DrawAliasModel (entity_t *e)
 		float lightadj;
 
 		// get lighting information
-		R_LightPoint (&r_worldentity.renderer.model->brush, e->origin);
+		R_LightPoint (&r_worldentity.renderer.model->brush, &origin[0]);//FIXME
 
 		lightadj = (ambientcolor[0] + ambientcolor[1] + ambientcolor[2]) / 765.0;
 
@@ -457,7 +467,7 @@ gl_R_DrawAliasModel (entity_t *e)
 		if (gl_vector_light->int_val) {
 			for (l = r_dlights, lnum = 0; lnum < r_maxdlights; lnum++, l++) {
 				if (l->die >= vr_data.realtime) {
-					VectorSubtract (l->origin, e->origin, dist);
+					VectorSubtract (l->origin, origin, dist);
 					if ((d = DotProduct (dist, dist)) >	// Out of range
 						((l->radius + radius) * (l->radius + radius))) {
 						continue;
@@ -508,7 +518,7 @@ gl_R_DrawAliasModel (entity_t *e)
 
 			for (l = r_dlights, lnum = 0; lnum < r_maxdlights; lnum++, l++) {
 				if (l->die >= vr_data.realtime) {
-					VectorSubtract (l->origin, e->origin, dist);
+					VectorSubtract (l->origin, origin, dist);
 
 					if ((d = DotProduct (dist, dist)) > (l->radius + radius) *
 						(l->radius + radius)) {
@@ -567,10 +577,12 @@ gl_R_DrawAliasModel (entity_t *e)
 	if (paliashdr->mdl.ident == HEADER_MDL16) {
 		// because we multipled by 256 when we loaded the verts, we have to
 		// scale by 1/256 when drawing.
-		VectorScale (paliashdr->mdl.scale, e->scale / 256.0, scale);
+		//FIXME see scaling above
+		VectorScale (paliashdr->mdl.scale, 1 / 256.0, scale);
 		vo = GL_GetAliasFrameVerts16 (paliashdr, e);
 	} else {
-		VectorScale (paliashdr->mdl.scale, e->scale, scale);
+		//FIXME see scaling above
+		VectorScale (paliashdr->mdl.scale, 1, scale);
 		vo = GL_GetAliasFrameVerts (paliashdr, e);
 	}
 
diff --git a/libs/video/renderer/gl/gl_mod_iqm.c b/libs/video/renderer/gl/gl_mod_iqm.c
index 601a76fbf..f66c2c7ca 100644
--- a/libs/video/renderer/gl/gl_mod_iqm.c
+++ b/libs/video/renderer/gl/gl_mod_iqm.c
@@ -103,7 +103,6 @@ gl_R_DrawIQMModel (entity_t *ent)
 
 	qfglPushMatrix ();
 	gl_R_RotateForEntity (ent);
-	qfglScalef (ent->scale, ent->scale, ent->scale);
 
 	for (i = 0; i < iqm->num_meshes; i++) {
 		qfglBindTexture (GL_TEXTURE_2D, gl->textures[i]);
diff --git a/libs/video/renderer/gl/gl_mod_sprite.c b/libs/video/renderer/gl/gl_mod_sprite.c
index d0dd91444..d4b1c1f86 100644
--- a/libs/video/renderer/gl/gl_mod_sprite.c
+++ b/libs/video/renderer/gl/gl_mod_sprite.c
@@ -123,10 +123,6 @@ R_DrawSpriteModel_f (entity_t *e)
 		VectorCopy (vup, up);
 		VectorCopy (vright, right);
 	}
-	if (e->scale != 1.0) {
-		up *= e->scale;
-		right *= e->scale;
-	}
 
 	VectorCopy (e->renderer.colormod, color);
 	modelalpha = color[3] = e->renderer.colormod[3];
@@ -194,10 +190,6 @@ R_DrawSpriteModel_VA_f (entity_t *e)
 		VectorCopy (vup, up);
 		VectorCopy (vright, right);
 	}
-	if (e->scale != 1.0) {
-		up *= e->scale;
-		right *= e->scale;
-	}
 
 	for (i = 0; i < 4; i++) {
 		color[i] = e->renderer.colormod[i] * 255;
diff --git a/libs/video/renderer/gl/gl_rmain.c b/libs/video/renderer/gl/gl_rmain.c
index 8079b790b..8bf8ec46a 100644
--- a/libs/video/renderer/gl/gl_rmain.c
+++ b/libs/video/renderer/gl/gl_rmain.c
@@ -74,7 +74,7 @@ qboolean    gl_mirror;
 plane_t    *gl_mirror_plane;
 
 float       gl_r_world_matrix[16];
-static float r_base_world_matrix[16];
+//FIXME static float r_base_world_matrix[16];
 
 //vec3_t		gl_shadecolor;					// Ender (Extend) Colormod
 float		gl_modelalpha;					// Ender (Extend) Alpha
@@ -344,9 +344,12 @@ gl_R_SetupFrame (void)
 	gl_Fog_SetupFrame ();
 
 	// build the transformation matrix for the given view angles
-	VectorCopy (r_refdef.vieworg, r_origin);
+	VectorCopy (r_refdef.viewposition, r_origin);
+
+	VectorCopy (qvmulf (r_refdef.viewrotation, (vec4f_t) { 1, 0, 0, 0 }), vpn);
+	VectorCopy (qvmulf (r_refdef.viewrotation, (vec4f_t) { 0, -1, 0, 0 }), vright);
+	VectorCopy (qvmulf (r_refdef.viewrotation, (vec4f_t) { 0, 0, 1, 0 }), vup);
 
-	AngleVectors (r_refdef.viewangles, vpn, vright, vup);
 
 	R_SetFrustum ();
 
@@ -419,13 +422,19 @@ R_SetupGL (void)
 	qfglMatrixMode (GL_MODELVIEW);
 	qfglLoadIdentity ();
 
-	qfglRotatef (-90, 1, 0, 0);			// put Z going up
-	qfglRotatef (90, 0, 0, 1);			// put Z going up
-	qfglRotatef (-r_refdef.viewangles[ROLL],  1, 0, 0);
-	qfglRotatef (-r_refdef.viewangles[PITCH], 0, 1, 0);
-	qfglRotatef (-r_refdef.viewangles[YAW],   0, 0, 1);
-	qfglTranslatef (-r_refdef.vieworg[0], -r_refdef.vieworg[1],
-				  -r_refdef.vieworg[2]);
+	static mat4f_t z_up = {
+		{ 0, 0, -1, 0},
+		{-1, 0,  0, 0},
+		{ 0, 1,  0, 0},
+		{ 0, 0,  0, 1},
+	};
+	mat4f_t view;
+	mat4fquat (view, qconjf (r_refdef.viewrotation));
+	mmulf (view, z_up, view);
+	vec4f_t offset = -r_refdef.viewposition;
+	offset[3] = 1;
+	view[3] = mvmulf (view, offset);
+	qfglLoadMatrixf (&view[0][0]);
 
 	qfglGetFloatv (GL_MODELVIEW_MATRIX, gl_r_world_matrix);
 
@@ -480,12 +489,12 @@ R_RenderScene (void)
 static void
 R_Mirror (void)
 {
-	float		d;
+	//float		d;
 //	msurface_t *s;
 
 //	if (!gl_mirror) // FIXME: Broken
 		return;
-
+/*
 	memcpy (r_base_world_matrix, gl_r_world_matrix,
 			sizeof (r_base_world_matrix));
 
@@ -551,6 +560,7 @@ R_Mirror (void)
 	r_worldentity.model->textures[gl_mirrortexturenum]->texturechain = NULL;
 #endif
 	qfglColor3ubv (color_white);
+*/
 }
 
 /*
@@ -584,6 +594,18 @@ R_RenderView_ (void)
 		R_ZGraph ();
 }
 
+//FIXME static void R_RenderViewFishEye (void);
+
+void
+gl_R_RenderView (void)
+{
+	R_RenderView_ ();
+	/*if(!scr_fisheye->int_val)
+		R_RenderView_ ();
+	else
+		R_RenderViewFishEye ();*/
+}
+/*FIXME
 // Algorithm:
 // Draw up to six views, one in each direction.
 // Save the picture to cube map texture, use GL_ARB_texture_cube_map.
@@ -593,17 +615,6 @@ R_RenderView_ (void)
 // grid vertices coordinates.
 // Render view. Fisheye is done.
 
-static void R_RenderViewFishEye (void);
-
-void
-gl_R_RenderView (void)
-{
-	if(!scr_fisheye->int_val)
-		R_RenderView_ ();
-	else
-		R_RenderViewFishEye ();
-}
-
 #define BOX_FRONT  0
 #define BOX_RIGHT  1
 #define BOX_BEHIND 2
@@ -891,7 +902,7 @@ R_RenderViewFishEye (void)
 	R_SetupGL_Viewport_and_Perspective ();
 	qfglMatrixMode (GL_MODELVIEW);
 	qfglCallList (fisheye_grid);
-}
+}*/
 
 void
 gl_R_ClearState (void)
diff --git a/libs/video/renderer/gl/gl_rmisc.c b/libs/video/renderer/gl/gl_rmisc.c
index d9a1c6797..de34bb203 100644
--- a/libs/video/renderer/gl/gl_rmisc.c
+++ b/libs/video/renderer/gl/gl_rmisc.c
@@ -74,6 +74,7 @@
 static void
 R_Envmap_f (void)
 {
+	/*FIXME update for simd
 	byte        buffer[256 * 256 * 4];
 
 	qfglDrawBuffer (GL_FRONT);
@@ -122,7 +123,7 @@ R_Envmap_f (void)
 	gl_envmap = false;
 	qfglDrawBuffer (GL_BACK);
 	qfglReadBuffer (GL_BACK);
-	gl_ctx->end_rendering ();
+	gl_ctx->end_rendering ();*/
 }
 
 void
@@ -250,6 +251,7 @@ gl_R_ViewChanged (float aspect)
 void
 gl_R_TimeRefresh_f (void)
 {
+/*FIXME update for simd
 	double      start, stop, time;
 	int         i;
 
@@ -265,4 +267,5 @@ gl_R_TimeRefresh_f (void)
 	stop = Sys_DoubleTime ();
 	time = stop - start;
 	Sys_Printf ("%g seconds (%g fps)\n", time, 128 / time);
+*/
 }
diff --git a/libs/video/renderer/gl/gl_rsurf.c b/libs/video/renderer/gl/gl_rsurf.c
index b954fc066..96d1ec93f 100644
--- a/libs/video/renderer/gl/gl_rsurf.c
+++ b/libs/video/renderer/gl/gl_rsurf.c
@@ -545,12 +545,13 @@ gl_R_DrawBrushModel (entity_t *e)
 		if (e->scale != 1.0)
 			radius *= e->scale;
 #endif
-		if (R_CullSphere (e->origin, radius))
+		if (R_CullSphere (&worldMatrix[3][0], radius)) {//FIXME
 			return;
+		}
 	} else {
 		rotated = false;
-		VectorAdd (e->origin, model->mins, mins);
-		VectorAdd (e->origin, model->maxs, maxs);
+		VectorAdd (worldMatrix[3], model->mins, mins);
+		VectorAdd (worldMatrix[3], model->maxs, maxs);
 #if 0 // QSG FIXME
 		if (e->scale != 1.0) {
 			VectorScale (mins, e->scale, mins);
@@ -561,7 +562,7 @@ gl_R_DrawBrushModel (entity_t *e)
 			return;
 	}
 
-	VectorSubtract (r_refdef.vieworg, e->origin, modelorg);
+	VectorSubtract (r_refdef.viewposition, worldMatrix[3], modelorg);
 	if (rotated) {
 		vec4f_t     temp = { modelorg[0], modelorg[1], modelorg[2], 0 };
 
@@ -579,7 +580,7 @@ gl_R_DrawBrushModel (entity_t *e)
 				 || (!r_dlights[k].radius))
 				continue;
 
-			VectorSubtract (r_dlights[k].origin, e->origin, lightorigin);
+			VectorSubtract (r_dlights[k].origin, worldMatrix[3], lightorigin);
 			R_RecursiveMarkLights (brush, lightorigin, &r_dlights[k], k,
 							brush->nodes + brush->hulls[0].firstclipnode);
 		}
@@ -723,7 +724,7 @@ gl_R_DrawWorld (void)
 	memset (&worldent, 0, sizeof (worldent));
 	worldent.renderer.model = r_worldentity.renderer.model;
 
-	VectorCopy (r_refdef.vieworg, modelorg);
+	VectorCopy (r_refdef.viewposition, modelorg);
 
 	currententity = &worldent;
 
diff --git a/libs/video/renderer/gl/gl_sky.c b/libs/video/renderer/gl/gl_sky.c
index cb3258246..db289326b 100644
--- a/libs/video/renderer/gl/gl_sky.c
+++ b/libs/video/renderer/gl/gl_sky.c
@@ -189,9 +189,9 @@ R_DrawSkyBox (void)
 			float *v = (float *) gl_skyvec[i][j];
 
 			qfglTexCoord2fv (v);
-			qfglVertex3f (r_refdef.vieworg[0] + v[2],
-						  r_refdef.vieworg[1] + v[3],
-						  r_refdef.vieworg[2] + v[4]);
+			qfglVertex3f (r_refdef.viewposition[0] + v[2],
+						  r_refdef.viewposition[1] + v[3],
+						  r_refdef.viewposition[2] + v[4]);
 		}
 		qfglEnd ();
 	}
@@ -219,7 +219,7 @@ skydome_vertex (const vec3_t v, float speedscale)
 	s = speedscale + dir[0];
 	t = speedscale + dir[1];
 
-	VectorAdd (r_refdef.vieworg, v, point);
+	VectorAdd (r_refdef.viewposition, v, point);
 
 	qfglTexCoord2f (s, t);
 	qfglVertex3fv (point);
@@ -242,7 +242,7 @@ skydome_debug (void)
 
 		h = 1;
 		t = 0;
-		VectorAdd (zenith, r_refdef.vieworg, v[0]);
+		VectorAdd (zenith, r_refdef.viewposition, v[0]);
 		for (b = 1; b <= 8; b++) {
 			x = gl_bubble_costable[b + 8];
 			y = -gl_bubble_sintable[b + 8];
@@ -250,7 +250,7 @@ skydome_debug (void)
 			v[h][0] = a1x * x;
 			v[h][1] = a1y * x;
 			v[h][2] = y * domescale[2];
-			VectorAdd (v[h], r_refdef.vieworg, v[h]);
+			VectorAdd (v[h], r_refdef.viewposition, v[h]);
 			for (i = t; i != h; i = (i + 1) % 3) {
 				qfglVertex3fv (v[i]);
 				qfglVertex3fv (v[h]);
@@ -262,7 +262,7 @@ skydome_debug (void)
 			v[h][0] = a2x * x;
 			v[h][1] = a2y * x;
 			v[h][2] = y * domescale[2];
-			VectorAdd (v[h], r_refdef.vieworg, v[h]);
+			VectorAdd (v[h], r_refdef.viewposition, v[h]);
 			for (i = t; i != h; i = (i + 1) % 3) {
 				qfglVertex3fv (v[i]);
 				qfglVertex3fv (v[h]);
@@ -274,7 +274,7 @@ skydome_debug (void)
 
 		h = 1;
 		t = 0;
-		VectorAdd (nadir, r_refdef.vieworg, v[0]);
+		VectorAdd (nadir, r_refdef.viewposition, v[0]);
 		for (b = 15; b >= 8; b--) {
 			x = gl_bubble_costable[b + 8];
 			y = -gl_bubble_sintable[b + 8];
@@ -282,7 +282,7 @@ skydome_debug (void)
 			v[h][0] = a2x * x;
 			v[h][1] = a2y * x;
 			v[h][2] = y * domescale[2];
-			VectorAdd (v[h], r_refdef.vieworg, v[h]);
+			VectorAdd (v[h], r_refdef.viewposition, v[h]);
 			for (i = t; i != h; i = (i + 1) % 3) {
 				qfglVertex3fv (v[i]);
 				qfglVertex3fv (v[h]);
@@ -294,7 +294,7 @@ skydome_debug (void)
 			v[h][0] = a1x * x;
 			v[h][1] = a1y * x;
 			v[h][2] = y * domescale[2];
-			VectorAdd (v[h], r_refdef.vieworg, v[h]);
+			VectorAdd (v[h], r_refdef.viewposition, v[h]);
 			for (i = t; i != h; i = (i + 1) % 3) {
 				qfglVertex3fv (v[i]);
 				qfglVertex3fv (v[h]);
diff --git a/libs/video/renderer/gl/gl_sky_clip.c b/libs/video/renderer/gl/gl_sky_clip.c
index 44a560005..697403eb9 100644
--- a/libs/video/renderer/gl/gl_sky_clip.c
+++ b/libs/video/renderer/gl/gl_sky_clip.c
@@ -220,14 +220,14 @@ find_cube_vertex (int face1, int face2, int face3, vec3_t v)
 	set_vertex
 
 	add the vertex to the polygon describing the face of the cube. Offsets
-	the vertex relative to r_refdef.vieworg so the cube is always centered
+	the vertex relative to r_refdef.viewposition so the cube is always centered
 	on the player and also calculates the texture coordinates of the vertex
 	(wish I could find a cleaner way of calculating s and t).
 */
 static void
 set_vertex (struct box_def *box, int face, int ind, const vec3_t v)
 {
-	VectorAdd (v, r_refdef.vieworg, box->face[face].poly.verts[ind]);
+	VectorAdd (v, r_refdef.viewposition, box->face[face].poly.verts[ind]);
 	switch (face) {
 		case 0:
 			box->face[face].poly.verts[ind][3] = (1024 - v[1] + 4) / BOX_WIDTH;
@@ -601,14 +601,14 @@ R_DrawSkyBoxPoly (const glpoly_t *poly)
 		Sys_Error ("too many verts!");
 	}
 
-	VectorSubtract (poly->verts[poly->numverts - 1], r_refdef.vieworg, last_v);
+	VectorSubtract (poly->verts[poly->numverts - 1], r_refdef.viewposition, last_v);
 	prev_face = determine_face (last_v);
 
 	box.visited_faces[0].face = prev_face;
 	box.face_count = 1;
 
 	for (i = 0; i < poly->numverts; i++) {
-		VectorSubtract (poly->verts[i], r_refdef.vieworg, v);
+		VectorSubtract (poly->verts[i], r_refdef.viewposition, v);
 		face = determine_face (v);
 		if (face != prev_face) {
 			if ((face_axis[face]) == (face_axis[prev_face])) {
@@ -864,11 +864,11 @@ gl_R_DrawSkyChain (const instsurf_t *sky_chain)
 					vec3_t      x, c = { 0, 0, 0 };
 
 					for (i = 0; i < p->numverts; i++) {
-						VectorSubtract (p->verts[i], r_refdef.vieworg, x);
+						VectorSubtract (p->verts[i], r_refdef.viewposition, x);
 						VectorAdd (x, c, c);
 					}
 					VectorScale (c, 1.0 / p->numverts, c);
-					VectorAdd (c, r_refdef.vieworg, c);
+					VectorAdd (c, r_refdef.viewposition, c);
 					qfglVertex3fv (c);
 					p = p->next;
 				}
@@ -889,7 +889,7 @@ gl_R_DrawSkyChain (const instsurf_t *sky_chain)
 					qfglBegin (GL_LINE_LOOP);
 					for (j = 0; j < 4; j++) {
 						VectorScale (&gl_skyvec[i][j][2], 1.0 / 128.0, v);
-						VectorAdd (v, r_refdef.vieworg, v);
+						VectorAdd (v, r_refdef.viewposition, v);
 						qfglVertex3fv (v);
 					}
 					qfglEnd ();
diff --git a/libs/video/renderer/glsl/glsl_alias.c b/libs/video/renderer/glsl/glsl_alias.c
index e0c29cfe4..22983ceef 100644
--- a/libs/video/renderer/glsl/glsl_alias.c
+++ b/libs/video/renderer/glsl/glsl_alias.c
@@ -157,17 +157,20 @@ calc_lighting (entity_t *ent, float *ambient, float *shadelight,
 	unsigned    i;
 	float       add;
 	vec3_t      dist;
+	vec4f_t     entorigin;
 	int         light;
 
+	entorigin = Transform_GetWorldPosition (ent->transform);
+
 	VectorSet ( -1, 0, 0, lightvec);	//FIXME
-	light = R_LightPoint (&r_worldentity.renderer.model->brush, ent->origin);
+	light = R_LightPoint (&r_worldentity.renderer.model->brush, &entorigin[0]);
 	*ambient = max (light, max (ent->renderer.model->min_light,
 								ent->renderer.min_light) * 128);
 	*shadelight = *ambient;
 
 	for (i = 0; i < r_maxdlights; i++) {
 		if (r_dlights[i].die >= vr_data.realtime) {
-			VectorSubtract (ent->origin, r_dlights[i].origin, dist);
+			VectorSubtract (entorigin, r_dlights[i].origin, dist);
 			add = r_dlights[i].radius - VectorLength (dist);
 			if (add > 0)
 				*ambient += add;
diff --git a/libs/video/renderer/glsl/glsl_bsp.c b/libs/video/renderer/glsl/glsl_bsp.c
index 3fc716cf8..50a4e98af 100644
--- a/libs/video/renderer/glsl/glsl_bsp.c
+++ b/libs/video/renderer/glsl/glsl_bsp.c
@@ -660,7 +660,8 @@ R_DrawBrushModel (entity_t *e)
 	plane_t    *plane;
 	msurface_t *surf;
 	qboolean    rotated;
-	vec3_t      mins, maxs, org;
+	vec3_t      mins, maxs;
+	vec4f_t     org;
 	mod_brush_t *brush;
 
 	model = e->renderer.model;
@@ -671,19 +672,20 @@ R_DrawBrushModel (entity_t *e)
 	if (mat[0][0] != 1 || mat[1][1] != 1 || mat[2][2] != 1) {
 		rotated = true;
 		radius = model->radius;
-		if (R_CullSphere (e->origin, radius))
+		if (R_CullSphere (&mat[3][0], radius)) { // FIXME
 			return;
+		}
 	} else {
 		rotated = false;
-		VectorAdd (e->origin, model->mins, mins);
-		VectorAdd (e->origin, model->maxs, maxs);
+		VectorAdd (mat[3], model->mins, mins);
+		VectorAdd (mat[3], model->maxs, maxs);
 		if (R_CullBox (mins, maxs))
 			return;
 	}
 
-	VectorSubtract (r_refdef.vieworg, e->origin, org);
+	org = r_refdef.viewposition - mat[3];
 	if (rotated) {
-		vec4f_t     temp = { org[0], org[1], org[2], 0 };
+		vec4f_t     temp = org;
 
 		org[0] = dotf (temp, mat[0])[0];
 		org[1] = dotf (temp, mat[1])[0];
@@ -699,7 +701,7 @@ R_DrawBrushModel (entity_t *e)
 				|| (!r_dlights[k].radius))
 				continue;
 
-			VectorSubtract (r_dlights[k].origin, e->origin, lightorigin);
+			VectorSubtract (r_dlights[k].origin, mat[3], lightorigin);
 			R_RecursiveMarkLights (brush, lightorigin, &r_dlights[k], k,
 							brush->nodes + brush->hulls[0].firstclipnode);
 		}
diff --git a/libs/video/renderer/glsl/glsl_iqm.c b/libs/video/renderer/glsl/glsl_iqm.c
index 76a9ae85e..93a25e982 100644
--- a/libs/video/renderer/glsl/glsl_iqm.c
+++ b/libs/video/renderer/glsl/glsl_iqm.c
@@ -214,22 +214,24 @@ glsl_R_DrawIQM (void)
 	dlight_t   *lights[MAX_IQM_LIGHTS];
 	int         i;
 	vec_t       norm_mat[9];
+	vec4f_t     entorigin;
 	mat4f_t     mvp_mat;
 	float       blend;
 	iqmframe_t *frame;
 
-	R_LightPoint (&r_worldentity.renderer.model->brush, ent->origin);//FIXME min_light?
-	VectorScale (ambientcolor, 1/255.0, ambientcolor);
-	R_FindNearLights (ent->origin, MAX_IQM_LIGHTS, lights);
-
 	// we need only the rotation for normals.
 	mat4f_t mat;
 	Transform_GetWorldMatrix (ent->transform, mat);
 	VectorCopy (mat[0], norm_mat + 0);
 	VectorCopy (mat[1], norm_mat + 3);
 	VectorCopy (mat[2], norm_mat + 6);
+	entorigin = mat[3];
 	mmulf (mvp_mat, iqm_vp, mat);
 
+	R_LightPoint (&r_worldentity.renderer.model->brush, &entorigin[0]);//FIXME min_light?
+	VectorScale (ambientcolor, 1/255.0, ambientcolor);
+	R_FindNearLights (&entorigin[0], MAX_IQM_LIGHTS, lights);//FIXME
+
 	blend = R_IQMGetLerpedFrames (ent, iqm);
 	frame = R_IQMBlendFrames (iqm, ent->animation.pose1, ent->animation.pose2,
 							  blend, 0);
@@ -240,7 +242,7 @@ glsl_R_DrawIQM (void)
 		lightpar_t *l = &iqm_shader.lights[i];
 		if (!lights[i])
 			break;
-		VectorSubtract (lights[i]->origin, ent->origin, val);
+		VectorSubtract (lights[i]->origin, entorigin, val);
 		val[3] = lights[i]->radius;
 		qfeglUniform4fv (l->position.location, 1, val);
 		qfeglUniform4fv (l->color.location, 1, lights[i]->color);
diff --git a/libs/video/renderer/glsl/glsl_lightmap.c b/libs/video/renderer/glsl/glsl_lightmap.c
index 65af9d238..f34de4692 100644
--- a/libs/video/renderer/glsl/glsl_lightmap.c
+++ b/libs/video/renderer/glsl/glsl_lightmap.c
@@ -44,6 +44,7 @@
 #endif
 #include <stdlib.h>
 
+#include "QF/entity.h"
 #include "QF/render.h"
 #include "QF/sys.h"
 
@@ -70,6 +71,7 @@ R_AddDynamicLights_1 (msurface_t *surf)
 	int         sd, td;
 	float       dist, rad, minlight;
 	vec3_t      impact, local, lightorigin;
+	vec4f_t     entorigin = { 0, 0, 0, 1};
 	int         s, t;
 	int         smax, tmax;
 	mtexinfo_t *tex;
@@ -78,12 +80,16 @@ R_AddDynamicLights_1 (msurface_t *surf)
 	tmax = (surf->extents[1] >> 4) + 1;
 	tex = surf->texinfo;
 
+	if (currententity->transform) {
+		//FIXME give world entity a transform
+		entorigin = Transform_GetWorldPosition (currententity->transform);
+	}
+
 	for (lnum = 0; lnum < r_maxdlights; lnum++) {
 		if (!(surf->dlightbits[lnum / 32] & (1 << (lnum % 32))))
 			continue;					// not lit by this light
 
-		VectorSubtract (r_dlights[lnum].origin, currententity->origin,
-						lightorigin);
+		VectorSubtract (r_dlights[lnum].origin, entorigin, lightorigin);
 		rad = r_dlights[lnum].radius;
 		dist = DotProduct (lightorigin, surf->plane->normal)
 				- surf->plane->dist;
diff --git a/libs/video/renderer/glsl/glsl_main.c b/libs/video/renderer/glsl/glsl_main.c
index ba8c2dce7..fed46ed3a 100644
--- a/libs/video/renderer/glsl/glsl_main.c
+++ b/libs/video/renderer/glsl/glsl_main.c
@@ -113,8 +113,11 @@ glsl_R_SetupFrame (void)
 	R_ClearEnts ();
 	r_framecount++;
 
-	VectorCopy (r_refdef.vieworg, r_origin);
-	AngleVectors (r_refdef.viewangles, vpn, vright, vup);
+	VectorCopy (r_refdef.viewposition, r_origin);
+	VectorCopy (qvmulf (r_refdef.viewrotation, (vec4f_t) { 1, 0, 0, 0 }), vpn);
+	VectorCopy (qvmulf (r_refdef.viewrotation, (vec4f_t) { 0, -1, 0, 0 }), vright);
+	VectorCopy (qvmulf (r_refdef.viewrotation, (vec4f_t) { 0, 0, 1, 0 }), vup);
+
 
 	R_SetFrustum ();
 
@@ -131,7 +134,6 @@ R_SetupView (void)
 		{ 0, 1,  0, 0},
 		{ 0, 0,  0, 1},
 	};
-	vec4f_t     rotation;
 	vec4f_t     offset = { 0, 0, 0, 1 };
 
 	x = r_refdef.vrect.x;
@@ -140,11 +142,10 @@ R_SetupView (void)
 	h = r_refdef.vrect.height;
 	qfeglViewport (x, y, w, h);
 
-	AngleQuat (r_refdef.viewangles, &rotation[0]);
-	rotation = qconjf (rotation);
-	mat4fquat (glsl_view, rotation);
+	mat4fquat (glsl_view, qconjf (r_refdef.viewrotation));
 	mmulf (glsl_view, z_up, glsl_view);
-	VectorNegate (r_refdef.vieworg, offset);
+	offset = -r_refdef.viewposition;
+	offset[3] = 1;
 	glsl_view[3] = mvmulf (glsl_view, offset);
 
 	qfeglEnable (GL_CULL_FACE);
@@ -304,6 +305,7 @@ glsl_R_ClearState (void)
 void
 glsl_R_TimeRefresh_f (void)
 {
+/* FIXME update for simd
 	double      start, stop, time;
 	int         i;
 
@@ -319,4 +321,5 @@ glsl_R_TimeRefresh_f (void)
 	stop = Sys_DoubleTime ();
 	time = stop - start;
 	Sys_Printf ("%g seconds (%g fps)\n", time, 128 / time);
+*/
 }
diff --git a/libs/video/renderer/glsl/glsl_particles.c b/libs/video/renderer/glsl/glsl_particles.c
index eb7eccb6d..de8c64602 100644
--- a/libs/video/renderer/glsl/glsl_particles.c
+++ b/libs/video/renderer/glsl/glsl_particles.c
@@ -42,6 +42,7 @@
 
 #include "QF/cmd.h"
 #include "QF/cvar.h"
+#include "QF/entity.h"
 #include "QF/image.h"
 #include "QF/mersenne.h"
 #include "QF/qargs.h"
@@ -629,12 +630,14 @@ R_RocketTrail_QF (const entity_t *ent)
 	float		dist, maxlen, origlen, percent, pscale, pscalenext;
 	float		len = 0.0;
 	vec3_t		old_origin, vec;
+	vec3_t		org;
 
 	if (numparticles >= r_maxparticles)
 		return;
 
 	VectorCopy (ent->old_origin, old_origin);
-	VectorSubtract (ent->origin, old_origin, vec);
+	VectorCopy (Transform_GetWorldPosition (ent->transform), org);
+	VectorSubtract (org, old_origin, vec);
 	maxlen = VectorNormalize (vec);
 	origlen = vr_data.frametime / maxlen;
 	pscale = 1.5 + qfrandom (1.5);
@@ -663,12 +666,14 @@ R_GrenadeTrail_QF (const entity_t *ent)
 	float		dist, maxlen, origlen, percent, pscale, pscalenext;
 	float		len = 0.0;
 	vec3_t		old_origin, vec;
+	vec3_t		org;
 
 	if (numparticles >= r_maxparticles)
 		return;
 
 	VectorCopy (ent->old_origin, old_origin);
-	VectorSubtract (ent->origin, old_origin, vec);
+	VectorCopy (Transform_GetWorldPosition (ent->transform), org);
+	VectorSubtract (org, old_origin, vec);
 	maxlen = VectorNormalize (vec);
 	origlen = vr_data.frametime / maxlen;
 	pscale = 6.0 + qfrandom (7.0);
@@ -698,12 +703,14 @@ R_BloodTrail_QF (const entity_t *ent)
 	float		len = 0.0;
 	int			j;
 	vec3_t		old_origin, porg, pvel, vec;
+	vec3_t		org;
 
 	if (numparticles >= r_maxparticles)
 		return;
 
 	VectorCopy (ent->old_origin, old_origin);
-	VectorSubtract (ent->origin, old_origin, vec);
+	VectorCopy (Transform_GetWorldPosition (ent->transform), org);
+	VectorSubtract (org, old_origin, vec);
 	maxlen = VectorNormalize (vec);
 	origlen = vr_data.frametime / maxlen;
 	pscale = 5.0 + qfrandom (10.0);
@@ -738,12 +745,14 @@ R_SlightBloodTrail_QF (const entity_t *ent)
 	float		len = 0.0;
 	int			j;
 	vec3_t      old_origin, porg, pvel, vec;
+	vec3_t      org;
 
 	if (numparticles >= r_maxparticles)
 		return;
 
 	VectorCopy (ent->old_origin, old_origin);
-	VectorSubtract (ent->origin, old_origin, vec);
+	VectorCopy (Transform_GetWorldPosition (ent->transform), org);
+	VectorSubtract (org, old_origin, vec);
 	maxlen = VectorNormalize (vec);
 	origlen = vr_data.frametime / maxlen;
 	pscale = 1.5 + qfrandom (7.5);
@@ -778,12 +787,14 @@ R_WizTrail_QF (const entity_t *ent)
 	float		dist = 3.0, len = 0.0;
 	static int	tracercount;
 	vec3_t		old_origin, pvel, subtract, vec;
+	vec3_t		org;
 
 	if (numparticles >= r_maxparticles)
 		return;
 
 	VectorCopy (ent->old_origin, old_origin);
-	VectorSubtract (ent->origin, old_origin, vec);
+	VectorCopy (Transform_GetWorldPosition (ent->transform), org);
+	VectorSubtract (org, old_origin, vec);
 	maxlen = VectorNormalize (vec);
 	origlen = vr_data.frametime / maxlen;
 	VectorScale (vec, maxlen - dist, subtract);
@@ -819,12 +830,14 @@ R_FlameTrail_QF (const entity_t *ent)
 	float		dist = 3.0, len = 0.0;
 	static int	tracercount;
 	vec3_t		old_origin, pvel, subtract, vec;
+	vec3_t		org;
 
 	if (numparticles >= r_maxparticles)
 		return;
 
 	VectorCopy (ent->old_origin, old_origin);
-	VectorSubtract (ent->origin, old_origin, vec);
+	VectorCopy (Transform_GetWorldPosition (ent->transform), org);
+	VectorSubtract (org, old_origin, vec);
 	maxlen = VectorNormalize (vec);
 	origlen = vr_data.frametime / maxlen;
 	VectorScale (vec, maxlen - dist, subtract);
@@ -860,12 +873,14 @@ R_VoorTrail_QF (const entity_t *ent)
 	float		dist = 3.0, len = 0.0;
 	int			j;
 	vec3_t		subtract, old_origin, porg, vec;
+	vec3_t		org;
 
 	if (numparticles >= r_maxparticles)
 		return;
 
 	VectorCopy (ent->old_origin, old_origin);
-	VectorSubtract (ent->origin, old_origin, vec);
+	VectorCopy (Transform_GetWorldPosition (ent->transform), org);
+	VectorSubtract (org, old_origin, vec);
 	maxlen = VectorNormalize (vec);
 	origlen = vr_data.frametime / maxlen;
 	VectorScale (vec, maxlen - dist, subtract);
@@ -898,7 +913,8 @@ R_GlowTrail_QF (const entity_t *ent, int glow_color)
 		return;
 
 	VectorCopy (ent->old_origin, old_origin);
-	VectorSubtract (ent->origin, old_origin, vec);
+	VectorCopy (Transform_GetWorldPosition (ent->transform), org);
+	VectorSubtract (org, old_origin, vec);
 	maxlen = VectorNormalize (vec);
 	origlen = vr_data.frametime / maxlen;
 	VectorScale (vec, (maxlen - dist), subtract);
@@ -977,12 +993,14 @@ R_RocketTrail_EE (const entity_t *ent)
 	float		dist, maxlen, origlen, percent, pscale, pscalenext;
 	float		len = 0.0;
 	vec3_t		old_origin, subtract, vec;
+	vec3_t		org;
 
 	if (numparticles >= r_maxparticles)
 		return;
 
 	VectorCopy (ent->old_origin, old_origin);
-	VectorSubtract (ent->origin, old_origin, vec);
+	VectorCopy (Transform_GetWorldPosition (ent->transform), org);
+	VectorSubtract (org, old_origin, vec);
 	maxlen = VectorNormalize (vec);
 	origlen = vr_data.frametime / maxlen;
 	pscale = 1.5 + qfrandom (1.5);
@@ -1012,12 +1030,14 @@ R_GrenadeTrail_EE (const entity_t *ent)
 	float		dist, maxlen, origlen, percent, pscale, pscalenext;
 	float		len = 0.0;
 	vec3_t		old_origin, subtract, vec;
+	vec3_t		org;
 
 	if (numparticles >= r_maxparticles)
 		return;
 
 	VectorCopy (ent->old_origin, old_origin);
-	VectorSubtract (ent->origin, ent->old_origin, vec);
+	VectorCopy (Transform_GetWorldPosition (ent->transform), org);
+	VectorSubtract (org, ent->old_origin, vec);
 	maxlen = VectorNormalize (vec);
 	origlen = vr_data.frametime / maxlen;
 	pscale = 6.0 + qfrandom (7.0);
@@ -1251,7 +1271,7 @@ R_DarkFieldParticles_ID (const entity_t *ent)
 //		l = r_maxparticles - numparticles;
 //	}
 
-	VectorCopy (ent->origin, org);
+	VectorCopy (Transform_GetWorldPosition (ent->transform), org);
 
 	for (i = -16; i < 16; i += 8) {
 		dir [1] = i * 8;
@@ -1285,6 +1305,7 @@ R_EntityParticles_ID (const entity_t *ent)
 	float       angle, sp, sy, cp, cy; // cr, sr
 	float       beamlength = 16.0, dist = 64.0;
 	vec3_t      forward, porg;
+	vec3_t      org;
 
 	if (numparticles + j >= r_maxparticles) {
 		return;
@@ -1292,6 +1313,8 @@ R_EntityParticles_ID (const entity_t *ent)
 		j = r_maxparticles - numparticles;
 	}
 
+	VectorCopy (Transform_GetWorldPosition (ent->transform), org);
+
 	for (i = 0; i < NUMVERTEXNORMALS; i++) {
 		int         k;
 		for (k = 0; k < 3; k++) {
@@ -1315,11 +1338,11 @@ R_EntityParticles_ID (const entity_t *ent)
 		forward[1] = cp * sy;
 		forward[2] = -sp;
 
-		porg[0] = ent->origin[0] + vertex_normals[i][0] * dist +
+		porg[0] = org[0] + vertex_normals[i][0] * dist +
 			forward[0] * beamlength;
-		porg[1] = ent->origin[1] + vertex_normals[i][1] * dist +
+		porg[1] = org[1] + vertex_normals[i][1] * dist +
 			forward[1] * beamlength;
-		porg[2] = ent->origin[2] + vertex_normals[i][2] * dist +
+		porg[2] = org[2] + vertex_normals[i][2] * dist +
 			forward[2] * beamlength;
 		particle_new (pt_explode, part_tex_dot, porg, 1.0, vec3_origin,
 					  vr_data.realtime + 0.01, 0x6f, 1.0, 0);
@@ -1338,7 +1361,8 @@ R_RocketTrail_ID (const entity_t *ent)
 		return;
 
 	VectorCopy (ent->old_origin, old_origin);
-	VectorSubtract (ent->origin, ent->old_origin, vec);
+	VectorCopy (Transform_GetWorldPosition (ent->transform), org);
+	VectorSubtract (org, ent->old_origin, vec);
 	maxlen = VectorNormalize (vec);
 	VectorScale (vec, (maxlen - dist), subtract);
 
@@ -1370,7 +1394,8 @@ R_GrenadeTrail_ID (const entity_t *ent)
 		return;
 
 	VectorCopy (ent->old_origin, old_origin);
-	VectorSubtract (ent->origin, ent->old_origin, vec);
+	VectorCopy (Transform_GetWorldPosition (ent->transform), org);
+	VectorSubtract (org, ent->old_origin, vec);
 	maxlen = VectorNormalize (vec);
 	VectorScale (vec, maxlen - dist, subtract);
 
@@ -1397,12 +1422,14 @@ R_BloodTrail_ID (const entity_t *ent)
 	float			dist = 3.0, len = 0.0;
 	unsigned int	rnd;
 	vec3_t			old_origin, subtract, vec, porg;
+	vec3_t			org;
 
 	if (numparticles >= r_maxparticles)
 		return;
 
 	VectorCopy (ent->old_origin, old_origin);
-	VectorSubtract (ent->origin, old_origin, vec);
+	VectorCopy (Transform_GetWorldPosition (ent->transform), org);
+	VectorSubtract (org, old_origin, vec);
 	maxlen = VectorNormalize (vec);
 	VectorScale (vec, maxlen - dist, subtract);
 
@@ -1428,12 +1455,14 @@ R_SlightBloodTrail_ID (const entity_t *ent)
 	float			dist = 6.0, len = 0.0;
 	unsigned int	rnd;
 	vec3_t			old_origin, porg, subtract, vec;
+	vec3_t			org;
 
 	if (numparticles >= r_maxparticles)
 		return;
 
 	VectorCopy (ent->old_origin, old_origin);
-	VectorSubtract (ent->origin, old_origin, vec);
+	VectorCopy (Transform_GetWorldPosition (ent->transform), org);
+	VectorSubtract (org, old_origin, vec);
 	maxlen = VectorNormalize (vec);
 	VectorScale (vec, maxlen - dist, subtract);
 
@@ -1459,12 +1488,14 @@ R_WizTrail_ID (const entity_t *ent)
 	float		dist = 3.0, len = 0.0;
 	static int	tracercount;
 	vec3_t		old_origin, pvel, subtract, vec;
+	vec3_t		org;
 
 	if (numparticles >= r_maxparticles)
 		return;
 
 	VectorCopy (ent->old_origin, old_origin);
-	VectorSubtract (ent->origin, old_origin, vec);
+	VectorCopy (Transform_GetWorldPosition (ent->transform), org);
+	VectorSubtract (org, old_origin, vec);
 	maxlen = VectorNormalize (vec);
 	VectorScale (vec, maxlen - dist, subtract);
 
@@ -1496,12 +1527,14 @@ R_FlameTrail_ID (const entity_t *ent)
 	float		dist = 3.0, len = 0.0;
 	static int	tracercount;
 	vec3_t		old_origin, pvel, subtract, vec;
+	vec3_t		org;
 
 	if (numparticles >= r_maxparticles)
 		return;
 
 	VectorCopy (ent->old_origin, old_origin);
-	VectorSubtract (ent->origin, old_origin, vec);
+	VectorCopy (Transform_GetWorldPosition (ent->transform), org);
+	VectorSubtract (org, old_origin, vec);
 	maxlen = VectorNormalize (vec);
 	VectorScale (vec, maxlen - dist, subtract);
 
@@ -1533,12 +1566,14 @@ R_VoorTrail_ID (const entity_t *ent)
 	float			dist = 3.0, len = 0.0;
 	unsigned int	rnd;
 	vec3_t			old_origin, porg, subtract, vec;
+	vec3_t			org;
 
 	if (numparticles >= r_maxparticles)
 		return;
 
 	VectorCopy (ent->old_origin, old_origin);
-	VectorSubtract (ent->origin, old_origin, vec);
+	VectorCopy (Transform_GetWorldPosition (ent->transform), org);
+	VectorSubtract (org, old_origin, vec);
 	maxlen = VectorNormalize (vec);
 	VectorScale (vec, maxlen - dist, subtract);
 
@@ -1594,7 +1629,7 @@ draw_qf_particles (void)
 	// LordHavoc: particles should not affect zbuffer
 	qfeglDepthMask (GL_FALSE);
 
-	minparticledist = DotProduct (r_refdef.vieworg, vpn) +
+	minparticledist = DotProduct (r_refdef.viewposition, vpn) +
 		r_particles_nearclip->value;
 
 	activeparticles = 0;
@@ -1736,7 +1771,7 @@ draw_id_particles (void)
 	qfeglEnable (GL_TEXTURE_2D);
 	qfeglBindTexture (GL_TEXTURE_2D, glsl_palette);
 
-	minparticledist = DotProduct (r_refdef.vieworg, vpn) +
+	minparticledist = DotProduct (r_refdef.viewposition, vpn) +
 		r_particles_nearclip->value;
 
 	activeparticles = 0;
diff --git a/libs/video/renderer/glsl/glsl_sprite.c b/libs/video/renderer/glsl/glsl_sprite.c
index 4d35bc8d6..7eecea5dd 100644
--- a/libs/video/renderer/glsl/glsl_sprite.c
+++ b/libs/video/renderer/glsl/glsl_sprite.c
@@ -185,6 +185,7 @@ make_quad (mspriteframe_t *frame, vec4f_t vpn, vec4f_t vright,
 {
 	vec4f_t     left, up, right, down;
 	vec4f_t     ul, ur, ll, lr;
+	vec4f_t     origin = Transform_GetWorldPosition (currententity->transform);
 
 	// build the sprite poster in worldspace
 	// first, rotate the sprite axes into world space
@@ -198,12 +199,12 @@ make_quad (mspriteframe_t *frame, vec4f_t vpn, vec4f_t vright,
 	ll = down + left;
 	lr = down + right;
 	// finally, translate the sprite corners, creating two triangles
-	VectorAdd (currententity->origin, ul, verts[0]);	// first triangle
-	VectorAdd (currententity->origin, ur, verts[1]);
-	VectorAdd (currententity->origin, lr, verts[2]);
-	VectorAdd (currententity->origin, ul, verts[3]);	// second triangle
-	VectorAdd (currententity->origin, lr, verts[4]);
-	VectorAdd (currententity->origin, ll, verts[5]);
+	VectorAdd (origin, ul, verts[0]);	// first triangle
+	VectorAdd (origin, ur, verts[1]);
+	VectorAdd (origin, lr, verts[2]);
+	VectorAdd (origin, ul, verts[3]);	// second triangle
+	VectorAdd (origin, lr, verts[4]);
+	VectorAdd (origin, ll, verts[5]);
 }
 
 void
@@ -212,9 +213,9 @@ R_DrawSprite (void)
 	entity_t   *ent = currententity;
 	msprite_t  *sprite = (msprite_t *) ent->renderer.model->cache.data;
 	mspriteframe_t *frame1, *frame2;
-	float       blend, sr, cr, dot, angle;
+	float       blend, sr, cr, dot;
 	vec3_t      tvec;
-	vec4f_t     svpn = {}, svright = {}, svup = {};
+	vec4f_t     svpn = {}, svright = {}, svup = {}, rot;
 	static quat_t color = { 1, 1, 1, 1};
 	float       vertsa[6][3], vertsb[6][3];
 	static float uvab[6][4] = {
@@ -284,9 +285,10 @@ R_DrawSprite (void)
 			// rotated in that plane round the center according to the sprite
 			// entity's roll angle. Thus svpn stays the same, but svright and
 			// svup rotate
-			angle = currententity->angles[ROLL] * (M_PI / 180);
-			sr = sin (angle);
-			cr = cos (angle);
+			rot = Transform_GetLocalRotation (currententity->transform);
+			//FIXME assumes the entity is only rolled
+			sr = 2 * rot[0] * rot[3];
+			cr = rot[3] * rot[3] - rot[0] * rot[0];
 			VectorCopy (vpn, svpn);
 			VectorScale (vright, cr, svright);
 			VectorMultAdd (svright, sr, vup, svright);
diff --git a/libs/video/renderer/r_efrag.c b/libs/video/renderer/r_efrag.c
index 86d494b6d..eb559e9cd 100644
--- a/libs/video/renderer/r_efrag.c
+++ b/libs/video/renderer/r_efrag.c
@@ -30,6 +30,7 @@
 
 #include <stdlib.h>
 
+#include "QF/entity.h"
 #include "QF/render.h"
 #include "QF/sys.h"
 
@@ -210,8 +211,9 @@ R_AddEfrags (mod_brush_t *brush, entity_t *ent)
 
 	entmodel = ent->renderer.model;
 
-	VectorAdd (ent->origin, entmodel->mins, emins);
-	VectorAdd (ent->origin, entmodel->maxs, emaxs);
+	vec4f_t     org = Transform_GetWorldPosition (ent->transform);
+	VectorAdd (org, entmodel->mins, emins);
+	VectorAdd (org, entmodel->maxs, emaxs);
 
 	ent->visibility.topnode = 0;
 	R_SplitEntityOnNode (brush, ent, emins, emaxs);
diff --git a/libs/video/renderer/sw/d_edge.c b/libs/video/renderer/sw/d_edge.c
index f510e2063..d1e8a4e29 100644
--- a/libs/video/renderer/sw/d_edge.c
+++ b/libs/video/renderer/sw/d_edge.c
@@ -29,6 +29,7 @@
 #endif
 
 #include "QF/cvar.h"
+#include "QF/entity.h"
 #include "QF/render.h"
 
 #include "d_local.h"
@@ -207,7 +208,8 @@ D_DrawSurfaces (void)
 					// TODO: store once at start of frame
 					currententity = s->entity;	// FIXME: make this passed in
 												// to R_RotateBmodel ()
-					VectorSubtract (r_origin, currententity->origin,
+					VectorSubtract (r_origin,
+						Transform_GetWorldPosition (currententity->transform),
 									local_modelorg);
 					TransformVector (local_modelorg, transformed_modelorg);
 
@@ -240,7 +242,8 @@ D_DrawSurfaces (void)
 					// TODO: store once at start of frame
 					currententity = s->entity;	// FIXME: make this passed in
 												// to R_RotateBmodel ()
-					VectorSubtract (r_origin, currententity->origin,
+					VectorSubtract (r_origin,
+						Transform_GetWorldPosition (currententity->transform),
 									local_modelorg);
 					TransformVector (local_modelorg, transformed_modelorg);
 
diff --git a/libs/video/renderer/sw/sw_rmain.c b/libs/video/renderer/sw/sw_rmain.c
index 8ab480bcc..63eecbb60 100644
--- a/libs/video/renderer/sw/sw_rmain.c
+++ b/libs/video/renderer/sw/sw_rmain.c
@@ -362,16 +362,16 @@ R_DrawEntitiesOnList (void)
 	for (ent = r_ent_queue; ent; ent = ent->next) {
 		currententity = ent;
 
+		VectorCopy (Transform_GetWorldPosition (currententity->transform),
+					r_entorigin);
 		switch (currententity->renderer.model->type) {
 			case mod_sprite:
-				VectorCopy (currententity->origin, r_entorigin);
 				VectorSubtract (r_origin, r_entorigin, modelorg);
 				R_DrawSprite ();
 				break;
 
 			case mod_alias:
 			case mod_iqm:
-				VectorCopy (currententity->origin, r_entorigin);
 				VectorSubtract (r_origin, r_entorigin, modelorg);
 
 				minlight = max (currententity->renderer.model->min_light,
@@ -384,7 +384,7 @@ R_DrawEntitiesOnList (void)
 					|| R_AliasCheckBBox ()) {
 					// 128 instead of 255 due to clamping below
 					j = max (R_LightPoint (&r_worldentity.renderer.model->brush,
-										   currententity->origin), minlight * 128);
+										   r_entorigin), minlight * 128);
 
 					lighting.ambientlight = j;
 					lighting.shadelight = j;
@@ -393,7 +393,7 @@ R_DrawEntitiesOnList (void)
 
 					for (lnum = 0; lnum < r_maxdlights; lnum++) {
 						if (r_dlights[lnum].die >= vr_data.realtime) {
-							VectorSubtract (currententity->origin,
+							VectorSubtract (r_entorigin,
 											r_dlights[lnum].origin, dist);
 							add = r_dlights[lnum].radius - VectorLength (dist);
 
@@ -443,7 +443,8 @@ R_DrawViewModel (void)
 	if (!currententity->renderer.model)
 		return;
 
-	VectorCopy (currententity->origin, r_entorigin);
+	VectorCopy (Transform_GetWorldPosition (currententity->transform),
+				r_entorigin);
 	VectorSubtract (r_origin, r_entorigin, modelorg);
 
 	VectorCopy (vup, viewlightvec);
@@ -453,7 +454,7 @@ R_DrawViewModel (void)
 					currententity->renderer.model->min_light);
 
 	j = max (R_LightPoint (&r_worldentity.renderer.model->brush,
-						   currententity->origin), minlight * 128);
+						   r_entorigin), minlight * 128);
 
 	r_viewlighting.ambientlight = j;
 	r_viewlighting.shadelight = j;
@@ -468,7 +469,7 @@ R_DrawViewModel (void)
 		if (dl->die < vr_data.realtime)
 			continue;
 
-		VectorSubtract (currententity->origin, dl->origin, dist);
+		VectorSubtract (r_entorigin, dl->origin, dist);
 		add = dl->radius - VectorLength (dist);
 		if (add > 0)
 			r_viewlighting.ambientlight += add;
@@ -498,7 +499,7 @@ R_BmodelCheckBBox (model_t *clmodel, float *minmaxs)
 	Transform_GetWorldMatrix (currententity->transform, mat);
 	if (mat[0][0] != 1 || mat[1][1] != 1 || mat[2][2] != 1) {
 		for (i = 0; i < 4; i++) {
-			d = DotProduct (currententity->origin, view_clipplanes[i].normal);
+			d = DotProduct (mat[3], view_clipplanes[i].normal);
 			d -= view_clipplanes[i].dist;
 
 			if (d <= -clmodel->radius)
@@ -546,6 +547,7 @@ R_DrawBEntitiesOnList (void)
 	int         j, clipflags;
 	unsigned int k;
 	vec3_t      oldorigin;
+	vec3_t      origin;
 	model_t    *clmodel;
 	float       minmaxs[6];
 	entity_t   *ent;
@@ -559,6 +561,8 @@ R_DrawBEntitiesOnList (void)
 	for (ent = r_ent_queue; ent; ent = ent->next) {
 		currententity = ent;
 
+		VectorCopy (Transform_GetWorldPosition (currententity->transform),
+					origin);
 		switch (currententity->renderer.model->type) {
 			case mod_brush:
 				clmodel = currententity->renderer.model;
@@ -566,16 +570,15 @@ R_DrawBEntitiesOnList (void)
 				// see if the bounding box lets us trivially reject, also
 				// sets trivial accept status
 				for (j = 0; j < 3; j++) {
-					minmaxs[j] = currententity->origin[j] + clmodel->mins[j];
-					minmaxs[3 + j] = currententity->origin[j] +
-						clmodel->maxs[j];
+					minmaxs[j] = origin[j] + clmodel->mins[j];
+					minmaxs[3 + j] = origin[j] + clmodel->maxs[j];
 				}
 
 				clipflags = R_BmodelCheckBBox (clmodel, minmaxs);
 
 				if (clipflags != BMODEL_FULLY_CLIPPED) {
 					mod_brush_t *brush = &clmodel->brush;
-					VectorCopy (currententity->origin, r_entorigin);
+					VectorCopy (origin, r_entorigin);
 					VectorSubtract (r_origin, r_entorigin, modelorg);
 
 					// FIXME: is this needed?
@@ -594,8 +597,7 @@ R_DrawBEntitiesOnList (void)
 							if ((r_dlights[k].die < vr_data.realtime) ||
 								(!r_dlights[k].radius)) continue;
 
-							VectorSubtract (r_dlights[k].origin,
-											currententity->origin,
+							VectorSubtract (r_dlights[k].origin, origin,
 											lightorigin);
 							R_RecursiveMarkLights (brush, lightorigin,
 												   &r_dlights[k], k,
@@ -829,7 +831,7 @@ R_RenderView_ (void)
 	R_HighFPPrecision ();
 }
 
-static void R_RenderViewFishEye (void);
+//XXX FIXME static void R_RenderViewFishEye (void);
 
 void
 R_RenderView (void)
@@ -849,11 +851,12 @@ R_RenderView (void)
 
 	if ((intptr_t) (&r_warpbuffer) & 3)
 		Sys_Error ("Globals are missaligned");
-
+	R_RenderView_ ();
+/*XXX FIXME
 	if (!scr_fisheye->int_val)
 		R_RenderView_ ();
 	else
-		R_RenderViewFishEye ();
+		R_RenderViewFishEye ();*/
 }
 
 void
@@ -867,7 +870,7 @@ R_InitTurb (void)
 		// AMP2 not 20
 	}
 }
-
+/*XXX FIXME
 #define BOX_FRONT  0
 #define BOX_BEHIND 2
 #define BOX_LEFT   3
@@ -1152,7 +1155,7 @@ R_RenderViewFishEye (void)
 	r_refdef.viewangles[PITCH] = pitch;
 	r_refdef.viewangles[ROLL] = roll;
 	renderlookup (offs, scrbufs);
-}
+}*/
 
 void
 R_ClearState (void)
diff --git a/libs/video/renderer/sw/sw_rmisc.c b/libs/video/renderer/sw/sw_rmisc.c
index dee5c780e..2ea74ad4e 100644
--- a/libs/video/renderer/sw/sw_rmisc.c
+++ b/libs/video/renderer/sw/sw_rmisc.c
@@ -53,6 +53,7 @@ R_CheckVariables (void)
 void
 R_TimeRefresh_f (void)
 {
+/* FIXME update for simd
 	int         i;
 	float       start, stop, time;
 	int         startangle;
@@ -82,6 +83,7 @@ R_TimeRefresh_f (void)
 	Sys_Printf ("%g seconds (%g fps)\n", time, 128 / time);
 
 	r_refdef.viewangles[1] = startangle;
+*/
 }
 
 void
@@ -237,10 +239,12 @@ R_SetupFrame (void)
 #endif
 
 	// build the transformation matrix for the given view angles
-	VectorCopy (r_refdef.vieworg, modelorg);
-	VectorCopy (r_refdef.vieworg, r_origin);
+	VectorCopy (r_refdef.viewposition, modelorg);
+	VectorCopy (r_refdef.viewposition, r_origin);
 
-	AngleVectors (r_refdef.viewangles, vpn, vright, vup);
+	VectorCopy (qvmulf (r_refdef.viewrotation, (vec4f_t) { 1, 0, 0, 0 }), vpn);
+	VectorCopy (qvmulf (r_refdef.viewrotation, (vec4f_t) { 0, -1, 0, 0 }), vright);
+	VectorCopy (qvmulf (r_refdef.viewrotation, (vec4f_t) { 0, 0, 1, 0 }), vup);
 	R_SetFrustum ();
 
 	// current viewleaf
diff --git a/libs/video/renderer/sw/sw_rpart.c b/libs/video/renderer/sw/sw_rpart.c
index d154ad739..c429279b2 100644
--- a/libs/video/renderer/sw/sw_rpart.c
+++ b/libs/video/renderer/sw/sw_rpart.c
@@ -37,6 +37,7 @@
 #endif
 
 #include "QF/cvar.h"
+#include "QF/entity.h"
 #include "QF/mersenne.h"
 #include "QF/qargs.h"
 #include "QF/quakefs.h"
@@ -386,9 +387,7 @@ R_DarkFieldParticles_ID (const entity_t *ent)
 	if (!r_particles->int_val)
 		return;
 
-	org[0] = ent->origin[0];
-	org[1] = ent->origin[1];
-	org[2] = ent->origin[2];
+	VectorCopy (Transform_GetWorldPosition (ent->transform), org);
 	for (i = -16; i < 16; i += 8) {
 		for (j = -16; j < 16; j += 8) {
 			for (k = 0; k < 32; k += 8) {
@@ -431,10 +430,13 @@ R_EntityParticles_ID (const entity_t *ent)
 	float		beamlength = 16.0, dist = 64.0;
 	particle_t *p;
 	vec3_t		forward;
+	vec3_t      org;
 
 	if (!r_particles->int_val)
 		return;
 
+	VectorCopy (Transform_GetWorldPosition (ent->transform), org);
+
 	for (i = 0; i < NUMVERTEXNORMALS; i++) {
 		int         k;
 		for (k = 0; k < 3; k++) {
@@ -470,11 +472,11 @@ R_EntityParticles_ID (const entity_t *ent)
 		p->type = pt_explode;
 		p->phys = R_ParticlePhysics (p->type);
 
-		p->org[0] = ent->origin[0] + r_avertexnormals[i][0] * dist +
+		p->org[0] = org[0] + r_avertexnormals[i][0] * dist +
 			forward[0] * beamlength;
-		p->org[1] = ent->origin[1] + r_avertexnormals[i][1] * dist +
+		p->org[1] = org[1] + r_avertexnormals[i][1] * dist +
 			forward[1] * beamlength;
-		p->org[2] = ent->origin[2] + r_avertexnormals[i][2] * dist +
+		p->org[2] = org[2] + r_avertexnormals[i][2] * dist +
 			forward[2] * beamlength;
 	}
 }
@@ -486,12 +488,14 @@ R_RocketTrail_QF (const entity_t *ent)
 	int			j;
 	particle_t *p;
 	vec3_t		old_origin, vec;
+	vec3_t		org;
 
 	if (!r_particles->int_val)
 		return;
 
+	VectorCopy (Transform_GetWorldPosition (ent->transform), org);
 	VectorCopy (ent->old_origin, old_origin);
-	VectorSubtract (ent->origin, old_origin, vec);
+	VectorSubtract (org, old_origin, vec);
 	len = VectorNormalize (vec);
 
 	while (len > 0) {
@@ -525,12 +529,14 @@ R_GrenadeTrail_QF (const entity_t *ent)
 	int			j;
 	particle_t *p;
 	vec3_t		old_origin, vec;
+	vec3_t		org;
 
 	if (!r_particles->int_val)
 		return;
 
 	VectorCopy (ent->old_origin, old_origin);
-	VectorSubtract (ent->origin, old_origin, vec);
+	VectorCopy (Transform_GetWorldPosition (ent->transform), org);
+	VectorSubtract (org, old_origin, vec);
 	len = VectorNormalize (vec);
 
 	while (len > 0) {
@@ -564,12 +570,14 @@ R_BloodTrail_QF (const entity_t *ent)
 	int			j;
 	particle_t *p;
 	vec3_t		old_origin, vec;
+	vec3_t      org;
 
 	if (!r_particles->int_val)
 		return;
 
 	VectorCopy (ent->old_origin, old_origin);
-	VectorSubtract (ent->origin, old_origin, vec);
+	VectorCopy (Transform_GetWorldPosition (ent->transform), org);
+	VectorSubtract (org, old_origin, vec);
 	len = VectorNormalize (vec);
 
 	while (len > 0) {
@@ -602,12 +610,14 @@ R_SlightBloodTrail_QF (const entity_t *ent)
 	int			j;
 	particle_t *p;
 	vec3_t		old_origin, vec;
+	vec3_t		org;
 
 	if (!r_particles->int_val)
 		return;
 
 	VectorCopy (ent->old_origin, old_origin);
-	VectorSubtract (ent->origin, old_origin, vec);
+	VectorCopy (Transform_GetWorldPosition (ent->transform), org);
+	VectorSubtract (org, old_origin, vec);
 	len = VectorNormalize (vec);
 
 	while (len > 0) {
@@ -639,12 +649,14 @@ R_WizTrail_QF (const entity_t *ent)
 	float		len;
 	particle_t *p;
 	vec3_t		old_origin, vec;
+	vec3_t		org;
 
 	if (!r_particles->int_val)
 		return;
 
 	VectorCopy (ent->old_origin, old_origin);
-	VectorSubtract (ent->origin, old_origin, vec);
+	VectorCopy (Transform_GetWorldPosition (ent->transform), org);
+	VectorSubtract (org, old_origin, vec);
 	len = VectorNormalize (vec);
 
 	while (len > 0) {
@@ -686,12 +698,14 @@ R_FlameTrail_QF (const entity_t *ent)
 	float		len;
 	particle_t *p;
 	vec3_t		old_origin, vec;
+	vec3_t		org;
 
 	if (!r_particles->int_val)
 		return;
 
 	VectorCopy (ent->old_origin, old_origin);
-	VectorSubtract (ent->origin, old_origin, vec);
+	VectorCopy (Transform_GetWorldPosition (ent->transform), org);
+	VectorSubtract (org, old_origin, vec);
 	len = VectorNormalize (vec);
 
 	while (len > 0) {
@@ -734,12 +748,14 @@ R_VoorTrail_QF (const entity_t *ent)
 	int			j;
 	particle_t *p;
 	vec3_t		old_origin, vec;
+	vec3_t      org;
 
 	if (!r_particles->int_val)
 		return;
 
 	VectorCopy (ent->old_origin, old_origin);
-	VectorSubtract (ent->origin, old_origin, vec);
+	VectorCopy (Transform_GetWorldPosition (ent->transform), org);
+	VectorSubtract (org, old_origin, vec);
 	len = VectorNormalize (vec);
 
 	while (len > 0) {
diff --git a/libs/video/renderer/sw/sw_rsprite.c b/libs/video/renderer/sw/sw_rsprite.c
index 8eb4151e7..6a70d2f4f 100644
--- a/libs/video/renderer/sw/sw_rsprite.c
+++ b/libs/video/renderer/sw/sw_rsprite.c
@@ -286,7 +286,7 @@ R_DrawSprite (void)
 	int         i;
 	msprite_t  *psprite;
 	vec3_t      tvec;
-	float       dot, angle, sr, cr;
+	float       dot, sr, cr;
 
 	psprite = currententity->renderer.model->cache.data;
 
@@ -371,9 +371,10 @@ R_DrawSprite (void)
 		// generate the sprite's axes, parallel to the viewplane, but rotated
 		// in that plane around the center according to the sprite entity's
 		// roll angle. So vpn stays the same, but vright and vup rotate
-		angle = currententity->angles[ROLL] * (M_PI * 2 / 360);
-		sr = sin (angle);
-		cr = cos (angle);
+		vec4f_t     rot = Transform_GetLocalRotation (currententity->transform);
+		//FIXME assumes the entity is only rolled
+		sr = 2 * rot[0] * rot[3];
+		cr = rot[3] * rot[3] - rot[0] * rot[0];
 
 		for (i = 0; i < 3; i++) {
 			r_spritedesc.vpn[i] = vpn[i];
diff --git a/libs/video/renderer/sw/sw_rsurf.c b/libs/video/renderer/sw/sw_rsurf.c
index 1dded8c00..36ea5fe79 100644
--- a/libs/video/renderer/sw/sw_rsurf.c
+++ b/libs/video/renderer/sw/sw_rsurf.c
@@ -28,6 +28,7 @@
 # include "config.h"
 #endif
 
+#include "QF/entity.h"
 #include "QF/render.h"
 #include "QF/sys.h"
 
@@ -78,6 +79,7 @@ R_AddDynamicLights (void)
 	int         sd, td;
 	float       dist, rad, minlight;
 	vec3_t      impact, local, lightorigin;
+	vec4f_t     entorigin = { 0, 0, 0, 1 };
 	int         s, t;
 	int         i;
 	int         smax, tmax;
@@ -88,12 +90,16 @@ R_AddDynamicLights (void)
 	tmax = (surf->extents[1] >> 4) + 1;
 	tex = surf->texinfo;
 
+	if (currententity->transform) {
+		//FIXME give world entity a transform
+		entorigin = Transform_GetWorldPosition (currententity->transform);
+	}
+
 	for (lnum = 0; lnum < r_maxdlights; lnum++) {
 		if (!(surf->dlightbits[lnum / 32] & (1 << (lnum % 32))))
 			continue;					// not lit by this light
 
-		VectorSubtract (r_dlights[lnum].origin, currententity->origin,
-						lightorigin);
+		VectorSubtract (r_dlights[lnum].origin, entorigin, lightorigin);
 		rad = r_dlights[lnum].radius;
 		dist = DotProduct (lightorigin, surf->plane->normal) -
 			surf->plane->dist;
diff --git a/libs/video/renderer/sw32/d_edge.c b/libs/video/renderer/sw32/d_edge.c
index 6fa0b131a..6015eaf23 100644
--- a/libs/video/renderer/sw32/d_edge.c
+++ b/libs/video/renderer/sw32/d_edge.c
@@ -32,6 +32,7 @@
 #include "namehack.h"
 
 #include "QF/cvar.h"
+#include "QF/entity.h"
 #include "QF/render.h"
 #include "QF/sys.h"
 
@@ -243,7 +244,8 @@ sw32_D_DrawSurfaces (void)
 					// TODO: store once at start of frame
 					currententity = s->entity;	// FIXME: make this passed in
 												// to sw32_R_RotateBmodel ()
-					VectorSubtract (r_origin, currententity->origin,
+					VectorSubtract (r_origin,
+						Transform_GetWorldPosition (currententity->transform),
 									local_modelorg);
 					sw32_TransformVector (local_modelorg, transformed_modelorg);
 
@@ -276,7 +278,8 @@ sw32_D_DrawSurfaces (void)
 					// TODO: store once at start of frame
 					currententity = s->entity;	// FIXME: make this passed in
 												// to sw32_R_RotateBmodel ()
-					VectorSubtract (r_origin, currententity->origin,
+					VectorSubtract (r_origin,
+						Transform_GetWorldPosition (currententity->transform),
 									local_modelorg);
 					sw32_TransformVector (local_modelorg, transformed_modelorg);
 
diff --git a/libs/video/renderer/sw32/sw32_rmain.c b/libs/video/renderer/sw32/sw32_rmain.c
index 36d94fd2a..d6dfd7670 100644
--- a/libs/video/renderer/sw32/sw32_rmain.c
+++ b/libs/video/renderer/sw32/sw32_rmain.c
@@ -369,16 +369,16 @@ R_DrawEntitiesOnList (void)
 	for (ent = r_ent_queue; ent; ent = ent->next) {
 		currententity = ent;
 
+		VectorCopy (Transform_GetWorldPosition (currententity->transform),
+					r_entorigin);
 		switch (currententity->renderer.model->type) {
 			case mod_sprite:
-				VectorCopy (currententity->origin, r_entorigin);
 				VectorSubtract (r_origin, r_entorigin, modelorg);
 				sw32_R_DrawSprite ();
 				break;
 
 			case mod_alias:
 			case mod_iqm:
-				VectorCopy (currententity->origin, r_entorigin);
 				VectorSubtract (r_origin, r_entorigin, modelorg);
 
 				minlight = max (currententity->renderer.min_light,
@@ -391,7 +391,7 @@ R_DrawEntitiesOnList (void)
 					|| sw32_R_AliasCheckBBox ()) {
 					// 128 instead of 255 due to clamping below
 					j = max (R_LightPoint (&r_worldentity.renderer.model->brush,
-										   currententity->origin),
+										   r_entorigin),
 							 minlight * 128);
 
 					lighting.ambientlight = j;
@@ -401,7 +401,7 @@ R_DrawEntitiesOnList (void)
 
 					for (lnum = 0; lnum < r_maxdlights; lnum++) {
 						if (r_dlights[lnum].die >= vr_data.realtime) {
-							VectorSubtract (currententity->origin,
+							VectorSubtract (r_entorigin,
 											r_dlights[lnum].origin, dist);
 							add = r_dlights[lnum].radius - VectorLength (dist);
 
@@ -450,7 +450,8 @@ R_DrawViewModel (void)
 	if (!currententity->renderer.model)
 		return;
 
-	VectorCopy (currententity->origin, r_entorigin);
+	VectorCopy (Transform_GetWorldPosition (currententity->transform),
+				r_entorigin);
 	VectorSubtract (r_origin, r_entorigin, modelorg);
 
 	VectorCopy (vup, viewlightvec);
@@ -460,7 +461,7 @@ R_DrawViewModel (void)
 					currententity->renderer.model->min_light);
 
 	j = max (R_LightPoint (&r_worldentity.renderer.model->brush,
-						   currententity->origin), minlight * 128);
+						   r_entorigin), minlight * 128);
 
 	r_viewlighting.ambientlight = j;
 	r_viewlighting.shadelight = j;
@@ -475,7 +476,7 @@ R_DrawViewModel (void)
 		if (dl->die < vr_data.realtime)
 			continue;
 
-		VectorSubtract (currententity->origin, dl->origin, dist);
+		VectorSubtract (r_entorigin, dl->origin, dist);
 		add = dl->radius - VectorLength (dist);
 		if (add > 0)
 			r_viewlighting.ambientlight += add;
@@ -505,7 +506,7 @@ R_BmodelCheckBBox (model_t *clmodel, float *minmaxs)
 	Transform_GetWorldMatrix (currententity->transform, mat);
 	if (mat[0][0] != 1 || mat[1][1] != 1 || mat[2][2] != 1) {
 		for (i = 0; i < 4; i++) {
-			d = DotProduct (currententity->origin, sw32_view_clipplanes[i].normal);
+			d = DotProduct (mat[3], sw32_view_clipplanes[i].normal);
 			d -= sw32_view_clipplanes[i].dist;
 
 			if (d <= -clmodel->radius)
@@ -553,6 +554,7 @@ R_DrawBEntitiesOnList (void)
 	int         j, clipflags;
 	unsigned int k;
 	vec3_t      oldorigin;
+	vec3_t      origin;
 	model_t    *clmodel;
 	float       minmaxs[6];
 	entity_t   *ent;
@@ -566,6 +568,8 @@ R_DrawBEntitiesOnList (void)
 	for (ent = r_ent_queue; ent; ent = ent->next) {
 		currententity = ent;
 
+		VectorCopy (Transform_GetWorldPosition (currententity->transform),
+					origin);
 		switch (currententity->renderer.model->type) {
 			case mod_brush:
 				clmodel = currententity->renderer.model;
@@ -573,16 +577,15 @@ R_DrawBEntitiesOnList (void)
 				// see if the bounding box lets us trivially reject, also
 				// sets trivial accept status
 				for (j = 0; j < 3; j++) {
-					minmaxs[j] = currententity->origin[j] + clmodel->mins[j];
-					minmaxs[3 + j] = currententity->origin[j] +
-						clmodel->maxs[j];
+					minmaxs[j] = origin[j] + clmodel->mins[j];
+					minmaxs[3 + j] = origin[j] + clmodel->maxs[j];
 				}
 
 				clipflags = R_BmodelCheckBBox (clmodel, minmaxs);
 
 				if (clipflags != BMODEL_FULLY_CLIPPED) {
 					mod_brush_t *brush = &clmodel->brush;
-					VectorCopy (currententity->origin, r_entorigin);
+					VectorCopy (origin, r_entorigin);
 					VectorSubtract (r_origin, r_entorigin, modelorg);
 
 					// FIXME: is this needed?
@@ -601,8 +604,7 @@ R_DrawBEntitiesOnList (void)
 							if ((r_dlights[k].die < vr_data.realtime) ||
 								(!r_dlights[k].radius)) continue;
 
-							VectorSubtract (r_dlights[k].origin,
-											currententity->origin,
+							VectorSubtract (r_dlights[k].origin, origin,
 											lightorigin);
 							R_RecursiveMarkLights (brush, lightorigin,
 												   &r_dlights[k], k,
diff --git a/libs/video/renderer/sw32/sw32_rmisc.c b/libs/video/renderer/sw32/sw32_rmisc.c
index 753268993..390b13b86 100644
--- a/libs/video/renderer/sw32/sw32_rmisc.c
+++ b/libs/video/renderer/sw32/sw32_rmisc.c
@@ -55,6 +55,7 @@ R_CheckVariables (void)
 void
 sw32_R_TimeRefresh_f (void)
 {
+/* FIXME update for simd
 	int         i;
 	float       start, stop, time;
 	int         startangle;
@@ -84,6 +85,7 @@ sw32_R_TimeRefresh_f (void)
 	Sys_Printf ("%g seconds (%g fps)\n", time, 128 / time);
 
 	r_refdef.viewangles[1] = startangle;
+*/
 }
 
 void
@@ -233,10 +235,12 @@ sw32_R_SetupFrame (void)
 #endif
 
 	// build the transformation matrix for the given view angles
-	VectorCopy (r_refdef.vieworg, modelorg);
-	VectorCopy (r_refdef.vieworg, r_origin);
+	VectorCopy (r_refdef.viewposition, modelorg);
+	VectorCopy (r_refdef.viewposition, r_origin);
 
-	AngleVectors (r_refdef.viewangles, vpn, vright, vup);
+	VectorCopy (qvmulf (r_refdef.viewrotation, (vec4f_t) { 1, 0, 0, 0 }), vpn);
+	VectorCopy (qvmulf (r_refdef.viewrotation, (vec4f_t) { 0, -1, 0, 0 }), vright);
+	VectorCopy (qvmulf (r_refdef.viewrotation, (vec4f_t) { 0, 0, 1, 0 }), vup);
 	R_SetFrustum ();
 
 	// current viewleaf
diff --git a/libs/video/renderer/sw32/sw32_rpart.c b/libs/video/renderer/sw32/sw32_rpart.c
index fc640bc8e..851618819 100644
--- a/libs/video/renderer/sw32/sw32_rpart.c
+++ b/libs/video/renderer/sw32/sw32_rpart.c
@@ -40,6 +40,7 @@
 #endif
 
 #include "QF/cvar.h"
+#include "QF/entity.h"
 #include "QF/mersenne.h"
 #include "QF/qargs.h"
 #include "QF/quakefs.h"
@@ -330,9 +331,7 @@ R_DarkFieldParticles_ID (const entity_t *ent)
 	particle_t	   *p;
 	vec3_t			dir, org;
 
-	org[0] = ent->origin[0];
-	org[1] = ent->origin[1];
-	org[2] = ent->origin[2];
+	VectorCopy (Transform_GetWorldPosition (ent->transform), org);
 	for (i = -16; i < 16; i += 8) {
 		for (j = -16; j < 16; j += 8) {
 			for (k = 0; k < 32; k += 8) {
@@ -376,6 +375,9 @@ R_EntityParticles_ID (const entity_t *ent)
 	float		beamlength = 16.0, dist = 64.0;
 	particle_t *p;
 	vec3_t		forward;
+	vec3_t		org;
+
+	VectorCopy (Transform_GetWorldPosition (ent->transform), org);
 
 	for (i = 0; i < NUMVERTEXNORMALS; i++) {
 		int         k;
@@ -412,11 +414,11 @@ R_EntityParticles_ID (const entity_t *ent)
 		p->type = pt_explode;
 		p->phys = R_ParticlePhysics (p->type);
 
-		p->org[0] = ent->origin[0] + r_avertexnormals[i][0] * dist +
+		p->org[0] = org[0] + r_avertexnormals[i][0] * dist +
 			forward[0] * beamlength;
-		p->org[1] = ent->origin[1] + r_avertexnormals[i][1] * dist +
+		p->org[1] = org[1] + r_avertexnormals[i][1] * dist +
 			forward[1] * beamlength;
-		p->org[2] = ent->origin[2] + r_avertexnormals[i][2] * dist +
+		p->org[2] = org[2] + r_avertexnormals[i][2] * dist +
 			forward[2] * beamlength;
 	}
 }
@@ -499,12 +501,14 @@ R_RocketTrail_QF (const entity_t *ent)
 	int			j;
 	particle_t *p;
 	vec3_t		old_origin, vec;
+	vec3_t		org;
 
 	if (!r_particles->int_val)
 		return;
 
 	VectorCopy (ent->old_origin, old_origin);
-	VectorSubtract (ent->origin, ent->old_origin, vec);
+	VectorCopy (Transform_GetWorldPosition (ent->transform), org);
+	VectorSubtract (org, ent->old_origin, vec);
 	len = VectorNormalize (vec);
 
 	while (len > 0) {
@@ -538,12 +542,14 @@ R_GrenadeTrail_QF (const entity_t *ent)
 	int			j;
 	particle_t *p;
 	vec3_t		old_origin, vec;
+	vec3_t		org;
 
 	if (!r_particles->int_val)
 		return;
 
 	VectorCopy (ent->old_origin, old_origin);
-	VectorSubtract (ent->origin, old_origin, vec);
+	VectorCopy (Transform_GetWorldPosition (ent->transform), org);
+	VectorSubtract (org, old_origin, vec);
 	len = VectorNormalize (vec);
 
 	while (len > 0) {
@@ -577,12 +583,14 @@ R_BloodTrail_QF (const entity_t *ent)
 	int			j;
 	particle_t *p;
 	vec3_t		old_origin, vec;
+	vec3_t		org;
 
 	if (!r_particles->int_val)
 		return;
 
 	VectorCopy (ent->old_origin, old_origin);
-	VectorSubtract (ent->origin, old_origin, vec);
+	VectorCopy (Transform_GetWorldPosition (ent->transform), org);
+	VectorSubtract (org, old_origin, vec);
 	len = VectorNormalize (vec);
 
 	while (len > 0) {
@@ -615,12 +623,14 @@ R_SlightBloodTrail_QF (const entity_t *ent)
 	int			j;
 	particle_t *p;
 	vec3_t		old_origin, vec;
+	vec3_t		org;
 
 	if (!r_particles->int_val)
 		return;
 
 	VectorCopy (ent->old_origin, old_origin);
-	VectorSubtract (ent->origin, old_origin, vec);
+	VectorCopy (Transform_GetWorldPosition (ent->transform), org);
+	VectorSubtract (org, old_origin, vec);
 	len = VectorNormalize (vec);
 
 	while (len > 0) {
@@ -652,12 +662,14 @@ R_WizTrail_QF (const entity_t *ent)
 	float		len;
 	particle_t *p;
 	vec3_t		old_origin, vec;
+	vec3_t      org;
 
 	if (!r_particles->int_val)
 		return;
 
 	VectorCopy (ent->old_origin, old_origin);
-	VectorSubtract (ent->origin, old_origin, vec);
+	VectorCopy (Transform_GetWorldPosition (ent->transform), org);
+	VectorSubtract (org, old_origin, vec);
 	len = VectorNormalize (vec);
 
 	while (len > 0) {
@@ -699,12 +711,14 @@ R_FlameTrail_QF (const entity_t *ent)
 	float		len;
 	particle_t *p;
 	vec3_t		old_origin, vec;
+	vec3_t		org;
 
 	if (!r_particles->int_val)
 		return;
 
 	VectorCopy (ent->old_origin, old_origin);
-	VectorSubtract (ent->origin, old_origin, vec);
+	VectorCopy (Transform_GetWorldPosition (ent->transform), org);
+	VectorSubtract (org, old_origin, vec);
 	len = VectorNormalize (vec);
 
 	while (len > 0) {
@@ -747,12 +761,14 @@ R_VoorTrail_QF (const entity_t *ent)
 	int			j;
 	particle_t *p;
 	vec3_t		old_origin, vec;
+	vec3_t		org;
 
 	if (!r_particles->int_val)
 		return;
 
 	VectorCopy (ent->old_origin, old_origin);
-	VectorSubtract (ent->origin, old_origin, vec);
+	VectorCopy (Transform_GetWorldPosition (ent->transform), org);
+	VectorSubtract (org, old_origin, vec);
 	len = VectorNormalize (vec);
 
 	while (len > 0) {
diff --git a/libs/video/renderer/sw32/sw32_rsprite.c b/libs/video/renderer/sw32/sw32_rsprite.c
index 9c6cb7221..bbdc1996f 100644
--- a/libs/video/renderer/sw32/sw32_rsprite.c
+++ b/libs/video/renderer/sw32/sw32_rsprite.c
@@ -282,7 +282,7 @@ sw32_R_DrawSprite (void)
 	int         i;
 	msprite_t  *psprite;
 	vec3_t      tvec;
-	float       dot, angle, sr, cr;
+	float       dot, sr, cr;
 
 	psprite = currententity->renderer.model->cache.data;
 
@@ -367,9 +367,10 @@ sw32_R_DrawSprite (void)
 		// generate the sprite's axes, parallel to the viewplane, but rotated
 		// in that plane around the center according to the sprite entity's
 		// roll angle. So vpn stays the same, but vright and vup rotate
-		angle = currententity->angles[ROLL] * (M_PI * 2 / 360);
-		sr = sin (angle);
-		cr = cos (angle);
+		vec4f_t     rot = Transform_GetLocalRotation (currententity->transform);
+		//FIXME assumes the entity is only rolled
+		sr = 2 * rot[0] * rot[3];
+		cr = rot[3] * rot[3] - rot[0] * rot[0];
 
 		for (i = 0; i < 3; i++) {
 			sw32_r_spritedesc.vpn[i] = vpn[i];
diff --git a/libs/video/renderer/sw32/sw32_rsurf.c b/libs/video/renderer/sw32/sw32_rsurf.c
index dfc9c31cc..9eba575a9 100644
--- a/libs/video/renderer/sw32/sw32_rsurf.c
+++ b/libs/video/renderer/sw32/sw32_rsurf.c
@@ -31,6 +31,7 @@
 #define NH_DEFINE
 #include "namehack.h"
 
+#include "QF/entity.h"
 #include "QF/render.h"
 #include "QF/sys.h"
 
@@ -96,6 +97,7 @@ R_AddDynamicLights (void)
 	int         sd, td;
 	float       dist, rad, minlight;
 	vec3_t      impact, local, lightorigin;
+	vec4f_t     entorigin = { 0, 0, 0, 1 };
 	int         s, t;
 	int         i;
 	int         smax, tmax;
@@ -106,12 +108,16 @@ R_AddDynamicLights (void)
 	tmax = (surf->extents[1] >> 4) + 1;
 	tex = surf->texinfo;
 
+	if (currententity->transform) {
+		//FIXME give world entity a transform
+		entorigin = Transform_GetWorldPosition (currententity->transform);
+	}
+
 	for (lnum = 0; lnum < r_maxdlights; lnum++) {
 		if (!(surf->dlightbits[lnum / 32] & (1 << (lnum % 32))))
 			continue;					// not lit by this light
 
-		VectorSubtract (r_dlights[lnum].origin, currententity->origin,
-						lightorigin);
+		VectorSubtract (r_dlights[lnum].origin, entorigin, lightorigin);
 		rad = r_dlights[lnum].radius;
 		dist = DotProduct (lightorigin, surf->plane->normal) -
 			surf->plane->dist;
diff --git a/libs/video/renderer/vulkan/shader/lighting.frag b/libs/video/renderer/vulkan/shader/lighting.frag
index e2db7cc78..7468e4dec 100644
--- a/libs/video/renderer/vulkan/shader/lighting.frag
+++ b/libs/video/renderer/vulkan/shader/lighting.frag
@@ -44,7 +44,7 @@ main (void)
 	vec3        c = subpassLoad (color).rgb;
 	vec3        n = subpassLoad (normal).rgb;
 	vec3        p = subpassLoad (position).rgb;
-	vec3        light = vec3 (0);
+	vec3        light = vec3 (0.8);
 
 	if (MaxLights > 0) {
 		for (int i = 0; i < lightCount; i++) {
diff --git a/libs/video/renderer/vulkan/vulkan_bsp.c b/libs/video/renderer/vulkan/vulkan_bsp.c
index 38aa57ee9..f1ba6e472 100644
--- a/libs/video/renderer/vulkan/vulkan_bsp.c
+++ b/libs/video/renderer/vulkan/vulkan_bsp.c
@@ -610,7 +610,8 @@ R_DrawBrushModel (entity_t *e, vulkan_ctx_t *ctx)
 	plane_t    *plane;
 	msurface_t *surf;
 	qboolean    rotated;
-	vec3_t      mins, maxs, org;
+	vec3_t      mins, maxs;
+	vec4f_t     org;
 	mod_brush_t *brush;
 
 	model = e->renderer.model;
@@ -621,21 +622,21 @@ R_DrawBrushModel (entity_t *e, vulkan_ctx_t *ctx)
 	if (mat[0][0] != 1 || mat[1][1] != 1 || mat[2][2] != 1) {
 		rotated = true;
 		radius = model->radius;
-		if (R_CullSphere (e->origin, radius))
+		if (R_CullSphere (&mat[3][0], radius)) { //FIXME
 			return;
+		}
 	} else {
 		rotated = false;
-		VectorAdd (e->origin, model->mins, mins);
-		VectorAdd (e->origin, model->maxs, maxs);
+		VectorAdd (mat[3], model->mins, mins);
+		VectorAdd (mat[3], model->maxs, maxs);
 		if (R_CullBox (mins, maxs))
 			return;
 	}
 
-	VectorSubtract (r_refdef.vieworg, e->origin, org);
+	org = r_refdef.viewposition - mat[3];
 	if (rotated) {
-		vec3_t      temp;
+		vec4f_t     temp = org;
 
-		VectorCopy (org, temp);
 		org[0] = DotProduct (temp, mat[0]);
 		org[1] = DotProduct (temp, mat[1]);
 		org[2] = DotProduct (temp, mat[2]);
@@ -650,7 +651,7 @@ R_DrawBrushModel (entity_t *e, vulkan_ctx_t *ctx)
 				|| (!r_dlights[k].radius))
 				continue;
 
-			VectorSubtract (r_dlights[k].origin, e->origin, lightorigin);
+			VectorSubtract (r_dlights[k].origin, mat[3], lightorigin);
 			R_RecursiveMarkLights (brush, lightorigin, &r_dlights[k], k,
 							brush->nodes + brush->hulls[0].firstclipnode);
 		}
diff --git a/libs/video/renderer/vulkan/vulkan_lightmap.c b/libs/video/renderer/vulkan/vulkan_lightmap.c
index 97c30c667..3cfbcb7ba 100644
--- a/libs/video/renderer/vulkan/vulkan_lightmap.c
+++ b/libs/video/renderer/vulkan/vulkan_lightmap.c
@@ -41,6 +41,7 @@
 #include <stdio.h>
 
 #include "QF/cvar.h"
+#include "QF/entity.h"
 #include "QF/render.h"
 #include "QF/sys.h"
 #include "QF/Vulkan/qf_bsp.h"
@@ -61,6 +62,7 @@ add_dynamic_lights (msurface_t *surf, float *block)
 	int         sd, td;
 	float       dist, rad, minlight;
 	vec3_t      impact, local, lightorigin;
+	vec4f_t     entorigin = { 0, 0, 0, 1 };
 	int         smax, tmax;
 	int         s, t;
 	mtexinfo_t *tex;
@@ -71,13 +73,18 @@ add_dynamic_lights (msurface_t *surf, float *block)
 	tex = surf->texinfo;
 	plane = surf->plane;
 
+	if (currententity->transform) {
+		//FIXME give world entity a transform
+		entorigin = Transform_GetWorldPosition (currententity->transform);
+	}
+
 	for (lnum = 0; lnum < r_maxdlights; lnum++) {
 		if (!(surf->dlightbits[lnum / 32] & (1 << (lnum % 32))))
 			continue;					// not lit by this light
 
 		dlight_t   *light = &r_dlights[lnum];
 
-		VectorSubtract (light->origin, currententity->origin, lightorigin);
+		VectorSubtract (light->origin, entorigin, lightorigin);
 		rad = light->radius;
 		dist = DotProduct (lightorigin, plane->normal) - plane->dist;
 		rad -= fabs (dist);
diff --git a/libs/video/renderer/vulkan/vulkan_main.c b/libs/video/renderer/vulkan/vulkan_main.c
index e63ff0b03..a7ed49669 100644
--- a/libs/video/renderer/vulkan/vulkan_main.c
+++ b/libs/video/renderer/vulkan/vulkan_main.c
@@ -66,8 +66,11 @@ setup_frame (vulkan_ctx_t *ctx)
 	R_ClearEnts ();
 	r_framecount++;
 
-	VectorCopy (r_refdef.vieworg, r_origin);
-	AngleVectors (r_refdef.viewangles, vpn, vright, vup);
+	VectorCopy (r_refdef.viewposition, r_origin);
+	VectorCopy (qvmulf (r_refdef.viewrotation, (vec4f_t) { 1, 0, 0, 0 }), vpn);
+	VectorCopy (qvmulf (r_refdef.viewrotation, (vec4f_t) { 0, -1, 0, 0 }), vright);
+	VectorCopy (qvmulf (r_refdef.viewrotation, (vec4f_t) { 0, 0, 1, 0 }), vup);
+
 	R_SetFrustum ();
 
 	r_viewleaf = Mod_PointInLeaf (r_origin, r_worldentity.renderer.model);
@@ -76,14 +79,14 @@ setup_frame (vulkan_ctx_t *ctx)
 static void
 setup_view (vulkan_ctx_t *ctx)
 {
-	mat4_t      mat;
-	float      *view = ctx->matrices.view_3d;
-	static mat4_t z_up = {
-		 0, 0, -1, 0,
-		-1, 0,  0, 0,
-		 0, 1,  0, 0,
-		 0, 0,  0, 1,
+	mat4f_t     view;
+	static mat4f_t z_up = {
+		{ 0, 0, -1, 0},
+		{-1, 0,  0, 0},
+		{ 0, 1,  0, 0},
+		{ 0, 0,  0, 1},
 	};
+	vec4f_t     offset = { 0, 0, 0, 1 };
 
 	/*x = r_refdef.vrect.x;
 	y = (vid.height - (r_refdef.vrect.y + r_refdef.vrect.height));
@@ -91,17 +94,12 @@ setup_view (vulkan_ctx_t *ctx)
 	h = r_refdef.vrect.height;
 	qfeglViewport (x, y, w, h);*/
 
-	Mat4Zero (mat);
-	VectorCopy (vpn, mat + 0);
-	VectorNegate (vright, mat + 4);			// we want vleft
-	VectorCopy (vup, mat + 8);
-	mat[15] = 1;
-	Mat4Transpose (mat, mat);//AngleVectors gives the transpose of what we want
-	Mat4Mult (z_up, mat, view);
-
-	Mat4Identity (mat);
-	VectorNegate (r_refdef.vieworg, mat + 12);
-	Mat4Mult (view, mat, view);
+	mat4fquat (view, qconjf (r_refdef.viewrotation));
+	mmulf (view, z_up, view);
+	offset = -r_refdef.viewposition;
+	offset[3] = 1;
+	view[3] = mvmulf (view, offset);
+	memcpy (ctx->matrices.view_3d, view, sizeof (view));
 }
 
 static void
diff --git a/nq/include/client.h b/nq/include/client.h
index 4af07cd24..5d98e437b 100644
--- a/nq/include/client.h
+++ b/nq/include/client.h
@@ -38,6 +38,7 @@
 #include "QF/render.h"
 
 #include "client/entities.h"
+#include "client/view.h"
 
 #include "game.h"
 #include "netmain.h"
@@ -165,11 +166,9 @@ typedef struct {
 	int         frameIndex;
 	vec3_t      frameViewAngles[2];	// During demo playback viewangles is lerped
 								// between these
-	vec3_t      viewangles;
 	vec4f_t     frameVelocity[2];	// Update by server, used for lean+bob
 								// (0 is newest)
-	vec4f_t     velocity;		// Lerped between frameVelocity[0] and [1]
-	vec3_t      punchangle;		// Temporary offset
+	viewstate_t viewstate;
 
 // pitch drifting vars
 	float       idealpitch;
diff --git a/nq/source/cl_chase.c b/nq/source/cl_chase.c
index 5d23817cd..6f0c430c6 100644
--- a/nq/source/cl_chase.c
+++ b/nq/source/cl_chase.c
@@ -41,16 +41,19 @@
 #include "QF/mathlib.h"
 
 #include "QF/plugin/vid_render.h"
+#include "QF/simd/vec4f.h"
 
 #include "world.h"
 
 #include "nq/include/chase.h"
 #include "nq/include/client.h"
 
-vec3_t camera_origin = {0,0,0};
-vec3_t camera_angles = {0,0,0};
-vec3_t player_origin = {0,0,0};
-vec3_t player_angles = {0,0,0};
+
+vec4f_t     camera_origin = {0,0,0,1};
+vec4f_t     player_origin = {0,0,0,1};
+vec4f_t     player_angles = {0,0,0,1};
+
+vec3_t      camera_angles = {0,0,0};
 
 vec3_t      chase_angles;
 vec3_t      chase_dest;
@@ -94,19 +97,17 @@ TraceLine (vec3_t start, vec3_t end, vec3_t impact)
 void
 Chase_Update (void)
 {
-	float		pitch, yaw, fwd;
-	int			i;
-	usercmd_t	cmd;	// movement direction
-	vec3_t		forward, up, right, stop, dir;
+	float       pitch, yaw, fwd;
+	usercmd_t   cmd;	// movement direction
+	vec4f_t	    forward = {}, up = {}, right = {}, stop = {}, dir = {};
 
 	// lazy camera, look toward player entity
 
 	if (chase_active->int_val == 2 || chase_active->int_val == 3) {
 		// control camera angles with key/mouse/joy-look
-
-		camera_angles[PITCH] += cl.viewangles[PITCH] - player_angles[PITCH];
-		camera_angles[YAW] += cl.viewangles[YAW] - player_angles[YAW];
-		camera_angles[ROLL] += cl.viewangles[ROLL] - player_angles[ROLL];
+		vec3_t      d;
+		VectorSubtract (cl.viewstate.angles, player_angles, d);
+		VectorAdd (camera_angles, d, camera_angles);
 
 		if (chase_active->int_val == 2) {
 			if (camera_angles[PITCH] < -60)
@@ -118,48 +119,48 @@ Chase_Update (void)
 		// move camera, it's not enough to just change the angles because
 		// the angles are automatically changed to look toward the player
 
-		if (chase_active->int_val == 3)
-			VectorCopy (r_data->refdef->vieworg, player_origin);
+		if (chase_active->int_val == 3) {
+			player_origin = r_data->refdef->viewposition;
+		}
 
-		AngleVectors (camera_angles, forward, right, up);
-		VectorScale (forward, chase_back->value, forward);
-		VectorSubtract (player_origin, forward, camera_origin);
+		AngleVectors (camera_angles, &forward[0], &right[0], &up[0]);
+		camera_origin = player_origin - chase_back->value * forward;
 
 		if (chase_active->int_val == 2) {
-			VectorCopy (r_data->refdef->vieworg, player_origin);
+			player_origin = r_data->refdef->viewposition;
 
 			// don't let camera get too low
-			if (camera_origin[2] < player_origin[2] + chase_up->value)
+			if (camera_origin[2] < player_origin[2] + chase_up->value) {
 				camera_origin[2] = player_origin[2] + chase_up->value;
+			}
 		}
 
 		// don't let camera get too far from player
 
-		VectorSubtract  (camera_origin, player_origin, dir);
-		VectorCopy      (dir, forward);
-		VectorNormalize (forward);
+		dir = camera_origin - player_origin;
+		forward = normalf (dir);
 
-		if (VectorLength (dir) > chase_back->value) {
-			VectorScale (forward, chase_back->value, dir);
-			VectorAdd (player_origin, dir, camera_origin);
+		if (magnitudef (dir)[0] > chase_back->value) {
+			camera_origin = player_origin + forward * chase_back->value;
 		}
 
 		// check for walls between player and camera
 
-		VectorScale (forward, 8, forward);
-		VectorAdd (camera_origin, forward, camera_origin);
-		TraceLine (player_origin, camera_origin, stop);
-		if (VectorLength (stop) != 0)
-			VectorSubtract (stop, forward, camera_origin);
+		camera_origin += 8 * forward;
+		//FIXME
+		TraceLine (&player_origin[0], &camera_origin[0], &stop[0]);
+		stop[3] = 1;
+		if (magnitude3f (stop)[0] != 0) {
+			camera_origin = stop - forward;
+		}
 
-		VectorSubtract (camera_origin, r_data->refdef->vieworg, dir);
-		VectorCopy (dir, forward);
-		VectorNormalize (forward);
+		dir = camera_origin - r_data->refdef->viewposition;
+		forward = normalf (dir);
 
 		if (chase_active->int_val == 2) {
 			if (dir[1] == 0 && dir[0] == 0) {
 				// look straight up or down
-//				camera_angles[YAW] = r_data->refdef->viewangles[YAW];
+//				camera_angles[YAW] = r_data->refdef->viewstate.angles[YAW];
 				if (dir[2] > 0)
 					camera_angles[PITCH] = 90;
 				else
@@ -182,13 +183,13 @@ Chase_Update (void)
 			}
 		}
 
-		VectorCopy (camera_angles, r_data->refdef->viewangles);// rotate camera
-		VectorCopy (camera_origin, r_data->refdef->vieworg);    // move camera
+		AngleQuat (camera_angles, &r_data->refdef->viewrotation[0]);//FIXME rotate camera
+		r_data->refdef->viewposition = camera_origin;    // move camera
 
 		// get basic movement from keyboard
 
 		memset (&cmd, 0, sizeof (cmd));
-//		VectorCopy (cl.viewangles, cmd.angles);
+//		VectorCopy (cl.viewstate.angles, cmd.angles);
 
 		if (in_strafe.state & 1) {
 			cmd.sidemove += cl_sidespeed->value * CL_KeyState (&in_right);
@@ -208,54 +209,54 @@ Chase_Update (void)
 		}
 
 		// mouse and joystick controllers add to movement
-		VectorSet (0, cl.viewangles[1] - camera_angles[1], 0, dir);
-		AngleVectors (dir, forward, right, up);
-		VectorScale  (forward, viewdelta.position[2] * m_forward->value,
-					  forward);
-		VectorScale  (right, viewdelta.position[0] * m_side->value, right);
-		VectorAdd    (forward, right, dir);
+		VectorSet (0, cl.viewstate.angles[1] - camera_angles[1], 0, dir);
+		AngleVectors (&dir[0], &forward[0], &right[0], &up[0]); //FIXME
+		forward *= viewdelta.position[2] * m_forward->value;
+		right *= viewdelta.position[0] * m_side->value;
+		dir = forward + right;
 		cmd.forwardmove += dir[0];
 		cmd.sidemove    -= dir[1];
 
 		VectorSet (0, camera_angles[1], 0, dir);
-		AngleVectors (dir, forward, right, up);
+		AngleVectors (&dir[0], &forward[0], &right[0], &up[0]); //FIXME
 
 		VectorScale (forward, cmd.forwardmove, forward);
 		VectorScale (right,   cmd.sidemove,    right);
 		VectorAdd   (forward, right, dir);
 
 		if (dir[1] || dir[0]) {
-			cl.viewangles[YAW] = (atan2 (dir[1], dir[0]) * 180 / M_PI);
-			if (cl.viewangles[YAW] <   0) cl.viewangles[YAW] += 360;
-//			if (cl.viewangles[YAW] < 180)
-//				cl.viewangles[YAW] += 180;
-//			else
-//				cl.viewangles[YAW] -= 180;
+			cl.viewstate.angles[YAW] = (atan2 (dir[1], dir[0]) * 180 / M_PI);
+			if (cl.viewstate.angles[YAW] <   0) {
+				cl.viewstate.angles[YAW] += 360;
+			}
 		}
 
-		cl.viewangles[PITCH] = 0;
+		cl.viewstate.angles[PITCH] = 0;
 
 		// remember the new angle to calculate the difference next frame
-		VectorCopy (cl.viewangles, player_angles);
+		VectorCopy (cl.viewstate.angles, player_angles);
 
 		return;
 	}
 
 	// regular camera, faces same direction as player
 
-	AngleVectors (cl.viewangles, forward, right, up);
+	//FIXME
+	AngleVectors (cl.viewstate.angles, &forward[0], &right[0], &up[0]);
 
 	// calc exact destination
-	for (i = 0; i < 3; i++)
-		camera_origin[i] = r_data->refdef->vieworg[i]
-			- forward[i] * chase_back->value - right[i] * chase_right->value;
+	camera_origin = r_data->refdef->viewposition
+		- forward * chase_back->value - right * chase_right->value;
+	// chase_up is world up
 	camera_origin[2] += chase_up->value;
 
 	// check for walls between player and camera
-	TraceLine (r_data->refdef->vieworg, camera_origin, stop);
-	if (VectorLength (stop) != 0)
-		for (i = 0; i < 3; i++)
-			camera_origin[i] = stop[i] + forward[i] * 8;
+	//FIXME
+	TraceLine (&r_data->refdef->viewposition[0], &camera_origin[0], &stop[0]);
+	stop[3] = 1;
+	if (magnitude3f (stop)[0] != 0) {
+		camera_origin = stop + forward * 8;
+	}
 
-	VectorCopy (camera_origin, r_data->refdef->vieworg);
+	r_data->refdef->viewposition = camera_origin;
 }
diff --git a/nq/source/cl_demo.c b/nq/source/cl_demo.c
index 39cdf9d24..03950998a 100644
--- a/nq/source/cl_demo.c
+++ b/nq/source/cl_demo.c
@@ -105,7 +105,7 @@ CL_WriteDemoMessage (sizebuf_t *msg)
 	len = LittleLong (msg->cursize);
 	Qwrite (cls.demofile, &len, 4);
 	for (i = 0; i < 3; i++) {
-		f = LittleFloat (cl.viewangles[i]);
+		f = LittleFloat (cl.viewstate.angles[i]);
 		Qwrite (cls.demofile, &f, 4);
 	}
 	Qwrite (cls.demofile, msg->data, msg->cursize);
diff --git a/nq/source/cl_ents.c b/nq/source/cl_ents.c
index e8aecb26c..2e04ff885 100644
--- a/nq/source/cl_ents.c
+++ b/nq/source/cl_ents.c
@@ -144,10 +144,9 @@ CL_RelinkEntities (void)
 	entity_state_t *new, *old;
 	renderer_t *renderer;
 	animation_t *animation;
-	float       bobjrotate, frac, f, d;
+	float       bobjrotate, frac, f;
 	int         i, j;
 	int         entvalid;
-	vec3_t      delta;
 	int         model_flags;
 
 	r_data->player_entity = &cl_entities[cl.viewentity];
@@ -156,19 +155,21 @@ CL_RelinkEntities (void)
 	frac = CL_LerpPoint ();
 
 	// interpolate player info
-	cl.velocity = cl.frameVelocity[1]
+	cl.viewstate.velocity = cl.frameVelocity[1]
 		+ frac * (cl.frameVelocity[0] - cl.frameVelocity[1]);
 
 	if (cls.demoplayback) {
 		// interpolate the angles
+		vec3_t      d;
+		VectorSubtract (cl.frameViewAngles[0], cl.frameViewAngles[1], d);
 		for (j = 0; j < 3; j++) {
-			d = cl.frameViewAngles[0][j] - cl.frameViewAngles[1][j];
-			if (d > 180)
-				d -= 360;
-			else if (d < -180)
-				d += 360;
-			cl.viewangles[j] = cl.frameViewAngles[1][j] + frac * d;
+			if (d[j] > 180) {
+				d[j] -= 360;
+			} else if (d[j] < -180) {
+				d[j] += 360;
+			}
 		}
+		VectorMultAdd (cl.frameViewAngles[1], frac, d, cl.viewstate.angles);
 	}
 
 	bobjrotate = anglemod (100 * cl.time);
@@ -184,8 +185,8 @@ CL_RelinkEntities (void)
 		// if the object wasn't included in the last packet, remove it
 		entvalid = cl_msgtime[i] == cl.mtime[0];
 		if (entvalid && !new->modelindex) {
-			VectorCopy (new->origin, ent->origin);
-			VectorCopy (new->angles, ent->angles);
+			CL_TransformEntity (ent, new->scale / 16.0, new->angles,
+								new->origin);
 			entvalid = 0;
 		}
 		if (!entvalid) {
@@ -220,7 +221,6 @@ CL_RelinkEntities (void)
 												cl.scores[i - 1].bottomcolor);
 			}
 		}
-		ent->scale = new->scale / 16.0;
 
 		VectorCopy (ent_colormod[new->colormod], renderer->colormod);
 		renderer->colormod[3] = ENTALPHA_DECODE (new->alpha);
@@ -234,32 +234,30 @@ CL_RelinkEntities (void)
 			// The entity was not updated in the last message so move to the
 			// final spot
 			animation->pose1 = animation->pose2 = -1;
-			VectorCopy (new->origin, ent->origin);
-			if (!(model_flags & EF_ROTATE))
-				CL_TransformEntity (ent, new->angles);
+			CL_TransformEntity (ent, new->scale / 16.0, new->angles,
+								new->origin);
 			if (i != cl.viewentity || chase_active->int_val) {
 				if (ent->visibility.efrag) {
 					r_funcs->R_RemoveEfrags (ent);
 				}
 				r_funcs->R_AddEfrags (&cl.worldmodel->brush, ent);
 			}
-			VectorCopy (ent->origin, ent->old_origin);
+			ent->old_origin = new->origin;
 		} else {
+			vec4f_t     delta = new->origin - old->origin;
 			f = frac;
-			VectorCopy (ent->origin, ent->old_origin);
-			VectorSubtract (new->origin, old->origin, delta);
+			ent->old_origin = Transform_GetWorldPosition (ent->transform);
 			// If the delta is large, assume a teleport and don't lerp
 			if (fabs (delta[0]) > 100 || fabs (delta[1] > 100)
 				|| fabs (delta[2]) > 100) {
 				// assume a teleportation, not a motion
-				VectorCopy (new->origin, ent->origin);
-				if (!(model_flags & EF_ROTATE))
-					CL_TransformEntity (ent, new->angles);
+				CL_TransformEntity (ent, new->scale / 16.0, new->angles,
+									new->origin);
 				animation->pose1 = animation->pose2 = -1;
 			} else {
-				vec3_t      angles, d;
 				// interpolate the origin and angles
-				VectorMultAdd (old->origin, f, delta, ent->origin);
+				vec3_t      angles, d;
+				vec4f_t     origin = old->origin + f * delta;
 				if (!(model_flags & EF_ROTATE)) {
 					VectorSubtract (new->angles, old->angles, d);
 					for (j = 0; j < 3; j++) {
@@ -269,12 +267,14 @@ CL_RelinkEntities (void)
 							d[j] += 360;
 					}
 					VectorMultAdd (old->angles, f, d, angles);
-					CL_TransformEntity (ent, angles);
 				}
+				CL_TransformEntity (ent, new->scale / 16.0, angles, origin);
 			}
 			if (i != cl.viewentity || chase_active->int_val) {
 				if (ent->visibility.efrag) {
-					if (!VectorCompare (ent->origin, ent->old_origin)) {
+					vec4f_t     org
+						= Transform_GetWorldPosition (ent->transform);
+					if (!VectorCompare (org, ent->old_origin)) {//FIXME
 						r_funcs->R_RemoveEfrags (ent);
 						r_funcs->R_AddEfrags (&cl.worldmodel->brush, ent);
 					}
@@ -289,17 +289,20 @@ CL_RelinkEntities (void)
 			vec3_t      angles;
 			VectorCopy (new->angles, angles);
 			angles[YAW] = bobjrotate;
-			CL_TransformEntity (ent, angles);
+			CL_TransformEntity (ent, new->scale / 16.0, angles, new->origin);
 		}
 		CL_EntityEffects (i, ent, new, cl.time);
-		vec4f_t org = { VectorExpand (ent->origin), 1}; //FIXME
+		vec4f_t org = Transform_GetWorldPosition (ent->transform);
 		CL_NewDlight (i, org, new->effects, new->glow_size,
 					  new->glow_color, cl.time);
-		if (VectorDistance_fast (old->origin, ent->origin) > (256 * 256))
-			VectorCopy (ent->origin, old->origin);
+		if (VectorDistance_fast (old->origin, org) > (256 * 256)) {
+			old->origin = org;
+		}
 		if (model_flags & ~EF_ROTATE)
 			CL_ModelEffects (ent, i, new->glow_color, cl.time);
 
 		cl_forcelink[i] = false;
 	}
+	cl.viewstate.origin
+		= Transform_GetWorldPosition (cl_entities[cl.viewentity].transform);
 }
diff --git a/nq/source/cl_input.c b/nq/source/cl_input.c
index dd980e814..291f0ecac 100644
--- a/nq/source/cl_input.c
+++ b/nq/source/cl_input.c
@@ -438,35 +438,35 @@ CL_AdjustAngles (void)
 	yawspeed *= host_frametime;
 
 	if (!(in_strafe.state & 1)) {
-		cl.viewangles[YAW] -= yawspeed * CL_KeyState (&in_right);
-		cl.viewangles[YAW] += yawspeed * CL_KeyState (&in_left);
-		cl.viewangles[YAW] = anglemod (cl.viewangles[YAW]);
+		cl.viewstate.angles[YAW] -= yawspeed * CL_KeyState (&in_right);
+		cl.viewstate.angles[YAW] += yawspeed * CL_KeyState (&in_left);
+		cl.viewstate.angles[YAW] = anglemod (cl.viewstate.angles[YAW]);
 	}
 	if (in_klook.state & 1) {
 		V_StopPitchDrift ();
-		cl.viewangles[PITCH] -= pitchspeed * CL_KeyState (&in_forward);
-		cl.viewangles[PITCH] += pitchspeed * CL_KeyState (&in_back);
+		cl.viewstate.angles[PITCH] -= pitchspeed * CL_KeyState (&in_forward);
+		cl.viewstate.angles[PITCH] += pitchspeed * CL_KeyState (&in_back);
 	}
 
 	up = CL_KeyState (&in_lookup);
 	down = CL_KeyState (&in_lookdown);
 
-	cl.viewangles[PITCH] -= pitchspeed * up;
-	cl.viewangles[PITCH] += pitchspeed * down;
+	cl.viewstate.angles[PITCH] -= pitchspeed * up;
+	cl.viewstate.angles[PITCH] += pitchspeed * down;
 
 	if (up || down)
 		V_StopPitchDrift ();
 
 	// FIXME: Need to clean up view angle limits
-	if (cl.viewangles[PITCH] > 80)
-		cl.viewangles[PITCH] = 80;
-	if (cl.viewangles[PITCH] < -70)
-		cl.viewangles[PITCH] = -70;
+	if (cl.viewstate.angles[PITCH] > 80)
+		cl.viewstate.angles[PITCH] = 80;
+	if (cl.viewstate.angles[PITCH] < -70)
+		cl.viewstate.angles[PITCH] = -70;
 
-	if (cl.viewangles[ROLL] > 50)
-		cl.viewangles[ROLL] = 50;
-	if (cl.viewangles[ROLL] < -50)
-		cl.viewangles[ROLL] = -50;
+	if (cl.viewstate.angles[ROLL] > 50)
+		cl.viewstate.angles[ROLL] = 50;
+	if (cl.viewstate.angles[ROLL] < -50)
+		cl.viewstate.angles[ROLL] = -50;
 }
 
 /*
@@ -516,12 +516,13 @@ CL_BaseMove (usercmd_t *cmd)
 	IN_Move ();
 
 	// adjust for chase camera angles
+	/*FIXME:chase figure out just what this does and get it working
 	if (cl.chase
 		&& (chase_active->int_val == 2 || chase_active->int_val == 3)) {
 		vec3_t      forward, right, up, f, r;
 		vec3_t      dir = {0, 0, 0};
 
-		dir[1] = r_data->refdef->viewangles[1] - cl.viewangles[1];
+		dir[1] = r_data->refdef->viewangles[1] - cl.viewstate.angles[1];
 		AngleVectors (dir, forward, right, up);
 		VectorScale (forward, cmd->forwardmove, f);
 		VectorScale (right, cmd->sidemove, r);
@@ -532,16 +533,18 @@ CL_BaseMove (usercmd_t *cmd)
 		viewdelta.position[2] = f[0] + r[0];
 		viewdelta.position[0] = (f[1] + r[1]) * -1;
 	}
+	*/
 
 	cmd->forwardmove += viewdelta.position[2] * m_forward->value;
 	cmd->sidemove += viewdelta.position[0] * m_side->value;
 	cmd->upmove += viewdelta.position[1];
-	cl.viewangles[PITCH] += viewdelta.angles[PITCH] * m_pitch->value;
-	cl.viewangles[YAW] += viewdelta.angles[YAW] * m_yaw->value;
-	cl.viewangles[ROLL] += viewdelta.angles[ROLL];
+	cl.viewstate.angles[PITCH] += viewdelta.angles[PITCH] * m_pitch->value;
+	cl.viewstate.angles[YAW] += viewdelta.angles[YAW] * m_yaw->value;
+	cl.viewstate.angles[ROLL] += viewdelta.angles[ROLL];
 
 	if (freelook && !(in_strafe.state & 1)) {
-		cl.viewangles[PITCH] = bound (-70, cl.viewangles[PITCH], 80);
+		cl.viewstate.angles[PITCH]
+			= bound (-70, cl.viewstate.angles[PITCH], 80);
 	}
 }
 
@@ -564,7 +567,7 @@ CL_SendMove (usercmd_t *cmd)
 
 	MSG_WriteFloat (&buf, cl.mtime[0]);		// so server can get ping times
 
-	write_angles (&buf, cl.viewangles);
+	write_angles (&buf, cl.viewstate.angles);
 
 	MSG_WriteShort (&buf, cmd->forwardmove);
 	MSG_WriteShort (&buf, cmd->sidemove);
diff --git a/nq/source/cl_main.c b/nq/source/cl_main.c
index e2c222713..e52eb5fea 100644
--- a/nq/source/cl_main.c
+++ b/nq/source/cl_main.c
@@ -34,6 +34,7 @@
 #include "QF/console.h"
 #include "QF/cvar.h"
 #include "QF/draw.h"
+#include "QF/entity.h"
 #include "QF/input.h"
 #include "QF/joystick.h"
 #include "QF/keys.h"
@@ -52,7 +53,6 @@
 #include "sbar.h"
 
 #include "client/temp_entities.h"
-#include "client/view.h"
 
 #include "nq/include/chase.h"
 #include "nq/include/cl_skin.h"
@@ -409,10 +409,11 @@ CL_PrintEntities_f (void)
 			Sys_Printf ("EMPTY\n");
 			continue;
 		}
-		Sys_Printf ("%s:%2i  (%5.1f,%5.1f,%5.1f) [%5.1f %5.1f %5.1f]\n",
+		vec4f_t     org = Transform_GetWorldPosition (ent->transform);
+		vec4f_t     rot = Transform_GetWorldRotation (ent->transform);
+		Sys_Printf ("%s:%2i  "VEC4F_FMT" "VEC4F_FMT"\n",
 					ent->renderer.model->path, ent->animation.frame,
-					VectorExpand (ent->origin),
-					VectorExpand (ent->angles));
+					VEC4_EXP (org), VEC4_EXP (rot));
 	}
 }
 
@@ -426,12 +427,13 @@ CL_ReadFromServer (void)
 {
 	int         ret;
 	TEntContext_t tentCtx = {
-		{VectorExpand (cl_entities[cl.viewentity].origin), 1},
+		Transform_GetWorldPosition (cl_entities[cl.viewentity].transform),
 		cl.worldmodel, cl.viewentity
 	};
 
 	cl.oldtime = cl.time;
 	cl.time += host_frametime;
+	cl.viewstate.frametime = host_frametime;
 
 	do {
 		ret = CL_GetMessage ();
@@ -535,7 +537,7 @@ CL_SetState (cactive_t state)
 static void
 Force_CenterView_f (void)
 {
-	cl.viewangles[PITCH] = 0;
+	cl.viewstate.angles[PITCH] = 0;
 }
 
 void
diff --git a/nq/source/cl_parse.c b/nq/source/cl_parse.c
index ccf535e18..e74a65976 100644
--- a/nq/source/cl_parse.c
+++ b/nq/source/cl_parse.c
@@ -41,6 +41,7 @@
 #include "QF/console.h"
 #include "QF/cvar.h"
 #include "QF/dstring.h"
+#include "QF/entity.h"
 #include "QF/idparse.h"
 #include "QF/input.h"
 #include "QF/msg.h"
@@ -661,17 +662,18 @@ CL_ParseClientdata (void)
 		cl.idealpitch = 0;
 
 	cl.frameVelocity[1] = cl.frameVelocity[0];
+	vec3_t      punchangle = { };
 	for (i = 0; i < 3; i++) {
-		if (bits & (SU_PUNCH1 << i))
-			cl.punchangle[i] = ((signed char) MSG_ReadByte (net_message));
-		else
-			cl.punchangle[i] = 0;
+		if (bits & (SU_PUNCH1 << i)) {
+			punchangle[i] = ((signed char) MSG_ReadByte (net_message));
+		}
 		if (bits & (SU_VELOCITY1 << i))
 			cl.frameVelocity[0][i] = ((signed char) MSG_ReadByte (net_message))
 				* 16;
 		else
 			cl.frameVelocity[0][i] = 0;
 	}
+	AngleQuat (punchangle, &cl.viewstate.punchangle[0]);//FIXME
 
 	//FIXME
 	//if (!VectorCompare (v_punchangles[0], cl.punchangle[0])) {
@@ -794,9 +796,9 @@ CL_ParseStatic (int version)
 	ent->renderer.skinnum = baseline.skinnum;
 	VectorCopy (ent_colormod[baseline.colormod], ent->renderer.colormod);
 	ent->renderer.colormod[3] = ENTALPHA_DECODE (baseline.alpha);
-	ent->scale = baseline.scale / 16.0;
-	VectorCopy (baseline.origin, ent->origin);
-	CL_TransformEntity (ent, baseline.angles);
+
+	CL_TransformEntity (ent, baseline.scale / 16.0, baseline.angles,
+						baseline.origin);
 
 	r_funcs->R_AddEfrags (&cl.worldmodel->brush, ent);
 }
@@ -839,7 +841,7 @@ CL_ParseServerMessage (void)
 	signon_t    so;
 
 	TEntContext_t tentCtx = {
-		{VectorExpand (cl_entities[cl.viewentity].origin), 1},
+		Transform_GetWorldPosition (cl_entities[cl.viewentity].transform),
 		cl.worldmodel, cl.viewentity
 	};
 
@@ -948,7 +950,7 @@ CL_ParseServerMessage (void)
 
 			case svc_setangle:
 			{
-				vec_t      *dest = cl.viewangles;
+				vec_t      *dest = cl.viewstate.angles;
 
 				MSG_ReadAngleV (net_message, dest);
 				break;
diff --git a/nq/source/cl_screen.c b/nq/source/cl_screen.c
index 509352a1c..78d231953 100644
--- a/nq/source/cl_screen.c
+++ b/nq/source/cl_screen.c
@@ -86,7 +86,9 @@ SCR_CShift (void)
 	int         contents = CONTENTS_EMPTY;
 
 	if (cls.state == ca_active && cl.worldmodel) {
-		leaf = Mod_PointInLeaf (r_data->refdef->vieworg, cl.worldmodel);
+		//FIXME
+		leaf = Mod_PointInLeaf (&r_data->refdef->viewposition[0],
+								cl.worldmodel);
 		contents = leaf->contents;
 	}
 	V_SetContentsColor (contents);
diff --git a/nq/source/cl_view.c b/nq/source/cl_view.c
index 1ccf06d98..f5ba3de8f 100644
--- a/nq/source/cl_view.c
+++ b/nq/source/cl_view.c
@@ -30,6 +30,7 @@
 
 #include "QF/cmd.h"
 #include "QF/cvar.h"
+#include "QF/entity.h"
 #include "QF/msg.h"
 #include "QF/screen.h"
 
@@ -39,8 +40,6 @@
 
 #include "compat.h"
 
-#include "client/view.h"
-
 #include "nq/include/chase.h"
 #include "nq/include/client.h"
 #include "nq/include/host.h"
@@ -81,6 +80,10 @@ cvar_t     *v_idlescale;
 
 float       v_dmg_time, v_dmg_roll, v_dmg_pitch;
 
+vec4f_t     v_idle_yaw;
+vec4f_t     v_idle_roll;
+vec4f_t     v_idle_pitch;
+
 cshift_t    cshift_empty = { {130, 80, 50}, 0};
 cshift_t    cshift_water = { {130, 80, 50}, 128};
 cshift_t    cshift_slime = { {0, 25, 5}, 150};
@@ -113,7 +116,7 @@ V_CalcRoll (const vec3_t angles, vec4f_t velocity)
 static float
 V_CalcBob (void)
 {
-	vec4f_t     velocity = cl.velocity;
+	vec4f_t     velocity = cl.viewstate.velocity;
 	float       cycle;
 	static double bobtime;
 	static float bob;
@@ -124,7 +127,7 @@ V_CalcBob (void)
 	if (cl.onground == -1)
 		return bob;						// just use old value
 
-	bobtime += host_frametime;
+	bobtime += cl.viewstate.frametime;
 	cycle = bobtime - (int) (bobtime / cl_bobcycle->value) *
 		cl_bobcycle->value;
 	cycle /= cl_bobcycle->value;
@@ -183,9 +186,9 @@ static void
 V_DriftPitch (void)
 {
 	float       delta, move;
-	usercmd_t  *cmd = &cl.cmd;
+	float       forwardmove = cl.viewstate.movecmd[0];
 
-	if (noclip_anglehack || cl.onground == -1 || cls.demoplayback) {
+	if (noclip_anglehack || cl.viewstate.onground == -1 || cls.demoplayback) {
 		cl.driftmove = 0;
 		cl.pitchvel = 0;
 		return;
@@ -193,10 +196,10 @@ V_DriftPitch (void)
 
 	// don't count small mouse motion
 	if (cl.nodrift) {
-		if (fabs (cmd->forwardmove) < cl_forwardspeed->value)
+		if (fabs (forwardmove) < cl_forwardspeed->value)
 			cl.driftmove = 0;
 		else
-			cl.driftmove += host_frametime;
+			cl.driftmove += cl.viewstate.frametime;
 
 		if (cl.driftmove > v_centermove->value) {
 			V_StartPitchDrift ();
@@ -204,28 +207,28 @@ V_DriftPitch (void)
 		return;
 	}
 
-	delta = cl.idealpitch - cl.viewangles[PITCH];
+	delta = cl.idealpitch - cl.viewstate.angles[PITCH];
 
 	if (!delta) {
 		cl.pitchvel = 0;
 		return;
 	}
 
-	move = host_frametime * cl.pitchvel;
-	cl.pitchvel += host_frametime * v_centerspeed->value;
+	move = cl.viewstate.frametime * cl.pitchvel;
+	cl.pitchvel += cl.viewstate.frametime * v_centerspeed->value;
 
 	if (delta > 0) {
 		if (move > delta) {
 			cl.pitchvel = 0;
 			move = delta;
 		}
-		cl.viewangles[PITCH] += move;
+		cl.viewstate.angles[PITCH] += move;
 	} else if (delta < 0) {
 		if (move > -delta) {
 			cl.pitchvel = 0;
 			move = -delta;
 		}
-		cl.viewangles[PITCH] -= move;
+		cl.viewstate.angles[PITCH] -= move;
 	}
 }
 
@@ -234,11 +237,10 @@ V_DriftPitch (void)
 void
 V_ParseDamage (void)
 {
-	entity_t   *ent = &cl_entities[cl.viewentity];
 	float       count, side;
 	int         armor, blood;
-	vec_t      *origin = ent->origin;
-	vec_t      *angles = ent->angles;
+	vec4f_t     origin = cl.viewstate.origin;
+	vec_t      *angles = cl.viewstate.angles;
 	vec3_t      from, forward, right, up;
 
 	armor = MSG_ReadByte (net_message);
@@ -482,74 +484,41 @@ V_PrepBlend (void)
 
 /* VIEW RENDERING */
 
-static float
-angledelta (float a)
-{
-	a = anglemod (a);
-	if (a > 180)
-		a -= 360;
-	return a;
-}
-
 static void
 CalcGunAngle (void)
 {
-	float       yaw, pitch, move;
-	static float oldpitch = 0, oldyaw = 0;
-
-	yaw = r_data->refdef->viewangles[YAW];
-	pitch = -r_data->refdef->viewangles[PITCH];
-
-	yaw = angledelta (yaw - r_data->refdef->viewangles[YAW]) * 0.4;
-	yaw = bound (-10, yaw, 10);
-	pitch = angledelta (-pitch - r_data->refdef->viewangles[PITCH]) * 0.4;
-	pitch = bound (-10, pitch, 10);
-
-	move = host_frametime * 20;
-	if (yaw > oldyaw) {
-		if (oldyaw + move < yaw)
-			yaw = oldyaw + move;
-	} else {
-		if (oldyaw - move > yaw)
-			yaw = oldyaw - move;
-	}
-
-	if (pitch > oldpitch) {
-		if (oldpitch + move < pitch)
-			pitch = oldpitch + move;
-	} else {
-		if (oldpitch - move > pitch)
-			pitch = oldpitch - move;
-	}
-
-	oldyaw = yaw;
-	oldpitch = pitch;
-
-	cl.viewent.angles[YAW] = r_data->refdef->viewangles[YAW] + yaw;
-	cl.viewent.angles[PITCH] = -(r_data->refdef->viewangles[PITCH] + pitch);
+	vec4f_t     rotation = r_data->refdef->viewrotation;
+	//FIXME make child of camera
+	Transform_SetWorldRotation (cl.viewent.transform, rotation);
 }
 
 static void
 V_BoundOffsets (void)
 {
-	entity_t   *ent = &cl_entities[cl.viewentity];
-	vec_t      *origin = ent->origin;
+	vec4f_t     offset = r_data->refdef->viewposition
+						- cl.viewstate.origin;
 
 	// absolutely bound refresh reletive to entity clipping hull
 	// so the view can never be inside a solid wall
 
-	if (r_data->refdef->vieworg[0] < origin[0] - 14)
-		r_data->refdef->vieworg[0] = origin[0] - 14;
-	else if (r_data->refdef->vieworg[0] > origin[0] + 14)
-		r_data->refdef->vieworg[0] = origin[0] + 14;
-	if (r_data->refdef->vieworg[1] < origin[1] - 14)
-		r_data->refdef->vieworg[1] = origin[1] - 14;
-	else if (r_data->refdef->vieworg[1] > origin[1] + 14)
-		r_data->refdef->vieworg[1] = origin[1] + 14;
-	if (r_data->refdef->vieworg[2] < origin[2] - 22)
-		r_data->refdef->vieworg[2] = origin[2] - 22;
-	else if (r_data->refdef->vieworg[2] > origin[2] + 30)
-		r_data->refdef->vieworg[2] = origin[2] + 30;
+	offset[0] = bound (-14, offset[0], 14);
+	offset[1] = bound (-14, offset[1], 14);
+	offset[2] = bound (-22, offset[2], 30);
+	r_data->refdef->viewposition = cl.viewstate.origin + offset;
+}
+
+static vec4f_t
+idle_quat (vec4f_t axis, cvar_t *cycle, cvar_t *level)
+{
+	vec4f_t     identity = { 0, 0, 0, 1 };
+	if (!level || !cycle) {
+		return identity;
+	}
+	float       scale = sin (cl.time * cycle->value);
+	float       ang = scale * level->value * v_idlescale->value;
+	float       c = cos (ang);
+	float       s = sin (ang);
+	return axis * s + identity * c;
 }
 
 /*
@@ -560,19 +529,21 @@ V_BoundOffsets (void)
 static void
 V_AddIdle (void)
 {
-	r_data->refdef->viewangles[ROLL] += v_idlescale->value *
-		sin (cl.time * v_iroll_cycle->value) * v_iroll_level->value;
-	r_data->refdef->viewangles[PITCH] += v_idlescale->value *
-		sin (cl.time * v_ipitch_cycle->value) * v_ipitch_level->value;
-	r_data->refdef->viewangles[YAW] += v_idlescale->value *
-		sin (cl.time * v_iyaw_cycle->value) * v_iyaw_level->value;
+	vec4f_t     roll = idle_quat ((vec4f_t) { 1, 0, 0, 0},
+								  v_iroll_cycle, v_iroll_level);
+	vec4f_t     pitch = idle_quat ((vec4f_t) { 0, 1, 0, 0},
+								   v_ipitch_cycle, v_ipitch_level);
+	vec4f_t     yaw = idle_quat ((vec4f_t) { 0, 0, 1, 0},
+								 v_iyaw_cycle, v_iyaw_level);
+	vec4f_t     rot = normalf (qmulf (yaw, qmulf (pitch, roll)));
 
-	cl.viewent.angles[ROLL] -= v_idlescale->value *
-		sin (cl.time * v_iroll_cycle->value) * v_iroll_level->value;
-	cl.viewent.angles[PITCH] -= v_idlescale->value *
-		sin (cl.time * v_ipitch_cycle->value) * v_ipitch_level->value;
-	cl.viewent.angles[YAW] -= v_idlescale->value *
-		sin (cl.time * v_iyaw_cycle->value) * v_iyaw_level->value;
+	// rotate the view
+	r_data->refdef->viewrotation = qmulf (rot, r_data->refdef->viewrotation);
+
+	// counter-rotate the weapon
+	rot = qmulf (qconjf (rot),
+				 Transform_GetWorldRotation (cl.viewent.transform));
+	Transform_SetWorldRotation (cl.viewent.transform, rot);
 }
 
 /*
@@ -583,40 +554,38 @@ V_AddIdle (void)
 static void
 V_CalcViewRoll (void)
 {
-	float       side;
-	vec_t      *angles = cl_entities[cl.viewentity].angles;
-	vec4f_t     velocity = cl.velocity;
+	vec_t      *angles = cl.viewstate.angles;
+	vec4f_t     velocity = cl.viewstate.velocity;
+	vec3_t      ang = { };
 
-	side = V_CalcRoll (angles, velocity);
-	r_data->refdef->viewangles[ROLL] += side;
+	ang[ROLL] = V_CalcRoll (angles, velocity);
 
 	if (v_dmg_time > 0) {
-		r_data->refdef->viewangles[ROLL] +=
-			v_dmg_time / v_kicktime->value * v_dmg_roll;
-		r_data->refdef->viewangles[PITCH] +=
-			v_dmg_time / v_kicktime->value * v_dmg_pitch;
-		v_dmg_time -= host_frametime;
+		ang[ROLL] += v_dmg_time / v_kicktime->value * v_dmg_roll;
+		ang[PITCH] += v_dmg_time / v_kicktime->value * v_dmg_pitch;
+		v_dmg_time -= cl.viewstate.frametime;
 	}
 
-	if (cl.stats[STAT_HEALTH] <= 0)
-		r_data->refdef->viewangles[ROLL] = 80;	// dead view angle
+	if (cl.viewstate.flags & VF_DEAD) {		// VF_GIB will also set VF_DEAD
+		ang[ROLL] = 80;	// dead view angle
+	}
+
+	vec4f_t     rot;
+	AngleQuat (ang, &rot[0]);//FIXME
+	r_data->refdef->viewrotation = qmulf (r_data->refdef->viewrotation, rot);
 }
 
 static void
 V_CalcIntermissionRefdef (void)
 {
-	// ent is the player model (visible when out of body)
-	entity_t   *ent = &cl_entities[cl.viewentity];
 	entity_t   *view;
 	float       old;
-	vec_t      *origin = ent->origin;
-	vec_t      *angles = ent->angles;
 
 	// view is the weapon model (visible only from inside body)
 	view = &cl.viewent;
 
-	VectorCopy (origin, r_data->refdef->vieworg);
-	VectorCopy (angles, r_data->refdef->viewangles);
+	r_data->refdef->viewposition = cl.viewstate.origin;
+	AngleQuat (cl.viewstate.angles, &r_data->refdef->viewrotation[0]);//FIXME
 	view->renderer.model = NULL;
 
 	// always idle in intermission
@@ -629,109 +598,98 @@ V_CalcIntermissionRefdef (void)
 static void
 V_CalcRefdef (void)
 {
-	// ent is the player model (visible when out of body)
-	entity_t   *ent = &cl_entities[cl.viewentity];
 	// view is the weapon model (visible only from inside body)
 	entity_t   *view = &cl.viewent;
 	float       bob;
 	static float oldz = 0;
-	int         i;
-	vec3_t      forward, right, up;
-	vec_t      *origin = ent->origin;
-	vec_t      *viewangles = cl.viewangles;
+	vec4f_t     forward = {}, right = {}, up = {};
+	vec4f_t     origin = cl.viewstate.origin;
+	vec_t      *viewangles = cl.viewstate.angles;
 
 	V_DriftPitch ();
 
 	bob = V_CalcBob ();
 
 	// refresh position
-	VectorCopy (origin, r_data->refdef->vieworg);
-	r_data->refdef->vieworg[2] += cl.viewheight + bob;
+	r_data->refdef->viewposition = origin;
+	r_data->refdef->viewposition[2] += cl.viewheight + bob;
 
 	// never let it sit exactly on a node line, because a water plane can
 	// disappear when viewed with the eye exactly on it.
 	// server protocol specifies to only 1/8 pixel, so add 1/16 in each axis
-	r_data->refdef->vieworg[0] += 1.0 / 16;
-	r_data->refdef->vieworg[1] += 1.0 / 16;
-	r_data->refdef->vieworg[2] += 1.0 / 16;
+	r_data->refdef->viewposition += (vec4f_t) { 1.0/16, 1.0/16, 1.0/16, 0};
 
-	VectorCopy (viewangles, r_data->refdef->viewangles);
+	AngleQuat (cl.viewstate.angles, &r_data->refdef->viewrotation[0]);//FIXME
 	V_CalcViewRoll ();
 	V_AddIdle ();
 
 	// offsets
-	AngleVectors (viewangles, forward, right, up);
+	//FIXME semi-duplicates AngleQuat (also, vec3_t vs vec4f_t)
+	AngleVectors (viewangles, &forward[0], &right[0], &up[0]);
 
 	// don't allow cheats in multiplayer
 	// FIXME check for dead
 	if (cl.maxclients == 1) {
-		for (i = 0; i < 3; i++) {
-			r_data->refdef->vieworg[i] += scr_ofsx->value * forward[i] +
-				scr_ofsy->value * right[i] +
-				scr_ofsz->value * up[i];
-		}
+		r_data->refdef->viewposition += scr_ofsx->value * forward
+										+ scr_ofsy->value * right
+										+ scr_ofsz->value * up;
 	}
 
 	V_BoundOffsets ();
 
 	// set up gun position
-	VectorCopy (viewangles, view->angles);
-
 	CalcGunAngle ();
 
-	VectorCopy (origin, view->origin);
-	view->origin[2] += cl.viewheight;
-
-	for (i = 0; i < 3; i++) {
-		view->origin[i] += forward[i] * bob * 0.4;
-//		view->origin[i] += right[i] * bob * 0.4;
-//		view->origin[i] += up[i] * bob * 0.8;
-	}
-	view->origin[2] += bob;
+	origin += (vec4f_t) { 0, 0, cl.viewheight, 0 };
+	origin += forward * bob * 0.4f + (vec4f_t) { 0, 0, bob, 0 };
 
 	// fudge position around to keep amount of weapon visible
 	// roughly equal with different FOV
-	if (hud_sbar->int_val == 0 && r_data->scr_viewsize->int_val >= 100)
+	if (hud_sbar->int_val == 0 && r_data->scr_viewsize->int_val >= 100) {
 		;
-	else if (r_data->scr_viewsize->int_val == 110)
-		view->origin[2] += 1;
-	else if (r_data->scr_viewsize->int_val == 100)
-		view->origin[2] += 2;
-	else if (r_data->scr_viewsize->int_val == 90)
-		view->origin[2] += 1;
-	else if (r_data->scr_viewsize->int_val == 80)
-		view->origin[2] += 0.5;
+	} else if (r_data->scr_viewsize->int_val == 110) {
+		origin += (vec4f_t) { 0, 0, 1, 0};
+	} else if (r_data->scr_viewsize->int_val == 100) {
+		origin += (vec4f_t) { 0, 0, 2, 0};
+	} else if (r_data->scr_viewsize->int_val == 90) {
+		origin += (vec4f_t) { 0, 0, 1, 0};
+	} else if (r_data->scr_viewsize->int_val == 80) {
+		origin += (vec4f_t) { 0, 0, 0.5, 0};
+	}
 
 	view->renderer.model = cl.model_precache[cl.stats[STAT_WEAPON]];
 	view->animation.frame = cl.stats[STAT_WEAPONFRAME];
 	view->renderer.skin = 0;
 
 	// set up the refresh position
-	VectorAdd (r_data->refdef->viewangles, cl.punchangle,
-			   r_data->refdef->viewangles);
+	r_data->refdef->viewrotation = qmulf (cl.viewstate.punchangle,
+										  r_data->refdef->viewrotation);
 
 	// smooth out stair step ups
 	if ((cl.onground != -1) && (origin[2] - oldz > 0)) {
 		float       steptime;
 
-		steptime = cl.time - cl.oldtime;
-		if (steptime < 0)
-			steptime = 0;
+		steptime = cl.viewstate.frametime;
 
 		oldz += steptime * 80;
 		if (oldz > origin[2])
 			oldz = origin[2];
 		if (origin[2] - oldz > 12)
 			oldz = origin[2] - 12;
-		r_data->refdef->vieworg[2] += oldz - origin[2];
-		view->origin[2] += oldz - origin[2];
-	} else
+		r_data->refdef->viewposition[2] += oldz - origin[2];
+		origin[2] += oldz - origin[2];
+	} else {
 		oldz = origin[2];
+	}
+	{
+		// FIXME sort out the alias model specific negation
+		vec3_t ang = {-viewangles[0], viewangles[1], viewangles[2]};
+		CL_TransformEntity (view, 1, ang, origin);
+	}
 
-	if (cl.chase && chase_active->int_val)
+	if (cl.chase && chase_active->int_val) {
 		Chase_Update ();
-
-	CL_TransformEntity (view, view->angles);
+	}
 }
 
 /*
@@ -743,8 +701,11 @@ V_CalcRefdef (void)
 void
 V_RenderView (void)
 {
-	if (cls.state != ca_active)
+	if (cls.state != ca_active) {
+		r_data->refdef->viewposition = (vec4f_t) { 0, 0, 0, 1 };
+		r_data->refdef->viewrotation = (vec4f_t) { 0, 0, 0, 1 };
 		return;
+	}
 
 	if (cl.intermission) {				// intermission / finale rendering
 		V_CalcIntermissionRefdef ();
diff --git a/qw/include/client.h b/qw/include/client.h
index 5389579c4..8c0369fba 100644
--- a/qw/include/client.h
+++ b/qw/include/client.h
@@ -37,6 +37,7 @@
 #include "QF/plugin/vid_render.h"
 
 #include "client/entities.h"
+#include "client/view.h"
 
 #include "netchan.h"
 #include "qw/bothdefs.h"
@@ -222,12 +223,7 @@ typedef struct {
 // the client simulates or interpolates movement to get these values
 	double      time;			// this is the time value that the client
 								// is rendering at.  always <= realtime
-	vec4f_t     simorg;
-	vec4f_t     simvel;
-	vec3_t      simangles;
-
-	vec3_t      punchangle;		// temporary view kick from weapon firing
-
+	viewstate_t viewstate;
 // pitch drifting vars
 	float       idealpitch;
 	float       pitchvel;
@@ -342,7 +338,9 @@ extern	struct cvar_s	*cl_fb_players;
 
 extern	client_state_t	cl;
 
-extern	entityset_t		cl_static_entities;
+typedef struct entitystateset_s DARRAY_TYPE (struct entity_state_s)
+		entitystateset_t;
+extern	entitystateset_t cl_static_entities;
 extern	entity_t		cl_entities[512];
 extern	byte			cl_entity_valid[2][512];
 
diff --git a/qw/source/cl_chase.c b/qw/source/cl_chase.c
index 8a3d6419d..68c9e207a 100644
--- a/qw/source/cl_chase.c
+++ b/qw/source/cl_chase.c
@@ -41,16 +41,19 @@
 #include "QF/mathlib.h"
 
 #include "QF/plugin/vid_render.h"
+#include "QF/simd/vec4f.h"
 
 #include "qw/include/chase.h"
 #include "qw/include/cl_input.h"
 #include "qw/include/client.h"
 #include "world.h"
 
-vec3_t camera_origin = {0,0,0};
-vec3_t camera_angles = {0,0,0};
-vec3_t player_origin = {0,0,0};
-vec3_t player_angles = {0,0,0};
+
+vec4f_t     camera_origin = {0,0,0,1};
+vec4f_t     player_origin = {0,0,0,1};
+vec4f_t     player_angles = {0,0,0,1};
+
+vec3_t      camera_angles = {0,0,0};
 
 vec3_t      chase_angles;
 vec3_t      chase_dest;
@@ -94,19 +97,17 @@ TraceLine (vec3_t start, vec3_t end, vec3_t impact)
 void
 Chase_Update (void)
 {
-	float		pitch, yaw, fwd;
-	int			i;
-	usercmd_t	cmd;	// movement direction
-	vec3_t		forward, up, right, stop, dir;
+	float       pitch, yaw, fwd;
+	usercmd_t   cmd;	// movement direction
+	vec4f_t	    forward = {}, up = {}, right = {}, stop = {}, dir = {};
 
 	// lazy camera, look toward player entity
 
 	if (chase_active->int_val == 2 || chase_active->int_val == 3) {
 		// control camera angles with key/mouse/joy-look
-
-		camera_angles[PITCH] += cl.viewangles[PITCH] - player_angles[PITCH];
-		camera_angles[YAW] += cl.viewangles[YAW] - player_angles[YAW];
-		camera_angles[ROLL] += cl.viewangles[ROLL] - player_angles[ROLL];
+		vec3_t      d;
+		VectorSubtract (cl.viewstate.angles, player_angles, d);
+		VectorAdd (camera_angles, d, camera_angles);
 
 		if (chase_active->int_val == 2) {
 			if (camera_angles[PITCH] < -60)
@@ -118,48 +119,48 @@ Chase_Update (void)
 		// move camera, it's not enough to just change the angles because
 		// the angles are automatically changed to look toward the player
 
-		if (chase_active->int_val == 3)
-			VectorCopy (r_data->refdef->vieworg, player_origin);
+		if (chase_active->int_val == 3) {
+			player_origin = r_data->refdef->viewposition;
+		}
 
-		AngleVectors (camera_angles, forward, right, up);
-		VectorScale (forward, chase_back->value, forward);
-		VectorSubtract (player_origin, forward, camera_origin);
+		AngleVectors (camera_angles, &forward[0], &right[0], &up[0]);
+		camera_origin = player_origin - chase_back->value * forward;
 
 		if (chase_active->int_val == 2) {
-			VectorCopy (r_data->refdef->vieworg, player_origin);
+			player_origin = r_data->refdef->viewposition;
 
 			// don't let camera get too low
-			if (camera_origin[2] < player_origin[2] + chase_up->value)
+			if (camera_origin[2] < player_origin[2] + chase_up->value) {
 				camera_origin[2] = player_origin[2] + chase_up->value;
+			}
 		}
 
 		// don't let camera get too far from player
 
-		VectorSubtract  (camera_origin, player_origin, dir);
-		VectorCopy      (dir, forward);
-		VectorNormalize (forward);
+		dir = camera_origin - player_origin;
+		forward = normalf (dir);
 
-		if (VectorLength (dir) > chase_back->value) {
-			VectorScale (forward, chase_back->value, dir);
-			VectorAdd (player_origin, dir, camera_origin);
+		if (magnitudef (dir)[0] > chase_back->value) {
+			camera_origin = player_origin + forward * chase_back->value;
 		}
 
 		// check for walls between player and camera
 
-		VectorScale (forward, 8, forward);
-		VectorAdd (camera_origin, forward, camera_origin);
-		TraceLine (player_origin, camera_origin, stop);
-		if (VectorLength (stop) != 0)
-			VectorSubtract (stop, forward, camera_origin);
+		camera_origin += 8 * forward;
+		//FIXME
+		TraceLine (&player_origin[0], &camera_origin[0], &stop[0]);
+		stop[3] = 1;
+		if (magnitude3f (stop)[0] != 0) {
+			camera_origin = stop - forward;
+		}
 
-		VectorSubtract (camera_origin, r_data->refdef->vieworg, dir);
-		VectorCopy (dir, forward);
-		VectorNormalize (forward);
+		dir = camera_origin - r_data->refdef->viewposition;
+		forward = normalf (dir);
 
 		if (chase_active->int_val == 2) {
 			if (dir[1] == 0 && dir[0] == 0) {
 				// look straight up or down
-//				camera_angles[YAW] = r_data->refdef->viewangles[YAW];
+//				camera_angles[YAW] = r_data->refdef->viewstate.angles[YAW];
 				if (dir[2] > 0)
 					camera_angles[PITCH] = 90;
 				else
@@ -182,13 +183,13 @@ Chase_Update (void)
 			}
 		}
 
-		VectorCopy (camera_angles, r_data->refdef->viewangles);// rotate camera
-		VectorCopy (camera_origin, r_data->refdef->vieworg);    // move camera
+		AngleQuat (camera_angles, &r_data->refdef->viewrotation[0]);//FIXME rotate camera
+		r_data->refdef->viewposition = camera_origin;    // move camera
 
 		// get basic movement from keyboard
 
 		memset (&cmd, 0, sizeof (cmd));
-//		VectorCopy (cl.viewangles, cmd.angles);
+//		VectorCopy (cl.viewstate.angles, cmd.angles);
 
 		if (in_strafe.state & 1) {
 			cmd.sidemove += cl_sidespeed->value * CL_KeyState (&in_right);
@@ -208,54 +209,54 @@ Chase_Update (void)
 		}
 
 		// mouse and joystick controllers add to movement
-		VectorSet (0, cl.viewangles[1] - camera_angles[1], 0, dir);
-		AngleVectors (dir, forward, right, up);
-		VectorScale  (forward, viewdelta.position[2] * m_forward->value,
-					  forward);
-		VectorScale  (right, viewdelta.position[0] * m_side->value, right);
-		VectorAdd    (forward, right, dir);
+		VectorSet (0, cl.viewstate.angles[1] - camera_angles[1], 0, dir);
+		AngleVectors (&dir[0], &forward[0], &right[0], &up[0]); //FIXME
+		forward *= viewdelta.position[2] * m_forward->value;
+		right *= viewdelta.position[0] * m_side->value;
+		dir = forward + right;
 		cmd.forwardmove += dir[0];
 		cmd.sidemove    -= dir[1];
 
 		VectorSet (0, camera_angles[1], 0, dir);
-		AngleVectors (dir, forward, right, up);
+		AngleVectors (&dir[0], &forward[0], &right[0], &up[0]); //FIXME
 
 		VectorScale (forward, cmd.forwardmove, forward);
 		VectorScale (right,   cmd.sidemove,    right);
 		VectorAdd   (forward, right, dir);
 
 		if (dir[1] || dir[0]) {
-			cl.viewangles[YAW] = (atan2 (dir[1], dir[0]) * 180 / M_PI);
-			if (cl.viewangles[YAW] <   0) cl.viewangles[YAW] += 360;
-//			if (cl.viewangles[YAW] < 180)
-//				cl.viewangles[YAW] += 180;
-//			else
-//				cl.viewangles[YAW] -= 180;
+			cl.viewstate.angles[YAW] = (atan2 (dir[1], dir[0]) * 180 / M_PI);
+			if (cl.viewstate.angles[YAW] <   0) {
+				cl.viewstate.angles[YAW] += 360;
+			}
 		}
 
-		cl.viewangles[PITCH] = 0;
+		cl.viewstate.angles[PITCH] = 0;
 
 		// remember the new angle to calculate the difference next frame
-		VectorCopy (cl.viewangles, player_angles);
+		VectorCopy (cl.viewstate.angles, player_angles);
 
 		return;
 	}
 
 	// regular camera, faces same direction as player
 
-	AngleVectors (cl.viewangles, forward, right, up);
+	//FIXME
+	AngleVectors (cl.viewstate.angles, &forward[0], &right[0], &up[0]);
 
 	// calc exact destination
-	for (i = 0; i < 3; i++)
-		camera_origin[i] = r_data->refdef->vieworg[i]
-			- forward[i] * chase_back->value - right[i] * chase_right->value;
+	camera_origin = r_data->refdef->viewposition
+		- forward * chase_back->value - right * chase_right->value;
+	// chase_up is world up
 	camera_origin[2] += chase_up->value;
 
 	// check for walls between player and camera
-	TraceLine (r_data->refdef->vieworg, camera_origin, stop);
-	if (VectorLength (stop) != 0)
-		for (i = 0; i < 3; i++)
-			camera_origin[i] = stop[i] + forward[i] * 8;
+	//FIXME
+	TraceLine (&r_data->refdef->viewposition[0], &camera_origin[0], &stop[0]);
+	stop[3] = 1;
+	if (magnitude3f (stop)[0] != 0) {
+		camera_origin = stop + forward * 8;
+	}
 
-	VectorCopy (camera_origin, r_data->refdef->vieworg);
+	r_data->refdef->viewposition = camera_origin;
 }
diff --git a/qw/source/cl_demo.c b/qw/source/cl_demo.c
index 0694b5f25..7503f5c2a 100644
--- a/qw/source/cl_demo.c
+++ b/qw/source/cl_demo.c
@@ -652,9 +652,8 @@ demo_start_recording (int track)
 {
 	byte        buf_data[MAX_MSGLEN + 10];	// + 10 for header
 	char       *s;
-	int         n, i, j;
+	int         n, i;
 	int         seq = 1;
-	entity_t   *ent;
 	entity_state_t *es, blankes;
 	player_info_t *player;
 	sizebuf_t   buf;
@@ -757,23 +756,16 @@ demo_start_recording (int track)
 	// spawnstatic
 	for (size_t staticIndex = 0; staticIndex < cl_static_entities.size;
 		 staticIndex++) {
-		ent = cl_static_entities.a[staticIndex];
+		entity_state_t *es = &cl_static_entities.a[staticIndex];
+
 		MSG_WriteByte (&buf, svc_spawnstatic);
 
-		for (j = 1; j < cl.nummodels; j++) {
-			if (ent->renderer.model == cl.model_precache[j]) {
-				break;
-			}
-		}
-		if (j == cl.nummodels)
-			MSG_WriteByte (&buf, 0);
-		else
-			MSG_WriteByte (&buf, j);
+		MSG_WriteByte (&buf, es->modelindex);
 
-		MSG_WriteByte (&buf, ent->animation.frame);
+		MSG_WriteByte (&buf, es->frame);
 		MSG_WriteByte (&buf, 0);
-		MSG_WriteByte (&buf, ent->renderer.skinnum);
-		MSG_WriteCoordAngleV (&buf, ent->origin, ent->angles);
+		MSG_WriteByte (&buf, es->skinnum);
+		MSG_WriteCoordAngleV (&buf, &es->origin[0], &es->angles[0]);
 
 		if (buf.cursize > MAX_MSGLEN / 2) {
 			CL_WriteRecordDemoMessage (&buf, seq++);
diff --git a/qw/source/cl_entparse.c b/qw/source/cl_entparse.c
index 60c8cf2c4..7100d2726 100644
--- a/qw/source/cl_entparse.c
+++ b/qw/source/cl_entparse.c
@@ -130,6 +130,8 @@ CL_ParseDelta (entity_state_t *from, entity_state_t *to, int bits)
 	if (bits & U_ANGLE3)
 		to->angles[2] = MSG_ReadAngle (net_message);
 
+	to->origin[3] = 1;
+
 	if (bits & U_SOLID) {
 		// FIXME
 	}
@@ -428,6 +430,7 @@ CL_ParsePlayerinfo (void)
 
 	state->messagenum = cl.parsecount;
 	MSG_ReadCoordV (net_message, &state->pls.es.origin[0]);//FIXME
+	state->pls.es.origin[3] = 1;
 
 	state->pls.es.frame = MSG_ReadByte (net_message);
 
@@ -486,7 +489,7 @@ CL_ParsePlayerinfo (void)
 		}
 		if (bits & PF_SCALE) {
 			val = MSG_ReadByte (net_message);
-			ent->scale = val / 16.0;
+			state->pls.es.scale = val;
 		}
 		if (bits & PF_EFFECTS2) {
 			state->pls.es.effects |= MSG_ReadByte (net_message) << 8;
diff --git a/qw/source/cl_ents.c b/qw/source/cl_ents.c
index b70b143cc..8ee9440b4 100644
--- a/qw/source/cl_ents.c
+++ b/qw/source/cl_ents.c
@@ -132,7 +132,6 @@ CL_LinkPacketEntities (void)
 	entity_state_t *new, *old;
 	renderer_t *renderer;
 	animation_t *animation;
-	vec3_t      delta;
 
 	frac = 1;
 	for (i = 0; i < 512; i++) {
@@ -195,7 +194,6 @@ CL_LinkPacketEntities (void)
 															  0);
 			}
 		}
-		ent->scale = new->scale / 16.0;
 
 		VectorCopy (ent_colormod[new->colormod], renderer->colormod);
 		renderer->colormod[3] = new->alpha / 255.0;
@@ -209,35 +207,31 @@ CL_LinkPacketEntities (void)
 			}
 		}
 
+		ent->old_origin = Transform_GetWorldPosition (ent->transform);
 		if (forcelink) {
 			animation->pose1 = animation->pose2 = -1;
-			VectorCopy (new->origin, ent->origin);
-			if (!(renderer->model->flags & EF_ROTATE))
-				CL_TransformEntity (ent, new->angles);
+			CL_TransformEntity (ent, new->scale / 16, new->angles,
+								new->origin);
 			if (i != cl.viewentity || chase_active->int_val) {
 				if (ent->visibility.efrag) {
 					r_funcs->R_RemoveEfrags (ent);
 				}
 				r_funcs->R_AddEfrags (&cl.worldmodel->brush, ent);
 			}
-			VectorCopy (ent->origin, ent->old_origin);
 		} else {
+			vec4f_t     delta = new->origin - old->origin;
 			f = frac;
-			VectorCopy (ent->origin, ent->old_origin);
-			VectorSubtract (new->origin, old->origin, delta);
 			// If the delta is large, assume a teleport and don't lerp
 			if (fabs (delta[0]) > 100 || fabs (delta[1] > 100)
 				|| fabs (delta[2]) > 100) {
 				// assume a teleportation, not a motion
-				VectorCopy (new->origin, ent->origin);
-				if (!(renderer->model->flags & EF_ROTATE)) {
-					CL_TransformEntity (ent, new->angles);
-				}
+				CL_TransformEntity (ent, new->scale / 16, new->angles,
+									new->origin);
 				animation->pose1 = animation->pose2 = -1;
 			} else {
 				vec3_t      angles, d;
+				vec4f_t     origin = old->origin + f * delta;
 				// interpolate the origin and angles
-				VectorMultAdd (old->origin, f, delta, ent->origin);
 				if (!(renderer->model->flags & EF_ROTATE)) {
 					VectorSubtract (new->angles, old->angles, d);
 					for (j = 0; j < 3; j++) {
@@ -247,12 +241,14 @@ CL_LinkPacketEntities (void)
 							d[j] += 360;
 					}
 					VectorMultAdd (old->angles, f, d, angles);
-					CL_TransformEntity (ent, angles);
 				}
+				CL_TransformEntity (ent, new->scale / 16.0, angles, origin);
 			}
 			if (i != cl.viewentity || chase_active->int_val) {
 				if (ent->visibility.efrag) {
-					if (!VectorCompare (ent->origin, ent->old_origin)) {
+					vec4f_t     org
+						= Transform_GetWorldPosition (ent->transform);
+					if (!VectorCompare (org, ent->old_origin)) {//FIXME
 						r_funcs->R_RemoveEfrags (ent);
 						r_funcs->R_AddEfrags (&cl.worldmodel->brush, ent);
 					}
@@ -271,12 +267,13 @@ CL_LinkPacketEntities (void)
 			angles[PITCH] = 0;
 			angles[YAW] = anglemod (100 * cl.time);
 			angles[ROLL] = 0;
-			CL_TransformEntity (ent, angles);
+			CL_TransformEntity (ent, new->scale / 16.0, angles, new->origin);
 		}
 		//CL_EntityEffects (i, ent, new);
 		//CL_NewDlight (i, ent->origin, new->effects, 0, 0, cl.time);
-		if (VectorDistance_fast (old->origin, ent->origin) > (256 * 256))
-			VectorCopy (ent->origin, old->origin);
+		vec4f_t org = Transform_GetWorldPosition (ent->transform);
+		if (VectorDistance_fast (old->origin, org) > (256 * 256))
+			old->origin = org;
 		if (renderer->model->flags & ~EF_ROTATE) {
 			CL_ModelEffects (ent, -new->number, new->glow_color, cl.time);
 		}
@@ -378,7 +375,7 @@ CL_LinkPlayers (void)
 
 		// spawn light flashes, even ones coming from invisible objects
 		if (j == cl.playernum) {
-			org = cl.simorg;
+			org = cl.viewstate.origin;
 			r_data->player_entity = &cl_player_ents[j];
 			clientplayer = true;
 		} else {
@@ -413,15 +410,16 @@ CL_LinkPlayers (void)
 		// predict only half the move to minimize overruns
 		msec = 500 * (playertime - state->state_time);
 		if (msec <= 0 || (!cl_predict_players->int_val) || cls.demoplayback2) {
-			VectorCopy (state->pls.es.origin, ent->origin);
+			Sys_Printf("a\n");
+			exact.pls.es.origin = state->pls.es.origin;
 		} else {									// predict players movement
 			state->pls.cmd.msec = msec = min (msec, 255);
 
 			oldphysent = pmove.numphysent;
 			CL_SetSolidPlayers (j);
+			exact.pls.es.origin[3] = 1;//FIXME should be done by prediction
 			CL_PredictUsercmd (state, &exact, &state->pls.cmd, clientplayer);
 			pmove.numphysent = oldphysent;
-			VectorCopy (exact.pls.es.origin, ent->origin);
 		}
 
 		// angles
@@ -439,7 +437,8 @@ CL_LinkPlayers (void)
 		ent->animation.frame = state->pls.es.frame;
 		ent->renderer.skinnum = state->pls.es.skinnum;
 
-		CL_TransformEntity (ent, ang);
+		//FIXME scale
+		CL_TransformEntity (ent, 1, ang, exact.pls.es.origin);
 
 		ent->renderer.min_light = 0;
 		ent->renderer.fullbright = 0;
@@ -484,14 +483,14 @@ CL_EmitEntities (void)
 		return;
 
 	TEntContext_t tentCtx = {
-		{VectorExpand (cl.simorg), 1}, cl.worldmodel, cl.viewentity
+		cl.viewstate.origin, cl.worldmodel, cl.viewentity
 	};
 
 	CL_LinkPlayers ();
 	CL_LinkPacketEntities ();
 	CL_UpdateTEnts (cl.time, &tentCtx);
 	if (cl_draw_locs->int_val) {
-		locs_draw (cl.simorg);
+		locs_draw (cl.viewstate.origin);
 	}
 }
 
diff --git a/qw/source/cl_input.c b/qw/source/cl_input.c
index 5a2fe2b6e..9b9763d46 100644
--- a/qw/source/cl_input.c
+++ b/qw/source/cl_input.c
@@ -530,6 +530,7 @@ CL_BaseMove (usercmd_t *cmd)
 	IN_Move ();
 
 	// adjust for chase camera angles
+	/*FIXME:chase figure out just what this does and get it working
 	if (cl.chase
 		&& (chase_active->int_val == 2 || chase_active->int_val == 3)) {
 		vec3_t      forward, right, up, f, r;
@@ -546,6 +547,7 @@ CL_BaseMove (usercmd_t *cmd)
 		viewdelta.position[2] = f[0] + r[0];
 		viewdelta.position[0] = (f[1] + r[1]) * -1;
 	}
+	*/
 
 	cmd->forwardmove += viewdelta.position[2] * m_forward->value;
 	cmd->sidemove += viewdelta.position[0] * m_side->value;
diff --git a/qw/source/cl_main.c b/qw/source/cl_main.c
index be73db0e7..cef24d6bd 100644
--- a/qw/source/cl_main.c
+++ b/qw/source/cl_main.c
@@ -1605,6 +1605,8 @@ Host_Frame (float time)
 	oldrealtime = realtime;
 	host_frametime = min (host_frametime, 0.2);
 
+	cl.viewstate.frametime = host_frametime;
+
 	con_frametime = con_realtime - oldcon_realtime;
 	oldcon_realtime = con_realtime;
 
diff --git a/qw/source/cl_parse.c b/qw/source/cl_parse.c
index b75355fa1..b53c2beb9 100644
--- a/qw/source/cl_parse.c
+++ b/qw/source/cl_parse.c
@@ -170,7 +170,7 @@ int         packet_latency[NET_TIMINGS];
 
 extern cvar_t *hud_scoreboard_uid;
 
-entityset_t cl_static_entities = DARRAY_STATIC_INIT (32);
+entitystateset_t cl_static_entities = DARRAY_STATIC_INIT (32);
 
 static void
 CL_LoadSky (void)
@@ -973,15 +973,14 @@ CL_ParseStatic (void)
 	ent = r_funcs->R_AllocEntity ();
 	CL_Init_Entity (ent);
 
-	DARRAY_APPEND (&cl_static_entities, ent);
+	DARRAY_APPEND (&cl_static_entities, es);
 
 	// copy it to the current state
 	ent->renderer.model = cl.model_precache[es.modelindex];
 	ent->animation.frame = es.frame;
 	ent->renderer.skinnum = es.skinnum;
 
-	VectorCopy (es.origin, ent->origin);
-	CL_TransformEntity (ent, es.angles);
+	CL_TransformEntity (ent, es.scale / 16.0, es.angles, es.origin);
 
 	r_funcs->R_AddEfrags (&cl.worldmodel->brush, ent);
 }
@@ -1296,7 +1295,7 @@ CL_ParseServerMessage (void)
 	const char *str;
 	static dstring_t *stuffbuf;
 	TEntContext_t tentCtx = {
-		{VectorExpand (cl.simorg), 1}, cl.worldmodel, cl.viewentity
+		cl.viewstate.origin, cl.worldmodel, cl.viewentity
 	};
 
 	received_framecount = host_framecount;
@@ -1542,17 +1541,17 @@ CL_ParseServerMessage (void)
 				cl.completed_time = realtime;
 				r_data->vid->recalc_refdef = true;		// go to full screen
 				Sys_MaskPrintf (SYS_DEV, "intermission simorg: ");
-				MSG_ReadCoordV (net_message, &cl.simorg[0]);//FIXME
-				cl.simorg[3] = 1;
-				for (i = 0; i < 3; i++)
-					Sys_MaskPrintf (SYS_DEV, "%f ", cl.simorg[i]);
+				MSG_ReadCoordV (net_message, &cl.viewstate.origin[0]);//FIXME
+				cl.viewstate.origin[3] = 1;
+				Sys_MaskPrintf (SYS_DEV, VEC4F_FMT,
+								VEC4_EXP (cl.viewstate.origin));
 				Sys_MaskPrintf (SYS_DEV, "\nintermission simangles: ");
-				MSG_ReadAngleV (net_message, cl.simangles);
-				cl.simangles[ROLL] = 0;						// FIXME @@@
-				for (i = 0; i < 3; i++)
-					Sys_MaskPrintf (SYS_DEV, "%f ", cl.simangles[i]);
+				MSG_ReadAngleV (net_message, cl.viewstate.angles);
+				cl.viewstate.angles[ROLL] = 0;			// FIXME @@@
+				Sys_MaskPrintf (SYS_DEV, "%f %f %f",
+								VectorExpand (cl.viewstate.angles));
 				Sys_MaskPrintf (SYS_DEV, "\n");
-				VectorZero (cl.simvel);
+				cl.viewstate.velocity = (vec4f_t) { };
 
 				// automatic fraglogging (by elmex)
 				// XXX: Should this _really_ called here?
@@ -1585,11 +1584,17 @@ CL_ParseServerMessage (void)
 			//   svc_cutscene (same value as svc_smallkick)
 
 			case svc_smallkick:
-				cl.punchangle[PITCH] = -2;
+				cl.viewstate.punchangle = (vec4f_t) {
+					// -2 degrees pitch
+					0, -0.0174524064, 0, 0.999847695
+				};
 				break;
 
 			case svc_bigkick:
-				cl.punchangle[PITCH] = -4;
+				cl.viewstate.punchangle = (vec4f_t) {
+					// -4 degrees pitch
+					0, -0.0348994967, 0, 0.999390827
+				};
 				break;
 
 			case svc_updateping:
diff --git a/qw/source/cl_pred.c b/qw/source/cl_pred.c
index f48533673..5bf79a163 100644
--- a/qw/source/cl_pred.c
+++ b/qw/source/cl_pred.c
@@ -47,7 +47,7 @@ cvar_t     *cl_pushlatency;
 
 
 void
-CL_PredictUsercmd (player_state_t * from, player_state_t * to, usercmd_t *u,
+CL_PredictUsercmd (player_state_t *from, player_state_t *to, usercmd_t *u,
 				   qboolean clientplayer)
 {
 	if (!clientplayer) {
@@ -105,6 +105,8 @@ CL_PredictMove (void)
 	float       f;
 	int         oldphysent, i;
 	frame_t    *from, *to = NULL;
+	entity_state_t *fromes;
+	entity_state_t *toes;
 
 	if (cl_pushlatency->value > 0)
 		Cvar_Set (cl_pushlatency, "0");
@@ -130,15 +132,16 @@ CL_PredictMove (void)
 		UPDATE_BACKUP - 1)
 		return;
 
-	VectorCopy (cl.viewangles, cl.simangles);
-	cl.simangles[ROLL] = 0;						// FIXME @@@
+	VectorCopy (cl.viewangles, cl.viewstate.angles);
+	cl.viewstate.angles[ROLL] = 0;						// FIXME @@@
 
 	// this is the last frame received from the server
 	from = &cl.frames[cls.netchan.incoming_sequence & UPDATE_MASK];
+	fromes = &from->playerstate[cl.playernum].pls.es;
 
 	if (!cl_predict->int_val) {
-		VectorCopy (from->playerstate[cl.playernum].pls.es.velocity, cl.simvel);
-		VectorCopy (from->playerstate[cl.playernum].pls.es.origin, cl.simorg);
+		cl.viewstate.velocity = fromes->velocity;
+		cl.viewstate.origin = fromes->origin;
 		return;
 	}
 
@@ -165,6 +168,7 @@ CL_PredictMove (void)
 	if (i == UPDATE_BACKUP - 1 || !to)
 		return;							// net hasn't deliver packets in a
 										// long time...
+	toes = &to->playerstate[cl.playernum].pls.es;
 
 	// now interpolate some fraction of the final frame
 	if (to->senttime == from->senttime)
@@ -175,18 +179,14 @@ CL_PredictMove (void)
 	}
 
 	for (i = 0; i < 3; i++)
-		if (fabs (from->playerstate[cl.playernum].pls.es.origin[i] -
-				  to->playerstate[cl.playernum].pls.es.origin[i]) > 128) {
+		if (fabs (fromes->origin[i] - toes->origin[i]) > 128) {
 			// teleported, so don't lerp
-			VectorCopy (to->playerstate[cl.playernum].pls.es.velocity,
-						cl.simvel);
-			VectorCopy (to->playerstate[cl.playernum].pls.es.origin, cl.simorg);
+			cl.viewstate.velocity = toes->velocity;
+			cl.viewstate.origin = toes->origin;
 			return;
 		}
 
-	cl.simorg = from->playerstate[cl.playernum].pls.es.origin
-				+ f * (to->playerstate[cl.playernum].pls.es.origin -
-					   from->playerstate[cl.playernum].pls.es.origin);
+	cl.viewstate.origin = fromes->origin + f * (toes->origin - fromes->origin);
 }
 
 void
diff --git a/qw/source/cl_screen.c b/qw/source/cl_screen.c
index 22c8b5b96..12cfb8441 100644
--- a/qw/source/cl_screen.c
+++ b/qw/source/cl_screen.c
@@ -87,7 +87,9 @@ SCR_CShift (void)
 	int         contents = CONTENTS_EMPTY;
 
 	if (cls.state == ca_active && cl.worldmodel) {
-		leaf = Mod_PointInLeaf (r_data->refdef->vieworg, cl.worldmodel);
+		//FIXME
+		leaf = Mod_PointInLeaf (&r_data->refdef->viewposition[0],
+								cl.worldmodel);
 		contents = leaf->contents;
 	}
 	V_SetContentsColor (contents);
diff --git a/qw/source/cl_view.c b/qw/source/cl_view.c
index f20d5747a..0e9162ca8 100644
--- a/qw/source/cl_view.c
+++ b/qw/source/cl_view.c
@@ -37,8 +37,6 @@
 
 #include "compat.h"
 
-#include "client/view.h"
-
 #include "qw/bothdefs.h"
 
 #include "qw/include/chase.h"
@@ -84,8 +82,9 @@ cvar_t     *v_idlescale;
 
 float       v_dmg_time, v_dmg_roll, v_dmg_pitch;
 
-frame_t    *view_frame;
-player_state_t *view_state;
+vec4f_t     v_idle_yaw;
+vec4f_t     v_idle_roll;
+vec4f_t     v_idle_pitch;
 
 cshift_t    cshift_empty = { {130, 80, 50}, 0};
 cshift_t    cshift_water = { {130, 80, 50}, 128};
@@ -119,7 +118,7 @@ V_CalcRoll (const vec3_t angles, vec4f_t velocity)
 static float
 V_CalcBob (void)
 {
-	vec4f_t     velocity = cl.simvel;
+	vec4f_t     velocity = cl.viewstate.velocity;
 	float       cycle;
 	static double bobtime;
 	static float bob;
@@ -130,7 +129,7 @@ V_CalcBob (void)
 	if (cl.onground == -1)
 		return bob;						// just use old value
 
-	bobtime += host_frametime;
+	bobtime += cl.viewstate.frametime;
 	cycle = bobtime - (int) (bobtime / cl_bobcycle->value) *
 		cl_bobcycle->value;
 	cycle /= cl_bobcycle->value;
@@ -189,10 +188,9 @@ static void
 V_DriftPitch (void)
 {
 	float       delta, move;
-	int         frameno = (cls.netchan.outgoing_sequence - 1) & UPDATE_MASK;
-	usercmd_t  *cmd = &cl.frames[frameno].cmd;
+	float       forwardmove = cl.viewstate.movecmd[0];
 
-	if (view_state->onground == -1 || cls.demoplayback) {
+	if (noclip_anglehack || cl.viewstate.onground == -1 || cls.demoplayback) {
 		cl.driftmove = 0;
 		cl.pitchvel = 0;
 		return;
@@ -200,10 +198,10 @@ V_DriftPitch (void)
 
 	// don't count small mouse motion
 	if (cl.nodrift) {
-		if (fabs (cmd->forwardmove) < cl_forwardspeed->value)
+		if (fabs (forwardmove) < cl_forwardspeed->value)
 			cl.driftmove = 0;
 		else
-			cl.driftmove += host_frametime;
+			cl.driftmove += cl.viewstate.frametime;
 
 		if (cl.driftmove > v_centermove->value) {
 			V_StartPitchDrift ();
@@ -211,28 +209,28 @@ V_DriftPitch (void)
 		return;
 	}
 
-	delta = cl.idealpitch - cl.viewangles[PITCH];
+	delta = cl.idealpitch - cl.viewstate.angles[PITCH];
 
 	if (!delta) {
 		cl.pitchvel = 0;
 		return;
 	}
 
-	move = host_frametime * cl.pitchvel;
-	cl.pitchvel += host_frametime * v_centerspeed->value;
+	move = cl.viewstate.frametime * cl.pitchvel;
+	cl.pitchvel += cl.viewstate.frametime * v_centerspeed->value;
 
 	if (delta > 0) {
 		if (move > delta) {
 			cl.pitchvel = 0;
 			move = delta;
 		}
-		cl.viewangles[PITCH] += move;
+		cl.viewstate.angles[PITCH] += move;
 	} else if (delta < 0) {
 		if (move > -delta) {
 			cl.pitchvel = 0;
 			move = -delta;
 		}
-		cl.viewangles[PITCH] -= move;
+		cl.viewstate.angles[PITCH] -= move;
 	}
 }
 
@@ -243,8 +241,8 @@ V_ParseDamage (void)
 {
 	float       count, side;
 	int         armor, blood;
-	vec4f_t     origin = cl.simorg;
-	vec_t      *angles = cl.simangles;
+	vec4f_t     origin = cl.viewstate.origin;
+	vec_t      *angles = cl.viewstate.angles;
 	vec3_t      from, forward, right, up;
 
 	armor = MSG_ReadByte (net_message);
@@ -488,73 +486,41 @@ V_PrepBlend (void)
 
 /* VIEW RENDERING */
 
-static float
-angledelta (float a)
-{
-	a = anglemod (a);
-	if (a > 180)
-		a -= 360;
-	return a;
-}
-
 static void
 CalcGunAngle (void)
 {
-	float       yaw, pitch, move;
-	static float oldpitch = 0, oldyaw = 0;
-
-	yaw = r_data->refdef->viewangles[YAW];
-	pitch = -r_data->refdef->viewangles[PITCH];
-
-	yaw = angledelta (yaw - r_data->refdef->viewangles[YAW]) * 0.4;
-	yaw = bound (-10, yaw, 10);
-	pitch = angledelta (-pitch - r_data->refdef->viewangles[PITCH]) * 0.4;
-	pitch = bound (-10, pitch, 10);
-
-	move = host_frametime * 20;
-	if (yaw > oldyaw) {
-		if (oldyaw + move < yaw)
-			yaw = oldyaw + move;
-	} else {
-		if (oldyaw - move > yaw)
-			yaw = oldyaw - move;
-	}
-
-	if (pitch > oldpitch) {
-		if (oldpitch + move < pitch)
-			pitch = oldpitch + move;
-	} else {
-		if (oldpitch - move > pitch)
-			pitch = oldpitch - move;
-	}
-
-	oldyaw = yaw;
-	oldpitch = pitch;
-
-	cl.viewent.angles[YAW] = r_data->refdef->viewangles[YAW] + yaw;
-	cl.viewent.angles[PITCH] = -(r_data->refdef->viewangles[PITCH] + pitch);
+	vec4f_t     rotation = r_data->refdef->viewrotation;
+	//FIXME make child of camera
+	Transform_SetWorldRotation (cl.viewent.transform, rotation);
 }
 
 static void
 V_BoundOffsets (void)
 {
-	vec4f_t     origin = cl.simorg;
+	vec4f_t     offset = r_data->refdef->viewposition
+						- cl.viewstate.origin;
 
 	// absolutely bound refresh reletive to entity clipping hull
 	// so the view can never be inside a solid wall
 
-	if (r_data->refdef->vieworg[0] < origin[0] - 14)
-		r_data->refdef->vieworg[0] = origin[0] - 14;
-	else if (r_data->refdef->vieworg[0] > origin[0] + 14)
-		r_data->refdef->vieworg[0] = origin[0] + 14;
-	if (r_data->refdef->vieworg[1] < origin[1] - 14)
-		r_data->refdef->vieworg[1] = origin[1] - 14;
-	else if (r_data->refdef->vieworg[1] > origin[1] + 14)
-		r_data->refdef->vieworg[1] = origin[1] + 14;
-	if (r_data->refdef->vieworg[2] < origin[2] - 22)
-		r_data->refdef->vieworg[2] = origin[2] - 22;
-	else if (r_data->refdef->vieworg[2] > origin[2] + 30)
-		r_data->refdef->vieworg[2] = origin[2] + 30;
+	offset[0] = bound (-14, offset[0], 14);
+	offset[1] = bound (-14, offset[1], 14);
+	offset[2] = bound (-22, offset[2], 30);
+	r_data->refdef->viewposition = cl.viewstate.origin + offset;
+}
+
+static vec4f_t
+idle_quat (vec4f_t axis, cvar_t *cycle, cvar_t *level)
+{
+	vec4f_t     identity = { 0, 0, 0, 1 };
+	if (!level || !cycle) {
+		return identity;
+	}
+	float       scale = sin (cl.time * cycle->value);
+	float       ang = scale * level->value * v_idlescale->value;
+	float       c = cos (ang);
+	float       s = sin (ang);
+	return axis * s + identity * c;
 }
 
 /*
@@ -565,19 +531,21 @@ V_BoundOffsets (void)
 static void
 V_AddIdle (void)
 {
-	r_data->refdef->viewangles[ROLL] += v_idlescale->value *
-		sin (cl.time * v_iroll_cycle->value) * v_iroll_level->value;
-	r_data->refdef->viewangles[PITCH] += v_idlescale->value *
-		sin (cl.time * v_ipitch_cycle->value) * v_ipitch_level->value;
-	r_data->refdef->viewangles[YAW] += v_idlescale->value *
-		sin (cl.time * v_iyaw_cycle->value) * v_iyaw_level->value;
+	vec4f_t     roll = idle_quat ((vec4f_t) { 1, 0, 0, 0},
+								  v_iroll_cycle, v_iroll_level);
+	vec4f_t     pitch = idle_quat ((vec4f_t) { 0, 1, 0, 0},
+								   v_ipitch_cycle, v_ipitch_level);
+	vec4f_t     yaw = idle_quat ((vec4f_t) { 0, 0, 1, 0},
+								 v_iyaw_cycle, v_iyaw_level);
+	vec4f_t     rot = normalf (qmulf (yaw, qmulf (pitch, roll)));
 
-	cl.viewent.angles[ROLL] -= v_idlescale->value *
-		sin (cl.time * v_iroll_cycle->value) * v_iroll_level->value;
-	cl.viewent.angles[PITCH] -= v_idlescale->value *
-		sin (cl.time * v_ipitch_cycle->value) * v_ipitch_level->value;
-	cl.viewent.angles[YAW] -= v_idlescale->value *
-		sin (cl.time * v_iyaw_cycle->value) * v_iyaw_level->value;
+	// rotate the view
+	r_data->refdef->viewrotation = qmulf (rot, r_data->refdef->viewrotation);
+
+	// counter-rotate the weapon
+	rot = qmulf (qconjf (rot),
+				 Transform_GetWorldRotation (cl.viewent.transform));
+	Transform_SetWorldRotation (cl.viewent.transform, rot);
 }
 
 /*
@@ -588,23 +556,25 @@ V_AddIdle (void)
 static void
 V_CalcViewRoll (void)
 {
-	float       side;
-	vec_t      *angles = cl.simangles;
-	vec4f_t     velocity = cl.simvel;
+	vec_t      *angles = cl.viewstate.angles;
+	vec4f_t     velocity = cl.viewstate.velocity;
+	vec3_t      ang = { };
 
-	side = V_CalcRoll (angles, velocity);
-	r_data->refdef->viewangles[ROLL] += side;
+	ang[ROLL] = V_CalcRoll (angles, velocity);
 
 	if (v_dmg_time > 0) {
-		r_data->refdef->viewangles[ROLL] +=
-			v_dmg_time / v_kicktime->value * v_dmg_roll;
-		r_data->refdef->viewangles[PITCH] +=
-			v_dmg_time / v_kicktime->value * v_dmg_pitch;
-		v_dmg_time -= host_frametime;
+		ang[ROLL] += v_dmg_time / v_kicktime->value * v_dmg_roll;
+		ang[PITCH] += v_dmg_time / v_kicktime->value * v_dmg_pitch;
+		v_dmg_time -= cl.viewstate.frametime;
 	}
 
-	if (view_state->pls.es.flags & PF_DEAD)		// PF_GIB will also set PF_DEAD
-		r_data->refdef->viewangles[ROLL] = 80;	// dead view angle
+	if (cl.viewstate.flags & VF_DEAD) {		// VF_GIB will also set VF_DEAD
+		ang[ROLL] = 80;	// dead view angle
+	}
+
+	vec4f_t     rot;
+	AngleQuat (ang, &rot[0]);//FIXME
+	r_data->refdef->viewrotation = qmulf (r_data->refdef->viewrotation, rot);
 }
 
 static void
@@ -612,14 +582,12 @@ V_CalcIntermissionRefdef (void)
 {
 	entity_t   *view;
 	float       old;
-	vec4f_t     origin = cl.simorg;
-	vec_t      *angles = cl.simangles;
 
 	// view is the weapon model (visible only from inside body)
 	view = &cl.viewent;
 
-	VectorCopy (origin, r_data->refdef->vieworg);
-	VectorCopy (angles, r_data->refdef->viewangles);
+	r_data->refdef->viewposition = cl.viewstate.origin;
+	AngleQuat (cl.viewstate.angles, &r_data->refdef->viewrotation[0]);//FIXME
 	view->renderer.model = NULL;
 
 	// always idle in intermission
@@ -636,113 +604,122 @@ V_CalcRefdef (void)
 	entity_t   *view = &cl.viewent;
 	float       bob;
 	static float oldz = 0;
-	int         i;
-	vec3_t      forward, right, up;
-	vec4f_t     origin = cl.simorg;
-	vec_t      *viewangles = cl.simangles;
+	vec4f_t     forward = {}, right = {}, up = {};
+	vec4f_t     origin = cl.viewstate.origin;
+	vec_t      *viewangles = cl.viewstate.angles;
 
 	V_DriftPitch ();
 
 	bob = V_CalcBob ();
 
 	// refresh position
-	VectorCopy (origin, r_data->refdef->vieworg);
-	r_data->refdef->vieworg[2] += cl.viewheight + bob;
+	r_data->refdef->viewposition = origin;
+	r_data->refdef->viewposition[2] += cl.viewheight + bob;
 
 	// never let it sit exactly on a node line, because a water plane can
 	// disappear when viewed with the eye exactly on it.
 	// server protocol specifies to only 1/8 pixel, so add 1/16 in each axis
-	r_data->refdef->vieworg[0] += 1.0 / 16;
-	r_data->refdef->vieworg[1] += 1.0 / 16;
-	r_data->refdef->vieworg[2] += 1.0 / 16;
+	r_data->refdef->viewposition += (vec4f_t) { 1.0/16, 1.0/16, 1.0/16, 0};
 
-	VectorCopy (viewangles, r_data->refdef->viewangles);
+	AngleQuat (cl.viewstate.angles, &r_data->refdef->viewrotation[0]);//FIXME
 	V_CalcViewRoll ();
 	V_AddIdle ();
 
 	// offsets
-	AngleVectors (viewangles, forward, right, up);
+	//FIXME semi-duplicates AngleQuat (also, vec3_t vs vec4f_t)
+	AngleVectors (viewangles, &forward[0], &right[0], &up[0]);
 
 	// don't allow cheats in multiplayer
 	// FIXME check for dead
 	if (cl.maxclients == 1) {
-		for (i = 0; i < 3; i++) {
-			r_data->refdef->vieworg[i] += scr_ofsx->value * forward[i] +
-				scr_ofsy->value * right[i] +
-				scr_ofsz->value * up[i];
-		}
+		r_data->refdef->viewposition += scr_ofsx->value * forward
+										+ scr_ofsy->value * right
+										+ scr_ofsz->value * up;
 	}
 
 	V_BoundOffsets ();
 
 	// set up gun position
-	VectorCopy (viewangles, view->angles);
-
 	CalcGunAngle ();
 
-	VectorCopy (origin, view->origin);
-	view->origin[2] += cl.viewheight;
-
-	for (i = 0; i < 3; i++) {
-		view->origin[i] += forward[i] * bob * 0.4;
-//		view->origin[i] += right[i] * bob * 0.4;
-//		view->origin[i] += up[i] * bob * 0.8;
-	}
-	view->origin[2] += bob;
+	origin += (vec4f_t) { 0, 0, cl.viewheight, 0 };
+	origin += forward * bob * 0.4f + (vec4f_t) { 0, 0, bob, 0 };
 
 	// fudge position around to keep amount of weapon visible
 	// roughly equal with different FOV
-	if (hud_sbar->int_val == 0 && r_data->scr_viewsize->int_val >= 100)
+	if (hud_sbar->int_val == 0 && r_data->scr_viewsize->int_val >= 100) {
 		;
-	else if (r_data->scr_viewsize->int_val == 110)
-		view->origin[2] += 1;
-	else if (r_data->scr_viewsize->int_val == 100)
-		view->origin[2] += 2;
-	else if (r_data->scr_viewsize->int_val == 90)
-		view->origin[2] += 1;
-	else if (r_data->scr_viewsize->int_val == 80)
-		view->origin[2] += 0.5;
+	} else if (r_data->scr_viewsize->int_val == 110) {
+		origin += (vec4f_t) { 0, 0, 1, 0};
+	} else if (r_data->scr_viewsize->int_val == 100) {
+		origin += (vec4f_t) { 0, 0, 2, 0};
+	} else if (r_data->scr_viewsize->int_val == 90) {
+		origin += (vec4f_t) { 0, 0, 1, 0};
+	} else if (r_data->scr_viewsize->int_val == 80) {
+		origin += (vec4f_t) { 0, 0, 0.5, 0};
+	}
 
-	if (view_state->pls.es.flags & (PF_GIB | PF_DEAD)) {
+	if (cl.viewstate.flags & (VF_GIB | VF_DEAD)) {
 		view->renderer.model = NULL;
 	} else {
 		view->renderer.model = cl.model_precache[cl.stats[STAT_WEAPON]];
 	}
-	view->animation.frame = view_state->pls.es.weaponframe;
+	view->animation.frame = cl.viewstate.weaponframe;
 	view->renderer.skin = 0;
 
 	// set up the refresh position
-	VectorAdd (r_data->refdef->viewangles, cl.punchangle,
-			   r_data->refdef->viewangles);
+	r_data->refdef->viewrotation = qmulf (cl.viewstate.punchangle,
+										  r_data->refdef->viewrotation);
 
 	// smooth out stair step ups
 	if ((cl.onground != -1) && (origin[2] - oldz > 0)) {
 		float       steptime;
 
-		steptime = host_frametime;
+		steptime = cl.viewstate.frametime;
 
 		oldz += steptime * 80;
 		if (oldz > origin[2])
 			oldz = origin[2];
 		if (origin[2] - oldz > 12)
 			oldz = origin[2] - 12;
-		r_data->refdef->vieworg[2] += oldz - origin[2];
-		view->origin[2] += oldz - origin[2];
-	} else
+		r_data->refdef->viewposition[2] += oldz - origin[2];
+		origin[2] += oldz - origin[2];
+	} else {
 		oldz = origin[2];
+	}
+	{
+		// FIXME sort out the alias model specific negation
+		vec3_t ang = {-viewangles[0], viewangles[1], viewangles[2]};
+		CL_TransformEntity (view, 1, ang, origin);
+	}
 
-	if (cl.chase && chase_active->int_val)
+	if (cl.chase && chase_active->int_val) {
 		Chase_Update ();
-
-	CL_TransformEntity (view, view->angles);
+	}
 }
 
 static void
 DropPunchAngle (void)
 {
-	cl.punchangle[PITCH] -= 10 * host_frametime;
-	if (cl.punchangle[PITCH] < 0)
-		cl.punchangle[PITCH] = 0;
+	vec4f_t     punch = cl.viewstate.punchangle;
+	float       ps = magnitude3f (punch)[0];
+	if (ps < 1e-3) {
+		// < 0.2 degree rotation, not worth worrying about
+		//ensure the quaternion is normalized
+		cl.viewstate.punchangle = (vec4f_t) { 0, 0, 0, 1 };
+		return;
+	}
+	float		pc = punch[3];
+	float       ds = 0.0871557427 * cl.viewstate.frametime;
+	float       dc = sqrt (1 - ds * ds);
+	float       s = ps * dc - pc * ds;
+	float       c = pc * dc + ps * ds;
+	if (s <= 0 || c >= 1) {
+		cl.viewstate.punchangle = (vec4f_t) { 0, 0, 0, 1 };
+	} else {
+		punch *= s / ps;
+		punch[3] = c;
+	}
 }
 
 /*
@@ -754,17 +731,17 @@ DropPunchAngle (void)
 void
 V_RenderView (void)
 {
-	if (cls.state != ca_active)
+	if (cls.state != ca_active) {
+		r_data->refdef->viewposition = (vec4f_t) { 0, 0, 0, 1 };
+		r_data->refdef->viewrotation = (vec4f_t) { 0, 0, 0, 1 };
 		return;
+	}
 
-	view_frame = &cl.frames[cls.netchan.incoming_sequence & UPDATE_MASK];
-	view_state = &view_frame->playerstate[cl.playernum];
-
-	if (view_state->pls.es.flags & PF_GIB)
+	if (cl.viewstate.flags & VF_GIB) {
 		cl.viewheight = 8;			// gib view height
-	else if (view_state->pls.es.flags & PF_DEAD)
+	} else if (cl.viewstate.flags & VF_DEAD) {
 		cl.viewheight = -16;			// corpse view height
-	else {
+	} else {
 		cl.viewheight = DEFAULT_VIEWHEIGHT;	// view height
 		if (cl.stdver)
 			cl.viewheight = cl.stats[STAT_VIEWHEIGHT];
diff --git a/qw/source/teamplay.c b/qw/source/teamplay.c
index 159da95f0..c3e2a0424 100644
--- a/qw/source/teamplay.c
+++ b/qw/source/teamplay.c
@@ -184,10 +184,10 @@ Team_ParseSay (dstring_t *buf, const char *s)
 			case 'l':
 			location:
 				bracket = 0;
-				location = locs_find (cl.simorg);
+				location = locs_find (cl.viewstate.origin);
 				if (location) {
 					recorded_location = true;
-					last_recorded_location = cl.simorg;
+					last_recorded_location = cl.viewstate.origin;
 					t1 = location->name;
 				} else
 					snprintf (t2, sizeof (t2), "Unknown!");
@@ -279,7 +279,7 @@ void
 Team_Dead (void)
 {
 	died = true;
-	death_location = cl.simorg;
+	death_location = cl.viewstate.origin;
 }
 
 void
@@ -370,7 +370,7 @@ locs_loc (void)
 
 	if (strcasecmp (Cmd_Argv (1), "add") == 0) {
 		if (Cmd_Argc () >= 3)
-			locs_mark (cl.simorg, desc);
+			locs_mark (cl.viewstate.origin, desc);
 		else
 			Sys_Printf ("loc add <description> :marks the current location "
 						"with the description and records the information "
@@ -379,7 +379,7 @@ locs_loc (void)
 
 	if (strcasecmp (Cmd_Argv (1), "rename") == 0) {
 		if (Cmd_Argc () >= 3)
-			locs_edit (cl.simorg, desc);
+			locs_edit (cl.viewstate.origin, desc);
 		else
 			Sys_Printf ("loc rename <description> :changes the description of "
 					    "the nearest location marker\n");
@@ -387,14 +387,14 @@ locs_loc (void)
 
 	if (strcasecmp (Cmd_Argv (1),"delete") == 0) {
 		if (Cmd_Argc () == 2)
-			locs_del (cl.simorg);
+			locs_del (cl.viewstate.origin);
 		else
 			Sys_Printf ("loc delete :removes nearest location marker\n");
 	}
 
 	if (strcasecmp (Cmd_Argv (1),"move") == 0) {
 		if (Cmd_Argc () == 2)
-			locs_edit (cl.simorg, NULL);
+			locs_edit (cl.viewstate.origin, NULL);
 		else
 			Sys_Printf ("loc move :moves the nearest location marker to your "
 						"current location\n");
@@ -409,7 +409,7 @@ Locs_Loc_Get (void)
 	if (GIB_Argc () != 1)
 		GIB_USAGE ("");
 	else {
-		location = locs_find (cl.simorg);
+		location = locs_find (cl.viewstate.origin);
 		GIB_Return (location ? location->name : "unknown");
 	}
 }

From 8f7d6b1d02b9057af7e9f93bd69dd1b0ef104403 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 19 Mar 2021 22:53:23 +0900
Subject: [PATCH 1482/1519] [vulkan] Initialize skins

This allows the qw client to run with Vulkan.
---
 libs/video/renderer/vid_render_vulkan.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libs/video/renderer/vid_render_vulkan.c b/libs/video/renderer/vid_render_vulkan.c
index 00c307dbc..b4f84f129 100644
--- a/libs/video/renderer/vid_render_vulkan.c
+++ b/libs/video/renderer/vid_render_vulkan.c
@@ -102,6 +102,7 @@ vulkan_R_Init (void)
 	Vulkan_Particles_Init (vulkan_ctx);
 	Vulkan_Lighting_Init (vulkan_ctx);
 	Vulkan_Compose_Init (vulkan_ctx);
+	Skin_Init ();
 
 	Sys_Printf ("R_Init %p %d", vulkan_ctx->swapchain->swapchain,
 				vulkan_ctx->swapchain->numImages);

From 82e58dae5f6adcd59df2bbc0390f0346ba8aae17 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 19 Mar 2021 22:54:20 +0900
Subject: [PATCH 1483/1519] [qw] Disable lerping on player model change

This seems to be an ancient bug, but may have been exposed by the recent
entity changes (was certainly highlighted by Vulkan)
---
 qw/source/cl_ents.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/qw/source/cl_ents.c b/qw/source/cl_ents.c
index 8ee9440b4..26e25ad25 100644
--- a/qw/source/cl_ents.c
+++ b/qw/source/cl_ents.c
@@ -433,7 +433,11 @@ CL_LinkPlayers (void)
 		}
 		ang[ROLL] = V_CalcRoll (ang, state->pls.es.velocity) * 4.0;
 
-		ent->renderer.model = cl.model_precache[state->pls.es.modelindex];
+		if (ent->renderer.model
+			!= cl.model_precache[state->pls.es.modelindex]) {
+			ent->renderer.model = cl.model_precache[state->pls.es.modelindex];
+			ent->animation.nolerp = 1;
+		}
 		ent->animation.frame = state->pls.es.frame;
 		ent->renderer.skinnum = state->pls.es.skinnum;
 

From 5cf1da7c252dcf6b6e9f3a0bd89b66756a2dd249 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 20 Mar 2021 00:58:37 +0900
Subject: [PATCH 1484/1519] [client] Finish moving onground to viewstate

Missed this in the entity cleanup (really, should have been separate
commits, but oh well).
---
 include/client/view.h | 2 +-
 nq/include/client.h   | 1 -
 nq/source/cl_parse.c  | 4 ++--
 nq/source/cl_view.c   | 4 ++--
 qw/include/client.h   | 1 -
 qw/source/cl_pred.c   | 4 ++--
 qw/source/cl_view.c   | 4 ++--
 7 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/include/client/view.h b/include/client/view.h
index 40ad78df3..7a7f8e005 100644
--- a/include/client/view.h
+++ b/include/client/view.h
@@ -43,7 +43,7 @@ typedef struct viewstate_s {
 	vec4f_t     origin;
 	vec3_t      angles;
 	int         weaponframe;
-	int         onground;
+	int         onground;		// -1 when in air
 	uint32_t    flags;
 	float       frametime;
 	vec4f_t     punchangle;
diff --git a/nq/include/client.h b/nq/include/client.h
index 5d98e437b..54cb937f9 100644
--- a/nq/include/client.h
+++ b/nq/include/client.h
@@ -178,7 +178,6 @@ typedef struct {
 	double      laststop;
 
 	qboolean    paused;			// Sent over by server
-	int         onground;
 	float       viewheight;
 	float       crouch;			// Local amount for smoothing stepups
 	qboolean    inwater;
diff --git a/nq/source/cl_parse.c b/nq/source/cl_parse.c
index e74a65976..30e48e82a 100644
--- a/nq/source/cl_parse.c
+++ b/nq/source/cl_parse.c
@@ -692,7 +692,7 @@ CL_ParseClientdata (void)
 		cl.stats[STAT_ITEMS] = i;
 	}
 
-	cl.onground = (bits & SU_ONGROUND) ? 0 : -1;
+	cl.viewstate.onground = (bits & SU_ONGROUND) ? 0 : -1;
 	cl.inwater = (bits & SU_INWATER) != 0;
 
 	if (bits & SU_WEAPONFRAME)
@@ -851,7 +851,7 @@ CL_ParseServerMessage (void)
 	else if (cl_shownet->int_val == 2)
 		Sys_Printf ("------------------\n");
 
-	cl.onground = -1;				// unless the server says otherwise
+	cl.viewstate.onground = -1;		// unless the server says otherwise
 
 	// parse the message
 	MSG_BeginReading (net_message);
diff --git a/nq/source/cl_view.c b/nq/source/cl_view.c
index f5ba3de8f..d21f267b1 100644
--- a/nq/source/cl_view.c
+++ b/nq/source/cl_view.c
@@ -124,7 +124,7 @@ V_CalcBob (void)
 	if (cl.spectator)
 		return 0;
 
-	if (cl.onground == -1)
+	if (cl.viewstate.onground == -1)
 		return bob;						// just use old value
 
 	bobtime += cl.viewstate.frametime;
@@ -666,7 +666,7 @@ V_CalcRefdef (void)
 										  r_data->refdef->viewrotation);
 
 	// smooth out stair step ups
-	if ((cl.onground != -1) && (origin[2] - oldz > 0)) {
+	if ((cl.viewstate.onground != -1) && (origin[2] - oldz > 0)) {
 		float       steptime;
 
 		steptime = cl.viewstate.frametime;
diff --git a/qw/include/client.h b/qw/include/client.h
index 8c0369fba..f3e12fced 100644
--- a/qw/include/client.h
+++ b/qw/include/client.h
@@ -232,7 +232,6 @@ typedef struct {
 	double      laststop;
 
 	qboolean    paused;			// Sent over by server
-	int         onground;		// -1 when in air
 	float       viewheight;
 	float       crouch;			// local amount for smoothing stepups
 
diff --git a/qw/source/cl_pred.c b/qw/source/cl_pred.c
index 5bf79a163..58ee4a144 100644
--- a/qw/source/cl_pred.c
+++ b/qw/source/cl_pred.c
@@ -115,7 +115,7 @@ CL_PredictMove (void)
 		return;
 
 	// assume on ground unless prediction says different
-	cl.onground = 0;
+	cl.viewstate.onground = 0;
 
 	cl.time = realtime - cls.latency - cl_pushlatency->value * 0.001;
 	if (cl.time > realtime)
@@ -157,7 +157,7 @@ CL_PredictMove (void)
 		CL_PredictUsercmd (&from->playerstate[cl.playernum],
 						   &to->playerstate[cl.playernum], &to->cmd,
 						   true);
-		cl.onground = onground;
+		cl.viewstate.onground = onground;
 		if (to->senttime >= cl.time)
 			break;
 		from = to;
diff --git a/qw/source/cl_view.c b/qw/source/cl_view.c
index 0e9162ca8..0da8c09cc 100644
--- a/qw/source/cl_view.c
+++ b/qw/source/cl_view.c
@@ -126,7 +126,7 @@ V_CalcBob (void)
 	if (cl.spectator)
 		return 0;
 
-	if (cl.onground == -1)
+	if (cl.viewstate.onground == -1)
 		return bob;						// just use old value
 
 	bobtime += cl.viewstate.frametime;
@@ -672,7 +672,7 @@ V_CalcRefdef (void)
 										  r_data->refdef->viewrotation);
 
 	// smooth out stair step ups
-	if ((cl.onground != -1) && (origin[2] - oldz > 0)) {
+	if ((cl.viewstate.onground != -1) && (origin[2] - oldz > 0)) {
 		float       steptime;
 
 		steptime = cl.viewstate.frametime;

From dc7cb97481a96319462b2e42bde1dac6eaf32ef1 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 20 Mar 2021 01:48:26 +0900
Subject: [PATCH 1485/1519] [qw] Remove viewangles from client state

Other than the one line in cl_pred.c, it's redundant, but it looks to be
just a redundant copy from ancient times.
---
 nq/source/cl_input.c |  3 ++-
 qw/include/client.h  |  6 ++----
 qw/source/cl_cam.c   | 14 ++++++-------
 qw/source/cl_demo.c  |  4 ++--
 qw/source/cl_ents.c  |  4 ++--
 qw/source/cl_input.c | 49 ++++++++++++++++++++++++--------------------
 qw/source/cl_main.c  | 16 +++++++--------
 qw/source/cl_parse.c |  4 ++--
 qw/source/cl_pred.c  |  2 +-
 9 files changed, 53 insertions(+), 49 deletions(-)

diff --git a/nq/source/cl_input.c b/nq/source/cl_input.c
index 291f0ecac..5d471afaf 100644
--- a/nq/source/cl_input.c
+++ b/nq/source/cl_input.c
@@ -477,8 +477,9 @@ CL_AdjustAngles (void)
 void
 CL_BaseMove (usercmd_t *cmd)
 {
-	if (cls.state != ca_active)
+	if (cls.state != ca_active) {
 		return;
+	}
 
 	CL_AdjustAngles ();
 
diff --git a/qw/include/client.h b/qw/include/client.h
index f3e12fced..9f282717c 100644
--- a/qw/include/client.h
+++ b/qw/include/client.h
@@ -216,13 +216,11 @@ typedef struct {
 	cshift_t    cshifts[NUM_CSHIFTS];	// Color shifts for damage, powerups
 	cshift_t    prev_cshifts[NUM_CSHIFTS];	// and content types
 
-// the client maintains its own idea of view angles, which are sent to the
-// server each frame.  And reset only at level change and teleport times
-	vec3_t      viewangles;
-
 // the client simulates or interpolates movement to get these values
 	double      time;			// this is the time value that the client
 								// is rendering at.  always <= realtime
+// the client maintains its own idea of view angles, which are sent to the
+// server each frame.  And reset only at level change and teleport times
 	viewstate_t viewstate;
 // pitch drifting vars
 	float       idealpitch;
diff --git a/qw/source/cl_cam.c b/qw/source/cl_cam.c
index 1b1959f13..383bc313a 100644
--- a/qw/source/cl_cam.c
+++ b/qw/source/cl_cam.c
@@ -439,7 +439,7 @@ Cam_Track (usercmd_t *cmd)
 	if (cl_chasecam->int_val) {
 		cmd->forwardmove = cmd->sidemove = cmd->upmove = 0;
 
-		VectorCopy (player->viewangles, cl.viewangles);
+		VectorCopy (player->viewangles, cl.viewstate.angles);
 		VectorCopy (player->pls.es.origin, desired_position);
 		if (memcmp (&desired_position, &self->pls.es.origin,
 					sizeof (desired_position)) != 0) {
@@ -468,8 +468,8 @@ Cam_Track (usercmd_t *cmd)
 		VectorCopy (desired_position, self->pls.es.origin);
 
 		VectorSubtract (player->pls.es.origin, desired_position, vec);
-		vectoangles (vec, cl.viewangles);
-		cl.viewangles[0] = -cl.viewangles[0];
+		vectoangles (vec, cl.viewstate.angles);
+		cl.viewstate.angles[0] = -cl.viewstate.angles[0];
 	}
 }
 
@@ -536,8 +536,8 @@ Cam_SetView (void)
 			adjustang (cam_viewangles[YAW], vec2[YAW],
 					   cl_camera_maxyaw->value);
 	}
-	VectorCopy (cam_viewangles, cl.viewangles);
-	VectorCopy (cl.viewangles, cl.simangles);
+	VectorCopy (cam_viewangles, cl.viewstate.angles);
+	VectorCopy (cl.viewstate.angles, cl.simangles);
 	cl.simangles[ROLL] = 0;						// FIXME @@@
 }
 #endif
@@ -576,7 +576,7 @@ Cam_FinishMove (usercmd_t *cmd)
 				adjustang (cam_viewangles[YAW], vec2[YAW],
 						   cl_camera_maxyaw->value);
 		}
-		VectorCopy (cam_viewangles, cl.viewangles);
+		VectorCopy (cam_viewangles, cl.viewstate.angles);
 	}
 #endif
 
@@ -587,7 +587,7 @@ Cam_FinishMove (usercmd_t *cmd)
 
 			if (autocam > CAM_TRACK) {
 				Cam_Unlock ();
-				VectorCopy (cl.viewangles, cmd->angles);
+				VectorCopy (cl.viewstate.angles, cmd->angles);
 				return;
 			}
 		} else
diff --git a/qw/source/cl_demo.c b/qw/source/cl_demo.c
index 7503f5c2a..df54decd7 100644
--- a/qw/source/cl_demo.c
+++ b/qw/source/cl_demo.c
@@ -333,7 +333,7 @@ nextdemomessage:
 			cls.netchan.outgoing_sequence++;
 			for (i = 0; i < 3; i++) {
 				Qread (cls.demofile, &f, 4);
-				cl.viewangles[i] = LittleFloat (f);
+				cl.viewstate.angles[i] = LittleFloat (f);
 			}
 			break;
 
@@ -462,7 +462,7 @@ CL_WriteDemoCmd (usercmd_t *pcmd)
 	Qwrite (cls.demofile, &cmd, sizeof (cmd));
 
 	for (i = 0; i < 3; i++) {
-		fl = LittleFloat (cl.viewangles[i]);
+		fl = LittleFloat (cl.viewstate.angles[i]);
 		Qwrite (cls.demofile, &fl, 4);
 	}
 
diff --git a/qw/source/cl_ents.c b/qw/source/cl_ents.c
index 26e25ad25..9da38dc9c 100644
--- a/qw/source/cl_ents.c
+++ b/qw/source/cl_ents.c
@@ -425,8 +425,8 @@ CL_LinkPlayers (void)
 		// angles
 		if (j == cl.playernum)
 		{
-			ang[PITCH] = -cl.viewangles[PITCH] / 3.0;
-			ang[YAW] = cl.viewangles[YAW];
+			ang[PITCH] = -cl.viewstate.angles[PITCH] / 3.0;
+			ang[YAW] = cl.viewstate.angles[YAW];
 		} else {
 			ang[PITCH] = -state->viewangles[PITCH] / 3.0;
 			ang[YAW] = state->viewangles[YAW];
diff --git a/qw/source/cl_input.c b/qw/source/cl_input.c
index 9b9763d46..7371c06cc 100644
--- a/qw/source/cl_input.c
+++ b/qw/source/cl_input.c
@@ -454,35 +454,35 @@ CL_AdjustAngles (void)
 	yawspeed *= host_frametime;
 
 	if (!(in_strafe.state & 1)) {
-		cl.viewangles[YAW] -= yawspeed * CL_KeyState (&in_right);
-		cl.viewangles[YAW] += yawspeed * CL_KeyState (&in_left);
-		cl.viewangles[YAW] = anglemod (cl.viewangles[YAW]);
+		cl.viewstate.angles[YAW] -= yawspeed * CL_KeyState (&in_right);
+		cl.viewstate.angles[YAW] += yawspeed * CL_KeyState (&in_left);
+		cl.viewstate.angles[YAW] = anglemod (cl.viewstate.angles[YAW]);
 	}
 	if (in_klook.state & 1) {
 		V_StopPitchDrift ();
-		cl.viewangles[PITCH] -= pitchspeed * CL_KeyState (&in_forward);
-		cl.viewangles[PITCH] += pitchspeed * CL_KeyState (&in_back);
+		cl.viewstate.angles[PITCH] -= pitchspeed * CL_KeyState (&in_forward);
+		cl.viewstate.angles[PITCH] += pitchspeed * CL_KeyState (&in_back);
 	}
 
 	up = CL_KeyState (&in_lookup);
 	down = CL_KeyState (&in_lookdown);
 
-	cl.viewangles[PITCH] -= pitchspeed * up;
-	cl.viewangles[PITCH] += pitchspeed * down;
+	cl.viewstate.angles[PITCH] -= pitchspeed * up;
+	cl.viewstate.angles[PITCH] += pitchspeed * down;
 
 	if (up || down)
 		V_StopPitchDrift ();
 
 	// FIXME: Need to clean up view angle limits
-	if (cl.viewangles[PITCH] > 80)
-		cl.viewangles[PITCH] = 80;
-	if (cl.viewangles[PITCH] < -70)
-		cl.viewangles[PITCH] = -70;
+	if (cl.viewstate.angles[PITCH] > 80)
+		cl.viewstate.angles[PITCH] = 80;
+	if (cl.viewstate.angles[PITCH] < -70)
+		cl.viewstate.angles[PITCH] = -70;
 
-	if (cl.viewangles[ROLL] > 50)
-		cl.viewangles[ROLL] = 50;
-	if (cl.viewangles[ROLL] < -50)
-		cl.viewangles[ROLL] = -50;
+	if (cl.viewstate.angles[ROLL] > 50)
+		cl.viewstate.angles[ROLL] = 50;
+	if (cl.viewstate.angles[ROLL] < -50)
+		cl.viewstate.angles[ROLL] = -50;
 }
 
 /*
@@ -493,11 +493,15 @@ CL_AdjustAngles (void)
 void
 CL_BaseMove (usercmd_t *cmd)
 {
+	if (cls.state != ca_active) {
+		return;
+	}
+
 	CL_AdjustAngles ();
 
 	memset (cmd, 0, sizeof (*cmd));
 
-	VectorCopy (cl.viewangles, cmd->angles);
+	VectorCopy (cl.viewstate.angles, cmd->angles);
 	if (in_strafe.state & 1) {
 		cmd->sidemove += cl_sidespeed->value * CL_KeyState (&in_right);
 		cmd->sidemove -= cl_sidespeed->value * CL_KeyState (&in_left);
@@ -536,7 +540,7 @@ CL_BaseMove (usercmd_t *cmd)
 		vec3_t      forward, right, up, f, r;
 		vec3_t      dir = {0, 0, 0};
 
-		dir[1] = r_data->refdef->viewangles[1] - cl.viewangles[1];
+		dir[1] = r_data->refdef->viewangles[1] - cl.viewstate.angles[1];
 		AngleVectors (dir, forward, right, up);
 		VectorScale (forward, cmd->forwardmove, f);
 		VectorScale (right, cmd->sidemove, r);
@@ -552,12 +556,13 @@ CL_BaseMove (usercmd_t *cmd)
 	cmd->forwardmove += viewdelta.position[2] * m_forward->value;
 	cmd->sidemove += viewdelta.position[0] * m_side->value;
 	cmd->upmove += viewdelta.position[1];
-	cl.viewangles[PITCH] += viewdelta.angles[PITCH] * m_pitch->value;
-	cl.viewangles[YAW] += viewdelta.angles[YAW] * m_yaw->value;
-	cl.viewangles[ROLL] += viewdelta.angles[ROLL];
+	cl.viewstate.angles[PITCH] += viewdelta.angles[PITCH] * m_pitch->value;
+	cl.viewstate.angles[YAW] += viewdelta.angles[YAW] * m_yaw->value;
+	cl.viewstate.angles[ROLL] += viewdelta.angles[ROLL];
 
 	if (freelook && !(in_strafe.state & 1)) {
-		cl.viewangles[PITCH] = bound (-70, cl.viewangles[PITCH], 80);
+		cl.viewstate.angles[PITCH]
+			= bound (-70, cl.viewstate.angles[PITCH], 80);
 	}
 }
 
@@ -609,7 +614,7 @@ CL_FinishMove (usercmd_t *cmd)
 	}
 	cmd->msec = ms;
 
-	VectorCopy (cl.viewangles, cmd->angles);
+	VectorCopy (cl.viewstate.angles, cmd->angles);
 
 	cmd->impulse = in_impulse;
 	in_impulse = 0;
diff --git a/qw/source/cl_main.c b/qw/source/cl_main.c
index cef24d6bd..ba7bfe270 100644
--- a/qw/source/cl_main.c
+++ b/qw/source/cl_main.c
@@ -1100,7 +1100,7 @@ CL_Download_f (void)
 static void
 Force_CenterView_f (void)
 {
-	cl.viewangles[PITCH] = 0;
+	cl.viewstate.angles[PITCH] = 0;
 }
 
 static void
@@ -1109,12 +1109,12 @@ CL_PRotate_f (void)
 	if ((cl.fpd & FPD_LIMIT_PITCH) || Cmd_Argc() < 2)
 		return;
 
-	cl.viewangles[PITCH] += atoi (Cmd_Argv (1));
+	cl.viewstate.angles[PITCH] += atoi (Cmd_Argv (1));
 
-	if (cl.viewangles[PITCH] < -70)
-		cl.viewangles[PITCH] = -70;
-	else if (cl.viewangles[PITCH] > 80)
-		cl.viewangles[PITCH] = 80;
+	if (cl.viewstate.angles[PITCH] < -70)
+		cl.viewstate.angles[PITCH] = -70;
+	else if (cl.viewstate.angles[PITCH] > 80)
+		cl.viewstate.angles[PITCH] = 80;
 }
 
 static void
@@ -1123,8 +1123,8 @@ CL_Rotate_f (void)
 	if ((cl.fpd & FPD_LIMIT_YAW) || Cmd_Argc() < 2)
 		return;
 
-	cl.viewangles[YAW] += atoi (Cmd_Argv (1));
-	cl.viewangles[YAW] = anglemod (cl.viewangles[YAW]);
+	cl.viewstate.angles[YAW] += atoi (Cmd_Argv (1));
+	cl.viewstate.angles[YAW] = anglemod (cl.viewstate.angles[YAW]);
 }
 
 void
diff --git a/qw/source/cl_parse.c b/qw/source/cl_parse.c
index b53c2beb9..b7a293f28 100644
--- a/qw/source/cl_parse.c
+++ b/qw/source/cl_parse.c
@@ -1273,7 +1273,7 @@ CL_ParseMuzzleFlash (void)
 	pl = &cl.frames[parsecountmod].playerstate[i - 1];
 
 	if (i - 1 == cl.playernum)
-		AngleVectors (cl.viewangles, f, r, u);
+		AngleVectors (cl.viewstate.angles, f, r, u);
 	else
 		AngleVectors (pl->viewangles, f, r, u);
 
@@ -1415,7 +1415,7 @@ CL_ParseServerMessage (void)
 
 			case svc_setangle:
 			{
-				vec_t      *dest = cl.viewangles;
+				vec_t      *dest = cl.viewstate.angles;
 				vec3_t      dummy;
 
 				if (cls.demoplayback2) {
diff --git a/qw/source/cl_pred.c b/qw/source/cl_pred.c
index 58ee4a144..40f9f1459 100644
--- a/qw/source/cl_pred.c
+++ b/qw/source/cl_pred.c
@@ -132,7 +132,7 @@ CL_PredictMove (void)
 		UPDATE_BACKUP - 1)
 		return;
 
-	VectorCopy (cl.viewangles, cl.viewstate.angles);
+	//VectorCopy (cl.viewstate.angles, cl.viewstate.angles);
 	cl.viewstate.angles[ROLL] = 0;						// FIXME @@@
 
 	// this is the last frame received from the server

From 0ace799b277a16d9269ac8f0fcde60f8b28630a7 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 20 Mar 2021 03:56:16 +0900
Subject: [PATCH 1486/1519] [util] Support commands with a data parameter

Useful for avoiding a pile of wrapper functions that merely pass on
command-specific data to the actual implementation. Used to clean up the
wrappers in nq and qw cl_input.c
---
 include/QF/cmd.h     |   8 +-
 libs/util/cmd.c      |  29 +++-
 nq/source/cl_input.c | 362 +++++++++++--------------------------------
 qw/source/cl_input.c | 362 +++++++++++--------------------------------
 4 files changed, 207 insertions(+), 554 deletions(-)

diff --git a/include/QF/cmd.h b/include/QF/cmd.h
index 35846a063..3cd74432b 100644
--- a/include/QF/cmd.h
+++ b/include/QF/cmd.h
@@ -37,6 +37,7 @@
 #include "QF/cbuf.h"
 
 typedef void (*xcommand_t) (void);
+typedef void (*xdatacmd_t) (void *data);
 
 typedef enum {
     src_client,			// came in over a net connection as a clc_stringcmd
@@ -48,6 +49,8 @@ typedef struct cmd_function_s {
 	struct cmd_function_s *next;
 	const char *name;
 	xcommand_t  function;
+	xdatacmd_t  datafunc;
+	void       *data;
 	const char *description;
 } cmd_function_t;
 
@@ -56,7 +59,10 @@ extern cmd_source_t	cmd_source;
 void	Cmd_Init_Hash (void);
 void	Cmd_Init (void);
 
-int		Cmd_AddCommand (const char *cmd_name, xcommand_t function, const char *description);
+int		Cmd_AddCommand (const char *cmd_name, xcommand_t function,
+						const char *description);
+int		Cmd_AddDataCommand (const char *cmd_name, xdatacmd_t function,
+							void *data, const char *description);
 int		Cmd_RemoveCommand (const char *cmd_name);
 
 qboolean Cmd_Exists (const char *cmd_name);
diff --git a/libs/util/cmd.c b/libs/util/cmd.c
index aede64982..812fb55b6 100644
--- a/libs/util/cmd.c
+++ b/libs/util/cmd.c
@@ -118,6 +118,8 @@ Cmd_Command (cbuf_args_t *args)
 	if (cmd) {
 		if (cmd->function) {
 			cmd->function ();
+		} else if (cmd->datafunc) {
+			cmd->datafunc (cmd->data);
 		}
 		return 0;
 	}
@@ -133,10 +135,9 @@ Cmd_Command (cbuf_args_t *args)
 	return 0;
 }
 
-/* Registers a command and handler function */
-VISIBLE int
-Cmd_AddCommand (const char *cmd_name, xcommand_t function,
-				const char *description)
+static int
+add_command (const char *cmd_name, xcommand_t func, xdatacmd_t datafunc,
+			 void *data, const char *description)
 {
 	cmd_function_t *cmd;
 	cmd_function_t **c;
@@ -152,7 +153,9 @@ Cmd_AddCommand (const char *cmd_name, xcommand_t function,
 	cmd = calloc (1, sizeof (cmd_function_t));
 	SYS_CHECKMEM (cmd);
 	cmd->name = cmd_name;
-	cmd->function = function;
+	cmd->function = func;
+	cmd->datafunc = datafunc;
+	cmd->data = data;
 	cmd->description = description;
 	Hash_Add (cmd_hash, cmd);
 	for (c = &cmd_functions; *c; c = &(*c)->next)
@@ -163,6 +166,22 @@ Cmd_AddCommand (const char *cmd_name, xcommand_t function,
 	return 1;
 }
 
+/* Registers a command and handler function */
+VISIBLE int
+Cmd_AddCommand (const char *cmd_name, xcommand_t function,
+				const char *description)
+{
+	return add_command (cmd_name, function, 0, 0, description);
+}
+
+/* Registers a command and handler function with data */
+VISIBLE int
+Cmd_AddDataCommand (const char *cmd_name, xdatacmd_t function,
+					void *data, const char *description)
+{
+	return add_command (cmd_name, 0, function, data, description);
+}
+
 /* Unregisters a command */
 VISIBLE int
 Cmd_RemoveCommand (const char *name)
diff --git a/nq/source/cl_input.c b/nq/source/cl_input.c
index 5d471afaf..58787e7e7 100644
--- a/nq/source/cl_input.c
+++ b/nq/source/cl_input.c
@@ -77,8 +77,9 @@ int         in_impulse;
 void (*write_angles) (sizebuf_t *sb, const vec3_t angles);
 
 static void
-KeyPress (kbutton_t *b)
+KeyPress (void *_b)
 {
+	kbutton_t  *b = _b;
 	const char *c;
 	int         k;
 
@@ -107,8 +108,9 @@ KeyPress (kbutton_t *b)
 }
 
 static void
-KeyRelease (kbutton_t *b)
+KeyRelease (void *_b)
 {
+	kbutton_t  *b = _b;
 	const char *c;
 	int         k;
 
@@ -141,25 +143,7 @@ KeyRelease (kbutton_t *b)
 }
 
 static void
-IN_KLookPress (void)
-{
-	KeyPress (&in_klook);
-}
-
-static void
-IN_KLookRelease (void)
-{
-	KeyRelease (&in_klook);
-}
-
-static void
-IN_MLookPress (void)
-{
-	KeyPress (&in_mlook);
-}
-
-static void
-IN_MLookRelease (void)
+IN_MLookRelease (void *data)
 {
 	KeyRelease (&in_mlook);
 	if (!freelook && lookspring->int_val)
@@ -167,187 +151,7 @@ IN_MLookRelease (void)
 }
 
 static void
-IN_UpPress (void)
-{
-	KeyPress (&in_up);
-}
-
-static void
-IN_UpRelease (void)
-{
-	KeyRelease (&in_up);
-}
-
-static void
-IN_DownPress (void)
-{
-	KeyPress (&in_down);
-}
-
-static void
-IN_DownRelease (void)
-{
-	KeyRelease (&in_down);
-}
-
-static void
-IN_LeftPress (void)
-{
-	KeyPress (&in_left);
-}
-
-static void
-IN_LeftRelease (void)
-{
-	KeyRelease (&in_left);
-}
-
-static void
-IN_RightPress (void)
-{
-	KeyPress (&in_right);
-}
-
-static void
-IN_RightRelease (void)
-{
-	KeyRelease (&in_right);
-}
-
-static void
-IN_ForwardPress (void)
-{
-	KeyPress (&in_forward);
-}
-
-static void
-IN_ForwardRelease (void)
-{
-	KeyRelease (&in_forward);
-}
-
-static void
-IN_BackPress (void)
-{
-	KeyPress (&in_back);
-}
-
-static void
-IN_BackRelease (void)
-{
-	KeyRelease (&in_back);
-}
-
-static void
-IN_LookupPress (void)
-{
-	KeyPress (&in_lookup);
-}
-
-static void
-IN_LookupRelease (void)
-{
-	KeyRelease (&in_lookup);
-}
-
-static void
-IN_LookdownPress (void)
-{
-	KeyPress (&in_lookdown);
-}
-
-static void
-IN_LookdownRelease (void)
-{
-	KeyRelease (&in_lookdown);
-}
-
-static void
-IN_MoveleftPress (void)
-{
-	KeyPress (&in_moveleft);
-}
-
-static void
-IN_MoveleftRelease (void)
-{
-	KeyRelease (&in_moveleft);
-}
-
-static void
-IN_MoverightPress (void)
-{
-	KeyPress (&in_moveright);
-}
-
-static void
-IN_MoverightRelease (void)
-{
-	KeyRelease (&in_moveright);
-}
-
-static void
-IN_SpeedPress (void)
-{
-	KeyPress (&in_speed);
-}
-
-static void
-IN_SpeedRelease (void)
-{
-	KeyRelease (&in_speed);
-}
-
-static void
-IN_StrafePress (void)
-{
-	KeyPress (&in_strafe);
-}
-
-static void
-IN_StrafeRelease (void)
-{
-	KeyRelease (&in_strafe);
-}
-
-static void
-IN_AttackPress (void)
-{
-	KeyPress (&in_attack);
-}
-
-static void
-IN_AttackRelease (void)
-{
-	KeyRelease (&in_attack);
-}
-
-static void
-IN_UsePress (void)
-{
-	KeyPress (&in_use);
-}
-
-static void
-IN_UseRelease (void)
-{
-	KeyRelease (&in_use);
-}
-
-static void
-IN_JumpPress (void)
-{
-	KeyPress (&in_jump);
-}
-
-static void
-IN_JumpRelease (void)
-{
-	KeyRelease (&in_jump);
-}
-
-static void
-IN_Impulse (void)
+IN_Impulse (void *data)
 {
 	in_impulse = atoi (Cmd_Argv (1));
 }
@@ -608,76 +412,86 @@ CL_SendMove (usercmd_t *cmd)
 void
 CL_Input_Init (void)
 {
-	Cmd_AddCommand ("+moveup", IN_UpPress, "When active the player is "
-					"swimming up in a liquid");
-	Cmd_AddCommand ("-moveup", IN_UpRelease, "When active the player is not "
-					"swimming up in a liquid");
-	Cmd_AddCommand ("+movedown", IN_DownPress, "When active the player is "
-					"swimming down in a liquid");
-	Cmd_AddCommand ("-movedown", IN_DownRelease, "When active the player is "
-					"not swimming down in a liquid");
-	Cmd_AddCommand ("+left", IN_LeftPress, "When active the player is turning "
-					"left");
-	Cmd_AddCommand ("-left", IN_LeftRelease, "When active the player is not "
-					"turning left");
-	Cmd_AddCommand ("+right", IN_RightPress, "When active the player is "
-					"turning right");
-	Cmd_AddCommand ("-right", IN_RightRelease, "When active the player is not "
-					"turning right");
-	Cmd_AddCommand ("+forward", IN_ForwardPress, "When active the player is "
-					"moving forward");
-	Cmd_AddCommand ("-forward", IN_ForwardRelease, "When active the player is "
-					"not moving forward");
-	Cmd_AddCommand ("+back", IN_BackPress, "When active the player is moving "
-					"backwards");
-	Cmd_AddCommand ("-back", IN_BackRelease, "When active the player is not "
-					"moving backwards");
-	Cmd_AddCommand ("+lookup", IN_LookupPress, "When active the player's view "
-					"is looking up");
-	Cmd_AddCommand ("-lookup", IN_LookupRelease, "When active the player's "
-					"view is not looking up");
-	Cmd_AddCommand ("+lookdown", IN_LookdownPress, "When active the player's "
-					"view is looking down");
-	Cmd_AddCommand ("-lookdown", IN_LookdownRelease, "When active the "
-					"player's view is not looking up");
-	Cmd_AddCommand ("+strafe", IN_StrafePress, "When active, +left and +right "
-					"function like +moveleft and +moveright");
-	Cmd_AddCommand ("-strafe", IN_StrafeRelease, "When active, +left and "
-					"+right stop functioning like +moveleft and +moveright");
-	Cmd_AddCommand ("+moveleft", IN_MoveleftPress, "When active the player is "
-					"strafing left");
-	Cmd_AddCommand ("-moveleft", IN_MoveleftRelease, "When active the player "
-					"is not strafing left");
-	Cmd_AddCommand ("+moveright", IN_MoverightPress, "When active the player "
-					"is strafing right");
-	Cmd_AddCommand ("-moveright", IN_MoverightRelease, "When active the "
-					"player is not strafing right");
-	Cmd_AddCommand ("+speed", IN_SpeedPress, "When active the player is "
-					"running");
-	Cmd_AddCommand ("-speed", IN_SpeedRelease, "When active the player is not "
-					"running");
-	Cmd_AddCommand ("+attack", IN_AttackPress, "When active player is "
-					"firing/using current weapon");
-	Cmd_AddCommand ("-attack", IN_AttackRelease, "When active player is not "
-					"firing/using current weapon");
-	Cmd_AddCommand ("+use", IN_UsePress, "Non-functional. Left over command "
-					"for opening doors and triggering switches");
-	Cmd_AddCommand ("-use", IN_UseRelease, "Non-functional. Left over command "
-					"for opening doors and triggering switches");
-	Cmd_AddCommand ("+jump", IN_JumpPress, "When active the player is "
-					"jumping");
-	Cmd_AddCommand ("-jump", IN_JumpRelease, "When active the player is not "
-					"jumping");
-	Cmd_AddCommand ("impulse", IN_Impulse, "Call a game function or QuakeC "
-					"function.");
-	Cmd_AddCommand ("+klook", IN_KLookPress, "When active, +forward and +back "
-					"perform +lookup and +lookdown");
-	Cmd_AddCommand ("-klook", IN_KLookRelease, "When active, +forward and "
-					"+back don't perform +lookup and +lookdown");
-	Cmd_AddCommand ("+mlook", IN_MLookPress, "When active moving the mouse or "
-					"joystick forwards and backwards performs +lookup and "
-					"+lookdown");
-	Cmd_AddCommand ("-mlook", IN_MLookRelease, "When active moving the mouse "
-					"or joystick forwards and backwards doesn't perform "
-					"+lookup and +lookdown");
+	Cmd_AddDataCommand ("+moveup", KeyPress, &in_up,
+						"When active the player is swimming up in a liquid");
+	Cmd_AddDataCommand ("-moveup", KeyRelease, &in_up,
+						"When active the player is not swimming up in a "
+						"liquid");
+	Cmd_AddDataCommand ("+movedown", KeyPress, &in_down,
+						"When active the player is swimming down in a liquid");
+	Cmd_AddDataCommand ("-movedown", KeyRelease, &in_down,
+						"When active the player is not swimming down in a "
+						"liquid");
+	Cmd_AddDataCommand ("+left", KeyPress, &in_left,
+						"When active the player is turning left");
+	Cmd_AddDataCommand ("-left", KeyRelease, &in_left,
+						"When active the player is not turning left");
+	Cmd_AddDataCommand ("+right", KeyPress, &in_right,
+						"When active the player is turning right");
+	Cmd_AddDataCommand ("-right", KeyRelease, &in_right,
+						"When active the player is not turning right");
+	Cmd_AddDataCommand ("+forward", KeyPress, &in_forward,
+						"When active the player is moving forward");
+	Cmd_AddDataCommand ("-forward", KeyRelease, &in_forward,
+						"When active the player is not moving forward");
+	Cmd_AddDataCommand ("+back", KeyPress, &in_back,
+						"When active the player is moving backwards");
+	Cmd_AddDataCommand ("-back", KeyRelease, &in_back,
+						"When active the player is not moving backwards");
+	Cmd_AddDataCommand ("+lookup", KeyPress, &in_lookup,
+						"When active the player's view is looking up");
+	Cmd_AddDataCommand ("-lookup", KeyRelease, &in_lookup,
+						"When active the player's view is not looking up");
+	Cmd_AddDataCommand ("+lookdown", KeyPress, &in_lookdown,
+						"When active the player's view is looking down");
+	Cmd_AddDataCommand ("-lookdown", KeyRelease, &in_lookdown,
+						"When active the player's view is not looking up");
+	Cmd_AddDataCommand ("+strafe", KeyPress, &in_strafe,
+						"When active, +left and +right function like "
+						"+moveleft and +moveright");
+	Cmd_AddDataCommand ("-strafe", KeyRelease, &in_strafe,
+						"When active, +left and +right stop functioning like "
+						"+moveleft and +moveright");
+	Cmd_AddDataCommand ("+moveleft", KeyPress, &in_moveleft,
+						"When active the player is strafing left");
+	Cmd_AddDataCommand ("-moveleft", KeyRelease, &in_moveleft,
+						"When active the player is not strafing left");
+	Cmd_AddDataCommand ("+moveright", KeyPress, &in_moveright,
+						"When active the player is strafing right");
+	Cmd_AddDataCommand ("-moveright", KeyRelease, &in_moveright,
+						"When active the player is not strafing right");
+	Cmd_AddDataCommand ("+speed", KeyPress, &in_speed,
+						"When active the player is running");
+	Cmd_AddDataCommand ("-speed", KeyRelease, &in_speed,
+						"When active the player is not running");
+	Cmd_AddDataCommand ("+attack", KeyPress, &in_attack,
+						"When active player is firing/using current weapon");
+	Cmd_AddDataCommand ("-attack", KeyRelease, &in_attack,
+						"When active player is not firing/using current "
+						"weapon");
+	Cmd_AddDataCommand ("+use", KeyPress, &in_use,
+						"Non-functional. Left over command for opening doors "
+						"and triggering switches");
+	Cmd_AddDataCommand ("-use", KeyRelease, &in_use,
+						"Non-functional. Left over command for opening doors "
+						"and triggering switches");
+	Cmd_AddDataCommand ("+jump", KeyPress, &in_jump,
+						"When active the player is jumping");
+	Cmd_AddDataCommand ("-jump", KeyRelease, &in_jump,
+						"When active the player is not jumping");
+	Cmd_AddDataCommand ("impulse", IN_Impulse, 0,
+						"Call a game function or QuakeC function.");
+	Cmd_AddDataCommand ("+klook", KeyPress, &in_klook,
+						"When active, +forward and +back perform +lookup and "
+						"+lookdown");
+	Cmd_AddDataCommand ("-klook", KeyRelease, &in_klook,
+						"When active, +forward and +back don't perform "
+						"+lookup and +lookdown");
+	Cmd_AddDataCommand ("+mlook", KeyPress, &in_mlook,
+						"When active moving the mouse or joystick forwards "
+						"and backwards performs +lookup and "
+						"+lookdown");
+	Cmd_AddDataCommand ("-mlook", IN_MLookRelease, &in_mlook,
+						"When active moving the mouse or joystick forwards "
+						"and backwards doesn't perform +lookup and +lookdown");
 }
diff --git a/qw/source/cl_input.c b/qw/source/cl_input.c
index 7371c06cc..770e16358 100644
--- a/qw/source/cl_input.c
+++ b/qw/source/cl_input.c
@@ -89,8 +89,9 @@ int         in_impulse;
 
 
 static void
-KeyPress (kbutton_t *b)
+KeyPress (void *_b)
 {
+	kbutton_t  *b = _b;
 	const char *c;
 	int         k;
 
@@ -119,8 +120,9 @@ KeyPress (kbutton_t *b)
 }
 
 static void
-KeyRelease (kbutton_t *b)
+KeyRelease (void *_b)
 {
+	kbutton_t  *b = _b;
 	const char *c;
 	int         k;
 
@@ -153,25 +155,7 @@ KeyRelease (kbutton_t *b)
 }
 
 static void
-IN_KLookPress (void)
-{
-	KeyPress (&in_klook);
-}
-
-static void
-IN_KLookRelease (void)
-{
-	KeyRelease (&in_klook);
-}
-
-static void
-IN_MLookPress (void)
-{
-	KeyPress (&in_mlook);
-}
-
-static void
-IN_MLookRelease (void)
+IN_MLookRelease (void *data)
 {
 	KeyRelease (&in_mlook);
 	if (!freelook && lookspring->int_val)
@@ -179,187 +163,7 @@ IN_MLookRelease (void)
 }
 
 static void
-IN_UpPress (void)
-{
-	KeyPress (&in_up);
-}
-
-static void
-IN_UpRelease (void)
-{
-	KeyRelease (&in_up);
-}
-
-static void
-IN_DownPress (void)
-{
-	KeyPress (&in_down);
-}
-
-static void
-IN_DownRelease (void)
-{
-	KeyRelease (&in_down);
-}
-
-static void
-IN_LeftPress (void)
-{
-	KeyPress (&in_left);
-}
-
-static void
-IN_LeftRelease (void)
-{
-	KeyRelease (&in_left);
-}
-
-static void
-IN_RightPress (void)
-{
-	KeyPress (&in_right);
-}
-
-static void
-IN_RightRelease (void)
-{
-	KeyRelease (&in_right);
-}
-
-static void
-IN_ForwardPress (void)
-{
-	KeyPress (&in_forward);
-}
-
-static void
-IN_ForwardRelease (void)
-{
-	KeyRelease (&in_forward);
-}
-
-static void
-IN_BackPress (void)
-{
-	KeyPress (&in_back);
-}
-
-static void
-IN_BackRelease (void)
-{
-	KeyRelease (&in_back);
-}
-
-static void
-IN_LookupPress (void)
-{
-	KeyPress (&in_lookup);
-}
-
-static void
-IN_LookupRelease (void)
-{
-	KeyRelease (&in_lookup);
-}
-
-static void
-IN_LookdownPress (void)
-{
-	KeyPress (&in_lookdown);
-}
-
-static void
-IN_LookdownRelease (void)
-{
-	KeyRelease (&in_lookdown);
-}
-
-static void
-IN_MoveleftPress (void)
-{
-	KeyPress (&in_moveleft);
-}
-
-static void
-IN_MoveleftRelease (void)
-{
-	KeyRelease (&in_moveleft);
-}
-
-static void
-IN_MoverightPress (void)
-{
-	KeyPress (&in_moveright);
-}
-
-static void
-IN_MoverightRelease (void)
-{
-	KeyRelease (&in_moveright);
-}
-
-static void
-IN_SpeedPress (void)
-{
-	KeyPress (&in_speed);
-}
-
-static void
-IN_SpeedRelease (void)
-{
-	KeyRelease (&in_speed);
-}
-
-static void
-IN_StrafePress (void)
-{
-	KeyPress (&in_strafe);
-}
-
-static void
-IN_StrafeRelease (void)
-{
-	KeyRelease (&in_strafe);
-}
-
-static void
-IN_AttackPress (void)
-{
-	KeyPress (&in_attack);
-}
-
-static void
-IN_AttackRelease (void)
-{
-	KeyRelease (&in_attack);
-}
-
-static void
-IN_UsePress (void)
-{
-	KeyPress (&in_use);
-}
-
-static void
-IN_UseRelease (void)
-{
-	KeyRelease (&in_use);
-}
-
-static void
-IN_JumpPress (void)
-{
-	KeyPress (&in_jump);
-}
-
-static void
-IN_JumpRelease (void)
-{
-	KeyRelease (&in_jump);
-}
-
-static void
-IN_Impulse (void)
+IN_Impulse (void *data)
 {
 	in_impulse = atoi (Cmd_Argv (1));
 	if (Cmd_Argc () <= 2)
@@ -772,78 +576,88 @@ CL_SendCmd (void)
 void
 CL_Input_Init (void)
 {
-	Cmd_AddCommand ("+moveup", IN_UpPress, "When active the player is "
-					"swimming up in a liquid");
-	Cmd_AddCommand ("-moveup", IN_UpRelease, "When active the player is not "
-					"swimming up in a liquid");
-	Cmd_AddCommand ("+movedown", IN_DownPress, "When active the player is "
-					"swimming down in a liquid");
-	Cmd_AddCommand ("-movedown", IN_DownRelease, "When active the player is "
-					"not swimming down in a liquid");
-	Cmd_AddCommand ("+left", IN_LeftPress, "When active the player is turning "
-					"left");
-	Cmd_AddCommand ("-left", IN_LeftRelease, "When active the player is not "
-					"turning left");
-	Cmd_AddCommand ("+right", IN_RightPress, "When active the player is "
-					"turning right");
-	Cmd_AddCommand ("-right", IN_RightRelease, "When active the player is not "
-					"turning right");
-	Cmd_AddCommand ("+forward", IN_ForwardPress, "When active the player is "
-					"moving forward");
-	Cmd_AddCommand ("-forward", IN_ForwardRelease, "When active the player is "
-					"not moving forward");
-	Cmd_AddCommand ("+back", IN_BackPress, "When active the player is moving "
-					"backwards");
-	Cmd_AddCommand ("-back", IN_BackRelease, "When active the player is not "
-					"moving backwards");
-	Cmd_AddCommand ("+lookup", IN_LookupPress, "When active the player's view "
-					"is looking up");
-	Cmd_AddCommand ("-lookup", IN_LookupRelease, "When active the player's "
-					"view is not looking up");
-	Cmd_AddCommand ("+lookdown", IN_LookdownPress, "When active the player's "
-					"view is looking down");
-	Cmd_AddCommand ("-lookdown", IN_LookdownRelease, "When active the "
-					"player's view is not looking up");
-	Cmd_AddCommand ("+strafe", IN_StrafePress, "When active, +left and +right "
-					"function like +moveleft and +moveright");
-	Cmd_AddCommand ("-strafe", IN_StrafeRelease, "When active, +left and "
-					"+right stop functioning like +moveleft and +moveright");
-	Cmd_AddCommand ("+moveleft", IN_MoveleftPress, "When active the player is "
-					"strafing left");
-	Cmd_AddCommand ("-moveleft", IN_MoveleftRelease, "When active the player "
-					"is not strafing left");
-	Cmd_AddCommand ("+moveright", IN_MoverightPress, "When active the player "
-					"is strafing right");
-	Cmd_AddCommand ("-moveright", IN_MoverightRelease, "When active the "
-					"player is not strafing right");
-	Cmd_AddCommand ("+speed", IN_SpeedPress, "When active the player is "
-					"running");
-	Cmd_AddCommand ("-speed", IN_SpeedRelease, "When active the player is not "
-					"running");
-	Cmd_AddCommand ("+attack", IN_AttackPress, "When active player is "
-					"firing/using current weapon");
-	Cmd_AddCommand ("-attack", IN_AttackRelease, "When active player is not "
-					"firing/using current weapon");
-	Cmd_AddCommand ("+use", IN_UsePress, "Non-functional. Left over command "
-					"for opening doors and triggering switches");
-	Cmd_AddCommand ("-use", IN_UseRelease, "Non-functional. Left over command "
-					"for opening doors and triggering switches");
-	Cmd_AddCommand ("+jump", IN_JumpPress, "When active the player is "
-					"jumping");
-	Cmd_AddCommand ("-jump", IN_JumpRelease, "When active the player is not "
-					"jumping");
-	Cmd_AddCommand ("impulse", IN_Impulse, "Call a game function or QuakeC "
-					"function.");
-	Cmd_AddCommand ("+klook", IN_KLookPress, "When active, +forward and +back "
-					"perform +lookup and +lookdown");
-	Cmd_AddCommand ("-klook", IN_KLookRelease, "When active, +forward and "
-					"+back don't perform +lookup and +lookdown");
-	Cmd_AddCommand ("+mlook", IN_MLookPress, "When active moving the mouse or "
-					"joystick forwards and backwards performs +lookup and "
-					"+lookdown");
-	Cmd_AddCommand ("-mlook", IN_MLookRelease, "When active moving the mouse "
-					"or joystick forwards and backwards doesn't perform "
-					"+lookup and +lookdown");
+	Cmd_AddDataCommand ("+moveup", KeyPress, &in_up,
+						"When active the player is swimming up in a liquid");
+	Cmd_AddDataCommand ("-moveup", KeyRelease, &in_up,
+						"When active the player is not swimming up in a "
+						"liquid");
+	Cmd_AddDataCommand ("+movedown", KeyPress, &in_down,
+						"When active the player is swimming down in a liquid");
+	Cmd_AddDataCommand ("-movedown", KeyRelease, &in_down,
+						"When active the player is not swimming down in a "
+						"liquid");
+	Cmd_AddDataCommand ("+left", KeyPress, &in_left,
+						"When active the player is turning left");
+	Cmd_AddDataCommand ("-left", KeyRelease, &in_left,
+						"When active the player is not turning left");
+	Cmd_AddDataCommand ("+right", KeyPress, &in_right,
+						"When active the player is turning right");
+	Cmd_AddDataCommand ("-right", KeyRelease, &in_right,
+						"When active the player is not turning right");
+	Cmd_AddDataCommand ("+forward", KeyPress, &in_forward,
+						"When active the player is moving forward");
+	Cmd_AddDataCommand ("-forward", KeyRelease, &in_forward,
+						"When active the player is not moving forward");
+	Cmd_AddDataCommand ("+back", KeyPress, &in_back,
+						"When active the player is moving backwards");
+	Cmd_AddDataCommand ("-back", KeyRelease, &in_back,
+						"When active the player is not moving backwards");
+	Cmd_AddDataCommand ("+lookup", KeyPress, &in_lookup,
+						"When active the player's view is looking up");
+	Cmd_AddDataCommand ("-lookup", KeyRelease, &in_lookup,
+						"When active the player's view is not looking up");
+	Cmd_AddDataCommand ("+lookdown", KeyPress, &in_lookdown,
+						"When active the player's view is looking down");
+	Cmd_AddDataCommand ("-lookdown", KeyRelease, &in_lookdown,
+						"When active the player's view is not looking up");
+	Cmd_AddDataCommand ("+strafe", KeyPress, &in_strafe,
+						"When active, +left and +right function like "
+						"+moveleft and +moveright");
+	Cmd_AddDataCommand ("-strafe", KeyRelease, &in_strafe,
+						"When active, +left and +right stop functioning like "
+						"+moveleft and +moveright");
+	Cmd_AddDataCommand ("+moveleft", KeyPress, &in_moveleft,
+						"When active the player is strafing left");
+	Cmd_AddDataCommand ("-moveleft", KeyRelease, &in_moveleft,
+						"When active the player is not strafing left");
+	Cmd_AddDataCommand ("+moveright", KeyPress, &in_moveright,
+						"When active the player is strafing right");
+	Cmd_AddDataCommand ("-moveright", KeyRelease, &in_moveright,
+						"When active the player is not strafing right");
+	Cmd_AddDataCommand ("+speed", KeyPress, &in_speed,
+						"When active the player is running");
+	Cmd_AddDataCommand ("-speed", KeyRelease, &in_speed,
+						"When active the player is not running");
+	Cmd_AddDataCommand ("+attack", KeyPress, &in_attack,
+						"When active player is firing/using current weapon");
+	Cmd_AddDataCommand ("-attack", KeyRelease, &in_attack,
+						"When active player is not firing/using current "
+						"weapon");
+	Cmd_AddDataCommand ("+use", KeyPress, &in_use,
+						"Non-functional. Left over command for opening doors "
+						"and triggering switches");
+	Cmd_AddDataCommand ("-use", KeyRelease, &in_use,
+						"Non-functional. Left over command for opening doors "
+						"and triggering switches");
+	Cmd_AddDataCommand ("+jump", KeyPress, &in_jump,
+						"When active the player is jumping");
+	Cmd_AddDataCommand ("-jump", KeyRelease, &in_jump,
+						"When active the player is not jumping");
+	Cmd_AddDataCommand ("impulse", IN_Impulse, 0,
+						"Call a game function or QuakeC function.");
+	Cmd_AddDataCommand ("+klook", KeyPress, &in_klook,
+						"When active, +forward and +back perform +lookup and "
+						"+lookdown");
+	Cmd_AddDataCommand ("-klook", KeyRelease, &in_klook,
+						"When active, +forward and +back don't perform "
+						"+lookup and +lookdown");
+	Cmd_AddDataCommand ("+mlook", KeyPress, &in_mlook,
+						"When active moving the mouse or joystick forwards "
+						"and backwards performs +lookup and "
+						"+lookdown");
+	Cmd_AddDataCommand ("-mlook", IN_MLookRelease, &in_mlook,
+						"When active moving the mouse or joystick forwards "
+						"and backwards doesn't perform +lookup and +lookdown");
 }
 
 void

From e3444b726f8f4ecd5320a793481e0c1e653f6c54 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 20 Mar 2021 12:00:40 +0900
Subject: [PATCH 1487/1519] [model] Add a re-entrant Mod_LeafPVS

Double benefit, actually: faster when building a fat PVS (don't need to
copy as much) and can be used in multiple threads. Also, default visiblity
can be set, and the buffer size has its own macro.
---
 include/QF/bspfile.h            |  2 ++
 include/QF/model.h              |  7 ++++++-
 libs/models/brush/model_brush.c | 36 +++++++++++++++++++++------------
 nq/source/sv_main.c             |  2 +-
 nq/source/sv_pr_cmds.c          |  2 +-
 qw/source/sv_ents.c             |  2 +-
 qw/source/sv_pr_cmds.c          |  2 +-
 tools/qfvis/source/qfvis.c      |  2 +-
 8 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/include/QF/bspfile.h b/include/QF/bspfile.h
index 0d32c09e8..27648f297 100644
--- a/include/QF/bspfile.h
+++ b/include/QF/bspfile.h
@@ -42,6 +42,8 @@
 #define MAX_MAP_FACES			65535	// format limit (u16)
 #define MAX_MAP_MARKSURFACES	65535	// format limit (u16)
 
+#define MAP_PVS_BYTES (MAX_MAP_LEAFS / 8)
+
 //=============================================================================
 
 #define BSPVERSION		29
diff --git a/include/QF/model.h b/include/QF/model.h
index b65a5ad18..0a7069d3f 100644
--- a/include/QF/model.h
+++ b/include/QF/model.h
@@ -432,7 +432,12 @@ model_t *Mod_ForName (const char *name, qboolean crash);
 void Mod_TouchModel (const char *name);
 // brush specific
 mleaf_t *Mod_PointInLeaf (const vec3_t p, model_t *model) __attribute__((pure));
-byte *Mod_LeafPVS (mleaf_t *leaf, model_t *model);
+byte *Mod_LeafPVS (const mleaf_t *leaf, const model_t *model);
+
+// NOTE: the buffer pointed to by out must be at least MAP_PVS_BYTES in size
+void Mod_LeafPVS_r (const mleaf_t *leaf, const model_t *model, byte defvis,
+					byte *out);
+
 void Mod_Print (void);
 
 extern struct cvar_s *gl_mesh_cache;
diff --git a/libs/models/brush/model_brush.c b/libs/models/brush/model_brush.c
index b18de9076..6270de72b 100644
--- a/libs/models/brush/model_brush.c
+++ b/libs/models/brush/model_brush.c
@@ -55,7 +55,7 @@
 #include "compat.h"
 #include "mod_internal.h"
 
-static byte mod_novis[MAX_MAP_LEAFS / 8];
+static byte mod_novis[MAP_PVS_BYTES];
 
 VISIBLE cvar_t		*gl_sky_divide; //FIXME visibility?
 VISIBLE int   mod_lightmap_bytes = 1;	//FIXME should this be visible?
@@ -85,22 +85,21 @@ Mod_PointInLeaf (const vec3_t p, model_t *model)
 	return NULL;						// never reached
 }
 
-static inline byte *
-Mod_DecompressVis (byte * in, mod_brush_t *brush)
+static inline void
+Mod_DecompressVis (const byte *in, const mod_brush_t *brush, byte defvis,
+				   byte *out)
 {
-	static byte decompressed[MAX_MAP_LEAFS / 8];
-	byte       *out;
+	byte       *start = out;
 	int			row, c;
 
 	row = (brush->numleafs + 7) >> 3;
-	out = decompressed;
 
 	if (!in) {							// no vis info, so make all visible
 		while (row) {
-			*out++ = 0xff;
+			*out++ = defvis;
 			row--;
 		}
-		return decompressed;
+		return;
 	}
 
 	do {
@@ -115,21 +114,32 @@ Mod_DecompressVis (byte * in, mod_brush_t *brush)
 			*out++ = 0;
 			c--;
 		}
-	} while (out - decompressed < row);
-
-	return decompressed;
+	} while (out - start < row);
 }
 
 VISIBLE byte *
-Mod_LeafPVS (mleaf_t *leaf, model_t *model)
+Mod_LeafPVS (const mleaf_t *leaf, const model_t *model)
 {
+	static byte decompressed[MAP_PVS_BYTES];
 	if (leaf == model->brush.leafs) {
 		if (!mod_novis[0]) {
 			memset (mod_novis, 0xff, sizeof (mod_novis));
 		}
 		return mod_novis;
 	}
-	return Mod_DecompressVis (leaf->compressed_vis, &model->brush);
+	Mod_DecompressVis (leaf->compressed_vis, &model->brush, 0xff, decompressed);
+	return decompressed;
+}
+
+VISIBLE void
+Mod_LeafPVS_r (const mleaf_t *leaf, const model_t *model, byte defvis,
+			   byte *out)
+{
+	if (leaf == model->brush.leafs) {
+		memset (out, defvis, sizeof (mod_novis));
+		return;
+	}
+	return Mod_DecompressVis (leaf->compressed_vis, &model->brush, defvis, out);
 }
 
 // BRUSHMODEL LOADING =========================================================
diff --git a/nq/source/sv_main.c b/nq/source/sv_main.c
index d8a98b5b4..7d486f24b 100644
--- a/nq/source/sv_main.c
+++ b/nq/source/sv_main.c
@@ -389,7 +389,7 @@ SV_ClearDatagram (void)
 */
 
 int         fatbytes;
-byte        fatpvs[MAX_MAP_LEAFS / 8];
+byte        fatpvs[MAP_PVS_BYTES];
 
 static void
 SV_AddToFatPVS (vec3_t org, mnode_t *node)
diff --git a/nq/source/sv_pr_cmds.c b/nq/source/sv_pr_cmds.c
index 096010f77..0489b4f4c 100644
--- a/nq/source/sv_pr_cmds.c
+++ b/nq/source/sv_pr_cmds.c
@@ -539,7 +539,7 @@ PF_checkpos (progs_t *pr)
 {
 }
 
-byte        checkpvs[MAX_MAP_LEAFS / 8];
+byte        checkpvs[MAP_PVS_BYTES];
 
 static int
 PF_newcheckclient (progs_t *pr, int check)
diff --git a/qw/source/sv_ents.c b/qw/source/sv_ents.c
index ccbf9278b..5538de54b 100644
--- a/qw/source/sv_ents.c
+++ b/qw/source/sv_ents.c
@@ -54,7 +54,7 @@
 	when the bob crosses a waterline.
 */
 
-byte		fatpvs[MAX_MAP_LEAFS / 8];
+byte		fatpvs[MAP_PVS_BYTES];
 int			fatbytes;
 
 
diff --git a/qw/source/sv_pr_cmds.c b/qw/source/sv_pr_cmds.c
index b8dc58de0..b30664a76 100644
--- a/qw/source/sv_pr_cmds.c
+++ b/qw/source/sv_pr_cmds.c
@@ -460,7 +460,7 @@ PF_checkpos (progs_t *pr)
 {
 }
 
-byte        checkpvs[MAX_MAP_LEAFS / 8];
+byte        checkpvs[MAP_PVS_BYTES];
 
 static int
 PF_newcheckclient (progs_t *pr, int check)
diff --git a/tools/qfvis/source/qfvis.c b/tools/qfvis/source/qfvis.c
index 9ffb09e35..c62eabbcc 100644
--- a/tools/qfvis/source/qfvis.c
+++ b/tools/qfvis/source/qfvis.c
@@ -613,7 +613,7 @@ void
 ClusterFlow (int clusternum)
 {
 	set_t      *visclusters;
-	byte        compressed[MAX_MAP_LEAFS / 8];
+	byte        compressed[MAP_PVS_BYTES];
 	byte       *outbuffer;
 	int         numvis, i;
 	cluster_t  *cluster;

From e0eacf401451860d86a32c3c54190f65d5adb1e1 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 20 Mar 2021 16:06:15 +0900
Subject: [PATCH 1488/1519] [model] Make set and mix versions of Mod_LeafPVS

The re-entrant version was a good start, but being able to mix while
decompressing saves having to have a temporary buffer somewhere.
---
 include/QF/model.h              |  6 ++--
 libs/models/brush/model_brush.c | 57 +++++++++++++++++++++++++++++----
 2 files changed, 55 insertions(+), 8 deletions(-)

diff --git a/include/QF/model.h b/include/QF/model.h
index 0a7069d3f..1c5969820 100644
--- a/include/QF/model.h
+++ b/include/QF/model.h
@@ -435,8 +435,10 @@ mleaf_t *Mod_PointInLeaf (const vec3_t p, model_t *model) __attribute__((pure));
 byte *Mod_LeafPVS (const mleaf_t *leaf, const model_t *model);
 
 // NOTE: the buffer pointed to by out must be at least MAP_PVS_BYTES in size
-void Mod_LeafPVS_r (const mleaf_t *leaf, const model_t *model, byte defvis,
-					byte *out);
+void Mod_LeafPVS_set (const mleaf_t *leaf, const model_t *model, byte defvis,
+					  byte *out);
+void Mod_LeafPVS_mix (const mleaf_t *leaf, const model_t *model, byte defvis,
+					  byte *out);
 
 void Mod_Print (void);
 
diff --git a/libs/models/brush/model_brush.c b/libs/models/brush/model_brush.c
index 6270de72b..1e2fa81a4 100644
--- a/libs/models/brush/model_brush.c
+++ b/libs/models/brush/model_brush.c
@@ -86,8 +86,8 @@ Mod_PointInLeaf (const vec3_t p, model_t *model)
 }
 
 static inline void
-Mod_DecompressVis (const byte *in, const mod_brush_t *brush, byte defvis,
-				   byte *out)
+Mod_DecompressVis_set (const byte *in, const mod_brush_t *brush, byte defvis,
+					   byte *out)
 {
 	byte       *start = out;
 	int			row, c;
@@ -117,6 +117,35 @@ Mod_DecompressVis (const byte *in, const mod_brush_t *brush, byte defvis,
 	} while (out - start < row);
 }
 
+static inline void
+Mod_DecompressVis_mix (const byte *in, const mod_brush_t *brush, byte defvis,
+					   byte *out)
+{
+	byte       *start = out;
+	int			row, c;
+
+	row = (brush->numleafs + 7) >> 3;
+
+	if (!in) {							// no vis info, so make all visible
+		while (row) {
+			*out++ |= defvis;
+			row--;
+		}
+		return;
+	}
+
+	do {
+		if (*in) {
+			*out++ |= *in++;
+			continue;
+		}
+
+		c = in[1];
+		in += 2;
+		out += c;
+	} while (out - start < row);
+}
+
 VISIBLE byte *
 Mod_LeafPVS (const mleaf_t *leaf, const model_t *model)
 {
@@ -127,19 +156,35 @@ Mod_LeafPVS (const mleaf_t *leaf, const model_t *model)
 		}
 		return mod_novis;
 	}
-	Mod_DecompressVis (leaf->compressed_vis, &model->brush, 0xff, decompressed);
+	Mod_DecompressVis_set (leaf->compressed_vis, &model->brush, 0xff,
+						   decompressed);
 	return decompressed;
 }
 
 VISIBLE void
-Mod_LeafPVS_r (const mleaf_t *leaf, const model_t *model, byte defvis,
-			   byte *out)
+Mod_LeafPVS_set (const mleaf_t *leaf, const model_t *model, byte defvis,
+				 byte *out)
 {
 	if (leaf == model->brush.leafs) {
 		memset (out, defvis, sizeof (mod_novis));
 		return;
 	}
-	return Mod_DecompressVis (leaf->compressed_vis, &model->brush, defvis, out);
+	return Mod_DecompressVis_set (leaf->compressed_vis, &model->brush, defvis,
+								  out);
+}
+
+VISIBLE void
+Mod_LeafPVS_mix (const mleaf_t *leaf, const model_t *model, byte defvis,
+				 byte *out)
+{
+	if (leaf == model->brush.leafs) {
+		for (int i = MAP_PVS_BYTES; i-- > 0; ) {
+			*out++ |= defvis;
+		}
+		return;
+	}
+	return Mod_DecompressVis_mix (leaf->compressed_vis, &model->brush, defvis,
+								  out);
 }
 
 // BRUSHMODEL LOADING =========================================================

From bab3e0720f82be00deb828c4feb8c82b036f90a6 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 20 Mar 2021 16:08:44 +0900
Subject: [PATCH 1489/1519] [vulkan] Implement real-time lighting

Light styles and shadows aren't implemented yet.

The map's entities are used to create the lights, and the PVS used to
determine which lights might be visible (ie, the surfaces they light).
That could do with some more improvements (eg, checking if a leaf is
outside a spotlight's cone), but the concept seems to work.
---
 include/QF/Vulkan/qf_lighting.h               | 13 ++-
 libs/video/renderer/vulkan/qfpipeline.plist   |  6 ++
 .../renderer/vulkan/shader/lighting.frag      | 10 +--
 libs/video/renderer/vulkan/vulkan_lighting.c  | 86 +++++++++++++++++--
 libs/video/renderer/vulkan/vulkan_main.c      |  2 +-
 5 files changed, 104 insertions(+), 13 deletions(-)

diff --git a/include/QF/Vulkan/qf_lighting.h b/include/QF/Vulkan/qf_lighting.h
index cd9e7d46c..c19f6ae80 100644
--- a/include/QF/Vulkan/qf_lighting.h
+++ b/include/QF/Vulkan/qf_lighting.h
@@ -46,8 +46,10 @@ typedef struct qfv_light_s {
 } qfv_light_t;
 
 typedef struct qfv_lightset_s DARRAY_TYPE (qfv_light_t) qfv_lightset_t;
+typedef struct qfv_lightleafset_s DARRAY_TYPE (int) qfv_lightleafset_t;
+typedef struct qfv_lightvisset_s DARRAY_TYPE (byte) qfv_lightvisset_t;
 
-#define NUM_LIGHTS 128
+#define NUM_LIGHTS 256
 
 typedef struct qfv_light_buffer_s {
 	int         lightCount;
@@ -64,6 +66,11 @@ typedef struct lightingframe_s {
 	VkDescriptorImageInfo imageInfo[LIGHTING_IMAGE_INFOS];
 	VkWriteDescriptorSet descriptors[LIGHTING_BUFFER_INFOS
 									 + LIGHTING_IMAGE_INFOS];
+	// A fat PVS of leafs visible from visible leafs so hidden lights can
+	// illuminate the leafs visible to the player
+	byte        pvs[MAP_PVS_BYTES];
+	struct mleaf_s *leaf;	// the last leaf used to generate the pvs
+	qfv_lightleafset_t lightvis;
 } lightingframe_t;
 
 typedef struct lightingframeset_s
@@ -75,6 +82,7 @@ typedef struct lightingctx_s {
 	VkPipelineLayout layout;
 	VkDeviceMemory light_memory;
 	qfv_lightset_t lights;
+	qfv_lightleafset_t lightleafs;
 } lightingctx_t;
 
 struct vulkan_ctx_s;
@@ -82,6 +90,7 @@ struct vulkan_ctx_s;
 void Vulkan_Lighting_Init (struct vulkan_ctx_s *ctx);
 void Vulkan_Lighting_Shutdown (struct vulkan_ctx_s *ctx);
 void Vulkan_Lighting_Draw (struct vulkan_ctx_s *ctx);
-void Vulkan_LoadLights (const char *entity_data, struct vulkan_ctx_s *ctx);
+void Vulkan_LoadLights (model_t *model, const char *entity_data,
+						struct vulkan_ctx_s *ctx);
 
 #endif//__QF_Vulkan_qf_lighting_h
diff --git a/libs/video/renderer/vulkan/qfpipeline.plist b/libs/video/renderer/vulkan/qfpipeline.plist
index 536c98a05..523edfbad 100644
--- a/libs/video/renderer/vulkan/qfpipeline.plist
+++ b/libs/video/renderer/vulkan/qfpipeline.plist
@@ -856,6 +856,12 @@
 					stage = fragment;
 					name = main;
 					module = $builtin/lighting.frag;
+					specializationInfo = {
+						mapEntries = (
+							{ size = 4; offset = 0; constantID = 0; },
+						);
+						data = <00000100>;
+					};
 				},
 			);
 			vertexInput = {
diff --git a/libs/video/renderer/vulkan/shader/lighting.frag b/libs/video/renderer/vulkan/shader/lighting.frag
index 7468e4dec..c48f54a2f 100644
--- a/libs/video/renderer/vulkan/shader/lighting.frag
+++ b/libs/video/renderer/vulkan/shader/lighting.frag
@@ -26,15 +26,15 @@ vec3
 calc_light (LightData light, vec3 position, vec3 normal)
 {
 	vec3        dist = light.position - position;
-	vec3        incoming = normalize (dist);
-	float       spotdot = -dot (incoming, light.direction);
-	float       lightdot = dot (incoming, normal);
 	float       d = sqrt (dot (dist, dist));
+	vec3        incoming = dist / d;
+	float       spotdot = dot (incoming, light.direction);
+	float       lightdot = dot (incoming, normal);
 	float       r = light.radius;
 
 	float       intensity = light.intensity * step (d, r);
 	intensity *= step (spotdot, light.cone) * clamp (lightdot, 0, 1);
-	return light.color * intensity * (r - d);
+	return light.color * intensity * (r - d) / 255.0;
 }
 
 void
@@ -44,7 +44,7 @@ main (void)
 	vec3        c = subpassLoad (color).rgb;
 	vec3        n = subpassLoad (normal).rgb;
 	vec3        p = subpassLoad (position).rgb;
-	vec3        light = vec3 (0.8);
+	vec3        light = vec3 (0);
 
 	if (MaxLights > 0) {
 		for (int i = 0; i < lightCount; i++) {
diff --git a/libs/video/renderer/vulkan/vulkan_lighting.c b/libs/video/renderer/vulkan/vulkan_lighting.c
index 07f0f9927..4df8475c7 100644
--- a/libs/video/renderer/vulkan/vulkan_lighting.c
+++ b/libs/video/renderer/vulkan/vulkan_lighting.c
@@ -61,6 +61,51 @@
 #include "r_internal.h"
 #include "vid_vulkan.h"
 
+static void
+find_visible_lights (vulkan_ctx_t *ctx)
+{
+	//qfv_device_t *device = ctx->device;
+	//qfv_devfuncs_t *dfunc = device->funcs;
+	lightingctx_t *lctx = ctx->lighting_context;
+	lightingframe_t *lframe = &lctx->frames.a[ctx->curFrame];
+
+	mleaf_t    *leaf = r_viewleaf;
+	model_t    *model = r_worldentity.renderer.model;
+
+	if (!leaf || !model) {
+		return;
+	}
+
+	if (leaf != lframe->leaf) {
+		double start = Sys_DoubleTime ();
+		byte        pvs[MAP_PVS_BYTES];
+
+		Mod_LeafPVS_set (leaf, model, 0, pvs);
+		memcpy (lframe->pvs, pvs, sizeof (pvs));
+		for (int i = 0; i < model->brush.numleafs; i++) {
+			if (pvs[i / 8] & (1 << (i % 8))) {
+				Mod_LeafPVS_mix (model->brush.leafs + i, model, 0, lframe->pvs);
+			}
+		}
+		lframe->leaf = leaf;
+
+		double end = Sys_DoubleTime ();
+		Sys_Printf ("find_visible_lights: %.5gus\n", (end - start) * 1e6);
+
+		int visible = 0;
+		memset (lframe->lightvis.a, 0, lframe->lightvis.size * sizeof (byte));
+		for (size_t i = 0; i < lctx->lightleafs.size; i++) {
+			int         l = lctx->lightleafs.a[i];
+			if (lframe->pvs[l / 8] & (1 << (l % 8))) {
+				lframe->lightvis.a[i] = 1;
+				visible++;
+			}
+		}
+		Sys_Printf ("find_visible_lights: %d / %zd visible\n", visible,
+					 lframe->lightvis.size);
+	}
+}
+
 static void
 update_lights (vulkan_ctx_t *ctx)
 {
@@ -69,6 +114,8 @@ update_lights (vulkan_ctx_t *ctx)
 	lightingctx_t *lctx = ctx->lighting_context;
 	lightingframe_t *lframe = &lctx->frames.a[ctx->curFrame];
 
+	find_visible_lights (ctx);
+
 	dlight_t   *lights[NUM_LIGHTS];
 	qfv_packet_t *packet = QFV_PacketAcquire (ctx->staging);
 	qfv_light_buffer_t *light_data = QFV_PacketExtend (packet,
@@ -88,6 +135,12 @@ update_lights (vulkan_ctx_t *ctx)
 		VectorZero (light_data->lights[i].direction);
 		light_data->lights[i].cone = 1;
 	}
+	for (size_t i = 0;
+		 i < lframe->lightvis.size && light_data->lightCount < NUM_LIGHTS; i++) {
+		if (lframe->lightvis.a[i]) {
+			light_data->lights[light_data->lightCount++] = lctx->lights.a[i];
+		}
+	}
 
 	VkBufferMemoryBarrier wr_barriers[] = {
 		{   VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER, 0,
@@ -208,6 +261,7 @@ Vulkan_Lighting_Init (vulkan_ctx_t *ctx)
 	ctx->lighting_context = lctx;
 
 	DARRAY_INIT (&lctx->lights, 16);
+	DARRAY_INIT (&lctx->lightleafs, 16);
 
 	size_t      frames = ctx->frames.size;
 	DARRAY_INIT (&lctx->frames, frames);
@@ -258,6 +312,8 @@ Vulkan_Lighting_Init (vulkan_ctx_t *ctx)
 	for (size_t i = 0; i < frames; i++) {
 		__auto_type lframe = &lctx->frames.a[i];
 
+		DARRAY_INIT (&lframe->lightvis, 16);
+
 		QFV_AllocateCommandBuffers (device, ctx->cmdpool, 1, cmdSet);
 		lframe->cmd = cmdSet->a[0];
 
@@ -298,10 +354,12 @@ Vulkan_Lighting_Shutdown (vulkan_ctx_t *ctx)
 	for (size_t i = 0; i < lctx->frames.size; i++) {
 		lightingframe_t *lframe = &lctx->frames.a[i];
 		dfunc->vkDestroyBuffer (device->dev, lframe->light_buffer, 0);
+		DARRAY_CLEAR (&lframe->lightvis);
 	}
 	dfunc->vkFreeMemory (device->dev, lctx->light_memory, 0);
 	dfunc->vkDestroyPipeline (device->dev, lctx->pipeline, 0);
 	DARRAY_CLEAR (&lctx->lights);
+	DARRAY_CLEAR (&lctx->lightleafs);
 	free (lctx->frames.a);
 	free (lctx);
 }
@@ -312,6 +370,14 @@ parse_light (qfv_light_t *light, const plitem_t *entity,
 {
 	const char *str;
 
+	Sys_Printf ("{\n");
+	for (int i = PL_D_NumKeys (entity); i-- > 0; ) {
+		const char *field = PL_KeyAtIndex (entity, i);
+		const char *value = PL_String (PL_ObjectForKey (entity, field));
+		Sys_Printf ("\t%s = %s\n", field, value);
+	}
+	Sys_Printf ("}\n");
+
 	if ((str = PL_String (PL_ObjectForKey (entity, "origin")))) {
 		sscanf (str, "%f %f %f", VectorExpandAddr (light->position));
 	}
@@ -336,7 +402,7 @@ parse_light (qfv_light_t *light, const plitem_t *entity,
 	}
 
 	light->intensity = 1;
-	if ((str = PL_String (PL_ObjectForKey (entity, "light")))
+	if ((str = PL_String (PL_ObjectForKey (entity, "light_lev")))
 		|| (str = PL_String (PL_ObjectForKey (entity, "_light")))) {
 		light->radius = atof (str);
 	}
@@ -345,12 +411,13 @@ parse_light (qfv_light_t *light, const plitem_t *entity,
 }
 
 void
-Vulkan_LoadLights (const char *entity_data, vulkan_ctx_t *ctx)
+Vulkan_LoadLights (model_t *model, const char *entity_data, vulkan_ctx_t *ctx)
 {
 	lightingctx_t *lctx = ctx->lighting_context;
 	plitem_t   *entities = 0;
 
 	lctx->lights.size = 0;
+	lctx->lightleafs.size = 0;
 
 	script_t   *script = Script_New ();
 	Script_Start (script, "ent data", entity_data);
@@ -389,13 +456,22 @@ Vulkan_LoadLights (const char *entity_data, vulkan_ctx_t *ctx)
 				qfv_light_t light = {};
 
 				parse_light (&light, entity, targets);
-				printf ("[%g, %g, %g] %g, [%g %g %g] %g, [%g %g %g] %g\n",
+				DARRAY_APPEND (&lctx->lights, light);
+				mleaf_t    *leaf = Mod_PointInLeaf (&light.position[0],
+													model);
+				DARRAY_APPEND (&lctx->lightleafs, leaf - model->brush.leafs);
+				printf ("[%g, %g, %g] %g, [%g %g %g] %g, [%g %g %g] %g, %zd\n",
 						VectorExpand (light.color), light.intensity,
 						VectorExpand (light.position), light.radius,
-						VectorExpand (light.direction), light.cone);
-				DARRAY_APPEND (&lctx->lights, light);
+						VectorExpand (light.direction), light.cone,
+						leaf - model->brush.leafs);
 			}
 		}
+		printf ("%zd frames\n", ctx->frames.size);
+		for (size_t i = 0; i < ctx->frames.size; i++) {
+			lightingframe_t *lframe = &lctx->frames.a[i];
+			DARRAY_RESIZE (&lframe->lightvis, lctx->lights.size);
+		}
 		// targets does not own the objects, so need to remove them before
 		// freeing targets
 		for (int i = PL_D_NumKeys (targets); i-- > 0; ) {
diff --git a/libs/video/renderer/vulkan/vulkan_main.c b/libs/video/renderer/vulkan/vulkan_main.c
index a7ed49669..bf1cd3ff2 100644
--- a/libs/video/renderer/vulkan/vulkan_main.c
+++ b/libs/video/renderer/vulkan/vulkan_main.c
@@ -216,7 +216,7 @@ Vulkan_NewMap (model_t *worldmodel, struct model_s **models, int num_models,
 	Vulkan_RegisterTextures (models, num_models, ctx);
 	Vulkan_BuildLightmaps (models, num_models, ctx);
 	Vulkan_BuildDisplayLists (models, num_models, ctx);
-	Vulkan_LoadLights (worldmodel->brush.entities, ctx);
+	Vulkan_LoadLights (worldmodel, worldmodel->brush.entities, ctx);
 }
 
 /*void

From dccd6989b2d23358ee6b9e054d62ee6cd2d5ac0d Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 20 Mar 2021 16:49:12 +0900
Subject: [PATCH 1490/1519] [vulkan] Implement gamma correction

Currently hard-coded to 0.67 (1/1.5), but it does the job for now.
---
 libs/video/renderer/vulkan/shader/compose.frag | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libs/video/renderer/vulkan/shader/compose.frag b/libs/video/renderer/vulkan/shader/compose.frag
index 39ac94845..631737c67 100644
--- a/libs/video/renderer/vulkan/shader/compose.frag
+++ b/libs/video/renderer/vulkan/shader/compose.frag
@@ -15,5 +15,6 @@ main (void)
 	o = subpassLoad (opaque).rgb;
 	t = subpassLoad (translucent);
 	c = mix (o, t.rgb, t.a);
+	c = pow (c, vec3(0.67));//FIXME make gamma correction configurable
 	frag_color = vec4 (c, 1);
 }

From 0246e559832a027344895613508215656a99b515 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 20 Mar 2021 16:50:37 +0900
Subject: [PATCH 1491/1519] [vulkan] Support colored lights

Now my dizzy map looks like it used to (more or less, possibly too dark,
but I suspect I used some command-line settings to qflight).
---
 libs/video/renderer/vulkan/vulkan_lighting.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libs/video/renderer/vulkan/vulkan_lighting.c b/libs/video/renderer/vulkan/vulkan_lighting.c
index 4df8475c7..a9c50d27b 100644
--- a/libs/video/renderer/vulkan/vulkan_lighting.c
+++ b/libs/video/renderer/vulkan/vulkan_lighting.c
@@ -408,6 +408,10 @@ parse_light (qfv_light_t *light, const plitem_t *entity,
 	}
 
 	VectorSet (1, 1, 1, light->color);
+	if ((str = PL_String (PL_ObjectForKey (entity, "color")))
+		|| (str = PL_String (PL_ObjectForKey (entity, "_color")))) {
+		sscanf (str, "%f %f %f", VectorExpandAddr (light->color));
+	}
 }
 
 void

From cadea2757706b6d66c3a347030d803c02dabe8c0 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 20 Mar 2021 18:02:27 +0900
Subject: [PATCH 1492/1519] [vulkan] Disable lightmap support

Hopefully, it won't be needed.
---
 libs/video/renderer/Makemodule.am        | 1 -
 libs/video/renderer/vulkan/vulkan_bsp.c  | 8 ++++----
 libs/video/renderer/vulkan/vulkan_main.c | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/libs/video/renderer/Makemodule.am b/libs/video/renderer/Makemodule.am
index 9eb2c2354..8c459dd1c 100644
--- a/libs/video/renderer/Makemodule.am
+++ b/libs/video/renderer/Makemodule.am
@@ -270,7 +270,6 @@ libs_video_renderer_librender_vulkan_la_SOURCES = \
 	libs/video/renderer/vulkan/vulkan_compose.c \
 	libs/video/renderer/vulkan/vulkan_draw.c \
 	libs/video/renderer/vulkan/vulkan_lighting.c \
-	libs/video/renderer/vulkan/vulkan_lightmap.c \
 	libs/video/renderer/vulkan/vulkan_main.c \
 	libs/video/renderer/vulkan/vulkan_matrices.c \
 	libs/video/renderer/vulkan/vulkan_particles.c \
diff --git a/libs/video/renderer/vulkan/vulkan_bsp.c b/libs/video/renderer/vulkan/vulkan_bsp.c
index f1ba6e472..937876dc9 100644
--- a/libs/video/renderer/vulkan/vulkan_bsp.c
+++ b/libs/video/renderer/vulkan/vulkan_bsp.c
@@ -202,7 +202,7 @@ Vulkan_ClearElements (vulkan_ctx_t *ctx)
 	release_elechains (bctx);
 	release_elementss (bctx);
 }
-
+/*
 static void
 update_lightmap (mod_brush_t *brush, msurface_t *surf, vulkan_ctx_t *ctx)
 {
@@ -218,7 +218,7 @@ dynamic:
 			Vulkan_BuildLightMap (brush, surf, ctx);
 	}
 }
-
+*/
 static inline void
 chain_surface (mod_brush_t *brush, msurface_t *surf, vec_t *transform,
 			   float *color, vulkan_ctx_t *ctx)
@@ -241,7 +241,7 @@ chain_surface (mod_brush_t *brush, msurface_t *surf, vec_t *transform,
 		tex = tx->render;
 		CHAIN_SURF_F2B (surf, tex->tex_chain);
 
-		update_lightmap (brush, surf, ctx);
+		//update_lightmap (brush, surf, ctx);
 	}
 	if (!(is = surf->instsurf))
 		is = surf->tinst;
@@ -1149,7 +1149,7 @@ Vulkan_DrawWorld (vulkan_ctx_t *ctx)
 		}
 	}
 
-	Vulkan_FlushLightmaps (ctx);
+	//Vulkan_FlushLightmaps (ctx);
 	bsp_begin (ctx);
 
 	push_transform (identity, bctx->layout, dfunc,
diff --git a/libs/video/renderer/vulkan/vulkan_main.c b/libs/video/renderer/vulkan/vulkan_main.c
index bf1cd3ff2..3474b67ed 100644
--- a/libs/video/renderer/vulkan/vulkan_main.c
+++ b/libs/video/renderer/vulkan/vulkan_main.c
@@ -214,7 +214,7 @@ Vulkan_NewMap (model_t *worldmodel, struct model_s **models, int num_models,
 	R_FreeAllEntities ();
 	Vulkan_ClearParticles (ctx);
 	Vulkan_RegisterTextures (models, num_models, ctx);
-	Vulkan_BuildLightmaps (models, num_models, ctx);
+	//Vulkan_BuildLightmaps (models, num_models, ctx);
 	Vulkan_BuildDisplayLists (models, num_models, ctx);
 	Vulkan_LoadLights (worldmodel, worldmodel->brush.entities, ctx);
 }

From 0a79348ce92eb8995bfc05e1e63c9cc42f75e817 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 20 Mar 2021 19:15:06 +0900
Subject: [PATCH 1493/1519] [vulkan] Tweak the lighting to look a bit better

Reduced the gamma correction a bit and increased the intensity of
dynamic lights. Not sure the latter is correct, but it looks much
better.
---
 libs/video/renderer/vulkan/shader/compose.frag  |  2 +-
 libs/video/renderer/vulkan/shader/lighting.frag |  6 +++---
 libs/video/renderer/vulkan/vulkan_lighting.c    | 14 ++++++++------
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/libs/video/renderer/vulkan/shader/compose.frag b/libs/video/renderer/vulkan/shader/compose.frag
index 631737c67..542ba4c1b 100644
--- a/libs/video/renderer/vulkan/shader/compose.frag
+++ b/libs/video/renderer/vulkan/shader/compose.frag
@@ -15,6 +15,6 @@ main (void)
 	o = subpassLoad (opaque).rgb;
 	t = subpassLoad (translucent);
 	c = mix (o, t.rgb, t.a);
-	c = pow (c, vec3(0.67));//FIXME make gamma correction configurable
+	c = pow (c, vec3(0.83));//FIXME make gamma correction configurable
 	frag_color = vec4 (c, 1);
 }
diff --git a/libs/video/renderer/vulkan/shader/lighting.frag b/libs/video/renderer/vulkan/shader/lighting.frag
index c48f54a2f..b756dd879 100644
--- a/libs/video/renderer/vulkan/shader/lighting.frag
+++ b/libs/video/renderer/vulkan/shader/lighting.frag
@@ -33,8 +33,8 @@ calc_light (LightData light, vec3 position, vec3 normal)
 	float       r = light.radius;
 
 	float       intensity = light.intensity * step (d, r);
-	intensity *= step (spotdot, light.cone) * clamp (lightdot, 0, 1);
-	return light.color * intensity * (r - d) / 255.0;
+	intensity *= smoothstep (spotdot, 1 - (1 - spotdot) * 0.995, light.cone) * clamp (lightdot, 0, 1);
+	return light.color * intensity * (r - d);
 }
 
 void
@@ -51,5 +51,5 @@ main (void)
 			light += calc_light (lights[i], p, n);
 		}
 	}
-	frag_color = vec4 (c * light, 1);
+	frag_color = vec4 (c * light / 255.0, 1);
 }
diff --git a/libs/video/renderer/vulkan/vulkan_lighting.c b/libs/video/renderer/vulkan/vulkan_lighting.c
index a9c50d27b..bac1843c7 100644
--- a/libs/video/renderer/vulkan/vulkan_lighting.c
+++ b/libs/video/renderer/vulkan/vulkan_lighting.c
@@ -131,7 +131,7 @@ update_lights (vulkan_ctx_t *ctx)
 		VectorCopy (lights[i]->color, light_data->lights[i].color);
 		VectorCopy (lights[i]->origin, light_data->lights[i].position);
 		light_data->lights[i].radius = lights[i]->radius;
-		light_data->lights[i].intensity = 1;
+		light_data->lights[i].intensity = 16;
 		VectorZero (light_data->lights[i].direction);
 		light_data->lights[i].cone = 1;
 	}
@@ -370,19 +370,23 @@ parse_light (qfv_light_t *light, const plitem_t *entity,
 {
 	const char *str;
 
-	Sys_Printf ("{\n");
+	/*Sys_Printf ("{\n");
 	for (int i = PL_D_NumKeys (entity); i-- > 0; ) {
 		const char *field = PL_KeyAtIndex (entity, i);
 		const char *value = PL_String (PL_ObjectForKey (entity, field));
 		Sys_Printf ("\t%s = %s\n", field, value);
 	}
-	Sys_Printf ("}\n");
+	Sys_Printf ("}\n");*/
+
+	light->cone = 1;
+	light->intensity = 1;
+	light->radius = 300;
+	VectorSet (1, 1, 1, light->color);
 
 	if ((str = PL_String (PL_ObjectForKey (entity, "origin")))) {
 		sscanf (str, "%f %f %f", VectorExpandAddr (light->position));
 	}
 
-	light->cone = 1;
 	if ((str = PL_String (PL_ObjectForKey (entity, "target")))) {
 		vec3_t      position = {};
 		plitem_t   *target = PL_ObjectForKey (targets, str);
@@ -401,13 +405,11 @@ parse_light (qfv_light_t *light, const plitem_t *entity,
 		light->cone = -cos (angle * M_PI / 360); // half angle
 	}
 
-	light->intensity = 1;
 	if ((str = PL_String (PL_ObjectForKey (entity, "light_lev")))
 		|| (str = PL_String (PL_ObjectForKey (entity, "_light")))) {
 		light->radius = atof (str);
 	}
 
-	VectorSet (1, 1, 1, light->color);
 	if ((str = PL_String (PL_ObjectForKey (entity, "color")))
 		|| (str = PL_String (PL_ObjectForKey (entity, "_color")))) {
 		sscanf (str, "%f %f %f", VectorExpandAddr (light->color));

From 7650df340018480e52358e5ef456b897bcb73713 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 21 Mar 2021 10:08:44 +0900
Subject: [PATCH 1494/1519] [model] Handle brush models with empty texture
 slots

It seems some maps have some empty texture slots (eg, e1m2).
---
 libs/models/brush/model_brush.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libs/models/brush/model_brush.c b/libs/models/brush/model_brush.c
index 1e2fa81a4..a2f02a322 100644
--- a/libs/models/brush/model_brush.c
+++ b/libs/models/brush/model_brush.c
@@ -274,7 +274,9 @@ Mod_LoadTextures (model_t *mod, bsp_t *bsp)
 										  mod->name);
 		}
 		for (i = 0; i < m->nummiptex; i++) {
-			tx = brush->textures[i];
+			if (!(tx = brush->textures[i])) {
+				continue;
+			}
 			tx->render = render_data;
 			render_data += render_size;
 			mod_funcs->Mod_ProcessTexture (mod, tx);

From 9e633e7230f1118fe2f60a0c1c07a1468e3b30ef Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 21 Mar 2021 10:11:53 +0900
Subject: [PATCH 1495/1519] [qflight] Remove minlights

It seems to be have been DOA (even in the original qutils light).
---
 tools/qflight/include/light.h  |  2 --
 tools/qflight/source/ltface.c  | 34 ----------------------------------
 tools/qflight/source/qflight.c |  3 ---
 3 files changed, 39 deletions(-)

diff --git a/tools/qflight/include/light.h b/tools/qflight/include/light.h
index 350b7e442..f558f594d 100644
--- a/tools/qflight/include/light.h
+++ b/tools/qflight/include/light.h
@@ -97,8 +97,6 @@ extern vec3_t bsp_yvector;
 
 extern qboolean extrasamples;
 
-extern float minlights[MAX_MAP_FACES];
-
 void LoadNodes (const char *file);
 qboolean TestLine (lightinfo_t *l, const vec3_t start, const vec3_t stop);
 qboolean TestSky (lightinfo_t *l, const vec3_t start, const vec3_t stop);
diff --git a/tools/qflight/source/ltface.c b/tools/qflight/source/ltface.c
index 2b8eb1953..de947cfff 100644
--- a/tools/qflight/source/ltface.c
+++ b/tools/qflight/source/ltface.c
@@ -508,38 +508,6 @@ SkyLightFace (entity_t *ent, int sun, lightinfo_t *l)
 	}
 }
 
-#if 0
-static void
-FixMinlight (lightinfo_t *l)
-{
-	float		minlight;
-	int			i, j;
-
-	minlight = minlights[l->surfnum];
-
-	// if minlight is set, there must be a style 0 light map
-	if (!minlight)
-		return;
-
-	for (i = 0; i < l->numlightstyles; i++) {
-		if (l->lightstyles[i] == 0)
-			break;
-	}
-	if (i == l->numlightstyles) {
-		if (l->numlightstyles == MAXLIGHTMAPS)
-			return;		// oh well..
-		for (j = 0; j < l->numsurfpt; j++)
-			l->lightmaps[i][j] = minlight;
-			l->lightstyles[i] = 0;
-			l->numlightstyles++;
-	} else {
-		for (j = 0; j < l->numsurfpt; j++)
-			if (l->lightmaps[i][j] < minlight)
-				l->lightmaps[i][j] = minlight;
-	}
-}
-#endif
-
 void
 LightFace (lightinfo_t *l, int surfnum)
 {
@@ -590,8 +558,6 @@ LightFace (lightinfo_t *l, int surfnum)
 			SkyLightFace (world_entity, i, l);
 	}
 
-//	FixMinlight (&l);
-
 	for (i = 0; i < MAXLIGHTMAPS; i++)
 		if (l->lightstyles[i] == 255)
 			break;
diff --git a/tools/qflight/source/qflight.c b/tools/qflight/source/qflight.c
index 75b9941d7..db133a3b4 100644
--- a/tools/qflight/source/qflight.c
+++ b/tools/qflight/source/qflight.c
@@ -78,9 +78,6 @@ vec3_t bsp_origin;
 
 qboolean extrasamples;
 
-float minlights[MAX_MAP_FACES];
-
-
 int
 GetFileSpace (int size)
 {

From 6e0cc59e8f558157eeda21f0491c7229a95038c0 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 21 Mar 2021 11:36:18 +0900
Subject: [PATCH 1496/1519] [util] Make wad lump failure a soft error

Can't recover from an error if the program is swept out from underneath
you.
---
 libs/util/wad.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/util/wad.c b/libs/util/wad.c
index 3b4355bbb..ffb5414d3 100644
--- a/libs/util/wad.c
+++ b/libs/util/wad.c
@@ -118,7 +118,7 @@ W_GetLumpinfo (const char *name)
 			return lump_p;
 	}
 
-	Sys_Error ("W_GetLumpinfo: %s not found", name);
+	Sys_MaskPrintf (SYS_WARN, "W_GetLumpinfo: %s not found", name);
 	return NULL;
 }
 

From 66e66277804bc93cd8efba0415bf9b3decf1ea5a Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 21 Mar 2021 11:37:36 +0900
Subject: [PATCH 1497/1519] [vulkan] Use the correct character data

I got tired of not being able to read 90% of quake's output :P
---
 libs/video/renderer/vulkan/vulkan_draw.c | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/libs/video/renderer/vulkan/vulkan_draw.c b/libs/video/renderer/vulkan/vulkan_draw.c
index 4b962edd6..12b3cd11b 100644
--- a/libs/video/renderer/vulkan/vulkan_draw.c
+++ b/libs/video/renderer/vulkan/vulkan_draw.c
@@ -383,10 +383,20 @@ Vulkan_Draw_Init (vulkan_ctx_t *ctx)
 								   dctx->stage);
 	dctx->sampler = Vulkan_CreateSampler (ctx, "quakepic");
 
-	qpic_t     *charspic = Draw_Font8x8Pic ();
+	draw_chars = W_GetLumpName ("conchars");
+	if (draw_chars) {
+		for (int i = 0; i < 256 * 64; i++) {
+			if (draw_chars[i] == 0) {
+				draw_chars[i] = 255;		// proper transparent color
+			}
+		}
+		dctx->conchars = pic_data ("conchars", 128, 128, draw_chars, dctx);
+	} else {
+		qpic_t     *charspic = Draw_Font8x8Pic ();
+		dctx->conchars = pic_data ("conchars", charspic->width,
+								   charspic->height, charspic->data, dctx);
+	}
 
-	dctx->conchars = pic_data ("conchars", charspic->width, charspic->height,
-							   charspic->data, dctx);
 	byte white_block = 0xfe;
 	dctx->white_pic = pic_data ("white", 1, 1, &white_block, dctx);
 

From a3c1b2e992efbf46fe68025083117d0c0d897587 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 21 Mar 2021 16:13:03 +0900
Subject: [PATCH 1498/1519] [util] Rename qfplist.[ch]

The name is a hold-over from before the current quakeforge tree and the
QF include directory.
---
 include/QF/{qfplist.h => plist.h}              | 10 +++++-----
 libs/audio/cd_file.c                           |  2 +-
 libs/gamecode/pr_parse.c                       |  2 +-
 libs/ruamoko/rua_plist.c                       |  2 +-
 libs/util/Makemodule.am                        |  2 +-
 libs/util/cexpr-lex.l                          |  2 +-
 libs/util/cexpr-parse.y                        |  2 +-
 libs/util/cexpr-type.c                         |  2 +-
 libs/util/{qfplist.c => plist.c}               |  4 ++--
 libs/util/quakefs.c                            |  2 +-
 libs/util/test/test-plist.c                    |  2 +-
 libs/video/renderer/gl/gl_fog.c                |  2 +-
 libs/video/renderer/glsl/glsl_fog.c            |  2 +-
 libs/video/renderer/vulkan/scrap.c             |  1 -
 libs/video/renderer/vulkan/shader.c            |  1 -
 libs/video/renderer/vulkan/staging.c           |  1 -
 libs/video/renderer/vulkan/vkparse.c           |  2 +-
 libs/video/renderer/vulkan/vkparse.h           |  2 +-
 libs/video/renderer/vulkan/vulkan_lighting.c   |  2 +-
 libs/video/renderer/vulkan/vulkan_texture.c    |  1 -
 libs/video/renderer/vulkan/vulkan_vid_common.c |  2 +-
 nq/source/cl_ents.c                            |  2 +-
 nq/source/cl_main.c                            |  2 +-
 nq/source/cl_parse.c                           |  2 +-
 nq/source/host_cmd.c                           |  2 +-
 qw/source/cl_parse.c                           |  2 +-
 tools/qflight/source/entities.c                |  2 +-
 tools/qflight/source/properties.c              |  2 +-
 28 files changed, 29 insertions(+), 33 deletions(-)
 rename include/QF/{qfplist.h => plist.h} (99%)
 rename libs/util/{qfplist.c => plist.c} (99%)

diff --git a/include/QF/qfplist.h b/include/QF/plist.h
similarity index 99%
rename from include/QF/qfplist.h
rename to include/QF/plist.h
index a4994476d..b14b5e4aa 100644
--- a/include/QF/qfplist.h
+++ b/include/QF/plist.h
@@ -1,5 +1,5 @@
 /*
-	qfplist.h
+	plist.h
 
 	Property list management types and prototypes
 
@@ -25,12 +25,12 @@
 
 */
 
-#ifndef __QF_qfplist_h
-#define __QF_qfplist_h
+#ifndef __QF_plist_h
+#define __QF_plist_h
 
 struct hashlink_s;
 
-/** \defgroup qfplist Property lists
+/** \defgroup plist Property lists
 	\ingroup utils
 */
 ///@{
@@ -505,4 +505,4 @@ PL_Message (plitem_t *messages, const plitem_t *item, const char *fmt, ...);
 
 ///@}
 
-#endif//__QF_qfplist_h
+#endif//__QF_plist_h
diff --git a/libs/audio/cd_file.c b/libs/audio/cd_file.c
index 5ffe88290..8f236ec5e 100644
--- a/libs/audio/cd_file.c
+++ b/libs/audio/cd_file.c
@@ -53,8 +53,8 @@
 #include "QF/cmd.h"
 #include "QF/cvar.h"
 #include "QF/dstring.h"
+#include "QF/plist.h"
 #include "QF/qargs.h"
-#include "QF/qfplist.h"
 #include "QF/quakefs.h"
 #include "QF/quakeio.h"
 #include "QF/sound.h"
diff --git a/libs/gamecode/pr_parse.c b/libs/gamecode/pr_parse.c
index b33d14e6c..08f394844 100644
--- a/libs/gamecode/pr_parse.c
+++ b/libs/gamecode/pr_parse.c
@@ -45,8 +45,8 @@
 
 #include "QF/dstring.h"
 #include "QF/mathlib.h"
+#include "QF/plist.h"
 #include "QF/progs.h"
-#include "QF/qfplist.h"
 #include "QF/script.h"
 #include "QF/sys.h"
 
diff --git a/libs/ruamoko/rua_plist.c b/libs/ruamoko/rua_plist.c
index ce5030e5c..d8b3c0da1 100644
--- a/libs/ruamoko/rua_plist.c
+++ b/libs/ruamoko/rua_plist.c
@@ -40,8 +40,8 @@
 #include <stdlib.h>
 
 #include "QF/hash.h"
+#include "QF/plist.h"
 #include "QF/progs.h"
-#include "QF/qfplist.h"
 
 #include "rua_internal.h"
 
diff --git a/libs/util/Makemodule.am b/libs/util/Makemodule.am
index d2ad47b0c..95ce152b9 100644
--- a/libs/util/Makemodule.am
+++ b/libs/util/Makemodule.am
@@ -64,10 +64,10 @@ libs_util_libQFutil_la_SOURCES= \
 	libs/util/mersenne.c \
 	libs/util/msg.c \
 	libs/util/pakfile.c \
+	libs/util/plist.c \
 	libs/util/plugin.c \
 	libs/util/qargs.c \
 	libs/util/qendian.c \
-	libs/util/qfplist.c \
 	libs/util/quakefs.c \
 	libs/util/quakeio.c \
 	libs/util/riff.c \
diff --git a/libs/util/cexpr-lex.l b/libs/util/cexpr-lex.l
index b82724af4..3fafef8e6 100644
--- a/libs/util/cexpr-lex.l
+++ b/libs/util/cexpr-lex.l
@@ -47,7 +47,7 @@
 #include "QF/cmem.h"
 #include "QF/dstring.h"
 #include "QF/hash.h"
-#include "QF/qfplist.h"
+#include "QF/plist.h"
 #include "QF/sys.h"
 
 #define CEXPR_YYDEBUG 1
diff --git a/libs/util/cexpr-parse.y b/libs/util/cexpr-parse.y
index 4c57c98c0..fca9171af 100644
--- a/libs/util/cexpr-parse.y
+++ b/libs/util/cexpr-parse.y
@@ -46,7 +46,7 @@
 #include "QF/cmem.h"
 #include "QF/dstring.h"
 #include "QF/hash.h"
-#include "QF/qfplist.h"
+#include "QF/plist.h"
 #include "QF/sys.h"
 
 #include "QF/cexpr.h"
diff --git a/libs/util/cexpr-type.c b/libs/util/cexpr-type.c
index 2aff20006..7ee34f5c2 100644
--- a/libs/util/cexpr-type.c
+++ b/libs/util/cexpr-type.c
@@ -32,7 +32,7 @@
 #include "QF/cexpr.h"
 #include "QF/cmem.h"
 #include "QF/mathlib.h"
-#include "QF/qfplist.h"
+#include "QF/plist.h"
 #include "QF/simd/vec4f.h"
 
 #include "libs/util/cexpr-parse.h"
diff --git a/libs/util/qfplist.c b/libs/util/plist.c
similarity index 99%
rename from libs/util/qfplist.c
rename to libs/util/plist.c
index 454c549f7..e41960398 100644
--- a/libs/util/qfplist.c
+++ b/libs/util/plist.c
@@ -1,5 +1,5 @@
 /*
-	qfplist.c
+	plist.c
 
 	Property list management
 
@@ -41,7 +41,7 @@
 #include "QF/darray.h"
 #include "QF/dstring.h"
 #include "QF/hash.h"
-#include "QF/qfplist.h"
+#include "QF/plist.h"
 #include "QF/qtypes.h"
 #include "QF/sys.h"
 #include "QF/va.h"
diff --git a/libs/util/quakefs.c b/libs/util/quakefs.c
index 569fab341..9e7c2dc63 100644
--- a/libs/util/quakefs.c
+++ b/libs/util/quakefs.c
@@ -82,9 +82,9 @@
 #include "QF/mathlib.h"
 #include "QF/pak.h"
 #include "QF/pakfile.h"
+#include "QF/plist.h"
 #include "QF/qargs.h"
 #include "QF/qendian.h"
-#include "QF/qfplist.h"
 #include "QF/qtypes.h"
 #include "QF/quakefs.h"
 #include "QF/sys.h"
diff --git a/libs/util/test/test-plist.c b/libs/util/test/test-plist.c
index bc8e0457a..d3ce32715 100644
--- a/libs/util/test/test-plist.c
+++ b/libs/util/test/test-plist.c
@@ -2,7 +2,7 @@
 # include "config.h"
 #endif
 #include <string.h>
-#include "QF/qfplist.h"
+#include "QF/plist.h"
 
 static const char *test_strings[] = {
 	"Guarding the entrance to the Grendal\n"
diff --git a/libs/video/renderer/gl/gl_fog.c b/libs/video/renderer/gl/gl_fog.c
index b8747e37b..0b74d0b80 100644
--- a/libs/video/renderer/gl/gl_fog.c
+++ b/libs/video/renderer/gl/gl_fog.c
@@ -34,7 +34,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #endif
 
 #include "QF/cmd.h"
-#include "QF/qfplist.h"
+#include "QF/plist.h"
 #include "QF/render.h"
 #include "QF/sys.h"
 
diff --git a/libs/video/renderer/glsl/glsl_fog.c b/libs/video/renderer/glsl/glsl_fog.c
index 8118b8497..82777061e 100644
--- a/libs/video/renderer/glsl/glsl_fog.c
+++ b/libs/video/renderer/glsl/glsl_fog.c
@@ -34,7 +34,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #endif
 
 #include "QF/cmd.h"
-#include "QF/qfplist.h"
+#include "QF/plist.h"
 #include "QF/render.h"
 #include "QF/sys.h"
 
diff --git a/libs/video/renderer/vulkan/scrap.c b/libs/video/renderer/vulkan/scrap.c
index 01eed4bf8..ab053bf10 100644
--- a/libs/video/renderer/vulkan/scrap.c
+++ b/libs/video/renderer/vulkan/scrap.c
@@ -43,7 +43,6 @@
 #include "QF/dstring.h"
 #include "QF/hash.h"
 #include "QF/image.h"
-#include "QF/qfplist.h"
 #include "QF/quakefs.h"
 #include "QF/render.h"
 #include "QF/sys.h"
diff --git a/libs/video/renderer/vulkan/shader.c b/libs/video/renderer/vulkan/shader.c
index 4168d9b63..d2921faca 100644
--- a/libs/video/renderer/vulkan/shader.c
+++ b/libs/video/renderer/vulkan/shader.c
@@ -42,7 +42,6 @@
 #include "QF/cvar.h"
 #include "QF/dstring.h"
 #include "QF/hash.h"
-#include "QF/qfplist.h"
 #include "QF/quakefs.h"
 #include "QF/sys.h"
 #include "QF/Vulkan/qf_vid.h"
diff --git a/libs/video/renderer/vulkan/staging.c b/libs/video/renderer/vulkan/staging.c
index 759962c4d..28ea169a7 100644
--- a/libs/video/renderer/vulkan/staging.c
+++ b/libs/video/renderer/vulkan/staging.c
@@ -42,7 +42,6 @@
 #include "QF/cvar.h"
 #include "QF/dstring.h"
 #include "QF/hash.h"
-#include "QF/qfplist.h"
 #include "QF/quakefs.h"
 #include "QF/sys.h"
 #include "QF/Vulkan/qf_vid.h"
diff --git a/libs/video/renderer/vulkan/vkparse.c b/libs/video/renderer/vulkan/vkparse.c
index de12d60c0..3a9e98411 100644
--- a/libs/video/renderer/vulkan/vkparse.c
+++ b/libs/video/renderer/vulkan/vkparse.c
@@ -45,8 +45,8 @@
 #include "QF/hash.h"
 #include "QF/input.h"
 #include "QF/mathlib.h"
+#include "QF/plist.h"
 #include "QF/qargs.h"
-#include "QF/qfplist.h"
 #include "QF/quakefs.h"
 #include "QF/sys.h"
 #include "QF/va.h"
diff --git a/libs/video/renderer/vulkan/vkparse.h b/libs/video/renderer/vulkan/vkparse.h
index 2550e1b17..4f258a96f 100644
--- a/libs/video/renderer/vulkan/vkparse.h
+++ b/libs/video/renderer/vulkan/vkparse.h
@@ -9,7 +9,7 @@ typedef struct parsectx_s {
 } parsectx_t;
 
 #include "QF/cexpr.h"
-#include "QF/qfplist.h"
+#include "QF/plist.h"
 #include "QF/Vulkan/renderpass.h"
 #ifdef vkparse_internal
 #include "libs/video/renderer/vulkan/vkparse.hinc"
diff --git a/libs/video/renderer/vulkan/vulkan_lighting.c b/libs/video/renderer/vulkan/vulkan_lighting.c
index bac1843c7..01df24722 100644
--- a/libs/video/renderer/vulkan/vulkan_lighting.c
+++ b/libs/video/renderer/vulkan/vulkan_lighting.c
@@ -42,8 +42,8 @@
 #include "qfalloca.h"
 
 #include "QF/dstring.h"
+#include "QF/plist.h"
 #include "QF/progs.h"
-#include "QF/qfplist.h"
 #include "QF/script.h"
 #include "QF/sys.h"
 #include "QF/va.h"
diff --git a/libs/video/renderer/vulkan/vulkan_texture.c b/libs/video/renderer/vulkan/vulkan_texture.c
index 7d8b13155..7d975298d 100644
--- a/libs/video/renderer/vulkan/vulkan_texture.c
+++ b/libs/video/renderer/vulkan/vulkan_texture.c
@@ -44,7 +44,6 @@
 #include "QF/hash.h"
 #include "QF/image.h"
 #include "QF/mathlib.h"
-#include "QF/qfplist.h"
 #include "QF/quakefs.h"
 #include "QF/render.h"
 #include "QF/sys.h"
diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c
index 909f26236..8c3c975ef 100644
--- a/libs/video/renderer/vulkan/vulkan_vid_common.c
+++ b/libs/video/renderer/vulkan/vulkan_vid_common.c
@@ -45,8 +45,8 @@
 #include "QF/hash.h"
 #include "QF/input.h"
 #include "QF/mathlib.h"
+#include "QF/plist.h"
 #include "QF/qargs.h"
-#include "QF/qfplist.h"
 #include "QF/quakefs.h"
 #include "QF/sys.h"
 #include "QF/va.h"
diff --git a/nq/source/cl_ents.c b/nq/source/cl_ents.c
index 2e04ff885..d2cab9909 100644
--- a/nq/source/cl_ents.c
+++ b/nq/source/cl_ents.c
@@ -36,7 +36,7 @@
 #include "QF/input.h"
 #include "QF/keys.h"
 #include "QF/msg.h"
-#include "QF/qfplist.h"
+#include "QF/plist.h"
 #include "QF/render.h"
 #include "QF/screen.h"
 #include "QF/skin.h"
diff --git a/nq/source/cl_main.c b/nq/source/cl_main.c
index e52eb5fea..75b4f72ea 100644
--- a/nq/source/cl_main.c
+++ b/nq/source/cl_main.c
@@ -39,7 +39,7 @@
 #include "QF/joystick.h"
 #include "QF/keys.h"
 #include "QF/msg.h"
-#include "QF/qfplist.h"
+#include "QF/plist.h"
 #include "QF/render.h"
 #include "QF/screen.h"
 #include "QF/skin.h"
diff --git a/nq/source/cl_parse.c b/nq/source/cl_parse.c
index 30e48e82a..d2b5e0b2b 100644
--- a/nq/source/cl_parse.c
+++ b/nq/source/cl_parse.c
@@ -45,7 +45,7 @@
 #include "QF/idparse.h"
 #include "QF/input.h"
 #include "QF/msg.h"
-#include "QF/qfplist.h"
+#include "QF/plist.h"
 #include "QF/sys.h"
 #include "QF/screen.h"
 #include "QF/skin.h"
diff --git a/nq/source/host_cmd.c b/nq/source/host_cmd.c
index c7e138f23..1ef9fcf41 100644
--- a/nq/source/host_cmd.c
+++ b/nq/source/host_cmd.c
@@ -44,7 +44,7 @@
 #include "QF/keys.h"
 #include "QF/model.h"
 #include "QF/msg.h"
-#include "QF/qfplist.h"
+#include "QF/plist.h"
 #include "QF/screen.h"
 #include "QF/script.h"
 #include "QF/sys.h"
diff --git a/qw/source/cl_parse.c b/qw/source/cl_parse.c
index b7a293f28..4f0c93475 100644
--- a/qw/source/cl_parse.c
+++ b/qw/source/cl_parse.c
@@ -52,7 +52,7 @@
 #include "QF/idparse.h"
 #include "QF/msg.h"
 #include "QF/progs.h"
-#include "QF/qfplist.h"
+#include "QF/plist.h"
 #include "QF/quakeio.h"
 #include "QF/screen.h"
 #include "QF/skin.h"
diff --git a/tools/qflight/source/entities.c b/tools/qflight/source/entities.c
index d3c608f6f..8c2260fcd 100644
--- a/tools/qflight/source/entities.c
+++ b/tools/qflight/source/entities.c
@@ -47,8 +47,8 @@
 #include "QF/bspfile.h"
 #include "QF/dstring.h"
 #include "QF/mathlib.h"
+#include "QF/plist.h"
 #include "QF/progs.h"
-#include "QF/qfplist.h"
 #include "QF/qtypes.h"
 #include "QF/quakefs.h"
 #include "QF/script.h"
diff --git a/tools/qflight/source/properties.c b/tools/qflight/source/properties.c
index c9297984b..87229d05d 100644
--- a/tools/qflight/source/properties.c
+++ b/tools/qflight/source/properties.c
@@ -41,7 +41,7 @@
 #include <errno.h>
 
 #include "QF/mathlib.h"
-#include "QF/qfplist.h"
+#include "QF/plist.h"
 #include "QF/quakeio.h"
 
 #include "compat.h"

From cc4167668c306fa06b6e742dc3d52ed55c00e3fb Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 21 Mar 2021 19:56:17 +0900
Subject: [PATCH 1499/1519] Fix a pile of leaks and uninit errors

Still "some" more to go: a pile to do with transforms and temporary
entities, and a nasty one with host_cbuf. There's also all the static
block-alloc lists :/
---
 include/QF/Vulkan/qf_lighting.h               |   2 +-
 include/QF/progs.h                            |   1 +
 libs/audio/cd_file.c                          |   1 +
 libs/audio/renderer/vorbis.c                  |   1 +
 libs/client/cl_temp_entities.c                |  13 +-
 libs/gamecode/pr_builtins.c                   |   6 +
 libs/models/alias/model_alias.c               |   3 +
 libs/models/brush/vulkan_model_brush.c        |   1 +
 libs/util/plist.c                             |   1 +
 libs/util/quakefs.c                           |  22 ++-
 libs/video/renderer/vulkan/instance.c         |   3 +
 libs/video/renderer/vulkan/vkparse.c          | 154 +++++++++++-------
 libs/video/renderer/vulkan/vulkan_lighting.c  |  11 +-
 .../video/renderer/vulkan/vulkan_vid_common.c |   6 +
 libs/video/targets/context_x11.c              |   4 +-
 libs/video/targets/keys.c                     |   5 +
 16 files changed, 153 insertions(+), 81 deletions(-)

diff --git a/include/QF/Vulkan/qf_lighting.h b/include/QF/Vulkan/qf_lighting.h
index c19f6ae80..c269feaae 100644
--- a/include/QF/Vulkan/qf_lighting.h
+++ b/include/QF/Vulkan/qf_lighting.h
@@ -70,7 +70,7 @@ typedef struct lightingframe_s {
 	// illuminate the leafs visible to the player
 	byte        pvs[MAP_PVS_BYTES];
 	struct mleaf_s *leaf;	// the last leaf used to generate the pvs
-	qfv_lightleafset_t lightvis;
+	qfv_lightvisset_t lightvis;
 } lightingframe_t;
 
 typedef struct lightingframeset_s
diff --git a/include/QF/progs.h b/include/QF/progs.h
index 89fa5d181..498303c25 100644
--- a/include/QF/progs.h
+++ b/include/QF/progs.h
@@ -1782,6 +1782,7 @@ struct progs_s {
 	///@{
 	struct hashtab_s *builtin_hash;
 	struct hashtab_s *builtin_num_hash;
+	struct biblock_s *builtin_blocks;
 	unsigned    bi_next;
 	unsigned  (*bi_map) (progs_t *pr, unsigned binum);
 	///@}
diff --git a/libs/audio/cd_file.c b/libs/audio/cd_file.c
index 8f236ec5e..0e26a803a 100644
--- a/libs/audio/cd_file.c
+++ b/libs/audio/cd_file.c
@@ -172,6 +172,7 @@ Load_Tracklist (void)
 	buffile = calloc (size+10, sizeof (char));
 	Qread (oggfile, buffile, size);
 
+	PL_Free (tracklist);
 	tracklist = PL_GetPropertyList (buffile, 0);
 	if (!tracklist || PL_Type (tracklist) != QFDictionary) {
 		Sys_Printf ("Malformed or empty tracklist file. check mus_ogglist\n");
diff --git a/libs/audio/renderer/vorbis.c b/libs/audio/renderer/vorbis.c
index fd14ec965..1c346a146 100644
--- a/libs/audio/renderer/vorbis.c
+++ b/libs/audio/renderer/vorbis.c
@@ -249,6 +249,7 @@ vorbis_stream_close (sfx_t *sfx)
 	if (vf->data)
 		free (vf->data);
 	ov_clear (vf->vf);
+	free (vf->vf);
 	free (vf);
 	SND_SFX_StreamClose (sfx);
 }
diff --git a/libs/client/cl_temp_entities.c b/libs/client/cl_temp_entities.c
index 03fab9b73..11ae7632d 100644
--- a/libs/client/cl_temp_entities.c
+++ b/libs/client/cl_temp_entities.c
@@ -317,12 +317,13 @@ CL_ParseBeam (qmsg_t *net_message, model_t *m, double time, TEntContext_t *ctx)
 	tent_obj_t *to;
 	beam_t     *b;
 	int         ent;
-	vec3_t      start, end;
+	vec4f_t     start, end;
 
 	ent = MSG_ReadShort (net_message);
 
-	MSG_ReadCoordV (net_message, start);
-	MSG_ReadCoordV (net_message, end);
+	MSG_ReadCoordV (net_message, &start[0]);//FIXME
+	MSG_ReadCoordV (net_message, &end[0]);//FIXME
+	start[3] = end[3] = 1;//FIXME
 
 	to = 0;
 	if (ent) {
@@ -345,10 +346,10 @@ CL_ParseBeam (qmsg_t *net_message, model_t *m, double time, TEntContext_t *ctx)
 	b->model = m;
 	b->endtime = time + 0.2;
 	b->seed = rand ();
-	VectorCopy (end, b->end);
+	b->end = end;
 	if (b->entity != ctx->playerEntity) {
 		// this will be done in CL_UpdateBeams
-		VectorCopy (start, b->start);
+		b->start = start;
 		beam_setup (b, true, time, ctx);
 	}
 }
@@ -626,7 +627,7 @@ CL_UpdateBeams (double time, TEntContext_t *ctx)
 		// if coming from the player, update the start position
 		if (b->entity == ctx->playerEntity) {
 			beam_clear (b);
-			VectorCopy (ctx->simorg, b->start);
+			b->start = ctx->simorg;
 			beam_setup (b, false, time, ctx);
 		}
 
diff --git a/libs/gamecode/pr_builtins.c b/libs/gamecode/pr_builtins.c
index 6d738e6bc..ab159e250 100644
--- a/libs/gamecode/pr_builtins.c
+++ b/libs/gamecode/pr_builtins.c
@@ -40,6 +40,7 @@
 #include "QF/cmd.h"
 #include "QF/crc.h"
 #include "QF/cvar.h"
+#include "QF/darray.h"
 #include "QF/hash.h"
 #include "QF/progs.h"
 #include "QF/qdefs.h"
@@ -50,6 +51,8 @@
 
 #include "compat.h"
 
+typedef struct biblock_s DARRAY_TYPE (builtin_t *) biblock_t;
+
 static const char *
 builtin_get_key (const void *_bi, void *unused)
 {
@@ -92,6 +95,8 @@ PR_RegisterBuiltins (progs_t *pr, builtin_t *builtins)
 	int         count;
 
 	if (!pr->builtin_hash) {
+		pr->builtin_blocks = malloc (sizeof (biblock_t));
+		DARRAY_INIT (pr->builtin_blocks, 16);
 		pr->builtin_hash = Hash_NewTable (1021, builtin_get_key, 0, pr,
 										  pr->hashlink_freelist);
 		pr->builtin_num_hash = Hash_NewTable (1021, 0, 0, pr,
@@ -104,6 +109,7 @@ PR_RegisterBuiltins (progs_t *pr, builtin_t *builtins)
 	for (bi = builtins, count = 1; bi->name; bi++)
 		count++;
 	bi = malloc (count * sizeof (builtin_t));
+	DARRAY_APPEND (pr->builtin_blocks, bi);
 	memcpy (bi, builtins, count * sizeof (builtin_t));
 	builtins = bi;
 
diff --git a/libs/models/alias/model_alias.c b/libs/models/alias/model_alias.c
index 727957fe5..583df43fa 100644
--- a/libs/models/alias/model_alias.c
+++ b/libs/models/alias/model_alias.c
@@ -387,4 +387,7 @@ Mod_LoadAliasModel (model_t *mod, void *buffer, cache_allocator_t allocator)
 	} else {
 		mod->aliashdr = header;
 	}
+	DARRAY_CLEAR (&alias_ctx.poseverts);
+	DARRAY_CLEAR (&alias_ctx.stverts);
+	DARRAY_CLEAR (&alias_ctx.triangles);
 }
diff --git a/libs/models/brush/vulkan_model_brush.c b/libs/models/brush/vulkan_model_brush.c
index 55eacb90b..2248ccdaf 100644
--- a/libs/models/brush/vulkan_model_brush.c
+++ b/libs/models/brush/vulkan_model_brush.c
@@ -326,6 +326,7 @@ load_textures (model_t *mod, vulkan_ctx_t *ctx)
 								 barriers->size, barriers->a);
 	QFV_PacketSubmit (packet);
 	QFV_DestroyStagingBuffer (stage);
+	free (barriers);
 }
 
 void
diff --git a/libs/util/plist.c b/libs/util/plist.c
index e41960398..b731f982f 100644
--- a/libs/util/plist.c
+++ b/libs/util/plist.c
@@ -223,6 +223,7 @@ PL_Free (plitem_t *item)
 			dict = item->data;
 			Hash_DelTable (dict->tab);
 			DARRAY_CLEAR (&dict->keys);
+			free (item->data);
 			break;
 
 		case QFArray:
diff --git a/libs/util/quakefs.c b/libs/util/quakefs.c
index 9e7c2dc63..e209d460a 100644
--- a/libs/util/quakefs.c
+++ b/libs/util/quakefs.c
@@ -252,12 +252,11 @@ static void
 delete_searchpath (searchpath_t *searchpath)
 {
 	if (searchpath->pack) {
-		Qclose (searchpath->pack->handle);
-		free (searchpath->pack->files);
-		free (searchpath->pack);
+		pack_del (searchpath->pack);
 	}
-	if (searchpath->filename)
+	if (searchpath->filename) {
 		free (searchpath->filename);
+	}
 	FREE (searchpaths, searchpath);
 }
 
@@ -274,8 +273,9 @@ delete_vpath (vpath_t *vpath)
 {
 	searchpath_t *next;
 
-	if (vpath->name)
+	if (vpath->name) {
 		free (vpath->name);
+	}
 	while (vpath->user) {
 		next = vpath->user->next;
 		delete_searchpath (vpath->user);
@@ -859,6 +859,7 @@ qfs_findfile_search (const vpath_t *vpath, const searchpath_t *sp,
 				found.ff.realname = strdup (*fn);
 				found.path = strdup (path->str);
 				found.fname_index = fn - fnames;
+				dstring_delete (path);
 				return &found;
 			}
 		}
@@ -1416,6 +1417,16 @@ qfs_path_cvar (cvar_t *var)
 	free (cpath);
 }
 
+static void
+qfs_shutdown (void *data)
+{
+	while (qfs_vpaths) {
+		vpath_t    *next = qfs_vpaths->next;
+		delete_vpath (qfs_vpaths);
+		qfs_vpaths = next;
+	}
+}
+
 VISIBLE void
 QFS_Init (const char *game)
 {
@@ -1465,6 +1476,7 @@ QFS_Init (const char *game)
 	} else {
 		QFS_Gamedir ("");
 	}
+	Sys_RegisterShutdown (qfs_shutdown, 0);
 }
 
 VISIBLE const char *
diff --git a/libs/video/renderer/vulkan/instance.c b/libs/video/renderer/vulkan/instance.c
index d1c845c6b..f50ec526b 100644
--- a/libs/video/renderer/vulkan/instance.c
+++ b/libs/video/renderer/vulkan/instance.c
@@ -285,11 +285,14 @@ void
 QFV_DestroyInstance (qfv_instance_t *instance)
 {
 	qfv_instfuncs_t *ifunc = instance->funcs;
+
 	if (instance->debug_handle) {
 		ifunc->vkDestroyDebugUtilsMessengerEXT (instance->instance,
 												instance->debug_handle, 0);
 	}
 	instance->funcs->vkDestroyInstance (instance->instance, 0);
+	del_strset (instance->enabled_extensions);
+	free (instance->devices);
 	free (instance);
 }
 
diff --git a/libs/video/renderer/vulkan/vkparse.c b/libs/video/renderer/vulkan/vkparse.c
index 3a9e98411..382d04873 100644
--- a/libs/video/renderer/vulkan/vkparse.c
+++ b/libs/video/renderer/vulkan/vkparse.c
@@ -252,6 +252,13 @@ parse_reference (const plitem_t *item, const char *type, plitem_t *messages,
 	return refItem;
 }
 
+static void *
+vkparse_alloc (void *context, size_t size)
+{
+	parsectx_t *pctx = context;
+	return cmemalloc (pctx->ectx->memsuper, size);
+}
+
 static int
 parse_single (const plfield_t *field, const plitem_t *item,
 			  void *data, plitem_t *messages, void *context)
@@ -269,9 +276,9 @@ parse_single (const plfield_t *field, const plitem_t *item,
 	}
 
 	plfield_t   f = { 0, 0, single->type, single->parser, 0 };
-	void       *value = calloc (1, single->stride);
+	void       *value = vkparse_alloc (context, single->stride);
+	memset (value, 0, single->stride);
 	if (!single->parser (&f, item, value, messages, context)) {
-		free (value);
 		return 0;
 	}
 
@@ -279,12 +286,6 @@ parse_single (const plfield_t *field, const plitem_t *item,
 	return 1;
 }
 
-static void *
-array_alloc (void *context, size_t size)
-{
-	return malloc (size);
-}
-
 static int
 parse_array (const plfield_t *field, const plitem_t *item,
 			 void *data, plitem_t *messages, void *context)
@@ -296,7 +297,7 @@ parse_array (const plfield_t *field, const plitem_t *item,
 	plelement_t element = {
 		array->type,
 		array->stride,
-		array_alloc,
+		vkparse_alloc,
 		array->parser,
 		0,
 	};
@@ -313,12 +314,11 @@ parse_array (const plfield_t *field, const plitem_t *item,
 	if (!PL_ParseArray (&f, item, &arr, messages, context)) {
 		return 0;
 	}
-	*value = malloc (array->stride * arr->size);
+	*value = vkparse_alloc (context, array->stride * arr->size);
 	memcpy (*value, arr->a, array->stride * arr->size);
 	if ((void *) size >= data) {
 		*size = arr->size;
 	}
-	free (arr);
 	return 1;
 }
 
@@ -339,7 +339,7 @@ parse_data (const plfield_t *field, const plitem_t *item,
 	Sys_Printf ("    %zd %zd\n", datad->value_offset, datad->size_offset);
 	Sys_Printf ("    %zd %p\n", binsize, bindata);
 
-	*value = malloc (binsize);
+	*value = vkparse_alloc (context, binsize);
 	memcpy (*value, bindata, binsize);
 	if ((void *) size > data) {
 		*size = binsize;
@@ -362,7 +362,9 @@ parse_string (const plfield_t *field, const plitem_t *item,
 	//Sys_Printf ("    %zd\n", string->value_offset);
 	//Sys_Printf ("    %s\n", str);
 
-	*value = strdup (str);
+	size_t      len = strlen (str) + 1;
+	*value = vkparse_alloc (context, len);
+	memcpy (*value, str, len);
 	return 1;
 }
 
@@ -877,7 +879,7 @@ typedef struct qfv_renderpass_s {
 static plelement_t parse_qfv_renderpass_attachments_data = {
 	QFDictionary,
 	sizeof (VkAttachmentDescription),
-	array_alloc,
+	vkparse_alloc,
 	parse_VkAttachmentDescription,
 	0,
 };
@@ -885,7 +887,7 @@ static plelement_t parse_qfv_renderpass_attachments_data = {
 static plelement_t parse_qfv_renderpass_subpasses_data = {
 	QFDictionary,
 	sizeof (VkSubpassDescription),
-	array_alloc,
+	vkparse_alloc,
 	parse_VkSubpassDescription,
 	0,
 };
@@ -893,7 +895,7 @@ static plelement_t parse_qfv_renderpass_subpasses_data = {
 static plelement_t parse_qfv_renderpass_dependencies_data = {
 	QFDictionary,
 	sizeof (VkSubpassDependency),
-	array_alloc,
+	vkparse_alloc,
 	parse_VkSubpassDependency,
 	0,
 };
@@ -953,7 +955,7 @@ QFV_GetEnum (const char *name)
 }
 
 static int
-parse_object (vulkan_ctx_t *ctx, plitem_t *plist,
+parse_object (vulkan_ctx_t *ctx, memsuper_t *memsuper, plitem_t *plist,
 			  plparser_t parser, void *object, plitem_t *properties)
 {
 	plitem_t   *messages = PL_NewArray ();
@@ -970,9 +972,9 @@ parse_object (vulkan_ctx_t *ctx, plitem_t *plist,
 	exprtab_t   vars_tab = { var_syms, 0 };
 
 	exprctx.external_variables = &vars_tab;
-	exprctx.memsuper = new_memsuper ();
 	exprctx.messages = messages;
 	exprctx.hashlinks = &ctx->hashlinks;
+	exprctx.memsuper = memsuper;
 
 	cexpr_init_symtab (&vars_tab, &exprctx);
 
@@ -983,8 +985,8 @@ parse_object (vulkan_ctx_t *ctx, plitem_t *plist,
 		}
 		return 0;
 	}
+	Hash_DelTable (vars_tab.tab);
 	PL_Free (messages);
-	delete_memsuper (exprctx.memsuper);
 
 	return 1;
 }
@@ -999,12 +1001,14 @@ parse_qfv_renderpass (const plfield_t *field, const plitem_t *item, void *data,
 VkRenderPass
 QFV_ParseRenderPass (vulkan_ctx_t *ctx, plitem_t *plist, plitem_t *properties)
 {
+	memsuper_t *memsuper = new_memsuper ();
 	qfv_device_t *device = ctx->device;
 
 	qfv_renderpass_t renderpass_data = {};
 
-	if (!parse_object (ctx, plist, parse_qfv_renderpass, &renderpass_data,
-					   properties)) {
+	if (!parse_object (ctx, memsuper, plist, parse_qfv_renderpass,
+					   &renderpass_data, properties)) {
+		delete_memsuper (memsuper);
 		return 0;
 	}
 
@@ -1014,29 +1018,22 @@ QFV_ParseRenderPass (vulkan_ctx_t *ctx, plitem_t *plist, plitem_t *properties)
 									   renderpass_data.subpasses,
 									   renderpass_data.dependencies);
 
-	free (renderpass_data.attachments);
-	for (size_t i = 0; i < renderpass_data.subpasses->size; i++) {
-		free ((void *) renderpass_data.subpasses->a[i].pInputAttachments);
-		free ((void *) renderpass_data.subpasses->a[i].pColorAttachments);
-		free ((void *) renderpass_data.subpasses->a[i].pResolveAttachments);
-		free ((void *) renderpass_data.subpasses->a[i].pDepthStencilAttachment);
-		free ((void *) renderpass_data.subpasses->a[i].pPreserveAttachments);
-	}
-	free (renderpass_data.subpasses);
-	free (renderpass_data.dependencies);
+	delete_memsuper (memsuper);
 	return renderpass;
 }
 
 VkPipeline
 QFV_ParsePipeline (vulkan_ctx_t *ctx, plitem_t *plist, plitem_t *properties)
 {
+	memsuper_t *memsuper = new_memsuper ();
 	qfv_device_t *device = ctx->device;
 
 	__auto_type cInfo = QFV_AllocGraphicsPipelineCreateInfoSet (1, alloca);
 	memset (&cInfo->a[0], 0, sizeof (cInfo->a[0]));
 
-	if (!parse_object (ctx, plist, parse_VkGraphicsPipelineCreateInfo,
+	if (!parse_object (ctx, memsuper, plist, parse_VkGraphicsPipelineCreateInfo,
 					   &cInfo->a[0], properties)) {
+		delete_memsuper (memsuper);
 		return 0;
 	}
 
@@ -1044,6 +1041,7 @@ QFV_ParsePipeline (vulkan_ctx_t *ctx, plitem_t *plist, plitem_t *properties)
 	__auto_type plSet = QFV_CreateGraphicsPipelines (device, 0, cInfo);
 	VkPipeline pipeline = plSet->a[0];
 	free (plSet);
+	delete_memsuper (memsuper);
 	return pipeline;
 }
 
@@ -1053,17 +1051,20 @@ QFV_ParseDescriptorPool (vulkan_ctx_t *ctx, plitem_t *plist,
 {
 	qfv_device_t *device = ctx->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
+	memsuper_t *memsuper = new_memsuper ();
 
 	VkDescriptorPoolCreateInfo cInfo = {};
 
-	if (!parse_object (ctx, plist, parse_VkDescriptorPoolCreateInfo, &cInfo,
-					   properties)) {
+	if (!parse_object (ctx, memsuper, plist, parse_VkDescriptorPoolCreateInfo,
+					   &cInfo, properties)) {
+		delete_memsuper (memsuper);
 		return 0;
 	}
 
 	VkDescriptorPool pool;
 	dfunc->vkCreateDescriptorPool (device->dev, &cInfo, 0, &pool);
 
+	delete_memsuper (memsuper);
 	return pool;
 }
 
@@ -1073,17 +1074,21 @@ QFV_ParseDescriptorSetLayout (vulkan_ctx_t *ctx, plitem_t *plist,
 {
 	qfv_device_t *device = ctx->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
+	memsuper_t *memsuper = new_memsuper ();
 
 	VkDescriptorSetLayoutCreateInfo cInfo = {};
 
-	if (!parse_object (ctx, plist, parse_VkDescriptorSetLayoutCreateInfo,
+	if (!parse_object (ctx, memsuper, plist,
+					   parse_VkDescriptorSetLayoutCreateInfo,
 					   &cInfo, properties)) {
+		delete_memsuper (memsuper);
 		return 0;
 	}
 
 	VkDescriptorSetLayout setLayout;
 	dfunc->vkCreateDescriptorSetLayout (device->dev, &cInfo, 0, &setLayout);
 
+	delete_memsuper (memsuper);
 	return setLayout;
 }
 
@@ -1093,17 +1098,20 @@ QFV_ParsePipelineLayout (vulkan_ctx_t *ctx, plitem_t *plist,
 {
 	qfv_device_t *device = ctx->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
+	memsuper_t *memsuper = new_memsuper ();
 
 	VkPipelineLayoutCreateInfo cInfo = {};
 
-	if (!parse_object (ctx, plist, parse_VkPipelineLayoutCreateInfo,
+	if (!parse_object (ctx, memsuper, plist, parse_VkPipelineLayoutCreateInfo,
 					   &cInfo, properties)) {
+		delete_memsuper (memsuper);
 		return 0;
 	}
 
 	VkPipelineLayout layout;
 	dfunc->vkCreatePipelineLayout (device->dev, &cInfo, 0, &layout);
 
+	delete_memsuper (memsuper);
 	return layout;
 }
 
@@ -1112,17 +1120,20 @@ QFV_ParseSampler (vulkan_ctx_t *ctx, plitem_t *plist, plitem_t *properties)
 {
 	qfv_device_t *device = ctx->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
+	memsuper_t *memsuper = new_memsuper ();
 
 	VkSamplerCreateInfo cInfo = {};
 
-	if (!parse_object (ctx, plist, parse_VkSamplerCreateInfo, &cInfo,
+	if (!parse_object (ctx, memsuper, plist, parse_VkSamplerCreateInfo, &cInfo,
 					   properties)) {
+		delete_memsuper (memsuper);
 		return 0;
 	}
 
 	VkSampler sampler;
 	dfunc->vkCreateSampler (device->dev, &cInfo, 0, &sampler);
 
+	delete_memsuper (memsuper);
 	return sampler;
 }
 
@@ -1131,17 +1142,20 @@ QFV_ParseImage (vulkan_ctx_t *ctx, plitem_t *plist, plitem_t *properties)
 {
 	qfv_device_t *device = ctx->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
+	memsuper_t *memsuper = new_memsuper ();
 
 	VkImageCreateInfo cInfo = {};
 
-	if (!parse_object (ctx, plist, parse_VkImageCreateInfo, &cInfo,
+	if (!parse_object (ctx, memsuper, plist, parse_VkImageCreateInfo, &cInfo,
 					   properties)) {
+		delete_memsuper (memsuper);
 		return 0;
 	}
 
 	VkImage image;
 	dfunc->vkCreateImage (device->dev, &cInfo, 0, &image);
 
+	delete_memsuper (memsuper);
 	return image;
 }
 
@@ -1150,17 +1164,20 @@ QFV_ParseImageView (vulkan_ctx_t *ctx, plitem_t *plist, plitem_t *properties)
 {
 	qfv_device_t *device = ctx->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
+	memsuper_t *memsuper = new_memsuper ();
 
 	VkImageViewCreateInfo cInfo = {};
 
-	if (!parse_object (ctx, plist, parse_VkImageViewCreateInfo, &cInfo,
-					   properties)) {
+	if (!parse_object (ctx, memsuper, plist, parse_VkImageViewCreateInfo,
+					   &cInfo, properties)) {
+		delete_memsuper (memsuper);
 		return 0;
 	}
 
 	VkImageView imageView;
 	dfunc->vkCreateImageView (device->dev, &cInfo, 0, &imageView);
 
+	delete_memsuper (memsuper);
 	return imageView;
 }
 
@@ -1177,14 +1194,14 @@ typedef struct {
 static plelement_t qfv_imagecreate_dict = {
 	QFDictionary,
 	sizeof (VkImageCreateInfo),
-	array_alloc,
+	vkparse_alloc,
 	parse_VkImageCreateInfo,
 };
 
 static plelement_t qfv_imageviewcreate_dict = {
 	QFDictionary,
 	sizeof (VkImageViewCreateInfo),
-	array_alloc,
+	vkparse_alloc,
 	parse_VkImageViewCreateInfo,
 };
 
@@ -1202,11 +1219,6 @@ parse_imagecreate_dict (const plfield_t *field, const plitem_t *item,
 		imagecreate_t  *imagecreate = data;
 		imagecreate->count = arr->size;
 		imagecreate->info = (VkImageCreateInfo *) arr->a;
-	} else {
-		//FIXME leaky boat when succeeds
-		if (arr) {
-			free (arr);
-		}
 	}
 	return ret;
 }
@@ -1239,18 +1251,21 @@ QFV_ParseImageSet (vulkan_ctx_t *ctx, plitem_t *item, plitem_t *properties)
 {
 	qfv_device_t *device = ctx->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
+	memsuper_t *memsuper = new_memsuper ();
 
 	imagecreate_t create = {};
 
 	pltype_t    type = PL_Type (item);
 
 	if (type == QFDictionary) {
-		if (!parse_object (ctx, item, parse_imagecreate_dict, &create,
-						   properties)) {
+		if (!parse_object (ctx, memsuper, item, parse_imagecreate_dict,
+						   &create, properties)) {
+			delete_memsuper (memsuper);
 			return 0;
 		}
 	} else {
 		Sys_Printf ("Neither array nor dictionary: %d\n", PL_Line (item));
+		delete_memsuper (memsuper);
 		return 0;
 	}
 
@@ -1265,6 +1280,7 @@ QFV_ParseImageSet (vulkan_ctx_t *ctx, plitem_t *item, plitem_t *properties)
 		QFV_AddHandle (ctx->images, name, (uint64_t) set->a[i]);
 	}
 
+	delete_memsuper (memsuper);
 	return set;
 }
 
@@ -1274,18 +1290,21 @@ QFV_ParseImageViewSet (vulkan_ctx_t *ctx, plitem_t *item,
 {
 	qfv_device_t *device = ctx->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
+	memsuper_t *memsuper = new_memsuper ();
 
 	imageviewcreate_t create = {};
 
 	pltype_t    type = PL_Type (item);
 
 	if (type == QFDictionary) {
-		if (!parse_object (ctx, item, parse_imageviewcreate_dict, &create,
-						   properties)) {
+		if (!parse_object (ctx, memsuper, item, parse_imageviewcreate_dict,
+						   &create, properties)) {
+			delete_memsuper (memsuper);
 			return 0;
 		}
 	} else {
 		Sys_Printf ("Neither array nor dictionary: %d\n", PL_Line (item));
+		delete_memsuper (memsuper);
 		return 0;
 	}
 
@@ -1298,6 +1317,7 @@ QFV_ParseImageViewSet (vulkan_ctx_t *ctx, plitem_t *item,
 		QFV_AddHandle (ctx->imageViews, name, (uint64_t) set->a[i]);
 	}
 
+	delete_memsuper (memsuper);
 	return set;
 }
 
@@ -1306,11 +1326,13 @@ QFV_ParseFramebuffer (vulkan_ctx_t *ctx, plitem_t *plist, plitem_t *properties)
 {
 	qfv_device_t *device = ctx->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
+	memsuper_t *memsuper = new_memsuper ();
 
 	VkFramebufferCreateInfo cInfo = {};
 
-	if (!parse_object (ctx, plist, parse_VkFramebufferCreateInfo, &cInfo,
-					   properties)) {
+	if (!parse_object (ctx, memsuper, plist, parse_VkFramebufferCreateInfo,
+					   &cInfo, properties)) {
+		delete_memsuper (memsuper);
 		return 0;
 	}
 
@@ -1318,6 +1340,7 @@ QFV_ParseFramebuffer (vulkan_ctx_t *ctx, plitem_t *plist, plitem_t *properties)
 	dfunc->vkCreateFramebuffer (device->dev, &cInfo, 0, &framebuffer);
 	printf ("framebuffer, renderPass: %p, %p\n", framebuffer, cInfo.renderPass);
 
+	delete_memsuper (memsuper);
 	return framebuffer;
 }
 
@@ -1325,19 +1348,16 @@ static int
 parse_clearvalueset (const plfield_t *field, const plitem_t *item, void *data,
 					 plitem_t *messages, void *context)
 {
-	parsectx_t *parsectx = context;
-	vulkan_ctx_t *ctx = parsectx->vctx;
-
 	plelement_t element = {
 		QFDictionary,
 		sizeof (VkClearValue),
-		array_alloc,
+		vkparse_alloc,
 		parse_VkClearValue,
 		0,
 	};
 	plfield_t   f = { 0, 0, 0, 0, &element };
 
-	if (!PL_ParseArray (&f, item, &ctx->clearValues, messages, context)) {
+	if (!PL_ParseArray (&f, item, data, messages, context)) {
 		return 0;
 	}
 	return 1;
@@ -1346,9 +1366,19 @@ parse_clearvalueset (const plfield_t *field, const plitem_t *item, void *data,
 int
 QFV_ParseClearValues (vulkan_ctx_t *ctx, plitem_t *plist, plitem_t *properties)
 {
-	if (!parse_object (ctx, plist, parse_clearvalueset, &ctx->clearValues,
-					   properties)) {
-		return 0;
+	int         ret = 0;
+	memsuper_t *memsuper = new_memsuper ();
+	clearvalueset_t *clearValues = 0;
+
+	ctx->clearValues = 0;
+	if (parse_object (ctx, memsuper, plist, parse_clearvalueset, &clearValues,
+					  properties)) {
+		ret = 1;
+		ctx->clearValues = DARRAY_ALLOCFIXED (clearvalueset_t,
+											  clearValues->size, malloc);
+		memcpy (ctx->clearValues->a, clearValues->a,
+				clearValues->size * sizeof (clearValues->a[0]));
 	}
-	return 1;
+	delete_memsuper (memsuper);
+	return ret;
 }
diff --git a/libs/video/renderer/vulkan/vulkan_lighting.c b/libs/video/renderer/vulkan/vulkan_lighting.c
index 01df24722..b1eecf3d3 100644
--- a/libs/video/renderer/vulkan/vulkan_lighting.c
+++ b/libs/video/renderer/vulkan/vulkan_lighting.c
@@ -77,7 +77,7 @@ find_visible_lights (vulkan_ctx_t *ctx)
 	}
 
 	if (leaf != lframe->leaf) {
-		double start = Sys_DoubleTime ();
+		//double start = Sys_DoubleTime ();
 		byte        pvs[MAP_PVS_BYTES];
 
 		Mod_LeafPVS_set (leaf, model, 0, pvs);
@@ -89,8 +89,8 @@ find_visible_lights (vulkan_ctx_t *ctx)
 		}
 		lframe->leaf = leaf;
 
-		double end = Sys_DoubleTime ();
-		Sys_Printf ("find_visible_lights: %.5gus\n", (end - start) * 1e6);
+		//double end = Sys_DoubleTime ();
+		//Sys_Printf ("find_visible_lights: %.5gus\n", (end - start) * 1e6);
 
 		int visible = 0;
 		memset (lframe->lightvis.a, 0, lframe->lightvis.size * sizeof (byte));
@@ -101,8 +101,8 @@ find_visible_lights (vulkan_ctx_t *ctx)
 				visible++;
 			}
 		}
-		Sys_Printf ("find_visible_lights: %d / %zd visible\n", visible,
-					 lframe->lightvis.size);
+		//Sys_Printf ("find_visible_lights: %d / %zd visible\n", visible,
+		//			 lframe->lightvis.size);
 	}
 }
 
@@ -313,6 +313,7 @@ Vulkan_Lighting_Init (vulkan_ctx_t *ctx)
 		__auto_type lframe = &lctx->frames.a[i];
 
 		DARRAY_INIT (&lframe->lightvis, 16);
+		lframe->leaf = 0;
 
 		QFV_AllocateCommandBuffers (device, ctx->cmdpool, 1, cmdSet);
 		lframe->cmd = cmdSet->a[0];
diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c
index 8c3c975ef..7c42467de 100644
--- a/libs/video/renderer/vulkan/vulkan_vid_common.c
+++ b/libs/video/renderer/vulkan/vulkan_vid_common.c
@@ -186,6 +186,8 @@ clear_table (hashtab_t **table)
 void
 Vulkan_Shutdown_Common (vulkan_ctx_t *ctx)
 {
+	PL_Free (ctx->pipelineDef);
+	PL_Free (ctx->renderpassDef);
 	if (ctx->pipeline) {
 		QFV_DestroyPipeline (ctx->device, ctx->pipeline);
 	}
@@ -546,6 +548,10 @@ Vulkan_DestroyFrames (vulkan_ctx_t *ctx)
 		df->vkDestroySemaphore (dev, frame->imageAvailableSemaphore, 0);
 		df->vkDestroySemaphore (dev, frame->renderDoneSemaphore, 0);
 		df->vkDestroyFramebuffer (dev, frame->framebuffer, 0);
+		for (int j = 0; j < frame->cmdSetCount; j++) {
+			DARRAY_CLEAR (&frame->cmdSets[j]);
+		}
+		free (frame->cmdSets);
 	}
 
 	DARRAY_CLEAR (&ctx->frames);
diff --git a/libs/video/targets/context_x11.c b/libs/video/targets/context_x11.c
index c118feab2..68e3645fe 100644
--- a/libs/video/targets/context_x11.c
+++ b/libs/video/targets/context_x11.c
@@ -311,9 +311,9 @@ void
 X11_CreateNullCursor (void)
 {
 	Pixmap		cursormask;
-	XGCValues	xgc;
+	XGCValues	xgc = { };
 	GC			gc;
-	XColor		dummycolour;
+	XColor		dummycolour = { };
 
 	if (nullcursor != None)
 		return;
diff --git a/libs/video/targets/keys.c b/libs/video/targets/keys.c
index 5d42aadd0..92ee71fc0 100644
--- a/libs/video/targets/keys.c
+++ b/libs/video/targets/keys.c
@@ -842,6 +842,11 @@ Key_IMT_Drop_All_f (void)
 		while (key_targets[kd].imts) {
 			imt = key_targets[kd].imts;
 			key_targets[kd].imts = imt->next;
+			for (int i = 0; i < QFK_LAST; i++) {
+				if (imt->bindings[i].str) {
+					free (imt->bindings[i].str);
+				}
+			}
 			free ((char *) imt->name);
 			free (imt);
 		}

From 1bafd88a27efe26957c055efcb05571aac1bff84 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 21 Mar 2021 20:40:02 +0900
Subject: [PATCH 1500/1519] oops plist

---
 include/QF/Makemodule.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/QF/Makemodule.am b/include/QF/Makemodule.am
index aefd432f7..4c190feae 100644
--- a/include/QF/Makemodule.am
+++ b/include/QF/Makemodule.am
@@ -36,6 +36,7 @@ include_qf = \
 	include/QF/pakfile.h \
 	include/QF/pcx.h \
 	include/QF/png.h \
+	include/QF/plist.h \
 	include/QF/plugin.h \
 	include/QF/pr_comp.h \
 	include/QF/pr_debug.h \
@@ -45,7 +46,6 @@ include_qf = \
 	include/QF/qargs.h \
 	include/QF/qdefs.h \
 	include/QF/qendian.h \
-	include/QF/qfplist.h \
 	include/QF/qtypes.h \
 	include/QF/quakefs.h \
 	include/QF/quakeio.h \

From 003910612a75a16c995c1a7cd4e9d6bf7a81e65c Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 21 Mar 2021 20:45:43 +0900
Subject: [PATCH 1501/1519] [entity] Fix tests for changed forward/right

I had forgotten that Quake has forward as +X and right as -Y (still a
right-handed system, just that with X forward, Y points left).
---
 libs/entity/test/test-hierarchy.c | 38 +++++++++++++++----------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/libs/entity/test/test-hierarchy.c b/libs/entity/test/test-hierarchy.c
index 513f33fca..7d60f0104 100644
--- a/libs/entity/test/test-hierarchy.c
+++ b/libs/entity/test/test-hierarchy.c
@@ -595,11 +595,11 @@ test_frames (void)
 					   (vec4f_t) { 0, 0, 1, 1 }, "world position")) {
 		return 1;
 	}
-	if (!check_vector (root, Transform_Right, (vec4f_t) { 1, 0, 0, 0 },
-					   "right")) {
+	if (!check_vector (root, Transform_Forward, (vec4f_t) { 1, 0, 0, 0 },
+					   "forward")) {
 		return 1;
 	}
-	if (!check_vector (root, Transform_Forward, (vec4f_t) { 0, 1, 0, 0 },
+	if (!check_vector (root, Transform_Right, (vec4f_t) { 0, -1, 0, 0 },
 					   "right")) {
 		return 1;
 	}
@@ -616,12 +616,12 @@ test_frames (void)
 					   "world position")) {
 		return 1;
 	}
-	if (!check_vector (A, Transform_Right, (vec4f_t) { 0, 1, 0, 0 },
-					   "right")) {
+	if (!check_vector (A, Transform_Forward, (vec4f_t) { 0, 1, 0, 0 },
+					   "forward")) {
 		return 1;
 	}
-	if (!check_vector (A, Transform_Forward, (vec4f_t) { 0, 0, 1, 0 },
-					   "forward")) {
+	if (!check_vector (A, Transform_Right, (vec4f_t) { 0, 0, -1, 0 },
+					   "right")) {
 		return 1;
 	}
 	if (!check_vector (A, Transform_Up, (vec4f_t) { 1, 0, 0, 0 },
@@ -636,12 +636,12 @@ test_frames (void)
 					   "world position")) {
 		return 1;
 	}
-	if (!check_vector (A1, Transform_Right, (vec4f_t) { 1, 0, 0, 0 },
-					   "right")) {
+	if (!check_vector (A1, Transform_Forward, (vec4f_t) { 1, 0, 0, 0 },
+					   "forward")) {
 		return 1;
 	}
-	if (!check_vector (A1, Transform_Forward, (vec4f_t) { 0, 1, 0, 0 },
-					   "forward")) {
+	if (!check_vector (A1, Transform_Right, (vec4f_t) { 0, -1, 0, 0 },
+					   "right")) {
 		return 1;
 	}
 	if (!check_vector (A1, Transform_Up, (vec4f_t) { 0, 0, 1, 0 },
@@ -657,12 +657,12 @@ test_frames (void)
 					   "world position")) {
 		return 1;
 	}
-	if (!check_vector (B, Transform_Right, (vec4f_t) { 0, 0, 1, 0 },
-					   "right")) {
+	if (!check_vector (B, Transform_Forward, (vec4f_t) { 0, 0, 1, 0 },
+					   "forward")) {
 		return 1;
 	}
-	if (!check_vector (B, Transform_Forward, (vec4f_t) {-1, 0, 0, 0 },
-					   "forward")) {
+	if (!check_vector (B, Transform_Right, (vec4f_t) { 1, 0, 0, 0 },
+					   "right")) {
 		return 1;
 	}
 	if (!check_vector (B, Transform_Up, (vec4f_t) { 0,-1, 0, 0 },
@@ -677,12 +677,12 @@ test_frames (void)
 					   "world position")) {
 		return 1;
 	}
-	if (!check_vector (B1, Transform_Right, (vec4f_t) { 1, 0, 0, 0 },
-					   "right")) {
+	if (!check_vector (B1, Transform_Forward, (vec4f_t) { 1, 0, 0, 0 },
+					   "forward")) {
 		return 1;
 	}
-	if (!check_vector (B1, Transform_Forward, (vec4f_t) { 0, 1, 0, 0 },
-					   "forward")) {
+	if (!check_vector (B1, Transform_Right, (vec4f_t) { 0, -1, 0, 0 },
+					   "right")) {
 		return 1;
 	}
 	if (!check_vector (B1, Transform_Up, (vec4f_t) { 0, 0, 1, 0 },

From 56cf181a1137f4d0412f423adc6c0868901cbb3e Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 21 Mar 2021 21:26:36 +0900
Subject: [PATCH 1502/1519] [gamecode] Make PR_RESMAP macros more function-like

I never liked that some of the macros needed the type as a parameter
(yay typeof and __auto_type) or those that returned a value hid the
return statement so they couldn't be used in assignments.
---
 include/QF/progs.h                 | 125 +++++++++++++++--------------
 libs/console/bi_inputline.c        |  10 +--
 libs/gamecode/pr_debug.c           |   4 +-
 libs/ruamoko/rua_hash.c            |  10 +--
 libs/ruamoko/rua_msgbuf.c          |  10 +--
 libs/ruamoko/rua_obj.c             |   8 +-
 libs/ruamoko/rua_plist.c           |  10 +--
 libs/ruamoko/rua_qfile.c           |  10 +--
 libs/ruamoko/rua_script.c          |  10 +--
 libs/ruamoko/rua_set.c             |  20 ++---
 libs/video/renderer/r_progs.c      |  10 +--
 ruamoko/qwaq/builtins/curses.c     |  20 ++---
 ruamoko/qwaq/builtins/debug.c      |  10 +--
 ruamoko/qwaq/builtins/editbuffer.c |  10 +--
 14 files changed, 136 insertions(+), 131 deletions(-)

diff --git a/include/QF/progs.h b/include/QF/progs.h
index 498303c25..8b1a6e118 100644
--- a/include/QF/progs.h
+++ b/include/QF/progs.h
@@ -1532,46 +1532,44 @@ void *PR_Resources_Find (progs_t *pr, const char *name);
 
 /** Allocate a new resource from the resource map.
 
-	\param type		The type of the resource. Must match the \c type parameter
-					used for PR_RESMAP.
 	\param map		The resource map.
 	\return			A pointer to the new resource, or null if no more could
 					be allocated.
 */
-#define PR_RESNEW(type,map)									\
-	type       *t;											\
-															\
-	if (!map._free) {										\
-		int         i, size;								\
-		map._size++;										\
-		size = map._size * sizeof (type *);					\
-		map._map = realloc (map._map, size);				\
-		if (!map._map)										\
-			return 0;										\
-		map._free = calloc (1024, sizeof (type));			\
-		if (!map._free)										\
-			return 0;										\
-		map._map[map._size - 1] = map._free;				\
-		for (i = 0; i < 1023; i++)							\
-			*(type **) &map._free[i] = &map._free[i + 1];	\
-		*(type **) &map._free[i] = 0;						\
-	}														\
-	t = map._free;											\
-	map._free = *(type **) t;								\
-	memset (t, 0, sizeof (type));							\
-	return t
+#define PR_RESNEW(map)														\
+	({																		\
+		if (!map._free) {													\
+			int         i, size;											\
+			map._size++;													\
+			size = map._size * sizeof (map._free);							\
+			map._map = realloc (map._map, size);							\
+			if (!map._map)													\
+				return 0;													\
+			map._free = calloc (1024, sizeof (*map._free));					\
+			if (!map._free)													\
+				return 0;													\
+			map._map[map._size - 1] = map._free;							\
+			for (i = 0; i < 1023; i++)										\
+				*(typeof (map._free) *) &map._free[i] = &map._free[i + 1];	\
+			*(typeof (map._free) *) &map._free[i] = 0;						\
+		}																	\
+		__auto_type t = map._free;											\
+		map._free = *(typeof (map._free) *) t;								\
+		memset (t, 0, sizeof (*map._free));									\
+		t;																	\
+	})
 
 /** Free a resource returning it to the resource map.
 
-	\param type		The type of the resource. Must match the \c type parameter
-					used for PR_RESMAP.
 	\param map		The resource map.
 	\param t		Pointer to the resource to be freed.
 */
-#define PR_RESFREE(type,map,t)								\
-	memset (t, 0, sizeof (type));							\
-	*(type **) t = map._free;								\
-	map._free = t
+#define PR_RESFREE(map,t)									\
+	do {													\
+		memset (t, 0, sizeof (*map._free));					\
+		*(typeof (map._free) *) t = map._free;				\
+		map._free = t;										\
+	} while (0)
 
 /** Free all resources in the resource map.
 
@@ -1580,24 +1578,24 @@ void *PR_Resources_Find (progs_t *pr, const char *name);
 
 	A reset resource map is guaranteed to allocate elements sequentially.
 
-	\param type		The type of the resource. Must match the \c type parameter
-					used for PR_RESMAP.
 	\param map		The resource map.
 */
-#define PR_RESRESET(type,map)								\
-	unsigned    i, j;										\
-	if (!map._size)											\
-		return;												\
-	for (i = 0; i < map._size; i++) {						\
-		map._free = map._map[i];							\
-		for (j = 0; j < 1023; j++)							\
-			*(type **) &map._free[j] = &map._free[j + 1];	\
-		if (i < map._size - 1)								\
-			*(type **) &map._free[j] = &map._map[i + 1][0];	\
-		else												\
-			*(type **) &map._free[j] = 0;					\
-	}														\
-	map._free = map._map[0];
+#define PR_RESRESET(map)													\
+	do {																	\
+		unsigned    i, j;													\
+		if (!map._size)														\
+			return;															\
+		for (i = 0; i < map._size; i++) {									\
+			map._free = map._map[i];										\
+			for (j = 0; j < 1023; j++)										\
+				*(typeof (map._free) *) &map._free[j] = &map._free[j + 1];	\
+			if (i < map._size - 1)											\
+				*(typeof (map._free) *) &map._free[j] = &map._map[i + 1][0];\
+			else															\
+				*(typeof (map._free) *) &map._free[j] = 0;					\
+		}																	\
+		map._free = map._map[0];											\
+	} while (0)
 
 /** Retrieve a resource from the resource map using a handle.
 
@@ -1606,12 +1604,14 @@ void *PR_Resources_Find (progs_t *pr, const char *name);
 	\return			A pointer to the resource, or NULL if the handle is
 					invalid.
 */
-#define PR_RESGET(map,col)									\
-	unsigned    row = ~col / 1024;							\
-	col = ~col % 1024;										\
-	if (row >= map._size)									\
-		return 0;											\
-	return &map._map[row][col]
+#define PR_RESGET(map,col)										\
+	({															\
+		unsigned    row = ~col / 1024;							\
+		col = ~col % 1024;										\
+		if (row >= map._size)									\
+			return 0;											\
+		&map._map[row][col];									\
+	})
 
 /** Convert a resource pointer to a handle.
 
@@ -1619,14 +1619,19 @@ void *PR_Resources_Find (progs_t *pr, const char *name);
 	\param ptr		The resource pointer.
 	\return			The handle or 0 if the pointer is invalid.
 */
-#define PR_RESINDEX(map,ptr)								\
-	unsigned    i;											\
-	for (i = 0; i < map._size; i++) {						\
-		long d = ptr - map._map[i];							\
-		if (d >= 0 && d < 1024)								\
-			return ~(i * 1024 + d);							\
-	}														\
-	return 0
+#define PR_RESINDEX(map,ptr)									\
+	({															\
+		unsigned    i;											\
+		unsigned    index = 0;									\
+		for (i = 0; i < map._size; i++) {						\
+			long d = ptr - map._map[i];							\
+			if (d >= 0 && d < 1024)	{							\
+				index = ~(i * 1024 + d);						\
+				break;											\
+			}													\
+		}														\
+		index;													\
+	})
 ///@}
 
 ///@}
diff --git a/libs/console/bi_inputline.c b/libs/console/bi_inputline.c
index 7e4e743a2..b55cfa034 100644
--- a/libs/console/bi_inputline.c
+++ b/libs/console/bi_inputline.c
@@ -62,31 +62,31 @@ typedef struct {
 static il_data_t *
 il_data_new (il_resources_t *res)
 {
-	PR_RESNEW (il_data_t, res->line_map);
+	return PR_RESNEW (res->line_map);
 }
 
 static void
 il_data_free (il_resources_t *res, il_data_t *line)
 {
-	PR_RESFREE (il_data_t, res->line_map, line);
+	PR_RESFREE (res->line_map, line);
 }
 
 static void
 il_data_reset (il_resources_t *res)
 {
-	PR_RESRESET (il_data_t, res->line_map);
+	PR_RESRESET (res->line_map);
 }
 
 static inline il_data_t *
 il_data_get (il_resources_t *res, unsigned index)
 {
-	PR_RESGET (res->line_map, index);
+	return PR_RESGET (res->line_map, index);
 }
 
 static inline int __attribute__((pure))
 il_data_index (il_resources_t *res, il_data_t *line)
 {
-	PR_RESINDEX (res->line_map, line);
+	return PR_RESINDEX (res->line_map, line);
 }
 
 static void
diff --git a/libs/gamecode/pr_debug.c b/libs/gamecode/pr_debug.c
index a272babf8..e8aa20e66 100644
--- a/libs/gamecode/pr_debug.c
+++ b/libs/gamecode/pr_debug.c
@@ -373,7 +373,7 @@ pr_debug_clear (progs_t *pr, void *data)
 	Hash_FlushTable (res->file_hash);
 	Hash_FlushTable (res->debug_syms);
 	Hash_FlushTable (res->compunits);
-	PR_RESRESET (compunit_t, res->compmap);
+	PR_RESRESET (res->compmap);
 	res->debug = 0;
 	res->auxfunctions = 0;
 	if (res->auxfunction_map)
@@ -461,7 +461,7 @@ byteswap_def (pr_def_t *def)
 static compunit_t *
 new_compunit (prdeb_resources_t *res)
 {
-	PR_RESNEW (compunit_t, res->compmap);
+	return PR_RESNEW (res->compmap);
 }
 
 static void
diff --git a/libs/ruamoko/rua_hash.c b/libs/ruamoko/rua_hash.c
index 98d9722ba..6448e0b1c 100644
--- a/libs/ruamoko/rua_hash.c
+++ b/libs/ruamoko/rua_hash.c
@@ -64,31 +64,31 @@ typedef struct {
 static bi_hashtab_t *
 table_new (hash_resources_t *res)
 {
-	PR_RESNEW (bi_hashtab_t, res->table_map);
+	return PR_RESNEW (res->table_map);
 }
 
 static void
 table_free (hash_resources_t *res, bi_hashtab_t *table)
 {
-	PR_RESFREE (bi_hashtab_t, res->table_map, table);
+	PR_RESFREE (res->table_map, table);
 }
 
 static void
 table_reset (hash_resources_t *res)
 {
-	PR_RESRESET (bi_hashtab_t, res->table_map);
+	PR_RESRESET (res->table_map);
 }
 
 static inline bi_hashtab_t *
 table_get (hash_resources_t *res, int index)
 {
-	PR_RESGET(res->table_map, index);
+	return PR_RESGET(res->table_map, index);
 }
 
 static inline int __attribute__((pure))
 table_index (hash_resources_t *res, bi_hashtab_t *table)
 {
-	PR_RESINDEX(res->table_map, table);
+	return PR_RESINDEX(res->table_map, table);
 }
 
 static const char *
diff --git a/libs/ruamoko/rua_msgbuf.c b/libs/ruamoko/rua_msgbuf.c
index 51c7bcf16..e16525053 100644
--- a/libs/ruamoko/rua_msgbuf.c
+++ b/libs/ruamoko/rua_msgbuf.c
@@ -58,32 +58,32 @@ typedef struct {
 static msgbuf_t *
 msgbuf_new (msgbuf_resources_t *res)
 {
-	PR_RESNEW (msgbuf_t, res->msgbuf_map);
+	return PR_RESNEW (res->msgbuf_map);
 }
 
 static void
 msgbuf_free (progs_t *pr, msgbuf_resources_t *res, msgbuf_t *msgbuf)
 {
 	PR_Zone_Free (pr, msgbuf->sizebuf.data);
-	PR_RESFREE (msgbuf_t, res->msgbuf_map, msgbuf);
+	PR_RESFREE (res->msgbuf_map, msgbuf);
 }
 
 static void
 msgbuf_reset (msgbuf_resources_t *res)
 {
-	PR_RESRESET (msgbuf_t, res->msgbuf_map);
+	PR_RESRESET (res->msgbuf_map);
 }
 
 static inline msgbuf_t *
 msgbuf_get (msgbuf_resources_t *res, int index)
 {
-	PR_RESGET(res->msgbuf_map, index);
+	return PR_RESGET(res->msgbuf_map, index);
 }
 
 static inline int __attribute__((pure))
 msgbuf_index (msgbuf_resources_t *res, msgbuf_t *msgbuf)
 {
-	PR_RESINDEX(res->msgbuf_map, msgbuf);
+	return PR_RESINDEX(res->msgbuf_map, msgbuf);
 }
 
 static void
diff --git a/libs/ruamoko/rua_obj.c b/libs/ruamoko/rua_obj.c
index 8612cd6f0..a901823b0 100644
--- a/libs/ruamoko/rua_obj.c
+++ b/libs/ruamoko/rua_obj.c
@@ -93,25 +93,25 @@ typedef struct probj_resources_s {
 static dtable_t *
 dtable_new (probj_t *probj)
 {
-	PR_RESNEW (dtable_t, probj->dtables);
+	return PR_RESNEW (probj->dtables);
 }
 
 static void
 dtable_reset (probj_t *probj)
 {
-	PR_RESRESET (dtable_t, probj->dtables);
+	PR_RESRESET (probj->dtables);
 }
 
 static inline dtable_t *
 dtable_get (probj_t *probj, int index)
 {
-	PR_RESGET (probj->dtables, index);
+	return PR_RESGET (probj->dtables, index);
 }
 
 static inline int __attribute__((pure))
 dtable_index (probj_t *probj, dtable_t *dtable)
 {
-	PR_RESINDEX (probj->dtables, dtable);
+	return PR_RESINDEX (probj->dtables, dtable);
 }
 
 static always_inline dtable_t * __attribute__((pure))
diff --git a/libs/ruamoko/rua_plist.c b/libs/ruamoko/rua_plist.c
index d8b3c0da1..afccba62e 100644
--- a/libs/ruamoko/rua_plist.c
+++ b/libs/ruamoko/rua_plist.c
@@ -63,31 +63,31 @@ typedef struct {
 static bi_plist_t *
 plist_new (plist_resources_t *res)
 {
-	PR_RESNEW (bi_plist_t, res->plist_map);
+	return PR_RESNEW (res->plist_map);
 }
 
 static void
 plist_free (plist_resources_t *res, bi_plist_t *plist)
 {
-	PR_RESFREE (bi_plist_t, res->plist_map, plist);
+	PR_RESFREE (res->plist_map, plist);
 }
 
 static void
 plist_reset (plist_resources_t *res)
 {
-	PR_RESRESET (bi_plist_t, res->plist_map);
+	PR_RESRESET (res->plist_map);
 }
 
 static inline bi_plist_t *
 plist_get (plist_resources_t *res, unsigned index)
 {
-	PR_RESGET(res->plist_map, index);
+	return PR_RESGET(res->plist_map, index);
 }
 
 static inline int __attribute__((pure))
 plist_index (plist_resources_t *res, bi_plist_t *plist)
 {
-	PR_RESINDEX(res->plist_map, plist);
+	return PR_RESINDEX(res->plist_map, plist);
 }
 
 static void
diff --git a/libs/ruamoko/rua_qfile.c b/libs/ruamoko/rua_qfile.c
index 2f625a949..8c6c45ef1 100644
--- a/libs/ruamoko/rua_qfile.c
+++ b/libs/ruamoko/rua_qfile.c
@@ -56,31 +56,31 @@ typedef struct {
 static qfile_t *
 handle_new (qfile_resources_t *res)
 {
-	PR_RESNEW (qfile_t, res->handle_map);
+	return PR_RESNEW (res->handle_map);
 }
 
 static void
 handle_free (qfile_resources_t *res, qfile_t *handle)
 {
-	PR_RESFREE (qfile_t, res->handle_map, handle);
+	PR_RESFREE (res->handle_map, handle);
 }
 
 static void
 handle_reset (qfile_resources_t *res)
 {
-	PR_RESRESET (qfile_t, res->handle_map);
+	PR_RESRESET (res->handle_map);
 }
 
 static inline qfile_t *
 handle_get (qfile_resources_t *res, int index)
 {
-	PR_RESGET(res->handle_map, index);
+	return PR_RESGET(res->handle_map, index);
 }
 
 static inline int __attribute__((pure))
 handle_index (qfile_resources_t *res, qfile_t *handle)
 {
-	PR_RESINDEX(res->handle_map, handle);
+	return PR_RESINDEX(res->handle_map, handle);
 }
 
 static void
diff --git a/libs/ruamoko/rua_script.c b/libs/ruamoko/rua_script.c
index 7c2cd6666..4723bfcbe 100644
--- a/libs/ruamoko/rua_script.c
+++ b/libs/ruamoko/rua_script.c
@@ -57,31 +57,31 @@ typedef struct {
 static rua_script_t *
 script_new (script_resources_t *res)
 {
-	PR_RESNEW (rua_script_t, res->scripts);
+	return PR_RESNEW (res->scripts);
 }
 
 static void
 script_free (script_resources_t *res, rua_script_t *script)
 {
-	PR_RESFREE (rua_script_t, res->scripts, script);
+	PR_RESFREE (res->scripts, script);
 }
 
 static void
 script_reset (script_resources_t *res)
 {
-	PR_RESRESET (rua_script_t, res->scripts);
+	PR_RESRESET (res->scripts);
 }
 
 static inline rua_script_t *
 script_get (script_resources_t *res, int index)
 {
-	PR_RESGET(res->scripts, index);
+	return PR_RESGET(res->scripts, index);
 }
 
 static inline int __attribute__((pure))
 script_index (script_resources_t *res, rua_script_t *script)
 {
-	PR_RESINDEX(res->scripts, script);
+	return PR_RESINDEX(res->scripts, script);
 }
 
 static void
diff --git a/libs/ruamoko/rua_set.c b/libs/ruamoko/rua_set.c
index 3bc36c06b..343e0ced0 100644
--- a/libs/ruamoko/rua_set.c
+++ b/libs/ruamoko/rua_set.c
@@ -77,61 +77,61 @@ typedef struct {
 static bi_set_t *
 res_set_new (set_resources_t *res)
 {
-	PR_RESNEW (bi_set_t, res->set_map);
+	return PR_RESNEW (res->set_map);
 }
 
 static void
 res_set_free (set_resources_t *res, bi_set_t *set)
 {
-	PR_RESFREE (bi_set_t, res->set_map, set);
+	PR_RESFREE (res->set_map, set);
 }
 
 static void
 res_set_reset (set_resources_t *res)
 {
-	PR_RESRESET (bi_set_t, res->set_map);
+	PR_RESRESET (res->set_map);
 }
 
 static inline bi_set_t *
 res_set_get (set_resources_t *res, int index)
 {
-	PR_RESGET(res->set_map, index);
+	return PR_RESGET(res->set_map, index);
 }
 
 static inline int __attribute__((pure))
 res_set_index (set_resources_t *res, bi_set_t *set)
 {
-	PR_RESINDEX(res->set_map, set);
+	return PR_RESINDEX(res->set_map, set);
 }
 
 static bi_set_iter_t *
 res_set_iter_new (set_resources_t *res)
 {
-	PR_RESNEW (bi_set_iter_t, res->set_iter_map);
+	return PR_RESNEW (res->set_iter_map);
 }
 
 static void
 res_set_iter_free (set_resources_t *res, bi_set_iter_t *set_iter)
 {
-	PR_RESFREE (bi_set_iter_t, res->set_iter_map, set_iter);
+	PR_RESFREE (res->set_iter_map, set_iter);
 }
 
 static void
 res_set_iter_reset (set_resources_t *res)
 {
-	PR_RESRESET (bi_set_iter_t, res->set_iter_map);
+	PR_RESRESET (res->set_iter_map);
 }
 
 static inline bi_set_iter_t *
 res_set_iter_get (set_resources_t *res, int index)
 {
-	PR_RESGET(res->set_iter_map, index);
+	return PR_RESGET(res->set_iter_map, index);
 }
 
 static inline int __attribute__((pure))
 res_set_iter_index (set_resources_t *res, bi_set_iter_t *set_iter)
 {
-	PR_RESINDEX(res->set_iter_map, set_iter);
+	return PR_RESINDEX(res->set_iter_map, set_iter);
 }
 
 static bi_set_t *
diff --git a/libs/video/renderer/r_progs.c b/libs/video/renderer/r_progs.c
index 3f2925fba..c09569c56 100644
--- a/libs/video/renderer/r_progs.c
+++ b/libs/video/renderer/r_progs.c
@@ -68,7 +68,7 @@ typedef struct {
 static qpic_res_t *
 qpic_new (draw_resources_t *res)
 {
-	PR_RESNEW (qpic_res_t, res->qpic_map);
+	return PR_RESNEW (res->qpic_map);
 }
 
 static void
@@ -86,25 +86,25 @@ static void
 qpic_free (draw_resources_t *res, qpic_res_t *qp)
 {
 	bi_draw_free_qpic (qp);
-	PR_RESFREE (qpic_res_t, res->qpic_map, qp);
+	PR_RESFREE (res->qpic_map, qp);
 }
 
 static void
 qpic_reset (draw_resources_t *res)
 {
-	PR_RESRESET (qpic_res_t, res->qpic_map);
+	PR_RESRESET (res->qpic_map);
 }
 
 static inline qpic_res_t *
 qpic_get (draw_resources_t *res, int index)
 {
-	PR_RESGET (res->qpic_map, index);
+	return PR_RESGET (res->qpic_map, index);
 }
 
 static inline int __attribute__((pure))
 qpic_index (draw_resources_t *res, qpic_res_t *qp)
 {
-	PR_RESINDEX (res->qpic_map, qp);
+	return PR_RESINDEX (res->qpic_map, qp);
 }
 
 static qpic_res_t *
diff --git a/ruamoko/qwaq/builtins/curses.c b/ruamoko/qwaq/builtins/curses.c
index 0848158f7..cf4f1ebe3 100644
--- a/ruamoko/qwaq/builtins/curses.c
+++ b/ruamoko/qwaq/builtins/curses.c
@@ -127,31 +127,31 @@ static const char *qwaq_command_names[]= {
 static window_t *
 window_new (qwaq_resources_t *res)
 {
-	PR_RESNEW (window_t, res->window_map);
+	return PR_RESNEW (res->window_map);
 }
 
 static void
 window_free (qwaq_resources_t *res, window_t *win)
 {
-	PR_RESFREE (window_t, res->window_map, win);
+	PR_RESFREE (res->window_map, win);
 }
 
 static void
 window_reset (qwaq_resources_t *res)
 {
-	PR_RESRESET (window_t, res->window_map);
+	PR_RESRESET (res->window_map);
 }
 
 static inline window_t *
 window_get (qwaq_resources_t *res, unsigned index)
 {
-	PR_RESGET(res->window_map, index);
+	return PR_RESGET(res->window_map, index);
 }
 
 static inline int __attribute__((pure))
 window_index (qwaq_resources_t *res, window_t *win)
 {
-	PR_RESINDEX (res->window_map, win);
+	return PR_RESINDEX (res->window_map, win);
 }
 
 static always_inline window_t * __attribute__((pure))
@@ -173,31 +173,31 @@ get_window (qwaq_resources_t *res, const char *name, int handle)
 static panel_t *
 panel_new (qwaq_resources_t *res)
 {
-	PR_RESNEW (panel_t, res->panel_map);
+	return PR_RESNEW (res->panel_map);
 }
 
 static void
 panel_free (qwaq_resources_t *res, panel_t *win)
 {
-	PR_RESFREE (panel_t, res->panel_map, win);
+	PR_RESFREE (res->panel_map, win);
 }
 
 static void
 panel_reset (qwaq_resources_t *res)
 {
-	PR_RESRESET (panel_t, res->panel_map);
+	PR_RESRESET (res->panel_map);
 }
 
 static inline panel_t *
 panel_get (qwaq_resources_t *res, unsigned index)
 {
-	PR_RESGET(res->panel_map, index);
+	return PR_RESGET(res->panel_map, index);
 }
 
 static inline int __attribute__((pure))
 panel_index (qwaq_resources_t *res, panel_t *win)
 {
-	PR_RESINDEX (res->panel_map, win);
+	return PR_RESINDEX (res->panel_map, win);
 }
 
 static always_inline panel_t * __attribute__((pure))
diff --git a/ruamoko/qwaq/builtins/debug.c b/ruamoko/qwaq/builtins/debug.c
index 19b215e38..a8c56f280 100644
--- a/ruamoko/qwaq/builtins/debug.c
+++ b/ruamoko/qwaq/builtins/debug.c
@@ -73,31 +73,31 @@ typedef struct qwaq_debug_s {
 static qwaq_target_t *
 target_new (qwaq_debug_t *debug)
 {
-	PR_RESNEW (qwaq_target_t, debug->targets);
+	return PR_RESNEW (debug->targets);
 }
 
 static void
 target_free (qwaq_debug_t *debug, qwaq_target_t *target)
 {
-	PR_RESFREE (qwaq_target_t, debug->targets, target);
+	PR_RESFREE (debug->targets, target);
 }
 
 static void
 target_reset (qwaq_debug_t *debug)
 {
-	PR_RESRESET (qwaq_target_t, debug->targets);
+	PR_RESRESET (debug->targets);
 }
 
 static inline qwaq_target_t *
 target_get (qwaq_debug_t *debug, unsigned index)
 {
-	PR_RESGET (debug->targets, index);
+	return PR_RESGET (debug->targets, index);
 }
 
 static inline int __attribute__((pure))
 target_index (qwaq_debug_t *debug, qwaq_target_t *target)
 {
-	PR_RESINDEX (debug->targets, target);
+	return PR_RESINDEX (debug->targets, target);
 }
 
 static always_inline qwaq_target_t * __attribute__((pure))
diff --git a/ruamoko/qwaq/builtins/editbuffer.c b/ruamoko/qwaq/builtins/editbuffer.c
index d687103d3..666632944 100644
--- a/ruamoko/qwaq/builtins/editbuffer.c
+++ b/ruamoko/qwaq/builtins/editbuffer.c
@@ -31,31 +31,31 @@ typedef struct qwaq_ebresources_s {
 static editbuffer_t *
 editbuffer_new (qwaq_ebresources_t *res)
 {
-	PR_RESNEW (editbuffer_t, res->buffers);
+	return PR_RESNEW (res->buffers);
 }
 
 static void
 editbuffer_free (qwaq_ebresources_t *res, editbuffer_t *buffer)
 {
-	PR_RESFREE (editbuffer_t, res->buffers, buffer);
+	PR_RESFREE (res->buffers, buffer);
 }
 
 static void
 editbuffer_reset (qwaq_ebresources_t *res)
 {
-	PR_RESRESET (editbuffer_t, res->buffers);
+	PR_RESRESET (res->buffers);
 }
 
 static inline editbuffer_t *
 editbuffer_get (qwaq_ebresources_t *res, unsigned index)
 {
-	PR_RESGET (res->buffers, index);
+	return PR_RESGET (res->buffers, index);
 }
 
 static inline int __attribute__((pure))
 editbuffer_index (qwaq_ebresources_t *res, editbuffer_t *buffer)
 {
-	PR_RESINDEX (res->buffers, buffer);
+	return PR_RESINDEX (res->buffers, buffer);
 }
 
 static always_inline editbuffer_t * __attribute__((pure))

From ce2ffac078df0179f643ae7fe7f54cf753fee7ae Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 21 Mar 2021 22:33:57 +0900
Subject: [PATCH 1503/1519] [entity] Free all memory in the unit test

Now I know that deleting transforms works properly.
---
 libs/entity/test/test-hierarchy.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libs/entity/test/test-hierarchy.c b/libs/entity/test/test-hierarchy.c
index 7d60f0104..428dfcc5c 100644
--- a/libs/entity/test/test-hierarchy.c
+++ b/libs/entity/test/test-hierarchy.c
@@ -690,6 +690,8 @@ test_frames (void)
 		return 1;
 	}
 
+	Transform_Delete (root);
+
 	return 0;
 }
 

From 1f8c4465a26fe24fe812b19f476baefa9d7bff25 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 21 Mar 2021 23:03:11 +0900
Subject: [PATCH 1504/1519] [gamecode] Make non-clearing version of PR_RESNEW

---
 include/QF/progs.h | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/include/QF/progs.h b/include/QF/progs.h
index 8b1a6e118..52e81d8a4 100644
--- a/include/QF/progs.h
+++ b/include/QF/progs.h
@@ -118,7 +118,7 @@ typedef struct pr_stashed_params_s {
 				alloca().
 
 	\param pr		pointer to ::progs_t VM struct
-	\return 		Pointer to a newly allocated and initialized parameter
+	\return			Pointer to a newly allocated and initialized parameter
 					stash that has the current parameters saved to it.
 	\hideinitializer
 */
@@ -137,7 +137,7 @@ typedef struct pr_stashed_params_s {
 	\param pr		pointer to ::progs_t VM struct
 	\param params	location to save the parameters, must be of adequade size
 					to hold \a pr_argc * \a pr_param_size words in \a params
-	\return 		\a params Allows the likes of:
+	\return			\a params Allows the likes of:
 						__auto_type params = PR_SaveParams (pr);
 */
 pr_stashed_params_t *_PR_SaveParams (progs_t *pr, pr_stashed_params_t *params);
@@ -1536,7 +1536,7 @@ void *PR_Resources_Find (progs_t *pr, const char *name);
 	\return			A pointer to the new resource, or null if no more could
 					be allocated.
 */
-#define PR_RESNEW(map)														\
+#define PR_RESNEW_NC(map)													\
 	({																		\
 		if (!map._free) {													\
 			int         i, size;											\
@@ -1545,7 +1545,7 @@ void *PR_Resources_Find (progs_t *pr, const char *name);
 			map._map = realloc (map._map, size);							\
 			if (!map._map)													\
 				return 0;													\
-			map._free = calloc (1024, sizeof (*map._free));					\
+			map._free = malloc (1024 * sizeof (*map._free));				\
 			if (!map._free)													\
 				return 0;													\
 			map._map[map._size - 1] = map._free;							\
@@ -1555,6 +1555,12 @@ void *PR_Resources_Find (progs_t *pr, const char *name);
 		}																	\
 		__auto_type t = map._free;											\
 		map._free = *(typeof (map._free) *) t;								\
+		t;																	\
+	})
+
+#define PR_RESNEW(map)														\
+	({																		\
+		__auto_type t = PR_RESNEW_NC (map);									\
 		memset (t, 0, sizeof (*map._free));									\
 		t;																	\
 	})

From 410fecd67b097184cbcbfab8ae14b01fc774acad Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 21 Mar 2021 23:05:13 +0900
Subject: [PATCH 1505/1519] [client] Fix the transform memory leak

The transforms aren't actually freed at the end (more work), but at
least they aren't lost any more, though one is still lost for the
viewent (weapon). The obvious fix didn't work.
---
 libs/client/cl_temp_entities.c | 80 ++++++++--------------------------
 nq/source/cl_ents.c            |  8 ++--
 2 files changed, 23 insertions(+), 65 deletions(-)

diff --git a/libs/client/cl_temp_entities.c b/libs/client/cl_temp_entities.c
index 11ae7632d..fdffbf985 100644
--- a/libs/client/cl_temp_entities.c
+++ b/libs/client/cl_temp_entities.c
@@ -40,6 +40,7 @@
 
 #include "QF/entity.h"
 #include "QF/msg.h"
+#include "QF/progs.h"	// for PR_RESMAP
 #include "QF/quakefs.h"
 #include "QF/render.h"
 #include "QF/sound.h"
@@ -54,9 +55,6 @@ typedef struct tent_s {
 	entity_t    ent;
 } tent_t;
 
-#define TEMP_BATCH 64
-static tent_t *temp_entities = 0;
-
 typedef struct {
 	int         entity;
 	struct model_s *model;
@@ -83,9 +81,11 @@ typedef struct tent_obj_s {
 	} to;
 } tent_obj_t;
 
-static tent_obj_t *tent_objects;
+static PR_RESMAP (tent_t) temp_entities;
+static PR_RESMAP (tent_obj_t) tent_objects;
 static tent_obj_t *cl_beams;
 static tent_obj_t *cl_explosions;
+
 static tent_t *cl_projectiles;
 
 static sfx_t *cl_sfx_wizhit;
@@ -158,20 +158,8 @@ CL_Init_Entity (entity_t *ent)
 static tent_t *
 new_temp_entity (void)
 {
-	tent_t     *tent;
-	if (!temp_entities) {
-		int         i;
-
-		temp_entities = malloc (TEMP_BATCH * sizeof (tent_t));
-		for (i = 0; i < TEMP_BATCH - 1; i++) {
-			temp_entities[i].next = &temp_entities[i + 1];
-			temp_entities[i].ent.transform = 0;
-		}
-		temp_entities[i].next = 0;
-		temp_entities[i].ent.transform = 0;
-	}
-	tent = temp_entities;
-	temp_entities = tent->next;
+	tent_t     *tent = PR_RESNEW_NC (temp_entities);
+	tent->ent.transform = 0;
 	tent->next = 0;
 	CL_Init_Entity (&tent->ent);
 	return tent;
@@ -182,63 +170,35 @@ free_temp_entities (tent_t *tents)
 {
 	tent_t    **t = &tents;
 
-	while (*t)
+	while (*t) {
+		Transform_Delete ((*t)->ent.transform);//FIXME reuse?
 		t = &(*t)->next;
-	*t = temp_entities;
-	temp_entities = tents;
+	}
+	*t = temp_entities._free;
+	temp_entities._free = tents;
 }
 
 static tent_obj_t *
 new_tent_object (void)
 {
-	tent_obj_t *tobj;
-	if (!tent_objects) {
-		int         i;
-
-		tent_objects = malloc (TEMP_BATCH * sizeof (tent_obj_t));
-		for (i = 0; i < TEMP_BATCH - 1; i++)
-			tent_objects[i].next = &tent_objects[i + 1];
-		tent_objects[i].next = 0;
-	}
-	tobj = tent_objects;
-	tent_objects = tobj->next;
+	tent_obj_t *tobj = PR_RESNEW_NC (tent_objects);
 	tobj->next = 0;
 	return tobj;
 }
 
 static void
-free_tent_objects (tent_obj_t *tobjs)
+free_tent_object (tent_obj_t *tobj)
 {
-	tent_obj_t **t = &tobjs;
-
-	while (*t)
-		t = &(*t)->next;
-	*t = tent_objects;
-	tent_objects = tobjs;
+	tobj->next = tent_objects._free;
+	tent_objects._free = tobj;
 }
 
 void
 CL_ClearTEnts (void)
 {
-	tent_t     *tent;
-	tent_obj_t *tobj;
-
-	for (tobj = cl_beams; tobj; tobj = tobj->next) {
-		for (tent = tobj->to.beam.tents; tent; tent = tent->next) {
-			tent->ent.visibility.efrag = 0;
-		}
-		free_temp_entities (tobj->to.beam.tents);
-	}
-	free_tent_objects (cl_beams);
+	PR_RESRESET (temp_entities);
+	PR_RESRESET (tent_objects);
 	cl_beams = 0;
-
-	for (tobj = cl_explosions; tobj; tobj = tobj->next) {
-		for (tent = tobj->to.ex.tent; tent; tent = tent->next) {
-			tent->ent.visibility.efrag = 0;
-		}
-		free_temp_entities (tobj->to.ex.tent);
-	}
-	free_tent_objects (cl_explosions);
 	cl_explosions = 0;
 }
 
@@ -618,8 +578,7 @@ CL_UpdateBeams (double time, TEntContext_t *ctx)
 			beam_clear (b);
 			_to = *to;
 			*to = _to->next;
-			_to->next = tent_objects;
-			tent_objects = _to;
+			free_tent_object (_to);
 			continue;
 		}
 		to = &(*to)->next;
@@ -663,8 +622,7 @@ CL_UpdateExplosions (double time, TEntContext_t *ctx)
 			free_temp_entities (ex->tent);
 			_to = *to;
 			*to = _to->next;
-			_to->next = tent_objects;
-			tent_objects = _to;
+			free_tent_object (_to);
 			continue;
 		}
 		to = &(*to)->next;
diff --git a/nq/source/cl_ents.c b/nq/source/cl_ents.c
index d2cab9909..d5c564f28 100644
--- a/nq/source/cl_ents.c
+++ b/nq/source/cl_ents.c
@@ -65,15 +65,15 @@ CL_ClearEnts (void)
 {
 	size_t      i;
 
+	for (i = 0; i < MAX_EDICTS; i++) {
+		CL_Init_Entity (cl_entities + i);
+	}
+
 	// clear other arrays
-	memset (cl_entities, 0, sizeof (cl_entities));
 	i = nq_entstates.num_frames * nq_entstates.num_entities;
 	memset (nq_entstates.frame[0], 0, i * sizeof (entity_state_t));
 	memset (cl_msgtime, 0, sizeof (cl_msgtime));
 	memset (cl_forcelink, 0, sizeof (cl_forcelink));
-
-	for (i = 0; i < MAX_EDICTS; i++)
-		CL_Init_Entity (cl_entities + i);
 }
 
 /*

From 5173414d97b6093e795a64d24ee9182dad3ca9d5 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 22 Mar 2021 13:13:26 +0900
Subject: [PATCH 1506/1519] [vulkan] Implement light styles

Other than dealing with shader data alignment issues, that went well :).
Nicely, the implementation gets the explicit scaling out of the shader,
and allows for a directional flag.
---
 include/QF/Vulkan/qf_lighting.h               |  4 +++-
 .../renderer/vulkan/shader/lighting.frag      | 15 +++++++++-----
 libs/video/renderer/vulkan/vulkan_lighting.c  | 20 +++++++++++++++----
 3 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/include/QF/Vulkan/qf_lighting.h b/include/QF/Vulkan/qf_lighting.h
index c269feaae..f6aa67a94 100644
--- a/include/QF/Vulkan/qf_lighting.h
+++ b/include/QF/Vulkan/qf_lighting.h
@@ -38,7 +38,7 @@
 
 typedef struct qfv_light_s {
 	vec3_t      color;
-	float       intensity;
+	int         data;
 	vec3_t      position;
 	float       radius;
 	vec3_t      direction;
@@ -50,8 +50,10 @@ typedef struct qfv_lightleafset_s DARRAY_TYPE (int) qfv_lightleafset_t;
 typedef struct qfv_lightvisset_s DARRAY_TYPE (byte) qfv_lightvisset_t;
 
 #define NUM_LIGHTS 256
+#define NUM_STYLES 64
 
 typedef struct qfv_light_buffer_s {
+	float       intensity[NUM_STYLES + 3];
 	int         lightCount;
 	qfv_light_t lights[NUM_LIGHTS] __attribute__((aligned(16)));
 } qfv_light_buffer_t;
diff --git a/libs/video/renderer/vulkan/shader/lighting.frag b/libs/video/renderer/vulkan/shader/lighting.frag
index b756dd879..98f5b20a6 100644
--- a/libs/video/renderer/vulkan/shader/lighting.frag
+++ b/libs/video/renderer/vulkan/shader/lighting.frag
@@ -7,7 +7,7 @@ layout (input_attachment_index = 3, set = 0, binding = 3) uniform subpassInput p
 
 struct LightData {
 	vec3        color;
-	float       intensity;
+	int         data;// bits 0-6: intensity key (however, values 0-66)
 	vec3        position;
 	float       radius;
 	vec3        direction;
@@ -16,6 +16,8 @@ struct LightData {
 
 layout (constant_id = 0) const int MaxLights = 128;
 layout (set = 1, binding = 0) uniform Lights {
+	vec4        intensity[16]; // 64 floats
+	vec3        intensity2;
 	int         lightCount;
 	LightData   lights[MaxLights];
 };
@@ -32,9 +34,12 @@ calc_light (LightData light, vec3 position, vec3 normal)
 	float       lightdot = dot (incoming, normal);
 	float       r = light.radius;
 
-	float       intensity = light.intensity * step (d, r);
-	intensity *= smoothstep (spotdot, 1 - (1 - spotdot) * 0.995, light.cone) * clamp (lightdot, 0, 1);
-	return light.color * intensity * (r - d);
+	int         style = light.data & 0x7f;
+	// deliberate array index error: access intensity2 as well
+	float       i = intensity[style / 4][style % 4];
+	i *= step (d, r) * clamp (lightdot, 0, 1);
+	i *= smoothstep (spotdot, 1 - (1 - spotdot) * 0.995, light.cone);
+	return light.color * i * (r - d);
 }
 
 void
@@ -51,5 +56,5 @@ main (void)
 			light += calc_light (lights[i], p, n);
 		}
 	}
-	frag_color = vec4 (c * light / 255.0, 1);
+	frag_color = vec4 (c * light, 1);
 }
diff --git a/libs/video/renderer/vulkan/vulkan_lighting.c b/libs/video/renderer/vulkan/vulkan_lighting.c
index b1eecf3d3..56c14387a 100644
--- a/libs/video/renderer/vulkan/vulkan_lighting.c
+++ b/libs/video/renderer/vulkan/vulkan_lighting.c
@@ -121,6 +121,14 @@ update_lights (vulkan_ctx_t *ctx)
 	qfv_light_buffer_t *light_data = QFV_PacketExtend (packet,
 													   sizeof (*light_data));
 
+	for (int i = 0; i < NUM_STYLES; i++) {
+		light_data->intensity[i] = d_lightstylevalue[i] / 65536.0;
+	}
+	// dynamic lights seem a tad fiant, so 16x map lights
+	light_data->intensity[64] = 1 / 16.0;
+	light_data->intensity[65] = 1 / 16.0;
+	light_data->intensity[66] = 1 / 16.0;
+
 	light_data->lightCount = 0;
 	R_FindNearLights (r_origin, NUM_LIGHTS - 1, lights);
 	for (int i = 0; i < NUM_LIGHTS - 1; i++) {
@@ -131,7 +139,7 @@ update_lights (vulkan_ctx_t *ctx)
 		VectorCopy (lights[i]->color, light_data->lights[i].color);
 		VectorCopy (lights[i]->origin, light_data->lights[i].position);
 		light_data->lights[i].radius = lights[i]->radius;
-		light_data->lights[i].intensity = 16;
+		light_data->lights[i].data = 64;	// default dynamic light
 		VectorZero (light_data->lights[i].direction);
 		light_data->lights[i].cone = 1;
 	}
@@ -380,7 +388,7 @@ parse_light (qfv_light_t *light, const plitem_t *entity,
 	Sys_Printf ("}\n");*/
 
 	light->cone = 1;
-	light->intensity = 1;
+	light->data = 0;
 	light->radius = 300;
 	VectorSet (1, 1, 1, light->color);
 
@@ -411,6 +419,10 @@ parse_light (qfv_light_t *light, const plitem_t *entity,
 		light->radius = atof (str);
 	}
 
+	if ((str = PL_String (PL_ObjectForKey (entity, "style")))) {
+		light->data = atoi (str) & 0x3f;
+	}
+
 	if ((str = PL_String (PL_ObjectForKey (entity, "color")))
 		|| (str = PL_String (PL_ObjectForKey (entity, "_color")))) {
 		sscanf (str, "%f %f %f", VectorExpandAddr (light->color));
@@ -467,8 +479,8 @@ Vulkan_LoadLights (model_t *model, const char *entity_data, vulkan_ctx_t *ctx)
 				mleaf_t    *leaf = Mod_PointInLeaf (&light.position[0],
 													model);
 				DARRAY_APPEND (&lctx->lightleafs, leaf - model->brush.leafs);
-				printf ("[%g, %g, %g] %g, [%g %g %g] %g, [%g %g %g] %g, %zd\n",
-						VectorExpand (light.color), light.intensity,
+				printf ("[%g, %g, %g] %d, [%g %g %g] %g, [%g %g %g] %g, %zd\n",
+						VectorExpand (light.color), light.data,
 						VectorExpand (light.position), light.radius,
 						VectorExpand (light.direction), light.cone,
 						leaf - model->brush.leafs);

From 4eecbe867d8b57afe01b5f8431b22eaaa6bc11b9 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 22 Mar 2021 19:08:16 +0900
Subject: [PATCH 1507/1519] [vulkan] Implement deferred emission (fullbrights)

That was... easier than expected. A little more tedious that I would
have liked, but my scripting system isn't perfect (I suspect it's best
suited as the output of a code generator), and the C side could do with
a little more automation.
---
 include/QF/Vulkan/qf_lighting.h               |  2 +-
 include/QF/Vulkan/qf_vid.h                    |  1 +
 libs/video/renderer/vulkan/deferred.plist     | 80 +++++++++++++++----
 libs/video/renderer/vulkan/qfpipeline.plist   | 28 ++++++-
 .../renderer/vulkan/shader/alias_gbuf.frag    |  8 +-
 .../renderer/vulkan/shader/bsp_gbuf.frag      | 13 +--
 .../renderer/vulkan/shader/lighting.frag      |  8 +-
 libs/video/renderer/vulkan/vulkan_lighting.c  |  4 +-
 8 files changed, 116 insertions(+), 28 deletions(-)

diff --git a/include/QF/Vulkan/qf_lighting.h b/include/QF/Vulkan/qf_lighting.h
index f6aa67a94..8541d367e 100644
--- a/include/QF/Vulkan/qf_lighting.h
+++ b/include/QF/Vulkan/qf_lighting.h
@@ -59,7 +59,7 @@ typedef struct qfv_light_buffer_s {
 } qfv_light_buffer_t;
 
 #define LIGHTING_BUFFER_INFOS 1
-#define LIGHTING_IMAGE_INFOS 4
+#define LIGHTING_IMAGE_INFOS 5
 
 typedef struct lightingframe_s {
 	VkCommandBuffer cmd;
diff --git a/include/QF/Vulkan/qf_vid.h b/include/QF/Vulkan/qf_vid.h
index 5ac5dddd4..e41d91890 100644
--- a/include/QF/Vulkan/qf_vid.h
+++ b/include/QF/Vulkan/qf_vid.h
@@ -49,6 +49,7 @@ enum {
 enum {
 	QFV_attachDepth,
 	QFV_attachColor,
+	QFV_attachEmission,
 	QFV_attachNormal,
 	QFV_attachPosition,
 	QFV_attachOpaque,
diff --git a/libs/video/renderer/vulkan/deferred.plist b/libs/video/renderer/vulkan/deferred.plist
index 6eded7acb..229c24c10 100644
--- a/libs/video/renderer/vulkan/deferred.plist
+++ b/libs/video/renderer/vulkan/deferred.plist
@@ -30,6 +30,21 @@
 			usage = color_attachment|input_attachment|transient_attachment;
 			initialLayout = undefined;
 		};
+		emission = {
+			imageType = VK_IMAGE_TYPE_2D;
+			format = r16g16b16a16_sfloat;
+			samples = 1;
+			extent = {
+				width = $swapchain.extent.width;
+				height = $swapchain.extent.height;
+				depth = 1;
+			};
+			mipLevels = 1;
+			arrayLayers = 1;
+			tiling = optimal;
+			usage = color_attachment|input_attachment|transient_attachment;
+			initialLayout = undefined;
+		};
 		normal = {
 			imageType = VK_IMAGE_TYPE_2D;
 			format = r16g16b16a16_sfloat;
@@ -124,6 +139,22 @@
 				layerCount = 1;
 			};
 		};
+		emission = {
+			image = emission;
+			viewType = VK_IMAGE_VIEW_TYPE_2D;
+			format = $properties.images.emission.format;
+			components = {
+				r = identity;
+				g = identity;
+				b = identity;
+				a = identity;
+			};
+			subresourceRange = {
+				aspectMask = color;
+				levelCount = 1;
+				layerCount = 1;
+			};
+		};
 		normal = {
 			image = normal;
 			viewType = VK_IMAGE_VIEW_TYPE_2D;
@@ -191,8 +222,8 @@
 	};
 	framebuffer = {
 		renderPass = $properties.renderpass;
-		attachments = (depth, color, normal, position, opaque, translucent,
-					   "$swapchain.views[$swapImageIndex]");
+		attachments = (depth, color, emission, normal, position, opaque,
+					   translucent, "$swapchain.views[$swapImageIndex]");
 		width = $swapchain.extent.width;
 		height = $swapchain.extent.height;
 		layers = 1;
@@ -200,6 +231,7 @@
 	clearValues = (
 		{ depthStencil = { depth = 1; stencil = 0; }; },
 		{ color = "[0, 0, 0, 1]"; },	// color
+		{ color = "[0, 0, 0, 1]"; },	// emission
 		{ color = "[0, 0, 0, 1]"; },	// normal
 		{ color = "[0, 0, 0, 1]"; },	// position
 		{ color = "[0, 0, 0, 1]"; },	// opaque
@@ -228,6 +260,16 @@
 				initialLayout = undefined;
 				finalLayout = color_attachment_optimal;
 			},
+			{
+				format = $properties.images.emission.format;
+				samples = 1;
+				loadOp = dont_care;
+				storeOp = dont_care;
+				stencilLoadOp = dont_care;
+				stencilStoreOp = dont_care;
+				initialLayout = undefined;
+				finalLayout = color_attachment_optimal;
+			},
 			{
 				format = $properties.images.normal.format;
 				samples = 1;
@@ -294,20 +336,24 @@
 						attachment = 1;
 						layout = color_attachment_optimal;
 					},
-					{	// normal
+					{	// emission
 						attachment = 2;
 						layout = color_attachment_optimal;
 					},
-					{	// position
+					{	// normal
 						attachment = 3;
 						layout = color_attachment_optimal;
 					},
+					{	// position
+						attachment = 4;
+						layout = color_attachment_optimal;
+					},
 				);
 				depthStencilAttachment = {
 					attachment = 0;
 					layout = depth_stencil_attachment_optimal;
 				};
-				preserveAttachments = (5);
+				preserveAttachments = (6);
 			},
 			{	// 2 lighting
 				pipelineBindPoint = graphics;
@@ -320,52 +366,56 @@
 						attachment = 1;
 						layout = shader_read_only_optimal;
 					},
-					{	// normal
+					{	// emission
 						attachment = 2;
 						layout = shader_read_only_optimal;
 					},
-					{	// position
+					{	// normal
 						attachment = 3;
 						layout = shader_read_only_optimal;
 					},
+					{	// position
+						attachment = 4;
+						layout = shader_read_only_optimal;
+					},
 				);
 				colorAttachments = (
 					{	// opaque
-						attachment = 4;
+						attachment = 5;
 						layout = color_attachment_optimal;
 					},
 				);
-				preserveAttachments = (5);
+				preserveAttachments = (6);
 			},
 			{	// 3 translucent
 				pipelineBindPoint = graphics;
 				colorAttachments = (
 					{	// translucent
-						attachment = 5;
+						attachment = 6;
 						layout = color_attachment_optimal;
 					},
 				);
-				preserveAttachments = (0, 1, 2, 3, 4);
+				preserveAttachments = (0, 1, 2, 3, 4, 5);
 			},
 			{	// 4 compose
 				pipelineBindPoint = graphics;
 				inputAttachments = (
 					{	// opaque
-						attachment = 4;
+						attachment = 5;
 						layout = shader_read_only_optimal;
 					},
 					{	// translucent
-						attachment = 5;
+						attachment = 6;
 						layout = shader_read_only_optimal;
 					},
 				);
 				colorAttachments = (
 					{	// swapchain
-						attachment = 6;
+						attachment = 7;
 						layout = color_attachment_optimal;
 					},
 				);
-				preserveAttachments = (0, 1, 2, 3);
+				preserveAttachments = (0, 1, 2, 3, 4);
 			},
 		);
 		dependencies = (
diff --git a/libs/video/renderer/vulkan/qfpipeline.plist b/libs/video/renderer/vulkan/qfpipeline.plist
index 523edfbad..3e8f79274 100644
--- a/libs/video/renderer/vulkan/qfpipeline.plist
+++ b/libs/video/renderer/vulkan/qfpipeline.plist
@@ -83,7 +83,7 @@
 			bindings = (
 				{
 					type = input_attachment;
-					descriptorCount = "4z * $frames.size";
+					descriptorCount = "5z * $frames.size";
 				},
 			);
 		};
@@ -258,6 +258,12 @@
 					descriptorCount = 1;
 					stageFlags = fragment;
 				},
+				{
+					binding = 4;
+					descriptorType = input_attachment;
+					descriptorCount = 1;
+					stageFlags = fragment;
+				},
 			);
 		};
 		lighting_lights = {
@@ -515,6 +521,16 @@
 						alphaBlendOp = add;
 						colorWriteMask = r|g|b|a;
 					},
+					{
+						blendEnable = false;
+						srcColorBlendFactor = src_alpha;
+						dstColorBlendFactor = one_minus_src_alpha;
+						colorBlendOp = add;
+						srcAlphaBlendFactor = src_alpha;
+						dstAlphaBlendFactor = one_minus_src_alpha;
+						alphaBlendOp = add;
+						colorWriteMask = r|g|b|a;
+					},
 				);
 			};
 			dynamic = {
@@ -674,6 +690,16 @@
 						alphaBlendOp = add;
 						colorWriteMask = r|g|b|a;
 					},
+					{
+						blendEnable = false;
+						srcColorBlendFactor = src_alpha;
+						dstColorBlendFactor = one_minus_src_alpha;
+						colorBlendOp = add;
+						srcAlphaBlendFactor = src_alpha;
+						dstAlphaBlendFactor = one_minus_src_alpha;
+						alphaBlendOp = add;
+						colorWriteMask = r|g|b|a;
+					},
 					{
 						blendEnable = false;
 						srcColorBlendFactor = src_alpha;
diff --git a/libs/video/renderer/vulkan/shader/alias_gbuf.frag b/libs/video/renderer/vulkan/shader/alias_gbuf.frag
index 0808b87f7..c9cc81db0 100644
--- a/libs/video/renderer/vulkan/shader/alias_gbuf.frag
+++ b/libs/video/renderer/vulkan/shader/alias_gbuf.frag
@@ -15,20 +15,24 @@ layout (location = 1) in vec4 position;
 layout (location = 2) in vec3 normal;
 
 layout (location = 0) out vec4 frag_color;
-layout (location = 1) out vec4 frag_normal;
-layout (location = 2) out vec4 frag_position;
+layout (location = 1) out vec4 frag_emission;
+layout (location = 2) out vec4 frag_normal;
+layout (location = 3) out vec4 frag_position;
 
 void
 main (void)
 {
 	vec4        c;
+	vec4        e;
 	int         i;
 	vec3        light = vec3 (0);
 	c = texture (Skin, vec3 (st, 0)) * unpackUnorm4x8(base_color);
 	c += texture (Skin, vec3 (st, 1)) * unpackUnorm4x8(colorA);
 	c += texture (Skin, vec3 (st, 2)) * unpackUnorm4x8(colorB);
+	e = texture (Skin, vec3 (st, 3));
 
 	frag_color = c;
+	frag_emission = e;
 	frag_normal = vec4(normal, 1);
 	frag_position = position;
 }
diff --git a/libs/video/renderer/vulkan/shader/bsp_gbuf.frag b/libs/video/renderer/vulkan/shader/bsp_gbuf.frag
index e4578ce5e..c00c0d72d 100644
--- a/libs/video/renderer/vulkan/shader/bsp_gbuf.frag
+++ b/libs/video/renderer/vulkan/shader/bsp_gbuf.frag
@@ -18,8 +18,9 @@ layout (location = 2) in vec3 normal;
 layout (location = 3) in vec4 position;
 
 layout (location = 0) out vec4 frag_color;
-layout (location = 1) out vec4 frag_normal;
-layout (location = 2) out vec4 frag_position;
+layout (location = 1) out vec4 frag_emission;
+layout (location = 2) out vec4 frag_normal;
+layout (location = 3) out vec4 frag_position;
 
 layout (constant_id = 0) const bool doWarp = false;
 layout (constant_id = 1) const bool doLight = true;
@@ -107,7 +108,8 @@ sky_color (vec3 dir, float time)
 void
 main (void)
 {
-	vec4        c;
+	vec4        c = vec4 (0);
+	vec4        e;
 	vec2        t_st = tl_st.xy;
 	vec2        l_st = tl_st.zw;
 
@@ -115,15 +117,16 @@ main (void)
 		t_st = warp_st (t_st, time);
 	}
 	if (doSkyCube || doSkySheet) {
-		c = sky_color (direction, time);
+		e = sky_color (direction, time);
 	} else {
 		c = texture (Texture, t_st);
 		if (doLight) {
 			c *= vec4 (texture (LightMap, l_st).xyz, 1);
 		}
-		c += texture (GlowMap, t_st);
+		e = texture (GlowMap, t_st);
 	}
 	frag_color = c;//fogBlend (c);
+	frag_emission = e;
 	frag_normal = vec4 (normal, 0);
 	frag_position = position;
 }
diff --git a/libs/video/renderer/vulkan/shader/lighting.frag b/libs/video/renderer/vulkan/shader/lighting.frag
index 98f5b20a6..86e496991 100644
--- a/libs/video/renderer/vulkan/shader/lighting.frag
+++ b/libs/video/renderer/vulkan/shader/lighting.frag
@@ -2,8 +2,9 @@
 
 layout (input_attachment_index = 0, set = 0, binding = 0) uniform subpassInput depth;
 layout (input_attachment_index = 1, set = 0, binding = 1) uniform subpassInput color;
-layout (input_attachment_index = 2, set = 0, binding = 2) uniform subpassInput normal;
-layout (input_attachment_index = 3, set = 0, binding = 3) uniform subpassInput position;
+layout (input_attachment_index = 2, set = 0, binding = 2) uniform subpassInput emission;
+layout (input_attachment_index = 3, set = 0, binding = 3) uniform subpassInput normal;
+layout (input_attachment_index = 4, set = 0, binding = 4) uniform subpassInput position;
 
 struct LightData {
 	vec3        color;
@@ -47,6 +48,7 @@ main (void)
 {
 	//float       d = subpassLoad (depth).r;
 	vec3        c = subpassLoad (color).rgb;
+	vec3        e = subpassLoad (emission).rgb;
 	vec3        n = subpassLoad (normal).rgb;
 	vec3        p = subpassLoad (position).rgb;
 	vec3        light = vec3 (0);
@@ -56,5 +58,5 @@ main (void)
 			light += calc_light (lights[i], p, n);
 		}
 	}
-	frag_color = vec4 (c * light, 1);
+	frag_color = vec4 (c * light + e, 1);
 }
diff --git a/libs/video/renderer/vulkan/vulkan_lighting.c b/libs/video/renderer/vulkan/vulkan_lighting.c
index 56c14387a..69c6faa69 100644
--- a/libs/video/renderer/vulkan/vulkan_lighting.c
+++ b/libs/video/renderer/vulkan/vulkan_lighting.c
@@ -214,8 +214,10 @@ Vulkan_Lighting_Draw (vulkan_ctx_t *ctx)
 	lframe->imageInfo[0].imageView = ctx->attachment_views->a[QFV_attachDepth];
 	lframe->imageInfo[1].imageView = ctx->attachment_views->a[QFV_attachColor];
 	lframe->imageInfo[2].imageView
-		= ctx->attachment_views->a[QFV_attachNormal];
+		= ctx->attachment_views->a[QFV_attachEmission];
 	lframe->imageInfo[3].imageView
+		= ctx->attachment_views->a[QFV_attachNormal];
+	lframe->imageInfo[4].imageView
 		= ctx->attachment_views->a[QFV_attachPosition];
 	dfunc->vkUpdateDescriptorSets (device->dev,
 								   LIGHTING_BUFFER_INFOS + LIGHTING_IMAGE_INFOS,

From de581501fb257bef2b65a9abcf63f51e0d1f5a79 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 22 Mar 2021 20:33:42 +0900
Subject: [PATCH 1508/1519] [vulkan] Early out from lights that are too distant

Gives a 43% speed boost to bigass1 timedemo (366 -> 525 fps).
---
 libs/video/renderer/vulkan/shader/lighting.frag | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/libs/video/renderer/vulkan/shader/lighting.frag b/libs/video/renderer/vulkan/shader/lighting.frag
index 86e496991..3be1485ee 100644
--- a/libs/video/renderer/vulkan/shader/lighting.frag
+++ b/libs/video/renderer/vulkan/shader/lighting.frag
@@ -28,12 +28,17 @@ layout (location = 0) out vec4 frag_color;
 vec3
 calc_light (LightData light, vec3 position, vec3 normal)
 {
+	float       r = light.radius;
 	vec3        dist = light.position - position;
 	float       d = sqrt (dot (dist, dist));
+	if (d > r) {
+		// the light is too far away
+		return vec3 (0);
+	}
+
 	vec3        incoming = dist / d;
 	float       spotdot = dot (incoming, light.direction);
 	float       lightdot = dot (incoming, normal);
-	float       r = light.radius;
 
 	int         style = light.data & 0x7f;
 	// deliberate array index error: access intensity2 as well

From 81956095f1e278b2864a3babb2663a37bf48b3d8 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 23 Mar 2021 08:25:56 +0900
Subject: [PATCH 1509/1519] [vulkan] Use correct vertex shader for skys

This gets skys rendering again, but their depth is incorrect.
---
 include/QF/Vulkan/qf_vid.h                  |  4 ++--
 libs/video/renderer/vulkan/qfpipeline.plist |  4 ++--
 libs/video/renderer/vulkan/vulkan_bsp.c     | 21 +++++++++++----------
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/include/QF/Vulkan/qf_vid.h b/include/QF/Vulkan/qf_vid.h
index e41d91890..f2d9bf0ec 100644
--- a/include/QF/Vulkan/qf_vid.h
+++ b/include/QF/Vulkan/qf_vid.h
@@ -36,7 +36,7 @@
 #include <vulkan/vulkan.h>
 
 //FIXME location
-enum {
+typedef enum {
 	QFV_passDepth,			// geometry
 	QFV_passGBuffer,		// geometry
 	QFV_passLighting,		// single quad
@@ -44,7 +44,7 @@ enum {
 	QFV_passCompose,		// single quad
 
 	QFV_NumPasses
-};
+} QFV_Subpass;
 
 enum {
 	QFV_attachDepth,
diff --git a/libs/video/renderer/vulkan/qfpipeline.plist b/libs/video/renderer/vulkan/qfpipeline.plist
index 3e8f79274..61687a721 100644
--- a/libs/video/renderer/vulkan/qfpipeline.plist
+++ b/libs/video/renderer/vulkan/qfpipeline.plist
@@ -719,12 +719,12 @@
 			//renderPass = renderpass;
 		};
 		bsp_skysheet = {
-			subpass = 2;
+			subpass = 3;
 			stages = (
 				{
 					stage = vertex;
 					name = main;
-					module = $builtin/bsp_gbuf.vert;
+					module = $builtin/quakebsp.vert;
 				},
 				{
 					stage = fragment;
diff --git a/libs/video/renderer/vulkan/vulkan_bsp.c b/libs/video/renderer/vulkan/vulkan_bsp.c
index 937876dc9..cd5b1e022 100644
--- a/libs/video/renderer/vulkan/vulkan_bsp.c
+++ b/libs/video/renderer/vulkan/vulkan_bsp.c
@@ -75,6 +75,12 @@ static const char *bsp_pass_names[] = {
 	"translucent",
 };
 
+static QFV_Subpass subpass_map[] = {
+	QFV_passDepth,			// QFV_bspDepth
+	QFV_passGBuffer,		// QFV_bspGBuffer
+	QFV_passTranslucent,	// QFV_bspTranslucent
+};
+
 static float identity[] = {
 	1, 0, 0, 0,
 	0, 1, 0, 0,
@@ -872,7 +878,7 @@ bsp_begin_subpass (QFV_BspSubpass subpass, VkPipeline pipeline,
 	dfunc->vkResetCommandBuffer (cmd, 0);
 	VkCommandBufferInheritanceInfo inherit = {
 		VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_INFO, 0,
-		ctx->renderpass, subpass,
+		ctx->renderpass, subpass_map[subpass],
 		cframe->framebuffer,
 		0, 0, 0,
 	};
@@ -883,6 +889,9 @@ bsp_begin_subpass (QFV_BspSubpass subpass, VkPipeline pipeline,
 	};
 	dfunc->vkBeginCommandBuffer (cmd, &beginInfo);
 
+	QFV_duCmdBeginLabel (device, cmd, bsp_pass_names[subpass],
+						 {0, 0.5, 0.6, 1});
+
 	dfunc->vkCmdBindPipeline (cmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
 							  pipeline);
 	VkViewport  viewport = {0, 0, vid.width, vid.height, 0, 1};
@@ -914,6 +923,7 @@ bsp_end_subpass (VkCommandBuffer cmd, vulkan_ctx_t *ctx)
 	qfv_device_t *device = ctx->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
 
+	QFV_duCmdEndLabel (device, cmd);
 	dfunc->vkEndCommandBuffer (cmd);
 }
 
@@ -1274,15 +1284,6 @@ Vulkan_DrawSky (vulkan_ctx_t *ctx)
 	fragconst_t frag_constants = { time: vr_data.realtime };
 	push_fragconst (&frag_constants, bctx->layout, dfunc,
 					bframe->cmdSet.a[QFV_bspTranslucent]);
-	bind_view (qfv_bsp_texture, ctx->default_black->view, bframe,
-			   bframe->cmdSet.a[QFV_bspTranslucent],//FIXME
-			   bctx->layout, dfunc);
-	bind_view (qfv_bsp_glowmap, ctx->default_black->view, bframe,
-			   bframe->cmdSet.a[QFV_bspTranslucent],//FIXME
-			   bctx->layout, dfunc);
-	bind_view (qfv_bsp_lightmap, ctx->default_black->view, bframe,
-			   bframe->cmdSet.a[QFV_bspTranslucent],//FIXME
-			   bctx->layout, dfunc);
 	for (is = bctx->sky_chain; is; is = is->tex_chain) {
 		surf = is->surface;
 		if (tex != surf->texinfo->texture->render) {

From d4e1bfb8b82939189dee8c98b491c163a2deebf5 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 23 Mar 2021 10:01:13 +0900
Subject: [PATCH 1510/1519] [vulkan] Clean up the pipeline specifications

While being able to write pipeline specs like this was the end goal of
the parsing sub-project, I didn't realize it was already usable. This
sure makes going through the pipeline specs much easier.
---
 libs/video/renderer/vulkan/qfpipeline.plist | 751 ++++++--------------
 1 file changed, 233 insertions(+), 518 deletions(-)

diff --git a/libs/video/renderer/vulkan/qfpipeline.plist b/libs/video/renderer/vulkan/qfpipeline.plist
index 61687a721..138d80855 100644
--- a/libs/video/renderer/vulkan/qfpipeline.plist
+++ b/libs/video/renderer/vulkan/qfpipeline.plist
@@ -335,6 +335,169 @@
 			setLayouts = (compose_attach);
 		};
 	};
+
+	depthStencil = {
+		test_and_write = {
+			depthTestEnable = true;
+			depthWriteEnable = true;
+			depthCompareOp = less_or_equal;
+			depthBoundsTestEnable = false;
+			stencilTestEnable = false;
+		};
+		test_only = {
+			depthTestEnable = true;
+			depthWriteEnable = false;
+			depthCompareOp = less_or_equal;
+			depthBoundsTestEnable = false;
+			stencilTestEnable = false;
+		};
+		disable = {
+			depthTestEnable = false;
+			depthWriteEnable = false;
+			depthCompareOp = less_or_equal;
+			depthBoundsTestEnable = false;
+			stencilTestEnable = false;
+		};
+	};
+
+	inputAssembly = {
+		alias = {
+			topology = triangle_list;
+			primitiveRestartEnable = false;
+		};
+		brush = {
+			topology = triangle_fan;
+			primitiveRestartEnable = true;
+		};
+		twod = {
+			topology = triangle_strip;
+			primitiveRestartEnable = true;
+		};
+	};
+
+	vertexInput = {
+		alias = {
+			bindings = (
+				{ binding = 0; stride = "2 * 4 * 4"; inputRate = vertex; },
+				{ binding = 1; stride = "2 * 4 * 4"; inputRate = vertex; },
+				{ binding = 2; stride = "2 * 4";     inputRate = vertex; },
+			);
+			attributes = (
+				{ location = 0; binding = 0; format = r32g32b32a32_sfloat; offset = 0;  },
+				{ location = 1; binding = 0; format = r32g32b32a32_sfloat; offset = 16; },
+				{ location = 2; binding = 1; format = r32g32b32a32_sfloat; offset = 0;  },
+				{ location = 3; binding = 1; format = r32g32b32a32_sfloat; offset = 16; },
+				{ location = 4; binding = 2; format = r32g32_sfloat;       offset = 0;  },
+			);
+		};
+		brush = {
+			bindings = (
+				{ binding = 0; stride = "2 * 4 * 4"; inputRate = vertex; },
+			);
+			attributes = (
+				{ location = 0; binding = 0; format = r32g32b32a32_sfloat; offset = 0;  },
+				{ location = 1; binding = 0; format = r32g32b32a32_sfloat; offset = 16; },
+			);
+		};
+		twod = {
+			bindings = (
+				{ binding = 0; stride = "2 * 4 * 4"; inputRate = vertex; },
+			);
+			attributes = (
+				{ location = 0; binding = 0; format = r32g32_sfloat;       offset = 0;  },
+				{ location = 1; binding = 0; format = r32g32_sfloat;       offset = 8;  },
+				{ location = 2; binding = 0; format = r32g32b32a32_sfloat; offset = 16; },
+			);
+		};
+	};
+
+	rasterization = {
+		cw_cull_back = {
+			depthClampEnable = false;
+			rasterizerDiscardEnable = false;
+			polygonMode = fill;
+			cullMode = back;
+			frontFace = clockwise;
+			depthBiasEnable = false;
+			lineWidth = 1;
+		};
+		counter_cw_cull_back = {
+			depthClampEnable = false;
+			rasterizerDiscardEnable = false;
+			polygonMode = fill;
+			cullMode = back;
+			frontFace = counter_clockwise;
+			depthBiasEnable = false;
+			lineWidth = 1;
+		};
+	};
+
+	multisample = {
+		rasterizationSamples = $msaaSamples;
+		sampleShadingEnable = false;
+		minSampleShading = 0.5f;
+		alphaToCoverageEnable = false;
+		alphaToOneEnable = false;
+	};
+
+	viewport = {
+		viewports = (
+			{
+				x = 0; y = 0;
+				width = 640; height = 480;
+				minDepth = 0; maxDepth = 1;
+			}
+		);
+		scissors = (
+			{
+				offset = { x = 0; y = 0 };
+				extent = { width = 640; height = 480; };
+			},
+		);
+	};
+
+	attachmentBlendOp = {
+		disabled = {
+			blendEnable = false;
+			srcColorBlendFactor = src_alpha;
+			dstColorBlendFactor = one_minus_src_alpha;
+			colorBlendOp = add;
+			srcAlphaBlendFactor = src_alpha;
+			dstAlphaBlendFactor = one_minus_src_alpha;
+			alphaBlendOp = add;
+			colorWriteMask = r|g|b|a;
+		};
+		alpha_blend = {
+			blendEnable = true;
+			srcColorBlendFactor = src_alpha;
+			dstColorBlendFactor = one_minus_src_alpha;
+			colorBlendOp = add;
+			srcAlphaBlendFactor = src_alpha;
+			dstAlphaBlendFactor = one_minus_src_alpha;
+			alphaBlendOp = add;
+			colorWriteMask = r|g|b|a;
+		};
+	};
+
+	fsquad = {
+		vertexInput = {
+			bindings = (
+				{ binding = 0; stride = "4 * 4"; inputRate = vertex; },
+			);
+			attributes = (
+				{ location = 0; binding = 0; format = r32g32b32a32_sfloat; offset = 0; },
+			);
+		};
+		inputAssembly = {
+			topology = triangle_strip;
+			primitiveRestartEnable = false;
+		};
+		colorBlend = {
+			logicOpEnable = false;
+			attachments = ($properties.attachmentBlendOp.disabled);
+		};
+	};
+
 	pipelines = {
 		alias_depth = {
 			subpass = 0;
@@ -346,29 +509,24 @@
 				},
 			);
 			vertexInput = {
+				// depth pass doesn't use UVs
 				bindings = (
-					"$properties.pipelines.alias_gbuf.vertexInput.bindings[0]",
-					"$properties.pipelines.alias_gbuf.vertexInput.bindings[1]",
+					"$properties.vertexInput.alias.bindings[0]",
+					"$properties.vertexInput.alias.bindings[1]",
 				);
 				attributes = (
-					"$properties.pipelines.alias_gbuf.vertexInput.attributes[0]",
-					"$properties.pipelines.alias_gbuf.vertexInput.attributes[1]",
-					"$properties.pipelines.alias_gbuf.vertexInput.attributes[2]",
-					"$properties.pipelines.alias_gbuf.vertexInput.attributes[3]",
+					"$properties.vertexInput.alias.attributes[0]",
+					"$properties.vertexInput.alias.attributes[1]",
+					"$properties.vertexInput.alias.attributes[2]",
+					"$properties.vertexInput.alias.attributes[3]",
 				);
 			};
-			inputAssembly = $properties.pipelines.alias_gbuf.inputAssembly;
-			viewport = $properties.pipelines.alias_gbuf.viewport;
-			rasterization = $properties.pipelines.alias_gbuf.rasterization;
-			multisample = $properties.pipelines.alias_gbuf.multisample;
-			depthStencil = {
-				depthTestEnable = true;
-				depthWriteEnable = true;
-				depthCompareOp = less_or_equal;
-				depthBoundsTestEnable = false;
-				stencilTestEnable = false;
-			};
-			colorBlend = $properties.pipelines.alias_gbuf.colorBlend;
+			inputAssembly = $properties.inputAssembly.alias;
+			viewport      = $properties.viewport;
+			rasterization = $properties.rasterization.cw_cull_back;
+			multisample   = $properties.multisample;
+			depthStencil  = $properties.depthStencil.test_and_write;
+			colorBlend    = $properties.pipelines.alias_gbuf.colorBlend;
 			dynamic = {
 				dynamicState = ( viewport, scissor );
 			};
@@ -395,142 +553,19 @@
 					};
 				},
 			);
-			vertexInput = {
-				bindings = (
-					{
-						binding = 0;
-						stride = "2 * 4 * 4";
-						inputRate = vertex;
-					},
-					{
-						binding = 1;
-						stride = "2 * 4 * 4";
-						inputRate = vertex;
-					},
-					{
-						binding = 2;
-						stride = "2 * 4";
-						inputRate = vertex;
-					},
-				);
-				attributes = (
-					{
-						location = 0;
-						binding = 0;
-						format = r32g32b32a32_sfloat;
-						offset = 0;
-					},
-					{
-						location = 1;
-						binding = 0;
-						format = r32g32b32a32_sfloat;
-						offset = 16;
-					},
-					{
-						location = 2;
-						binding = 1;
-						format = r32g32b32a32_sfloat;
-						offset = 0;
-					},
-					{
-						location = 3;
-						binding = 1;
-						format = r32g32b32a32_sfloat;
-						offset = 16;
-					},
-					{
-						location = 4;
-						binding = 2;
-						format = r32g32_sfloat;
-						offset = 0;
-					},
-				);
-			};
-			inputAssembly = {
-				topology = triangle_list;
-				primitiveRestartEnable = false;
-			};
-			viewport = {
-				viewports = (
-					{
-						x = 0; y = 0;
-						width = 640; height = 480;
-						minDepth = 0; maxDepth = 1;
-					}
-				);
-				scissors = (
-					{
-						offset = { x = 0; y = 0 };
-						extent = { width = 640; height = 480; };
-					},
-				);
-			};
-			rasterization = {
-				depthClampEnable = false;
-				rasterizerDiscardEnable = false;
-				polygonMode = fill;
-				cullMode = back;
-				frontFace = clockwise;
-				depthBiasEnable = false;
-				lineWidth = 1;
-			};
-			multisample = {
-				rasterizationSamples = $msaaSamples;
-				sampleShadingEnable = false;
-				minSampleShading = 0.5f;
-				alphaToCoverageEnable = false;
-				alphaToOneEnable = false;
-			};
-			depthStencil = {
-				depthTestEnable = true;
-				depthWriteEnable = true;
-				depthCompareOp = less_or_equal;
-				depthBoundsTestEnable = false;
-				stencilTestEnable = false;
-			};
+			vertexInput   = $properties.vertexInput.alias;
+			inputAssembly = $properties.inputAssembly.alias;
+			viewport      = $properties.viewport;
+			rasterization = $properties.rasterization.cw_cull_back;
+			multisample   = $properties.multisample;
+			depthStencil  = $properties.depthStencil.test_only;
 			colorBlend = {
 				logicOpEnable = false;
 				attachments = (
-					{
-						blendEnable = false;
-						srcColorBlendFactor = src_alpha;
-						dstColorBlendFactor = one_minus_src_alpha;
-						colorBlendOp = add;
-						srcAlphaBlendFactor = src_alpha;
-						dstAlphaBlendFactor = one_minus_src_alpha;
-						alphaBlendOp = add;
-						colorWriteMask = r|g|b|a;
-					},
-					{
-						blendEnable = false;
-						srcColorBlendFactor = src_alpha;
-						dstColorBlendFactor = one_minus_src_alpha;
-						colorBlendOp = add;
-						srcAlphaBlendFactor = src_alpha;
-						dstAlphaBlendFactor = one_minus_src_alpha;
-						alphaBlendOp = add;
-						colorWriteMask = r|g|b|a;
-					},
-					{
-						blendEnable = false;
-						srcColorBlendFactor = src_alpha;
-						dstColorBlendFactor = one_minus_src_alpha;
-						colorBlendOp = add;
-						srcAlphaBlendFactor = src_alpha;
-						dstAlphaBlendFactor = one_minus_src_alpha;
-						alphaBlendOp = add;
-						colorWriteMask = r|g|b|a;
-					},
-					{
-						blendEnable = false;
-						srcColorBlendFactor = src_alpha;
-						dstColorBlendFactor = one_minus_src_alpha;
-						colorBlendOp = add;
-						srcAlphaBlendFactor = src_alpha;
-						dstAlphaBlendFactor = one_minus_src_alpha;
-						alphaBlendOp = add;
-						colorWriteMask = r|g|b|a;
-					},
+					$properties.attachmentBlendOp.disabled,
+					$properties.attachmentBlendOp.disabled,
+					$properties.attachmentBlendOp.disabled,
+					$properties.attachmentBlendOp.disabled,
 				);
 			};
 			dynamic = {
@@ -550,24 +585,18 @@
 			);
 			vertexInput = {
 				bindings = (
-					"$properties.pipelines.bsp_gbuf.vertexInput.bindings[0]",
+					"$properties.vertexInput.brush.bindings[0]",
 				);
 				attributes = (
-					"$properties.pipelines.bsp_gbuf.vertexInput.attributes[0]",
+					"$properties.vertexInput.brush.attributes[0]",
 				);
 			};
-			inputAssembly = $properties.pipelines.bsp_gbuf.inputAssembly;
-			viewport = $properties.pipelines.bsp_gbuf.viewport;
-			rasterization = $properties.pipelines.bsp_gbuf.rasterization;
-			multisample = $properties.pipelines.bsp_gbuf.multisample;
-			depthStencil = {
-				depthTestEnable = true;
-				depthWriteEnable = true;
-				depthCompareOp = less_or_equal;
-				depthBoundsTestEnable = false;
-				stencilTestEnable = false;
-			};
-			colorBlend = $properties.pipelines.bsp_gbuf.colorBlend;
+			inputAssembly = $properties.inputAssembly.brush;
+			viewport      = $properties.viewport;
+			rasterization = $properties.rasterization.cw_cull_back;
+			multisample   = $properties.multisample;
+			depthStencil  = $properties.depthStencil.test_and_write;
+			colorBlend    = $properties.pipelines.bsp_gbuf.colorBlend;
 			dynamic = {
 				dynamicState = ( viewport, scissor );
 			};
@@ -596,120 +625,25 @@
 							{ size = 4; offset = 0; constantID = 0; },
 							{ size = 4; offset = 0; constantID = 1; },
 							{ size = 4; offset = 0; constantID = 2; },
-							{ size = 4; offset = 4; constantID = 1; },
+							{ size = 4; offset = 0; constantID = 3; },
 						);
 						data = <00000000ffffffff>;
 					};
 				},
 			);
-			vertexInput = {
-				bindings = (
-					{
-						binding = 0;
-						stride = "2 * 4 * 4";
-						inputRate = vertex;
-					},
-				);
-				attributes = (
-					{
-						location = 0;
-						binding = 0;
-						format = r32g32b32a32_sfloat;
-						offset = 0;
-					},
-					{
-						location = 1;
-						binding = 0;
-						format = r32g32b32a32_sfloat;
-						offset = 16;
-					},
-				);
-			};
-			inputAssembly = {
-				topology = triangle_fan;
-				primitiveRestartEnable = true;
-			};
-			viewport = {
-				viewports = (
-					{
-						x = 0; y = 0;
-						width = 640; height = 480;
-						minDepth = 0; maxDepth = 1;
-					}
-				);
-				scissors = (
-					{
-						offset = { x = 0; y = 0 };
-						extent = { width = 640; height = 480; };
-					},
-				);
-			};
-			rasterization = {
-				depthClampEnable = false;
-				rasterizerDiscardEnable = false;
-				polygonMode = fill;
-				cullMode = back;
-				frontFace = clockwise;
-				depthBiasEnable = false;
-				lineWidth = 1;
-			};
-			multisample = {
-				rasterizationSamples = $msaaSamples;
-				sampleShadingEnable = false;
-				minSampleShading = 0.5f;
-				alphaToCoverageEnable = false;
-				alphaToOneEnable = false;
-			};
-			depthStencil = {
-				depthTestEnable = true;
-				depthWriteEnable = true;
-				depthCompareOp = less_or_equal;
-				depthBoundsTestEnable = false;
-				stencilTestEnable = false;
-			};
+			vertexInput   = $properties.vertexInput.brush;
+			inputAssembly = $properties.inputAssembly.brush;
+			viewport      = $properties.viewport;
+			rasterization = $properties.rasterization.cw_cull_back;
+			multisample   = $properties.multisample;
+			depthStencil   = $properties.depthStencil.test_only;
 			colorBlend = {
 				logicOpEnable = false;
 				attachments = (
-					{
-						blendEnable = false;
-						srcColorBlendFactor = src_alpha;
-						dstColorBlendFactor = one_minus_src_alpha;
-						colorBlendOp = add;
-						srcAlphaBlendFactor = src_alpha;
-						dstAlphaBlendFactor = one_minus_src_alpha;
-						alphaBlendOp = add;
-						colorWriteMask = r|g|b|a;
-					},
-					{
-						blendEnable = false;
-						srcColorBlendFactor = src_alpha;
-						dstColorBlendFactor = one_minus_src_alpha;
-						colorBlendOp = add;
-						srcAlphaBlendFactor = src_alpha;
-						dstAlphaBlendFactor = one_minus_src_alpha;
-						alphaBlendOp = add;
-						colorWriteMask = r|g|b|a;
-					},
-					{
-						blendEnable = false;
-						srcColorBlendFactor = src_alpha;
-						dstColorBlendFactor = one_minus_src_alpha;
-						colorBlendOp = add;
-						srcAlphaBlendFactor = src_alpha;
-						dstAlphaBlendFactor = one_minus_src_alpha;
-						alphaBlendOp = add;
-						colorWriteMask = r|g|b|a;
-					},
-					{
-						blendEnable = false;
-						srcColorBlendFactor = src_alpha;
-						dstColorBlendFactor = one_minus_src_alpha;
-						colorBlendOp = add;
-						srcAlphaBlendFactor = src_alpha;
-						dstAlphaBlendFactor = one_minus_src_alpha;
-						alphaBlendOp = add;
-						colorWriteMask = r|g|b|a;
-					}
+					$properties.attachmentBlendOp.disabled,
+					$properties.attachmentBlendOp.disabled,
+					$properties.attachmentBlendOp.disabled,
+					$properties.attachmentBlendOp.disabled,
 				);
 			};
 			dynamic = {
@@ -739,26 +673,15 @@
 					};
 				},
 			);
-			vertexInput = $properties.pipelines.bsp_gbuf.vertexInput;
-			inputAssembly = $properties.pipelines.bsp_gbuf.inputAssembly;
-			viewport = $properties.pipelines.bsp_gbuf.viewport;
-			rasterization = $properties.pipelines.bsp_gbuf.rasterization;
-			multisample = $properties.pipelines.bsp_gbuf.multisample;
-			depthStencil = $properties.pipelines.bsp_gbuf.depthStencil;
+			vertexInput   = $properties.vertexInput.brush;
+			inputAssembly = $properties.inputAssembly.brush;
+			viewport      = $properties.viewport;
+			rasterization = $properties.rasterization.cw_cull_back;
+			multisample   = $properties.multisample;
+			depthStencil  = $properties.depthStencil.test_only;
 			colorBlend = {
 				logicOpEnable = false;
-				attachments = (
-					{
-						blendEnable = false;
-						srcColorBlendFactor = src_alpha;
-						dstColorBlendFactor = one_minus_src_alpha;
-						colorBlendOp = add;
-						srcAlphaBlendFactor = src_alpha;
-						dstAlphaBlendFactor = one_minus_src_alpha;
-						alphaBlendOp = add;
-						colorWriteMask = r|g|b|a;
-					},
-				);
+				attachments = ($properties.attachmentBlendOp.disabled);
 			};
 			dynamic = {
 				dynamicState = ( viewport, scissor );
@@ -780,89 +703,15 @@
 					module = $builtin/twod.frag;
 				},
 			);
-			vertexInput = {
-				bindings = (
-					{
-						binding = 0;
-						stride = "2 * 4 * 4";
-						inputRate = vertex;
-					},
-				);
-				attributes = (
-					{
-						location = 0;
-						binding = 0;
-						format = r32g32_sfloat;
-						offset = 0;
-					},
-					{
-						location = 1;
-						binding = 0;
-						format = r32g32_sfloat;
-						offset = 8;
-					},
-					{
-						location = 2;
-						binding = 0;
-						format = r32g32b32a32_sfloat;
-						offset = 16;
-					},
-				);
-			};
-			inputAssembly = {
-				topology = triangle_strip;
-				primitiveRestartEnable = true;
-			};
-			viewport = {
-				viewports = (
-					{
-						x = 0; y = 0;
-						width = 640; height = 480;
-						minDepth = 0; maxDepth = 1;
-					}
-				);
-				scissors = (
-					{
-						offset = { x = 0; y = 0 };
-						extent = { width = 640; height = 480; };
-					},
-				);
-			};
-			rasterization = {
-				depthClampEnable = false;
-				rasterizerDiscardEnable = false;
-				polygonMode = fill;
-				cullMode = back;
-				frontFace = counter_clockwise;
-				depthBiasEnable = false;
-				lineWidth = 1;
-			};
-			multisample = {
-				rasterizationSamples = $msaaSamples;
-				sampleShadingEnable = false;
-				minSampleShading = 0.5f;
-				alphaToCoverageEnable = false;
-				alphaToOneEnable = false;
-			};
-			depthStencil = {
-				depthTestEnable = true;
-				depthWriteEnable = true;
-				depthCompareOp = less_or_equal;
-				depthBoundsTestEnable = false;
-				stencilTestEnable = false;
-			};
+			vertexInput   = $properties.vertexInput.twod;
+			inputAssembly = $properties.inputAssembly.twod;
+			viewport      = $properties.viewport;
+			rasterization = $properties.rasterization.counter_cw_cull_back;
+			multisample   = $properties.multisample;
+			depthStencil  = $properties.depthStencil.test_and_write;
 			colorBlend = {
 				logicOpEnable = false;
-				attachments = ({
-					blendEnable = true;
-					srcColorBlendFactor = src_alpha;
-					dstColorBlendFactor = one_minus_src_alpha;
-					colorBlendOp = add;
-					srcAlphaBlendFactor = src_alpha;
-					dstAlphaBlendFactor = one_minus_src_alpha;
-					alphaBlendOp = add;
-					colorWriteMask = r|g|b|a;
-				});
+				attachments = ($properties.attachmentBlendOp.alpha_blend);
 			};
 			dynamic = {
 				dynamicState = ( viewport, scissor );
@@ -890,80 +739,13 @@
 					};
 				},
 			);
-			vertexInput = {
-				bindings = (
-					{
-						binding = 0;
-						stride = "4 * 4";
-						inputRate = vertex;
-					},
-				);
-				attributes = (
-					{
-						location = 0;
-						binding = 0;
-						format = r32g32b32a32_sfloat;
-						offset = 0;
-					},
-				);
-			};
-			inputAssembly = {
-				topology = triangle_strip;
-				primitiveRestartEnable = false;
-			};
-			viewport = {
-				viewports = (
-					{
-						x = 0; y = 0;
-						width = 640; height = 480;
-						minDepth = 0; maxDepth = 1;
-					}
-				);
-				scissors = (
-					{
-						offset = { x = 0; y = 0 };
-						extent = { width = 640; height = 480; };
-					},
-				);
-			};
-			rasterization = {
-				depthClampEnable = false;
-				rasterizerDiscardEnable = false;
-				polygonMode = fill;
-				cullMode = back;
-				frontFace = counter_clockwise;
-				depthBiasEnable = false;
-				lineWidth = 1;
-			};
-			multisample = {
-				rasterizationSamples = $msaaSamples;
-				sampleShadingEnable = false;
-				minSampleShading = 0.5f;
-				alphaToCoverageEnable = false;
-				alphaToOneEnable = false;
-			};
-			depthStencil = {
-				depthTestEnable = false;
-				depthWriteEnable = false;
-				depthCompareOp = less_or_equal;
-				depthBoundsTestEnable = false;
-				stencilTestEnable = false;
-			};
-			colorBlend = {
-				logicOpEnable = false;
-				attachments = (
-					{
-						blendEnable = false;
-						srcColorBlendFactor = src_alpha;
-						dstColorBlendFactor = one_minus_src_alpha;
-						colorBlendOp = add;
-						srcAlphaBlendFactor = src_alpha;
-						dstAlphaBlendFactor = one_minus_src_alpha;
-						alphaBlendOp = add;
-						colorWriteMask = r|g|b|a;
-					},
-				);
-			};
+			vertexInput   = $properties.fsquad.vertexInput;
+			inputAssembly = $properties.fsquad.inputAssembly;
+			viewport      = $properties.viewport;
+			rasterization = $properties.rasterization.counter_cw_cull_back;
+			multisample   = $properties.multisample;
+			depthStencil  = $properties.depthStencil.disable;
+			colorBlend    = $properties.fsquad.colorBlend;
 			dynamic = {
 				dynamicState = ( viewport, scissor );
 			};
@@ -984,80 +766,13 @@
 					module = $builtin/compose.frag;
 				},
 			);
-			vertexInput = {
-				bindings = (
-					{
-						binding = 0;
-						stride = "4 * 4";
-						inputRate = vertex;
-					},
-				);
-				attributes = (
-					{
-						location = 0;
-						binding = 0;
-						format = r32g32b32a32_sfloat;
-						offset = 0;
-					},
-				);
-			};
-			inputAssembly = {
-				topology = triangle_strip;
-				primitiveRestartEnable = false;
-			};
-			viewport = {
-				viewports = (
-					{
-						x = 0; y = 0;
-						width = 640; height = 480;
-						minDepth = 0; maxDepth = 1;
-					}
-				);
-				scissors = (
-					{
-						offset = { x = 0; y = 0 };
-						extent = { width = 640; height = 480; };
-					},
-				);
-			};
-			rasterization = {
-				depthClampEnable = false;
-				rasterizerDiscardEnable = false;
-				polygonMode = fill;
-				cullMode = back;
-				frontFace = counter_clockwise;
-				depthBiasEnable = false;
-				lineWidth = 1;
-			};
-			multisample = {
-				rasterizationSamples = $msaaSamples;
-				sampleShadingEnable = false;
-				minSampleShading = 0.5f;
-				alphaToCoverageEnable = false;
-				alphaToOneEnable = false;
-			};
-			depthStencil = {
-				depthTestEnable = false;
-				depthWriteEnable = false;
-				depthCompareOp = less_or_equal;
-				depthBoundsTestEnable = false;
-				stencilTestEnable = false;
-			};
-			colorBlend = {
-				logicOpEnable = false;
-				attachments = (
-					{
-						blendEnable = false;
-						srcColorBlendFactor = src_alpha;
-						dstColorBlendFactor = one_minus_src_alpha;
-						colorBlendOp = add;
-						srcAlphaBlendFactor = src_alpha;
-						dstAlphaBlendFactor = one_minus_src_alpha;
-						alphaBlendOp = add;
-						colorWriteMask = r|g|b|a;
-					},
-				);
-			};
+			vertexInput   = $properties.fsquad.vertexInput;
+			inputAssembly = $properties.fsquad.inputAssembly;
+			viewport      = $properties.viewport;
+			rasterization = $properties.rasterization.counter_cw_cull_back;
+			multisample   = $properties.multisample;
+			depthStencil  = $properties.depthStencil.disable;
+			colorBlend    = $properties.fsquad.colorBlend;
 			dynamic = {
 				dynamicState = ( viewport, scissor );
 			};

From 5ac807d4b2b9783dcfb4c78aaeafe12071909cfb Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 23 Mar 2021 10:12:26 +0900
Subject: [PATCH 1511/1519] [vulkan] Remove the old forward renderpass spec

I doubt I'll go back to it, and it was in the wrong place anyway.
---
 libs/video/renderer/vulkan/qfpipeline.plist | 141 --------------------
 1 file changed, 141 deletions(-)

diff --git a/libs/video/renderer/vulkan/qfpipeline.plist b/libs/video/renderer/vulkan/qfpipeline.plist
index 138d80855..54bc0f9af 100644
--- a/libs/video/renderer/vulkan/qfpipeline.plist
+++ b/libs/video/renderer/vulkan/qfpipeline.plist
@@ -780,145 +780,4 @@
 			//renderPass = renderpass;
 		};
 	};
-	renderpass = {
-		attachments = (
-			{
-				flags = 0;
-				format = $swapchain.format;
-				samples = 1;
-				loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR;
-				storeOp = VK_ATTACHMENT_STORE_OP_STORE;
-				stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
-				stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
-				initialLayout = VK_IMAGE_LAYOUT_UNDEFINED;
-				finalLayout = VK_IMAGE_LAYOUT_PRESENT_SRC_KHR;
-			},
-			{
-				flags = 0;
-				format = VK_FORMAT_D32_SFLOAT;
-				samples = 1;
-				loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR;
-				storeOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
-				stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
-				stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
-				initialLayout = VK_IMAGE_LAYOUT_UNDEFINED;
-				finalLayout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL;
-			},
-		);
-		subpasses = (
-			{
-				pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS;
-				colorAttachments = (
-					{
-						attachment = 0;
-						layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
-					}
-				);
-				depthStencilAttachment = {
-					attachment = 1;
-					layout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL;
-				};
-				preserveAttachments = ();
-			},
-		);
-		dependencies = (
-			{
-				srcSubpass = VK_SUBPASS_EXTERNAL;
-				dstSubpass = 0;
-				srcStageMask = VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT;
-				dstStageMask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
-				srcAccessMask = VK_ACCESS_MEMORY_READ_BIT;
-				dstAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT;
-				dependencyFlags = VK_DEPENDENCY_BY_REGION_BIT;
-			},
-			{
-				srcSubpass = 0;
-				dstSubpass = VK_SUBPASS_EXTERNAL;
-				srcStageMask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
-				dstStageMask = VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT;
-				srcAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT;
-				dstAccessMask = VK_ACCESS_MEMORY_READ_BIT;
-				dependencyFlags = VK_DEPENDENCY_BY_REGION_BIT;
-			},
-		);
-	};
-	renderpass_msaa = {
-		attachments = (
-			{
-				flags = 0;
-				format = $swapchain.format;
-				samples = VK_SAMPLE_COUNT_1_BIT;
-				loadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
-				storeOp = VK_ATTACHMENT_STORE_OP_STORE;
-				stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
-				stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
-				initialLayout = VK_IMAGE_LAYOUT_UNDEFINED;
-				finalLayout = VK_IMAGE_LAYOUT_PRESENT_SRC_KHR;
-			},
-			{
-				flags = 0;
-				format = VK_FORMAT_D32_SFLOAT;
-				samples = $msaaSamples;
-				loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR;
-				storeOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
-				stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
-				stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
-				initialLayout = VK_IMAGE_LAYOUT_UNDEFINED;
-				finalLayout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL;
-			},
-			{
-				flags = 0;
-				format = $swapchain.format;
-				samples = $msaaSamples;
-				loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR;
-				storeOp = VK_ATTACHMENT_STORE_OP_STORE;
-				stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
-				stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
-				initialLayout = VK_IMAGE_LAYOUT_UNDEFINED;
-				finalLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
-			},
-		);
-		subpasses = (
-			{
-				pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS;
-				colorAttachments = (
-					{
-						attachment = 2;
-						layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
-					}
-				);
-				resolveAttachments = (
-					{
-						attachment = 0;
-						layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
-					}
-				);
-				depthStencilAttachment = {
-					attachment = 1;
-					layout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL;
-				};
-				preserveAttachments = ();
-			},
-		);
-		dependencies = (
-			{
-				srcSubpass = VK_SUBPASS_EXTERNAL;
-				dstSubpass = 0;
-				srcStageMask = VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT;
-				dstStageMask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
-				srcAccessMask = VK_ACCESS_MEMORY_READ_BIT;
-				dstAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT;
-				dependencyFlags = VK_DEPENDENCY_BY_REGION_BIT;
-			},
-			{
-				srcSubpass = 0;
-				dstSubpass = VK_SUBPASS_EXTERNAL;
-				srcStageMask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
-				dstStageMask = VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT;
-				srcAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT;
-				dstAccessMask = VK_ACCESS_MEMORY_READ_BIT;
-				dependencyFlags = VK_DEPENDENCY_BY_REGION_BIT;
-			},
-		);
-	};
 }

From 6e0312658d259ecd0a534b679fdf0efcfbb1fcdd Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 23 Mar 2021 11:26:24 +0900
Subject: [PATCH 1512/1519] [vulkan] Fix sky depth issues

There were actually several problems: translucency wasn't using or
depending on the depth buffer, and the depth buffer wasn't marked as
read-only in the g-buffer pass. Getting that correct seems to have given
bigass1 a 0.5% boost (hard to say, could be the usual noise).
---
 include/QF/Vulkan/qf_vid.h                  |  2 +-
 libs/video/renderer/vulkan/deferred.plist   | 49 +++++++++++++--------
 libs/video/renderer/vulkan/qfpipeline.plist | 12 ++---
 libs/video/renderer/vulkan/vulkan_alias.c   |  8 +++-
 4 files changed, 45 insertions(+), 26 deletions(-)

diff --git a/include/QF/Vulkan/qf_vid.h b/include/QF/Vulkan/qf_vid.h
index f2d9bf0ec..b01000d06 100644
--- a/include/QF/Vulkan/qf_vid.h
+++ b/include/QF/Vulkan/qf_vid.h
@@ -38,9 +38,9 @@
 //FIXME location
 typedef enum {
 	QFV_passDepth,			// geometry
+	QFV_passTranslucent,	// geometry
 	QFV_passGBuffer,		// geometry
 	QFV_passLighting,		// single quad
-	QFV_passTranslucent,	// geometry
 	QFV_passCompose,		// single quad
 
 	QFV_NumPasses
diff --git a/libs/video/renderer/vulkan/deferred.plist b/libs/video/renderer/vulkan/deferred.plist
index 229c24c10..d956a5792 100644
--- a/libs/video/renderer/vulkan/deferred.plist
+++ b/libs/video/renderer/vulkan/deferred.plist
@@ -329,7 +329,21 @@
 					layout = depth_stencil_attachment_optimal;
 				};
 			},
-			{	// 1 g-buffer generation
+			{	// 1 translucent
+				pipelineBindPoint = graphics;
+				colorAttachments = (
+					{	// translucent
+						attachment = 6;
+						layout = color_attachment_optimal;
+					},
+				);
+				depthStencilAttachment = {
+					attachment = 0;
+					layout = depth_stencil_read_only_optimal;
+				};
+				preserveAttachments = (1, 2, 3, 4, 5);
+			},
+			{	// 2 g-buffer generation
 				pipelineBindPoint = graphics;
 				colorAttachments = (
 					{	// color
@@ -351,11 +365,11 @@
 				);
 				depthStencilAttachment = {
 					attachment = 0;
-					layout = depth_stencil_attachment_optimal;
+					layout = depth_stencil_read_only_optimal;
 				};
 				preserveAttachments = (6);
 			},
-			{	// 2 lighting
+			{	// 3 lighting
 				pipelineBindPoint = graphics;
 				inputAttachments = (
 					{	// depth
@@ -387,16 +401,6 @@
 				);
 				preserveAttachments = (6);
 			},
-			{	// 3 translucent
-				pipelineBindPoint = graphics;
-				colorAttachments = (
-					{	// translucent
-						attachment = 6;
-						layout = color_attachment_optimal;
-					},
-				);
-				preserveAttachments = (0, 1, 2, 3, 4, 5);
-			},
 			{	// 4 compose
 				pipelineBindPoint = graphics;
 				inputAttachments = (
@@ -421,7 +425,7 @@
 		dependencies = (
 			{
 				srcSubpass = 0;	// depth
-				dstSubpass = 1; // g-buffer
+				dstSubpass = 1; // translucent
 				srcStageMask = color_attachment_output;
 				dstStageMask = fragment_shader;
 				srcAccessMask = color_attachment_write;
@@ -429,8 +433,8 @@
 				dependencyFlags = by_region;
 			},
 			{
-				srcSubpass = 1;	// g-buffer
-				dstSubpass = 2;	// lighting
+				srcSubpass = 0;	// depth
+				dstSubpass = 2; // g-buffer
 				srcStageMask = color_attachment_output;
 				dstStageMask = fragment_shader;
 				srcAccessMask = color_attachment_write;
@@ -438,7 +442,16 @@
 				dependencyFlags = by_region;
 			},
 			{
-				srcSubpass = 2;	// lighting
+				srcSubpass = 2;	// g-buffer
+				dstSubpass = 3;	// lighting
+				srcStageMask = color_attachment_output;
+				dstStageMask = fragment_shader;
+				srcAccessMask = color_attachment_write;
+				dstAccessMask = shader_read;
+				dependencyFlags = by_region;
+			},
+			{
+				srcSubpass = 3;	// lighting
 				dstSubpass = 4;	// compose
 				srcStageMask = color_attachment_output;
 				dstStageMask = fragment_shader;
@@ -447,7 +460,7 @@
 				dependencyFlags = by_region;
 			},
 			{
-				srcSubpass = 3;	// translucent
+				srcSubpass = 1;	// translucent
 				dstSubpass = 4;	// compose
 				srcStageMask = color_attachment_output;
 				dstStageMask = fragment_shader;
diff --git a/libs/video/renderer/vulkan/qfpipeline.plist b/libs/video/renderer/vulkan/qfpipeline.plist
index 54bc0f9af..97bcc9251 100644
--- a/libs/video/renderer/vulkan/qfpipeline.plist
+++ b/libs/video/renderer/vulkan/qfpipeline.plist
@@ -534,7 +534,7 @@
 			//renderPass = renderpass;
 		};
 		alias_gbuf = {
-			subpass = 1;
+			subpass = 2;
 			stages = (
 				{
 					stage = vertex;
@@ -604,7 +604,7 @@
 			//renderPass = renderpass;
 		};
 		bsp_gbuf = {
-			subpass = 1;
+			subpass = 2;
 			stages = (
 				{
 					stage = vertex;
@@ -653,7 +653,7 @@
 			//renderPass = renderpass;
 		};
 		bsp_skysheet = {
-			subpass = 3;
+			subpass = 1;
 			stages = (
 				{
 					stage = vertex;
@@ -690,7 +690,7 @@
 			//renderPass = renderpass;
 		};
 		twod = {
-			subpass = 3;
+			subpass = 1;
 			stages = (
 				{
 					stage = vertex;
@@ -708,7 +708,7 @@
 			viewport      = $properties.viewport;
 			rasterization = $properties.rasterization.counter_cw_cull_back;
 			multisample   = $properties.multisample;
-			depthStencil  = $properties.depthStencil.test_and_write;
+			depthStencil  = $properties.depthStencil.test_only;
 			colorBlend = {
 				logicOpEnable = false;
 				attachments = ($properties.attachmentBlendOp.alpha_blend);
@@ -720,7 +720,7 @@
 			//renderPass = renderpass;
 		};
 		lighting = {
-			subpass = 2;
+			subpass = 3;
 			stages = (
 				{
 					stage = vertex;
diff --git a/libs/video/renderer/vulkan/vulkan_alias.c b/libs/video/renderer/vulkan/vulkan_alias.c
index 25a2d9d13..c2581e773 100644
--- a/libs/video/renderer/vulkan/vulkan_alias.c
+++ b/libs/video/renderer/vulkan/vulkan_alias.c
@@ -70,6 +70,12 @@ static const char *alias_pass_names[] = {
 	"translucent",
 };
 
+static QFV_Subpass subpass_map[] = {
+	QFV_passDepth,			// QFV_aliasDepth
+	QFV_passGBuffer,		// QFV_aliasGBuffer
+	QFV_passTranslucent,	// QFV_aliasTranslucent
+};
+
 static void
 emit_commands (VkCommandBuffer cmd, int pose1, int pose2,
 			   qfv_alias_skin_t *skin,
@@ -174,7 +180,7 @@ alias_begin_subpass (QFV_AliasSubpass subpass, VkPipeline pipeline,
 	dfunc->vkResetCommandBuffer (cmd, 0);
 	VkCommandBufferInheritanceInfo inherit = {
 		VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_INFO, 0,
-		ctx->renderpass, subpass,
+		ctx->renderpass, subpass_map[subpass],
 		cframe->framebuffer,
 		0, 0, 0,
 	};

From 7e946a4de942e1b3865913ad1e2eff67c067bed7 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 23 Mar 2021 12:24:24 +0900
Subject: [PATCH 1513/1519] [vulkan] Implement water surface rendering

They're unlit (fullbright, but that's nothing new for quake), but
working nicely. As a bonus, sort out the sky pass (forced to due to the
way command buffers are used).
---
 include/QF/Vulkan/qf_bsp.h                    |   4 +-
 libs/video/renderer/Makemodule.am             |   5 +
 libs/video/renderer/vulkan/qfpipeline.plist   |  37 +++++
 libs/video/renderer/vulkan/shader.c           |   3 +
 .../renderer/vulkan/shader/bsp_turb.frag      |  52 ++++++
 libs/video/renderer/vulkan/vulkan_bsp.c       | 150 +++++++++---------
 6 files changed, 173 insertions(+), 78 deletions(-)
 create mode 100644 libs/video/renderer/vulkan/shader/bsp_turb.frag

diff --git a/include/QF/Vulkan/qf_bsp.h b/include/QF/Vulkan/qf_bsp.h
index ff3f6612a..7f279ffc2 100644
--- a/include/QF/Vulkan/qf_bsp.h
+++ b/include/QF/Vulkan/qf_bsp.h
@@ -73,7 +73,8 @@ typedef enum {
 typedef enum {
 	QFV_bspDepth,
 	QFV_bspGBuffer,
-	QFV_bspTranslucent,
+	QFV_bspSky,
+	QFV_bspTurb,
 
 	QFV_bspNumPasses
 } QFV_BspSubpass;
@@ -146,6 +147,7 @@ typedef struct bspctx_s {
 	VkPipeline   depth;
 	VkPipeline   gbuf;
 	VkPipeline   sky;
+	VkPipeline   turb;
 	VkPipelineLayout layout;
 	size_t       vertex_buffer_size;
 	size_t       index_buffer_size;
diff --git a/libs/video/renderer/Makemodule.am b/libs/video/renderer/Makemodule.am
index 8c459dd1c..d21a7952d 100644
--- a/libs/video/renderer/Makemodule.am
+++ b/libs/video/renderer/Makemodule.am
@@ -313,6 +313,8 @@ bsp_gbuff_src = $(vkshaderpath)/bsp_gbuf.frag
 bsp_gbuff_c = $(vkshaderpath)/bsp_gbuf.frag.spvc
 bsp_skyf_src = $(vkshaderpath)/bsp_sky.frag
 bsp_skyf_c = $(vkshaderpath)/bsp_sky.frag.spvc
+bsp_turbf_src = $(vkshaderpath)/bsp_turb.frag
+bsp_turbf_c = $(vkshaderpath)/bsp_turb.frag.spvc
 lightingf_src = $(vkshaderpath)/lighting.frag
 lightingf_c = $(vkshaderpath)/lighting.frag.spvc
 composef_src = $(vkshaderpath)/compose.frag
@@ -348,6 +350,8 @@ $(bsp_gbuff_c): $(bsp_gbuff_src)
 
 $(bsp_skyf_c): $(bsp_skyf_src)
 
+$(bsp_turbf_c): $(bsp_turbf_src)
+
 $(lightingf_c): $(lightingf_src)
 
 $(composef_c): $(composef_src)
@@ -374,6 +378,7 @@ vkshader_c = \
 	$(bsp_gbufg_c) \
 	$(bsp_gbuff_c) \
 	$(bsp_skyf_c) \
+	$(bsp_turbf_c) \
 	$(lightingf_c) \
 	$(composef_c) \
 	$(aliasv_c) \
diff --git a/libs/video/renderer/vulkan/qfpipeline.plist b/libs/video/renderer/vulkan/qfpipeline.plist
index 97bcc9251..2d95f06b4 100644
--- a/libs/video/renderer/vulkan/qfpipeline.plist
+++ b/libs/video/renderer/vulkan/qfpipeline.plist
@@ -689,6 +689,43 @@
 			layout = quakebsp_layout;
 			//renderPass = renderpass;
 		};
+		bsp_turb = {
+			subpass = 1;
+			stages = (
+				{
+					stage = vertex;
+					name = main;
+					module = $builtin/quakebsp.vert;
+				},
+				{
+					stage = fragment;
+					name = main;
+					module = $builtin/bsp_turb.frag;
+					specializationInfo = {
+						mapEntries = (
+							{ size = 4; offset = 0; constantID = 0; },
+							{ size = 4; offset = 4; constantID = 1; },
+						);
+						data = <00000000ffffffff>;
+					};
+				},
+			);
+			vertexInput   = $properties.vertexInput.brush;
+			inputAssembly = $properties.inputAssembly.brush;
+			viewport      = $properties.viewport;
+			rasterization = $properties.rasterization.cw_cull_back;
+			multisample   = $properties.multisample;
+			depthStencil  = $properties.depthStencil.test_only;
+			colorBlend = {
+				logicOpEnable = false;
+				attachments = ($properties.attachmentBlendOp.disabled);
+			};
+			dynamic = {
+				dynamicState = ( viewport, scissor );
+			};
+			layout = quakebsp_layout;
+			//renderPass = renderpass;
+		};
 		twod = {
 			subpass = 1;
 			stages = (
diff --git a/libs/video/renderer/vulkan/shader.c b/libs/video/renderer/vulkan/shader.c
index d2921faca..c10d9a286 100644
--- a/libs/video/renderer/vulkan/shader.c
+++ b/libs/video/renderer/vulkan/shader.c
@@ -72,6 +72,8 @@ static
 static
 #include "libs/video/renderer/vulkan/shader/bsp_sky.frag.spvc"
 static
+#include "libs/video/renderer/vulkan/shader/bsp_turb.frag.spvc"
+static
 #include "libs/video/renderer/vulkan/shader/lighting.frag.spvc"
 static
 #include "libs/video/renderer/vulkan/shader/compose.frag.spvc"
@@ -104,6 +106,7 @@ static shaderdata_t builtin_shaders[] = {
 	{ "bsp_gbuf.geom", bsp_gbuf_geom, sizeof (bsp_gbuf_geom) },
 	{ "bsp_gbuf.frag", bsp_gbuf_frag, sizeof (bsp_gbuf_frag) },
 	{ "bsp_sky.frag", bsp_sky_frag, sizeof (bsp_sky_frag) },
+	{ "bsp_turb.frag", bsp_turb_frag, sizeof (bsp_turb_frag) },
 	{ "lighting.frag", lighting_frag, sizeof (lighting_frag) },
 	{ "compose.frag", compose_frag, sizeof (compose_frag) },
 	{ "alias.vert", alias_vert, sizeof (alias_vert) },
diff --git a/libs/video/renderer/vulkan/shader/bsp_turb.frag b/libs/video/renderer/vulkan/shader/bsp_turb.frag
new file mode 100644
index 000000000..ab4b04c7d
--- /dev/null
+++ b/libs/video/renderer/vulkan/shader/bsp_turb.frag
@@ -0,0 +1,52 @@
+#version 450
+
+layout (set = 0, binding = 1) uniform sampler2D Texture;
+
+layout (push_constant) uniform PushConstants {
+	layout (offset = 64)
+	vec4        fog;
+	float       time;
+};
+
+layout (location = 0) in vec4 tl_st;
+layout (location = 1) in vec3 direction;
+
+layout (location = 0) out vec4 frag_color;
+
+const float PI = 3.14159265;
+const float SPEED = 20.0;
+const float CYCLE = 128.0;
+const float FACTOR = PI * 2.0 / CYCLE;
+const vec2 BIAS = vec2 (1.0, 1.0);
+const float SCALE = 8.0;
+
+vec2
+warp_st (vec2 st, float time)
+{
+	vec2        angle = st.ts * CYCLE / 2.0;
+	vec2        phase = vec2 (time, time) * SPEED;
+	return st + (sin ((angle + phase) * FACTOR) + BIAS) / SCALE;
+}
+
+vec4
+fogBlend (vec4 color)
+{
+	float       az = fog.a * gl_FragCoord.z / gl_FragCoord.w;
+	vec3        fog_color = fog.rgb;
+	float       fog_factor = exp (-az * az);
+
+	return vec4 (mix (fog_color.rgb, color.rgb, fog_factor), color.a);
+}
+
+void
+main (void)
+{
+	vec4        c = vec4 (0);
+	vec4        e;
+	vec2        t_st = tl_st.xy;
+	vec2        l_st = tl_st.zw;
+
+	t_st = warp_st (t_st, time);
+	c = texture (Texture, t_st);
+	frag_color = c;//fogBlend (c);
+}
diff --git a/libs/video/renderer/vulkan/vulkan_bsp.c b/libs/video/renderer/vulkan/vulkan_bsp.c
index cd5b1e022..a85625440 100644
--- a/libs/video/renderer/vulkan/vulkan_bsp.c
+++ b/libs/video/renderer/vulkan/vulkan_bsp.c
@@ -72,13 +72,15 @@
 static const char *bsp_pass_names[] = {
 	"depth",
 	"g-buffer",
-	"translucent",
+	"sky",
+	"turb",
 };
 
 static QFV_Subpass subpass_map[] = {
 	QFV_passDepth,			// QFV_bspDepth
 	QFV_passGBuffer,		// QFV_bspGBuffer
-	QFV_passTranslucent,	// QFV_bspTranslucent
+	QFV_passTranslucent,	// QFV_bspSky
+	QFV_passTranslucent,	// QFV_bspTurb
 };
 
 static float identity[] = {
@@ -968,58 +970,40 @@ bsp_end (vulkan_ctx_t *ctx)
 	bsp_end_subpass (bframe->cmdSet.a[QFV_bspGBuffer], ctx);
 }
 
-/*static void
-turb_begin (bspctx_t *bctx)
+static void
+turb_begin (vulkan_ctx_t *ctx)
 {
-	quat_t      fog;
+	bspctx_t   *bctx = ctx->bsp_context;
 
 	bctx->default_color[3] = bound (0, r_wateralpha->value, 1);
+
 	QuatCopy (bctx->default_color, bctx->last_color);
-	qfeglVertexAttrib4fv (quake_bsp.color.location, default_color);
 
-	Mat4Mult (glsl_projection, glsl_view, bsp_vp);
+	__auto_type cframe = &ctx->frames.a[ctx->curFrame];
+	bspframe_t *bframe = &bctx->frames.a[ctx->curFrame];
 
-	qfeglUseProgram (quake_turb.program);
-	qfeglEnableVertexAttribArray (quake_turb.vertex.location);
-	qfeglEnableVertexAttribArray (quake_turb.tlst.location);
-	qfeglDisableVertexAttribArray (quake_turb.color.location);
+	DARRAY_APPEND (&cframe->cmdSets[QFV_passTranslucent],
+				   bframe->cmdSet.a[QFV_bspTurb]);
 
-	qfeglVertexAttrib4fv (quake_turb.color.location, default_color);
+	//FIXME need per frame matrices
+	bframe->bufferInfo[0].buffer = ctx->matrices.buffer_3d;
+	bframe->imageInfo[0].imageView = ctx->default_magenta->view;
+	bframe->imageInfo[1].imageView = ctx->default_magenta->view;
+	bframe->imageInfo[2].imageView = QFV_ScrapImageView (bctx->light_scrap);
+	bframe->imageInfo[3].imageView = bctx->default_skysheet->view;
+	bframe->imageInfo[4].imageView = bctx->default_skybox->view;
 
-	glsl_Fog_GetColor (fog);
-	fog[3] = glsl_Fog_GetDensity () / 64.0;
-	fragconst_t frag_constants = { time: vr_data.realtime };
-	dfunc->vkCmdPushConstants (cmd, bctx->layout, VK_SHADER_STAGE_FRAGMENT_BIT,
-							   64, sizeof (fragconst_t), &frag_constants);
-	qfeglUniform4fv (quake_turb.fog.location, 1, fog);
+	bsp_begin_subpass (QFV_bspTurb, bctx->turb, ctx);
+}
 
-	qfeglUniform1i (quake_turb.palette.location, 1);
-	qfeglActiveTexture (GL_TEXTURE0 + 1);
-	qfeglEnable (GL_TEXTURE_2D);
-	qfeglBindTexture (GL_TEXTURE_2D, glsl_palette);
-
-	qfeglUniform1f (quake_turb.time.location, vr_data.realtime);
-
-	qfeglUniform1i (quake_turb.texture.location, 0);
-	qfeglActiveTexture (GL_TEXTURE0 + 0);
-	qfeglEnable (GL_TEXTURE_2D);
-
-	qfeglBindBuffer (GL_ARRAY_BUFFER, bsp_vbo);
-}*/
-
-/*static void
-turb_end (bspctx_t *bctx)
+static void
+turb_end (vulkan_ctx_t *ctx)
 {
-	qfeglDisableVertexAttribArray (quake_turb.vertex.location);
-	qfeglDisableVertexAttribArray (quake_turb.tlst.location);
+	bspctx_t   *bctx = ctx->bsp_context;
+	bspframe_t *bframe = &bctx->frames.a[ctx->curFrame];
 
-	qfeglActiveTexture (GL_TEXTURE0 + 0);
-	qfeglDisable (GL_TEXTURE_2D);
-	qfeglActiveTexture (GL_TEXTURE0 + 1);
-	qfeglDisable (GL_TEXTURE_2D);
-
-	qfeglBindBuffer (GL_ARRAY_BUFFER, 0);
-}*/
+	bsp_end_subpass (bframe->cmdSet.a[QFV_bspTurb], ctx);
+}
 
 static void
 spin (mat4_t mat, bspctx_t *bctx)
@@ -1057,9 +1041,8 @@ sky_begin (vulkan_ctx_t *ctx)
 	__auto_type cframe = &ctx->frames.a[ctx->curFrame];
 	bspframe_t *bframe = &bctx->frames.a[ctx->curFrame];
 
-	//FIXME where should skys go? g-buffer is overkill. Translucent pre-pass?
 	DARRAY_APPEND (&cframe->cmdSets[QFV_passTranslucent],
-				   bframe->cmdSet.a[QFV_bspTranslucent]);
+				   bframe->cmdSet.a[QFV_bspSky]);
 
 	//FIXME need per frame matrices
 	bframe->bufferInfo[0].buffer = ctx->matrices.buffer_3d;
@@ -1071,8 +1054,7 @@ sky_begin (vulkan_ctx_t *ctx)
 	bframe->imageInfo[4].imageView = get_view (bctx->skybox_tex,
 											   bctx->default_skybox);
 
-	//FIXME sky pass
-	bsp_begin_subpass (QFV_bspTranslucent, bctx->sky, ctx);
+	bsp_begin_subpass (QFV_bspSky, bctx->sky, ctx);
 }
 
 static void
@@ -1081,8 +1063,7 @@ sky_end (vulkan_ctx_t *ctx)
 	bspctx_t   *bctx = ctx->bsp_context;
 	bspframe_t *bframe = &bctx->frames.a[ctx->curFrame];
 
-	//FIXME sky pass
-	bsp_end_subpass (bframe->cmdSet.a[QFV_bspTranslucent], ctx);
+	bsp_end_subpass (bframe->cmdSet.a[QFV_bspSky], ctx);
 }
 
 static inline void
@@ -1217,7 +1198,10 @@ Vulkan_DrawWorld (vulkan_ctx_t *ctx)
 void
 Vulkan_DrawWaterSurfaces (vulkan_ctx_t *ctx)
 {
-/*	bspctx_t   *bctx = ctx->bsp_context;
+	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+	bspctx_t   *bctx = ctx->bsp_context;
+	bspframe_t *bframe = &bctx->frames.a[ctx->curFrame];
 	instsurf_t *is;
 	msurface_t *surf;
 	vulktex_t  *tex = 0;
@@ -1227,38 +1211,49 @@ Vulkan_DrawWaterSurfaces (vulkan_ctx_t *ctx)
 	if (!bctx->waterchain)
 		return;
 
-	turb_begin (bctx);
+	turb_begin (ctx);
+	push_transform (identity, bctx->layout, dfunc,
+					bframe->cmdSet.a[QFV_bspTurb]);
+	fragconst_t frag_constants = { time: vr_data.realtime };
+	push_fragconst (&frag_constants, bctx->layout, dfunc,
+					bframe->cmdSet.a[QFV_bspTurb]);
 	for (is = bctx->waterchain; is; is = is->tex_chain) {
 		surf = is->surface;
-		if (tex != surf->texinfo->texture) {
+		if (tex != surf->texinfo->texture->render) {
 			if (tex) {
-				//XXX qfeglBindTexture (GL_TEXTURE_2D, tex->gl_texturenum);
-				//for (ec = tex->elechain; ec; ec = ec->next)
-				//	draw_elechain (ec, quake_turb.mvp_matrix.location,
-				//				   quake_turb.vertex.location,
-				//				   quake_turb.tlst.location,
-				//				   quake_turb.color.location);
+				bind_view (qfv_bsp_texture,
+						   get_view (tex->tex, ctx->default_black),
+						   bframe,
+						   bframe->cmdSet.a[QFV_bspTurb],
+						   bctx->layout, dfunc);
+				for (ec = tex->elechain; ec; ec = ec->next) {
+					draw_elechain (ec, bctx->layout, dfunc,
+								   bframe->cmdSet.a[QFV_bspTurb]);
+					reset_elechain (ec);
+				}
 				tex->elechain = 0;
 				tex->elechain_tail = &tex->elechain;
 			}
-			tex = surf->texinfo->texture;
+			tex = surf->texinfo->texture->render;
 		}
-		add_surf_elements (tex, is, &ec, &el, bctx);
+		add_surf_elements (tex, is, &ec, &el, bctx, bframe);
 	}
 	if (tex) {
-		//XXX qfeglBindTexture (GL_TEXTURE_2D, tex->gl_texturenum);
-		//for (ec = tex->elechain; ec; ec = ec->next)
-		//	draw_elechain (ec, quake_turb.mvp_matrix.location,
-		//				   quake_turb.vertex.location,
-		//				   quake_turb.tlst.location,
-		//				   quake_turb.color.location);
+		bind_view (qfv_bsp_texture, get_view (tex->tex, ctx->default_black),
+				   bframe, bframe->cmdSet.a[QFV_bspTurb],
+				   bctx->layout, dfunc);
+		for (ec = tex->elechain; ec; ec = ec->next) {
+			draw_elechain (ec, bctx->layout, dfunc,
+						   bframe->cmdSet.a[QFV_bspTurb]);
+			reset_elechain (ec);
+		}
 		tex->elechain = 0;
 		tex->elechain_tail = &tex->elechain;
 	}
-	turb_end (bctx);
+	turb_end (ctx);
 
 	bctx->waterchain = 0;
-	bctx->waterchain_tail = &bctx->waterchain;*/
+	bctx->waterchain_tail = &bctx->waterchain;
 }
 
 void
@@ -1278,12 +1273,11 @@ Vulkan_DrawSky (vulkan_ctx_t *ctx)
 		return;
 
 	sky_begin (ctx);
-	//FIXME sky pass
 	push_transform (identity, bctx->layout, dfunc,
-					bframe->cmdSet.a[QFV_bspTranslucent]);
+					bframe->cmdSet.a[QFV_bspSky]);
 	fragconst_t frag_constants = { time: vr_data.realtime };
 	push_fragconst (&frag_constants, bctx->layout, dfunc,
-					bframe->cmdSet.a[QFV_bspTranslucent]);
+					bframe->cmdSet.a[QFV_bspSky]);
 	for (is = bctx->sky_chain; is; is = is->tex_chain) {
 		surf = is->surface;
 		if (tex != surf->texinfo->texture->render) {
@@ -1291,11 +1285,11 @@ Vulkan_DrawSky (vulkan_ctx_t *ctx)
 				bind_view (qfv_bsp_skysheet,
 						   get_view (tex->tex, ctx->default_black),
 						   bframe,
-						   bframe->cmdSet.a[QFV_bspTranslucent],//FIXME
+						   bframe->cmdSet.a[QFV_bspSky],
 						   bctx->layout, dfunc);
 				for (ec = tex->elechain; ec; ec = ec->next) {
-					draw_elechain (ec, bctx->layout, dfunc,//FIXME
-								   bframe->cmdSet.a[QFV_bspTranslucent]);
+					draw_elechain (ec, bctx->layout, dfunc,
+								   bframe->cmdSet.a[QFV_bspSky]);
 					reset_elechain (ec);
 				}
 				tex->elechain = 0;
@@ -1307,11 +1301,11 @@ Vulkan_DrawSky (vulkan_ctx_t *ctx)
 	}
 	if (tex) {
 		bind_view (qfv_bsp_skysheet, get_view (tex->tex, ctx->default_black),
-				   bframe, bframe->cmdSet.a[QFV_bspTranslucent],//FIXME
+				   bframe, bframe->cmdSet.a[QFV_bspSky],
 				   bctx->layout, dfunc);
 		for (ec = tex->elechain; ec; ec = ec->next) {
-			draw_elechain (ec, bctx->layout, dfunc,//FIXME
-						   bframe->cmdSet.a[QFV_bspTranslucent]);
+			draw_elechain (ec, bctx->layout, dfunc,
+						   bframe->cmdSet.a[QFV_bspSky]);
 			reset_elechain (ec);
 		}
 		tex->elechain = 0;
@@ -1488,6 +1482,7 @@ Vulkan_Bsp_Init (vulkan_ctx_t *ctx)
 	bctx->depth = Vulkan_CreatePipeline (ctx, "bsp_depth");
 	bctx->gbuf = Vulkan_CreatePipeline (ctx, "bsp_gbuf");
 	bctx->sky = Vulkan_CreatePipeline (ctx, "bsp_skysheet");
+	bctx->turb = Vulkan_CreatePipeline (ctx, "bsp_turb");
 	bctx->layout = Vulkan_CreatePipelineLayout (ctx, "quakebsp_layout");
 	bctx->sampler = Vulkan_CreateSampler (ctx, "quakebsp_sampler");
 
@@ -1539,6 +1534,7 @@ Vulkan_Bsp_Shutdown (struct vulkan_ctx_s *ctx)
 	dfunc->vkDestroyPipeline (device->dev, bctx->depth, 0);
 	dfunc->vkDestroyPipeline (device->dev, bctx->gbuf, 0);
 	dfunc->vkDestroyPipeline (device->dev, bctx->sky, 0);
+	dfunc->vkDestroyPipeline (device->dev, bctx->turb, 0);
 	DARRAY_CLEAR (&bctx->texture_chains);
 	DARRAY_CLEAR (&bctx->frames);
 	QFV_DestroyStagingBuffer (bctx->light_stage);

From a0d47de4396a2741d7cc5a300ef7c83c7283a5a1 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 23 Mar 2021 13:04:22 +0900
Subject: [PATCH 1514/1519] [vulkan] Suppress all the debug output

silence is golden
---
 include/QF/sys.h                              | 31 ++++---
 include/vid_vulkan.h                          |  1 -
 libs/audio/renderer/snd_channels.c            |  3 +-
 libs/video/renderer/vid_render_vulkan.c       | 20 +---
 libs/video/renderer/vulkan/device.c           |  6 +-
 libs/video/renderer/vulkan/vkparse.c          | 93 ++++++++++---------
 libs/video/renderer/vulkan/vulkan_lighting.c  | 15 +--
 .../video/renderer/vulkan/vulkan_vid_common.c | 26 +++---
 8 files changed, 99 insertions(+), 96 deletions(-)

diff --git a/include/QF/sys.h b/include/QF/sys.h
index 58aa08b76..e54031af2 100644
--- a/include/QF/sys.h
+++ b/include/QF/sys.h
@@ -84,21 +84,22 @@ void Sys_TimeOfDay(date_t *date);
 
 void Sys_MaskPrintf (int mask, const char *fmt, ...) __attribute__((format(printf,2,3)));
 // remember to update developer_flags in cvar.c
-#define SYS_DEV     (1|0)
-#define SYS_WARN    (1|2)	// bit 0 so developer 1 will pick it up
-#define SYS_VID     (1|4)
-#define SYS_FS_NF   (1|8)
-#define SYS_FS_F    (1|16)
-#define SYS_FS      (1|32)
-#define SYS_NET     (1|64)
-#define SYS_RUA_OBJ (1|128)
-#define SYS_RUA_MSG (1|256)
-#define SYS_SND     (1|512)
-#define SYS_GLT     (1|1024)
-#define SYS_GLSL    (1|2048)
-#define SYS_SKIN    (1|4096)
-#define SYS_MODEL   (1|8192)
-#define SYS_VULKAN  (1|16384)
+#define SYS_DEV             (1|0)
+#define SYS_WARN            (1|2)	// bit 0 so developer 1 will pick it up
+#define SYS_VID             (1|4)
+#define SYS_FS_NF           (1|8)
+#define SYS_FS_F            (1|16)
+#define SYS_FS              (1|32)
+#define SYS_NET             (1|64)
+#define SYS_RUA_OBJ         (1|128)
+#define SYS_RUA_MSG         (1|256)
+#define SYS_SND             (1|512)
+#define SYS_GLT             (1|1024)
+#define SYS_GLSL            (1|2048)
+#define SYS_SKIN            (1|4096)
+#define SYS_MODEL           (1|8192)
+#define SYS_VULKAN          (1|16384)
+#define SYS_VULKAN_PARSE    (1|32768)
 
 int Sys_CheckInput (int idle, int net_socket);
 const char *Sys_ConsoleInput (void);
diff --git a/include/vid_vulkan.h b/include/vid_vulkan.h
index 080b8079f..70deb17f7 100644
--- a/include/vid_vulkan.h
+++ b/include/vid_vulkan.h
@@ -89,7 +89,6 @@ typedef struct vulkan_ctx_s {
 	VkCommandBuffer cmdbuffer;
 	VkFence     fence;			// for ctx->cmdbuffer only
 	struct qfv_stagebuf_s *staging;
-	VkPipeline  pipeline;
 	size_t      curFrame;
 	vulkan_frameset_t frames;
 
diff --git a/libs/audio/renderer/snd_channels.c b/libs/audio/renderer/snd_channels.c
index cbf337496..59c068b2c 100644
--- a/libs/audio/renderer/snd_channels.c
+++ b/libs/audio/renderer/snd_channels.c
@@ -104,7 +104,8 @@ SND_AllocChannel (void)
 		for (free = &free_channels; *free; free = &(*free)->next) {
 			num_free++;
 		}
-		Sys_Printf ("SND_AllocChannel: out of channels. %d\n", num_free);
+		Sys_MaskPrintf (SYS_WARN, "SND_AllocChannel: out of channels. %d\n",
+						num_free);
 		return 0;
 	}
 	chan = *free;
diff --git a/libs/video/renderer/vid_render_vulkan.c b/libs/video/renderer/vid_render_vulkan.c
index b4f84f129..83f0d4b51 100644
--- a/libs/video/renderer/vid_render_vulkan.c
+++ b/libs/video/renderer/vid_render_vulkan.c
@@ -92,9 +92,6 @@ vulkan_R_Init (void)
 	Vulkan_CreateFrames (vulkan_ctx);
 	Vulkan_CreateRenderPass (vulkan_ctx);
 	Vulkan_CreateFramebuffers (vulkan_ctx);
-	// FIXME this should be staged so screen updates can begin while pipelines
-	// are being built
-	vulkan_ctx->pipeline = Vulkan_CreatePipeline (vulkan_ctx, "pipeline");
 	Vulkan_Texture_Init (vulkan_ctx);
 	Vulkan_Alias_Init (vulkan_ctx);
 	Vulkan_Bsp_Init (vulkan_ctx);
@@ -104,13 +101,6 @@ vulkan_R_Init (void)
 	Vulkan_Compose_Init (vulkan_ctx);
 	Skin_Init ();
 
-	Sys_Printf ("R_Init %p %d", vulkan_ctx->swapchain->swapchain,
-				vulkan_ctx->swapchain->numImages);
-	for (int32_t i = 0; i < vulkan_ctx->swapchain->numImages; i++) {
-		Sys_Printf (" %p", vulkan_ctx->swapchain->images->a[i]);
-	}
-	Sys_Printf ("\n");
-
 	SCR_Init ();
 }
 
@@ -559,10 +549,10 @@ vulkan_vid_render_choose_visual (void)
 								cmdset);
 	vulkan_ctx->cmdbuffer = cmdset->a[0];
 	vulkan_ctx->fence = QFV_CreateFence (vulkan_ctx->device, 1);
-	Sys_Printf ("vk choose visual %p %p %d %p\n", vulkan_ctx->device->dev,
-				vulkan_ctx->device->queue.queue,
-				vulkan_ctx->device->queue.queueFamily,
-				vulkan_ctx->cmdpool);
+	Sys_MaskPrintf (SYS_VULKAN, "vk choose visual %p %p %d %p\n",
+					vulkan_ctx->device->dev, vulkan_ctx->device->queue.queue,
+					vulkan_ctx->device->queue.queueFamily,
+					vulkan_ctx->cmdpool);
 }
 
 static void
@@ -570,7 +560,7 @@ vulkan_vid_render_create_context (void)
 {
 	vulkan_ctx->create_window (vulkan_ctx);
 	vulkan_ctx->surface = vulkan_ctx->create_surface (vulkan_ctx);
-	Sys_Printf ("vk create context %p\n", vulkan_ctx->surface);
+	Sys_MaskPrintf (SYS_VULKAN, "vk create context %p\n", vulkan_ctx->surface);
 }
 
 static void
diff --git a/libs/video/renderer/vulkan/device.c b/libs/video/renderer/vulkan/device.c
index 58e04c110..778c98273 100644
--- a/libs/video/renderer/vulkan/device.c
+++ b/libs/video/renderer/vulkan/device.c
@@ -115,9 +115,11 @@ load_device_funcs (qfv_instance_t *inst, qfv_device_t *dev)
 	if (!ext || dev->extension_enabled (dev, ext)) { \
 		dfunc->name = (PFN_##name) ifunc->vkGetDeviceProcAddr (device, #name); \
 		if (!dfunc->name) { \
-			Sys_Printf ("Couldn't find device level function %s", #name); \
+			Sys_MaskPrintf (SYS_VULKAN_PARSE, \
+							"Couldn't find device level function %s", #name); \
 		} else { \
-			Sys_Printf ("Found device level function %s\n", #name); \
+			Sys_MaskPrintf (SYS_VULKAN_PARSE, \
+							"Found device level function %s\n", #name); \
 		} \
 	}
 
diff --git a/libs/video/renderer/vulkan/vkparse.c b/libs/video/renderer/vulkan/vkparse.c
index 382d04873..798cd98f9 100644
--- a/libs/video/renderer/vulkan/vkparse.c
+++ b/libs/video/renderer/vulkan/vkparse.c
@@ -159,9 +159,9 @@ parse_basic (const plfield_t *field, const plitem_t *item,
 	ectx.symtab = 0;
 	ectx.result = &result;
 	const char *valstr = PL_String (item);
-	//Sys_Printf ("parse_basic: %s %zd %d %p %p: %s\n",
-	//			field->name, field->offset, field->type, field->parser,
-	//			field->data, valstr);
+	//Sys_MaskPrintf (SYS_VULKAN_PARSE, "parse_basic: %s %zd %d %p %p: %s\n",
+	//				field->name, field->offset, field->type, field->parser,
+	//				field->data, valstr);
 	if (strcmp (valstr, "VK_SUBPASS_EXTERNAL") == 0) {
 		//FIXME handle subpass in a separate parser?
 		*(uint32_t *) data = VK_SUBPASS_EXTERNAL;
@@ -172,7 +172,7 @@ parse_basic (const plfield_t *field, const plitem_t *item,
 						field->name, valstr);
 		}
 	}
-	//Sys_Printf ("    %x\n", *(uint32_t *)data);
+	//Sys_MaskPrintf (SYS_VULKAN_PARSE, "    %x\n", *(uint32_t *)data);
 
 	return ret;
 }
@@ -190,23 +190,24 @@ parse_uint32_t (const plfield_t *field, const plitem_t *item,
 	ectx.symtab = 0;
 	ectx.result = &result;
 	const char *valstr = PL_String (item);
-	//Sys_Printf ("parse_uint32_t: %s %zd %d %p %p: %s\n",
-	//			field->name, field->offset, field->type, field->parser,
-	//			field->data, valstr);
+	//Sys_MaskPrintf (SYS_VULKAN_PARSE, "parse_uint32_t: %s %zd %d %p %p: %s\n",
+	//				field->name, field->offset, field->type, field->parser,
+	//				field->data, valstr);
 	if (strcmp (valstr, "VK_SUBPASS_EXTERNAL") == 0) {
 		//FIXME handle subpass in a separate parser?
 		*(uint32_t *) data = VK_SUBPASS_EXTERNAL;
 	} else {
-		//Sys_Printf ("parse_uint32_t: %s %zd %d %p %p %s\n",
-		//			field->name, field->offset, field->type, field->parser,
-		//			field->data, valstr);
+		//Sys_MaskPrintf (SYS_VULKAN_PARSE,
+		//				"parse_uint32_t: %s %zd %d %p %p %s\n",
+		//				field->name, field->offset, field->type, field->parser,
+		//				field->data, valstr);
 		ret = !cexpr_eval_string (valstr, &ectx);
 		if (!ret) {
 			PL_Message (messages, item, "error parsing %s: %s",
 						field->name, valstr);
 		}
 		*(uint32_t *) data = val;
-		//Sys_Printf ("    %d\n", *(uint32_t *)data);
+		//Sys_MaskPrintf (SYS_VULKAN_PARSE, "    %d\n", *(uint32_t *)data);
 	}
 
 	return ret;
@@ -223,14 +224,14 @@ parse_enum (const plfield_t *field, const plitem_t *item,
 	ectx.symtab = enm->symtab;
 	ectx.result = &result;
 	const char *valstr = PL_String (item);
-	//Sys_Printf ("parse_enum: %s %zd %d %p %p %s\n",
-	//			field->name, field->offset, field->type, field->parser,
-	//			field->data, valstr);
+	//Sys_MaskPrintf (SYS_VULKAN_PARSE, "parse_enum: %s %zd %d %p %p %s\n",
+	//				field->name, field->offset, field->type, field->parser,
+	//				field->data, valstr);
 	ret = !cexpr_parse_enum (enm, valstr, &ectx, data);
 	if (!ret) {
 		PL_Message (messages, item, "error parsing enum: %s", valstr);
 	}
-	//Sys_Printf ("    %d\n", *(int *)data);
+	//Sys_MaskPrintf (SYS_VULKAN_PARSE, "    %d\n", *(int *)data);
 	return ret;
 }
 
@@ -266,8 +267,9 @@ parse_single (const plfield_t *field, const plitem_t *item,
 	__auto_type single = (parse_single_t *) field->data;
 	void       *flddata = (byte *)data + single->value_offset;
 
-	//Sys_Printf ("parse_single: %s %zd %d %p %p\n", field->name, field->offset,
-	//			field->type, field->parser, field->data);
+	//Sys_MaskPrintf (SYS_VULKAN_PARSE, "parse_single: %s %zd %d %p %p\n",
+	//				field->name, field->offset,
+	//				field->type, field->parser, field->data);
 
 	if (!PL_CheckType (single->type, PL_Type (item))) {
 		PL_TypeMismatch (messages, item, field->name, single->type,
@@ -306,11 +308,12 @@ parse_array (const plfield_t *field, const plitem_t *item,
 	typedef struct arr_s DARRAY_TYPE(byte) arr_t;
 	arr_t      *arr;
 
-	//Sys_Printf ("parse_array: %s %zd %d %p %p %p\n",
-	//			field->name, field->offset, field->type, field->parser,
-	//			field->data, data);
-	//Sys_Printf ("    %d %zd %p %zd %zd\n", array->type, array->stride,
-	//			array->parser, array->value_offset, array->size_offset);
+	//Sys_MaskPrintf (SYS_VULKAN_PARSE, "parse_array: %s %zd %d %p %p %p\n",
+	//				field->name, field->offset, field->type, field->parser,
+	//				field->data, data);
+	//Sys_MaskPrintf (SYS_VULKAN_PARSE, "    %d %zd %p %zd %zd\n", array->type,
+	//				array->stride, array->parser, array->value_offset,
+	//				array->size_offset);
 	if (!PL_ParseArray (&f, item, &arr, messages, context)) {
 		return 0;
 	}
@@ -333,11 +336,12 @@ parse_data (const plfield_t *field, const plitem_t *item,
 	const void *bindata = PL_BinaryData (item);
 	size_t      binsize = PL_BinarySize (item);
 
-	Sys_Printf ("parse_data: %s %zd %d %p %p %p\n",
-				field->name, field->offset, field->type, field->parser,
-				field->data, data);
-	Sys_Printf ("    %zd %zd\n", datad->value_offset, datad->size_offset);
-	Sys_Printf ("    %zd %p\n", binsize, bindata);
+	Sys_MaskPrintf (SYS_VULKAN_PARSE, "parse_data: %s %zd %d %p %p %p\n",
+					field->name, field->offset, field->type, field->parser,
+					field->data, data);
+	Sys_MaskPrintf (SYS_VULKAN_PARSE, "    %zd %zd\n", datad->value_offset,
+					datad->size_offset);
+	Sys_MaskPrintf (SYS_VULKAN_PARSE, "    %zd %p\n", binsize, bindata);
 
 	*value = vkparse_alloc (context, binsize);
 	memcpy (*value, bindata, binsize);
@@ -356,11 +360,11 @@ parse_string (const plfield_t *field, const plitem_t *item,
 
 	const char *str = PL_String (item);
 
-	//Sys_Printf ("parse_string: %s %zd %d %p %p %p\n",
-	//			field->name, field->offset, field->type, field->parser,
-	//			field->data, data);
-	//Sys_Printf ("    %zd\n", string->value_offset);
-	//Sys_Printf ("    %s\n", str);
+	//Sys_MaskPrintf (SYS_VULKAN_PARSE, "parse_string: %s %zd %d %p %p %p\n",
+	//				field->name, field->offset, field->type, field->parser,
+	//				field->data, data);
+	//Sys_MaskPrintf (SYS_VULKAN_PARSE, "    %zd\n", string->value_offset);
+	//Sys_MaskPrintf (SYS_VULKAN_PARSE, "    %s\n", str);
 
 	size_t      len = strlen (str) + 1;
 	*value = vkparse_alloc (context, len);
@@ -390,9 +394,10 @@ parse_RGBA (const plitem_t *item, void **data,
 	ectx.symtab = 0;
 	ectx.result = &result;
 	const char *valstr = PL_String (item);
-	Sys_Printf ("parse_RGBA: %s\n", valstr);
+	Sys_MaskPrintf (SYS_VULKAN_PARSE, "parse_RGBA: %s\n", valstr);
 	ret = !cexpr_eval_string (valstr, &ectx);
-	Sys_Printf ("    "VEC4F_FMT"\n", VEC4_EXP (*(vec4f_t *)data[0]));
+	Sys_MaskPrintf (SYS_VULKAN_PARSE, "    "VEC4F_FMT"\n",
+					VEC4_EXP (*(vec4f_t *)data[0]));
 	return ret;
 }
 
@@ -426,7 +431,7 @@ parse_VkRenderPass (const plitem_t *item, void **data,
 	vulkan_ctx_t *ctx = pctx->vctx;
 
 	const char *name = PL_String (item);
-	Sys_Printf ("parse_VkRenderPass: %s\n", name);
+	Sys_MaskPrintf (SYS_VULKAN_PARSE, "parse_VkRenderPass: %s\n", name);
 	if (name[0] != '$') {
 		name = va (ctx->va_ctx, "$"QFV_PROPERTIES".%s", name);
 	}
@@ -483,7 +488,8 @@ parse_VkDescriptorSetLayout (const plfield_t *field, const plitem_t *item,
 	vulkan_ctx_t *ctx = pctx->vctx;
 
 	const char *name = PL_String (item);
-	Sys_Printf ("parse_VkDescriptorSetLayout: %s\n", name);
+	Sys_MaskPrintf (SYS_VULKAN_PARSE, "parse_VkDescriptorSetLayout: %s\n",
+					name);
 	if (name[0] != '$') {
 		name = va (ctx->va_ctx, "$"QFV_PROPERTIES".setLayouts.%s", name);
 	}
@@ -519,7 +525,7 @@ parse_VkPipelineLayout (const plitem_t *item, void **data,
 	vulkan_ctx_t *ctx = context->vctx;
 
 	const char *name = PL_String (item);
-	Sys_Printf ("parse_VkPipelineLayout: %s\n", name);
+	Sys_MaskPrintf (SYS_VULKAN_PARSE, "parse_VkPipelineLayout: %s\n", name);
 	if (name[0] != '$') {
 		name = va (ctx->va_ctx, "$"QFV_PROPERTIES".pipelineLayouts.%s", name);
 	}
@@ -554,7 +560,7 @@ parse_VkImage (const plitem_t *item, void **data, plitem_t *messages,
 	vulkan_ctx_t *ctx = context->vctx;
 
 	const char *name = PL_String (item);
-	Sys_Printf ("parse_VkImage: %s\n", name);
+	Sys_MaskPrintf (SYS_VULKAN_PARSE, "parse_VkImage: %s\n", name);
 	if (name[0] != '$') {
 		name = va (ctx->va_ctx, "$"QFV_PROPERTIES".images.%s", name);
 	}
@@ -596,7 +602,7 @@ parse_VkImageView (const plfield_t *field, const plitem_t *item, void *data,
 	vulkan_ctx_t *ctx = context->vctx;
 
 	const char *name = PL_String (item);
-	Sys_Printf ("parse_VkImageView: %s\n", name);
+	Sys_MaskPrintf (SYS_VULKAN_PARSE, "parse_VkImageView: %s\n", name);
 	if (name[0] != '$') {
 		name = va (ctx->va_ctx, "$"QFV_PROPERTIES".imageViews.%s", name);
 	}
@@ -981,7 +987,8 @@ parse_object (vulkan_ctx_t *ctx, memsuper_t *memsuper, plitem_t *plist,
 
 	if (!parser (0, plist, object, messages, &parsectx)) {
 		for (int i = 0; i < PL_A_NumObjects (messages); i++) {
-			Sys_Printf ("%s\n", PL_String (PL_ObjectAtIndex (messages, i)));
+			Sys_MaskPrintf (SYS_VULKAN_PARSE, "%s\n",
+							PL_String (PL_ObjectAtIndex (messages, i)));
 		}
 		return 0;
 	}
@@ -1264,7 +1271,8 @@ QFV_ParseImageSet (vulkan_ctx_t *ctx, plitem_t *item, plitem_t *properties)
 			return 0;
 		}
 	} else {
-		Sys_Printf ("Neither array nor dictionary: %d\n", PL_Line (item));
+		Sys_MaskPrintf (SYS_VULKAN_PARSE, "Neither array nor dictionary: %d\n",
+						PL_Line (item));
 		delete_memsuper (memsuper);
 		return 0;
 	}
@@ -1338,7 +1346,8 @@ QFV_ParseFramebuffer (vulkan_ctx_t *ctx, plitem_t *plist, plitem_t *properties)
 
 	VkFramebuffer framebuffer;
 	dfunc->vkCreateFramebuffer (device->dev, &cInfo, 0, &framebuffer);
-	printf ("framebuffer, renderPass: %p, %p\n", framebuffer, cInfo.renderPass);
+	Sys_MaskPrintf (SYS_VULKAN_PARSE, "framebuffer, renderPass: %p, %p\n",
+					framebuffer, cInfo.renderPass);
 
 	delete_memsuper (memsuper);
 	return framebuffer;
diff --git a/libs/video/renderer/vulkan/vulkan_lighting.c b/libs/video/renderer/vulkan/vulkan_lighting.c
index 69c6faa69..48d4cdba9 100644
--- a/libs/video/renderer/vulkan/vulkan_lighting.c
+++ b/libs/video/renderer/vulkan/vulkan_lighting.c
@@ -481,14 +481,15 @@ Vulkan_LoadLights (model_t *model, const char *entity_data, vulkan_ctx_t *ctx)
 				mleaf_t    *leaf = Mod_PointInLeaf (&light.position[0],
 													model);
 				DARRAY_APPEND (&lctx->lightleafs, leaf - model->brush.leafs);
-				printf ("[%g, %g, %g] %d, [%g %g %g] %g, [%g %g %g] %g, %zd\n",
-						VectorExpand (light.color), light.data,
-						VectorExpand (light.position), light.radius,
-						VectorExpand (light.direction), light.cone,
-						leaf - model->brush.leafs);
+				Sys_MaskPrintf (SYS_VULKAN,
+								"[%g, %g, %g] %d, "
+								"[%g %g %g] %g, [%g %g %g] %g, %zd\n",
+								VectorExpand (light.color), light.data,
+								VectorExpand (light.position), light.radius,
+								VectorExpand (light.direction), light.cone,
+								leaf - model->brush.leafs);
 			}
 		}
-		printf ("%zd frames\n", ctx->frames.size);
 		for (size_t i = 0; i < ctx->frames.size; i++) {
 			lightingframe_t *lframe = &lctx->frames.a[i];
 			DARRAY_RESIZE (&lframe->lightvis, lctx->lights.size);
@@ -501,5 +502,5 @@ Vulkan_LoadLights (model_t *model, const char *entity_data, vulkan_ctx_t *ctx)
 		PL_Free (targets);
 		PL_Free (entities);
 	}
-	printf ("loaded %zd lights\n", lctx->lights.size);
+	Sys_MaskPrintf (SYS_VULKAN, "loaded %zd lights\n", lctx->lights.size);
 }
diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c
index 7c42467de..fccf5843c 100644
--- a/libs/video/renderer/vulkan/vulkan_vid_common.c
+++ b/libs/video/renderer/vulkan/vulkan_vid_common.c
@@ -166,11 +166,12 @@ static const char *device_extensions[] = {
 void
 Vulkan_Init_Common (vulkan_ctx_t *ctx)
 {
-	Sys_Printf ("Vulkan_Init_Common\n");
+	Sys_MaskPrintf (SYS_VULKAN, "Vulkan_Init_Common\n");
 
 	QFV_InitParse (ctx);
 	Vulkan_Init_Cvars ();
-	ctx->instance = QFV_CreateInstance (ctx, PACKAGE_STRING, 0x000702ff, 0, instance_extensions);//FIXME version
+	ctx->instance = QFV_CreateInstance (ctx, PACKAGE_STRING, 0x000702ff, 0,
+										instance_extensions);//FIXME version
 }
 
 static void
@@ -188,9 +189,6 @@ Vulkan_Shutdown_Common (vulkan_ctx_t *ctx)
 {
 	PL_Free (ctx->pipelineDef);
 	PL_Free (ctx->renderpassDef);
-	if (ctx->pipeline) {
-		QFV_DestroyPipeline (ctx->device, ctx->pipeline);
-	}
 	if (ctx->frames.size) {
 		Vulkan_DestroyFrames (ctx);
 	}
@@ -265,7 +263,7 @@ qfv_load_pipeline (vulkan_ctx_t *ctx, const char *name)
 	if (!item || !(item = PL_ObjectForKey (item, name))) {
 		Sys_Printf ("error loading %s\n", name);
 	} else {
-		Sys_Printf ("Found %s def\n", name);
+		Sys_MaskPrintf (SYS_VULKAN_PARSE, "Found %s def\n", name);
 	}
 	return item;
 }
@@ -282,7 +280,7 @@ qfv_load_renderpass (vulkan_ctx_t *ctx, const char *name)
 	if (!item || !(item = PL_ObjectForKey (item, name))) {
 		Sys_Printf ("error loading %s\n", name);
 	} else {
-		Sys_Printf ("Found %s def\n", name);
+		Sys_MaskPrintf (SYS_VULKAN_PARSE, "Found %s def\n", name);
 	}
 	return item;
 }
@@ -325,7 +323,6 @@ Vulkan_CreateRenderPass (vulkan_ctx_t *ctx)
 											  name));
 	item = qfv_load_renderpass (ctx, "clearValues");
 	QFV_ParseClearValues (ctx, item, ctx->renderpassDef);
-	printf ("renderpass: %p\n", ctx->renderpass);
 
 	qfv_device_t *device = ctx->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
@@ -395,7 +392,7 @@ Vulkan_CreatePipeline (vulkan_ctx_t *ctx, const char *name)
 		Sys_Printf ("error loading pipeline %s\n", name);
 		return 0;
 	} else {
-		Sys_Printf ("Found pipeline def %s\n", name);
+		Sys_MaskPrintf (SYS_VULKAN_PARSE, "Found pipeline def %s\n", name);
 	}
 	VkPipeline pipeline = QFV_ParsePipeline (ctx, item, ctx->pipelineDef);
 	QFV_duSetObjectName (ctx->device, VK_OBJECT_TYPE_PIPELINE, pipeline,
@@ -419,7 +416,8 @@ Vulkan_CreateDescriptorPool (vulkan_ctx_t *ctx, const char *name)
 		Sys_Printf ("error loading descriptor pool %s\n", name);
 		return 0;
 	} else {
-		Sys_Printf ("Found descriptor pool def %s\n", name);
+		Sys_MaskPrintf (SYS_VULKAN_PARSE, "Found descriptor pool def %s\n",
+						name);
 	}
 	pool = QFV_ParseDescriptorPool (ctx, item, ctx->pipelineDef);
 	QFV_AddHandle (tab, path, (uint64_t) pool);
@@ -444,7 +442,8 @@ Vulkan_CreatePipelineLayout (vulkan_ctx_t *ctx, const char *name)
 		Sys_Printf ("error loading pipeline layout %s\n", name);
 		return 0;
 	} else {
-		Sys_Printf ("Found pipeline layout def %s\n", name);
+		Sys_MaskPrintf (SYS_VULKAN_PARSE, "Found pipeline layout def %s\n",
+						name);
 	}
 	layout = QFV_ParsePipelineLayout (ctx, item, ctx->pipelineDef);
 	QFV_AddHandle (tab, path, (uint64_t) layout);
@@ -469,7 +468,7 @@ Vulkan_CreateSampler (vulkan_ctx_t *ctx, const char *name)
 		Sys_Printf ("error loading sampler %s\n", name);
 		return 0;
 	} else {
-		Sys_Printf ("Found sampler def %s\n", name);
+		Sys_MaskPrintf (SYS_VULKAN_PARSE, "Found sampler def %s\n", name);
 	}
 	sampler = QFV_ParseSampler (ctx, item, ctx->pipelineDef);
 	QFV_AddHandle (tab, path, (uint64_t) sampler);
@@ -494,7 +493,8 @@ Vulkan_CreateDescriptorSetLayout(vulkan_ctx_t *ctx, const char *name)
 		Sys_Printf ("error loading descriptor set %s\n", name);
 		return 0;
 	} else {
-		Sys_Printf ("Found descriptor set def %s\n", name);
+		Sys_MaskPrintf (SYS_VULKAN_PARSE, "Found descriptor set def %s\n",
+						name);
 	}
 	set = QFV_ParseDescriptorSetLayout (ctx, item, ctx->pipelineDef);
 	QFV_AddHandle (tab, path, (uint64_t) set);

From 51d6ec7c8c3729cf794e560f00ca2347597f3c31 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 24 Mar 2021 12:04:09 +0900
Subject: [PATCH 1515/1519] [vulkan] Fix what looks like a thinko

It looked like the code would have deleted a replacement swapchain
instead of the one being replaced.
---
 libs/video/renderer/vulkan/vulkan_vid_common.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c
index fccf5843c..f3f152470 100644
--- a/libs/video/renderer/vulkan/vulkan_vid_common.c
+++ b/libs/video/renderer/vulkan/vulkan_vid_common.c
@@ -245,7 +245,7 @@ Vulkan_CreateSwapchain (vulkan_ctx_t *ctx)
 		free (ctx->swapchain);
 	}
 	ctx->swapchain = QFV_CreateSwapchain (ctx, old_swapchain);
-	if (ctx->swapchain->swapchain == old_swapchain) {
+	if (old_swapchain && ctx->swapchain->swapchain != old_swapchain) {
 		ctx->device->funcs->vkDestroySwapchainKHR (ctx->device->dev,
 												   old_swapchain, 0);
 	}

From c5c44da727893151d5489b6a7a8c159ea2522b10 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 24 Mar 2021 19:20:53 +0900
Subject: [PATCH 1516/1519] [vulkan] Implement screenshot

Finally, I can brag about my progress on irc :)
---
 include/QF/Vulkan/funclist.h                  |  1 +
 include/QF/Vulkan/image.h                     |  2 +
 include/QF/Vulkan/qf_vid.h                    |  1 +
 include/QF/Vulkan/swapchain.h                 |  1 +
 include/vid_vulkan.h                          |  3 +
 libs/models/brush/vulkan_model_brush.c        | 19 +-----
 libs/video/renderer/Makemodule.am             |  1 +
 libs/video/renderer/vid_render_vulkan.c       | 68 +++++++++++++++++++
 libs/video/renderer/vulkan/image.c            | 15 ++++
 libs/video/renderer/vulkan/swapchain.c        |  5 +-
 .../video/renderer/vulkan/vulkan_vid_common.c | 11 +++
 11 files changed, 109 insertions(+), 18 deletions(-)

diff --git a/include/QF/Vulkan/funclist.h b/include/QF/Vulkan/funclist.h
index e4a21d52a..9e5af1ef1 100644
--- a/include/QF/Vulkan/funclist.h
+++ b/include/QF/Vulkan/funclist.h
@@ -164,6 +164,7 @@ DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdPipelineBarrier)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdCopyBuffer)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdCopyBufferToImage)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdCopyImageToBuffer)
+DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdCopyImage)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdBlitImage)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdBeginRenderPass)
 DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdNextSubpass)
diff --git a/include/QF/Vulkan/image.h b/include/QF/Vulkan/image.h
index 5e5623137..5e4866952 100644
--- a/include/QF/Vulkan/image.h
+++ b/include/QF/Vulkan/image.h
@@ -66,6 +66,8 @@ VkImageView QFV_CreateImageView (struct qfv_device_s *device,
 								 VkImage image, VkImageViewType type,
 								 VkFormat format, VkImageAspectFlags aspect);
 
+size_t QFV_GetImageSize (struct qfv_device_s *device, VkImage image);
+
 /** Generate all mipmaps for a given texture down to a 1x1 pixel.
  *
  * Uses the GPU blit command from one mip level to the next, thus the base mip
diff --git a/include/QF/Vulkan/qf_vid.h b/include/QF/Vulkan/qf_vid.h
index b01000d06..80f12ca67 100644
--- a/include/QF/Vulkan/qf_vid.h
+++ b/include/QF/Vulkan/qf_vid.h
@@ -60,6 +60,7 @@ enum {
 struct vulkan_ctx_s;
 void Vulkan_DestroyFrames (struct vulkan_ctx_s *ctx);
 void Vulkan_CreateFrames (struct vulkan_ctx_s *ctx);
+void Vulkan_CreateCapture (struct vulkan_ctx_s *ctx);
 void Vulkan_CreateFramebuffers (struct vulkan_ctx_s *ctx);
 void Vulkan_DestroyFramebuffers (struct vulkan_ctx_s *ctx);
 void Vulkan_CreateRenderPass (struct vulkan_ctx_s *ctx);
diff --git a/include/QF/Vulkan/swapchain.h b/include/QF/Vulkan/swapchain.h
index 9d04b35e4..5c988f90f 100644
--- a/include/QF/Vulkan/swapchain.h
+++ b/include/QF/Vulkan/swapchain.h
@@ -8,6 +8,7 @@ typedef struct qfv_swapchain_s {
 	VkFormat    format;
 	VkExtent2D  extent;
 	int32_t     numImages;
+	VkImageUsageFlags usage;
 	struct qfv_imageset_s *images;
 	struct qfv_imageviewset_s *imageViews;
 } qfv_swapchain_t;
diff --git a/include/vid_vulkan.h b/include/vid_vulkan.h
index 70deb17f7..2a1f8fd9a 100644
--- a/include/vid_vulkan.h
+++ b/include/vid_vulkan.h
@@ -92,6 +92,9 @@ typedef struct vulkan_ctx_s {
 	size_t      curFrame;
 	vulkan_frameset_t frames;
 
+	struct qfv_capture_s *capture;
+	void      (*capture_callback) (const byte *data, int width, int height);
+
 	struct qfv_tex_s *default_black;
 	struct qfv_tex_s *default_white;
 	struct qfv_tex_s *default_magenta;
diff --git a/libs/models/brush/vulkan_model_brush.c b/libs/models/brush/vulkan_model_brush.c
index 2248ccdaf..a7b4dc336 100644
--- a/libs/models/brush/vulkan_model_brush.c
+++ b/libs/models/brush/vulkan_model_brush.c
@@ -87,21 +87,6 @@ static void vulkan_brush_clear (model_t *mod, void *data)
 	dfunc->vkFreeMemory (device->dev, mctx->texture_memory, 0);
 }
 
-static size_t
-get_image_size (VkImage image, qfv_device_t *device)
-{
-	qfv_devfuncs_t *dfunc = device->funcs;
-	size_t      size;
-	size_t      align;
-
-	VkMemoryRequirements requirements;
-	dfunc->vkGetImageMemoryRequirements (device->dev, image, &requirements);
-	size = requirements.size;
-	align = requirements.alignment - 1;
-	size = (size + align) & ~(align);
-	return size;
-}
-
 static void
 transfer_mips (byte *dst, const void *_src, const texture_t *tx, byte *palette)
 {
@@ -193,7 +178,7 @@ load_textures (model_t *mod, vulkan_ctx_t *ctx)
 		}
 		vulktex_t  *tex = tx->render;
 		tex->tex->offset = memsize;
-		memsize += get_image_size (tex->tex->image, device);
+		memsize += QFV_GetImageSize (device, tex->tex->image);
 		image_count++;
 		copy_count += MIPLEVELS;
 		if (strncmp (tx->name, "sky", 3) == 0) {
@@ -204,7 +189,7 @@ load_textures (model_t *mod, vulkan_ctx_t *ctx)
 		if (tex->glow) {
 			copy_count += MIPLEVELS;
 			tex->glow->offset = memsize;
-			memsize += get_image_size (tex->glow->image, device);
+			memsize += QFV_GetImageSize (device, tex->glow->image);
 			image_count++;
 		}
 	}
diff --git a/libs/video/renderer/Makemodule.am b/libs/video/renderer/Makemodule.am
index d21a7952d..54fa0a2e3 100644
--- a/libs/video/renderer/Makemodule.am
+++ b/libs/video/renderer/Makemodule.am
@@ -250,6 +250,7 @@ libs_video_renderer_librender_vulkan_la_SOURCES = \
 	libs/video/renderer/vulkan/barrier.c \
 	libs/video/renderer/vulkan/buffer.c \
 	libs/video/renderer/vulkan/command.c \
+	libs/video/renderer/vulkan/capture.c \
 	libs/video/renderer/vulkan/descriptor.c \
 	libs/video/renderer/vulkan/device.c \
 	libs/video/renderer/vulkan/image.c \
diff --git a/libs/video/renderer/vid_render_vulkan.c b/libs/video/renderer/vid_render_vulkan.c
index 83f0d4b51..82f677e33 100644
--- a/libs/video/renderer/vid_render_vulkan.c
+++ b/libs/video/renderer/vid_render_vulkan.c
@@ -31,7 +31,10 @@
 #include <stdlib.h>
 
 #include "QF/darray.h"
+#include "QF/dstring.h"
+#include "QF/quakefs.h"
 #include "QF/sys.h"
+#include "QF/va.h"
 
 #include "QF/plugin/general.h"
 #include "QF/plugin/vid_render.h"
@@ -46,6 +49,7 @@
 #include "QF/Vulkan/qf_particles.h"
 #include "QF/Vulkan/qf_texture.h"
 #include "QF/Vulkan/qf_vid.h"
+#include "QF/Vulkan/capture.h"
 #include "QF/Vulkan/command.h"
 #include "QF/Vulkan/device.h"
 #include "QF/Vulkan/image.h"
@@ -90,6 +94,7 @@ vulkan_R_Init (void)
 	Vulkan_CreateMatrices (vulkan_ctx);
 	Vulkan_CreateSwapchain (vulkan_ctx);
 	Vulkan_CreateFrames (vulkan_ctx);
+	Vulkan_CreateCapture (vulkan_ctx);
 	Vulkan_CreateRenderPass (vulkan_ctx);
 	Vulkan_CreateFramebuffers (vulkan_ctx);
 	Vulkan_Texture_Init (vulkan_ctx);
@@ -165,6 +170,12 @@ vulkan_R_RenderFrame (SCR_Func scr_3dfunc, SCR_Func *scr_funcs)
 	}
 
 	dfunc->vkCmdEndRenderPass (frame->cmdBuffer);
+	if (vulkan_ctx->capture_callback) {
+		VkImage     srcImage = vulkan_ctx->swapchain->images->a[imageIndex];
+		VkCommandBuffer cmd = QFV_CaptureImage (vulkan_ctx->capture, srcImage,
+												vulkan_ctx->curFrame);
+		dfunc->vkCmdExecuteCommands (frame->cmdBuffer, 1, &cmd);
+	}
 	dfunc->vkEndCommandBuffer (frame->cmdBuffer);
 
 	VkPipelineStageFlags waitStage
@@ -178,6 +189,17 @@ vulkan_R_RenderFrame (SCR_Func scr_3dfunc, SCR_Func *scr_funcs)
 	dfunc->vkResetFences (dev, 1, &frame->fence);
 	dfunc->vkQueueSubmit (queue->queue, 1, &submitInfo, frame->fence);
 
+	if (vulkan_ctx->capture_callback) {
+		//FIXME look into "threading" this rather than waiting here
+		dfunc->vkWaitForFences (device->dev, 1, &frame->fence, VK_TRUE,
+								1000000000ull);
+		vulkan_ctx->capture_callback (QFV_CaptureData (vulkan_ctx->capture,
+													   vulkan_ctx->curFrame),
+									  vulkan_ctx->capture->extent.width,
+									  vulkan_ctx->capture->extent.height);
+		vulkan_ctx->capture_callback = 0;
+	}
+
 	VkPresentInfoKHR presentInfo = {
 		VK_STRUCTURE_TYPE_PRESENT_INFO_KHR, 0,
 		1, &frame->renderDoneSemaphore,
@@ -358,9 +380,55 @@ vulkan_R_InitParticles (void)
 	Vulkan_InitParticles (vulkan_ctx);
 }
 
+static int
+is_bgr (VkFormat format)
+{
+	return (format >= VK_FORMAT_B8G8R8A8_UNORM
+			&& format <= VK_FORMAT_B8G8R8A8_SRGB);
+}
+
+static void
+capture_screenshot (const byte *data, int width, int height)
+{
+	dstring_t  *name = dstring_new ();
+	// find a file name to save it to
+	if (!QFS_NextFilename (name, va (vulkan_ctx->va_ctx, "%s/qf",
+									 qfs_gamedir->dir.shots),
+						   ".ppm")) {
+		Sys_Printf ("SCR_ScreenShot_f: Couldn't create a ppm file\n");
+	} else {
+		QFile      *file = QFS_Open (name->str, "wb");
+		if (!file) {
+			Sys_Printf ("Couldn't open %s\n", name->str);
+		} else {
+			Qprintf (file, "P6\n%d\n%d\n255\n", width, height);
+			if (vulkan_ctx->capture->canBlit ||
+				!is_bgr (vulkan_ctx->swapchain->format)) {
+				for (int count = width * height; count-- > 0; ) {
+					Qwrite (file, data, 3);
+					data += 4;
+				}
+			} else {
+				for (int count = width * height; count-- > 0; ) {
+					byte        rgb[] = { data[2], data[1], data[0] };
+					Qwrite (file, rgb, 3);
+					data += 4;
+				}
+			}
+			Qclose (file);
+		}
+	}
+	dstring_delete (name);
+}
+
 static void
 vulkan_SCR_ScreenShot_f (void)
 {
+	if (!vulkan_ctx->capture) {
+		Sys_Printf ("Screenshot not supported\n");
+		return;
+	}
+	vulkan_ctx->capture_callback = capture_screenshot;
 }
 
 static void
diff --git a/libs/video/renderer/vulkan/image.c b/libs/video/renderer/vulkan/image.c
index 41b4586f0..c05ececf9 100644
--- a/libs/video/renderer/vulkan/image.c
+++ b/libs/video/renderer/vulkan/image.c
@@ -194,6 +194,21 @@ QFV_CreateImageView (qfv_device_t *device, VkImage image,
 	return view;
 }
 
+size_t
+QFV_GetImageSize (qfv_device_t *device, VkImage image)
+{
+	qfv_devfuncs_t *dfunc = device->funcs;
+	size_t      size;
+	size_t      align;
+
+	VkMemoryRequirements requirements;
+	dfunc->vkGetImageMemoryRequirements (device->dev, image, &requirements);
+	size = requirements.size;
+	align = requirements.alignment - 1;
+	size = (size + align) & ~(align);
+	return size;
+}
+
 void
 QFV_GenerateMipMaps (qfv_device_t *device, VkCommandBuffer cmd,
 					 VkImage image, unsigned mips,
diff --git a/libs/video/renderer/vulkan/swapchain.c b/libs/video/renderer/vulkan/swapchain.c
index 478700e83..762e2c799 100644
--- a/libs/video/renderer/vulkan/swapchain.c
+++ b/libs/video/renderer/vulkan/swapchain.c
@@ -83,8 +83,10 @@ QFV_CreateSwapchain (vulkan_ctx_t *ctx, VkSwapchainKHR old_swapchain)
 					imageSize.width, imageSize.height);
 
 	VkImageUsageFlags imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT;
-	imageUsage |= VK_IMAGE_USAGE_TRANSFER_DST_BIT;
+	imageUsage |= VK_IMAGE_USAGE_TRANSFER_SRC_BIT;
 	imageUsage &= surfCaps.supportedUsageFlags;
+	Sys_MaskPrintf (SYS_VULKAN, "%x %x\n", imageUsage,
+					surfCaps.supportedUsageFlags);
 
 	VkSurfaceTransformFlagBitsKHR surfTransform
 		= VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR;
@@ -147,6 +149,7 @@ QFV_CreateSwapchain (vulkan_ctx_t *ctx, VkSwapchainKHR old_swapchain)
 	sc->format = useFormat.format;
 	sc->extent = imageSize;
 	sc->numImages = numImages;
+	sc->usage = imageUsage;
 	sc->images = DARRAY_ALLOCFIXED (qfv_imageset_t, numImages, malloc);
 	sc->imageViews = DARRAY_ALLOCFIXED (qfv_imageviewset_t, numImages, malloc);
 	dfuncs->vkGetSwapchainImagesKHR (dev, swapchain, &numImages, sc->images->a);
diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c
index f3f152470..a0301e1a1 100644
--- a/libs/video/renderer/vulkan/vulkan_vid_common.c
+++ b/libs/video/renderer/vulkan/vulkan_vid_common.c
@@ -54,6 +54,7 @@
 #include "QF/Vulkan/qf_vid.h"
 #include "QF/Vulkan/barrier.h"
 #include "QF/Vulkan/buffer.h"
+#include "QF/Vulkan/capture.h"
 #include "QF/Vulkan/debug.h"
 #include "QF/Vulkan/descriptor.h"
 #include "QF/Vulkan/device.h"
@@ -189,6 +190,9 @@ Vulkan_Shutdown_Common (vulkan_ctx_t *ctx)
 {
 	PL_Free (ctx->pipelineDef);
 	PL_Free (ctx->renderpassDef);
+	if (ctx->capture) {
+		QFV_DestroyCapture (ctx->capture);
+	}
 	if (ctx->frames.size) {
 		Vulkan_DestroyFrames (ctx);
 	}
@@ -535,6 +539,13 @@ Vulkan_CreateFrames (vulkan_ctx_t *ctx)
 	}
 }
 
+void
+Vulkan_CreateCapture (vulkan_ctx_t *ctx)
+{
+	ctx->capture = QFV_CreateCapture (ctx->device, ctx->frames.size,
+									  ctx->swapchain, ctx->cmdpool);
+}
+
 void
 Vulkan_DestroyFrames (vulkan_ctx_t *ctx)
 {

From 999dd8248bf716c1361251d3f2391d4de7449d69 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 25 Mar 2021 15:54:34 +0900
Subject: [PATCH 1517/1519] [vulkan] Implement sky box loading and rendering

Loading is broken for multi-file image sets due to the way images are
loaded (this needs some thought for making it effecient), but the
Blender environment map loading works.
---
 include/QF/Vulkan/qf_bsp.h                    |   4 +-
 include/QF/Vulkan/qf_texture.h                |   4 +
 libs/video/renderer/vid_render_vulkan.c       |   1 +
 libs/video/renderer/vulkan/qfpipeline.plist   |  37 +++
 .../video/renderer/vulkan/shader/bsp_sky.frag |  15 +-
 libs/video/renderer/vulkan/vulkan_bsp.c       | 138 ++++-----
 libs/video/renderer/vulkan/vulkan_texture.c   | 277 +++++++++++++++---
 .../video/renderer/vulkan/vulkan_vid_common.c |   2 +-
 8 files changed, 342 insertions(+), 136 deletions(-)

diff --git a/include/QF/Vulkan/qf_bsp.h b/include/QF/Vulkan/qf_bsp.h
index 7f279ffc2..6c69f2586 100644
--- a/include/QF/Vulkan/qf_bsp.h
+++ b/include/QF/Vulkan/qf_bsp.h
@@ -146,7 +146,8 @@ typedef struct bspctx_s {
 	VkDeviceMemory texture_memory;
 	VkPipeline   depth;
 	VkPipeline   gbuf;
-	VkPipeline   sky;
+	VkPipeline   skysheet;
+	VkPipeline   skybox;
 	VkPipeline   turb;
 	VkPipelineLayout layout;
 	size_t       vertex_buffer_size;
@@ -162,6 +163,7 @@ struct vulkan_ctx_s;
 void Vulkan_ClearElements (struct vulkan_ctx_s *ctx);
 void Vulkan_DrawWorld (struct vulkan_ctx_s *ctx);
 void Vulkan_DrawSky (struct vulkan_ctx_s *ctx);
+void Vulkan_LoadSkys (const char *sky, struct vulkan_ctx_s *ctx);
 void Vulkan_RegisterTextures (model_t **models, int num_models,
 							  struct vulkan_ctx_s *ctx);
 void Vulkan_BuildDisplayLists (model_t **models, int num_models,
diff --git a/include/QF/Vulkan/qf_texture.h b/include/QF/Vulkan/qf_texture.h
index a70ba1116..55a631f62 100644
--- a/include/QF/Vulkan/qf_texture.h
+++ b/include/QF/Vulkan/qf_texture.h
@@ -15,6 +15,10 @@ void Vulkan_ExpandPalette (byte *dst, const byte *src, const byte *palette,
 						   int alpha, int count);
 qfv_tex_t *Vulkan_LoadTex (struct vulkan_ctx_s *ctx, tex_t *tex, int mip,
 						   const char *name);
+qfv_tex_t *Vulkan_LoadEnvMap (struct vulkan_ctx_s *ctx, tex_t *tex,
+							  const char *name);
+qfv_tex_t *Vulkan_LoadEnvSides (struct vulkan_ctx_s *ctx, tex_t **tex,
+								const char *name);
 VkImageView Vulkan_TexImageView (qfv_tex_t *tex) __attribute__((pure));
 void Vulkan_UnloadTex (struct vulkan_ctx_s *ctx, qfv_tex_t *tex);
 void Vulkan_Texture_Init (struct vulkan_ctx_s *ctx);
diff --git a/libs/video/renderer/vid_render_vulkan.c b/libs/video/renderer/vid_render_vulkan.c
index 82f677e33..836e1349a 100644
--- a/libs/video/renderer/vid_render_vulkan.c
+++ b/libs/video/renderer/vid_render_vulkan.c
@@ -223,6 +223,7 @@ vulkan_R_ClearState (void)
 static void
 vulkan_R_LoadSkys (const char *skyname)
 {
+	Vulkan_LoadSkys (skyname, vulkan_ctx);
 }
 
 static void
diff --git a/libs/video/renderer/vulkan/qfpipeline.plist b/libs/video/renderer/vulkan/qfpipeline.plist
index 2d95f06b4..d19294a80 100644
--- a/libs/video/renderer/vulkan/qfpipeline.plist
+++ b/libs/video/renderer/vulkan/qfpipeline.plist
@@ -652,6 +652,43 @@
 			layout = quakebsp_layout;
 			//renderPass = renderpass;
 		};
+		bsp_skybox = {
+			subpass = 1;
+			stages = (
+				{
+					stage = vertex;
+					name = main;
+					module = $builtin/quakebsp.vert;
+				},
+				{
+					stage = fragment;
+					name = main;
+					module = $builtin/bsp_sky.frag;
+					specializationInfo = {
+						mapEntries = (
+							{ size = 4; offset = 0; constantID = 1; },
+							{ size = 4; offset = 4; constantID = 0; },
+						);
+						data = <00000000ffffffff>;
+					};
+				},
+			);
+			vertexInput   = $properties.vertexInput.brush;
+			inputAssembly = $properties.inputAssembly.brush;
+			viewport      = $properties.viewport;
+			rasterization = $properties.rasterization.cw_cull_back;
+			multisample   = $properties.multisample;
+			depthStencil  = $properties.depthStencil.test_only;
+			colorBlend = {
+				logicOpEnable = false;
+				attachments = ($properties.attachmentBlendOp.disabled);
+			};
+			dynamic = {
+				dynamicState = ( viewport, scissor );
+			};
+			layout = quakebsp_layout;
+			//renderPass = renderpass;
+		};
 		bsp_skysheet = {
 			subpass = 1;
 			stages = (
diff --git a/libs/video/renderer/vulkan/shader/bsp_sky.frag b/libs/video/renderer/vulkan/shader/bsp_sky.frag
index 28ce41421..ed6828a10 100644
--- a/libs/video/renderer/vulkan/shader/bsp_sky.frag
+++ b/libs/video/renderer/vulkan/shader/bsp_sky.frag
@@ -14,7 +14,7 @@ layout (location = 1) in vec3 direction;
 
 layout (location = 0) out vec4 frag_color;
 
-layout (constant_id = 0) const bool doSkyCube = false;
+layout (constant_id = 0) const bool doSkyBox = false;
 layout (constant_id = 1) const bool doSkySheet = false;
 
 const float SCALE = 8.0;
@@ -55,12 +55,14 @@ sky_sheet (vec3 dir, float time)
 }
 
 vec4
-sky_cube (vec3 dir, float time)
+sky_box (vec3 dir, float time)
 {
 	// NOTE: quake's world is right-handed with Z up and X forward, but
 	// Vulkan's cube maps are left-handed with Y up and Z forward. The
 	// rotation to X foward is done by the Sky matrix so all that's left
 	// to do here is swizzle the Y and Z coordinates
+	dir = normalize(dir);
+	//return vec4(dir.xyz, 1) * 0.5 + vec4(0.5);
 	return texture (SkyCube, dir.xzy);
 }
 
@@ -68,15 +70,14 @@ vec4
 sky_color (vec3 dir, float time)
 {
 	if (!doSkySheet) {
-		return vec4 (1, 0, 1, 1);
-		//return sky_cube (dir, time);
-	} if (!doSkyCube) {
+		return sky_box (dir, time);
+	} if (!doSkyBox) {
 		return sky_sheet (dir, time);
 	} else {
 		// can see through the sheet (may look funny when looking down)
 		// maybe have 4 sheet layers instead of 2?
 		vec4        c1 = sky_sheet (dir, time);
-		vec4        c2 = sky_cube (dir, time);
+		vec4        c2 = sky_box (dir, time);
 		return vec4 (mix (c2.rgb, c1.rgb, c1.a), max (c1.a, c2.a));
 		return vec4 (1, 0, 1, 1);
 	}
@@ -87,7 +88,7 @@ main (void)
 {
 	vec4        c;
 
-	if (doSkyCube || doSkySheet) {
+	if (doSkyBox || doSkySheet) {
 		c = sky_color (direction, time);
 	} else {
 		c = vec4 (0, 0, 0, 1);
diff --git a/libs/video/renderer/vulkan/vulkan_bsp.c b/libs/video/renderer/vulkan/vulkan_bsp.c
index a85625440..bceea6666 100644
--- a/libs/video/renderer/vulkan/vulkan_bsp.c
+++ b/libs/video/renderer/vulkan/vulkan_bsp.c
@@ -1054,7 +1054,11 @@ sky_begin (vulkan_ctx_t *ctx)
 	bframe->imageInfo[4].imageView = get_view (bctx->skybox_tex,
 											   bctx->default_skybox);
 
-	bsp_begin_subpass (QFV_bspSky, bctx->sky, ctx);
+	if (bctx->skybox_tex) {
+		bsp_begin_subpass (QFV_bspSky, bctx->skybox, ctx);
+	} else {
+		bsp_begin_subpass (QFV_bspSky, bctx->skysheet, ctx);
+	}
 }
 
 static void
@@ -1370,7 +1374,7 @@ create_default_skys (vulkan_ctx_t *ctx)
 								   VK_FORMAT_B8G8R8A8_UNORM,
 								   VK_IMAGE_ASPECT_COLOR_BIT);
 	QFV_duSetObjectName (device, VK_OBJECT_TYPE_IMAGE_VIEW, boxview,
-						 "bsp:iview:default_skysheet");
+						 "bsp:iview:default_skybox");
 
 	sheetview = QFV_CreateImageView (device, skysheet,
 									 VK_IMAGE_VIEW_TYPE_2D_ARRAY,
@@ -1481,7 +1485,8 @@ Vulkan_Bsp_Init (vulkan_ctx_t *ctx)
 
 	bctx->depth = Vulkan_CreatePipeline (ctx, "bsp_depth");
 	bctx->gbuf = Vulkan_CreatePipeline (ctx, "bsp_gbuf");
-	bctx->sky = Vulkan_CreatePipeline (ctx, "bsp_skysheet");
+	bctx->skybox = Vulkan_CreatePipeline (ctx, "bsp_skybox");
+	bctx->skysheet = Vulkan_CreatePipeline (ctx, "bsp_skysheet");
 	bctx->turb = Vulkan_CreatePipeline (ctx, "bsp_turb");
 	bctx->layout = Vulkan_CreatePipelineLayout (ctx, "quakebsp_layout");
 	bctx->sampler = Vulkan_CreateSampler (ctx, "quakebsp_sampler");
@@ -1533,7 +1538,8 @@ Vulkan_Bsp_Shutdown (struct vulkan_ctx_s *ctx)
 
 	dfunc->vkDestroyPipeline (device->dev, bctx->depth, 0);
 	dfunc->vkDestroyPipeline (device->dev, bctx->gbuf, 0);
-	dfunc->vkDestroyPipeline (device->dev, bctx->sky, 0);
+	dfunc->vkDestroyPipeline (device->dev, bctx->skybox, 0);
+	dfunc->vkDestroyPipeline (device->dev, bctx->skysheet, 0);
 	dfunc->vkDestroyPipeline (device->dev, bctx->turb, 0);
 	DARRAY_CLEAR (&bctx->texture_chains);
 	DARRAY_CLEAR (&bctx->frames);
@@ -1548,6 +1554,10 @@ Vulkan_Bsp_Shutdown (struct vulkan_ctx_s *ctx)
 		dfunc->vkFreeMemory (device->dev, bctx->index_memory, 0);
 	}
 
+	if (bctx->skybox_tex) {
+		Vulkan_UnloadTex (ctx, bctx->skybox_tex);
+	}
+
 	dfunc->vkDestroyImageView (device->dev, bctx->default_skysheet->view, 0);
 	dfunc->vkDestroyImage (device->dev, bctx->default_skysheet->image, 0);
 
@@ -1590,103 +1600,61 @@ copy_sub_tex (tex_t *src, int x, int y, tex_t *dst)
 				dstbytes);
 }*/
 
-/*XXX	void
-Vulkan_R_LoadSkys (const char *sky, vulkan_ctx_t *ctx)
+void
+Vulkan_LoadSkys (const char *sky, vulkan_ctx_t *ctx)
 {
-const char *name;
+	bspctx_t   *bctx = ctx->bsp_context;
+
+	const char *name;
 	int         i;
 	tex_t      *tex;
-	// NOTE: quake's world and GL's world are rotated relative to each other
-	// quake has x right, y in, z up. gl has x right, y up, z out
-	// quake order:                      +x    -x    +z    -z    +y    -y
-	// gl order:                         +x    -x    +y    -y    +z    -z
-	// fizquake orger:                   -y    +y    +z    -z    +x    -x
-	// to get from quake order to fitzquake order, all that's needed is
-	// a -90 degree rotation on the (quake) z-axis. This is taken care of in
-	// the sky_matrix setup code.
-	// However, from the player's perspective, skymaps have lf and rt
-	// swapped, but everythink makes sense if looking at the cube from outside
-	// along the positive y axis, with the front of the cube being the nearest
-	// face. This matches nicely with Blender's default cube in front (num-1)
-	// view.
 	static const char *sky_suffix[] = { "ft", "bk", "up", "dn", "rt", "lf"};
-	static int  sky_coords[][2] = {
-		{2, 0},	// front
-		{0, 0}, // back
-		{1, 1}, // up
-		{0, 1}, // down
-		{2, 1}, // left
-		{1, 0}, // right
-	};
 
-	if (!sky || !*sky)
+	if (bctx->skybox_tex) {
+		Vulkan_UnloadTex (ctx, bctx->skybox_tex);
+	}
+	bctx->skybox_tex = 0;
+
+	if (!sky || !*sky) {
 		sky = r_skyname->string;
+	}
 
 	if (!*sky || !strcasecmp (sky, "none")) {
-		skybox_loaded = false;
+		Sys_MaskPrintf (SYS_VULKAN, "Skybox unloaded\n");
 		return;
 	}
 
-	if (!skybox_tex)
-		qfeglGenTextures (1, &skybox_tex);
-
-	qfeglBindTexture (GL_TEXTURE_CUBE_MAP, skybox_tex);
-
-	//blender envmap
-	// bk rt ft
-	// dn up lt
-	tex = LoadImage (name = va ("env/%s_map", sky));
-	if (tex && tex->format >= 3 && tex->height * 3 == tex->width * 2
-		&& is_pow2 (tex->height)) {
-		tex_t      *sub;
-		int         size = tex->height / 2;
-
-		skybox_loaded = true;
-		sub = malloc (field_offset (tex_t, data[size * size * tex->format]));
-		sub->width = size;
-		sub->height = size;
-		sub->format = tex->format;
-		sub->palette = tex->palette;
-		for (i = 0; i < 6; i++) {
-			int         x, y;
-			x = sky_coords[i][0] * size;
-			y = sky_coords[i][1] * size;
-			copy_sub_tex (tex, x, y, sub);
-			qfeglTexImage2D (GL_TEXTURE_CUBE_MAP_POSITIVE_X + i, 0,
-							sub->format == 3 ? GL_RGB : GL_RGBA,
-							sub->width, sub->height, 0,
-							sub->format == 3 ? GL_RGB : GL_RGBA,
-							GL_UNSIGNED_BYTE, sub->data);
-		}
-		free (sub);
+	name = va (ctx->va_ctx, "env/%s_map", sky);
+	tex = LoadImage (name, 1);
+	if (tex) {
+		bctx->skybox_tex = Vulkan_LoadEnvMap (ctx, tex, sky);
+		Sys_MaskPrintf (SYS_VULKAN, "Loaded %s\n", name);
 	} else {
-		skybox_loaded = true;
+		int         failed = 0;
+		tex_t      *sides[6] = { };
+
 		for (i = 0; i < 6; i++) {
-			tex = LoadImage (name = va ("env/%s%s", sky, sky_suffix[i]));
-			if (!tex || tex->format < 3) {	// FIXME pcx support
-				Sys_MaskPrintf (SYS_GLSL, "Couldn't load %s\n", name);
+			name = va (ctx->va_ctx, "env/%s%s", sky, sky_suffix[i]);
+			tex = LoadImage (name, 1);
+			if (!tex) {
+				Sys_MaskPrintf (SYS_VULKAN, "Couldn't load %s\n", name);
 				// also look in gfx/env, where Darkplaces looks for skies
-				tex = LoadImage (name = va ("gfx/env/%s%s", sky,
-											sky_suffix[i]));
-				if (!tex || tex->format < 3) {  // FIXME pcx support
-					Sys_MaskPrintf (SYS_GLSL, "Couldn't load %s\n", name);
-					skybox_loaded = false;
+				name = va (ctx->va_ctx, "gfx/env/%s%s", sky, sky_suffix[i]);
+				tex = LoadImage (name, 1);
+				if (!tex) {
+					Sys_MaskPrintf (SYS_VULKAN, "Couldn't load %s\n", name);
+					failed = 1;
 					continue;
 				}
 			}
-			Sys_MaskPrintf (SYS_GLSL, "Loaded %s\n", name);
-			qfeglTexImage2D (GL_TEXTURE_CUBE_MAP_POSITIVE_X + i, 0,
-							tex->format == 3 ? GL_RGB : GL_RGBA,
-							tex->width, tex->height, 0,
-							tex->format == 3 ? GL_RGB : GL_RGBA,
-							GL_UNSIGNED_BYTE, tex->data);
+			sides[i] = tex;
+			Sys_MaskPrintf (SYS_VULKAN, "Loaded %s\n", name);
+		}
+		if (!failed) {
+			bctx->skybox_tex = Vulkan_LoadEnvSides (ctx, sides, sky);
 		}
 	}
-	qfeglTexParameteri (GL_TEXTURE_CUBE_MAP, GL_TEXTURE_WRAP_S,
-					   GL_CLAMP_TO_EDGE);
-	qfeglTexParameteri (GL_TEXTURE_CUBE_MAP, GL_TEXTURE_WRAP_T,
-					   GL_CLAMP_TO_EDGE);
-	qfeglTexParameteri (GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-	qfeglTexParameteri (GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-	qfeglGenerateMipmap (GL_TEXTURE_CUBE_MAP);
-}*/
+	if (bctx->skybox_tex) {
+		Sys_MaskPrintf (SYS_VULKAN, "Skybox %s loaded\n", sky);
+	}
+}
diff --git a/libs/video/renderer/vulkan/vulkan_texture.c b/libs/video/renderer/vulkan/vulkan_texture.c
index 7d975298d..7aa8cfc64 100644
--- a/libs/video/renderer/vulkan/vulkan_texture.c
+++ b/libs/video/renderer/vulkan/vulkan_texture.c
@@ -96,45 +96,76 @@ Vulkan_ExpandPalette (byte *dst, const byte *src, const byte *palette,
 	}
 }
 
+static int
+tex_format (const tex_t *tex, VkFormat *format, int *bpp)
+{
+	switch (tex->format) {
+		case tex_l:
+		case tex_a:
+			*format = VK_FORMAT_R8_UNORM;
+			*bpp = 1;
+			return 1;
+		case tex_la:
+			*format = VK_FORMAT_R8G8_UNORM;
+			*bpp = 2;
+			return 1;
+		case tex_palette:
+			if (!tex->palette) {
+				return 0;
+			}
+			*format = VK_FORMAT_R8G8B8A8_UNORM;
+			*bpp = 4;
+			return 1;
+		case tex_rgb:
+			*format = VK_FORMAT_R8G8B8A8_UNORM;
+			*bpp = 4;
+			return 1;
+		case tex_rgba:
+			*format = VK_FORMAT_R8G8B8A8_UNORM;
+			*bpp = 4;
+			return 1;
+		case tex_frgba:
+			*format = VK_FORMAT_R32G32B32A32_SFLOAT;
+			*bpp = 16;
+			return 1;
+	}
+	return 0;
+}
+
+static size_t
+stage_tex_data (qfv_packet_t *packet, tex_t *tex, int bpp)
+{
+	size_t      texels = tex->width * tex->height;
+	byte       *tex_data = QFV_PacketExtend (packet, bpp * texels);
+
+	if (tex->format == tex_palette) {
+		Vulkan_ExpandPalette (tex_data, tex->data, tex->palette, 1, texels);
+	} else {
+		if (tex->format == 3) {
+			byte       *in = tex->data;
+			byte       *out = tex_data;
+			while (texels-- > 0) {
+				*out++ = *in++;
+				*out++ = *in++;
+				*out++ = *in++;
+				*out++ = 255;
+			}
+		} else {
+			memcpy (tex_data, tex->data, bpp * texels);
+		}
+	}
+	return tex_data - (byte *) packet->stage->data;
+}
+
 qfv_tex_t *
 Vulkan_LoadTex (vulkan_ctx_t *ctx, tex_t *tex, int mip, const char *name)
 {
 	qfv_device_t *device = ctx->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
-	int         bpp = 0;
-	VkFormat    format = VK_FORMAT_UNDEFINED;
+	int         bpp;
+	VkFormat    format;
 
-	switch (tex->format) {
-		case tex_l:
-		case tex_a:
-			format = VK_FORMAT_R8_UNORM;
-			bpp = 1;
-			break;
-		case tex_la:
-			format = VK_FORMAT_R8G8_UNORM;
-			bpp = 2;
-			break;
-		case tex_palette:
-			if (!tex->palette) {
-				return 0;
-			}
-			format = VK_FORMAT_R8G8B8A8_UNORM;
-			bpp = 4;
-			break;
-		case tex_rgb:
-			format = VK_FORMAT_R8G8B8_UNORM;
-			bpp = 3;
-			break;
-		case tex_rgba:
-			format = VK_FORMAT_R8G8B8A8_UNORM;
-			bpp = 4;
-			break;
-		case tex_frgba:
-			format = VK_FORMAT_R32G32B32A32_SFLOAT;
-			bpp = 16;
-			break;
-	}
-	if (format == VK_FORMAT_UNDEFINED) {
+	if (!tex_format (tex, &format, &bpp)) {
 		return 0;
 	}
 
@@ -169,16 +200,8 @@ Vulkan_LoadTex (vulkan_ctx_t *ctx, tex_t *tex, int mip, const char *name)
 	QFV_duSetObjectName (device, VK_OBJECT_TYPE_IMAGE_VIEW, qtex->view,
 						 va (ctx->va_ctx, "iview:%s", name));
 
-	size_t      bytes = bpp * tex->width * tex->height;
 	qfv_packet_t *packet = QFV_PacketAcquire (ctx->staging);
-	byte       *tex_data = QFV_PacketExtend (packet, bytes);
-
-	if (tex->format == tex_palette) {
-		Vulkan_ExpandPalette (tex_data, tex->data, tex->palette,
-							  1, tex->width * tex->height);
-	} else {
-		memcpy (tex_data, tex->data, bytes);
-	}
+	stage_tex_data (packet, tex, bpp);
 
 	VkImageMemoryBarrier barrier;
 	qfv_pipelinestagepair_t stages;
@@ -214,6 +237,176 @@ Vulkan_LoadTex (vulkan_ctx_t *ctx, tex_t *tex, int mip, const char *name)
 	return qtex;
 }
 
+static qfv_tex_t *
+create_cubetex (vulkan_ctx_t *ctx, int size, VkFormat format,
+				const char *name)
+{
+	qfv_device_t *device = ctx->device;
+
+	qfv_tex_t  *qtex = malloc (sizeof (qfv_tex_t));
+
+	VkExtent3D  extent = { size, size, 1 };
+	qtex->image = QFV_CreateImage (device, 1, VK_IMAGE_TYPE_2D, format, extent,
+								   1, 1, VK_SAMPLE_COUNT_1_BIT,
+								   VK_IMAGE_USAGE_SAMPLED_BIT
+								   | VK_IMAGE_USAGE_TRANSFER_DST_BIT);
+	QFV_duSetObjectName (device, VK_OBJECT_TYPE_IMAGE, qtex->image,
+						 va (ctx->va_ctx, "image:envmap:%s", name));
+	qtex->memory = QFV_AllocImageMemory (device, qtex->image,
+										 VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT,
+										 0, 0);
+	QFV_duSetObjectName (device, VK_OBJECT_TYPE_DEVICE_MEMORY, qtex->memory,
+						 va (ctx->va_ctx, "memory:%s", name));
+	QFV_BindImageMemory (device, qtex->image, qtex->memory, 0);
+	qtex->view = QFV_CreateImageView (device, qtex->image,
+									  VK_IMAGE_VIEW_TYPE_CUBE, format,
+									  VK_IMAGE_ASPECT_COLOR_BIT);
+	QFV_duSetObjectName (device, VK_OBJECT_TYPE_IMAGE_VIEW, qtex->view,
+						 va (ctx->va_ctx, "iview:envmap:%s", name));
+
+	return qtex;
+}
+
+qfv_tex_t *
+Vulkan_LoadEnvMap (vulkan_ctx_t *ctx, tex_t *tex, const char *name)
+{
+	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+	int         bpp;
+	VkFormat    format;
+
+	static int env_coords[][2] = {
+		{2, 0},	// right
+		{0, 0}, // left
+		{1, 1}, // top
+		{0, 1}, // bottom
+		{2, 1}, // front
+		{1, 0}, // back
+	};
+
+	if (!tex_format (tex, &format, &bpp)) {
+		return 0;
+	}
+	if (tex->height * 3 != tex->width * 2) {
+		return 0;
+	}
+
+	int size = tex->height / 2;
+	qfv_tex_t  *qtex = create_cubetex (ctx, size, format, name);
+
+	qfv_packet_t *packet = QFV_PacketAcquire (ctx->staging);
+	stage_tex_data (packet, tex, bpp);
+
+	VkImageMemoryBarrier barrier;
+	qfv_pipelinestagepair_t stages;
+
+	stages = imageLayoutTransitionStages[qfv_LT_Undefined_to_TransferDst];
+	barrier = imageLayoutTransitionBarriers[qfv_LT_Undefined_to_TransferDst];
+	barrier.image = qtex->image;
+	barrier.subresourceRange.levelCount = VK_REMAINING_MIP_LEVELS;
+	barrier.subresourceRange.layerCount = VK_REMAINING_ARRAY_LAYERS;
+	dfunc->vkCmdPipelineBarrier (packet->cmd, stages.src, stages.dst,
+								 0, 0, 0, 0, 0,
+								 1, &barrier);
+
+	VkBufferImageCopy copy[6] = {
+		{
+			0, tex->width, 0,
+			{VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1},
+			{0, 0, 0}, {size, size, 1},
+		},
+	};
+	for (int i = 0; i < 6; i++) {
+		int     x = env_coords[i][0] * size;
+		int     y = env_coords[i][1] * size;
+		int offset = x + y * tex->width;
+		copy[i] = copy[0];
+		copy[i].bufferOffset = packet->offset + bpp * offset;
+		copy[i].imageSubresource.baseArrayLayer = i;
+	}
+	dfunc->vkCmdCopyBufferToImage (packet->cmd, packet->stage->buffer,
+								   qtex->image,
+								   VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
+								   6, copy);
+	stages = imageLayoutTransitionStages[qfv_LT_TransferDst_to_ShaderReadOnly];
+	barrier=imageLayoutTransitionBarriers[qfv_LT_TransferDst_to_ShaderReadOnly];
+	barrier.image = qtex->image;
+	barrier.subresourceRange.levelCount = VK_REMAINING_MIP_LEVELS;
+	barrier.subresourceRange.layerCount = VK_REMAINING_ARRAY_LAYERS;
+	dfunc->vkCmdPipelineBarrier (packet->cmd, stages.src, stages.dst,
+								 0, 0, 0, 0, 0,
+								 1, &barrier);
+	QFV_PacketSubmit (packet);
+	return qtex;
+}
+
+qfv_tex_t *
+Vulkan_LoadEnvSides (vulkan_ctx_t *ctx, tex_t **tex, const char *name)
+{
+	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+	int         bpp;
+	VkFormat    format;
+
+	if (!tex_format (tex[0], &format, &bpp)) {
+		return 0;
+	}
+	if (tex[0]->height != tex[0]->width) {
+		return 0;
+	}
+	for (int i = 1; i < 6; i++) {
+		if (tex[i]->format != tex[0]->format
+			|| tex[i]->width != tex[0]->width
+			|| tex[i]->height != tex[0]->height) {
+			return 0;
+		}
+	}
+
+	int size = tex[0]->height;
+	qfv_tex_t  *qtex = create_cubetex (ctx, size, format, name);
+
+	qfv_packet_t *packet = QFV_PacketAcquire (ctx->staging);
+
+	VkImageMemoryBarrier barrier;
+	qfv_pipelinestagepair_t stages;
+
+	stages = imageLayoutTransitionStages[qfv_LT_Undefined_to_TransferDst];
+	barrier = imageLayoutTransitionBarriers[qfv_LT_Undefined_to_TransferDst];
+	barrier.image = qtex->image;
+	barrier.subresourceRange.levelCount = VK_REMAINING_MIP_LEVELS;
+	barrier.subresourceRange.layerCount = VK_REMAINING_ARRAY_LAYERS;
+	dfunc->vkCmdPipelineBarrier (packet->cmd, stages.src, stages.dst,
+								 0, 0, 0, 0, 0,
+								 1, &barrier);
+
+	VkBufferImageCopy copy[6] = {
+		{
+			0, 0, 0,
+			{VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1},
+			{0, 0, 0}, {size, size, 1},
+		},
+	};
+	for (int i = 0; i < 6; i++) {
+		copy[i] = copy[0];
+		copy[i].bufferOffset = stage_tex_data (packet, tex[i], bpp);
+		copy[i].imageSubresource.baseArrayLayer = i;
+	}
+	dfunc->vkCmdCopyBufferToImage (packet->cmd, packet->stage->buffer,
+								   qtex->image,
+								   VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
+								   6, copy);
+	stages = imageLayoutTransitionStages[qfv_LT_TransferDst_to_ShaderReadOnly];
+	barrier=imageLayoutTransitionBarriers[qfv_LT_TransferDst_to_ShaderReadOnly];
+	barrier.image = qtex->image;
+	barrier.subresourceRange.levelCount = VK_REMAINING_MIP_LEVELS;
+	barrier.subresourceRange.layerCount = VK_REMAINING_ARRAY_LAYERS;
+	dfunc->vkCmdPipelineBarrier (packet->cmd, stages.src, stages.dst,
+								 0, 0, 0, 0, 0,
+								 1, &barrier);
+	QFV_PacketSubmit (packet);
+	return qtex;
+}
+
 VkImageView
 Vulkan_TexImageView (qfv_tex_t *tex)
 {
diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c
index a0301e1a1..e18b5d689 100644
--- a/libs/video/renderer/vulkan/vulkan_vid_common.c
+++ b/libs/video/renderer/vulkan/vulkan_vid_common.c
@@ -237,7 +237,7 @@ void
 Vulkan_CreateStagingBuffers (vulkan_ctx_t *ctx)
 {
 	ctx->staging = QFV_CreateStagingBuffer (ctx->device, "vulkan_ctx",
-											4*1024*1024, ctx->cmdpool);
+											16*1024*1024, ctx->cmdpool);
 }
 
 void

From 457306edad0c14a54d6c81f2714557e28cc48eff Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 25 Mar 2021 15:56:01 +0900
Subject: [PATCH 1518/1519] [qw] Fix handling of sky box name

The handling was broken during some merge work. Need to find a good way
to unify it all (probably by giving nq a fake serverinfo).
---
 qw/source/cl_parse.c | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/qw/source/cl_parse.c b/qw/source/cl_parse.c
index 4f0c93475..a1e8474ca 100644
--- a/qw/source/cl_parse.c
+++ b/qw/source/cl_parse.c
@@ -177,15 +177,29 @@ CL_LoadSky (void)
 {
 	plitem_t   *item;
 	const char *name = 0;
+	static const char *sky_keys[] = {
+		"sky",      // Q2/DarkPlaces
+		"skyname",  // old QF
+		"qlsky",    // QuakeLives
+		0
+	};
 
-	if (!cl.worldspawn) {
-		r_funcs->R_LoadSkys (0);
-		return;
+	// R_LoadSkys does the right thing with null pointers.
+	if (cl.serverinfo) {
+		name = Info_ValueForKey (cl.serverinfo, "sky");
 	}
-	if ((item = PL_ObjectForKey (cl.worldspawn, "sky")) // Q2/DarkPlaces
-		|| (item = PL_ObjectForKey (cl.worldspawn, "skyname")) // old QF
-		|| (item = PL_ObjectForKey (cl.worldspawn, "qlsky"))) /* QuakeLives */ {
-		name = PL_String (item);
+
+	if (!name) {
+		if (!cl.worldspawn) {
+			r_funcs->R_LoadSkys (0);
+			return;
+		}
+		for (const char **key = sky_keys; *key; key++) {
+			if ((item = PL_ObjectForKey (cl.worldspawn, *key))) {
+				name = PL_String (item);
+				break;
+			}
+		}
 	}
 	r_funcs->R_LoadSkys (name);
 }

From 32c2e013ca6248aaa42edc59177600322b4a4486 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 25 Mar 2021 15:59:28 +0900
Subject: [PATCH 1519/1519] [vulkan] Add missed screen capture files

Rather critical to the build (and screenshots)
---
 include/QF/Vulkan/capture.h          |  43 +++++
 libs/video/renderer/vulkan/capture.c | 270 +++++++++++++++++++++++++++
 2 files changed, 313 insertions(+)
 create mode 100644 include/QF/Vulkan/capture.h
 create mode 100644 libs/video/renderer/vulkan/capture.c

diff --git a/include/QF/Vulkan/capture.h b/include/QF/Vulkan/capture.h
new file mode 100644
index 000000000..a2fa1397b
--- /dev/null
+++ b/include/QF/Vulkan/capture.h
@@ -0,0 +1,43 @@
+#ifndef __QF_Vulkan_capture_h
+#define __QF_Vulkan_capture_h
+
+#include "QF/darray.h"
+#include "QF/qtypes.h"
+
+typedef struct qfv_capture_image_s {
+	VkImage     image;
+	VkImageLayout layout;
+	VkCommandBuffer cmd;
+	byte       *data;
+} qfv_capture_image_t;
+
+typedef struct qfv_capture_image_set_s
+	DARRAY_TYPE (qfv_capture_image_t) qfv_capture_image_set_t;
+
+#define QFV_AllocCaptureImageSet(num, allocator) \
+	DARRAY_ALLOCFIXED (qfv_capture_image_set_t, num, allocator)
+
+typedef struct qfv_capture_s {
+	struct qfv_device_s *device;
+
+	int         canBlit;
+	VkExtent2D  extent;
+	qfv_capture_image_set_t *image_set;
+	size_t      memsize;
+	VkDeviceMemory memory;
+} qfv_capture_t;
+
+struct qfv_swapchain_s;
+
+qfv_capture_t *QFV_CreateCapture (struct qfv_device_s *device, int numframes,
+								  struct qfv_swapchain_s *swapchain,
+								  VkCommandPool cmdPool);
+void QFV_RenewCapture (qfv_capture_t *capture,
+					   struct qfv_swapchain_s *swapchain);
+void QFV_DestroyCapture (qfv_capture_t *capture);
+
+VkCommandBuffer QFV_CaptureImage (qfv_capture_t *capture, VkImage scImage,
+								  int frame);
+const byte *QFV_CaptureData (qfv_capture_t *capture, int frame) __attribute__((pure));
+
+#endif//__QF_Vulkan_capture_h
diff --git a/libs/video/renderer/vulkan/capture.c b/libs/video/renderer/vulkan/capture.c
new file mode 100644
index 000000000..1fa0d8193
--- /dev/null
+++ b/libs/video/renderer/vulkan/capture.c
@@ -0,0 +1,270 @@
+/*
+	capture.c
+
+	Vulkan frame capture support
+
+	Copyright (C) 1996-1997 Id Software, Inc.
+	Copyright (C) 2021      Bill Currie <bill@taniwha.org>
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifdef HAVE_MATH_H
+# include <math.h>
+#endif
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#include <stdlib.h>
+
+#include "QF/Vulkan/qf_vid.h"
+#include "QF/Vulkan/capture.h"
+#include "QF/Vulkan/command.h"
+#include "QF/Vulkan/device.h"
+#include "QF/Vulkan/image.h"
+#include "QF/Vulkan/instance.h"
+#include "QF/Vulkan/swapchain.h"
+
+#include "vid_vulkan.h"
+
+qfv_capture_t *
+QFV_CreateCapture (qfv_device_t *device, int numframes,
+				   qfv_swapchain_t *swapchain, VkCommandPool cmdPool)
+{
+	qfv_instfuncs_t *ifunc = device->physDev->instance->funcs;
+	qfv_devfuncs_t *dfunc = device->funcs;
+	VkFormat    format = VK_FORMAT_R8G8B8A8_UNORM;
+	int         canBlit = 1;
+
+	VkFormatProperties format_props;
+	ifunc->vkGetPhysicalDeviceFormatProperties (device->physDev->dev,
+												swapchain->format,
+												&format_props);
+	if (!(swapchain->usage & VK_IMAGE_USAGE_TRANSFER_SRC_BIT)) {
+		Sys_Printf ("Swapchain does not support reading. FIXME\n");
+		return 0;
+	}
+	if (!(format_props.optimalTilingFeatures
+		  & VK_FORMAT_FEATURE_BLIT_SRC_BIT)) {
+		Sys_MaskPrintf (SYS_VULKAN,
+						"Device does not support blitting from optimal tiled "
+						"images.\n");
+		canBlit = 0;
+	}
+	ifunc->vkGetPhysicalDeviceFormatProperties (device->physDev->dev, format,
+												&format_props);
+	if (!(format_props.linearTilingFeatures
+		  & VK_FORMAT_FEATURE_BLIT_DST_BIT)) {
+		Sys_MaskPrintf (SYS_VULKAN,
+						"Device does not support blitting from optimal tiled "
+						"images.\n");
+		canBlit = 0;
+	}
+
+	qfv_capture_t *capture = malloc (sizeof (qfv_capture_t));
+	capture->device = device;
+	capture->canBlit = canBlit;
+	capture->extent = swapchain->extent;
+	capture->image_set = QFV_AllocCaptureImageSet (numframes, malloc);
+
+	__auto_type cmdset = QFV_AllocCommandBufferSet (numframes, alloca);
+	QFV_AllocateCommandBuffers (device, cmdPool, 1, cmdset);
+
+	VkImageCreateInfo createInfo = {
+		.sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO,
+		.imageType = VK_IMAGE_TYPE_2D,
+		.format = format,
+		.extent = { swapchain->extent.width, swapchain->extent.height, 1 },
+		.arrayLayers = 1,
+		.mipLevels = 1,
+		.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED,
+		.samples = VK_SAMPLE_COUNT_1_BIT,
+		.tiling = VK_IMAGE_TILING_LINEAR,
+		.usage = VK_IMAGE_USAGE_TRANSFER_DST_BIT,
+	};
+
+	for (int i = 0; i < numframes; i++) {
+		__auto_type image = &capture->image_set->a[i];
+		dfunc->vkCreateImage (device->dev, &createInfo, 0, &image->image);
+		image->layout = VK_IMAGE_LAYOUT_UNDEFINED;
+		image->cmd = cmdset->a[i];
+	}
+	size_t      image_size = QFV_GetImageSize (device,
+											   capture->image_set->a[0].image);
+	capture->memsize = numframes * image_size;
+	capture->memory = QFV_AllocImageMemory (device,
+											capture->image_set->a[0].image,
+											VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT,
+											capture->memsize, 0);
+	byte       *data;
+	dfunc->vkMapMemory (device->dev, capture->memory, 0, capture->memsize, 0,
+						(void **) &data);
+
+	for (int i = 0; i < numframes; i++) {
+		__auto_type image = &capture->image_set->a[i];
+		image->data = data + i * image_size;
+		dfunc->vkBindImageMemory (device->dev, image->image, capture->memory,
+								  image->data - data);
+	}
+	return capture;
+}
+
+void
+QFV_DestroyCapture (qfv_capture_t *capture)
+{
+	qfv_device_t *device = capture->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	for (size_t i = 0; i < capture->image_set->size; i++) {
+		__auto_type image = &capture->image_set->a[i];
+		dfunc->vkDestroyImage (device->dev, image->image, 0);
+	}
+	dfunc->vkUnmapMemory (device->dev, capture->memory);
+	dfunc->vkFreeMemory (device->dev, capture->memory, 0);
+	free (capture->image_set);
+	free (capture);
+}
+
+static void
+blit_image (qfv_capture_t *capture, qfv_devfuncs_t *dfunc,
+			VkImage scImage, qfv_capture_image_t *image)
+{
+	VkImageBlit blit = {
+		{ VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1 },
+		{ { }, { capture->extent.width, capture->extent.height, 1 } },
+		{ VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1 },
+		{ { }, { capture->extent.width, capture->extent.height, 1 } },
+	};
+	dfunc->vkCmdBlitImage (image->cmd,
+						   scImage, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
+						   image->image, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
+						   1, &blit, VK_FILTER_NEAREST);
+}
+
+static void
+copy_image (qfv_capture_t *capture, qfv_devfuncs_t *dfunc,
+			VkImage scImage, qfv_capture_image_t *image)
+{
+	VkImageCopy copy = {
+		{ VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1 }, { },
+		{ VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1 }, { },
+		{ capture->extent.width, capture->extent.height, 1 },
+	};
+	dfunc->vkCmdCopyImage (image->cmd,
+						   scImage, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
+						   image->image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
+						   1, &copy);
+}
+
+VkCommandBuffer
+QFV_CaptureImage (qfv_capture_t *capture, VkImage scImage, int frame)
+{
+	qfv_device_t *device = capture->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+	__auto_type image = &capture->image_set->a[frame];
+
+	dfunc->vkResetCommandBuffer (image->cmd, 0);
+	VkCommandBufferInheritanceInfo inherit = {
+		VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_INFO, 0,
+		0, 0, 0, 0, 0, 0,
+	};
+	VkCommandBufferBeginInfo beginInfo = {
+		VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, 0,
+		VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT, &inherit,
+	};
+	dfunc->vkBeginCommandBuffer (image->cmd, &beginInfo);
+
+	VkImageMemoryBarrier start_barriers[] = {
+		{
+			.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,
+			.srcAccessMask = 0,
+			.dstAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT,
+			.oldLayout = image->layout,
+			.newLayout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
+			.image = image->image,
+			.subresourceRange = { VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1 },
+		},
+		{
+			.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,
+			.srcAccessMask = VK_ACCESS_MEMORY_READ_BIT,
+			.dstAccessMask = VK_ACCESS_TRANSFER_READ_BIT,
+			.oldLayout = VK_IMAGE_LAYOUT_PRESENT_SRC_KHR,
+			.newLayout = VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
+			.image = scImage,
+			.subresourceRange = { VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1 },
+		},
+	};
+	VkImageMemoryBarrier end_barriers[] = {
+		{
+			.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,
+			.srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT,
+			.dstAccessMask = VK_ACCESS_MEMORY_READ_BIT,
+			.oldLayout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
+			.newLayout = VK_IMAGE_LAYOUT_GENERAL,
+			.image = image->image,
+			.subresourceRange = { VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1 },
+		},
+		{
+			.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,
+			.srcAccessMask = VK_ACCESS_TRANSFER_READ_BIT,
+			.dstAccessMask = VK_ACCESS_MEMORY_READ_BIT,
+			.oldLayout = VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
+			.newLayout = VK_IMAGE_LAYOUT_PRESENT_SRC_KHR,
+			.image = scImage,
+			.subresourceRange = { VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1 },
+		},
+	};
+
+	dfunc->vkCmdPipelineBarrier (image->cmd,
+								 VK_PIPELINE_STAGE_TRANSFER_BIT,
+								 VK_PIPELINE_STAGE_TRANSFER_BIT,
+								 0, 0, 0, 0, 0,
+								 2, start_barriers);
+
+	if (capture->canBlit) {
+		blit_image (capture, dfunc, scImage, image);
+	} else {
+		copy_image (capture, dfunc, scImage, image);
+	}
+
+	dfunc->vkCmdPipelineBarrier (image->cmd,
+								 VK_PIPELINE_STAGE_TRANSFER_BIT,
+								 VK_PIPELINE_STAGE_TRANSFER_BIT,
+								 0, 0, 0, 0, 0,
+								 2, end_barriers);
+	image->layout = VK_IMAGE_LAYOUT_GENERAL;
+
+	dfunc->vkEndCommandBuffer (image->cmd);
+
+	return image->cmd;
+}
+
+const byte *
+QFV_CaptureData (qfv_capture_t *capture, int frame)
+{
+	__auto_type image = &capture->image_set->a[frame];
+	return image->data;
+}